diff --git a/src/bootstrap/bin/llvm-config-wrapper.rs b/src/bootstrap/bin/llvm-config-wrapper.rs index b1703f8c728e2..5e3625eb22e52 100644 --- a/src/bootstrap/bin/llvm-config-wrapper.rs +++ b/src/bootstrap/bin/llvm-config-wrapper.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // The sheer existence of this file is an awful hack. See the comments in // `src/bootstrap/native.rs` for why this is needed when compiling LLD. diff --git a/src/bootstrap/bin/main.rs b/src/bootstrap/bin/main.rs index d02bc7972ae9a..8ddce5c247db6 100644 --- a/src/bootstrap/bin/main.rs +++ b/src/bootstrap/bin/main.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! rustbuild, the Rust build system //! //! This is the entry point for the build system used to compile the `rustc` diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs index 7192cae8956e4..ebc5bf47d3202 100644 --- a/src/bootstrap/bin/rustc.rs +++ b/src/bootstrap/bin/rustc.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Shim which is passed to Cargo as "rustc" when running the bootstrap. //! //! This shim will take care of some various tasks that our build process diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs index a54e58665cceb..3912dd836635c 100644 --- a/src/bootstrap/bin/rustdoc.rs +++ b/src/bootstrap/bin/rustdoc.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Shim which is passed to Cargo as "rustdoc" when running the bootstrap. //! //! See comments in `src/bootstrap/rustc.rs` for more information. diff --git a/src/bootstrap/bin/sccache-plus-cl.rs b/src/bootstrap/bin/sccache-plus-cl.rs index 0a20ac7e492dc..f9e14d1ff6d30 100644 --- a/src/bootstrap/bin/sccache-plus-cl.rs +++ b/src/bootstrap/bin/sccache-plus-cl.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate cc; use std::env; diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index 12c1972c22039..cf59d6fd6bfde 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::any::Any; use std::cell::{Cell, RefCell}; use std::collections::BTreeSet; diff --git a/src/bootstrap/cache.rs b/src/bootstrap/cache.rs index bca5ff85ba23e..8c59e6bd621ca 100644 --- a/src/bootstrap/cache.rs +++ b/src/bootstrap/cache.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::any::{Any, TypeId}; use std::borrow::Borrow; use std::cell::RefCell; diff --git a/src/bootstrap/cc_detect.rs b/src/bootstrap/cc_detect.rs index 698903f128d4d..4647d8fec6fce 100644 --- a/src/bootstrap/cc_detect.rs +++ b/src/bootstrap/cc_detect.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! C-compiler probing and detection. //! //! This module will fill out the `cc` and `cxx` maps of `Build` by looking for diff --git a/src/bootstrap/channel.rs b/src/bootstrap/channel.rs index fa2b58fb2daa7..da87eaab44fa7 100644 --- a/src/bootstrap/channel.rs +++ b/src/bootstrap/channel.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Build configuration for Rust's release channels. //! //! Implements the stable/beta/nightly channel distinctions by setting various diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs index 133e5aa37a7db..e191af33b4b03 100644 --- a/src/bootstrap/check.rs +++ b/src/bootstrap/check.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Implementation of compiling the compiler and standard library, in "check" mode. use compile::{run_cargo, std_cargo, test_cargo, rustc_cargo, rustc_cargo_env, add_to_sysroot}; diff --git a/src/bootstrap/clean.rs b/src/bootstrap/clean.rs index 87f194fb7d2f8..87de811db856f 100644 --- a/src/bootstrap/clean.rs +++ b/src/bootstrap/clean.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Implementation of `make clean` in rustbuild. //! //! Responsible for cleaning out a build directory of all old and stale diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index 2f8816d111a9d..c07228752e083 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Implementation of compiling various phases of the compiler and standard //! library. //! diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs index 43650332d3b67..b21b037e2bbef 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Serialized configuration of a build. //! //! This module implements parsing `config.toml` configuration files to tweak diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 6e473fae3be5c..6eccbbce12ea9 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Implementation of the various distribution aspects of the compiler. //! //! This module is responsible for creating tarballs of the standard library, diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs index ed9b5b1773fae..70082c6164939 100644 --- a/src/bootstrap/doc.rs +++ b/src/bootstrap/doc.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Documentation generation for rustbuilder. //! //! This module implements generation for all bits and pieces of documentation diff --git a/src/bootstrap/flags.rs b/src/bootstrap/flags.rs index 60b4d65f44401..a208e7b47e54e 100644 --- a/src/bootstrap/flags.rs +++ b/src/bootstrap/flags.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Command-line interface of the rustbuild build system. //! //! This module implements the command-line parsing of the build system which diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs index cb28698aa3d6d..a12e3102a3a48 100644 --- a/src/bootstrap/install.rs +++ b/src/bootstrap/install.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Implementation of the install aspects of the compiler. //! //! This module is responsible for installing the standard library, diff --git a/src/bootstrap/job.rs b/src/bootstrap/job.rs index 6445ce8da332e..8a2ac6c6a3de0 100644 --- a/src/bootstrap/job.rs +++ b/src/bootstrap/job.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Job management on Windows for bootstrapping //! //! Most of the time when you're running a build system (e.g. make) you expect diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index 5bb475e07ba8d..855964ec1ab46 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Implementation of rustbuild, the Rust build system. //! //! This module, and its descendants, are the implementation of the Rust build diff --git a/src/bootstrap/metadata.rs b/src/bootstrap/metadata.rs index fa0b1983510b9..ac9a495e58fb7 100644 --- a/src/bootstrap/metadata.rs +++ b/src/bootstrap/metadata.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::HashMap; use std::process::Command; use std::path::PathBuf; diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index c99347aa94e66..0b17f88271afb 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Compilation of native dependencies like LLVM. //! //! Native projects like LLVM unfortunately aren't suited just yet for diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs index c2610de23beba..ccef6199bebde 100644 --- a/src/bootstrap/sanity.rs +++ b/src/bootstrap/sanity.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Sanity checking performed by rustbuild before actually executing anything. //! //! This module contains the implementation of ensuring that the build diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index f762d9414cff3..35f952cfd3731 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Implementation of the test-related targets of the build system. //! //! This file implements the various regression test suites that we execute on diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs index 23ef031dcb703..38e3233330d1b 100644 --- a/src/bootstrap/tool.rs +++ b/src/bootstrap/tool.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fs; use std::env; use std::iter; diff --git a/src/bootstrap/toolstate.rs b/src/bootstrap/toolstate.rs index f63c1988906fb..8ff7c09fc2996 100644 --- a/src/bootstrap/toolstate.rs +++ b/src/bootstrap/toolstate.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Copy, Clone, Debug, Deserialize, Serialize, PartialEq, Eq)] #[serde(rename_all = "kebab-case")] /// Whether a tool can be compiled, tested or neither diff --git a/src/bootstrap/util.rs b/src/bootstrap/util.rs index be03796921af8..d63dff678b451 100644 --- a/src/bootstrap/util.rs +++ b/src/bootstrap/util.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Various utility functions used throughout rustbuild. //! //! Simple things like testing the various filesystem operations here and there, diff --git a/src/build_helper/lib.rs b/src/build_helper/lib.rs index 1cbb8e49bfa15..a6424ab6a878f 100644 --- a/src/build_helper/lib.rs +++ b/src/build_helper/lib.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fs::File; use std::path::{Path, PathBuf}; use std::process::{Command, Stdio}; diff --git a/src/etc/test-float-parse/_common.rs b/src/etc/test-float-parse/_common.rs index 725a715f7cf32..9cbad5486b485 100644 --- a/src/etc/test-float-parse/_common.rs +++ b/src/etc/test-float-parse/_common.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::io; use std::io::prelude::*; use std::mem::transmute; diff --git a/src/etc/test-float-parse/few-ones.rs b/src/etc/test-float-parse/few-ones.rs index 2486df4446631..2d82918aabbdb 100644 --- a/src/etc/test-float-parse/few-ones.rs +++ b/src/etc/test-float-parse/few-ones.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod _common; use _common::validate; diff --git a/src/etc/test-float-parse/huge-pow10.rs b/src/etc/test-float-parse/huge-pow10.rs index 9d12a03dae290..9a16d9c60280d 100644 --- a/src/etc/test-float-parse/huge-pow10.rs +++ b/src/etc/test-float-parse/huge-pow10.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod _common; use _common::validate; diff --git a/src/etc/test-float-parse/long-fractions.rs b/src/etc/test-float-parse/long-fractions.rs index 9598bd12a0d45..55e4f07cd0cc3 100644 --- a/src/etc/test-float-parse/long-fractions.rs +++ b/src/etc/test-float-parse/long-fractions.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod _common; use std::char; diff --git a/src/etc/test-float-parse/many-digits.rs b/src/etc/test-float-parse/many-digits.rs index 469a38da2b831..76da818c7091f 100644 --- a/src/etc/test-float-parse/many-digits.rs +++ b/src/etc/test-float-parse/many-digits.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate rand; mod _common; diff --git a/src/etc/test-float-parse/rand-f64.rs b/src/etc/test-float-parse/rand-f64.rs index 2994dd9d5e644..39ad63945cd11 100644 --- a/src/etc/test-float-parse/rand-f64.rs +++ b/src/etc/test-float-parse/rand-f64.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate rand; mod _common; diff --git a/src/etc/test-float-parse/short-decimals.rs b/src/etc/test-float-parse/short-decimals.rs index 4909f7c58f89a..8b9b6f78ae35a 100644 --- a/src/etc/test-float-parse/short-decimals.rs +++ b/src/etc/test-float-parse/short-decimals.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod _common; use _common::validate; diff --git a/src/etc/test-float-parse/subnorm.rs b/src/etc/test-float-parse/subnorm.rs index 04a7cc2746675..448482c6eb817 100644 --- a/src/etc/test-float-parse/subnorm.rs +++ b/src/etc/test-float-parse/subnorm.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod _common; use std::mem::transmute; diff --git a/src/etc/test-float-parse/tiny-pow10.rs b/src/etc/test-float-parse/tiny-pow10.rs index 50ca5e32609ac..43fad5b49eee6 100644 --- a/src/etc/test-float-parse/tiny-pow10.rs +++ b/src/etc/test-float-parse/tiny-pow10.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod _common; use _common::validate; diff --git a/src/etc/test-float-parse/u32-small.rs b/src/etc/test-float-parse/u32-small.rs index 571ac80e5b0c5..3ae62425adf0b 100644 --- a/src/etc/test-float-parse/u32-small.rs +++ b/src/etc/test-float-parse/u32-small.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod _common; use _common::validate; diff --git a/src/etc/test-float-parse/u64-pow2.rs b/src/etc/test-float-parse/u64-pow2.rs index 5b25c8399319c..1c9bda948ffd3 100644 --- a/src/etc/test-float-parse/u64-pow2.rs +++ b/src/etc/test-float-parse/u64-pow2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod _common; use _common::validate; diff --git a/src/liballoc/alloc.rs b/src/liballoc/alloc.rs index 3bd0c243b39ac..36e7fc375c6bc 100644 --- a/src/liballoc/alloc.rs +++ b/src/liballoc/alloc.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Memory allocation APIs #![stable(feature = "alloc_module", since = "1.28.0")] diff --git a/src/liballoc/benches/btree/map.rs b/src/liballoc/benches/btree/map.rs index 20b9091a07bfc..8a2df8adf3456 100644 --- a/src/liballoc/benches/btree/map.rs +++ b/src/liballoc/benches/btree/map.rs @@ -1,14 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::iter::Iterator; use std::vec::Vec; use std::collections::BTreeMap; diff --git a/src/liballoc/benches/btree/mod.rs b/src/liballoc/benches/btree/mod.rs index f436b0ac0c037..4dc2dfd9153e7 100644 --- a/src/liballoc/benches/btree/mod.rs +++ b/src/liballoc/benches/btree/mod.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod map; diff --git a/src/liballoc/benches/lib.rs b/src/liballoc/benches/lib.rs index b4f4fd74f3a39..69d5ea4023856 100644 --- a/src/liballoc/benches/lib.rs +++ b/src/liballoc/benches/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(repr_simd)] #![feature(slice_sort_by_cached_key)] #![feature(test)] diff --git a/src/liballoc/benches/linked_list.rs b/src/liballoc/benches/linked_list.rs index bbac44553f18a..29c5ad2bc6eb2 100644 --- a/src/liballoc/benches/linked_list.rs +++ b/src/liballoc/benches/linked_list.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::LinkedList; use test::Bencher; diff --git a/src/liballoc/benches/slice.rs b/src/liballoc/benches/slice.rs index a699ff9c0a76e..11b8921fef519 100644 --- a/src/liballoc/benches/slice.rs +++ b/src/liballoc/benches/slice.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rand::{thread_rng}; use std::mem; use std::ptr; diff --git a/src/liballoc/benches/str.rs b/src/liballoc/benches/str.rs index 38c94d4d8b5f3..0c281fae971bf 100644 --- a/src/liballoc/benches/str.rs +++ b/src/liballoc/benches/str.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use test::{Bencher, black_box}; #[bench] diff --git a/src/liballoc/benches/string.rs b/src/liballoc/benches/string.rs index 36be21d978e1f..2933014cb58e9 100644 --- a/src/liballoc/benches/string.rs +++ b/src/liballoc/benches/string.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::iter::repeat; use test::Bencher; diff --git a/src/liballoc/benches/vec.rs b/src/liballoc/benches/vec.rs index 414901170683e..590c49f4ef500 100644 --- a/src/liballoc/benches/vec.rs +++ b/src/liballoc/benches/vec.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use test::Bencher; use std::iter::{FromIterator, repeat}; diff --git a/src/liballoc/benches/vec_deque.rs b/src/liballoc/benches/vec_deque.rs index 380645e7cd03a..f7aadbdbd8266 100644 --- a/src/liballoc/benches/vec_deque.rs +++ b/src/liballoc/benches/vec_deque.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::VecDeque; use test::{Bencher, black_box}; diff --git a/src/liballoc/benches/vec_deque_append.rs b/src/liballoc/benches/vec_deque_append.rs index bd33565113752..327998b6f44f2 100644 --- a/src/liballoc/benches/vec_deque_append.rs +++ b/src/liballoc/benches/vec_deque_append.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(duration_as_u128)] use std::{collections::VecDeque, time::Instant}; diff --git a/src/liballoc/borrow.rs b/src/liballoc/borrow.rs index c6741ddb822d5..5cc585f38d247 100644 --- a/src/liballoc/borrow.rs +++ b/src/liballoc/borrow.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A module for working with borrowed data. #![stable(feature = "rust1", since = "1.0.0")] diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs index 32292e61f94d2..8d7f6c133a980 100644 --- a/src/liballoc/boxed.rs +++ b/src/liballoc/boxed.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A pointer type for heap allocation. //! //! `Box`, casually referred to as a 'box', provides the simplest form of diff --git a/src/liballoc/boxed_test.rs b/src/liballoc/boxed_test.rs index 55995742a4a7d..724b3a184e007 100644 --- a/src/liballoc/boxed_test.rs +++ b/src/liballoc/boxed_test.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Test for `boxed` mod. use core::any::Any; diff --git a/src/liballoc/collections/binary_heap.rs b/src/liballoc/collections/binary_heap.rs index fcadcb544c431..8f5eeb8b2b24f 100644 --- a/src/liballoc/collections/binary_heap.rs +++ b/src/liballoc/collections/binary_heap.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A priority queue implemented with a binary heap. //! //! Insertion and popping the largest element have `O(log n)` time complexity. diff --git a/src/liballoc/collections/btree/map.rs b/src/liballoc/collections/btree/map.rs index 8c950cd06d9e3..187a57255dc7a 100644 --- a/src/liballoc/collections/btree/map.rs +++ b/src/liballoc/collections/btree/map.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use core::cmp::Ordering; use core::fmt::Debug; use core::hash::{Hash, Hasher}; diff --git a/src/liballoc/collections/btree/mod.rs b/src/liballoc/collections/btree/mod.rs index 087c9f228d444..8b7dc07063b62 100644 --- a/src/liballoc/collections/btree/mod.rs +++ b/src/liballoc/collections/btree/mod.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod node; mod search; pub mod map; diff --git a/src/liballoc/collections/btree/node.rs b/src/liballoc/collections/btree/node.rs index 0315545262b6b..453168bd10711 100644 --- a/src/liballoc/collections/btree/node.rs +++ b/src/liballoc/collections/btree/node.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This is an attempt at an implementation following the ideal // // ``` diff --git a/src/liballoc/collections/btree/search.rs b/src/liballoc/collections/btree/search.rs index bc1272fbc786e..9010de7c16ac3 100644 --- a/src/liballoc/collections/btree/search.rs +++ b/src/liballoc/collections/btree/search.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use core::cmp::Ordering; use borrow::Borrow; diff --git a/src/liballoc/collections/btree/set.rs b/src/liballoc/collections/btree/set.rs index af9a7074e4a4f..c62f3ea12c836 100644 --- a/src/liballoc/collections/btree/set.rs +++ b/src/liballoc/collections/btree/set.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This is pretty much entirely stolen from TreeSet, since BTreeMap has an identical interface // to TreeMap diff --git a/src/liballoc/collections/linked_list.rs b/src/liballoc/collections/linked_list.rs index 9844de9a57d70..53a4fbb5497a4 100644 --- a/src/liballoc/collections/linked_list.rs +++ b/src/liballoc/collections/linked_list.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A doubly-linked list with owned nodes. //! //! The `LinkedList` allows pushing and popping elements at either end diff --git a/src/liballoc/collections/mod.rs b/src/liballoc/collections/mod.rs index 96e0eb633b2f5..138f5d79bb008 100644 --- a/src/liballoc/collections/mod.rs +++ b/src/liballoc/collections/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Collection types. #![stable(feature = "rust1", since = "1.0.0")] diff --git a/src/liballoc/collections/vec_deque.rs b/src/liballoc/collections/vec_deque.rs index 571f35a2031d2..e98f88dc21c8c 100644 --- a/src/liballoc/collections/vec_deque.rs +++ b/src/liballoc/collections/vec_deque.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A double-ended queue implemented with a growable ring buffer. //! //! This queue has `O(1)` amortized inserts and removals from both ends of the diff --git a/src/liballoc/fmt.rs b/src/liballoc/fmt.rs index b49ec0ae25212..51b3cb1e5b95e 100644 --- a/src/liballoc/fmt.rs +++ b/src/liballoc/fmt.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Utilities for formatting and printing `String`s. //! //! This module contains the runtime support for the [`format!`] syntax extension. diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index bcdfd8c9aa5d5..92f6dcdc2b24a 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2014-2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! # The Rust core allocation and collections library //! //! This library provides smart pointers and collections for managing diff --git a/src/liballoc/macros.rs b/src/liballoc/macros.rs index 472eef77d7956..1978efda097f2 100644 --- a/src/liballoc/macros.rs +++ b/src/liballoc/macros.rs @@ -1,13 +1,3 @@ -// Copyright 2013-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// Creates a [`Vec`] containing the arguments. /// /// `vec!` allows `Vec`s to be defined with the same syntax as array expressions. diff --git a/src/liballoc/prelude.rs b/src/liballoc/prelude.rs index 53b5e93a66e26..7cd22095de417 100644 --- a/src/liballoc/prelude.rs +++ b/src/liballoc/prelude.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The alloc Prelude //! //! The purpose of this module is to alleviate imports of commonly-used diff --git a/src/liballoc/raw_vec.rs b/src/liballoc/raw_vec.rs index 837770feecef5..2235cd5064b00 100644 --- a/src/liballoc/raw_vec.rs +++ b/src/liballoc/raw_vec.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![unstable(feature = "raw_vec_internals", reason = "implementation detail", issue = "0")] #![doc(hidden)] diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs index 4860daa11e20c..d63840e6bf8ff 100644 --- a/src/liballoc/rc.rs +++ b/src/liballoc/rc.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(deprecated)] //! Single-threaded reference-counting pointers. 'Rc' stands for 'Reference diff --git a/src/liballoc/slice.rs b/src/liballoc/slice.rs index 9d442b3e00ca0..3480aaba6984d 100644 --- a/src/liballoc/slice.rs +++ b/src/liballoc/slice.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A dynamically-sized view into a contiguous sequence, `[T]`. //! //! *[See also the slice primitive type](../../std/primitive.slice.html).* diff --git a/src/liballoc/str.rs b/src/liballoc/str.rs index 870bf971cd3f6..cf5ad2c250527 100644 --- a/src/liballoc/str.rs +++ b/src/liballoc/str.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Unicode string slices. //! //! *[See also the `str` primitive type](../../std/primitive.str.html).* diff --git a/src/liballoc/string.rs b/src/liballoc/string.rs index eabda7123dec0..89294fdc639cf 100644 --- a/src/liballoc/string.rs +++ b/src/liballoc/string.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A UTF-8 encoded, growable string. //! //! This module contains the [`String`] type, a trait for converting diff --git a/src/liballoc/sync.rs b/src/liballoc/sync.rs index 2cd7898f4c781..8a97b8b400476 100644 --- a/src/liballoc/sync.rs +++ b/src/liballoc/sync.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![stable(feature = "rust1", since = "1.0.0")] //! Thread-safe reference-counting pointers. diff --git a/src/liballoc/task.rs b/src/liballoc/task.rs index 7a4eda21a601a..604c56dd01762 100644 --- a/src/liballoc/task.rs +++ b/src/liballoc/task.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Types and Traits for working with asynchronous tasks. pub use core::task::*; diff --git a/src/liballoc/tests/arc.rs b/src/liballoc/tests/arc.rs index d90c22a3b1892..6f36479366cd2 100644 --- a/src/liballoc/tests/arc.rs +++ b/src/liballoc/tests/arc.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::any::Any; use std::sync::{Arc, Weak}; diff --git a/src/liballoc/tests/binary_heap.rs b/src/liballoc/tests/binary_heap.rs index 8494463463cb9..c1f808fd39085 100644 --- a/src/liballoc/tests/binary_heap.rs +++ b/src/liballoc/tests/binary_heap.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cmp; use std::collections::BinaryHeap; use std::collections::binary_heap::{Drain, PeekMut}; diff --git a/src/liballoc/tests/btree/map.rs b/src/liballoc/tests/btree/map.rs index 6ebdb86cc4a98..d283ea31205f8 100644 --- a/src/liballoc/tests/btree/map.rs +++ b/src/liballoc/tests/btree/map.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::BTreeMap; use std::collections::btree_map::Entry::{Occupied, Vacant}; use std::ops::Bound::{self, Excluded, Included, Unbounded}; diff --git a/src/liballoc/tests/btree/mod.rs b/src/liballoc/tests/btree/mod.rs index ae8b18d0c9fd9..4c704d0f8c28f 100644 --- a/src/liballoc/tests/btree/mod.rs +++ b/src/liballoc/tests/btree/mod.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod map; mod set; diff --git a/src/liballoc/tests/btree/set.rs b/src/liballoc/tests/btree/set.rs index 0330bda5e3238..e24c04fd8acb3 100644 --- a/src/liballoc/tests/btree/set.rs +++ b/src/liballoc/tests/btree/set.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::BTreeSet; use std::iter::FromIterator; diff --git a/src/liballoc/tests/cow_str.rs b/src/liballoc/tests/cow_str.rs index 63939686ab7c2..eb6adb159b0fd 100644 --- a/src/liballoc/tests/cow_str.rs +++ b/src/liballoc/tests/cow_str.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::borrow::Cow; // check that Cow<'a, str> implements addition diff --git a/src/liballoc/tests/fmt.rs b/src/liballoc/tests/fmt.rs index 70e21c65a1806..0ad092b4997f4 100644 --- a/src/liballoc/tests/fmt.rs +++ b/src/liballoc/tests/fmt.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt; #[test] diff --git a/src/liballoc/tests/heap.rs b/src/liballoc/tests/heap.rs index 6fa88ce969a0e..ba2d40e7abcbc 100644 --- a/src/liballoc/tests/heap.rs +++ b/src/liballoc/tests/heap.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use alloc_system::System; use std::alloc::{Global, Alloc, Layout}; diff --git a/src/liballoc/tests/lib.rs b/src/liballoc/tests/lib.rs index 3a84f9e7e47ba..6ae9f26cd151c 100644 --- a/src/liballoc/tests/lib.rs +++ b/src/liballoc/tests/lib.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(allocator_api)] #![feature(alloc_system)] #![feature(box_syntax)] diff --git a/src/liballoc/tests/linked_list.rs b/src/liballoc/tests/linked_list.rs index 4e3e855105eb8..6e775f9650d12 100644 --- a/src/liballoc/tests/linked_list.rs +++ b/src/liballoc/tests/linked_list.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::LinkedList; #[test] diff --git a/src/liballoc/tests/rc.rs b/src/liballoc/tests/rc.rs index 9ec7c831444d1..2b2a9e688308c 100644 --- a/src/liballoc/tests/rc.rs +++ b/src/liballoc/tests/rc.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::any::Any; use std::rc::{Rc, Weak}; diff --git a/src/liballoc/tests/slice.rs b/src/liballoc/tests/slice.rs index df5e18a9a184e..71034efb145a5 100644 --- a/src/liballoc/tests/slice.rs +++ b/src/liballoc/tests/slice.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cell::Cell; use std::cmp::Ordering::{Equal, Greater, Less}; use std::cmp::Ordering; diff --git a/src/liballoc/tests/str.rs b/src/liballoc/tests/str.rs index 6275c7bb11206..4acbabbd09fdb 100644 --- a/src/liballoc/tests/str.rs +++ b/src/liballoc/tests/str.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::borrow::Cow; use std::cmp::Ordering::{Equal, Greater, Less}; use std::str::from_utf8; diff --git a/src/liballoc/tests/string.rs b/src/liballoc/tests/string.rs index befb36baeef1e..8a5bfca8b7db5 100644 --- a/src/liballoc/tests/string.rs +++ b/src/liballoc/tests/string.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::borrow::Cow; use std::collections::CollectionAllocErr::*; use std::mem::size_of; diff --git a/src/liballoc/tests/vec.rs b/src/liballoc/tests/vec.rs index e329b45a6175d..e98a19fca01cc 100644 --- a/src/liballoc/tests/vec.rs +++ b/src/liballoc/tests/vec.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::borrow::Cow; use std::mem::size_of; use std::{usize, isize}; diff --git a/src/liballoc/tests/vec_deque.rs b/src/liballoc/tests/vec_deque.rs index 3ea6c87a65169..7c3e059f2bce0 100644 --- a/src/liballoc/tests/vec_deque.rs +++ b/src/liballoc/tests/vec_deque.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::VecDeque; use std::fmt::Debug; use std::collections::vec_deque::{Drain}; diff --git a/src/liballoc/vec.rs b/src/liballoc/vec.rs index e9c1a3df51891..64850007ab345 100644 --- a/src/liballoc/vec.rs +++ b/src/liballoc/vec.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A contiguous growable array type with heap-allocated contents, written //! `Vec`. //! diff --git a/src/liballoc_jemalloc/build.rs b/src/liballoc_jemalloc/build.rs index fbda425a70bf5..3c7852eecef6f 100644 --- a/src/liballoc_jemalloc/build.rs +++ b/src/liballoc_jemalloc/build.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(warnings)] extern crate build_helper; diff --git a/src/liballoc_jemalloc/lib.rs b/src/liballoc_jemalloc/lib.rs index 480a24b9bd1f2..50451cfe78753 100644 --- a/src/liballoc_jemalloc/lib.rs +++ b/src/liballoc_jemalloc/lib.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![no_std] #![allow(unused_attributes)] #![unstable(feature = "alloc_jemalloc", diff --git a/src/liballoc_system/lib.rs b/src/liballoc_system/lib.rs index 753b6a5e29248..2cb6a143e5637 100644 --- a/src/liballoc_system/lib.rs +++ b/src/liballoc_system/lib.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![no_std] #![allow(unused_attributes)] #![unstable(feature = "alloc_system", diff --git a/src/libarena/lib.rs b/src/libarena/lib.rs index 6ad703180c224..0dc1a8a618749 100644 --- a/src/libarena/lib.rs +++ b/src/libarena/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The arena, a fast but limited type of allocator. //! //! Arenas are a type of allocator that destroy the objects within, all at diff --git a/src/libcore/alloc.rs b/src/libcore/alloc.rs index 35e4eea756d41..5c7d6107fc07e 100644 --- a/src/libcore/alloc.rs +++ b/src/libcore/alloc.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Memory allocation APIs #![stable(feature = "alloc_module", since = "1.28.0")] diff --git a/src/libcore/any.rs b/src/libcore/any.rs index 6b26093439e4f..79165935a929f 100644 --- a/src/libcore/any.rs +++ b/src/libcore/any.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This module implements the `Any` trait, which enables dynamic typing //! of any `'static` type through runtime reflection. //! diff --git a/src/libcore/array.rs b/src/libcore/array.rs index 3d24f8902bd83..7590c55fbff7b 100644 --- a/src/libcore/array.rs +++ b/src/libcore/array.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Implementations of things like `Eq` for fixed-length arrays //! up to a certain length. Eventually we should able to generalize //! to all lengths. diff --git a/src/libcore/ascii.rs b/src/libcore/ascii.rs index 6ee91e0b22ff0..7a06aa2b0d397 100644 --- a/src/libcore/ascii.rs +++ b/src/libcore/ascii.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Operations on ASCII strings and characters. //! //! Most string operations in Rust act on UTF-8 strings. However, at times it diff --git a/src/libcore/benches/any.rs b/src/libcore/benches/any.rs index 67e02cf9509b6..261b130d0da4e 100644 --- a/src/libcore/benches/any.rs +++ b/src/libcore/benches/any.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use core::any::*; use test::{Bencher, black_box}; diff --git a/src/libcore/benches/hash/mod.rs b/src/libcore/benches/hash/mod.rs index 55d9e3e091380..4f2e152b69526 100644 --- a/src/libcore/benches/hash/mod.rs +++ b/src/libcore/benches/hash/mod.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod sip; diff --git a/src/libcore/benches/hash/sip.rs b/src/libcore/benches/hash/sip.rs index 3379c85bbec7d..5baba42763e10 100644 --- a/src/libcore/benches/hash/sip.rs +++ b/src/libcore/benches/hash/sip.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(deprecated)] use core::hash::*; diff --git a/src/libcore/benches/iter.rs b/src/libcore/benches/iter.rs index 6c597301ac204..5821f76e23d82 100644 --- a/src/libcore/benches/iter.rs +++ b/src/libcore/benches/iter.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use core::iter::*; use test::{Bencher, black_box}; diff --git a/src/libcore/benches/lib.rs b/src/libcore/benches/lib.rs index ced77d779182a..9ca6a7e229d22 100644 --- a/src/libcore/benches/lib.rs +++ b/src/libcore/benches/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(flt2dec)] #![feature(test)] diff --git a/src/libcore/benches/num/dec2flt/mod.rs b/src/libcore/benches/num/dec2flt/mod.rs index 562866e11777c..561a4bee87ad9 100644 --- a/src/libcore/benches/num/dec2flt/mod.rs +++ b/src/libcore/benches/num/dec2flt/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::f64; use test::Bencher; diff --git a/src/libcore/benches/num/flt2dec/mod.rs b/src/libcore/benches/num/flt2dec/mod.rs index 7f3b98a1c7614..4153745d0424a 100644 --- a/src/libcore/benches/num/flt2dec/mod.rs +++ b/src/libcore/benches/num/flt2dec/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod strategy { mod dragon; mod grisu; diff --git a/src/libcore/benches/num/flt2dec/strategy/dragon.rs b/src/libcore/benches/num/flt2dec/strategy/dragon.rs index 6824cf40ed2ae..60660b1da1118 100644 --- a/src/libcore/benches/num/flt2dec/strategy/dragon.rs +++ b/src/libcore/benches/num/flt2dec/strategy/dragon.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::{i16, f64}; use super::super::*; use core::num::flt2dec::strategy::dragon::*; diff --git a/src/libcore/benches/num/flt2dec/strategy/grisu.rs b/src/libcore/benches/num/flt2dec/strategy/grisu.rs index 82e1a858fca9f..841feba50dd5b 100644 --- a/src/libcore/benches/num/flt2dec/strategy/grisu.rs +++ b/src/libcore/benches/num/flt2dec/strategy/grisu.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::{i16, f64}; use super::super::*; use core::num::flt2dec::strategy::grisu::*; diff --git a/src/libcore/benches/num/mod.rs b/src/libcore/benches/num/mod.rs index 55f0bdb57ec82..46bf691bd9b7a 100644 --- a/src/libcore/benches/num/mod.rs +++ b/src/libcore/benches/num/mod.rs @@ -1,12 +1,2 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod flt2dec; mod dec2flt; diff --git a/src/libcore/benches/ops.rs b/src/libcore/benches/ops.rs index 7f36a4b0771aa..80649f33562f2 100644 --- a/src/libcore/benches/ops.rs +++ b/src/libcore/benches/ops.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use core::ops::*; use test::Bencher; diff --git a/src/libcore/benches/slice.rs b/src/libcore/benches/slice.rs index b2fc74544f1df..484753c1a045e 100644 --- a/src/libcore/benches/slice.rs +++ b/src/libcore/benches/slice.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use test::black_box; use test::Bencher; diff --git a/src/libcore/borrow.rs b/src/libcore/borrow.rs index f45a32d4b94ac..ae78dc3c8ded4 100644 --- a/src/libcore/borrow.rs +++ b/src/libcore/borrow.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A module for working with borrowed data. #![stable(feature = "rust1", since = "1.0.0")] diff --git a/src/libcore/cell.rs b/src/libcore/cell.rs index 009aba5f59869..ff48172fbf5e8 100644 --- a/src/libcore/cell.rs +++ b/src/libcore/cell.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Shareable mutable containers. //! //! Rust memory safety is based on this rule: Given an object `T`, it is only possible to diff --git a/src/libcore/char/convert.rs b/src/libcore/char/convert.rs index 803a924eb3a46..96fdf26573810 100644 --- a/src/libcore/char/convert.rs +++ b/src/libcore/char/convert.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Character conversions. use convert::TryFrom; diff --git a/src/libcore/char/decode.rs b/src/libcore/char/decode.rs index cc52f048b891b..510c46cdca0ed 100644 --- a/src/libcore/char/decode.rs +++ b/src/libcore/char/decode.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! UTF-8 and UTF-16 decoding iterators use fmt; diff --git a/src/libcore/char/methods.rs b/src/libcore/char/methods.rs index 64a17786b0a6b..78751dbd3f788 100644 --- a/src/libcore/char/methods.rs +++ b/src/libcore/char/methods.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! impl char {} use slice; diff --git a/src/libcore/char/mod.rs b/src/libcore/char/mod.rs index 7e1313747eef2..a189cadfe8fb0 100644 --- a/src/libcore/char/mod.rs +++ b/src/libcore/char/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A character type. //! //! The `char` type represents a single character. More specifically, since diff --git a/src/libcore/clone.rs b/src/libcore/clone.rs index 3b15ba2b4ab1f..cd51440235be9 100644 --- a/src/libcore/clone.rs +++ b/src/libcore/clone.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The `Clone` trait for types that cannot be 'implicitly copied'. //! //! In Rust, some simple types are "implicitly copyable" and when you diff --git a/src/libcore/cmp.rs b/src/libcore/cmp.rs index 58d6c4f5e0923..2e1955a7decb4 100644 --- a/src/libcore/cmp.rs +++ b/src/libcore/cmp.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Functionality for ordering and comparison. //! //! This module defines both [`PartialOrd`] and [`PartialEq`] traits which are used diff --git a/src/libcore/convert.rs b/src/libcore/convert.rs index d5337868843df..1220694dcf894 100644 --- a/src/libcore/convert.rs +++ b/src/libcore/convert.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Traits for conversions between types. //! //! The traits in this module provide a general way to talk about conversions diff --git a/src/libcore/default.rs b/src/libcore/default.rs index ab36e29b1e1d4..5fc05fedf40a4 100644 --- a/src/libcore/default.rs +++ b/src/libcore/default.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The `Default` trait for types which may have meaningful default values. #![stable(feature = "rust1", since = "1.0.0")] diff --git a/src/libcore/fmt/builders.rs b/src/libcore/fmt/builders.rs index 3c5f934d4d8c7..a8fe0200b89ea 100644 --- a/src/libcore/fmt/builders.rs +++ b/src/libcore/fmt/builders.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use fmt; struct PadAdapter<'a> { diff --git a/src/libcore/fmt/float.rs b/src/libcore/fmt/float.rs index 03e7a9a49d8a7..5e8d8660a9f8f 100644 --- a/src/libcore/fmt/float.rs +++ b/src/libcore/fmt/float.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use fmt::{Formatter, Result, LowerExp, UpperExp, Display, Debug}; use mem; use num::flt2dec; diff --git a/src/libcore/fmt/mod.rs b/src/libcore/fmt/mod.rs index 928f95e3ba2ea..212b43264a83b 100644 --- a/src/libcore/fmt/mod.rs +++ b/src/libcore/fmt/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Utilities for formatting and printing strings. #![stable(feature = "rust1", since = "1.0.0")] diff --git a/src/libcore/fmt/num.rs b/src/libcore/fmt/num.rs index 51391fa50d56f..c7c8fc50efaae 100644 --- a/src/libcore/fmt/num.rs +++ b/src/libcore/fmt/num.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Integer and floating-point number formatting #![allow(deprecated)] diff --git a/src/libcore/fmt/rt/v1.rs b/src/libcore/fmt/rt/v1.rs index ec7add9c3759f..826ae36d2d100 100644 --- a/src/libcore/fmt/rt/v1.rs +++ b/src/libcore/fmt/rt/v1.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This is an internal module used by the ifmt! runtime. These structures are //! emitted to static arrays to precompile format strings ahead of time. //! diff --git a/src/libcore/future/future.rs b/src/libcore/future/future.rs index 10b4ca9b0b27a..99ed19312985b 100644 --- a/src/libcore/future/future.rs +++ b/src/libcore/future/future.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![unstable(feature = "futures_api", reason = "futures in libcore are unstable", issue = "50547")] diff --git a/src/libcore/future/future_obj.rs b/src/libcore/future/future_obj.rs index 2df870a011dcb..4b5b67aae6f99 100644 --- a/src/libcore/future/future_obj.rs +++ b/src/libcore/future/future_obj.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![unstable(feature = "futures_api", reason = "futures in libcore are unstable", issue = "50547")] diff --git a/src/libcore/future/mod.rs b/src/libcore/future/mod.rs index f9361a0f4e7a3..64ad34539c0c5 100644 --- a/src/libcore/future/mod.rs +++ b/src/libcore/future/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![unstable(feature = "futures_api", reason = "futures in libcore are unstable", issue = "50547")] diff --git a/src/libcore/hash/mod.rs b/src/libcore/hash/mod.rs index e7907e0344493..6f5750b7e519e 100644 --- a/src/libcore/hash/mod.rs +++ b/src/libcore/hash/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Generic hashing support. //! //! This module provides a generic way to compute the hash of a value. The diff --git a/src/libcore/hash/sip.rs b/src/libcore/hash/sip.rs index e3bdecdc4b1fd..3377b831a9daa 100644 --- a/src/libcore/hash/sip.rs +++ b/src/libcore/hash/sip.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! An implementation of SipHash. #![allow(deprecated)] diff --git a/src/libcore/hint.rs b/src/libcore/hint.rs index f4e96e67b2c66..fe8c88cad5ab2 100644 --- a/src/libcore/hint.rs +++ b/src/libcore/hint.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![stable(feature = "core_hint", since = "1.27.0")] //! Hints to compiler that affects how code should be emitted or optimized. diff --git a/src/libcore/internal_macros.rs b/src/libcore/internal_macros.rs index db75f9bf210fc..d12800f712483 100644 --- a/src/libcore/internal_macros.rs +++ b/src/libcore/internal_macros.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // implements the unary operator "op &T" // based on "op T" where T is expected to be `Copy`able macro_rules! forward_ref_unop { diff --git a/src/libcore/intrinsics.rs b/src/libcore/intrinsics.rs index 7756a6f71dbd6..bce0053990c7a 100644 --- a/src/libcore/intrinsics.rs +++ b/src/libcore/intrinsics.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! rustc compiler intrinsics. //! //! The corresponding definitions are in librustc_codegen_llvm/intrinsic.rs. diff --git a/src/libcore/iter/iterator.rs b/src/libcore/iter/iterator.rs index 3918529105334..faa531b32e73f 100644 --- a/src/libcore/iter/iterator.rs +++ b/src/libcore/iter/iterator.rs @@ -1,13 +1,3 @@ -// Copyright 2013-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use cmp::Ordering; use ops::Try; diff --git a/src/libcore/iter/mod.rs b/src/libcore/iter/mod.rs index ef3f4ced4f9b2..6e1085da559ad 100644 --- a/src/libcore/iter/mod.rs +++ b/src/libcore/iter/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2013-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Composable external iteration. //! //! If you've found yourself with a collection of some kind, and needed to diff --git a/src/libcore/iter/range.rs b/src/libcore/iter/range.rs index 651c7a35d413c..e1a28898e7fea 100644 --- a/src/libcore/iter/range.rs +++ b/src/libcore/iter/range.rs @@ -1,13 +1,3 @@ -// Copyright 2013-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use convert::TryFrom; use mem; use ops::{self, Add, Sub}; diff --git a/src/libcore/iter/sources.rs b/src/libcore/iter/sources.rs index d500cc99fa13c..bfae5a66c5add 100644 --- a/src/libcore/iter/sources.rs +++ b/src/libcore/iter/sources.rs @@ -1,13 +1,3 @@ -// Copyright 2013-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use fmt; use marker; use usize; diff --git a/src/libcore/iter/traits.rs b/src/libcore/iter/traits.rs index 4b2c1aa551e99..29623643b2819 100644 --- a/src/libcore/iter/traits.rs +++ b/src/libcore/iter/traits.rs @@ -1,12 +1,3 @@ -// Copyright 2013-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. use ops::{Mul, Add, Try}; use num::Wrapping; diff --git a/src/libcore/iter_private.rs b/src/libcore/iter_private.rs index c4d54d2c7b81d..890db47b19700 100644 --- a/src/libcore/iter_private.rs +++ b/src/libcore/iter_private.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - /// An iterator whose items are random accessible efficiently /// /// # Safety diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs index b2ffc9d77d771..09bb33f940fca 100644 --- a/src/libcore/lib.rs +++ b/src/libcore/lib.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! # The Rust Core Library //! //! The Rust Core Library is the dependency-free[^free] foundation of [The diff --git a/src/libcore/macros.rs b/src/libcore/macros.rs index 5b3b2d1635688..a2e4325327cf9 100644 --- a/src/libcore/macros.rs +++ b/src/libcore/macros.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// Entry point of thread panic, for details, see std::macros #[macro_export] #[allow_internal_unstable] diff --git a/src/libcore/marker.rs b/src/libcore/marker.rs index b1dc84bb84cb8..4593b2cd177e5 100644 --- a/src/libcore/marker.rs +++ b/src/libcore/marker.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Primitive traits and types representing basic properties of types. //! //! Rust types can be classified in various useful ways according to diff --git a/src/libcore/mem.rs b/src/libcore/mem.rs index ea711c69393a4..e543f4c285753 100644 --- a/src/libcore/mem.rs +++ b/src/libcore/mem.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Basic functions for dealing with memory. //! //! This module contains functions for querying the size and alignment of diff --git a/src/libcore/nonzero.rs b/src/libcore/nonzero.rs index cc36ea7f71391..b68c454287a25 100644 --- a/src/libcore/nonzero.rs +++ b/src/libcore/nonzero.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Exposes the NonZero lang item which provides optimization hints. use ops::CoerceUnsized; diff --git a/src/libcore/num/bignum.rs b/src/libcore/num/bignum.rs index 732a02e8c427d..98525cab14291 100644 --- a/src/libcore/num/bignum.rs +++ b/src/libcore/num/bignum.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Custom arbitrary-precision number (bignum) implementation. //! //! This is designed to avoid the heap allocation at expense of stack memory. diff --git a/src/libcore/num/dec2flt/algorithm.rs b/src/libcore/num/dec2flt/algorithm.rs index ccf3950c2ba39..b1d8d2cabd84f 100644 --- a/src/libcore/num/dec2flt/algorithm.rs +++ b/src/libcore/num/dec2flt/algorithm.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The various algorithms from the paper. use cmp::min; diff --git a/src/libcore/num/dec2flt/mod.rs b/src/libcore/num/dec2flt/mod.rs index f93564c2849f5..58b196a6eac3d 100644 --- a/src/libcore/num/dec2flt/mod.rs +++ b/src/libcore/num/dec2flt/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Converting decimal strings into IEEE 754 binary floating point numbers. //! //! # Problem statement diff --git a/src/libcore/num/dec2flt/num.rs b/src/libcore/num/dec2flt/num.rs index 34b41fa9decd2..b76c58cc66e6b 100644 --- a/src/libcore/num/dec2flt/num.rs +++ b/src/libcore/num/dec2flt/num.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Utility functions for bignums that don't make too much sense to turn into methods. // FIXME This module's name is a bit unfortunate, since other modules also import `core::num`. diff --git a/src/libcore/num/dec2flt/parse.rs b/src/libcore/num/dec2flt/parse.rs index e7ed94d4d91c2..9e075e43303b6 100644 --- a/src/libcore/num/dec2flt/parse.rs +++ b/src/libcore/num/dec2flt/parse.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Validating and decomposing a decimal string of the form: //! //! `(digits | digits? '.'? digits?) (('e' | 'E') ('+' | '-')? digits)?` diff --git a/src/libcore/num/dec2flt/rawfp.rs b/src/libcore/num/dec2flt/rawfp.rs index 38f4e4687a99b..2c2423ad363f9 100644 --- a/src/libcore/num/dec2flt/rawfp.rs +++ b/src/libcore/num/dec2flt/rawfp.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Bit fiddling on positive IEEE 754 floats. Negative numbers aren't and needn't be handled. //! Normal floating point numbers have a canonical representation as (frac, exp) such that the //! value is 2exp * (1 + sum(frac[N-i] / 2i)) where N is the number of bits. diff --git a/src/libcore/num/dec2flt/table.rs b/src/libcore/num/dec2flt/table.rs index cb8c94313d030..345ac830aaa77 100644 --- a/src/libcore/num/dec2flt/table.rs +++ b/src/libcore/num/dec2flt/table.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Tables of approximations of powers of ten. //! DO NOT MODIFY: Generated by `src/etc/dec2flt_table.py` diff --git a/src/libcore/num/diy_float.rs b/src/libcore/num/diy_float.rs index b0561da5934c0..cdf332989492f 100644 --- a/src/libcore/num/diy_float.rs +++ b/src/libcore/num/diy_float.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Extended precision "soft float", for internal use only. // This module is only for dec2flt and flt2dec, and only public because of coretests. diff --git a/src/libcore/num/f32.rs b/src/libcore/num/f32.rs index 577c823f9a060..3c1a47692b8d9 100644 --- a/src/libcore/num/f32.rs +++ b/src/libcore/num/f32.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This module provides constants which are specific to the implementation //! of the `f32` floating point data type. //! diff --git a/src/libcore/num/f64.rs b/src/libcore/num/f64.rs index b8e3dd6ed646c..8ada5b6756c38 100644 --- a/src/libcore/num/f64.rs +++ b/src/libcore/num/f64.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This module provides constants which are specific to the implementation //! of the `f64` floating point data type. //! diff --git a/src/libcore/num/flt2dec/decoder.rs b/src/libcore/num/flt2dec/decoder.rs index c34a56f288fd4..a3bf783976bbd 100644 --- a/src/libcore/num/flt2dec/decoder.rs +++ b/src/libcore/num/flt2dec/decoder.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Decodes a floating-point value into individual parts and error ranges. use {f32, f64}; diff --git a/src/libcore/num/flt2dec/estimator.rs b/src/libcore/num/flt2dec/estimator.rs index d42e05a91f140..baf9c022f3baf 100644 --- a/src/libcore/num/flt2dec/estimator.rs +++ b/src/libcore/num/flt2dec/estimator.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The exponent estimator. /// Finds `k_0` such that `10^(k_0-1) < mant * 2^exp <= 10^(k_0+1)`. diff --git a/src/libcore/num/flt2dec/mod.rs b/src/libcore/num/flt2dec/mod.rs index 21a2e72dac8c3..a454c753895b7 100644 --- a/src/libcore/num/flt2dec/mod.rs +++ b/src/libcore/num/flt2dec/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /*! Floating-point number to decimal conversion routines. diff --git a/src/libcore/num/flt2dec/strategy/dragon.rs b/src/libcore/num/flt2dec/strategy/dragon.rs index aa6a08cb2057e..14e5c0e866a70 100644 --- a/src/libcore/num/flt2dec/strategy/dragon.rs +++ b/src/libcore/num/flt2dec/strategy/dragon.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Almost direct (but slightly optimized) Rust translation of Figure 3 of "Printing //! Floating-Point Numbers Quickly and Accurately"[^1]. //! diff --git a/src/libcore/num/flt2dec/strategy/grisu.rs b/src/libcore/num/flt2dec/strategy/grisu.rs index effe073c3816c..742d6fb3fffe6 100644 --- a/src/libcore/num/flt2dec/strategy/grisu.rs +++ b/src/libcore/num/flt2dec/strategy/grisu.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Rust adaptation of the Grisu3 algorithm described in "Printing Floating-Point Numbers Quickly //! and Accurately with Integers"[^1]. It uses about 1KB of precomputed table, and in turn, it's //! very quick for most inputs. diff --git a/src/libcore/num/i128.rs b/src/libcore/num/i128.rs index 989376d1ac2d2..564ed598a882c 100644 --- a/src/libcore/num/i128.rs +++ b/src/libcore/num/i128.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The 128-bit signed integer type. //! //! *[See also the `i128` primitive type](../../std/primitive.i128.html).* diff --git a/src/libcore/num/i16.rs b/src/libcore/num/i16.rs index 0f3a5baa2dd9e..44d6aaef25ba0 100644 --- a/src/libcore/num/i16.rs +++ b/src/libcore/num/i16.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The 16-bit signed integer type. //! //! *[See also the `i16` primitive type](../../std/primitive.i16.html).* diff --git a/src/libcore/num/i32.rs b/src/libcore/num/i32.rs index ea8b3a9145c6e..90a5f89195e31 100644 --- a/src/libcore/num/i32.rs +++ b/src/libcore/num/i32.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The 32-bit signed integer type. //! //! *[See also the `i32` primitive type](../../std/primitive.i32.html).* diff --git a/src/libcore/num/i64.rs b/src/libcore/num/i64.rs index aa21b1190aef5..04a8a9d757915 100644 --- a/src/libcore/num/i64.rs +++ b/src/libcore/num/i64.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The 64-bit signed integer type. //! //! *[See also the `i64` primitive type](../../std/primitive.i64.html).* diff --git a/src/libcore/num/i8.rs b/src/libcore/num/i8.rs index 1bed4861594c9..5a52a967cf96d 100644 --- a/src/libcore/num/i8.rs +++ b/src/libcore/num/i8.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The 8-bit signed integer type. //! //! *[See also the `i8` primitive type](../../std/primitive.i8.html).* diff --git a/src/libcore/num/int_macros.rs b/src/libcore/num/int_macros.rs index 3b1612a4ee29f..5c59fe25f6483 100644 --- a/src/libcore/num/int_macros.rs +++ b/src/libcore/num/int_macros.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![doc(hidden)] macro_rules! int_module { diff --git a/src/libcore/num/isize.rs b/src/libcore/num/isize.rs index e0917f79c43dc..143f8b3b272d6 100644 --- a/src/libcore/num/isize.rs +++ b/src/libcore/num/isize.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The pointer-sized signed integer type. //! //! *[See also the `isize` primitive type](../../std/primitive.isize.html).* diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs index b93428c6321f6..ac0b23e87f789 100644 --- a/src/libcore/num/mod.rs +++ b/src/libcore/num/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Numeric traits and functions for the built-in numeric types. #![stable(feature = "rust1", since = "1.0.0")] diff --git a/src/libcore/num/u128.rs b/src/libcore/num/u128.rs index e8c783a1bb542..7d1aa664de30c 100644 --- a/src/libcore/num/u128.rs +++ b/src/libcore/num/u128.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The 128-bit unsigned integer type. //! //! *[See also the `u128` primitive type](../../std/primitive.u128.html).* diff --git a/src/libcore/num/u16.rs b/src/libcore/num/u16.rs index 9c318216f1fba..34f80abaecc05 100644 --- a/src/libcore/num/u16.rs +++ b/src/libcore/num/u16.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The 16-bit unsigned integer type. //! //! *[See also the `u16` primitive type](../../std/primitive.u16.html).* diff --git a/src/libcore/num/u32.rs b/src/libcore/num/u32.rs index 84367c2073833..5fd486f546608 100644 --- a/src/libcore/num/u32.rs +++ b/src/libcore/num/u32.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The 32-bit unsigned integer type. //! //! *[See also the `u32` primitive type](../../std/primitive.u32.html).* diff --git a/src/libcore/num/u64.rs b/src/libcore/num/u64.rs index cc48a28b22f69..044d238aea9be 100644 --- a/src/libcore/num/u64.rs +++ b/src/libcore/num/u64.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The 64-bit unsigned integer type. //! //! *[See also the `u64` primitive type](../../std/primitive.u64.html).* diff --git a/src/libcore/num/u8.rs b/src/libcore/num/u8.rs index 6c0daa7763ae1..6747e6a0f6c24 100644 --- a/src/libcore/num/u8.rs +++ b/src/libcore/num/u8.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The 8-bit unsigned integer type. //! //! *[See also the `u8` primitive type](../../std/primitive.u8.html).* diff --git a/src/libcore/num/uint_macros.rs b/src/libcore/num/uint_macros.rs index f7e1f78d69ebf..a94b541ddb907 100644 --- a/src/libcore/num/uint_macros.rs +++ b/src/libcore/num/uint_macros.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![doc(hidden)] macro_rules! uint_module { diff --git a/src/libcore/num/usize.rs b/src/libcore/num/usize.rs index 0b6f1c73c5834..e3a5239d908dc 100644 --- a/src/libcore/num/usize.rs +++ b/src/libcore/num/usize.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The pointer-sized unsigned integer type. //! //! *[See also the `usize` primitive type](../../std/primitive.usize.html).* diff --git a/src/libcore/num/wrapping.rs b/src/libcore/num/wrapping.rs index 1c826c2fa76bd..252707c141c56 100644 --- a/src/libcore/num/wrapping.rs +++ b/src/libcore/num/wrapping.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::Wrapping; use ops::*; diff --git a/src/libcore/ops/arith.rs b/src/libcore/ops/arith.rs index a1bc5463f7333..7d8bf18d33a01 100644 --- a/src/libcore/ops/arith.rs +++ b/src/libcore/ops/arith.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// The addition operator `+`. /// /// Note that `RHS` is `Self` by default, but this is not mandatory. For diff --git a/src/libcore/ops/bit.rs b/src/libcore/ops/bit.rs index 3900f365b0ab1..2c9bf248633c4 100644 --- a/src/libcore/ops/bit.rs +++ b/src/libcore/ops/bit.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// The unary logical negation operator `!`. /// /// # Examples diff --git a/src/libcore/ops/deref.rs b/src/libcore/ops/deref.rs index 54eecc82e19ef..25c802fa5543f 100644 --- a/src/libcore/ops/deref.rs +++ b/src/libcore/ops/deref.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// Used for immutable dereferencing operations, like `*v`. /// /// In addition to being used for explicit dereferencing operations with the diff --git a/src/libcore/ops/drop.rs b/src/libcore/ops/drop.rs index 474f7e34c3470..8d16fdebb3e73 100644 --- a/src/libcore/ops/drop.rs +++ b/src/libcore/ops/drop.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// Used to run some code when a value goes out of scope. /// This is sometimes called a 'destructor'. /// diff --git a/src/libcore/ops/function.rs b/src/libcore/ops/function.rs index 3ebd10a920919..b39c72431350f 100644 --- a/src/libcore/ops/function.rs +++ b/src/libcore/ops/function.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// The version of the call operator that takes an immutable receiver. /// /// Instances of `Fn` can be called repeatedly without mutating state. diff --git a/src/libcore/ops/generator.rs b/src/libcore/ops/generator.rs index 4b70c5398be4f..cbbaebe4a4a49 100644 --- a/src/libcore/ops/generator.rs +++ b/src/libcore/ops/generator.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// The result of a generator resumption. /// /// This enum is returned from the `Generator::resume` method and indicates the diff --git a/src/libcore/ops/index.rs b/src/libcore/ops/index.rs index 1ac80ecc96ffe..4f55c68ecd4ae 100644 --- a/src/libcore/ops/index.rs +++ b/src/libcore/ops/index.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// Used for indexing operations (`container[index]`) in immutable contexts. /// /// `container[index]` is actually syntactic sugar for `*container.index(index)`, diff --git a/src/libcore/ops/mod.rs b/src/libcore/ops/mod.rs index ce4f45762de48..fb5e8acdcb193 100644 --- a/src/libcore/ops/mod.rs +++ b/src/libcore/ops/mod.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Overloadable operators. //! //! Implementing these traits allows you to overload certain operators. diff --git a/src/libcore/ops/range.rs b/src/libcore/ops/range.rs index 9c635678d7aa0..51f9b0b696234 100644 --- a/src/libcore/ops/range.rs +++ b/src/libcore/ops/range.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use fmt; use hash::{Hash, Hasher}; diff --git a/src/libcore/ops/try.rs b/src/libcore/ops/try.rs index 4f2d30aa6a8a7..380bd12131cf6 100644 --- a/src/libcore/ops/try.rs +++ b/src/libcore/ops/try.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// A trait for customizing the behavior of the `?` operator. /// /// A type implementing `Try` is one that has a canonical way to view it diff --git a/src/libcore/ops/unsize.rs b/src/libcore/ops/unsize.rs index da72f3748425d..f12c2e901c21b 100644 --- a/src/libcore/ops/unsize.rs +++ b/src/libcore/ops/unsize.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use marker::Unsize; /// Trait that indicates that this is a pointer or a wrapper for one, diff --git a/src/libcore/option.rs b/src/libcore/option.rs index f743fbfd0752b..e842a37f54a09 100644 --- a/src/libcore/option.rs +++ b/src/libcore/option.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Optional values. //! //! Type [`Option`] represents an optional value: every [`Option`] diff --git a/src/libcore/panic.rs b/src/libcore/panic.rs index 17cac5aa0a05f..e08bdec662526 100644 --- a/src/libcore/panic.rs +++ b/src/libcore/panic.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Panic support in the standard library. #![unstable(feature = "core_panic_info", diff --git a/src/libcore/panicking.rs b/src/libcore/panicking.rs index 58407de9566e9..636773792ea56 100644 --- a/src/libcore/panicking.rs +++ b/src/libcore/panicking.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Panic support for libcore //! //! The core library cannot define panicking, but it does *declare* panicking. This diff --git a/src/libcore/prelude/mod.rs b/src/libcore/prelude/mod.rs index 99b1947c84e4f..51f4acf068580 100644 --- a/src/libcore/prelude/mod.rs +++ b/src/libcore/prelude/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The libcore prelude #![stable(feature = "core_prelude", since = "1.4.0")] diff --git a/src/libcore/prelude/v1.rs b/src/libcore/prelude/v1.rs index 45f629a64424c..02a4e81f89f23 100644 --- a/src/libcore/prelude/v1.rs +++ b/src/libcore/prelude/v1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The core prelude //! //! This module is intended for users of libcore which do not link to libstd as diff --git a/src/libcore/ptr.rs b/src/libcore/ptr.rs index 57351822cc3cf..bc1d7f0366d01 100644 --- a/src/libcore/ptr.rs +++ b/src/libcore/ptr.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // FIXME: talk about offset, copy_memory, copy_nonoverlapping_memory //! Raw, unsafe pointers, `*const T`, and `*mut T`. diff --git a/src/libcore/raw.rs b/src/libcore/raw.rs index a95f05227fb8b..eb7e4d2533b6f 100644 --- a/src/libcore/raw.rs +++ b/src/libcore/raw.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(missing_docs)] #![unstable(feature = "raw", issue = "27751")] diff --git a/src/libcore/result.rs b/src/libcore/result.rs index ac908342655b6..411d638a54126 100644 --- a/src/libcore/result.rs +++ b/src/libcore/result.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Error handling with the `Result` type. //! //! [`Result`][`Result`] is the type used for returning and propagating diff --git a/src/libcore/slice/memchr.rs b/src/libcore/slice/memchr.rs index cf95333af9cbb..0f1bc41dd7fff 100644 --- a/src/libcore/slice/memchr.rs +++ b/src/libcore/slice/memchr.rs @@ -1,12 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // Original implementation taken from rust-memchr // Copyright 2015 Andrew Gallant, bluss and Nicolas Koch diff --git a/src/libcore/slice/mod.rs b/src/libcore/slice/mod.rs index 3366c4a3e661c..35407fc05ada0 100644 --- a/src/libcore/slice/mod.rs +++ b/src/libcore/slice/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Slice management and manipulation //! //! For more details see [`std::slice`]. diff --git a/src/libcore/slice/rotate.rs b/src/libcore/slice/rotate.rs index 0d182b8497452..60a0c1b2ac64d 100644 --- a/src/libcore/slice/rotate.rs +++ b/src/libcore/slice/rotate.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use cmp; use mem; use ptr; diff --git a/src/libcore/slice/sort.rs b/src/libcore/slice/sort.rs index e4c1fd03f9eb3..4f9438ece116c 100644 --- a/src/libcore/slice/sort.rs +++ b/src/libcore/slice/sort.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Slice sorting //! //! This module contains an sort algorithm based on Orson Peters' pattern-defeating quicksort, diff --git a/src/libcore/str/lossy.rs b/src/libcore/str/lossy.rs index 186d6adbc91cf..dea530e34594c 100644 --- a/src/libcore/str/lossy.rs +++ b/src/libcore/str/lossy.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use char; use str as core_str; use fmt; diff --git a/src/libcore/str/mod.rs b/src/libcore/str/mod.rs index 64bdf4d9f486a..5ce64b9eea35a 100644 --- a/src/libcore/str/mod.rs +++ b/src/libcore/str/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! String manipulation //! //! For more details, see std::str diff --git a/src/libcore/str/pattern.rs b/src/libcore/str/pattern.rs index 5e63fa9ff354c..6dab71c4d5a2e 100644 --- a/src/libcore/str/pattern.rs +++ b/src/libcore/str/pattern.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The string Pattern API. //! //! For more details, see the traits `Pattern`, `Searcher`, diff --git a/src/libcore/sync/atomic.rs b/src/libcore/sync/atomic.rs index 617e067e0787e..f195d1babc9ac 100644 --- a/src/libcore/sync/atomic.rs +++ b/src/libcore/sync/atomic.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Atomic types //! //! Atomic types provide primitive shared-memory communication between diff --git a/src/libcore/sync/mod.rs b/src/libcore/sync/mod.rs index 0080e0b5e4353..b635bae0a47b4 100644 --- a/src/libcore/sync/mod.rs +++ b/src/libcore/sync/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Synchronization primitives #![stable(feature = "rust1", since = "1.0.0")] diff --git a/src/libcore/task/context.rs b/src/libcore/task/context.rs index 5a29c8528ef3a..85a0a57512a1e 100644 --- a/src/libcore/task/context.rs +++ b/src/libcore/task/context.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![unstable(feature = "futures_api", reason = "futures in libcore are unstable", issue = "50547")] diff --git a/src/libcore/task/mod.rs b/src/libcore/task/mod.rs index f51e5f7ce0e31..adbddfecd741f 100644 --- a/src/libcore/task/mod.rs +++ b/src/libcore/task/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![unstable(feature = "futures_api", reason = "futures in libcore are unstable", issue = "50547")] diff --git a/src/libcore/task/poll.rs b/src/libcore/task/poll.rs index fb027efc6dca0..27b1139e15c79 100644 --- a/src/libcore/task/poll.rs +++ b/src/libcore/task/poll.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![unstable(feature = "futures_api", reason = "futures in libcore are unstable", issue = "50547")] diff --git a/src/libcore/task/spawn.rs b/src/libcore/task/spawn.rs index 58ee85d232bc4..cb5a68346dd4b 100644 --- a/src/libcore/task/spawn.rs +++ b/src/libcore/task/spawn.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![unstable(feature = "futures_api", reason = "futures in libcore are unstable", issue = "50547")] diff --git a/src/libcore/task/wake.rs b/src/libcore/task/wake.rs index d770536ef4279..97fd0b2c9b8c1 100644 --- a/src/libcore/task/wake.rs +++ b/src/libcore/task/wake.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![unstable(feature = "futures_api", reason = "futures in libcore are unstable", issue = "50547")] diff --git a/src/libcore/tests/any.rs b/src/libcore/tests/any.rs index a80bf93953039..62bebcb03c96a 100644 --- a/src/libcore/tests/any.rs +++ b/src/libcore/tests/any.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use core::any::*; #[derive(PartialEq, Debug)] diff --git a/src/libcore/tests/array.rs b/src/libcore/tests/array.rs index 6278d5e23e0d6..9e133ac568811 100644 --- a/src/libcore/tests/array.rs +++ b/src/libcore/tests/array.rs @@ -1,12 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. use core::array::FixedSizeArray; use core::convert::TryFrom; diff --git a/src/libcore/tests/ascii.rs b/src/libcore/tests/ascii.rs index 950222dbcfa3f..ec98e0464c9e6 100644 --- a/src/libcore/tests/ascii.rs +++ b/src/libcore/tests/ascii.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use core::char::from_u32; #[test] diff --git a/src/libcore/tests/atomic.rs b/src/libcore/tests/atomic.rs index a3667b3f3fee0..05fe8460f324e 100644 --- a/src/libcore/tests/atomic.rs +++ b/src/libcore/tests/atomic.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use core::sync::atomic::*; use core::sync::atomic::Ordering::SeqCst; diff --git a/src/libcore/tests/cell.rs b/src/libcore/tests/cell.rs index 4b7243b9cfc79..56f295dff8e43 100644 --- a/src/libcore/tests/cell.rs +++ b/src/libcore/tests/cell.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use core::cell::*; use core::default::Default; use std::mem::drop; diff --git a/src/libcore/tests/char.rs b/src/libcore/tests/char.rs index 3d99c8ea9e229..61856242c5706 100644 --- a/src/libcore/tests/char.rs +++ b/src/libcore/tests/char.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::{char,str}; use std::convert::TryFrom; use std::str::FromStr; diff --git a/src/libcore/tests/clone.rs b/src/libcore/tests/clone.rs index 91d68ba33447a..c97a87aebce41 100644 --- a/src/libcore/tests/clone.rs +++ b/src/libcore/tests/clone.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[test] fn test_borrowed_clone() { let x = 5; diff --git a/src/libcore/tests/cmp.rs b/src/libcore/tests/cmp.rs index 8c5179f59932b..4e624e5eb126e 100644 --- a/src/libcore/tests/cmp.rs +++ b/src/libcore/tests/cmp.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use core::cmp::Ordering::{Less, Greater, Equal}; #[test] diff --git a/src/libcore/tests/fmt/builders.rs b/src/libcore/tests/fmt/builders.rs index b7233658e9361..fd7192cc15119 100644 --- a/src/libcore/tests/fmt/builders.rs +++ b/src/libcore/tests/fmt/builders.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod debug_struct { use std::fmt; diff --git a/src/libcore/tests/fmt/float.rs b/src/libcore/tests/fmt/float.rs index 138c3970e9087..bd0daf7a8eb84 100644 --- a/src/libcore/tests/fmt/float.rs +++ b/src/libcore/tests/fmt/float.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[test] fn test_format_f64() { assert_eq!("1", format!("{:.0}", 1.0f64)); diff --git a/src/libcore/tests/fmt/mod.rs b/src/libcore/tests/fmt/mod.rs index 5d204c7d523d6..d86e21cf40b6e 100644 --- a/src/libcore/tests/fmt/mod.rs +++ b/src/libcore/tests/fmt/mod.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod builders; mod float; mod num; diff --git a/src/libcore/tests/fmt/num.rs b/src/libcore/tests/fmt/num.rs index bc205ec0582ea..6d9494ec289aa 100644 --- a/src/libcore/tests/fmt/num.rs +++ b/src/libcore/tests/fmt/num.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[test] fn test_format_int() { // Formatting integers should select the right implementation based off diff --git a/src/libcore/tests/hash/mod.rs b/src/libcore/tests/hash/mod.rs index 85c9d41b65b59..135f4dfcac7d5 100644 --- a/src/libcore/tests/hash/mod.rs +++ b/src/libcore/tests/hash/mod.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod sip; use std::hash::{Hash, Hasher}; diff --git a/src/libcore/tests/hash/sip.rs b/src/libcore/tests/hash/sip.rs index bad858011e960..b615cfd77ef1d 100644 --- a/src/libcore/tests/hash/sip.rs +++ b/src/libcore/tests/hash/sip.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(deprecated)] use core::hash::{Hash, Hasher}; diff --git a/src/libcore/tests/intrinsics.rs b/src/libcore/tests/intrinsics.rs index 9f3cba26a62db..7544c13dee4bf 100644 --- a/src/libcore/tests/intrinsics.rs +++ b/src/libcore/tests/intrinsics.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use core::any::TypeId; #[test] diff --git a/src/libcore/tests/iter.rs b/src/libcore/tests/iter.rs index 72b115f8b5f77..b1fcf7e844bf1 100644 --- a/src/libcore/tests/iter.rs +++ b/src/libcore/tests/iter.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use core::iter::*; use core::{i8, i16, isize}; use core::usize; diff --git a/src/libcore/tests/lib.rs b/src/libcore/tests/lib.rs index fc92a5a222512..e15db274b33a9 100644 --- a/src/libcore/tests/lib.rs +++ b/src/libcore/tests/lib.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] #![feature(cell_update)] #![feature(core_private_bignum)] diff --git a/src/libcore/tests/manually_drop.rs b/src/libcore/tests/manually_drop.rs index 82dfb8d4c0b2a..49a1c187ea6cd 100644 --- a/src/libcore/tests/manually_drop.rs +++ b/src/libcore/tests/manually_drop.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use core::mem::ManuallyDrop; #[test] diff --git a/src/libcore/tests/mem.rs b/src/libcore/tests/mem.rs index 714f2babbdff6..f5b241959fdd2 100644 --- a/src/libcore/tests/mem.rs +++ b/src/libcore/tests/mem.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use core::mem::*; #[test] diff --git a/src/libcore/tests/nonzero.rs b/src/libcore/tests/nonzero.rs index 8d39298bac3d1..d4462cd154382 100644 --- a/src/libcore/tests/nonzero.rs +++ b/src/libcore/tests/nonzero.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use core::num::NonZeroU32; use core::option::Option; use core::option::Option::{Some, None}; diff --git a/src/libcore/tests/num/bignum.rs b/src/libcore/tests/num/bignum.rs index 58a9dd1b128ce..b873f1dd0652f 100644 --- a/src/libcore/tests/num/bignum.rs +++ b/src/libcore/tests/num/bignum.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::prelude::v1::*; use core::num::bignum::tests::Big8x3 as Big; diff --git a/src/libcore/tests/num/dec2flt/mod.rs b/src/libcore/tests/num/dec2flt/mod.rs index 17b2f59cd4df2..450ed06a4640b 100644 --- a/src/libcore/tests/num/dec2flt/mod.rs +++ b/src/libcore/tests/num/dec2flt/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(overflowing_literals)] use std::{i64, f32, f64}; diff --git a/src/libcore/tests/num/dec2flt/parse.rs b/src/libcore/tests/num/dec2flt/parse.rs index 3ad694e38adb0..1eac484119170 100644 --- a/src/libcore/tests/num/dec2flt/parse.rs +++ b/src/libcore/tests/num/dec2flt/parse.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use core::num::dec2flt::parse::{Decimal, parse_decimal}; use core::num::dec2flt::parse::ParseResult::{Valid, Invalid}; diff --git a/src/libcore/tests/num/dec2flt/rawfp.rs b/src/libcore/tests/num/dec2flt/rawfp.rs index c9cd2bf5a9ae7..747c1bfa3f9c2 100644 --- a/src/libcore/tests/num/dec2flt/rawfp.rs +++ b/src/libcore/tests/num/dec2flt/rawfp.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::f32; use std::f64; use core::num::diy_float::Fp; diff --git a/src/libcore/tests/num/flt2dec/estimator.rs b/src/libcore/tests/num/flt2dec/estimator.rs index 857aae72c8a5b..fb0888e2720a9 100644 --- a/src/libcore/tests/num/flt2dec/estimator.rs +++ b/src/libcore/tests/num/flt2dec/estimator.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use core::num::flt2dec::estimator::*; #[test] diff --git a/src/libcore/tests/num/flt2dec/mod.rs b/src/libcore/tests/num/flt2dec/mod.rs index 04567e25e25ba..fed9ce73b2a8e 100644 --- a/src/libcore/tests/num/flt2dec/mod.rs +++ b/src/libcore/tests/num/flt2dec/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::prelude::v1::*; use std::{str, i16, f32, f64, fmt}; diff --git a/src/libcore/tests/num/flt2dec/random.rs b/src/libcore/tests/num/flt2dec/random.rs index a1928657dabc4..869e0fddaa58a 100644 --- a/src/libcore/tests/num/flt2dec/random.rs +++ b/src/libcore/tests/num/flt2dec/random.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![cfg(not(target_arch = "wasm32"))] use std::i16; diff --git a/src/libcore/tests/num/flt2dec/strategy/dragon.rs b/src/libcore/tests/num/flt2dec/strategy/dragon.rs index 03772a765cc6a..1803e39b46df3 100644 --- a/src/libcore/tests/num/flt2dec/strategy/dragon.rs +++ b/src/libcore/tests/num/flt2dec/strategy/dragon.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::prelude::v1::*; use super::super::*; use core::num::bignum::Big32x40 as Big; diff --git a/src/libcore/tests/num/flt2dec/strategy/grisu.rs b/src/libcore/tests/num/flt2dec/strategy/grisu.rs index 286b39d8cf3b3..53e9f12ae0f14 100644 --- a/src/libcore/tests/num/flt2dec/strategy/grisu.rs +++ b/src/libcore/tests/num/flt2dec/strategy/grisu.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::super::*; use core::num::flt2dec::strategy::grisu::*; diff --git a/src/libcore/tests/num/i16.rs b/src/libcore/tests/num/i16.rs index 7435831ac6dba..f5544b914b73d 100644 --- a/src/libcore/tests/num/i16.rs +++ b/src/libcore/tests/num/i16.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - int_module!(i16, i16); diff --git a/src/libcore/tests/num/i32.rs b/src/libcore/tests/num/i32.rs index 3b3407e1ada52..39250ee84bce6 100644 --- a/src/libcore/tests/num/i32.rs +++ b/src/libcore/tests/num/i32.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - int_module!(i32, i32); diff --git a/src/libcore/tests/num/i64.rs b/src/libcore/tests/num/i64.rs index 9e1aec256eed0..fa4d2ab6638d7 100644 --- a/src/libcore/tests/num/i64.rs +++ b/src/libcore/tests/num/i64.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - int_module!(i64, i64); diff --git a/src/libcore/tests/num/i8.rs b/src/libcore/tests/num/i8.rs index f72244239b260..ccec6915fe090 100644 --- a/src/libcore/tests/num/i8.rs +++ b/src/libcore/tests/num/i8.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - int_module!(i8, i8); diff --git a/src/libcore/tests/num/int_macros.rs b/src/libcore/tests/num/int_macros.rs index 71d2e7945389b..4f6900d3b3957 100644 --- a/src/libcore/tests/num/int_macros.rs +++ b/src/libcore/tests/num/int_macros.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! int_module { ($T:ident, $T_i:ident) => ( #[cfg(test)] mod tests { diff --git a/src/libcore/tests/num/mod.rs b/src/libcore/tests/num/mod.rs index ab96d3126bb22..46d64a8be79e7 100644 --- a/src/libcore/tests/num/mod.rs +++ b/src/libcore/tests/num/mod.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use core::convert::{TryFrom, TryInto}; use core::cmp::PartialEq; use core::fmt::Debug; diff --git a/src/libcore/tests/num/u16.rs b/src/libcore/tests/num/u16.rs index 8455207583cc1..435b914224c5a 100644 --- a/src/libcore/tests/num/u16.rs +++ b/src/libcore/tests/num/u16.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - uint_module!(u16, u16); diff --git a/src/libcore/tests/num/u32.rs b/src/libcore/tests/num/u32.rs index b44e60f652979..71dc005dea370 100644 --- a/src/libcore/tests/num/u32.rs +++ b/src/libcore/tests/num/u32.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - uint_module!(u32, u32); diff --git a/src/libcore/tests/num/u64.rs b/src/libcore/tests/num/u64.rs index ffcd1015d58d6..b498ebc52042e 100644 --- a/src/libcore/tests/num/u64.rs +++ b/src/libcore/tests/num/u64.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - uint_module!(u64, u64); diff --git a/src/libcore/tests/num/u8.rs b/src/libcore/tests/num/u8.rs index 4ee14e22f2d57..68e938be704ac 100644 --- a/src/libcore/tests/num/u8.rs +++ b/src/libcore/tests/num/u8.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - uint_module!(u8, u8); diff --git a/src/libcore/tests/num/uint_macros.rs b/src/libcore/tests/num/uint_macros.rs index ca6906f731047..6e81542b6ec88 100644 --- a/src/libcore/tests/num/uint_macros.rs +++ b/src/libcore/tests/num/uint_macros.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! uint_module { ($T:ident, $T_i:ident) => ( #[cfg(test)] mod tests { diff --git a/src/libcore/tests/ops.rs b/src/libcore/tests/ops.rs index d66193b1687c8..401644e120d16 100644 --- a/src/libcore/tests/ops.rs +++ b/src/libcore/tests/ops.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use core::ops::{Range, RangeFull, RangeFrom, RangeTo, RangeInclusive}; // Test the Range structs without the syntactic sugar. diff --git a/src/libcore/tests/option.rs b/src/libcore/tests/option.rs index 1324ba2d9a9c3..896479c352a36 100644 --- a/src/libcore/tests/option.rs +++ b/src/libcore/tests/option.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use core::option::*; use core::mem; use core::clone::Clone; diff --git a/src/libcore/tests/pattern.rs b/src/libcore/tests/pattern.rs index cfa3b7ee6640f..b78ed0210770f 100644 --- a/src/libcore/tests/pattern.rs +++ b/src/libcore/tests/pattern.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::str::pattern::*; // This macro makes it easier to write diff --git a/src/libcore/tests/ptr.rs b/src/libcore/tests/ptr.rs index 92160910d8f70..65c1a3e0254d2 100644 --- a/src/libcore/tests/ptr.rs +++ b/src/libcore/tests/ptr.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use core::ptr::*; use core::cell::RefCell; diff --git a/src/libcore/tests/result.rs b/src/libcore/tests/result.rs index 0c00992ffd84e..1fab07526a07f 100644 --- a/src/libcore/tests/result.rs +++ b/src/libcore/tests/result.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use core::option::*; fn op1() -> Result { Ok(666) } diff --git a/src/libcore/tests/slice.rs b/src/libcore/tests/slice.rs index b087ec81f59c6..10d6b497ba769 100644 --- a/src/libcore/tests/slice.rs +++ b/src/libcore/tests/slice.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use core::result::Result::{Ok, Err}; #[test] diff --git a/src/libcore/tests/str.rs b/src/libcore/tests/str.rs index 343c9596c5383..ed939ca7139a5 100644 --- a/src/libcore/tests/str.rs +++ b/src/libcore/tests/str.rs @@ -1,11 +1 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // All `str` tests live in liballoc/tests diff --git a/src/libcore/tests/str_lossy.rs b/src/libcore/tests/str_lossy.rs index 56ef3f070c1fa..f9fd333cca712 100644 --- a/src/libcore/tests/str_lossy.rs +++ b/src/libcore/tests/str_lossy.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use core::str::lossy::*; #[test] diff --git a/src/libcore/tests/time.rs b/src/libcore/tests/time.rs index 466f28f0ef0aa..6efd22572dc18 100644 --- a/src/libcore/tests/time.rs +++ b/src/libcore/tests/time.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use core::time::Duration; #[test] diff --git a/src/libcore/tests/tuple.rs b/src/libcore/tests/tuple.rs index 4fe5e0a740bf7..a4c171eb4243b 100644 --- a/src/libcore/tests/tuple.rs +++ b/src/libcore/tests/tuple.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cmp::Ordering::{Equal, Less, Greater}; #[test] diff --git a/src/libcore/time.rs b/src/libcore/time.rs index b58920224eb70..071af8694f567 100644 --- a/src/libcore/time.rs +++ b/src/libcore/time.rs @@ -1,12 +1,3 @@ -// Copyright 2012-2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![stable(feature = "duration_core", since = "1.25.0")] //! Temporal quantification. diff --git a/src/libcore/tuple.rs b/src/libcore/tuple.rs index 4c5370194fecb..a82666d8f70f8 100644 --- a/src/libcore/tuple.rs +++ b/src/libcore/tuple.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // See src/libstd/primitive_docs.rs for documentation. use cmp::*; diff --git a/src/libcore/unicode/bool_trie.rs b/src/libcore/unicode/bool_trie.rs index 0e6437fded594..39584d346e4a8 100644 --- a/src/libcore/unicode/bool_trie.rs +++ b/src/libcore/unicode/bool_trie.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// BoolTrie is a trie for representing a set of Unicode codepoints. It is /// implemented with postfix compression (sharing of identical child nodes), /// which gives both compact size and fast lookup. diff --git a/src/libcore/unicode/mod.rs b/src/libcore/unicode/mod.rs index e5cda880f8807..3b86246269f62 100644 --- a/src/libcore/unicode/mod.rs +++ b/src/libcore/unicode/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![unstable(feature = "unicode_internals", issue = "0")] #![allow(missing_docs)] diff --git a/src/libcore/unicode/printable.rs b/src/libcore/unicode/printable.rs index 519dd17bb9b3f..ca6322c601baf 100644 --- a/src/libcore/unicode/printable.rs +++ b/src/libcore/unicode/printable.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // NOTE: The following code was generated by "src/libcore/unicode/printable.py", // do not edit directly! diff --git a/src/libcore/unicode/tables.rs b/src/libcore/unicode/tables.rs index 3de855ac94315..ad64bc4678c69 100644 --- a/src/libcore/unicode/tables.rs +++ b/src/libcore/unicode/tables.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // NOTE: The following code was generated by "./unicode.py", do not edit directly #![allow(missing_docs, non_upper_case_globals, non_snake_case)] diff --git a/src/libcore/unicode/version.rs b/src/libcore/unicode/version.rs index 59ebf5f501269..4d68d2e8c2ef7 100644 --- a/src/libcore/unicode/version.rs +++ b/src/libcore/unicode/version.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// Represents a Unicode Version. /// /// See also: diff --git a/src/libcore/unit.rs b/src/libcore/unit.rs index 087ddf9688ab7..540025d77bb4c 100644 --- a/src/libcore/unit.rs +++ b/src/libcore/unit.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use iter::FromIterator; /// Collapses all unit items from an iterator into one. diff --git a/src/libfmt_macros/lib.rs b/src/libfmt_macros/lib.rs index 1bac6d22d3744..0a53793fee94f 100644 --- a/src/libfmt_macros/lib.rs +++ b/src/libfmt_macros/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Macro support for format strings //! //! These structures are used when parsing format strings for the compiler. diff --git a/src/libgraphviz/lib.rs b/src/libgraphviz/lib.rs index 9fa48adebdf07..0e748ad6c660b 100644 --- a/src/libgraphviz/lib.rs +++ b/src/libgraphviz/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Generate files suitable for use with [Graphviz](http://www.graphviz.org/) //! //! The `render` function generates output (e.g. an `output.dot` file) for diff --git a/src/libpanic_abort/lib.rs b/src/libpanic_abort/lib.rs index da568fae70e14..b23a36a874766 100644 --- a/src/libpanic_abort/lib.rs +++ b/src/libpanic_abort/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Implementation of Rust panics via process aborts //! //! When compared to the implementation via unwinding, this crate is *much* diff --git a/src/libpanic_unwind/dummy.rs b/src/libpanic_unwind/dummy.rs index 7150560b4a13d..b052f76e2a3a8 100644 --- a/src/libpanic_unwind/dummy.rs +++ b/src/libpanic_unwind/dummy.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Unwinding for wasm32 //! //! Right now we don't support this, so this is just stubs diff --git a/src/libpanic_unwind/dwarf/eh.rs b/src/libpanic_unwind/dwarf/eh.rs index a24c659689139..ce7fab8584a28 100644 --- a/src/libpanic_unwind/dwarf/eh.rs +++ b/src/libpanic_unwind/dwarf/eh.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Parsing of GCC-style Language-Specific Data Area (LSDA) //! For details see: //! http://refspecs.linuxfoundation.org/LSB_3.0.0/LSB-PDA/LSB-PDA/ehframechpt.html diff --git a/src/libpanic_unwind/dwarf/mod.rs b/src/libpanic_unwind/dwarf/mod.rs index 7e0c32fe03d8a..fdd6bd3919f9c 100644 --- a/src/libpanic_unwind/dwarf/mod.rs +++ b/src/libpanic_unwind/dwarf/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Utilities for parsing DWARF-encoded data streams. //! See http://www.dwarfstd.org, //! DWARF-4 standard, Section 7 - "Data Representation" diff --git a/src/libpanic_unwind/emcc.rs b/src/libpanic_unwind/emcc.rs index 87efc23abc81d..45c9244a46fcd 100644 --- a/src/libpanic_unwind/emcc.rs +++ b/src/libpanic_unwind/emcc.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Unwinding for emscripten //! //! Whereas Rust's usual unwinding implementation for Unix platforms diff --git a/src/libpanic_unwind/gcc.rs b/src/libpanic_unwind/gcc.rs index 11ebcf5c01ea7..c057b07ddcf47 100644 --- a/src/libpanic_unwind/gcc.rs +++ b/src/libpanic_unwind/gcc.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Implementation of panics backed by libgcc/libunwind (in some form) //! //! For background on exception handling and stack unwinding please see diff --git a/src/libpanic_unwind/lib.rs b/src/libpanic_unwind/lib.rs index 9c3fc76c307a6..b59a61a65ab25 100644 --- a/src/libpanic_unwind/lib.rs +++ b/src/libpanic_unwind/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Implementation of panics via stack unwinding //! //! This crate is an implementation of panics in Rust using "most native" stack diff --git a/src/libpanic_unwind/macros.rs b/src/libpanic_unwind/macros.rs index 6ea79dc862bda..659e977285e35 100644 --- a/src/libpanic_unwind/macros.rs +++ b/src/libpanic_unwind/macros.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// A macro for defining `#[cfg]` if-else statements. /// /// This is similar to the `if/elif` C preprocessor macro by allowing definition diff --git a/src/libpanic_unwind/seh.rs b/src/libpanic_unwind/seh.rs index 015be2dea2157..864936a2bccd0 100644 --- a/src/libpanic_unwind/seh.rs +++ b/src/libpanic_unwind/seh.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Windows SEH //! //! On Windows (currently only on MSVC), the default exception handling diff --git a/src/libpanic_unwind/seh64_gnu.rs b/src/libpanic_unwind/seh64_gnu.rs index 0b08e54c6739a..9bc0f989cc11b 100644 --- a/src/libpanic_unwind/seh64_gnu.rs +++ b/src/libpanic_unwind/seh64_gnu.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Unwinding implementation of top of native Win64 SEH, //! however the unwind handler data (aka LSDA) uses GCC-compatible encoding. diff --git a/src/libpanic_unwind/windows.rs b/src/libpanic_unwind/windows.rs index 5f1dda36a889e..83df35cf1946e 100644 --- a/src/libpanic_unwind/windows.rs +++ b/src/libpanic_unwind/windows.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(bad_style)] #![allow(dead_code)] #![cfg(windows)] diff --git a/src/libproc_macro/diagnostic.rs b/src/libproc_macro/diagnostic.rs index af7790164183c..60e5b10d45979 100644 --- a/src/libproc_macro/diagnostic.rs +++ b/src/libproc_macro/diagnostic.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use Span; use rustc_errors as errors; diff --git a/src/libproc_macro/lib.rs b/src/libproc_macro/lib.rs index 656819880b135..5b3b5711d6a91 100644 --- a/src/libproc_macro/lib.rs +++ b/src/libproc_macro/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A support library for macro authors when defining new macros. //! //! This library, provided by the standard distribution, provides the types diff --git a/src/libproc_macro/quote.rs b/src/libproc_macro/quote.rs index 7ae7b13a15217..837a56f32d302 100644 --- a/src/libproc_macro/quote.rs +++ b/src/libproc_macro/quote.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! # Quasiquoter //! This file contains the implementation internals of the quasiquoter provided by `quote!`. diff --git a/src/libproc_macro/rustc.rs b/src/libproc_macro/rustc.rs index 21229d3299d7e..60925a6f16314 100644 --- a/src/libproc_macro/rustc.rs +++ b/src/libproc_macro/rustc.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use {Delimiter, Level, Spacing, Span, __internal}; use {Group, Ident, Literal, Punct, TokenTree}; diff --git a/src/libprofiler_builtins/build.rs b/src/libprofiler_builtins/build.rs index 8d6c7d68dfe23..83b13a9c2fd17 100644 --- a/src/libprofiler_builtins/build.rs +++ b/src/libprofiler_builtins/build.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Compiles the profiler part of the `compiler-rt` library. //! //! See the build.rs for libcompiler_builtins crate for details. diff --git a/src/libprofiler_builtins/lib.rs b/src/libprofiler_builtins/lib.rs index a85593253b100..7e155d88de1d9 100644 --- a/src/libprofiler_builtins/lib.rs +++ b/src/libprofiler_builtins/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![no_std] #![feature(profiler_runtime)] #![profiler_runtime] diff --git a/src/librustc/benches/dispatch.rs b/src/librustc/benches/dispatch.rs index 63e74778fb92a..e3b36be5696b3 100644 --- a/src/librustc/benches/dispatch.rs +++ b/src/librustc/benches/dispatch.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use test::Bencher; // Static/dynamic method dispatch diff --git a/src/librustc/benches/lib.rs b/src/librustc/benches/lib.rs index 5496df1342ff4..0f81586d3bdd9 100644 --- a/src/librustc/benches/lib.rs +++ b/src/librustc/benches/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(test)] extern crate test; diff --git a/src/librustc/benches/pattern.rs b/src/librustc/benches/pattern.rs index 638b1ce3f7530..fd8cc5b83fd5a 100644 --- a/src/librustc/benches/pattern.rs +++ b/src/librustc/benches/pattern.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use test::Bencher; // Overhead of various match forms diff --git a/src/librustc/build.rs b/src/librustc/build.rs index 4df5f0e64050c..0016c31115a60 100644 --- a/src/librustc/build.rs +++ b/src/librustc/build.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { println!("cargo:rerun-if-changed=build.rs"); println!("cargo:rerun-if-env-changed=CFG_LIBDIR_RELATIVE"); diff --git a/src/librustc/cfg/construct.rs b/src/librustc/cfg/construct.rs index 98cfa094c169a..3d7dacf4e2f79 100644 --- a/src/librustc/cfg/construct.rs +++ b/src/librustc/cfg/construct.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use cfg::*; use middle::region; use rustc_data_structures::graph::implementation as graph; diff --git a/src/librustc/cfg/graphviz.rs b/src/librustc/cfg/graphviz.rs index 9241240caf043..08e77944f37f8 100644 --- a/src/librustc/cfg/graphviz.rs +++ b/src/librustc/cfg/graphviz.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// This module provides linkage between rustc::middle::graph and /// libgraphviz traits. diff --git a/src/librustc/cfg/mod.rs b/src/librustc/cfg/mod.rs index cf9c24cc58a62..e58557839f9b9 100644 --- a/src/librustc/cfg/mod.rs +++ b/src/librustc/cfg/mod.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Module that constructs a control-flow graph representing an item. //! Uses `Graph` as the underlying representation. diff --git a/src/librustc/dep_graph/debug.rs b/src/librustc/dep_graph/debug.rs index f0e43e78a50af..a9ad22c5e913e 100644 --- a/src/librustc/dep_graph/debug.rs +++ b/src/librustc/dep_graph/debug.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Code for debugging the dep-graph. use super::dep_node::DepNode; diff --git a/src/librustc/dep_graph/dep_node.rs b/src/librustc/dep_graph/dep_node.rs index 90081d5b85ef9..6a550bf9c4986 100644 --- a/src/librustc/dep_graph/dep_node.rs +++ b/src/librustc/dep_graph/dep_node.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - //! This module defines the `DepNode` type which the compiler uses to represent //! nodes in the dependency graph. A `DepNode` consists of a `DepKind` (which //! specifies the kind of thing it represents, like a piece of HIR, MIR, etc) diff --git a/src/librustc/dep_graph/dep_tracking_map.rs b/src/librustc/dep_graph/dep_tracking_map.rs index 7e46c202a84d4..6ce42dde5909d 100644 --- a/src/librustc/dep_graph/dep_tracking_map.rs +++ b/src/librustc/dep_graph/dep_tracking_map.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc_data_structures::fx::FxHashMap; use std::cell::RefCell; use std::hash::Hash; diff --git a/src/librustc/dep_graph/graph.rs b/src/librustc/dep_graph/graph.rs index a285399657177..fab79faf13157 100644 --- a/src/librustc/dep_graph/graph.rs +++ b/src/librustc/dep_graph/graph.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use errors::DiagnosticBuilder; use rustc_data_structures::stable_hasher::{HashStable, StableHasher}; use rustc_data_structures::fx::{FxHashMap, FxHashSet}; diff --git a/src/librustc/dep_graph/mod.rs b/src/librustc/dep_graph/mod.rs index 8a6f66911ece4..89f7a33df08ce 100644 --- a/src/librustc/dep_graph/mod.rs +++ b/src/librustc/dep_graph/mod.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod debug; mod dep_node; mod dep_tracking_map; diff --git a/src/librustc/dep_graph/prev.rs b/src/librustc/dep_graph/prev.rs index 669a99019aa60..977424c03a614 100644 --- a/src/librustc/dep_graph/prev.rs +++ b/src/librustc/dep_graph/prev.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use ich::Fingerprint; use rustc_data_structures::fx::FxHashMap; use super::dep_node::DepNode; diff --git a/src/librustc/dep_graph/query.rs b/src/librustc/dep_graph/query.rs index ce0b5557a34bf..6d5a5dd858390 100644 --- a/src/librustc/dep_graph/query.rs +++ b/src/librustc/dep_graph/query.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc_data_structures::fx::FxHashMap; use rustc_data_structures::graph::implementation::{ Direction, INCOMING, Graph, NodeIndex, OUTGOING diff --git a/src/librustc/dep_graph/safe.rs b/src/librustc/dep_graph/safe.rs index f82bf9be03390..f1e8224a70d14 100644 --- a/src/librustc/dep_graph/safe.rs +++ b/src/librustc/dep_graph/safe.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The `DepGraphSafe` trait use hir::BodyId; diff --git a/src/librustc/dep_graph/serialized.rs b/src/librustc/dep_graph/serialized.rs index 60fc813a25d51..35e86991e66a5 100644 --- a/src/librustc/dep_graph/serialized.rs +++ b/src/librustc/dep_graph/serialized.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The data that we will serialize and deserialize. use dep_graph::DepNode; diff --git a/src/librustc/diagnostics.rs b/src/librustc/diagnostics.rs index a3c0688dcc8ed..2ad8e48c13618 100644 --- a/src/librustc/diagnostics.rs +++ b/src/librustc/diagnostics.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(non_snake_case)] // Error messages for EXXXX errors. diff --git a/src/librustc/hir/check_attr.rs b/src/librustc/hir/check_attr.rs index 9ded7bc28b30f..cc65f771dbad2 100644 --- a/src/librustc/hir/check_attr.rs +++ b/src/librustc/hir/check_attr.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This module implements some validity checks for attributes. //! In particular it verifies that `#[inline]` and `#[repr]` attributes are //! attached to items that actually support them and if there are diff --git a/src/librustc/hir/def.rs b/src/librustc/hir/def.rs index 65146f2de8441..635360831fd57 100644 --- a/src/librustc/hir/def.rs +++ b/src/librustc/hir/def.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use hir::def_id::DefId; use util::nodemap::{NodeMap, DefIdMap}; use syntax::ast; diff --git a/src/librustc/hir/def_id.rs b/src/librustc/hir/def_id.rs index 7acfe6839540b..a15f6f8638bd3 100644 --- a/src/librustc/hir/def_id.rs +++ b/src/librustc/hir/def_id.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use ty; use rustc_data_structures::indexed_vec::Idx; diff --git a/src/librustc/hir/intravisit.rs b/src/librustc/hir/intravisit.rs index d853d3d9a7fb4..580630d07bdab 100644 --- a/src/librustc/hir/intravisit.rs +++ b/src/librustc/hir/intravisit.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! HIR walker for walking the contents of nodes. //! //! **For an overview of the visitor strategy, see the docs on the diff --git a/src/librustc/hir/itemlikevisit.rs b/src/librustc/hir/itemlikevisit.rs index a62000e10c79f..dcb894c98d87f 100644 --- a/src/librustc/hir/itemlikevisit.rs +++ b/src/librustc/hir/itemlikevisit.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::{Item, ImplItem, TraitItem}; use super::intravisit::Visitor; diff --git a/src/librustc/hir/lowering.rs b/src/librustc/hir/lowering.rs index cb05f7b44c3b9..af9ac2c0f3644 100644 --- a/src/librustc/hir/lowering.rs +++ b/src/librustc/hir/lowering.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Lowers the AST to the HIR. //! //! Since the AST and HIR are fairly similar, this is mostly a simple procedure, diff --git a/src/librustc/hir/map/blocks.rs b/src/librustc/hir/map/blocks.rs index f2f7f95426ab8..305aa4b0d939b 100644 --- a/src/librustc/hir/map/blocks.rs +++ b/src/librustc/hir/map/blocks.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This module provides a simplified abstraction for working with //! code blocks identified by their integer node-id. In particular, //! it captures a common set of attributes that all "function-like diff --git a/src/librustc/hir/map/collector.rs b/src/librustc/hir/map/collector.rs index a14745a138127..7695ad70264f4 100644 --- a/src/librustc/hir/map/collector.rs +++ b/src/librustc/hir/map/collector.rs @@ -1,13 +1,3 @@ -// Copyright 2015-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::*; use dep_graph::{DepGraph, DepKind, DepNodeIndex}; use hir::def_id::{LOCAL_CRATE, CrateNum}; diff --git a/src/librustc/hir/map/def_collector.rs b/src/librustc/hir/map/def_collector.rs index cab620aeec548..7da477f4794f1 100644 --- a/src/librustc/hir/map/def_collector.rs +++ b/src/librustc/hir/map/def_collector.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use hir::map::definitions::*; use hir::def_id::{CRATE_DEF_INDEX, DefIndex, DefIndexAddressSpace}; use session::CrateDisambiguator; diff --git a/src/librustc/hir/map/definitions.rs b/src/librustc/hir/map/definitions.rs index 7ecbf7ebbaff0..4abee7a179ab4 100644 --- a/src/librustc/hir/map/definitions.rs +++ b/src/librustc/hir/map/definitions.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! For each definition, we track the following data. A definition //! here is defined somewhat circularly as "something with a def-id", //! but it generally corresponds to things like structs, enums, etc. diff --git a/src/librustc/hir/map/hir_id_validator.rs b/src/librustc/hir/map/hir_id_validator.rs index a17c160c4d03e..4a22e604e1839 100644 --- a/src/librustc/hir/map/hir_id_validator.rs +++ b/src/librustc/hir/map/hir_id_validator.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use hir::def_id::{DefId, DefIndex, CRATE_DEF_INDEX}; use hir::{self, intravisit, HirId, ItemLocalId}; use syntax::ast::NodeId; diff --git a/src/librustc/hir/map/mod.rs b/src/librustc/hir/map/mod.rs index c3112da4f8c3a..91e77c652a90a 100644 --- a/src/librustc/hir/map/mod.rs +++ b/src/librustc/hir/map/mod.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub use self::Node::*; use self::MapEntry::*; use self::collector::NodeCollector; diff --git a/src/librustc/hir/mod.rs b/src/librustc/hir/mod.rs index 6bdfbd40e8d36..5cbd3092ca6d6 100644 --- a/src/librustc/hir/mod.rs +++ b/src/librustc/hir/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // The Rust HIR. pub use self::BlockCheckMode::*; diff --git a/src/librustc/hir/pat_util.rs b/src/librustc/hir/pat_util.rs index 8a714a5fbd847..8223b8379c066 100644 --- a/src/librustc/hir/pat_util.rs +++ b/src/librustc/hir/pat_util.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use hir::def::Def; use hir::def_id::DefId; use hir::{self, HirId, PatKind}; diff --git a/src/librustc/hir/print.rs b/src/librustc/hir/print.rs index 9fe462e65a2cb..3b58a2db31efc 100644 --- a/src/librustc/hir/print.rs +++ b/src/librustc/hir/print.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub use self::AnnNode::*; use rustc_target::spec::abi::Abi; diff --git a/src/librustc/ich/caching_codemap_view.rs b/src/librustc/ich/caching_codemap_view.rs index 97114779042af..dfc9a3e3a831c 100644 --- a/src/librustc/ich/caching_codemap_view.rs +++ b/src/librustc/ich/caching_codemap_view.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc_data_structures::sync::Lrc; use syntax::source_map::SourceMap; use syntax_pos::{BytePos, SourceFile}; diff --git a/src/librustc/ich/hcx.rs b/src/librustc/ich/hcx.rs index f03ad98c7dee4..6120e1bd6e848 100644 --- a/src/librustc/ich/hcx.rs +++ b/src/librustc/ich/hcx.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use hir; use hir::def_id::{DefId, DefIndex}; use hir::map::DefPathHash; diff --git a/src/librustc/ich/impls_cstore.rs b/src/librustc/ich/impls_cstore.rs index f8cd3b8a18a3b..fdea62a1dd8f6 100644 --- a/src/librustc/ich/impls_cstore.rs +++ b/src/librustc/ich/impls_cstore.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This module contains `HashStable` implementations for various data types //! from rustc::middle::cstore in no particular order. diff --git a/src/librustc/ich/impls_hir.rs b/src/librustc/ich/impls_hir.rs index e82ef8bbdae55..b95ccdf693215 100644 --- a/src/librustc/ich/impls_hir.rs +++ b/src/librustc/ich/impls_hir.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This module contains `HashStable` implementations for various HIR data //! types in no particular order. diff --git a/src/librustc/ich/impls_mir.rs b/src/librustc/ich/impls_mir.rs index 38ea536b4ee72..4571b560a0dcd 100644 --- a/src/librustc/ich/impls_mir.rs +++ b/src/librustc/ich/impls_mir.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This module contains `HashStable` implementations for various MIR data //! types in no particular order. diff --git a/src/librustc/ich/impls_misc.rs b/src/librustc/ich/impls_misc.rs index db40417917547..f79adc8109a7f 100644 --- a/src/librustc/ich/impls_misc.rs +++ b/src/librustc/ich/impls_misc.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This module contains `HashStable` implementations for various data types //! that don't fit into any of the other impls_xxx modules. diff --git a/src/librustc/ich/impls_syntax.rs b/src/librustc/ich/impls_syntax.rs index 4811f84635c7f..caba85a3f442b 100644 --- a/src/librustc/ich/impls_syntax.rs +++ b/src/librustc/ich/impls_syntax.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This module contains `HashStable` implementations for various data types //! from libsyntax in no particular order. diff --git a/src/librustc/ich/impls_ty.rs b/src/librustc/ich/impls_ty.rs index 1c331d53a2a3c..5af84725cd03e 100644 --- a/src/librustc/ich/impls_ty.rs +++ b/src/librustc/ich/impls_ty.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This module contains `HashStable` implementations for various data types //! from rustc::ty in no particular order. diff --git a/src/librustc/ich/mod.rs b/src/librustc/ich/mod.rs index 6e5134c3c0545..a06da2587e9b3 100644 --- a/src/librustc/ich/mod.rs +++ b/src/librustc/ich/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! ICH - Incremental Compilation Hash crate use rustc_data_structures::fingerprint::Fingerprint; diff --git a/src/librustc/infer/anon_types/mod.rs b/src/librustc/infer/anon_types/mod.rs index 96c64c05ccfbd..018928825943d 100644 --- a/src/librustc/infer/anon_types/mod.rs +++ b/src/librustc/infer/anon_types/mod.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use hir::def_id::DefId; use hir; use infer::{self, InferCtxt, InferOk, TypeVariableOrigin}; diff --git a/src/librustc/infer/at.rs b/src/librustc/infer/at.rs index 89dbc76c8a65c..6a9bcea659823 100644 --- a/src/librustc/infer/at.rs +++ b/src/librustc/infer/at.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A nice interface for working with the infcx. The basic idea is to //! do `infcx.at(cause, param_env)`, which sets the "cause" of the //! operation as well as the surrounding parameter environment. Then diff --git a/src/librustc/infer/canonical/canonicalizer.rs b/src/librustc/infer/canonical/canonicalizer.rs index fbe9165ae97fa..7efea23e73fa4 100644 --- a/src/librustc/infer/canonical/canonicalizer.rs +++ b/src/librustc/infer/canonical/canonicalizer.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This module contains the "canonicalizer" itself. //! //! For an overview of what canonicaliation is and how it fits into diff --git a/src/librustc/infer/canonical/mod.rs b/src/librustc/infer/canonical/mod.rs index 2e57ef7b17d44..1bfb67d0a72db 100644 --- a/src/librustc/infer/canonical/mod.rs +++ b/src/librustc/infer/canonical/mod.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! **Canonicalization** is the key to constructing a query in the //! middle of type inference. Ordinarily, it is not possible to store //! types from type inference in query keys, because they contain diff --git a/src/librustc/infer/canonical/query_result.rs b/src/librustc/infer/canonical/query_result.rs index 341089d8a815f..0ef5bdb564b5b 100644 --- a/src/librustc/infer/canonical/query_result.rs +++ b/src/librustc/infer/canonical/query_result.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This module contains the code to instantiate a "query result", and //! in particular to extract out the resulting region obligations and //! encode them therein. diff --git a/src/librustc/infer/canonical/substitute.rs b/src/librustc/infer/canonical/substitute.rs index f3fe01d5fd121..62677a335c6d7 100644 --- a/src/librustc/infer/canonical/substitute.rs +++ b/src/librustc/infer/canonical/substitute.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This module contains code to substitute new values into a //! `Canonical<'tcx, T>`. //! diff --git a/src/librustc/infer/combine.rs b/src/librustc/infer/combine.rs index 4738a03cbd3ec..92d691ccc5a81 100644 --- a/src/librustc/infer/combine.rs +++ b/src/librustc/infer/combine.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /////////////////////////////////////////////////////////////////////////// // # Type combining // diff --git a/src/librustc/infer/equate.rs b/src/librustc/infer/equate.rs index 26eb2ffbf6aba..cf77a31439566 100644 --- a/src/librustc/infer/equate.rs +++ b/src/librustc/infer/equate.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::combine::{CombineFields, RelationDir}; use super::{Subtype}; diff --git a/src/librustc/infer/error_reporting/mod.rs b/src/librustc/infer/error_reporting/mod.rs index 02da3701db297..47ffd54d6f12a 100644 --- a/src/librustc/infer/error_reporting/mod.rs +++ b/src/librustc/infer/error_reporting/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Error Reporting Code for the inference engine //! //! Because of the way inference, and in particular region inference, diff --git a/src/librustc/infer/error_reporting/need_type_info.rs b/src/librustc/infer/error_reporting/need_type_info.rs index 505b1bc032d20..5a490365125a8 100644 --- a/src/librustc/infer/error_reporting/need_type_info.rs +++ b/src/librustc/infer/error_reporting/need_type_info.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use hir::{self, Local, Pat, Body, HirId}; use hir::intravisit::{self, Visitor, NestedVisitorMap}; use infer::InferCtxt; diff --git a/src/librustc/infer/error_reporting/nice_region_error/different_lifetimes.rs b/src/librustc/infer/error_reporting/nice_region_error/different_lifetimes.rs index 168285b455f0a..dd586f12016b7 100644 --- a/src/librustc/infer/error_reporting/nice_region_error/different_lifetimes.rs +++ b/src/librustc/infer/error_reporting/nice_region_error/different_lifetimes.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Error Reporting for Anonymous Region Lifetime Errors //! where both the regions are anonymous. diff --git a/src/librustc/infer/error_reporting/nice_region_error/find_anon_type.rs b/src/librustc/infer/error_reporting/nice_region_error/find_anon_type.rs index 21be09b0ba193..bc2bf0f16bee8 100644 --- a/src/librustc/infer/error_reporting/nice_region_error/find_anon_type.rs +++ b/src/librustc/infer/error_reporting/nice_region_error/find_anon_type.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use hir; use ty::{self, Region, TyCtxt}; use hir::map as hir_map; diff --git a/src/librustc/infer/error_reporting/nice_region_error/mod.rs b/src/librustc/infer/error_reporting/nice_region_error/mod.rs index 0ff5630f63ed0..ecf59daeaf12e 100644 --- a/src/librustc/infer/error_reporting/nice_region_error/mod.rs +++ b/src/librustc/infer/error_reporting/nice_region_error/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use infer::InferCtxt; use infer::lexical_region_resolve::RegionResolutionError; use infer::lexical_region_resolve::RegionResolutionError::*; diff --git a/src/librustc/infer/error_reporting/nice_region_error/named_anon_conflict.rs b/src/librustc/infer/error_reporting/nice_region_error/named_anon_conflict.rs index 4e26a4178b95d..ae2e6386277f0 100644 --- a/src/librustc/infer/error_reporting/nice_region_error/named_anon_conflict.rs +++ b/src/librustc/infer/error_reporting/nice_region_error/named_anon_conflict.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Error Reporting for Anonymous Region Lifetime Errors //! where one region is named and the other is anonymous. use infer::error_reporting::nice_region_error::NiceRegionError; diff --git a/src/librustc/infer/error_reporting/nice_region_error/outlives_closure.rs b/src/librustc/infer/error_reporting/nice_region_error/outlives_closure.rs index f4ef197e5b422..d53b69fcdcb19 100644 --- a/src/librustc/infer/error_reporting/nice_region_error/outlives_closure.rs +++ b/src/librustc/infer/error_reporting/nice_region_error/outlives_closure.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Error Reporting for Anonymous Region Lifetime Errors //! where both the regions are anonymous. diff --git a/src/librustc/infer/error_reporting/nice_region_error/static_impl_trait.rs b/src/librustc/infer/error_reporting/nice_region_error/static_impl_trait.rs index d25dcd5b045ca..0a6f61d375cb9 100644 --- a/src/librustc/infer/error_reporting/nice_region_error/static_impl_trait.rs +++ b/src/librustc/infer/error_reporting/nice_region_error/static_impl_trait.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Error Reporting for static impl Traits. use infer::error_reporting::nice_region_error::NiceRegionError; diff --git a/src/librustc/infer/error_reporting/nice_region_error/util.rs b/src/librustc/infer/error_reporting/nice_region_error/util.rs index 8cb0df18bc8ff..8fdf5528c14c8 100644 --- a/src/librustc/infer/error_reporting/nice_region_error/util.rs +++ b/src/librustc/infer/error_reporting/nice_region_error/util.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Helper functions corresponding to lifetime errors due to //! anonymous regions. use hir; diff --git a/src/librustc/infer/error_reporting/note.rs b/src/librustc/infer/error_reporting/note.rs index 02ec9fe74c1fe..ed1f37c2edb5b 100644 --- a/src/librustc/infer/error_reporting/note.rs +++ b/src/librustc/infer/error_reporting/note.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use infer::{self, InferCtxt, SubregionOrigin}; use middle::region; use ty::{self, Region}; diff --git a/src/librustc/infer/freshen.rs b/src/librustc/infer/freshen.rs index 4673aac1872ff..bb6a79dcc2dea 100644 --- a/src/librustc/infer/freshen.rs +++ b/src/librustc/infer/freshen.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Freshening is the process of replacing unknown variables with fresh types. The idea is that //! the type, after freshening, contains no inference variables but instead contains either a //! value for each variable or fresh "arbitrary" types wherever a variable would have been. diff --git a/src/librustc/infer/fudge.rs b/src/librustc/infer/fudge.rs index 39dc24b86e72a..a38db5d210f7b 100644 --- a/src/librustc/infer/fudge.rs +++ b/src/librustc/infer/fudge.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use infer::type_variable::TypeVariableMap; use ty::{self, Ty, TyCtxt}; use ty::fold::{TypeFoldable, TypeFolder}; diff --git a/src/librustc/infer/glb.rs b/src/librustc/infer/glb.rs index fd14e0e40e234..cd54645b77c31 100644 --- a/src/librustc/infer/glb.rs +++ b/src/librustc/infer/glb.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::combine::CombineFields; use super::InferCtxt; use super::lattice::{self, LatticeDir}; diff --git a/src/librustc/infer/higher_ranked/mod.rs b/src/librustc/infer/higher_ranked/mod.rs index bb1c9448132c1..778f95f83e7e6 100644 --- a/src/librustc/infer/higher_ranked/mod.rs +++ b/src/librustc/infer/higher_ranked/mod.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Helper routines for higher-ranked things. See the `doc` module at //! the end of the file for details. diff --git a/src/librustc/infer/lattice.rs b/src/librustc/infer/lattice.rs index 6848c625b5a1f..a8794b4076a9d 100644 --- a/src/librustc/infer/lattice.rs +++ b/src/librustc/infer/lattice.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! # Lattice Variables //! //! This file contains generic code for operating on inference variables diff --git a/src/librustc/infer/lexical_region_resolve/graphviz.rs b/src/librustc/infer/lexical_region_resolve/graphviz.rs index bdd3f78aff3eb..d0e719814f072 100644 --- a/src/librustc/infer/lexical_region_resolve/graphviz.rs +++ b/src/librustc/infer/lexical_region_resolve/graphviz.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This module provides linkage between libgraphviz traits and //! `rustc::middle::typeck::infer::region_constraints`, generating a //! rendering of the graph represented by the list of `Constraint` diff --git a/src/librustc/infer/lexical_region_resolve/mod.rs b/src/librustc/infer/lexical_region_resolve/mod.rs index 120b45ec01e5e..0bfc5d46231d7 100644 --- a/src/librustc/infer/lexical_region_resolve/mod.rs +++ b/src/librustc/infer/lexical_region_resolve/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The code to do lexical region resolution. use infer::SubregionOrigin; diff --git a/src/librustc/infer/lub.rs b/src/librustc/infer/lub.rs index 55c7eef607bbe..ad6a4ebad01e2 100644 --- a/src/librustc/infer/lub.rs +++ b/src/librustc/infer/lub.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::combine::CombineFields; use super::InferCtxt; use super::lattice::{self, LatticeDir}; diff --git a/src/librustc/infer/mod.rs b/src/librustc/infer/mod.rs index a3c9d14eef295..fdfa61d1cbf0a 100644 --- a/src/librustc/infer/mod.rs +++ b/src/librustc/infer/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! See the Book for more information. pub use self::LateBoundRegionConversionTime::*; diff --git a/src/librustc/infer/outlives/env.rs b/src/librustc/infer/outlives/env.rs index 7f59a6794efbd..3e04e1d63aefb 100644 --- a/src/librustc/infer/outlives/env.rs +++ b/src/librustc/infer/outlives/env.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use infer::{GenericKind, InferCtxt}; use infer::outlives::free_region_map::FreeRegionMap; use traits::query::outlives_bounds::{self, OutlivesBound}; diff --git a/src/librustc/infer/outlives/free_region_map.rs b/src/librustc/infer/outlives/free_region_map.rs index 6163ec1642001..51c545276acb1 100644 --- a/src/librustc/infer/outlives/free_region_map.rs +++ b/src/librustc/infer/outlives/free_region_map.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use ty::{self, Lift, TyCtxt, Region}; use rustc_data_structures::transitive_relation::TransitiveRelation; diff --git a/src/librustc/infer/outlives/mod.rs b/src/librustc/infer/outlives/mod.rs index bb3703b215732..4111726c6de22 100644 --- a/src/librustc/infer/outlives/mod.rs +++ b/src/librustc/infer/outlives/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Various code related to computing outlives relations. pub mod env; diff --git a/src/librustc/infer/outlives/obligations.rs b/src/librustc/infer/outlives/obligations.rs index 817280b97e031..5b7b084d8fcaa 100644 --- a/src/librustc/infer/outlives/obligations.rs +++ b/src/librustc/infer/outlives/obligations.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Code that handles "type-outlives" constraints like `T: 'a`. This //! is based on the `outlives_components` function defined on the tcx, //! but it adds a bit of heuristics on top, in particular to deal with diff --git a/src/librustc/infer/region_constraints/mod.rs b/src/librustc/infer/region_constraints/mod.rs index 296808cea2bd7..22ddbfce131de 100644 --- a/src/librustc/infer/region_constraints/mod.rs +++ b/src/librustc/infer/region_constraints/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! See README.md use self::UndoLogEntry::*; diff --git a/src/librustc/infer/region_constraints/taint.rs b/src/librustc/infer/region_constraints/taint.rs index ee45f7bd82801..ca49d0d34fe14 100644 --- a/src/librustc/infer/region_constraints/taint.rs +++ b/src/librustc/infer/region_constraints/taint.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::*; #[derive(Debug)] diff --git a/src/librustc/infer/resolve.rs b/src/librustc/infer/resolve.rs index be13fb9a2a5eb..338b0ac036ade 100644 --- a/src/librustc/infer/resolve.rs +++ b/src/librustc/infer/resolve.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::{InferCtxt, FixupError, FixupResult}; use ty::{self, Ty, TyCtxt, TypeFoldable}; use ty::fold::{TypeFolder, TypeVisitor}; diff --git a/src/librustc/infer/sub.rs b/src/librustc/infer/sub.rs index 048810c042722..b9050834ccf6b 100644 --- a/src/librustc/infer/sub.rs +++ b/src/librustc/infer/sub.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::SubregionOrigin; use super::combine::{CombineFields, RelationDir}; diff --git a/src/librustc/infer/type_variable.rs b/src/librustc/infer/type_variable.rs index b1e4fc7c7fc7b..fa55c56f74c68 100644 --- a/src/librustc/infer/type_variable.rs +++ b/src/librustc/infer/type_variable.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use syntax::symbol::InternedString; use syntax_pos::Span; use ty::{self, Ty}; diff --git a/src/librustc/infer/unify_key.rs b/src/librustc/infer/unify_key.rs index a1145572b79d9..4501ac4a4aae9 100644 --- a/src/librustc/infer/unify_key.rs +++ b/src/librustc/infer/unify_key.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use ty::{self, FloatVarValue, IntVarValue, Ty, TyCtxt}; use rustc_data_structures::unify::{NoError, EqUnifyValue, UnifyKey, UnifyValue}; diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs index d43ebf8d415a7..88b1595fe74d4 100644 --- a/src/librustc/lib.rs +++ b/src/librustc/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The "main crate" of the Rust compiler. This crate contains common //! type definitions that are used by the other crates in the rustc //! "family". Some prominent examples (note that each of these modules diff --git a/src/librustc/lint/builtin.rs b/src/librustc/lint/builtin.rs index 6783415619f98..e604ddf6afff7 100644 --- a/src/librustc/lint/builtin.rs +++ b/src/librustc/lint/builtin.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Some lints that are built in to the compiler. //! //! These are the built-in lints that are emitted direct in the main diff --git a/src/librustc/lint/context.rs b/src/librustc/lint/context.rs index 315ed38ad0770..1ba12a1503d91 100644 --- a/src/librustc/lint/context.rs +++ b/src/librustc/lint/context.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Implementation of lint checking. //! //! The lint checking is mostly consolidated into one pass which runs diff --git a/src/librustc/lint/levels.rs b/src/librustc/lint/levels.rs index 5b9ddabf21c1b..c80978fcc3b83 100644 --- a/src/librustc/lint/levels.rs +++ b/src/librustc/lint/levels.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cmp; use errors::{Applicability, DiagnosticBuilder}; diff --git a/src/librustc/lint/mod.rs b/src/librustc/lint/mod.rs index 5872440c36250..d23b0ebe091f8 100644 --- a/src/librustc/lint/mod.rs +++ b/src/librustc/lint/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Lints, aka compiler warnings. //! //! A 'lint' check is a kind of miscellaneous constraint that a user _might_ diff --git a/src/librustc/macros.rs b/src/librustc/macros.rs index 759ac1a7952f7..c9ad388067bfe 100644 --- a/src/librustc/macros.rs +++ b/src/librustc/macros.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength macro_rules! enum_from_u32 { diff --git a/src/librustc/middle/allocator.rs b/src/librustc/middle/allocator.rs index 79a9ef0e8b577..bb2e3b4ec1971 100644 --- a/src/librustc/middle/allocator.rs +++ b/src/librustc/middle/allocator.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Clone, Copy)] pub enum AllocatorKind { Global, diff --git a/src/librustc/middle/borrowck.rs b/src/librustc/middle/borrowck.rs index c8d513a59f00d..d9cc173f113cb 100644 --- a/src/librustc/middle/borrowck.rs +++ b/src/librustc/middle/borrowck.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use ich::StableHashingContext; use hir::HirId; use util::nodemap::FxHashSet; diff --git a/src/librustc/middle/cstore.rs b/src/librustc/middle/cstore.rs index f4b4404338961..d68fe5eed8fab 100644 --- a/src/librustc/middle/cstore.rs +++ b/src/librustc/middle/cstore.rs @@ -1,23 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! the rustc crate store interface. This also includes types that //! are *mostly* used as a part of that interface, but these should //! probably get a better home if someone can find one. diff --git a/src/librustc/middle/dead.rs b/src/librustc/middle/dead.rs index ba04842ac7c0a..855a09c4933d2 100644 --- a/src/librustc/middle/dead.rs +++ b/src/librustc/middle/dead.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This implements the dead-code warning pass. It follows middle::reachable // closely. The idea is that all reachable symbols are live, codes called // from live codes are live, and everything else is dead. diff --git a/src/librustc/middle/dependency_format.rs b/src/librustc/middle/dependency_format.rs index a9c118d606b2e..9482d09e030b2 100644 --- a/src/librustc/middle/dependency_format.rs +++ b/src/librustc/middle/dependency_format.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Resolution of mixing rlibs and dylibs //! //! When producing a final artifact, such as a dynamic library, the compiler has diff --git a/src/librustc/middle/entry.rs b/src/librustc/middle/entry.rs index b0acc6f20e691..19c11a0f49148 100644 --- a/src/librustc/middle/entry.rs +++ b/src/librustc/middle/entry.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use hir::map as hir_map; use hir::def_id::{CRATE_DEF_INDEX}; use session::{config, Session}; diff --git a/src/librustc/middle/exported_symbols.rs b/src/librustc/middle/exported_symbols.rs index 01783eb0ff65f..5e841f290e35f 100644 --- a/src/librustc/middle/exported_symbols.rs +++ b/src/librustc/middle/exported_symbols.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use hir::def_id::{DefId, LOCAL_CRATE}; use ich::StableHashingContext; use rustc_data_structures::stable_hasher::{StableHasher, HashStable, diff --git a/src/librustc/middle/expr_use_visitor.rs b/src/librustc/middle/expr_use_visitor.rs index 90692bcd30103..29b199bbd949b 100644 --- a/src/librustc/middle/expr_use_visitor.rs +++ b/src/librustc/middle/expr_use_visitor.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A different sort of visitor for walking fn bodies. Unlike the //! normal visitor, which just walks the entire body in one shot, the //! `ExprUseVisitor` determines how expressions are being used. diff --git a/src/librustc/middle/free_region.rs b/src/librustc/middle/free_region.rs index 1341e3515d571..6e9eadca6a521 100644 --- a/src/librustc/middle/free_region.rs +++ b/src/librustc/middle/free_region.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This file handles the relationships between free regions -- //! meaning lifetime parameters. Ordinarily, free regions are //! unrelated to one another, but they can be related via implied or diff --git a/src/librustc/middle/intrinsicck.rs b/src/librustc/middle/intrinsicck.rs index 8058f3dde668d..9117f359009b8 100644 --- a/src/librustc/middle/intrinsicck.rs +++ b/src/librustc/middle/intrinsicck.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use hir::def::Def; use hir::def_id::DefId; use ty::{self, Ty, TyCtxt}; diff --git a/src/librustc/middle/lang_items.rs b/src/librustc/middle/lang_items.rs index 8c300a0aba0ec..847466d59f896 100644 --- a/src/librustc/middle/lang_items.rs +++ b/src/librustc/middle/lang_items.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Detecting language items. // // Language items are items that represent concepts intrinsic to the language diff --git a/src/librustc/middle/lib_features.rs b/src/librustc/middle/lib_features.rs index ec618de677318..f63b744a19b79 100644 --- a/src/librustc/middle/lib_features.rs +++ b/src/librustc/middle/lib_features.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Detecting lib features (i.e. features that are not lang features). // // These are declared using stability attributes (e.g. `#[stable (..)]` diff --git a/src/librustc/middle/liveness.rs b/src/librustc/middle/liveness.rs index 7d9590ee578e6..0ca6de9537d84 100644 --- a/src/librustc/middle/liveness.rs +++ b/src/librustc/middle/liveness.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A classic liveness analysis based on dataflow over the AST. Computes, //! for each local variable in a function, whether that variable is live //! at a given point. Program execution points are identified by their diff --git a/src/librustc/middle/mem_categorization.rs b/src/librustc/middle/mem_categorization.rs index e0ed0f1da509e..6fe5ee7be9503 100644 --- a/src/librustc/middle/mem_categorization.rs +++ b/src/librustc/middle/mem_categorization.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! # Categorization //! //! The job of the categorization module is to analyze an expression to diff --git a/src/librustc/middle/privacy.rs b/src/librustc/middle/privacy.rs index e2de0b6bd013d..09de6a54ae50d 100644 --- a/src/librustc/middle/privacy.rs +++ b/src/librustc/middle/privacy.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A pass that checks to make sure private fields and methods aren't used //! outside their scopes. This pass will also generate a set of exported items //! which are available for use externally when compiled as a library. diff --git a/src/librustc/middle/reachable.rs b/src/librustc/middle/reachable.rs index 3d8bb6b825b38..f5a225196b169 100644 --- a/src/librustc/middle/reachable.rs +++ b/src/librustc/middle/reachable.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Finds items that are externally reachable, to determine which items // need to have their metadata (and possibly their AST) serialized. // All items that can be referred to through an exported name are diff --git a/src/librustc/middle/recursion_limit.rs b/src/librustc/middle/recursion_limit.rs index 077a20315a2af..ea83432a80184 100644 --- a/src/librustc/middle/recursion_limit.rs +++ b/src/librustc/middle/recursion_limit.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Recursion limit. // // There are various parts of the compiler that must impose arbitrary limits diff --git a/src/librustc/middle/region.rs b/src/librustc/middle/region.rs index be1d93dbad1b8..1813610935275 100644 --- a/src/librustc/middle/region.rs +++ b/src/librustc/middle/region.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This file builds up the `ScopeTree`, which describes //! the parent links in the region hierarchy. //! diff --git a/src/librustc/middle/resolve_lifetime.rs b/src/librustc/middle/resolve_lifetime.rs index 379f4df11fa7b..e86ba448eaabe 100644 --- a/src/librustc/middle/resolve_lifetime.rs +++ b/src/librustc/middle/resolve_lifetime.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Name resolution for lifetimes. //! //! Name resolution for lifetimes follows MUCH simpler rules than the diff --git a/src/librustc/middle/stability.rs b/src/librustc/middle/stability.rs index 85195b0f62e7c..63edd4c7ffdbc 100644 --- a/src/librustc/middle/stability.rs +++ b/src/librustc/middle/stability.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A pass that annotates every item and method with its stability level, //! propagating default levels lexically from parent to children ast nodes. diff --git a/src/librustc/middle/weak_lang_items.rs b/src/librustc/middle/weak_lang_items.rs index e8431ce3e109b..899c51354fba2 100644 --- a/src/librustc/middle/weak_lang_items.rs +++ b/src/librustc/middle/weak_lang_items.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Validity checking for weak lang items use session::config; diff --git a/src/librustc/mir/cache.rs b/src/librustc/mir/cache.rs index 41ba526b73fef..12b15a0ad9aeb 100644 --- a/src/librustc/mir/cache.rs +++ b/src/librustc/mir/cache.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc_data_structures::indexed_vec::IndexVec; use rustc_data_structures::sync::{RwLock, ReadGuard}; use rustc_data_structures::stable_hasher::{HashStable, StableHasher, diff --git a/src/librustc/mir/mod.rs b/src/librustc/mir/mod.rs index 14981a700a32e..026b806cd1d4f 100644 --- a/src/librustc/mir/mod.rs +++ b/src/librustc/mir/mod.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! MIR datatypes and passes. See the [rustc guide] for more info. //! //! [rustc guide]: https://rust-lang-nursery.github.io/rustc-guide/mir/index.html diff --git a/src/librustc/mir/mono.rs b/src/librustc/mir/mono.rs index 9d2f62bd03046..e5c94846f50cc 100644 --- a/src/librustc/mir/mono.rs +++ b/src/librustc/mir/mono.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use hir::def_id::{DefId, CrateNum}; use syntax::ast::NodeId; use syntax::symbol::{Symbol, InternedString}; diff --git a/src/librustc/mir/tcx.rs b/src/librustc/mir/tcx.rs index ec395478ec6b5..1e2fe75975779 100644 --- a/src/librustc/mir/tcx.rs +++ b/src/librustc/mir/tcx.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /*! * Methods for the various MIR types. These are intended for use after * building is complete. diff --git a/src/librustc/mir/traversal.rs b/src/librustc/mir/traversal.rs index c919793fe3e03..747dadf3a1386 100644 --- a/src/librustc/mir/traversal.rs +++ b/src/librustc/mir/traversal.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc_data_structures::bitvec::BitArray; use super::*; diff --git a/src/librustc/mir/visit.rs b/src/librustc/mir/visit.rs index cab6ed0c122cd..f77c4b8208c7e 100644 --- a/src/librustc/mir/visit.rs +++ b/src/librustc/mir/visit.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use hir::def_id::DefId; use ty::subst::Substs; use ty::{CanonicalTy, ClosureSubsts, GeneratorSubsts, Region, Ty}; diff --git a/src/librustc/session/code_stats.rs b/src/librustc/session/code_stats.rs index 32865acb298fa..852fedffecccf 100644 --- a/src/librustc/session/code_stats.rs +++ b/src/librustc/session/code_stats.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc_target::abi::{Align, Size}; use rustc_data_structures::fx::{FxHashSet}; use std::cmp::{self, Ordering}; diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs index d594678625288..6db6921ab3c29 100644 --- a/src/librustc/session/config.rs +++ b/src/librustc/session/config.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Contains infrastructure for configuring the compiler, including parsing //! command line options. diff --git a/src/librustc/session/filesearch.rs b/src/librustc/session/filesearch.rs index 32044fdf2a8cb..1a8bb19061099 100644 --- a/src/librustc/session/filesearch.rs +++ b/src/librustc/session/filesearch.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(non_camel_case_types)] pub use self::FileMatch::*; diff --git a/src/librustc/session/mod.rs b/src/librustc/session/mod.rs index ef81cd3a4575e..353208162536c 100644 --- a/src/librustc/session/mod.rs +++ b/src/librustc/session/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub use self::code_stats::{DataTypeKind, SizeKind, FieldInfo, VariantInfo}; use self::code_stats::CodeStats; diff --git a/src/librustc/session/search_paths.rs b/src/librustc/session/search_paths.rs index d2dca9f60845a..3995f024bc9f8 100644 --- a/src/librustc/session/search_paths.rs +++ b/src/librustc/session/search_paths.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::slice; use std::path::{Path, PathBuf}; use session::{early_error, config}; diff --git a/src/librustc/traits/auto_trait.rs b/src/librustc/traits/auto_trait.rs index ed95aa73078a9..86e022aa5511d 100644 --- a/src/librustc/traits/auto_trait.rs +++ b/src/librustc/traits/auto_trait.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Support code for rustdoc and external tools . You really don't //! want to be using this unless you need to. diff --git a/src/librustc/traits/codegen/mod.rs b/src/librustc/traits/codegen/mod.rs index cf404202ac120..db456c7a52103 100644 --- a/src/librustc/traits/codegen/mod.rs +++ b/src/librustc/traits/codegen/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file contains various trait resolution methods used by codegen. // They all assume regions can be erased and monomorphic types. It // seems likely that they should eventually be merged into more diff --git a/src/librustc/traits/coherence.rs b/src/librustc/traits/coherence.rs index c283c4d3caba3..ff415c5686abe 100644 --- a/src/librustc/traits/coherence.rs +++ b/src/librustc/traits/coherence.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! See rustc guide chapters on [trait-resolution] and [trait-specialization] for more info on how //! this works. //! diff --git a/src/librustc/traits/engine.rs b/src/librustc/traits/engine.rs index acbf5392cf54c..63c5bb9d5dfda 100644 --- a/src/librustc/traits/engine.rs +++ b/src/librustc/traits/engine.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use infer::InferCtxt; use ty::{self, Ty, TyCtxt}; use hir::def_id::DefId; diff --git a/src/librustc/traits/error_reporting.rs b/src/librustc/traits/error_reporting.rs index 0aa15a4ae0c25..534170c1f1272 100644 --- a/src/librustc/traits/error_reporting.rs +++ b/src/librustc/traits/error_reporting.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::{ FulfillmentError, FulfillmentErrorCode, diff --git a/src/librustc/traits/fulfill.rs b/src/librustc/traits/fulfill.rs index 5c977e1bf624b..4286f2e70cd8d 100644 --- a/src/librustc/traits/fulfill.rs +++ b/src/librustc/traits/fulfill.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use infer::{RegionObligation, InferCtxt}; use mir::interpret::GlobalId; use ty::{self, Ty, TypeFoldable, ToPolyTraitRef, ToPredicate}; diff --git a/src/librustc/traits/mod.rs b/src/librustc/traits/mod.rs index e2dbe88354060..22540035b1ebe 100644 --- a/src/librustc/traits/mod.rs +++ b/src/librustc/traits/mod.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Trait Resolution. See [rustc guide] for more info on how this works. //! //! [rustc guide]: https://rust-lang-nursery.github.io/rustc-guide/traits/resolution.html diff --git a/src/librustc/traits/object_safety.rs b/src/librustc/traits/object_safety.rs index 17d55b77625b2..d4b2b6ce4843a 100644 --- a/src/librustc/traits/object_safety.rs +++ b/src/librustc/traits/object_safety.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! "Object safety" refers to the ability for a trait to be converted //! to an object. In general, traits may only be converted to an //! object if all of their methods meet certain criteria. In particular, diff --git a/src/librustc/traits/on_unimplemented.rs b/src/librustc/traits/on_unimplemented.rs index 280ce75720bcf..5df213b2b9e70 100644 --- a/src/librustc/traits/on_unimplemented.rs +++ b/src/librustc/traits/on_unimplemented.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use fmt_macros::{Parser, Piece, Position}; use hir::def_id::DefId; diff --git a/src/librustc/traits/project.rs b/src/librustc/traits/project.rs index 939ba92c7badf..77e35ba728dc9 100644 --- a/src/librustc/traits/project.rs +++ b/src/librustc/traits/project.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Code for projecting associated types out of trait references. use super::elaborate_predicates; diff --git a/src/librustc/traits/query/dropck_outlives.rs b/src/librustc/traits/query/dropck_outlives.rs index 3a0f770082409..e8003da90fcdb 100644 --- a/src/librustc/traits/query/dropck_outlives.rs +++ b/src/librustc/traits/query/dropck_outlives.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use infer::at::At; use infer::InferOk; use smallvec::SmallVec; diff --git a/src/librustc/traits/query/evaluate_obligation.rs b/src/librustc/traits/query/evaluate_obligation.rs index 6bd9267836254..e11b582c8c7c6 100644 --- a/src/librustc/traits/query/evaluate_obligation.rs +++ b/src/librustc/traits/query/evaluate_obligation.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use infer::InferCtxt; use smallvec::SmallVec; use traits::{EvaluationResult, PredicateObligation, SelectionContext, diff --git a/src/librustc/traits/query/mod.rs b/src/librustc/traits/query/mod.rs index 35f17aebc0443..8e6f32981e5ce 100644 --- a/src/librustc/traits/query/mod.rs +++ b/src/librustc/traits/query/mod.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Experimental types for the trait query interface. The methods //! defined in this module are all based on **canonicalization**, //! which makes a canonical query by replacing unbound inference diff --git a/src/librustc/traits/query/normalize.rs b/src/librustc/traits/query/normalize.rs index 8b4954cc501dd..83a7a17b8bbc6 100644 --- a/src/librustc/traits/query/normalize.rs +++ b/src/librustc/traits/query/normalize.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Code for the 'normalization' query. This consists of a wrapper //! which folds deeply, invoking the underlying //! `normalize_projection_ty` query when it encounters projections. diff --git a/src/librustc/traits/query/normalize_erasing_regions.rs b/src/librustc/traits/query/normalize_erasing_regions.rs index 1cb96a3e33f43..e7034065bdf2e 100644 --- a/src/librustc/traits/query/normalize_erasing_regions.rs +++ b/src/librustc/traits/query/normalize_erasing_regions.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Methods for normalizing when you don't care about regions (and //! aren't doing type inference). If either of those things don't //! apply to you, use `infcx.normalize(...)`. diff --git a/src/librustc/traits/query/outlives_bounds.rs b/src/librustc/traits/query/outlives_bounds.rs index 47c8ee357fbe8..4b95ad42ee778 100644 --- a/src/librustc/traits/query/outlives_bounds.rs +++ b/src/librustc/traits/query/outlives_bounds.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use infer::InferCtxt; use syntax::ast; use syntax::source_map::Span; diff --git a/src/librustc/traits/query/type_op/custom.rs b/src/librustc/traits/query/type_op/custom.rs index 737388ad41101..b0cca4bdd9e98 100644 --- a/src/librustc/traits/query/type_op/custom.rs +++ b/src/librustc/traits/query/type_op/custom.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use infer::{InferCtxt, InferOk}; use std::fmt; use traits::query::Fallible; diff --git a/src/librustc/traits/query/type_op/eq.rs b/src/librustc/traits/query/type_op/eq.rs index 52a087cbc8069..7add93fdad65f 100644 --- a/src/librustc/traits/query/type_op/eq.rs +++ b/src/librustc/traits/query/type_op/eq.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use infer::canonical::{Canonical, Canonicalized, CanonicalizedQueryResult, QueryResult}; use traits::query::Fallible; use ty::{ParamEnvAnd, Ty, TyCtxt}; diff --git a/src/librustc/traits/query/type_op/mod.rs b/src/librustc/traits/query/type_op/mod.rs index 3b16dab22f2c2..d4cb51aa06e20 100644 --- a/src/librustc/traits/query/type_op/mod.rs +++ b/src/librustc/traits/query/type_op/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use infer::canonical::{Canonical, Canonicalized, CanonicalizedQueryResult, QueryRegionConstraint, QueryResult}; use infer::{InferCtxt, InferOk}; diff --git a/src/librustc/traits/query/type_op/normalize.rs b/src/librustc/traits/query/type_op/normalize.rs index 0c393fa4ca80f..9d93d2434c78e 100644 --- a/src/librustc/traits/query/type_op/normalize.rs +++ b/src/librustc/traits/query/type_op/normalize.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use infer::canonical::{Canonical, Canonicalized, CanonicalizedQueryResult, QueryResult}; use std::fmt; use traits::query::Fallible; diff --git a/src/librustc/traits/query/type_op/outlives.rs b/src/librustc/traits/query/type_op/outlives.rs index e41ae7a72f9c2..2304676a14b00 100644 --- a/src/librustc/traits/query/type_op/outlives.rs +++ b/src/librustc/traits/query/type_op/outlives.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use infer::canonical::{Canonical, Canonicalized, CanonicalizedQueryResult, QueryResult}; use traits::query::dropck_outlives::trivial_dropck_outlives; use traits::query::dropck_outlives::DropckOutlivesResult; diff --git a/src/librustc/traits/query/type_op/prove_predicate.rs b/src/librustc/traits/query/type_op/prove_predicate.rs index e1b3b3c436dab..f5a43e5b1e6a1 100644 --- a/src/librustc/traits/query/type_op/prove_predicate.rs +++ b/src/librustc/traits/query/type_op/prove_predicate.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use infer::canonical::{Canonical, Canonicalized, CanonicalizedQueryResult, QueryResult}; use traits::query::Fallible; use ty::{ParamEnvAnd, Predicate, TyCtxt}; diff --git a/src/librustc/traits/query/type_op/subtype.rs b/src/librustc/traits/query/type_op/subtype.rs index dc41bb1d6ab69..20405372eecbd 100644 --- a/src/librustc/traits/query/type_op/subtype.rs +++ b/src/librustc/traits/query/type_op/subtype.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use infer::canonical::{Canonical, Canonicalized, CanonicalizedQueryResult, QueryResult}; use traits::query::Fallible; use ty::{ParamEnvAnd, Ty, TyCtxt}; diff --git a/src/librustc/traits/select.rs b/src/librustc/traits/select.rs index dd383732bf827..f18c09ce7106f 100644 --- a/src/librustc/traits/select.rs +++ b/src/librustc/traits/select.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! See [rustc guide] for more info on how this works. //! //! [rustc guide]: https://rust-lang-nursery.github.io/rustc-guide/traits/resolution.html#selection diff --git a/src/librustc/traits/specialize/mod.rs b/src/librustc/traits/specialize/mod.rs index 9343eff9e79b4..c5e55ea1fc1cf 100644 --- a/src/librustc/traits/specialize/mod.rs +++ b/src/librustc/traits/specialize/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Logic and data structures related to impl specialization, explained in //! greater detail below. //! diff --git a/src/librustc/traits/specialize/specialization_graph.rs b/src/librustc/traits/specialize/specialization_graph.rs index a7652574c1a2e..34baf730f9e51 100644 --- a/src/librustc/traits/specialize/specialization_graph.rs +++ b/src/librustc/traits/specialize/specialization_graph.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::OverlapError; use hir::def_id::DefId; diff --git a/src/librustc/traits/structural_impls.rs b/src/librustc/traits/structural_impls.rs index 87535a6ae8d14..e09072abcf264 100644 --- a/src/librustc/traits/structural_impls.rs +++ b/src/librustc/traits/structural_impls.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use chalk_engine; use rustc_data_structures::accumulate_vec::AccumulateVec; use traits; diff --git a/src/librustc/traits/util.rs b/src/librustc/traits/util.rs index 40f13ac06f56f..e533fadf7d3d7 100644 --- a/src/librustc/traits/util.rs +++ b/src/librustc/traits/util.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use hir::def_id::DefId; use ty::subst::{Kind, Subst, Substs}; use ty::{self, Ty, TyCtxt, ToPredicate, ToPolyTraitRef}; diff --git a/src/librustc/ty/_match.rs b/src/librustc/ty/_match.rs index c9b0e97c9b05c..fea972c8833db 100644 --- a/src/librustc/ty/_match.rs +++ b/src/librustc/ty/_match.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use ty::{self, Ty, TyCtxt}; use ty::error::TypeError; use ty::relate::{self, Relate, TypeRelation, RelateResult}; diff --git a/src/librustc/ty/adjustment.rs b/src/librustc/ty/adjustment.rs index 3263da8fda365..987b1e8999342 100644 --- a/src/librustc/ty/adjustment.rs +++ b/src/librustc/ty/adjustment.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use hir; use hir::def_id::DefId; use ty::{self, Ty, TyCtxt}; diff --git a/src/librustc/ty/binding.rs b/src/librustc/ty/binding.rs index 971b3c3d14aeb..2ab14642406b1 100644 --- a/src/librustc/ty/binding.rs +++ b/src/librustc/ty/binding.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use hir::BindingAnnotation::*; use hir::BindingAnnotation; use hir::Mutability; diff --git a/src/librustc/ty/cast.rs b/src/librustc/ty/cast.rs index c0861abb774de..040a75540a6df 100644 --- a/src/librustc/ty/cast.rs +++ b/src/librustc/ty/cast.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Helpers for handling cast expressions, used in both // typeck and codegen. diff --git a/src/librustc/ty/codec.rs b/src/librustc/ty/codec.rs index cc3e8a458a01f..0caf891f19c06 100644 --- a/src/librustc/ty/codec.rs +++ b/src/librustc/ty/codec.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This module contains some shared code for encoding and decoding various // things from the `ty` module, and in particular implements support for // "shorthands" which allow to have pointers back into the already encoded diff --git a/src/librustc/ty/context.rs b/src/librustc/ty/context.rs index 0545a88f36bdc..1e419799e9d7f 100644 --- a/src/librustc/ty/context.rs +++ b/src/librustc/ty/context.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! type context book-keeping use dep_graph::DepGraph; diff --git a/src/librustc/ty/erase_regions.rs b/src/librustc/ty/erase_regions.rs index 2fb2154ce6ba0..8ff5d23edef5e 100644 --- a/src/librustc/ty/erase_regions.rs +++ b/src/librustc/ty/erase_regions.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use ty::{self, Ty, TyCtxt}; use ty::fold::{TypeFolder, TypeFoldable}; diff --git a/src/librustc/ty/error.rs b/src/librustc/ty/error.rs index aa6ee420a2162..025e2cbce40bd 100644 --- a/src/librustc/ty/error.rs +++ b/src/librustc/ty/error.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use hir::def_id::DefId; use ty::{self, BoundRegion, Region, Ty, TyCtxt}; use std::fmt; diff --git a/src/librustc/ty/fast_reject.rs b/src/librustc/ty/fast_reject.rs index 567d1c668f7c7..5ec7592fb12be 100644 --- a/src/librustc/ty/fast_reject.rs +++ b/src/librustc/ty/fast_reject.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use hir::def_id::DefId; use ich::StableHashingContext; use rustc_data_structures::stable_hasher::{StableHasher, StableHasherResult, diff --git a/src/librustc/ty/flags.rs b/src/librustc/ty/flags.rs index b9371ec39ccda..6223fb285d51b 100644 --- a/src/librustc/ty/flags.rs +++ b/src/librustc/ty/flags.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use mir::interpret::ConstValue; use ty::subst::Substs; use ty::{self, Ty, TypeFlags, TypeFoldable}; diff --git a/src/librustc/ty/fold.rs b/src/librustc/ty/fold.rs index 26010c3d5f55c..9ad3564068632 100644 --- a/src/librustc/ty/fold.rs +++ b/src/librustc/ty/fold.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Generalized type folding mechanism. The setup is a bit convoluted //! but allows for convenient usage. Let T be an instance of some //! "foldable type" (one which implements `TypeFoldable`) and F be an diff --git a/src/librustc/ty/inhabitedness/def_id_forest.rs b/src/librustc/ty/inhabitedness/def_id_forest.rs index c152c0fb8e94c..0ecc3da6d2d2d 100644 --- a/src/librustc/ty/inhabitedness/def_id_forest.rs +++ b/src/librustc/ty/inhabitedness/def_id_forest.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::mem; use smallvec::SmallVec; use syntax::ast::CRATE_NODE_ID; diff --git a/src/librustc/ty/inhabitedness/mod.rs b/src/librustc/ty/inhabitedness/mod.rs index ef5b223620032..0a2fc7a2b7b13 100644 --- a/src/librustc/ty/inhabitedness/mod.rs +++ b/src/librustc/ty/inhabitedness/mod.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use util::nodemap::{FxHashMap, FxHashSet}; use ty::context::TyCtxt; use ty::{AdtDef, VariantDef, FieldDef, Ty, TyS}; diff --git a/src/librustc/ty/instance.rs b/src/librustc/ty/instance.rs index 68996f52b867a..701caef56b2cf 100644 --- a/src/librustc/ty/instance.rs +++ b/src/librustc/ty/instance.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use hir::def_id::DefId; use ty::{self, Ty, TypeFoldable, Substs, TyCtxt}; use traits; diff --git a/src/librustc/ty/item_path.rs b/src/librustc/ty/item_path.rs index e38bb411a14f9..924b7444397b6 100644 --- a/src/librustc/ty/item_path.rs +++ b/src/librustc/ty/item_path.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use hir::map::DefPathData; use hir::def_id::{CrateNum, DefId, CRATE_DEF_INDEX, LOCAL_CRATE}; use ty::{self, Ty, TyCtxt}; diff --git a/src/librustc/ty/layout.rs b/src/librustc/ty/layout.rs index d485b9b32d431..f94768f553964 100644 --- a/src/librustc/ty/layout.rs +++ b/src/librustc/ty/layout.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use session::{self, DataTypeKind}; use ty::{self, Ty, TyCtxt, TypeFoldable, ReprOptions}; diff --git a/src/librustc/ty/mod.rs b/src/librustc/ty/mod.rs index 77b4d32c397d7..5d08ae8f5627a 100644 --- a/src/librustc/ty/mod.rs +++ b/src/librustc/ty/mod.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub use self::Variance::*; pub use self::AssociatedItemContainer::*; pub use self::BorrowKind::*; diff --git a/src/librustc/ty/outlives.rs b/src/librustc/ty/outlives.rs index 5171bfb7e0608..5d67d72dee8db 100644 --- a/src/librustc/ty/outlives.rs +++ b/src/librustc/ty/outlives.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // The outlines relation `T: 'a` or `'a: 'b`. This code frequently // refers to rules defined in RFC 1214 (`OutlivesFooBar`), so see that // RFC for reference. diff --git a/src/librustc/ty/query/config.rs b/src/librustc/ty/query/config.rs index b5093d0a1fc95..4b61cb1cc3cbe 100644 --- a/src/librustc/ty/query/config.rs +++ b/src/librustc/ty/query/config.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use dep_graph::SerializedDepNodeIndex; use dep_graph::DepNode; use hir::def_id::{CrateNum, DefId, DefIndex}; diff --git a/src/librustc/ty/query/job.rs b/src/librustc/ty/query/job.rs index e3b0f8c4570df..d659af64c3250 100644 --- a/src/librustc/ty/query/job.rs +++ b/src/librustc/ty/query/job.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(warnings)] use std::mem; diff --git a/src/librustc/ty/query/keys.rs b/src/librustc/ty/query/keys.rs index 8423b02ee7582..a725e984a60d0 100644 --- a/src/librustc/ty/query/keys.rs +++ b/src/librustc/ty/query/keys.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Defines the set of legal keys that can be used in queries. use infer::canonical::Canonical; diff --git a/src/librustc/ty/query/mod.rs b/src/librustc/ty/query/mod.rs index 6f61583e49b8e..53990b77c5b4d 100644 --- a/src/librustc/ty/query/mod.rs +++ b/src/librustc/ty/query/mod.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use dep_graph::{DepConstructor, DepNode}; use errors::DiagnosticBuilder; use hir::def_id::{CrateNum, DefId, DefIndex}; diff --git a/src/librustc/ty/query/on_disk_cache.rs b/src/librustc/ty/query/on_disk_cache.rs index 6e16d92ba0c8d..ac985dfbd6b51 100644 --- a/src/librustc/ty/query/on_disk_cache.rs +++ b/src/librustc/ty/query/on_disk_cache.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use dep_graph::{DepNodeIndex, SerializedDepNodeIndex}; use errors::Diagnostic; use hir; diff --git a/src/librustc/ty/query/plumbing.rs b/src/librustc/ty/query/plumbing.rs index 8473e4af40e3b..65b80016e9493 100644 --- a/src/librustc/ty/query/plumbing.rs +++ b/src/librustc/ty/query/plumbing.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The implementation of the query system itself. Defines the macros //! that generate the actual methods on tcx which find and execute the //! provider, manage the caches, and so forth. diff --git a/src/librustc/ty/query/values.rs b/src/librustc/ty/query/values.rs index d3d0624879240..3f84f1bc78972 100644 --- a/src/librustc/ty/query/values.rs +++ b/src/librustc/ty/query/values.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use ty::{self, Ty, TyCtxt}; use syntax::symbol::Symbol; diff --git a/src/librustc/ty/relate.rs b/src/librustc/ty/relate.rs index d72e48c04fed4..20bdc75da27c3 100644 --- a/src/librustc/ty/relate.rs +++ b/src/librustc/ty/relate.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Generalized type relating mechanism. A type relation R relates a //! pair of values (A, B). A and B are usually types or regions but //! can be other things. Examples of type relations are subtyping, diff --git a/src/librustc/ty/steal.rs b/src/librustc/ty/steal.rs index 842c0d6573432..0394ebd21cc1a 100644 --- a/src/librustc/ty/steal.rs +++ b/src/librustc/ty/steal.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc_data_structures::sync::{RwLock, ReadGuard}; use std::mem; diff --git a/src/librustc/ty/structural_impls.rs b/src/librustc/ty/structural_impls.rs index e6c10358279b3..baf2b0f571a26 100644 --- a/src/librustc/ty/structural_impls.rs +++ b/src/librustc/ty/structural_impls.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This module contains implements of the `Lift` and `TypeFoldable` //! traits for various types in the Rust compiler. Most are written by //! hand, though we've recently added some macros (e.g., diff --git a/src/librustc/ty/sty.rs b/src/librustc/ty/sty.rs index 7c7ee9b330ecc..a4a70c555fb4e 100644 --- a/src/librustc/ty/sty.rs +++ b/src/librustc/ty/sty.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This module contains TyKind and its major components use hir::def_id::DefId; diff --git a/src/librustc/ty/subst.rs b/src/librustc/ty/subst.rs index 0e85c68b8b1de..771eddbd2ebe4 100644 --- a/src/librustc/ty/subst.rs +++ b/src/librustc/ty/subst.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Type substitutions. use hir::def_id::DefId; diff --git a/src/librustc/ty/trait_def.rs b/src/librustc/ty/trait_def.rs index 6332080a1836c..e52f0ce8d5934 100644 --- a/src/librustc/ty/trait_def.rs +++ b/src/librustc/ty/trait_def.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use hir; use hir::def_id::DefId; use hir::map::DefPathHash; diff --git a/src/librustc/ty/util.rs b/src/librustc/ty/util.rs index 938cdf3048b1c..6dc5c20d227be 100644 --- a/src/librustc/ty/util.rs +++ b/src/librustc/ty/util.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! misc. type-system utilities too small to deserve their own file use hir::def::Def; diff --git a/src/librustc/ty/walk.rs b/src/librustc/ty/walk.rs index 6d3ba22c57f27..220a0e24dd6c1 100644 --- a/src/librustc/ty/walk.rs +++ b/src/librustc/ty/walk.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! An iterator over the type substructure. //! WARNING: this does not keep track of the region depth. diff --git a/src/librustc/ty/wf.rs b/src/librustc/ty/wf.rs index fc55d8f34a23f..7544f95021aa4 100644 --- a/src/librustc/ty/wf.rs +++ b/src/librustc/ty/wf.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use hir::def_id::DefId; use mir::interpret::ConstValue; use infer::InferCtxt; diff --git a/src/librustc/util/bug.rs b/src/librustc/util/bug.rs index f2593e4d4b5ee..aeaddfbe57eab 100644 --- a/src/librustc/util/bug.rs +++ b/src/librustc/util/bug.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // These functions are used by macro expansion for bug! and span_bug! use ty::tls; diff --git a/src/librustc/util/captures.rs b/src/librustc/util/captures.rs index b68cfd278fa9e..09d576b23c0f5 100644 --- a/src/librustc/util/captures.rs +++ b/src/librustc/util/captures.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// "Signaling" trait used in impl trait to tag lifetimes that you may /// need to capture but don't really need for other reasons. /// Basically a workaround; see [this comment] for details. diff --git a/src/librustc/util/common.rs b/src/librustc/util/common.rs index 1ec025f78c9ac..f0dabe2416c52 100644 --- a/src/librustc/util/common.rs +++ b/src/librustc/util/common.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(non_camel_case_types)] use rustc_data_structures::sync::Lock; diff --git a/src/librustc/util/nodemap.rs b/src/librustc/util/nodemap.rs index 0dc71af9db694..0b874ae594089 100644 --- a/src/librustc/util/nodemap.rs +++ b/src/librustc/util/nodemap.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! An efficient hash map for node IDs #![allow(non_snake_case)] diff --git a/src/librustc/util/ppaux.rs b/src/librustc/util/ppaux.rs index 0f15c75c2fb36..ff8573f0dbd55 100644 --- a/src/librustc/util/ppaux.rs +++ b/src/librustc/util/ppaux.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use hir::def_id::DefId; use hir::map::definitions::DefPathData; use mir::interpret::ConstValue; diff --git a/src/librustc/util/profiling.rs b/src/librustc/util/profiling.rs index 447b75e547f01..5706b491ceacd 100644 --- a/src/librustc/util/profiling.rs +++ b/src/librustc/util/profiling.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use session::config::Options; use std::fs; diff --git a/src/librustc/util/time_graph.rs b/src/librustc/util/time_graph.rs index a8502682a806b..65370964fd438 100644 --- a/src/librustc/util/time_graph.rs +++ b/src/librustc/util/time_graph.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::HashMap; use std::fs::File; use std::io::prelude::*; diff --git a/src/librustc_allocator/expand.rs b/src/librustc_allocator/expand.rs index 5999416cecf15..6ec844ce4f637 100644 --- a/src/librustc_allocator/expand.rs +++ b/src/librustc_allocator/expand.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::middle::allocator::AllocatorKind; use rustc_data_structures::small_vec::OneVector; use rustc_errors; diff --git a/src/librustc_allocator/lib.rs b/src/librustc_allocator/lib.rs index 2a3404ee83034..b7376bb619476 100644 --- a/src/librustc_allocator/lib.rs +++ b/src/librustc_allocator/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![cfg_attr(not(stage0), feature(nll))] #![feature(rustc_private)] diff --git a/src/librustc_apfloat/ieee.rs b/src/librustc_apfloat/ieee.rs index 87d59d2e763cb..5b50b1789bfd8 100644 --- a/src/librustc_apfloat/ieee.rs +++ b/src/librustc_apfloat/ieee.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use {Category, ExpInt, IEK_INF, IEK_NAN, IEK_ZERO}; use {Float, FloatConvert, ParseError, Round, Status, StatusAnd}; diff --git a/src/librustc_apfloat/lib.rs b/src/librustc_apfloat/lib.rs index d6e821d427d05..946bcc89085b7 100644 --- a/src/librustc_apfloat/lib.rs +++ b/src/librustc_apfloat/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Port of LLVM's APFloat software floating-point implementation from the //! following C++ sources (please update commit hash when backporting): //! diff --git a/src/librustc_apfloat/ppc.rs b/src/librustc_apfloat/ppc.rs index e662088e82fb0..b5094c5b47e87 100644 --- a/src/librustc_apfloat/ppc.rs +++ b/src/librustc_apfloat/ppc.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use {Category, ExpInt, Float, FloatConvert, Round, ParseError, Status, StatusAnd}; use ieee; diff --git a/src/librustc_apfloat/tests/ieee.rs b/src/librustc_apfloat/tests/ieee.rs index 6e06ea858efad..96249020c1a6f 100644 --- a/src/librustc_apfloat/tests/ieee.rs +++ b/src/librustc_apfloat/tests/ieee.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate rustc_apfloat; diff --git a/src/librustc_apfloat/tests/ppc.rs b/src/librustc_apfloat/tests/ppc.rs index 145c3ddc869df..cfb453bd0617a 100644 --- a/src/librustc_apfloat/tests/ppc.rs +++ b/src/librustc_apfloat/tests/ppc.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate rustc_apfloat; use rustc_apfloat::{Category, Float, Round}; diff --git a/src/librustc_asan/build.rs b/src/librustc_asan/build.rs index b8614c520e7cf..b8e4f6ae6d8f6 100644 --- a/src/librustc_asan/build.rs +++ b/src/librustc_asan/build.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate build_helper; extern crate cmake; diff --git a/src/librustc_asan/lib.rs b/src/librustc_asan/lib.rs index b3ba86ad8a4b3..876b33873d64e 100644 --- a/src/librustc_asan/lib.rs +++ b/src/librustc_asan/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![sanitizer_runtime] #![feature(alloc_system)] #![cfg_attr(not(stage0), feature(nll))] diff --git a/src/librustc_borrowck/borrowck/check_loans.rs b/src/librustc_borrowck/borrowck/check_loans.rs index 847d37be89933..d36389501d01d 100644 --- a/src/librustc_borrowck/borrowck/check_loans.rs +++ b/src/librustc_borrowck/borrowck/check_loans.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ---------------------------------------------------------------------- // Checking loans // diff --git a/src/librustc_borrowck/borrowck/gather_loans/gather_moves.rs b/src/librustc_borrowck/borrowck/gather_loans/gather_moves.rs index 5c165fbad6943..93ffe6a72ff49 100644 --- a/src/librustc_borrowck/borrowck/gather_loans/gather_moves.rs +++ b/src/librustc_borrowck/borrowck/gather_loans/gather_moves.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Computes moves. use borrowck::*; diff --git a/src/librustc_borrowck/borrowck/gather_loans/lifetime.rs b/src/librustc_borrowck/borrowck/gather_loans/lifetime.rs index c9dcc0d9fa266..fd26215d273b4 100644 --- a/src/librustc_borrowck/borrowck/gather_loans/lifetime.rs +++ b/src/librustc_borrowck/borrowck/gather_loans/lifetime.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This module implements the check that the lifetime of a borrow //! does not exceed the lifetime of the value being borrowed. diff --git a/src/librustc_borrowck/borrowck/gather_loans/mod.rs b/src/librustc_borrowck/borrowck/gather_loans/mod.rs index 6c83e2dd1c206..b6ae0c20e8616 100644 --- a/src/librustc_borrowck/borrowck/gather_loans/mod.rs +++ b/src/librustc_borrowck/borrowck/gather_loans/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ---------------------------------------------------------------------- // Gathering loans // diff --git a/src/librustc_borrowck/borrowck/gather_loans/move_error.rs b/src/librustc_borrowck/borrowck/gather_loans/move_error.rs index b29ab55f9ba78..74463769730d4 100644 --- a/src/librustc_borrowck/borrowck/gather_loans/move_error.rs +++ b/src/librustc_borrowck/borrowck/gather_loans/move_error.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use borrowck::BorrowckCtxt; use rustc::middle::mem_categorization as mc; use rustc::middle::mem_categorization::Categorization; diff --git a/src/librustc_borrowck/borrowck/gather_loans/restrictions.rs b/src/librustc_borrowck/borrowck/gather_loans/restrictions.rs index d9784cc2177fd..98309910cb68c 100644 --- a/src/librustc_borrowck/borrowck/gather_loans/restrictions.rs +++ b/src/librustc_borrowck/borrowck/gather_loans/restrictions.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Computes the restrictions that result from a borrow. use borrowck::*; diff --git a/src/librustc_borrowck/borrowck/mod.rs b/src/librustc_borrowck/borrowck/mod.rs index a3ca329b92d7f..48f2a66c6a65f 100644 --- a/src/librustc_borrowck/borrowck/mod.rs +++ b/src/librustc_borrowck/borrowck/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! See The Book chapter on the borrow checker for more details. #![allow(non_camel_case_types)] diff --git a/src/librustc_borrowck/borrowck/move_data.rs b/src/librustc_borrowck/borrowck/move_data.rs index d9f223daf6091..afecbf47c5d1e 100644 --- a/src/librustc_borrowck/borrowck/move_data.rs +++ b/src/librustc_borrowck/borrowck/move_data.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Data structures used for tracking moves. Please see the extensive //! comments in the section "Moves and initialization" in `README.md`. diff --git a/src/librustc_borrowck/borrowck/unused.rs b/src/librustc_borrowck/borrowck/unused.rs index b8d6df368d478..89aebab7d1f81 100644 --- a/src/librustc_borrowck/borrowck/unused.rs +++ b/src/librustc_borrowck/borrowck/unused.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::hir::intravisit::{Visitor, NestedVisitorMap}; use rustc::hir::{self, HirId}; use rustc::lint::builtin::UNUSED_MUT; diff --git a/src/librustc_borrowck/dataflow.rs b/src/librustc_borrowck/dataflow.rs index 75dee2b78fddb..b8a81194258b4 100644 --- a/src/librustc_borrowck/dataflow.rs +++ b/src/librustc_borrowck/dataflow.rs @@ -1,14 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - //! A module for propagating forward dataflow information. The analysis //! assumes that the items to be propagated can be represented as bits //! and thus uses bitvectors. Your job is simply to specify the so-called diff --git a/src/librustc_borrowck/diagnostics.rs b/src/librustc_borrowck/diagnostics.rs index 3fea01443be4b..44d8a23fcb910 100644 --- a/src/librustc_borrowck/diagnostics.rs +++ b/src/librustc_borrowck/diagnostics.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(non_snake_case)] diff --git a/src/librustc_borrowck/graphviz.rs b/src/librustc_borrowck/graphviz.rs index dddd6a354c115..f4cfd94f7c921 100644 --- a/src/librustc_borrowck/graphviz.rs +++ b/src/librustc_borrowck/graphviz.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This module provides linkage between rustc::middle::graph and //! libgraphviz traits, specialized to attaching borrowck analysis //! data to rendered labels. diff --git a/src/librustc_borrowck/lib.rs b/src/librustc_borrowck/lib.rs index 16da8c8a3b8bf..50e6af8c421f6 100644 --- a/src/librustc_borrowck/lib.rs +++ b/src/librustc_borrowck/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png", html_favicon_url = "https://doc.rust-lang.org/favicon.ico", html_root_url = "https://doc.rust-lang.org/nightly/")] diff --git a/src/librustc_codegen_llvm/abi.rs b/src/librustc_codegen_llvm/abi.rs index 684f2b358858f..07c90824ed156 100644 --- a/src/librustc_codegen_llvm/abi.rs +++ b/src/librustc_codegen_llvm/abi.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use llvm::{self, AttributePlace}; use base; use builder::{Builder, MemFlags}; diff --git a/src/librustc_codegen_llvm/allocator.rs b/src/librustc_codegen_llvm/allocator.rs index 0beb8a8844c95..38e19e7ef4237 100644 --- a/src/librustc_codegen_llvm/allocator.rs +++ b/src/librustc_codegen_llvm/allocator.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ffi::CString; use attributes; diff --git a/src/librustc_codegen_llvm/asm.rs b/src/librustc_codegen_llvm/asm.rs index 5d27f8eab3ece..176cc18e67b8b 100644 --- a/src/librustc_codegen_llvm/asm.rs +++ b/src/librustc_codegen_llvm/asm.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use llvm; use common::*; use type_::Type; diff --git a/src/librustc_codegen_llvm/attributes.rs b/src/librustc_codegen_llvm/attributes.rs index 2b64642b766ab..b14686f668b64 100644 --- a/src/librustc_codegen_llvm/attributes.rs +++ b/src/librustc_codegen_llvm/attributes.rs @@ -1,12 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. //! Set and unset common attributes on LLVM values. use std::ffi::CString; diff --git a/src/librustc_codegen_llvm/back/archive.rs b/src/librustc_codegen_llvm/back/archive.rs index af9efc6d7c417..ede99fdc7dbee 100644 --- a/src/librustc_codegen_llvm/back/archive.rs +++ b/src/librustc_codegen_llvm/back/archive.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A helper class for dealing with static archives use std::ffi::{CString, CStr}; diff --git a/src/librustc_codegen_llvm/back/bytecode.rs b/src/librustc_codegen_llvm/back/bytecode.rs index 9a3dd9d2f8814..0a7710bfe9e28 100644 --- a/src/librustc_codegen_llvm/back/bytecode.rs +++ b/src/librustc_codegen_llvm/back/bytecode.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Management of the encoding of LLVM bytecode into rlibs //! //! This module contains the management of encoding LLVM bytecode into rlibs, diff --git a/src/librustc_codegen_llvm/back/command.rs b/src/librustc_codegen_llvm/back/command.rs index 9ebbdd7c3c936..bc484ace58463 100644 --- a/src/librustc_codegen_llvm/back/command.rs +++ b/src/librustc_codegen_llvm/back/command.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A thin wrapper around `Command` in the standard library which allows us to //! read the arguments that are built up. diff --git a/src/librustc_codegen_llvm/back/link.rs b/src/librustc_codegen_llvm/back/link.rs index d50a56ad84ab2..d9267adbfb29a 100644 --- a/src/librustc_codegen_llvm/back/link.rs +++ b/src/librustc_codegen_llvm/back/link.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use back::wasm; use cc::windows_registry; use super::archive::{ArchiveBuilder, ArchiveConfig}; diff --git a/src/librustc_codegen_llvm/back/linker.rs b/src/librustc_codegen_llvm/back/linker.rs index a429e8f2d815d..2b22f59ed1ee1 100644 --- a/src/librustc_codegen_llvm/back/linker.rs +++ b/src/librustc_codegen_llvm/back/linker.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::HashMap; use std::ffi::{OsStr, OsString}; use std::fs::{self, File}; diff --git a/src/librustc_codegen_llvm/back/lto.rs b/src/librustc_codegen_llvm/back/lto.rs index 56858a31efd25..302dfeb4ede68 100644 --- a/src/librustc_codegen_llvm/back/lto.rs +++ b/src/librustc_codegen_llvm/back/lto.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use back::bytecode::{DecodedBytecode, RLIB_BYTECODE_EXTENSION}; use back::symbol_export; use back::write::{ModuleConfig, with_llvm_pmb, CodegenContext}; diff --git a/src/librustc_codegen_llvm/back/rpath.rs b/src/librustc_codegen_llvm/back/rpath.rs index 2c3a143646c24..5836654ef9290 100644 --- a/src/librustc_codegen_llvm/back/rpath.rs +++ b/src/librustc_codegen_llvm/back/rpath.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::HashSet; use std::env; use std::path::{Path, PathBuf}; diff --git a/src/librustc_codegen_llvm/back/symbol_export.rs b/src/librustc_codegen_llvm/back/symbol_export.rs index edb1da0b5582e..b9b52e2a438dc 100644 --- a/src/librustc_codegen_llvm/back/symbol_export.rs +++ b/src/librustc_codegen_llvm/back/symbol_export.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc_data_structures::sync::Lrc; use std::sync::Arc; diff --git a/src/librustc_codegen_llvm/back/wasm.rs b/src/librustc_codegen_llvm/back/wasm.rs index f37854b7bcae0..fd944f5526632 100644 --- a/src/librustc_codegen_llvm/back/wasm.rs +++ b/src/librustc_codegen_llvm/back/wasm.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fs; use std::path::Path; use std::str; diff --git a/src/librustc_codegen_llvm/back/write.rs b/src/librustc_codegen_llvm/back/write.rs index 80e9965e39cd8..50c90c31edbfa 100644 --- a/src/librustc_codegen_llvm/back/write.rs +++ b/src/librustc_codegen_llvm/back/write.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use attributes; use back::bytecode::{self, RLIB_BYTECODE_EXTENSION}; use back::lto::{self, ModuleBuffer, ThinBuffer}; diff --git a/src/librustc_codegen_llvm/base.rs b/src/librustc_codegen_llvm/base.rs index 009c6da9d8d15..22452c483c4a8 100644 --- a/src/librustc_codegen_llvm/base.rs +++ b/src/librustc_codegen_llvm/base.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Codegen the completed AST to the LLVM IR. //! //! Some functions here, such as codegen_block and codegen_expr, return a value -- diff --git a/src/librustc_codegen_llvm/build.rs b/src/librustc_codegen_llvm/build.rs index 97accbb4b8fe6..d1fc624c68927 100644 --- a/src/librustc_codegen_llvm/build.rs +++ b/src/librustc_codegen_llvm/build.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { println!("cargo:rerun-if-changed=build.rs"); println!("cargo:rerun-if-env-changed=CFG_VERSION"); diff --git a/src/librustc_codegen_llvm/builder.rs b/src/librustc_codegen_llvm/builder.rs index cfbc2ab90072d..54474f861f2ad 100644 --- a/src/librustc_codegen_llvm/builder.rs +++ b/src/librustc_codegen_llvm/builder.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use llvm::{AtomicRmwBinOp, AtomicOrdering, SynchronizationScope, AsmDialect}; use llvm::{IntPredicate, RealPredicate, False, OperandBundleDef}; use llvm::{self, BasicBlock}; diff --git a/src/librustc_codegen_llvm/callee.rs b/src/librustc_codegen_llvm/callee.rs index 2e90f95fa8e2d..83dbdc7d59902 100644 --- a/src/librustc_codegen_llvm/callee.rs +++ b/src/librustc_codegen_llvm/callee.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Handles codegen of callees as well as other call-related //! things. Callees are a superset of normal rust values and sometimes //! have different representations. In particular, top-level fn items diff --git a/src/librustc_codegen_llvm/common.rs b/src/librustc_codegen_llvm/common.rs index 53bb02ddd99d9..919f47917f037 100644 --- a/src/librustc_codegen_llvm/common.rs +++ b/src/librustc_codegen_llvm/common.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(non_camel_case_types, non_snake_case)] //! Code that is useful in various codegen modules. diff --git a/src/librustc_codegen_llvm/consts.rs b/src/librustc_codegen_llvm/consts.rs index 6f09ebb382697..7c7f51a65d65a 100644 --- a/src/librustc_codegen_llvm/consts.rs +++ b/src/librustc_codegen_llvm/consts.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use libc::c_uint; use llvm::{self, SetUnnamedAddr, True}; use rustc::hir::def_id::DefId; diff --git a/src/librustc_codegen_llvm/context.rs b/src/librustc_codegen_llvm/context.rs index 9547f4a190e78..9e76235085189 100644 --- a/src/librustc_codegen_llvm/context.rs +++ b/src/librustc_codegen_llvm/context.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use attributes; use common; use llvm; diff --git a/src/librustc_codegen_llvm/debuginfo/create_scope_map.rs b/src/librustc_codegen_llvm/debuginfo/create_scope_map.rs index a76f1d50fa7bf..c05300b20b717 100644 --- a/src/librustc_codegen_llvm/debuginfo/create_scope_map.rs +++ b/src/librustc_codegen_llvm/debuginfo/create_scope_map.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::{FunctionDebugContext, FunctionDebugContextData}; use super::metadata::file_metadata; use super::utils::{DIB, span_start}; diff --git a/src/librustc_codegen_llvm/debuginfo/doc.rs b/src/librustc_codegen_llvm/debuginfo/doc.rs index ce0476b07eb43..51a99527fd95e 100644 --- a/src/librustc_codegen_llvm/debuginfo/doc.rs +++ b/src/librustc_codegen_llvm/debuginfo/doc.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! # Debug Info Module //! //! This module serves the purpose of generating debug symbols. We use LLVM's diff --git a/src/librustc_codegen_llvm/debuginfo/gdb.rs b/src/librustc_codegen_llvm/debuginfo/gdb.rs index f6faddb894ffd..a84c7b43931f3 100644 --- a/src/librustc_codegen_llvm/debuginfo/gdb.rs +++ b/src/librustc_codegen_llvm/debuginfo/gdb.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // .debug_gdb_scripts binary section. use llvm; diff --git a/src/librustc_codegen_llvm/debuginfo/metadata.rs b/src/librustc_codegen_llvm/debuginfo/metadata.rs index c7a515016c01b..c2527035ca895 100644 --- a/src/librustc_codegen_llvm/debuginfo/metadata.rs +++ b/src/librustc_codegen_llvm/debuginfo/metadata.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use self::RecursiveTypeDescription::*; use self::MemberDescriptionFactory::*; use self::EnumDiscriminantInfo::*; diff --git a/src/librustc_codegen_llvm/debuginfo/mod.rs b/src/librustc_codegen_llvm/debuginfo/mod.rs index 99919a940b405..fd0b9ce2017d0 100644 --- a/src/librustc_codegen_llvm/debuginfo/mod.rs +++ b/src/librustc_codegen_llvm/debuginfo/mod.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // See doc.rs for documentation. mod doc; diff --git a/src/librustc_codegen_llvm/debuginfo/namespace.rs b/src/librustc_codegen_llvm/debuginfo/namespace.rs index 06f8a4b131b60..36188b8fc4797 100644 --- a/src/librustc_codegen_llvm/debuginfo/namespace.rs +++ b/src/librustc_codegen_llvm/debuginfo/namespace.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Namespace Handling. use super::metadata::{unknown_file_metadata, UNKNOWN_LINE_NUMBER}; diff --git a/src/librustc_codegen_llvm/debuginfo/source_loc.rs b/src/librustc_codegen_llvm/debuginfo/source_loc.rs index c59b5e2b8f5f5..e8cf35fb75d02 100644 --- a/src/librustc_codegen_llvm/debuginfo/source_loc.rs +++ b/src/librustc_codegen_llvm/debuginfo/source_loc.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use self::InternalDebugLocation::*; use super::utils::{debug_context, span_start}; diff --git a/src/librustc_codegen_llvm/debuginfo/type_names.rs b/src/librustc_codegen_llvm/debuginfo/type_names.rs index a08b964cd721d..1a772c3309eed 100644 --- a/src/librustc_codegen_llvm/debuginfo/type_names.rs +++ b/src/librustc_codegen_llvm/debuginfo/type_names.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Type Names for Debug Info. use common::CodegenCx; diff --git a/src/librustc_codegen_llvm/debuginfo/utils.rs b/src/librustc_codegen_llvm/debuginfo/utils.rs index 19bc4ac39d308..e9c96aaa60a45 100644 --- a/src/librustc_codegen_llvm/debuginfo/utils.rs +++ b/src/librustc_codegen_llvm/debuginfo/utils.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Utility Functions. use super::{CrateDebugContext}; diff --git a/src/librustc_codegen_llvm/declare.rs b/src/librustc_codegen_llvm/declare.rs index 5e743ac51bc61..2082aac112113 100644 --- a/src/librustc_codegen_llvm/declare.rs +++ b/src/librustc_codegen_llvm/declare.rs @@ -1,12 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. //! Declare various LLVM values. //! //! Prefer using functions and methods from this module rather than calling LLVM diff --git a/src/librustc_codegen_llvm/diagnostics.rs b/src/librustc_codegen_llvm/diagnostics.rs index 94776f17c7989..872fa424e4cfb 100644 --- a/src/librustc_codegen_llvm/diagnostics.rs +++ b/src/librustc_codegen_llvm/diagnostics.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(non_snake_case)] register_long_diagnostics! { diff --git a/src/librustc_codegen_llvm/glue.rs b/src/librustc_codegen_llvm/glue.rs index ff33cec043729..7211796cb621f 100644 --- a/src/librustc_codegen_llvm/glue.rs +++ b/src/librustc_codegen_llvm/glue.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! // // Code relating to drop glue. diff --git a/src/librustc_codegen_llvm/intrinsic.rs b/src/librustc_codegen_llvm/intrinsic.rs index 5d00e0807991e..87b40d6f9cd07 100644 --- a/src/librustc_codegen_llvm/intrinsic.rs +++ b/src/librustc_codegen_llvm/intrinsic.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(non_upper_case_globals)] use attributes; diff --git a/src/librustc_codegen_llvm/lib.rs b/src/librustc_codegen_llvm/lib.rs index 03a2e0a82cf10..1002a48a7ce68 100644 --- a/src/librustc_codegen_llvm/lib.rs +++ b/src/librustc_codegen_llvm/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The Rust compiler. //! //! # Note diff --git a/src/librustc_codegen_llvm/llvm/archive_ro.rs b/src/librustc_codegen_llvm/llvm/archive_ro.rs index 4cbf0d92d7b99..ae9993c2c8939 100644 --- a/src/librustc_codegen_llvm/llvm/archive_ro.rs +++ b/src/librustc_codegen_llvm/llvm/archive_ro.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A wrapper around LLVM's archive (.a) code use std::ffi::CString; diff --git a/src/librustc_codegen_llvm/llvm/diagnostic.rs b/src/librustc_codegen_llvm/llvm/diagnostic.rs index c41a5f74ae302..4022bdce76b71 100644 --- a/src/librustc_codegen_llvm/llvm/diagnostic.rs +++ b/src/librustc_codegen_llvm/llvm/diagnostic.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! LLVM diagnostic reports. pub use self::OptimizationDiagnosticKind::*; diff --git a/src/librustc_codegen_llvm/llvm/ffi.rs b/src/librustc_codegen_llvm/llvm/ffi.rs index d3039a05b6db8..78e1ea6470cfe 100644 --- a/src/librustc_codegen_llvm/llvm/ffi.rs +++ b/src/librustc_codegen_llvm/llvm/ffi.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // FIXME: Rename 'DIGlobalVariable' to 'DIGlobalVariableExpression' // once support for LLVM 3.9 is dropped. // diff --git a/src/librustc_codegen_llvm/llvm/mod.rs b/src/librustc_codegen_llvm/llvm/mod.rs index 4343c8c184ecf..48373fcbde35d 100644 --- a/src/librustc_codegen_llvm/llvm/mod.rs +++ b/src/librustc_codegen_llvm/llvm/mod.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(non_upper_case_globals)] #![allow(non_camel_case_types)] #![allow(non_snake_case)] diff --git a/src/librustc_codegen_llvm/llvm_util.rs b/src/librustc_codegen_llvm/llvm_util.rs index ff26e0f35f00f..48bfb926a742b 100644 --- a/src/librustc_codegen_llvm/llvm_util.rs +++ b/src/librustc_codegen_llvm/llvm_util.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use syntax_pos::symbol::Symbol; use back::write::create_target_machine; use llvm; diff --git a/src/librustc_codegen_llvm/metadata.rs b/src/librustc_codegen_llvm/metadata.rs index a4526a53769ba..bdb0d53df618e 100644 --- a/src/librustc_codegen_llvm/metadata.rs +++ b/src/librustc_codegen_llvm/metadata.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::middle::cstore::MetadataLoader; use rustc_target::spec::Target; use llvm; diff --git a/src/librustc_codegen_llvm/meth.rs b/src/librustc_codegen_llvm/meth.rs index 8a1159bc4773c..e52743f9e7938 100644 --- a/src/librustc_codegen_llvm/meth.rs +++ b/src/librustc_codegen_llvm/meth.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use abi::{FnType, FnTypeExt}; use callee; use common::*; diff --git a/src/librustc_codegen_llvm/mir/analyze.rs b/src/librustc_codegen_llvm/mir/analyze.rs index 0206744eb2b6b..60f9b0e650b74 100644 --- a/src/librustc_codegen_llvm/mir/analyze.rs +++ b/src/librustc_codegen_llvm/mir/analyze.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! An analysis to determine which locals require allocas and //! which do not. diff --git a/src/librustc_codegen_llvm/mir/block.rs b/src/librustc_codegen_llvm/mir/block.rs index a534b4e478fb7..1b7a95728cdef 100644 --- a/src/librustc_codegen_llvm/mir/block.rs +++ b/src/librustc_codegen_llvm/mir/block.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use llvm::{self, BasicBlock}; use rustc::middle::lang_items; use rustc::ty::{self, Ty, TypeFoldable}; diff --git a/src/librustc_codegen_llvm/mir/constant.rs b/src/librustc_codegen_llvm/mir/constant.rs index 2657543b2d167..b5aa870d4b264 100644 --- a/src/librustc_codegen_llvm/mir/constant.rs +++ b/src/librustc_codegen_llvm/mir/constant.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use llvm; use rustc::mir::interpret::{ConstEvalErr, read_target_uint}; use rustc_mir::interpret::{const_field}; diff --git a/src/librustc_codegen_llvm/mir/mod.rs b/src/librustc_codegen_llvm/mir/mod.rs index 9e65144bd60a1..9f7eb04fe53c0 100644 --- a/src/librustc_codegen_llvm/mir/mod.rs +++ b/src/librustc_codegen_llvm/mir/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use common::{C_i32, C_null}; use libc::c_uint; use llvm::{self, BasicBlock}; diff --git a/src/librustc_codegen_llvm/mir/operand.rs b/src/librustc_codegen_llvm/mir/operand.rs index 9537379813d52..32d0c9fa683ce 100644 --- a/src/librustc_codegen_llvm/mir/operand.rs +++ b/src/librustc_codegen_llvm/mir/operand.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::mir::interpret::ConstEvalErr; use rustc::mir; use rustc::mir::interpret::{ConstValue, ScalarMaybeUndef}; diff --git a/src/librustc_codegen_llvm/mir/place.rs b/src/librustc_codegen_llvm/mir/place.rs index ce3292eaa426d..4eea18a8db866 100644 --- a/src/librustc_codegen_llvm/mir/place.rs +++ b/src/librustc_codegen_llvm/mir/place.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use llvm::{self, LLVMConstInBoundsGEP}; use rustc::ty::{self, Ty}; use rustc::ty::layout::{self, Align, TyLayout, LayoutOf, Size}; diff --git a/src/librustc_codegen_llvm/mir/rvalue.rs b/src/librustc_codegen_llvm/mir/rvalue.rs index 25f32360815e7..698fc0a545093 100644 --- a/src/librustc_codegen_llvm/mir/rvalue.rs +++ b/src/librustc_codegen_llvm/mir/rvalue.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use llvm; use rustc::ty::{self, Ty}; use rustc::ty::cast::{CastTy, IntTy}; diff --git a/src/librustc_codegen_llvm/mir/statement.rs b/src/librustc_codegen_llvm/mir/statement.rs index dd62a12553caa..aad5b824587a0 100644 --- a/src/librustc_codegen_llvm/mir/statement.rs +++ b/src/librustc_codegen_llvm/mir/statement.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::mir; use asm; diff --git a/src/librustc_codegen_llvm/mono_item.rs b/src/librustc_codegen_llvm/mono_item.rs index 7f25911abec35..5fa4c6903203e 100644 --- a/src/librustc_codegen_llvm/mono_item.rs +++ b/src/librustc_codegen_llvm/mono_item.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Walks the crate looking for items/impl-items/trait-items that have //! either a `rustc_symbol_name` or `rustc_item_path` attribute and //! generates an error giving, respectively, the symbol name or diff --git a/src/librustc_codegen_llvm/type_.rs b/src/librustc_codegen_llvm/type_.rs index 51a233d791625..acbda390d977d 100644 --- a/src/librustc_codegen_llvm/type_.rs +++ b/src/librustc_codegen_llvm/type_.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(non_upper_case_globals)] pub use llvm::Type; diff --git a/src/librustc_codegen_llvm/type_of.rs b/src/librustc_codegen_llvm/type_of.rs index e6907030ae635..4a67ce567c82d 100644 --- a/src/librustc_codegen_llvm/type_of.rs +++ b/src/librustc_codegen_llvm/type_of.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use abi::{FnType, FnTypeExt}; use common::*; use llvm; diff --git a/src/librustc_codegen_llvm/value.rs b/src/librustc_codegen_llvm/value.rs index 3328948c2951e..7c0bee707f48b 100644 --- a/src/librustc_codegen_llvm/value.rs +++ b/src/librustc_codegen_llvm/value.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub use llvm::Value; use llvm; diff --git a/src/librustc_codegen_utils/codegen_backend.rs b/src/librustc_codegen_utils/codegen_backend.rs index d693e088360d4..0b180aa41be13 100644 --- a/src/librustc_codegen_utils/codegen_backend.rs +++ b/src/librustc_codegen_utils/codegen_backend.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The Rust compiler. //! //! # Note diff --git a/src/librustc_codegen_utils/lib.rs b/src/librustc_codegen_utils/lib.rs index 635819e94e867..3638cf5f3fdcc 100644 --- a/src/librustc_codegen_utils/lib.rs +++ b/src/librustc_codegen_utils/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! # Note //! //! This API is completely unstable and subject to change. diff --git a/src/librustc_codegen_utils/link.rs b/src/librustc_codegen_utils/link.rs index 75f1d614ae72f..21af9082e387e 100644 --- a/src/librustc_codegen_utils/link.rs +++ b/src/librustc_codegen_utils/link.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::session::config::{self, OutputFilenames, Input, OutputType}; use rustc::session::Session; use std::path::{Path, PathBuf}; diff --git a/src/librustc_codegen_utils/symbol_names.rs b/src/librustc_codegen_utils/symbol_names.rs index 33ce06217a46e..9e5aa58774226 100644 --- a/src/librustc_codegen_utils/symbol_names.rs +++ b/src/librustc_codegen_utils/symbol_names.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The Rust Linkage Model and Symbol Names //! ======================================= //! diff --git a/src/librustc_codegen_utils/symbol_names_test.rs b/src/librustc_codegen_utils/symbol_names_test.rs index 47bbd67fb5c70..5dbeb4a9e261b 100644 --- a/src/librustc_codegen_utils/symbol_names_test.rs +++ b/src/librustc_codegen_utils/symbol_names_test.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Walks the crate looking for items/impl-items/trait-items that have //! either a `rustc_symbol_name` or `rustc_item_path` attribute and //! generates an error giving, respectively, the symbol name or diff --git a/src/librustc_cratesio_shim/src/lib.rs b/src/librustc_cratesio_shim/src/lib.rs index 39087c5f74616..5ac848e31d26e 100644 --- a/src/librustc_cratesio_shim/src/lib.rs +++ b/src/librustc_cratesio_shim/src/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // See Cargo.toml for a comment explaining this crate. #![allow(unused_extern_crates)] diff --git a/src/librustc_data_structures/accumulate_vec.rs b/src/librustc_data_structures/accumulate_vec.rs index 9423e6b3256c5..3db942079d949 100644 --- a/src/librustc_data_structures/accumulate_vec.rs +++ b/src/librustc_data_structures/accumulate_vec.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A vector type intended to be used for collecting from iterators onto the stack. //! //! Space for up to N elements is provided on the stack. If more elements are collected, Vec is diff --git a/src/librustc_data_structures/array_vec.rs b/src/librustc_data_structures/array_vec.rs index 45fb565706180..1ab3d39fd320d 100644 --- a/src/librustc_data_structures/array_vec.rs +++ b/src/librustc_data_structures/array_vec.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A stack-allocated vector, allowing storage of N elements on the stack. use std::marker::Unsize; diff --git a/src/librustc_data_structures/base_n.rs b/src/librustc_data_structures/base_n.rs index d3b47daa5b4b8..c9c1933f25b2b 100644 --- a/src/librustc_data_structures/base_n.rs +++ b/src/librustc_data_structures/base_n.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// Convert unsigned integers into a string representation with some base. /// Bases up to and including 36 can be used for case-insensitive things. diff --git a/src/librustc_data_structures/bitslice.rs b/src/librustc_data_structures/bitslice.rs index a63033c436528..007febef38af0 100644 --- a/src/librustc_data_structures/bitslice.rs +++ b/src/librustc_data_structures/bitslice.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // FIXME: merge with `bitvec` use std::mem; diff --git a/src/librustc_data_structures/bitvec.rs b/src/librustc_data_structures/bitvec.rs index 49ab3e58812dc..c65e3d82f0536 100644 --- a/src/librustc_data_structures/bitvec.rs +++ b/src/librustc_data_structures/bitvec.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use indexed_vec::{Idx, IndexVec}; use std::marker::PhantomData; diff --git a/src/librustc_data_structures/const_cstr.rs b/src/librustc_data_structures/const_cstr.rs index 4589d973b6a41..fbe2f29f706f6 100644 --- a/src/librustc_data_structures/const_cstr.rs +++ b/src/librustc_data_structures/const_cstr.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// This macro creates a zero-overhead &CStr by adding a NUL terminator to /// the string literal passed into it at compile-time. Use it like: /// diff --git a/src/librustc_data_structures/fingerprint.rs b/src/librustc_data_structures/fingerprint.rs index aa9ddda2b9364..03d4da1bd016b 100644 --- a/src/librustc_data_structures/fingerprint.rs +++ b/src/librustc_data_structures/fingerprint.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::mem; use stable_hasher; use serialize; diff --git a/src/librustc_data_structures/flock.rs b/src/librustc_data_structures/flock.rs index 3f248dadb66c1..8e2947e01b37d 100644 --- a/src/librustc_data_structures/flock.rs +++ b/src/librustc_data_structures/flock.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Simple file-locking apis for each OS. //! //! This is not meant to be in the standard library, it does nothing with diff --git a/src/librustc_data_structures/fx.rs b/src/librustc_data_structures/fx.rs index 3bf3170d1df1a..940002792f04b 100644 --- a/src/librustc_data_structures/fx.rs +++ b/src/librustc_data_structures/fx.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::{HashMap, HashSet}; use std::default::Default; use std::hash::Hash; diff --git a/src/librustc_data_structures/graph/dominators/mod.rs b/src/librustc_data_structures/graph/dominators/mod.rs index e54147cbe7c87..84e09448d0b69 100644 --- a/src/librustc_data_structures/graph/dominators/mod.rs +++ b/src/librustc_data_structures/graph/dominators/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Algorithm citation: //! A Simple, Fast Dominance Algorithm. //! Keith D. Cooper, Timothy J. Harvey, and Ken Kennedy diff --git a/src/librustc_data_structures/graph/dominators/test.rs b/src/librustc_data_structures/graph/dominators/test.rs index 0af878cac2df1..5d17ce9e90941 100644 --- a/src/librustc_data_structures/graph/dominators/test.rs +++ b/src/librustc_data_structures/graph/dominators/test.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::super::test::TestGraph; use super::*; diff --git a/src/librustc_data_structures/graph/implementation/mod.rs b/src/librustc_data_structures/graph/implementation/mod.rs index baac756586865..1d4583e5041b1 100644 --- a/src/librustc_data_structures/graph/implementation/mod.rs +++ b/src/librustc_data_structures/graph/implementation/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A graph module for use in dataflow, region resolution, and elsewhere. //! //! # Interface details diff --git a/src/librustc_data_structures/graph/implementation/tests.rs b/src/librustc_data_structures/graph/implementation/tests.rs index 3814827b5df6e..a7a2504239610 100644 --- a/src/librustc_data_structures/graph/implementation/tests.rs +++ b/src/librustc_data_structures/graph/implementation/tests.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use graph::implementation::*; use std::fmt::Debug; diff --git a/src/librustc_data_structures/graph/iterate/mod.rs b/src/librustc_data_structures/graph/iterate/mod.rs index 3afdc88d60279..c09364b0a5395 100644 --- a/src/librustc_data_structures/graph/iterate/mod.rs +++ b/src/librustc_data_structures/graph/iterate/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::super::indexed_vec::IndexVec; use super::{DirectedGraph, WithSuccessors, WithNumNodes}; diff --git a/src/librustc_data_structures/graph/iterate/test.rs b/src/librustc_data_structures/graph/iterate/test.rs index 100881ddfdd77..62e48aaec53f1 100644 --- a/src/librustc_data_structures/graph/iterate/test.rs +++ b/src/librustc_data_structures/graph/iterate/test.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::super::test::TestGraph; use super::*; diff --git a/src/librustc_data_structures/graph/mod.rs b/src/librustc_data_structures/graph/mod.rs index 7265e4e8c7c66..3d47b7d49fb96 100644 --- a/src/librustc_data_structures/graph/mod.rs +++ b/src/librustc_data_structures/graph/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::indexed_vec::Idx; pub mod dominators; diff --git a/src/librustc_data_structures/graph/reference.rs b/src/librustc_data_structures/graph/reference.rs index a7b763db8da29..5ad2a71e1d732 100644 --- a/src/librustc_data_structures/graph/reference.rs +++ b/src/librustc_data_structures/graph/reference.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::*; impl<'graph, G: DirectedGraph> DirectedGraph for &'graph G { diff --git a/src/librustc_data_structures/graph/scc/mod.rs b/src/librustc_data_structures/graph/scc/mod.rs index a989a54010222..3d00194f2f5f9 100644 --- a/src/librustc_data_structures/graph/scc/mod.rs +++ b/src/librustc_data_structures/graph/scc/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Routine to compute the strongly connected components (SCCs) of a //! graph, as well as the resulting DAG if each SCC is replaced with a //! node in the graph. This uses Tarjan's algorithm that completes in diff --git a/src/librustc_data_structures/graph/scc/test.rs b/src/librustc_data_structures/graph/scc/test.rs index 405e1b3a61748..e23cb1348b015 100644 --- a/src/librustc_data_structures/graph/scc/test.rs +++ b/src/librustc_data_structures/graph/scc/test.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![cfg(test)] use graph::test::TestGraph; diff --git a/src/librustc_data_structures/graph/test.rs b/src/librustc_data_structures/graph/test.rs index b72d011c99bad..c16bf7efa8d75 100644 --- a/src/librustc_data_structures/graph/test.rs +++ b/src/librustc_data_structures/graph/test.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::HashMap; use std::cmp::max; use std::slice; diff --git a/src/librustc_data_structures/indexed_set.rs b/src/librustc_data_structures/indexed_set.rs index f21c898a28a34..fbdb43775f263 100644 --- a/src/librustc_data_structures/indexed_set.rs +++ b/src/librustc_data_structures/indexed_set.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use array_vec::ArrayVec; use std::fmt; use std::iter; diff --git a/src/librustc_data_structures/indexed_vec.rs b/src/librustc_data_structures/indexed_vec.rs index c358f2f852e18..dbf68ec1616e3 100644 --- a/src/librustc_data_structures/indexed_vec.rs +++ b/src/librustc_data_structures/indexed_vec.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt::Debug; use std::iter::{self, FromIterator}; use std::slice; diff --git a/src/librustc_data_structures/lib.rs b/src/librustc_data_structures/lib.rs index 1eef7870c01b4..fd021864e5878 100644 --- a/src/librustc_data_structures/lib.rs +++ b/src/librustc_data_structures/lib.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Various data structures used by the Rust compiler. The intention //! is that code in here should be not be *specific* to rustc, so that //! it can be easily unit tested and so forth. diff --git a/src/librustc_data_structures/obligation_forest/mod.rs b/src/librustc_data_structures/obligation_forest/mod.rs index 7ef88852685d5..2d6b364ee04ec 100644 --- a/src/librustc_data_structures/obligation_forest/mod.rs +++ b/src/librustc_data_structures/obligation_forest/mod.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The `ObligationForest` is a utility data structure used in trait //! matching to track the set of outstanding obligations (those not //! yet resolved to success or error). It also tracks the "backtrace" diff --git a/src/librustc_data_structures/obligation_forest/node_index.rs b/src/librustc_data_structures/obligation_forest/node_index.rs index d89bd22ec9637..69ea473e05461 100644 --- a/src/librustc_data_structures/obligation_forest/node_index.rs +++ b/src/librustc_data_structures/obligation_forest/node_index.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::num::NonZeroU32; use std::u32; diff --git a/src/librustc_data_structures/obligation_forest/test.rs b/src/librustc_data_structures/obligation_forest/test.rs index 527a1ef0ec441..8dad0d19b7a7d 100644 --- a/src/librustc_data_structures/obligation_forest/test.rs +++ b/src/librustc_data_structures/obligation_forest/test.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![cfg(test)] use super::{Error, ObligationForest, ObligationProcessor, Outcome, ProcessResult}; diff --git a/src/librustc_data_structures/ptr_key.rs b/src/librustc_data_structures/ptr_key.rs index 6835dab38df0a..322dcbe8f08fb 100644 --- a/src/librustc_data_structures/ptr_key.rs +++ b/src/librustc_data_structures/ptr_key.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::{hash, ptr}; use std::ops::Deref; diff --git a/src/librustc_data_structures/sip128.rs b/src/librustc_data_structures/sip128.rs index 1f0b0d9cbfb0b..9ec9a39840032 100644 --- a/src/librustc_data_structures/sip128.rs +++ b/src/librustc_data_structures/sip128.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This is a copy of `core::hash::sip` adapted to providing 128 bit hashes. use std::cmp; diff --git a/src/librustc_data_structures/small_c_str.rs b/src/librustc_data_structures/small_c_str.rs index b0ad83e497938..2137549292b0f 100644 --- a/src/librustc_data_structures/small_c_str.rs +++ b/src/librustc_data_structures/small_c_str.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ffi; use std::ops::Deref; diff --git a/src/librustc_data_structures/small_vec.rs b/src/librustc_data_structures/small_vec.rs index e4e6a3d1a9c67..6ab114da1bb18 100644 --- a/src/librustc_data_structures/small_vec.rs +++ b/src/librustc_data_structures/small_vec.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A vector type intended to be used for collecting from iterators onto the stack. //! //! Space for up to N elements is provided on the stack. If more elements are collected, Vec is diff --git a/src/librustc_data_structures/snapshot_map/mod.rs b/src/librustc_data_structures/snapshot_map/mod.rs index 5030bf98dffd5..61b164a452d32 100644 --- a/src/librustc_data_structures/snapshot_map/mod.rs +++ b/src/librustc_data_structures/snapshot_map/mod.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use fx::FxHashMap; use std::hash::Hash; use std::ops; diff --git a/src/librustc_data_structures/snapshot_map/test.rs b/src/librustc_data_structures/snapshot_map/test.rs index b163e0fe420ec..a1197e394200e 100644 --- a/src/librustc_data_structures/snapshot_map/test.rs +++ b/src/librustc_data_structures/snapshot_map/test.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::SnapshotMap; #[test] diff --git a/src/librustc_data_structures/sorted_map.rs b/src/librustc_data_structures/sorted_map.rs index 730b13a0584fc..1c02d8b4c1135 100644 --- a/src/librustc_data_structures/sorted_map.rs +++ b/src/librustc_data_structures/sorted_map.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::borrow::Borrow; use std::cmp::Ordering; use std::convert::From; diff --git a/src/librustc_data_structures/stable_hasher.rs b/src/librustc_data_structures/stable_hasher.rs index 1024e69cc2b0e..37768f1c4d0e2 100644 --- a/src/librustc_data_structures/stable_hasher.rs +++ b/src/librustc_data_structures/stable_hasher.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::hash::{Hash, Hasher, BuildHasher}; use std::marker::PhantomData; use std::mem; diff --git a/src/librustc_data_structures/svh.rs b/src/librustc_data_structures/svh.rs index 94f132562b5ea..712de9fb1e2f0 100644 --- a/src/librustc_data_structures/svh.rs +++ b/src/librustc_data_structures/svh.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Calculation and management of a Strict Version Hash for crates //! //! The SVH is used for incremental compilation to track when HIR diff --git a/src/librustc_data_structures/sync.rs b/src/librustc_data_structures/sync.rs index 6989cdc0a9a15..da8f4a712fa53 100644 --- a/src/librustc_data_structures/sync.rs +++ b/src/librustc_data_structures/sync.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This module defines types which are thread safe if cfg!(parallel_queries) is true. //! //! `Lrc` is an alias of either Rc or Arc. diff --git a/src/librustc_data_structures/thin_vec.rs b/src/librustc_data_structures/thin_vec.rs index 546686b46b8db..099a7bf0083da 100644 --- a/src/librustc_data_structures/thin_vec.rs +++ b/src/librustc_data_structures/thin_vec.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// A vector type optimized for cases where this size is usually 0 (c.f. `SmallVector`). /// The `Option>` wrapping allows us to represent a zero sized vector with `None`, /// which uses only a single (null) pointer. diff --git a/src/librustc_data_structures/tiny_list.rs b/src/librustc_data_structures/tiny_list.rs index e1bfdf35b274e..d1765f2d6ba77 100644 --- a/src/librustc_data_structures/tiny_list.rs +++ b/src/librustc_data_structures/tiny_list.rs @@ -1,14 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - //! A singly-linked list. //! //! Using this data structure only makes sense under very specific diff --git a/src/librustc_data_structures/transitive_relation.rs b/src/librustc_data_structures/transitive_relation.rs index 2acc29acb0caa..13827d925aad1 100644 --- a/src/librustc_data_structures/transitive_relation.rs +++ b/src/librustc_data_structures/transitive_relation.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use bitvec::BitMatrix; use fx::FxHashMap; use sync::Lock; diff --git a/src/librustc_data_structures/tuple_slice.rs b/src/librustc_data_structures/tuple_slice.rs index b7c71dd366469..60b2b0330fb1c 100644 --- a/src/librustc_data_structures/tuple_slice.rs +++ b/src/librustc_data_structures/tuple_slice.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::slice; /// Allows to view uniform tuples as slices diff --git a/src/librustc_data_structures/work_queue.rs b/src/librustc_data_structures/work_queue.rs index 0c8ec753a18f6..940e8039d2656 100644 --- a/src/librustc_data_structures/work_queue.rs +++ b/src/librustc_data_structures/work_queue.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use indexed_set::IdxSet; use indexed_vec::Idx; use std::collections::VecDeque; diff --git a/src/librustc_driver/build.rs b/src/librustc_driver/build.rs index 9844f3b557a1f..414d13445f01e 100644 --- a/src/librustc_driver/build.rs +++ b/src/librustc_driver/build.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { println!("cargo:rerun-if-changed=build.rs"); println!("cargo:rerun-if-env-changed=CFG_RELEASE"); diff --git a/src/librustc_driver/derive_registrar.rs b/src/librustc_driver/derive_registrar.rs index 9983efce6af0b..43e4fde72993d 100644 --- a/src/librustc_driver/derive_registrar.rs +++ b/src/librustc_driver/derive_registrar.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::hir::itemlikevisit::ItemLikeVisitor; use rustc::hir::map::Map; use rustc::hir; diff --git a/src/librustc_driver/driver.rs b/src/librustc_driver/driver.rs index 1c2c0ad73a897..c10e2ff8c9dc5 100644 --- a/src/librustc_driver/driver.rs +++ b/src/librustc_driver/driver.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::dep_graph::DepGraph; use rustc::hir::{self, map as hir_map}; use rustc::hir::lowering::lower_crate; diff --git a/src/librustc_driver/lib.rs b/src/librustc_driver/lib.rs index f88c619bf7791..a403149dd7d8a 100644 --- a/src/librustc_driver/lib.rs +++ b/src/librustc_driver/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The Rust compiler. //! //! # Note diff --git a/src/librustc_driver/pretty.rs b/src/librustc_driver/pretty.rs index 65cbee821e864..06bb91e61932c 100644 --- a/src/librustc_driver/pretty.rs +++ b/src/librustc_driver/pretty.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The various pretty print routines. pub use self::UserIdentifiedItem::*; diff --git a/src/librustc_driver/profile/mod.rs b/src/librustc_driver/profile/mod.rs index 2ec85e1c27f1d..ad8c04a445169 100644 --- a/src/librustc_driver/profile/mod.rs +++ b/src/librustc_driver/profile/mod.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::session::Session; use rustc::util::common::{ProfQDumpParams, ProfileQueriesMsg, profq_msg, profq_set_chan}; use std::sync::mpsc::{Receiver}; diff --git a/src/librustc_driver/profile/trace.rs b/src/librustc_driver/profile/trace.rs index f31111e37ba08..5f5db8e5da58b 100644 --- a/src/librustc_driver/profile/trace.rs +++ b/src/librustc_driver/profile/trace.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::*; use syntax_pos::SpanData; use rustc::util::common::QueryMsg; diff --git a/src/librustc_driver/test.rs b/src/librustc_driver/test.rs index 175422975e006..a15c494a9d6e6 100644 --- a/src/librustc_driver/test.rs +++ b/src/librustc_driver/test.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! # Standalone Tests for the Inference Module use std::path::PathBuf; diff --git a/src/librustc_errors/diagnostic.rs b/src/librustc_errors/diagnostic.rs index 825e31539c8be..212d40e460990 100644 --- a/src/librustc_errors/diagnostic.rs +++ b/src/librustc_errors/diagnostic.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use CodeSuggestion; use SubstitutionPart; use Substitution; diff --git a/src/librustc_errors/diagnostic_builder.rs b/src/librustc_errors/diagnostic_builder.rs index 1b34898b99084..6efd7193b6061 100644 --- a/src/librustc_errors/diagnostic_builder.rs +++ b/src/librustc_errors/diagnostic_builder.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use Diagnostic; use DiagnosticId; use DiagnosticStyledString; diff --git a/src/librustc_errors/emitter.rs b/src/librustc_errors/emitter.rs index b4034a6a529bd..80cf2da4ff144 100644 --- a/src/librustc_errors/emitter.rs +++ b/src/librustc_errors/emitter.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use self::Destination::*; use syntax_pos::{SourceFile, Span, MultiSpan}; diff --git a/src/librustc_errors/lib.rs b/src/librustc_errors/lib.rs index 3582c2359c8b9..a9e7e13c55610 100644 --- a/src/librustc_errors/lib.rs +++ b/src/librustc_errors/lib.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png", html_favicon_url = "https://doc.rust-lang.org/favicon.ico", html_root_url = "https://doc.rust-lang.org/nightly/")] diff --git a/src/librustc_errors/lock.rs b/src/librustc_errors/lock.rs index dff8d53986db5..88b15ad8ff300 100644 --- a/src/librustc_errors/lock.rs +++ b/src/librustc_errors/lock.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Bindings to acquire a global named lock. //! //! This is intended to be used to synchronize multiple compiler processes to diff --git a/src/librustc_errors/registry.rs b/src/librustc_errors/registry.rs index 83737681471e2..2b1a8c1c0ab75 100644 --- a/src/librustc_errors/registry.rs +++ b/src/librustc_errors/registry.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::HashMap; #[derive(Clone)] diff --git a/src/librustc_errors/snippet.rs b/src/librustc_errors/snippet.rs index 002261dc1a532..da1da77f398a9 100644 --- a/src/librustc_errors/snippet.rs +++ b/src/librustc_errors/snippet.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Code for annotating snippets. use Level; diff --git a/src/librustc_errors/styled_buffer.rs b/src/librustc_errors/styled_buffer.rs index 2c736ec22c3b3..880f09e75e32e 100644 --- a/src/librustc_errors/styled_buffer.rs +++ b/src/librustc_errors/styled_buffer.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Code for creating styled buffers use snippet::{Style, StyledString}; diff --git a/src/librustc_fs_util/lib.rs b/src/librustc_fs_util/lib.rs index ffe420b109d3e..f566e4d5cddda 100644 --- a/src/librustc_fs_util/lib.rs +++ b/src/librustc_fs_util/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::path::{Path, PathBuf}; use std::ffi::CString; use std::fs; diff --git a/src/librustc_incremental/assert_dep_graph.rs b/src/librustc_incremental/assert_dep_graph.rs index 64036690927bd..4d58bdeb0413e 100644 --- a/src/librustc_incremental/assert_dep_graph.rs +++ b/src/librustc_incremental/assert_dep_graph.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This pass is only used for the UNIT TESTS and DEBUGGING NEEDS //! around dependency graph construction. It serves two purposes; it //! will dump graphs in graphviz form to disk, and it searches for diff --git a/src/librustc_incremental/assert_module_sources.rs b/src/librustc_incremental/assert_module_sources.rs index 9b8e2c450d5f8..b15b191e0fd09 100644 --- a/src/librustc_incremental/assert_module_sources.rs +++ b/src/librustc_incremental/assert_module_sources.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This pass is only used for UNIT TESTS related to incremental //! compilation. It tests whether a particular `.o` file will be re-used //! from a previous compilation or whether it must be regenerated. diff --git a/src/librustc_incremental/build.rs b/src/librustc_incremental/build.rs index f18a3f9b94016..d230ba91039ad 100644 --- a/src/librustc_incremental/build.rs +++ b/src/librustc_incremental/build.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { println!("cargo:rerun-if-changed=build.rs"); println!("cargo:rerun-if-env-changed=CFG_VERSION"); diff --git a/src/librustc_incremental/lib.rs b/src/librustc_incremental/lib.rs index ad8714fa4d52d..9a7c08914edbb 100644 --- a/src/librustc_incremental/lib.rs +++ b/src/librustc_incremental/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Support for serializing the dep-graph and reloading it. #![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png", diff --git a/src/librustc_incremental/persist/data.rs b/src/librustc_incremental/persist/data.rs index d7d142aac75cc..49b4bb061141c 100644 --- a/src/librustc_incremental/persist/data.rs +++ b/src/librustc_incremental/persist/data.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The data that we will serialize and deserialize. use rustc::dep_graph::{WorkProduct, WorkProductId}; diff --git a/src/librustc_incremental/persist/dirty_clean.rs b/src/librustc_incremental/persist/dirty_clean.rs index 7f2da5a326ace..d717c033529ec 100644 --- a/src/librustc_incremental/persist/dirty_clean.rs +++ b/src/librustc_incremental/persist/dirty_clean.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Debugging code to test fingerprints computed for query results. //! For each node marked with `#[rustc_clean]` or `#[rustc_dirty]`, //! we will compare the fingerprint from the current and from the previous diff --git a/src/librustc_incremental/persist/file_format.rs b/src/librustc_incremental/persist/file_format.rs index 98f7873fda0e4..373d6c18c661d 100644 --- a/src/librustc_incremental/persist/file_format.rs +++ b/src/librustc_incremental/persist/file_format.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This module defines a generic file format that allows to check if a given //! file generated by incremental compilation was generated by a compatible //! compiler version. This file format is used for the on-disk version of the diff --git a/src/librustc_incremental/persist/fs.rs b/src/librustc_incremental/persist/fs.rs index 28d53dc7fb3c4..ca804d5353a20 100644 --- a/src/librustc_incremental/persist/fs.rs +++ b/src/librustc_incremental/persist/fs.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - //! This module manages how the incremental compilation cache is represented in //! the file system. //! diff --git a/src/librustc_incremental/persist/load.rs b/src/librustc_incremental/persist/load.rs index fbc3bf03599fc..b1746c17dfeb8 100644 --- a/src/librustc_incremental/persist/load.rs +++ b/src/librustc_incremental/persist/load.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Code to save/load the dep-graph from files. use rustc_data_structures::fx::FxHashMap; diff --git a/src/librustc_incremental/persist/mod.rs b/src/librustc_incremental/persist/mod.rs index e1f00db56d5cb..dc3153b80b7c6 100644 --- a/src/librustc_incremental/persist/mod.rs +++ b/src/librustc_incremental/persist/mod.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! When in incremental mode, this pass dumps out the dependency graph //! into the given directory. At the same time, it also hashes the //! various HIR nodes. diff --git a/src/librustc_incremental/persist/save.rs b/src/librustc_incremental/persist/save.rs index 06b0ea946d778..7720faf9f94b4 100644 --- a/src/librustc_incremental/persist/save.rs +++ b/src/librustc_incremental/persist/save.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::dep_graph::{DepGraph, DepKind, WorkProduct, WorkProductId}; use rustc::session::Session; use rustc::ty::TyCtxt; diff --git a/src/librustc_incremental/persist/work_product.rs b/src/librustc_incremental/persist/work_product.rs index cfe59b1f67262..7e1059269dc7d 100644 --- a/src/librustc_incremental/persist/work_product.rs +++ b/src/librustc_incremental/persist/work_product.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This module contains files for saving intermediate work-products. use persist::fs::*; diff --git a/src/librustc_lint/bad_style.rs b/src/librustc_lint/bad_style.rs index 09871c0e84049..5692cf08b21ed 100644 --- a/src/librustc_lint/bad_style.rs +++ b/src/librustc_lint/bad_style.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::hir::def::Def; use rustc::ty; use lint::{LateContext, LintContext, LintArray}; diff --git a/src/librustc_lint/builtin.rs b/src/librustc_lint/builtin.rs index c26d8555214c1..cb91164e9d222 100644 --- a/src/librustc_lint/builtin.rs +++ b/src/librustc_lint/builtin.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Lints in the Rust compiler. //! //! This contains lints which can feasibly be implemented as their own diff --git a/src/librustc_lint/lib.rs b/src/librustc_lint/lib.rs index 7d802787105d1..c0d571e3f3fdf 100644 --- a/src/librustc_lint/lib.rs +++ b/src/librustc_lint/lib.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Lints in the Rust compiler. //! //! This currently only contains the definitions and implementations diff --git a/src/librustc_lint/types.rs b/src/librustc_lint/types.rs index d9f6e7de5b5e4..1df2ea396467a 100644 --- a/src/librustc_lint/types.rs +++ b/src/librustc_lint/types.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(non_snake_case)] use rustc::hir::map as hir_map; diff --git a/src/librustc_lint/unused.rs b/src/librustc_lint/unused.rs index 7a9d18676cf6c..a2617af845f54 100644 --- a/src/librustc_lint/unused.rs +++ b/src/librustc_lint/unused.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::hir::def::Def; use rustc::hir::def_id::DefId; use rustc::ty; diff --git a/src/librustc_llvm/build.rs b/src/librustc_llvm/build.rs index 4e24a26983d48..14e03ae4b659e 100644 --- a/src/librustc_llvm/build.rs +++ b/src/librustc_llvm/build.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate cc; extern crate build_helper; diff --git a/src/librustc_llvm/lib.rs b/src/librustc_llvm/lib.rs index 387660473a887..5a334b237d76d 100644 --- a/src/librustc_llvm/lib.rs +++ b/src/librustc_llvm/lib.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![cfg_attr(not(stage0), feature(nll))] #![feature(static_nobundle)] diff --git a/src/librustc_lsan/build.rs b/src/librustc_lsan/build.rs index 05e40cdceddda..470f2bb3e5c85 100644 --- a/src/librustc_lsan/build.rs +++ b/src/librustc_lsan/build.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate build_helper; extern crate cmake; diff --git a/src/librustc_lsan/lib.rs b/src/librustc_lsan/lib.rs index b3ba86ad8a4b3..876b33873d64e 100644 --- a/src/librustc_lsan/lib.rs +++ b/src/librustc_lsan/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![sanitizer_runtime] #![feature(alloc_system)] #![cfg_attr(not(stage0), feature(nll))] diff --git a/src/librustc_metadata/build.rs b/src/librustc_metadata/build.rs index f18a3f9b94016..d230ba91039ad 100644 --- a/src/librustc_metadata/build.rs +++ b/src/librustc_metadata/build.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { println!("cargo:rerun-if-changed=build.rs"); println!("cargo:rerun-if-env-changed=CFG_VERSION"); diff --git a/src/librustc_metadata/creader.rs b/src/librustc_metadata/creader.rs index c242f8d476a71..0d4a7ce54f1a7 100644 --- a/src/librustc_metadata/creader.rs +++ b/src/librustc_metadata/creader.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Validates all used crates and extern libraries and loads their metadata use cstore::{self, CStore, CrateSource, MetadataBlob}; diff --git a/src/librustc_metadata/cstore.rs b/src/librustc_metadata/cstore.rs index aad632f89180d..1a4488bd64c23 100644 --- a/src/librustc_metadata/cstore.rs +++ b/src/librustc_metadata/cstore.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // The crate store - a central repo for information collected about external // crates and libraries diff --git a/src/librustc_metadata/cstore_impl.rs b/src/librustc_metadata/cstore_impl.rs index 5aa05270a2a0b..32b6ca0dcbe6b 100644 --- a/src/librustc_metadata/cstore_impl.rs +++ b/src/librustc_metadata/cstore_impl.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use cstore::{self, LoadedMacro}; use encoder; use link_args; diff --git a/src/librustc_metadata/decoder.rs b/src/librustc_metadata/decoder.rs index f1e7e3de67d04..93b92c4b7866c 100644 --- a/src/librustc_metadata/decoder.rs +++ b/src/librustc_metadata/decoder.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Decoding metadata from a single crate's metadata use cstore::{self, CrateMetadata, MetadataBlob, NativeLibrary, ForeignModule}; diff --git a/src/librustc_metadata/diagnostics.rs b/src/librustc_metadata/diagnostics.rs index b38c12355737b..1b1852434740c 100644 --- a/src/librustc_metadata/diagnostics.rs +++ b/src/librustc_metadata/diagnostics.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(non_snake_case)] register_long_diagnostics! { diff --git a/src/librustc_metadata/dynamic_lib.rs b/src/librustc_metadata/dynamic_lib.rs index 182a071277ece..7d1c3c09d33e9 100644 --- a/src/librustc_metadata/dynamic_lib.rs +++ b/src/librustc_metadata/dynamic_lib.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Dynamic library facilities. //! //! A simple wrapper over the platform's dynamic library facilities diff --git a/src/librustc_metadata/encoder.rs b/src/librustc_metadata/encoder.rs index 44d8d4a727769..78c49706bcc28 100644 --- a/src/librustc_metadata/encoder.rs +++ b/src/librustc_metadata/encoder.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use index::Index; use index_builder::{FromId, IndexBuilder, Untracked}; use isolated_encoder::IsolatedEncoder; diff --git a/src/librustc_metadata/foreign_modules.rs b/src/librustc_metadata/foreign_modules.rs index e96d56fb38893..cc28f1d5abb28 100644 --- a/src/librustc_metadata/foreign_modules.rs +++ b/src/librustc_metadata/foreign_modules.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::hir::itemlikevisit::ItemLikeVisitor; use rustc::hir; use rustc::middle::cstore::ForeignModule; diff --git a/src/librustc_metadata/index.rs b/src/librustc_metadata/index.rs index 0b4f7e579acb9..ccf398241b191 100644 --- a/src/librustc_metadata/index.rs +++ b/src/librustc_metadata/index.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use schema::*; use rustc::hir::def_id::{DefId, DefIndex, DefIndexAddressSpace}; diff --git a/src/librustc_metadata/index_builder.rs b/src/librustc_metadata/index_builder.rs index fd2c2237c32d6..ec88a5cb30a2d 100644 --- a/src/librustc_metadata/index_builder.rs +++ b/src/librustc_metadata/index_builder.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Builder types for generating the "item data" section of the //! metadata. This section winds up looking like this: //! diff --git a/src/librustc_metadata/isolated_encoder.rs b/src/librustc_metadata/isolated_encoder.rs index 88594afa32024..c09d35d150a12 100644 --- a/src/librustc_metadata/isolated_encoder.rs +++ b/src/librustc_metadata/isolated_encoder.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use encoder::EncodeContext; use schema::{Lazy, LazySeq}; use rustc::ty::TyCtxt; diff --git a/src/librustc_metadata/lib.rs b/src/librustc_metadata/lib.rs index a3591b2415a89..f336ca4f2319f 100644 --- a/src/librustc_metadata/lib.rs +++ b/src/librustc_metadata/lib.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png", html_favicon_url = "https://doc.rust-lang.org/favicon.ico", html_root_url = "https://doc.rust-lang.org/nightly/")] diff --git a/src/librustc_metadata/link_args.rs b/src/librustc_metadata/link_args.rs index 008e1e363ff53..01098a9e5848c 100644 --- a/src/librustc_metadata/link_args.rs +++ b/src/librustc_metadata/link_args.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::hir::itemlikevisit::ItemLikeVisitor; use rustc::hir; use rustc::ty::TyCtxt; diff --git a/src/librustc_metadata/locator.rs b/src/librustc_metadata/locator.rs index f78a19403acf8..737953e597b76 100644 --- a/src/librustc_metadata/locator.rs +++ b/src/librustc_metadata/locator.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Finds crate binaries and loads their metadata //! //! Might I be the first to welcome you to a world of platform differences, diff --git a/src/librustc_metadata/native_libs.rs b/src/librustc_metadata/native_libs.rs index 446ea6c324441..497b5a07eac04 100644 --- a/src/librustc_metadata/native_libs.rs +++ b/src/librustc_metadata/native_libs.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::hir::itemlikevisit::ItemLikeVisitor; use rustc::hir; use rustc::middle::cstore::{self, NativeLibrary}; diff --git a/src/librustc_metadata/schema.rs b/src/librustc_metadata/schema.rs index 8e454ddc0adc4..5530f11565f10 100644 --- a/src/librustc_metadata/schema.rs +++ b/src/librustc_metadata/schema.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use index; use rustc::hir; diff --git a/src/librustc_metadata_utils/lib.rs b/src/librustc_metadata_utils/lib.rs index a1e5150390ac1..62912aa6fe89c 100644 --- a/src/librustc_metadata_utils/lib.rs +++ b/src/librustc_metadata_utils/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate rustc; extern crate syntax_pos; diff --git a/src/librustc_mir/borrow_check/borrow_set.rs b/src/librustc_mir/borrow_check/borrow_set.rs index 454f89e5d06fc..5003e59e7a0a7 100644 --- a/src/librustc_mir/borrow_check/borrow_set.rs +++ b/src/librustc_mir/borrow_check/borrow_set.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use borrow_check::place_ext::PlaceExt; use dataflow::indexes::BorrowIndex; use rustc::mir::traversal; diff --git a/src/librustc_mir/borrow_check/error_reporting.rs b/src/librustc_mir/borrow_check/error_reporting.rs index f1df135f7ee83..d6d8193ec49f8 100644 --- a/src/librustc_mir/borrow_check/error_reporting.rs +++ b/src/librustc_mir/borrow_check/error_reporting.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use borrow_check::WriteKind; use rustc::middle::region::ScopeTree; use rustc::mir::VarBindingForm; diff --git a/src/librustc_mir/borrow_check/flows.rs b/src/librustc_mir/borrow_check/flows.rs index 90dc96cbd3cf3..a1df6aba64e58 100644 --- a/src/librustc_mir/borrow_check/flows.rs +++ b/src/librustc_mir/borrow_check/flows.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Manages the dataflow bits required for borrowck. //! //! FIXME: this might be better as a "generic" fixed-point combinator, diff --git a/src/librustc_mir/borrow_check/location.rs b/src/librustc_mir/borrow_check/location.rs index 28da1b2d73357..38ac40738d744 100644 --- a/src/librustc_mir/borrow_check/location.rs +++ b/src/librustc_mir/borrow_check/location.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::mir::{BasicBlock, Location, Mir}; use rustc_data_structures::indexed_vec::{Idx, IndexVec}; diff --git a/src/librustc_mir/borrow_check/mod.rs b/src/librustc_mir/borrow_check/mod.rs index 70b6c8f25805c..c36804faeb5b4 100644 --- a/src/librustc_mir/borrow_check/mod.rs +++ b/src/librustc_mir/borrow_check/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This query borrow-checks the MIR to (further) ensure it is not broken. use borrow_check::nll::region_infer::RegionInferenceContext; diff --git a/src/librustc_mir/borrow_check/move_errors.rs b/src/librustc_mir/borrow_check/move_errors.rs index 497e8e07853fb..a96cb57d31c88 100644 --- a/src/librustc_mir/borrow_check/move_errors.rs +++ b/src/librustc_mir/borrow_check/move_errors.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use core::unicode::property::Pattern_White_Space; use rustc::mir::*; use rustc::ty; diff --git a/src/librustc_mir/borrow_check/mutability_errors.rs b/src/librustc_mir/borrow_check/mutability_errors.rs index 05d6f49d97c6c..da7eadc27863a 100644 --- a/src/librustc_mir/borrow_check/mutability_errors.rs +++ b/src/librustc_mir/borrow_check/mutability_errors.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::hir; use rustc::mir::{self, BindingForm, ClearCrossCrate, Local, Location, Mir}; use rustc::mir::{Mutability, Place, Projection, ProjectionElem, Static}; diff --git a/src/librustc_mir/borrow_check/nll/constraint_generation.rs b/src/librustc_mir/borrow_check/nll/constraint_generation.rs index 457499ded5657..bab726e391014 100644 --- a/src/librustc_mir/borrow_check/nll/constraint_generation.rs +++ b/src/librustc_mir/borrow_check/nll/constraint_generation.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use borrow_check::borrow_set::BorrowSet; use borrow_check::location::LocationTable; use borrow_check::nll::ToRegionVid; diff --git a/src/librustc_mir/borrow_check/nll/constraints/graph.rs b/src/librustc_mir/borrow_check/nll/constraints/graph.rs index 1a1094b570bd1..980025c028f45 100644 --- a/src/librustc_mir/borrow_check/nll/constraints/graph.rs +++ b/src/librustc_mir/borrow_check/nll/constraints/graph.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use borrow_check::nll::constraints::{ConstraintIndex, ConstraintSet, OutlivesConstraint}; use rustc::ty::RegionVid; use rustc_data_structures::graph; diff --git a/src/librustc_mir/borrow_check/nll/constraints/mod.rs b/src/librustc_mir/borrow_check/nll/constraints/mod.rs index 4cb92262ff085..2e22635a0b9a2 100644 --- a/src/librustc_mir/borrow_check/nll/constraints/mod.rs +++ b/src/librustc_mir/borrow_check/nll/constraints/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::ty::RegionVid; use rustc_data_structures::graph::scc::Sccs; use rustc_data_structures::indexed_vec::{Idx, IndexVec}; diff --git a/src/librustc_mir/borrow_check/nll/explain_borrow/find_use.rs b/src/librustc_mir/borrow_check/nll/explain_borrow/find_use.rs index aa88fa11174b1..1577c7294d03b 100644 --- a/src/librustc_mir/borrow_check/nll/explain_borrow/find_use.rs +++ b/src/librustc_mir/borrow_check/nll/explain_borrow/find_use.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::VecDeque; use std::rc::Rc; diff --git a/src/librustc_mir/borrow_check/nll/explain_borrow/mod.rs b/src/librustc_mir/borrow_check/nll/explain_borrow/mod.rs index 5098b24adc367..b6af823fd5468 100644 --- a/src/librustc_mir/borrow_check/nll/explain_borrow/mod.rs +++ b/src/librustc_mir/borrow_check/nll/explain_borrow/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use borrow_check::borrow_set::BorrowData; use borrow_check::nll::region_infer::Cause; use borrow_check::{Context, MirBorrowckCtxt, WriteKind}; diff --git a/src/librustc_mir/borrow_check/nll/facts.rs b/src/librustc_mir/borrow_check/nll/facts.rs index 8eb052f88e124..3866d3c8b3939 100644 --- a/src/librustc_mir/borrow_check/nll/facts.rs +++ b/src/librustc_mir/borrow_check/nll/facts.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use borrow_check::location::{LocationIndex, LocationTable}; use dataflow::indexes::BorrowIndex; use polonius_engine::AllFacts as PoloniusAllFacts; diff --git a/src/librustc_mir/borrow_check/nll/invalidation.rs b/src/librustc_mir/borrow_check/nll/invalidation.rs index f233a17597a54..04d9feb207d20 100644 --- a/src/librustc_mir/borrow_check/nll/invalidation.rs +++ b/src/librustc_mir/borrow_check/nll/invalidation.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use borrow_check::borrow_set::BorrowSet; use borrow_check::location::LocationTable; use borrow_check::{JustWrite, WriteAndRead}; diff --git a/src/librustc_mir/borrow_check/nll/mod.rs b/src/librustc_mir/borrow_check/nll/mod.rs index 40df78d6bfd37..63a0399af897e 100644 --- a/src/librustc_mir/borrow_check/nll/mod.rs +++ b/src/librustc_mir/borrow_check/nll/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use borrow_check::borrow_set::BorrowSet; use borrow_check::location::{LocationIndex, LocationTable}; use borrow_check::nll::facts::AllFactsExt; diff --git a/src/librustc_mir/borrow_check/nll/region_infer/annotation.rs b/src/librustc_mir/borrow_check/nll/region_infer/annotation.rs index 7cde06be0c23b..5d9508a3a5a92 100644 --- a/src/librustc_mir/borrow_check/nll/region_infer/annotation.rs +++ b/src/librustc_mir/borrow_check/nll/region_infer/annotation.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! As part of the NLL unit tests, you can annotate a function with //! `#[rustc_regions]`, and we will emit information about the region //! inference context and -- in particular -- the external constraints diff --git a/src/librustc_mir/borrow_check/nll/region_infer/dump_mir.rs b/src/librustc_mir/borrow_check/nll/region_infer/dump_mir.rs index d3b4f0a0447a1..e8bb865da592d 100644 --- a/src/librustc_mir/borrow_check/nll/region_infer/dump_mir.rs +++ b/src/librustc_mir/borrow_check/nll/region_infer/dump_mir.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! As part of generating the regions, if you enable `-Zdump-mir=nll`, //! we will generate an annotated copy of the MIR that includes the //! state of region inference. This code handles emitting the region diff --git a/src/librustc_mir/borrow_check/nll/region_infer/error_reporting/mod.rs b/src/librustc_mir/borrow_check/nll/region_infer/error_reporting/mod.rs index ca208a434314f..68f0f8bced359 100644 --- a/src/librustc_mir/borrow_check/nll/region_infer/error_reporting/mod.rs +++ b/src/librustc_mir/borrow_check/nll/region_infer/error_reporting/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use borrow_check::nll::region_infer::{ConstraintIndex, RegionInferenceContext}; use borrow_check::nll::type_check::Locations; use rustc::hir::def_id::DefId; diff --git a/src/librustc_mir/borrow_check/nll/region_infer/error_reporting/region_name.rs b/src/librustc_mir/borrow_check/nll/region_infer/error_reporting/region_name.rs index 6177194ab914d..d0e02ba71caa3 100644 --- a/src/librustc_mir/borrow_check/nll/region_infer/error_reporting/region_name.rs +++ b/src/librustc_mir/borrow_check/nll/region_infer/error_reporting/region_name.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use borrow_check::nll::region_infer::RegionInferenceContext; use borrow_check::nll::ToRegionVid; use borrow_check::nll::universal_regions::DefiningTy; diff --git a/src/librustc_mir/borrow_check/nll/region_infer/error_reporting/var_name.rs b/src/librustc_mir/borrow_check/nll/region_infer/error_reporting/var_name.rs index 57ff0f4c10a4b..133d6ceef33ea 100644 --- a/src/librustc_mir/borrow_check/nll/region_infer/error_reporting/var_name.rs +++ b/src/librustc_mir/borrow_check/nll/region_infer/error_reporting/var_name.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use borrow_check::nll::region_infer::RegionInferenceContext; use borrow_check::nll::ToRegionVid; use rustc::mir::{Local, Mir}; diff --git a/src/librustc_mir/borrow_check/nll/region_infer/graphviz.rs b/src/librustc_mir/borrow_check/nll/region_infer/graphviz.rs index dd508084d7dec..3d3fd93e12c60 100644 --- a/src/librustc_mir/borrow_check/nll/region_infer/graphviz.rs +++ b/src/librustc_mir/borrow_check/nll/region_infer/graphviz.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This module provides linkage between RegionInferenceContext and //! libgraphviz traits, specialized to attaching borrowck analysis //! data to rendered labels. diff --git a/src/librustc_mir/borrow_check/nll/region_infer/mod.rs b/src/librustc_mir/borrow_check/nll/region_infer/mod.rs index ff68b5987e85a..49b26161e85ca 100644 --- a/src/librustc_mir/borrow_check/nll/region_infer/mod.rs +++ b/src/librustc_mir/borrow_check/nll/region_infer/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::universal_regions::UniversalRegions; use borrow_check::nll::constraints::graph::NormalConstraintGraph; use borrow_check::nll::constraints::{ diff --git a/src/librustc_mir/borrow_check/nll/region_infer/values.rs b/src/librustc_mir/borrow_check/nll/region_infer/values.rs index 8db5809e53f5e..fd82c275872a8 100644 --- a/src/librustc_mir/borrow_check/nll/region_infer/values.rs +++ b/src/librustc_mir/borrow_check/nll/region_infer/values.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::mir::{BasicBlock, Location, Mir}; use rustc::ty::{self, RegionVid}; use rustc_data_structures::bitvec::SparseBitMatrix; diff --git a/src/librustc_mir/borrow_check/nll/renumber.rs b/src/librustc_mir/borrow_check/nll/renumber.rs index e1bd8530629d9..f7980d03b91b3 100644 --- a/src/librustc_mir/borrow_check/nll/renumber.rs +++ b/src/librustc_mir/borrow_check/nll/renumber.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::ty::subst::Substs; use rustc::ty::{self, CanonicalTy, ClosureSubsts, GeneratorSubsts, Ty, TypeFoldable}; use rustc::mir::{BasicBlock, Local, Location, Mir, Statement, StatementKind}; diff --git a/src/librustc_mir/borrow_check/nll/type_check/constraint_conversion.rs b/src/librustc_mir/borrow_check/nll/type_check/constraint_conversion.rs index 64a61972a2206..e401f4b9f244b 100644 --- a/src/librustc_mir/borrow_check/nll/type_check/constraint_conversion.rs +++ b/src/librustc_mir/borrow_check/nll/type_check/constraint_conversion.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use borrow_check::location::LocationTable; use borrow_check::nll::constraints::{ConstraintSet, OutlivesConstraint}; use borrow_check::nll::facts::AllFacts; diff --git a/src/librustc_mir/borrow_check/nll/type_check/free_region_relations.rs b/src/librustc_mir/borrow_check/nll/type_check/free_region_relations.rs index e4b1aacd34f71..28d8215b6b942 100644 --- a/src/librustc_mir/borrow_check/nll/type_check/free_region_relations.rs +++ b/src/librustc_mir/borrow_check/nll/type_check/free_region_relations.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use borrow_check::location::LocationTable; use borrow_check::nll::facts::AllFacts; use borrow_check::nll::type_check::constraint_conversion; diff --git a/src/librustc_mir/borrow_check/nll/type_check/input_output.rs b/src/librustc_mir/borrow_check/nll/type_check/input_output.rs index af42667016780..8873775787e4c 100644 --- a/src/librustc_mir/borrow_check/nll/type_check/input_output.rs +++ b/src/librustc_mir/borrow_check/nll/type_check/input_output.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This module contains code to equate the input/output types appearing //! in the MIR with the expected input/output types from the function //! signature. This requires a bit of processing, as the expected types diff --git a/src/librustc_mir/borrow_check/nll/type_check/liveness/liveness_map.rs b/src/librustc_mir/borrow_check/nll/type_check/liveness/liveness_map.rs index 89e8c76b22fb4..7fd952337ab32 100644 --- a/src/librustc_mir/borrow_check/nll/type_check/liveness/liveness_map.rs +++ b/src/librustc_mir/borrow_check/nll/type_check/liveness/liveness_map.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! For the NLL computation, we need to compute liveness, but only for those //! local variables whose types contain regions. The others are not of interest //! to us. This file defines a new index type (LocalWithRegion) that indexes into diff --git a/src/librustc_mir/borrow_check/nll/type_check/liveness/mod.rs b/src/librustc_mir/borrow_check/nll/type_check/liveness/mod.rs index a9b69cfe761ab..2520c02b2226e 100644 --- a/src/librustc_mir/borrow_check/nll/type_check/liveness/mod.rs +++ b/src/librustc_mir/borrow_check/nll/type_check/liveness/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use borrow_check::nll::constraints::ConstraintSet; use borrow_check::nll::type_check::AtLocation; use borrow_check::nll::{LocalWithRegion, NllLivenessMap}; diff --git a/src/librustc_mir/borrow_check/nll/type_check/mod.rs b/src/librustc_mir/borrow_check/nll/type_check/mod.rs index 2fb5861dff444..3db8fff33e840 100644 --- a/src/librustc_mir/borrow_check/nll/type_check/mod.rs +++ b/src/librustc_mir/borrow_check/nll/type_check/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This pass type-checks the MIR to ensure it is not broken. #![allow(unreachable_code)] diff --git a/src/librustc_mir/borrow_check/nll/type_check/relate_tys.rs b/src/librustc_mir/borrow_check/nll/type_check/relate_tys.rs index deb972ee04611..f950871a3d024 100644 --- a/src/librustc_mir/borrow_check/nll/type_check/relate_tys.rs +++ b/src/librustc_mir/borrow_check/nll/type_check/relate_tys.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use borrow_check::nll::constraints::OutlivesConstraint; use borrow_check::nll::type_check::{BorrowCheckContext, Locations}; use borrow_check::nll::universal_regions::UniversalRegions; diff --git a/src/librustc_mir/borrow_check/nll/universal_regions.rs b/src/librustc_mir/borrow_check/nll/universal_regions.rs index 8112b71b12752..12dcaf1745618 100644 --- a/src/librustc_mir/borrow_check/nll/universal_regions.rs +++ b/src/librustc_mir/borrow_check/nll/universal_regions.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Code to extract the universally quantified regions declared on a //! function and the relationships between them. For example: //! diff --git a/src/librustc_mir/borrow_check/path_utils.rs b/src/librustc_mir/borrow_check/path_utils.rs index 70b4e0ea2f03c..d36844c1306b1 100644 --- a/src/librustc_mir/borrow_check/path_utils.rs +++ b/src/librustc_mir/borrow_check/path_utils.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use borrow_check::borrow_set::{BorrowSet, BorrowData, TwoPhaseActivation}; use borrow_check::places_conflict; use borrow_check::Context; diff --git a/src/librustc_mir/borrow_check/place_ext.rs b/src/librustc_mir/borrow_check/place_ext.rs index 2b4a1553e1a89..e131676d54c4b 100644 --- a/src/librustc_mir/borrow_check/place_ext.rs +++ b/src/librustc_mir/borrow_check/place_ext.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::hir; use rustc::mir::ProjectionElem; use rustc::mir::{Local, Mir, Place}; diff --git a/src/librustc_mir/borrow_check/places_conflict.rs b/src/librustc_mir/borrow_check/places_conflict.rs index f791735690922..e0d55e96b34c3 100644 --- a/src/librustc_mir/borrow_check/places_conflict.rs +++ b/src/librustc_mir/borrow_check/places_conflict.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use borrow_check::ArtificialField; use borrow_check::Overlap; use borrow_check::{Deep, Shallow, ShallowOrDeep}; diff --git a/src/librustc_mir/borrow_check/prefixes.rs b/src/librustc_mir/borrow_check/prefixes.rs index 8dcc114330621..0cf1de8dcf52d 100644 --- a/src/librustc_mir/borrow_check/prefixes.rs +++ b/src/librustc_mir/borrow_check/prefixes.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! From the NLL RFC: "The deep [aka 'supporting'] prefixes for an //! place are formed by stripping away fields and derefs, except that //! we stop when we reach the deref of a shared reference. [...] " diff --git a/src/librustc_mir/borrow_check/used_muts.rs b/src/librustc_mir/borrow_check/used_muts.rs index dbe19bc47859f..b2ac86d3ec664 100644 --- a/src/librustc_mir/borrow_check/used_muts.rs +++ b/src/librustc_mir/borrow_check/used_muts.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::mir::visit::{PlaceContext, Visitor}; use rustc::mir::{Local, Location, Place}; diff --git a/src/librustc_mir/build/block.rs b/src/librustc_mir/build/block.rs index c3637a5abebdc..a9fa0ef0eeacd 100644 --- a/src/librustc_mir/build/block.rs +++ b/src/librustc_mir/build/block.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use build::{BlockAnd, BlockAndExtension, Builder}; use build::ForGuard::OutsideGuard; use build::matches::ArmHasGuard; diff --git a/src/librustc_mir/build/cfg.rs b/src/librustc_mir/build/cfg.rs index 1ed8289d44184..f316e8644461b 100644 --- a/src/librustc_mir/build/cfg.rs +++ b/src/librustc_mir/build/cfg.rs @@ -1,16 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - //! Routines for manipulating the control-flow graph. use build::CFG; diff --git a/src/librustc_mir/build/expr/as_constant.rs b/src/librustc_mir/build/expr/as_constant.rs index a57f1b9549485..3749ccbf1c3f3 100644 --- a/src/librustc_mir/build/expr/as_constant.rs +++ b/src/librustc_mir/build/expr/as_constant.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! See docs in build/expr/mod.rs use build::Builder; diff --git a/src/librustc_mir/build/expr/as_operand.rs b/src/librustc_mir/build/expr/as_operand.rs index 7eae414a39137..6738743a50099 100644 --- a/src/librustc_mir/build/expr/as_operand.rs +++ b/src/librustc_mir/build/expr/as_operand.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! See docs in build/expr/mod.rs use build::{BlockAnd, BlockAndExtension, Builder}; diff --git a/src/librustc_mir/build/expr/as_place.rs b/src/librustc_mir/build/expr/as_place.rs index a38ca7ae5bf64..0a6b1306e97cf 100644 --- a/src/librustc_mir/build/expr/as_place.rs +++ b/src/librustc_mir/build/expr/as_place.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! See docs in build/expr/mod.rs use build::{BlockAnd, BlockAndExtension, Builder}; diff --git a/src/librustc_mir/build/expr/as_rvalue.rs b/src/librustc_mir/build/expr/as_rvalue.rs index 68009e962a302..c2cabc2b98607 100644 --- a/src/librustc_mir/build/expr/as_rvalue.rs +++ b/src/librustc_mir/build/expr/as_rvalue.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! See docs in build/expr/mod.rs use rustc_data_structures::fx::FxHashMap; diff --git a/src/librustc_mir/build/expr/as_temp.rs b/src/librustc_mir/build/expr/as_temp.rs index f66fe763b759d..0c57b062c80ae 100644 --- a/src/librustc_mir/build/expr/as_temp.rs +++ b/src/librustc_mir/build/expr/as_temp.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! See docs in build/expr/mod.rs use build::{BlockAnd, BlockAndExtension, Builder}; diff --git a/src/librustc_mir/build/expr/category.rs b/src/librustc_mir/build/expr/category.rs index bce8e97d481f1..7b4f5b6b68a29 100644 --- a/src/librustc_mir/build/expr/category.rs +++ b/src/librustc_mir/build/expr/category.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use hair::*; #[derive(Debug, PartialEq)] diff --git a/src/librustc_mir/build/expr/into.rs b/src/librustc_mir/build/expr/into.rs index 2b05e2c023a5c..c5b8d7dd85096 100644 --- a/src/librustc_mir/build/expr/into.rs +++ b/src/librustc_mir/build/expr/into.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! See docs in build/expr/mod.rs use build::{BlockAnd, BlockAndExtension, Builder}; diff --git a/src/librustc_mir/build/expr/mod.rs b/src/librustc_mir/build/expr/mod.rs index a63cf41f0663e..387d16663f99a 100644 --- a/src/librustc_mir/build/expr/mod.rs +++ b/src/librustc_mir/build/expr/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Builds MIR from expressions. As a caller into this module, you //! have many options, but the first thing you have to decide is //! whether you are evaluating this expression for its *value*, its diff --git a/src/librustc_mir/build/expr/stmt.rs b/src/librustc_mir/build/expr/stmt.rs index 6f1fe8335780d..c813fc320df75 100644 --- a/src/librustc_mir/build/expr/stmt.rs +++ b/src/librustc_mir/build/expr/stmt.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use build::{BlockAnd, BlockAndExtension, Builder}; use build::scope::BreakableScope; use hair::*; diff --git a/src/librustc_mir/build/into.rs b/src/librustc_mir/build/into.rs index 9c8d0b2aeb911..83042b8402a10 100644 --- a/src/librustc_mir/build/into.rs +++ b/src/librustc_mir/build/into.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! In general, there are a number of things for which it's convenient //! to just call `builder.into` and have it emit its result into a //! given location. This is basically for expressions or things that can be diff --git a/src/librustc_mir/build/matches/mod.rs b/src/librustc_mir/build/matches/mod.rs index b317bb7cff0e3..2f4d570aed6db 100644 --- a/src/librustc_mir/build/matches/mod.rs +++ b/src/librustc_mir/build/matches/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Code related to match expressions. These are sufficiently complex //! to warrant their own module and submodules. :) This main module //! includes the high-level algorithm, the submodules contain the diff --git a/src/librustc_mir/build/matches/simplify.rs b/src/librustc_mir/build/matches/simplify.rs index 147b8cc2175af..c28a3894ee922 100644 --- a/src/librustc_mir/build/matches/simplify.rs +++ b/src/librustc_mir/build/matches/simplify.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Simplifying Candidates //! //! *Simplifying* a match pair `place @ pattern` means breaking it down diff --git a/src/librustc_mir/build/matches/test.rs b/src/librustc_mir/build/matches/test.rs index 15a983635f7ae..15c2778f1610b 100644 --- a/src/librustc_mir/build/matches/test.rs +++ b/src/librustc_mir/build/matches/test.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Testing candidates // // After candidates have been simplified, the only match pairs that diff --git a/src/librustc_mir/build/matches/util.rs b/src/librustc_mir/build/matches/util.rs index cfd9100fc6ae7..69553b4cfe8ea 100644 --- a/src/librustc_mir/build/matches/util.rs +++ b/src/librustc_mir/build/matches/util.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use build::Builder; use build::matches::MatchPair; use hair::*; diff --git a/src/librustc_mir/build/misc.rs b/src/librustc_mir/build/misc.rs index ae8070698c299..7a7c4dedfc88c 100644 --- a/src/librustc_mir/build/misc.rs +++ b/src/librustc_mir/build/misc.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Miscellaneous builder routines that are not specific to building any particular //! kind of thing. diff --git a/src/librustc_mir/build/mod.rs b/src/librustc_mir/build/mod.rs index 179bc2426ab4a..916ff04c55321 100644 --- a/src/librustc_mir/build/mod.rs +++ b/src/librustc_mir/build/mod.rs @@ -1,14 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use build; use build::scope::{CachedBlock, DropKind}; use hair::cx::Cx; diff --git a/src/librustc_mir/build/scope.rs b/src/librustc_mir/build/scope.rs index 8e99a45c87fdc..044cdced7271a 100644 --- a/src/librustc_mir/build/scope.rs +++ b/src/librustc_mir/build/scope.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /*! Managing the scope stack. The scopes are tied to lexical scopes, so as we descend the HAIR, we push a scope on the stack, build its diff --git a/src/librustc_mir/dataflow/at_location.rs b/src/librustc_mir/dataflow/at_location.rs index 0dfc5b5b4b7e0..13a994f673523 100644 --- a/src/librustc_mir/dataflow/at_location.rs +++ b/src/librustc_mir/dataflow/at_location.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A nice wrapper to consume dataflow results at several CFG //! locations. diff --git a/src/librustc_mir/dataflow/drop_flag_effects.rs b/src/librustc_mir/dataflow/drop_flag_effects.rs index 7af1daae4cad5..22fb7a3bc470e 100644 --- a/src/librustc_mir/dataflow/drop_flag_effects.rs +++ b/src/librustc_mir/dataflow/drop_flag_effects.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::mir::{self, Mir, Location}; use rustc::ty::{self, TyCtxt}; use util::elaborate_drops::DropFlagState; diff --git a/src/librustc_mir/dataflow/graphviz.rs b/src/librustc_mir/dataflow/graphviz.rs index 97d549987712b..dd8fd29f655c2 100644 --- a/src/librustc_mir/dataflow/graphviz.rs +++ b/src/librustc_mir/dataflow/graphviz.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Hook into libgraphviz for rendering dataflow graphs for MIR. use syntax::ast::NodeId; diff --git a/src/librustc_mir/dataflow/impls/borrowed_locals.rs b/src/librustc_mir/dataflow/impls/borrowed_locals.rs index c8c41c13b0fbb..8d5bc607190a6 100644 --- a/src/librustc_mir/dataflow/impls/borrowed_locals.rs +++ b/src/librustc_mir/dataflow/impls/borrowed_locals.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub use super::*; use rustc::mir::*; diff --git a/src/librustc_mir/dataflow/impls/borrows.rs b/src/librustc_mir/dataflow/impls/borrows.rs index 8f3595b17848c..d06846ee8cdf5 100644 --- a/src/librustc_mir/dataflow/impls/borrows.rs +++ b/src/librustc_mir/dataflow/impls/borrows.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use borrow_check::borrow_set::{BorrowSet, BorrowData}; use borrow_check::place_ext::PlaceExt; diff --git a/src/librustc_mir/dataflow/impls/mod.rs b/src/librustc_mir/dataflow/impls/mod.rs index ee3bba840c67b..8ef919e5e61bd 100644 --- a/src/librustc_mir/dataflow/impls/mod.rs +++ b/src/librustc_mir/dataflow/impls/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Dataflow analyses are built upon some interpretation of the //! bitvectors attached to each basic block, represented via a //! zero-sized structure. diff --git a/src/librustc_mir/dataflow/impls/storage_liveness.rs b/src/librustc_mir/dataflow/impls/storage_liveness.rs index 29548051a4d92..b4cc22a49a113 100644 --- a/src/librustc_mir/dataflow/impls/storage_liveness.rs +++ b/src/librustc_mir/dataflow/impls/storage_liveness.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub use super::*; use rustc::mir::*; diff --git a/src/librustc_mir/dataflow/mod.rs b/src/librustc_mir/dataflow/mod.rs index 598e827b2564e..2ad76134e5497 100644 --- a/src/librustc_mir/dataflow/mod.rs +++ b/src/librustc_mir/dataflow/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use syntax::ast::{self, MetaItem}; use rustc_data_structures::bitslice::{bitwise, BitwiseOperator}; diff --git a/src/librustc_mir/dataflow/move_paths/abs_domain.rs b/src/librustc_mir/dataflow/move_paths/abs_domain.rs index 4d20857bc2ec8..0718d20467954 100644 --- a/src/librustc_mir/dataflow/move_paths/abs_domain.rs +++ b/src/librustc_mir/dataflow/move_paths/abs_domain.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The move-analysis portion of borrowck needs to work in an abstract //! domain of lifted Places. Most of the Place variants fall into a //! one-to-one mapping between the concrete and abstract (e.g. a diff --git a/src/librustc_mir/dataflow/move_paths/builder.rs b/src/librustc_mir/dataflow/move_paths/builder.rs index 2148363c79712..c107167788bc7 100644 --- a/src/librustc_mir/dataflow/move_paths/builder.rs +++ b/src/librustc_mir/dataflow/move_paths/builder.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::ty::{self, TyCtxt}; use rustc::mir::*; use rustc::mir::tcx::RvalueInitializationState; diff --git a/src/librustc_mir/dataflow/move_paths/mod.rs b/src/librustc_mir/dataflow/move_paths/mod.rs index 7b4cbdf7131b0..43777257dc22b 100644 --- a/src/librustc_mir/dataflow/move_paths/mod.rs +++ b/src/librustc_mir/dataflow/move_paths/mod.rs @@ -1,14 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use rustc::ty::{self, TyCtxt}; use rustc::mir::*; use rustc::util::nodemap::FxHashMap; diff --git a/src/librustc_mir/diagnostics.rs b/src/librustc_mir/diagnostics.rs index ae4713a65de63..1b56431fb5a82 100644 --- a/src/librustc_mir/diagnostics.rs +++ b/src/librustc_mir/diagnostics.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(non_snake_case)] register_long_diagnostics! { diff --git a/src/librustc_mir/hair/cx/block.rs b/src/librustc_mir/hair/cx/block.rs index 6c8b5d97b6ff3..b569294f7ff4f 100644 --- a/src/librustc_mir/hair/cx/block.rs +++ b/src/librustc_mir/hair/cx/block.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use hair::*; use hair::cx::Cx; use hair::cx::to_ref::ToRef; diff --git a/src/librustc_mir/hair/cx/expr.rs b/src/librustc_mir/hair/cx/expr.rs index 04a3b5c115f22..a37311e7a9536 100644 --- a/src/librustc_mir/hair/cx/expr.rs +++ b/src/librustc_mir/hair/cx/expr.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use hair::*; use rustc_data_structures::indexed_vec::Idx; use hair::cx::Cx; diff --git a/src/librustc_mir/hair/cx/mod.rs b/src/librustc_mir/hair/cx/mod.rs index ef21348cd3ca1..e65940af0d348 100644 --- a/src/librustc_mir/hair/cx/mod.rs +++ b/src/librustc_mir/hair/cx/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This module contains the code to convert from the wacky tcx data //! structures into the hair. The `builder` is generally ignorant of //! the tcx etc, and instead goes through the `Cx` for most of its diff --git a/src/librustc_mir/hair/cx/to_ref.rs b/src/librustc_mir/hair/cx/to_ref.rs index 6930a959d6515..1b87e4450c56e 100644 --- a/src/librustc_mir/hair/cx/to_ref.rs +++ b/src/librustc_mir/hair/cx/to_ref.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use hair::*; use rustc::hir; diff --git a/src/librustc_mir/hair/mod.rs b/src/librustc_mir/hair/mod.rs index c39aa9ca7806d..be7151c0c8ab3 100644 --- a/src/librustc_mir/hair/mod.rs +++ b/src/librustc_mir/hair/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The MIR is built from some high-level abstract IR //! (HAIR). This section defines the HAIR along with a trait for //! accessing it. The intention is to allow MIR construction to be diff --git a/src/librustc_mir/hair/pattern/_match.rs b/src/librustc_mir/hair/pattern/_match.rs index e9d65caf08743..cdbe339da10f7 100644 --- a/src/librustc_mir/hair/pattern/_match.rs +++ b/src/librustc_mir/hair/pattern/_match.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// This file includes the logic for exhaustiveness and usefulness checking for /// pattern-matching. Specifically, given a list of patterns for a type, we can /// tell whether: diff --git a/src/librustc_mir/hair/pattern/check_match.rs b/src/librustc_mir/hair/pattern/check_match.rs index 604cc61a17ecb..f80f5ddd36dfe 100644 --- a/src/librustc_mir/hair/pattern/check_match.rs +++ b/src/librustc_mir/hair/pattern/check_match.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::_match::{MatchCheckCtxt, Matrix, expand_pattern, is_useful}; use super::_match::Usefulness::*; use super::_match::WitnessPreference::*; diff --git a/src/librustc_mir/hair/pattern/mod.rs b/src/librustc_mir/hair/pattern/mod.rs index 384ee0079dc84..279ab2cb08cc4 100644 --- a/src/librustc_mir/hair/pattern/mod.rs +++ b/src/librustc_mir/hair/pattern/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Code to validate patterns/matches mod _match; diff --git a/src/librustc_mir/lib.rs b/src/librustc_mir/lib.rs index 617efed31d913..e11d7836e692b 100644 --- a/src/librustc_mir/lib.rs +++ b/src/librustc_mir/lib.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /*! Rust MIR: a lowered representation of Rust. Also: an experiment! diff --git a/src/librustc_mir/monomorphize/collector.rs b/src/librustc_mir/monomorphize/collector.rs index a1dbf9ddb0356..7518ac4506c3d 100644 --- a/src/librustc_mir/monomorphize/collector.rs +++ b/src/librustc_mir/monomorphize/collector.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Mono Item Collection //! =========================== //! diff --git a/src/librustc_mir/monomorphize/item.rs b/src/librustc_mir/monomorphize/item.rs index 3187a91e22597..d089fff0e6b05 100644 --- a/src/librustc_mir/monomorphize/item.rs +++ b/src/librustc_mir/monomorphize/item.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Walks the crate looking for items/impl-items/trait-items that have //! either a `rustc_symbol_name` or `rustc_item_path` attribute and //! generates an error giving, respectively, the symbol name or diff --git a/src/librustc_mir/monomorphize/mod.rs b/src/librustc_mir/monomorphize/mod.rs index 30556759bd394..7fa904d32cbb4 100644 --- a/src/librustc_mir/monomorphize/mod.rs +++ b/src/librustc_mir/monomorphize/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::hir::def_id::DefId; use rustc::middle::lang_items::DropInPlaceFnLangItem; use rustc::traits; diff --git a/src/librustc_mir/monomorphize/partitioning.rs b/src/librustc_mir/monomorphize/partitioning.rs index 7d7be69b35559..e3d9664c75bc9 100644 --- a/src/librustc_mir/monomorphize/partitioning.rs +++ b/src/librustc_mir/monomorphize/partitioning.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Partitioning Codegen Units for Incremental Compilation //! ====================================================== //! diff --git a/src/librustc_mir/shim.rs b/src/librustc_mir/shim.rs index 765a47e729e68..29bb287327bc9 100644 --- a/src/librustc_mir/shim.rs +++ b/src/librustc_mir/shim.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::hir; use rustc::hir::def_id::DefId; use rustc::infer; diff --git a/src/librustc_mir/transform/add_call_guards.rs b/src/librustc_mir/transform/add_call_guards.rs index 2692790444000..3ea1c8e82ff2b 100644 --- a/src/librustc_mir/transform/add_call_guards.rs +++ b/src/librustc_mir/transform/add_call_guards.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::ty::TyCtxt; use rustc::mir::*; use rustc_data_structures::indexed_vec::{Idx, IndexVec}; diff --git a/src/librustc_mir/transform/add_moves_for_packed_drops.rs b/src/librustc_mir/transform/add_moves_for_packed_drops.rs index 203669c61badd..8ec6902cf15fd 100644 --- a/src/librustc_mir/transform/add_moves_for_packed_drops.rs +++ b/src/librustc_mir/transform/add_moves_for_packed_drops.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::hir::def_id::DefId; use rustc::mir::*; use rustc::ty::TyCtxt; diff --git a/src/librustc_mir/transform/add_validation.rs b/src/librustc_mir/transform/add_validation.rs index 9061b34ae4445..6a6f06c88fc58 100644 --- a/src/librustc_mir/transform/add_validation.rs +++ b/src/librustc_mir/transform/add_validation.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This pass adds validation calls (AcquireValid, ReleaseValid) where appropriate. //! It has to be run really early, before transformations like inlining, because //! introducing these calls *adds* UB -- so, conceptually, this pass is actually part diff --git a/src/librustc_mir/transform/check_unsafety.rs b/src/librustc_mir/transform/check_unsafety.rs index 5d284981c70af..0ff2081cd3cda 100644 --- a/src/librustc_mir/transform/check_unsafety.rs +++ b/src/librustc_mir/transform/check_unsafety.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc_data_structures::fx::FxHashSet; use rustc_data_structures::indexed_vec::IndexVec; use rustc_data_structures::sync::Lrc; diff --git a/src/librustc_mir/transform/cleanup_post_borrowck.rs b/src/librustc_mir/transform/cleanup_post_borrowck.rs index 256b1fd66e9a7..e9842c0966c94 100644 --- a/src/librustc_mir/transform/cleanup_post_borrowck.rs +++ b/src/librustc_mir/transform/cleanup_post_borrowck.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This module provides two passes: //! //! - `CleanEndRegions`, that reduces the set of `EndRegion` statements diff --git a/src/librustc_mir/transform/const_prop.rs b/src/librustc_mir/transform/const_prop.rs index fa11e6f0719b1..00d64d5ac85ae 100644 --- a/src/librustc_mir/transform/const_prop.rs +++ b/src/librustc_mir/transform/const_prop.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Propagates constants for early reporting of statically known //! assertion failures diff --git a/src/librustc_mir/transform/copy_prop.rs b/src/librustc_mir/transform/copy_prop.rs index fba60c7e8dc27..58dfc9d86fb6c 100644 --- a/src/librustc_mir/transform/copy_prop.rs +++ b/src/librustc_mir/transform/copy_prop.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Trivial copy propagation pass. //! //! This uses def-use analysis to remove values that have exactly one def and one use, which must diff --git a/src/librustc_mir/transform/deaggregator.rs b/src/librustc_mir/transform/deaggregator.rs index 8b2b9ef7e814d..1aa5a7cf2e590 100644 --- a/src/librustc_mir/transform/deaggregator.rs +++ b/src/librustc_mir/transform/deaggregator.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::ty::TyCtxt; use rustc::mir::*; use rustc_data_structures::indexed_vec::Idx; diff --git a/src/librustc_mir/transform/dump_mir.rs b/src/librustc_mir/transform/dump_mir.rs index a16ef2adea9be..8fabb2d11fc46 100644 --- a/src/librustc_mir/transform/dump_mir.rs +++ b/src/librustc_mir/transform/dump_mir.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This pass just dumps MIR at a specified point. use std::borrow::Cow; diff --git a/src/librustc_mir/transform/elaborate_drops.rs b/src/librustc_mir/transform/elaborate_drops.rs index bbf896e624f20..31f131f50dd7f 100644 --- a/src/librustc_mir/transform/elaborate_drops.rs +++ b/src/librustc_mir/transform/elaborate_drops.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use dataflow::move_paths::{HasMoveData, MoveData, MovePathIndex, LookupResult}; use dataflow::{MaybeInitializedPlaces, MaybeUninitializedPlaces}; use dataflow::{DataflowResults}; diff --git a/src/librustc_mir/transform/erase_regions.rs b/src/librustc_mir/transform/erase_regions.rs index c697391d86776..c55f50ec640d0 100644 --- a/src/librustc_mir/transform/erase_regions.rs +++ b/src/librustc_mir/transform/erase_regions.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This pass erases all early-bound regions from the types occurring in the MIR. //! We want to do this once just before codegen, so codegen does not have to take //! care erasing regions all over the place. diff --git a/src/librustc_mir/transform/generator.rs b/src/librustc_mir/transform/generator.rs index dc657f228c9fc..429933303ea48 100644 --- a/src/librustc_mir/transform/generator.rs +++ b/src/librustc_mir/transform/generator.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This is the implementation of the pass which transforms generators into state machines. //! //! MIR generation for generators creates a function which has a self argument which diff --git a/src/librustc_mir/transform/inline.rs b/src/librustc_mir/transform/inline.rs index 31e437ce2281a..3331f6dd8263a 100644 --- a/src/librustc_mir/transform/inline.rs +++ b/src/librustc_mir/transform/inline.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Inlining pass for MIR functions use rustc::hir; diff --git a/src/librustc_mir/transform/instcombine.rs b/src/librustc_mir/transform/instcombine.rs index 4cf4a8f23a443..79e81d6a9c62f 100644 --- a/src/librustc_mir/transform/instcombine.rs +++ b/src/librustc_mir/transform/instcombine.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Performs various peephole optimizations. use rustc::mir::{Constant, Location, Place, Mir, Operand, ProjectionElem, Rvalue, Local}; diff --git a/src/librustc_mir/transform/lower_128bit.rs b/src/librustc_mir/transform/lower_128bit.rs index 8ed5600400b51..a0eb2a4e55ab7 100644 --- a/src/librustc_mir/transform/lower_128bit.rs +++ b/src/librustc_mir/transform/lower_128bit.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Replaces 128-bit operators with lang item calls use rustc::hir::def_id::DefId; diff --git a/src/librustc_mir/transform/mod.rs b/src/librustc_mir/transform/mod.rs index 90dfebeef1b0c..a1d61b219496b 100644 --- a/src/librustc_mir/transform/mod.rs +++ b/src/librustc_mir/transform/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use borrow_check::nll::type_check; use build; use rustc::hir::def_id::{CrateNum, DefId, LOCAL_CRATE}; diff --git a/src/librustc_mir/transform/no_landing_pads.rs b/src/librustc_mir/transform/no_landing_pads.rs index c8f171d4160c6..2d13b066270a2 100644 --- a/src/librustc_mir/transform/no_landing_pads.rs +++ b/src/librustc_mir/transform/no_landing_pads.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This pass removes the unwind branch of all the terminators when the no-landing-pads option is //! specified. diff --git a/src/librustc_mir/transform/promote_consts.rs b/src/librustc_mir/transform/promote_consts.rs index bb66b9ed6ece8..913fad8f53f71 100644 --- a/src/librustc_mir/transform/promote_consts.rs +++ b/src/librustc_mir/transform/promote_consts.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A pass that promotes borrows of constant rvalues. //! //! The rvalues considered constant are trees of temps, diff --git a/src/librustc_mir/transform/qualify_consts.rs b/src/librustc_mir/transform/qualify_consts.rs index 7582792b10d98..99c42f8c36f5e 100644 --- a/src/librustc_mir/transform/qualify_consts.rs +++ b/src/librustc_mir/transform/qualify_consts.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A pass that qualifies constness of temporaries in constants, //! static initializers and functions and also drives promotion. //! diff --git a/src/librustc_mir/transform/remove_noop_landing_pads.rs b/src/librustc_mir/transform/remove_noop_landing_pads.rs index 04a7a81eb126f..0770847a5aa9b 100644 --- a/src/librustc_mir/transform/remove_noop_landing_pads.rs +++ b/src/librustc_mir/transform/remove_noop_landing_pads.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::ty::TyCtxt; use rustc::mir::*; use rustc_data_structures::bitvec::BitArray; diff --git a/src/librustc_mir/transform/rustc_peek.rs b/src/librustc_mir/transform/rustc_peek.rs index 63675f056ab78..d48ce7cf4d98d 100644 --- a/src/librustc_mir/transform/rustc_peek.rs +++ b/src/librustc_mir/transform/rustc_peek.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc_target::spec::abi::{Abi}; use syntax::ast; use syntax_pos::Span; diff --git a/src/librustc_mir/transform/simplify.rs b/src/librustc_mir/transform/simplify.rs index 164790db4b5ec..5799e2852b5e3 100644 --- a/src/librustc_mir/transform/simplify.rs +++ b/src/librustc_mir/transform/simplify.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A number of passes which remove various redundancies in the CFG. //! //! The `SimplifyCfg` pass gets rid of unnecessary blocks in the CFG, whereas the `SimplifyLocals` diff --git a/src/librustc_mir/transform/simplify_branches.rs b/src/librustc_mir/transform/simplify_branches.rs index e14941b8aeb9a..688a9df4ac544 100644 --- a/src/librustc_mir/transform/simplify_branches.rs +++ b/src/librustc_mir/transform/simplify_branches.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A pass that simplifies branches when their condition is known. use rustc::ty::{TyCtxt, ParamEnv}; diff --git a/src/librustc_mir/transform/uniform_array_move_out.rs b/src/librustc_mir/transform/uniform_array_move_out.rs index 78464b2a104ec..5a12164dac957 100644 --- a/src/librustc_mir/transform/uniform_array_move_out.rs +++ b/src/librustc_mir/transform/uniform_array_move_out.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This pass converts move out from array by Subslice and // ConstIndex{.., from_end: true} to ConstIndex move out(s) from begin // of array. It allows detect error by mir borrowck and elaborate diff --git a/src/librustc_mir/util/alignment.rs b/src/librustc_mir/util/alignment.rs index 8717bd08ae4a5..452f58f436cac 100644 --- a/src/librustc_mir/util/alignment.rs +++ b/src/librustc_mir/util/alignment.rs @@ -1,14 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use rustc::ty::{self, TyCtxt}; use rustc::mir::*; diff --git a/src/librustc_mir/util/borrowck_errors.rs b/src/librustc_mir/util/borrowck_errors.rs index 1c5e1e406911a..f1464c9810d5c 100644 --- a/src/librustc_mir/util/borrowck_errors.rs +++ b/src/librustc_mir/util/borrowck_errors.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::session::config::BorrowckMode; use rustc::ty::{self, TyCtxt}; use rustc_errors::{DiagnosticBuilder, DiagnosticId}; diff --git a/src/librustc_mir/util/collect_writes.rs b/src/librustc_mir/util/collect_writes.rs index 23f753f8569bb..d5198ec50d31b 100644 --- a/src/librustc_mir/util/collect_writes.rs +++ b/src/librustc_mir/util/collect_writes.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::mir::{Local, Location}; use rustc::mir::Mir; use rustc::mir::visit::PlaceContext; diff --git a/src/librustc_mir/util/def_use.rs b/src/librustc_mir/util/def_use.rs index 07de346e795f9..057a7c8be88c9 100644 --- a/src/librustc_mir/util/def_use.rs +++ b/src/librustc_mir/util/def_use.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Def-use analysis. use rustc::mir::{Local, Location, Mir}; diff --git a/src/librustc_mir/util/elaborate_drops.rs b/src/librustc_mir/util/elaborate_drops.rs index 45e405cb55e32..4e9272ba86e8b 100644 --- a/src/librustc_mir/util/elaborate_drops.rs +++ b/src/librustc_mir/util/elaborate_drops.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt; use rustc::hir; use rustc::mir::*; diff --git a/src/librustc_mir/util/graphviz.rs b/src/librustc_mir/util/graphviz.rs index 22e2b1b0b09c9..f5a4460cc127e 100644 --- a/src/librustc_mir/util/graphviz.rs +++ b/src/librustc_mir/util/graphviz.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use dot; use rustc::hir::def_id::DefId; use rustc::mir::*; diff --git a/src/librustc_mir/util/liveness.rs b/src/librustc_mir/util/liveness.rs index 04fa516a655a6..6bdffec5026bc 100644 --- a/src/librustc_mir/util/liveness.rs +++ b/src/librustc_mir/util/liveness.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Liveness analysis which computes liveness of MIR local variables at the boundary of basic blocks //! //! This analysis considers references as being used only at the point of the diff --git a/src/librustc_mir/util/mod.rs b/src/librustc_mir/util/mod.rs index 1e624081bcfb5..29614a33f8e27 100644 --- a/src/librustc_mir/util/mod.rs +++ b/src/librustc_mir/util/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use core::unicode::property::Pattern_White_Space; use rustc::ty; use syntax_pos::Span; diff --git a/src/librustc_mir/util/patch.rs b/src/librustc_mir/util/patch.rs index c2a56adc18f5c..3960642764f4f 100644 --- a/src/librustc_mir/util/patch.rs +++ b/src/librustc_mir/util/patch.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::ty::Ty; use rustc::mir::*; use rustc_data_structures::indexed_vec::{IndexVec, Idx}; diff --git a/src/librustc_mir/util/pretty.rs b/src/librustc_mir/util/pretty.rs index 886f83b8f2f3b..75edc13cf27f8 100644 --- a/src/librustc_mir/util/pretty.rs +++ b/src/librustc_mir/util/pretty.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::hir; use rustc::hir::def_id::{DefId, LOCAL_CRATE}; use rustc::mir::*; diff --git a/src/librustc_msan/build.rs b/src/librustc_msan/build.rs index 4abfc3585602f..e1140278f2b4e 100644 --- a/src/librustc_msan/build.rs +++ b/src/librustc_msan/build.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate build_helper; extern crate cmake; diff --git a/src/librustc_msan/lib.rs b/src/librustc_msan/lib.rs index b3ba86ad8a4b3..876b33873d64e 100644 --- a/src/librustc_msan/lib.rs +++ b/src/librustc_msan/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![sanitizer_runtime] #![feature(alloc_system)] #![cfg_attr(not(stage0), feature(nll))] diff --git a/src/librustc_passes/ast_validation.rs b/src/librustc_passes/ast_validation.rs index bca119660aa2a..61816208a7814 100644 --- a/src/librustc_passes/ast_validation.rs +++ b/src/librustc_passes/ast_validation.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Validate AST before lowering it to HIR // // This pass is supposed to catch things that fit into AST data structures, diff --git a/src/librustc_passes/diagnostics.rs b/src/librustc_passes/diagnostics.rs index f1d0a4fee341e..037227aeb715d 100644 --- a/src/librustc_passes/diagnostics.rs +++ b/src/librustc_passes/diagnostics.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(non_snake_case)] register_long_diagnostics! { diff --git a/src/librustc_passes/hir_stats.rs b/src/librustc_passes/hir_stats.rs index 3c5a0590c2023..cb855e9a96853 100644 --- a/src/librustc_passes/hir_stats.rs +++ b/src/librustc_passes/hir_stats.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // The visitors in this module collect sizes and counts of the most important // pieces of AST and HIR. The resulting numbers are good approximations but not // completely accurate (some things might be counted twice, others missed). diff --git a/src/librustc_passes/lib.rs b/src/librustc_passes/lib.rs index d62cb00923f70..5edf22ec113f0 100644 --- a/src/librustc_passes/lib.rs +++ b/src/librustc_passes/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Various checks //! //! # Note diff --git a/src/librustc_passes/loops.rs b/src/librustc_passes/loops.rs index 8ef20126e035f..df18b91816319 100644 --- a/src/librustc_passes/loops.rs +++ b/src/librustc_passes/loops.rs @@ -1,12 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. use self::Context::*; use rustc::session::Session; diff --git a/src/librustc_passes/mir_stats.rs b/src/librustc_passes/mir_stats.rs index 3206fa6e17265..b52523f5edb51 100644 --- a/src/librustc_passes/mir_stats.rs +++ b/src/librustc_passes/mir_stats.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // The visitors in this module collect sizes and counts of the most important // pieces of MIR. The resulting numbers are good approximations but not // completely accurate (some things might be counted twice, others missed). diff --git a/src/librustc_passes/rvalue_promotion.rs b/src/librustc_passes/rvalue_promotion.rs index fca1c7f27ab37..5540a26467bd2 100644 --- a/src/librustc_passes/rvalue_promotion.rs +++ b/src/librustc_passes/rvalue_promotion.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Verifies that the types and values of const and static items // are safe. The rules enforced by this module are: // diff --git a/src/librustc_platform_intrinsics/aarch64.rs b/src/librustc_platform_intrinsics/aarch64.rs index 14925cd6d4dac..833a312ae63a4 100644 --- a/src/librustc_platform_intrinsics/aarch64.rs +++ b/src/librustc_platform_intrinsics/aarch64.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // DO NOT EDIT: autogenerated by etc/platform-intrinsics/generator.py // ignore-tidy-linelength diff --git a/src/librustc_platform_intrinsics/arm.rs b/src/librustc_platform_intrinsics/arm.rs index 8b320d90fac2c..2d19293b13295 100644 --- a/src/librustc_platform_intrinsics/arm.rs +++ b/src/librustc_platform_intrinsics/arm.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // DO NOT EDIT: autogenerated by etc/platform-intrinsics/generator.py // ignore-tidy-linelength diff --git a/src/librustc_platform_intrinsics/hexagon.rs b/src/librustc_platform_intrinsics/hexagon.rs index 65460cfb8bd51..fd0f3a46b39cd 100644 --- a/src/librustc_platform_intrinsics/hexagon.rs +++ b/src/librustc_platform_intrinsics/hexagon.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // DO NOT EDIT: autogenerated by etc/platform-intrinsics/generator.py // ignore-tidy-linelength diff --git a/src/librustc_platform_intrinsics/lib.rs b/src/librustc_platform_intrinsics/lib.rs index d41f4cd61f763..b851ef537163b 100644 --- a/src/librustc_platform_intrinsics/lib.rs +++ b/src/librustc_platform_intrinsics/lib.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(bad_style)] #![cfg_attr(not(stage0), feature(nll))] diff --git a/src/librustc_platform_intrinsics/nvptx.rs b/src/librustc_platform_intrinsics/nvptx.rs index 0c0ee429d0cc4..41278463bae77 100644 --- a/src/librustc_platform_intrinsics/nvptx.rs +++ b/src/librustc_platform_intrinsics/nvptx.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // DO NOT EDIT: autogenerated by etc/platform-intrinsics/generator.py // ignore-tidy-linelength diff --git a/src/librustc_platform_intrinsics/powerpc.rs b/src/librustc_platform_intrinsics/powerpc.rs index 5c062c0ecec03..d745090107c62 100644 --- a/src/librustc_platform_intrinsics/powerpc.rs +++ b/src/librustc_platform_intrinsics/powerpc.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // DO NOT EDIT: autogenerated by etc/platform-intrinsics/generator.py // ignore-tidy-linelength diff --git a/src/librustc_platform_intrinsics/x86.rs b/src/librustc_platform_intrinsics/x86.rs index 5c01c3a118d2d..3f1ba912eee63 100644 --- a/src/librustc_platform_intrinsics/x86.rs +++ b/src/librustc_platform_intrinsics/x86.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // DO NOT EDIT: autogenerated by etc/platform-intrinsics/generator.py // ignore-tidy-linelength diff --git a/src/librustc_plugin/build.rs b/src/librustc_plugin/build.rs index f2728593db4d9..eca2736ee5292 100644 --- a/src/librustc_plugin/build.rs +++ b/src/librustc_plugin/build.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Used by `rustc` when compiling a plugin crate. use syntax::ast; diff --git a/src/librustc_plugin/diagnostics.rs b/src/librustc_plugin/diagnostics.rs index 100c1db143974..382a1edb43c4a 100644 --- a/src/librustc_plugin/diagnostics.rs +++ b/src/librustc_plugin/diagnostics.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(non_snake_case)] register_long_diagnostics! { diff --git a/src/librustc_plugin/lib.rs b/src/librustc_plugin/lib.rs index 67f53a67313f7..53bf54fb01276 100644 --- a/src/librustc_plugin/lib.rs +++ b/src/librustc_plugin/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Infrastructure for compiler plugins. //! //! Plugins are Rust libraries which extend the behavior of `rustc` diff --git a/src/librustc_plugin/load.rs b/src/librustc_plugin/load.rs index bf59165a9c461..788e1cb9f42ba 100644 --- a/src/librustc_plugin/load.rs +++ b/src/librustc_plugin/load.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Used by `rustc` when loading a plugin. use rustc::session::Session; diff --git a/src/librustc_plugin/registry.rs b/src/librustc_plugin/registry.rs index b1ab86674cf90..6c6f1aef195b5 100644 --- a/src/librustc_plugin/registry.rs +++ b/src/librustc_plugin/registry.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Used by plugin crates to tell `rustc` about the plugins they provide. use rustc::lint::{EarlyLintPassObject, LateLintPassObject, LintId, Lint}; diff --git a/src/librustc_privacy/diagnostics.rs b/src/librustc_privacy/diagnostics.rs index f8559954db12b..fa4df53e47b31 100644 --- a/src/librustc_privacy/diagnostics.rs +++ b/src/librustc_privacy/diagnostics.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(non_snake_case)] register_long_diagnostics! { diff --git a/src/librustc_privacy/lib.rs b/src/librustc_privacy/lib.rs index dd536d673cf4d..ba052e7918688 100644 --- a/src/librustc_privacy/lib.rs +++ b/src/librustc_privacy/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png", html_favicon_url = "https://doc.rust-lang.org/favicon.ico", html_root_url = "https://doc.rust-lang.org/nightly/")] diff --git a/src/librustc_resolve/build_reduced_graph.rs b/src/librustc_resolve/build_reduced_graph.rs index 80f6c263e1999..38a768ef103d3 100644 --- a/src/librustc_resolve/build_reduced_graph.rs +++ b/src/librustc_resolve/build_reduced_graph.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Reduced graph building //! //! Here we build the "reduced graph": the graph of the module tree without diff --git a/src/librustc_resolve/check_unused.rs b/src/librustc_resolve/check_unused.rs index de9481579e2f4..57b8c6fd3ff0d 100644 --- a/src/librustc_resolve/check_unused.rs +++ b/src/librustc_resolve/check_unused.rs @@ -1,14 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // // Unused import checking // diff --git a/src/librustc_resolve/diagnostics.rs b/src/librustc_resolve/diagnostics.rs index c1dc3041d7d17..7e2a91b6ce97f 100644 --- a/src/librustc_resolve/diagnostics.rs +++ b/src/librustc_resolve/diagnostics.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(non_snake_case)] // Error messages for EXXXX errors. Each message should start and end with a diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs index 264f5c0113581..6ffb6b3093164 100644 --- a/src/librustc_resolve/lib.rs +++ b/src/librustc_resolve/lib.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png", html_favicon_url = "https://doc.rust-lang.org/favicon.ico", html_root_url = "https://doc.rust-lang.org/nightly/")] diff --git a/src/librustc_resolve/macros.rs b/src/librustc_resolve/macros.rs index 879b4ea3fe579..a868f16d40a21 100644 --- a/src/librustc_resolve/macros.rs +++ b/src/librustc_resolve/macros.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use {AmbiguityError, CrateLint, Resolver, ResolutionError, is_known_tool, resolve_error}; use {Module, ModuleKind, NameBinding, NameBindingKind, PathResult, ToNameBinding}; use ModuleOrUniformRoot; diff --git a/src/librustc_resolve/resolve_imports.rs b/src/librustc_resolve/resolve_imports.rs index 87e30be7caaaf..13fc91918ffcc 100644 --- a/src/librustc_resolve/resolve_imports.rs +++ b/src/librustc_resolve/resolve_imports.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use self::ImportDirectiveSubclass::*; use {AmbiguityError, CrateLint, Module, ModuleOrUniformRoot, PerNS}; diff --git a/src/librustc_save_analysis/dump_visitor.rs b/src/librustc_save_analysis/dump_visitor.rs index dc9310cdcdaa4..3b59d9b141f79 100644 --- a/src/librustc_save_analysis/dump_visitor.rs +++ b/src/librustc_save_analysis/dump_visitor.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Write the output of rustc's analysis to an implementor of Dump. //! //! Dumping the analysis is implemented by walking the AST and getting a bunch of diff --git a/src/librustc_save_analysis/json_dumper.rs b/src/librustc_save_analysis/json_dumper.rs index d2e52f98238dd..d69dddf459416 100644 --- a/src/librustc_save_analysis/json_dumper.rs +++ b/src/librustc_save_analysis/json_dumper.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::io::Write; use rustc_serialize::json::as_json; diff --git a/src/librustc_save_analysis/lib.rs b/src/librustc_save_analysis/lib.rs index 9facd39ebea21..2989fe69f89db 100644 --- a/src/librustc_save_analysis/lib.rs +++ b/src/librustc_save_analysis/lib.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png", html_favicon_url = "https://doc.rust-lang.org/favicon.ico", html_root_url = "https://doc.rust-lang.org/nightly/")] diff --git a/src/librustc_save_analysis/sig.rs b/src/librustc_save_analysis/sig.rs index 130325628796e..e2df173b1d888 100644 --- a/src/librustc_save_analysis/sig.rs +++ b/src/librustc_save_analysis/sig.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // A signature is a string representation of an item's type signature, excluding // any body. It also includes ids for any defs or refs in the signature. For // example: diff --git a/src/librustc_save_analysis/span_utils.rs b/src/librustc_save_analysis/span_utils.rs index e1a3829cd7538..6e679d872475c 100644 --- a/src/librustc_save_analysis/span_utils.rs +++ b/src/librustc_save_analysis/span_utils.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::session::Session; use generated_code; diff --git a/src/librustc_target/abi/call/aarch64.rs b/src/librustc_target/abi/call/aarch64.rs index 90b5b97b51ee2..42fd5a9271f64 100644 --- a/src/librustc_target/abi/call/aarch64.rs +++ b/src/librustc_target/abi/call/aarch64.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use abi::call::{FnType, ArgType, Reg, RegKind, Uniform}; use abi::{HasDataLayout, LayoutOf, TyLayout, TyLayoutMethods}; diff --git a/src/librustc_target/abi/call/arm.rs b/src/librustc_target/abi/call/arm.rs index 249aad2d937ea..557e4eedd062d 100644 --- a/src/librustc_target/abi/call/arm.rs +++ b/src/librustc_target/abi/call/arm.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use abi::call::{Conv, FnType, ArgType, Reg, RegKind, Uniform}; use abi::{HasDataLayout, LayoutOf, TyLayout, TyLayoutMethods}; use spec::HasTargetSpec; diff --git a/src/librustc_target/abi/call/asmjs.rs b/src/librustc_target/abi/call/asmjs.rs index 81d6f7b134b3e..a62a0e2bf89e0 100644 --- a/src/librustc_target/abi/call/asmjs.rs +++ b/src/librustc_target/abi/call/asmjs.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use abi::call::{FnType, ArgType, Uniform}; use abi::{HasDataLayout, LayoutOf, TyLayout, TyLayoutMethods}; diff --git a/src/librustc_target/abi/call/hexagon.rs b/src/librustc_target/abi/call/hexagon.rs index d37d5584591c4..d538a8068ac4a 100644 --- a/src/librustc_target/abi/call/hexagon.rs +++ b/src/librustc_target/abi/call/hexagon.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(non_upper_case_globals)] use abi::call::{FnType, ArgType}; diff --git a/src/librustc_target/abi/call/mips.rs b/src/librustc_target/abi/call/mips.rs index 1e8af52e3e819..2d9506835ef3d 100644 --- a/src/librustc_target/abi/call/mips.rs +++ b/src/librustc_target/abi/call/mips.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use abi::call::{ArgType, FnType, Reg, Uniform}; use abi::{HasDataLayout, LayoutOf, Size, TyLayoutMethods}; diff --git a/src/librustc_target/abi/call/mips64.rs b/src/librustc_target/abi/call/mips64.rs index 8e2dd99696e17..49a7185434213 100644 --- a/src/librustc_target/abi/call/mips64.rs +++ b/src/librustc_target/abi/call/mips64.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use abi::call::{ArgAttribute, ArgType, CastTarget, FnType, PassMode, Reg, RegKind, Uniform}; use abi::{self, HasDataLayout, LayoutOf, Size, TyLayout, TyLayoutMethods}; diff --git a/src/librustc_target/abi/call/mod.rs b/src/librustc_target/abi/call/mod.rs index 78ed4b2d615a4..df27254cec5d7 100644 --- a/src/librustc_target/abi/call/mod.rs +++ b/src/librustc_target/abi/call/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use abi::{self, Abi, Align, FieldPlacement, Size}; use abi::{HasDataLayout, LayoutOf, TyLayout, TyLayoutMethods}; use spec::HasTargetSpec; diff --git a/src/librustc_target/abi/call/msp430.rs b/src/librustc_target/abi/call/msp430.rs index e57ca03da6007..d8ba37db53d4d 100644 --- a/src/librustc_target/abi/call/msp430.rs +++ b/src/librustc_target/abi/call/msp430.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Reference: MSP430 Embedded Application Binary Interface // http://www.ti.com/lit/an/slaa534/slaa534.pdf diff --git a/src/librustc_target/abi/call/nvptx.rs b/src/librustc_target/abi/call/nvptx.rs index f23f7ddf2abcc..4cf0f11eb1e4a 100644 --- a/src/librustc_target/abi/call/nvptx.rs +++ b/src/librustc_target/abi/call/nvptx.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Reference: PTX Writer's Guide to Interoperability // http://docs.nvidia.com/cuda/ptx-writers-guide-to-interoperability diff --git a/src/librustc_target/abi/call/nvptx64.rs b/src/librustc_target/abi/call/nvptx64.rs index 4399a2fec6caf..8ccc77598c90a 100644 --- a/src/librustc_target/abi/call/nvptx64.rs +++ b/src/librustc_target/abi/call/nvptx64.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Reference: PTX Writer's Guide to Interoperability // http://docs.nvidia.com/cuda/ptx-writers-guide-to-interoperability diff --git a/src/librustc_target/abi/call/powerpc.rs b/src/librustc_target/abi/call/powerpc.rs index 3be3034143a34..2d9506835ef3d 100644 --- a/src/librustc_target/abi/call/powerpc.rs +++ b/src/librustc_target/abi/call/powerpc.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use abi::call::{ArgType, FnType, Reg, Uniform}; use abi::{HasDataLayout, LayoutOf, Size, TyLayoutMethods}; diff --git a/src/librustc_target/abi/call/powerpc64.rs b/src/librustc_target/abi/call/powerpc64.rs index 0c5ec77a3982d..e0840d2844042 100644 --- a/src/librustc_target/abi/call/powerpc64.rs +++ b/src/librustc_target/abi/call/powerpc64.rs @@ -1,13 +1,3 @@ -// Copyright 2014-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // FIXME: // Alignment of 128 bit types is not currently handled, this will // need to be fixed when PowerPC vector support is added. diff --git a/src/librustc_target/abi/call/riscv.rs b/src/librustc_target/abi/call/riscv.rs index fe0d7485c158b..4950bcd3330aa 100644 --- a/src/librustc_target/abi/call/riscv.rs +++ b/src/librustc_target/abi/call/riscv.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Reference: RISC-V ELF psABI specification // https://github.com/riscv/riscv-elf-psabi-doc diff --git a/src/librustc_target/abi/call/s390x.rs b/src/librustc_target/abi/call/s390x.rs index 37be6ea41c63a..4caa05ec2c56f 100644 --- a/src/librustc_target/abi/call/s390x.rs +++ b/src/librustc_target/abi/call/s390x.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // FIXME: The assumes we're using the non-vector ABI, i.e. compiling // for a pre-z13 machine or using -mno-vx. diff --git a/src/librustc_target/abi/call/sparc.rs b/src/librustc_target/abi/call/sparc.rs index 1e8af52e3e819..2d9506835ef3d 100644 --- a/src/librustc_target/abi/call/sparc.rs +++ b/src/librustc_target/abi/call/sparc.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use abi::call::{ArgType, FnType, Reg, Uniform}; use abi::{HasDataLayout, LayoutOf, Size, TyLayoutMethods}; diff --git a/src/librustc_target/abi/call/sparc64.rs b/src/librustc_target/abi/call/sparc64.rs index a58aebc2ff063..04b645b95b2d1 100644 --- a/src/librustc_target/abi/call/sparc64.rs +++ b/src/librustc_target/abi/call/sparc64.rs @@ -1,13 +1,3 @@ -// Copyright 2014-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // FIXME: This needs an audit for correctness and completeness. use abi::call::{FnType, ArgType, Reg, RegKind, Uniform}; diff --git a/src/librustc_target/abi/call/wasm32.rs b/src/librustc_target/abi/call/wasm32.rs index 7109eea535d4a..78f43f8b508b3 100644 --- a/src/librustc_target/abi/call/wasm32.rs +++ b/src/librustc_target/abi/call/wasm32.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use abi::call::{FnType, ArgType}; fn classify_ret_ty(ret: &mut ArgType) { diff --git a/src/librustc_target/abi/call/x86.rs b/src/librustc_target/abi/call/x86.rs index 1dcaafcf77fcf..1e33d0ddc0ec4 100644 --- a/src/librustc_target/abi/call/x86.rs +++ b/src/librustc_target/abi/call/x86.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use abi::call::{ArgAttribute, FnType, PassMode, Reg, RegKind}; use abi::{self, HasDataLayout, LayoutOf, TyLayout, TyLayoutMethods}; use spec::HasTargetSpec; diff --git a/src/librustc_target/abi/call/x86_64.rs b/src/librustc_target/abi/call/x86_64.rs index eade086ec48ec..c858bd0c14f9e 100644 --- a/src/librustc_target/abi/call/x86_64.rs +++ b/src/librustc_target/abi/call/x86_64.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // The classification code for the x86_64 ABI is taken from the clay language // https://github.com/jckarter/clay/blob/master/compiler/src/externals.cpp diff --git a/src/librustc_target/abi/call/x86_win64.rs b/src/librustc_target/abi/call/x86_win64.rs index 1ee069e2bbbbf..c583f7a0a2a24 100644 --- a/src/librustc_target/abi/call/x86_win64.rs +++ b/src/librustc_target/abi/call/x86_win64.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use abi::call::{ArgType, FnType, Reg}; use abi::Abi; diff --git a/src/librustc_target/abi/mod.rs b/src/librustc_target/abi/mod.rs index 16b5241b29aa5..679f802b4ad93 100644 --- a/src/librustc_target/abi/mod.rs +++ b/src/librustc_target/abi/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub use self::Integer::*; pub use self::Primitive::*; diff --git a/src/librustc_target/build.rs b/src/librustc_target/build.rs index 6f6fde1e9e778..368200b776d74 100644 --- a/src/librustc_target/build.rs +++ b/src/librustc_target/build.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { println!("cargo:rerun-if-changed=build.rs"); println!("cargo:rerun-if-env-changed=CFG_DEFAULT_LINKER"); diff --git a/src/librustc_target/lib.rs b/src/librustc_target/lib.rs index 5f5cc4c5ff7c8..bdb1a7a8bfee9 100644 --- a/src/librustc_target/lib.rs +++ b/src/librustc_target/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Some stuff used by rustc that doesn't have many dependencies //! //! Originally extracted from rustc::back, which was nominally the diff --git a/src/librustc_target/spec/aarch64_apple_ios.rs b/src/librustc_target/spec/aarch64_apple_ios.rs index 90f8cd90c66ec..8a29c8a06494b 100644 --- a/src/librustc_target/spec/aarch64_apple_ios.rs +++ b/src/librustc_target/spec/aarch64_apple_ios.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; use super::apple_ios_base::{opts, Arch}; diff --git a/src/librustc_target/spec/aarch64_fuchsia.rs b/src/librustc_target/spec/aarch64_fuchsia.rs index 28baf6f66e7a1..da20b3f68082f 100644 --- a/src/librustc_target/spec/aarch64_fuchsia.rs +++ b/src/librustc_target/spec/aarch64_fuchsia.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/aarch64_linux_android.rs b/src/librustc_target/spec/aarch64_linux_android.rs index afd67112f0d6a..071071396880c 100644 --- a/src/librustc_target/spec/aarch64_linux_android.rs +++ b/src/librustc_target/spec/aarch64_linux_android.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; // See https://developer.android.com/ndk/guides/abis.html#arm64-v8a diff --git a/src/librustc_target/spec/aarch64_pc_windows_msvc.rs b/src/librustc_target/spec/aarch64_pc_windows_msvc.rs index 8747f239d3418..540420acf1570 100644 --- a/src/librustc_target/spec/aarch64_pc_windows_msvc.rs +++ b/src/librustc_target/spec/aarch64_pc_windows_msvc.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult, PanicStrategy, LldFlavor}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/aarch64_unknown_cloudabi.rs b/src/librustc_target/spec/aarch64_unknown_cloudabi.rs index ffdb7decd0b47..3f619db667610 100644 --- a/src/librustc_target/spec/aarch64_unknown_cloudabi.rs +++ b/src/librustc_target/spec/aarch64_unknown_cloudabi.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/aarch64_unknown_freebsd.rs b/src/librustc_target/spec/aarch64_unknown_freebsd.rs index 48177b8c79aed..c3a2dd1819dee 100644 --- a/src/librustc_target/spec/aarch64_unknown_freebsd.rs +++ b/src/librustc_target/spec/aarch64_unknown_freebsd.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/aarch64_unknown_hermit.rs b/src/librustc_target/spec/aarch64_unknown_hermit.rs index 6b81c62e48b87..73045bccfc58b 100644 --- a/src/librustc_target/spec/aarch64_unknown_hermit.rs +++ b/src/librustc_target/spec/aarch64_unknown_hermit.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/aarch64_unknown_linux_gnu.rs b/src/librustc_target/spec/aarch64_unknown_linux_gnu.rs index 2351d01469215..9365c945ff49d 100644 --- a/src/librustc_target/spec/aarch64_unknown_linux_gnu.rs +++ b/src/librustc_target/spec/aarch64_unknown_linux_gnu.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/aarch64_unknown_linux_musl.rs b/src/librustc_target/spec/aarch64_unknown_linux_musl.rs index 5ab55a076f45b..301368de5f424 100644 --- a/src/librustc_target/spec/aarch64_unknown_linux_musl.rs +++ b/src/librustc_target/spec/aarch64_unknown_linux_musl.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/aarch64_unknown_netbsd.rs b/src/librustc_target/spec/aarch64_unknown_netbsd.rs index c300855b02187..91feacda3e8d7 100644 --- a/src/librustc_target/spec/aarch64_unknown_netbsd.rs +++ b/src/librustc_target/spec/aarch64_unknown_netbsd.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/aarch64_unknown_none.rs b/src/librustc_target/spec/aarch64_unknown_none.rs index cfba0614adcd6..1d8fed1131b31 100644 --- a/src/librustc_target/spec/aarch64_unknown_none.rs +++ b/src/librustc_target/spec/aarch64_unknown_none.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Generic AArch64 target for bare-metal code // // Can be used in conjunction with the `target-feature` and diff --git a/src/librustc_target/spec/aarch64_unknown_openbsd.rs b/src/librustc_target/spec/aarch64_unknown_openbsd.rs index 25817fce5ce6c..3c6383dab6519 100644 --- a/src/librustc_target/spec/aarch64_unknown_openbsd.rs +++ b/src/librustc_target/spec/aarch64_unknown_openbsd.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/abi.rs b/src/librustc_target/spec/abi.rs index 6d8c8eb19f057..651cfeccd63df 100644 --- a/src/librustc_target/spec/abi.rs +++ b/src/librustc_target/spec/abi.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt; #[derive(PartialEq, Eq, PartialOrd, Ord, Hash, RustcEncodable, RustcDecodable, Clone, Copy, Debug)] diff --git a/src/librustc_target/spec/android_base.rs b/src/librustc_target/spec/android_base.rs index 7e27e8aa9a76b..a8f8ad3185f0d 100644 --- a/src/librustc_target/spec/android_base.rs +++ b/src/librustc_target/spec/android_base.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, TargetOptions}; pub fn opts() -> TargetOptions { diff --git a/src/librustc_target/spec/apple_base.rs b/src/librustc_target/spec/apple_base.rs index 38b3f2528fe86..2bf5e0a3b89ff 100644 --- a/src/librustc_target/spec/apple_base.rs +++ b/src/librustc_target/spec/apple_base.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::env; use spec::{LinkArgs, TargetOptions}; diff --git a/src/librustc_target/spec/apple_ios_base.rs b/src/librustc_target/spec/apple_ios_base.rs index 296eaca7c7df0..8c5a631acc036 100644 --- a/src/librustc_target/spec/apple_ios_base.rs +++ b/src/librustc_target/spec/apple_ios_base.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::io; use std::process::Command; use spec::{LinkArgs, LinkerFlavor, TargetOptions}; diff --git a/src/librustc_target/spec/arm_base.rs b/src/librustc_target/spec/arm_base.rs index 635b8ae7388fe..1d51d60c8f258 100644 --- a/src/librustc_target/spec/arm_base.rs +++ b/src/librustc_target/spec/arm_base.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::abi::Abi; // All the calling conventions trigger an assertion(Unsupported calling convention) in llvm on arm diff --git a/src/librustc_target/spec/arm_linux_androideabi.rs b/src/librustc_target/spec/arm_linux_androideabi.rs index ffd242b2bc20e..0ba84e8ba1b9f 100644 --- a/src/librustc_target/spec/arm_linux_androideabi.rs +++ b/src/librustc_target/spec/arm_linux_androideabi.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/arm_unknown_linux_gnueabi.rs b/src/librustc_target/spec/arm_unknown_linux_gnueabi.rs index c67a25e8bc275..0f891dacc6dbf 100644 --- a/src/librustc_target/spec/arm_unknown_linux_gnueabi.rs +++ b/src/librustc_target/spec/arm_unknown_linux_gnueabi.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/arm_unknown_linux_gnueabihf.rs b/src/librustc_target/spec/arm_unknown_linux_gnueabihf.rs index ed0049a932e92..5503bf326cd7b 100644 --- a/src/librustc_target/spec/arm_unknown_linux_gnueabihf.rs +++ b/src/librustc_target/spec/arm_unknown_linux_gnueabihf.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/arm_unknown_linux_musleabi.rs b/src/librustc_target/spec/arm_unknown_linux_musleabi.rs index c34093fbab912..c2162beba26e8 100644 --- a/src/librustc_target/spec/arm_unknown_linux_musleabi.rs +++ b/src/librustc_target/spec/arm_unknown_linux_musleabi.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/arm_unknown_linux_musleabihf.rs b/src/librustc_target/spec/arm_unknown_linux_musleabihf.rs index 967873b3201b5..b3f00331b3c9e 100644 --- a/src/librustc_target/spec/arm_unknown_linux_musleabihf.rs +++ b/src/librustc_target/spec/arm_unknown_linux_musleabihf.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/armebv7r_none_eabihf.rs b/src/librustc_target/spec/armebv7r_none_eabihf.rs index 8bd08d355a7bc..5345b3ff68153 100644 --- a/src/librustc_target/spec/armebv7r_none_eabihf.rs +++ b/src/librustc_target/spec/armebv7r_none_eabihf.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Targets the Cortex-R4F/R5F processor (ARMv7-R) use std::default::Default; diff --git a/src/librustc_target/spec/armv4t_unknown_linux_gnueabi.rs b/src/librustc_target/spec/armv4t_unknown_linux_gnueabi.rs index fb99dffeddd69..7fe021e5327b9 100644 --- a/src/librustc_target/spec/armv4t_unknown_linux_gnueabi.rs +++ b/src/librustc_target/spec/armv4t_unknown_linux_gnueabi.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/armv5te_unknown_linux_gnueabi.rs b/src/librustc_target/spec/armv5te_unknown_linux_gnueabi.rs index 810f091247224..c85a80f6e8a4c 100644 --- a/src/librustc_target/spec/armv5te_unknown_linux_gnueabi.rs +++ b/src/librustc_target/spec/armv5te_unknown_linux_gnueabi.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/armv5te_unknown_linux_musleabi.rs b/src/librustc_target/spec/armv5te_unknown_linux_musleabi.rs index 2d4e95ab01d6f..dce767898c06b 100644 --- a/src/librustc_target/spec/armv5te_unknown_linux_musleabi.rs +++ b/src/librustc_target/spec/armv5te_unknown_linux_musleabi.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/armv6_unknown_netbsd_eabihf.rs b/src/librustc_target/spec/armv6_unknown_netbsd_eabihf.rs index 38f0f34211daf..95cc41e6c98fb 100644 --- a/src/librustc_target/spec/armv6_unknown_netbsd_eabihf.rs +++ b/src/librustc_target/spec/armv6_unknown_netbsd_eabihf.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/armv7_apple_ios.rs b/src/librustc_target/spec/armv7_apple_ios.rs index da7cbb918bd71..73c5f4d3cebc6 100644 --- a/src/librustc_target/spec/armv7_apple_ios.rs +++ b/src/librustc_target/spec/armv7_apple_ios.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; use super::apple_ios_base::{opts, Arch}; diff --git a/src/librustc_target/spec/armv7_linux_androideabi.rs b/src/librustc_target/spec/armv7_linux_androideabi.rs index cfdc5cddcfb30..c9c43e459f749 100644 --- a/src/librustc_target/spec/armv7_linux_androideabi.rs +++ b/src/librustc_target/spec/armv7_linux_androideabi.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; // See https://developer.android.com/ndk/guides/abis.html#v7a diff --git a/src/librustc_target/spec/armv7_unknown_cloudabi_eabihf.rs b/src/librustc_target/spec/armv7_unknown_cloudabi_eabihf.rs index 393c45e434e61..68270bd35e94d 100644 --- a/src/librustc_target/spec/armv7_unknown_cloudabi_eabihf.rs +++ b/src/librustc_target/spec/armv7_unknown_cloudabi_eabihf.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/armv7_unknown_linux_gnueabihf.rs b/src/librustc_target/spec/armv7_unknown_linux_gnueabihf.rs index 14e8fa9dc02a4..68e3493ab1fe8 100644 --- a/src/librustc_target/spec/armv7_unknown_linux_gnueabihf.rs +++ b/src/librustc_target/spec/armv7_unknown_linux_gnueabihf.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/armv7_unknown_linux_musleabihf.rs b/src/librustc_target/spec/armv7_unknown_linux_musleabihf.rs index 6e71cb307b997..769afcb2ab663 100644 --- a/src/librustc_target/spec/armv7_unknown_linux_musleabihf.rs +++ b/src/librustc_target/spec/armv7_unknown_linux_musleabihf.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/armv7_unknown_netbsd_eabihf.rs b/src/librustc_target/spec/armv7_unknown_netbsd_eabihf.rs index 412c354611519..f9e416fd06e92 100644 --- a/src/librustc_target/spec/armv7_unknown_netbsd_eabihf.rs +++ b/src/librustc_target/spec/armv7_unknown_netbsd_eabihf.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/armv7s_apple_ios.rs b/src/librustc_target/spec/armv7s_apple_ios.rs index c0c577c3b8c6c..a3bca907a0bd7 100644 --- a/src/librustc_target/spec/armv7s_apple_ios.rs +++ b/src/librustc_target/spec/armv7s_apple_ios.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; use super::apple_ios_base::{opts, Arch}; diff --git a/src/librustc_target/spec/asmjs_unknown_emscripten.rs b/src/librustc_target/spec/asmjs_unknown_emscripten.rs index 4e716fb207fab..c87dbd3e9c5f6 100644 --- a/src/librustc_target/spec/asmjs_unknown_emscripten.rs +++ b/src/librustc_target/spec/asmjs_unknown_emscripten.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::{LinkArgs, LinkerFlavor, Target, TargetOptions}; pub fn target() -> Result { diff --git a/src/librustc_target/spec/bitrig_base.rs b/src/librustc_target/spec/bitrig_base.rs index e0cbfcdcef07c..3b6985fa4c826 100644 --- a/src/librustc_target/spec/bitrig_base.rs +++ b/src/librustc_target/spec/bitrig_base.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{TargetOptions, RelroLevel}; use std::default::Default; diff --git a/src/librustc_target/spec/cloudabi_base.rs b/src/librustc_target/spec/cloudabi_base.rs index 2ffa74e737fd5..399c97c9284fb 100644 --- a/src/librustc_target/spec/cloudabi_base.rs +++ b/src/librustc_target/spec/cloudabi_base.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkArgs, LinkerFlavor, TargetOptions, RelroLevel}; pub fn opts() -> TargetOptions { diff --git a/src/librustc_target/spec/dragonfly_base.rs b/src/librustc_target/spec/dragonfly_base.rs index 32eac8663afac..a9dfea5971dfa 100644 --- a/src/librustc_target/spec/dragonfly_base.rs +++ b/src/librustc_target/spec/dragonfly_base.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkArgs, LinkerFlavor, TargetOptions, RelroLevel}; use std::default::Default; diff --git a/src/librustc_target/spec/freebsd_base.rs b/src/librustc_target/spec/freebsd_base.rs index 04b8a6e706064..2b602674a5621 100644 --- a/src/librustc_target/spec/freebsd_base.rs +++ b/src/librustc_target/spec/freebsd_base.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkArgs, LinkerFlavor, TargetOptions, RelroLevel}; use std::default::Default; diff --git a/src/librustc_target/spec/fuchsia_base.rs b/src/librustc_target/spec/fuchsia_base.rs index b593b83532614..4d67335863f49 100644 --- a/src/librustc_target/spec/fuchsia_base.rs +++ b/src/librustc_target/spec/fuchsia_base.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkArgs, LinkerFlavor, TargetOptions}; use std::default::Default; diff --git a/src/librustc_target/spec/haiku_base.rs b/src/librustc_target/spec/haiku_base.rs index bf62b49f9141b..00c6bd40dc584 100644 --- a/src/librustc_target/spec/haiku_base.rs +++ b/src/librustc_target/spec/haiku_base.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{TargetOptions, RelroLevel}; use std::default::Default; diff --git a/src/librustc_target/spec/hermit_base.rs b/src/librustc_target/spec/hermit_base.rs index 2a24f771e9289..ffb86818cfb10 100644 --- a/src/librustc_target/spec/hermit_base.rs +++ b/src/librustc_target/spec/hermit_base.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkArgs, LinkerFlavor, PanicStrategy, TargetOptions}; use std::default::Default; diff --git a/src/librustc_target/spec/i386_apple_ios.rs b/src/librustc_target/spec/i386_apple_ios.rs index 9eb0327f625cc..8decbf8662424 100644 --- a/src/librustc_target/spec/i386_apple_ios.rs +++ b/src/librustc_target/spec/i386_apple_ios.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; use super::apple_ios_base::{opts, Arch}; diff --git a/src/librustc_target/spec/i586_pc_windows_msvc.rs b/src/librustc_target/spec/i586_pc_windows_msvc.rs index 9a20b854e0f41..12a7f98beff95 100644 --- a/src/librustc_target/spec/i586_pc_windows_msvc.rs +++ b/src/librustc_target/spec/i586_pc_windows_msvc.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::TargetResult; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/i586_unknown_linux_gnu.rs b/src/librustc_target/spec/i586_unknown_linux_gnu.rs index 35bca76af47df..76f6a4eba389f 100644 --- a/src/librustc_target/spec/i586_unknown_linux_gnu.rs +++ b/src/librustc_target/spec/i586_unknown_linux_gnu.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::TargetResult; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/i586_unknown_linux_musl.rs b/src/librustc_target/spec/i586_unknown_linux_musl.rs index ba23e1d6860bd..2b56fd7a7e370 100644 --- a/src/librustc_target/spec/i586_unknown_linux_musl.rs +++ b/src/librustc_target/spec/i586_unknown_linux_musl.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::TargetResult; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/i686_apple_darwin.rs b/src/librustc_target/spec/i686_apple_darwin.rs index d17789dfcc07f..31e812ee19b27 100644 --- a/src/librustc_target/spec/i686_apple_darwin.rs +++ b/src/librustc_target/spec/i686_apple_darwin.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/i686_linux_android.rs b/src/librustc_target/spec/i686_linux_android.rs index 171e089959545..1d45edfc5a700 100644 --- a/src/librustc_target/spec/i686_linux_android.rs +++ b/src/librustc_target/spec/i686_linux_android.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; // See https://developer.android.com/ndk/guides/abis.html#x86 diff --git a/src/librustc_target/spec/i686_pc_windows_gnu.rs b/src/librustc_target/spec/i686_pc_windows_gnu.rs index 867d04ec3f28b..d7bc38ca172d5 100644 --- a/src/librustc_target/spec/i686_pc_windows_gnu.rs +++ b/src/librustc_target/spec/i686_pc_windows_gnu.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/i686_pc_windows_msvc.rs b/src/librustc_target/spec/i686_pc_windows_msvc.rs index 3570f379c3087..f0d75ae4e9bdd 100644 --- a/src/librustc_target/spec/i686_pc_windows_msvc.rs +++ b/src/librustc_target/spec/i686_pc_windows_msvc.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/i686_unknown_cloudabi.rs b/src/librustc_target/spec/i686_unknown_cloudabi.rs index 335105bb1a869..91700fdcfe7f6 100644 --- a/src/librustc_target/spec/i686_unknown_cloudabi.rs +++ b/src/librustc_target/spec/i686_unknown_cloudabi.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/i686_unknown_dragonfly.rs b/src/librustc_target/spec/i686_unknown_dragonfly.rs index cb0c471353b30..e857bdfa3c691 100644 --- a/src/librustc_target/spec/i686_unknown_dragonfly.rs +++ b/src/librustc_target/spec/i686_unknown_dragonfly.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/i686_unknown_freebsd.rs b/src/librustc_target/spec/i686_unknown_freebsd.rs index 3838a157d10b5..cd9e1f22642eb 100644 --- a/src/librustc_target/spec/i686_unknown_freebsd.rs +++ b/src/librustc_target/spec/i686_unknown_freebsd.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/i686_unknown_haiku.rs b/src/librustc_target/spec/i686_unknown_haiku.rs index 98f0787bebaf8..fd8ecdbbbca96 100644 --- a/src/librustc_target/spec/i686_unknown_haiku.rs +++ b/src/librustc_target/spec/i686_unknown_haiku.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/i686_unknown_linux_gnu.rs b/src/librustc_target/spec/i686_unknown_linux_gnu.rs index c3ff347882da1..ab38832831157 100644 --- a/src/librustc_target/spec/i686_unknown_linux_gnu.rs +++ b/src/librustc_target/spec/i686_unknown_linux_gnu.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/i686_unknown_linux_musl.rs b/src/librustc_target/spec/i686_unknown_linux_musl.rs index c02076c071a1d..81cbf57e577a6 100644 --- a/src/librustc_target/spec/i686_unknown_linux_musl.rs +++ b/src/librustc_target/spec/i686_unknown_linux_musl.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/i686_unknown_netbsd.rs b/src/librustc_target/spec/i686_unknown_netbsd.rs index d60ed9885991d..b36eb6ef35212 100644 --- a/src/librustc_target/spec/i686_unknown_netbsd.rs +++ b/src/librustc_target/spec/i686_unknown_netbsd.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/i686_unknown_openbsd.rs b/src/librustc_target/spec/i686_unknown_openbsd.rs index f22bf2abe4501..be9c80c86991f 100644 --- a/src/librustc_target/spec/i686_unknown_openbsd.rs +++ b/src/librustc_target/spec/i686_unknown_openbsd.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/l4re_base.rs b/src/librustc_target/spec/l4re_base.rs index 4ebc930d48b6f..93bbd12018962 100644 --- a/src/librustc_target/spec/l4re_base.rs +++ b/src/librustc_target/spec/l4re_base.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkArgs, LinkerFlavor, PanicStrategy, TargetOptions}; use std::default::Default; //use std::process::Command; diff --git a/src/librustc_target/spec/linux_base.rs b/src/librustc_target/spec/linux_base.rs index 4a9cd9e2f3233..7316df12f9693 100644 --- a/src/librustc_target/spec/linux_base.rs +++ b/src/librustc_target/spec/linux_base.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkArgs, LinkerFlavor, TargetOptions, RelroLevel}; use std::default::Default; diff --git a/src/librustc_target/spec/linux_musl_base.rs b/src/librustc_target/spec/linux_musl_base.rs index 7a3f3c2a518bc..a7bba5daf802a 100644 --- a/src/librustc_target/spec/linux_musl_base.rs +++ b/src/librustc_target/spec/linux_musl_base.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, TargetOptions}; pub fn opts() -> TargetOptions { diff --git a/src/librustc_target/spec/mips64_unknown_linux_gnuabi64.rs b/src/librustc_target/spec/mips64_unknown_linux_gnuabi64.rs index 1f60d918908d0..ab7f152d622f7 100644 --- a/src/librustc_target/spec/mips64_unknown_linux_gnuabi64.rs +++ b/src/librustc_target/spec/mips64_unknown_linux_gnuabi64.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/mips64el_unknown_linux_gnuabi64.rs b/src/librustc_target/spec/mips64el_unknown_linux_gnuabi64.rs index e42fde8d403fb..bf216049454de 100644 --- a/src/librustc_target/spec/mips64el_unknown_linux_gnuabi64.rs +++ b/src/librustc_target/spec/mips64el_unknown_linux_gnuabi64.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/mips_unknown_linux_gnu.rs b/src/librustc_target/spec/mips_unknown_linux_gnu.rs index 59e15137cf40d..1373af0415eee 100644 --- a/src/librustc_target/spec/mips_unknown_linux_gnu.rs +++ b/src/librustc_target/spec/mips_unknown_linux_gnu.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/mips_unknown_linux_musl.rs b/src/librustc_target/spec/mips_unknown_linux_musl.rs index 8ee399ba56c32..306bad2fc5f38 100644 --- a/src/librustc_target/spec/mips_unknown_linux_musl.rs +++ b/src/librustc_target/spec/mips_unknown_linux_musl.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/mips_unknown_linux_uclibc.rs b/src/librustc_target/spec/mips_unknown_linux_uclibc.rs index 384ab1e413123..d5edd7c187226 100644 --- a/src/librustc_target/spec/mips_unknown_linux_uclibc.rs +++ b/src/librustc_target/spec/mips_unknown_linux_uclibc.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/mipsel_unknown_linux_gnu.rs b/src/librustc_target/spec/mipsel_unknown_linux_gnu.rs index edd29164caca8..bf8e04803ce77 100644 --- a/src/librustc_target/spec/mipsel_unknown_linux_gnu.rs +++ b/src/librustc_target/spec/mipsel_unknown_linux_gnu.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/mipsel_unknown_linux_musl.rs b/src/librustc_target/spec/mipsel_unknown_linux_musl.rs index 1d9378ca1b814..9929623cb5dab 100644 --- a/src/librustc_target/spec/mipsel_unknown_linux_musl.rs +++ b/src/librustc_target/spec/mipsel_unknown_linux_musl.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/mipsel_unknown_linux_uclibc.rs b/src/librustc_target/spec/mipsel_unknown_linux_uclibc.rs index a1db1791bb7ce..0e66ce0568854 100644 --- a/src/librustc_target/spec/mipsel_unknown_linux_uclibc.rs +++ b/src/librustc_target/spec/mipsel_unknown_linux_uclibc.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/mod.rs b/src/librustc_target/spec/mod.rs index 4a8ae69b2383e..6f92a176d95b5 100644 --- a/src/librustc_target/spec/mod.rs +++ b/src/librustc_target/spec/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! [Flexible target specification.](https://github.com/rust-lang/rfcs/pull/131) //! //! Rust targets a wide variety of usecases, and in the interest of flexibility, diff --git a/src/librustc_target/spec/msp430_none_elf.rs b/src/librustc_target/spec/msp430_none_elf.rs index 3ac4c459c6384..09d5c99e1b81f 100644 --- a/src/librustc_target/spec/msp430_none_elf.rs +++ b/src/librustc_target/spec/msp430_none_elf.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, PanicStrategy, Target, TargetOptions, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/netbsd_base.rs b/src/librustc_target/spec/netbsd_base.rs index 8b6bb5dec9138..6ce2912da75cf 100644 --- a/src/librustc_target/spec/netbsd_base.rs +++ b/src/librustc_target/spec/netbsd_base.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkArgs, LinkerFlavor, TargetOptions, RelroLevel}; use std::default::Default; diff --git a/src/librustc_target/spec/openbsd_base.rs b/src/librustc_target/spec/openbsd_base.rs index 90ab1135c54b0..4bdf73fc92213 100644 --- a/src/librustc_target/spec/openbsd_base.rs +++ b/src/librustc_target/spec/openbsd_base.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkArgs, LinkerFlavor, TargetOptions, RelroLevel}; use std::default::Default; diff --git a/src/librustc_target/spec/powerpc64_unknown_linux_gnu.rs b/src/librustc_target/spec/powerpc64_unknown_linux_gnu.rs index 1959871161343..12c8cd4054f4f 100644 --- a/src/librustc_target/spec/powerpc64_unknown_linux_gnu.rs +++ b/src/librustc_target/spec/powerpc64_unknown_linux_gnu.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult, RelroLevel}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/powerpc64le_unknown_linux_gnu.rs b/src/librustc_target/spec/powerpc64le_unknown_linux_gnu.rs index 39840692dff18..bda483f9194c2 100644 --- a/src/librustc_target/spec/powerpc64le_unknown_linux_gnu.rs +++ b/src/librustc_target/spec/powerpc64le_unknown_linux_gnu.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/powerpc64le_unknown_linux_musl.rs b/src/librustc_target/spec/powerpc64le_unknown_linux_musl.rs index 34ec82412289d..d1311772e3705 100644 --- a/src/librustc_target/spec/powerpc64le_unknown_linux_musl.rs +++ b/src/librustc_target/spec/powerpc64le_unknown_linux_musl.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/powerpc_unknown_linux_gnu.rs b/src/librustc_target/spec/powerpc_unknown_linux_gnu.rs index c05b110a75d39..14aaae4c4e6a6 100644 --- a/src/librustc_target/spec/powerpc_unknown_linux_gnu.rs +++ b/src/librustc_target/spec/powerpc_unknown_linux_gnu.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/powerpc_unknown_linux_gnuspe.rs b/src/librustc_target/spec/powerpc_unknown_linux_gnuspe.rs index c76c3119c87c5..f50ee63eddc1f 100644 --- a/src/librustc_target/spec/powerpc_unknown_linux_gnuspe.rs +++ b/src/librustc_target/spec/powerpc_unknown_linux_gnuspe.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/powerpc_unknown_netbsd.rs b/src/librustc_target/spec/powerpc_unknown_netbsd.rs index c05e40b9c25d7..9ac0fd49d571a 100644 --- a/src/librustc_target/spec/powerpc_unknown_netbsd.rs +++ b/src/librustc_target/spec/powerpc_unknown_netbsd.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/redox_base.rs b/src/librustc_target/spec/redox_base.rs index c28746a936359..dd32f02e34049 100644 --- a/src/librustc_target/spec/redox_base.rs +++ b/src/librustc_target/spec/redox_base.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkArgs, LinkerFlavor, TargetOptions}; use std::default::Default; diff --git a/src/librustc_target/spec/riscv32imac_unknown_none_elf.rs b/src/librustc_target/spec/riscv32imac_unknown_none_elf.rs index f8cd1b5b81207..e416d7d21cd17 100644 --- a/src/librustc_target/spec/riscv32imac_unknown_none_elf.rs +++ b/src/librustc_target/spec/riscv32imac_unknown_none_elf.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, PanicStrategy, Target, TargetOptions, TargetResult}; use spec::abi::{Abi}; diff --git a/src/librustc_target/spec/s390x_unknown_linux_gnu.rs b/src/librustc_target/spec/s390x_unknown_linux_gnu.rs index c9a9625ebab95..fe9bdc1e95125 100644 --- a/src/librustc_target/spec/s390x_unknown_linux_gnu.rs +++ b/src/librustc_target/spec/s390x_unknown_linux_gnu.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/solaris_base.rs b/src/librustc_target/spec/solaris_base.rs index c14cc3f5bc3be..1fe8c3539698f 100644 --- a/src/librustc_target/spec/solaris_base.rs +++ b/src/librustc_target/spec/solaris_base.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::TargetOptions; use std::default::Default; diff --git a/src/librustc_target/spec/sparc64_unknown_linux_gnu.rs b/src/librustc_target/spec/sparc64_unknown_linux_gnu.rs index f68b5fd24bf75..0747fbd0faa57 100644 --- a/src/librustc_target/spec/sparc64_unknown_linux_gnu.rs +++ b/src/librustc_target/spec/sparc64_unknown_linux_gnu.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/sparc64_unknown_netbsd.rs b/src/librustc_target/spec/sparc64_unknown_netbsd.rs index 1c1bca9b2b879..c26e61572bab9 100644 --- a/src/librustc_target/spec/sparc64_unknown_netbsd.rs +++ b/src/librustc_target/spec/sparc64_unknown_netbsd.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/sparc_unknown_linux_gnu.rs b/src/librustc_target/spec/sparc_unknown_linux_gnu.rs index 4e352374f90b0..e1effc7cbdeb4 100644 --- a/src/librustc_target/spec/sparc_unknown_linux_gnu.rs +++ b/src/librustc_target/spec/sparc_unknown_linux_gnu.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/sparcv9_sun_solaris.rs b/src/librustc_target/spec/sparcv9_sun_solaris.rs index 7dea1b75a3c58..7621b5e4e169a 100644 --- a/src/librustc_target/spec/sparcv9_sun_solaris.rs +++ b/src/librustc_target/spec/sparcv9_sun_solaris.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/thumb_base.rs b/src/librustc_target/spec/thumb_base.rs index fdaf1dc6110b5..1545e0fde6023 100644 --- a/src/librustc_target/spec/thumb_base.rs +++ b/src/librustc_target/spec/thumb_base.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // These 4 `thumbv*` targets cover the ARM Cortex-M family of processors which are widely used in // microcontrollers. Namely, all these processors: // diff --git a/src/librustc_target/spec/thumbv6m_none_eabi.rs b/src/librustc_target/spec/thumbv6m_none_eabi.rs index 26812501814f5..7f91db6906deb 100644 --- a/src/librustc_target/spec/thumbv6m_none_eabi.rs +++ b/src/librustc_target/spec/thumbv6m_none_eabi.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Targets the Cortex-M0, Cortex-M0+ and Cortex-M1 processors (ARMv6-M architecture) use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; diff --git a/src/librustc_target/spec/thumbv7em_none_eabi.rs b/src/librustc_target/spec/thumbv7em_none_eabi.rs index ab85c97b1b5ba..df793b0ff7c58 100644 --- a/src/librustc_target/spec/thumbv7em_none_eabi.rs +++ b/src/librustc_target/spec/thumbv7em_none_eabi.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Targets the Cortex-M4 and Cortex-M7 processors (ARMv7E-M) // // This target assumes that the device doesn't have a FPU (Floating Point Unit) and lowers all the diff --git a/src/librustc_target/spec/thumbv7em_none_eabihf.rs b/src/librustc_target/spec/thumbv7em_none_eabihf.rs index 4e62f29134edf..3926b533ab7ca 100644 --- a/src/librustc_target/spec/thumbv7em_none_eabihf.rs +++ b/src/librustc_target/spec/thumbv7em_none_eabihf.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Targets the Cortex-M4F and Cortex-M7F processors (ARMv7E-M) // // This target assumes that the device does have a FPU (Floating Point Unit) and lowers all (single diff --git a/src/librustc_target/spec/thumbv7m_none_eabi.rs b/src/librustc_target/spec/thumbv7m_none_eabi.rs index 10dc503388afe..7564dde37493b 100644 --- a/src/librustc_target/spec/thumbv7m_none_eabi.rs +++ b/src/librustc_target/spec/thumbv7m_none_eabi.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Targets the Cortex-M3 processor (ARMv7-M) use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; diff --git a/src/librustc_target/spec/wasm32_experimental_emscripten.rs b/src/librustc_target/spec/wasm32_experimental_emscripten.rs index 164df20f84f34..539e4d3ff7c33 100644 --- a/src/librustc_target/spec/wasm32_experimental_emscripten.rs +++ b/src/librustc_target/spec/wasm32_experimental_emscripten.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::{LinkArgs, LinkerFlavor, Target, TargetOptions}; pub fn target() -> Result { diff --git a/src/librustc_target/spec/wasm32_unknown_emscripten.rs b/src/librustc_target/spec/wasm32_unknown_emscripten.rs index 5077abf1e0eb3..8e8b265074e7d 100644 --- a/src/librustc_target/spec/wasm32_unknown_emscripten.rs +++ b/src/librustc_target/spec/wasm32_unknown_emscripten.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::{LinkArgs, LinkerFlavor, Target, TargetOptions}; pub fn target() -> Result { diff --git a/src/librustc_target/spec/wasm32_unknown_unknown.rs b/src/librustc_target/spec/wasm32_unknown_unknown.rs index 94e7739b1a05a..0664c0c4e40a8 100644 --- a/src/librustc_target/spec/wasm32_unknown_unknown.rs +++ b/src/librustc_target/spec/wasm32_unknown_unknown.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // The wasm32-unknown-unknown target is currently an experimental version of a // wasm-based target which does *not* use the Emscripten toolchain. Instead // this toolchain is based purely on LLVM's own toolchain, using LLVM's native diff --git a/src/librustc_target/spec/windows_base.rs b/src/librustc_target/spec/windows_base.rs index 176df9f13253d..5bb49177a6d9c 100644 --- a/src/librustc_target/spec/windows_base.rs +++ b/src/librustc_target/spec/windows_base.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkArgs, LinkerFlavor, TargetOptions}; use std::default::Default; diff --git a/src/librustc_target/spec/windows_msvc_base.rs b/src/librustc_target/spec/windows_msvc_base.rs index 1f00e690cd352..4bd6f20091e73 100644 --- a/src/librustc_target/spec/windows_msvc_base.rs +++ b/src/librustc_target/spec/windows_msvc_base.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkArgs, LinkerFlavor, TargetOptions}; use std::default::Default; diff --git a/src/librustc_target/spec/x86_64_apple_darwin.rs b/src/librustc_target/spec/x86_64_apple_darwin.rs index a4efd7e0066ff..6f9306316ccd9 100644 --- a/src/librustc_target/spec/x86_64_apple_darwin.rs +++ b/src/librustc_target/spec/x86_64_apple_darwin.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/x86_64_apple_ios.rs b/src/librustc_target/spec/x86_64_apple_ios.rs index eeb53d72fe8a3..9528208438a70 100644 --- a/src/librustc_target/spec/x86_64_apple_ios.rs +++ b/src/librustc_target/spec/x86_64_apple_ios.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetOptions, TargetResult}; use super::apple_ios_base::{opts, Arch}; diff --git a/src/librustc_target/spec/x86_64_fuchsia.rs b/src/librustc_target/spec/x86_64_fuchsia.rs index e8fa179887c87..866afacfcde9f 100644 --- a/src/librustc_target/spec/x86_64_fuchsia.rs +++ b/src/librustc_target/spec/x86_64_fuchsia.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/x86_64_linux_android.rs b/src/librustc_target/spec/x86_64_linux_android.rs index 06abe916784dc..5e08e7c16cd52 100644 --- a/src/librustc_target/spec/x86_64_linux_android.rs +++ b/src/librustc_target/spec/x86_64_linux_android.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/x86_64_pc_windows_gnu.rs b/src/librustc_target/spec/x86_64_pc_windows_gnu.rs index 8d2f702bc4a0f..c3c36d22cef5e 100644 --- a/src/librustc_target/spec/x86_64_pc_windows_gnu.rs +++ b/src/librustc_target/spec/x86_64_pc_windows_gnu.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/x86_64_pc_windows_msvc.rs b/src/librustc_target/spec/x86_64_pc_windows_msvc.rs index ab610ea94ae89..178d67784e653 100644 --- a/src/librustc_target/spec/x86_64_pc_windows_msvc.rs +++ b/src/librustc_target/spec/x86_64_pc_windows_msvc.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/x86_64_rumprun_netbsd.rs b/src/librustc_target/spec/x86_64_rumprun_netbsd.rs index ed15cfd9036f5..4f012d565c895 100644 --- a/src/librustc_target/spec/x86_64_rumprun_netbsd.rs +++ b/src/librustc_target/spec/x86_64_rumprun_netbsd.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/x86_64_sun_solaris.rs b/src/librustc_target/spec/x86_64_sun_solaris.rs index e84f21c500664..8c00b2923790d 100644 --- a/src/librustc_target/spec/x86_64_sun_solaris.rs +++ b/src/librustc_target/spec/x86_64_sun_solaris.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/x86_64_unknown_bitrig.rs b/src/librustc_target/spec/x86_64_unknown_bitrig.rs index 21ec6dffcbbce..49bea0e31d527 100644 --- a/src/librustc_target/spec/x86_64_unknown_bitrig.rs +++ b/src/librustc_target/spec/x86_64_unknown_bitrig.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/x86_64_unknown_cloudabi.rs b/src/librustc_target/spec/x86_64_unknown_cloudabi.rs index 8dc8bd7a7fad9..ddd0f6ca58d60 100644 --- a/src/librustc_target/spec/x86_64_unknown_cloudabi.rs +++ b/src/librustc_target/spec/x86_64_unknown_cloudabi.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/x86_64_unknown_dragonfly.rs b/src/librustc_target/spec/x86_64_unknown_dragonfly.rs index 50b2871c2ee9c..425d84a0d05a2 100644 --- a/src/librustc_target/spec/x86_64_unknown_dragonfly.rs +++ b/src/librustc_target/spec/x86_64_unknown_dragonfly.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/x86_64_unknown_freebsd.rs b/src/librustc_target/spec/x86_64_unknown_freebsd.rs index f0aa81ed4598b..de37058f5d2c8 100644 --- a/src/librustc_target/spec/x86_64_unknown_freebsd.rs +++ b/src/librustc_target/spec/x86_64_unknown_freebsd.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/x86_64_unknown_haiku.rs b/src/librustc_target/spec/x86_64_unknown_haiku.rs index 68fa58b922019..56826f6bcc035 100644 --- a/src/librustc_target/spec/x86_64_unknown_haiku.rs +++ b/src/librustc_target/spec/x86_64_unknown_haiku.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/x86_64_unknown_hermit.rs b/src/librustc_target/spec/x86_64_unknown_hermit.rs index 9f9f2e6ec43e9..6a831ee5057e4 100644 --- a/src/librustc_target/spec/x86_64_unknown_hermit.rs +++ b/src/librustc_target/spec/x86_64_unknown_hermit.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/x86_64_unknown_l4re_uclibc.rs b/src/librustc_target/spec/x86_64_unknown_l4re_uclibc.rs index f1179c18294d3..cf04cc1bdc2f5 100644 --- a/src/librustc_target/spec/x86_64_unknown_l4re_uclibc.rs +++ b/src/librustc_target/spec/x86_64_unknown_l4re_uclibc.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/x86_64_unknown_linux_gnu.rs b/src/librustc_target/spec/x86_64_unknown_linux_gnu.rs index 56559661b03cb..c6ec8de5b7312 100644 --- a/src/librustc_target/spec/x86_64_unknown_linux_gnu.rs +++ b/src/librustc_target/spec/x86_64_unknown_linux_gnu.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/x86_64_unknown_linux_gnux32.rs b/src/librustc_target/spec/x86_64_unknown_linux_gnux32.rs index 72b5bd27c7dfe..2334272a7dbdd 100644 --- a/src/librustc_target/spec/x86_64_unknown_linux_gnux32.rs +++ b/src/librustc_target/spec/x86_64_unknown_linux_gnux32.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/x86_64_unknown_linux_musl.rs b/src/librustc_target/spec/x86_64_unknown_linux_musl.rs index f1924efcf98b5..95321fe2f783e 100644 --- a/src/librustc_target/spec/x86_64_unknown_linux_musl.rs +++ b/src/librustc_target/spec/x86_64_unknown_linux_musl.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/x86_64_unknown_netbsd.rs b/src/librustc_target/spec/x86_64_unknown_netbsd.rs index 6e8ca6b9e1991..fc28b395e42f8 100644 --- a/src/librustc_target/spec/x86_64_unknown_netbsd.rs +++ b/src/librustc_target/spec/x86_64_unknown_netbsd.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/x86_64_unknown_openbsd.rs b/src/librustc_target/spec/x86_64_unknown_openbsd.rs index c60b7c86680f8..aeca28e81ea14 100644 --- a/src/librustc_target/spec/x86_64_unknown_openbsd.rs +++ b/src/librustc_target/spec/x86_64_unknown_openbsd.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_target/spec/x86_64_unknown_redox.rs b/src/librustc_target/spec/x86_64_unknown_redox.rs index 548dfb06109ff..3cebdb325e729 100644 --- a/src/librustc_target/spec/x86_64_unknown_redox.rs +++ b/src/librustc_target/spec/x86_64_unknown_redox.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { diff --git a/src/librustc_traits/chalk_context.rs b/src/librustc_traits/chalk_context.rs index 4c28df97bdf50..b481ba47c5842 100644 --- a/src/librustc_traits/chalk_context.rs +++ b/src/librustc_traits/chalk_context.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use chalk_engine::fallible::Fallible as ChalkEngineFallible; use chalk_engine::{context, hh::HhGoal, DelayedLiteral, ExClause}; use rustc::infer::canonical::{Canonical, CanonicalVarValues, QueryRegionConstraint, QueryResult}; diff --git a/src/librustc_traits/dropck_outlives.rs b/src/librustc_traits/dropck_outlives.rs index a27a447ad4b09..9ac948b7b4145 100644 --- a/src/librustc_traits/dropck_outlives.rs +++ b/src/librustc_traits/dropck_outlives.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::hir::def_id::DefId; use rustc::infer::canonical::{Canonical, QueryResult}; use rustc::traits::query::dropck_outlives::{DropckOutlivesResult, DtorckConstraint}; diff --git a/src/librustc_traits/evaluate_obligation.rs b/src/librustc_traits/evaluate_obligation.rs index b5ee346569a69..15a554c276b8e 100644 --- a/src/librustc_traits/evaluate_obligation.rs +++ b/src/librustc_traits/evaluate_obligation.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::traits::{EvaluationResult, Obligation, ObligationCause, OverflowError, SelectionContext, TraitQueryMode}; use rustc::traits::query::CanonicalPredicateGoal; diff --git a/src/librustc_traits/implied_outlives_bounds.rs b/src/librustc_traits/implied_outlives_bounds.rs index 7b31518c07b18..14cca7f27454e 100644 --- a/src/librustc_traits/implied_outlives_bounds.rs +++ b/src/librustc_traits/implied_outlives_bounds.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Provider for the `implied_outlives_bounds` query. //! Do not call this query directory. See [`rustc::traits::query::implied_outlives_bounds`]. diff --git a/src/librustc_traits/lib.rs b/src/librustc_traits/lib.rs index 700efbd6ba942..6409969c3fefe 100644 --- a/src/librustc_traits/lib.rs +++ b/src/librustc_traits/lib.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! New recursive solver modeled on Chalk's recursive solver. Most of //! the guts are broken up into modules; see the comments in those modules. diff --git a/src/librustc_traits/lowering.rs b/src/librustc_traits/lowering.rs index 9fd3b318ec140..3ea9f66b681f2 100644 --- a/src/librustc_traits/lowering.rs +++ b/src/librustc_traits/lowering.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::hir::def_id::DefId; use rustc::hir::intravisit::{self, NestedVisitorMap, Visitor}; use rustc::hir::map::definitions::DefPathData; diff --git a/src/librustc_traits/normalize_erasing_regions.rs b/src/librustc_traits/normalize_erasing_regions.rs index a85983d0e9a81..c06cdbd0928da 100644 --- a/src/librustc_traits/normalize_erasing_regions.rs +++ b/src/librustc_traits/normalize_erasing_regions.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::traits::{Normalized, ObligationCause}; use rustc::traits::query::NoSolution; use rustc::ty::query::Providers; diff --git a/src/librustc_traits/normalize_projection_ty.rs b/src/librustc_traits/normalize_projection_ty.rs index 1c0f677fbf3cb..12bf554666b2c 100644 --- a/src/librustc_traits/normalize_projection_ty.rs +++ b/src/librustc_traits/normalize_projection_ty.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::infer::canonical::{Canonical, QueryResult}; use rustc::traits::query::{normalize::NormalizationResult, CanonicalProjectionGoal, NoSolution}; use rustc::traits::{self, ObligationCause, SelectionContext, TraitEngineExt}; diff --git a/src/librustc_traits/type_op.rs b/src/librustc_traits/type_op.rs index 8fe4290528e74..8613dd9ea978a 100644 --- a/src/librustc_traits/type_op.rs +++ b/src/librustc_traits/type_op.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::infer::canonical::{Canonical, QueryResult}; use rustc::infer::InferCtxt; use rustc::traits::query::type_op::eq::Eq; diff --git a/src/librustc_tsan/build.rs b/src/librustc_tsan/build.rs index 38595478c7433..27476e68a00b6 100644 --- a/src/librustc_tsan/build.rs +++ b/src/librustc_tsan/build.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate build_helper; extern crate cmake; diff --git a/src/librustc_tsan/lib.rs b/src/librustc_tsan/lib.rs index b3ba86ad8a4b3..876b33873d64e 100644 --- a/src/librustc_tsan/lib.rs +++ b/src/librustc_tsan/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![sanitizer_runtime] #![feature(alloc_system)] #![cfg_attr(not(stage0), feature(nll))] diff --git a/src/librustc_typeck/astconv.rs b/src/librustc_typeck/astconv.rs index a528c8e9b4f96..0903fa68c9c08 100644 --- a/src/librustc_typeck/astconv.rs +++ b/src/librustc_typeck/astconv.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Conversion from AST representation of types to the ty.rs //! representation. The main routine here is `ast_ty_to_ty()`: each use //! is parameterized by an instance of `AstConv`. diff --git a/src/librustc_typeck/check/_match.rs b/src/librustc_typeck/check/_match.rs index ae68584f2446f..61a8fded81ba8 100644 --- a/src/librustc_typeck/check/_match.rs +++ b/src/librustc_typeck/check/_match.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::hir::{self, PatKind}; use rustc::hir::def::{Def, CtorKind}; use rustc::hir::pat_util::EnumerateAndAdjustIterator; diff --git a/src/librustc_typeck/check/autoderef.rs b/src/librustc_typeck/check/autoderef.rs index 743a2390ec43d..e48ddb5c5000c 100644 --- a/src/librustc_typeck/check/autoderef.rs +++ b/src/librustc_typeck/check/autoderef.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use astconv::AstConv; use super::{FnCtxt, PlaceOp, Needs}; diff --git a/src/librustc_typeck/check/callee.rs b/src/librustc_typeck/check/callee.rs index 53186c64befd3..c86a3d443552f 100644 --- a/src/librustc_typeck/check/callee.rs +++ b/src/librustc_typeck/check/callee.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::{Expectation, FnCtxt, Needs, TupleArgumentsFlag}; use super::autoderef::Autoderef; use super::method::MethodCallee; diff --git a/src/librustc_typeck/check/cast.rs b/src/librustc_typeck/check/cast.rs index 52e5e57f74759..cef449161832b 100644 --- a/src/librustc_typeck/check/cast.rs +++ b/src/librustc_typeck/check/cast.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Code for type-checking cast expressions. //! //! A cast `e as U` is valid if one of the following holds: diff --git a/src/librustc_typeck/check/closure.rs b/src/librustc_typeck/check/closure.rs index a283e032e0e02..b0e2ae6d3cd13 100644 --- a/src/librustc_typeck/check/closure.rs +++ b/src/librustc_typeck/check/closure.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Code for type-checking closure expressions. use super::{check_fn, Expectation, FnCtxt, GeneratorTypes}; diff --git a/src/librustc_typeck/check/coercion.rs b/src/librustc_typeck/check/coercion.rs index 763adb007c3a4..7df6018b8bc5c 100644 --- a/src/librustc_typeck/check/coercion.rs +++ b/src/librustc_typeck/check/coercion.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! # Type Coercion //! //! Under certain circumstances we will coerce from one type to another, diff --git a/src/librustc_typeck/check/compare_method.rs b/src/librustc_typeck/check/compare_method.rs index 9aa2ba363ed7a..5ae47c8fb4f55 100644 --- a/src/librustc_typeck/check/compare_method.rs +++ b/src/librustc_typeck/check/compare_method.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::hir::{self, GenericParamKind, ImplItemKind, TraitItemKind}; use rustc::infer::{self, InferOk}; use rustc::ty::{self, TyCtxt, GenericParamDefKind}; diff --git a/src/librustc_typeck/check/demand.rs b/src/librustc_typeck/check/demand.rs index b0b2799c793b2..ba7e252ff329c 100644 --- a/src/librustc_typeck/check/demand.rs +++ b/src/librustc_typeck/check/demand.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use check::FnCtxt; use rustc::infer::InferOk; use rustc::traits::ObligationCause; diff --git a/src/librustc_typeck/check/dropck.rs b/src/librustc_typeck/check/dropck.rs index 9d3cbf910e059..e4ea2fa988524 100644 --- a/src/librustc_typeck/check/dropck.rs +++ b/src/librustc_typeck/check/dropck.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use check::regionck::RegionCtxt; use hir::def_id::DefId; diff --git a/src/librustc_typeck/check/generator_interior.rs b/src/librustc_typeck/check/generator_interior.rs index f0afc58b3cec5..038c462e6d99d 100644 --- a/src/librustc_typeck/check/generator_interior.rs +++ b/src/librustc_typeck/check/generator_interior.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This calculates the types which has storage which lives across a suspension point in a //! generator from the perspective of typeck. The actual types used at runtime //! is calculated in `rustc_mir::transform::generator` and may be a subset of the diff --git a/src/librustc_typeck/check/intrinsic.rs b/src/librustc_typeck/check/intrinsic.rs index 23872ddf2f64b..2d06e402049c9 100644 --- a/src/librustc_typeck/check/intrinsic.rs +++ b/src/librustc_typeck/check/intrinsic.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Type-checking for the rust-intrinsic and platform-intrinsic //! intrinsics that the compiler exposes. diff --git a/src/librustc_typeck/check/method/confirm.rs b/src/librustc_typeck/check/method/confirm.rs index 6057c18663a6e..c25423193a214 100644 --- a/src/librustc_typeck/check/method/confirm.rs +++ b/src/librustc_typeck/check/method/confirm.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::{probe, MethodCallee}; use astconv::AstConv; diff --git a/src/librustc_typeck/check/method/mod.rs b/src/librustc_typeck/check/method/mod.rs index 04c32fa88271a..a007d1cf4fef5 100644 --- a/src/librustc_typeck/check/method/mod.rs +++ b/src/librustc_typeck/check/method/mod.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Method lookup: the secret sauce of Rust. See the [rustc guide] chapter. //! //! [rustc guide]: https://rust-lang-nursery.github.io/rustc-guide/method-lookup.html diff --git a/src/librustc_typeck/check/method/probe.rs b/src/librustc_typeck/check/method/probe.rs index 85a437283fa68..95542eb37e47e 100644 --- a/src/librustc_typeck/check/method/probe.rs +++ b/src/librustc_typeck/check/method/probe.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::MethodError; use super::NoMatchData; use super::{CandidateSource, ImplSource, TraitSource}; diff --git a/src/librustc_typeck/check/method/suggest.rs b/src/librustc_typeck/check/method/suggest.rs index 14e36ba3429ec..2c3bcb2ef4f66 100644 --- a/src/librustc_typeck/check/method/suggest.rs +++ b/src/librustc_typeck/check/method/suggest.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Give useful errors and suggestions to users when an item can't be //! found or is otherwise invalid. diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs index db4dda0da5b4e..2d5a106b197ac 100644 --- a/src/librustc_typeck/check/mod.rs +++ b/src/librustc_typeck/check/mod.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /* # check.rs diff --git a/src/librustc_typeck/check/op.rs b/src/librustc_typeck/check/op.rs index b7cf6819e2180..7a40cdc4622ba 100644 --- a/src/librustc_typeck/check/op.rs +++ b/src/librustc_typeck/check/op.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Code related to processing overloaded binary and unary operators. use super::{FnCtxt, Needs}; diff --git a/src/librustc_typeck/check/regionck.rs b/src/librustc_typeck/check/regionck.rs index 867864b3853d0..0e835e851e00b 100644 --- a/src/librustc_typeck/check/regionck.rs +++ b/src/librustc_typeck/check/regionck.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The region check is a final pass that runs over the AST after we have //! inferred the type constraints but before we have actually finalized //! the types. Its purpose is to embed a variety of region constraints. diff --git a/src/librustc_typeck/check/upvar.rs b/src/librustc_typeck/check/upvar.rs index 41df937980ff3..aec5987cf61df 100644 --- a/src/librustc_typeck/check/upvar.rs +++ b/src/librustc_typeck/check/upvar.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! ### Inferring borrow kinds for upvars //! //! Whenever there is a closure expression, we need to determine how each diff --git a/src/librustc_typeck/check/wfcheck.rs b/src/librustc_typeck/check/wfcheck.rs index 99e0e8775b0cd..69cd9e0c7e2fa 100644 --- a/src/librustc_typeck/check/wfcheck.rs +++ b/src/librustc_typeck/check/wfcheck.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use check::{Inherited, FnCtxt}; use constrained_type_params::{identify_constrained_type_params, Parameter}; diff --git a/src/librustc_typeck/check/writeback.rs b/src/librustc_typeck/check/writeback.rs index 319de51713b93..d265bec334a58 100644 --- a/src/librustc_typeck/check/writeback.rs +++ b/src/librustc_typeck/check/writeback.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Type resolution: the phase that finds all the types in the AST with // unresolved type variables and replaces "ty_var" types with their // substitutions. diff --git a/src/librustc_typeck/check_unused.rs b/src/librustc_typeck/check_unused.rs index 62015907f0c8e..70e70cee2fa54 100644 --- a/src/librustc_typeck/check_unused.rs +++ b/src/librustc_typeck/check_unused.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use lint; use rustc::ty::TyCtxt; diff --git a/src/librustc_typeck/coherence/builtin.rs b/src/librustc_typeck/coherence/builtin.rs index d01e7dbdfefe5..f8ae249c7bb28 100644 --- a/src/librustc_typeck/coherence/builtin.rs +++ b/src/librustc_typeck/coherence/builtin.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Check properties that are required by built-in traits and set //! up data structures required by type-checking/codegen. diff --git a/src/librustc_typeck/coherence/inherent_impls.rs b/src/librustc_typeck/coherence/inherent_impls.rs index 52e37b8d0ce11..61fca4c984c89 100644 --- a/src/librustc_typeck/coherence/inherent_impls.rs +++ b/src/librustc_typeck/coherence/inherent_impls.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The code in this module gathers up all of the inherent impls in //! the current crate and organizes them in a map. It winds up //! touching the whole crate and thus must be recomputed completely diff --git a/src/librustc_typeck/coherence/inherent_impls_overlap.rs b/src/librustc_typeck/coherence/inherent_impls_overlap.rs index c0260d6714d05..70411e409fc99 100644 --- a/src/librustc_typeck/coherence/inherent_impls_overlap.rs +++ b/src/librustc_typeck/coherence/inherent_impls_overlap.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use namespace::Namespace; use rustc::hir::def_id::{CrateNum, DefId, LOCAL_CRATE}; use rustc::hir; diff --git a/src/librustc_typeck/coherence/mod.rs b/src/librustc_typeck/coherence/mod.rs index 168cf47fb5266..dfdeded661394 100644 --- a/src/librustc_typeck/coherence/mod.rs +++ b/src/librustc_typeck/coherence/mod.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Coherence phase // // The job of the coherence phase of typechecking is to ensure that diff --git a/src/librustc_typeck/coherence/orphan.rs b/src/librustc_typeck/coherence/orphan.rs index f9b89488232d2..42f83d6bbd3ac 100644 --- a/src/librustc_typeck/coherence/orphan.rs +++ b/src/librustc_typeck/coherence/orphan.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Orphan checker: every impl either implements a trait defined in this //! crate or pertains to a type defined in this crate. diff --git a/src/librustc_typeck/coherence/unsafety.rs b/src/librustc_typeck/coherence/unsafety.rs index 9e19854a571fc..b60d293b2ad58 100644 --- a/src/librustc_typeck/coherence/unsafety.rs +++ b/src/librustc_typeck/coherence/unsafety.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Unsafety checker: every impl either implements a trait defined in this //! crate or pertains to a type defined in this crate. diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs index 956d542ab7d4e..aa9680ae0641f 100644 --- a/src/librustc_typeck/collect.rs +++ b/src/librustc_typeck/collect.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! "Collection" is the process of determining the type and other external //! details of each item in Rust. Collection is specifically concerned //! with *interprocedural* things -- for example, for a function diff --git a/src/librustc_typeck/constrained_type_params.rs b/src/librustc_typeck/constrained_type_params.rs index 37b0b83ccd088..d669d7218c462 100644 --- a/src/librustc_typeck/constrained_type_params.rs +++ b/src/librustc_typeck/constrained_type_params.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::ty::{self, Ty, TyCtxt}; use rustc::ty::fold::{TypeFoldable, TypeVisitor}; use rustc::util::nodemap::FxHashSet; diff --git a/src/librustc_typeck/diagnostics.rs b/src/librustc_typeck/diagnostics.rs index cae7b4a2862d6..e7fce6d42ff5f 100644 --- a/src/librustc_typeck/diagnostics.rs +++ b/src/librustc_typeck/diagnostics.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(non_snake_case)] register_long_diagnostics! { diff --git a/src/librustc_typeck/impl_wf_check.rs b/src/librustc_typeck/impl_wf_check.rs index 11260b8f11e12..d423b56ba57fb 100644 --- a/src/librustc_typeck/impl_wf_check.rs +++ b/src/librustc_typeck/impl_wf_check.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This pass enforces various "well-formedness constraints" on impls. //! Logically, it is part of wfcheck -- but we do it early so that we //! can stop compilation afterwards, since part of the trait matching diff --git a/src/librustc_typeck/lib.rs b/src/librustc_typeck/lib.rs index eddbac3f5417b..2bde92a92b610 100644 --- a/src/librustc_typeck/lib.rs +++ b/src/librustc_typeck/lib.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /*! typeck.rs, an introduction diff --git a/src/librustc_typeck/namespace.rs b/src/librustc_typeck/namespace.rs index 690bf1c550c0e..e8f6272810a37 100644 --- a/src/librustc_typeck/namespace.rs +++ b/src/librustc_typeck/namespace.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::hir; use rustc::ty; diff --git a/src/librustc_typeck/outlives/explicit.rs b/src/librustc_typeck/outlives/explicit.rs index a7ecfc269f35b..ac7884bb59ad9 100644 --- a/src/librustc_typeck/outlives/explicit.rs +++ b/src/librustc_typeck/outlives/explicit.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::hir::def_id::DefId; use rustc::ty::{self, OutlivesPredicate, TyCtxt}; use util::nodemap::FxHashMap; diff --git a/src/librustc_typeck/outlives/implicit_infer.rs b/src/librustc_typeck/outlives/implicit_infer.rs index ec36fa0fbc145..f69136778532b 100644 --- a/src/librustc_typeck/outlives/implicit_infer.rs +++ b/src/librustc_typeck/outlives/implicit_infer.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::hir; use rustc::hir::def_id::DefId; use rustc::hir::itemlikevisit::ItemLikeVisitor; diff --git a/src/librustc_typeck/outlives/mod.rs b/src/librustc_typeck/outlives/mod.rs index 74ef62e0c63c6..6fc141815ba93 100644 --- a/src/librustc_typeck/outlives/mod.rs +++ b/src/librustc_typeck/outlives/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use hir::map as hir_map; use rustc::hir; use rustc::hir::def_id::{CrateNum, DefId, LOCAL_CRATE}; diff --git a/src/librustc_typeck/outlives/test.rs b/src/librustc_typeck/outlives/test.rs index c3c2ae667ddd9..cc49446e99e2a 100644 --- a/src/librustc_typeck/outlives/test.rs +++ b/src/librustc_typeck/outlives/test.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::hir; use rustc::hir::itemlikevisit::ItemLikeVisitor; use rustc::ty::TyCtxt; diff --git a/src/librustc_typeck/outlives/utils.rs b/src/librustc_typeck/outlives/utils.rs index 0d833c50d7e3b..1f78f2619ddd1 100644 --- a/src/librustc_typeck/outlives/utils.rs +++ b/src/librustc_typeck/outlives/utils.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::ty::outlives::Component; use rustc::ty::subst::{Kind, UnpackedKind}; use rustc::ty::{self, Region, RegionKind, Ty, TyCtxt}; diff --git a/src/librustc_typeck/structured_errors.rs b/src/librustc_typeck/structured_errors.rs index ffd9da8c8b95c..4ff0e93a9c804 100644 --- a/src/librustc_typeck/structured_errors.rs +++ b/src/librustc_typeck/structured_errors.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::session::Session; use syntax_pos::Span; use errors::{DiagnosticId, DiagnosticBuilder}; diff --git a/src/librustc_typeck/variance/constraints.rs b/src/librustc_typeck/variance/constraints.rs index a79215497182e..d325858034c5f 100644 --- a/src/librustc_typeck/variance/constraints.rs +++ b/src/librustc_typeck/variance/constraints.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Constraint construction and representation //! //! The second pass over the AST determines the set of constraints. diff --git a/src/librustc_typeck/variance/mod.rs b/src/librustc_typeck/variance/mod.rs index 3d70550c1dfb2..96f928d684395 100644 --- a/src/librustc_typeck/variance/mod.rs +++ b/src/librustc_typeck/variance/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Module for inferring the variance of type and lifetime parameters. See the [rustc guide] //! chapter for more info. //! diff --git a/src/librustc_typeck/variance/solve.rs b/src/librustc_typeck/variance/solve.rs index 7116a42cead83..c76e9b4aa3ea1 100644 --- a/src/librustc_typeck/variance/solve.rs +++ b/src/librustc_typeck/variance/solve.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Constraint solving //! //! The final phase iterates over the constraints, refining the variance diff --git a/src/librustc_typeck/variance/terms.rs b/src/librustc_typeck/variance/terms.rs index 0aec31609b060..ae232642dc79f 100644 --- a/src/librustc_typeck/variance/terms.rs +++ b/src/librustc_typeck/variance/terms.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Representing terms // // Terms are structured as a straightforward tree. Rather than rely on diff --git a/src/librustc_typeck/variance/test.rs b/src/librustc_typeck/variance/test.rs index 1acadb7e77236..c1ba1910a3355 100644 --- a/src/librustc_typeck/variance/test.rs +++ b/src/librustc_typeck/variance/test.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::hir; use rustc::hir::itemlikevisit::ItemLikeVisitor; use rustc::ty::TyCtxt; diff --git a/src/librustc_typeck/variance/xform.rs b/src/librustc_typeck/variance/xform.rs index 7106ca4d420a8..969463d8e7cbc 100644 --- a/src/librustc_typeck/variance/xform.rs +++ b/src/librustc_typeck/variance/xform.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::ty; pub fn glb(v1: ty::Variance, v2: ty::Variance) -> ty::Variance { diff --git a/src/librustdoc/clean/auto_trait.rs b/src/librustdoc/clean/auto_trait.rs index de5a680ccf9d1..02398b4274657 100644 --- a/src/librustdoc/clean/auto_trait.rs +++ b/src/librustdoc/clean/auto_trait.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::hir; use rustc::traits::auto_trait as auto; use rustc::ty::{self, TypeFoldable}; diff --git a/src/librustdoc/clean/blanket_impl.rs b/src/librustdoc/clean/blanket_impl.rs index e7e371cd56785..434d390621c60 100644 --- a/src/librustdoc/clean/blanket_impl.rs +++ b/src/librustdoc/clean/blanket_impl.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::hir; use rustc::traits; use rustc::ty::ToPredicate; diff --git a/src/librustdoc/clean/cfg.rs b/src/librustdoc/clean/cfg.rs index f90f1e54da22c..31ecfb270445c 100644 --- a/src/librustdoc/clean/cfg.rs +++ b/src/librustdoc/clean/cfg.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Representation of a `#[doc(cfg(...))]` attribute. // FIXME: Once RFC #1868 is implemented, switch to use those structures instead. diff --git a/src/librustdoc/clean/def_ctor.rs b/src/librustdoc/clean/def_ctor.rs index cd9f4eb42dfc6..19d7dd9da2c68 100644 --- a/src/librustdoc/clean/def_ctor.rs +++ b/src/librustdoc/clean/def_ctor.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use core::DocContext; use super::*; diff --git a/src/librustdoc/clean/inline.rs b/src/librustdoc/clean/inline.rs index 75d7488d26a75..845f1f4a85bc9 100644 --- a/src/librustdoc/clean/inline.rs +++ b/src/librustdoc/clean/inline.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Support for inlining external documentation into the current AST. use std::iter::once; diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index b660613bb9faf..35bc18caeeff1 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This module contains the "cleaned" pieces of the AST, and the functions //! that clean them. diff --git a/src/librustdoc/clean/simplify.rs b/src/librustdoc/clean/simplify.rs index e938d2d0a1652..7a670ab9b64ec 100644 --- a/src/librustdoc/clean/simplify.rs +++ b/src/librustdoc/clean/simplify.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Simplification of where clauses and parameter bounds into a prettier and //! more canonical form. //! diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs index a312913a69c17..136b3fc37b355 100644 --- a/src/librustdoc/core.rs +++ b/src/librustdoc/core.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc_lint; use rustc_driver::{self, driver, target_features, abort_on_err}; use rustc::session::{self, config}; diff --git a/src/librustdoc/doctree.rs b/src/librustdoc/doctree.rs index dd1e1e99957ce..f30e14bc63517 100644 --- a/src/librustdoc/doctree.rs +++ b/src/librustdoc/doctree.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This module is used to store stuff from Rust's AST in a more convenient //! manner (and with prettier names) before cleaning. pub use self::StructType::*; diff --git a/src/librustdoc/externalfiles.rs b/src/librustdoc/externalfiles.rs index 9631ea059cc43..ed7633c702f00 100644 --- a/src/librustdoc/externalfiles.rs +++ b/src/librustdoc/externalfiles.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fs; use std::path::Path; use std::str; diff --git a/src/librustdoc/fold.rs b/src/librustdoc/fold.rs index 6d96bc8e36038..11a9f7e6b3905 100644 --- a/src/librustdoc/fold.rs +++ b/src/librustdoc/fold.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::mem; use clean::*; diff --git a/src/librustdoc/html/escape.rs b/src/librustdoc/html/escape.rs index 1173e6447f50c..690bcd8c070cf 100644 --- a/src/librustdoc/html/escape.rs +++ b/src/librustdoc/html/escape.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! HTML Escaping //! //! This module contains one unit-struct which can be used to HTML-escape a diff --git a/src/librustdoc/html/format.rs b/src/librustdoc/html/format.rs index 58034d1df5a1f..9e24ad1c6d06c 100644 --- a/src/librustdoc/html/format.rs +++ b/src/librustdoc/html/format.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! HTML formatting module //! //! This module contains a large number of `fmt::Display` implementations for diff --git a/src/librustdoc/html/highlight.rs b/src/librustdoc/html/highlight.rs index 5df4862290e3c..e75b607d57f77 100644 --- a/src/librustdoc/html/highlight.rs +++ b/src/librustdoc/html/highlight.rs @@ -1,13 +1,3 @@ -// Copyright 2014-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Basic syntax highlighting functionality. //! //! This module uses libsyntax's lexer to provide token-based highlighting for diff --git a/src/librustdoc/html/item_type.rs b/src/librustdoc/html/item_type.rs index a5131e327e08e..e00e1ca0f74bc 100644 --- a/src/librustdoc/html/item_type.rs +++ b/src/librustdoc/html/item_type.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Item types. use std::fmt; diff --git a/src/librustdoc/html/layout.rs b/src/librustdoc/html/layout.rs index af7c0a04215c1..5365a810db809 100644 --- a/src/librustdoc/html/layout.rs +++ b/src/librustdoc/html/layout.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt; use std::io; use std::path::PathBuf; diff --git a/src/librustdoc/html/markdown.rs b/src/librustdoc/html/markdown.rs index c104b88334061..47f1038aee0fa 100644 --- a/src/librustdoc/html/markdown.rs +++ b/src/librustdoc/html/markdown.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Markdown formatting for rustdoc //! //! This module implements markdown formatting through the pulldown-cmark diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index 4caea56faad34..7b4d8eaa44d5a 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Rustdoc's HTML Rendering module //! //! This modules contains the bulk of the logic necessary for rendering a diff --git a/src/librustdoc/html/toc.rs b/src/librustdoc/html/toc.rs index 88ada5c7f7fc0..a645aee882b32 100644 --- a/src/librustdoc/html/toc.rs +++ b/src/librustdoc/html/toc.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Table-of-contents creation. use std::fmt; diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs index a8ae6a94d5c4d..0b91209b0d732 100644 --- a/src/librustdoc/lib.rs +++ b/src/librustdoc/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png", html_favicon_url = "https://doc.rust-lang.org/favicon.ico", html_root_url = "https://doc.rust-lang.org/nightly/", diff --git a/src/librustdoc/markdown.rs b/src/librustdoc/markdown.rs index a3ae953e6ee9b..0775b950cc79f 100644 --- a/src/librustdoc/markdown.rs +++ b/src/librustdoc/markdown.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::default::Default; use std::fs::File; use std::io::prelude::*; diff --git a/src/librustdoc/passes/collapse_docs.rs b/src/librustdoc/passes/collapse_docs.rs index 33d052775ba76..2d1c934b497c2 100644 --- a/src/librustdoc/passes/collapse_docs.rs +++ b/src/librustdoc/passes/collapse_docs.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use clean::{self, DocFragment, Item}; use fold; use fold::DocFolder; diff --git a/src/librustdoc/passes/collect_intra_doc_links.rs b/src/librustdoc/passes/collect_intra_doc_links.rs index cced30d1a0c20..39e79c9b99b43 100644 --- a/src/librustdoc/passes/collect_intra_doc_links.rs +++ b/src/librustdoc/passes/collect_intra_doc_links.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use clean::*; use rustc::lint as lint; diff --git a/src/librustdoc/passes/mod.rs b/src/librustdoc/passes/mod.rs index 16251877bb106..cd28c115e3b86 100644 --- a/src/librustdoc/passes/mod.rs +++ b/src/librustdoc/passes/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Contains information about "passes", used to modify crate information during the documentation //! process. diff --git a/src/librustdoc/passes/propagate_doc_cfg.rs b/src/librustdoc/passes/propagate_doc_cfg.rs index 69093846302a7..9b91b0470f894 100644 --- a/src/librustdoc/passes/propagate_doc_cfg.rs +++ b/src/librustdoc/passes/propagate_doc_cfg.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::sync::Arc; use clean::{Crate, Item}; diff --git a/src/librustdoc/passes/strip_hidden.rs b/src/librustdoc/passes/strip_hidden.rs index cc0b6fb6d6705..0c96176a2db5a 100644 --- a/src/librustdoc/passes/strip_hidden.rs +++ b/src/librustdoc/passes/strip_hidden.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::util::nodemap::DefIdSet; use std::mem; diff --git a/src/librustdoc/passes/strip_priv_imports.rs b/src/librustdoc/passes/strip_priv_imports.rs index f01c333d742d3..69216f272714b 100644 --- a/src/librustdoc/passes/strip_priv_imports.rs +++ b/src/librustdoc/passes/strip_priv_imports.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use clean; use core::DocContext; use fold::DocFolder; diff --git a/src/librustdoc/passes/strip_private.rs b/src/librustdoc/passes/strip_private.rs index 3b17a768ffdee..336db9322147f 100644 --- a/src/librustdoc/passes/strip_private.rs +++ b/src/librustdoc/passes/strip_private.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::util::nodemap::DefIdSet; use clean; diff --git a/src/librustdoc/passes/unindent_comments.rs b/src/librustdoc/passes/unindent_comments.rs index 6d875c107c874..cb895168d0946 100644 --- a/src/librustdoc/passes/unindent_comments.rs +++ b/src/librustdoc/passes/unindent_comments.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cmp; use std::string::String; use std::usize; diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs index 3b07a2ccdde09..db8861de7e7fe 100644 --- a/src/librustdoc/test.rs +++ b/src/librustdoc/test.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::env; use std::ffi::OsString; use std::io::prelude::*; diff --git a/src/librustdoc/theme.rs b/src/librustdoc/theme.rs index 96a67e0788758..f7d826cac1b1e 100644 --- a/src/librustdoc/theme.rs +++ b/src/librustdoc/theme.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::HashSet; use std::fs::File; use std::hash::{Hash, Hasher}; diff --git a/src/librustdoc/visit_ast.rs b/src/librustdoc/visit_ast.rs index 15a94b8adfcb2..60a1ab22d080f 100644 --- a/src/librustdoc/visit_ast.rs +++ b/src/librustdoc/visit_ast.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Rust AST Visitor. Extracts useful information and massages it into a form //! usable for clean diff --git a/src/librustdoc/visit_lib.rs b/src/librustdoc/visit_lib.rs index 10a4e69dcc6cd..9e7f398d32b0d 100644 --- a/src/librustdoc/visit_lib.rs +++ b/src/librustdoc/visit_lib.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc::middle::privacy::{AccessLevels, AccessLevel}; use rustc::hir::def::Def; use rustc::hir::def_id::{CrateNum, CRATE_DEF_INDEX, DefId}; diff --git a/src/libserialize/collection_impls.rs b/src/libserialize/collection_impls.rs index 3e028d755c6d4..23321d25a9698 100644 --- a/src/libserialize/collection_impls.rs +++ b/src/libserialize/collection_impls.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Implementations of serialization for structures found in liballoc use std::hash::{Hash, BuildHasher}; diff --git a/src/libserialize/hex.rs b/src/libserialize/hex.rs index 7f3736e82caa6..e634c1e0c3a5e 100644 --- a/src/libserialize/hex.rs +++ b/src/libserialize/hex.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Hex binary-to-text encoding pub use self::FromHexError::*; diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs index 35ef6327de5fd..c851061a2d8b4 100644 --- a/src/libserialize/json.rs +++ b/src/libserialize/json.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Rust JSON serialization library // Copyright (c) 2011 Google Inc. diff --git a/src/libserialize/leb128.rs b/src/libserialize/leb128.rs index e02bc5e1025fd..16ff59489e718 100644 --- a/src/libserialize/leb128.rs +++ b/src/libserialize/leb128.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[inline] pub fn write_to_vec(vec: &mut Vec, byte: u8) { vec.push(byte); diff --git a/src/libserialize/lib.rs b/src/libserialize/lib.rs index 1f6ee3d867b17..a5c5b266030e7 100644 --- a/src/libserialize/lib.rs +++ b/src/libserialize/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Support code for encoding and decoding types. /* diff --git a/src/libserialize/opaque.rs b/src/libserialize/opaque.rs index c71f474891131..3e2035d47729c 100644 --- a/src/libserialize/opaque.rs +++ b/src/libserialize/opaque.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use leb128::{self, read_signed_leb128, write_signed_leb128}; use std::borrow::Cow; use serialize; diff --git a/src/libserialize/serialize.rs b/src/libserialize/serialize.rs index 60bb5a0fec2cd..310515ca17976 100644 --- a/src/libserialize/serialize.rs +++ b/src/libserialize/serialize.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Support code for encoding and decoding types. /* diff --git a/src/libstd/alloc.rs b/src/libstd/alloc.rs index b9aba1e9cab32..4c36de6683d18 100644 --- a/src/libstd/alloc.rs +++ b/src/libstd/alloc.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Memory allocation APIs //! //! In a given program, the standard library has one “global” memory allocator diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs index 0c8e95aa42624..7db0aad390960 100644 --- a/src/libstd/ascii.rs +++ b/src/libstd/ascii.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Operations on ASCII strings and characters. //! //! Most string operations in Rust act on UTF-8 strings. However, at times it diff --git a/src/libstd/build.rs b/src/libstd/build.rs index 016e7adb4c914..dc57fe19c9a0f 100644 --- a/src/libstd/build.rs +++ b/src/libstd/build.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(warnings)] extern crate build_helper; diff --git a/src/libstd/collections/hash/bench.rs b/src/libstd/collections/hash/bench.rs index ff6cb7985a4de..8ca43f8ada211 100644 --- a/src/libstd/collections/hash/bench.rs +++ b/src/libstd/collections/hash/bench.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![cfg(test)] extern crate test; diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs index 91912e5f2412e..8264b1457867b 100644 --- a/src/libstd/collections/hash/map.rs +++ b/src/libstd/collections/hash/map.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use self::Entry::*; use self::VacantEntryState::*; diff --git a/src/libstd/collections/hash/mod.rs b/src/libstd/collections/hash/mod.rs index 7a22bec5a3f89..0d1bbb590db9e 100644 --- a/src/libstd/collections/hash/mod.rs +++ b/src/libstd/collections/hash/mod.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Unordered containers, implemented as hash-tables mod bench; diff --git a/src/libstd/collections/hash/set.rs b/src/libstd/collections/hash/set.rs index 5ac3e8f9cf7d3..98e5d9de2f7db 100644 --- a/src/libstd/collections/hash/set.rs +++ b/src/libstd/collections/hash/set.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use borrow::Borrow; use fmt; use hash::{Hash, BuildHasher}; diff --git a/src/libstd/collections/hash/table.rs b/src/libstd/collections/hash/table.rs index 768357ec8dc41..7bbb0076e6dad 100644 --- a/src/libstd/collections/hash/table.rs +++ b/src/libstd/collections/hash/table.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use alloc::{Global, Alloc, Layout, LayoutErr, handle_alloc_error}; use collections::CollectionAllocErr; use hash::{BuildHasher, Hash, Hasher}; diff --git a/src/libstd/collections/mod.rs b/src/libstd/collections/mod.rs index 8d2c82bc0aa84..ef397283ca4fb 100644 --- a/src/libstd/collections/mod.rs +++ b/src/libstd/collections/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Collection types. //! //! Rust's standard collection library provides efficient implementations of the diff --git a/src/libstd/env.rs b/src/libstd/env.rs index 9066c0b769479..eb4b50992e282 100644 --- a/src/libstd/env.rs +++ b/src/libstd/env.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Inspection and manipulation of the process's environment. //! //! This module contains functions to inspect various aspects such as diff --git a/src/libstd/error.rs b/src/libstd/error.rs index 29534696abc5b..7d87bb0cad31e 100644 --- a/src/libstd/error.rs +++ b/src/libstd/error.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Traits for working with Errors. #![stable(feature = "rust1", since = "1.0.0")] diff --git a/src/libstd/f32.rs b/src/libstd/f32.rs index 8e8340b3ed901..49497b87ec532 100644 --- a/src/libstd/f32.rs +++ b/src/libstd/f32.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This module provides constants which are specific to the implementation //! of the `f32` floating point data type. //! diff --git a/src/libstd/f64.rs b/src/libstd/f64.rs index 6880294afcaaf..15afa9d5b115f 100644 --- a/src/libstd/f64.rs +++ b/src/libstd/f64.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This module provides constants which are specific to the implementation //! of the `f64` floating point data type. //! diff --git a/src/libstd/ffi/c_str.rs b/src/libstd/ffi/c_str.rs index 2b87094926cf5..53b31ab2e48e3 100644 --- a/src/libstd/ffi/c_str.rs +++ b/src/libstd/ffi/c_str.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use ascii; use borrow::{Cow, Borrow}; use cmp::Ordering; diff --git a/src/libstd/ffi/mod.rs b/src/libstd/ffi/mod.rs index a37a5e8ae820b..c0ab295eb206d 100644 --- a/src/libstd/ffi/mod.rs +++ b/src/libstd/ffi/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Utilities related to FFI bindings. //! //! This module provides utilities to handle data across non-Rust diff --git a/src/libstd/ffi/os_str.rs b/src/libstd/ffi/os_str.rs index 6bcd62dbd59c2..57655042d246d 100644 --- a/src/libstd/ffi/os_str.rs +++ b/src/libstd/ffi/os_str.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use borrow::{Borrow, Cow}; use fmt; use ops; diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs index 7632fbc41f5a3..3cf91094a359e 100644 --- a/src/libstd/fs.rs +++ b/src/libstd/fs.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Filesystem manipulation operations. //! //! This module contains basic methods to manipulate the contents of the local diff --git a/src/libstd/future.rs b/src/libstd/future.rs index cadb5c0ba5d0e..aeb02e6fce536 100644 --- a/src/libstd/future.rs +++ b/src/libstd/future.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Asynchronous values. use core::cell::Cell; diff --git a/src/libstd/io/buffered.rs b/src/libstd/io/buffered.rs index 77bc7e946eb41..954a50de0bac7 100644 --- a/src/libstd/io/buffered.rs +++ b/src/libstd/io/buffered.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Buffering wrappers for I/O traits use io::prelude::*; diff --git a/src/libstd/io/cursor.rs b/src/libstd/io/cursor.rs index 14f20151dca86..aff672934bac6 100644 --- a/src/libstd/io/cursor.rs +++ b/src/libstd/io/cursor.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use io::prelude::*; use core::convert::TryInto; diff --git a/src/libstd/io/error.rs b/src/libstd/io/error.rs index 3e50988a68ba2..afe6cbe942125 100644 --- a/src/libstd/io/error.rs +++ b/src/libstd/io/error.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use error; use fmt; use result; diff --git a/src/libstd/io/impls.rs b/src/libstd/io/impls.rs index fe1179a3b4a18..ec75a87aec34f 100644 --- a/src/libstd/io/impls.rs +++ b/src/libstd/io/impls.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use cmp; use io::{self, SeekFrom, Read, Initializer, Write, Seek, BufRead, Error, ErrorKind}; use fmt; diff --git a/src/libstd/io/lazy.rs b/src/libstd/io/lazy.rs index 4fb367fb6ba52..1facb3a361274 100644 --- a/src/libstd/io/lazy.rs +++ b/src/libstd/io/lazy.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use cell::Cell; use ptr; use sync::Arc; diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index b83f3fbe7a59c..2bceee9b89605 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Traits, helpers, and type definitions for core I/O functionality. //! //! The `std::io` module contains a number of common things you'll need diff --git a/src/libstd/io/prelude.rs b/src/libstd/io/prelude.rs index 8772d0f5b099b..2e19edf262126 100644 --- a/src/libstd/io/prelude.rs +++ b/src/libstd/io/prelude.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The I/O Prelude //! //! The purpose of this module is to alleviate imports of many common I/O traits diff --git a/src/libstd/io/stdio.rs b/src/libstd/io/stdio.rs index 1f256f518c7ce..8e82c2082c487 100644 --- a/src/libstd/io/stdio.rs +++ b/src/libstd/io/stdio.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use io::prelude::*; use cell::RefCell; diff --git a/src/libstd/io/util.rs b/src/libstd/io/util.rs index 33f741dbc38f2..e11a54baea2fc 100644 --- a/src/libstd/io/util.rs +++ b/src/libstd/io/util.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(missing_copy_implementations)] use fmt; diff --git a/src/libstd/keyword_docs.rs b/src/libstd/keyword_docs.rs index 4f6bda6cfe379..758c63443886a 100644 --- a/src/libstd/keyword_docs.rs +++ b/src/libstd/keyword_docs.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[doc(keyword = "fn")] // /// The `fn` keyword. diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 8b42471674610..700dd8257f0cb 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! # The Rust Standard Library //! //! The Rust Standard Library is the foundation of portable Rust software, a diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs index f15494c5fd7f5..74a6f001a38ec 100644 --- a/src/libstd/macros.rs +++ b/src/libstd/macros.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Standard library macros //! //! This modules contains a set of macros which are exported from the standard diff --git a/src/libstd/memchr.rs b/src/libstd/memchr.rs index c28f3da98cea9..b43a299d5928d 100644 --- a/src/libstd/memchr.rs +++ b/src/libstd/memchr.rs @@ -1,12 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // Original implementation taken from rust-memchr // Copyright 2015 Andrew Gallant, bluss and Nicolas Koch diff --git a/src/libstd/net/addr.rs b/src/libstd/net/addr.rs index e80c3eeb876ce..a373bab7c08dc 100644 --- a/src/libstd/net/addr.rs +++ b/src/libstd/net/addr.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use fmt; use hash; use io; diff --git a/src/libstd/net/ip.rs b/src/libstd/net/ip.rs index d45a66ef66532..64c22d32bef53 100644 --- a/src/libstd/net/ip.rs +++ b/src/libstd/net/ip.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![unstable(feature = "ip", reason = "extra functionality has not been \ scrutinized to the level that it should \ be to be stable", diff --git a/src/libstd/net/mod.rs b/src/libstd/net/mod.rs index be4bcee8a68ae..afea6cd1e8e44 100644 --- a/src/libstd/net/mod.rs +++ b/src/libstd/net/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Networking primitives for TCP/UDP communication. //! //! This module provides networking functionality for the Transmission Control and User diff --git a/src/libstd/net/parser.rs b/src/libstd/net/parser.rs index cf3e5354a3188..70e0c2ad4b49b 100644 --- a/src/libstd/net/parser.rs +++ b/src/libstd/net/parser.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A private parser implementation of IPv4, IPv6, and socket addresses. //! //! This module is "publicly exported" through the `FromStr` implementations diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs index 75c7a3d928094..79c430a8d5001 100644 --- a/src/libstd/net/tcp.rs +++ b/src/libstd/net/tcp.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use io::prelude::*; use fmt; diff --git a/src/libstd/net/test.rs b/src/libstd/net/test.rs index aec3d901ece60..eb5862cbdd945 100644 --- a/src/libstd/net/test.rs +++ b/src/libstd/net/test.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(warnings)] // not used on emscripten use env; diff --git a/src/libstd/net/udp.rs b/src/libstd/net/udp.rs index 0ebe3284b4f0a..e11a2d155d703 100644 --- a/src/libstd/net/udp.rs +++ b/src/libstd/net/udp.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use fmt; use io::{self, Error, ErrorKind}; use net::{ToSocketAddrs, SocketAddr, Ipv4Addr, Ipv6Addr}; diff --git a/src/libstd/num.rs b/src/libstd/num.rs index 3f90c1fa3b1f2..c80b9a56704a7 100644 --- a/src/libstd/num.rs +++ b/src/libstd/num.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Additional functionality for numerics. //! //! This module provides some extra types that are useful when doing numerical diff --git a/src/libstd/os/android/fs.rs b/src/libstd/os/android/fs.rs index 5899dc688e225..7aab6bf27ca88 100644 --- a/src/libstd/os/android/fs.rs +++ b/src/libstd/os/android/fs.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![stable(feature = "metadata_ext", since = "1.1.0")] use libc; diff --git a/src/libstd/os/android/mod.rs b/src/libstd/os/android/mod.rs index 7cc37769c1e0b..ad1cd85095d69 100644 --- a/src/libstd/os/android/mod.rs +++ b/src/libstd/os/android/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Android-specific definitions #![stable(feature = "raw_ext", since = "1.1.0")] diff --git a/src/libstd/os/android/raw.rs b/src/libstd/os/android/raw.rs index 60ad8fcc54ccd..e03de8a7cc40b 100644 --- a/src/libstd/os/android/raw.rs +++ b/src/libstd/os/android/raw.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Android-specific raw type definitions #![stable(feature = "raw_ext", since = "1.1.0")] diff --git a/src/libstd/os/bitrig/fs.rs b/src/libstd/os/bitrig/fs.rs index 24caf326ab0fd..8d6da3b7a0730 100644 --- a/src/libstd/os/bitrig/fs.rs +++ b/src/libstd/os/bitrig/fs.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![stable(feature = "metadata_ext", since = "1.1.0")] use libc; diff --git a/src/libstd/os/bitrig/mod.rs b/src/libstd/os/bitrig/mod.rs index fb58818a5baf1..0bc105bb2b40a 100644 --- a/src/libstd/os/bitrig/mod.rs +++ b/src/libstd/os/bitrig/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Bitrig-specific definitions #![stable(feature = "raw_ext", since = "1.1.0")] diff --git a/src/libstd/os/bitrig/raw.rs b/src/libstd/os/bitrig/raw.rs index 28958575eb229..034dc986b6917 100644 --- a/src/libstd/os/bitrig/raw.rs +++ b/src/libstd/os/bitrig/raw.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Bitrig-specific raw type definitions #![stable(feature = "raw_ext", since = "1.1.0")] diff --git a/src/libstd/os/dragonfly/fs.rs b/src/libstd/os/dragonfly/fs.rs index 6aea450774ffd..14f5e8035687f 100644 --- a/src/libstd/os/dragonfly/fs.rs +++ b/src/libstd/os/dragonfly/fs.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![stable(feature = "metadata_ext", since = "1.1.0")] use libc; diff --git a/src/libstd/os/dragonfly/mod.rs b/src/libstd/os/dragonfly/mod.rs index 645561823fcf9..c8df03e742ff2 100644 --- a/src/libstd/os/dragonfly/mod.rs +++ b/src/libstd/os/dragonfly/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Dragonfly-specific definitions #![stable(feature = "raw_ext", since = "1.1.0")] diff --git a/src/libstd/os/dragonfly/raw.rs b/src/libstd/os/dragonfly/raw.rs index 5da2540ceee67..4f36652ddcf50 100644 --- a/src/libstd/os/dragonfly/raw.rs +++ b/src/libstd/os/dragonfly/raw.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Dragonfly-specific raw type definitions #![stable(feature = "raw_ext", since = "1.1.0")] diff --git a/src/libstd/os/emscripten/fs.rs b/src/libstd/os/emscripten/fs.rs index e0e197dc122a1..33c41c9223e69 100644 --- a/src/libstd/os/emscripten/fs.rs +++ b/src/libstd/os/emscripten/fs.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![stable(feature = "metadata_ext", since = "1.1.0")] use libc; diff --git a/src/libstd/os/emscripten/mod.rs b/src/libstd/os/emscripten/mod.rs index 8ec44b9fae497..3111325021a80 100644 --- a/src/libstd/os/emscripten/mod.rs +++ b/src/libstd/os/emscripten/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Linux-specific definitions #![stable(feature = "raw_ext", since = "1.1.0")] diff --git a/src/libstd/os/emscripten/raw.rs b/src/libstd/os/emscripten/raw.rs index bcd85f8e29af9..d59ce482ef788 100644 --- a/src/libstd/os/emscripten/raw.rs +++ b/src/libstd/os/emscripten/raw.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Emscripten-specific raw type definitions //! This is basically exactly the same as the linux definitions, //! except using the musl-specific stat64 structure in liblibc. diff --git a/src/libstd/os/freebsd/fs.rs b/src/libstd/os/freebsd/fs.rs index 5f24cd636d541..1b4a0fcfa7c1e 100644 --- a/src/libstd/os/freebsd/fs.rs +++ b/src/libstd/os/freebsd/fs.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![stable(feature = "metadata_ext", since = "1.1.0")] use libc; diff --git a/src/libstd/os/freebsd/mod.rs b/src/libstd/os/freebsd/mod.rs index ce7b91ea41c87..1d9ee5468fe9e 100644 --- a/src/libstd/os/freebsd/mod.rs +++ b/src/libstd/os/freebsd/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! FreeBSD-specific definitions #![stable(feature = "raw_ext", since = "1.1.0")] diff --git a/src/libstd/os/freebsd/raw.rs b/src/libstd/os/freebsd/raw.rs index c755e5af8d949..7d90e583b5b9f 100644 --- a/src/libstd/os/freebsd/raw.rs +++ b/src/libstd/os/freebsd/raw.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! FreeBSD-specific raw type definitions #![stable(feature = "raw_ext", since = "1.1.0")] diff --git a/src/libstd/os/fuchsia/fs.rs b/src/libstd/os/fuchsia/fs.rs index 16802576356d1..8c2d23cb1c2ec 100644 --- a/src/libstd/os/fuchsia/fs.rs +++ b/src/libstd/os/fuchsia/fs.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![stable(feature = "metadata_ext", since = "1.1.0")] use fs::Metadata; diff --git a/src/libstd/os/fuchsia/mod.rs b/src/libstd/os/fuchsia/mod.rs index 1ebcbba9147e5..740eb011fb188 100644 --- a/src/libstd/os/fuchsia/mod.rs +++ b/src/libstd/os/fuchsia/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Fuchsia-specific definitions #![stable(feature = "raw_ext", since = "1.1.0")] diff --git a/src/libstd/os/fuchsia/raw.rs b/src/libstd/os/fuchsia/raw.rs index 5d017351492dd..b4a6bd3295c6b 100644 --- a/src/libstd/os/fuchsia/raw.rs +++ b/src/libstd/os/fuchsia/raw.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Fuchsia-specific raw type definitions #![stable(feature = "raw_ext", since = "1.1.0")] diff --git a/src/libstd/os/haiku/fs.rs b/src/libstd/os/haiku/fs.rs index 453136e0ac864..2ed1ca975d8b6 100644 --- a/src/libstd/os/haiku/fs.rs +++ b/src/libstd/os/haiku/fs.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![stable(feature = "metadata_ext", since = "1.1.0")] use libc; diff --git a/src/libstd/os/haiku/mod.rs b/src/libstd/os/haiku/mod.rs index dd1675cc9b51f..c6a43d9342d04 100644 --- a/src/libstd/os/haiku/mod.rs +++ b/src/libstd/os/haiku/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Haiku-specific definitions #![stable(feature = "raw_ext", since = "1.1.0")] diff --git a/src/libstd/os/haiku/raw.rs b/src/libstd/os/haiku/raw.rs index 95353d999f952..e6af8f29807cf 100644 --- a/src/libstd/os/haiku/raw.rs +++ b/src/libstd/os/haiku/raw.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Haiku-specific raw type definitions #![stable(feature = "raw_ext", since = "1.1.0")] diff --git a/src/libstd/os/hermit/fs.rs b/src/libstd/os/hermit/fs.rs index d2e751668a67b..b94324475e5ad 100644 --- a/src/libstd/os/hermit/fs.rs +++ b/src/libstd/os/hermit/fs.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![stable(feature = "metadata_ext", since = "1.1.0")] use libc; diff --git a/src/libstd/os/hermit/mod.rs b/src/libstd/os/hermit/mod.rs index fcb22cdad641f..4dee2a6d43397 100644 --- a/src/libstd/os/hermit/mod.rs +++ b/src/libstd/os/hermit/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! HermitCore-specific definitions #![stable(feature = "raw_ext", since = "1.1.0")] diff --git a/src/libstd/os/hermit/raw.rs b/src/libstd/os/hermit/raw.rs index 282afe0b6e1c0..0e232a808a097 100644 --- a/src/libstd/os/hermit/raw.rs +++ b/src/libstd/os/hermit/raw.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! HermitCore-specific raw type definitions #![stable(feature = "raw_ext", since = "1.1.0")] diff --git a/src/libstd/os/ios/fs.rs b/src/libstd/os/ios/fs.rs index 296ce69ff4362..7f0bdb80b20d6 100644 --- a/src/libstd/os/ios/fs.rs +++ b/src/libstd/os/ios/fs.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![stable(feature = "metadata_ext", since = "1.1.0")] use libc; diff --git a/src/libstd/os/ios/mod.rs b/src/libstd/os/ios/mod.rs index 4cad23389d02e..098473c0dc96a 100644 --- a/src/libstd/os/ios/mod.rs +++ b/src/libstd/os/ios/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! iOS-specific definitions #![stable(feature = "raw_ext", since = "1.1.0")] diff --git a/src/libstd/os/ios/raw.rs b/src/libstd/os/ios/raw.rs index 8b34a932a170a..1b528ce8c91b6 100644 --- a/src/libstd/os/ios/raw.rs +++ b/src/libstd/os/ios/raw.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! iOS-specific raw type definitions #![stable(feature = "raw_ext", since = "1.1.0")] diff --git a/src/libstd/os/linux/fs.rs b/src/libstd/os/linux/fs.rs index 76fb10da850b1..132a56a75b67f 100644 --- a/src/libstd/os/linux/fs.rs +++ b/src/libstd/os/linux/fs.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![stable(feature = "metadata_ext", since = "1.1.0")] use libc; diff --git a/src/libstd/os/linux/mod.rs b/src/libstd/os/linux/mod.rs index 8ec44b9fae497..3111325021a80 100644 --- a/src/libstd/os/linux/mod.rs +++ b/src/libstd/os/linux/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Linux-specific definitions #![stable(feature = "raw_ext", since = "1.1.0")] diff --git a/src/libstd/os/linux/raw.rs b/src/libstd/os/linux/raw.rs index bb1830a147e43..e5ab8a839cb7b 100644 --- a/src/libstd/os/linux/raw.rs +++ b/src/libstd/os/linux/raw.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Linux-specific raw type definitions #![stable(feature = "raw_ext", since = "1.1.0")] diff --git a/src/libstd/os/macos/fs.rs b/src/libstd/os/macos/fs.rs index 0b14c05cb5519..1227fc46fcdc1 100644 --- a/src/libstd/os/macos/fs.rs +++ b/src/libstd/os/macos/fs.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![stable(feature = "metadata_ext", since = "1.1.0")] use libc; diff --git a/src/libstd/os/macos/mod.rs b/src/libstd/os/macos/mod.rs index c9406f7310039..ce48d6e1cc296 100644 --- a/src/libstd/os/macos/mod.rs +++ b/src/libstd/os/macos/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! macOS-specific definitions #![stable(feature = "raw_ext", since = "1.1.0")] diff --git a/src/libstd/os/macos/raw.rs b/src/libstd/os/macos/raw.rs index 8ffddf638b10c..684cb891e0012 100644 --- a/src/libstd/os/macos/raw.rs +++ b/src/libstd/os/macos/raw.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! macOS-specific raw type definitions #![stable(feature = "raw_ext", since = "1.1.0")] diff --git a/src/libstd/os/mod.rs b/src/libstd/os/mod.rs index c384ec9168ac4..8c65c2980993c 100644 --- a/src/libstd/os/mod.rs +++ b/src/libstd/os/mod.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! OS-specific functionality. #![stable(feature = "os", since = "1.0.0")] diff --git a/src/libstd/os/netbsd/fs.rs b/src/libstd/os/netbsd/fs.rs index e9cad33fee61d..7022013e9dd29 100644 --- a/src/libstd/os/netbsd/fs.rs +++ b/src/libstd/os/netbsd/fs.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![stable(feature = "metadata_ext", since = "1.1.0")] use libc; diff --git a/src/libstd/os/netbsd/mod.rs b/src/libstd/os/netbsd/mod.rs index 06efbd83707d3..3746363979999 100644 --- a/src/libstd/os/netbsd/mod.rs +++ b/src/libstd/os/netbsd/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! OpenBSD-specific definitions #![stable(feature = "raw_ext", since = "1.1.0")] diff --git a/src/libstd/os/netbsd/raw.rs b/src/libstd/os/netbsd/raw.rs index 9b2e037e59a0b..f02bae801a24b 100644 --- a/src/libstd/os/netbsd/raw.rs +++ b/src/libstd/os/netbsd/raw.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! NetBSD-specific raw type definitions #![stable(feature = "raw_ext", since = "1.1.0")] diff --git a/src/libstd/os/openbsd/fs.rs b/src/libstd/os/openbsd/fs.rs index 0f6b83b6e324b..4d9749199f94d 100644 --- a/src/libstd/os/openbsd/fs.rs +++ b/src/libstd/os/openbsd/fs.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![stable(feature = "metadata_ext", since = "1.1.0")] use libc; diff --git a/src/libstd/os/openbsd/mod.rs b/src/libstd/os/openbsd/mod.rs index 06efbd83707d3..3746363979999 100644 --- a/src/libstd/os/openbsd/mod.rs +++ b/src/libstd/os/openbsd/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! OpenBSD-specific definitions #![stable(feature = "raw_ext", since = "1.1.0")] diff --git a/src/libstd/os/openbsd/raw.rs b/src/libstd/os/openbsd/raw.rs index 6142f03621813..27710ca6ce7b0 100644 --- a/src/libstd/os/openbsd/raw.rs +++ b/src/libstd/os/openbsd/raw.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! OpenBSD-specific raw type definitions #![stable(feature = "raw_ext", since = "1.1.0")] diff --git a/src/libstd/os/raw/mod.rs b/src/libstd/os/raw/mod.rs index dc33747c05b06..7cfbd48ac2cb4 100644 --- a/src/libstd/os/raw/mod.rs +++ b/src/libstd/os/raw/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Platform-specific types, as defined by C. //! //! Code that interacts via FFI will almost certainly be using the diff --git a/src/libstd/os/solaris/fs.rs b/src/libstd/os/solaris/fs.rs index 19dce1ba34c76..f2f89b5dd8bcc 100644 --- a/src/libstd/os/solaris/fs.rs +++ b/src/libstd/os/solaris/fs.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![stable(feature = "metadata_ext", since = "1.1.0")] use libc; diff --git a/src/libstd/os/solaris/mod.rs b/src/libstd/os/solaris/mod.rs index 1e0166947bf5c..7f560c9b09332 100644 --- a/src/libstd/os/solaris/mod.rs +++ b/src/libstd/os/solaris/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Solaris-specific definitions #![stable(feature = "raw_ext", since = "1.1.0")] diff --git a/src/libstd/os/solaris/raw.rs b/src/libstd/os/solaris/raw.rs index 5a813c5c76bca..3c2c063ca41ee 100644 --- a/src/libstd/os/solaris/raw.rs +++ b/src/libstd/os/solaris/raw.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Solaris-specific raw type definitions #![stable(feature = "raw_ext", since = "1.1.0")] diff --git a/src/libstd/panic.rs b/src/libstd/panic.rs index b8c1c4f9e68e7..a9bbe381e6208 100644 --- a/src/libstd/panic.rs +++ b/src/libstd/panic.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Panic support in the standard library. #![stable(feature = "std_panic", since = "1.9.0")] diff --git a/src/libstd/panicking.rs b/src/libstd/panicking.rs index 862f0fd71b0a3..18e92de272b38 100644 --- a/src/libstd/panicking.rs +++ b/src/libstd/panicking.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Implementation of various bits and pieces of the `panic!` macro and //! associated runtime pieces. //! diff --git a/src/libstd/path.rs b/src/libstd/path.rs index ca8be75fab5be..b0c0c36fa0d4e 100644 --- a/src/libstd/path.rs +++ b/src/libstd/path.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Cross-platform path manipulation. //! //! This module provides two types, [`PathBuf`] and [`Path`][`Path`] (akin to [`String`] diff --git a/src/libstd/prelude/mod.rs b/src/libstd/prelude/mod.rs index 919e033f2b4bd..ec8318f3728eb 100644 --- a/src/libstd/prelude/mod.rs +++ b/src/libstd/prelude/mod.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The Rust Prelude. //! //! Rust comes with a variety of things in its standard library. However, if diff --git a/src/libstd/prelude/v1.rs b/src/libstd/prelude/v1.rs index 53763da5e2886..0c3b164f65421 100644 --- a/src/libstd/prelude/v1.rs +++ b/src/libstd/prelude/v1.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The first version of the prelude of The Rust Standard Library. //! //! See the [module-level documentation](../index.html) for more. diff --git a/src/libstd/primitive_docs.rs b/src/libstd/primitive_docs.rs index 7074928eaf6da..2218967bba992 100644 --- a/src/libstd/primitive_docs.rs +++ b/src/libstd/primitive_docs.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[doc(primitive = "bool")] #[doc(alias = "true")] #[doc(alias = "false")] diff --git a/src/libstd/process.rs b/src/libstd/process.rs index 53babd449a992..b0642abed0950 100644 --- a/src/libstd/process.rs +++ b/src/libstd/process.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A module for working with processes. //! //! This module is mostly concerned with spawning and interacting with child diff --git a/src/libstd/rt.rs b/src/libstd/rt.rs index 9e957bd87d79e..a4beb72be576c 100644 --- a/src/libstd/rt.rs +++ b/src/libstd/rt.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Runtime services //! //! The `rt` module provides a narrow set of runtime services, diff --git a/src/libstd/sync/barrier.rs b/src/libstd/sync/barrier.rs index 273c7c1c54a2a..f248c721e9ad2 100644 --- a/src/libstd/sync/barrier.rs +++ b/src/libstd/sync/barrier.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use fmt; use sync::{Mutex, Condvar}; diff --git a/src/libstd/sync/condvar.rs b/src/libstd/sync/condvar.rs index 3014283da5b27..7688737910676 100644 --- a/src/libstd/sync/condvar.rs +++ b/src/libstd/sync/condvar.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use fmt; use sync::atomic::{AtomicUsize, Ordering}; use sync::{mutex, MutexGuard, PoisonError}; diff --git a/src/libstd/sync/mod.rs b/src/libstd/sync/mod.rs index e12ef8d9eda2d..e8442d85da574 100644 --- a/src/libstd/sync/mod.rs +++ b/src/libstd/sync/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Useful synchronization primitives. //! //! This module contains useful safe and unsafe synchronization primitives. diff --git a/src/libstd/sync/mpsc/blocking.rs b/src/libstd/sync/mpsc/blocking.rs index c08bd6d133d06..ae5a18adbb3c0 100644 --- a/src/libstd/sync/mpsc/blocking.rs +++ b/src/libstd/sync/mpsc/blocking.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Generic support for building blocking abstractions. use thread::{self, Thread}; diff --git a/src/libstd/sync/mpsc/cache_aligned.rs b/src/libstd/sync/mpsc/cache_aligned.rs index 5af01262573f3..fb1177e03506c 100644 --- a/src/libstd/sync/mpsc/cache_aligned.rs +++ b/src/libstd/sync/mpsc/cache_aligned.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use ops::{Deref, DerefMut}; #[derive(Copy, Clone, Default, PartialEq, Eq, PartialOrd, Ord, Hash)] diff --git a/src/libstd/sync/mpsc/mod.rs b/src/libstd/sync/mpsc/mod.rs index 59cf741487e44..a61a6c40885fe 100644 --- a/src/libstd/sync/mpsc/mod.rs +++ b/src/libstd/sync/mpsc/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Multi-producer, single-consumer FIFO queue communication primitives. //! //! This module provides message-based communication over channels, concretely diff --git a/src/libstd/sync/mpsc/mpsc_queue.rs b/src/libstd/sync/mpsc/mpsc_queue.rs index df945ac3859f9..794d11f1eac99 100644 --- a/src/libstd/sync/mpsc/mpsc_queue.rs +++ b/src/libstd/sync/mpsc/mpsc_queue.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A mostly lock-free multi-producer, single consumer queue. //! //! This module contains an implementation of a concurrent MPSC queue. This diff --git a/src/libstd/sync/mpsc/oneshot.rs b/src/libstd/sync/mpsc/oneshot.rs index b8e50c9297b64..36928c428e331 100644 --- a/src/libstd/sync/mpsc/oneshot.rs +++ b/src/libstd/sync/mpsc/oneshot.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// Oneshot channels/ports /// /// This is the initial flavor of channels/ports used for comm module. This is diff --git a/src/libstd/sync/mpsc/select.rs b/src/libstd/sync/mpsc/select.rs index a7a284cfb7994..355b719b8b947 100644 --- a/src/libstd/sync/mpsc/select.rs +++ b/src/libstd/sync/mpsc/select.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Selection over an array of receivers //! //! This module contains the implementation machinery necessary for selecting diff --git a/src/libstd/sync/mpsc/shared.rs b/src/libstd/sync/mpsc/shared.rs index f9e0290416432..af538b75b701d 100644 --- a/src/libstd/sync/mpsc/shared.rs +++ b/src/libstd/sync/mpsc/shared.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// Shared channels /// /// This is the flavor of channels which are not necessarily optimized for any diff --git a/src/libstd/sync/mpsc/spsc_queue.rs b/src/libstd/sync/mpsc/spsc_queue.rs index 9482f6958b311..b43ccf074a427 100644 --- a/src/libstd/sync/mpsc/spsc_queue.rs +++ b/src/libstd/sync/mpsc/spsc_queue.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A single-producer single-consumer concurrent queue //! //! This module contains the implementation of an SPSC queue which can be used diff --git a/src/libstd/sync/mpsc/stream.rs b/src/libstd/sync/mpsc/stream.rs index d1515eba68c3e..5c68930bf4730 100644 --- a/src/libstd/sync/mpsc/stream.rs +++ b/src/libstd/sync/mpsc/stream.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// Stream channels /// /// This is the flavor of channels which are optimized for one sender and one diff --git a/src/libstd/sync/mpsc/sync.rs b/src/libstd/sync/mpsc/sync.rs index 90f12c826d68e..1430fd53d2def 100644 --- a/src/libstd/sync/mpsc/sync.rs +++ b/src/libstd/sync/mpsc/sync.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// Synchronous channels/ports /// /// This channel implementation differs significantly from the asynchronous diff --git a/src/libstd/sync/mutex.rs b/src/libstd/sync/mutex.rs index e5a410644b907..cb34433d00254 100644 --- a/src/libstd/sync/mutex.rs +++ b/src/libstd/sync/mutex.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use cell::UnsafeCell; use fmt; use mem; diff --git a/src/libstd/sync/once.rs b/src/libstd/sync/once.rs index f258ff073e2a7..b912778028f3a 100644 --- a/src/libstd/sync/once.rs +++ b/src/libstd/sync/once.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A "once initialization" primitive //! //! This primitive is meant to be used to run one-time initialization. An diff --git a/src/libstd/sync/rwlock.rs b/src/libstd/sync/rwlock.rs index e3db60cff8474..3782f3ade3207 100644 --- a/src/libstd/sync/rwlock.rs +++ b/src/libstd/sync/rwlock.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use cell::UnsafeCell; use fmt; use mem; diff --git a/src/libstd/sys/cloudabi/abi/mod.rs b/src/libstd/sys/cloudabi/abi/mod.rs index 81a4d29342301..9d01d24ea830d 100644 --- a/src/libstd/sys/cloudabi/abi/mod.rs +++ b/src/libstd/sys/cloudabi/abi/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[allow(warnings)] mod cloudabi; pub use self::cloudabi::*; diff --git a/src/libstd/sys/cloudabi/args.rs b/src/libstd/sys/cloudabi/args.rs index 7b62cc6adc984..4147ffff87113 100644 --- a/src/libstd/sys/cloudabi/args.rs +++ b/src/libstd/sys/cloudabi/args.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub use sys::cloudabi::shims::args::*; #[allow(dead_code)] diff --git a/src/libstd/sys/cloudabi/backtrace.rs b/src/libstd/sys/cloudabi/backtrace.rs index 2c43b5937ce5a..72f28550435a1 100644 --- a/src/libstd/sys/cloudabi/backtrace.rs +++ b/src/libstd/sys/cloudabi/backtrace.rs @@ -1,13 +1,3 @@ -// Copyright 2014-2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use error::Error; use ffi::CStr; use intrinsics; diff --git a/src/libstd/sys/cloudabi/condvar.rs b/src/libstd/sys/cloudabi/condvar.rs index c05c837ade274..79c498a4eaf18 100644 --- a/src/libstd/sys/cloudabi/condvar.rs +++ b/src/libstd/sys/cloudabi/condvar.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use cell::UnsafeCell; use mem; use sync::atomic::{AtomicU32, Ordering}; diff --git a/src/libstd/sys/cloudabi/mod.rs b/src/libstd/sys/cloudabi/mod.rs index 9e943c17fc85f..449880c623b92 100644 --- a/src/libstd/sys/cloudabi/mod.rs +++ b/src/libstd/sys/cloudabi/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use io; use libc; use mem; diff --git a/src/libstd/sys/cloudabi/mutex.rs b/src/libstd/sys/cloudabi/mutex.rs index d4ba6bcfc8062..ae62d8bfdb0c2 100644 --- a/src/libstd/sys/cloudabi/mutex.rs +++ b/src/libstd/sys/cloudabi/mutex.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use cell::UnsafeCell; use mem; use sync::atomic::{AtomicU32, Ordering}; diff --git a/src/libstd/sys/cloudabi/os.rs b/src/libstd/sys/cloudabi/os.rs index 7e506b84df1ce..8a6464125de68 100644 --- a/src/libstd/sys/cloudabi/os.rs +++ b/src/libstd/sys/cloudabi/os.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use ffi::CStr; use libc::{self, c_int}; use str; diff --git a/src/libstd/sys/cloudabi/rwlock.rs b/src/libstd/sys/cloudabi/rwlock.rs index 8539aec5e2c07..b9a981ecc045b 100644 --- a/src/libstd/sys/cloudabi/rwlock.rs +++ b/src/libstd/sys/cloudabi/rwlock.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use cell::UnsafeCell; use mem; use sync::atomic::{AtomicU32, Ordering}; diff --git a/src/libstd/sys/cloudabi/shims/args.rs b/src/libstd/sys/cloudabi/shims/args.rs index 1b5785adc8ab3..f924a434263f4 100644 --- a/src/libstd/sys/cloudabi/shims/args.rs +++ b/src/libstd/sys/cloudabi/shims/args.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use ffi::OsString; pub struct Args(()); diff --git a/src/libstd/sys/cloudabi/shims/env.rs b/src/libstd/sys/cloudabi/shims/env.rs index 31777aa94bcd4..e9f2cc91919f2 100644 --- a/src/libstd/sys/cloudabi/shims/env.rs +++ b/src/libstd/sys/cloudabi/shims/env.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod os { pub const FAMILY: &'static str = "cloudabi"; pub const OS: &'static str = "cloudabi"; diff --git a/src/libstd/sys/cloudabi/shims/fs.rs b/src/libstd/sys/cloudabi/shims/fs.rs index d3da0fbc37192..3af10a74c7d45 100644 --- a/src/libstd/sys/cloudabi/shims/fs.rs +++ b/src/libstd/sys/cloudabi/shims/fs.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use ffi::OsString; use fmt; use hash::{Hash, Hasher}; diff --git a/src/libstd/sys/cloudabi/shims/mod.rs b/src/libstd/sys/cloudabi/shims/mod.rs index 407c2b90511d3..080eac19ceb0b 100644 --- a/src/libstd/sys/cloudabi/shims/mod.rs +++ b/src/libstd/sys/cloudabi/shims/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use io; pub mod args; diff --git a/src/libstd/sys/cloudabi/shims/net.rs b/src/libstd/sys/cloudabi/shims/net.rs index 93eaf6a9e7d69..da733e599168a 100644 --- a/src/libstd/sys/cloudabi/shims/net.rs +++ b/src/libstd/sys/cloudabi/shims/net.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use fmt; use io; use net::{Ipv4Addr, Ipv6Addr, Shutdown, SocketAddr}; diff --git a/src/libstd/sys/cloudabi/shims/os.rs b/src/libstd/sys/cloudabi/shims/os.rs index 1e355d9ad042e..31cb18ea5268b 100644 --- a/src/libstd/sys/cloudabi/shims/os.rs +++ b/src/libstd/sys/cloudabi/shims/os.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use error::Error as StdError; use ffi::{OsStr, OsString}; use fmt; diff --git a/src/libstd/sys/cloudabi/shims/pipe.rs b/src/libstd/sys/cloudabi/shims/pipe.rs index 77a9cd6259005..30ef79dd769b4 100644 --- a/src/libstd/sys/cloudabi/shims/pipe.rs +++ b/src/libstd/sys/cloudabi/shims/pipe.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use io; use sys::Void; diff --git a/src/libstd/sys/cloudabi/shims/process.rs b/src/libstd/sys/cloudabi/shims/process.rs index fcd40c15c1708..49b9d5e266ec4 100644 --- a/src/libstd/sys/cloudabi/shims/process.rs +++ b/src/libstd/sys/cloudabi/shims/process.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use ffi::OsStr; use fmt; use io; diff --git a/src/libstd/sys/cloudabi/stack_overflow.rs b/src/libstd/sys/cloudabi/stack_overflow.rs index 5c0b1e5671e1b..e97831b2c2855 100644 --- a/src/libstd/sys/cloudabi/stack_overflow.rs +++ b/src/libstd/sys/cloudabi/stack_overflow.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![cfg_attr(test, allow(dead_code))] pub struct Handler; diff --git a/src/libstd/sys/cloudabi/stdio.rs b/src/libstd/sys/cloudabi/stdio.rs index 1d7344f921c9d..78a0b448542cb 100644 --- a/src/libstd/sys/cloudabi/stdio.rs +++ b/src/libstd/sys/cloudabi/stdio.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use io; use sys::cloudabi::abi; diff --git a/src/libstd/sys/cloudabi/thread.rs b/src/libstd/sys/cloudabi/thread.rs index 8cca47efd22d1..db7b7af1f9181 100644 --- a/src/libstd/sys/cloudabi/thread.rs +++ b/src/libstd/sys/cloudabi/thread.rs @@ -1,13 +1,3 @@ -// Copyright 2014-2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use boxed::FnBox; use cmp; use ffi::CStr; diff --git a/src/libstd/sys/cloudabi/time.rs b/src/libstd/sys/cloudabi/time.rs index ee12731619aac..659fbdb22c07d 100644 --- a/src/libstd/sys/cloudabi/time.rs +++ b/src/libstd/sys/cloudabi/time.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use mem; use sys::cloudabi::abi; use time::Duration; diff --git a/src/libstd/sys/mod.rs b/src/libstd/sys/mod.rs index c44db3b107224..21c48955bf122 100644 --- a/src/libstd/sys/mod.rs +++ b/src/libstd/sys/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Platform-dependent platform abstraction //! //! The `std::sys` module is the abstracted interface through which diff --git a/src/libstd/sys/redox/args.rs b/src/libstd/sys/redox/args.rs index 556ed77372e69..2e45677453d42 100644 --- a/src/libstd/sys/redox/args.rs +++ b/src/libstd/sys/redox/args.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Global initialization and retrieval of command line arguments. //! //! On some platforms these are stored during runtime startup, diff --git a/src/libstd/sys/redox/backtrace/mod.rs b/src/libstd/sys/redox/backtrace/mod.rs index 40b957d847b0f..9a007241073c4 100644 --- a/src/libstd/sys/redox/backtrace/mod.rs +++ b/src/libstd/sys/redox/backtrace/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// See sys/unix/backtrace/mod.rs for an explanation of the method used here. pub use self::tracing::unwind_backtrace; diff --git a/src/libstd/sys/redox/backtrace/printing.rs b/src/libstd/sys/redox/backtrace/printing.rs index 3e937dbe623e7..c50c7154f0cd2 100644 --- a/src/libstd/sys/redox/backtrace/printing.rs +++ b/src/libstd/sys/redox/backtrace/printing.rs @@ -1,11 +1 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub use sys_common::gnu::libbacktrace::{foreach_symbol_fileline, resolve_symname}; diff --git a/src/libstd/sys/redox/backtrace/tracing.rs b/src/libstd/sys/redox/backtrace/tracing.rs index c0414b78f8d66..59a8c5fab3d44 100644 --- a/src/libstd/sys/redox/backtrace/tracing.rs +++ b/src/libstd/sys/redox/backtrace/tracing.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use error::Error; use io; use libc; diff --git a/src/libstd/sys/redox/cmath.rs b/src/libstd/sys/redox/cmath.rs index 2bc96651b0c84..f6bb58934fc05 100644 --- a/src/libstd/sys/redox/cmath.rs +++ b/src/libstd/sys/redox/cmath.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![cfg(not(test))] use libc::{c_float, c_double}; diff --git a/src/libstd/sys/redox/condvar.rs b/src/libstd/sys/redox/condvar.rs index 2a611ed7dabbe..5f9eee588c33e 100644 --- a/src/libstd/sys/redox/condvar.rs +++ b/src/libstd/sys/redox/condvar.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use cell::UnsafeCell; use intrinsics::{atomic_cxchg, atomic_load, atomic_xadd, atomic_xchg}; use ptr; diff --git a/src/libstd/sys/redox/env.rs b/src/libstd/sys/redox/env.rs index 669b7520df846..77816cf781191 100644 --- a/src/libstd/sys/redox/env.rs +++ b/src/libstd/sys/redox/env.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod os { pub const FAMILY: &'static str = "redox"; pub const OS: &'static str = "redox"; diff --git a/src/libstd/sys/redox/ext/ffi.rs b/src/libstd/sys/redox/ext/ffi.rs index cd88c8f46b3c0..848880d26e89e 100644 --- a/src/libstd/sys/redox/ext/ffi.rs +++ b/src/libstd/sys/redox/ext/ffi.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Redox-specific extension to the primitives in the `std::ffi` module. #![stable(feature = "rust1", since = "1.0.0")] diff --git a/src/libstd/sys/redox/ext/fs.rs b/src/libstd/sys/redox/ext/fs.rs index c1dba6edda484..04edfd6851dde 100644 --- a/src/libstd/sys/redox/ext/fs.rs +++ b/src/libstd/sys/redox/ext/fs.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Redox-specific extensions to primitives in the `std::fs` module. #![stable(feature = "rust1", since = "1.0.0")] diff --git a/src/libstd/sys/redox/ext/io.rs b/src/libstd/sys/redox/ext/io.rs index c4d99568c55c7..3ee0c6010a7ad 100644 --- a/src/libstd/sys/redox/ext/io.rs +++ b/src/libstd/sys/redox/ext/io.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Unix-specific extensions to general I/O primitives #![stable(feature = "rust1", since = "1.0.0")] diff --git a/src/libstd/sys/redox/ext/mod.rs b/src/libstd/sys/redox/ext/mod.rs index cb2c75ae0bfa8..8a2d243c7ff62 100644 --- a/src/libstd/sys/redox/ext/mod.rs +++ b/src/libstd/sys/redox/ext/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Experimental extensions to `std` for Unix platforms. //! //! For now, this module is limited to extracting file descriptors, diff --git a/src/libstd/sys/redox/ext/net.rs b/src/libstd/sys/redox/ext/net.rs index 2ab7770324254..76c68829b7f1b 100644 --- a/src/libstd/sys/redox/ext/net.rs +++ b/src/libstd/sys/redox/ext/net.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![stable(feature = "unix_socket_redox", since = "1.29")] //! Unix-specific networking functionality diff --git a/src/libstd/sys/redox/ext/process.rs b/src/libstd/sys/redox/ext/process.rs index cfb6d5fc703a6..941fba8755b4a 100644 --- a/src/libstd/sys/redox/ext/process.rs +++ b/src/libstd/sys/redox/ext/process.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Redox-specific extensions to primitives in the `std::process` module. #![stable(feature = "rust1", since = "1.0.0")] diff --git a/src/libstd/sys/redox/ext/thread.rs b/src/libstd/sys/redox/ext/thread.rs index 71ff0d46b91e3..21b140ad718ac 100644 --- a/src/libstd/sys/redox/ext/thread.rs +++ b/src/libstd/sys/redox/ext/thread.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Redox-specific extensions to primitives in the `std::thread` module. #![stable(feature = "thread_extensions", since = "1.9.0")] diff --git a/src/libstd/sys/redox/fast_thread_local.rs b/src/libstd/sys/redox/fast_thread_local.rs index 6a007e98827b6..95263e6f5e312 100644 --- a/src/libstd/sys/redox/fast_thread_local.rs +++ b/src/libstd/sys/redox/fast_thread_local.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![cfg(target_thread_local)] #![unstable(feature = "thread_local_internals", issue = "0")] diff --git a/src/libstd/sys/redox/fd.rs b/src/libstd/sys/redox/fd.rs index e04e2791b23a1..8b27c6b397f7a 100644 --- a/src/libstd/sys/redox/fd.rs +++ b/src/libstd/sys/redox/fd.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![unstable(reason = "not public", issue = "0", feature = "fd")] use io::{self, Read}; diff --git a/src/libstd/sys/redox/fs.rs b/src/libstd/sys/redox/fs.rs index 2e2216186f1e6..b52a8e940b42c 100644 --- a/src/libstd/sys/redox/fs.rs +++ b/src/libstd/sys/redox/fs.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use os::unix::prelude::*; use ffi::{OsString, OsStr}; diff --git a/src/libstd/sys/redox/memchr.rs b/src/libstd/sys/redox/memchr.rs index 873b33535025b..409d3a7a85565 100644 --- a/src/libstd/sys/redox/memchr.rs +++ b/src/libstd/sys/redox/memchr.rs @@ -1,12 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // Original implementation taken from rust-memchr // Copyright 2015 Andrew Gallant, bluss and Nicolas Koch diff --git a/src/libstd/sys/redox/mod.rs b/src/libstd/sys/redox/mod.rs index 4352b72c30773..24d47a65c6784 100644 --- a/src/libstd/sys/redox/mod.rs +++ b/src/libstd/sys/redox/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code, missing_docs, bad_style)] use io::{self, ErrorKind}; diff --git a/src/libstd/sys/redox/mutex.rs b/src/libstd/sys/redox/mutex.rs index a995f597fc46a..42424da858fbc 100644 --- a/src/libstd/sys/redox/mutex.rs +++ b/src/libstd/sys/redox/mutex.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use cell::UnsafeCell; use intrinsics::{atomic_cxchg, atomic_xchg}; use ptr; diff --git a/src/libstd/sys/redox/net/dns/answer.rs b/src/libstd/sys/redox/net/dns/answer.rs index 8e6aaeb0293ad..c0450c11ed6b9 100644 --- a/src/libstd/sys/redox/net/dns/answer.rs +++ b/src/libstd/sys/redox/net/dns/answer.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use string::String; use vec::Vec; diff --git a/src/libstd/sys/redox/net/dns/mod.rs b/src/libstd/sys/redox/net/dns/mod.rs index 1a26257e4a7e2..8f0a0610af5e3 100644 --- a/src/libstd/sys/redox/net/dns/mod.rs +++ b/src/libstd/sys/redox/net/dns/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub use self::answer::DnsAnswer; pub use self::query::DnsQuery; diff --git a/src/libstd/sys/redox/net/dns/query.rs b/src/libstd/sys/redox/net/dns/query.rs index b0dcdcb624abd..dcb554d82debb 100644 --- a/src/libstd/sys/redox/net/dns/query.rs +++ b/src/libstd/sys/redox/net/dns/query.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use string::String; #[derive(Clone, Debug)] diff --git a/src/libstd/sys/redox/net/mod.rs b/src/libstd/sys/redox/net/mod.rs index 67f22231d5f75..d2af3afb0e027 100644 --- a/src/libstd/sys/redox/net/mod.rs +++ b/src/libstd/sys/redox/net/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use fs::File; use io::{Error, Result, Read}; use iter::Iterator; diff --git a/src/libstd/sys/redox/net/netc.rs b/src/libstd/sys/redox/net/netc.rs index b6d9f4562953a..420a15a4063f3 100644 --- a/src/libstd/sys/redox/net/netc.rs +++ b/src/libstd/sys/redox/net/netc.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub type in_addr_t = u32; pub type in_port_t = u16; diff --git a/src/libstd/sys/redox/net/tcp.rs b/src/libstd/sys/redox/net/tcp.rs index b5664908479cf..0364d81d738ac 100644 --- a/src/libstd/sys/redox/net/tcp.rs +++ b/src/libstd/sys/redox/net/tcp.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use cmp; use io::{self, Error, ErrorKind, Result}; use mem; diff --git a/src/libstd/sys/redox/net/udp.rs b/src/libstd/sys/redox/net/udp.rs index 22af02079e796..e768902af53d4 100644 --- a/src/libstd/sys/redox/net/udp.rs +++ b/src/libstd/sys/redox/net/udp.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use cell::UnsafeCell; use cmp; use io::{self, Error, ErrorKind, Result}; diff --git a/src/libstd/sys/redox/os.rs b/src/libstd/sys/redox/os.rs index 5822216779b6e..a519310703975 100644 --- a/src/libstd/sys/redox/os.rs +++ b/src/libstd/sys/redox/os.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Implementation of `std::os` functionality for unix systems #![allow(unused_imports)] // lots of cfg code here diff --git a/src/libstd/sys/redox/os_str.rs b/src/libstd/sys/redox/os_str.rs index eb3a1ead58c94..9d5e084feb2d6 100644 --- a/src/libstd/sys/redox/os_str.rs +++ b/src/libstd/sys/redox/os_str.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// The underlying OsString/OsStr implementation on Unix systems: just /// a `Vec`/`[u8]`. diff --git a/src/libstd/sys/redox/path.rs b/src/libstd/sys/redox/path.rs index e6a267dd5d913..8e60b7f59549a 100644 --- a/src/libstd/sys/redox/path.rs +++ b/src/libstd/sys/redox/path.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use ffi::OsStr; use path::Prefix; diff --git a/src/libstd/sys/redox/pipe.rs b/src/libstd/sys/redox/pipe.rs index 28645facd93f8..9e40eadb2370e 100644 --- a/src/libstd/sys/redox/pipe.rs +++ b/src/libstd/sys/redox/pipe.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use io; use sys::{cvt, syscall}; use sys::fd::FileDesc; diff --git a/src/libstd/sys/redox/process.rs b/src/libstd/sys/redox/process.rs index 2037616e6ac7c..c5d8e52efc297 100644 --- a/src/libstd/sys/redox/process.rs +++ b/src/libstd/sys/redox/process.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use env::{split_paths}; use ffi::OsStr; use os::unix::ffi::OsStrExt; diff --git a/src/libstd/sys/redox/rand.rs b/src/libstd/sys/redox/rand.rs index 3b378f53429ed..5b58d1782bf0a 100644 --- a/src/libstd/sys/redox/rand.rs +++ b/src/libstd/sys/redox/rand.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn hashmap_random_keys() -> (u64, u64) { (0, 0) } diff --git a/src/libstd/sys/redox/rwlock.rs b/src/libstd/sys/redox/rwlock.rs index d74b614ba47de..990e7551114bb 100644 --- a/src/libstd/sys/redox/rwlock.rs +++ b/src/libstd/sys/redox/rwlock.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::mutex::Mutex; pub struct RWLock { diff --git a/src/libstd/sys/redox/stack_overflow.rs b/src/libstd/sys/redox/stack_overflow.rs index 760fe06c57faf..cf01d323d45db 100644 --- a/src/libstd/sys/redox/stack_overflow.rs +++ b/src/libstd/sys/redox/stack_overflow.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![cfg_attr(test, allow(dead_code))] pub struct Handler; diff --git a/src/libstd/sys/redox/stdio.rs b/src/libstd/sys/redox/stdio.rs index 7a4d11b0ecb9a..416b5a31f4cc1 100644 --- a/src/libstd/sys/redox/stdio.rs +++ b/src/libstd/sys/redox/stdio.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use io; use sys::{cvt, syscall}; use sys::fd::FileDesc; diff --git a/src/libstd/sys/redox/syscall/arch/arm.rs b/src/libstd/sys/redox/syscall/arch/arm.rs index 9fb3961486df2..e640f7ed37631 100644 --- a/src/libstd/sys/redox/syscall/arch/arm.rs +++ b/src/libstd/sys/redox/syscall/arch/arm.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::error::{Error, Result}; pub unsafe fn syscall0(mut a: usize) -> Result { diff --git a/src/libstd/sys/redox/syscall/arch/x86.rs b/src/libstd/sys/redox/syscall/arch/x86.rs index 724a6b927f43a..0cd6409bb06f8 100644 --- a/src/libstd/sys/redox/syscall/arch/x86.rs +++ b/src/libstd/sys/redox/syscall/arch/x86.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::error::{Error, Result}; pub unsafe fn syscall0(mut a: usize) -> Result { diff --git a/src/libstd/sys/redox/syscall/arch/x86_64.rs b/src/libstd/sys/redox/syscall/arch/x86_64.rs index a321c31f207d0..52ad01bd4a8cf 100644 --- a/src/libstd/sys/redox/syscall/arch/x86_64.rs +++ b/src/libstd/sys/redox/syscall/arch/x86_64.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::error::{Error, Result}; pub unsafe fn syscall0(mut a: usize) -> Result { diff --git a/src/libstd/sys/redox/syscall/call.rs b/src/libstd/sys/redox/syscall/call.rs index f9a8bd61ac800..1eb74da03d440 100644 --- a/src/libstd/sys/redox/syscall/call.rs +++ b/src/libstd/sys/redox/syscall/call.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::arch::*; use super::data::{SigAction, Stat, StatVfs, TimeSpec}; use super::error::Result; diff --git a/src/libstd/sys/redox/syscall/data.rs b/src/libstd/sys/redox/syscall/data.rs index 2e784ebc8a5c5..0b458ea89b87f 100644 --- a/src/libstd/sys/redox/syscall/data.rs +++ b/src/libstd/sys/redox/syscall/data.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use core::ops::{Deref, DerefMut}; use core::{mem, slice}; diff --git a/src/libstd/sys/redox/syscall/error.rs b/src/libstd/sys/redox/syscall/error.rs index 1ef79547431f8..b5ae5e2d61fb1 100644 --- a/src/libstd/sys/redox/syscall/error.rs +++ b/src/libstd/sys/redox/syscall/error.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use core::{fmt, result}; #[derive(Eq, PartialEq)] diff --git a/src/libstd/sys/redox/syscall/flag.rs b/src/libstd/sys/redox/syscall/flag.rs index 0f61b9fa77b52..6cb22bc65e0e4 100644 --- a/src/libstd/sys/redox/syscall/flag.rs +++ b/src/libstd/sys/redox/syscall/flag.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub const CLONE_VM: usize = 0x100; pub const CLONE_FS: usize = 0x200; pub const CLONE_FILES: usize = 0x400; diff --git a/src/libstd/sys/redox/syscall/mod.rs b/src/libstd/sys/redox/syscall/mod.rs index ce789c269a7e0..b16f5dbd918e8 100644 --- a/src/libstd/sys/redox/syscall/mod.rs +++ b/src/libstd/sys/redox/syscall/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub use self::arch::*; pub use self::call::*; pub use self::data::*; diff --git a/src/libstd/sys/redox/syscall/number.rs b/src/libstd/sys/redox/syscall/number.rs index 45cb40e390840..1720e56eda6dd 100644 --- a/src/libstd/sys/redox/syscall/number.rs +++ b/src/libstd/sys/redox/syscall/number.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub const SYS_CLASS: usize = 0xF000_0000; pub const SYS_CLASS_PATH: usize=0x1000_0000; pub const SYS_CLASS_FILE: usize=0x2000_0000; diff --git a/src/libstd/sys/redox/thread.rs b/src/libstd/sys/redox/thread.rs index f4177087d77a1..c57897931159e 100644 --- a/src/libstd/sys/redox/thread.rs +++ b/src/libstd/sys/redox/thread.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use boxed::FnBox; use ffi::CStr; use io; diff --git a/src/libstd/sys/redox/thread_local.rs b/src/libstd/sys/redox/thread_local.rs index cacd84e21025f..a1c4b10e45063 100644 --- a/src/libstd/sys/redox/thread_local.rs +++ b/src/libstd/sys/redox/thread_local.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] // not used on all platforms use collections::BTreeMap; diff --git a/src/libstd/sys/redox/time.rs b/src/libstd/sys/redox/time.rs index 5c491115c5516..dafc9a799bab0 100644 --- a/src/libstd/sys/redox/time.rs +++ b/src/libstd/sys/redox/time.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use cmp::Ordering; use fmt; use sys::{cvt, syscall}; diff --git a/src/libstd/sys/unix/android.rs b/src/libstd/sys/unix/android.rs index 10436723a81d0..7be49ed023078 100644 --- a/src/libstd/sys/unix/android.rs +++ b/src/libstd/sys/unix/android.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Android ABI-compatibility module //! //! The ABI of Android has changed quite a bit over time, and libstd attempts to diff --git a/src/libstd/sys/unix/args.rs b/src/libstd/sys/unix/args.rs index c3c033dfbc739..db1c5f4fea54c 100644 --- a/src/libstd/sys/unix/args.rs +++ b/src/libstd/sys/unix/args.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Global initialization and retrieval of command line arguments. //! //! On some platforms these are stored during runtime startup, diff --git a/src/libstd/sys/unix/backtrace/mod.rs b/src/libstd/sys/unix/backtrace/mod.rs index b5bf20c747be6..79c3e39d8f8dd 100644 --- a/src/libstd/sys/unix/backtrace/mod.rs +++ b/src/libstd/sys/unix/backtrace/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// Backtrace support built on libgcc with some extra OS-specific support /// /// Some methods of getting a backtrace: diff --git a/src/libstd/sys/unix/backtrace/printing/dladdr.rs b/src/libstd/sys/unix/backtrace/printing/dladdr.rs index bc56fd6594ea6..09715db8c1a34 100644 --- a/src/libstd/sys/unix/backtrace/printing/dladdr.rs +++ b/src/libstd/sys/unix/backtrace/printing/dladdr.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use io; use intrinsics; use ffi::CStr; diff --git a/src/libstd/sys/unix/backtrace/printing/mod.rs b/src/libstd/sys/unix/backtrace/printing/mod.rs index caa60712b1d58..d0303e6995f8b 100644 --- a/src/libstd/sys/unix/backtrace/printing/mod.rs +++ b/src/libstd/sys/unix/backtrace/printing/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2014-2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod dladdr; use sys::backtrace::BacktraceContext; diff --git a/src/libstd/sys/unix/backtrace/tracing/backtrace_fn.rs b/src/libstd/sys/unix/backtrace/tracing/backtrace_fn.rs index 6293eeb4ed649..236762c5eb5df 100644 --- a/src/libstd/sys/unix/backtrace/tracing/backtrace_fn.rs +++ b/src/libstd/sys/unix/backtrace/tracing/backtrace_fn.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// As always - iOS on arm uses SjLj exceptions and /// _Unwind_Backtrace is even not available there. Still, /// backtraces could be extracted using a backtrace function, diff --git a/src/libstd/sys/unix/backtrace/tracing/gcc_s.rs b/src/libstd/sys/unix/backtrace/tracing/gcc_s.rs index 6e8415686792c..72a7968c514ca 100644 --- a/src/libstd/sys/unix/backtrace/tracing/gcc_s.rs +++ b/src/libstd/sys/unix/backtrace/tracing/gcc_s.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use error::Error; use io; use libc; diff --git a/src/libstd/sys/unix/backtrace/tracing/mod.rs b/src/libstd/sys/unix/backtrace/tracing/mod.rs index c9c8e260d2f63..11863e6454525 100644 --- a/src/libstd/sys/unix/backtrace/tracing/mod.rs +++ b/src/libstd/sys/unix/backtrace/tracing/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub use self::imp::*; #[cfg(not(all(target_os = "ios", target_arch = "arm")))] diff --git a/src/libstd/sys/unix/cmath.rs b/src/libstd/sys/unix/cmath.rs index 2bc96651b0c84..f6bb58934fc05 100644 --- a/src/libstd/sys/unix/cmath.rs +++ b/src/libstd/sys/unix/cmath.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![cfg(not(test))] use libc::{c_float, c_double}; diff --git a/src/libstd/sys/unix/condvar.rs b/src/libstd/sys/unix/condvar.rs index 2007da7b1f6be..3e048d5c6e4f3 100644 --- a/src/libstd/sys/unix/condvar.rs +++ b/src/libstd/sys/unix/condvar.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use cell::UnsafeCell; use libc; use sys::mutex::{self, Mutex}; diff --git a/src/libstd/sys/unix/env.rs b/src/libstd/sys/unix/env.rs index ad116c57f557e..f83234830d737 100644 --- a/src/libstd/sys/unix/env.rs +++ b/src/libstd/sys/unix/env.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[cfg(target_os = "linux")] pub mod os { pub const FAMILY: &'static str = "unix"; diff --git a/src/libstd/sys/unix/ext/ffi.rs b/src/libstd/sys/unix/ext/ffi.rs index 8347145db5aaf..d1c3cd82ac514 100644 --- a/src/libstd/sys/unix/ext/ffi.rs +++ b/src/libstd/sys/unix/ext/ffi.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Unix-specific extension to the primitives in the `std::ffi` module #![stable(feature = "rust1", since = "1.0.0")] diff --git a/src/libstd/sys/unix/ext/fs.rs b/src/libstd/sys/unix/ext/fs.rs index 507e9d881717b..801cf48b8b176 100644 --- a/src/libstd/sys/unix/ext/fs.rs +++ b/src/libstd/sys/unix/ext/fs.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Unix-specific extensions to primitives in the `std::fs` module. #![stable(feature = "rust1", since = "1.0.0")] diff --git a/src/libstd/sys/unix/ext/io.rs b/src/libstd/sys/unix/ext/io.rs index c9fe3590a64a0..73f4879e4e434 100644 --- a/src/libstd/sys/unix/ext/io.rs +++ b/src/libstd/sys/unix/ext/io.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Unix-specific extensions to general I/O primitives #![stable(feature = "rust1", since = "1.0.0")] diff --git a/src/libstd/sys/unix/ext/mod.rs b/src/libstd/sys/unix/ext/mod.rs index 88e4237f8e2b7..36e9370b71318 100644 --- a/src/libstd/sys/unix/ext/mod.rs +++ b/src/libstd/sys/unix/ext/mod.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Experimental extensions to `std` for Unix platforms. //! //! Provides access to platform-level information on Unix platforms, and diff --git a/src/libstd/sys/unix/ext/net.rs b/src/libstd/sys/unix/ext/net.rs index 55f43ccd7db4d..6a1b1deedc810 100644 --- a/src/libstd/sys/unix/ext/net.rs +++ b/src/libstd/sys/unix/ext/net.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![stable(feature = "unix_socket", since = "1.10.0")] //! Unix-specific networking functionality diff --git a/src/libstd/sys/unix/ext/process.rs b/src/libstd/sys/unix/ext/process.rs index 21630ae9746fc..0282aaae90923 100644 --- a/src/libstd/sys/unix/ext/process.rs +++ b/src/libstd/sys/unix/ext/process.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Unix-specific extensions to primitives in the `std::process` module. #![stable(feature = "rust1", since = "1.0.0")] diff --git a/src/libstd/sys/unix/ext/raw.rs b/src/libstd/sys/unix/ext/raw.rs index 7972990e67dfe..eabb4b0250308 100644 --- a/src/libstd/sys/unix/ext/raw.rs +++ b/src/libstd/sys/unix/ext/raw.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Unix-specific primitives available on all unix platforms #![stable(feature = "raw_ext", since = "1.1.0")] diff --git a/src/libstd/sys/unix/ext/thread.rs b/src/libstd/sys/unix/ext/thread.rs index 8dadf29945c1a..4b3d5e31848f1 100644 --- a/src/libstd/sys/unix/ext/thread.rs +++ b/src/libstd/sys/unix/ext/thread.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Unix-specific extensions to primitives in the `std::thread` module. #![stable(feature = "thread_extensions", since = "1.9.0")] diff --git a/src/libstd/sys/unix/fast_thread_local.rs b/src/libstd/sys/unix/fast_thread_local.rs index c13a0fea1e05c..d48d701dd50ea 100644 --- a/src/libstd/sys/unix/fast_thread_local.rs +++ b/src/libstd/sys/unix/fast_thread_local.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![cfg(target_thread_local)] #![unstable(feature = "thread_local_internals", issue = "0")] diff --git a/src/libstd/sys/unix/fd.rs b/src/libstd/sys/unix/fd.rs index 4830e38d6a92f..a0710f4de8dcb 100644 --- a/src/libstd/sys/unix/fd.rs +++ b/src/libstd/sys/unix/fd.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![unstable(reason = "not public", issue = "0", feature = "fd")] use cmp; diff --git a/src/libstd/sys/unix/fs.rs b/src/libstd/sys/unix/fs.rs index 1d5b0cfa94ad5..1354aa55b0026 100644 --- a/src/libstd/sys/unix/fs.rs +++ b/src/libstd/sys/unix/fs.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use os::unix::prelude::*; use ffi::{CString, CStr, OsString, OsStr}; diff --git a/src/libstd/sys/unix/l4re.rs b/src/libstd/sys/unix/l4re.rs index 2121848967939..437fed0cd170d 100644 --- a/src/libstd/sys/unix/l4re.rs +++ b/src/libstd/sys/unix/l4re.rs @@ -1,13 +1,3 @@ -// Copyright 2016-2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! unimpl { () => (return Err(io::Error::new(io::ErrorKind::Other, "No networking available on L4Re."));) } diff --git a/src/libstd/sys/unix/memchr.rs b/src/libstd/sys/unix/memchr.rs index f49adc24163ca..05bfecd1d751a 100644 --- a/src/libstd/sys/unix/memchr.rs +++ b/src/libstd/sys/unix/memchr.rs @@ -1,12 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // Original implementation taken from rust-memchr // Copyright 2015 Andrew Gallant, bluss and Nicolas Koch diff --git a/src/libstd/sys/unix/mod.rs b/src/libstd/sys/unix/mod.rs index c738003caf1d9..92546ed164e26 100644 --- a/src/libstd/sys/unix/mod.rs +++ b/src/libstd/sys/unix/mod.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(missing_docs, bad_style)] use io::{self, ErrorKind}; diff --git a/src/libstd/sys/unix/mutex.rs b/src/libstd/sys/unix/mutex.rs index 1d447de11343c..54429dc84b6b3 100644 --- a/src/libstd/sys/unix/mutex.rs +++ b/src/libstd/sys/unix/mutex.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use cell::UnsafeCell; use libc; use mem; diff --git a/src/libstd/sys/unix/net.rs b/src/libstd/sys/unix/net.rs index 8c73fe8c6129f..289769164b35c 100644 --- a/src/libstd/sys/unix/net.rs +++ b/src/libstd/sys/unix/net.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use ffi::CStr; use io; use libc::{self, c_int, c_void, size_t, sockaddr, socklen_t, EAI_SYSTEM, MSG_PEEK}; diff --git a/src/libstd/sys/unix/os.rs b/src/libstd/sys/unix/os.rs index f8f0bbd5bc250..1e101ee7a859b 100644 --- a/src/libstd/sys/unix/os.rs +++ b/src/libstd/sys/unix/os.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Implementation of `std::os` functionality for unix systems #![allow(unused_imports)] // lots of cfg code here diff --git a/src/libstd/sys/unix/os_str.rs b/src/libstd/sys/unix/os_str.rs index 01c0fb830aadd..9d5e084feb2d6 100644 --- a/src/libstd/sys/unix/os_str.rs +++ b/src/libstd/sys/unix/os_str.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// The underlying OsString/OsStr implementation on Unix systems: just /// a `Vec`/`[u8]`. diff --git a/src/libstd/sys/unix/path.rs b/src/libstd/sys/unix/path.rs index bf9af7a4353a8..90b1fa7c97b96 100644 --- a/src/libstd/sys/unix/path.rs +++ b/src/libstd/sys/unix/path.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use path::Prefix; use ffi::OsStr; diff --git a/src/libstd/sys/unix/pipe.rs b/src/libstd/sys/unix/pipe.rs index 0a5dccddddae2..d949ebd9faa3d 100644 --- a/src/libstd/sys/unix/pipe.rs +++ b/src/libstd/sys/unix/pipe.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use io; use libc::{self, c_int}; use mem; diff --git a/src/libstd/sys/unix/process/mod.rs b/src/libstd/sys/unix/process/mod.rs index d8ac26c45b172..bba4b21c46232 100644 --- a/src/libstd/sys/unix/process/mod.rs +++ b/src/libstd/sys/unix/process/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub use self::process_common::{Command, ExitStatus, ExitCode, Stdio, StdioPipes}; pub use self::process_inner::Process; diff --git a/src/libstd/sys/unix/process/process_common.rs b/src/libstd/sys/unix/process/process_common.rs index 77f125f3c5b56..2c55813c5cd39 100644 --- a/src/libstd/sys/unix/process/process_common.rs +++ b/src/libstd/sys/unix/process/process_common.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use os::unix::prelude::*; use ffi::{OsString, OsStr, CString, CStr}; diff --git a/src/libstd/sys/unix/process/process_fuchsia.rs b/src/libstd/sys/unix/process/process_fuchsia.rs index fa48001179e05..5582310adbf74 100644 --- a/src/libstd/sys/unix/process/process_fuchsia.rs +++ b/src/libstd/sys/unix/process/process_fuchsia.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use io; use libc::{self, size_t}; use mem; diff --git a/src/libstd/sys/unix/process/process_unix.rs b/src/libstd/sys/unix/process/process_unix.rs index 9d6d607e3f340..983e3dee87ea2 100644 --- a/src/libstd/sys/unix/process/process_unix.rs +++ b/src/libstd/sys/unix/process/process_unix.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use io::{self, Error, ErrorKind}; use libc::{self, c_int, gid_t, pid_t, uid_t}; use ptr; diff --git a/src/libstd/sys/unix/process/zircon.rs b/src/libstd/sys/unix/process/zircon.rs index a06c73ee263c2..e8e973cc5fabc 100644 --- a/src/libstd/sys/unix/process/zircon.rs +++ b/src/libstd/sys/unix/process/zircon.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(non_camel_case_types, unused)] use convert::TryInto; diff --git a/src/libstd/sys/unix/rand.rs b/src/libstd/sys/unix/rand.rs index 01c0ada4ffbe5..54b4721a077c1 100644 --- a/src/libstd/sys/unix/rand.rs +++ b/src/libstd/sys/unix/rand.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use mem; use slice; diff --git a/src/libstd/sys/unix/rwlock.rs b/src/libstd/sys/unix/rwlock.rs index c754d5b8359a9..2f15bc8335898 100644 --- a/src/libstd/sys/unix/rwlock.rs +++ b/src/libstd/sys/unix/rwlock.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use libc; use cell::UnsafeCell; use sync::atomic::{AtomicUsize, Ordering}; diff --git a/src/libstd/sys/unix/stack_overflow.rs b/src/libstd/sys/unix/stack_overflow.rs index 40453f9b8a15b..d6a219a6d5759 100644 --- a/src/libstd/sys/unix/stack_overflow.rs +++ b/src/libstd/sys/unix/stack_overflow.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![cfg_attr(test, allow(dead_code))] use libc; diff --git a/src/libstd/sys/unix/stdio.rs b/src/libstd/sys/unix/stdio.rs index 87ba2aef4f1d3..f71b9a773e053 100644 --- a/src/libstd/sys/unix/stdio.rs +++ b/src/libstd/sys/unix/stdio.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use io; use libc; use sys::fd::FileDesc; diff --git a/src/libstd/sys/unix/thread.rs b/src/libstd/sys/unix/thread.rs index f3a45d2465739..9f3ada6dbea96 100644 --- a/src/libstd/sys/unix/thread.rs +++ b/src/libstd/sys/unix/thread.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use boxed::FnBox; use cmp; use ffi::CStr; diff --git a/src/libstd/sys/unix/thread_local.rs b/src/libstd/sys/unix/thread_local.rs index 2487f6bcaf74f..c171fbce237ff 100644 --- a/src/libstd/sys/unix/thread_local.rs +++ b/src/libstd/sys/unix/thread_local.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] // not used on all platforms use mem; diff --git a/src/libstd/sys/unix/time.rs b/src/libstd/sys/unix/time.rs index 0b1fb726357e1..49439e7ad6b0d 100644 --- a/src/libstd/sys/unix/time.rs +++ b/src/libstd/sys/unix/time.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use cmp::Ordering; use libc; use time::Duration; diff --git a/src/libstd/sys/unix/weak.rs b/src/libstd/sys/unix/weak.rs index 18944be58ee7e..5a59c1304c153 100644 --- a/src/libstd/sys/unix/weak.rs +++ b/src/libstd/sys/unix/weak.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Support for "weak linkage" to symbols on Unix //! //! Some I/O operations we do in libstd require newer versions of OSes but we diff --git a/src/libstd/sys/wasm/args.rs b/src/libstd/sys/wasm/args.rs index b3c6b671e8099..cea56091adcba 100644 --- a/src/libstd/sys/wasm/args.rs +++ b/src/libstd/sys/wasm/args.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use ffi::OsString; use marker::PhantomData; use vec; diff --git a/src/libstd/sys/wasm/backtrace.rs b/src/libstd/sys/wasm/backtrace.rs index 9a8c48ff29fc7..52d4a63bb6384 100644 --- a/src/libstd/sys/wasm/backtrace.rs +++ b/src/libstd/sys/wasm/backtrace.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use io; use sys::unsupported; use sys_common::backtrace::Frame; diff --git a/src/libstd/sys/wasm/cmath.rs b/src/libstd/sys/wasm/cmath.rs index 87ac2091cad41..f03d4cfbd9c25 100644 --- a/src/libstd/sys/wasm/cmath.rs +++ b/src/libstd/sys/wasm/cmath.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[inline] pub unsafe fn cbrtf(n: f32) -> f32 { f64::cbrt(n as f64) as f32 diff --git a/src/libstd/sys/wasm/condvar.rs b/src/libstd/sys/wasm/condvar.rs index afa7afeef5988..22df0f60db5a1 100644 --- a/src/libstd/sys/wasm/condvar.rs +++ b/src/libstd/sys/wasm/condvar.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use sys::mutex::Mutex; use time::Duration; diff --git a/src/libstd/sys/wasm/env.rs b/src/libstd/sys/wasm/env.rs index 1422042bd0228..7a54b5b73172b 100644 --- a/src/libstd/sys/wasm/env.rs +++ b/src/libstd/sys/wasm/env.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod os { pub const FAMILY: &'static str = ""; pub const OS: &'static str = ""; diff --git a/src/libstd/sys/wasm/fs.rs b/src/libstd/sys/wasm/fs.rs index b3c70a6685a6c..8b1c4476bc417 100644 --- a/src/libstd/sys/wasm/fs.rs +++ b/src/libstd/sys/wasm/fs.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use ffi::OsString; use fmt; use hash::{Hash, Hasher}; diff --git a/src/libstd/sys/wasm/memchr.rs b/src/libstd/sys/wasm/memchr.rs index 964e35994139b..9967482197eb3 100644 --- a/src/libstd/sys/wasm/memchr.rs +++ b/src/libstd/sys/wasm/memchr.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub use core::slice::memchr::{memchr, memrchr}; diff --git a/src/libstd/sys/wasm/mod.rs b/src/libstd/sys/wasm/mod.rs index c02e5e809c8bb..8897c8fd253d8 100644 --- a/src/libstd/sys/wasm/mod.rs +++ b/src/libstd/sys/wasm/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! System bindings for the wasm/web platform //! //! This module contains the facade (aka platform-specific) implementations of diff --git a/src/libstd/sys/wasm/mutex.rs b/src/libstd/sys/wasm/mutex.rs index 4197bdcc80839..cf0a0a8638b13 100644 --- a/src/libstd/sys/wasm/mutex.rs +++ b/src/libstd/sys/wasm/mutex.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use cell::UnsafeCell; pub struct Mutex { diff --git a/src/libstd/sys/wasm/net.rs b/src/libstd/sys/wasm/net.rs index e7476ab37f7c8..81b8e780e2659 100644 --- a/src/libstd/sys/wasm/net.rs +++ b/src/libstd/sys/wasm/net.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use fmt; use io; use net::{SocketAddr, Shutdown, Ipv4Addr, Ipv6Addr}; diff --git a/src/libstd/sys/wasm/os.rs b/src/libstd/sys/wasm/os.rs index 0cb991e19b0d0..9b278dfb9f8b2 100644 --- a/src/libstd/sys/wasm/os.rs +++ b/src/libstd/sys/wasm/os.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use error::Error as StdError; use ffi::{OsString, OsStr}; use fmt; diff --git a/src/libstd/sys/wasm/os_str.rs b/src/libstd/sys/wasm/os_str.rs index e0da5bdf36c14..9d5e084feb2d6 100644 --- a/src/libstd/sys/wasm/os_str.rs +++ b/src/libstd/sys/wasm/os_str.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// The underlying OsString/OsStr implementation on Unix systems: just /// a `Vec`/`[u8]`. diff --git a/src/libstd/sys/wasm/path.rs b/src/libstd/sys/wasm/path.rs index 395b8c1e40e98..90b1fa7c97b96 100644 --- a/src/libstd/sys/wasm/path.rs +++ b/src/libstd/sys/wasm/path.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use path::Prefix; use ffi::OsStr; diff --git a/src/libstd/sys/wasm/pipe.rs b/src/libstd/sys/wasm/pipe.rs index 992e1ac409cfb..ac48a6dc03323 100644 --- a/src/libstd/sys/wasm/pipe.rs +++ b/src/libstd/sys/wasm/pipe.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use io; use sys::Void; diff --git a/src/libstd/sys/wasm/process.rs b/src/libstd/sys/wasm/process.rs index 433e9cec7c8ac..5357d931c7367 100644 --- a/src/libstd/sys/wasm/process.rs +++ b/src/libstd/sys/wasm/process.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use ffi::OsStr; use fmt; use io; diff --git a/src/libstd/sys/wasm/rwlock.rs b/src/libstd/sys/wasm/rwlock.rs index 6516010af4759..9f172859b7e65 100644 --- a/src/libstd/sys/wasm/rwlock.rs +++ b/src/libstd/sys/wasm/rwlock.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use cell::UnsafeCell; pub struct RWLock { diff --git a/src/libstd/sys/wasm/stack_overflow.rs b/src/libstd/sys/wasm/stack_overflow.rs index bed274142f1ce..c0e7c824615c8 100644 --- a/src/libstd/sys/wasm/stack_overflow.rs +++ b/src/libstd/sys/wasm/stack_overflow.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Handler; impl Handler { diff --git a/src/libstd/sys/wasm/stdio.rs b/src/libstd/sys/wasm/stdio.rs index 023f29576a27d..8928bb2cb42c0 100644 --- a/src/libstd/sys/wasm/stdio.rs +++ b/src/libstd/sys/wasm/stdio.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use io; use sys::{ReadSysCall, WriteSysCall}; diff --git a/src/libstd/sys/wasm/thread.rs b/src/libstd/sys/wasm/thread.rs index 8173a62421117..e6f1d355e7a40 100644 --- a/src/libstd/sys/wasm/thread.rs +++ b/src/libstd/sys/wasm/thread.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use boxed::FnBox; use ffi::CStr; use io; diff --git a/src/libstd/sys/wasm/thread_local.rs b/src/libstd/sys/wasm/thread_local.rs index 442dd3302a058..c7c385da8c376 100644 --- a/src/libstd/sys/wasm/thread_local.rs +++ b/src/libstd/sys/wasm/thread_local.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use boxed::Box; use ptr; diff --git a/src/libstd/sys/wasm/time.rs b/src/libstd/sys/wasm/time.rs index e52435e63398f..cb61dffb09bdd 100644 --- a/src/libstd/sys/wasm/time.rs +++ b/src/libstd/sys/wasm/time.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use time::Duration; use sys::{TimeSysCall, TimeClock}; diff --git a/src/libstd/sys/windows/args.rs b/src/libstd/sys/windows/args.rs index 4784633edc14d..b221584e5da5a 100644 --- a/src/libstd/sys/windows/args.rs +++ b/src/libstd/sys/windows/args.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] // runtime init functions not used during testing use os::windows::prelude::*; diff --git a/src/libstd/sys/windows/backtrace/backtrace_gnu.rs b/src/libstd/sys/windows/backtrace/backtrace_gnu.rs index f0d29dd4178d1..e8aa939974232 100644 --- a/src/libstd/sys/windows/backtrace/backtrace_gnu.rs +++ b/src/libstd/sys/windows/backtrace/backtrace_gnu.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use io; use sys::c; use libc::c_char; diff --git a/src/libstd/sys/windows/backtrace/mod.rs b/src/libstd/sys/windows/backtrace/mod.rs index f64cae810b9ac..6a71f3c2a1eb7 100644 --- a/src/libstd/sys/windows/backtrace/mod.rs +++ b/src/libstd/sys/windows/backtrace/mod.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! As always, windows has something very different than unix, we mainly want //! to avoid having to depend too much on libunwind for windows. //! diff --git a/src/libstd/sys/windows/backtrace/printing/mod.rs b/src/libstd/sys/windows/backtrace/printing/mod.rs index 251d5028aeaa6..d44df7e5f248c 100644 --- a/src/libstd/sys/windows/backtrace/printing/mod.rs +++ b/src/libstd/sys/windows/backtrace/printing/mod.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[cfg(target_env = "msvc")] #[path = "msvc.rs"] mod printing; diff --git a/src/libstd/sys/windows/backtrace/printing/msvc.rs b/src/libstd/sys/windows/backtrace/printing/msvc.rs index c8b946bf13ad1..b186bb423345c 100644 --- a/src/libstd/sys/windows/backtrace/printing/msvc.rs +++ b/src/libstd/sys/windows/backtrace/printing/msvc.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use ffi::CStr; use io; use libc::{c_char, c_ulong}; diff --git a/src/libstd/sys/windows/c.rs b/src/libstd/sys/windows/c.rs index e514a56dcc436..f10bae4a2f0c8 100644 --- a/src/libstd/sys/windows/c.rs +++ b/src/libstd/sys/windows/c.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! C definitions used by libnative that don't belong in liblibc #![allow(bad_style)] diff --git a/src/libstd/sys/windows/cmath.rs b/src/libstd/sys/windows/cmath.rs index b665a2c9ba4db..e744cb219a849 100644 --- a/src/libstd/sys/windows/cmath.rs +++ b/src/libstd/sys/windows/cmath.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![cfg(not(test))] use libc::{c_float, c_double}; diff --git a/src/libstd/sys/windows/compat.rs b/src/libstd/sys/windows/compat.rs index cd42b7d05ee38..b6c55344c6267 100644 --- a/src/libstd/sys/windows/compat.rs +++ b/src/libstd/sys/windows/compat.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A "compatibility layer" for spanning XP and Windows 7 //! //! The standard library currently binds many functions that are not available diff --git a/src/libstd/sys/windows/condvar.rs b/src/libstd/sys/windows/condvar.rs index d708b327c55cb..48d8af7391308 100644 --- a/src/libstd/sys/windows/condvar.rs +++ b/src/libstd/sys/windows/condvar.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use cell::UnsafeCell; use sys::c; use sys::mutex::{self, Mutex}; diff --git a/src/libstd/sys/windows/dynamic_lib.rs b/src/libstd/sys/windows/dynamic_lib.rs index 5227280808f5b..fa3c5ecb97761 100644 --- a/src/libstd/sys/windows/dynamic_lib.rs +++ b/src/libstd/sys/windows/dynamic_lib.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use os::windows::prelude::*; use ffi::{CString, OsStr}; diff --git a/src/libstd/sys/windows/env.rs b/src/libstd/sys/windows/env.rs index e6d74895774ce..b1a974e8927c6 100644 --- a/src/libstd/sys/windows/env.rs +++ b/src/libstd/sys/windows/env.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod os { pub const FAMILY: &'static str = "windows"; pub const OS: &'static str = "windows"; diff --git a/src/libstd/sys/windows/ext/ffi.rs b/src/libstd/sys/windows/ext/ffi.rs index bae0d02786a09..823d51c0fc1ef 100644 --- a/src/libstd/sys/windows/ext/ffi.rs +++ b/src/libstd/sys/windows/ext/ffi.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Windows-specific extensions to the primitives in the `std::ffi` module. //! //! # Overview diff --git a/src/libstd/sys/windows/ext/fs.rs b/src/libstd/sys/windows/ext/fs.rs index 78c9e95a05501..8eaf58aed32c3 100644 --- a/src/libstd/sys/windows/ext/fs.rs +++ b/src/libstd/sys/windows/ext/fs.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Windows-specific extensions for the primitives in the `std::fs` module. #![stable(feature = "rust1", since = "1.0.0")] diff --git a/src/libstd/sys/windows/ext/io.rs b/src/libstd/sys/windows/ext/io.rs index 90128dda088a9..76143dee46463 100644 --- a/src/libstd/sys/windows/ext/io.rs +++ b/src/libstd/sys/windows/ext/io.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![stable(feature = "rust1", since = "1.0.0")] use fs; diff --git a/src/libstd/sys/windows/ext/mod.rs b/src/libstd/sys/windows/ext/mod.rs index 1f10609f32c48..0a6d435d3290e 100644 --- a/src/libstd/sys/windows/ext/mod.rs +++ b/src/libstd/sys/windows/ext/mod.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Platform-specific extensions to `std` for Windows. //! //! Provides access to platform-level information for Windows, and exposes diff --git a/src/libstd/sys/windows/ext/process.rs b/src/libstd/sys/windows/ext/process.rs index a02bcbe0c87c2..15f0fd4e11f43 100644 --- a/src/libstd/sys/windows/ext/process.rs +++ b/src/libstd/sys/windows/ext/process.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Extensions to `std::process` for Windows. #![stable(feature = "process_extensions", since = "1.2.0")] diff --git a/src/libstd/sys/windows/ext/raw.rs b/src/libstd/sys/windows/ext/raw.rs index 92d53e2e42884..77428d9e7747e 100644 --- a/src/libstd/sys/windows/ext/raw.rs +++ b/src/libstd/sys/windows/ext/raw.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Windows-specific primitives #![stable(feature = "raw_ext", since = "1.1.0")] diff --git a/src/libstd/sys/windows/ext/thread.rs b/src/libstd/sys/windows/ext/thread.rs index 36b3a3d4bdec8..29d612fedc0f0 100644 --- a/src/libstd/sys/windows/ext/thread.rs +++ b/src/libstd/sys/windows/ext/thread.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Extensions to `std::thread` for Windows. #![stable(feature = "thread_extensions", since = "1.9.0")] diff --git a/src/libstd/sys/windows/fast_thread_local.rs b/src/libstd/sys/windows/fast_thread_local.rs index 9fee9bd93b47e..f8b936b481038 100644 --- a/src/libstd/sys/windows/fast_thread_local.rs +++ b/src/libstd/sys/windows/fast_thread_local.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![unstable(feature = "thread_local_internals", issue = "0")] #![cfg(target_thread_local)] diff --git a/src/libstd/sys/windows/fs.rs b/src/libstd/sys/windows/fs.rs index 082d4689c7ba8..1b4c171ab3192 100644 --- a/src/libstd/sys/windows/fs.rs +++ b/src/libstd/sys/windows/fs.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use os::windows::prelude::*; use ffi::OsString; diff --git a/src/libstd/sys/windows/handle.rs b/src/libstd/sys/windows/handle.rs index 3729d6d6534e8..7d12e0f6ef085 100644 --- a/src/libstd/sys/windows/handle.rs +++ b/src/libstd/sys/windows/handle.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![unstable(issue = "0", feature = "windows_handle")] use cmp; diff --git a/src/libstd/sys/windows/memchr.rs b/src/libstd/sys/windows/memchr.rs index fa7c816fd02ea..87b1aa2f24a3a 100644 --- a/src/libstd/sys/windows/memchr.rs +++ b/src/libstd/sys/windows/memchr.rs @@ -1,12 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // Original implementation taken from rust-memchr // Copyright 2015 Andrew Gallant, bluss and Nicolas Koch diff --git a/src/libstd/sys/windows/mod.rs b/src/libstd/sys/windows/mod.rs index ccf79de909fa9..53f6522b6b69c 100644 --- a/src/libstd/sys/windows/mod.rs +++ b/src/libstd/sys/windows/mod.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(missing_docs, bad_style)] use ptr; diff --git a/src/libstd/sys/windows/mutex.rs b/src/libstd/sys/windows/mutex.rs index 9bf9f749d4df2..6fb6e74055003 100644 --- a/src/libstd/sys/windows/mutex.rs +++ b/src/libstd/sys/windows/mutex.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! System Mutexes //! //! The Windows implementation of mutexes is a little odd and it may not be diff --git a/src/libstd/sys/windows/net.rs b/src/libstd/sys/windows/net.rs index cd8acff6b0cb8..acda81dcde574 100644 --- a/src/libstd/sys/windows/net.rs +++ b/src/libstd/sys/windows/net.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![unstable(issue = "0", feature = "windows_net")] use cmp; diff --git a/src/libstd/sys/windows/os.rs b/src/libstd/sys/windows/os.rs index b94482435597e..201830988377f 100644 --- a/src/libstd/sys/windows/os.rs +++ b/src/libstd/sys/windows/os.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Implementation of `std::os` functionality for Windows #![allow(bad_style)] diff --git a/src/libstd/sys/windows/os_str.rs b/src/libstd/sys/windows/os_str.rs index bcc66b9954b89..7e4bcd990b1e7 100644 --- a/src/libstd/sys/windows/os_str.rs +++ b/src/libstd/sys/windows/os_str.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// The underlying OsString/OsStr implementation on Windows is a /// wrapper around the "WTF-8" encoding; see the `wtf8` module for more. diff --git a/src/libstd/sys/windows/path.rs b/src/libstd/sys/windows/path.rs index 98d62a0c953a6..795df30032400 100644 --- a/src/libstd/sys/windows/path.rs +++ b/src/libstd/sys/windows/path.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use path::Prefix; use ffi::OsStr; use mem; diff --git a/src/libstd/sys/windows/pipe.rs b/src/libstd/sys/windows/pipe.rs index 4b19519a57a87..2e8933a4d232a 100644 --- a/src/libstd/sys/windows/pipe.rs +++ b/src/libstd/sys/windows/pipe.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use os::windows::prelude::*; use ffi::OsStr; diff --git a/src/libstd/sys/windows/process.rs b/src/libstd/sys/windows/process.rs index 4974a8de89c79..30c9cbc08a189 100644 --- a/src/libstd/sys/windows/process.rs +++ b/src/libstd/sys/windows/process.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![unstable(feature = "process_internals", issue = "0")] use collections::BTreeMap; diff --git a/src/libstd/sys/windows/rand.rs b/src/libstd/sys/windows/rand.rs index 262323656aa8c..4f000dceb2f18 100644 --- a/src/libstd/sys/windows/rand.rs +++ b/src/libstd/sys/windows/rand.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use io; use mem; use sys::c; diff --git a/src/libstd/sys/windows/rwlock.rs b/src/libstd/sys/windows/rwlock.rs index 3e81ebfcedfb9..3cd19470101aa 100644 --- a/src/libstd/sys/windows/rwlock.rs +++ b/src/libstd/sys/windows/rwlock.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use cell::UnsafeCell; use sys::c; diff --git a/src/libstd/sys/windows/stack_overflow.rs b/src/libstd/sys/windows/stack_overflow.rs index 4a406d70e63ab..0c7de0bc9e8f3 100644 --- a/src/libstd/sys/windows/stack_overflow.rs +++ b/src/libstd/sys/windows/stack_overflow.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![cfg_attr(test, allow(dead_code))] use sys_common::util::report_overflow; diff --git a/src/libstd/sys/windows/stdio.rs b/src/libstd/sys/windows/stdio.rs index 81b89da21d3c6..b57f8e7536de0 100644 --- a/src/libstd/sys/windows/stdio.rs +++ b/src/libstd/sys/windows/stdio.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![unstable(issue = "0", feature = "windows_stdio")] use io::prelude::*; diff --git a/src/libstd/sys/windows/thread.rs b/src/libstd/sys/windows/thread.rs index 85588cc6c8e85..fc36bbf459fac 100644 --- a/src/libstd/sys/windows/thread.rs +++ b/src/libstd/sys/windows/thread.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use boxed::FnBox; use io; use ffi::CStr; diff --git a/src/libstd/sys/windows/thread_local.rs b/src/libstd/sys/windows/thread_local.rs index cdad320e12241..50bbd5476b366 100644 --- a/src/libstd/sys/windows/thread_local.rs +++ b/src/libstd/sys/windows/thread_local.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use mem; use ptr; use sync::atomic::AtomicPtr; diff --git a/src/libstd/sys/windows/time.rs b/src/libstd/sys/windows/time.rs index 07e64d386a1c2..33fff1d74a290 100644 --- a/src/libstd/sys/windows/time.rs +++ b/src/libstd/sys/windows/time.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use cmp::Ordering; use fmt; use mem; diff --git a/src/libstd/sys_common/at_exit_imp.rs b/src/libstd/sys_common/at_exit_imp.rs index 76e5df2c8654a..cd2d176c2a5c5 100644 --- a/src/libstd/sys_common/at_exit_imp.rs +++ b/src/libstd/sys_common/at_exit_imp.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Implementation of running at_exit routines //! //! Documentation can be found on the `rt::at_exit` function. diff --git a/src/libstd/sys_common/backtrace.rs b/src/libstd/sys_common/backtrace.rs index 77371782977b1..f76678842b0b3 100644 --- a/src/libstd/sys_common/backtrace.rs +++ b/src/libstd/sys_common/backtrace.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// Common code for printing the backtrace in the same way across the different /// supported platforms. diff --git a/src/libstd/sys_common/bytestring.rs b/src/libstd/sys_common/bytestring.rs index 971b83938c167..df57fae428167 100644 --- a/src/libstd/sys_common/bytestring.rs +++ b/src/libstd/sys_common/bytestring.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] use fmt::{Formatter, Result, Write}; diff --git a/src/libstd/sys_common/condvar.rs b/src/libstd/sys_common/condvar.rs index b6f29dd5fc3d3..ad95879f07355 100644 --- a/src/libstd/sys_common/condvar.rs +++ b/src/libstd/sys_common/condvar.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use time::Duration; use sys_common::mutex::{self, Mutex}; use sys::condvar as imp; diff --git a/src/libstd/sys_common/gnu/libbacktrace.rs b/src/libstd/sys_common/gnu/libbacktrace.rs index 6ad3af6aee1d5..18cb8431b9ec3 100644 --- a/src/libstd/sys_common/gnu/libbacktrace.rs +++ b/src/libstd/sys_common/gnu/libbacktrace.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use libc; use ffi::CStr; diff --git a/src/libstd/sys_common/gnu/mod.rs b/src/libstd/sys_common/gnu/mod.rs index 3a8cf2d842591..d6959697f2a3d 100644 --- a/src/libstd/sys_common/gnu/mod.rs +++ b/src/libstd/sys_common/gnu/mod.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(missing_docs)] #![allow(non_camel_case_types)] #![allow(non_snake_case)] diff --git a/src/libstd/sys_common/io.rs b/src/libstd/sys_common/io.rs index ab23936358e78..086e25e20789e 100644 --- a/src/libstd/sys_common/io.rs +++ b/src/libstd/sys_common/io.rs @@ -1,12 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. pub const DEFAULT_BUF_SIZE: usize = 8 * 1024; #[cfg(test)] diff --git a/src/libstd/sys_common/mod.rs b/src/libstd/sys_common/mod.rs index d0c4d6a773746..075d77cb35341 100644 --- a/src/libstd/sys_common/mod.rs +++ b/src/libstd/sys_common/mod.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Platform-independent platform abstraction //! //! This is the platform-independent portion of the standard library's diff --git a/src/libstd/sys_common/mutex.rs b/src/libstd/sys_common/mutex.rs index c6d531c7a1ac5..536f1c70db23a 100644 --- a/src/libstd/sys_common/mutex.rs +++ b/src/libstd/sys_common/mutex.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use sys::mutex as imp; /// An OS-based mutual exclusion lock. diff --git a/src/libstd/sys_common/net.rs b/src/libstd/sys_common/net.rs index b841afe1a5141..d123dc8ac1047 100644 --- a/src/libstd/sys_common/net.rs +++ b/src/libstd/sys_common/net.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use cmp; use ffi::CString; use fmt; diff --git a/src/libstd/sys_common/poison.rs b/src/libstd/sys_common/poison.rs index 1625efe4a2ae7..d990291b818dc 100644 --- a/src/libstd/sys_common/poison.rs +++ b/src/libstd/sys_common/poison.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use error::{Error}; use fmt; use sync::atomic::{AtomicBool, Ordering}; diff --git a/src/libstd/sys_common/process.rs b/src/libstd/sys_common/process.rs index ddf0ebe603e08..3384ffeb64e9f 100644 --- a/src/libstd/sys_common/process.rs +++ b/src/libstd/sys_common/process.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] #![unstable(feature = "process_internals", issue = "0")] diff --git a/src/libstd/sys_common/remutex.rs b/src/libstd/sys_common/remutex.rs index 071a3a25c7acd..9ef24433f1360 100644 --- a/src/libstd/sys_common/remutex.rs +++ b/src/libstd/sys_common/remutex.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use fmt; use marker; use ops::Deref; diff --git a/src/libstd/sys_common/rwlock.rs b/src/libstd/sys_common/rwlock.rs index 71a4f01ec4cab..0aa0284539a8f 100644 --- a/src/libstd/sys_common/rwlock.rs +++ b/src/libstd/sys_common/rwlock.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use sys::rwlock as imp; /// An OS-based reader-writer lock. diff --git a/src/libstd/sys_common/thread.rs b/src/libstd/sys_common/thread.rs index 86a5e2b86942a..fe9ad7623b7d5 100644 --- a/src/libstd/sys_common/thread.rs +++ b/src/libstd/sys_common/thread.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use boxed::FnBox; use env; use sync::atomic::{self, Ordering}; diff --git a/src/libstd/sys_common/thread_info.rs b/src/libstd/sys_common/thread_info.rs index d75cbded7347b..b4bca72b09d1b 100644 --- a/src/libstd/sys_common/thread_info.rs +++ b/src/libstd/sys_common/thread_info.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] // stack_guard isn't used right now on all platforms use cell::RefCell; diff --git a/src/libstd/sys_common/thread_local.rs b/src/libstd/sys_common/thread_local.rs index bb72cb0930a7f..874e58dcfeee0 100644 --- a/src/libstd/sys_common/thread_local.rs +++ b/src/libstd/sys_common/thread_local.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! OS-based thread local storage //! //! This module provides an implementation of OS-based thread local storage, diff --git a/src/libstd/sys_common/util.rs b/src/libstd/sys_common/util.rs index a373e980b970d..453be904588fe 100644 --- a/src/libstd/sys_common/util.rs +++ b/src/libstd/sys_common/util.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use fmt; use io::prelude::*; use sys::stdio::{Stderr, stderr_prints_nothing}; diff --git a/src/libstd/sys_common/wtf8.rs b/src/libstd/sys_common/wtf8.rs index 8725abe741679..fb976842caea1 100644 --- a/src/libstd/sys_common/wtf8.rs +++ b/src/libstd/sys_common/wtf8.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Implementation of [the WTF-8 encoding](https://simonsapin.github.io/wtf-8/). //! //! This library uses Rust’s type system to maintain diff --git a/src/libstd/tests/env.rs b/src/libstd/tests/env.rs index 8acb8a46d7bf2..0d1600a1efff3 100644 --- a/src/libstd/tests/env.rs +++ b/src/libstd/tests/env.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate rand; use std::env::*; diff --git a/src/libstd/thread/local.rs b/src/libstd/thread/local.rs index a170abb2628e5..f3addded6e724 100644 --- a/src/libstd/thread/local.rs +++ b/src/libstd/thread/local.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Thread local storage #![unstable(feature = "thread_local_internals", issue = "0")] diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs index 61c6084a25023..4ebecd11dda52 100644 --- a/src/libstd/thread/mod.rs +++ b/src/libstd/thread/mod.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Native threads. //! //! ## The threading model diff --git a/src/libstd/time.rs b/src/libstd/time.rs index 90ab349159915..a6aa51164ea05 100644 --- a/src/libstd/time.rs +++ b/src/libstd/time.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Temporal quantification. //! //! Example: diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index b6084bcf34307..9d9850ba1eea8 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // The Rust abstract syntax tree. pub use self::UnsafeSource::*; diff --git a/src/libsyntax/attr/builtin.rs b/src/libsyntax/attr/builtin.rs index ecd52a62eab26..19c9af68cdff7 100644 --- a/src/libsyntax/attr/builtin.rs +++ b/src/libsyntax/attr/builtin.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Parsing and validation of builtin attributes use ast::{self, Attribute, MetaItem, Name, NestedMetaItemKind}; diff --git a/src/libsyntax/attr/mod.rs b/src/libsyntax/attr/mod.rs index cd9d76822106c..061a2a915ac7f 100644 --- a/src/libsyntax/attr/mod.rs +++ b/src/libsyntax/attr/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Functions dealing with attributes and meta items mod builtin; diff --git a/src/libsyntax/build.rs b/src/libsyntax/build.rs index d39340c332690..9b861f9640904 100644 --- a/src/libsyntax/build.rs +++ b/src/libsyntax/build.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { println!("cargo:rerun-if-changed=build.rs"); println!("cargo:rerun-if-env-changed=CFG_RELEASE_CHANNEL"); diff --git a/src/libsyntax/config.rs b/src/libsyntax/config.rs index 0e52434ec0170..ef03edaf065c5 100644 --- a/src/libsyntax/config.rs +++ b/src/libsyntax/config.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use attr::HasAttrs; use feature_gate::{feature_err, EXPLAIN_STMT_ATTR_SYNTAX, Features, get_features, GateIssue}; use {fold, attr}; diff --git a/src/libsyntax/diagnostic_list.rs b/src/libsyntax/diagnostic_list.rs index 23ce7fc6a6568..0d3426891db50 100644 --- a/src/libsyntax/diagnostic_list.rs +++ b/src/libsyntax/diagnostic_list.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(non_snake_case)] // Error messages for EXXXX errors. diff --git a/src/libsyntax/diagnostics/macros.rs b/src/libsyntax/diagnostics/macros.rs index 61f3e7046f149..6f7493ad59726 100644 --- a/src/libsyntax/diagnostics/macros.rs +++ b/src/libsyntax/diagnostics/macros.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_export] macro_rules! register_diagnostic { ($code:tt, $description:tt) => (__register_diagnostic! { $code, $description }); diff --git a/src/libsyntax/diagnostics/metadata.rs b/src/libsyntax/diagnostics/metadata.rs index 1438299d375b6..abde3dca0f6b0 100644 --- a/src/libsyntax/diagnostics/metadata.rs +++ b/src/libsyntax/diagnostics/metadata.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This module contains utilities for outputting metadata for diagnostic errors. //! //! Each set of errors is mapped to a metadata file by a name, which is diff --git a/src/libsyntax/diagnostics/plugin.rs b/src/libsyntax/diagnostics/plugin.rs index c5a2cd5ac0b43..9941b18125e0e 100644 --- a/src/libsyntax/diagnostics/plugin.rs +++ b/src/libsyntax/diagnostics/plugin.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::BTreeMap; use std::env; diff --git a/src/libsyntax/early_buffered_lints.rs b/src/libsyntax/early_buffered_lints.rs index a976af1435d23..204e07625adef 100644 --- a/src/libsyntax/early_buffered_lints.rs +++ b/src/libsyntax/early_buffered_lints.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Allows the buffering of lints for later. //! //! Since we cannot have a dependency on `librustc`, we implement some types here that are somewhat diff --git a/src/libsyntax/entry.rs b/src/libsyntax/entry.rs index 93ca1948ed84b..72a550a05d5da 100644 --- a/src/libsyntax/entry.rs +++ b/src/libsyntax/entry.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use attr; use ast::{Item, ItemKind}; diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index 75d24df7b629f..73e5f35e8590e 100644 --- a/src/libsyntax/ext/base.rs +++ b/src/libsyntax/ext/base.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub use self::SyntaxExtension::*; use ast::{self, Attribute, Name, PatKind, MetaItem}; diff --git a/src/libsyntax/ext/build.rs b/src/libsyntax/ext/build.rs index b1bed9602f362..e2f49bca1f366 100644 --- a/src/libsyntax/ext/build.rs +++ b/src/libsyntax/ext/build.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc_target::spec::abi::Abi; use ast::{self, Ident, Generics, Expr, BlockCheckMode, UnOp, PatKind}; use attr; diff --git a/src/libsyntax/ext/derive.rs b/src/libsyntax/ext/derive.rs index 80bbc618932ef..1a768cfece62e 100644 --- a/src/libsyntax/ext/derive.rs +++ b/src/libsyntax/ext/derive.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use attr::HasAttrs; use ast; use source_map::{hygiene, ExpnInfo, ExpnFormat}; diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index a2e84b508dc12..14fe56fdf7dbc 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use ast::{self, Block, Ident, NodeId, PatKind, Path}; use ast::{MacStmtStyle, StmtKind, ItemKind}; use attr::{self, HasAttrs}; diff --git a/src/libsyntax/ext/placeholders.rs b/src/libsyntax/ext/placeholders.rs index 7a8ccfddf8eb6..24ac7ecc8fdfd 100644 --- a/src/libsyntax/ext/placeholders.rs +++ b/src/libsyntax/ext/placeholders.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use ast::{self, NodeId}; use source_map::{DUMMY_SP, dummy_spanned}; use ext::base::ExtCtxt; diff --git a/src/libsyntax/ext/quote.rs b/src/libsyntax/ext/quote.rs index 13a139deea4c3..34eb133d21bd2 100644 --- a/src/libsyntax/ext/quote.rs +++ b/src/libsyntax/ext/quote.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use ast::{self, Arg, Arm, Block, Expr, Item, Pat, Stmt, Ty}; use source_map::respan; use syntax_pos::Span; diff --git a/src/libsyntax/ext/source_util.rs b/src/libsyntax/ext/source_util.rs index 19a204cc989bf..ce89c139129b6 100644 --- a/src/libsyntax/ext/source_util.rs +++ b/src/libsyntax/ext/source_util.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use ast; use syntax_pos::{self, Pos, Span, FileName}; use ext::base::*; diff --git a/src/libsyntax/ext/tt/macro_parser.rs b/src/libsyntax/ext/tt/macro_parser.rs index dcdeee5c2e700..bcfcd6bd49d56 100644 --- a/src/libsyntax/ext/tt/macro_parser.rs +++ b/src/libsyntax/ext/tt/macro_parser.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This is an NFA-based parser, which calls out to the main rust parser for named nonterminals //! (which it commits to fully when it hits one in a grammar). There's a set of current NFA threads //! and a set of next ones. Instead of NTs, we have a special case for Kleene star. The big-O, in diff --git a/src/libsyntax/ext/tt/macro_rules.rs b/src/libsyntax/ext/tt/macro_rules.rs index 2c738ac2a04cd..e2594301300a5 100644 --- a/src/libsyntax/ext/tt/macro_rules.rs +++ b/src/libsyntax/ext/tt/macro_rules.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use {ast, attr}; use syntax_pos::{Span, DUMMY_SP}; use edition::Edition; diff --git a/src/libsyntax/ext/tt/quoted.rs b/src/libsyntax/ext/tt/quoted.rs index cc635a29275fa..0ba479ca9f993 100644 --- a/src/libsyntax/ext/tt/quoted.rs +++ b/src/libsyntax/ext/tt/quoted.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use ast::NodeId; use early_buffered_lints::BufferedEarlyLintId; use ext::tt::macro_parser; diff --git a/src/libsyntax/ext/tt/transcribe.rs b/src/libsyntax/ext/tt/transcribe.rs index 67a15b149f6d5..dd2417ba262ea 100644 --- a/src/libsyntax/ext/tt/transcribe.rs +++ b/src/libsyntax/ext/tt/transcribe.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use ast::Ident; use ext::base::ExtCtxt; use ext::expand::Marker; diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index 4ed96d269061b..73024cd8cb7c5 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Feature gating //! //! This module implements the gating necessary for preventing certain compiler diff --git a/src/libsyntax/fold.rs b/src/libsyntax/fold.rs index 660056e15e06b..54e15e787d52e 100644 --- a/src/libsyntax/fold.rs +++ b/src/libsyntax/fold.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A Folder represents an AST->AST fold; it accepts an AST piece, //! and returns a piece of the same type. So, for instance, macro //! expansion is a Folder that walks over an AST and produces another diff --git a/src/libsyntax/json.rs b/src/libsyntax/json.rs index b0cf29e9f63a4..88dfc15d9ce6d 100644 --- a/src/libsyntax/json.rs +++ b/src/libsyntax/json.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A JSON emitter for errors. //! //! This works by converting errors to a simplified structural format (see the diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs index 2aaab6aaa16d9..cd4599c8500cd 100644 --- a/src/libsyntax/lib.rs +++ b/src/libsyntax/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The Rust parser and macro expander. //! //! # Note diff --git a/src/libsyntax/parse/attr.rs b/src/libsyntax/parse/attr.rs index a240604bfe0ad..f76f9fbd3307f 100644 --- a/src/libsyntax/parse/attr.rs +++ b/src/libsyntax/parse/attr.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use attr; use ast; use source_map::respan; diff --git a/src/libsyntax/parse/classify.rs b/src/libsyntax/parse/classify.rs index 99f9d0511fe5e..a1cdfd9146a1e 100644 --- a/src/libsyntax/parse/classify.rs +++ b/src/libsyntax/parse/classify.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Routines the parser uses to classify AST nodes // Predicates on exprs and stmts that the pretty-printer and parser use diff --git a/src/libsyntax/parse/lexer/comments.rs b/src/libsyntax/parse/lexer/comments.rs index dde0466f43c2d..1d5fc11fa8d69 100644 --- a/src/libsyntax/parse/lexer/comments.rs +++ b/src/libsyntax/parse/lexer/comments.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub use self::CommentStyle::*; use ast; diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs index 448ff9676c927..8509733dca478 100644 --- a/src/libsyntax/parse/lexer/mod.rs +++ b/src/libsyntax/parse/lexer/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use ast::{self, Ident}; use syntax_pos::{self, BytePos, CharPos, Pos, Span, NO_EXPANSION}; use source_map::{SourceMap, FilePathMapping}; diff --git a/src/libsyntax/parse/lexer/tokentrees.rs b/src/libsyntax/parse/lexer/tokentrees.rs index e2fd7faf90387..fb44c4ca9d1a9 100644 --- a/src/libsyntax/parse/lexer/tokentrees.rs +++ b/src/libsyntax/parse/lexer/tokentrees.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use print::pprust::token_to_string; use parse::lexer::StringReader; use parse::{token, PResult}; diff --git a/src/libsyntax/parse/lexer/unicode_chars.rs b/src/libsyntax/parse/lexer/unicode_chars.rs index 03bf1b5a4e1ed..92371507ff525 100644 --- a/src/libsyntax/parse/lexer/unicode_chars.rs +++ b/src/libsyntax/parse/lexer/unicode_chars.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Characters and their corresponding confusables were collected from // http://www.unicode.org/Public/security/10.0.0/confusables.txt diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs index 1136cda5ee359..5e3f946e3cac3 100644 --- a/src/libsyntax/parse/mod.rs +++ b/src/libsyntax/parse/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The main parser interface use rustc_data_structures::sync::{Lrc, Lock}; diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 1e72f834b8ec6..18d833fe53029 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc_target::spec::abi::{self, Abi}; use ast::{AngleBracketedArgs, ParenthesisedArgs, AttrStyle, BareFnTy}; use ast::{GenericBound, TraitBoundModifier}; diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index 1d0c6b5317a38..4673488b3875d 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub use self::BinOpToken::*; pub use self::Nonterminal::*; pub use self::DelimToken::*; diff --git a/src/libsyntax/print/pp.rs b/src/libsyntax/print/pp.rs index 086de35d531c7..5a4a4a26f1ac2 100644 --- a/src/libsyntax/print/pp.rs +++ b/src/libsyntax/print/pp.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This pretty-printer is a direct reimplementation of Philip Karlton's //! Mesa pretty-printer, as described in appendix A of //! diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index be63c8f060a8e..83d2dae0f693b 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub use self::AnnNode::*; use rustc_target::spec::abi::{self, Abi}; diff --git a/src/libsyntax/ptr.rs b/src/libsyntax/ptr.rs index b86d19ba3ce00..c6ede651fccdb 100644 --- a/src/libsyntax/ptr.rs +++ b/src/libsyntax/ptr.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The AST pointer //! //! Provides `P`, a frozen owned smart pointer, as a replacement for `@T` in diff --git a/src/libsyntax/show_span.rs b/src/libsyntax/show_span.rs index 8ab2ba71ec1fa..4228e0c87ce33 100644 --- a/src/libsyntax/show_span.rs +++ b/src/libsyntax/show_span.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Span debugger //! //! This module shows spans for all expressions in the crate diff --git a/src/libsyntax/source_map.rs b/src/libsyntax/source_map.rs index c65931a857718..1388e0698744d 100644 --- a/src/libsyntax/source_map.rs +++ b/src/libsyntax/source_map.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The SourceMap tracks all the source code used within a single crate, mapping //! from integer byte positions to the original source code location. Each bit //! of source parsed during crate parsing (typically files, in-memory strings, diff --git a/src/libsyntax/std_inject.rs b/src/libsyntax/std_inject.rs index 1210f331b285b..de4243c3f7a86 100644 --- a/src/libsyntax/std_inject.rs +++ b/src/libsyntax/std_inject.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use ast; use attr; use std::cell::Cell; diff --git a/src/libsyntax/str.rs b/src/libsyntax/str.rs index 281861918fd8e..04b6f9a3bfff1 100644 --- a/src/libsyntax/str.rs +++ b/src/libsyntax/str.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[inline] pub fn char_at(s: &str, byte: usize) -> char { s[byte..].chars().next().unwrap() diff --git a/src/libsyntax/test.rs b/src/libsyntax/test.rs index 49ab0c2256e89..80fdd8ace6ba6 100644 --- a/src/libsyntax/test.rs +++ b/src/libsyntax/test.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Code that generates a test runner to run all the tests in a crate #![allow(dead_code)] diff --git a/src/libsyntax/test_snippet.rs b/src/libsyntax/test_snippet.rs index d49965fd93642..e0604772ec13a 100644 --- a/src/libsyntax/test_snippet.rs +++ b/src/libsyntax/test_snippet.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use source_map::{SourceMap, FilePathMapping}; use errors::Handler; use errors::emitter::EmitterWriter; diff --git a/src/libsyntax/tokenstream.rs b/src/libsyntax/tokenstream.rs index 840ee299bf338..3f6dc397431bc 100644 --- a/src/libsyntax/tokenstream.rs +++ b/src/libsyntax/tokenstream.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! # Token Streams //! //! `TokenStream`s represent syntactic objects before they are converted into ASTs. diff --git a/src/libsyntax/util/lev_distance.rs b/src/libsyntax/util/lev_distance.rs index e429791f2bdd4..6c95b8e00759e 100644 --- a/src/libsyntax/util/lev_distance.rs +++ b/src/libsyntax/util/lev_distance.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cmp; use symbol::Symbol; diff --git a/src/libsyntax/util/move_map.rs b/src/libsyntax/util/move_map.rs index eb2c5a2458c15..4bc54710a2240 100644 --- a/src/libsyntax/util/move_map.rs +++ b/src/libsyntax/util/move_map.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ptr; use OneVector; diff --git a/src/libsyntax/util/node_count.rs b/src/libsyntax/util/node_count.rs index ebb3081c1fde5..7dd213ae38b9e 100644 --- a/src/libsyntax/util/node_count.rs +++ b/src/libsyntax/util/node_count.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Simply gives a rought count of the number of nodes in an AST. use visit::*; diff --git a/src/libsyntax/util/parser.rs b/src/libsyntax/util/parser.rs index 6866806cd7c66..ca9cfc5ccbffe 100644 --- a/src/libsyntax/util/parser.rs +++ b/src/libsyntax/util/parser.rs @@ -1,12 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. use parse::token::{Token, BinOpToken}; use symbol::keywords; use ast::{self, BinOpKind}; diff --git a/src/libsyntax/util/parser_testing.rs b/src/libsyntax/util/parser_testing.rs index 374154e63333d..371be74f34faf 100644 --- a/src/libsyntax/util/parser_testing.rs +++ b/src/libsyntax/util/parser_testing.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use ast::{self, Ident}; use source_map::FilePathMapping; use parse::{ParseSess, PResult, source_file_to_stream}; diff --git a/src/libsyntax/util/rc_slice.rs b/src/libsyntax/util/rc_slice.rs index 520b7a48e3025..e1f7bd6ffab03 100644 --- a/src/libsyntax/util/rc_slice.rs +++ b/src/libsyntax/util/rc_slice.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt; use std::ops::{Deref, Range}; use rustc_data_structures::sync::Lrc; diff --git a/src/libsyntax/util/rc_vec.rs b/src/libsyntax/util/rc_vec.rs index 99fbce1ad91e1..74beb46f3f31f 100644 --- a/src/libsyntax/util/rc_vec.rs +++ b/src/libsyntax/util/rc_vec.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt; use std::ops::{Deref, Range}; diff --git a/src/libsyntax/visit.rs b/src/libsyntax/visit.rs index e57d692faae53..459400e12215c 100644 --- a/src/libsyntax/visit.rs +++ b/src/libsyntax/visit.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! AST walker. Each overridden visit method has full control over what //! happens with its node, it can do its own traversal of the node's children, //! call `visit::walk_*` to apply the default traversal algorithm, or prevent diff --git a/src/libsyntax_ext/asm.rs b/src/libsyntax_ext/asm.rs index 026ddccd7be97..5ae7120e0dec7 100644 --- a/src/libsyntax_ext/asm.rs +++ b/src/libsyntax_ext/asm.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Inline assembly support. // use self::State::*; diff --git a/src/libsyntax_ext/assert.rs b/src/libsyntax_ext/assert.rs index e3bd2ca01310b..b2f4cc84b76d2 100644 --- a/src/libsyntax_ext/assert.rs +++ b/src/libsyntax_ext/assert.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use syntax::ast::*; use syntax::source_map::Spanned; use syntax::ext::base::*; diff --git a/src/libsyntax_ext/cfg.rs b/src/libsyntax_ext/cfg.rs index 2384b6a796e19..7e3c1bbddf525 100644 --- a/src/libsyntax_ext/cfg.rs +++ b/src/libsyntax_ext/cfg.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// The compiler code necessary to support the cfg! extension, which expands to /// a literal `true` or `false` based on whether the given cfg matches the /// current compilation environment. diff --git a/src/libsyntax_ext/compile_error.rs b/src/libsyntax_ext/compile_error.rs index ce7fb400bd547..fd018885a26be 100644 --- a/src/libsyntax_ext/compile_error.rs +++ b/src/libsyntax_ext/compile_error.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // The compiler code necessary to support the compile_error! extension. use syntax::ext::base::*; diff --git a/src/libsyntax_ext/concat.rs b/src/libsyntax_ext/concat.rs index dcdd2c590e01f..a19c7e427e34c 100644 --- a/src/libsyntax_ext/concat.rs +++ b/src/libsyntax_ext/concat.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use syntax::ast; use syntax::ext::base; use syntax::ext::build::AstBuilder; diff --git a/src/libsyntax_ext/concat_idents.rs b/src/libsyntax_ext/concat_idents.rs index c8cc11e43545a..e2375c6cc19c1 100644 --- a/src/libsyntax_ext/concat_idents.rs +++ b/src/libsyntax_ext/concat_idents.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use rustc_data_structures::thin_vec::ThinVec; use syntax::ast; diff --git a/src/libsyntax_ext/deriving/bounds.rs b/src/libsyntax_ext/deriving/bounds.rs index 41e980b334616..dcfc6ab0391b8 100644 --- a/src/libsyntax_ext/deriving/bounds.rs +++ b/src/libsyntax_ext/deriving/bounds.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use deriving::path_std; use deriving::generic::*; use deriving::generic::ty::*; diff --git a/src/libsyntax_ext/deriving/clone.rs b/src/libsyntax_ext/deriving/clone.rs index ec935b3e72f23..3384fae7fdca8 100644 --- a/src/libsyntax_ext/deriving/clone.rs +++ b/src/libsyntax_ext/deriving/clone.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use deriving::path_std; use deriving::generic::*; use deriving::generic::ty::*; diff --git a/src/libsyntax_ext/deriving/cmp/eq.rs b/src/libsyntax_ext/deriving/cmp/eq.rs index f202bc4e524d2..dbba8c3b7a006 100644 --- a/src/libsyntax_ext/deriving/cmp/eq.rs +++ b/src/libsyntax_ext/deriving/cmp/eq.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use deriving::path_std; use deriving::generic::*; use deriving::generic::ty::*; diff --git a/src/libsyntax_ext/deriving/cmp/ord.rs b/src/libsyntax_ext/deriving/cmp/ord.rs index 117bedf453e6c..21bd56710ac9b 100644 --- a/src/libsyntax_ext/deriving/cmp/ord.rs +++ b/src/libsyntax_ext/deriving/cmp/ord.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use deriving::path_std; use deriving::generic::*; use deriving::generic::ty::*; diff --git a/src/libsyntax_ext/deriving/cmp/partial_eq.rs b/src/libsyntax_ext/deriving/cmp/partial_eq.rs index 24a3a7542fb66..4ec24bce4cd48 100644 --- a/src/libsyntax_ext/deriving/cmp/partial_eq.rs +++ b/src/libsyntax_ext/deriving/cmp/partial_eq.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use deriving::{path_local, path_std}; use deriving::generic::*; use deriving::generic::ty::*; diff --git a/src/libsyntax_ext/deriving/cmp/partial_ord.rs b/src/libsyntax_ext/deriving/cmp/partial_ord.rs index 3705a245584d0..b6eab9ce51f49 100644 --- a/src/libsyntax_ext/deriving/cmp/partial_ord.rs +++ b/src/libsyntax_ext/deriving/cmp/partial_ord.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub use self::OrderingOp::*; use deriving::{path_local, pathvec_std, path_std}; diff --git a/src/libsyntax_ext/deriving/custom.rs b/src/libsyntax_ext/deriving/custom.rs index 973ad631b8343..579a0b5feebee 100644 --- a/src/libsyntax_ext/deriving/custom.rs +++ b/src/libsyntax_ext/deriving/custom.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::panic; use errors::FatalError; diff --git a/src/libsyntax_ext/deriving/debug.rs b/src/libsyntax_ext/deriving/debug.rs index df9c351ef1c95..b3e5bd9283ef6 100644 --- a/src/libsyntax_ext/deriving/debug.rs +++ b/src/libsyntax_ext/deriving/debug.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use deriving::path_std; use deriving::generic::*; use deriving::generic::ty::*; diff --git a/src/libsyntax_ext/deriving/decodable.rs b/src/libsyntax_ext/deriving/decodable.rs index c2b9294499907..89c630e991530 100644 --- a/src/libsyntax_ext/deriving/decodable.rs +++ b/src/libsyntax_ext/deriving/decodable.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The compiler code necessary for `#[derive(Decodable)]`. See encodable.rs for more. use deriving::{self, pathvec_std}; diff --git a/src/libsyntax_ext/deriving/default.rs b/src/libsyntax_ext/deriving/default.rs index adbc5828b8fb8..c26c4bb627400 100644 --- a/src/libsyntax_ext/deriving/default.rs +++ b/src/libsyntax_ext/deriving/default.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use deriving::path_std; use deriving::generic::*; use deriving::generic::ty::*; diff --git a/src/libsyntax_ext/deriving/encodable.rs b/src/libsyntax_ext/deriving/encodable.rs index 5438c8b52af05..c8935874158a2 100644 --- a/src/libsyntax_ext/deriving/encodable.rs +++ b/src/libsyntax_ext/deriving/encodable.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The compiler code necessary to implement the `#[derive(Encodable)]` //! (and `Decodable`, in decodable.rs) extension. The idea here is that //! type-defining items may be tagged with `#[derive(Encodable, Decodable)]`. diff --git a/src/libsyntax_ext/deriving/generic/mod.rs b/src/libsyntax_ext/deriving/generic/mod.rs index 28a2c11ceb104..33c37de5a4aff 100644 --- a/src/libsyntax_ext/deriving/generic/mod.rs +++ b/src/libsyntax_ext/deriving/generic/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Some code that abstracts away much of the boilerplate of writing //! `derive` instances for traits. Among other things it manages getting //! access to the fields of the 4 different sorts of structs and enum diff --git a/src/libsyntax_ext/deriving/generic/ty.rs b/src/libsyntax_ext/deriving/generic/ty.rs index fa284f4ab0e17..ebc2b547e4437 100644 --- a/src/libsyntax_ext/deriving/generic/ty.rs +++ b/src/libsyntax_ext/deriving/generic/ty.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A mini version of ast::Ty, which is easier to use, and features an explicit `Self` type to use //! when specifying impls to be derived. diff --git a/src/libsyntax_ext/deriving/hash.rs b/src/libsyntax_ext/deriving/hash.rs index 950e8c84f1765..4af2bd57b00e2 100644 --- a/src/libsyntax_ext/deriving/hash.rs +++ b/src/libsyntax_ext/deriving/hash.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use deriving::{self, pathvec_std, path_std}; use deriving::generic::*; use deriving::generic::ty::*; diff --git a/src/libsyntax_ext/deriving/mod.rs b/src/libsyntax_ext/deriving/mod.rs index ae47a028bc386..85b864dee532f 100644 --- a/src/libsyntax_ext/deriving/mod.rs +++ b/src/libsyntax_ext/deriving/mod.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The compiler code necessary to implement the `#[derive]` extensions. use rustc_data_structures::sync::Lrc; diff --git a/src/libsyntax_ext/diagnostics.rs b/src/libsyntax_ext/diagnostics.rs index f99a6c3c2166d..e8ad4af68508e 100644 --- a/src/libsyntax_ext/diagnostics.rs +++ b/src/libsyntax_ext/diagnostics.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(non_snake_case)] // Error messages for EXXXX errors. diff --git a/src/libsyntax_ext/env.rs b/src/libsyntax_ext/env.rs index 8f26b2402aadf..33669c8bc37ec 100644 --- a/src/libsyntax_ext/env.rs +++ b/src/libsyntax_ext/env.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // The compiler code necessary to support the env! extension. Eventually this // should all get sucked into either the compiler syntax extension plugin // interface. diff --git a/src/libsyntax_ext/format.rs b/src/libsyntax_ext/format.rs index b23c2ec3db101..577051d1ea2f8 100644 --- a/src/libsyntax_ext/format.rs +++ b/src/libsyntax_ext/format.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use self::ArgumentType::*; use self::Position::*; diff --git a/src/libsyntax_ext/format_foreign.rs b/src/libsyntax_ext/format_foreign.rs index 6eba3c4f2bbc9..395d8b27594be 100644 --- a/src/libsyntax_ext/format_foreign.rs +++ b/src/libsyntax_ext/format_foreign.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod printf { use super::strcursor::StrCursor as Cur; diff --git a/src/libsyntax_ext/global_asm.rs b/src/libsyntax_ext/global_asm.rs index 1130a50537d01..ac8a1acb49583 100644 --- a/src/libsyntax_ext/global_asm.rs +++ b/src/libsyntax_ext/global_asm.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// Module-level assembly support. /// /// The macro defined here allows you to specify "top-level", diff --git a/src/libsyntax_ext/lib.rs b/src/libsyntax_ext/lib.rs index 790a42007fb1d..462247a5d27ba 100644 --- a/src/libsyntax_ext/lib.rs +++ b/src/libsyntax_ext/lib.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Syntax extensions in the Rust compiler. #![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png", diff --git a/src/libsyntax_ext/log_syntax.rs b/src/libsyntax_ext/log_syntax.rs index 7b76b1e891468..5f24ed81cddb9 100644 --- a/src/libsyntax_ext/log_syntax.rs +++ b/src/libsyntax_ext/log_syntax.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use syntax::ext::base; use syntax::feature_gate; use syntax::print; diff --git a/src/libsyntax_ext/proc_macro_impl.rs b/src/libsyntax_ext/proc_macro_impl.rs index ff60262055bf3..b169855d5523b 100644 --- a/src/libsyntax_ext/proc_macro_impl.rs +++ b/src/libsyntax_ext/proc_macro_impl.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::panic; use errors::FatalError; diff --git a/src/libsyntax_ext/proc_macro_registrar.rs b/src/libsyntax_ext/proc_macro_registrar.rs index 65e175f95df81..5204d80edf475 100644 --- a/src/libsyntax_ext/proc_macro_registrar.rs +++ b/src/libsyntax_ext/proc_macro_registrar.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::mem; use errors; diff --git a/src/libsyntax_ext/trace_macros.rs b/src/libsyntax_ext/trace_macros.rs index 256b525b8bea6..f17c6de19d967 100644 --- a/src/libsyntax_ext/trace_macros.rs +++ b/src/libsyntax_ext/trace_macros.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use syntax::ext::base::ExtCtxt; use syntax::ext::base; use syntax::feature_gate; diff --git a/src/libsyntax_pos/analyze_source_file.rs b/src/libsyntax_pos/analyze_source_file.rs index e468aaac7a306..74830ae73e115 100644 --- a/src/libsyntax_pos/analyze_source_file.rs +++ b/src/libsyntax_pos/analyze_source_file.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use unicode_width::UnicodeWidthChar; use super::*; diff --git a/src/libsyntax_pos/edition.rs b/src/libsyntax_pos/edition.rs index fce8fc3db4e4e..0841175f2a1ca 100644 --- a/src/libsyntax_pos/edition.rs +++ b/src/libsyntax_pos/edition.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt; use std::str::FromStr; diff --git a/src/libsyntax_pos/hygiene.rs b/src/libsyntax_pos/hygiene.rs index 99342f362360b..eb22b270a616a 100644 --- a/src/libsyntax_pos/hygiene.rs +++ b/src/libsyntax_pos/hygiene.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Machinery for hygienic macros, inspired by the `MTWT[1]` paper. //! //! `[1]` Matthew Flatt, Ryan Culpepper, David Darais, and Robert Bruce Findler. 2012. diff --git a/src/libsyntax_pos/lib.rs b/src/libsyntax_pos/lib.rs index bd70344b01812..4564c125aaf10 100644 --- a/src/libsyntax_pos/lib.rs +++ b/src/libsyntax_pos/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The source positions and related helper functions //! //! # Note diff --git a/src/libsyntax_pos/span_encoding.rs b/src/libsyntax_pos/span_encoding.rs index 473aa1bd1b8a4..8cb3bc2144da1 100644 --- a/src/libsyntax_pos/span_encoding.rs +++ b/src/libsyntax_pos/span_encoding.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Spans are encoded using 1-bit tag and 2 different encoding formats (one for each tag value). // One format is used for keeping span data inline, // another contains index into an out-of-line span interner. diff --git a/src/libsyntax_pos/symbol.rs b/src/libsyntax_pos/symbol.rs index defdca9abd15a..855025e66bf35 100644 --- a/src/libsyntax_pos/symbol.rs +++ b/src/libsyntax_pos/symbol.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! An "interner" is a data structure that associates values with usize tags and //! allows bidirectional lookup; i.e. given a value, one can easily find the //! type, and vice versa. diff --git a/src/libterm/lib.rs b/src/libterm/lib.rs index a49fd67639dbe..d754ed6273cae 100644 --- a/src/libterm/lib.rs +++ b/src/libterm/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Terminal formatting library. //! //! This crate provides the `Terminal` trait, which abstracts over an [ANSI diff --git a/src/libterm/terminfo/mod.rs b/src/libterm/terminfo/mod.rs index adfc7078ebacb..eaa96df3f3bad 100644 --- a/src/libterm/terminfo/mod.rs +++ b/src/libterm/terminfo/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Terminfo database interface. use std::collections::HashMap; diff --git a/src/libterm/terminfo/parm.rs b/src/libterm/terminfo/parm.rs index 31e1b18485ca4..434dd4a9fbc99 100644 --- a/src/libterm/terminfo/parm.rs +++ b/src/libterm/terminfo/parm.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Parameterized string expansion use self::Param::*; diff --git a/src/libterm/terminfo/parser/compiled.rs b/src/libterm/terminfo/parser/compiled.rs index 57dcfb0d9064d..63d018312697b 100644 --- a/src/libterm/terminfo/parser/compiled.rs +++ b/src/libterm/terminfo/parser/compiled.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(non_upper_case_globals, missing_docs)] //! ncurses-compatible compiled terminfo format parsing (term(5)) diff --git a/src/libterm/terminfo/searcher.rs b/src/libterm/terminfo/searcher.rs index 492d26e625cbe..692b81f64512a 100644 --- a/src/libterm/terminfo/searcher.rs +++ b/src/libterm/terminfo/searcher.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! ncurses-compatible database discovery //! //! Does not support hashed database, only filesystem! diff --git a/src/libterm/win.rs b/src/libterm/win.rs index e0b60eead497a..25b03ba59acbc 100644 --- a/src/libterm/win.rs +++ b/src/libterm/win.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Windows console handling // FIXME (#13400): this is only a tiny fraction of the Windows console api diff --git a/src/libtest/formatters/json.rs b/src/libtest/formatters/json.rs index 89235d897bde6..7be92716ecc45 100644 --- a/src/libtest/formatters/json.rs +++ b/src/libtest/formatters/json.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::*; pub(crate) struct JsonFormatter { diff --git a/src/libtest/formatters/mod.rs b/src/libtest/formatters/mod.rs index 24c7929076c1d..be5f6a65039b7 100644 --- a/src/libtest/formatters/mod.rs +++ b/src/libtest/formatters/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::*; mod pretty; diff --git a/src/libtest/formatters/pretty.rs b/src/libtest/formatters/pretty.rs index f94780682a0c0..4af00428ca87e 100644 --- a/src/libtest/formatters/pretty.rs +++ b/src/libtest/formatters/pretty.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::*; pub(crate) struct PrettyFormatter { diff --git a/src/libtest/formatters/terse.rs b/src/libtest/formatters/terse.rs index 22a06b9f605db..50548ad0ff10f 100644 --- a/src/libtest/formatters/terse.rs +++ b/src/libtest/formatters/terse.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::*; pub(crate) struct TerseFormatter { diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index 060ea1ea9b132..31a1cc68a5ce1 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Support code for rustc's built in unit-test and micro-benchmarking //! framework. //! diff --git a/src/libtest/stats.rs b/src/libtest/stats.rs index ddb5dcf2a1cd3..dd92c99eb0e73 100644 --- a/src/libtest/stats.rs +++ b/src/libtest/stats.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(missing_docs)] #![allow(deprecated)] // Float diff --git a/src/libunwind/build.rs b/src/libunwind/build.rs index 11c4c2faf1342..b50a11fa03ab6 100644 --- a/src/libunwind/build.rs +++ b/src/libunwind/build.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::env; fn main() { diff --git a/src/libunwind/lib.rs b/src/libunwind/lib.rs index 424a7e3d009ec..de625d5d3e944 100644 --- a/src/libunwind/lib.rs +++ b/src/libunwind/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![no_std] #![unstable(feature = "panic_unwind", issue = "32837")] diff --git a/src/libunwind/libunwind.rs b/src/libunwind/libunwind.rs index 73a259bd4438e..605250dc00c9f 100644 --- a/src/libunwind/libunwind.rs +++ b/src/libunwind/libunwind.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(bad_style)] macro_rules! cfg_if { diff --git a/src/libunwind/macros.rs b/src/libunwind/macros.rs index a962d5fc41537..659e977285e35 100644 --- a/src/libunwind/macros.rs +++ b/src/libunwind/macros.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// A macro for defining `#[cfg]` if-else statements. /// /// This is similar to the `if/elif` C preprocessor macro by allowing definition diff --git a/src/rtstartup/rsbegin.rs b/src/rtstartup/rsbegin.rs index 8ff401164c135..0e78fc4d80139 100644 --- a/src/rtstartup/rsbegin.rs +++ b/src/rtstartup/rsbegin.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // rsbegin.o and rsend.o are the so called "compiler runtime startup objects". // They contain code needed to correctly initialize the compiler runtime. // diff --git a/src/rtstartup/rsend.rs b/src/rtstartup/rsend.rs index f487f1d410e03..4023c2fe23dc8 100644 --- a/src/rtstartup/rsend.rs +++ b/src/rtstartup/rsend.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // See rsbegin.rs for details. #![feature(no_core, lang_items, optin_builtin_traits)] diff --git a/src/rustc/compiler_builtins_shim/build.rs b/src/rustc/compiler_builtins_shim/build.rs index b37543e5f679d..2ff8e09d30e03 100644 --- a/src/rustc/compiler_builtins_shim/build.rs +++ b/src/rustc/compiler_builtins_shim/build.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file is left intentionally empty (and not removed) to avoid an issue // where this crate is always considered dirty due to compiler-builtins' // `cargo:rerun-if-changed=build.rs` directive; since the path is relative, it diff --git a/src/rustc/rustc.rs b/src/rustc/rustc.rs index ab5a7c3f747eb..9a39f402d83b5 100644 --- a/src/rustc/rustc.rs +++ b/src/rustc/rustc.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_private)] #![feature(link_args)] diff --git a/src/test/codegen-units/item-collection/auxiliary/cgu_export_trait_method.rs b/src/test/codegen-units/item-collection/auxiliary/cgu_export_trait_method.rs index 49b8e43836e52..ecea26dc4be46 100644 --- a/src/test/codegen-units/item-collection/auxiliary/cgu_export_trait_method.rs +++ b/src/test/codegen-units/item-collection/auxiliary/cgu_export_trait_method.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] pub trait Trait : Sized { diff --git a/src/test/codegen-units/item-collection/auxiliary/cgu_extern_closures.rs b/src/test/codegen-units/item-collection/auxiliary/cgu_extern_closures.rs index 944d85db50806..05ea0a89ff29c 100644 --- a/src/test/codegen-units/item-collection/auxiliary/cgu_extern_closures.rs +++ b/src/test/codegen-units/item-collection/auxiliary/cgu_extern_closures.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] #[inline] diff --git a/src/test/codegen-units/item-collection/auxiliary/cgu_generic_function.rs b/src/test/codegen-units/item-collection/auxiliary/cgu_generic_function.rs index 04c68748eca0e..976cbb2b44b68 100644 --- a/src/test/codegen-units/item-collection/auxiliary/cgu_generic_function.rs +++ b/src/test/codegen-units/item-collection/auxiliary/cgu_generic_function.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] struct Struct(u32); diff --git a/src/test/codegen-units/item-collection/cross-crate-closures.rs b/src/test/codegen-units/item-collection/cross-crate-closures.rs index a26604d3ce969..bd04422c39f76 100644 --- a/src/test/codegen-units/item-collection/cross-crate-closures.rs +++ b/src/test/codegen-units/item-collection/cross-crate-closures.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // In the current version of the collector that still has to support // legacy-codegen, closures do not generate their own MonoItems, so we are // ignoring this test until MIR codegen has taken over completely diff --git a/src/test/codegen-units/item-collection/cross-crate-generic-functions.rs b/src/test/codegen-units/item-collection/cross-crate-generic-functions.rs index aa33c25da9a24..cf7bde4a091d2 100644 --- a/src/test/codegen-units/item-collection/cross-crate-generic-functions.rs +++ b/src/test/codegen-units/item-collection/cross-crate-generic-functions.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags:-Zprint-mono-items=eager diff --git a/src/test/codegen-units/item-collection/cross-crate-trait-method.rs b/src/test/codegen-units/item-collection/cross-crate-trait-method.rs index 2951ee4f6c94b..8a19a7bd9f8fa 100644 --- a/src/test/codegen-units/item-collection/cross-crate-trait-method.rs +++ b/src/test/codegen-units/item-collection/cross-crate-trait-method.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags:-Zprint-mono-items=eager diff --git a/src/test/codegen-units/item-collection/drop_in_place_intrinsic.rs b/src/test/codegen-units/item-collection/drop_in_place_intrinsic.rs index cec88f1c6a245..27fb3cb1380d3 100644 --- a/src/test/codegen-units/item-collection/drop_in_place_intrinsic.rs +++ b/src/test/codegen-units/item-collection/drop_in_place_intrinsic.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags:-Zprint-mono-items=eager // compile-flags:-Zinline-in-all-cgus diff --git a/src/test/codegen-units/item-collection/function-as-argument.rs b/src/test/codegen-units/item-collection/function-as-argument.rs index 9a88336d1e57e..bdf6826f21aa8 100644 --- a/src/test/codegen-units/item-collection/function-as-argument.rs +++ b/src/test/codegen-units/item-collection/function-as-argument.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags:-Zprint-mono-items=eager diff --git a/src/test/codegen-units/item-collection/generic-drop-glue.rs b/src/test/codegen-units/item-collection/generic-drop-glue.rs index 5afa519bc5902..675bdfdb4d250 100644 --- a/src/test/codegen-units/item-collection/generic-drop-glue.rs +++ b/src/test/codegen-units/item-collection/generic-drop-glue.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags:-Zprint-mono-items=eager // compile-flags:-Zinline-in-all-cgus diff --git a/src/test/codegen-units/item-collection/generic-functions.rs b/src/test/codegen-units/item-collection/generic-functions.rs index 402d19f9996ce..f879724c9a16c 100644 --- a/src/test/codegen-units/item-collection/generic-functions.rs +++ b/src/test/codegen-units/item-collection/generic-functions.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags:-Zprint-mono-items=eager diff --git a/src/test/codegen-units/item-collection/generic-impl.rs b/src/test/codegen-units/item-collection/generic-impl.rs index 07e51a1e94722..01b4e5301833e 100644 --- a/src/test/codegen-units/item-collection/generic-impl.rs +++ b/src/test/codegen-units/item-collection/generic-impl.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags:-Zprint-mono-items=eager diff --git a/src/test/codegen-units/item-collection/impl-in-non-instantiated-generic.rs b/src/test/codegen-units/item-collection/impl-in-non-instantiated-generic.rs index 6d65c0d3aa8b4..702ecba321e3e 100644 --- a/src/test/codegen-units/item-collection/impl-in-non-instantiated-generic.rs +++ b/src/test/codegen-units/item-collection/impl-in-non-instantiated-generic.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags:-Zprint-mono-items=eager diff --git a/src/test/codegen-units/item-collection/instantiation-through-vtable.rs b/src/test/codegen-units/item-collection/instantiation-through-vtable.rs index d09d343a8458e..db0390b58c84a 100644 --- a/src/test/codegen-units/item-collection/instantiation-through-vtable.rs +++ b/src/test/codegen-units/item-collection/instantiation-through-vtable.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags:-Zprint-mono-items=eager // compile-flags:-Zinline-in-all-cgus diff --git a/src/test/codegen-units/item-collection/items-within-generic-items.rs b/src/test/codegen-units/item-collection/items-within-generic-items.rs index f9813063831f9..748b6094a2a40 100644 --- a/src/test/codegen-units/item-collection/items-within-generic-items.rs +++ b/src/test/codegen-units/item-collection/items-within-generic-items.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags:-Zprint-mono-items=eager diff --git a/src/test/codegen-units/item-collection/non-generic-closures.rs b/src/test/codegen-units/item-collection/non-generic-closures.rs index 77ada23de714c..affdda3904372 100644 --- a/src/test/codegen-units/item-collection/non-generic-closures.rs +++ b/src/test/codegen-units/item-collection/non-generic-closures.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // In the current version of the collector that still has to support // legacy-codegen, closures do not generate their own MonoItems, so we are // ignoring this test until MIR codegen has taken over completely diff --git a/src/test/codegen-units/item-collection/non-generic-drop-glue.rs b/src/test/codegen-units/item-collection/non-generic-drop-glue.rs index a939dd56cda5b..a899b8b2c8b9c 100644 --- a/src/test/codegen-units/item-collection/non-generic-drop-glue.rs +++ b/src/test/codegen-units/item-collection/non-generic-drop-glue.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags:-Zprint-mono-items=eager // compile-flags:-Zinline-in-all-cgus diff --git a/src/test/codegen-units/item-collection/non-generic-functions.rs b/src/test/codegen-units/item-collection/non-generic-functions.rs index 38d08c8a6ed2a..e147b54fdaf08 100644 --- a/src/test/codegen-units/item-collection/non-generic-functions.rs +++ b/src/test/codegen-units/item-collection/non-generic-functions.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags:-Zprint-mono-items=eager diff --git a/src/test/codegen-units/item-collection/overloaded-operators.rs b/src/test/codegen-units/item-collection/overloaded-operators.rs index dae6ef8355126..db91486012ddf 100644 --- a/src/test/codegen-units/item-collection/overloaded-operators.rs +++ b/src/test/codegen-units/item-collection/overloaded-operators.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags:-Zprint-mono-items=eager diff --git a/src/test/codegen-units/item-collection/static-init.rs b/src/test/codegen-units/item-collection/static-init.rs index f36c4903458ee..397bccc4bf834 100644 --- a/src/test/codegen-units/item-collection/static-init.rs +++ b/src/test/codegen-units/item-collection/static-init.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-Zprint-mono-items=eager // ignore-tidy-linelength diff --git a/src/test/codegen-units/item-collection/statics-and-consts.rs b/src/test/codegen-units/item-collection/statics-and-consts.rs index 883809ff05966..db2d83aeefabd 100644 --- a/src/test/codegen-units/item-collection/statics-and-consts.rs +++ b/src/test/codegen-units/item-collection/statics-and-consts.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags:-Zprint-mono-items=eager diff --git a/src/test/codegen-units/item-collection/trait-implementations.rs b/src/test/codegen-units/item-collection/trait-implementations.rs index f85486b5d3478..004198a624ef6 100644 --- a/src/test/codegen-units/item-collection/trait-implementations.rs +++ b/src/test/codegen-units/item-collection/trait-implementations.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags:-Zprint-mono-items=eager diff --git a/src/test/codegen-units/item-collection/trait-method-as-argument.rs b/src/test/codegen-units/item-collection/trait-method-as-argument.rs index 1f08f0f806014..cab4a70913422 100644 --- a/src/test/codegen-units/item-collection/trait-method-as-argument.rs +++ b/src/test/codegen-units/item-collection/trait-method-as-argument.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags:-Zprint-mono-items=eager diff --git a/src/test/codegen-units/item-collection/trait-method-default-impl.rs b/src/test/codegen-units/item-collection/trait-method-default-impl.rs index b130747972e38..ba99d430acc62 100644 --- a/src/test/codegen-units/item-collection/trait-method-default-impl.rs +++ b/src/test/codegen-units/item-collection/trait-method-default-impl.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags:-Zprint-mono-items=eager diff --git a/src/test/codegen-units/item-collection/transitive-drop-glue.rs b/src/test/codegen-units/item-collection/transitive-drop-glue.rs index 7bbc9b6d0fbc9..7e29af43538fd 100644 --- a/src/test/codegen-units/item-collection/transitive-drop-glue.rs +++ b/src/test/codegen-units/item-collection/transitive-drop-glue.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags:-Zprint-mono-items=eager // compile-flags:-Zinline-in-all-cgus diff --git a/src/test/codegen-units/item-collection/tuple-drop-glue.rs b/src/test/codegen-units/item-collection/tuple-drop-glue.rs index 865570ccfa55a..d77de53ce010d 100644 --- a/src/test/codegen-units/item-collection/tuple-drop-glue.rs +++ b/src/test/codegen-units/item-collection/tuple-drop-glue.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags:-Zprint-mono-items=eager // compile-flags:-Zinline-in-all-cgus diff --git a/src/test/codegen-units/item-collection/unreferenced-const-fn.rs b/src/test/codegen-units/item-collection/unreferenced-const-fn.rs index c2ff846721c5f..9197107ae8171 100644 --- a/src/test/codegen-units/item-collection/unreferenced-const-fn.rs +++ b/src/test/codegen-units/item-collection/unreferenced-const-fn.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags:-Zprint-mono-items=lazy diff --git a/src/test/codegen-units/item-collection/unreferenced-inline-function.rs b/src/test/codegen-units/item-collection/unreferenced-inline-function.rs index 829b4fbf3c92b..80c7787323803 100644 --- a/src/test/codegen-units/item-collection/unreferenced-inline-function.rs +++ b/src/test/codegen-units/item-collection/unreferenced-inline-function.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags:-Zprint-mono-items=lazy diff --git a/src/test/codegen-units/item-collection/unsizing.rs b/src/test/codegen-units/item-collection/unsizing.rs index 5e9a3258c7adf..3e224e9a31a79 100644 --- a/src/test/codegen-units/item-collection/unsizing.rs +++ b/src/test/codegen-units/item-collection/unsizing.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags:-Zprint-mono-items=eager // compile-flags:-Zinline-in-all-cgus diff --git a/src/test/codegen-units/item-collection/unused-traits-and-generics.rs b/src/test/codegen-units/item-collection/unused-traits-and-generics.rs index 2edc7b211a1ba..598efdbdad1bc 100644 --- a/src/test/codegen-units/item-collection/unused-traits-and-generics.rs +++ b/src/test/codegen-units/item-collection/unused-traits-and-generics.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags:-Zprint-mono-items=eager diff --git a/src/test/codegen-units/partitioning/auxiliary/cgu_explicit_inlining.rs b/src/test/codegen-units/partitioning/auxiliary/cgu_explicit_inlining.rs index e4ba9fae41246..4a3a63cc1b4ad 100644 --- a/src/test/codegen-units/partitioning/auxiliary/cgu_explicit_inlining.rs +++ b/src/test/codegen-units/partitioning/auxiliary/cgu_explicit_inlining.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] #[inline] diff --git a/src/test/codegen-units/partitioning/auxiliary/cgu_extern_drop_glue.rs b/src/test/codegen-units/partitioning/auxiliary/cgu_extern_drop_glue.rs index 049bdb46579ee..b5fec23375a5e 100644 --- a/src/test/codegen-units/partitioning/auxiliary/cgu_extern_drop_glue.rs +++ b/src/test/codegen-units/partitioning/auxiliary/cgu_extern_drop_glue.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] pub struct Struct(pub u32); diff --git a/src/test/codegen-units/partitioning/auxiliary/cgu_generic_function.rs b/src/test/codegen-units/partitioning/auxiliary/cgu_generic_function.rs index 04c68748eca0e..976cbb2b44b68 100644 --- a/src/test/codegen-units/partitioning/auxiliary/cgu_generic_function.rs +++ b/src/test/codegen-units/partitioning/auxiliary/cgu_generic_function.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] struct Struct(u32); diff --git a/src/test/codegen-units/partitioning/auxiliary/shared_generics_aux.rs b/src/test/codegen-units/partitioning/auxiliary/shared_generics_aux.rs index b742da8a9001f..d50a7910fe0b3 100644 --- a/src/test/codegen-units/partitioning/auxiliary/shared_generics_aux.rs +++ b/src/test/codegen-units/partitioning/auxiliary/shared_generics_aux.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-Zshare-generics=yes #![crate_type="rlib"] diff --git a/src/test/codegen-units/partitioning/extern-drop-glue.rs b/src/test/codegen-units/partitioning/extern-drop-glue.rs index cbad3a638840c..f85ae0c077486 100644 --- a/src/test/codegen-units/partitioning/extern-drop-glue.rs +++ b/src/test/codegen-units/partitioning/extern-drop-glue.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // We specify -Z incremental here because we want to test the partitioning for diff --git a/src/test/codegen-units/partitioning/extern-generic.rs b/src/test/codegen-units/partitioning/extern-generic.rs index a774376690a97..7d805acb36c2d 100644 --- a/src/test/codegen-units/partitioning/extern-generic.rs +++ b/src/test/codegen-units/partitioning/extern-generic.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // We specify -Z incremental here because we want to test the partitioning for // incremental compilation diff --git a/src/test/codegen-units/partitioning/inlining-from-extern-crate.rs b/src/test/codegen-units/partitioning/inlining-from-extern-crate.rs index 4136557d80044..e943f54a40631 100644 --- a/src/test/codegen-units/partitioning/inlining-from-extern-crate.rs +++ b/src/test/codegen-units/partitioning/inlining-from-extern-crate.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // We specify -Z incremental here because we want to test the partitioning for // incremental compilation diff --git a/src/test/codegen-units/partitioning/local-drop-glue.rs b/src/test/codegen-units/partitioning/local-drop-glue.rs index 98729d99ea950..366af4d4c386b 100644 --- a/src/test/codegen-units/partitioning/local-drop-glue.rs +++ b/src/test/codegen-units/partitioning/local-drop-glue.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // We specify -Z incremental here because we want to test the partitioning for // incremental compilation diff --git a/src/test/codegen-units/partitioning/local-generic.rs b/src/test/codegen-units/partitioning/local-generic.rs index 7c8ca20e1e3c0..dcff638b0b1ce 100644 --- a/src/test/codegen-units/partitioning/local-generic.rs +++ b/src/test/codegen-units/partitioning/local-generic.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // We specify -Z incremental here because we want to test the partitioning for // incremental compilation diff --git a/src/test/codegen-units/partitioning/local-inlining-but-not-all.rs b/src/test/codegen-units/partitioning/local-inlining-but-not-all.rs index 747f768c11ff2..18211fad31e58 100644 --- a/src/test/codegen-units/partitioning/local-inlining-but-not-all.rs +++ b/src/test/codegen-units/partitioning/local-inlining-but-not-all.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // We specify -Z incremental here because we want to test the partitioning for // incremental compilation diff --git a/src/test/codegen-units/partitioning/local-inlining.rs b/src/test/codegen-units/partitioning/local-inlining.rs index f144f0d992bf0..7aa83e4bf4163 100644 --- a/src/test/codegen-units/partitioning/local-inlining.rs +++ b/src/test/codegen-units/partitioning/local-inlining.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // We specify -Z incremental here because we want to test the partitioning for // incremental compilation diff --git a/src/test/codegen-units/partitioning/local-transitive-inlining.rs b/src/test/codegen-units/partitioning/local-transitive-inlining.rs index 8637844a83d08..5bc56146794bf 100644 --- a/src/test/codegen-units/partitioning/local-transitive-inlining.rs +++ b/src/test/codegen-units/partitioning/local-transitive-inlining.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // We specify -Z incremental here because we want to test the partitioning for // incremental compilation diff --git a/src/test/codegen-units/partitioning/methods-are-with-self-type.rs b/src/test/codegen-units/partitioning/methods-are-with-self-type.rs index ff25a7194e072..c2961ed9322ad 100644 --- a/src/test/codegen-units/partitioning/methods-are-with-self-type.rs +++ b/src/test/codegen-units/partitioning/methods-are-with-self-type.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Currently, all generic functions are instantiated in each codegen unit that // uses them, even those not marked with #[inline], so this test does not make // much sense at the moment. diff --git a/src/test/codegen-units/partitioning/regular-modules.rs b/src/test/codegen-units/partitioning/regular-modules.rs index e1ec6f51b30b6..f42dc3dfc17a9 100644 --- a/src/test/codegen-units/partitioning/regular-modules.rs +++ b/src/test/codegen-units/partitioning/regular-modules.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // We specify -Z incremental here because we want to test the partitioning for // incremental compilation diff --git a/src/test/codegen-units/partitioning/shared-generics.rs b/src/test/codegen-units/partitioning/shared-generics.rs index 880361fac2ee0..688fb457dbad4 100644 --- a/src/test/codegen-units/partitioning/shared-generics.rs +++ b/src/test/codegen-units/partitioning/shared-generics.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags:-Zprint-mono-items=eager -Zshare-generics=yes -Zincremental=tmp/partitioning-tests/shared-generics-exe diff --git a/src/test/codegen-units/partitioning/statics.rs b/src/test/codegen-units/partitioning/statics.rs index b6c1e5210dacc..40483318795b1 100644 --- a/src/test/codegen-units/partitioning/statics.rs +++ b/src/test/codegen-units/partitioning/statics.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // We specify -Z incremental here because we want to test the partitioning for // incremental compilation diff --git a/src/test/codegen-units/partitioning/vtable-through-const.rs b/src/test/codegen-units/partitioning/vtable-through-const.rs index 74533c1015b60..14667c5e08c0c 100644 --- a/src/test/codegen-units/partitioning/vtable-through-const.rs +++ b/src/test/codegen-units/partitioning/vtable-through-const.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // We specify -Z incremental here because we want to test the partitioning for diff --git a/src/test/codegen/abi-main-signature-16bit-c-int.rs b/src/test/codegen/abi-main-signature-16bit-c-int.rs index df5cba1c244b8..d7b8c48c33e98 100644 --- a/src/test/codegen/abi-main-signature-16bit-c-int.rs +++ b/src/test/codegen/abi-main-signature-16bit-c-int.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Checks the signature of the implicitly generated native main() // entry point. It must match C's `int main(int, char **)`. diff --git a/src/test/codegen/abi-main-signature-32bit-c-int.rs b/src/test/codegen/abi-main-signature-32bit-c-int.rs index 3139749dfcb06..c7aab09edec71 100644 --- a/src/test/codegen/abi-main-signature-32bit-c-int.rs +++ b/src/test/codegen/abi-main-signature-32bit-c-int.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Checks the signature of the implicitly generated native main() // entry point. It must match C's `int main(int, char **)`. diff --git a/src/test/codegen/abi-sysv64.rs b/src/test/codegen/abi-sysv64.rs index 920f5cbcca3f2..6456ad47615e8 100644 --- a/src/test/codegen/abi-sysv64.rs +++ b/src/test/codegen/abi-sysv64.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Checks if the correct annotation for the sysv64 ABI is passed to // llvm. Also checks that the abi-sysv64 feature gate allows usage // of the sysv64 abi. diff --git a/src/test/codegen/abi-x86-interrupt.rs b/src/test/codegen/abi-x86-interrupt.rs index e0b37cb2f3224..db215860f206b 100644 --- a/src/test/codegen/abi-x86-interrupt.rs +++ b/src/test/codegen/abi-x86-interrupt.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Checks if the correct annotation for the x86-interrupt ABI is passed to // llvm. Also checks that the abi_x86_interrupt feature gate allows usage // of the x86-interrupt abi. diff --git a/src/test/codegen/abi-x86_64_sysv.rs b/src/test/codegen/abi-x86_64_sysv.rs index 88666e9c1fd47..84e06023e9c3f 100644 --- a/src/test/codegen/abi-x86_64_sysv.rs +++ b/src/test/codegen/abi-x86_64_sysv.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // only-x86_64 // compile-flags: -C no-prepopulate-passes diff --git a/src/test/codegen/adjustments.rs b/src/test/codegen/adjustments.rs index 2b35d4547395a..b8398f6ac8421 100644 --- a/src/test/codegen/adjustments.rs +++ b/src/test/codegen/adjustments.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C no-prepopulate-passes // ignore-tidy-linelength diff --git a/src/test/codegen/align-struct.rs b/src/test/codegen/align-struct.rs index bf119da2e829f..32a835f807c47 100644 --- a/src/test/codegen/align-struct.rs +++ b/src/test/codegen/align-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C no-prepopulate-passes // ignore-tidy-linelength // min-llvm-version 7.0 diff --git a/src/test/codegen/alloc-optimisation.rs b/src/test/codegen/alloc-optimisation.rs index 07dc1350714b6..c3ffaeb9547b3 100644 --- a/src/test/codegen/alloc-optimisation.rs +++ b/src/test/codegen/alloc-optimisation.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // no-system-llvm // compile-flags: -O diff --git a/src/test/codegen/auxiliary/nounwind.rs b/src/test/codegen/auxiliary/nounwind.rs index 5e40e8ede1557..73c5aee338788 100644 --- a/src/test/codegen/auxiliary/nounwind.rs +++ b/src/test/codegen/auxiliary/nounwind.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[no_mangle] pub fn bar() { } diff --git a/src/test/codegen/call-metadata.rs b/src/test/codegen/call-metadata.rs index 1b92ff60226aa..030a58441e304 100644 --- a/src/test/codegen/call-metadata.rs +++ b/src/test/codegen/call-metadata.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Checks that range metadata gets emitted on calls to functions returning a // scalar value. diff --git a/src/test/codegen/coercions.rs b/src/test/codegen/coercions.rs index c8c9f5b407c42..d645ca6b13aed 100644 --- a/src/test/codegen/coercions.rs +++ b/src/test/codegen/coercions.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C no-prepopulate-passes #![crate_type = "lib"] diff --git a/src/test/codegen/consts.rs b/src/test/codegen/consts.rs index 301f554448627..e0843f5ff08b3 100644 --- a/src/test/codegen/consts.rs +++ b/src/test/codegen/consts.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C no-prepopulate-passes // ignore-tidy-linelength // min-llvm-version 7.0 diff --git a/src/test/codegen/dealloc-no-unwind.rs b/src/test/codegen/dealloc-no-unwind.rs index 551b66e103a11..ff21b4caa83c3 100644 --- a/src/test/codegen/dealloc-no-unwind.rs +++ b/src/test/codegen/dealloc-no-unwind.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // no-system-llvm // compile-flags: -O diff --git a/src/test/codegen/dllimports/auxiliary/dummy.rs b/src/test/codegen/dllimports/auxiliary/dummy.rs index 06001c6b01426..113a164f1457f 100644 --- a/src/test/codegen/dllimports/auxiliary/dummy.rs +++ b/src/test/codegen/dllimports/auxiliary/dummy.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "staticlib"] diff --git a/src/test/codegen/dllimports/auxiliary/wrapper.rs b/src/test/codegen/dllimports/auxiliary/wrapper.rs index c03f88092e583..7aa90920a3ed1 100644 --- a/src/test/codegen/dllimports/auxiliary/wrapper.rs +++ b/src/test/codegen/dllimports/auxiliary/wrapper.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "rlib"] diff --git a/src/test/codegen/dllimports/main.rs b/src/test/codegen/dllimports/main.rs index d0fafbdd0447e..40bbd2821eff9 100644 --- a/src/test/codegen/dllimports/main.rs +++ b/src/test/codegen/dllimports/main.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test is for *-windows-msvc only. // ignore-android // ignore-bitrig diff --git a/src/test/codegen/drop.rs b/src/test/codegen/drop.rs index 1961060c2c266..7e6f8eaaa30d2 100644 --- a/src/test/codegen/drop.rs +++ b/src/test/codegen/drop.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C no-prepopulate-passes #![crate_type = "lib"] diff --git a/src/test/codegen/enum-bounds-check.rs b/src/test/codegen/enum-bounds-check.rs index 4cfb5a752dfdc..21a27c9f35d4e 100644 --- a/src/test/codegen/enum-bounds-check.rs +++ b/src/test/codegen/enum-bounds-check.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -O #![crate_type = "lib"] diff --git a/src/test/codegen/exact_div.rs b/src/test/codegen/exact_div.rs index 9ba6c0c000637..6a55b492cb1e1 100644 --- a/src/test/codegen/exact_div.rs +++ b/src/test/codegen/exact_div.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C no-prepopulate-passes #![crate_type = "lib"] diff --git a/src/test/codegen/extern-functions.rs b/src/test/codegen/extern-functions.rs index 90ee0c75680dc..a935d88652267 100644 --- a/src/test/codegen/extern-functions.rs +++ b/src/test/codegen/extern-functions.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C no-prepopulate-passes #![crate_type = "lib"] diff --git a/src/test/codegen/fastcall-inreg.rs b/src/test/codegen/fastcall-inreg.rs index 77e3781961f4d..e152e6e9d1333 100644 --- a/src/test/codegen/fastcall-inreg.rs +++ b/src/test/codegen/fastcall-inreg.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Checks if the "fastcall" calling convention marks function arguments // as "inreg" like the C/C++ compilers for the platforms. // x86 only. diff --git a/src/test/codegen/fatptr.rs b/src/test/codegen/fatptr.rs index b9e6508dfff1d..1c49b5714ef51 100644 --- a/src/test/codegen/fatptr.rs +++ b/src/test/codegen/fatptr.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C no-prepopulate-passes #![crate_type = "lib"] diff --git a/src/test/codegen/float_math.rs b/src/test/codegen/float_math.rs index 6a6d6f90b2e69..592e09452df6f 100644 --- a/src/test/codegen/float_math.rs +++ b/src/test/codegen/float_math.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C no-prepopulate-passes #![crate_type = "lib"] diff --git a/src/test/codegen/force-frame-pointers.rs b/src/test/codegen/force-frame-pointers.rs index f70e366719882..c6c1da2c1b05e 100644 --- a/src/test/codegen/force-frame-pointers.rs +++ b/src/test/codegen/force-frame-pointers.rs @@ -1,12 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // compile-flags: -C no-prepopulate-passes -C force-frame-pointers=y diff --git a/src/test/codegen/function-arguments.rs b/src/test/codegen/function-arguments.rs index 09031508da1f7..71e2a757f24c4 100644 --- a/src/test/codegen/function-arguments.rs +++ b/src/test/codegen/function-arguments.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C no-prepopulate-passes // ignore-tidy-linelength // min-llvm-version 6.0 diff --git a/src/test/codegen/gdb_debug_script_load.rs b/src/test/codegen/gdb_debug_script_load.rs index efaca29752b5d..2e8dc7b6f36cb 100644 --- a/src/test/codegen/gdb_debug_script_load.rs +++ b/src/test/codegen/gdb_debug_script_load.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // ignore-windows // ignore-macos diff --git a/src/test/codegen/global_asm.rs b/src/test/codegen/global_asm.rs index 6b79e79fa0080..57d8aeb165bf4 100644 --- a/src/test/codegen/global_asm.rs +++ b/src/test/codegen/global_asm.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-aarch64 // ignore-aarch64_be // ignore-arm diff --git a/src/test/codegen/global_asm_include.rs b/src/test/codegen/global_asm_include.rs index 3f73a1cabbf19..44402619c4385 100644 --- a/src/test/codegen/global_asm_include.rs +++ b/src/test/codegen/global_asm_include.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-aarch64 // ignore-aarch64_be // ignore-arm diff --git a/src/test/codegen/global_asm_x2.rs b/src/test/codegen/global_asm_x2.rs index 3e118a50d454e..d632d0dde00e2 100644 --- a/src/test/codegen/global_asm_x2.rs +++ b/src/test/codegen/global_asm_x2.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-aarch64 // ignore-aarch64_be // ignore-arm diff --git a/src/test/codegen/internalize-closures.rs b/src/test/codegen/internalize-closures.rs index 90aafd6a3bb3b..3434820aa8a18 100644 --- a/src/test/codegen/internalize-closures.rs +++ b/src/test/codegen/internalize-closures.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C no-prepopulate-passes pub fn main() { diff --git a/src/test/codegen/intrinsic-no-unnamed-attr.rs b/src/test/codegen/intrinsic-no-unnamed-attr.rs index 0f239c8426575..c8a8e0b3e7a09 100644 --- a/src/test/codegen/intrinsic-no-unnamed-attr.rs +++ b/src/test/codegen/intrinsic-no-unnamed-attr.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C no-prepopulate-passes #![feature(intrinsics)] diff --git a/src/test/codegen/issue-13018.rs b/src/test/codegen/issue-13018.rs index 702b9545794b2..b70ea1f48c8ce 100644 --- a/src/test/codegen/issue-13018.rs +++ b/src/test/codegen/issue-13018.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -O // A drop([...].clone()) sequence on an Rc should be a no-op diff --git a/src/test/codegen/issue-15953.rs b/src/test/codegen/issue-15953.rs index 320ea6b5cc4e3..28d28428904f5 100644 --- a/src/test/codegen/issue-15953.rs +++ b/src/test/codegen/issue-15953.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that llvm generates `memcpy` for moving a value // inside a function and moving an argument. diff --git a/src/test/codegen/issue-32031.rs b/src/test/codegen/issue-32031.rs index e5ec17385455e..cf672266bc773 100644 --- a/src/test/codegen/issue-32031.rs +++ b/src/test/codegen/issue-32031.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C no-prepopulate-passes #![crate_type = "lib"] diff --git a/src/test/codegen/issue-32364.rs b/src/test/codegen/issue-32364.rs index 401253a315fbf..210a4bf774160 100644 --- a/src/test/codegen/issue-32364.rs +++ b/src/test/codegen/issue-32364.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-arm // ignore-aarch64 diff --git a/src/test/codegen/issue-34947-pow-i32.rs b/src/test/codegen/issue-34947-pow-i32.rs index 0564cd2e5016c..653da8e8b5f7b 100644 --- a/src/test/codegen/issue-34947-pow-i32.rs +++ b/src/test/codegen/issue-34947-pow-i32.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -O #![crate_type = "lib"] diff --git a/src/test/codegen/issue-37945.rs b/src/test/codegen/issue-37945.rs index a36a50415ada5..0ca42b7ec83b1 100644 --- a/src/test/codegen/issue-37945.rs +++ b/src/test/codegen/issue-37945.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -O // ignore-x86 // ignore-arm diff --git a/src/test/codegen/issue-44056-macos-tls-align.rs b/src/test/codegen/issue-44056-macos-tls-align.rs index 3235ef0bb3335..bae6f629f16ce 100644 --- a/src/test/codegen/issue-44056-macos-tls-align.rs +++ b/src/test/codegen/issue-44056-macos-tls-align.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // only-macos // no-system-llvm diff --git a/src/test/codegen/issue-45222.rs b/src/test/codegen/issue-45222.rs index 30a03243f0151..4a6a08ac054db 100644 --- a/src/test/codegen/issue-45222.rs +++ b/src/test/codegen/issue-45222.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -O // min-llvm-version 6.0 diff --git a/src/test/codegen/issue-45466.rs b/src/test/codegen/issue-45466.rs index 149547639440c..ccdbd72d4757e 100644 --- a/src/test/codegen/issue-45466.rs +++ b/src/test/codegen/issue-45466.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -O // min-llvm-version 6.0 diff --git a/src/test/codegen/issue-47278.rs b/src/test/codegen/issue-47278.rs index 21858b434bf19..590e8ea850290 100644 --- a/src/test/codegen/issue-47278.rs +++ b/src/test/codegen/issue-47278.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // -C no-prepopulate-passes #![crate_type="staticlib"] diff --git a/src/test/codegen/issue-47442.rs b/src/test/codegen/issue-47442.rs index d0c9932e4e20f..6944336d33560 100644 --- a/src/test/codegen/issue-47442.rs +++ b/src/test/codegen/issue-47442.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // check that we don't emit unneeded `resume` cleanup blocks for every // destructor. diff --git a/src/test/codegen/lifetime_start_end.rs b/src/test/codegen/lifetime_start_end.rs index 9f5170cc89ee4..9df46bb3dd1b5 100644 --- a/src/test/codegen/lifetime_start_end.rs +++ b/src/test/codegen/lifetime_start_end.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -O -C no-prepopulate-passes #![crate_type = "lib"] diff --git a/src/test/codegen/likely.rs b/src/test/codegen/likely.rs index acaec0350bfbd..c56cf718f98e4 100644 --- a/src/test/codegen/likely.rs +++ b/src/test/codegen/likely.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C no-prepopulate-passes #![crate_type = "lib"] diff --git a/src/test/codegen/link-dead-code.rs b/src/test/codegen/link-dead-code.rs index 9cabcd9157a6a..d920be8a8a235 100644 --- a/src/test/codegen/link-dead-code.rs +++ b/src/test/codegen/link-dead-code.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-Clink-dead-code #![feature(const_fn)] diff --git a/src/test/codegen/link_section.rs b/src/test/codegen/link_section.rs index 415ee6eb7eab8..86c1365fdb711 100644 --- a/src/test/codegen/link_section.rs +++ b/src/test/codegen/link_section.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C no-prepopulate-passes #![crate_type = "lib"] diff --git a/src/test/codegen/loads.rs b/src/test/codegen/loads.rs index def5269e07a02..e164f5115fffd 100644 --- a/src/test/codegen/loads.rs +++ b/src/test/codegen/loads.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C no-prepopulate-passes #![crate_type = "lib"] diff --git a/src/test/codegen/local-generics-in-exe-internalized.rs b/src/test/codegen/local-generics-in-exe-internalized.rs index 162a025c30217..6bdbf92919389 100644 --- a/src/test/codegen/local-generics-in-exe-internalized.rs +++ b/src/test/codegen/local-generics-in-exe-internalized.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C no-prepopulate-passes -Zshare-generics=yes // Check that local generics are internalized if they are in the same CGU diff --git a/src/test/codegen/lto-removes-invokes.rs b/src/test/codegen/lto-removes-invokes.rs index b2f43489523d1..2708a7f0a2061 100644 --- a/src/test/codegen/lto-removes-invokes.rs +++ b/src/test/codegen/lto-removes-invokes.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C lto -C panic=abort -O // no-prefer-dynamic diff --git a/src/test/codegen/mainsubprogram.rs b/src/test/codegen/mainsubprogram.rs index 2cfc20e30ca5c..d886cb88004cb 100644 --- a/src/test/codegen/mainsubprogram.rs +++ b/src/test/codegen/mainsubprogram.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test depends on a patch that was committed to upstream LLVM // before 4.0, formerly backported to the Rust LLVM fork. diff --git a/src/test/codegen/mainsubprogramstart.rs b/src/test/codegen/mainsubprogramstart.rs index 62a996316c4f5..d91f91ee7ab68 100644 --- a/src/test/codegen/mainsubprogramstart.rs +++ b/src/test/codegen/mainsubprogramstart.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // ignore-windows // ignore-macos diff --git a/src/test/codegen/match-optimizes-away.rs b/src/test/codegen/match-optimizes-away.rs index d7b779374314d..f6a1502b822d4 100644 --- a/src/test/codegen/match-optimizes-away.rs +++ b/src/test/codegen/match-optimizes-away.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // no-system-llvm // compile-flags: -O diff --git a/src/test/codegen/match.rs b/src/test/codegen/match.rs index c9d0427dd0ad4..35eac2e7fd50a 100644 --- a/src/test/codegen/match.rs +++ b/src/test/codegen/match.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C no-prepopulate-passes #![crate_type = "lib"] diff --git a/src/test/codegen/mir_zst_stores.rs b/src/test/codegen/mir_zst_stores.rs index 884cf59c1c192..17e7ba3093bff 100644 --- a/src/test/codegen/mir_zst_stores.rs +++ b/src/test/codegen/mir_zst_stores.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C no-prepopulate-passes #![crate_type = "lib"] diff --git a/src/test/codegen/move-val-init.rs b/src/test/codegen/move-val-init.rs index e2371d6148762..6222536b50600 100644 --- a/src/test/codegen/move-val-init.rs +++ b/src/test/codegen/move-val-init.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C no-prepopulate-passes #![feature(core_intrinsics)] diff --git a/src/test/codegen/naked-functions.rs b/src/test/codegen/naked-functions.rs index aab5f1bfb4f86..4277ee01b1932 100644 --- a/src/test/codegen/naked-functions.rs +++ b/src/test/codegen/naked-functions.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags: -C no-prepopulate-passes diff --git a/src/test/codegen/no-assumes-on-casts.rs b/src/test/codegen/no-assumes-on-casts.rs index a5a7d94a5536b..b5cfa2775abb7 100644 --- a/src/test/codegen/no-assumes-on-casts.rs +++ b/src/test/codegen/no-assumes-on-casts.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] // compile-flags: -Cno-prepopulate-passes diff --git a/src/test/codegen/no-dllimport-w-cross-lang-lto.rs b/src/test/codegen/no-dllimport-w-cross-lang-lto.rs index 0d5d02206a632..c1c1ef6ede2cb 100644 --- a/src/test/codegen/no-dllimport-w-cross-lang-lto.rs +++ b/src/test/codegen/no-dllimport-w-cross-lang-lto.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test makes sure that functions get annotated with the proper // "target-cpu" attribute in LLVM. diff --git a/src/test/codegen/no-output-asm-is-volatile.rs b/src/test/codegen/no-output-asm-is-volatile.rs index 457d706a8ffef..ad497b25a9ec5 100644 --- a/src/test/codegen/no-output-asm-is-volatile.rs +++ b/src/test/codegen/no-output-asm-is-volatile.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -O // ignore-asmjs diff --git a/src/test/codegen/nontemporal.rs b/src/test/codegen/nontemporal.rs index 28ec534b97a68..3a41fb4fab3b7 100644 --- a/src/test/codegen/nontemporal.rs +++ b/src/test/codegen/nontemporal.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -O #![feature(core_intrinsics)] diff --git a/src/test/codegen/noreturnflag.rs b/src/test/codegen/noreturnflag.rs index f66369782e5a6..fc288eb0cf1e2 100644 --- a/src/test/codegen/noreturnflag.rs +++ b/src/test/codegen/noreturnflag.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -g -C no-prepopulate-passes // ignore-tidy-linelength diff --git a/src/test/codegen/nounwind.rs b/src/test/codegen/nounwind.rs index 6863b1f2792b9..49a74ef7ab4ef 100644 --- a/src/test/codegen/nounwind.rs +++ b/src/test/codegen/nounwind.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:nounwind.rs // compile-flags: -C no-prepopulate-passes -C panic=abort -C metadata=a // ignore-windows diff --git a/src/test/codegen/packed.rs b/src/test/codegen/packed.rs index 10dd12909b644..9bac46c5eebb1 100644 --- a/src/test/codegen/packed.rs +++ b/src/test/codegen/packed.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags: -C no-prepopulate-passes // min-llvm-version 7.0 diff --git a/src/test/codegen/panic-abort-windows.rs b/src/test/codegen/panic-abort-windows.rs index f1affcc12487f..e2d942e869992 100644 --- a/src/test/codegen/panic-abort-windows.rs +++ b/src/test/codegen/panic-abort-windows.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // This test is for *-windows-msvc only. diff --git a/src/test/codegen/personality_lifetimes.rs b/src/test/codegen/personality_lifetimes.rs index 9fd600b32e6c7..0d3d537a2723d 100644 --- a/src/test/codegen/personality_lifetimes.rs +++ b/src/test/codegen/personality_lifetimes.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-msvc // compile-flags: -O -C no-prepopulate-passes diff --git a/src/test/codegen/prefetch.rs b/src/test/codegen/prefetch.rs index 3a23c16d5214d..4cd38e142824a 100644 --- a/src/test/codegen/prefetch.rs +++ b/src/test/codegen/prefetch.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C no-prepopulate-passes #![crate_type = "lib"] diff --git a/src/test/codegen/refs.rs b/src/test/codegen/refs.rs index 6c00ffa754b06..9583730e9dd5b 100644 --- a/src/test/codegen/refs.rs +++ b/src/test/codegen/refs.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C no-prepopulate-passes // ignore-tidy-linelength diff --git a/src/test/codegen/remap_path_prefix/aux_mod.rs b/src/test/codegen/remap_path_prefix/aux_mod.rs index 2a7019957af15..44cc4bb722d16 100644 --- a/src/test/codegen/remap_path_prefix/aux_mod.rs +++ b/src/test/codegen/remap_path_prefix/aux_mod.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-test: this is not a test #[inline] diff --git a/src/test/codegen/remap_path_prefix/auxiliary/remap_path_prefix_aux.rs b/src/test/codegen/remap_path_prefix/auxiliary/remap_path_prefix_aux.rs index 3ef0ff9ef0687..b87a20e75f4b7 100644 --- a/src/test/codegen/remap_path_prefix/auxiliary/remap_path_prefix_aux.rs +++ b/src/test/codegen/remap_path_prefix/auxiliary/remap_path_prefix_aux.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags: -g --remap-path-prefix={{cwd}}=/the/aux-cwd --remap-path-prefix={{src-base}}/remap_path_prefix/auxiliary=/the/aux-src diff --git a/src/test/codegen/remap_path_prefix/main.rs b/src/test/codegen/remap_path_prefix/main.rs index dd0f89c931d8a..52ffb97a5b221 100644 --- a/src/test/codegen/remap_path_prefix/main.rs +++ b/src/test/codegen/remap_path_prefix/main.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-windows // ignore-tidy-linelength diff --git a/src/test/codegen/repeat-trusted-len.rs b/src/test/codegen/repeat-trusted-len.rs index 8565335bd75df..c348a8f7b8b8f 100644 --- a/src/test/codegen/repeat-trusted-len.rs +++ b/src/test/codegen/repeat-trusted-len.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -O // ignore-tidy-linelength // min-llvm-version 7.0 diff --git a/src/test/codegen/repr-transparent-aggregates-1.rs b/src/test/codegen/repr-transparent-aggregates-1.rs index a1185cc1e2e73..fb88f2a69ca15 100644 --- a/src/test/codegen/repr-transparent-aggregates-1.rs +++ b/src/test/codegen/repr-transparent-aggregates-1.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C no-prepopulate-passes // ignore-arm diff --git a/src/test/codegen/repr-transparent-aggregates-2.rs b/src/test/codegen/repr-transparent-aggregates-2.rs index b4623eb491399..6c628ac035fd9 100644 --- a/src/test/codegen/repr-transparent-aggregates-2.rs +++ b/src/test/codegen/repr-transparent-aggregates-2.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C no-prepopulate-passes // ignore-aarch64 diff --git a/src/test/codegen/repr-transparent-aggregates-3.rs b/src/test/codegen/repr-transparent-aggregates-3.rs index a292f1d70f3a9..cd740dc9b8233 100644 --- a/src/test/codegen/repr-transparent-aggregates-3.rs +++ b/src/test/codegen/repr-transparent-aggregates-3.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C no-prepopulate-passes // only-mips64 diff --git a/src/test/codegen/repr-transparent-sysv64.rs b/src/test/codegen/repr-transparent-sysv64.rs index 2e4665e22e346..b71cb14a4ff08 100644 --- a/src/test/codegen/repr-transparent-sysv64.rs +++ b/src/test/codegen/repr-transparent-sysv64.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // only-x86_64 // compile-flags: -C no-prepopulate-passes diff --git a/src/test/codegen/repr-transparent.rs b/src/test/codegen/repr-transparent.rs index 64a62fd7e88a4..fd655261ab852 100644 --- a/src/test/codegen/repr-transparent.rs +++ b/src/test/codegen/repr-transparent.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C no-prepopulate-passes #![crate_type="lib"] diff --git a/src/test/codegen/scalar-pair-bool.rs b/src/test/codegen/scalar-pair-bool.rs index f50e032f8e6f2..78d1025b13c77 100644 --- a/src/test/codegen/scalar-pair-bool.rs +++ b/src/test/codegen/scalar-pair-bool.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -O #![crate_type = "lib"] diff --git a/src/test/codegen/simd-intrinsic-float-abs.rs b/src/test/codegen/simd-intrinsic-float-abs.rs index 49f1f3e8565c6..acb993d51fb8c 100644 --- a/src/test/codegen/simd-intrinsic-float-abs.rs +++ b/src/test/codegen/simd-intrinsic-float-abs.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten // compile-flags: -C no-prepopulate-passes diff --git a/src/test/codegen/simd-intrinsic-float-ceil.rs b/src/test/codegen/simd-intrinsic-float-ceil.rs index 4a6f162e16b1b..58667af7e50ed 100644 --- a/src/test/codegen/simd-intrinsic-float-ceil.rs +++ b/src/test/codegen/simd-intrinsic-float-ceil.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten // compile-flags: -C no-prepopulate-passes diff --git a/src/test/codegen/simd-intrinsic-float-cos.rs b/src/test/codegen/simd-intrinsic-float-cos.rs index 6304c6c644f42..affbe17d3341f 100644 --- a/src/test/codegen/simd-intrinsic-float-cos.rs +++ b/src/test/codegen/simd-intrinsic-float-cos.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten // compile-flags: -C no-prepopulate-passes diff --git a/src/test/codegen/simd-intrinsic-float-exp.rs b/src/test/codegen/simd-intrinsic-float-exp.rs index 110031c645143..43472d9dece8e 100644 --- a/src/test/codegen/simd-intrinsic-float-exp.rs +++ b/src/test/codegen/simd-intrinsic-float-exp.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten // compile-flags: -C no-prepopulate-passes diff --git a/src/test/codegen/simd-intrinsic-float-exp2.rs b/src/test/codegen/simd-intrinsic-float-exp2.rs index dc62c90822f0c..471d49b7841ec 100644 --- a/src/test/codegen/simd-intrinsic-float-exp2.rs +++ b/src/test/codegen/simd-intrinsic-float-exp2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten // compile-flags: -C no-prepopulate-passes diff --git a/src/test/codegen/simd-intrinsic-float-floor.rs b/src/test/codegen/simd-intrinsic-float-floor.rs index 9bc8ca0d1527f..bd8ba8b6cd774 100644 --- a/src/test/codegen/simd-intrinsic-float-floor.rs +++ b/src/test/codegen/simd-intrinsic-float-floor.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten // compile-flags: -C no-prepopulate-passes diff --git a/src/test/codegen/simd-intrinsic-float-fma.rs b/src/test/codegen/simd-intrinsic-float-fma.rs index acd7f717214f1..8ad9e9004c2cd 100644 --- a/src/test/codegen/simd-intrinsic-float-fma.rs +++ b/src/test/codegen/simd-intrinsic-float-fma.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten // compile-flags: -C no-prepopulate-passes diff --git a/src/test/codegen/simd-intrinsic-float-fsqrt.rs b/src/test/codegen/simd-intrinsic-float-fsqrt.rs index 2bad0bba48a78..ecffca960dab4 100644 --- a/src/test/codegen/simd-intrinsic-float-fsqrt.rs +++ b/src/test/codegen/simd-intrinsic-float-fsqrt.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten // compile-flags: -C no-prepopulate-passes diff --git a/src/test/codegen/simd-intrinsic-float-log.rs b/src/test/codegen/simd-intrinsic-float-log.rs index d3829efe09b0e..79e6ed54690bf 100644 --- a/src/test/codegen/simd-intrinsic-float-log.rs +++ b/src/test/codegen/simd-intrinsic-float-log.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten // compile-flags: -C no-prepopulate-passes diff --git a/src/test/codegen/simd-intrinsic-float-log10.rs b/src/test/codegen/simd-intrinsic-float-log10.rs index 47f19e499fa7d..db92a94fca84b 100644 --- a/src/test/codegen/simd-intrinsic-float-log10.rs +++ b/src/test/codegen/simd-intrinsic-float-log10.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten // compile-flags: -C no-prepopulate-passes diff --git a/src/test/codegen/simd-intrinsic-float-log2.rs b/src/test/codegen/simd-intrinsic-float-log2.rs index e36a5887b6196..90d9ec3cedd6f 100644 --- a/src/test/codegen/simd-intrinsic-float-log2.rs +++ b/src/test/codegen/simd-intrinsic-float-log2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten // compile-flags: -C no-prepopulate-passes diff --git a/src/test/codegen/simd-intrinsic-float-minmax.rs b/src/test/codegen/simd-intrinsic-float-minmax.rs index 16f86735c2ed7..2761392e6a923 100644 --- a/src/test/codegen/simd-intrinsic-float-minmax.rs +++ b/src/test/codegen/simd-intrinsic-float-minmax.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten // min-llvm-version 7.0 diff --git a/src/test/codegen/simd-intrinsic-float-pow.rs b/src/test/codegen/simd-intrinsic-float-pow.rs index bb2ac36220302..1dd2c2ccb83db 100644 --- a/src/test/codegen/simd-intrinsic-float-pow.rs +++ b/src/test/codegen/simd-intrinsic-float-pow.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten // compile-flags: -C no-prepopulate-passes diff --git a/src/test/codegen/simd-intrinsic-float-powi.rs b/src/test/codegen/simd-intrinsic-float-powi.rs index 6e28af262ace6..09f31bdd6bbdf 100644 --- a/src/test/codegen/simd-intrinsic-float-powi.rs +++ b/src/test/codegen/simd-intrinsic-float-powi.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten // compile-flags: -C no-prepopulate-passes diff --git a/src/test/codegen/simd-intrinsic-float-sin.rs b/src/test/codegen/simd-intrinsic-float-sin.rs index 26100ed5c3f03..dc87651c2aa1f 100644 --- a/src/test/codegen/simd-intrinsic-float-sin.rs +++ b/src/test/codegen/simd-intrinsic-float-sin.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten // compile-flags: -C no-prepopulate-passes diff --git a/src/test/codegen/simd-intrinsic-generic-gather.rs b/src/test/codegen/simd-intrinsic-generic-gather.rs index 6c47bf3e321fb..1e281614c5d8c 100644 --- a/src/test/codegen/simd-intrinsic-generic-gather.rs +++ b/src/test/codegen/simd-intrinsic-generic-gather.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten // ignore-tidy-linelength // min-llvm-version 6.0 diff --git a/src/test/codegen/simd-intrinsic-generic-scatter.rs b/src/test/codegen/simd-intrinsic-generic-scatter.rs index 7b5b2e55e2949..f0e0223135f2e 100644 --- a/src/test/codegen/simd-intrinsic-generic-scatter.rs +++ b/src/test/codegen/simd-intrinsic-generic-scatter.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten // ignore-tidy-linelength // min-llvm-version 6.0 diff --git a/src/test/codegen/simd-intrinsic-generic-select.rs b/src/test/codegen/simd-intrinsic-generic-select.rs index 8a64d7437d84d..1d7862da03558 100644 --- a/src/test/codegen/simd-intrinsic-generic-select.rs +++ b/src/test/codegen/simd-intrinsic-generic-select.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C no-prepopulate-passes #![crate_type = "lib"] diff --git a/src/test/codegen/slice-init.rs b/src/test/codegen/slice-init.rs index 915db493fc2a4..6c79ddb0a7abd 100644 --- a/src/test/codegen/slice-init.rs +++ b/src/test/codegen/slice-init.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C no-prepopulate-passes #![crate_type = "lib"] diff --git a/src/test/codegen/slice-position-bounds-check.rs b/src/test/codegen/slice-position-bounds-check.rs index a6c846d7dab51..b494f42b2965d 100644 --- a/src/test/codegen/slice-position-bounds-check.rs +++ b/src/test/codegen/slice-position-bounds-check.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-system-llvm // compile-flags: -O -C panic=abort #![crate_type = "lib"] diff --git a/src/test/codegen/sparc-struct-abi.rs b/src/test/codegen/sparc-struct-abi.rs index 56c4364d598e7..78e5b14a21214 100644 --- a/src/test/codegen/sparc-struct-abi.rs +++ b/src/test/codegen/sparc-struct-abi.rs @@ -1,12 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // Checks that we correctly codegen extern "C" functions returning structs. // See issue #52638. diff --git a/src/test/codegen/stack-probes.rs b/src/test/codegen/stack-probes.rs index b8c2e62abef62..b8ebf338cbf97 100644 --- a/src/test/codegen/stack-probes.rs +++ b/src/test/codegen/stack-probes.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-arm // ignore-aarch64 // ignore-mips diff --git a/src/test/codegen/stores.rs b/src/test/codegen/stores.rs index 0aaf00bfdbe8e..5b478e546ca86 100644 --- a/src/test/codegen/stores.rs +++ b/src/test/codegen/stores.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C no-prepopulate-passes // ignore-tidy-linelength // min-llvm-version 7.0 diff --git a/src/test/codegen/swap-small-types.rs b/src/test/codegen/swap-small-types.rs index 46406ee5182a7..c8466fed7d1bd 100644 --- a/src/test/codegen/swap-small-types.rs +++ b/src/test/codegen/swap-small-types.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -O // only-x86_64 diff --git a/src/test/codegen/target-cpu-on-functions.rs b/src/test/codegen/target-cpu-on-functions.rs index cd7d061c0de3d..5692dca1df5a2 100644 --- a/src/test/codegen/target-cpu-on-functions.rs +++ b/src/test/codegen/target-cpu-on-functions.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test makes sure that functions get annotated with the proper // "target-cpu" attribute in LLVM. diff --git a/src/test/codegen/target-feature-on-functions.rs b/src/test/codegen/target-feature-on-functions.rs index e3cc2c753e55e..d4d39d08b1eaa 100644 --- a/src/test/codegen/target-feature-on-functions.rs +++ b/src/test/codegen/target-feature-on-functions.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // only-x86_64 // compile-flags: -C target-feature=+avx diff --git a/src/test/codegen/unchecked-float-casts.rs b/src/test/codegen/unchecked-float-casts.rs index 87ebaaeec320c..34e9612222309 100644 --- a/src/test/codegen/unchecked-float-casts.rs +++ b/src/test/codegen/unchecked-float-casts.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C no-prepopulate-passes // This file tests that we don't generate any code for saturation if diff --git a/src/test/codegen/vec-clear.rs b/src/test/codegen/vec-clear.rs index c44637376d7aa..b9ffce8b0cb3d 100644 --- a/src/test/codegen/vec-clear.rs +++ b/src/test/codegen/vec-clear.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-debug: the debug assertions get in the way // compile-flags: -O diff --git a/src/test/codegen/vec-iter-collect-len.rs b/src/test/codegen/vec-iter-collect-len.rs index 05cbf05344411..73348ddd063dc 100644 --- a/src/test/codegen/vec-iter-collect-len.rs +++ b/src/test/codegen/vec-iter-collect-len.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-debug: the debug assertions get in the way // no-system-llvm // compile-flags: -O diff --git a/src/test/codegen/vec-optimizes-away.rs b/src/test/codegen/vec-optimizes-away.rs index 6bef01fd4ea2d..ebede0908c6c4 100644 --- a/src/test/codegen/vec-optimizes-away.rs +++ b/src/test/codegen/vec-optimizes-away.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // ignore-debug: the debug assertions get in the way // no-system-llvm diff --git a/src/test/codegen/vtabletype.rs b/src/test/codegen/vtabletype.rs index abd1eb3e2cc7b..b40025aa8b9a6 100644 --- a/src/test/codegen/vtabletype.rs +++ b/src/test/codegen/vtabletype.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test depends on a patch that was committed to upstream LLVM // after 5.0, then backported to the Rust LLVM fork. diff --git a/src/test/codegen/x86_mmx.rs b/src/test/codegen/x86_mmx.rs index 4424c30e0f875..62bd1b41c064e 100644 --- a/src/test/codegen/x86_mmx.rs +++ b/src/test/codegen/x86_mmx.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-arm // ignore-aarch64 // ignore-emscripten diff --git a/src/test/codegen/zip.rs b/src/test/codegen/zip.rs index d0051c5165fe1..e55f4f1a2de3a 100644 --- a/src/test/codegen/zip.rs +++ b/src/test/codegen/zip.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C no-prepopulate-passes -O #![crate_type = "lib"] diff --git a/src/test/compile-fail-fulldeps/auxiliary/attr_plugin_test.rs b/src/test/compile-fail-fulldeps/auxiliary/attr_plugin_test.rs index bab3721a31332..c83e7bdb9983e 100644 --- a/src/test/compile-fail-fulldeps/auxiliary/attr_plugin_test.rs +++ b/src/test/compile-fail-fulldeps/auxiliary/attr_plugin_test.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host #![feature(plugin_registrar)] diff --git a/src/test/compile-fail-fulldeps/auxiliary/lint_for_crate.rs b/src/test/compile-fail-fulldeps/auxiliary/lint_for_crate.rs index c965a3ed86c82..4f4ea8f73393f 100644 --- a/src/test/compile-fail-fulldeps/auxiliary/lint_for_crate.rs +++ b/src/test/compile-fail-fulldeps/auxiliary/lint_for_crate.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host #![feature(plugin_registrar, rustc_private)] diff --git a/src/test/compile-fail-fulldeps/auxiliary/lint_group_plugin_test.rs b/src/test/compile-fail-fulldeps/auxiliary/lint_group_plugin_test.rs index 8ccb5878c4045..75295cd0a5863 100644 --- a/src/test/compile-fail-fulldeps/auxiliary/lint_group_plugin_test.rs +++ b/src/test/compile-fail-fulldeps/auxiliary/lint_group_plugin_test.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host #![feature(plugin_registrar)] diff --git a/src/test/compile-fail-fulldeps/auxiliary/lint_plugin_test.rs b/src/test/compile-fail-fulldeps/auxiliary/lint_plugin_test.rs index 315dad7eea515..ce7f1f0347a78 100644 --- a/src/test/compile-fail-fulldeps/auxiliary/lint_plugin_test.rs +++ b/src/test/compile-fail-fulldeps/auxiliary/lint_plugin_test.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host #![feature(plugin_registrar)] diff --git a/src/test/compile-fail-fulldeps/auxiliary/macro_crate_test.rs b/src/test/compile-fail-fulldeps/auxiliary/macro_crate_test.rs index fb0f9105b0d8a..a364aa0422deb 100644 --- a/src/test/compile-fail-fulldeps/auxiliary/macro_crate_test.rs +++ b/src/test/compile-fail-fulldeps/auxiliary/macro_crate_test.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host #![feature(plugin_registrar, quote, rustc_private)] diff --git a/src/test/compile-fail-fulldeps/auxiliary/macro_reexport_1.rs b/src/test/compile-fail-fulldeps/auxiliary/macro_reexport_1.rs index aaeccc6e89883..61692465c59e0 100644 --- a/src/test/compile-fail-fulldeps/auxiliary/macro_reexport_1.rs +++ b/src/test/compile-fail-fulldeps/auxiliary/macro_reexport_1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "dylib"] #[macro_export] macro_rules! reexported { diff --git a/src/test/compile-fail-fulldeps/auxiliary/pub_and_stability.rs b/src/test/compile-fail-fulldeps/auxiliary/pub_and_stability.rs index f46d906d865a8..ee05a07dbb29a 100644 --- a/src/test/compile-fail-fulldeps/auxiliary/pub_and_stability.rs +++ b/src/test/compile-fail-fulldeps/auxiliary/pub_and_stability.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This crate attempts to enumerate the various scenarios for how a // type can define fields and methods with various visibilities and // stabilities. diff --git a/src/test/compile-fail-fulldeps/auxiliary/rlib_crate_test.rs b/src/test/compile-fail-fulldeps/auxiliary/rlib_crate_test.rs index ae1568b2f88e1..3df40df7b3317 100644 --- a/src/test/compile-fail-fulldeps/auxiliary/rlib_crate_test.rs +++ b/src/test/compile-fail-fulldeps/auxiliary/rlib_crate_test.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "rlib"] diff --git a/src/test/compile-fail-fulldeps/auxiliary/use_from_trait_xc.rs b/src/test/compile-fail-fulldeps/auxiliary/use_from_trait_xc.rs index 9a6d176d0887b..4abe11941b11f 100644 --- a/src/test/compile-fail-fulldeps/auxiliary/use_from_trait_xc.rs +++ b/src/test/compile-fail-fulldeps/auxiliary/use_from_trait_xc.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub use self::sub::{Bar, Baz}; pub trait Trait { diff --git a/src/test/compile-fail-fulldeps/dropck_tarena_cycle_checked.rs b/src/test/compile-fail-fulldeps/dropck_tarena_cycle_checked.rs index f368788af55de..6b7da2ebb802b 100644 --- a/src/test/compile-fail-fulldeps/dropck_tarena_cycle_checked.rs +++ b/src/test/compile-fail-fulldeps/dropck_tarena_cycle_checked.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Reject mixing cyclic structure and Drop when using TypedArena. // // (Compare against compile-fail/dropck_vec_cycle_checked.rs) diff --git a/src/test/compile-fail-fulldeps/dropck_tarena_unsound_drop.rs b/src/test/compile-fail-fulldeps/dropck_tarena_unsound_drop.rs index 531e1ada44b3f..3fcde44b6c49b 100644 --- a/src/test/compile-fail-fulldeps/dropck_tarena_unsound_drop.rs +++ b/src/test/compile-fail-fulldeps/dropck_tarena_unsound_drop.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that an arena (TypedArena) cannot carry elements whose drop // methods might access borrowed data of lifetime that does not // strictly outlive the arena itself. diff --git a/src/test/compile-fail-fulldeps/explore-issue-38412.rs b/src/test/compile-fail-fulldeps/explore-issue-38412.rs index 4b9a5b716182c..cd0a69b0d8b8e 100644 --- a/src/test/compile-fail-fulldeps/explore-issue-38412.rs +++ b/src/test/compile-fail-fulldeps/explore-issue-38412.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:pub_and_stability.rs #![feature(unused_feature)] diff --git a/src/test/compile-fail-fulldeps/gated-plugin.rs b/src/test/compile-fail-fulldeps/gated-plugin.rs index 4e80ca46c0a84..3a138d9af03ca 100644 --- a/src/test/compile-fail-fulldeps/gated-plugin.rs +++ b/src/test/compile-fail-fulldeps/gated-plugin.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:macro_crate_test.rs #![plugin(macro_crate_test)] diff --git a/src/test/compile-fail-fulldeps/gated-quote.rs b/src/test/compile-fail-fulldeps/gated-quote.rs index 63e1c6f16b3e6..86848e3156fbd 100644 --- a/src/test/compile-fail-fulldeps/gated-quote.rs +++ b/src/test/compile-fail-fulldeps/gated-quote.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that `quote`-related macro are gated by `quote` feature gate. // (To sanity-check the code, uncomment this.) diff --git a/src/test/compile-fail-fulldeps/issue-15778-fail.rs b/src/test/compile-fail-fulldeps/issue-15778-fail.rs index d56571ee1aca5..91c379673b3da 100644 --- a/src/test/compile-fail-fulldeps/issue-15778-fail.rs +++ b/src/test/compile-fail-fulldeps/issue-15778-fail.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:lint_for_crate.rs // ignore-stage1 // compile-flags: -D crate-not-okay diff --git a/src/test/compile-fail-fulldeps/issue-18986.rs b/src/test/compile-fail-fulldeps/issue-18986.rs index 95af37605441d..1c431a45ab23e 100644 --- a/src/test/compile-fail-fulldeps/issue-18986.rs +++ b/src/test/compile-fail-fulldeps/issue-18986.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:use_from_trait_xc.rs extern crate use_from_trait_xc; diff --git a/src/test/compile-fail-fulldeps/issue-48941.rs b/src/test/compile-fail-fulldeps/issue-48941.rs index baeb019df1ca0..8c4c2445670b8 100644 --- a/src/test/compile-fail-fulldeps/issue-48941.rs +++ b/src/test/compile-fail-fulldeps/issue-48941.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This is a regression test against an ICE that used to occur // on malformed attributes for a custom MultiModifier. diff --git a/src/test/compile-fail-fulldeps/lint-group-plugin-deny-cmdline.rs b/src/test/compile-fail-fulldeps/lint-group-plugin-deny-cmdline.rs index a523799278c01..75e0a8fc31f7c 100644 --- a/src/test/compile-fail-fulldeps/lint-group-plugin-deny-cmdline.rs +++ b/src/test/compile-fail-fulldeps/lint-group-plugin-deny-cmdline.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:lint_group_plugin_test.rs // ignore-stage1 // compile-flags: -D lint-me diff --git a/src/test/compile-fail-fulldeps/lint-plugin-deny-attr.rs b/src/test/compile-fail-fulldeps/lint-plugin-deny-attr.rs index e3dbdc331a763..65a3623618020 100644 --- a/src/test/compile-fail-fulldeps/lint-plugin-deny-attr.rs +++ b/src/test/compile-fail-fulldeps/lint-plugin-deny-attr.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:lint_plugin_test.rs // ignore-stage1 diff --git a/src/test/compile-fail-fulldeps/lint-plugin-deny-cmdline.rs b/src/test/compile-fail-fulldeps/lint-plugin-deny-cmdline.rs index 41d25becd8452..b0c4dc0bce516 100644 --- a/src/test/compile-fail-fulldeps/lint-plugin-deny-cmdline.rs +++ b/src/test/compile-fail-fulldeps/lint-plugin-deny-cmdline.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:lint_plugin_test.rs // ignore-stage1 // compile-flags: -D test-lint diff --git a/src/test/compile-fail-fulldeps/lint-plugin-forbid-cmdline.rs b/src/test/compile-fail-fulldeps/lint-plugin-forbid-cmdline.rs index 155294f8026ab..07bd785ee7137 100644 --- a/src/test/compile-fail-fulldeps/lint-plugin-forbid-cmdline.rs +++ b/src/test/compile-fail-fulldeps/lint-plugin-forbid-cmdline.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:lint_plugin_test.rs // ignore-stage1 // compile-flags: -F test-lint diff --git a/src/test/compile-fail-fulldeps/macro-crate-doesnt-resolve.rs b/src/test/compile-fail-fulldeps/macro-crate-doesnt-resolve.rs index c676076aef34a..1e8de1282a082 100644 --- a/src/test/compile-fail-fulldeps/macro-crate-doesnt-resolve.rs +++ b/src/test/compile-fail-fulldeps/macro-crate-doesnt-resolve.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:macro_crate_test.rs #[macro_use] #[no_link] diff --git a/src/test/compile-fail-fulldeps/macro-crate-rlib.rs b/src/test/compile-fail-fulldeps/macro-crate-rlib.rs index 5b34d8e3adb08..21e62171f0f0d 100644 --- a/src/test/compile-fail-fulldeps/macro-crate-rlib.rs +++ b/src/test/compile-fail-fulldeps/macro-crate-rlib.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:rlib_crate_test.rs // ignore-tidy-linelength // ignore-cross-compile gives a different error message diff --git a/src/test/compile-fail-fulldeps/macro-crate-unexported-macro.rs b/src/test/compile-fail-fulldeps/macro-crate-unexported-macro.rs index 886b6247c0a3d..8cf0cc4e4f385 100644 --- a/src/test/compile-fail-fulldeps/macro-crate-unexported-macro.rs +++ b/src/test/compile-fail-fulldeps/macro-crate-unexported-macro.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:macro_crate_test.rs #[macro_use] #[no_link] diff --git a/src/test/compile-fail-fulldeps/no-link-unknown-crate.rs b/src/test/compile-fail-fulldeps/no-link-unknown-crate.rs index 8e4692bdee197..c7da2e41832f6 100644 --- a/src/test/compile-fail-fulldeps/no-link-unknown-crate.rs +++ b/src/test/compile-fail-fulldeps/no-link-unknown-crate.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[no_link] extern crate doesnt_exist; //~ ERROR can't find crate diff --git a/src/test/compile-fail-fulldeps/plugin-as-extern-crate.rs b/src/test/compile-fail-fulldeps/plugin-as-extern-crate.rs index bb292e2e52a95..f192694dc7318 100644 --- a/src/test/compile-fail-fulldeps/plugin-as-extern-crate.rs +++ b/src/test/compile-fail-fulldeps/plugin-as-extern-crate.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:macro_crate_test.rs // ignore-cross-compile // diff --git a/src/test/compile-fail-fulldeps/plugin-attr-register-deny.rs b/src/test/compile-fail-fulldeps/plugin-attr-register-deny.rs index 0d2a5a30c106b..f9922f7f6060e 100644 --- a/src/test/compile-fail-fulldeps/plugin-attr-register-deny.rs +++ b/src/test/compile-fail-fulldeps/plugin-attr-register-deny.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:attr_plugin_test.rs // ignore-stage1 diff --git a/src/test/compile-fail-fulldeps/plugin-plus-extern-crate.rs b/src/test/compile-fail-fulldeps/plugin-plus-extern-crate.rs index 3dfd8838ebec4..db13954f8eda9 100644 --- a/src/test/compile-fail-fulldeps/plugin-plus-extern-crate.rs +++ b/src/test/compile-fail-fulldeps/plugin-plus-extern-crate.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:macro_crate_test.rs // ignore-stage1 // ignore-cross-compile diff --git a/src/test/compile-fail-fulldeps/proc-macro/attr-invalid-exprs.rs b/src/test/compile-fail-fulldeps/proc-macro/attr-invalid-exprs.rs index 91b72510e3e54..6d11e446fc0ba 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/attr-invalid-exprs.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/attr-invalid-exprs.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:attr-stmt-expr.rs // ignore-stage1 diff --git a/src/test/compile-fail-fulldeps/proc-macro/attr-stmt-expr.rs b/src/test/compile-fail-fulldeps/proc-macro/attr-stmt-expr.rs index 52b2a473ecd75..0978093e4aa57 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/attr-stmt-expr.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/attr-stmt-expr.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:attr-stmt-expr.rs // ignore-stage1 diff --git a/src/test/compile-fail-fulldeps/proc-macro/attribute-with-error.rs b/src/test/compile-fail-fulldeps/proc-macro/attribute-with-error.rs index 3cb565c1ede38..fd909aec91b7d 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/attribute-with-error.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/attribute-with-error.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:attribute-with-error.rs // ignore-stage1 diff --git a/src/test/compile-fail-fulldeps/proc-macro/attribute.rs b/src/test/compile-fail-fulldeps/proc-macro/attribute.rs index 5d5e61270b61d..687b4a24db137 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/attribute.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/attribute.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "proc-macro"] extern crate proc_macro; diff --git a/src/test/compile-fail-fulldeps/proc-macro/attributes-included.rs b/src/test/compile-fail-fulldeps/proc-macro/attributes-included.rs index e941367b08de9..c610290d694c4 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/attributes-included.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/attributes-included.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:attributes-included.rs // ignore-stage1 // compile-pass diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/attr-stmt-expr.rs b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/attr-stmt-expr.rs index 22ddc91399553..4c7fc23f13f03 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/attr-stmt-expr.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/attr-stmt-expr.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/attr_proc_macro.rs b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/attr_proc_macro.rs index 679cb7728680d..b1f54be6bac4b 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/attr_proc_macro.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/attr_proc_macro.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host // no-prefer-dynamic diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/attribute-with-error.rs b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/attribute-with-error.rs index 1428409266944..c073be0031019 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/attribute-with-error.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/attribute-with-error.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host // no-prefer-dynamic diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/attributes-included.rs b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/attributes-included.rs index a1f4209662d86..a5eb40b28dca4 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/attributes-included.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/attributes-included.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host // no-prefer-dynamic diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/bang_proc_macro.rs b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/bang_proc_macro.rs index 6484725814a10..16f3b7640290d 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/bang_proc_macro.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/bang_proc_macro.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host // no-prefer-dynamic diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/bang_proc_macro2.rs b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/bang_proc_macro2.rs index 3f0a45743671c..fcaaba6023d11 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/bang_proc_macro2.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/bang_proc_macro2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host // no-prefer-dynamic diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-a-b.rs b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-a-b.rs index cd8750bc89c42..64d4e0f7b7ae5 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-a-b.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-a-b.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host // no-prefer-dynamic diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-a.rs b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-a.rs index 53b2c23e5d7df..c9d94aba9f756 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-a.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-a.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host // no-prefer-dynamic diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-b.rs b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-b.rs index 5787546fb1e5a..e7ab6c0729fbf 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-b.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-b.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host // no-prefer-dynamic diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-bad.rs b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-bad.rs index 841b39eaed07b..9547675f3d691 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-bad.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-bad.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic // force-host diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-clona.rs b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-clona.rs index 719fbdb15ef2a..4a35c9d0dbbda 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-clona.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-clona.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host // no-prefer-dynamic diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-foo.rs b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-foo.rs index 64dcf72ba2029..3ea027d4f5323 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-foo.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-foo.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host // no-prefer-dynamic diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-unstable-2.rs b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-unstable-2.rs index 2d492d341ebba..eac21b04983c8 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-unstable-2.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-unstable-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host // no-prefer-dynamic diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-unstable.rs b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-unstable.rs index a7b5d1e3e54cf..f702df66db1b8 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-unstable.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-unstable.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host // no-prefer-dynamic diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/issue-41211.rs b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/issue-41211.rs index 5365e8238e99f..db946e7f331ca 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/issue-41211.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/issue-41211.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host // no-prefer-dynamic diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/issue_38586.rs b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/issue_38586.rs index e1a7ffaa26cb7..f3a19081c475f 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/issue_38586.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/issue_38586.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host // no-prefer-dynamic diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/issue_50493.rs b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/issue_50493.rs index e71b792a48a14..f72024948a9dc 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/issue_50493.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/issue_50493.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host // no-prefer-dynamic diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/more-gates.rs b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/more-gates.rs index 67fe93058aa89..cb3add53c128e 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/more-gates.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/more-gates.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/proc-macro-gates.rs b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/proc-macro-gates.rs index 0f8fd5b5709c7..319fa09dc5e31 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/proc-macro-gates.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/proc-macro-gates.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic // force-host diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/test-macros.rs b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/test-macros.rs index 581c7cb15a59c..978eabc3784b2 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/test-macros.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/test-macros.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/compile-fail-fulldeps/proc-macro/define-two.rs b/src/test/compile-fail-fulldeps/proc-macro/define-two.rs index 8321c471b2a8a..114f34dd7b9ff 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/define-two.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/define-two.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/compile-fail-fulldeps/proc-macro/derive-bad.rs b/src/test/compile-fail-fulldeps/proc-macro/derive-bad.rs index 93790f5937298..7021f40b04326 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/derive-bad.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/derive-bad.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:derive-bad.rs // ignore-stage1 diff --git a/src/test/compile-fail-fulldeps/proc-macro/derive-still-gated.rs b/src/test/compile-fail-fulldeps/proc-macro/derive-still-gated.rs index f36236c53562d..144b3b6360106 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/derive-still-gated.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/derive-still-gated.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:derive-a.rs #![allow(warnings)] diff --git a/src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable-2.rs b/src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable-2.rs index 6f254dcbdb11a..0c7db5212100e 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable-2.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:derive-unstable-2.rs // ignore-stage1 diff --git a/src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable.rs b/src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable.rs index ca0f0e382ed0c..bdf99f4810580 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:derive-unstable.rs // ignore-stage1 diff --git a/src/test/compile-fail-fulldeps/proc-macro/export-macro.rs b/src/test/compile-fail-fulldeps/proc-macro/export-macro.rs index 477039bd7a2fa..3ceae1be3b031 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/export-macro.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/export-macro.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: cannot export macro_rules! macros from a `proc-macro` crate #![crate_type = "proc-macro"] diff --git a/src/test/compile-fail-fulldeps/proc-macro/exports.rs b/src/test/compile-fail-fulldeps/proc-macro/exports.rs index 41b94d04e8c73..32a34c693e461 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/exports.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/exports.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "proc-macro"] #![allow(warnings)] diff --git a/src/test/compile-fail-fulldeps/proc-macro/illegal-proc-macro-derive-use.rs b/src/test/compile-fail-fulldeps/proc-macro/illegal-proc-macro-derive-use.rs index f37980c5e0f54..4efd9e952fc14 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/illegal-proc-macro-derive-use.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/illegal-proc-macro-derive-use.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate proc_macro; #[proc_macro_derive(Foo)] diff --git a/src/test/compile-fail-fulldeps/proc-macro/import.rs b/src/test/compile-fail-fulldeps/proc-macro/import.rs index fae2439344fb0..8fbccdf1aed14 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/import.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/import.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:derive-a.rs #![allow(warnings)] diff --git a/src/test/compile-fail-fulldeps/proc-macro/issue-37788.rs b/src/test/compile-fail-fulldeps/proc-macro/issue-37788.rs index 691c280580122..75fcd24d85f6f 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/issue-37788.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/issue-37788.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:derive-a-b.rs #[macro_use] diff --git a/src/test/compile-fail-fulldeps/proc-macro/issue-38586.rs b/src/test/compile-fail-fulldeps/proc-macro/issue-38586.rs index 2d843d0e46652..ba4bd239fd4ff 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/issue-38586.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/issue-38586.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_38586.rs // ignore-stage1 diff --git a/src/test/compile-fail-fulldeps/proc-macro/issue-41211.rs b/src/test/compile-fail-fulldeps/proc-macro/issue-41211.rs index 52d7afb26adba..c67018f268de0 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/issue-41211.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/issue-41211.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-41211.rs // FIXME: https://github.com/rust-lang/rust/issues/41430 diff --git a/src/test/compile-fail-fulldeps/proc-macro/issue-50493.rs b/src/test/compile-fail-fulldeps/proc-macro/issue-50493.rs index eaa64c6ba3692..c3295fe45fd41 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/issue-50493.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/issue-50493.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_50493.rs // ignore-stage1 diff --git a/src/test/compile-fail-fulldeps/proc-macro/item-error.rs b/src/test/compile-fail-fulldeps/proc-macro/item-error.rs index c0d4d71a6ec8b..b3ec7d85f1267 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/item-error.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/item-error.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:derive-b.rs // ignore-stage1 diff --git a/src/test/compile-fail-fulldeps/proc-macro/lints_in_proc_macros.rs b/src/test/compile-fail-fulldeps/proc-macro/lints_in_proc_macros.rs index 6e9d231ea99a4..a3af72984e483 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/lints_in_proc_macros.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/lints_in_proc_macros.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:bang_proc_macro2.rs // ignore-stage1 diff --git a/src/test/compile-fail-fulldeps/proc-macro/macro-use-attr.rs b/src/test/compile-fail-fulldeps/proc-macro/macro-use-attr.rs index 0fcb9efc1c95c..c608c361174c5 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/macro-use-attr.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/macro-use-attr.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:attr_proc_macro.rs #[macro_use] extern crate attr_proc_macro; diff --git a/src/test/compile-fail-fulldeps/proc-macro/macro-use-bang.rs b/src/test/compile-fail-fulldeps/proc-macro/macro-use-bang.rs index be5b8c39f1dde..3c02fc9db79f7 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/macro-use-bang.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/macro-use-bang.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:bang_proc_macro.rs #![feature(proc_macro_non_items)] diff --git a/src/test/compile-fail-fulldeps/proc-macro/macros-in-extern.rs b/src/test/compile-fail-fulldeps/proc-macro/macros-in-extern.rs index f280e74fc90bd..2a3130e479ed4 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/macros-in-extern.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/macros-in-extern.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:test-macros.rs // ignore-stage1 // ignore-wasm32 diff --git a/src/test/compile-fail-fulldeps/proc-macro/more-gates.rs b/src/test/compile-fail-fulldeps/proc-macro/more-gates.rs index 4c038179544ff..e3fb96b90edef 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/more-gates.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/more-gates.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:more-gates.rs extern crate more_gates as foo; diff --git a/src/test/compile-fail-fulldeps/proc-macro/no-macro-use-attr.rs b/src/test/compile-fail-fulldeps/proc-macro/no-macro-use-attr.rs index ab05ca28386ab..62a501ded1006 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/no-macro-use-attr.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/no-macro-use-attr.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:derive-a.rs #![feature(rustc_attrs)] diff --git a/src/test/compile-fail-fulldeps/proc-macro/proc-macro-attributes.rs b/src/test/compile-fail-fulldeps/proc-macro/proc-macro-attributes.rs index 215d51c227084..2b3cd81ebc21c 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/proc-macro-attributes.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/proc-macro-attributes.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:derive-b.rs // ignore-stage1 diff --git a/src/test/compile-fail-fulldeps/proc-macro/proc-macro-gates.rs b/src/test/compile-fail-fulldeps/proc-macro/proc-macro-gates.rs index 5cf65103ba3eb..ab651efa7c927 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/proc-macro-gates.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/proc-macro-gates.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:proc-macro-gates.rs // gate-test-proc_macro_non_items // gate-test-proc_macro_mod line diff --git a/src/test/compile-fail-fulldeps/proc-macro/proc-macro-gates2.rs b/src/test/compile-fail-fulldeps/proc-macro/proc-macro-gates2.rs index dc182414a1ddc..46b543a397cc7 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/proc-macro-gates2.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/proc-macro-gates2.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:proc-macro-gates.rs #![feature(stmt_expr_attributes)] diff --git a/src/test/compile-fail-fulldeps/proc-macro/pub-at-crate-root.rs b/src/test/compile-fail-fulldeps/proc-macro/pub-at-crate-root.rs index 238dde5160cd4..0be7e95497462 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/pub-at-crate-root.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/pub-at-crate-root.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "proc-macro"] extern crate proc_macro; diff --git a/src/test/compile-fail-fulldeps/proc-macro/shadow-builtin.rs b/src/test/compile-fail-fulldeps/proc-macro/shadow-builtin.rs index 8c5affb7b5ab3..c88b79da542a1 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/shadow-builtin.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/shadow-builtin.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "proc-macro"] extern crate proc_macro; diff --git a/src/test/compile-fail-fulldeps/proc-macro/shadow.rs b/src/test/compile-fail-fulldeps/proc-macro/shadow.rs index 9bff1c57ae4e0..9c49bae28a3bc 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/shadow.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/shadow.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:derive-a.rs #[macro_use] diff --git a/src/test/compile-fail-fulldeps/proc-macro/two-crate-types-1.rs b/src/test/compile-fail-fulldeps/proc-macro/two-crate-types-1.rs index db646fb781544..0ef449ae863f8 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/two-crate-types-1.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/two-crate-types-1.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: cannot mix `proc-macro` crate type with others #![crate_type = "proc-macro"] diff --git a/src/test/compile-fail-fulldeps/proc-macro/two-crate-types-2.rs b/src/test/compile-fail-fulldeps/proc-macro/two-crate-types-2.rs index 97b0f8446043d..9088720ec9971 100644 --- a/src/test/compile-fail-fulldeps/proc-macro/two-crate-types-2.rs +++ b/src/test/compile-fail-fulldeps/proc-macro/two-crate-types-2.rs @@ -1,12 +1,2 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: cannot mix `proc-macro` crate type with others // compile-flags: --crate-type rlib --crate-type proc-macro diff --git a/src/test/compile-fail-fulldeps/qquote.rs b/src/test/compile-fail-fulldeps/qquote.rs index 4b0bc8f02b4f9..99e365d21ff94 100644 --- a/src/test/compile-fail-fulldeps/qquote.rs +++ b/src/test/compile-fail-fulldeps/qquote.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cross-compile #![feature(quote, rustc_private)] diff --git a/src/test/compile-fail/asm-src-loc-codegen-units.rs b/src/test/compile-fail/asm-src-loc-codegen-units.rs index 6c5c5b00776d8..798eb32181ce7 100644 --- a/src/test/compile-fail/asm-src-loc-codegen-units.rs +++ b/src/test/compile-fail/asm-src-loc-codegen-units.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // WONTFIX(#20184) Needs landing pads (not present in stage1) or the compiler hangs. // ignore-stage1 // compile-flags: -C codegen-units=2 diff --git a/src/test/compile-fail/asm-src-loc.rs b/src/test/compile-fail/asm-src-loc.rs index 59b47c2408d7d..0b60256e7fd09 100644 --- a/src/test/compile-fail/asm-src-loc.rs +++ b/src/test/compile-fail/asm-src-loc.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten #![feature(asm)] diff --git a/src/test/compile-fail/auxiliary/crateresolve1-1.rs b/src/test/compile-fail/auxiliary/crateresolve1-1.rs index 050f2fe732935..a00a19e46d519 100644 --- a/src/test/compile-fail/auxiliary/crateresolve1-1.rs +++ b/src/test/compile-fail/auxiliary/crateresolve1-1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-C extra-filename=-1 #![crate_name = "crateresolve1"] #![crate_type = "lib"] diff --git a/src/test/compile-fail/auxiliary/crateresolve1-2.rs b/src/test/compile-fail/auxiliary/crateresolve1-2.rs index d19b3bafba507..71cc0a12ea379 100644 --- a/src/test/compile-fail/auxiliary/crateresolve1-2.rs +++ b/src/test/compile-fail/auxiliary/crateresolve1-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-C extra-filename=-2 #![crate_name = "crateresolve1"] #![crate_type = "lib"] diff --git a/src/test/compile-fail/auxiliary/crateresolve1-3.rs b/src/test/compile-fail/auxiliary/crateresolve1-3.rs index c5096ac49a885..921687d4c3bff 100644 --- a/src/test/compile-fail/auxiliary/crateresolve1-3.rs +++ b/src/test/compile-fail/auxiliary/crateresolve1-3.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-C extra-filename=-3 #![crate_name = "crateresolve1"] #![crate_type = "lib"] diff --git a/src/test/compile-fail/auxiliary/panic-runtime-lang-items.rs b/src/test/compile-fail/auxiliary/panic-runtime-lang-items.rs index d9848a554aba5..abe34a39caf34 100644 --- a/src/test/compile-fail/auxiliary/panic-runtime-lang-items.rs +++ b/src/test/compile-fail/auxiliary/panic-runtime-lang-items.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "rlib"] diff --git a/src/test/compile-fail/auxiliary/panic-runtime-unwind.rs b/src/test/compile-fail/auxiliary/panic-runtime-unwind.rs index 4bb36839d988b..97452a342ab4d 100644 --- a/src/test/compile-fail/auxiliary/panic-runtime-unwind.rs +++ b/src/test/compile-fail/auxiliary/panic-runtime-unwind.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-C panic=unwind // no-prefer-dynamic diff --git a/src/test/compile-fail/auxiliary/panic-runtime-unwind2.rs b/src/test/compile-fail/auxiliary/panic-runtime-unwind2.rs index 4bb36839d988b..97452a342ab4d 100644 --- a/src/test/compile-fail/auxiliary/panic-runtime-unwind2.rs +++ b/src/test/compile-fail/auxiliary/panic-runtime-unwind2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-C panic=unwind // no-prefer-dynamic diff --git a/src/test/compile-fail/auxiliary/some-panic-impl.rs b/src/test/compile-fail/auxiliary/some-panic-impl.rs index db16ac325ac59..db2ba081aae1a 100644 --- a/src/test/compile-fail/auxiliary/some-panic-impl.rs +++ b/src/test/compile-fail/auxiliary/some-panic-impl.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "rlib"] diff --git a/src/test/compile-fail/auxiliary/wants-panic-runtime-unwind.rs b/src/test/compile-fail/auxiliary/wants-panic-runtime-unwind.rs index 2183338b24985..d5f0102196f48 100644 --- a/src/test/compile-fail/auxiliary/wants-panic-runtime-unwind.rs +++ b/src/test/compile-fail/auxiliary/wants-panic-runtime-unwind.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "rlib"] diff --git a/src/test/compile-fail/auxiliary/weak-lang-items.rs b/src/test/compile-fail/auxiliary/weak-lang-items.rs index 6434e62b6f703..7a698cf76ae51 100644 --- a/src/test/compile-fail/auxiliary/weak-lang-items.rs +++ b/src/test/compile-fail/auxiliary/weak-lang-items.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic // This aux-file will require the eh_personality function to be codegen'd, but diff --git a/src/test/compile-fail/coerce-unsafe-to-closure.rs b/src/test/compile-fail/coerce-unsafe-to-closure.rs index 90cbbf242aad4..78bdd36f9cc3a 100644 --- a/src/test/compile-fail/coerce-unsafe-to-closure.rs +++ b/src/test/compile-fail/coerce-unsafe-to-closure.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x: Option<&[u8]> = Some("foo").map(std::mem::transmute); //~^ ERROR E0277 diff --git a/src/test/compile-fail/const-err3.rs b/src/test/compile-fail/const-err3.rs index f5e43b57e7775..fc10824f0c03c 100644 --- a/src/test/compile-fail/const-err3.rs +++ b/src/test/compile-fail/const-err3.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![deny(const_err)] diff --git a/src/test/compile-fail/crateresolve1.rs b/src/test/compile-fail/crateresolve1.rs index 8c3dbda680201..453c8d976228a 100644 --- a/src/test/compile-fail/crateresolve1.rs +++ b/src/test/compile-fail/crateresolve1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:crateresolve1-1.rs // aux-build:crateresolve1-2.rs // aux-build:crateresolve1-3.rs diff --git a/src/test/compile-fail/empty-extern-arg.rs b/src/test/compile-fail/empty-extern-arg.rs index 8791481d9e75e..ae28fcad903be 100644 --- a/src/test/compile-fail/empty-extern-arg.rs +++ b/src/test/compile-fail/empty-extern-arg.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --extern std= // error-pattern: can't find crate for `std` diff --git a/src/test/compile-fail/issue-10755.rs b/src/test/compile-fail/issue-10755.rs index 57915bce456d9..6753b870f2e74 100644 --- a/src/test/compile-fail/issue-10755.rs +++ b/src/test/compile-fail/issue-10755.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C linker=llllll -Z linker-flavor=ld // error-pattern: linker `llllll` not found diff --git a/src/test/compile-fail/issue-23595-1.rs b/src/test/compile-fail/issue-23595-1.rs index a3422d859c61f..bb2aa5ad08b87 100644 --- a/src/test/compile-fail/issue-23595-1.rs +++ b/src/test/compile-fail/issue-23595-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(associated_type_defaults)] use std::ops::{Index}; diff --git a/src/test/compile-fail/issue-43733-2.rs b/src/test/compile-fail/issue-43733-2.rs index a5ba9ef9bd35d..09136f4964263 100644 --- a/src/test/compile-fail/issue-43733-2.rs +++ b/src/test/compile-fail/issue-43733-2.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_fn)] #![feature(cfg_target_thread_local, thread_local_internals)] diff --git a/src/test/compile-fail/issue-46209-private-enum-variant-reexport.rs b/src/test/compile-fail/issue-46209-private-enum-variant-reexport.rs index f5a20dd96dc90..d54c993147938 100644 --- a/src/test/compile-fail/issue-46209-private-enum-variant-reexport.rs +++ b/src/test/compile-fail/issue-46209-private-enum-variant-reexport.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(crate_visibility_modifier)] mod rank { diff --git a/src/test/compile-fail/meta-expected-error-wrong-rev.rs b/src/test/compile-fail/meta-expected-error-wrong-rev.rs index 8869e950b3a44..7e49434142bcb 100644 --- a/src/test/compile-fail/meta-expected-error-wrong-rev.rs +++ b/src/test/compile-fail/meta-expected-error-wrong-rev.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-compare-mode-nll // revisions: a diff --git a/src/test/compile-fail/nolink-with-link-args.rs b/src/test/compile-fail/nolink-with-link-args.rs index 6dfd74f541e6e..7f38aa34a1e27 100644 --- a/src/test/compile-fail/nolink-with-link-args.rs +++ b/src/test/compile-fail/nolink-with-link-args.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:aFdEfSeVEE // compile-flags: -Z linker-flavor=ld diff --git a/src/test/compile-fail/not-utf8.rs b/src/test/compile-fail/not-utf8.rs index 5331062d9b68d..1cb1fdcb8c96d 100644 --- a/src/test/compile-fail/not-utf8.rs +++ b/src/test/compile-fail/not-utf8.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: did not contain valid UTF-8 fn foo() { diff --git a/src/test/compile-fail/panic-implementation-missing.rs b/src/test/compile-fail/panic-implementation-missing.rs index b11081a3e3bbe..ceb3ac3e6464c 100644 --- a/src/test/compile-fail/panic-implementation-missing.rs +++ b/src/test/compile-fail/panic-implementation-missing.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: `#[panic_implementation]` function required, but not found #![feature(lang_items)] diff --git a/src/test/compile-fail/panic-implementation-twice.rs b/src/test/compile-fail/panic-implementation-twice.rs index 78dc545c036f8..dc54c0b28062f 100644 --- a/src/test/compile-fail/panic-implementation-twice.rs +++ b/src/test/compile-fail/panic-implementation-twice.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:some-panic-impl.rs #![feature(panic_implementation)] diff --git a/src/test/compile-fail/two-panic-runtimes.rs b/src/test/compile-fail/two-panic-runtimes.rs index 0fe0da2fa2c57..66b184e521abc 100644 --- a/src/test/compile-fail/two-panic-runtimes.rs +++ b/src/test/compile-fail/two-panic-runtimes.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:cannot link together two panic runtimes: panic_runtime_unwind and panic_runtime_unwind2 // ignore-tidy-linelength // aux-build:panic-runtime-unwind.rs diff --git a/src/test/compile-fail/unsized-locals/unsized-exprs.rs b/src/test/compile-fail/unsized-locals/unsized-exprs.rs index a09ccbb407e98..0cf93c78c4abe 100644 --- a/src/test/compile-fail/unsized-locals/unsized-exprs.rs +++ b/src/test/compile-fail/unsized-locals/unsized-exprs.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unsized_tuple_coercion, unsized_locals)] struct A(X); diff --git a/src/test/compile-fail/unsized-locals/unsized-exprs2.rs b/src/test/compile-fail/unsized-locals/unsized-exprs2.rs index 40d6e54bd892f..ae69893a83577 100644 --- a/src/test/compile-fail/unsized-locals/unsized-exprs2.rs +++ b/src/test/compile-fail/unsized-locals/unsized-exprs2.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unsized_tuple_coercion, unsized_locals)] struct A(X); diff --git a/src/test/compile-fail/want-abort-got-unwind.rs b/src/test/compile-fail/want-abort-got-unwind.rs index b178006411ba0..30782e18229e3 100644 --- a/src/test/compile-fail/want-abort-got-unwind.rs +++ b/src/test/compile-fail/want-abort-got-unwind.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:is not compiled with this crate's panic strategy `abort` // aux-build:panic-runtime-unwind.rs // compile-flags:-C panic=abort diff --git a/src/test/compile-fail/want-abort-got-unwind2.rs b/src/test/compile-fail/want-abort-got-unwind2.rs index de8e010c3cb48..35d8d46b55e96 100644 --- a/src/test/compile-fail/want-abort-got-unwind2.rs +++ b/src/test/compile-fail/want-abort-got-unwind2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:is not compiled with this crate's panic strategy `abort` // aux-build:panic-runtime-unwind.rs // aux-build:wants-panic-runtime-unwind.rs diff --git a/src/test/compile-fail/weak-lang-item.rs b/src/test/compile-fail/weak-lang-item.rs index 42972c40674b6..8ecdcefe2d133 100644 --- a/src/test/compile-fail/weak-lang-item.rs +++ b/src/test/compile-fail/weak-lang-item.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:weak-lang-items.rs // error-pattern: `#[panic_implementation]` function required, but not found // error-pattern: language item required, but not found: `eh_personality` diff --git a/src/test/debuginfo/associated-types.rs b/src/test/debuginfo/associated-types.rs index ccd94022711cd..526fe4c8fcf5f 100644 --- a/src/test/debuginfo/associated-types.rs +++ b/src/test/debuginfo/associated-types.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/auxiliary/cross_crate_debuginfo_type_uniquing.rs b/src/test/debuginfo/auxiliary/cross_crate_debuginfo_type_uniquing.rs index f4bc72305a026..b9bb3ba7209f9 100644 --- a/src/test/debuginfo/auxiliary/cross_crate_debuginfo_type_uniquing.rs +++ b/src/test/debuginfo/auxiliary/cross_crate_debuginfo_type_uniquing.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "rlib"] // compile-flags:-g diff --git a/src/test/debuginfo/auxiliary/cross_crate_spans.rs b/src/test/debuginfo/auxiliary/cross_crate_spans.rs index 9b6b6221bda38..efe5e419542e8 100644 --- a/src/test/debuginfo/auxiliary/cross_crate_spans.rs +++ b/src/test/debuginfo/auxiliary/cross_crate_spans.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] #![allow(unused_variables)] diff --git a/src/test/debuginfo/auxiliary/issue13213aux.rs b/src/test/debuginfo/auxiliary/issue13213aux.rs index d0566a1e0914b..bde98b44544d6 100644 --- a/src/test/debuginfo/auxiliary/issue13213aux.rs +++ b/src/test/debuginfo/auxiliary/issue13213aux.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] // compile-flags:-g diff --git a/src/test/debuginfo/auxiliary/macro-stepping.rs b/src/test/debuginfo/auxiliary/macro-stepping.rs index 1006b684a8c22..4447dd22ddbd7 100644 --- a/src/test/debuginfo/auxiliary/macro-stepping.rs +++ b/src/test/debuginfo/auxiliary/macro-stepping.rs @@ -1,13 +1,3 @@ -// Copyright 2013-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-g #![crate_type = "rlib"] diff --git a/src/test/debuginfo/basic-types-globals-metadata.rs b/src/test/debuginfo/basic-types-globals-metadata.rs index b699eface3ff7..3934d3c7a685e 100644 --- a/src/test/debuginfo/basic-types-globals-metadata.rs +++ b/src/test/debuginfo/basic-types-globals-metadata.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // ignore-gdb // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155 diff --git a/src/test/debuginfo/basic-types-globals.rs b/src/test/debuginfo/basic-types-globals.rs index 51c36f8f1c15d..389b2cf015cac 100644 --- a/src/test/debuginfo/basic-types-globals.rs +++ b/src/test/debuginfo/basic-types-globals.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Caveats - gdb prints any 8-bit value (meaning rust I8 and u8 values) // as its numerical value along with its associated ASCII char, there // doesn't seem to be any way around this. Also, gdb doesn't know diff --git a/src/test/debuginfo/basic-types-metadata.rs b/src/test/debuginfo/basic-types-metadata.rs index 3dbfdea3c22cf..ca0a6e2320273 100644 --- a/src/test/debuginfo/basic-types-metadata.rs +++ b/src/test/debuginfo/basic-types-metadata.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // ignore-gdb // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155 diff --git a/src/test/debuginfo/basic-types-mut-globals.rs b/src/test/debuginfo/basic-types-mut-globals.rs index 2d4b4d61aa862..9b0c46fa478c1 100644 --- a/src/test/debuginfo/basic-types-mut-globals.rs +++ b/src/test/debuginfo/basic-types-mut-globals.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Caveats - gdb prints any 8-bit value (meaning rust I8 and u8 values) // as its numerical value along with its associated ASCII char, there // doesn't seem to be any way around this. Also, gdb doesn't know diff --git a/src/test/debuginfo/basic-types.rs b/src/test/debuginfo/basic-types.rs index 01ce5bd31626e..159a0ed9cba36 100644 --- a/src/test/debuginfo/basic-types.rs +++ b/src/test/debuginfo/basic-types.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Caveats - gdb prints any 8-bit value (meaning rust i8 and u8 values) // as its numerical value along with its associated ASCII char, there // doesn't seem to be any way around this. Also, gdb doesn't know diff --git a/src/test/debuginfo/borrowed-basic.rs b/src/test/debuginfo/borrowed-basic.rs index f6c0ff09efe93..978b9cef0fade 100644 --- a/src/test/debuginfo/borrowed-basic.rs +++ b/src/test/debuginfo/borrowed-basic.rs @@ -1,14 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // Gdb doesn't know about UTF-32 character encoding and will print a rust char as only // its numerical value. diff --git a/src/test/debuginfo/borrowed-c-style-enum.rs b/src/test/debuginfo/borrowed-c-style-enum.rs index d6f379634be5b..4ea8eed8098d1 100644 --- a/src/test/debuginfo/borrowed-c-style-enum.rs +++ b/src/test/debuginfo/borrowed-c-style-enum.rs @@ -1,14 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // compile-flags:-g // min-lldb-version: 310 diff --git a/src/test/debuginfo/borrowed-enum.rs b/src/test/debuginfo/borrowed-enum.rs index 9e63beff3cb2e..9b25cda8adcc8 100644 --- a/src/test/debuginfo/borrowed-enum.rs +++ b/src/test/debuginfo/borrowed-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // min-lldb-version: 310 // ignore-gdb-version: 7.11.90 - 7.12.9 diff --git a/src/test/debuginfo/borrowed-struct.rs b/src/test/debuginfo/borrowed-struct.rs index 01428e515e27f..dd09c198fbce2 100644 --- a/src/test/debuginfo/borrowed-struct.rs +++ b/src/test/debuginfo/borrowed-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-g // min-lldb-version: 310 diff --git a/src/test/debuginfo/borrowed-tuple.rs b/src/test/debuginfo/borrowed-tuple.rs index 17db88ee37f53..31aabe2c7837e 100644 --- a/src/test/debuginfo/borrowed-tuple.rs +++ b/src/test/debuginfo/borrowed-tuple.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/borrowed-unique-basic.rs b/src/test/debuginfo/borrowed-unique-basic.rs index 9e95498b0c30e..a8d29b3125dc3 100644 --- a/src/test/debuginfo/borrowed-unique-basic.rs +++ b/src/test/debuginfo/borrowed-unique-basic.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // Gdb doesn't know about UTF-32 character encoding and will print a rust char as only diff --git a/src/test/debuginfo/box.rs b/src/test/debuginfo/box.rs index 98c09fe09de8f..0a590c9c531b0 100644 --- a/src/test/debuginfo/box.rs +++ b/src/test/debuginfo/box.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/boxed-struct.rs b/src/test/debuginfo/boxed-struct.rs index ac091b4a533db..ea8cdb6ceda31 100644 --- a/src/test/debuginfo/boxed-struct.rs +++ b/src/test/debuginfo/boxed-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/by-value-non-immediate-argument.rs b/src/test/debuginfo/by-value-non-immediate-argument.rs index 9007b44296bcc..11a115e239384 100644 --- a/src/test/debuginfo/by-value-non-immediate-argument.rs +++ b/src/test/debuginfo/by-value-non-immediate-argument.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // ignore-test // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155 // min-lldb-version: 310 diff --git a/src/test/debuginfo/by-value-self-argument-in-trait-impl.rs b/src/test/debuginfo/by-value-self-argument-in-trait-impl.rs index c14f8c7b354fc..44da969528890 100644 --- a/src/test/debuginfo/by-value-self-argument-in-trait-impl.rs +++ b/src/test/debuginfo/by-value-self-argument-in-trait-impl.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/c-style-enum-in-composite.rs b/src/test/debuginfo/c-style-enum-in-composite.rs index 004e15d1cc6c1..86d968d441ba4 100644 --- a/src/test/debuginfo/c-style-enum-in-composite.rs +++ b/src/test/debuginfo/c-style-enum-in-composite.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // min-lldb-version: 310 diff --git a/src/test/debuginfo/c-style-enum.rs b/src/test/debuginfo/c-style-enum.rs index 2dbac8e3d9eac..d3d3863543a75 100644 --- a/src/test/debuginfo/c-style-enum.rs +++ b/src/test/debuginfo/c-style-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-aarch64 // ignore-gdb // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155 // min-lldb-version: 310 diff --git a/src/test/debuginfo/closure-in-generic-function.rs b/src/test/debuginfo/closure-in-generic-function.rs index 5335e0bfa4a69..59a48a806b36e 100644 --- a/src/test/debuginfo/closure-in-generic-function.rs +++ b/src/test/debuginfo/closure-in-generic-function.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/constant-debug-locs.rs b/src/test/debuginfo/constant-debug-locs.rs index f5dab5a55b45c..bf85fdca42106 100644 --- a/src/test/debuginfo/constant-debug-locs.rs +++ b/src/test/debuginfo/constant-debug-locs.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/constant-in-match-pattern.rs b/src/test/debuginfo/constant-in-match-pattern.rs index 6974238ac72f2..e1b533b723b92 100644 --- a/src/test/debuginfo/constant-in-match-pattern.rs +++ b/src/test/debuginfo/constant-in-match-pattern.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/cross-crate-spans.rs b/src/test/debuginfo/cross-crate-spans.rs index 28728df928051..23901116e0b60 100644 --- a/src/test/debuginfo/cross-crate-spans.rs +++ b/src/test/debuginfo/cross-crate-spans.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(omit_gdb_pretty_printer_section)] #![omit_gdb_pretty_printer_section] diff --git a/src/test/debuginfo/cross-crate-type-uniquing.rs b/src/test/debuginfo/cross-crate-type-uniquing.rs index 47365b2b9a0f3..5974ddb3a1742 100644 --- a/src/test/debuginfo/cross-crate-type-uniquing.rs +++ b/src/test/debuginfo/cross-crate-type-uniquing.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // aux-build:cross_crate_debuginfo_type_uniquing.rs diff --git a/src/test/debuginfo/destructured-fn-argument.rs b/src/test/debuginfo/destructured-fn-argument.rs index efa9ee59b22b2..769a38a4260e7 100644 --- a/src/test/debuginfo/destructured-fn-argument.rs +++ b/src/test/debuginfo/destructured-fn-argument.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/destructured-for-loop-variable.rs b/src/test/debuginfo/destructured-for-loop-variable.rs index e973c22fd4a85..14f473666b941 100644 --- a/src/test/debuginfo/destructured-for-loop-variable.rs +++ b/src/test/debuginfo/destructured-for-loop-variable.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/destructured-local.rs b/src/test/debuginfo/destructured-local.rs index 1f18b77ab8f6f..5853af4527e9e 100644 --- a/src/test/debuginfo/destructured-local.rs +++ b/src/test/debuginfo/destructured-local.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/drop-locations.rs b/src/test/debuginfo/drop-locations.rs index 76c2826ee8c61..c195f46208a0c 100644 --- a/src/test/debuginfo/drop-locations.rs +++ b/src/test/debuginfo/drop-locations.rs @@ -1,13 +1,3 @@ -// Copyright 2013-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-windows // ignore-android // ignore-test // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155 diff --git a/src/test/debuginfo/evec-in-struct.rs b/src/test/debuginfo/evec-in-struct.rs index 2e151577590b3..7e5254bc05a4b 100644 --- a/src/test/debuginfo/evec-in-struct.rs +++ b/src/test/debuginfo/evec-in-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/extern-c-fn.rs b/src/test/debuginfo/extern-c-fn.rs index 01901b2c42b8e..e864ee6018333 100644 --- a/src/test/debuginfo/extern-c-fn.rs +++ b/src/test/debuginfo/extern-c-fn.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/function-arg-initialization.rs b/src/test/debuginfo/function-arg-initialization.rs index 90088a0297aa8..fef62534b304d 100644 --- a/src/test/debuginfo/function-arg-initialization.rs +++ b/src/test/debuginfo/function-arg-initialization.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // ignore-test // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155 // min-lldb-version: 310 diff --git a/src/test/debuginfo/function-arguments.rs b/src/test/debuginfo/function-arguments.rs index c8f2e385a6e74..248c4372b47d5 100644 --- a/src/test/debuginfo/function-arguments.rs +++ b/src/test/debuginfo/function-arguments.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/function-prologue-stepping-regular.rs b/src/test/debuginfo/function-prologue-stepping-regular.rs index d50d105e009ff..46901030f6525 100644 --- a/src/test/debuginfo/function-prologue-stepping-regular.rs +++ b/src/test/debuginfo/function-prologue-stepping-regular.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test case checks if function arguments already have the correct value when breaking at the // beginning of a function. diff --git a/src/test/debuginfo/gdb-pretty-struct-and-enums-pre-gdb-7-7.rs b/src/test/debuginfo/gdb-pretty-struct-and-enums-pre-gdb-7-7.rs index 158a1f17fc03d..84284ec7d98ff 100644 --- a/src/test/debuginfo/gdb-pretty-struct-and-enums-pre-gdb-7-7.rs +++ b/src/test/debuginfo/gdb-pretty-struct-and-enums-pre-gdb-7-7.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-bitrig // ignore-solaris // ignore-windows failing on win32 bot diff --git a/src/test/debuginfo/generic-enum-with-different-disr-sizes.rs b/src/test/debuginfo/generic-enum-with-different-disr-sizes.rs index 1fc05b3752f04..a42d086954ef6 100644 --- a/src/test/debuginfo/generic-enum-with-different-disr-sizes.rs +++ b/src/test/debuginfo/generic-enum-with-different-disr-sizes.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // ignore-lldb: FIXME(#27089) // min-lldb-version: 310 diff --git a/src/test/debuginfo/generic-function.rs b/src/test/debuginfo/generic-function.rs index f1bfc08915edd..f384d809d3181 100644 --- a/src/test/debuginfo/generic-function.rs +++ b/src/test/debuginfo/generic-function.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // min-lldb-version: 310 diff --git a/src/test/debuginfo/generic-functions-nested.rs b/src/test/debuginfo/generic-functions-nested.rs index 79ae007a50062..d26a76b004866 100644 --- a/src/test/debuginfo/generic-functions-nested.rs +++ b/src/test/debuginfo/generic-functions-nested.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/generic-method-on-generic-struct.rs b/src/test/debuginfo/generic-method-on-generic-struct.rs index 4f3f6dfc821ee..839447853d1ec 100644 --- a/src/test/debuginfo/generic-method-on-generic-struct.rs +++ b/src/test/debuginfo/generic-method-on-generic-struct.rs @@ -1,14 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // compile-flags:-g // min-lldb-version: 310 diff --git a/src/test/debuginfo/generic-static-method-on-struct-and-enum.rs b/src/test/debuginfo/generic-static-method-on-struct-and-enum.rs index 603365089ecef..b0ac8ae857726 100644 --- a/src/test/debuginfo/generic-static-method-on-struct-and-enum.rs +++ b/src/test/debuginfo/generic-static-method-on-struct-and-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/generic-struct-style-enum.rs b/src/test/debuginfo/generic-struct-style-enum.rs index 4a1d14ccf6118..2ed83b413ed50 100644 --- a/src/test/debuginfo/generic-struct-style-enum.rs +++ b/src/test/debuginfo/generic-struct-style-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // min-lldb-version: 310 // ignore-gdb-version: 7.11.90 - 7.12.9 diff --git a/src/test/debuginfo/generic-struct.rs b/src/test/debuginfo/generic-struct.rs index 35f00ce78717b..6c6b739b4205a 100644 --- a/src/test/debuginfo/generic-struct.rs +++ b/src/test/debuginfo/generic-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // min-lldb-version: 310 diff --git a/src/test/debuginfo/generic-tuple-style-enum.rs b/src/test/debuginfo/generic-tuple-style-enum.rs index 012bd6140cdbe..f80a787c451e1 100644 --- a/src/test/debuginfo/generic-tuple-style-enum.rs +++ b/src/test/debuginfo/generic-tuple-style-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // min-lldb-version: 310 // ignore-gdb-version: 7.11.90 - 7.12.9 diff --git a/src/test/debuginfo/include_string.rs b/src/test/debuginfo/include_string.rs index 2c75349e5c8c7..f47212517a1ff 100644 --- a/src/test/debuginfo/include_string.rs +++ b/src/test/debuginfo/include_string.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/issue-12886.rs b/src/test/debuginfo/issue-12886.rs index c30ee92dc532d..1cd623efea917 100644 --- a/src/test/debuginfo/issue-12886.rs +++ b/src/test/debuginfo/issue-12886.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-windows failing on 64-bit bots FIXME #17638 // ignore-lldb // ignore-aarch64 diff --git a/src/test/debuginfo/issue-13213.rs b/src/test/debuginfo/issue-13213.rs index 67975d02b19f0..898ebe547b360 100644 --- a/src/test/debuginfo/issue-13213.rs +++ b/src/test/debuginfo/issue-13213.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // aux-build:issue13213aux.rs diff --git a/src/test/debuginfo/issue-14411.rs b/src/test/debuginfo/issue-14411.rs index d334e33f887b8..19609f428467b 100644 --- a/src/test/debuginfo/issue-14411.rs +++ b/src/test/debuginfo/issue-14411.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/issue-22656.rs b/src/test/debuginfo/issue-22656.rs index a971e06ed5ec2..56a4e840242a7 100644 --- a/src/test/debuginfo/issue-22656.rs +++ b/src/test/debuginfo/issue-22656.rs @@ -1,14 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // This test makes sure that the LLDB pretty printer does not throw an exception // when trying to handle a Vec<> or anything else that contains zero-sized // fields. diff --git a/src/test/debuginfo/issue-7712.rs b/src/test/debuginfo/issue-7712.rs index 124cdfb436ca3..3a7565f559a78 100644 --- a/src/test/debuginfo/issue-7712.rs +++ b/src/test/debuginfo/issue-7712.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-C debuginfo=1 // min-lldb-version: 310 diff --git a/src/test/debuginfo/lexical-scope-in-for-loop.rs b/src/test/debuginfo/lexical-scope-in-for-loop.rs index e99e241411bfd..0d357c832e495 100644 --- a/src/test/debuginfo/lexical-scope-in-for-loop.rs +++ b/src/test/debuginfo/lexical-scope-in-for-loop.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/lexical-scope-in-if.rs b/src/test/debuginfo/lexical-scope-in-if.rs index 42e288321e197..73cf8ee09d418 100644 --- a/src/test/debuginfo/lexical-scope-in-if.rs +++ b/src/test/debuginfo/lexical-scope-in-if.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/lexical-scope-in-match.rs b/src/test/debuginfo/lexical-scope-in-match.rs index 597d9837aadcf..ed30a22b9f123 100644 --- a/src/test/debuginfo/lexical-scope-in-match.rs +++ b/src/test/debuginfo/lexical-scope-in-match.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/lexical-scope-in-parameterless-closure.rs b/src/test/debuginfo/lexical-scope-in-parameterless-closure.rs index 59935e55b3337..d6b947fad8e12 100644 --- a/src/test/debuginfo/lexical-scope-in-parameterless-closure.rs +++ b/src/test/debuginfo/lexical-scope-in-parameterless-closure.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-C debuginfo=1 diff --git a/src/test/debuginfo/lexical-scope-in-stack-closure.rs b/src/test/debuginfo/lexical-scope-in-stack-closure.rs index 0a8d3b61a8d8d..642562ef8e287 100644 --- a/src/test/debuginfo/lexical-scope-in-stack-closure.rs +++ b/src/test/debuginfo/lexical-scope-in-stack-closure.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/lexical-scope-in-unconditional-loop.rs b/src/test/debuginfo/lexical-scope-in-unconditional-loop.rs index e55088afd7d9f..728c6d7077b2a 100644 --- a/src/test/debuginfo/lexical-scope-in-unconditional-loop.rs +++ b/src/test/debuginfo/lexical-scope-in-unconditional-loop.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/lexical-scope-in-unique-closure.rs b/src/test/debuginfo/lexical-scope-in-unique-closure.rs index 70dece865ece0..1c8d8f322f8df 100644 --- a/src/test/debuginfo/lexical-scope-in-unique-closure.rs +++ b/src/test/debuginfo/lexical-scope-in-unique-closure.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/lexical-scope-in-while.rs b/src/test/debuginfo/lexical-scope-in-while.rs index 38d8b75a644fd..17c9574b23b7b 100644 --- a/src/test/debuginfo/lexical-scope-in-while.rs +++ b/src/test/debuginfo/lexical-scope-in-while.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/lexical-scope-with-macro.rs b/src/test/debuginfo/lexical-scope-with-macro.rs index 32d775168692b..37f540d8abf4d 100644 --- a/src/test/debuginfo/lexical-scope-with-macro.rs +++ b/src/test/debuginfo/lexical-scope-with-macro.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // ignore-macos FIXME #48807 diff --git a/src/test/debuginfo/lexical-scopes-in-block-expression.rs b/src/test/debuginfo/lexical-scopes-in-block-expression.rs index e76f9da1c2505..f064b39c39f27 100644 --- a/src/test/debuginfo/lexical-scopes-in-block-expression.rs +++ b/src/test/debuginfo/lexical-scopes-in-block-expression.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // ignore-gdb // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155 diff --git a/src/test/debuginfo/limited-debuginfo.rs b/src/test/debuginfo/limited-debuginfo.rs index d840f38b2aad2..bd381cd0e22d3 100644 --- a/src/test/debuginfo/limited-debuginfo.rs +++ b/src/test/debuginfo/limited-debuginfo.rs @@ -1,14 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // ignore-lldb // ignore-gdb // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155 diff --git a/src/test/debuginfo/macro-stepping.rs b/src/test/debuginfo/macro-stepping.rs index 204dd8c1e739b..e4b2b7b79bcb9 100644 --- a/src/test/debuginfo/macro-stepping.rs +++ b/src/test/debuginfo/macro-stepping.rs @@ -1,13 +1,3 @@ -// Copyright 2013-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-windows // ignore-android // ignore-aarch64 diff --git a/src/test/debuginfo/method-on-enum.rs b/src/test/debuginfo/method-on-enum.rs index ddfff0f7d76e1..94ca0289b78b0 100644 --- a/src/test/debuginfo/method-on-enum.rs +++ b/src/test/debuginfo/method-on-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // min-lldb-version: 310 // ignore-test // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155 diff --git a/src/test/debuginfo/method-on-generic-struct.rs b/src/test/debuginfo/method-on-generic-struct.rs index 20d419b4ac088..034b71863d77f 100644 --- a/src/test/debuginfo/method-on-generic-struct.rs +++ b/src/test/debuginfo/method-on-generic-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/method-on-struct.rs b/src/test/debuginfo/method-on-struct.rs index c7546fe2221ff..98c79e14d11a5 100644 --- a/src/test/debuginfo/method-on-struct.rs +++ b/src/test/debuginfo/method-on-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/method-on-trait.rs b/src/test/debuginfo/method-on-trait.rs index 1dc37bb06ac40..c0680a0eb3d7e 100644 --- a/src/test/debuginfo/method-on-trait.rs +++ b/src/test/debuginfo/method-on-trait.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/method-on-tuple-struct.rs b/src/test/debuginfo/method-on-tuple-struct.rs index dac762ae0c35b..c2f31e29f94c6 100644 --- a/src/test/debuginfo/method-on-tuple-struct.rs +++ b/src/test/debuginfo/method-on-tuple-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/multi-byte-chars.rs b/src/test/debuginfo/multi-byte-chars.rs index f02e3f2a22bed..5382dd1a3234b 100644 --- a/src/test/debuginfo/multi-byte-chars.rs +++ b/src/test/debuginfo/multi-byte-chars.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/multi-cgu.rs b/src/test/debuginfo/multi-cgu.rs index f4f9f92396f2c..748da8f7edba1 100644 --- a/src/test/debuginfo/multi-cgu.rs +++ b/src/test/debuginfo/multi-cgu.rs @@ -1,14 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // This test case makes sure that we get proper break points for binaries // compiled with multiple codegen units. (see #39160) diff --git a/src/test/debuginfo/multiple-functions-equal-var-names.rs b/src/test/debuginfo/multiple-functions-equal-var-names.rs index 71ba1bcea306a..8700995d28f4a 100644 --- a/src/test/debuginfo/multiple-functions-equal-var-names.rs +++ b/src/test/debuginfo/multiple-functions-equal-var-names.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/multiple-functions.rs b/src/test/debuginfo/multiple-functions.rs index 7a1b7b19d9f5d..e83c99443f076 100644 --- a/src/test/debuginfo/multiple-functions.rs +++ b/src/test/debuginfo/multiple-functions.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/name-shadowing-and-scope-nesting.rs b/src/test/debuginfo/name-shadowing-and-scope-nesting.rs index 462e1c59aea22..31d4522ea63b8 100644 --- a/src/test/debuginfo/name-shadowing-and-scope-nesting.rs +++ b/src/test/debuginfo/name-shadowing-and-scope-nesting.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/nil-enum.rs b/src/test/debuginfo/nil-enum.rs index 94377421c0b0c..c56551b9de127 100644 --- a/src/test/debuginfo/nil-enum.rs +++ b/src/test/debuginfo/nil-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // LLDB can't handle zero-sized values // ignore-lldb diff --git a/src/test/debuginfo/no-debug-attribute.rs b/src/test/debuginfo/no-debug-attribute.rs index 15f2eae76c677..db9ac4af629c9 100644 --- a/src/test/debuginfo/no-debug-attribute.rs +++ b/src/test/debuginfo/no-debug-attribute.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-lldb // compile-flags:-g diff --git a/src/test/debuginfo/option-like-enum.rs b/src/test/debuginfo/option-like-enum.rs index 618587e421970..67a3d133ed3d5 100644 --- a/src/test/debuginfo/option-like-enum.rs +++ b/src/test/debuginfo/option-like-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // ignore-test // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155 diff --git a/src/test/debuginfo/packed-struct-with-destructor.rs b/src/test/debuginfo/packed-struct-with-destructor.rs index 50bd857d46076..92ef93e487cf9 100644 --- a/src/test/debuginfo/packed-struct-with-destructor.rs +++ b/src/test/debuginfo/packed-struct-with-destructor.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // min-lldb-version: 310 diff --git a/src/test/debuginfo/packed-struct.rs b/src/test/debuginfo/packed-struct.rs index 16e6371a9c0a9..bc64333e0c9b4 100644 --- a/src/test/debuginfo/packed-struct.rs +++ b/src/test/debuginfo/packed-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // min-lldb-version: 310 // ignore-gdb-version: 7.11.90 - 7.12.9 diff --git a/src/test/debuginfo/pretty-huge-vec.rs b/src/test/debuginfo/pretty-huge-vec.rs index bb53852352307..2e3386b7a360e 100644 --- a/src/test/debuginfo/pretty-huge-vec.rs +++ b/src/test/debuginfo/pretty-huge-vec.rs @@ -1,13 +1,3 @@ -// Copyright 2013-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-windows failing on win32 bot // ignore-freebsd: gdb package too new // ignore-android: FIXME(#10381) diff --git a/src/test/debuginfo/pretty-std-collections.rs b/src/test/debuginfo/pretty-std-collections.rs index 8e37a884b34bb..bd76686b1cb34 100644 --- a/src/test/debuginfo/pretty-std-collections.rs +++ b/src/test/debuginfo/pretty-std-collections.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-windows failing on win32 bot // ignore-freebsd: gdb package too new // ignore-android: FIXME(#10381) diff --git a/src/test/debuginfo/pretty-std.rs b/src/test/debuginfo/pretty-std.rs index 7bc566480e763..82802eff08abb 100644 --- a/src/test/debuginfo/pretty-std.rs +++ b/src/test/debuginfo/pretty-std.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-windows failing on win32 bot // ignore-freebsd: gdb package too new // ignore-test // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155 diff --git a/src/test/debuginfo/pretty-uninitialized-vec.rs b/src/test/debuginfo/pretty-uninitialized-vec.rs index 75169658fe6a2..37aae65d42b69 100644 --- a/src/test/debuginfo/pretty-uninitialized-vec.rs +++ b/src/test/debuginfo/pretty-uninitialized-vec.rs @@ -1,13 +1,3 @@ -// Copyright 2013-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-windows failing on win32 bot // ignore-freebsd: gdb package too new // ignore-android: FIXME(#10381) diff --git a/src/test/debuginfo/recursive-enum.rs b/src/test/debuginfo/recursive-enum.rs index 3094bdeac8b66..a62d4807a6cd5 100644 --- a/src/test/debuginfo/recursive-enum.rs +++ b/src/test/debuginfo/recursive-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-lldb // compile-flags:-g diff --git a/src/test/debuginfo/recursive-struct.rs b/src/test/debuginfo/recursive-struct.rs index 75c2feb480ede..2b8598df1496d 100644 --- a/src/test/debuginfo/recursive-struct.rs +++ b/src/test/debuginfo/recursive-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // ignore-lldb // ignore-gdb-version: 7.11.90 - 7.12.9 diff --git a/src/test/debuginfo/self-in-default-method.rs b/src/test/debuginfo/self-in-default-method.rs index 796d122cd66ba..a53d0541cf7e9 100644 --- a/src/test/debuginfo/self-in-default-method.rs +++ b/src/test/debuginfo/self-in-default-method.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/self-in-generic-default-method.rs b/src/test/debuginfo/self-in-generic-default-method.rs index b07d7ca5fb7b7..9ebacc85d52c7 100644 --- a/src/test/debuginfo/self-in-generic-default-method.rs +++ b/src/test/debuginfo/self-in-generic-default-method.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/shadowed-argument.rs b/src/test/debuginfo/shadowed-argument.rs index baf782b7e678a..ca515154ec4e4 100644 --- a/src/test/debuginfo/shadowed-argument.rs +++ b/src/test/debuginfo/shadowed-argument.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/shadowed-variable.rs b/src/test/debuginfo/shadowed-variable.rs index 6e4d94d26cdeb..bc346e8670145 100644 --- a/src/test/debuginfo/shadowed-variable.rs +++ b/src/test/debuginfo/shadowed-variable.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/should-fail.rs b/src/test/debuginfo/should-fail.rs index 1f8acb5310122..441be56b5b45a 100644 --- a/src/test/debuginfo/should-fail.rs +++ b/src/test/debuginfo/should-fail.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // == Test [gdb|lldb]-[command|check] are parsed correctly === diff --git a/src/test/debuginfo/simd.rs b/src/test/debuginfo/simd.rs index 75e68f7efedef..4748916002c9c 100644 --- a/src/test/debuginfo/simd.rs +++ b/src/test/debuginfo/simd.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Need a fix for LLDB first... // ignore-lldb // ignore-tidy-linelength diff --git a/src/test/debuginfo/simple-lexical-scope.rs b/src/test/debuginfo/simple-lexical-scope.rs index 5f9a4fd080534..207632b226ad2 100644 --- a/src/test/debuginfo/simple-lexical-scope.rs +++ b/src/test/debuginfo/simple-lexical-scope.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/simple-struct.rs b/src/test/debuginfo/simple-struct.rs index 8fdf204d30ab5..55f14a13ecb63 100644 --- a/src/test/debuginfo/simple-struct.rs +++ b/src/test/debuginfo/simple-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // ignore-gdb // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155 diff --git a/src/test/debuginfo/simple-tuple.rs b/src/test/debuginfo/simple-tuple.rs index 8f69672c88844..e3bd602ab7524 100644 --- a/src/test/debuginfo/simple-tuple.rs +++ b/src/test/debuginfo/simple-tuple.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // ignore-gdb // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155 diff --git a/src/test/debuginfo/static-method-on-struct-and-enum.rs b/src/test/debuginfo/static-method-on-struct-and-enum.rs index dab4ab515d995..53ae53dde7401 100644 --- a/src/test/debuginfo/static-method-on-struct-and-enum.rs +++ b/src/test/debuginfo/static-method-on-struct-and-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/struct-in-enum.rs b/src/test/debuginfo/struct-in-enum.rs index 14aaf67d5ae1b..db20e9d3e4542 100644 --- a/src/test/debuginfo/struct-in-enum.rs +++ b/src/test/debuginfo/struct-in-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // min-lldb-version: 310 // ignore-gdb-version: 7.11.90 - 7.12.9 diff --git a/src/test/debuginfo/struct-in-struct.rs b/src/test/debuginfo/struct-in-struct.rs index 46524cf1d029a..84267b6d68a9f 100644 --- a/src/test/debuginfo/struct-in-struct.rs +++ b/src/test/debuginfo/struct-in-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // min-lldb-version: 310 diff --git a/src/test/debuginfo/struct-namespace.rs b/src/test/debuginfo/struct-namespace.rs index 3fd4cf57b2a80..9cb30a6fb52c5 100644 --- a/src/test/debuginfo/struct-namespace.rs +++ b/src/test/debuginfo/struct-namespace.rs @@ -1,13 +1,3 @@ -// Copyright 2013-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-gdb // compile-flags:-g // min-lldb-version: 310 diff --git a/src/test/debuginfo/struct-style-enum.rs b/src/test/debuginfo/struct-style-enum.rs index b156a3be699e3..b39b36181e660 100644 --- a/src/test/debuginfo/struct-style-enum.rs +++ b/src/test/debuginfo/struct-style-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // min-lldb-version: 310 // ignore-gdb-version: 7.11.90 - 7.12.9 diff --git a/src/test/debuginfo/struct-with-destructor.rs b/src/test/debuginfo/struct-with-destructor.rs index ab935a07d650f..79afc6d22058f 100644 --- a/src/test/debuginfo/struct-with-destructor.rs +++ b/src/test/debuginfo/struct-with-destructor.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // min-lldb-version: 310 diff --git a/src/test/debuginfo/trait-pointers.rs b/src/test/debuginfo/trait-pointers.rs index 193cd419bab88..a44f30abd6859 100644 --- a/src/test/debuginfo/trait-pointers.rs +++ b/src/test/debuginfo/trait-pointers.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/tuple-in-struct.rs b/src/test/debuginfo/tuple-in-struct.rs index dae1f5da542f5..c43c1f7bf6da0 100644 --- a/src/test/debuginfo/tuple-in-struct.rs +++ b/src/test/debuginfo/tuple-in-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // min-lldb-version: 310 diff --git a/src/test/debuginfo/tuple-in-tuple.rs b/src/test/debuginfo/tuple-in-tuple.rs index 4ebc740b9c0f7..bc753d770ca8f 100644 --- a/src/test/debuginfo/tuple-in-tuple.rs +++ b/src/test/debuginfo/tuple-in-tuple.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/tuple-struct.rs b/src/test/debuginfo/tuple-struct.rs index aa644d8419b54..4bf7a28e7def2 100644 --- a/src/test/debuginfo/tuple-struct.rs +++ b/src/test/debuginfo/tuple-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/tuple-style-enum.rs b/src/test/debuginfo/tuple-style-enum.rs index f36153d1f5c5a..e80da7e143222 100644 --- a/src/test/debuginfo/tuple-style-enum.rs +++ b/src/test/debuginfo/tuple-style-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // min-lldb-version: 310 // ignore-gdb-version: 7.11.90 - 7.12.9 diff --git a/src/test/debuginfo/type-names.rs b/src/test/debuginfo/type-names.rs index 3ec8b048b12bf..6ec237ed761b9 100644 --- a/src/test/debuginfo/type-names.rs +++ b/src/test/debuginfo/type-names.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // ignore-lldb // ignore-gdb // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155 diff --git a/src/test/debuginfo/union-smoke.rs b/src/test/debuginfo/union-smoke.rs index 622c7cf0d3334..63235213ebed8 100644 --- a/src/test/debuginfo/union-smoke.rs +++ b/src/test/debuginfo/union-smoke.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // ignore-gdb // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155 diff --git a/src/test/debuginfo/unique-enum.rs b/src/test/debuginfo/unique-enum.rs index 5a99de7779cff..c4ecb802831b0 100644 --- a/src/test/debuginfo/unique-enum.rs +++ b/src/test/debuginfo/unique-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // min-lldb-version: 310 // ignore-gdb-version: 7.11.90 - 7.12.9 diff --git a/src/test/debuginfo/unreachable-locals.rs b/src/test/debuginfo/unreachable-locals.rs index 4c4210ea132a6..b6971f353a512 100644 --- a/src/test/debuginfo/unreachable-locals.rs +++ b/src/test/debuginfo/unreachable-locals.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/unsized.rs b/src/test/debuginfo/unsized.rs index b0ce335a8d913..c27fe61dc8b47 100644 --- a/src/test/debuginfo/unsized.rs +++ b/src/test/debuginfo/unsized.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-g // === GDB TESTS =================================================================================== diff --git a/src/test/debuginfo/var-captured-in-nested-closure.rs b/src/test/debuginfo/var-captured-in-nested-closure.rs index b9a1d73b6d869..9b1aaa06f5726 100644 --- a/src/test/debuginfo/var-captured-in-nested-closure.rs +++ b/src/test/debuginfo/var-captured-in-nested-closure.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/var-captured-in-sendable-closure.rs b/src/test/debuginfo/var-captured-in-sendable-closure.rs index 9aeb3bc91336a..01e0c96836387 100644 --- a/src/test/debuginfo/var-captured-in-sendable-closure.rs +++ b/src/test/debuginfo/var-captured-in-sendable-closure.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/var-captured-in-stack-closure.rs b/src/test/debuginfo/var-captured-in-stack-closure.rs index c795a095b9769..99eb1928df311 100644 --- a/src/test/debuginfo/var-captured-in-stack-closure.rs +++ b/src/test/debuginfo/var-captured-in-stack-closure.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/vec-slices.rs b/src/test/debuginfo/vec-slices.rs index 888d9b28506b3..94291d43eb8fb 100644 --- a/src/test/debuginfo/vec-slices.rs +++ b/src/test/debuginfo/vec-slices.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-windows // ignore-gdb // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155 // min-lldb-version: 310 diff --git a/src/test/debuginfo/vec.rs b/src/test/debuginfo/vec.rs index dba947530fea8..ca9b943e7ccd9 100644 --- a/src/test/debuginfo/vec.rs +++ b/src/test/debuginfo/vec.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-lldb-version: 310 // ignore-gdb // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155 diff --git a/src/test/incremental-fulldeps/auxiliary/incremental_proc_macro_aux.rs b/src/test/incremental-fulldeps/auxiliary/incremental_proc_macro_aux.rs index e9f9ba86f23dc..27ca47af0a3db 100644 --- a/src/test/incremental-fulldeps/auxiliary/incremental_proc_macro_aux.rs +++ b/src/test/incremental-fulldeps/auxiliary/incremental_proc_macro_aux.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/incremental-fulldeps/incremental_proc_macro.rs b/src/test/incremental-fulldeps/incremental_proc_macro.rs index 103ee30baba93..4e0759c5aed4e 100644 --- a/src/test/incremental-fulldeps/incremental_proc_macro.rs +++ b/src/test/incremental-fulldeps/incremental_proc_macro.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:incremental_proc_macro_aux.rs // ignore-stage1 // revisions: cfail1 cfail2 diff --git a/src/test/incremental/add_private_fn_at_krate_root_cc/auxiliary/point.rs b/src/test/incremental/add_private_fn_at_krate_root_cc/auxiliary/point.rs index adc2b23441ef8..16aaad348a808 100644 --- a/src/test/incremental/add_private_fn_at_krate_root_cc/auxiliary/point.rs +++ b/src/test/incremental/add_private_fn_at_krate_root_cc/auxiliary/point.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Point { pub x: f32, pub y: f32, diff --git a/src/test/incremental/add_private_fn_at_krate_root_cc/struct_point.rs b/src/test/incremental/add_private_fn_at_krate_root_cc/struct_point.rs index 90a532a6cd6d4..0e17a29dea03e 100644 --- a/src/test/incremental/add_private_fn_at_krate_root_cc/struct_point.rs +++ b/src/test/incremental/add_private_fn_at_krate_root_cc/struct_point.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test where we add a private item into the root of an external. // crate. This should not cause anything we use to be invalidated. // Regression test for #36168. diff --git a/src/test/incremental/cache_file_headers.rs b/src/test/incremental/cache_file_headers.rs index 02ee06b4cf445..7f1ef886ac831 100644 --- a/src/test/incremental/cache_file_headers.rs +++ b/src/test/incremental/cache_file_headers.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test case makes sure that the compiler does not try to re-use anything // from the incremental compilation cache if the cache was produced by a // different compiler version. This is tested by artificially forcing the diff --git a/src/test/incremental/callee_caller_cross_crate/auxiliary/a.rs b/src/test/incremental/callee_caller_cross_crate/auxiliary/a.rs index d802c9a8352eb..6445f87f7fafc 100644 --- a/src/test/incremental/callee_caller_cross_crate/auxiliary/a.rs +++ b/src/test/incremental/callee_caller_cross_crate/auxiliary/a.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="rlib"] #[cfg(rpass1)] diff --git a/src/test/incremental/callee_caller_cross_crate/b.rs b/src/test/incremental/callee_caller_cross_crate/b.rs index 9e56d34636ff0..95285b7a03c50 100644 --- a/src/test/incremental/callee_caller_cross_crate/b.rs +++ b/src/test/incremental/callee_caller_cross_crate/b.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:a.rs // revisions:rpass1 rpass2 // compile-flags:-Z query-dep-graph diff --git a/src/test/incremental/change_add_field/struct_point.rs b/src/test/incremental/change_add_field/struct_point.rs index 37d1a397303b6..6006831e48234 100644 --- a/src/test/incremental/change_add_field/struct_point.rs +++ b/src/test/incremental/change_add_field/struct_point.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test where we change a type definition by adding a field. Fns with // this type in their signature are recompiled, as are their callers. // Fns with that type used only in their body are also recompiled, but diff --git a/src/test/incremental/change_crate_dep_kind.rs b/src/test/incremental/change_crate_dep_kind.rs index 2e418cc504875..04a41d71cc945 100644 --- a/src/test/incremental/change_crate_dep_kind.rs +++ b/src/test/incremental/change_crate_dep_kind.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we detect changes to the `dep_kind` query. If the change is not // detected then -Zincremental-verify-ich will trigger an assertion. diff --git a/src/test/incremental/change_crate_order/auxiliary/a.rs b/src/test/incremental/change_crate_order/auxiliary/a.rs index 69b4acd3e3023..5948f38cf1bd7 100644 --- a/src/test/incremental/change_crate_order/auxiliary/a.rs +++ b/src/test/incremental/change_crate_order/auxiliary/a.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="rlib"] pub static A : u32 = 32; diff --git a/src/test/incremental/change_crate_order/auxiliary/b.rs b/src/test/incremental/change_crate_order/auxiliary/b.rs index 1ab97a312c1f1..12e310398511b 100644 --- a/src/test/incremental/change_crate_order/auxiliary/b.rs +++ b/src/test/incremental/change_crate_order/auxiliary/b.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="rlib"] pub static B: u32 = 32; diff --git a/src/test/incremental/change_crate_order/main.rs b/src/test/incremental/change_crate_order/main.rs index 5ee75d44f1d15..e514c8519f89f 100644 --- a/src/test/incremental/change_crate_order/main.rs +++ b/src/test/incremental/change_crate_order/main.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:a.rs // aux-build:b.rs // revisions:rpass1 rpass2 diff --git a/src/test/incremental/change_private_fn/struct_point.rs b/src/test/incremental/change_private_fn/struct_point.rs index d1b8399dbdae5..f9f83169ef4af 100644 --- a/src/test/incremental/change_private_fn/struct_point.rs +++ b/src/test/incremental/change_private_fn/struct_point.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test where we change the body of a private method in an impl. // We then test what sort of functions must be rebuilt as a result. diff --git a/src/test/incremental/change_private_fn_cc/auxiliary/point.rs b/src/test/incremental/change_private_fn_cc/auxiliary/point.rs index af20336806fd4..483f205720c95 100644 --- a/src/test/incremental/change_private_fn_cc/auxiliary/point.rs +++ b/src/test/incremental/change_private_fn_cc/auxiliary/point.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Point { pub x: f32, pub y: f32, diff --git a/src/test/incremental/change_private_fn_cc/struct_point.rs b/src/test/incremental/change_private_fn_cc/struct_point.rs index c79dc6e341815..827eb8105b274 100644 --- a/src/test/incremental/change_private_fn_cc/struct_point.rs +++ b/src/test/incremental/change_private_fn_cc/struct_point.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test where we change the body of a private method in an impl. // We then test what sort of functions must be rebuilt as a result. diff --git a/src/test/incremental/change_private_impl_method/struct_point.rs b/src/test/incremental/change_private_impl_method/struct_point.rs index cf6eefd61d70a..e3073b170df49 100644 --- a/src/test/incremental/change_private_impl_method/struct_point.rs +++ b/src/test/incremental/change_private_impl_method/struct_point.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test where we change the body of a private method in an impl. // We then test what sort of functions must be rebuilt as a result. diff --git a/src/test/incremental/change_private_impl_method_cc/auxiliary/point.rs b/src/test/incremental/change_private_impl_method_cc/auxiliary/point.rs index f5e3a06051cc9..2441da06bc820 100644 --- a/src/test/incremental/change_private_impl_method_cc/auxiliary/point.rs +++ b/src/test/incremental/change_private_impl_method_cc/auxiliary/point.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Point { pub x: f32, pub y: f32, diff --git a/src/test/incremental/change_private_impl_method_cc/struct_point.rs b/src/test/incremental/change_private_impl_method_cc/struct_point.rs index f32ef9622f0d8..bd5e9636d48ba 100644 --- a/src/test/incremental/change_private_impl_method_cc/struct_point.rs +++ b/src/test/incremental/change_private_impl_method_cc/struct_point.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test where we change the body of a private method in an impl. // We then test what sort of functions must be rebuilt as a result. diff --git a/src/test/incremental/change_pub_inherent_method_body/struct_point.rs b/src/test/incremental/change_pub_inherent_method_body/struct_point.rs index a204fe27da6bb..8e87fde54efb5 100644 --- a/src/test/incremental/change_pub_inherent_method_body/struct_point.rs +++ b/src/test/incremental/change_pub_inherent_method_body/struct_point.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test where we change the body of a public, inherent method. // revisions:cfail1 cfail2 diff --git a/src/test/incremental/change_pub_inherent_method_sig/struct_point.rs b/src/test/incremental/change_pub_inherent_method_sig/struct_point.rs index 76c9dfce93d22..7ea64a08472c1 100644 --- a/src/test/incremental/change_pub_inherent_method_sig/struct_point.rs +++ b/src/test/incremental/change_pub_inherent_method_sig/struct_point.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test where we change the *signature* of a public, inherent method. // revisions:cfail1 cfail2 diff --git a/src/test/incremental/change_symbol_export_status.rs b/src/test/incremental/change_symbol_export_status.rs index feb8026f501a8..f3de46d99ddc0 100644 --- a/src/test/incremental/change_symbol_export_status.rs +++ b/src/test/incremental/change_symbol_export_status.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: rpass1 rpass2 // compile-flags: -Zquery-dep-graph diff --git a/src/test/incremental/commandline-args.rs b/src/test/incremental/commandline-args.rs index bb2f385e9c5f7..e5b84267b2903 100644 --- a/src/test/incremental/commandline-args.rs +++ b/src/test/incremental/commandline-args.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that changing a tracked commandline argument invalidates // the cache while changing an untracked one doesn't. diff --git a/src/test/incremental/crate_hash_reorder.rs b/src/test/incremental/crate_hash_reorder.rs index 3f1bdb7e3c674..5aba2a670370c 100644 --- a/src/test/incremental/crate_hash_reorder.rs +++ b/src/test/incremental/crate_hash_reorder.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the crate hash is not affected by reordering items. // revisions:rpass1 rpass2 rpass3 diff --git a/src/test/incremental/dirty_clean.rs b/src/test/incremental/dirty_clean.rs index 6d54cf53660a9..f4248dbdd6d23 100644 --- a/src/test/incremental/dirty_clean.rs +++ b/src/test/incremental/dirty_clean.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: rpass1 cfail2 // compile-flags: -Z query-dep-graph diff --git a/src/test/incremental/extern_static/issue-49153.rs b/src/test/incremental/extern_static/issue-49153.rs index e0538e09c6470..f1dbac288853e 100644 --- a/src/test/incremental/extern_static/issue-49153.rs +++ b/src/test/incremental/extern_static/issue-49153.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // https://github.com/rust-lang/rust/issues/49153 // revisions:rpass1 rpass2 diff --git a/src/test/incremental/feature_gate.rs b/src/test/incremental/feature_gate.rs index de2f9ab52f60b..d36044ec92bd6 100644 --- a/src/test/incremental/feature_gate.rs +++ b/src/test/incremental/feature_gate.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test makes sure that we detect changed feature gates. // revisions:rpass1 cfail2 diff --git a/src/test/incremental/foreign.rs b/src/test/incremental/foreign.rs index dbdebefaf310b..982c119096c63 100644 --- a/src/test/incremental/foreign.rs +++ b/src/test/incremental/foreign.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test what happens we save incremental compilation state that makes // use of foreign items. This used to ICE (#34991). diff --git a/src/test/incremental/hashes/call_expressions.rs b/src/test/incremental/hashes/call_expressions.rs index 3416669dbfa8d..52de065598965 100644 --- a/src/test/incremental/hashes/call_expressions.rs +++ b/src/test/incremental/hashes/call_expressions.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // This test case tests the incremental compilation hash (ICH) implementation // for function and method call expressions. diff --git a/src/test/incremental/hashes/closure_expressions.rs b/src/test/incremental/hashes/closure_expressions.rs index 839e0ca8e01ae..c7cb8304ae6f7 100644 --- a/src/test/incremental/hashes/closure_expressions.rs +++ b/src/test/incremental/hashes/closure_expressions.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // This test case tests the incremental compilation hash (ICH) implementation // for closure expression. diff --git a/src/test/incremental/hashes/consts.rs b/src/test/incremental/hashes/consts.rs index d523752c0914a..0ab0915d4d071 100644 --- a/src/test/incremental/hashes/consts.rs +++ b/src/test/incremental/hashes/consts.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // This test case tests the incremental compilation hash (ICH) implementation // for consts. diff --git a/src/test/incremental/hashes/enum_constructors.rs b/src/test/incremental/hashes/enum_constructors.rs index 9e8a0a9027ba8..e9b557bde20f7 100644 --- a/src/test/incremental/hashes/enum_constructors.rs +++ b/src/test/incremental/hashes/enum_constructors.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // This test case tests the incremental compilation hash (ICH) implementation // for struct constructor expressions. diff --git a/src/test/incremental/hashes/enum_defs.rs b/src/test/incremental/hashes/enum_defs.rs index 0181ac3a24b77..294476258ab95 100644 --- a/src/test/incremental/hashes/enum_defs.rs +++ b/src/test/incremental/hashes/enum_defs.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // This test case tests the incremental compilation hash (ICH) implementation // for enum definitions. diff --git a/src/test/incremental/hashes/exported_vs_not.rs b/src/test/incremental/hashes/exported_vs_not.rs index f04f24a2ec7a2..1880dd2fb0d7c 100644 --- a/src/test/incremental/hashes/exported_vs_not.rs +++ b/src/test/incremental/hashes/exported_vs_not.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass // revisions: cfail1 cfail2 cfail3 // compile-flags: -Z query-dep-graph -Zincremental-ignore-spans diff --git a/src/test/incremental/hashes/extern_mods.rs b/src/test/incremental/hashes/extern_mods.rs index 0e92c717643c4..e6423ebad128c 100644 --- a/src/test/incremental/hashes/extern_mods.rs +++ b/src/test/incremental/hashes/extern_mods.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // This test case tests the incremental compilation hash (ICH) implementation // for `extern` modules. diff --git a/src/test/incremental/hashes/for_loops.rs b/src/test/incremental/hashes/for_loops.rs index 15546a5bacf4a..90c1ecf10c707 100644 --- a/src/test/incremental/hashes/for_loops.rs +++ b/src/test/incremental/hashes/for_loops.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // This test case tests the incremental compilation hash (ICH) implementation // for `for` loops. diff --git a/src/test/incremental/hashes/function_interfaces.rs b/src/test/incremental/hashes/function_interfaces.rs index 03860ae2122a8..21263c8b6c614 100644 --- a/src/test/incremental/hashes/function_interfaces.rs +++ b/src/test/incremental/hashes/function_interfaces.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // This test case tests the incremental compilation hash (ICH) implementation // for function interfaces. diff --git a/src/test/incremental/hashes/if_expressions.rs b/src/test/incremental/hashes/if_expressions.rs index 6a1139f1e8ec1..18dba63072bad 100644 --- a/src/test/incremental/hashes/if_expressions.rs +++ b/src/test/incremental/hashes/if_expressions.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // This test case tests the incremental compilation hash (ICH) implementation // for if expressions. diff --git a/src/test/incremental/hashes/indexing_expressions.rs b/src/test/incremental/hashes/indexing_expressions.rs index fa2d707c8a19c..eb0c33f7766b4 100644 --- a/src/test/incremental/hashes/indexing_expressions.rs +++ b/src/test/incremental/hashes/indexing_expressions.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // This test case tests the incremental compilation hash (ICH) implementation // for indexing expression. diff --git a/src/test/incremental/hashes/inherent_impls.rs b/src/test/incremental/hashes/inherent_impls.rs index dd12fa2192f0b..92ce5a606bf90 100644 --- a/src/test/incremental/hashes/inherent_impls.rs +++ b/src/test/incremental/hashes/inherent_impls.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // This test case tests the incremental compilation hash (ICH) implementation // for let expressions. diff --git a/src/test/incremental/hashes/inline_asm.rs b/src/test/incremental/hashes/inline_asm.rs index cc427f358580e..e73aa89a8374d 100644 --- a/src/test/incremental/hashes/inline_asm.rs +++ b/src/test/incremental/hashes/inline_asm.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // This test case tests the incremental compilation hash (ICH) implementation // for inline asm. diff --git a/src/test/incremental/hashes/let_expressions.rs b/src/test/incremental/hashes/let_expressions.rs index 957cb336d9e69..40b4b3737ad27 100644 --- a/src/test/incremental/hashes/let_expressions.rs +++ b/src/test/incremental/hashes/let_expressions.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // This test case tests the incremental compilation hash (ICH) implementation // for let expressions. diff --git a/src/test/incremental/hashes/loop_expressions.rs b/src/test/incremental/hashes/loop_expressions.rs index bda8c5f16a06a..a218b01fc8512 100644 --- a/src/test/incremental/hashes/loop_expressions.rs +++ b/src/test/incremental/hashes/loop_expressions.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // This test case tests the incremental compilation hash (ICH) implementation // for `loop` loops. diff --git a/src/test/incremental/hashes/match_expressions.rs b/src/test/incremental/hashes/match_expressions.rs index f21b1f31eef6a..b6b934eb7d508 100644 --- a/src/test/incremental/hashes/match_expressions.rs +++ b/src/test/incremental/hashes/match_expressions.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // This test case tests the incremental compilation hash (ICH) implementation // for match expressions. diff --git a/src/test/incremental/hashes/panic_exprs.rs b/src/test/incremental/hashes/panic_exprs.rs index ffb66c29219d3..17d39d5432656 100644 --- a/src/test/incremental/hashes/panic_exprs.rs +++ b/src/test/incremental/hashes/panic_exprs.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test case tests the incremental compilation hash (ICH) implementation // for exprs that can panic at runtime (e.g. because of bounds checking). For // these expressions an error message containing their source location is diff --git a/src/test/incremental/hashes/statics.rs b/src/test/incremental/hashes/statics.rs index 95cec734f201c..c3db4369b7dd0 100644 --- a/src/test/incremental/hashes/statics.rs +++ b/src/test/incremental/hashes/statics.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // This test case tests the incremental compilation hash (ICH) implementation // for statics. diff --git a/src/test/incremental/hashes/struct_constructors.rs b/src/test/incremental/hashes/struct_constructors.rs index 09b661ba619f5..5444fe78f0a47 100644 --- a/src/test/incremental/hashes/struct_constructors.rs +++ b/src/test/incremental/hashes/struct_constructors.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // This test case tests the incremental compilation hash (ICH) implementation // for struct constructor expressions. diff --git a/src/test/incremental/hashes/struct_defs.rs b/src/test/incremental/hashes/struct_defs.rs index 10b1beb04133f..0c69dcdc70058 100644 --- a/src/test/incremental/hashes/struct_defs.rs +++ b/src/test/incremental/hashes/struct_defs.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // This test case tests the incremental compilation hash (ICH) implementation // for struct definitions. diff --git a/src/test/incremental/hashes/trait_defs.rs b/src/test/incremental/hashes/trait_defs.rs index b089d7d1eaee1..5f1c0ef37b0fb 100644 --- a/src/test/incremental/hashes/trait_defs.rs +++ b/src/test/incremental/hashes/trait_defs.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // This test case tests the incremental compilation hash (ICH) implementation // for trait definitions. diff --git a/src/test/incremental/hashes/trait_impls.rs b/src/test/incremental/hashes/trait_impls.rs index 346d14f9392ea..1487129d09ea6 100644 --- a/src/test/incremental/hashes/trait_impls.rs +++ b/src/test/incremental/hashes/trait_impls.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // This test case tests the incremental compilation hash (ICH) implementation // for let expressions. diff --git a/src/test/incremental/hashes/type_defs.rs b/src/test/incremental/hashes/type_defs.rs index 4dffaa424256a..4ffa0d9bb7ba7 100644 --- a/src/test/incremental/hashes/type_defs.rs +++ b/src/test/incremental/hashes/type_defs.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // This test case tests the incremental compilation hash (ICH) implementation // for `type` definitions. diff --git a/src/test/incremental/hashes/unary_and_binary_exprs.rs b/src/test/incremental/hashes/unary_and_binary_exprs.rs index be995a86b0ae6..26cc41fd8186c 100644 --- a/src/test/incremental/hashes/unary_and_binary_exprs.rs +++ b/src/test/incremental/hashes/unary_and_binary_exprs.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // This test case tests the incremental compilation hash (ICH) implementation // for unary and binary expressions. diff --git a/src/test/incremental/hashes/while_let_loops.rs b/src/test/incremental/hashes/while_let_loops.rs index a15e239a6b159..edfea05ae9835 100644 --- a/src/test/incremental/hashes/while_let_loops.rs +++ b/src/test/incremental/hashes/while_let_loops.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // This test case tests the incremental compilation hash (ICH) implementation // for `while let` loops. diff --git a/src/test/incremental/hashes/while_loops.rs b/src/test/incremental/hashes/while_loops.rs index 4311cef28d142..85c2c9fa25064 100644 --- a/src/test/incremental/hashes/while_loops.rs +++ b/src/test/incremental/hashes/while_loops.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // This test case tests the incremental compilation hash (ICH) implementation // for `while` loops. diff --git a/src/test/incremental/hello_world.rs b/src/test/incremental/hello_world.rs index 2d65e0aa657a6..e2e15eb958f98 100644 --- a/src/test/incremental/hello_world.rs +++ b/src/test/incremental/hello_world.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: rpass1 rpass2 // compile-flags: -Z query-dep-graph diff --git a/src/test/incremental/ich_method_call_trait_scope.rs b/src/test/incremental/ich_method_call_trait_scope.rs index 996c9ed21cf67..d4b170bd277c1 100644 --- a/src/test/incremental/ich_method_call_trait_scope.rs +++ b/src/test/incremental/ich_method_call_trait_scope.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that the hash for a method call is sensitive to the traits in // scope. diff --git a/src/test/incremental/ich_nested_items.rs b/src/test/incremental/ich_nested_items.rs index 47369e95dcead..3c2ce765c4805 100644 --- a/src/test/incremental/ich_nested_items.rs +++ b/src/test/incremental/ich_nested_items.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that the hash of `foo` doesn't change just because we ordered // the nested items (or even added new ones). diff --git a/src/test/incremental/ich_resolve_results.rs b/src/test/incremental/ich_resolve_results.rs index 9e5b51f3e7a01..0e4ab6b78e2d7 100644 --- a/src/test/incremental/ich_resolve_results.rs +++ b/src/test/incremental/ich_resolve_results.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that the hash for `mod3::bar` changes when we change the // `use` to something different. diff --git a/src/test/incremental/inlined_hir_34991/main.rs b/src/test/incremental/inlined_hir_34991/main.rs index baf4ae739325d..819b8434b0839 100644 --- a/src/test/incremental/inlined_hir_34991/main.rs +++ b/src/test/incremental/inlined_hir_34991/main.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #34991: an ICE occurred here because we inline // some of the vector routines and give them a local def-id `X`. This // got hashed after codegen (`Hir(X)`). When we load back up, we get an diff --git a/src/test/incremental/issue-35593.rs b/src/test/incremental/issue-35593.rs index 52a601ac1e87b..009e37d17c3b1 100644 --- a/src/test/incremental/issue-35593.rs +++ b/src/test/incremental/issue-35593.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #35593. Check that we can reuse this trivially // equal example. diff --git a/src/test/incremental/issue-38222.rs b/src/test/incremental/issue-38222.rs index a19de6ef63604..df08661c1500e 100644 --- a/src/test/incremental/issue-38222.rs +++ b/src/test/incremental/issue-38222.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that debuginfo does not introduce a dependency edge to the Krate // dep-node. diff --git a/src/test/incremental/issue-39569.rs b/src/test/incremental/issue-39569.rs index 5b53e94825300..06e3cf0a29328 100644 --- a/src/test/incremental/issue-39569.rs +++ b/src/test/incremental/issue-39569.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for a weird corner case in our dep-graph reduction // code. When we solve `CoerceUnsized`, we find no impls, so we // don't end up with an edge to any HIR nodes, but it still gets diff --git a/src/test/incremental/issue-39828/auxiliary/generic.rs b/src/test/incremental/issue-39828/auxiliary/generic.rs index 5491827af8a35..a5bb0d65f1b02 100644 --- a/src/test/incremental/issue-39828/auxiliary/generic.rs +++ b/src/test/incremental/issue-39828/auxiliary/generic.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions:rpass1 rpass2 // compile-flags: -Z query-dep-graph diff --git a/src/test/incremental/issue-39828/issue-39828.rs b/src/test/incremental/issue-39828/issue-39828.rs index c729380bd5a31..8cef916ff5423 100644 --- a/src/test/incremental/issue-39828/issue-39828.rs +++ b/src/test/incremental/issue-39828/issue-39828.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #39828. If you make use of a module that // consists only of generics, no code is generated, just a dummy // module. The reduced graph consists of a single node (for that diff --git a/src/test/incremental/issue-42602.rs b/src/test/incremental/issue-42602.rs index 921c7c25a0626..17e1b82187881 100644 --- a/src/test/incremental/issue-42602.rs +++ b/src/test/incremental/issue-42602.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #42602. It used to be that we had // a dep-graph like // diff --git a/src/test/incremental/issue-49043.rs b/src/test/incremental/issue-49043.rs index 118027b190e29..50d8fb8693077 100644 --- a/src/test/incremental/issue-49043.rs +++ b/src/test/incremental/issue-49043.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for hashing involving canonical variables. In this // test -- which has an intensional error -- the type of the value // being dropped winds up including a type variable. Canonicalization diff --git a/src/test/incremental/issue-49595/auxiliary/lit_a.rs b/src/test/incremental/issue-49595/auxiliary/lit_a.rs index f36baa0548392..295a0b48139e5 100644 --- a/src/test/incremental/issue-49595/auxiliary/lit_a.rs +++ b/src/test/incremental/issue-49595/auxiliary/lit_a.rs @@ -1,11 +1 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub const A: &str = "hello"; diff --git a/src/test/incremental/issue-49595/auxiliary/lit_b.rs b/src/test/incremental/issue-49595/auxiliary/lit_b.rs index 2252437e45937..5d377edfb02eb 100644 --- a/src/test/incremental/issue-49595/auxiliary/lit_b.rs +++ b/src/test/incremental/issue-49595/auxiliary/lit_b.rs @@ -1,11 +1 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub const A: &str = "xxxxx"; diff --git a/src/test/incremental/issue-49595/issue_49595.rs b/src/test/incremental/issue-49595/issue_49595.rs index 134f114e6acca..69b524b15cd41 100644 --- a/src/test/incremental/issue-49595/issue_49595.rs +++ b/src/test/incremental/issue-49595/issue_49595.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions:cfail1 cfail2 cfail3 // compile-flags: -Z query-dep-graph --test // compile-pass diff --git a/src/test/incremental/issue-51409.rs b/src/test/incremental/issue-51409.rs index d7aff5afe409e..44fe73b1dc51b 100644 --- a/src/test/incremental/issue-51409.rs +++ b/src/test/incremental/issue-51409.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: rpass1 // Regression test that `infer_outlives_predicates` can be diff --git a/src/test/incremental/krate-inherent.rs b/src/test/incremental/krate-inherent.rs index 925538879aa3c..e01ce317a2070 100644 --- a/src/test/incremental/krate-inherent.rs +++ b/src/test/incremental/krate-inherent.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: cfail1 cfail2 // compile-flags: -Z query-dep-graph // compile-pass diff --git a/src/test/incremental/krate-inlined.rs b/src/test/incremental/krate-inlined.rs index 83b75116c6086..dfb18166ae950 100644 --- a/src/test/incremental/krate-inlined.rs +++ b/src/test/incremental/krate-inlined.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regr. test that using HIR inlined from another krate does *not* add // a dependency from the local Krate node. We can't easily test that // directly anymore, so now we test that we get reuse. diff --git a/src/test/incremental/krate_reassign_34991/auxiliary/a.rs b/src/test/incremental/krate_reassign_34991/auxiliary/a.rs index 865156095a4d4..33fa789fcae45 100644 --- a/src/test/incremental/krate_reassign_34991/auxiliary/a.rs +++ b/src/test/incremental/krate_reassign_34991/auxiliary/a.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="rlib"] pub type X = u32; diff --git a/src/test/incremental/krate_reassign_34991/main.rs b/src/test/incremental/krate_reassign_34991/main.rs index 1c807059ddbe6..c4ae19ac942f2 100644 --- a/src/test/incremental/krate_reassign_34991/main.rs +++ b/src/test/incremental/krate_reassign_34991/main.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:a.rs // revisions:rpass1 rpass2 diff --git a/src/test/incremental/macro_export.rs b/src/test/incremental/macro_export.rs index 7c1a5c5c2e6be..d1966646867a9 100644 --- a/src/test/incremental/macro_export.rs +++ b/src/test/incremental/macro_export.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: cfail1 cfail2 cfail3 // compile-pass diff --git a/src/test/incremental/remapped_paths_cc/auxiliary/extern_crate.rs b/src/test/incremental/remapped_paths_cc/auxiliary/extern_crate.rs index c80b334623b43..52e7f4bd7c782 100644 --- a/src/test/incremental/remapped_paths_cc/auxiliary/extern_crate.rs +++ b/src/test/incremental/remapped_paths_cc/auxiliary/extern_crate.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength //[rpass1] compile-flags: -g diff --git a/src/test/incremental/remapped_paths_cc/main.rs b/src/test/incremental/remapped_paths_cc/main.rs index cd66310dafeff..12411a928799f 100644 --- a/src/test/incremental/remapped_paths_cc/main.rs +++ b/src/test/incremental/remapped_paths_cc/main.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions:rpass1 rpass2 rpass3 // compile-flags: -Z query-dep-graph -g // aux-build:extern_crate.rs diff --git a/src/test/incremental/remove-private-item-cross-crate/auxiliary/a.rs b/src/test/incremental/remove-private-item-cross-crate/auxiliary/a.rs index 4d84e844dedbb..279a6f078d116 100644 --- a/src/test/incremental/remove-private-item-cross-crate/auxiliary/a.rs +++ b/src/test/incremental/remove-private-item-cross-crate/auxiliary/a.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(warnings)] #![crate_name = "a"] #![crate_type = "rlib"] diff --git a/src/test/incremental/remove-private-item-cross-crate/main.rs b/src/test/incremental/remove-private-item-cross-crate/main.rs index d94cb403da8a5..f16c3c482cf8c 100644 --- a/src/test/incremental/remove-private-item-cross-crate/main.rs +++ b/src/test/incremental/remove-private-item-cross-crate/main.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are able to reuse `main` even though a private // item was removed from the root module of crate`a`. diff --git a/src/test/incremental/remove_crate/auxiliary/extern_crate.rs b/src/test/incremental/remove_crate/auxiliary/extern_crate.rs index 39543cd829d8a..1cafdf49d7471 100644 --- a/src/test/incremental/remove_crate/auxiliary/extern_crate.rs +++ b/src/test/incremental/remove_crate/auxiliary/extern_crate.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn foo(_: u8) { } diff --git a/src/test/incremental/remove_crate/main.rs b/src/test/incremental/remove_crate/main.rs index fafcb8bb0c83a..14b80df0d3894 100644 --- a/src/test/incremental/remove_crate/main.rs +++ b/src/test/incremental/remove_crate/main.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that removing an upstream crate does not cause any trouble. // revisions:rpass1 rpass2 diff --git a/src/test/incremental/remove_source_file/auxiliary/mod.rs b/src/test/incremental/remove_source_file/auxiliary/mod.rs index a2cea65a309ce..96a366d9633a4 100644 --- a/src/test/incremental/remove_source_file/auxiliary/mod.rs +++ b/src/test/incremental/remove_source_file/auxiliary/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn print_hello() { println!("hello"); } diff --git a/src/test/incremental/remove_source_file/main.rs b/src/test/incremental/remove_source_file/main.rs index 75fe6d9511cab..3af9c0518924a 100644 --- a/src/test/incremental/remove_source_file/main.rs +++ b/src/test/incremental/remove_source_file/main.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test case makes sure that the compiler doesn't crash due to a failing // table lookup when a source file is removed. diff --git a/src/test/incremental/rlib_cross_crate/auxiliary/a.rs b/src/test/incremental/rlib_cross_crate/auxiliary/a.rs index 1099aeb921763..5a26df9ae50ca 100644 --- a/src/test/incremental/rlib_cross_crate/auxiliary/a.rs +++ b/src/test/incremental/rlib_cross_crate/auxiliary/a.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic // compile-flags: -Z query-dep-graph diff --git a/src/test/incremental/rlib_cross_crate/b.rs b/src/test/incremental/rlib_cross_crate/b.rs index 9849e93d3ff9e..7c3dcf3a8157b 100644 --- a/src/test/incremental/rlib_cross_crate/b.rs +++ b/src/test/incremental/rlib_cross_crate/b.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Same test as `type_alias_cross_crate`, but with // `no-prefer-dynamic`, ensuring that we test what happens when we // build rlibs (before we were only testing dylibs, which meant we diff --git a/src/test/incremental/source_loc_macros.rs b/src/test/incremental/source_loc_macros.rs index 3f669ae3fc860..51ea7d6d447e5 100644 --- a/src/test/incremental/source_loc_macros.rs +++ b/src/test/incremental/source_loc_macros.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test makes sure that different expansions of the file!(), line!(), // column!() macros get picked up by the incr. comp. hash. diff --git a/src/test/incremental/span_hash_stable/auxiliary/mod.rs b/src/test/incremental/span_hash_stable/auxiliary/mod.rs index dfd2a6610f259..f3824db4c4212 100644 --- a/src/test/incremental/span_hash_stable/auxiliary/mod.rs +++ b/src/test/incremental/span_hash_stable/auxiliary/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[cfg(rpass1)] pub mod sub2; diff --git a/src/test/incremental/span_hash_stable/auxiliary/sub1.rs b/src/test/incremental/span_hash_stable/auxiliary/sub1.rs index 2d042c316833e..54fbe4465e3cf 100644 --- a/src/test/incremental/span_hash_stable/auxiliary/sub1.rs +++ b/src/test/incremental/span_hash_stable/auxiliary/sub1.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[rustc_clean(label="Hir", cfg="rpass2")] pub struct SomeType { pub x: u32, diff --git a/src/test/incremental/span_hash_stable/auxiliary/sub2.rs b/src/test/incremental/span_hash_stable/auxiliary/sub2.rs index df7d2f0267d02..349576168567f 100644 --- a/src/test/incremental/span_hash_stable/auxiliary/sub2.rs +++ b/src/test/incremental/span_hash_stable/auxiliary/sub2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[rustc_clean(label="Hir", cfg="rpass2")] pub struct SomeOtherType { pub a: i32, diff --git a/src/test/incremental/span_hash_stable/main.rs b/src/test/incremental/span_hash_stable/main.rs index 646a388c8776e..f19c99e1986e6 100644 --- a/src/test/incremental/span_hash_stable/main.rs +++ b/src/test/incremental/span_hash_stable/main.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test makes sure that it doesn't make a difference in which order we are // adding source files to the source_map. The order affects the BytePos values of // the spans and this test makes sure that we handle them correctly by hashing diff --git a/src/test/incremental/spans_in_type_debuginfo.rs b/src/test/incremental/spans_in_type_debuginfo.rs index e1369d92c5ccb..8ed469db6e633 100644 --- a/src/test/incremental/spans_in_type_debuginfo.rs +++ b/src/test/incremental/spans_in_type_debuginfo.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that moving a type definition within a source file does not affect // re-compilation. diff --git a/src/test/incremental/spans_significant_w_debuginfo.rs b/src/test/incremental/spans_significant_w_debuginfo.rs index cdab8de9828ab..87c97ba06c46a 100644 --- a/src/test/incremental/spans_significant_w_debuginfo.rs +++ b/src/test/incremental/spans_significant_w_debuginfo.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test makes sure that just changing a definition's location in the // source file also changes its incr. comp. hash, if debuginfo is enabled. diff --git a/src/test/incremental/spans_significant_w_panic.rs b/src/test/incremental/spans_significant_w_panic.rs index 1fefec7a0a799..ecda56f7e942e 100644 --- a/src/test/incremental/spans_significant_w_panic.rs +++ b/src/test/incremental/spans_significant_w_panic.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test makes sure that just changing a definition's location in the // source file also changes its incr. comp. hash, if debuginfo is enabled. diff --git a/src/test/incremental/spike-neg1.rs b/src/test/incremental/spike-neg1.rs index d4701b9a66eb4..97812ffe3be98 100644 --- a/src/test/incremental/spike-neg1.rs +++ b/src/test/incremental/spike-neg1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // A variant of the first "spike" test that serves to test the // `rustc_partition_reused` and `rustc_partition_codegened` tests. // Here we change and say that the `x` module will be reused (when in diff --git a/src/test/incremental/spike-neg2.rs b/src/test/incremental/spike-neg2.rs index da79237b1a649..3bb1914fd6a4c 100644 --- a/src/test/incremental/spike-neg2.rs +++ b/src/test/incremental/spike-neg2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // A variant of the first "spike" test that serves to test the // `rustc_partition_reused` and `rustc_partition_codegened` tests. // Here we change and say that the `y` module will be codegened (when diff --git a/src/test/incremental/spike.rs b/src/test/incremental/spike.rs index 1756511dd3706..a6a05e7c3db8d 100644 --- a/src/test/incremental/spike.rs +++ b/src/test/incremental/spike.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // A first "spike" for incremental compilation: here, we change the // content of the `make` function, and we find that we can reuse the // `y` module entirely (but not the `x` module). diff --git a/src/test/incremental/static_cycle/b.rs b/src/test/incremental/static_cycle/b.rs index b659703bef004..064213fbabbf7 100644 --- a/src/test/incremental/static_cycle/b.rs +++ b/src/test/incremental/static_cycle/b.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions:rpass1 rpass2 #![cfg_attr(rpass2, warn(dead_code))] diff --git a/src/test/incremental/static_refering_to_other_static/issue-49081.rs b/src/test/incremental/static_refering_to_other_static/issue-49081.rs index 6345b456523ed..8e3715d1d8341 100644 --- a/src/test/incremental/static_refering_to_other_static/issue-49081.rs +++ b/src/test/incremental/static_refering_to_other_static/issue-49081.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // https://github.com/rust-lang/rust/issues/49081 // revisions:rpass1 rpass2 diff --git a/src/test/incremental/static_refering_to_other_static2/issue.rs b/src/test/incremental/static_refering_to_other_static2/issue.rs index 5584786689518..720bb1e222b49 100644 --- a/src/test/incremental/static_refering_to_other_static2/issue.rs +++ b/src/test/incremental/static_refering_to_other_static2/issue.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions:rpass1 rpass2 #[cfg(rpass1)] diff --git a/src/test/incremental/static_refering_to_other_static3/issue.rs b/src/test/incremental/static_refering_to_other_static3/issue.rs index f19ae9e0e8d11..80999813dc5b8 100644 --- a/src/test/incremental/static_refering_to_other_static3/issue.rs +++ b/src/test/incremental/static_refering_to_other_static3/issue.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions:rpass1 rpass2 #[cfg(rpass1)] diff --git a/src/test/incremental/static_stable_hash/issue-49301.rs b/src/test/incremental/static_stable_hash/issue-49301.rs index 3e421b27c11bc..fdd05c72ca3cd 100644 --- a/src/test/incremental/static_stable_hash/issue-49301.rs +++ b/src/test/incremental/static_stable_hash/issue-49301.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // https://github.com/rust-lang/rust/issues/49081 // revisions:rpass1 rpass2 diff --git a/src/test/incremental/string_constant.rs b/src/test/incremental/string_constant.rs index 35c906525cbff..41c72335d6305 100644 --- a/src/test/incremental/string_constant.rs +++ b/src/test/incremental/string_constant.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: cfail1 cfail2 // compile-flags: -Z query-dep-graph // compile-pass diff --git a/src/test/incremental/struct_add_field.rs b/src/test/incremental/struct_add_field.rs index 42681eb2be45d..d019a3d2ab887 100644 --- a/src/test/incremental/struct_add_field.rs +++ b/src/test/incremental/struct_add_field.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test incremental compilation tracking where we change field names // in between revisions (hashing should be stable). diff --git a/src/test/incremental/struct_change_field_name.rs b/src/test/incremental/struct_change_field_name.rs index 63df407d5c02a..28011efed9cee 100644 --- a/src/test/incremental/struct_change_field_name.rs +++ b/src/test/incremental/struct_change_field_name.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test incremental compilation tracking where we change field names // in between revisions (hashing should be stable). diff --git a/src/test/incremental/struct_change_field_type.rs b/src/test/incremental/struct_change_field_type.rs index 67b3416397948..cb4a83c2f9a40 100644 --- a/src/test/incremental/struct_change_field_type.rs +++ b/src/test/incremental/struct_change_field_type.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test incremental compilation tracking where we change nothing // in between revisions (hashing should be stable). diff --git a/src/test/incremental/struct_change_field_type_cross_crate/auxiliary/a.rs b/src/test/incremental/struct_change_field_type_cross_crate/auxiliary/a.rs index 2ddcaf157210d..d3ddb32c33803 100644 --- a/src/test/incremental/struct_change_field_type_cross_crate/auxiliary/a.rs +++ b/src/test/incremental/struct_change_field_type_cross_crate/auxiliary/a.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="rlib"] #[cfg(rpass1)] diff --git a/src/test/incremental/struct_change_field_type_cross_crate/b.rs b/src/test/incremental/struct_change_field_type_cross_crate/b.rs index 9660f47da35c1..ecfd24cbaf418 100644 --- a/src/test/incremental/struct_change_field_type_cross_crate/b.rs +++ b/src/test/incremental/struct_change_field_type_cross_crate/b.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:a.rs // revisions:rpass1 rpass2 // compile-flags: -Z query-dep-graph diff --git a/src/test/incremental/struct_change_nothing.rs b/src/test/incremental/struct_change_nothing.rs index e2d4045874431..e62c004a83da0 100644 --- a/src/test/incremental/struct_change_nothing.rs +++ b/src/test/incremental/struct_change_nothing.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test incremental compilation tracking where we change nothing // in between revisions (hashing should be stable). diff --git a/src/test/incremental/struct_remove_field.rs b/src/test/incremental/struct_remove_field.rs index fba965ff5a005..572a2c640e6d2 100644 --- a/src/test/incremental/struct_remove_field.rs +++ b/src/test/incremental/struct_remove_field.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test incremental compilation tracking where we change field names // in between revisions (hashing should be stable). diff --git a/src/test/incremental/type_alias_cross_crate/auxiliary/a.rs b/src/test/incremental/type_alias_cross_crate/auxiliary/a.rs index 2ae434071f2c5..61fe297d73dd6 100644 --- a/src/test/incremental/type_alias_cross_crate/auxiliary/a.rs +++ b/src/test/incremental/type_alias_cross_crate/auxiliary/a.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z query-dep-graph #![crate_type="rlib"] diff --git a/src/test/incremental/type_alias_cross_crate/b.rs b/src/test/incremental/type_alias_cross_crate/b.rs index ee35a4d9b9c6e..9261a0fb290ea 100644 --- a/src/test/incremental/type_alias_cross_crate/b.rs +++ b/src/test/incremental/type_alias_cross_crate/b.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:a.rs // revisions:rpass1 rpass2 rpass3 // compile-flags: -Z query-dep-graph diff --git a/src/test/incremental/unchecked_dirty_clean.rs b/src/test/incremental/unchecked_dirty_clean.rs index a81e884f39eac..9ea9431e20aec 100644 --- a/src/test/incremental/unchecked_dirty_clean.rs +++ b/src/test/incremental/unchecked_dirty_clean.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: rpass1 cfail2 // compile-flags: -Z query-dep-graph diff --git a/src/test/incremental/warnings-reemitted.rs b/src/test/incremental/warnings-reemitted.rs index 1ea436d8ad192..f2acaa0121bb2 100644 --- a/src/test/incremental/warnings-reemitted.rs +++ b/src/test/incremental/warnings-reemitted.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: cfail1 cfail2 cfail3 // compile-flags: -Coverflow-checks=on // compile-pass diff --git a/src/test/mir-opt/basic_assignment.rs b/src/test/mir-opt/basic_assignment.rs index 54b7a3821caad..a9c529c668bf7 100644 --- a/src/test/mir-opt/basic_assignment.rs +++ b/src/test/mir-opt/basic_assignment.rs @@ -1,23 +1,6 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // this tests move up progration, which is not yet implemented -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // check that codegen of assignment expressions is sane. Assignments // tend to be absent in simple code, so subtle breakage in them can diff --git a/src/test/mir-opt/box_expr.rs b/src/test/mir-opt/box_expr.rs index 8390a0d19ae7b..ad5cf42029e9d 100644 --- a/src/test/mir-opt/box_expr.rs +++ b/src/test/mir-opt/box_expr.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare compiled with panic=abort by default #![feature(box_syntax)] diff --git a/src/test/mir-opt/combine_array_len.rs b/src/test/mir-opt/combine_array_len.rs index 440ad3518ae5a..9a046202cd004 100644 --- a/src/test/mir-opt/combine_array_len.rs +++ b/src/test/mir-opt/combine_array_len.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn norm2(x: [f32; 2]) -> f32 { let a = x[0]; let b = x[1]; diff --git a/src/test/mir-opt/copy_propagation.rs b/src/test/mir-opt/copy_propagation.rs index 067a937b0b30c..a86caf04b043b 100644 --- a/src/test/mir-opt/copy_propagation.rs +++ b/src/test/mir-opt/copy_propagation.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn test(x: u32) -> u32 { let y = x; y diff --git a/src/test/mir-opt/copy_propagation_arg.rs b/src/test/mir-opt/copy_propagation_arg.rs index dacaff8f2d942..4e05484a80c1e 100644 --- a/src/test/mir-opt/copy_propagation_arg.rs +++ b/src/test/mir-opt/copy_propagation_arg.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that CopyPropagation does not propagate an assignment to a function argument // (doing so can break usages of the original argument value) diff --git a/src/test/mir-opt/deaggregator_test.rs b/src/test/mir-opt/deaggregator_test.rs index c918bef129ad1..44c2319bc7eb1 100644 --- a/src/test/mir-opt/deaggregator_test.rs +++ b/src/test/mir-opt/deaggregator_test.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Baz { x: usize, y: f32, diff --git a/src/test/mir-opt/deaggregator_test_enum.rs b/src/test/mir-opt/deaggregator_test_enum.rs index 8af56b7c01173..fed1627159067 100644 --- a/src/test/mir-opt/deaggregator_test_enum.rs +++ b/src/test/mir-opt/deaggregator_test_enum.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Baz { Empty, Foo { x: usize }, diff --git a/src/test/mir-opt/deaggregator_test_enum_2.rs b/src/test/mir-opt/deaggregator_test_enum_2.rs index b6505de22f3b6..59c75739d81a4 100644 --- a/src/test/mir-opt/deaggregator_test_enum_2.rs +++ b/src/test/mir-opt/deaggregator_test_enum_2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that deaggregate fires in more than one basic block enum Foo { diff --git a/src/test/mir-opt/deaggregator_test_multiple.rs b/src/test/mir-opt/deaggregator_test_multiple.rs index 3a9a458fd464d..34c41af273fea 100644 --- a/src/test/mir-opt/deaggregator_test_multiple.rs +++ b/src/test/mir-opt/deaggregator_test_multiple.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that deaggregate fires more than once per block enum Foo { diff --git a/src/test/mir-opt/end_region_1.rs b/src/test/mir-opt/end_region_1.rs index 184459aa90eb8..c2c1e88f18afe 100644 --- a/src/test/mir-opt/end_region_1.rs +++ b/src/test/mir-opt/end_region_1.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z identify_regions -Z emit-end-regions // ignore-tidy-linelength diff --git a/src/test/mir-opt/end_region_2.rs b/src/test/mir-opt/end_region_2.rs index c40ab5253a075..2220222db3738 100644 --- a/src/test/mir-opt/end_region_2.rs +++ b/src/test/mir-opt/end_region_2.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z identify_regions -Z emit-end-regions // ignore-tidy-linelength diff --git a/src/test/mir-opt/end_region_3.rs b/src/test/mir-opt/end_region_3.rs index 086d80d15eacd..07cecdc3ae051 100644 --- a/src/test/mir-opt/end_region_3.rs +++ b/src/test/mir-opt/end_region_3.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z identify_regions -Z emit-end-regions // ignore-tidy-linelength diff --git a/src/test/mir-opt/end_region_4.rs b/src/test/mir-opt/end_region_4.rs index fc58e0824e8bd..a7c13b5ae6b9c 100644 --- a/src/test/mir-opt/end_region_4.rs +++ b/src/test/mir-opt/end_region_4.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z identify_regions -Z emit-end-regions // ignore-tidy-linelength diff --git a/src/test/mir-opt/end_region_5.rs b/src/test/mir-opt/end_region_5.rs index 9496fd9e6c173..e509719ee93c8 100644 --- a/src/test/mir-opt/end_region_5.rs +++ b/src/test/mir-opt/end_region_5.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z identify_regions -Z span_free_formats -Z emit-end-regions // Unwinding should EndRegion for in-scope borrows: Borrowing via by-ref closure. diff --git a/src/test/mir-opt/end_region_6.rs b/src/test/mir-opt/end_region_6.rs index 910362f65c8d9..02f04e197142a 100644 --- a/src/test/mir-opt/end_region_6.rs +++ b/src/test/mir-opt/end_region_6.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z identify_regions -Z span_free_formats -Z emit-end-regions // ignore-tidy-linelength diff --git a/src/test/mir-opt/end_region_7.rs b/src/test/mir-opt/end_region_7.rs index 59261ec968740..823b630edbde5 100644 --- a/src/test/mir-opt/end_region_7.rs +++ b/src/test/mir-opt/end_region_7.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z identify_regions -Z span_free_formats -Z emit-end-regions // ignore-tidy-linelength diff --git a/src/test/mir-opt/end_region_8.rs b/src/test/mir-opt/end_region_8.rs index a49913a62d9d0..9c072b25677cc 100644 --- a/src/test/mir-opt/end_region_8.rs +++ b/src/test/mir-opt/end_region_8.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z identify_regions -Z span_free_formats -Z emit-end-regions // ignore-tidy-linelength diff --git a/src/test/mir-opt/end_region_9.rs b/src/test/mir-opt/end_region_9.rs index 15c31e178759d..eba6856f32b8b 100644 --- a/src/test/mir-opt/end_region_9.rs +++ b/src/test/mir-opt/end_region_9.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z identify_regions -Z span_free_formats -Z emit-end-regions // ignore-tidy-linelength diff --git a/src/test/mir-opt/end_region_cyclic.rs b/src/test/mir-opt/end_region_cyclic.rs index 2d6962c5a5c1f..fa968c9b10c9e 100644 --- a/src/test/mir-opt/end_region_cyclic.rs +++ b/src/test/mir-opt/end_region_cyclic.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z identify_regions -Z span_free_formats -Z emit-end-regions // ignore-tidy-linelength diff --git a/src/test/mir-opt/end_region_destruction_extents_1.rs b/src/test/mir-opt/end_region_destruction_extents_1.rs index 8f8c406bcb3a4..9b0cda8f589ca 100644 --- a/src/test/mir-opt/end_region_destruction_extents_1.rs +++ b/src/test/mir-opt/end_region_destruction_extents_1.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z identify_regions -Z span_free_formats -Z emit-end-regions // ignore-tidy-linelength diff --git a/src/test/mir-opt/inline-closure-borrows-arg.rs b/src/test/mir-opt/inline-closure-borrows-arg.rs index 6ce51be3ec5db..9847c7e330a66 100644 --- a/src/test/mir-opt/inline-closure-borrows-arg.rs +++ b/src/test/mir-opt/inline-closure-borrows-arg.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z span_free_formats // Tests that MIR inliner can handle closure arguments, diff --git a/src/test/mir-opt/inline-closure.rs b/src/test/mir-opt/inline-closure.rs index 22e7de31e90cf..537d7e1a9d9b2 100644 --- a/src/test/mir-opt/inline-closure.rs +++ b/src/test/mir-opt/inline-closure.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z span_free_formats // Tests that MIR inliner can handle closure arguments. (#45894) diff --git a/src/test/mir-opt/issue-38669.rs b/src/test/mir-opt/issue-38669.rs index a9eea26f46643..ceb8b60dab14c 100644 --- a/src/test/mir-opt/issue-38669.rs +++ b/src/test/mir-opt/issue-38669.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // check that we don't StorageDead booleans before they are used fn main() { diff --git a/src/test/mir-opt/issue-41110.rs b/src/test/mir-opt/issue-41110.rs index e43b4052e07e8..31ad1ebd9ff62 100644 --- a/src/test/mir-opt/issue-41110.rs +++ b/src/test/mir-opt/issue-41110.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare compiled with panic=abort by default // check that we don't emit multiple drop flags when they are not needed. diff --git a/src/test/mir-opt/issue-41697.rs b/src/test/mir-opt/issue-41697.rs index 4d2ba5e2b120c..9db25b15f6835 100644 --- a/src/test/mir-opt/issue-41697.rs +++ b/src/test/mir-opt/issue-41697.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #41697. Using dump-mir was triggering // artificial cycles: during type-checking, we had to get the MIR for // the constant expressions in `[u8; 2]`, which in turn would trigger diff --git a/src/test/mir-opt/issue-41888.rs b/src/test/mir-opt/issue-41888.rs index ea4d7d3165d06..58f321d6df170 100644 --- a/src/test/mir-opt/issue-41888.rs +++ b/src/test/mir-opt/issue-41888.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // check that we clear the "ADT master drop flag" even when there are // no fields to be dropped. diff --git a/src/test/mir-opt/issue-43457.rs b/src/test/mir-opt/issue-43457.rs index 85cecc5070cd5..10ec53885f1dc 100644 --- a/src/test/mir-opt/issue-43457.rs +++ b/src/test/mir-opt/issue-43457.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z identify_regions -Z span_free_formats -Z emit-end-regions // ignore-tidy-linelength diff --git a/src/test/mir-opt/issue-49232.rs b/src/test/mir-opt/issue-49232.rs index 8e5a94abeed78..26b9630502a62 100644 --- a/src/test/mir-opt/issue-49232.rs +++ b/src/test/mir-opt/issue-49232.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // We must mark a variable whose initialization fails due to an // abort statement as StorageDead. diff --git a/src/test/mir-opt/loop_test.rs b/src/test/mir-opt/loop_test.rs index d36d890809497..84213a571f5fb 100644 --- a/src/test/mir-opt/loop_test.rs +++ b/src/test/mir-opt/loop_test.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z identify_regions -Z emit-end-regions // Tests to make sure we correctly generate falseUnwind edges in loops diff --git a/src/test/mir-opt/lower_128bit_debug_test.rs b/src/test/mir-opt/lower_128bit_debug_test.rs index 646c4312fc21f..a1132cd3f94e7 100644 --- a/src/test/mir-opt/lower_128bit_debug_test.rs +++ b/src/test/mir-opt/lower_128bit_debug_test.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // asmjs can't even pass i128 as arguments or return values, so ignore it. // this will hopefully be fixed by the LLVM 5 upgrade (#43370) // ignore-asmjs diff --git a/src/test/mir-opt/lower_128bit_test.rs b/src/test/mir-opt/lower_128bit_test.rs index b4b54e13a698e..3d7452a7ae82d 100644 --- a/src/test/mir-opt/lower_128bit_test.rs +++ b/src/test/mir-opt/lower_128bit_test.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten // compile-flags: -Z lower_128bit_ops=yes -C debug_assertions=no diff --git a/src/test/mir-opt/match_false_edges.rs b/src/test/mir-opt/match_false_edges.rs index 43e711ca902f8..2f0de3917a305 100644 --- a/src/test/mir-opt/match_false_edges.rs +++ b/src/test/mir-opt/match_false_edges.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z borrowck=mir fn guard() -> bool { diff --git a/src/test/mir-opt/nll/named-lifetimes-basic.rs b/src/test/mir-opt/nll/named-lifetimes-basic.rs index adc0249a40cfc..c4c1caeee5461 100644 --- a/src/test/mir-opt/nll/named-lifetimes-basic.rs +++ b/src/test/mir-opt/nll/named-lifetimes-basic.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Basic test for named lifetime translation. Check that we // instantiate the types that appear in function arguments with // suitable variables and that we setup the outlives relationship diff --git a/src/test/mir-opt/nll/reborrow-basic.rs b/src/test/mir-opt/nll/reborrow-basic.rs index 8a7ea8962fc5d..f0f332f5eec08 100644 --- a/src/test/mir-opt/nll/reborrow-basic.rs +++ b/src/test/mir-opt/nll/reborrow-basic.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Basic test for reborrow constraints: the region (`R5`) that appears // in the type of `r_a` must outlive the region (`R7`) that appears in // the type of `r_b` diff --git a/src/test/mir-opt/nll/region-subtyping-basic.rs b/src/test/mir-opt/nll/region-subtyping-basic.rs index e554024efef43..37bd14dd947e9 100644 --- a/src/test/mir-opt/nll/region-subtyping-basic.rs +++ b/src/test/mir-opt/nll/region-subtyping-basic.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Basic test for liveness constraints: the region (`R1`) that appears // in the type of `p` includes the points after `&v[0]` up to (but not // including) the call to `use_x`. The `else` branch is not included. diff --git a/src/test/mir-opt/packed-struct-drop-aligned.rs b/src/test/mir-opt/packed-struct-drop-aligned.rs index 9441c6f4085a2..1f1489c1c7df6 100644 --- a/src/test/mir-opt/packed-struct-drop-aligned.rs +++ b/src/test/mir-opt/packed-struct-drop-aligned.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare compiled with panic=abort by default fn main() { diff --git a/src/test/mir-opt/return_an_array.rs b/src/test/mir-opt/return_an_array.rs index bfae5b9438970..bea3c317c892f 100644 --- a/src/test/mir-opt/return_an_array.rs +++ b/src/test/mir-opt/return_an_array.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // this tests move up progration, which is not yet implemented fn foo() -> [u8; 1024] { diff --git a/src/test/mir-opt/simplify_if.rs b/src/test/mir-opt/simplify_if.rs index 52d5892e6560b..f6e6c6baf7a46 100644 --- a/src/test/mir-opt/simplify_if.rs +++ b/src/test/mir-opt/simplify_if.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { if false { println!("hello world!"); diff --git a/src/test/mir-opt/storage_live_dead_in_statics.rs b/src/test/mir-opt/storage_live_dead_in_statics.rs index 730ef655b13d0..80e1c1be1394f 100644 --- a/src/test/mir-opt/storage_live_dead_in_statics.rs +++ b/src/test/mir-opt/storage_live_dead_in_statics.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that when we compile the static `XXX` into MIR, we do not // generate `StorageStart` or `StorageEnd` statements. diff --git a/src/test/mir-opt/storage_ranges.rs b/src/test/mir-opt/storage_ranges.rs index 16e30f84d1756..7dbcec451e3b4 100644 --- a/src/test/mir-opt/storage_ranges.rs +++ b/src/test/mir-opt/storage_ranges.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength fn main() { diff --git a/src/test/mir-opt/uniform_array_move_out.rs b/src/test/mir-opt/uniform_array_move_out.rs index fa5f62f89f63c..fac5ef3b03ce1 100644 --- a/src/test/mir-opt/uniform_array_move_out.rs +++ b/src/test/mir-opt/uniform_array_move_out.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] #![feature(slice_patterns)] diff --git a/src/test/mir-opt/validate_1.rs b/src/test/mir-opt/validate_1.rs index 2d5c98ff0ed91..a4b0ec46033dd 100644 --- a/src/test/mir-opt/validate_1.rs +++ b/src/test/mir-opt/validate_1.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags: -Z verbose -Z mir-emit-validate=1 -Z span_free_formats diff --git a/src/test/mir-opt/validate_2.rs b/src/test/mir-opt/validate_2.rs index 3776a11b3ab82..7d08901dbb815 100644 --- a/src/test/mir-opt/validate_2.rs +++ b/src/test/mir-opt/validate_2.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // ignore-wasm32-bare unwinding being disabled causes differences in output // ignore-wasm64-bare unwinding being disabled causes differences in output diff --git a/src/test/mir-opt/validate_3.rs b/src/test/mir-opt/validate_3.rs index 72ec9ce400ffe..d429f4fc571b2 100644 --- a/src/test/mir-opt/validate_3.rs +++ b/src/test/mir-opt/validate_3.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags: -Z verbose -Z mir-emit-validate=1 diff --git a/src/test/mir-opt/validate_4.rs b/src/test/mir-opt/validate_4.rs index 24a4ebd8429df..3addaa4ba4bd5 100644 --- a/src/test/mir-opt/validate_4.rs +++ b/src/test/mir-opt/validate_4.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags: -Z verbose -Z mir-emit-validate=1 -Z span_free_formats diff --git a/src/test/mir-opt/validate_5.rs b/src/test/mir-opt/validate_5.rs index b4d4479bab94a..98e789d062039 100644 --- a/src/test/mir-opt/validate_5.rs +++ b/src/test/mir-opt/validate_5.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags: -Z verbose -Z mir-emit-validate=2 -Z span_free_formats diff --git a/src/test/parse-fail/ascii-only-character-escape.rs b/src/test/parse-fail/ascii-only-character-escape.rs index a8c40225c3021..a644f6239b368 100644 --- a/src/test/parse-fail/ascii-only-character-escape.rs +++ b/src/test/parse-fail/ascii-only-character-escape.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error fn main() { diff --git a/src/test/parse-fail/assoc-oddities-1.rs b/src/test/parse-fail/assoc-oddities-1.rs index 63408b76b153e..f659b31177ffc 100644 --- a/src/test/parse-fail/assoc-oddities-1.rs +++ b/src/test/parse-fail/assoc-oddities-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn that_odd_parse() { diff --git a/src/test/parse-fail/assoc-oddities-2.rs b/src/test/parse-fail/assoc-oddities-2.rs index 5679328edc998..fe4641b2004b1 100644 --- a/src/test/parse-fail/assoc-oddities-2.rs +++ b/src/test/parse-fail/assoc-oddities-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn that_odd_parse() { diff --git a/src/test/parse-fail/associated-types-project-from-hrtb-explicit.rs b/src/test/parse-fail/associated-types-project-from-hrtb-explicit.rs index 70055a101815f..aa225be245469 100644 --- a/src/test/parse-fail/associated-types-project-from-hrtb-explicit.rs +++ b/src/test/parse-fail/associated-types-project-from-hrtb-explicit.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error // Test you can't use a higher-ranked trait bound inside of a qualified diff --git a/src/test/parse-fail/attr-bad-meta-2.rs b/src/test/parse-fail/attr-bad-meta-2.rs index ce640a3f67cd2..cefd3369742be 100644 --- a/src/test/parse-fail/attr-bad-meta-2.rs +++ b/src/test/parse-fail/attr-bad-meta-2.rs @@ -1,12 +1,2 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[path =] //~ ERROR unexpected token: `]` mod m {} diff --git a/src/test/parse-fail/attr-bad-meta-3.rs b/src/test/parse-fail/attr-bad-meta-3.rs index 92e2a59d25d87..b51e9f2212dda 100644 --- a/src/test/parse-fail/attr-bad-meta-3.rs +++ b/src/test/parse-fail/attr-bad-meta-3.rs @@ -1,12 +1,2 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[path() token] //~ ERROR expected `]`, found `token` mod m {} diff --git a/src/test/parse-fail/attr-bad-meta.rs b/src/test/parse-fail/attr-bad-meta.rs index 6f9d794dc2dc3..7fe5427249141 100644 --- a/src/test/parse-fail/attr-bad-meta.rs +++ b/src/test/parse-fail/attr-bad-meta.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unrestricted_attribute_tokens)] #[path*] //~ ERROR expected one of `(`, `::`, `=`, `[`, `]`, or `{`, found `*` diff --git a/src/test/parse-fail/attr-before-eof.rs b/src/test/parse-fail/attr-before-eof.rs index c75b0ac122aeb..c090a77fc30a5 100644 --- a/src/test/parse-fail/attr-before-eof.rs +++ b/src/test/parse-fail/attr-before-eof.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only #[derive(Debug)] //~ERROR expected item after attributes diff --git a/src/test/parse-fail/attr-dangling-in-fn.rs b/src/test/parse-fail/attr-dangling-in-fn.rs index 7b731b6d6de60..79bf4c0695f9d 100644 --- a/src/test/parse-fail/attr-dangling-in-fn.rs +++ b/src/test/parse-fail/attr-dangling-in-fn.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // error-pattern:expected statement diff --git a/src/test/parse-fail/attr-dangling-in-mod.rs b/src/test/parse-fail/attr-dangling-in-mod.rs index 79609935f9ed8..ffc6bbc835b55 100644 --- a/src/test/parse-fail/attr-dangling-in-mod.rs +++ b/src/test/parse-fail/attr-dangling-in-mod.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // error-pattern:expected item diff --git a/src/test/parse-fail/attr.rs b/src/test/parse-fail/attr.rs index 1f0a95826fcd7..9f4ee80285a53 100644 --- a/src/test/parse-fail/attr.rs +++ b/src/test/parse-fail/attr.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only #![feature(lang_items)] diff --git a/src/test/parse-fail/attrs-after-extern-mod.rs b/src/test/parse-fail/attrs-after-extern-mod.rs index 442eb14116e4c..2078320f12874 100644 --- a/src/test/parse-fail/attrs-after-extern-mod.rs +++ b/src/test/parse-fail/attrs-after-extern-mod.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // Constants (static variables) can be used to match in patterns, but mutable diff --git a/src/test/parse-fail/bad-char-literals.rs b/src/test/parse-fail/bad-char-literals.rs index 821015ece7712..085f61645fb92 100644 --- a/src/test/parse-fail/bad-char-literals.rs +++ b/src/test/parse-fail/bad-char-literals.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error // ignore-tidy-cr diff --git a/src/test/parse-fail/bad-lit-suffixes.rs b/src/test/parse-fail/bad-lit-suffixes.rs index 0811a6470247e..989d63e2e949d 100644 --- a/src/test/parse-fail/bad-lit-suffixes.rs +++ b/src/test/parse-fail/bad-lit-suffixes.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error diff --git a/src/test/parse-fail/bad-match.rs b/src/test/parse-fail/bad-match.rs index b42c04f3ce281..32c4beec0e428 100644 --- a/src/test/parse-fail/bad-match.rs +++ b/src/test/parse-fail/bad-match.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // error-pattern: expected diff --git a/src/test/parse-fail/bad-name.rs b/src/test/parse-fail/bad-name.rs index 201e6ced2f9e8..3f3e7533ae25d 100644 --- a/src/test/parse-fail/bad-name.rs +++ b/src/test/parse-fail/bad-name.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // error-pattern: expected diff --git a/src/test/parse-fail/bad-pointer-type.rs b/src/test/parse-fail/bad-pointer-type.rs index cdb4d16fed22c..7f446542ee016 100644 --- a/src/test/parse-fail/bad-pointer-type.rs +++ b/src/test/parse-fail/bad-pointer-type.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn foo(_: *()) { diff --git a/src/test/parse-fail/bad-value-ident-false.rs b/src/test/parse-fail/bad-value-ident-false.rs index 96325a2abb424..3379ab8bf1560 100644 --- a/src/test/parse-fail/bad-value-ident-false.rs +++ b/src/test/parse-fail/bad-value-ident-false.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn false() { } //~ ERROR expected identifier, found keyword `false` diff --git a/src/test/parse-fail/bad-value-ident-true.rs b/src/test/parse-fail/bad-value-ident-true.rs index 7ff16b8037339..40815abc12f89 100644 --- a/src/test/parse-fail/bad-value-ident-true.rs +++ b/src/test/parse-fail/bad-value-ident-true.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn true() { } //~ ERROR expected identifier, found keyword `true` diff --git a/src/test/parse-fail/better-expected.rs b/src/test/parse-fail/better-expected.rs index b60201c251dcc..0a6dca75888b2 100644 --- a/src/test/parse-fail/better-expected.rs +++ b/src/test/parse-fail/better-expected.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/parse-fail/bind-struct-early-modifiers.rs b/src/test/parse-fail/bind-struct-early-modifiers.rs index e9e76af11a530..945823fdddc7e 100644 --- a/src/test/parse-fail/bind-struct-early-modifiers.rs +++ b/src/test/parse-fail/bind-struct-early-modifiers.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/parse-fail/bound-single-question-mark.rs b/src/test/parse-fail/bound-single-question-mark.rs index 9dde5268c0878..0352dc0f6fe08 100644 --- a/src/test/parse-fail/bound-single-question-mark.rs +++ b/src/test/parse-fail/bound-single-question-mark.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn f() {} //~ ERROR expected identifier, found `>` diff --git a/src/test/parse-fail/bounds-lifetime-1.rs b/src/test/parse-fail/bounds-lifetime-1.rs index 824d243d5f846..1e64756a6de70 100644 --- a/src/test/parse-fail/bounds-lifetime-1.rs +++ b/src/test/parse-fail/bounds-lifetime-1.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only type A = for<'a 'b> fn(); //~ ERROR expected one of `,`, `:`, or `>`, found `'b` diff --git a/src/test/parse-fail/bounds-lifetime-2.rs b/src/test/parse-fail/bounds-lifetime-2.rs index 3c67dda70f562..6d865ffeb2427 100644 --- a/src/test/parse-fail/bounds-lifetime-2.rs +++ b/src/test/parse-fail/bounds-lifetime-2.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only type A = for<'a + 'b> fn(); //~ ERROR expected one of `,`, `:`, or `>`, found `+` diff --git a/src/test/parse-fail/bounds-lifetime-where-1.rs b/src/test/parse-fail/bounds-lifetime-where-1.rs index aae9d72998750..d0c7c9df26c5b 100644 --- a/src/test/parse-fail/bounds-lifetime-where-1.rs +++ b/src/test/parse-fail/bounds-lifetime-where-1.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only type A where 'a; //~ ERROR expected `:`, found `;` diff --git a/src/test/parse-fail/bounds-lifetime-where.rs b/src/test/parse-fail/bounds-lifetime-where.rs index 0a30818bc96ae..532bf53d61fc5 100644 --- a/src/test/parse-fail/bounds-lifetime-where.rs +++ b/src/test/parse-fail/bounds-lifetime-where.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only type A where 'a: 'b + 'c = u8; // OK diff --git a/src/test/parse-fail/bounds-lifetime.rs b/src/test/parse-fail/bounds-lifetime.rs index 88db205310ce1..52b4556084fef 100644 --- a/src/test/parse-fail/bounds-lifetime.rs +++ b/src/test/parse-fail/bounds-lifetime.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only type A = for<'a:> fn(); // OK diff --git a/src/test/parse-fail/bounds-type-where.rs b/src/test/parse-fail/bounds-type-where.rs index 9dc5d8277446d..fa10de3015533 100644 --- a/src/test/parse-fail/bounds-type-where.rs +++ b/src/test/parse-fail/bounds-type-where.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only type A where for<'a> for<'b> Trait1 + ?Trait2: 'a + Trait = u8; // OK diff --git a/src/test/parse-fail/bounds-type.rs b/src/test/parse-fail/bounds-type.rs index 0ebe7fde0a63f..360e7939c9556 100644 --- a/src/test/parse-fail/bounds-type.rs +++ b/src/test/parse-fail/bounds-type.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error struct S< diff --git a/src/test/parse-fail/brace-after-qualified-path-in-match.rs b/src/test/parse-fail/brace-after-qualified-path-in-match.rs index ff434d87e1fb2..1e7d519722834 100644 --- a/src/test/parse-fail/brace-after-qualified-path-in-match.rs +++ b/src/test/parse-fail/brace-after-qualified-path-in-match.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn foo() { diff --git a/src/test/parse-fail/byte-literals.rs b/src/test/parse-fail/byte-literals.rs index 3ecd7780afd84..59dc5ef413930 100644 --- a/src/test/parse-fail/byte-literals.rs +++ b/src/test/parse-fail/byte-literals.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error diff --git a/src/test/parse-fail/byte-string-literals.rs b/src/test/parse-fail/byte-string-literals.rs index 4eba9e91ca5f4..82ab311bb5932 100644 --- a/src/test/parse-fail/byte-string-literals.rs +++ b/src/test/parse-fail/byte-string-literals.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error diff --git a/src/test/parse-fail/circular_modules_hello.rs b/src/test/parse-fail/circular_modules_hello.rs index 94770aa875b42..06757fb4f9e94 100644 --- a/src/test/parse-fail/circular_modules_hello.rs +++ b/src/test/parse-fail/circular_modules_hello.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // ignore-test: this is an auxiliary file for circular-modules-main.rs diff --git a/src/test/parse-fail/circular_modules_main.rs b/src/test/parse-fail/circular_modules_main.rs index 861d4cd12ab5c..bd5c438d9bed6 100644 --- a/src/test/parse-fail/circular_modules_main.rs +++ b/src/test/parse-fail/circular_modules_main.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only #[path = "circular_modules_hello.rs"] diff --git a/src/test/parse-fail/class-implements-bad-trait.rs b/src/test/parse-fail/class-implements-bad-trait.rs index ea263d938d40c..10ee1a9afd858 100644 --- a/src/test/parse-fail/class-implements-bad-trait.rs +++ b/src/test/parse-fail/class-implements-bad-trait.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // error-pattern:nonexistent diff --git a/src/test/parse-fail/closure-return-syntax.rs b/src/test/parse-fail/closure-return-syntax.rs index 4c77edec56f13..54eb791d2bce4 100644 --- a/src/test/parse-fail/closure-return-syntax.rs +++ b/src/test/parse-fail/closure-return-syntax.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we cannot parse a closure with an explicit return type // unless it uses braces. diff --git a/src/test/parse-fail/column-offset-1-based.rs b/src/test/parse-fail/column-offset-1-based.rs index 8caf2e0c0a477..11602d7cb3e21 100644 --- a/src/test/parse-fail/column-offset-1-based.rs +++ b/src/test/parse-fail/column-offset-1-based.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only # //~ ERROR 13:1: 13:2: expected `[`, found `` diff --git a/src/test/parse-fail/default.rs b/src/test/parse-fail/default.rs index 6c3bc45d34aa4..fc092ebbc987d 100644 --- a/src/test/parse-fail/default.rs +++ b/src/test/parse-fail/default.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // Test successful and unsuccessful parsing of the `default` contextual keyword diff --git a/src/test/parse-fail/do-catch-suggests-try.rs b/src/test/parse-fail/do-catch-suggests-try.rs index 449135e69c319..7ab78dc49d74d 100644 --- a/src/test/parse-fail/do-catch-suggests-try.rs +++ b/src/test/parse-fail/do-catch-suggests-try.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/parse-fail/doc-after-struct-field.rs b/src/test/parse-fail/doc-after-struct-field.rs index a2c60151ac72d..7870555aebb23 100644 --- a/src/test/parse-fail/doc-after-struct-field.rs +++ b/src/test/parse-fail/doc-after-struct-field.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z continue-parse-after-error struct X { diff --git a/src/test/parse-fail/doc-before-attr.rs b/src/test/parse-fail/doc-before-attr.rs index 4548cebd0a886..73c644682c70e 100644 --- a/src/test/parse-fail/doc-before-attr.rs +++ b/src/test/parse-fail/doc-before-attr.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only /// hi diff --git a/src/test/parse-fail/doc-before-eof.rs b/src/test/parse-fail/doc-before-eof.rs index 728972eca6206..4cf74001436e9 100644 --- a/src/test/parse-fail/doc-before-eof.rs +++ b/src/test/parse-fail/doc-before-eof.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only /// hi //~ERROR expected item after doc comment diff --git a/src/test/parse-fail/doc-before-extern-rbrace.rs b/src/test/parse-fail/doc-before-extern-rbrace.rs index 70da47ba9b4f0..ec89316232397 100644 --- a/src/test/parse-fail/doc-before-extern-rbrace.rs +++ b/src/test/parse-fail/doc-before-extern-rbrace.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only extern { diff --git a/src/test/parse-fail/doc-before-fn-rbrace.rs b/src/test/parse-fail/doc-before-fn-rbrace.rs index bcf32612c8f4c..049e3b4647237 100644 --- a/src/test/parse-fail/doc-before-fn-rbrace.rs +++ b/src/test/parse-fail/doc-before-fn-rbrace.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z continue-parse-after-error fn main() { /// document diff --git a/src/test/parse-fail/doc-before-identifier.rs b/src/test/parse-fail/doc-before-identifier.rs index 8f1fad91b1f99..c8ec192b1173e 100644 --- a/src/test/parse-fail/doc-before-identifier.rs +++ b/src/test/parse-fail/doc-before-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z continue-parse-after-error fn /// document foo() {} diff --git a/src/test/parse-fail/doc-before-mod-rbrace.rs b/src/test/parse-fail/doc-before-mod-rbrace.rs index d38d1876384a8..8cc0729cc908f 100644 --- a/src/test/parse-fail/doc-before-mod-rbrace.rs +++ b/src/test/parse-fail/doc-before-mod-rbrace.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z continue-parse-after-error mod Foo { /// document diff --git a/src/test/parse-fail/doc-before-rbrace.rs b/src/test/parse-fail/doc-before-rbrace.rs index 48ea2b5aea12c..d24f711397b6e 100644 --- a/src/test/parse-fail/doc-before-rbrace.rs +++ b/src/test/parse-fail/doc-before-rbrace.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/parse-fail/doc-before-semi.rs b/src/test/parse-fail/doc-before-semi.rs index 71104b8caae19..2d5d549d4c329 100644 --- a/src/test/parse-fail/doc-before-semi.rs +++ b/src/test/parse-fail/doc-before-semi.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/parse-fail/doc-before-struct-rbrace-1.rs b/src/test/parse-fail/doc-before-struct-rbrace-1.rs index 6d9b4b05ad9fa..cdb91306ec0dd 100644 --- a/src/test/parse-fail/doc-before-struct-rbrace-1.rs +++ b/src/test/parse-fail/doc-before-struct-rbrace-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z continue-parse-after-error struct X { a: u8, diff --git a/src/test/parse-fail/doc-before-struct-rbrace-2.rs b/src/test/parse-fail/doc-before-struct-rbrace-2.rs index 63b2f96379916..5a6901091e53a 100644 --- a/src/test/parse-fail/doc-before-struct-rbrace-2.rs +++ b/src/test/parse-fail/doc-before-struct-rbrace-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z continue-parse-after-error struct X { a: u8 /// document diff --git a/src/test/parse-fail/duplicate-visibility.rs b/src/test/parse-fail/duplicate-visibility.rs index 6899caa7153bb..4b7bad4b364bc 100644 --- a/src/test/parse-fail/duplicate-visibility.rs +++ b/src/test/parse-fail/duplicate-visibility.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // error-pattern:expected one of `(`, `fn`, `static`, `type`, or `}` here diff --git a/src/test/parse-fail/empty-impl-semicolon.rs b/src/test/parse-fail/empty-impl-semicolon.rs index 9939f1e36ea9d..57fad0e93125f 100644 --- a/src/test/parse-fail/empty-impl-semicolon.rs +++ b/src/test/parse-fail/empty-impl-semicolon.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only impl Foo; //~ ERROR expected one of `!`, `(`, `+`, `::`, `<`, `for`, `where`, or `{`, found `;` diff --git a/src/test/parse-fail/extern-crate-unexpected-token.rs b/src/test/parse-fail/extern-crate-unexpected-token.rs index 2518686575eb1..58b2fa1afdf31 100644 --- a/src/test/parse-fail/extern-crate-unexpected-token.rs +++ b/src/test/parse-fail/extern-crate-unexpected-token.rs @@ -1,11 +1 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crte foo; //~ ERROR expected one of `crate`, `fn`, or `{`, found `crte` diff --git a/src/test/parse-fail/extern-expected-fn-or-brace.rs b/src/test/parse-fail/extern-expected-fn-or-brace.rs index 21cca129658c5..137133299d87a 100644 --- a/src/test/parse-fail/extern-expected-fn-or-brace.rs +++ b/src/test/parse-fail/extern-expected-fn-or-brace.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // Verifies that the expected token errors for `extern crate` are diff --git a/src/test/parse-fail/extern-foreign-crate.rs b/src/test/parse-fail/extern-foreign-crate.rs index 9adbd87140986..d770b6687c9fd 100644 --- a/src/test/parse-fail/extern-foreign-crate.rs +++ b/src/test/parse-fail/extern-foreign-crate.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // Verifies that the expected token errors for `extern crate` are diff --git a/src/test/parse-fail/extern-no-fn.rs b/src/test/parse-fail/extern-no-fn.rs index aa0dbd4d4fc1b..2836ec7d160c9 100644 --- a/src/test/parse-fail/extern-no-fn.rs +++ b/src/test/parse-fail/extern-no-fn.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only extern { //~ ERROR missing `fn`, `type`, or `static` for extern-item declaration diff --git a/src/test/parse-fail/impl-qpath.rs b/src/test/parse-fail/impl-qpath.rs index 48dd888b2e530..7036d63cc423f 100644 --- a/src/test/parse-fail/impl-qpath.rs +++ b/src/test/parse-fail/impl-qpath.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only impl <*const u8>::AssocTy {} // OK diff --git a/src/test/parse-fail/import-from-path.rs b/src/test/parse-fail/import-from-path.rs index fbd59d200a0cd..e3fee987ab701 100644 --- a/src/test/parse-fail/import-from-path.rs +++ b/src/test/parse-fail/import-from-path.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // error-pattern:expected diff --git a/src/test/parse-fail/import-from-rename.rs b/src/test/parse-fail/import-from-rename.rs index c4d8ba2086d21..498bbd6b0ffdf 100644 --- a/src/test/parse-fail/import-from-rename.rs +++ b/src/test/parse-fail/import-from-rename.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // error-pattern:expected diff --git a/src/test/parse-fail/import-glob-path.rs b/src/test/parse-fail/import-glob-path.rs index 2faf833d4f127..5a3a581fca4f4 100644 --- a/src/test/parse-fail/import-glob-path.rs +++ b/src/test/parse-fail/import-glob-path.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // error-pattern:expected diff --git a/src/test/parse-fail/import-glob-rename.rs b/src/test/parse-fail/import-glob-rename.rs index 7e17e1f1d6c06..f96f48d5fd695 100644 --- a/src/test/parse-fail/import-glob-rename.rs +++ b/src/test/parse-fail/import-glob-rename.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // error-pattern:expected diff --git a/src/test/parse-fail/inner-attr-after-doc-comment.rs b/src/test/parse-fail/inner-attr-after-doc-comment.rs index ed8342d9f5aaf..1c72ed091af73 100644 --- a/src/test/parse-fail/inner-attr-after-doc-comment.rs +++ b/src/test/parse-fail/inner-attr-after-doc-comment.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only #![feature(lang_items)] diff --git a/src/test/parse-fail/inner-attr.rs b/src/test/parse-fail/inner-attr.rs index 8cebda6644565..07bcf0780f6e8 100644 --- a/src/test/parse-fail/inner-attr.rs +++ b/src/test/parse-fail/inner-attr.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only #[feature(lang_items)] diff --git a/src/test/parse-fail/int-literal-too-large-span.rs b/src/test/parse-fail/int-literal-too-large-span.rs index 1af8df7d2f644..0de71396640da 100644 --- a/src/test/parse-fail/int-literal-too-large-span.rs +++ b/src/test/parse-fail/int-literal-too-large-span.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // issue #17123 diff --git a/src/test/parse-fail/issue-10392-2.rs b/src/test/parse-fail/issue-10392-2.rs index 2817912666e55..63d3f4c5b1b65 100644 --- a/src/test/parse-fail/issue-10392-2.rs +++ b/src/test/parse-fail/issue-10392-2.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only struct A { foo: isize } diff --git a/src/test/parse-fail/issue-10392.rs b/src/test/parse-fail/issue-10392.rs index 9c67575bcc145..41f6e34267630 100644 --- a/src/test/parse-fail/issue-10392.rs +++ b/src/test/parse-fail/issue-10392.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only struct A { foo: isize } diff --git a/src/test/parse-fail/issue-14303-enum.rs b/src/test/parse-fail/issue-14303-enum.rs index 6bcf588b5161b..c111959f50bbe 100644 --- a/src/test/parse-fail/issue-14303-enum.rs +++ b/src/test/parse-fail/issue-14303-enum.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only enum X<'a, T, 'b> { diff --git a/src/test/parse-fail/issue-14303-fn-def.rs b/src/test/parse-fail/issue-14303-fn-def.rs index ae8e38c03773f..1ad15f9064da2 100644 --- a/src/test/parse-fail/issue-14303-fn-def.rs +++ b/src/test/parse-fail/issue-14303-fn-def.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn foo<'a, T, 'b>(x: &'a T) {} diff --git a/src/test/parse-fail/issue-14303-fncall.rs b/src/test/parse-fail/issue-14303-fncall.rs index 80a9b3d7c0d5b..3642b80a01b2d 100644 --- a/src/test/parse-fail/issue-14303-fncall.rs +++ b/src/test/parse-fail/issue-14303-fncall.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/parse-fail/issue-14303-impl.rs b/src/test/parse-fail/issue-14303-impl.rs index f06d5f29e9e07..64301530fb354 100644 --- a/src/test/parse-fail/issue-14303-impl.rs +++ b/src/test/parse-fail/issue-14303-impl.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only struct X { x: isize } diff --git a/src/test/parse-fail/issue-14303-path.rs b/src/test/parse-fail/issue-14303-path.rs index f0d1feffec80b..0f0641e55dfea 100644 --- a/src/test/parse-fail/issue-14303-path.rs +++ b/src/test/parse-fail/issue-14303-path.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn bar<'a, T>(x: mymodule::X<'a, T, 'b, 'c>) {} diff --git a/src/test/parse-fail/issue-14303-struct.rs b/src/test/parse-fail/issue-14303-struct.rs index 5673e4f2a4c7d..d9d585990882b 100644 --- a/src/test/parse-fail/issue-14303-struct.rs +++ b/src/test/parse-fail/issue-14303-struct.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only struct X<'a, T, 'b> { diff --git a/src/test/parse-fail/issue-14303-trait.rs b/src/test/parse-fail/issue-14303-trait.rs index 8af5af9e93302..fb4c01ac71cf3 100644 --- a/src/test/parse-fail/issue-14303-trait.rs +++ b/src/test/parse-fail/issue-14303-trait.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only trait Foo<'a, T, 'b> {} diff --git a/src/test/parse-fail/issue-15914.rs b/src/test/parse-fail/issue-15914.rs index 0b8f0ac221ab2..c82e2b6eb0bbc 100644 --- a/src/test/parse-fail/issue-15914.rs +++ b/src/test/parse-fail/issue-15914.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/parse-fail/issue-1655.rs b/src/test/parse-fail/issue-1655.rs index a044dff261db3..2be809bf2566b 100644 --- a/src/test/parse-fail/issue-1655.rs +++ b/src/test/parse-fail/issue-1655.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // error-pattern:expected `[`, found `vec` diff --git a/src/test/parse-fail/issue-17383.rs b/src/test/parse-fail/issue-17383.rs index 48f629fd82873..bbe3a9b8dac04 100644 --- a/src/test/parse-fail/issue-17383.rs +++ b/src/test/parse-fail/issue-17383.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only enum X { diff --git a/src/test/parse-fail/issue-17718-const-mut.rs b/src/test/parse-fail/issue-17718-const-mut.rs index b450cb25e6ba8..f9b8d3104d9d5 100644 --- a/src/test/parse-fail/issue-17718-const-mut.rs +++ b/src/test/parse-fail/issue-17718-const-mut.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only const diff --git a/src/test/parse-fail/issue-17904-2.rs b/src/test/parse-fail/issue-17904-2.rs index 3f41c0edd2e6f..81510a2bdf7f1 100644 --- a/src/test/parse-fail/issue-17904-2.rs +++ b/src/test/parse-fail/issue-17904-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error struct Bar { x: T } where T: Copy //~ ERROR expected item, found `where` diff --git a/src/test/parse-fail/issue-17904.rs b/src/test/parse-fail/issue-17904.rs index a54d89f48c300..2fe897e46cc5b 100644 --- a/src/test/parse-fail/issue-17904.rs +++ b/src/test/parse-fail/issue-17904.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error struct Baz where U: Eq(U); //This is parsed as the new Fn* style parenthesis syntax. diff --git a/src/test/parse-fail/issue-1802-1.rs b/src/test/parse-fail/issue-1802-1.rs index fc3d071729fbc..207298c363cfc 100644 --- a/src/test/parse-fail/issue-1802-1.rs +++ b/src/test/parse-fail/issue-1802-1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // error-pattern:no valid digits found for number diff --git a/src/test/parse-fail/issue-1802-2.rs b/src/test/parse-fail/issue-1802-2.rs index 05c5a4bcb0240..28094ed4bea6f 100644 --- a/src/test/parse-fail/issue-1802-2.rs +++ b/src/test/parse-fail/issue-1802-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // error-pattern:no valid digits found for number diff --git a/src/test/parse-fail/issue-19096.rs b/src/test/parse-fail/issue-19096.rs index 6ba0fb5f15bb1..8b682732f6474 100644 --- a/src/test/parse-fail/issue-19096.rs +++ b/src/test/parse-fail/issue-19096.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/parse-fail/issue-19398.rs b/src/test/parse-fail/issue-19398.rs index a91d513b83df5..d31d31c8e124a 100644 --- a/src/test/parse-fail/issue-19398.rs +++ b/src/test/parse-fail/issue-19398.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only trait T { diff --git a/src/test/parse-fail/issue-20711-2.rs b/src/test/parse-fail/issue-20711-2.rs index d0836d4af9737..e9f26cb39169c 100644 --- a/src/test/parse-fail/issue-20711-2.rs +++ b/src/test/parse-fail/issue-20711-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // ignore-tidy-linelength diff --git a/src/test/parse-fail/issue-20711.rs b/src/test/parse-fail/issue-20711.rs index d944224798852..545984706a214 100644 --- a/src/test/parse-fail/issue-20711.rs +++ b/src/test/parse-fail/issue-20711.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // ignore-tidy-linelength diff --git a/src/test/parse-fail/issue-21153.rs b/src/test/parse-fail/issue-21153.rs index b6d95ffb911ca..13a5cc320e50f 100644 --- a/src/test/parse-fail/issue-21153.rs +++ b/src/test/parse-fail/issue-21153.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only trait MyTrait: Iterator { //~ ERROR missing `fn`, `type`, or `const` diff --git a/src/test/parse-fail/issue-22647.rs b/src/test/parse-fail/issue-22647.rs index 1ace57edba3d8..25cd7ffce5a97 100644 --- a/src/test/parse-fail/issue-22647.rs +++ b/src/test/parse-fail/issue-22647.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let caller = |f: F| //~ ERROR expected one of `:`, `;`, `=`, or `@`, found `<` where F: Fn() -> i32 diff --git a/src/test/parse-fail/issue-22712.rs b/src/test/parse-fail/issue-22712.rs index ed936cdd9a934..b03d578e3d638 100644 --- a/src/test/parse-fail/issue-22712.rs +++ b/src/test/parse-fail/issue-22712.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { buffer: B } diff --git a/src/test/parse-fail/issue-2354-1.rs b/src/test/parse-fail/issue-2354-1.rs index f24c544073578..50e166c1f36f4 100644 --- a/src/test/parse-fail/issue-2354-1.rs +++ b/src/test/parse-fail/issue-2354-1.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only static foo: isize = 2; } //~ ERROR unexpected close delimiter: diff --git a/src/test/parse-fail/issue-2354.rs b/src/test/parse-fail/issue-2354.rs index 2e799a72c81af..ced949a911fc8 100644 --- a/src/test/parse-fail/issue-2354.rs +++ b/src/test/parse-fail/issue-2354.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn foo() { //~ HELP did you mean to close this delimiter? diff --git a/src/test/parse-fail/issue-23620-invalid-escapes.rs b/src/test/parse-fail/issue-23620-invalid-escapes.rs index dfeaae490021a..6895a926b4f0c 100644 --- a/src/test/parse-fail/issue-23620-invalid-escapes.rs +++ b/src/test/parse-fail/issue-23620-invalid-escapes.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error fn main() { diff --git a/src/test/parse-fail/issue-24197.rs b/src/test/parse-fail/issue-24197.rs index 37d6218261234..005ff9fa2e0ec 100644 --- a/src/test/parse-fail/issue-24197.rs +++ b/src/test/parse-fail/issue-24197.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let buf[0] = 0; //~ ERROR expected one of `:`, `;`, `=`, or `@`, found `[` } diff --git a/src/test/parse-fail/issue-24375.rs b/src/test/parse-fail/issue-24375.rs index 8723423325c19..1d128d33e4f49 100644 --- a/src/test/parse-fail/issue-24375.rs +++ b/src/test/parse-fail/issue-24375.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - static tmp : [&'static str; 2] = ["hello", "he"]; fn main() { diff --git a/src/test/parse-fail/issue-24780.rs b/src/test/parse-fail/issue-24780.rs index 6fd4ee38a4d7a..58500ffe3dc1c 100644 --- a/src/test/parse-fail/issue-24780.rs +++ b/src/test/parse-fail/issue-24780.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Verify that '>' is not both expected and found at the same time, as it used // to happen in #24780. For example, following should be an error: // expected one of ..., `>`, ... found `>` diff --git a/src/test/parse-fail/issue-27255.rs b/src/test/parse-fail/issue-27255.rs index a751c4af494dd..08674c7b9ae18 100644 --- a/src/test/parse-fail/issue-27255.rs +++ b/src/test/parse-fail/issue-27255.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only impl A .. {} //~ ERROR diff --git a/src/test/parse-fail/issue-30318.rs b/src/test/parse-fail/issue-30318.rs index 9ea0bb782838b..5a44b3f712df4 100644 --- a/src/test/parse-fail/issue-30318.rs +++ b/src/test/parse-fail/issue-30318.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn foo() { } diff --git a/src/test/parse-fail/issue-3036.rs b/src/test/parse-fail/issue-3036.rs index 229b12136fc6c..66f4b5f097fc6 100644 --- a/src/test/parse-fail/issue-3036.rs +++ b/src/test/parse-fail/issue-3036.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // Testing that semicolon tokens are printed correctly in errors diff --git a/src/test/parse-fail/issue-32214.rs b/src/test/parse-fail/issue-32214.rs index 9e20009409368..2ca169949f808 100644 --- a/src/test/parse-fail/issue-32214.rs +++ b/src/test/parse-fail/issue-32214.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error pub fn test >() {} diff --git a/src/test/parse-fail/issue-32446.rs b/src/test/parse-fail/issue-32446.rs index 90b9a4aae8b5b..264ea351997b7 100644 --- a/src/test/parse-fail/issue-32446.rs +++ b/src/test/parse-fail/issue-32446.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() {} diff --git a/src/test/parse-fail/issue-32501.rs b/src/test/parse-fail/issue-32501.rs index 21db2f5051703..40ed0285d2061 100644 --- a/src/test/parse-fail/issue-32501.rs +++ b/src/test/parse-fail/issue-32501.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/parse-fail/issue-32505.rs b/src/test/parse-fail/issue-32505.rs index 246941ff2597d..94fe70ddd8f56 100644 --- a/src/test/parse-fail/issue-32505.rs +++ b/src/test/parse-fail/issue-32505.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error pub fn test() { diff --git a/src/test/parse-fail/issue-33262.rs b/src/test/parse-fail/issue-33262.rs index d6bbfdc59f5c6..72c75ce8ff52d 100644 --- a/src/test/parse-fail/issue-33262.rs +++ b/src/test/parse-fail/issue-33262.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // Issue #33262 diff --git a/src/test/parse-fail/issue-33413.rs b/src/test/parse-fail/issue-33413.rs index 25ae7b4c55a2b..27ac5b5344df2 100644 --- a/src/test/parse-fail/issue-33413.rs +++ b/src/test/parse-fail/issue-33413.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only impl S { diff --git a/src/test/parse-fail/issue-33455.rs b/src/test/parse-fail/issue-33455.rs index 96070332f06df..6dff63f5cf412 100644 --- a/src/test/parse-fail/issue-33455.rs +++ b/src/test/parse-fail/issue-33455.rs @@ -1,11 +1 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use foo.bar; //~ ERROR expected one of `::`, `;`, or `as`, found `.` diff --git a/src/test/parse-fail/issue-33569.rs b/src/test/parse-fail/issue-33569.rs index 15d491719a6d5..c97b533e35432 100644 --- a/src/test/parse-fail/issue-33569.rs +++ b/src/test/parse-fail/issue-33569.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z no-analysis macro_rules! foo { diff --git a/src/test/parse-fail/issue-37113.rs b/src/test/parse-fail/issue-37113.rs index 14c6f3944bb59..0044aa5610f5f 100644 --- a/src/test/parse-fail/issue-37113.rs +++ b/src/test/parse-fail/issue-37113.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! test_macro { ( $( $t:ty ),* $(),*) => { enum SomeEnum { diff --git a/src/test/parse-fail/issue-37234.rs b/src/test/parse-fail/issue-37234.rs index 93a1468bf7b19..4debc74790543 100644 --- a/src/test/parse-fail/issue-37234.rs +++ b/src/test/parse-fail/issue-37234.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! failed { () => {{ let x = 5 ""; //~ ERROR found `""` diff --git a/src/test/parse-fail/issue-43692.rs b/src/test/parse-fail/issue-43692.rs index eb5d050e1022d..c34f55ec59bfd 100644 --- a/src/test/parse-fail/issue-43692.rs +++ b/src/test/parse-fail/issue-43692.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/parse-fail/issue-5544-a.rs b/src/test/parse-fail/issue-5544-a.rs index cf1500e34d874..72cc2227eb8a1 100644 --- a/src/test/parse-fail/issue-5544-a.rs +++ b/src/test/parse-fail/issue-5544-a.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/parse-fail/issue-5544-b.rs b/src/test/parse-fail/issue-5544-b.rs index 8c0b6741cb804..9c87b61a78a4c 100644 --- a/src/test/parse-fail/issue-5544-b.rs +++ b/src/test/parse-fail/issue-5544-b.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/parse-fail/issue-5806.rs b/src/test/parse-fail/issue-5806.rs index f6606a58ecaf1..db767e27baeb9 100644 --- a/src/test/parse-fail/issue-5806.rs +++ b/src/test/parse-fail/issue-5806.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-windows // ignore-freebsd // ignore-openbsd diff --git a/src/test/parse-fail/issue-6610.rs b/src/test/parse-fail/issue-6610.rs index f5113efad1ce8..d2e4d3861fb65 100644 --- a/src/test/parse-fail/issue-6610.rs +++ b/src/test/parse-fail/issue-6610.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only trait Foo { fn a() } //~ ERROR expected `;` or `{`, found `}` diff --git a/src/test/parse-fail/issue-8537.rs b/src/test/parse-fail/issue-8537.rs index e152a369290b7..387cf99397045 100644 --- a/src/test/parse-fail/issue-8537.rs +++ b/src/test/parse-fail/issue-8537.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only pub extern diff --git a/src/test/parse-fail/keyword-abstract.rs b/src/test/parse-fail/keyword-abstract.rs index 2db5a5c583ac3..14f92eeb08e68 100644 --- a/src/test/parse-fail/keyword-abstract.rs +++ b/src/test/parse-fail/keyword-abstract.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/parse-fail/keyword-as-as-identifier.rs b/src/test/parse-fail/keyword-as-as-identifier.rs index c6070c456e8a0..d2a38a41aa655 100644 --- a/src/test/parse-fail/keyword-as-as-identifier.rs +++ b/src/test/parse-fail/keyword-as-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // This file was auto-generated using 'src/etc/generate-keyword-tests.py as' diff --git a/src/test/parse-fail/keyword-box-as-identifier.rs b/src/test/parse-fail/keyword-box-as-identifier.rs index b5abe14dbe872..acbd4a8c92ca0 100644 --- a/src/test/parse-fail/keyword-box-as-identifier.rs +++ b/src/test/parse-fail/keyword-box-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/parse-fail/keyword-break-as-identifier.rs b/src/test/parse-fail/keyword-break-as-identifier.rs index 65c775fa1b6cc..02affe09c6b56 100644 --- a/src/test/parse-fail/keyword-break-as-identifier.rs +++ b/src/test/parse-fail/keyword-break-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // This file was auto-generated using 'src/etc/generate-keyword-tests.py break' diff --git a/src/test/parse-fail/keyword-const-as-identifier.rs b/src/test/parse-fail/keyword-const-as-identifier.rs index 6ecf14957e32b..cd86858716ed9 100644 --- a/src/test/parse-fail/keyword-const-as-identifier.rs +++ b/src/test/parse-fail/keyword-const-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // This file was auto-generated using 'src/etc/generate-keyword-tests.py const' diff --git a/src/test/parse-fail/keyword-continue-as-identifier.rs b/src/test/parse-fail/keyword-continue-as-identifier.rs index 87377ac83642f..58683a3d0065b 100644 --- a/src/test/parse-fail/keyword-continue-as-identifier.rs +++ b/src/test/parse-fail/keyword-continue-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // This file was auto-generated using 'src/etc/generate-keyword-tests.py continue' diff --git a/src/test/parse-fail/keyword-else-as-identifier.rs b/src/test/parse-fail/keyword-else-as-identifier.rs index 6878f7fea039d..61e64c7e14897 100644 --- a/src/test/parse-fail/keyword-else-as-identifier.rs +++ b/src/test/parse-fail/keyword-else-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // This file was auto-generated using 'src/etc/generate-keyword-tests.py else' diff --git a/src/test/parse-fail/keyword-enum-as-identifier.rs b/src/test/parse-fail/keyword-enum-as-identifier.rs index 042a02d79e003..2fb1a6d341c4e 100644 --- a/src/test/parse-fail/keyword-enum-as-identifier.rs +++ b/src/test/parse-fail/keyword-enum-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // This file was auto-generated using 'src/etc/generate-keyword-tests.py enum' diff --git a/src/test/parse-fail/keyword-final.rs b/src/test/parse-fail/keyword-final.rs index be29a739443e6..7350f5a7f3e06 100644 --- a/src/test/parse-fail/keyword-final.rs +++ b/src/test/parse-fail/keyword-final.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/parse-fail/keyword-fn-as-identifier.rs b/src/test/parse-fail/keyword-fn-as-identifier.rs index 0d454f67d1c05..dfeb444ccfdf5 100644 --- a/src/test/parse-fail/keyword-fn-as-identifier.rs +++ b/src/test/parse-fail/keyword-fn-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // This file was auto-generated using 'src/etc/generate-keyword-tests.py fn' diff --git a/src/test/parse-fail/keyword-for-as-identifier.rs b/src/test/parse-fail/keyword-for-as-identifier.rs index d341669f7272b..806156f26a3ee 100644 --- a/src/test/parse-fail/keyword-for-as-identifier.rs +++ b/src/test/parse-fail/keyword-for-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // This file was auto-generated using 'src/etc/generate-keyword-tests.py for' diff --git a/src/test/parse-fail/keyword-if-as-identifier.rs b/src/test/parse-fail/keyword-if-as-identifier.rs index 417e40425e03b..d71b77f7203b1 100644 --- a/src/test/parse-fail/keyword-if-as-identifier.rs +++ b/src/test/parse-fail/keyword-if-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // This file was auto-generated using 'src/etc/generate-keyword-tests.py if' diff --git a/src/test/parse-fail/keyword-impl-as-identifier.rs b/src/test/parse-fail/keyword-impl-as-identifier.rs index fe97c191f683c..a151b089e6643 100644 --- a/src/test/parse-fail/keyword-impl-as-identifier.rs +++ b/src/test/parse-fail/keyword-impl-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // This file was auto-generated using 'src/etc/generate-keyword-tests.py impl' diff --git a/src/test/parse-fail/keyword-in-as-identifier.rs b/src/test/parse-fail/keyword-in-as-identifier.rs index c0f9396b98100..4cd0d88cf9f59 100644 --- a/src/test/parse-fail/keyword-in-as-identifier.rs +++ b/src/test/parse-fail/keyword-in-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // This file was auto-generated using 'src/etc/generate-keyword-tests.py in' diff --git a/src/test/parse-fail/keyword-let-as-identifier.rs b/src/test/parse-fail/keyword-let-as-identifier.rs index 5d6dca78d7830..690a6bd700d4a 100644 --- a/src/test/parse-fail/keyword-let-as-identifier.rs +++ b/src/test/parse-fail/keyword-let-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // This file was auto-generated using 'src/etc/generate-keyword-tests.py let' diff --git a/src/test/parse-fail/keyword-loop-as-identifier.rs b/src/test/parse-fail/keyword-loop-as-identifier.rs index 7c3d11d67f61c..9be7373cf1172 100644 --- a/src/test/parse-fail/keyword-loop-as-identifier.rs +++ b/src/test/parse-fail/keyword-loop-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // This file was auto-generated using 'src/etc/generate-keyword-tests.py loop' diff --git a/src/test/parse-fail/keyword-match-as-identifier.rs b/src/test/parse-fail/keyword-match-as-identifier.rs index 7c727f44da764..02a0d754c6e35 100644 --- a/src/test/parse-fail/keyword-match-as-identifier.rs +++ b/src/test/parse-fail/keyword-match-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // This file was auto-generated using 'src/etc/generate-keyword-tests.py match' diff --git a/src/test/parse-fail/keyword-mod-as-identifier.rs b/src/test/parse-fail/keyword-mod-as-identifier.rs index 85b4cc2e02c6a..1f9ffc82da4d4 100644 --- a/src/test/parse-fail/keyword-mod-as-identifier.rs +++ b/src/test/parse-fail/keyword-mod-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // This file was auto-generated using 'src/etc/generate-keyword-tests.py mod' diff --git a/src/test/parse-fail/keyword-move-as-identifier.rs b/src/test/parse-fail/keyword-move-as-identifier.rs index b785ac0058ccb..7b7e3508dcaf6 100644 --- a/src/test/parse-fail/keyword-move-as-identifier.rs +++ b/src/test/parse-fail/keyword-move-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // This file was auto-generated using 'src/etc/generate-keyword-tests.py move' diff --git a/src/test/parse-fail/keyword-mut-as-identifier.rs b/src/test/parse-fail/keyword-mut-as-identifier.rs index 0aeca9b34ab8c..41b86b0229fdd 100644 --- a/src/test/parse-fail/keyword-mut-as-identifier.rs +++ b/src/test/parse-fail/keyword-mut-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/parse-fail/keyword-override.rs b/src/test/parse-fail/keyword-override.rs index 60333762b33e0..423fbaf2a226f 100644 --- a/src/test/parse-fail/keyword-override.rs +++ b/src/test/parse-fail/keyword-override.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/parse-fail/keyword-pub-as-identifier.rs b/src/test/parse-fail/keyword-pub-as-identifier.rs index 9233728697026..6e5d84c5b0ce1 100644 --- a/src/test/parse-fail/keyword-pub-as-identifier.rs +++ b/src/test/parse-fail/keyword-pub-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // This file was auto-generated using 'src/etc/generate-keyword-tests.py pub' diff --git a/src/test/parse-fail/keyword-ref-as-identifier.rs b/src/test/parse-fail/keyword-ref-as-identifier.rs index a689c4eeea413..fc2a98af515e9 100644 --- a/src/test/parse-fail/keyword-ref-as-identifier.rs +++ b/src/test/parse-fail/keyword-ref-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/parse-fail/keyword-return-as-identifier.rs b/src/test/parse-fail/keyword-return-as-identifier.rs index bcf7f13754315..e85e818e92581 100644 --- a/src/test/parse-fail/keyword-return-as-identifier.rs +++ b/src/test/parse-fail/keyword-return-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // This file was auto-generated using 'src/etc/generate-keyword-tests.py return' diff --git a/src/test/parse-fail/keyword-static-as-identifier.rs b/src/test/parse-fail/keyword-static-as-identifier.rs index 793262266a39f..ae55d30ee4bc4 100644 --- a/src/test/parse-fail/keyword-static-as-identifier.rs +++ b/src/test/parse-fail/keyword-static-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // This file was auto-generated using 'src/etc/generate-keyword-tests.py static' diff --git a/src/test/parse-fail/keyword-struct-as-identifier.rs b/src/test/parse-fail/keyword-struct-as-identifier.rs index 591bd25db65da..593db01ba830e 100644 --- a/src/test/parse-fail/keyword-struct-as-identifier.rs +++ b/src/test/parse-fail/keyword-struct-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // This file was auto-generated using 'src/etc/generate-keyword-tests.py struct' diff --git a/src/test/parse-fail/keyword-trait-as-identifier.rs b/src/test/parse-fail/keyword-trait-as-identifier.rs index bdb5d264b031e..c53cf2f84f927 100644 --- a/src/test/parse-fail/keyword-trait-as-identifier.rs +++ b/src/test/parse-fail/keyword-trait-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // This file was auto-generated using 'src/etc/generate-keyword-tests.py trait' diff --git a/src/test/parse-fail/keyword-try-as-identifier-edition2018.rs b/src/test/parse-fail/keyword-try-as-identifier-edition2018.rs index 1e4f85c122d6c..a2782d42cf3ba 100644 --- a/src/test/parse-fail/keyword-try-as-identifier-edition2018.rs +++ b/src/test/parse-fail/keyword-try-as-identifier-edition2018.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only --edition 2018 fn main() { diff --git a/src/test/parse-fail/keyword-type-as-identifier.rs b/src/test/parse-fail/keyword-type-as-identifier.rs index 2ba99d098deef..1639558431450 100644 --- a/src/test/parse-fail/keyword-type-as-identifier.rs +++ b/src/test/parse-fail/keyword-type-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // This file was auto-generated using 'src/etc/generate-keyword-tests.py type' diff --git a/src/test/parse-fail/keyword-typeof.rs b/src/test/parse-fail/keyword-typeof.rs index 40e26bd375ae5..667caf1856319 100644 --- a/src/test/parse-fail/keyword-typeof.rs +++ b/src/test/parse-fail/keyword-typeof.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/parse-fail/keyword-unsafe-as-identifier.rs b/src/test/parse-fail/keyword-unsafe-as-identifier.rs index a72723e566dde..d3530a3bfb493 100644 --- a/src/test/parse-fail/keyword-unsafe-as-identifier.rs +++ b/src/test/parse-fail/keyword-unsafe-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // This file was auto-generated using 'src/etc/generate-keyword-tests.py unsafe' diff --git a/src/test/parse-fail/keyword-use-as-identifier.rs b/src/test/parse-fail/keyword-use-as-identifier.rs index de74907ff2097..08c69e491246f 100644 --- a/src/test/parse-fail/keyword-use-as-identifier.rs +++ b/src/test/parse-fail/keyword-use-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // This file was auto-generated using 'src/etc/generate-keyword-tests.py use' diff --git a/src/test/parse-fail/keyword-where-as-identifier.rs b/src/test/parse-fail/keyword-where-as-identifier.rs index 4b7c8920b13ca..8283cf5c31cac 100644 --- a/src/test/parse-fail/keyword-where-as-identifier.rs +++ b/src/test/parse-fail/keyword-where-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // This file was auto-generated using 'src/etc/generate-keyword-tests.py where' diff --git a/src/test/parse-fail/keyword-while-as-identifier.rs b/src/test/parse-fail/keyword-while-as-identifier.rs index 01793caa38a8a..7c70087a441d3 100644 --- a/src/test/parse-fail/keyword-while-as-identifier.rs +++ b/src/test/parse-fail/keyword-while-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // This file was auto-generated using 'src/etc/generate-keyword-tests.py while' diff --git a/src/test/parse-fail/keyword.rs b/src/test/parse-fail/keyword.rs index d4ce5518e465d..92c05e53b6002 100644 --- a/src/test/parse-fail/keyword.rs +++ b/src/test/parse-fail/keyword.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only pub mod break { diff --git a/src/test/parse-fail/keywords-followed-by-double-colon.rs b/src/test/parse-fail/keywords-followed-by-double-colon.rs index 7a5b48c5f004d..cdcfa74e07268 100644 --- a/src/test/parse-fail/keywords-followed-by-double-colon.rs +++ b/src/test/parse-fail/keywords-followed-by-double-colon.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/parse-fail/lex-bad-binary-literal.rs b/src/test/parse-fail/lex-bad-binary-literal.rs index caacb12d0082d..316e7398a4a1a 100644 --- a/src/test/parse-fail/lex-bad-binary-literal.rs +++ b/src/test/parse-fail/lex-bad-binary-literal.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error fn main() { diff --git a/src/test/parse-fail/lex-bad-char-literals-1.rs b/src/test/parse-fail/lex-bad-char-literals-1.rs index 006e3e68d8f2d..6620c9b680571 100644 --- a/src/test/parse-fail/lex-bad-char-literals-1.rs +++ b/src/test/parse-fail/lex-bad-char-literals-1.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error static c3: char = '\x1' //~ ERROR: numeric character escape is too short diff --git a/src/test/parse-fail/lex-bad-char-literals-2.rs b/src/test/parse-fail/lex-bad-char-literals-2.rs index 8bd6808c5ffd4..0579302d5f2f4 100644 --- a/src/test/parse-fail/lex-bad-char-literals-2.rs +++ b/src/test/parse-fail/lex-bad-char-literals-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // This test needs to the last one appearing in this file as it kills the parser diff --git a/src/test/parse-fail/lex-bad-char-literals-3.rs b/src/test/parse-fail/lex-bad-char-literals-3.rs index 464e75ec58231..0ea8290ad9383 100644 --- a/src/test/parse-fail/lex-bad-char-literals-3.rs +++ b/src/test/parse-fail/lex-bad-char-literals-3.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // This test needs to the last one appearing in this file as it kills the parser diff --git a/src/test/parse-fail/lex-bad-char-literals-4.rs b/src/test/parse-fail/lex-bad-char-literals-4.rs index b230e62360380..8ac2d905ef9cf 100644 --- a/src/test/parse-fail/lex-bad-char-literals-4.rs +++ b/src/test/parse-fail/lex-bad-char-literals-4.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // // This test needs to the last one appearing in this file as it kills the parser diff --git a/src/test/parse-fail/lex-bad-char-literals-5.rs b/src/test/parse-fail/lex-bad-char-literals-5.rs index aa166881d89d5..3c7bcf08718e1 100644 --- a/src/test/parse-fail/lex-bad-char-literals-5.rs +++ b/src/test/parse-fail/lex-bad-char-literals-5.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // // This test needs to the last one appearing in this file as it kills the parser diff --git a/src/test/parse-fail/lex-bad-numeric-literals.rs b/src/test/parse-fail/lex-bad-numeric-literals.rs index d495a8edd09a4..f478c15b33dc7 100644 --- a/src/test/parse-fail/lex-bad-numeric-literals.rs +++ b/src/test/parse-fail/lex-bad-numeric-literals.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error fn main() { diff --git a/src/test/parse-fail/lex-bad-octal-literal.rs b/src/test/parse-fail/lex-bad-octal-literal.rs index c8406af52ae0c..70f1aa41919eb 100644 --- a/src/test/parse-fail/lex-bad-octal-literal.rs +++ b/src/test/parse-fail/lex-bad-octal-literal.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error fn main() { diff --git a/src/test/parse-fail/lex-bad-token.rs b/src/test/parse-fail/lex-bad-token.rs index 774b10a9f97c5..6bcc13815a4df 100644 --- a/src/test/parse-fail/lex-bad-token.rs +++ b/src/test/parse-fail/lex-bad-token.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only ● //~ ERROR: unknown start of token diff --git a/src/test/parse-fail/lex-bare-cr-string-literal-doc-comment.rs b/src/test/parse-fail/lex-bare-cr-string-literal-doc-comment.rs index ac085d475114e..21fbfe715e8bd 100644 --- a/src/test/parse-fail/lex-bare-cr-string-literal-doc-comment.rs +++ b/src/test/parse-fail/lex-bare-cr-string-literal-doc-comment.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error // ignore-tidy-cr diff --git a/src/test/parse-fail/lex-stray-backslash.rs b/src/test/parse-fail/lex-stray-backslash.rs index b6042bbdc1a26..d6cccfa6c718b 100644 --- a/src/test/parse-fail/lex-stray-backslash.rs +++ b/src/test/parse-fail/lex-stray-backslash.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only \ //~ ERROR: unknown start of token: \ diff --git a/src/test/parse-fail/lifetime-in-pattern.rs b/src/test/parse-fail/lifetime-in-pattern.rs index 8802497ae1bfd..afee685cd056f 100644 --- a/src/test/parse-fail/lifetime-in-pattern.rs +++ b/src/test/parse-fail/lifetime-in-pattern.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn test(&'a str) { //~^ ERROR unexpected lifetime `'a` in pattern } diff --git a/src/test/parse-fail/lifetime-semicolon.rs b/src/test/parse-fail/lifetime-semicolon.rs index e1975952fca3e..ede3eaeb37bcc 100644 --- a/src/test/parse-fail/lifetime-semicolon.rs +++ b/src/test/parse-fail/lifetime-semicolon.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only struct Foo<'a, 'b> { diff --git a/src/test/parse-fail/macro-bad-delimiter-ident.rs b/src/test/parse-fail/macro-bad-delimiter-ident.rs index 2940adee043a5..56eb976b9c67c 100644 --- a/src/test/parse-fail/macro-bad-delimiter-ident.rs +++ b/src/test/parse-fail/macro-bad-delimiter-ident.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/parse-fail/macro-doc-comments-1.rs b/src/test/parse-fail/macro-doc-comments-1.rs index 03bcef4fa5ee0..8d8103bb1e065 100644 --- a/src/test/parse-fail/macro-doc-comments-1.rs +++ b/src/test/parse-fail/macro-doc-comments-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! outer { (#[$outer:meta]) => () } diff --git a/src/test/parse-fail/macro-doc-comments-2.rs b/src/test/parse-fail/macro-doc-comments-2.rs index a1b112c29b6e0..8f33720ae80eb 100644 --- a/src/test/parse-fail/macro-doc-comments-2.rs +++ b/src/test/parse-fail/macro-doc-comments-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! inner { (#![$inner:meta]) => () } diff --git a/src/test/parse-fail/macro-keyword.rs b/src/test/parse-fail/macro-keyword.rs index c7dcaf4137e5d..cb1898e6ea733 100644 --- a/src/test/parse-fail/macro-keyword.rs +++ b/src/test/parse-fail/macro-keyword.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn macro() { //~ ERROR expected identifier, found reserved keyword `macro` diff --git a/src/test/parse-fail/macro-mismatched-delim-brace-paren.rs b/src/test/parse-fail/macro-mismatched-delim-brace-paren.rs index 84cf900129f95..29fdd9efdf2a2 100644 --- a/src/test/parse-fail/macro-mismatched-delim-brace-paren.rs +++ b/src/test/parse-fail/macro-mismatched-delim-brace-paren.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/parse-fail/macro-mismatched-delim-paren-brace.rs b/src/test/parse-fail/macro-mismatched-delim-paren-brace.rs index cbc0ed0ccdb84..38e5393b04a1c 100644 --- a/src/test/parse-fail/macro-mismatched-delim-paren-brace.rs +++ b/src/test/parse-fail/macro-mismatched-delim-paren-brace.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/parse-fail/macro-repeat.rs b/src/test/parse-fail/macro-repeat.rs index 3abadd885ac6e..580a1daacbf31 100644 --- a/src/test/parse-fail/macro-repeat.rs +++ b/src/test/parse-fail/macro-repeat.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! mac { ( $($v:tt)* ) => ( $v //~ ERROR still repeating at this depth diff --git a/src/test/parse-fail/macros-no-semicolon-items.rs b/src/test/parse-fail/macros-no-semicolon-items.rs index faf6b4a308a07..2c3284b6d2dd8 100644 --- a/src/test/parse-fail/macros-no-semicolon-items.rs +++ b/src/test/parse-fail/macros-no-semicolon-items.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only macro_rules! foo() //~ ERROR semicolon diff --git a/src/test/parse-fail/macros-no-semicolon.rs b/src/test/parse-fail/macros-no-semicolon.rs index 1c55d70f60737..0ad5b8d3f81f3 100644 --- a/src/test/parse-fail/macros-no-semicolon.rs +++ b/src/test/parse-fail/macros-no-semicolon.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/parse-fail/match-arrows-block-then-binop.rs b/src/test/parse-fail/match-arrows-block-then-binop.rs index e8cfb77f05963..1a79da38c3d18 100644 --- a/src/test/parse-fail/match-arrows-block-then-binop.rs +++ b/src/test/parse-fail/match-arrows-block-then-binop.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/parse-fail/match-vec-invalid.rs b/src/test/parse-fail/match-vec-invalid.rs index 72501ba0e4f4d..9c8fb1eff4907 100644 --- a/src/test/parse-fail/match-vec-invalid.rs +++ b/src/test/parse-fail/match-vec-invalid.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/parse-fail/mod_file_not_exist.rs b/src/test/parse-fail/mod_file_not_exist.rs index 4bc6e706d4284..c41c9e07cb100 100644 --- a/src/test/parse-fail/mod_file_not_exist.rs +++ b/src/test/parse-fail/mod_file_not_exist.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-windows // compile-flags: -Z parse-only diff --git a/src/test/parse-fail/mod_file_not_exist_windows.rs b/src/test/parse-fail/mod_file_not_exist_windows.rs index 5cf821749e945..2ae73ce3144e5 100644 --- a/src/test/parse-fail/mod_file_not_exist_windows.rs +++ b/src/test/parse-fail/mod_file_not_exist_windows.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-android // ignore-bitrig // ignore-cloudabi diff --git a/src/test/parse-fail/mod_file_with_path_attr.rs b/src/test/parse-fail/mod_file_with_path_attr.rs index 993232e70ab3b..703d638491f86 100644 --- a/src/test/parse-fail/mod_file_with_path_attr.rs +++ b/src/test/parse-fail/mod_file_with_path_attr.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only #[path = "not_a_real_file.rs"] diff --git a/src/test/parse-fail/multiline-comment-line-tracking.rs b/src/test/parse-fail/multiline-comment-line-tracking.rs index 11abe6727455d..553fa55c5fd0d 100644 --- a/src/test/parse-fail/multiline-comment-line-tracking.rs +++ b/src/test/parse-fail/multiline-comment-line-tracking.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:18:3 /* 1 diff --git a/src/test/parse-fail/multitrait.rs b/src/test/parse-fail/multitrait.rs index b7c9b16588466..2c6275699b479 100644 --- a/src/test/parse-fail/multitrait.rs +++ b/src/test/parse-fail/multitrait.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only struct S { diff --git a/src/test/parse-fail/mut-patterns.rs b/src/test/parse-fail/mut-patterns.rs index 71d826c67f8bd..9c4384c5385ee 100644 --- a/src/test/parse-fail/mut-patterns.rs +++ b/src/test/parse-fail/mut-patterns.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // Can't put mut in non-ident pattern diff --git a/src/test/parse-fail/new-unicode-escapes-1.rs b/src/test/parse-fail/new-unicode-escapes-1.rs index 78a68e846d111..cf75cdaa98a16 100644 --- a/src/test/parse-fail/new-unicode-escapes-1.rs +++ b/src/test/parse-fail/new-unicode-escapes-1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only pub fn main() { diff --git a/src/test/parse-fail/new-unicode-escapes-2.rs b/src/test/parse-fail/new-unicode-escapes-2.rs index cdadaef1b59a8..228518f8c1a1d 100644 --- a/src/test/parse-fail/new-unicode-escapes-2.rs +++ b/src/test/parse-fail/new-unicode-escapes-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only pub fn main() { diff --git a/src/test/parse-fail/new-unicode-escapes-3.rs b/src/test/parse-fail/new-unicode-escapes-3.rs index 8189bf6771291..8a38e1407ac0a 100644 --- a/src/test/parse-fail/new-unicode-escapes-3.rs +++ b/src/test/parse-fail/new-unicode-escapes-3.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only pub fn main() { diff --git a/src/test/parse-fail/new-unicode-escapes-4.rs b/src/test/parse-fail/new-unicode-escapes-4.rs index 8770fb319df0f..49a35663a912f 100644 --- a/src/test/parse-fail/new-unicode-escapes-4.rs +++ b/src/test/parse-fail/new-unicode-escapes-4.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error pub fn main() { diff --git a/src/test/parse-fail/no-binary-float-literal.rs b/src/test/parse-fail/no-binary-float-literal.rs index 528a2b1ad33a2..c3ed2ac2dcf34 100644 --- a/src/test/parse-fail/no-binary-float-literal.rs +++ b/src/test/parse-fail/no-binary-float-literal.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // error-pattern:binary float literal is not supported diff --git a/src/test/parse-fail/no-hex-float-literal.rs b/src/test/parse-fail/no-hex-float-literal.rs index df40fdde866e1..4e56cc2d323ff 100644 --- a/src/test/parse-fail/no-hex-float-literal.rs +++ b/src/test/parse-fail/no-hex-float-literal.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // error-pattern:hexadecimal float literal is not supported diff --git a/src/test/parse-fail/no-unsafe-self.rs b/src/test/parse-fail/no-unsafe-self.rs index 22baf88b43f5a..c74fc8c25dcbd 100644 --- a/src/test/parse-fail/no-unsafe-self.rs +++ b/src/test/parse-fail/no-unsafe-self.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error trait A { diff --git a/src/test/parse-fail/not-a-pred.rs b/src/test/parse-fail/not-a-pred.rs index d880c06f8a1a6..8efd28b5977d0 100644 --- a/src/test/parse-fail/not-a-pred.rs +++ b/src/test/parse-fail/not-a-pred.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // error-pattern: lt diff --git a/src/test/parse-fail/omitted-arg-in-item-fn.rs b/src/test/parse-fail/omitted-arg-in-item-fn.rs index 388b7c8772e9a..a9c0e9133b78e 100644 --- a/src/test/parse-fail/omitted-arg-in-item-fn.rs +++ b/src/test/parse-fail/omitted-arg-in-item-fn.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn foo(x) { //~ ERROR expected one of `:` or `@`, found `)` diff --git a/src/test/parse-fail/paamayim-nekudotayim.rs b/src/test/parse-fail/paamayim-nekudotayim.rs index 3466fc6e71ac0..9ae57223c86c4 100644 --- a/src/test/parse-fail/paamayim-nekudotayim.rs +++ b/src/test/parse-fail/paamayim-nekudotayim.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // http://phpsadness.com/sad/1 diff --git a/src/test/parse-fail/paren-after-qualified-path-in-match.rs b/src/test/parse-fail/paren-after-qualified-path-in-match.rs index d3aa4b72b78a5..dec0ba820b92b 100644 --- a/src/test/parse-fail/paren-after-qualified-path-in-match.rs +++ b/src/test/parse-fail/paren-after-qualified-path-in-match.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn foo() { diff --git a/src/test/parse-fail/pat-lt-bracket-1.rs b/src/test/parse-fail/pat-lt-bracket-1.rs index 6d3d120778830..2e2001434f28c 100644 --- a/src/test/parse-fail/pat-lt-bracket-1.rs +++ b/src/test/parse-fail/pat-lt-bracket-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { match 42 { x < 7 => (), diff --git a/src/test/parse-fail/pat-lt-bracket-2.rs b/src/test/parse-fail/pat-lt-bracket-2.rs index 6a0653041d45b..00226b8f49d8e 100644 --- a/src/test/parse-fail/pat-lt-bracket-2.rs +++ b/src/test/parse-fail/pat-lt-bracket-2.rs @@ -1,12 +1,2 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn a(B<) {} //~^ error: expected one of `:` or `@`, found `<` diff --git a/src/test/parse-fail/pat-lt-bracket-3.rs b/src/test/parse-fail/pat-lt-bracket-3.rs index 8ea2bcf900c97..bf67f325a41f5 100644 --- a/src/test/parse-fail/pat-lt-bracket-3.rs +++ b/src/test/parse-fail/pat-lt-bracket-3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo(T, T); impl Foo { diff --git a/src/test/parse-fail/pat-lt-bracket-4.rs b/src/test/parse-fail/pat-lt-bracket-4.rs index a163b38b49270..96084229998e4 100644 --- a/src/test/parse-fail/pat-lt-bracket-4.rs +++ b/src/test/parse-fail/pat-lt-bracket-4.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only enum BtNode { diff --git a/src/test/parse-fail/pat-lt-bracket-5.rs b/src/test/parse-fail/pat-lt-bracket-5.rs index 421d7a05befff..c4b9dd469f54c 100644 --- a/src/test/parse-fail/pat-lt-bracket-5.rs +++ b/src/test/parse-fail/pat-lt-bracket-5.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let v[0] = v[1]; //~ ERROR expected one of `:`, `;`, `=`, or `@`, found `[` } diff --git a/src/test/parse-fail/pat-lt-bracket-6.rs b/src/test/parse-fail/pat-lt-bracket-6.rs index fb78e558a951a..9bad0cb25c1e4 100644 --- a/src/test/parse-fail/pat-lt-bracket-6.rs +++ b/src/test/parse-fail/pat-lt-bracket-6.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let Test(&desc[..]) = x; //~ ERROR: expected one of `)`, `,`, or `@`, found `[` } diff --git a/src/test/parse-fail/pat-lt-bracket-7.rs b/src/test/parse-fail/pat-lt-bracket-7.rs index d75589d8889e3..36c0d7733733a 100644 --- a/src/test/parse-fail/pat-lt-bracket-7.rs +++ b/src/test/parse-fail/pat-lt-bracket-7.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { for thing(x[]) in foo {} //~ ERROR: expected one of `)`, `,`, or `@`, found `[` } diff --git a/src/test/parse-fail/pat-ranges-1.rs b/src/test/parse-fail/pat-ranges-1.rs index 857a3924aec01..ce953b2eb2299 100644 --- a/src/test/parse-fail/pat-ranges-1.rs +++ b/src/test/parse-fail/pat-ranges-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Parsing of range patterns fn main() { diff --git a/src/test/parse-fail/pat-ranges-2.rs b/src/test/parse-fail/pat-ranges-2.rs index 64c749333cf4a..9f736ed328c5c 100644 --- a/src/test/parse-fail/pat-ranges-2.rs +++ b/src/test/parse-fail/pat-ranges-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Parsing of range patterns fn main() { diff --git a/src/test/parse-fail/pat-ranges-3.rs b/src/test/parse-fail/pat-ranges-3.rs index 1327a9fab3661..65da55e3bda8c 100644 --- a/src/test/parse-fail/pat-ranges-3.rs +++ b/src/test/parse-fail/pat-ranges-3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Parsing of range patterns fn main() { diff --git a/src/test/parse-fail/pat-ranges-4.rs b/src/test/parse-fail/pat-ranges-4.rs index c159c7702502d..7f4a5f3239e76 100644 --- a/src/test/parse-fail/pat-ranges-4.rs +++ b/src/test/parse-fail/pat-ranges-4.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Parsing of range patterns fn main() { diff --git a/src/test/parse-fail/pat-ref-enum.rs b/src/test/parse-fail/pat-ref-enum.rs index cf8025726598c..85bb6bae9cf25 100644 --- a/src/test/parse-fail/pat-ref-enum.rs +++ b/src/test/parse-fail/pat-ref-enum.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn matcher(x: Option) { diff --git a/src/test/parse-fail/pat-tuple-1.rs b/src/test/parse-fail/pat-tuple-1.rs index 945d0740654e8..8dad6e258e44f 100644 --- a/src/test/parse-fail/pat-tuple-1.rs +++ b/src/test/parse-fail/pat-tuple-1.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/parse-fail/pat-tuple-2.rs b/src/test/parse-fail/pat-tuple-2.rs index 07b391d327984..b52ecdf0a3237 100644 --- a/src/test/parse-fail/pat-tuple-2.rs +++ b/src/test/parse-fail/pat-tuple-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/parse-fail/pat-tuple-3.rs b/src/test/parse-fail/pat-tuple-3.rs index 029dc7a295678..1562447533db3 100644 --- a/src/test/parse-fail/pat-tuple-3.rs +++ b/src/test/parse-fail/pat-tuple-3.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/parse-fail/pat-tuple-4.rs b/src/test/parse-fail/pat-tuple-4.rs index f4c3afa07f106..70584952b3e9b 100644 --- a/src/test/parse-fail/pat-tuple-4.rs +++ b/src/test/parse-fail/pat-tuple-4.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/parse-fail/pat-tuple-5.rs b/src/test/parse-fail/pat-tuple-5.rs index d528b97b5de89..6bd5775945279 100644 --- a/src/test/parse-fail/pat-tuple-5.rs +++ b/src/test/parse-fail/pat-tuple-5.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/parse-fail/pub-item-macro.rs b/src/test/parse-fail/pub-item-macro.rs index 8809e9a257ddb..7bab86539827a 100644 --- a/src/test/parse-fail/pub-item-macro.rs +++ b/src/test/parse-fail/pub-item-macro.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #14660 macro_rules! priv_x { () => { diff --git a/src/test/parse-fail/pub-method-macro.rs b/src/test/parse-fail/pub-method-macro.rs index 83db24b8c01ef..f04af1a0d65ff 100644 --- a/src/test/parse-fail/pub-method-macro.rs +++ b/src/test/parse-fail/pub-method-macro.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #18317 mod bleh { diff --git a/src/test/parse-fail/range-3.rs b/src/test/parse-fail/range-3.rs index 95aa71b0cdfdb..4e9c3e1e925a0 100644 --- a/src/test/parse-fail/range-3.rs +++ b/src/test/parse-fail/range-3.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // Test range syntax - syntax errors. diff --git a/src/test/parse-fail/range-4.rs b/src/test/parse-fail/range-4.rs index 4500df116a2de..db6ae7003f88b 100644 --- a/src/test/parse-fail/range-4.rs +++ b/src/test/parse-fail/range-4.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // Test range syntax - syntax errors. diff --git a/src/test/parse-fail/range_inclusive.rs b/src/test/parse-fail/range_inclusive.rs index 2aa7d6d6cd793..7bbefdfd71d9a 100644 --- a/src/test/parse-fail/range_inclusive.rs +++ b/src/test/parse-fail/range_inclusive.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Make sure that inclusive ranges with no end point don't parse. pub fn main() { diff --git a/src/test/parse-fail/range_inclusive_dotdotdot.rs b/src/test/parse-fail/range_inclusive_dotdotdot.rs index 34b96a59c2dde..4f1572779ad04 100644 --- a/src/test/parse-fail/range_inclusive_dotdotdot.rs +++ b/src/test/parse-fail/range_inclusive_dotdotdot.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error // Make sure that inclusive ranges with `...` syntax don't parse. diff --git a/src/test/parse-fail/raw-byte-string-eof.rs b/src/test/parse-fail/raw-byte-string-eof.rs index 4b8bb31d19af5..b30fe2e1faea5 100644 --- a/src/test/parse-fail/raw-byte-string-eof.rs +++ b/src/test/parse-fail/raw-byte-string-eof.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only diff --git a/src/test/parse-fail/raw-byte-string-literals.rs b/src/test/parse-fail/raw-byte-string-literals.rs index 2e33f98add6b4..4d3f2528d6849 100644 --- a/src/test/parse-fail/raw-byte-string-literals.rs +++ b/src/test/parse-fail/raw-byte-string-literals.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error diff --git a/src/test/parse-fail/raw-str-delim.rs b/src/test/parse-fail/raw-str-delim.rs index 8c0027287dece..a2f6b8c8f1074 100644 --- a/src/test/parse-fail/raw-str-delim.rs +++ b/src/test/parse-fail/raw-str-delim.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only static s: &'static str = diff --git a/src/test/parse-fail/raw-str-unbalanced.rs b/src/test/parse-fail/raw-str-unbalanced.rs index 5c09f68970bc4..c38855cf35e74 100644 --- a/src/test/parse-fail/raw-str-unbalanced.rs +++ b/src/test/parse-fail/raw-str-unbalanced.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only static s: &'static str = diff --git a/src/test/parse-fail/raw-str-unterminated.rs b/src/test/parse-fail/raw-str-unterminated.rs index c37239ac42c80..ef35aa47094f9 100644 --- a/src/test/parse-fail/raw-str-unterminated.rs +++ b/src/test/parse-fail/raw-str-unterminated.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only static s: &'static str = diff --git a/src/test/parse-fail/recover-enum.rs b/src/test/parse-fail/recover-enum.rs index 7de3ed10c90fb..a12da5b0d6543 100644 --- a/src/test/parse-fail/recover-enum.rs +++ b/src/test/parse-fail/recover-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error fn main() { diff --git a/src/test/parse-fail/recover-enum2.rs b/src/test/parse-fail/recover-enum2.rs index 6fd32f842f135..b96e427b16cba 100644 --- a/src/test/parse-fail/recover-enum2.rs +++ b/src/test/parse-fail/recover-enum2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error fn main() { diff --git a/src/test/parse-fail/recover-struct.rs b/src/test/parse-fail/recover-struct.rs index 535dd529c0bb4..f27320f402305 100644 --- a/src/test/parse-fail/recover-struct.rs +++ b/src/test/parse-fail/recover-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error fn main() { diff --git a/src/test/parse-fail/regions-out-of-scope-slice.rs b/src/test/parse-fail/regions-out-of-scope-slice.rs index c4601b4de1713..b62259fd2e8f7 100644 --- a/src/test/parse-fail/regions-out-of-scope-slice.rs +++ b/src/test/parse-fail/regions-out-of-scope-slice.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // ignore-test blk region isn't supported in the front-end diff --git a/src/test/parse-fail/removed-syntax-closure-lifetime.rs b/src/test/parse-fail/removed-syntax-closure-lifetime.rs index b305b1894a810..50fde58a35746 100644 --- a/src/test/parse-fail/removed-syntax-closure-lifetime.rs +++ b/src/test/parse-fail/removed-syntax-closure-lifetime.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only type closure = Box; diff --git a/src/test/parse-fail/removed-syntax-enum-newtype.rs b/src/test/parse-fail/removed-syntax-enum-newtype.rs index 6a7f706624dde..d8eb6c4b44095 100644 --- a/src/test/parse-fail/removed-syntax-enum-newtype.rs +++ b/src/test/parse-fail/removed-syntax-enum-newtype.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only enum e = isize; //~ ERROR expected one of `<`, `where`, or `{`, found `=` diff --git a/src/test/parse-fail/removed-syntax-extern-const.rs b/src/test/parse-fail/removed-syntax-extern-const.rs index 27688867de378..c3dbd39abf3c4 100644 --- a/src/test/parse-fail/removed-syntax-extern-const.rs +++ b/src/test/parse-fail/removed-syntax-extern-const.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only extern { diff --git a/src/test/parse-fail/removed-syntax-field-let.rs b/src/test/parse-fail/removed-syntax-field-let.rs index 6deb3bb2e9518..70110bd5529f1 100644 --- a/src/test/parse-fail/removed-syntax-field-let.rs +++ b/src/test/parse-fail/removed-syntax-field-let.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error struct s { diff --git a/src/test/parse-fail/removed-syntax-field-semicolon.rs b/src/test/parse-fail/removed-syntax-field-semicolon.rs index 409b950776939..2ca6fbd48fb9a 100644 --- a/src/test/parse-fail/removed-syntax-field-semicolon.rs +++ b/src/test/parse-fail/removed-syntax-field-semicolon.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only struct s { diff --git a/src/test/parse-fail/removed-syntax-fixed-vec.rs b/src/test/parse-fail/removed-syntax-fixed-vec.rs index 0f34db0885202..5f70c435ba26c 100644 --- a/src/test/parse-fail/removed-syntax-fixed-vec.rs +++ b/src/test/parse-fail/removed-syntax-fixed-vec.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only type v = [isize * 3]; //~ ERROR expected one of `!`, `(`, `+`, `::`, `;`, `<`, or `]`, found `*` diff --git a/src/test/parse-fail/removed-syntax-fn-sigil.rs b/src/test/parse-fail/removed-syntax-fn-sigil.rs index f47ad01d7e129..77735f4fab47f 100644 --- a/src/test/parse-fail/removed-syntax-fn-sigil.rs +++ b/src/test/parse-fail/removed-syntax-fn-sigil.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn f() { diff --git a/src/test/parse-fail/removed-syntax-mode.rs b/src/test/parse-fail/removed-syntax-mode.rs index 6e99f8b3eeadc..207397231d9a3 100644 --- a/src/test/parse-fail/removed-syntax-mode.rs +++ b/src/test/parse-fail/removed-syntax-mode.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn f(+x: isize) {} //~ ERROR expected pattern, found `+` diff --git a/src/test/parse-fail/removed-syntax-mut-vec-expr.rs b/src/test/parse-fail/removed-syntax-mut-vec-expr.rs index 7e5bd27b497cb..f68a1bcf17167 100644 --- a/src/test/parse-fail/removed-syntax-mut-vec-expr.rs +++ b/src/test/parse-fail/removed-syntax-mut-vec-expr.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn f() { diff --git a/src/test/parse-fail/removed-syntax-mut-vec-ty.rs b/src/test/parse-fail/removed-syntax-mut-vec-ty.rs index 0cdf1981a231b..b492a86c9acfa 100644 --- a/src/test/parse-fail/removed-syntax-mut-vec-ty.rs +++ b/src/test/parse-fail/removed-syntax-mut-vec-ty.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only type v = [mut isize]; //~ ERROR expected type, found keyword `mut` diff --git a/src/test/parse-fail/removed-syntax-ptr-lifetime.rs b/src/test/parse-fail/removed-syntax-ptr-lifetime.rs index b91ab8730b3dc..3457b96f36f4d 100644 --- a/src/test/parse-fail/removed-syntax-ptr-lifetime.rs +++ b/src/test/parse-fail/removed-syntax-ptr-lifetime.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only type bptr = &lifetime/isize; //~ ERROR expected one of `!`, `(`, `::`, `;`, or `<`, found `/` diff --git a/src/test/parse-fail/removed-syntax-record.rs b/src/test/parse-fail/removed-syntax-record.rs index fd6f99bdbf9f4..b16a741bee160 100644 --- a/src/test/parse-fail/removed-syntax-record.rs +++ b/src/test/parse-fail/removed-syntax-record.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only type t = { f: () }; //~ ERROR expected type, found `{` diff --git a/src/test/parse-fail/removed-syntax-static-fn.rs b/src/test/parse-fail/removed-syntax-static-fn.rs index 4c0cd3358ddbd..3cb1cd4f6b37c 100644 --- a/src/test/parse-fail/removed-syntax-static-fn.rs +++ b/src/test/parse-fail/removed-syntax-static-fn.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // ignore-tidy-linelength diff --git a/src/test/parse-fail/removed-syntax-uniq-mut-expr.rs b/src/test/parse-fail/removed-syntax-uniq-mut-expr.rs index b16c77ab6b5be..95166bd3875eb 100644 --- a/src/test/parse-fail/removed-syntax-uniq-mut-expr.rs +++ b/src/test/parse-fail/removed-syntax-uniq-mut-expr.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn f() { diff --git a/src/test/parse-fail/removed-syntax-uniq-mut-ty.rs b/src/test/parse-fail/removed-syntax-uniq-mut-ty.rs index 8a47376179dfd..7d9b8af734c07 100644 --- a/src/test/parse-fail/removed-syntax-uniq-mut-ty.rs +++ b/src/test/parse-fail/removed-syntax-uniq-mut-ty.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only type mut_box = Box; //~ ERROR expected one of `>`, lifetime, or type, found `mut` diff --git a/src/test/parse-fail/removed-syntax-with-1.rs b/src/test/parse-fail/removed-syntax-with-1.rs index 156b172a94402..a08baf622d4ee 100644 --- a/src/test/parse-fail/removed-syntax-with-1.rs +++ b/src/test/parse-fail/removed-syntax-with-1.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn removed_with() { diff --git a/src/test/parse-fail/removed-syntax-with-2.rs b/src/test/parse-fail/removed-syntax-with-2.rs index c4354c0760442..22b9ba2a41d10 100644 --- a/src/test/parse-fail/removed-syntax-with-2.rs +++ b/src/test/parse-fail/removed-syntax-with-2.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn removed_with() { diff --git a/src/test/parse-fail/require-parens-for-chained-comparison.rs b/src/test/parse-fail/require-parens-for-chained-comparison.rs index 1ee6996ce9c84..912da96f2da06 100644 --- a/src/test/parse-fail/require-parens-for-chained-comparison.rs +++ b/src/test/parse-fail/require-parens-for-chained-comparison.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn f() {} diff --git a/src/test/parse-fail/struct-field-numeric-shorthand.rs b/src/test/parse-fail/struct-field-numeric-shorthand.rs index 49ba0d8bde625..a6ed6fc69e6a5 100644 --- a/src/test/parse-fail/struct-field-numeric-shorthand.rs +++ b/src/test/parse-fail/struct-field-numeric-shorthand.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only struct Rgb(u8, u8, u8); diff --git a/src/test/parse-fail/struct-literal-in-for.rs b/src/test/parse-fail/struct-literal-in-for.rs index 930984555600b..0dec3d375c3ed 100644 --- a/src/test/parse-fail/struct-literal-in-for.rs +++ b/src/test/parse-fail/struct-literal-in-for.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only struct Foo { diff --git a/src/test/parse-fail/struct-literal-in-if.rs b/src/test/parse-fail/struct-literal-in-if.rs index db6a360a5675a..f69b9b1cbccb4 100644 --- a/src/test/parse-fail/struct-literal-in-if.rs +++ b/src/test/parse-fail/struct-literal-in-if.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only struct Foo { diff --git a/src/test/parse-fail/struct-literal-in-match-discriminant.rs b/src/test/parse-fail/struct-literal-in-match-discriminant.rs index 7038cc798c415..d14276fbf782b 100644 --- a/src/test/parse-fail/struct-literal-in-match-discriminant.rs +++ b/src/test/parse-fail/struct-literal-in-match-discriminant.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only struct Foo { diff --git a/src/test/parse-fail/struct-literal-in-while.rs b/src/test/parse-fail/struct-literal-in-while.rs index 75e4eb3de070b..cd3e640b67ceb 100644 --- a/src/test/parse-fail/struct-literal-in-while.rs +++ b/src/test/parse-fail/struct-literal-in-while.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only struct Foo { diff --git a/src/test/parse-fail/struct-literal-restrictions-in-lamda.rs b/src/test/parse-fail/struct-literal-restrictions-in-lamda.rs index 6b7a26556f430..743b7733a2285 100644 --- a/src/test/parse-fail/struct-literal-restrictions-in-lamda.rs +++ b/src/test/parse-fail/struct-literal-restrictions-in-lamda.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only struct Foo { diff --git a/src/test/parse-fail/tag-variant-disr-non-nullary.rs b/src/test/parse-fail/tag-variant-disr-non-nullary.rs index 2d86589285c1a..55ab871dd333f 100644 --- a/src/test/parse-fail/tag-variant-disr-non-nullary.rs +++ b/src/test/parse-fail/tag-variant-disr-non-nullary.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only //error-pattern: discriminator values can only be used with a field-less enum diff --git a/src/test/parse-fail/trailing-carriage-return-in-string.rs b/src/test/parse-fail/trailing-carriage-return-in-string.rs index dd763dc64c0e8..cbc919516c18e 100644 --- a/src/test/parse-fail/trailing-carriage-return-in-string.rs +++ b/src/test/parse-fail/trailing-carriage-return-in-string.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // ignore-tidy-cr diff --git a/src/test/parse-fail/trait-bounds-not-on-impl.rs b/src/test/parse-fail/trait-bounds-not-on-impl.rs index 7cd2774fe39b2..f89dbb0ed8fb1 100644 --- a/src/test/parse-fail/trait-bounds-not-on-impl.rs +++ b/src/test/parse-fail/trait-bounds-not-on-impl.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error trait Foo { diff --git a/src/test/parse-fail/trait-non-item-macros.rs b/src/test/parse-fail/trait-non-item-macros.rs index 9f94d5d41fda7..958c90b7c0a16 100644 --- a/src/test/parse-fail/trait-non-item-macros.rs +++ b/src/test/parse-fail/trait-non-item-macros.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! bah { ($a:expr) => ($a) //~^ ERROR expected one of `async`, `const`, `extern`, `fn`, `type`, or `unsafe`, found `2` diff --git a/src/test/parse-fail/trait-object-bad-parens.rs b/src/test/parse-fail/trait-object-bad-parens.rs index 25e9c3071d654..4d732b3a7c84b 100644 --- a/src/test/parse-fail/trait-object-bad-parens.rs +++ b/src/test/parse-fail/trait-object-bad-parens.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error fn main() { diff --git a/src/test/parse-fail/trait-object-lifetime-parens.rs b/src/test/parse-fail/trait-object-lifetime-parens.rs index 6be62d966eb94..fef8352e93bef 100644 --- a/src/test/parse-fail/trait-object-lifetime-parens.rs +++ b/src/test/parse-fail/trait-object-lifetime-parens.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error fn f() {} //~ ERROR parenthesized lifetime bounds are not supported diff --git a/src/test/parse-fail/trait-object-macro-matcher.rs b/src/test/parse-fail/trait-object-macro-matcher.rs index 3a5bce509f10e..80d867d3b568e 100644 --- a/src/test/parse-fail/trait-object-macro-matcher.rs +++ b/src/test/parse-fail/trait-object-macro-matcher.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // A single lifetime is not parsed as a type. // `ty` matcher in particular doesn't accept a single lifetime diff --git a/src/test/parse-fail/trait-object-polytrait-priority.rs b/src/test/parse-fail/trait-object-polytrait-priority.rs index b5fc06ddaac05..40d2ad52c3574 100644 --- a/src/test/parse-fail/trait-object-polytrait-priority.rs +++ b/src/test/parse-fail/trait-object-polytrait-priority.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Trait<'a> {} fn main() { diff --git a/src/test/parse-fail/trait-object-trait-parens.rs b/src/test/parse-fail/trait-object-trait-parens.rs index dc44f4f3fb135..75f6a740ede2b 100644 --- a/src/test/parse-fail/trait-object-trait-parens.rs +++ b/src/test/parse-fail/trait-object-trait-parens.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn f Trait<'a>)>() {} diff --git a/src/test/parse-fail/trait-plusequal-splitting.rs b/src/test/parse-fail/trait-plusequal-splitting.rs index cbb955fe61d03..5a9cd50342807 100644 --- a/src/test/parse-fail/trait-plusequal-splitting.rs +++ b/src/test/parse-fail/trait-plusequal-splitting.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // Fixes issue where `+` in generics weren't parsed if they were part of a `+=`. diff --git a/src/test/parse-fail/trait-pub-assoc-const.rs b/src/test/parse-fail/trait-pub-assoc-const.rs index cce6b5c4cbf75..3ee2dc1ae18fb 100644 --- a/src/test/parse-fail/trait-pub-assoc-const.rs +++ b/src/test/parse-fail/trait-pub-assoc-const.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { pub const Foo: u32; //~^ ERROR expected one of `async`, `const`, `extern`, `fn`, `type`, `unsafe`, or `}`, found diff --git a/src/test/parse-fail/trait-pub-assoc-ty.rs b/src/test/parse-fail/trait-pub-assoc-ty.rs index d6a4e5e021d38..042addfd1a434 100644 --- a/src/test/parse-fail/trait-pub-assoc-ty.rs +++ b/src/test/parse-fail/trait-pub-assoc-ty.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { pub type Foo; //~^ ERROR expected one of `async`, `const`, `extern`, `fn`, `type`, `unsafe`, or `}`, found diff --git a/src/test/parse-fail/trait-pub-method.rs b/src/test/parse-fail/trait-pub-method.rs index 286cb4dbff7e1..9675182c1561e 100644 --- a/src/test/parse-fail/trait-pub-method.rs +++ b/src/test/parse-fail/trait-pub-method.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { pub fn foo(); //~^ ERROR expected one of `async`, `const`, `extern`, `fn`, `type`, `unsafe`, or `}`, found diff --git a/src/test/parse-fail/type-parameters-in-field-exprs.rs b/src/test/parse-fail/type-parameters-in-field-exprs.rs index cb018ff1bfa39..1c714c28662c8 100644 --- a/src/test/parse-fail/type-parameters-in-field-exprs.rs +++ b/src/test/parse-fail/type-parameters-in-field-exprs.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error struct Foo { diff --git a/src/test/parse-fail/unbalanced-doublequote.rs b/src/test/parse-fail/unbalanced-doublequote.rs index 8d10f64504a12..56953aaf60b10 100644 --- a/src/test/parse-fail/unbalanced-doublequote.rs +++ b/src/test/parse-fail/unbalanced-doublequote.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only diff --git a/src/test/parse-fail/underscore-suffix-for-float.rs b/src/test/parse-fail/underscore-suffix-for-float.rs index 8327217e6f286..d8c33f4152ff8 100644 --- a/src/test/parse-fail/underscore-suffix-for-float.rs +++ b/src/test/parse-fail/underscore-suffix-for-float.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let a = 42._; //~ ERROR expected identifier, found reserved identifier `_` //~^ ERROR `{integer}` is a primitive type and therefore doesn't have fields diff --git a/src/test/parse-fail/underscore-suffix-for-string.rs b/src/test/parse-fail/underscore-suffix-for-string.rs index 05de5f8e1941b..fa33486aeb23c 100644 --- a/src/test/parse-fail/underscore-suffix-for-string.rs +++ b/src/test/parse-fail/underscore-suffix-for-string.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let _ = "Foo"_; //~^ WARNING underscore literal suffix is not allowed diff --git a/src/test/parse-fail/unicode-chars.rs b/src/test/parse-fail/unicode-chars.rs index f590a7f2aa2eb..8108ea7bd503c 100644 --- a/src/test/parse-fail/unicode-chars.rs +++ b/src/test/parse-fail/unicode-chars.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/parse-fail/unsized.rs b/src/test/parse-fail/unsized.rs index 1bcb5208d7610..0c98af8b37e19 100644 --- a/src/test/parse-fail/unsized.rs +++ b/src/test/parse-fail/unsized.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // Test syntax checks for `type` keyword. diff --git a/src/test/parse-fail/unsized2.rs b/src/test/parse-fail/unsized2.rs index f3af8740be948..5f566b97b3d41 100644 --- a/src/test/parse-fail/unsized2.rs +++ b/src/test/parse-fail/unsized2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // Test syntax checks for `type` keyword. diff --git a/src/test/parse-fail/use-as-where-use-ends-with-mod-sep.rs b/src/test/parse-fail/use-as-where-use-ends-with-mod-sep.rs index 9e16e29ba50b3..f9302fef1aaf9 100644 --- a/src/test/parse-fail/use-as-where-use-ends-with-mod-sep.rs +++ b/src/test/parse-fail/use-as-where-use-ends-with-mod-sep.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error use std::any:: as foo; //~ ERROR expected identifier, found keyword `as` diff --git a/src/test/parse-fail/use-ends-with-mod-sep.rs b/src/test/parse-fail/use-ends-with-mod-sep.rs index e6a10d43e2994..8606ca3c308c0 100644 --- a/src/test/parse-fail/use-ends-with-mod-sep.rs +++ b/src/test/parse-fail/use-ends-with-mod-sep.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only use std::any::; //~ ERROR expected identifier, found `;` diff --git a/src/test/parse-fail/variadic-ffi-3.rs b/src/test/parse-fail/variadic-ffi-3.rs index d202fa33cc1e3..678e95147c30d 100644 --- a/src/test/parse-fail/variadic-ffi-3.rs +++ b/src/test/parse-fail/variadic-ffi-3.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn foo(x: isize, ...) { diff --git a/src/test/parse-fail/variadic-ffi-4.rs b/src/test/parse-fail/variadic-ffi-4.rs index ef9d4558f687d..5ff2ceadb07ca 100644 --- a/src/test/parse-fail/variadic-ffi-4.rs +++ b/src/test/parse-fail/variadic-ffi-4.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only extern "C" fn foo(x: isize, ...) { diff --git a/src/test/parse-fail/virtual-structs.rs b/src/test/parse-fail/virtual-structs.rs index f34eddc93c570..a84914ccec516 100644 --- a/src/test/parse-fail/virtual-structs.rs +++ b/src/test/parse-fail/virtual-structs.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // Test diagnostics for the removed struct inheritance feature. diff --git a/src/test/parse-fail/where-clauses-no-bounds-or-predicates.rs b/src/test/parse-fail/where-clauses-no-bounds-or-predicates.rs index cf67b518fff91..6148c077210d5 100644 --- a/src/test/parse-fail/where-clauses-no-bounds-or-predicates.rs +++ b/src/test/parse-fail/where-clauses-no-bounds-or-predicates.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error // Empty predicate list is OK diff --git a/src/test/parse-fail/where_with_bound.rs b/src/test/parse-fail/where_with_bound.rs index 2948619ccd07d..2f0caec0376bb 100644 --- a/src/test/parse-fail/where_with_bound.rs +++ b/src/test/parse-fail/where_with_bound.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn foo() where ::Item: ToString, T: Iterator { } diff --git a/src/test/parse-fail/wrong-escape-of-curly-braces.rs b/src/test/parse-fail/wrong-escape-of-curly-braces.rs index d86bf726cbd6e..d751d25c6b32b 100644 --- a/src/test/parse-fail/wrong-escape-of-curly-braces.rs +++ b/src/test/parse-fail/wrong-escape-of-curly-braces.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn f() { let ok = "{{everything fine}}"; let bad = "\{it is wrong\}"; diff --git a/src/test/pretty/asm-clobbers.rs b/src/test/pretty/asm-clobbers.rs index c72add8d3d68a..1bc9f008bbbf9 100644 --- a/src/test/pretty/asm-clobbers.rs +++ b/src/test/pretty/asm-clobbers.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(asm)] pub fn main() { unsafe { asm!("" : : : "hello", "world") }; } diff --git a/src/test/pretty/asm-options.rs b/src/test/pretty/asm-options.rs index bc9f89a3d15ff..5c2bbd9edd931 100644 --- a/src/test/pretty/asm-options.rs +++ b/src/test/pretty/asm-options.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(asm)] // pp-exact diff --git a/src/test/pretty/attr-derive.rs b/src/test/pretty/attr-derive.rs index a1c581a18682c..6fa39528ba542 100644 --- a/src/test/pretty/attr-derive.rs +++ b/src/test/pretty/attr-derive.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:derive-foo.rs // ignore-stage1 // pp-exact diff --git a/src/test/pretty/attr-fn-inner.rs b/src/test/pretty/attr-fn-inner.rs index 79964d2a7baca..f13339e334c6e 100644 --- a/src/test/pretty/attr-fn-inner.rs +++ b/src/test/pretty/attr-fn-inner.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pp-exact // Testing that both the inner item and next outer item are // preserved, and that the first outer item parsed in main is not diff --git a/src/test/pretty/attr-literals.rs b/src/test/pretty/attr-literals.rs index 73aa31699630c..355f3d5a3cfb8 100644 --- a/src/test/pretty/attr-literals.rs +++ b/src/test/pretty/attr-literals.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pp-exact // Tests literals in attributes. diff --git a/src/test/pretty/auto-trait.rs b/src/test/pretty/auto-trait.rs index 842af49e8a7f9..2eb4d3390be57 100644 --- a/src/test/pretty/auto-trait.rs +++ b/src/test/pretty/auto-trait.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] // pp-exact diff --git a/src/test/pretty/auxiliary/derive-foo.rs b/src/test/pretty/auxiliary/derive-foo.rs index bd81d3e5a3b53..f46759363fecb 100644 --- a/src/test/pretty/auxiliary/derive-foo.rs +++ b/src/test/pretty/auxiliary/derive-foo.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/pretty/blank-lines.rs b/src/test/pretty/blank-lines.rs index e78f8f5fc9f79..b9153d0482c88 100644 --- a/src/test/pretty/blank-lines.rs +++ b/src/test/pretty/blank-lines.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --crate-type=lib // pp-exact diff --git a/src/test/pretty/block-comment-multiple-asterisks.rs b/src/test/pretty/block-comment-multiple-asterisks.rs index fbdafef29d878..bb090b7463677 100644 --- a/src/test/pretty/block-comment-multiple-asterisks.rs +++ b/src/test/pretty/block-comment-multiple-asterisks.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --crate-type=lib // pp-exact diff --git a/src/test/pretty/block-comment-trailing-whitespace.rs b/src/test/pretty/block-comment-trailing-whitespace.rs index 50f1b035bb2c4..4d502f603d1d7 100644 --- a/src/test/pretty/block-comment-trailing-whitespace.rs +++ b/src/test/pretty/block-comment-trailing-whitespace.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --crate-type=lib // pp-exact diff --git a/src/test/pretty/block-comment-trailing-whitespace2.rs b/src/test/pretty/block-comment-trailing-whitespace2.rs index 99c6ca43294ae..b7c42e39557c9 100644 --- a/src/test/pretty/block-comment-trailing-whitespace2.rs +++ b/src/test/pretty/block-comment-trailing-whitespace2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --crate-type=lib // pp-exact diff --git a/src/test/pretty/block-comment-wchar.rs b/src/test/pretty/block-comment-wchar.rs index 6f4a95e7c9b00..93373c5da6558 100644 --- a/src/test/pretty/block-comment-wchar.rs +++ b/src/test/pretty/block-comment-wchar.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This is meant as a test case for Issue 3961. // // Test via: rustc --pretty normal src/test/pretty/block-comment-wchar.rs diff --git a/src/test/pretty/block-disambig.rs b/src/test/pretty/block-disambig.rs index c645a66b70efc..0878c6fdeb255 100644 --- a/src/test/pretty/block-disambig.rs +++ b/src/test/pretty/block-disambig.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --crate-type=lib // A bunch of tests for syntactic forms involving blocks that were diff --git a/src/test/pretty/cast-lt.rs b/src/test/pretty/cast-lt.rs index ca4c364c63157..e14bdd1f3b3ec 100644 --- a/src/test/pretty/cast-lt.rs +++ b/src/test/pretty/cast-lt.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-compare-only // pretty-mode:expanded // pp-exact:cast-lt.pp diff --git a/src/test/pretty/closure-reform-pretty.rs b/src/test/pretty/closure-reform-pretty.rs index a1fdebf6fa1c0..ef5189fa13ee1 100644 --- a/src/test/pretty/closure-reform-pretty.rs +++ b/src/test/pretty/closure-reform-pretty.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Any copyright is dedicated to the Public Domain. // http://creativecommons.org/publicdomain/zero/1.0/ diff --git a/src/test/pretty/disamb-stmt-expr.rs b/src/test/pretty/disamb-stmt-expr.rs index 610d9a7782d2a..601ca7bb6de1c 100644 --- a/src/test/pretty/disamb-stmt-expr.rs +++ b/src/test/pretty/disamb-stmt-expr.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pp-exact // Here we check that the parentheses around the body of `wsucc()` are diff --git a/src/test/pretty/do1.rs b/src/test/pretty/do1.rs index c9501e8166f14..7be835cb22f2d 100644 --- a/src/test/pretty/do1.rs +++ b/src/test/pretty/do1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pp-exact fn f(f: F) where F: Fn(isize) { f(10) } diff --git a/src/test/pretty/doc-comments.rs b/src/test/pretty/doc-comments.rs index 62cadd7cc3e73..2a98c9fc05897 100644 --- a/src/test/pretty/doc-comments.rs +++ b/src/test/pretty/doc-comments.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --crate-type=lib // pp-exact diff --git a/src/test/pretty/empty-impl.rs b/src/test/pretty/empty-impl.rs index 74445c9432d61..d570933592a06 100644 --- a/src/test/pretty/empty-impl.rs +++ b/src/test/pretty/empty-impl.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --crate-type=lib trait X { fn dummy(&self) { } } diff --git a/src/test/pretty/empty-lines.rs b/src/test/pretty/empty-lines.rs index cc5f5a83a467a..15d7625d4e7cc 100644 --- a/src/test/pretty/empty-lines.rs +++ b/src/test/pretty/empty-lines.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --crate-type=lib // Issue #759 diff --git a/src/test/pretty/example1.rs b/src/test/pretty/example1.rs index 394fd64bcc419..4f7d5e7e71e17 100644 --- a/src/test/pretty/example1.rs +++ b/src/test/pretty/example1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pp-exact fn main() { } diff --git a/src/test/pretty/example2.rs b/src/test/pretty/example2.rs index 94f62d8647e55..852b9f316ce0f 100644 --- a/src/test/pretty/example2.rs +++ b/src/test/pretty/example2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pp-exact:example2.pp fn main() { } diff --git a/src/test/pretty/fn-return.rs b/src/test/pretty/fn-return.rs index 8a223296e5467..142d852cd6a13 100644 --- a/src/test/pretty/fn-return.rs +++ b/src/test/pretty/fn-return.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pp-exact // Check that `fn f() -> () { }` does not print as `fn f() { }`. diff --git a/src/test/pretty/fn-types.rs b/src/test/pretty/fn-types.rs index 31efb0c9ab1eb..842138e28c353 100644 --- a/src/test/pretty/fn-types.rs +++ b/src/test/pretty/fn-types.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pp-exact fn from_foreign_fn(_x: fn()) { } diff --git a/src/test/pretty/for-comment.rs b/src/test/pretty/for-comment.rs index 32837fbcf87bc..447e7f918c224 100644 --- a/src/test/pretty/for-comment.rs +++ b/src/test/pretty/for-comment.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --crate-type=lib // pp-exact diff --git a/src/test/pretty/import-renames.rs b/src/test/pretty/import-renames.rs index 311835eba1b96..ce6b5058ba6b4 100644 --- a/src/test/pretty/import-renames.rs +++ b/src/test/pretty/import-renames.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --crate-type=lib // pp-exact diff --git a/src/test/pretty/issue-19077.rs b/src/test/pretty/issue-19077.rs index 61274385857fe..b42791113056e 100644 --- a/src/test/pretty/issue-19077.rs +++ b/src/test/pretty/issue-19077.rs @@ -1,12 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // Testing that unsafe blocks in match arms are followed by a comma // pp-exact diff --git a/src/test/pretty/issue-25031.rs b/src/test/pretty/issue-25031.rs index 6c5a847869e4c..d91494891d4da 100644 --- a/src/test/pretty/issue-25031.rs +++ b/src/test/pretty/issue-25031.rs @@ -1,12 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // Testing that type items with where clauses output correctly. diff --git a/src/test/pretty/issue-30731.rs b/src/test/pretty/issue-30731.rs index cd72ae9843351..ee81cce864171 100644 --- a/src/test/pretty/issue-30731.rs +++ b/src/test/pretty/issue-30731.rs @@ -1,12 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // Test pretty printing of macro with braces but without terminating semicolon, // this used to panic before fix. diff --git a/src/test/pretty/issue-31073.rs b/src/test/pretty/issue-31073.rs index 872923f8caf93..75795f6d56895 100644 --- a/src/test/pretty/issue-31073.rs +++ b/src/test/pretty/issue-31073.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pp-exact:issue-31073.pp fn main() { diff --git a/src/test/pretty/issue-4264.rs b/src/test/pretty/issue-4264.rs index 6d52ad3ff1e1f..3dea811298180 100644 --- a/src/test/pretty/issue-4264.rs +++ b/src/test/pretty/issue-4264.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-compare-only // pretty-mode:hir,typed // pp-exact:issue-4264.pp diff --git a/src/test/pretty/let.rs b/src/test/pretty/let.rs index 736ea3a0d10ad..20ffb75781829 100644 --- a/src/test/pretty/let.rs +++ b/src/test/pretty/let.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pp-exact // Check that `let x: _ = 0;` does not print as `let x = 0;`. diff --git a/src/test/pretty/lifetime.rs b/src/test/pretty/lifetime.rs index 2cc7153b7f5ce..bfef51202dbe1 100644 --- a/src/test/pretty/lifetime.rs +++ b/src/test/pretty/lifetime.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pp-exact fn f1<'a, 'b, 'c>(_x: &'a u32, _y: &'b u32, _z: &'c u32) where 'c: 'a + 'b { } diff --git a/src/test/pretty/match-block-expr.rs b/src/test/pretty/match-block-expr.rs index 7751f155da487..0db6574b0737f 100644 --- a/src/test/pretty/match-block-expr.rs +++ b/src/test/pretty/match-block-expr.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pp-exact fn main() { diff --git a/src/test/pretty/match-naked-expr-medium.rs b/src/test/pretty/match-naked-expr-medium.rs index 39af19dbf6f36..a124fdff3900d 100644 --- a/src/test/pretty/match-naked-expr-medium.rs +++ b/src/test/pretty/match-naked-expr-medium.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pp-exact fn main() { diff --git a/src/test/pretty/match-naked-expr.rs b/src/test/pretty/match-naked-expr.rs index 02bbf667d96bc..7c16bbefe3c26 100644 --- a/src/test/pretty/match-naked-expr.rs +++ b/src/test/pretty/match-naked-expr.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pp-exact fn main() { diff --git a/src/test/pretty/path-type-bounds.rs b/src/test/pretty/path-type-bounds.rs index ae6a0fc314226..3072e416cbeef 100644 --- a/src/test/pretty/path-type-bounds.rs +++ b/src/test/pretty/path-type-bounds.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pp-exact diff --git a/src/test/pretty/raw-str-nonexpr.rs b/src/test/pretty/raw-str-nonexpr.rs index bce78e4f4c1f8..cb23124f2103f 100644 --- a/src/test/pretty/raw-str-nonexpr.rs +++ b/src/test/pretty/raw-str-nonexpr.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pp-exact #![feature(asm)] diff --git a/src/test/pretty/stmt_expr_attributes.rs b/src/test/pretty/stmt_expr_attributes.rs index b34e18520793a..eb1768683e6e9 100644 --- a/src/test/pretty/stmt_expr_attributes.rs +++ b/src/test/pretty/stmt_expr_attributes.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pp-exact #![feature(custom_attribute)] diff --git a/src/test/pretty/struct-pattern.rs b/src/test/pretty/struct-pattern.rs index b0795bb08f361..6acb2e27f4fa4 100644 --- a/src/test/pretty/struct-pattern.rs +++ b/src/test/pretty/struct-pattern.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pp-exact // pretty-compare-only // Testing that shorthand struct patterns are preserved diff --git a/src/test/pretty/struct-tuple.rs b/src/test/pretty/struct-tuple.rs index 82d430b270136..77e064b4fa41f 100644 --- a/src/test/pretty/struct-tuple.rs +++ b/src/test/pretty/struct-tuple.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pp-exact struct Foo; struct Bar(isize, isize); diff --git a/src/test/pretty/tag-blank-lines.rs b/src/test/pretty/tag-blank-lines.rs index 29a3b965251ec..28ed4fccaf26b 100644 --- a/src/test/pretty/tag-blank-lines.rs +++ b/src/test/pretty/tag-blank-lines.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pp-exact enum foo { diff --git a/src/test/pretty/top-level-doc-comments.rs b/src/test/pretty/top-level-doc-comments.rs index 59c7f0fe0de84..16f95d334cbcf 100644 --- a/src/test/pretty/top-level-doc-comments.rs +++ b/src/test/pretty/top-level-doc-comments.rs @@ -3,15 +3,8 @@ struct X; // ignore-license -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // pp-exact diff --git a/src/test/pretty/trait-polarity.rs b/src/test/pretty/trait-polarity.rs index 7d3a921301e34..3aab99bf6a0ae 100644 --- a/src/test/pretty/trait-polarity.rs +++ b/src/test/pretty/trait-polarity.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] // pp-exact diff --git a/src/test/pretty/trait-safety.rs b/src/test/pretty/trait-safety.rs index 95dfc751ff5a0..b2f2d610c3122 100644 --- a/src/test/pretty/trait-safety.rs +++ b/src/test/pretty/trait-safety.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pp-exact unsafe trait UnsafeTrait { diff --git a/src/test/pretty/unary-op-disambig.rs b/src/test/pretty/unary-op-disambig.rs index 133c567a74aa2..0c57e0a337175 100644 --- a/src/test/pretty/unary-op-disambig.rs +++ b/src/test/pretty/unary-op-disambig.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --crate-type=lib // Preserve semicolons that disambiguate unops diff --git a/src/test/pretty/vec-comments.rs b/src/test/pretty/vec-comments.rs index dc2dae1044dac..a150cf0b8ea8a 100644 --- a/src/test/pretty/vec-comments.rs +++ b/src/test/pretty/vec-comments.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #679 // Testing that comments are correctly interleaved // pp-exact:vec-comments.pp diff --git a/src/test/pretty/where-clauses.rs b/src/test/pretty/where-clauses.rs index 388064a8be854..3d6e431a11a9a 100644 --- a/src/test/pretty/where-clauses.rs +++ b/src/test/pretty/where-clauses.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pp-exact fn f<'a, 'b, T>(t: T) -> isize where T: 'a, 'a: 'b, T: Eq { 0 } diff --git a/src/test/run-fail-fulldeps/qquote.rs b/src/test/run-fail-fulldeps/qquote.rs index d757dd97e94b6..d0e0521672878 100644 --- a/src/test/run-fail-fulldeps/qquote.rs +++ b/src/test/run-fail-fulldeps/qquote.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cross-compile // error-pattern:expected expression, found statement (`let`) diff --git a/src/test/run-fail/adjust_never.rs b/src/test/run-fail/adjust_never.rs index da68dc39f85d7..8661a2f80a7ba 100644 --- a/src/test/run-fail/adjust_never.rs +++ b/src/test/run-fail/adjust_never.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that a variable of type ! can coerce to another type. // error-pattern:explicit diff --git a/src/test/run-fail/args-panic.rs b/src/test/run-fail/args-panic.rs index 3eca89fbed331..9a62652dde1e1 100644 --- a/src/test/run-fail/args-panic.rs +++ b/src/test/run-fail/args-panic.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // error-pattern:meep #![feature(box_syntax)] diff --git a/src/test/run-fail/assert-as-macro.rs b/src/test/run-fail/assert-as-macro.rs index c52c11b1b9188..f715e21f781bd 100644 --- a/src/test/run-fail/assert-as-macro.rs +++ b/src/test/run-fail/assert-as-macro.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:assertion failed: 1 == 2 fn main() { diff --git a/src/test/run-fail/assert-eq-macro-panic.rs b/src/test/run-fail/assert-eq-macro-panic.rs index fed2ee0beab29..863fec12d7475 100644 --- a/src/test/run-fail/assert-eq-macro-panic.rs +++ b/src/test/run-fail/assert-eq-macro-panic.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:assertion failed: `(left == right)` // error-pattern: left: `14` // error-pattern:right: `15` diff --git a/src/test/run-fail/assert-macro-explicit.rs b/src/test/run-fail/assert-macro-explicit.rs index 197ed59c07f44..3689323c999d6 100644 --- a/src/test/run-fail/assert-macro-explicit.rs +++ b/src/test/run-fail/assert-macro-explicit.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:panicked at 'assertion failed: false' fn main() { diff --git a/src/test/run-fail/assert-macro-fmt.rs b/src/test/run-fail/assert-macro-fmt.rs index 78239a2217e6b..9fbfb085c2fa5 100644 --- a/src/test/run-fail/assert-macro-fmt.rs +++ b/src/test/run-fail/assert-macro-fmt.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:panicked at 'test-assert-fmt 42 rust' fn main() { diff --git a/src/test/run-fail/assert-macro-owned.rs b/src/test/run-fail/assert-macro-owned.rs index e68aef10de891..bd58d35eb719f 100644 --- a/src/test/run-fail/assert-macro-owned.rs +++ b/src/test/run-fail/assert-macro-owned.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:panicked at 'test-assert-owned' fn main() { diff --git a/src/test/run-fail/assert-macro-static.rs b/src/test/run-fail/assert-macro-static.rs index 59be468e0cb90..650aaeab4f66f 100644 --- a/src/test/run-fail/assert-macro-static.rs +++ b/src/test/run-fail/assert-macro-static.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:panicked at 'test-assert-static' fn main() { diff --git a/src/test/run-fail/assert-ne-macro-panic.rs b/src/test/run-fail/assert-ne-macro-panic.rs index d57bb0fb67fb0..f55ef2b3ff5ca 100644 --- a/src/test/run-fail/assert-ne-macro-panic.rs +++ b/src/test/run-fail/assert-ne-macro-panic.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:assertion failed: `(left != right)` // error-pattern: left: `14` // error-pattern:right: `14` diff --git a/src/test/run-fail/binop-fail-3.rs b/src/test/run-fail/binop-fail-3.rs index efbc49fbece92..a7696fffda0c2 100644 --- a/src/test/run-fail/binop-fail-3.rs +++ b/src/test/run-fail/binop-fail-3.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:quux fn foo() -> ! { panic!("quux"); diff --git a/src/test/run-fail/binop-panic.rs b/src/test/run-fail/binop-panic.rs index fb2db7ea9985c..dba5cecc67e11 100644 --- a/src/test/run-fail/binop-panic.rs +++ b/src/test/run-fail/binop-panic.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:quux fn my_err(s: String) -> ! { println!("{}", s); diff --git a/src/test/run-fail/borrowck-local-borrow.rs b/src/test/run-fail/borrowck-local-borrow.rs index daee3903d770d..cb17a6305624b 100644 --- a/src/test/run-fail/borrowck-local-borrow.rs +++ b/src/test/run-fail/borrowck-local-borrow.rs @@ -1,12 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // error-pattern:panic 1 // revisions: ast mir diff --git a/src/test/run-fail/bounds-check-no-overflow.rs b/src/test/run-fail/bounds-check-no-overflow.rs index 3d1cbb446e848..3943f87f7fe0c 100644 --- a/src/test/run-fail/bounds-check-no-overflow.rs +++ b/src/test/run-fail/bounds-check-no-overflow.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:index out of bounds use std::usize; diff --git a/src/test/run-fail/bug-2470-bounds-check-overflow.rs b/src/test/run-fail/bug-2470-bounds-check-overflow.rs index 4a294d8fabc38..b4e3f24699118 100644 --- a/src/test/run-fail/bug-2470-bounds-check-overflow.rs +++ b/src/test/run-fail/bug-2470-bounds-check-overflow.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:index out of bounds use std::mem; diff --git a/src/test/run-fail/bug-811.rs b/src/test/run-fail/bug-811.rs index c0e02ccd61be2..e36ec0f59010b 100644 --- a/src/test/run-fail/bug-811.rs +++ b/src/test/run-fail/bug-811.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:quux use std::marker::PhantomData; diff --git a/src/test/run-fail/call-fn-never-arg.rs b/src/test/run-fail/call-fn-never-arg.rs index 95101e70db951..d21a43ec5c50a 100644 --- a/src/test/run-fail/call-fn-never-arg.rs +++ b/src/test/run-fail/call-fn-never-arg.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we can use a ! for an argument of type ! // error-pattern:wowzers! diff --git a/src/test/run-fail/cast-never.rs b/src/test/run-fail/cast-never.rs index 8f7b0c40538f9..3620ddee47869 100644 --- a/src/test/run-fail/cast-never.rs +++ b/src/test/run-fail/cast-never.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we can explicitly cast ! to another type // error-pattern:explicit diff --git a/src/test/run-fail/die-macro-expr.rs b/src/test/run-fail/die-macro-expr.rs index 16aa4d48d911f..70413f978969c 100644 --- a/src/test/run-fail/die-macro-expr.rs +++ b/src/test/run-fail/die-macro-expr.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:test fn main() { diff --git a/src/test/run-fail/die-macro-pure.rs b/src/test/run-fail/die-macro-pure.rs index b54bf1c0c68d6..cec0742d5035b 100644 --- a/src/test/run-fail/die-macro-pure.rs +++ b/src/test/run-fail/die-macro-pure.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:test fn f() { diff --git a/src/test/run-fail/die-macro.rs b/src/test/run-fail/die-macro.rs index 811bd6e037dd4..846b9ea24d3b7 100644 --- a/src/test/run-fail/die-macro.rs +++ b/src/test/run-fail/die-macro.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:test fn main() { diff --git a/src/test/run-fail/diverging-closure.rs b/src/test/run-fail/diverging-closure.rs index 6b98e0397b5a3..a92e07a21fe4f 100644 --- a/src/test/run-fail/diverging-closure.rs +++ b/src/test/run-fail/diverging-closure.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:oops fn main() { diff --git a/src/test/run-fail/divide-by-zero.rs b/src/test/run-fail/divide-by-zero.rs index 1f9e069526ce9..fdb3f4842e50a 100644 --- a/src/test/run-fail/divide-by-zero.rs +++ b/src/test/run-fail/divide-by-zero.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:attempt to divide by zero fn main() { diff --git a/src/test/run-fail/doublepanic.rs b/src/test/run-fail/doublepanic.rs index 936ebd9689737..10d303e491e44 100644 --- a/src/test/run-fail/doublepanic.rs +++ b/src/test/run-fail/doublepanic.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unreachable_code)] // error-pattern:One diff --git a/src/test/run-fail/dst-raw-slice.rs b/src/test/run-fail/dst-raw-slice.rs index 77cec8b632728..561b1fb42ed06 100644 --- a/src/test/run-fail/dst-raw-slice.rs +++ b/src/test/run-fail/dst-raw-slice.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test bounds checking for DST raw slices // error-pattern:index out of bounds diff --git a/src/test/run-fail/explicit-panic-msg.rs b/src/test/run-fail/explicit-panic-msg.rs index 907fae02b419b..35e0518b9be57 100644 --- a/src/test/run-fail/explicit-panic-msg.rs +++ b/src/test/run-fail/explicit-panic-msg.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_assignments)] #![allow(unused_variables)] diff --git a/src/test/run-fail/explicit-panic.rs b/src/test/run-fail/explicit-panic.rs index 928e7326b66cd..11ea6b4122128 100644 --- a/src/test/run-fail/explicit-panic.rs +++ b/src/test/run-fail/explicit-panic.rs @@ -1,16 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - // error-pattern:explicit fn main() { panic!(); diff --git a/src/test/run-fail/expr-fn-panic.rs b/src/test/run-fail/expr-fn-panic.rs index f7a889754257b..0532c32ec7028 100644 --- a/src/test/run-fail/expr-fn-panic.rs +++ b/src/test/run-fail/expr-fn-panic.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:explicit panic fn f() -> ! { diff --git a/src/test/run-fail/expr-if-panic-fn.rs b/src/test/run-fail/expr-if-panic-fn.rs index a8ec8f3f41462..660b1396e38a9 100644 --- a/src/test/run-fail/expr-if-panic-fn.rs +++ b/src/test/run-fail/expr-if-panic-fn.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:explicit panic fn f() -> ! { diff --git a/src/test/run-fail/expr-if-panic.rs b/src/test/run-fail/expr-if-panic.rs index 25bf43751f0b3..36aaf459a56ee 100644 --- a/src/test/run-fail/expr-if-panic.rs +++ b/src/test/run-fail/expr-if-panic.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:explicit panic fn main() { diff --git a/src/test/run-fail/expr-match-panic-fn.rs b/src/test/run-fail/expr-match-panic-fn.rs index 6758ac6c4d4d8..120df61b4bfe6 100644 --- a/src/test/run-fail/expr-match-panic-fn.rs +++ b/src/test/run-fail/expr-match-panic-fn.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:explicit panic fn f() -> ! { diff --git a/src/test/run-fail/expr-match-panic.rs b/src/test/run-fail/expr-match-panic.rs index 8876fb1f49b82..b2f0179a08323 100644 --- a/src/test/run-fail/expr-match-panic.rs +++ b/src/test/run-fail/expr-match-panic.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:explicit panic fn main() { diff --git a/src/test/run-fail/fmt-panic.rs b/src/test/run-fail/fmt-panic.rs index 22e81480867a9..5749991914c02 100644 --- a/src/test/run-fail/fmt-panic.rs +++ b/src/test/run-fail/fmt-panic.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:meh fn main() { diff --git a/src/test/run-fail/for-each-loop-panic.rs b/src/test/run-fail/for-each-loop-panic.rs index a462d83601921..d24e81e152c3c 100644 --- a/src/test/run-fail/for-each-loop-panic.rs +++ b/src/test/run-fail/for-each-loop-panic.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:moop fn main() { diff --git a/src/test/run-fail/glob-use-std.rs b/src/test/run-fail/glob-use-std.rs index a7ba283b25af3..d19a782986b16 100644 --- a/src/test/run-fail/glob-use-std.rs +++ b/src/test/run-fail/glob-use-std.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #7580 // error-pattern:panic works diff --git a/src/test/run-fail/hashmap-capacity-overflow.rs b/src/test/run-fail/hashmap-capacity-overflow.rs index 2c7c0875227d9..038f2756ff322 100644 --- a/src/test/run-fail/hashmap-capacity-overflow.rs +++ b/src/test/run-fail/hashmap-capacity-overflow.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:capacity overflow use std::collections::hash_map::HashMap; diff --git a/src/test/run-fail/if-check-panic.rs b/src/test/run-fail/if-check-panic.rs index f8b2d11cb646d..f9a4b8fcb38a5 100644 --- a/src/test/run-fail/if-check-panic.rs +++ b/src/test/run-fail/if-check-panic.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:Number is odd fn even(x: usize) -> bool { if x < 2 { diff --git a/src/test/run-fail/if-cond-bot.rs b/src/test/run-fail/if-cond-bot.rs index 203bc8fc65ff8..c680cad258f24 100644 --- a/src/test/run-fail/if-cond-bot.rs +++ b/src/test/run-fail/if-cond-bot.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:quux fn my_err(s: String) -> ! { println!("{}", s); diff --git a/src/test/run-fail/issue-12920.rs b/src/test/run-fail/issue-12920.rs index 39a819f3d5204..0819e992d1378 100644 --- a/src/test/run-fail/issue-12920.rs +++ b/src/test/run-fail/issue-12920.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:explicit panic pub fn main() { diff --git a/src/test/run-fail/issue-13202.rs b/src/test/run-fail/issue-13202.rs index 57b7dfc1eecd6..cf3a6b3d986f5 100644 --- a/src/test/run-fail/issue-13202.rs +++ b/src/test/run-fail/issue-13202.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:bad input fn main() { diff --git a/src/test/run-fail/issue-18576.rs b/src/test/run-fail/issue-18576.rs index 88fb8f1b0c4cc..ca9d1e5f5e7de 100644 --- a/src/test/run-fail/issue-18576.rs +++ b/src/test/run-fail/issue-18576.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:stop // #18576 diff --git a/src/test/run-fail/issue-20971.rs b/src/test/run-fail/issue-20971.rs index e433a45731f95..6c2de783c0166 100644 --- a/src/test/run-fail/issue-20971.rs +++ b/src/test/run-fail/issue-20971.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for Issue #20971. // error-pattern:Hello, world! diff --git a/src/test/run-fail/issue-23354-2.rs b/src/test/run-fail/issue-23354-2.rs index b120d3222fa21..8f7baff56dc55 100644 --- a/src/test/run-fail/issue-23354-2.rs +++ b/src/test/run-fail/issue-23354-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:panic evaluated #[allow(unused_variables)] diff --git a/src/test/run-fail/issue-23354.rs b/src/test/run-fail/issue-23354.rs index f6b937c82595b..4c2fb022a6bf6 100644 --- a/src/test/run-fail/issue-23354.rs +++ b/src/test/run-fail/issue-23354.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:panic evaluated #[allow(unused_variables)] diff --git a/src/test/run-fail/issue-2444.rs b/src/test/run-fail/issue-2444.rs index f55b1ba03dee8..17f89e4d20d3e 100644 --- a/src/test/run-fail/issue-2444.rs +++ b/src/test/run-fail/issue-2444.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:explicit panic use std::sync::Arc; diff --git a/src/test/run-fail/issue-2761.rs b/src/test/run-fail/issue-2761.rs index 95050a4dcf19e..84d90930d2d23 100644 --- a/src/test/run-fail/issue-2761.rs +++ b/src/test/run-fail/issue-2761.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:custom message fn main() { diff --git a/src/test/run-fail/issue-28934.rs b/src/test/run-fail/issue-28934.rs index b32a504cb6bee..5915372b6920f 100644 --- a/src/test/run-fail/issue-28934.rs +++ b/src/test/run-fail/issue-28934.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test: issue had to do with "givens" in region inference, // which were not being considered during the contraction phase. diff --git a/src/test/run-fail/issue-29798.rs b/src/test/run-fail/issue-29798.rs index a77175975f941..297e1c028c446 100644 --- a/src/test/run-fail/issue-29798.rs +++ b/src/test/run-fail/issue-29798.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:index out of bounds: the len is 5 but the index is 5 #![feature(const_fn)] diff --git a/src/test/run-fail/issue-3029.rs b/src/test/run-fail/issue-3029.rs index 1ada7771cd66c..face808b68ff3 100644 --- a/src/test/run-fail/issue-3029.rs +++ b/src/test/run-fail/issue-3029.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_allocation)] #![allow(unreachable_code)] #![allow(unused_variables)] diff --git a/src/test/run-fail/issue-30380.rs b/src/test/run-fail/issue-30380.rs index 7bd9adcba9bd1..036071a89c7a4 100644 --- a/src/test/run-fail/issue-30380.rs +++ b/src/test/run-fail/issue-30380.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // check that panics in destructors during assignment do not leave // destroyed values lying around for other destructors to observe. diff --git a/src/test/run-fail/issue-44216-add-instant.rs b/src/test/run-fail/issue-44216-add-instant.rs index e17d23d925a8b..76ad0a3d41bf8 100644 --- a/src/test/run-fail/issue-44216-add-instant.rs +++ b/src/test/run-fail/issue-44216-add-instant.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:overflow use std::time::{Instant, Duration}; diff --git a/src/test/run-fail/issue-44216-add-system-time.rs b/src/test/run-fail/issue-44216-add-system-time.rs index 4a0c9c7d65e9e..aa861f7d5993e 100644 --- a/src/test/run-fail/issue-44216-add-system-time.rs +++ b/src/test/run-fail/issue-44216-add-system-time.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:overflow use std::time::{Duration, SystemTime}; diff --git a/src/test/run-fail/issue-44216-sub-instant.rs b/src/test/run-fail/issue-44216-sub-instant.rs index 6cc38cfec8319..8bc1f47ae2d96 100644 --- a/src/test/run-fail/issue-44216-sub-instant.rs +++ b/src/test/run-fail/issue-44216-sub-instant.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:overflow use std::time::{Instant, Duration}; diff --git a/src/test/run-fail/issue-44216-sub-system-time.rs b/src/test/run-fail/issue-44216-sub-system-time.rs index bcf60126f0f23..37ab0e7c3f99f 100644 --- a/src/test/run-fail/issue-44216-sub-system-time.rs +++ b/src/test/run-fail/issue-44216-sub-system-time.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:overflow use std::time::{Duration, SystemTime}; diff --git a/src/test/run-fail/issue-51345.rs b/src/test/run-fail/issue-51345.rs index 9efd08195a1bb..3c7f6a68db545 100644 --- a/src/test/run-fail/issue-51345.rs +++ b/src/test/run-fail/issue-51345.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: thread 'main' panicked at 'explicit panic' #![feature(nll)] diff --git a/src/test/run-fail/issue-6458-1.rs b/src/test/run-fail/issue-6458-1.rs index 7da27bd15f24a..550bb2b832f44 100644 --- a/src/test/run-fail/issue-6458-1.rs +++ b/src/test/run-fail/issue-6458-1.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:explicit panic fn foo(t: T) {} diff --git a/src/test/run-fail/issue-948.rs b/src/test/run-fail/issue-948.rs index 4a1bc856a39c3..8f1c6587f030a 100644 --- a/src/test/run-fail/issue-948.rs +++ b/src/test/run-fail/issue-948.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:beep boop #![allow(unused_variables)] diff --git a/src/test/run-fail/main-panic.rs b/src/test/run-fail/main-panic.rs index 87f77681fa02d..3a9409562db6a 100644 --- a/src/test/run-fail/main-panic.rs +++ b/src/test/run-fail/main-panic.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:thread 'main' panicked at fn main() { diff --git a/src/test/run-fail/match-bot-panic.rs b/src/test/run-fail/match-bot-panic.rs index 5a6eedb4863a9..f4da8c4e43fb6 100644 --- a/src/test/run-fail/match-bot-panic.rs +++ b/src/test/run-fail/match-bot-panic.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:explicit panic #![allow(unreachable_code)] diff --git a/src/test/run-fail/match-disc-bot.rs b/src/test/run-fail/match-disc-bot.rs index a369a9889cc59..a9312fbb1fb35 100644 --- a/src/test/run-fail/match-disc-bot.rs +++ b/src/test/run-fail/match-disc-bot.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:quux fn f() -> ! { panic!("quux") diff --git a/src/test/run-fail/match-wildcards.rs b/src/test/run-fail/match-wildcards.rs index 61bfd38c5f4c8..7a65ad5255896 100644 --- a/src/test/run-fail/match-wildcards.rs +++ b/src/test/run-fail/match-wildcards.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:squirrelcupcake fn cmp() -> isize { match (Some('a'), None::) { diff --git a/src/test/run-fail/meta-revision-bad.rs b/src/test/run-fail/meta-revision-bad.rs index 0b7c464800aa8..17f6398b73554 100644 --- a/src/test/run-fail/meta-revision-bad.rs +++ b/src/test/run-fail/meta-revision-bad.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Meta test for compiletest: check that when we give the wrong error // patterns, the test fails. diff --git a/src/test/run-fail/meta-revision-ok.rs b/src/test/run-fail/meta-revision-ok.rs index 99dd332c558b0..8693ee5f4ef96 100644 --- a/src/test/run-fail/meta-revision-ok.rs +++ b/src/test/run-fail/meta-revision-ok.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Meta test for compiletest: check that when we give the right error // patterns, the test passes. See all `meta-revision-bad.rs`. diff --git a/src/test/run-fail/mir_codegen_calls_converging_drops.rs b/src/test/run-fail/mir_codegen_calls_converging_drops.rs index 9c851eb7346bb..ee0dc98ce6819 100644 --- a/src/test/run-fail/mir_codegen_calls_converging_drops.rs +++ b/src/test/run-fail/mir_codegen_calls_converging_drops.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:converging_fn called // error-pattern:0 dropped // error-pattern:exit diff --git a/src/test/run-fail/mir_codegen_calls_converging_drops_2.rs b/src/test/run-fail/mir_codegen_calls_converging_drops_2.rs index 6f10521155648..ee2c25ce8565e 100644 --- a/src/test/run-fail/mir_codegen_calls_converging_drops_2.rs +++ b/src/test/run-fail/mir_codegen_calls_converging_drops_2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:complex called // error-pattern:dropped // error-pattern:exit diff --git a/src/test/run-fail/mir_codegen_calls_diverging.rs b/src/test/run-fail/mir_codegen_calls_diverging.rs index 9dbf7de0d2d49..dceae0a4e4a03 100644 --- a/src/test/run-fail/mir_codegen_calls_diverging.rs +++ b/src/test/run-fail/mir_codegen_calls_diverging.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:diverging_fn called fn diverging_fn() -> ! { diff --git a/src/test/run-fail/mir_codegen_calls_diverging_drops.rs b/src/test/run-fail/mir_codegen_calls_diverging_drops.rs index f8fbe8f79cc62..187e526f7c092 100644 --- a/src/test/run-fail/mir_codegen_calls_diverging_drops.rs +++ b/src/test/run-fail/mir_codegen_calls_diverging_drops.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:diverging_fn called // error-pattern:0 dropped diff --git a/src/test/run-fail/mir_codegen_no_landing_pads.rs b/src/test/run-fail/mir_codegen_no_landing_pads.rs index aded2739b10d1..f3384dc45f3d2 100644 --- a/src/test/run-fail/mir_codegen_no_landing_pads.rs +++ b/src/test/run-fail/mir_codegen_no_landing_pads.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z no-landing-pads -C codegen-units=1 // error-pattern:converging_fn called // ignore-cloudabi no std::process diff --git a/src/test/run-fail/mir_codegen_no_landing_pads_diverging.rs b/src/test/run-fail/mir_codegen_no_landing_pads_diverging.rs index d3a8613bbc4bf..08f6d578bb2e0 100644 --- a/src/test/run-fail/mir_codegen_no_landing_pads_diverging.rs +++ b/src/test/run-fail/mir_codegen_no_landing_pads_diverging.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z no-landing-pads -C codegen-units=1 // error-pattern:diverging_fn called // ignore-cloudabi no std::process diff --git a/src/test/run-fail/mir_drop_panics.rs b/src/test/run-fail/mir_drop_panics.rs index 51191dd7087e4..02b448de5aec8 100644 --- a/src/test/run-fail/mir_drop_panics.rs +++ b/src/test/run-fail/mir_drop_panics.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:panic 1 // error-pattern:drop 2 diff --git a/src/test/run-fail/mir_dynamic_drops_1.rs b/src/test/run-fail/mir_dynamic_drops_1.rs index 856fc50a0f8e9..db8d0af29db2c 100644 --- a/src/test/run-fail/mir_dynamic_drops_1.rs +++ b/src/test/run-fail/mir_dynamic_drops_1.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:drop 1 // error-pattern:drop 2 // ignore-cloudabi no std::process diff --git a/src/test/run-fail/mir_dynamic_drops_2.rs b/src/test/run-fail/mir_dynamic_drops_2.rs index 964562322bd7c..21d3a042b1e31 100644 --- a/src/test/run-fail/mir_dynamic_drops_2.rs +++ b/src/test/run-fail/mir_dynamic_drops_2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:drop 1 // ignore-cloudabi no std::process diff --git a/src/test/run-fail/mir_dynamic_drops_3.rs b/src/test/run-fail/mir_dynamic_drops_3.rs index 4c070314555ca..b90499686823a 100644 --- a/src/test/run-fail/mir_dynamic_drops_3.rs +++ b/src/test/run-fail/mir_dynamic_drops_3.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:unwind happens // error-pattern:drop 3 // error-pattern:drop 2 diff --git a/src/test/run-fail/mir_indexing_oob_1.rs b/src/test/run-fail/mir_indexing_oob_1.rs index cf342ad94f990..0ae0320b124bc 100644 --- a/src/test/run-fail/mir_indexing_oob_1.rs +++ b/src/test/run-fail/mir_indexing_oob_1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:index out of bounds: the len is 5 but the index is 10 const C: [u32; 5] = [0; 5]; diff --git a/src/test/run-fail/mir_indexing_oob_2.rs b/src/test/run-fail/mir_indexing_oob_2.rs index 3eb94682b2047..a7a1177260c31 100644 --- a/src/test/run-fail/mir_indexing_oob_2.rs +++ b/src/test/run-fail/mir_indexing_oob_2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:index out of bounds: the len is 5 but the index is 10 const C: &'static [u8; 5] = b"hello"; diff --git a/src/test/run-fail/mir_indexing_oob_3.rs b/src/test/run-fail/mir_indexing_oob_3.rs index 06bb6d4d28713..188460fff7832 100644 --- a/src/test/run-fail/mir_indexing_oob_3.rs +++ b/src/test/run-fail/mir_indexing_oob_3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:index out of bounds: the len is 5 but the index is 10 const C: &'static [u8; 5] = b"hello"; diff --git a/src/test/run-fail/mod-zero.rs b/src/test/run-fail/mod-zero.rs index 641d39e2324b8..ac2959fcd3853 100644 --- a/src/test/run-fail/mod-zero.rs +++ b/src/test/run-fail/mod-zero.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:attempt to calculate the remainder with a divisor of zero fn main() { diff --git a/src/test/run-fail/never-associated-type.rs b/src/test/run-fail/never-associated-type.rs index fdd21e08c20f9..ba30b9ea0fe3d 100644 --- a/src/test/run-fail/never-associated-type.rs +++ b/src/test/run-fail/never-associated-type.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we can use ! as an associated type. // error-pattern:kapow! diff --git a/src/test/run-fail/never-type-arg.rs b/src/test/run-fail/never-type-arg.rs index 826ca3a08c0e1..fc7f2fc90d704 100644 --- a/src/test/run-fail/never-type-arg.rs +++ b/src/test/run-fail/never-type-arg.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we can use ! as an argument to a trait impl. // error-pattern:oh no! diff --git a/src/test/run-fail/overflowing-add.rs b/src/test/run-fail/overflowing-add.rs index 584701410ef83..24602aced9e42 100644 --- a/src/test/run-fail/overflowing-add.rs +++ b/src/test/run-fail/overflowing-add.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:thread 'main' panicked at 'attempt to add with overflow' // compile-flags: -C debug-assertions diff --git a/src/test/run-fail/overflowing-lsh-1.rs b/src/test/run-fail/overflowing-lsh-1.rs index baa1e05d559b6..c69da0f49adf1 100644 --- a/src/test/run-fail/overflowing-lsh-1.rs +++ b/src/test/run-fail/overflowing-lsh-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:thread 'main' panicked at 'attempt to shift left with overflow' // compile-flags: -C debug-assertions diff --git a/src/test/run-fail/overflowing-lsh-2.rs b/src/test/run-fail/overflowing-lsh-2.rs index 3438ed2c77c18..21659bd52393a 100644 --- a/src/test/run-fail/overflowing-lsh-2.rs +++ b/src/test/run-fail/overflowing-lsh-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:thread 'main' panicked at 'attempt to shift left with overflow' // compile-flags: -C debug-assertions diff --git a/src/test/run-fail/overflowing-lsh-3.rs b/src/test/run-fail/overflowing-lsh-3.rs index ef5c43db6e285..8f06cd1153354 100644 --- a/src/test/run-fail/overflowing-lsh-3.rs +++ b/src/test/run-fail/overflowing-lsh-3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:thread 'main' panicked at 'attempt to shift left with overflow' // compile-flags: -C debug-assertions diff --git a/src/test/run-fail/overflowing-lsh-4.rs b/src/test/run-fail/overflowing-lsh-4.rs index 226ece6020db4..084c147094dee 100644 --- a/src/test/run-fail/overflowing-lsh-4.rs +++ b/src/test/run-fail/overflowing-lsh-4.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:thread 'main' panicked at 'attempt to shift left with overflow' // compile-flags: -C debug-assertions diff --git a/src/test/run-fail/overflowing-mul.rs b/src/test/run-fail/overflowing-mul.rs index 5d6f59e02296b..48110365a81df 100644 --- a/src/test/run-fail/overflowing-mul.rs +++ b/src/test/run-fail/overflowing-mul.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:thread 'main' panicked at 'attempt to multiply with overflow' // compile-flags: -C debug-assertions diff --git a/src/test/run-fail/overflowing-neg.rs b/src/test/run-fail/overflowing-neg.rs index e7c518f1286fb..c4afd74241eda 100644 --- a/src/test/run-fail/overflowing-neg.rs +++ b/src/test/run-fail/overflowing-neg.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:thread 'main' panicked at 'attempt to negate with overflow' // compile-flags: -C debug-assertions diff --git a/src/test/run-fail/overflowing-pow-signed.rs b/src/test/run-fail/overflowing-pow-signed.rs index b0ff0df557704..c539c685faf9e 100644 --- a/src/test/run-fail/overflowing-pow-signed.rs +++ b/src/test/run-fail/overflowing-pow-signed.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:thread 'main' panicked at 'attempt to multiply with overflow' // compile-flags: -C debug-assertions diff --git a/src/test/run-fail/overflowing-pow-unsigned.rs b/src/test/run-fail/overflowing-pow-unsigned.rs index d3e7035279fbe..1d4fa3b5c7eb8 100644 --- a/src/test/run-fail/overflowing-pow-unsigned.rs +++ b/src/test/run-fail/overflowing-pow-unsigned.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:thread 'main' panicked at 'attempt to multiply with overflow' // compile-flags: -C debug-assertions diff --git a/src/test/run-fail/overflowing-rsh-1.rs b/src/test/run-fail/overflowing-rsh-1.rs index 8f198c887e491..24a77da896d9e 100644 --- a/src/test/run-fail/overflowing-rsh-1.rs +++ b/src/test/run-fail/overflowing-rsh-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:thread 'main' panicked at 'attempt to shift right with overflow' // compile-flags: -C debug-assertions diff --git a/src/test/run-fail/overflowing-rsh-2.rs b/src/test/run-fail/overflowing-rsh-2.rs index e4f260b2bbbbb..b5615cacc2055 100644 --- a/src/test/run-fail/overflowing-rsh-2.rs +++ b/src/test/run-fail/overflowing-rsh-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:thread 'main' panicked at 'attempt to shift right with overflow' // compile-flags: -C debug-assertions diff --git a/src/test/run-fail/overflowing-rsh-3.rs b/src/test/run-fail/overflowing-rsh-3.rs index 11aa98a0c3cbc..7598e026d8139 100644 --- a/src/test/run-fail/overflowing-rsh-3.rs +++ b/src/test/run-fail/overflowing-rsh-3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:thread 'main' panicked at 'attempt to shift right with overflow' // compile-flags: -C debug-assertions diff --git a/src/test/run-fail/overflowing-rsh-4.rs b/src/test/run-fail/overflowing-rsh-4.rs index 742720e83c10c..a8d3b69392a97 100644 --- a/src/test/run-fail/overflowing-rsh-4.rs +++ b/src/test/run-fail/overflowing-rsh-4.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:thread 'main' panicked at 'attempt to shift right with overflow' // compile-flags: -C debug-assertions diff --git a/src/test/run-fail/overflowing-rsh-5.rs b/src/test/run-fail/overflowing-rsh-5.rs index 6106fdcb16a46..793f495240d57 100644 --- a/src/test/run-fail/overflowing-rsh-5.rs +++ b/src/test/run-fail/overflowing-rsh-5.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:thread 'main' panicked at 'attempt to shift right with overflow' // compile-flags: -C debug-assertions diff --git a/src/test/run-fail/overflowing-rsh-6.rs b/src/test/run-fail/overflowing-rsh-6.rs index d419550fcc570..d6b2f8dc9f9af 100644 --- a/src/test/run-fail/overflowing-rsh-6.rs +++ b/src/test/run-fail/overflowing-rsh-6.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:thread 'main' panicked at 'attempt to shift right with overflow' // compile-flags: -C debug-assertions diff --git a/src/test/run-fail/overflowing-sub.rs b/src/test/run-fail/overflowing-sub.rs index 404921a1af552..e3b111dd2bba6 100644 --- a/src/test/run-fail/overflowing-sub.rs +++ b/src/test/run-fail/overflowing-sub.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:thread 'main' panicked at 'attempt to subtract with overflow' // compile-flags: -C debug-assertions diff --git a/src/test/run-fail/panic-arg.rs b/src/test/run-fail/panic-arg.rs index 9023784050f2f..c164ff94630b1 100644 --- a/src/test/run-fail/panic-arg.rs +++ b/src/test/run-fail/panic-arg.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:woe fn f(a: isize) { println!("{}", a); diff --git a/src/test/run-fail/panic-macro-any-wrapped.rs b/src/test/run-fail/panic-macro-any-wrapped.rs index 4d0f7c29cb9df..83eb39a538f16 100644 --- a/src/test/run-fail/panic-macro-any-wrapped.rs +++ b/src/test/run-fail/panic-macro-any-wrapped.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:panicked at 'Box' fn main() { diff --git a/src/test/run-fail/panic-macro-any.rs b/src/test/run-fail/panic-macro-any.rs index c8f851be556d7..72d42e5b799cd 100644 --- a/src/test/run-fail/panic-macro-any.rs +++ b/src/test/run-fail/panic-macro-any.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:panicked at 'Box' #![feature(box_syntax)] diff --git a/src/test/run-fail/panic-macro-explicit.rs b/src/test/run-fail/panic-macro-explicit.rs index a8565549a03ed..f632034807cd4 100644 --- a/src/test/run-fail/panic-macro-explicit.rs +++ b/src/test/run-fail/panic-macro-explicit.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:panicked at 'explicit panic' fn main() { diff --git a/src/test/run-fail/panic-macro-fmt.rs b/src/test/run-fail/panic-macro-fmt.rs index 50ad99c6747b2..658ae56e7e49f 100644 --- a/src/test/run-fail/panic-macro-fmt.rs +++ b/src/test/run-fail/panic-macro-fmt.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:panicked at 'test-fail-fmt 42 rust' fn main() { diff --git a/src/test/run-fail/panic-macro-owned.rs b/src/test/run-fail/panic-macro-owned.rs index 2f695c4e4b70c..9b935717638bc 100644 --- a/src/test/run-fail/panic-macro-owned.rs +++ b/src/test/run-fail/panic-macro-owned.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:panicked at 'test-fail-owned' fn main() { diff --git a/src/test/run-fail/panic-macro-static.rs b/src/test/run-fail/panic-macro-static.rs index c62162da09b7c..31ac488beb234 100644 --- a/src/test/run-fail/panic-macro-static.rs +++ b/src/test/run-fail/panic-macro-static.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:panicked at 'test-fail-static' fn main() { diff --git a/src/test/run-fail/panic-main.rs b/src/test/run-fail/panic-main.rs index fd2919bfe12fc..881eb7b5823b7 100644 --- a/src/test/run-fail/panic-main.rs +++ b/src/test/run-fail/panic-main.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:moop fn main() { panic!("moop"); diff --git a/src/test/run-fail/panic-parens.rs b/src/test/run-fail/panic-parens.rs index 1917a7e2a7ff1..e7f98e58c4f39 100644 --- a/src/test/run-fail/panic-parens.rs +++ b/src/test/run-fail/panic-parens.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Fail macros without arguments need to be disambiguated in // certain positions // error-pattern:oops diff --git a/src/test/run-fail/panic-set-handler.rs b/src/test/run-fail/panic-set-handler.rs index 2d430be07ef2f..0a150d7fbb900 100644 --- a/src/test/run-fail/panic-set-handler.rs +++ b/src/test/run-fail/panic-set-handler.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:greetings from the panic handler use std::panic; diff --git a/src/test/run-fail/panic-set-unset-handler.rs b/src/test/run-fail/panic-set-unset-handler.rs index e7659d0bd88b7..f8809c2f3889e 100644 --- a/src/test/run-fail/panic-set-unset-handler.rs +++ b/src/test/run-fail/panic-set-unset-handler.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:thread 'main' panicked at 'foobar' use std::panic; diff --git a/src/test/run-fail/panic-take-handler-nop.rs b/src/test/run-fail/panic-take-handler-nop.rs index 46e937c5d9b79..bb191a38f8473 100644 --- a/src/test/run-fail/panic-take-handler-nop.rs +++ b/src/test/run-fail/panic-take-handler-nop.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:thread 'main' panicked at 'foobar' use std::panic; diff --git a/src/test/run-fail/panic-task-name-none.rs b/src/test/run-fail/panic-task-name-none.rs index 36e2a4b86aa39..c7f504046baed 100644 --- a/src/test/run-fail/panic-task-name-none.rs +++ b/src/test/run-fail/panic-task-name-none.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:thread '' panicked at 'test' // ignore-emscripten Needs threads diff --git a/src/test/run-fail/panic-task-name-owned.rs b/src/test/run-fail/panic-task-name-owned.rs index 4da40c3158b84..58f76ff787f9f 100644 --- a/src/test/run-fail/panic-task-name-owned.rs +++ b/src/test/run-fail/panic-task-name-owned.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:thread 'owned name' panicked at 'test' // ignore-emscripten Needs threads. diff --git a/src/test/run-fail/panic.rs b/src/test/run-fail/panic.rs index f59e6001794eb..95f20dedad26c 100644 --- a/src/test/run-fail/panic.rs +++ b/src/test/run-fail/panic.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:1 == 2 fn main() { assert!(1 == 2); diff --git a/src/test/run-fail/promoted_div_by_zero.rs b/src/test/run-fail/promoted_div_by_zero.rs index 385fd5092328b..3fe51a19c20bb 100644 --- a/src/test/run-fail/promoted_div_by_zero.rs +++ b/src/test/run-fail/promoted_div_by_zero.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(const_err)] // error-pattern: attempt to divide by zero diff --git a/src/test/run-fail/promoted_overflow.rs b/src/test/run-fail/promoted_overflow.rs index 0e1b0117a8c52..139bf54095970 100644 --- a/src/test/run-fail/promoted_overflow.rs +++ b/src/test/run-fail/promoted_overflow.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(const_err)] // error-pattern: overflow diff --git a/src/test/run-fail/result-get-panic.rs b/src/test/run-fail/result-get-panic.rs index 6378b4ec79540..cddf20ee49df3 100644 --- a/src/test/run-fail/result-get-panic.rs +++ b/src/test/run-fail/result-get-panic.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:called `Result::unwrap()` on an `Err` value use std::result::Result::Err; diff --git a/src/test/run-fail/return-never-coerce.rs b/src/test/run-fail/return-never-coerce.rs index ddcecd97ba596..18182ff0f9d47 100644 --- a/src/test/run-fail/return-never-coerce.rs +++ b/src/test/run-fail/return-never-coerce.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that ! coerces to other types. // error-pattern:aah! diff --git a/src/test/run-fail/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs b/src/test/run-fail/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs index 66a6e6afed34b..5f76caabc796b 100644 --- a/src/test/run-fail/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs +++ b/src/test/run-fail/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass // failure-status: 1 diff --git a/src/test/run-fail/rfc-1937-termination-trait/termination-trait-for-never.rs b/src/test/run-fail/rfc-1937-termination-trait/termination-trait-for-never.rs index 863de85af88fb..cb37b8e067090 100644 --- a/src/test/run-fail/rfc-1937-termination-trait/termination-trait-for-never.rs +++ b/src/test/run-fail/rfc-1937-termination-trait/termination-trait-for-never.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:oh, dear fn main() -> ! { diff --git a/src/test/run-fail/rfc-1937-termination-trait/termination-trait-for-result-box-error_err.rs b/src/test/run-fail/rfc-1937-termination-trait/termination-trait-for-result-box-error_err.rs index 4fb7ae9c10c90..bd47a9768f94b 100644 --- a/src/test/run-fail/rfc-1937-termination-trait/termination-trait-for-result-box-error_err.rs +++ b/src/test/run-fail/rfc-1937-termination-trait/termination-trait-for-result-box-error_err.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass // failure-status: 1 diff --git a/src/test/run-fail/rfc-1937-termination-trait/termination-trait-for-str.rs b/src/test/run-fail/rfc-1937-termination-trait/termination-trait-for-str.rs index 9f01b0bff8955..bd6fa8af93513 100644 --- a/src/test/run-fail/rfc-1937-termination-trait/termination-trait-for-str.rs +++ b/src/test/run-fail/rfc-1937-termination-trait/termination-trait-for-str.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: An error message for you // failure-status: 1 diff --git a/src/test/run-fail/rhs-type.rs b/src/test/run-fail/rhs-type.rs index 572b56d02ae99..6efbeadd70421 100644 --- a/src/test/run-fail/rhs-type.rs +++ b/src/test/run-fail/rhs-type.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that codegen treats the rhs of pth's decl // as a _|_-typed thing, not a str-typed thing // error-pattern:bye diff --git a/src/test/run-fail/run-unexported-tests.rs b/src/test/run-fail/run-unexported-tests.rs index c7d5574f909f2..11e100e716eb4 100644 --- a/src/test/run-fail/run-unexported-tests.rs +++ b/src/test/run-fail/run-unexported-tests.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:ran an unexported test // compile-flags:--test // check-stdout diff --git a/src/test/run-fail/str-overrun.rs b/src/test/run-fail/str-overrun.rs index a9c0030fecaf7..e566308a08767 100644 --- a/src/test/run-fail/str-overrun.rs +++ b/src/test/run-fail/str-overrun.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // error-pattern:index out of bounds: the len is 5 but the index is 5 fn main() { let s: String = "hello".to_string(); diff --git a/src/test/run-fail/task-spawn-barefn.rs b/src/test/run-fail/task-spawn-barefn.rs index 108430848b9b2..497c5ea71804f 100644 --- a/src/test/run-fail/task-spawn-barefn.rs +++ b/src/test/run-fail/task-spawn-barefn.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:Ensure that the child thread runs by panicking // ignore-emscripten Needs threads. diff --git a/src/test/run-fail/test-panic.rs b/src/test/run-fail/test-panic.rs index bb6f4abe1fc96..92f5146b710f2 100644 --- a/src/test/run-fail/test-panic.rs +++ b/src/test/run-fail/test-panic.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // check-stdout // error-pattern:thread 'test_foo' panicked at // compile-flags: --test diff --git a/src/test/run-fail/test-should-fail-bad-message.rs b/src/test/run-fail/test-should-fail-bad-message.rs index eac9813f180ae..3c69bb07d3b18 100644 --- a/src/test/run-fail/test-should-fail-bad-message.rs +++ b/src/test/run-fail/test-should-fail-bad-message.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // check-stdout // error-pattern:thread 'test_foo' panicked at // compile-flags: --test diff --git a/src/test/run-fail/test-should-panic-bad-message.rs b/src/test/run-fail/test-should-panic-bad-message.rs index 7186672b4049e..b73d4d7377a34 100644 --- a/src/test/run-fail/test-should-panic-bad-message.rs +++ b/src/test/run-fail/test-should-panic-bad-message.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --test // error-pattern:panicked at 'bar' diff --git a/src/test/run-fail/test-should-panic-no-message.rs b/src/test/run-fail/test-should-panic-no-message.rs index 50dc2aed8e9d0..b18389ec7440e 100644 --- a/src/test/run-fail/test-should-panic-no-message.rs +++ b/src/test/run-fail/test-should-panic-no-message.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --test // error-pattern:panicked at 'explicit panic' diff --git a/src/test/run-fail/test-tasks-invalid-value.rs b/src/test/run-fail/test-tasks-invalid-value.rs index fcf3559e7da66..2dae1b4592c0f 100644 --- a/src/test/run-fail/test-tasks-invalid-value.rs +++ b/src/test/run-fail/test-tasks-invalid-value.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This checks that RUST_TEST_THREADS not being 1, 2, ... is detected // properly. diff --git a/src/test/run-fail/tls-exit-status.rs b/src/test/run-fail/tls-exit-status.rs index d9b81c5d4b690..f15fd4f6894f7 100644 --- a/src/test/run-fail/tls-exit-status.rs +++ b/src/test/run-fail/tls-exit-status.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:nonzero // exec-env:RUST_NEWRT=1 // ignore-cloudabi no std::env diff --git a/src/test/run-fail/unimplemented-macro-panic.rs b/src/test/run-fail/unimplemented-macro-panic.rs index e3d8aa2e460af..2a848281e4f22 100644 --- a/src/test/run-fail/unimplemented-macro-panic.rs +++ b/src/test/run-fail/unimplemented-macro-panic.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:not yet implemented fn main() { unimplemented!() diff --git a/src/test/run-fail/unique-panic.rs b/src/test/run-fail/unique-panic.rs index 3dc3d0afda10b..adefd796af492 100644 --- a/src/test/run-fail/unique-panic.rs +++ b/src/test/run-fail/unique-panic.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: panic fn main() { diff --git a/src/test/run-fail/unreachable-fmt-msg.rs b/src/test/run-fail/unreachable-fmt-msg.rs index f005fa4476cf2..ac2a52163b4de 100644 --- a/src/test/run-fail/unreachable-fmt-msg.rs +++ b/src/test/run-fail/unreachable-fmt-msg.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:internal error: entered unreachable code: 6 is not prime fn main() { unreachable!("{} is not {}", 6u32, "prime"); diff --git a/src/test/run-fail/unreachable-macro-panic.rs b/src/test/run-fail/unreachable-macro-panic.rs index 493fe7ee4f8e7..597a01447228d 100644 --- a/src/test/run-fail/unreachable-macro-panic.rs +++ b/src/test/run-fail/unreachable-macro-panic.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:internal error: entered unreachable code fn main() { unreachable!() diff --git a/src/test/run-fail/unreachable-static-msg.rs b/src/test/run-fail/unreachable-static-msg.rs index 0a9dee3d0b99c..40a2881cc5714 100644 --- a/src/test/run-fail/unreachable-static-msg.rs +++ b/src/test/run-fail/unreachable-static-msg.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:internal error: entered unreachable code: uhoh fn main() { unreachable!("uhoh") diff --git a/src/test/run-fail/unreachable.rs b/src/test/run-fail/unreachable.rs index 493fe7ee4f8e7..597a01447228d 100644 --- a/src/test/run-fail/unreachable.rs +++ b/src/test/run-fail/unreachable.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:internal error: entered unreachable code fn main() { unreachable!() diff --git a/src/test/run-fail/unwind-interleaved.rs b/src/test/run-fail/unwind-interleaved.rs index 0a7be154d5d15..c163678ae9873 100644 --- a/src/test/run-fail/unwind-interleaved.rs +++ b/src/test/run-fail/unwind-interleaved.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:fail fn a() {} diff --git a/src/test/run-fail/unwind-rec.rs b/src/test/run-fail/unwind-rec.rs index 5177b4091d73d..83ac19ff4a533 100644 --- a/src/test/run-fail/unwind-rec.rs +++ b/src/test/run-fail/unwind-rec.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:fail diff --git a/src/test/run-fail/unwind-rec2.rs b/src/test/run-fail/unwind-rec2.rs index 3be5036b216e0..4dfc282b6c0f5 100644 --- a/src/test/run-fail/unwind-rec2.rs +++ b/src/test/run-fail/unwind-rec2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:fail diff --git a/src/test/run-fail/unwind-unique.rs b/src/test/run-fail/unwind-unique.rs index f4ba789d6bf7b..7b761faad9534 100644 --- a/src/test/run-fail/unwind-unique.rs +++ b/src/test/run-fail/unwind-unique.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:fail fn failfn() { diff --git a/src/test/run-fail/vec-overrun.rs b/src/test/run-fail/vec-overrun.rs index 457ae75a451e9..2be945f736cb7 100644 --- a/src/test/run-fail/vec-overrun.rs +++ b/src/test/run-fail/vec-overrun.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:index out of bounds: the len is 1 but the index is 2 diff --git a/src/test/run-fail/while-body-panics.rs b/src/test/run-fail/while-body-panics.rs index 29482612c24c7..76acb4ba42de4 100644 --- a/src/test/run-fail/while-body-panics.rs +++ b/src/test/run-fail/while-body-panics.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(while_true)] // error-pattern:quux diff --git a/src/test/run-fail/while-panic.rs b/src/test/run-fail/while-panic.rs index e410684cd349a..a0827591729f7 100644 --- a/src/test/run-fail/while-panic.rs +++ b/src/test/run-fail/while-panic.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(while_true)] // error-pattern:giraffe diff --git a/src/test/run-make-fulldeps/a-b-a-linker-guard/a.rs b/src/test/run-make-fulldeps/a-b-a-linker-guard/a.rs index c6680a78819db..aa07b1e71607c 100644 --- a/src/test/run-make-fulldeps/a-b-a-linker-guard/a.rs +++ b/src/test/run-make-fulldeps/a-b-a-linker-guard/a.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "a"] #![crate_type = "dylib"] diff --git a/src/test/run-make-fulldeps/a-b-a-linker-guard/b.rs b/src/test/run-make-fulldeps/a-b-a-linker-guard/b.rs index 89fd48de5bbf9..f30df120a3ba7 100644 --- a/src/test/run-make-fulldeps/a-b-a-linker-guard/b.rs +++ b/src/test/run-make-fulldeps/a-b-a-linker-guard/b.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "b"] extern crate a; diff --git a/src/test/run-make-fulldeps/alloc-extern-crates/fakealloc.rs b/src/test/run-make-fulldeps/alloc-extern-crates/fakealloc.rs index 43f974893148a..625c3afab921c 100644 --- a/src/test/run-make-fulldeps/alloc-extern-crates/fakealloc.rs +++ b/src/test/run-make-fulldeps/alloc-extern-crates/fakealloc.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] #![no_std] diff --git a/src/test/run-make-fulldeps/allow-non-lint-warnings-cmdline/foo.rs b/src/test/run-make-fulldeps/allow-non-lint-warnings-cmdline/foo.rs index a9e18f5a8f1e6..46e72da2de9f3 100644 --- a/src/test/run-make-fulldeps/allow-non-lint-warnings-cmdline/foo.rs +++ b/src/test/run-make-fulldeps/allow-non-lint-warnings-cmdline/foo.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive()] #[derive(Copy, Clone)] pub struct Foo; diff --git a/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/bar.rs b/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/bar.rs index 1dad2ed90521d..2a977ed63b155 100644 --- a/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/bar.rs +++ b/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/bar.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] #![feature(staged_api)] #![unstable(feature = "unstable_test_feature", issue = "0")] diff --git a/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/foo.rs b/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/foo.rs index b728136a89e29..869b543541688 100644 --- a/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/foo.rs +++ b/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/foo.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unstable_test_feature)] extern crate bar; diff --git a/src/test/run-make-fulldeps/archive-duplicate-names/bar.rs b/src/test/run-make-fulldeps/archive-duplicate-names/bar.rs index 1200a6de8e2e0..994a98c2cd8b1 100644 --- a/src/test/run-make-fulldeps/archive-duplicate-names/bar.rs +++ b/src/test/run-make-fulldeps/archive-duplicate-names/bar.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate foo; fn main() { diff --git a/src/test/run-make-fulldeps/archive-duplicate-names/foo.rs b/src/test/run-make-fulldeps/archive-duplicate-names/foo.rs index 24b4734f2cd33..5f5ed424ba980 100644 --- a/src/test/run-make-fulldeps/archive-duplicate-names/foo.rs +++ b/src/test/run-make-fulldeps/archive-duplicate-names/foo.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] #[link(name = "foo", kind = "static")] diff --git a/src/test/run-make-fulldeps/atomic-lock-free/atomic_lock_free.rs b/src/test/run-make-fulldeps/atomic-lock-free/atomic_lock_free.rs index 54f888b3796a1..6c77036b06e00 100644 --- a/src/test/run-make-fulldeps/atomic-lock-free/atomic_lock_free.rs +++ b/src/test/run-make-fulldeps/atomic-lock-free/atomic_lock_free.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(cfg_target_has_atomic, no_core, intrinsics, lang_items)] #![crate_type="rlib"] #![no_core] diff --git a/src/test/run-make-fulldeps/bare-outfile/foo.rs b/src/test/run-make-fulldeps/bare-outfile/foo.rs index 63e747901ae87..f79c691f0853c 100644 --- a/src/test/run-make-fulldeps/bare-outfile/foo.rs +++ b/src/test/run-make-fulldeps/bare-outfile/foo.rs @@ -1,12 +1,2 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { } diff --git a/src/test/run-make-fulldeps/c-dynamic-dylib/bar.rs b/src/test/run-make-fulldeps/c-dynamic-dylib/bar.rs index 37b120decd1a8..b8c798ffdb4a9 100644 --- a/src/test/run-make-fulldeps/c-dynamic-dylib/bar.rs +++ b/src/test/run-make-fulldeps/c-dynamic-dylib/bar.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate foo; fn main() { diff --git a/src/test/run-make-fulldeps/c-dynamic-dylib/foo.rs b/src/test/run-make-fulldeps/c-dynamic-dylib/foo.rs index 04253be71d454..14f67017a3b8c 100644 --- a/src/test/run-make-fulldeps/c-dynamic-dylib/foo.rs +++ b/src/test/run-make-fulldeps/c-dynamic-dylib/foo.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "dylib"] #[link(name = "cfoo")] diff --git a/src/test/run-make-fulldeps/c-dynamic-rlib/bar.rs b/src/test/run-make-fulldeps/c-dynamic-rlib/bar.rs index 37b120decd1a8..b8c798ffdb4a9 100644 --- a/src/test/run-make-fulldeps/c-dynamic-rlib/bar.rs +++ b/src/test/run-make-fulldeps/c-dynamic-rlib/bar.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate foo; fn main() { diff --git a/src/test/run-make-fulldeps/c-dynamic-rlib/foo.rs b/src/test/run-make-fulldeps/c-dynamic-rlib/foo.rs index a1f01bd2b626c..9bf3689cd36d5 100644 --- a/src/test/run-make-fulldeps/c-dynamic-rlib/foo.rs +++ b/src/test/run-make-fulldeps/c-dynamic-rlib/foo.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] #[link(name = "cfoo")] diff --git a/src/test/run-make-fulldeps/c-link-to-rust-dylib/foo.rs b/src/test/run-make-fulldeps/c-link-to-rust-dylib/foo.rs index 32675bcba1e0a..f197fa513345d 100644 --- a/src/test/run-make-fulldeps/c-link-to-rust-dylib/foo.rs +++ b/src/test/run-make-fulldeps/c-link-to-rust-dylib/foo.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "dylib"] #[no_mangle] diff --git a/src/test/run-make-fulldeps/c-link-to-rust-staticlib/foo.rs b/src/test/run-make-fulldeps/c-link-to-rust-staticlib/foo.rs index 1bb1901670035..2e59432cdb16f 100644 --- a/src/test/run-make-fulldeps/c-link-to-rust-staticlib/foo.rs +++ b/src/test/run-make-fulldeps/c-link-to-rust-staticlib/foo.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "staticlib"] #[no_mangle] diff --git a/src/test/run-make-fulldeps/c-static-dylib/bar.rs b/src/test/run-make-fulldeps/c-static-dylib/bar.rs index 37b120decd1a8..b8c798ffdb4a9 100644 --- a/src/test/run-make-fulldeps/c-static-dylib/bar.rs +++ b/src/test/run-make-fulldeps/c-static-dylib/bar.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate foo; fn main() { diff --git a/src/test/run-make-fulldeps/c-static-dylib/foo.rs b/src/test/run-make-fulldeps/c-static-dylib/foo.rs index 44be5ac890d6e..25e1ed2a9d328 100644 --- a/src/test/run-make-fulldeps/c-static-dylib/foo.rs +++ b/src/test/run-make-fulldeps/c-static-dylib/foo.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "dylib"] #[link(name = "cfoo", kind = "static")] diff --git a/src/test/run-make-fulldeps/c-static-rlib/bar.rs b/src/test/run-make-fulldeps/c-static-rlib/bar.rs index 37b120decd1a8..b8c798ffdb4a9 100644 --- a/src/test/run-make-fulldeps/c-static-rlib/bar.rs +++ b/src/test/run-make-fulldeps/c-static-rlib/bar.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate foo; fn main() { diff --git a/src/test/run-make-fulldeps/c-static-rlib/foo.rs b/src/test/run-make-fulldeps/c-static-rlib/foo.rs index cbd7b020bd812..d434ecfa8bb0b 100644 --- a/src/test/run-make-fulldeps/c-static-rlib/foo.rs +++ b/src/test/run-make-fulldeps/c-static-rlib/foo.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] #[link(name = "cfoo", kind = "static")] diff --git a/src/test/run-make-fulldeps/cdylib-fewer-symbols/foo.rs b/src/test/run-make-fulldeps/cdylib-fewer-symbols/foo.rs index 4ec8d4ee86079..5a6f7c45bd284 100644 --- a/src/test/run-make-fulldeps/cdylib-fewer-symbols/foo.rs +++ b/src/test/run-make-fulldeps/cdylib-fewer-symbols/foo.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "cdylib"] #[no_mangle] diff --git a/src/test/run-make-fulldeps/cdylib/bar.rs b/src/test/run-make-fulldeps/cdylib/bar.rs index 2c97298604cbc..fe665abc7c1c1 100644 --- a/src/test/run-make-fulldeps/cdylib/bar.rs +++ b/src/test/run-make-fulldeps/cdylib/bar.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] pub fn bar() { diff --git a/src/test/run-make-fulldeps/cdylib/foo.rs b/src/test/run-make-fulldeps/cdylib/foo.rs index cdac6d1903525..c2cc3afcc1322 100644 --- a/src/test/run-make-fulldeps/cdylib/foo.rs +++ b/src/test/run-make-fulldeps/cdylib/foo.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "cdylib"] extern crate bar; diff --git a/src/test/run-make-fulldeps/codegen-options-parsing/dummy.rs b/src/test/run-make-fulldeps/codegen-options-parsing/dummy.rs index 8ae3d072362ed..f328e4d9d04c3 100644 --- a/src/test/run-make-fulldeps/codegen-options-parsing/dummy.rs +++ b/src/test/run-make-fulldeps/codegen-options-parsing/dummy.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() {} diff --git a/src/test/run-make-fulldeps/compiler-lookup-paths-2/a.rs b/src/test/run-make-fulldeps/compiler-lookup-paths-2/a.rs index e7572a5f61578..83be6e807e0b9 100644 --- a/src/test/run-make-fulldeps/compiler-lookup-paths-2/a.rs +++ b/src/test/run-make-fulldeps/compiler-lookup-paths-2/a.rs @@ -1,11 +1 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] diff --git a/src/test/run-make-fulldeps/compiler-lookup-paths-2/b.rs b/src/test/run-make-fulldeps/compiler-lookup-paths-2/b.rs index fee0da9b4c194..1be6cbc919d0d 100644 --- a/src/test/run-make-fulldeps/compiler-lookup-paths-2/b.rs +++ b/src/test/run-make-fulldeps/compiler-lookup-paths-2/b.rs @@ -1,12 +1,2 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] extern crate a; diff --git a/src/test/run-make-fulldeps/compiler-lookup-paths-2/c.rs b/src/test/run-make-fulldeps/compiler-lookup-paths-2/c.rs index 66fe51d10991e..e37bc2e1dcef1 100644 --- a/src/test/run-make-fulldeps/compiler-lookup-paths-2/c.rs +++ b/src/test/run-make-fulldeps/compiler-lookup-paths-2/c.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] extern crate b; extern crate a; diff --git a/src/test/run-make-fulldeps/compiler-lookup-paths/a.rs b/src/test/run-make-fulldeps/compiler-lookup-paths/a.rs index 4ddf231fba2a4..83be6e807e0b9 100644 --- a/src/test/run-make-fulldeps/compiler-lookup-paths/a.rs +++ b/src/test/run-make-fulldeps/compiler-lookup-paths/a.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] diff --git a/src/test/run-make-fulldeps/compiler-lookup-paths/b.rs b/src/test/run-make-fulldeps/compiler-lookup-paths/b.rs index c38300f976ebc..1be6cbc919d0d 100644 --- a/src/test/run-make-fulldeps/compiler-lookup-paths/b.rs +++ b/src/test/run-make-fulldeps/compiler-lookup-paths/b.rs @@ -1,12 +1,2 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] extern crate a; diff --git a/src/test/run-make-fulldeps/compiler-lookup-paths/c.rs b/src/test/run-make-fulldeps/compiler-lookup-paths/c.rs index b5c54558a4f0a..4c7ce01b6a02c 100644 --- a/src/test/run-make-fulldeps/compiler-lookup-paths/c.rs +++ b/src/test/run-make-fulldeps/compiler-lookup-paths/c.rs @@ -1,12 +1,2 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] extern crate b; diff --git a/src/test/run-make-fulldeps/compiler-lookup-paths/d.rs b/src/test/run-make-fulldeps/compiler-lookup-paths/d.rs index 295b6e00e41ab..ca2676cf67db2 100644 --- a/src/test/run-make-fulldeps/compiler-lookup-paths/d.rs +++ b/src/test/run-make-fulldeps/compiler-lookup-paths/d.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] #[link(name = "native", kind = "static")] diff --git a/src/test/run-make-fulldeps/compiler-lookup-paths/e.rs b/src/test/run-make-fulldeps/compiler-lookup-paths/e.rs index c0407aba7c9f5..18eb60aca97d2 100644 --- a/src/test/run-make-fulldeps/compiler-lookup-paths/e.rs +++ b/src/test/run-make-fulldeps/compiler-lookup-paths/e.rs @@ -1,12 +1,2 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "e"] #![crate_type = "rlib"] diff --git a/src/test/run-make-fulldeps/compiler-lookup-paths/e2.rs b/src/test/run-make-fulldeps/compiler-lookup-paths/e2.rs index f8c8c029c0bdd..cbf08b98e7ea1 100644 --- a/src/test/run-make-fulldeps/compiler-lookup-paths/e2.rs +++ b/src/test/run-make-fulldeps/compiler-lookup-paths/e2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "e"] #![crate_type = "rlib"] diff --git a/src/test/run-make-fulldeps/compiler-lookup-paths/f.rs b/src/test/run-make-fulldeps/compiler-lookup-paths/f.rs index e616042257625..483deaaea4927 100644 --- a/src/test/run-make-fulldeps/compiler-lookup-paths/f.rs +++ b/src/test/run-make-fulldeps/compiler-lookup-paths/f.rs @@ -1,12 +1,2 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] extern crate e; diff --git a/src/test/run-make-fulldeps/compiler-rt-works-on-mingw/foo.rs b/src/test/run-make-fulldeps/compiler-rt-works-on-mingw/foo.rs index 293f9d582945e..7b5c740cb49b8 100644 --- a/src/test/run-make-fulldeps/compiler-rt-works-on-mingw/foo.rs +++ b/src/test/run-make-fulldeps/compiler-rt-works-on-mingw/foo.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern { fn foo(); } pub fn main() { diff --git a/src/test/run-make-fulldeps/crate-data-smoke/crate.rs b/src/test/run-make-fulldeps/crate-data-smoke/crate.rs index 305b3dc70a625..a48a6f51c4234 100644 --- a/src/test/run-make-fulldeps/crate-data-smoke/crate.rs +++ b/src/test/run-make-fulldeps/crate-data-smoke/crate.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] // Querying about the crate metadata should *not* parse the entire crate, it diff --git a/src/test/run-make-fulldeps/crate-data-smoke/lib.rs b/src/test/run-make-fulldeps/crate-data-smoke/lib.rs index 639a5d0387b8e..8002f11ec871b 100644 --- a/src/test/run-make-fulldeps/crate-data-smoke/lib.rs +++ b/src/test/run-make-fulldeps/crate-data-smoke/lib.rs @@ -1,12 +1,2 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "mylib"] #![crate_type = "lib"] diff --git a/src/test/run-make-fulldeps/crate-data-smoke/rlib.rs b/src/test/run-make-fulldeps/crate-data-smoke/rlib.rs index 4e0937486003c..47fcce4a7f67c 100644 --- a/src/test/run-make-fulldeps/crate-data-smoke/rlib.rs +++ b/src/test/run-make-fulldeps/crate-data-smoke/rlib.rs @@ -1,12 +1,2 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "mylib"] #![crate_type = "rlib"] diff --git a/src/test/run-make-fulldeps/crate-name-priority/foo.rs b/src/test/run-make-fulldeps/crate-name-priority/foo.rs index 8ae3d072362ed..f328e4d9d04c3 100644 --- a/src/test/run-make-fulldeps/crate-name-priority/foo.rs +++ b/src/test/run-make-fulldeps/crate-name-priority/foo.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() {} diff --git a/src/test/run-make-fulldeps/crate-name-priority/foo1.rs b/src/test/run-make-fulldeps/crate-name-priority/foo1.rs index a397d6bc749fe..4ff3bd9516bd9 100644 --- a/src/test/run-make-fulldeps/crate-name-priority/foo1.rs +++ b/src/test/run-make-fulldeps/crate-name-priority/foo1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] fn main() {} diff --git a/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/staticlib.rs b/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/staticlib.rs index b370b7b859d87..b24522e7f0efa 100644 --- a/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/staticlib.rs +++ b/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/staticlib.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="staticlib"] extern crate upstream; diff --git a/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/upstream.rs b/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/upstream.rs index a79b9bf08fc65..bd6820098eea4 100644 --- a/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/upstream.rs +++ b/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/upstream.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] pub fn foo() {} diff --git a/src/test/run-make-fulldeps/cross-lang-lto/lib.rs b/src/test/run-make-fulldeps/cross-lang-lto/lib.rs index b2a5b946160f0..94cfef6ada521 100644 --- a/src/test/run-make-fulldeps/cross-lang-lto/lib.rs +++ b/src/test/run-make-fulldeps/cross-lang-lto/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[no_mangle] pub extern "C" fn foo() { println!("abc"); diff --git a/src/test/run-make-fulldeps/cross-lang-lto/main.rs b/src/test/run-make-fulldeps/cross-lang-lto/main.rs index ccd34c9e4dbed..f6320bcb04aa8 100644 --- a/src/test/run-make-fulldeps/cross-lang-lto/main.rs +++ b/src/test/run-make-fulldeps/cross-lang-lto/main.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { println!("Hello World"); } diff --git a/src/test/run-make-fulldeps/debug-assertions/debug.rs b/src/test/run-make-fulldeps/debug-assertions/debug.rs index 65682cb86c368..76ca60a71c885 100644 --- a/src/test/run-make-fulldeps/debug-assertions/debug.rs +++ b/src/test/run-make-fulldeps/debug-assertions/debug.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![deny(warnings)] diff --git a/src/test/run-make-fulldeps/dep-info-doesnt-run-much/foo.rs b/src/test/run-make-fulldeps/dep-info-doesnt-run-much/foo.rs index 3591182104498..316e681293efd 100644 --- a/src/test/run-make-fulldeps/dep-info-doesnt-run-much/foo.rs +++ b/src/test/run-make-fulldeps/dep-info-doesnt-run-much/foo.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // We're only emitting dep info, so we shouldn't be running static analysis to // figure out that this program is erroneous. fn main() { diff --git a/src/test/run-make-fulldeps/dep-info-spaces/bar.rs b/src/test/run-make-fulldeps/dep-info-spaces/bar.rs index 4c79f7e285535..c5c0bc606cd69 100644 --- a/src/test/run-make-fulldeps/dep-info-spaces/bar.rs +++ b/src/test/run-make-fulldeps/dep-info-spaces/bar.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn bar() {} diff --git a/src/test/run-make-fulldeps/dep-info-spaces/lib.rs b/src/test/run-make-fulldeps/dep-info-spaces/lib.rs index bfbe41baeac48..6264e7b67ec6d 100644 --- a/src/test/run-make-fulldeps/dep-info-spaces/lib.rs +++ b/src/test/run-make-fulldeps/dep-info-spaces/lib.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[path="foo foo.rs"] pub mod foo; diff --git a/src/test/run-make-fulldeps/dep-info/bar.rs b/src/test/run-make-fulldeps/dep-info/bar.rs index 4c79f7e285535..c5c0bc606cd69 100644 --- a/src/test/run-make-fulldeps/dep-info/bar.rs +++ b/src/test/run-make-fulldeps/dep-info/bar.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn bar() {} diff --git a/src/test/run-make-fulldeps/dep-info/foo.rs b/src/test/run-make-fulldeps/dep-info/foo.rs index 2661b1f4eb49b..b76b4321d62aa 100644 --- a/src/test/run-make-fulldeps/dep-info/foo.rs +++ b/src/test/run-make-fulldeps/dep-info/foo.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn foo() {} diff --git a/src/test/run-make-fulldeps/dep-info/lib.rs b/src/test/run-make-fulldeps/dep-info/lib.rs index 7c15785bbb23d..eb8631259d43d 100644 --- a/src/test/run-make-fulldeps/dep-info/lib.rs +++ b/src/test/run-make-fulldeps/dep-info/lib.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] pub mod foo; diff --git a/src/test/run-make-fulldeps/dep-info/lib2.rs b/src/test/run-make-fulldeps/dep-info/lib2.rs index 1b70fb4eb4b47..f4fda9c93c5ff 100644 --- a/src/test/run-make-fulldeps/dep-info/lib2.rs +++ b/src/test/run-make-fulldeps/dep-info/lib2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] pub mod foo; diff --git a/src/test/run-make-fulldeps/duplicate-output-flavors/foo.rs b/src/test/run-make-fulldeps/duplicate-output-flavors/foo.rs index 04d3ae6720722..c1bfaa6cab5d9 100644 --- a/src/test/run-make-fulldeps/duplicate-output-flavors/foo.rs +++ b/src/test/run-make-fulldeps/duplicate-output-flavors/foo.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] diff --git a/src/test/run-make-fulldeps/dylib-chain/m1.rs b/src/test/run-make-fulldeps/dylib-chain/m1.rs index 5437c935c4e95..08c3f37522cea 100644 --- a/src/test/run-make-fulldeps/dylib-chain/m1.rs +++ b/src/test/run-make-fulldeps/dylib-chain/m1.rs @@ -1,12 +1,2 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "dylib"] pub fn m1() {} diff --git a/src/test/run-make-fulldeps/dylib-chain/m2.rs b/src/test/run-make-fulldeps/dylib-chain/m2.rs index b464f32eae204..62176ddc9f35f 100644 --- a/src/test/run-make-fulldeps/dylib-chain/m2.rs +++ b/src/test/run-make-fulldeps/dylib-chain/m2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "dylib"] extern crate m1; diff --git a/src/test/run-make-fulldeps/dylib-chain/m3.rs b/src/test/run-make-fulldeps/dylib-chain/m3.rs index bf431cc827b0b..d213aeda9ac19 100644 --- a/src/test/run-make-fulldeps/dylib-chain/m3.rs +++ b/src/test/run-make-fulldeps/dylib-chain/m3.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "dylib"] extern crate m2; diff --git a/src/test/run-make-fulldeps/dylib-chain/m4.rs b/src/test/run-make-fulldeps/dylib-chain/m4.rs index 6c2a66858028e..fa8ec6079deac 100644 --- a/src/test/run-make-fulldeps/dylib-chain/m4.rs +++ b/src/test/run-make-fulldeps/dylib-chain/m4.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate m3; fn main() { m3::m3() } diff --git a/src/test/run-make-fulldeps/emit/test-24876.rs b/src/test/run-make-fulldeps/emit/test-24876.rs index ab69decbf007e..734e2ee4bd419 100644 --- a/src/test/run-make-fulldeps/emit/test-24876.rs +++ b/src/test/run-make-fulldeps/emit/test-24876.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Checks for issue #24876 fn main() { diff --git a/src/test/run-make-fulldeps/emit/test-26235.rs b/src/test/run-make-fulldeps/emit/test-26235.rs index 97b58a3671bf3..07d975f3317ca 100644 --- a/src/test/run-make-fulldeps/emit/test-26235.rs +++ b/src/test/run-make-fulldeps/emit/test-26235.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Checks for issue #26235 fn main() { diff --git a/src/test/run-make-fulldeps/error-found-staticlib-instead-crate/bar.rs b/src/test/run-make-fulldeps/error-found-staticlib-instead-crate/bar.rs index 5ab3e5ee99dd8..fe35f1f8e2ead 100644 --- a/src/test/run-make-fulldeps/error-found-staticlib-instead-crate/bar.rs +++ b/src/test/run-make-fulldeps/error-found-staticlib-instead-crate/bar.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate foo; fn main() { diff --git a/src/test/run-make-fulldeps/error-found-staticlib-instead-crate/foo.rs b/src/test/run-make-fulldeps/error-found-staticlib-instead-crate/foo.rs index 222d98a12de9d..b76b4321d62aa 100644 --- a/src/test/run-make-fulldeps/error-found-staticlib-instead-crate/foo.rs +++ b/src/test/run-make-fulldeps/error-found-staticlib-instead-crate/foo.rs @@ -1,11 +1 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn foo() {} diff --git a/src/test/run-make-fulldeps/error-writing-dependencies/foo.rs b/src/test/run-make-fulldeps/error-writing-dependencies/foo.rs index 8ae3d072362ed..f328e4d9d04c3 100644 --- a/src/test/run-make-fulldeps/error-writing-dependencies/foo.rs +++ b/src/test/run-make-fulldeps/error-writing-dependencies/foo.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() {} diff --git a/src/test/run-make-fulldeps/exit-code/compile-error.rs b/src/test/run-make-fulldeps/exit-code/compile-error.rs index 8c05318a50819..a96c197606cce 100644 --- a/src/test/run-make-fulldeps/exit-code/compile-error.rs +++ b/src/test/run-make-fulldeps/exit-code/compile-error.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { compile_error!("kaboom"); } diff --git a/src/test/run-make-fulldeps/exit-code/lint-failure.rs b/src/test/run-make-fulldeps/exit-code/lint-failure.rs index 910abfd5d7ee5..70bdddc6246bd 100644 --- a/src/test/run-make-fulldeps/exit-code/lint-failure.rs +++ b/src/test/run-make-fulldeps/exit-code/lint-failure.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(intra_doc_link_resolution_failure)] /// [intradoc::failure] diff --git a/src/test/run-make-fulldeps/exit-code/success.rs b/src/test/run-make-fulldeps/exit-code/success.rs index 9f6c5734a3097..55b8e42b6e201 100644 --- a/src/test/run-make-fulldeps/exit-code/success.rs +++ b/src/test/run-make-fulldeps/exit-code/success.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// Main function fn main() { println!("Hello, world!"); diff --git a/src/test/run-make-fulldeps/extern-diff-internal-name/lib.rs b/src/test/run-make-fulldeps/extern-diff-internal-name/lib.rs index e8779bba13c88..ad96f70866e4f 100644 --- a/src/test/run-make-fulldeps/extern-diff-internal-name/lib.rs +++ b/src/test/run-make-fulldeps/extern-diff-internal-name/lib.rs @@ -1,12 +1,2 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "bar"] #![crate_type = "rlib"] diff --git a/src/test/run-make-fulldeps/extern-diff-internal-name/test.rs b/src/test/run-make-fulldeps/extern-diff-internal-name/test.rs index 11e042c8c4a06..4c53dc28a80e6 100644 --- a/src/test/run-make-fulldeps/extern-diff-internal-name/test.rs +++ b/src/test/run-make-fulldeps/extern-diff-internal-name/test.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate foo; diff --git a/src/test/run-make-fulldeps/extern-flag-disambiguates/a.rs b/src/test/run-make-fulldeps/extern-flag-disambiguates/a.rs index ac92aede7894f..2b1a3190150fe 100644 --- a/src/test/run-make-fulldeps/extern-flag-disambiguates/a.rs +++ b/src/test/run-make-fulldeps/extern-flag-disambiguates/a.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "a"] #![crate_type = "rlib"] diff --git a/src/test/run-make-fulldeps/extern-flag-disambiguates/b.rs b/src/test/run-make-fulldeps/extern-flag-disambiguates/b.rs index 8ae238f5a482c..1d7a7339ce27e 100644 --- a/src/test/run-make-fulldeps/extern-flag-disambiguates/b.rs +++ b/src/test/run-make-fulldeps/extern-flag-disambiguates/b.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "b"] #![crate_type = "rlib"] diff --git a/src/test/run-make-fulldeps/extern-flag-disambiguates/c.rs b/src/test/run-make-fulldeps/extern-flag-disambiguates/c.rs index 6eccdf7e5c857..3f9d143ed2dc4 100644 --- a/src/test/run-make-fulldeps/extern-flag-disambiguates/c.rs +++ b/src/test/run-make-fulldeps/extern-flag-disambiguates/c.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "c"] #![crate_type = "rlib"] diff --git a/src/test/run-make-fulldeps/extern-flag-disambiguates/d.rs b/src/test/run-make-fulldeps/extern-flag-disambiguates/d.rs index 9923ff83a9185..249c6a107ff39 100644 --- a/src/test/run-make-fulldeps/extern-flag-disambiguates/d.rs +++ b/src/test/run-make-fulldeps/extern-flag-disambiguates/d.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[cfg(before)] extern crate a; extern crate b; extern crate c; diff --git a/src/test/run-make-fulldeps/extern-flag-fun/bar-alt.rs b/src/test/run-make-fulldeps/extern-flag-fun/bar-alt.rs index d6ebd9d896fbc..cdc6c27d800bd 100644 --- a/src/test/run-make-fulldeps/extern-flag-fun/bar-alt.rs +++ b/src/test/run-make-fulldeps/extern-flag-fun/bar-alt.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn f() {} diff --git a/src/test/run-make-fulldeps/extern-flag-fun/bar.rs b/src/test/run-make-fulldeps/extern-flag-fun/bar.rs index e6c760257380c..e69de29bb2d1d 100644 --- a/src/test/run-make-fulldeps/extern-flag-fun/bar.rs +++ b/src/test/run-make-fulldeps/extern-flag-fun/bar.rs @@ -1,9 +0,0 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. diff --git a/src/test/run-make-fulldeps/extern-flag-fun/foo.rs b/src/test/run-make-fulldeps/extern-flag-fun/foo.rs index 5274166864011..0edda7d7b8842 100644 --- a/src/test/run-make-fulldeps/extern-flag-fun/foo.rs +++ b/src/test/run-make-fulldeps/extern-flag-fun/foo.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate bar; fn main() {} diff --git a/src/test/run-make-fulldeps/extern-flag-rename-transitive/bar.rs b/src/test/run-make-fulldeps/extern-flag-rename-transitive/bar.rs index a14f3ba05b066..94446a07d6c54 100644 --- a/src/test/run-make-fulldeps/extern-flag-rename-transitive/bar.rs +++ b/src/test/run-make-fulldeps/extern-flag-rename-transitive/bar.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] extern crate foo; diff --git a/src/test/run-make-fulldeps/extern-flag-rename-transitive/baz.rs b/src/test/run-make-fulldeps/extern-flag-rename-transitive/baz.rs index a96c9f61c666c..c3908db34299d 100644 --- a/src/test/run-make-fulldeps/extern-flag-rename-transitive/baz.rs +++ b/src/test/run-make-fulldeps/extern-flag-rename-transitive/baz.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] extern crate a; diff --git a/src/test/run-make-fulldeps/extern-flag-rename-transitive/foo.rs b/src/test/run-make-fulldeps/extern-flag-rename-transitive/foo.rs index b18ce024718f4..c1bfaa6cab5d9 100644 --- a/src/test/run-make-fulldeps/extern-flag-rename-transitive/foo.rs +++ b/src/test/run-make-fulldeps/extern-flag-rename-transitive/foo.rs @@ -1,11 +1 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] diff --git a/src/test/run-make-fulldeps/extern-fn-generic/test.rs b/src/test/run-make-fulldeps/extern-fn-generic/test.rs index 8f5ff091b3b6b..0666bf4262de4 100644 --- a/src/test/run-make-fulldeps/extern-fn-generic/test.rs +++ b/src/test/run-make-fulldeps/extern-fn-generic/test.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate testcrate; extern "C" fn bar(ts: testcrate::TestStruct) -> T { ts.y } diff --git a/src/test/run-make-fulldeps/extern-fn-generic/testcrate.rs b/src/test/run-make-fulldeps/extern-fn-generic/testcrate.rs index d02c05047c009..f0a721d35e29a 100644 --- a/src/test/run-make-fulldeps/extern-fn-generic/testcrate.rs +++ b/src/test/run-make-fulldeps/extern-fn-generic/testcrate.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] #[repr(C)] diff --git a/src/test/run-make-fulldeps/extern-fn-mangle/test.rs b/src/test/run-make-fulldeps/extern-fn-mangle/test.rs index 35b5a9278a429..b213534c95812 100644 --- a/src/test/run-make-fulldeps/extern-fn-mangle/test.rs +++ b/src/test/run-make-fulldeps/extern-fn-mangle/test.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[no_mangle] pub extern "C" fn foo() -> i32 { 3 } diff --git a/src/test/run-make-fulldeps/extern-fn-reachable/dylib.rs b/src/test/run-make-fulldeps/extern-fn-reachable/dylib.rs index f24265e7a5229..cd01793487051 100644 --- a/src/test/run-make-fulldeps/extern-fn-reachable/dylib.rs +++ b/src/test/run-make-fulldeps/extern-fn-reachable/dylib.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "dylib"] #![allow(dead_code)] diff --git a/src/test/run-make-fulldeps/extern-fn-reachable/main.rs b/src/test/run-make-fulldeps/extern-fn-reachable/main.rs index 27387332c1c1f..64479c686889a 100644 --- a/src/test/run-make-fulldeps/extern-fn-reachable/main.rs +++ b/src/test/run-make-fulldeps/extern-fn-reachable/main.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_private)] extern crate rustc_metadata; diff --git a/src/test/run-make-fulldeps/extern-fn-struct-passing-abi/test.rs b/src/test/run-make-fulldeps/extern-fn-struct-passing-abi/test.rs index 54a4f868eb4e5..615163d9ad25b 100644 --- a/src/test/run-make-fulldeps/extern-fn-struct-passing-abi/test.rs +++ b/src/test/run-make-fulldeps/extern-fn-struct-passing-abi/test.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Passing structs via FFI should work regardless of whether // they get passed in multiple registers, byval pointers or the stack diff --git a/src/test/run-make-fulldeps/extern-fn-with-extern-types/test.rs b/src/test/run-make-fulldeps/extern-fn-with-extern-types/test.rs index 9d6c87885b16e..6c027cc8f57f1 100644 --- a/src/test/run-make-fulldeps/extern-fn-with-extern-types/test.rs +++ b/src/test/run-make-fulldeps/extern-fn-with-extern-types/test.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(extern_types)] #[link(name = "ctest", kind = "static")] diff --git a/src/test/run-make-fulldeps/extern-fn-with-packed-struct/test.rs b/src/test/run-make-fulldeps/extern-fn-with-packed-struct/test.rs index d2540ad61542b..7d7658ceeb3bf 100644 --- a/src/test/run-make-fulldeps/extern-fn-with-packed-struct/test.rs +++ b/src/test/run-make-fulldeps/extern-fn-with-packed-struct/test.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[repr(C, packed)] #[derive(Copy, Clone, Debug, PartialEq)] struct Foo { diff --git a/src/test/run-make-fulldeps/extern-fn-with-union/test.rs b/src/test/run-make-fulldeps/extern-fn-with-union/test.rs index f9277ba11f476..007dfdb5e1030 100644 --- a/src/test/run-make-fulldeps/extern-fn-with-union/test.rs +++ b/src/test/run-make-fulldeps/extern-fn-with-union/test.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate testcrate; use std::mem; diff --git a/src/test/run-make-fulldeps/extern-fn-with-union/testcrate.rs b/src/test/run-make-fulldeps/extern-fn-with-union/testcrate.rs index 66978c38511eb..b51526dfcee15 100644 --- a/src/test/run-make-fulldeps/extern-fn-with-union/testcrate.rs +++ b/src/test/run-make-fulldeps/extern-fn-with-union/testcrate.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] #[repr(C)] diff --git a/src/test/run-make-fulldeps/extern-multiple-copies/bar.rs b/src/test/run-make-fulldeps/extern-multiple-copies/bar.rs index a50f5de384c02..c6b3595f67753 100644 --- a/src/test/run-make-fulldeps/extern-multiple-copies/bar.rs +++ b/src/test/run-make-fulldeps/extern-multiple-copies/bar.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate foo2; // foo2 first to exhibit the bug extern crate foo1; diff --git a/src/test/run-make-fulldeps/extern-multiple-copies/foo1.rs b/src/test/run-make-fulldeps/extern-multiple-copies/foo1.rs index 0be200ddcd27d..c1bfaa6cab5d9 100644 --- a/src/test/run-make-fulldeps/extern-multiple-copies/foo1.rs +++ b/src/test/run-make-fulldeps/extern-multiple-copies/foo1.rs @@ -1,11 +1 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] diff --git a/src/test/run-make-fulldeps/extern-multiple-copies/foo2.rs b/src/test/run-make-fulldeps/extern-multiple-copies/foo2.rs index 0be200ddcd27d..c1bfaa6cab5d9 100644 --- a/src/test/run-make-fulldeps/extern-multiple-copies/foo2.rs +++ b/src/test/run-make-fulldeps/extern-multiple-copies/foo2.rs @@ -1,11 +1 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] diff --git a/src/test/run-make-fulldeps/extern-multiple-copies2/bar.rs b/src/test/run-make-fulldeps/extern-multiple-copies2/bar.rs index b8ac34aa53e30..b3088152d6ab8 100644 --- a/src/test/run-make-fulldeps/extern-multiple-copies2/bar.rs +++ b/src/test/run-make-fulldeps/extern-multiple-copies2/bar.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate foo2; // foo2 first to exhibit the bug #[macro_use] diff --git a/src/test/run-make-fulldeps/extern-multiple-copies2/foo1.rs b/src/test/run-make-fulldeps/extern-multiple-copies2/foo1.rs index 1787772053ba4..4c778e52ff4da 100644 --- a/src/test/run-make-fulldeps/extern-multiple-copies2/foo1.rs +++ b/src/test/run-make-fulldeps/extern-multiple-copies2/foo1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] pub struct A; diff --git a/src/test/run-make-fulldeps/extern-multiple-copies2/foo2.rs b/src/test/run-make-fulldeps/extern-multiple-copies2/foo2.rs index bad1030438779..2be103507dfd8 100644 --- a/src/test/run-make-fulldeps/extern-multiple-copies2/foo2.rs +++ b/src/test/run-make-fulldeps/extern-multiple-copies2/foo2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] #[macro_use] diff --git a/src/test/run-make-fulldeps/extern-overrides-distribution/libc.rs b/src/test/run-make-fulldeps/extern-overrides-distribution/libc.rs index a489d834a9236..ee51ae32886e3 100644 --- a/src/test/run-make-fulldeps/extern-overrides-distribution/libc.rs +++ b/src/test/run-make-fulldeps/extern-overrides-distribution/libc.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] pub fn foo() {} diff --git a/src/test/run-make-fulldeps/extern-overrides-distribution/main.rs b/src/test/run-make-fulldeps/extern-overrides-distribution/main.rs index 451841e736899..1290a8c56701c 100644 --- a/src/test/run-make-fulldeps/extern-overrides-distribution/main.rs +++ b/src/test/run-make-fulldeps/extern-overrides-distribution/main.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate libc; fn main() { diff --git a/src/test/run-make-fulldeps/extern-prelude/basic.rs b/src/test/run-make-fulldeps/extern-prelude/basic.rs index b8d6a772e2a98..dc7cc1f27b6f6 100644 --- a/src/test/run-make-fulldeps/extern-prelude/basic.rs +++ b/src/test/run-make-fulldeps/extern-prelude/basic.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(extern_prelude)] fn main() { diff --git a/src/test/run-make-fulldeps/extern-prelude/ep-lib.rs b/src/test/run-make-fulldeps/extern-prelude/ep-lib.rs index dac0a3ce760fa..f5e129eca6631 100644 --- a/src/test/run-make-fulldeps/extern-prelude/ep-lib.rs +++ b/src/test/run-make-fulldeps/extern-prelude/ep-lib.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] pub struct S; diff --git a/src/test/run-make-fulldeps/extern-prelude/ep-vec.rs b/src/test/run-make-fulldeps/extern-prelude/ep-vec.rs index f750a26f9e6ff..148a4a987266f 100644 --- a/src/test/run-make-fulldeps/extern-prelude/ep-vec.rs +++ b/src/test/run-make-fulldeps/extern-prelude/ep-vec.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] pub fn new(arg1: f32, arg2: ()) {} diff --git a/src/test/run-make-fulldeps/extern-prelude/feature-gate.rs b/src/test/run-make-fulldeps/extern-prelude/feature-gate.rs index 49763f3ba6a23..98852f599ed47 100644 --- a/src/test/run-make-fulldeps/extern-prelude/feature-gate.rs +++ b/src/test/run-make-fulldeps/extern-prelude/feature-gate.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let s = ep_lib::S; // Feature error } diff --git a/src/test/run-make-fulldeps/extern-prelude/relative-only.rs b/src/test/run-make-fulldeps/extern-prelude/relative-only.rs index 0cd56b93de6a0..0fdf3b49d96b4 100644 --- a/src/test/run-make-fulldeps/extern-prelude/relative-only.rs +++ b/src/test/run-make-fulldeps/extern-prelude/relative-only.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Extern prelude names are not available by absolute paths #![feature(extern_prelude)] diff --git a/src/test/run-make-fulldeps/extern-prelude/shadow-mod.rs b/src/test/run-make-fulldeps/extern-prelude/shadow-mod.rs index 52213c8d4f950..69411aaf57c71 100644 --- a/src/test/run-make-fulldeps/extern-prelude/shadow-mod.rs +++ b/src/test/run-make-fulldeps/extern-prelude/shadow-mod.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Local module shadows `ep_lib` from extern prelude mod ep_lib { diff --git a/src/test/run-make-fulldeps/extern-prelude/shadow-prelude.rs b/src/test/run-make-fulldeps/extern-prelude/shadow-prelude.rs index de1c4d16d39bb..6c6ce12708d79 100644 --- a/src/test/run-make-fulldeps/extern-prelude/shadow-prelude.rs +++ b/src/test/run-make-fulldeps/extern-prelude/shadow-prelude.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Extern prelude shadows standard library prelude #![feature(extern_prelude)] diff --git a/src/test/run-make-fulldeps/extra-filename-with-temp-outputs/foo.rs b/src/test/run-make-fulldeps/extra-filename-with-temp-outputs/foo.rs index 8ae3d072362ed..f328e4d9d04c3 100644 --- a/src/test/run-make-fulldeps/extra-filename-with-temp-outputs/foo.rs +++ b/src/test/run-make-fulldeps/extra-filename-with-temp-outputs/foo.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() {} diff --git a/src/test/run-make-fulldeps/fpic/hello.rs b/src/test/run-make-fulldeps/fpic/hello.rs index a9e231b0ea839..45590d86ba6c5 100644 --- a/src/test/run-make-fulldeps/fpic/hello.rs +++ b/src/test/run-make-fulldeps/fpic/hello.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { } diff --git a/src/test/run-make-fulldeps/hir-tree/input.rs b/src/test/run-make-fulldeps/hir-tree/input.rs index 12adc083bcd10..9d1a4e9e47d71 100644 --- a/src/test/run-make-fulldeps/hir-tree/input.rs +++ b/src/test/run-make-fulldeps/hir-tree/input.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { println!("Hello, Rustaceans!"); } diff --git a/src/test/run-make-fulldeps/hotplug_codegen_backend/some_crate.rs b/src/test/run-make-fulldeps/hotplug_codegen_backend/some_crate.rs index bfa8b6b3ef69a..da27b7f3463da 100644 --- a/src/test/run-make-fulldeps/hotplug_codegen_backend/some_crate.rs +++ b/src/test/run-make-fulldeps/hotplug_codegen_backend/some_crate.rs @@ -1,12 +1,2 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(no_core)] #![no_core] diff --git a/src/test/run-make-fulldeps/hotplug_codegen_backend/the_backend.rs b/src/test/run-make-fulldeps/hotplug_codegen_backend/the_backend.rs index 87d2026fe2dc8..d6b17f22a90fa 100644 --- a/src/test/run-make-fulldeps/hotplug_codegen_backend/the_backend.rs +++ b/src/test/run-make-fulldeps/hotplug_codegen_backend/the_backend.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_private)] extern crate syntax; diff --git a/src/test/run-make-fulldeps/include_bytes_deps/main.rs b/src/test/run-make-fulldeps/include_bytes_deps/main.rs index 27ca1a46a500d..00ad0eb8d5072 100644 --- a/src/test/run-make-fulldeps/include_bytes_deps/main.rs +++ b/src/test/run-make-fulldeps/include_bytes_deps/main.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(external_doc)] #[doc(include="input.md")] diff --git a/src/test/run-make-fulldeps/inline-always-many-cgu/foo.rs b/src/test/run-make-fulldeps/inline-always-many-cgu/foo.rs index 539dcdfa9b30b..65fe69c16fe7c 100644 --- a/src/test/run-make-fulldeps/inline-always-many-cgu/foo.rs +++ b/src/test/run-make-fulldeps/inline-always-many-cgu/foo.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] pub mod a { diff --git a/src/test/run-make-fulldeps/interdependent-c-libraries/bar.rs b/src/test/run-make-fulldeps/interdependent-c-libraries/bar.rs index 1963976b4b0f5..2794be53ce4dd 100644 --- a/src/test/run-make-fulldeps/interdependent-c-libraries/bar.rs +++ b/src/test/run-make-fulldeps/interdependent-c-libraries/bar.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] extern crate foo; diff --git a/src/test/run-make-fulldeps/interdependent-c-libraries/foo.rs b/src/test/run-make-fulldeps/interdependent-c-libraries/foo.rs index 7a0fe6bb18f90..891c47d61de97 100644 --- a/src/test/run-make-fulldeps/interdependent-c-libraries/foo.rs +++ b/src/test/run-make-fulldeps/interdependent-c-libraries/foo.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] #[link(name = "foo", kind = "static")] diff --git a/src/test/run-make-fulldeps/interdependent-c-libraries/main.rs b/src/test/run-make-fulldeps/interdependent-c-libraries/main.rs index f42e3dd44a924..2aba427df4743 100644 --- a/src/test/run-make-fulldeps/interdependent-c-libraries/main.rs +++ b/src/test/run-make-fulldeps/interdependent-c-libraries/main.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate foo; extern crate bar; diff --git a/src/test/run-make-fulldeps/intrinsic-unreachable/exit-ret.rs b/src/test/run-make-fulldeps/intrinsic-unreachable/exit-ret.rs index 1b8b644dd78e8..936001c43a48f 100644 --- a/src/test/run-make-fulldeps/intrinsic-unreachable/exit-ret.rs +++ b/src/test/run-make-fulldeps/intrinsic-unreachable/exit-ret.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(asm)] #![crate_type="lib"] diff --git a/src/test/run-make-fulldeps/intrinsic-unreachable/exit-unreachable.rs b/src/test/run-make-fulldeps/intrinsic-unreachable/exit-unreachable.rs index de63809ab6638..00b09cb9460b1 100644 --- a/src/test/run-make-fulldeps/intrinsic-unreachable/exit-unreachable.rs +++ b/src/test/run-make-fulldeps/intrinsic-unreachable/exit-unreachable.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(asm, core_intrinsics)] #![crate_type="lib"] diff --git a/src/test/run-make-fulldeps/invalid-library/foo.rs b/src/test/run-make-fulldeps/invalid-library/foo.rs index 6316cfa3bba08..bb7b36c496efa 100644 --- a/src/test/run-make-fulldeps/invalid-library/foo.rs +++ b/src/test/run-make-fulldeps/invalid-library/foo.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate foo; fn main() {} diff --git a/src/test/run-make-fulldeps/issue-11908/bar.rs b/src/test/run-make-fulldeps/issue-11908/bar.rs index 6316cfa3bba08..bb7b36c496efa 100644 --- a/src/test/run-make-fulldeps/issue-11908/bar.rs +++ b/src/test/run-make-fulldeps/issue-11908/bar.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate foo; fn main() {} diff --git a/src/test/run-make-fulldeps/issue-11908/foo.rs b/src/test/run-make-fulldeps/issue-11908/foo.rs index 0858d3c4e47a1..82b2dfe9fdb51 100644 --- a/src/test/run-make-fulldeps/issue-11908/foo.rs +++ b/src/test/run-make-fulldeps/issue-11908/foo.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] diff --git a/src/test/run-make-fulldeps/issue-14500/bar.rs b/src/test/run-make-fulldeps/issue-14500/bar.rs index 4b4916fe96d63..49af74e1b7489 100644 --- a/src/test/run-make-fulldeps/issue-14500/bar.rs +++ b/src/test/run-make-fulldeps/issue-14500/bar.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate foo; diff --git a/src/test/run-make-fulldeps/issue-14500/foo.rs b/src/test/run-make-fulldeps/issue-14500/foo.rs index a91d8d6a21df4..feebef1a6d079 100644 --- a/src/test/run-make-fulldeps/issue-14500/foo.rs +++ b/src/test/run-make-fulldeps/issue-14500/foo.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[no_mangle] pub extern fn foo() {} diff --git a/src/test/run-make-fulldeps/issue-14698/foo.rs b/src/test/run-make-fulldeps/issue-14698/foo.rs index 7dc79f2043ba8..f328e4d9d04c3 100644 --- a/src/test/run-make-fulldeps/issue-14698/foo.rs +++ b/src/test/run-make-fulldeps/issue-14698/foo.rs @@ -1,11 +1 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() {} diff --git a/src/test/run-make-fulldeps/issue-15460/bar.rs b/src/test/run-make-fulldeps/issue-15460/bar.rs index 46777f7fbd241..e66aeb6bd39e6 100644 --- a/src/test/run-make-fulldeps/issue-15460/bar.rs +++ b/src/test/run-make-fulldeps/issue-15460/bar.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate foo; fn main() { unsafe { foo::foo() } diff --git a/src/test/run-make-fulldeps/issue-15460/foo.rs b/src/test/run-make-fulldeps/issue-15460/foo.rs index 6917fa5557980..9beafd9ff3532 100644 --- a/src/test/run-make-fulldeps/issue-15460/foo.rs +++ b/src/test/run-make-fulldeps/issue-15460/foo.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "dylib"] #[link(name = "foo", kind = "static")] diff --git a/src/test/run-make-fulldeps/issue-18943/foo.rs b/src/test/run-make-fulldeps/issue-18943/foo.rs index aadf0f593e745..0b29c8712802d 100644 --- a/src/test/run-make-fulldeps/issue-18943/foo.rs +++ b/src/test/run-make-fulldeps/issue-18943/foo.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { } trait Bar { } diff --git a/src/test/run-make-fulldeps/issue-19371/foo.rs b/src/test/run-make-fulldeps/issue-19371/foo.rs index 4dfecb33c144d..62904e42aab08 100644 --- a/src/test/run-make-fulldeps/issue-19371/foo.rs +++ b/src/test/run-make-fulldeps/issue-19371/foo.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_private)] extern crate rustc; diff --git a/src/test/run-make-fulldeps/issue-20626/foo.rs b/src/test/run-make-fulldeps/issue-20626/foo.rs index 9f727607e4ed8..a474e234e72d0 100644 --- a/src/test/run-make-fulldeps/issue-20626/foo.rs +++ b/src/test/run-make-fulldeps/issue-20626/foo.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn identity(a: &u32) -> &u32 { a } fn print_foo(f: &fn(&u32) -> &u32, x: &u32) { diff --git a/src/test/run-make-fulldeps/issue-22131/foo.rs b/src/test/run-make-fulldeps/issue-22131/foo.rs index 50c63abc0d4e5..33255d76879f3 100644 --- a/src/test/run-make-fulldeps/issue-22131/foo.rs +++ b/src/test/run-make-fulldeps/issue-22131/foo.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// ```rust /// assert_eq!(foo::foo(), 1); /// ``` diff --git a/src/test/run-make-fulldeps/issue-24445/foo.rs b/src/test/run-make-fulldeps/issue-24445/foo.rs index 65e505df5ef17..b67f3847cd498 100644 --- a/src/test/run-make-fulldeps/issue-24445/foo.rs +++ b/src/test/run-make-fulldeps/issue-24445/foo.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "staticlib"] struct Destroy; diff --git a/src/test/run-make-fulldeps/issue-25581/test.rs b/src/test/run-make-fulldeps/issue-25581/test.rs index 6717d16cb7c41..018070b4c307a 100644 --- a/src/test/run-make-fulldeps/issue-25581/test.rs +++ b/src/test/run-make-fulldeps/issue-25581/test.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(libc)] extern crate libc; diff --git a/src/test/run-make-fulldeps/issue-26006/in/libc/lib.rs b/src/test/run-make-fulldeps/issue-26006/in/libc/lib.rs index 177ffdce0627d..23f2bf51800a3 100644 --- a/src/test/run-make-fulldeps/issue-26006/in/libc/lib.rs +++ b/src/test/run-make-fulldeps/issue-26006/in/libc/lib.rs @@ -1,12 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![crate_type="rlib"] pub fn something(){} diff --git a/src/test/run-make-fulldeps/issue-26006/in/time/lib.rs b/src/test/run-make-fulldeps/issue-26006/in/time/lib.rs index b1d07d5733796..156ff24ca8b1c 100644 --- a/src/test/run-make-fulldeps/issue-26006/in/time/lib.rs +++ b/src/test/run-make-fulldeps/issue-26006/in/time/lib.rs @@ -1,12 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![feature(libc)] extern crate libc; diff --git a/src/test/run-make-fulldeps/issue-26092/blank.rs b/src/test/run-make-fulldeps/issue-26092/blank.rs index 8ae3d072362ed..f328e4d9d04c3 100644 --- a/src/test/run-make-fulldeps/issue-26092/blank.rs +++ b/src/test/run-make-fulldeps/issue-26092/blank.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() {} diff --git a/src/test/run-make-fulldeps/issue-28595/a.rs b/src/test/run-make-fulldeps/issue-28595/a.rs index 7377a9f3416f8..448364151868c 100644 --- a/src/test/run-make-fulldeps/issue-28595/a.rs +++ b/src/test/run-make-fulldeps/issue-28595/a.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] #[link(name = "a", kind = "static")] diff --git a/src/test/run-make-fulldeps/issue-28595/b.rs b/src/test/run-make-fulldeps/issue-28595/b.rs index 37ff346c3f3f3..24ab412284dd3 100644 --- a/src/test/run-make-fulldeps/issue-28595/b.rs +++ b/src/test/run-make-fulldeps/issue-28595/b.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate a; #[link(name = "b", kind = "static")] diff --git a/src/test/run-make-fulldeps/issue-28766/foo.rs b/src/test/run-make-fulldeps/issue-28766/foo.rs index 3ed0a6bfc7472..1dcabe42dc116 100644 --- a/src/test/run-make-fulldeps/issue-28766/foo.rs +++ b/src/test/run-make-fulldeps/issue-28766/foo.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="lib"] pub struct Foo(()); diff --git a/src/test/run-make-fulldeps/issue-28766/main.rs b/src/test/run-make-fulldeps/issue-28766/main.rs index d1dadbdc7ad3e..de12b1fd9dc3d 100644 --- a/src/test/run-make-fulldeps/issue-28766/main.rs +++ b/src/test/run-make-fulldeps/issue-28766/main.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="lib"] extern crate foo; use foo::Foo; diff --git a/src/test/run-make-fulldeps/issue-30063/foo.rs b/src/test/run-make-fulldeps/issue-30063/foo.rs index 45f7a2c2aa6fb..45590d86ba6c5 100644 --- a/src/test/run-make-fulldeps/issue-30063/foo.rs +++ b/src/test/run-make-fulldeps/issue-30063/foo.rs @@ -1,11 +1 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { } diff --git a/src/test/run-make-fulldeps/issue-33329/main.rs b/src/test/run-make-fulldeps/issue-33329/main.rs index e06c0a5ec2a4c..f328e4d9d04c3 100644 --- a/src/test/run-make-fulldeps/issue-33329/main.rs +++ b/src/test/run-make-fulldeps/issue-33329/main.rs @@ -1,11 +1 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() {} diff --git a/src/test/run-make-fulldeps/issue-35164/main.rs b/src/test/run-make-fulldeps/issue-35164/main.rs index 24322a2484fe0..1333d63224c07 100644 --- a/src/test/run-make-fulldeps/issue-35164/main.rs +++ b/src/test/run-make-fulldeps/issue-35164/main.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod submodule; fn main() { diff --git a/src/test/run-make-fulldeps/issue-35164/submodule/mod.rs b/src/test/run-make-fulldeps/issue-35164/submodule/mod.rs index 7847c13af787d..a9045b242fb3d 100644 --- a/src/test/run-make-fulldeps/issue-35164/submodule/mod.rs +++ b/src/test/run-make-fulldeps/issue-35164/submodule/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn foo() { let _MyFoo = 2; } diff --git a/src/test/run-make-fulldeps/issue-36710/foo.rs b/src/test/run-make-fulldeps/issue-36710/foo.rs index 6e50566ddfde0..a9d3effbd1806 100644 --- a/src/test/run-make-fulldeps/issue-36710/foo.rs +++ b/src/test/run-make-fulldeps/issue-36710/foo.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that linking to C++ code with global destructors works. extern { fn get() -> u32; } diff --git a/src/test/run-make-fulldeps/issue-37839/a.rs b/src/test/run-make-fulldeps/issue-37839/a.rs index 052317438c2f7..b5dffac3ff6a1 100644 --- a/src/test/run-make-fulldeps/issue-37839/a.rs +++ b/src/test/run-make-fulldeps/issue-37839/a.rs @@ -1,12 +1,2 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused)] #![crate_type = "proc-macro"] diff --git a/src/test/run-make-fulldeps/issue-37839/b.rs b/src/test/run-make-fulldeps/issue-37839/b.rs index 82f48f6d8d667..355d2b165274b 100644 --- a/src/test/run-make-fulldeps/issue-37839/b.rs +++ b/src/test/run-make-fulldeps/issue-37839/b.rs @@ -1,12 +1,2 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] #[macro_use] extern crate a; diff --git a/src/test/run-make-fulldeps/issue-37839/c.rs b/src/test/run-make-fulldeps/issue-37839/c.rs index 85bece514279c..4c7ce01b6a02c 100644 --- a/src/test/run-make-fulldeps/issue-37839/c.rs +++ b/src/test/run-make-fulldeps/issue-37839/c.rs @@ -1,12 +1,2 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] extern crate b; diff --git a/src/test/run-make-fulldeps/issue-37893/a.rs b/src/test/run-make-fulldeps/issue-37893/a.rs index 052317438c2f7..b5dffac3ff6a1 100644 --- a/src/test/run-make-fulldeps/issue-37893/a.rs +++ b/src/test/run-make-fulldeps/issue-37893/a.rs @@ -1,12 +1,2 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused)] #![crate_type = "proc-macro"] diff --git a/src/test/run-make-fulldeps/issue-37893/b.rs b/src/test/run-make-fulldeps/issue-37893/b.rs index 82f48f6d8d667..355d2b165274b 100644 --- a/src/test/run-make-fulldeps/issue-37893/b.rs +++ b/src/test/run-make-fulldeps/issue-37893/b.rs @@ -1,12 +1,2 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] #[macro_use] extern crate a; diff --git a/src/test/run-make-fulldeps/issue-37893/c.rs b/src/test/run-make-fulldeps/issue-37893/c.rs index eee55cc236966..b9c2155728cb7 100644 --- a/src/test/run-make-fulldeps/issue-37893/c.rs +++ b/src/test/run-make-fulldeps/issue-37893/c.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "staticlib"] extern crate b; extern crate a; diff --git a/src/test/run-make-fulldeps/issue-38237/bar.rs b/src/test/run-make-fulldeps/issue-38237/bar.rs index 794e08c2fe338..2b839f3a3b334 100644 --- a/src/test/run-make-fulldeps/issue-38237/bar.rs +++ b/src/test/run-make-fulldeps/issue-38237/bar.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] #[derive(Debug)] diff --git a/src/test/run-make-fulldeps/issue-38237/baz.rs b/src/test/run-make-fulldeps/issue-38237/baz.rs index c2a2c89db016f..cd2425f9b692b 100644 --- a/src/test/run-make-fulldeps/issue-38237/baz.rs +++ b/src/test/run-make-fulldeps/issue-38237/baz.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate foo; extern crate bar; diff --git a/src/test/run-make-fulldeps/issue-38237/foo.rs b/src/test/run-make-fulldeps/issue-38237/foo.rs index 6fb315731de17..a106e4fde5cc3 100644 --- a/src/test/run-make-fulldeps/issue-38237/foo.rs +++ b/src/test/run-make-fulldeps/issue-38237/foo.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "proc-macro"] extern crate proc_macro; diff --git a/src/test/run-make-fulldeps/issue-40535/bar.rs b/src/test/run-make-fulldeps/issue-40535/bar.rs index 4c22f181975b8..b02b28f59d9ef 100644 --- a/src/test/run-make-fulldeps/issue-40535/bar.rs +++ b/src/test/run-make-fulldeps/issue-40535/bar.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] extern crate baz; diff --git a/src/test/run-make-fulldeps/issue-40535/baz.rs b/src/test/run-make-fulldeps/issue-40535/baz.rs index 737a918a0398d..83be6e807e0b9 100644 --- a/src/test/run-make-fulldeps/issue-40535/baz.rs +++ b/src/test/run-make-fulldeps/issue-40535/baz.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] diff --git a/src/test/run-make-fulldeps/issue-40535/foo.rs b/src/test/run-make-fulldeps/issue-40535/foo.rs index 53a8c8636b148..270202664257b 100644 --- a/src/test/run-make-fulldeps/issue-40535/foo.rs +++ b/src/test/run-make-fulldeps/issue-40535/foo.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] extern crate bar; diff --git a/src/test/run-make-fulldeps/issue-46239/main.rs b/src/test/run-make-fulldeps/issue-46239/main.rs index 3b3289168abe9..b7df5cf4d8128 100644 --- a/src/test/run-make-fulldeps/issue-46239/main.rs +++ b/src/test/run-make-fulldeps/issue-46239/main.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn project(x: &(T,)) -> &T { &x.0 } fn dummy() {} diff --git a/src/test/run-make-fulldeps/issue-51671/app.rs b/src/test/run-make-fulldeps/issue-51671/app.rs index 453602b800b5e..246373f124aac 100644 --- a/src/test/run-make-fulldeps/issue-51671/app.rs +++ b/src/test/run-make-fulldeps/issue-51671/app.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "bin"] #![feature(lang_items)] #![feature(panic_implementation)] diff --git a/src/test/run-make-fulldeps/issue-7349/foo.rs b/src/test/run-make-fulldeps/issue-7349/foo.rs index b75c82afb53d0..246a12595808b 100644 --- a/src/test/run-make-fulldeps/issue-7349/foo.rs +++ b/src/test/run-make-fulldeps/issue-7349/foo.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn outer() { #[allow(dead_code)] fn inner() -> u32 { diff --git a/src/test/run-make-fulldeps/issues-41478-43796/a.rs b/src/test/run-make-fulldeps/issues-41478-43796/a.rs index 9d95f8b258527..fd67221144a38 100644 --- a/src/test/run-make-fulldeps/issues-41478-43796/a.rs +++ b/src/test/run-make-fulldeps/issues-41478-43796/a.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] pub struct V(S); pub trait An { diff --git a/src/test/run-make-fulldeps/libs-and-bins/foo.rs b/src/test/run-make-fulldeps/libs-and-bins/foo.rs index 2ebe63928cad6..ae166b17840e3 100644 --- a/src/test/run-make-fulldeps/libs-and-bins/foo.rs +++ b/src/test/run-make-fulldeps/libs-and-bins/foo.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "dylib"] #![crate_type = "bin"] diff --git a/src/test/run-make-fulldeps/libs-through-symlinks/bar.rs b/src/test/run-make-fulldeps/libs-through-symlinks/bar.rs index 6316cfa3bba08..bb7b36c496efa 100644 --- a/src/test/run-make-fulldeps/libs-through-symlinks/bar.rs +++ b/src/test/run-make-fulldeps/libs-through-symlinks/bar.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate foo; fn main() {} diff --git a/src/test/run-make-fulldeps/libs-through-symlinks/foo.rs b/src/test/run-make-fulldeps/libs-through-symlinks/foo.rs index dd818cf87986d..8e3df2c6d4e51 100644 --- a/src/test/run-make-fulldeps/libs-through-symlinks/foo.rs +++ b/src/test/run-make-fulldeps/libs-through-symlinks/foo.rs @@ -1,12 +1,2 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] #![crate_name = "foo"] diff --git a/src/test/run-make-fulldeps/libtest-json/f.rs b/src/test/run-make-fulldeps/libtest-json/f.rs index 5cff1f1a5b1af..29d52ee96540f 100644 --- a/src/test/run-make-fulldeps/libtest-json/f.rs +++ b/src/test/run-make-fulldeps/libtest-json/f.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[test] fn a() { // Should pass diff --git a/src/test/run-make-fulldeps/link-arg/empty.rs b/src/test/run-make-fulldeps/link-arg/empty.rs index 2b76fb24e5f1e..45590d86ba6c5 100644 --- a/src/test/run-make-fulldeps/link-arg/empty.rs +++ b/src/test/run-make-fulldeps/link-arg/empty.rs @@ -1,11 +1 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { } diff --git a/src/test/run-make-fulldeps/link-cfg/dep-with-staticlib.rs b/src/test/run-make-fulldeps/link-cfg/dep-with-staticlib.rs index ecc2365ddb06d..55c96df7b5891 100644 --- a/src/test/run-make-fulldeps/link-cfg/dep-with-staticlib.rs +++ b/src/test/run-make-fulldeps/link-cfg/dep-with-staticlib.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(link_cfg)] #![crate_type = "rlib"] diff --git a/src/test/run-make-fulldeps/link-cfg/dep.rs b/src/test/run-make-fulldeps/link-cfg/dep.rs index 7da879c2bfa2b..149ae61bf88df 100644 --- a/src/test/run-make-fulldeps/link-cfg/dep.rs +++ b/src/test/run-make-fulldeps/link-cfg/dep.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(link_cfg)] #![crate_type = "rlib"] diff --git a/src/test/run-make-fulldeps/link-cfg/no-deps.rs b/src/test/run-make-fulldeps/link-cfg/no-deps.rs index 6b1141067440b..6dba7fe218e2b 100644 --- a/src/test/run-make-fulldeps/link-cfg/no-deps.rs +++ b/src/test/run-make-fulldeps/link-cfg/no-deps.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(link_cfg)] #[link(name = "return1", cfg(foo))] diff --git a/src/test/run-make-fulldeps/link-cfg/with-deps.rs b/src/test/run-make-fulldeps/link-cfg/with-deps.rs index 799555c500a16..48b7828152eb9 100644 --- a/src/test/run-make-fulldeps/link-cfg/with-deps.rs +++ b/src/test/run-make-fulldeps/link-cfg/with-deps.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate dep; fn main() { diff --git a/src/test/run-make-fulldeps/link-cfg/with-staticlib-deps.rs b/src/test/run-make-fulldeps/link-cfg/with-staticlib-deps.rs index 33a9c7720e268..23e5926a73ce3 100644 --- a/src/test/run-make-fulldeps/link-cfg/with-staticlib-deps.rs +++ b/src/test/run-make-fulldeps/link-cfg/with-staticlib-deps.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate dep_with_staticlib; fn main() { diff --git a/src/test/run-make-fulldeps/link-path-order/main.rs b/src/test/run-make-fulldeps/link-path-order/main.rs index f3502e8bcd413..4674bfe35dbbe 100644 --- a/src/test/run-make-fulldeps/link-path-order/main.rs +++ b/src/test/run-make-fulldeps/link-path-order/main.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(libc)] extern crate libc; diff --git a/src/test/run-make-fulldeps/linkage-attr-on-static/bar.rs b/src/test/run-make-fulldeps/linkage-attr-on-static/bar.rs index 274401c448bad..b827532e8890d 100644 --- a/src/test/run-make-fulldeps/linkage-attr-on-static/bar.rs +++ b/src/test/run-make-fulldeps/linkage-attr-on-static/bar.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(linkage)] #[no_mangle] diff --git a/src/test/run-make-fulldeps/linker-output-non-utf8/exec.rs b/src/test/run-make-fulldeps/linker-output-non-utf8/exec.rs index 1c03eb479fdea..6864018d64e97 100644 --- a/src/test/run-make-fulldeps/linker-output-non-utf8/exec.rs +++ b/src/test/run-make-fulldeps/linker-output-non-utf8/exec.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[link(name="library")] extern "C" { fn foo(); diff --git a/src/test/run-make-fulldeps/linker-output-non-utf8/library.rs b/src/test/run-make-fulldeps/linker-output-non-utf8/library.rs index 194be26424ad8..6689a82fa2c49 100644 --- a/src/test/run-make-fulldeps/linker-output-non-utf8/library.rs +++ b/src/test/run-make-fulldeps/linker-output-non-utf8/library.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "staticlib"] extern "C" { diff --git a/src/test/run-make-fulldeps/llvm-pass/main.rs b/src/test/run-make-fulldeps/llvm-pass/main.rs index 5b5ab94bcef02..0c13b890c6e3a 100644 --- a/src/test/run-make-fulldeps/llvm-pass/main.rs +++ b/src/test/run-make-fulldeps/llvm-pass/main.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(plugin)] #![plugin(some_plugin)] diff --git a/src/test/run-make-fulldeps/llvm-pass/plugin.rs b/src/test/run-make-fulldeps/llvm-pass/plugin.rs index f77b2fca857a6..f0e4800046cf4 100644 --- a/src/test/run-make-fulldeps/llvm-pass/plugin.rs +++ b/src/test/run-make-fulldeps/llvm-pass/plugin.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(plugin_registrar, rustc_private)] #![crate_type = "dylib"] #![crate_name = "some_plugin"] diff --git a/src/test/run-make-fulldeps/long-linker-command-lines-cmd-exe/foo.rs b/src/test/run-make-fulldeps/long-linker-command-lines-cmd-exe/foo.rs index 67d8ad0b67255..74d7b9b07f697 100644 --- a/src/test/run-make-fulldeps/long-linker-command-lines-cmd-exe/foo.rs +++ b/src/test/run-make-fulldeps/long-linker-command-lines-cmd-exe/foo.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Like the `long-linker-command-lines` test this test attempts to blow // a command line limit for running the linker. Unlike that test, however, // this test is testing `cmd.exe` specifically rather than the OS. diff --git a/src/test/run-make-fulldeps/long-linker-command-lines/foo.rs b/src/test/run-make-fulldeps/long-linker-command-lines/foo.rs index 2ac240982afc4..ac42141365e9d 100644 --- a/src/test/run-make-fulldeps/long-linker-command-lines/foo.rs +++ b/src/test/run-make-fulldeps/long-linker-command-lines/foo.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This is a test which attempts to blow out the system limit with how many // arguments can be passed to a process. This'll successively call rustc with // larger and larger argument lists in an attempt to find one that's way too diff --git a/src/test/run-make-fulldeps/longjmp-across-rust/main.rs b/src/test/run-make-fulldeps/longjmp-across-rust/main.rs index c420473a560eb..5b43c1cc3b70a 100644 --- a/src/test/run-make-fulldeps/longjmp-across-rust/main.rs +++ b/src/test/run-make-fulldeps/longjmp-across-rust/main.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[link(name = "foo", kind = "static")] extern { fn test_start(f: extern fn()); diff --git a/src/test/run-make-fulldeps/ls-metadata/foo.rs b/src/test/run-make-fulldeps/ls-metadata/foo.rs index 8ae3d072362ed..f328e4d9d04c3 100644 --- a/src/test/run-make-fulldeps/ls-metadata/foo.rs +++ b/src/test/run-make-fulldeps/ls-metadata/foo.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() {} diff --git a/src/test/run-make-fulldeps/lto-no-link-whole-rlib/lib1.rs b/src/test/run-make-fulldeps/lto-no-link-whole-rlib/lib1.rs index 0a87c8e472558..4b43b86600c52 100644 --- a/src/test/run-make-fulldeps/lto-no-link-whole-rlib/lib1.rs +++ b/src/test/run-make-fulldeps/lto-no-link-whole-rlib/lib1.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] #[link(name = "foo", kind = "static")] diff --git a/src/test/run-make-fulldeps/lto-no-link-whole-rlib/lib2.rs b/src/test/run-make-fulldeps/lto-no-link-whole-rlib/lib2.rs index 6e3f382b3fd92..50b7882a05a53 100644 --- a/src/test/run-make-fulldeps/lto-no-link-whole-rlib/lib2.rs +++ b/src/test/run-make-fulldeps/lto-no-link-whole-rlib/lib2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] extern crate lib1; diff --git a/src/test/run-make-fulldeps/lto-no-link-whole-rlib/main.rs b/src/test/run-make-fulldeps/lto-no-link-whole-rlib/main.rs index 8417af63be9d9..0c658808e6e5d 100644 --- a/src/test/run-make-fulldeps/lto-no-link-whole-rlib/main.rs +++ b/src/test/run-make-fulldeps/lto-no-link-whole-rlib/main.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate lib1; extern crate lib2; diff --git a/src/test/run-make-fulldeps/lto-readonly-lib/lib.rs b/src/test/run-make-fulldeps/lto-readonly-lib/lib.rs index 04d3ae6720722..c1bfaa6cab5d9 100644 --- a/src/test/run-make-fulldeps/lto-readonly-lib/lib.rs +++ b/src/test/run-make-fulldeps/lto-readonly-lib/lib.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] diff --git a/src/test/run-make-fulldeps/lto-readonly-lib/main.rs b/src/test/run-make-fulldeps/lto-readonly-lib/main.rs index e12ac9e01dc17..69da798b3eb95 100644 --- a/src/test/run-make-fulldeps/lto-readonly-lib/main.rs +++ b/src/test/run-make-fulldeps/lto-readonly-lib/main.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate lib; fn main() {} diff --git a/src/test/run-make-fulldeps/lto-smoke-c/foo.rs b/src/test/run-make-fulldeps/lto-smoke-c/foo.rs index 1bb1901670035..2e59432cdb16f 100644 --- a/src/test/run-make-fulldeps/lto-smoke-c/foo.rs +++ b/src/test/run-make-fulldeps/lto-smoke-c/foo.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "staticlib"] #[no_mangle] diff --git a/src/test/run-make-fulldeps/lto-smoke/lib.rs b/src/test/run-make-fulldeps/lto-smoke/lib.rs index 04d3ae6720722..c1bfaa6cab5d9 100644 --- a/src/test/run-make-fulldeps/lto-smoke/lib.rs +++ b/src/test/run-make-fulldeps/lto-smoke/lib.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] diff --git a/src/test/run-make-fulldeps/lto-smoke/main.rs b/src/test/run-make-fulldeps/lto-smoke/main.rs index e12ac9e01dc17..69da798b3eb95 100644 --- a/src/test/run-make-fulldeps/lto-smoke/main.rs +++ b/src/test/run-make-fulldeps/lto-smoke/main.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate lib; fn main() {} diff --git a/src/test/run-make-fulldeps/manual-crate-name/bar.rs b/src/test/run-make-fulldeps/manual-crate-name/bar.rs index 04d3ae6720722..c1bfaa6cab5d9 100644 --- a/src/test/run-make-fulldeps/manual-crate-name/bar.rs +++ b/src/test/run-make-fulldeps/manual-crate-name/bar.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] diff --git a/src/test/run-make-fulldeps/manual-link/foo.rs b/src/test/run-make-fulldeps/manual-link/foo.rs index d67a4057afbfc..f5cd598abc6b0 100644 --- a/src/test/run-make-fulldeps/manual-link/foo.rs +++ b/src/test/run-make-fulldeps/manual-link/foo.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] extern { diff --git a/src/test/run-make-fulldeps/manual-link/main.rs b/src/test/run-make-fulldeps/manual-link/main.rs index 756a47f386ae3..fe35f1f8e2ead 100644 --- a/src/test/run-make-fulldeps/manual-link/main.rs +++ b/src/test/run-make-fulldeps/manual-link/main.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate foo; fn main() { diff --git a/src/test/run-make-fulldeps/many-crates-but-no-match/crateA1.rs b/src/test/run-make-fulldeps/many-crates-but-no-match/crateA1.rs index dbfe920c85ba3..3fed5a38e2cae 100644 --- a/src/test/run-make-fulldeps/many-crates-but-no-match/crateA1.rs +++ b/src/test/run-make-fulldeps/many-crates-but-no-match/crateA1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name="crateA"] // Base crate diff --git a/src/test/run-make-fulldeps/many-crates-but-no-match/crateA2.rs b/src/test/run-make-fulldeps/many-crates-but-no-match/crateA2.rs index 857c36aee6025..8db07a015ff2a 100644 --- a/src/test/run-make-fulldeps/many-crates-but-no-match/crateA2.rs +++ b/src/test/run-make-fulldeps/many-crates-but-no-match/crateA2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name="crateA"] // Base crate diff --git a/src/test/run-make-fulldeps/many-crates-but-no-match/crateA3.rs b/src/test/run-make-fulldeps/many-crates-but-no-match/crateA3.rs index 8b8dac5e862a1..a1e8e40a38c2a 100644 --- a/src/test/run-make-fulldeps/many-crates-but-no-match/crateA3.rs +++ b/src/test/run-make-fulldeps/many-crates-but-no-match/crateA3.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name="crateA"] // Base crate diff --git a/src/test/run-make-fulldeps/many-crates-but-no-match/crateB.rs b/src/test/run-make-fulldeps/many-crates-but-no-match/crateB.rs index bf55017c6463f..4ccd65d653edd 100644 --- a/src/test/run-make-fulldeps/many-crates-but-no-match/crateB.rs +++ b/src/test/run-make-fulldeps/many-crates-but-no-match/crateB.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate crateA; diff --git a/src/test/run-make-fulldeps/many-crates-but-no-match/crateC.rs b/src/test/run-make-fulldeps/many-crates-but-no-match/crateC.rs index 174d9382b76be..a8b817ec6810b 100644 --- a/src/test/run-make-fulldeps/many-crates-but-no-match/crateC.rs +++ b/src/test/run-make-fulldeps/many-crates-but-no-match/crateC.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate crateB; fn main() {} diff --git a/src/test/run-make-fulldeps/metadata-flag-frobs-symbols/bar.rs b/src/test/run-make-fulldeps/metadata-flag-frobs-symbols/bar.rs index 44b9e2f874a4b..1e6957a3694b6 100644 --- a/src/test/run-make-fulldeps/metadata-flag-frobs-symbols/bar.rs +++ b/src/test/run-make-fulldeps/metadata-flag-frobs-symbols/bar.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate foo1; extern crate foo2; diff --git a/src/test/run-make-fulldeps/metadata-flag-frobs-symbols/foo.rs b/src/test/run-make-fulldeps/metadata-flag-frobs-symbols/foo.rs index baabdc9ad7bbe..696aed2fa1db4 100644 --- a/src/test/run-make-fulldeps/metadata-flag-frobs-symbols/foo.rs +++ b/src/test/run-make-fulldeps/metadata-flag-frobs-symbols/foo.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] #![crate_type = "rlib"] diff --git a/src/test/run-make-fulldeps/min-global-align/min_global_align.rs b/src/test/run-make-fulldeps/min-global-align/min_global_align.rs index 3d4f9001a7474..ce86d202c62d3 100644 --- a/src/test/run-make-fulldeps/min-global-align/min_global_align.rs +++ b/src/test/run-make-fulldeps/min-global-align/min_global_align.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(no_core, lang_items)] #![crate_type="rlib"] #![no_core] diff --git a/src/test/run-make-fulldeps/mismatching-target-triples/bar.rs b/src/test/run-make-fulldeps/mismatching-target-triples/bar.rs index 0dc5c0a3a8ee1..b2c2fc1c41074 100644 --- a/src/test/run-make-fulldeps/mismatching-target-triples/bar.rs +++ b/src/test/run-make-fulldeps/mismatching-target-triples/bar.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(no_core)] #![no_core] extern crate foo; diff --git a/src/test/run-make-fulldeps/mismatching-target-triples/foo.rs b/src/test/run-make-fulldeps/mismatching-target-triples/foo.rs index a2169d0c63110..6fa0549144807 100644 --- a/src/test/run-make-fulldeps/mismatching-target-triples/foo.rs +++ b/src/test/run-make-fulldeps/mismatching-target-triples/foo.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(no_core)] #![no_core] #![crate_type = "lib"] diff --git a/src/test/run-make-fulldeps/missing-crate-dependency/crateA.rs b/src/test/run-make-fulldeps/missing-crate-dependency/crateA.rs index 4e111f29e8afa..31433cb60b8a6 100644 --- a/src/test/run-make-fulldeps/missing-crate-dependency/crateA.rs +++ b/src/test/run-make-fulldeps/missing-crate-dependency/crateA.rs @@ -1,12 +1,2 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Base crate pub fn func() {} diff --git a/src/test/run-make-fulldeps/missing-crate-dependency/crateB.rs b/src/test/run-make-fulldeps/missing-crate-dependency/crateB.rs index bf55017c6463f..4ccd65d653edd 100644 --- a/src/test/run-make-fulldeps/missing-crate-dependency/crateB.rs +++ b/src/test/run-make-fulldeps/missing-crate-dependency/crateB.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate crateA; diff --git a/src/test/run-make-fulldeps/missing-crate-dependency/crateC.rs b/src/test/run-make-fulldeps/missing-crate-dependency/crateC.rs index 174d9382b76be..a8b817ec6810b 100644 --- a/src/test/run-make-fulldeps/missing-crate-dependency/crateC.rs +++ b/src/test/run-make-fulldeps/missing-crate-dependency/crateC.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate crateB; fn main() {} diff --git a/src/test/run-make-fulldeps/mixing-deps/both.rs b/src/test/run-make-fulldeps/mixing-deps/both.rs index c44335e2bbc2a..6a58187633f48 100644 --- a/src/test/run-make-fulldeps/mixing-deps/both.rs +++ b/src/test/run-make-fulldeps/mixing-deps/both.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] #![crate_type = "dylib"] diff --git a/src/test/run-make-fulldeps/mixing-deps/dylib.rs b/src/test/run-make-fulldeps/mixing-deps/dylib.rs index 78af525f386fa..88976d5b663f3 100644 --- a/src/test/run-make-fulldeps/mixing-deps/dylib.rs +++ b/src/test/run-make-fulldeps/mixing-deps/dylib.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "dylib"] extern crate both; diff --git a/src/test/run-make-fulldeps/mixing-deps/prog.rs b/src/test/run-make-fulldeps/mixing-deps/prog.rs index c3d88016fdaa3..188981dc1a31a 100644 --- a/src/test/run-make-fulldeps/mixing-deps/prog.rs +++ b/src/test/run-make-fulldeps/mixing-deps/prog.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate dylib; extern crate both; diff --git a/src/test/run-make-fulldeps/mixing-formats/bar1.rs b/src/test/run-make-fulldeps/mixing-formats/bar1.rs index 4b4916fe96d63..49af74e1b7489 100644 --- a/src/test/run-make-fulldeps/mixing-formats/bar1.rs +++ b/src/test/run-make-fulldeps/mixing-formats/bar1.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate foo; diff --git a/src/test/run-make-fulldeps/mixing-formats/bar2.rs b/src/test/run-make-fulldeps/mixing-formats/bar2.rs index 4b4916fe96d63..49af74e1b7489 100644 --- a/src/test/run-make-fulldeps/mixing-formats/bar2.rs +++ b/src/test/run-make-fulldeps/mixing-formats/bar2.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate foo; diff --git a/src/test/run-make-fulldeps/mixing-formats/baz.rs b/src/test/run-make-fulldeps/mixing-formats/baz.rs index 3fb90f6a854f6..99a73159ea4bd 100644 --- a/src/test/run-make-fulldeps/mixing-formats/baz.rs +++ b/src/test/run-make-fulldeps/mixing-formats/baz.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate bar1; fn main() {} diff --git a/src/test/run-make-fulldeps/mixing-formats/baz2.rs b/src/test/run-make-fulldeps/mixing-formats/baz2.rs index c5066ccd6566f..d0fab1e4cdf61 100644 --- a/src/test/run-make-fulldeps/mixing-formats/baz2.rs +++ b/src/test/run-make-fulldeps/mixing-formats/baz2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate bar1; extern crate bar2; diff --git a/src/test/run-make-fulldeps/mixing-formats/foo.rs b/src/test/run-make-fulldeps/mixing-formats/foo.rs index e6c760257380c..e69de29bb2d1d 100644 --- a/src/test/run-make-fulldeps/mixing-formats/foo.rs +++ b/src/test/run-make-fulldeps/mixing-formats/foo.rs @@ -1,9 +0,0 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. diff --git a/src/test/run-make-fulldeps/mixing-libs/dylib.rs b/src/test/run-make-fulldeps/mixing-libs/dylib.rs index 1a5bd658cd9aa..6856887501c26 100644 --- a/src/test/run-make-fulldeps/mixing-libs/dylib.rs +++ b/src/test/run-make-fulldeps/mixing-libs/dylib.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "dylib"] extern crate rlib; diff --git a/src/test/run-make-fulldeps/mixing-libs/prog.rs b/src/test/run-make-fulldeps/mixing-libs/prog.rs index 5e1a4274756c3..14ce5c951a7b7 100644 --- a/src/test/run-make-fulldeps/mixing-libs/prog.rs +++ b/src/test/run-make-fulldeps/mixing-libs/prog.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate dylib; extern crate rlib; diff --git a/src/test/run-make-fulldeps/mixing-libs/rlib.rs b/src/test/run-make-fulldeps/mixing-libs/rlib.rs index ad0ea67b9ab15..96dcd16bb9301 100644 --- a/src/test/run-make-fulldeps/mixing-libs/rlib.rs +++ b/src/test/run-make-fulldeps/mixing-libs/rlib.rs @@ -1,12 +1,2 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] pub fn rlib() {} diff --git a/src/test/run-make-fulldeps/msvc-opt-minsize/foo.rs b/src/test/run-make-fulldeps/msvc-opt-minsize/foo.rs index 30b12691afeda..3f5496c08ee25 100644 --- a/src/test/run-make-fulldeps/msvc-opt-minsize/foo.rs +++ b/src/test/run-make-fulldeps/msvc-opt-minsize/foo.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(test)] extern crate test; diff --git a/src/test/run-make-fulldeps/multiple-emits/foo.rs b/src/test/run-make-fulldeps/multiple-emits/foo.rs index 8ae3d072362ed..f328e4d9d04c3 100644 --- a/src/test/run-make-fulldeps/multiple-emits/foo.rs +++ b/src/test/run-make-fulldeps/multiple-emits/foo.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() {} diff --git a/src/test/run-make-fulldeps/no-builtins-lto/main.rs b/src/test/run-make-fulldeps/no-builtins-lto/main.rs index e960c726a98cc..890c999c8ccf7 100644 --- a/src/test/run-make-fulldeps/no-builtins-lto/main.rs +++ b/src/test/run-make-fulldeps/no-builtins-lto/main.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate no_builtins; fn main() {} diff --git a/src/test/run-make-fulldeps/no-builtins-lto/no_builtins.rs b/src/test/run-make-fulldeps/no-builtins-lto/no_builtins.rs index be95e7c5521ee..5d001031a57fa 100644 --- a/src/test/run-make-fulldeps/no-builtins-lto/no_builtins.rs +++ b/src/test/run-make-fulldeps/no-builtins-lto/no_builtins.rs @@ -1,12 +1,2 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] #![no_builtins] diff --git a/src/test/run-make-fulldeps/no-duplicate-libs/main.rs b/src/test/run-make-fulldeps/no-duplicate-libs/main.rs index 824946fe9c2bd..298018ca7183a 100644 --- a/src/test/run-make-fulldeps/no-duplicate-libs/main.rs +++ b/src/test/run-make-fulldeps/no-duplicate-libs/main.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[link(name = "foo")] // linker should drop this library, no symbols used #[link(name = "bar")] // symbol comes from this library #[link(name = "foo")] // now linker picks up `foo` b/c `bar` library needs it diff --git a/src/test/run-make-fulldeps/no-integrated-as/hello.rs b/src/test/run-make-fulldeps/no-integrated-as/hello.rs index 68e7f6d94d139..e7a11a969c037 100644 --- a/src/test/run-make-fulldeps/no-integrated-as/hello.rs +++ b/src/test/run-make-fulldeps/no-integrated-as/hello.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { println!("Hello, world!"); } diff --git a/src/test/run-make-fulldeps/no-intermediate-extras/foo.rs b/src/test/run-make-fulldeps/no-intermediate-extras/foo.rs index e6c760257380c..e69de29bb2d1d 100644 --- a/src/test/run-make-fulldeps/no-intermediate-extras/foo.rs +++ b/src/test/run-make-fulldeps/no-intermediate-extras/foo.rs @@ -1,9 +0,0 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. diff --git a/src/test/run-make-fulldeps/obey-crate-type-flag/test.rs b/src/test/run-make-fulldeps/obey-crate-type-flag/test.rs index e6c8b8eb179e6..8a768f9de9024 100644 --- a/src/test/run-make-fulldeps/obey-crate-type-flag/test.rs +++ b/src/test/run-make-fulldeps/obey-crate-type-flag/test.rs @@ -1,12 +1,2 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] #![crate_type = "dylib"] diff --git a/src/test/run-make-fulldeps/output-filename-conflicts-with-directory/foo.rs b/src/test/run-make-fulldeps/output-filename-conflicts-with-directory/foo.rs index 3f07b46791d22..f328e4d9d04c3 100644 --- a/src/test/run-make-fulldeps/output-filename-conflicts-with-directory/foo.rs +++ b/src/test/run-make-fulldeps/output-filename-conflicts-with-directory/foo.rs @@ -1,11 +1 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() {} diff --git a/src/test/run-make-fulldeps/output-filename-overwrites-input/bar.rs b/src/test/run-make-fulldeps/output-filename-overwrites-input/bar.rs index 8e4e35fdee66e..83be6e807e0b9 100644 --- a/src/test/run-make-fulldeps/output-filename-overwrites-input/bar.rs +++ b/src/test/run-make-fulldeps/output-filename-overwrites-input/bar.rs @@ -1,11 +1 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] diff --git a/src/test/run-make-fulldeps/output-filename-overwrites-input/foo.rs b/src/test/run-make-fulldeps/output-filename-overwrites-input/foo.rs index 3f07b46791d22..f328e4d9d04c3 100644 --- a/src/test/run-make-fulldeps/output-filename-overwrites-input/foo.rs +++ b/src/test/run-make-fulldeps/output-filename-overwrites-input/foo.rs @@ -1,11 +1 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() {} diff --git a/src/test/run-make-fulldeps/output-type-permutations/foo.rs b/src/test/run-make-fulldeps/output-type-permutations/foo.rs index bb5796bd8737f..f0a2cc6ad75e6 100644 --- a/src/test/run-make-fulldeps/output-type-permutations/foo.rs +++ b/src/test/run-make-fulldeps/output-type-permutations/foo.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "bar"] fn main() {} diff --git a/src/test/run-make-fulldeps/output-with-hyphens/foo-bar.rs b/src/test/run-make-fulldeps/output-with-hyphens/foo-bar.rs index 2f93b2d1ead01..3f1a70458e377 100644 --- a/src/test/run-make-fulldeps/output-with-hyphens/foo-bar.rs +++ b/src/test/run-make-fulldeps/output-with-hyphens/foo-bar.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] #![crate_type = "bin"] diff --git a/src/test/run-make-fulldeps/panic-impl-transitive/panic-impl-consumer.rs b/src/test/run-make-fulldeps/panic-impl-transitive/panic-impl-consumer.rs index 592fab8be85ec..82a98b12d041d 100644 --- a/src/test/run-make-fulldeps/panic-impl-transitive/panic-impl-consumer.rs +++ b/src/test/run-make-fulldeps/panic-impl-transitive/panic-impl-consumer.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![no_std] #![no_main] diff --git a/src/test/run-make-fulldeps/panic-impl-transitive/panic-impl-provider.rs b/src/test/run-make-fulldeps/panic-impl-transitive/panic-impl-provider.rs index 46cdf2e2fa55e..539edd45f73e2 100644 --- a/src/test/run-make-fulldeps/panic-impl-transitive/panic-impl-provider.rs +++ b/src/test/run-make-fulldeps/panic-impl-transitive/panic-impl-provider.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] #![feature(panic_implementation)] #![no_std] diff --git a/src/test/run-make-fulldeps/pgo-gen-lto/test.rs b/src/test/run-make-fulldeps/pgo-gen-lto/test.rs index 3f07b46791d22..f328e4d9d04c3 100644 --- a/src/test/run-make-fulldeps/pgo-gen-lto/test.rs +++ b/src/test/run-make-fulldeps/pgo-gen-lto/test.rs @@ -1,11 +1 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() {} diff --git a/src/test/run-make-fulldeps/pgo-gen/test.rs b/src/test/run-make-fulldeps/pgo-gen/test.rs index 3f07b46791d22..f328e4d9d04c3 100644 --- a/src/test/run-make-fulldeps/pgo-gen/test.rs +++ b/src/test/run-make-fulldeps/pgo-gen/test.rs @@ -1,11 +1 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() {} diff --git a/src/test/run-make-fulldeps/prefer-dylib/bar.rs b/src/test/run-make-fulldeps/prefer-dylib/bar.rs index 4c79f7e285535..c5c0bc606cd69 100644 --- a/src/test/run-make-fulldeps/prefer-dylib/bar.rs +++ b/src/test/run-make-fulldeps/prefer-dylib/bar.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn bar() {} diff --git a/src/test/run-make-fulldeps/prefer-dylib/foo.rs b/src/test/run-make-fulldeps/prefer-dylib/foo.rs index 858ef492acef5..8d68535e3b647 100644 --- a/src/test/run-make-fulldeps/prefer-dylib/foo.rs +++ b/src/test/run-make-fulldeps/prefer-dylib/foo.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate bar; fn main() { diff --git a/src/test/run-make-fulldeps/prefer-rlib/bar.rs b/src/test/run-make-fulldeps/prefer-rlib/bar.rs index 4c79f7e285535..c5c0bc606cd69 100644 --- a/src/test/run-make-fulldeps/prefer-rlib/bar.rs +++ b/src/test/run-make-fulldeps/prefer-rlib/bar.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn bar() {} diff --git a/src/test/run-make-fulldeps/prefer-rlib/foo.rs b/src/test/run-make-fulldeps/prefer-rlib/foo.rs index 858ef492acef5..8d68535e3b647 100644 --- a/src/test/run-make-fulldeps/prefer-rlib/foo.rs +++ b/src/test/run-make-fulldeps/prefer-rlib/foo.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate bar; fn main() { diff --git a/src/test/run-make-fulldeps/pretty-expanded-hygiene/input.pp.rs b/src/test/run-make-fulldeps/pretty-expanded-hygiene/input.pp.rs index 3d2dd380e488e..b835bf8782cc3 100644 --- a/src/test/run-make-fulldeps/pretty-expanded-hygiene/input.pp.rs +++ b/src/test/run-make-fulldeps/pretty-expanded-hygiene/input.pp.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // minimal junk #![feature(no_core)] #![no_core] diff --git a/src/test/run-make-fulldeps/pretty-expanded-hygiene/input.rs b/src/test/run-make-fulldeps/pretty-expanded-hygiene/input.rs index 422fbdb088488..ed3b48dbdc114 100644 --- a/src/test/run-make-fulldeps/pretty-expanded-hygiene/input.rs +++ b/src/test/run-make-fulldeps/pretty-expanded-hygiene/input.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // minimal junk #![feature(no_core)] #![no_core] diff --git a/src/test/run-make-fulldeps/pretty-expanded/input.rs b/src/test/run-make-fulldeps/pretty-expanded/input.rs index 04bf17dc28aec..8b8fadb89c165 100644 --- a/src/test/run-make-fulldeps/pretty-expanded/input.rs +++ b/src/test/run-make-fulldeps/pretty-expanded/input.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[crate_type="lib"] // #13544 diff --git a/src/test/run-make-fulldeps/pretty-print-path-suffix/input.rs b/src/test/run-make-fulldeps/pretty-print-path-suffix/input.rs index 8ea86a94f935e..d075c46d8b003 100644 --- a/src/test/run-make-fulldeps/pretty-print-path-suffix/input.rs +++ b/src/test/run-make-fulldeps/pretty-print-path-suffix/input.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="lib"] pub fn diff --git a/src/test/run-make-fulldeps/pretty-print-to-file/input.rs b/src/test/run-make-fulldeps/pretty-print-to-file/input.rs index 8e3ec36318749..aa828155b205a 100644 --- a/src/test/run-make-fulldeps/pretty-print-to-file/input.rs +++ b/src/test/run-make-fulldeps/pretty-print-to-file/input.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[crate_type="lib"] pub fn diff --git a/src/test/run-make-fulldeps/profile/test.rs b/src/test/run-make-fulldeps/profile/test.rs index 046d27a9f0fe5..f328e4d9d04c3 100644 --- a/src/test/run-make-fulldeps/profile/test.rs +++ b/src/test/run-make-fulldeps/profile/test.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() {} diff --git a/src/test/run-make-fulldeps/prune-link-args/empty.rs b/src/test/run-make-fulldeps/prune-link-args/empty.rs index a9e231b0ea839..45590d86ba6c5 100644 --- a/src/test/run-make-fulldeps/prune-link-args/empty.rs +++ b/src/test/run-make-fulldeps/prune-link-args/empty.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { } diff --git a/src/test/run-make-fulldeps/relocation-model/foo.rs b/src/test/run-make-fulldeps/relocation-model/foo.rs index e06d81cd60b65..da0f5d925d107 100644 --- a/src/test/run-make-fulldeps/relocation-model/foo.rs +++ b/src/test/run-make-fulldeps/relocation-model/foo.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() {} diff --git a/src/test/run-make-fulldeps/relro-levels/hello.rs b/src/test/run-make-fulldeps/relro-levels/hello.rs index 41782851a1a6d..e7a11a969c037 100644 --- a/src/test/run-make-fulldeps/relro-levels/hello.rs +++ b/src/test/run-make-fulldeps/relro-levels/hello.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { println!("Hello, world!"); } diff --git a/src/test/run-make-fulldeps/reproducible-build/linker.rs b/src/test/run-make-fulldeps/reproducible-build/linker.rs index fd8946708bffd..998d1f328596c 100644 --- a/src/test/run-make-fulldeps/reproducible-build/linker.rs +++ b/src/test/run-make-fulldeps/reproducible-build/linker.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::env; use std::path::Path; use std::fs::File; diff --git a/src/test/run-make-fulldeps/reproducible-build/reproducible-build-aux.rs b/src/test/run-make-fulldeps/reproducible-build/reproducible-build-aux.rs index 9ef853e79960b..8105b3d2bda3d 100644 --- a/src/test/run-make-fulldeps/reproducible-build/reproducible-build-aux.rs +++ b/src/test/run-make-fulldeps/reproducible-build/reproducible-build-aux.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="lib"] pub static STATIC: i32 = 1234; diff --git a/src/test/run-make-fulldeps/reproducible-build/reproducible-build.rs b/src/test/run-make-fulldeps/reproducible-build/reproducible-build.rs index a040c0f858d78..c348f8ab6b717 100644 --- a/src/test/run-make-fulldeps/reproducible-build/reproducible-build.rs +++ b/src/test/run-make-fulldeps/reproducible-build/reproducible-build.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test case makes sure that two identical invocations of the compiler // (i.e. same code base, same compile-flags, same compiler-versions, etc.) // produce the same output. In the past, symbol names of monomorphized functions diff --git a/src/test/run-make-fulldeps/resolve-rename/bar.rs b/src/test/run-make-fulldeps/resolve-rename/bar.rs index 1552b45f2fc16..4a09ce355e684 100644 --- a/src/test/run-make-fulldeps/resolve-rename/bar.rs +++ b/src/test/run-make-fulldeps/resolve-rename/bar.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] extern crate foo; diff --git a/src/test/run-make-fulldeps/resolve-rename/baz.rs b/src/test/run-make-fulldeps/resolve-rename/baz.rs index 27d801490e425..9176073ef97f4 100644 --- a/src/test/run-make-fulldeps/resolve-rename/baz.rs +++ b/src/test/run-make-fulldeps/resolve-rename/baz.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] extern crate bar; diff --git a/src/test/run-make-fulldeps/resolve-rename/foo.rs b/src/test/run-make-fulldeps/resolve-rename/foo.rs index 830c289b65f11..bd6820098eea4 100644 --- a/src/test/run-make-fulldeps/resolve-rename/foo.rs +++ b/src/test/run-make-fulldeps/resolve-rename/foo.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] pub fn foo() {} diff --git a/src/test/run-make-fulldeps/rlib-chain/m1.rs b/src/test/run-make-fulldeps/rlib-chain/m1.rs index e3afa352938d6..665b206ccf197 100644 --- a/src/test/run-make-fulldeps/rlib-chain/m1.rs +++ b/src/test/run-make-fulldeps/rlib-chain/m1.rs @@ -1,12 +1,2 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] pub fn m1() {} diff --git a/src/test/run-make-fulldeps/rlib-chain/m2.rs b/src/test/run-make-fulldeps/rlib-chain/m2.rs index 2b4c181134b31..eba12fe121885 100644 --- a/src/test/run-make-fulldeps/rlib-chain/m2.rs +++ b/src/test/run-make-fulldeps/rlib-chain/m2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] extern crate m1; diff --git a/src/test/run-make-fulldeps/rlib-chain/m3.rs b/src/test/run-make-fulldeps/rlib-chain/m3.rs index 6323a9e65aae1..ade191db49c8e 100644 --- a/src/test/run-make-fulldeps/rlib-chain/m3.rs +++ b/src/test/run-make-fulldeps/rlib-chain/m3.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] extern crate m2; diff --git a/src/test/run-make-fulldeps/rlib-chain/m4.rs b/src/test/run-make-fulldeps/rlib-chain/m4.rs index 6c2a66858028e..fa8ec6079deac 100644 --- a/src/test/run-make-fulldeps/rlib-chain/m4.rs +++ b/src/test/run-make-fulldeps/rlib-chain/m4.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate m3; fn main() { m3::m3() } diff --git a/src/test/run-make-fulldeps/rustc-macro-dep-files/bar.rs b/src/test/run-make-fulldeps/rustc-macro-dep-files/bar.rs index 03330c3d1700d..6324c6c37e75c 100644 --- a/src/test/run-make-fulldeps/rustc-macro-dep-files/bar.rs +++ b/src/test/run-make-fulldeps/rustc-macro-dep-files/bar.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] extern crate foo; diff --git a/src/test/run-make-fulldeps/rustc-macro-dep-files/foo.rs b/src/test/run-make-fulldeps/rustc-macro-dep-files/foo.rs index 2f2524f6ef115..00b1c26d43f10 100644 --- a/src/test/run-make-fulldeps/rustc-macro-dep-files/foo.rs +++ b/src/test/run-make-fulldeps/rustc-macro-dep-files/foo.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "proc-macro"] extern crate proc_macro; diff --git a/src/test/run-make-fulldeps/rustdoc-error-lines/input.rs b/src/test/run-make-fulldeps/rustdoc-error-lines/input.rs index 6dc7060bc4889..7b07f38f25948 100644 --- a/src/test/run-make-fulldeps/rustdoc-error-lines/input.rs +++ b/src/test/run-make-fulldeps/rustdoc-error-lines/input.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test for #45868 // random #![feature] to ensure that crate attrs diff --git a/src/test/run-make-fulldeps/rustdoc-output-path/foo.rs b/src/test/run-make-fulldeps/rustdoc-output-path/foo.rs index 11fc2cd2b8d15..4a835673a596b 100644 --- a/src/test/run-make-fulldeps/rustdoc-output-path/foo.rs +++ b/src/test/run-make-fulldeps/rustdoc-output-path/foo.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Foo; diff --git a/src/test/run-make-fulldeps/sanitizer-address/overflow.rs b/src/test/run-make-fulldeps/sanitizer-address/overflow.rs index 1f3c64c8c322d..b997a74cc3eb4 100644 --- a/src/test/run-make-fulldeps/sanitizer-address/overflow.rs +++ b/src/test/run-make-fulldeps/sanitizer-address/overflow.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let xs = [0, 1, 2, 3]; let _y = unsafe { *xs.as_ptr().offset(4) }; diff --git a/src/test/run-make-fulldeps/sanitizer-cdylib-link/library.rs b/src/test/run-make-fulldeps/sanitizer-cdylib-link/library.rs index 4ceef5d3f5272..bf11553ea6b17 100644 --- a/src/test/run-make-fulldeps/sanitizer-cdylib-link/library.rs +++ b/src/test/run-make-fulldeps/sanitizer-cdylib-link/library.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[no_mangle] pub extern fn overflow() { let xs = [0, 1, 2, 3]; diff --git a/src/test/run-make-fulldeps/sanitizer-cdylib-link/program.rs b/src/test/run-make-fulldeps/sanitizer-cdylib-link/program.rs index 9f52817c85100..3bbbcd9c6f8e6 100644 --- a/src/test/run-make-fulldeps/sanitizer-cdylib-link/program.rs +++ b/src/test/run-make-fulldeps/sanitizer-cdylib-link/program.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern { fn overflow(); } diff --git a/src/test/run-make-fulldeps/sanitizer-dylib-link/library.rs b/src/test/run-make-fulldeps/sanitizer-dylib-link/library.rs index 4ceef5d3f5272..bf11553ea6b17 100644 --- a/src/test/run-make-fulldeps/sanitizer-dylib-link/library.rs +++ b/src/test/run-make-fulldeps/sanitizer-dylib-link/library.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[no_mangle] pub extern fn overflow() { let xs = [0, 1, 2, 3]; diff --git a/src/test/run-make-fulldeps/sanitizer-dylib-link/program.rs b/src/test/run-make-fulldeps/sanitizer-dylib-link/program.rs index 9f52817c85100..3bbbcd9c6f8e6 100644 --- a/src/test/run-make-fulldeps/sanitizer-dylib-link/program.rs +++ b/src/test/run-make-fulldeps/sanitizer-dylib-link/program.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern { fn overflow(); } diff --git a/src/test/run-make-fulldeps/sanitizer-invalid-cratetype/hello.rs b/src/test/run-make-fulldeps/sanitizer-invalid-cratetype/hello.rs index 41782851a1a6d..e7a11a969c037 100644 --- a/src/test/run-make-fulldeps/sanitizer-invalid-cratetype/hello.rs +++ b/src/test/run-make-fulldeps/sanitizer-invalid-cratetype/hello.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { println!("Hello, world!"); } diff --git a/src/test/run-make-fulldeps/sanitizer-invalid-target/hello.rs b/src/test/run-make-fulldeps/sanitizer-invalid-target/hello.rs index e9e46b7702a80..d3dd5ed03d954 100644 --- a/src/test/run-make-fulldeps/sanitizer-invalid-target/hello.rs +++ b/src/test/run-make-fulldeps/sanitizer-invalid-target/hello.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(no_core)] #![no_core] #![no_main] diff --git a/src/test/run-make-fulldeps/sanitizer-leak/leak.rs b/src/test/run-make-fulldeps/sanitizer-leak/leak.rs index 279da6aaae707..ab8df5c7bfd45 100644 --- a/src/test/run-make-fulldeps/sanitizer-leak/leak.rs +++ b/src/test/run-make-fulldeps/sanitizer-leak/leak.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::mem; fn main() { diff --git a/src/test/run-make-fulldeps/sanitizer-memory/uninit.rs b/src/test/run-make-fulldeps/sanitizer-memory/uninit.rs index 8350c7de3acab..163e2c5a4625f 100644 --- a/src/test/run-make-fulldeps/sanitizer-memory/uninit.rs +++ b/src/test/run-make-fulldeps/sanitizer-memory/uninit.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::mem; fn main() { diff --git a/src/test/run-make-fulldeps/sanitizer-staticlib-link/library.rs b/src/test/run-make-fulldeps/sanitizer-staticlib-link/library.rs index 4ceef5d3f5272..bf11553ea6b17 100644 --- a/src/test/run-make-fulldeps/sanitizer-staticlib-link/library.rs +++ b/src/test/run-make-fulldeps/sanitizer-staticlib-link/library.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[no_mangle] pub extern fn overflow() { let xs = [0, 1, 2, 3]; diff --git a/src/test/run-make-fulldeps/save-analysis-fail/SameDir.rs b/src/test/run-make-fulldeps/save-analysis-fail/SameDir.rs index fe70ac1edef6e..2c690d5f759d7 100644 --- a/src/test/run-make-fulldeps/save-analysis-fail/SameDir.rs +++ b/src/test/run-make-fulldeps/save-analysis-fail/SameDir.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // sub-module in the same directory as the main crate file pub struct SameStruct { diff --git a/src/test/run-make-fulldeps/save-analysis-fail/SameDir3.rs b/src/test/run-make-fulldeps/save-analysis-fail/SameDir3.rs index 315f900868b45..fab03ee2e3d15 100644 --- a/src/test/run-make-fulldeps/save-analysis-fail/SameDir3.rs +++ b/src/test/run-make-fulldeps/save-analysis-fail/SameDir3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn hello(x: isize) { println!("macro {} :-(", x); } diff --git a/src/test/run-make-fulldeps/save-analysis-fail/SubDir/mod.rs b/src/test/run-make-fulldeps/save-analysis-fail/SubDir/mod.rs index fe84db08da900..511721d92a350 100644 --- a/src/test/run-make-fulldeps/save-analysis-fail/SubDir/mod.rs +++ b/src/test/run-make-fulldeps/save-analysis-fail/SubDir/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // sub-module in a sub-directory use sub::sub2 as msalias; diff --git a/src/test/run-make-fulldeps/save-analysis-fail/foo.rs b/src/test/run-make-fulldeps/save-analysis-fail/foo.rs index b844f2e49e71e..e042210ac79b0 100644 --- a/src/test/run-make-fulldeps/save-analysis-fail/foo.rs +++ b/src/test/run-make-fulldeps/save-analysis-fail/foo.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![ crate_name = "test" ] #![feature(box_syntax)] #![feature(rustc_private)] diff --git a/src/test/run-make-fulldeps/save-analysis-fail/krate2.rs b/src/test/run-make-fulldeps/save-analysis-fail/krate2.rs index 2c6f517ff3882..7d787e0c9871f 100644 --- a/src/test/run-make-fulldeps/save-analysis-fail/krate2.rs +++ b/src/test/run-make-fulldeps/save-analysis-fail/krate2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![ crate_name = "krate2" ] #![ crate_type = "lib" ] diff --git a/src/test/run-make-fulldeps/save-analysis-rfc2126/extern_absolute_paths.rs b/src/test/run-make-fulldeps/save-analysis-rfc2126/extern_absolute_paths.rs index 7e5343df84141..7a8e3fff098a0 100644 --- a/src/test/run-make-fulldeps/save-analysis-rfc2126/extern_absolute_paths.rs +++ b/src/test/run-make-fulldeps/save-analysis-rfc2126/extern_absolute_paths.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use krate2::hello; fn main() { diff --git a/src/test/run-make-fulldeps/save-analysis-rfc2126/extern_in_paths.rs b/src/test/run-make-fulldeps/save-analysis-rfc2126/extern_in_paths.rs index e48627e86bac5..299b96621ac32 100644 --- a/src/test/run-make-fulldeps/save-analysis-rfc2126/extern_in_paths.rs +++ b/src/test/run-make-fulldeps/save-analysis-rfc2126/extern_in_paths.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(extern_in_paths)] use extern::krate2; diff --git a/src/test/run-make-fulldeps/save-analysis-rfc2126/krate2.rs b/src/test/run-make-fulldeps/save-analysis-rfc2126/krate2.rs index 21fc57ccdf2de..d24c68862b074 100644 --- a/src/test/run-make-fulldeps/save-analysis-rfc2126/krate2.rs +++ b/src/test/run-make-fulldeps/save-analysis-rfc2126/krate2.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "krate2"] #![crate_type = "lib"] diff --git a/src/test/run-make-fulldeps/save-analysis/SameDir.rs b/src/test/run-make-fulldeps/save-analysis/SameDir.rs index fe70ac1edef6e..2c690d5f759d7 100644 --- a/src/test/run-make-fulldeps/save-analysis/SameDir.rs +++ b/src/test/run-make-fulldeps/save-analysis/SameDir.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // sub-module in the same directory as the main crate file pub struct SameStruct { diff --git a/src/test/run-make-fulldeps/save-analysis/SameDir3.rs b/src/test/run-make-fulldeps/save-analysis/SameDir3.rs index 315f900868b45..fab03ee2e3d15 100644 --- a/src/test/run-make-fulldeps/save-analysis/SameDir3.rs +++ b/src/test/run-make-fulldeps/save-analysis/SameDir3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn hello(x: isize) { println!("macro {} :-(", x); } diff --git a/src/test/run-make-fulldeps/save-analysis/SubDir/mod.rs b/src/test/run-make-fulldeps/save-analysis/SubDir/mod.rs index fe84db08da900..511721d92a350 100644 --- a/src/test/run-make-fulldeps/save-analysis/SubDir/mod.rs +++ b/src/test/run-make-fulldeps/save-analysis/SubDir/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // sub-module in a sub-directory use sub::sub2 as msalias; diff --git a/src/test/run-make-fulldeps/save-analysis/foo.rs b/src/test/run-make-fulldeps/save-analysis/foo.rs index 5b4e4802957af..90c67231e181d 100644 --- a/src/test/run-make-fulldeps/save-analysis/foo.rs +++ b/src/test/run-make-fulldeps/save-analysis/foo.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![ crate_name = "test" ] #![feature(box_syntax)] #![feature(rustc_private)] diff --git a/src/test/run-make-fulldeps/save-analysis/krate2.rs b/src/test/run-make-fulldeps/save-analysis/krate2.rs index 2c6f517ff3882..7d787e0c9871f 100644 --- a/src/test/run-make-fulldeps/save-analysis/krate2.rs +++ b/src/test/run-make-fulldeps/save-analysis/krate2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![ crate_name = "krate2" ] #![ crate_type = "lib" ] diff --git a/src/test/run-make-fulldeps/sepcomp-cci-copies/cci_lib.rs b/src/test/run-make-fulldeps/sepcomp-cci-copies/cci_lib.rs index 62bc329428690..869d4a6cd3e4e 100644 --- a/src/test/run-make-fulldeps/sepcomp-cci-copies/cci_lib.rs +++ b/src/test/run-make-fulldeps/sepcomp-cci-copies/cci_lib.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] #[inline] diff --git a/src/test/run-make-fulldeps/sepcomp-cci-copies/foo.rs b/src/test/run-make-fulldeps/sepcomp-cci-copies/foo.rs index e00cab20f6b34..ba251fcb0ac24 100644 --- a/src/test/run-make-fulldeps/sepcomp-cci-copies/foo.rs +++ b/src/test/run-make-fulldeps/sepcomp-cci-copies/foo.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate cci_lib; use cci_lib::cci_fn; diff --git a/src/test/run-make-fulldeps/sepcomp-inlining/foo.rs b/src/test/run-make-fulldeps/sepcomp-inlining/foo.rs index 5b62c1b062673..2fe5f9cb72661 100644 --- a/src/test/run-make-fulldeps/sepcomp-inlining/foo.rs +++ b/src/test/run-make-fulldeps/sepcomp-inlining/foo.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(start)] #[inline] diff --git a/src/test/run-make-fulldeps/sepcomp-separate/foo.rs b/src/test/run-make-fulldeps/sepcomp-separate/foo.rs index 64a76e9e0edab..169bafa9b3a50 100644 --- a/src/test/run-make-fulldeps/sepcomp-separate/foo.rs +++ b/src/test/run-make-fulldeps/sepcomp-separate/foo.rs @@ -1,15 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - fn magic_fn() -> usize { 1234 } diff --git a/src/test/run-make-fulldeps/simd-ffi/simd.rs b/src/test/run-make-fulldeps/simd-ffi/simd.rs index 21411a35e3c35..b834e5cc463a4 100644 --- a/src/test/run-make-fulldeps/simd-ffi/simd.rs +++ b/src/test/run-make-fulldeps/simd-ffi/simd.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ensures that public symbols are not removed completely #![crate_type = "lib"] // we can compile to a variety of platforms, because we don't need diff --git a/src/test/run-make-fulldeps/simple-dylib/bar.rs b/src/test/run-make-fulldeps/simple-dylib/bar.rs index 4c79f7e285535..c5c0bc606cd69 100644 --- a/src/test/run-make-fulldeps/simple-dylib/bar.rs +++ b/src/test/run-make-fulldeps/simple-dylib/bar.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn bar() {} diff --git a/src/test/run-make-fulldeps/simple-dylib/foo.rs b/src/test/run-make-fulldeps/simple-dylib/foo.rs index 858ef492acef5..8d68535e3b647 100644 --- a/src/test/run-make-fulldeps/simple-dylib/foo.rs +++ b/src/test/run-make-fulldeps/simple-dylib/foo.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate bar; fn main() { diff --git a/src/test/run-make-fulldeps/simple-rlib/bar.rs b/src/test/run-make-fulldeps/simple-rlib/bar.rs index 4c79f7e285535..c5c0bc606cd69 100644 --- a/src/test/run-make-fulldeps/simple-rlib/bar.rs +++ b/src/test/run-make-fulldeps/simple-rlib/bar.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn bar() {} diff --git a/src/test/run-make-fulldeps/simple-rlib/foo.rs b/src/test/run-make-fulldeps/simple-rlib/foo.rs index 858ef492acef5..8d68535e3b647 100644 --- a/src/test/run-make-fulldeps/simple-rlib/foo.rs +++ b/src/test/run-make-fulldeps/simple-rlib/foo.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate bar; fn main() { diff --git a/src/test/run-make-fulldeps/stable-symbol-names/stable-symbol-names1.rs b/src/test/run-make-fulldeps/stable-symbol-names/stable-symbol-names1.rs index 7344bdf49f6f2..b85a428278cd9 100644 --- a/src/test/run-make-fulldeps/stable-symbol-names/stable-symbol-names1.rs +++ b/src/test/run-make-fulldeps/stable-symbol-names/stable-symbol-names1.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="rlib"] pub trait Foo { diff --git a/src/test/run-make-fulldeps/stable-symbol-names/stable-symbol-names2.rs b/src/test/run-make-fulldeps/stable-symbol-names/stable-symbol-names2.rs index eacba4ddb25c0..6df74d2491b7d 100644 --- a/src/test/run-make-fulldeps/stable-symbol-names/stable-symbol-names2.rs +++ b/src/test/run-make-fulldeps/stable-symbol-names/stable-symbol-names2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="rlib"] extern crate stable_symbol_names1; diff --git a/src/test/run-make-fulldeps/static-dylib-by-default/bar.rs b/src/test/run-make-fulldeps/static-dylib-by-default/bar.rs index 63da277dece47..5381e7f24bc3a 100644 --- a/src/test/run-make-fulldeps/static-dylib-by-default/bar.rs +++ b/src/test/run-make-fulldeps/static-dylib-by-default/bar.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "dylib"] extern crate foo; diff --git a/src/test/run-make-fulldeps/static-dylib-by-default/foo.rs b/src/test/run-make-fulldeps/static-dylib-by-default/foo.rs index 341040e653c5c..7ebec8720557d 100644 --- a/src/test/run-make-fulldeps/static-dylib-by-default/foo.rs +++ b/src/test/run-make-fulldeps/static-dylib-by-default/foo.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] #![crate_type = "dylib"] diff --git a/src/test/run-make-fulldeps/static-nobundle/bbb.rs b/src/test/run-make-fulldeps/static-nobundle/bbb.rs index 2bd69c9932723..0e10fc3dd3a0c 100644 --- a/src/test/run-make-fulldeps/static-nobundle/bbb.rs +++ b/src/test/run-make-fulldeps/static-nobundle/bbb.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] #![feature(static_nobundle)] diff --git a/src/test/run-make-fulldeps/static-nobundle/ccc.rs b/src/test/run-make-fulldeps/static-nobundle/ccc.rs index bd34753a00d12..a1f875a52d514 100644 --- a/src/test/run-make-fulldeps/static-nobundle/ccc.rs +++ b/src/test/run-make-fulldeps/static-nobundle/ccc.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "dylib"] extern crate bbb; diff --git a/src/test/run-make-fulldeps/static-nobundle/ddd.rs b/src/test/run-make-fulldeps/static-nobundle/ddd.rs index f7d23a899f758..50b41211ff02b 100644 --- a/src/test/run-make-fulldeps/static-nobundle/ddd.rs +++ b/src/test/run-make-fulldeps/static-nobundle/ddd.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate ccc; fn main() { diff --git a/src/test/run-make-fulldeps/static-unwinding/lib.rs b/src/test/run-make-fulldeps/static-unwinding/lib.rs index 12c72d54c094b..3fb1117a11059 100644 --- a/src/test/run-make-fulldeps/static-unwinding/lib.rs +++ b/src/test/run-make-fulldeps/static-unwinding/lib.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] pub static mut statik: isize = 0; diff --git a/src/test/run-make-fulldeps/static-unwinding/main.rs b/src/test/run-make-fulldeps/static-unwinding/main.rs index 1cd785334f63a..0c66ea1aa07fc 100644 --- a/src/test/run-make-fulldeps/static-unwinding/main.rs +++ b/src/test/run-make-fulldeps/static-unwinding/main.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate lib; use std::thread; diff --git a/src/test/run-make-fulldeps/staticlib-blank-lib/foo.rs b/src/test/run-make-fulldeps/staticlib-blank-lib/foo.rs index 6010e60e95c1c..48ba8b7f1b78d 100644 --- a/src/test/run-make-fulldeps/staticlib-blank-lib/foo.rs +++ b/src/test/run-make-fulldeps/staticlib-blank-lib/foo.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "staticlib"] #[link(name = "foo", kind = "static")] diff --git a/src/test/run-make-fulldeps/std-core-cycle/bar.rs b/src/test/run-make-fulldeps/std-core-cycle/bar.rs index 4b885e5e2bb82..9f5e7c29bddd7 100644 --- a/src/test/run-make-fulldeps/std-core-cycle/bar.rs +++ b/src/test/run-make-fulldeps/std-core-cycle/bar.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(allocator_api)] #![crate_type = "rlib"] diff --git a/src/test/run-make-fulldeps/std-core-cycle/foo.rs b/src/test/run-make-fulldeps/std-core-cycle/foo.rs index 46047fb835d75..3c80bc45a5b9c 100644 --- a/src/test/run-make-fulldeps/std-core-cycle/foo.rs +++ b/src/test/run-make-fulldeps/std-core-cycle/foo.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "cdylib"] extern crate bar; diff --git a/src/test/run-make-fulldeps/suspicious-library/bar.rs b/src/test/run-make-fulldeps/suspicious-library/bar.rs index ed0e8a7e23e80..550c94cd0c608 100644 --- a/src/test/run-make-fulldeps/suspicious-library/bar.rs +++ b/src/test/run-make-fulldeps/suspicious-library/bar.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate foo; fn main() { foo::foo() } diff --git a/src/test/run-make-fulldeps/suspicious-library/foo.rs b/src/test/run-make-fulldeps/suspicious-library/foo.rs index 2ec6e3834a113..a382d8f2c7f55 100644 --- a/src/test/run-make-fulldeps/suspicious-library/foo.rs +++ b/src/test/run-make-fulldeps/suspicious-library/foo.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "dylib"] pub fn foo() {} diff --git a/src/test/run-make-fulldeps/symbol-visibility/a_cdylib.rs b/src/test/run-make-fulldeps/symbol-visibility/a_cdylib.rs index 9a70542c06ca7..d4fbff85bfe6f 100644 --- a/src/test/run-make-fulldeps/symbol-visibility/a_cdylib.rs +++ b/src/test/run-make-fulldeps/symbol-visibility/a_cdylib.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="cdylib"] extern crate an_rlib; diff --git a/src/test/run-make-fulldeps/symbol-visibility/a_rust_dylib.rs b/src/test/run-make-fulldeps/symbol-visibility/a_rust_dylib.rs index 99e748ec2efc8..a47df0ab7eed1 100644 --- a/src/test/run-make-fulldeps/symbol-visibility/a_rust_dylib.rs +++ b/src/test/run-make-fulldeps/symbol-visibility/a_rust_dylib.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="dylib"] extern crate an_rlib; diff --git a/src/test/run-make-fulldeps/symbol-visibility/an_executable.rs b/src/test/run-make-fulldeps/symbol-visibility/an_executable.rs index 73059c5e374f2..3f5e125ad193d 100644 --- a/src/test/run-make-fulldeps/symbol-visibility/an_executable.rs +++ b/src/test/run-make-fulldeps/symbol-visibility/an_executable.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="bin"] extern crate an_rlib; diff --git a/src/test/run-make-fulldeps/symbol-visibility/an_rlib.rs b/src/test/run-make-fulldeps/symbol-visibility/an_rlib.rs index a1d73afd30b11..3696422b11e96 100644 --- a/src/test/run-make-fulldeps/symbol-visibility/an_rlib.rs +++ b/src/test/run-make-fulldeps/symbol-visibility/an_rlib.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="rlib"] pub fn public_rust_function_from_rlib() {} diff --git a/src/test/run-make-fulldeps/symbols-include-type-name/lib.rs b/src/test/run-make-fulldeps/symbols-include-type-name/lib.rs index d84f1617db53a..37d445917674f 100644 --- a/src/test/run-make-fulldeps/symbols-include-type-name/lib.rs +++ b/src/test/run-make-fulldeps/symbols-include-type-name/lib.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Def { pub id: i32, } diff --git a/src/test/run-make-fulldeps/symlinked-extern/bar.rs b/src/test/run-make-fulldeps/symlinked-extern/bar.rs index 79103f2401700..cd9c959d5e6a3 100644 --- a/src/test/run-make-fulldeps/symlinked-extern/bar.rs +++ b/src/test/run-make-fulldeps/symlinked-extern/bar.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] extern crate foo; diff --git a/src/test/run-make-fulldeps/symlinked-extern/baz.rs b/src/test/run-make-fulldeps/symlinked-extern/baz.rs index 0f6ba25436823..cd433a3ac7a3e 100644 --- a/src/test/run-make-fulldeps/symlinked-extern/baz.rs +++ b/src/test/run-make-fulldeps/symlinked-extern/baz.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate bar; extern crate foo; diff --git a/src/test/run-make-fulldeps/symlinked-extern/foo.rs b/src/test/run-make-fulldeps/symlinked-extern/foo.rs index 0b8bb64d37572..c00700b8cf83e 100644 --- a/src/test/run-make-fulldeps/symlinked-extern/foo.rs +++ b/src/test/run-make-fulldeps/symlinked-extern/foo.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] pub struct S; diff --git a/src/test/run-make-fulldeps/symlinked-libraries/bar.rs b/src/test/run-make-fulldeps/symlinked-libraries/bar.rs index 73596f93f5685..fde0d746634c7 100644 --- a/src/test/run-make-fulldeps/symlinked-libraries/bar.rs +++ b/src/test/run-make-fulldeps/symlinked-libraries/bar.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate foo; fn main() { diff --git a/src/test/run-make-fulldeps/symlinked-libraries/foo.rs b/src/test/run-make-fulldeps/symlinked-libraries/foo.rs index fdb29974cd800..cde9e291b45bc 100644 --- a/src/test/run-make-fulldeps/symlinked-libraries/foo.rs +++ b/src/test/run-make-fulldeps/symlinked-libraries/foo.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "dylib"] pub fn bar() {} diff --git a/src/test/run-make-fulldeps/symlinked-rlib/bar.rs b/src/test/run-make-fulldeps/symlinked-rlib/bar.rs index e8f06680862fc..fde0d746634c7 100644 --- a/src/test/run-make-fulldeps/symlinked-rlib/bar.rs +++ b/src/test/run-make-fulldeps/symlinked-rlib/bar.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate foo; fn main() { diff --git a/src/test/run-make-fulldeps/symlinked-rlib/foo.rs b/src/test/run-make-fulldeps/symlinked-rlib/foo.rs index 5abbb1dcbcef2..c5c0bc606cd69 100644 --- a/src/test/run-make-fulldeps/symlinked-rlib/foo.rs +++ b/src/test/run-make-fulldeps/symlinked-rlib/foo.rs @@ -1,11 +1 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn bar() {} diff --git a/src/test/run-make-fulldeps/target-cpu-native/foo.rs b/src/test/run-make-fulldeps/target-cpu-native/foo.rs index f7a9f969060ae..f79c691f0853c 100644 --- a/src/test/run-make-fulldeps/target-cpu-native/foo.rs +++ b/src/test/run-make-fulldeps/target-cpu-native/foo.rs @@ -1,12 +1,2 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { } diff --git a/src/test/run-make-fulldeps/target-specs/foo.rs b/src/test/run-make-fulldeps/target-specs/foo.rs index bbd1c5d900faf..421300686955c 100644 --- a/src/test/run-make-fulldeps/target-specs/foo.rs +++ b/src/test/run-make-fulldeps/target-specs/foo.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(lang_items, no_core, optin_builtin_traits)] #![no_core] diff --git a/src/test/run-make-fulldeps/test-harness/test-ignore-cfg.rs b/src/test/run-make-fulldeps/test-harness/test-ignore-cfg.rs index 990d3d104853b..31ef131f2ad76 100644 --- a/src/test/run-make-fulldeps/test-harness/test-ignore-cfg.rs +++ b/src/test/run-make-fulldeps/test-harness/test-ignore-cfg.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[test] #[cfg_attr(ignorecfg, ignore)] fn shouldignore() { diff --git a/src/test/run-make-fulldeps/treat-err-as-bug/err.rs b/src/test/run-make-fulldeps/treat-err-as-bug/err.rs index 078495663acc6..136b2f3070299 100644 --- a/src/test/run-make-fulldeps/treat-err-as-bug/err.rs +++ b/src/test/run-make-fulldeps/treat-err-as-bug/err.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="rlib"] pub static C: u32 = 0-1; diff --git a/src/test/run-make-fulldeps/type-mismatch-same-crate-name/crateA.rs b/src/test/run-make-fulldeps/type-mismatch-same-crate-name/crateA.rs index e40266bb4cdaa..4871c8c2e9ccd 100644 --- a/src/test/run-make-fulldeps/type-mismatch-same-crate-name/crateA.rs +++ b/src/test/run-make-fulldeps/type-mismatch-same-crate-name/crateA.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod foo { pub struct Foo; } diff --git a/src/test/run-make-fulldeps/type-mismatch-same-crate-name/crateB.rs b/src/test/run-make-fulldeps/type-mismatch-same-crate-name/crateB.rs index da4ea1c9387e9..24fcc7cadc108 100644 --- a/src/test/run-make-fulldeps/type-mismatch-same-crate-name/crateB.rs +++ b/src/test/run-make-fulldeps/type-mismatch-same-crate-name/crateB.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate crateA; pub fn try_foo(x: crateA::Foo){} diff --git a/src/test/run-make-fulldeps/type-mismatch-same-crate-name/crateC.rs b/src/test/run-make-fulldeps/type-mismatch-same-crate-name/crateC.rs index 210bc4c8320c5..12898aa5c74b9 100644 --- a/src/test/run-make-fulldeps/type-mismatch-same-crate-name/crateC.rs +++ b/src/test/run-make-fulldeps/type-mismatch-same-crate-name/crateC.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This tests the extra note reported when a type error deals with // seemingly identical types. // The main use case of this error is when there are two crates diff --git a/src/test/run-make-fulldeps/use-extern-for-plugins/bar.rs b/src/test/run-make-fulldeps/use-extern-for-plugins/bar.rs index 3e99ed60c62fa..704d212036273 100644 --- a/src/test/run-make-fulldeps/use-extern-for-plugins/bar.rs +++ b/src/test/run-make-fulldeps/use-extern-for-plugins/bar.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(no_core)] #![no_core] #![crate_type = "lib"] diff --git a/src/test/run-make-fulldeps/use-extern-for-plugins/baz.rs b/src/test/run-make-fulldeps/use-extern-for-plugins/baz.rs index 3f15d0e6e0590..49a96a0c80b02 100644 --- a/src/test/run-make-fulldeps/use-extern-for-plugins/baz.rs +++ b/src/test/run-make-fulldeps/use-extern-for-plugins/baz.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(no_core)] #![no_core] #![crate_type = "lib"] diff --git a/src/test/run-make-fulldeps/use-extern-for-plugins/foo.rs b/src/test/run-make-fulldeps/use-extern-for-plugins/foo.rs index 0afd3be466dbf..dffdc0798872e 100644 --- a/src/test/run-make-fulldeps/use-extern-for-plugins/foo.rs +++ b/src/test/run-make-fulldeps/use-extern-for-plugins/foo.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![no_std] #![crate_type = "lib"] #![crate_name = "a"] diff --git a/src/test/run-make-fulldeps/used/used.rs b/src/test/run-make-fulldeps/used/used.rs index 186cd0fdf5e35..31bac9af02117 100644 --- a/src/test/run-make-fulldeps/used/used.rs +++ b/src/test/run-make-fulldeps/used/used.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] #![feature(used)] diff --git a/src/test/run-make-fulldeps/volatile-intrinsics/main.rs b/src/test/run-make-fulldeps/volatile-intrinsics/main.rs index d214a20139c9c..4295d95f3f398 100644 --- a/src/test/run-make-fulldeps/volatile-intrinsics/main.rs +++ b/src/test/run-make-fulldeps/volatile-intrinsics/main.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(core_intrinsics, volatile)] use std::intrinsics::{ diff --git a/src/test/run-make-fulldeps/weird-output-filenames/foo.rs b/src/test/run-make-fulldeps/weird-output-filenames/foo.rs index 8ae3d072362ed..f328e4d9d04c3 100644 --- a/src/test/run-make-fulldeps/weird-output-filenames/foo.rs +++ b/src/test/run-make-fulldeps/weird-output-filenames/foo.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() {} diff --git a/src/test/run-make-fulldeps/windows-spawn/hello.rs b/src/test/run-make-fulldeps/windows-spawn/hello.rs index b177f41941d1b..47ad8c634112b 100644 --- a/src/test/run-make-fulldeps/windows-spawn/hello.rs +++ b/src/test/run-make-fulldeps/windows-spawn/hello.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { println!("Hello World!"); } diff --git a/src/test/run-make-fulldeps/windows-spawn/spawn.rs b/src/test/run-make-fulldeps/windows-spawn/spawn.rs index 2913cbe2260c1..c34da3d5fde4c 100644 --- a/src/test/run-make-fulldeps/windows-spawn/spawn.rs +++ b/src/test/run-make-fulldeps/windows-spawn/spawn.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::io::ErrorKind; use std::process::Command; diff --git a/src/test/run-make-fulldeps/windows-subsystem/console.rs b/src/test/run-make-fulldeps/windows-subsystem/console.rs index ffad1e35ee660..4a2e9bb3c5cf0 100644 --- a/src/test/run-make-fulldeps/windows-subsystem/console.rs +++ b/src/test/run-make-fulldeps/windows-subsystem/console.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![windows_subsystem = "console"] fn main() {} diff --git a/src/test/run-make-fulldeps/windows-subsystem/windows.rs b/src/test/run-make-fulldeps/windows-subsystem/windows.rs index 33cbe32059190..1138248f07da0 100644 --- a/src/test/run-make-fulldeps/windows-subsystem/windows.rs +++ b/src/test/run-make-fulldeps/windows-subsystem/windows.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![windows_subsystem = "windows"] fn main() {} diff --git a/src/test/run-make/wasm-custom-section/bar.rs b/src/test/run-make/wasm-custom-section/bar.rs index 6b165f1f70092..c95f3e1438b76 100644 --- a/src/test/run-make/wasm-custom-section/bar.rs +++ b/src/test/run-make/wasm-custom-section/bar.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "cdylib"] #![deny(warnings)] diff --git a/src/test/run-make/wasm-custom-section/foo.rs b/src/test/run-make/wasm-custom-section/foo.rs index 6a35d743710dd..61f81f024b5a7 100644 --- a/src/test/run-make/wasm-custom-section/foo.rs +++ b/src/test/run-make/wasm-custom-section/foo.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] #![deny(warnings)] diff --git a/src/test/run-make/wasm-custom-sections-opt/foo.rs b/src/test/run-make/wasm-custom-sections-opt/foo.rs index 4d983514a2360..9af7728b7f3a3 100644 --- a/src/test/run-make/wasm-custom-sections-opt/foo.rs +++ b/src/test/run-make/wasm-custom-sections-opt/foo.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "cdylib"] #![deny(warnings)] diff --git a/src/test/run-make/wasm-import-module/bar.rs b/src/test/run-make/wasm-import-module/bar.rs index bd27be32b2134..206f7c63e036e 100644 --- a/src/test/run-make/wasm-import-module/bar.rs +++ b/src/test/run-make/wasm-import-module/bar.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "cdylib"] #![deny(warnings)] diff --git a/src/test/run-make/wasm-import-module/foo.rs b/src/test/run-make/wasm-import-module/foo.rs index e4009253fd288..b9f87f18d0aa3 100644 --- a/src/test/run-make/wasm-import-module/foo.rs +++ b/src/test/run-make/wasm-import-module/foo.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] #![deny(warnings)] diff --git a/src/test/run-make/wasm-panic-small/foo.rs b/src/test/run-make/wasm-panic-small/foo.rs index 1ea724ca94d47..649854a175546 100644 --- a/src/test/run-make/wasm-panic-small/foo.rs +++ b/src/test/run-make/wasm-panic-small/foo.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "cdylib"] #[no_mangle] diff --git a/src/test/run-make/wasm-symbols-not-exported/bar.rs b/src/test/run-make/wasm-symbols-not-exported/bar.rs index 979ec44b04077..12f288751cc0b 100644 --- a/src/test/run-make/wasm-symbols-not-exported/bar.rs +++ b/src/test/run-make/wasm-symbols-not-exported/bar.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(panic_implementation, alloc_error_handler)] #![crate_type = "cdylib"] #![no_std] diff --git a/src/test/run-make/wasm-symbols-not-exported/foo.rs b/src/test/run-make/wasm-symbols-not-exported/foo.rs index cd8c7cb205d96..d46baee01b966 100644 --- a/src/test/run-make/wasm-symbols-not-exported/foo.rs +++ b/src/test/run-make/wasm-symbols-not-exported/foo.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "cdylib"] #[no_mangle] diff --git a/src/test/run-pass-fulldeps/ast_stmt_expr_attr.rs b/src/test/run-pass-fulldeps/ast_stmt_expr_attr.rs index 6a706bdb9b2b6..b937dfa9071c6 100644 --- a/src/test/run-pass-fulldeps/ast_stmt_expr_attr.rs +++ b/src/test/run-pass-fulldeps/ast_stmt_expr_attr.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cross-compile #![feature(rustc_private)] diff --git a/src/test/run-pass-fulldeps/auxiliary/cond_plugin.rs b/src/test/run-pass-fulldeps/auxiliary/cond_plugin.rs index 94c5b208a3707..d2cb78b623cf5 100644 --- a/src/test/run-pass-fulldeps/auxiliary/cond_plugin.rs +++ b/src/test/run-pass-fulldeps/auxiliary/cond_plugin.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/run-pass-fulldeps/auxiliary/custom_derive_partial_eq.rs b/src/test/run-pass-fulldeps/auxiliary/custom_derive_partial_eq.rs index 985f31296fb87..4d6ff47a3ee91 100644 --- a/src/test/run-pass-fulldeps/auxiliary/custom_derive_partial_eq.rs +++ b/src/test/run-pass-fulldeps/auxiliary/custom_derive_partial_eq.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host #![feature(plugin_registrar, rustc_private)] diff --git a/src/test/run-pass-fulldeps/auxiliary/custom_derive_plugin.rs b/src/test/run-pass-fulldeps/auxiliary/custom_derive_plugin.rs index 449cd29ada3e0..8f80ca7332f3f 100644 --- a/src/test/run-pass-fulldeps/auxiliary/custom_derive_plugin.rs +++ b/src/test/run-pass-fulldeps/auxiliary/custom_derive_plugin.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host #![feature(plugin_registrar)] diff --git a/src/test/run-pass-fulldeps/auxiliary/custom_derive_plugin_attr.rs b/src/test/run-pass-fulldeps/auxiliary/custom_derive_plugin_attr.rs index 7eafd834c4913..699972c9a85bd 100644 --- a/src/test/run-pass-fulldeps/auxiliary/custom_derive_plugin_attr.rs +++ b/src/test/run-pass-fulldeps/auxiliary/custom_derive_plugin_attr.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host #![feature(plugin_registrar)] diff --git a/src/test/run-pass-fulldeps/auxiliary/hello_macro.rs b/src/test/run-pass-fulldeps/auxiliary/hello_macro.rs index b54543c73fbd2..b9d7425ad3d4c 100644 --- a/src/test/run-pass-fulldeps/auxiliary/hello_macro.rs +++ b/src/test/run-pass-fulldeps/auxiliary/hello_macro.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/run-pass-fulldeps/auxiliary/issue-13560-1.rs b/src/test/run-pass-fulldeps/auxiliary/issue-13560-1.rs index 858d7269cd874..c3a2ae679bf74 100644 --- a/src/test/run-pass-fulldeps/auxiliary/issue-13560-1.rs +++ b/src/test/run-pass-fulldeps/auxiliary/issue-13560-1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "dylib"] diff --git a/src/test/run-pass-fulldeps/auxiliary/issue-13560-2.rs b/src/test/run-pass-fulldeps/auxiliary/issue-13560-2.rs index 8e46acca1244f..39c261e1162f1 100644 --- a/src/test/run-pass-fulldeps/auxiliary/issue-13560-2.rs +++ b/src/test/run-pass-fulldeps/auxiliary/issue-13560-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "rlib"] diff --git a/src/test/run-pass-fulldeps/auxiliary/issue-13560-3.rs b/src/test/run-pass-fulldeps/auxiliary/issue-13560-3.rs index c0539aa1b6e20..e991bcc1a0242 100644 --- a/src/test/run-pass-fulldeps/auxiliary/issue-13560-3.rs +++ b/src/test/run-pass-fulldeps/auxiliary/issue-13560-3.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "rlib"] diff --git a/src/test/run-pass-fulldeps/auxiliary/issue-16723.rs b/src/test/run-pass-fulldeps/auxiliary/issue-16723.rs index 533d0ac490c41..c750ccec067a1 100644 --- a/src/test/run-pass-fulldeps/auxiliary/issue-16723.rs +++ b/src/test/run-pass-fulldeps/auxiliary/issue-16723.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host #![feature(plugin_registrar, quote, rustc_private)] diff --git a/src/test/run-pass-fulldeps/auxiliary/issue-16822.rs b/src/test/run-pass-fulldeps/auxiliary/issue-16822.rs index 0e3041c11748b..9042dd39117b9 100644 --- a/src/test/run-pass-fulldeps/auxiliary/issue-16822.rs +++ b/src/test/run-pass-fulldeps/auxiliary/issue-16822.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="lib"] use std::cell::RefCell; diff --git a/src/test/run-pass-fulldeps/auxiliary/issue-18502.rs b/src/test/run-pass-fulldeps/auxiliary/issue-18502.rs index 718b046e1e477..4d4230607aad7 100644 --- a/src/test/run-pass-fulldeps/auxiliary/issue-18502.rs +++ b/src/test/run-pass-fulldeps/auxiliary/issue-18502.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="lib"] struct Foo; diff --git a/src/test/run-pass-fulldeps/auxiliary/issue_24106.rs b/src/test/run-pass-fulldeps/auxiliary/issue_24106.rs index 745fbbe769e60..2c6a6034806bd 100644 --- a/src/test/run-pass-fulldeps/auxiliary/issue_24106.rs +++ b/src/test/run-pass-fulldeps/auxiliary/issue_24106.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="lib"] enum E { E0 = 0, E1 = 1 } diff --git a/src/test/run-pass-fulldeps/auxiliary/linkage-visibility.rs b/src/test/run-pass-fulldeps/auxiliary/linkage-visibility.rs index 7a15a4cb3a2e8..e183837876260 100644 --- a/src/test/run-pass-fulldeps/auxiliary/linkage-visibility.rs +++ b/src/test/run-pass-fulldeps/auxiliary/linkage-visibility.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_private)] // We're testing linkage visibility; the compiler warns us, but we want to diff --git a/src/test/run-pass-fulldeps/auxiliary/lint_for_crate.rs b/src/test/run-pass-fulldeps/auxiliary/lint_for_crate.rs index 601003827c6a2..e7b18c256f4b4 100644 --- a/src/test/run-pass-fulldeps/auxiliary/lint_for_crate.rs +++ b/src/test/run-pass-fulldeps/auxiliary/lint_for_crate.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host #![feature(plugin_registrar, rustc_private)] diff --git a/src/test/run-pass-fulldeps/auxiliary/llvm_pass_plugin.rs b/src/test/run-pass-fulldeps/auxiliary/llvm_pass_plugin.rs index 59cfdd1e04a03..b5307446bca05 100644 --- a/src/test/run-pass-fulldeps/auxiliary/llvm_pass_plugin.rs +++ b/src/test/run-pass-fulldeps/auxiliary/llvm_pass_plugin.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host #![feature(plugin_registrar)] diff --git a/src/test/run-pass-fulldeps/auxiliary/lto-syntax-extension-lib.rs b/src/test/run-pass-fulldeps/auxiliary/lto-syntax-extension-lib.rs index 78c03bac33f27..954a1e554dabd 100644 --- a/src/test/run-pass-fulldeps/auxiliary/lto-syntax-extension-lib.rs +++ b/src/test/run-pass-fulldeps/auxiliary/lto-syntax-extension-lib.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "rlib"] diff --git a/src/test/run-pass-fulldeps/auxiliary/lto-syntax-extension-plugin.rs b/src/test/run-pass-fulldeps/auxiliary/lto-syntax-extension-plugin.rs index 9cf0d756f40ba..bd50442541990 100644 --- a/src/test/run-pass-fulldeps/auxiliary/lto-syntax-extension-plugin.rs +++ b/src/test/run-pass-fulldeps/auxiliary/lto-syntax-extension-plugin.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host #![feature(plugin_registrar)] diff --git a/src/test/run-pass-fulldeps/auxiliary/macro_crate_test.rs b/src/test/run-pass-fulldeps/auxiliary/macro_crate_test.rs index 14e9dbf3a37bc..e31628782dc47 100644 --- a/src/test/run-pass-fulldeps/auxiliary/macro_crate_test.rs +++ b/src/test/run-pass-fulldeps/auxiliary/macro_crate_test.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host #![feature(plugin_registrar, quote, rustc_private)] diff --git a/src/test/run-pass-fulldeps/auxiliary/outlive-expansion-phase.rs b/src/test/run-pass-fulldeps/auxiliary/outlive-expansion-phase.rs index f56983c14b1bc..25ad8caa37fac 100644 --- a/src/test/run-pass-fulldeps/auxiliary/outlive-expansion-phase.rs +++ b/src/test/run-pass-fulldeps/auxiliary/outlive-expansion-phase.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host #![feature(plugin_registrar)] diff --git a/src/test/run-pass-fulldeps/auxiliary/plugin_args.rs b/src/test/run-pass-fulldeps/auxiliary/plugin_args.rs index ac39118c5f1e0..5f6b569723f44 100644 --- a/src/test/run-pass-fulldeps/auxiliary/plugin_args.rs +++ b/src/test/run-pass-fulldeps/auxiliary/plugin_args.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host #![feature(plugin_registrar)] diff --git a/src/test/run-pass-fulldeps/auxiliary/plugin_with_plugin_lib.rs b/src/test/run-pass-fulldeps/auxiliary/plugin_with_plugin_lib.rs index 8b5ff7cf07c69..320b77e8ea8e1 100644 --- a/src/test/run-pass-fulldeps/auxiliary/plugin_with_plugin_lib.rs +++ b/src/test/run-pass-fulldeps/auxiliary/plugin_with_plugin_lib.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host #![feature(plugin_registrar, rustc_private)] diff --git a/src/test/run-pass-fulldeps/auxiliary/proc_macro_def.rs b/src/test/run-pass-fulldeps/auxiliary/proc_macro_def.rs index 9faa7366ec5f1..82d3e472a7660 100644 --- a/src/test/run-pass-fulldeps/auxiliary/proc_macro_def.rs +++ b/src/test/run-pass-fulldeps/auxiliary/proc_macro_def.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/run-pass-fulldeps/auxiliary/procedural_mbe_matching.rs b/src/test/run-pass-fulldeps/auxiliary/procedural_mbe_matching.rs index f1777745e06c3..226a54249e1ef 100644 --- a/src/test/run-pass-fulldeps/auxiliary/procedural_mbe_matching.rs +++ b/src/test/run-pass-fulldeps/auxiliary/procedural_mbe_matching.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host #![crate_type="dylib"] diff --git a/src/test/run-pass-fulldeps/auxiliary/roman_numerals.rs b/src/test/run-pass-fulldeps/auxiliary/roman_numerals.rs index dc6f33bad9979..216c81ca34ce5 100644 --- a/src/test/run-pass-fulldeps/auxiliary/roman_numerals.rs +++ b/src/test/run-pass-fulldeps/auxiliary/roman_numerals.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host #![crate_type="dylib"] diff --git a/src/test/run-pass-fulldeps/auxiliary/syntax_extension_with_dll_deps_1.rs b/src/test/run-pass-fulldeps/auxiliary/syntax_extension_with_dll_deps_1.rs index fadeb02440533..8b00fb81cd259 100644 --- a/src/test/run-pass-fulldeps/auxiliary/syntax_extension_with_dll_deps_1.rs +++ b/src/test/run-pass-fulldeps/auxiliary/syntax_extension_with_dll_deps_1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host #![crate_type = "dylib"] diff --git a/src/test/run-pass-fulldeps/auxiliary/syntax_extension_with_dll_deps_2.rs b/src/test/run-pass-fulldeps/auxiliary/syntax_extension_with_dll_deps_2.rs index 72d2628535556..a356df55b3562 100644 --- a/src/test/run-pass-fulldeps/auxiliary/syntax_extension_with_dll_deps_2.rs +++ b/src/test/run-pass-fulldeps/auxiliary/syntax_extension_with_dll_deps_2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host #![crate_type = "dylib"] diff --git a/src/test/run-pass-fulldeps/compiler-calls.rs b/src/test/run-pass-fulldeps/compiler-calls.rs index baf9e0d5dc5a6..9986c8b6ae257 100644 --- a/src/test/run-pass-fulldeps/compiler-calls.rs +++ b/src/test/run-pass-fulldeps/compiler-calls.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the CompilerCalls interface to the compiler works. // ignore-cross-compile diff --git a/src/test/run-pass-fulldeps/create-dir-all-bare.rs b/src/test/run-pass-fulldeps/create-dir-all-bare.rs index a35eed1f72d79..da4cde447eb8e 100644 --- a/src/test/run-pass-fulldeps/create-dir-all-bare.rs +++ b/src/test/run-pass-fulldeps/create-dir-all-bare.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::env; use std::fs; use std::path::PathBuf; diff --git a/src/test/run-pass-fulldeps/custom-derive-partial-eq.rs b/src/test/run-pass-fulldeps/custom-derive-partial-eq.rs index 47f5f8397d1c5..be16664e68f9b 100644 --- a/src/test/run-pass-fulldeps/custom-derive-partial-eq.rs +++ b/src/test/run-pass-fulldeps/custom-derive-partial-eq.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:custom_derive_partial_eq.rs // ignore-stage1 #![feature(plugin, custom_derive)] diff --git a/src/test/run-pass-fulldeps/derive-no-std-not-supported.rs b/src/test/run-pass-fulldeps/derive-no-std-not-supported.rs index a0747e0fbf59f..ac9abf38e4868 100644 --- a/src/test/run-pass-fulldeps/derive-no-std-not-supported.rs +++ b/src/test/run-pass-fulldeps/derive-no-std-not-supported.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_private)] #![no_std] diff --git a/src/test/run-pass-fulldeps/derive-totalsum-attr.rs b/src/test/run-pass-fulldeps/derive-totalsum-attr.rs index e088f5e426263..5098b893a0720 100644 --- a/src/test/run-pass-fulldeps/derive-totalsum-attr.rs +++ b/src/test/run-pass-fulldeps/derive-totalsum-attr.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:custom_derive_plugin_attr.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/derive-totalsum.rs b/src/test/run-pass-fulldeps/derive-totalsum.rs index 848b2425e4496..3cd04231b6415 100644 --- a/src/test/run-pass-fulldeps/derive-totalsum.rs +++ b/src/test/run-pass-fulldeps/derive-totalsum.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:custom_derive_plugin.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/deriving-encodable-decodable-box.rs b/src/test/run-pass-fulldeps/deriving-encodable-decodable-box.rs index 4c5b3259902eb..b72a57d427024 100644 --- a/src/test/run-pass-fulldeps/deriving-encodable-decodable-box.rs +++ b/src/test/run-pass-fulldeps/deriving-encodable-decodable-box.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![feature(box_syntax)] #![feature(rustc_private)] diff --git a/src/test/run-pass-fulldeps/deriving-encodable-decodable-cell-refcell.rs b/src/test/run-pass-fulldeps/deriving-encodable-decodable-cell-refcell.rs index 6e5eb86c58411..dcf36523f90f0 100644 --- a/src/test/run-pass-fulldeps/deriving-encodable-decodable-cell-refcell.rs +++ b/src/test/run-pass-fulldeps/deriving-encodable-decodable-cell-refcell.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This briefly tests the capability of `Cell` and `RefCell` to implement the // `Encodable` and `Decodable` traits via `#[derive(Encodable, Decodable)]` diff --git a/src/test/run-pass-fulldeps/deriving-global.rs b/src/test/run-pass-fulldeps/deriving-global.rs index e967873280470..ced2b07bfc7f1 100644 --- a/src/test/run-pass-fulldeps/deriving-global.rs +++ b/src/test/run-pass-fulldeps/deriving-global.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_private)] extern crate serialize; diff --git a/src/test/run-pass-fulldeps/deriving-hygiene.rs b/src/test/run-pass-fulldeps/deriving-hygiene.rs index 532f245659976..a4b23053081e1 100644 --- a/src/test/run-pass-fulldeps/deriving-hygiene.rs +++ b/src/test/run-pass-fulldeps/deriving-hygiene.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_private)] extern crate serialize; diff --git a/src/test/run-pass-fulldeps/dropck_tarena_sound_drop.rs b/src/test/run-pass-fulldeps/dropck_tarena_sound_drop.rs index db30bfbf74790..7fe3cab57f9b2 100644 --- a/src/test/run-pass-fulldeps/dropck_tarena_sound_drop.rs +++ b/src/test/run-pass-fulldeps/dropck_tarena_sound_drop.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that an arena (TypedArena) can carry elements whose drop // methods might access borrowed data, as long as the borrowed data // has lifetime that strictly outlives the arena itself. diff --git a/src/test/run-pass-fulldeps/empty-struct-braces-derive.rs b/src/test/run-pass-fulldeps/empty-struct-braces-derive.rs index 79ce3cb68d4be..d80bbca95df56 100644 --- a/src/test/run-pass-fulldeps/empty-struct-braces-derive.rs +++ b/src/test/run-pass-fulldeps/empty-struct-braces-derive.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // `#[derive(Trait)]` works for empty structs/variants with braces or parens. #![feature(rustc_private)] diff --git a/src/test/run-pass-fulldeps/extern-mod-syntax.rs b/src/test/run-pass-fulldeps/extern-mod-syntax.rs index 37404ee7e696c..12373acc365a6 100644 --- a/src/test/run-pass-fulldeps/extern-mod-syntax.rs +++ b/src/test/run-pass-fulldeps/extern-mod-syntax.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_imports)] #![feature(rustc_private)] diff --git a/src/test/run-pass-fulldeps/issue-11881.rs b/src/test/run-pass-fulldeps/issue-11881.rs index 4f419e70074fc..45827857a87d3 100644 --- a/src/test/run-pass-fulldeps/issue-11881.rs +++ b/src/test/run-pass-fulldeps/issue-11881.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![feature(rustc_private)] extern crate serialize; diff --git a/src/test/run-pass-fulldeps/issue-13560.rs b/src/test/run-pass-fulldeps/issue-13560.rs index 0ceb5ed5e755d..de2ecbdc988b0 100644 --- a/src/test/run-pass-fulldeps/issue-13560.rs +++ b/src/test/run-pass-fulldeps/issue-13560.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-13560-1.rs // aux-build:issue-13560-2.rs // aux-build:issue-13560-3.rs diff --git a/src/test/run-pass-fulldeps/issue-14021.rs b/src/test/run-pass-fulldeps/issue-14021.rs index 907967d115d58..a5fd585870fa4 100644 --- a/src/test/run-pass-fulldeps/issue-14021.rs +++ b/src/test/run-pass-fulldeps/issue-14021.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_private)] extern crate serialize; diff --git a/src/test/run-pass-fulldeps/issue-15149.rs b/src/test/run-pass-fulldeps/issue-15149.rs index 15ac1d55cc8c4..b5fe3d01e842a 100644 --- a/src/test/run-pass-fulldeps/issue-15149.rs +++ b/src/test/run-pass-fulldeps/issue-15149.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic // ignore-cross-compile diff --git a/src/test/run-pass-fulldeps/issue-15778-pass.rs b/src/test/run-pass-fulldeps/issue-15778-pass.rs index 6fcf0a0450c84..50e9b14b26832 100644 --- a/src/test/run-pass-fulldeps/issue-15778-pass.rs +++ b/src/test/run-pass-fulldeps/issue-15778-pass.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:lint_for_crate.rs // ignore-stage1 // compile-flags: -D crate-not-okay diff --git a/src/test/run-pass-fulldeps/issue-15924.rs b/src/test/run-pass-fulldeps/issue-15924.rs index 0c208773884d4..7c984bd73ec8b 100644 --- a/src/test/run-pass-fulldeps/issue-15924.rs +++ b/src/test/run-pass-fulldeps/issue-15924.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(rustc_private)] diff --git a/src/test/run-pass-fulldeps/issue-16723.rs b/src/test/run-pass-fulldeps/issue-16723.rs index bacfa8d1ead5a..a3965f98927f9 100644 --- a/src/test/run-pass-fulldeps/issue-16723.rs +++ b/src/test/run-pass-fulldeps/issue-16723.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-stage1 // aux-build:issue-16723.rs #![feature(plugin)] diff --git a/src/test/run-pass-fulldeps/issue-16822.rs b/src/test/run-pass-fulldeps/issue-16822.rs index 172d3e31d45e8..bcc10d1641225 100644 --- a/src/test/run-pass-fulldeps/issue-16822.rs +++ b/src/test/run-pass-fulldeps/issue-16822.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-16822.rs extern crate issue_16822 as lib; diff --git a/src/test/run-pass-fulldeps/issue-16992.rs b/src/test/run-pass-fulldeps/issue-16992.rs index 3ab7f8429e601..e5945b679f382 100644 --- a/src/test/run-pass-fulldeps/issue-16992.rs +++ b/src/test/run-pass-fulldeps/issue-16992.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cross-compile #![feature(quote, rustc_private)] diff --git a/src/test/run-pass-fulldeps/issue-18502.rs b/src/test/run-pass-fulldeps/issue-18502.rs index 8367fc110e137..a6e1fc84932cb 100644 --- a/src/test/run-pass-fulldeps/issue-18502.rs +++ b/src/test/run-pass-fulldeps/issue-18502.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-18502.rs extern crate issue_18502 as fmt; diff --git a/src/test/run-pass-fulldeps/issue-18763-quote-token-tree.rs b/src/test/run-pass-fulldeps/issue-18763-quote-token-tree.rs index 03311d76e46d4..8f01384d2b71e 100644 --- a/src/test/run-pass-fulldeps/issue-18763-quote-token-tree.rs +++ b/src/test/run-pass-fulldeps/issue-18763-quote-token-tree.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cross-compile #![feature(quote, rustc_private)] diff --git a/src/test/run-pass-fulldeps/issue-24972.rs b/src/test/run-pass-fulldeps/issue-24972.rs index ae7eb84d3e8ec..8d80b4f0c1185 100644 --- a/src/test/run-pass-fulldeps/issue-24972.rs +++ b/src/test/run-pass-fulldeps/issue-24972.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_private)] extern crate serialize; diff --git a/src/test/run-pass-fulldeps/issue-2804.rs b/src/test/run-pass-fulldeps/issue-2804.rs index f999d2d0ed99c..53455df9e388d 100644 --- a/src/test/run-pass-fulldeps/issue-2804.rs +++ b/src/test/run-pass-fulldeps/issue-2804.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_private)] extern crate serialize; diff --git a/src/test/run-pass-fulldeps/issue-4016.rs b/src/test/run-pass-fulldeps/issue-4016.rs index bc3fa162e02bd..e35d834891766 100644 --- a/src/test/run-pass-fulldeps/issue-4016.rs +++ b/src/test/run-pass-fulldeps/issue-4016.rs @@ -1,14 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![feature(rustc_private)] extern crate serialize; diff --git a/src/test/run-pass-fulldeps/issue-4036.rs b/src/test/run-pass-fulldeps/issue-4036.rs index ae7bb8a684224..0cbd8adf977d8 100644 --- a/src/test/run-pass-fulldeps/issue-4036.rs +++ b/src/test/run-pass-fulldeps/issue-4036.rs @@ -1,14 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // Issue #4036: Test for an issue that arose around fixing up type inference // byproducts in vtable records. diff --git a/src/test/run-pass-fulldeps/issue-40663.rs b/src/test/run-pass-fulldeps/issue-40663.rs index 8cb9dc4a1b6ec..9ee3aa89ea851 100644 --- a/src/test/run-pass-fulldeps/issue-40663.rs +++ b/src/test/run-pass-fulldeps/issue-40663.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:custom_derive_plugin.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/issue_24106.rs b/src/test/run-pass-fulldeps/issue_24106.rs index 7cfd11537f4e9..a497d9f33ae81 100644 --- a/src/test/run-pass-fulldeps/issue_24106.rs +++ b/src/test/run-pass-fulldeps/issue_24106.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_24106.rs extern crate issue_24106; diff --git a/src/test/run-pass-fulldeps/linkage-visibility.rs b/src/test/run-pass-fulldeps/linkage-visibility.rs index 9839a2c704105..5315a219d6d1a 100644 --- a/src/test/run-pass-fulldeps/linkage-visibility.rs +++ b/src/test/run-pass-fulldeps/linkage-visibility.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:linkage-visibility.rs // ignore-android: FIXME(#10356) // ignore-windows: std::dynamic_lib does not work on Windows well diff --git a/src/test/run-pass-fulldeps/llvm-pass-plugin.rs b/src/test/run-pass-fulldeps/llvm-pass-plugin.rs index 5dfef636f9f36..3aad40ecfe8aa 100644 --- a/src/test/run-pass-fulldeps/llvm-pass-plugin.rs +++ b/src/test/run-pass-fulldeps/llvm-pass-plugin.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:llvm_pass_plugin.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/lto-syntax-extension.rs b/src/test/run-pass-fulldeps/lto-syntax-extension.rs index e32f0852ad70b..05ce9e0a8df50 100644 --- a/src/test/run-pass-fulldeps/lto-syntax-extension.rs +++ b/src/test/run-pass-fulldeps/lto-syntax-extension.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:lto-syntax-extension-lib.rs // aux-build:lto-syntax-extension-plugin.rs // compile-flags:-C lto diff --git a/src/test/run-pass-fulldeps/macro-crate-does-hygiene-work.rs b/src/test/run-pass-fulldeps/macro-crate-does-hygiene-work.rs index 8ed47fe1f6f20..3c251cc0f553a 100644 --- a/src/test/run-pass-fulldeps/macro-crate-does-hygiene-work.rs +++ b/src/test/run-pass-fulldeps/macro-crate-does-hygiene-work.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:macro_crate_test.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/macro-crate-multi-decorator-literals.rs b/src/test/run-pass-fulldeps/macro-crate-multi-decorator-literals.rs index 86d7cd54d9739..352f3c331e58a 100644 --- a/src/test/run-pass-fulldeps/macro-crate-multi-decorator-literals.rs +++ b/src/test/run-pass-fulldeps/macro-crate-multi-decorator-literals.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:macro_crate_test.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/macro-crate-multi-decorator.rs b/src/test/run-pass-fulldeps/macro-crate-multi-decorator.rs index 9245e85edd6dd..3eca60b1d7c34 100644 --- a/src/test/run-pass-fulldeps/macro-crate-multi-decorator.rs +++ b/src/test/run-pass-fulldeps/macro-crate-multi-decorator.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:macro_crate_test.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/macro-crate.rs b/src/test/run-pass-fulldeps/macro-crate.rs index 06f78b10e5e93..aeeb28a0506dd 100644 --- a/src/test/run-pass-fulldeps/macro-crate.rs +++ b/src/test/run-pass-fulldeps/macro-crate.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:macro_crate_test.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/macro-quote-cond.rs b/src/test/run-pass-fulldeps/macro-quote-cond.rs index 3eb7e8cc9a46d..c08e60ea73703 100644 --- a/src/test/run-pass-fulldeps/macro-quote-cond.rs +++ b/src/test/run-pass-fulldeps/macro-quote-cond.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:cond_plugin.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/macro-quote-test.rs b/src/test/run-pass-fulldeps/macro-quote-test.rs index 1005a6bfc50c7..493469d3e5999 100644 --- a/src/test/run-pass-fulldeps/macro-quote-test.rs +++ b/src/test/run-pass-fulldeps/macro-quote-test.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that a macro can emit delimiters with nothing inside - `()`, `{}` // aux-build:hello_macro.rs diff --git a/src/test/run-pass-fulldeps/mbe_matching_test_macro.rs b/src/test/run-pass-fulldeps/mbe_matching_test_macro.rs index 822b2c9b93b4a..c672081edf48c 100644 --- a/src/test/run-pass-fulldeps/mbe_matching_test_macro.rs +++ b/src/test/run-pass-fulldeps/mbe_matching_test_macro.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:procedural_mbe_matching.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/mod_dir_path_canonicalized.rs b/src/test/run-pass-fulldeps/mod_dir_path_canonicalized.rs index ee424b31636e1..22a76a3d968aa 100644 --- a/src/test/run-pass-fulldeps/mod_dir_path_canonicalized.rs +++ b/src/test/run-pass-fulldeps/mod_dir_path_canonicalized.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Testing that a libsyntax can parse modules with canonicalized base path // ignore-cross-compile diff --git a/src/test/run-pass-fulldeps/mod_dir_simple/test.rs b/src/test/run-pass-fulldeps/mod_dir_simple/test.rs index 58c1beee3be70..a5e27a3a43c37 100644 --- a/src/test/run-pass-fulldeps/mod_dir_simple/test.rs +++ b/src/test/run-pass-fulldeps/mod_dir_simple/test.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn foo() -> isize { 10 } diff --git a/src/test/run-pass-fulldeps/myriad-closures.rs b/src/test/run-pass-fulldeps/myriad-closures.rs index baf27d6f57c3c..a1ea0e685d659 100644 --- a/src/test/run-pass-fulldeps/myriad-closures.rs +++ b/src/test/run-pass-fulldeps/myriad-closures.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test case tests whether we can handle code bases that contain a high // number of closures, something that needs special handling in the MingGW // toolchain. diff --git a/src/test/run-pass-fulldeps/outlive-expansion-phase.rs b/src/test/run-pass-fulldeps/outlive-expansion-phase.rs index 6eb3e510724f3..86aed2511ceb6 100644 --- a/src/test/run-pass-fulldeps/outlive-expansion-phase.rs +++ b/src/test/run-pass-fulldeps/outlive-expansion-phase.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:outlive-expansion-phase.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/plugin-args-1.rs b/src/test/run-pass-fulldeps/plugin-args-1.rs index 4d4f9092bc825..0111af1c76804 100644 --- a/src/test/run-pass-fulldeps/plugin-args-1.rs +++ b/src/test/run-pass-fulldeps/plugin-args-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:plugin_args.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/plugin-args-2.rs b/src/test/run-pass-fulldeps/plugin-args-2.rs index 4da566aec4282..e4a3dfab5668d 100644 --- a/src/test/run-pass-fulldeps/plugin-args-2.rs +++ b/src/test/run-pass-fulldeps/plugin-args-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:plugin_args.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/plugin-args-3.rs b/src/test/run-pass-fulldeps/plugin-args-3.rs index 0a064933aec4a..4696233f2818e 100644 --- a/src/test/run-pass-fulldeps/plugin-args-3.rs +++ b/src/test/run-pass-fulldeps/plugin-args-3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:plugin_args.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/plugin-lib-ok-in-plugin.rs b/src/test/run-pass-fulldeps/plugin-lib-ok-in-plugin.rs index c612ee75651ba..e9f234f7f545e 100644 --- a/src/test/run-pass-fulldeps/plugin-lib-ok-in-plugin.rs +++ b/src/test/run-pass-fulldeps/plugin-lib-ok-in-plugin.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:macro_crate_test.rs // aux-build:plugin_with_plugin_lib.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/plugin-plus-extern-crate.rs b/src/test/run-pass-fulldeps/plugin-plus-extern-crate.rs index d1ce83f267788..e45a7f59c1bdc 100644 --- a/src/test/run-pass-fulldeps/plugin-plus-extern-crate.rs +++ b/src/test/run-pass-fulldeps/plugin-plus-extern-crate.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:macro_crate_test.rs // ignore-stage1 // ignore-cross-compile diff --git a/src/test/run-pass-fulldeps/pprust-expr-roundtrip.rs b/src/test/run-pass-fulldeps/pprust-expr-roundtrip.rs index e944ef2b620df..4307ee37886ef 100644 --- a/src/test/run-pass-fulldeps/pprust-expr-roundtrip.rs +++ b/src/test/run-pass-fulldeps/pprust-expr-roundtrip.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cross-compile diff --git a/src/test/run-pass-fulldeps/proc-macro/add-impl.rs b/src/test/run-pass-fulldeps/proc-macro/add-impl.rs index 5175fe174a9e7..48af29cc03e40 100644 --- a/src/test/run-pass-fulldeps/proc-macro/add-impl.rs +++ b/src/test/run-pass-fulldeps/proc-macro/add-impl.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:add-impl.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/proc-macro/append-impl.rs b/src/test/run-pass-fulldeps/proc-macro/append-impl.rs index 37aef7ef1318c..7c54faba86e7d 100644 --- a/src/test/run-pass-fulldeps/proc-macro/append-impl.rs +++ b/src/test/run-pass-fulldeps/proc-macro/append-impl.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:append-impl.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/proc-macro/attr-args.rs b/src/test/run-pass-fulldeps/proc-macro/attr-args.rs index effb3ad5189e1..04b3e598871a8 100644 --- a/src/test/run-pass-fulldeps/proc-macro/attr-args.rs +++ b/src/test/run-pass-fulldeps/proc-macro/attr-args.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:attr-args.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/proc-macro/attr-cfg.rs b/src/test/run-pass-fulldeps/proc-macro/attr-cfg.rs index 1a9d9b9ee621d..12d42e1286da8 100644 --- a/src/test/run-pass-fulldeps/proc-macro/attr-cfg.rs +++ b/src/test/run-pass-fulldeps/proc-macro/attr-cfg.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:attr-cfg.rs // ignore-stage1 // revisions: foo bar diff --git a/src/test/run-pass-fulldeps/proc-macro/attr-on-trait.rs b/src/test/run-pass-fulldeps/proc-macro/attr-on-trait.rs index 698a0eca1734f..f85aa6609ebfa 100644 --- a/src/test/run-pass-fulldeps/proc-macro/attr-on-trait.rs +++ b/src/test/run-pass-fulldeps/proc-macro/attr-on-trait.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:attr-on-trait.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/proc-macro/attr-stmt-expr.rs b/src/test/run-pass-fulldeps/proc-macro/attr-stmt-expr.rs index b5272e6608bbf..8719f6d328067 100644 --- a/src/test/run-pass-fulldeps/proc-macro/attr-stmt-expr.rs +++ b/src/test/run-pass-fulldeps/proc-macro/attr-stmt-expr.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:attr-stmt-expr.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/add-impl.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/add-impl.rs index 3959eccd81e35..324a8a7a81ff7 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/add-impl.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/add-impl.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/append-impl.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/append-impl.rs index fdce709e5bad6..b032b13375928 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/append-impl.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/append-impl.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host // no-prefer-dynamic diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/attr-args.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/attr-args.rs index 655bfa3ff6312..4169a323013dd 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/attr-args.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/attr-args.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/attr-cfg.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/attr-cfg.rs index f9037aa8bf94d..5ae34cd83b0a3 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/attr-cfg.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/attr-cfg.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/attr-on-trait.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/attr-on-trait.rs index 5e5c775b1ffbd..4ea814fc69ecd 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/attr-on-trait.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/attr-on-trait.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/attr-stmt-expr.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/attr-stmt-expr.rs index 4d5e22b4eb6c2..51448d559b6db 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/attr-stmt-expr.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/attr-stmt-expr.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/bang-macro.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/bang-macro.rs index 8b7c6cd10b860..14af073b7608f 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/bang-macro.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/bang-macro.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/call-site.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/call-site.rs index 65eb8f4bec2d0..bd5da63bc9557 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/call-site.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/call-site.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/count_compound_ops.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/count_compound_ops.rs index a84e029f9d87d..aab0e0613e372 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/count_compound_ops.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/count_compound_ops.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![feature(proc_macro_non_items, proc_macro_quote)] diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/custom-attr-only-one-derive.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/custom-attr-only-one-derive.rs index 4609f57bddfa4..41f8bb89d34b3 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/custom-attr-only-one-derive.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/custom-attr-only-one-derive.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-a.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-a.rs index b7374a07e427a..ceec22a5f89cf 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-a.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-a.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-atob.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-atob.rs index 67d828d92a700..13fa6fdf4f05d 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-atob.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-atob.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-attr-cfg.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-attr-cfg.rs index 2b413579a9a0f..8a2552782d413 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-attr-cfg.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-attr-cfg.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-b.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-b.rs index e1aabad4142f9..20dabbdd40664 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-b.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-b.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-ctod.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-ctod.rs index 550ffe9400db8..c2daf60dfcc7e 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-ctod.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-ctod.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-nothing.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-nothing.rs index cfe428bf5f323..f0fa45b120def 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-nothing.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-nothing.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-same-struct.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-same-struct.rs index cf96f52823f0f..f70b9d4850668 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-same-struct.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-same-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic // compile-flags:--crate-type proc-macro diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-two-attrs.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-two-attrs.rs index d02edb50fb2b5..1c4dc7d4533c8 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-two-attrs.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-two-attrs.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-union.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-union.rs index 41bb88a0a92c1..2998a6d6e2e92 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-union.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-union.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/double.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/double.rs index a6c9817f24714..fb9cd7f0eb1ca 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/double.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/double.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/empty-crate.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/empty-crate.rs index b45d4bf41d635..453596ea2d123 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/empty-crate.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/empty-crate.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/expand-with-a-macro.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/expand-with-a-macro.rs index e6831b6bfdf65..f3377c458becb 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/expand-with-a-macro.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/expand-with-a-macro.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/external-crate-var.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/external-crate-var.rs index 030c53b3e6f32..09e5aea9b8305 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/external-crate-var.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/external-crate-var.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct ExternFoo; pub trait ExternTrait { diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/gen-lifetime-token.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/gen-lifetime-token.rs index 978de27b70aad..386a5ace60237 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/gen-lifetime-token.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/gen-lifetime-token.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/hygiene_example.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/hygiene_example.rs index ca88482064bc9..f7e7e0b5751ee 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/hygiene_example.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/hygiene_example.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate hygiene_example_codegen; pub use hygiene_example_codegen::hello; diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/hygiene_example_codegen.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/hygiene_example_codegen.rs index 43c1d5fcc8d49..83aa4edcaed11 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/hygiene_example_codegen.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/hygiene_example_codegen.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![feature(proc_macro_quote, proc_macro_non_items)] diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/issue-39889.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/issue-39889.rs index 9094310fb3e76..e7af66da79758 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/issue-39889.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/issue-39889.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host // no-prefer-dynamic diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/issue-40001-plugin.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/issue-40001-plugin.rs index adcd2d605e3ce..4723a2c8d34a2 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/issue-40001-plugin.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/issue-40001-plugin.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax, plugin, plugin_registrar, rustc_private)] #![cfg_attr(stage0, feature(macro_vis_matcher))] #![feature(macro_at_most_once_rep)] diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/issue-42708.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/issue-42708.rs index 906caceb8696b..7fefbf9680a2f 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/issue-42708.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/issue-42708.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/issue-50061.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/issue-50061.rs index 6de17522fc9a7..66be92958eb17 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/issue-50061.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/issue-50061.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/lifetimes.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/lifetimes.rs index 0ee26b6a1b9ee..7e5c2b5d5df64 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/lifetimes.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/lifetimes.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/modify-ast.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/modify-ast.rs index 498c6811d9c20..9bb9c1d35110e 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/modify-ast.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/modify-ast.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/negative-token.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/negative-token.rs index fd639696991f6..c242d36762cb0 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/negative-token.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/negative-token.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/not-joint.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/not-joint.rs index e00a4d89e8d62..ca2b80848fd46 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/not-joint.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/not-joint.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/span-api-tests.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/span-api-tests.rs index 8e2c5c0a088d2..cb71291f9090d 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/span-api-tests.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/span-api-tests.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host // no-prefer-dynamic diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/span-test-macros.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/span-test-macros.rs index b4666e2cb61bd..9a78f0a895526 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/span-test-macros.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/span-test-macros.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_export] macro_rules! reemit_legacy { ($($tok:tt)*) => ($($tok)*) diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/test-macros.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/test-macros.rs index 581c7cb15a59c..978eabc3784b2 100644 --- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/test-macros.rs +++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/test-macros.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/run-pass-fulldeps/proc-macro/bang-macro.rs b/src/test/run-pass-fulldeps/proc-macro/bang-macro.rs index 955b6ab986d07..7cb2884d4e875 100644 --- a/src/test/run-pass-fulldeps/proc-macro/bang-macro.rs +++ b/src/test/run-pass-fulldeps/proc-macro/bang-macro.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:bang-macro.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/proc-macro/call-site.rs b/src/test/run-pass-fulldeps/proc-macro/call-site.rs index dfe97eb587cfb..d78483cc64d2f 100644 --- a/src/test/run-pass-fulldeps/proc-macro/call-site.rs +++ b/src/test/run-pass-fulldeps/proc-macro/call-site.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:call-site.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/proc-macro/count_compound_ops.rs b/src/test/run-pass-fulldeps/proc-macro/count_compound_ops.rs index 6601d66e586a3..57a19f760ea38 100644 --- a/src/test/run-pass-fulldeps/proc-macro/count_compound_ops.rs +++ b/src/test/run-pass-fulldeps/proc-macro/count_compound_ops.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:count_compound_ops.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/proc-macro/crate-var.rs b/src/test/run-pass-fulldeps/proc-macro/crate-var.rs index 41c15195bc840..3548addd22837 100644 --- a/src/test/run-pass-fulldeps/proc-macro/crate-var.rs +++ b/src/test/run-pass-fulldeps/proc-macro/crate-var.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:double.rs // aux-build:external-crate-var.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/proc-macro/custom-attr-only-one-derive.rs b/src/test/run-pass-fulldeps/proc-macro/custom-attr-only-one-derive.rs index 3b2833a4bcf75..993d3315596ea 100644 --- a/src/test/run-pass-fulldeps/proc-macro/custom-attr-only-one-derive.rs +++ b/src/test/run-pass-fulldeps/proc-macro/custom-attr-only-one-derive.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:custom-attr-only-one-derive.rs #![feature(rust_2018_preview)] diff --git a/src/test/run-pass-fulldeps/proc-macro/derive-attr-cfg.rs b/src/test/run-pass-fulldeps/proc-macro/derive-attr-cfg.rs index 93023f8f8edfc..7fd423b88a009 100644 --- a/src/test/run-pass-fulldeps/proc-macro/derive-attr-cfg.rs +++ b/src/test/run-pass-fulldeps/proc-macro/derive-attr-cfg.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:derive-attr-cfg.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/proc-macro/derive-b.rs b/src/test/run-pass-fulldeps/proc-macro/derive-b.rs index ac9eca3822669..ce4a5c4ca1184 100644 --- a/src/test/run-pass-fulldeps/proc-macro/derive-b.rs +++ b/src/test/run-pass-fulldeps/proc-macro/derive-b.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:derive-b.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/proc-macro/derive-same-struct.rs b/src/test/run-pass-fulldeps/proc-macro/derive-same-struct.rs index ba5a639a759cb..eaf925336f0a4 100644 --- a/src/test/run-pass-fulldeps/proc-macro/derive-same-struct.rs +++ b/src/test/run-pass-fulldeps/proc-macro/derive-same-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:derive-same-struct.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/proc-macro/derive-test.rs b/src/test/run-pass-fulldeps/proc-macro/derive-test.rs index 5a53a4e8db34f..edb0201ba7797 100644 --- a/src/test/run-pass-fulldeps/proc-macro/derive-test.rs +++ b/src/test/run-pass-fulldeps/proc-macro/derive-test.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic // compile-flags: --test diff --git a/src/test/run-pass-fulldeps/proc-macro/derive-two-attrs.rs b/src/test/run-pass-fulldeps/proc-macro/derive-two-attrs.rs index 0df0288216eff..a876a5c79ac40 100644 --- a/src/test/run-pass-fulldeps/proc-macro/derive-two-attrs.rs +++ b/src/test/run-pass-fulldeps/proc-macro/derive-two-attrs.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:derive-two-attrs.rs extern crate derive_two_attrs as foo; diff --git a/src/test/run-pass-fulldeps/proc-macro/derive-union.rs b/src/test/run-pass-fulldeps/proc-macro/derive-union.rs index 71807e21d962e..c1f15235aa1e8 100644 --- a/src/test/run-pass-fulldeps/proc-macro/derive-union.rs +++ b/src/test/run-pass-fulldeps/proc-macro/derive-union.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:derive-union.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/proc-macro/empty-crate.rs b/src/test/run-pass-fulldeps/proc-macro/empty-crate.rs index 38a2716aee77b..cac9ba461477d 100644 --- a/src/test/run-pass-fulldeps/proc-macro/empty-crate.rs +++ b/src/test/run-pass-fulldeps/proc-macro/empty-crate.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:empty-crate.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/proc-macro/expand-with-a-macro.rs b/src/test/run-pass-fulldeps/proc-macro/expand-with-a-macro.rs index 4ccd4615fb609..65c92ea3353d4 100644 --- a/src/test/run-pass-fulldeps/proc-macro/expand-with-a-macro.rs +++ b/src/test/run-pass-fulldeps/proc-macro/expand-with-a-macro.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:expand-with-a-macro.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/proc-macro/gen-lifetime-token.rs b/src/test/run-pass-fulldeps/proc-macro/gen-lifetime-token.rs index ce2fed86e46ae..1659b87440b97 100644 --- a/src/test/run-pass-fulldeps/proc-macro/gen-lifetime-token.rs +++ b/src/test/run-pass-fulldeps/proc-macro/gen-lifetime-token.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:gen-lifetime-token.rs extern crate gen_lifetime_token as bar; diff --git a/src/test/run-pass-fulldeps/proc-macro/hygiene_example.rs b/src/test/run-pass-fulldeps/proc-macro/hygiene_example.rs index 579e8c337733a..47fe76cfbd636 100644 --- a/src/test/run-pass-fulldeps/proc-macro/hygiene_example.rs +++ b/src/test/run-pass-fulldeps/proc-macro/hygiene_example.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:hygiene_example_codegen.rs // aux-build:hygiene_example.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/proc-macro/issue-39889.rs b/src/test/run-pass-fulldeps/proc-macro/issue-39889.rs index 3fc7446815eb4..bd85b8778dd62 100644 --- a/src/test/run-pass-fulldeps/proc-macro/issue-39889.rs +++ b/src/test/run-pass-fulldeps/proc-macro/issue-39889.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-39889.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/proc-macro/issue-40001.rs b/src/test/run-pass-fulldeps/proc-macro/issue-40001.rs index b828199883fa0..1e546e14423f1 100644 --- a/src/test/run-pass-fulldeps/proc-macro/issue-40001.rs +++ b/src/test/run-pass-fulldeps/proc-macro/issue-40001.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-40001-plugin.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/proc-macro/issue-42708.rs b/src/test/run-pass-fulldeps/proc-macro/issue-42708.rs index 7bbdbc6505db5..2f6b8f2108082 100644 --- a/src/test/run-pass-fulldeps/proc-macro/issue-42708.rs +++ b/src/test/run-pass-fulldeps/proc-macro/issue-42708.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-42708.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/proc-macro/issue-50061.rs b/src/test/run-pass-fulldeps/proc-macro/issue-50061.rs index 410faaeb3eeac..6be9f778a95aa 100644 --- a/src/test/run-pass-fulldeps/proc-macro/issue-50061.rs +++ b/src/test/run-pass-fulldeps/proc-macro/issue-50061.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-50061.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/proc-macro/lifetimes.rs b/src/test/run-pass-fulldeps/proc-macro/lifetimes.rs index c73441e30e6d5..f80173a196c9b 100644 --- a/src/test/run-pass-fulldeps/proc-macro/lifetimes.rs +++ b/src/test/run-pass-fulldeps/proc-macro/lifetimes.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:lifetimes.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/proc-macro/load-two.rs b/src/test/run-pass-fulldeps/proc-macro/load-two.rs index 67c1237781470..820c645f4f8df 100644 --- a/src/test/run-pass-fulldeps/proc-macro/load-two.rs +++ b/src/test/run-pass-fulldeps/proc-macro/load-two.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:derive-atob.rs // aux-build:derive-ctod.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/proc-macro/macros-in-extern.rs b/src/test/run-pass-fulldeps/proc-macro/macros-in-extern.rs index bd76cc380544f..e843cf9c02b82 100644 --- a/src/test/run-pass-fulldeps/proc-macro/macros-in-extern.rs +++ b/src/test/run-pass-fulldeps/proc-macro/macros-in-extern.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:test-macros.rs // ignore-stage1 // ignore-wasm32 diff --git a/src/test/run-pass-fulldeps/proc-macro/modify-ast.rs b/src/test/run-pass-fulldeps/proc-macro/modify-ast.rs index d6f7cc4699adb..a96c61f1cb889 100644 --- a/src/test/run-pass-fulldeps/proc-macro/modify-ast.rs +++ b/src/test/run-pass-fulldeps/proc-macro/modify-ast.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:modify-ast.rs extern crate modify_ast; diff --git a/src/test/run-pass-fulldeps/proc-macro/negative-token.rs b/src/test/run-pass-fulldeps/proc-macro/negative-token.rs index a793d069d1448..77c0f321ac48e 100644 --- a/src/test/run-pass-fulldeps/proc-macro/negative-token.rs +++ b/src/test/run-pass-fulldeps/proc-macro/negative-token.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:negative-token.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/proc-macro/not-joint.rs b/src/test/run-pass-fulldeps/proc-macro/not-joint.rs index 7a53348f96396..b360e4e1bb274 100644 --- a/src/test/run-pass-fulldeps/proc-macro/not-joint.rs +++ b/src/test/run-pass-fulldeps/proc-macro/not-joint.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:not-joint.rs extern crate not_joint as bar; diff --git a/src/test/run-pass-fulldeps/proc-macro/smoke.rs b/src/test/run-pass-fulldeps/proc-macro/smoke.rs index 54d651df1f9af..f626cfabe6c6a 100644 --- a/src/test/run-pass-fulldeps/proc-macro/smoke.rs +++ b/src/test/run-pass-fulldeps/proc-macro/smoke.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:derive-a.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/proc-macro/span-api-tests.rs b/src/test/run-pass-fulldeps/proc-macro/span-api-tests.rs index 415cada265ec7..0076c08621f7a 100644 --- a/src/test/run-pass-fulldeps/proc-macro/span-api-tests.rs +++ b/src/test/run-pass-fulldeps/proc-macro/span-api-tests.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:span-api-tests.rs // aux-build:span-test-macros.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/struct-field-macro.rs b/src/test/run-pass-fulldeps/proc-macro/struct-field-macro.rs index c9056e08d4426..e4a5bcbcac420 100644 --- a/src/test/run-pass-fulldeps/proc-macro/struct-field-macro.rs +++ b/src/test/run-pass-fulldeps/proc-macro/struct-field-macro.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:derive-nothing.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/proc_macro.rs b/src/test/run-pass-fulldeps/proc_macro.rs index c9d7b0423ec59..3bb9c659cd8f4 100644 --- a/src/test/run-pass-fulldeps/proc_macro.rs +++ b/src/test/run-pass-fulldeps/proc_macro.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:proc_macro_def.rs // ignore-stage1 // ignore-cross-compile diff --git a/src/test/run-pass-fulldeps/qquote.rs b/src/test/run-pass-fulldeps/qquote.rs index 55fed8693a065..fd3cd5dc4528d 100644 --- a/src/test/run-pass-fulldeps/qquote.rs +++ b/src/test/run-pass-fulldeps/qquote.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cross-compile #![feature(quote, rustc_private)] diff --git a/src/test/run-pass-fulldeps/quote-tokens.rs b/src/test/run-pass-fulldeps/quote-tokens.rs index 8e6a69cb58479..8f57a286e22f9 100644 --- a/src/test/run-pass-fulldeps/quote-tokens.rs +++ b/src/test/run-pass-fulldeps/quote-tokens.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cross-compile #![feature(quote, rustc_private)] diff --git a/src/test/run-pass-fulldeps/quote-unused-sp-no-warning.rs b/src/test/run-pass-fulldeps/quote-unused-sp-no-warning.rs index d3be1ddcb8c32..76a74f0833f89 100644 --- a/src/test/run-pass-fulldeps/quote-unused-sp-no-warning.rs +++ b/src/test/run-pass-fulldeps/quote-unused-sp-no-warning.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cross-compile #![feature(quote, rustc_private)] #![deny(unused_variables)] diff --git a/src/test/run-pass-fulldeps/regions-mock-tcx.rs b/src/test/run-pass-fulldeps/regions-mock-tcx.rs index 670f5380d81fa..e1d0051fb54ad 100644 --- a/src/test/run-pass-fulldeps/regions-mock-tcx.rs +++ b/src/test/run-pass-fulldeps/regions-mock-tcx.rs @@ -1,14 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // Test a sample usage pattern for regions. Makes use of the // following features: // diff --git a/src/test/run-pass-fulldeps/rename-directory.rs b/src/test/run-pass-fulldeps/rename-directory.rs index 417707e89322c..4bd3a8dabcf64 100644 --- a/src/test/run-pass-fulldeps/rename-directory.rs +++ b/src/test/run-pass-fulldeps/rename-directory.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test can't be a unit test in std, // because it needs TempDir, which is in extra diff --git a/src/test/run-pass-fulldeps/roman-numerals-macro.rs b/src/test/run-pass-fulldeps/roman-numerals-macro.rs index 81f5c649626c3..59a2d132cdc26 100644 --- a/src/test/run-pass-fulldeps/roman-numerals-macro.rs +++ b/src/test/run-pass-fulldeps/roman-numerals-macro.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:roman_numerals.rs // ignore-stage1 diff --git a/src/test/run-pass-fulldeps/rustc_encodable_hygiene.rs b/src/test/run-pass-fulldeps/rustc_encodable_hygiene.rs index 655b08225ab39..ae232c602cb7d 100644 --- a/src/test/run-pass-fulldeps/rustc_encodable_hygiene.rs +++ b/src/test/run-pass-fulldeps/rustc_encodable_hygiene.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_private)] #[allow(dead_code)] diff --git a/src/test/run-pass-fulldeps/stdio-from.rs b/src/test/run-pass-fulldeps/stdio-from.rs index 5b28ce0f0c68d..70e53936b70dd 100644 --- a/src/test/run-pass-fulldeps/stdio-from.rs +++ b/src/test/run-pass-fulldeps/stdio-from.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cross-compile use std::env; diff --git a/src/test/run-pass-fulldeps/switch-stdout.rs b/src/test/run-pass-fulldeps/switch-stdout.rs index 316b97f17ef94..6b16f955902e2 100644 --- a/src/test/run-pass-fulldeps/switch-stdout.rs +++ b/src/test/run-pass-fulldeps/switch-stdout.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::env; use std::fs::File; use std::io::{Read, Write}; diff --git a/src/test/run-pass-fulldeps/syntax-extension-with-dll-deps.rs b/src/test/run-pass-fulldeps/syntax-extension-with-dll-deps.rs index 23096828c4b95..7c236fd69eae6 100644 --- a/src/test/run-pass-fulldeps/syntax-extension-with-dll-deps.rs +++ b/src/test/run-pass-fulldeps/syntax-extension-with-dll-deps.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:syntax_extension_with_dll_deps_1.rs // aux-build:syntax_extension_with_dll_deps_2.rs // ignore-stage1 diff --git a/src/test/run-pass-valgrind/cast-enum-with-dtor.rs b/src/test/run-pass-valgrind/cast-enum-with-dtor.rs index 4466a95cb39b9..42445b9056f9d 100644 --- a/src/test/run-pass-valgrind/cast-enum-with-dtor.rs +++ b/src/test/run-pass-valgrind/cast-enum-with-dtor.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![allow(dead_code)] diff --git a/src/test/run-pass-valgrind/cleanup-auto-borrow-obj.rs b/src/test/run-pass-valgrind/cleanup-auto-borrow-obj.rs index 220968529de20..925ffe75fe785 100644 --- a/src/test/run-pass-valgrind/cleanup-auto-borrow-obj.rs +++ b/src/test/run-pass-valgrind/cleanup-auto-borrow-obj.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic // This would previously leak the Box because we wouldn't diff --git a/src/test/run-pass-valgrind/cleanup-stdin.rs b/src/test/run-pass-valgrind/cleanup-stdin.rs index b7c94ed6944f6..3505074293264 100644 --- a/src/test/run-pass-valgrind/cleanup-stdin.rs +++ b/src/test/run-pass-valgrind/cleanup-stdin.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic fn main() { diff --git a/src/test/run-pass-valgrind/coerce-match-calls.rs b/src/test/run-pass-valgrind/coerce-match-calls.rs index c2f6b4c4ac446..60943aad80dc2 100644 --- a/src/test/run-pass-valgrind/coerce-match-calls.rs +++ b/src/test/run-pass-valgrind/coerce-match-calls.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that coercions are propagated through match and if expressions. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass-valgrind/coerce-match.rs b/src/test/run-pass-valgrind/coerce-match.rs index 360e8c9cc4f4f..a4ba5427d4b04 100644 --- a/src/test/run-pass-valgrind/coerce-match.rs +++ b/src/test/run-pass-valgrind/coerce-match.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that coercions are propagated through match and if expressions. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass-valgrind/down-with-thread-dtors.rs b/src/test/run-pass-valgrind/down-with-thread-dtors.rs index 90c20444842f4..c3567a9b20097 100644 --- a/src/test/run-pass-valgrind/down-with-thread-dtors.rs +++ b/src/test/run-pass-valgrind/down-with-thread-dtors.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic // ignore-emscripten diff --git a/src/test/run-pass-valgrind/dst-dtor-1.rs b/src/test/run-pass-valgrind/dst-dtor-1.rs index 4af642a106c15..7533a7bd2353b 100644 --- a/src/test/run-pass-valgrind/dst-dtor-1.rs +++ b/src/test/run-pass-valgrind/dst-dtor-1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic static mut DROP_RAN: bool = false; diff --git a/src/test/run-pass-valgrind/dst-dtor-2.rs b/src/test/run-pass-valgrind/dst-dtor-2.rs index 283b8202b35d0..ebf0c17fecb56 100644 --- a/src/test/run-pass-valgrind/dst-dtor-2.rs +++ b/src/test/run-pass-valgrind/dst-dtor-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic static mut DROP_RAN: isize = 0; diff --git a/src/test/run-pass-valgrind/dst-dtor-3.rs b/src/test/run-pass-valgrind/dst-dtor-3.rs index 1ae66a28a849e..e15908dfcc31f 100644 --- a/src/test/run-pass-valgrind/dst-dtor-3.rs +++ b/src/test/run-pass-valgrind/dst-dtor-3.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![feature(unsized_tuple_coercion)] diff --git a/src/test/run-pass-valgrind/dst-dtor-4.rs b/src/test/run-pass-valgrind/dst-dtor-4.rs index e416f25bc03a0..52bf0c364b24d 100644 --- a/src/test/run-pass-valgrind/dst-dtor-4.rs +++ b/src/test/run-pass-valgrind/dst-dtor-4.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![feature(unsized_tuple_coercion)] diff --git a/src/test/run-pass-valgrind/exit-flushes.rs b/src/test/run-pass-valgrind/exit-flushes.rs index bb0d5644d389f..c4d23c2938d63 100644 --- a/src/test/run-pass-valgrind/exit-flushes.rs +++ b/src/test/run-pass-valgrind/exit-flushes.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic // ignore-cloudabi // ignore-emscripten diff --git a/src/test/run-pass-valgrind/issue-44800.rs b/src/test/run-pass-valgrind/issue-44800.rs index 29cfae1692924..f76657ca75207 100644 --- a/src/test/run-pass-valgrind/issue-44800.rs +++ b/src/test/run-pass-valgrind/issue-44800.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::alloc::System; use std::collections::VecDeque; diff --git a/src/test/run-pass-valgrind/osx-frameworks.rs b/src/test/run-pass-valgrind/osx-frameworks.rs index 468a20db6f74d..3acb1e9962039 100644 --- a/src/test/run-pass-valgrind/osx-frameworks.rs +++ b/src/test/run-pass-valgrind/osx-frameworks.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass-valgrind/unsized-locals/long-live-the-unsized-temporary.rs b/src/test/run-pass-valgrind/unsized-locals/long-live-the-unsized-temporary.rs index e1fda427b4e73..2f275f88d963e 100644 --- a/src/test/run-pass-valgrind/unsized-locals/long-live-the-unsized-temporary.rs +++ b/src/test/run-pass-valgrind/unsized-locals/long-live-the-unsized-temporary.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unsized_locals)] use std::fmt; diff --git a/src/test/run-pass/abi-sysv64-arg-passing.rs b/src/test/run-pass/abi-sysv64-arg-passing.rs index 4ec3f16f7af6d..0b9f9934fa9c8 100644 --- a/src/test/run-pass/abi-sysv64-arg-passing.rs +++ b/src/test/run-pass/abi-sysv64-arg-passing.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Checks if the "sysv64" calling convention behaves the same as the // "C" calling convention on platforms where both should be the same diff --git a/src/test/run-pass/abi-sysv64-register-usage.rs b/src/test/run-pass/abi-sysv64-register-usage.rs index e701329127502..a0d6e968252a2 100644 --- a/src/test/run-pass/abi-sysv64-register-usage.rs +++ b/src/test/run-pass/abi-sysv64-register-usage.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Checks if the correct registers are being used to pass arguments // when the sysv64 ABI is specified. diff --git a/src/test/run-pass/abort-on-c-abi.rs b/src/test/run-pass/abort-on-c-abi.rs index ef368ed604bea..8b8f7998e1cec 100644 --- a/src/test/run-pass/abort-on-c-abi.rs +++ b/src/test/run-pass/abort-on-c-abi.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Since we mark some ABIs as "nounwind" to LLVM, we must make sure that // we never unwind through them. diff --git a/src/test/run-pass/alias-uninit-value.rs b/src/test/run-pass/alias-uninit-value.rs index 77b9efb0012f0..1dd301c43e393 100644 --- a/src/test/run-pass/alias-uninit-value.rs +++ b/src/test/run-pass/alias-uninit-value.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - // Regression test for issue #374 // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/align-struct.rs b/src/test/run-pass/align-struct.rs index 2b6a151574ad9..caabe93348f83 100644 --- a/src/test/run-pass/align-struct.rs +++ b/src/test/run-pass/align-struct.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![feature(box_syntax)] #![feature(repr_packed)] diff --git a/src/test/run-pass/align-with-extern-c-fn.rs b/src/test/run-pass/align-with-extern-c-fn.rs index 6f89c5d377f54..4cc606c064864 100644 --- a/src/test/run-pass/align-with-extern-c-fn.rs +++ b/src/test/run-pass/align-with-extern-c-fn.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // #45662 #![feature(repr_align)] diff --git a/src/test/run-pass/alignment-gep-tup-like-1.rs b/src/test/run-pass/alignment-gep-tup-like-1.rs index c1f75d5ee74ea..fbd402737ad15 100644 --- a/src/test/run-pass/alignment-gep-tup-like-1.rs +++ b/src/test/run-pass/alignment-gep-tup-like-1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] struct pair { diff --git a/src/test/run-pass/alloca-from-derived-tydesc.rs b/src/test/run-pass/alloca-from-derived-tydesc.rs index 23a1e7998012c..223ca01546f72 100644 --- a/src/test/run-pass/alloca-from-derived-tydesc.rs +++ b/src/test/run-pass/alloca-from-derived-tydesc.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // pretty-expanded FIXME #23616 enum option { some(T), none, } diff --git a/src/test/run-pass/allocator-alloc-one.rs b/src/test/run-pass/allocator-alloc-one.rs index f15b013c07ba4..8188613970b00 100644 --- a/src/test/run-pass/allocator-alloc-one.rs +++ b/src/test/run-pass/allocator-alloc-one.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(allocator_api, nonnull)] use std::alloc::{Alloc, Global, Layout, handle_alloc_error}; diff --git a/src/test/run-pass/allocator/auxiliary/custom-as-global.rs b/src/test/run-pass/allocator/auxiliary/custom-as-global.rs index a3f05a01c5ad0..6842e2c33b217 100644 --- a/src/test/run-pass/allocator/auxiliary/custom-as-global.rs +++ b/src/test/run-pass/allocator/auxiliary/custom-as-global.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "rlib"] diff --git a/src/test/run-pass/allocator/auxiliary/custom.rs b/src/test/run-pass/allocator/auxiliary/custom.rs index b17464e04190f..b0ec9ab09299f 100644 --- a/src/test/run-pass/allocator/auxiliary/custom.rs +++ b/src/test/run-pass/allocator/auxiliary/custom.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![feature(allocator_api)] diff --git a/src/test/run-pass/allocator/auxiliary/helper.rs b/src/test/run-pass/allocator/auxiliary/helper.rs index e75a432710df2..7f6770c226a0c 100644 --- a/src/test/run-pass/allocator/auxiliary/helper.rs +++ b/src/test/run-pass/allocator/auxiliary/helper.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "rlib"] diff --git a/src/test/run-pass/allocator/custom.rs b/src/test/run-pass/allocator/custom.rs index 3a7f8fa862094..7429175a31b54 100644 --- a/src/test/run-pass/allocator/custom.rs +++ b/src/test/run-pass/allocator/custom.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:helper.rs // no-prefer-dynamic diff --git a/src/test/run-pass/allocator/xcrate-use.rs b/src/test/run-pass/allocator/xcrate-use.rs index 482e3b04aae2d..5adbe626938db 100644 --- a/src/test/run-pass/allocator/xcrate-use.rs +++ b/src/test/run-pass/allocator/xcrate-use.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:custom.rs // aux-build:helper.rs // no-prefer-dynamic diff --git a/src/test/run-pass/allocator/xcrate-use2.rs b/src/test/run-pass/allocator/xcrate-use2.rs index 7a45fd28bdbc5..6154b33c25c8d 100644 --- a/src/test/run-pass/allocator/xcrate-use2.rs +++ b/src/test/run-pass/allocator/xcrate-use2.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:custom.rs // aux-build:custom-as-global.rs // aux-build:helper.rs diff --git a/src/test/run-pass/allow_irrefutable_let_patterns.rs b/src/test/run-pass/allow_irrefutable_let_patterns.rs index ea114b63be73a..599eb00d1d937 100644 --- a/src/test/run-pass/allow_irrefutable_let_patterns.rs +++ b/src/test/run-pass/allow_irrefutable_let_patterns.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(irrefutable_let_patterns)] // must-compile-successfully-irrefutable_let_patterns_with_gate diff --git a/src/test/run-pass/anon-extern-mod-cross-crate-2.rs b/src/test/run-pass/anon-extern-mod-cross-crate-2.rs index 8c480d7deebd9..37f98c6342103 100644 --- a/src/test/run-pass/anon-extern-mod-cross-crate-2.rs +++ b/src/test/run-pass/anon-extern-mod-cross-crate-2.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:anon-extern-mod-cross-crate-1.rs // pretty-expanded FIXME #23616 // ignore-wasm32-bare no libc to test ffi with diff --git a/src/test/run-pass/anon-extern-mod.rs b/src/test/run-pass/anon-extern-mod.rs index 16ca7bce95b59..6f03a16b0a508 100644 --- a/src/test/run-pass/anon-extern-mod.rs +++ b/src/test/run-pass/anon-extern-mod.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 // ignore-wasm32-bare no libc to test ffi with diff --git a/src/test/run-pass/anon-trait-static-method.rs b/src/test/run-pass/anon-trait-static-method.rs index 5889bfce3c478..604e99dcb55d1 100644 --- a/src/test/run-pass/anon-trait-static-method.rs +++ b/src/test/run-pass/anon-trait-static-method.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { x: isize } diff --git a/src/test/run-pass/anon_trait_static_method_exe.rs b/src/test/run-pass/anon_trait_static_method_exe.rs index f420460a41247..5624d38f054fa 100644 --- a/src/test/run-pass/anon_trait_static_method_exe.rs +++ b/src/test/run-pass/anon_trait_static_method_exe.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:anon_trait_static_method_lib.rs extern crate anon_trait_static_method_lib; diff --git a/src/test/run-pass/arbitrary_self_types_raw_pointer_struct.rs b/src/test/run-pass/arbitrary_self_types_raw_pointer_struct.rs index 8b6941e1c635c..2ea1c9ac6e6c5 100644 --- a/src/test/run-pass/arbitrary_self_types_raw_pointer_struct.rs +++ b/src/test/run-pass/arbitrary_self_types_raw_pointer_struct.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(arbitrary_self_types)] use std::rc::Rc; diff --git a/src/test/run-pass/arbitrary_self_types_raw_pointer_trait.rs b/src/test/run-pass/arbitrary_self_types_raw_pointer_trait.rs index f70e38a14e416..2aa2be5f78877 100644 --- a/src/test/run-pass/arbitrary_self_types_raw_pointer_trait.rs +++ b/src/test/run-pass/arbitrary_self_types_raw_pointer_trait.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(arbitrary_self_types)] use std::ptr; diff --git a/src/test/run-pass/arbitrary_self_types_silly.rs b/src/test/run-pass/arbitrary_self_types_silly.rs index 755a8d7ea294f..6178563beb248 100644 --- a/src/test/run-pass/arbitrary_self_types_silly.rs +++ b/src/test/run-pass/arbitrary_self_types_silly.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![feature(arbitrary_self_types)] struct Foo; diff --git a/src/test/run-pass/arbitrary_self_types_struct.rs b/src/test/run-pass/arbitrary_self_types_struct.rs index 961717de0463e..c3951fcf16ea7 100644 --- a/src/test/run-pass/arbitrary_self_types_struct.rs +++ b/src/test/run-pass/arbitrary_self_types_struct.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![feature(arbitrary_self_types)] use std::rc::Rc; diff --git a/src/test/run-pass/arbitrary_self_types_trait.rs b/src/test/run-pass/arbitrary_self_types_trait.rs index e74d614dd6bd9..8d3a23114cd98 100644 --- a/src/test/run-pass/arbitrary_self_types_trait.rs +++ b/src/test/run-pass/arbitrary_self_types_trait.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![feature(arbitrary_self_types)] use std::rc::Rc; diff --git a/src/test/run-pass/arbitrary_self_types_unsized_struct.rs b/src/test/run-pass/arbitrary_self_types_unsized_struct.rs index 8dc40e7aab111..fafb27b9e61aa 100644 --- a/src/test/run-pass/arbitrary_self_types_unsized_struct.rs +++ b/src/test/run-pass/arbitrary_self_types_unsized_struct.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![feature(arbitrary_self_types)] use std::rc::Rc; diff --git a/src/test/run-pass/argument-passing.rs b/src/test/run-pass/argument-passing.rs index d2a595804a4b2..ea18ffe015566 100644 --- a/src/test/run-pass/argument-passing.rs +++ b/src/test/run-pass/argument-passing.rs @@ -1,15 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - struct X { x: isize } diff --git a/src/test/run-pass/arith-0.rs b/src/test/run-pass/arith-0.rs index a4365efbbbd0e..e818dad4ba889 100644 --- a/src/test/run-pass/arith-0.rs +++ b/src/test/run-pass/arith-0.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - pub fn main() { let a: isize = 10; println!("{}", a); diff --git a/src/test/run-pass/arith-1.rs b/src/test/run-pass/arith-1.rs index fd281ea1173cf..640f809a22fe4 100644 --- a/src/test/run-pass/arith-1.rs +++ b/src/test/run-pass/arith-1.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - pub fn main() { let i32_a: isize = 10; assert_eq!(i32_a, 10); diff --git a/src/test/run-pass/arith-2.rs b/src/test/run-pass/arith-2.rs index 48e834cf54dd1..5bf96b5e362bf 100644 --- a/src/test/run-pass/arith-2.rs +++ b/src/test/run-pass/arith-2.rs @@ -1,16 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - pub fn main() { let i32_c: isize = 0x10101010; assert_eq!(i32_c + i32_c * 2 / 3 * 2 + (i32_c - 7 % 3), diff --git a/src/test/run-pass/arith-unsigned.rs b/src/test/run-pass/arith-unsigned.rs index e5ff97e3cdbd2..26e87bfa4174b 100644 --- a/src/test/run-pass/arith-unsigned.rs +++ b/src/test/run-pass/arith-unsigned.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![allow(type_limits)] // Unsigned integer operations diff --git a/src/test/run-pass/arr_cycle.rs b/src/test/run-pass/arr_cycle.rs index 400458b614b39..d88020648c1dc 100644 --- a/src/test/run-pass/arr_cycle.rs +++ b/src/test/run-pass/arr_cycle.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cell::Cell; #[derive(Debug)] diff --git a/src/test/run-pass/array_const_index-1.rs b/src/test/run-pass/array_const_index-1.rs index 3e4504eb19575..bd98b058d7f91 100644 --- a/src/test/run-pass/array_const_index-1.rs +++ b/src/test/run-pass/array_const_index-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_indexing)] fn main() { diff --git a/src/test/run-pass/artificial-block.rs b/src/test/run-pass/artificial-block.rs index de946d94d07b9..dd4d3e575362a 100644 --- a/src/test/run-pass/artificial-block.rs +++ b/src/test/run-pass/artificial-block.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn f() -> isize { { return 3; } } pub fn main() { assert_eq!(f(), 3); } diff --git a/src/test/run-pass/as-precedence.rs b/src/test/run-pass/as-precedence.rs index d89607077dcbe..34ff96ea6daf7 100644 --- a/src/test/run-pass/as-precedence.rs +++ b/src/test/run-pass/as-precedence.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn main() { assert_eq!(3 as usize * 3, 9); assert_eq!(3 as (usize) * 3, 9); diff --git a/src/test/run-pass/asm-concat-src.rs b/src/test/run-pass/asm-concat-src.rs index 0380ccbdea47b..b24586464d673 100644 --- a/src/test/run-pass/asm-concat-src.rs +++ b/src/test/run-pass/asm-concat-src.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 // ignore-emscripten no asm diff --git a/src/test/run-pass/asm-in-moved.rs b/src/test/run-pass/asm-in-moved.rs index 246dd83fbef29..22bd6b8aeee49 100644 --- a/src/test/run-pass/asm-in-moved.rs +++ b/src/test/run-pass/asm-in-moved.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/run-pass/asm-in-out-operand.rs b/src/test/run-pass/asm-in-out-operand.rs index 243ecf86e9c46..148c5b34855b3 100644 --- a/src/test/run-pass/asm-in-out-operand.rs +++ b/src/test/run-pass/asm-in-out-operand.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(asm)] #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] diff --git a/src/test/run-pass/asm-indirect-memory.rs b/src/test/run-pass/asm-indirect-memory.rs index d1873afb3a9b7..83b773d86042b 100644 --- a/src/test/run-pass/asm-indirect-memory.rs +++ b/src/test/run-pass/asm-indirect-memory.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(asm)] #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] diff --git a/src/test/run-pass/asm-out-assign.rs b/src/test/run-pass/asm-out-assign.rs index 6acb9054af5cc..d0978cc834297 100644 --- a/src/test/run-pass/asm-out-assign.rs +++ b/src/test/run-pass/asm-out-assign.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/run-pass/assert-eq-macro-success.rs b/src/test/run-pass/assert-eq-macro-success.rs index 3110e22d5da13..3d38d095ba77e 100644 --- a/src/test/run-pass/assert-eq-macro-success.rs +++ b/src/test/run-pass/assert-eq-macro-success.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(PartialEq, Debug)] struct Point { x : isize } diff --git a/src/test/run-pass/assert-eq-macro-unsized.rs b/src/test/run-pass/assert-eq-macro-unsized.rs index e21d3ef0ed068..0a18c1f1b1dca 100644 --- a/src/test/run-pass/assert-eq-macro-unsized.rs +++ b/src/test/run-pass/assert-eq-macro-unsized.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { assert_eq!([1, 2, 3][..], vec![1, 2, 3][..]); } diff --git a/src/test/run-pass/assert-eq-trailing-comma.rs b/src/test/run-pass/assert-eq-trailing-comma.rs index d98baf640a8c9..77f3ec90da42a 100644 --- a/src/test/run-pass/assert-eq-trailing-comma.rs +++ b/src/test/run-pass/assert-eq-trailing-comma.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { assert_eq!(1, 1,); } diff --git a/src/test/run-pass/assert-escape.rs b/src/test/run-pass/assert-escape.rs index d340806c3577d..01342113bde75 100644 --- a/src/test/run-pass/assert-escape.rs +++ b/src/test/run-pass/assert-escape.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { assert!(r#"☃\backslash"#.contains("\\")); } diff --git a/src/test/run-pass/assert-ne-macro-success.rs b/src/test/run-pass/assert-ne-macro-success.rs index ce671d2f1b5a2..8d432ac07347f 100644 --- a/src/test/run-pass/assert-ne-macro-success.rs +++ b/src/test/run-pass/assert-ne-macro-success.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(PartialEq, Debug)] struct Point { x : isize } diff --git a/src/test/run-pass/assert-ne-macro-unsized.rs b/src/test/run-pass/assert-ne-macro-unsized.rs index eeac0b6f9f687..ca3b053473f1f 100644 --- a/src/test/run-pass/assert-ne-macro-unsized.rs +++ b/src/test/run-pass/assert-ne-macro-unsized.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { assert_ne!([6, 6, 6][..], vec![1, 2, 3][..]); } diff --git a/src/test/run-pass/assert-ne-trailing-comma.rs b/src/test/run-pass/assert-ne-trailing-comma.rs index 4d3c29da8b22b..f931a04a29086 100644 --- a/src/test/run-pass/assert-ne-trailing-comma.rs +++ b/src/test/run-pass/assert-ne-trailing-comma.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { assert_ne!(1, 2,); } diff --git a/src/test/run-pass/assign-assign.rs b/src/test/run-pass/assign-assign.rs index 186f91da07ccb..ea0337676fc5f 100644 --- a/src/test/run-pass/assign-assign.rs +++ b/src/test/run-pass/assign-assign.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue 483 - Assignment expressions result in nil fn test_assign() { diff --git a/src/test/run-pass/assignability-trait.rs b/src/test/run-pass/assignability-trait.rs index bc95d96a8cc9d..089c9a1f4d91c 100644 --- a/src/test/run-pass/assignability-trait.rs +++ b/src/test/run-pass/assignability-trait.rs @@ -1,13 +1,3 @@ -// Copyright 2012-4 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that type assignability is used to search for instances when // making method calls, but only if there aren't any matches without // it. diff --git a/src/test/run-pass/assoc-oddities-3.rs b/src/test/run-pass/assoc-oddities-3.rs index 4913816ffe679..bd38125967550 100644 --- a/src/test/run-pass/assoc-oddities-3.rs +++ b/src/test/run-pass/assoc-oddities-3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn that_odd_parse(c: bool, n: usize) -> u32 { let x = 2; let a = [1, 2, 3, 4]; diff --git a/src/test/run-pass/associated-const-const-eval.rs b/src/test/run-pass/associated-const-const-eval.rs index 9c36a42527f12..2b9b3106be660 100644 --- a/src/test/run-pass/associated-const-const-eval.rs +++ b/src/test/run-pass/associated-const-const-eval.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Foo { const NUM: usize; } diff --git a/src/test/run-pass/associated-const-cross-crate-const-eval.rs b/src/test/run-pass/associated-const-cross-crate-const-eval.rs index c2758b1aed77f..ae76d859619a0 100644 --- a/src/test/run-pass/associated-const-cross-crate-const-eval.rs +++ b/src/test/run-pass/associated-const-cross-crate-const-eval.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:associated-const-cc-lib.rs diff --git a/src/test/run-pass/associated-const-cross-crate-defaults.rs b/src/test/run-pass/associated-const-cross-crate-defaults.rs index 084c448ba2ab1..a02101c249f78 100644 --- a/src/test/run-pass/associated-const-cross-crate-defaults.rs +++ b/src/test/run-pass/associated-const-cross-crate-defaults.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:associated-const-cc-lib.rs diff --git a/src/test/run-pass/associated-const-cross-crate.rs b/src/test/run-pass/associated-const-cross-crate.rs index a882d6ae23d8a..09dfd2308a80d 100644 --- a/src/test/run-pass/associated-const-cross-crate.rs +++ b/src/test/run-pass/associated-const-cross-crate.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:associated-const-cc-lib.rs diff --git a/src/test/run-pass/associated-const-in-global-const.rs b/src/test/run-pass/associated-const-in-global-const.rs index b7fb4d73259b3..4b8fa79e52607 100644 --- a/src/test/run-pass/associated-const-in-global-const.rs +++ b/src/test/run-pass/associated-const-in-global-const.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct Foo; impl Foo { diff --git a/src/test/run-pass/associated-const-inherent-impl.rs b/src/test/run-pass/associated-const-inherent-impl.rs index 86454a4a09117..ff4c52e6e1708 100644 --- a/src/test/run-pass/associated-const-inherent-impl.rs +++ b/src/test/run-pass/associated-const-inherent-impl.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct Foo; impl Foo { diff --git a/src/test/run-pass/associated-const-marks-live-code.rs b/src/test/run-pass/associated-const-marks-live-code.rs index bfeb78ddfe5c7..2bd4ca76bfdaf 100644 --- a/src/test/run-pass/associated-const-marks-live-code.rs +++ b/src/test/run-pass/associated-const-marks-live-code.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![deny(dead_code)] const GLOBAL_BAR: u32 = 1; diff --git a/src/test/run-pass/associated-const-match-patterns.rs b/src/test/run-pass/associated-const-match-patterns.rs index 54603e6e0d9aa..3c08c36c64ea3 100644 --- a/src/test/run-pass/associated-const-match-patterns.rs +++ b/src/test/run-pass/associated-const-match-patterns.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:empty-struct.rs diff --git a/src/test/run-pass/associated-const-outer-ty-refs.rs b/src/test/run-pass/associated-const-outer-ty-refs.rs index 987c64dbff562..bed38022edf6a 100644 --- a/src/test/run-pass/associated-const-outer-ty-refs.rs +++ b/src/test/run-pass/associated-const-outer-ty-refs.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Lattice { const BOTTOM: Self; } diff --git a/src/test/run-pass/associated-const-overwrite-default.rs b/src/test/run-pass/associated-const-overwrite-default.rs index bb594cfa0f973..22c9e410d30ee 100644 --- a/src/test/run-pass/associated-const-overwrite-default.rs +++ b/src/test/run-pass/associated-const-overwrite-default.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Foo { const ID: i32 = 2; } diff --git a/src/test/run-pass/associated-const-public-impl.rs b/src/test/run-pass/associated-const-public-impl.rs index 5ff363844a124..f966f617e0f70 100644 --- a/src/test/run-pass/associated-const-public-impl.rs +++ b/src/test/run-pass/associated-const-public-impl.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - mod bar1 { pub use self::bar2::Foo; mod bar2 { diff --git a/src/test/run-pass/associated-const-range-match-patterns.rs b/src/test/run-pass/associated-const-range-match-patterns.rs index d72e1efc4d74c..0105331607101 100644 --- a/src/test/run-pass/associated-const-range-match-patterns.rs +++ b/src/test/run-pass/associated-const-range-match-patterns.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct Foo; trait HasNum { diff --git a/src/test/run-pass/associated-const-resolution-order.rs b/src/test/run-pass/associated-const-resolution-order.rs index 5fa49b48200db..33c215007dbe9 100644 --- a/src/test/run-pass/associated-const-resolution-order.rs +++ b/src/test/run-pass/associated-const-resolution-order.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct MyType; impl MyType { diff --git a/src/test/run-pass/associated-const-self-type.rs b/src/test/run-pass/associated-const-self-type.rs index 16ccb5b39552c..c5acade49ac9e 100644 --- a/src/test/run-pass/associated-const-self-type.rs +++ b/src/test/run-pass/associated-const-self-type.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait MyInt { const ONE: Self; } diff --git a/src/test/run-pass/associated-const-type-parameters.rs b/src/test/run-pass/associated-const-type-parameters.rs index 7859a87e014b0..19dfc8251096c 100644 --- a/src/test/run-pass/associated-const-type-parameters.rs +++ b/src/test/run-pass/associated-const-type-parameters.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Foo { const X: i32; fn get_x() -> i32 { diff --git a/src/test/run-pass/associated-const-ufcs-infer-trait.rs b/src/test/run-pass/associated-const-ufcs-infer-trait.rs index b22630678249f..d19b67546d972 100644 --- a/src/test/run-pass/associated-const-ufcs-infer-trait.rs +++ b/src/test/run-pass/associated-const-ufcs-infer-trait.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Foo { const ID: i32; } diff --git a/src/test/run-pass/associated-const-use-default.rs b/src/test/run-pass/associated-const-use-default.rs index 5ed9a6dea3dd7..1cb280d8cb61f 100644 --- a/src/test/run-pass/associated-const-use-default.rs +++ b/src/test/run-pass/associated-const-use-default.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Foo { const ID: i32 = 1; } diff --git a/src/test/run-pass/associated-const-use-impl-of-same-trait.rs b/src/test/run-pass/associated-const-use-impl-of-same-trait.rs index 986f160f3cbd0..34b30ad1d00b1 100644 --- a/src/test/run-pass/associated-const-use-impl-of-same-trait.rs +++ b/src/test/run-pass/associated-const-use-impl-of-same-trait.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // The main purpose of this test is to ensure that different impls of the same // trait can refer to each other without setting off the static recursion check // (as long as there's no actual recursion). diff --git a/src/test/run-pass/associated-const.rs b/src/test/run-pass/associated-const.rs index 3c84f4a833530..2ff08ffc4bf6a 100644 --- a/src/test/run-pass/associated-const.rs +++ b/src/test/run-pass/associated-const.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Foo { const ID: i32; } diff --git a/src/test/run-pass/associated-item-long-paths.rs b/src/test/run-pass/associated-item-long-paths.rs index 4ad0187df7a8f..f2d151fc54aca 100644 --- a/src/test/run-pass/associated-item-long-paths.rs +++ b/src/test/run-pass/associated-item-long-paths.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::mem::size_of; // The main point of this test is to ensure that we can parse and resolve diff --git a/src/test/run-pass/associated-types-basic.rs b/src/test/run-pass/associated-types-basic.rs index 2617a05fe2414..50b37b9416d21 100644 --- a/src/test/run-pass/associated-types-basic.rs +++ b/src/test/run-pass/associated-types-basic.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { type T; } diff --git a/src/test/run-pass/associated-types-binding-in-trait.rs b/src/test/run-pass/associated-types-binding-in-trait.rs index d82ba6add75c7..d1a542a963404 100644 --- a/src/test/run-pass/associated-types-binding-in-trait.rs +++ b/src/test/run-pass/associated-types-binding-in-trait.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test a case where the associated type binding (to `bool`, in this // case) is derived from the trait definition. Issue #21636. diff --git a/src/test/run-pass/associated-types-binding-in-where-clause.rs b/src/test/run-pass/associated-types-binding-in-where-clause.rs index 82ebac7e5dc7e..8bb385180233b 100644 --- a/src/test/run-pass/associated-types-binding-in-where-clause.rs +++ b/src/test/run-pass/associated-types-binding-in-where-clause.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test equality constraints on associated types in a where clause. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/associated-types-bound.rs b/src/test/run-pass/associated-types-bound.rs index 4eacd120bc690..7e535dd6d2833 100644 --- a/src/test/run-pass/associated-types-bound.rs +++ b/src/test/run-pass/associated-types-bound.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test equality constrai32s on associated types in a where clause. diff --git a/src/test/run-pass/associated-types-cc.rs b/src/test/run-pass/associated-types-cc.rs index b2be87be4cb35..e5bcc17b4cc05 100644 --- a/src/test/run-pass/associated-types-cc.rs +++ b/src/test/run-pass/associated-types-cc.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:associated-types-cc-lib.rs // Test that we are able to reference cross-crate traits that employ diff --git a/src/test/run-pass/associated-types-conditional-dispatch.rs b/src/test/run-pass/associated-types-conditional-dispatch.rs index dbf975c6f2e88..4533169cd6147 100644 --- a/src/test/run-pass/associated-types-conditional-dispatch.rs +++ b/src/test/run-pass/associated-types-conditional-dispatch.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we evaluate projection predicates to winnow out // candidates during trait selection and method resolution (#20296). // If we don't properly winnow out candidates based on the output type diff --git a/src/test/run-pass/associated-types-constant-type.rs b/src/test/run-pass/associated-types-constant-type.rs index 77ab616ca918b..646b657f22033 100644 --- a/src/test/run-pass/associated-types-constant-type.rs +++ b/src/test/run-pass/associated-types-constant-type.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait SignedUnsigned { type Opposite; fn convert(self) -> Self::Opposite; diff --git a/src/test/run-pass/associated-types-doubleendediterator-object.rs b/src/test/run-pass/associated-types-doubleendediterator-object.rs index de83e4edd8527..5086c6449609a 100644 --- a/src/test/run-pass/associated-types-doubleendediterator-object.rs +++ b/src/test/run-pass/associated-types-doubleendediterator-object.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn pairwise_sub(mut t: Box>) -> isize { diff --git a/src/test/run-pass/associated-types-duplicate-binding-in-env-hrtb.rs b/src/test/run-pass/associated-types-duplicate-binding-in-env-hrtb.rs index 8ca3bc0254834..17b0ee07a6b63 100644 --- a/src/test/run-pass/associated-types-duplicate-binding-in-env-hrtb.rs +++ b/src/test/run-pass/associated-types-duplicate-binding-in-env-hrtb.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we do not report ambiguities when equivalent predicates // (modulo bound lifetime names) appears in the environment // twice. Issue #21965. diff --git a/src/test/run-pass/associated-types-duplicate-binding-in-env.rs b/src/test/run-pass/associated-types-duplicate-binding-in-env.rs index 5878f5dd51b2a..1fd45feee78fa 100644 --- a/src/test/run-pass/associated-types-duplicate-binding-in-env.rs +++ b/src/test/run-pass/associated-types-duplicate-binding-in-env.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we do not report ambiguities when the same predicate // appears in the environment twice. Issue #21965. diff --git a/src/test/run-pass/associated-types-enum-field-named.rs b/src/test/run-pass/associated-types-enum-field-named.rs index 7014cc59b71db..593e2bdd6222e 100644 --- a/src/test/run-pass/associated-types-enum-field-named.rs +++ b/src/test/run-pass/associated-types-enum-field-named.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test associated types appearing in struct-like enum variants. diff --git a/src/test/run-pass/associated-types-enum-field-numbered.rs b/src/test/run-pass/associated-types-enum-field-numbered.rs index c983fdefc0e35..a51ce443a306b 100644 --- a/src/test/run-pass/associated-types-enum-field-numbered.rs +++ b/src/test/run-pass/associated-types-enum-field-numbered.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test associated types appearing in tuple-like enum variants. diff --git a/src/test/run-pass/associated-types-eq-obj.rs b/src/test/run-pass/associated-types-eq-obj.rs index feccd1d2dcec0..ca7f65f65b57a 100644 --- a/src/test/run-pass/associated-types-eq-obj.rs +++ b/src/test/run-pass/associated-types-eq-obj.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test equality constraints on associated types inside of an object type // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/associated-types-impl-redirect.rs b/src/test/run-pass/associated-types-impl-redirect.rs index 3e34367a21582..cc49fc4a65f85 100644 --- a/src/test/run-pass/associated-types-impl-redirect.rs +++ b/src/test/run-pass/associated-types-impl-redirect.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test how resolving a projection interacts with inference. In this // case, we were eagerly unifying the type variable for the iterator // type with `I` from the where clause, ignoring the in-scope `impl` diff --git a/src/test/run-pass/associated-types-in-bound-type-arg.rs b/src/test/run-pass/associated-types-in-bound-type-arg.rs index 18803d15719e8..31149141da7ae 100644 --- a/src/test/run-pass/associated-types-in-bound-type-arg.rs +++ b/src/test/run-pass/associated-types-in-bound-type-arg.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test the case where we resolve `C::Result` and the trait bound // itself includes a `Self::Item` shorthand. // diff --git a/src/test/run-pass/associated-types-in-default-method.rs b/src/test/run-pass/associated-types-in-default-method.rs index 74199f57fb634..3a1b274638fd2 100644 --- a/src/test/run-pass/associated-types-in-default-method.rs +++ b/src/test/run-pass/associated-types-in-default-method.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Get { type Value; fn get(&self) -> &::Value; diff --git a/src/test/run-pass/associated-types-in-fn.rs b/src/test/run-pass/associated-types-in-fn.rs index dcd7895fa99e6..91629b38caf47 100644 --- a/src/test/run-pass/associated-types-in-fn.rs +++ b/src/test/run-pass/associated-types-in-fn.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Get { type Value; fn get(&self) -> &::Value; diff --git a/src/test/run-pass/associated-types-in-impl-generics.rs b/src/test/run-pass/associated-types-in-impl-generics.rs index 5b81ac7090876..6c93ea413b081 100644 --- a/src/test/run-pass/associated-types-in-impl-generics.rs +++ b/src/test/run-pass/associated-types-in-impl-generics.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Get { type Value; fn get(&self) -> &::Value; diff --git a/src/test/run-pass/associated-types-in-inherent-method.rs b/src/test/run-pass/associated-types-in-inherent-method.rs index 5eaf4c2bc8396..cf2663ed09df0 100644 --- a/src/test/run-pass/associated-types-in-inherent-method.rs +++ b/src/test/run-pass/associated-types-in-inherent-method.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Get { type Value; fn get(&self) -> &::Value; diff --git a/src/test/run-pass/associated-types-issue-20220.rs b/src/test/run-pass/associated-types-issue-20220.rs index 31336787e4c13..53451427a1dbe 100644 --- a/src/test/run-pass/associated-types-issue-20220.rs +++ b/src/test/run-pass/associated-types-issue-20220.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test references to `Self::Item` in the trait. Issue #20220. diff --git a/src/test/run-pass/associated-types-issue-20371.rs b/src/test/run-pass/associated-types-issue-20371.rs index c93a0b76a9560..67f6f2e8ea015 100644 --- a/src/test/run-pass/associated-types-issue-20371.rs +++ b/src/test/run-pass/associated-types-issue-20371.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are able to have an impl that defines an associated type // before the actual trait. diff --git a/src/test/run-pass/associated-types-issue-21212.rs b/src/test/run-pass/associated-types-issue-21212.rs index cf4b82721112c..19ac5e2f0aad1 100644 --- a/src/test/run-pass/associated-types-issue-21212.rs +++ b/src/test/run-pass/associated-types-issue-21212.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #21212: an overflow occurred during trait // checking where normalizing `Self::Input` led to normalizing the // where clauses in the environment which in turn required normalizing diff --git a/src/test/run-pass/associated-types-iterator-binding.rs b/src/test/run-pass/associated-types-iterator-binding.rs index abd4917cae87f..f6e68776357bc 100644 --- a/src/test/run-pass/associated-types-iterator-binding.rs +++ b/src/test/run-pass/associated-types-iterator-binding.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn pairwise_sub>(mut t: T) -> isize { let mut result = 0; loop { diff --git a/src/test/run-pass/associated-types-method.rs b/src/test/run-pass/associated-types-method.rs index b57687a49fa6f..8a47b269ea581 100644 --- a/src/test/run-pass/associated-types-method.rs +++ b/src/test/run-pass/associated-types-method.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that methods whose impl-trait-ref contains associated types // are supported. diff --git a/src/test/run-pass/associated-types-nested-projections.rs b/src/test/run-pass/associated-types-nested-projections.rs index 62fa07e20b6b0..8ce63056f9fb6 100644 --- a/src/test/run-pass/associated-types-nested-projections.rs +++ b/src/test/run-pass/associated-types-nested-projections.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we can resolve nested projection types. Issue #20666. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/associated-types-normalize-in-bounds-binding.rs b/src/test/run-pass/associated-types-normalize-in-bounds-binding.rs index 7e2d1aa23149d..6975805400057 100644 --- a/src/test/run-pass/associated-types-normalize-in-bounds-binding.rs +++ b/src/test/run-pass/associated-types-normalize-in-bounds-binding.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we normalize associated types that appear in a bound that // contains a binding. Issue #21664. diff --git a/src/test/run-pass/associated-types-normalize-in-bounds-ufcs.rs b/src/test/run-pass/associated-types-normalize-in-bounds-ufcs.rs index d8e4c5218d9cf..cf5b46613c7b3 100644 --- a/src/test/run-pass/associated-types-normalize-in-bounds-ufcs.rs +++ b/src/test/run-pass/associated-types-normalize-in-bounds-ufcs.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we normalize associated types that appear in bounds; if // we didn't, the call to `self.split2()` fails to type check. diff --git a/src/test/run-pass/associated-types-normalize-in-bounds.rs b/src/test/run-pass/associated-types-normalize-in-bounds.rs index ff08e7b69bdd8..2d6ca0a7e1d85 100644 --- a/src/test/run-pass/associated-types-normalize-in-bounds.rs +++ b/src/test/run-pass/associated-types-normalize-in-bounds.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we normalize associated types that appear in bounds; if // we didn't, the call to `self.split2()` fails to type check. diff --git a/src/test/run-pass/associated-types-normalize-unifield-struct.rs b/src/test/run-pass/associated-types-normalize-unifield-struct.rs index 517033d58702d..7b868b7da71b0 100644 --- a/src/test/run-pass/associated-types-normalize-unifield-struct.rs +++ b/src/test/run-pass/associated-types-normalize-unifield-struct.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #21010: Normalize associated types in // various special paths in the `type_is_immediate` function. diff --git a/src/test/run-pass/associated-types-project-from-type-param-via-bound-in-where.rs b/src/test/run-pass/associated-types-project-from-type-param-via-bound-in-where.rs index 5ceb1013ad811..4682844fa5d33 100644 --- a/src/test/run-pass/associated-types-project-from-type-param-via-bound-in-where.rs +++ b/src/test/run-pass/associated-types-project-from-type-param-via-bound-in-where.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Various uses of `T::Item` syntax where the bound that supplies // `Item` originates in a where-clause, not the declaration of // `T`. Issue #20300. diff --git a/src/test/run-pass/associated-types-projection-bound-in-supertraits.rs b/src/test/run-pass/associated-types-projection-bound-in-supertraits.rs index e150d01582437..112b307695254 100644 --- a/src/test/run-pass/associated-types-projection-bound-in-supertraits.rs +++ b/src/test/run-pass/associated-types-projection-bound-in-supertraits.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we correctly handle projection bounds appearing in the // supertrait list (and in conjunction with overloaded operators). In // this case, the `Result=Self` binding in the supertrait listing of diff --git a/src/test/run-pass/associated-types-projection-from-known-type-in-impl.rs b/src/test/run-pass/associated-types-projection-from-known-type-in-impl.rs index 8054b3aa52a1d..bd0090ea2030d 100644 --- a/src/test/run-pass/associated-types-projection-from-known-type-in-impl.rs +++ b/src/test/run-pass/associated-types-projection-from-known-type-in-impl.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test where the impl self type uses a projection from a constant type. diff --git a/src/test/run-pass/associated-types-projection-in-object-type.rs b/src/test/run-pass/associated-types-projection-in-object-type.rs index 14e94dbff6caf..d3fae085e7057 100644 --- a/src/test/run-pass/associated-types-projection-in-object-type.rs +++ b/src/test/run-pass/associated-types-projection-in-object-type.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Corrected regression test for #20831. The original did not compile. // When fixed, it revealed another problem concerning projections that // appear in associated type bindings in object types, which were not diff --git a/src/test/run-pass/associated-types-projection-in-supertrait.rs b/src/test/run-pass/associated-types-projection-in-supertrait.rs index 70c7602ffceb1..344b134445264 100644 --- a/src/test/run-pass/associated-types-projection-in-supertrait.rs +++ b/src/test/run-pass/associated-types-projection-in-supertrait.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are handle to correctly handle a projection type // that appears in a supertrait bound. Issue #20559. diff --git a/src/test/run-pass/associated-types-projection-in-where-clause.rs b/src/test/run-pass/associated-types-projection-in-where-clause.rs index 80e3aa09e3e61..cbba95984d9d7 100644 --- a/src/test/run-pass/associated-types-projection-in-where-clause.rs +++ b/src/test/run-pass/associated-types-projection-in-where-clause.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test a where clause that uses a non-normalized projection type. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/associated-types-projection-to-unrelated-trait.rs b/src/test/run-pass/associated-types-projection-to-unrelated-trait.rs index 8059db5204ee6..577677b2c1b84 100644 --- a/src/test/run-pass/associated-types-projection-to-unrelated-trait.rs +++ b/src/test/run-pass/associated-types-projection-to-unrelated-trait.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we do not get an error when you use `::Value` in // the trait definition if there is no default method and for every impl, // `Self` does implement `Get`. diff --git a/src/test/run-pass/associated-types-qualified-path-with-trait-with-type-parameters.rs b/src/test/run-pass/associated-types-qualified-path-with-trait-with-type-parameters.rs index a69de216ab997..bf9c36753ec11 100644 --- a/src/test/run-pass/associated-types-qualified-path-with-trait-with-type-parameters.rs +++ b/src/test/run-pass/associated-types-qualified-path-with-trait-with-type-parameters.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait Foo { diff --git a/src/test/run-pass/associated-types-ref-from-struct.rs b/src/test/run-pass/associated-types-ref-from-struct.rs index ce09ec60bd6a5..90f2825463db8 100644 --- a/src/test/run-pass/associated-types-ref-from-struct.rs +++ b/src/test/run-pass/associated-types-ref-from-struct.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test associated type references in structure fields. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/associated-types-ref-in-struct-literal.rs b/src/test/run-pass/associated-types-ref-in-struct-literal.rs index 3b7fb65a8b4aa..188bf6d22ea29 100644 --- a/src/test/run-pass/associated-types-ref-in-struct-literal.rs +++ b/src/test/run-pass/associated-types-ref-in-struct-literal.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test associated type references in a struct literal. Issue #20535. diff --git a/src/test/run-pass/associated-types-region-erasure-issue-20582.rs b/src/test/run-pass/associated-types-region-erasure-issue-20582.rs index 40f352e2e1f71..2b64204dd0acc 100644 --- a/src/test/run-pass/associated-types-region-erasure-issue-20582.rs +++ b/src/test/run-pass/associated-types-region-erasure-issue-20582.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #20582. This test caused an ICE related to // inconsistent region erasure in codegen. diff --git a/src/test/run-pass/associated-types-resolve-lifetime.rs b/src/test/run-pass/associated-types-resolve-lifetime.rs index 824291ea60782..c6b935c9ece4e 100644 --- a/src/test/run-pass/associated-types-resolve-lifetime.rs +++ b/src/test/run-pass/associated-types-resolve-lifetime.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait Get { diff --git a/src/test/run-pass/associated-types-return.rs b/src/test/run-pass/associated-types-return.rs index f5434c9eb865c..18db6870dcc1b 100644 --- a/src/test/run-pass/associated-types-return.rs +++ b/src/test/run-pass/associated-types-return.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test equality constraints on associated types in a where clause. diff --git a/src/test/run-pass/associated-types-simple.rs b/src/test/run-pass/associated-types-simple.rs index 776b2183d3908..6f085c05e80b6 100644 --- a/src/test/run-pass/associated-types-simple.rs +++ b/src/test/run-pass/associated-types-simple.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Get { type Value; fn get(&self) -> &::Value; diff --git a/src/test/run-pass/associated-types-stream.rs b/src/test/run-pass/associated-types-stream.rs index 6adfaabcc23b4..ac11ddfa249db 100644 --- a/src/test/run-pass/associated-types-stream.rs +++ b/src/test/run-pass/associated-types-stream.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test references to the trait `Stream` in the bounds for associated // types defined on `Stream`. Issue #20551. diff --git a/src/test/run-pass/associated-types-struct-field-named.rs b/src/test/run-pass/associated-types-struct-field-named.rs index 00746c32e1c31..190f3d0b95d2c 100644 --- a/src/test/run-pass/associated-types-struct-field-named.rs +++ b/src/test/run-pass/associated-types-struct-field-named.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we correctly normalize the type of a struct field // which has an associated type. diff --git a/src/test/run-pass/associated-types-struct-field-numbered.rs b/src/test/run-pass/associated-types-struct-field-numbered.rs index 25e89892a29af..9a2cb5c250f1e 100644 --- a/src/test/run-pass/associated-types-struct-field-numbered.rs +++ b/src/test/run-pass/associated-types-struct-field-numbered.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we correctly normalize the type of a struct field // which has an associated type. diff --git a/src/test/run-pass/associated-types-sugar-path.rs b/src/test/run-pass/associated-types-sugar-path.rs index d8d42f2cba281..8934cdbb2e279 100644 --- a/src/test/run-pass/associated-types-sugar-path.rs +++ b/src/test/run-pass/associated-types-sugar-path.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test paths to associated types using the type-parameter-only sugar. use std::ops::Deref; diff --git a/src/test/run-pass/associated-types-where-clause-impl-ambiguity.rs b/src/test/run-pass/associated-types-where-clause-impl-ambiguity.rs index ef1225d39a70e..4d91cdfaa34b2 100644 --- a/src/test/run-pass/associated-types-where-clause-impl-ambiguity.rs +++ b/src/test/run-pass/associated-types-where-clause-impl-ambiguity.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test how resolving a projection interacts with inference. In this // case, we were eagerly unifying the type variable for the iterator // type with `I` from the where clause, ignoring the in-scope `impl` diff --git a/src/test/run-pass/astconv-cycle-between-trait-and-type.rs b/src/test/run-pass/astconv-cycle-between-trait-and-type.rs index ef2dc48fe1364..4693213bf8002 100644 --- a/src/test/run-pass/astconv-cycle-between-trait-and-type.rs +++ b/src/test/run-pass/astconv-cycle-between-trait-and-type.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are able to successfully compile a setup where a trait // (`Trait1`) references a struct (`SomeType`) which in turn // carries a predicate that references the trait (`u32 : Trait1`, diff --git a/src/test/run-pass/async-await.rs b/src/test/run-pass/async-await.rs index 99b8ad83bf6cc..3536f8e8327b5 100644 --- a/src/test/run-pass/async-await.rs +++ b/src/test/run-pass/async-await.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 #![feature(arbitrary_self_types, async_await, await_macro, futures_api, pin)] diff --git a/src/test/run-pass/atomic-access-bool.rs b/src/test/run-pass/atomic-access-bool.rs index 286c92ce50ee3..2a359aa321cf8 100644 --- a/src/test/run-pass/atomic-access-bool.rs +++ b/src/test/run-pass/atomic-access-bool.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(atomic_access)] use std::sync::atomic::{AtomicBool, ATOMIC_BOOL_INIT}; use std::sync::atomic::Ordering::*; diff --git a/src/test/run-pass/atomic-compare_exchange.rs b/src/test/run-pass/atomic-compare_exchange.rs index 2f33eb9ca4093..5a61d1e3b2050 100644 --- a/src/test/run-pass/atomic-compare_exchange.rs +++ b/src/test/run-pass/atomic-compare_exchange.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(extended_compare_and_swap)] use std::sync::atomic::{AtomicIsize, ATOMIC_ISIZE_INIT}; use std::sync::atomic::Ordering::*; diff --git a/src/test/run-pass/atomic-print.rs b/src/test/run-pass/atomic-print.rs index 2d478e954e7cb..5b5e53d8a0dbb 100644 --- a/src/test/run-pass/atomic-print.rs +++ b/src/test/run-pass/atomic-print.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no process support // ignore-emscripten no threads support diff --git a/src/test/run-pass/attr-before-view-item.rs b/src/test/run-pass/attr-before-view-item.rs index 2a86489c69aa5..1b1dfff44ce02 100644 --- a/src/test/run-pass/attr-before-view-item.rs +++ b/src/test/run-pass/attr-before-view-item.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(custom_attribute, test)] diff --git a/src/test/run-pass/attr-before-view-item2.rs b/src/test/run-pass/attr-before-view-item2.rs index c8683f2d14751..5f71550304794 100644 --- a/src/test/run-pass/attr-before-view-item2.rs +++ b/src/test/run-pass/attr-before-view-item2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(custom_attribute, test)] diff --git a/src/test/run-pass/attr-main-2.rs b/src/test/run-pass/attr-main-2.rs index b3c9ea541b712..e0bf6ecc8f198 100644 --- a/src/test/run-pass/attr-main-2.rs +++ b/src/test/run-pass/attr-main-2.rs @@ -1,14 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![feature(main)] pub fn main() { diff --git a/src/test/run-pass/attr-main.rs b/src/test/run-pass/attr-main.rs index e8a12ee3ac791..645baf32e0458 100644 --- a/src/test/run-pass/attr-main.rs +++ b/src/test/run-pass/attr-main.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(main)] diff --git a/src/test/run-pass/attr-mix-new.rs b/src/test/run-pass/attr-mix-new.rs index bcfb4b330f5ed..f02c1bf5cde95 100644 --- a/src/test/run-pass/attr-mix-new.rs +++ b/src/test/run-pass/attr-mix-new.rs @@ -1,12 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // pretty-expanded FIXME #23616 #![allow(unused_attribute)] diff --git a/src/test/run-pass/attr-on-generic-formals.rs b/src/test/run-pass/attr-on-generic-formals.rs index e87b9e3d82a24..b1215840f877f 100644 --- a/src/test/run-pass/attr-on-generic-formals.rs +++ b/src/test/run-pass/attr-on-generic-formals.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test ensures we can attach attributes to the formals in all // places where generic parameter lists occur, assuming appropriate // feature gates are enabled. diff --git a/src/test/run-pass/attr-start.rs b/src/test/run-pass/attr-start.rs index bfafe04d6006c..29f86c9b59e99 100644 --- a/src/test/run-pass/attr-start.rs +++ b/src/test/run-pass/attr-start.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(start)] diff --git a/src/test/run-pass/attr.rs b/src/test/run-pass/attr.rs index 57e1b38c9c166..645baf32e0458 100644 --- a/src/test/run-pass/attr.rs +++ b/src/test/run-pass/attr.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(main)] diff --git a/src/test/run-pass/augmented-assignments-feature-gate-cross.rs b/src/test/run-pass/augmented-assignments-feature-gate-cross.rs index b68e011af15f2..566d4522808e3 100644 --- a/src/test/run-pass/augmented-assignments-feature-gate-cross.rs +++ b/src/test/run-pass/augmented-assignments-feature-gate-cross.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:augmented_assignments.rs extern crate augmented_assignments; diff --git a/src/test/run-pass/augmented-assignments-feature-gate.rs b/src/test/run-pass/augmented-assignments-feature-gate.rs index f7e20ee94458f..7809ac8ea967b 100644 --- a/src/test/run-pass/augmented-assignments-feature-gate.rs +++ b/src/test/run-pass/augmented-assignments-feature-gate.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::AddAssign; struct Int(i32); diff --git a/src/test/run-pass/augmented-assignments-trait.rs b/src/test/run-pass/augmented-assignments-trait.rs index f1cb2c56dbcf0..e7072c3cc35c0 100644 --- a/src/test/run-pass/augmented-assignments-trait.rs +++ b/src/test/run-pass/augmented-assignments-trait.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::AddAssign; struct Int(i32); diff --git a/src/test/run-pass/augmented-assignments.rs b/src/test/run-pass/augmented-assignments.rs index 3ed9e8548dcbc..b7da645cb224e 100644 --- a/src/test/run-pass/augmented-assignments.rs +++ b/src/test/run-pass/augmented-assignments.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(unused_assignments)] use std::mem; diff --git a/src/test/run-pass/auto-instantiate.rs b/src/test/run-pass/auto-instantiate.rs index 4a1bfa3eb4266..fd97f4dc5654b 100644 --- a/src/test/run-pass/auto-instantiate.rs +++ b/src/test/run-pass/auto-instantiate.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug)] struct Pair { a: T, b: U } struct Triple { x: isize, y: isize, z: isize } diff --git a/src/test/run-pass/auto-is-contextual.rs b/src/test/run-pass/auto-is-contextual.rs index ad433cc26a790..90532b0f4b637 100644 --- a/src/test/run-pass/auto-is-contextual.rs +++ b/src/test/run-pass/auto-is-contextual.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! auto { () => (struct S;) } diff --git a/src/test/run-pass/auto-loop.rs b/src/test/run-pass/auto-loop.rs index b0afae79c3696..01a31ae2fd11d 100644 --- a/src/test/run-pass/auto-loop.rs +++ b/src/test/run-pass/auto-loop.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { let mut sum = 0; let xs = vec![1, 2, 3, 4, 5]; diff --git a/src/test/run-pass/auto-ref-bounded-ty-param.rs b/src/test/run-pass/auto-ref-bounded-ty-param.rs index 77ec0e1791f96..2f04c3c006a7a 100644 --- a/src/test/run-pass/auto-ref-bounded-ty-param.rs +++ b/src/test/run-pass/auto-ref-bounded-ty-param.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn f(&self); } diff --git a/src/test/run-pass/auto-ref-sliceable.rs b/src/test/run-pass/auto-ref-sliceable.rs index f6cb314d06e2d..47680a68d593d 100644 --- a/src/test/run-pass/auto-ref-sliceable.rs +++ b/src/test/run-pass/auto-ref-sliceable.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - trait Pushable { fn push_val(&mut self, t: T); } diff --git a/src/test/run-pass/auto-ref.rs b/src/test/run-pass/auto-ref.rs index 0ad2303a7697b..877e4398433bf 100644 --- a/src/test/run-pass/auto-ref.rs +++ b/src/test/run-pass/auto-ref.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { x: isize, } diff --git a/src/test/run-pass/auto-traits.rs b/src/test/run-pass/auto-traits.rs index 2a18b402bc64d..d5418b63521a1 100644 --- a/src/test/run-pass/auto-traits.rs +++ b/src/test/run-pass/auto-traits.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] auto trait Auto {} diff --git a/src/test/run-pass/autobind.rs b/src/test/run-pass/autobind.rs index ed0b9eca0e058..bb38b7afdf6e5 100644 --- a/src/test/run-pass/autobind.rs +++ b/src/test/run-pass/autobind.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - fn f(x: Vec) -> T { return x.into_iter().next().unwrap(); } fn g(act: F) -> isize where F: FnOnce(Vec) -> isize { return act(vec![1, 2, 3]); } diff --git a/src/test/run-pass/autoderef-and-borrow-method-receiver.rs b/src/test/run-pass/autoderef-and-borrow-method-receiver.rs index a4c6cdd544c87..a38b059141639 100644 --- a/src/test/run-pass/autoderef-and-borrow-method-receiver.rs +++ b/src/test/run-pass/autoderef-and-borrow-method-receiver.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct Foo { diff --git a/src/test/run-pass/autoderef-method-on-trait.rs b/src/test/run-pass/autoderef-method-on-trait.rs index f6ff9a31fa13c..a199e133605e6 100644 --- a/src/test/run-pass/autoderef-method-on-trait.rs +++ b/src/test/run-pass/autoderef-method-on-trait.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] trait double { diff --git a/src/test/run-pass/autoderef-method-priority.rs b/src/test/run-pass/autoderef-method-priority.rs index 234af92610abe..98a182722f0c8 100644 --- a/src/test/run-pass/autoderef-method-priority.rs +++ b/src/test/run-pass/autoderef-method-priority.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] trait double { diff --git a/src/test/run-pass/autoderef-method-twice-but-not-thrice.rs b/src/test/run-pass/autoderef-method-twice-but-not-thrice.rs index 5890fe4416661..dc3f0e249363f 100644 --- a/src/test/run-pass/autoderef-method-twice-but-not-thrice.rs +++ b/src/test/run-pass/autoderef-method-twice-but-not-thrice.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] trait double { diff --git a/src/test/run-pass/autoderef-method-twice.rs b/src/test/run-pass/autoderef-method-twice.rs index 2598ec17d2aea..8190912002142 100644 --- a/src/test/run-pass/autoderef-method-twice.rs +++ b/src/test/run-pass/autoderef-method-twice.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] trait double { diff --git a/src/test/run-pass/autoderef-method.rs b/src/test/run-pass/autoderef-method.rs index 7c83b9c982fbd..6065f57f6b2b6 100644 --- a/src/test/run-pass/autoderef-method.rs +++ b/src/test/run-pass/autoderef-method.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] trait double { diff --git a/src/test/run-pass/autoderef-privacy.rs b/src/test/run-pass/autoderef-privacy.rs index e50f1bea0d3ba..594d45d0d3ce6 100644 --- a/src/test/run-pass/autoderef-privacy.rs +++ b/src/test/run-pass/autoderef-privacy.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check we do not select a private method or field when computing autoderefs #![allow(unused)] diff --git a/src/test/run-pass/autoref-intermediate-types-issue-3585.rs b/src/test/run-pass/autoref-intermediate-types-issue-3585.rs index 4096d45d8df8d..1a2ef5bfdb7c3 100644 --- a/src/test/run-pass/autoref-intermediate-types-issue-3585.rs +++ b/src/test/run-pass/autoref-intermediate-types-issue-3585.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] trait Foo { diff --git a/src/test/run-pass/auxiliary/allocator-dummy.rs b/src/test/run-pass/auxiliary/allocator-dummy.rs index f4a32a93dfb71..bedf3020c8be0 100644 --- a/src/test/run-pass/auxiliary/allocator-dummy.rs +++ b/src/test/run-pass/auxiliary/allocator-dummy.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![feature(allocator, core_intrinsics, panic_unwind)] diff --git a/src/test/run-pass/auxiliary/anon-extern-mod-cross-crate-1.rs b/src/test/run-pass/auxiliary/anon-extern-mod-cross-crate-1.rs index 741ce351da38e..744b4ae39e15b 100644 --- a/src/test/run-pass/auxiliary/anon-extern-mod-cross-crate-1.rs +++ b/src/test/run-pass/auxiliary/anon-extern-mod-cross-crate-1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name="anonexternmod"] #![feature(libc)] diff --git a/src/test/run-pass/auxiliary/anon_trait_static_method_lib.rs b/src/test/run-pass/auxiliary/anon_trait_static_method_lib.rs index 9d93d9689e737..dceec7e3ec151 100644 --- a/src/test/run-pass/auxiliary/anon_trait_static_method_lib.rs +++ b/src/test/run-pass/auxiliary/anon_trait_static_method_lib.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Foo { pub x: isize } diff --git a/src/test/run-pass/auxiliary/associated-const-cc-lib.rs b/src/test/run-pass/auxiliary/associated-const-cc-lib.rs index e4cada40db3c9..4fcefe32cbfb3 100644 --- a/src/test/run-pass/auxiliary/associated-const-cc-lib.rs +++ b/src/test/run-pass/auxiliary/associated-const-cc-lib.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![crate_type="lib"] // These items are for testing that associated consts work cross-crate. diff --git a/src/test/run-pass/auxiliary/associated-types-cc-lib.rs b/src/test/run-pass/auxiliary/associated-types-cc-lib.rs index 175e8730cbcd3..b67853587068d 100644 --- a/src/test/run-pass/auxiliary/associated-types-cc-lib.rs +++ b/src/test/run-pass/auxiliary/associated-types-cc-lib.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Helper for test issue-18048, which tests associated types in a // cross-crate scenario. diff --git a/src/test/run-pass/auxiliary/augmented_assignments.rs b/src/test/run-pass/auxiliary/augmented_assignments.rs index 6601e7240a780..d0d3f57459acc 100644 --- a/src/test/run-pass/auxiliary/augmented_assignments.rs +++ b/src/test/run-pass/auxiliary/augmented_assignments.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::AddAssign; pub struct Int(pub i32); diff --git a/src/test/run-pass/auxiliary/blind-item-mixed-crate-use-item-foo.rs b/src/test/run-pass/auxiliary/blind-item-mixed-crate-use-item-foo.rs index f129b4b77bb9f..cf769f31bf7ec 100644 --- a/src/test/run-pass/auxiliary/blind-item-mixed-crate-use-item-foo.rs +++ b/src/test/run-pass/auxiliary/blind-item-mixed-crate-use-item-foo.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="lib"] pub const X: () = (); diff --git a/src/test/run-pass/auxiliary/blind-item-mixed-crate-use-item-foo2.rs b/src/test/run-pass/auxiliary/blind-item-mixed-crate-use-item-foo2.rs index 91fa912455109..81c16ede90930 100644 --- a/src/test/run-pass/auxiliary/blind-item-mixed-crate-use-item-foo2.rs +++ b/src/test/run-pass/auxiliary/blind-item-mixed-crate-use-item-foo2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="lib"] pub const Y: () = (); diff --git a/src/test/run-pass/auxiliary/cci_borrow_lib.rs b/src/test/run-pass/auxiliary/cci_borrow_lib.rs index 9c90510a8573e..7c57a1c6678a5 100644 --- a/src/test/run-pass/auxiliary/cci_borrow_lib.rs +++ b/src/test/run-pass/auxiliary/cci_borrow_lib.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn foo(x: &usize) -> usize { *x } diff --git a/src/test/run-pass/auxiliary/cci_capture_clause.rs b/src/test/run-pass/auxiliary/cci_capture_clause.rs index b38e955231e4a..4cd001ecc9e60 100644 --- a/src/test/run-pass/auxiliary/cci_capture_clause.rs +++ b/src/test/run-pass/auxiliary/cci_capture_clause.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::thread; use std::sync::mpsc::{Receiver, channel}; diff --git a/src/test/run-pass/auxiliary/cci_class.rs b/src/test/run-pass/auxiliary/cci_class.rs index 08a13fd8bcc9a..de2945d746045 100644 --- a/src/test/run-pass/auxiliary/cci_class.rs +++ b/src/test/run-pass/auxiliary/cci_class.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod kitties { pub struct cat { meows : usize, diff --git a/src/test/run-pass/auxiliary/cci_class_2.rs b/src/test/run-pass/auxiliary/cci_class_2.rs index 7d147832f0943..c3de3150e6978 100644 --- a/src/test/run-pass/auxiliary/cci_class_2.rs +++ b/src/test/run-pass/auxiliary/cci_class_2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod kitties { pub struct cat { meows : usize, diff --git a/src/test/run-pass/auxiliary/cci_class_3.rs b/src/test/run-pass/auxiliary/cci_class_3.rs index ec1bf108dcb00..fb7fad0b5a2e7 100644 --- a/src/test/run-pass/auxiliary/cci_class_3.rs +++ b/src/test/run-pass/auxiliary/cci_class_3.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod kitties { pub struct cat { meows : usize, diff --git a/src/test/run-pass/auxiliary/cci_class_4.rs b/src/test/run-pass/auxiliary/cci_class_4.rs index 300cc31632e40..85aa3bc8c0df9 100644 --- a/src/test/run-pass/auxiliary/cci_class_4.rs +++ b/src/test/run-pass/auxiliary/cci_class_4.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod kitties { pub struct cat { meows : usize, diff --git a/src/test/run-pass/auxiliary/cci_class_6.rs b/src/test/run-pass/auxiliary/cci_class_6.rs index c902a6c7dca89..35f93d0c6c827 100644 --- a/src/test/run-pass/auxiliary/cci_class_6.rs +++ b/src/test/run-pass/auxiliary/cci_class_6.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod kitties { pub struct cat { diff --git a/src/test/run-pass/auxiliary/cci_class_cast.rs b/src/test/run-pass/auxiliary/cci_class_cast.rs index f54a39d61ef3e..dfc3c56ddee70 100644 --- a/src/test/run-pass/auxiliary/cci_class_cast.rs +++ b/src/test/run-pass/auxiliary/cci_class_cast.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod kitty { use std::fmt; diff --git a/src/test/run-pass/auxiliary/cci_class_trait.rs b/src/test/run-pass/auxiliary/cci_class_trait.rs index 7ca3d7c4ac990..2d02b591c5559 100644 --- a/src/test/run-pass/auxiliary/cci_class_trait.rs +++ b/src/test/run-pass/auxiliary/cci_class_trait.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod animals { pub trait noisy { fn speak(&mut self); diff --git a/src/test/run-pass/auxiliary/cci_const.rs b/src/test/run-pass/auxiliary/cci_const.rs index ee8290050f91b..af6a5ad8ed39d 100644 --- a/src/test/run-pass/auxiliary/cci_const.rs +++ b/src/test/run-pass/auxiliary/cci_const.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub extern fn bar() { } diff --git a/src/test/run-pass/auxiliary/cci_const_block.rs b/src/test/run-pass/auxiliary/cci_const_block.rs index 76fe9fe5aa40a..ad618aab830fe 100644 --- a/src/test/run-pass/auxiliary/cci_const_block.rs +++ b/src/test/run-pass/auxiliary/cci_const_block.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub static BLOCK_FN_DEF: fn(usize) -> usize = { fn foo(a: usize) -> usize { a + 10 diff --git a/src/test/run-pass/auxiliary/cci_impl_lib.rs b/src/test/run-pass/auxiliary/cci_impl_lib.rs index d8921f4e09a8a..0db0037b20327 100644 --- a/src/test/run-pass/auxiliary/cci_impl_lib.rs +++ b/src/test/run-pass/auxiliary/cci_impl_lib.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name="cci_impl_lib"] pub trait uint_helpers { diff --git a/src/test/run-pass/auxiliary/cci_intrinsic.rs b/src/test/run-pass/auxiliary/cci_intrinsic.rs index b6e69d29f70cd..f65f359875bfd 100644 --- a/src/test/run-pass/auxiliary/cci_intrinsic.rs +++ b/src/test/run-pass/auxiliary/cci_intrinsic.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(intrinsics)] pub mod rusti { diff --git a/src/test/run-pass/auxiliary/cci_iter_lib.rs b/src/test/run-pass/auxiliary/cci_iter_lib.rs index 07d03b4c7590f..60c36bc7d05ae 100644 --- a/src/test/run-pass/auxiliary/cci_iter_lib.rs +++ b/src/test/run-pass/auxiliary/cci_iter_lib.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name="cci_iter_lib"] #[inline] diff --git a/src/test/run-pass/auxiliary/cci_nested_lib.rs b/src/test/run-pass/auxiliary/cci_nested_lib.rs index 91de734ec3a67..379ed076611f4 100644 --- a/src/test/run-pass/auxiliary/cci_nested_lib.rs +++ b/src/test/run-pass/auxiliary/cci_nested_lib.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] use std::cell::RefCell; diff --git a/src/test/run-pass/auxiliary/cci_no_inline_lib.rs b/src/test/run-pass/auxiliary/cci_no_inline_lib.rs index 4c6f808c61920..177dba2178f06 100644 --- a/src/test/run-pass/auxiliary/cci_no_inline_lib.rs +++ b/src/test/run-pass/auxiliary/cci_no_inline_lib.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name="cci_no_inline_lib"] diff --git a/src/test/run-pass/auxiliary/cfg_inner_static.rs b/src/test/run-pass/auxiliary/cfg_inner_static.rs index b5b4390657b4f..6a619a4e768cf 100644 --- a/src/test/run-pass/auxiliary/cfg_inner_static.rs +++ b/src/test/run-pass/auxiliary/cfg_inner_static.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // this used to just ICE on compiling pub fn foo() { if cfg!(foo) { diff --git a/src/test/run-pass/auxiliary/cgu_test.rs b/src/test/run-pass/auxiliary/cgu_test.rs index 7c88d3d37e3a3..5ed973164a1c0 100644 --- a/src/test/run-pass/auxiliary/cgu_test.rs +++ b/src/test/run-pass/auxiliary/cgu_test.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic // compile-flags: --crate-type=lib diff --git a/src/test/run-pass/auxiliary/cgu_test_a.rs b/src/test/run-pass/auxiliary/cgu_test_a.rs index 0f0d1cd87e1f8..a3dcd92012ee9 100644 --- a/src/test/run-pass/auxiliary/cgu_test_a.rs +++ b/src/test/run-pass/auxiliary/cgu_test_a.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic // compile-flags: -Ccodegen-units=2 --crate-type=lib diff --git a/src/test/run-pass/auxiliary/cgu_test_b.rs b/src/test/run-pass/auxiliary/cgu_test_b.rs index 0f0d1cd87e1f8..a3dcd92012ee9 100644 --- a/src/test/run-pass/auxiliary/cgu_test_b.rs +++ b/src/test/run-pass/auxiliary/cgu_test_b.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic // compile-flags: -Ccodegen-units=2 --crate-type=lib diff --git a/src/test/run-pass/auxiliary/check_static_recursion_foreign_helper.rs b/src/test/run-pass/auxiliary/check_static_recursion_foreign_helper.rs index cd36a8eedb482..e8b3b7f54f3be 100644 --- a/src/test/run-pass/auxiliary/check_static_recursion_foreign_helper.rs +++ b/src/test/run-pass/auxiliary/check_static_recursion_foreign_helper.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Helper definition for test/run-pass/check-static-recursion-foreign.rs. #![feature(libc)] diff --git a/src/test/run-pass/auxiliary/coherence_copy_like_lib.rs b/src/test/run-pass/auxiliary/coherence_copy_like_lib.rs index d3d389c6a8bd5..b5b4802c112de 100644 --- a/src/test/run-pass/auxiliary/coherence_copy_like_lib.rs +++ b/src/test/run-pass/auxiliary/coherence_copy_like_lib.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] #![feature(fundamental)] diff --git a/src/test/run-pass/auxiliary/coherence_lib.rs b/src/test/run-pass/auxiliary/coherence_lib.rs index daa123849e4e7..9a5ec82430639 100644 --- a/src/test/run-pass/auxiliary/coherence_lib.rs +++ b/src/test/run-pass/auxiliary/coherence_lib.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="lib"] pub trait Remote { diff --git a/src/test/run-pass/auxiliary/const_fn_lib.rs b/src/test/run-pass/auxiliary/const_fn_lib.rs index be06e8dd5700b..ec797c9b8e2c3 100644 --- a/src/test/run-pass/auxiliary/const_fn_lib.rs +++ b/src/test/run-pass/auxiliary/const_fn_lib.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Crate that exports a const fn. Used for testing cross-crate. #![crate_type="rlib"] diff --git a/src/test/run-pass/auxiliary/crate-attributes-using-cfg_attr.rs b/src/test/run-pass/auxiliary/crate-attributes-using-cfg_attr.rs index 0028b51f9d1ee..1e0f5d79c0b42 100644 --- a/src/test/run-pass/auxiliary/crate-attributes-using-cfg_attr.rs +++ b/src/test/run-pass/auxiliary/crate-attributes-using-cfg_attr.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic // compile-flags: --cfg foo diff --git a/src/test/run-pass/auxiliary/crate-method-reexport-grrrrrrr2.rs b/src/test/run-pass/auxiliary/crate-method-reexport-grrrrrrr2.rs index f3d5bf2d65eee..d08504005a5e1 100644 --- a/src/test/run-pass/auxiliary/crate-method-reexport-grrrrrrr2.rs +++ b/src/test/run-pass/auxiliary/crate-method-reexport-grrrrrrr2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name="crate_method_reexport_grrrrrrr2"] pub use name_pool::add; diff --git a/src/test/run-pass/auxiliary/debuginfo-lto-aux.rs b/src/test/run-pass/auxiliary/debuginfo-lto-aux.rs index 88e54d30172bc..dd471154b4ff2 100644 --- a/src/test/run-pass/auxiliary/debuginfo-lto-aux.rs +++ b/src/test/run-pass/auxiliary/debuginfo-lto-aux.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -g --crate-type=rlib pub struct StructWithLifetime<'a>(&'a i32); diff --git a/src/test/run-pass/auxiliary/default_type_params_xc.rs b/src/test/run-pass/auxiliary/default_type_params_xc.rs index fe852e5d8eaee..aacbd672ade6c 100644 --- a/src/test/run-pass/auxiliary/default_type_params_xc.rs +++ b/src/test/run-pass/auxiliary/default_type_params_xc.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Heap; pub struct FakeHeap; diff --git a/src/test/run-pass/auxiliary/derive-no-std.rs b/src/test/run-pass/auxiliary/derive-no-std.rs index f083e10bfdb32..21bfd5a2909b1 100644 --- a/src/test/run-pass/auxiliary/derive-no-std.rs +++ b/src/test/run-pass/auxiliary/derive-no-std.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "rlib"] diff --git a/src/test/run-pass/auxiliary/dropck_eyepatch_extern_crate.rs b/src/test/run-pass/auxiliary/dropck_eyepatch_extern_crate.rs index d891294344115..270d5de7ac844 100644 --- a/src/test/run-pass/auxiliary/dropck_eyepatch_extern_crate.rs +++ b/src/test/run-pass/auxiliary/dropck_eyepatch_extern_crate.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(dropck_eyepatch)] // The point of this test is to illustrate that the `#[may_dangle]` diff --git a/src/test/run-pass/auxiliary/edition-kw-macro-2015.rs b/src/test/run-pass/auxiliary/edition-kw-macro-2015.rs index f8ed2c7f432eb..553ba69303a6b 100644 --- a/src/test/run-pass/auxiliary/edition-kw-macro-2015.rs +++ b/src/test/run-pass/auxiliary/edition-kw-macro-2015.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2015 #[macro_export] diff --git a/src/test/run-pass/auxiliary/edition-kw-macro-2018.rs b/src/test/run-pass/auxiliary/edition-kw-macro-2018.rs index 36562fd004928..f1f4ee28093b2 100644 --- a/src/test/run-pass/auxiliary/edition-kw-macro-2018.rs +++ b/src/test/run-pass/auxiliary/edition-kw-macro-2018.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 #[macro_export] diff --git a/src/test/run-pass/auxiliary/empty-struct.rs b/src/test/run-pass/auxiliary/empty-struct.rs index 734e57a774d87..93275e7143eed 100644 --- a/src/test/run-pass/auxiliary/empty-struct.rs +++ b/src/test/run-pass/auxiliary/empty-struct.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct XEmpty1 {} pub struct XEmpty2; pub struct XEmpty7(); diff --git a/src/test/run-pass/auxiliary/explicit_self_xcrate.rs b/src/test/run-pass/auxiliary/explicit_self_xcrate.rs index dafa66d9286d2..25cdfa9099070 100644 --- a/src/test/run-pass/auxiliary/explicit_self_xcrate.rs +++ b/src/test/run-pass/auxiliary/explicit_self_xcrate.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Foo { #[inline(always)] fn f(&self); diff --git a/src/test/run-pass/auxiliary/extern-crosscrate-source.rs b/src/test/run-pass/auxiliary/extern-crosscrate-source.rs index 150dffeea886c..74c08de6f0feb 100644 --- a/src/test/run-pass/auxiliary/extern-crosscrate-source.rs +++ b/src/test/run-pass/auxiliary/extern-crosscrate-source.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name="externcallback"] #![crate_type = "lib"] #![feature(libc)] diff --git a/src/test/run-pass/auxiliary/extern-take-value.rs b/src/test/run-pass/auxiliary/extern-take-value.rs index 500c455136b51..869e794cc8a88 100644 --- a/src/test/run-pass/auxiliary/extern-take-value.rs +++ b/src/test/run-pass/auxiliary/extern-take-value.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub extern fn f() -> i32 { 1 } pub extern fn g() -> i32 { 2 } diff --git a/src/test/run-pass/auxiliary/extern_calling_convention.rs b/src/test/run-pass/auxiliary/extern_calling_convention.rs index 55a4226c6632d..968b1a2551098 100644 --- a/src/test/run-pass/auxiliary/extern_calling_convention.rs +++ b/src/test/run-pass/auxiliary/extern_calling_convention.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Make sure Rust generates the correct calling convention for extern // functions. diff --git a/src/test/run-pass/auxiliary/extern_mod_ordering_lib.rs b/src/test/run-pass/auxiliary/extern_mod_ordering_lib.rs index 0fb6adfcda19f..7357f59700eda 100644 --- a/src/test/run-pass/auxiliary/extern_mod_ordering_lib.rs +++ b/src/test/run-pass/auxiliary/extern_mod_ordering_lib.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="lib"] pub mod extern_mod_ordering_lib { diff --git a/src/test/run-pass/auxiliary/fat_drop.rs b/src/test/run-pass/auxiliary/fat_drop.rs index 1f944b6ed32f0..768d29876b971 100644 --- a/src/test/run-pass/auxiliary/fat_drop.rs +++ b/src/test/run-pass/auxiliary/fat_drop.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub static mut DROPPED: bool = false; pub struct S { diff --git a/src/test/run-pass/auxiliary/fn-abi.rs b/src/test/run-pass/auxiliary/fn-abi.rs index 5d380ea6a5aca..25c9e1b4ca332 100644 --- a/src/test/run-pass/auxiliary/fn-abi.rs +++ b/src/test/run-pass/auxiliary/fn-abi.rs @@ -1,12 +1,2 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[no_mangle] pub extern fn foo() {} diff --git a/src/test/run-pass/auxiliary/foreign_lib.rs b/src/test/run-pass/auxiliary/foreign_lib.rs index cef36274c625e..42c8a9da7f8dc 100644 --- a/src/test/run-pass/auxiliary/foreign_lib.rs +++ b/src/test/run-pass/auxiliary/foreign_lib.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name="foreign_lib"] #![feature(libc)] diff --git a/src/test/run-pass/auxiliary/go_trait.rs b/src/test/run-pass/auxiliary/go_trait.rs index 044bb606b40e2..aa0ec22896d73 100644 --- a/src/test/run-pass/auxiliary/go_trait.rs +++ b/src/test/run-pass/auxiliary/go_trait.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(specialization)] // Common code used for tests that model the Fn/FnMut/FnOnce hierarchy. diff --git a/src/test/run-pass/auxiliary/i8.rs b/src/test/run-pass/auxiliary/i8.rs index 44e62b99a96d1..889a9c4ebb1f7 100644 --- a/src/test/run-pass/auxiliary/i8.rs +++ b/src/test/run-pass/auxiliary/i8.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // A crate named after a built-in type. pub struct Test; diff --git a/src/test/run-pass/auxiliary/impl_privacy_xc_1.rs b/src/test/run-pass/auxiliary/impl_privacy_xc_1.rs index ad3cdedf7eafe..367b8ec8b88d0 100644 --- a/src/test/run-pass/auxiliary/impl_privacy_xc_1.rs +++ b/src/test/run-pass/auxiliary/impl_privacy_xc_1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] pub struct Fish { diff --git a/src/test/run-pass/auxiliary/impl_privacy_xc_2.rs b/src/test/run-pass/auxiliary/impl_privacy_xc_2.rs index c3212b0fc6d22..5f9c22681671b 100644 --- a/src/test/run-pass/auxiliary/impl_privacy_xc_2.rs +++ b/src/test/run-pass/auxiliary/impl_privacy_xc_2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] pub struct Fish { diff --git a/src/test/run-pass/auxiliary/inline_dtor.rs b/src/test/run-pass/auxiliary/inline_dtor.rs index dd1fdc2e4981f..5eee89fdc57f9 100644 --- a/src/test/run-pass/auxiliary/inline_dtor.rs +++ b/src/test/run-pass/auxiliary/inline_dtor.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name="inline_dtor"] pub struct Foo; diff --git a/src/test/run-pass/auxiliary/inner_static.rs b/src/test/run-pass/auxiliary/inner_static.rs index 0d15c13a4ef1e..42dcd379d41e4 100644 --- a/src/test/run-pass/auxiliary/inner_static.rs +++ b/src/test/run-pass/auxiliary/inner_static.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct A { pub v: T } pub struct B { pub v: T } diff --git a/src/test/run-pass/auxiliary/iss.rs b/src/test/run-pass/auxiliary/iss.rs index b231efa0fece4..cf32f6c2d5dc8 100644 --- a/src/test/run-pass/auxiliary/iss.rs +++ b/src/test/run-pass/auxiliary/iss.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name="issue6919_3"] // part of issue-6919.rs diff --git a/src/test/run-pass/auxiliary/issue-10028.rs b/src/test/run-pass/auxiliary/issue-10028.rs index ed42ad6e87527..135f26f40479c 100644 --- a/src/test/run-pass/auxiliary/issue-10028.rs +++ b/src/test/run-pass/auxiliary/issue-10028.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct ZeroLengthThingWithDestructor; impl Drop for ZeroLengthThingWithDestructor { fn drop(&mut self) {} diff --git a/src/test/run-pass/auxiliary/issue-11224.rs b/src/test/run-pass/auxiliary/issue-11224.rs index 15b72b37781e7..63543621a80d8 100644 --- a/src/test/run-pass/auxiliary/issue-11224.rs +++ b/src/test/run-pass/auxiliary/issue-11224.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(dead_code)] mod inner { diff --git a/src/test/run-pass/auxiliary/issue-11225-1.rs b/src/test/run-pass/auxiliary/issue-11225-1.rs index e1ec15be9279f..2c6f899a0f49a 100644 --- a/src/test/run-pass/auxiliary/issue-11225-1.rs +++ b/src/test/run-pass/auxiliary/issue-11225-1.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod inner { pub trait Trait { fn f(&self) { f(); } diff --git a/src/test/run-pass/auxiliary/issue-11225-2.rs b/src/test/run-pass/auxiliary/issue-11225-2.rs index 25110edda2706..4381f0a4edf18 100644 --- a/src/test/run-pass/auxiliary/issue-11225-2.rs +++ b/src/test/run-pass/auxiliary/issue-11225-2.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use inner::Trait; mod inner { diff --git a/src/test/run-pass/auxiliary/issue-11225-3.rs b/src/test/run-pass/auxiliary/issue-11225-3.rs index d48fb68ba0ffd..266e42a10b58d 100644 --- a/src/test/run-pass/auxiliary/issue-11225-3.rs +++ b/src/test/run-pass/auxiliary/issue-11225-3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait PrivateTrait { fn private_trait_method(&self); fn private_trait_method_ufcs(&self); diff --git a/src/test/run-pass/auxiliary/issue-11508.rs b/src/test/run-pass/auxiliary/issue-11508.rs index c5dc3439f2f8d..16bfc65c2b576 100644 --- a/src/test/run-pass/auxiliary/issue-11508.rs +++ b/src/test/run-pass/auxiliary/issue-11508.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Closed01(pub F); pub trait Bar { fn new() -> Self; } diff --git a/src/test/run-pass/auxiliary/issue-11529.rs b/src/test/run-pass/auxiliary/issue-11529.rs index 21ef99e3c3d95..dd3ef4387057d 100644 --- a/src/test/run-pass/auxiliary/issue-11529.rs +++ b/src/test/run-pass/auxiliary/issue-11529.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct A<'a>(pub &'a isize); diff --git a/src/test/run-pass/auxiliary/issue-12133-dylib.rs b/src/test/run-pass/auxiliary/issue-12133-dylib.rs index ea22258f67d6b..8bd2b3353b8f3 100644 --- a/src/test/run-pass/auxiliary/issue-12133-dylib.rs +++ b/src/test/run-pass/auxiliary/issue-12133-dylib.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "dylib"] diff --git a/src/test/run-pass/auxiliary/issue-12133-dylib2.rs b/src/test/run-pass/auxiliary/issue-12133-dylib2.rs index fa5722ae6a31b..30de740060001 100644 --- a/src/test/run-pass/auxiliary/issue-12133-dylib2.rs +++ b/src/test/run-pass/auxiliary/issue-12133-dylib2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "dylib"] diff --git a/src/test/run-pass/auxiliary/issue-12133-rlib.rs b/src/test/run-pass/auxiliary/issue-12133-rlib.rs index 8e46acca1244f..39c261e1162f1 100644 --- a/src/test/run-pass/auxiliary/issue-12133-rlib.rs +++ b/src/test/run-pass/auxiliary/issue-12133-rlib.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "rlib"] diff --git a/src/test/run-pass/auxiliary/issue-12660-aux.rs b/src/test/run-pass/auxiliary/issue-12660-aux.rs index 9f2bd5d0e9392..6dea8662dfec9 100644 --- a/src/test/run-pass/auxiliary/issue-12660-aux.rs +++ b/src/test/run-pass/auxiliary/issue-12660-aux.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="lib"] #![crate_name="issue12660aux"] diff --git a/src/test/run-pass/auxiliary/issue-13620-1.rs b/src/test/run-pass/auxiliary/issue-13620-1.rs index e373421fabfac..1442c0cc7aab3 100644 --- a/src/test/run-pass/auxiliary/issue-13620-1.rs +++ b/src/test/run-pass/auxiliary/issue-13620-1.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Foo { pub foo: extern fn() } diff --git a/src/test/run-pass/auxiliary/issue-13620-2.rs b/src/test/run-pass/auxiliary/issue-13620-2.rs index 554170bc13037..7efd24407ba9c 100644 --- a/src/test/run-pass/auxiliary/issue-13620-2.rs +++ b/src/test/run-pass/auxiliary/issue-13620-2.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate issue_13620_1 as crate1; pub static FOO2: crate1::Foo = crate1::FOO; diff --git a/src/test/run-pass/auxiliary/issue-13872-1.rs b/src/test/run-pass/auxiliary/issue-13872-1.rs index 941b67eb2da6c..fa9258834c771 100644 --- a/src/test/run-pass/auxiliary/issue-13872-1.rs +++ b/src/test/run-pass/auxiliary/issue-13872-1.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub enum A { B } diff --git a/src/test/run-pass/auxiliary/issue-13872-2.rs b/src/test/run-pass/auxiliary/issue-13872-2.rs index bb51417528aef..8c64f16e3f938 100644 --- a/src/test/run-pass/auxiliary/issue-13872-2.rs +++ b/src/test/run-pass/auxiliary/issue-13872-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate issue_13872_1 as foo; pub use foo::A::B; diff --git a/src/test/run-pass/auxiliary/issue-13872-3.rs b/src/test/run-pass/auxiliary/issue-13872-3.rs index e20618f1ec076..d31d52eb8478a 100644 --- a/src/test/run-pass/auxiliary/issue-13872-3.rs +++ b/src/test/run-pass/auxiliary/issue-13872-3.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate issue_13872_2 as bar; use bar::B; diff --git a/src/test/run-pass/auxiliary/issue-14344-1.rs b/src/test/run-pass/auxiliary/issue-14344-1.rs index 78c03bac33f27..954a1e554dabd 100644 --- a/src/test/run-pass/auxiliary/issue-14344-1.rs +++ b/src/test/run-pass/auxiliary/issue-14344-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "rlib"] diff --git a/src/test/run-pass/auxiliary/issue-14344-2.rs b/src/test/run-pass/auxiliary/issue-14344-2.rs index 9df35e50adba9..c47b8c0ea6c79 100644 --- a/src/test/run-pass/auxiliary/issue-14344-2.rs +++ b/src/test/run-pass/auxiliary/issue-14344-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate issue_14344_1; pub fn bar() {} diff --git a/src/test/run-pass/auxiliary/issue-14421.rs b/src/test/run-pass/auxiliary/issue-14421.rs index a48088609f982..5fe4b24cf1708 100644 --- a/src/test/run-pass/auxiliary/issue-14421.rs +++ b/src/test/run-pass/auxiliary/issue-14421.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="lib"] #![deny(warnings)] #![allow(dead_code)] diff --git a/src/test/run-pass/auxiliary/issue-14422.rs b/src/test/run-pass/auxiliary/issue-14422.rs index 32af6d9255e5b..a6026c1d03fd5 100644 --- a/src/test/run-pass/auxiliary/issue-14422.rs +++ b/src/test/run-pass/auxiliary/issue-14422.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="lib"] #![deny(warnings)] diff --git a/src/test/run-pass/auxiliary/issue-15562.rs b/src/test/run-pass/auxiliary/issue-15562.rs index 76243d3bcedb0..d5afaaa5622aa 100644 --- a/src/test/run-pass/auxiliary/issue-15562.rs +++ b/src/test/run-pass/auxiliary/issue-15562.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] extern { diff --git a/src/test/run-pass/auxiliary/issue-16643.rs b/src/test/run-pass/auxiliary/issue-16643.rs index b590160a0c2ab..7808e0119f69f 100644 --- a/src/test/run-pass/auxiliary/issue-16643.rs +++ b/src/test/run-pass/auxiliary/issue-16643.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] pub struct TreeBuilder { pub h: H } diff --git a/src/test/run-pass/auxiliary/issue-17662.rs b/src/test/run-pass/auxiliary/issue-17662.rs index fb55a077005eb..75efe110cdfd9 100644 --- a/src/test/run-pass/auxiliary/issue-17662.rs +++ b/src/test/run-pass/auxiliary/issue-17662.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] pub trait Foo<'a, T> { diff --git a/src/test/run-pass/auxiliary/issue-17718-aux.rs b/src/test/run-pass/auxiliary/issue-17718-aux.rs index 2bc8b4b7ba032..1cba9709f9116 100644 --- a/src/test/run-pass/auxiliary/issue-17718-aux.rs +++ b/src/test/run-pass/auxiliary/issue-17718-aux.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::sync::atomic; pub const C1: usize = 1; diff --git a/src/test/run-pass/auxiliary/issue-18501.rs b/src/test/run-pass/auxiliary/issue-18501.rs index af3bc20378c39..dd914b464fa58 100644 --- a/src/test/run-pass/auxiliary/issue-18501.rs +++ b/src/test/run-pass/auxiliary/issue-18501.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] struct Foo; diff --git a/src/test/run-pass/auxiliary/issue-18514.rs b/src/test/run-pass/auxiliary/issue-18514.rs index 2a5e07a32855e..20c8e60ee4573 100644 --- a/src/test/run-pass/auxiliary/issue-18514.rs +++ b/src/test/run-pass/auxiliary/issue-18514.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] pub trait Tr { diff --git a/src/test/run-pass/auxiliary/issue-18711.rs b/src/test/run-pass/auxiliary/issue-18711.rs index c247c0223fcbf..5cb1f9c43718e 100644 --- a/src/test/run-pass/auxiliary/issue-18711.rs +++ b/src/test/run-pass/auxiliary/issue-18711.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] pub fn inner(f: F) -> F { diff --git a/src/test/run-pass/auxiliary/issue-18913-1.rs b/src/test/run-pass/auxiliary/issue-18913-1.rs index 4315e27797f1e..053c5ada5eeff 100644 --- a/src/test/run-pass/auxiliary/issue-18913-1.rs +++ b/src/test/run-pass/auxiliary/issue-18913-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "rlib"] diff --git a/src/test/run-pass/auxiliary/issue-18913-2.rs b/src/test/run-pass/auxiliary/issue-18913-2.rs index dcdeaec48f552..54747b45f523e 100644 --- a/src/test/run-pass/auxiliary/issue-18913-2.rs +++ b/src/test/run-pass/auxiliary/issue-18913-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "rlib"] diff --git a/src/test/run-pass/auxiliary/issue-19340-1.rs b/src/test/run-pass/auxiliary/issue-19340-1.rs index fc61b78d8a7ee..39ee36b8b915c 100644 --- a/src/test/run-pass/auxiliary/issue-19340-1.rs +++ b/src/test/run-pass/auxiliary/issue-19340-1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub enum Homura { Madoka { name: String }, } diff --git a/src/test/run-pass/auxiliary/issue-2380.rs b/src/test/run-pass/auxiliary/issue-2380.rs index b3e0f06148593..9a51a73c9a37b 100644 --- a/src/test/run-pass/auxiliary/issue-2380.rs +++ b/src/test/run-pass/auxiliary/issue-2380.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name="a"] #![crate_type = "lib"] diff --git a/src/test/run-pass/auxiliary/issue-2414-a.rs b/src/test/run-pass/auxiliary/issue-2414-a.rs index 8c414193bd628..b90ab32ddc4ad 100644 --- a/src/test/run-pass/auxiliary/issue-2414-a.rs +++ b/src/test/run-pass/auxiliary/issue-2414-a.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name="a"] #![crate_type = "lib"] diff --git a/src/test/run-pass/auxiliary/issue-2414-b.rs b/src/test/run-pass/auxiliary/issue-2414-b.rs index b1c95bcb4300f..fc018349d80f1 100644 --- a/src/test/run-pass/auxiliary/issue-2414-b.rs +++ b/src/test/run-pass/auxiliary/issue-2414-b.rs @@ -1,14 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![crate_name="b"] #![crate_type = "lib"] diff --git a/src/test/run-pass/auxiliary/issue-25185-1.rs b/src/test/run-pass/auxiliary/issue-25185-1.rs index b9da39cbbcb4e..77a4787ba943d 100644 --- a/src/test/run-pass/auxiliary/issue-25185-1.rs +++ b/src/test/run-pass/auxiliary/issue-25185-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "rlib"] diff --git a/src/test/run-pass/auxiliary/issue-25185-2.rs b/src/test/run-pass/auxiliary/issue-25185-2.rs index 00b5277d6c00e..7ce3df255a331 100644 --- a/src/test/run-pass/auxiliary/issue-25185-2.rs +++ b/src/test/run-pass/auxiliary/issue-25185-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate issue_25185_1; pub use issue_25185_1::rust_dbg_extern_identity_u32; diff --git a/src/test/run-pass/auxiliary/issue-2526.rs b/src/test/run-pass/auxiliary/issue-2526.rs index 3d777d01d5027..3b27f658cdae5 100644 --- a/src/test/run-pass/auxiliary/issue-2526.rs +++ b/src/test/run-pass/auxiliary/issue-2526.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name="issue_2526"] #![crate_type = "lib"] diff --git a/src/test/run-pass/auxiliary/issue-25467.rs b/src/test/run-pass/auxiliary/issue-25467.rs index e358cde15737d..ca9b3097c830f 100644 --- a/src/test/run-pass/auxiliary/issue-25467.rs +++ b/src/test/run-pass/auxiliary/issue-25467.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="lib"] pub trait Trait { diff --git a/src/test/run-pass/auxiliary/issue-2631-a.rs b/src/test/run-pass/auxiliary/issue-2631-a.rs index 604a3e69a2176..1e8211bfaa783 100644 --- a/src/test/run-pass/auxiliary/issue-2631-a.rs +++ b/src/test/run-pass/auxiliary/issue-2631-a.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name="req"] #![crate_type = "lib"] diff --git a/src/test/run-pass/auxiliary/issue-29485.rs b/src/test/run-pass/auxiliary/issue-29485.rs index 825c449702154..1e8891c51206f 100644 --- a/src/test/run-pass/auxiliary/issue-29485.rs +++ b/src/test/run-pass/auxiliary/issue-29485.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name="a"] #![crate_type = "lib"] diff --git a/src/test/run-pass/auxiliary/issue-3012-1.rs b/src/test/run-pass/auxiliary/issue-3012-1.rs index f34a97519e77d..509af2a8d7df3 100644 --- a/src/test/run-pass/auxiliary/issue-3012-1.rs +++ b/src/test/run-pass/auxiliary/issue-3012-1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name="socketlib"] #![crate_type = "lib"] diff --git a/src/test/run-pass/auxiliary/issue-31702-1.rs b/src/test/run-pass/auxiliary/issue-31702-1.rs index 50a31630df318..a48d0dc2c6447 100644 --- a/src/test/run-pass/auxiliary/issue-31702-1.rs +++ b/src/test/run-pass/auxiliary/issue-31702-1.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Copy)] pub struct U256(pub [u64; 4]); diff --git a/src/test/run-pass/auxiliary/issue-31702-2.rs b/src/test/run-pass/auxiliary/issue-31702-2.rs index c5b1bc6dfb08d..8099ed2a6dfc5 100644 --- a/src/test/run-pass/auxiliary/issue-31702-2.rs +++ b/src/test/run-pass/auxiliary/issue-31702-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -g extern crate issue_31702_1; diff --git a/src/test/run-pass/auxiliary/issue-36954.rs b/src/test/run-pass/auxiliary/issue-36954.rs index 832ee1d7c1b45..ea716a160c3a5 100644 --- a/src/test/run-pass/auxiliary/issue-36954.rs +++ b/src/test/run-pass/auxiliary/issue-36954.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_fn)] #![crate_type = "lib"] diff --git a/src/test/run-pass/auxiliary/issue-41394.rs b/src/test/run-pass/auxiliary/issue-41394.rs index f06b81279ac41..2e650efc7147d 100644 --- a/src/test/run-pass/auxiliary/issue-41394.rs +++ b/src/test/run-pass/auxiliary/issue-41394.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] #[repr(u32)] diff --git a/src/test/run-pass/auxiliary/issue-4208-cc.rs b/src/test/run-pass/auxiliary/issue-4208-cc.rs index a7c1633784d81..7b4c8b01a9e2f 100644 --- a/src/test/run-pass/auxiliary/issue-4208-cc.rs +++ b/src/test/run-pass/auxiliary/issue-4208-cc.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name="numeric"] #![crate_type = "lib"] diff --git a/src/test/run-pass/auxiliary/issue-4545.rs b/src/test/run-pass/auxiliary/issue-4545.rs index 29feeaa7d9285..2f60947507541 100644 --- a/src/test/run-pass/auxiliary/issue-4545.rs +++ b/src/test/run-pass/auxiliary/issue-4545.rs @@ -1,12 +1,2 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct S(Option); pub fn mk() -> S { S(None) } diff --git a/src/test/run-pass/auxiliary/issue-48984-aux.rs b/src/test/run-pass/auxiliary/issue-48984-aux.rs index 6290279701e69..7cc888cd4cb29 100644 --- a/src/test/run-pass/auxiliary/issue-48984-aux.rs +++ b/src/test/run-pass/auxiliary/issue-48984-aux.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] #![crate_name = "issue48984aux"] diff --git a/src/test/run-pass/auxiliary/issue-5518.rs b/src/test/run-pass/auxiliary/issue-5518.rs index cea227e050f83..bfe96552a5c92 100644 --- a/src/test/run-pass/auxiliary/issue-5518.rs +++ b/src/test/run-pass/auxiliary/issue-5518.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait A<'a, T> { fn f(&mut self) -> &'a mut T; fn p() -> T; diff --git a/src/test/run-pass/auxiliary/issue-5521.rs b/src/test/run-pass/auxiliary/issue-5521.rs index 82bd2b6420437..c2f81779b359d 100644 --- a/src/test/run-pass/auxiliary/issue-5521.rs +++ b/src/test/run-pass/auxiliary/issue-5521.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::collections::HashMap; pub type map = Box>; diff --git a/src/test/run-pass/auxiliary/issue-7178.rs b/src/test/run-pass/auxiliary/issue-7178.rs index 18b464bd924e9..56ae5139af44c 100644 --- a/src/test/run-pass/auxiliary/issue-7178.rs +++ b/src/test/run-pass/auxiliary/issue-7178.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Foo<'a, A:'a>(&'a A); impl<'a, A> Foo<'a, A> { diff --git a/src/test/run-pass/auxiliary/issue-7899.rs b/src/test/run-pass/auxiliary/issue-7899.rs index e197e84442b10..3af6e871661ba 100644 --- a/src/test/run-pass/auxiliary/issue-7899.rs +++ b/src/test/run-pass/auxiliary/issue-7899.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct V2(pub T, pub T); diff --git a/src/test/run-pass/auxiliary/issue-8044.rs b/src/test/run-pass/auxiliary/issue-8044.rs index 8f328699ae0aa..2ec25f51cde87 100644 --- a/src/test/run-pass/auxiliary/issue-8044.rs +++ b/src/test/run-pass/auxiliary/issue-8044.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct BTree { pub node: TreeItem, } diff --git a/src/test/run-pass/auxiliary/issue-8259.rs b/src/test/run-pass/auxiliary/issue-8259.rs index 91167e8e32b14..891aee099dc55 100644 --- a/src/test/run-pass/auxiliary/issue-8259.rs +++ b/src/test/run-pass/auxiliary/issue-8259.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub enum Foo<'a> { A, B(&'a str), diff --git a/src/test/run-pass/auxiliary/issue-9906.rs b/src/test/run-pass/auxiliary/issue-9906.rs index 5eb48985bf90d..8a3eea790a26a 100644 --- a/src/test/run-pass/auxiliary/issue-9906.rs +++ b/src/test/run-pass/auxiliary/issue-9906.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub use other::FooBar; pub use other::foo; diff --git a/src/test/run-pass/auxiliary/issue-9968.rs b/src/test/run-pass/auxiliary/issue-9968.rs index d04d761e11256..8d795b59ea8be 100644 --- a/src/test/run-pass/auxiliary/issue-9968.rs +++ b/src/test/run-pass/auxiliary/issue-9968.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub use internal::core::{Trait, Struct}; mod internal { diff --git a/src/test/run-pass/auxiliary/issue13507.rs b/src/test/run-pass/auxiliary/issue13507.rs index 87b01ed990036..c91013043eb77 100644 --- a/src/test/run-pass/auxiliary/issue13507.rs +++ b/src/test/run-pass/auxiliary/issue13507.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod testtypes { use std::any::TypeId; diff --git a/src/test/run-pass/auxiliary/issue2170lib.rs b/src/test/run-pass/auxiliary/issue2170lib.rs index b311ee3567467..a99385a834dfb 100644 --- a/src/test/run-pass/auxiliary/issue2170lib.rs +++ b/src/test/run-pass/auxiliary/issue2170lib.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo(_x: i32) { } diff --git a/src/test/run-pass/auxiliary/issue34796aux.rs b/src/test/run-pass/auxiliary/issue34796aux.rs index 9131b609c4ce1..09c69b90329ff 100644 --- a/src/test/run-pass/auxiliary/issue34796aux.rs +++ b/src/test/run-pass/auxiliary/issue34796aux.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] pub trait Future { type Item; diff --git a/src/test/run-pass/auxiliary/issue_10031_aux.rs b/src/test/run-pass/auxiliary/issue_10031_aux.rs index f0f1af2e3a3da..e2abeb99ea829 100644 --- a/src/test/run-pass/auxiliary/issue_10031_aux.rs +++ b/src/test/run-pass/auxiliary/issue_10031_aux.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Wrap(pub A); diff --git a/src/test/run-pass/auxiliary/issue_12612_1.rs b/src/test/run-pass/auxiliary/issue_12612_1.rs index a0234c1185a97..01f5a784bb79c 100644 --- a/src/test/run-pass/auxiliary/issue_12612_1.rs +++ b/src/test/run-pass/auxiliary/issue_12612_1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod bar { pub fn foo() {} } diff --git a/src/test/run-pass/auxiliary/issue_12612_2.rs b/src/test/run-pass/auxiliary/issue_12612_2.rs index b4ae4374b2e58..2c7247871936f 100644 --- a/src/test/run-pass/auxiliary/issue_12612_2.rs +++ b/src/test/run-pass/auxiliary/issue_12612_2.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn baz() {} diff --git a/src/test/run-pass/auxiliary/issue_19293.rs b/src/test/run-pass/auxiliary/issue_19293.rs index 12894ad72e1a4..31359e86559dd 100644 --- a/src/test/run-pass/auxiliary/issue_19293.rs +++ b/src/test/run-pass/auxiliary/issue_19293.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Foo (pub isize); pub enum MyEnum { Foo(Foo), diff --git a/src/test/run-pass/auxiliary/issue_20389.rs b/src/test/run-pass/auxiliary/issue_20389.rs index 4ce7e3079e330..ae6d44eeb7703 100644 --- a/src/test/run-pass/auxiliary/issue_20389.rs +++ b/src/test/run-pass/auxiliary/issue_20389.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait T { type C; fn dummy(&self) { } diff --git a/src/test/run-pass/auxiliary/issue_2316_a.rs b/src/test/run-pass/auxiliary/issue_2316_a.rs index 6bd1e7335ad3a..418ddc0b06926 100644 --- a/src/test/run-pass/auxiliary/issue_2316_a.rs +++ b/src/test/run-pass/auxiliary/issue_2316_a.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum cat { tabby, calico, tortoiseshell } diff --git a/src/test/run-pass/auxiliary/issue_2316_b.rs b/src/test/run-pass/auxiliary/issue_2316_b.rs index 8a212f6e5a9c5..550c2d6eb226d 100644 --- a/src/test/run-pass/auxiliary/issue_2316_b.rs +++ b/src/test/run-pass/auxiliary/issue_2316_b.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_imports)] extern crate issue_2316_a; diff --git a/src/test/run-pass/auxiliary/issue_2472_b.rs b/src/test/run-pass/auxiliary/issue_2472_b.rs index 5f55476427fe2..0d151520fe079 100644 --- a/src/test/run-pass/auxiliary/issue_2472_b.rs +++ b/src/test/run-pass/auxiliary/issue_2472_b.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub struct S(pub ()); impl S { diff --git a/src/test/run-pass/auxiliary/issue_2723_a.rs b/src/test/run-pass/auxiliary/issue_2723_a.rs index 44bea136a7c3b..661b46d829dfe 100644 --- a/src/test/run-pass/auxiliary/issue_2723_a.rs +++ b/src/test/run-pass/auxiliary/issue_2723_a.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub unsafe fn f(xs: Vec ) { xs.iter().map(|_x| { unsafe fn q() { panic!(); } }).collect::>(); } diff --git a/src/test/run-pass/auxiliary/issue_3136_a.rs b/src/test/run-pass/auxiliary/issue_3136_a.rs index 55de208cc905a..9bb546ab393b1 100644 --- a/src/test/run-pass/auxiliary/issue_3136_a.rs +++ b/src/test/run-pass/auxiliary/issue_3136_a.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait x { fn use_x(&self); } diff --git a/src/test/run-pass/auxiliary/issue_38190.rs b/src/test/run-pass/auxiliary/issue_38190.rs index 7fc4390d6dcfb..373e646ba2c39 100644 --- a/src/test/run-pass/auxiliary/issue_38190.rs +++ b/src/test/run-pass/auxiliary/issue_38190.rs @@ -1,12 +1,2 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_export] macro_rules! m { ([$i:item]) => {} } diff --git a/src/test/run-pass/auxiliary/issue_38226_aux.rs b/src/test/run-pass/auxiliary/issue_38226_aux.rs index d48a973368501..f968017199f50 100644 --- a/src/test/run-pass/auxiliary/issue_38226_aux.rs +++ b/src/test/run-pass/auxiliary/issue_38226_aux.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="rlib"] #[inline(never)] diff --git a/src/test/run-pass/auxiliary/issue_38715-modern.rs b/src/test/run-pass/auxiliary/issue_38715-modern.rs index 7f14b2c4659c6..15d072957cbd8 100644 --- a/src/test/run-pass/auxiliary/issue_38715-modern.rs +++ b/src/test/run-pass/auxiliary/issue_38715-modern.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(duplicate_macro_exports)] #[macro_export] diff --git a/src/test/run-pass/auxiliary/issue_38715.rs b/src/test/run-pass/auxiliary/issue_38715.rs index cf4fee0e515c9..5c15073f5a5e6 100644 --- a/src/test/run-pass/auxiliary/issue_38715.rs +++ b/src/test/run-pass/auxiliary/issue_38715.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(duplicate_macro_exports)] #[macro_export] diff --git a/src/test/run-pass/auxiliary/issue_3979_traits.rs b/src/test/run-pass/auxiliary/issue_3979_traits.rs index 46035731c30a1..5d03a0e9e9931 100644 --- a/src/test/run-pass/auxiliary/issue_3979_traits.rs +++ b/src/test/run-pass/auxiliary/issue_3979_traits.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name="issue_3979_traits"] #![crate_type = "lib"] diff --git a/src/test/run-pass/auxiliary/issue_39823.rs b/src/test/run-pass/auxiliary/issue_39823.rs index 5342601ac14ff..3af9c68f2331d 100644 --- a/src/test/run-pass/auxiliary/issue_39823.rs +++ b/src/test/run-pass/auxiliary/issue_39823.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="rlib"] #[derive(Debug, PartialEq)] diff --git a/src/test/run-pass/auxiliary/issue_40469.rs b/src/test/run-pass/auxiliary/issue_40469.rs index 4970bba431a84..4f2f41f2cde64 100644 --- a/src/test/run-pass/auxiliary/issue_40469.rs +++ b/src/test/run-pass/auxiliary/issue_40469.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! m { () => { $crate::main(); } } diff --git a/src/test/run-pass/auxiliary/issue_41053.rs b/src/test/run-pass/auxiliary/issue_41053.rs index 68e92b104298c..ae73c3e780fb3 100644 --- a/src/test/run-pass/auxiliary/issue_41053.rs +++ b/src/test/run-pass/auxiliary/issue_41053.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Test; diff --git a/src/test/run-pass/auxiliary/issue_42007_s.rs b/src/test/run-pass/auxiliary/issue_42007_s.rs index 91ad9869ed856..95119a589c99d 100644 --- a/src/test/run-pass/auxiliary/issue_42007_s.rs +++ b/src/test/run-pass/auxiliary/issue_42007_s.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[repr(u8)] pub enum E { B = 1 as u8, diff --git a/src/test/run-pass/auxiliary/issue_8401.rs b/src/test/run-pass/auxiliary/issue_8401.rs index 40e01c1474a60..e35dbbfabfcdd 100644 --- a/src/test/run-pass/auxiliary/issue_8401.rs +++ b/src/test/run-pass/auxiliary/issue_8401.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // for this issue, this code must be built in a library use std::mem; diff --git a/src/test/run-pass/auxiliary/issue_9123.rs b/src/test/run-pass/auxiliary/issue_9123.rs index 8c2546e76cfd4..60af53359e8ad 100644 --- a/src/test/run-pass/auxiliary/issue_9123.rs +++ b/src/test/run-pass/auxiliary/issue_9123.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] pub trait X { diff --git a/src/test/run-pass/auxiliary/issue_9155.rs b/src/test/run-pass/auxiliary/issue_9155.rs index 486eb8fd6f6b8..049a96a655a3a 100644 --- a/src/test/run-pass/auxiliary/issue_9155.rs +++ b/src/test/run-pass/auxiliary/issue_9155.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Foo(T); impl Foo { diff --git a/src/test/run-pass/auxiliary/issue_9188.rs b/src/test/run-pass/auxiliary/issue_9188.rs index 8ff85cc359d4f..3bc5697a1a689 100644 --- a/src/test/run-pass/auxiliary/issue_9188.rs +++ b/src/test/run-pass/auxiliary/issue_9188.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn foo() -> &'static isize { if false { static a: isize = 4; diff --git a/src/test/run-pass/auxiliary/kinds_in_metadata.rs b/src/test/run-pass/auxiliary/kinds_in_metadata.rs index 82f182c04bd38..2a2106ff70ac6 100644 --- a/src/test/run-pass/auxiliary/kinds_in_metadata.rs +++ b/src/test/run-pass/auxiliary/kinds_in_metadata.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ diff --git a/src/test/run-pass/auxiliary/link-cfg-works-transitive-dylib.rs b/src/test/run-pass/auxiliary/link-cfg-works-transitive-dylib.rs index d41fd490f58e2..fa4f33bcef669 100644 --- a/src/test/run-pass/auxiliary/link-cfg-works-transitive-dylib.rs +++ b/src/test/run-pass/auxiliary/link-cfg-works-transitive-dylib.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(link_cfg)] #[link(name = "foo", cfg(foo))] diff --git a/src/test/run-pass/auxiliary/link-cfg-works-transitive-rlib.rs b/src/test/run-pass/auxiliary/link-cfg-works-transitive-rlib.rs index 9f096c351fbe3..b365ed9173251 100644 --- a/src/test/run-pass/auxiliary/link-cfg-works-transitive-rlib.rs +++ b/src/test/run-pass/auxiliary/link-cfg-works-transitive-rlib.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![feature(link_cfg)] diff --git a/src/test/run-pass/auxiliary/linkage1.rs b/src/test/run-pass/auxiliary/linkage1.rs index ca4046d81636a..e87ce5e4d3181 100644 --- a/src/test/run-pass/auxiliary/linkage1.rs +++ b/src/test/run-pass/auxiliary/linkage1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[no_mangle] pub static foo: isize = 3; diff --git a/src/test/run-pass/auxiliary/llvm_pr32379.rs b/src/test/run-pass/auxiliary/llvm_pr32379.rs index a7b15bda33627..8e42976709519 100644 --- a/src/test/run-pass/auxiliary/llvm_pr32379.rs +++ b/src/test/run-pass/auxiliary/llvm_pr32379.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn pr32379(mut data: u64, f1: bool, f2: bool) -> u64 { if f1 { data &= !2; } if f2 { data |= 2; } diff --git a/src/test/run-pass/auxiliary/macro-comma-support.rs b/src/test/run-pass/auxiliary/macro-comma-support.rs index 6eafd520a726b..6a452c185a8c9 100644 --- a/src/test/run-pass/auxiliary/macro-comma-support.rs +++ b/src/test/run-pass/auxiliary/macro-comma-support.rs @@ -1,11 +1 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - () diff --git a/src/test/run-pass/auxiliary/macro-include-items-expr.rs b/src/test/run-pass/auxiliary/macro-include-items-expr.rs index aea3c749930b6..7394f194b80ea 100644 --- a/src/test/run-pass/auxiliary/macro-include-items-expr.rs +++ b/src/test/run-pass/auxiliary/macro-include-items-expr.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-test: this is not a test 1 diff --git a/src/test/run-pass/auxiliary/macro-include-items-item.rs b/src/test/run-pass/auxiliary/macro-include-items-item.rs index da72aaef80591..7d54745e03bff 100644 --- a/src/test/run-pass/auxiliary/macro-include-items-item.rs +++ b/src/test/run-pass/auxiliary/macro-include-items-item.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-test: this is not a test fn foo() { bar() } diff --git a/src/test/run-pass/auxiliary/macro_crate_def_only.rs b/src/test/run-pass/auxiliary/macro_crate_def_only.rs index 4f55ac4f65fd4..c267eefde02c5 100644 --- a/src/test/run-pass/auxiliary/macro_crate_def_only.rs +++ b/src/test/run-pass/auxiliary/macro_crate_def_only.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_export] macro_rules! make_a_5 { () => (5) diff --git a/src/test/run-pass/auxiliary/macro_crate_nonterminal.rs b/src/test/run-pass/auxiliary/macro_crate_nonterminal.rs index 4f75e2b5d7565..2e2440462ae4e 100644 --- a/src/test/run-pass/auxiliary/macro_crate_nonterminal.rs +++ b/src/test/run-pass/auxiliary/macro_crate_nonterminal.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn increment(x: usize) -> usize { x + 1 } diff --git a/src/test/run-pass/auxiliary/macro_export_inner_module.rs b/src/test/run-pass/auxiliary/macro_export_inner_module.rs index 84e944f69b98e..d71af9ee6f278 100644 --- a/src/test/run-pass/auxiliary/macro_export_inner_module.rs +++ b/src/test/run-pass/auxiliary/macro_export_inner_module.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod inner { #[macro_export] macro_rules! foo { diff --git a/src/test/run-pass/auxiliary/macro_with_super_1.rs b/src/test/run-pass/auxiliary/macro_with_super_1.rs index fd2e52bb35503..b015500df06a9 100644 --- a/src/test/run-pass/auxiliary/macro_with_super_1.rs +++ b/src/test/run-pass/auxiliary/macro_with_super_1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] #[macro_export] diff --git a/src/test/run-pass/auxiliary/method_self_arg1.rs b/src/test/run-pass/auxiliary/method_self_arg1.rs index 785a8b0566431..8258fdd9ab93a 100644 --- a/src/test/run-pass/auxiliary/method_self_arg1.rs +++ b/src/test/run-pass/auxiliary/method_self_arg1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] #![feature(box_syntax)] diff --git a/src/test/run-pass/auxiliary/method_self_arg2.rs b/src/test/run-pass/auxiliary/method_self_arg2.rs index 3761d58087e0d..94a4a016c3eca 100644 --- a/src/test/run-pass/auxiliary/method_self_arg2.rs +++ b/src/test/run-pass/auxiliary/method_self_arg2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] #![feature(box_syntax)] diff --git a/src/test/run-pass/auxiliary/mir_external_refs.rs b/src/test/run-pass/auxiliary/mir_external_refs.rs index 4cad98004d7e4..9fd58f1d71437 100644 --- a/src/test/run-pass/auxiliary/mir_external_refs.rs +++ b/src/test/run-pass/auxiliary/mir_external_refs.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub struct S(pub u8); impl S { diff --git a/src/test/run-pass/auxiliary/moves_based_on_type_lib.rs b/src/test/run-pass/auxiliary/moves_based_on_type_lib.rs index f95be3f4a1d05..7e7e3b860242e 100644 --- a/src/test/run-pass/auxiliary/moves_based_on_type_lib.rs +++ b/src/test/run-pass/auxiliary/moves_based_on_type_lib.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="lib"] pub struct S { diff --git a/src/test/run-pass/auxiliary/msvc-data-only-lib.rs b/src/test/run-pass/auxiliary/msvc-data-only-lib.rs index 71fb9a519489b..ccaa6d8edcf9a 100644 --- a/src/test/run-pass/auxiliary/msvc-data-only-lib.rs +++ b/src/test/run-pass/auxiliary/msvc-data-only-lib.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "rlib"] diff --git a/src/test/run-pass/auxiliary/namespaced_enum_emulate_flat.rs b/src/test/run-pass/auxiliary/namespaced_enum_emulate_flat.rs index b7bde4a74a553..55e6b34aca770 100644 --- a/src/test/run-pass/auxiliary/namespaced_enum_emulate_flat.rs +++ b/src/test/run-pass/auxiliary/namespaced_enum_emulate_flat.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub use Foo::*; pub enum Foo { diff --git a/src/test/run-pass/auxiliary/namespaced_enums.rs b/src/test/run-pass/auxiliary/namespaced_enums.rs index 3bf39b788db6e..d3548c76cf2a6 100644 --- a/src/test/run-pass/auxiliary/namespaced_enums.rs +++ b/src/test/run-pass/auxiliary/namespaced_enums.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub enum Foo { A, B(isize), diff --git a/src/test/run-pass/auxiliary/nested_item.rs b/src/test/run-pass/auxiliary/nested_item.rs index 63639c4cdb3c9..9db9d19d6f610 100644 --- a/src/test/run-pass/auxiliary/nested_item.rs +++ b/src/test/run-pass/auxiliary/nested_item.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // original problem pub fn foo() -> isize { { diff --git a/src/test/run-pass/auxiliary/newtype_struct_xc.rs b/src/test/run-pass/auxiliary/newtype_struct_xc.rs index be3414b7ad2c0..9d1e0742e3c9e 100644 --- a/src/test/run-pass/auxiliary/newtype_struct_xc.rs +++ b/src/test/run-pass/auxiliary/newtype_struct_xc.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="lib"] pub struct Au(pub isize); diff --git a/src/test/run-pass/auxiliary/overloaded_autoderef_xc.rs b/src/test/run-pass/auxiliary/overloaded_autoderef_xc.rs index 3c8cba13ae73d..112455f91f912 100644 --- a/src/test/run-pass/auxiliary/overloaded_autoderef_xc.rs +++ b/src/test/run-pass/auxiliary/overloaded_autoderef_xc.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::Deref; struct DerefWithHelper { diff --git a/src/test/run-pass/auxiliary/packed.rs b/src/test/run-pass/auxiliary/packed.rs index 828be41cd4157..e95178fa0fa04 100644 --- a/src/test/run-pass/auxiliary/packed.rs +++ b/src/test/run-pass/auxiliary/packed.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(repr_packed)] #[repr(packed)] diff --git a/src/test/run-pass/auxiliary/priv-impl-prim-ty.rs b/src/test/run-pass/auxiliary/priv-impl-prim-ty.rs index 19cdede5518a4..8ccbd3f12bf8a 100644 --- a/src/test/run-pass/auxiliary/priv-impl-prim-ty.rs +++ b/src/test/run-pass/auxiliary/priv-impl-prim-ty.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait A { fn frob(&self); } diff --git a/src/test/run-pass/auxiliary/privacy_reexport.rs b/src/test/run-pass/auxiliary/privacy_reexport.rs index fd97f210a5514..6b72dbc92338d 100644 --- a/src/test/run-pass/auxiliary/privacy_reexport.rs +++ b/src/test/run-pass/auxiliary/privacy_reexport.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub extern crate core; pub use foo as bar; diff --git a/src/test/run-pass/auxiliary/pub_static_array.rs b/src/test/run-pass/auxiliary/pub_static_array.rs index 7248d0e543bdb..49cb76921add3 100644 --- a/src/test/run-pass/auxiliary/pub_static_array.rs +++ b/src/test/run-pass/auxiliary/pub_static_array.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub static ARRAY: [u8; 1] = [1]; diff --git a/src/test/run-pass/auxiliary/pub_use_mods_xcrate.rs b/src/test/run-pass/auxiliary/pub_use_mods_xcrate.rs index e4890f4fe2d87..74d3504d5beb2 100644 --- a/src/test/run-pass/auxiliary/pub_use_mods_xcrate.rs +++ b/src/test/run-pass/auxiliary/pub_use_mods_xcrate.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod a { pub use a::b::c; diff --git a/src/test/run-pass/auxiliary/pub_use_xcrate1.rs b/src/test/run-pass/auxiliary/pub_use_xcrate1.rs index 41aafd64cb3f4..772c9627a71ee 100644 --- a/src/test/run-pass/auxiliary/pub_use_xcrate1.rs +++ b/src/test/run-pass/auxiliary/pub_use_xcrate1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Foo { pub name: isize } diff --git a/src/test/run-pass/auxiliary/pub_use_xcrate2.rs b/src/test/run-pass/auxiliary/pub_use_xcrate2.rs index d59d7f2a6136c..20d7066d36da9 100644 --- a/src/test/run-pass/auxiliary/pub_use_xcrate2.rs +++ b/src/test/run-pass/auxiliary/pub_use_xcrate2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate pub_use_xcrate1; pub use pub_use_xcrate1::Foo; diff --git a/src/test/run-pass/auxiliary/reachable-unnameable-items.rs b/src/test/run-pass/auxiliary/reachable-unnameable-items.rs index 7ec2bb9394cc3..20f110b1a8cfd 100644 --- a/src/test/run-pass/auxiliary/reachable-unnameable-items.rs +++ b/src/test/run-pass/auxiliary/reachable-unnameable-items.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use inner_private_module::*; mod inner_private_module { diff --git a/src/test/run-pass/auxiliary/reexport-should-still-link.rs b/src/test/run-pass/auxiliary/reexport-should-still-link.rs index 9d5464e652651..237ea8dfcf3f8 100644 --- a/src/test/run-pass/auxiliary/reexport-should-still-link.rs +++ b/src/test/run-pass/auxiliary/reexport-should-still-link.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub use foo::bar; mod foo { diff --git a/src/test/run-pass/auxiliary/reexported_static_methods.rs b/src/test/run-pass/auxiliary/reexported_static_methods.rs index cc4db1a958169..cc961625f3237 100644 --- a/src/test/run-pass/auxiliary/reexported_static_methods.rs +++ b/src/test/run-pass/auxiliary/reexported_static_methods.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub use sub_foo::Foo; pub use self::Bar as Baz; pub use sub_foo::Boz; diff --git a/src/test/run-pass/auxiliary/rmeta_rlib.rs b/src/test/run-pass/auxiliary/rmeta_rlib.rs index 28c11315fa1cd..f5e8c3d2a5c87 100644 --- a/src/test/run-pass/auxiliary/rmeta_rlib.rs +++ b/src/test/run-pass/auxiliary/rmeta_rlib.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type="rlib"] diff --git a/src/test/run-pass/auxiliary/rmeta_rmeta.rs b/src/test/run-pass/auxiliary/rmeta_rmeta.rs index c3cfe89ee5c3e..4a6d055a81fab 100644 --- a/src/test/run-pass/auxiliary/rmeta_rmeta.rs +++ b/src/test/run-pass/auxiliary/rmeta_rmeta.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic // compile-flags: --emit=metadata diff --git a/src/test/run-pass/auxiliary/sepcomp-extern-lib.rs b/src/test/run-pass/auxiliary/sepcomp-extern-lib.rs index 72f1f73a81b81..73fb5e8f3c439 100644 --- a/src/test/run-pass/auxiliary/sepcomp-extern-lib.rs +++ b/src/test/run-pass/auxiliary/sepcomp-extern-lib.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[no_mangle] pub extern "C" fn foo() -> usize { 1234 diff --git a/src/test/run-pass/auxiliary/sepcomp_cci_lib.rs b/src/test/run-pass/auxiliary/sepcomp_cci_lib.rs index c57d161d8f574..64e34a56da43d 100644 --- a/src/test/run-pass/auxiliary/sepcomp_cci_lib.rs +++ b/src/test/run-pass/auxiliary/sepcomp_cci_lib.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[inline] pub fn cci_fn() -> usize { 1200 diff --git a/src/test/run-pass/auxiliary/sepcomp_lib.rs b/src/test/run-pass/auxiliary/sepcomp_lib.rs index 6f48978a0000d..1536228c265b2 100644 --- a/src/test/run-pass/auxiliary/sepcomp_lib.rs +++ b/src/test/run-pass/auxiliary/sepcomp_lib.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C codegen-units=3 --crate-type=rlib,dylib -g pub mod a { diff --git a/src/test/run-pass/auxiliary/static-function-pointer-aux.rs b/src/test/run-pass/auxiliary/static-function-pointer-aux.rs index 2ccdb4e086447..4dfc25764a4fa 100644 --- a/src/test/run-pass/auxiliary/static-function-pointer-aux.rs +++ b/src/test/run-pass/auxiliary/static-function-pointer-aux.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn f(x: isize) -> isize { -x } pub static F: fn(isize) -> isize = f; diff --git a/src/test/run-pass/auxiliary/static-methods-crate.rs b/src/test/run-pass/auxiliary/static-methods-crate.rs index b8fd59bf7037d..7ff3bc0dd2a73 100644 --- a/src/test/run-pass/auxiliary/static-methods-crate.rs +++ b/src/test/run-pass/auxiliary/static-methods-crate.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name="static_methods_crate"] #![crate_type = "lib"] diff --git a/src/test/run-pass/auxiliary/static_fn_inline_xc_aux.rs b/src/test/run-pass/auxiliary/static_fn_inline_xc_aux.rs index 2193e12bceb28..8d0f7f61ced19 100644 --- a/src/test/run-pass/auxiliary/static_fn_inline_xc_aux.rs +++ b/src/test/run-pass/auxiliary/static_fn_inline_xc_aux.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub mod num { pub trait Num2 { fn from_int2(n: isize) -> Self; diff --git a/src/test/run-pass/auxiliary/static_fn_trait_xc_aux.rs b/src/test/run-pass/auxiliary/static_fn_trait_xc_aux.rs index 44e875fbe3c05..b8aed2c5f54d9 100644 --- a/src/test/run-pass/auxiliary/static_fn_trait_xc_aux.rs +++ b/src/test/run-pass/auxiliary/static_fn_trait_xc_aux.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod num { pub trait Num2 { fn from_int2(n: isize) -> Self; diff --git a/src/test/run-pass/auxiliary/static_mut_xc.rs b/src/test/run-pass/auxiliary/static_mut_xc.rs index 9d677e3dc4607..264a2243adcf5 100644 --- a/src/test/run-pass/auxiliary/static_mut_xc.rs +++ b/src/test/run-pass/auxiliary/static_mut_xc.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub static mut a: isize = 3; diff --git a/src/test/run-pass/auxiliary/struct_destructuring_cross_crate.rs b/src/test/run-pass/auxiliary/struct_destructuring_cross_crate.rs index 26941b726d4c0..3665ae7e8d311 100644 --- a/src/test/run-pass/auxiliary/struct_destructuring_cross_crate.rs +++ b/src/test/run-pass/auxiliary/struct_destructuring_cross_crate.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="lib"] pub struct S { diff --git a/src/test/run-pass/auxiliary/struct_variant_xc_aux.rs b/src/test/run-pass/auxiliary/struct_variant_xc_aux.rs index 201f028b6b658..e919df611cf67 100644 --- a/src/test/run-pass/auxiliary/struct_variant_xc_aux.rs +++ b/src/test/run-pass/auxiliary/struct_variant_xc_aux.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name="struct_variant_xc_aux"] #![crate_type = "lib"] diff --git a/src/test/run-pass/auxiliary/svh-a-base.rs b/src/test/run-pass/auxiliary/svh-a-base.rs index 31a97f695f06c..36b41fc818ff8 100644 --- a/src/test/run-pass/auxiliary/svh-a-base.rs +++ b/src/test/run-pass/auxiliary/svh-a-base.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The `svh-a-*.rs` files are all deviations from the base file //! svh-a-base.rs with some difference (usually in `fn foo`) that //! should not affect the strict version hash (SVH) computation diff --git a/src/test/run-pass/auxiliary/svh-b.rs b/src/test/run-pass/auxiliary/svh-b.rs index b8946fdc99553..03869aeb37194 100644 --- a/src/test/run-pass/auxiliary/svh-b.rs +++ b/src/test/run-pass/auxiliary/svh-b.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This is a client of the `a` crate defined in "svn-a-base.rs". The //! rpass and cfail tests (such as "run-pass/svh-add-comment.rs") use //! it by swapping in a different object code library crate built from diff --git a/src/test/run-pass/auxiliary/thread-local-extern-static.rs b/src/test/run-pass/auxiliary/thread-local-extern-static.rs index e9457886be80d..b237b1c480e3a 100644 --- a/src/test/run-pass/auxiliary/thread-local-extern-static.rs +++ b/src/test/run-pass/auxiliary/thread-local-extern-static.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(cfg_target_thread_local, const_fn, thread_local)] #![crate_type = "lib"] diff --git a/src/test/run-pass/auxiliary/trait_default_method_xc_aux.rs b/src/test/run-pass/auxiliary/trait_default_method_xc_aux.rs index c1168a912dc68..0fb26af80c78d 100644 --- a/src/test/run-pass/auxiliary/trait_default_method_xc_aux.rs +++ b/src/test/run-pass/auxiliary/trait_default_method_xc_aux.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Something { pub x: isize } pub trait A { diff --git a/src/test/run-pass/auxiliary/trait_default_method_xc_aux_2.rs b/src/test/run-pass/auxiliary/trait_default_method_xc_aux_2.rs index 7443ef9c0f359..15480132a23f0 100644 --- a/src/test/run-pass/auxiliary/trait_default_method_xc_aux_2.rs +++ b/src/test/run-pass/auxiliary/trait_default_method_xc_aux_2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:trait_default_method_xc_aux.rs extern crate trait_default_method_xc_aux as aux; diff --git a/src/test/run-pass/auxiliary/trait_inheritance_auto_xc_2_aux.rs b/src/test/run-pass/auxiliary/trait_inheritance_auto_xc_2_aux.rs index af0128d967622..e9327676dc6d0 100644 --- a/src/test/run-pass/auxiliary/trait_inheritance_auto_xc_2_aux.rs +++ b/src/test/run-pass/auxiliary/trait_inheritance_auto_xc_2_aux.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Foo { fn f(&self) -> isize; } pub trait Bar { fn g(&self) -> isize; } pub trait Baz { fn h(&self) -> isize; } diff --git a/src/test/run-pass/auxiliary/trait_inheritance_auto_xc_aux.rs b/src/test/run-pass/auxiliary/trait_inheritance_auto_xc_aux.rs index 6be1f8c45f48d..9af26cb2e2bf9 100644 --- a/src/test/run-pass/auxiliary/trait_inheritance_auto_xc_aux.rs +++ b/src/test/run-pass/auxiliary/trait_inheritance_auto_xc_aux.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Foo { fn f(&self) -> isize; } pub trait Bar { fn g(&self) -> isize; } pub trait Baz { fn h(&self) -> isize; } diff --git a/src/test/run-pass/auxiliary/trait_inheritance_overloading_xc.rs b/src/test/run-pass/auxiliary/trait_inheritance_overloading_xc.rs index 1bfada612ebf6..a25704412262d 100644 --- a/src/test/run-pass/auxiliary/trait_inheritance_overloading_xc.rs +++ b/src/test/run-pass/auxiliary/trait_inheritance_overloading_xc.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cmp::PartialEq; use std::ops::{Add, Sub, Mul}; diff --git a/src/test/run-pass/auxiliary/trait_safety_lib.rs b/src/test/run-pass/auxiliary/trait_safety_lib.rs index 585a756fd0767..6fc432ed45504 100644 --- a/src/test/run-pass/auxiliary/trait_safety_lib.rs +++ b/src/test/run-pass/auxiliary/trait_safety_lib.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Simple smoke test that unsafe traits can be compiled etc. pub unsafe trait Foo { diff --git a/src/test/run-pass/auxiliary/trait_superkinds_in_metadata.rs b/src/test/run-pass/auxiliary/trait_superkinds_in_metadata.rs index 0fa2d3459f433..acfd1e13e93e3 100644 --- a/src/test/run-pass/auxiliary/trait_superkinds_in_metadata.rs +++ b/src/test/run-pass/auxiliary/trait_superkinds_in_metadata.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test library crate for cross-crate usages of traits inheriting // from the builtin kinds. Mostly tests metadata correctness. diff --git a/src/test/run-pass/auxiliary/trait_xc_call_aux.rs b/src/test/run-pass/auxiliary/trait_xc_call_aux.rs index 9eeb815c5de88..b76c52e62a941 100644 --- a/src/test/run-pass/auxiliary/trait_xc_call_aux.rs +++ b/src/test/run-pass/auxiliary/trait_xc_call_aux.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub trait Foo { fn f(&self) -> isize; } diff --git a/src/test/run-pass/auxiliary/traitimpl.rs b/src/test/run-pass/auxiliary/traitimpl.rs index 22e79cc62845b..fda5314cdbfa5 100644 --- a/src/test/run-pass/auxiliary/traitimpl.rs +++ b/src/test/run-pass/auxiliary/traitimpl.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test inherent trait impls work cross-crait. pub trait Bar<'a> : 'a {} diff --git a/src/test/run-pass/auxiliary/two_macros.rs b/src/test/run-pass/auxiliary/two_macros.rs index 0da6ba13696da..441a978dd6930 100644 --- a/src/test/run-pass/auxiliary/two_macros.rs +++ b/src/test/run-pass/auxiliary/two_macros.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_export] macro_rules! macro_one { ($($t:tt)*) => ($($t)*) } diff --git a/src/test/run-pass/auxiliary/two_macros_2.rs b/src/test/run-pass/auxiliary/two_macros_2.rs index b16cd3a421095..8ad2c0f127554 100644 --- a/src/test/run-pass/auxiliary/two_macros_2.rs +++ b/src/test/run-pass/auxiliary/two_macros_2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! macro_one { ($($t:tt)*) => ($($t)*) } macro_rules! macro_two { ($($t:tt)*) => ($($t)*) } diff --git a/src/test/run-pass/auxiliary/typeid-intrinsic-aux1.rs b/src/test/run-pass/auxiliary/typeid-intrinsic-aux1.rs index 0d0f1b3a482ea..281c079682fdb 100644 --- a/src/test/run-pass/auxiliary/typeid-intrinsic-aux1.rs +++ b/src/test/run-pass/auxiliary/typeid-intrinsic-aux1.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::any::{Any, TypeId}; pub struct A; diff --git a/src/test/run-pass/auxiliary/typeid-intrinsic-aux2.rs b/src/test/run-pass/auxiliary/typeid-intrinsic-aux2.rs index 0d0f1b3a482ea..281c079682fdb 100644 --- a/src/test/run-pass/auxiliary/typeid-intrinsic-aux2.rs +++ b/src/test/run-pass/auxiliary/typeid-intrinsic-aux2.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::any::{Any, TypeId}; pub struct A; diff --git a/src/test/run-pass/auxiliary/unboxed-closures-cross-crate.rs b/src/test/run-pass/auxiliary/unboxed-closures-cross-crate.rs index dc9798a210168..ac0a74eebd5e5 100644 --- a/src/test/run-pass/auxiliary/unboxed-closures-cross-crate.rs +++ b/src/test/run-pass/auxiliary/unboxed-closures-cross-crate.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::Add; #[inline] diff --git a/src/test/run-pass/auxiliary/unstable-macros.rs b/src/test/run-pass/auxiliary/unstable-macros.rs index 836164a721a46..b8d580702c9bc 100644 --- a/src/test/run-pass/auxiliary/unstable-macros.rs +++ b/src/test/run-pass/auxiliary/unstable-macros.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(staged_api)] #![stable(feature = "unit_test", since = "1.0.0")] diff --git a/src/test/run-pass/auxiliary/use-macro-self.rs b/src/test/run-pass/auxiliary/use-macro-self.rs index cdc519a5fdbc5..f1307411a7f77 100644 --- a/src/test/run-pass/auxiliary/use-macro-self.rs +++ b/src/test/run-pass/auxiliary/use-macro-self.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod foobarius {} #[macro_export] diff --git a/src/test/run-pass/auxiliary/using-target-feature-unstable.rs b/src/test/run-pass/auxiliary/using-target-feature-unstable.rs index 8b7d0332fe975..78645c284f116 100644 --- a/src/test/run-pass/auxiliary/using-target-feature-unstable.rs +++ b/src/test/run-pass/auxiliary/using-target-feature-unstable.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(mmx_target_feature)] #[inline] diff --git a/src/test/run-pass/auxiliary/weak-lang-items.rs b/src/test/run-pass/auxiliary/weak-lang-items.rs index 6434e62b6f703..7a698cf76ae51 100644 --- a/src/test/run-pass/auxiliary/weak-lang-items.rs +++ b/src/test/run-pass/auxiliary/weak-lang-items.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic // This aux-file will require the eh_personality function to be codegen'd, but diff --git a/src/test/run-pass/auxiliary/where_clauses_xc.rs b/src/test/run-pass/auxiliary/where_clauses_xc.rs index 4549bd719c65e..7c8043b200234 100644 --- a/src/test/run-pass/auxiliary/where_clauses_xc.rs +++ b/src/test/run-pass/auxiliary/where_clauses_xc.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Equal { fn equal(&self, other: &Self) -> bool; fn equals(&self, this: &T, that: &T, x: &U, y: &U) -> bool diff --git a/src/test/run-pass/auxiliary/xcrate-trait-lifetime-param.rs b/src/test/run-pass/auxiliary/xcrate-trait-lifetime-param.rs index 66c0300e260b8..7c1175f7a88f2 100644 --- a/src/test/run-pass/auxiliary/xcrate-trait-lifetime-param.rs +++ b/src/test/run-pass/auxiliary/xcrate-trait-lifetime-param.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait FromBuf<'a> { fn from_buf(_: &'a [u8]) -> Self; } diff --git a/src/test/run-pass/auxiliary/xcrate_address_insignificant.rs b/src/test/run-pass/auxiliary/xcrate_address_insignificant.rs index 5195839c067f7..e79e334b53f13 100644 --- a/src/test/run-pass/auxiliary/xcrate_address_insignificant.rs +++ b/src/test/run-pass/auxiliary/xcrate_address_insignificant.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn foo() -> isize { static a: isize = 3; a diff --git a/src/test/run-pass/auxiliary/xcrate_associated_type_defaults.rs b/src/test/run-pass/auxiliary/xcrate_associated_type_defaults.rs index 6779438c67226..d8a55dd34bcf0 100644 --- a/src/test/run-pass/auxiliary/xcrate_associated_type_defaults.rs +++ b/src/test/run-pass/auxiliary/xcrate_associated_type_defaults.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(associated_type_defaults)] pub trait Foo { diff --git a/src/test/run-pass/auxiliary/xcrate_generic_fn_nested_return.rs b/src/test/run-pass/auxiliary/xcrate_generic_fn_nested_return.rs index 48fb05f7779d2..2ab23b4d7e45c 100644 --- a/src/test/run-pass/auxiliary/xcrate_generic_fn_nested_return.rs +++ b/src/test/run-pass/auxiliary/xcrate_generic_fn_nested_return.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Request { pub id: String, pub arg: String, diff --git a/src/test/run-pass/auxiliary/xcrate_static_addresses.rs b/src/test/run-pass/auxiliary/xcrate_static_addresses.rs index d0da80e31b913..e18d34799ef35 100644 --- a/src/test/run-pass/auxiliary/xcrate_static_addresses.rs +++ b/src/test/run-pass/auxiliary/xcrate_static_addresses.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub static global: isize = 3; static global0: isize = 4; diff --git a/src/test/run-pass/auxiliary/xcrate_struct_aliases.rs b/src/test/run-pass/auxiliary/xcrate_struct_aliases.rs index 334f7829bd192..bc8879aa37e0b 100644 --- a/src/test/run-pass/auxiliary/xcrate_struct_aliases.rs +++ b/src/test/run-pass/auxiliary/xcrate_struct_aliases.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct S { pub x: isize, pub y: isize, diff --git a/src/test/run-pass/auxiliary/xcrate_unit_struct.rs b/src/test/run-pass/auxiliary/xcrate_unit_struct.rs index 7a69be2b06c7c..69ed498e7e1cd 100644 --- a/src/test/run-pass/auxiliary/xcrate_unit_struct.rs +++ b/src/test/run-pass/auxiliary/xcrate_unit_struct.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] // used by the rpass test diff --git a/src/test/run-pass/backtrace-debuginfo-aux.rs b/src/test/run-pass/backtrace-debuginfo-aux.rs index cb7ef7e30062c..781d6eba5ed28 100644 --- a/src/test/run-pass/backtrace-debuginfo-aux.rs +++ b/src/test/run-pass/backtrace-debuginfo-aux.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-test: not a test, used by backtrace-debuginfo.rs to test file!() #[inline(never)] diff --git a/src/test/run-pass/backtrace-debuginfo.rs b/src/test/run-pass/backtrace-debuginfo.rs index 7bcb4e5ec2d2e..37c889e9df4ad 100644 --- a/src/test/run-pass/backtrace-debuginfo.rs +++ b/src/test/run-pass/backtrace-debuginfo.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // We disable tail merging here because it can't preserve debuginfo and thus // potentially breaks the backtraces. Also, subtle changes can decide whether // tail merging succeeds, so the test might work today but fail tomorrow due to a diff --git a/src/test/run-pass/backtrace.rs b/src/test/run-pass/backtrace.rs index 3e1ae730e4af3..da3871aba095c 100644 --- a/src/test/run-pass/backtrace.rs +++ b/src/test/run-pass/backtrace.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-android FIXME #17520 // ignore-cloudabi spawning processes is not supported // ignore-emscripten spawning processes is not supported diff --git a/src/test/run-pass/bare-fn-implements-fn-mut.rs b/src/test/run-pass/bare-fn-implements-fn-mut.rs index 30a11ca2536d3..c06fc702ca7d2 100644 --- a/src/test/run-pass/bare-fn-implements-fn-mut.rs +++ b/src/test/run-pass/bare-fn-implements-fn-mut.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::FnMut; fn call_f(mut f: F) { diff --git a/src/test/run-pass/bare-static-string.rs b/src/test/run-pass/bare-static-string.rs index fefb303fc70fe..8d4782226d503 100644 --- a/src/test/run-pass/bare-static-string.rs +++ b/src/test/run-pass/bare-static-string.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { let x: &'static str = "foo"; println!("{}", x); diff --git a/src/test/run-pass/bench/issue-32062.rs b/src/test/run-pass/bench/issue-32062.rs index 8f6457d820a84..71f83fda4098c 100644 --- a/src/test/run-pass/bench/issue-32062.rs +++ b/src/test/run-pass/bench/issue-32062.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn main() { diff --git a/src/test/run-pass/big-literals.rs b/src/test/run-pass/big-literals.rs index 56e0039f66de3..9b1fa2123f91c 100644 --- a/src/test/run-pass/big-literals.rs +++ b/src/test/run-pass/big-literals.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Catch mistakes in the overflowing literals lint. #![deny(overflowing_literals)] diff --git a/src/test/run-pass/binary-minus-without-space.rs b/src/test/run-pass/binary-minus-without-space.rs index 01a9ec8093973..60d00e7cf54d8 100644 --- a/src/test/run-pass/binary-minus-without-space.rs +++ b/src/test/run-pass/binary-minus-without-space.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that issue #954 stays fixed diff --git a/src/test/run-pass/bind-by-move.rs b/src/test/run-pass/bind-by-move.rs index 9be7d63ab951d..82db89468d134 100644 --- a/src/test/run-pass/bind-by-move.rs +++ b/src/test/run-pass/bind-by-move.rs @@ -1,14 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::sync::Arc; fn dispose(_x: Arc) { } diff --git a/src/test/run-pass/bind-field-short-with-modifiers.rs b/src/test/run-pass/bind-field-short-with-modifiers.rs index b4c38bf450b1b..b17a804eb94a6 100644 --- a/src/test/run-pass/bind-field-short-with-modifiers.rs +++ b/src/test/run-pass/bind-field-short-with-modifiers.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { struct Foo { x: isize, y: isize } let mut f = Foo { x: 10, y: 0 }; diff --git a/src/test/run-pass/binops-issue-22743.rs b/src/test/run-pass/binops-issue-22743.rs index da7a3ae684c57..4e95597b67198 100644 --- a/src/test/run-pass/binops-issue-22743.rs +++ b/src/test/run-pass/binops-issue-22743.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::Mul; #[derive(Copy, Clone)] diff --git a/src/test/run-pass/binops.rs b/src/test/run-pass/binops.rs index 2b8fcd303b66e..afda24520d201 100644 --- a/src/test/run-pass/binops.rs +++ b/src/test/run-pass/binops.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Binop corner cases fn test_nil() { diff --git a/src/test/run-pass/bitwise.rs b/src/test/run-pass/bitwise.rs index bb4b9cfecf7b6..309ccae148780 100644 --- a/src/test/run-pass/bitwise.rs +++ b/src/test/run-pass/bitwise.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[cfg(any(target_pointer_width = "32"))] fn target() { assert_eq!(-1000isize as usize >> 3_usize, 536870787_usize); diff --git a/src/test/run-pass/blind-item-local-shadow.rs b/src/test/run-pass/blind-item-local-shadow.rs index bb654b1a20b91..45ee177942d09 100644 --- a/src/test/run-pass/blind-item-local-shadow.rs +++ b/src/test/run-pass/blind-item-local-shadow.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod bar { pub fn foo() -> bool { true } } diff --git a/src/test/run-pass/blind-item-mixed-crate-use-item.rs b/src/test/run-pass/blind-item-mixed-crate-use-item.rs index 3b6614c18faa8..00d171f6e4d43 100644 --- a/src/test/run-pass/blind-item-mixed-crate-use-item.rs +++ b/src/test/run-pass/blind-item-mixed-crate-use-item.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:blind-item-mixed-crate-use-item-foo.rs // aux-build:blind-item-mixed-crate-use-item-foo2.rs diff --git a/src/test/run-pass/blind-item-mixed-use-item.rs b/src/test/run-pass/blind-item-mixed-use-item.rs index 6244ba6fccf0b..e6008206ba8f0 100644 --- a/src/test/run-pass/blind-item-mixed-use-item.rs +++ b/src/test/run-pass/blind-item-mixed-use-item.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 mod m { diff --git a/src/test/run-pass/block-arg-call-as.rs b/src/test/run-pass/block-arg-call-as.rs index 73cba2e4e0a7c..26a226133e1ce 100644 --- a/src/test/run-pass/block-arg-call-as.rs +++ b/src/test/run-pass/block-arg-call-as.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn asBlock(f: F) -> usize where F: FnOnce() -> usize { return f(); } diff --git a/src/test/run-pass/block-arg.rs b/src/test/run-pass/block-arg.rs index 7fca4bccab3ff..8d5840ae9e790 100644 --- a/src/test/run-pass/block-arg.rs +++ b/src/test/run-pass/block-arg.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check usage and precedence of block arguments in expressions: pub fn main() { let v = vec![-1.0f64, 0.0, 1.0, 2.0, 3.0]; diff --git a/src/test/run-pass/block-explicit-types.rs b/src/test/run-pass/block-explicit-types.rs index 835d356d8aaa1..449a4967580aa 100644 --- a/src/test/run-pass/block-explicit-types.rs +++ b/src/test/run-pass/block-explicit-types.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { fn as_buf(s: String, f: F) -> T where F: FnOnce(String) -> T { f(s) } as_buf("foo".to_string(), |foo: String| -> () { println!("{}", foo) }); diff --git a/src/test/run-pass/block-expr-precedence.rs b/src/test/run-pass/block-expr-precedence.rs index ac8f501257361..b50cb1b8a6e89 100644 --- a/src/test/run-pass/block-expr-precedence.rs +++ b/src/test/run-pass/block-expr-precedence.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test has some extra semis in it that the pretty-printer won't // reproduce so we don't want to automatically reformat it diff --git a/src/test/run-pass/block-fn-coerce.rs b/src/test/run-pass/block-fn-coerce.rs index 3e6109da39a26..0fbc1f5178d39 100644 --- a/src/test/run-pass/block-fn-coerce.rs +++ b/src/test/run-pass/block-fn-coerce.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn force(f: F) -> isize where F: FnOnce() -> isize { return f(); } pub fn main() { diff --git a/src/test/run-pass/block-iter-1.rs b/src/test/run-pass/block-iter-1.rs index 7cbe8104deb5d..8b3fc95f5a15b 100644 --- a/src/test/run-pass/block-iter-1.rs +++ b/src/test/run-pass/block-iter-1.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn iter_vec(v: Vec , mut f: F) where F: FnMut(&T) { for x in &v { f(x); } } pub fn main() { diff --git a/src/test/run-pass/block-iter-2.rs b/src/test/run-pass/block-iter-2.rs index 7701f6114ca62..0176f6d26d9f5 100644 --- a/src/test/run-pass/block-iter-2.rs +++ b/src/test/run-pass/block-iter-2.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn iter_vec(v: Vec, mut f: F) where F: FnMut(&T) { for x in &v { f(x); } } pub fn main() { diff --git a/src/test/run-pass/bool-not.rs b/src/test/run-pass/bool-not.rs index fa0b86d0a0246..34865a3676208 100644 --- a/src/test/run-pass/bool-not.rs +++ b/src/test/run-pass/bool-not.rs @@ -1,17 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - - pub fn main() { if !false { assert!((true)); } else { assert!((false)); } if !true { assert!((false)); } else { assert!((true)); } diff --git a/src/test/run-pass/bool.rs b/src/test/run-pass/bool.rs index 1152574d06942..e6322746f20c2 100644 --- a/src/test/run-pass/bool.rs +++ b/src/test/run-pass/bool.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Basic boolean tests diff --git a/src/test/run-pass/borrow-by-val-method-receiver.rs b/src/test/run-pass/borrow-by-val-method-receiver.rs index 44f4a54610a9b..5907f8238af94 100644 --- a/src/test/run-pass/borrow-by-val-method-receiver.rs +++ b/src/test/run-pass/borrow-by-val-method-receiver.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn foo(self); } diff --git a/src/test/run-pass/borrow-tuple-fields.rs b/src/test/run-pass/borrow-tuple-fields.rs index f0d09688192c6..f18e3b9e23928 100644 --- a/src/test/run-pass/borrow-tuple-fields.rs +++ b/src/test/run-pass/borrow-tuple-fields.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct Foo(isize, isize); fn main() { diff --git a/src/test/run-pass/borrowck/borrowck-assign-to-subfield.rs b/src/test/run-pass/borrowck/borrowck-assign-to-subfield.rs index ee74a0544084e..a83173f56cc40 100644 --- a/src/test/run-pass/borrowck/borrowck-assign-to-subfield.rs +++ b/src/test/run-pass/borrowck/borrowck-assign-to-subfield.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub fn main() { diff --git a/src/test/run-pass/borrowck/borrowck-assignment-to-static-mut.rs b/src/test/run-pass/borrowck/borrowck-assignment-to-static-mut.rs index 302a7b96bc07d..e74d7f25be8a7 100644 --- a/src/test/run-pass/borrowck/borrowck-assignment-to-static-mut.rs +++ b/src/test/run-pass/borrowck/borrowck-assignment-to-static-mut.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test taken from #45641 (https://github.com/rust-lang/rust/issues/45641) // revisions: ast mir diff --git a/src/test/run-pass/borrowck/borrowck-binding-mutbl.rs b/src/test/run-pass/borrowck/borrowck-binding-mutbl.rs index b6c2a3a61ea4f..0bedeb063e2f0 100644 --- a/src/test/run-pass/borrowck/borrowck-binding-mutbl.rs +++ b/src/test/run-pass/borrowck/borrowck-binding-mutbl.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct F { f: Vec } fn impure(_v: &[isize]) { diff --git a/src/test/run-pass/borrowck/borrowck-borrow-from-expr-block.rs b/src/test/run-pass/borrowck/borrowck-borrow-from-expr-block.rs index 1d7230510df2b..ba9a9306e1a1b 100644 --- a/src/test/run-pass/borrowck/borrowck-borrow-from-expr-block.rs +++ b/src/test/run-pass/borrowck/borrowck-borrow-from-expr-block.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn borrow(x: &isize, f: F) where F: FnOnce(&isize) { diff --git a/src/test/run-pass/borrowck/borrowck-borrow-of-mut-base-ptr-safe.rs b/src/test/run-pass/borrowck/borrowck-borrow-of-mut-base-ptr-safe.rs index b716a1a27a195..90d273bb8cfc8 100644 --- a/src/test/run-pass/borrowck/borrowck-borrow-of-mut-base-ptr-safe.rs +++ b/src/test/run-pass/borrowck/borrowck-borrow-of-mut-base-ptr-safe.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that freezing an `&mut` pointer while referent is // frozen is legal. // diff --git a/src/test/run-pass/borrowck/borrowck-closures-two-imm.rs b/src/test/run-pass/borrowck/borrowck-closures-two-imm.rs index 5b15c8f0797fa..3b06b4ab5aebc 100644 --- a/src/test/run-pass/borrowck/borrowck-closures-two-imm.rs +++ b/src/test/run-pass/borrowck/borrowck-closures-two-imm.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that two closures can simultaneously have immutable // access to the variable, whether that immutable access be used // for direct reads or for taking immutable ref. Also check diff --git a/src/test/run-pass/borrowck/borrowck-field-sensitivity.rs b/src/test/run-pass/borrowck/borrowck-field-sensitivity.rs index a465c9cf811aa..a607dced33e48 100644 --- a/src/test/run-pass/borrowck/borrowck-field-sensitivity.rs +++ b/src/test/run-pass/borrowck/borrowck-field-sensitivity.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/borrowck/borrowck-fixed-length-vecs.rs b/src/test/run-pass/borrowck/borrowck-fixed-length-vecs.rs index 0e33351894d14..751fb4b348d6e 100644 --- a/src/test/run-pass/borrowck/borrowck-fixed-length-vecs.rs +++ b/src/test/run-pass/borrowck/borrowck-fixed-length-vecs.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { let x = [22]; let y = &x[0]; diff --git a/src/test/run-pass/borrowck/borrowck-freeze-frozen-mut.rs b/src/test/run-pass/borrowck/borrowck-freeze-frozen-mut.rs index 380bd398a7cb2..9f620805837ec 100644 --- a/src/test/run-pass/borrowck/borrowck-freeze-frozen-mut.rs +++ b/src/test/run-pass/borrowck/borrowck-freeze-frozen-mut.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that a `&mut` inside of an `&` is freezable. diff --git a/src/test/run-pass/borrowck/borrowck-lend-args.rs b/src/test/run-pass/borrowck/borrowck-lend-args.rs index f1f0274c5cc48..01f50e43ff7b8 100644 --- a/src/test/run-pass/borrowck/borrowck-lend-args.rs +++ b/src/test/run-pass/borrowck/borrowck-lend-args.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // pretty-expanded FIXME #23616 fn borrow(_v: &isize) {} diff --git a/src/test/run-pass/borrowck/borrowck-macro-interaction-issue-6304.rs b/src/test/run-pass/borrowck/borrowck-macro-interaction-issue-6304.rs index fb30c85e70963..3790164294298 100644 --- a/src/test/run-pass/borrowck/borrowck-macro-interaction-issue-6304.rs +++ b/src/test/run-pass/borrowck/borrowck-macro-interaction-issue-6304.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we do not ICE when compiling this // macro, which reuses the expression `$id` diff --git a/src/test/run-pass/borrowck/borrowck-move-by-capture-ok.rs b/src/test/run-pass/borrowck/borrowck-move-by-capture-ok.rs index c3645867117d2..8f18d18296370 100644 --- a/src/test/run-pass/borrowck/borrowck-move-by-capture-ok.rs +++ b/src/test/run-pass/borrowck/borrowck-move-by-capture-ok.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/borrowck/borrowck-multiple-borrows-interior-boxes.rs b/src/test/run-pass/borrowck/borrowck-multiple-borrows-interior-boxes.rs index f57a7bd7add44..b5e32e7212be6 100644 --- a/src/test/run-pass/borrowck/borrowck-multiple-borrows-interior-boxes.rs +++ b/src/test/run-pass/borrowck/borrowck-multiple-borrows-interior-boxes.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test case from #39963. #![feature(nll)] diff --git a/src/test/run-pass/borrowck/borrowck-mut-uniq.rs b/src/test/run-pass/borrowck/borrowck-mut-uniq.rs index ec868bc5c85ef..e6918b727815e 100644 --- a/src/test/run-pass/borrowck/borrowck-mut-uniq.rs +++ b/src/test/run-pass/borrowck/borrowck-mut-uniq.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] use std::mem::swap; diff --git a/src/test/run-pass/borrowck/borrowck-mut-vec-as-imm-slice.rs b/src/test/run-pass/borrowck/borrowck-mut-vec-as-imm-slice.rs index 4699f376313ba..00c47b00f1fd5 100644 --- a/src/test/run-pass/borrowck/borrowck-mut-vec-as-imm-slice.rs +++ b/src/test/run-pass/borrowck/borrowck-mut-vec-as-imm-slice.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - fn want_slice(v: &[isize]) -> isize { let mut sum = 0; for i in v { sum += *i; } diff --git a/src/test/run-pass/borrowck/borrowck-pat-enum.rs b/src/test/run-pass/borrowck/borrowck-pat-enum.rs index 8de45e4205dfb..5a3c4a1e96d35 100644 --- a/src/test/run-pass/borrowck/borrowck-pat-enum.rs +++ b/src/test/run-pass/borrowck/borrowck-pat-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty issue #37199 fn match_ref(v: Option) -> isize { diff --git a/src/test/run-pass/borrowck/borrowck-pat-reassign-no-binding.rs b/src/test/run-pass/borrowck/borrowck-pat-reassign-no-binding.rs index e0a5db678d2f4..ca058908dda80 100644 --- a/src/test/run-pass/borrowck/borrowck-pat-reassign-no-binding.rs +++ b/src/test/run-pass/borrowck/borrowck-pat-reassign-no-binding.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { let mut x = None; match x { diff --git a/src/test/run-pass/borrowck/borrowck-rvalues-mutable.rs b/src/test/run-pass/borrowck/borrowck-rvalues-mutable.rs index 93cb0cb0af23a..a37001bc5a3d0 100644 --- a/src/test/run-pass/borrowck/borrowck-rvalues-mutable.rs +++ b/src/test/run-pass/borrowck/borrowck-rvalues-mutable.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct Counter { value: usize } diff --git a/src/test/run-pass/borrowck/borrowck-scope-of-deref-issue-4666.rs b/src/test/run-pass/borrowck/borrowck-scope-of-deref-issue-4666.rs index 59a5fea769a6f..4bb5291c9a102 100644 --- a/src/test/run-pass/borrowck/borrowck-scope-of-deref-issue-4666.rs +++ b/src/test/run-pass/borrowck/borrowck-scope-of-deref-issue-4666.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that the scope of the pointer returned from `get()` is // limited to the deref operation itself, and does not infect the // block as a whole. diff --git a/src/test/run-pass/borrowck/borrowck-slice-pattern-element-loan.rs b/src/test/run-pass/borrowck/borrowck-slice-pattern-element-loan.rs index 48d16102ff3c2..1115d5ebf53d4 100644 --- a/src/test/run-pass/borrowck/borrowck-slice-pattern-element-loan.rs +++ b/src/test/run-pass/borrowck/borrowck-slice-pattern-element-loan.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //compile-flags: -Z borrowck=mir #![feature(slice_patterns)] diff --git a/src/test/run-pass/borrowck/borrowck-static-item-in-fn.rs b/src/test/run-pass/borrowck/borrowck-static-item-in-fn.rs index d51d0b1d2e1fd..fc10f5f4228c3 100644 --- a/src/test/run-pass/borrowck/borrowck-static-item-in-fn.rs +++ b/src/test/run-pass/borrowck/borrowck-static-item-in-fn.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #7740 // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/borrowck/borrowck-trait-lifetime.rs b/src/test/run-pass/borrowck/borrowck-trait-lifetime.rs index 0bfa8f48650bb..f2a3a69c9f3c5 100644 --- a/src/test/run-pass/borrowck/borrowck-trait-lifetime.rs +++ b/src/test/run-pass/borrowck/borrowck-trait-lifetime.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test verifies that casting from the same lifetime on a value // to the same lifetime on a trait succeeds. See issue #10766. diff --git a/src/test/run-pass/borrowck/borrowck-uniq-via-ref.rs b/src/test/run-pass/borrowck/borrowck-uniq-via-ref.rs index 0ec87599c6391..76e4e955170b4 100644 --- a/src/test/run-pass/borrowck/borrowck-uniq-via-ref.rs +++ b/src/test/run-pass/borrowck/borrowck-uniq-via-ref.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // pretty-expanded FIXME #23616 struct Rec { diff --git a/src/test/run-pass/borrowck/borrowck-univariant-enum.rs b/src/test/run-pass/borrowck/borrowck-univariant-enum.rs index 2e8ddb0806472..ccac9e6b75f68 100644 --- a/src/test/run-pass/borrowck/borrowck-univariant-enum.rs +++ b/src/test/run-pass/borrowck/borrowck-univariant-enum.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - use std::cell::Cell; #[derive(Copy, Clone)] diff --git a/src/test/run-pass/borrowck/borrowck-unsafe-static-mutable-borrows.rs b/src/test/run-pass/borrowck/borrowck-unsafe-static-mutable-borrows.rs index de411d3096092..e470161432cf5 100644 --- a/src/test/run-pass/borrowck/borrowck-unsafe-static-mutable-borrows.rs +++ b/src/test/run-pass/borrowck/borrowck-unsafe-static-mutable-borrows.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/run-pass/borrowck/borrowck-unused-mut-locals.rs b/src/test/run-pass/borrowck/borrowck-unused-mut-locals.rs index 7f1b6ed170168..fd6f644934bfd 100644 --- a/src/test/run-pass/borrowck/borrowck-unused-mut-locals.rs +++ b/src/test/run-pass/borrowck/borrowck-unused-mut-locals.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] #![deny(unused_mut)] diff --git a/src/test/run-pass/borrowck/borrowck-use-mut-borrow.rs b/src/test/run-pass/borrowck/borrowck-use-mut-borrow.rs index 8c94df6dbf454..15b4b12d5df80 100644 --- a/src/test/run-pass/borrowck/borrowck-use-mut-borrow.rs +++ b/src/test/run-pass/borrowck/borrowck-use-mut-borrow.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/borrowck/two-phase-baseline.rs b/src/test/run-pass/borrowck/two-phase-baseline.rs index ca15591a10192..c8a423a9765d6 100644 --- a/src/test/run-pass/borrowck/two-phase-baseline.rs +++ b/src/test/run-pass/borrowck/two-phase-baseline.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z borrowck=mir -Z two-phase-borrows // This is the "goto example" for why we want two phase borrows. diff --git a/src/test/run-pass/borrowck/two-phase-bin-ops.rs b/src/test/run-pass/borrowck/two-phase-bin-ops.rs index 1b2529d7875ab..83def7ab475b3 100644 --- a/src/test/run-pass/borrowck/two-phase-bin-ops.rs +++ b/src/test/run-pass/borrowck/two-phase-bin-ops.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: lxl nll #![cfg_attr(nll, feature(nll))] diff --git a/src/test/run-pass/borrowck/two-phase-control-flow-split-before-activation.rs b/src/test/run-pass/borrowck/two-phase-control-flow-split-before-activation.rs index 35a5422040a17..b620fa6158e6f 100644 --- a/src/test/run-pass/borrowck/two-phase-control-flow-split-before-activation.rs +++ b/src/test/run-pass/borrowck/two-phase-control-flow-split-before-activation.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: lxl nll //[lxl]compile-flags: -Z borrowck=mir -Z two-phase-borrows diff --git a/src/test/run-pass/borrowed-ptr-pattern-2.rs b/src/test/run-pass/borrowed-ptr-pattern-2.rs index 3e47764ba0264..ffa2aaaf5e2ff 100644 --- a/src/test/run-pass/borrowed-ptr-pattern-2.rs +++ b/src/test/run-pass/borrowed-ptr-pattern-2.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn foo(s: &String) -> bool { match &**s { "kitty" => true, diff --git a/src/test/run-pass/borrowed-ptr-pattern-3.rs b/src/test/run-pass/borrowed-ptr-pattern-3.rs index 91228efb9c1cb..ca4599281ba6b 100644 --- a/src/test/run-pass/borrowed-ptr-pattern-3.rs +++ b/src/test/run-pass/borrowed-ptr-pattern-3.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn foo<'r>(s: &'r usize) -> bool { match s { &3 => true, diff --git a/src/test/run-pass/borrowed-ptr-pattern-infallible.rs b/src/test/run-pass/borrowed-ptr-pattern-infallible.rs index 6656eb41f2e3a..d5828ec5d57f2 100644 --- a/src/test/run-pass/borrowed-ptr-pattern-infallible.rs +++ b/src/test/run-pass/borrowed-ptr-pattern-infallible.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - pub fn main() { let (&x, &y) = (&3, &'a'); assert_eq!(x, 3); diff --git a/src/test/run-pass/borrowed-ptr-pattern-option.rs b/src/test/run-pass/borrowed-ptr-pattern-option.rs index e1e9381eeb8e7..9ba360bcb3424 100644 --- a/src/test/run-pass/borrowed-ptr-pattern-option.rs +++ b/src/test/run-pass/borrowed-ptr-pattern-option.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn select<'r>(x: &'r Option, y: &'r Option) -> &'r Option { match (x, y) { (&None, &None) => x, diff --git a/src/test/run-pass/borrowed-ptr-pattern.rs b/src/test/run-pass/borrowed-ptr-pattern.rs index 3042ff7743b70..2a8ff4958740d 100644 --- a/src/test/run-pass/borrowed-ptr-pattern.rs +++ b/src/test/run-pass/borrowed-ptr-pattern.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn foo(x: &T) -> T{ match x { &ref a => (*a).clone() diff --git a/src/test/run-pass/box-new.rs b/src/test/run-pass/box-new.rs index a2d76d33993ba..2d177bcf9276c 100644 --- a/src/test/run-pass/box-new.rs +++ b/src/test/run-pass/box-new.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn main() { diff --git a/src/test/run-pass/box-of-array-of-drop-1.rs b/src/test/run-pass/box-of-array-of-drop-1.rs index db055e6886a83..66e242752d47a 100644 --- a/src/test/run-pass/box-of-array-of-drop-1.rs +++ b/src/test/run-pass/box-of-array-of-drop-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we cleanup a fixed size Box<[D; k]> properly when D has a // destructor. diff --git a/src/test/run-pass/box-of-array-of-drop-2.rs b/src/test/run-pass/box-of-array-of-drop-2.rs index 9dde53bb31dc5..37ab0e8338226 100644 --- a/src/test/run-pass/box-of-array-of-drop-2.rs +++ b/src/test/run-pass/box-of-array-of-drop-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we cleanup dynamic sized Box<[D]> properly when D has a // destructor. diff --git a/src/test/run-pass/break-value.rs b/src/test/run-pass/break-value.rs index e5a035fb562b1..c738f6d0a9cf5 100644 --- a/src/test/run-pass/break-value.rs +++ b/src/test/run-pass/break-value.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn int_id(x: isize) -> isize { return x; } diff --git a/src/test/run-pass/break.rs b/src/test/run-pass/break.rs index 9a32fbc103147..7d9fd62247c83 100644 --- a/src/test/run-pass/break.rs +++ b/src/test/run-pass/break.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { let mut i = 0; while i < 20 { i += 1; if i == 10 { break; } } diff --git a/src/test/run-pass/bug-7183-generics.rs b/src/test/run-pass/bug-7183-generics.rs index 80fd09114fc95..72cfe1973a878 100644 --- a/src/test/run-pass/bug-7183-generics.rs +++ b/src/test/run-pass/bug-7183-generics.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Speak : Sized { fn say(&self, s:&str) -> String; fn hi(&self) -> String { hello(self) } diff --git a/src/test/run-pass/bug-7295.rs b/src/test/run-pass/bug-7295.rs index 89fd51bd5f1dc..b6dea6c82dc1a 100644 --- a/src/test/run-pass/bug-7295.rs +++ b/src/test/run-pass/bug-7295.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub trait Foo { diff --git a/src/test/run-pass/builtin-clone-unwind.rs b/src/test/run-pass/builtin-clone-unwind.rs index 7e7c5ee412556..1f37ef4dc090f 100644 --- a/src/test/run-pass/builtin-clone-unwind.rs +++ b/src/test/run-pass/builtin-clone-unwind.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare compiled with panic=abort by default // Test that builtin implementations of `Clone` cleanup everything diff --git a/src/test/run-pass/builtin-clone.rs b/src/test/run-pass/builtin-clone.rs index 95903610931b2..2a9b98a6e338d 100644 --- a/src/test/run-pass/builtin-clone.rs +++ b/src/test/run-pass/builtin-clone.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that `Clone` is correctly implemented for builtin types. // Also test that cloning an array or a tuple is done right, i.e. // each component is cloned. diff --git a/src/test/run-pass/builtin-superkinds-capabilities-transitive.rs b/src/test/run-pass/builtin-superkinds-capabilities-transitive.rs index e028c3b9d4b30..8ff70036ed2a0 100644 --- a/src/test/run-pass/builtin-superkinds-capabilities-transitive.rs +++ b/src/test/run-pass/builtin-superkinds-capabilities-transitive.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests "transitivity" of super-builtin-kinds on traits. Here, if // we have a Foo, we know we have a Bar, and if we have a Bar, we // know we have a Send. So if we have a Foo we should know we have diff --git a/src/test/run-pass/builtin-superkinds-capabilities-xc.rs b/src/test/run-pass/builtin-superkinds-capabilities-xc.rs index 1a27eae194328..7af41cbf50ba5 100644 --- a/src/test/run-pass/builtin-superkinds-capabilities-xc.rs +++ b/src/test/run-pass/builtin-superkinds-capabilities-xc.rs @@ -1,14 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // aux-build:trait_superkinds_in_metadata.rs // Tests "capabilities" granted by traits with super-builtin-kinds, diff --git a/src/test/run-pass/builtin-superkinds-capabilities.rs b/src/test/run-pass/builtin-superkinds-capabilities.rs index 99a68790e76e9..2a2917b69b08a 100644 --- a/src/test/run-pass/builtin-superkinds-capabilities.rs +++ b/src/test/run-pass/builtin-superkinds-capabilities.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests "capabilities" granted by traits that inherit from super- // builtin-kinds, e.g., if a trait requires Send to implement, then // at usage site of that trait, we know we have the Send capability. diff --git a/src/test/run-pass/builtin-superkinds-in-metadata.rs b/src/test/run-pass/builtin-superkinds-in-metadata.rs index 3259b1cc0679e..d7d6d6cd88423 100644 --- a/src/test/run-pass/builtin-superkinds-in-metadata.rs +++ b/src/test/run-pass/builtin-superkinds-in-metadata.rs @@ -1,14 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // aux-build:trait_superkinds_in_metadata.rs // Tests (correct) usage of trait super-builtin-kinds cross-crate. diff --git a/src/test/run-pass/builtin-superkinds-phantom-typaram.rs b/src/test/run-pass/builtin-superkinds-phantom-typaram.rs index 6bc81f4a36bcd..c2fd3c501a1c5 100644 --- a/src/test/run-pass/builtin-superkinds-phantom-typaram.rs +++ b/src/test/run-pass/builtin-superkinds-phantom-typaram.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that even when a type parameter doesn't implement a required // super-builtin-kind of a trait, if the type parameter is never used, // the type can implement the trait anyway. diff --git a/src/test/run-pass/builtin-superkinds-self-type.rs b/src/test/run-pass/builtin-superkinds-self-type.rs index 9b8893b0762fd..6bfe87c947fd5 100644 --- a/src/test/run-pass/builtin-superkinds-self-type.rs +++ b/src/test/run-pass/builtin-superkinds-self-type.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests the ability for the Self type in default methods to use // capabilities granted by builtin kinds as supertraits. diff --git a/src/test/run-pass/builtin-superkinds-simple.rs b/src/test/run-pass/builtin-superkinds-simple.rs index 8a954de9d0a45..670b8ed0e9bc1 100644 --- a/src/test/run-pass/builtin-superkinds-simple.rs +++ b/src/test/run-pass/builtin-superkinds-simple.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Simple test case of implementing a trait with super-builtin-kinds. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/builtin-superkinds-typaram.rs b/src/test/run-pass/builtin-superkinds-typaram.rs index 6d41774c05bf1..c3a456318bce6 100644 --- a/src/test/run-pass/builtin-superkinds-typaram.rs +++ b/src/test/run-pass/builtin-superkinds-typaram.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests correct implementation of traits with super-builtin-kinds // using a bounded type parameter. diff --git a/src/test/run-pass/by-value-self-in-mut-slot.rs b/src/test/run-pass/by-value-self-in-mut-slot.rs index 846b695c35b3d..dc00f84ddd266 100644 --- a/src/test/run-pass/by-value-self-in-mut-slot.rs +++ b/src/test/run-pass/by-value-self-in-mut-slot.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct X { a: isize } diff --git a/src/test/run-pass/byte-literals.rs b/src/test/run-pass/byte-literals.rs index f5acb72429ae0..259ac08fd979e 100644 --- a/src/test/run-pass/byte-literals.rs +++ b/src/test/run-pass/byte-literals.rs @@ -1,12 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // diff --git a/src/test/run-pass/c-stack-as-value.rs b/src/test/run-pass/c-stack-as-value.rs index df4989d89ab5e..ebcdf07991b6c 100644 --- a/src/test/run-pass/c-stack-as-value.rs +++ b/src/test/run-pass/c-stack-as-value.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 // ignore-wasm32-bare no libc to test ffi with diff --git a/src/test/run-pass/c-stack-returning-int64.rs b/src/test/run-pass/c-stack-returning-int64.rs index 56a0437146b9e..fd91d1c5c3c90 100644 --- a/src/test/run-pass/c-stack-returning-int64.rs +++ b/src/test/run-pass/c-stack-returning-int64.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare no libc to test with #![feature(libc)] diff --git a/src/test/run-pass/cabi-int-widening.rs b/src/test/run-pass/cabi-int-widening.rs index 5b1677c184c74..f6524c6a3d902 100644 --- a/src/test/run-pass/cabi-int-widening.rs +++ b/src/test/run-pass/cabi-int-widening.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare no libc to test ffi with #[link(name = "rust_test_helpers", kind = "static")] diff --git a/src/test/run-pass/call-closure-from-overloaded-op.rs b/src/test/run-pass/call-closure-from-overloaded-op.rs index e35398a22917f..f789cfb93c42f 100644 --- a/src/test/run-pass/call-closure-from-overloaded-op.rs +++ b/src/test/run-pass/call-closure-from-overloaded-op.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn foo() -> isize { 22 } pub fn main() { diff --git a/src/test/run-pass/can-copy-pod.rs b/src/test/run-pass/can-copy-pod.rs index 31b279335225f..bc10d236b3639 100644 --- a/src/test/run-pass/can-copy-pod.rs +++ b/src/test/run-pass/can-copy-pod.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 /* Any copyright is dedicated to the Public Domain. diff --git a/src/test/run-pass/cancel-clean-via-immediate-rvalue-ref.rs b/src/test/run-pass/cancel-clean-via-immediate-rvalue-ref.rs index ac30921625055..f27803677cc0e 100644 --- a/src/test/run-pass/cancel-clean-via-immediate-rvalue-ref.rs +++ b/src/test/run-pass/cancel-clean-via-immediate-rvalue-ref.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/capture-clauses-boxed-closures.rs b/src/test/run-pass/capture-clauses-boxed-closures.rs index 45cec79e1a30e..468d8df279af0 100644 --- a/src/test/run-pass/capture-clauses-boxed-closures.rs +++ b/src/test/run-pass/capture-clauses-boxed-closures.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn each(x: &[T], mut f: F) where F: FnMut(&T) { for val in x { f(val) diff --git a/src/test/run-pass/capture-clauses-unboxed-closures.rs b/src/test/run-pass/capture-clauses-unboxed-closures.rs index e8a9dc7b8f368..4c49a2a467114 100644 --- a/src/test/run-pass/capture-clauses-unboxed-closures.rs +++ b/src/test/run-pass/capture-clauses-unboxed-closures.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn each<'a,T,F:FnMut(&'a T)>(x: &'a [T], mut f: F) { for val in x { f(val) diff --git a/src/test/run-pass/cast-does-fallback.rs b/src/test/run-pass/cast-does-fallback.rs index aa6752ffc35b0..6adf90fc0e614 100644 --- a/src/test/run-pass/cast-does-fallback.rs +++ b/src/test/run-pass/cast-does-fallback.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { // Test that these type check correctly. (&42u8 >> 4) as usize; diff --git a/src/test/run-pass/cast-in-array-size.rs b/src/test/run-pass/cast-in-array-size.rs index 6f1fafba563ab..75855f6c5ecd7 100644 --- a/src/test/run-pass/cast-in-array-size.rs +++ b/src/test/run-pass/cast-in-array-size.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // issues #10618 and #16382 // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/cast-region-to-uint.rs b/src/test/run-pass/cast-region-to-uint.rs index f5180ea260f8d..ef2f6f1c49285 100644 --- a/src/test/run-pass/cast-region-to-uint.rs +++ b/src/test/run-pass/cast-region-to-uint.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { let x: isize = 3; println!("&x={:x}", (&x as *const isize as usize)); diff --git a/src/test/run-pass/cast-rfc0401-vtable-kinds.rs b/src/test/run-pass/cast-rfc0401-vtable-kinds.rs index 32a155c13e64a..e53ab7919228b 100644 --- a/src/test/run-pass/cast-rfc0401-vtable-kinds.rs +++ b/src/test/run-pass/cast-rfc0401-vtable-kinds.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that you can cast between different pointers to trait objects // whose vtable have the same kind (both lengths, or both trait pointers). diff --git a/src/test/run-pass/cast-rfc0401.rs b/src/test/run-pass/cast-rfc0401.rs index 022ed6c28c3bd..324860e53e198 100644 --- a/src/test/run-pass/cast-rfc0401.rs +++ b/src/test/run-pass/cast-rfc0401.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] use std::vec; diff --git a/src/test/run-pass/cast-to-infer-ty.rs b/src/test/run-pass/cast-to-infer-ty.rs index 2aa0d9c62fb41..e29860cbfbf5f 100644 --- a/src/test/run-pass/cast-to-infer-ty.rs +++ b/src/test/run-pass/cast-to-infer-ty.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we allow a cast to `_` so long as the target type can be // inferred elsewhere. diff --git a/src/test/run-pass/cast.rs b/src/test/run-pass/cast.rs index 80fa5362a8be9..e2c81cbf02c02 100644 --- a/src/test/run-pass/cast.rs +++ b/src/test/run-pass/cast.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { let i: isize = 'Q' as isize; assert_eq!(i, 0x51); diff --git a/src/test/run-pass/catch-unwind-bang.rs b/src/test/run-pass/catch-unwind-bang.rs index 849132b8ebfab..6c6f5a4fcfd91 100644 --- a/src/test/run-pass/catch-unwind-bang.rs +++ b/src/test/run-pass/catch-unwind-bang.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare compiled with panic=abort by default fn worker() -> ! { diff --git a/src/test/run-pass/cci_borrow.rs b/src/test/run-pass/cci_borrow.rs index 1535ddfb4de0e..5442928824189 100644 --- a/src/test/run-pass/cci_borrow.rs +++ b/src/test/run-pass/cci_borrow.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:cci_borrow_lib.rs #![feature(box_syntax)] diff --git a/src/test/run-pass/cci_capture_clause.rs b/src/test/run-pass/cci_capture_clause.rs index 5019455c2a7f0..49b68fab4a782 100644 --- a/src/test/run-pass/cci_capture_clause.rs +++ b/src/test/run-pass/cci_capture_clause.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:cci_capture_clause.rs // This test makes sure we can do cross-crate inlining on functions diff --git a/src/test/run-pass/cci_impl_exe.rs b/src/test/run-pass/cci_impl_exe.rs index 998f412597771..9235f713909fd 100644 --- a/src/test/run-pass/cci_impl_exe.rs +++ b/src/test/run-pass/cci_impl_exe.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:cci_impl_lib.rs extern crate cci_impl_lib; diff --git a/src/test/run-pass/cci_iter_exe.rs b/src/test/run-pass/cci_iter_exe.rs index 4d9646522749c..aff467dadc8ff 100644 --- a/src/test/run-pass/cci_iter_exe.rs +++ b/src/test/run-pass/cci_iter_exe.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:cci_iter_lib.rs extern crate cci_iter_lib; diff --git a/src/test/run-pass/cci_nested_exe.rs b/src/test/run-pass/cci_nested_exe.rs index b40c29dd71529..651af08ee631c 100644 --- a/src/test/run-pass/cci_nested_exe.rs +++ b/src/test/run-pass/cci_nested_exe.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:cci_nested_lib.rs diff --git a/src/test/run-pass/cci_no_inline_exe.rs b/src/test/run-pass/cci_no_inline_exe.rs index b105411c284a7..061b42a4a7f92 100644 --- a/src/test/run-pass/cci_no_inline_exe.rs +++ b/src/test/run-pass/cci_no_inline_exe.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:cci_no_inline_lib.rs extern crate cci_no_inline_lib; diff --git a/src/test/run-pass/cell-does-not-clone.rs b/src/test/run-pass/cell-does-not-clone.rs index c1fcf49654626..c1922087aa43f 100644 --- a/src/test/run-pass/cell-does-not-clone.rs +++ b/src/test/run-pass/cell-does-not-clone.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::cell::Cell; #[derive(Copy)] diff --git a/src/test/run-pass/cfg-attr-cfg.rs b/src/test/run-pass/cfg-attr-cfg.rs index 74022d4c6c839..b0a43062b6f9c 100644 --- a/src/test/run-pass/cfg-attr-cfg.rs +++ b/src/test/run-pass/cfg-attr-cfg.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // main is conditionally compiled, but the conditional compilation // is conditional too! diff --git a/src/test/run-pass/cfg-attr-crate.rs b/src/test/run-pass/cfg-attr-crate.rs index 21dc7ff7e01f0..45dda372d038e 100644 --- a/src/test/run-pass/cfg-attr-crate.rs +++ b/src/test/run-pass/cfg-attr-crate.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // https://github.com/rust-lang/rust/issues/21833#issuecomment-72353044 // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/cfg-family.rs b/src/test/run-pass/cfg-family.rs index e45e35b370d9f..cca5f474e9b81 100644 --- a/src/test/run-pass/cfg-family.rs +++ b/src/test/run-pass/cfg-family.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 // ignore-cloudabi no target_family // ignore-wasm32-bare no target_family diff --git a/src/test/run-pass/cfg-in-crate-1.rs b/src/test/run-pass/cfg-in-crate-1.rs index 5dd6fa45bb96e..f475391a8e62f 100644 --- a/src/test/run-pass/cfg-in-crate-1.rs +++ b/src/test/run-pass/cfg-in-crate-1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --cfg bar -D warnings #![cfg(bar)] diff --git a/src/test/run-pass/cfg-macros-foo.rs b/src/test/run-pass/cfg-macros-foo.rs index 36b9ce1585cf8..ddac032099691 100644 --- a/src/test/run-pass/cfg-macros-foo.rs +++ b/src/test/run-pass/cfg-macros-foo.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --cfg foo // check that cfg correctly chooses between the macro impls (see also diff --git a/src/test/run-pass/cfg-macros-notfoo.rs b/src/test/run-pass/cfg-macros-notfoo.rs index 4e1b833add017..cf61be97be5ba 100644 --- a/src/test/run-pass/cfg-macros-notfoo.rs +++ b/src/test/run-pass/cfg-macros-notfoo.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: // check that cfg correctly chooses between the macro impls (see also diff --git a/src/test/run-pass/cfg-match-arm.rs b/src/test/run-pass/cfg-match-arm.rs index 05dc7d52424b1..ad45f8900cfb0 100644 --- a/src/test/run-pass/cfg-match-arm.rs +++ b/src/test/run-pass/cfg-match-arm.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 enum Foo { diff --git a/src/test/run-pass/cfg-target-family.rs b/src/test/run-pass/cfg-target-family.rs index 7c279e43e0e63..7b50f3f4975af 100644 --- a/src/test/run-pass/cfg-target-family.rs +++ b/src/test/run-pass/cfg-target-family.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no target_family // ignore-wasm32-bare no target_family diff --git a/src/test/run-pass/cfg-target-vendor.rs b/src/test/run-pass/cfg-target-vendor.rs index 787ae5289dd58..383fffe715548 100644 --- a/src/test/run-pass/cfg-target-vendor.rs +++ b/src/test/run-pass/cfg-target-vendor.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(cfg_target_vendor)] #[cfg(target_vendor = "unknown")] diff --git a/src/test/run-pass/cfg_attr.rs b/src/test/run-pass/cfg_attr.rs index 9bef7f70420e2..c3d239ca9ce59 100644 --- a/src/test/run-pass/cfg_attr.rs +++ b/src/test/run-pass/cfg_attr.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:--cfg set1 --cfg set2 #![allow(dead_code)] use std::fmt::Debug; diff --git a/src/test/run-pass/cfg_inner_static.rs b/src/test/run-pass/cfg_inner_static.rs index b3d5ddc428308..ed4f6298ae3f9 100644 --- a/src/test/run-pass/cfg_inner_static.rs +++ b/src/test/run-pass/cfg_inner_static.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:cfg_inner_static.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/cfg_stmt_expr.rs b/src/test/run-pass/cfg_stmt_expr.rs index fcc93557665bf..f3e967810a03f 100644 --- a/src/test/run-pass/cfg_stmt_expr.rs +++ b/src/test/run-pass/cfg_stmt_expr.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(non_snake_case)] #![feature(stmt_expr_attributes)] diff --git a/src/test/run-pass/cfgs-on-items.rs b/src/test/run-pass/cfgs-on-items.rs index 1b692d8bd51f4..997a58be11624 100644 --- a/src/test/run-pass/cfgs-on-items.rs +++ b/src/test/run-pass/cfgs-on-items.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --cfg fooA --cfg fooB // fooA AND !bar diff --git a/src/test/run-pass/char.rs b/src/test/run-pass/char.rs index d63512f8066cb..1616d666c1b96 100644 --- a/src/test/run-pass/char.rs +++ b/src/test/run-pass/char.rs @@ -1,16 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - pub fn main() { let c: char = 'x'; let d: char = 'x'; diff --git a/src/test/run-pass/char_unicode.rs b/src/test/run-pass/char_unicode.rs index bfc7faac06ebe..90ec26e80bb49 100644 --- a/src/test/run-pass/char_unicode.rs +++ b/src/test/run-pass/char_unicode.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unicode_version)] /// Tests access to the internal Unicode Version type and value. diff --git a/src/test/run-pass/check-static-mut-slices.rs b/src/test/run-pass/check-static-mut-slices.rs index 1cfe5bdaebb7f..054052ceb564e 100644 --- a/src/test/run-pass/check-static-mut-slices.rs +++ b/src/test/run-pass/check-static-mut-slices.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Checks that mutable static items can have mutable slices diff --git a/src/test/run-pass/check-static-recursion-foreign.rs b/src/test/run-pass/check-static-recursion-foreign.rs index 9c87f2ca68203..cb3829935591c 100644 --- a/src/test/run-pass/check-static-recursion-foreign.rs +++ b/src/test/run-pass/check-static-recursion-foreign.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Static recursion check shouldn't fail when given a foreign item (#18279) // aux-build:check_static_recursion_foreign_helper.rs diff --git a/src/test/run-pass/check-static-slice.rs b/src/test/run-pass/check-static-slice.rs index b5f2bea5a3881..926ad7a4ada8d 100644 --- a/src/test/run-pass/check-static-slice.rs +++ b/src/test/run-pass/check-static-slice.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that the various ways of getting to a reference to a vec (both sized // and unsized) work properly. diff --git a/src/test/run-pass/check_const-feature-gated.rs b/src/test/run-pass/check_const-feature-gated.rs index ae27b76c747e6..1c816d5d7c32f 100644 --- a/src/test/run-pass/check_const-feature-gated.rs +++ b/src/test/run-pass/check_const-feature-gated.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const ARR: [usize; 1] = [2]; fn main() { diff --git a/src/test/run-pass/child-outlives-parent.rs b/src/test/run-pass/child-outlives-parent.rs index 03c80e497410e..80e3c81af5281 100644 --- a/src/test/run-pass/child-outlives-parent.rs +++ b/src/test/run-pass/child-outlives-parent.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Reported as issue #126, child leaks the string. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/class-attributes-1.rs b/src/test/run-pass/class-attributes-1.rs index 5dc27472184d7..901bf1d9788d8 100644 --- a/src/test/run-pass/class-attributes-1.rs +++ b/src/test/run-pass/class-attributes-1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pp-exact - Make sure we actually print the attributes #![allow(unused_attribute)] #![feature(custom_attribute)] diff --git a/src/test/run-pass/class-attributes-2.rs b/src/test/run-pass/class-attributes-2.rs index cc1b15bcb81cd..9a170c0969840 100644 --- a/src/test/run-pass/class-attributes-2.rs +++ b/src/test/run-pass/class-attributes-2.rs @@ -1,12 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![allow(unused_attribute)] #![feature(custom_attribute)] diff --git a/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs b/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs index 04c4b2cb37765..0d1d1703c711b 100644 --- a/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs +++ b/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:cci_class_cast.rs #![feature(box_syntax)] diff --git a/src/test/run-pass/class-cast-to-trait-multiple-types.rs b/src/test/run-pass/class-cast-to-trait-multiple-types.rs index e5acad3a3ad34..471f9c52bd8c8 100644 --- a/src/test/run-pass/class-cast-to-trait-multiple-types.rs +++ b/src/test/run-pass/class-cast-to-trait-multiple-types.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait noisy { fn speak(&mut self) -> isize; } diff --git a/src/test/run-pass/class-cast-to-trait.rs b/src/test/run-pass/class-cast-to-trait.rs index adb0b6cd0a75f..dff11e237d96e 100644 --- a/src/test/run-pass/class-cast-to-trait.rs +++ b/src/test/run-pass/class-cast-to-trait.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-freebsd FIXME fails on BSD diff --git a/src/test/run-pass/class-dtor.rs b/src/test/run-pass/class-dtor.rs index 05ec2bc0ac75d..26f7d830a07f7 100644 --- a/src/test/run-pass/class-dtor.rs +++ b/src/test/run-pass/class-dtor.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct cat { diff --git a/src/test/run-pass/class-exports.rs b/src/test/run-pass/class-exports.rs index 6783609b256c9..c8fb68e2dfe5e 100644 --- a/src/test/run-pass/class-exports.rs +++ b/src/test/run-pass/class-exports.rs @@ -1,14 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - /* Test that exporting a class also exports its public fields and methods */ diff --git a/src/test/run-pass/class-impl-very-parameterized-trait.rs b/src/test/run-pass/class-impl-very-parameterized-trait.rs index 27a57a8885915..af2e57bac6cec 100644 --- a/src/test/run-pass/class-impl-very-parameterized-trait.rs +++ b/src/test/run-pass/class-impl-very-parameterized-trait.rs @@ -1,14 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::cmp; #[derive(Copy, Clone, Debug)] diff --git a/src/test/run-pass/class-implement-trait-cross-crate.rs b/src/test/run-pass/class-implement-trait-cross-crate.rs index 5a1dc930efa54..8dc7754040bb5 100644 --- a/src/test/run-pass/class-implement-trait-cross-crate.rs +++ b/src/test/run-pass/class-implement-trait-cross-crate.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:cci_class_trait.rs extern crate cci_class_trait; use cci_class_trait::animals::noisy; diff --git a/src/test/run-pass/class-implement-traits.rs b/src/test/run-pass/class-implement-traits.rs index 394af6b9ecd51..9bbc623169370 100644 --- a/src/test/run-pass/class-implement-traits.rs +++ b/src/test/run-pass/class-implement-traits.rs @@ -1,14 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait noisy { fn speak(&mut self); } diff --git a/src/test/run-pass/class-method-cross-crate.rs b/src/test/run-pass/class-method-cross-crate.rs index 6ab158dc37ca5..b57f557ef356a 100644 --- a/src/test/run-pass/class-method-cross-crate.rs +++ b/src/test/run-pass/class-method-cross-crate.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:cci_class_2.rs extern crate cci_class_2; diff --git a/src/test/run-pass/class-methods-cross-crate.rs b/src/test/run-pass/class-methods-cross-crate.rs index 666571007595c..25cb45023b411 100644 --- a/src/test/run-pass/class-methods-cross-crate.rs +++ b/src/test/run-pass/class-methods-cross-crate.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:cci_class_3.rs extern crate cci_class_3; diff --git a/src/test/run-pass/class-methods.rs b/src/test/run-pass/class-methods.rs index 93af906bd5a6c..a22949c065b9c 100644 --- a/src/test/run-pass/class-methods.rs +++ b/src/test/run-pass/class-methods.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct cat { meows : usize, diff --git a/src/test/run-pass/class-poly-methods-cross-crate.rs b/src/test/run-pass/class-poly-methods-cross-crate.rs index 7d266181c9eb1..9949e3d95a5fb 100644 --- a/src/test/run-pass/class-poly-methods-cross-crate.rs +++ b/src/test/run-pass/class-poly-methods-cross-crate.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:cci_class_6.rs extern crate cci_class_6; diff --git a/src/test/run-pass/class-poly-methods.rs b/src/test/run-pass/class-poly-methods.rs index 5da858e3c4097..77336e7177333 100644 --- a/src/test/run-pass/class-poly-methods.rs +++ b/src/test/run-pass/class-poly-methods.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - struct cat { info : Vec , meows : usize, diff --git a/src/test/run-pass/class-separate-impl.rs b/src/test/run-pass/class-separate-impl.rs index 343d414758cc0..ebb30f9273b5e 100644 --- a/src/test/run-pass/class-separate-impl.rs +++ b/src/test/run-pass/class-separate-impl.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] use std::fmt; diff --git a/src/test/run-pass/class-str-field.rs b/src/test/run-pass/class-str-field.rs index e3b9b56db0b5b..db656480cf060 100644 --- a/src/test/run-pass/class-str-field.rs +++ b/src/test/run-pass/class-str-field.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct cat { diff --git a/src/test/run-pass/class-typarams.rs b/src/test/run-pass/class-typarams.rs index cc9a118ba19d1..8f4a3e840262a 100644 --- a/src/test/run-pass/class-typarams.rs +++ b/src/test/run-pass/class-typarams.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 use std::marker::PhantomData; diff --git a/src/test/run-pass/classes-cross-crate.rs b/src/test/run-pass/classes-cross-crate.rs index 3d99aa1ef1d08..d00388d17ed54 100644 --- a/src/test/run-pass/classes-cross-crate.rs +++ b/src/test/run-pass/classes-cross-crate.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:cci_class_4.rs extern crate cci_class_4; diff --git a/src/test/run-pass/classes-self-referential.rs b/src/test/run-pass/classes-self-referential.rs index 487d20729d4e7..1134abf77db73 100644 --- a/src/test/run-pass/classes-self-referential.rs +++ b/src/test/run-pass/classes-self-referential.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // pretty-expanded FIXME #23616 struct kitten { diff --git a/src/test/run-pass/classes-simple-cross-crate.rs b/src/test/run-pass/classes-simple-cross-crate.rs index db15001c62f19..19e0c489fe956 100644 --- a/src/test/run-pass/classes-simple-cross-crate.rs +++ b/src/test/run-pass/classes-simple-cross-crate.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:cci_class.rs extern crate cci_class; diff --git a/src/test/run-pass/classes-simple-method.rs b/src/test/run-pass/classes-simple-method.rs index 64ec2ea7e71ae..2cb4025bad83b 100644 --- a/src/test/run-pass/classes-simple-method.rs +++ b/src/test/run-pass/classes-simple-method.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct cat { meows : usize, diff --git a/src/test/run-pass/classes-simple.rs b/src/test/run-pass/classes-simple.rs index c475fb2cff945..d08e0ce59b278 100644 --- a/src/test/run-pass/classes-simple.rs +++ b/src/test/run-pass/classes-simple.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct cat { meows : usize, diff --git a/src/test/run-pass/classes.rs b/src/test/run-pass/classes.rs index fa0dda11233a8..a133cd46a4c8c 100644 --- a/src/test/run-pass/classes.rs +++ b/src/test/run-pass/classes.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct cat { meows : usize, diff --git a/src/test/run-pass/cleanup-arm-conditional.rs b/src/test/run-pass/cleanup-arm-conditional.rs index dd900c56b40b1..07023c5579148 100644 --- a/src/test/run-pass/cleanup-arm-conditional.rs +++ b/src/test/run-pass/cleanup-arm-conditional.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that cleanup scope for temporaries created in a match // arm is confined to the match arm itself. diff --git a/src/test/run-pass/cleanup-rvalue-during-if-and-while.rs b/src/test/run-pass/cleanup-rvalue-during-if-and-while.rs index b117f4abd9572..370c95c6668d9 100644 --- a/src/test/run-pass/cleanup-rvalue-during-if-and-while.rs +++ b/src/test/run-pass/cleanup-rvalue-during-if-and-while.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test verifies that temporaries created for `while`'s and `if` // conditions are dropped after the condition is evaluated. diff --git a/src/test/run-pass/cleanup-rvalue-for-scope.rs b/src/test/run-pass/cleanup-rvalue-for-scope.rs index f69a0332cc4f4..abe58b084d2b6 100644 --- a/src/test/run-pass/cleanup-rvalue-for-scope.rs +++ b/src/test/run-pass/cleanup-rvalue-for-scope.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the lifetime of rvalues in for loops is extended // to the for loop itself. diff --git a/src/test/run-pass/cleanup-rvalue-scopes.rs b/src/test/run-pass/cleanup-rvalue-scopes.rs index b5bf35a7006a3..0baa5b4670849 100644 --- a/src/test/run-pass/cleanup-rvalue-scopes.rs +++ b/src/test/run-pass/cleanup-rvalue-scopes.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that destructors for rvalue temporaries run either at end of // statement or end of block, as appropriate given the temporary // lifetime rules. diff --git a/src/test/run-pass/cleanup-rvalue-temp-during-incomplete-alloc.rs b/src/test/run-pass/cleanup-rvalue-temp-during-incomplete-alloc.rs index ae455d916b6f9..c74930691b33c 100644 --- a/src/test/run-pass/cleanup-rvalue-temp-during-incomplete-alloc.rs +++ b/src/test/run-pass/cleanup-rvalue-temp-during-incomplete-alloc.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test cleanup of rvalue temporary that occurs while `box` construction // is in progress. This scenario revealed a rather terrible bug. The // ingredients are: diff --git a/src/test/run-pass/cleanup-shortcircuit.rs b/src/test/run-pass/cleanup-shortcircuit.rs index 2460fa92925e4..118fa0083ab47 100644 --- a/src/test/run-pass/cleanup-shortcircuit.rs +++ b/src/test/run-pass/cleanup-shortcircuit.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that cleanups for the RHS of shortcircuiting operators work. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/clone-closure.rs b/src/test/run-pass/clone-closure.rs index 0fe3711d8d32e..f7bab960ec96e 100644 --- a/src/test/run-pass/clone-closure.rs +++ b/src/test/run-pass/clone-closure.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that closures implement `Clone`. #[derive(Clone)] diff --git a/src/test/run-pass/clone-with-exterior.rs b/src/test/run-pass/clone-with-exterior.rs index 6ac7acd2a6b68..08493d088b3b9 100644 --- a/src/test/run-pass/clone-with-exterior.rs +++ b/src/test/run-pass/clone-with-exterior.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support #![feature(box_syntax)] diff --git a/src/test/run-pass/close-over-big-then-small-data.rs b/src/test/run-pass/close-over-big-then-small-data.rs index ba700e4e32651..ab691da45443d 100644 --- a/src/test/run-pass/close-over-big-then-small-data.rs +++ b/src/test/run-pass/close-over-big-then-small-data.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // If we use GEPi rather than GEP_tup_like when // storing closure data (as we used to do), the u64 would // overwrite the u16. diff --git a/src/test/run-pass/closure-bounds-can-capture-chan.rs b/src/test/run-pass/closure-bounds-can-capture-chan.rs index 5268e855d5fd8..1478fec601d07 100644 --- a/src/test/run-pass/closure-bounds-can-capture-chan.rs +++ b/src/test/run-pass/closure-bounds-can-capture-chan.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 use std::sync::mpsc::channel; diff --git a/src/test/run-pass/closure-expected-type/expect-infer-supply-two-infers.rs b/src/test/run-pass/closure-expected-type/expect-infer-supply-two-infers.rs index 8a90a491f7e58..c46fbae59b170 100644 --- a/src/test/run-pass/closure-expected-type/expect-infer-supply-two-infers.rs +++ b/src/test/run-pass/closure-expected-type/expect-infer-supply-two-infers.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn with_closure(_: F) where F: FnOnce(Vec, A) { diff --git a/src/test/run-pass/closure-expected-type/issue-38714.rs b/src/test/run-pass/closure-expected-type/issue-38714.rs index a1d512105c933..1783ff285e508 100644 --- a/src/test/run-pass/closure-expected-type/issue-38714.rs +++ b/src/test/run-pass/closure-expected-type/issue-38714.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct UsizeRef<'a> { a: &'a usize } diff --git a/src/test/run-pass/closure-expected-type/supply-just-return-type.rs b/src/test/run-pass/closure-expected-type/supply-just-return-type.rs index 0b930b338fd72..72314c732667f 100644 --- a/src/test/run-pass/closure-expected-type/supply-just-return-type.rs +++ b/src/test/run-pass/closure-expected-type/supply-just-return-type.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn with_closure(f: F) -> Result where F: FnOnce(&char) -> Result, { diff --git a/src/test/run-pass/closure-expected-type/supply-nothing.rs b/src/test/run-pass/closure-expected-type/supply-nothing.rs index 15d8b393c152f..da477bf7de812 100644 --- a/src/test/run-pass/closure-expected-type/supply-nothing.rs +++ b/src/test/run-pass/closure-expected-type/supply-nothing.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn with_closure(f: F) -> u32 where F: FnOnce(&u32, &u32) -> u32 { diff --git a/src/test/run-pass/closure-immediate.rs b/src/test/run-pass/closure-immediate.rs index e566c10583597..004f6f31fc650 100644 --- a/src/test/run-pass/closure-immediate.rs +++ b/src/test/run-pass/closure-immediate.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // After the work to reoptimize structs, it became possible for immediate logic to fail. // This test verifies that it actually works. diff --git a/src/test/run-pass/closure-inference.rs b/src/test/run-pass/closure-inference.rs index 630a510ca651e..f02b11d1da683 100644 --- a/src/test/run-pass/closure-inference.rs +++ b/src/test/run-pass/closure-inference.rs @@ -1,15 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - fn foo(i: isize) -> isize { i + 1 } fn apply(f: F, v: A) -> A where F: FnOnce(A) -> A { f(v) } diff --git a/src/test/run-pass/closure-inference2.rs b/src/test/run-pass/closure-inference2.rs index 2f24cd4ce4043..491f4ad312296 100644 --- a/src/test/run-pass/closure-inference2.rs +++ b/src/test/run-pass/closure-inference2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test a rather underspecified example: diff --git a/src/test/run-pass/closure-reform.rs b/src/test/run-pass/closure-reform.rs index a37733bdc2df8..7ab354254ffed 100644 --- a/src/test/run-pass/closure-reform.rs +++ b/src/test/run-pass/closure-reform.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ diff --git a/src/test/run-pass/closure-returning-closure.rs b/src/test/run-pass/closure-returning-closure.rs index 2c00f770cd91d..4a61fa5ca599c 100644 --- a/src/test/run-pass/closure-returning-closure.rs +++ b/src/test/run-pass/closure-returning-closure.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let f = |_||x, y| x+y; assert_eq!(f(())(1, 2), 3); diff --git a/src/test/run-pass/closure-to-fn-coercion.rs b/src/test/run-pass/closure-to-fn-coercion.rs index 343209143cc2f..26d4d4a2f7d51 100644 --- a/src/test/run-pass/closure-to-fn-coercion.rs +++ b/src/test/run-pass/closure-to-fn-coercion.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::mem; const FOO: fn(u8) -> u8 = |v: u8| { v }; diff --git a/src/test/run-pass/closure_to_fn_coercion-expected-types.rs b/src/test/run-pass/closure_to_fn_coercion-expected-types.rs index 41da3089c884e..257a18dd5bfe3 100644 --- a/src/test/run-pass/closure_to_fn_coercion-expected-types.rs +++ b/src/test/run-pass/closure_to_fn_coercion-expected-types.rs @@ -1,12 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // Ensure that we deduce expected argument types when a `fn()` type is expected (#41755) fn foo(f: fn(Vec) -> usize) { } diff --git a/src/test/run-pass/cmp-default.rs b/src/test/run-pass/cmp-default.rs index d4b570a4db654..3be0eb4c5d52a 100644 --- a/src/test/run-pass/cmp-default.rs +++ b/src/test/run-pass/cmp-default.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::cmp::Ordering; // Test default methods in PartialOrd and PartialEq diff --git a/src/test/run-pass/codegen-object-shim.rs b/src/test/run-pass/codegen-object-shim.rs index 5fbfef05e10d4..4e2d7ac608653 100644 --- a/src/test/run-pass/codegen-object-shim.rs +++ b/src/test/run-pass/codegen-object-shim.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { assert_eq!((ToString::to_string as fn(&(ToString+'static)) -> String)(&"foo"), String::from("foo")); diff --git a/src/test/run-pass/codegen-tag-static-padding.rs b/src/test/run-pass/codegen-tag-static-padding.rs index ba01d51dc6a5d..f95f23d8c23cb 100644 --- a/src/test/run-pass/codegen-tag-static-padding.rs +++ b/src/test/run-pass/codegen-tag-static-padding.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // Issue #13186 // For simplicity of explanations assuming code is compiled for x86_64 diff --git a/src/test/run-pass/coerce-expect-unsized.rs b/src/test/run-pass/coerce-expect-unsized.rs index 5a1953b563aa4..6ed9760648aee 100644 --- a/src/test/run-pass/coerce-expect-unsized.rs +++ b/src/test/run-pass/coerce-expect-unsized.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] use std::cell::RefCell; diff --git a/src/test/run-pass/coerce-overloaded-autoderef.rs b/src/test/run-pass/coerce-overloaded-autoderef.rs index 091e29dd18a6b..ef7f36a1778e0 100644 --- a/src/test/run-pass/coerce-overloaded-autoderef.rs +++ b/src/test/run-pass/coerce-overloaded-autoderef.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 use std::rc::Rc; diff --git a/src/test/run-pass/coerce-reborrow-imm-ptr-arg.rs b/src/test/run-pass/coerce-reborrow-imm-ptr-arg.rs index 581764d4a3b2f..17bf2f7e8e3e1 100644 --- a/src/test/run-pass/coerce-reborrow-imm-ptr-arg.rs +++ b/src/test/run-pass/coerce-reborrow-imm-ptr-arg.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn negate(x: &isize) -> isize { diff --git a/src/test/run-pass/coerce-reborrow-imm-ptr-rcvr.rs b/src/test/run-pass/coerce-reborrow-imm-ptr-rcvr.rs index 5258ad1af5150..7558cefefc92a 100644 --- a/src/test/run-pass/coerce-reborrow-imm-ptr-rcvr.rs +++ b/src/test/run-pass/coerce-reborrow-imm-ptr-rcvr.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct SpeechMaker { speeches: usize } diff --git a/src/test/run-pass/coerce-reborrow-imm-vec-arg.rs b/src/test/run-pass/coerce-reborrow-imm-vec-arg.rs index 1786d5b54f3a2..45be408cf7fd9 100644 --- a/src/test/run-pass/coerce-reborrow-imm-vec-arg.rs +++ b/src/test/run-pass/coerce-reborrow-imm-vec-arg.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn sum(x: &[isize]) -> isize { diff --git a/src/test/run-pass/coerce-reborrow-imm-vec-rcvr.rs b/src/test/run-pass/coerce-reborrow-imm-vec-rcvr.rs index e86f20694e103..86bd320bf5ac9 100644 --- a/src/test/run-pass/coerce-reborrow-imm-vec-rcvr.rs +++ b/src/test/run-pass/coerce-reborrow-imm-vec-rcvr.rs @@ -1,15 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - fn bar(v: &mut [usize]) -> Vec { v.to_vec() } diff --git a/src/test/run-pass/coerce-reborrow-mut-ptr-arg.rs b/src/test/run-pass/coerce-reborrow-mut-ptr-arg.rs index b70146ea2d363..3eec1309e7152 100644 --- a/src/test/run-pass/coerce-reborrow-mut-ptr-arg.rs +++ b/src/test/run-pass/coerce-reborrow-mut-ptr-arg.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct SpeechMaker { diff --git a/src/test/run-pass/coerce-reborrow-mut-ptr-rcvr.rs b/src/test/run-pass/coerce-reborrow-mut-ptr-rcvr.rs index 5f4cc569ac4e7..1a4e152e55dc5 100644 --- a/src/test/run-pass/coerce-reborrow-mut-ptr-rcvr.rs +++ b/src/test/run-pass/coerce-reborrow-mut-ptr-rcvr.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct SpeechMaker { diff --git a/src/test/run-pass/coerce-reborrow-mut-vec-arg.rs b/src/test/run-pass/coerce-reborrow-mut-vec-arg.rs index ca4ee4a97d524..81ff075b9c7b5 100644 --- a/src/test/run-pass/coerce-reborrow-mut-vec-arg.rs +++ b/src/test/run-pass/coerce-reborrow-mut-vec-arg.rs @@ -1,15 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - fn reverse(v: &mut [usize]) { v.reverse(); } diff --git a/src/test/run-pass/coerce-reborrow-mut-vec-rcvr.rs b/src/test/run-pass/coerce-reborrow-mut-vec-rcvr.rs index f35735adbcfe2..f0caa6d679937 100644 --- a/src/test/run-pass/coerce-reborrow-mut-vec-rcvr.rs +++ b/src/test/run-pass/coerce-reborrow-mut-vec-rcvr.rs @@ -1,15 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - fn bar(v: &mut [usize]) { v.reverse(); v.reverse(); diff --git a/src/test/run-pass/coerce-unify-return.rs b/src/test/run-pass/coerce-unify-return.rs index 2299a03b2a423..7f9b26acc7070 100644 --- a/src/test/run-pass/coerce-unify-return.rs +++ b/src/test/run-pass/coerce-unify-return.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that coercions unify the expected return type of a polymorphic // function call, instead of leaving the type variables as they were. diff --git a/src/test/run-pass/coerce-unify.rs b/src/test/run-pass/coerce-unify.rs index 3d690146931d9..b96300811efc4 100644 --- a/src/test/run-pass/coerce-unify.rs +++ b/src/test/run-pass/coerce-unify.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that coercions can unify if-else, match arms and array elements. // Try to construct if-else chains, matches and arrays out of given expressions. diff --git a/src/test/run-pass/coerce-unsize-subtype.rs b/src/test/run-pass/coerce-unsize-subtype.rs index b19708f5a8931..a3d3d46165c44 100644 --- a/src/test/run-pass/coerce-unsize-subtype.rs +++ b/src/test/run-pass/coerce-unsize-subtype.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 use std::rc::Rc; diff --git a/src/test/run-pass/coherence-bigint-int.rs b/src/test/run-pass/coherence-bigint-int.rs index 9ad4f6b9d75c7..07b91cbd45d38 100644 --- a/src/test/run-pass/coherence-bigint-int.rs +++ b/src/test/run-pass/coherence-bigint-int.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:coherence_lib.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/coherence-bigint-vecint.rs b/src/test/run-pass/coherence-bigint-vecint.rs index ac4b98cfc8c81..f14f7310cf680 100644 --- a/src/test/run-pass/coherence-bigint-vecint.rs +++ b/src/test/run-pass/coherence-bigint-vecint.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:coherence_lib.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/coherence-blanket.rs b/src/test/run-pass/coherence-blanket.rs index 32743aafa8236..99b22c775f983 100644 --- a/src/test/run-pass/coherence-blanket.rs +++ b/src/test/run-pass/coherence-blanket.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:coherence_lib.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/coherence-covered-type-parameter.rs b/src/test/run-pass/coherence-covered-type-parameter.rs index 890470d8ac242..a6b03ac2063c8 100644 --- a/src/test/run-pass/coherence-covered-type-parameter.rs +++ b/src/test/run-pass/coherence-covered-type-parameter.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:coherence_lib.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/coherence-impl-in-fn.rs b/src/test/run-pass/coherence-impl-in-fn.rs index d7c21340afc39..0923f4e8a63d3 100644 --- a/src/test/run-pass/coherence-impl-in-fn.rs +++ b/src/test/run-pass/coherence-impl-in-fn.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { #[derive(Copy, Clone)] enum x { foo } diff --git a/src/test/run-pass/coherence-iterator-vec-any-elem.rs b/src/test/run-pass/coherence-iterator-vec-any-elem.rs index 04a6cd5882789..e1a5152b701b6 100644 --- a/src/test/run-pass/coherence-iterator-vec-any-elem.rs +++ b/src/test/run-pass/coherence-iterator-vec-any-elem.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:coherence_lib.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/coherence-iterator-vec.rs b/src/test/run-pass/coherence-iterator-vec.rs index 8a3301dee273d..08f3f5486ca0c 100644 --- a/src/test/run-pass/coherence-iterator-vec.rs +++ b/src/test/run-pass/coherence-iterator-vec.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:coherence_lib.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/coherence-multidispatch-tuple.rs b/src/test/run-pass/coherence-multidispatch-tuple.rs index 07477f96c0d3d..04d3e53f75931 100644 --- a/src/test/run-pass/coherence-multidispatch-tuple.rs +++ b/src/test/run-pass/coherence-multidispatch-tuple.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 use std::fmt::Debug; diff --git a/src/test/run-pass/coherence-negative-impls-safe.rs b/src/test/run-pass/coherence-negative-impls-safe.rs index 2f42ab4988ace..3988b8680f51b 100644 --- a/src/test/run-pass/coherence-negative-impls-safe.rs +++ b/src/test/run-pass/coherence-negative-impls-safe.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(optin_builtin_traits)] diff --git a/src/test/run-pass/coherence-rfc447-constrained.rs b/src/test/run-pass/coherence-rfc447-constrained.rs index 4b52378e50889..e2f7182d0f395 100644 --- a/src/test/run-pass/coherence-rfc447-constrained.rs +++ b/src/test/run-pass/coherence-rfc447-constrained.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // check that trait matching can handle impls whose types are only // constrained by a projection. diff --git a/src/test/run-pass/coherence-subtyping.rs b/src/test/run-pass/coherence-subtyping.rs index eb04514271c75..b2e6b9732f172 100644 --- a/src/test/run-pass/coherence-subtyping.rs +++ b/src/test/run-pass/coherence-subtyping.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that two distinct impls which match subtypes of one another // yield coherence errors (or not) depending on the variance. diff --git a/src/test/run-pass/coherence-where-clause.rs b/src/test/run-pass/coherence-where-clause.rs index 8ab340d1bff65..9e94534c0e55c 100644 --- a/src/test/run-pass/coherence-where-clause.rs +++ b/src/test/run-pass/coherence-where-clause.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt::Debug; use std::default::Default; diff --git a/src/test/run-pass/coherence_copy_like.rs b/src/test/run-pass/coherence_copy_like.rs index 71db5225ecc08..7b7557eb59962 100644 --- a/src/test/run-pass/coherence_copy_like.rs +++ b/src/test/run-pass/coherence_copy_like.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are able to introduce a negative constraint that // `MyType: !MyTrait` along with other "fundamental" wrappers. diff --git a/src/test/run-pass/collections-const-new.rs b/src/test/run-pass/collections-const-new.rs index 4003c2ec4f7e4..e6eaa2e89f54b 100644 --- a/src/test/run-pass/collections-const-new.rs +++ b/src/test/run-pass/collections-const-new.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test several functions can be used for constants // 1. Vec::new() // 2. String::new() diff --git a/src/test/run-pass/colorful-write-macros.rs b/src/test/run-pass/colorful-write-macros.rs index 21ff6d6938a3b..26038bf318761 100644 --- a/src/test/run-pass/colorful-write-macros.rs +++ b/src/test/run-pass/colorful-write-macros.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::io::Write; use std::fmt; diff --git a/src/test/run-pass/comm.rs b/src/test/run-pass/comm.rs index 7c78cbdce0853..5eea2de07e418 100644 --- a/src/test/run-pass/comm.rs +++ b/src/test/run-pass/comm.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/command-before-exec.rs b/src/test/run-pass/command-before-exec.rs index 9599f65da4eca..769997d369189 100644 --- a/src/test/run-pass/command-before-exec.rs +++ b/src/test/run-pass/command-before-exec.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-windows - this is a unix-specific test // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/command-exec.rs b/src/test/run-pass/command-exec.rs index d6d0c2b36f647..643d75101f43f 100644 --- a/src/test/run-pass/command-exec.rs +++ b/src/test/run-pass/command-exec.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-windows - this is a unix-specific test // ignore-pretty issue #37199 // ignore-cloudabi no processes diff --git a/src/test/run-pass/compare-generic-enums.rs b/src/test/run-pass/compare-generic-enums.rs index 228a73326e117..11488103f3538 100644 --- a/src/test/run-pass/compare-generic-enums.rs +++ b/src/test/run-pass/compare-generic-enums.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - type an_int = isize; fn cmp(x: Option, y: Option) -> bool { diff --git a/src/test/run-pass/compiletest-skip-codegen.rs b/src/test/run-pass/compiletest-skip-codegen.rs index d318b8fa44bc6..3c0e22613128a 100644 --- a/src/test/run-pass/compiletest-skip-codegen.rs +++ b/src/test/run-pass/compiletest-skip-codegen.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that with the `skip-codegen` option the test isn't executed. // skip-codegen diff --git a/src/test/run-pass/complex.rs b/src/test/run-pass/complex.rs index 6bb9503c2b0e4..48824cab65d39 100644 --- a/src/test/run-pass/complex.rs +++ b/src/test/run-pass/complex.rs @@ -1,16 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - type t = isize; fn nothing() { } diff --git a/src/test/run-pass/concat.rs b/src/test/run-pass/concat.rs index 9a2390a9e68d3..e89763745beb2 100644 --- a/src/test/run-pass/concat.rs +++ b/src/test/run-pass/concat.rs @@ -1,14 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { assert_eq!(format!(concat!("foo", "bar", "{}"), "baz"), "foobarbaz".to_string()); assert_eq!(format!(concat!()), "".to_string()); diff --git a/src/test/run-pass/conditional-compile-arch.rs b/src/test/run-pass/conditional-compile-arch.rs index 1efbfb927fa75..e9efa7216a200 100644 --- a/src/test/run-pass/conditional-compile-arch.rs +++ b/src/test/run-pass/conditional-compile-arch.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #[cfg(target_arch = "x86")] diff --git a/src/test/run-pass/conditional-compile.rs b/src/test/run-pass/conditional-compile.rs index 01bdcfeaefb45..b731c5cea70e5 100644 --- a/src/test/run-pass/conditional-compile.rs +++ b/src/test/run-pass/conditional-compile.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Crate use statements #[cfg(bogus)] diff --git a/src/test/run-pass/conditional-debug-macro-on.rs b/src/test/run-pass/conditional-debug-macro-on.rs index 7da33be7a57da..d4141f35d56d5 100644 --- a/src/test/run-pass/conditional-debug-macro-on.rs +++ b/src/test/run-pass/conditional-debug-macro-on.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { // exits early if println! evaluates its arguments, otherwise it // will hit the panic. diff --git a/src/test/run-pass/conservative_impl_trait.rs b/src/test/run-pass/conservative_impl_trait.rs index 14e1ca612c087..64d93aec3182e 100644 --- a/src/test/run-pass/conservative_impl_trait.rs +++ b/src/test/run-pass/conservative_impl_trait.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // #39665 fn batches(n: &u32) -> impl Iterator { diff --git a/src/test/run-pass/const-adt-align-mismatch.rs b/src/test/run-pass/const-adt-align-mismatch.rs index 46cd708a13969..f0639784e7bde 100644 --- a/src/test/run-pass/const-adt-align-mismatch.rs +++ b/src/test/run-pass/const-adt-align-mismatch.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::mem; #[derive(PartialEq, Debug)] diff --git a/src/test/run-pass/const-autoderef.rs b/src/test/run-pass/const-autoderef.rs index 6b3970e4f1997..d21fc6abda0b2 100644 --- a/src/test/run-pass/const-autoderef.rs +++ b/src/test/run-pass/const-autoderef.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - const A: [u8; 1] = ['h' as u8]; const B: u8 = (&A)[0]; const C: &'static &'static &'static &'static [u8; 1] = & & & &A; diff --git a/src/test/run-pass/const-big-enum.rs b/src/test/run-pass/const-big-enum.rs index 33e5e05465000..cc742a3192cdf 100644 --- a/src/test/run-pass/const-big-enum.rs +++ b/src/test/run-pass/const-big-enum.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum Foo { Bar(u32), Baz, diff --git a/src/test/run-pass/const-binops.rs b/src/test/run-pass/const-binops.rs index a29953bea887b..aec9b47cf85ff 100644 --- a/src/test/run-pass/const-binops.rs +++ b/src/test/run-pass/const-binops.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - macro_rules! assert_approx_eq { ($a:expr, $b:expr) => ({ let (a, b) = (&$a, &$b); diff --git a/src/test/run-pass/const-bitshift-rhs-inference.rs b/src/test/run-pass/const-bitshift-rhs-inference.rs index b377fd230b980..e79bf9d1bb136 100644 --- a/src/test/run-pass/const-bitshift-rhs-inference.rs +++ b/src/test/run-pass/const-bitshift-rhs-inference.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const RHS: u8 = 8; const IRHS: i8 = 8; const RHS16: u16 = 8; diff --git a/src/test/run-pass/const-block-cross-crate-fn.rs b/src/test/run-pass/const-block-cross-crate-fn.rs index 6fa6feffbfa00..701173d975605 100644 --- a/src/test/run-pass/const-block-cross-crate-fn.rs +++ b/src/test/run-pass/const-block-cross-crate-fn.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:cci_const_block.rs diff --git a/src/test/run-pass/const-block-item-macro-codegen.rs b/src/test/run-pass/const-block-item-macro-codegen.rs index 8a4b220a3763c..ce563a2408df4 100644 --- a/src/test/run-pass/const-block-item-macro-codegen.rs +++ b/src/test/run-pass/const-block-item-macro-codegen.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // General test that function items in static blocks // can be generated with a macro. diff --git a/src/test/run-pass/const-block-item.rs b/src/test/run-pass/const-block-item.rs index 51ebc240e7288..9076b091c9d04 100644 --- a/src/test/run-pass/const-block-item.rs +++ b/src/test/run-pass/const-block-item.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - mod foo { pub trait Value { fn value(&self) -> usize; diff --git a/src/test/run-pass/const-block.rs b/src/test/run-pass/const-block.rs index e6f191ea9522f..68ed657bb628a 100644 --- a/src/test/run-pass/const-block.rs +++ b/src/test/run-pass/const-block.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![allow(dead_code)] #![allow(unused_unsafe)] diff --git a/src/test/run-pass/const-bound.rs b/src/test/run-pass/const-bound.rs index 72a23b998e5a1..6238f00b3c3ff 100644 --- a/src/test/run-pass/const-bound.rs +++ b/src/test/run-pass/const-bound.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Make sure const bounds work on things, and test that a few types // are const. diff --git a/src/test/run-pass/const-byte-str-cast.rs b/src/test/run-pass/const-byte-str-cast.rs index 7297c71a6d668..a71328bf10a56 100644 --- a/src/test/run-pass/const-byte-str-cast.rs +++ b/src/test/run-pass/const-byte-str-cast.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[deny(warnings)] pub fn main() { diff --git a/src/test/run-pass/const-cast-ptr-int.rs b/src/test/run-pass/const-cast-ptr-int.rs index e7674f893d377..2ec6d3026a5ed 100644 --- a/src/test/run-pass/const-cast-ptr-int.rs +++ b/src/test/run-pass/const-cast-ptr-int.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::ptr; struct TestStruct { diff --git a/src/test/run-pass/const-cast.rs b/src/test/run-pass/const-cast.rs index e77fd5f71394e..31de5aa171ea2 100644 --- a/src/test/run-pass/const-cast.rs +++ b/src/test/run-pass/const-cast.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct TestStruct { x: *const u8, } diff --git a/src/test/run-pass/const-const.rs b/src/test/run-pass/const-const.rs index b28017b85ad61..654b66ac23258 100644 --- a/src/test/run-pass/const-const.rs +++ b/src/test/run-pass/const-const.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - const a: isize = 1; const b: isize = a + 2; diff --git a/src/test/run-pass/const-contents.rs b/src/test/run-pass/const-contents.rs index 0d9d0e0e0aa73..2e52b7f0b3448 100644 --- a/src/test/run-pass/const-contents.rs +++ b/src/test/run-pass/const-contents.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #570 diff --git a/src/test/run-pass/const-cross-crate-const.rs b/src/test/run-pass/const-cross-crate-const.rs index d66c335db2e87..a4f25d656e50c 100644 --- a/src/test/run-pass/const-cross-crate-const.rs +++ b/src/test/run-pass/const-cross-crate-const.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:cci_const.rs diff --git a/src/test/run-pass/const-cross-crate-extern.rs b/src/test/run-pass/const-cross-crate-extern.rs index bbe31ceed33cf..921e487d83e6f 100644 --- a/src/test/run-pass/const-cross-crate-extern.rs +++ b/src/test/run-pass/const-cross-crate-extern.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:cci_const.rs diff --git a/src/test/run-pass/const-deref.rs b/src/test/run-pass/const-deref.rs index f5407f0c81523..382c78aca2a32 100644 --- a/src/test/run-pass/const-deref.rs +++ b/src/test/run-pass/const-deref.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - const C: &'static isize = &1000; static D: isize = *C; diff --git a/src/test/run-pass/const-endianess.rs b/src/test/run-pass/const-endianess.rs index 95c738d3ec49a..6b6a1ee987d0b 100644 --- a/src/test/run-pass/const-endianess.rs +++ b/src/test/run-pass/const-endianess.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_int_ops)] #![feature(test)] diff --git a/src/test/run-pass/const-enum-byref-self.rs b/src/test/run-pass/const-enum-byref-self.rs index 57470c4a67e26..afc5b944229ef 100644 --- a/src/test/run-pass/const-enum-byref-self.rs +++ b/src/test/run-pass/const-enum-byref-self.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum E { V, VV(isize) } static C: E = E::V; diff --git a/src/test/run-pass/const-enum-byref.rs b/src/test/run-pass/const-enum-byref.rs index e3f1d5d35320c..b2005096a5b1f 100644 --- a/src/test/run-pass/const-enum-byref.rs +++ b/src/test/run-pass/const-enum-byref.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum E { V, VV(isize) } static C: E = E::V; diff --git a/src/test/run-pass/const-enum-cast.rs b/src/test/run-pass/const-enum-cast.rs index 38f21f7e95962..6f5007f3ea224 100644 --- a/src/test/run-pass/const-enum-cast.rs +++ b/src/test/run-pass/const-enum-cast.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum A { A1, A2 } enum B { B1=0, B2=2 } diff --git a/src/test/run-pass/const-enum-ptr.rs b/src/test/run-pass/const-enum-ptr.rs index 40a1c99e987db..b031cce5d982a 100644 --- a/src/test/run-pass/const-enum-ptr.rs +++ b/src/test/run-pass/const-enum-ptr.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum E { V0, V1(isize) } static C: &'static E = &E::V0; diff --git a/src/test/run-pass/const-enum-struct.rs b/src/test/run-pass/const-enum-struct.rs index 46c4f82eb98e1..81f36064671ad 100644 --- a/src/test/run-pass/const-enum-struct.rs +++ b/src/test/run-pass/const-enum-struct.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum E { V16(u16), V32(u32) } struct S { a: E, b: u16, c: u16 } static C: S = S { a: E::V16(0xDEAD), b: 0x600D, c: 0xBAD }; diff --git a/src/test/run-pass/const-enum-struct2.rs b/src/test/run-pass/const-enum-struct2.rs index e356ecb385b98..25523b0a36eca 100644 --- a/src/test/run-pass/const-enum-struct2.rs +++ b/src/test/run-pass/const-enum-struct2.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum E { V0, V16(u16) } struct S { a: E, b: u16, c: u16 } static C: S = S { a: E::V0, b: 0x600D, c: 0xBAD }; diff --git a/src/test/run-pass/const-enum-structlike.rs b/src/test/run-pass/const-enum-structlike.rs index a526e0be3da41..5f5e687e08f31 100644 --- a/src/test/run-pass/const-enum-structlike.rs +++ b/src/test/run-pass/const-enum-structlike.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum E { S0 { s: String }, S1 { u: usize } diff --git a/src/test/run-pass/const-enum-tuple.rs b/src/test/run-pass/const-enum-tuple.rs index 476defaa524a0..ce581e081ac69 100644 --- a/src/test/run-pass/const-enum-tuple.rs +++ b/src/test/run-pass/const-enum-tuple.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum E { V16(u16), V32(u32) } static C: (E, u16, u16) = (E::V16(0xDEAD), 0x600D, 0xBAD); diff --git a/src/test/run-pass/const-enum-tuple2.rs b/src/test/run-pass/const-enum-tuple2.rs index 61043ef75a4c5..dd322e2d66b6f 100644 --- a/src/test/run-pass/const-enum-tuple2.rs +++ b/src/test/run-pass/const-enum-tuple2.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum E { V0, V16(u16) } static C: (E, u16, u16) = (E::V0, 0x600D, 0xBAD); diff --git a/src/test/run-pass/const-enum-tuplestruct.rs b/src/test/run-pass/const-enum-tuplestruct.rs index f574508522b26..dd128a0739ed5 100644 --- a/src/test/run-pass/const-enum-tuplestruct.rs +++ b/src/test/run-pass/const-enum-tuplestruct.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum E { V16(u16), V32(u32) } struct S(E, u16, u16); static C: S = S(E::V16(0xDEAD), 0x600D, 0xBAD); diff --git a/src/test/run-pass/const-enum-tuplestruct2.rs b/src/test/run-pass/const-enum-tuplestruct2.rs index 88cfc0dec7028..907d39976ad68 100644 --- a/src/test/run-pass/const-enum-tuplestruct2.rs +++ b/src/test/run-pass/const-enum-tuplestruct2.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum E { V0, V16(u16) } struct S(E, u16, u16); static C: S = S(E::V0, 0x600D, 0xBAD); diff --git a/src/test/run-pass/const-enum-vec-index.rs b/src/test/run-pass/const-enum-vec-index.rs index 9c1a4dbdffa84..06265df7a59e2 100644 --- a/src/test/run-pass/const-enum-vec-index.rs +++ b/src/test/run-pass/const-enum-vec-index.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Copy, Clone)] enum E { V1(isize), V0 } diff --git a/src/test/run-pass/const-enum-vec-ptr.rs b/src/test/run-pass/const-enum-vec-ptr.rs index 0bd18a02e4a2d..18a8658f8e95d 100644 --- a/src/test/run-pass/const-enum-vec-ptr.rs +++ b/src/test/run-pass/const-enum-vec-ptr.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum E { V1(isize), V0 } static C: &'static [E] = &[E::V0, E::V1(0xDEADBEE), E::V0]; diff --git a/src/test/run-pass/const-enum-vector.rs b/src/test/run-pass/const-enum-vector.rs index e7a6f520a9924..05c4afda7c92d 100644 --- a/src/test/run-pass/const-enum-vector.rs +++ b/src/test/run-pass/const-enum-vector.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum E { V1(isize), V0 } static C: [E; 3] = [E::V0, E::V1(0xDEADBEE), E::V0]; diff --git a/src/test/run-pass/const-err.rs b/src/test/run-pass/const-err.rs index f7f79356a0b9f..358a45064ecc0 100644 --- a/src/test/run-pass/const-err.rs +++ b/src/test/run-pass/const-err.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // check for const_err regressions #![deny(const_err)] diff --git a/src/test/run-pass/const-expr-in-fixed-length-vec.rs b/src/test/run-pass/const-expr-in-fixed-length-vec.rs index 6cf9239e2e4ed..4943f86b27659 100644 --- a/src/test/run-pass/const-expr-in-fixed-length-vec.rs +++ b/src/test/run-pass/const-expr-in-fixed-length-vec.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that constant expressions can be used for declaring the // type of a fixed length vector. diff --git a/src/test/run-pass/const-expr-in-vec-repeat.rs b/src/test/run-pass/const-expr-in-vec-repeat.rs index fc3e6749f6e3f..06d4180fa2c7b 100644 --- a/src/test/run-pass/const-expr-in-vec-repeat.rs +++ b/src/test/run-pass/const-expr-in-vec-repeat.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that constant expressions can be used in vec repeat syntax. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/const-extern-function.rs b/src/test/run-pass/const-extern-function.rs index 214b0400e8631..0b6aa2e7881b8 100644 --- a/src/test/run-pass/const-extern-function.rs +++ b/src/test/run-pass/const-extern-function.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - extern fn foopy() {} static f: extern "C" fn() = foopy; diff --git a/src/test/run-pass/const-fields-and-indexing.rs b/src/test/run-pass/const-fields-and-indexing.rs index 55d6b60c19285..914cb101acf67 100644 --- a/src/test/run-pass/const-fields-and-indexing.rs +++ b/src/test/run-pass/const-fields-and-indexing.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const x : [isize; 4] = [1,2,3,4]; static p : isize = x[2]; const y : &'static [isize] = &[1,2,3,4]; diff --git a/src/test/run-pass/const-fn-const-eval.rs b/src/test/run-pass/const-fn-const-eval.rs index 77c70fe7f6354..4b77fb9f5a008 100644 --- a/src/test/run-pass/const-fn-const-eval.rs +++ b/src/test/run-pass/const-fn-const-eval.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_fn)] const fn add(x: usize, y: usize) -> usize { diff --git a/src/test/run-pass/const-fn-feature-flags.rs b/src/test/run-pass/const-fn-feature-flags.rs index a7736a2eb3431..ac1719e4177f0 100644 --- a/src/test/run-pass/const-fn-feature-flags.rs +++ b/src/test/run-pass/const-fn-feature-flags.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test use of stabilized const fns in std formerly using individual feature gates. use std::cell::Cell; diff --git a/src/test/run-pass/const-fn-method.rs b/src/test/run-pass/const-fn-method.rs index 7d8d941439cf8..be73249f670e8 100644 --- a/src/test/run-pass/const-fn-method.rs +++ b/src/test/run-pass/const-fn-method.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_fn)] struct Foo { value: u32 } diff --git a/src/test/run-pass/const-fn-nested.rs b/src/test/run-pass/const-fn-nested.rs index 86f5dedc4d1b1..83cbf52c2e4d7 100644 --- a/src/test/run-pass/const-fn-nested.rs +++ b/src/test/run-pass/const-fn-nested.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test a call whose argument is the result of another call. #![feature(const_fn)] diff --git a/src/test/run-pass/const-fn-stability-calls.rs b/src/test/run-pass/const-fn-stability-calls.rs index c5f97d55c0660..2bceeef0907d7 100644 --- a/src/test/run-pass/const-fn-stability-calls.rs +++ b/src/test/run-pass/const-fn-stability-calls.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test use of const fn from another crate without a feature gate. // aux-build:const_fn_lib.rs diff --git a/src/test/run-pass/const-fn-val.rs b/src/test/run-pass/const-fn-val.rs index 85c92dda434a6..e4a9ed17529cc 100644 --- a/src/test/run-pass/const-fn-val.rs +++ b/src/test/run-pass/const-fn-val.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn foo() -> isize { return 0xca7f000d; } diff --git a/src/test/run-pass/const-fn.rs b/src/test/run-pass/const-fn.rs index 562040dc5620b..f8f3d97184168 100644 --- a/src/test/run-pass/const-fn.rs +++ b/src/test/run-pass/const-fn.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // A very basic test of const fn functionality. #![feature(const_fn, const_indexing)] diff --git a/src/test/run-pass/const-index-feature-gate.rs b/src/test/run-pass/const-index-feature-gate.rs index 2e60634d15eed..dcaa3e2b4d53e 100644 --- a/src/test/run-pass/const-index-feature-gate.rs +++ b/src/test/run-pass/const-index-feature-gate.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const ARR: [usize; 1] = [2]; const ARR2: [i32; ARR[0]] = [5, 6]; diff --git a/src/test/run-pass/const-meth-pattern.rs b/src/test/run-pass/const-meth-pattern.rs index 3b27987f190cd..40deec83266bb 100644 --- a/src/test/run-pass/const-meth-pattern.rs +++ b/src/test/run-pass/const-meth-pattern.rs @@ -1,12 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![feature(const_fn)] struct A; diff --git a/src/test/run-pass/const-negation.rs b/src/test/run-pass/const-negation.rs index 5c633eb6112ff..e6392687d0278 100644 --- a/src/test/run-pass/const-negation.rs +++ b/src/test/run-pass/const-negation.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[deny(const_err)] fn main() { diff --git a/src/test/run-pass/const-negative.rs b/src/test/run-pass/const-negative.rs index 7f26a9773396d..08dae4d38757b 100644 --- a/src/test/run-pass/const-negative.rs +++ b/src/test/run-pass/const-negative.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #358 diff --git a/src/test/run-pass/const-nullary-enum.rs b/src/test/run-pass/const-nullary-enum.rs index b3f6549ef0167..5f660255426f8 100644 --- a/src/test/run-pass/const-nullary-enum.rs +++ b/src/test/run-pass/const-nullary-enum.rs @@ -1,14 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum Foo { Bar, Baz, diff --git a/src/test/run-pass/const-nullary-univariant-enum.rs b/src/test/run-pass/const-nullary-univariant-enum.rs index b1b7f782cd04a..60ca63a0e13db 100644 --- a/src/test/run-pass/const-nullary-univariant-enum.rs +++ b/src/test/run-pass/const-nullary-univariant-enum.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #[derive(Copy, Clone)] enum Foo { Bar = 0xDEADBEE diff --git a/src/test/run-pass/const-pattern-variant.rs b/src/test/run-pass/const-pattern-variant.rs index 104ab6e19db67..177572edbf1ee 100644 --- a/src/test/run-pass/const-pattern-variant.rs +++ b/src/test/run-pass/const-pattern-variant.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_fn)] #[derive(PartialEq, Eq)] diff --git a/src/test/run-pass/const-rec-and-tup.rs b/src/test/run-pass/const-rec-and-tup.rs index e6680fe3e8fdb..ba507e9b8e7c1 100644 --- a/src/test/run-pass/const-rec-and-tup.rs +++ b/src/test/run-pass/const-rec-and-tup.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Pair { a: f64, b: f64 } struct AnotherPair { x: (i64, i64), y: Pair } diff --git a/src/test/run-pass/const-region-ptrs-noncopy.rs b/src/test/run-pass/const-region-ptrs-noncopy.rs index 9a1f747ce59fb..4a38bb67aa38f 100644 --- a/src/test/run-pass/const-region-ptrs-noncopy.rs +++ b/src/test/run-pass/const-region-ptrs-noncopy.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - type Big = [u64; 8]; struct Pair<'a> { a: isize, b: &'a Big } const x: &'static Big = &([13, 14, 10, 13, 11, 14, 14, 15]); diff --git a/src/test/run-pass/const-region-ptrs.rs b/src/test/run-pass/const-region-ptrs.rs index c783d4b818478..0f6fac8ceff01 100644 --- a/src/test/run-pass/const-region-ptrs.rs +++ b/src/test/run-pass/const-region-ptrs.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Pair<'a> { a: isize, b: &'a isize } const x: &'static isize = &10; diff --git a/src/test/run-pass/const-repeated-values.rs b/src/test/run-pass/const-repeated-values.rs index 1d749a2626e9f..d3751e74c08d5 100644 --- a/src/test/run-pass/const-repeated-values.rs +++ b/src/test/run-pass/const-repeated-values.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const FOO: isize = 42; enum Bar { diff --git a/src/test/run-pass/const-size_of-align_of.rs b/src/test/run-pass/const-size_of-align_of.rs index 06fbe9bf4f639..4c879addddf48 100644 --- a/src/test/run-pass/const-size_of-align_of.rs +++ b/src/test/run-pass/const-size_of-align_of.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_fn)] use std::mem; diff --git a/src/test/run-pass/const-str-ptr.rs b/src/test/run-pass/const-str-ptr.rs index f58bf4fc39fec..782221ee1ed47 100644 --- a/src/test/run-pass/const-str-ptr.rs +++ b/src/test/run-pass/const-str-ptr.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::{str, string}; const A: [u8; 2] = ['h' as u8, 'i' as u8]; diff --git a/src/test/run-pass/const-struct-offsets.rs b/src/test/run-pass/const-struct-offsets.rs index 4f38a6431b8ea..3ae24bf8cd15c 100644 --- a/src/test/run-pass/const-struct-offsets.rs +++ b/src/test/run-pass/const-struct-offsets.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 enum Foo { diff --git a/src/test/run-pass/const-struct.rs b/src/test/run-pass/const-struct.rs index 3cd58c6c52afb..06190bb2fd117 100644 --- a/src/test/run-pass/const-struct.rs +++ b/src/test/run-pass/const-struct.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cmp; #[derive(Debug)] diff --git a/src/test/run-pass/const-trait-to-trait.rs b/src/test/run-pass/const-trait-to-trait.rs index 4b53e116789af..b441942dcef6d 100644 --- a/src/test/run-pass/const-trait-to-trait.rs +++ b/src/test/run-pass/const-trait-to-trait.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #24644 - block causes a &Trait -> &Trait coercion: trait Trait {} diff --git a/src/test/run-pass/const-tuple-struct.rs b/src/test/run-pass/const-tuple-struct.rs index ddc50fc6646f2..b74c998cc99aa 100644 --- a/src/test/run-pass/const-tuple-struct.rs +++ b/src/test/run-pass/const-tuple-struct.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct Bar(isize, isize); static X: Bar = Bar(1, 2); diff --git a/src/test/run-pass/const-typeid-of.rs b/src/test/run-pass/const-typeid-of.rs index ce29e55c6d720..d82b1b979ce64 100644 --- a/src/test/run-pass/const-typeid-of.rs +++ b/src/test/run-pass/const-typeid-of.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(core_intrinsics)] #![feature(const_type_id)] diff --git a/src/test/run-pass/const-unit-struct.rs b/src/test/run-pass/const-unit-struct.rs index 320f41006e569..76f013cc6a703 100644 --- a/src/test/run-pass/const-unit-struct.rs +++ b/src/test/run-pass/const-unit-struct.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct Foo; diff --git a/src/test/run-pass/const-unsafe-fn.rs b/src/test/run-pass/const-unsafe-fn.rs index 2511cfd042206..1fe6cf761b4e4 100644 --- a/src/test/run-pass/const-unsafe-fn.rs +++ b/src/test/run-pass/const-unsafe-fn.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // A quick test of 'unsafe const fn' functionality #![feature(const_fn)] diff --git a/src/test/run-pass/const-vec-of-fns.rs b/src/test/run-pass/const-vec-of-fns.rs index f16fbac00797a..926b20c963fdc 100644 --- a/src/test/run-pass/const-vec-of-fns.rs +++ b/src/test/run-pass/const-vec-of-fns.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 /*! diff --git a/src/test/run-pass/const-vec-syntax.rs b/src/test/run-pass/const-vec-syntax.rs index a577bbd827886..ddf23116c1f62 100644 --- a/src/test/run-pass/const-vec-syntax.rs +++ b/src/test/run-pass/const-vec-syntax.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn f(_: &[isize]) {} diff --git a/src/test/run-pass/const-vecs-and-slices.rs b/src/test/run-pass/const-vecs-and-slices.rs index 758812054cd9b..65fa1a50b6751 100644 --- a/src/test/run-pass/const-vecs-and-slices.rs +++ b/src/test/run-pass/const-vecs-and-slices.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - static x : [isize; 4] = [1,2,3,4]; static y : &'static [isize] = &[1,2,3,4]; static z : &'static [isize; 4] = &[1,2,3,4]; diff --git a/src/test/run-pass/const.rs b/src/test/run-pass/const.rs index 95ae514636e5c..0d51f997c0ca5 100644 --- a/src/test/run-pass/const.rs +++ b/src/test/run-pass/const.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - static i: isize = 10; pub fn main() { println!("{}", i); } diff --git a/src/test/run-pass/consts-in-patterns.rs b/src/test/run-pass/consts-in-patterns.rs index eec4c940585c0..79aeab4b6f25f 100644 --- a/src/test/run-pass/consts-in-patterns.rs +++ b/src/test/run-pass/consts-in-patterns.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_fn)] const FOO: isize = 10; diff --git a/src/test/run-pass/copy-closure.rs b/src/test/run-pass/copy-closure.rs index a211d6fc3a385..79174e5f7f8e2 100644 --- a/src/test/run-pass/copy-closure.rs +++ b/src/test/run-pass/copy-closure.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that closures implement `Copy`. fn call T>(f: F) -> T { f() } diff --git a/src/test/run-pass/copy-out-of-array-1.rs b/src/test/run-pass/copy-out-of-array-1.rs index 54147c73ff0ff..9de80c8bec517 100644 --- a/src/test/run-pass/copy-out-of-array-1.rs +++ b/src/test/run-pass/copy-out-of-array-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Ensure that we can copy out of a fixed-size array. // // (Compare with compile-fail/move-out-of-array-1.rs) diff --git a/src/test/run-pass/core-run-destroy.rs b/src/test/run-pass/core-run-destroy.rs index eaec9b1926a20..903a915b72369 100644 --- a/src/test/run-pass/core-run-destroy.rs +++ b/src/test/run-pass/core-run-destroy.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:--test // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/crate-attributes-using-cfg_attr.rs b/src/test/run-pass/crate-attributes-using-cfg_attr.rs index 72ccc6723f921..fd7e0246a2d54 100644 --- a/src/test/run-pass/crate-attributes-using-cfg_attr.rs +++ b/src/test/run-pass/crate-attributes-using-cfg_attr.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:crate-attributes-using-cfg_attr.rs extern crate crate_attributes_using_cfg_attr; diff --git a/src/test/run-pass/crate-leading-sep.rs b/src/test/run-pass/crate-leading-sep.rs index ede78ff803d00..26d4df433aae1 100644 --- a/src/test/run-pass/crate-leading-sep.rs +++ b/src/test/run-pass/crate-leading-sep.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn main() { diff --git a/src/test/run-pass/crate-method-reexport-grrrrrrr.rs b/src/test/run-pass/crate-method-reexport-grrrrrrr.rs index c0bc97b1f659d..0d243e14b94c5 100644 --- a/src/test/run-pass/crate-method-reexport-grrrrrrr.rs +++ b/src/test/run-pass/crate-method-reexport-grrrrrrr.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/crate-name-attr-used.rs b/src/test/run-pass/crate-name-attr-used.rs index a108f4dc56874..666f80e566262 100644 --- a/src/test/run-pass/crate-name-attr-used.rs +++ b/src/test/run-pass/crate-name-attr-used.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:--crate-name crate_name_attr_used -F unused-attributes // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/cross-crate-const-pat.rs b/src/test/run-pass/cross-crate-const-pat.rs index a85541bb8ba5f..7e95c68eae50a 100644 --- a/src/test/run-pass/cross-crate-const-pat.rs +++ b/src/test/run-pass/cross-crate-const-pat.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:cci_const.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/cross-crate-newtype-struct-pat.rs b/src/test/run-pass/cross-crate-newtype-struct-pat.rs index 7eae9017420d7..e008a48d315c9 100644 --- a/src/test/run-pass/cross-crate-newtype-struct-pat.rs +++ b/src/test/run-pass/cross-crate-newtype-struct-pat.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:newtype_struct_xc.rs diff --git a/src/test/run-pass/crt-static-off-works.rs b/src/test/run-pass/crt-static-off-works.rs index c94c877c12c6d..fd87fef115c94 100644 --- a/src/test/run-pass/crt-static-off-works.rs +++ b/src/test/run-pass/crt-static-off-works.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-C target-feature=-crt-static -Z unstable-options // ignore-musl - requires changing the linker which is hard diff --git a/src/test/run-pass/crt-static-on-works.rs b/src/test/run-pass/crt-static-on-works.rs index ae8e5f6297048..a0a2c58512584 100644 --- a/src/test/run-pass/crt-static-on-works.rs +++ b/src/test/run-pass/crt-static-on-works.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-C target-feature=+crt-static -Z unstable-options #![feature(cfg_target_feature)] diff --git a/src/test/run-pass/ctfe/assoc-const.rs b/src/test/run-pass/ctfe/assoc-const.rs index 6a740dc1dd30b..c16885684c7e9 100644 --- a/src/test/run-pass/ctfe/assoc-const.rs +++ b/src/test/run-pass/ctfe/assoc-const.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Nat { const VALUE: usize; } diff --git a/src/test/run-pass/ctfe/bswap-const.rs b/src/test/run-pass/ctfe/bswap-const.rs index b951a9b72b1e1..b94534333ff80 100644 --- a/src/test/run-pass/ctfe/bswap-const.rs +++ b/src/test/run-pass/ctfe/bswap-const.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(core_intrinsics)] use std::intrinsics; diff --git a/src/test/run-pass/ctfe/chained-constants-stackoverflow.rs b/src/test/run-pass/ctfe/chained-constants-stackoverflow.rs index 813dd5fbb9941..180d28447fd94 100644 --- a/src/test/run-pass/ctfe/chained-constants-stackoverflow.rs +++ b/src/test/run-pass/ctfe/chained-constants-stackoverflow.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // https://github.com/rust-lang/rust/issues/34997 pub const CST_1: u32 = 0; diff --git a/src/test/run-pass/ctfe/const-block-non-item-statement-3.rs b/src/test/run-pass/ctfe/const-block-non-item-statement-3.rs index e233107169c75..373fca8037a3b 100644 --- a/src/test/run-pass/ctfe/const-block-non-item-statement-3.rs +++ b/src/test/run-pass/ctfe/const-block-non-item-statement-3.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_let)] type Array = [u32; { let x = 2; 5 }]; diff --git a/src/test/run-pass/ctfe/const-block-non-item-statement.rs b/src/test/run-pass/ctfe/const-block-non-item-statement.rs index b5a9bfb45a1b4..4d9273d5cdd97 100644 --- a/src/test/run-pass/ctfe/const-block-non-item-statement.rs +++ b/src/test/run-pass/ctfe/const-block-non-item-statement.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_let)] enum Foo { diff --git a/src/test/run-pass/ctfe/const-fn-destructuring-arg.rs b/src/test/run-pass/ctfe/const-fn-destructuring-arg.rs index 8b832976aab0e..f8f88543747c3 100644 --- a/src/test/run-pass/ctfe/const-fn-destructuring-arg.rs +++ b/src/test/run-pass/ctfe/const-fn-destructuring-arg.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // test that certain things are disallowed in constant functions #![feature(const_fn, const_let)] diff --git a/src/test/run-pass/ctfe/deref_in_pattern.rs b/src/test/run-pass/ctfe/deref_in_pattern.rs index 4ccfa0338f393..6e2c842fdec8f 100644 --- a/src/test/run-pass/ctfe/deref_in_pattern.rs +++ b/src/test/run-pass/ctfe/deref_in_pattern.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // https://github.com/rust-lang/rust/issues/25574 const A: [u8; 4] = *b"fooo"; diff --git a/src/test/run-pass/ctfe/ice-48279.rs b/src/test/run-pass/ctfe/ice-48279.rs index c435e5fdaab4a..506f4b73add38 100644 --- a/src/test/run-pass/ctfe/ice-48279.rs +++ b/src/test/run-pass/ctfe/ice-48279.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // https://github.com/rust-lang/rust/issues/48279 #![feature(const_fn)] diff --git a/src/test/run-pass/ctfe/issue-37550.rs b/src/test/run-pass/ctfe/issue-37550.rs index 27796a5feea28..478b82d797ec7 100644 --- a/src/test/run-pass/ctfe/issue-37550.rs +++ b/src/test/run-pass/ctfe/issue-37550.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_fn, const_let)] const fn x() { diff --git a/src/test/run-pass/ctfe/issue-broken-mir.rs b/src/test/run-pass/ctfe/issue-broken-mir.rs index 6ed0c7c0d5dc4..0c3345efaf14e 100644 --- a/src/test/run-pass/ctfe/issue-broken-mir.rs +++ b/src/test/run-pass/ctfe/issue-broken-mir.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // https://github.com/rust-lang/rust/issues/27918 fn main() { diff --git a/src/test/run-pass/ctfe/locals-in-const-fn.rs b/src/test/run-pass/ctfe/locals-in-const-fn.rs index 8c153315c25aa..985b90a116ebc 100644 --- a/src/test/run-pass/ctfe/locals-in-const-fn.rs +++ b/src/test/run-pass/ctfe/locals-in-const-fn.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // https://github.com/rust-lang/rust/issues/48821 #![feature(const_fn, const_let)] diff --git a/src/test/run-pass/ctfe/match-const-fn-structs.rs b/src/test/run-pass/ctfe/match-const-fn-structs.rs index 0bb253d1a6455..800963a0ce135 100644 --- a/src/test/run-pass/ctfe/match-const-fn-structs.rs +++ b/src/test/run-pass/ctfe/match-const-fn-structs.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // https://github.com/rust-lang/rust/issues/46114 #![feature(const_fn)] diff --git a/src/test/run-pass/ctfe/mozjs-error.rs b/src/test/run-pass/ctfe/mozjs-error.rs index 9c8a4b5ae6a2d..17ec737f99dda 100644 --- a/src/test/run-pass/ctfe/mozjs-error.rs +++ b/src/test/run-pass/ctfe/mozjs-error.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct CustomAutoRooterVFTable { trace: unsafe extern "C" fn(this: *mut i32, trc: *mut u32), } diff --git a/src/test/run-pass/ctfe/non-scalar-cast.rs b/src/test/run-pass/ctfe/non-scalar-cast.rs index ff4474f47c9f3..fe3b454c0adee 100644 --- a/src/test/run-pass/ctfe/non-scalar-cast.rs +++ b/src/test/run-pass/ctfe/non-scalar-cast.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // https://github.com/rust-lang/rust/issues/37448 fn main() { diff --git a/src/test/run-pass/ctfe/promotion.rs b/src/test/run-pass/ctfe/promotion.rs index 2d228408254aa..1df1780040d69 100644 --- a/src/test/run-pass/ctfe/promotion.rs +++ b/src/test/run-pass/ctfe/promotion.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo(_: &'static [&'static str]) {} fn bar(_: &'static [&'static str; 3]) {} diff --git a/src/test/run-pass/ctfe/references.rs b/src/test/run-pass/ctfe/references.rs index ad7dbeb79c721..04a1dd07c7d02 100644 --- a/src/test/run-pass/ctfe/references.rs +++ b/src/test/run-pass/ctfe/references.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const FOO: &[u8] = b"foo"; const BAR: &[u8] = &[1, 2, 3]; diff --git a/src/test/run-pass/ctfe/repeat_match.rs b/src/test/run-pass/ctfe/repeat_match.rs index dedf5defebb7c..07b0f3ca24789 100644 --- a/src/test/run-pass/ctfe/repeat_match.rs +++ b/src/test/run-pass/ctfe/repeat_match.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // https://github.com/rust-lang/rust/issues/45044 const X: [u8; 1] = [0; 1]; diff --git a/src/test/run-pass/ctfe/return-in-const-fn.rs b/src/test/run-pass/ctfe/return-in-const-fn.rs index d57d3bcb49aa8..182fe63f351df 100644 --- a/src/test/run-pass/ctfe/return-in-const-fn.rs +++ b/src/test/run-pass/ctfe/return-in-const-fn.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // https://github.com/rust-lang/rust/issues/43754 #![feature(const_fn)] diff --git a/src/test/run-pass/ctfe/signed_enum_discr.rs b/src/test/run-pass/ctfe/signed_enum_discr.rs index 7049d28a87085..a9262e6b2c1cc 100644 --- a/src/test/run-pass/ctfe/signed_enum_discr.rs +++ b/src/test/run-pass/ctfe/signed_enum_discr.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // https://github.com/rust-lang/rust/issues/49181 #[derive(Eq, PartialEq)] diff --git a/src/test/run-pass/ctfe/tuple-struct-constructors.rs b/src/test/run-pass/ctfe/tuple-struct-constructors.rs index d5f3e88fd52e8..fdb9cc56babc3 100644 --- a/src/test/run-pass/ctfe/tuple-struct-constructors.rs +++ b/src/test/run-pass/ctfe/tuple-struct-constructors.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // https://github.com/rust-lang/rust/issues/41898 use std::num::NonZeroU64; diff --git a/src/test/run-pass/cycle-generic-bound.rs b/src/test/run-pass/cycle-generic-bound.rs index b6d84f9d5a240..56bfa98451f74 100644 --- a/src/test/run-pass/cycle-generic-bound.rs +++ b/src/test/run-pass/cycle-generic-bound.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #15477. This test just needs to compile. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/cycle-trait-type-trait.rs b/src/test/run-pass/cycle-trait-type-trait.rs index 4ae5c599b43dd..8d4bfa8911557 100644 --- a/src/test/run-pass/cycle-trait-type-trait.rs +++ b/src/test/run-pass/cycle-trait-type-trait.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test a case where a supertrait references a type that references // the original trait. This poses no problem at the moment. diff --git a/src/test/run-pass/dead-code-alias-in-pat.rs b/src/test/run-pass/dead-code-alias-in-pat.rs index a37d671e5c171..5b6ca26f1ce51 100644 --- a/src/test/run-pass/dead-code-alias-in-pat.rs +++ b/src/test/run-pass/dead-code-alias-in-pat.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(dead_code)] fn main() { diff --git a/src/test/run-pass/dead-code-leading-underscore.rs b/src/test/run-pass/dead-code-leading-underscore.rs index 6e3f8a288129c..eff40111ac9d4 100644 --- a/src/test/run-pass/dead-code-leading-underscore.rs +++ b/src/test/run-pass/dead-code-leading-underscore.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![deny(dead_code)] diff --git a/src/test/run-pass/debuginfo-lto.rs b/src/test/run-pass/debuginfo-lto.rs index c29cfafe438ca..680616fee7c38 100644 --- a/src/test/run-pass/debuginfo-lto.rs +++ b/src/test/run-pass/debuginfo-lto.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test case makes sure that we don't run into LLVM's dreaded // "possible ODR violation" assertion when compiling with LTO + Debuginfo. // It covers cases that have traditionally been prone to cause this error. diff --git a/src/test/run-pass/deep.rs b/src/test/run-pass/deep.rs index d59fe8d813d24..5c3ecd8c22c4a 100644 --- a/src/test/run-pass/deep.rs +++ b/src/test/run-pass/deep.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten apparently blows the stack fn f(x: isize) -> isize { diff --git a/src/test/run-pass/default-alloc-error-hook.rs b/src/test/run-pass/default-alloc-error-hook.rs index 5f6b60a5a8d99..8dcc8ad5433e0 100644 --- a/src/test/run-pass/default-alloc-error-hook.rs +++ b/src/test/run-pass/default-alloc-error-hook.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/default-associated-types.rs b/src/test/run-pass/default-associated-types.rs index ed55d5c8b171e..d7ed943b84e0d 100644 --- a/src/test/run-pass/default-associated-types.rs +++ b/src/test/run-pass/default-associated-types.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(associated_type_defaults)] trait Foo { diff --git a/src/test/run-pass/default-method-parsing.rs b/src/test/run-pass/default-method-parsing.rs index 5ccb66a76bf76..7f66605d7c363 100644 --- a/src/test/run-pass/default-method-parsing.rs +++ b/src/test/run-pass/default-method-parsing.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait Foo { diff --git a/src/test/run-pass/default-method-simple.rs b/src/test/run-pass/default-method-simple.rs index 61de804a80a81..61f56482fe7c0 100644 --- a/src/test/run-pass/default-method-simple.rs +++ b/src/test/run-pass/default-method-simple.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Foo { fn f(&self) { println!("Hello!"); diff --git a/src/test/run-pass/default-method-supertrait-vtable.rs b/src/test/run-pass/default-method-supertrait-vtable.rs index 0d45a5d52124d..2bacac8719d81 100644 --- a/src/test/run-pass/default-method-supertrait-vtable.rs +++ b/src/test/run-pass/default-method-supertrait-vtable.rs @@ -1,12 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // diff --git a/src/test/run-pass/defaults-well-formedness.rs b/src/test/run-pass/defaults-well-formedness.rs index 9b06bf837ae0c..0528e8a627718 100644 --- a/src/test/run-pass/defaults-well-formedness.rs +++ b/src/test/run-pass/defaults-well-formedness.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Trait {} struct Foo(U, V) where U: Trait; diff --git a/src/test/run-pass/deprecation-in-force-unstable.rs b/src/test/run-pass/deprecation-in-force-unstable.rs index 542117eca1209..b3509734ffcbc 100644 --- a/src/test/run-pass/deprecation-in-force-unstable.rs +++ b/src/test/run-pass/deprecation-in-force-unstable.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-Zforce-unstable-if-unmarked #[deprecated] // should work even with -Zforce-unstable-if-unmarked diff --git a/src/test/run-pass/deref-lval.rs b/src/test/run-pass/deref-lval.rs index 0e65e5b43b732..d02adcb0cdc76 100644 --- a/src/test/run-pass/deref-lval.rs +++ b/src/test/run-pass/deref-lval.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] use std::cell::Cell; diff --git a/src/test/run-pass/deref-mut-on-ref.rs b/src/test/run-pass/deref-mut-on-ref.rs index 98441d7daaad7..119d943026ada 100644 --- a/src/test/run-pass/deref-mut-on-ref.rs +++ b/src/test/run-pass/deref-mut-on-ref.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that `&mut T` implements `DerefMut` diff --git a/src/test/run-pass/deref-on-ref.rs b/src/test/run-pass/deref-on-ref.rs index 383c8197f9473..651ccd5be855c 100644 --- a/src/test/run-pass/deref-on-ref.rs +++ b/src/test/run-pass/deref-on-ref.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that `&T` and `&mut T` implement `Deref` diff --git a/src/test/run-pass/deref-rc.rs b/src/test/run-pass/deref-rc.rs index fa50e3144ed84..ae17608fc56e3 100644 --- a/src/test/run-pass/deref-rc.rs +++ b/src/test/run-pass/deref-rc.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::rc::Rc; fn main() { diff --git a/src/test/run-pass/deref.rs b/src/test/run-pass/deref.rs index 0e6b3d87d345b..08b047f54d94b 100644 --- a/src/test/run-pass/deref.rs +++ b/src/test/run-pass/deref.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/derive-no-std.rs b/src/test/run-pass/derive-no-std.rs index 0cbe4f4ebd0ed..d74d5e53ad632 100644 --- a/src/test/run-pass/derive-no-std.rs +++ b/src/test/run-pass/derive-no-std.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:derive-no-std.rs extern crate derive_no_std; diff --git a/src/test/run-pass/derive-partialord-correctness.rs b/src/test/run-pass/derive-partialord-correctness.rs index bc9e9a700875e..36ec9fb538f4e 100644 --- a/src/test/run-pass/derive-partialord-correctness.rs +++ b/src/test/run-pass/derive-partialord-correctness.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Original issue: #49650 #[derive(PartialOrd, PartialEq)] diff --git a/src/test/run-pass/deriving-associated-types.rs b/src/test/run-pass/deriving-associated-types.rs index d3aaa3ded69d8..7035e1eed131b 100644 --- a/src/test/run-pass/deriving-associated-types.rs +++ b/src/test/run-pass/deriving-associated-types.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait DeclaredTrait { type Type; } diff --git a/src/test/run-pass/deriving-bounds.rs b/src/test/run-pass/deriving-bounds.rs index 6d0a43997bc47..51a6439fbc5eb 100644 --- a/src/test/run-pass/deriving-bounds.rs +++ b/src/test/run-pass/deriving-bounds.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Copy, Clone)] struct Test; diff --git a/src/test/run-pass/deriving-clone-array.rs b/src/test/run-pass/deriving-clone-array.rs index 182a1390b1f75..7ffbe5bbb1013 100644 --- a/src/test/run-pass/deriving-clone-array.rs +++ b/src/test/run-pass/deriving-clone-array.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // test for issue #30244 #[derive(Copy, Clone)] diff --git a/src/test/run-pass/deriving-clone-enum.rs b/src/test/run-pass/deriving-clone-enum.rs index 22daffc48699a..1457d8359a11f 100644 --- a/src/test/run-pass/deriving-clone-enum.rs +++ b/src/test/run-pass/deriving-clone-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #[derive(Clone)] diff --git a/src/test/run-pass/deriving-clone-generic-enum.rs b/src/test/run-pass/deriving-clone-generic-enum.rs index 8a07bad696188..5aea36dff7bd8 100644 --- a/src/test/run-pass/deriving-clone-generic-enum.rs +++ b/src/test/run-pass/deriving-clone-generic-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #[derive(Clone)] diff --git a/src/test/run-pass/deriving-clone-generic-struct.rs b/src/test/run-pass/deriving-clone-generic-struct.rs index d80f14c36945b..b4b9815b5b588 100644 --- a/src/test/run-pass/deriving-clone-generic-struct.rs +++ b/src/test/run-pass/deriving-clone-generic-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #[derive(Clone)] diff --git a/src/test/run-pass/deriving-clone-generic-tuple-struct.rs b/src/test/run-pass/deriving-clone-generic-tuple-struct.rs index f2f2ec3de7600..136296698fe3b 100644 --- a/src/test/run-pass/deriving-clone-generic-tuple-struct.rs +++ b/src/test/run-pass/deriving-clone-generic-tuple-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #[derive(Clone)] diff --git a/src/test/run-pass/deriving-clone-struct.rs b/src/test/run-pass/deriving-clone-struct.rs index 8bca834508550..895c4dea8070c 100644 --- a/src/test/run-pass/deriving-clone-struct.rs +++ b/src/test/run-pass/deriving-clone-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #[derive(Clone)] diff --git a/src/test/run-pass/deriving-clone-tuple-struct.rs b/src/test/run-pass/deriving-clone-tuple-struct.rs index 8be029ba2accc..cfb61b83e479d 100644 --- a/src/test/run-pass/deriving-clone-tuple-struct.rs +++ b/src/test/run-pass/deriving-clone-tuple-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #[derive(Clone)] diff --git a/src/test/run-pass/deriving-cmp-generic-enum.rs b/src/test/run-pass/deriving-cmp-generic-enum.rs index b2add21dcd487..bfe7499c305d6 100644 --- a/src/test/run-pass/deriving-cmp-generic-enum.rs +++ b/src/test/run-pass/deriving-cmp-generic-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(PartialEq, Eq, PartialOrd, Ord)] enum E { E0, diff --git a/src/test/run-pass/deriving-cmp-generic-struct-enum.rs b/src/test/run-pass/deriving-cmp-generic-struct-enum.rs index f061b6cf4c1b3..b3bc4033f0c28 100644 --- a/src/test/run-pass/deriving-cmp-generic-struct-enum.rs +++ b/src/test/run-pass/deriving-cmp-generic-struct-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(PartialEq, Eq, PartialOrd, Ord)] enum ES { ES1 { x: T }, diff --git a/src/test/run-pass/deriving-cmp-generic-struct.rs b/src/test/run-pass/deriving-cmp-generic-struct.rs index d6c73f394acaa..34d3680fb4cd2 100644 --- a/src/test/run-pass/deriving-cmp-generic-struct.rs +++ b/src/test/run-pass/deriving-cmp-generic-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(PartialEq, Eq, PartialOrd, Ord)] struct S { x: T, diff --git a/src/test/run-pass/deriving-cmp-generic-tuple-struct.rs b/src/test/run-pass/deriving-cmp-generic-tuple-struct.rs index fc256228507fa..d47cc5660aa7b 100644 --- a/src/test/run-pass/deriving-cmp-generic-tuple-struct.rs +++ b/src/test/run-pass/deriving-cmp-generic-tuple-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(PartialEq, Eq, PartialOrd, Ord)] struct TS(T,T); diff --git a/src/test/run-pass/deriving-cmp-shortcircuit.rs b/src/test/run-pass/deriving-cmp-shortcircuit.rs index e22e4767d521f..05e8e47fe0c07 100644 --- a/src/test/run-pass/deriving-cmp-shortcircuit.rs +++ b/src/test/run-pass/deriving-cmp-shortcircuit.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // check that the derived impls for the comparison traits shortcircuit // where possible, by having a type that panics when compared as the // second element, so this passes iff the instances shortcircuit. diff --git a/src/test/run-pass/deriving-copyclone.rs b/src/test/run-pass/deriving-copyclone.rs index 96d0406d9eb28..8e84b72b4cc55 100644 --- a/src/test/run-pass/deriving-copyclone.rs +++ b/src/test/run-pass/deriving-copyclone.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Test that #[derive(Copy, Clone)] produces a shallow copy //! even when a member violates RFC 1521 diff --git a/src/test/run-pass/deriving-default-box.rs b/src/test/run-pass/deriving-default-box.rs index 70ac284cd30c9..e3212fea83463 100644 --- a/src/test/run-pass/deriving-default-box.rs +++ b/src/test/run-pass/deriving-default-box.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] use std::default::Default; diff --git a/src/test/run-pass/deriving-enum-single-variant.rs b/src/test/run-pass/deriving-enum-single-variant.rs index d45247c593e5a..229feda95a90e 100644 --- a/src/test/run-pass/deriving-enum-single-variant.rs +++ b/src/test/run-pass/deriving-enum-single-variant.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub type task_id = isize; diff --git a/src/test/run-pass/deriving-eq-ord-boxed-slice.rs b/src/test/run-pass/deriving-eq-ord-boxed-slice.rs index 16c49065008aa..92d93ed296da8 100644 --- a/src/test/run-pass/deriving-eq-ord-boxed-slice.rs +++ b/src/test/run-pass/deriving-eq-ord-boxed-slice.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(PartialEq, PartialOrd, Eq, Ord, Debug)] struct Foo(Box<[u8]>); diff --git a/src/test/run-pass/deriving-hash.rs b/src/test/run-pass/deriving-hash.rs index ceeb42663965f..b9a7ba5a52e02 100644 --- a/src/test/run-pass/deriving-hash.rs +++ b/src/test/run-pass/deriving-hash.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::hash::{Hash, SipHasher, Hasher}; use std::mem::size_of; diff --git a/src/test/run-pass/deriving-in-fn.rs b/src/test/run-pass/deriving-in-fn.rs index 435d15aab8f26..93490108ef213 100644 --- a/src/test/run-pass/deriving-in-fn.rs +++ b/src/test/run-pass/deriving-in-fn.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { #[derive(Debug)] struct Foo { diff --git a/src/test/run-pass/deriving-in-macro.rs b/src/test/run-pass/deriving-in-macro.rs index adc3e3efd70df..9f6e1b37fbdae 100644 --- a/src/test/run-pass/deriving-in-macro.rs +++ b/src/test/run-pass/deriving-in-macro.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 macro_rules! define_vec { diff --git a/src/test/run-pass/deriving-meta-multiple.rs b/src/test/run-pass/deriving-meta-multiple.rs index a2d22699fcc1f..53ec538a1c2c4 100644 --- a/src/test/run-pass/deriving-meta-multiple.rs +++ b/src/test/run-pass/deriving-meta-multiple.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 use std::hash::{Hash, SipHasher}; diff --git a/src/test/run-pass/deriving-meta.rs b/src/test/run-pass/deriving-meta.rs index f1c930828d2aa..0eae4aa843136 100644 --- a/src/test/run-pass/deriving-meta.rs +++ b/src/test/run-pass/deriving-meta.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 use std::hash::{Hash, SipHasher}; diff --git a/src/test/run-pass/deriving-self-lifetime-totalord-totaleq.rs b/src/test/run-pass/deriving-self-lifetime-totalord-totaleq.rs index 3fdf840d5963c..b31c4b1899f46 100644 --- a/src/test/run-pass/deriving-self-lifetime-totalord-totaleq.rs +++ b/src/test/run-pass/deriving-self-lifetime-totalord-totaleq.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cmp::Ordering::{Less,Equal,Greater}; #[derive(PartialEq, Eq, PartialOrd, Ord)] diff --git a/src/test/run-pass/deriving-show-2.rs b/src/test/run-pass/deriving-show-2.rs index 2b7438fd84540..e5e9febd57c58 100644 --- a/src/test/run-pass/deriving-show-2.rs +++ b/src/test/run-pass/deriving-show-2.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt; #[derive(Debug)] diff --git a/src/test/run-pass/deriving-show.rs b/src/test/run-pass/deriving-show.rs index e858ba8c823b8..19d536851474f 100644 --- a/src/test/run-pass/deriving-show.rs +++ b/src/test/run-pass/deriving-show.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug)] struct Unit; diff --git a/src/test/run-pass/deriving-via-extension-c-enum.rs b/src/test/run-pass/deriving-via-extension-c-enum.rs index 92ffd82d90288..3eb8f5ce1f277 100644 --- a/src/test/run-pass/deriving-via-extension-c-enum.rs +++ b/src/test/run-pass/deriving-via-extension-c-enum.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(PartialEq, Debug)] enum Foo { Bar, diff --git a/src/test/run-pass/deriving-via-extension-enum.rs b/src/test/run-pass/deriving-via-extension-enum.rs index f43f5162196a7..f86ecf3fdab10 100644 --- a/src/test/run-pass/deriving-via-extension-enum.rs +++ b/src/test/run-pass/deriving-via-extension-enum.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(PartialEq, Debug)] enum Foo { Bar(isize, isize), diff --git a/src/test/run-pass/deriving-via-extension-hash-enum.rs b/src/test/run-pass/deriving-via-extension-hash-enum.rs index cbe23ea0522ba..007c97a8fc414 100644 --- a/src/test/run-pass/deriving-via-extension-hash-enum.rs +++ b/src/test/run-pass/deriving-via-extension-hash-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Hash)] enum Foo { Bar(isize, char), diff --git a/src/test/run-pass/deriving-via-extension-hash-struct.rs b/src/test/run-pass/deriving-via-extension-hash-struct.rs index 42f0e45627084..3d66655b52e4a 100644 --- a/src/test/run-pass/deriving-via-extension-hash-struct.rs +++ b/src/test/run-pass/deriving-via-extension-hash-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #[derive(Hash)] diff --git a/src/test/run-pass/deriving-via-extension-struct-empty.rs b/src/test/run-pass/deriving-via-extension-struct-empty.rs index 9c929940eba28..b4577b1e78981 100644 --- a/src/test/run-pass/deriving-via-extension-struct-empty.rs +++ b/src/test/run-pass/deriving-via-extension-struct-empty.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(PartialEq, Debug)] struct Foo; diff --git a/src/test/run-pass/deriving-via-extension-struct-like-enum-variant.rs b/src/test/run-pass/deriving-via-extension-struct-like-enum-variant.rs index 5f9d9b6fb2155..81e1e9f55cf70 100644 --- a/src/test/run-pass/deriving-via-extension-struct-like-enum-variant.rs +++ b/src/test/run-pass/deriving-via-extension-struct-like-enum-variant.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(PartialEq, Debug)] enum S { X { x: isize, y: isize }, diff --git a/src/test/run-pass/deriving-via-extension-struct-tuple.rs b/src/test/run-pass/deriving-via-extension-struct-tuple.rs index 9dffac00a2274..22f377cdc8539 100644 --- a/src/test/run-pass/deriving-via-extension-struct-tuple.rs +++ b/src/test/run-pass/deriving-via-extension-struct-tuple.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(PartialEq, Debug)] struct Foo(isize, isize, String); diff --git a/src/test/run-pass/deriving-via-extension-struct.rs b/src/test/run-pass/deriving-via-extension-struct.rs index 624fb4a58e1a1..5839aa927332c 100644 --- a/src/test/run-pass/deriving-via-extension-struct.rs +++ b/src/test/run-pass/deriving-via-extension-struct.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(PartialEq, Debug)] struct Foo { x: isize, diff --git a/src/test/run-pass/deriving-via-extension-type-params.rs b/src/test/run-pass/deriving-via-extension-type-params.rs index 4d88dbbca37b9..f1965068b802b 100644 --- a/src/test/run-pass/deriving-via-extension-type-params.rs +++ b/src/test/run-pass/deriving-via-extension-type-params.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(PartialEq, Hash, Debug)] struct Foo { x: isize, diff --git a/src/test/run-pass/deriving-with-repr-packed.rs b/src/test/run-pass/deriving-with-repr-packed.rs index f5130908c0b21..c2c1bba4b5194 100644 --- a/src/test/run-pass/deriving-with-repr-packed.rs +++ b/src/test/run-pass/deriving-with-repr-packed.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // check that derive on a packed struct does not call field // methods with a misaligned field. diff --git a/src/test/run-pass/destructure-array-1.rs b/src/test/run-pass/destructure-array-1.rs index 43271162c1812..ffc5fd1dbca54 100644 --- a/src/test/run-pass/destructure-array-1.rs +++ b/src/test/run-pass/destructure-array-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Ensure that we can do a destructuring bind of a fixed-size array, // even when the element type has a destructor. diff --git a/src/test/run-pass/die-macro.rs b/src/test/run-pass/die-macro.rs index 0816e258e84a0..3d3c3a8611bb2 100644 --- a/src/test/run-pass/die-macro.rs +++ b/src/test/run-pass/die-macro.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Just testing that panic!() type checks in statement or expr diff --git a/src/test/run-pass/discrim-explicit-23030.rs b/src/test/run-pass/discrim-explicit-23030.rs index aed7b1527ce76..4ca4d0d871078 100644 --- a/src/test/run-pass/discrim-explicit-23030.rs +++ b/src/test/run-pass/discrim-explicit-23030.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue 23030: Workaround overflowing discriminant // with explicit assignments. diff --git a/src/test/run-pass/discriminant_value-wrapper.rs b/src/test/run-pass/discriminant_value-wrapper.rs index d7a32423710fd..f014cce9dddc6 100644 --- a/src/test/run-pass/discriminant_value-wrapper.rs +++ b/src/test/run-pass/discriminant_value-wrapper.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::mem; enum ADT { diff --git a/src/test/run-pass/discriminant_value.rs b/src/test/run-pass/discriminant_value.rs index 13257529ed9f8..29a8f3f97ccea 100644 --- a/src/test/run-pass/discriminant_value.rs +++ b/src/test/run-pass/discriminant_value.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(core, core_intrinsics)] extern crate core; diff --git a/src/test/run-pass/div-mod.rs b/src/test/run-pass/div-mod.rs index b6cae71df865d..b88ec27c8192e 100644 --- a/src/test/run-pass/div-mod.rs +++ b/src/test/run-pass/div-mod.rs @@ -1,17 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - - pub fn main() { let x: isize = 15; let y: isize = 5; diff --git a/src/test/run-pass/diverging-fallback-control-flow.rs b/src/test/run-pass/diverging-fallback-control-flow.rs index 723a98bcdfa0d..f95cca64d25ba 100644 --- a/src/test/run-pass/diverging-fallback-control-flow.rs +++ b/src/test/run-pass/diverging-fallback-control-flow.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test various cases where we permit an unconstrained variable // to fallback based on control-flow. // diff --git a/src/test/run-pass/diverging-fallback-method-chain.rs b/src/test/run-pass/diverging-fallback-method-chain.rs index 664a329c228ae..62194a3e76744 100644 --- a/src/test/run-pass/diverging-fallback-method-chain.rs +++ b/src/test/run-pass/diverging-fallback-method-chain.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test a regression found when building compiler. The `produce()` // error type `T` winds up getting unified with result of `x.parse()`; // the type of the closure given to `unwrap_or_else` needs to be diff --git a/src/test/run-pass/diverging-fallback-option.rs b/src/test/run-pass/diverging-fallback-option.rs index 49f90e7c91f34..af51717815039 100644 --- a/src/test/run-pass/diverging-fallback-option.rs +++ b/src/test/run-pass/diverging-fallback-option.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(warnings)] // Here the type of `c` is `Option`, where `?T` is unconstrained. diff --git a/src/test/run-pass/double-ref.rs b/src/test/run-pass/double-ref.rs index 13ce6a07e3641..7a70517b6bd98 100644 --- a/src/test/run-pass/double-ref.rs +++ b/src/test/run-pass/double-ref.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn check_expr() { diff --git a/src/test/run-pass/drop-on-empty-block-exit.rs b/src/test/run-pass/drop-on-empty-block-exit.rs index 8dea648508d6d..8cf46601fbe3e 100644 --- a/src/test/run-pass/drop-on-empty-block-exit.rs +++ b/src/test/run-pass/drop-on-empty-block-exit.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/drop-on-ret.rs b/src/test/run-pass/drop-on-ret.rs index fc517fa592f52..51ecf07896dcb 100644 --- a/src/test/run-pass/drop-on-ret.rs +++ b/src/test/run-pass/drop-on-ret.rs @@ -1,16 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - // pretty-expanded FIXME #23616 fn f() -> isize { diff --git a/src/test/run-pass/drop-struct-as-object.rs b/src/test/run-pass/drop-struct-as-object.rs index 17603e11dddd9..36f3f6b33d322 100644 --- a/src/test/run-pass/drop-struct-as-object.rs +++ b/src/test/run-pass/drop-struct-as-object.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that destructor on a struct runs successfully after the struct // is boxed and converted to an object. diff --git a/src/test/run-pass/drop-trait-enum.rs b/src/test/run-pass/drop-trait-enum.rs index a6027615adb5a..f213c92a97ee4 100644 --- a/src/test/run-pass/drop-trait-enum.rs +++ b/src/test/run-pass/drop-trait-enum.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support #![feature(box_syntax)] diff --git a/src/test/run-pass/drop-trait-generic.rs b/src/test/run-pass/drop-trait-generic.rs index e55eae1e74fc6..48833d31afbeb 100644 --- a/src/test/run-pass/drop-trait-generic.rs +++ b/src/test/run-pass/drop-trait-generic.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S { x: T } diff --git a/src/test/run-pass/drop-trait.rs b/src/test/run-pass/drop-trait.rs index 21740eb393066..ab529eff2da4c 100644 --- a/src/test/run-pass/drop-trait.rs +++ b/src/test/run-pass/drop-trait.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { x: isize } diff --git a/src/test/run-pass/drop-uninhabited-enum.rs b/src/test/run-pass/drop-uninhabited-enum.rs index 9fa085b6701dd..76c4b2d67d35d 100644 --- a/src/test/run-pass/drop-uninhabited-enum.rs +++ b/src/test/run-pass/drop-uninhabited-enum.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 enum Foo { } diff --git a/src/test/run-pass/drop-with-type-ascription-1.rs b/src/test/run-pass/drop-with-type-ascription-1.rs index 15f229dbca5d9..6a7f2d9ab5b31 100644 --- a/src/test/run-pass/drop-with-type-ascription-1.rs +++ b/src/test/run-pass/drop-with-type-ascription-1.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn main() { let foo = "hello".to_string(); let foo: Vec<&str> = foo.split_whitespace().collect(); diff --git a/src/test/run-pass/drop-with-type-ascription-2.rs b/src/test/run-pass/drop-with-type-ascription-2.rs index 1f486c1834c06..6e868e9b4ed19 100644 --- a/src/test/run-pass/drop-with-type-ascription-2.rs +++ b/src/test/run-pass/drop-with-type-ascription-2.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn main() { let args = vec!["foobie", "asdf::asdf"]; let arr: Vec<&str> = args[1].split("::").collect(); diff --git a/src/test/run-pass/dropck-eyepatch-extern-crate.rs b/src/test/run-pass/dropck-eyepatch-extern-crate.rs index 20f069f77ea15..80831011effb2 100644 --- a/src/test/run-pass/dropck-eyepatch-extern-crate.rs +++ b/src/test/run-pass/dropck-eyepatch-extern-crate.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:dropck_eyepatch_extern_crate.rs extern crate dropck_eyepatch_extern_crate as other; diff --git a/src/test/run-pass/dropck-eyepatch-reorder.rs b/src/test/run-pass/dropck-eyepatch-reorder.rs index a99a7232e9ebc..9e7be9037b6de 100644 --- a/src/test/run-pass/dropck-eyepatch-reorder.rs +++ b/src/test/run-pass/dropck-eyepatch-reorder.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(dropck_eyepatch)] // The point of this test is to test uses of `#[may_dangle]` attribute diff --git a/src/test/run-pass/dropck-eyepatch.rs b/src/test/run-pass/dropck-eyepatch.rs index c0c091d78eb16..339b7ff6e59d1 100644 --- a/src/test/run-pass/dropck-eyepatch.rs +++ b/src/test/run-pass/dropck-eyepatch.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(dropck_eyepatch)] // The point of this test is to illustrate that the `#[may_dangle]` diff --git a/src/test/run-pass/dropck_legal_cycles.rs b/src/test/run-pass/dropck_legal_cycles.rs index 5f915a762d149..67f4caeefd99c 100644 --- a/src/test/run-pass/dropck_legal_cycles.rs +++ b/src/test/run-pass/dropck_legal_cycles.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test exercises cases where cyclic structure is legal, // including when the cycles go through data-structures such // as `Vec` or `TypedArena`. diff --git a/src/test/run-pass/dst-coerce-custom.rs b/src/test/run-pass/dst-coerce-custom.rs index 6eb01e879df57..3b905e50d93df 100644 --- a/src/test/run-pass/dst-coerce-custom.rs +++ b/src/test/run-pass/dst-coerce-custom.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test a very simple custom DST coercion. #![feature(unsize, coerce_unsized)] diff --git a/src/test/run-pass/dst-coerce-rc.rs b/src/test/run-pass/dst-coerce-rc.rs index 039f4d8fd510d..4a2a268132311 100644 --- a/src/test/run-pass/dst-coerce-rc.rs +++ b/src/test/run-pass/dst-coerce-rc.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test a very simple custom DST coercion. #![feature(core, rc_weak)] diff --git a/src/test/run-pass/dst-coercions.rs b/src/test/run-pass/dst-coercions.rs index 6b5bd6ad35e75..fc43a5f063f46 100644 --- a/src/test/run-pass/dst-coercions.rs +++ b/src/test/run-pass/dst-coercions.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test coercions involving DST and/or raw pointers // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/dst-deref-mut.rs b/src/test/run-pass/dst-deref-mut.rs index 9fb4635765ca0..86e77e091267e 100644 --- a/src/test/run-pass/dst-deref-mut.rs +++ b/src/test/run-pass/dst-deref-mut.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that a custom deref with a fat pointer return type does not ICE diff --git a/src/test/run-pass/dst-deref.rs b/src/test/run-pass/dst-deref.rs index 4a143873e6e13..4da12ac0d894b 100644 --- a/src/test/run-pass/dst-deref.rs +++ b/src/test/run-pass/dst-deref.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that a custom deref with a fat pointer return type does not ICE diff --git a/src/test/run-pass/dst-field-align.rs b/src/test/run-pass/dst-field-align.rs index c36833f2fb627..02c8b4d59c42d 100644 --- a/src/test/run-pass/dst-field-align.rs +++ b/src/test/run-pass/dst-field-align.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { a: u16, b: T diff --git a/src/test/run-pass/dst-index.rs b/src/test/run-pass/dst-index.rs index 6bda400a7cdbb..352ca13d502d4 100644 --- a/src/test/run-pass/dst-index.rs +++ b/src/test/run-pass/dst-index.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that overloaded index expressions with DST result types // work and don't ICE. diff --git a/src/test/run-pass/dst-irrefutable-bind.rs b/src/test/run-pass/dst-irrefutable-bind.rs index b1d6c732e7fbb..b6fabba7ca17e 100644 --- a/src/test/run-pass/dst-irrefutable-bind.rs +++ b/src/test/run-pass/dst-irrefutable-bind.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unsized_tuple_coercion)] struct Test(T); diff --git a/src/test/run-pass/dst-raw.rs b/src/test/run-pass/dst-raw.rs index 9ebfbee8a3302..a9bf21fdb68ec 100644 --- a/src/test/run-pass/dst-raw.rs +++ b/src/test/run-pass/dst-raw.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test DST raw pointers diff --git a/src/test/run-pass/dst-struct-sole.rs b/src/test/run-pass/dst-struct-sole.rs index 58d7b35a5275c..770af864a44c0 100644 --- a/src/test/run-pass/dst-struct-sole.rs +++ b/src/test/run-pass/dst-struct-sole.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // As dst-struct.rs, but the unsized field is the only field in the struct. diff --git a/src/test/run-pass/dst-struct.rs b/src/test/run-pass/dst-struct.rs index 40ca847278722..53ac54f8b3766 100644 --- a/src/test/run-pass/dst-struct.rs +++ b/src/test/run-pass/dst-struct.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] struct Fat { diff --git a/src/test/run-pass/dst-trait-tuple.rs b/src/test/run-pass/dst-trait-tuple.rs index 9803e26f5f859..09bcc526c7ae9 100644 --- a/src/test/run-pass/dst-trait-tuple.rs +++ b/src/test/run-pass/dst-trait-tuple.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![allow(unused_features)] #![feature(box_syntax)] #![feature(unsized_tuple_coercion)] diff --git a/src/test/run-pass/dst-trait.rs b/src/test/run-pass/dst-trait.rs index a412306b96645..41ca5ca1caa0b 100644 --- a/src/test/run-pass/dst-trait.rs +++ b/src/test/run-pass/dst-trait.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] struct Fat { diff --git a/src/test/run-pass/dst-tuple-sole.rs b/src/test/run-pass/dst-tuple-sole.rs index a788e25218eb4..661ce5b858d8f 100644 --- a/src/test/run-pass/dst-tuple-sole.rs +++ b/src/test/run-pass/dst-tuple-sole.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // As dst-tuple.rs, but the unsized field is the only field in the tuple. diff --git a/src/test/run-pass/dst-tuple.rs b/src/test/run-pass/dst-tuple.rs index 7c2125d00f9ba..b30edbd74ba7e 100644 --- a/src/test/run-pass/dst-tuple.rs +++ b/src/test/run-pass/dst-tuple.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![feature(box_syntax)] #![feature(unsized_tuple_coercion)] diff --git a/src/test/run-pass/duplicated-external-mods.rs b/src/test/run-pass/duplicated-external-mods.rs index 4cb3dbe027a16..f2c1e1f654016 100644 --- a/src/test/run-pass/duplicated-external-mods.rs +++ b/src/test/run-pass/duplicated-external-mods.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:anon-extern-mod-cross-crate-1.rs // aux-build:anon-extern-mod-cross-crate-1.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/dyn-trait.rs b/src/test/run-pass/dyn-trait.rs index 010667942424c..389c99bc13f4b 100644 --- a/src/test/run-pass/dyn-trait.rs +++ b/src/test/run-pass/dyn-trait.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty `dyn ::foo` parses differently in the current edition use std::fmt::Display; diff --git a/src/test/run-pass/dynamic-drop.rs b/src/test/run-pass/dynamic-drop.rs index 765fb06e5f3a4..ce8b69c6f842e 100644 --- a/src/test/run-pass/dynamic-drop.rs +++ b/src/test/run-pass/dynamic-drop.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions:lexical nll #![cfg_attr(nll, feature(nll))] diff --git a/src/test/run-pass/early-ret-binop-add.rs b/src/test/run-pass/early-ret-binop-add.rs index 0a490466ef73b..2cb31d5f24b31 100644 --- a/src/test/run-pass/early-ret-binop-add.rs +++ b/src/test/run-pass/early-ret-binop-add.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 use std::ops::Add; diff --git a/src/test/run-pass/early-vtbl-resolution.rs b/src/test/run-pass/early-vtbl-resolution.rs index 2d2cf6fbf0a7f..9600d8a2f08fa 100644 --- a/src/test/run-pass/early-vtbl-resolution.rs +++ b/src/test/run-pass/early-vtbl-resolution.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait thing { diff --git a/src/test/run-pass/edition-keywords-2015-2015.rs b/src/test/run-pass/edition-keywords-2015-2015.rs index 1751eacc6b7ce..f684443bc6c77 100644 --- a/src/test/run-pass/edition-keywords-2015-2015.rs +++ b/src/test/run-pass/edition-keywords-2015-2015.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2015 // aux-build:edition-kw-macro-2015.rs diff --git a/src/test/run-pass/edition-keywords-2015-2018.rs b/src/test/run-pass/edition-keywords-2015-2018.rs index f2794a4b8d81a..ead068cd3661b 100644 --- a/src/test/run-pass/edition-keywords-2015-2018.rs +++ b/src/test/run-pass/edition-keywords-2015-2018.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2015 // aux-build:edition-kw-macro-2018.rs diff --git a/src/test/run-pass/edition-keywords-2018-2015.rs b/src/test/run-pass/edition-keywords-2018-2015.rs index 7d5de00cdb8c2..d15d77f37cc42 100644 --- a/src/test/run-pass/edition-keywords-2018-2015.rs +++ b/src/test/run-pass/edition-keywords-2018-2015.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 // aux-build:edition-kw-macro-2015.rs diff --git a/src/test/run-pass/edition-keywords-2018-2018.rs b/src/test/run-pass/edition-keywords-2018-2018.rs index 6462fc4da60a0..d0061c52beea4 100644 --- a/src/test/run-pass/edition-keywords-2018-2018.rs +++ b/src/test/run-pass/edition-keywords-2018-2018.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 // aux-build:edition-kw-macro-2018.rs diff --git a/src/test/run-pass/else-if.rs b/src/test/run-pass/else-if.rs index afc1d200b274b..83a6658895ae8 100644 --- a/src/test/run-pass/else-if.rs +++ b/src/test/run-pass/else-if.rs @@ -1,16 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - pub fn main() { if 1 == 2 { assert!((false)); diff --git a/src/test/run-pass/empty-allocation-non-null.rs b/src/test/run-pass/empty-allocation-non-null.rs index 3dbe7da6ac704..31117936c76ac 100644 --- a/src/test/run-pass/empty-allocation-non-null.rs +++ b/src/test/run-pass/empty-allocation-non-null.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { assert!(Some(Box::new(())).is_some()); diff --git a/src/test/run-pass/empty-allocation-rvalue-non-null.rs b/src/test/run-pass/empty-allocation-rvalue-non-null.rs index f52a21a997d78..60b32dfe21377 100644 --- a/src/test/run-pass/empty-allocation-rvalue-non-null.rs +++ b/src/test/run-pass/empty-allocation-rvalue-non-null.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub fn main() { diff --git a/src/test/run-pass/empty-mutable-vec.rs b/src/test/run-pass/empty-mutable-vec.rs index 757579faa17c7..316b78d6c824b 100644 --- a/src/test/run-pass/empty-mutable-vec.rs +++ b/src/test/run-pass/empty-mutable-vec.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![allow(unused_mut)] diff --git a/src/test/run-pass/empty-struct-braces.rs b/src/test/run-pass/empty-struct-braces.rs index 7c161ba8dd96e..aa0f92a91c673 100644 --- a/src/test/run-pass/empty-struct-braces.rs +++ b/src/test/run-pass/empty-struct-braces.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Empty struct defined with braces add names into type namespace // Empty struct defined without braces add names into both type and value namespaces diff --git a/src/test/run-pass/empty-tag.rs b/src/test/run-pass/empty-tag.rs index e60cd02ce9994..d0a45ca26672e 100644 --- a/src/test/run-pass/empty-tag.rs +++ b/src/test/run-pass/empty-tag.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Copy, Clone, Debug)] enum chan { chan_t, } diff --git a/src/test/run-pass/empty-type-parameter-list.rs b/src/test/run-pass/empty-type-parameter-list.rs index 7af2844d5646e..43275090f2de7 100644 --- a/src/test/run-pass/empty-type-parameter-list.rs +++ b/src/test/run-pass/empty-type-parameter-list.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that empty type parameter list (<>) is synonymous with // no type parameters at all diff --git a/src/test/run-pass/empty-types-in-patterns.rs b/src/test/run-pass/empty-types-in-patterns.rs index 86cf9b5ec4783..70c3b3af98b7b 100644 --- a/src/test/run-pass/empty-types-in-patterns.rs +++ b/src/test/run-pass/empty-types-in-patterns.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(never_type)] #![feature(exhaustive_patterns)] #![feature(slice_patterns)] diff --git a/src/test/run-pass/empty_global_asm.rs b/src/test/run-pass/empty_global_asm.rs index db73da2747f9c..5789985a03832 100644 --- a/src/test/run-pass/empty_global_asm.rs +++ b/src/test/run-pass/empty_global_asm.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(global_asm)] #[cfg(target_arch = "x86")] diff --git a/src/test/run-pass/enum-alignment.rs b/src/test/run-pass/enum-alignment.rs index 827894f8f32c9..61de0ffd00610 100644 --- a/src/test/run-pass/enum-alignment.rs +++ b/src/test/run-pass/enum-alignment.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::mem; fn addr_of(ptr: &T) -> usize { diff --git a/src/test/run-pass/enum-clike-ffi-as-int.rs b/src/test/run-pass/enum-clike-ffi-as-int.rs index fdaad9e1fabce..6030af408e95a 100644 --- a/src/test/run-pass/enum-clike-ffi-as-int.rs +++ b/src/test/run-pass/enum-clike-ffi-as-int.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - /*! * C-like enums have to be represented as LLVM ints, not wrapped in a * struct, because it's important for the FFI that they interoperate diff --git a/src/test/run-pass/enum-discr.rs b/src/test/run-pass/enum-discr.rs index fafd8b576ff0f..bb95ffeefa233 100644 --- a/src/test/run-pass/enum-discr.rs +++ b/src/test/run-pass/enum-discr.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum Animal { Cat = 0, Dog = 1, diff --git a/src/test/run-pass/enum-discrim-autosizing.rs b/src/test/run-pass/enum-discrim-autosizing.rs index c85ab535fc16b..204071d1d55c9 100644 --- a/src/test/run-pass/enum-discrim-autosizing.rs +++ b/src/test/run-pass/enum-discrim-autosizing.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::mem::size_of; enum Ei8 { diff --git a/src/test/run-pass/enum-discrim-manual-sizing.rs b/src/test/run-pass/enum-discrim-manual-sizing.rs index 8557c065dc69c..db45e7f15a4ba 100644 --- a/src/test/run-pass/enum-discrim-manual-sizing.rs +++ b/src/test/run-pass/enum-discrim-manual-sizing.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::mem::{size_of, align_of}; #[repr(i8)] diff --git a/src/test/run-pass/enum-discrim-range-overflow.rs b/src/test/run-pass/enum-discrim-range-overflow.rs index f1306b3f08cff..900fcea309fde 100644 --- a/src/test/run-pass/enum-discrim-range-overflow.rs +++ b/src/test/run-pass/enum-discrim-range-overflow.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub enum E64 { diff --git a/src/test/run-pass/enum-discrim-width-stuff.rs b/src/test/run-pass/enum-discrim-width-stuff.rs index 46238c4572080..536b8906ed379 100644 --- a/src/test/run-pass/enum-discrim-width-stuff.rs +++ b/src/test/run-pass/enum-discrim-width-stuff.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! check { ($m:ident, $t:ty, $v:expr) => {{ mod $m { diff --git a/src/test/run-pass/enum-disr-val-pretty.rs b/src/test/run-pass/enum-disr-val-pretty.rs index 425d8f6d651cc..3fa1b5a4d247f 100644 --- a/src/test/run-pass/enum-disr-val-pretty.rs +++ b/src/test/run-pass/enum-disr-val-pretty.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pp-exact diff --git a/src/test/run-pass/enum-export-inheritance.rs b/src/test/run-pass/enum-export-inheritance.rs index 4cf8fff237645..4c8901c9e76e8 100644 --- a/src/test/run-pass/enum-export-inheritance.rs +++ b/src/test/run-pass/enum-export-inheritance.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 mod a { diff --git a/src/test/run-pass/enum-layout-optimization.rs b/src/test/run-pass/enum-layout-optimization.rs index a562761cab92b..8bda1d679a137 100644 --- a/src/test/run-pass/enum-layout-optimization.rs +++ b/src/test/run-pass/enum-layout-optimization.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we will do various size optimizations to enum layout, but // *not* if `#[repr(u8)]` or `#[repr(C)]` is passed. See also #40029. diff --git a/src/test/run-pass/enum-non-c-like-repr-c-and-int.rs b/src/test/run-pass/enum-non-c-like-repr-c-and-int.rs index 86453fdf6fae6..4d60a493e3127 100644 --- a/src/test/run-pass/enum-non-c-like-repr-c-and-int.rs +++ b/src/test/run-pass/enum-non-c-like-repr-c-and-int.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test deserializes an enum in-place by transmuting to a union that // should have the same layout, and manipulating the tag and payloads // independently. This verifies that `repr(some_int)` has a stable representation, diff --git a/src/test/run-pass/enum-non-c-like-repr-c.rs b/src/test/run-pass/enum-non-c-like-repr-c.rs index b4e0fe8d4572a..ab775d6d6aa31 100644 --- a/src/test/run-pass/enum-non-c-like-repr-c.rs +++ b/src/test/run-pass/enum-non-c-like-repr-c.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test deserializes an enum in-place by transmuting to a union that // should have the same layout, and manipulating the tag and payloads // independently. This verifies that `repr(some_int)` has a stable representation, diff --git a/src/test/run-pass/enum-non-c-like-repr-int.rs b/src/test/run-pass/enum-non-c-like-repr-int.rs index 6e147b00ef9af..a8f827c058ea3 100644 --- a/src/test/run-pass/enum-non-c-like-repr-int.rs +++ b/src/test/run-pass/enum-non-c-like-repr-int.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test deserializes an enum in-place by transmuting to a union that // should have the same layout, and manipulating the tag and payloads // independently. This verifies that `repr(some_int)` has a stable representation, diff --git a/src/test/run-pass/enum-null-pointer-opt.rs b/src/test/run-pass/enum-null-pointer-opt.rs index 34ed589d418c1..b48a354c30960 100644 --- a/src/test/run-pass/enum-null-pointer-opt.rs +++ b/src/test/run-pass/enum-null-pointer-opt.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::mem::size_of; use std::num::NonZeroUsize; use std::ptr::NonNull; diff --git a/src/test/run-pass/enum-nullable-const-null-with-fields.rs b/src/test/run-pass/enum-nullable-const-null-with-fields.rs index 1342c4e104de5..8385cc5d880c6 100644 --- a/src/test/run-pass/enum-nullable-const-null-with-fields.rs +++ b/src/test/run-pass/enum-nullable-const-null-with-fields.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::result::Result; use std::result::Result::Ok; diff --git a/src/test/run-pass/enum-nullable-simplifycfg-misopt.rs b/src/test/run-pass/enum-nullable-simplifycfg-misopt.rs index b5db8d913204a..20d95c50e1118 100644 --- a/src/test/run-pass/enum-nullable-simplifycfg-misopt.rs +++ b/src/test/run-pass/enum-nullable-simplifycfg-misopt.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] /*! diff --git a/src/test/run-pass/enum-univariant-repr.rs b/src/test/run-pass/enum-univariant-repr.rs index 17d614b54969c..67f8a29baad4f 100644 --- a/src/test/run-pass/enum-univariant-repr.rs +++ b/src/test/run-pass/enum-univariant-repr.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::mem; // Univariant C-like enum diff --git a/src/test/run-pass/enum-variants.rs b/src/test/run-pass/enum-variants.rs index 5eb7a243acf0c..648bb5ce10f3a 100644 --- a/src/test/run-pass/enum-variants.rs +++ b/src/test/run-pass/enum-variants.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![allow(dead_assignment)] diff --git a/src/test/run-pass/enum-vec-initializer.rs b/src/test/run-pass/enum-vec-initializer.rs index 037ee5f777758..b7ce44dbe4ee2 100644 --- a/src/test/run-pass/enum-vec-initializer.rs +++ b/src/test/run-pass/enum-vec-initializer.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 enum Flopsy { diff --git a/src/test/run-pass/env-args-reverse-iterator.rs b/src/test/run-pass/env-args-reverse-iterator.rs index 0645c65d0d666..78548fd9bc570 100644 --- a/src/test/run-pass/env-args-reverse-iterator.rs +++ b/src/test/run-pass/env-args-reverse-iterator.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/env-funky-keys.rs b/src/test/run-pass/env-funky-keys.rs index 12e1cbe97d83c..c21283ad84b88 100644 --- a/src/test/run-pass/env-funky-keys.rs +++ b/src/test/run-pass/env-funky-keys.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Ignore this test on Android, because it segfaults there. // ignore-android diff --git a/src/test/run-pass/env-home-dir.rs b/src/test/run-pass/env-home-dir.rs index e92f24a27519e..e076489bc78e5 100644 --- a/src/test/run-pass/env-home-dir.rs +++ b/src/test/run-pass/env-home-dir.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no environment variables present // ignore-emscripten env vars don't work? diff --git a/src/test/run-pass/env-null-vars.rs b/src/test/run-pass/env-null-vars.rs index 296764269dec0..75bdac37add34 100644 --- a/src/test/run-pass/env-null-vars.rs +++ b/src/test/run-pass/env-null-vars.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-windows // ignore-wasm32-bare no libc to test ffi with diff --git a/src/test/run-pass/env-vars.rs b/src/test/run-pass/env-vars.rs index d7b4c81fc7f2b..6159638745a44 100644 --- a/src/test/run-pass/env-vars.rs +++ b/src/test/run-pass/env-vars.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no env vars // ignore-wasm32-bare no env vars diff --git a/src/test/run-pass/epoch-gate-feature.rs b/src/test/run-pass/epoch-gate-feature.rs index e3cd1edd20987..d4c6c2e5dc183 100644 --- a/src/test/run-pass/epoch-gate-feature.rs +++ b/src/test/run-pass/epoch-gate-feature.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Checks if the correct registers are being used to pass arguments // when the sysv64 ABI is specified. diff --git a/src/test/run-pass/eq-multidispatch.rs b/src/test/run-pass/eq-multidispatch.rs index ca37ee28bcbc2..1212f5d17dbb2 100644 --- a/src/test/run-pass/eq-multidispatch.rs +++ b/src/test/run-pass/eq-multidispatch.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #[derive(PartialEq, Debug)] struct Bar; #[derive(Debug)] diff --git a/src/test/run-pass/estr-slice.rs b/src/test/run-pass/estr-slice.rs index 5364cdc627f50..a52aebd06a84b 100644 --- a/src/test/run-pass/estr-slice.rs +++ b/src/test/run-pass/estr-slice.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { let x = "hello"; let v = "hello"; diff --git a/src/test/run-pass/estr-uniq.rs b/src/test/run-pass/estr-uniq.rs index 4dfb15418405d..06bc884cab565 100644 --- a/src/test/run-pass/estr-uniq.rs +++ b/src/test/run-pass/estr-uniq.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![allow(dead_assignment)] pub fn main() { diff --git a/src/test/run-pass/evec-slice.rs b/src/test/run-pass/evec-slice.rs index 52ccbe52d460e..e2a72406dcb7c 100644 --- a/src/test/run-pass/evec-slice.rs +++ b/src/test/run-pass/evec-slice.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_assignment)] pub fn main() { diff --git a/src/test/run-pass/exec-env.rs b/src/test/run-pass/exec-env.rs index b2d2e70f83ba5..1327b558fc967 100644 --- a/src/test/run-pass/exec-env.rs +++ b/src/test/run-pass/exec-env.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // exec-env:TEST_EXEC_ENV=22 // ignore-cloudabi no env vars // ignore-emscripten FIXME: issue #31622 diff --git a/src/test/run-pass/exhaustive-bool-match-sanity.rs b/src/test/run-pass/exhaustive-bool-match-sanity.rs index 27bcab43229c5..641daa2eb9c1c 100644 --- a/src/test/run-pass/exhaustive-bool-match-sanity.rs +++ b/src/test/run-pass/exhaustive-bool-match-sanity.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #33540 // We previously used to generate a 3-armed boolean `SwitchInt` in the // MIR of the function `foo` below. #33583 changed rustc to diff --git a/src/test/run-pass/existential_type.rs b/src/test/run-pass/existential_type.rs index e63d5c2293a81..c84ca097f3d66 100644 --- a/src/test/run-pass/existential_type.rs +++ b/src/test/run-pass/existential_type.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(existential_type)] fn main() { diff --git a/src/test/run-pass/explicit-i-suffix.rs b/src/test/run-pass/explicit-i-suffix.rs index fa3970b62805b..6006645f6275a 100644 --- a/src/test/run-pass/explicit-i-suffix.rs +++ b/src/test/run-pass/explicit-i-suffix.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub fn main() { diff --git a/src/test/run-pass/explicit-self-closures.rs b/src/test/run-pass/explicit-self-closures.rs index cb3a28d19d2e5..64eb2797c4be8 100644 --- a/src/test/run-pass/explicit-self-closures.rs +++ b/src/test/run-pass/explicit-self-closures.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test to make sure that explicit self params work inside closures // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/explicit-self-generic.rs b/src/test/run-pass/explicit-self-generic.rs index d2274ced55610..d3a43a286d411 100644 --- a/src/test/run-pass/explicit-self-generic.rs +++ b/src/test/run-pass/explicit-self-generic.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] #[derive(Copy, Clone)] diff --git a/src/test/run-pass/explicit-self-objects-uniq.rs b/src/test/run-pass/explicit-self-objects-uniq.rs index bb7e612a9f2a7..9160f3b1b9fd5 100644 --- a/src/test/run-pass/explicit-self-objects-uniq.rs +++ b/src/test/run-pass/explicit-self-objects-uniq.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] trait Foo { diff --git a/src/test/run-pass/explicit-self.rs b/src/test/run-pass/explicit-self.rs index 11711e6ab74be..525980cf7cc2a 100644 --- a/src/test/run-pass/explicit-self.rs +++ b/src/test/run-pass/explicit-self.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] static tau: f64 = 2.0*3.14159265358979323; diff --git a/src/test/run-pass/explicit_self_xcrate_exe.rs b/src/test/run-pass/explicit_self_xcrate_exe.rs index eaaf92fbea9ce..c982bcfc570a1 100644 --- a/src/test/run-pass/explicit_self_xcrate_exe.rs +++ b/src/test/run-pass/explicit_self_xcrate_exe.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:explicit_self_xcrate.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/export-abstract-tag.rs b/src/test/run-pass/export-abstract-tag.rs index 7333d739f4b68..b96973696d165 100644 --- a/src/test/run-pass/export-abstract-tag.rs +++ b/src/test/run-pass/export-abstract-tag.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // We can export tags without exporting the variants to create a simple // sort of ADT. diff --git a/src/test/run-pass/export-glob-imports-target.rs b/src/test/run-pass/export-glob-imports-target.rs index 4f821ebcc185a..03b2eb7648ebc 100644 --- a/src/test/run-pass/export-glob-imports-target.rs +++ b/src/test/run-pass/export-glob-imports-target.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that a glob-export functions as an import // when referenced within its own local scope. diff --git a/src/test/run-pass/export-multi.rs b/src/test/run-pass/export-multi.rs index e7c35fcd7562c..bfa2765d25457 100644 --- a/src/test/run-pass/export-multi.rs +++ b/src/test/run-pass/export-multi.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 use m::f; diff --git a/src/test/run-pass/export-non-interference2.rs b/src/test/run-pass/export-non-interference2.rs index 0b9b8fbcfd33a..30d5a0d9c05d2 100644 --- a/src/test/run-pass/export-non-interference2.rs +++ b/src/test/run-pass/export-non-interference2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod foo { pub mod bar { pub fn y() { super::super::foo::x(); } diff --git a/src/test/run-pass/export-non-interference3.rs b/src/test/run-pass/export-non-interference3.rs index b7ef4df7ed6c0..a11ea3a045513 100644 --- a/src/test/run-pass/export-non-interference3.rs +++ b/src/test/run-pass/export-non-interference3.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod foo { pub fn x() { ::bar::x(); } } diff --git a/src/test/run-pass/export-tag-variant.rs b/src/test/run-pass/export-tag-variant.rs index 6257332a66566..c837379769a92 100644 --- a/src/test/run-pass/export-tag-variant.rs +++ b/src/test/run-pass/export-tag-variant.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 mod foo { diff --git a/src/test/run-pass/expr-block-fn.rs b/src/test/run-pass/expr-block-fn.rs index 32641c4a3f2c9..229e2b02bf021 100644 --- a/src/test/run-pass/expr-block-fn.rs +++ b/src/test/run-pass/expr-block-fn.rs @@ -1,16 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - fn test_fn() { fn ten() -> isize { return 10; } let rs = ten; diff --git a/src/test/run-pass/expr-block-generic-unique1.rs b/src/test/run-pass/expr-block-generic-unique1.rs index 304f1c7a2eacd..b89f2f9660c26 100644 --- a/src/test/run-pass/expr-block-generic-unique1.rs +++ b/src/test/run-pass/expr-block-generic-unique1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn test_generic(expected: Box, eq: F) where T: Clone, F: FnOnce(Box, Box) -> bool { diff --git a/src/test/run-pass/expr-block-generic-unique2.rs b/src/test/run-pass/expr-block-generic-unique2.rs index af3f5547867a1..4c712abcc3fef 100644 --- a/src/test/run-pass/expr-block-generic-unique2.rs +++ b/src/test/run-pass/expr-block-generic-unique2.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn test_generic(expected: T, eq: F) where T: Clone, F: FnOnce(T, T) -> bool { diff --git a/src/test/run-pass/expr-block-generic.rs b/src/test/run-pass/expr-block-generic.rs index 8795962bebdd8..5665790a84dbc 100644 --- a/src/test/run-pass/expr-block-generic.rs +++ b/src/test/run-pass/expr-block-generic.rs @@ -1,14 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn test_generic(expected: T, eq: F) where F: FnOnce(T, T) -> bool { let actual: T = { expected.clone() }; assert!(eq(expected, actual)); diff --git a/src/test/run-pass/expr-block-slot.rs b/src/test/run-pass/expr-block-slot.rs index d9b4c95bc24d1..65d58e00bc973 100644 --- a/src/test/run-pass/expr-block-slot.rs +++ b/src/test/run-pass/expr-block-slot.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #377 diff --git a/src/test/run-pass/expr-block-unique.rs b/src/test/run-pass/expr-block-unique.rs index 2426ee5966c9f..a5b7bacec23b7 100644 --- a/src/test/run-pass/expr-block-unique.rs +++ b/src/test/run-pass/expr-block-unique.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] pub fn main() { let x: Box<_> = { box 100 }; assert_eq!(*x, 100); } diff --git a/src/test/run-pass/expr-block.rs b/src/test/run-pass/expr-block.rs index 664555caf26bb..bed93ca2cb242 100644 --- a/src/test/run-pass/expr-block.rs +++ b/src/test/run-pass/expr-block.rs @@ -1,17 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - - // Tests for standalone blocks as expressions fn test_basic() { let rs: bool = { true }; assert!((rs)); } diff --git a/src/test/run-pass/expr-copy.rs b/src/test/run-pass/expr-copy.rs index 99e74a6b8564d..fdea32f476ac2 100644 --- a/src/test/run-pass/expr-copy.rs +++ b/src/test/run-pass/expr-copy.rs @@ -1,15 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - fn f(arg: &mut A) { arg.a = 100; } diff --git a/src/test/run-pass/expr-empty-ret.rs b/src/test/run-pass/expr-empty-ret.rs index 02ac2a0b67b14..7c49f3b150cfc 100644 --- a/src/test/run-pass/expr-empty-ret.rs +++ b/src/test/run-pass/expr-empty-ret.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #521 // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/expr-fn.rs b/src/test/run-pass/expr-fn.rs index cc9a2e60decee..9e0679b959b95 100644 --- a/src/test/run-pass/expr-fn.rs +++ b/src/test/run-pass/expr-fn.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - fn test_int() { fn f() -> isize { 10 } assert_eq!(f(), 10); diff --git a/src/test/run-pass/expr-if-generic.rs b/src/test/run-pass/expr-if-generic.rs index 94c6b70bb62f3..3e3600c452802 100644 --- a/src/test/run-pass/expr-if-generic.rs +++ b/src/test/run-pass/expr-if-generic.rs @@ -1,14 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn test_generic(expected: T, not_expected: T, eq: F) where T: Clone, F: FnOnce(T, T) -> bool, diff --git a/src/test/run-pass/expr-if-panic-all.rs b/src/test/run-pass/expr-if-panic-all.rs index 43110533b6dc6..ea7f36f8a3cc2 100644 --- a/src/test/run-pass/expr-if-panic-all.rs +++ b/src/test/run-pass/expr-if-panic-all.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // When all branches of an if expression result in panic, the entire if // expression results in panic. diff --git a/src/test/run-pass/expr-if-panic.rs b/src/test/run-pass/expr-if-panic.rs index 1bedc2a5a1707..ae92e3b125ba8 100644 --- a/src/test/run-pass/expr-if-panic.rs +++ b/src/test/run-pass/expr-if-panic.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn test_if_panic() { let x = if false { panic!() } else { 10 }; assert_eq!(x, 10); diff --git a/src/test/run-pass/expr-if-struct.rs b/src/test/run-pass/expr-if-struct.rs index e79daed4c33d7..c137520257c07 100644 --- a/src/test/run-pass/expr-if-struct.rs +++ b/src/test/run-pass/expr-if-struct.rs @@ -1,17 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - - // Tests for if as expressions returning nominal types #[derive(Copy, Clone)] diff --git a/src/test/run-pass/expr-if-unique.rs b/src/test/run-pass/expr-if-unique.rs index a8547536603ad..ef76fb27e9d3d 100644 --- a/src/test/run-pass/expr-if-unique.rs +++ b/src/test/run-pass/expr-if-unique.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] // Tests for if as expressions returning boxed types diff --git a/src/test/run-pass/expr-if.rs b/src/test/run-pass/expr-if.rs index e8458e320113b..4b8d363b02032 100644 --- a/src/test/run-pass/expr-if.rs +++ b/src/test/run-pass/expr-if.rs @@ -1,17 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - - // Tests for if as expressions fn test_if() { let rs: bool = if true { true } else { false }; assert!((rs)); } diff --git a/src/test/run-pass/expr-match-generic-unique1.rs b/src/test/run-pass/expr-match-generic-unique1.rs index 3fce798c285c0..3ec8e4c442c74 100644 --- a/src/test/run-pass/expr-match-generic-unique1.rs +++ b/src/test/run-pass/expr-match-generic-unique1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn test_generic(expected: Box, eq: F) where F: FnOnce(Box, Box) -> bool { diff --git a/src/test/run-pass/expr-match-generic-unique2.rs b/src/test/run-pass/expr-match-generic-unique2.rs index 5500edcf239f5..9c616896b6442 100644 --- a/src/test/run-pass/expr-match-generic-unique2.rs +++ b/src/test/run-pass/expr-match-generic-unique2.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn test_generic(expected: T, eq: F) where F: FnOnce(T, T) -> bool { diff --git a/src/test/run-pass/expr-match-generic.rs b/src/test/run-pass/expr-match-generic.rs index 509106289d079..5e1169cc0356a 100644 --- a/src/test/run-pass/expr-match-generic.rs +++ b/src/test/run-pass/expr-match-generic.rs @@ -1,15 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - type compare = extern "Rust" fn(T, T) -> bool; fn test_generic(expected: T, eq: compare) { diff --git a/src/test/run-pass/expr-match-panic-all.rs b/src/test/run-pass/expr-match-panic-all.rs index e712d552a8107..ee9474e681894 100644 --- a/src/test/run-pass/expr-match-panic-all.rs +++ b/src/test/run-pass/expr-match-panic-all.rs @@ -1,16 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - // When all branches of a match expression result in panic, the entire // match expression results in panic. diff --git a/src/test/run-pass/expr-match-panic.rs b/src/test/run-pass/expr-match-panic.rs index 1a6466048d90d..774eb21896a97 100644 --- a/src/test/run-pass/expr-match-panic.rs +++ b/src/test/run-pass/expr-match-panic.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - fn test_simple() { let r = match true { true => { true } false => { panic!() } }; assert_eq!(r, true); diff --git a/src/test/run-pass/expr-match-struct.rs b/src/test/run-pass/expr-match-struct.rs index 2dcb0f833e4b3..d3ed683595ca4 100644 --- a/src/test/run-pass/expr-match-struct.rs +++ b/src/test/run-pass/expr-match-struct.rs @@ -1,17 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - - // Tests for match as expressions resulting in struct types #[derive(Copy, Clone)] struct R { i: isize } diff --git a/src/test/run-pass/expr-match-unique.rs b/src/test/run-pass/expr-match-unique.rs index e66f09c63ea4b..f8aada857e0ba 100644 --- a/src/test/run-pass/expr-match-unique.rs +++ b/src/test/run-pass/expr-match-unique.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] // Tests for match as expressions resulting in boxed types diff --git a/src/test/run-pass/expr-match.rs b/src/test/run-pass/expr-match.rs index 580ee52ed3645..00410ae7c590f 100644 --- a/src/test/run-pass/expr-match.rs +++ b/src/test/run-pass/expr-match.rs @@ -1,17 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - - // Tests for using match as an expression fn test_basic() { diff --git a/src/test/run-pass/expr-scope.rs b/src/test/run-pass/expr-scope.rs index a1d86218846d6..15bb4a2eb0b44 100644 --- a/src/test/run-pass/expr-scope.rs +++ b/src/test/run-pass/expr-scope.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #762 // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/ext-expand-inner-exprs.rs b/src/test/run-pass/ext-expand-inner-exprs.rs index 90ca31e80be3a..a32b3d7f002b8 100644 --- a/src/test/run-pass/ext-expand-inner-exprs.rs +++ b/src/test/run-pass/ext-expand-inner-exprs.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - static FOO : &'static str = concat!(concat!("hel", "lo"), "world"); pub fn main() { diff --git a/src/test/run-pass/extend-for-unit.rs b/src/test/run-pass/extend-for-unit.rs index d1a0614bd8a19..1c1e61239b790 100644 --- a/src/test/run-pass/extend-for-unit.rs +++ b/src/test/run-pass/extend-for-unit.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { let mut x = 0; { diff --git a/src/test/run-pass/exterior.rs b/src/test/run-pass/exterior.rs index 5ab6c7774d55c..0e8368348f484 100644 --- a/src/test/run-pass/exterior.rs +++ b/src/test/run-pass/exterior.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - use std::cell::Cell; #[derive(Copy, Clone)] diff --git a/src/test/run-pass/extern-1.rs b/src/test/run-pass/extern-1.rs index 67f6a3e8fc484..d9efd1c8c4e0b 100644 --- a/src/test/run-pass/extern-1.rs +++ b/src/test/run-pass/extern-1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 extern fn f() { diff --git a/src/test/run-pass/extern-call-deep.rs b/src/test/run-pass/extern-call-deep.rs index a41ab8da9de11..649f309bf1a95 100644 --- a/src/test/run-pass/extern-call-deep.rs +++ b/src/test/run-pass/extern-call-deep.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare no libc to test ffi with #![feature(libc)] diff --git a/src/test/run-pass/extern-call-deep2.rs b/src/test/run-pass/extern-call-deep2.rs index 3bdc8c18864fd..9abb0cee030c6 100644 --- a/src/test/run-pass/extern-call-deep2.rs +++ b/src/test/run-pass/extern-call-deep2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support #![feature(libc)] diff --git a/src/test/run-pass/extern-call-direct.rs b/src/test/run-pass/extern-call-direct.rs index ec6b6c8d39fad..f69758c5ea30f 100644 --- a/src/test/run-pass/extern-call-direct.rs +++ b/src/test/run-pass/extern-call-direct.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test direct calls to extern fns. diff --git a/src/test/run-pass/extern-call-indirect.rs b/src/test/run-pass/extern-call-indirect.rs index ba108955c28d6..275504dfdf33d 100644 --- a/src/test/run-pass/extern-call-indirect.rs +++ b/src/test/run-pass/extern-call-indirect.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare no libc to test ffi with #![feature(libc)] diff --git a/src/test/run-pass/extern-call-scrub.rs b/src/test/run-pass/extern-call-scrub.rs index a29ea377947c7..335cae4a9b6af 100644 --- a/src/test/run-pass/extern-call-scrub.rs +++ b/src/test/run-pass/extern-call-scrub.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This time we're testing repeatedly going up and down both stacks to // make sure the stack pointers are maintained properly in both // directions diff --git a/src/test/run-pass/extern-calling-convention-test.rs b/src/test/run-pass/extern-calling-convention-test.rs index 12f9c22c91824..80a5fdb229d08 100644 --- a/src/test/run-pass/extern-calling-convention-test.rs +++ b/src/test/run-pass/extern-calling-convention-test.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:extern_calling_convention.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/extern-compare-with-return-type.rs b/src/test/run-pass/extern-compare-with-return-type.rs index 6535ae2fca946..c02caa5c05358 100644 --- a/src/test/run-pass/extern-compare-with-return-type.rs +++ b/src/test/run-pass/extern-compare-with-return-type.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that we can compare various kinds of extern fn signatures. diff --git a/src/test/run-pass/extern-crosscrate.rs b/src/test/run-pass/extern-crosscrate.rs index 825b502d95485..c62621e233e5e 100644 --- a/src/test/run-pass/extern-crosscrate.rs +++ b/src/test/run-pass/extern-crosscrate.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:extern-crosscrate-source.rs // ignore-wasm32-bare no libc to test ffi with diff --git a/src/test/run-pass/extern-foreign-crate.rs b/src/test/run-pass/extern-foreign-crate.rs index 1757ff51fed3f..15d844ebbac51 100644 --- a/src/test/run-pass/extern-foreign-crate.rs +++ b/src/test/run-pass/extern-foreign-crate.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 extern crate std as mystd; diff --git a/src/test/run-pass/extern-methods.rs b/src/test/run-pass/extern-methods.rs index 2587a97863679..66d5494468309 100644 --- a/src/test/run-pass/extern-methods.rs +++ b/src/test/run-pass/extern-methods.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-arm // ignore-aarch64 diff --git a/src/test/run-pass/extern-mod-abi.rs b/src/test/run-pass/extern-mod-abi.rs index 74f47f08703a2..8fa35ce7ecff7 100644 --- a/src/test/run-pass/extern-mod-abi.rs +++ b/src/test/run-pass/extern-mod-abi.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 extern "C" { diff --git a/src/test/run-pass/extern-mod-ordering-exe.rs b/src/test/run-pass/extern-mod-ordering-exe.rs index 1c64716b822b5..8d91e10d470a5 100644 --- a/src/test/run-pass/extern-mod-ordering-exe.rs +++ b/src/test/run-pass/extern-mod-ordering-exe.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:extern_mod_ordering_lib.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/extern-pass-TwoU16s.rs b/src/test/run-pass/extern-pass-TwoU16s.rs index a1aa9b69fadaa..d25a592927aa8 100644 --- a/src/test/run-pass/extern-pass-TwoU16s.rs +++ b/src/test/run-pass/extern-pass-TwoU16s.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare no libc for ffi testing // Test a foreign function that accepts and returns a struct diff --git a/src/test/run-pass/extern-pass-TwoU32s.rs b/src/test/run-pass/extern-pass-TwoU32s.rs index 6442f230d3024..9579a73644bcb 100644 --- a/src/test/run-pass/extern-pass-TwoU32s.rs +++ b/src/test/run-pass/extern-pass-TwoU32s.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare no libc for ffi testing // Test a foreign function that accepts and returns a struct diff --git a/src/test/run-pass/extern-pass-TwoU64s.rs b/src/test/run-pass/extern-pass-TwoU64s.rs index bfb649c3f74ea..86f0d4517037a 100644 --- a/src/test/run-pass/extern-pass-TwoU64s.rs +++ b/src/test/run-pass/extern-pass-TwoU64s.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare no libc for ffi testing // Test a foreign function that accepts and returns a struct diff --git a/src/test/run-pass/extern-pass-TwoU8s.rs b/src/test/run-pass/extern-pass-TwoU8s.rs index 1f90d9c436677..ca2f5543714b8 100644 --- a/src/test/run-pass/extern-pass-TwoU8s.rs +++ b/src/test/run-pass/extern-pass-TwoU8s.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare no libc for ffi testing // Test a foreign function that accepts and returns a struct diff --git a/src/test/run-pass/extern-pass-char.rs b/src/test/run-pass/extern-pass-char.rs index 920e15bf2c119..cc73de04f0787 100644 --- a/src/test/run-pass/extern-pass-char.rs +++ b/src/test/run-pass/extern-pass-char.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare no libc for ffi testing // Test a function that takes/returns a u8. diff --git a/src/test/run-pass/extern-pass-double.rs b/src/test/run-pass/extern-pass-double.rs index 9c184477ad340..c12a45a6d4c05 100644 --- a/src/test/run-pass/extern-pass-double.rs +++ b/src/test/run-pass/extern-pass-double.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare no libc for ffi testing #[link(name = "rust_test_helpers", kind = "static")] diff --git a/src/test/run-pass/extern-pass-empty.rs b/src/test/run-pass/extern-pass-empty.rs index f4ee3b6e9e800..0d03d609a83f5 100644 --- a/src/test/run-pass/extern-pass-empty.rs +++ b/src/test/run-pass/extern-pass-empty.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test a foreign function that accepts empty struct. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/extern-pass-u32.rs b/src/test/run-pass/extern-pass-u32.rs index 691bd6295b143..19cba0d0bc382 100644 --- a/src/test/run-pass/extern-pass-u32.rs +++ b/src/test/run-pass/extern-pass-u32.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare no libc for ffi testing // Test a function that takes/returns a u32. diff --git a/src/test/run-pass/extern-pass-u64.rs b/src/test/run-pass/extern-pass-u64.rs index 4b351ed2836cc..eba3b4cbe1a7c 100644 --- a/src/test/run-pass/extern-pass-u64.rs +++ b/src/test/run-pass/extern-pass-u64.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare no libc for ffi testing // Test a call to a function that takes/returns a u64. diff --git a/src/test/run-pass/extern-prelude-core.rs b/src/test/run-pass/extern-prelude-core.rs index d0d01b34c6e92..2c3fda3d3ac57 100644 --- a/src/test/run-pass/extern-prelude-core.rs +++ b/src/test/run-pass/extern-prelude-core.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(extern_prelude, lang_items, start, alloc)] #![no_std] diff --git a/src/test/run-pass/extern-prelude-no-speculative.rs b/src/test/run-pass/extern-prelude-no-speculative.rs index ff3aec439aae0..ef04b6f1b0739 100644 --- a/src/test/run-pass/extern-prelude-no-speculative.rs +++ b/src/test/run-pass/extern-prelude-no-speculative.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --extern LooksLikeExternCrate=/path/to/nowhere mod m { diff --git a/src/test/run-pass/extern-prelude-std.rs b/src/test/run-pass/extern-prelude-std.rs index de73f1d22783e..6674c3947ce9f 100644 --- a/src/test/run-pass/extern-prelude-std.rs +++ b/src/test/run-pass/extern-prelude-std.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(extern_prelude)] mod foo { diff --git a/src/test/run-pass/extern-pub.rs b/src/test/run-pass/extern-pub.rs index 29bcdef5dc9ec..2969bf0c09561 100644 --- a/src/test/run-pass/extern-pub.rs +++ b/src/test/run-pass/extern-pub.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 extern { diff --git a/src/test/run-pass/extern-return-TwoU16s.rs b/src/test/run-pass/extern-return-TwoU16s.rs index b9ce3f4588688..933246392a644 100644 --- a/src/test/run-pass/extern-return-TwoU16s.rs +++ b/src/test/run-pass/extern-return-TwoU16s.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare no libc to test ffi with pub struct TwoU16s { diff --git a/src/test/run-pass/extern-return-TwoU32s.rs b/src/test/run-pass/extern-return-TwoU32s.rs index 686ff16fe4d6b..64d815ad4ca5a 100644 --- a/src/test/run-pass/extern-return-TwoU32s.rs +++ b/src/test/run-pass/extern-return-TwoU32s.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare no libc to test ffi with pub struct TwoU32s { diff --git a/src/test/run-pass/extern-return-TwoU64s.rs b/src/test/run-pass/extern-return-TwoU64s.rs index e754674fd1ebd..3f7aaaa6108ca 100644 --- a/src/test/run-pass/extern-return-TwoU64s.rs +++ b/src/test/run-pass/extern-return-TwoU64s.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare no libc to test ffi with pub struct TwoU64s { diff --git a/src/test/run-pass/extern-return-TwoU8s.rs b/src/test/run-pass/extern-return-TwoU8s.rs index 68fe3832e90ab..4db7d997cd6ec 100644 --- a/src/test/run-pass/extern-return-TwoU8s.rs +++ b/src/test/run-pass/extern-return-TwoU8s.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare no libc to test ffi with pub struct TwoU8s { diff --git a/src/test/run-pass/extern-rust.rs b/src/test/run-pass/extern-rust.rs index e7f707bc334d7..e85af0aeefa45 100644 --- a/src/test/run-pass/extern-rust.rs +++ b/src/test/run-pass/extern-rust.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #[repr(C)] diff --git a/src/test/run-pass/extern-take-value.rs b/src/test/run-pass/extern-take-value.rs index f535e45e6cf6e..f63ce79b9f8b2 100644 --- a/src/test/run-pass/extern-take-value.rs +++ b/src/test/run-pass/extern-take-value.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:extern-take-value.rs extern crate extern_take_value; diff --git a/src/test/run-pass/extern-thiscall.rs b/src/test/run-pass/extern-thiscall.rs index a669f29d098a0..6a688ed8c0fdd 100644 --- a/src/test/run-pass/extern-thiscall.rs +++ b/src/test/run-pass/extern-thiscall.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-arm // ignore-aarch64 diff --git a/src/test/run-pass/extern-types-inherent-impl.rs b/src/test/run-pass/extern-types-inherent-impl.rs index 4e44af3690064..1346fcbd4430a 100644 --- a/src/test/run-pass/extern-types-inherent-impl.rs +++ b/src/test/run-pass/extern-types-inherent-impl.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that inherent impls can be defined for extern types. #![feature(extern_types)] diff --git a/src/test/run-pass/extern-types-manual-sync-send.rs b/src/test/run-pass/extern-types-manual-sync-send.rs index c6530c3ea773a..4ca5c90e6d610 100644 --- a/src/test/run-pass/extern-types-manual-sync-send.rs +++ b/src/test/run-pass/extern-types-manual-sync-send.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that unsafe impl for Sync/Send can be provided for extern types. #![feature(extern_types)] diff --git a/src/test/run-pass/extern-types-pointer-cast.rs b/src/test/run-pass/extern-types-pointer-cast.rs index 0dede8eb70de0..414793e9ab025 100644 --- a/src/test/run-pass/extern-types-pointer-cast.rs +++ b/src/test/run-pass/extern-types-pointer-cast.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that pointers to extern types can be cast from/to usize, // despite being !Sized. diff --git a/src/test/run-pass/extern-types-size_of_val.rs b/src/test/run-pass/extern-types-size_of_val.rs index 0aabce99debe8..8f2e494f3602e 100644 --- a/src/test/run-pass/extern-types-size_of_val.rs +++ b/src/test/run-pass/extern-types-size_of_val.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(extern_types)] use std::mem::{size_of_val, align_of_val}; diff --git a/src/test/run-pass/extern-types-thin-pointer.rs b/src/test/run-pass/extern-types-thin-pointer.rs index c2444a58b5a1b..458cfc02f7360 100644 --- a/src/test/run-pass/extern-types-thin-pointer.rs +++ b/src/test/run-pass/extern-types-thin-pointer.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that pointers and references to extern types are thin, ie they have the same size and // alignment as a pointer to (). diff --git a/src/test/run-pass/extern-types-trait-impl.rs b/src/test/run-pass/extern-types-trait-impl.rs index 0f61c936deb61..1b0dee56d3e9f 100644 --- a/src/test/run-pass/extern-types-trait-impl.rs +++ b/src/test/run-pass/extern-types-trait-impl.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that traits can be implemented for extern types. #![feature(extern_types)] diff --git a/src/test/run-pass/extern-vectorcall.rs b/src/test/run-pass/extern-vectorcall.rs index 90c3459036b6b..87a36d49a814e 100644 --- a/src/test/run-pass/extern-vectorcall.rs +++ b/src/test/run-pass/extern-vectorcall.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-arm // ignore-aarch64 diff --git a/src/test/run-pass/extern_fat_drop.rs b/src/test/run-pass/extern_fat_drop.rs index 123458ff97e13..3d1ba9093166b 100644 --- a/src/test/run-pass/extern_fat_drop.rs +++ b/src/test/run-pass/extern_fat_drop.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:fat_drop.rs extern crate fat_drop; diff --git a/src/test/run-pass/extoption_env-not-defined.rs b/src/test/run-pass/extoption_env-not-defined.rs index 352f68da9854f..7a2a2afad5c25 100644 --- a/src/test/run-pass/extoption_env-not-defined.rs +++ b/src/test/run-pass/extoption_env-not-defined.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { assert!(option_env!("__HOPEFULLY_DOESNT_EXIST__").is_none()); } diff --git a/src/test/run-pass/fact.rs b/src/test/run-pass/fact.rs index 5cb2abbfb0a68..0dd68c991ad3b 100644 --- a/src/test/run-pass/fact.rs +++ b/src/test/run-pass/fact.rs @@ -1,16 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - fn f(x: isize) -> isize { // println!("in f:"); diff --git a/src/test/run-pass/fat-arrow-match.rs b/src/test/run-pass/fat-arrow-match.rs index 004e6d48e3798..9a2194da73f0c 100644 --- a/src/test/run-pass/fat-arrow-match.rs +++ b/src/test/run-pass/fat-arrow-match.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum color { red, green, diff --git a/src/test/run-pass/fat-lto.rs b/src/test/run-pass/fat-lto.rs index 453eede261cc0..7e50b44430c11 100644 --- a/src/test/run-pass/fat-lto.rs +++ b/src/test/run-pass/fat-lto.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Clto=fat // no-prefer-dynamic diff --git a/src/test/run-pass/fat-ptr-cast.rs b/src/test/run-pass/fat-ptr-cast.rs index 58296c3f95ef9..367b57d5ea0a2 100644 --- a/src/test/run-pass/fat-ptr-cast.rs +++ b/src/test/run-pass/fat-ptr-cast.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(raw)] use std::mem; diff --git a/src/test/run-pass/fds-are-cloexec.rs b/src/test/run-pass/fds-are-cloexec.rs index a5ae0ae9f3155..571c74205b8b2 100644 --- a/src/test/run-pass/fds-are-cloexec.rs +++ b/src/test/run-pass/fds-are-cloexec.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-windows // ignore-android // ignore-cloudabi no processes diff --git a/src/test/run-pass/field-destruction-order.rs b/src/test/run-pass/field-destruction-order.rs index 624167db36da3..59475317998d1 100644 --- a/src/test/run-pass/field-destruction-order.rs +++ b/src/test/run-pass/field-destruction-order.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // In theory, it doesn't matter what order destructors are run in for rust // because we have explicit ownership of values meaning that there's no need to // run one before another. With unsafe code, however, there may be a safe diff --git a/src/test/run-pass/filter-block-view-items.rs b/src/test/run-pass/filter-block-view-items.rs index fbdf817e9abb8..d2b9866504a98 100644 --- a/src/test/run-pass/filter-block-view-items.rs +++ b/src/test/run-pass/filter-block-view-items.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub fn main() { diff --git a/src/test/run-pass/fixed_length_copy.rs b/src/test/run-pass/fixed_length_copy.rs index eefd94475358c..08dd2ad6ff4a4 100644 --- a/src/test/run-pass/fixed_length_copy.rs +++ b/src/test/run-pass/fixed_length_copy.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { let arr = [1,2,3]; let arr2 = arr; diff --git a/src/test/run-pass/fixup-deref-mut.rs b/src/test/run-pass/fixup-deref-mut.rs index 900da3c2d6ab2..c9962da2eb94b 100644 --- a/src/test/run-pass/fixup-deref-mut.rs +++ b/src/test/run-pass/fixup-deref-mut.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 use std::ops::{Deref, DerefMut}; diff --git a/src/test/run-pass/float-int-invalid-const-cast.rs b/src/test/run-pass/float-int-invalid-const-cast.rs index f84432abbfa0b..dfebfafbca5ba 100644 --- a/src/test/run-pass/float-int-invalid-const-cast.rs +++ b/src/test/run-pass/float-int-invalid-const-cast.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no i128 support #![deny(const_err)] diff --git a/src/test/run-pass/float-literal-inference.rs b/src/test/run-pass/float-literal-inference.rs index b7c2c8d4953cb..0cc578f581aa2 100644 --- a/src/test/run-pass/float-literal-inference.rs +++ b/src/test/run-pass/float-literal-inference.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S { z: f64 } diff --git a/src/test/run-pass/float-nan.rs b/src/test/run-pass/float-nan.rs index 856599431fd18..e049635f60c91 100644 --- a/src/test/run-pass/float-nan.rs +++ b/src/test/run-pass/float-nan.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::f64; pub fn main() { diff --git a/src/test/run-pass/float-signature.rs b/src/test/run-pass/float-signature.rs index 08daf1bd80e42..cb77988d10e61 100644 --- a/src/test/run-pass/float-signature.rs +++ b/src/test/run-pass/float-signature.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - pub fn main() { fn foo(n: f64) -> f64 { return n + 0.12345; } let n: f64 = 0.1; diff --git a/src/test/run-pass/float.rs b/src/test/run-pass/float.rs index 22d54162c430c..0979aa6904a2f 100644 --- a/src/test/run-pass/float.rs +++ b/src/test/run-pass/float.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { let pi = 3.1415927f64; println!("{}", -pi * (pi + 2.0 / pi) - pi * 5.0); diff --git a/src/test/run-pass/float2.rs b/src/test/run-pass/float2.rs index e9f6e0f51b4ec..5bdec3da17fca 100644 --- a/src/test/run-pass/float2.rs +++ b/src/test/run-pass/float2.rs @@ -1,16 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - pub fn main() { let a = 1.5e6f64; let b = 1.5E6f64; diff --git a/src/test/run-pass/float_math.rs b/src/test/run-pass/float_math.rs index c1b4b55bd3723..ba7e6ac3ec063 100644 --- a/src/test/run-pass/float_math.rs +++ b/src/test/run-pass/float_math.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(core_intrinsics)] use std::intrinsics::{fadd_fast, fsub_fast, fmul_fast, fdiv_fast, frem_fast}; diff --git a/src/test/run-pass/floatlits.rs b/src/test/run-pass/floatlits.rs index d133f3463a3f2..b471c0b5911e1 100644 --- a/src/test/run-pass/floatlits.rs +++ b/src/test/run-pass/floatlits.rs @@ -1,16 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - pub fn main() { let f = 4.999999999999f64; assert!((f > 4.90f64)); diff --git a/src/test/run-pass/fmt-pointer-trait.rs b/src/test/run-pass/fmt-pointer-trait.rs index 4ecb9da4eb9c6..d63bef335577a 100644 --- a/src/test/run-pass/fmt-pointer-trait.rs +++ b/src/test/run-pass/fmt-pointer-trait.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ptr; use std::rc::Rc; use std::sync::Arc; diff --git a/src/test/run-pass/fn-abi.rs b/src/test/run-pass/fn-abi.rs index 0e3005a2aaa65..6f6991c0b4061 100644 --- a/src/test/run-pass/fn-abi.rs +++ b/src/test/run-pass/fn-abi.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Ensure that declarations and types which use `extern fn` both have the same // ABI (#9309). diff --git a/src/test/run-pass/fn-bare-assign.rs b/src/test/run-pass/fn-bare-assign.rs index 2d3d4cbffd00d..383572d493339 100644 --- a/src/test/run-pass/fn-bare-assign.rs +++ b/src/test/run-pass/fn-bare-assign.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn f(i: isize, called: &mut bool) { assert_eq!(i, 10); *called = true; diff --git a/src/test/run-pass/fn-bare-coerce-to-block.rs b/src/test/run-pass/fn-bare-coerce-to-block.rs index 4ec32d23467f7..b3236b9c0ef57 100644 --- a/src/test/run-pass/fn-bare-coerce-to-block.rs +++ b/src/test/run-pass/fn-bare-coerce-to-block.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn bare() {} diff --git a/src/test/run-pass/fn-bare-item.rs b/src/test/run-pass/fn-bare-item.rs index 455b71aff877a..011650bd18c24 100644 --- a/src/test/run-pass/fn-bare-item.rs +++ b/src/test/run-pass/fn-bare-item.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn f() { println!("This is a bare function"); } diff --git a/src/test/run-pass/fn-bare-size.rs b/src/test/run-pass/fn-bare-size.rs index 3ed4f103af081..fec31ffee3ffc 100644 --- a/src/test/run-pass/fn-bare-size.rs +++ b/src/test/run-pass/fn-bare-size.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::mem; pub fn main() { diff --git a/src/test/run-pass/fn-bare-spawn.rs b/src/test/run-pass/fn-bare-spawn.rs index e6ee77cb62bb6..815d4a68a4888 100644 --- a/src/test/run-pass/fn-bare-spawn.rs +++ b/src/test/run-pass/fn-bare-spawn.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This is what the signature to spawn should look like with bare functions diff --git a/src/test/run-pass/fn-coerce-field.rs b/src/test/run-pass/fn-coerce-field.rs index 74d107d15ab0f..b169850cfde44 100644 --- a/src/test/run-pass/fn-coerce-field.rs +++ b/src/test/run-pass/fn-coerce-field.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct r where F: FnOnce() { diff --git a/src/test/run-pass/fn-item-type-cast.rs b/src/test/run-pass/fn-item-type-cast.rs index 9a8a8d4782ed5..e087fb977c8c9 100644 --- a/src/test/run-pass/fn-item-type-cast.rs +++ b/src/test/run-pass/fn-item-type-cast.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test explicit coercions from a fn item type to a fn pointer type. diff --git a/src/test/run-pass/fn-item-type-coerce.rs b/src/test/run-pass/fn-item-type-coerce.rs index 67899bfd683d8..9a68bc09a3380 100644 --- a/src/test/run-pass/fn-item-type-coerce.rs +++ b/src/test/run-pass/fn-item-type-coerce.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test implicit coercions from a fn item type to a fn pointer type. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/fn-item-type-zero-sized.rs b/src/test/run-pass/fn-item-type-zero-sized.rs index 5fdaf083d078f..ec56b625166e4 100644 --- a/src/test/run-pass/fn-item-type-zero-sized.rs +++ b/src/test/run-pass/fn-item-type-zero-sized.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that fn item types are zero-sized. use std::mem::{size_of, size_of_val}; diff --git a/src/test/run-pass/fn-lval.rs b/src/test/run-pass/fn-lval.rs index 13c96f4346894..8b032c4825da8 100644 --- a/src/test/run-pass/fn-lval.rs +++ b/src/test/run-pass/fn-lval.rs @@ -1,16 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - // pretty-expanded FIXME #23616 fn foo(_f: fn(isize) -> isize) { } diff --git a/src/test/run-pass/fn-pattern-expected-type-2.rs b/src/test/run-pass/fn-pattern-expected-type-2.rs index 66a7123c795f7..0f85886a0db62 100644 --- a/src/test/run-pass/fn-pattern-expected-type-2.rs +++ b/src/test/run-pass/fn-pattern-expected-type-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { let v : &[(isize,isize)] = &[ (1, 2), (3, 4), (5, 6) ]; for &(x, y) in v { diff --git a/src/test/run-pass/fn-pattern-expected-type.rs b/src/test/run-pass/fn-pattern-expected-type.rs index 2e9607602fd62..506a42fff80fe 100644 --- a/src/test/run-pass/fn-pattern-expected-type.rs +++ b/src/test/run-pass/fn-pattern-expected-type.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { let f = |(x, y): (isize, isize)| { assert_eq!(x, 1); diff --git a/src/test/run-pass/fn-type-infer.rs b/src/test/run-pass/fn-type-infer.rs index ad6c10611aaa0..f5b0f0baaa817 100644 --- a/src/test/run-pass/fn-type-infer.rs +++ b/src/test/run-pass/fn-type-infer.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![allow(unused_variables)] diff --git a/src/test/run-pass/for-destruct.rs b/src/test/run-pass/for-destruct.rs index ba78ff4d53937..0ae66416decc1 100644 --- a/src/test/run-pass/for-destruct.rs +++ b/src/test/run-pass/for-destruct.rs @@ -1,14 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct Pair { x: isize, y: isize } pub fn main() { diff --git a/src/test/run-pass/for-loop-goofiness.rs b/src/test/run-pass/for-loop-goofiness.rs index 411183e4f74a7..de9b5321e69cf 100644 --- a/src/test/run-pass/for-loop-goofiness.rs +++ b/src/test/run-pass/for-loop-goofiness.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum BogusOption { None, Some(T), diff --git a/src/test/run-pass/for-loop-has-unit-body.rs b/src/test/run-pass/for-loop-has-unit-body.rs index 4036fc8480067..e02909f2e5835 100644 --- a/src/test/run-pass/for-loop-has-unit-body.rs +++ b/src/test/run-pass/for-loop-has-unit-body.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { // Check that the tail statement in the body unifies with something for _ in 0..3 { diff --git a/src/test/run-pass/for-loop-into-iterator.rs b/src/test/run-pass/for-loop-into-iterator.rs index 7efd15f222e37..41698772abf73 100644 --- a/src/test/run-pass/for-loop-into-iterator.rs +++ b/src/test/run-pass/for-loop-into-iterator.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that for loops can do what RFC #235 claims diff --git a/src/test/run-pass/for-loop-lifetime-of-unbound-values.rs b/src/test/run-pass/for-loop-lifetime-of-unbound-values.rs index 7a088b5133472..e42f4ecaa27c8 100644 --- a/src/test/run-pass/for-loop-lifetime-of-unbound-values.rs +++ b/src/test/run-pass/for-loop-lifetime-of-unbound-values.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test when destructors run in a for loop. The intention is // that the value for each iteration is dropped *after* the loop // body has executed. This is true even when the value is assigned diff --git a/src/test/run-pass/for-loop-macro.rs b/src/test/run-pass/for-loop-macro.rs index 17c5a98246b18..a38e6840cd35f 100644 --- a/src/test/run-pass/for-loop-macro.rs +++ b/src/test/run-pass/for-loop-macro.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! var { ( $name:ident ) => ( $name ); } diff --git a/src/test/run-pass/for-loop-mut-ref-element.rs b/src/test/run-pass/for-loop-mut-ref-element.rs index 556c846b0b8e1..036ac091d8fd3 100644 --- a/src/test/run-pass/for-loop-mut-ref-element.rs +++ b/src/test/run-pass/for-loop-mut-ref-element.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that for loops can bind elements as mutable references fn main() { diff --git a/src/test/run-pass/for-loop-no-std.rs b/src/test/run-pass/for-loop-no-std.rs index 856857156c940..dae2c0a4e7137 100644 --- a/src/test/run-pass/for-loop-no-std.rs +++ b/src/test/run-pass/for-loop-no-std.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(lang_items, start, alloc)] #![no_std] diff --git a/src/test/run-pass/for-loop-panic.rs b/src/test/run-pass/for-loop-panic.rs index 001ca1a02f632..9dc1be5366159 100644 --- a/src/test/run-pass/for-loop-panic.rs +++ b/src/test/run-pass/for-loop-panic.rs @@ -1,13 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - pub fn main() { let x: Vec = Vec::new(); for _ in &x { panic!("moop"); } } diff --git a/src/test/run-pass/for-loop-unconstrained-element-type-i32-fallback.rs b/src/test/run-pass/for-loop-unconstrained-element-type-i32-fallback.rs index 0bfc4d2264c62..8c1212270baf3 100644 --- a/src/test/run-pass/for-loop-unconstrained-element-type-i32-fallback.rs +++ b/src/test/run-pass/for-loop-unconstrained-element-type-i32-fallback.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the type of `sum` falls back to `i32` here, // and that the for loop desugaring doesn't interfere with // that. diff --git a/src/test/run-pass/foreach-external-iterators-break.rs b/src/test/run-pass/foreach-external-iterators-break.rs index e63c29eb0173a..2dbcf282c3ca7 100644 --- a/src/test/run-pass/foreach-external-iterators-break.rs +++ b/src/test/run-pass/foreach-external-iterators-break.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { let x = [1; 100]; let mut y = 0; diff --git a/src/test/run-pass/foreach-external-iterators-hashmap-break-restart.rs b/src/test/run-pass/foreach-external-iterators-hashmap-break-restart.rs index 232af7eca419b..13c1108775085 100644 --- a/src/test/run-pass/foreach-external-iterators-hashmap-break-restart.rs +++ b/src/test/run-pass/foreach-external-iterators-hashmap-break-restart.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::collections::HashMap; // This is a fancy one: it uses an external iterator established diff --git a/src/test/run-pass/foreach-external-iterators-hashmap.rs b/src/test/run-pass/foreach-external-iterators-hashmap.rs index 2ef420187ded2..49521983fad35 100644 --- a/src/test/run-pass/foreach-external-iterators-hashmap.rs +++ b/src/test/run-pass/foreach-external-iterators-hashmap.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::collections::HashMap; pub fn main() { diff --git a/src/test/run-pass/foreach-external-iterators-loop.rs b/src/test/run-pass/foreach-external-iterators-loop.rs index 7248537d6a1b6..019cd6b73880b 100644 --- a/src/test/run-pass/foreach-external-iterators-loop.rs +++ b/src/test/run-pass/foreach-external-iterators-loop.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { let x = [1; 100]; let mut y = 0; diff --git a/src/test/run-pass/foreach-external-iterators-nested.rs b/src/test/run-pass/foreach-external-iterators-nested.rs index ea55c90bdf12d..23fe43ae53912 100644 --- a/src/test/run-pass/foreach-external-iterators-nested.rs +++ b/src/test/run-pass/foreach-external-iterators-nested.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { let x = [1; 100]; let y = [2; 100]; diff --git a/src/test/run-pass/foreach-external-iterators.rs b/src/test/run-pass/foreach-external-iterators.rs index 9b847517ec8fb..4c42ad997d2c6 100644 --- a/src/test/run-pass/foreach-external-iterators.rs +++ b/src/test/run-pass/foreach-external-iterators.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { let x = [1; 100]; let mut y = 0; diff --git a/src/test/run-pass/foreach-nested.rs b/src/test/run-pass/foreach-nested.rs index 2c4d0cc7648ce..8b710ada68b2c 100644 --- a/src/test/run-pass/foreach-nested.rs +++ b/src/test/run-pass/foreach-nested.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - fn two(mut it: F) where F: FnMut(isize) { it(0); it(1); } pub fn main() { diff --git a/src/test/run-pass/foreach-put-structured.rs b/src/test/run-pass/foreach-put-structured.rs index 028e31d76aa80..3685ccb6549c2 100644 --- a/src/test/run-pass/foreach-put-structured.rs +++ b/src/test/run-pass/foreach-put-structured.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - fn pairs(mut it: F) where F: FnMut((isize, isize)) { let mut i: isize = 0; let mut j: isize = 0; diff --git a/src/test/run-pass/foreach-simple-outer-slot.rs b/src/test/run-pass/foreach-simple-outer-slot.rs index 674c2e344823d..387aa5d161201 100644 --- a/src/test/run-pass/foreach-simple-outer-slot.rs +++ b/src/test/run-pass/foreach-simple-outer-slot.rs @@ -1,16 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - pub fn main() { let mut sum: isize = 0; first_ten(|i| { println!("main"); println!("{}", i); sum = sum + i; }); diff --git a/src/test/run-pass/foreign-call-no-runtime.rs b/src/test/run-pass/foreign-call-no-runtime.rs index dd5c075c39b16..f72efc0666340 100644 --- a/src/test/run-pass/foreign-call-no-runtime.rs +++ b/src/test/run-pass/foreign-call-no-runtime.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support #![feature(libc)] diff --git a/src/test/run-pass/foreign-dupe.rs b/src/test/run-pass/foreign-dupe.rs index b79e6e98fc056..41645fb956a1a 100644 --- a/src/test/run-pass/foreign-dupe.rs +++ b/src/test/run-pass/foreign-dupe.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:foreign_lib.rs // ignore-wasm32-bare no libc to test ffi with diff --git a/src/test/run-pass/foreign-fn-linkname.rs b/src/test/run-pass/foreign-fn-linkname.rs index fd827efbfdd44..7471d066997bd 100644 --- a/src/test/run-pass/foreign-fn-linkname.rs +++ b/src/test/run-pass/foreign-fn-linkname.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare no libc to test ffi with #![feature(libc)] diff --git a/src/test/run-pass/foreign-fn-with-byval.rs b/src/test/run-pass/foreign-fn-with-byval.rs index 65efa571a9b4b..fe557c226b4f9 100644 --- a/src/test/run-pass/foreign-fn-with-byval.rs +++ b/src/test/run-pass/foreign-fn-with-byval.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare no libc to test ffi with #[derive(Copy, Clone)] diff --git a/src/test/run-pass/foreign-int-types.rs b/src/test/run-pass/foreign-int-types.rs index 5ea0ef6c7ba3b..1f26b2b8d533f 100644 --- a/src/test/run-pass/foreign-int-types.rs +++ b/src/test/run-pass/foreign-int-types.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![forbid(improper_ctypes)] #![allow(dead_code)] diff --git a/src/test/run-pass/foreign-mod-src/inner.rs b/src/test/run-pass/foreign-mod-src/inner.rs index 2fd316ce3480b..413b4b5990bef 100644 --- a/src/test/run-pass/foreign-mod-src/inner.rs +++ b/src/test/run-pass/foreign-mod-src/inner.rs @@ -1,16 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - pub fn main() { let f = "Makefile"; let s = rustrt.str_buf(f); diff --git a/src/test/run-pass/foreign-mod-unused-const.rs b/src/test/run-pass/foreign-mod-unused-const.rs index 5e9e529669a01..c42d0f5b58329 100644 --- a/src/test/run-pass/foreign-mod-unused-const.rs +++ b/src/test/run-pass/foreign-mod-unused-const.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 mod foo { diff --git a/src/test/run-pass/foreign-no-abi.rs b/src/test/run-pass/foreign-no-abi.rs index b516cdf4416b8..09c661e1983be 100644 --- a/src/test/run-pass/foreign-no-abi.rs +++ b/src/test/run-pass/foreign-no-abi.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ABI is cdecl by default // ignore-wasm32-bare no libc to test ffi with diff --git a/src/test/run-pass/foreign-src/foreign.rs b/src/test/run-pass/foreign-src/foreign.rs index 2e07795ec27e3..c9dc6c4726c0b 100644 --- a/src/test/run-pass/foreign-src/foreign.rs +++ b/src/test/run-pass/foreign-src/foreign.rs @@ -1,16 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - pub fn main() { libc.puts(rustrt.str_buf("hello, extern world 1")); libc.puts(rustrt.str_buf("hello, extern world 2")); diff --git a/src/test/run-pass/foreign-struct.rs b/src/test/run-pass/foreign-struct.rs index 8b48731ee0ba0..b751e0589a521 100644 --- a/src/test/run-pass/foreign-struct.rs +++ b/src/test/run-pass/foreign-struct.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Passing enums by value // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/foreign-truncated-arguments.rs b/src/test/run-pass/foreign-truncated-arguments.rs index a983a4a95988c..051bd3035693a 100644 --- a/src/test/run-pass/foreign-truncated-arguments.rs +++ b/src/test/run-pass/foreign-truncated-arguments.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -O // Regression test for https://github.com/rust-lang/rust/issues/33868 diff --git a/src/test/run-pass/foreign2.rs b/src/test/run-pass/foreign2.rs index d69d6976e4a90..f17bb29e1847f 100644 --- a/src/test/run-pass/foreign2.rs +++ b/src/test/run-pass/foreign2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare no libc to test ffi with // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/format-hygiene.rs b/src/test/run-pass/format-hygiene.rs index 6971f775231d5..37ac12db264c0 100644 --- a/src/test/run-pass/format-hygiene.rs +++ b/src/test/run-pass/format-hygiene.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub const arg0: u8 = 1; pub fn main() { diff --git a/src/test/run-pass/format-nan.rs b/src/test/run-pass/format-nan.rs index 9bbd8cdb11d88..dbe2c61c494fa 100644 --- a/src/test/run-pass/format-nan.rs +++ b/src/test/run-pass/format-nan.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { use std::f64; let x = "NaN".to_string(); diff --git a/src/test/run-pass/format-no-std.rs b/src/test/run-pass/format-no-std.rs index e23accfcc235d..0f3a5c277b4c5 100644 --- a/src/test/run-pass/format-no-std.rs +++ b/src/test/run-pass/format-no-std.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no no_std executables #![feature(lang_items, start, alloc)] diff --git a/src/test/run-pass/format-ref-cell.rs b/src/test/run-pass/format-ref-cell.rs index 0f16dfa1e8f15..0e7925af78f24 100644 --- a/src/test/run-pass/format-ref-cell.rs +++ b/src/test/run-pass/format-ref-cell.rs @@ -1,14 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::cell::RefCell; pub fn main() { diff --git a/src/test/run-pass/fsu-moves-and-copies.rs b/src/test/run-pass/fsu-moves-and-copies.rs index efd7f66e93b83..3d847662f94c8 100644 --- a/src/test/run-pass/fsu-moves-and-copies.rs +++ b/src/test/run-pass/fsu-moves-and-copies.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue 4691: Ensure that functional-struct-updates operates // correctly and moves rather than copy when appropriate. diff --git a/src/test/run-pass/fun-call-variants.rs b/src/test/run-pass/fun-call-variants.rs index 3bb6df33f70a0..e08878accc325 100644 --- a/src/test/run-pass/fun-call-variants.rs +++ b/src/test/run-pass/fun-call-variants.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn ho(f: F) -> isize where F: FnOnce(isize) -> isize { let n: isize = f(3); return n; } fn direct(x: isize) -> isize { return x + 1; } diff --git a/src/test/run-pass/fun-indirect-call.rs b/src/test/run-pass/fun-indirect-call.rs index b28c64d06be2f..81af4402c11e4 100644 --- a/src/test/run-pass/fun-indirect-call.rs +++ b/src/test/run-pass/fun-indirect-call.rs @@ -1,17 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - - fn f() -> isize { return 42; } pub fn main() { diff --git a/src/test/run-pass/func-arg-incomplete-pattern.rs b/src/test/run-pass/func-arg-incomplete-pattern.rs index 7d9501879d0a9..11673c1769621 100644 --- a/src/test/run-pass/func-arg-incomplete-pattern.rs +++ b/src/test/run-pass/func-arg-incomplete-pattern.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we do not leak when the arg pattern must drop part of the // argument (in this case, the `y` field). diff --git a/src/test/run-pass/func-arg-ref-pattern.rs b/src/test/run-pass/func-arg-ref-pattern.rs index 5214f2d02f51d..5f22809749e1a 100644 --- a/src/test/run-pass/func-arg-ref-pattern.rs +++ b/src/test/run-pass/func-arg-ref-pattern.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // exec-env:RUST_POISON_ON_FREE=1 // Test argument patterns where we create refs to the inside of diff --git a/src/test/run-pass/func-arg-wild-pattern.rs b/src/test/run-pass/func-arg-wild-pattern.rs index 3ab3ee4db2d5b..5b88fcafd6299 100644 --- a/src/test/run-pass/func-arg-wild-pattern.rs +++ b/src/test/run-pass/func-arg-wild-pattern.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we can compile code that uses a `_` in function argument // patterns. diff --git a/src/test/run-pass/functional-struct-upd.rs b/src/test/run-pass/functional-struct-upd.rs index 240d49d718f33..0900fcda0b1dc 100644 --- a/src/test/run-pass/functional-struct-upd.rs +++ b/src/test/run-pass/functional-struct-upd.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug)] struct Foo { x: isize, diff --git a/src/test/run-pass/futures-api.rs b/src/test/run-pass/futures-api.rs index 476cb48c0d2ee..e08c6cc574763 100644 --- a/src/test/run-pass/futures-api.rs +++ b/src/test/run-pass/futures-api.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(arbitrary_self_types, futures_api, pin)] #![allow(unused)] diff --git a/src/test/run-pass/generator/auxiliary/xcrate-reachable.rs b/src/test/run-pass/generator/auxiliary/xcrate-reachable.rs index 91e43537cc21d..33337f8038f60 100644 --- a/src/test/run-pass/generator/auxiliary/xcrate-reachable.rs +++ b/src/test/run-pass/generator/auxiliary/xcrate-reachable.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators, generator_trait)] use std::ops::Generator; diff --git a/src/test/run-pass/generator/auxiliary/xcrate.rs b/src/test/run-pass/generator/auxiliary/xcrate.rs index fcfe0b754b68c..8e08de28bc6b2 100644 --- a/src/test/run-pass/generator/auxiliary/xcrate.rs +++ b/src/test/run-pass/generator/auxiliary/xcrate.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators, generator_trait)] use std::ops::Generator; diff --git a/src/test/run-pass/generator/borrow-in-tail-expr.rs b/src/test/run-pass/generator/borrow-in-tail-expr.rs index 486fe3c900d8b..057e8956058bd 100644 --- a/src/test/run-pass/generator/borrow-in-tail-expr.rs +++ b/src/test/run-pass/generator/borrow-in-tail-expr.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators)] fn main() { diff --git a/src/test/run-pass/generator/conditional-drop.rs b/src/test/run-pass/generator/conditional-drop.rs index 3d39c46186be3..27b33a824ef2b 100644 --- a/src/test/run-pass/generator/conditional-drop.rs +++ b/src/test/run-pass/generator/conditional-drop.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators, generator_trait)] use std::ops::Generator; diff --git a/src/test/run-pass/generator/control-flow.rs b/src/test/run-pass/generator/control-flow.rs index 09971410e556d..90ae4d73dccdf 100644 --- a/src/test/run-pass/generator/control-flow.rs +++ b/src/test/run-pass/generator/control-flow.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators, generator_trait)] use std::ops::{GeneratorState, Generator}; diff --git a/src/test/run-pass/generator/drop-env.rs b/src/test/run-pass/generator/drop-env.rs index ef4dc24472e61..ce7320e6a5504 100644 --- a/src/test/run-pass/generator/drop-env.rs +++ b/src/test/run-pass/generator/drop-env.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators, generator_trait)] use std::ops::Generator; diff --git a/src/test/run-pass/generator/issue-44197.rs b/src/test/run-pass/generator/issue-44197.rs index 272b7eb7bfdd0..0c7030e49d834 100644 --- a/src/test/run-pass/generator/issue-44197.rs +++ b/src/test/run-pass/generator/issue-44197.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators, generator_trait)] use std::ops::{ Generator, GeneratorState }; diff --git a/src/test/run-pass/generator/issue-52398.rs b/src/test/run-pass/generator/issue-52398.rs index 0fb8f277ea9d4..15806a06c58ef 100644 --- a/src/test/run-pass/generator/issue-52398.rs +++ b/src/test/run-pass/generator/issue-52398.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators)] use std::cell::RefCell; diff --git a/src/test/run-pass/generator/iterator-count.rs b/src/test/run-pass/generator/iterator-count.rs index 3564ddaa8068e..d40600269bc9a 100644 --- a/src/test/run-pass/generator/iterator-count.rs +++ b/src/test/run-pass/generator/iterator-count.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators, generator_trait)] use std::ops::{GeneratorState, Generator}; diff --git a/src/test/run-pass/generator/live-upvar-across-yield.rs b/src/test/run-pass/generator/live-upvar-across-yield.rs index 28e7da232ce09..7e9a239f08bd8 100644 --- a/src/test/run-pass/generator/live-upvar-across-yield.rs +++ b/src/test/run-pass/generator/live-upvar-across-yield.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators, generator_trait)] use std::ops::Generator; diff --git a/src/test/run-pass/generator/match-bindings.rs b/src/test/run-pass/generator/match-bindings.rs index 231aa1b42f021..878d4ef8d2e9c 100644 --- a/src/test/run-pass/generator/match-bindings.rs +++ b/src/test/run-pass/generator/match-bindings.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators)] enum Enum { diff --git a/src/test/run-pass/generator/nested_generators.rs b/src/test/run-pass/generator/nested_generators.rs index 29808da85a7a9..90fffbda04d9e 100644 --- a/src/test/run-pass/generator/nested_generators.rs +++ b/src/test/run-pass/generator/nested_generators.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators)] #![feature(generator_trait)] diff --git a/src/test/run-pass/generator/panic-drops.rs b/src/test/run-pass/generator/panic-drops.rs index 3d7b60ab6b901..8c711546a1a37 100644 --- a/src/test/run-pass/generator/panic-drops.rs +++ b/src/test/run-pass/generator/panic-drops.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare compiled as panic=abort by default #![feature(generators, generator_trait)] diff --git a/src/test/run-pass/generator/panic-safe.rs b/src/test/run-pass/generator/panic-safe.rs index ace5cdde51d85..76b681b67779e 100644 --- a/src/test/run-pass/generator/panic-safe.rs +++ b/src/test/run-pass/generator/panic-safe.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare compiled with panic=abort by default #![feature(generators, generator_trait)] diff --git a/src/test/run-pass/generator/reborrow-mut-upvar.rs b/src/test/run-pass/generator/reborrow-mut-upvar.rs index 8353066bfbe8e..90977ffdf0b1f 100644 --- a/src/test/run-pass/generator/reborrow-mut-upvar.rs +++ b/src/test/run-pass/generator/reborrow-mut-upvar.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators)] fn _run(bar: &mut i32) { diff --git a/src/test/run-pass/generator/resume-after-return.rs b/src/test/run-pass/generator/resume-after-return.rs index 06e7615d26191..eb3335f79f532 100644 --- a/src/test/run-pass/generator/resume-after-return.rs +++ b/src/test/run-pass/generator/resume-after-return.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare compiled with panic=abort by default #![feature(generators, generator_trait)] diff --git a/src/test/run-pass/generator/smoke.rs b/src/test/run-pass/generator/smoke.rs index 7395c8484c169..f786acaeb1f1e 100644 --- a/src/test/run-pass/generator/smoke.rs +++ b/src/test/run-pass/generator/smoke.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support // compile-flags: --test diff --git a/src/test/run-pass/generator/static-generators.rs b/src/test/run-pass/generator/static-generators.rs index ebc070eee09c1..e852dfc7f1b72 100644 --- a/src/test/run-pass/generator/static-generators.rs +++ b/src/test/run-pass/generator/static-generators.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators, generator_trait)] use std::ops::{Generator, GeneratorState}; diff --git a/src/test/run-pass/generator/too-live-local-in-immovable-gen.rs b/src/test/run-pass/generator/too-live-local-in-immovable-gen.rs index 2314533a68153..c406db7d770a3 100644 --- a/src/test/run-pass/generator/too-live-local-in-immovable-gen.rs +++ b/src/test/run-pass/generator/too-live-local-in-immovable-gen.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators)] fn main() { diff --git a/src/test/run-pass/generator/xcrate-reachable.rs b/src/test/run-pass/generator/xcrate-reachable.rs index 2fc39ba186916..b07974948e40b 100644 --- a/src/test/run-pass/generator/xcrate-reachable.rs +++ b/src/test/run-pass/generator/xcrate-reachable.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:xcrate-reachable.rs #![feature(generator_trait)] diff --git a/src/test/run-pass/generator/xcrate.rs b/src/test/run-pass/generator/xcrate.rs index 04791d5135677..a98293f9c7144 100644 --- a/src/test/run-pass/generator/xcrate.rs +++ b/src/test/run-pass/generator/xcrate.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:xcrate.rs #![feature(generators, generator_trait)] diff --git a/src/test/run-pass/generator/yield-in-args-rev.rs b/src/test/run-pass/generator/yield-in-args-rev.rs index df00329799e96..b24be9ffca992 100644 --- a/src/test/run-pass/generator/yield-in-args-rev.rs +++ b/src/test/run-pass/generator/yield-in-args-rev.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that a borrow that occurs after a yield in the same // argument list is not treated as live across the yield by // type-checking. diff --git a/src/test/run-pass/generator/yield-in-box.rs b/src/test/run-pass/generator/yield-in-box.rs index d68007be05c88..686af4e31274d 100644 --- a/src/test/run-pass/generator/yield-in-box.rs +++ b/src/test/run-pass/generator/yield-in-box.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that box-statements with yields in them work. #![feature(generators, box_syntax)] diff --git a/src/test/run-pass/generator/yield-in-initializer.rs b/src/test/run-pass/generator/yield-in-initializer.rs index 3042061226b39..d4008de82044b 100644 --- a/src/test/run-pass/generator/yield-in-initializer.rs +++ b/src/test/run-pass/generator/yield-in-initializer.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators)] fn main() { diff --git a/src/test/run-pass/generator/yield-subtype.rs b/src/test/run-pass/generator/yield-subtype.rs index c41341690441f..65dc5c2cf3d26 100644 --- a/src/test/run-pass/generator/yield-subtype.rs +++ b/src/test/run-pass/generator/yield-subtype.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions:lexical nll //[nll]compile-flags: -Z disable-nll-user-type-assert #![cfg_attr(nll, feature(nll))] diff --git a/src/test/run-pass/generic-alias-unique.rs b/src/test/run-pass/generic-alias-unique.rs index c4fd311961531..7d9ffb973e1f8 100644 --- a/src/test/run-pass/generic-alias-unique.rs +++ b/src/test/run-pass/generic-alias-unique.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn id(t: T) -> T { return t; } diff --git a/src/test/run-pass/generic-default-type-params-cross-crate.rs b/src/test/run-pass/generic-default-type-params-cross-crate.rs index 4cf9f93bcaccf..74af9532b0e5f 100644 --- a/src/test/run-pass/generic-default-type-params-cross-crate.rs +++ b/src/test/run-pass/generic-default-type-params-cross-crate.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:default_type_params_xc.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/generic-default-type-params.rs b/src/test/run-pass/generic-default-type-params.rs index e30cb7657988d..cbc79b6214751 100644 --- a/src/test/run-pass/generic-default-type-params.rs +++ b/src/test/run-pass/generic-default-type-params.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { a: A } diff --git a/src/test/run-pass/generic-derived-type.rs b/src/test/run-pass/generic-derived-type.rs index 74a71873e287f..6618bed5c3f4f 100644 --- a/src/test/run-pass/generic-derived-type.rs +++ b/src/test/run-pass/generic-derived-type.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn g(x: X) -> X { return x; } #[derive(Clone)] diff --git a/src/test/run-pass/generic-exterior-unique.rs b/src/test/run-pass/generic-exterior-unique.rs index 64091d2926c97..32f78438e0a21 100644 --- a/src/test/run-pass/generic-exterior-unique.rs +++ b/src/test/run-pass/generic-exterior-unique.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] struct Recbox {x: Box} diff --git a/src/test/run-pass/generic-extern-mangle.rs b/src/test/run-pass/generic-extern-mangle.rs index debe3706891ce..ec3fedb46faae 100644 --- a/src/test/run-pass/generic-extern-mangle.rs +++ b/src/test/run-pass/generic-extern-mangle.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::Add; extern "C" fn foo(a: T, b: T) -> T::Output { a + b } diff --git a/src/test/run-pass/generic-fn-infer.rs b/src/test/run-pass/generic-fn-infer.rs index bff86207f7862..f0a85d8590102 100644 --- a/src/test/run-pass/generic-fn-infer.rs +++ b/src/test/run-pass/generic-fn-infer.rs @@ -1,17 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - - // Issue #45: infer type parameters in function applications fn id(x: T) -> T { return x; } diff --git a/src/test/run-pass/generic-fn-twice.rs b/src/test/run-pass/generic-fn-twice.rs index b37c73f7f759c..3f0dc95661d77 100644 --- a/src/test/run-pass/generic-fn-twice.rs +++ b/src/test/run-pass/generic-fn-twice.rs @@ -1,16 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - // pretty-expanded FIXME #23616 mod foomod { diff --git a/src/test/run-pass/generic-fn-unique.rs b/src/test/run-pass/generic-fn-unique.rs index 3585cd2e0797d..a65027ed96c4f 100644 --- a/src/test/run-pass/generic-fn-unique.rs +++ b/src/test/run-pass/generic-fn-unique.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn f(x: Box) -> Box { return x; } diff --git a/src/test/run-pass/generic-fn.rs b/src/test/run-pass/generic-fn.rs index 0ba0ed4bf7f97..ffea4dc11a3bc 100644 --- a/src/test/run-pass/generic-fn.rs +++ b/src/test/run-pass/generic-fn.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_assignment)] fn id(x: T) -> T { return x; } diff --git a/src/test/run-pass/generic-ivec-leak.rs b/src/test/run-pass/generic-ivec-leak.rs index d439c62380185..87b0efd2f0eae 100644 --- a/src/test/run-pass/generic-ivec-leak.rs +++ b/src/test/run-pass/generic-ivec-leak.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum wrapper { wrapped(T), } pub fn main() { let _w = wrapper::wrapped(vec![1, 2, 3, 4, 5]); } diff --git a/src/test/run-pass/generic-newtype-struct.rs b/src/test/run-pass/generic-newtype-struct.rs index 24b5172800078..1e72021acda71 100644 --- a/src/test/run-pass/generic-newtype-struct.rs +++ b/src/test/run-pass/generic-newtype-struct.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct S(T); diff --git a/src/test/run-pass/generic-object.rs b/src/test/run-pass/generic-object.rs index 7e737fe00afd4..2d7f41b0ba053 100644 --- a/src/test/run-pass/generic-object.rs +++ b/src/test/run-pass/generic-object.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] trait Foo { diff --git a/src/test/run-pass/generic-recursive-tag.rs b/src/test/run-pass/generic-recursive-tag.rs index ca2bf0ac22459..95f06dbdb865a 100644 --- a/src/test/run-pass/generic-recursive-tag.rs +++ b/src/test/run-pass/generic-recursive-tag.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] enum list { cons(Box, Box>), nil, } diff --git a/src/test/run-pass/generic-static-methods.rs b/src/test/run-pass/generic-static-methods.rs index ad501ec7e9ba1..939635000c829 100644 --- a/src/test/run-pass/generic-static-methods.rs +++ b/src/test/run-pass/generic-static-methods.rs @@ -1,15 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - trait vec_utils { fn map_(x: &Self, f: F) -> Vec where F: FnMut(&T) -> U; } diff --git a/src/test/run-pass/generic-tag-corruption.rs b/src/test/run-pass/generic-tag-corruption.rs index d61ae520ada89..d6b0f0072e2e2 100644 --- a/src/test/run-pass/generic-tag-corruption.rs +++ b/src/test/run-pass/generic-tag-corruption.rs @@ -1,16 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - // This used to cause memory corruption in stage 0. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/generic-tag-local.rs b/src/test/run-pass/generic-tag-local.rs index 9518d590279fc..f1f4e70becfd4 100644 --- a/src/test/run-pass/generic-tag-local.rs +++ b/src/test/run-pass/generic-tag-local.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - // pretty-expanded FIXME #23616 enum clam { a(T), } diff --git a/src/test/run-pass/generic-tag-match.rs b/src/test/run-pass/generic-tag-match.rs index 830c982e13c80..9e4227b9cd531 100644 --- a/src/test/run-pass/generic-tag-match.rs +++ b/src/test/run-pass/generic-tag-match.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_assignment)] enum foo { arm(T), } diff --git a/src/test/run-pass/generic-tag-values.rs b/src/test/run-pass/generic-tag-values.rs index 1acb23209009e..ed769a33b7ffc 100644 --- a/src/test/run-pass/generic-tag-values.rs +++ b/src/test/run-pass/generic-tag-values.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum noption { some(T), } struct Pair { x: isize, y: isize } diff --git a/src/test/run-pass/generic-tag.rs b/src/test/run-pass/generic-tag.rs index a79465c8cd860..fd4482d1a2df6 100644 --- a/src/test/run-pass/generic-tag.rs +++ b/src/test/run-pass/generic-tag.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![allow(dead_assignment)] diff --git a/src/test/run-pass/generic-temporary.rs b/src/test/run-pass/generic-temporary.rs index 80a6efe7a0ef9..e1a657f4271b9 100644 --- a/src/test/run-pass/generic-temporary.rs +++ b/src/test/run-pass/generic-temporary.rs @@ -1,14 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn mk() -> isize { return 1; } fn chk(a: isize) { println!("{}", a); assert_eq!(a, 1); } diff --git a/src/test/run-pass/generic-tup.rs b/src/test/run-pass/generic-tup.rs index cd0e344b89c92..2fd70d20e7ede 100644 --- a/src/test/run-pass/generic-tup.rs +++ b/src/test/run-pass/generic-tup.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn get_third(t: (T, T, T)) -> T { let (_, _, x) = t; return x; } pub fn main() { diff --git a/src/test/run-pass/generic-type-synonym.rs b/src/test/run-pass/generic-type-synonym.rs index 2b3bd5ead94a2..f46fd7328503d 100644 --- a/src/test/run-pass/generic-type-synonym.rs +++ b/src/test/run-pass/generic-type-synonym.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - // pretty-expanded FIXME #23616 struct Foo { diff --git a/src/test/run-pass/generic-type.rs b/src/test/run-pass/generic-type.rs index 8e7a3add34349..a11cdb38da856 100644 --- a/src/test/run-pass/generic-type.rs +++ b/src/test/run-pass/generic-type.rs @@ -1,16 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - struct Pair {x: T, y: T} pub fn main() { diff --git a/src/test/run-pass/generic-unique.rs b/src/test/run-pass/generic-unique.rs index 1b1355ea336a6..09e50c16d12ef 100644 --- a/src/test/run-pass/generic-unique.rs +++ b/src/test/run-pass/generic-unique.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] struct Triple { x: T, y: T, z: T } diff --git a/src/test/run-pass/global-scope.rs b/src/test/run-pass/global-scope.rs index 8e155c459965d..22fb0f93dbced 100644 --- a/src/test/run-pass/global-scope.rs +++ b/src/test/run-pass/global-scope.rs @@ -1,15 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - pub fn f() -> isize { return 1; } pub mod foo { diff --git a/src/test/run-pass/guards-not-exhaustive.rs b/src/test/run-pass/guards-not-exhaustive.rs index 53c3eff5b81ee..6a990bfb91945 100644 --- a/src/test/run-pass/guards-not-exhaustive.rs +++ b/src/test/run-pass/guards-not-exhaustive.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #[derive(Copy, Clone)] enum Q { R(Option) } diff --git a/src/test/run-pass/guards.rs b/src/test/run-pass/guards.rs index d79dbabac2d42..be50f1ad41431 100644 --- a/src/test/run-pass/guards.rs +++ b/src/test/run-pass/guards.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #[derive(Copy, Clone)] struct Pair { x: isize, y: isize } diff --git a/src/test/run-pass/hashmap-memory.rs b/src/test/run-pass/hashmap-memory.rs index 2e98e0fe5ca3d..b0851293a0b18 100644 --- a/src/test/run-pass/hashmap-memory.rs +++ b/src/test/run-pass/hashmap-memory.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten No support for threads /** diff --git a/src/test/run-pass/hello.rs b/src/test/run-pass/hello.rs index 61dcbb75b9ef9..bc8bb23877e8a 100644 --- a/src/test/run-pass/hello.rs +++ b/src/test/run-pass/hello.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { println!("hello, world"); } diff --git a/src/test/run-pass/hrtb-binder-levels-in-object-types.rs b/src/test/run-pass/hrtb-binder-levels-in-object-types.rs index bcd519bc25d20..8908fdf011392 100644 --- a/src/test/run-pass/hrtb-binder-levels-in-object-types.rs +++ b/src/test/run-pass/hrtb-binder-levels-in-object-types.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we handle binder levels in object types correctly. // Initially, the reference to `'tcx` in the object type // `&Typer<'tcx>` was getting an incorrect binder level, yielding diff --git a/src/test/run-pass/hrtb-debruijn-object-types-in-closures.rs b/src/test/run-pass/hrtb-debruijn-object-types-in-closures.rs index 6761cc12876fe..8700e8e66a4ce 100644 --- a/src/test/run-pass/hrtb-debruijn-object-types-in-closures.rs +++ b/src/test/run-pass/hrtb-debruijn-object-types-in-closures.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait Typer<'tcx> { diff --git a/src/test/run-pass/hrtb-fn-like-trait-object.rs b/src/test/run-pass/hrtb-fn-like-trait-object.rs index 8e2e21bed0a7c..57136ed3bba66 100644 --- a/src/test/run-pass/hrtb-fn-like-trait-object.rs +++ b/src/test/run-pass/hrtb-fn-like-trait-object.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // A basic test of using a higher-ranked trait bound. diff --git a/src/test/run-pass/hrtb-fn-like-trait.rs b/src/test/run-pass/hrtb-fn-like-trait.rs index 71e314b513251..941053f8b5011 100644 --- a/src/test/run-pass/hrtb-fn-like-trait.rs +++ b/src/test/run-pass/hrtb-fn-like-trait.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // A basic test of using a higher-ranked trait bound. diff --git a/src/test/run-pass/hrtb-opt-in-copy.rs b/src/test/run-pass/hrtb-opt-in-copy.rs index f0214d3f37b6f..baea0614061d5 100644 --- a/src/test/run-pass/hrtb-opt-in-copy.rs +++ b/src/test/run-pass/hrtb-opt-in-copy.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we handle binder levels correctly when checking whether a // type can implement `Copy`. In particular, we had a bug where we failed to // liberate the late-bound regions from the impl, and thus wound up diff --git a/src/test/run-pass/hrtb-parse.rs b/src/test/run-pass/hrtb-parse.rs index cdffaef66eb2f..036ff8967106d 100644 --- a/src/test/run-pass/hrtb-parse.rs +++ b/src/test/run-pass/hrtb-parse.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we can parse all the various places that a `for` keyword // can appear representing universal quantification. diff --git a/src/test/run-pass/hrtb-precedence-of-plus-where-clause.rs b/src/test/run-pass/hrtb-precedence-of-plus-where-clause.rs index 46ea256296194..6d62a6f678906 100644 --- a/src/test/run-pass/hrtb-precedence-of-plus-where-clause.rs +++ b/src/test/run-pass/hrtb-precedence-of-plus-where-clause.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 // Test that `F : Fn(isize) -> isize + Send` is interpreted as two diff --git a/src/test/run-pass/hrtb-precedence-of-plus.rs b/src/test/run-pass/hrtb-precedence-of-plus.rs index 511d32348576e..e7b06e1633a94 100644 --- a/src/test/run-pass/hrtb-precedence-of-plus.rs +++ b/src/test/run-pass/hrtb-precedence-of-plus.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 // Test that `Fn(isize) -> isize + 'static` parses as `(Fn(isize) -> isize) + diff --git a/src/test/run-pass/hrtb-resolve-lifetime.rs b/src/test/run-pass/hrtb-resolve-lifetime.rs index bdbcda89099e5..8a34c18a663b1 100644 --- a/src/test/run-pass/hrtb-resolve-lifetime.rs +++ b/src/test/run-pass/hrtb-resolve-lifetime.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // A basic test of using a higher-ranked trait bound. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/hrtb-trait-object-paren-notation.rs b/src/test/run-pass/hrtb-trait-object-paren-notation.rs index 5b9d4a834d872..773ff2baf9e72 100644 --- a/src/test/run-pass/hrtb-trait-object-paren-notation.rs +++ b/src/test/run-pass/hrtb-trait-object-paren-notation.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // A basic test of using a higher-ranked trait bound. trait FnLike { diff --git a/src/test/run-pass/hrtb-trait-object-passed-to-closure.rs b/src/test/run-pass/hrtb-trait-object-passed-to-closure.rs index 48d0959630f7d..4ad7dcd408ffd 100644 --- a/src/test/run-pass/hrtb-trait-object-passed-to-closure.rs +++ b/src/test/run-pass/hrtb-trait-object-passed-to-closure.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that `&PrinterSupport`, which is really short for `&'a // PrinterSupport<'b>`, gets properly expanded when it appears in a // closure type. This used to result in messed up De Bruijn indices. diff --git a/src/test/run-pass/hrtb-type-outlives.rs b/src/test/run-pass/hrtb-type-outlives.rs index 083f042fec265..ecc71a2956822 100644 --- a/src/test/run-pass/hrtb-type-outlives.rs +++ b/src/test/run-pass/hrtb-type-outlives.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test what happens when a HR obligation is applied to an impl with // "outlives" bounds. Currently we're pretty conservative here; this // will probably improve in time. diff --git a/src/test/run-pass/hrtb-unboxed-closure-trait.rs b/src/test/run-pass/hrtb-unboxed-closure-trait.rs index 6666b61a4a725..78bb0b3857f23 100644 --- a/src/test/run-pass/hrtb-unboxed-closure-trait.rs +++ b/src/test/run-pass/hrtb-unboxed-closure-trait.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test HRTB used with the `Fn` trait. fn foo(f: F) { diff --git a/src/test/run-pass/html-literals.rs b/src/test/run-pass/html-literals.rs index 1e1fde4d1e2be..b55d3249b0eac 100644 --- a/src/test/run-pass/html-literals.rs +++ b/src/test/run-pass/html-literals.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // A test of the macro system. Can we do HTML literals? /* diff --git a/src/test/run-pass/huge-largest-array.rs b/src/test/run-pass/huge-largest-array.rs index f0bb31b8470f1..fb76629be57f3 100644 --- a/src/test/run-pass/huge-largest-array.rs +++ b/src/test/run-pass/huge-largest-array.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::mem::size_of; #[cfg(target_pointer_width = "32")] diff --git a/src/test/run-pass/hygiene-dodging-1.rs b/src/test/run-pass/hygiene-dodging-1.rs index 83f09850f7776..ccf2d868919bd 100644 --- a/src/test/run-pass/hygiene-dodging-1.rs +++ b/src/test/run-pass/hygiene-dodging-1.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - mod x { pub fn g() -> usize {14} } diff --git a/src/test/run-pass/hygiene.rs b/src/test/run-pass/hygiene.rs index 91648ee579826..b9a6ee22b8f1f 100644 --- a/src/test/run-pass/hygiene.rs +++ b/src/test/run-pass/hygiene.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused)] fn f() { diff --git a/src/test/run-pass/hygiene/auxiliary/legacy_interaction.rs b/src/test/run-pass/hygiene/auxiliary/legacy_interaction.rs index c614ee4d57501..90d5243b74b7b 100644 --- a/src/test/run-pass/hygiene/auxiliary/legacy_interaction.rs +++ b/src/test/run-pass/hygiene/auxiliary/legacy_interaction.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty pretty-printing is unhygienic #[macro_export] diff --git a/src/test/run-pass/hygiene/auxiliary/my_crate.rs b/src/test/run-pass/hygiene/auxiliary/my_crate.rs index e10d20b6d47cf..cdc6c27d800bd 100644 --- a/src/test/run-pass/hygiene/auxiliary/my_crate.rs +++ b/src/test/run-pass/hygiene/auxiliary/my_crate.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn f() {} diff --git a/src/test/run-pass/hygiene/auxiliary/unhygienic_example.rs b/src/test/run-pass/hygiene/auxiliary/unhygienic_example.rs index 298e0209a0987..8e6e8f9b32f97 100644 --- a/src/test/run-pass/hygiene/auxiliary/unhygienic_example.rs +++ b/src/test/run-pass/hygiene/auxiliary/unhygienic_example.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] extern crate my_crate; diff --git a/src/test/run-pass/hygiene/auxiliary/xcrate.rs b/src/test/run-pass/hygiene/auxiliary/xcrate.rs index 2ccd043097f8e..f5a911f57df69 100644 --- a/src/test/run-pass/hygiene/auxiliary/xcrate.rs +++ b/src/test/run-pass/hygiene/auxiliary/xcrate.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(decl_macro)] #![allow(unused)] diff --git a/src/test/run-pass/hygiene/issue-44128.rs b/src/test/run-pass/hygiene/issue-44128.rs index 213ee1edff4e8..24abb81f03c08 100644 --- a/src/test/run-pass/hygiene/issue-44128.rs +++ b/src/test/run-pass/hygiene/issue-44128.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(decl_macro)] pub macro create_struct($a:ident) { diff --git a/src/test/run-pass/hygiene/issue-47311.rs b/src/test/run-pass/hygiene/issue-47311.rs index 3b6890cdce63b..87e72c45e470b 100644 --- a/src/test/run-pass/hygiene/issue-47311.rs +++ b/src/test/run-pass/hygiene/issue-47311.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty pretty-printing is unhygienic #![feature(decl_macro)] diff --git a/src/test/run-pass/hygiene/issue-47312.rs b/src/test/run-pass/hygiene/issue-47312.rs index 5e83f3808d8cc..591112e473abb 100644 --- a/src/test/run-pass/hygiene/issue-47312.rs +++ b/src/test/run-pass/hygiene/issue-47312.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty pretty-printing is unhygienic #![feature(decl_macro)] diff --git a/src/test/run-pass/hygiene/items.rs b/src/test/run-pass/hygiene/items.rs index 121c341a124ce..1ac85142158a8 100644 --- a/src/test/run-pass/hygiene/items.rs +++ b/src/test/run-pass/hygiene/items.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty pretty-printing is unhygienic #![feature(decl_macro)] diff --git a/src/test/run-pass/hygiene/legacy_interaction.rs b/src/test/run-pass/hygiene/legacy_interaction.rs index 683a15b99aebe..a694e789b1779 100644 --- a/src/test/run-pass/hygiene/legacy_interaction.rs +++ b/src/test/run-pass/hygiene/legacy_interaction.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty pretty-printing is unhygienic // aux-build:legacy_interaction.rs diff --git a/src/test/run-pass/hygiene/lexical.rs b/src/test/run-pass/hygiene/lexical.rs index cb02a17fec38a..4fd40da2c930f 100644 --- a/src/test/run-pass/hygiene/lexical.rs +++ b/src/test/run-pass/hygiene/lexical.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty pretty-printing is unhygienic #![feature(decl_macro)] diff --git a/src/test/run-pass/hygiene/specialization.rs b/src/test/run-pass/hygiene/specialization.rs index 3d46d2ec99efb..1d2e96d8baebd 100644 --- a/src/test/run-pass/hygiene/specialization.rs +++ b/src/test/run-pass/hygiene/specialization.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty pretty-printing is unhygienic #![feature(decl_macro)] diff --git a/src/test/run-pass/hygiene/trait_items.rs b/src/test/run-pass/hygiene/trait_items.rs index 2344c97ce1b1c..b6d7580db0f97 100644 --- a/src/test/run-pass/hygiene/trait_items.rs +++ b/src/test/run-pass/hygiene/trait_items.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty pretty-printing is unhygienic #![feature(decl_macro)] diff --git a/src/test/run-pass/hygiene/ty_params.rs b/src/test/run-pass/hygiene/ty_params.rs index 510528ede40c5..319bc923355ca 100644 --- a/src/test/run-pass/hygiene/ty_params.rs +++ b/src/test/run-pass/hygiene/ty_params.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty pretty-printing is unhygienic #![feature(decl_macro)] diff --git a/src/test/run-pass/hygiene/wrap_unhygienic_example.rs b/src/test/run-pass/hygiene/wrap_unhygienic_example.rs index 5520695021438..2b7b0bd3ced95 100644 --- a/src/test/run-pass/hygiene/wrap_unhygienic_example.rs +++ b/src/test/run-pass/hygiene/wrap_unhygienic_example.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty pretty-printing is unhygienic // aux-build:my_crate.rs diff --git a/src/test/run-pass/hygiene/xcrate.rs b/src/test/run-pass/hygiene/xcrate.rs index 6df3a34d3c87f..4805dfaf8563d 100644 --- a/src/test/run-pass/hygiene/xcrate.rs +++ b/src/test/run-pass/hygiene/xcrate.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty pretty-printing is unhygienic // aux-build:xcrate.rs diff --git a/src/test/run-pass/hygienic-labels-in-let.rs b/src/test/run-pass/hygienic-labels-in-let.rs index 2aa5f59cda62d..be0a94588b7f3 100644 --- a/src/test/run-pass/hygienic-labels-in-let.rs +++ b/src/test/run-pass/hygienic-labels-in-let.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that labels injected by macros do not break hygiene. This // checks cases where the macros invocations are under the rhs of a // let statement. diff --git a/src/test/run-pass/hygienic-labels.rs b/src/test/run-pass/hygienic-labels.rs index a5882f022920f..d611103309a24 100644 --- a/src/test/run-pass/hygienic-labels.rs +++ b/src/test/run-pass/hygienic-labels.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that labels injected by macros do not break hygiene. // Issue #24278: The label/lifetime shadowing checker from #24162 diff --git a/src/test/run-pass/i128-ffi.rs b/src/test/run-pass/i128-ffi.rs index edf278cbf64a5..964275a92d0b2 100644 --- a/src/test/run-pass/i128-ffi.rs +++ b/src/test/run-pass/i128-ffi.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // MSVC doesn't support 128 bit integers, and other Windows // C compilers have very inconsistent views on how the ABI // should look like. diff --git a/src/test/run-pass/i128.rs b/src/test/run-pass/i128.rs index baf3b3399849a..0fc0827ecbacf 100644 --- a/src/test/run-pass/i128.rs +++ b/src/test/run-pass/i128.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten i128 doesn't work // compile-flags: -Z borrowck=compare diff --git a/src/test/run-pass/i32-sub.rs b/src/test/run-pass/i32-sub.rs index 143787a466b80..c9f3d525198eb 100644 --- a/src/test/run-pass/i32-sub.rs +++ b/src/test/run-pass/i32-sub.rs @@ -1,15 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - - pub fn main() { let mut x: i32 = -400; x = 0 - x; assert_eq!(x, 400); } diff --git a/src/test/run-pass/i8-incr.rs b/src/test/run-pass/i8-incr.rs index 242cea264afb1..4a1d983206a52 100644 --- a/src/test/run-pass/i8-incr.rs +++ b/src/test/run-pass/i8-incr.rs @@ -1,17 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - - pub fn main() { let mut x: i8 = -12; let y: i8 = -12; diff --git a/src/test/run-pass/if-bot.rs b/src/test/run-pass/if-bot.rs index e66a8c85723a0..6d87288dd0821 100644 --- a/src/test/run-pass/if-bot.rs +++ b/src/test/run-pass/if-bot.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { let i: isize = if false { panic!() } else { 5 }; println!("{}", i); diff --git a/src/test/run-pass/if-check.rs b/src/test/run-pass/if-check.rs index c72cd10a082e9..43904f6823f5d 100644 --- a/src/test/run-pass/if-check.rs +++ b/src/test/run-pass/if-check.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn even(x: usize) -> bool { if x < 2 { return false; diff --git a/src/test/run-pass/if-let.rs b/src/test/run-pass/if-let.rs index 13134abd8fdd9..d1e03e4f5b02b 100644 --- a/src/test/run-pass/if-let.rs +++ b/src/test/run-pass/if-let.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { let x = Some(3); if let Some(y) = x { diff --git a/src/test/run-pass/if-ret.rs b/src/test/run-pass/if-ret.rs index 8d475a99b8188..c06d00a75b37b 100644 --- a/src/test/run-pass/if-ret.rs +++ b/src/test/run-pass/if-ret.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn foo() { if (return) { } } diff --git a/src/test/run-pass/ifmt.rs b/src/test/run-pass/ifmt.rs index 37436d7ae0042..56222fa46f7c9 100644 --- a/src/test/run-pass/ifmt.rs +++ b/src/test/run-pass/ifmt.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(warnings)] #![allow(unused_must_use)] #![allow(unused_features)] diff --git a/src/test/run-pass/ignore-all-the-things.rs b/src/test/run-pass/ignore-all-the-things.rs index c14f3dc72916d..b1fc331708c69 100644 --- a/src/test/run-pass/ignore-all-the-things.rs +++ b/src/test/run-pass/ignore-all-the-things.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(slice_patterns)] diff --git a/src/test/run-pass/impl-for-never.rs b/src/test/run-pass/impl-for-never.rs index 794f5969bff50..d2dbae61767b7 100644 --- a/src/test/run-pass/impl-for-never.rs +++ b/src/test/run-pass/impl-for-never.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we can call static methods on ! both directly and when it appears in a generic #![feature(never_type)] diff --git a/src/test/run-pass/impl-implicit-trait.rs b/src/test/run-pass/impl-implicit-trait.rs index 7f1d576e09944..c5625af6a0119 100644 --- a/src/test/run-pass/impl-implicit-trait.rs +++ b/src/test/run-pass/impl-implicit-trait.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 enum option_ { diff --git a/src/test/run-pass/impl-inherent-non-conflict.rs b/src/test/run-pass/impl-inherent-non-conflict.rs index 209b4acb09586..ed87ffb01984f 100644 --- a/src/test/run-pass/impl-inherent-non-conflict.rs +++ b/src/test/run-pass/impl-inherent-non-conflict.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Ensure that a user-defined type admits multiple inherent methods // with the same name, which can be called on values that have a // precise enough type to allow distinguishing between the methods. diff --git a/src/test/run-pass/impl-inherent-prefer-over-trait.rs b/src/test/run-pass/impl-inherent-prefer-over-trait.rs index f0195976aa832..057c22ed1a6d5 100644 --- a/src/test/run-pass/impl-inherent-prefer-over-trait.rs +++ b/src/test/run-pass/impl-inherent-prefer-over-trait.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct Foo; trait Trait { diff --git a/src/test/run-pass/impl-not-adjacent-to-type.rs b/src/test/run-pass/impl-not-adjacent-to-type.rs index beba056b72cdc..c0cdff30cbf29 100644 --- a/src/test/run-pass/impl-not-adjacent-to-type.rs +++ b/src/test/run-pass/impl-not-adjacent-to-type.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - mod foo { pub struct Point { pub x: i32, diff --git a/src/test/run-pass/impl-privacy-xc-1.rs b/src/test/run-pass/impl-privacy-xc-1.rs index 97945f4c4dac3..42e149eacb543 100644 --- a/src/test/run-pass/impl-privacy-xc-1.rs +++ b/src/test/run-pass/impl-privacy-xc-1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:impl_privacy_xc_1.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/impl-privacy-xc-2.rs b/src/test/run-pass/impl-privacy-xc-2.rs index 3ef4b43d079c8..7cdd7146c331e 100644 --- a/src/test/run-pass/impl-privacy-xc-2.rs +++ b/src/test/run-pass/impl-privacy-xc-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:impl_privacy_xc_2.rs extern crate impl_privacy_xc_2; diff --git a/src/test/run-pass/impl-trait/auto-trait-leak.rs b/src/test/run-pass/impl-trait/auto-trait-leak.rs index 62fbae7b40c03..346af9a9b1fc8 100644 --- a/src/test/run-pass/impl-trait/auto-trait-leak.rs +++ b/src/test/run-pass/impl-trait/auto-trait-leak.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Fast path, main can see the concrete type returned. fn before() -> impl FnMut(i32) { let mut p = Box::new(0); diff --git a/src/test/run-pass/impl-trait/auxiliary/xcrate.rs b/src/test/run-pass/impl-trait/auxiliary/xcrate.rs index c57c1cfe74f9c..ac016258b7f92 100644 --- a/src/test/run-pass/impl-trait/auxiliary/xcrate.rs +++ b/src/test/run-pass/impl-trait/auxiliary/xcrate.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // NOTE commented out due to issue #45994 //pub fn fourway_add(a: i32) -> impl Fn(i32) -> impl Fn(i32) -> impl Fn(i32) -> i32 { // move |b| move |c| move |d| a + b + c + d diff --git a/src/test/run-pass/impl-trait/bounds_regression.rs b/src/test/run-pass/impl-trait/bounds_regression.rs index cc931a68edd04..df23aaebbd14e 100644 --- a/src/test/run-pass/impl-trait/bounds_regression.rs +++ b/src/test/run-pass/impl-trait/bounds_regression.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait FakeGenerator { type Yield; type Return; diff --git a/src/test/run-pass/impl-trait/equality.rs b/src/test/run-pass/impl-trait/equality.rs index 034d3d7c80f36..e56cde2685192 100644 --- a/src/test/run-pass/impl-trait/equality.rs +++ b/src/test/run-pass/impl-trait/equality.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(specialization)] trait Foo: std::fmt::Debug + Eq {} diff --git a/src/test/run-pass/impl-trait/example-calendar.rs b/src/test/run-pass/impl-trait/example-calendar.rs index fce31256db492..236e1b59e33fa 100644 --- a/src/test/run-pass/impl-trait/example-calendar.rs +++ b/src/test/run-pass/impl-trait/example-calendar.rs @@ -1,13 +1,3 @@ -// Copyright 2016-2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: normal nll //[nll] compile-flags:-Zborrowck=mir diff --git a/src/test/run-pass/impl-trait/example-st.rs b/src/test/run-pass/impl-trait/example-st.rs index a06bde7f532d3..1067418c1f1ca 100644 --- a/src/test/run-pass/impl-trait/example-st.rs +++ b/src/test/run-pass/impl-trait/example-st.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct State; type Error = (); diff --git a/src/test/run-pass/impl-trait/existential-minimal.rs b/src/test/run-pass/impl-trait/existential-minimal.rs index 4e9d786dda058..2e66baa562944 100644 --- a/src/test/run-pass/impl-trait/existential-minimal.rs +++ b/src/test/run-pass/impl-trait/existential-minimal.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() {} fn foo() -> impl std::fmt::Debug { "cake" } diff --git a/src/test/run-pass/impl-trait/issue-42479.rs b/src/test/run-pass/impl-trait/issue-42479.rs index df7a6c1309220..ebaebba072747 100644 --- a/src/test/run-pass/impl-trait/issue-42479.rs +++ b/src/test/run-pass/impl-trait/issue-42479.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::iter::once; struct Foo { diff --git a/src/test/run-pass/impl-trait/issue-49376.rs b/src/test/run-pass/impl-trait/issue-49376.rs index b687b485fce21..f4c3da7500f79 100644 --- a/src/test/run-pass/impl-trait/issue-49376.rs +++ b/src/test/run-pass/impl-trait/issue-49376.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests for nested self-reference which caused a stack overflow. use std::fmt::Debug; diff --git a/src/test/run-pass/impl-trait/lifetimes.rs b/src/test/run-pass/impl-trait/lifetimes.rs index d126d795d909a..f49aaca60713c 100644 --- a/src/test/run-pass/impl-trait/lifetimes.rs +++ b/src/test/run-pass/impl-trait/lifetimes.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(warnings)] use std::fmt::Debug; diff --git a/src/test/run-pass/impl-trait/nesting.rs b/src/test/run-pass/impl-trait/nesting.rs index 73e6c1c0d1d68..c561ef0904d46 100644 --- a/src/test/run-pass/impl-trait/nesting.rs +++ b/src/test/run-pass/impl-trait/nesting.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo(t: T) -> impl Into<[T; { const FOO: usize = 1; FOO }]> { [t] } diff --git a/src/test/run-pass/impl-trait/universal_hrtb_anon.rs b/src/test/run-pass/impl-trait/universal_hrtb_anon.rs index 9fc74757da0bf..f3d82d04e83db 100644 --- a/src/test/run-pass/impl-trait/universal_hrtb_anon.rs +++ b/src/test/run-pass/impl-trait/universal_hrtb_anon.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn hrtb(f: impl Fn(&u32) -> u32) -> u32 { f(&22) + f(&44) } diff --git a/src/test/run-pass/impl-trait/universal_hrtb_named.rs b/src/test/run-pass/impl-trait/universal_hrtb_named.rs index 3aefc79ebf782..a8915b219b1c2 100644 --- a/src/test/run-pass/impl-trait/universal_hrtb_named.rs +++ b/src/test/run-pass/impl-trait/universal_hrtb_named.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn hrtb(f: impl for<'a> Fn(&'a u32) -> &'a u32) -> u32 { f(&22) + f(&44) } diff --git a/src/test/run-pass/impl-trait/universal_in_adt_in_parameters.rs b/src/test/run-pass/impl-trait/universal_in_adt_in_parameters.rs index 57452a2e475c3..15bd1e5124d5a 100644 --- a/src/test/run-pass/impl-trait/universal_in_adt_in_parameters.rs +++ b/src/test/run-pass/impl-trait/universal_in_adt_in_parameters.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt::Display; fn check_display_eq(iter: &Vec) { diff --git a/src/test/run-pass/impl-trait/universal_in_impl_trait_in_parameters.rs b/src/test/run-pass/impl-trait/universal_in_impl_trait_in_parameters.rs index fea946f12584e..a5a80cc4372c9 100644 --- a/src/test/run-pass/impl-trait/universal_in_impl_trait_in_parameters.rs +++ b/src/test/run-pass/impl-trait/universal_in_impl_trait_in_parameters.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt::Display; fn check_display_eq(iter: impl IntoIterator) { diff --git a/src/test/run-pass/impl-trait/universal_in_trait_defn_parameters.rs b/src/test/run-pass/impl-trait/universal_in_trait_defn_parameters.rs index d3611e02e025b..233bbda618b7f 100644 --- a/src/test/run-pass/impl-trait/universal_in_trait_defn_parameters.rs +++ b/src/test/run-pass/impl-trait/universal_in_trait_defn_parameters.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt::Debug; trait InTraitDefnParameters { diff --git a/src/test/run-pass/impl-trait/universal_multiple_bounds.rs b/src/test/run-pass/impl-trait/universal_multiple_bounds.rs index 594207feb09a4..da0161f4d40fb 100644 --- a/src/test/run-pass/impl-trait/universal_multiple_bounds.rs +++ b/src/test/run-pass/impl-trait/universal_multiple_bounds.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt::Display; fn foo(f: impl Display + Clone) -> String { diff --git a/src/test/run-pass/impl-trait/xcrate.rs b/src/test/run-pass/impl-trait/xcrate.rs index 35ae185b3e1de..66269d9f52e7b 100644 --- a/src/test/run-pass/impl-trait/xcrate.rs +++ b/src/test/run-pass/impl-trait/xcrate.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:xcrate.rs extern crate xcrate; diff --git a/src/test/run-pass/impl-trait/xcrate_simple.rs b/src/test/run-pass/impl-trait/xcrate_simple.rs index 8d4086cc88047..7180fb9c82832 100644 --- a/src/test/run-pass/impl-trait/xcrate_simple.rs +++ b/src/test/run-pass/impl-trait/xcrate_simple.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:xcrate.rs extern crate xcrate; diff --git a/src/test/run-pass/implied-bounds-closure-arg-outlives.rs b/src/test/run-pass/implied-bounds-closure-arg-outlives.rs index 0e5cc574f0022..b32c798760ff7 100644 --- a/src/test/run-pass/implied-bounds-closure-arg-outlives.rs +++ b/src/test/run-pass/implied-bounds-closure-arg-outlives.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are able to handle the relationships between free // regions bound in a closure callback. diff --git a/src/test/run-pass/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans.rs b/src/test/run-pass/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans.rs index b37533d2da763..3f67b0589fb00 100644 --- a/src/test/run-pass/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans.rs +++ b/src/test/run-pass/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] // no-prefer-dynamic diff --git a/src/test/run-pass/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans_macros.rs b/src/test/run-pass/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans_macros.rs index 112315af84485..63611c2429977 100644 --- a/src/test/run-pass/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans_macros.rs +++ b/src/test/run-pass/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans_macros.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! add1 { ($e:expr) => ({ let a = 1 + $e; diff --git a/src/test/run-pass/import-crate-with-invalid-spans/main.rs b/src/test/run-pass/import-crate-with-invalid-spans/main.rs index 2f80a0954dc0a..466b3bc2f65b6 100644 --- a/src/test/run-pass/import-crate-with-invalid-spans/main.rs +++ b/src/test/run-pass/import-crate-with-invalid-spans/main.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:crate_with_invalid_spans.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/import-from.rs b/src/test/run-pass/import-from.rs index 9ac35fbb38756..1c41f2970b110 100644 --- a/src/test/run-pass/import-from.rs +++ b/src/test/run-pass/import-from.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 use spam::{ham, eggs}; diff --git a/src/test/run-pass/import-glob-0.rs b/src/test/run-pass/import-glob-0.rs index a57b8de629eb5..4c38c6f507d26 100644 --- a/src/test/run-pass/import-glob-0.rs +++ b/src/test/run-pass/import-glob-0.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use module_of_many_things::*; use dug::too::greedily::and::too::deep::*; diff --git a/src/test/run-pass/import-glob-1.rs b/src/test/run-pass/import-glob-1.rs index a7949e7d6e3b1..14b7bb7f9cd7d 100644 --- a/src/test/run-pass/import-glob-1.rs +++ b/src/test/run-pass/import-glob-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This should resolve fine. Prior to fix, the last import // was being tried too early, and marked as unrsolved before // the glob import had a chance to be resolved. diff --git a/src/test/run-pass/import-glob-crate.rs b/src/test/run-pass/import-glob-crate.rs index fec46c7e1f82d..bf20eef8ceb1b 100644 --- a/src/test/run-pass/import-glob-crate.rs +++ b/src/test/run-pass/import-glob-crate.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::mem::*; pub fn main() { diff --git a/src/test/run-pass/import-in-block.rs b/src/test/run-pass/import-in-block.rs index 532cdbbee3cd4..a969396f57865 100644 --- a/src/test/run-pass/import-in-block.rs +++ b/src/test/run-pass/import-in-block.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub fn main() { diff --git a/src/test/run-pass/import-prefix-macro.rs b/src/test/run-pass/import-prefix-macro.rs index cfe4ff78e6258..b824c5f7bc975 100644 --- a/src/test/run-pass/import-prefix-macro.rs +++ b/src/test/run-pass/import-prefix-macro.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod a { pub mod b { pub mod c { diff --git a/src/test/run-pass/import-rename.rs b/src/test/run-pass/import-rename.rs index f293c284f946f..1a875c81bd129 100644 --- a/src/test/run-pass/import-rename.rs +++ b/src/test/run-pass/import-rename.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use foo::{x, y as fooy}; use Maybe::{Yes as MaybeYes}; diff --git a/src/test/run-pass/import-trailing-comma.rs b/src/test/run-pass/import-trailing-comma.rs index c47448536223c..5b263030635d3 100644 --- a/src/test/run-pass/import-trailing-comma.rs +++ b/src/test/run-pass/import-trailing-comma.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 use foo::bar::{baz, quux,}; diff --git a/src/test/run-pass/import.rs b/src/test/run-pass/import.rs index c2b459d288727..84134b495775a 100644 --- a/src/test/run-pass/import.rs +++ b/src/test/run-pass/import.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod foo { pub fn x(y: isize) { println!("{}", y); } } diff --git a/src/test/run-pass/import2.rs b/src/test/run-pass/import2.rs index 4086acc0a8eb4..ff22d13eb18da 100644 --- a/src/test/run-pass/import2.rs +++ b/src/test/run-pass/import2.rs @@ -1,14 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use zed::bar; mod zed { diff --git a/src/test/run-pass/import3.rs b/src/test/run-pass/import3.rs index 2c09eff7b12e5..004f81275b41c 100644 --- a/src/test/run-pass/import3.rs +++ b/src/test/run-pass/import3.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_imports)] use baz::zed; diff --git a/src/test/run-pass/import4.rs b/src/test/run-pass/import4.rs index 229813ff55ceb..bc364ee2c7088 100644 --- a/src/test/run-pass/import4.rs +++ b/src/test/run-pass/import4.rs @@ -1,14 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use zed::bar; mod zed { diff --git a/src/test/run-pass/import5.rs b/src/test/run-pass/import5.rs index 0cad094d55dd7..9b36b49169a6d 100644 --- a/src/test/run-pass/import5.rs +++ b/src/test/run-pass/import5.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use foo::bar; mod foo { pub use foo::zed::bar; diff --git a/src/test/run-pass/import6.rs b/src/test/run-pass/import6.rs index 545bd7cee5ea8..65d4aef01a1e7 100644 --- a/src/test/run-pass/import6.rs +++ b/src/test/run-pass/import6.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_imports)] use foo::zed; diff --git a/src/test/run-pass/import7.rs b/src/test/run-pass/import7.rs index 4b9d1328951fe..a342d97af11c0 100644 --- a/src/test/run-pass/import7.rs +++ b/src/test/run-pass/import7.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_imports)] use foo::zed; diff --git a/src/test/run-pass/import8.rs b/src/test/run-pass/import8.rs index 0f3891bf06715..9902b872c1fbe 100644 --- a/src/test/run-pass/import8.rs +++ b/src/test/run-pass/import8.rs @@ -1,14 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use foo::x; use foo::x as z; diff --git a/src/test/run-pass/imports.rs b/src/test/run-pass/imports.rs index f845a2ee57162..d5f3541948e14 100644 --- a/src/test/run-pass/imports.rs +++ b/src/test/run-pass/imports.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused)] // Like other items, private imports can be imported and used non-lexically in paths. diff --git a/src/test/run-pass/in-band-lifetimes.rs b/src/test/run-pass/in-band-lifetimes.rs index 6edd0d686eff8..c892260536365 100644 --- a/src/test/run-pass/in-band-lifetimes.rs +++ b/src/test/run-pass/in-band-lifetimes.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(warnings)] #![feature(in_band_lifetimes)] diff --git a/src/test/run-pass/inc-range-pat.rs b/src/test/run-pass/inc-range-pat.rs index 237b41b6128cf..6b99a9d0a7422 100644 --- a/src/test/run-pass/inc-range-pat.rs +++ b/src/test/run-pass/inc-range-pat.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test old and new syntax for inclusive range patterns. fn main() { diff --git a/src/test/run-pass/inconsistent-lifetime-mismatch.rs b/src/test/run-pass/inconsistent-lifetime-mismatch.rs index 9a0d8e201c243..dfe5cbcc6b3ad 100644 --- a/src/test/run-pass/inconsistent-lifetime-mismatch.rs +++ b/src/test/run-pass/inconsistent-lifetime-mismatch.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn foo(_: &[&str]) {} diff --git a/src/test/run-pass/infer-fn-tail-expr.rs b/src/test/run-pass/infer-fn-tail-expr.rs index f00005fc7d0b5..b4f29419331d1 100644 --- a/src/test/run-pass/infer-fn-tail-expr.rs +++ b/src/test/run-pass/infer-fn-tail-expr.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // issue #680 diff --git a/src/test/run-pass/infer-from-object-trait-issue-26952.rs b/src/test/run-pass/infer-from-object-trait-issue-26952.rs index d5ca90c1a28c4..06db66eef4649 100644 --- a/src/test/run-pass/infer-from-object-trait-issue-26952.rs +++ b/src/test/run-pass/infer-from-object-trait-issue-26952.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that when we match a trait reference like `Foo: Foo<_#0t>`, // we unify with `_#0t` with `A`. In this code, if we failed to do // that, then you get an unconstrained type-variable in `call`. diff --git a/src/test/run-pass/inferred-suffix-in-pattern-range.rs b/src/test/run-pass/inferred-suffix-in-pattern-range.rs index 89d26aade2ec3..ca4c8e249385d 100644 --- a/src/test/run-pass/inferred-suffix-in-pattern-range.rs +++ b/src/test/run-pass/inferred-suffix-in-pattern-range.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { let x = 2; let x_message = match x { diff --git a/src/test/run-pass/inherent-trait-method-order.rs b/src/test/run-pass/inherent-trait-method-order.rs index 5489a61f7d0b9..4cd326ce01102 100644 --- a/src/test/run-pass/inherent-trait-method-order.rs +++ b/src/test/run-pass/inherent-trait-method-order.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct Foo; impl Foo { diff --git a/src/test/run-pass/init-large-type.rs b/src/test/run-pass/init-large-type.rs index c8f9a0e4cab6d..bca97115da827 100644 --- a/src/test/run-pass/init-large-type.rs +++ b/src/test/run-pass/init-large-type.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Makes sure that zero-initializing large types is reasonably fast, // Doing it incorrectly causes massive slowdown in LLVM during // optimisation. diff --git a/src/test/run-pass/init-res-into-things.rs b/src/test/run-pass/init-res-into-things.rs index a270b00398166..379e294deee0b 100644 --- a/src/test/run-pass/init-res-into-things.rs +++ b/src/test/run-pass/init-res-into-things.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] use std::cell::Cell; diff --git a/src/test/run-pass/inlined-main.rs b/src/test/run-pass/inlined-main.rs index 1288c37d615cd..3a55a894267ad 100644 --- a/src/test/run-pass/inlined-main.rs +++ b/src/test/run-pass/inlined-main.rs @@ -1,12 +1,2 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[inline(always)] fn main() {} diff --git a/src/test/run-pass/inner-attrs-on-impl.rs b/src/test/run-pass/inner-attrs-on-impl.rs index d8d9d5136e2d1..4cc659562eaac 100644 --- a/src/test/run-pass/inner-attrs-on-impl.rs +++ b/src/test/run-pass/inner-attrs-on-impl.rs @@ -1,15 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - struct Foo; impl Foo { diff --git a/src/test/run-pass/inner-module.rs b/src/test/run-pass/inner-module.rs index 95a10df5f8128..d8658691875bf 100644 --- a/src/test/run-pass/inner-module.rs +++ b/src/test/run-pass/inner-module.rs @@ -1,16 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - mod inner { pub mod inner2 { pub fn hello() { println!("hello, modular world"); } diff --git a/src/test/run-pass/inner-static.rs b/src/test/run-pass/inner-static.rs index b93ca943e4714..6f7d7c2288750 100644 --- a/src/test/run-pass/inner-static.rs +++ b/src/test/run-pass/inner-static.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:inner_static.rs diff --git a/src/test/run-pass/instantiable.rs b/src/test/run-pass/instantiable.rs index 28fba70eb24d9..b7847b738e022 100644 --- a/src/test/run-pass/instantiable.rs +++ b/src/test/run-pass/instantiable.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 use std::ptr; diff --git a/src/test/run-pass/int-abs-overflow.rs b/src/test/run-pass/int-abs-overflow.rs index e17e3a16d6834..b7009f4a03fbc 100644 --- a/src/test/run-pass/int-abs-overflow.rs +++ b/src/test/run-pass/int-abs-overflow.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z force-overflow-checks=on // ignore-emscripten no threads support diff --git a/src/test/run-pass/int.rs b/src/test/run-pass/int.rs index 9495552af409b..8c999fa924ec6 100644 --- a/src/test/run-pass/int.rs +++ b/src/test/run-pass/int.rs @@ -1,16 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - // pretty-expanded FIXME #23616 pub fn main() { let _x: isize = 10; } diff --git a/src/test/run-pass/integer-literal-radix.rs b/src/test/run-pass/integer-literal-radix.rs index ba9d22f06a976..d9a9b0847aae4 100644 --- a/src/test/run-pass/integer-literal-radix.rs +++ b/src/test/run-pass/integer-literal-radix.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { let a = 0xBEEF_isize; let b = 0o755_isize; diff --git a/src/test/run-pass/integer-literal-suffix-inference-2.rs b/src/test/run-pass/integer-literal-suffix-inference-2.rs index e953cf2fda1af..1b126d2ad7e2a 100644 --- a/src/test/run-pass/integer-literal-suffix-inference-2.rs +++ b/src/test/run-pass/integer-literal-suffix-inference-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn foo(_: *const ()) {} diff --git a/src/test/run-pass/integer-literal-suffix-inference-3.rs b/src/test/run-pass/integer-literal-suffix-inference-3.rs index 31aca964def1c..1962189acc1b1 100644 --- a/src/test/run-pass/integer-literal-suffix-inference-3.rs +++ b/src/test/run-pass/integer-literal-suffix-inference-3.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { println!("{}", std::mem::size_of_val(&1)); } diff --git a/src/test/run-pass/integer-literal-suffix-inference.rs b/src/test/run-pass/integer-literal-suffix-inference.rs index 57f80bb14e2fe..9b37496f6107c 100644 --- a/src/test/run-pass/integer-literal-suffix-inference.rs +++ b/src/test/run-pass/integer-literal-suffix-inference.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub fn main() { diff --git a/src/test/run-pass/into-iterator-type-inference-shift.rs b/src/test/run-pass/into-iterator-type-inference-shift.rs index 7ec18ef127690..8054b321c725f 100644 --- a/src/test/run-pass/into-iterator-type-inference-shift.rs +++ b/src/test/run-pass/into-iterator-type-inference-shift.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for type inference failure around shifting. In this // case, the iteration yields an isize, but we hadn't run the full type // propagation yet, and so we just saw a type variable, yielding an diff --git a/src/test/run-pass/intrinsic-alignment.rs b/src/test/run-pass/intrinsic-alignment.rs index 5a6a6e0163ede..8f78f145cbcde 100644 --- a/src/test/run-pass/intrinsic-alignment.rs +++ b/src/test/run-pass/intrinsic-alignment.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare seems not important to test here #![feature(intrinsics, main)] diff --git a/src/test/run-pass/intrinsic-assume.rs b/src/test/run-pass/intrinsic-assume.rs index 41ef62b0ced3d..6a2955ad391b8 100644 --- a/src/test/run-pass/intrinsic-assume.rs +++ b/src/test/run-pass/intrinsic-assume.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(core_intrinsics)] use std::intrinsics::assume; diff --git a/src/test/run-pass/intrinsic-atomics-cc.rs b/src/test/run-pass/intrinsic-atomics-cc.rs index abb85cc7f1949..04a8df8b35c03 100644 --- a/src/test/run-pass/intrinsic-atomics-cc.rs +++ b/src/test/run-pass/intrinsic-atomics-cc.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:cci_intrinsic.rs diff --git a/src/test/run-pass/intrinsic-atomics.rs b/src/test/run-pass/intrinsic-atomics.rs index 4b11158e8c3d1..6a0522b0fa89a 100644 --- a/src/test/run-pass/intrinsic-atomics.rs +++ b/src/test/run-pass/intrinsic-atomics.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] #![feature(intrinsics)] diff --git a/src/test/run-pass/intrinsic-move-val-cleanups.rs b/src/test/run-pass/intrinsic-move-val-cleanups.rs index 8f22579423fd5..9a11512b367f6 100644 --- a/src/test/run-pass/intrinsic-move-val-cleanups.rs +++ b/src/test/run-pass/intrinsic-move-val-cleanups.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support // This test is checking that the move_val_init intrinsic is diff --git a/src/test/run-pass/intrinsic-move-val.rs b/src/test/run-pass/intrinsic-move-val.rs index ea42b59f1f2b8..d5fe381198c7a 100644 --- a/src/test/run-pass/intrinsic-move-val.rs +++ b/src/test/run-pass/intrinsic-move-val.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![feature(box_syntax)] #![feature(intrinsics)] diff --git a/src/test/run-pass/intrinsic-uninit.rs b/src/test/run-pass/intrinsic-uninit.rs index 3d2c1ec5c1977..5d09ce0ed0090 100644 --- a/src/test/run-pass/intrinsic-uninit.rs +++ b/src/test/run-pass/intrinsic-uninit.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(intrinsics)] diff --git a/src/test/run-pass/intrinsic-unreachable.rs b/src/test/run-pass/intrinsic-unreachable.rs index 0ce446e445c73..f051d0748fa37 100644 --- a/src/test/run-pass/intrinsic-unreachable.rs +++ b/src/test/run-pass/intrinsic-unreachable.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(core_intrinsics)] use std::intrinsics; diff --git a/src/test/run-pass/intrinsics-integer.rs b/src/test/run-pass/intrinsics-integer.rs index 7a8ff1befc7f0..44503cfad6b74 100644 --- a/src/test/run-pass/intrinsics-integer.rs +++ b/src/test/run-pass/intrinsics-integer.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no i128 support #![feature(intrinsics)] diff --git a/src/test/run-pass/intrinsics-math.rs b/src/test/run-pass/intrinsics-math.rs index 5132405a9d583..23ab15b5c107c 100644 --- a/src/test/run-pass/intrinsics-math.rs +++ b/src/test/run-pass/intrinsics-math.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten fma not implemented in emscripten macro_rules! assert_approx_eq { diff --git a/src/test/run-pass/invalid_const_promotion.rs b/src/test/run-pass/invalid_const_promotion.rs index 53cb4c4b009e5..cd786d03b4cce 100644 --- a/src/test/run-pass/invalid_const_promotion.rs +++ b/src/test/run-pass/invalid_const_promotion.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32 // ignore-emscripten diff --git a/src/test/run-pass/invoke-external-foreign.rs b/src/test/run-pass/invoke-external-foreign.rs index d01c3b67895e6..d34933cde4246 100644 --- a/src/test/run-pass/invoke-external-foreign.rs +++ b/src/test/run-pass/invoke-external-foreign.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:foreign_lib.rs // ignore-wasm32-bare no libc to test ffi with diff --git a/src/test/run-pass/irrefutable-slice-patterns.rs b/src/test/run-pass/irrefutable-slice-patterns.rs index c2e95eb54f901..24748e5b36960 100644 --- a/src/test/run-pass/irrefutable-slice-patterns.rs +++ b/src/test/run-pass/irrefutable-slice-patterns.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // #47096 #![feature(slice_patterns)] diff --git a/src/test/run-pass/irrefutable-unit.rs b/src/test/run-pass/irrefutable-unit.rs index 0c2fbb01f48f4..f588ae3a55742 100644 --- a/src/test/run-pass/irrefutable-unit.rs +++ b/src/test/run-pass/irrefutable-unit.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub fn main() { diff --git a/src/test/run-pass/issue-10025.rs b/src/test/run-pass/issue-10025.rs index 1ca2476a1013b..850244b8ef798 100644 --- a/src/test/run-pass/issue-10025.rs +++ b/src/test/run-pass/issue-10025.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 unsafe extern fn foo() {} diff --git a/src/test/run-pass/issue-10028.rs b/src/test/run-pass/issue-10028.rs index 53d6f67f119ee..cb95bb268efda 100644 --- a/src/test/run-pass/issue-10028.rs +++ b/src/test/run-pass/issue-10028.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-10028.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-10031.rs b/src/test/run-pass/issue-10031.rs index 4dc1487b9af94..430cf2f8fd8c3 100644 --- a/src/test/run-pass/issue-10031.rs +++ b/src/test/run-pass/issue-10031.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_10031_aux.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-10228.rs b/src/test/run-pass/issue-10228.rs index b5c97bd10edfe..5d9fdc69c6c11 100644 --- a/src/test/run-pass/issue-10228.rs +++ b/src/test/run-pass/issue-10228.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 enum StdioContainer { diff --git a/src/test/run-pass/issue-10392.rs b/src/test/run-pass/issue-10392.rs index 1a5f423b0fd8b..83c37bd9a302c 100644 --- a/src/test/run-pass/issue-10392.rs +++ b/src/test/run-pass/issue-10392.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct A { foo: isize } struct B { a: isize, b: isize, c: isize } diff --git a/src/test/run-pass/issue-10396.rs b/src/test/run-pass/issue-10396.rs index b487608d4e660..1b516067a727c 100644 --- a/src/test/run-pass/issue-10396.rs +++ b/src/test/run-pass/issue-10396.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug)] enum Foo<'s> { V(&'s str) diff --git a/src/test/run-pass/issue-10436.rs b/src/test/run-pass/issue-10436.rs index 81a955b0f22e4..5271b61eb1199 100644 --- a/src/test/run-pass/issue-10436.rs +++ b/src/test/run-pass/issue-10436.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn works(x: T) -> Vec { vec![x] } fn also_works(x: T) -> Vec { vec![x] } diff --git a/src/test/run-pass/issue-10456.rs b/src/test/run-pass/issue-10456.rs index 10b4162305432..4d0e9000c343e 100644 --- a/src/test/run-pass/issue-10456.rs +++ b/src/test/run-pass/issue-10456.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub struct Foo; diff --git a/src/test/run-pass/issue-10626.rs b/src/test/run-pass/issue-10626.rs index 9262fc342f751..de5b4f6ce46d4 100644 --- a/src/test/run-pass/issue-10626.rs +++ b/src/test/run-pass/issue-10626.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/issue-10638.rs b/src/test/run-pass/issue-10638.rs index 379bdffbbb22f..070b9f43b23f4 100644 --- a/src/test/run-pass/issue-10638.rs +++ b/src/test/run-pass/issue-10638.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub fn main() { diff --git a/src/test/run-pass/issue-10682.rs b/src/test/run-pass/issue-10682.rs index 67b73bdadbb62..3a4f205fe7be3 100644 --- a/src/test/run-pass/issue-10682.rs +++ b/src/test/run-pass/issue-10682.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #10682 // Nested `proc` usage can't use outer owned data diff --git a/src/test/run-pass/issue-10683.rs b/src/test/run-pass/issue-10683.rs index d3ba477fa573e..a7582d78c8223 100644 --- a/src/test/run-pass/issue-10683.rs +++ b/src/test/run-pass/issue-10683.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 static NAME: &'static str = "hello world"; diff --git a/src/test/run-pass/issue-10718.rs b/src/test/run-pass/issue-10718.rs index fedd94e22e7bd..e816e2050b39e 100644 --- a/src/test/run-pass/issue-10718.rs +++ b/src/test/run-pass/issue-10718.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn f(p: F) { diff --git a/src/test/run-pass/issue-10734.rs b/src/test/run-pass/issue-10734.rs index a521e5d4b6c34..90a78479fbe92 100644 --- a/src/test/run-pass/issue-10734.rs +++ b/src/test/run-pass/issue-10734.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - static mut drop_count: usize = 0; struct Foo { diff --git a/src/test/run-pass/issue-10763.rs b/src/test/run-pass/issue-10763.rs index 3789b93ad76c9..15f2bddfd8445 100644 --- a/src/test/run-pass/issue-10763.rs +++ b/src/test/run-pass/issue-10763.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 extern "Rust" fn foo() {} diff --git a/src/test/run-pass/issue-10764.rs b/src/test/run-pass/issue-10764.rs index cfabf699fa278..70c2726447a90 100644 --- a/src/test/run-pass/issue-10764.rs +++ b/src/test/run-pass/issue-10764.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 extern "Rust" fn main() {} diff --git a/src/test/run-pass/issue-10767.rs b/src/test/run-pass/issue-10767.rs index 2184aa00fa409..bea053466b7bb 100644 --- a/src/test/run-pass/issue-10767.rs +++ b/src/test/run-pass/issue-10767.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/issue-10802.rs b/src/test/run-pass/issue-10802.rs index 1e700d4e18b27..b4c26bd614827 100644 --- a/src/test/run-pass/issue-10802.rs +++ b/src/test/run-pass/issue-10802.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] struct DroppableStruct; diff --git a/src/test/run-pass/issue-10806.rs b/src/test/run-pass/issue-10806.rs index 49883f15d3192..4566ef79b32da 100644 --- a/src/test/run-pass/issue-10806.rs +++ b/src/test/run-pass/issue-10806.rs @@ -1,14 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // pretty-expanded FIXME #23616 pub fn foo() -> isize { diff --git a/src/test/run-pass/issue-10853.rs b/src/test/run-pass/issue-10853.rs index 2e6d278037902..29fef755c9ba4 100644 --- a/src/test/run-pass/issue-10853.rs +++ b/src/test/run-pass/issue-10853.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![deny(missing_docs)] diff --git a/src/test/run-pass/issue-10902.rs b/src/test/run-pass/issue-10902.rs index 9f0417a8be9ba..24bee2fc38806 100644 --- a/src/test/run-pass/issue-10902.rs +++ b/src/test/run-pass/issue-10902.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub mod two_tuple { diff --git a/src/test/run-pass/issue-11047.rs b/src/test/run-pass/issue-11047.rs index 1d97d579a6120..9b9db8f5aaf86 100644 --- a/src/test/run-pass/issue-11047.rs +++ b/src/test/run-pass/issue-11047.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that static methods can be invoked on `type` aliases #![allow(unused_variables)] diff --git a/src/test/run-pass/issue-11085.rs b/src/test/run-pass/issue-11085.rs index c024c6297bf10..048e0fc2ec363 100644 --- a/src/test/run-pass/issue-11085.rs +++ b/src/test/run-pass/issue-11085.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --cfg foo // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-1112.rs b/src/test/run-pass/issue-1112.rs index 72d1a43e88318..3be202f43894e 100644 --- a/src/test/run-pass/issue-1112.rs +++ b/src/test/run-pass/issue-1112.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #1112 // Alignment of interior pointers to dynamic-size types diff --git a/src/test/run-pass/issue-11205.rs b/src/test/run-pass/issue-11205.rs index 25c66bf8d485f..0f94011e1862a 100644 --- a/src/test/run-pass/issue-11205.rs +++ b/src/test/run-pass/issue-11205.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![allow(dead_code)] diff --git a/src/test/run-pass/issue-11224.rs b/src/test/run-pass/issue-11224.rs index 14017ee178924..b4cbdeb8e9ad9 100644 --- a/src/test/run-pass/issue-11224.rs +++ b/src/test/run-pass/issue-11224.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-11224.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-11225-1.rs b/src/test/run-pass/issue-11225-1.rs index 60789be62b353..25c2f05131cc9 100644 --- a/src/test/run-pass/issue-11225-1.rs +++ b/src/test/run-pass/issue-11225-1.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-11225-1.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-11225-2.rs b/src/test/run-pass/issue-11225-2.rs index 540183b7ef432..563dd42b9d0b4 100644 --- a/src/test/run-pass/issue-11225-2.rs +++ b/src/test/run-pass/issue-11225-2.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-11225-2.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-11225-3.rs b/src/test/run-pass/issue-11225-3.rs index 317c3d3222d34..4606e92de1958 100644 --- a/src/test/run-pass/issue-11225-3.rs +++ b/src/test/run-pass/issue-11225-3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-11225-3.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-11267.rs b/src/test/run-pass/issue-11267.rs index 1a1227c792019..df395194e2456 100644 --- a/src/test/run-pass/issue-11267.rs +++ b/src/test/run-pass/issue-11267.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that unary structs can be mutably borrowed. struct Empty; diff --git a/src/test/run-pass/issue-11382.rs b/src/test/run-pass/issue-11382.rs index 51996614d259f..8fcc46c60006d 100644 --- a/src/test/run-pass/issue-11382.rs +++ b/src/test/run-pass/issue-11382.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { println!("{}", 1.2); } diff --git a/src/test/run-pass/issue-11384.rs b/src/test/run-pass/issue-11384.rs index 5b4bd6c9f2bfc..b6aca89a3f7dc 100644 --- a/src/test/run-pass/issue-11384.rs +++ b/src/test/run-pass/issue-11384.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait Common { fn dummy(&self) { } } diff --git a/src/test/run-pass/issue-11508.rs b/src/test/run-pass/issue-11508.rs index 21ed30683f50f..49a2c24266370 100644 --- a/src/test/run-pass/issue-11508.rs +++ b/src/test/run-pass/issue-11508.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-11508.rs extern crate issue_11508 as rand; diff --git a/src/test/run-pass/issue-11529.rs b/src/test/run-pass/issue-11529.rs index e5d95874be61f..807a442090ed5 100644 --- a/src/test/run-pass/issue-11529.rs +++ b/src/test/run-pass/issue-11529.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-11529.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-11552.rs b/src/test/run-pass/issue-11552.rs index aa980e48c5ee7..162454f690f8a 100644 --- a/src/test/run-pass/issue-11552.rs +++ b/src/test/run-pass/issue-11552.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_patterns)] #![feature(box_syntax)] diff --git a/src/test/run-pass/issue-11577.rs b/src/test/run-pass/issue-11577.rs index a64fbb6afd61d..6cf3b66d87b5d 100644 --- a/src/test/run-pass/issue-11577.rs +++ b/src/test/run-pass/issue-11577.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Destructuring struct variants would ICE where regular structs wouldn't enum Foo { diff --git a/src/test/run-pass/issue-11592.rs b/src/test/run-pass/issue-11592.rs index 432e7ff20254f..569b1b67fbce4 100644 --- a/src/test/run-pass/issue-11592.rs +++ b/src/test/run-pass/issue-11592.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Ensure the private trait Bar isn't complained about. #![deny(missing_docs)] diff --git a/src/test/run-pass/issue-11612.rs b/src/test/run-pass/issue-11612.rs index de1b0525d8497..80c86437222df 100644 --- a/src/test/run-pass/issue-11612.rs +++ b/src/test/run-pass/issue-11612.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // #11612 // We weren't updating the auto adjustments with all the resolved // type information after type check. diff --git a/src/test/run-pass/issue-11677.rs b/src/test/run-pass/issue-11677.rs index 62da3b1467559..5bdc9bcb74a1a 100644 --- a/src/test/run-pass/issue-11677.rs +++ b/src/test/run-pass/issue-11677.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![allow(dead_code)] // this code used to cause an ICE diff --git a/src/test/run-pass/issue-11709.rs b/src/test/run-pass/issue-11709.rs index 88d74a65813be..5fc0e6831913d 100644 --- a/src/test/run-pass/issue-11709.rs +++ b/src/test/run-pass/issue-11709.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty issue #37199 // Don't panic on blocks without results diff --git a/src/test/run-pass/issue-11820.rs b/src/test/run-pass/issue-11820.rs index 6d2243db30070..111263b1b82f5 100644 --- a/src/test/run-pass/issue-11820.rs +++ b/src/test/run-pass/issue-11820.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct NoClone; diff --git a/src/test/run-pass/issue-11869.rs b/src/test/run-pass/issue-11869.rs index 8a9b3e4b1434e..4959351e566af 100644 --- a/src/test/run-pass/issue-11869.rs +++ b/src/test/run-pass/issue-11869.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct A { diff --git a/src/test/run-pass/issue-11940.rs b/src/test/run-pass/issue-11940.rs index 186446a345677..c1ceddaa6ff7d 100644 --- a/src/test/run-pass/issue-11940.rs +++ b/src/test/run-pass/issue-11940.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - const TEST_STR: &'static str = "abcd"; fn main() { diff --git a/src/test/run-pass/issue-11958.rs b/src/test/run-pass/issue-11958.rs index 05de69cb966ad..6464b2a71e16c 100644 --- a/src/test/run-pass/issue-11958.rs +++ b/src/test/run-pass/issue-11958.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![forbid(warnings)] // We shouldn't need to rebind a moved upvar as mut if it's already diff --git a/src/test/run-pass/issue-12033.rs b/src/test/run-pass/issue-12033.rs index 5e1d82ce52cc6..50ff031de9dcb 100644 --- a/src/test/run-pass/issue-12033.rs +++ b/src/test/run-pass/issue-12033.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cell::RefCell; fn main() { diff --git a/src/test/run-pass/issue-12133-1.rs b/src/test/run-pass/issue-12133-1.rs index d47bb818c4946..c5e819d60ac4c 100644 --- a/src/test/run-pass/issue-12133-1.rs +++ b/src/test/run-pass/issue-12133-1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-12133-rlib.rs // aux-build:issue-12133-dylib.rs diff --git a/src/test/run-pass/issue-12133-2.rs b/src/test/run-pass/issue-12133-2.rs index 580c487af0de9..cf24b2994dd8d 100644 --- a/src/test/run-pass/issue-12133-2.rs +++ b/src/test/run-pass/issue-12133-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-12133-rlib.rs // aux-build:issue-12133-dylib.rs // no-prefer-dynamic diff --git a/src/test/run-pass/issue-12133-3.rs b/src/test/run-pass/issue-12133-3.rs index 2b36c94d2e290..8ec39fffc8033 100644 --- a/src/test/run-pass/issue-12133-3.rs +++ b/src/test/run-pass/issue-12133-3.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-12133-rlib.rs // aux-build:issue-12133-dylib.rs // aux-build:issue-12133-dylib2.rs diff --git a/src/test/run-pass/issue-12285.rs b/src/test/run-pass/issue-12285.rs index fb98909eb9765..b8d446b9c24a9 100644 --- a/src/test/run-pass/issue-12285.rs +++ b/src/test/run-pass/issue-12285.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct S; fn main() { diff --git a/src/test/run-pass/issue-1251.rs b/src/test/run-pass/issue-1251.rs index 00e8aa69a8942..d2a46e30707c8 100644 --- a/src/test/run-pass/issue-1251.rs +++ b/src/test/run-pass/issue-1251.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 // ignore-wasm32-bare no libc to test ffi with diff --git a/src/test/run-pass/issue-1257.rs b/src/test/run-pass/issue-1257.rs index 44ebe362c729d..99a5e047eb3f2 100644 --- a/src/test/run-pass/issue-1257.rs +++ b/src/test/run-pass/issue-1257.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub fn main () { diff --git a/src/test/run-pass/issue-12582.rs b/src/test/run-pass/issue-12582.rs index b89964d968e84..ee3e530cb65b6 100644 --- a/src/test/run-pass/issue-12582.rs +++ b/src/test/run-pass/issue-12582.rs @@ -1,12 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // pub fn main() { diff --git a/src/test/run-pass/issue-12612.rs b/src/test/run-pass/issue-12612.rs index bdf8f84a9597d..5417bbd5272be 100644 --- a/src/test/run-pass/issue-12612.rs +++ b/src/test/run-pass/issue-12612.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_12612_1.rs // aux-build:issue_12612_2.rs diff --git a/src/test/run-pass/issue-12660.rs b/src/test/run-pass/issue-12660.rs index ebf390cfe4fc3..e0f61bc00c248 100644 --- a/src/test/run-pass/issue-12660.rs +++ b/src/test/run-pass/issue-12660.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-12660-aux.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-12677.rs b/src/test/run-pass/issue-12677.rs index e83a2e9727d99..ba168f3a264c2 100644 --- a/src/test/run-pass/issue-12677.rs +++ b/src/test/run-pass/issue-12677.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn main() { let s = "Hello"; let first = s.bytes(); diff --git a/src/test/run-pass/issue-12699.rs b/src/test/run-pass/issue-12699.rs index 4620d982c1ea5..e0602ad21ed53 100644 --- a/src/test/run-pass/issue-12699.rs +++ b/src/test/run-pass/issue-12699.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare can't block the thread use std::thread; diff --git a/src/test/run-pass/issue-12729.rs b/src/test/run-pass/issue-12729.rs index 1852ed212862f..0e8e5b23816e0 100644 --- a/src/test/run-pass/issue-12729.rs +++ b/src/test/run-pass/issue-12729.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub struct Foo; diff --git a/src/test/run-pass/issue-12744.rs b/src/test/run-pass/issue-12744.rs index aec45216b1b73..47c94ea3478c0 100644 --- a/src/test/run-pass/issue-12744.rs +++ b/src/test/run-pass/issue-12744.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { fn test() -> Box { Box::new(1) } println!("{:?}", test()) diff --git a/src/test/run-pass/issue-12860.rs b/src/test/run-pass/issue-12860.rs index 58ce390cac691..a0cd1dcba4219 100644 --- a/src/test/run-pass/issue-12860.rs +++ b/src/test/run-pass/issue-12860.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::HashSet; #[derive(Copy, Clone, PartialEq, Eq, Hash)] diff --git a/src/test/run-pass/issue-12909.rs b/src/test/run-pass/issue-12909.rs index e15321907301c..b993c19227db0 100644 --- a/src/test/run-pass/issue-12909.rs +++ b/src/test/run-pass/issue-12909.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 use std::collections::HashMap; diff --git a/src/test/run-pass/issue-13027.rs b/src/test/run-pass/issue-13027.rs index 2c460900ef628..cd80a14a33ee3 100644 --- a/src/test/run-pass/issue-13027.rs +++ b/src/test/run-pass/issue-13027.rs @@ -1,12 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // Tests that match expression handles overlapped literal and range diff --git a/src/test/run-pass/issue-13105.rs b/src/test/run-pass/issue-13105.rs index f2a606a8bba30..9ce422184ce98 100644 --- a/src/test/run-pass/issue-13105.rs +++ b/src/test/run-pass/issue-13105.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait Foo { diff --git a/src/test/run-pass/issue-13167.rs b/src/test/run-pass/issue-13167.rs index 414f6768e0a6b..4d319f6b14d35 100644 --- a/src/test/run-pass/issue-13167.rs +++ b/src/test/run-pass/issue-13167.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 use std::slice; diff --git a/src/test/run-pass/issue-13204.rs b/src/test/run-pass/issue-13204.rs index 13e8fe0e964c4..1a1d4b90f3b61 100644 --- a/src/test/run-pass/issue-13204.rs +++ b/src/test/run-pass/issue-13204.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that when instantiating trait default methods, typeck handles // lifetime parameters defined on the method bound correctly. diff --git a/src/test/run-pass/issue-13214.rs b/src/test/run-pass/issue-13214.rs index 7a3d3f4ff485a..0317b5f2f4d80 100644 --- a/src/test/run-pass/issue-13214.rs +++ b/src/test/run-pass/issue-13214.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // defining static with struct that contains enum // with &'static str variant used to cause ICE diff --git a/src/test/run-pass/issue-13259-windows-tcb-trash.rs b/src/test/run-pass/issue-13259-windows-tcb-trash.rs index 634046e86ee6c..2989e763b05b0 100644 --- a/src/test/run-pass/issue-13259-windows-tcb-trash.rs +++ b/src/test/run-pass/issue-13259-windows-tcb-trash.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(libc)] extern crate libc; diff --git a/src/test/run-pass/issue-13264.rs b/src/test/run-pass/issue-13264.rs index 383c1aef23459..c8cfca2a9d81a 100644 --- a/src/test/run-pass/issue-13264.rs +++ b/src/test/run-pass/issue-13264.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::Deref; struct Root { diff --git a/src/test/run-pass/issue-13304.rs b/src/test/run-pass/issue-13304.rs index 36036ae241e21..ec8e745fea965 100644 --- a/src/test/run-pass/issue-13304.rs +++ b/src/test/run-pass/issue-13304.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/issue-13323.rs b/src/test/run-pass/issue-13323.rs index de72d7152f8ec..9be8f93a2a61e 100644 --- a/src/test/run-pass/issue-13323.rs +++ b/src/test/run-pass/issue-13323.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] struct StrWrap { diff --git a/src/test/run-pass/issue-13405.rs b/src/test/run-pass/issue-13405.rs index c8b26dc4aed15..aff7f7b63d5a8 100644 --- a/src/test/run-pass/issue-13405.rs +++ b/src/test/run-pass/issue-13405.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct Foo<'a> { diff --git a/src/test/run-pass/issue-13434.rs b/src/test/run-pass/issue-13434.rs index 5d7a84d80d4c3..746954bddb568 100644 --- a/src/test/run-pass/issue-13434.rs +++ b/src/test/run-pass/issue-13434.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug)] struct MyStruct; diff --git a/src/test/run-pass/issue-13494.rs b/src/test/run-pass/issue-13494.rs index 316190b54eb08..6a085a0bc1cfe 100644 --- a/src/test/run-pass/issue-13494.rs +++ b/src/test/run-pass/issue-13494.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support // This test may not always fail, but it can be flaky if the race it used to diff --git a/src/test/run-pass/issue-13507-2.rs b/src/test/run-pass/issue-13507-2.rs index 75a724e55fb11..fb8421e7f2f92 100644 --- a/src/test/run-pass/issue-13507-2.rs +++ b/src/test/run-pass/issue-13507-2.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue13507.rs extern crate issue13507; diff --git a/src/test/run-pass/issue-13620.rs b/src/test/run-pass/issue-13620.rs index 4c46831418707..84abb6fcf2bff 100644 --- a/src/test/run-pass/issue-13620.rs +++ b/src/test/run-pass/issue-13620.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-13620-1.rs // aux-build:issue-13620-2.rs diff --git a/src/test/run-pass/issue-13655.rs b/src/test/run-pass/issue-13655.rs index 51a9c9264a83c..55a4ff663a37f 100644 --- a/src/test/run-pass/issue-13655.rs +++ b/src/test/run-pass/issue-13655.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(fn_traits, unboxed_closures)] use std::ops::Fn; diff --git a/src/test/run-pass/issue-13665.rs b/src/test/run-pass/issue-13665.rs index f4902c8e0ac38..cdf2c2923eee3 100644 --- a/src/test/run-pass/issue-13665.rs +++ b/src/test/run-pass/issue-13665.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn foo<'r>() { diff --git a/src/test/run-pass/issue-13703.rs b/src/test/run-pass/issue-13703.rs index 173b8dda05795..acdbf5795f4b1 100644 --- a/src/test/run-pass/issue-13703.rs +++ b/src/test/run-pass/issue-13703.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub struct Foo<'a, 'b: 'a> { foo: &'a &'b isize } diff --git a/src/test/run-pass/issue-13763.rs b/src/test/run-pass/issue-13763.rs index 1367ab2ed85bd..0b72caeee7b22 100644 --- a/src/test/run-pass/issue-13763.rs +++ b/src/test/run-pass/issue-13763.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 mod u8 { diff --git a/src/test/run-pass/issue-13775.rs b/src/test/run-pass/issue-13775.rs index c69ae6a15cd37..c12567b8ca21b 100644 --- a/src/test/run-pass/issue-13775.rs +++ b/src/test/run-pass/issue-13775.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait Foo { diff --git a/src/test/run-pass/issue-13808.rs b/src/test/run-pass/issue-13808.rs index ccdfa0646c6aa..deb514dc5a1d7 100644 --- a/src/test/run-pass/issue-13808.rs +++ b/src/test/run-pass/issue-13808.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct Foo<'a> { diff --git a/src/test/run-pass/issue-13837.rs b/src/test/run-pass/issue-13837.rs index d90b9cffb6abd..b9fe6751e86ee 100644 --- a/src/test/run-pass/issue-13837.rs +++ b/src/test/run-pass/issue-13837.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct TestStruct { diff --git a/src/test/run-pass/issue-13867.rs b/src/test/run-pass/issue-13867.rs index bc28dc54de6f6..39b3bfaad6b41 100644 --- a/src/test/run-pass/issue-13867.rs +++ b/src/test/run-pass/issue-13867.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that codegen works correctly when there are multiple refutable // patterns in match expression. diff --git a/src/test/run-pass/issue-13872.rs b/src/test/run-pass/issue-13872.rs index e9fb7945d0400..22b3bdba3cf24 100644 --- a/src/test/run-pass/issue-13872.rs +++ b/src/test/run-pass/issue-13872.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-13872-1.rs // aux-build:issue-13872-2.rs // aux-build:issue-13872-3.rs diff --git a/src/test/run-pass/issue-13902.rs b/src/test/run-pass/issue-13902.rs index 14019aaacd4c4..7fb631c8aca37 100644 --- a/src/test/run-pass/issue-13902.rs +++ b/src/test/run-pass/issue-13902.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const JSVAL_TAG_CLEAR: u32 = 0xFFFFFF80; const JSVAL_TYPE_INT32: u8 = 0x01; const JSVAL_TYPE_UNDEFINED: u8 = 0x02; diff --git a/src/test/run-pass/issue-14082.rs b/src/test/run-pass/issue-14082.rs index d159d55c77c56..a6a9e2a9dd0c9 100644 --- a/src/test/run-pass/issue-14082.rs +++ b/src/test/run-pass/issue-14082.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![allow(unused_imports, dead_code)] diff --git a/src/test/run-pass/issue-14229.rs b/src/test/run-pass/issue-14229.rs index ee2bbe63750c3..57c784433f359 100644 --- a/src/test/run-pass/issue-14229.rs +++ b/src/test/run-pass/issue-14229.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo: Sized { fn foo(self) {} } diff --git a/src/test/run-pass/issue-14254.rs b/src/test/run-pass/issue-14254.rs index 9049ae0548fa9..4d011d32dd3e4 100644 --- a/src/test/run-pass/issue-14254.rs +++ b/src/test/run-pass/issue-14254.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait Foo: Sized { diff --git a/src/test/run-pass/issue-14308.rs b/src/test/run-pass/issue-14308.rs index 74936411da2c9..0e7f3c27e538f 100644 --- a/src/test/run-pass/issue-14308.rs +++ b/src/test/run-pass/issue-14308.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct A(isize); fn main() { diff --git a/src/test/run-pass/issue-14330.rs b/src/test/run-pass/issue-14330.rs index dd5b7e722fe7b..07cb715698ec9 100644 --- a/src/test/run-pass/issue-14330.rs +++ b/src/test/run-pass/issue-14330.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #[macro_use] extern crate std as std2; diff --git a/src/test/run-pass/issue-14344.rs b/src/test/run-pass/issue-14344.rs index 06b8f44ed260c..93ec322b3dcfb 100644 --- a/src/test/run-pass/issue-14344.rs +++ b/src/test/run-pass/issue-14344.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-14344-1.rs // aux-build:issue-14344-2.rs diff --git a/src/test/run-pass/issue-14382.rs b/src/test/run-pass/issue-14382.rs index cdb44f6a60675..44277550cc79f 100644 --- a/src/test/run-pass/issue-14382.rs +++ b/src/test/run-pass/issue-14382.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug)] struct Matrix4(S); trait POrd {} diff --git a/src/test/run-pass/issue-14393.rs b/src/test/run-pass/issue-14393.rs index 88af65074951d..bc0f351fce60a 100644 --- a/src/test/run-pass/issue-14393.rs +++ b/src/test/run-pass/issue-14393.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn main() { diff --git a/src/test/run-pass/issue-14399.rs b/src/test/run-pass/issue-14399.rs index d5c67bea099f5..ab34ca4429ab9 100644 --- a/src/test/run-pass/issue-14399.rs +++ b/src/test/run-pass/issue-14399.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // #14399 // We'd previously ICE if we had a method call whose return // value was coerced to a trait object. (v.clone() returns Box diff --git a/src/test/run-pass/issue-14421.rs b/src/test/run-pass/issue-14421.rs index 046d888030f0c..05162eaeb37a9 100644 --- a/src/test/run-pass/issue-14421.rs +++ b/src/test/run-pass/issue-14421.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-14421.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-14422.rs b/src/test/run-pass/issue-14422.rs index 178a219f5bfc0..5ad31f6733cbc 100644 --- a/src/test/run-pass/issue-14422.rs +++ b/src/test/run-pass/issue-14422.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-14422.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-14456.rs b/src/test/run-pass/issue-14456.rs index 601fafbf02eb9..7b4ffdfd9aba2 100644 --- a/src/test/run-pass/issue-14456.rs +++ b/src/test/run-pass/issue-14456.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/issue-1451.rs b/src/test/run-pass/issue-1451.rs index b65a3a9ab7084..0105971c7e62b 100644 --- a/src/test/run-pass/issue-1451.rs +++ b/src/test/run-pass/issue-1451.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![allow(unused_variables)] diff --git a/src/test/run-pass/issue-14589.rs b/src/test/run-pass/issue-14589.rs index 8aaa24e991ea1..8ad10e1ce1e75 100644 --- a/src/test/run-pass/issue-14589.rs +++ b/src/test/run-pass/issue-14589.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // All 3 expressions should work in that the argument gets // coerced to a trait object diff --git a/src/test/run-pass/issue-1460.rs b/src/test/run-pass/issue-1460.rs index 6e1cfc7186299..9fb40a000127b 100644 --- a/src/test/run-pass/issue-1460.rs +++ b/src/test/run-pass/issue-1460.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // pretty-expanded FIXME #23616 pub fn main() { diff --git a/src/test/run-pass/issue-14821.rs b/src/test/run-pass/issue-14821.rs index 50eb7767f82eb..ac035adaa25b8 100644 --- a/src/test/run-pass/issue-14821.rs +++ b/src/test/run-pass/issue-14821.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait SomeTrait {} struct Meow; impl SomeTrait for Meow {} diff --git a/src/test/run-pass/issue-14837.rs b/src/test/run-pass/issue-14837.rs index 5589acdda37e1..2d17dead4ad71 100644 --- a/src/test/run-pass/issue-14837.rs +++ b/src/test/run-pass/issue-14837.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #[deny(dead_code)] diff --git a/src/test/run-pass/issue-14865.rs b/src/test/run-pass/issue-14865.rs index 1ec268bb17037..3d1dd8a50c1c5 100644 --- a/src/test/run-pass/issue-14865.rs +++ b/src/test/run-pass/issue-14865.rs @@ -1,14 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum X { Foo(usize), Bar(bool) diff --git a/src/test/run-pass/issue-14875.rs b/src/test/run-pass/issue-14875.rs index e705539bb4772..4e43ed22697e2 100644 --- a/src/test/run-pass/issue-14875.rs +++ b/src/test/run-pass/issue-14875.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare always compiled as panic=abort right now // Check that values are not leaked when a dtor panics (#14875) diff --git a/src/test/run-pass/issue-14901.rs b/src/test/run-pass/issue-14901.rs index 566836784696d..bbc9f0bb34133 100644 --- a/src/test/run-pass/issue-14901.rs +++ b/src/test/run-pass/issue-14901.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Reader {} enum Wrapper<'a> { diff --git a/src/test/run-pass/issue-14919.rs b/src/test/run-pass/issue-14919.rs index 5d0fde01798dc..ccb51016dd510 100644 --- a/src/test/run-pass/issue-14919.rs +++ b/src/test/run-pass/issue-14919.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait Matcher { diff --git a/src/test/run-pass/issue-14933.rs b/src/test/run-pass/issue-14933.rs index f6815b7608304..cbaa0df95a4af 100644 --- a/src/test/run-pass/issue-14933.rs +++ b/src/test/run-pass/issue-14933.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub type BigRat = T; diff --git a/src/test/run-pass/issue-14936.rs b/src/test/run-pass/issue-14936.rs index 8a628b73c0067..3f10be6b62a9d 100644 --- a/src/test/run-pass/issue-14936.rs +++ b/src/test/run-pass/issue-14936.rs @@ -1,14 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![feature(asm)] type History = Vec<&'static str>; diff --git a/src/test/run-pass/issue-14940.rs b/src/test/run-pass/issue-14940.rs index c074182011969..1e9708afefc6e 100644 --- a/src/test/run-pass/issue-14940.rs +++ b/src/test/run-pass/issue-14940.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/issue-14958.rs b/src/test/run-pass/issue-14958.rs index 0709ccf1406d4..ffcced1b72cbd 100644 --- a/src/test/run-pass/issue-14958.rs +++ b/src/test/run-pass/issue-14958.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(fn_traits, unboxed_closures)] diff --git a/src/test/run-pass/issue-14959.rs b/src/test/run-pass/issue-14959.rs index 42824b563bed9..9ad1dc7858db9 100644 --- a/src/test/run-pass/issue-14959.rs +++ b/src/test/run-pass/issue-14959.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(fn_traits, unboxed_closures)] diff --git a/src/test/run-pass/issue-15043.rs b/src/test/run-pass/issue-15043.rs index adf56388acd69..812deb2a72d66 100644 --- a/src/test/run-pass/issue-15043.rs +++ b/src/test/run-pass/issue-15043.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![allow(warnings)] diff --git a/src/test/run-pass/issue-15063.rs b/src/test/run-pass/issue-15063.rs index 695d30d73175c..d1a2be50f27d3 100644 --- a/src/test/run-pass/issue-15063.rs +++ b/src/test/run-pass/issue-15063.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Two { A, B} impl Drop for Two { fn drop(&mut self) { diff --git a/src/test/run-pass/issue-15080.rs b/src/test/run-pass/issue-15080.rs index 59267f79e2643..11398bd31845a 100644 --- a/src/test/run-pass/issue-15080.rs +++ b/src/test/run-pass/issue-15080.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(slice_patterns)] fn main() { diff --git a/src/test/run-pass/issue-15104.rs b/src/test/run-pass/issue-15104.rs index 2878f2795c590..eff1b6b59d9f6 100644 --- a/src/test/run-pass/issue-15104.rs +++ b/src/test/run-pass/issue-15104.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(slice_patterns)] fn main() { diff --git a/src/test/run-pass/issue-15108.rs b/src/test/run-pass/issue-15108.rs index aaf1e5fc18320..bc82a3f56b5f2 100644 --- a/src/test/run-pass/issue-15108.rs +++ b/src/test/run-pass/issue-15108.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn main() {} diff --git a/src/test/run-pass/issue-15129.rs b/src/test/run-pass/issue-15129.rs index 9bcfa6ea40a4e..01f7d85b32779 100644 --- a/src/test/run-pass/issue-15129.rs +++ b/src/test/run-pass/issue-15129.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub enum T { T1(()), T2(()) diff --git a/src/test/run-pass/issue-15155.rs b/src/test/run-pass/issue-15155.rs index e1ecaaab026cf..9ea482e84e580 100644 --- a/src/test/run-pass/issue-15155.rs +++ b/src/test/run-pass/issue-15155.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait TraitWithSend: Send {} trait IndirectTraitWithSend: TraitWithSend {} diff --git a/src/test/run-pass/issue-15189.rs b/src/test/run-pass/issue-15189.rs index 54b96d6630749..202b873acd257 100644 --- a/src/test/run-pass/issue-15189.rs +++ b/src/test/run-pass/issue-15189.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! third { ($e:expr) => ({let x = 2; $e[x]}) } diff --git a/src/test/run-pass/issue-15221.rs b/src/test/run-pass/issue-15221.rs index bb89fb2fa102f..9b9611cb565fd 100644 --- a/src/test/run-pass/issue-15221.rs +++ b/src/test/run-pass/issue-15221.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 macro_rules! inner { diff --git a/src/test/run-pass/issue-15261.rs b/src/test/run-pass/issue-15261.rs index 239fef1232639..8cb4030f914a9 100644 --- a/src/test/run-pass/issue-15261.rs +++ b/src/test/run-pass/issue-15261.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 static mut n_mut: usize = 0; diff --git a/src/test/run-pass/issue-15444.rs b/src/test/run-pass/issue-15444.rs index e9a9eabcd917f..50d9939f20a79 100644 --- a/src/test/run-pass/issue-15444.rs +++ b/src/test/run-pass/issue-15444.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait MyTrait { diff --git a/src/test/run-pass/issue-15487.rs b/src/test/run-pass/issue-15487.rs index 3616ab9e6c730..915261b5f4f4a 100644 --- a/src/test/run-pass/issue-15487.rs +++ b/src/test/run-pass/issue-15487.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-windows // ignore-wasm32-bare no libs to link diff --git a/src/test/run-pass/issue-15523-big.rs b/src/test/run-pass/issue-15523-big.rs index 33c81cab3817b..75fd8d8dfce8f 100644 --- a/src/test/run-pass/issue-15523-big.rs +++ b/src/test/run-pass/issue-15523-big.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue 15523: derive(PartialOrd) should use the provided // discriminant values for the derived ordering. // diff --git a/src/test/run-pass/issue-15523.rs b/src/test/run-pass/issue-15523.rs index bb8fa6791a5c4..a5446a2a2fc2e 100644 --- a/src/test/run-pass/issue-15523.rs +++ b/src/test/run-pass/issue-15523.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue 15523: derive(PartialOrd) should use the provided // discriminant values for the derived ordering. // diff --git a/src/test/run-pass/issue-15562.rs b/src/test/run-pass/issue-15562.rs index da1e15d826d99..00a0b6f49dd3f 100644 --- a/src/test/run-pass/issue-15562.rs +++ b/src/test/run-pass/issue-15562.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-15562.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-15571.rs b/src/test/run-pass/issue-15571.rs index 35915a62102d3..98812cea3e70c 100644 --- a/src/test/run-pass/issue-15571.rs +++ b/src/test/run-pass/issue-15571.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn match_on_local() { diff --git a/src/test/run-pass/issue-15673.rs b/src/test/run-pass/issue-15673.rs index ff9a17323e433..a5c3058c46618 100644 --- a/src/test/run-pass/issue-15673.rs +++ b/src/test/run-pass/issue-15673.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(iter_arith)] fn main() { diff --git a/src/test/run-pass/issue-15689-1.rs b/src/test/run-pass/issue-15689-1.rs index 20d66cd8176e7..8778a15975d00 100644 --- a/src/test/run-pass/issue-15689-1.rs +++ b/src/test/run-pass/issue-15689-1.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #[derive(PartialEq, Debug)] enum Test<'a> { Slice(&'a isize) diff --git a/src/test/run-pass/issue-15689-2.rs b/src/test/run-pass/issue-15689-2.rs index 922b18c01d9eb..04cf82d5f905a 100644 --- a/src/test/run-pass/issue-15689-2.rs +++ b/src/test/run-pass/issue-15689-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #[derive(Clone)] diff --git a/src/test/run-pass/issue-15730.rs b/src/test/run-pass/issue-15730.rs index 929580019ff64..b7361a50057d6 100644 --- a/src/test/run-pass/issue-15730.rs +++ b/src/test/run-pass/issue-15730.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn main() { diff --git a/src/test/run-pass/issue-15734.rs b/src/test/run-pass/issue-15734.rs index 5a35239cf72d2..a56d800918325 100644 --- a/src/test/run-pass/issue-15734.rs +++ b/src/test/run-pass/issue-15734.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // If `Index` used an associated type for its output, this test would // work more smoothly. diff --git a/src/test/run-pass/issue-15735.rs b/src/test/run-pass/issue-15735.rs index bdd58bf6a7d5a..67ca3123c894b 100644 --- a/src/test/run-pass/issue-15735.rs +++ b/src/test/run-pass/issue-15735.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct A<'a> { a: &'a i32, b: &'a i32, diff --git a/src/test/run-pass/issue-15763.rs b/src/test/run-pass/issue-15763.rs index e1176d470636c..97e5443cc1340 100644 --- a/src/test/run-pass/issue-15763.rs +++ b/src/test/run-pass/issue-15763.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] #[derive(PartialEq, Debug)] diff --git a/src/test/run-pass/issue-15774.rs b/src/test/run-pass/issue-15774.rs index eb3322e037058..c0d233699b987 100644 --- a/src/test/run-pass/issue-15774.rs +++ b/src/test/run-pass/issue-15774.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![deny(warnings)] diff --git a/src/test/run-pass/issue-15793.rs b/src/test/run-pass/issue-15793.rs index 432174a1f52a0..2ef60db8bbe4a 100644 --- a/src/test/run-pass/issue-15793.rs +++ b/src/test/run-pass/issue-15793.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum NestedEnum { First, Second, diff --git a/src/test/run-pass/issue-15858.rs b/src/test/run-pass/issue-15858.rs index a1ada18984e9e..a5d5a4d5ae231 100644 --- a/src/test/run-pass/issue-15858.rs +++ b/src/test/run-pass/issue-15858.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - static mut DROP_RAN: bool = false; trait Bar { diff --git a/src/test/run-pass/issue-15881-model-lexer-dotdotdot.rs b/src/test/run-pass/issue-15881-model-lexer-dotdotdot.rs index 04ffad501b042..a31af2eaf2a54 100644 --- a/src/test/run-pass/issue-15881-model-lexer-dotdotdot.rs +++ b/src/test/run-pass/issue-15881-model-lexer-dotdotdot.rs @@ -1,12 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // regression test for the model lexer handling the DOTDOTDOT syntax (#15877) diff --git a/src/test/run-pass/issue-16151.rs b/src/test/run-pass/issue-16151.rs index 212dfaf3cb6c7..40bdea07919d4 100644 --- a/src/test/run-pass/issue-16151.rs +++ b/src/test/run-pass/issue-16151.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::mem; static mut DROP_COUNT: usize = 0; diff --git a/src/test/run-pass/issue-16256.rs b/src/test/run-pass/issue-16256.rs index b994fcb46b096..d9e248be861b5 100644 --- a/src/test/run-pass/issue-16256.rs +++ b/src/test/run-pass/issue-16256.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn main() { diff --git a/src/test/run-pass/issue-16272.rs b/src/test/run-pass/issue-16272.rs index f8d6e43c73068..e0b4fe27d31da 100644 --- a/src/test/run-pass/issue-16272.rs +++ b/src/test/run-pass/issue-16272.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/issue-16278.rs b/src/test/run-pass/issue-16278.rs index 41af72db20089..51596ff157e8e 100644 --- a/src/test/run-pass/issue-16278.rs +++ b/src/test/run-pass/issue-16278.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-cr // this file has some special \r\n endings (use xxd to see them) diff --git a/src/test/run-pass/issue-16441.rs b/src/test/run-pass/issue-16441.rs index 4624953dea3fa..1f107b6c09c55 100644 --- a/src/test/run-pass/issue-16441.rs +++ b/src/test/run-pass/issue-16441.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct Empty; diff --git a/src/test/run-pass/issue-16452.rs b/src/test/run-pass/issue-16452.rs index b6056d0ab8ca9..3631e9161f342 100644 --- a/src/test/run-pass/issue-16452.rs +++ b/src/test/run-pass/issue-16452.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn main() { diff --git a/src/test/run-pass/issue-16492.rs b/src/test/run-pass/issue-16492.rs index 177550a0dd4a1..0b935500b7ee9 100644 --- a/src/test/run-pass/issue-16492.rs +++ b/src/test/run-pass/issue-16492.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::rc::Rc; use std::cell::Cell; diff --git a/src/test/run-pass/issue-16530.rs b/src/test/run-pass/issue-16530.rs index bd7e7c8518927..5ebebf1219886 100644 --- a/src/test/run-pass/issue-16530.rs +++ b/src/test/run-pass/issue-16530.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::hash::{SipHasher, Hasher, Hash}; #[derive(Hash)] diff --git a/src/test/run-pass/issue-16560.rs b/src/test/run-pass/issue-16560.rs index e91569f8b2450..b73eac048e3a9 100644 --- a/src/test/run-pass/issue-16560.rs +++ b/src/test/run-pass/issue-16560.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/issue-16596.rs b/src/test/run-pass/issue-16596.rs index d70158743e720..042e42e4c71dd 100644 --- a/src/test/run-pass/issue-16596.rs +++ b/src/test/run-pass/issue-16596.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait MatrixRow { fn dummy(&self) { }} struct Mat; diff --git a/src/test/run-pass/issue-16597-empty.rs b/src/test/run-pass/issue-16597-empty.rs index c51e33c01040b..efdfc339a9b25 100644 --- a/src/test/run-pass/issue-16597-empty.rs +++ b/src/test/run-pass/issue-16597-empty.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:--test // This verifies that the test generation doesn't crash when we have diff --git a/src/test/run-pass/issue-16597.rs b/src/test/run-pass/issue-16597.rs index 583d8d46235d6..3d3e387352766 100644 --- a/src/test/run-pass/issue-16597.rs +++ b/src/test/run-pass/issue-16597.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:--test mod tests { diff --git a/src/test/run-pass/issue-1660.rs b/src/test/run-pass/issue-1660.rs index 2a59c3051d5cb..8eb03a3c71eb8 100644 --- a/src/test/run-pass/issue-1660.rs +++ b/src/test/run-pass/issue-1660.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub fn main() { diff --git a/src/test/run-pass/issue-16602-1.rs b/src/test/run-pass/issue-16602-1.rs index ee638edad6cb5..e27dc98645208 100644 --- a/src/test/run-pass/issue-16602-1.rs +++ b/src/test/run-pass/issue-16602-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let mut t = [1; 2]; t = [t[1] * 2, t[0] * 2]; diff --git a/src/test/run-pass/issue-16602-2.rs b/src/test/run-pass/issue-16602-2.rs index 742eb6c280e39..1f282bbad4d9a 100644 --- a/src/test/run-pass/issue-16602-2.rs +++ b/src/test/run-pass/issue-16602-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct A { pub x: u32, pub y: u32, diff --git a/src/test/run-pass/issue-16602-3.rs b/src/test/run-pass/issue-16602-3.rs index d29932dcf6836..396709bf9fc18 100644 --- a/src/test/run-pass/issue-16602-3.rs +++ b/src/test/run-pass/issue-16602-3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug)] enum Foo { Bar(u32, u32), diff --git a/src/test/run-pass/issue-16643.rs b/src/test/run-pass/issue-16643.rs index 54572296df7e0..3e17ac270cbf9 100644 --- a/src/test/run-pass/issue-16643.rs +++ b/src/test/run-pass/issue-16643.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-16643.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-16648.rs b/src/test/run-pass/issue-16648.rs index bf272308fa9df..6e332efb6aef7 100644 --- a/src/test/run-pass/issue-16648.rs +++ b/src/test/run-pass/issue-16648.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x: (isize, &[isize]) = (2, &[1, 2]); assert_eq!(match x { diff --git a/src/test/run-pass/issue-16668.rs b/src/test/run-pass/issue-16668.rs index 7944e80a42860..21c7622939108 100644 --- a/src/test/run-pass/issue-16668.rs +++ b/src/test/run-pass/issue-16668.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Parser<'a, I, O> { parse: Box Result + 'a> } diff --git a/src/test/run-pass/issue-16671.rs b/src/test/run-pass/issue-16671.rs index 9f34ad6726cb6..318ae140a2b15 100644 --- a/src/test/run-pass/issue-16671.rs +++ b/src/test/run-pass/issue-16671.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //compile-flags: -Z borrowck=compare -Z emit-end-regions #![deny(warnings)] diff --git a/src/test/run-pass/issue-16739.rs b/src/test/run-pass/issue-16739.rs index 2bdedfebe3e99..5720804293dfb 100644 --- a/src/test/run-pass/issue-16739.rs +++ b/src/test/run-pass/issue-16739.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] #![feature(unboxed_closures, fn_traits)] diff --git a/src/test/run-pass/issue-16745.rs b/src/test/run-pass/issue-16745.rs index 79fe0b0177a43..37e2e601106a6 100644 --- a/src/test/run-pass/issue-16745.rs +++ b/src/test/run-pass/issue-16745.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { const X: u8 = 0; let out: u8 = match 0u8 { diff --git a/src/test/run-pass/issue-16774.rs b/src/test/run-pass/issue-16774.rs index 1309d2ffab8e0..be9cb6af817d8 100644 --- a/src/test/run-pass/issue-16774.rs +++ b/src/test/run-pass/issue-16774.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] #![feature(box_patterns)] diff --git a/src/test/run-pass/issue-16783.rs b/src/test/run-pass/issue-16783.rs index 33cdbca14e367..7bdef92f92952 100644 --- a/src/test/run-pass/issue-16783.rs +++ b/src/test/run-pass/issue-16783.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub fn main() { diff --git a/src/test/run-pass/issue-16819.rs b/src/test/run-pass/issue-16819.rs index ecd8a3390b753..1ae1d4bd5f855 100644 --- a/src/test/run-pass/issue-16819.rs +++ b/src/test/run-pass/issue-16819.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // `#[cfg]` on struct field permits empty unusable struct struct S { diff --git a/src/test/run-pass/issue-16922.rs b/src/test/run-pass/issue-16922.rs index 1fdc27eb12845..17d2e71084366 100644 --- a/src/test/run-pass/issue-16922.rs +++ b/src/test/run-pass/issue-16922.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 use std::any::Any; diff --git a/src/test/run-pass/issue-1696.rs b/src/test/run-pass/issue-1696.rs index b06285b06a5e4..2257a75947dd1 100644 --- a/src/test/run-pass/issue-1696.rs +++ b/src/test/run-pass/issue-1696.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::HashMap; pub fn main() { diff --git a/src/test/run-pass/issue-1701.rs b/src/test/run-pass/issue-1701.rs index 49ee99b22a120..ddf1eaffd2c87 100644 --- a/src/test/run-pass/issue-1701.rs +++ b/src/test/run-pass/issue-1701.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum pattern { tabby, tortoiseshell, calico } enum breed { beagle, rottweiler, pug } type name = String; diff --git a/src/test/run-pass/issue-17068.rs b/src/test/run-pass/issue-17068.rs index 91264b4ac3f2b..c3aa07895f51f 100644 --- a/src/test/run-pass/issue-17068.rs +++ b/src/test/run-pass/issue-17068.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that regionck creates the right region links in the pattern // binding of a for loop diff --git a/src/test/run-pass/issue-17074.rs b/src/test/run-pass/issue-17074.rs index ec2d8f79781cc..1d77a5a434acd 100644 --- a/src/test/run-pass/issue-17074.rs +++ b/src/test/run-pass/issue-17074.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - static X2: u64 = !0 as u16 as u64; static Y2: u64 = !0 as u32 as u64; const X: u64 = !0 as u16 as u64; diff --git a/src/test/run-pass/issue-17121.rs b/src/test/run-pass/issue-17121.rs index 6eb813025ec13..79b0dc3116613 100644 --- a/src/test/run-pass/issue-17121.rs +++ b/src/test/run-pass/issue-17121.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 // ignore-cloudabi no std::fs diff --git a/src/test/run-pass/issue-17170.rs b/src/test/run-pass/issue-17170.rs index c786064ba01ae..ceea7b5211e78 100644 --- a/src/test/run-pass/issue-17170.rs +++ b/src/test/run-pass/issue-17170.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(repr_simd)] #[repr(simd)] diff --git a/src/test/run-pass/issue-17216.rs b/src/test/run-pass/issue-17216.rs index e713bbf127d8c..627aa41bc237f 100644 --- a/src/test/run-pass/issue-17216.rs +++ b/src/test/run-pass/issue-17216.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Leak<'a> { dropped: &'a mut bool } diff --git a/src/test/run-pass/issue-17233.rs b/src/test/run-pass/issue-17233.rs index e9f0c73e29db3..a8beab107629e 100644 --- a/src/test/run-pass/issue-17233.rs +++ b/src/test/run-pass/issue-17233.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - const X1: &'static [u8] = &[b'1']; const X2: &'static [u8] = b"1"; const X3: &'static [u8; 1] = &[b'1']; diff --git a/src/test/run-pass/issue-17302.rs b/src/test/run-pass/issue-17302.rs index 59625581167d0..76af34913a1ed 100644 --- a/src/test/run-pass/issue-17302.rs +++ b/src/test/run-pass/issue-17302.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - static mut DROPPED: [bool; 2] = [false, false]; struct A(usize); diff --git a/src/test/run-pass/issue-17322.rs b/src/test/run-pass/issue-17322.rs index c94345f794d17..69f01a9a093a2 100644 --- a/src/test/run-pass/issue-17322.rs +++ b/src/test/run-pass/issue-17322.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/issue-17336.rs b/src/test/run-pass/issue-17336.rs index ce04237081f71..bde7f9a914767 100644 --- a/src/test/run-pass/issue-17336.rs +++ b/src/test/run-pass/issue-17336.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[allow(dead_code)] fn check(a: &str) { let x = a as *const str; diff --git a/src/test/run-pass/issue-17351.rs b/src/test/run-pass/issue-17351.rs index 88f83a300a785..9563dbd1d7fdc 100644 --- a/src/test/run-pass/issue-17351.rs +++ b/src/test/run-pass/issue-17351.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait Str { fn foo(&self) {} } diff --git a/src/test/run-pass/issue-17361.rs b/src/test/run-pass/issue-17361.rs index 354b0861758c5..555c381370bca 100644 --- a/src/test/run-pass/issue-17361.rs +++ b/src/test/run-pass/issue-17361.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that astconv doesn't forget about mutability of &mut str // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-17450.rs b/src/test/run-pass/issue-17450.rs index 242d8c20cd759..cfb32a58d132b 100644 --- a/src/test/run-pass/issue-17450.rs +++ b/src/test/run-pass/issue-17450.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code, warnings)] static mut x: isize = 3; diff --git a/src/test/run-pass/issue-17503.rs b/src/test/run-pass/issue-17503.rs index 796277ce74d14..c2d685282e637 100644 --- a/src/test/run-pass/issue-17503.rs +++ b/src/test/run-pass/issue-17503.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let s: &[isize] = &[0, 1, 2, 3, 4]; let ss: &&[isize] = &s; diff --git a/src/test/run-pass/issue-17662.rs b/src/test/run-pass/issue-17662.rs index 320d108cfae74..19fc739a87d89 100644 --- a/src/test/run-pass/issue-17662.rs +++ b/src/test/run-pass/issue-17662.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-17662.rs diff --git a/src/test/run-pass/issue-17718-borrow-interior.rs b/src/test/run-pass/issue-17718-borrow-interior.rs index cafc037525782..01abc52069a66 100644 --- a/src/test/run-pass/issue-17718-borrow-interior.rs +++ b/src/test/run-pass/issue-17718-borrow-interior.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S { a: usize } static A: S = S { a: 3 }; diff --git a/src/test/run-pass/issue-17718-const-destructors.rs b/src/test/run-pass/issue-17718-const-destructors.rs index ca0b222050e21..50d71ab1a5389 100644 --- a/src/test/run-pass/issue-17718-const-destructors.rs +++ b/src/test/run-pass/issue-17718-const-destructors.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct A; impl Drop for A { fn drop(&mut self) {} diff --git a/src/test/run-pass/issue-17718-parse-const.rs b/src/test/run-pass/issue-17718-parse-const.rs index 9be92d6597850..59f271b4820e8 100644 --- a/src/test/run-pass/issue-17718-parse-const.rs +++ b/src/test/run-pass/issue-17718-parse-const.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - const FOO: usize = 3; fn main() { diff --git a/src/test/run-pass/issue-17718-static-unsafe-interior.rs b/src/test/run-pass/issue-17718-static-unsafe-interior.rs index 5f7629fa26777..c0509abdf6fa8 100644 --- a/src/test/run-pass/issue-17718-static-unsafe-interior.rs +++ b/src/test/run-pass/issue-17718-static-unsafe-interior.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 use std::marker; diff --git a/src/test/run-pass/issue-17718.rs b/src/test/run-pass/issue-17718.rs index 502e4a816640a..59194ea88545e 100644 --- a/src/test/run-pass/issue-17718.rs +++ b/src/test/run-pass/issue-17718.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-17718-aux.rs extern crate issue_17718_aux as other; diff --git a/src/test/run-pass/issue-17732.rs b/src/test/run-pass/issue-17732.rs index 9a678f00157e6..42d8f1ea445fc 100644 --- a/src/test/run-pass/issue-17732.rs +++ b/src/test/run-pass/issue-17732.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait Person { diff --git a/src/test/run-pass/issue-17734.rs b/src/test/run-pass/issue-17734.rs index 8178c1fd7c885..2d5bb51665887 100644 --- a/src/test/run-pass/issue-17734.rs +++ b/src/test/run-pass/issue-17734.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that generating drop glue for Box doesn't ICE diff --git a/src/test/run-pass/issue-17746.rs b/src/test/run-pass/issue-17746.rs index a66d5e102888c..632a45fd75bc9 100644 --- a/src/test/run-pass/issue-17746.rs +++ b/src/test/run-pass/issue-17746.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #17746 fn main() {} diff --git a/src/test/run-pass/issue-17756.rs b/src/test/run-pass/issue-17756.rs index 1b108463c748e..7f392ad3752e9 100644 --- a/src/test/run-pass/issue-17756.rs +++ b/src/test/run-pass/issue-17756.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const count : usize = 2 as usize; fn main() { let larger : [usize; count*2]; diff --git a/src/test/run-pass/issue-17771.rs b/src/test/run-pass/issue-17771.rs index fc821441330a5..10eb6c006d96b 100644 --- a/src/test/run-pass/issue-17771.rs +++ b/src/test/run-pass/issue-17771.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait Aaa { fn dummy(&self) { } } diff --git a/src/test/run-pass/issue-17816.rs b/src/test/run-pass/issue-17816.rs index a9aa4cdd4f69d..72fba17a49aea 100644 --- a/src/test/run-pass/issue-17816.rs +++ b/src/test/run-pass/issue-17816.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::marker::PhantomData; fn main() { diff --git a/src/test/run-pass/issue-17877.rs b/src/test/run-pass/issue-17877.rs index d3fe0903a1d64..dcf1b83486630 100644 --- a/src/test/run-pass/issue-17877.rs +++ b/src/test/run-pass/issue-17877.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(slice_patterns)] fn main() { diff --git a/src/test/run-pass/issue-17897.rs b/src/test/run-pass/issue-17897.rs index 82ecd63613036..4909d8f6a0c40 100644 --- a/src/test/run-pass/issue-17897.rs +++ b/src/test/run-pass/issue-17897.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn action(mut cb: Box usize>) -> usize { cb(1) } diff --git a/src/test/run-pass/issue-17904.rs b/src/test/run-pass/issue-17904.rs index 994001a82ce33..600e02ccea9d1 100644 --- a/src/test/run-pass/issue-17904.rs +++ b/src/test/run-pass/issue-17904.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we can parse where clauses on various forms of tuple // structs. diff --git a/src/test/run-pass/issue-18060.rs b/src/test/run-pass/issue-18060.rs index 322a3d8c9bb2e..303916b06bf47 100644 --- a/src/test/run-pass/issue-18060.rs +++ b/src/test/run-pass/issue-18060.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #18060: match arms were matching in the wrong order. fn main() { diff --git a/src/test/run-pass/issue-18075.rs b/src/test/run-pass/issue-18075.rs index 5f07ba2235fd5..bdbf14d8dd051 100644 --- a/src/test/run-pass/issue-18075.rs +++ b/src/test/run-pass/issue-18075.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // exec-env:RUST_LOG=rustc::middle=debug fn main() { diff --git a/src/test/run-pass/issue-18083.rs b/src/test/run-pass/issue-18083.rs index ff26e186db393..33ab53160b909 100644 --- a/src/test/run-pass/issue-18083.rs +++ b/src/test/run-pass/issue-18083.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // These crossed imports should resolve fine, and not block on // each other and be reported as unresolved. diff --git a/src/test/run-pass/issue-18088.rs b/src/test/run-pass/issue-18088.rs index a45256387d6c0..4cf48a36d0fa1 100644 --- a/src/test/run-pass/issue-18088.rs +++ b/src/test/run-pass/issue-18088.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub trait Indexable: std::ops::Index { fn index2(&self, i: usize) -> &T { &self[i] diff --git a/src/test/run-pass/issue-18110.rs b/src/test/run-pass/issue-18110.rs index eecdea66cf6f7..fc4de8a12a3e9 100644 --- a/src/test/run-pass/issue-18110.rs +++ b/src/test/run-pass/issue-18110.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn main() { diff --git a/src/test/run-pass/issue-18173.rs b/src/test/run-pass/issue-18173.rs index f4266fada32fc..8952f270ce35f 100644 --- a/src/test/run-pass/issue-18173.rs +++ b/src/test/run-pass/issue-18173.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { type T; } diff --git a/src/test/run-pass/issue-18188.rs b/src/test/run-pass/issue-18188.rs index 18088a5f3ec31..4b4d2d94e97b4 100644 --- a/src/test/run-pass/issue-18188.rs +++ b/src/test/run-pass/issue-18188.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub trait Promisable: Send + Sync {} diff --git a/src/test/run-pass/issue-1821.rs b/src/test/run-pass/issue-1821.rs index bdff5ba484dc8..6a7ea7031248a 100644 --- a/src/test/run-pass/issue-1821.rs +++ b/src/test/run-pass/issue-1821.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #1821 - Don't recurse trying to typecheck this diff --git a/src/test/run-pass/issue-18232.rs b/src/test/run-pass/issue-18232.rs index 376d6523ccb98..13ff8b7cf52b9 100644 --- a/src/test/run-pass/issue-18232.rs +++ b/src/test/run-pass/issue-18232.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct Cursor<'a>(::std::marker::PhantomData<&'a ()>); diff --git a/src/test/run-pass/issue-18352.rs b/src/test/run-pass/issue-18352.rs index cce6ba407a663..764237f45dc59 100644 --- a/src/test/run-pass/issue-18352.rs +++ b/src/test/run-pass/issue-18352.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - const X: &'static str = "12345"; fn test(s: String) -> bool { diff --git a/src/test/run-pass/issue-18353.rs b/src/test/run-pass/issue-18353.rs index 1386c9d0daa5b..2f687c964bdd8 100644 --- a/src/test/run-pass/issue-18353.rs +++ b/src/test/run-pass/issue-18353.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that wrapping an unsized struct in an enum which gets optimised does // not ICE. diff --git a/src/test/run-pass/issue-18412.rs b/src/test/run-pass/issue-18412.rs index 1017fab5ae2e0..c238c6f78d863 100644 --- a/src/test/run-pass/issue-18412.rs +++ b/src/test/run-pass/issue-18412.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that non-static methods can be assigned to local variables as // function pointers. diff --git a/src/test/run-pass/issue-18425.rs b/src/test/run-pass/issue-18425.rs index 797b319718217..d8094c3b74f64 100644 --- a/src/test/run-pass/issue-18425.rs +++ b/src/test/run-pass/issue-18425.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that codegen doesn't ICE when codegenning an array repeat // expression with a count of 1 and a non-Copy element type. diff --git a/src/test/run-pass/issue-18446.rs b/src/test/run-pass/issue-18446.rs index eb321e046dcbf..9d8d5c6e6b003 100644 --- a/src/test/run-pass/issue-18446.rs +++ b/src/test/run-pass/issue-18446.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that methods in trait impls should override default methods. trait T { diff --git a/src/test/run-pass/issue-18464.rs b/src/test/run-pass/issue-18464.rs index f4faab5e46853..37576d5838e48 100644 --- a/src/test/run-pass/issue-18464.rs +++ b/src/test/run-pass/issue-18464.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(dead_code)] const LOW_RANGE: char = '0'; diff --git a/src/test/run-pass/issue-18501.rs b/src/test/run-pass/issue-18501.rs index fb8158c6ddc60..503fae7baec39 100644 --- a/src/test/run-pass/issue-18501.rs +++ b/src/test/run-pass/issue-18501.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we don't ICE when inlining a function from another // crate that uses a trait method as a value due to incorrectly // translating the def ID of the trait during AST decoding. diff --git a/src/test/run-pass/issue-18514.rs b/src/test/run-pass/issue-18514.rs index f8bebb4a40beb..9f4b72fc6c4e6 100644 --- a/src/test/run-pass/issue-18514.rs +++ b/src/test/run-pass/issue-18514.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we don't ICE when codegenning a generic impl method from // an extern crate that contains a match expression on a local // variable place where one of the match case bodies contains an diff --git a/src/test/run-pass/issue-18539.rs b/src/test/run-pass/issue-18539.rs index 8de2d1e4259cf..31415379ea135 100644 --- a/src/test/run-pass/issue-18539.rs +++ b/src/test/run-pass/issue-18539.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that coercing bare fn's that return a zero sized type to // a closure doesn't cause an LLVM ERROR diff --git a/src/test/run-pass/issue-18652.rs b/src/test/run-pass/issue-18652.rs index 1eddc34f5b17f..fd7b74fdb81a8 100644 --- a/src/test/run-pass/issue-18652.rs +++ b/src/test/run-pass/issue-18652.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests multiple free variables being passed by value into an unboxed // once closure as an optimization by codegen. This used to hit an // incorrect assert. diff --git a/src/test/run-pass/issue-18655.rs b/src/test/run-pass/issue-18655.rs index cdb83ae5caa0b..c7362163ff87d 100644 --- a/src/test/run-pass/issue-18655.rs +++ b/src/test/run-pass/issue-18655.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Factory { type Product; fn create(&self) -> ::Product; diff --git a/src/test/run-pass/issue-1866.rs b/src/test/run-pass/issue-1866.rs index 2c346b93f5e80..cbceea0b7ef40 100644 --- a/src/test/run-pass/issue-1866.rs +++ b/src/test/run-pass/issue-1866.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 mod a { diff --git a/src/test/run-pass/issue-18661.rs b/src/test/run-pass/issue-18661.rs index 4287f449c6fd0..36209aab4f9a0 100644 --- a/src/test/run-pass/issue-18661.rs +++ b/src/test/run-pass/issue-18661.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that param substitutions from the correct environment are // used when codegenning unboxed closure calls. diff --git a/src/test/run-pass/issue-18685.rs b/src/test/run-pass/issue-18685.rs index b569dbc8062e4..564b192ab6d9e 100644 --- a/src/test/run-pass/issue-18685.rs +++ b/src/test/run-pass/issue-18685.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the self param space is not used in a conflicting // manner by unboxed closures within a default method on a trait diff --git a/src/test/run-pass/issue-18711.rs b/src/test/run-pass/issue-18711.rs index 8239d74d6df12..23a9687290053 100644 --- a/src/test/run-pass/issue-18711.rs +++ b/src/test/run-pass/issue-18711.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we don't panic on a RefCell borrow conflict in certain // code paths involving unboxed closures. diff --git a/src/test/run-pass/issue-18738.rs b/src/test/run-pass/issue-18738.rs index 819ec532ed2ce..7ed75374c3140 100644 --- a/src/test/run-pass/issue-18738.rs +++ b/src/test/run-pass/issue-18738.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Eq, PartialEq, PartialOrd, Ord)] enum Test<'a> { Int(&'a isize), diff --git a/src/test/run-pass/issue-18767.rs b/src/test/run-pass/issue-18767.rs index 264985b791e7f..ce9ddb45d8235 100644 --- a/src/test/run-pass/issue-18767.rs +++ b/src/test/run-pass/issue-18767.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that regionck uses the right memcat for patterns in for loops // and doesn't ICE. diff --git a/src/test/run-pass/issue-18804/auxiliary/lib.rs b/src/test/run-pass/issue-18804/auxiliary/lib.rs index 06d454b2c890a..ae27dd520e9f8 100644 --- a/src/test/run-pass/issue-18804/auxiliary/lib.rs +++ b/src/test/run-pass/issue-18804/auxiliary/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] #![feature(linkage)] diff --git a/src/test/run-pass/issue-18804/main.rs b/src/test/run-pass/issue-18804/main.rs index b5aa052034936..091fb3d7a78eb 100644 --- a/src/test/run-pass/issue-18804/main.rs +++ b/src/test/run-pass/issue-18804/main.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test for issue #18804, #[linkage] does not propagate thorugh generic // functions. Failure results in a linker error. diff --git a/src/test/run-pass/issue-18809.rs b/src/test/run-pass/issue-18809.rs index b646fa9e62dec..ab4f7aba31372 100644 --- a/src/test/run-pass/issue-18809.rs +++ b/src/test/run-pass/issue-18809.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Tup { type T0; type T1; diff --git a/src/test/run-pass/issue-18845.rs b/src/test/run-pass/issue-18845.rs index 241408ddef135..c5e399bafacb3 100644 --- a/src/test/run-pass/issue-18845.rs +++ b/src/test/run-pass/issue-18845.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This used to generate invalid IR in that even if we took the // `false` branch we'd still try to free the Box from the other // arm. This was due to treating `*Box::new(9)` as an rvalue datum diff --git a/src/test/run-pass/issue-18859.rs b/src/test/run-pass/issue-18859.rs index 7c7501d3420d2..53ce602f2a8e0 100644 --- a/src/test/run-pass/issue-18859.rs +++ b/src/test/run-pass/issue-18859.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - mod foo { pub mod bar { pub mod baz { diff --git a/src/test/run-pass/issue-18906.rs b/src/test/run-pass/issue-18906.rs index 7cc61dd253276..281e8f400d962 100644 --- a/src/test/run-pass/issue-18906.rs +++ b/src/test/run-pass/issue-18906.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub trait Borrow { diff --git a/src/test/run-pass/issue-18913.rs b/src/test/run-pass/issue-18913.rs index 9bb1371045e9a..022e17fd1dad7 100644 --- a/src/test/run-pass/issue-18913.rs +++ b/src/test/run-pass/issue-18913.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-18913-1.rs // aux-build:issue-18913-2.rs diff --git a/src/test/run-pass/issue-18937-1.rs b/src/test/run-pass/issue-18937-1.rs index 7a24d087b44e2..761fe51b5d4a3 100644 --- a/src/test/run-pass/issue-18937-1.rs +++ b/src/test/run-pass/issue-18937-1.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are able to type-check this example. In particular, // knowing that `T: 'a` allows us to deduce that `[U]: 'a` (because // when `T=[U]` it implies that `U: 'a`). diff --git a/src/test/run-pass/issue-18988.rs b/src/test/run-pass/issue-18988.rs index e41ac6bdbeb82..d242a53809290 100644 --- a/src/test/run-pass/issue-18988.rs +++ b/src/test/run-pass/issue-18988.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Foo : Send { } pub struct MyFoo { diff --git a/src/test/run-pass/issue-19001.rs b/src/test/run-pass/issue-19001.rs index 3340ed1ffd99c..9ed127a6c6b99 100644 --- a/src/test/run-pass/issue-19001.rs +++ b/src/test/run-pass/issue-19001.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // check that we handle recursive arrays correctly in `type_of` struct Loopy { diff --git a/src/test/run-pass/issue-19037.rs b/src/test/run-pass/issue-19037.rs index 0735693a4bd46..e07d95c6bbb6d 100644 --- a/src/test/run-pass/issue-19037.rs +++ b/src/test/run-pass/issue-19037.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct Str([u8]); diff --git a/src/test/run-pass/issue-19081.rs b/src/test/run-pass/issue-19081.rs index 8e2fa2b619715..12853c5bbed23 100644 --- a/src/test/run-pass/issue-19081.rs +++ b/src/test/run-pass/issue-19081.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Hasher { type State; diff --git a/src/test/run-pass/issue-19097.rs b/src/test/run-pass/issue-19097.rs index ca4b72f9e5bd0..1e68bf13af3a2 100644 --- a/src/test/run-pass/issue-19097.rs +++ b/src/test/run-pass/issue-19097.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // regression test for #19097 struct Foo(T); diff --git a/src/test/run-pass/issue-19098.rs b/src/test/run-pass/issue-19098.rs index e526dd2903e53..4b42371068099 100644 --- a/src/test/run-pass/issue-19098.rs +++ b/src/test/run-pass/issue-19098.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Handler { fn handle(&self, _: &mut String); } diff --git a/src/test/run-pass/issue-19102.rs b/src/test/run-pass/issue-19102.rs index da2af77921735..b456d26cd3960 100644 --- a/src/test/run-pass/issue-19102.rs +++ b/src/test/run-pass/issue-19102.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(unused_qualifications)] use self::A::B; diff --git a/src/test/run-pass/issue-19127.rs b/src/test/run-pass/issue-19127.rs index 8d169917cad92..175d465227b75 100644 --- a/src/test/run-pass/issue-19127.rs +++ b/src/test/run-pass/issue-19127.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn foo T>(f: F) {} diff --git a/src/test/run-pass/issue-19129-1.rs b/src/test/run-pass/issue-19129-1.rs index f9b605c44e918..909a779163bba 100644 --- a/src/test/run-pass/issue-19129-1.rs +++ b/src/test/run-pass/issue-19129-1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait Trait { diff --git a/src/test/run-pass/issue-19129-2.rs b/src/test/run-pass/issue-19129-2.rs index 47b8aaacdadb8..ce9e8e2e619cd 100644 --- a/src/test/run-pass/issue-19129-2.rs +++ b/src/test/run-pass/issue-19129-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait Trait { diff --git a/src/test/run-pass/issue-19135.rs b/src/test/run-pass/issue-19135.rs index ca2098138ef0c..35a8737ffebe9 100644 --- a/src/test/run-pass/issue-19135.rs +++ b/src/test/run-pass/issue-19135.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::marker::PhantomData; #[derive(Debug)] diff --git a/src/test/run-pass/issue-19244.rs b/src/test/run-pass/issue-19244.rs index 92ac2e37b90d2..b516e349fdacc 100644 --- a/src/test/run-pass/issue-19244.rs +++ b/src/test/run-pass/issue-19244.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct MyStruct { field: usize } struct Nested { nested: MyStruct } struct Mix2 { nested: ((usize,),) } diff --git a/src/test/run-pass/issue-19293.rs b/src/test/run-pass/issue-19293.rs index 95ca3efb099c7..2121e8c66dd40 100644 --- a/src/test/run-pass/issue-19293.rs +++ b/src/test/run-pass/issue-19293.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_19293.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-19340-1.rs b/src/test/run-pass/issue-19340-1.rs index e553c244c8653..d3849e43fc7f9 100644 --- a/src/test/run-pass/issue-19340-1.rs +++ b/src/test/run-pass/issue-19340-1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-19340-1.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-19340-2.rs b/src/test/run-pass/issue-19340-2.rs index d7747201cbe46..cdfe6f51353f6 100644 --- a/src/test/run-pass/issue-19340-2.rs +++ b/src/test/run-pass/issue-19340-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 enum Homura { diff --git a/src/test/run-pass/issue-19358.rs b/src/test/run-pass/issue-19358.rs index c0c210b3e96a4..bf110b28767ea 100644 --- a/src/test/run-pass/issue-19358.rs +++ b/src/test/run-pass/issue-19358.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Trait { fn dummy(&self) { } } #[derive(Debug)] diff --git a/src/test/run-pass/issue-19367.rs b/src/test/run-pass/issue-19367.rs index d5bb6ebb7de1f..f58bbd6845269 100644 --- a/src/test/run-pass/issue-19367.rs +++ b/src/test/run-pass/issue-19367.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S { o: Option } diff --git a/src/test/run-pass/issue-19398.rs b/src/test/run-pass/issue-19398.rs index 2dc5a6e99799a..d8f57ca0fa672 100644 --- a/src/test/run-pass/issue-19398.rs +++ b/src/test/run-pass/issue-19398.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait T { diff --git a/src/test/run-pass/issue-19404.rs b/src/test/run-pass/issue-19404.rs index c0f13b0b6c7ad..f3a57420682e3 100644 --- a/src/test/run-pass/issue-19404.rs +++ b/src/test/run-pass/issue-19404.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::any::TypeId; use std::rc::Rc; diff --git a/src/test/run-pass/issue-19479.rs b/src/test/run-pass/issue-19479.rs index 7557c1b44e0dc..5642d7e5df81f 100644 --- a/src/test/run-pass/issue-19479.rs +++ b/src/test/run-pass/issue-19479.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait Base { diff --git a/src/test/run-pass/issue-19499.rs b/src/test/run-pass/issue-19499.rs index 069ceadf91627..21bdb71717b87 100644 --- a/src/test/run-pass/issue-19499.rs +++ b/src/test/run-pass/issue-19499.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #19499. Due to incorrect caching of trait // results for closures with upvars whose types were not fully // computed, this rather bizarre little program (along with many more diff --git a/src/test/run-pass/issue-19631.rs b/src/test/run-pass/issue-19631.rs index 562d2e4169e66..f10eebdfcc81b 100644 --- a/src/test/run-pass/issue-19631.rs +++ b/src/test/run-pass/issue-19631.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait PoolManager { diff --git a/src/test/run-pass/issue-19632.rs b/src/test/run-pass/issue-19632.rs index 1cb20011c2145..652aa59ea15f7 100644 --- a/src/test/run-pass/issue-19632.rs +++ b/src/test/run-pass/issue-19632.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait PoolManager { diff --git a/src/test/run-pass/issue-1974.rs b/src/test/run-pass/issue-1974.rs index 7b33b4e7a4f39..e99c55aa5ebc9 100644 --- a/src/test/run-pass/issue-1974.rs +++ b/src/test/run-pass/issue-1974.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue 1974 // Don't double free the condition allocation // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-19811-escape-unicode.rs b/src/test/run-pass/issue-19811-escape-unicode.rs index b447ffd69b4c9..94afbf6f4d722 100644 --- a/src/test/run-pass/issue-19811-escape-unicode.rs +++ b/src/test/run-pass/issue-19811-escape-unicode.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn main() { let mut escaped = String::from(""); for c in '\u{10401}'.escape_unicode() { diff --git a/src/test/run-pass/issue-19850.rs b/src/test/run-pass/issue-19850.rs index 15ca6a9d4c1d2..7753790ec1835 100644 --- a/src/test/run-pass/issue-19850.rs +++ b/src/test/run-pass/issue-19850.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that `::Output` and `Self::Output` are accepted as type annotations in let // bindings diff --git a/src/test/run-pass/issue-19982.rs b/src/test/run-pass/issue-19982.rs index 30edf24e8b177..ed92392790cb0 100644 --- a/src/test/run-pass/issue-19982.rs +++ b/src/test/run-pass/issue-19982.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(fn_traits, unboxed_closures)] diff --git a/src/test/run-pass/issue-20009.rs b/src/test/run-pass/issue-20009.rs index 9d433eabe6297..b7cedd6cc5309 100644 --- a/src/test/run-pass/issue-20009.rs +++ b/src/test/run-pass/issue-20009.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that associated types are `Sized` // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-20055-box-trait.rs b/src/test/run-pass/issue-20055-box-trait.rs index 7e89cfe24e16a..ebcc78983c050 100644 --- a/src/test/run-pass/issue-20055-box-trait.rs +++ b/src/test/run-pass/issue-20055-box-trait.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // See Issues #20055 and #21695. // We are checking here that the temporaries `Box<[i8, k]>`, for `k` diff --git a/src/test/run-pass/issue-20055-box-unsized-array.rs b/src/test/run-pass/issue-20055-box-unsized-array.rs index 5af5186e94f37..76dad71c097fd 100644 --- a/src/test/run-pass/issue-20055-box-unsized-array.rs +++ b/src/test/run-pass/issue-20055-box-unsized-array.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #2005: Check that boxed fixed-size arrays are properly // accounted for (namely, only deallocated if they were actually // created) when they appear as temporaries in unused arms of a match diff --git a/src/test/run-pass/issue-20091.rs b/src/test/run-pass/issue-20091.rs index 7671b43d493e1..1c20e8e6306ec 100644 --- a/src/test/run-pass/issue-20091.rs +++ b/src/test/run-pass/issue-20091.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/issue-20174.rs b/src/test/run-pass/issue-20174.rs index 072738812727c..edd0756ae3cbb 100644 --- a/src/test/run-pass/issue-20174.rs +++ b/src/test/run-pass/issue-20174.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct GradFn usize>(F); fn main() { diff --git a/src/test/run-pass/issue-20186.rs b/src/test/run-pass/issue-20186.rs index b3895e36a19a5..fede14d3949a6 100644 --- a/src/test/run-pass/issue-20186.rs +++ b/src/test/run-pass/issue-20186.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo; impl Foo { diff --git a/src/test/run-pass/issue-20313.rs b/src/test/run-pass/issue-20313.rs index 0e5eaf857f35c..0925b9d4b870a 100644 --- a/src/test/run-pass/issue-20313.rs +++ b/src/test/run-pass/issue-20313.rs @@ -1,12 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // pretty-expanded FIXME #23616 #![feature(link_llvm_intrinsics)] diff --git a/src/test/run-pass/issue-20343.rs b/src/test/run-pass/issue-20343.rs index 70064f4e2670c..a36915602a37e 100644 --- a/src/test/run-pass/issue-20343.rs +++ b/src/test/run-pass/issue-20343.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for Issue #20343. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-20389.rs b/src/test/run-pass/issue-20389.rs index 03c7e9f8db72b..17e84acefeba8 100644 --- a/src/test/run-pass/issue-20389.rs +++ b/src/test/run-pass/issue-20389.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_20389.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-20396.rs b/src/test/run-pass/issue-20396.rs index f607ed373b344..b9af0fe617ac0 100644 --- a/src/test/run-pass/issue-20396.rs +++ b/src/test/run-pass/issue-20396.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![allow(dead_code)] diff --git a/src/test/run-pass/issue-20414.rs b/src/test/run-pass/issue-20414.rs index d2e2d9bd6efcf..497e97937315c 100644 --- a/src/test/run-pass/issue-20414.rs +++ b/src/test/run-pass/issue-20414.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait Trait { diff --git a/src/test/run-pass/issue-20427.rs b/src/test/run-pass/issue-20427.rs index 985ca067350a3..6a8bea85a7c50 100644 --- a/src/test/run-pass/issue-20427.rs +++ b/src/test/run-pass/issue-20427.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:i8.rs // ignore-pretty issue #37201 diff --git a/src/test/run-pass/issue-20454.rs b/src/test/run-pass/issue-20454.rs index 15cb79ac6a86f..0a85af0a919ca 100644 --- a/src/test/run-pass/issue-20454.rs +++ b/src/test/run-pass/issue-20454.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::thread; fn _foo() { diff --git a/src/test/run-pass/issue-20544.rs b/src/test/run-pass/issue-20544.rs index 322c326ef0d62..5fc2543367445 100644 --- a/src/test/run-pass/issue-20544.rs +++ b/src/test/run-pass/issue-20544.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unboxed_closures)] #![feature(fn_traits)] diff --git a/src/test/run-pass/issue-20575.rs b/src/test/run-pass/issue-20575.rs index 7db7e3b28e8e6..f611e0a8edd3c 100644 --- a/src/test/run-pass/issue-20575.rs +++ b/src/test/run-pass/issue-20575.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that overloaded calls work with zero arity closures // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-20616.rs b/src/test/run-pass/issue-20616.rs index 5727f54cd7046..465abc615060d 100644 --- a/src/test/run-pass/issue-20616.rs +++ b/src/test/run-pass/issue-20616.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - type MyType<'a, T> = &'a T; // combine lifetime bounds and type arguments in usual way diff --git a/src/test/run-pass/issue-2063-resource.rs b/src/test/run-pass/issue-2063-resource.rs index c3a0dc67e83ed..d950ed02b06a8 100644 --- a/src/test/run-pass/issue-2063-resource.rs +++ b/src/test/run-pass/issue-2063-resource.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // test that autoderef of a type like this does not // cause compiler to loop. Note that no instances // of such a type could ever be constructed. diff --git a/src/test/run-pass/issue-2063.rs b/src/test/run-pass/issue-2063.rs index 5be4f8e8e7384..06f7d7ab3062a 100644 --- a/src/test/run-pass/issue-2063.rs +++ b/src/test/run-pass/issue-2063.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // test that autoderef of a type like this does not // cause compiler to loop. Note that no instances // of such a type could ever be constructed. diff --git a/src/test/run-pass/issue-20644.rs b/src/test/run-pass/issue-20644.rs index 65a67d0b41a72..d90d1acdb4fcc 100644 --- a/src/test/run-pass/issue-20644.rs +++ b/src/test/run-pass/issue-20644.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // A reduced version of the rustbook ice. The problem this encountered // had to do with codegen ignoring binders. diff --git a/src/test/run-pass/issue-20676.rs b/src/test/run-pass/issue-20676.rs index a30162274139b..a2c86100051d6 100644 --- a/src/test/run-pass/issue-20676.rs +++ b/src/test/run-pass/issue-20676.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #20676. Error was that we didn't support // UFCS-style calls to a method in `Trait` where `Self` was bound to a // trait object of type `Trait`. See also `ufcs-trait-object.rs`. diff --git a/src/test/run-pass/issue-2074.rs b/src/test/run-pass/issue-2074.rs index bd844b7720c86..b802bed329cff 100644 --- a/src/test/run-pass/issue-2074.rs +++ b/src/test/run-pass/issue-2074.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![allow(non_camel_case_types)] diff --git a/src/test/run-pass/issue-20763-1.rs b/src/test/run-pass/issue-20763-1.rs index 98270099df904..90b772cf3dd97 100644 --- a/src/test/run-pass/issue-20763-1.rs +++ b/src/test/run-pass/issue-20763-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait T0 { diff --git a/src/test/run-pass/issue-20763-2.rs b/src/test/run-pass/issue-20763-2.rs index 340670b412036..6877fe39bf91b 100644 --- a/src/test/run-pass/issue-20763-2.rs +++ b/src/test/run-pass/issue-20763-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait T0 { diff --git a/src/test/run-pass/issue-20797.rs b/src/test/run-pass/issue-20797.rs index 3a4be580fc3e6..d91d887e718b8 100644 --- a/src/test/run-pass/issue-20797.rs +++ b/src/test/run-pass/issue-20797.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no std::fs // Regression test for #20797. diff --git a/src/test/run-pass/issue-20803.rs b/src/test/run-pass/issue-20803.rs index 2c00510ba97e0..b3c7616211b51 100644 --- a/src/test/run-pass/issue-20803.rs +++ b/src/test/run-pass/issue-20803.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::Add; fn foo(x: T) -> >::Output where i32: Add { diff --git a/src/test/run-pass/issue-20823.rs b/src/test/run-pass/issue-20823.rs index 4d31d0cedb6d5..b9b446ba8f05f 100644 --- a/src/test/run-pass/issue-20823.rs +++ b/src/test/run-pass/issue-20823.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --test #![deny(unstable)] diff --git a/src/test/run-pass/issue-20825.rs b/src/test/run-pass/issue-20825.rs index 3c76b4bedff60..7b84fddd4f7df 100644 --- a/src/test/run-pass/issue-20825.rs +++ b/src/test/run-pass/issue-20825.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Subscriber { type Input; } diff --git a/src/test/run-pass/issue-20847.rs b/src/test/run-pass/issue-20847.rs index d2c335605458b..a36812cb778b1 100644 --- a/src/test/run-pass/issue-20847.rs +++ b/src/test/run-pass/issue-20847.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(fn_traits)] use std::ops::Fn; diff --git a/src/test/run-pass/issue-20953.rs b/src/test/run-pass/issue-20953.rs index 647302bbc9304..145101a2511d6 100644 --- a/src/test/run-pass/issue-20953.rs +++ b/src/test/run-pass/issue-20953.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let mut shrinker: Box> = Box::new(vec![1].into_iter()); println!("{:?}", shrinker.next()); diff --git a/src/test/run-pass/issue-21033.rs b/src/test/run-pass/issue-21033.rs index 00e792c9a006c..f3dc7df4d75ac 100644 --- a/src/test/run-pass/issue-21033.rs +++ b/src/test/run-pass/issue-21033.rs @@ -1,12 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // pretty-expanded FIXME #23616 #![feature(box_patterns)] diff --git a/src/test/run-pass/issue-21058.rs b/src/test/run-pass/issue-21058.rs index 862439e21f4f3..649649efa5630 100644 --- a/src/test/run-pass/issue-21058.rs +++ b/src/test/run-pass/issue-21058.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(core_intrinsics)] struct NT(str); diff --git a/src/test/run-pass/issue-21140.rs b/src/test/run-pass/issue-21140.rs index c19f3327fbb41..7b4287a806534 100644 --- a/src/test/run-pass/issue-21140.rs +++ b/src/test/run-pass/issue-21140.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Trait where Self::Out: std::fmt::Display { type Out; } diff --git a/src/test/run-pass/issue-21174.rs b/src/test/run-pass/issue-21174.rs index 6c0280de36d02..52ca32f7aca55 100644 --- a/src/test/run-pass/issue-21174.rs +++ b/src/test/run-pass/issue-21174.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Trait<'a> { type A; type B; diff --git a/src/test/run-pass/issue-21245.rs b/src/test/run-pass/issue-21245.rs index e3340d9767d02..04f6b21851a6d 100644 --- a/src/test/run-pass/issue-21245.rs +++ b/src/test/run-pass/issue-21245.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #21245. Check that we are able to infer // the types in these examples correctly. It used to be that // insufficient type propagation caused the type of the iterator to be diff --git a/src/test/run-pass/issue-21291.rs b/src/test/run-pass/issue-21291.rs index 6b45a4d0a5207..f65531b1b86c5 100644 --- a/src/test/run-pass/issue-21291.rs +++ b/src/test/run-pass/issue-21291.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support // Regression test for unwrapping the result of `join`, issue #21291 diff --git a/src/test/run-pass/issue-21306.rs b/src/test/run-pass/issue-21306.rs index bc2c7f09374fa..c78b8053be665 100644 --- a/src/test/run-pass/issue-21306.rs +++ b/src/test/run-pass/issue-21306.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::sync::Arc; fn main() { diff --git a/src/test/run-pass/issue-21361.rs b/src/test/run-pass/issue-21361.rs index b89e07ef31f0b..a2d72924bd276 100644 --- a/src/test/run-pass/issue-21361.rs +++ b/src/test/run-pass/issue-21361.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn main() { let v = vec![1, 2, 3]; let boxed: Box> = Box::new(v.into_iter()); diff --git a/src/test/run-pass/issue-21363.rs b/src/test/run-pass/issue-21363.rs index 608c60d03b3e7..7ab623308a3db 100644 --- a/src/test/run-pass/issue-21363.rs +++ b/src/test/run-pass/issue-21363.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![no_implicit_prelude] diff --git a/src/test/run-pass/issue-21384.rs b/src/test/run-pass/issue-21384.rs index 2ef66809a8d80..b81c0bb7a526b 100644 --- a/src/test/run-pass/issue-21384.rs +++ b/src/test/run-pass/issue-21384.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use ::std::ops::RangeFull; fn test(arg: T) -> T { diff --git a/src/test/run-pass/issue-21400.rs b/src/test/run-pass/issue-21400.rs index 6715b71a5f506..09932bfa9ba2e 100644 --- a/src/test/run-pass/issue-21400.rs +++ b/src/test/run-pass/issue-21400.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #21400 which itself was extracted from // stackoverflow.com/questions/28031155/is-my-borrow-checker-drunk/28031580 diff --git a/src/test/run-pass/issue-21402.rs b/src/test/run-pass/issue-21402.rs index 7fd329da2b72a..31476ac67f325 100644 --- a/src/test/run-pass/issue-21402.rs +++ b/src/test/run-pass/issue-21402.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #[derive(Hash)] diff --git a/src/test/run-pass/issue-21475.rs b/src/test/run-pass/issue-21475.rs index 99839b56506f9..ca8024a17e921 100644 --- a/src/test/run-pass/issue-21475.rs +++ b/src/test/run-pass/issue-21475.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 use m::{START, END}; diff --git a/src/test/run-pass/issue-21486.rs b/src/test/run-pass/issue-21486.rs index a61f294465d98..f5bdc51eb0c45 100644 --- a/src/test/run-pass/issue-21486.rs +++ b/src/test/run-pass/issue-21486.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #21486: Make sure that all structures are dropped, even when // created via FRU and control-flow breaks in the middle of // construction. diff --git a/src/test/run-pass/issue-21520.rs b/src/test/run-pass/issue-21520.rs index b512fd4919356..2450a68b8910b 100644 --- a/src/test/run-pass/issue-21520.rs +++ b/src/test/run-pass/issue-21520.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the requirement (in `Bar`) that `T::Bar : 'static` does // not wind up propagating to `T`. diff --git a/src/test/run-pass/issue-21562.rs b/src/test/run-pass/issue-21562.rs index 51896786d0c35..6d68ef8b83f01 100644 --- a/src/test/run-pass/issue-21562.rs +++ b/src/test/run-pass/issue-21562.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate core; use core::marker::Sync; diff --git a/src/test/run-pass/issue-21622.rs b/src/test/run-pass/issue-21622.rs index 32f52308af162..9cb6e4c14c292 100644 --- a/src/test/run-pass/issue-21622.rs +++ b/src/test/run-pass/issue-21622.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct Index; impl Index { diff --git a/src/test/run-pass/issue-21634.rs b/src/test/run-pass/issue-21634.rs index 08cc993ce4fb2..8b1ffa74d5478 100644 --- a/src/test/run-pass/issue-21634.rs +++ b/src/test/run-pass/issue-21634.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(cfg_target_feature)] #[cfg(any(not(target_arch = "x86"), target_feature = "sse2"))] diff --git a/src/test/run-pass/issue-21655.rs b/src/test/run-pass/issue-21655.rs index bf01873bea5e7..9cd7d0aee0d21 100644 --- a/src/test/run-pass/issue-21655.rs +++ b/src/test/run-pass/issue-21655.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn test(it: &mut Iterator) { for x in it { assert_eq!(x, 1) diff --git a/src/test/run-pass/issue-21721.rs b/src/test/run-pass/issue-21721.rs index d1fc61ff6a5d4..40dde0efbada0 100644 --- a/src/test/run-pass/issue-21721.rs +++ b/src/test/run-pass/issue-21721.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn main() { static NONE: Option<((), &'static u8)> = None; let ptr = unsafe { diff --git a/src/test/run-pass/issue-21726.rs b/src/test/run-pass/issue-21726.rs index 9fdd89e25a194..2db87ac2bfb06 100644 --- a/src/test/run-pass/issue-21726.rs +++ b/src/test/run-pass/issue-21726.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #21726: an issue arose around the rules for // subtyping of projection types that resulted in an unconstrained // region, yielding region inference failures. diff --git a/src/test/run-pass/issue-21891.rs b/src/test/run-pass/issue-21891.rs index 0e35de7cdcbaf..7f80089bd88c2 100644 --- a/src/test/run-pass/issue-21891.rs +++ b/src/test/run-pass/issue-21891.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 static foo: [usize; 3] = [1, 2, 3]; diff --git a/src/test/run-pass/issue-2190-1.rs b/src/test/run-pass/issue-2190-1.rs index 8cc23c883ed6a..ad15c7e7e7bbf 100644 --- a/src/test/run-pass/issue-2190-1.rs +++ b/src/test/run-pass/issue-2190-1.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 // ignore-emscripten no threads diff --git a/src/test/run-pass/issue-21909.rs b/src/test/run-pass/issue-21909.rs index 6a5d76de8d3f8..0baf1c5038a41 100644 --- a/src/test/run-pass/issue-21909.rs +++ b/src/test/run-pass/issue-21909.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait A { diff --git a/src/test/run-pass/issue-21922.rs b/src/test/run-pass/issue-21922.rs index 2f538b365e127..70a296145c5a2 100644 --- a/src/test/run-pass/issue-21922.rs +++ b/src/test/run-pass/issue-21922.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::Add; fn show(z: i32) { println!("{}", z) diff --git a/src/test/run-pass/issue-22008.rs b/src/test/run-pass/issue-22008.rs index 3e145122e5aeb..3d9579462c3b5 100644 --- a/src/test/run-pass/issue-22008.rs +++ b/src/test/run-pass/issue-22008.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { let command = "a"; diff --git a/src/test/run-pass/issue-22036.rs b/src/test/run-pass/issue-22036.rs index 43fb286f0ec40..3d96624d4cbfa 100644 --- a/src/test/run-pass/issue-22036.rs +++ b/src/test/run-pass/issue-22036.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait DigitCollection: Sized { type Iter: Iterator; fn digit_iter(self) -> Self::Iter; diff --git a/src/test/run-pass/issue-22066.rs b/src/test/run-pass/issue-22066.rs index c2486f0dcb498..9461b17e77ad0 100644 --- a/src/test/run-pass/issue-22066.rs +++ b/src/test/run-pass/issue-22066.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait LineFormatter<'a> { type Iter: Iterator + 'a; fn iter(&'a self, line: &'a str) -> Self::Iter; diff --git a/src/test/run-pass/issue-2214.rs b/src/test/run-pass/issue-2214.rs index a87af59ee7982..950cdc6e823c1 100644 --- a/src/test/run-pass/issue-2214.rs +++ b/src/test/run-pass/issue-2214.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare no libc to test ffi with #![feature(libc)] diff --git a/src/test/run-pass/issue-2216.rs b/src/test/run-pass/issue-2216.rs index c2f74a9d65300..b169066c1572f 100644 --- a/src/test/run-pass/issue-2216.rs +++ b/src/test/run-pass/issue-2216.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { let mut x = 0; diff --git a/src/test/run-pass/issue-22258.rs b/src/test/run-pass/issue-22258.rs index f749131345ea5..4c5965dfcc8be 100644 --- a/src/test/run-pass/issue-22258.rs +++ b/src/test/run-pass/issue-22258.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::Add; fn f(a: T, b: T) -> ::Output { diff --git a/src/test/run-pass/issue-22346.rs b/src/test/run-pass/issue-22346.rs index 895b9d222a856..dcbbff12be6e9 100644 --- a/src/test/run-pass/issue-22346.rs +++ b/src/test/run-pass/issue-22346.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 // This used to cause an ICE because the retslot for the "return" had the wrong type diff --git a/src/test/run-pass/issue-22356.rs b/src/test/run-pass/issue-22356.rs index 51a871d59b361..a900af5002d70 100644 --- a/src/test/run-pass/issue-22356.rs +++ b/src/test/run-pass/issue-22356.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 use std::marker::PhantomData; diff --git a/src/test/run-pass/issue-22375.rs b/src/test/run-pass/issue-22375.rs index c6e941d844d00..376b6bc0822b4 100644 --- a/src/test/run-pass/issue-22375.rs +++ b/src/test/run-pass/issue-22375.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait A> {} fn main() {} diff --git a/src/test/run-pass/issue-22403.rs b/src/test/run-pass/issue-22403.rs index 7bd66e5a83d46..9d898e7915409 100644 --- a/src/test/run-pass/issue-22403.rs +++ b/src/test/run-pass/issue-22403.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = Box::new([1, 2, 3]); let y = x as Box<[i32]>; diff --git a/src/test/run-pass/issue-22426.rs b/src/test/run-pass/issue-22426.rs index ad6ade4c59f12..98816de8578b5 100644 --- a/src/test/run-pass/issue-22426.rs +++ b/src/test/run-pass/issue-22426.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn main() { diff --git a/src/test/run-pass/issue-22463.rs b/src/test/run-pass/issue-22463.rs index 3aeb92f0becc9..43d3010d5f093 100644 --- a/src/test/run-pass/issue-22463.rs +++ b/src/test/run-pass/issue-22463.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! items { () => { type A = (); diff --git a/src/test/run-pass/issue-22471.rs b/src/test/run-pass/issue-22471.rs index 1e7084b1ab342..f1d3ff3936de1 100644 --- a/src/test/run-pass/issue-22471.rs +++ b/src/test/run-pass/issue-22471.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - type Foo where T: Copy = Box; fn main(){} diff --git a/src/test/run-pass/issue-22536-copy-mustnt-zero.rs b/src/test/run-pass/issue-22536-copy-mustnt-zero.rs index af99b11c2534f..de25ef38b5a15 100644 --- a/src/test/run-pass/issue-22536-copy-mustnt-zero.rs +++ b/src/test/run-pass/issue-22536-copy-mustnt-zero.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for Issue #22536: If a type implements Copy, then // moving it must not zero the original memory. diff --git a/src/test/run-pass/issue-22546.rs b/src/test/run-pass/issue-22546.rs index 8516d344e1cdc..d38e36a46d090 100644 --- a/src/test/run-pass/issue-22546.rs +++ b/src/test/run-pass/issue-22546.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Parsing patterns with paths with type parameters (issue #22544) use std::default::Default; diff --git a/src/test/run-pass/issue-22577.rs b/src/test/run-pass/issue-22577.rs index 83ffdb3bf4424..4bf4c3e1f2374 100644 --- a/src/test/run-pass/issue-22577.rs +++ b/src/test/run-pass/issue-22577.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 // ignore-cloudabi no std::fs diff --git a/src/test/run-pass/issue-22629.rs b/src/test/run-pass/issue-22629.rs index 07ca79295bf5c..5664bdcb2869c 100644 --- a/src/test/run-pass/issue-22629.rs +++ b/src/test/run-pass/issue-22629.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test transitive analysis for associated types. Collected types // should be normalized and new obligations generated. diff --git a/src/test/run-pass/issue-22777.rs b/src/test/run-pass/issue-22777.rs index 4df46c0e2e1e7..a644e678bcf77 100644 --- a/src/test/run-pass/issue-22777.rs +++ b/src/test/run-pass/issue-22777.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test is reduced from libsyntax. It is just checking that we // can successfully deal with a "deep" structure, which the drop-check // was hitting a recursion limit on at one point. diff --git a/src/test/run-pass/issue-22781.rs b/src/test/run-pass/issue-22781.rs index 1aa32f201422c..4f52f36105b05 100644 --- a/src/test/run-pass/issue-22781.rs +++ b/src/test/run-pass/issue-22781.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::HashMap; use std::collections::hash_map::Entry::Vacant; diff --git a/src/test/run-pass/issue-22814.rs b/src/test/run-pass/issue-22814.rs index 6afcd77074644..e7a791d8d254c 100644 --- a/src/test/run-pass/issue-22814.rs +++ b/src/test/run-pass/issue-22814.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Test {} macro_rules! test { diff --git a/src/test/run-pass/issue-22828.rs b/src/test/run-pass/issue-22828.rs index d6a4d7834dfce..49beaa1aebb0f 100644 --- a/src/test/run-pass/issue-22828.rs +++ b/src/test/run-pass/issue-22828.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test transitive analysis for associated types. Collected types // should be normalized and new obligations generated. diff --git a/src/test/run-pass/issue-2284.rs b/src/test/run-pass/issue-2284.rs index d606c52607ab0..bd9e998f06029 100644 --- a/src/test/run-pass/issue-2284.rs +++ b/src/test/run-pass/issue-2284.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait Send { diff --git a/src/test/run-pass/issue-22864-1.rs b/src/test/run-pass/issue-22864-1.rs index df1e3c5de520f..75645fbe9b4f9 100644 --- a/src/test/run-pass/issue-22864-1.rs +++ b/src/test/run-pass/issue-22864-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { struct Fun(F); let f = Fun(|x| 3*x); diff --git a/src/test/run-pass/issue-22864-2.rs b/src/test/run-pass/issue-22864-2.rs index f9360af011bc9..fb1df4edf42ed 100644 --- a/src/test/run-pass/issue-22864-2.rs +++ b/src/test/run-pass/issue-22864-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support pub fn main() { diff --git a/src/test/run-pass/issue-2288.rs b/src/test/run-pass/issue-2288.rs index b8353ea441366..e2500b6bbc35a 100644 --- a/src/test/run-pass/issue-2288.rs +++ b/src/test/run-pass/issue-2288.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] trait clam { diff --git a/src/test/run-pass/issue-22894.rs b/src/test/run-pass/issue-22894.rs index 8acd88deef2d0..883c4915bccc1 100644 --- a/src/test/run-pass/issue-22894.rs +++ b/src/test/run-pass/issue-22894.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[allow(dead_code)] static X: &'static str = &*""; fn main() {} diff --git a/src/test/run-pass/issue-22992-2.rs b/src/test/run-pass/issue-22992-2.rs index 070d4d11759f9..1df4b78f9782b 100644 --- a/src/test/run-pass/issue-22992-2.rs +++ b/src/test/run-pass/issue-22992-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct A(B); struct B; diff --git a/src/test/run-pass/issue-22992.rs b/src/test/run-pass/issue-22992.rs index dc612fc0bc71c..c7a5e10c15a41 100644 --- a/src/test/run-pass/issue-22992.rs +++ b/src/test/run-pass/issue-22992.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty issue #37201 struct X { val: i32 } diff --git a/src/test/run-pass/issue-23036.rs b/src/test/run-pass/issue-23036.rs index c3c9ede5adaf3..2d9e111c1a557 100644 --- a/src/test/run-pass/issue-23036.rs +++ b/src/test/run-pass/issue-23036.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no std::path use std::collections::HashMap; diff --git a/src/test/run-pass/issue-2311-2.rs b/src/test/run-pass/issue-2311-2.rs index a47c151255270..1f9c18fb13a26 100644 --- a/src/test/run-pass/issue-2311-2.rs +++ b/src/test/run-pass/issue-2311-2.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait clam { fn get(self) -> A; } diff --git a/src/test/run-pass/issue-2311.rs b/src/test/run-pass/issue-2311.rs index 5a086fd6fc2dc..46f3a4fb61aac 100644 --- a/src/test/run-pass/issue-2311.rs +++ b/src/test/run-pass/issue-2311.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait clam { fn get(self) -> A; } diff --git a/src/test/run-pass/issue-2312.rs b/src/test/run-pass/issue-2312.rs index 6f479c621170e..30a54c4414dc4 100644 --- a/src/test/run-pass/issue-2312.rs +++ b/src/test/run-pass/issue-2312.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Testing that the B's are resolved diff --git a/src/test/run-pass/issue-2316-c.rs b/src/test/run-pass/issue-2316-c.rs index 158e4570f2c70..37137425b6d66 100644 --- a/src/test/run-pass/issue-2316-c.rs +++ b/src/test/run-pass/issue-2316-c.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_2316_a.rs // aux-build:issue_2316_b.rs diff --git a/src/test/run-pass/issue-23208.rs b/src/test/run-pass/issue-23208.rs index ee3c16be73166..cc7d208b45b27 100644 --- a/src/test/run-pass/issue-23208.rs +++ b/src/test/run-pass/issue-23208.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait TheTrait : TheSuperTrait<::Item> { type Item; } diff --git a/src/test/run-pass/issue-23261.rs b/src/test/run-pass/issue-23261.rs index fc806f5429a47..3e1aa295af1ea 100644 --- a/src/test/run-pass/issue-23261.rs +++ b/src/test/run-pass/issue-23261.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Matching on a DST struct should not trigger an LLVM assertion. struct Foo { diff --git a/src/test/run-pass/issue-23304-1.rs b/src/test/run-pass/issue-23304-1.rs index ec6cf5a5628dc..e525bb2713722 100644 --- a/src/test/run-pass/issue-23304-1.rs +++ b/src/test/run-pass/issue-23304-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] #[repr(u8)] diff --git a/src/test/run-pass/issue-23304-2.rs b/src/test/run-pass/issue-23304-2.rs index 5989b7e9c6ad8..20e663b20ea79 100644 --- a/src/test/run-pass/issue-23304-2.rs +++ b/src/test/run-pass/issue-23304-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] enum X { A = 42 as isize } diff --git a/src/test/run-pass/issue-23311.rs b/src/test/run-pass/issue-23311.rs index fc286184dcb35..14765bf1e6dbe 100644 --- a/src/test/run-pass/issue-23311.rs +++ b/src/test/run-pass/issue-23311.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we do not ICE when pattern matching an array against a slice. #![feature(slice_patterns)] diff --git a/src/test/run-pass/issue-23336.rs b/src/test/run-pass/issue-23336.rs index 21e5129844498..9e1949d864575 100644 --- a/src/test/run-pass/issue-23336.rs +++ b/src/test/run-pass/issue-23336.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Data { fn doit(&self) {} } impl Data for T {} pub trait UnaryLogic { type D: Data; } diff --git a/src/test/run-pass/issue-23338-ensure-param-drop-order.rs b/src/test/run-pass/issue-23338-ensure-param-drop-order.rs index 42c72e647fd2e..dea6a4f181a40 100644 --- a/src/test/run-pass/issue-23338-ensure-param-drop-order.rs +++ b/src/test/run-pass/issue-23338-ensure-param-drop-order.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty issue #37201 // This test is ensuring that parameters are indeed dropped after diff --git a/src/test/run-pass/issue-23338-params-outlive-temps-of-body.rs b/src/test/run-pass/issue-23338-params-outlive-temps-of-body.rs index cb9e852e52692..24c4f7b467115 100644 --- a/src/test/run-pass/issue-23338-params-outlive-temps-of-body.rs +++ b/src/test/run-pass/issue-23338-params-outlive-temps-of-body.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This is largely checking that we now accept code where temp values // are borrowing from the input parameters (the `foo` case below). // diff --git a/src/test/run-pass/issue-23406.rs b/src/test/run-pass/issue-23406.rs index c3c1b755af833..ef0b04b531ab5 100644 --- a/src/test/run-pass/issue-23406.rs +++ b/src/test/run-pass/issue-23406.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Inner { type T; } diff --git a/src/test/run-pass/issue-23433.rs b/src/test/run-pass/issue-23433.rs index 9547b2f08a6bc..69d6880b52ffc 100644 --- a/src/test/run-pass/issue-23433.rs +++ b/src/test/run-pass/issue-23433.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Don't fail if we encounter a NonNull where T is an unsized type use std::ptr::NonNull; diff --git a/src/test/run-pass/issue-23442.rs b/src/test/run-pass/issue-23442.rs index 88b5a92620b75..8d8b0904f84f7 100644 --- a/src/test/run-pass/issue-23442.rs +++ b/src/test/run-pass/issue-23442.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::marker::PhantomData; pub struct UnionedKeys<'a,K> diff --git a/src/test/run-pass/issue-23477.rs b/src/test/run-pass/issue-23477.rs index d4671c919b751..fa7a9d6fdf837 100644 --- a/src/test/run-pass/issue-23477.rs +++ b/src/test/run-pass/issue-23477.rs @@ -1,12 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // compiler-flags: -g pub struct Dst { diff --git a/src/test/run-pass/issue-23485.rs b/src/test/run-pass/issue-23485.rs index f176c60346b14..0e5b1ed5dd473 100644 --- a/src/test/run-pass/issue-23485.rs +++ b/src/test/run-pass/issue-23485.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test for an ICE that occurred when a default method implementation // was applied to a type that did not meet the prerequisites. The // problem occurred specifically because normalizing diff --git a/src/test/run-pass/issue-23491.rs b/src/test/run-pass/issue-23491.rs index 5ec228217ed7f..32e2b7f206935 100644 --- a/src/test/run-pass/issue-23491.rs +++ b/src/test/run-pass/issue-23491.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] struct Node(T); diff --git a/src/test/run-pass/issue-23550.rs b/src/test/run-pass/issue-23550.rs index 6e20662b702a9..253affe760b1f 100644 --- a/src/test/run-pass/issue-23550.rs +++ b/src/test/run-pass/issue-23550.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(core_intrinsics)] #![allow(warnings)] diff --git a/src/test/run-pass/issue-23611-enum-swap-in-drop.rs b/src/test/run-pass/issue-23611-enum-swap-in-drop.rs index 09bc3fd0214e7..09d9c119d9581 100644 --- a/src/test/run-pass/issue-23611-enum-swap-in-drop.rs +++ b/src/test/run-pass/issue-23611-enum-swap-in-drop.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue 23611: this test is ensuring that, for an instance `X` of the // enum `E`, if you swap in a different variant during the execution // of the `::drop`, then the appropriate substructure will diff --git a/src/test/run-pass/issue-23649-1.rs b/src/test/run-pass/issue-23649-1.rs index a631898d8682a..8dc1c3aa9716b 100644 --- a/src/test/run-pass/issue-23649-1.rs +++ b/src/test/run-pass/issue-23649-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::mem; pub struct X([u8]); diff --git a/src/test/run-pass/issue-23649-2.rs b/src/test/run-pass/issue-23649-2.rs index c48ae414cc30f..e7c6a5eea2c0f 100644 --- a/src/test/run-pass/issue-23649-2.rs +++ b/src/test/run-pass/issue-23649-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no std::path use std::collections::HashMap; diff --git a/src/test/run-pass/issue-23649-3.rs b/src/test/run-pass/issue-23649-3.rs index 4aa6c53ef9e23..e15055a721ec5 100644 --- a/src/test/run-pass/issue-23649-3.rs +++ b/src/test/run-pass/issue-23649-3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(PartialEq)] struct Slice { slice: [u8] } diff --git a/src/test/run-pass/issue-23699.rs b/src/test/run-pass/issue-23699.rs index 1909be4df7ba2..af38673a5599c 100644 --- a/src/test/run-pass/issue-23699.rs +++ b/src/test/run-pass/issue-23699.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn gimme_a_raw_pointer(_: *const T) { } fn test(t: T) { } diff --git a/src/test/run-pass/issue-23781.rs b/src/test/run-pass/issue-23781.rs index 23ac8d2b78214..8c8212b9125f0 100644 --- a/src/test/run-pass/issue-23781.rs +++ b/src/test/run-pass/issue-23781.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt; struct Foo; diff --git a/src/test/run-pass/issue-2380-b.rs b/src/test/run-pass/issue-2380-b.rs index b704162424713..e47d6e21b8d05 100644 --- a/src/test/run-pass/issue-2380-b.rs +++ b/src/test/run-pass/issue-2380-b.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-2380.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-23808.rs b/src/test/run-pass/issue-23808.rs index 1435a1b5d3878..f3655bd1f3b53 100644 --- a/src/test/run-pass/issue-23808.rs +++ b/src/test/run-pass/issue-23808.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(dead_code)] // use different types / traits to test all combinations diff --git a/src/test/run-pass/issue-23825.rs b/src/test/run-pass/issue-23825.rs index 1b857d94c72e4..d317f5a2fe90f 100644 --- a/src/test/run-pass/issue-23825.rs +++ b/src/test/run-pass/issue-23825.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Stringify { fn to_string(&self) -> String; } diff --git a/src/test/run-pass/issue-2383.rs b/src/test/run-pass/issue-2383.rs index a497a9fda6a6a..ed4f26684c9f2 100644 --- a/src/test/run-pass/issue-2383.rs +++ b/src/test/run-pass/issue-2383.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 use std::collections::VecDeque; diff --git a/src/test/run-pass/issue-23833.rs b/src/test/run-pass/issue-23833.rs index 7d63c41eb26e1..76ff706f3c239 100644 --- a/src/test/run-pass/issue-23833.rs +++ b/src/test/run-pass/issue-23833.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt; use std::{i8, i16, i32, i64, isize}; use std::{u8, u16, u32, u64, usize}; diff --git a/src/test/run-pass/issue-23891.rs b/src/test/run-pass/issue-23891.rs index 55536de9123f1..ddca6430e1c79 100644 --- a/src/test/run-pass/issue-23891.rs +++ b/src/test/run-pass/issue-23891.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! id { ($s: pat) => ($s); } diff --git a/src/test/run-pass/issue-23898.rs b/src/test/run-pass/issue-23898.rs index 3f5546ce83ddf..f644d58cb051b 100644 --- a/src/test/run-pass/issue-23898.rs +++ b/src/test/run-pass/issue-23898.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Note: This test was used to demonstrate #5873 (now #23898). enum State { ST_NULL, ST_WHITESPACE } diff --git a/src/test/run-pass/issue-23958.rs b/src/test/run-pass/issue-23958.rs index 5f1c79a3c1542..fdd7531112248 100644 --- a/src/test/run-pass/issue-23958.rs +++ b/src/test/run-pass/issue-23958.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Collection where for<'a> &'a Self: IntoIterator { fn my_iter(&self) -> <&Self as IntoIterator>::IntoIter { self.into_iter() diff --git a/src/test/run-pass/issue-23968-const-not-overflow.rs b/src/test/run-pass/issue-23968-const-not-overflow.rs index 95f65917ceb7d..c8efbb7d39d03 100644 --- a/src/test/run-pass/issue-23968-const-not-overflow.rs +++ b/src/test/run-pass/issue-23968-const-not-overflow.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const U8_MAX_HALF: u8 = !0u8 / 2; const U16_MAX_HALF: u16 = !0u16 / 2; const U32_MAX_HALF: u32 = !0u32 / 2; diff --git a/src/test/run-pass/issue-23992.rs b/src/test/run-pass/issue-23992.rs index d1ee4208b781a..4f6a65db94dc1 100644 --- a/src/test/run-pass/issue-23992.rs +++ b/src/test/run-pass/issue-23992.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Outer(T); pub struct Inner<'a> { value: &'a bool } diff --git a/src/test/run-pass/issue-24085.rs b/src/test/run-pass/issue-24085.rs index b15ec2986c236..9176002783bad 100644 --- a/src/test/run-pass/issue-24085.rs +++ b/src/test/run-pass/issue-24085.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #24085. Errors were occurring in region // inference due to the requirement that `'a:b'`, which was getting // incorrectly codegened in connection with the closure below. diff --git a/src/test/run-pass/issue-24086.rs b/src/test/run-pass/issue-24086.rs index 0a8324eafe295..ba8ee5db28654 100644 --- a/src/test/run-pass/issue-24086.rs +++ b/src/test/run-pass/issue-24086.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Registry<'a> { listener: &'a mut (), } diff --git a/src/test/run-pass/issue-2414-c.rs b/src/test/run-pass/issue-2414-c.rs index 2e047ae0127c7..c0a67075f7868 100644 --- a/src/test/run-pass/issue-2414-c.rs +++ b/src/test/run-pass/issue-2414-c.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-2414-a.rs // aux-build:issue-2414-b.rs diff --git a/src/test/run-pass/issue-24161.rs b/src/test/run-pass/issue-24161.rs index 2445ef17ecf3b..f3faf0b5bc757 100644 --- a/src/test/run-pass/issue-24161.rs +++ b/src/test/run-pass/issue-24161.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Copy,Clone)] struct Functions { a: fn(u32) -> u32, diff --git a/src/test/run-pass/issue-24227.rs b/src/test/run-pass/issue-24227.rs index 34c16bd4003ad..4aa292147b6e2 100644 --- a/src/test/run-pass/issue-24227.rs +++ b/src/test/run-pass/issue-24227.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This resulted in an ICE. Test for future-proofing // Issue #24227 diff --git a/src/test/run-pass/issue-2428.rs b/src/test/run-pass/issue-2428.rs index a07050d4582f0..38cd05b77f078 100644 --- a/src/test/run-pass/issue-2428.rs +++ b/src/test/run-pass/issue-2428.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { let _foo = 100; const quux: isize = 5; diff --git a/src/test/run-pass/issue-24308.rs b/src/test/run-pass/issue-24308.rs index 0a483fc987adc..674d238dab858 100644 --- a/src/test/run-pass/issue-24308.rs +++ b/src/test/run-pass/issue-24308.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Foo { fn method1() {} fn method2(); diff --git a/src/test/run-pass/issue-24313.rs b/src/test/run-pass/issue-24313.rs index 2e7d2e490b3c7..2fd9fed5ca784 100644 --- a/src/test/run-pass/issue-24313.rs +++ b/src/test/run-pass/issue-24313.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no processes // ignore-emscripten no threads diff --git a/src/test/run-pass/issue-24353.rs b/src/test/run-pass/issue-24353.rs index 7a41a0139273f..1aaea53e04573 100644 --- a/src/test/run-pass/issue-24353.rs +++ b/src/test/run-pass/issue-24353.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { return (); diff --git a/src/test/run-pass/issue-24389.rs b/src/test/run-pass/issue-24389.rs index 41599fa3e6358..a00213202a233 100644 --- a/src/test/run-pass/issue-24389.rs +++ b/src/test/run-pass/issue-24389.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] struct Foo; diff --git a/src/test/run-pass/issue-24434.rs b/src/test/run-pass/issue-24434.rs index 2b0d09d746034..a6ddb7525f830 100644 --- a/src/test/run-pass/issue-24434.rs +++ b/src/test/run-pass/issue-24434.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:--cfg set1 #![cfg_attr(set1, feature(custom_attribute))] diff --git a/src/test/run-pass/issue-2445-b.rs b/src/test/run-pass/issue-2445-b.rs index c1d17d263d6d6..f59ecb40d2377 100644 --- a/src/test/run-pass/issue-2445-b.rs +++ b/src/test/run-pass/issue-2445-b.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct c1 { diff --git a/src/test/run-pass/issue-2445.rs b/src/test/run-pass/issue-2445.rs index 0b6cf5890fd3e..643b7339a7f14 100644 --- a/src/test/run-pass/issue-2445.rs +++ b/src/test/run-pass/issue-2445.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct c1 { diff --git a/src/test/run-pass/issue-24533.rs b/src/test/run-pass/issue-24533.rs index 440a4184780cd..877654d33f190 100644 --- a/src/test/run-pass/issue-24533.rs +++ b/src/test/run-pass/issue-24533.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::slice::Iter; use std::io::{Error, ErrorKind, Result}; use std::vec::*; diff --git a/src/test/run-pass/issue-24535-allow-mutable-borrow-in-match-guard.rs b/src/test/run-pass/issue-24535-allow-mutable-borrow-in-match-guard.rs index ac415e31f2b64..1f7e122e62526 100644 --- a/src/test/run-pass/issue-24535-allow-mutable-borrow-in-match-guard.rs +++ b/src/test/run-pass/issue-24535-allow-mutable-borrow-in-match-guard.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test illustrates that under NLL, we can remove our overly // conservative approach for disallowing mutations of match inputs. diff --git a/src/test/run-pass/issue-24589.rs b/src/test/run-pass/issue-24589.rs index 2fa8c8e98c0de..aad46c62f4550 100644 --- a/src/test/run-pass/issue-24589.rs +++ b/src/test/run-pass/issue-24589.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct _X([u8]); impl std::ops::Deref for _X { diff --git a/src/test/run-pass/issue-2463.rs b/src/test/run-pass/issue-2463.rs index f0b0614535bdf..be4721c6864b0 100644 --- a/src/test/run-pass/issue-2463.rs +++ b/src/test/run-pass/issue-2463.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct Pair { f: isize, g: isize } diff --git a/src/test/run-pass/issue-2472.rs b/src/test/run-pass/issue-2472.rs index 0cbdbda63756a..a7199fe21d2da 100644 --- a/src/test/run-pass/issue-2472.rs +++ b/src/test/run-pass/issue-2472.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_2472_b.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-24779.rs b/src/test/run-pass/issue-24779.rs index 4f13b91cdb133..6a7829b588f9c 100644 --- a/src/test/run-pass/issue-24779.rs +++ b/src/test/run-pass/issue-24779.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { assert_eq!((||||42)()(), 42); } diff --git a/src/test/run-pass/issue-24805-dropck-itemless.rs b/src/test/run-pass/issue-24805-dropck-itemless.rs index 9fa482022982b..7ee74bcb89469 100644 --- a/src/test/run-pass/issue-24805-dropck-itemless.rs +++ b/src/test/run-pass/issue-24805-dropck-itemless.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that item-less traits do not cause dropck to inject extra // region constraints. diff --git a/src/test/run-pass/issue-2487-a.rs b/src/test/run-pass/issue-2487-a.rs index 76450b351f457..a059c916facbc 100644 --- a/src/test/run-pass/issue-2487-a.rs +++ b/src/test/run-pass/issue-2487-a.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct socket { diff --git a/src/test/run-pass/issue-24945-repeat-dash-opts.rs b/src/test/run-pass/issue-24945-repeat-dash-opts.rs index 33ac519a584f9..8b8337a8a2e15 100644 --- a/src/test/run-pass/issue-24945-repeat-dash-opts.rs +++ b/src/test/run-pass/issue-24945-repeat-dash-opts.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test is just checking that we continue to accept `-g -g -O -O` // as options to the compiler. diff --git a/src/test/run-pass/issue-24947.rs b/src/test/run-pass/issue-24947.rs index 19a364a93fd79..b10eb721c6ffc 100644 --- a/src/test/run-pass/issue-24947.rs +++ b/src/test/run-pass/issue-24947.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // #24947 ICE using a trait-associated const in an array size diff --git a/src/test/run-pass/issue-24954.rs b/src/test/run-pass/issue-24954.rs index f525274a1dfca..80bd3d6b0b746 100644 --- a/src/test/run-pass/issue-24954.rs +++ b/src/test/run-pass/issue-24954.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! foo { ($y:expr) => ({ $y = 2; diff --git a/src/test/run-pass/issue-2502.rs b/src/test/run-pass/issue-2502.rs index 63179cd14acda..a97f81cb64647 100644 --- a/src/test/run-pass/issue-2502.rs +++ b/src/test/run-pass/issue-2502.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // pretty-expanded FIXME #23616 struct font<'a> { diff --git a/src/test/run-pass/issue-25089.rs b/src/test/run-pass/issue-25089.rs index e707023530be8..5f16d28140a98 100644 --- a/src/test/run-pass/issue-25089.rs +++ b/src/test/run-pass/issue-25089.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/issue-25145.rs b/src/test/run-pass/issue-25145.rs index d5d23012e040b..ff0d60d7d380e 100644 --- a/src/test/run-pass/issue-25145.rs +++ b/src/test/run-pass/issue-25145.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct S; impl S { diff --git a/src/test/run-pass/issue-25180.rs b/src/test/run-pass/issue-25180.rs index 4e6f9b321bab4..e4ddf5a798a3e 100644 --- a/src/test/run-pass/issue-25180.rs +++ b/src/test/run-pass/issue-25180.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const x: &'static Fn() = &|| println!("ICE here"); fn main() {} diff --git a/src/test/run-pass/issue-25185.rs b/src/test/run-pass/issue-25185.rs index 9a2dbd1c96e31..862ea3bbfea5b 100644 --- a/src/test/run-pass/issue-25185.rs +++ b/src/test/run-pass/issue-25185.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-25185-1.rs // aux-build:issue-25185-2.rs // ignore-wasm32-bare no libc for ffi testing diff --git a/src/test/run-pass/issue-2526-a.rs b/src/test/run-pass/issue-2526-a.rs index 0c68c47023194..9c9adffd0fa36 100644 --- a/src/test/run-pass/issue-2526-a.rs +++ b/src/test/run-pass/issue-2526-a.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-2526.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-25279.rs b/src/test/run-pass/issue-25279.rs index e483866790f62..3d8e20c61337c 100644 --- a/src/test/run-pass/issue-25279.rs +++ b/src/test/run-pass/issue-25279.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S<'a>(&'a ()); impl<'a> S<'a> { diff --git a/src/test/run-pass/issue-25339.rs b/src/test/run-pass/issue-25339.rs index 381df7c5d5938..79ff376d17fb8 100644 --- a/src/test/run-pass/issue-25339.rs +++ b/src/test/run-pass/issue-25339.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(associated_type_defaults)] use std::marker::PhantomData; diff --git a/src/test/run-pass/issue-25343.rs b/src/test/run-pass/issue-25343.rs index 64e7350fb8244..fcaea6ab0eebd 100644 --- a/src/test/run-pass/issue-25343.rs +++ b/src/test/run-pass/issue-25343.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[allow(unused)] fn main() { || { diff --git a/src/test/run-pass/issue-25394.rs b/src/test/run-pass/issue-25394.rs index c42de6fdf3408..664d23a905f80 100644 --- a/src/test/run-pass/issue-25394.rs +++ b/src/test/run-pass/issue-25394.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug)] struct Row([T]); diff --git a/src/test/run-pass/issue-25467.rs b/src/test/run-pass/issue-25467.rs index 4775876826983..911a2b51db21d 100644 --- a/src/test/run-pass/issue-25467.rs +++ b/src/test/run-pass/issue-25467.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-25467.rs pub type Issue25467BarT = (); diff --git a/src/test/run-pass/issue-25497.rs b/src/test/run-pass/issue-25497.rs index 730b0a274bfa5..c6afc1953cf94 100644 --- a/src/test/run-pass/issue-25497.rs +++ b/src/test/run-pass/issue-25497.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Clone, Debug, PartialEq)] enum Expression { Dummy, diff --git a/src/test/run-pass/issue-2550.rs b/src/test/run-pass/issue-2550.rs index 87b0b198f9b67..316954f6bbd1e 100644 --- a/src/test/run-pass/issue-2550.rs +++ b/src/test/run-pass/issue-2550.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct C { diff --git a/src/test/run-pass/issue-25515.rs b/src/test/run-pass/issue-25515.rs index d1746ec019102..bd698d39636e0 100644 --- a/src/test/run-pass/issue-25515.rs +++ b/src/test/run-pass/issue-25515.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::rc::Rc; struct Foo<'r>(&'r mut i32); diff --git a/src/test/run-pass/issue-25549-multiple-drop.rs b/src/test/run-pass/issue-25549-multiple-drop.rs index 5280891677e37..47230308c2d6f 100644 --- a/src/test/run-pass/issue-25549-multiple-drop.rs +++ b/src/test/run-pass/issue-25549-multiple-drop.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo<'r>(&'r mut i32); impl<'r> Drop for Foo<'r> { diff --git a/src/test/run-pass/issue-25679.rs b/src/test/run-pass/issue-25679.rs index 0ba7feece6061..e5954e75378ee 100644 --- a/src/test/run-pass/issue-25679.rs +++ b/src/test/run-pass/issue-25679.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Device { type Resources; } diff --git a/src/test/run-pass/issue-25693.rs b/src/test/run-pass/issue-25693.rs index 0d9dc3cf60556..05de1552d5ee3 100644 --- a/src/test/run-pass/issue-25693.rs +++ b/src/test/run-pass/issue-25693.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Parameters { type SelfRef; } struct RP<'a> { _marker: std::marker::PhantomData<&'a ()> } diff --git a/src/test/run-pass/issue-25700-1.rs b/src/test/run-pass/issue-25700-1.rs index 57f5b84b28537..99c6f0873951d 100644 --- a/src/test/run-pass/issue-25700-1.rs +++ b/src/test/run-pass/issue-25700-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S(Option<&'static T>); trait Tr { type Out; } diff --git a/src/test/run-pass/issue-25700-2.rs b/src/test/run-pass/issue-25700-2.rs index 3117e6f3681de..1df56f355a984 100644 --- a/src/test/run-pass/issue-25700-2.rs +++ b/src/test/run-pass/issue-25700-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Parser { type Input; } diff --git a/src/test/run-pass/issue-25746-bool-transmute.rs b/src/test/run-pass/issue-25746-bool-transmute.rs index 434e019219f71..b341085c9e737 100644 --- a/src/test/run-pass/issue-25746-bool-transmute.rs +++ b/src/test/run-pass/issue-25746-bool-transmute.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::mem::transmute; fn main() { diff --git a/src/test/run-pass/issue-25757.rs b/src/test/run-pass/issue-25757.rs index d1fb75377050d..a42e322c59005 100644 --- a/src/test/run-pass/issue-25757.rs +++ b/src/test/run-pass/issue-25757.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { a: u32 } diff --git a/src/test/run-pass/issue-25810.rs b/src/test/run-pass/issue-25810.rs index 820872ad3fc50..1cf38055952c2 100644 --- a/src/test/run-pass/issue-25810.rs +++ b/src/test/run-pass/issue-25810.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = X(15); let y = x.foo(); diff --git a/src/test/run-pass/issue-25916.rs b/src/test/run-pass/issue-25916.rs index eb52e2e21c481..4f6655e894d0b 100644 --- a/src/test/run-pass/issue-25916.rs +++ b/src/test/run-pass/issue-25916.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { macro_rules! f { () => { 0 + 0 } diff --git a/src/test/run-pass/issue-26095.rs b/src/test/run-pass/issue-26095.rs index 9d8d9c3ff2e3b..5387b47f43bc7 100644 --- a/src/test/run-pass/issue-26095.rs +++ b/src/test/run-pass/issue-26095.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait HasNumber { const Number: usize; } diff --git a/src/test/run-pass/issue-2611-3.rs b/src/test/run-pass/issue-2611-3.rs index e223d3412e049..b84b87517edae 100644 --- a/src/test/run-pass/issue-2611-3.rs +++ b/src/test/run-pass/issue-2611-3.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that impls are allowed to have looser, more permissive bounds // than the traits require. diff --git a/src/test/run-pass/issue-26127.rs b/src/test/run-pass/issue-26127.rs index 75cbcc83d6102..14b5c32a252dd 100644 --- a/src/test/run-pass/issue-26127.rs +++ b/src/test/run-pass/issue-26127.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Tr { type T; } impl Tr for u8 { type T=(); } struct S(I::T); diff --git a/src/test/run-pass/issue-26205.rs b/src/test/run-pass/issue-26205.rs index dd34612af0fc6..52e06c2d423ea 100644 --- a/src/test/run-pass/issue-26205.rs +++ b/src/test/run-pass/issue-26205.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::{Deref, DerefMut}; struct Foo; diff --git a/src/test/run-pass/issue-26251.rs b/src/test/run-pass/issue-26251.rs index 3735d36147d1f..895713b8ab388 100644 --- a/src/test/run-pass/issue-26251.rs +++ b/src/test/run-pass/issue-26251.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = 'a'; diff --git a/src/test/run-pass/issue-2631-b.rs b/src/test/run-pass/issue-2631-b.rs index 913b07613e030..5dce6912df451 100644 --- a/src/test/run-pass/issue-2631-b.rs +++ b/src/test/run-pass/issue-2631-b.rs @@ -1,14 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // aux-build:issue-2631-a.rs extern crate req; diff --git a/src/test/run-pass/issue-26322.rs b/src/test/run-pass/issue-26322.rs index 7f8c7f5521fa1..f18f3a77e850a 100644 --- a/src/test/run-pass/issue-26322.rs +++ b/src/test/run-pass/issue-26322.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! columnline { () => ( (column!(), line!()) diff --git a/src/test/run-pass/issue-2633-2.rs b/src/test/run-pass/issue-2633-2.rs index b955947c4101b..e3490dcc6721f 100644 --- a/src/test/run-pass/issue-2633-2.rs +++ b/src/test/run-pass/issue-2633-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/issue-2633.rs b/src/test/run-pass/issue-2633.rs index 5841a9ec176cd..3b491f02aac0a 100644 --- a/src/test/run-pass/issue-2633.rs +++ b/src/test/run-pass/issue-2633.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Copy, Clone)] struct cat { meow: extern "Rust" fn(), diff --git a/src/test/run-pass/issue-2642.rs b/src/test/run-pass/issue-2642.rs index f0bc31fb391c0..d5cbe9c1d1c5e 100644 --- a/src/test/run-pass/issue-2642.rs +++ b/src/test/run-pass/issue-2642.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn f() { diff --git a/src/test/run-pass/issue-26468.rs b/src/test/run-pass/issue-26468.rs index 9fb8675e84e9d..6357de637073f 100644 --- a/src/test/run-pass/issue-26468.rs +++ b/src/test/run-pass/issue-26468.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] enum FooMode { diff --git a/src/test/run-pass/issue-26484.rs b/src/test/run-pass/issue-26484.rs index d3e6fc85f136f..00cdbb016467c 100644 --- a/src/test/run-pass/issue-26484.rs +++ b/src/test/run-pass/issue-26484.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-g fn helper bool>(_f: F) { diff --git a/src/test/run-pass/issue-26641.rs b/src/test/run-pass/issue-26641.rs index 16f1d4626fbaf..83e23d3ca9bf1 100644 --- a/src/test/run-pass/issue-26641.rs +++ b/src/test/run-pass/issue-26641.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Parser<'a>(Box); fn main() { diff --git a/src/test/run-pass/issue-26646.rs b/src/test/run-pass/issue-26646.rs index 89c0a11e292f5..7347898a0f784 100644 --- a/src/test/run-pass/issue-26646.rs +++ b/src/test/run-pass/issue-26646.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(unused_attributes)] #[repr(C)] diff --git a/src/test/run-pass/issue-26655.rs b/src/test/run-pass/issue-26655.rs index 6d43451af6b91..1397478389cff 100644 --- a/src/test/run-pass/issue-26655.rs +++ b/src/test/run-pass/issue-26655.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support // Check that the destructors of simple enums are run on unwinding diff --git a/src/test/run-pass/issue-26709.rs b/src/test/run-pass/issue-26709.rs index 62626d75865cf..52c024da04e9d 100644 --- a/src/test/run-pass/issue-26709.rs +++ b/src/test/run-pass/issue-26709.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Wrapper<'a, T: ?Sized>(&'a mut i32, T); impl<'a, T: ?Sized> Drop for Wrapper<'a, T> { diff --git a/src/test/run-pass/issue-26802.rs b/src/test/run-pass/issue-26802.rs index 854340b0eae29..aafc703c9f597 100644 --- a/src/test/run-pass/issue-26802.rs +++ b/src/test/run-pass/issue-26802.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo<'a> { fn bar<'b>(&self, x: &'b u8) -> u8 where 'a: 'b { *x+7 } } diff --git a/src/test/run-pass/issue-26805.rs b/src/test/run-pass/issue-26805.rs index c996c8f65ac8b..9d729e4bf8461 100644 --- a/src/test/run-pass/issue-26805.rs +++ b/src/test/run-pass/issue-26805.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct NonOrd; fn main() { diff --git a/src/test/run-pass/issue-26873-multifile.rs b/src/test/run-pass/issue-26873-multifile.rs index 51bf4bfe0e13e..37da489541a96 100644 --- a/src/test/run-pass/issue-26873-multifile.rs +++ b/src/test/run-pass/issue-26873-multifile.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty issue #37195 mod issue_26873_multifile; diff --git a/src/test/run-pass/issue-26873-onefile.rs b/src/test/run-pass/issue-26873-onefile.rs index a9a04fd889455..2564b64a663f2 100644 --- a/src/test/run-pass/issue-26873-onefile.rs +++ b/src/test/run-pass/issue-26873-onefile.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod A { pub mod B { use super::*; diff --git a/src/test/run-pass/issue-26905.rs b/src/test/run-pass/issue-26905.rs index 0ad193bb28c99..5f9cf7d4a250f 100644 --- a/src/test/run-pass/issue-26905.rs +++ b/src/test/run-pass/issue-26905.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unsize, coerce_unsized)] // Verfies that PhantomData is ignored for DST coercions diff --git a/src/test/run-pass/issue-26996.rs b/src/test/run-pass/issue-26996.rs index e17845a68bccc..14a427ee63b7c 100644 --- a/src/test/run-pass/issue-26996.rs +++ b/src/test/run-pass/issue-26996.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let mut c = (1, "".to_owned()); match c { diff --git a/src/test/run-pass/issue-26997.rs b/src/test/run-pass/issue-26997.rs index e7ecf68f10897..93bc6ae0067cd 100644 --- a/src/test/run-pass/issue-26997.rs +++ b/src/test/run-pass/issue-26997.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Foo { x: isize, y: isize diff --git a/src/test/run-pass/issue-27021.rs b/src/test/run-pass/issue-27021.rs index eb7d529f0ad6c..e616c6824eace 100644 --- a/src/test/run-pass/issue-27021.rs +++ b/src/test/run-pass/issue-27021.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let mut c = (1, (1, "".to_owned())); match c { diff --git a/src/test/run-pass/issue-27054-primitive-binary-ops.rs b/src/test/run-pass/issue-27054-primitive-binary-ops.rs index a97a49a1a4a00..49146255c2631 100644 --- a/src/test/run-pass/issue-27054-primitive-binary-ops.rs +++ b/src/test/run-pass/issue-27054-primitive-binary-ops.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = &mut 1; assert_eq!(*x + { *x=2; 1 }, 2); diff --git a/src/test/run-pass/issue-27060.rs b/src/test/run-pass/issue-27060.rs index 809c45466f088..7b6dc65529334 100644 --- a/src/test/run-pass/issue-27060.rs +++ b/src/test/run-pass/issue-27060.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[repr(packed)] pub struct Good { data: &'static u32, diff --git a/src/test/run-pass/issue-2708.rs b/src/test/run-pass/issue-2708.rs index cf565b9f90197..4be979a5adad7 100644 --- a/src/test/run-pass/issue-2708.rs +++ b/src/test/run-pass/issue-2708.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/issue-27105.rs b/src/test/run-pass/issue-27105.rs index 3836ad089a36d..ab5494ac83442 100644 --- a/src/test/run-pass/issue-27105.rs +++ b/src/test/run-pass/issue-27105.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cell::RefCell; use std::rc::Rc; diff --git a/src/test/run-pass/issue-2718.rs b/src/test/run-pass/issue-2718.rs index d59f2956ee402..a91df7cf4b7b5 100644 --- a/src/test/run-pass/issue-2718.rs +++ b/src/test/run-pass/issue-2718.rs @@ -1,12 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // pub type Task = isize; diff --git a/src/test/run-pass/issue-2723-b.rs b/src/test/run-pass/issue-2723-b.rs index a6ba957a1b110..73635e0ad047f 100644 --- a/src/test/run-pass/issue-2723-b.rs +++ b/src/test/run-pass/issue-2723-b.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_2723_a.rs extern crate issue_2723_a; diff --git a/src/test/run-pass/issue-27240.rs b/src/test/run-pass/issue-27240.rs index 4e341d311729d..758935c0cd1fd 100644 --- a/src/test/run-pass/issue-27240.rs +++ b/src/test/run-pass/issue-27240.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt; struct NoisyDrop(T); impl Drop for NoisyDrop { diff --git a/src/test/run-pass/issue-27268.rs b/src/test/run-pass/issue-27268.rs index 8af850bbada83..350fcddf50d12 100644 --- a/src/test/run-pass/issue-27268.rs +++ b/src/test/run-pass/issue-27268.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { const _C: &'static Fn() = &||{}; } diff --git a/src/test/run-pass/issue-27281.rs b/src/test/run-pass/issue-27281.rs index c84fc0fffe32f..c03d7df107894 100644 --- a/src/test/run-pass/issue-27281.rs +++ b/src/test/run-pass/issue-27281.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Trait<'a> { type T; type U; diff --git a/src/test/run-pass/issue-27320.rs b/src/test/run-pass/issue-27320.rs index e010b162cc406..dfd612181cf61 100644 --- a/src/test/run-pass/issue-27320.rs +++ b/src/test/run-pass/issue-27320.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_variables)] #![allow(dead_code)] diff --git a/src/test/run-pass/issue-2734.rs b/src/test/run-pass/issue-2734.rs index 916e3dd689fcf..7b3998674c7d3 100644 --- a/src/test/run-pass/issue-2734.rs +++ b/src/test/run-pass/issue-2734.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/issue-2735-2.rs b/src/test/run-pass/issue-2735-2.rs index cdce059ae71f1..61be5869a026e 100644 --- a/src/test/run-pass/issue-2735-2.rs +++ b/src/test/run-pass/issue-2735-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cell::Cell; // This test should behave exactly like issue-2735-3 diff --git a/src/test/run-pass/issue-2735-3.rs b/src/test/run-pass/issue-2735-3.rs index d1e28faba8b5b..b00d69e81f466 100644 --- a/src/test/run-pass/issue-2735-3.rs +++ b/src/test/run-pass/issue-2735-3.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cell::Cell; // This test should behave exactly like issue-2735-2 diff --git a/src/test/run-pass/issue-2735.rs b/src/test/run-pass/issue-2735.rs index af8eef557f821..c86096d5c151f 100644 --- a/src/test/run-pass/issue-2735.rs +++ b/src/test/run-pass/issue-2735.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/issue-27401-dropflag-reinit.rs b/src/test/run-pass/issue-27401-dropflag-reinit.rs index 37dc060d5d64d..8282fc6f9dd6d 100644 --- a/src/test/run-pass/issue-27401-dropflag-reinit.rs +++ b/src/test/run-pass/issue-27401-dropflag-reinit.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty issue #37201 // Check that when a `let`-binding occurs in a loop, its associated diff --git a/src/test/run-pass/issue-2748-a.rs b/src/test/run-pass/issue-2748-a.rs index ac1e65ee77634..21b769f95db39 100644 --- a/src/test/run-pass/issue-2748-a.rs +++ b/src/test/run-pass/issue-2748-a.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct CMap<'a> { diff --git a/src/test/run-pass/issue-2748-b.rs b/src/test/run-pass/issue-2748-b.rs index f1cbf11a347eb..7f7db0245f2b5 100644 --- a/src/test/run-pass/issue-2748-b.rs +++ b/src/test/run-pass/issue-2748-b.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn thing<'r>(x: &'r [isize]) -> &'r [isize] { x } pub fn main() { diff --git a/src/test/run-pass/issue-27583.rs b/src/test/run-pass/issue-27583.rs index df1b2c2cf43aa..e0f806d00f21d 100644 --- a/src/test/run-pass/issue-27583.rs +++ b/src/test/run-pass/issue-27583.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #27583. Unclear how useful this will be // going forward, since the issue in question was EXTREMELY sensitive // to compiler internals (like the precise numbering of nodes), but diff --git a/src/test/run-pass/issue-27639.rs b/src/test/run-pass/issue-27639.rs index ce1abb163d53b..c63a685929a89 100644 --- a/src/test/run-pass/issue-27639.rs +++ b/src/test/run-pass/issue-27639.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { const iter: i32 = 0; diff --git a/src/test/run-pass/issue-27859.rs b/src/test/run-pass/issue-27859.rs index d184724cf6f7a..38eebb8ab4145 100644 --- a/src/test/run-pass/issue-27859.rs +++ b/src/test/run-pass/issue-27859.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no std::env // ignore-wasm32 issue 42629 diff --git a/src/test/run-pass/issue-27889.rs b/src/test/run-pass/issue-27889.rs index 29a5f6dd24bd0..cbda2ec6a21e6 100644 --- a/src/test/run-pass/issue-27889.rs +++ b/src/test/run-pass/issue-27889.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that a field can have the same name in different variants // of an enum diff --git a/src/test/run-pass/issue-27890.rs b/src/test/run-pass/issue-27890.rs index a33882a833185..9ddc38c396a4d 100644 --- a/src/test/run-pass/issue-27890.rs +++ b/src/test/run-pass/issue-27890.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - static PLUS_ONE: &'static (Fn(i32) -> i32 + Sync) = (&|x: i32| { x + 1 }) as &'static (Fn(i32) -> i32 + Sync); diff --git a/src/test/run-pass/issue-27901.rs b/src/test/run-pass/issue-27901.rs index b7a9daaf8abd4..b0822accb6b6b 100644 --- a/src/test/run-pass/issue-27901.rs +++ b/src/test/run-pass/issue-27901.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Stream { type Item; } impl<'a> Stream for &'a str { type Item = u8; } fn f<'s>(s: &'s str) -> (&'s str, <&'s str as Stream>::Item) { diff --git a/src/test/run-pass/issue-27997.rs b/src/test/run-pass/issue-27997.rs index 9dba477a7e5e5..c8f8bc7e3ff37 100644 --- a/src/test/run-pass/issue-27997.rs +++ b/src/test/run-pass/issue-27997.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::sync::atomic::{Ordering, AtomicUsize}; use std::mem; diff --git a/src/test/run-pass/issue-2804-2.rs b/src/test/run-pass/issue-2804-2.rs index e428ecd4e5bb3..43dfe6e53a6cd 100644 --- a/src/test/run-pass/issue-2804-2.rs +++ b/src/test/run-pass/issue-2804-2.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Minimized version of issue-2804.rs. Both check that callee IDs don't // clobber the previous node ID in a macro expr diff --git a/src/test/run-pass/issue-28181.rs b/src/test/run-pass/issue-28181.rs index f64b92cdbb763..1bac2057c4956 100644 --- a/src/test/run-pass/issue-28181.rs +++ b/src/test/run-pass/issue-28181.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn bar(f: F) -> usize where F: Fn([usize; 1]) -> usize { f([2]) } fn main() { diff --git a/src/test/run-pass/issue-28279.rs b/src/test/run-pass/issue-28279.rs index 3165084b9e90d..341e4c8ec19d9 100644 --- a/src/test/run-pass/issue-28279.rs +++ b/src/test/run-pass/issue-28279.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::rc::Rc; fn test1() -> Rc Fn(&'a usize) + 'static> { diff --git a/src/test/run-pass/issue-28550.rs b/src/test/run-pass/issue-28550.rs index f44a535e8176e..702506ae5b940 100644 --- a/src/test/run-pass/issue-28550.rs +++ b/src/test/run-pass/issue-28550.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct AT,T>(F::Output); struct BT,T>(A); diff --git a/src/test/run-pass/issue-28561.rs b/src/test/run-pass/issue-28561.rs index e21e487fedd1c..10133ab73baab 100644 --- a/src/test/run-pass/issue-28561.rs +++ b/src/test/run-pass/issue-28561.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)] struct Array { f00: [T; 00], diff --git a/src/test/run-pass/issue-28600.rs b/src/test/run-pass/issue-28600.rs index bbbdb79a11d32..aff2ee8491bb1 100644 --- a/src/test/run-pass/issue-28600.rs +++ b/src/test/run-pass/issue-28600.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // #28600 ICE: pub extern fn with parameter type &str inside struct impl struct Test; diff --git a/src/test/run-pass/issue-28676.rs b/src/test/run-pass/issue-28676.rs index a7bee427a813c..d5c8eac0f4071 100644 --- a/src/test/run-pass/issue-28676.rs +++ b/src/test/run-pass/issue-28676.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare no libc to test ffi with #[derive(Copy, Clone)] diff --git a/src/test/run-pass/issue-28777.rs b/src/test/run-pass/issue-28777.rs index ea5d4e4f3c27b..3aae6591a42cc 100644 --- a/src/test/run-pass/issue-28777.rs +++ b/src/test/run-pass/issue-28777.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let v1 = { 1 + {2} * {3} }; let v2 = 1 + {2} * {3} ; diff --git a/src/test/run-pass/issue-28822.rs b/src/test/run-pass/issue-28822.rs index 5a010f2be7a34..23a37444b195d 100644 --- a/src/test/run-pass/issue-28822.rs +++ b/src/test/run-pass/issue-28822.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_fn)] fn main() {} diff --git a/src/test/run-pass/issue-28828.rs b/src/test/run-pass/issue-28828.rs index 24e4b83e8a675..cc08f0d75a844 100644 --- a/src/test/run-pass/issue-28828.rs +++ b/src/test/run-pass/issue-28828.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Foo { type Out; } diff --git a/src/test/run-pass/issue-28839.rs b/src/test/run-pass/issue-28839.rs index 2ff4403a42f97..8b83ee9d9f959 100644 --- a/src/test/run-pass/issue-28839.rs +++ b/src/test/run-pass/issue-28839.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty issue #37199 pub struct Foo; diff --git a/src/test/run-pass/issue-28871.rs b/src/test/run-pass/issue-28871.rs index 92ba98f506257..382e08cd8c475 100644 --- a/src/test/run-pass/issue-28871.rs +++ b/src/test/run-pass/issue-28871.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #28871. The problem is that rustc encountered // two ways to project, one from a where clause and one from the where // clauses on the trait definition. (In fact, in this case, the where diff --git a/src/test/run-pass/issue-28936.rs b/src/test/run-pass/issue-28936.rs index 992fbdce26898..856069d608ba4 100644 --- a/src/test/run-pass/issue-28936.rs +++ b/src/test/run-pass/issue-28936.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub type Session = i32; pub struct StreamParser<'a, T> { _tokens: T, diff --git a/src/test/run-pass/issue-2895.rs b/src/test/run-pass/issue-2895.rs index b0fd0e148c8c2..1c941b531c128 100644 --- a/src/test/run-pass/issue-2895.rs +++ b/src/test/run-pass/issue-2895.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::mem; struct Cat { diff --git a/src/test/run-pass/issue-28950.rs b/src/test/run-pass/issue-28950.rs index 4e4530789c8dd..730a7a23ef9e6 100644 --- a/src/test/run-pass/issue-28950.rs +++ b/src/test/run-pass/issue-28950.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads // compile-flags: -O diff --git a/src/test/run-pass/issue-28983.rs b/src/test/run-pass/issue-28983.rs index f70f876876642..df8a791a58b89 100644 --- a/src/test/run-pass/issue-28983.rs +++ b/src/test/run-pass/issue-28983.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Test { type T; } impl Test for u32 { diff --git a/src/test/run-pass/issue-28999.rs b/src/test/run-pass/issue-28999.rs index 87112ef171981..280a960c80aa0 100644 --- a/src/test/run-pass/issue-28999.rs +++ b/src/test/run-pass/issue-28999.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Xyz<'a, V> { pub v: (V, &'a u32), } diff --git a/src/test/run-pass/issue-29030.rs b/src/test/run-pass/issue-29030.rs index 43de3601df10a..b99810f9e8ff1 100644 --- a/src/test/run-pass/issue-29030.rs +++ b/src/test/run-pass/issue-29030.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug)] struct Message<'a, P: 'a = &'a [u8]> { header: &'a [u8], diff --git a/src/test/run-pass/issue-29037.rs b/src/test/run-pass/issue-29037.rs index dc1d67cc6455a..9727f1f1a780f 100644 --- a/src/test/run-pass/issue-29037.rs +++ b/src/test/run-pass/issue-29037.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test ensures that each pointer type `P` is covariant in `X`. use std::rc::Rc; diff --git a/src/test/run-pass/issue-2904.rs b/src/test/run-pass/issue-2904.rs index d82fce97c41dc..18ea1f8353d19 100644 --- a/src/test/run-pass/issue-2904.rs +++ b/src/test/run-pass/issue-2904.rs @@ -1,14 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // Map representation use std::fmt; diff --git a/src/test/run-pass/issue-29048.rs b/src/test/run-pass/issue-29048.rs index 48f4327d3e99a..cd495cfeb398d 100644 --- a/src/test/run-pass/issue-29048.rs +++ b/src/test/run-pass/issue-29048.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Chan; pub struct ChanSelect<'c, T> { chans: Vec<(&'c Chan, T)>, diff --git a/src/test/run-pass/issue-29053.rs b/src/test/run-pass/issue-29053.rs index 72655071e4135..2c99917f0fcc1 100644 --- a/src/test/run-pass/issue-29053.rs +++ b/src/test/run-pass/issue-29053.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x: &'static str = "x"; diff --git a/src/test/run-pass/issue-29071-2.rs b/src/test/run-pass/issue-29071-2.rs index 8e69c063f99a0..440c325ce30c9 100644 --- a/src/test/run-pass/issue-29071-2.rs +++ b/src/test/run-pass/issue-29071-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn t1() -> u32 { let x; x = if true { [1, 2, 3] } else { [2, 3, 4] }[0]; diff --git a/src/test/run-pass/issue-29071.rs b/src/test/run-pass/issue-29071.rs index 09c17a85ab50b..bb8e4419834c3 100644 --- a/src/test/run-pass/issue-29071.rs +++ b/src/test/run-pass/issue-29071.rs @@ -1,12 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. fn ret() -> u32 { static x: u32 = 10; x & if true { 10u32 } else { 20u32 } & x diff --git a/src/test/run-pass/issue-29092.rs b/src/test/run-pass/issue-29092.rs index c55cc91cc928f..ba57ec36ea6bd 100644 --- a/src/test/run-pass/issue-29092.rs +++ b/src/test/run-pass/issue-29092.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for Issue #29092. // // (Possibly redundant with regression test run-pass/issue-30530.rs) diff --git a/src/test/run-pass/issue-29147.rs b/src/test/run-pass/issue-29147.rs index 026b98905d099..f23a602a7e67e 100644 --- a/src/test/run-pass/issue-29147.rs +++ b/src/test/run-pass/issue-29147.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![recursion_limit="1024"] use std::mem; diff --git a/src/test/run-pass/issue-29166.rs b/src/test/run-pass/issue-29166.rs index 193f977ff99bc..4b14c90ff9054 100644 --- a/src/test/run-pass/issue-29166.rs +++ b/src/test/run-pass/issue-29166.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test ensures that vec.into_iter does not overconstrain element lifetime. pub fn main() { diff --git a/src/test/run-pass/issue-29227.rs b/src/test/run-pass/issue-29227.rs index 7e27f7093ad6b..4a1976c07e82e 100644 --- a/src/test/run-pass/issue-29227.rs +++ b/src/test/run-pass/issue-29227.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // Regression test for #29227. The problem here was that MIR diff --git a/src/test/run-pass/issue-29276.rs b/src/test/run-pass/issue-29276.rs index 393b2226031b1..9f437b1ed00dd 100644 --- a/src/test/run-pass/issue-29276.rs +++ b/src/test/run-pass/issue-29276.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S([u8; { struct Z; 0 }]); fn main() {} diff --git a/src/test/run-pass/issue-2935.rs b/src/test/run-pass/issue-2935.rs index b2ea183e9f878..1d7f4635870b5 100644 --- a/src/test/run-pass/issue-2935.rs +++ b/src/test/run-pass/issue-2935.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] //type t = { a: isize }; diff --git a/src/test/run-pass/issue-2936.rs b/src/test/run-pass/issue-2936.rs index c277073a79dc9..125f0c3484637 100644 --- a/src/test/run-pass/issue-2936.rs +++ b/src/test/run-pass/issue-2936.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait bar { fn get_bar(&self) -> T; } diff --git a/src/test/run-pass/issue-29466.rs b/src/test/run-pass/issue-29466.rs index 9e7b73467229a..978556cb860a1 100644 --- a/src/test/run-pass/issue-29466.rs +++ b/src/test/run-pass/issue-29466.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! m( ($e1:expr => $e2:expr) => ({ $e1 }) ); diff --git a/src/test/run-pass/issue-29485.rs b/src/test/run-pass/issue-29485.rs index 828b495d40813..8763c755bef46 100644 --- a/src/test/run-pass/issue-29485.rs +++ b/src/test/run-pass/issue-29485.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-29485.rs // ignore-emscripten no threads diff --git a/src/test/run-pass/issue-29488.rs b/src/test/run-pass/issue-29488.rs index 17a6e9bd6b2e7..99f650b0701a7 100644 --- a/src/test/run-pass/issue-29488.rs +++ b/src/test/run-pass/issue-29488.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/issue-29516.rs b/src/test/run-pass/issue-29516.rs index 465986583b155..f2aba1200cb0f 100644 --- a/src/test/run-pass/issue-29516.rs +++ b/src/test/run-pass/issue-29516.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] auto trait NotSame {} diff --git a/src/test/run-pass/issue-29522.rs b/src/test/run-pass/issue-29522.rs index de7c7aee05530..1addb174a3ff0 100644 --- a/src/test/run-pass/issue-29522.rs +++ b/src/test/run-pass/issue-29522.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // check that we don't accidentally capture upvars just because their name // occurs in a path diff --git a/src/test/run-pass/issue-29540.rs b/src/test/run-pass/issue-29540.rs index 285cf5763cc3a..590f93c582c87 100644 --- a/src/test/run-pass/issue-29540.rs +++ b/src/test/run-pass/issue-29540.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug)] pub struct Config { pub name: String, diff --git a/src/test/run-pass/issue-29663.rs b/src/test/run-pass/issue-29663.rs index 9a77be049feeb..87de6529203e6 100644 --- a/src/test/run-pass/issue-29663.rs +++ b/src/test/run-pass/issue-29663.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // write_volatile causes an LLVM assert with composite types #![feature(volatile)] diff --git a/src/test/run-pass/issue-29668.rs b/src/test/run-pass/issue-29668.rs index be785de44d194..e88d7811012bd 100644 --- a/src/test/run-pass/issue-29668.rs +++ b/src/test/run-pass/issue-29668.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Functions can return unnameable types mod m1 { diff --git a/src/test/run-pass/issue-29710.rs b/src/test/run-pass/issue-29710.rs index f4cfb7e3af884..ce0b97c631195 100644 --- a/src/test/run-pass/issue-29710.rs +++ b/src/test/run-pass/issue-29710.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(unused_results)] #![allow(dead_code)] diff --git a/src/test/run-pass/issue-29740.rs b/src/test/run-pass/issue-29740.rs index eb7b740db6e4b..d1b7d20ae6b26 100644 --- a/src/test/run-pass/issue-29740.rs +++ b/src/test/run-pass/issue-29740.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #29740. Inefficient MIR matching algorithms // generated way too much code for this sort of case, leading to OOM. diff --git a/src/test/run-pass/issue-29746.rs b/src/test/run-pass/issue-29746.rs index d4463fed1a674..67ae8c9e2d7af 100644 --- a/src/test/run-pass/issue-29746.rs +++ b/src/test/run-pass/issue-29746.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // zip!(a1,a2,a3,a4) is equivalent to: // a1.zip(a2).zip(a3).zip(a4).map(|(((x1,x2),x3),x4)| (x1,x2,x3,x4)) macro_rules! zip { diff --git a/src/test/run-pass/issue-29844.rs b/src/test/run-pass/issue-29844.rs index 51df4d60f0459..5b1b6bf492865 100644 --- a/src/test/run-pass/issue-29844.rs +++ b/src/test/run-pass/issue-29844.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::sync::Arc; pub struct DescriptorSet<'a> { diff --git a/src/test/run-pass/issue-2989.rs b/src/test/run-pass/issue-2989.rs index a4342f33402d3..cc6b669e61f75 100644 --- a/src/test/run-pass/issue-2989.rs +++ b/src/test/run-pass/issue-2989.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait methods { fn to_bytes(&self) -> Vec ; } diff --git a/src/test/run-pass/issue-29914-2.rs b/src/test/run-pass/issue-29914-2.rs index fe0a6cf288024..1a68383d5e672 100644 --- a/src/test/run-pass/issue-29914-2.rs +++ b/src/test/run-pass/issue-29914-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const ARR: [usize; 5] = [5, 4, 3, 2, 1]; fn main() { diff --git a/src/test/run-pass/issue-29914-3.rs b/src/test/run-pass/issue-29914-3.rs index 3a02764164cea..d47f8ccdeabf6 100644 --- a/src/test/run-pass/issue-29914-3.rs +++ b/src/test/run-pass/issue-29914-3.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const ARR: [usize; 5] = [5, 4, 3, 2, 1]; const BLA: usize = ARR[ARR[3]]; diff --git a/src/test/run-pass/issue-29914.rs b/src/test/run-pass/issue-29914.rs index bb933f0e42275..65d1304888a1d 100644 --- a/src/test/run-pass/issue-29914.rs +++ b/src/test/run-pass/issue-29914.rs @@ -1,12 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![feature(const_indexing)] const ARR: [usize; 5] = [5, 4, 3, 2, 1]; diff --git a/src/test/run-pass/issue-29927.rs b/src/test/run-pass/issue-29927.rs index 6d9adbcd57980..8d18c1ef6d364 100644 --- a/src/test/run-pass/issue-29927.rs +++ b/src/test/run-pass/issue-29927.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_fn)] struct A { field: usize, diff --git a/src/test/run-pass/issue-29948.rs b/src/test/run-pass/issue-29948.rs index 3a7e9ba93e190..5309330dd23f0 100644 --- a/src/test/run-pass/issue-29948.rs +++ b/src/test/run-pass/issue-29948.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare compiled with panic=abort by default use std::panic; diff --git a/src/test/run-pass/issue-30018-nopanic.rs b/src/test/run-pass/issue-30018-nopanic.rs index 25eff9def9dfc..96cd17abadd5f 100644 --- a/src/test/run-pass/issue-30018-nopanic.rs +++ b/src/test/run-pass/issue-30018-nopanic.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // More thorough regression test for Issues #30018 and #30822. This // attempts to explore different ways that array element construction // (for both scratch arrays and non-scratch ones) interacts with diff --git a/src/test/run-pass/issue-30018-panic.rs b/src/test/run-pass/issue-30018-panic.rs index e39ffb87425dc..142993069c900 100644 --- a/src/test/run-pass/issue-30018-panic.rs +++ b/src/test/run-pass/issue-30018-panic.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for Issue #30018. This is very similar to the // original reported test, except that the panic is wrapped in a // spawned thread to isolate the expected error result from the diff --git a/src/test/run-pass/issue-30081.rs b/src/test/run-pass/issue-30081.rs index 13e9daa7883cf..6462cf25bdaac 100644 --- a/src/test/run-pass/issue-30081.rs +++ b/src/test/run-pass/issue-30081.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This used to segfault #30081 pub enum Instruction { diff --git a/src/test/run-pass/issue-3012-2.rs b/src/test/run-pass/issue-3012-2.rs index bcf8a9180918c..582df9b27f00b 100644 --- a/src/test/run-pass/issue-3012-2.rs +++ b/src/test/run-pass/issue-3012-2.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-3012-1.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-30240.rs b/src/test/run-pass/issue-30240.rs index 3be661ce35e38..897b429c3ff62 100644 --- a/src/test/run-pass/issue-30240.rs +++ b/src/test/run-pass/issue-30240.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let &ref a = &[0i32] as &[_]; assert_eq!(a, &[0i32] as &[_]); diff --git a/src/test/run-pass/issue-3026.rs b/src/test/run-pass/issue-3026.rs index 7c0dc8a004890..30a98cef311dc 100644 --- a/src/test/run-pass/issue-3026.rs +++ b/src/test/run-pass/issue-3026.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/issue-3037.rs b/src/test/run-pass/issue-3037.rs index 83a522a69e3d1..0cdcc56fec94d 100644 --- a/src/test/run-pass/issue-3037.rs +++ b/src/test/run-pass/issue-3037.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 enum what { } diff --git a/src/test/run-pass/issue-30371.rs b/src/test/run-pass/issue-30371.rs index a4ab475e9eacc..f7a61e9b00ca7 100644 --- a/src/test/run-pass/issue-30371.rs +++ b/src/test/run-pass/issue-30371.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(unused_variables)] fn main() { diff --git a/src/test/run-pass/issue-30490.rs b/src/test/run-pass/issue-30490.rs index 633bd53864d13..538d69bb99f00 100644 --- a/src/test/run-pass/issue-30490.rs +++ b/src/test/run-pass/issue-30490.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/issue-3052.rs b/src/test/run-pass/issue-3052.rs index 3b56b2e28ff22..7df4e817bb002 100644 --- a/src/test/run-pass/issue-3052.rs +++ b/src/test/run-pass/issue-3052.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 type Connection = Box) + 'static>; diff --git a/src/test/run-pass/issue-30530.rs b/src/test/run-pass/issue-30530.rs index d5139c908bdac..dc36e01ffa5bb 100644 --- a/src/test/run-pass/issue-30530.rs +++ b/src/test/run-pass/issue-30530.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for Issue #30530: alloca's created for storing // intermediate scratch values during brace-less match arms need to be // initialized with their drop-flag set to "dropped" (or else we end diff --git a/src/test/run-pass/issue-30615.rs b/src/test/run-pass/issue-30615.rs index a26509d19829c..80e72771da36a 100644 --- a/src/test/run-pass/issue-30615.rs +++ b/src/test/run-pass/issue-30615.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { &0u8 as *const u8 as *const PartialEq; &[0u8] as *const [u8; 1] as *const [u8]; diff --git a/src/test/run-pass/issue-30756.rs b/src/test/run-pass/issue-30756.rs index 621607e5f6fa8..b410b8909d3fb 100644 --- a/src/test/run-pass/issue-30756.rs +++ b/src/test/run-pass/issue-30756.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![forbid(unsafe_code)] thread_local!(static FOO: u8 = 1); diff --git a/src/test/run-pass/issue-30891.rs b/src/test/run-pass/issue-30891.rs index 622e5fa544ec9..6f8a18dea4e12 100644 --- a/src/test/run-pass/issue-30891.rs +++ b/src/test/run-pass/issue-30891.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const ERROR_CONST: bool = true; fn get() -> bool { diff --git a/src/test/run-pass/issue-3091.rs b/src/test/run-pass/issue-3091.rs index c67399a89e9c6..0d3863ca0aa81 100644 --- a/src/test/run-pass/issue-3091.rs +++ b/src/test/run-pass/issue-3091.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { let x = 1; let y = 1; diff --git a/src/test/run-pass/issue-3109.rs b/src/test/run-pass/issue-3109.rs index dc22ebce804e6..1651fbaeeb6c7 100644 --- a/src/test/run-pass/issue-3109.rs +++ b/src/test/run-pass/issue-3109.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { println!("{:?}", ("hi there!", "you")); } diff --git a/src/test/run-pass/issue-3121.rs b/src/test/run-pass/issue-3121.rs index a0bdcf18ec520..53cbef30eb377 100644 --- a/src/test/run-pass/issue-3121.rs +++ b/src/test/run-pass/issue-3121.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] #[derive(Copy, Clone)] diff --git a/src/test/run-pass/issue-31260.rs b/src/test/run-pass/issue-31260.rs index d21ffb96bef2e..a7bceaffbf5e1 100644 --- a/src/test/run-pass/issue-31260.rs +++ b/src/test/run-pass/issue-31260.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Struct { pub field: K, } diff --git a/src/test/run-pass/issue-31267-additional.rs b/src/test/run-pass/issue-31267-additional.rs index 06ab310f6d21f..b8eff5f6d3371 100644 --- a/src/test/run-pass/issue-31267-additional.rs +++ b/src/test/run-pass/issue-31267-additional.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #[derive(Clone, Copy, Debug)] struct Bar; diff --git a/src/test/run-pass/issue-31267.rs b/src/test/run-pass/issue-31267.rs index 9cbdde4049164..b53c9389ccaae 100644 --- a/src/test/run-pass/issue-31267.rs +++ b/src/test/run-pass/issue-31267.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #31267 diff --git a/src/test/run-pass/issue-31299.rs b/src/test/run-pass/issue-31299.rs index 6c04e66068e60..890f0863e870a 100644 --- a/src/test/run-pass/issue-31299.rs +++ b/src/test/run-pass/issue-31299.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #31299. This was generating an overflow error // because of eager normalization: // diff --git a/src/test/run-pass/issue-3149.rs b/src/test/run-pass/issue-3149.rs index fa33bd8fce80b..f33fd989adad3 100644 --- a/src/test/run-pass/issue-3149.rs +++ b/src/test/run-pass/issue-3149.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn Matrix4(m11: T, m12: T, m13: T, m14: T, diff --git a/src/test/run-pass/issue-31597.rs b/src/test/run-pass/issue-31597.rs index 9acd6384b75e5..7d3347eadf962 100644 --- a/src/test/run-pass/issue-31597.rs +++ b/src/test/run-pass/issue-31597.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Make { type Out; diff --git a/src/test/run-pass/issue-31702.rs b/src/test/run-pass/issue-31702.rs index 334c1b2a28b14..a9d2aba70d0d3 100644 --- a/src/test/run-pass/issue-31702.rs +++ b/src/test/run-pass/issue-31702.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-31702-1.rs // aux-build:issue-31702-2.rs // ignore-test: FIXME(#31702) when this test was added it was thought that the diff --git a/src/test/run-pass/issue-31776.rs b/src/test/run-pass/issue-31776.rs index 0f1f6290a2573..39053ea9f1447 100644 --- a/src/test/run-pass/issue-31776.rs +++ b/src/test/run-pass/issue-31776.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Various scenarios in which `pub` is required in blocks struct S; diff --git a/src/test/run-pass/issue-32008.rs b/src/test/run-pass/issue-32008.rs index 95890d2e1b47b..25f2cf86cb6fa 100644 --- a/src/test/run-pass/issue-32008.rs +++ b/src/test/run-pass/issue-32008.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that binary operators allow subtyping on both the LHS and RHS, // and as such do not introduce unnecessarily strict lifetime constraints. diff --git a/src/test/run-pass/issue-3211.rs b/src/test/run-pass/issue-3211.rs index 28c9bf1e83a8d..66230237365dc 100644 --- a/src/test/run-pass/issue-3211.rs +++ b/src/test/run-pass/issue-3211.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { let mut x = 0; for _ in 0..4096 { x += 1; } diff --git a/src/test/run-pass/issue-3220.rs b/src/test/run-pass/issue-3220.rs index 0a37a01303777..5296cf126e65e 100644 --- a/src/test/run-pass/issue-3220.rs +++ b/src/test/run-pass/issue-3220.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct thing { x: isize, } diff --git a/src/test/run-pass/issue-32292.rs b/src/test/run-pass/issue-32292.rs index ed319b1391dc3..2b0a5e6425a14 100644 --- a/src/test/run-pass/issue-32292.rs +++ b/src/test/run-pass/issue-32292.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(warnings)] #[derive(Hash, Ord, PartialOrd, Eq, PartialEq, Debug, Clone, Copy)] diff --git a/src/test/run-pass/issue-32324.rs b/src/test/run-pass/issue-32324.rs index ca9dd6ada80b5..fd67dd9fc2ccf 100644 --- a/src/test/run-pass/issue-32324.rs +++ b/src/test/run-pass/issue-32324.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] trait Resources { diff --git a/src/test/run-pass/issue-32389.rs b/src/test/run-pass/issue-32389.rs index 2f6cfb61205c8..7157f3b63a6fc 100644 --- a/src/test/run-pass/issue-32389.rs +++ b/src/test/run-pass/issue-32389.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo() -> T { loop {} } fn test() { diff --git a/src/test/run-pass/issue-32518.rs b/src/test/run-pass/issue-32518.rs index 386d3e6524c4e..8a9cbf8364967 100644 --- a/src/test/run-pass/issue-32518.rs +++ b/src/test/run-pass/issue-32518.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic // aux-build:cgu_test.rs // aux-build:cgu_test_a.rs diff --git a/src/test/run-pass/issue-32805.rs b/src/test/run-pass/issue-32805.rs index b7ff63b75ce88..1f206b6aa584c 100644 --- a/src/test/run-pass/issue-32805.rs +++ b/src/test/run-pass/issue-32805.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn const_mir() -> f32 { 9007199791611905.0 } fn main() { diff --git a/src/test/run-pass/issue-3290.rs b/src/test/run-pass/issue-3290.rs index 6c775e15fb56e..93d67d9e67fe0 100644 --- a/src/test/run-pass/issue-3290.rs +++ b/src/test/run-pass/issue-3290.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/issue-32947.rs b/src/test/run-pass/issue-32947.rs index d059a46b4df12..0ef4daf2f796b 100644 --- a/src/test/run-pass/issue-32947.rs +++ b/src/test/run-pass/issue-32947.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten FIXME(#45351) #![feature(repr_simd, test)] diff --git a/src/test/run-pass/issue-33096.rs b/src/test/run-pass/issue-33096.rs index c3cf008c82515..b1fad129df596 100644 --- a/src/test/run-pass/issue-33096.rs +++ b/src/test/run-pass/issue-33096.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -g use std::ops::Deref; diff --git a/src/test/run-pass/issue-33185.rs b/src/test/run-pass/issue-33185.rs index f12e65323bc95..002145618a73b 100644 --- a/src/test/run-pass/issue-33185.rs +++ b/src/test/run-pass/issue-33185.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] #[macro_export] diff --git a/src/test/run-pass/issue-33187.rs b/src/test/run-pass/issue-33187.rs index 477112ab3c5ab..4845ba3464c3b 100644 --- a/src/test/run-pass/issue-33187.rs +++ b/src/test/run-pass/issue-33187.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo(::Data); impl Copy for Foo where ::Data: Copy { } diff --git a/src/test/run-pass/issue-33202.rs b/src/test/run-pass/issue-33202.rs index eb4192942f5ea..efc72fa3e0435 100644 --- a/src/test/run-pass/issue-33202.rs +++ b/src/test/run-pass/issue-33202.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[repr(C)] pub enum CPOption { PSome(T), diff --git a/src/test/run-pass/issue-33264.rs b/src/test/run-pass/issue-33264.rs index cb4b227548aab..2c86095e2fc5d 100644 --- a/src/test/run-pass/issue-33264.rs +++ b/src/test/run-pass/issue-33264.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // only-x86_64 #![allow(dead_code, non_upper_case_globals)] diff --git a/src/test/run-pass/issue-33287.rs b/src/test/run-pass/issue-33287.rs index a2021e0e52792..6201bab9ae2ad 100644 --- a/src/test/run-pass/issue-33287.rs +++ b/src/test/run-pass/issue-33287.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const A: [u32; 1] = [0]; fn test() { diff --git a/src/test/run-pass/issue-333.rs b/src/test/run-pass/issue-333.rs index bdd0a53530395..2d1fbf69b212c 100644 --- a/src/test/run-pass/issue-333.rs +++ b/src/test/run-pass/issue-333.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn quux(x: T) -> T { let f = id::; return f(x); } fn id(x: T) -> T { return x; } diff --git a/src/test/run-pass/issue-33387.rs b/src/test/run-pass/issue-33387.rs index d30e88b3968c7..973d37417a97d 100644 --- a/src/test/run-pass/issue-33387.rs +++ b/src/test/run-pass/issue-33387.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] use std::sync::Arc; diff --git a/src/test/run-pass/issue-33461.rs b/src/test/run-pass/issue-33461.rs index ac7f7ff422985..fcba5d6e77d75 100644 --- a/src/test/run-pass/issue-33461.rs +++ b/src/test/run-pass/issue-33461.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::marker::PhantomData; struct TheType { diff --git a/src/test/run-pass/issue-33498.rs b/src/test/run-pass/issue-33498.rs index 9b4e1918baea1..878f6f0ed327f 100644 --- a/src/test/run-pass/issue-33498.rs +++ b/src/test/run-pass/issue-33498.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { let x = (0, 2); diff --git a/src/test/run-pass/issue-33537.rs b/src/test/run-pass/issue-33537.rs index 24f4c9f590b11..106efab08391e 100644 --- a/src/test/run-pass/issue-33537.rs +++ b/src/test/run-pass/issue-33537.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_fn)] const fn foo() -> *const i8 { diff --git a/src/test/run-pass/issue-33687.rs b/src/test/run-pass/issue-33687.rs index 59badca065a10..8b237f377656b 100644 --- a/src/test/run-pass/issue-33687.rs +++ b/src/test/run-pass/issue-33687.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unboxed_closures)] #![feature(fn_traits)] diff --git a/src/test/run-pass/issue-33770.rs b/src/test/run-pass/issue-33770.rs index 7fad2b3e4a29c..a268b55cc38db 100644 --- a/src/test/run-pass/issue-33770.rs +++ b/src/test/run-pass/issue-33770.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/issue-3389.rs b/src/test/run-pass/issue-3389.rs index 70e3484a0c57a..fe436876205ed 100644 --- a/src/test/run-pass/issue-3389.rs +++ b/src/test/run-pass/issue-3389.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct trie_node { content: Vec , children: Vec , diff --git a/src/test/run-pass/issue-33903.rs b/src/test/run-pass/issue-33903.rs index 3bc0f7a0fdee8..bf865fdd8c347 100644 --- a/src/test/run-pass/issue-33903.rs +++ b/src/test/run-pass/issue-33903.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue 33903: // Built-in indexing should be used even when the index is not // trivially an integer diff --git a/src/test/run-pass/issue-33992.rs b/src/test/run-pass/issue-33992.rs index 98da7d46b1aa3..86bc9912aa4f5 100644 --- a/src/test/run-pass/issue-33992.rs +++ b/src/test/run-pass/issue-33992.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-windows // ignore-macos diff --git a/src/test/run-pass/issue-34053.rs b/src/test/run-pass/issue-34053.rs index 81c4552414752..3b4c04a438eab 100644 --- a/src/test/run-pass/issue-34053.rs +++ b/src/test/run-pass/issue-34053.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::sync::atomic::{AtomicUsize, ATOMIC_USIZE_INIT, Ordering}; static DROP_COUNTER: AtomicUsize = ATOMIC_USIZE_INIT; diff --git a/src/test/run-pass/issue-34074.rs b/src/test/run-pass/issue-34074.rs index 17d2bee746619..69d9e41cc25bc 100644 --- a/src/test/run-pass/issue-34074.rs +++ b/src/test/run-pass/issue-34074.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Make sure several unnamed function parameters don't conflict with each other trait Tr { diff --git a/src/test/run-pass/issue-34194.rs b/src/test/run-pass/issue-34194.rs index e1aef8996196d..76386bef63c0e 100644 --- a/src/test/run-pass/issue-34194.rs +++ b/src/test/run-pass/issue-34194.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] struct A { diff --git a/src/test/run-pass/issue-3424.rs b/src/test/run-pass/issue-3424.rs index 74e58f31e23e2..0fe173ed2aeb5 100644 --- a/src/test/run-pass/issue-3424.rs +++ b/src/test/run-pass/issue-3424.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // rustc --test ignores2.rs && ./ignores2 pub struct Path; diff --git a/src/test/run-pass/issue-3429.rs b/src/test/run-pass/issue-3429.rs index 325a3ec715124..fa85940c65b0c 100644 --- a/src/test/run-pass/issue-3429.rs +++ b/src/test/run-pass/issue-3429.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub fn main() { diff --git a/src/test/run-pass/issue-34427.rs b/src/test/run-pass/issue-34427.rs index 6bf8a2ac6a72d..1a698910ded7c 100644 --- a/src/test/run-pass/issue-34427.rs +++ b/src/test/run-pass/issue-34427.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #34427: On ARM, the code in `foo` at one time was generating // a machine code instruction of the form: `str r0, [r0, rN]!` (for // some N), which is not legal because the source register and base diff --git a/src/test/run-pass/issue-3447.rs b/src/test/run-pass/issue-3447.rs index 1558d94bae799..8ade3d056495f 100644 --- a/src/test/run-pass/issue-3447.rs +++ b/src/test/run-pass/issue-3447.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] use std::cell::RefCell; diff --git a/src/test/run-pass/issue-34503.rs b/src/test/run-pass/issue-34503.rs index e6217243eeb4a..daef2e159ed39 100644 --- a/src/test/run-pass/issue-34503.rs +++ b/src/test/run-pass/issue-34503.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { struct X; trait Foo { diff --git a/src/test/run-pass/issue-34569.rs b/src/test/run-pass/issue-34569.rs index 5c7c5a2b3b96f..d1cb301883deb 100644 --- a/src/test/run-pass/issue-34569.rs +++ b/src/test/run-pass/issue-34569.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-g // In this test we just want to make sure that the code below does not lead to diff --git a/src/test/run-pass/issue-34571.rs b/src/test/run-pass/issue-34571.rs index 7d80415657655..28fe076b644d4 100644 --- a/src/test/run-pass/issue-34571.rs +++ b/src/test/run-pass/issue-34571.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[repr(u8)] enum Foo { Foo(u8), diff --git a/src/test/run-pass/issue-34751.rs b/src/test/run-pass/issue-34751.rs index d4cea506f730a..23805075f46c6 100644 --- a/src/test/run-pass/issue-34751.rs +++ b/src/test/run-pass/issue-34751.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // #34751 ICE: 'rustc' panicked at 'assertion failed: !substs.has_regions_escaping_depth(0)' #[allow(dead_code)] diff --git a/src/test/run-pass/issue-34780.rs b/src/test/run-pass/issue-34780.rs index eda4ebb7132a8..eba406bd1f5ee 100644 --- a/src/test/run-pass/issue-34780.rs +++ b/src/test/run-pass/issue-34780.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(associated_consts)] use std::marker::PhantomData; diff --git a/src/test/run-pass/issue-34784.rs b/src/test/run-pass/issue-34784.rs index c9a214e0cedd0..f3d28018043ec 100644 --- a/src/test/run-pass/issue-34784.rs +++ b/src/test/run-pass/issue-34784.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const C: *const u8 = &0; fn foo(x: *const u8) { diff --git a/src/test/run-pass/issue-34796.rs b/src/test/run-pass/issue-34796.rs index 0fb6ccc0dc8bd..cc3606fec5920 100644 --- a/src/test/run-pass/issue-34796.rs +++ b/src/test/run-pass/issue-34796.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test case exposes conditions where the encoding of a trait object type // with projection predicates would differ between this crate and the upstream // crate, because the predicates were encoded in different order within each diff --git a/src/test/run-pass/issue-34798.rs b/src/test/run-pass/issue-34798.rs index e217d07ed725d..670cf490ca180 100644 --- a/src/test/run-pass/issue-34798.rs +++ b/src/test/run-pass/issue-34798.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![forbid(improper_ctypes)] #![allow(dead_code)] diff --git a/src/test/run-pass/issue-34932.rs b/src/test/run-pass/issue-34932.rs index dca387dcc2117..ed2183ce568a1 100644 --- a/src/test/run-pass/issue-34932.rs +++ b/src/test/run-pass/issue-34932.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:--test // rustc-env:RUSTC_BOOTSTRAP_KEY= #![cfg(any())] // This test should be configured away diff --git a/src/test/run-pass/issue-3500.rs b/src/test/run-pass/issue-3500.rs index f1d9f888b0816..87a7c60dfff02 100644 --- a/src/test/run-pass/issue-3500.rs +++ b/src/test/run-pass/issue-3500.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub fn main() { diff --git a/src/test/run-pass/issue-35376.rs b/src/test/run-pass/issue-35376.rs index 9e4eb84edc67c..8f2342ba1aa48 100644 --- a/src/test/run-pass/issue-35376.rs +++ b/src/test/run-pass/issue-35376.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(specialization)] fn main() {} diff --git a/src/test/run-pass/issue-35423.rs b/src/test/run-pass/issue-35423.rs index 34cb2930db0cf..21da292368ee5 100644 --- a/src/test/run-pass/issue-35423.rs +++ b/src/test/run-pass/issue-35423.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main () { let x = 4; match x { diff --git a/src/test/run-pass/issue-35546.rs b/src/test/run-pass/issue-35546.rs index e8d14f1d42146..c83efffd240bd 100644 --- a/src/test/run-pass/issue-35546.rs +++ b/src/test/run-pass/issue-35546.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #35546. Check that we are able to codegen // this. Before we had problems because of the drop glue signature // around dropping a trait object (specifically, when dropping the diff --git a/src/test/run-pass/issue-3556.rs b/src/test/run-pass/issue-3556.rs index e6b577ada0c86..164d70c9dc909 100644 --- a/src/test/run-pass/issue-3556.rs +++ b/src/test/run-pass/issue-3556.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #[derive(Debug)] enum Token { Text(String), diff --git a/src/test/run-pass/issue-3559.rs b/src/test/run-pass/issue-3559.rs index 64f053d9a8c6d..b4263cda2da54 100644 --- a/src/test/run-pass/issue-3559.rs +++ b/src/test/run-pass/issue-3559.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::HashMap; fn check_strs(actual: &str, expected: &str) -> bool { diff --git a/src/test/run-pass/issue-35600.rs b/src/test/run-pass/issue-35600.rs index 88358eff08d05..75cbbdbb05006 100644 --- a/src/test/run-pass/issue-35600.rs +++ b/src/test/run-pass/issue-35600.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { type bar; fn bar(); diff --git a/src/test/run-pass/issue-3563-2.rs b/src/test/run-pass/issue-3563-2.rs index 65c21317cf247..a3c64260e43f3 100644 --- a/src/test/run-pass/issue-3563-2.rs +++ b/src/test/run-pass/issue-3563-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait Canvas { diff --git a/src/test/run-pass/issue-3563-3.rs b/src/test/run-pass/issue-3563-3.rs index 56208d08779cb..35b79bfb23488 100644 --- a/src/test/run-pass/issue-3563-3.rs +++ b/src/test/run-pass/issue-3563-3.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ASCII art shape renderer. Demonstrates traits, impls, operator overloading, // non-copyable struct, unit testing. To run execute: rustc --test shapes.rs && // ./shapes diff --git a/src/test/run-pass/issue-3574.rs b/src/test/run-pass/issue-3574.rs index 9aac52fa2f8a1..d77a7ee209973 100644 --- a/src/test/run-pass/issue-3574.rs +++ b/src/test/run-pass/issue-3574.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // rustc --test match_borrowed_str.rs.rs && ./match_borrowed_str.rs diff --git a/src/test/run-pass/issue-35815.rs b/src/test/run-pass/issue-35815.rs index 619542926500b..96009e7460961 100644 --- a/src/test/run-pass/issue-35815.rs +++ b/src/test/run-pass/issue-35815.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::mem; struct Foo { diff --git a/src/test/run-pass/issue-36023.rs b/src/test/run-pass/issue-36023.rs index f6c03b384f23d..66d1751820dcc 100644 --- a/src/test/run-pass/issue-36023.rs +++ b/src/test/run-pass/issue-36023.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::Deref; fn main() { diff --git a/src/test/run-pass/issue-36036-associated-type-layout.rs b/src/test/run-pass/issue-36036-associated-type-layout.rs index 4ee3be0eb7b81..530a812659159 100644 --- a/src/test/run-pass/issue-36036-associated-type-layout.rs +++ b/src/test/run-pass/issue-36036-associated-type-layout.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue 36036: computing the layout of a type composed from another // trait's associated type caused compiler to ICE when the associated // type was allowed to be unsized, even though the known instantiated diff --git a/src/test/run-pass/issue-36053.rs b/src/test/run-pass/issue-36053.rs index ece58eedc56ee..143c600142673 100644 --- a/src/test/run-pass/issue-36053.rs +++ b/src/test/run-pass/issue-36053.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #36053. ICE was caused due to obligations being // added to a special, dedicated fulfillment cx during a // probe. Problem seems to be related to the particular definition of diff --git a/src/test/run-pass/issue-36075.rs b/src/test/run-pass/issue-36075.rs index fe399e10c1c3f..aca08567eb886 100644 --- a/src/test/run-pass/issue-36075.rs +++ b/src/test/run-pass/issue-36075.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait DeclarationParser { type Declaration; } diff --git a/src/test/run-pass/issue-3609.rs b/src/test/run-pass/issue-3609.rs index f53053f2edcb7..58998035ccfcb 100644 --- a/src/test/run-pass/issue-3609.rs +++ b/src/test/run-pass/issue-3609.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::thread; use std::sync::mpsc::Sender; diff --git a/src/test/run-pass/issue-36139-normalize-closure-sig.rs b/src/test/run-pass/issue-36139-normalize-closure-sig.rs index adde0ed306674..d2a1e4d036692 100644 --- a/src/test/run-pass/issue-36139-normalize-closure-sig.rs +++ b/src/test/run-pass/issue-36139-normalize-closure-sig.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Previously the closure's argument would be inferred to // >::Item, causing an error in MIR type // checking diff --git a/src/test/run-pass/issue-36260.rs b/src/test/run-pass/issue-36260.rs index 08dbbb5c9fe13..a1c324103213f 100644 --- a/src/test/run-pass/issue-36260.rs +++ b/src/test/run-pass/issue-36260.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Make sure this compiles without getting a linker error because of missing // drop-glue because the collector missed adding drop-glue for the closure: diff --git a/src/test/run-pass/issue-36278-prefix-nesting.rs b/src/test/run-pass/issue-36278-prefix-nesting.rs index 95269d0569dec..9bf62db4ec1b9 100644 --- a/src/test/run-pass/issue-36278-prefix-nesting.rs +++ b/src/test/run-pass/issue-36278-prefix-nesting.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue 36278: On an unsized struct with >1 level of nontrivial // nesting, ensure we are computing dynamic size of prefix correctly. diff --git a/src/test/run-pass/issue-36381.rs b/src/test/run-pass/issue-36381.rs index 2694c98dd9163..897e96c1cfc76 100644 --- a/src/test/run-pass/issue-36381.rs +++ b/src/test/run-pass/issue-36381.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #36381. The monomorphization collector was asserting that // there are no projection types, but the `<&str as // StreamOnce>::Position` projection contained a late-bound region, diff --git a/src/test/run-pass/issue-36401.rs b/src/test/run-pass/issue-36401.rs index 7b08eba9e4988..226b9a91d9515 100644 --- a/src/test/run-pass/issue-36401.rs +++ b/src/test/run-pass/issue-36401.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug)] pub enum Event { Key(u8), diff --git a/src/test/run-pass/issue-36474.rs b/src/test/run-pass/issue-36474.rs index 025244ca6648c..67f19859644e0 100644 --- a/src/test/run-pass/issue-36474.rs +++ b/src/test/run-pass/issue-36474.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { remove_axis(&3, 0); } diff --git a/src/test/run-pass/issue-3656.rs b/src/test/run-pass/issue-3656.rs index c278dcef9dde7..5e2b2fbf0effa 100644 --- a/src/test/run-pass/issue-3656.rs +++ b/src/test/run-pass/issue-3656.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #3656 // Incorrect struct size computation in the FFI, because of not taking // the alignment of elements into account. diff --git a/src/test/run-pass/issue-36744-bitcast-args-if-needed.rs b/src/test/run-pass/issue-36744-bitcast-args-if-needed.rs index 1859cc9ca00b5..802056ea02afc 100644 --- a/src/test/run-pass/issue-36744-bitcast-args-if-needed.rs +++ b/src/test/run-pass/issue-36744-bitcast-args-if-needed.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This tests for an ICE (and, if ignored, subsequent LLVM abort) when // a lifetime-parametric fn is passed into a context whose expected // type has a differing lifetime parameterization. diff --git a/src/test/run-pass/issue-36744-without-calls.rs b/src/test/run-pass/issue-36744-without-calls.rs index 1766edb06b481..c8b68d57274fe 100644 --- a/src/test/run-pass/issue-36744-without-calls.rs +++ b/src/test/run-pass/issue-36744-without-calls.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests for an LLVM abort when storing a lifetime-parametric fn into // context that is expecting one that is not lifetime-parametric // (i.e. has no `for <'_>`). diff --git a/src/test/run-pass/issue-36768.rs b/src/test/run-pass/issue-36768.rs index bb4d12919a1c2..2cb39b9ac8789 100644 --- a/src/test/run-pass/issue-36768.rs +++ b/src/test/run-pass/issue-36768.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:--test #![deny(private_in_public)] diff --git a/src/test/run-pass/issue-36786-resolve-call.rs b/src/test/run-pass/issue-36786-resolve-call.rs index 0d718c7ba4683..c99fc92a025fe 100644 --- a/src/test/run-pass/issue-36786-resolve-call.rs +++ b/src/test/run-pass/issue-36786-resolve-call.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Ensure that types that rely on obligations are autoderefed // correctly diff --git a/src/test/run-pass/issue-36792.rs b/src/test/run-pass/issue-36792.rs index f2755ec3f8466..2f6d386d433a5 100644 --- a/src/test/run-pass/issue-36792.rs +++ b/src/test/run-pass/issue-36792.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo() -> impl Copy { foo } diff --git a/src/test/run-pass/issue-36816.rs b/src/test/run-pass/issue-36816.rs index 22f3a52b26e74..0ed0301dbd53f 100644 --- a/src/test/run-pass/issue-36816.rs +++ b/src/test/run-pass/issue-36816.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! m { () => { 1 } } macro_rules! n { () => { 1 + m!() } } diff --git a/src/test/run-pass/issue-3683.rs b/src/test/run-pass/issue-3683.rs index ed9b8066104f5..c8f2ab37e13f2 100644 --- a/src/test/run-pass/issue-3683.rs +++ b/src/test/run-pass/issue-3683.rs @@ -1,12 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // diff --git a/src/test/run-pass/issue-36856.rs b/src/test/run-pass/issue-36856.rs index 91a0dadd65328..7c0a48373a705 100644 --- a/src/test/run-pass/issue-36856.rs +++ b/src/test/run-pass/issue-36856.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #36856. // compile-flags:-g diff --git a/src/test/run-pass/issue-36936.rs b/src/test/run-pass/issue-36936.rs index 34a9c2916683f..a25d44f3208a1 100644 --- a/src/test/run-pass/issue-36936.rs +++ b/src/test/run-pass/issue-36936.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // check that casts are not being treated as lexprs. fn main() { diff --git a/src/test/run-pass/issue-36954.rs b/src/test/run-pass/issue-36954.rs index f8330ba99b7ae..5da2fb2a5e052 100644 --- a/src/test/run-pass/issue-36954.rs +++ b/src/test/run-pass/issue-36954.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-36954.rs extern crate issue_36954 as lib; diff --git a/src/test/run-pass/issue-3702.rs b/src/test/run-pass/issue-3702.rs index 9c09b8cd1c723..bf4072326dbbb 100644 --- a/src/test/run-pass/issue-3702.rs +++ b/src/test/run-pass/issue-3702.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { trait Text { fn to_string(&self) -> String; diff --git a/src/test/run-pass/issue-37109.rs b/src/test/run-pass/issue-37109.rs index 1c893071d5589..920fac9dc81c6 100644 --- a/src/test/run-pass/issue-37109.rs +++ b/src/test/run-pass/issue-37109.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait ToRef<'a> { type Ref: 'a; } diff --git a/src/test/run-pass/issue-37175.rs b/src/test/run-pass/issue-37175.rs index 0d3613b573e12..b1bcc6b97768a 100644 --- a/src/test/run-pass/issue-37175.rs +++ b/src/test/run-pass/issue-37175.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! m { (<$t:ty>) => { stringify!($t) } } fn main() { println!("{}", m!(>)); diff --git a/src/test/run-pass/issue-37222.rs b/src/test/run-pass/issue-37222.rs index 381a5799cc555..3be77fdf2d41e 100644 --- a/src/test/run-pass/issue-37222.rs +++ b/src/test/run-pass/issue-37222.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug, PartialEq)] enum Bar { A(i64), diff --git a/src/test/run-pass/issue-37291/auxiliary/lib.rs b/src/test/run-pass/issue-37291/auxiliary/lib.rs index 67cdea807beeb..1b163ee1391ca 100644 --- a/src/test/run-pass/issue-37291/auxiliary/lib.rs +++ b/src/test/run-pass/issue-37291/auxiliary/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] use std::ops::Mul; diff --git a/src/test/run-pass/issue-37291/main.rs b/src/test/run-pass/issue-37291/main.rs index 2461f7485f26f..af9a72416a819 100644 --- a/src/test/run-pass/issue-37291/main.rs +++ b/src/test/run-pass/issue-37291/main.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:lib.rs // Regression test for #37291. The problem was that the starting diff --git a/src/test/run-pass/issue-3743.rs b/src/test/run-pass/issue-3743.rs index cd62c04a32581..502bbe4143c88 100644 --- a/src/test/run-pass/issue-3743.rs +++ b/src/test/run-pass/issue-3743.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // If `Mul` used an associated type for its output, this test would // work more smoothly. diff --git a/src/test/run-pass/issue-3753.rs b/src/test/run-pass/issue-3753.rs index e6eb8efe442f3..50aac49bea749 100644 --- a/src/test/run-pass/issue-3753.rs +++ b/src/test/run-pass/issue-3753.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #3656 // Issue Name: pub method preceded by attribute can't be parsed // Abstract: Visibility parsing failed when compiler parsing diff --git a/src/test/run-pass/issue-37598.rs b/src/test/run-pass/issue-37598.rs index e97c8d9f4176c..0dd018edd3058 100644 --- a/src/test/run-pass/issue-37598.rs +++ b/src/test/run-pass/issue-37598.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(slice_patterns)] fn check(list: &[u8]) { diff --git a/src/test/run-pass/issue-37655.rs b/src/test/run-pass/issue-37655.rs index d229bcacc501a..1b7c5954ae327 100644 --- a/src/test/run-pass/issue-37655.rs +++ b/src/test/run-pass/issue-37655.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #37655. The problem was a false edge created by // coercion that wound up requiring that `'a` (in `split()`) outlive // `'b`, which shouldn't be necessary. diff --git a/src/test/run-pass/issue-37686.rs b/src/test/run-pass/issue-37686.rs index 47881d4d530f7..49dfa8fe31ff9 100644 --- a/src/test/run-pass/issue-37686.rs +++ b/src/test/run-pass/issue-37686.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { match (0, 0) { (std::usize::MIN, std::usize::MAX) => {} diff --git a/src/test/run-pass/issue-37725.rs b/src/test/run-pass/issue-37725.rs index a8fb11f9c62bd..08731afa52946 100644 --- a/src/test/run-pass/issue-37725.rs +++ b/src/test/run-pass/issue-37725.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn foo(&self); } diff --git a/src/test/run-pass/issue-37733.rs b/src/test/run-pass/issue-37733.rs index 358b93254de90..fa9fd340ef800 100644 --- a/src/test/run-pass/issue-37733.rs +++ b/src/test/run-pass/issue-37733.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - type A = for<> fn(); type B = for<'a,> fn(); diff --git a/src/test/run-pass/issue-3794.rs b/src/test/run-pass/issue-3794.rs index badb833ee800b..9161fefef30cf 100644 --- a/src/test/run-pass/issue-3794.rs +++ b/src/test/run-pass/issue-3794.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] trait T { diff --git a/src/test/run-pass/issue-37991.rs b/src/test/run-pass/issue-37991.rs index 9bdde02d0061c..68fdbdb52542c 100644 --- a/src/test/run-pass/issue-37991.rs +++ b/src/test/run-pass/issue-37991.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_fn)] const fn foo() -> i64 { diff --git a/src/test/run-pass/issue-38002.rs b/src/test/run-pass/issue-38002.rs index 4eb381b9eac27..0ec5fdca8fee8 100644 --- a/src/test/run-pass/issue-38002.rs +++ b/src/test/run-pass/issue-38002.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that constant ADTs are codegened OK, part k of N. enum Bar { diff --git a/src/test/run-pass/issue-38033.rs b/src/test/run-pass/issue-38033.rs index 50549dc8b2380..467415b697e62 100644 --- a/src/test/run-pass/issue-38033.rs +++ b/src/test/run-pass/issue-38033.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::marker; use std::mem; diff --git a/src/test/run-pass/issue-38074.rs b/src/test/run-pass/issue-38074.rs index 2368ba8a110be..ec035d42448ed 100644 --- a/src/test/run-pass/issue-38074.rs +++ b/src/test/run-pass/issue-38074.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten FIXME(#45351) #![feature(platform_intrinsics, repr_simd)] diff --git a/src/test/run-pass/issue-38091.rs b/src/test/run-pass/issue-38091.rs index 34050242f84fa..39be9d00f5450 100644 --- a/src/test/run-pass/issue-38091.rs +++ b/src/test/run-pass/issue-38091.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(specialization)] trait Iterate<'a> { diff --git a/src/test/run-pass/issue-38190.rs b/src/test/run-pass/issue-38190.rs index ed9bf9e809520..431adecb89adf 100644 --- a/src/test/run-pass/issue-38190.rs +++ b/src/test/run-pass/issue-38190.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_38190.rs // ignore-pretty issue #37195 diff --git a/src/test/run-pass/issue-38226.rs b/src/test/run-pass/issue-38226.rs index dd9f9be7da713..dd4e638bc5d39 100644 --- a/src/test/run-pass/issue-38226.rs +++ b/src/test/run-pass/issue-38226.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test makes sure that we don't run into a linker error because of the // middle::reachable pass missing trait methods with default impls. diff --git a/src/test/run-pass/issue-38437.rs b/src/test/run-pass/issue-38437.rs index a6e7df1c0102c..97149aad620e1 100644 --- a/src/test/run-pass/issue-38437.rs +++ b/src/test/run-pass/issue-38437.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that drop elaboration clears the "master" discriminant // drop flag even if it protects no fields. diff --git a/src/test/run-pass/issue-3847.rs b/src/test/run-pass/issue-3847.rs index bd3a726991b91..83e772f5e21ea 100644 --- a/src/test/run-pass/issue-3847.rs +++ b/src/test/run-pass/issue-3847.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod buildings { pub struct Tower { pub height: usize } } diff --git a/src/test/run-pass/issue-38556.rs b/src/test/run-pass/issue-38556.rs index f6f334f650b24..fc48bfed9d7a5 100644 --- a/src/test/run-pass/issue-38556.rs +++ b/src/test/run-pass/issue-38556.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Foo; macro_rules! reexport { diff --git a/src/test/run-pass/issue-38715.rs b/src/test/run-pass/issue-38715.rs index b158234eb1154..a8e5265dd9d20 100644 --- a/src/test/run-pass/issue-38715.rs +++ b/src/test/run-pass/issue-38715.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_38715.rs // aux-build:issue_38715-modern.rs diff --git a/src/test/run-pass/issue-38727.rs b/src/test/run-pass/issue-38727.rs index e60b6a99f9213..fd80bb581da20 100644 --- a/src/test/run-pass/issue-38727.rs +++ b/src/test/run-pass/issue-38727.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[repr(u64)] enum A { A = 0u64, diff --git a/src/test/run-pass/issue-3874.rs b/src/test/run-pass/issue-3874.rs index a29a26758654e..198d50b0993e5 100644 --- a/src/test/run-pass/issue-3874.rs +++ b/src/test/run-pass/issue-3874.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 enum PureCounter { PureCounterVariant(usize) } diff --git a/src/test/run-pass/issue-38763.rs b/src/test/run-pass/issue-38763.rs index e038062ff9ae7..19b68d3e821d4 100644 --- a/src/test/run-pass/issue-38763.rs +++ b/src/test/run-pass/issue-38763.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten #[repr(C)] diff --git a/src/test/run-pass/issue-3878.rs b/src/test/run-pass/issue-3878.rs index e0e11b4fd8650..7989961477fd5 100644 --- a/src/test/run-pass/issue-3878.rs +++ b/src/test/run-pass/issue-3878.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![allow(path_statements)] diff --git a/src/test/run-pass/issue-3888-2.rs b/src/test/run-pass/issue-3888-2.rs index 24c1a5d05c89f..5b1e52b659fb0 100644 --- a/src/test/run-pass/issue-3888-2.rs +++ b/src/test/run-pass/issue-3888-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn vec_peek<'r, T>(v: &'r [T]) -> &'r [T] { diff --git a/src/test/run-pass/issue-38942.rs b/src/test/run-pass/issue-38942.rs index 9c1c999d090ef..8b44b89d55dea 100644 --- a/src/test/run-pass/issue-38942.rs +++ b/src/test/run-pass/issue-38942.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // See https://github.com/rust-lang/rust/issues/38942 #[repr(u64)] diff --git a/src/test/run-pass/issue-3895.rs b/src/test/run-pass/issue-3895.rs index ffe14dab30039..ea34481409b5a 100644 --- a/src/test/run-pass/issue-3895.rs +++ b/src/test/run-pass/issue-3895.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { enum State { BadChar, BadSyntax } diff --git a/src/test/run-pass/issue-38987.rs b/src/test/run-pass/issue-38987.rs index 31a3b7233d8cd..dbbf2adf79a05 100644 --- a/src/test/run-pass/issue-38987.rs +++ b/src/test/run-pass/issue-38987.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let _ = -0x8000_0000_0000_0000_0000_0000_0000_0000i128; } diff --git a/src/test/run-pass/issue-3904.rs b/src/test/run-pass/issue-3904.rs index e917ecc745f0b..45926f27946e0 100644 --- a/src/test/run-pass/issue-3904.rs +++ b/src/test/run-pass/issue-3904.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn example_err(prog: &str, arg: &str) { println!("{}: {}", prog, arg) } diff --git a/src/test/run-pass/issue-39089.rs b/src/test/run-pass/issue-39089.rs index c3a58844547d6..3cca38d9b5387 100644 --- a/src/test/run-pass/issue-39089.rs +++ b/src/test/run-pass/issue-39089.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn f Sized>() {} fn main() {} diff --git a/src/test/run-pass/issue-39292.rs b/src/test/run-pass/issue-39292.rs index dc2b21f3470e8..6e51e618d07ea 100644 --- a/src/test/run-pass/issue-39292.rs +++ b/src/test/run-pass/issue-39292.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #39292. The object vtable was being // incorrectly left with a null pointer. diff --git a/src/test/run-pass/issue-3935.rs b/src/test/run-pass/issue-3935.rs index 45ff20fc0a9c3..54f67c5911f29 100644 --- a/src/test/run-pass/issue-3935.rs +++ b/src/test/run-pass/issue-3935.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #[derive(PartialEq)] struct Bike { name: String, diff --git a/src/test/run-pass/issue-39367.rs b/src/test/run-pass/issue-39367.rs index 3e72efada84e6..84e352196f39d 100644 --- a/src/test/run-pass/issue-39367.rs +++ b/src/test/run-pass/issue-39367.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::Deref; struct ArenaSet::Target>(U, &'static V) diff --git a/src/test/run-pass/issue-39467.rs b/src/test/run-pass/issue-39467.rs index 9f94be271eeb6..099e0ba8fb0bc 100644 --- a/src/test/run-pass/issue-39467.rs +++ b/src/test/run-pass/issue-39467.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! expr { () => { () } } enum A {} diff --git a/src/test/run-pass/issue-39548.rs b/src/test/run-pass/issue-39548.rs index 7da50670d1dee..7d82d2148b1d3 100644 --- a/src/test/run-pass/issue-39548.rs +++ b/src/test/run-pass/issue-39548.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - type Array = [(); ((1 < 2) == false) as usize]; fn main() { diff --git a/src/test/run-pass/issue-39709.rs b/src/test/run-pass/issue-39709.rs index ebca9312a64b0..c79b9583d297e 100644 --- a/src/test/run-pass/issue-39709.rs +++ b/src/test/run-pass/issue-39709.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { println!("{}", { macro_rules! x { ($(t:tt)*) => {} } 33 }); } diff --git a/src/test/run-pass/issue-39720.rs b/src/test/run-pass/issue-39720.rs index 9873a8c2bf44f..c696e54f4b2c1 100644 --- a/src/test/run-pass/issue-39720.rs +++ b/src/test/run-pass/issue-39720.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten FIXME(#45351) #![feature(repr_simd, platform_intrinsics)] diff --git a/src/test/run-pass/issue-3979-2.rs b/src/test/run-pass/issue-3979-2.rs index 4cd3c04bac3c2..46229a2062075 100644 --- a/src/test/run-pass/issue-3979-2.rs +++ b/src/test/run-pass/issue-3979-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait A { diff --git a/src/test/run-pass/issue-3979-generics.rs b/src/test/run-pass/issue-3979-generics.rs index 2b56799f6b07c..5c540400d7efc 100644 --- a/src/test/run-pass/issue-3979-generics.rs +++ b/src/test/run-pass/issue-3979-generics.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::ops::Add; trait Positioned { diff --git a/src/test/run-pass/issue-3979-xcrate.rs b/src/test/run-pass/issue-3979-xcrate.rs index acacc48856646..b0d124bac44a2 100644 --- a/src/test/run-pass/issue-3979-xcrate.rs +++ b/src/test/run-pass/issue-3979-xcrate.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_3979_traits.rs extern crate issue_3979_traits; diff --git a/src/test/run-pass/issue-3979.rs b/src/test/run-pass/issue-3979.rs index 9b5f7296ab592..d51dd27f7ae0c 100644 --- a/src/test/run-pass/issue-3979.rs +++ b/src/test/run-pass/issue-3979.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Positioned { fn SetX(&mut self, _: isize); fn X(&self) -> isize; diff --git a/src/test/run-pass/issue-39808.rs b/src/test/run-pass/issue-39808.rs index 91c70d76eefbc..a3c3763a74b0a 100644 --- a/src/test/run-pass/issue-39808.rs +++ b/src/test/run-pass/issue-39808.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unreachable_code)] // Regression test for #39808. The type parameter of `Owned` was diff --git a/src/test/run-pass/issue-39823.rs b/src/test/run-pass/issue-39823.rs index 061a55b03b218..beb7a6cee2378 100644 --- a/src/test/run-pass/issue-39823.rs +++ b/src/test/run-pass/issue-39823.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_39823.rs extern crate issue_39823; diff --git a/src/test/run-pass/issue-39827.rs b/src/test/run-pass/issue-39827.rs index b753cf5844fa9..514a7ab07246c 100644 --- a/src/test/run-pass/issue-39827.rs +++ b/src/test/run-pass/issue-39827.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![feature(core_intrinsics)] use std::intrinsics::{ volatile_copy_memory, volatile_store, volatile_load, diff --git a/src/test/run-pass/issue-3991.rs b/src/test/run-pass/issue-3991.rs index d89cf8c2e1064..cfe20ef3d6649 100644 --- a/src/test/run-pass/issue-3991.rs +++ b/src/test/run-pass/issue-3991.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // pretty-expanded FIXME #23616 struct HasNested { diff --git a/src/test/run-pass/issue-39984.rs b/src/test/run-pass/issue-39984.rs index a0019e7215c98..95795501acc64 100644 --- a/src/test/run-pass/issue-39984.rs +++ b/src/test/run-pass/issue-39984.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #39984. // // The key here is that the error type of the `Ok` call ought to be diff --git a/src/test/run-pass/issue-40003.rs b/src/test/run-pass/issue-40003.rs index 103a365af0eb3..17f27f55099a6 100644 --- a/src/test/run-pass/issue-40003.rs +++ b/src/test/run-pass/issue-40003.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { if false { test(); } } diff --git a/src/test/run-pass/issue-40085.rs b/src/test/run-pass/issue-40085.rs index b6d02908a0f78..da7a0e577c7a2 100644 --- a/src/test/run-pass/issue-40085.rs +++ b/src/test/run-pass/issue-40085.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::Index; fn bar() {} static UNIT: () = (); diff --git a/src/test/run-pass/issue-40136.rs b/src/test/run-pass/issue-40136.rs index 488754af06fb8..e319e1d9a1cc1 100644 --- a/src/test/run-pass/issue-40136.rs +++ b/src/test/run-pass/issue-40136.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - macro_rules! m { () => { 0 } } trait T { diff --git a/src/test/run-pass/issue-40235.rs b/src/test/run-pass/issue-40235.rs index 90f170d8e42e0..dd25aef339bf0 100644 --- a/src/test/run-pass/issue-40235.rs +++ b/src/test/run-pass/issue-40235.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo() {} fn main() { diff --git a/src/test/run-pass/issue-4025.rs b/src/test/run-pass/issue-4025.rs index dec148ca0f6dc..8f32566c64be6 100644 --- a/src/test/run-pass/issue-4025.rs +++ b/src/test/run-pass/issue-4025.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /* # if b { x } else { y } requires identical types for x and y */ diff --git a/src/test/run-pass/issue-40408.rs b/src/test/run-pass/issue-40408.rs index a73dc1966b4be..00a07870c3aa2 100644 --- a/src/test/run-pass/issue-40408.rs +++ b/src/test/run-pass/issue-40408.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { println!("{}", 0E+10); println!("{}", 0e+10); diff --git a/src/test/run-pass/issue-40469.rs b/src/test/run-pass/issue-40469.rs index 30055e532cd45..8306909502ea2 100644 --- a/src/test/run-pass/issue-40469.rs +++ b/src/test/run-pass/issue-40469.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty issue #37195 #![allow(dead_code)] diff --git a/src/test/run-pass/issue-40770.rs b/src/test/run-pass/issue-40770.rs index 599d0b273e3f1..1786d4c29630d 100644 --- a/src/test/run-pass/issue-40770.rs +++ b/src/test/run-pass/issue-40770.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! m { ($e:expr) => { macro_rules! n { () => { $e } } diff --git a/src/test/run-pass/issue-40847.rs b/src/test/run-pass/issue-40847.rs index 2fa99984401c1..7a052ed6ad3dc 100644 --- a/src/test/run-pass/issue-40847.rs +++ b/src/test/run-pass/issue-40847.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! gen { ($name:ident ( $($dol:tt $var:ident)* ) $($body:tt)*) => { macro_rules! $name { diff --git a/src/test/run-pass/issue-40883.rs b/src/test/run-pass/issue-40883.rs index c1f3b2028aa7e..0be752891ee90 100644 --- a/src/test/run-pass/issue-40883.rs +++ b/src/test/run-pass/issue-40883.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // check that we don't have linear stack usage with multiple calls to `push` #![feature(test)] diff --git a/src/test/run-pass/issue-40951.rs b/src/test/run-pass/issue-40951.rs index adc7101b16aa1..efed90afbe2d6 100644 --- a/src/test/run-pass/issue-40951.rs +++ b/src/test/run-pass/issue-40951.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #40951. const FOO: [&'static str; 1] = ["foo"]; diff --git a/src/test/run-pass/issue-40962.rs b/src/test/run-pass/issue-40962.rs index b35cfa12eab18..302eb4513356c 100644 --- a/src/test/run-pass/issue-40962.rs +++ b/src/test/run-pass/issue-40962.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! m { ($i:meta) => { #[derive($i)] diff --git a/src/test/run-pass/issue-41053.rs b/src/test/run-pass/issue-41053.rs index 769d841e364d7..710a1d428be22 100644 --- a/src/test/run-pass/issue-41053.rs +++ b/src/test/run-pass/issue-41053.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_41053.rs pub trait Trait { fn foo(&self) {} } diff --git a/src/test/run-pass/issue-4107.rs b/src/test/run-pass/issue-4107.rs index 6c5f4bf36de83..fb996721c65b9 100644 --- a/src/test/run-pass/issue-4107.rs +++ b/src/test/run-pass/issue-4107.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { let _id: &Mat2 = &Matrix::identity(1.0); } diff --git a/src/test/run-pass/issue-41213.rs b/src/test/run-pass/issue-41213.rs index d4755020fef22..063bc166c9299 100644 --- a/src/test/run-pass/issue-41213.rs +++ b/src/test/run-pass/issue-41213.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum A { A1, A2, diff --git a/src/test/run-pass/issue-41272.rs b/src/test/run-pass/issue-41272.rs index d6a0034690af8..9833b32d05471 100644 --- a/src/test/run-pass/issue-41272.rs +++ b/src/test/run-pass/issue-41272.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo; impl Foo { diff --git a/src/test/run-pass/issue-41298.rs b/src/test/run-pass/issue-41298.rs index 2b9baa746748b..5413a96f715f4 100644 --- a/src/test/run-pass/issue-41298.rs +++ b/src/test/run-pass/issue-41298.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Function { t: T, f: F } impl Function R> { fn foo() { } } diff --git a/src/test/run-pass/issue-41394.rs b/src/test/run-pass/issue-41394.rs index 798905599a852..1635f73f480d1 100644 --- a/src/test/run-pass/issue-41394.rs +++ b/src/test/run-pass/issue-41394.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-41394.rs extern crate issue_41394 as lib; diff --git a/src/test/run-pass/issue-41479.rs b/src/test/run-pass/issue-41479.rs index cc97b3323cf33..a997861ee36e5 100644 --- a/src/test/run-pass/issue-41479.rs +++ b/src/test/run-pass/issue-41479.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn split(pair: (A, B)) { let _a = pair.0; let _b = pair.1; diff --git a/src/test/run-pass/issue-41498.rs b/src/test/run-pass/issue-41498.rs index 66fd30bdbbbe4..0b6b0fbb444bb 100644 --- a/src/test/run-pass/issue-41498.rs +++ b/src/test/run-pass/issue-41498.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // regression test for issue #41498. struct S; diff --git a/src/test/run-pass/issue-41604.rs b/src/test/run-pass/issue-41604.rs index 20fb8c7e7d6b0..7e34fee86ea68 100644 --- a/src/test/run-pass/issue-41604.rs +++ b/src/test/run-pass/issue-41604.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct B; impl B { diff --git a/src/test/run-pass/issue-41628.rs b/src/test/run-pass/issue-41628.rs index cba47f9844157..a872b40036c06 100644 --- a/src/test/run-pass/issue-41628.rs +++ b/src/test/run-pass/issue-41628.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(dead_code)] #![feature(used)] diff --git a/src/test/run-pass/issue-41677.rs b/src/test/run-pass/issue-41677.rs index d014382ca39b6..52fca241e18f8 100644 --- a/src/test/run-pass/issue-41677.rs +++ b/src/test/run-pass/issue-41677.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #41677. The local variable was winding up with // a type `Receiver` where `?T` was unconstrained, because we // failed to enforce the WF obligations and `?T` is a bivariant type diff --git a/src/test/run-pass/issue-41696.rs b/src/test/run-pass/issue-41696.rs index 1888be58c57d0..dc4168ad83a12 100644 --- a/src/test/run-pass/issue-41696.rs +++ b/src/test/run-pass/issue-41696.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // this used to cause exponential code-size blowup during LLVM passes. #![feature(test)] diff --git a/src/test/run-pass/issue-41744.rs b/src/test/run-pass/issue-41744.rs index 276067d7d7491..04c251a02b6d5 100644 --- a/src/test/run-pass/issue-41744.rs +++ b/src/test/run-pass/issue-41744.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Tc {} impl Tc for bool {} diff --git a/src/test/run-pass/issue-41803.rs b/src/test/run-pass/issue-41803.rs index e18b4204584e3..f43e2b7f98b1b 100644 --- a/src/test/run-pass/issue-41803.rs +++ b/src/test/run-pass/issue-41803.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// A compile-time map from identifiers to arbitrary (heterogeneous) expressions macro_rules! ident_map { ( $name:ident = { $($key:ident => $e:expr,)* } ) => { diff --git a/src/test/run-pass/issue-41849-variance-req.rs b/src/test/run-pass/issue-41849-variance-req.rs index 0557a6ef376b6..3542c5e81681f 100644 --- a/src/test/run-pass/issue-41849-variance-req.rs +++ b/src/test/run-pass/issue-41849-variance-req.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #41849. use std::ops::Mul; diff --git a/src/test/run-pass/issue-41888.rs b/src/test/run-pass/issue-41888.rs index e145cde039dfd..ce0e1c797a885 100644 --- a/src/test/run-pass/issue-41888.rs +++ b/src/test/run-pass/issue-41888.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let _ = g(Some(E::F(K))); } type R = Result<(), ()>; diff --git a/src/test/run-pass/issue-41936-variance-coerce-unsized-cycle.rs b/src/test/run-pass/issue-41936-variance-coerce-unsized-cycle.rs index bfbead8789178..a6bf9dd024779 100644 --- a/src/test/run-pass/issue-41936-variance-coerce-unsized-cycle.rs +++ b/src/test/run-pass/issue-41936-variance-coerce-unsized-cycle.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #41936. The coerce-unsized trait check in // coherence was using subtyping, which triggered variance // computation, which failed because it required type info for fields diff --git a/src/test/run-pass/issue-42007.rs b/src/test/run-pass/issue-42007.rs index cc7e3bc372cc6..301bcd5bd6b45 100644 --- a/src/test/run-pass/issue-42007.rs +++ b/src/test/run-pass/issue-42007.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_42007_s.rs extern crate issue_42007_s; diff --git a/src/test/run-pass/issue-4208.rs b/src/test/run-pass/issue-4208.rs index 52f5d53c046ab..5294321121666 100644 --- a/src/test/run-pass/issue-4208.rs +++ b/src/test/run-pass/issue-4208.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-4208-cc.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-42148.rs b/src/test/run-pass/issue-42148.rs index 0196649a3f624..90b1cc8227a66 100644 --- a/src/test/run-pass/issue-42148.rs +++ b/src/test/run-pass/issue-42148.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Zst; fn main() { diff --git a/src/test/run-pass/issue-42210.rs b/src/test/run-pass/issue-42210.rs index ecdf78cd5bdf8..9e351bfe863c8 100644 --- a/src/test/run-pass/issue-42210.rs +++ b/src/test/run-pass/issue-42210.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #42210. // compile-flags: -g diff --git a/src/test/run-pass/issue-4228.rs b/src/test/run-pass/issue-4228.rs index 3d283849b1f9c..f73d7789c7dd1 100644 --- a/src/test/run-pass/issue-4228.rs +++ b/src/test/run-pass/issue-4228.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct Foo; diff --git a/src/test/run-pass/issue-42453.rs b/src/test/run-pass/issue-42453.rs index dfe3a21961e3b..f7dafb81cefed 100644 --- a/src/test/run-pass/issue-42453.rs +++ b/src/test/run-pass/issue-42453.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug)] struct builder; diff --git a/src/test/run-pass/issue-42463.rs b/src/test/run-pass/issue-42463.rs index 7182fc213f74a..110bfce29fdfd 100644 --- a/src/test/run-pass/issue-42463.rs +++ b/src/test/run-pass/issue-42463.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::{Deref, DerefMut}; struct CheckedDeref { diff --git a/src/test/run-pass/issue-42467.rs b/src/test/run-pass/issue-42467.rs index 1b2ee959b2def..287ce733ed935 100644 --- a/src/test/run-pass/issue-42467.rs +++ b/src/test/run-pass/issue-42467.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo(T); struct IntoIter(T); diff --git a/src/test/run-pass/issue-4252.rs b/src/test/run-pass/issue-4252.rs index e604141dab812..eb4e40787fd30 100644 --- a/src/test/run-pass/issue-4252.rs +++ b/src/test/run-pass/issue-4252.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait X { fn call(&self, x: &T); fn default_method(&self, x: &T) { diff --git a/src/test/run-pass/issue-42552.rs b/src/test/run-pass/issue-42552.rs index fd1265b7174f6..1a5d90713e583 100644 --- a/src/test/run-pass/issue-42552.rs +++ b/src/test/run-pass/issue-42552.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for an obscure issue with the projection cache. fn into_iter(a: &I) -> Groups { diff --git a/src/test/run-pass/issue-42679.rs b/src/test/run-pass/issue-42679.rs index 312835225edf5..a1cd59d8a05b5 100644 --- a/src/test/run-pass/issue-42679.rs +++ b/src/test/run-pass/issue-42679.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] #![feature(box_patterns)] diff --git a/src/test/run-pass/issue-42747.rs b/src/test/run-pass/issue-42747.rs index 05043ae6b2145..8197e949e49c7 100644 --- a/src/test/run-pass/issue-42747.rs +++ b/src/test/run-pass/issue-42747.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! fooN { ($cur:ident $prev:ty) => { #[allow(dead_code)] diff --git a/src/test/run-pass/issue-42956.rs b/src/test/run-pass/issue-42956.rs index 9bda6ee4bcb56..ec6c5009c2729 100644 --- a/src/test/run-pass/issue-42956.rs +++ b/src/test/run-pass/issue-42956.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(associated_consts)] impl A for i32 { diff --git a/src/test/run-pass/issue-43057.rs b/src/test/run-pass/issue-43057.rs index 152ddfb193fc5..e0f471607e459 100644 --- a/src/test/run-pass/issue-43057.rs +++ b/src/test/run-pass/issue-43057.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused)] macro_rules! column { diff --git a/src/test/run-pass/issue-43132.rs b/src/test/run-pass/issue-43132.rs index 64b3b092b8936..e54c976ee14b7 100644 --- a/src/test/run-pass/issue-43132.rs +++ b/src/test/run-pass/issue-43132.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused)] fn main() { diff --git a/src/test/run-pass/issue-43205.rs b/src/test/run-pass/issue-43205.rs index 0e613ac0727a6..4184f102cadad 100644 --- a/src/test/run-pass/issue-43205.rs +++ b/src/test/run-pass/issue-43205.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { &&[()][0]; println!("{:?}", &[(),()][1]); diff --git a/src/test/run-pass/issue-43291.rs b/src/test/run-pass/issue-43291.rs index 98de8f788594c..c40bd0117895f 100644 --- a/src/test/run-pass/issue-43291.rs +++ b/src/test/run-pass/issue-43291.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { assert_eq!(!0usize as *const (), foo(0, 1)); assert_eq!(!0usize as *const (), (0i8 - 1) as *const ()); diff --git a/src/test/run-pass/issue-4333.rs b/src/test/run-pass/issue-4333.rs index a84d7f3fe8287..0e846904e0330 100644 --- a/src/test/run-pass/issue-4333.rs +++ b/src/test/run-pass/issue-4333.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 use std::io; diff --git a/src/test/run-pass/issue-43357.rs b/src/test/run-pass/issue-43357.rs index 9a5f65d67b106..9970bcff13c8c 100644 --- a/src/test/run-pass/issue-43357.rs +++ b/src/test/run-pass/issue-43357.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Trait { type Output; } diff --git a/src/test/run-pass/issue-43483.rs b/src/test/run-pass/issue-43483.rs index 48482af76dbf1..330f4dab75d88 100644 --- a/src/test/run-pass/issue-43483.rs +++ b/src/test/run-pass/issue-43483.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait VecN { const DIM: usize; } diff --git a/src/test/run-pass/issue-43692.rs b/src/test/run-pass/issue-43692.rs index 23e96f8c1bf2e..f3830dc370660 100644 --- a/src/test/run-pass/issue-43692.rs +++ b/src/test/run-pass/issue-43692.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { assert_eq!('\u{10__FFFF}', '\u{10FFFF}'); assert_eq!("\u{10_F0FF__}foo\u{1_0_0_0__}", "\u{10F0FF}foo\u{1000}"); diff --git a/src/test/run-pass/issue-43853.rs b/src/test/run-pass/issue-43853.rs index e9f8d2744a16a..1a9eac14d89b7 100644 --- a/src/test/run-pass/issue-43853.rs +++ b/src/test/run-pass/issue-43853.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare compiled with panic=abort by default use std::panic; diff --git a/src/test/run-pass/issue-4387.rs b/src/test/run-pass/issue-4387.rs index 9c4ae04bf7b7f..120c87b6a2cac 100644 --- a/src/test/run-pass/issue-4387.rs +++ b/src/test/run-pass/issue-4387.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub fn main() { diff --git a/src/test/run-pass/issue-43910.rs b/src/test/run-pass/issue-43910.rs index d61ce7f4689bb..9205f5ffbf780 100644 --- a/src/test/run-pass/issue-43910.rs +++ b/src/test/run-pass/issue-43910.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(unused_variables)] fn main() { diff --git a/src/test/run-pass/issue-43923.rs b/src/test/run-pass/issue-43923.rs index e1992e4fc5032..c49a492d73fc9 100644 --- a/src/test/run-pass/issue-43923.rs +++ b/src/test/run-pass/issue-43923.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct A { ptr: T } fn foo(x: &A<[T]>) {} diff --git a/src/test/run-pass/issue-44005.rs b/src/test/run-pass/issue-44005.rs index a53026f36ab70..67af4f2b7307f 100644 --- a/src/test/run-pass/issue-44005.rs +++ b/src/test/run-pass/issue-44005.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Foo<'a> { type Bar; fn foo(&'a self) -> Self::Bar; diff --git a/src/test/run-pass/issue-4401.rs b/src/test/run-pass/issue-4401.rs index e4fea724c798c..4df2900b41b09 100644 --- a/src/test/run-pass/issue-4401.rs +++ b/src/test/run-pass/issue-4401.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { let mut count = 0; for _ in 0..999_999 { count += 1; } diff --git a/src/test/run-pass/issue-44056.rs b/src/test/run-pass/issue-44056.rs index dcaa0bf86294a..877ea58953503 100644 --- a/src/test/run-pass/issue-44056.rs +++ b/src/test/run-pass/issue-44056.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // only-x86_64 // no-prefer-dynamic // compile-flags: -Ctarget-feature=+avx -Clto diff --git a/src/test/run-pass/issue-44247.rs b/src/test/run-pass/issue-44247.rs index 27b0aeaac5599..8814618cdc4b6 100644 --- a/src/test/run-pass/issue-44247.rs +++ b/src/test/run-pass/issue-44247.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait T { type X; const X: Self::X; diff --git a/src/test/run-pass/issue-44333.rs b/src/test/run-pass/issue-44333.rs index 72731f4132113..a82e7444e3de1 100644 --- a/src/test/run-pass/issue-44333.rs +++ b/src/test/run-pass/issue-44333.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - type Func = fn(usize, usize) -> usize; fn foo(a: usize, b: usize) -> usize { a + b } diff --git a/src/test/run-pass/issue-44373.rs b/src/test/run-pass/issue-44373.rs index d0f8ed96f4cb3..aa473bcead99b 100644 --- a/src/test/run-pass/issue-44373.rs +++ b/src/test/run-pass/issue-44373.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z borrowck=compare struct Foo(bool); diff --git a/src/test/run-pass/issue-44402.rs b/src/test/run-pass/issue-44402.rs index 5cbd3446d9b6f..9830dee9dcb22 100644 --- a/src/test/run-pass/issue-44402.rs +++ b/src/test/run-pass/issue-44402.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(never_type)] #![feature(exhaustive_patterns)] diff --git a/src/test/run-pass/issue-4446.rs b/src/test/run-pass/issue-4446.rs index 5eec800d58846..14e77b92f0bcb 100644 --- a/src/test/run-pass/issue-4446.rs +++ b/src/test/run-pass/issue-4446.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support use std::sync::mpsc::channel; diff --git a/src/test/run-pass/issue-4448.rs b/src/test/run-pass/issue-4448.rs index 6f0356b5bfbc8..946e71deabf1f 100644 --- a/src/test/run-pass/issue-4448.rs +++ b/src/test/run-pass/issue-4448.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support use std::sync::mpsc::channel; diff --git a/src/test/run-pass/issue-4464.rs b/src/test/run-pass/issue-4464.rs index 675ca2c3b7ef8..722b77f245e3e 100644 --- a/src/test/run-pass/issue-4464.rs +++ b/src/test/run-pass/issue-4464.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn broken(v: &[u8], i: usize, j: usize) -> &[u8] { &v[i..j] } diff --git a/src/test/run-pass/issue-44730.rs b/src/test/run-pass/issue-44730.rs index 6e8aba012552e..639df96846f4e 100644 --- a/src/test/run-pass/issue-44730.rs +++ b/src/test/run-pass/issue-44730.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! dox #![deny(missing_docs)] diff --git a/src/test/run-pass/issue-44851.rs b/src/test/run-pass/issue-44851.rs index 62d675b13be30..9354227460bc0 100644 --- a/src/test/run-pass/issue-44851.rs +++ b/src/test/run-pass/issue-44851.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! a { () => { "a" } } diff --git a/src/test/run-pass/issue-45124.rs b/src/test/run-pass/issue-45124.rs index cb79eda8b0739..e6f8ab002dafd 100644 --- a/src/test/run-pass/issue-45124.rs +++ b/src/test/run-pass/issue-45124.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --edition 2018 #![feature(try_blocks)] diff --git a/src/test/run-pass/issue-45152.rs b/src/test/run-pass/issue-45152.rs index a5c349adb8d20..56492af5b0762 100644 --- a/src/test/run-pass/issue-45152.rs +++ b/src/test/run-pass/issue-45152.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unsize, coerce_unsized)] #[repr(packed)] diff --git a/src/test/run-pass/issue-4541.rs b/src/test/run-pass/issue-4541.rs index 68f6945cd9cb7..2e7aff1d4d2f5 100644 --- a/src/test/run-pass/issue-4541.rs +++ b/src/test/run-pass/issue-4541.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no std::env fn parse_args() -> String { diff --git a/src/test/run-pass/issue-4542.rs b/src/test/run-pass/issue-4542.rs index 59837e4bd53f6..168164aba8855 100644 --- a/src/test/run-pass/issue-4542.rs +++ b/src/test/run-pass/issue-4542.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 // ignore-cloudabi no std::env diff --git a/src/test/run-pass/issue-45425.rs b/src/test/run-pass/issue-45425.rs index 06ffa6b3dea93..ee418db828ceb 100644 --- a/src/test/run-pass/issue-45425.rs +++ b/src/test/run-pass/issue-45425.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::Add; fn ref_add(a: &T, b: &T) -> T diff --git a/src/test/run-pass/issue-4545.rs b/src/test/run-pass/issue-4545.rs index 6cb7ccc0e9543..22a08b6bc67d5 100644 --- a/src/test/run-pass/issue-4545.rs +++ b/src/test/run-pass/issue-4545.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-4545.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-45731.rs b/src/test/run-pass/issue-45731.rs index e2c04c964d773..1a8988d19fb12 100644 --- a/src/test/run-pass/issue-45731.rs +++ b/src/test/run-pass/issue-45731.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:--test -g #[cfg(target_os = "macos")] diff --git a/src/test/run-pass/issue-46069.rs b/src/test/run-pass/issue-46069.rs index 70db20e4a6c92..f653dbffe4a85 100644 --- a/src/test/run-pass/issue-46069.rs +++ b/src/test/run-pass/issue-46069.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::iter::{Fuse, Cloned}; use std::slice::Iter; diff --git a/src/test/run-pass/issue-46095.rs b/src/test/run-pass/issue-46095.rs index 35e51ebe70b89..e49bd7cc8029f 100644 --- a/src/test/run-pass/issue-46095.rs +++ b/src/test/run-pass/issue-46095.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct A; impl A { diff --git a/src/test/run-pass/issue-46519.rs b/src/test/run-pass/issue-46519.rs index 878cae4e387f4..f050b6337b193 100644 --- a/src/test/run-pass/issue-46519.rs +++ b/src/test/run-pass/issue-46519.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:--test -O #[test] diff --git a/src/test/run-pass/issue-46553.rs b/src/test/run-pass/issue-46553.rs index cf00ae4c46755..c270bd5bc396f 100644 --- a/src/test/run-pass/issue-46553.rs +++ b/src/test/run-pass/issue-46553.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_fn)] #![deny(const_err)] diff --git a/src/test/run-pass/issue-46845.rs b/src/test/run-pass/issue-46845.rs index 92f68dcfc349d..db841433ec6fb 100644 --- a/src/test/run-pass/issue-46845.rs +++ b/src/test/run-pass/issue-46845.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // To work around #46855 // compile-flags: -Z mir-opt-level=0 // Regression test for the inhabitedness of unions with uninhabited variants, issue #46845 diff --git a/src/test/run-pass/issue-46855.rs b/src/test/run-pass/issue-46855.rs index 28aa6c731ec81..a7009e370a6b9 100644 --- a/src/test/run-pass/issue-46855.rs +++ b/src/test/run-pass/issue-46855.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Zmir-opt-level=1 use std::mem; diff --git a/src/test/run-pass/issue-46920-byte-array-patterns.rs b/src/test/run-pass/issue-46920-byte-array-patterns.rs index 236f6995c51b8..d8f26ae0310ae 100644 --- a/src/test/run-pass/issue-46920-byte-array-patterns.rs +++ b/src/test/run-pass/issue-46920-byte-array-patterns.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const CURSOR_PARTITION_LABEL: &'static [u8] = b"partition"; const CURSOR_EVENT_TYPE_LABEL: &'static [u8] = b"event_type"; const BYTE_PATTERN: &'static [u8; 5] = b"hello"; diff --git a/src/test/run-pass/issue-46959.rs b/src/test/run-pass/issue-46959.rs index 7f050c055b0ce..a08d7381c0640 100644 --- a/src/test/run-pass/issue-46959.rs +++ b/src/test/run-pass/issue-46959.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(non_camel_case_types)] #[allow(dead_code)] diff --git a/src/test/run-pass/issue-46964.rs b/src/test/run-pass/issue-46964.rs index 2a82c6dd43819..442cfb23a616c 100644 --- a/src/test/run-pass/issue-46964.rs +++ b/src/test/run-pass/issue-46964.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod my_mod { #[derive(Clone, Copy, Eq, PartialEq, PartialOrd, Ord, Hash)] pub struct Name<'a> { diff --git a/src/test/run-pass/issue-47139-1.rs b/src/test/run-pass/issue-47139-1.rs index cb87991a491db..8f614d9aec85e 100644 --- a/src/test/run-pass/issue-47139-1.rs +++ b/src/test/run-pass/issue-47139-1.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #47139: // // Coherence was encountering an (unnecessary) overflow trying to diff --git a/src/test/run-pass/issue-47139-2.rs b/src/test/run-pass/issue-47139-2.rs index 08eaee5acd730..fb7389d1f3335 100644 --- a/src/test/run-pass/issue-47139-2.rs +++ b/src/test/run-pass/issue-47139-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #47139: // // Same as issue-47139-1.rs, but the impls of dummy are in the diff --git a/src/test/run-pass/issue-4734.rs b/src/test/run-pass/issue-4734.rs index 9fb826712adc0..4919651df0b8c 100644 --- a/src/test/run-pass/issue-4734.rs +++ b/src/test/run-pass/issue-4734.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Ensures that destructors are run for expressions of the form "e;" where // `e` is a type which requires a destructor. diff --git a/src/test/run-pass/issue-4735.rs b/src/test/run-pass/issue-4735.rs index 7eb09e055a292..d4b22b5c3d783 100644 --- a/src/test/run-pass/issue-4735.rs +++ b/src/test/run-pass/issue-4735.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 use std::mem::transmute; diff --git a/src/test/run-pass/issue-47364.rs b/src/test/run-pass/issue-47364.rs index 2847ac2a0ba43..5c6fec08480c7 100644 --- a/src/test/run-pass/issue-47364.rs +++ b/src/test/run-pass/issue-47364.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C codegen-units=8 -O fn main() { diff --git a/src/test/run-pass/issue-4759-1.rs b/src/test/run-pass/issue-4759-1.rs index a565460c42e28..3cb003a12c6ec 100644 --- a/src/test/run-pass/issue-4759-1.rs +++ b/src/test/run-pass/issue-4759-1.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait U { fn f(self); } impl U for isize { fn f(self) {} } pub fn main() { 4.f(); } diff --git a/src/test/run-pass/issue-4759.rs b/src/test/run-pass/issue-4759.rs index 7788a8f3ec233..e07f680ff6ff1 100644 --- a/src/test/run-pass/issue-4759.rs +++ b/src/test/run-pass/issue-4759.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/issue-47638.rs b/src/test/run-pass/issue-47638.rs index 6f627b2a3c137..9cf656ea052a4 100644 --- a/src/test/run-pass/issue-47638.rs +++ b/src/test/run-pass/issue-47638.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn id<'c, 'b>(f: &'c &'b Fn(&i32)) -> &'c &'b Fn(&'static i32) { f } diff --git a/src/test/run-pass/issue-47673.rs b/src/test/run-pass/issue-47673.rs index 22f7f169e2988..3231fcd1b5a95 100644 --- a/src/test/run-pass/issue-47673.rs +++ b/src/test/run-pass/issue-47673.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_import)] use {{}, {}}; diff --git a/src/test/run-pass/issue-47703-1.rs b/src/test/run-pass/issue-47703-1.rs index facdee5cc176f..714640af07b78 100644 --- a/src/test/run-pass/issue-47703-1.rs +++ b/src/test/run-pass/issue-47703-1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] struct AtomicRefMut<'a> { diff --git a/src/test/run-pass/issue-47703-tuple.rs b/src/test/run-pass/issue-47703-tuple.rs index 4fec3efc0a089..2f2f6acb8b043 100644 --- a/src/test/run-pass/issue-47703-tuple.rs +++ b/src/test/run-pass/issue-47703-tuple.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] struct WithDrop; diff --git a/src/test/run-pass/issue-47703.rs b/src/test/run-pass/issue-47703.rs index 2146986377a05..050f7ede1ec2f 100644 --- a/src/test/run-pass/issue-47703.rs +++ b/src/test/run-pass/issue-47703.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] struct MyStruct<'a> { diff --git a/src/test/run-pass/issue-47722.rs b/src/test/run-pass/issue-47722.rs index 3b5d808e1f546..cf32ba88f2b30 100644 --- a/src/test/run-pass/issue-47722.rs +++ b/src/test/run-pass/issue-47722.rs @@ -1,12 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // Tests that automatic coercions from &mut T to *mut T // allow borrows of T to expire immediately - essentially, that diff --git a/src/test/run-pass/issue-47789.rs b/src/test/run-pass/issue-47789.rs index 3148939992caf..82bc40861d6eb 100644 --- a/src/test/run-pass/issue-47789.rs +++ b/src/test/run-pass/issue-47789.rs @@ -1,14 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![feature(nll)] static mut x: &'static u32 = &0; diff --git a/src/test/run-pass/issue-48159.rs b/src/test/run-pass/issue-48159.rs index ce4585607e9b1..4f7708327145f 100644 --- a/src/test/run-pass/issue-48159.rs +++ b/src/test/run-pass/issue-48159.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(repr_packed)] #![allow(non_camel_case_types)] diff --git a/src/test/run-pass/issue-4830.rs b/src/test/run-pass/issue-4830.rs index f615767c21558..b56c7ab238cc7 100644 --- a/src/test/run-pass/issue-4830.rs +++ b/src/test/run-pass/issue-4830.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // pretty-expanded FIXME #23616 pub struct Scheduler { diff --git a/src/test/run-pass/issue-48508-aux.rs b/src/test/run-pass/issue-48508-aux.rs index a00361a2c9d33..f92e761f4ab45 100644 --- a/src/test/run-pass/issue-48508-aux.rs +++ b/src/test/run-pass/issue-48508-aux.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-test Not a test. Used by issue-48508.rs pub fn other() -> f64 { diff --git a/src/test/run-pass/issue-48508.rs b/src/test/run-pass/issue-48508.rs index 1b10d873f11c4..4f818bf10d7bb 100644 --- a/src/test/run-pass/issue-48508.rs +++ b/src/test/run-pass/issue-48508.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #48508: // // Confusion between global and local file offsets caused incorrect handling of multibyte character diff --git a/src/test/run-pass/issue-48551.rs b/src/test/run-pass/issue-48551.rs index 93bddbc533549..971f7f414868d 100644 --- a/src/test/run-pass/issue-48551.rs +++ b/src/test/run-pass/issue-48551.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #48551. Covers a case where duplicate candidates // arose during associated type projection. diff --git a/src/test/run-pass/issue-4865-1.rs b/src/test/run-pass/issue-4865-1.rs index 3c4777951302e..ab49d9f1d1d9f 100644 --- a/src/test/run-pass/issue-4865-1.rs +++ b/src/test/run-pass/issue-4865-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This should resolve fine. // Prior to fix, the crossed imports between a and b // would block on the glob import, itself never being resolved diff --git a/src/test/run-pass/issue-4865-2.rs b/src/test/run-pass/issue-4865-2.rs index 6de2f437b20b9..030f18720d4fe 100644 --- a/src/test/run-pass/issue-4865-2.rs +++ b/src/test/run-pass/issue-4865-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Previously, this would have failed to resolve due to the circular // block between `use say` and `pub use hello::*`. // diff --git a/src/test/run-pass/issue-4865-3.rs b/src/test/run-pass/issue-4865-3.rs index d800ea6a66580..3751fb78e7091 100644 --- a/src/test/run-pass/issue-4865-3.rs +++ b/src/test/run-pass/issue-4865-3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This should resolve fine even with the circular imports as // they are not `pub`. diff --git a/src/test/run-pass/issue-4875.rs b/src/test/run-pass/issue-4875.rs index 7ac96c21c621a..1e74e934aaff1 100644 --- a/src/test/run-pass/issue-4875.rs +++ b/src/test/run-pass/issue-4875.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // regression test for issue 4875 // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-48962.rs b/src/test/run-pass/issue-48962.rs index 46aeb329c896b..ac5cb57d6e9a7 100644 --- a/src/test/run-pass/issue-48962.rs +++ b/src/test/run-pass/issue-48962.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are able to reinitialize box with moved referent #![feature(nll)] static mut ORDER: [usize; 3] = [0, 0, 0]; diff --git a/src/test/run-pass/issue-48984.rs b/src/test/run-pass/issue-48984.rs index 227ad4e58f1f8..146955359054d 100644 --- a/src/test/run-pass/issue-48984.rs +++ b/src/test/run-pass/issue-48984.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-48984-aux.rs extern crate issue48984aux; use issue48984aux::Bar; diff --git a/src/test/run-pass/issue-49298.rs b/src/test/run-pass/issue-49298.rs index 0b2169c9476cd..7cd3366498924 100644 --- a/src/test/run-pass/issue-49298.rs +++ b/src/test/run-pass/issue-49298.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(test)] extern crate test; diff --git a/src/test/run-pass/issue-49556.rs b/src/test/run-pass/issue-49556.rs index 70ccee99f664d..adf1f81e6fb44 100644 --- a/src/test/run-pass/issue-49556.rs +++ b/src/test/run-pass/issue-49556.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn iter<'a>(data: &'a [usize]) -> impl Iterator + 'a { data.iter() .map( diff --git a/src/test/run-pass/issue-49588-non-shorthand-field-patterns-in-pattern-macro.rs b/src/test/run-pass/issue-49588-non-shorthand-field-patterns-in-pattern-macro.rs index 51b2b5a4f7c0f..42e5518eff3fc 100644 --- a/src/test/run-pass/issue-49588-non-shorthand-field-patterns-in-pattern-macro.rs +++ b/src/test/run-pass/issue-49588-non-shorthand-field-patterns-in-pattern-macro.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(non_shorthand_field_patterns)] pub struct Value { pub value: A } diff --git a/src/test/run-pass/issue-49632.rs b/src/test/run-pass/issue-49632.rs index 8cbb7d21af708..22f4452e12498 100644 --- a/src/test/run-pass/issue-49632.rs +++ b/src/test/run-pass/issue-49632.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(stmt_expr_attributes)] pub fn main() { diff --git a/src/test/run-pass/issue-49685.rs b/src/test/run-pass/issue-49685.rs index 1e4e795532371..9129eed99fcaf 100644 --- a/src/test/run-pass/issue-49685.rs +++ b/src/test/run-pass/issue-49685.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #49685: drop elaboration was not revealing the // value of `impl Trait` returns, leading to an ICE. diff --git a/src/test/run-pass/issue-49854.rs b/src/test/run-pass/issue-49854.rs index 5bb80b5e2c6a1..779f41feda8c4 100644 --- a/src/test/run-pass/issue-49854.rs +++ b/src/test/run-pass/issue-49854.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ffi::OsString; fn main() { diff --git a/src/test/run-pass/issue-49955-2.rs b/src/test/run-pass/issue-49955-2.rs index 17e1de95dd30e..b8950b6fbf14b 100644 --- a/src/test/run-pass/issue-49955-2.rs +++ b/src/test/run-pass/issue-49955-2.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z borrowck=mir use std::cell::Cell; diff --git a/src/test/run-pass/issue-49955.rs b/src/test/run-pass/issue-49955.rs index 57a1264aaee80..fc697b49d130c 100644 --- a/src/test/run-pass/issue-49955.rs +++ b/src/test/run-pass/issue-49955.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z borrowck=compare const ALL_THE_NUMS: [u32; 1] = [ diff --git a/src/test/run-pass/issue-49973.rs b/src/test/run-pass/issue-49973.rs index 641e9239177fb..bcf5851d6f9cd 100644 --- a/src/test/run-pass/issue-49973.rs +++ b/src/test/run-pass/issue-49973.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug)] #[repr(i32)] enum E { diff --git a/src/test/run-pass/issue-5008-borrowed-traitobject-method-call.rs b/src/test/run-pass/issue-5008-borrowed-traitobject-method-call.rs index 90900ca46ce01..598aee88d4be5 100644 --- a/src/test/run-pass/issue-5008-borrowed-traitobject-method-call.rs +++ b/src/test/run-pass/issue-5008-borrowed-traitobject-method-call.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /* #5008 cast to &Trait causes code to segfault on method call diff --git a/src/test/run-pass/issue-50415.rs b/src/test/run-pass/issue-50415.rs index aa493ce032130..418100f333f50 100644 --- a/src/test/run-pass/issue-50415.rs +++ b/src/test/run-pass/issue-50415.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { // -------- Simplified test case -------- diff --git a/src/test/run-pass/issue-50442.rs b/src/test/run-pass/issue-50442.rs index 1e43bebf5c32c..2ee60ee18140f 100644 --- a/src/test/run-pass/issue-50442.rs +++ b/src/test/run-pass/issue-50442.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Void {} enum Foo { diff --git a/src/test/run-pass/issue-5060.rs b/src/test/run-pass/issue-5060.rs index 21e3343f44586..7d2750996c81e 100644 --- a/src/test/run-pass/issue-5060.rs +++ b/src/test/run-pass/issue-5060.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! print_hd_tl { ($field_hd:ident, $($field_tl:ident),+) => ({ print!("{}", stringify!($field_hd)); diff --git a/src/test/run-pass/issue-50689.rs b/src/test/run-pass/issue-50689.rs index d437b9d88f4d7..26912b5fb2489 100644 --- a/src/test/run-pass/issue-50689.rs +++ b/src/test/run-pass/issue-50689.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Foo { Bar = (|x: i32| { }, 42).1, } diff --git a/src/test/run-pass/issue-50731.rs b/src/test/run-pass/issue-50731.rs index 06df2b989af28..cf2977f8925ec 100644 --- a/src/test/run-pass/issue-50731.rs +++ b/src/test/run-pass/issue-50731.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Void {} fn foo(_: Result<(Void, u32), (Void, String)>) {} fn main() { diff --git a/src/test/run-pass/issue-50811.rs b/src/test/run-pass/issue-50811.rs index 05b168d98f1f2..0b1387d442a50 100644 --- a/src/test/run-pass/issue-50811.rs +++ b/src/test/run-pass/issue-50811.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(test)] extern crate test; diff --git a/src/test/run-pass/issue-51185.rs b/src/test/run-pass/issue-51185.rs index 8e286ad1419f2..ba41931f6a5a5 100644 --- a/src/test/run-pass/issue-51185.rs +++ b/src/test/run-pass/issue-51185.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo() -> impl Into fn(&'a ())> { (|_| {}) as for<'a> fn(&'a ()) } diff --git a/src/test/run-pass/issue-51345.rs b/src/test/run-pass/issue-51345.rs index 7d392944685b8..35e097c22b32f 100644 --- a/src/test/run-pass/issue-51345.rs +++ b/src/test/run-pass/issue-51345.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] fn main() { diff --git a/src/test/run-pass/issue-51582.rs b/src/test/run-pass/issue-51582.rs index bca05d83e4064..ff64a3fac9f59 100644 --- a/src/test/run-pass/issue-51582.rs +++ b/src/test/run-pass/issue-51582.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(core_intrinsics)] #[repr(i8)] diff --git a/src/test/run-pass/issue-51655.rs b/src/test/run-pass/issue-51655.rs index b5b89ede91b11..458e76bed50d0 100644 --- a/src/test/run-pass/issue-51655.rs +++ b/src/test/run-pass/issue-51655.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] const PATH_DOT: &[u8] = &[b'.']; diff --git a/src/test/run-pass/issue-51907.rs b/src/test/run-pass/issue-51907.rs index de2a59c5f015b..99e9e946d1bf1 100644 --- a/src/test/run-pass/issue-51907.rs +++ b/src/test/run-pass/issue-51907.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { extern fn borrow(&self); extern fn take(self: Box); diff --git a/src/test/run-pass/issue-5192.rs b/src/test/run-pass/issue-5192.rs index 0758ace42da90..bc1105ab9318d 100644 --- a/src/test/run-pass/issue-5192.rs +++ b/src/test/run-pass/issue-5192.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/issue-52140/auxiliary/some_crate.rs b/src/test/run-pass/issue-52140/auxiliary/some_crate.rs index bf8dee0863a1b..087005849d11b 100644 --- a/src/test/run-pass/issue-52140/auxiliary/some_crate.rs +++ b/src/test/run-pass/issue-52140/auxiliary/some_crate.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] pub fn hello() { diff --git a/src/test/run-pass/issue-52140/main.rs b/src/test/run-pass/issue-52140/main.rs index 6fae6adc44248..53f0522db2b52 100644 --- a/src/test/run-pass/issue-52140/main.rs +++ b/src/test/run-pass/issue-52140/main.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:some_crate.rs // edition:2018 diff --git a/src/test/run-pass/issue-52141/auxiliary/some_crate.rs b/src/test/run-pass/issue-52141/auxiliary/some_crate.rs index bf8dee0863a1b..087005849d11b 100644 --- a/src/test/run-pass/issue-52141/auxiliary/some_crate.rs +++ b/src/test/run-pass/issue-52141/auxiliary/some_crate.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] pub fn hello() { diff --git a/src/test/run-pass/issue-52141/main.rs b/src/test/run-pass/issue-52141/main.rs index 8f3fc9f969894..d0427e8c093b4 100644 --- a/src/test/run-pass/issue-52141/main.rs +++ b/src/test/run-pass/issue-52141/main.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:some_crate.rs // edition:2018 diff --git a/src/test/run-pass/issue-52169.rs b/src/test/run-pass/issue-52169.rs index f2163416922cd..ea841aa263796 100644 --- a/src/test/run-pass/issue-52169.rs +++ b/src/test/run-pass/issue-52169.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(macro_literal_matcher)] macro_rules! a { diff --git a/src/test/run-pass/issue-5239-2.rs b/src/test/run-pass/issue-5239-2.rs index 406746ab8c54c..859eee38d2968 100644 --- a/src/test/run-pass/issue-5239-2.rs +++ b/src/test/run-pass/issue-5239-2.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #5239 diff --git a/src/test/run-pass/issue-5243.rs b/src/test/run-pass/issue-5243.rs index 9bd13c4d3a0f4..bf421fb2aef60 100644 --- a/src/test/run-pass/issue-5243.rs +++ b/src/test/run-pass/issue-5243.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that merely having lifetime parameters is not // enough for codegen to consider this as non-monomorphic, // which led to various assertions and failures in turn. diff --git a/src/test/run-pass/issue-52557.rs b/src/test/run-pass/issue-52557.rs index 2b8dfe162cc3d..801f15dd94dff 100644 --- a/src/test/run-pass/issue-52557.rs +++ b/src/test/run-pass/issue-52557.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test checks for namespace pollution by private tests. // Tests used to marked as public causing name conflicts with normal // functions only in test builds. diff --git a/src/test/run-pass/issue-52705/auxiliary/png.rs b/src/test/run-pass/issue-52705/auxiliary/png.rs index 48d53a2cbac0a..fa9956e440db3 100644 --- a/src/test/run-pass/issue-52705/auxiliary/png.rs +++ b/src/test/run-pass/issue-52705/auxiliary/png.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] pub struct DecodingError; diff --git a/src/test/run-pass/issue-52705/main.rs b/src/test/run-pass/issue-52705/main.rs index 101f67e3e7b98..d7bdc6e1d20c9 100644 --- a/src/test/run-pass/issue-52705/main.rs +++ b/src/test/run-pass/issue-52705/main.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:png.rs // edition:2018 diff --git a/src/test/run-pass/issue-5280.rs b/src/test/run-pass/issue-5280.rs index 5e2e4df95b326..3a7e8d93221b7 100644 --- a/src/test/run-pass/issue-5280.rs +++ b/src/test/run-pass/issue-5280.rs @@ -1,12 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // type FontTableTag = u32; diff --git a/src/test/run-pass/issue-5315.rs b/src/test/run-pass/issue-5315.rs index b8532c55c4cb6..b64c2aac45261 100644 --- a/src/test/run-pass/issue-5315.rs +++ b/src/test/run-pass/issue-5315.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct A(bool); diff --git a/src/test/run-pass/issue-5321-immediates-with-bare-self.rs b/src/test/run-pass/issue-5321-immediates-with-bare-self.rs index dd00fab50203b..b400c7dd3d6ac 100644 --- a/src/test/run-pass/issue-5321-immediates-with-bare-self.rs +++ b/src/test/run-pass/issue-5321-immediates-with-bare-self.rs @@ -1,12 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // trait Fooable { diff --git a/src/test/run-pass/issue-53333.rs b/src/test/run-pass/issue-53333.rs index 51b90af7164f3..e51581401b686 100644 --- a/src/test/run-pass/issue-53333.rs +++ b/src/test/run-pass/issue-53333.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 fn main() { diff --git a/src/test/run-pass/issue-5353.rs b/src/test/run-pass/issue-5353.rs index 34ef63572ae1e..4f719b9a14494 100644 --- a/src/test/run-pass/issue-5353.rs +++ b/src/test/run-pass/issue-5353.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 const INVALID_ENUM : u32 = 0; diff --git a/src/test/run-pass/issue-5518.rs b/src/test/run-pass/issue-5518.rs index 5981a0148a0af..1e31a2897dbe9 100644 --- a/src/test/run-pass/issue-5518.rs +++ b/src/test/run-pass/issue-5518.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-5518.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-5521.rs b/src/test/run-pass/issue-5521.rs index 136f7aa956c0d..253b08d699a11 100644 --- a/src/test/run-pass/issue-5521.rs +++ b/src/test/run-pass/issue-5521.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-5521.rs diff --git a/src/test/run-pass/issue-5530.rs b/src/test/run-pass/issue-5530.rs index bd7d7af71df85..9e11536435c3f 100644 --- a/src/test/run-pass/issue-5530.rs +++ b/src/test/run-pass/issue-5530.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum Enum { Foo { foo: usize }, Bar { bar: usize } diff --git a/src/test/run-pass/issue-5550.rs b/src/test/run-pass/issue-5550.rs index 91741f938a5a0..d989a9cc062d6 100644 --- a/src/test/run-pass/issue-5550.rs +++ b/src/test/run-pass/issue-5550.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![allow(dead_assignment)] diff --git a/src/test/run-pass/issue-5554.rs b/src/test/run-pass/issue-5554.rs index e8190a7245a1e..6130051e9d973 100644 --- a/src/test/run-pass/issue-5554.rs +++ b/src/test/run-pass/issue-5554.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 use std::default::Default; diff --git a/src/test/run-pass/issue-5572.rs b/src/test/run-pass/issue-5572.rs index 6ae9dc68a5c67..05887124db9fd 100644 --- a/src/test/run-pass/issue-5572.rs +++ b/src/test/run-pass/issue-5572.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn foo(_t: T) { } diff --git a/src/test/run-pass/issue-5666.rs b/src/test/run-pass/issue-5666.rs index eba83227f449b..e1ec5618c2997 100644 --- a/src/test/run-pass/issue-5666.rs +++ b/src/test/run-pass/issue-5666.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] struct Dog { diff --git a/src/test/run-pass/issue-5688.rs b/src/test/run-pass/issue-5688.rs index 88ff103723c73..b29d1516e9eb0 100644 --- a/src/test/run-pass/issue-5688.rs +++ b/src/test/run-pass/issue-5688.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /* # Corrupted initialization in the static struct diff --git a/src/test/run-pass/issue-5708.rs b/src/test/run-pass/issue-5708.rs index 6ab3395109915..53093e8a79f62 100644 --- a/src/test/run-pass/issue-5708.rs +++ b/src/test/run-pass/issue-5708.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /* # ICE when returning struct with reference to trait diff --git a/src/test/run-pass/issue-5718.rs b/src/test/run-pass/issue-5718.rs index 0bc9a07cb0023..1dbae7311b02c 100644 --- a/src/test/run-pass/issue-5718.rs +++ b/src/test/run-pass/issue-5718.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/issue-5741.rs b/src/test/run-pass/issue-5741.rs index 5190bd95adadc..d7752b04b7e57 100644 --- a/src/test/run-pass/issue-5741.rs +++ b/src/test/run-pass/issue-5741.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![allow(unreachable_code)] diff --git a/src/test/run-pass/issue-5754.rs b/src/test/run-pass/issue-5754.rs index e6bc516acc39f..992e2b04f684b 100644 --- a/src/test/run-pass/issue-5754.rs +++ b/src/test/run-pass/issue-5754.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct TwoDoubles { diff --git a/src/test/run-pass/issue-5791.rs b/src/test/run-pass/issue-5791.rs index 2e93279f756f0..5b7df0674e159 100644 --- a/src/test/run-pass/issue-5791.rs +++ b/src/test/run-pass/issue-5791.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 extern { diff --git a/src/test/run-pass/issue-5884.rs b/src/test/run-pass/issue-5884.rs index c3247876c7ab9..d578ecd60ab44 100644 --- a/src/test/run-pass/issue-5884.rs +++ b/src/test/run-pass/issue-5884.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/issue-5900.rs b/src/test/run-pass/issue-5900.rs index d3a43b51dcff4..42661f6048e4c 100644 --- a/src/test/run-pass/issue-5900.rs +++ b/src/test/run-pass/issue-5900.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub mod foo { diff --git a/src/test/run-pass/issue-5917.rs b/src/test/run-pass/issue-5917.rs index 112ad0185d8cb..9034d29c78757 100644 --- a/src/test/run-pass/issue-5917.rs +++ b/src/test/run-pass/issue-5917.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct T (&'static [isize]); static t : T = T (&[5, 4, 3]); pub fn main () { diff --git a/src/test/run-pass/issue-5950.rs b/src/test/run-pass/issue-5950.rs index b0e01db14d85a..db456e259b339 100644 --- a/src/test/run-pass/issue-5950.rs +++ b/src/test/run-pass/issue-5950.rs @@ -1,14 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // pretty-expanded FIXME #23616 pub use local as local_alias; diff --git a/src/test/run-pass/issue-5988.rs b/src/test/run-pass/issue-5988.rs index 2cf0089c6bb65..4babd81766903 100644 --- a/src/test/run-pass/issue-5988.rs +++ b/src/test/run-pass/issue-5988.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait B { diff --git a/src/test/run-pass/issue-5997.rs b/src/test/run-pass/issue-5997.rs index 0c41acf04aae6..6212821d3708c 100644 --- a/src/test/run-pass/issue-5997.rs +++ b/src/test/run-pass/issue-5997.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn f() -> bool { enum E { V(T) } diff --git a/src/test/run-pass/issue-6117.rs b/src/test/run-pass/issue-6117.rs index 555272974021a..711f9fe811b8b 100644 --- a/src/test/run-pass/issue-6117.rs +++ b/src/test/run-pass/issue-6117.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 enum Either { Left(T), Right(U) } diff --git a/src/test/run-pass/issue-6128.rs b/src/test/run-pass/issue-6128.rs index b52900746e3c4..9d8b0b89d94c9 100644 --- a/src/test/run-pass/issue-6128.rs +++ b/src/test/run-pass/issue-6128.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![feature(box_syntax)] use std::collections::HashMap; diff --git a/src/test/run-pass/issue-6130.rs b/src/test/run-pass/issue-6130.rs index f124b851f0925..101c3b60ce308 100644 --- a/src/test/run-pass/issue-6130.rs +++ b/src/test/run-pass/issue-6130.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![deny(type_limits)] pub fn main() { diff --git a/src/test/run-pass/issue-6153.rs b/src/test/run-pass/issue-6153.rs index 1b16418ac4259..dafcbcf85404f 100644 --- a/src/test/run-pass/issue-6153.rs +++ b/src/test/run-pass/issue-6153.rs @@ -1,15 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - fn swap(f: F) -> Vec where F: FnOnce(Vec) -> Vec { let x = vec![1, 2, 3]; f(x) diff --git a/src/test/run-pass/issue-6157.rs b/src/test/run-pass/issue-6157.rs index 2c5bc48abe840..d3414affbf9c2 100644 --- a/src/test/run-pass/issue-6157.rs +++ b/src/test/run-pass/issue-6157.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub trait OpInt { fn call(&mut self, _: isize, _: isize) -> isize; } diff --git a/src/test/run-pass/issue-6318.rs b/src/test/run-pass/issue-6318.rs index 69c7ec4cf1f8a..e00a7a801a5be 100644 --- a/src/test/run-pass/issue-6318.rs +++ b/src/test/run-pass/issue-6318.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/issue-6334.rs b/src/test/run-pass/issue-6334.rs index fca1c296dddcc..53a37dff0f9da 100644 --- a/src/test/run-pass/issue-6334.rs +++ b/src/test/run-pass/issue-6334.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that everything still compiles and runs fine even when // we reorder the bounds. diff --git a/src/test/run-pass/issue-6341.rs b/src/test/run-pass/issue-6341.rs index 41abaa2c8b853..202d3a4979dae 100644 --- a/src/test/run-pass/issue-6341.rs +++ b/src/test/run-pass/issue-6341.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #[derive(PartialEq)] diff --git a/src/test/run-pass/issue-6344-let.rs b/src/test/run-pass/issue-6344-let.rs index 8449d9f572bf0..9cf7cd1a1ede6 100644 --- a/src/test/run-pass/issue-6344-let.rs +++ b/src/test/run-pass/issue-6344-let.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct A { x: usize } impl Drop for A { diff --git a/src/test/run-pass/issue-6344-match.rs b/src/test/run-pass/issue-6344-match.rs index 4bb23295c858c..f1432ded5c1f6 100644 --- a/src/test/run-pass/issue-6344-match.rs +++ b/src/test/run-pass/issue-6344-match.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct A { x: usize } impl Drop for A { diff --git a/src/test/run-pass/issue-6449.rs b/src/test/run-pass/issue-6449.rs index 09a4e288404f2..de04a8bdcd1c7 100644 --- a/src/test/run-pass/issue-6449.rs +++ b/src/test/run-pass/issue-6449.rs @@ -1,14 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum Foo { Bar(isize), Baz, diff --git a/src/test/run-pass/issue-6470.rs b/src/test/run-pass/issue-6470.rs index 9b5f78a14504a..24b198fa681a6 100644 --- a/src/test/run-pass/issue-6470.rs +++ b/src/test/run-pass/issue-6470.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub mod Bar { diff --git a/src/test/run-pass/issue-6557.rs b/src/test/run-pass/issue-6557.rs index 109383b343bf8..5e08a39530b43 100644 --- a/src/test/run-pass/issue-6557.rs +++ b/src/test/run-pass/issue-6557.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(box_patterns)] diff --git a/src/test/run-pass/issue-6892.rs b/src/test/run-pass/issue-6892.rs index 75420ad6ff1c5..b6ca8892a7890 100644 --- a/src/test/run-pass/issue-6892.rs +++ b/src/test/run-pass/issue-6892.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Ensures that destructors are run for expressions of the form "let _ = e;" // where `e` is a type which requires a destructor. diff --git a/src/test/run-pass/issue-6898.rs b/src/test/run-pass/issue-6898.rs index e0d2f13ad6899..dff851d686ea8 100644 --- a/src/test/run-pass/issue-6898.rs +++ b/src/test/run-pass/issue-6898.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 use std::mem; diff --git a/src/test/run-pass/issue-6919.rs b/src/test/run-pass/issue-6919.rs index 3495c0eb1aed3..984c1834f614f 100644 --- a/src/test/run-pass/issue-6919.rs +++ b/src/test/run-pass/issue-6919.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:iss.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-6991.rs b/src/test/run-pass/issue-6991.rs index 32a9a055d49b8..3dc083da40cbd 100644 --- a/src/test/run-pass/issue-6991.rs +++ b/src/test/run-pass/issue-6991.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - static x: &'static usize = &1; static y: usize = *x; diff --git a/src/test/run-pass/issue-7012.rs b/src/test/run-pass/issue-7012.rs index 3a9864f3a7667..ddce0515db679 100644 --- a/src/test/run-pass/issue-7012.rs +++ b/src/test/run-pass/issue-7012.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /* # Comparison of static arrays diff --git a/src/test/run-pass/issue-7178.rs b/src/test/run-pass/issue-7178.rs index 0882203cb1ea5..d38186519e7c3 100644 --- a/src/test/run-pass/issue-7178.rs +++ b/src/test/run-pass/issue-7178.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-7178.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-7222.rs b/src/test/run-pass/issue-7222.rs index 3eb39ad6aad59..23df7758a1265 100644 --- a/src/test/run-pass/issue-7222.rs +++ b/src/test/run-pass/issue-7222.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub fn main() { diff --git a/src/test/run-pass/issue-7268.rs b/src/test/run-pass/issue-7268.rs index 626adfe292bfa..2deeef9645a0e 100644 --- a/src/test/run-pass/issue-7268.rs +++ b/src/test/run-pass/issue-7268.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn foo(_: T) {} diff --git a/src/test/run-pass/issue-7344.rs b/src/test/run-pass/issue-7344.rs index fb348fb453804..d3a80b314d5d9 100644 --- a/src/test/run-pass/issue-7344.rs +++ b/src/test/run-pass/issue-7344.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![allow(unreachable_code)] diff --git a/src/test/run-pass/issue-7519-match-unit-in-arg.rs b/src/test/run-pass/issue-7519-match-unit-in-arg.rs index c5c59407ab231..5793e540f0b07 100644 --- a/src/test/run-pass/issue-7519-match-unit-in-arg.rs +++ b/src/test/run-pass/issue-7519-match-unit-in-arg.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 /* diff --git a/src/test/run-pass/issue-7563.rs b/src/test/run-pass/issue-7563.rs index 6d2a602fc8df7..a87ffcae6e21f 100644 --- a/src/test/run-pass/issue-7563.rs +++ b/src/test/run-pass/issue-7563.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait IDummy { fn do_nothing(&self); } diff --git a/src/test/run-pass/issue-7575.rs b/src/test/run-pass/issue-7575.rs index 508ebf3f69d1a..33704c678af6d 100644 --- a/src/test/run-pass/issue-7575.rs +++ b/src/test/run-pass/issue-7575.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Foo { fn new() -> bool { false } fn dummy(&self) { } diff --git a/src/test/run-pass/issue-7607-2.rs b/src/test/run-pass/issue-7607-2.rs index 799513e6e4f21..ec2f3cf7eb48c 100644 --- a/src/test/run-pass/issue-7607-2.rs +++ b/src/test/run-pass/issue-7607-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub mod a { diff --git a/src/test/run-pass/issue-7660.rs b/src/test/run-pass/issue-7660.rs index 3f3e11a2ddb02..d45c1bcd0c698 100644 --- a/src/test/run-pass/issue-7660.rs +++ b/src/test/run-pass/issue-7660.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue 7660 // rvalue lifetime too short when equivalent `match` works diff --git a/src/test/run-pass/issue-7663.rs b/src/test/run-pass/issue-7663.rs index 87e0799f63461..319d5ef428474 100644 --- a/src/test/run-pass/issue-7663.rs +++ b/src/test/run-pass/issue-7663.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![allow(unused_imports, dead_code)] mod test1 { diff --git a/src/test/run-pass/issue-7673-cast-generically-implemented-trait.rs b/src/test/run-pass/issue-7673-cast-generically-implemented-trait.rs index f5acebf3a66fa..c05867d76eff6 100644 --- a/src/test/run-pass/issue-7673-cast-generically-implemented-trait.rs +++ b/src/test/run-pass/issue-7673-cast-generically-implemented-trait.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 /* diff --git a/src/test/run-pass/issue-7784.rs b/src/test/run-pass/issue-7784.rs index 8d21594aa12ca..adab4da857106 100644 --- a/src/test/run-pass/issue-7784.rs +++ b/src/test/run-pass/issue-7784.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(slice_patterns)] use std::ops::Add; diff --git a/src/test/run-pass/issue-7899.rs b/src/test/run-pass/issue-7899.rs index a17565fa0ac5b..756a3acebca7c 100644 --- a/src/test/run-pass/issue-7899.rs +++ b/src/test/run-pass/issue-7899.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-7899.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-7911.rs b/src/test/run-pass/issue-7911.rs index 764d6fa791805..5113c409ab465 100644 --- a/src/test/run-pass/issue-7911.rs +++ b/src/test/run-pass/issue-7911.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // (Closes #7911) Test that we can use the same self expression // with different mutability in macro in two methods diff --git a/src/test/run-pass/issue-8044.rs b/src/test/run-pass/issue-8044.rs index 4f72409c36e1c..a45e8d87f0b21 100644 --- a/src/test/run-pass/issue-8044.rs +++ b/src/test/run-pass/issue-8044.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-8044.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-8171-default-method-self-inherit-builtin-trait.rs b/src/test/run-pass/issue-8171-default-method-self-inherit-builtin-trait.rs index 92d1c7c5a1c3d..814d5e4dc5f57 100644 --- a/src/test/run-pass/issue-8171-default-method-self-inherit-builtin-trait.rs +++ b/src/test/run-pass/issue-8171-default-method-self-inherit-builtin-trait.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 /* diff --git a/src/test/run-pass/issue-8248.rs b/src/test/run-pass/issue-8248.rs index b58be361f15d0..d88478907058f 100644 --- a/src/test/run-pass/issue-8248.rs +++ b/src/test/run-pass/issue-8248.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait A { diff --git a/src/test/run-pass/issue-8249.rs b/src/test/run-pass/issue-8249.rs index 3e65bc000ff84..5403615f9acad 100644 --- a/src/test/run-pass/issue-8249.rs +++ b/src/test/run-pass/issue-8249.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait A { diff --git a/src/test/run-pass/issue-8259.rs b/src/test/run-pass/issue-8259.rs index e7f09789c5ba0..9d379345bcb06 100644 --- a/src/test/run-pass/issue-8259.rs +++ b/src/test/run-pass/issue-8259.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-8259.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-8351-1.rs b/src/test/run-pass/issue-8351-1.rs index ed78b37604e86..a92cfe4539afd 100644 --- a/src/test/run-pass/issue-8351-1.rs +++ b/src/test/run-pass/issue-8351-1.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum E { Foo{f: isize}, Bar, diff --git a/src/test/run-pass/issue-8351-2.rs b/src/test/run-pass/issue-8351-2.rs index 1ed93915b8a03..142e6d8a4d110 100644 --- a/src/test/run-pass/issue-8351-2.rs +++ b/src/test/run-pass/issue-8351-2.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum E { Foo{f: isize, b: bool}, Bar, diff --git a/src/test/run-pass/issue-8391.rs b/src/test/run-pass/issue-8391.rs index b832c410443c4..5ea58ce7a70b7 100644 --- a/src/test/run-pass/issue-8391.rs +++ b/src/test/run-pass/issue-8391.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn main() { let x = match Some(1) { ref _y @ Some(_) => 1, diff --git a/src/test/run-pass/issue-8398.rs b/src/test/run-pass/issue-8398.rs index 5c2c03f9857f3..88c3f0f4b7f43 100644 --- a/src/test/run-pass/issue-8398.rs +++ b/src/test/run-pass/issue-8398.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub trait Writer { diff --git a/src/test/run-pass/issue-8401.rs b/src/test/run-pass/issue-8401.rs index afdd572b129a3..688e883f5780f 100644 --- a/src/test/run-pass/issue-8401.rs +++ b/src/test/run-pass/issue-8401.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_8401.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-8460.rs b/src/test/run-pass/issue-8460.rs index 17ea5b9a79489..551104214cf2f 100644 --- a/src/test/run-pass/issue-8460.rs +++ b/src/test/run-pass/issue-8460.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support #![feature(rustc_attrs)] diff --git a/src/test/run-pass/issue-8498.rs b/src/test/run-pass/issue-8498.rs index d57b2a3236895..a7b450999d9e1 100644 --- a/src/test/run-pass/issue-8498.rs +++ b/src/test/run-pass/issue-8498.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { match &[(Box::new(5),Box::new(7))] { ps => { diff --git a/src/test/run-pass/issue-8506.rs b/src/test/run-pass/issue-8506.rs index 24632a0d13a10..13b9e0e9bf67d 100644 --- a/src/test/run-pass/issue-8506.rs +++ b/src/test/run-pass/issue-8506.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![allow(dead_code)] diff --git a/src/test/run-pass/issue-8521.rs b/src/test/run-pass/issue-8521.rs index ce362c4bcd1e1..3ec02027be0f3 100644 --- a/src/test/run-pass/issue-8521.rs +++ b/src/test/run-pass/issue-8521.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo1 {} trait A {} diff --git a/src/test/run-pass/issue-8578.rs b/src/test/run-pass/issue-8578.rs index ce392f8d881d4..e94ac593a7180 100644 --- a/src/test/run-pass/issue-8578.rs +++ b/src/test/run-pass/issue-8578.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub struct UninterpretedOption_NamePart { diff --git a/src/test/run-pass/issue-868.rs b/src/test/run-pass/issue-868.rs index 64b463ddf5c68..2abe077254f35 100644 --- a/src/test/run-pass/issue-868.rs +++ b/src/test/run-pass/issue-868.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn f(g: F) -> T where F: FnOnce() -> T { g() } diff --git a/src/test/run-pass/issue-8709.rs b/src/test/run-pass/issue-8709.rs index 44759cef2864f..33d5ab33d4530 100644 --- a/src/test/run-pass/issue-8709.rs +++ b/src/test/run-pass/issue-8709.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - macro_rules! sty { ($t:ty) => (stringify!($t)) } diff --git a/src/test/run-pass/issue-8783.rs b/src/test/run-pass/issue-8783.rs index 485a76ff7ece9..1338b55eb4aec 100644 --- a/src/test/run-pass/issue-8783.rs +++ b/src/test/run-pass/issue-8783.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 use std::default::Default; diff --git a/src/test/run-pass/issue-8827.rs b/src/test/run-pass/issue-8827.rs index 6b573698a3600..6872edb9d1ad7 100644 --- a/src/test/run-pass/issue-8827.rs +++ b/src/test/run-pass/issue-8827.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/issue-8851.rs b/src/test/run-pass/issue-8851.rs index 2a0c02b23e8ee..778840e7e6bbb 100644 --- a/src/test/run-pass/issue-8851.rs +++ b/src/test/run-pass/issue-8851.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // after fixing #9384 and implementing hygiene for match bindings, // this now fails because the insertion of the 'y' into the match // doesn't cause capture. Making this macro hygienic (as I've done) diff --git a/src/test/run-pass/issue-8860.rs b/src/test/run-pass/issue-8860.rs index 127f9e355c7a2..b09f8f6f502bf 100644 --- a/src/test/run-pass/issue-8860.rs +++ b/src/test/run-pass/issue-8860.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z borrowck=compare static mut DROP: isize = 0; diff --git a/src/test/run-pass/issue-8898.rs b/src/test/run-pass/issue-8898.rs index 065cef2c60d7d..2066bfe2f5a69 100644 --- a/src/test/run-pass/issue-8898.rs +++ b/src/test/run-pass/issue-8898.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn assert_repr_eq(obj : T, expected : String) { assert_eq!(expected, format!("{:?}", obj)); } diff --git a/src/test/run-pass/issue-9047.rs b/src/test/run-pass/issue-9047.rs index aa3e601c3a205..0c3d585d596c5 100644 --- a/src/test/run-pass/issue-9047.rs +++ b/src/test/run-pass/issue-9047.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn decode() -> String { 'outer: loop { let mut ch_start: usize; diff --git a/src/test/run-pass/issue-9110.rs b/src/test/run-pass/issue-9110.rs index 298ae5e6aaca8..206732a46740d 100644 --- a/src/test/run-pass/issue-9110.rs +++ b/src/test/run-pass/issue-9110.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 macro_rules! silly_macro { diff --git a/src/test/run-pass/issue-9123.rs b/src/test/run-pass/issue-9123.rs index 4da0c22a0b1bf..9b0800277314a 100644 --- a/src/test/run-pass/issue-9123.rs +++ b/src/test/run-pass/issue-9123.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_9123.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-9129.rs b/src/test/run-pass/issue-9129.rs index 485f10357b3f3..82bf62476680f 100644 --- a/src/test/run-pass/issue-9129.rs +++ b/src/test/run-pass/issue-9129.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty unreported #![feature(box_syntax)] diff --git a/src/test/run-pass/issue-9188.rs b/src/test/run-pass/issue-9188.rs index e2272837efb7a..743857487df74 100644 --- a/src/test/run-pass/issue-9188.rs +++ b/src/test/run-pass/issue-9188.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_9188.rs diff --git a/src/test/run-pass/issue-9243.rs b/src/test/run-pass/issue-9243.rs index b857465aabc1d..2b5c42117ac91 100644 --- a/src/test/run-pass/issue-9243.rs +++ b/src/test/run-pass/issue-9243.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue 9243 pub struct Test { diff --git a/src/test/run-pass/issue-9249.rs b/src/test/run-pass/issue-9249.rs index e4d848dbd754c..5709f3bd81226 100644 --- a/src/test/run-pass/issue-9249.rs +++ b/src/test/run-pass/issue-9249.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 static DATA:&'static [&'static str] = &["my string"]; diff --git a/src/test/run-pass/issue-9259.rs b/src/test/run-pass/issue-9259.rs index 996548de81738..3d32d961717e6 100644 --- a/src/test/run-pass/issue-9259.rs +++ b/src/test/run-pass/issue-9259.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct A<'a> { a: &'a [String], b: Option<&'a [String]>, diff --git a/src/test/run-pass/issue-9382.rs b/src/test/run-pass/issue-9382.rs index 7538e55fd95df..1b555d465bf88 100644 --- a/src/test/run-pass/issue-9382.rs +++ b/src/test/run-pass/issue-9382.rs @@ -1,14 +1,5 @@ // pretty-expanded FIXME #23616 -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![allow(unnecessary_allocation)] #![feature(box_syntax)] diff --git a/src/test/run-pass/issue-9394-inherited-trait-calls.rs b/src/test/run-pass/issue-9394-inherited-trait-calls.rs index 7d2c435b38429..198d0b7af4190 100644 --- a/src/test/run-pass/issue-9394-inherited-trait-calls.rs +++ b/src/test/run-pass/issue-9394-inherited-trait-calls.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Base: Base2 + Base3{ fn foo(&self) -> String; fn foo1(&self) -> String; diff --git a/src/test/run-pass/issue-9396.rs b/src/test/run-pass/issue-9396.rs index 5af2006f08146..ec5d5f340e6a3 100644 --- a/src/test/run-pass/issue-9396.rs +++ b/src/test/run-pass/issue-9396.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support use std::sync::mpsc::{TryRecvError, channel}; diff --git a/src/test/run-pass/issue-9446.rs b/src/test/run-pass/issue-9446.rs index a6adb1d369e40..1dce51d4646b0 100644 --- a/src/test/run-pass/issue-9446.rs +++ b/src/test/run-pass/issue-9446.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Wrapper(String); impl Wrapper { diff --git a/src/test/run-pass/issue-9719.rs b/src/test/run-pass/issue-9719.rs index 108f1a0d73daf..5e7cb6c9e3b9e 100644 --- a/src/test/run-pass/issue-9719.rs +++ b/src/test/run-pass/issue-9719.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 mod a { diff --git a/src/test/run-pass/issue-9737.rs b/src/test/run-pass/issue-9737.rs index 5e1fd87b57a13..413ef6590fd0d 100644 --- a/src/test/run-pass/issue-9737.rs +++ b/src/test/run-pass/issue-9737.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! f { (v: $x:expr) => ( println!("{}", $x) ) } diff --git a/src/test/run-pass/issue-979.rs b/src/test/run-pass/issue-979.rs index 43fa98124262a..4dc9adfcd5024 100644 --- a/src/test/run-pass/issue-979.rs +++ b/src/test/run-pass/issue-979.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cell::Cell; struct r<'a> { diff --git a/src/test/run-pass/issue-9837.rs b/src/test/run-pass/issue-9837.rs index f887459836c6b..deff3fd243fb5 100644 --- a/src/test/run-pass/issue-9837.rs +++ b/src/test/run-pass/issue-9837.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const C1: i32 = 0x12345678; const C2: isize = C1 as i16 as isize; diff --git a/src/test/run-pass/issue-9906.rs b/src/test/run-pass/issue-9906.rs index 84f848fc9cdb2..e3db14d3538d6 100644 --- a/src/test/run-pass/issue-9906.rs +++ b/src/test/run-pass/issue-9906.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-9906.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-9918.rs b/src/test/run-pass/issue-9918.rs index a766e6b707e30..15863fe235b20 100644 --- a/src/test/run-pass/issue-9918.rs +++ b/src/test/run-pass/issue-9918.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { assert_eq!((0 + 0u8) as char, '\0'); } diff --git a/src/test/run-pass/issue-9942.rs b/src/test/run-pass/issue-9942.rs index 222eb0c651815..ccd15ef29ad82 100644 --- a/src/test/run-pass/issue-9942.rs +++ b/src/test/run-pass/issue-9942.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub fn main() { diff --git a/src/test/run-pass/issue-9951.rs b/src/test/run-pass/issue-9951.rs index 63807395fb0cc..d0d0ad792be84 100644 --- a/src/test/run-pass/issue-9951.rs +++ b/src/test/run-pass/issue-9951.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![allow(unused_variables)] diff --git a/src/test/run-pass/issue-9968.rs b/src/test/run-pass/issue-9968.rs index c8af811d13d8d..36619fdf903e9 100644 --- a/src/test/run-pass/issue-9968.rs +++ b/src/test/run-pass/issue-9968.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-9968.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue2170exe.rs b/src/test/run-pass/issue2170exe.rs index d126d1f6ce1d3..06fe08068e7a3 100644 --- a/src/test/run-pass/issue2170exe.rs +++ b/src/test/run-pass/issue2170exe.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue2170lib.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue24687-embed-debuginfo/auxiliary/issue24687_lib.rs b/src/test/run-pass/issue24687-embed-debuginfo/auxiliary/issue24687_lib.rs index f1624fd2e58b0..3ae53baa82a5a 100644 --- a/src/test/run-pass/issue24687-embed-debuginfo/auxiliary/issue24687_lib.rs +++ b/src/test/run-pass/issue24687-embed-debuginfo/auxiliary/issue24687_lib.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="lib"] // This is a file that pulls in a separate file as a submodule, where diff --git a/src/test/run-pass/issue24687-embed-debuginfo/auxiliary/issue24687_mbcs_in_comments.rs b/src/test/run-pass/issue24687-embed-debuginfo/auxiliary/issue24687_mbcs_in_comments.rs index 8dc243aed7e1e..215145a64b177 100644 --- a/src/test/run-pass/issue24687-embed-debuginfo/auxiliary/issue24687_mbcs_in_comments.rs +++ b/src/test/run-pass/issue24687-embed-debuginfo/auxiliary/issue24687_mbcs_in_comments.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt; // This ia file with many multi-byte characters, to try to encourage diff --git a/src/test/run-pass/issue24687-embed-debuginfo/main.rs b/src/test/run-pass/issue24687-embed-debuginfo/main.rs index abec252c74e5d..1fde935866da6 100644 --- a/src/test/run-pass/issue24687-embed-debuginfo/main.rs +++ b/src/test/run-pass/issue24687-embed-debuginfo/main.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue24687_lib.rs // compile-flags:-g diff --git a/src/test/run-pass/issue28498-must-work-ex1.rs b/src/test/run-pass/issue28498-must-work-ex1.rs index 83a978d57b955..28a2251b2097e 100644 --- a/src/test/run-pass/issue28498-must-work-ex1.rs +++ b/src/test/run-pass/issue28498-must-work-ex1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Example taken from RFC 1238 text // https://github.com/rust-lang/rfcs/blob/master/text/1238-nonparametric-dropck.md diff --git a/src/test/run-pass/issue28498-must-work-ex2.rs b/src/test/run-pass/issue28498-must-work-ex2.rs index 93652a1b612cc..f0ef5555cba22 100644 --- a/src/test/run-pass/issue28498-must-work-ex2.rs +++ b/src/test/run-pass/issue28498-must-work-ex2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Example taken from RFC 1238 text // https://github.com/rust-lang/rfcs/blob/master/text/1238-nonparametric-dropck.md diff --git a/src/test/run-pass/issue28498-ugeh-ex1.rs b/src/test/run-pass/issue28498-ugeh-ex1.rs index b07831f552c6a..6b51d3753f23a 100644 --- a/src/test/run-pass/issue28498-ugeh-ex1.rs +++ b/src/test/run-pass/issue28498-ugeh-ex1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Example taken from RFC 1238 text // https://github.com/rust-lang/rfcs/blob/master/text/1238-nonparametric-dropck.md diff --git a/src/test/run-pass/issue28498-ugeh-with-lifetime-param.rs b/src/test/run-pass/issue28498-ugeh-with-lifetime-param.rs index 19be2568e4ff2..99dc902949f86 100644 --- a/src/test/run-pass/issue28498-ugeh-with-lifetime-param.rs +++ b/src/test/run-pass/issue28498-ugeh-with-lifetime-param.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Demonstrate the use of the unguarded escape hatch with a lifetime param // to assert that destructor will not access any dead data. // diff --git a/src/test/run-pass/issue28498-ugeh-with-passed-to-fn.rs b/src/test/run-pass/issue28498-ugeh-with-passed-to-fn.rs index bb430ea3e33a8..90b6a940ebc5c 100644 --- a/src/test/run-pass/issue28498-ugeh-with-passed-to-fn.rs +++ b/src/test/run-pass/issue28498-ugeh-with-passed-to-fn.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Demonstrate the use of the unguarded escape hatch with a type param in negative position // to assert that destructor will not access any dead data. // diff --git a/src/test/run-pass/issue28498-ugeh-with-trait-bound.rs b/src/test/run-pass/issue28498-ugeh-with-trait-bound.rs index 2e9633b3a2148..e181439fea49a 100644 --- a/src/test/run-pass/issue28498-ugeh-with-trait-bound.rs +++ b/src/test/run-pass/issue28498-ugeh-with-trait-bound.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Demonstrate the use of the unguarded escape hatch with a trait bound // to assert that destructor will not access any dead data. // diff --git a/src/test/run-pass/issue29927-1.rs b/src/test/run-pass/issue29927-1.rs index 68271accb61a2..8d81d2e5c0996 100644 --- a/src/test/run-pass/issue29927-1.rs +++ b/src/test/run-pass/issue29927-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_fn)] const fn f() -> usize { 5 diff --git a/src/test/run-pass/issue_26873_multifile/A/B.rs b/src/test/run-pass/issue_26873_multifile/A/B.rs index 8917a98b8cf3f..1f017e3fc992e 100644 --- a/src/test/run-pass/issue_26873_multifile/A/B.rs +++ b/src/test/run-pass/issue_26873_multifile/A/B.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::*; pub struct S; diff --git a/src/test/run-pass/issue_26873_multifile/A/C.rs b/src/test/run-pass/issue_26873_multifile/A/C.rs index 64aaf9c279865..236e9c22c6bb5 100644 --- a/src/test/run-pass/issue_26873_multifile/A/C.rs +++ b/src/test/run-pass/issue_26873_multifile/A/C.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::*; use super::B::S; diff --git a/src/test/run-pass/issue_26873_multifile/A/mod.rs b/src/test/run-pass/issue_26873_multifile/A/mod.rs index a2aeb1cc43f98..7f4873325ffbf 100644 --- a/src/test/run-pass/issue_26873_multifile/A/mod.rs +++ b/src/test/run-pass/issue_26873_multifile/A/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod B; pub mod C; diff --git a/src/test/run-pass/issue_26873_multifile/mod.rs b/src/test/run-pass/issue_26873_multifile/mod.rs index 3643b94e31a85..6b69cd316157f 100644 --- a/src/test/run-pass/issue_26873_multifile/mod.rs +++ b/src/test/run-pass/issue_26873_multifile/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod A; use self::A::*; diff --git a/src/test/run-pass/issue_3136_b.rs b/src/test/run-pass/issue_3136_b.rs index cffe3f9572b29..41ecc3b4b356a 100644 --- a/src/test/run-pass/issue_3136_b.rs +++ b/src/test/run-pass/issue_3136_b.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_3136_a.rc // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue_9155.rs b/src/test/run-pass/issue_9155.rs index 9db556bf9a22f..451425d993671 100644 --- a/src/test/run-pass/issue_9155.rs +++ b/src/test/run-pass/issue_9155.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_9155.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/istr.rs b/src/test/run-pass/istr.rs index 7ebeb79f56669..af11e49e56e32 100644 --- a/src/test/run-pass/istr.rs +++ b/src/test/run-pass/istr.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::string::String; fn test_stack_assign() { diff --git a/src/test/run-pass/item-attributes.rs b/src/test/run-pass/item-attributes.rs index 0fc13319b8734..9ecb6cef4a998 100644 --- a/src/test/run-pass/item-attributes.rs +++ b/src/test/run-pass/item-attributes.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // These are attributes of the implicit crate. Really this just needs to parse // for completeness since .rs files linked from .rc files support this // notation to specify their module's attributes diff --git a/src/test/run-pass/item-name-overload.rs b/src/test/run-pass/item-name-overload.rs index 2827a6df33737..d8081009101a8 100644 --- a/src/test/run-pass/item-name-overload.rs +++ b/src/test/run-pass/item-name-overload.rs @@ -1,16 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - // pretty-expanded FIXME #23616 mod foo { diff --git a/src/test/run-pass/iter-cloned-type-inference.rs b/src/test/run-pass/iter-cloned-type-inference.rs index e3351bda3354d..7ac9995b2f04e 100644 --- a/src/test/run-pass/iter-cloned-type-inference.rs +++ b/src/test/run-pass/iter-cloned-type-inference.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test to see that the element type of .cloned() can be inferred // properly. Previously this would fail to deduce the type of `sum`. diff --git a/src/test/run-pass/iter-range.rs b/src/test/run-pass/iter-range.rs index a6130841b5c52..fa19ac0a99bfe 100644 --- a/src/test/run-pass/iter-range.rs +++ b/src/test/run-pass/iter-range.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - fn range_(a: isize, b: isize, mut it: F) where F: FnMut(isize) { assert!((a < b)); let mut i: isize = a; diff --git a/src/test/run-pass/iter-step-overflow-debug.rs b/src/test/run-pass/iter-step-overflow-debug.rs index c45a10eac52b1..8c472462f3f5c 100644 --- a/src/test/run-pass/iter-step-overflow-debug.rs +++ b/src/test/run-pass/iter-step-overflow-debug.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare compiled with panic=abort by default // compile-flags: -C debug_assertions=yes diff --git a/src/test/run-pass/iter-step-overflow-ndebug.rs b/src/test/run-pass/iter-step-overflow-ndebug.rs index 8642f1643c11c..8f9894d20c1b3 100644 --- a/src/test/run-pass/iter-step-overflow-ndebug.rs +++ b/src/test/run-pass/iter-step-overflow-ndebug.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C debug_assertions=no fn main() { diff --git a/src/test/run-pass/iter-sum-overflow-debug.rs b/src/test/run-pass/iter-sum-overflow-debug.rs index c640f7cd28045..6ac1b8cf299e0 100644 --- a/src/test/run-pass/iter-sum-overflow-debug.rs +++ b/src/test/run-pass/iter-sum-overflow-debug.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare compiled with panic=abort by default // compile-flags: -C debug_assertions=yes diff --git a/src/test/run-pass/iter-sum-overflow-ndebug.rs b/src/test/run-pass/iter-sum-overflow-ndebug.rs index 65ac1ef29ed6a..a87803ccab85a 100644 --- a/src/test/run-pass/iter-sum-overflow-ndebug.rs +++ b/src/test/run-pass/iter-sum-overflow-ndebug.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C debug_assertions=no fn main() { diff --git a/src/test/run-pass/iter-sum-overflow-overflow-checks.rs b/src/test/run-pass/iter-sum-overflow-overflow-checks.rs index 517cd139cf354..14189f40b203d 100644 --- a/src/test/run-pass/iter-sum-overflow-overflow-checks.rs +++ b/src/test/run-pass/iter-sum-overflow-overflow-checks.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare compiled with panic=abort by default // compile-flags: -C overflow-checks diff --git a/src/test/run-pass/iter-zip.rs b/src/test/run-pass/iter-zip.rs index b0503bc2048e7..1b6b3031b643b 100644 --- a/src/test/run-pass/iter-zip.rs +++ b/src/test/run-pass/iter-zip.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that .zip() specialization preserves side effects // in sideeffectful iterator adaptors. diff --git a/src/test/run-pass/ivec-pass-by-value.rs b/src/test/run-pass/ivec-pass-by-value.rs index e3b42e60645a3..22c0f0af927d4 100644 --- a/src/test/run-pass/ivec-pass-by-value.rs +++ b/src/test/run-pass/ivec-pass-by-value.rs @@ -1,12 +1,2 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn f(_a: Vec ) { } pub fn main() { f(vec![1, 2, 3, 4, 5]); } diff --git a/src/test/run-pass/ivec-tag.rs b/src/test/run-pass/ivec-tag.rs index 0da1d18afd8ef..6d0b3e1911f88 100644 --- a/src/test/run-pass/ivec-tag.rs +++ b/src/test/run-pass/ivec-tag.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/keyword-changes-2012-07-31.rs b/src/test/run-pass/keyword-changes-2012-07-31.rs index 9838fe62394ce..eda488d5e94e8 100644 --- a/src/test/run-pass/keyword-changes-2012-07-31.rs +++ b/src/test/run-pass/keyword-changes-2012-07-31.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // return -> return // mod -> module // match -> match diff --git a/src/test/run-pass/kindck-implicit-close-over-mut-var.rs b/src/test/run-pass/kindck-implicit-close-over-mut-var.rs index 1c5d8a69bf340..699fd44af869c 100644 --- a/src/test/run-pass/kindck-implicit-close-over-mut-var.rs +++ b/src/test/run-pass/kindck-implicit-close-over-mut-var.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::thread; fn user(_i: isize) {} diff --git a/src/test/run-pass/kindck-owned-trait-contains-1.rs b/src/test/run-pass/kindck-owned-trait-contains-1.rs index 9b56666fd464c..a71f2a507ae9c 100644 --- a/src/test/run-pass/kindck-owned-trait-contains-1.rs +++ b/src/test/run-pass/kindck-owned-trait-contains-1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] trait repeat { fn get(&self) -> A; } diff --git a/src/test/run-pass/kinds-in-metadata.rs b/src/test/run-pass/kinds-in-metadata.rs index 84c5da1ad6c2a..7cfc28b12b98a 100644 --- a/src/test/run-pass/kinds-in-metadata.rs +++ b/src/test/run-pass/kinds-in-metadata.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:kinds_in_metadata.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/label_break_value.rs b/src/test/run-pass/label_break_value.rs index 444845e24dc7d..73ad027877d64 100644 --- a/src/test/run-pass/label_break_value.rs +++ b/src/test/run-pass/label_break_value.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(label_break_value)] // Test control flow to follow label_break_value semantics diff --git a/src/test/run-pass/labeled-break.rs b/src/test/run-pass/labeled-break.rs index fe2f35c5119e0..bea3f5a976a0c 100644 --- a/src/test/run-pass/labeled-break.rs +++ b/src/test/run-pass/labeled-break.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub fn main() { diff --git a/src/test/run-pass/lambda-infer-unresolved.rs b/src/test/run-pass/lambda-infer-unresolved.rs index 5109c6fc77726..0303c8560172c 100644 --- a/src/test/run-pass/lambda-infer-unresolved.rs +++ b/src/test/run-pass/lambda-infer-unresolved.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This should typecheck even though the type of e is not fully // resolved when we finish typechecking the ||. diff --git a/src/test/run-pass/lambda-var-hygiene.rs b/src/test/run-pass/lambda-var-hygiene.rs index ae5bf71d15fe4..9cc4cc29bf59d 100644 --- a/src/test/run-pass/lambda-var-hygiene.rs +++ b/src/test/run-pass/lambda-var-hygiene.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // shouldn't affect evaluation of $ex: macro_rules! bad_macro { ($ex:expr) => ({(|_x| { $ex }) (9) }) diff --git a/src/test/run-pass/large-records.rs b/src/test/run-pass/large-records.rs index e9c66093fb0cf..8d7ad9d211648 100644 --- a/src/test/run-pass/large-records.rs +++ b/src/test/run-pass/large-records.rs @@ -1,17 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - - // pretty-expanded FIXME #23616 struct Large {a: isize, diff --git a/src/test/run-pass/last-use-in-block.rs b/src/test/run-pass/last-use-in-block.rs index a2b01f29ae127..0c996e4383383 100644 --- a/src/test/run-pass/last-use-in-block.rs +++ b/src/test/run-pass/last-use-in-block.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #1818 diff --git a/src/test/run-pass/last-use-in-cap-clause.rs b/src/test/run-pass/last-use-in-cap-clause.rs index 5fbcfadf870e1..9fab8d36d4d47 100644 --- a/src/test/run-pass/last-use-in-cap-clause.rs +++ b/src/test/run-pass/last-use-in-cap-clause.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Make sure #1399 stays fixed struct A { a: Box } diff --git a/src/test/run-pass/last-use-is-capture.rs b/src/test/run-pass/last-use-is-capture.rs index cb2a2061406a2..a6ca294d2a8b6 100644 --- a/src/test/run-pass/last-use-is-capture.rs +++ b/src/test/run-pass/last-use-is-capture.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Make sure #1399 stays fixed #![feature(box_syntax)] diff --git a/src/test/run-pass/lazy-and-or.rs b/src/test/run-pass/lazy-and-or.rs index 500de64ae832c..d1f564fbe4c6c 100644 --- a/src/test/run-pass/lazy-and-or.rs +++ b/src/test/run-pass/lazy-and-or.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn incr(x: &mut isize) -> bool { *x += 1; assert!((false)); return false; } pub fn main() { diff --git a/src/test/run-pass/lazy-init.rs b/src/test/run-pass/lazy-init.rs index d71d7e751a045..3f3f6593ae233 100644 --- a/src/test/run-pass/lazy-init.rs +++ b/src/test/run-pass/lazy-init.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - fn foo(x: isize) { println!("{}", x); } pub fn main() { let mut x: isize; if 1 > 2 { x = 12; } else { x = 10; } foo(x); } diff --git a/src/test/run-pass/leak-unique-as-tydesc.rs b/src/test/run-pass/leak-unique-as-tydesc.rs index d89888927e1bd..2293e3c823f8c 100644 --- a/src/test/run-pass/leak-unique-as-tydesc.rs +++ b/src/test/run-pass/leak-unique-as-tydesc.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/let-assignability.rs b/src/test/run-pass/let-assignability.rs index 69b0eab99f71f..ed5a30b316598 100644 --- a/src/test/run-pass/let-assignability.rs +++ b/src/test/run-pass/let-assignability.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn f() { diff --git a/src/test/run-pass/let-destruct-ref.rs b/src/test/run-pass/let-destruct-ref.rs index c9504f87c4904..a09ad8347ba77 100644 --- a/src/test/run-pass/let-destruct-ref.rs +++ b/src/test/run-pass/let-destruct-ref.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { let x = 3_usize; let ref y = x; diff --git a/src/test/run-pass/let-var-hygiene.rs b/src/test/run-pass/let-var-hygiene.rs index d9087f58befe7..edbfb8248833d 100644 --- a/src/test/run-pass/let-var-hygiene.rs +++ b/src/test/run-pass/let-var-hygiene.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // shouldn't affect evaluation of $ex: macro_rules! bad_macro { diff --git a/src/test/run-pass/lex-bare-cr-nondoc-comment.rs b/src/test/run-pass/lex-bare-cr-nondoc-comment.rs index ba949ca88814d..da18ab268ffa8 100644 --- a/src/test/run-pass/lex-bare-cr-nondoc-comment.rs +++ b/src/test/run-pass/lex-bare-cr-nondoc-comment.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-cr // nondoc comment with bare CR: ' ' diff --git a/src/test/run-pass/lexer-crlf-line-endings-string-literal-doc-comment.rs b/src/test/run-pass/lexer-crlf-line-endings-string-literal-doc-comment.rs index 05f1f1bfea0fb..a8e34ed4502b6 100644 --- a/src/test/run-pass/lexer-crlf-line-endings-string-literal-doc-comment.rs +++ b/src/test/run-pass/lexer-crlf-line-endings-string-literal-doc-comment.rs @@ -2,15 +2,8 @@ // ignore-tidy-cr (repeated again because of tidy bug) // license is ignored because tidy can't handle the CRLF here properly. -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // NB: this file needs CRLF line endings. The .gitattributes file in // this directory should enforce it. diff --git a/src/test/run-pass/lexical-scoping.rs b/src/test/run-pass/lexical-scoping.rs index 36604042d0f25..15797eee9b85d 100644 --- a/src/test/run-pass/lexical-scoping.rs +++ b/src/test/run-pass/lexical-scoping.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that items in subscopes can shadow type parameters and local variables (see issue #23880). #![allow(unused)] diff --git a/src/test/run-pass/lib-defaults.rs b/src/test/run-pass/lib-defaults.rs index fcaeda9a5495b..8e0b02556585c 100644 --- a/src/test/run-pass/lib-defaults.rs +++ b/src/test/run-pass/lib-defaults.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare no libc to test ffi with // compile-flags: -lrust_test_helpers diff --git a/src/test/run-pass/linear-for-loop.rs b/src/test/run-pass/linear-for-loop.rs index fc6d435b034be..de29615b1ac02 100644 --- a/src/test/run-pass/linear-for-loop.rs +++ b/src/test/run-pass/linear-for-loop.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { let x = vec![1, 2, 3]; let mut y = 0; diff --git a/src/test/run-pass/link-cfg-works.rs b/src/test/run-pass/link-cfg-works.rs index 7db948c7daa9f..a4888292c7dfe 100644 --- a/src/test/run-pass/link-cfg-works.rs +++ b/src/test/run-pass/link-cfg-works.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:link-cfg-works-transitive-rlib.rs // aux-build:link-cfg-works-transitive-dylib.rs diff --git a/src/test/run-pass/link-section.rs b/src/test/run-pass/link-section.rs index 3336ce7e723de..015743c405def 100644 --- a/src/test/run-pass/link-section.rs +++ b/src/test/run-pass/link-section.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[cfg(not(target_os = "macos"))] #[link_section=".moretext"] fn i_live_in_more_text() -> &'static str { diff --git a/src/test/run-pass/linkage1.rs b/src/test/run-pass/linkage1.rs index f12a233f493ee..4e404f26eec5e 100644 --- a/src/test/run-pass/linkage1.rs +++ b/src/test/run-pass/linkage1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-windows // ignore-macos // ignore-emscripten doesn't support this linkage diff --git a/src/test/run-pass/lint-cap.rs b/src/test/run-pass/lint-cap.rs index 003a99f746a59..0e8bdbdc6aaf4 100644 --- a/src/test/run-pass/lint-cap.rs +++ b/src/test/run-pass/lint-cap.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --cap-lints allow #![deny(warnings)] diff --git a/src/test/run-pass/lint-dead-code-associated-type.rs b/src/test/run-pass/lint-dead-code-associated-type.rs index 1ae078ba2211a..576ba6d170cf6 100644 --- a/src/test/run-pass/lint-dead-code-associated-type.rs +++ b/src/test/run-pass/lint-dead-code-associated-type.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(dead_code)] trait Foo { diff --git a/src/test/run-pass/lint-dead-code-variant.rs b/src/test/run-pass/lint-dead-code-variant.rs index 074c69d87087f..3838b83e45f79 100644 --- a/src/test/run-pass/lint-dead-code-variant.rs +++ b/src/test/run-pass/lint-dead-code-variant.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(dead_code)] enum Foo { diff --git a/src/test/run-pass/lint-expr-stmt-attrs-for-early-lints.rs b/src/test/run-pass/lint-expr-stmt-attrs-for-early-lints.rs index 16c7176a68db4..9ca3ecc72d2c2 100644 --- a/src/test/run-pass/lint-expr-stmt-attrs-for-early-lints.rs +++ b/src/test/run-pass/lint-expr-stmt-attrs-for-early-lints.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(stmt_expr_attributes)] #![deny(unused_parens)] diff --git a/src/test/run-pass/lint-non-camel-case-types-non-uppercase-statics-unicode.rs b/src/test/run-pass/lint-non-camel-case-types-non-uppercase-statics-unicode.rs index 6e65cb2afd4ff..e900a35f73926 100644 --- a/src/test/run-pass/lint-non-camel-case-types-non-uppercase-statics-unicode.rs +++ b/src/test/run-pass/lint-non-camel-case-types-non-uppercase-statics-unicode.rs @@ -1,12 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // diff --git a/src/test/run-pass/lint-non-camel-case-with-trailing-underscores.rs b/src/test/run-pass/lint-non-camel-case-with-trailing-underscores.rs index 3b4bd001e8dc0..ff4c7e8ed55f6 100644 --- a/src/test/run-pass/lint-non-camel-case-with-trailing-underscores.rs +++ b/src/test/run-pass/lint-non-camel-case-with-trailing-underscores.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This is ok because we often use the trailing underscore to mean 'prime' // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/lint-unknown-lints-at-crate-level.rs b/src/test/run-pass/lint-unknown-lints-at-crate-level.rs index 1e510c28e7858..fe2fbeabac67d 100644 --- a/src/test/run-pass/lint-unknown-lints-at-crate-level.rs +++ b/src/test/run-pass/lint-unknown-lints-at-crate-level.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -D warnings -D unknown-lints #![allow(unknown_lints)] diff --git a/src/test/run-pass/list.rs b/src/test/run-pass/list.rs index 3761241555509..854106a61a690 100644 --- a/src/test/run-pass/list.rs +++ b/src/test/run-pass/list.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/liveness-assign-imm-local-after-loop.rs b/src/test/run-pass/liveness-assign-imm-local-after-loop.rs index dfa080550469a..6831344891922 100644 --- a/src/test/run-pass/liveness-assign-imm-local-after-loop.rs +++ b/src/test/run-pass/liveness-assign-imm-local-after-loop.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![allow(dead_assignment)] diff --git a/src/test/run-pass/liveness-assign-imm-local-after-ret.rs b/src/test/run-pass/liveness-assign-imm-local-after-ret.rs index 76b44832a8a16..b1d5c99f8dc44 100644 --- a/src/test/run-pass/liveness-assign-imm-local-after-ret.rs +++ b/src/test/run-pass/liveness-assign-imm-local-after-ret.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![allow(dead_code)] diff --git a/src/test/run-pass/liveness-loop-break.rs b/src/test/run-pass/liveness-loop-break.rs index 0dba1830cbd2e..7317aa921f934 100644 --- a/src/test/run-pass/liveness-loop-break.rs +++ b/src/test/run-pass/liveness-loop-break.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn test() { let v; loop { diff --git a/src/test/run-pass/liveness-move-in-loop.rs b/src/test/run-pass/liveness-move-in-loop.rs index f9bb45ee4009b..66fa14084d64f 100644 --- a/src/test/run-pass/liveness-move-in-loop.rs +++ b/src/test/run-pass/liveness-move-in-loop.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // pretty-expanded FIXME #23616 fn take(x: isize) -> isize {x} diff --git a/src/test/run-pass/llvm-pr32379.rs b/src/test/run-pass/llvm-pr32379.rs index 5625e81c0e63c..a18a5386d8112 100644 --- a/src/test/run-pass/llvm-pr32379.rs +++ b/src/test/run-pass/llvm-pr32379.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:llvm_pr32379.rs // LLVM PR #32379 (https://bugs.llvm.org/show_bug.cgi?id=32379), which diff --git a/src/test/run-pass/log-err-phi.rs b/src/test/run-pass/log-err-phi.rs index 2f2328faaca7f..fd12ffe36f86b 100644 --- a/src/test/run-pass/log-err-phi.rs +++ b/src/test/run-pass/log-err-phi.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - pub fn main() { if false { println!("{}", "foobar"); diff --git a/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs b/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs index 1991e2b178d51..ada1fb4a5224c 100644 --- a/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs +++ b/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Clone, Debug)] enum foo { a(usize), diff --git a/src/test/run-pass/log-knows-the-names-of-variants.rs b/src/test/run-pass/log-knows-the-names-of-variants.rs index e8852377957f8..b925bf10bed69 100644 --- a/src/test/run-pass/log-knows-the-names-of-variants.rs +++ b/src/test/run-pass/log-knows-the-names-of-variants.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug)] enum foo { a(usize), diff --git a/src/test/run-pass/log-poly.rs b/src/test/run-pass/log-poly.rs index b54b4692a41bf..32dbb95a7237e 100644 --- a/src/test/run-pass/log-poly.rs +++ b/src/test/run-pass/log-poly.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug)] enum Numbers { Three diff --git a/src/test/run-pass/log_syntax-trace_macros-macro-locations.rs b/src/test/run-pass/log_syntax-trace_macros-macro-locations.rs index 4932831186760..1478780b3429b 100644 --- a/src/test/run-pass/log_syntax-trace_macros-macro-locations.rs +++ b/src/test/run-pass/log_syntax-trace_macros-macro-locations.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(trace_macros, log_syntax)] diff --git a/src/test/run-pass/logging-only-prints-once.rs b/src/test/run-pass/logging-only-prints-once.rs index 11ab43fd08763..7b10560022565 100644 --- a/src/test/run-pass/logging-only-prints-once.rs +++ b/src/test/run-pass/logging-only-prints-once.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-windows // ignore-emscripten no threads support // exec-env:RUST_LOG=debug diff --git a/src/test/run-pass/logging_before_rt_started.rs b/src/test/run-pass/logging_before_rt_started.rs index 820285188ae4e..0cba1080de265 100644 --- a/src/test/run-pass/logging_before_rt_started.rs +++ b/src/test/run-pass/logging_before_rt_started.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // exec-env:RUST_LOG=std::ptr // In issue #9487, it was realized that std::ptr was invoking the logging diff --git a/src/test/run-pass/long-while.rs b/src/test/run-pass/long-while.rs index ce55c76120235..4a3ee6f971387 100644 --- a/src/test/run-pass/long-while.rs +++ b/src/test/run-pass/long-while.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![allow(unused_variables)] diff --git a/src/test/run-pass/loop-break-cont-1.rs b/src/test/run-pass/loop-break-cont-1.rs index 5abac0e65a360..ff0af615987f1 100644 --- a/src/test/run-pass/loop-break-cont-1.rs +++ b/src/test/run-pass/loop-break-cont-1.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { let _i = 0_usize; loop { diff --git a/src/test/run-pass/loop-break-cont.rs b/src/test/run-pass/loop-break-cont.rs index a15efa2d8ee8e..ce41c1e14ad2d 100644 --- a/src/test/run-pass/loop-break-cont.rs +++ b/src/test/run-pass/loop-break-cont.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { let mut i = 0_usize; loop { diff --git a/src/test/run-pass/loop-break-value.rs b/src/test/run-pass/loop-break-value.rs index 39053769b24b5..6a32af2609984 100644 --- a/src/test/run-pass/loop-break-value.rs +++ b/src/test/run-pass/loop-break-value.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(never_type)] #[allow(unused)] diff --git a/src/test/run-pass/loop-diverges.rs b/src/test/run-pass/loop-diverges.rs index c2ad9a6ef73e1..ea477988a4e62 100644 --- a/src/test/run-pass/loop-diverges.rs +++ b/src/test/run-pass/loop-diverges.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 /* Make sure a loop{} can be the tailexpr in the body diff --git a/src/test/run-pass/loop-label-shadowing.rs b/src/test/run-pass/loop-label-shadowing.rs index 399920a7e315c..4ef8bb7ab8021 100644 --- a/src/test/run-pass/loop-label-shadowing.rs +++ b/src/test/run-pass/loop-label-shadowing.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #12512. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/loop-labeled-break-value.rs b/src/test/run-pass/loop-labeled-break-value.rs index 4f03b45b116e7..78ed142c536be 100644 --- a/src/test/run-pass/loop-labeled-break-value.rs +++ b/src/test/run-pass/loop-labeled-break-value.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn main() { diff --git a/src/test/run-pass/loop-no-reinit-needed-post-bot.rs b/src/test/run-pass/loop-no-reinit-needed-post-bot.rs index 689e17c170d90..f8bac9227adb1 100644 --- a/src/test/run-pass/loop-no-reinit-needed-post-bot.rs +++ b/src/test/run-pass/loop-no-reinit-needed-post-bot.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct S; diff --git a/src/test/run-pass/loop-scope.rs b/src/test/run-pass/loop-scope.rs index 6916bfb8c616a..3578c7e81fa56 100644 --- a/src/test/run-pass/loop-scope.rs +++ b/src/test/run-pass/loop-scope.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { let x = vec![10, 20, 30]; let mut sum = 0; diff --git a/src/test/run-pass/lto-many-codegen-units.rs b/src/test/run-pass/lto-many-codegen-units.rs index bed675cee5604..17c345beb8493 100644 --- a/src/test/run-pass/lto-many-codegen-units.rs +++ b/src/test/run-pass/lto-many-codegen-units.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C lto -C codegen-units=8 // no-prefer-dynamic diff --git a/src/test/run-pass/lto-still-runs-thread-dtors.rs b/src/test/run-pass/lto-still-runs-thread-dtors.rs index 91fb7aa51d4b0..732681af037af 100644 --- a/src/test/run-pass/lto-still-runs-thread-dtors.rs +++ b/src/test/run-pass/lto-still-runs-thread-dtors.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C lto // no-prefer-dynamic // ignore-emscripten no threads support diff --git a/src/test/run-pass/lub-glb-with-unbound-infer-var.rs b/src/test/run-pass/lub-glb-with-unbound-infer-var.rs index 6b9bd67f9a5a4..7e430d26b26fe 100644 --- a/src/test/run-pass/lub-glb-with-unbound-infer-var.rs +++ b/src/test/run-pass/lub-glb-with-unbound-infer-var.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test for a specific corner case: when we compute the LUB of two fn // types and their parameters have unbound variables. In that case, we // wind up relating those two variables. This was causing an ICE in an diff --git a/src/test/run-pass/macro-2.rs b/src/test/run-pass/macro-2.rs index 801d92b6dcb16..a749f977adc90 100644 --- a/src/test/run-pass/macro-2.rs +++ b/src/test/run-pass/macro-2.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { macro_rules! mylambda_tt { diff --git a/src/test/run-pass/macro-at-most-once-rep.rs b/src/test/run-pass/macro-at-most-once-rep.rs index 61c3e781c0867..578cc829df6a3 100644 --- a/src/test/run-pass/macro-at-most-once-rep.rs +++ b/src/test/run-pass/macro-at-most-once-rep.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // The logic for parsing Kleene operators in macros has a special case to disambiguate `?`. // Specifically, `$(pat)?` is the ZeroOrOne operator whereas `$(pat)?+` or `$(pat)?*` are the // ZeroOrMore and OneOrMore operators using `?` as a separator. These tests are intended to diff --git a/src/test/run-pass/macro-attribute-expansion.rs b/src/test/run-pass/macro-attribute-expansion.rs index c3de9f736fbe5..97f53ccbfb8a3 100644 --- a/src/test/run-pass/macro-attribute-expansion.rs +++ b/src/test/run-pass/macro-attribute-expansion.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! descriptions { ($name:ident is $desc:expr) => { // Check that we will correctly expand attributes diff --git a/src/test/run-pass/macro-attributes.rs b/src/test/run-pass/macro-attributes.rs index 839fee3a2d214..fea23859a491a 100644 --- a/src/test/run-pass/macro-attributes.rs +++ b/src/test/run-pass/macro-attributes.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(custom_attribute)] macro_rules! compiles_fine { diff --git a/src/test/run-pass/macro-block-nonterminal.rs b/src/test/run-pass/macro-block-nonterminal.rs index 21b284f420f20..d2ef17636d8dc 100644 --- a/src/test/run-pass/macro-block-nonterminal.rs +++ b/src/test/run-pass/macro-block-nonterminal.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - macro_rules! do_block{ ($val:block) => {$val} } diff --git a/src/test/run-pass/macro-comma-behavior.rs b/src/test/run-pass/macro-comma-behavior.rs index 2a434009e134f..545b3cb0df8a7 100644 --- a/src/test/run-pass/macro-comma-behavior.rs +++ b/src/test/run-pass/macro-comma-behavior.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Ideally, any macro call with a trailing comma should behave // identically to a call without the comma. // diff --git a/src/test/run-pass/macro-comma-support.rs b/src/test/run-pass/macro-comma-support.rs index f645849cd5114..4e86c9789ac00 100644 --- a/src/test/run-pass/macro-comma-support.rs +++ b/src/test/run-pass/macro-comma-support.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This is meant to be a comprehensive test of invocations with/without // trailing commas (or other, similar optionally-trailing separators). // Every macro is accounted for, even those not tested in this file. diff --git a/src/test/run-pass/macro-crate-def-only.rs b/src/test/run-pass/macro-crate-def-only.rs index 28be058b9a376..0b12861fa5b35 100644 --- a/src/test/run-pass/macro-crate-def-only.rs +++ b/src/test/run-pass/macro-crate-def-only.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:macro_crate_def_only.rs diff --git a/src/test/run-pass/macro-crate-nonterminal-renamed.rs b/src/test/run-pass/macro-crate-nonterminal-renamed.rs index 93f5899e3ac90..c5e6b98f2da70 100644 --- a/src/test/run-pass/macro-crate-nonterminal-renamed.rs +++ b/src/test/run-pass/macro-crate-nonterminal-renamed.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:macro_crate_nonterminal.rs #[macro_use] diff --git a/src/test/run-pass/macro-crate-nonterminal.rs b/src/test/run-pass/macro-crate-nonterminal.rs index 28f9393ab7a10..113fc40bab10d 100644 --- a/src/test/run-pass/macro-crate-nonterminal.rs +++ b/src/test/run-pass/macro-crate-nonterminal.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:macro_crate_nonterminal.rs #[macro_use] diff --git a/src/test/run-pass/macro-crate-use.rs b/src/test/run-pass/macro-crate-use.rs index c7255f67fa684..75c3a59648239 100644 --- a/src/test/run-pass/macro-crate-use.rs +++ b/src/test/run-pass/macro-crate-use.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn increment(x: usize) -> usize { x + 1 } diff --git a/src/test/run-pass/macro-deep_expansion.rs b/src/test/run-pass/macro-deep_expansion.rs index 3e8548ff49d2b..a0aa68f53aa2d 100644 --- a/src/test/run-pass/macro-deep_expansion.rs +++ b/src/test/run-pass/macro-deep_expansion.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - macro_rules! foo2 { () => { "foo" diff --git a/src/test/run-pass/macro-delimiter-significance.rs b/src/test/run-pass/macro-delimiter-significance.rs index a2ae3fbf83b0f..c517b3bd5eff4 100644 --- a/src/test/run-pass/macro-delimiter-significance.rs +++ b/src/test/run-pass/macro-delimiter-significance.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { vec![1_usize, 2, 3].len(); } diff --git a/src/test/run-pass/macro-doc-comments.rs b/src/test/run-pass/macro-doc-comments.rs index 506813df5b374..e8ffe0d373084 100644 --- a/src/test/run-pass/macro-doc-comments.rs +++ b/src/test/run-pass/macro-doc-comments.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! doc { ( $(#[$outer:meta])* diff --git a/src/test/run-pass/macro-doc-escapes.rs b/src/test/run-pass/macro-doc-escapes.rs index ea92f0ffebe6f..9c69684380b79 100644 --- a/src/test/run-pass/macro-doc-escapes.rs +++ b/src/test/run-pass/macro-doc-escapes.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // When expanding a macro, documentation attributes (including documentation comments) must be // passed "as is" without being parsed. Otherwise, some text will be incorrectly interpreted as // escape sequences, leading to an ICE. diff --git a/src/test/run-pass/macro-doc-raw-str-hashes.rs b/src/test/run-pass/macro-doc-raw-str-hashes.rs index ffbe237b74e60..7debb985d2281 100644 --- a/src/test/run-pass/macro-doc-raw-str-hashes.rs +++ b/src/test/run-pass/macro-doc-raw-str-hashes.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // The number of `#`s used to wrap the documentation comment should differ regarding the content. // // Related issue: #27489 diff --git a/src/test/run-pass/macro-export-inner-module.rs b/src/test/run-pass/macro-export-inner-module.rs index e39f81e49d7c4..75f50e1f8eb5f 100644 --- a/src/test/run-pass/macro-export-inner-module.rs +++ b/src/test/run-pass/macro-export-inner-module.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //aux-build:macro_export_inner_module.rs #[macro_use] #[no_link] diff --git a/src/test/run-pass/macro-first-set.rs b/src/test/run-pass/macro-first-set.rs index 9216040ab6ec8..7329d95e9bc79 100644 --- a/src/test/run-pass/macro-first-set.rs +++ b/src/test/run-pass/macro-first-set.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![cfg_attr(stage0, feature(macro_vis_matcher))] //{{{ issue 40569 ============================================================== diff --git a/src/test/run-pass/macro-follow.rs b/src/test/run-pass/macro-follow.rs index dca676f8cf95f..09e12a4658a72 100644 --- a/src/test/run-pass/macro-follow.rs +++ b/src/test/run-pass/macro-follow.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check the macro follow sets (see corresponding cfail test). // FOLLOW(pat) = {FatArrow, Comma, Eq, Or, Ident(if), Ident(in)} diff --git a/src/test/run-pass/macro-followed-by-seq.rs b/src/test/run-pass/macro-followed-by-seq.rs index 15224930b8465..6f2c9998505d6 100644 --- a/src/test/run-pass/macro-followed-by-seq.rs +++ b/src/test/run-pass/macro-followed-by-seq.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #25436: check that things which can be // followed by any token also permit X* to come afterwards. diff --git a/src/test/run-pass/macro-include-items.rs b/src/test/run-pass/macro-include-items.rs index f8728ebb91517..1298ba411768f 100644 --- a/src/test/run-pass/macro-include-items.rs +++ b/src/test/run-pass/macro-include-items.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty issue #37195 fn bar() {} diff --git a/src/test/run-pass/macro-interpolation.rs b/src/test/run-pass/macro-interpolation.rs index 6dcd1538ebce2..5bb71a6818d4e 100644 --- a/src/test/run-pass/macro-interpolation.rs +++ b/src/test/run-pass/macro-interpolation.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - macro_rules! overly_complicated { ($fnname:ident, $arg:ident, $ty:ty, $body:block, $val:expr, $pat:pat, $res:path) => ({ diff --git a/src/test/run-pass/macro-invocation-in-count-expr-fixed-array-type.rs b/src/test/run-pass/macro-invocation-in-count-expr-fixed-array-type.rs index 9fafeb6531dca..10a2130a29eed 100644 --- a/src/test/run-pass/macro-invocation-in-count-expr-fixed-array-type.rs +++ b/src/test/run-pass/macro-invocation-in-count-expr-fixed-array-type.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 macro_rules! four { diff --git a/src/test/run-pass/macro-lifetime-used-with-bound.rs b/src/test/run-pass/macro-lifetime-used-with-bound.rs index b9e1fde6b1f3e..589f1f49064a3 100644 --- a/src/test/run-pass/macro-lifetime-used-with-bound.rs +++ b/src/test/run-pass/macro-lifetime-used-with-bound.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! foo { ($l:lifetime, $l2:lifetime) => { fn f<$l: $l2, $l2>(arg: &$l str, arg2: &$l2 str) -> &$l str { diff --git a/src/test/run-pass/macro-lifetime-used-with-labels.rs b/src/test/run-pass/macro-lifetime-used-with-labels.rs index d003d7dcfb620..7779821f42a4d 100644 --- a/src/test/run-pass/macro-lifetime-used-with-labels.rs +++ b/src/test/run-pass/macro-lifetime-used-with-labels.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unreachable_code)] macro_rules! x { diff --git a/src/test/run-pass/macro-lifetime-used-with-static.rs b/src/test/run-pass/macro-lifetime-used-with-static.rs index 5c1f8683e00f6..1df30474c60bb 100644 --- a/src/test/run-pass/macro-lifetime-used-with-static.rs +++ b/src/test/run-pass/macro-lifetime-used-with-static.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! foo { ($l:lifetime) => { fn f(arg: &$l str) -> &$l str { diff --git a/src/test/run-pass/macro-lifetime.rs b/src/test/run-pass/macro-lifetime.rs index ff5798ff78d62..d398102065036 100644 --- a/src/test/run-pass/macro-lifetime.rs +++ b/src/test/run-pass/macro-lifetime.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! foo { ($l:lifetime) => { fn f<$l>(arg: &$l str) -> &$l str { diff --git a/src/test/run-pass/macro-literal.rs b/src/test/run-pass/macro-literal.rs index 6d5e8bc97c0e9..6d8895d7ee6b6 100644 --- a/src/test/run-pass/macro-literal.rs +++ b/src/test/run-pass/macro-literal.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(macro_literal_matcher)] macro_rules! mtester { diff --git a/src/test/run-pass/macro-meta-items.rs b/src/test/run-pass/macro-meta-items.rs index 9c1e1fca3413e..714b5f1b1990c 100644 --- a/src/test/run-pass/macro-meta-items.rs +++ b/src/test/run-pass/macro-meta-items.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --cfg foo macro_rules! compiles_fine { diff --git a/src/test/run-pass/macro-method-issue-4621.rs b/src/test/run-pass/macro-method-issue-4621.rs index 64648cae5e6cc..5646897d6dc29 100644 --- a/src/test/run-pass/macro-method-issue-4621.rs +++ b/src/test/run-pass/macro-method-issue-4621.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct A; macro_rules! make_thirteen_method {() => (fn thirteen(&self)->isize {13})} diff --git a/src/test/run-pass/macro-multiple-items.rs b/src/test/run-pass/macro-multiple-items.rs index 190bfc53a9edb..1ae831a79f4cf 100644 --- a/src/test/run-pass/macro-multiple-items.rs +++ b/src/test/run-pass/macro-multiple-items.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! make_foo { () => ( struct Foo; diff --git a/src/test/run-pass/macro-named-default.rs b/src/test/run-pass/macro-named-default.rs index 028d59a19dd64..98e6f75e9e11d 100644 --- a/src/test/run-pass/macro-named-default.rs +++ b/src/test/run-pass/macro-named-default.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! default { ($($x:tt)*) => { $($x)* } } diff --git a/src/test/run-pass/macro-nested_definition_issue-31946.rs b/src/test/run-pass/macro-nested_definition_issue-31946.rs index 84ff2dc4d0d61..be8a1bae23517 100644 --- a/src/test/run-pass/macro-nested_definition_issue-31946.rs +++ b/src/test/run-pass/macro-nested_definition_issue-31946.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { println!("{}", { macro_rules! foo { diff --git a/src/test/run-pass/macro-nested_expr.rs b/src/test/run-pass/macro-nested_expr.rs index 993ded60c3678..52de507a696b5 100644 --- a/src/test/run-pass/macro-nested_expr.rs +++ b/src/test/run-pass/macro-nested_expr.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // #42164 #![feature(decl_macro)] diff --git a/src/test/run-pass/macro-nested_stmt_macros.rs b/src/test/run-pass/macro-nested_stmt_macros.rs index 5997a4f18e760..8a0aa1075bd13 100644 --- a/src/test/run-pass/macro-nested_stmt_macros.rs +++ b/src/test/run-pass/macro-nested_stmt_macros.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! foo { () => { struct Bar; diff --git a/src/test/run-pass/macro-nt-list.rs b/src/test/run-pass/macro-nt-list.rs index f3367ff2b410f..e59b9f0f7fb20 100644 --- a/src/test/run-pass/macro-nt-list.rs +++ b/src/test/run-pass/macro-nt-list.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 macro_rules! list { diff --git a/src/test/run-pass/macro-of-higher-order.rs b/src/test/run-pass/macro-of-higher-order.rs index c982e8ac6f83e..a723faf413b0b 100644 --- a/src/test/run-pass/macro-of-higher-order.rs +++ b/src/test/run-pass/macro-of-higher-order.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - macro_rules! higher_order { (subst $lhs:tt => $rhs:tt) => ({ macro_rules! anon { $lhs => $rhs } diff --git a/src/test/run-pass/macro-pat-follow.rs b/src/test/run-pass/macro-pat-follow.rs index c1abebd5f9040..dfd50da1a8087 100644 --- a/src/test/run-pass/macro-pat-follow.rs +++ b/src/test/run-pass/macro-pat-follow.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! pat_in { ($p:pat in $e:expr) => {{ let mut iter = $e.into_iter(); diff --git a/src/test/run-pass/macro-pat-neg-lit.rs b/src/test/run-pass/macro-pat-neg-lit.rs index 43ac697edced9..1d0c2401eff88 100644 --- a/src/test/run-pass/macro-pat-neg-lit.rs +++ b/src/test/run-pass/macro-pat-neg-lit.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! enum_number { ($name:ident { $($variant:ident = $value:expr, )* }) => { enum $name { diff --git a/src/test/run-pass/macro-pat.rs b/src/test/run-pass/macro-pat.rs index 48e521de57e90..916b41a9f9ea0 100644 --- a/src/test/run-pass/macro-pat.rs +++ b/src/test/run-pass/macro-pat.rs @@ -1,14 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - macro_rules! mypat { () => ( Some('y') diff --git a/src/test/run-pass/macro-path.rs b/src/test/run-pass/macro-path.rs index 7aecc1dc20348..1d79bd7a86249 100644 --- a/src/test/run-pass/macro-path.rs +++ b/src/test/run-pass/macro-path.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - mod m { pub type t = isize; } diff --git a/src/test/run-pass/macro-pub-matcher.rs b/src/test/run-pass/macro-pub-matcher.rs index db8331358b96e..4875a14ff03c4 100644 --- a/src/test/run-pass/macro-pub-matcher.rs +++ b/src/test/run-pass/macro-pub-matcher.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code, unused_imports)] #![cfg_attr(stage0, feature(macro_vis_matcher))] #![feature(crate_visibility_modifier)] diff --git a/src/test/run-pass/macro-seq-followed-by-seq.rs b/src/test/run-pass/macro-seq-followed-by-seq.rs index 23c7d2516a27e..169cb39ad83be 100644 --- a/src/test/run-pass/macro-seq-followed-by-seq.rs +++ b/src/test/run-pass/macro-seq-followed-by-seq.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test of allowing two sequences repetitions in a row, // functionality added as byproduct of RFC amendment #1384 // https://github.com/rust-lang/rfcs/pull/1384 diff --git a/src/test/run-pass/macro-stability.rs b/src/test/run-pass/macro-stability.rs index 9afcd51aa85af..25479dac16485 100644 --- a/src/test/run-pass/macro-stability.rs +++ b/src/test/run-pass/macro-stability.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:unstable-macros.rs #![feature(unstable_macros)] diff --git a/src/test/run-pass/macro-stmt.rs b/src/test/run-pass/macro-stmt.rs index 027df9f93a88d..7e472ebdb0eb8 100644 --- a/src/test/run-pass/macro-stmt.rs +++ b/src/test/run-pass/macro-stmt.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! myfn { ( $f:ident, ( $( $x:ident ),* ), $body:block ) => ( fn $f( $( $x : isize),* ) -> isize $body diff --git a/src/test/run-pass/macro-stmt_macro_in_expr_macro.rs b/src/test/run-pass/macro-stmt_macro_in_expr_macro.rs index c5badd78a6371..e44bafffa759a 100644 --- a/src/test/run-pass/macro-stmt_macro_in_expr_macro.rs +++ b/src/test/run-pass/macro-stmt_macro_in_expr_macro.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! foo { () => { struct Bar; diff --git a/src/test/run-pass/macro-tt-followed-by-seq.rs b/src/test/run-pass/macro-tt-followed-by-seq.rs index cdb1f86aea50b..0fd4a049e51de 100644 --- a/src/test/run-pass/macro-tt-followed-by-seq.rs +++ b/src/test/run-pass/macro-tt-followed-by-seq.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #25436: permit token-trees to be followed // by sequences, enabling more general parsing. diff --git a/src/test/run-pass/macro-use-all-and-none.rs b/src/test/run-pass/macro-use-all-and-none.rs index 60e1d6287f181..20020e8c31179 100644 --- a/src/test/run-pass/macro-use-all-and-none.rs +++ b/src/test/run-pass/macro-use-all-and-none.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:two_macros.rs #[macro_use] diff --git a/src/test/run-pass/macro-use-all.rs b/src/test/run-pass/macro-use-all.rs index ca9c0e23e7c33..fbebf66de6557 100644 --- a/src/test/run-pass/macro-use-all.rs +++ b/src/test/run-pass/macro-use-all.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:two_macros.rs #[macro_use] diff --git a/src/test/run-pass/macro-use-both.rs b/src/test/run-pass/macro-use-both.rs index 7e0a374ef1521..061ac2b107eb4 100644 --- a/src/test/run-pass/macro-use-both.rs +++ b/src/test/run-pass/macro-use-both.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:two_macros.rs #[macro_use(macro_one, macro_two)] diff --git a/src/test/run-pass/macro-use-one.rs b/src/test/run-pass/macro-use-one.rs index 6a30b3e55ba9a..1306fb8a50516 100644 --- a/src/test/run-pass/macro-use-one.rs +++ b/src/test/run-pass/macro-use-one.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:two_macros.rs #[macro_use(macro_two)] diff --git a/src/test/run-pass/macro-with-attrs1.rs b/src/test/run-pass/macro-with-attrs1.rs index 99bf71b1f0126..c369695e9369c 100644 --- a/src/test/run-pass/macro-with-attrs1.rs +++ b/src/test/run-pass/macro-with-attrs1.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --cfg foo diff --git a/src/test/run-pass/macro-with-attrs2.rs b/src/test/run-pass/macro-with-attrs2.rs index 062c8d55d5296..39a6dbb4cd93b 100644 --- a/src/test/run-pass/macro-with-attrs2.rs +++ b/src/test/run-pass/macro-with-attrs2.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #[cfg(foo)] macro_rules! foo { () => (1) } diff --git a/src/test/run-pass/macro-with-braces-in-expr-position.rs b/src/test/run-pass/macro-with-braces-in-expr-position.rs index c3fad3a19f927..eb7a101ed3a64 100644 --- a/src/test/run-pass/macro-with-braces-in-expr-position.rs +++ b/src/test/run-pass/macro-with-braces-in-expr-position.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/macro_with_super_2.rs b/src/test/run-pass/macro_with_super_2.rs index 9ecf186d5b11e..e507485647064 100644 --- a/src/test/run-pass/macro_with_super_2.rs +++ b/src/test/run-pass/macro_with_super_2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:macro_with_super_1.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/macros-in-extern.rs b/src/test/run-pass/macros-in-extern.rs index d9094934356fc..f33622b7c06b2 100644 --- a/src/test/run-pass/macros-in-extern.rs +++ b/src/test/run-pass/macros-in-extern.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32 #![feature(decl_macro, macros_in_extern)] diff --git a/src/test/run-pass/match-arm-statics.rs b/src/test/run-pass/match-arm-statics.rs index ca6ef2e42777b..450319b48c593 100644 --- a/src/test/run-pass/match-arm-statics.rs +++ b/src/test/run-pass/match-arm-statics.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -g #[derive(PartialEq, Eq)] diff --git a/src/test/run-pass/match-beginning-vert.rs b/src/test/run-pass/match-beginning-vert.rs index cdacfb2f05729..92402afb46579 100644 --- a/src/test/run-pass/match-beginning-vert.rs +++ b/src/test/run-pass/match-beginning-vert.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Foo { A, B, diff --git a/src/test/run-pass/match-borrowed_str.rs b/src/test/run-pass/match-borrowed_str.rs index b027e62494c23..3f33296dde8cd 100644 --- a/src/test/run-pass/match-borrowed_str.rs +++ b/src/test/run-pass/match-borrowed_str.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![allow(unnecessary_allocation)] fn f1(ref_string: &str) -> String { diff --git a/src/test/run-pass/match-bot-2.rs b/src/test/run-pass/match-bot-2.rs index 88c514a724f2f..e30c57edcc305 100644 --- a/src/test/run-pass/match-bot-2.rs +++ b/src/test/run-pass/match-bot-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // n.b. This was only ever failing with optimization disabled. fn a() -> isize { match return 1 { 2 => 3, _ => panic!() } } diff --git a/src/test/run-pass/match-bot.rs b/src/test/run-pass/match-bot.rs index 7745410fa434a..2c5aa17c7413f 100644 --- a/src/test/run-pass/match-bot.rs +++ b/src/test/run-pass/match-bot.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { let i: isize = match Some::(3) { None:: => { panic!() } Some::(_) => { 5 } }; diff --git a/src/test/run-pass/match-byte-array-patterns.rs b/src/test/run-pass/match-byte-array-patterns.rs index dbfe588fb0c6a..4dff93e14a616 100644 --- a/src/test/run-pass/match-byte-array-patterns.rs +++ b/src/test/run-pass/match-byte-array-patterns.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(slice_patterns)] fn main() { diff --git a/src/test/run-pass/match-enum-struct-0.rs b/src/test/run-pass/match-enum-struct-0.rs index 1754dc0c960f8..231d6f924d7e8 100644 --- a/src/test/run-pass/match-enum-struct-0.rs +++ b/src/test/run-pass/match-enum-struct-0.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // regression test for issue #5625 diff --git a/src/test/run-pass/match-enum-struct-1.rs b/src/test/run-pass/match-enum-struct-1.rs index ebf2db36700c3..214665db7838b 100644 --- a/src/test/run-pass/match-enum-struct-1.rs +++ b/src/test/run-pass/match-enum-struct-1.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum E { Foo{f : isize}, Bar diff --git a/src/test/run-pass/match-implicit-copy-unique.rs b/src/test/run-pass/match-implicit-copy-unique.rs index 10de6eeabddaa..b2e0e991550bd 100644 --- a/src/test/run-pass/match-implicit-copy-unique.rs +++ b/src/test/run-pass/match-implicit-copy-unique.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] struct Pair { a: Box, b: Box } diff --git a/src/test/run-pass/match-in-macro.rs b/src/test/run-pass/match-in-macro.rs index e096c97e16f16..d0b300bf92f83 100644 --- a/src/test/run-pass/match-in-macro.rs +++ b/src/test/run-pass/match-in-macro.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum Foo { B { b1: isize, bb1: isize}, } diff --git a/src/test/run-pass/match-join.rs b/src/test/run-pass/match-join.rs index b47732b325a98..d22e7c3ba531c 100644 --- a/src/test/run-pass/match-join.rs +++ b/src/test/run-pass/match-join.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo(y: Option) { let mut x: isize; let mut rs: Vec = Vec::new(); diff --git a/src/test/run-pass/match-larger-const.rs b/src/test/run-pass/match-larger-const.rs index 8cb4d92c21cf0..de1406f8dac27 100644 --- a/src/test/run-pass/match-larger-const.rs +++ b/src/test/run-pass/match-larger-const.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Eq, PartialEq)] pub struct Data([u8; 4]); diff --git a/src/test/run-pass/match-naked-record-expr.rs b/src/test/run-pass/match-naked-record-expr.rs index e558e88e03d9c..192b2068d9dba 100644 --- a/src/test/run-pass/match-naked-record-expr.rs +++ b/src/test/run-pass/match-naked-record-expr.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct X { x: isize } diff --git a/src/test/run-pass/match-naked-record.rs b/src/test/run-pass/match-naked-record.rs index a2b35e6558c47..9d8b9f2a657af 100644 --- a/src/test/run-pass/match-naked-record.rs +++ b/src/test/run-pass/match-naked-record.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct X { x: isize } diff --git a/src/test/run-pass/match-path.rs b/src/test/run-pass/match-path.rs index 1b3594a0a792e..ae051a8982652 100644 --- a/src/test/run-pass/match-path.rs +++ b/src/test/run-pass/match-path.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - // pretty-expanded FIXME #23616 mod m1 { diff --git a/src/test/run-pass/match-pattern-bindings.rs b/src/test/run-pass/match-pattern-bindings.rs index 9f687ab99e800..1ff7400435ed9 100644 --- a/src/test/run-pass/match-pattern-bindings.rs +++ b/src/test/run-pass/match-pattern-bindings.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn main() { let value = Some(1); assert_eq!(match value { diff --git a/src/test/run-pass/match-pattern-lit.rs b/src/test/run-pass/match-pattern-lit.rs index 32de1c6c67427..f31780511bb96 100644 --- a/src/test/run-pass/match-pattern-lit.rs +++ b/src/test/run-pass/match-pattern-lit.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - fn altlit(f: isize) -> isize { match f { 10 => { println!("case 10"); return 20; } diff --git a/src/test/run-pass/match-pattern-no-type-params.rs b/src/test/run-pass/match-pattern-no-type-params.rs index ccf23b87ea3b8..e335586d12516 100644 --- a/src/test/run-pass/match-pattern-no-type-params.rs +++ b/src/test/run-pass/match-pattern-no-type-params.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum maybe { nothing, just(T), } fn foo(x: maybe) { diff --git a/src/test/run-pass/match-pattern-simple.rs b/src/test/run-pass/match-pattern-simple.rs index 8e729e2eab386..4827836b5b277 100644 --- a/src/test/run-pass/match-pattern-simple.rs +++ b/src/test/run-pass/match-pattern-simple.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - // pretty-expanded FIXME #23616 fn altsimple(f: isize) { match f { _x => () } } diff --git a/src/test/run-pass/match-phi.rs b/src/test/run-pass/match-phi.rs index 24185ffa4128f..22e1502b37b96 100644 --- a/src/test/run-pass/match-phi.rs +++ b/src/test/run-pass/match-phi.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![allow(dead_assignment)] diff --git a/src/test/run-pass/match-pipe-binding.rs b/src/test/run-pass/match-pipe-binding.rs index 9592da77a1b58..53f2c93f63f8a 100644 --- a/src/test/run-pass/match-pipe-binding.rs +++ b/src/test/run-pass/match-pipe-binding.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z borrowck=compare fn test1() { diff --git a/src/test/run-pass/match-range-infer.rs b/src/test/run-pass/match-range-infer.rs index cf07345d3433a..8e3fb9d0ad40b 100644 --- a/src/test/run-pass/match-range-infer.rs +++ b/src/test/run-pass/match-range-infer.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that type inference for range patterns works correctly (is bi-directional). pub fn main() { diff --git a/src/test/run-pass/match-range-static.rs b/src/test/run-pass/match-range-static.rs index b63ca7defd61a..8131ed55503a0 100644 --- a/src/test/run-pass/match-range-static.rs +++ b/src/test/run-pass/match-range-static.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 const s: isize = 1; diff --git a/src/test/run-pass/match-range.rs b/src/test/run-pass/match-range.rs index efa725321967d..d72fedf0d0569 100644 --- a/src/test/run-pass/match-range.rs +++ b/src/test/run-pass/match-range.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(exclusive_range_pattern)] pub fn main() { diff --git a/src/test/run-pass/match-reassign.rs b/src/test/run-pass/match-reassign.rs index bedcee43db5ba..d8318ec900f44 100644 --- a/src/test/run-pass/match-reassign.rs +++ b/src/test/run-pass/match-reassign.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #23698: The reassignment checker only cared // about the last assignment in a match arm body diff --git a/src/test/run-pass/match-ref-binding-in-guard-3256.rs b/src/test/run-pass/match-ref-binding-in-guard-3256.rs index dc3c759078f3d..7d797e5ffa77c 100644 --- a/src/test/run-pass/match-ref-binding-in-guard-3256.rs +++ b/src/test/run-pass/match-ref-binding-in-guard-3256.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::sync::Mutex; pub fn main() { diff --git a/src/test/run-pass/match-ref-binding-mut-option.rs b/src/test/run-pass/match-ref-binding-mut-option.rs index f429e7b58e382..5894ee5b7d150 100644 --- a/src/test/run-pass/match-ref-binding-mut-option.rs +++ b/src/test/run-pass/match-ref-binding-mut-option.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { let mut v = Some(22); match v { diff --git a/src/test/run-pass/match-ref-binding-mut.rs b/src/test/run-pass/match-ref-binding-mut.rs index abc418ddd5169..8090c7d2f55ed 100644 --- a/src/test/run-pass/match-ref-binding-mut.rs +++ b/src/test/run-pass/match-ref-binding-mut.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct Rec { f: isize } diff --git a/src/test/run-pass/match-ref-binding.rs b/src/test/run-pass/match-ref-binding.rs index eab7ed529b1f6..b899194c7b6f7 100644 --- a/src/test/run-pass/match-ref-binding.rs +++ b/src/test/run-pass/match-ref-binding.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn destructure(x: Option) -> isize { match x { None => 0, diff --git a/src/test/run-pass/match-ref-unsized.rs b/src/test/run-pass/match-ref-unsized.rs index 4de028299df81..a53109797b1d9 100644 --- a/src/test/run-pass/match-ref-unsized.rs +++ b/src/test/run-pass/match-ref-unsized.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Binding unsized expressions to ref patterns pub fn main() { diff --git a/src/test/run-pass/match-static-const-rename.rs b/src/test/run-pass/match-static-const-rename.rs index 77e3b724cbe77..3cbb64881daae 100644 --- a/src/test/run-pass/match-static-const-rename.rs +++ b/src/test/run-pass/match-static-const-rename.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #7526: lowercase static constants in patterns look like bindings // This is similar to compile-fail/match-static-const-lc, except it diff --git a/src/test/run-pass/match-str.rs b/src/test/run-pass/match-str.rs index e6def65e53a6f..112f017389206 100644 --- a/src/test/run-pass/match-str.rs +++ b/src/test/run-pass/match-str.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #53 diff --git a/src/test/run-pass/match-struct-0.rs b/src/test/run-pass/match-struct-0.rs index e9e45df460df1..8ea6e816cbad1 100644 --- a/src/test/run-pass/match-struct-0.rs +++ b/src/test/run-pass/match-struct-0.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct Foo{ f : isize, } diff --git a/src/test/run-pass/match-tag.rs b/src/test/run-pass/match-tag.rs index e4a0d4e95f3c7..a8bcfccc2aa52 100644 --- a/src/test/run-pass/match-tag.rs +++ b/src/test/run-pass/match-tag.rs @@ -1,17 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - - enum color { rgb(isize, isize, isize), rgba(isize, isize, isize, isize), diff --git a/src/test/run-pass/match-unique-bind.rs b/src/test/run-pass/match-unique-bind.rs index ca864c05cfdc8..2e128e9024e81 100644 --- a/src/test/run-pass/match-unique-bind.rs +++ b/src/test/run-pass/match-unique-bind.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_patterns)] #![feature(box_syntax)] diff --git a/src/test/run-pass/match-unsized.rs b/src/test/run-pass/match-unsized.rs index 7253672a7ff47..067c8cd33a23e 100644 --- a/src/test/run-pass/match-unsized.rs +++ b/src/test/run-pass/match-unsized.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let data: &'static str = "Hello, World!"; match data { diff --git a/src/test/run-pass/match-value-binding-in-guard-3291.rs b/src/test/run-pass/match-value-binding-in-guard-3291.rs index ab56a8cfc9392..6db7e41f3ef0a 100644 --- a/src/test/run-pass/match-value-binding-in-guard-3291.rs +++ b/src/test/run-pass/match-value-binding-in-guard-3291.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/match-var-hygiene.rs b/src/test/run-pass/match-var-hygiene.rs index dfb23aabf191d..55bfcdd230a94 100644 --- a/src/test/run-pass/match-var-hygiene.rs +++ b/src/test/run-pass/match-var-hygiene.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // shouldn't affect evaluation of $ex. macro_rules! bad_macro { ($ex:expr) => ( {match 9 {_x => $ex}} diff --git a/src/test/run-pass/match-vec-alternatives.rs b/src/test/run-pass/match-vec-alternatives.rs index 7d03d9c2abe20..98b334fdf6925 100644 --- a/src/test/run-pass/match-vec-alternatives.rs +++ b/src/test/run-pass/match-vec-alternatives.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(slice_patterns)] fn match_vecs<'a, T>(l1: &'a [T], l2: &'a [T]) -> &'static str { diff --git a/src/test/run-pass/match-vec-rvalue.rs b/src/test/run-pass/match-vec-rvalue.rs index 3d221927b96e1..d77d66ddd7ed9 100644 --- a/src/test/run-pass/match-vec-rvalue.rs +++ b/src/test/run-pass/match-vec-rvalue.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that matching rvalues with drops does not crash. diff --git a/src/test/run-pass/match-with-ret-arm.rs b/src/test/run-pass/match-with-ret-arm.rs index 79b197f08e271..5651cb11ee52a 100644 --- a/src/test/run-pass/match-with-ret-arm.rs +++ b/src/test/run-pass/match-with-ret-arm.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { // sometimes we have had trouble finding // the right type for f, as we unified diff --git a/src/test/run-pass/max-min-classes.rs b/src/test/run-pass/max-min-classes.rs index f0844b8e1eb17..8720d5abc824c 100644 --- a/src/test/run-pass/max-min-classes.rs +++ b/src/test/run-pass/max-min-classes.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Product { fn product(&self) -> isize; } diff --git a/src/test/run-pass/method-argument-inference-associated-type.rs b/src/test/run-pass/method-argument-inference-associated-type.rs index 76b8cf92329d1..14d5129216c86 100644 --- a/src/test/run-pass/method-argument-inference-associated-type.rs +++ b/src/test/run-pass/method-argument-inference-associated-type.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct ClientMap; pub struct ClientMap2; diff --git a/src/test/run-pass/method-attributes.rs b/src/test/run-pass/method-attributes.rs index 400ecda411e18..2874c6fc127ff 100644 --- a/src/test/run-pass/method-attributes.rs +++ b/src/test/run-pass/method-attributes.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pp-exact - Make sure we print all the attributes // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/method-early-bound-lifetimes-on-self.rs b/src/test/run-pass/method-early-bound-lifetimes-on-self.rs index 3babb543bf2a1..ae9d1f686e255 100644 --- a/src/test/run-pass/method-early-bound-lifetimes-on-self.rs +++ b/src/test/run-pass/method-early-bound-lifetimes-on-self.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we successfully handle methods where the `self` type has // an early-bound lifetime. Issue #18208. diff --git a/src/test/run-pass/method-mut-self-modifies-mut-slice-lvalue.rs b/src/test/run-pass/method-mut-self-modifies-mut-slice-lvalue.rs index 220482f57eb01..1f389595b9fc3 100644 --- a/src/test/run-pass/method-mut-self-modifies-mut-slice-lvalue.rs +++ b/src/test/run-pass/method-mut-self-modifies-mut-slice-lvalue.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that an `&mut self` method, when invoked on a place whose // type is `&mut [u8]`, passes in a pointer to the place and not a // temporary. Issue #19147. diff --git a/src/test/run-pass/method-normalize-bounds-issue-20604.rs b/src/test/run-pass/method-normalize-bounds-issue-20604.rs index 3a1ce74a64c02..29335343f0640 100644 --- a/src/test/run-pass/method-normalize-bounds-issue-20604.rs +++ b/src/test/run-pass/method-normalize-bounds-issue-20604.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we handle projection types which wind up important for // resolving methods. This test was reduced from a larger example; the // call to `foo()` at the end was failing to resolve because the diff --git a/src/test/run-pass/method-projection.rs b/src/test/run-pass/method-projection.rs index 41d92cc75937b..55eeca71355cd 100644 --- a/src/test/run-pass/method-projection.rs +++ b/src/test/run-pass/method-projection.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we can use method notation to call methods based on a // projection bound from a trait. Issue #20469. diff --git a/src/test/run-pass/method-recursive-blanket-impl.rs b/src/test/run-pass/method-recursive-blanket-impl.rs index 6877bf376a658..a93de9801f2dc 100644 --- a/src/test/run-pass/method-recursive-blanket-impl.rs +++ b/src/test/run-pass/method-recursive-blanket-impl.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we don't trigger on the blanket impl for all `&'a T` but // rather keep autoderefing and trigger on the underlying impl. To // know not to stop at the blanket, we have to recursively evaluate diff --git a/src/test/run-pass/method-self-arg-aux1.rs b/src/test/run-pass/method-self-arg-aux1.rs index 2572baf68fd12..b893601b1b2f3 100644 --- a/src/test/run-pass/method-self-arg-aux1.rs +++ b/src/test/run-pass/method-self-arg-aux1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test method calls with self as an argument (cross-crate) #![feature(box_syntax)] diff --git a/src/test/run-pass/method-self-arg-aux2.rs b/src/test/run-pass/method-self-arg-aux2.rs index 51de69ff01f0f..ef7a02cb5f95d 100644 --- a/src/test/run-pass/method-self-arg-aux2.rs +++ b/src/test/run-pass/method-self-arg-aux2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test method calls with self as an argument (cross-crate) #![feature(box_syntax)] diff --git a/src/test/run-pass/method-self-arg-trait.rs b/src/test/run-pass/method-self-arg-trait.rs index 34e849bd0d2d8..4beac3089afaf 100644 --- a/src/test/run-pass/method-self-arg-trait.rs +++ b/src/test/run-pass/method-self-arg-trait.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test method calls with self as an argument #![feature(box_syntax)] diff --git a/src/test/run-pass/method-self-arg.rs b/src/test/run-pass/method-self-arg.rs index b7fb2fa138da9..5a72341ec4e83 100644 --- a/src/test/run-pass/method-self-arg.rs +++ b/src/test/run-pass/method-self-arg.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test method calls with self as an argument #![feature(box_syntax)] diff --git a/src/test/run-pass/method-two-trait-defer-resolution-1.rs b/src/test/run-pass/method-two-trait-defer-resolution-1.rs index ff80ee1986815..3851581142dff 100644 --- a/src/test/run-pass/method-two-trait-defer-resolution-1.rs +++ b/src/test/run-pass/method-two-trait-defer-resolution-1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we pick which version of `foo` to run based on the // type that is (ultimately) inferred for `x`. diff --git a/src/test/run-pass/method-two-trait-defer-resolution-2.rs b/src/test/run-pass/method-two-trait-defer-resolution-2.rs index f403f52603950..c8bb0317639ea 100644 --- a/src/test/run-pass/method-two-trait-defer-resolution-2.rs +++ b/src/test/run-pass/method-two-trait-defer-resolution-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that when we write `x.foo()`, we do not have to know the // complete type of `x` in order to type-check the method call. In // this case, we know that `x: Vec<_1>`, but we don't know what type diff --git a/src/test/run-pass/method-two-traits-distinguished-via-where-clause.rs b/src/test/run-pass/method-two-traits-distinguished-via-where-clause.rs index 3f0f4f3574534..ce335316fd4ab 100644 --- a/src/test/run-pass/method-two-traits-distinguished-via-where-clause.rs +++ b/src/test/run-pass/method-two-traits-distinguished-via-where-clause.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we select between traits A and B. To do that, we must // consider the `Sized` bound. diff --git a/src/test/run-pass/method-where-clause.rs b/src/test/run-pass/method-where-clause.rs index 078dbe0e79e7f..81277c516aa24 100644 --- a/src/test/run-pass/method-where-clause.rs +++ b/src/test/run-pass/method-where-clause.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we can use method notation to call methods based on a // where clause type, and not only type parameters. diff --git a/src/test/run-pass/mid-path-type-params.rs b/src/test/run-pass/mid-path-type-params.rs index 3055f90ee2597..5222074ab5b51 100644 --- a/src/test/run-pass/mid-path-type-params.rs +++ b/src/test/run-pass/mid-path-type-params.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct S { diff --git a/src/test/run-pass/minmax-stability-issue-23687.rs b/src/test/run-pass/minmax-stability-issue-23687.rs index ba48648df32fb..d043a99688acf 100644 --- a/src/test/run-pass/minmax-stability-issue-23687.rs +++ b/src/test/run-pass/minmax-stability-issue-23687.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt::Debug; use std::cmp::{self, PartialOrd, Ordering}; diff --git a/src/test/run-pass/mir-inlining/ice-issue-45493.rs b/src/test/run-pass/mir-inlining/ice-issue-45493.rs index bd178f0e5bdaf..e6b15708045f6 100644 --- a/src/test/run-pass/mir-inlining/ice-issue-45493.rs +++ b/src/test/run-pass/mir-inlining/ice-issue-45493.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-Zmir-opt-level=2 trait Array { diff --git a/src/test/run-pass/mir-inlining/ice-issue-45885.rs b/src/test/run-pass/mir-inlining/ice-issue-45885.rs index 702cb6a9bc165..cbfff5e1e4c8a 100644 --- a/src/test/run-pass/mir-inlining/ice-issue-45885.rs +++ b/src/test/run-pass/mir-inlining/ice-issue-45885.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-Zmir-opt-level=2 pub enum Enum { diff --git a/src/test/run-pass/mir-inlining/no-trait-method-issue-40473.rs b/src/test/run-pass/mir-inlining/no-trait-method-issue-40473.rs index 11a29d9741755..64e83ee24b417 100644 --- a/src/test/run-pass/mir-inlining/no-trait-method-issue-40473.rs +++ b/src/test/run-pass/mir-inlining/no-trait-method-issue-40473.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-Zmir-opt-level=2 pub trait Foo { fn bar(&self) -> usize { 2 } diff --git a/src/test/run-pass/mir-typeck-normalize-fn-sig.rs b/src/test/run-pass/mir-typeck-normalize-fn-sig.rs index 11918d3739d4b..cd0a762593f2c 100644 --- a/src/test/run-pass/mir-typeck-normalize-fn-sig.rs +++ b/src/test/run-pass/mir-typeck-normalize-fn-sig.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This code was creating an ICE in the MIR type checker. The reason // is that we are reifying a reference to a function (`foo::<'x>`), // which involves extracting its signature, but we were not diff --git a/src/test/run-pass/mir_adt_construction.rs b/src/test/run-pass/mir_adt_construction.rs index eb96d94efec93..ec5c78025e870 100644 --- a/src/test/run-pass/mir_adt_construction.rs +++ b/src/test/run-pass/mir_adt_construction.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt; #[repr(C)] diff --git a/src/test/run-pass/mir_ascription_coercion.rs b/src/test/run-pass/mir_ascription_coercion.rs index bc1013429aa59..ac74a92a68e61 100644 --- a/src/test/run-pass/mir_ascription_coercion.rs +++ b/src/test/run-pass/mir_ascription_coercion.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that the result of type ascription has adjustments applied #![feature(type_ascription)] diff --git a/src/test/run-pass/mir_augmented_assignments.rs b/src/test/run-pass/mir_augmented_assignments.rs index bb90f25fce5f4..61559cb4b7eb3 100644 --- a/src/test/run-pass/mir_augmented_assignments.rs +++ b/src/test/run-pass/mir_augmented_assignments.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::mem; use std::ops::{ AddAssign, BitAndAssign, BitOrAssign, BitXorAssign, DivAssign, MulAssign, RemAssign, diff --git a/src/test/run-pass/mir_autoderef.rs b/src/test/run-pass/mir_autoderef.rs index f0032fee2835e..0979e8176848f 100644 --- a/src/test/run-pass/mir_autoderef.rs +++ b/src/test/run-pass/mir_autoderef.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::{Deref, DerefMut}; pub struct MyRef(u32); diff --git a/src/test/run-pass/mir_boxing.rs b/src/test/run-pass/mir_boxing.rs index 1c5134755d7aa..d2e9d26f9f9aa 100644 --- a/src/test/run-pass/mir_boxing.rs +++ b/src/test/run-pass/mir_boxing.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn test() -> Box { diff --git a/src/test/run-pass/mir_build_match_comparisons.rs b/src/test/run-pass/mir_build_match_comparisons.rs index b195ff63412af..d92f25cb33d2e 100644 --- a/src/test/run-pass/mir_build_match_comparisons.rs +++ b/src/test/run-pass/mir_build_match_comparisons.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn test1(x: i8) -> i32 { match x { 1...10 => 0, diff --git a/src/test/run-pass/mir_call_with_associated_type.rs b/src/test/run-pass/mir_call_with_associated_type.rs index 935d0e58985d7..a3844908599d4 100644 --- a/src/test/run-pass/mir_call_with_associated_type.rs +++ b/src/test/run-pass/mir_call_with_associated_type.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Trait { type Type; } diff --git a/src/test/run-pass/mir_calls_to_shims.rs b/src/test/run-pass/mir_calls_to_shims.rs index 9641ed282936f..6376445a4ea92 100644 --- a/src/test/run-pass/mir_calls_to_shims.rs +++ b/src/test/run-pass/mir_calls_to_shims.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare compiled with panic=abort by default #![feature(fn_traits)] diff --git a/src/test/run-pass/mir_cast_fn_ret.rs b/src/test/run-pass/mir_cast_fn_ret.rs index 311d5451eb6dd..be82635455934 100644 --- a/src/test/run-pass/mir_cast_fn_ret.rs +++ b/src/test/run-pass/mir_cast_fn_ret.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub extern "C" fn tuple2() -> (u16, u8) { (1, 2) } diff --git a/src/test/run-pass/mir_codegen_array.rs b/src/test/run-pass/mir_codegen_array.rs index b7f247012ce12..b27051f9bf64c 100644 --- a/src/test/run-pass/mir_codegen_array.rs +++ b/src/test/run-pass/mir_codegen_array.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn into_inner() -> [u64; 1024] { let mut x = 10 + 20; [x; 1024] diff --git a/src/test/run-pass/mir_codegen_array_2.rs b/src/test/run-pass/mir_codegen_array_2.rs index c7133fb0c0e49..2d8f090c522c9 100644 --- a/src/test/run-pass/mir_codegen_array_2.rs +++ b/src/test/run-pass/mir_codegen_array_2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn into_inner(x: u64) -> [u64; 1024] { [x; 2*4*8*16] } diff --git a/src/test/run-pass/mir_codegen_call_converging.rs b/src/test/run-pass/mir_codegen_call_converging.rs index 7d420bb86c607..8e95079b67e3f 100644 --- a/src/test/run-pass/mir_codegen_call_converging.rs +++ b/src/test/run-pass/mir_codegen_call_converging.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn converging_fn() -> u64 { 43 } diff --git a/src/test/run-pass/mir_codegen_calls.rs b/src/test/run-pass/mir_codegen_calls.rs index d02e3287bc38a..c2fe62ecbae32 100644 --- a/src/test/run-pass/mir_codegen_calls.rs +++ b/src/test/run-pass/mir_codegen_calls.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(fn_traits, test)] extern crate test; diff --git a/src/test/run-pass/mir_codegen_calls_variadic.rs b/src/test/run-pass/mir_codegen_calls_variadic.rs index 7845c9426e23b..a235da7ee5787 100644 --- a/src/test/run-pass/mir_codegen_calls_variadic.rs +++ b/src/test/run-pass/mir_codegen_calls_variadic.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare no libc to test ffi with #[link(name = "rust_test_helpers", kind = "static")] diff --git a/src/test/run-pass/mir_codegen_critical_edge.rs b/src/test/run-pass/mir_codegen_critical_edge.rs index c742e71633fc5..e1c6da45e58c1 100644 --- a/src/test/run-pass/mir_codegen_critical_edge.rs +++ b/src/test/run-pass/mir_codegen_critical_edge.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This code produces a CFG with critical edges that, if we don't // handle properly, will cause invalid codegen. diff --git a/src/test/run-pass/mir_codegen_spike1.rs b/src/test/run-pass/mir_codegen_spike1.rs index 27e1583af34ac..41835c9e16dc5 100644 --- a/src/test/run-pass/mir_codegen_spike1.rs +++ b/src/test/run-pass/mir_codegen_spike1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // A simple spike test for MIR version of codegen. fn sum(x: i32, y: i32) -> i32 { diff --git a/src/test/run-pass/mir_codegen_switch.rs b/src/test/run-pass/mir_codegen_switch.rs index b097bf46ad370..5fc79e11d37aa 100644 --- a/src/test/run-pass/mir_codegen_switch.rs +++ b/src/test/run-pass/mir_codegen_switch.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Abc { A(u8), B(i8), diff --git a/src/test/run-pass/mir_codegen_switchint.rs b/src/test/run-pass/mir_codegen_switchint.rs index 537734596a521..63c0727aa546a 100644 --- a/src/test/run-pass/mir_codegen_switchint.rs +++ b/src/test/run-pass/mir_codegen_switchint.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn foo(x: i8) -> i32 { match x { 1 => 0, diff --git a/src/test/run-pass/mir_coercion_casts.rs b/src/test/run-pass/mir_coercion_casts.rs index 2be2854fac959..d42598d06a7b0 100644 --- a/src/test/run-pass/mir_coercion_casts.rs +++ b/src/test/run-pass/mir_coercion_casts.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests the coercion casts are handled properly fn main() { diff --git a/src/test/run-pass/mir_coercions.rs b/src/test/run-pass/mir_coercions.rs index 79d1cfde7cd58..5125dea82eea5 100644 --- a/src/test/run-pass/mir_coercions.rs +++ b/src/test/run-pass/mir_coercions.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(coerce_unsized, unsize)] use std::ops::CoerceUnsized; diff --git a/src/test/run-pass/mir_constval_adts.rs b/src/test/run-pass/mir_constval_adts.rs index 696ff8a7e600f..22b13dac7b297 100644 --- a/src/test/run-pass/mir_constval_adts.rs +++ b/src/test/run-pass/mir_constval_adts.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(PartialEq, Debug)] struct Point { _x: i32, diff --git a/src/test/run-pass/mir_drop_order.rs b/src/test/run-pass/mir_drop_order.rs index 7ab133bbab4e1..67db2f8824adb 100644 --- a/src/test/run-pass/mir_drop_order.rs +++ b/src/test/run-pass/mir_drop_order.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare compiled with panic=abort by default use std::cell::RefCell; diff --git a/src/test/run-pass/mir_early_return_scope.rs b/src/test/run-pass/mir_early_return_scope.rs index c27e57358b09b..bc20089c9390b 100644 --- a/src/test/run-pass/mir_early_return_scope.rs +++ b/src/test/run-pass/mir_early_return_scope.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - static mut DROP: bool = false; struct ConnWrap(Conn); diff --git a/src/test/run-pass/mir_fat_ptr.rs b/src/test/run-pass/mir_fat_ptr.rs index e5c9e3577d1c3..55418c4802a7c 100644 --- a/src/test/run-pass/mir_fat_ptr.rs +++ b/src/test/run-pass/mir_fat_ptr.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // test that ordinary fat pointer operations work. struct Wrapper(u32, T); diff --git a/src/test/run-pass/mir_fat_ptr_drop.rs b/src/test/run-pass/mir_fat_ptr_drop.rs index 64e68c78c3ca6..ca29387601586 100644 --- a/src/test/run-pass/mir_fat_ptr_drop.rs +++ b/src/test/run-pass/mir_fat_ptr_drop.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // test that ordinary fat pointer operations work. #![feature(braced_empty_structs)] diff --git a/src/test/run-pass/mir_heavy_promoted.rs b/src/test/run-pass/mir_heavy_promoted.rs index b50852175776c..83c6a05c357bb 100644 --- a/src/test/run-pass/mir_heavy_promoted.rs +++ b/src/test/run-pass/mir_heavy_promoted.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten apparently only works in optimized mode const TEST_DATA: [u8; 32 * 1024 * 1024] = [42; 32 * 1024 * 1024]; diff --git a/src/test/run-pass/mir_match_arm_guard.rs b/src/test/run-pass/mir_match_arm_guard.rs index 487999e6ed62b..5a371e10233aa 100644 --- a/src/test/run-pass/mir_match_arm_guard.rs +++ b/src/test/run-pass/mir_match_arm_guard.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // #30527 - We were not generating arms with guards in certain cases. fn match_with_guard(x: Option) -> i8 { diff --git a/src/test/run-pass/mir_misc_casts.rs b/src/test/run-pass/mir_misc_casts.rs index 81c8b75fb9b6a..dec256c1ad2da 100644 --- a/src/test/run-pass/mir_misc_casts.rs +++ b/src/test/run-pass/mir_misc_casts.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn func(){} const STR: &'static str = "hello"; diff --git a/src/test/run-pass/mir_overflow_off.rs b/src/test/run-pass/mir_overflow_off.rs index a2cfca01dacb3..4b8cc3b90deb5 100644 --- a/src/test/run-pass/mir_overflow_off.rs +++ b/src/test/run-pass/mir_overflow_off.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z force-overflow-checks=off // Test that with MIR codegen, overflow checks can be diff --git a/src/test/run-pass/mir_raw_fat_ptr.rs b/src/test/run-pass/mir_raw_fat_ptr.rs index 846318ec4fd34..6216553bbb343 100644 --- a/src/test/run-pass/mir_raw_fat_ptr.rs +++ b/src/test/run-pass/mir_raw_fat_ptr.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // check raw fat pointer ops in mir // FIXME: please improve this when we get monomorphization support diff --git a/src/test/run-pass/mir_refs_correct.rs b/src/test/run-pass/mir_refs_correct.rs index df90fe2b7918d..625cfd0862a2b 100644 --- a/src/test/run-pass/mir_refs_correct.rs +++ b/src/test/run-pass/mir_refs_correct.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:mir_external_refs.rs extern crate mir_external_refs as ext; diff --git a/src/test/run-pass/mir_small_agg_arg.rs b/src/test/run-pass/mir_small_agg_arg.rs index 639a585ae0013..d401f5d92086e 100644 --- a/src/test/run-pass/mir_small_agg_arg.rs +++ b/src/test/run-pass/mir_small_agg_arg.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo((x, y): (i8, i8)) { } diff --git a/src/test/run-pass/mir_struct_with_assoc_ty.rs b/src/test/run-pass/mir_struct_with_assoc_ty.rs index 7b2514c27c8cb..eb65b50d7b977 100644 --- a/src/test/run-pass/mir_struct_with_assoc_ty.rs +++ b/src/test/run-pass/mir_struct_with_assoc_ty.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::marker::PhantomData; pub trait DataBind { diff --git a/src/test/run-pass/mir_temp_promotions.rs b/src/test/run-pass/mir_temp_promotions.rs index 4865e955091f8..a877dd33b8e67 100644 --- a/src/test/run-pass/mir_temp_promotions.rs +++ b/src/test/run-pass/mir_temp_promotions.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn test1(f: f32) -> bool { // test that we properly promote temporaries to allocas when a temporary is assigned to // multiple times (assignment is still happening once ∀ possible dataflows). diff --git a/src/test/run-pass/mir_void_return.rs b/src/test/run-pass/mir_void_return.rs index 78cb9fb39d6a6..da191f7440f96 100644 --- a/src/test/run-pass/mir_void_return.rs +++ b/src/test/run-pass/mir_void_return.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn mir() -> (){ let x = 1; let mut y = 0; diff --git a/src/test/run-pass/mir_void_return_2.rs b/src/test/run-pass/mir_void_return_2.rs index fc9e3d5e3b535..fc2a01bfb9df3 100644 --- a/src/test/run-pass/mir_void_return_2.rs +++ b/src/test/run-pass/mir_void_return_2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn nil() {} fn mir(){ diff --git a/src/test/run-pass/mod-inside-fn.rs b/src/test/run-pass/mod-inside-fn.rs index 6b922634aade1..08404c0865820 100644 --- a/src/test/run-pass/mod-inside-fn.rs +++ b/src/test/run-pass/mod-inside-fn.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn f() -> isize { mod m { pub fn g() -> isize { 720 } diff --git a/src/test/run-pass/mod-view-items.rs b/src/test/run-pass/mod-view-items.rs index ba23197b83c7f..26cd48dc43104 100644 --- a/src/test/run-pass/mod-view-items.rs +++ b/src/test/run-pass/mod-view-items.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test view items inside non-file-level mods // This is a regression test for an issue where we were failing to diff --git a/src/test/run-pass/mod_dir_implicit.rs b/src/test/run-pass/mod_dir_implicit.rs index f8034f9e07386..cf033ddadaf87 100644 --- a/src/test/run-pass/mod_dir_implicit.rs +++ b/src/test/run-pass/mod_dir_implicit.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty issue #37195 mod mod_dir_implicit_aux; diff --git a/src/test/run-pass/mod_dir_implicit_aux/mod.rs b/src/test/run-pass/mod_dir_implicit_aux/mod.rs index 58c1beee3be70..a5e27a3a43c37 100644 --- a/src/test/run-pass/mod_dir_implicit_aux/mod.rs +++ b/src/test/run-pass/mod_dir_implicit_aux/mod.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn foo() -> isize { 10 } diff --git a/src/test/run-pass/mod_dir_path.rs b/src/test/run-pass/mod_dir_path.rs index fc91ea870d51a..52e848a86c579 100644 --- a/src/test/run-pass/mod_dir_path.rs +++ b/src/test/run-pass/mod_dir_path.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty issue #37195 mod mod_dir_simple { diff --git a/src/test/run-pass/mod_dir_path2.rs b/src/test/run-pass/mod_dir_path2.rs index b96c1ae072243..dc0a814ac94d7 100644 --- a/src/test/run-pass/mod_dir_path2.rs +++ b/src/test/run-pass/mod_dir_path2.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty issue #37195 #[path = "mod_dir_simple"] diff --git a/src/test/run-pass/mod_dir_path3.rs b/src/test/run-pass/mod_dir_path3.rs index 3160064d7c244..e0ea82edacb09 100644 --- a/src/test/run-pass/mod_dir_path3.rs +++ b/src/test/run-pass/mod_dir_path3.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty issue #37195 #[path = "mod_dir_simple"] diff --git a/src/test/run-pass/mod_dir_path_multi.rs b/src/test/run-pass/mod_dir_path_multi.rs index 12b28cf98af0b..0d09e0c4a856c 100644 --- a/src/test/run-pass/mod_dir_path_multi.rs +++ b/src/test/run-pass/mod_dir_path_multi.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty issue #37195 #[path = "mod_dir_simple"] diff --git a/src/test/run-pass/mod_dir_recursive.rs b/src/test/run-pass/mod_dir_recursive.rs index 8964d9ccd2527..2b785da9916d3 100644 --- a/src/test/run-pass/mod_dir_recursive.rs +++ b/src/test/run-pass/mod_dir_recursive.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty issue #37195 // Testing that the parser for each file tracks its modules diff --git a/src/test/run-pass/mod_dir_simple.rs b/src/test/run-pass/mod_dir_simple.rs index 429b4ebe63970..dec815c281700 100644 --- a/src/test/run-pass/mod_dir_simple.rs +++ b/src/test/run-pass/mod_dir_simple.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty issue #37195 mod mod_dir_simple { diff --git a/src/test/run-pass/mod_dir_simple/load_another_mod.rs b/src/test/run-pass/mod_dir_simple/load_another_mod.rs index ca45864a5a154..36ef8ee130696 100644 --- a/src/test/run-pass/mod_dir_simple/load_another_mod.rs +++ b/src/test/run-pass/mod_dir_simple/load_another_mod.rs @@ -1,12 +1,2 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[path = "test.rs"] pub mod test; diff --git a/src/test/run-pass/mod_dir_simple/test.rs b/src/test/run-pass/mod_dir_simple/test.rs index 58c1beee3be70..a5e27a3a43c37 100644 --- a/src/test/run-pass/mod_dir_simple/test.rs +++ b/src/test/run-pass/mod_dir_simple/test.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn foo() -> isize { 10 } diff --git a/src/test/run-pass/mod_file.rs b/src/test/run-pass/mod_file.rs index c18fecd7c569e..be1613648926d 100644 --- a/src/test/run-pass/mod_file.rs +++ b/src/test/run-pass/mod_file.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty issue #37195 // Testing that a plain .rs file can load modules from other source files diff --git a/src/test/run-pass/mod_file_aux.rs b/src/test/run-pass/mod_file_aux.rs index b7470811f6034..98f42c5cdb129 100644 --- a/src/test/run-pass/mod_file_aux.rs +++ b/src/test/run-pass/mod_file_aux.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-test Not a test. Used by other tests pub fn foo() -> isize { 10 } diff --git a/src/test/run-pass/mod_file_with_path_attr.rs b/src/test/run-pass/mod_file_with_path_attr.rs index d9f28ceb0ecac..c8ba4a0366e55 100644 --- a/src/test/run-pass/mod_file_with_path_attr.rs +++ b/src/test/run-pass/mod_file_with_path_attr.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty issue #37195 // Testing that a plain .rs file can load modules from other source files diff --git a/src/test/run-pass/module-polymorphism3-files/float-template/inst_f32.rs b/src/test/run-pass/module-polymorphism3-files/float-template/inst_f32.rs index 2242daa2d802f..ae9811ac02490 100644 --- a/src/test/run-pass/module-polymorphism3-files/float-template/inst_f32.rs +++ b/src/test/run-pass/module-polymorphism3-files/float-template/inst_f32.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub type T = f32; diff --git a/src/test/run-pass/module-polymorphism3-files/float-template/inst_f64.rs b/src/test/run-pass/module-polymorphism3-files/float-template/inst_f64.rs index 543d672b0ab37..df276449c4fc5 100644 --- a/src/test/run-pass/module-polymorphism3-files/float-template/inst_f64.rs +++ b/src/test/run-pass/module-polymorphism3-files/float-template/inst_f64.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub type T = f64; diff --git a/src/test/run-pass/module-polymorphism3-files/float-template/inst_float.rs b/src/test/run-pass/module-polymorphism3-files/float-template/inst_float.rs index 7151796c8ece1..7a0d84f3a5171 100644 --- a/src/test/run-pass/module-polymorphism3-files/float-template/inst_float.rs +++ b/src/test/run-pass/module-polymorphism3-files/float-template/inst_float.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub type T = float; diff --git a/src/test/run-pass/module-qualified-struct-destructure.rs b/src/test/run-pass/module-qualified-struct-destructure.rs index d6844f0f4abde..99fa6997d5a66 100644 --- a/src/test/run-pass/module-qualified-struct-destructure.rs +++ b/src/test/run-pass/module-qualified-struct-destructure.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 mod m { diff --git a/src/test/run-pass/monad.rs b/src/test/run-pass/monad.rs index 211827f92222c..5cb11dec1d276 100644 --- a/src/test/run-pass/monad.rs +++ b/src/test/run-pass/monad.rs @@ -1,16 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - trait vec_monad { fn bind(&self, f: F ) -> Vec where F: FnMut(&A) -> Vec ; } diff --git a/src/test/run-pass/monomorphize-abi-alignment.rs b/src/test/run-pass/monomorphize-abi-alignment.rs index 00e97ebc24e7b..bec61b09d5d98 100644 --- a/src/test/run-pass/monomorphize-abi-alignment.rs +++ b/src/test/run-pass/monomorphize-abi-alignment.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /*! * On x86_64-linux-gnu and possibly other platforms, structs get 8-byte "preferred" alignment, * but their "ABI" alignment (i.e., what actually matters for data layout) is the largest alignment diff --git a/src/test/run-pass/monomorphized-callees-with-ty-params-3314.rs b/src/test/run-pass/monomorphized-callees-with-ty-params-3314.rs index b7de1b5f4cbb5..ec7ff2d8a5174 100644 --- a/src/test/run-pass/monomorphized-callees-with-ty-params-3314.rs +++ b/src/test/run-pass/monomorphized-callees-with-ty-params-3314.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait Serializer { diff --git a/src/test/run-pass/move-1-unique.rs b/src/test/run-pass/move-1-unique.rs index 5c8dd41c64663..ddcf19aa215ef 100644 --- a/src/test/run-pass/move-1-unique.rs +++ b/src/test/run-pass/move-1-unique.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] #[derive(Clone)] diff --git a/src/test/run-pass/move-2-unique.rs b/src/test/run-pass/move-2-unique.rs index 0b67e54e23458..cfc9375549dff 100644 --- a/src/test/run-pass/move-2-unique.rs +++ b/src/test/run-pass/move-2-unique.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] struct X { x: isize, y: isize, z: isize } diff --git a/src/test/run-pass/move-2.rs b/src/test/run-pass/move-2.rs index 0fbc2de91e6cd..b3ad955b2e59c 100644 --- a/src/test/run-pass/move-2.rs +++ b/src/test/run-pass/move-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] struct X { x: isize, y: isize, z: isize } diff --git a/src/test/run-pass/move-3-unique.rs b/src/test/run-pass/move-3-unique.rs index 36ad3a40b3f56..c4632ca67256f 100644 --- a/src/test/run-pass/move-3-unique.rs +++ b/src/test/run-pass/move-3-unique.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] #[derive(Clone)] diff --git a/src/test/run-pass/move-4-unique.rs b/src/test/run-pass/move-4-unique.rs index 266e34c98a40d..f47d1ce1fb984 100644 --- a/src/test/run-pass/move-4-unique.rs +++ b/src/test/run-pass/move-4-unique.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] struct Triple {a: isize, b: isize, c: isize} diff --git a/src/test/run-pass/move-4.rs b/src/test/run-pass/move-4.rs index 481068869e34d..a15c0a34281aa 100644 --- a/src/test/run-pass/move-4.rs +++ b/src/test/run-pass/move-4.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] struct Triple { a: isize, b: isize, c: isize } diff --git a/src/test/run-pass/move-arg-2-unique.rs b/src/test/run-pass/move-arg-2-unique.rs index b6e225cc8b73e..138312e291fab 100644 --- a/src/test/run-pass/move-arg-2-unique.rs +++ b/src/test/run-pass/move-arg-2-unique.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn test(foo: Box> ) { assert_eq!((*foo)[0], 10); } diff --git a/src/test/run-pass/move-arg-2.rs b/src/test/run-pass/move-arg-2.rs index 78774854c9f16..cd069387e1d16 100644 --- a/src/test/run-pass/move-arg-2.rs +++ b/src/test/run-pass/move-arg-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn test(foo: Box>) { assert_eq!((*foo)[0], 10); } diff --git a/src/test/run-pass/move-arg.rs b/src/test/run-pass/move-arg.rs index 1883c66987e00..c4d2cd563daa3 100644 --- a/src/test/run-pass/move-arg.rs +++ b/src/test/run-pass/move-arg.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn test(foo: isize) { assert_eq!(foo, 10); } pub fn main() { let x = 10; test(x); } diff --git a/src/test/run-pass/move-nullary-fn.rs b/src/test/run-pass/move-nullary-fn.rs index cec1e43997206..96c6eb7c89a0f 100644 --- a/src/test/run-pass/move-nullary-fn.rs +++ b/src/test/run-pass/move-nullary-fn.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #922 // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/move-out-of-field.rs b/src/test/run-pass/move-out-of-field.rs index 262add090bde7..3a1d5bc69e303 100644 --- a/src/test/run-pass/move-out-of-field.rs +++ b/src/test/run-pass/move-out-of-field.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::string::String; struct StringBuffer { diff --git a/src/test/run-pass/move-scalar.rs b/src/test/run-pass/move-scalar.rs index 798424d107e27..393a67265687b 100644 --- a/src/test/run-pass/move-scalar.rs +++ b/src/test/run-pass/move-scalar.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { let y: isize = 42; diff --git a/src/test/run-pass/move-self.rs b/src/test/run-pass/move-self.rs index c69cd17864a54..1eafe589cd702 100644 --- a/src/test/run-pass/move-self.rs +++ b/src/test/run-pass/move-self.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S { x: String } diff --git a/src/test/run-pass/moves-based-on-type-capture-clause.rs b/src/test/run-pass/moves-based-on-type-capture-clause.rs index 548a62f4603de..fe9f7bc9c71c2 100644 --- a/src/test/run-pass/moves-based-on-type-capture-clause.rs +++ b/src/test/run-pass/moves-based-on-type-capture-clause.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/moves-based-on-type-cross-crate.rs b/src/test/run-pass/moves-based-on-type-cross-crate.rs index a313ec998f0a1..e6a217d8e9d29 100644 --- a/src/test/run-pass/moves-based-on-type-cross-crate.rs +++ b/src/test/run-pass/moves-based-on-type-cross-crate.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:moves_based_on_type_lib.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/msvc-data-only.rs b/src/test/run-pass/msvc-data-only.rs index ad6888c4d3096..ae4103e96c30f 100644 --- a/src/test/run-pass/msvc-data-only.rs +++ b/src/test/run-pass/msvc-data-only.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:msvc-data-only-lib.rs extern crate msvc_data_only_lib; diff --git a/src/test/run-pass/multi-let.rs b/src/test/run-pass/multi-let.rs index 3b060bb18868b..7b2dc92c55a3b 100644 --- a/src/test/run-pass/multi-let.rs +++ b/src/test/run-pass/multi-let.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { let x = 10; let y = x; diff --git a/src/test/run-pass/multi-panic.rs b/src/test/run-pass/multi-panic.rs index 2e6e10935fa7a..9a8c9a7a478c3 100644 --- a/src/test/run-pass/multi-panic.rs +++ b/src/test/run-pass/multi-panic.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/multibyte.rs b/src/test/run-pass/multibyte.rs index 0475dd10fdef9..889f0cb75c7e9 100644 --- a/src/test/run-pass/multibyte.rs +++ b/src/test/run-pass/multibyte.rs @@ -1,12 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // Test that multibyte characters don't crash the compiler diff --git a/src/test/run-pass/multidispatch-conditional-impl-not-considered.rs b/src/test/run-pass/multidispatch-conditional-impl-not-considered.rs index 49ecef9c7359a..72aa9edd0f36a 100644 --- a/src/test/run-pass/multidispatch-conditional-impl-not-considered.rs +++ b/src/test/run-pass/multidispatch-conditional-impl-not-considered.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we correctly ignore the blanket impl // because (in this case) `T` does not impl `Clone`. // diff --git a/src/test/run-pass/multidispatch1.rs b/src/test/run-pass/multidispatch1.rs index 7137a4109b151..ac22aeac12eea 100644 --- a/src/test/run-pass/multidispatch1.rs +++ b/src/test/run-pass/multidispatch1.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::fmt::Debug; trait MyTrait { diff --git a/src/test/run-pass/multidispatch2.rs b/src/test/run-pass/multidispatch2.rs index 1573c0234a6e4..517f815748981 100644 --- a/src/test/run-pass/multidispatch2.rs +++ b/src/test/run-pass/multidispatch2.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::fmt::Debug; use std::default::Default; diff --git a/src/test/run-pass/multiline-comment.rs b/src/test/run-pass/multiline-comment.rs index 8c74326d1c34a..76f9284eb3eb1 100644 --- a/src/test/run-pass/multiline-comment.rs +++ b/src/test/run-pass/multiline-comment.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // pretty-expanded FIXME #23616 /* diff --git a/src/test/run-pass/multiple-reprs.rs b/src/test/run-pass/multiple-reprs.rs index d8eafb806f747..e9b694995ba06 100644 --- a/src/test/run-pass/multiple-reprs.rs +++ b/src/test/run-pass/multiple-reprs.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::mem::{size_of, align_of}; use std::os::raw::c_int; diff --git a/src/test/run-pass/multiple-trait-bounds.rs b/src/test/run-pass/multiple-trait-bounds.rs index 2746205b637dc..09e872d995038 100644 --- a/src/test/run-pass/multiple-trait-bounds.rs +++ b/src/test/run-pass/multiple-trait-bounds.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn f(_: T) { diff --git a/src/test/run-pass/mut-function-arguments.rs b/src/test/run-pass/mut-function-arguments.rs index bf4d4ea921aa5..924d754b3259e 100644 --- a/src/test/run-pass/mut-function-arguments.rs +++ b/src/test/run-pass/mut-function-arguments.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn f(mut y: Box) { diff --git a/src/test/run-pass/mut-in-ident-patterns.rs b/src/test/run-pass/mut-in-ident-patterns.rs index 32ff7efffa0dc..cb27e192d424f 100644 --- a/src/test/run-pass/mut-in-ident-patterns.rs +++ b/src/test/run-pass/mut-in-ident-patterns.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Foo { fn foo(&self, mut x: isize) -> isize { let val = x; diff --git a/src/test/run-pass/mut-vstore-expr.rs b/src/test/run-pass/mut-vstore-expr.rs index 503f3ce5f9b2f..d598e3b88db91 100644 --- a/src/test/run-pass/mut-vstore-expr.rs +++ b/src/test/run-pass/mut-vstore-expr.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub fn main() { diff --git a/src/test/run-pass/mutability-inherits-through-fixed-length-vec.rs b/src/test/run-pass/mutability-inherits-through-fixed-length-vec.rs index 8b5b290aa6fb4..aea7ffcc4eea0 100644 --- a/src/test/run-pass/mutability-inherits-through-fixed-length-vec.rs +++ b/src/test/run-pass/mutability-inherits-through-fixed-length-vec.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn test1() { let mut ints = [0; 32]; ints[0] += 1; diff --git a/src/test/run-pass/mutable-alias-vec.rs b/src/test/run-pass/mutable-alias-vec.rs index 3f90cedca9b5a..3a15e59ad3c94 100644 --- a/src/test/run-pass/mutable-alias-vec.rs +++ b/src/test/run-pass/mutable-alias-vec.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn grow(v: &mut Vec ) { v.push(1); } diff --git a/src/test/run-pass/mutual-recursion-group.rs b/src/test/run-pass/mutual-recursion-group.rs index 72a8847094b2c..d52eb7eefd9fd 100644 --- a/src/test/run-pass/mutual-recursion-group.rs +++ b/src/test/run-pass/mutual-recursion-group.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // pretty-expanded FIXME #23616 enum colour { red, green, blue, } diff --git a/src/test/run-pass/namespaced-enum-emulate-flat-xc.rs b/src/test/run-pass/namespaced-enum-emulate-flat-xc.rs index f275e9b7425bd..de0e841beb650 100644 --- a/src/test/run-pass/namespaced-enum-emulate-flat-xc.rs +++ b/src/test/run-pass/namespaced-enum-emulate-flat-xc.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:namespaced_enum_emulate_flat.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/namespaced-enum-emulate-flat.rs b/src/test/run-pass/namespaced-enum-emulate-flat.rs index 0f85c20d3151b..67921707f4442 100644 --- a/src/test/run-pass/namespaced-enum-emulate-flat.rs +++ b/src/test/run-pass/namespaced-enum-emulate-flat.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub use Foo::*; diff --git a/src/test/run-pass/namespaced-enum-glob-import-xcrate.rs b/src/test/run-pass/namespaced-enum-glob-import-xcrate.rs index 7bfe90bad7f4f..e680f0f60a685 100644 --- a/src/test/run-pass/namespaced-enum-glob-import-xcrate.rs +++ b/src/test/run-pass/namespaced-enum-glob-import-xcrate.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:namespaced_enums.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/namespaced-enum-glob-import.rs b/src/test/run-pass/namespaced-enum-glob-import.rs index f506ea11f848b..f82544c4bbcf6 100644 --- a/src/test/run-pass/namespaced-enum-glob-import.rs +++ b/src/test/run-pass/namespaced-enum-glob-import.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 mod m2 { diff --git a/src/test/run-pass/namespaced-enums-xcrate.rs b/src/test/run-pass/namespaced-enums-xcrate.rs index 0046d80e086d1..e5e71b5816acf 100644 --- a/src/test/run-pass/namespaced-enums-xcrate.rs +++ b/src/test/run-pass/namespaced-enums-xcrate.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:namespaced_enums.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/namespaced-enums.rs b/src/test/run-pass/namespaced-enums.rs index 3e72f73bc4894..7f1c25cdbd2fd 100644 --- a/src/test/run-pass/namespaced-enums.rs +++ b/src/test/run-pass/namespaced-enums.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 enum Foo { diff --git a/src/test/run-pass/native-print-no-runtime.rs b/src/test/run-pass/native-print-no-runtime.rs index deb0b5030614e..e4d7eb82c6709 100644 --- a/src/test/run-pass/native-print-no-runtime.rs +++ b/src/test/run-pass/native-print-no-runtime.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(start)] #[start] diff --git a/src/test/run-pass/negative.rs b/src/test/run-pass/negative.rs index df074ddc06ac5..cc75d2ee86a70 100644 --- a/src/test/run-pass/negative.rs +++ b/src/test/run-pass/negative.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { match -5 { -5 => {} diff --git a/src/test/run-pass/nested-block-comment.rs b/src/test/run-pass/nested-block-comment.rs index 650e28548c17a..62d038024a276 100644 --- a/src/test/run-pass/nested-block-comment.rs +++ b/src/test/run-pass/nested-block-comment.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 /* This test checks that nested comments are supported diff --git a/src/test/run-pass/nested-class.rs b/src/test/run-pass/nested-class.rs index 1ad68cb9de052..f1f32240ce562 100644 --- a/src/test/run-pass/nested-class.rs +++ b/src/test/run-pass/nested-class.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { struct b { i: isize, diff --git a/src/test/run-pass/nested-enum-same-names.rs b/src/test/run-pass/nested-enum-same-names.rs index c0baab66c597a..5f884756cf240 100644 --- a/src/test/run-pass/nested-enum-same-names.rs +++ b/src/test/run-pass/nested-enum-same-names.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 /* diff --git a/src/test/run-pass/nested-exhaustive-match.rs b/src/test/run-pass/nested-exhaustive-match.rs index e0a3b1adfe49f..5acd27ecbf994 100644 --- a/src/test/run-pass/nested-exhaustive-match.rs +++ b/src/test/run-pass/nested-exhaustive-match.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct Foo { foo: bool, bar: Option, baz: isize } diff --git a/src/test/run-pass/nested-function-names-issue-8587.rs b/src/test/run-pass/nested-function-names-issue-8587.rs index 24b1f5ac75eae..7a6164383dfa8 100644 --- a/src/test/run-pass/nested-function-names-issue-8587.rs +++ b/src/test/run-pass/nested-function-names-issue-8587.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Make sure nested functions are separate, even if they have // equal name. // diff --git a/src/test/run-pass/nested-matchs.rs b/src/test/run-pass/nested-matchs.rs index 46d30b68f7898..8b8f818ae1044 100644 --- a/src/test/run-pass/nested-matchs.rs +++ b/src/test/run-pass/nested-matchs.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn baz() -> ! { panic!(); } fn foo() { diff --git a/src/test/run-pass/nested-pattern.rs b/src/test/run-pass/nested-pattern.rs index f9abdd56fa444..1c9fcb501f53c 100644 --- a/src/test/run-pass/nested-pattern.rs +++ b/src/test/run-pass/nested-pattern.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - // a bug was causing this to complain about leaked memory on exit enum t { foo(isize, usize), bar(isize, Option), } diff --git a/src/test/run-pass/nested-vec-1.rs b/src/test/run-pass/nested-vec-1.rs index 2b92ed38eab80..22cf39178f7a1 100644 --- a/src/test/run-pass/nested-vec-1.rs +++ b/src/test/run-pass/nested-vec-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that using the `vec!` macro nested within itself works fn main() { diff --git a/src/test/run-pass/nested-vec-2.rs b/src/test/run-pass/nested-vec-2.rs index 669f9e4f4bb7e..980b5be2268c9 100644 --- a/src/test/run-pass/nested-vec-2.rs +++ b/src/test/run-pass/nested-vec-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that using the `vec!` macro nested within itself works // when the contents implement Drop diff --git a/src/test/run-pass/nested-vec-3.rs b/src/test/run-pass/nested-vec-3.rs index d1a63b4439276..debbb63eb1053 100644 --- a/src/test/run-pass/nested-vec-3.rs +++ b/src/test/run-pass/nested-vec-3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support // Test that using the `vec!` macro nested within itself works when diff --git a/src/test/run-pass/nested_item_main.rs b/src/test/run-pass/nested_item_main.rs index b24d517f7375c..225619ad47a23 100644 --- a/src/test/run-pass/nested_item_main.rs +++ b/src/test/run-pass/nested_item_main.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:nested_item.rs diff --git a/src/test/run-pass/never-result.rs b/src/test/run-pass/never-result.rs index 5c0af392f44df..ddfb992cb1467 100644 --- a/src/test/run-pass/never-result.rs +++ b/src/test/run-pass/never-result.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we can extract a ! through pattern matching then use it as several different types. #![feature(never_type)] diff --git a/src/test/run-pass/never-type-rvalues.rs b/src/test/run-pass/never-type-rvalues.rs index bda288f40869b..2de8567924e39 100644 --- a/src/test/run-pass/never-type-rvalues.rs +++ b/src/test/run-pass/never-type-rvalues.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(never_type)] #![allow(dead_code)] #![allow(path_statements)] diff --git a/src/test/run-pass/never_coercions.rs b/src/test/run-pass/never_coercions.rs index dfba5d2c3da0a..70f67fd3da1b2 100644 --- a/src/test/run-pass/never_coercions.rs +++ b/src/test/run-pass/never_coercions.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that having something of type ! doesn't screw up type-checking and that it coerces to the // LUB type of the other match arms. diff --git a/src/test/run-pass/new-box-syntax.rs b/src/test/run-pass/new-box-syntax.rs index 6598b70b3d5cd..a39803c2eb84b 100644 --- a/src/test/run-pass/new-box-syntax.rs +++ b/src/test/run-pass/new-box-syntax.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 /* Any copyright is dedicated to the Public Domain. diff --git a/src/test/run-pass/new-box.rs b/src/test/run-pass/new-box.rs index d6881ea90afb6..b35c5445a4405 100644 --- a/src/test/run-pass/new-box.rs +++ b/src/test/run-pass/new-box.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn f(x: Box) { diff --git a/src/test/run-pass/new-impl-syntax.rs b/src/test/run-pass/new-impl-syntax.rs index 554fab53e4b58..d02136d9309fd 100644 --- a/src/test/run-pass/new-impl-syntax.rs +++ b/src/test/run-pass/new-impl-syntax.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt; struct Thingy { diff --git a/src/test/run-pass/new-import-syntax.rs b/src/test/run-pass/new-import-syntax.rs index 36e5b020b55ab..67cf5ab2e1f6b 100644 --- a/src/test/run-pass/new-import-syntax.rs +++ b/src/test/run-pass/new-import-syntax.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { println!("Hello world!"); } diff --git a/src/test/run-pass/new-style-constants.rs b/src/test/run-pass/new-style-constants.rs index 36d66d1e12b6b..1ded0cd1c8ba7 100644 --- a/src/test/run-pass/new-style-constants.rs +++ b/src/test/run-pass/new-style-constants.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - static FOO: isize = 3; pub fn main() { diff --git a/src/test/run-pass/new-style-fixed-length-vec.rs b/src/test/run-pass/new-style-fixed-length-vec.rs index 4d9f0394eb440..e8a7177e25bd1 100644 --- a/src/test/run-pass/new-style-fixed-length-vec.rs +++ b/src/test/run-pass/new-style-fixed-length-vec.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - static FOO: [isize; 3] = [1, 2, 3]; pub fn main() { diff --git a/src/test/run-pass/new-unicode-escapes.rs b/src/test/run-pass/new-unicode-escapes.rs index 2c0417576052e..1bce71a9ed9a0 100644 --- a/src/test/run-pass/new-unicode-escapes.rs +++ b/src/test/run-pass/new-unicode-escapes.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { let s = "\u{2603}"; assert_eq!(s, "☃"); diff --git a/src/test/run-pass/new-unsafe-pointers.rs b/src/test/run-pass/new-unsafe-pointers.rs index a0d631046a635..a80ef1410876c 100644 --- a/src/test/run-pass/new-unsafe-pointers.rs +++ b/src/test/run-pass/new-unsafe-pointers.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn main() { diff --git a/src/test/run-pass/newlambdas-ret-infer.rs b/src/test/run-pass/newlambdas-ret-infer.rs index 428eed0787a83..7306055930bbc 100644 --- a/src/test/run-pass/newlambdas-ret-infer.rs +++ b/src/test/run-pass/newlambdas-ret-infer.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the lambda kind is inferred correctly as a return // expression diff --git a/src/test/run-pass/newlambdas-ret-infer2.rs b/src/test/run-pass/newlambdas-ret-infer2.rs index 439ea3f2b579c..d55c655d3e211 100644 --- a/src/test/run-pass/newlambdas-ret-infer2.rs +++ b/src/test/run-pass/newlambdas-ret-infer2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the lambda kind is inferred correctly as a return // expression diff --git a/src/test/run-pass/newlambdas.rs b/src/test/run-pass/newlambdas.rs index a6f39958632c2..93199f8ccd50d 100644 --- a/src/test/run-pass/newlambdas.rs +++ b/src/test/run-pass/newlambdas.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests for the new |args| expr lambda syntax diff --git a/src/test/run-pass/newtype-polymorphic.rs b/src/test/run-pass/newtype-polymorphic.rs index e7da8d7bf93c7..25a0154bdd183 100644 --- a/src/test/run-pass/newtype-polymorphic.rs +++ b/src/test/run-pass/newtype-polymorphic.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - #[derive(Clone)] struct myvec(Vec ); diff --git a/src/test/run-pass/newtype-struct-drop-run.rs b/src/test/run-pass/newtype-struct-drop-run.rs index 6a5d86b522ed4..bd1384e22e303 100644 --- a/src/test/run-pass/newtype-struct-drop-run.rs +++ b/src/test/run-pass/newtype-struct-drop-run.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Make sure the destructor is run for newtype structs. use std::cell::Cell; diff --git a/src/test/run-pass/newtype-struct-with-dtor.rs b/src/test/run-pass/newtype-struct-with-dtor.rs index 07c76e27284f5..f90aece010f0e 100644 --- a/src/test/run-pass/newtype-struct-with-dtor.rs +++ b/src/test/run-pass/newtype-struct-with-dtor.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub struct Fd(u32); diff --git a/src/test/run-pass/newtype-struct-xc-2.rs b/src/test/run-pass/newtype-struct-xc-2.rs index ac03f65750df5..14931dececf04 100644 --- a/src/test/run-pass/newtype-struct-xc-2.rs +++ b/src/test/run-pass/newtype-struct-xc-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:newtype_struct_xc.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/newtype-struct-xc.rs b/src/test/run-pass/newtype-struct-xc.rs index 0cac4530faf32..8fd1901e3ca6e 100644 --- a/src/test/run-pass/newtype-struct-xc.rs +++ b/src/test/run-pass/newtype-struct-xc.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:newtype_struct_xc.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/newtype-temporary.rs b/src/test/run-pass/newtype-temporary.rs index 19790a488b58e..f8d6cde2aa8cc 100644 --- a/src/test/run-pass/newtype-temporary.rs +++ b/src/test/run-pass/newtype-temporary.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(PartialEq, Debug)] struct Foo(usize); diff --git a/src/test/run-pass/newtype.rs b/src/test/run-pass/newtype.rs index 818ea4c9f2326..48b2823dea28f 100644 --- a/src/test/run-pass/newtype.rs +++ b/src/test/run-pass/newtype.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Copy, Clone)] struct mytype(Mytype); diff --git a/src/test/run-pass/next-power-of-two-overflow-debug.rs b/src/test/run-pass/next-power-of-two-overflow-debug.rs index 2135b3f8764c0..60f36d66793fc 100644 --- a/src/test/run-pass/next-power-of-two-overflow-debug.rs +++ b/src/test/run-pass/next-power-of-two-overflow-debug.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C debug_assertions=yes // ignore-wasm32-bare compiled with panic=abort by default // ignore-emscripten dies with an LLVM error diff --git a/src/test/run-pass/next-power-of-two-overflow-ndebug.rs b/src/test/run-pass/next-power-of-two-overflow-ndebug.rs index b05c1863d902d..b107130d45478 100644 --- a/src/test/run-pass/next-power-of-two-overflow-ndebug.rs +++ b/src/test/run-pass/next-power-of-two-overflow-ndebug.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C debug_assertions=no // ignore-emscripten dies with an LLVM error diff --git a/src/test/run-pass/nil-decl-in-foreign.rs b/src/test/run-pass/nil-decl-in-foreign.rs index 97ee237771f3f..07c4df76257f2 100644 --- a/src/test/run-pass/nil-decl-in-foreign.rs +++ b/src/test/run-pass/nil-decl-in-foreign.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #901 // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/nil-pattern.rs b/src/test/run-pass/nil-pattern.rs index 342644e038437..bdd512a1abeef 100644 --- a/src/test/run-pass/nil-pattern.rs +++ b/src/test/run-pass/nil-pattern.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub fn main() { let x = (); match x { () => { } } } diff --git a/src/test/run-pass/nll/issue-47153-generic-const.rs b/src/test/run-pass/nll/issue-47153-generic-const.rs index 9708ca1c14279..db8cd2da444a1 100644 --- a/src/test/run-pass/nll/issue-47153-generic-const.rs +++ b/src/test/run-pass/nll/issue-47153-generic-const.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #47153: constants in a generic context (such as // a trait) used to ICE. diff --git a/src/test/run-pass/nll/issue-47589.rs b/src/test/run-pass/nll/issue-47589.rs index 393c18efad0ad..bf36c6f3955a7 100644 --- a/src/test/run-pass/nll/issue-47589.rs +++ b/src/test/run-pass/nll/issue-47589.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] pub struct DescriptorSet<'a> { diff --git a/src/test/run-pass/nll/issue-48623-closure.rs b/src/test/run-pass/nll/issue-48623-closure.rs index 08ff54a428e76..773af58455461 100644 --- a/src/test/run-pass/nll/issue-48623-closure.rs +++ b/src/test/run-pass/nll/issue-48623-closure.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] struct WithDrop; diff --git a/src/test/run-pass/nll/issue-48623-generator.rs b/src/test/run-pass/nll/issue-48623-generator.rs index 524837c4ba91e..b438f094f6b9d 100644 --- a/src/test/run-pass/nll/issue-48623-generator.rs +++ b/src/test/run-pass/nll/issue-48623-generator.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] #![feature(generators, generator_trait)] diff --git a/src/test/run-pass/nll/issue-50343.rs b/src/test/run-pass/nll/issue-50343.rs index f01d99c68cc7b..a26e8f7c25793 100644 --- a/src/test/run-pass/nll/issue-50343.rs +++ b/src/test/run-pass/nll/issue-50343.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] #![deny(unused_mut)] diff --git a/src/test/run-pass/nll/issue-50461-used-mut-from-moves.rs b/src/test/run-pass/nll/issue-50461-used-mut-from-moves.rs index d5cf122bf3b33..05dcadf2ee21c 100644 --- a/src/test/run-pass/nll/issue-50461-used-mut-from-moves.rs +++ b/src/test/run-pass/nll/issue-50461-used-mut-from-moves.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] #![deny(unused_mut)] diff --git a/src/test/run-pass/nll/issue-53123-raw-pointer-cast.rs b/src/test/run-pass/nll/issue-53123-raw-pointer-cast.rs index 7959f1737b9f4..d4780173a4fc5 100644 --- a/src/test/run-pass/nll/issue-53123-raw-pointer-cast.rs +++ b/src/test/run-pass/nll/issue-53123-raw-pointer-cast.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] #![allow(unused_variables)] diff --git a/src/test/run-pass/nll/mutating_references.rs b/src/test/run-pass/nll/mutating_references.rs index 96b7362e4d939..7165fd653224d 100644 --- a/src/test/run-pass/nll/mutating_references.rs +++ b/src/test/run-pass/nll/mutating_references.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] struct List { diff --git a/src/test/run-pass/nll/process_or_insert_default.rs b/src/test/run-pass/nll/process_or_insert_default.rs index a3a484402cc14..bea9b5f9f2002 100644 --- a/src/test/run-pass/nll/process_or_insert_default.rs +++ b/src/test/run-pass/nll/process_or_insert_default.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] use std::collections::HashMap; diff --git a/src/test/run-pass/nll/rc-loop.rs b/src/test/run-pass/nll/rc-loop.rs index 2114dbebe93fb..4a391977d40a5 100644 --- a/src/test/run-pass/nll/rc-loop.rs +++ b/src/test/run-pass/nll/rc-loop.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // A test for something that NLL enables. It sometimes happens that // the `while let` pattern makes some borrows from a variable (in this // case, `x`) that you need in order to compute the next value for diff --git a/src/test/run-pass/no-core-1.rs b/src/test/run-pass/no-core-1.rs index 7868077fbf244..67021499f461a 100644 --- a/src/test/run-pass/no-core-1.rs +++ b/src/test/run-pass/no-core-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(no_core, core)] #![no_core] diff --git a/src/test/run-pass/no-drop-flag-size.rs b/src/test/run-pass/no-drop-flag-size.rs index a606a8a9f4b3b..4d2c44fb4923e 100644 --- a/src/test/run-pass/no-drop-flag-size.rs +++ b/src/test/run-pass/no-drop-flag-size.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::mem::size_of; struct Test { diff --git a/src/test/run-pass/no-landing-pads.rs b/src/test/run-pass/no-landing-pads.rs index 73f123045d249..464978658262d 100644 --- a/src/test/run-pass/no-landing-pads.rs +++ b/src/test/run-pass/no-landing-pads.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z no-landing-pads -C codegen-units=1 // ignore-emscripten no threads support diff --git a/src/test/run-pass/no-std-1.rs b/src/test/run-pass/no-std-1.rs index 9298d74f9c47b..fecf7397c8f87 100644 --- a/src/test/run-pass/no-std-1.rs +++ b/src/test/run-pass/no-std-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![no_std] extern crate std; diff --git a/src/test/run-pass/no-std-2.rs b/src/test/run-pass/no-std-2.rs index 1b24987052b49..946f993ca888c 100644 --- a/src/test/run-pass/no-std-2.rs +++ b/src/test/run-pass/no-std-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![no_std] extern crate std; diff --git a/src/test/run-pass/no-std-3.rs b/src/test/run-pass/no-std-3.rs index 685c62f5a532a..f937d2593a0c7 100644 --- a/src/test/run-pass/no-std-3.rs +++ b/src/test/run-pass/no-std-3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![no_std] extern crate std; diff --git a/src/test/run-pass/no-stdio.rs b/src/test/run-pass/no-stdio.rs index d34241769603b..9654b74c9dc60 100644 --- a/src/test/run-pass/no-stdio.rs +++ b/src/test/run-pass/no-stdio.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-android // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/non-built-in-quote.rs b/src/test/run-pass/non-built-in-quote.rs index 6c0df5f4c14e7..75df2788d7918 100644 --- a/src/test/run-pass/non-built-in-quote.rs +++ b/src/test/run-pass/non-built-in-quote.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 macro_rules! quote_tokens { () => (()) } diff --git a/src/test/run-pass/non-legacy-modes.rs b/src/test/run-pass/non-legacy-modes.rs index 58534ed96da83..a3abbeb81566e 100644 --- a/src/test/run-pass/non-legacy-modes.rs +++ b/src/test/run-pass/non-legacy-modes.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct X { repr: isize } diff --git a/src/test/run-pass/non_modrs_mods/foors_mod.rs b/src/test/run-pass/non_modrs_mods/foors_mod.rs index 7d37c6d939954..13e72c786339e 100644 --- a/src/test/run-pass/non_modrs_mods/foors_mod.rs +++ b/src/test/run-pass/non_modrs_mods/foors_mod.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // ignore-test: not a test, used by non_modrs_mods.rs diff --git a/src/test/run-pass/non_modrs_mods/foors_mod/inner_foors_mod.rs b/src/test/run-pass/non_modrs_mods/foors_mod/inner_foors_mod.rs index 77cab972352bd..68429e9831f07 100644 --- a/src/test/run-pass/non_modrs_mods/foors_mod/inner_foors_mod.rs +++ b/src/test/run-pass/non_modrs_mods/foors_mod/inner_foors_mod.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod innest; diff --git a/src/test/run-pass/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs b/src/test/run-pass/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs index b61667cfd882c..b76b4321d62aa 100644 --- a/src/test/run-pass/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs +++ b/src/test/run-pass/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn foo() {} diff --git a/src/test/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs b/src/test/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs index b61667cfd882c..b76b4321d62aa 100644 --- a/src/test/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs +++ b/src/test/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn foo() {} diff --git a/src/test/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs b/src/test/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs index 77cab972352bd..68429e9831f07 100644 --- a/src/test/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs +++ b/src/test/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod innest; diff --git a/src/test/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod.rs b/src/test/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod.rs index 77cab972352bd..68429e9831f07 100644 --- a/src/test/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod.rs +++ b/src/test/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod innest; diff --git a/src/test/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs b/src/test/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs index b61667cfd882c..b76b4321d62aa 100644 --- a/src/test/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs +++ b/src/test/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn foo() {} diff --git a/src/test/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs b/src/test/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs index b61667cfd882c..b76b4321d62aa 100644 --- a/src/test/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs +++ b/src/test/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn foo() {} diff --git a/src/test/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs b/src/test/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs index 77cab972352bd..68429e9831f07 100644 --- a/src/test/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs +++ b/src/test/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod innest; diff --git a/src/test/run-pass/non_modrs_mods/modrs_mod/mod.rs b/src/test/run-pass/non_modrs_mods/modrs_mod/mod.rs index 9e3f10f12ed63..f2a2c56b29132 100644 --- a/src/test/run-pass/non_modrs_mods/modrs_mod/mod.rs +++ b/src/test/run-pass/non_modrs_mods/modrs_mod/mod.rs @@ -1,12 +1,2 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod inner_modrs_mod; pub mod inner_foors_mod; diff --git a/src/test/run-pass/non_modrs_mods/non_modrs_mods.rs b/src/test/run-pass/non_modrs_mods/non_modrs_mods.rs index eab8112b85543..dac21fb998520 100644 --- a/src/test/run-pass/non_modrs_mods/non_modrs_mods.rs +++ b/src/test/run-pass/non_modrs_mods/non_modrs_mods.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // ignore-pretty issue #37195 #![feature(non_modrs_mods)] diff --git a/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs b/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs index 226e6fda0a41f..97441eb5e57a7 100644 --- a/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs +++ b/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod inner_modrs_mod; diff --git a/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs b/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs index b61667cfd882c..b76b4321d62aa 100644 --- a/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs +++ b/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn foo() {} diff --git a/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs b/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs index 77cab972352bd..68429e9831f07 100644 --- a/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs +++ b/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod innest; diff --git a/src/test/run-pass/nondrop-cycle.rs b/src/test/run-pass/nondrop-cycle.rs index a28f2b15b9285..fbac5f8cce03c 100644 --- a/src/test/run-pass/nondrop-cycle.rs +++ b/src/test/run-pass/nondrop-cycle.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 use std::cell::Cell; diff --git a/src/test/run-pass/nonzero-enum.rs b/src/test/run-pass/nonzero-enum.rs index fc92c9df9f7ef..a80a1aabe4f7d 100644 --- a/src/test/run-pass/nonzero-enum.rs +++ b/src/test/run-pass/nonzero-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::mem::size_of; enum E { diff --git a/src/test/run-pass/nul-characters.rs b/src/test/run-pass/nul-characters.rs index cbea5e71f255f..d93219d83d263 100644 --- a/src/test/run-pass/nul-characters.rs +++ b/src/test/run-pass/nul-characters.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { let all_nuls1 = "\0\x00\u{0}\u{0}"; diff --git a/src/test/run-pass/nullable-pointer-ffi-compat.rs b/src/test/run-pass/nullable-pointer-ffi-compat.rs index 2b7cf6c668247..0487052799a46 100644 --- a/src/test/run-pass/nullable-pointer-ffi-compat.rs +++ b/src/test/run-pass/nullable-pointer-ffi-compat.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // #11303, #11040: // This would previously crash on i686 Linux due to abi differences // between returning an Option and T, where T is a non nullable diff --git a/src/test/run-pass/nullable-pointer-iotareduction.rs b/src/test/run-pass/nullable-pointer-iotareduction.rs index d33102a38f96e..42aad550c1a7f 100644 --- a/src/test/run-pass/nullable-pointer-iotareduction.rs +++ b/src/test/run-pass/nullable-pointer-iotareduction.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] // Iota-reduction is a rule in the Calculus of (Co-)Inductive Constructions, diff --git a/src/test/run-pass/nullable-pointer-opt-closures.rs b/src/test/run-pass/nullable-pointer-opt-closures.rs index ac5634e6cdd16..ee7129455e1ae 100644 --- a/src/test/run-pass/nullable-pointer-opt-closures.rs +++ b/src/test/run-pass/nullable-pointer-opt-closures.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::mem; pub fn main() { diff --git a/src/test/run-pass/nullable-pointer-size.rs b/src/test/run-pass/nullable-pointer-size.rs index b097d350c8d5e..fb536c5f23356 100644 --- a/src/test/run-pass/nullable-pointer-size.rs +++ b/src/test/run-pass/nullable-pointer-size.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::mem; enum E { Thing(isize, T), Nothing((), ((), ()), [i8; 0]) } diff --git a/src/test/run-pass/nullary-or-pattern.rs b/src/test/run-pass/nullary-or-pattern.rs index feb8726c0e4a8..3d7e6718ef6dc 100644 --- a/src/test/run-pass/nullary-or-pattern.rs +++ b/src/test/run-pass/nullary-or-pattern.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum blah { a, b, } fn or_alt(q: blah) -> isize { diff --git a/src/test/run-pass/num-wrapping.rs b/src/test/run-pass/num-wrapping.rs index 20c7f27336e25..7c42855f1e0e8 100644 --- a/src/test/run-pass/num-wrapping.rs +++ b/src/test/run-pass/num-wrapping.rs @@ -1,12 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // compile-flags: -C debug-assertions // diff --git a/src/test/run-pass/numeric-fields.rs b/src/test/run-pass/numeric-fields.rs index 15f054de79d13..8548d9377e49b 100644 --- a/src/test/run-pass/numeric-fields.rs +++ b/src/test/run-pass/numeric-fields.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S(u8, u16); fn main() { diff --git a/src/test/run-pass/numeric-method-autoexport.rs b/src/test/run-pass/numeric-method-autoexport.rs index 15ece09abd80f..5be5012253f53 100644 --- a/src/test/run-pass/numeric-method-autoexport.rs +++ b/src/test/run-pass/numeric-method-autoexport.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file is intended to test only that methods are automatically // reachable for each numeric type, for each exported impl, with no imports // necessary. Testing the methods of the impls is done within the source diff --git a/src/test/run-pass/object-lifetime-default-default-to-static.rs b/src/test/run-pass/object-lifetime-default-default-to-static.rs index 1b631f171eb79..cf836c1a7deda 100644 --- a/src/test/run-pass/object-lifetime-default-default-to-static.rs +++ b/src/test/run-pass/object-lifetime-default-default-to-static.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that `Box` is equivalent to `Box`, both in // fields and fn arguments. diff --git a/src/test/run-pass/object-lifetime-default-from-ref-struct.rs b/src/test/run-pass/object-lifetime-default-from-ref-struct.rs index 6aaf892097136..6d4670c08eb3f 100644 --- a/src/test/run-pass/object-lifetime-default-from-ref-struct.rs +++ b/src/test/run-pass/object-lifetime-default-from-ref-struct.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the lifetime of the enclosing `&` is used for the object // lifetime bound. diff --git a/src/test/run-pass/object-lifetime-default-from-rptr-box.rs b/src/test/run-pass/object-lifetime-default-from-rptr-box.rs index af8018b765341..3f69c9274889c 100644 --- a/src/test/run-pass/object-lifetime-default-from-rptr-box.rs +++ b/src/test/run-pass/object-lifetime-default-from-rptr-box.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the lifetime from the enclosing `&` is "inherited" // through the `Box` struct. diff --git a/src/test/run-pass/object-lifetime-default-from-rptr-mut.rs b/src/test/run-pass/object-lifetime-default-from-rptr-mut.rs index edd0bdb32c2b1..dc9e292f0de38 100644 --- a/src/test/run-pass/object-lifetime-default-from-rptr-mut.rs +++ b/src/test/run-pass/object-lifetime-default-from-rptr-mut.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the lifetime of the enclosing `&` is used for the object // lifetime bound. diff --git a/src/test/run-pass/object-lifetime-default-from-rptr-struct.rs b/src/test/run-pass/object-lifetime-default-from-rptr-struct.rs index fcff5fd6f17d6..df7aa8429d1e3 100644 --- a/src/test/run-pass/object-lifetime-default-from-rptr-struct.rs +++ b/src/test/run-pass/object-lifetime-default-from-rptr-struct.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the lifetime from the enclosing `&` is "inherited" // through the `MyBox` struct. diff --git a/src/test/run-pass/object-lifetime-default-from-rptr.rs b/src/test/run-pass/object-lifetime-default-from-rptr.rs index cbff0d4dbaa3c..061f71b9ae6bf 100644 --- a/src/test/run-pass/object-lifetime-default-from-rptr.rs +++ b/src/test/run-pass/object-lifetime-default-from-rptr.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the lifetime of the enclosing `&` is used for the object // lifetime bound. diff --git a/src/test/run-pass/object-method-numbering.rs b/src/test/run-pass/object-method-numbering.rs index 82d34fa9ae48b..455af78c7a08e 100644 --- a/src/test/run-pass/object-method-numbering.rs +++ b/src/test/run-pass/object-method-numbering.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test for using an object with an associated type binding as the // instantiation for a generic type with a bound. diff --git a/src/test/run-pass/object-one-type-two-traits.rs b/src/test/run-pass/object-one-type-two-traits.rs index 284beccdb2956..28a4bfbf8400c 100644 --- a/src/test/run-pass/object-one-type-two-traits.rs +++ b/src/test/run-pass/object-one-type-two-traits.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Testing creating two vtables with the same self type, but different // traits. diff --git a/src/test/run-pass/object-safety-sized-self-by-value-self.rs b/src/test/run-pass/object-safety-sized-self-by-value-self.rs index 81acd94ebe516..124cddbb6c127 100644 --- a/src/test/run-pass/object-safety-sized-self-by-value-self.rs +++ b/src/test/run-pass/object-safety-sized-self-by-value-self.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that a trait is still object-safe (and usable) if it has // methods with by-value self so long as they require `Self : Sized`. diff --git a/src/test/run-pass/object-safety-sized-self-generic-method.rs b/src/test/run-pass/object-safety-sized-self-generic-method.rs index 2e84117566e47..811da1f6449f1 100644 --- a/src/test/run-pass/object-safety-sized-self-generic-method.rs +++ b/src/test/run-pass/object-safety-sized-self-generic-method.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that a trait is still object-safe (and usable) if it has // generic methods so long as they require `Self : Sized`. diff --git a/src/test/run-pass/object-safety-sized-self-return-Self.rs b/src/test/run-pass/object-safety-sized-self-return-Self.rs index eda541262bd94..55bf0ef5fcdcc 100644 --- a/src/test/run-pass/object-safety-sized-self-return-Self.rs +++ b/src/test/run-pass/object-safety-sized-self-return-Self.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that a trait is still object-safe (and usable) if it has // methods that return `Self` so long as they require `Self : Sized`. diff --git a/src/test/run-pass/objects-coerce-freeze-borrored.rs b/src/test/run-pass/objects-coerce-freeze-borrored.rs index f907b5723f41b..872b9d3e9160b 100644 --- a/src/test/run-pass/objects-coerce-freeze-borrored.rs +++ b/src/test/run-pass/objects-coerce-freeze-borrored.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we can coerce an `@Object` to an `&Object` diff --git a/src/test/run-pass/objects-owned-object-borrowed-method-headerless.rs b/src/test/run-pass/objects-owned-object-borrowed-method-headerless.rs index c27bc62ada803..a96772bfb6312 100644 --- a/src/test/run-pass/objects-owned-object-borrowed-method-headerless.rs +++ b/src/test/run-pass/objects-owned-object-borrowed-method-headerless.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test invoked `&self` methods on owned objects where the values // closed over do not contain managed values, and thus the boxes do // not have headers. diff --git a/src/test/run-pass/objects-owned-object-owned-method.rs b/src/test/run-pass/objects-owned-object-owned-method.rs index 5d9658dc15d63..6ca5233b198e0 100644 --- a/src/test/run-pass/objects-owned-object-owned-method.rs +++ b/src/test/run-pass/objects-owned-object-owned-method.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test invoked `&self` methods on owned objects where the values // closed over contain managed values. This implies that the boxes // will have headers that must be skipped over. diff --git a/src/test/run-pass/once-move-out-on-heap.rs b/src/test/run-pass/once-move-out-on-heap.rs index 6dd4c0ddce3c5..46e663417cf93 100644 --- a/src/test/run-pass/once-move-out-on-heap.rs +++ b/src/test/run-pass/once-move-out-on-heap.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Testing guarantees provided by once functions. diff --git a/src/test/run-pass/one-tuple.rs b/src/test/run-pass/one-tuple.rs index 68974b47d06a9..fa54f9529382e 100644 --- a/src/test/run-pass/one-tuple.rs +++ b/src/test/run-pass/one-tuple.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Why one-tuples? Because macros. diff --git a/src/test/run-pass/op-assign-builtins-by-ref.rs b/src/test/run-pass/op-assign-builtins-by-ref.rs index 230d44ba647a5..8e0353e484921 100644 --- a/src/test/run-pass/op-assign-builtins-by-ref.rs +++ b/src/test/run-pass/op-assign-builtins-by-ref.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { // test compound assignment operators with ref as right-hand side, // for each operator, with various types as operands. diff --git a/src/test/run-pass/opeq.rs b/src/test/run-pass/opeq.rs index f5f0928ff144a..ea6c7647bb5cb 100644 --- a/src/test/run-pass/opeq.rs +++ b/src/test/run-pass/opeq.rs @@ -1,16 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - pub fn main() { let mut x: isize = 1; x *= 2; diff --git a/src/test/run-pass/operator-associativity.rs b/src/test/run-pass/operator-associativity.rs index 86ca8f3325a82..69e3f699e9c6d 100644 --- a/src/test/run-pass/operator-associativity.rs +++ b/src/test/run-pass/operator-associativity.rs @@ -1,16 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - // Testcase for issue #130, operator associativity. pub fn main() { assert_eq!(3 * 5 / 2, 7); } diff --git a/src/test/run-pass/operator-multidispatch.rs b/src/test/run-pass/operator-multidispatch.rs index af7deef11b6b2..cc546c903b790 100644 --- a/src/test/run-pass/operator-multidispatch.rs +++ b/src/test/run-pass/operator-multidispatch.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we can overload the `+` operator for points so that two // points can be added, and a point can be added to an integer. diff --git a/src/test/run-pass/operator-overloading.rs b/src/test/run-pass/operator-overloading.rs index c3a1164ba9c6a..5b01343b49309 100644 --- a/src/test/run-pass/operator-overloading.rs +++ b/src/test/run-pass/operator-overloading.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cmp; use std::ops; diff --git a/src/test/run-pass/optimization-fuel-0.rs b/src/test/run-pass/optimization-fuel-0.rs index 3832c040108f8..d2b141157b9ac 100644 --- a/src/test/run-pass/optimization-fuel-0.rs +++ b/src/test/run-pass/optimization-fuel-0.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name="foo"] use std::mem::size_of; diff --git a/src/test/run-pass/optimization-fuel-1.rs b/src/test/run-pass/optimization-fuel-1.rs index e3529ebfb0d81..28428a3c2a993 100644 --- a/src/test/run-pass/optimization-fuel-1.rs +++ b/src/test/run-pass/optimization-fuel-1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name="foo"] use std::mem::size_of; diff --git a/src/test/run-pass/option-ext.rs b/src/test/run-pass/option-ext.rs index c054171ff008a..0b21b8e5b5a6c 100644 --- a/src/test/run-pass/option-ext.rs +++ b/src/test/run-pass/option-ext.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { let thing = "{{ f }}"; let f = thing.find("{{"); diff --git a/src/test/run-pass/option-unwrap.rs b/src/test/run-pass/option-unwrap.rs index e22edb3caede4..52c9766d29d60 100644 --- a/src/test/run-pass/option-unwrap.rs +++ b/src/test/run-pass/option-unwrap.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cell::Cell; struct dtor<'a> { diff --git a/src/test/run-pass/optional_comma_in_match_arm.rs b/src/test/run-pass/optional_comma_in_match_arm.rs index b25ec444f22ad..366521d551120 100644 --- a/src/test/run-pass/optional_comma_in_match_arm.rs +++ b/src/test/run-pass/optional_comma_in_match_arm.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty issue #37199 fn main() { diff --git a/src/test/run-pass/or-pattern.rs b/src/test/run-pass/or-pattern.rs index 3bb0c71c58115..be83985b9958c 100644 --- a/src/test/run-pass/or-pattern.rs +++ b/src/test/run-pass/or-pattern.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum blah { a(isize, isize, usize), b(isize, isize), c, } fn or_alt(q: blah) -> isize { diff --git a/src/test/run-pass/order-drop-with-match.rs b/src/test/run-pass/order-drop-with-match.rs index 8f82e3aaba155..65ce7679f48bc 100644 --- a/src/test/run-pass/order-drop-with-match.rs +++ b/src/test/run-pass/order-drop-with-match.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // Test to make sure the destructors run in the right order. // Each destructor sets it's tag in the corresponding entry // in ORDER matching up to when it ran. diff --git a/src/test/run-pass/out-of-stack.rs b/src/test/run-pass/out-of-stack.rs index 6ed07fb2f7d25..0df007ce132fa 100644 --- a/src/test/run-pass/out-of-stack.rs +++ b/src/test/run-pass/out-of-stack.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-android: FIXME (#20004) // ignore-musl // ignore-cloudabi no processes diff --git a/src/test/run-pass/out-pointer-aliasing.rs b/src/test/run-pass/out-pointer-aliasing.rs index 790affd939f24..48fa9020b9305 100644 --- a/src/test/run-pass/out-pointer-aliasing.rs +++ b/src/test/run-pass/out-pointer-aliasing.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #[derive(Copy, Clone)] pub struct Foo { f1: isize, diff --git a/src/test/run-pass/output-slot-variants.rs b/src/test/run-pass/output-slot-variants.rs index 2171b8c481d1f..6b51fc761ac6c 100644 --- a/src/test/run-pass/output-slot-variants.rs +++ b/src/test/run-pass/output-slot-variants.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![allow(dead_assignment)] diff --git a/src/test/run-pass/over-constrained-vregs.rs b/src/test/run-pass/over-constrained-vregs.rs index e4e07941470a8..bc8d91067f513 100644 --- a/src/test/run-pass/over-constrained-vregs.rs +++ b/src/test/run-pass/over-constrained-vregs.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #152. pub fn main() { let mut b: usize = 1_usize; diff --git a/src/test/run-pass/overlap-doesnt-conflict-with-specialization.rs b/src/test/run-pass/overlap-doesnt-conflict-with-specialization.rs index ed45d81c0d6a1..ddad0f5969917 100644 --- a/src/test/run-pass/overlap-doesnt-conflict-with-specialization.rs +++ b/src/test/run-pass/overlap-doesnt-conflict-with-specialization.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(overlapping_marker_traits)] #![feature(specialization)] diff --git a/src/test/run-pass/overlap-permitted-for-marker-traits-neg.rs b/src/test/run-pass/overlap-permitted-for-marker-traits-neg.rs index 740d5d22ab507..91ecb269bf8ff 100644 --- a/src/test/run-pass/overlap-permitted-for-marker-traits-neg.rs +++ b/src/test/run-pass/overlap-permitted-for-marker-traits-neg.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(overlapping_marker_traits)] #![feature(optin_builtin_traits)] diff --git a/src/test/run-pass/overlap-permitted-for-marker-traits.rs b/src/test/run-pass/overlap-permitted-for-marker-traits.rs index 11a46299d8c83..407b341372a98 100644 --- a/src/test/run-pass/overlap-permitted-for-marker-traits.rs +++ b/src/test/run-pass/overlap-permitted-for-marker-traits.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests for RFC 1268: we allow overlapping impls of marker traits, // that is, traits without items. In this case, a type `T` is // `MyMarker` if it is either `Debug` or `Display`. diff --git a/src/test/run-pass/overloaded-autoderef-count.rs b/src/test/run-pass/overloaded-autoderef-count.rs index 14a9cc4c2489a..78034b79f4d59 100644 --- a/src/test/run-pass/overloaded-autoderef-count.rs +++ b/src/test/run-pass/overloaded-autoderef-count.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cell::Cell; use std::ops::{Deref, DerefMut}; diff --git a/src/test/run-pass/overloaded-autoderef-indexing.rs b/src/test/run-pass/overloaded-autoderef-indexing.rs index 67b8bc1d157ca..17cdb650bc510 100644 --- a/src/test/run-pass/overloaded-autoderef-indexing.rs +++ b/src/test/run-pass/overloaded-autoderef-indexing.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::ops::Deref; struct DerefArray<'a, T:'a> { diff --git a/src/test/run-pass/overloaded-autoderef-order.rs b/src/test/run-pass/overloaded-autoderef-order.rs index 8ea8b375b17b4..6b7461d4d0323 100644 --- a/src/test/run-pass/overloaded-autoderef-order.rs +++ b/src/test/run-pass/overloaded-autoderef-order.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::rc::Rc; use std::ops::Deref; diff --git a/src/test/run-pass/overloaded-autoderef-vtable.rs b/src/test/run-pass/overloaded-autoderef-vtable.rs index 38ed90a45471b..05698c2409a6a 100644 --- a/src/test/run-pass/overloaded-autoderef-vtable.rs +++ b/src/test/run-pass/overloaded-autoderef-vtable.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::ops::Deref; struct DerefWithHelper { diff --git a/src/test/run-pass/overloaded-autoderef-xcrate.rs b/src/test/run-pass/overloaded-autoderef-xcrate.rs index 174e09cb14c7a..8354f511c494a 100644 --- a/src/test/run-pass/overloaded-autoderef-xcrate.rs +++ b/src/test/run-pass/overloaded-autoderef-xcrate.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:overloaded_autoderef_xc.rs diff --git a/src/test/run-pass/overloaded-autoderef.rs b/src/test/run-pass/overloaded-autoderef.rs index 759e2aace6104..23cb93d01d9bd 100644 --- a/src/test/run-pass/overloaded-autoderef.rs +++ b/src/test/run-pass/overloaded-autoderef.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax, core)] use std::cell::RefCell; diff --git a/src/test/run-pass/overloaded-calls-object-one-arg.rs b/src/test/run-pass/overloaded-calls-object-one-arg.rs index ec64f627c9462..2db1c0b2d2c57 100644 --- a/src/test/run-pass/overloaded-calls-object-one-arg.rs +++ b/src/test/run-pass/overloaded-calls-object-one-arg.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests calls to closure arguments where the closure takes 1 argument. // This is a bit tricky due to rust-call ABI. diff --git a/src/test/run-pass/overloaded-calls-object-two-args.rs b/src/test/run-pass/overloaded-calls-object-two-args.rs index c38a62147a011..5184b4d04d800 100644 --- a/src/test/run-pass/overloaded-calls-object-two-args.rs +++ b/src/test/run-pass/overloaded-calls-object-two-args.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests calls to closure arguments where the closure takes 2 arguments. // This is a bit tricky due to rust-call ABI. diff --git a/src/test/run-pass/overloaded-calls-object-zero-args.rs b/src/test/run-pass/overloaded-calls-object-zero-args.rs index 08ab465ebb04c..ab04d96659943 100644 --- a/src/test/run-pass/overloaded-calls-object-zero-args.rs +++ b/src/test/run-pass/overloaded-calls-object-zero-args.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests calls to closure arguments where the closure takes 0 arguments. // This is a bit tricky due to rust-call ABI. diff --git a/src/test/run-pass/overloaded-calls-param-vtables.rs b/src/test/run-pass/overloaded-calls-param-vtables.rs index c15c6df5fac2a..1649d5f77078a 100644 --- a/src/test/run-pass/overloaded-calls-param-vtables.rs +++ b/src/test/run-pass/overloaded-calls-param-vtables.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that nested vtables work with overloaded calls. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/overloaded-calls-simple.rs b/src/test/run-pass/overloaded-calls-simple.rs index 24a79a26837ad..9e9f915d11bd6 100644 --- a/src/test/run-pass/overloaded-calls-simple.rs +++ b/src/test/run-pass/overloaded-calls-simple.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![feature(lang_items, unboxed_closures, fn_traits)] use std::ops::{Fn, FnMut, FnOnce}; diff --git a/src/test/run-pass/overloaded-calls-zero-args.rs b/src/test/run-pass/overloaded-calls-zero-args.rs index 5fd6d5cb10f3d..d59532123dd19 100644 --- a/src/test/run-pass/overloaded-calls-zero-args.rs +++ b/src/test/run-pass/overloaded-calls-zero-args.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![feature(unboxed_closures, fn_traits)] use std::ops::FnMut; diff --git a/src/test/run-pass/overloaded-deref-count.rs b/src/test/run-pass/overloaded-deref-count.rs index a8a3b3014e099..7d529ac0639fb 100644 --- a/src/test/run-pass/overloaded-deref-count.rs +++ b/src/test/run-pass/overloaded-deref-count.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::cell::Cell; use std::ops::{Deref, DerefMut}; use std::vec::Vec; diff --git a/src/test/run-pass/overloaded-deref.rs b/src/test/run-pass/overloaded-deref.rs index 9cdf45b485c1b..be3fe723fc9a9 100644 --- a/src/test/run-pass/overloaded-deref.rs +++ b/src/test/run-pass/overloaded-deref.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cell::RefCell; use std::rc::Rc; use std::string::String; diff --git a/src/test/run-pass/overloaded-index-assoc-list.rs b/src/test/run-pass/overloaded-index-assoc-list.rs index 50140d1aab9da..5b0e0de5bc21c 100644 --- a/src/test/run-pass/overloaded-index-assoc-list.rs +++ b/src/test/run-pass/overloaded-index-assoc-list.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test overloading of the `[]` operator. In particular test that it // takes its argument *by reference*. diff --git a/src/test/run-pass/overloaded-index-autoderef.rs b/src/test/run-pass/overloaded-index-autoderef.rs index 9988599d59dcc..f8f8245714127 100644 --- a/src/test/run-pass/overloaded-index-autoderef.rs +++ b/src/test/run-pass/overloaded-index-autoderef.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test overloaded indexing combined with autoderef. #![feature(box_syntax, core)] diff --git a/src/test/run-pass/overloaded-index-in-field.rs b/src/test/run-pass/overloaded-index-in-field.rs index 7e2b586631dce..d547f8acdf8e8 100644 --- a/src/test/run-pass/overloaded-index-in-field.rs +++ b/src/test/run-pass/overloaded-index-in-field.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test using overloaded indexing when the "map" is stored in a // field. This caused problems at some point. diff --git a/src/test/run-pass/overloaded-index.rs b/src/test/run-pass/overloaded-index.rs index b54a18f722a72..f4415c5792ad7 100644 --- a/src/test/run-pass/overloaded-index.rs +++ b/src/test/run-pass/overloaded-index.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::{Index, IndexMut}; struct Foo { diff --git a/src/test/run-pass/overloaded_deref_with_ref_pattern.rs b/src/test/run-pass/overloaded_deref_with_ref_pattern.rs index f72d496425138..cade136b2b93e 100644 --- a/src/test/run-pass/overloaded_deref_with_ref_pattern.rs +++ b/src/test/run-pass/overloaded_deref_with_ref_pattern.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we choose Deref or DerefMut appropriately based on mutability of ref bindings (#15609). use std::ops::{Deref, DerefMut}; diff --git a/src/test/run-pass/overloaded_deref_with_ref_pattern_issue15609.rs b/src/test/run-pass/overloaded_deref_with_ref_pattern_issue15609.rs index e5eb6ab8f610d..5f849e95270d8 100644 --- a/src/test/run-pass/overloaded_deref_with_ref_pattern_issue15609.rs +++ b/src/test/run-pass/overloaded_deref_with_ref_pattern_issue15609.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we choose Deref or DerefMut appropriately based on mutability of ref bindings (#15609). fn main() { diff --git a/src/test/run-pass/owned-implies-static.rs b/src/test/run-pass/owned-implies-static.rs index f698b660751ab..7101726ab6a60 100644 --- a/src/test/run-pass/owned-implies-static.rs +++ b/src/test/run-pass/owned-implies-static.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn f(_x: T) {} diff --git a/src/test/run-pass/packed-struct-borrow-element.rs b/src/test/run-pass/packed-struct-borrow-element.rs index c8a8643ed6b98..dd783d93af470 100644 --- a/src/test/run-pass/packed-struct-borrow-element.rs +++ b/src/test/run-pass/packed-struct-borrow-element.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten weird assertion? #![feature(repr_packed)] diff --git a/src/test/run-pass/packed-struct-drop-aligned.rs b/src/test/run-pass/packed-struct-drop-aligned.rs index bbe31a65e86a2..1ac1dc4181478 100644 --- a/src/test/run-pass/packed-struct-drop-aligned.rs +++ b/src/test/run-pass/packed-struct-drop-aligned.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cell::Cell; use std::mem; diff --git a/src/test/run-pass/packed-struct-generic-layout.rs b/src/test/run-pass/packed-struct-generic-layout.rs index b962a5c793382..caa8f62e1ecda 100644 --- a/src/test/run-pass/packed-struct-generic-layout.rs +++ b/src/test/run-pass/packed-struct-generic-layout.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::mem; #[repr(packed)] diff --git a/src/test/run-pass/packed-struct-generic-size.rs b/src/test/run-pass/packed-struct-generic-size.rs index 127d873b2d97a..5d1f117cb6982 100644 --- a/src/test/run-pass/packed-struct-generic-size.rs +++ b/src/test/run-pass/packed-struct-generic-size.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(repr_packed)] use std::mem; diff --git a/src/test/run-pass/packed-struct-layout.rs b/src/test/run-pass/packed-struct-layout.rs index a4a0055785f0d..a6e4f111ebefc 100644 --- a/src/test/run-pass/packed-struct-layout.rs +++ b/src/test/run-pass/packed-struct-layout.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::mem; #[repr(packed)] diff --git a/src/test/run-pass/packed-struct-match.rs b/src/test/run-pass/packed-struct-match.rs index c02d524d763d3..1e5eb3cb8f58e 100644 --- a/src/test/run-pass/packed-struct-match.rs +++ b/src/test/run-pass/packed-struct-match.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(repr_packed)] #[repr(packed)] diff --git a/src/test/run-pass/packed-struct-optimized-enum.rs b/src/test/run-pass/packed-struct-optimized-enum.rs index 9d23a0c71489a..5a7e8ff2f4787 100644 --- a/src/test/run-pass/packed-struct-optimized-enum.rs +++ b/src/test/run-pass/packed-struct-optimized-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[repr(packed)] struct Packed(T); diff --git a/src/test/run-pass/packed-struct-size-xc.rs b/src/test/run-pass/packed-struct-size-xc.rs index 48f34554ca142..2c024b22670e1 100644 --- a/src/test/run-pass/packed-struct-size-xc.rs +++ b/src/test/run-pass/packed-struct-size-xc.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:packed.rs diff --git a/src/test/run-pass/packed-struct-size.rs b/src/test/run-pass/packed-struct-size.rs index f8e23610fe230..f935b535fc6a0 100644 --- a/src/test/run-pass/packed-struct-size.rs +++ b/src/test/run-pass/packed-struct-size.rs @@ -1,12 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![feature(repr_packed)] diff --git a/src/test/run-pass/packed-struct-vec.rs b/src/test/run-pass/packed-struct-vec.rs index 9d8b3d0d07412..079cd8fb55eb1 100644 --- a/src/test/run-pass/packed-struct-vec.rs +++ b/src/test/run-pass/packed-struct-vec.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(repr_packed)] use std::fmt; diff --git a/src/test/run-pass/packed-tuple-struct-layout.rs b/src/test/run-pass/packed-tuple-struct-layout.rs index 18f7eff280a84..3b388a9401f13 100644 --- a/src/test/run-pass/packed-tuple-struct-layout.rs +++ b/src/test/run-pass/packed-tuple-struct-layout.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::mem; #[repr(packed)] diff --git a/src/test/run-pass/packed-tuple-struct-size.rs b/src/test/run-pass/packed-tuple-struct-size.rs index 9def6ac28e552..65f2c50547d83 100644 --- a/src/test/run-pass/packed-tuple-struct-size.rs +++ b/src/test/run-pass/packed-tuple-struct-size.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(repr_packed)] use std::mem; diff --git a/src/test/run-pass/panic-handler-chain.rs b/src/test/run-pass/panic-handler-chain.rs index e2de795bdb72b..1bb32ac5ad79e 100644 --- a/src/test/run-pass/panic-handler-chain.rs +++ b/src/test/run-pass/panic-handler-chain.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support #![feature(std_panic)] diff --git a/src/test/run-pass/panic-handler-flail-wildly.rs b/src/test/run-pass/panic-handler-flail-wildly.rs index f0c50f842ab3c..76cabc6681914 100644 --- a/src/test/run-pass/panic-handler-flail-wildly.rs +++ b/src/test/run-pass/panic-handler-flail-wildly.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support #![feature(std_panic)] diff --git a/src/test/run-pass/panic-handler-set-twice.rs b/src/test/run-pass/panic-handler-set-twice.rs index 120483ab336ff..36cfb255c04ab 100644 --- a/src/test/run-pass/panic-handler-set-twice.rs +++ b/src/test/run-pass/panic-handler-set-twice.rs @@ -1,12 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![feature(std_panic)] // ignore-emscripten no threads support diff --git a/src/test/run-pass/panic-in-dtor-drops-fields.rs b/src/test/run-pass/panic-in-dtor-drops-fields.rs index c5f92fbd55aad..633473d8238c5 100644 --- a/src/test/run-pass/panic-in-dtor-drops-fields.rs +++ b/src/test/run-pass/panic-in-dtor-drops-fields.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/panic-recover-propagate.rs b/src/test/run-pass/panic-recover-propagate.rs index cc2cfb6be969b..4a62c1a3203f1 100644 --- a/src/test/run-pass/panic-recover-propagate.rs +++ b/src/test/run-pass/panic-recover-propagate.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support use std::sync::atomic::{AtomicUsize, Ordering, ATOMIC_USIZE_INIT}; diff --git a/src/test/run-pass/panic-runtime/abort-link-to-unwinding-crates.rs b/src/test/run-pass/panic-runtime/abort-link-to-unwinding-crates.rs index 731603606e426..83714c2bc50a5 100644 --- a/src/test/run-pass/panic-runtime/abort-link-to-unwinding-crates.rs +++ b/src/test/run-pass/panic-runtime/abort-link-to-unwinding-crates.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-C panic=abort // aux-build:exit-success-if-unwind.rs // no-prefer-dynamic diff --git a/src/test/run-pass/panic-runtime/abort.rs b/src/test/run-pass/panic-runtime/abort.rs index 4692ad3ca2f1d..19ed2e07b7ffa 100644 --- a/src/test/run-pass/panic-runtime/abort.rs +++ b/src/test/run-pass/panic-runtime/abort.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-C panic=abort // no-prefer-dynamic // ignore-cloudabi no processes diff --git a/src/test/run-pass/panic-runtime/auxiliary/exit-success-if-unwind.rs b/src/test/run-pass/panic-runtime/auxiliary/exit-success-if-unwind.rs index 9e5fc592b1a33..c0e05740542df 100644 --- a/src/test/run-pass/panic-runtime/auxiliary/exit-success-if-unwind.rs +++ b/src/test/run-pass/panic-runtime/auxiliary/exit-success-if-unwind.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "rlib"] diff --git a/src/test/run-pass/panic-runtime/link-to-abort.rs b/src/test/run-pass/panic-runtime/link-to-abort.rs index 9f5407e4526a5..e1e6163fe6322 100644 --- a/src/test/run-pass/panic-runtime/link-to-abort.rs +++ b/src/test/run-pass/panic-runtime/link-to-abort.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-C panic=abort // no-prefer-dynamic // ignore-macos diff --git a/src/test/run-pass/panic-runtime/link-to-unwind.rs b/src/test/run-pass/panic-runtime/link-to-unwind.rs index dec8f738d3294..89ea7c1e3f70f 100644 --- a/src/test/run-pass/panic-runtime/link-to-unwind.rs +++ b/src/test/run-pass/panic-runtime/link-to-unwind.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![feature(panic_unwind)] diff --git a/src/test/run-pass/panic-runtime/lto-abort.rs b/src/test/run-pass/panic-runtime/lto-abort.rs index 54e02fb697579..6aa0635c6c111 100644 --- a/src/test/run-pass/panic-runtime/lto-abort.rs +++ b/src/test/run-pass/panic-runtime/lto-abort.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-C lto -C panic=abort // no-prefer-dynamic // ignore-cloudabi no processes diff --git a/src/test/run-pass/panic-runtime/lto-unwind.rs b/src/test/run-pass/panic-runtime/lto-unwind.rs index 52f10688f14f5..98961cac3b6bd 100644 --- a/src/test/run-pass/panic-runtime/lto-unwind.rs +++ b/src/test/run-pass/panic-runtime/lto-unwind.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-C lto -C panic=unwind // no-prefer-dynamic // ignore-cloudabi no processes diff --git a/src/test/run-pass/panic-safe.rs b/src/test/run-pass/panic-safe.rs index 9bda07f077f06..bd92248b2b6b3 100644 --- a/src/test/run-pass/panic-safe.rs +++ b/src/test/run-pass/panic-safe.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] use std::panic::{UnwindSafe, AssertUnwindSafe}; diff --git a/src/test/run-pass/parallel-codegen-closures.rs b/src/test/run-pass/parallel-codegen-closures.rs index 27b9eeccbeb14..884b5610734d9 100644 --- a/src/test/run-pass/parallel-codegen-closures.rs +++ b/src/test/run-pass/parallel-codegen-closures.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests parallel codegen - this can fail if the symbol for the anonymous // closure in `sum` pollutes the second codegen unit from the first. diff --git a/src/test/run-pass/parameterized-trait-with-bounds.rs b/src/test/run-pass/parameterized-trait-with-bounds.rs index 3e74341d81981..7da2aa2956f7b 100644 --- a/src/test/run-pass/parameterized-trait-with-bounds.rs +++ b/src/test/run-pass/parameterized-trait-with-bounds.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![allow(dead_code)] diff --git a/src/test/run-pass/paren-free.rs b/src/test/run-pass/paren-free.rs index d9669812d2ad3..1f05ee0ed2242 100644 --- a/src/test/run-pass/paren-free.rs +++ b/src/test/run-pass/paren-free.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { let x = true; if x { let mut i = 10; while i > 0 { i -= 1; } } diff --git a/src/test/run-pass/parse-assoc-type-lt.rs b/src/test/run-pass/parse-assoc-type-lt.rs index c81677220539e..e6b07c583fb09 100644 --- a/src/test/run-pass/parse-assoc-type-lt.rs +++ b/src/test/run-pass/parse-assoc-type-lt.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait Foo { diff --git a/src/test/run-pass/parse-complex-macro-invoc-op.rs b/src/test/run-pass/parse-complex-macro-invoc-op.rs index e4c9fd9d8ef83..5762ada709795 100644 --- a/src/test/run-pass/parse-complex-macro-invoc-op.rs +++ b/src/test/run-pass/parse-complex-macro-invoc-op.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test parsing binary operators after macro invocations. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/parse-panic.rs b/src/test/run-pass/parse-panic.rs index 22b24ebb3b589..d591ac4298ab0 100644 --- a/src/test/run-pass/parse-panic.rs +++ b/src/test/run-pass/parse-panic.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unreachable_code)] fn dont_call_me() { panic!(); println!("{}", 1); } diff --git a/src/test/run-pass/parser-unicode-whitespace.rs b/src/test/run-pass/parser-unicode-whitespace.rs index 837bb8339e1d1..26e79b061726e 100644 --- a/src/test/run-pass/parser-unicode-whitespace.rs +++ b/src/test/run-pass/parser-unicode-whitespace.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // Beware editing: it has numerous whitespace characters which are important. // It contains one ranges from the 'PATTERN_WHITE_SPACE' property outlined in // http://unicode.org/Public/UNIDATA/PropList.txt diff --git a/src/test/run-pass/pat-ranges.rs b/src/test/run-pass/pat-ranges.rs index 964989508ccf2..dd5f2bc97bed1 100644 --- a/src/test/run-pass/pat-ranges.rs +++ b/src/test/run-pass/pat-ranges.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Parsing of range patterns const NUM1: i32 = 10; diff --git a/src/test/run-pass/pat-tuple-1.rs b/src/test/run-pass/pat-tuple-1.rs index 45a9a2b303c9f..e6275241a325a 100644 --- a/src/test/run-pass/pat-tuple-1.rs +++ b/src/test/run-pass/pat-tuple-1.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn tuple() { let x = (1, 2, 3); match x { diff --git a/src/test/run-pass/pat-tuple-2.rs b/src/test/run-pass/pat-tuple-2.rs index ee60d1c01cf84..5e71b56f58269 100644 --- a/src/test/run-pass/pat-tuple-2.rs +++ b/src/test/run-pass/pat-tuple-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn tuple() { let x = (1,); match x { diff --git a/src/test/run-pass/pat-tuple-3.rs b/src/test/run-pass/pat-tuple-3.rs index 7a46c1deb59bf..a9917322e73fd 100644 --- a/src/test/run-pass/pat-tuple-3.rs +++ b/src/test/run-pass/pat-tuple-3.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn tuple() { let x = (1, 2, 3); let branch = match x { diff --git a/src/test/run-pass/pat-tuple-4.rs b/src/test/run-pass/pat-tuple-4.rs index 1d75e1e9d14dd..fd9bee051eeca 100644 --- a/src/test/run-pass/pat-tuple-4.rs +++ b/src/test/run-pass/pat-tuple-4.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn tuple() { let x = (1, 2, 3); match x { diff --git a/src/test/run-pass/pat-tuple-5.rs b/src/test/run-pass/pat-tuple-5.rs index 1192932f13daf..d5ac095767ea4 100644 --- a/src/test/run-pass/pat-tuple-5.rs +++ b/src/test/run-pass/pat-tuple-5.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn tuple() { struct S; struct Z; diff --git a/src/test/run-pass/pat-tuple-6.rs b/src/test/run-pass/pat-tuple-6.rs index 9d3cd65b455cf..23a27c2b313ce 100644 --- a/src/test/run-pass/pat-tuple-6.rs +++ b/src/test/run-pass/pat-tuple-6.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn tuple() { let x = (1, 2, 3, 4, 5); match x { diff --git a/src/test/run-pass/pat-tuple-7.rs b/src/test/run-pass/pat-tuple-7.rs index 6d51df63e158a..52fbe53e4d1fe 100644 --- a/src/test/run-pass/pat-tuple-7.rs +++ b/src/test/run-pass/pat-tuple-7.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(pattern_parentheses)] fn main() { diff --git a/src/test/run-pass/path.rs b/src/test/run-pass/path.rs index fddc2744eb174..7a9b04c070465 100644 --- a/src/test/run-pass/path.rs +++ b/src/test/run-pass/path.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - // pretty-expanded FIXME #23616 mod foo { diff --git a/src/test/run-pass/paths-containing-nul.rs b/src/test/run-pass/paths-containing-nul.rs index e0fe1ea72df16..0e7198d56447d 100644 --- a/src/test/run-pass/paths-containing-nul.rs +++ b/src/test/run-pass/paths-containing-nul.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no files or I/O // ignore-wasm32-bare no files or I/O diff --git a/src/test/run-pass/paths-in-macro-invocations.rs b/src/test/run-pass/paths-in-macro-invocations.rs index e860f7021e536..8e95089fa9ea4 100644 --- a/src/test/run-pass/paths-in-macro-invocations.rs +++ b/src/test/run-pass/paths-in-macro-invocations.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:two_macros.rs extern crate two_macros; diff --git a/src/test/run-pass/pattern-bound-var-in-for-each.rs b/src/test/run-pass/pattern-bound-var-in-for-each.rs index 778f355b24b89..8ccb9e22cd3d9 100644 --- a/src/test/run-pass/pattern-bound-var-in-for-each.rs +++ b/src/test/run-pass/pattern-bound-var-in-for-each.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that codegen_path checks whether a // pattern-bound var is an upvar (when codegenning // the for-each body) diff --git a/src/test/run-pass/pattern-in-closure.rs b/src/test/run-pass/pattern-in-closure.rs index 909ed985d7f48..4f9abdc2980a8 100644 --- a/src/test/run-pass/pattern-in-closure.rs +++ b/src/test/run-pass/pattern-in-closure.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { x: isize, y: isize diff --git a/src/test/run-pass/print-stdout-eprint-stderr.rs b/src/test/run-pass/print-stdout-eprint-stderr.rs index 9e36089cc23df..9c47a734d7b84 100644 --- a/src/test/run-pass/print-stdout-eprint-stderr.rs +++ b/src/test/run-pass/print-stdout-eprint-stderr.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi spawning processes is not supported // ignore-emscripten spawning processes is not supported diff --git a/src/test/run-pass/priv-impl-prim-ty.rs b/src/test/run-pass/priv-impl-prim-ty.rs index aa2db260dd4ae..e8446eb7d4a8a 100644 --- a/src/test/run-pass/priv-impl-prim-ty.rs +++ b/src/test/run-pass/priv-impl-prim-ty.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:priv-impl-prim-ty.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/privacy-ns.rs b/src/test/run-pass/privacy-ns.rs index 8082816c43611..397a2c6a7b113 100644 --- a/src/test/run-pass/privacy-ns.rs +++ b/src/test/run-pass/privacy-ns.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // Check we do the correct privacy checks when we import a name and there is an // item with that name in both the value and type namespaces. diff --git a/src/test/run-pass/privacy-reexport.rs b/src/test/run-pass/privacy-reexport.rs index 15c977afe2a6c..8b82f04b4d436 100644 --- a/src/test/run-pass/privacy-reexport.rs +++ b/src/test/run-pass/privacy-reexport.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:privacy_reexport.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/privacy1.rs b/src/test/run-pass/privacy1.rs index 329c4aaa873a9..0e08816b1053f 100644 --- a/src/test/run-pass/privacy1.rs +++ b/src/test/run-pass/privacy1.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub mod test2 { diff --git a/src/test/run-pass/private-class-field.rs b/src/test/run-pass/private-class-field.rs index 8c92a05ba2a67..a9106a8d47248 100644 --- a/src/test/run-pass/private-class-field.rs +++ b/src/test/run-pass/private-class-field.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct cat { meows : usize, diff --git a/src/test/run-pass/private-method.rs b/src/test/run-pass/private-method.rs index 0d6e6010c56c8..67bf8341fba8b 100644 --- a/src/test/run-pass/private-method.rs +++ b/src/test/run-pass/private-method.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct cat { diff --git a/src/test/run-pass/process-envs.rs b/src/test/run-pass/process-envs.rs index e399bc20d52ae..7334e400e4389 100644 --- a/src/test/run-pass/process-envs.rs +++ b/src/test/run-pass/process-envs.rs @@ -1,12 +1,6 @@ // Copyright 2014, 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/process-exit.rs b/src/test/run-pass/process-exit.rs index 44ef4a9df71af..e8d3ad1fc9326 100644 --- a/src/test/run-pass/process-exit.rs +++ b/src/test/run-pass/process-exit.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/process-remove-from-env.rs b/src/test/run-pass/process-remove-from-env.rs index 9011ffcf45ad0..0b1ee9713b60d 100644 --- a/src/test/run-pass/process-remove-from-env.rs +++ b/src/test/run-pass/process-remove-from-env.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/process-sigpipe.rs b/src/test/run-pass/process-sigpipe.rs index a436e48ea530e..4eec2f017a98a 100644 --- a/src/test/run-pass/process-sigpipe.rs +++ b/src/test/run-pass/process-sigpipe.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-android since the dynamic linker sets a SIGPIPE handler (to do // a crash report) so inheritance is moot on the entire platform diff --git a/src/test/run-pass/process-spawn-nonexistent.rs b/src/test/run-pass/process-spawn-nonexistent.rs index 9219cd625f30f..19b4c00db7a97 100644 --- a/src/test/run-pass/process-spawn-nonexistent.rs +++ b/src/test/run-pass/process-spawn-nonexistent.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/process-spawn-with-unicode-params.rs b/src/test/run-pass/process-spawn-with-unicode-params.rs index 1e22f17986c35..a1dfc9b27aeb5 100644 --- a/src/test/run-pass/process-spawn-with-unicode-params.rs +++ b/src/test/run-pass/process-spawn-with-unicode-params.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic // The test copies itself into a subdirectory with a non-ASCII name and then diff --git a/src/test/run-pass/process-status-inherits-stdin.rs b/src/test/run-pass/process-status-inherits-stdin.rs index fdf5cf5ad9281..e840e7616274e 100644 --- a/src/test/run-pass/process-status-inherits-stdin.rs +++ b/src/test/run-pass/process-status-inherits-stdin.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/project-cache-issue-31849.rs b/src/test/run-pass/project-cache-issue-31849.rs index d03424b2b2b7a..086883e5cb3cd 100644 --- a/src/test/run-pass/project-cache-issue-31849.rs +++ b/src/test/run-pass/project-cache-issue-31849.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #31849: the problem here was actually a performance // cliff, but I'm adding the test for reference. diff --git a/src/test/run-pass/project-cache-issue-37154.rs b/src/test/run-pass/project-cache-issue-37154.rs index 29dc6984e234a..51e0196686091 100644 --- a/src/test/run-pass/project-cache-issue-37154.rs +++ b/src/test/run-pass/project-cache-issue-37154.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #37154: the problem here was that the cache // results in a false error because it was caching skolemized results // even after those skolemized regions had been popped. diff --git a/src/test/run-pass/project-defer-unification.rs b/src/test/run-pass/project-defer-unification.rs index 9a6ea2272fea7..a0e45b9c91405 100644 --- a/src/test/run-pass/project-defer-unification.rs +++ b/src/test/run-pass/project-defer-unification.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // A regression test extracted from image-0.3.11. The point of // failure was in `index_colors` below. diff --git a/src/test/run-pass/promoted_overflow_opt.rs b/src/test/run-pass/promoted_overflow_opt.rs index 6b2f1c6d3c8a2..2a8b9201fa2b0 100644 --- a/src/test/run-pass/promoted_overflow_opt.rs +++ b/src/test/run-pass/promoted_overflow_opt.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(const_err)] // compile-flags: -O diff --git a/src/test/run-pass/ptr-coercion.rs b/src/test/run-pass/ptr-coercion.rs index ac1b6aebec5b1..a72a758a62426 100644 --- a/src/test/run-pass/ptr-coercion.rs +++ b/src/test/run-pass/ptr-coercion.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test coercions between pointers which don't do anything fancy like unsizing. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/pub-extern-privacy.rs b/src/test/run-pass/pub-extern-privacy.rs index 1ef804fe8feea..ceaab13049f3c 100644 --- a/src/test/run-pass/pub-extern-privacy.rs +++ b/src/test/run-pass/pub-extern-privacy.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare no libc to test ffi with // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/pub-item-inside-macro.rs b/src/test/run-pass/pub-item-inside-macro.rs index d082ca624e098..e1942057614a6 100644 --- a/src/test/run-pass/pub-item-inside-macro.rs +++ b/src/test/run-pass/pub-item-inside-macro.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #14660 // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/pub-method-inside-macro.rs b/src/test/run-pass/pub-method-inside-macro.rs index 2e2e261b6d021..2d153ccd0197e 100644 --- a/src/test/run-pass/pub-method-inside-macro.rs +++ b/src/test/run-pass/pub-method-inside-macro.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #17436 // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/pub-use-xcrate.rs b/src/test/run-pass/pub-use-xcrate.rs index 3318c0380be74..15a1c0debd3d0 100644 --- a/src/test/run-pass/pub-use-xcrate.rs +++ b/src/test/run-pass/pub-use-xcrate.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:pub_use_xcrate1.rs // aux-build:pub_use_xcrate2.rs diff --git a/src/test/run-pass/pub_use_mods_xcrate_exe.rs b/src/test/run-pass/pub_use_mods_xcrate_exe.rs index 9373b7945d55a..711a2dde09c25 100644 --- a/src/test/run-pass/pub_use_mods_xcrate_exe.rs +++ b/src/test/run-pass/pub_use_mods_xcrate_exe.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:pub_use_mods_xcrate.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/pure-sum.rs b/src/test/run-pass/pure-sum.rs index 3313196a5eced..84a2d6c6d2f5b 100644 --- a/src/test/run-pass/pure-sum.rs +++ b/src/test/run-pass/pure-sum.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that functions can modify local state. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/purity-infer.rs b/src/test/run-pass/purity-infer.rs index c5588a29cb526..3b2b41860194d 100644 --- a/src/test/run-pass/purity-infer.rs +++ b/src/test/run-pass/purity-infer.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn something(f: F) where F: FnOnce() { f(); } pub fn main() { something(|| println!("hi!") ); diff --git a/src/test/run-pass/range-inclusive-pattern-precedence.rs b/src/test/run-pass/range-inclusive-pattern-precedence.rs index 5e491d48bcf46..08f8f77c9ac0b 100644 --- a/src/test/run-pass/range-inclusive-pattern-precedence.rs +++ b/src/test/run-pass/range-inclusive-pattern-precedence.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_patterns, pattern_parentheses)] const VALUE: usize = 21; diff --git a/src/test/run-pass/range-type-infer.rs b/src/test/run-pass/range-type-infer.rs index b6d4d09d69727..cff156d1e9c50 100644 --- a/src/test/run-pass/range-type-infer.rs +++ b/src/test/run-pass/range-type-infer.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Make sure the type inference for the new range expression work as // good as the old one. Check out issue #21672, #21595 and #21649 for // more details. diff --git a/src/test/run-pass/range.rs b/src/test/run-pass/range.rs index 4c249bbe1f73e..762ca5daa98bd 100644 --- a/src/test/run-pass/range.rs +++ b/src/test/run-pass/range.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test range syntax. diff --git a/src/test/run-pass/range_inclusive.rs b/src/test/run-pass/range_inclusive.rs index 2bedfc133b581..31c3c3940344c 100644 --- a/src/test/run-pass/range_inclusive.rs +++ b/src/test/run-pass/range_inclusive.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test inclusive range syntax. #![feature(range_is_empty)] diff --git a/src/test/run-pass/range_inclusive_gate.rs b/src/test/run-pass/range_inclusive_gate.rs index 6c2731fa5a9bb..c09d75cd6d20a 100644 --- a/src/test/run-pass/range_inclusive_gate.rs +++ b/src/test/run-pass/range_inclusive_gate.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that you only need the syntax gate if you don't mention the structs. // (Obsoleted since both features are stabilized) diff --git a/src/test/run-pass/ranges-precedence.rs b/src/test/run-pass/ranges-precedence.rs index eb404751ee6f9..86862993d4da3 100644 --- a/src/test/run-pass/ranges-precedence.rs +++ b/src/test/run-pass/ranges-precedence.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the precedence of ranges is correct diff --git a/src/test/run-pass/raw-fat-ptr.rs b/src/test/run-pass/raw-fat-ptr.rs index b4572f4577133..df69db1cc9a25 100644 --- a/src/test/run-pass/raw-fat-ptr.rs +++ b/src/test/run-pass/raw-fat-ptr.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // check raw fat pointer ops use std::mem; diff --git a/src/test/run-pass/raw-str.rs b/src/test/run-pass/raw-str.rs index 9ee824d418585..8861ec3f85a11 100644 Binary files a/src/test/run-pass/raw-str.rs and b/src/test/run-pass/raw-str.rs differ diff --git a/src/test/run-pass/rcvr-borrowed-to-region.rs b/src/test/run-pass/rcvr-borrowed-to-region.rs index bc869113fe900..1506410e7bf97 100644 --- a/src/test/run-pass/rcvr-borrowed-to-region.rs +++ b/src/test/run-pass/rcvr-borrowed-to-region.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] trait get { diff --git a/src/test/run-pass/rcvr-borrowed-to-slice.rs b/src/test/run-pass/rcvr-borrowed-to-slice.rs index efa73ad92ce83..9ae7ac728292f 100644 --- a/src/test/run-pass/rcvr-borrowed-to-slice.rs +++ b/src/test/run-pass/rcvr-borrowed-to-slice.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait sum { fn sum_(self) -> isize; } diff --git a/src/test/run-pass/reachable-unnameable-items.rs b/src/test/run-pass/reachable-unnameable-items.rs index d087be6d10cfc..a745404740630 100644 --- a/src/test/run-pass/reachable-unnameable-items.rs +++ b/src/test/run-pass/reachable-unnameable-items.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare compiled with panic=abort by default // aux-build:reachable-unnameable-items.rs diff --git a/src/test/run-pass/reachable-unnameable-type-alias.rs b/src/test/run-pass/reachable-unnameable-type-alias.rs index 5d0c6df3d582f..a632ce186e1dc 100644 --- a/src/test/run-pass/reachable-unnameable-type-alias.rs +++ b/src/test/run-pass/reachable-unnameable-type-alias.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(staged_api)] #![stable(feature = "a", since = "b")] diff --git a/src/test/run-pass/readalias.rs b/src/test/run-pass/readalias.rs index 56b15c243618f..e9f8431dfe82b 100644 --- a/src/test/run-pass/readalias.rs +++ b/src/test/run-pass/readalias.rs @@ -1,17 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - - struct Point {x: isize, y: isize, z: isize} fn f(p: Point) { assert_eq!(p.z, 12); } diff --git a/src/test/run-pass/realloc-16687.rs b/src/test/run-pass/realloc-16687.rs index c4cae1e1d611d..e283d5b6de1db 100644 --- a/src/test/run-pass/realloc-16687.rs +++ b/src/test/run-pass/realloc-16687.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // alloc::heap::reallocate test. // // Ideally this would be revised to use no_std, but for now it serves diff --git a/src/test/run-pass/rec-align-u32.rs b/src/test/run-pass/rec-align-u32.rs index 4a115c737da3a..f8984d8a2913d 100644 --- a/src/test/run-pass/rec-align-u32.rs +++ b/src/test/run-pass/rec-align-u32.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #2303 #![feature(intrinsics)] diff --git a/src/test/run-pass/rec-align-u64.rs b/src/test/run-pass/rec-align-u64.rs index 85c1b2adb79ec..c943b23df35d0 100644 --- a/src/test/run-pass/rec-align-u64.rs +++ b/src/test/run-pass/rec-align-u64.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare seems unimportant to test // Issue #2303 diff --git a/src/test/run-pass/rec-auto.rs b/src/test/run-pass/rec-auto.rs index 18431bc53794c..d4a26b04b3f17 100644 --- a/src/test/run-pass/rec-auto.rs +++ b/src/test/run-pass/rec-auto.rs @@ -1,17 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - - // Issue #50. struct X { foo: String, bar: String } diff --git a/src/test/run-pass/rec-extend.rs b/src/test/run-pass/rec-extend.rs index ffef77a4b8de4..4fa1b3a83fd76 100644 --- a/src/test/run-pass/rec-extend.rs +++ b/src/test/run-pass/rec-extend.rs @@ -1,17 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - - struct Point {x: isize, y: isize} pub fn main() { diff --git a/src/test/run-pass/rec-tup.rs b/src/test/run-pass/rec-tup.rs index 810888b0d8e78..4fc62b9732204 100644 --- a/src/test/run-pass/rec-tup.rs +++ b/src/test/run-pass/rec-tup.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #[derive(Copy, Clone)] struct Point {x: isize, y: isize} diff --git a/src/test/run-pass/rec.rs b/src/test/run-pass/rec.rs index b47bda0931fed..09c51d7c2548b 100644 --- a/src/test/run-pass/rec.rs +++ b/src/test/run-pass/rec.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #[derive(Copy, Clone)] struct Rect {x: isize, y: isize, w: isize, h: isize} diff --git a/src/test/run-pass/record-pat.rs b/src/test/run-pass/record-pat.rs index 99bec7ab7d1fb..459a5120e8265 100644 --- a/src/test/run-pass/record-pat.rs +++ b/src/test/run-pass/record-pat.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum t1 { a(isize), b(usize), } struct T2 {x: t1, y: isize} enum t3 { c(T2, usize), } diff --git a/src/test/run-pass/reexport-should-still-link.rs b/src/test/run-pass/reexport-should-still-link.rs index 1243d72af5efb..733f8f9c1f37d 100644 --- a/src/test/run-pass/reexport-should-still-link.rs +++ b/src/test/run-pass/reexport-should-still-link.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:reexport-should-still-link.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/reexport-star.rs b/src/test/run-pass/reexport-star.rs index a8d052f407fcc..ae48f97a9ddb5 100644 --- a/src/test/run-pass/reexport-star.rs +++ b/src/test/run-pass/reexport-star.rs @@ -1,14 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // pretty-expanded FIXME #23616 mod a { diff --git a/src/test/run-pass/reexport-test-harness-main.rs b/src/test/run-pass/reexport-test-harness-main.rs index 88e3e6ba4acd3..5171c1c17393e 100644 --- a/src/test/run-pass/reexport-test-harness-main.rs +++ b/src/test/run-pass/reexport-test-harness-main.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:--test #![reexport_test_harness_main = "test_main"] diff --git a/src/test/run-pass/reexported-static-methods-cross-crate.rs b/src/test/run-pass/reexported-static-methods-cross-crate.rs index 4d10503838446..d8abf92d8e520 100644 --- a/src/test/run-pass/reexported-static-methods-cross-crate.rs +++ b/src/test/run-pass/reexported-static-methods-cross-crate.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:reexported_static_methods.rs extern crate reexported_static_methods; diff --git a/src/test/run-pass/refer-to-other-statics-by-value.rs b/src/test/run-pass/refer-to-other-statics-by-value.rs index 94c98ff95aba2..e08700c57c0e3 100644 --- a/src/test/run-pass/refer-to-other-statics-by-value.rs +++ b/src/test/run-pass/refer-to-other-statics-by-value.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - static A: usize = 42; static B: usize = A; diff --git a/src/test/run-pass/regions-addr-of-interior-of-unique-box.rs b/src/test/run-pass/regions-addr-of-interior-of-unique-box.rs index 4839067e53d1f..009f8fb89e28a 100644 --- a/src/test/run-pass/regions-addr-of-interior-of-unique-box.rs +++ b/src/test/run-pass/regions-addr-of-interior-of-unique-box.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // pretty-expanded FIXME #23616 struct Point { diff --git a/src/test/run-pass/regions-addr-of-ret.rs b/src/test/run-pass/regions-addr-of-ret.rs index 3baf2fa2de517..926b24ff21fb0 100644 --- a/src/test/run-pass/regions-addr-of-ret.rs +++ b/src/test/run-pass/regions-addr-of-ret.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn f(x: &isize) -> &isize { return &*x; } diff --git a/src/test/run-pass/regions-assoc-type-region-bound.rs b/src/test/run-pass/regions-assoc-type-region-bound.rs index b51d62f490f3c..a28397896d375 100644 --- a/src/test/run-pass/regions-assoc-type-region-bound.rs +++ b/src/test/run-pass/regions-assoc-type-region-bound.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the compiler considers the 'a bound declared in the // trait. Issue #20890. diff --git a/src/test/run-pass/regions-assoc-type-static-bound.rs b/src/test/run-pass/regions-assoc-type-static-bound.rs index 344f707aefc01..f6cc3febc8e99 100644 --- a/src/test/run-pass/regions-assoc-type-static-bound.rs +++ b/src/test/run-pass/regions-assoc-type-static-bound.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the compiler considers the 'static bound declared in the // trait. Issue #20890. diff --git a/src/test/run-pass/regions-borrow-at.rs b/src/test/run-pass/regions-borrow-at.rs index abebb670e65d2..9332ade8171a6 100644 --- a/src/test/run-pass/regions-borrow-at.rs +++ b/src/test/run-pass/regions-borrow-at.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn foo(x: &usize) -> usize { diff --git a/src/test/run-pass/regions-borrow-evec-fixed.rs b/src/test/run-pass/regions-borrow-evec-fixed.rs index 6d1f2930abf32..234d6caf0606a 100644 --- a/src/test/run-pass/regions-borrow-evec-fixed.rs +++ b/src/test/run-pass/regions-borrow-evec-fixed.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn foo(x: &[isize]) -> isize { x[0] } diff --git a/src/test/run-pass/regions-borrow-evec-uniq.rs b/src/test/run-pass/regions-borrow-evec-uniq.rs index e61a8d147757c..30beb4eb4466e 100644 --- a/src/test/run-pass/regions-borrow-evec-uniq.rs +++ b/src/test/run-pass/regions-borrow-evec-uniq.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - fn foo(x: &[isize]) -> isize { x[0] } diff --git a/src/test/run-pass/regions-borrow-uniq.rs b/src/test/run-pass/regions-borrow-uniq.rs index 48b09b3385118..003839722aaaf 100644 --- a/src/test/run-pass/regions-borrow-uniq.rs +++ b/src/test/run-pass/regions-borrow-uniq.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn foo(x: &usize) -> usize { diff --git a/src/test/run-pass/regions-bot.rs b/src/test/run-pass/regions-bot.rs index 4347cbe2dc9c2..4cc0588f732b0 100644 --- a/src/test/run-pass/regions-bot.rs +++ b/src/test/run-pass/regions-bot.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // A very limited test of the "bottom" region diff --git a/src/test/run-pass/regions-bound-lists-feature-gate-2.rs b/src/test/run-pass/regions-bound-lists-feature-gate-2.rs index 47d2fe363d369..093f4fb0446a9 100644 --- a/src/test/run-pass/regions-bound-lists-feature-gate-2.rs +++ b/src/test/run-pass/regions-bound-lists-feature-gate-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(issue_5723_bootstrap)] trait Foo { diff --git a/src/test/run-pass/regions-bound-lists-feature-gate.rs b/src/test/run-pass/regions-bound-lists-feature-gate.rs index 72db92aa93ce0..f30269f3c224b 100644 --- a/src/test/run-pass/regions-bound-lists-feature-gate.rs +++ b/src/test/run-pass/regions-bound-lists-feature-gate.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(issue_5723_bootstrap)] trait Foo { diff --git a/src/test/run-pass/regions-close-over-type-parameter-successfully.rs b/src/test/run-pass/regions-close-over-type-parameter-successfully.rs index 4a24e201b3538..e62f0fc24ee0f 100644 --- a/src/test/run-pass/regions-close-over-type-parameter-successfully.rs +++ b/src/test/run-pass/regions-close-over-type-parameter-successfully.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // A test where we (successfully) close over a reference into // an object. diff --git a/src/test/run-pass/regions-copy-closure.rs b/src/test/run-pass/regions-copy-closure.rs index 371823ece2945..186adca8cfab1 100644 --- a/src/test/run-pass/regions-copy-closure.rs +++ b/src/test/run-pass/regions-copy-closure.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct closure_box<'a> { cl: Box, } diff --git a/src/test/run-pass/regions-creating-enums2.rs b/src/test/run-pass/regions-creating-enums2.rs index 66d28f5afa17a..1b4e7bb7c5f5c 100644 --- a/src/test/run-pass/regions-creating-enums2.rs +++ b/src/test/run-pass/regions-creating-enums2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 enum ast<'a> { diff --git a/src/test/run-pass/regions-creating-enums5.rs b/src/test/run-pass/regions-creating-enums5.rs index 4bd12863e2a3d..76b1c0fa8fb2c 100644 --- a/src/test/run-pass/regions-creating-enums5.rs +++ b/src/test/run-pass/regions-creating-enums5.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 enum ast<'a> { diff --git a/src/test/run-pass/regions-debruijn-of-object.rs b/src/test/run-pass/regions-debruijn-of-object.rs index 9f2d27f024bb0..77322953ff06c 100644 --- a/src/test/run-pass/regions-debruijn-of-object.rs +++ b/src/test/run-pass/regions-debruijn-of-object.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct ctxt<'tcx> { diff --git a/src/test/run-pass/regions-dependent-addr-of.rs b/src/test/run-pass/regions-dependent-addr-of.rs index c8b39bbe74994..240fc9cc0f530 100644 --- a/src/test/run-pass/regions-dependent-addr-of.rs +++ b/src/test/run-pass/regions-dependent-addr-of.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test lifetimes are linked properly when we create dependent region pointers. // Issue #3148. diff --git a/src/test/run-pass/regions-dependent-autofn.rs b/src/test/run-pass/regions-dependent-autofn.rs index ef05fc595df14..a39a7069de0e3 100644 --- a/src/test/run-pass/regions-dependent-autofn.rs +++ b/src/test/run-pass/regions-dependent-autofn.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test lifetimes are linked properly when we autoslice a vector. // Issue #3148. diff --git a/src/test/run-pass/regions-dependent-autoslice.rs b/src/test/run-pass/regions-dependent-autoslice.rs index cd140f7aa599b..69e2af530e593 100644 --- a/src/test/run-pass/regions-dependent-autoslice.rs +++ b/src/test/run-pass/regions-dependent-autoslice.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test lifetimes are linked properly when we autoslice a vector. // Issue #3148. diff --git a/src/test/run-pass/regions-dependent-let-ref.rs b/src/test/run-pass/regions-dependent-let-ref.rs index 1b869e462b0ff..2a11651334d2f 100644 --- a/src/test/run-pass/regions-dependent-let-ref.rs +++ b/src/test/run-pass/regions-dependent-let-ref.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test lifetimes are linked properly when we take reference // to interior. diff --git a/src/test/run-pass/regions-early-bound-lifetime-in-assoc-fn.rs b/src/test/run-pass/regions-early-bound-lifetime-in-assoc-fn.rs index 0ffbc432aaeb5..890c7ea9a522b 100644 --- a/src/test/run-pass/regions-early-bound-lifetime-in-assoc-fn.rs +++ b/src/test/run-pass/regions-early-bound-lifetime-in-assoc-fn.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are able to compile calls to associated fns like // `decode()` where the bound on the `Self` parameter references a // lifetime parameter of the trait. This example indicates why trait diff --git a/src/test/run-pass/regions-early-bound-trait-param.rs b/src/test/run-pass/regions-early-bound-trait-param.rs index 75c209a092070..2531650c70a64 100644 --- a/src/test/run-pass/regions-early-bound-trait-param.rs +++ b/src/test/run-pass/regions-early-bound-trait-param.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that you can use an early-bound lifetime parameter as // on of the generic parameters in a trait. diff --git a/src/test/run-pass/regions-early-bound-used-in-bound-method.rs b/src/test/run-pass/regions-early-bound-used-in-bound-method.rs index c7bc8dc0a515b..6352387e6f413 100644 --- a/src/test/run-pass/regions-early-bound-used-in-bound-method.rs +++ b/src/test/run-pass/regions-early-bound-used-in-bound-method.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that you can use a fn lifetime parameter as part of // the value for a type parameter in a bound. diff --git a/src/test/run-pass/regions-early-bound-used-in-bound.rs b/src/test/run-pass/regions-early-bound-used-in-bound.rs index 3c8c78aa1169a..c950664db0c0a 100644 --- a/src/test/run-pass/regions-early-bound-used-in-bound.rs +++ b/src/test/run-pass/regions-early-bound-used-in-bound.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that you can use a fn lifetime parameter as part of // the value for a type parameter in a bound. diff --git a/src/test/run-pass/regions-early-bound-used-in-type-param.rs b/src/test/run-pass/regions-early-bound-used-in-type-param.rs index 8d145fad004a6..4c4f807a01374 100644 --- a/src/test/run-pass/regions-early-bound-used-in-type-param.rs +++ b/src/test/run-pass/regions-early-bound-used-in-type-param.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that you can use a fn lifetime parameter as part of // the value for a type parameter in a bound. diff --git a/src/test/run-pass/regions-escape-into-other-fn.rs b/src/test/run-pass/regions-escape-into-other-fn.rs index 7cb719cccced8..72d8bc0cd4059 100644 --- a/src/test/run-pass/regions-escape-into-other-fn.rs +++ b/src/test/run-pass/regions-escape-into-other-fn.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn foo(x: &usize) -> &usize { x } diff --git a/src/test/run-pass/regions-expl-self.rs b/src/test/run-pass/regions-expl-self.rs index 7ad3c3f4e1713..24e88c91d8157 100644 --- a/src/test/run-pass/regions-expl-self.rs +++ b/src/test/run-pass/regions-expl-self.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that you can insert an explicit lifetime in explicit self. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/regions-fn-subtyping-2.rs b/src/test/run-pass/regions-fn-subtyping-2.rs index 7f2fc11cb8e0e..9056e6d98570b 100644 --- a/src/test/run-pass/regions-fn-subtyping-2.rs +++ b/src/test/run-pass/regions-fn-subtyping-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #2263. // Here, `f` is a function that takes a pointer `x` and a function diff --git a/src/test/run-pass/regions-fn-subtyping.rs b/src/test/run-pass/regions-fn-subtyping.rs index f762b4f41ed40..c60c0106ce6a0 100644 --- a/src/test/run-pass/regions-fn-subtyping.rs +++ b/src/test/run-pass/regions-fn-subtyping.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #2263. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/regions-free-region-outlives-static-outlives-free-region.rs b/src/test/run-pass/regions-free-region-outlives-static-outlives-free-region.rs index 09c8d1f23a26d..db0f5a84ae382 100644 --- a/src/test/run-pass/regions-free-region-outlives-static-outlives-free-region.rs +++ b/src/test/run-pass/regions-free-region-outlives-static-outlives-free-region.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we recognize that if you have // // 'a : 'static diff --git a/src/test/run-pass/regions-infer-borrow-scope-addr-of.rs b/src/test/run-pass/regions-infer-borrow-scope-addr-of.rs index 5c80863ce859d..6da7f640a4d72 100644 --- a/src/test/run-pass/regions-infer-borrow-scope-addr-of.rs +++ b/src/test/run-pass/regions-infer-borrow-scope-addr-of.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::mem::swap; pub fn main() { diff --git a/src/test/run-pass/regions-infer-borrow-scope-view.rs b/src/test/run-pass/regions-infer-borrow-scope-view.rs index 262e936826e51..ced94d2efab42 100644 --- a/src/test/run-pass/regions-infer-borrow-scope-view.rs +++ b/src/test/run-pass/regions-infer-borrow-scope-view.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - fn view(x: &[T]) -> &[T] {x} pub fn main() { diff --git a/src/test/run-pass/regions-infer-borrow-scope-within-loop-ok.rs b/src/test/run-pass/regions-infer-borrow-scope-within-loop-ok.rs index a40ba8382fc2b..f3813a4809474 100644 --- a/src/test/run-pass/regions-infer-borrow-scope-within-loop-ok.rs +++ b/src/test/run-pass/regions-infer-borrow-scope-within-loop-ok.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn borrow(x: &T) -> &T {x} diff --git a/src/test/run-pass/regions-infer-borrow-scope.rs b/src/test/run-pass/regions-infer-borrow-scope.rs index 72208272df75a..4e38af13f13cc 100644 --- a/src/test/run-pass/regions-infer-borrow-scope.rs +++ b/src/test/run-pass/regions-infer-borrow-scope.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] struct Point {x: isize, y: isize} diff --git a/src/test/run-pass/regions-infer-call-2.rs b/src/test/run-pass/regions-infer-call-2.rs index b994bc7b85553..3ddc25235f927 100644 --- a/src/test/run-pass/regions-infer-call-2.rs +++ b/src/test/run-pass/regions-infer-call-2.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn takes_two(x: &isize, y: &isize) -> isize { *x + *y } fn with(f: F) -> T where F: FnOnce(&isize) -> T { diff --git a/src/test/run-pass/regions-infer-call.rs b/src/test/run-pass/regions-infer-call.rs index 76b93f2356b06..16b2d832e3c56 100644 --- a/src/test/run-pass/regions-infer-call.rs +++ b/src/test/run-pass/regions-infer-call.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn takes_two(x: &isize, y: &isize) -> isize { *x + *y } fn has_two<'a,'b>(x: &'a isize, y: &'b isize) -> isize { diff --git a/src/test/run-pass/regions-infer-contravariance-due-to-ret.rs b/src/test/run-pass/regions-infer-contravariance-due-to-ret.rs index 3c6bc13399960..f80653309f706 100644 --- a/src/test/run-pass/regions-infer-contravariance-due-to-ret.rs +++ b/src/test/run-pass/regions-infer-contravariance-due-to-ret.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct boxed_int<'a> { f: &'a isize, } diff --git a/src/test/run-pass/regions-infer-reborrow-ref-mut-recurse.rs b/src/test/run-pass/regions-infer-reborrow-ref-mut-recurse.rs index 2349b6c3bc146..1f46c6cda1e53 100644 --- a/src/test/run-pass/regions-infer-reborrow-ref-mut-recurse.rs +++ b/src/test/run-pass/regions-infer-reborrow-ref-mut-recurse.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test an edge case in region inference: the lifetime of the borrow // of `*x` must be extended to at least 'a. diff --git a/src/test/run-pass/regions-infer-region-in-fn-but-not-type.rs b/src/test/run-pass/regions-infer-region-in-fn-but-not-type.rs index a8418f967fdb3..1214d658785dd 100644 --- a/src/test/run-pass/regions-infer-region-in-fn-but-not-type.rs +++ b/src/test/run-pass/regions-infer-region-in-fn-but-not-type.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // check that the &isize here does not cause us to think that `foo` // contains region pointers // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/regions-infer-static-from-proc.rs b/src/test/run-pass/regions-infer-static-from-proc.rs index 403dfbf655f3b..6970c780f6c59 100644 --- a/src/test/run-pass/regions-infer-static-from-proc.rs +++ b/src/test/run-pass/regions-infer-static-from-proc.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that the 'static bound on a proc influences lifetimes of // region variables contained within (otherwise, region inference will // give `x` a very short lifetime). diff --git a/src/test/run-pass/regions-issue-21422.rs b/src/test/run-pass/regions-issue-21422.rs index ecc170a1462aa..fec267568f9dd 100644 --- a/src/test/run-pass/regions-issue-21422.rs +++ b/src/test/run-pass/regions-issue-21422.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #21422, which was related to failing to // add inference constraints that the operands of a binary operator // should outlive the binary operation itself. diff --git a/src/test/run-pass/regions-issue-22246.rs b/src/test/run-pass/regions-issue-22246.rs index b6815d929678a..5ae45e9dfa844 100644 --- a/src/test/run-pass/regions-issue-22246.rs +++ b/src/test/run-pass/regions-issue-22246.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #22246 -- we should be able to deduce // that `&'a B::Owned` implies that `B::Owned : 'a`. diff --git a/src/test/run-pass/regions-lifetime-nonfree-late-bound.rs b/src/test/run-pass/regions-lifetime-nonfree-late-bound.rs index 2a20cd2b773c3..ba2b7f6dda746 100644 --- a/src/test/run-pass/regions-lifetime-nonfree-late-bound.rs +++ b/src/test/run-pass/regions-lifetime-nonfree-late-bound.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This is a regression test for the ICE from issue #10846. // // The original issue causing the ICE: the LUB-computations during diff --git a/src/test/run-pass/regions-lifetime-static-items-enclosing-scopes.rs b/src/test/run-pass/regions-lifetime-static-items-enclosing-scopes.rs index df034df73624d..ef151fe561c0b 100644 --- a/src/test/run-pass/regions-lifetime-static-items-enclosing-scopes.rs +++ b/src/test/run-pass/regions-lifetime-static-items-enclosing-scopes.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test verifies that temporary lifetime is correctly computed // for static objects in enclosing scopes. diff --git a/src/test/run-pass/regions-link-fn-args.rs b/src/test/run-pass/regions-link-fn-args.rs index 9e8ce6160487e..346b9a1d143b2 100644 --- a/src/test/run-pass/regions-link-fn-args.rs +++ b/src/test/run-pass/regions-link-fn-args.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that region inference correctly links up the regions when a // `ref` borrow occurs inside a fn argument. diff --git a/src/test/run-pass/regions-lub-ref-ref-rc.rs b/src/test/run-pass/regions-lub-ref-ref-rc.rs index ade742863a9da..1cd982c2582ec 100644 --- a/src/test/run-pass/regions-lub-ref-ref-rc.rs +++ b/src/test/run-pass/regions-lub-ref-ref-rc.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test a corner case of LUB coercion. In this case, one arm of the // match requires a deref coercion and the other doesn't, and there // is an extra `&` on the `rc`. We want to be sure that the lifetime diff --git a/src/test/run-pass/regions-mock-codegen.rs b/src/test/run-pass/regions-mock-codegen.rs index b58e837f3bdcf..30d7464222429 100644 --- a/src/test/run-pass/regions-mock-codegen.rs +++ b/src/test/run-pass/regions-mock-codegen.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(allocator_api)] diff --git a/src/test/run-pass/regions-no-bound-in-argument-cleanup.rs b/src/test/run-pass/regions-no-bound-in-argument-cleanup.rs index cdb58d1ba4c01..0fd5df5f489d5 100644 --- a/src/test/run-pass/regions-no-bound-in-argument-cleanup.rs +++ b/src/test/run-pass/regions-no-bound-in-argument-cleanup.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 use std::marker; diff --git a/src/test/run-pass/regions-no-variance-from-fn-generics.rs b/src/test/run-pass/regions-no-variance-from-fn-generics.rs index c339be25f8bb3..4f732e8c8a9c9 100644 --- a/src/test/run-pass/regions-no-variance-from-fn-generics.rs +++ b/src/test/run-pass/regions-no-variance-from-fn-generics.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #12856: a lifetime formal binding introduced by a generic fn // should not upset the variance inference for actual occurrences of // that lifetime in type expressions. diff --git a/src/test/run-pass/regions-nullary-variant.rs b/src/test/run-pass/regions-nullary-variant.rs index ae55b97dc932d..937ca307e39a2 100644 --- a/src/test/run-pass/regions-nullary-variant.rs +++ b/src/test/run-pass/regions-nullary-variant.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 enum roption<'a> { diff --git a/src/test/run-pass/regions-params.rs b/src/test/run-pass/regions-params.rs index dbd52bd6b60ed..bcccb8000386c 100644 --- a/src/test/run-pass/regions-params.rs +++ b/src/test/run-pass/regions-params.rs @@ -1,15 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - fn region_identity(x: &usize) -> &usize { x } fn apply(t: T, f: F) -> T where F: FnOnce(T) -> T { f(t) } diff --git a/src/test/run-pass/regions-reassign-let-bound-pointer.rs b/src/test/run-pass/regions-reassign-let-bound-pointer.rs index b29cc8f90368a..6415d53bdd5f4 100644 --- a/src/test/run-pass/regions-reassign-let-bound-pointer.rs +++ b/src/test/run-pass/regions-reassign-let-bound-pointer.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that the type checker permits us to reassign `z` which // started out with a longer lifetime and was reassigned to a shorter // one (it should infer to be the intersection). diff --git a/src/test/run-pass/regions-reassign-match-bound-pointer.rs b/src/test/run-pass/regions-reassign-match-bound-pointer.rs index 58d4f556a79cb..2771690e6d5a0 100644 --- a/src/test/run-pass/regions-reassign-match-bound-pointer.rs +++ b/src/test/run-pass/regions-reassign-match-bound-pointer.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that the type checker permits us to reassign `z` which // started out with a longer lifetime and was reassigned to a shorter // one (it should infer to be the intersection). diff --git a/src/test/run-pass/regions-refcell.rs b/src/test/run-pass/regions-refcell.rs index ca6a62c10c26b..54f80861be8be 100644 --- a/src/test/run-pass/regions-refcell.rs +++ b/src/test/run-pass/regions-refcell.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This is a regression test for something that only came up while // attempting to bootstrap librustc with new destructor lifetime // semantics. diff --git a/src/test/run-pass/regions-relate-bound-regions-on-closures-to-inference-variables.rs b/src/test/run-pass/regions-relate-bound-regions-on-closures-to-inference-variables.rs index 3322fc36fd3a4..3b83cf00a3dd7 100644 --- a/src/test/run-pass/regions-relate-bound-regions-on-closures-to-inference-variables.rs +++ b/src/test/run-pass/regions-relate-bound-regions-on-closures-to-inference-variables.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that this fairly specialized, but also reasonable, pattern // typechecks. The pattern involves regions bound in closures that // wind up related to inference variables. diff --git a/src/test/run-pass/regions-return-interior-of-option.rs b/src/test/run-pass/regions-return-interior-of-option.rs index fe1c68ff4281a..54f3f30ad18f4 100644 --- a/src/test/run-pass/regions-return-interior-of-option.rs +++ b/src/test/run-pass/regions-return-interior-of-option.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn get(opt: &Option) -> &T { match *opt { Some(ref v) => v, diff --git a/src/test/run-pass/regions-scope-chain-example.rs b/src/test/run-pass/regions-scope-chain-example.rs index 185d5db1f5112..fcc1611999e0c 100644 --- a/src/test/run-pass/regions-scope-chain-example.rs +++ b/src/test/run-pass/regions-scope-chain-example.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This is an example where the older inference algorithm failed. The // specifics of why it failed are somewhat, but not entirely, tailed // to the algorithm. Ultimately the problem is that when computing the diff --git a/src/test/run-pass/regions-self-impls.rs b/src/test/run-pass/regions-self-impls.rs index 26e3fbfab9e61..979273aa9660d 100644 --- a/src/test/run-pass/regions-self-impls.rs +++ b/src/test/run-pass/regions-self-impls.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Clam<'a> { chowder: &'a isize } diff --git a/src/test/run-pass/regions-self-in-enums.rs b/src/test/run-pass/regions-self-in-enums.rs index 9ff20e93a0dfc..754b2def54219 100644 --- a/src/test/run-pass/regions-self-in-enums.rs +++ b/src/test/run-pass/regions-self-in-enums.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum int_wrapper<'a> { int_wrapper_ctor(&'a isize) } diff --git a/src/test/run-pass/regions-simple.rs b/src/test/run-pass/regions-simple.rs index f4fe73131fe3c..d6592f9ee9933 100644 --- a/src/test/run-pass/regions-simple.rs +++ b/src/test/run-pass/regions-simple.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { let mut x: isize = 3; let y: &mut isize = &mut x; diff --git a/src/test/run-pass/regions-static-bound.rs b/src/test/run-pass/regions-static-bound.rs index 1c6411e3b8f11..4d566c87d2a27 100644 --- a/src/test/run-pass/regions-static-bound.rs +++ b/src/test/run-pass/regions-static-bound.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn invariant_id<'a,'b>(t: &'b mut &'static ()) -> &'b mut &'a () where 'a: 'static { t } fn static_id<'a>(t: &'a ()) -> &'static () diff --git a/src/test/run-pass/regions-static-closure.rs b/src/test/run-pass/regions-static-closure.rs index fa1c3b230c6ee..cee8c9b2118bd 100644 --- a/src/test/run-pass/regions-static-closure.rs +++ b/src/test/run-pass/regions-static-closure.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct closure_box<'a> { cl: Box, } diff --git a/src/test/run-pass/regions-trait-object-1.rs b/src/test/run-pass/regions-trait-object-1.rs index 542dc76061fef..680d88ec313a6 100644 --- a/src/test/run-pass/regions-trait-object-1.rs +++ b/src/test/run-pass/regions-trait-object-1.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This is a regression test for something that only came up while // attempting to bootstrap libsyntax; it is adapted from // `syntax::ext::tt::generic_extension`. diff --git a/src/test/run-pass/regions-variance-contravariant-use-contravariant.rs b/src/test/run-pass/regions-variance-contravariant-use-contravariant.rs index 5e5be1c25877d..0e47aa044a6a6 100644 --- a/src/test/run-pass/regions-variance-contravariant-use-contravariant.rs +++ b/src/test/run-pass/regions-variance-contravariant-use-contravariant.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that a type which is contravariant with respect to its region // parameter compiles successfully when used in a contravariant way. // diff --git a/src/test/run-pass/regions-variance-covariant-use-covariant.rs b/src/test/run-pass/regions-variance-covariant-use-covariant.rs index 02562781373a8..77db9d36bf222 100644 --- a/src/test/run-pass/regions-variance-covariant-use-covariant.rs +++ b/src/test/run-pass/regions-variance-covariant-use-covariant.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that a type which is covariant with respect to its region // parameter is successful when used in a covariant way. // diff --git a/src/test/run-pass/repeat-expr-in-static.rs b/src/test/run-pass/repeat-expr-in-static.rs index fc85aa8b51025..928509e1bd652 100644 --- a/src/test/run-pass/repeat-expr-in-static.rs +++ b/src/test/run-pass/repeat-expr-in-static.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - static FOO: [isize; 4] = [32; 4]; static BAR: [isize; 4] = [32, 32, 32, 32]; diff --git a/src/test/run-pass/repeated-vector-syntax.rs b/src/test/run-pass/repeated-vector-syntax.rs index 6d72e9774dca8..36012bba62078 100644 --- a/src/test/run-pass/repeated-vector-syntax.rs +++ b/src/test/run-pass/repeated-vector-syntax.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { let x = [ [true]; 512 ]; let y = [ 0; 1 ]; diff --git a/src/test/run-pass/repr_c_int_align.rs b/src/test/run-pass/repr_c_int_align.rs index af4eb61530290..9bb08cb6c647a 100644 --- a/src/test/run-pass/repr_c_int_align.rs +++ b/src/test/run-pass/repr_c_int_align.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -O #![allow(dead_code)] diff --git a/src/test/run-pass/resolve-issue-2428.rs b/src/test/run-pass/resolve-issue-2428.rs index 6159b24165e44..173c41a2675a5 100644 --- a/src/test/run-pass/resolve-issue-2428.rs +++ b/src/test/run-pass/resolve-issue-2428.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - const foo: isize = 4 >> 1; enum bs { thing = foo } pub fn main() { assert_eq!(bs::thing as isize, foo); } diff --git a/src/test/run-pass/resolve-pseudo-shadowing.rs b/src/test/run-pass/resolve-pseudo-shadowing.rs index 071279ae7d818..bfb1ae87b413d 100644 --- a/src/test/run-pass/resolve-pseudo-shadowing.rs +++ b/src/test/run-pass/resolve-pseudo-shadowing.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // check that type parameters can't "shadow" qualified paths. fn check(_c: Clone) { diff --git a/src/test/run-pass/resource-assign-is-not-copy.rs b/src/test/run-pass/resource-assign-is-not-copy.rs index 4d0c2900a0fad..3ff4558071215 100644 --- a/src/test/run-pass/resource-assign-is-not-copy.rs +++ b/src/test/run-pass/resource-assign-is-not-copy.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cell::Cell; #[derive(Debug)] diff --git a/src/test/run-pass/resource-destruct.rs b/src/test/run-pass/resource-destruct.rs index c92a9ca8480ca..f4adfd2064a37 100644 --- a/src/test/run-pass/resource-destruct.rs +++ b/src/test/run-pass/resource-destruct.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cell::Cell; struct shrinky_pointer<'a> { diff --git a/src/test/run-pass/resource-in-struct.rs b/src/test/run-pass/resource-in-struct.rs index 2914127246a0b..44007e186f402 100644 --- a/src/test/run-pass/resource-in-struct.rs +++ b/src/test/run-pass/resource-in-struct.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Ensures that class dtors run if the object is inside an enum // variant diff --git a/src/test/run-pass/result-opt-conversions.rs b/src/test/run-pass/result-opt-conversions.rs index 0f6da002dda37..a817ac736632e 100644 --- a/src/test/run-pass/result-opt-conversions.rs +++ b/src/test/run-pass/result-opt-conversions.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(transpose_result)] #[derive(Copy, Clone, Debug, PartialEq)] diff --git a/src/test/run-pass/ret-bang.rs b/src/test/run-pass/ret-bang.rs index 7d4d021811227..eb69ee6f886e8 100644 --- a/src/test/run-pass/ret-bang.rs +++ b/src/test/run-pass/ret-bang.rs @@ -1,16 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - fn my_err(s: String) -> ! { println!("{}", s); panic!(); } fn okay(i: usize) -> isize { diff --git a/src/test/run-pass/ret-none.rs b/src/test/run-pass/ret-none.rs index 032a4b662cb1a..e4c6a5a6cffa1 100644 --- a/src/test/run-pass/ret-none.rs +++ b/src/test/run-pass/ret-none.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - // pretty-expanded FIXME #23616 enum option { none, some(T), } diff --git a/src/test/run-pass/return-from-closure.rs b/src/test/run-pass/return-from-closure.rs index 76eddd05382fc..938658fdd4d85 100644 --- a/src/test/run-pass/return-from-closure.rs +++ b/src/test/run-pass/return-from-closure.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // just to make sure that `return` is only returning from the closure, // not the surrounding function. diff --git a/src/test/run-pass/return-nil.rs b/src/test/run-pass/return-nil.rs index fe4244084cb19..f24df197234f8 100644 --- a/src/test/run-pass/return-nil.rs +++ b/src/test/run-pass/return-nil.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - // pretty-expanded FIXME #23616 fn f() { let x: () = (); return x; } diff --git a/src/test/run-pass/rfc-1014-2.rs b/src/test/run-pass/rfc-1014-2.rs index 7cdaf278a08f5..7a0d08e1e7c32 100644 --- a/src/test/run-pass/rfc-1014-2.rs +++ b/src/test/run-pass/rfc-1014-2.rs @@ -1,12 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![feature(libc)] extern crate libc; diff --git a/src/test/run-pass/rfc-1014.rs b/src/test/run-pass/rfc-1014.rs index 61487b6953dbe..40f3481b99b44 100644 --- a/src/test/run-pass/rfc-1014.rs +++ b/src/test/run-pass/rfc-1014.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi stdout does not map to file descriptor 1 by default // ignore-wasm32-bare no libc diff --git a/src/test/run-pass/rfc-1789-as-cell/from-mut.rs b/src/test/run-pass/rfc-1789-as-cell/from-mut.rs index 88f7fbc86df6e..15a25f3401507 100644 --- a/src/test/run-pass/rfc-1789-as-cell/from-mut.rs +++ b/src/test/run-pass/rfc-1789-as-cell/from-mut.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(as_cell)] use std::cell::Cell; diff --git a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs b/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs index 183bb55353052..bf70901ee734a 100644 --- a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs +++ b/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::error::Error; fn main() -> Result<(), Box> { diff --git a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-empty.rs b/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-empty.rs index 046d27a9f0fe5..f328e4d9d04c3 100644 --- a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-empty.rs +++ b/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-empty.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() {} diff --git a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-exitcode.rs b/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-exitcode.rs index 4aa7d8c3a77d2..dd2844f2bb0fc 100644 --- a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-exitcode.rs +++ b/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-exitcode.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(process_exitcode_placeholder)] use std::process::ExitCode; diff --git a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-impl-termination.rs b/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-impl-termination.rs index 5bce3f8045eeb..45b0c5e15d345 100644 --- a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-impl-termination.rs +++ b/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-impl-termination.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(termination_trait_lib)] fn main() -> impl std::process::Termination { } diff --git a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-result-box-error_ok.rs b/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-result-box-error_ok.rs index 33686ed0b8fa2..b5694d97129d7 100644 --- a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-result-box-error_ok.rs +++ b/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-result-box-error_ok.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::io::Error; fn main() -> Result<(), Box> { diff --git a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-result.rs b/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-result.rs index 1c87e31e763e9..5ab0323860b59 100644 --- a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-result.rs +++ b/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-result.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::io::Error; fn main() -> Result<(), Error> { diff --git a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-str.rs b/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-str.rs index 2023ff75564f7..9613f2438a6d8 100644 --- a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-str.rs +++ b/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-str.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() -> Result<(), &'static str> { Ok(()) } diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/box.rs b/src/test/run-pass/rfc-2005-default-binding-mode/box.rs index 95bce1935e525..27e222919a0da 100644 --- a/src/test/run-pass/rfc-2005-default-binding-mode/box.rs +++ b/src/test/run-pass/rfc-2005-default-binding-mode/box.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax, box_patterns)] struct Foo{} diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/constref.rs b/src/test/run-pass/rfc-2005-default-binding-mode/constref.rs index af40ef2b1c5d1..96707835ff76a 100644 --- a/src/test/run-pass/rfc-2005-default-binding-mode/constref.rs +++ b/src/test/run-pass/rfc-2005-default-binding-mode/constref.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const CONST_REF: &[u8; 3] = b"foo"; trait Foo { diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/enum.rs b/src/test/run-pass/rfc-2005-default-binding-mode/enum.rs index 4755fc37ef347..23e4ed26440b3 100644 --- a/src/test/run-pass/rfc-2005-default-binding-mode/enum.rs +++ b/src/test/run-pass/rfc-2005-default-binding-mode/enum.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Wrapper { Wrap(i32), } diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/for.rs b/src/test/run-pass/rfc-2005-default-binding-mode/for.rs index c2467d3f00910..beb9b7ba612c5 100644 --- a/src/test/run-pass/rfc-2005-default-binding-mode/for.rs +++ b/src/test/run-pass/rfc-2005-default-binding-mode/for.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { let mut tups = vec![(0u8, 1u8)]; diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/general.rs b/src/test/run-pass/rfc-2005-default-binding-mode/general.rs index df28046d7d70b..ec1dc8971dd63 100644 --- a/src/test/run-pass/rfc-2005-default-binding-mode/general.rs +++ b/src/test/run-pass/rfc-2005-default-binding-mode/general.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn some_or_wildcard(r: &Option, b: &i32) { let _: &i32 = match r { Some(a) => a, diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/lit.rs b/src/test/run-pass/rfc-2005-default-binding-mode/lit.rs index 004ea42b65b88..0826b12c4618f 100644 --- a/src/test/run-pass/rfc-2005-default-binding-mode/lit.rs +++ b/src/test/run-pass/rfc-2005-default-binding-mode/lit.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn with_u8() { let s = 5u8; let r = match &s { diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/range.rs b/src/test/run-pass/rfc-2005-default-binding-mode/range.rs index f38bd2de86971..8a430f153cd89 100644 --- a/src/test/run-pass/rfc-2005-default-binding-mode/range.rs +++ b/src/test/run-pass/rfc-2005-default-binding-mode/range.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { let i = 5; match &&&&i { diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/ref-region.rs b/src/test/run-pass/rfc-2005-default-binding-mode/ref-region.rs index bc96853fd948a..39836acfecb20 100644 --- a/src/test/run-pass/rfc-2005-default-binding-mode/ref-region.rs +++ b/src/test/run-pass/rfc-2005-default-binding-mode/ref-region.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo<'a, 'b>(x: &'a &'b Option) -> &'a u32 { let x: &'a &'a Option = x; match x { diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/reset-mode.rs b/src/test/run-pass/rfc-2005-default-binding-mode/reset-mode.rs index 1d86a2ecf869a..4743b2f41bd9a 100644 --- a/src/test/run-pass/rfc-2005-default-binding-mode/reset-mode.rs +++ b/src/test/run-pass/rfc-2005-default-binding-mode/reset-mode.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we "reset" the mode as we pass through a `&` pattern. // // cc #46688 diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/slice.rs b/src/test/run-pass/rfc-2005-default-binding-mode/slice.rs index 0d1d0893c593e..cc59c8ab031c5 100644 --- a/src/test/run-pass/rfc-2005-default-binding-mode/slice.rs +++ b/src/test/run-pass/rfc-2005-default-binding-mode/slice.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(slice_patterns)] fn slice_pat() { diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/struct.rs b/src/test/run-pass/rfc-2005-default-binding-mode/struct.rs index 017439b3b140f..4d864f0d7a79f 100644 --- a/src/test/run-pass/rfc-2005-default-binding-mode/struct.rs +++ b/src/test/run-pass/rfc-2005-default-binding-mode/struct.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug, PartialEq)] struct Foo { x: u8, diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/tuple-struct.rs b/src/test/run-pass/rfc-2005-default-binding-mode/tuple-struct.rs index 3b55405abdd7e..68a49075c9b57 100644 --- a/src/test/run-pass/rfc-2005-default-binding-mode/tuple-struct.rs +++ b/src/test/run-pass/rfc-2005-default-binding-mode/tuple-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Foo { Bar(Option, (), (), Vec), Baz, diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/tuple.rs b/src/test/run-pass/rfc-2005-default-binding-mode/tuple.rs index 966b8e1a81279..b78e796d6c309 100644 --- a/src/test/run-pass/rfc-2005-default-binding-mode/tuple.rs +++ b/src/test/run-pass/rfc-2005-default-binding-mode/tuple.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { let foo = (Some(1), (), (), vec![2, 3]); diff --git a/src/test/run-pass/rfc-2008-non-exhaustive/auxiliary/enums.rs b/src/test/run-pass/rfc-2008-non-exhaustive/auxiliary/enums.rs index 12d1bf9ea9104..e3820599c72d9 100644 --- a/src/test/run-pass/rfc-2008-non-exhaustive/auxiliary/enums.rs +++ b/src/test/run-pass/rfc-2008-non-exhaustive/auxiliary/enums.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] #![feature(non_exhaustive)] diff --git a/src/test/run-pass/rfc-2008-non-exhaustive/auxiliary/structs.rs b/src/test/run-pass/rfc-2008-non-exhaustive/auxiliary/structs.rs index a2c6f8c05e2c9..7926fc6084bc1 100644 --- a/src/test/run-pass/rfc-2008-non-exhaustive/auxiliary/structs.rs +++ b/src/test/run-pass/rfc-2008-non-exhaustive/auxiliary/structs.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(non_exhaustive)] #[non_exhaustive] diff --git a/src/test/run-pass/rfc-2008-non-exhaustive/auxiliary/variants.rs b/src/test/run-pass/rfc-2008-non-exhaustive/auxiliary/variants.rs index d04c1073ad9b3..f590d0a3268ff 100644 --- a/src/test/run-pass/rfc-2008-non-exhaustive/auxiliary/variants.rs +++ b/src/test/run-pass/rfc-2008-non-exhaustive/auxiliary/variants.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] #![feature(non_exhaustive)] diff --git a/src/test/run-pass/rfc-2008-non-exhaustive/enums.rs b/src/test/run-pass/rfc-2008-non-exhaustive/enums.rs index 9d41eca8fe5d2..5868e06bbc3de 100644 --- a/src/test/run-pass/rfc-2008-non-exhaustive/enums.rs +++ b/src/test/run-pass/rfc-2008-non-exhaustive/enums.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:enums.rs extern crate enums; diff --git a/src/test/run-pass/rfc-2008-non-exhaustive/enums_same_crate.rs b/src/test/run-pass/rfc-2008-non-exhaustive/enums_same_crate.rs index 8f1ba364b0e2b..4c44cc3d5dae5 100644 --- a/src/test/run-pass/rfc-2008-non-exhaustive/enums_same_crate.rs +++ b/src/test/run-pass/rfc-2008-non-exhaustive/enums_same_crate.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(non_exhaustive)] #[non_exhaustive] diff --git a/src/test/run-pass/rfc-2008-non-exhaustive/structs.rs b/src/test/run-pass/rfc-2008-non-exhaustive/structs.rs index bb65e10da27bf..4dabe5bbd0a48 100644 --- a/src/test/run-pass/rfc-2008-non-exhaustive/structs.rs +++ b/src/test/run-pass/rfc-2008-non-exhaustive/structs.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:structs.rs extern crate structs; diff --git a/src/test/run-pass/rfc-2008-non-exhaustive/structs_same_crate.rs b/src/test/run-pass/rfc-2008-non-exhaustive/structs_same_crate.rs index 175782f10fc91..5dd81a13d2cea 100644 --- a/src/test/run-pass/rfc-2008-non-exhaustive/structs_same_crate.rs +++ b/src/test/run-pass/rfc-2008-non-exhaustive/structs_same_crate.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(non_exhaustive)] #[non_exhaustive] diff --git a/src/test/run-pass/rfc-2008-non-exhaustive/variants.rs b/src/test/run-pass/rfc-2008-non-exhaustive/variants.rs index 2658c59a69985..51eeb90b19e6c 100644 --- a/src/test/run-pass/rfc-2008-non-exhaustive/variants.rs +++ b/src/test/run-pass/rfc-2008-non-exhaustive/variants.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:variants.rs extern crate variants; diff --git a/src/test/run-pass/rfc-2008-non-exhaustive/variants_same_crate.rs b/src/test/run-pass/rfc-2008-non-exhaustive/variants_same_crate.rs index a1c376c17985d..f75f846ffe83e 100644 --- a/src/test/run-pass/rfc-2008-non-exhaustive/variants_same_crate.rs +++ b/src/test/run-pass/rfc-2008-non-exhaustive/variants_same_crate.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(non_exhaustive)] /* diff --git a/src/test/run-pass/rfc-2126-crate-paths/crate-path-absolute.rs b/src/test/run-pass/rfc-2126-crate-paths/crate-path-absolute.rs index 31f683a173550..44c38739a4e1d 100644 --- a/src/test/run-pass/rfc-2126-crate-paths/crate-path-absolute.rs +++ b/src/test/run-pass/rfc-2126-crate-paths/crate-path-absolute.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(crate_in_paths)] use crate::m::f; diff --git a/src/test/run-pass/rfc-2126-crate-paths/crate-path-visibility-ambiguity.rs b/src/test/run-pass/rfc-2126-crate-paths/crate-path-visibility-ambiguity.rs index 4646d81cf518f..3c45eebd62d00 100644 --- a/src/test/run-pass/rfc-2126-crate-paths/crate-path-visibility-ambiguity.rs +++ b/src/test/run-pass/rfc-2126-crate-paths/crate-path-visibility-ambiguity.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(crate_in_paths)] #![feature(crate_visibility_modifier)] diff --git a/src/test/run-pass/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs b/src/test/run-pass/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs index a5214d796cd62..07e70648452c5 100644 --- a/src/test/run-pass/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs +++ b/src/test/run-pass/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug, PartialEq)] pub struct S; diff --git a/src/test/run-pass/rfc-2126-extern-absolute-paths/basic.rs b/src/test/run-pass/rfc-2126-extern-absolute-paths/basic.rs index 93384b81e4aa7..9d84180b68be8 100644 --- a/src/test/run-pass/rfc-2126-extern-absolute-paths/basic.rs +++ b/src/test/run-pass/rfc-2126-extern-absolute-paths/basic.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:xcrate.rs // edition:2018 diff --git a/src/test/run-pass/rfc-2126-extern-absolute-paths/extern.rs b/src/test/run-pass/rfc-2126-extern-absolute-paths/extern.rs index 15b754e1fe6b2..8cb5c8d58b51c 100644 --- a/src/test/run-pass/rfc-2126-extern-absolute-paths/extern.rs +++ b/src/test/run-pass/rfc-2126-extern-absolute-paths/extern.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:xcrate.rs #![feature(extern_in_paths)] diff --git a/src/test/run-pass/rfc-2126-extern-absolute-paths/test.rs b/src/test/run-pass/rfc-2126-extern-absolute-paths/test.rs index cace83d627461..bc7a6537f6e76 100644 --- a/src/test/run-pass/rfc-2126-extern-absolute-paths/test.rs +++ b/src/test/run-pass/rfc-2126-extern-absolute-paths/test.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that `#[test]` works with extern-absolute-paths enabled. // // Regression test for #47075. diff --git a/src/test/run-pass/rfc-2151-raw-identifiers/attr.rs b/src/test/run-pass/rfc-2151-raw-identifiers/attr.rs index 2ef9fba2076ad..7d0dd388260cf 100644 --- a/src/test/run-pass/rfc-2151-raw-identifiers/attr.rs +++ b/src/test/run-pass/rfc-2151-raw-identifiers/attr.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::mem; #[r#repr(r#C, r#packed)] diff --git a/src/test/run-pass/rfc-2151-raw-identifiers/basic.rs b/src/test/run-pass/rfc-2151-raw-identifiers/basic.rs index eefce3981bec1..a088ed816185a 100644 --- a/src/test/run-pass/rfc-2151-raw-identifiers/basic.rs +++ b/src/test/run-pass/rfc-2151-raw-identifiers/basic.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn r#fn(r#match: u32) -> u32 { r#match } diff --git a/src/test/run-pass/rfc-2151-raw-identifiers/items.rs b/src/test/run-pass/rfc-2151-raw-identifiers/items.rs index 4306ffe2042af..5cb7d2e9d4c1d 100644 --- a/src/test/run-pass/rfc-2151-raw-identifiers/items.rs +++ b/src/test/run-pass/rfc-2151-raw-identifiers/items.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug, PartialEq, Eq)] struct IntWrapper(u32); diff --git a/src/test/run-pass/rfc-2151-raw-identifiers/macros.rs b/src/test/run-pass/rfc-2151-raw-identifiers/macros.rs index 9e89b79266cfa..2fb1f2f10e0e2 100644 --- a/src/test/run-pass/rfc-2151-raw-identifiers/macros.rs +++ b/src/test/run-pass/rfc-2151-raw-identifiers/macros.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(decl_macro)] r#macro_rules! r#struct { diff --git a/src/test/run-pass/rfc-2175-or-if-while-let/basic.rs b/src/test/run-pass/rfc-2175-or-if-while-let/basic.rs index a516a3e5dcd75..5cd8eab4eee62 100644 --- a/src/test/run-pass/rfc-2175-or-if-while-let/basic.rs +++ b/src/test/run-pass/rfc-2175-or-if-while-let/basic.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(if_while_or_patterns)] enum E { diff --git a/src/test/run-pass/rfc-2421-unreserve-pure-offsetof-sizeof-alignof.rs b/src/test/run-pass/rfc-2421-unreserve-pure-offsetof-sizeof-alignof.rs index 7d8050a07a310..af48df67c72be 100644 --- a/src/test/run-pass/rfc-2421-unreserve-pure-offsetof-sizeof-alignof.rs +++ b/src/test/run-pass/rfc-2421-unreserve-pure-offsetof-sizeof-alignof.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that removed keywords are allowed as identifiers. fn main () { let offsetof = (); diff --git a/src/test/run-pass/rfc1445/eq-allows-match-on-ty-in-macro.rs b/src/test/run-pass/rfc1445/eq-allows-match-on-ty-in-macro.rs index 241fe6c6ab1e9..30884ded88ccf 100644 --- a/src/test/run-pass/rfc1445/eq-allows-match-on-ty-in-macro.rs +++ b/src/test/run-pass/rfc1445/eq-allows-match-on-ty-in-macro.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] macro_rules! foo { diff --git a/src/test/run-pass/rfc1445/eq-allows-match.rs b/src/test/run-pass/rfc1445/eq-allows-match.rs index f02a45625c9f6..69ccd0bfbc235 100644 --- a/src/test/run-pass/rfc1445/eq-allows-match.rs +++ b/src/test/run-pass/rfc1445/eq-allows-match.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] #[derive(PartialEq, Eq)] diff --git a/src/test/run-pass/rfc1623.rs b/src/test/run-pass/rfc1623.rs index 17453933c8abc..651374b0ce9b4 100644 --- a/src/test/run-pass/rfc1623.rs +++ b/src/test/run-pass/rfc1623.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] // very simple test for a 'static static with default lifetime diff --git a/src/test/run-pass/rfc1717/auxiliary/clibrary.rs b/src/test/run-pass/rfc1717/auxiliary/clibrary.rs index 7438ba21bfc4a..c1c5b70bc04e2 100644 --- a/src/test/run-pass/rfc1717/auxiliary/clibrary.rs +++ b/src/test/run-pass/rfc1717/auxiliary/clibrary.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "staticlib"] diff --git a/src/test/run-pass/rfc1717/library-override.rs b/src/test/run-pass/rfc1717/library-override.rs index c51b33f9c4af6..5cc88d223b498 100644 --- a/src/test/run-pass/rfc1717/library-override.rs +++ b/src/test/run-pass/rfc1717/library-override.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare no libc to test ffi with // compile-flags: -lstatic=wronglibrary:rust_test_helpers diff --git a/src/test/run-pass/rfc1857-drop-order.rs b/src/test/run-pass/rfc1857-drop-order.rs index 94b2a586ddfa0..704d7583dcd8b 100644 --- a/src/test/run-pass/rfc1857-drop-order.rs +++ b/src/test/run-pass/rfc1857-drop-order.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare compiled with panic=abort by default #![allow(dead_code, unreachable_code)] diff --git a/src/test/run-pass/rmeta.rs b/src/test/run-pass/rmeta.rs index 11684d8663af8..bd8125bbb5648 100644 --- a/src/test/run-pass/rmeta.rs +++ b/src/test/run-pass/rmeta.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that using rlibs and rmeta dep crates work together. Specifically, that // there can be both an rmeta and an rlib file and rustc will prefer the rlib. diff --git a/src/test/run-pass/running-with-no-runtime.rs b/src/test/run-pass/running-with-no-runtime.rs index d349519478ae4..7f8a0f01dde04 100644 --- a/src/test/run-pass/running-with-no-runtime.rs +++ b/src/test/run-pass/running-with-no-runtime.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi spawning processes is not supported // ignore-emscripten spawning processes is not supported diff --git a/src/test/run-pass/rustc-rust-log.rs b/src/test/run-pass/rustc-rust-log.rs index 629387d4cb11d..4d67b692adbf5 100644 --- a/src/test/run-pass/rustc-rust-log.rs +++ b/src/test/run-pass/rustc-rust-log.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // rustc-env:RUST_LOG=debug fn main() {} diff --git a/src/test/run-pass/rvalue-static-promotion.rs b/src/test/run-pass/rvalue-static-promotion.rs index acf96b566df84..0066217774d94 100644 --- a/src/test/run-pass/rvalue-static-promotion.rs +++ b/src/test/run-pass/rvalue-static-promotion.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cell::Cell; const NONE_CELL_STRING: Option> = None; diff --git a/src/test/run-pass/saturating-float-casts.rs b/src/test/run-pass/saturating-float-casts.rs index ad3b4b172594e..f5c470d20e172 100644 --- a/src/test/run-pass/saturating-float-casts.rs +++ b/src/test/run-pass/saturating-float-casts.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests saturating float->int casts. See u128-as-f32.rs for the opposite direction. // compile-flags: -Z saturating-float-casts diff --git a/src/test/run-pass/segfault-no-out-of-stack.rs b/src/test/run-pass/segfault-no-out-of-stack.rs index 307ead4b74f74..85be65159f4da 100644 --- a/src/test/run-pass/segfault-no-out-of-stack.rs +++ b/src/test/run-pass/segfault-no-out-of-stack.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi can't run commands // ignore-emscripten can't run commands diff --git a/src/test/run-pass/self-impl.rs b/src/test/run-pass/self-impl.rs index fcd233c361b83..c6331be8b26ca 100644 --- a/src/test/run-pass/self-impl.rs +++ b/src/test/run-pass/self-impl.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we can use `Self` types in impls in the expected way. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/self-in-mut-slot-default-method.rs b/src/test/run-pass/self-in-mut-slot-default-method.rs index 905a23f22a6f8..31531c5f7dcaf 100644 --- a/src/test/run-pass/self-in-mut-slot-default-method.rs +++ b/src/test/run-pass/self-in-mut-slot-default-method.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] struct X { diff --git a/src/test/run-pass/self-in-mut-slot-immediate-value.rs b/src/test/run-pass/self-in-mut-slot-immediate-value.rs index 24014c289f919..5539d7130e7ea 100644 --- a/src/test/run-pass/self-in-mut-slot-immediate-value.rs +++ b/src/test/run-pass/self-in-mut-slot-immediate-value.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Assert that `mut self` on an immediate value doesn't // allow mutating the original - issue #10615. diff --git a/src/test/run-pass/self-in-typedefs.rs b/src/test/run-pass/self-in-typedefs.rs index d262e8c60a18e..7ebd840eb79cc 100644 --- a/src/test/run-pass/self-in-typedefs.rs +++ b/src/test/run-pass/self-in-typedefs.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(self_in_typedefs)] #![feature(untagged_unions)] diff --git a/src/test/run-pass/self-re-assign.rs b/src/test/run-pass/self-re-assign.rs index 05295aa3309d4..8648bdb9a837c 100644 --- a/src/test/run-pass/self-re-assign.rs +++ b/src/test/run-pass/self-re-assign.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Ensure assigning an owned or managed variable to itself works. In particular, // that we do not glue_drop before we glue_take (#3290). diff --git a/src/test/run-pass/self-shadowing-import.rs b/src/test/run-pass/self-shadowing-import.rs index 5ef6e08f857c1..06c60b3a0aef3 100644 --- a/src/test/run-pass/self-shadowing-import.rs +++ b/src/test/run-pass/self-shadowing-import.rs @@ -1,14 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - mod a { pub mod b { pub mod a { diff --git a/src/test/run-pass/self-type-param.rs b/src/test/run-pass/self-type-param.rs index ac810606a9328..4f9c449978433 100644 --- a/src/test/run-pass/self-type-param.rs +++ b/src/test/run-pass/self-type-param.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait MyTrait { diff --git a/src/test/run-pass/semi-after-macro-ty.rs b/src/test/run-pass/semi-after-macro-ty.rs index 2b4304252a127..b6ac20b7ebc09 100644 --- a/src/test/run-pass/semi-after-macro-ty.rs +++ b/src/test/run-pass/semi-after-macro-ty.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! foo { ($t:ty; $p:path;) => {} } diff --git a/src/test/run-pass/semistatement-in-lambda.rs b/src/test/run-pass/semistatement-in-lambda.rs index 0fc5fe498a62d..602f771b3a56d 100644 --- a/src/test/run-pass/semistatement-in-lambda.rs +++ b/src/test/run-pass/semistatement-in-lambda.rs @@ -1,14 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { // Test that lambdas behave as unary expressions with block-like expressions -if true { 1 } else { 2 } * 3; diff --git a/src/test/run-pass/send-is-not-static-par-for.rs b/src/test/run-pass/send-is-not-static-par-for.rs index 356a3be3927e4..a226fa64dfb26 100644 --- a/src/test/run-pass/send-is-not-static-par-for.rs +++ b/src/test/run-pass/send-is-not-static-par-for.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::thread; use std::sync::Mutex; diff --git a/src/test/run-pass/send-resource.rs b/src/test/run-pass/send-resource.rs index 59332d6b65e8c..d35424cb55f0b 100644 --- a/src/test/run-pass/send-resource.rs +++ b/src/test/run-pass/send-resource.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 // ignore-emscripten no threads support diff --git a/src/test/run-pass/send-type-inference.rs b/src/test/run-pass/send-type-inference.rs index 84d491d052404..2717951aa7ef3 100644 --- a/src/test/run-pass/send-type-inference.rs +++ b/src/test/run-pass/send-type-inference.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 use std::sync::mpsc::{channel, Sender}; diff --git a/src/test/run-pass/send_str_hashmap.rs b/src/test/run-pass/send_str_hashmap.rs index 2ff2d5a8aa52b..a2a3f4fe94833 100644 --- a/src/test/run-pass/send_str_hashmap.rs +++ b/src/test/run-pass/send_str_hashmap.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::HashMap; use std::borrow::Cow; diff --git a/src/test/run-pass/send_str_treemap.rs b/src/test/run-pass/send_str_treemap.rs index 3178dc9459881..9a578fb8ffa2a 100644 --- a/src/test/run-pass/send_str_treemap.rs +++ b/src/test/run-pass/send_str_treemap.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::BTreeMap; use std::borrow::Cow; diff --git a/src/test/run-pass/sendable-class.rs b/src/test/run-pass/sendable-class.rs index 4fb1c32952f8e..da96c3cfcb0c3 100644 --- a/src/test/run-pass/sendable-class.rs +++ b/src/test/run-pass/sendable-class.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that a class with only sendable fields can be sent // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/sendfn-is-a-block.rs b/src/test/run-pass/sendfn-is-a-block.rs index 162b05f0bb3f5..d6e4843b8ea71 100644 --- a/src/test/run-pass/sendfn-is-a-block.rs +++ b/src/test/run-pass/sendfn-is-a-block.rs @@ -1,15 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - fn test(f: F) -> usize where F: FnOnce(usize) -> usize { return f(22); } diff --git a/src/test/run-pass/sendfn-spawn-with-fn-arg.rs b/src/test/run-pass/sendfn-spawn-with-fn-arg.rs index ecd0bfb144076..2b4f009bc18c9 100644 --- a/src/test/run-pass/sendfn-spawn-with-fn-arg.rs +++ b/src/test/run-pass/sendfn-spawn-with-fn-arg.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support #![feature(box_syntax)] diff --git a/src/test/run-pass/sepcomp-cci.rs b/src/test/run-pass/sepcomp-cci.rs index d3d3de0e2c0cb..8c79c04f61d51 100644 --- a/src/test/run-pass/sepcomp-cci.rs +++ b/src/test/run-pass/sepcomp-cci.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-bitrig // compile-flags: -C codegen-units=3 // aux-build:sepcomp_cci_lib.rs diff --git a/src/test/run-pass/sepcomp-extern.rs b/src/test/run-pass/sepcomp-extern.rs index f21b787dab72f..cd96f3e3351c8 100644 --- a/src/test/run-pass/sepcomp-extern.rs +++ b/src/test/run-pass/sepcomp-extern.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-bitrig // compile-flags: -C codegen-units=3 // aux-build:sepcomp-extern-lib.rs diff --git a/src/test/run-pass/sepcomp-fns-backwards.rs b/src/test/run-pass/sepcomp-fns-backwards.rs index 4fea07028b614..9ca6992813197 100644 --- a/src/test/run-pass/sepcomp-fns-backwards.rs +++ b/src/test/run-pass/sepcomp-fns-backwards.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-bitrig // compile-flags: -C codegen-units=3 diff --git a/src/test/run-pass/sepcomp-fns.rs b/src/test/run-pass/sepcomp-fns.rs index a2356cf02a11f..d5b2363acadb8 100644 --- a/src/test/run-pass/sepcomp-fns.rs +++ b/src/test/run-pass/sepcomp-fns.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-bitrig // compile-flags: -C codegen-units=3 diff --git a/src/test/run-pass/sepcomp-lib-lto.rs b/src/test/run-pass/sepcomp-lib-lto.rs index 8d73f4db7d234..2fbef55a195a9 100644 --- a/src/test/run-pass/sepcomp-lib-lto.rs +++ b/src/test/run-pass/sepcomp-lib-lto.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we can use `-C lto` when linking against libraries that were // separately compiled. diff --git a/src/test/run-pass/sepcomp-lib.rs b/src/test/run-pass/sepcomp-lib.rs index abe842a332d8f..9eaee54556895 100644 --- a/src/test/run-pass/sepcomp-lib.rs +++ b/src/test/run-pass/sepcomp-lib.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:sepcomp_lib.rs // Test linking against a library built with -C codegen-units > 1 diff --git a/src/test/run-pass/sepcomp-statics.rs b/src/test/run-pass/sepcomp-statics.rs index 8cda469a88bf5..4ab2bf80abf13 100644 --- a/src/test/run-pass/sepcomp-statics.rs +++ b/src/test/run-pass/sepcomp-statics.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-bitrig // compile-flags: -C codegen-units=3 diff --git a/src/test/run-pass/sepcomp-unwind.rs b/src/test/run-pass/sepcomp-unwind.rs index 3a93845a0620a..16e71db657303 100644 --- a/src/test/run-pass/sepcomp-unwind.rs +++ b/src/test/run-pass/sepcomp-unwind.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-bitrig // compile-flags: -C codegen-units=3 // ignore-emscripten no threads support diff --git a/src/test/run-pass/seq-compare.rs b/src/test/run-pass/seq-compare.rs index 43612f529772a..cb90e3be0ac82 100644 --- a/src/test/run-pass/seq-compare.rs +++ b/src/test/run-pass/seq-compare.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - pub fn main() { assert!(("hello".to_string() < "hellr".to_string())); assert!(("hello ".to_string() > "hello".to_string())); diff --git a/src/test/run-pass/shadow.rs b/src/test/run-pass/shadow.rs index b764fc6f1ec96..e88e668f778ca 100644 --- a/src/test/run-pass/shadow.rs +++ b/src/test/run-pass/shadow.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo(c: Vec ) { let a: isize = 5; let mut b: Vec = Vec::new(); diff --git a/src/test/run-pass/shadowed-use-visibility.rs b/src/test/run-pass/shadowed-use-visibility.rs index d2a32da4feaa2..30e614a685a46 100644 --- a/src/test/run-pass/shadowed-use-visibility.rs +++ b/src/test/run-pass/shadowed-use-visibility.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod foo { pub fn f() {} diff --git a/src/test/run-pass/shebang.rs b/src/test/run-pass/shebang.rs index a0947cd49a42d..a5fbda1c1ea31 100644 --- a/src/test/run-pass/shebang.rs +++ b/src/test/run-pass/shebang.rs @@ -1,12 +1,5 @@ #!/usr/bin/env rustx -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. pub fn main() { println!("Hello World"); } diff --git a/src/test/run-pass/shift-near-oflo.rs b/src/test/run-pass/shift-near-oflo.rs index 527ced54c4298..2559ecfdb7568 100644 --- a/src/test/run-pass/shift-near-oflo.rs +++ b/src/test/run-pass/shift-near-oflo.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C debug-assertions // Check that we do *not* overflow on a number of edge cases. diff --git a/src/test/run-pass/shift-various-types.rs b/src/test/run-pass/shift-various-types.rs index 9238112a0818f..1febc7df51bfc 100644 --- a/src/test/run-pass/shift-various-types.rs +++ b/src/test/run-pass/shift-various-types.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we can do shifts by any integral type. diff --git a/src/test/run-pass/shift.rs b/src/test/run-pass/shift.rs index 2f417e0e2f4e8..32e7476e52286 100644 --- a/src/test/run-pass/shift.rs +++ b/src/test/run-pass/shift.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Testing shifts for various combinations of integers // Issue #1570 diff --git a/src/test/run-pass/show-boxed-slice.rs b/src/test/run-pass/show-boxed-slice.rs index 47d0737dfc451..9a29c75878ccf 100644 --- a/src/test/run-pass/show-boxed-slice.rs +++ b/src/test/run-pass/show-boxed-slice.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug)] struct Foo(Box<[u8]>); diff --git a/src/test/run-pass/signal-alternate-stack-cleanup.rs b/src/test/run-pass/signal-alternate-stack-cleanup.rs index ad099f82d13b9..3ca776a0b9b62 100644 --- a/src/test/run-pass/signal-alternate-stack-cleanup.rs +++ b/src/test/run-pass/signal-alternate-stack-cleanup.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Previously memory for alternate signal stack have been unmapped during // main thread exit while still being in use by signal handlers. This test // triggers this situation by sending signal from atexit handler. diff --git a/src/test/run-pass/signal-exit-status.rs b/src/test/run-pass/signal-exit-status.rs index 76171a4cc4656..9e1e55ad54d8a 100644 --- a/src/test/run-pass/signal-exit-status.rs +++ b/src/test/run-pass/signal-exit-status.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no processes // ignore-emscripten no processes // ignore-windows diff --git a/src/test/run-pass/signed-shift-const-eval.rs b/src/test/run-pass/signed-shift-const-eval.rs index 9ea2dedcba17d..b350c92b6de0c 100644 --- a/src/test/run-pass/signed-shift-const-eval.rs +++ b/src/test/run-pass/signed-shift-const-eval.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum test { thing = -5 >> 1_usize } pub fn main() { assert_eq!(test::thing as isize, -3); diff --git a/src/test/run-pass/sigpipe-should-be-ignored.rs b/src/test/run-pass/sigpipe-should-be-ignored.rs index f5e2239538f65..4e93d782882f5 100644 --- a/src/test/run-pass/sigpipe-should-be-ignored.rs +++ b/src/test/run-pass/sigpipe-should-be-ignored.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Be sure that when a SIGPIPE would have been received that the entire process // doesn't die in a ball of fire, but rather it's gracefully handled. diff --git a/src/test/run-pass/simd-generics.rs b/src/test/run-pass/simd-generics.rs index ef40a6ce96bd4..eb3383d608f31 100644 --- a/src/test/run-pass/simd-generics.rs +++ b/src/test/run-pass/simd-generics.rs @@ -1,15 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - #![feature(repr_simd, platform_intrinsics)] use std::ops; diff --git a/src/test/run-pass/simd-intrinsic-float-math.rs b/src/test/run-pass/simd-intrinsic-float-math.rs index 3c7ca21459f46..431e7f66787f3 100644 --- a/src/test/run-pass/simd-intrinsic-float-math.rs +++ b/src/test/run-pass/simd-intrinsic-float-math.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten // ignore-android diff --git a/src/test/run-pass/simd-intrinsic-float-minmax.rs b/src/test/run-pass/simd-intrinsic-float-minmax.rs index d35123e2235e2..9ab365e1cc26e 100644 --- a/src/test/run-pass/simd-intrinsic-float-minmax.rs +++ b/src/test/run-pass/simd-intrinsic-float-minmax.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten // min-llvm-version 7.0 // error-pattern: panicked diff --git a/src/test/run-pass/simd-intrinsic-generic-arithmetic.rs b/src/test/run-pass/simd-intrinsic-generic-arithmetic.rs index ac6d0c697ecc0..52e5f57fb9147 100644 --- a/src/test/run-pass/simd-intrinsic-generic-arithmetic.rs +++ b/src/test/run-pass/simd-intrinsic-generic-arithmetic.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten FIXME(#45351) hits an LLVM assert #![feature(repr_simd, platform_intrinsics)] diff --git a/src/test/run-pass/simd-intrinsic-generic-cast.rs b/src/test/run-pass/simd-intrinsic-generic-cast.rs index ed2786edf3a3f..cab53589d50ac 100644 --- a/src/test/run-pass/simd-intrinsic-generic-cast.rs +++ b/src/test/run-pass/simd-intrinsic-generic-cast.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten FIXME(#45351) hits an LLVM assert #![feature(repr_simd, platform_intrinsics, concat_idents, test)] diff --git a/src/test/run-pass/simd-intrinsic-generic-comparison.rs b/src/test/run-pass/simd-intrinsic-generic-comparison.rs index d27378ba89308..56e202a29fa74 100644 --- a/src/test/run-pass/simd-intrinsic-generic-comparison.rs +++ b/src/test/run-pass/simd-intrinsic-generic-comparison.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten FIXME(#45351) hits an LLVM assert #![feature(repr_simd, platform_intrinsics, concat_idents)] diff --git a/src/test/run-pass/simd-intrinsic-generic-elements.rs b/src/test/run-pass/simd-intrinsic-generic-elements.rs index 72fcef27a665b..dde1e7358d196 100644 --- a/src/test/run-pass/simd-intrinsic-generic-elements.rs +++ b/src/test/run-pass/simd-intrinsic-generic-elements.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten FIXME(#45351) hits an LLVM assert #![feature(repr_simd, platform_intrinsics)] diff --git a/src/test/run-pass/simd-intrinsic-generic-gather.rs b/src/test/run-pass/simd-intrinsic-generic-gather.rs index 54143739a88f9..08e58ab5bb8c4 100644 --- a/src/test/run-pass/simd-intrinsic-generic-gather.rs +++ b/src/test/run-pass/simd-intrinsic-generic-gather.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten // min-llvm-version 6.0 diff --git a/src/test/run-pass/simd-intrinsic-generic-reduction.rs b/src/test/run-pass/simd-intrinsic-generic-reduction.rs index 8e999b7115ea1..d23fec8a6e787 100644 --- a/src/test/run-pass/simd-intrinsic-generic-reduction.rs +++ b/src/test/run-pass/simd-intrinsic-generic-reduction.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten // Test that the simd_reduce_{op} intrinsics produce the correct results. diff --git a/src/test/run-pass/simd-intrinsic-generic-select.rs b/src/test/run-pass/simd-intrinsic-generic-select.rs index 8e94d797e8944..d945a0a658985 100644 --- a/src/test/run-pass/simd-intrinsic-generic-select.rs +++ b/src/test/run-pass/simd-intrinsic-generic-select.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten // Test that the simd_select intrinsics produces correct results. diff --git a/src/test/run-pass/simd-size-align.rs b/src/test/run-pass/simd-size-align.rs index b8d7cd8414176..c4c863c7c724a 100644 --- a/src/test/run-pass/simd-size-align.rs +++ b/src/test/run-pass/simd-size-align.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![feature(repr_simd)] #![allow(non_camel_case_types)] diff --git a/src/test/run-pass/simd-target-feature-mixup.rs b/src/test/run-pass/simd-target-feature-mixup.rs index 139da04645264..e7667952c052f 100644 --- a/src/test/run-pass/simd-target-feature-mixup.rs +++ b/src/test/run-pass/simd-target-feature-mixup.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten #![feature(repr_simd, target_feature, cfg_target_feature)] diff --git a/src/test/run-pass/simd-type.rs b/src/test/run-pass/simd-type.rs index 2883b80a25b9e..bc77d37e3c12c 100644 --- a/src/test/run-pass/simd-type.rs +++ b/src/test/run-pass/simd-type.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // pretty-expanded FIXME #23616 #![feature(repr_simd)] diff --git a/src/test/run-pass/simd-upgraded.rs b/src/test/run-pass/simd-upgraded.rs index 821a505c13849..09c8a9a3a9821 100644 --- a/src/test/run-pass/simd-upgraded.rs +++ b/src/test/run-pass/simd-upgraded.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that removed LLVM SIMD intrinsics continue // to work via the "AutoUpgrade" mechanism. diff --git a/src/test/run-pass/simple-generic-match.rs b/src/test/run-pass/simple-generic-match.rs index 02fc2a61d017b..b94c1698ca88c 100644 --- a/src/test/run-pass/simple-generic-match.rs +++ b/src/test/run-pass/simple-generic-match.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - // pretty-expanded FIXME #23616 enum clam { a(T), } diff --git a/src/test/run-pass/simple-generic-tag.rs b/src/test/run-pass/simple-generic-tag.rs index 2e8d8f61bc8a7..e43b7faeb0492 100644 --- a/src/test/run-pass/simple-generic-tag.rs +++ b/src/test/run-pass/simple-generic-tag.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - // pretty-expanded FIXME #23616 enum clam { a(T), } diff --git a/src/test/run-pass/simple-infer.rs b/src/test/run-pass/simple-infer.rs index 04c1af4326bbd..835ab85982d6d 100644 --- a/src/test/run-pass/simple-infer.rs +++ b/src/test/run-pass/simple-infer.rs @@ -1,13 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - pub fn main() { let mut n; n = 1; println!("{}", n); } diff --git a/src/test/run-pass/simple-match-generic-tag.rs b/src/test/run-pass/simple-match-generic-tag.rs index 52989b3666924..1d67a3aac543d 100644 --- a/src/test/run-pass/simple-match-generic-tag.rs +++ b/src/test/run-pass/simple-match-generic-tag.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum opt { none, some(T) } pub fn main() { diff --git a/src/test/run-pass/simple_global_asm.rs b/src/test/run-pass/simple_global_asm.rs index cd8273c6bc2b8..00d03e4a7d2a4 100644 --- a/src/test/run-pass/simple_global_asm.rs +++ b/src/test/run-pass/simple_global_asm.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(global_asm)] #![feature(naked_functions)] diff --git a/src/test/run-pass/size-and-align.rs b/src/test/run-pass/size-and-align.rs index 13d55e0172e71..56ba49b935f48 100644 --- a/src/test/run-pass/size-and-align.rs +++ b/src/test/run-pass/size-and-align.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum clam { a(T, isize), b, } fn uhoh(v: Vec> ) { diff --git a/src/test/run-pass/sized-borrowed-pointer.rs b/src/test/run-pass/sized-borrowed-pointer.rs index 76c06d560d754..7c3249bdc628c 100644 --- a/src/test/run-pass/sized-borrowed-pointer.rs +++ b/src/test/run-pass/sized-borrowed-pointer.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Possibly-dynamic size of typaram should be cleared at pointer boundary. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/sized-owned-pointer.rs b/src/test/run-pass/sized-owned-pointer.rs index d3a6b104dba55..c8f268172ca2a 100644 --- a/src/test/run-pass/sized-owned-pointer.rs +++ b/src/test/run-pass/sized-owned-pointer.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Possibly-dynamic size of typaram should be cleared at pointer boundary. diff --git a/src/test/run-pass/sleep.rs b/src/test/run-pass/sleep.rs index 9acc6ff8cf084..f0411876c8a0a 100644 --- a/src/test/run-pass/sleep.rs +++ b/src/test/run-pass/sleep.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support use std::thread::{self, sleep}; diff --git a/src/test/run-pass/slice-2.rs b/src/test/run-pass/slice-2.rs index 3a99fd9af932e..b4b19f8c9b8e0 100644 --- a/src/test/run-pass/slice-2.rs +++ b/src/test/run-pass/slice-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test slicing expressions on slices and Vecs. diff --git a/src/test/run-pass/slice-of-zero-size-elements.rs b/src/test/run-pass/slice-of-zero-size-elements.rs index ab22b820503af..d6050f286b017 100644 --- a/src/test/run-pass/slice-of-zero-size-elements.rs +++ b/src/test/run-pass/slice-of-zero-size-elements.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C debug-assertions #![feature(iter_to_slice)] diff --git a/src/test/run-pass/slice-panic-1.rs b/src/test/run-pass/slice-panic-1.rs index afec06adc864f..0c6ce0e9f94dc 100644 --- a/src/test/run-pass/slice-panic-1.rs +++ b/src/test/run-pass/slice-panic-1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support // Test that if a slicing expr[..] fails, the correct cleanups happen. diff --git a/src/test/run-pass/slice-panic-2.rs b/src/test/run-pass/slice-panic-2.rs index 2932b585b8805..a973f59a435b2 100644 --- a/src/test/run-pass/slice-panic-2.rs +++ b/src/test/run-pass/slice-panic-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support // Test that if a slicing expr[..] fails, the correct cleanups happen. diff --git a/src/test/run-pass/slice.rs b/src/test/run-pass/slice.rs index dfd7b947c57e5..4c7a86fb0694a 100644 --- a/src/test/run-pass/slice.rs +++ b/src/test/run-pass/slice.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test slicing sugar. extern crate core; diff --git a/src/test/run-pass/slice_binary_search.rs b/src/test/run-pass/slice_binary_search.rs index 80b370d58fc53..f41f0ad349a16 100644 --- a/src/test/run-pass/slice_binary_search.rs +++ b/src/test/run-pass/slice_binary_search.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test binary_search_by_key lifetime. Issue #34683 #[derive(Debug)] diff --git a/src/test/run-pass/slowparse-bstring.rs b/src/test/run-pass/slowparse-bstring.rs index b2bbd7e9103d2..ee6be75be2216 100644 --- a/src/test/run-pass/slowparse-bstring.rs +++ b/src/test/run-pass/slowparse-bstring.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // Issue #16624 diff --git a/src/test/run-pass/slowparse-string.rs b/src/test/run-pass/slowparse-string.rs index 46b47c8537fe7..a2bf26f1e2757 100644 --- a/src/test/run-pass/slowparse-string.rs +++ b/src/test/run-pass/slowparse-string.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // Issue #16624 diff --git a/src/test/run-pass/small-enum-range-edge.rs b/src/test/run-pass/small-enum-range-edge.rs index 7b6f0a7c9abc8..4a83ad09f68e7 100644 --- a/src/test/run-pass/small-enum-range-edge.rs +++ b/src/test/run-pass/small-enum-range-edge.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests the range assertion wraparound case when reading discriminants. #[repr(u8)] diff --git a/src/test/run-pass/small-enums-with-fields.rs b/src/test/run-pass/small-enums-with-fields.rs index 86eed715f325a..0393690e147ae 100644 --- a/src/test/run-pass/small-enums-with-fields.rs +++ b/src/test/run-pass/small-enums-with-fields.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::mem::size_of; #[derive(PartialEq, Debug)] diff --git a/src/test/run-pass/snake-case-no-lowercase-equivalent.rs b/src/test/run-pass/snake-case-no-lowercase-equivalent.rs index 90ea7537c6e60..bea78055beed4 100644 --- a/src/test/run-pass/snake-case-no-lowercase-equivalent.rs +++ b/src/test/run-pass/snake-case-no-lowercase-equivalent.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(non_ascii_idents)] diff --git a/src/test/run-pass/spawn-fn.rs b/src/test/run-pass/spawn-fn.rs index 751d833ff9c8b..99c70c8d101ad 100644 --- a/src/test/run-pass/spawn-fn.rs +++ b/src/test/run-pass/spawn-fn.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/spawn-types.rs b/src/test/run-pass/spawn-types.rs index cab190d025f8b..29bfac5af3438 100644 --- a/src/test/run-pass/spawn-types.rs +++ b/src/test/run-pass/spawn-types.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support /* diff --git a/src/test/run-pass/spawn.rs b/src/test/run-pass/spawn.rs index c9a030cf053c7..7b898f24d7d65 100644 --- a/src/test/run-pass/spawn.rs +++ b/src/test/run-pass/spawn.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/spawn2.rs b/src/test/run-pass/spawn2.rs index 2a5fab8a20927..1e4d1cb16b8c7 100644 --- a/src/test/run-pass/spawn2.rs +++ b/src/test/run-pass/spawn2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/spawning-with-debug.rs b/src/test/run-pass/spawning-with-debug.rs index c09ddf5296661..f6fc36c59ce9f 100644 --- a/src/test/run-pass/spawning-with-debug.rs +++ b/src/test/run-pass/spawning-with-debug.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-windows // exec-env:RUST_LOG=debug // ignore-emscripten no threads support diff --git a/src/test/run-pass/specialization/assoc-ty-graph-cycle.rs b/src/test/run-pass/specialization/assoc-ty-graph-cycle.rs index a65dcf33d85b1..27ce57ddb6d91 100644 --- a/src/test/run-pass/specialization/assoc-ty-graph-cycle.rs +++ b/src/test/run-pass/specialization/assoc-ty-graph-cycle.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Make sure we don't crash with a cycle error during coherence. #![feature(specialization)] diff --git a/src/test/run-pass/specialization/auxiliary/cross_crates_defaults.rs b/src/test/run-pass/specialization/auxiliary/cross_crates_defaults.rs index b62d80b589fda..5cf975b5752f0 100644 --- a/src/test/run-pass/specialization/auxiliary/cross_crates_defaults.rs +++ b/src/test/run-pass/specialization/auxiliary/cross_crates_defaults.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![feature(specialization)] // First, test only use of explicit `default` items: diff --git a/src/test/run-pass/specialization/auxiliary/go_trait.rs b/src/test/run-pass/specialization/auxiliary/go_trait.rs index 044bb606b40e2..aa0ec22896d73 100644 --- a/src/test/run-pass/specialization/auxiliary/go_trait.rs +++ b/src/test/run-pass/specialization/auxiliary/go_trait.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(specialization)] // Common code used for tests that model the Fn/FnMut/FnOnce hierarchy. diff --git a/src/test/run-pass/specialization/auxiliary/specialization_cross_crate.rs b/src/test/run-pass/specialization/auxiliary/specialization_cross_crate.rs index 1d235336de821..8caa8524fb996 100644 --- a/src/test/run-pass/specialization/auxiliary/specialization_cross_crate.rs +++ b/src/test/run-pass/specialization/auxiliary/specialization_cross_crate.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(specialization)] pub trait Foo { diff --git a/src/test/run-pass/specialization/cross-crate-defaults.rs b/src/test/run-pass/specialization/cross-crate-defaults.rs index 132520dcb736e..a4bf01c657259 100644 --- a/src/test/run-pass/specialization/cross-crate-defaults.rs +++ b/src/test/run-pass/specialization/cross-crate-defaults.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:cross_crates_defaults.rs #![feature(specialization)] diff --git a/src/test/run-pass/specialization/defaultimpl/allowed-cross-crate.rs b/src/test/run-pass/specialization/defaultimpl/allowed-cross-crate.rs index 6b999f3835835..5f8ee06a4f4e6 100644 --- a/src/test/run-pass/specialization/defaultimpl/allowed-cross-crate.rs +++ b/src/test/run-pass/specialization/defaultimpl/allowed-cross-crate.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:go_trait.rs #![feature(specialization)] diff --git a/src/test/run-pass/specialization/defaultimpl/auxiliary/go_trait.rs b/src/test/run-pass/specialization/defaultimpl/auxiliary/go_trait.rs index dd060f8ef40dc..c065593b432d4 100644 --- a/src/test/run-pass/specialization/defaultimpl/auxiliary/go_trait.rs +++ b/src/test/run-pass/specialization/defaultimpl/auxiliary/go_trait.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(specialization)] // Common code used for tests that model the Fn/FnMut/FnOnce hierarchy. diff --git a/src/test/run-pass/specialization/defaultimpl/out-of-order.rs b/src/test/run-pass/specialization/defaultimpl/out-of-order.rs index f77b88e2f850a..8bd09053894f5 100644 --- a/src/test/run-pass/specialization/defaultimpl/out-of-order.rs +++ b/src/test/run-pass/specialization/defaultimpl/out-of-order.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that you can list the more specific impl before the more general one. #![feature(specialization)] diff --git a/src/test/run-pass/specialization/defaultimpl/overlap-projection.rs b/src/test/run-pass/specialization/defaultimpl/overlap-projection.rs index 500cded38c1ad..e63698685d5d3 100644 --- a/src/test/run-pass/specialization/defaultimpl/overlap-projection.rs +++ b/src/test/run-pass/specialization/defaultimpl/overlap-projection.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that impls on projected self types can resolve overlap, even when the // projections involve specialization, so long as the associated type is // provided by the most specialized impl. diff --git a/src/test/run-pass/specialization/defaultimpl/projection.rs b/src/test/run-pass/specialization/defaultimpl/projection.rs index 6a833ba6760f6..565592053dd5b 100644 --- a/src/test/run-pass/specialization/defaultimpl/projection.rs +++ b/src/test/run-pass/specialization/defaultimpl/projection.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(specialization)] // Make sure we *can* project non-defaulted associated types diff --git a/src/test/run-pass/specialization/defaultimpl/specialization-trait-item-not-implemented.rs b/src/test/run-pass/specialization/defaultimpl/specialization-trait-item-not-implemented.rs index fc7312020053e..dfa06bc03ca4f 100644 --- a/src/test/run-pass/specialization/defaultimpl/specialization-trait-item-not-implemented.rs +++ b/src/test/run-pass/specialization/defaultimpl/specialization-trait-item-not-implemented.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that we can combine a default impl that supplies one method with a // full impl that supplies the other, and they can invoke one another. diff --git a/src/test/run-pass/specialization/specialization-allowed-cross-crate.rs b/src/test/run-pass/specialization/specialization-allowed-cross-crate.rs index 6b999f3835835..5f8ee06a4f4e6 100644 --- a/src/test/run-pass/specialization/specialization-allowed-cross-crate.rs +++ b/src/test/run-pass/specialization/specialization-allowed-cross-crate.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:go_trait.rs #![feature(specialization)] diff --git a/src/test/run-pass/specialization/specialization-assoc-fns.rs b/src/test/run-pass/specialization/specialization-assoc-fns.rs index 577f217862da3..1dde6fb823ea6 100644 --- a/src/test/run-pass/specialization/specialization-assoc-fns.rs +++ b/src/test/run-pass/specialization/specialization-assoc-fns.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that non-method associated functions can be specialized #![feature(specialization)] diff --git a/src/test/run-pass/specialization/specialization-basics.rs b/src/test/run-pass/specialization/specialization-basics.rs index b11495e9edf1a..49c09d707e8e9 100644 --- a/src/test/run-pass/specialization/specialization-basics.rs +++ b/src/test/run-pass/specialization/specialization-basics.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(specialization)] // Tests a variety of basic specialization scenarios and method diff --git a/src/test/run-pass/specialization/specialization-cross-crate-no-gate.rs b/src/test/run-pass/specialization/specialization-cross-crate-no-gate.rs index b9548539e1649..0e9b99d52e3aa 100644 --- a/src/test/run-pass/specialization/specialization-cross-crate-no-gate.rs +++ b/src/test/run-pass/specialization/specialization-cross-crate-no-gate.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that specialization works even if only the upstream crate enables it // aux-build:specialization_cross_crate.rs diff --git a/src/test/run-pass/specialization/specialization-cross-crate.rs b/src/test/run-pass/specialization/specialization-cross-crate.rs index 7593ac4fb1dd2..3664ebe07b37d 100644 --- a/src/test/run-pass/specialization/specialization-cross-crate.rs +++ b/src/test/run-pass/specialization/specialization-cross-crate.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:specialization_cross_crate.rs #![feature(specialization)] diff --git a/src/test/run-pass/specialization/specialization-default-methods.rs b/src/test/run-pass/specialization/specialization-default-methods.rs index 9cfc6aabbb4f2..ef5f3b3756d31 100644 --- a/src/test/run-pass/specialization/specialization-default-methods.rs +++ b/src/test/run-pass/specialization/specialization-default-methods.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(specialization)] // Test that default methods are cascaded correctly diff --git a/src/test/run-pass/specialization/specialization-on-projection.rs b/src/test/run-pass/specialization/specialization-on-projection.rs index acf78def1b967..017e28b7f956e 100644 --- a/src/test/run-pass/specialization/specialization-on-projection.rs +++ b/src/test/run-pass/specialization/specialization-on-projection.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(specialization)] // Ensure that specialization works for impls defined directly on a projection diff --git a/src/test/run-pass/specialization/specialization-out-of-order.rs b/src/test/run-pass/specialization/specialization-out-of-order.rs index 2d293f494a347..3a462b42deaec 100644 --- a/src/test/run-pass/specialization/specialization-out-of-order.rs +++ b/src/test/run-pass/specialization/specialization-out-of-order.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that you can list the more specific impl before the more general one. #![feature(specialization)] diff --git a/src/test/run-pass/specialization/specialization-overlap-projection.rs b/src/test/run-pass/specialization/specialization-overlap-projection.rs index 20046ee66b0e2..4097ee47667b4 100644 --- a/src/test/run-pass/specialization/specialization-overlap-projection.rs +++ b/src/test/run-pass/specialization/specialization-overlap-projection.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that impls on projected self types can resolve overlap, even when the // projections involve specialization, so long as the associated type is // provided by the most specialized impl. diff --git a/src/test/run-pass/specialization/specialization-projection-alias.rs b/src/test/run-pass/specialization/specialization-projection-alias.rs index 7fce1cca582c1..b8c96d06a207f 100644 --- a/src/test/run-pass/specialization/specialization-projection-alias.rs +++ b/src/test/run-pass/specialization/specialization-projection-alias.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(specialization)] // Regression test for ICE when combining specialized associated types and type diff --git a/src/test/run-pass/specialization/specialization-projection.rs b/src/test/run-pass/specialization/specialization-projection.rs index 4e0bdec297fe2..143fa81aeb332 100644 --- a/src/test/run-pass/specialization/specialization-projection.rs +++ b/src/test/run-pass/specialization/specialization-projection.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(specialization)] // Make sure we *can* project non-defaulted associated types diff --git a/src/test/run-pass/specialization/specialization-super-traits.rs b/src/test/run-pass/specialization/specialization-super-traits.rs index a9b3bfca53d18..73dc63d24e41c 100644 --- a/src/test/run-pass/specialization/specialization-super-traits.rs +++ b/src/test/run-pass/specialization/specialization-super-traits.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(specialization)] // Test that you can specialize via an explicit trait hierarchy diff --git a/src/test/run-pass/specialization/specialization-translate-projections-with-lifetimes.rs b/src/test/run-pass/specialization/specialization-translate-projections-with-lifetimes.rs index 9702f63241377..af1b03741ca3c 100644 --- a/src/test/run-pass/specialization/specialization-translate-projections-with-lifetimes.rs +++ b/src/test/run-pass/specialization/specialization-translate-projections-with-lifetimes.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(specialization)] trait Iterator { diff --git a/src/test/run-pass/specialization/specialization-translate-projections-with-params.rs b/src/test/run-pass/specialization/specialization-translate-projections-with-params.rs index 647d5523c376c..ae750f8df82e4 100644 --- a/src/test/run-pass/specialization/specialization-translate-projections-with-params.rs +++ b/src/test/run-pass/specialization/specialization-translate-projections-with-params.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Ensure that provided items are inherited properly even when impls vary in // type parameters *and* rely on projections, and the type parameters are input // types on the trait. diff --git a/src/test/run-pass/specialization/specialization-translate-projections.rs b/src/test/run-pass/specialization/specialization-translate-projections.rs index 11e1d997fdda0..df4ef103c0ae6 100644 --- a/src/test/run-pass/specialization/specialization-translate-projections.rs +++ b/src/test/run-pass/specialization/specialization-translate-projections.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Ensure that provided items are inherited properly even when impls vary in // type parameters *and* rely on projections. diff --git a/src/test/run-pass/sse2.rs b/src/test/run-pass/sse2.rs index b1d7e5435c4cb..f610c37df3776 100644 --- a/src/test/run-pass/sse2.rs +++ b/src/test/run-pass/sse2.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // min-llvm-version 6.0 // ^ needs MCSubtargetInfo::checkFeatures() // ignore-cloudabi no std::env diff --git a/src/test/run-pass/stable-addr-of.rs b/src/test/run-pass/stable-addr-of.rs index 5ffceb2c6a8bc..2a256bbfa3932 100644 --- a/src/test/run-pass/stable-addr-of.rs +++ b/src/test/run-pass/stable-addr-of.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #2040 diff --git a/src/test/run-pass/stack-probes-lto.rs b/src/test/run-pass/stack-probes-lto.rs index ff5413ce06ca0..2705950b01424 100644 --- a/src/test/run-pass/stack-probes-lto.rs +++ b/src/test/run-pass/stack-probes-lto.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-arm // ignore-aarch64 // ignore-mips diff --git a/src/test/run-pass/stack-probes.rs b/src/test/run-pass/stack-probes.rs index 1334ab8dc6378..ff264421cfbcf 100644 --- a/src/test/run-pass/stack-probes.rs +++ b/src/test/run-pass/stack-probes.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-arm // ignore-aarch64 // ignore-mips diff --git a/src/test/run-pass/static-array-across-crate.rs b/src/test/run-pass/static-array-across-crate.rs index 732d94cee8ed3..dd7a86faa8095 100644 --- a/src/test/run-pass/static-array-across-crate.rs +++ b/src/test/run-pass/static-array-across-crate.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:pub_static_array.rs extern crate pub_static_array as array; diff --git a/src/test/run-pass/static-fn-inline-xc.rs b/src/test/run-pass/static-fn-inline-xc.rs index 80de65c0e9f65..60a4097151b3b 100644 --- a/src/test/run-pass/static-fn-inline-xc.rs +++ b/src/test/run-pass/static-fn-inline-xc.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:static_fn_inline_xc_aux.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/static-fn-trait-xc.rs b/src/test/run-pass/static-fn-trait-xc.rs index 550e03c8b12fb..3adeaa36b78e3 100644 --- a/src/test/run-pass/static-fn-trait-xc.rs +++ b/src/test/run-pass/static-fn-trait-xc.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:static_fn_trait_xc_aux.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/static-function-pointer-xc.rs b/src/test/run-pass/static-function-pointer-xc.rs index a09928bd2208f..6b138fb24fd83 100644 --- a/src/test/run-pass/static-function-pointer-xc.rs +++ b/src/test/run-pass/static-function-pointer-xc.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:static-function-pointer-aux.rs extern crate static_function_pointer_aux as aux; diff --git a/src/test/run-pass/static-function-pointer.rs b/src/test/run-pass/static-function-pointer.rs index be297524309d2..5436197c105c7 100644 --- a/src/test/run-pass/static-function-pointer.rs +++ b/src/test/run-pass/static-function-pointer.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn f(x: isize) -> isize { x } fn g(x: isize) -> isize { 2 * x } diff --git a/src/test/run-pass/static-impl.rs b/src/test/run-pass/static-impl.rs index 89fd83ced4c8c..827e0c45b2472 100644 --- a/src/test/run-pass/static-impl.rs +++ b/src/test/run-pass/static-impl.rs @@ -1,16 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - pub trait plus { fn plus(&self) -> isize; } diff --git a/src/test/run-pass/static-method-in-trait-with-tps-intracrate.rs b/src/test/run-pass/static-method-in-trait-with-tps-intracrate.rs index c2b3a9a72283b..eef6b6686281b 100644 --- a/src/test/run-pass/static-method-in-trait-with-tps-intracrate.rs +++ b/src/test/run-pass/static-method-in-trait-with-tps-intracrate.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Deserializer { fn read_int(&self) -> isize; } diff --git a/src/test/run-pass/static-method-xcrate.rs b/src/test/run-pass/static-method-xcrate.rs index ab6adcbbffe7a..69dab807f678a 100644 --- a/src/test/run-pass/static-method-xcrate.rs +++ b/src/test/run-pass/static-method-xcrate.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:static-methods-crate.rs extern crate static_methods_crate; diff --git a/src/test/run-pass/static-methods-in-traits.rs b/src/test/run-pass/static-methods-in-traits.rs index 3fd3bbe936fff..c1c64da7adc29 100644 --- a/src/test/run-pass/static-methods-in-traits.rs +++ b/src/test/run-pass/static-methods-in-traits.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - mod a { pub trait Foo { fn foo() -> Self; diff --git a/src/test/run-pass/static-methods-in-traits2.rs b/src/test/run-pass/static-methods-in-traits2.rs index cd8406983fbb3..12d645cc1419f 100644 --- a/src/test/run-pass/static-methods-in-traits2.rs +++ b/src/test/run-pass/static-methods-in-traits2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub trait Number: NumConv { diff --git a/src/test/run-pass/static-mut-foreign.rs b/src/test/run-pass/static-mut-foreign.rs index 2b7fa0166a8ed..39f7ae0e37674 100644 --- a/src/test/run-pass/static-mut-foreign.rs +++ b/src/test/run-pass/static-mut-foreign.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Constants (static variables) can be used to match in patterns, but mutable // statics cannot. This ensures that there's some form of error if this is // attempted. diff --git a/src/test/run-pass/static-mut-xc.rs b/src/test/run-pass/static-mut-xc.rs index 5911b6cfa8504..922e4310d1cdf 100644 --- a/src/test/run-pass/static-mut-xc.rs +++ b/src/test/run-pass/static-mut-xc.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Constants (static variables) can be used to match in patterns, but mutable // statics cannot. This ensures that there's some form of error if this is // attempted. diff --git a/src/test/run-pass/static-recursive.rs b/src/test/run-pass/static-recursive.rs index 4a6ba984eef0a..0a0d7c7c6ac86 100644 --- a/src/test/run-pass/static-recursive.rs +++ b/src/test/run-pass/static-recursive.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - static mut S: *const u8 = unsafe { &S as *const *const u8 as *const u8 }; struct StaticDoubleLinked { diff --git a/src/test/run-pass/std-sync-right-kind-impls.rs b/src/test/run-pass/std-sync-right-kind-impls.rs index 1ad04493528b4..df6b50c696938 100644 --- a/src/test/run-pass/std-sync-right-kind-impls.rs +++ b/src/test/run-pass/std-sync-right-kind-impls.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 use std::sync; diff --git a/src/test/run-pass/stdio-is-blocking.rs b/src/test/run-pass/stdio-is-blocking.rs index 8d4ee14628408..281c6a17aa997 100644 --- a/src/test/run-pass/stdio-is-blocking.rs +++ b/src/test/run-pass/stdio-is-blocking.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/stmt_expr_attr_macro_parse.rs b/src/test/run-pass/stmt_expr_attr_macro_parse.rs index 23559e8789bf5..2f94922b22623 100644 --- a/src/test/run-pass/stmt_expr_attr_macro_parse.rs +++ b/src/test/run-pass/stmt_expr_attr_macro_parse.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! m { ($e:expr) => { "expr includes attr" diff --git a/src/test/run-pass/str-concat.rs b/src/test/run-pass/str-concat.rs index ad0d2f11abd86..a0392f479c8d4 100644 --- a/src/test/run-pass/str-concat.rs +++ b/src/test/run-pass/str-concat.rs @@ -1,16 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - pub fn main() { let a: String = "hello".to_string(); let b: String = "world".to_string(); diff --git a/src/test/run-pass/str-multiline.rs b/src/test/run-pass/str-multiline.rs index 94e14290498b8..faf992fabf167 100644 --- a/src/test/run-pass/str-multiline.rs +++ b/src/test/run-pass/str-multiline.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { let a: String = "this \ is a test".to_string(); diff --git a/src/test/run-pass/string-box-error.rs b/src/test/run-pass/string-box-error.rs index a80d9a0593566..396343883364c 100644 --- a/src/test/run-pass/string-box-error.rs +++ b/src/test/run-pass/string-box-error.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Ensure that both `Box` and `Box` can be obtained from `String`. use std::error::Error; diff --git a/src/test/run-pass/string-escapes.rs b/src/test/run-pass/string-escapes.rs index acd9e0675aed9..6013173f31349 100644 --- a/src/test/run-pass/string-escapes.rs +++ b/src/test/run-pass/string-escapes.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn main() { let x = "\\\\\ "; diff --git a/src/test/run-pass/string-self-append.rs b/src/test/run-pass/string-self-append.rs index cef7a93aeeddc..480378102d749 100644 --- a/src/test/run-pass/string-self-append.rs +++ b/src/test/run-pass/string-self-append.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { // Make sure we properly handle repeated self-appends. let mut a: String = "A".to_string(); diff --git a/src/test/run-pass/struct-aliases-xcrate.rs b/src/test/run-pass/struct-aliases-xcrate.rs index 2ca9d599d84a0..7c51a9dd2deef 100644 --- a/src/test/run-pass/struct-aliases-xcrate.rs +++ b/src/test/run-pass/struct-aliases-xcrate.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:xcrate_struct_aliases.rs extern crate xcrate_struct_aliases; diff --git a/src/test/run-pass/struct-aliases.rs b/src/test/run-pass/struct-aliases.rs index f1337a5b07974..d43cd012509ce 100644 --- a/src/test/run-pass/struct-aliases.rs +++ b/src/test/run-pass/struct-aliases.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::mem; struct S { diff --git a/src/test/run-pass/struct-destructuring-cross-crate.rs b/src/test/run-pass/struct-destructuring-cross-crate.rs index 63e8d694ddb56..b2b0dbf9bff0b 100644 --- a/src/test/run-pass/struct-destructuring-cross-crate.rs +++ b/src/test/run-pass/struct-destructuring-cross-crate.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:struct_destructuring_cross_crate.rs diff --git a/src/test/run-pass/struct-field-shorthand.rs b/src/test/run-pass/struct-field-shorthand.rs index b61e232200c9a..6e65aba0cb742 100644 --- a/src/test/run-pass/struct-field-shorthand.rs +++ b/src/test/run-pass/struct-field-shorthand.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { x: i32, y: bool, diff --git a/src/test/run-pass/struct-like-variant-construct.rs b/src/test/run-pass/struct-like-variant-construct.rs index a55e5143a0bfb..eb7a589a7e8d1 100644 --- a/src/test/run-pass/struct-like-variant-construct.rs +++ b/src/test/run-pass/struct-like-variant-construct.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 enum Foo { diff --git a/src/test/run-pass/struct-like-variant-match.rs b/src/test/run-pass/struct-like-variant-match.rs index 175090eadd982..0d4963592a862 100644 --- a/src/test/run-pass/struct-like-variant-match.rs +++ b/src/test/run-pass/struct-like-variant-match.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum Foo { Bar { x: isize, diff --git a/src/test/run-pass/struct-lit-functional-no-fields.rs b/src/test/run-pass/struct-lit-functional-no-fields.rs index c3b1ff0f057be..640860bcc5ca2 100644 --- a/src/test/run-pass/struct-lit-functional-no-fields.rs +++ b/src/test/run-pass/struct-lit-functional-no-fields.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug,PartialEq,Clone)] struct Foo { bar: T, diff --git a/src/test/run-pass/struct-literal-dtor.rs b/src/test/run-pass/struct-literal-dtor.rs index 61607cffc47fc..37977eb06cda3 100644 --- a/src/test/run-pass/struct-literal-dtor.rs +++ b/src/test/run-pass/struct-literal-dtor.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct foo { x: String, } diff --git a/src/test/run-pass/struct-new-as-field-name.rs b/src/test/run-pass/struct-new-as-field-name.rs index 7fb3a64e02b88..3bc61eaf36105 100644 --- a/src/test/run-pass/struct-new-as-field-name.rs +++ b/src/test/run-pass/struct-new-as-field-name.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct Foo { new: isize, } diff --git a/src/test/run-pass/struct-order-of-eval-1.rs b/src/test/run-pass/struct-order-of-eval-1.rs index b5e4011bbea58..e763bb18f5c7a 100644 --- a/src/test/run-pass/struct-order-of-eval-1.rs +++ b/src/test/run-pass/struct-order-of-eval-1.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct S { f0: String, f1: isize } pub fn main() { diff --git a/src/test/run-pass/struct-order-of-eval-2.rs b/src/test/run-pass/struct-order-of-eval-2.rs index 7ec28f597edbe..2aa9d985aa27c 100644 --- a/src/test/run-pass/struct-order-of-eval-2.rs +++ b/src/test/run-pass/struct-order-of-eval-2.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct S { f0: String, f1: String, diff --git a/src/test/run-pass/struct-order-of-eval-3.rs b/src/test/run-pass/struct-order-of-eval-3.rs index 3059c8e9e8963..28a47600b5f26 100644 --- a/src/test/run-pass/struct-order-of-eval-3.rs +++ b/src/test/run-pass/struct-order-of-eval-3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Checks that functional-record-update order-of-eval is as expected // even when no Drop-implementations are involved. diff --git a/src/test/run-pass/struct-order-of-eval-4.rs b/src/test/run-pass/struct-order-of-eval-4.rs index 2ae9ebc34e1b3..9893999f6124a 100644 --- a/src/test/run-pass/struct-order-of-eval-4.rs +++ b/src/test/run-pass/struct-order-of-eval-4.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Checks that struct-literal expression order-of-eval is as expected // even when no Drop-implementations are involved. diff --git a/src/test/run-pass/struct-partial-move-1.rs b/src/test/run-pass/struct-partial-move-1.rs index 3b04bfc1acca0..35e1c1426cfe3 100644 --- a/src/test/run-pass/struct-partial-move-1.rs +++ b/src/test/run-pass/struct-partial-move-1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(PartialEq, Debug)] pub struct Partial { x: T, y: T } diff --git a/src/test/run-pass/struct-partial-move-2.rs b/src/test/run-pass/struct-partial-move-2.rs index b9c697c71eaaa..9e898485eb73a 100644 --- a/src/test/run-pass/struct-partial-move-2.rs +++ b/src/test/run-pass/struct-partial-move-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(PartialEq, Debug)] pub struct Partial { x: T, y: T } diff --git a/src/test/run-pass/struct-path-associated-type.rs b/src/test/run-pass/struct-path-associated-type.rs index b033ed5c80210..a5933d460cb68 100644 --- a/src/test/run-pass/struct-path-associated-type.rs +++ b/src/test/run-pass/struct-path-associated-type.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S { a: T, b: U, diff --git a/src/test/run-pass/struct-path-self.rs b/src/test/run-pass/struct-path-self.rs index c7a282c2a2fa0..bb8ed3df567b6 100644 --- a/src/test/run-pass/struct-path-self.rs +++ b/src/test/run-pass/struct-path-self.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::Add; struct S { diff --git a/src/test/run-pass/struct-pattern-matching.rs b/src/test/run-pass/struct-pattern-matching.rs index 9c3ce54f36914..ab7f9152ce8de 100644 --- a/src/test/run-pass/struct-pattern-matching.rs +++ b/src/test/run-pass/struct-pattern-matching.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { x: isize, y: isize, diff --git a/src/test/run-pass/struct-return.rs b/src/test/run-pass/struct-return.rs index 61a2bcb3a9b75..50fd9c90447df 100644 --- a/src/test/run-pass/struct-return.rs +++ b/src/test/run-pass/struct-return.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare no libc to test ffi with #[repr(C)] diff --git a/src/test/run-pass/struct-variant-field-visibility.rs b/src/test/run-pass/struct-variant-field-visibility.rs index b6e7846e96d03..667e8dfd739a3 100644 --- a/src/test/run-pass/struct-variant-field-visibility.rs +++ b/src/test/run-pass/struct-variant-field-visibility.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 mod foo { diff --git a/src/test/run-pass/struct_variant_xc.rs b/src/test/run-pass/struct_variant_xc.rs index 602650e4e06a3..5766264337569 100644 --- a/src/test/run-pass/struct_variant_xc.rs +++ b/src/test/run-pass/struct_variant_xc.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:struct_variant_xc_aux.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/struct_variant_xc_match.rs b/src/test/run-pass/struct_variant_xc_match.rs index 3ceb65bcfdeb1..236a229f940e5 100644 --- a/src/test/run-pass/struct_variant_xc_match.rs +++ b/src/test/run-pass/struct_variant_xc_match.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:struct_variant_xc_aux.rs extern crate struct_variant_xc_aux; diff --git a/src/test/run-pass/structured-compare.rs b/src/test/run-pass/structured-compare.rs index 7974366c395fc..4b82033a202b3 100644 --- a/src/test/run-pass/structured-compare.rs +++ b/src/test/run-pass/structured-compare.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - #[derive(Copy, Clone, Debug)] enum foo { large, small, } diff --git a/src/test/run-pass/super-fast-paren-parsing.rs b/src/test/run-pass/super-fast-paren-parsing.rs index a1bbd19021127..3253c21ac50ca 100644 --- a/src/test/run-pass/super-fast-paren-parsing.rs +++ b/src/test/run-pass/super-fast-paren-parsing.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // exec-env:RUST_MIN_STACK=16000000 // rustc-env:RUST_MIN_STACK=16000000 // diff --git a/src/test/run-pass/super.rs b/src/test/run-pass/super.rs index 51520c77751b0..81493c7d67fa0 100644 --- a/src/test/run-pass/super.rs +++ b/src/test/run-pass/super.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub mod a { diff --git a/src/test/run-pass/supertrait-default-generics.rs b/src/test/run-pass/supertrait-default-generics.rs index 8351cc50fd822..47d724a9ea03f 100644 --- a/src/test/run-pass/supertrait-default-generics.rs +++ b/src/test/run-pass/supertrait-default-generics.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // There is some other borrowck bug, so we make the stuff not mut. diff --git a/src/test/run-pass/supported-cast.rs b/src/test/run-pass/supported-cast.rs index 7f92707586b28..9d875c59d87ca 100644 --- a/src/test/run-pass/supported-cast.rs +++ b/src/test/run-pass/supported-cast.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { let f = 1_usize as *const String; println!("{:?}", f as isize); diff --git a/src/test/run-pass/svh-add-nothing.rs b/src/test/run-pass/svh-add-nothing.rs index aca50859b6eda..b673fa55e3817 100644 --- a/src/test/run-pass/svh-add-nothing.rs +++ b/src/test/run-pass/svh-add-nothing.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // note that these aux-build directives must be in this order // aux-build:svh-a-base.rs // aux-build:svh-b.rs diff --git a/src/test/run-pass/swap-1.rs b/src/test/run-pass/swap-1.rs index 12e72aac38d4a..55f9c1b6fa2d2 100644 --- a/src/test/run-pass/swap-1.rs +++ b/src/test/run-pass/swap-1.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::mem::swap; pub fn main() { diff --git a/src/test/run-pass/swap-2.rs b/src/test/run-pass/swap-2.rs index 4601b7d7cf567..42b17ef8b78ef 100644 --- a/src/test/run-pass/swap-2.rs +++ b/src/test/run-pass/swap-2.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::mem::swap; pub fn main() { diff --git a/src/test/run-pass/swap-overlapping.rs b/src/test/run-pass/swap-overlapping.rs index 2e5386d6866ed..fdf1a7002928c 100644 --- a/src/test/run-pass/swap-overlapping.rs +++ b/src/test/run-pass/swap-overlapping.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #5041 - avoid overlapping memcpy when src and dest of a swap are the same // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/sync-send-atomics.rs b/src/test/run-pass/sync-send-atomics.rs index 1ead6268d0c2a..d264d8a6f8517 100644 --- a/src/test/run-pass/sync-send-atomics.rs +++ b/src/test/run-pass/sync-send-atomics.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 use std::sync::atomic::*; diff --git a/src/test/run-pass/sync-send-in-std.rs b/src/test/run-pass/sync-send-in-std.rs index 335a9c0d8bedb..f2ac8f6cd1cb3 100644 --- a/src/test/run-pass/sync-send-in-std.rs +++ b/src/test/run-pass/sync-send-in-std.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi networking not available // ignore-wasm32-bare networking not available diff --git a/src/test/run-pass/sync-send-iterators-in-libcollections.rs b/src/test/run-pass/sync-send-iterators-in-libcollections.rs index e9584e12b2e3e..1c5325fe7313b 100644 --- a/src/test/run-pass/sync-send-iterators-in-libcollections.rs +++ b/src/test/run-pass/sync-send-iterators-in-libcollections.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(warnings)] #![feature(drain, collections_bound, btree_range)] diff --git a/src/test/run-pass/sync-send-iterators-in-libcore.rs b/src/test/run-pass/sync-send-iterators-in-libcore.rs index 55269a2866631..867172caaa299 100644 --- a/src/test/run-pass/sync-send-iterators-in-libcore.rs +++ b/src/test/run-pass/sync-send-iterators-in-libcore.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![allow(warnings)] diff --git a/src/test/run-pass/syntax-extension-cfg.rs b/src/test/run-pass/syntax-extension-cfg.rs index c1d8713b20e6b..b7ba297de3659 100644 --- a/src/test/run-pass/syntax-extension-cfg.rs +++ b/src/test/run-pass/syntax-extension-cfg.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --cfg foo --cfg qux="foo" diff --git a/src/test/run-pass/syntax-extension-source-utils.rs b/src/test/run-pass/syntax-extension-source-utils.rs index 1b2741f14b63b..1dcec48b16633 100644 --- a/src/test/run-pass/syntax-extension-source-utils.rs +++ b/src/test/run-pass/syntax-extension-source-utils.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty issue #37195 pub mod m1 { diff --git a/src/test/run-pass/syntax-trait-polarity.rs b/src/test/run-pass/syntax-trait-polarity.rs index f69b857981d78..33e2daee76481 100644 --- a/src/test/run-pass/syntax-trait-polarity.rs +++ b/src/test/run-pass/syntax-trait-polarity.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(optin_builtin_traits)] diff --git a/src/test/run-pass/tag-align-dyn-u64.rs b/src/test/run-pass/tag-align-dyn-u64.rs index aaac1869af54f..f7a61f45e2e0b 100644 --- a/src/test/run-pass/tag-align-dyn-u64.rs +++ b/src/test/run-pass/tag-align-dyn-u64.rs @@ -1,14 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::mem; enum Tag { diff --git a/src/test/run-pass/tag-align-dyn-variants.rs b/src/test/run-pass/tag-align-dyn-variants.rs index 1c3fb209e35a3..d41c7d3992ab9 100644 --- a/src/test/run-pass/tag-align-dyn-variants.rs +++ b/src/test/run-pass/tag-align-dyn-variants.rs @@ -1,14 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::mem; enum Tag { diff --git a/src/test/run-pass/tag-align-shape.rs b/src/test/run-pass/tag-align-shape.rs index 5db886c815b2a..371935843b188 100644 --- a/src/test/run-pass/tag-align-shape.rs +++ b/src/test/run-pass/tag-align-shape.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug)] enum a_tag { a_tag_var(u64) diff --git a/src/test/run-pass/tag-align-u64.rs b/src/test/run-pass/tag-align-u64.rs index 43485a5bfcb63..3cfbadaf0fc89 100644 --- a/src/test/run-pass/tag-align-u64.rs +++ b/src/test/run-pass/tag-align-u64.rs @@ -1,14 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::mem; enum Tag { diff --git a/src/test/run-pass/tag-disr-val-shape.rs b/src/test/run-pass/tag-disr-val-shape.rs index fba3f9fb0d028..194aeb2f8c6c1 100644 --- a/src/test/run-pass/tag-disr-val-shape.rs +++ b/src/test/run-pass/tag-disr-val-shape.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug)] enum color { red = 0xff0000, diff --git a/src/test/run-pass/tag-exports.rs b/src/test/run-pass/tag-exports.rs index d797fd2e54f46..966a9ccd3bad1 100644 --- a/src/test/run-pass/tag-exports.rs +++ b/src/test/run-pass/tag-exports.rs @@ -1,14 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // pretty-expanded FIXME #23616 use alder::*; diff --git a/src/test/run-pass/tag-in-block.rs b/src/test/run-pass/tag-in-block.rs index f1a820c8d816e..0bc0b6fad0815 100644 --- a/src/test/run-pass/tag-in-block.rs +++ b/src/test/run-pass/tag-in-block.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - // pretty-expanded FIXME #23616 fn foo() { diff --git a/src/test/run-pass/tag-variant-disr-type-mismatch.rs b/src/test/run-pass/tag-variant-disr-type-mismatch.rs index d31eacc99769f..8c0838b458447 100644 --- a/src/test/run-pass/tag-variant-disr-type-mismatch.rs +++ b/src/test/run-pass/tag-variant-disr-type-mismatch.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 enum color { diff --git a/src/test/run-pass/tag-variant-disr-val.rs b/src/test/run-pass/tag-variant-disr-val.rs index 9a2b3b1ff0017..36ebf2b3b1be5 100644 --- a/src/test/run-pass/tag-variant-disr-val.rs +++ b/src/test/run-pass/tag-variant-disr-val.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use color::{red, green, blue, black, white, imaginary, purple, orange}; #[derive(Copy, Clone)] diff --git a/src/test/run-pass/tag.rs b/src/test/run-pass/tag.rs index e3cfceb0d426f..742fcdfc34df9 100644 --- a/src/test/run-pass/tag.rs +++ b/src/test/run-pass/tag.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - enum colour { red(isize, isize), green, } impl PartialEq for colour { diff --git a/src/test/run-pass/tail-call-arg-leak.rs b/src/test/run-pass/tail-call-arg-leak.rs index 8842e1b85915b..53ec5ea7ff7ba 100644 --- a/src/test/run-pass/tail-call-arg-leak.rs +++ b/src/test/run-pass/tail-call-arg-leak.rs @@ -1,16 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - // use of tail calls causes arg slot leaks, issue #160. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/tail-cps.rs b/src/test/run-pass/tail-cps.rs index b6313905923d6..c945f3de0cad7 100644 --- a/src/test/run-pass/tail-cps.rs +++ b/src/test/run-pass/tail-cps.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn checktrue(rs: bool) -> bool { assert!((rs)); return true; } pub fn main() { let k = checktrue; evenk(42, k); oddk(45, k); } diff --git a/src/test/run-pass/tail-direct.rs b/src/test/run-pass/tail-direct.rs index 4a7a0acdfa891..47847ee6db9e9 100644 --- a/src/test/run-pass/tail-direct.rs +++ b/src/test/run-pass/tail-direct.rs @@ -1,17 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - - pub fn main() { assert!((even(42))); assert!((odd(45))); } fn even(n: isize) -> bool { if n == 0 { return true; } else { return odd(n - 1); } } diff --git a/src/test/run-pass/task-comm-0.rs b/src/test/run-pass/task-comm-0.rs index 01e6d4cf7dee4..68fc7d267d458 100644 --- a/src/test/run-pass/task-comm-0.rs +++ b/src/test/run-pass/task-comm-0.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/task-comm-1.rs b/src/test/run-pass/task-comm-1.rs index 3295e68ac4e3a..81b1037511fce 100644 --- a/src/test/run-pass/task-comm-1.rs +++ b/src/test/run-pass/task-comm-1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/task-comm-10.rs b/src/test/run-pass/task-comm-10.rs index a69bba82ff0cd..089609616c080 100644 --- a/src/test/run-pass/task-comm-10.rs +++ b/src/test/run-pass/task-comm-10.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/task-comm-11.rs b/src/test/run-pass/task-comm-11.rs index c7beeb53850ef..7fd4c820616de 100644 --- a/src/test/run-pass/task-comm-11.rs +++ b/src/test/run-pass/task-comm-11.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 // ignore-emscripten no threads support diff --git a/src/test/run-pass/task-comm-12.rs b/src/test/run-pass/task-comm-12.rs index 23594cebf3183..36d55b286d702 100644 --- a/src/test/run-pass/task-comm-12.rs +++ b/src/test/run-pass/task-comm-12.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/task-comm-13.rs b/src/test/run-pass/task-comm-13.rs index b48299703769a..8c7f64bae40ef 100644 --- a/src/test/run-pass/task-comm-13.rs +++ b/src/test/run-pass/task-comm-13.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support use std::sync::mpsc::{channel, Sender}; diff --git a/src/test/run-pass/task-comm-14.rs b/src/test/run-pass/task-comm-14.rs index a03ff8719bba8..644680649838f 100644 --- a/src/test/run-pass/task-comm-14.rs +++ b/src/test/run-pass/task-comm-14.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support use std::sync::mpsc::{channel, Sender}; diff --git a/src/test/run-pass/task-comm-15.rs b/src/test/run-pass/task-comm-15.rs index fc5a891d1d667..ece4617c1c6d9 100644 --- a/src/test/run-pass/task-comm-15.rs +++ b/src/test/run-pass/task-comm-15.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/task-comm-16.rs b/src/test/run-pass/task-comm-16.rs index 0caf21ead3969..87eb1ca1d6734 100644 --- a/src/test/run-pass/task-comm-16.rs +++ b/src/test/run-pass/task-comm-16.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::sync::mpsc::channel; use std::cmp; diff --git a/src/test/run-pass/task-comm-17.rs b/src/test/run-pass/task-comm-17.rs index ca6f5c164ed37..19513725a298e 100644 --- a/src/test/run-pass/task-comm-17.rs +++ b/src/test/run-pass/task-comm-17.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/task-comm-3.rs b/src/test/run-pass/task-comm-3.rs index 8d2d3afc78777..d312214d7a527 100644 --- a/src/test/run-pass/task-comm-3.rs +++ b/src/test/run-pass/task-comm-3.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/task-comm-4.rs b/src/test/run-pass/task-comm-4.rs index e70a00591d6c9..9bebaaebf603c 100644 --- a/src/test/run-pass/task-comm-4.rs +++ b/src/test/run-pass/task-comm-4.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_assignment)] use std::sync::mpsc::channel; diff --git a/src/test/run-pass/task-comm-5.rs b/src/test/run-pass/task-comm-5.rs index cd5cb677d460b..1792803cc63e6 100644 --- a/src/test/run-pass/task-comm-5.rs +++ b/src/test/run-pass/task-comm-5.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::sync::mpsc::channel; pub fn main() { test00(); } diff --git a/src/test/run-pass/task-comm-6.rs b/src/test/run-pass/task-comm-6.rs index b8b5773ade546..7c8294c95f917 100644 --- a/src/test/run-pass/task-comm-6.rs +++ b/src/test/run-pass/task-comm-6.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![allow(dead_assignment)] use std::sync::mpsc::channel; diff --git a/src/test/run-pass/task-comm-7.rs b/src/test/run-pass/task-comm-7.rs index 7ab267ea66c1d..ff005721f27b7 100644 --- a/src/test/run-pass/task-comm-7.rs +++ b/src/test/run-pass/task-comm-7.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support #![allow(dead_assignment)] diff --git a/src/test/run-pass/task-comm-9.rs b/src/test/run-pass/task-comm-9.rs index 1f0eebf1f715b..cac3ba2496784 100644 --- a/src/test/run-pass/task-comm-9.rs +++ b/src/test/run-pass/task-comm-9.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/task-comm-chan-nil.rs b/src/test/run-pass/task-comm-chan-nil.rs index 3b9ec42169150..362db4020e80c 100644 --- a/src/test/run-pass/task-comm-chan-nil.rs +++ b/src/test/run-pass/task-comm-chan-nil.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::sync::mpsc::channel; // rustboot can't transmit nils across channels because they don't have diff --git a/src/test/run-pass/task-life-0.rs b/src/test/run-pass/task-life-0.rs index 34ea43ca82799..416cabd12d548 100644 --- a/src/test/run-pass/task-life-0.rs +++ b/src/test/run-pass/task-life-0.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/task-spawn-move-and-copy.rs b/src/test/run-pass/task-spawn-move-and-copy.rs index 94b69a1c3e477..247bd94ad864a 100644 --- a/src/test/run-pass/task-spawn-move-and-copy.rs +++ b/src/test/run-pass/task-spawn-move-and-copy.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support #![feature(box_syntax)] diff --git a/src/test/run-pass/task-stderr.rs b/src/test/run-pass/task-stderr.rs index 13d5cc989e94d..9db1503da56c7 100644 --- a/src/test/run-pass/task-stderr.rs +++ b/src/test/run-pass/task-stderr.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support #![feature(box_syntax, set_stdio)] diff --git a/src/test/run-pass/tcp-stress.rs b/src/test/run-pass/tcp-stress.rs index 30da1e523fc52..c90f9024af141 100644 --- a/src/test/run-pass/tcp-stress.rs +++ b/src/test/run-pass/tcp-stress.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-android needs extra network permissions // ignore-bitrig system ulimit (Too many open files) // ignore-cloudabi no global network namespace access diff --git a/src/test/run-pass/terminate-in-initializer.rs b/src/test/run-pass/terminate-in-initializer.rs index c9133bae85408..cd9d093160635 100644 --- a/src/test/run-pass/terminate-in-initializer.rs +++ b/src/test/run-pass/terminate-in-initializer.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support // Issue #787 diff --git a/src/test/run-pass/test-allow-dead-extern-static-no-warning.rs b/src/test/run-pass/test-allow-dead-extern-static-no-warning.rs index 8df32b54b8530..aa95f55e88e3b 100644 --- a/src/test/run-pass/test-allow-dead-extern-static-no-warning.rs +++ b/src/test/run-pass/test-allow-dead-extern-static-no-warning.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --test #![deny(dead_code)] diff --git a/src/test/run-pass/test-allow-fail-attr.rs b/src/test/run-pass/test-allow-fail-attr.rs index 884633df66b1b..0c3c2a4248852 100644 --- a/src/test/run-pass/test-allow-fail-attr.rs +++ b/src/test/run-pass/test-allow-fail-attr.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare compiled with panic=abort by default // compile-flags: --test #![feature(allow_fail)] diff --git a/src/test/run-pass/test-allow-non-camel-case-variant.rs b/src/test/run-pass/test-allow-non-camel-case-variant.rs index c7073b3a95e12..da3ef7e0c0b0b 100644 --- a/src/test/run-pass/test-allow-non-camel-case-variant.rs +++ b/src/test/run-pass/test-allow-non-camel-case-variant.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(non_camel_case_types)] pub enum Foo { diff --git a/src/test/run-pass/test-fn-signature-verification-for-explicit-return-type.rs b/src/test/run-pass/test-fn-signature-verification-for-explicit-return-type.rs index 10ad838d3cb87..a9d09d0398d5b 100644 --- a/src/test/run-pass/test-fn-signature-verification-for-explicit-return-type.rs +++ b/src/test/run-pass/test-fn-signature-verification-for-explicit-return-type.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(test)] // compile-flags: --test diff --git a/src/test/run-pass/test-main-not-dead-attr.rs b/src/test/run-pass/test-main-not-dead-attr.rs index 295559b6ddb6f..fb596dade8fe4 100644 --- a/src/test/run-pass/test-main-not-dead-attr.rs +++ b/src/test/run-pass/test-main-not-dead-attr.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --test #![feature(main)] diff --git a/src/test/run-pass/test-main-not-dead.rs b/src/test/run-pass/test-main-not-dead.rs index 7de3ca7479659..97ab2e3083110 100644 --- a/src/test/run-pass/test-main-not-dead.rs +++ b/src/test/run-pass/test-main-not-dead.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --test #![deny(dead_code)] diff --git a/src/test/run-pass/test-runner-hides-buried-main.rs b/src/test/run-pass/test-runner-hides-buried-main.rs index 7ba10850403e0..4295f8bbf4cd3 100644 --- a/src/test/run-pass/test-runner-hides-buried-main.rs +++ b/src/test/run-pass/test-runner-hides-buried-main.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --test #![feature(main)] diff --git a/src/test/run-pass/test-runner-hides-main.rs b/src/test/run-pass/test-runner-hides-main.rs index 7b696c1f8d27c..664d9153caf0d 100644 --- a/src/test/run-pass/test-runner-hides-main.rs +++ b/src/test/run-pass/test-runner-hides-main.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:--test // Building as a test runner means that a synthetic main will be run, // not ours diff --git a/src/test/run-pass/test-runner-hides-start.rs b/src/test/run-pass/test-runner-hides-start.rs index fc94b19ada1fb..2634df10f2662 100644 --- a/src/test/run-pass/test-runner-hides-start.rs +++ b/src/test/run-pass/test-runner-hides-start.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --test #![feature(start)] diff --git a/src/test/run-pass/test-should-fail-good-message.rs b/src/test/run-pass/test-should-fail-good-message.rs index 360d4952d16aa..d7d9c6c1edc71 100644 --- a/src/test/run-pass/test-should-fail-good-message.rs +++ b/src/test/run-pass/test-should-fail-good-message.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare compiled with panic=abort by default // compile-flags: --test #[test] diff --git a/src/test/run-pass/test-vs-cfg-test.rs b/src/test/run-pass/test-vs-cfg-test.rs index 708fde5988862..75f4d0c8db23a 100644 --- a/src/test/run-pass/test-vs-cfg-test.rs +++ b/src/test/run-pass/test-vs-cfg-test.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --cfg test // Make sure `--cfg test` does not inject test harness diff --git a/src/test/run-pass/thin-lto-global-allocator.rs b/src/test/run-pass/thin-lto-global-allocator.rs index 257d5bbc30677..18869cf66da81 100644 --- a/src/test/run-pass/thin-lto-global-allocator.rs +++ b/src/test/run-pass/thin-lto-global-allocator.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z thinlto -C codegen-units=2 #[global_allocator] diff --git a/src/test/run-pass/thinlto/all-crates.rs b/src/test/run-pass/thinlto/all-crates.rs index 8d68202d71176..3636d046d835e 100644 --- a/src/test/run-pass/thinlto/all-crates.rs +++ b/src/test/run-pass/thinlto/all-crates.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Clto=thin // no-prefer-dynamic diff --git a/src/test/run-pass/thinlto/auxiliary/dylib.rs b/src/test/run-pass/thinlto/auxiliary/dylib.rs index cdb3f49cae88b..e8b7f8f9f4735 100644 --- a/src/test/run-pass/thinlto/auxiliary/dylib.rs +++ b/src/test/run-pass/thinlto/auxiliary/dylib.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z thinlto -C codegen-units=8 #[inline] diff --git a/src/test/run-pass/thinlto/auxiliary/msvc-imp-present.rs b/src/test/run-pass/thinlto/auxiliary/msvc-imp-present.rs index eff7802a24519..933af050a6a2a 100644 --- a/src/test/run-pass/thinlto/auxiliary/msvc-imp-present.rs +++ b/src/test/run-pass/thinlto/auxiliary/msvc-imp-present.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic // compile-flags: -Z thinlto -C codegen-units=8 -C prefer-dynamic diff --git a/src/test/run-pass/thinlto/auxiliary/thin-lto-inlines-aux.rs b/src/test/run-pass/thinlto/auxiliary/thin-lto-inlines-aux.rs index ccbb0e7a71863..5fd3f1996ddf8 100644 --- a/src/test/run-pass/thinlto/auxiliary/thin-lto-inlines-aux.rs +++ b/src/test/run-pass/thinlto/auxiliary/thin-lto-inlines-aux.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "rlib"] diff --git a/src/test/run-pass/thinlto/dylib-works.rs b/src/test/run-pass/thinlto/dylib-works.rs index 06df40f61427d..e80699af631e7 100644 --- a/src/test/run-pass/thinlto/dylib-works.rs +++ b/src/test/run-pass/thinlto/dylib-works.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:dylib.rs extern crate dylib; diff --git a/src/test/run-pass/thinlto/msvc-imp-present.rs b/src/test/run-pass/thinlto/msvc-imp-present.rs index 95cff2a286207..8aaec0efd8a02 100644 --- a/src/test/run-pass/thinlto/msvc-imp-present.rs +++ b/src/test/run-pass/thinlto/msvc-imp-present.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:msvc-imp-present.rs // compile-flags: -Z thinlto -C codegen-units=8 // no-prefer-dynamic diff --git a/src/test/run-pass/thinlto/thin-lto-inlines.rs b/src/test/run-pass/thinlto/thin-lto-inlines.rs index 41ca983af51c7..fd60bfce80850 100644 --- a/src/test/run-pass/thinlto/thin-lto-inlines.rs +++ b/src/test/run-pass/thinlto/thin-lto-inlines.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z thinlto -C codegen-units=8 -O // ignore-emscripten can't inspect instructions on emscripten diff --git a/src/test/run-pass/thinlto/thin-lto-inlines2.rs b/src/test/run-pass/thinlto/thin-lto-inlines2.rs index 3c0e904662a35..898c9f3e683ba 100644 --- a/src/test/run-pass/thinlto/thin-lto-inlines2.rs +++ b/src/test/run-pass/thinlto/thin-lto-inlines2.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C codegen-units=8 -O -C lto=thin // aux-build:thin-lto-inlines-aux.rs // no-prefer-dynamic diff --git a/src/test/run-pass/thinlto/weak-works.rs b/src/test/run-pass/thinlto/weak-works.rs index 0a1b7307a46ff..89fdc588cd2d7 100644 --- a/src/test/run-pass/thinlto/weak-works.rs +++ b/src/test/run-pass/thinlto/weak-works.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C codegen-units=8 -Z thinlto // ignore-windows diff --git a/src/test/run-pass/thread-local-extern-static.rs b/src/test/run-pass/thread-local-extern-static.rs index 09c8b64776c7b..34a571d56d031 100644 --- a/src/test/run-pass/thread-local-extern-static.rs +++ b/src/test/run-pass/thread-local-extern-static.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-windows // aux-build:thread-local-extern-static.rs diff --git a/src/test/run-pass/thread-local-syntax.rs b/src/test/run-pass/thread-local-syntax.rs index 373824122fd51..b5547c9dabcaa 100644 --- a/src/test/run-pass/thread-local-syntax.rs +++ b/src/test/run-pass/thread-local-syntax.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(missing_docs)] //! this tests the syntax of `thread_local!` diff --git a/src/test/run-pass/threads.rs b/src/test/run-pass/threads.rs index f193598975aaf..f9d0883ad5edc 100644 --- a/src/test/run-pass/threads.rs +++ b/src/test/run-pass/threads.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/tls-dtors-are-run-in-a-static-binary.rs b/src/test/run-pass/tls-dtors-are-run-in-a-static-binary.rs index 82e586196e379..5f02721e266f8 100644 --- a/src/test/run-pass/tls-dtors-are-run-in-a-static-binary.rs +++ b/src/test/run-pass/tls-dtors-are-run-in-a-static-binary.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic // ignore-emscripten no threads support diff --git a/src/test/run-pass/tls-init-on-init.rs b/src/test/run-pass/tls-init-on-init.rs index 48a0d4a99ecc9..274fec0880fc0 100644 --- a/src/test/run-pass/tls-init-on-init.rs +++ b/src/test/run-pass/tls-init-on-init.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support #![feature(thread_local_try_with)] diff --git a/src/test/run-pass/tls-try-with.rs b/src/test/run-pass/tls-try-with.rs index 552f4c5e829e1..135df5c0589ab 100644 --- a/src/test/run-pass/tls-try-with.rs +++ b/src/test/run-pass/tls-try-with.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support #![feature(thread_local_try_with)] diff --git a/src/test/run-pass/tool_attributes.rs b/src/test/run-pass/tool_attributes.rs index 9d8e56e44cbb3..506c11011a6da 100644 --- a/src/test/run-pass/tool_attributes.rs +++ b/src/test/run-pass/tool_attributes.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Scoped attributes should not trigger an unused attributes lint. #![deny(unused_attributes)] diff --git a/src/test/run-pass/tool_lints.rs b/src/test/run-pass/tool_lints.rs index 24ec43b12f60e..ca225b4619689 100644 --- a/src/test/run-pass/tool_lints.rs +++ b/src/test/run-pass/tool_lints.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(tool_lints)] #![deny(unknown_lints)] diff --git a/src/test/run-pass/tool_lints_2018_preview.rs b/src/test/run-pass/tool_lints_2018_preview.rs index 6cd57eaa19595..7a25ca6c87c40 100644 --- a/src/test/run-pass/tool_lints_2018_preview.rs +++ b/src/test/run-pass/tool_lints_2018_preview.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(tool_lints)] #![feature(rust_2018_preview)] #![deny(unknown_lints)] diff --git a/src/test/run-pass/trailing-comma.rs b/src/test/run-pass/trailing-comma.rs index 02bae5aa45515..197af295a42c7 100644 --- a/src/test/run-pass/trailing-comma.rs +++ b/src/test/run-pass/trailing-comma.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(slice_patterns)] diff --git a/src/test/run-pass/trait-bounds-basic.rs b/src/test/run-pass/trait-bounds-basic.rs index 558e69664ecf9..9af618d8896d3 100644 --- a/src/test/run-pass/trait-bounds-basic.rs +++ b/src/test/run-pass/trait-bounds-basic.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait Foo { diff --git a/src/test/run-pass/trait-bounds-impl-comparison-duplicates.rs b/src/test/run-pass/trait-bounds-impl-comparison-duplicates.rs index 33bfbc396035c..7651be71cfd5e 100644 --- a/src/test/run-pass/trait-bounds-impl-comparison-duplicates.rs +++ b/src/test/run-pass/trait-bounds-impl-comparison-duplicates.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that type parameter bounds on an implementation need not match the // trait exactly, as long as the implementation doesn't demand *more* bounds // than the trait. diff --git a/src/test/run-pass/trait-bounds-in-arc.rs b/src/test/run-pass/trait-bounds-in-arc.rs index 7b57d66ef21fd..166c832d94561 100644 --- a/src/test/run-pass/trait-bounds-in-arc.rs +++ b/src/test/run-pass/trait-bounds-in-arc.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that a heterogeneous list of existential types can be put inside an Arc // and shared between threads as long as all types fulfill Send. diff --git a/src/test/run-pass/trait-bounds-on-structs-and-enums.rs b/src/test/run-pass/trait-bounds-on-structs-and-enums.rs index 6f088e15b353a..99d2bac282e98 100644 --- a/src/test/run-pass/trait-bounds-on-structs-and-enums.rs +++ b/src/test/run-pass/trait-bounds-on-structs-and-enums.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait U {} diff --git a/src/test/run-pass/trait-bounds-recursion.rs b/src/test/run-pass/trait-bounds-recursion.rs index d984e9cdc990f..2099ab563c8c4 100644 --- a/src/test/run-pass/trait-bounds-recursion.rs +++ b/src/test/run-pass/trait-bounds-recursion.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait I { fn i(&self) -> Self; } diff --git a/src/test/run-pass/trait-bounds.rs b/src/test/run-pass/trait-bounds.rs index d501fef122cc7..10da3db267184 100644 --- a/src/test/run-pass/trait-bounds.rs +++ b/src/test/run-pass/trait-bounds.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait connection { fn read(&self) -> isize; } diff --git a/src/test/run-pass/trait-cache-issue-18209.rs b/src/test/run-pass/trait-cache-issue-18209.rs index 9cc2b2fadc607..763b42a67c445 100644 --- a/src/test/run-pass/trait-cache-issue-18209.rs +++ b/src/test/run-pass/trait-cache-issue-18209.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the cache results from the default method do not pollute // the cache for the later call in `load()`. // diff --git a/src/test/run-pass/trait-coercion-generic.rs b/src/test/run-pass/trait-coercion-generic.rs index 40453262ddf3a..e24b3c5287a46 100644 --- a/src/test/run-pass/trait-coercion-generic.rs +++ b/src/test/run-pass/trait-coercion-generic.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Trait { fn f(&self, x: T); } diff --git a/src/test/run-pass/trait-coercion.rs b/src/test/run-pass/trait-coercion.rs index 130c6ee7521b4..983c881292eb7 100644 --- a/src/test/run-pass/trait-coercion.rs +++ b/src/test/run-pass/trait-coercion.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] use std::io::{self, Write}; diff --git a/src/test/run-pass/trait-composition-trivial.rs b/src/test/run-pass/trait-composition-trivial.rs index 4138413c5b552..c54d054322d20 100644 --- a/src/test/run-pass/trait-composition-trivial.rs +++ b/src/test/run-pass/trait-composition-trivial.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait Foo { diff --git a/src/test/run-pass/trait-copy-guessing.rs b/src/test/run-pass/trait-copy-guessing.rs index 71cd3c9441e10..5774ed392be3f 100644 --- a/src/test/run-pass/trait-copy-guessing.rs +++ b/src/test/run-pass/trait-copy-guessing.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // "guessing" in trait selection can affect `copy_or_move`. Check that this // is correctly handled. I am not sure what is the "correct" behaviour, // but we should at least not ICE. diff --git a/src/test/run-pass/trait-default-method-bound-subst.rs b/src/test/run-pass/trait-default-method-bound-subst.rs index b9936bcadd48d..fb8e22c0b6abc 100644 --- a/src/test/run-pass/trait-default-method-bound-subst.rs +++ b/src/test/run-pass/trait-default-method-bound-subst.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - trait A { fn g(&self, x: T, y: U) -> (T, U) { (x, y) } } diff --git a/src/test/run-pass/trait-default-method-bound-subst2.rs b/src/test/run-pass/trait-default-method-bound-subst2.rs index 92b9449461ba1..f82c9412b6363 100644 --- a/src/test/run-pass/trait-default-method-bound-subst2.rs +++ b/src/test/run-pass/trait-default-method-bound-subst2.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - trait A { fn g(&self, x: T) -> T { x } } diff --git a/src/test/run-pass/trait-default-method-bound-subst3.rs b/src/test/run-pass/trait-default-method-bound-subst3.rs index af7e8830332b0..b7d0346d619d2 100644 --- a/src/test/run-pass/trait-default-method-bound-subst3.rs +++ b/src/test/run-pass/trait-default-method-bound-subst3.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - trait A { fn g(&self, x: T, y: T) -> (T, T) { (x, y) } } diff --git a/src/test/run-pass/trait-default-method-bound-subst4.rs b/src/test/run-pass/trait-default-method-bound-subst4.rs index 581a54e57f490..72c627e41c918 100644 --- a/src/test/run-pass/trait-default-method-bound-subst4.rs +++ b/src/test/run-pass/trait-default-method-bound-subst4.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - trait A { fn g(&self, x: usize) -> usize { x } fn h(&self, x: T) { } diff --git a/src/test/run-pass/trait-default-method-bound.rs b/src/test/run-pass/trait-default-method-bound.rs index e0ea9651f6139..f128de00d6009 100644 --- a/src/test/run-pass/trait-default-method-bound.rs +++ b/src/test/run-pass/trait-default-method-bound.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - trait A { fn g(&self) -> isize { 10 } } diff --git a/src/test/run-pass/trait-default-method-xc-2.rs b/src/test/run-pass/trait-default-method-xc-2.rs index 833063d2a2d0e..47a5ced1d5da6 100644 --- a/src/test/run-pass/trait-default-method-xc-2.rs +++ b/src/test/run-pass/trait-default-method-xc-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:trait_default_method_xc_aux.rs // aux-build:trait_default_method_xc_aux_2.rs diff --git a/src/test/run-pass/trait-default-method-xc.rs b/src/test/run-pass/trait-default-method-xc.rs index 72e3fb256ca83..81792efd1debc 100644 --- a/src/test/run-pass/trait-default-method-xc.rs +++ b/src/test/run-pass/trait-default-method-xc.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:trait_default_method_xc_aux.rs diff --git a/src/test/run-pass/trait-false-ambiguity-where-clause-builtin-bound.rs b/src/test/run-pass/trait-false-ambiguity-where-clause-builtin-bound.rs index b9ca8971d3893..a721f31ce020c 100644 --- a/src/test/run-pass/trait-false-ambiguity-where-clause-builtin-bound.rs +++ b/src/test/run-pass/trait-false-ambiguity-where-clause-builtin-bound.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we do not error out because of a (False) ambiguity // between the builtin rules for Sized and the where clause. Issue // #20959. diff --git a/src/test/run-pass/trait-generic.rs b/src/test/run-pass/trait-generic.rs index eadda5dfe299c..def32a1fd8557 100644 --- a/src/test/run-pass/trait-generic.rs +++ b/src/test/run-pass/trait-generic.rs @@ -1,16 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - trait to_str { fn to_string_(&self) -> String; } diff --git a/src/test/run-pass/trait-impl-2.rs b/src/test/run-pass/trait-impl-2.rs index c94b517f6a7d6..385fe9626403a 100644 --- a/src/test/run-pass/trait-impl-2.rs +++ b/src/test/run-pass/trait-impl-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub mod Foo { diff --git a/src/test/run-pass/trait-impl.rs b/src/test/run-pass/trait-impl.rs index e940f6c2126f3..4ecda6befecd9 100644 --- a/src/test/run-pass/trait-impl.rs +++ b/src/test/run-pass/trait-impl.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test calling methods on an impl for a bare trait. // aux-build:traitimpl.rs diff --git a/src/test/run-pass/trait-inheritance-auto-xc-2.rs b/src/test/run-pass/trait-inheritance-auto-xc-2.rs index 270cf652ed7cb..3d91d79e15e32 100644 --- a/src/test/run-pass/trait-inheritance-auto-xc-2.rs +++ b/src/test/run-pass/trait-inheritance-auto-xc-2.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:trait_inheritance_auto_xc_2_aux.rs diff --git a/src/test/run-pass/trait-inheritance-auto-xc.rs b/src/test/run-pass/trait-inheritance-auto-xc.rs index eaca60c935a60..f6a5e26f9d2dd 100644 --- a/src/test/run-pass/trait-inheritance-auto-xc.rs +++ b/src/test/run-pass/trait-inheritance-auto-xc.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:trait_inheritance_auto_xc_aux.rs diff --git a/src/test/run-pass/trait-inheritance-auto.rs b/src/test/run-pass/trait-inheritance-auto.rs index 75c48d5171278..e1bdabad57a66 100644 --- a/src/test/run-pass/trait-inheritance-auto.rs +++ b/src/test/run-pass/trait-inheritance-auto.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Testing that this impl turns A into a Quux, because // A is already a Foo Bar Baz diff --git a/src/test/run-pass/trait-inheritance-call-bound-inherited.rs b/src/test/run-pass/trait-inheritance-call-bound-inherited.rs index 2fb2b9274c699..64f41018c9b1e 100644 --- a/src/test/run-pass/trait-inheritance-call-bound-inherited.rs +++ b/src/test/run-pass/trait-inheritance-call-bound-inherited.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Foo { fn f(&self) -> isize; } trait Bar : Foo { fn g(&self) -> isize; } diff --git a/src/test/run-pass/trait-inheritance-call-bound-inherited2.rs b/src/test/run-pass/trait-inheritance-call-bound-inherited2.rs index 87dc04f1c6671..5b6c0b9f36082 100644 --- a/src/test/run-pass/trait-inheritance-call-bound-inherited2.rs +++ b/src/test/run-pass/trait-inheritance-call-bound-inherited2.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Foo { fn f(&self) -> isize; } trait Bar : Foo { fn g(&self) -> isize; } trait Baz : Bar { fn h(&self) -> isize; } diff --git a/src/test/run-pass/trait-inheritance-cast-without-call-to-supertrait.rs b/src/test/run-pass/trait-inheritance-cast-without-call-to-supertrait.rs index dd61dc0f9fb83..7f7df5dfad5bd 100644 --- a/src/test/run-pass/trait-inheritance-cast-without-call-to-supertrait.rs +++ b/src/test/run-pass/trait-inheritance-cast-without-call-to-supertrait.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Testing that we can cast to a subtrait and call subtrait // methods. Not testing supertrait methods diff --git a/src/test/run-pass/trait-inheritance-cast.rs b/src/test/run-pass/trait-inheritance-cast.rs index 0de2c586930e6..63beb5bfebcc8 100644 --- a/src/test/run-pass/trait-inheritance-cast.rs +++ b/src/test/run-pass/trait-inheritance-cast.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Testing that supertrait methods can be called on subtrait object types diff --git a/src/test/run-pass/trait-inheritance-cross-trait-call-xc.rs b/src/test/run-pass/trait-inheritance-cross-trait-call-xc.rs index 3e68bea57c660..4f2d5be420afd 100644 --- a/src/test/run-pass/trait-inheritance-cross-trait-call-xc.rs +++ b/src/test/run-pass/trait-inheritance-cross-trait-call-xc.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:trait_xc_call_aux.rs diff --git a/src/test/run-pass/trait-inheritance-cross-trait-call.rs b/src/test/run-pass/trait-inheritance-cross-trait-call.rs index 27b0f66603f8c..2bbad91e8122b 100644 --- a/src/test/run-pass/trait-inheritance-cross-trait-call.rs +++ b/src/test/run-pass/trait-inheritance-cross-trait-call.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Foo { fn f(&self) -> isize; } trait Bar : Foo { fn g(&self) -> isize; } diff --git a/src/test/run-pass/trait-inheritance-diamond.rs b/src/test/run-pass/trait-inheritance-diamond.rs index 43151bb0f9921..6a62dcaceba2c 100644 --- a/src/test/run-pass/trait-inheritance-diamond.rs +++ b/src/test/run-pass/trait-inheritance-diamond.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // B and C both require A, so D does as well, twice, but that's just fine diff --git a/src/test/run-pass/trait-inheritance-multiple-inheritors.rs b/src/test/run-pass/trait-inheritance-multiple-inheritors.rs index 8125ce20912e5..3e372a01bd2dd 100644 --- a/src/test/run-pass/trait-inheritance-multiple-inheritors.rs +++ b/src/test/run-pass/trait-inheritance-multiple-inheritors.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait A { fn a(&self) -> isize; } trait B: A { fn b(&self) -> isize; } trait C: A { fn c(&self) -> isize; } diff --git a/src/test/run-pass/trait-inheritance-multiple-params.rs b/src/test/run-pass/trait-inheritance-multiple-params.rs index c0f7a9d9c254a..5ed3eb2432cb7 100644 --- a/src/test/run-pass/trait-inheritance-multiple-params.rs +++ b/src/test/run-pass/trait-inheritance-multiple-params.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait A { fn a(&self) -> isize; } trait B: A { fn b(&self) -> isize; } trait C: A { fn c(&self) -> isize; } diff --git a/src/test/run-pass/trait-inheritance-num.rs b/src/test/run-pass/trait-inheritance-num.rs index e5390ac8a6256..a54fb86d79641 100644 --- a/src/test/run-pass/trait-inheritance-num.rs +++ b/src/test/run-pass/trait-inheritance-num.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub trait NumExt: PartialEq + PartialOrd {} diff --git a/src/test/run-pass/trait-inheritance-num0.rs b/src/test/run-pass/trait-inheritance-num0.rs index 9f5c7cf60360d..bc8953774b130 100644 --- a/src/test/run-pass/trait-inheritance-num0.rs +++ b/src/test/run-pass/trait-inheritance-num0.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Extending Num and using inherited static methods // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/trait-inheritance-num1.rs b/src/test/run-pass/trait-inheritance-num1.rs index e21abdae730bc..0977de8995798 100644 --- a/src/test/run-pass/trait-inheritance-num1.rs +++ b/src/test/run-pass/trait-inheritance-num1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub trait NumCast: Sized { diff --git a/src/test/run-pass/trait-inheritance-num2.rs b/src/test/run-pass/trait-inheritance-num2.rs index 5f8541a6da1e8..7cb9f45d34818 100644 --- a/src/test/run-pass/trait-inheritance-num2.rs +++ b/src/test/run-pass/trait-inheritance-num2.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // A more complex example of numeric extensions pub trait TypeExt {} diff --git a/src/test/run-pass/trait-inheritance-num3.rs b/src/test/run-pass/trait-inheritance-num3.rs index fb56ae82b303e..c0a631e5b21a2 100644 --- a/src/test/run-pass/trait-inheritance-num3.rs +++ b/src/test/run-pass/trait-inheritance-num3.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait NumCast: Sized { fn from(i: i32) -> Option; } diff --git a/src/test/run-pass/trait-inheritance-num5.rs b/src/test/run-pass/trait-inheritance-num5.rs index bd442629243ee..24ca6a918b1b2 100644 --- a/src/test/run-pass/trait-inheritance-num5.rs +++ b/src/test/run-pass/trait-inheritance-num5.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub trait NumCast: Sized { diff --git a/src/test/run-pass/trait-inheritance-overloading-simple.rs b/src/test/run-pass/trait-inheritance-overloading-simple.rs index 9c1f585fe450b..5f99b33812f06 100644 --- a/src/test/run-pass/trait-inheritance-overloading-simple.rs +++ b/src/test/run-pass/trait-inheritance-overloading-simple.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cmp::PartialEq; trait MyNum : PartialEq { } diff --git a/src/test/run-pass/trait-inheritance-overloading-xc-exe.rs b/src/test/run-pass/trait-inheritance-overloading-xc-exe.rs index 21d6c53a465cf..73dec5ddaec59 100644 --- a/src/test/run-pass/trait-inheritance-overloading-xc-exe.rs +++ b/src/test/run-pass/trait-inheritance-overloading-xc-exe.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:trait_inheritance_overloading_xc.rs diff --git a/src/test/run-pass/trait-inheritance-overloading.rs b/src/test/run-pass/trait-inheritance-overloading.rs index b7d0400dd892b..1495cb4e86b9d 100644 --- a/src/test/run-pass/trait-inheritance-overloading.rs +++ b/src/test/run-pass/trait-inheritance-overloading.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cmp::PartialEq; use std::ops::{Add, Sub, Mul}; diff --git a/src/test/run-pass/trait-inheritance-self-in-supertype.rs b/src/test/run-pass/trait-inheritance-self-in-supertype.rs index e353be16b45e5..d111364b76800 100644 --- a/src/test/run-pass/trait-inheritance-self-in-supertype.rs +++ b/src/test/run-pass/trait-inheritance-self-in-supertype.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test for issue #4183: use of Self in supertraits. pub static FUZZY_EPSILON: f64 = 0.1; diff --git a/src/test/run-pass/trait-inheritance-self.rs b/src/test/run-pass/trait-inheritance-self.rs index a025be5d651bc..3aa4d5d2b96dc 100644 --- a/src/test/run-pass/trait-inheritance-self.rs +++ b/src/test/run-pass/trait-inheritance-self.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn f(&self, x: &T); } diff --git a/src/test/run-pass/trait-inheritance-simple.rs b/src/test/run-pass/trait-inheritance-simple.rs index 917e520339af4..eb470a2a2bc0c 100644 --- a/src/test/run-pass/trait-inheritance-simple.rs +++ b/src/test/run-pass/trait-inheritance-simple.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Foo { fn f(&self) -> isize; } trait Bar : Foo { fn g(&self) -> isize; } diff --git a/src/test/run-pass/trait-inheritance-static.rs b/src/test/run-pass/trait-inheritance-static.rs index aae6b76087fe4..13f19c20557c0 100644 --- a/src/test/run-pass/trait-inheritance-static.rs +++ b/src/test/run-pass/trait-inheritance-static.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub trait MyNum { fn from_int(_: isize) -> Self; } diff --git a/src/test/run-pass/trait-inheritance-static2.rs b/src/test/run-pass/trait-inheritance-static2.rs index dd942fbfa08c8..e1e54b8c9265f 100644 --- a/src/test/run-pass/trait-inheritance-static2.rs +++ b/src/test/run-pass/trait-inheritance-static2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait MyEq {} pub trait MyNum { diff --git a/src/test/run-pass/trait-inheritance-subst.rs b/src/test/run-pass/trait-inheritance-subst.rs index 73bb4bacf64e1..80a6400ec3b2b 100644 --- a/src/test/run-pass/trait-inheritance-subst.rs +++ b/src/test/run-pass/trait-inheritance-subst.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub trait Add { fn add(&self, rhs: &RHS) -> Result; } diff --git a/src/test/run-pass/trait-inheritance-subst2.rs b/src/test/run-pass/trait-inheritance-subst2.rs index 7d3ebc19e8f83..4eb16a2a93d41 100644 --- a/src/test/run-pass/trait-inheritance-subst2.rs +++ b/src/test/run-pass/trait-inheritance-subst2.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Panda { fn chomp(&self, bamboo: &T) -> T; } diff --git a/src/test/run-pass/trait-inheritance-visibility.rs b/src/test/run-pass/trait-inheritance-visibility.rs index f00a4f2ecb6aa..cac7f2b8705a2 100644 --- a/src/test/run-pass/trait-inheritance-visibility.rs +++ b/src/test/run-pass/trait-inheritance-visibility.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - mod traits { pub trait Foo { fn f(&self) -> isize; } diff --git a/src/test/run-pass/trait-inheritance2.rs b/src/test/run-pass/trait-inheritance2.rs index 2161c0f894f43..1ec5807430e6b 100644 --- a/src/test/run-pass/trait-inheritance2.rs +++ b/src/test/run-pass/trait-inheritance2.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Foo { fn f(&self) -> isize; } trait Bar { fn g(&self) -> isize; } trait Baz { fn h(&self) -> isize; } diff --git a/src/test/run-pass/trait-item-inside-macro.rs b/src/test/run-pass/trait-item-inside-macro.rs index 7c13576120b44..d49bf721ccef8 100644 --- a/src/test/run-pass/trait-item-inside-macro.rs +++ b/src/test/run-pass/trait-item-inside-macro.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #34183 macro_rules! foo { diff --git a/src/test/run-pass/trait-object-auto-dedup.rs b/src/test/run-pass/trait-object-auto-dedup.rs index 9f5845f6d77b0..0a9b8df4fd84b 100644 --- a/src/test/run-pass/trait-object-auto-dedup.rs +++ b/src/test/run-pass/trait-object-auto-dedup.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that duplicate auto trait bounds in trait objects don't create new types. #[allow(unused_assignments)] diff --git a/src/test/run-pass/trait-object-exclusion.rs b/src/test/run-pass/trait-object-exclusion.rs index 13b725b7c9eff..ecec047ae0f56 100644 --- a/src/test/run-pass/trait-object-exclusion.rs +++ b/src/test/run-pass/trait-object-exclusion.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Future: 'static { // The requirement for Self: Sized must prevent instantiation of // Future::forget in vtables, otherwise there's an infinite type diff --git a/src/test/run-pass/trait-object-generics.rs b/src/test/run-pass/trait-object-generics.rs index 4b14ac2f76f6b..14ad89952329d 100644 --- a/src/test/run-pass/trait-object-generics.rs +++ b/src/test/run-pass/trait-object-generics.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // test for #8664 #![feature(box_syntax)] diff --git a/src/test/run-pass/trait-object-lifetime-first.rs b/src/test/run-pass/trait-object-lifetime-first.rs index f269fe90d4b4e..08ced3ee717c4 100644 --- a/src/test/run-pass/trait-object-lifetime-first.rs +++ b/src/test/run-pass/trait-object-lifetime-first.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt::Display; static BYTE: u8 = 33; diff --git a/src/test/run-pass/trait-object-with-lifetime-bound.rs b/src/test/run-pass/trait-object-with-lifetime-bound.rs index 21b84221d06e0..8467f4ff4d537 100644 --- a/src/test/run-pass/trait-object-with-lifetime-bound.rs +++ b/src/test/run-pass/trait-object-with-lifetime-bound.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Uncovered during work on new scoping rules for safe destructors // as an important use case to support properly. diff --git a/src/test/run-pass/trait-region-pointer-simple.rs b/src/test/run-pass/trait-region-pointer-simple.rs index 95311e62e6343..e8f90e4cc5216 100644 --- a/src/test/run-pass/trait-region-pointer-simple.rs +++ b/src/test/run-pass/trait-region-pointer-simple.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn f(&self) -> isize; } diff --git a/src/test/run-pass/trait-safety-ok-cc.rs b/src/test/run-pass/trait-safety-ok-cc.rs index abbc556f34e4c..0addcd9e8b9b4 100644 --- a/src/test/run-pass/trait-safety-ok-cc.rs +++ b/src/test/run-pass/trait-safety-ok-cc.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:trait_safety_lib.rs // Simple smoke test that unsafe traits can be compiled across crates. diff --git a/src/test/run-pass/trait-safety-ok.rs b/src/test/run-pass/trait-safety-ok.rs index 0ccc6cd152dfc..45be4c1521dee 100644 --- a/src/test/run-pass/trait-safety-ok.rs +++ b/src/test/run-pass/trait-safety-ok.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Simple smoke test that unsafe traits can be compiled etc. diff --git a/src/test/run-pass/trait-static-method-overwriting.rs b/src/test/run-pass/trait-static-method-overwriting.rs index 31968da6ee310..a5925651f38c2 100644 --- a/src/test/run-pass/trait-static-method-overwriting.rs +++ b/src/test/run-pass/trait-static-method-overwriting.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod base { pub trait HasNew { fn new() -> Self; diff --git a/src/test/run-pass/trait-to-str.rs b/src/test/run-pass/trait-to-str.rs index 9671e31d7e48c..93777c9889ba9 100644 --- a/src/test/run-pass/trait-to-str.rs +++ b/src/test/run-pass/trait-to-str.rs @@ -1,12 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // diff --git a/src/test/run-pass/trait-where-clause-vs-impl.rs b/src/test/run-pass/trait-where-clause-vs-impl.rs index f3dcb51f97a29..73226ca761927 100644 --- a/src/test/run-pass/trait-where-clause-vs-impl.rs +++ b/src/test/run-pass/trait-where-clause-vs-impl.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that when there is a conditional (but blanket) impl and a // where clause, we don't get confused in trait resolution. // diff --git a/src/test/run-pass/trait-with-bounds-default.rs b/src/test/run-pass/trait-with-bounds-default.rs index 6b0faa2207b25..d31a521138e13 100644 --- a/src/test/run-pass/trait-with-bounds-default.rs +++ b/src/test/run-pass/trait-with-bounds-default.rs @@ -1,12 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // pub trait Clone2 { diff --git a/src/test/run-pass/traits-assoc-type-in-supertrait.rs b/src/test/run-pass/traits-assoc-type-in-supertrait.rs index 5cecacafc74b1..611211ac6cded 100644 --- a/src/test/run-pass/traits-assoc-type-in-supertrait.rs +++ b/src/test/run-pass/traits-assoc-type-in-supertrait.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test case where an associated type is referenced from within the // supertrait definition. Issue #20220. diff --git a/src/test/run-pass/traits-conditional-dispatch.rs b/src/test/run-pass/traits-conditional-dispatch.rs index 53457d85e016f..78dbc48eb5b25 100644 --- a/src/test/run-pass/traits-conditional-dispatch.rs +++ b/src/test/run-pass/traits-conditional-dispatch.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are able to resolve conditional dispatch. Here, the // blanket impl for T:Copy coexists with an impl for Box, because // Box does not impl Copy. diff --git a/src/test/run-pass/traits-conditional-model-fn.rs b/src/test/run-pass/traits-conditional-model-fn.rs index d19f7143ed222..2201f40ff2f33 100644 --- a/src/test/run-pass/traits-conditional-model-fn.rs +++ b/src/test/run-pass/traits-conditional-model-fn.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // A model for how the `Fn` traits could work. You can implement at // most one of `Go`, `GoMut`, or `GoOnce`, and then the others follow // automatically. diff --git a/src/test/run-pass/traits-default-method-macro.rs b/src/test/run-pass/traits-default-method-macro.rs index 193038d9e50f3..e8cc0c57e64cc 100644 --- a/src/test/run-pass/traits-default-method-macro.rs +++ b/src/test/run-pass/traits-default-method-macro.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - trait Foo { fn bar(&self) -> String { format!("test") diff --git a/src/test/run-pass/traits-default-method-mut.rs b/src/test/run-pass/traits-default-method-mut.rs index bcdadb1d90d38..576f72a0b46c3 100644 --- a/src/test/run-pass/traits-default-method-mut.rs +++ b/src/test/run-pass/traits-default-method-mut.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![allow(dead_assignment)] diff --git a/src/test/run-pass/traits-default-method-self.rs b/src/test/run-pass/traits-default-method-self.rs index 36b0eb527b642..8270ab090d078 100644 --- a/src/test/run-pass/traits-default-method-self.rs +++ b/src/test/run-pass/traits-default-method-self.rs @@ -1,12 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // diff --git a/src/test/run-pass/traits-default-method-trivial.rs b/src/test/run-pass/traits-default-method-trivial.rs index a2e7f54bba652..e7c425e13b6e9 100644 --- a/src/test/run-pass/traits-default-method-trivial.rs +++ b/src/test/run-pass/traits-default-method-trivial.rs @@ -1,12 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // diff --git a/src/test/run-pass/traits-elaborate-type-region.rs b/src/test/run-pass/traits-elaborate-type-region.rs index 4621c2ca4be28..8cb5692c17136 100644 --- a/src/test/run-pass/traits-elaborate-type-region.rs +++ b/src/test/run-pass/traits-elaborate-type-region.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] // Test that we elaborate `Type: 'region` constraints and infer various important things. diff --git a/src/test/run-pass/traits-impl-object-overlap-issue-23853.rs b/src/test/run-pass/traits-impl-object-overlap-issue-23853.rs index b9b2b5061375a..72e045fcacd58 100644 --- a/src/test/run-pass/traits-impl-object-overlap-issue-23853.rs +++ b/src/test/run-pass/traits-impl-object-overlap-issue-23853.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are able to compile the case where both a blanket impl // and the object type itself supply the required trait obligation. // In this case, the blanket impl for `Foo` applies to any type, diff --git a/src/test/run-pass/traits-issue-22019.rs b/src/test/run-pass/traits-issue-22019.rs index 2f3e0c64f6c11..0808095606cd9 100644 --- a/src/test/run-pass/traits-issue-22019.rs +++ b/src/test/run-pass/traits-issue-22019.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test an issue where global caching was causing free regions from // distinct scopes to be compared (`'g` and `'h`). The only important // thing is that compilation succeeds here. diff --git a/src/test/run-pass/traits-issue-22110.rs b/src/test/run-pass/traits-issue-22110.rs index 3da8c25397834..13717d6faa388 100644 --- a/src/test/run-pass/traits-issue-22110.rs +++ b/src/test/run-pass/traits-issue-22110.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test an issue where we reported ambiguity between the where-clause // and the blanket impl. The only important thing is that compilation // succeeds here. Issue #22110. diff --git a/src/test/run-pass/traits-issue-22655.rs b/src/test/run-pass/traits-issue-22655.rs index ded17422c498d..9c57cc2076f9c 100644 --- a/src/test/run-pass/traits-issue-22655.rs +++ b/src/test/run-pass/traits-issue-22655.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #22655: This test should not lead to // infinite recursion. diff --git a/src/test/run-pass/traits-issue-23003.rs b/src/test/run-pass/traits-issue-23003.rs index 46cd22f22baa4..d7e45f2414283 100644 --- a/src/test/run-pass/traits-issue-23003.rs +++ b/src/test/run-pass/traits-issue-23003.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test stack overflow triggered by evaluating the implications. To be // WF, the type `Receipt` would require that `::Cancel` be WF. This normalizes to `Receipt` diff --git a/src/test/run-pass/traits-issue-26339.rs b/src/test/run-pass/traits-issue-26339.rs index f2cf1779d6241..1f9e8f0dcce39 100644 --- a/src/test/run-pass/traits-issue-26339.rs +++ b/src/test/run-pass/traits-issue-26339.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the right implementation is called through a trait // object when supertraits include multiple references to the // same trait, with different type parameters. diff --git a/src/test/run-pass/traits-multidispatch-infer-convert-target.rs b/src/test/run-pass/traits-multidispatch-infer-convert-target.rs index 6634c1ad0a220..0a51bb3a7a5f7 100644 --- a/src/test/run-pass/traits-multidispatch-infer-convert-target.rs +++ b/src/test/run-pass/traits-multidispatch-infer-convert-target.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we can infer the Target based on the Self or vice versa. diff --git a/src/test/run-pass/traits-negative-impls.rs b/src/test/run-pass/traits-negative-impls.rs index 09c7d077705b5..8120b07d18b99 100644 --- a/src/test/run-pass/traits-negative-impls.rs +++ b/src/test/run-pass/traits-negative-impls.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] use std::marker::Send; diff --git a/src/test/run-pass/traits-repeated-supertrait.rs b/src/test/run-pass/traits-repeated-supertrait.rs index b059945ef74e3..c25982f632635 100644 --- a/src/test/run-pass/traits-repeated-supertrait.rs +++ b/src/test/run-pass/traits-repeated-supertrait.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test a case of a trait which extends the same supertrait twice, but // with difference type parameters. Test that we can invoke the // various methods in various ways successfully. diff --git a/src/test/run-pass/transmute-non-immediate-to-immediate.rs b/src/test/run-pass/transmute-non-immediate-to-immediate.rs index bd705a909b0ec..2119c8336f4c0 100644 --- a/src/test/run-pass/transmute-non-immediate-to-immediate.rs +++ b/src/test/run-pass/transmute-non-immediate-to-immediate.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #7988 // Transmuting non-immediate type to immediate type diff --git a/src/test/run-pass/transmute-specialization.rs b/src/test/run-pass/transmute-specialization.rs index 823def3227044..e2b110db6367f 100644 --- a/src/test/run-pass/transmute-specialization.rs +++ b/src/test/run-pass/transmute-specialization.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(specialization)] trait Specializable { type Output; } diff --git a/src/test/run-pass/trivial-message.rs b/src/test/run-pass/trivial-message.rs index fd60c61463818..98df95ce5d2c3 100644 --- a/src/test/run-pass/trivial-message.rs +++ b/src/test/run-pass/trivial-message.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /* This is about the simplest program that can successfully send a message. diff --git a/src/test/run-pass/trivial_casts.rs b/src/test/run-pass/trivial_casts.rs index 3da1ba0f0451f..bc56d0158d4df 100644 --- a/src/test/run-pass/trivial_casts.rs +++ b/src/test/run-pass/trivial_casts.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that all coercions can actually be done using casts (modulo the lints). #![allow(trivial_casts, trivial_numeric_casts)] diff --git a/src/test/run-pass/try-block.rs b/src/test/run-pass/try-block.rs index a7e7cc2062095..6d5b5f3ac8c94 100644 --- a/src/test/run-pass/try-block.rs +++ b/src/test/run-pass/try-block.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --edition 2018 #![feature(try_blocks)] diff --git a/src/test/run-pass/try-is-identifier-edition2015.rs b/src/test/run-pass/try-is-identifier-edition2015.rs index aafb52e4c491f..efbcbc291c1fd 100644 --- a/src/test/run-pass/try-is-identifier-edition2015.rs +++ b/src/test/run-pass/try-is-identifier-edition2015.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --edition 2015 fn main() { diff --git a/src/test/run-pass/try-macro.rs b/src/test/run-pass/try-macro.rs index a12e20702d298..1f30c1e39b982 100644 --- a/src/test/run-pass/try-macro.rs +++ b/src/test/run-pass/try-macro.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::num::{ParseFloatError, ParseIntError}; fn main() { diff --git a/src/test/run-pass/try-operator-custom.rs b/src/test/run-pass/try-operator-custom.rs index 82ba70c945944..008cab00ea241 100644 --- a/src/test/run-pass/try-operator-custom.rs +++ b/src/test/run-pass/try-operator-custom.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(try_trait)] use std::ops::Try; diff --git a/src/test/run-pass/try-operator-hygiene.rs b/src/test/run-pass/try-operator-hygiene.rs index 53d6185020a02..94d088974f234 100644 --- a/src/test/run-pass/try-operator-hygiene.rs +++ b/src/test/run-pass/try-operator-hygiene.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // `expr?` expands to: // // match expr { diff --git a/src/test/run-pass/try-operator.rs b/src/test/run-pass/try-operator.rs index d615c5f1034dc..86ec926462a84 100644 --- a/src/test/run-pass/try-operator.rs +++ b/src/test/run-pass/try-operator.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no std::fs use std::fs::File; diff --git a/src/test/run-pass/try-wait.rs b/src/test/run-pass/try-wait.rs index b8c0d80c5a67c..cc7a9234b62ca 100644 --- a/src/test/run-pass/try-wait.rs +++ b/src/test/run-pass/try-wait.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/tup.rs b/src/test/run-pass/tup.rs index 86ca37deb02d1..51391f3e9ea0a 100644 --- a/src/test/run-pass/tup.rs +++ b/src/test/run-pass/tup.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - type point = (isize, isize); fn f(p: point, x: isize, y: isize) { diff --git a/src/test/run-pass/tuple-index-fat-types.rs b/src/test/run-pass/tuple-index-fat-types.rs index e4ea073bfc28a..ee224cc84bfb1 100644 --- a/src/test/run-pass/tuple-index-fat-types.rs +++ b/src/test/run-pass/tuple-index-fat-types.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct Foo<'a>(&'a [isize]); fn main() { diff --git a/src/test/run-pass/tuple-index.rs b/src/test/run-pass/tuple-index.rs index 26d918f236750..e68fa1caa5514 100644 --- a/src/test/run-pass/tuple-index.rs +++ b/src/test/run-pass/tuple-index.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct Point(isize, isize); fn main() { diff --git a/src/test/run-pass/tuple-struct-construct.rs b/src/test/run-pass/tuple-struct-construct.rs index c40adf2260dd4..2e2e094ca8747 100644 --- a/src/test/run-pass/tuple-struct-construct.rs +++ b/src/test/run-pass/tuple-struct-construct.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug)] struct Foo(isize, isize); diff --git a/src/test/run-pass/tuple-struct-constructor-pointer.rs b/src/test/run-pass/tuple-struct-constructor-pointer.rs index 90cf94666deda..366fb90fe21d6 100644 --- a/src/test/run-pass/tuple-struct-constructor-pointer.rs +++ b/src/test/run-pass/tuple-struct-constructor-pointer.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(PartialEq, Debug)] struct Foo(isize); #[derive(PartialEq, Debug)] diff --git a/src/test/run-pass/tuple-struct-destructuring.rs b/src/test/run-pass/tuple-struct-destructuring.rs index 4b0eb26cf9484..decfddcfb50ad 100644 --- a/src/test/run-pass/tuple-struct-destructuring.rs +++ b/src/test/run-pass/tuple-struct-destructuring.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo(isize, isize); pub fn main() { diff --git a/src/test/run-pass/tuple-struct-matching.rs b/src/test/run-pass/tuple-struct-matching.rs index b37302fce0830..2e2a32e92a669 100644 --- a/src/test/run-pass/tuple-struct-matching.rs +++ b/src/test/run-pass/tuple-struct-matching.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo(isize, isize); pub fn main() { diff --git a/src/test/run-pass/tuple-struct-trivial.rs b/src/test/run-pass/tuple-struct-trivial.rs index fa2c9768fcb50..57abb0c5efe97 100644 --- a/src/test/run-pass/tuple-struct-trivial.rs +++ b/src/test/run-pass/tuple-struct-trivial.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct Foo(isize, isize, isize); diff --git a/src/test/run-pass/two-macro-use.rs b/src/test/run-pass/two-macro-use.rs index 5df9d0222b4bb..1a941367fc0f7 100644 --- a/src/test/run-pass/two-macro-use.rs +++ b/src/test/run-pass/two-macro-use.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:two_macros.rs #[macro_use(macro_one)] diff --git a/src/test/run-pass/tydesc-name.rs b/src/test/run-pass/tydesc-name.rs index 4a169c0a384aa..a149e66118d6d 100644 --- a/src/test/run-pass/tydesc-name.rs +++ b/src/test/run-pass/tydesc-name.rs @@ -1,14 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![feature(core_intrinsics)] use std::intrinsics::type_name; diff --git a/src/test/run-pass/type-ascription.rs b/src/test/run-pass/type-ascription.rs index 18fb8e2e408f1..58b6db991e8dd 100644 --- a/src/test/run-pass/type-ascription.rs +++ b/src/test/run-pass/type-ascription.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Type ascription doesn't lead to unsoundness #![feature(type_ascription)] diff --git a/src/test/run-pass/type-id-higher-rank-2.rs b/src/test/run-pass/type-id-higher-rank-2.rs index aead8bc264d7e..d9280cf97f920 100644 --- a/src/test/run-pass/type-id-higher-rank-2.rs +++ b/src/test/run-pass/type-id-higher-rank-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we can't ignore lifetimes by going through Any. use std::any::Any; diff --git a/src/test/run-pass/type-id-higher-rank.rs b/src/test/run-pass/type-id-higher-rank.rs index 2a6708dc99904..55d70e31b1641 100644 --- a/src/test/run-pass/type-id-higher-rank.rs +++ b/src/test/run-pass/type-id-higher-rank.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that type IDs correctly account for higher-rank lifetimes // Also acts as a regression test for an ICE (issue #19791) diff --git a/src/test/run-pass/type-in-nested-module.rs b/src/test/run-pass/type-in-nested-module.rs index 7e2360caa93ff..da31a2afcabd9 100644 --- a/src/test/run-pass/type-in-nested-module.rs +++ b/src/test/run-pass/type-in-nested-module.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - // pretty-expanded FIXME #23616 mod a { diff --git a/src/test/run-pass/type-infer-generalize-ty-var.rs b/src/test/run-pass/type-infer-generalize-ty-var.rs index d7fb85ca4842e..b2bdb523f9e58 100644 --- a/src/test/run-pass/type-infer-generalize-ty-var.rs +++ b/src/test/run-pass/type-infer-generalize-ty-var.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test a scenario where we generate a constraint like `?1 <: &?2`. // In such a case, it is important that we instantiate `?1` with `&?3` // where `?3 <: ?2`, and not with `&?2`. This is a regression test for diff --git a/src/test/run-pass/type-macros-hlist.rs b/src/test/run-pass/type-macros-hlist.rs index 84c0983de80c8..95dd6eccfef49 100644 --- a/src/test/run-pass/type-macros-hlist.rs +++ b/src/test/run-pass/type-macros-hlist.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::*; #[derive(Copy, Clone, Debug, Eq, Ord, PartialEq, PartialOrd)] diff --git a/src/test/run-pass/type-macros-simple.rs b/src/test/run-pass/type-macros-simple.rs index 67b1d2c06e314..06d2ee5346432 100644 --- a/src/test/run-pass/type-macros-simple.rs +++ b/src/test/run-pass/type-macros-simple.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! Tuple { { $A:ty,$B:ty } => { ($A, $B) } } diff --git a/src/test/run-pass/type-namespace.rs b/src/test/run-pass/type-namespace.rs index 7172e9b85e3c8..587a302ad5f89 100644 --- a/src/test/run-pass/type-namespace.rs +++ b/src/test/run-pass/type-namespace.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct A { a: isize } fn a(a: A) -> isize { return a.a; } diff --git a/src/test/run-pass/type-param-constraints.rs b/src/test/run-pass/type-param-constraints.rs index 1a3bdcca7a1e5..2f1b5c68e000c 100644 --- a/src/test/run-pass/type-param-constraints.rs +++ b/src/test/run-pass/type-param-constraints.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/type-param.rs b/src/test/run-pass/type-param.rs index c59e40934fb4b..6efbf5b633186 100644 --- a/src/test/run-pass/type-param.rs +++ b/src/test/run-pass/type-param.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - // pretty-expanded FIXME #23616 type lteq = extern fn(T) -> bool; diff --git a/src/test/run-pass/type-params-in-for-each.rs b/src/test/run-pass/type-params-in-for-each.rs index fea2bd978eb96..5e5a73aeb3201 100644 --- a/src/test/run-pass/type-params-in-for-each.rs +++ b/src/test/run-pass/type-params-in-for-each.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // pretty-expanded FIXME #23616 struct S { diff --git a/src/test/run-pass/type-ptr.rs b/src/test/run-pass/type-ptr.rs index 67ead80c89b25..001218e0ae7b3 100644 --- a/src/test/run-pass/type-ptr.rs +++ b/src/test/run-pass/type-ptr.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn f(a: *const isize) -> *const isize { return a; } diff --git a/src/test/run-pass/type-sizes.rs b/src/test/run-pass/type-sizes.rs index 5eb079988f5be..4757e6749e3eb 100644 --- a/src/test/run-pass/type-sizes.rs +++ b/src/test/run-pass/type-sizes.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(never_type)] use std::mem::size_of; diff --git a/src/test/run-pass/type-use-i1-versus-i8.rs b/src/test/run-pass/type-use-i1-versus-i8.rs index 6cef9c3be172d..dc029e4569ef5 100644 --- a/src/test/run-pass/type-use-i1-versus-i8.rs +++ b/src/test/run-pass/type-use-i1-versus-i8.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 use std::ptr; diff --git a/src/test/run-pass/typeck-fn-to-unsafe-fn-ptr.rs b/src/test/run-pass/typeck-fn-to-unsafe-fn-ptr.rs index 323705f3f955f..101f9756c8504 100644 --- a/src/test/run-pass/typeck-fn-to-unsafe-fn-ptr.rs +++ b/src/test/run-pass/typeck-fn-to-unsafe-fn-ptr.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This tests reification from safe function to `unsafe fn` pointer fn do_nothing() -> () {} diff --git a/src/test/run-pass/typeck-macro-interaction-issue-8852.rs b/src/test/run-pass/typeck-macro-interaction-issue-8852.rs index 696e151a80e8b..088fcd09283b5 100644 --- a/src/test/run-pass/typeck-macro-interaction-issue-8852.rs +++ b/src/test/run-pass/typeck-macro-interaction-issue-8852.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum T { A(isize), B(f64) diff --git a/src/test/run-pass/typeck_type_placeholder_1.rs b/src/test/run-pass/typeck_type_placeholder_1.rs index 113d52ffb35b9..5534e17139bd6 100644 --- a/src/test/run-pass/typeck_type_placeholder_1.rs +++ b/src/test/run-pass/typeck_type_placeholder_1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test checks that the `_` type placeholder works // correctly for enabling type inference. diff --git a/src/test/run-pass/typeclasses-eq-example-static.rs b/src/test/run-pass/typeclasses-eq-example-static.rs index d386f27d8c23b..4b9276276e7b7 100644 --- a/src/test/run-pass/typeclasses-eq-example-static.rs +++ b/src/test/run-pass/typeclasses-eq-example-static.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] // Example from lkuper's intern talk, August 2012 -- now with static diff --git a/src/test/run-pass/typeclasses-eq-example.rs b/src/test/run-pass/typeclasses-eq-example.rs index 8e8fd9bf64843..97a5a73ff5582 100644 --- a/src/test/run-pass/typeclasses-eq-example.rs +++ b/src/test/run-pass/typeclasses-eq-example.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] // Example from lkuper's intern talk, August 2012. diff --git a/src/test/run-pass/typeid-intrinsic.rs b/src/test/run-pass/typeid-intrinsic.rs index 54d5415a5539b..4b03478b6104a 100644 --- a/src/test/run-pass/typeid-intrinsic.rs +++ b/src/test/run-pass/typeid-intrinsic.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:typeid-intrinsic-aux1.rs // aux-build:typeid-intrinsic-aux2.rs diff --git a/src/test/run-pass/typestate-cfg-nesting.rs b/src/test/run-pass/typestate-cfg-nesting.rs index 2acaff262690b..baa09df5d6336 100644 --- a/src/test/run-pass/typestate-cfg-nesting.rs +++ b/src/test/run-pass/typestate-cfg-nesting.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![allow(dead_assignment)] diff --git a/src/test/run-pass/typestate-multi-decl.rs b/src/test/run-pass/typestate-multi-decl.rs index a47883463e8a0..bc8d9c10de17b 100644 --- a/src/test/run-pass/typestate-multi-decl.rs +++ b/src/test/run-pass/typestate-multi-decl.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { let (x, y) = (10, 20); let z = x + y; diff --git a/src/test/run-pass/u128-as-f32.rs b/src/test/run-pass/u128-as-f32.rs index 2848fb2d51a6b..831e8df1f91e4 100644 --- a/src/test/run-pass/u128-as-f32.rs +++ b/src/test/run-pass/u128-as-f32.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten u128 not supported #![feature(test)] diff --git a/src/test/run-pass/u128.rs b/src/test/run-pass/u128.rs index d649b3b74d39a..f583ba1ee2ca2 100644 --- a/src/test/run-pass/u128.rs +++ b/src/test/run-pass/u128.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten u128 not supported // compile-flags: -Z borrowck=compare diff --git a/src/test/run-pass/u32-decr.rs b/src/test/run-pass/u32-decr.rs index b56b6f32c0291..60039b4195a28 100644 --- a/src/test/run-pass/u32-decr.rs +++ b/src/test/run-pass/u32-decr.rs @@ -1,17 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - - pub fn main() { let mut word: u32 = 200000; word = word - 1; diff --git a/src/test/run-pass/u8-incr-decr.rs b/src/test/run-pass/u8-incr-decr.rs index d35ef015e6f0b..6f612984da5fd 100644 --- a/src/test/run-pass/u8-incr-decr.rs +++ b/src/test/run-pass/u8-incr-decr.rs @@ -1,17 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - - // These constants were chosen because they aren't used anywhere // in the rest of the generated code so they're easily grep-able. diff --git a/src/test/run-pass/u8-incr.rs b/src/test/run-pass/u8-incr.rs index 9554f9c2dfbca..c58ec0068971f 100644 --- a/src/test/run-pass/u8-incr.rs +++ b/src/test/run-pass/u8-incr.rs @@ -1,17 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - - pub fn main() { let mut x: u8 = 12; let y: u8 = 12; diff --git a/src/test/run-pass/ufcs-explicit-self.rs b/src/test/run-pass/ufcs-explicit-self.rs index b3cbd2c4eb37b..dd242b231a520 100644 --- a/src/test/run-pass/ufcs-explicit-self.rs +++ b/src/test/run-pass/ufcs-explicit-self.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] #[derive(Copy, Clone)] diff --git a/src/test/run-pass/ufcs-polymorphic-paths.rs b/src/test/run-pass/ufcs-polymorphic-paths.rs index 491045564ce22..e136bb23bcd8a 100644 --- a/src/test/run-pass/ufcs-polymorphic-paths.rs +++ b/src/test/run-pass/ufcs-polymorphic-paths.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::borrow::{Cow, ToOwned}; use std::default::Default; use std::iter::FromIterator; diff --git a/src/test/run-pass/ufcs-trait-object.rs b/src/test/run-pass/ufcs-trait-object.rs index 457beeb3f37a3..b94b101514b10 100644 --- a/src/test/run-pass/ufcs-trait-object.rs +++ b/src/test/run-pass/ufcs-trait-object.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that when you use ufcs form to invoke a trait method (on a // trait object) everything works fine. diff --git a/src/test/run-pass/ufcs-type-params.rs b/src/test/run-pass/ufcs-type-params.rs index d72fde1a3332f..2bb15b91760fa 100644 --- a/src/test/run-pass/ufcs-type-params.rs +++ b/src/test/run-pass/ufcs-type-params.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait Foo { diff --git a/src/test/run-pass/uint.rs b/src/test/run-pass/uint.rs index a894d76297930..61898ef878800 100644 --- a/src/test/run-pass/uint.rs +++ b/src/test/run-pass/uint.rs @@ -1,16 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - // pretty-expanded FIXME #23616 pub fn main() { let _x: usize = 10 as usize; } diff --git a/src/test/run-pass/unary-minus-suffix-inference.rs b/src/test/run-pass/unary-minus-suffix-inference.rs index cff260c3ba63e..e5579c20a1474 100644 --- a/src/test/run-pass/unary-minus-suffix-inference.rs +++ b/src/test/run-pass/unary-minus-suffix-inference.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { let a = 1; let a_neg: i8 = -a; diff --git a/src/test/run-pass/unboxed-closures-all-traits.rs b/src/test/run-pass/unboxed-closures-all-traits.rs index 201500d0c6289..33612f33df79b 100644 --- a/src/test/run-pass/unboxed-closures-all-traits.rs +++ b/src/test/run-pass/unboxed-closures-all-traits.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(lang_items)] fn a isize>(f: F) -> isize { diff --git a/src/test/run-pass/unboxed-closures-blanket-fn-mut.rs b/src/test/run-pass/unboxed-closures-blanket-fn-mut.rs index 23ec0cb5f60f0..a2c7439ea7faf 100644 --- a/src/test/run-pass/unboxed-closures-blanket-fn-mut.rs +++ b/src/test/run-pass/unboxed-closures-blanket-fn-mut.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that you can supply `&F` where `F: FnMut()`. #![feature(lang_items)] diff --git a/src/test/run-pass/unboxed-closures-blanket-fn.rs b/src/test/run-pass/unboxed-closures-blanket-fn.rs index 2aa48e7d2add3..b261992ad2143 100644 --- a/src/test/run-pass/unboxed-closures-blanket-fn.rs +++ b/src/test/run-pass/unboxed-closures-blanket-fn.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that you can supply `&F` where `F: Fn()`. #![feature(lang_items)] diff --git a/src/test/run-pass/unboxed-closures-boxed.rs b/src/test/run-pass/unboxed-closures-boxed.rs index 72d5a1dc0433e..7b5e02f692d35 100644 --- a/src/test/run-pass/unboxed-closures-boxed.rs +++ b/src/test/run-pass/unboxed-closures-boxed.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] use std::ops::FnMut; diff --git a/src/test/run-pass/unboxed-closures-by-ref.rs b/src/test/run-pass/unboxed-closures-by-ref.rs index b251215909a43..e08966853aee8 100644 --- a/src/test/run-pass/unboxed-closures-by-ref.rs +++ b/src/test/run-pass/unboxed-closures-by-ref.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test by-ref capture of environment in unboxed closure types fn call_fn(f: F) { diff --git a/src/test/run-pass/unboxed-closures-call-fn-autoderef.rs b/src/test/run-pass/unboxed-closures-call-fn-autoderef.rs index 56c53bcafcede..51e53fc773169 100644 --- a/src/test/run-pass/unboxed-closures-call-fn-autoderef.rs +++ b/src/test/run-pass/unboxed-closures-call-fn-autoderef.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the call operator autoderefs when calling a bounded type parameter. use std::ops::FnMut; diff --git a/src/test/run-pass/unboxed-closures-call-sugar-autoderef.rs b/src/test/run-pass/unboxed-closures-call-sugar-autoderef.rs index 63667ec11d669..647455f93f979 100644 --- a/src/test/run-pass/unboxed-closures-call-sugar-autoderef.rs +++ b/src/test/run-pass/unboxed-closures-call-sugar-autoderef.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the call operator autoderefs when calling a bounded type parameter. use std::ops::FnMut; diff --git a/src/test/run-pass/unboxed-closures-call-sugar-object-autoderef.rs b/src/test/run-pass/unboxed-closures-call-sugar-object-autoderef.rs index f4453f1bb8ab3..4614e789eac6a 100644 --- a/src/test/run-pass/unboxed-closures-call-sugar-object-autoderef.rs +++ b/src/test/run-pass/unboxed-closures-call-sugar-object-autoderef.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the call operator autoderefs when calling to an object type. use std::ops::FnMut; diff --git a/src/test/run-pass/unboxed-closures-call-sugar-object.rs b/src/test/run-pass/unboxed-closures-call-sugar-object.rs index 2fdb9e9b346c4..9336f0343341b 100644 --- a/src/test/run-pass/unboxed-closures-call-sugar-object.rs +++ b/src/test/run-pass/unboxed-closures-call-sugar-object.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::FnMut; fn make_adder(x: isize) -> Boxisize + 'static> { diff --git a/src/test/run-pass/unboxed-closures-counter-not-moved.rs b/src/test/run-pass/unboxed-closures-counter-not-moved.rs index 300a0ee63f817..70335a984ee03 100644 --- a/src/test/run-pass/unboxed-closures-counter-not-moved.rs +++ b/src/test/run-pass/unboxed-closures-counter-not-moved.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we mutate a counter on the stack only when we expect to. fn call(f: F) where F : FnOnce() { diff --git a/src/test/run-pass/unboxed-closures-cross-crate.rs b/src/test/run-pass/unboxed-closures-cross-crate.rs index 37dc760cedcfe..c27c231d591f5 100644 --- a/src/test/run-pass/unboxed-closures-cross-crate.rs +++ b/src/test/run-pass/unboxed-closures-cross-crate.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that unboxed closures work with cross-crate inlining // Acts as a regression test for #16790, #18378 and #18543 diff --git a/src/test/run-pass/unboxed-closures-direct-sugary-call.rs b/src/test/run-pass/unboxed-closures-direct-sugary-call.rs index c8da4a6992a1d..40e7102365581 100644 --- a/src/test/run-pass/unboxed-closures-direct-sugary-call.rs +++ b/src/test/run-pass/unboxed-closures-direct-sugary-call.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn main() { diff --git a/src/test/run-pass/unboxed-closures-drop.rs b/src/test/run-pass/unboxed-closures-drop.rs index 57f2f87e24697..776607b5a4441 100644 --- a/src/test/run-pass/unboxed-closures-drop.rs +++ b/src/test/run-pass/unboxed-closures-drop.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // A battery of tests to ensure destructors of unboxed closure environments // run at the right times. diff --git a/src/test/run-pass/unboxed-closures-extern-fn-hr.rs b/src/test/run-pass/unboxed-closures-extern-fn-hr.rs index 75cd61b9cf029..551d1e4f27cf8 100644 --- a/src/test/run-pass/unboxed-closures-extern-fn-hr.rs +++ b/src/test/run-pass/unboxed-closures-extern-fn-hr.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Checks that higher-ranked extern fn pointers implement the full range of Fn traits. fn square(x: &isize) -> isize { (*x) * (*x) } diff --git a/src/test/run-pass/unboxed-closures-extern-fn.rs b/src/test/run-pass/unboxed-closures-extern-fn.rs index eddb6080d17be..f42b6ff79a463 100644 --- a/src/test/run-pass/unboxed-closures-extern-fn.rs +++ b/src/test/run-pass/unboxed-closures-extern-fn.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Checks that extern fn pointers implement the full range of Fn traits. use std::ops::{Fn,FnMut,FnOnce}; diff --git a/src/test/run-pass/unboxed-closures-fn-as-fnmut-and-fnonce.rs b/src/test/run-pass/unboxed-closures-fn-as-fnmut-and-fnonce.rs index f90aced3dbe33..3ae2b376fff95 100644 --- a/src/test/run-pass/unboxed-closures-fn-as-fnmut-and-fnonce.rs +++ b/src/test/run-pass/unboxed-closures-fn-as-fnmut-and-fnonce.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Checks that the Fn trait hierarchy rules permit // any Fn trait to be used where Fn is implemented. diff --git a/src/test/run-pass/unboxed-closures-fnmut-as-fnonce.rs b/src/test/run-pass/unboxed-closures-fnmut-as-fnonce.rs index 0a977cef442ee..663ac567bcfcf 100644 --- a/src/test/run-pass/unboxed-closures-fnmut-as-fnonce.rs +++ b/src/test/run-pass/unboxed-closures-fnmut-as-fnonce.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Checks that the Fn trait hierarchy rules permit // FnMut or FnOnce to be used where FnMut is implemented. diff --git a/src/test/run-pass/unboxed-closures-generic.rs b/src/test/run-pass/unboxed-closures-generic.rs index 01c81ef98d505..89b0898fdf4a5 100644 --- a/src/test/run-pass/unboxed-closures-generic.rs +++ b/src/test/run-pass/unboxed-closures-generic.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::FnMut; fn call_iti32>(y: i32, mut f: F) -> i32 { diff --git a/src/test/run-pass/unboxed-closures-infer-arg-types-from-expected-bound.rs b/src/test/run-pass/unboxed-closures-infer-arg-types-from-expected-bound.rs index c4944548e17f0..7ec6922d145ec 100644 --- a/src/test/run-pass/unboxed-closures-infer-arg-types-from-expected-bound.rs +++ b/src/test/run-pass/unboxed-closures-infer-arg-types-from-expected-bound.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are able to infer that the type of `x` is `isize` based // on the expected type from the object. diff --git a/src/test/run-pass/unboxed-closures-infer-arg-types-from-expected-object-type.rs b/src/test/run-pass/unboxed-closures-infer-arg-types-from-expected-object-type.rs index 9cad7d61e32c5..6586b60345c61 100644 --- a/src/test/run-pass/unboxed-closures-infer-arg-types-from-expected-object-type.rs +++ b/src/test/run-pass/unboxed-closures-infer-arg-types-from-expected-object-type.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are able to infer that the type of `x` is `isize` based // on the expected type from the object. diff --git a/src/test/run-pass/unboxed-closures-infer-arg-types-w-bound-regs-from-expected-bound.rs b/src/test/run-pass/unboxed-closures-infer-arg-types-w-bound-regs-from-expected-bound.rs index bdd1932182bdc..272fc440faa35 100644 --- a/src/test/run-pass/unboxed-closures-infer-arg-types-w-bound-regs-from-expected-bound.rs +++ b/src/test/run-pass/unboxed-closures-infer-arg-types-w-bound-regs-from-expected-bound.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are able to infer that the type of `x` is `isize` based // on the expected type from the object. diff --git a/src/test/run-pass/unboxed-closures-infer-explicit-call-early.rs b/src/test/run-pass/unboxed-closures-infer-explicit-call-early.rs index 028f2e9375b3c..5e5b4a671cc2e 100644 --- a/src/test/run-pass/unboxed-closures-infer-explicit-call-early.rs +++ b/src/test/run-pass/unboxed-closures-infer-explicit-call-early.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(fn_traits)] fn main() { diff --git a/src/test/run-pass/unboxed-closures-infer-fnmut-calling-fnmut.rs b/src/test/run-pass/unboxed-closures-infer-fnmut-calling-fnmut.rs index 17833033492d0..99e3e424607aa 100644 --- a/src/test/run-pass/unboxed-closures-infer-fnmut-calling-fnmut.rs +++ b/src/test/run-pass/unboxed-closures-infer-fnmut-calling-fnmut.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are able to infer a suitable kind for this closure // that is just called (`FnMut`). diff --git a/src/test/run-pass/unboxed-closures-infer-fnmut-move.rs b/src/test/run-pass/unboxed-closures-infer-fnmut-move.rs index 794527249bffa..c5a472800d01d 100644 --- a/src/test/run-pass/unboxed-closures-infer-fnmut-move.rs +++ b/src/test/run-pass/unboxed-closures-infer-fnmut-move.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are able to infer a suitable kind for this `move` // closure that is just called (`FnMut`). diff --git a/src/test/run-pass/unboxed-closures-infer-fnmut.rs b/src/test/run-pass/unboxed-closures-infer-fnmut.rs index 67f36b9a9203c..09cd79f498d98 100644 --- a/src/test/run-pass/unboxed-closures-infer-fnmut.rs +++ b/src/test/run-pass/unboxed-closures-infer-fnmut.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are able to infer a suitable kind for this closure // that is just called (`FnMut`). diff --git a/src/test/run-pass/unboxed-closures-infer-fnonce-move.rs b/src/test/run-pass/unboxed-closures-infer-fnonce-move.rs index 449f533103a80..299095c2ff8bc 100644 --- a/src/test/run-pass/unboxed-closures-infer-fnonce-move.rs +++ b/src/test/run-pass/unboxed-closures-infer-fnonce-move.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are able to infer a suitable kind for this `move` // closure that is just called (`FnOnce`). diff --git a/src/test/run-pass/unboxed-closures-infer-fnonce.rs b/src/test/run-pass/unboxed-closures-infer-fnonce.rs index 79a1aff853524..d001e2b943fdf 100644 --- a/src/test/run-pass/unboxed-closures-infer-fnonce.rs +++ b/src/test/run-pass/unboxed-closures-infer-fnonce.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are able to infer a suitable kind for this closure // that is just called (`FnOnce`). diff --git a/src/test/run-pass/unboxed-closures-infer-kind.rs b/src/test/run-pass/unboxed-closures-infer-kind.rs index c04df7ed5f871..ac1b9a15acc47 100644 --- a/src/test/run-pass/unboxed-closures-infer-kind.rs +++ b/src/test/run-pass/unboxed-closures-infer-kind.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we can infer the "kind" of an unboxed closure based on // the expected type. diff --git a/src/test/run-pass/unboxed-closures-infer-recursive-fn.rs b/src/test/run-pass/unboxed-closures-infer-recursive-fn.rs index ac303e3a090b1..0065ee2cd9855 100644 --- a/src/test/run-pass/unboxed-closures-infer-recursive-fn.rs +++ b/src/test/run-pass/unboxed-closures-infer-recursive-fn.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(fn_traits, unboxed_closures)] use std::marker::PhantomData; diff --git a/src/test/run-pass/unboxed-closures-infer-upvar.rs b/src/test/run-pass/unboxed-closures-infer-upvar.rs index 1401fe7470b0a..33377b660912c 100644 --- a/src/test/run-pass/unboxed-closures-infer-upvar.rs +++ b/src/test/run-pass/unboxed-closures-infer-upvar.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the type variable in the type(`Vec<_>`) of a closed over // variable does not interfere with type inference. diff --git a/src/test/run-pass/unboxed-closures-manual-impl.rs b/src/test/run-pass/unboxed-closures-manual-impl.rs index e2d05884f3a5f..269f20fca0073 100644 --- a/src/test/run-pass/unboxed-closures-manual-impl.rs +++ b/src/test/run-pass/unboxed-closures-manual-impl.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unboxed_closures, fn_traits)] struct S; diff --git a/src/test/run-pass/unboxed-closures-monomorphization.rs b/src/test/run-pass/unboxed-closures-monomorphization.rs index d0d36d969b785..16c4441cff9c3 100644 --- a/src/test/run-pass/unboxed-closures-monomorphization.rs +++ b/src/test/run-pass/unboxed-closures-monomorphization.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that unboxed closures in contexts with free type parameters // monomorphize correctly (issue #16791) diff --git a/src/test/run-pass/unboxed-closures-move-from-projection-issue-30046.rs b/src/test/run-pass/unboxed-closures-move-from-projection-issue-30046.rs index d902ebc9dc9d2..b5fa279cca90c 100644 --- a/src/test/run-pass/unboxed-closures-move-from-projection-issue-30046.rs +++ b/src/test/run-pass/unboxed-closures-move-from-projection-issue-30046.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused)] fn foo(f: F) diff --git a/src/test/run-pass/unboxed-closures-move-mutable.rs b/src/test/run-pass/unboxed-closures-move-mutable.rs index a55b0a0185e61..e40f626ffb53b 100644 --- a/src/test/run-pass/unboxed-closures-move-mutable.rs +++ b/src/test/run-pass/unboxed-closures-move-mutable.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![deny(unused_mut)] diff --git a/src/test/run-pass/unboxed-closures-move-some-upvars-in-by-ref-closure.rs b/src/test/run-pass/unboxed-closures-move-some-upvars-in-by-ref-closure.rs index b9a16535c420a..ad82567580612 100644 --- a/src/test/run-pass/unboxed-closures-move-some-upvars-in-by-ref-closure.rs +++ b/src/test/run-pass/unboxed-closures-move-some-upvars-in-by-ref-closure.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that in a by-ref once closure we move some variables even as // we capture others by mutable reference. diff --git a/src/test/run-pass/unboxed-closures-prelude.rs b/src/test/run-pass/unboxed-closures-prelude.rs index f82b04f37c502..767d5181f3480 100644 --- a/src/test/run-pass/unboxed-closures-prelude.rs +++ b/src/test/run-pass/unboxed-closures-prelude.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that the re-exports of `FnOnce` et al from the prelude work. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/unboxed-closures-simple.rs b/src/test/run-pass/unboxed-closures-simple.rs index 429afb95248ce..8dbd5bfc5055e 100644 --- a/src/test/run-pass/unboxed-closures-simple.rs +++ b/src/test/run-pass/unboxed-closures-simple.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::FnMut; pub fn main() { diff --git a/src/test/run-pass/unboxed-closures-single-word-env.rs b/src/test/run-pass/unboxed-closures-single-word-env.rs index 3ed055a7884eb..36d68e2f347d2 100644 --- a/src/test/run-pass/unboxed-closures-single-word-env.rs +++ b/src/test/run-pass/unboxed-closures-single-word-env.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Ensures that single-word environments work right in unboxed closures. // These take a different path in codegen. diff --git a/src/test/run-pass/unboxed-closures-static-call-fn-once.rs b/src/test/run-pass/unboxed-closures-static-call-fn-once.rs index c13e9513ce33a..c5663cf6ec303 100644 --- a/src/test/run-pass/unboxed-closures-static-call-fn-once.rs +++ b/src/test/run-pass/unboxed-closures-static-call-fn-once.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn main() { diff --git a/src/test/run-pass/unboxed-closures-sugar-object.rs b/src/test/run-pass/unboxed-closures-sugar-object.rs index b7d367f235381..0a5b118fe5800 100644 --- a/src/test/run-pass/unboxed-closures-sugar-object.rs +++ b/src/test/run-pass/unboxed-closures-sugar-object.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test unboxed closure sugar used in object types. #![allow(dead_code)] diff --git a/src/test/run-pass/unboxed-closures-unique-type-id.rs b/src/test/run-pass/unboxed-closures-unique-type-id.rs index c95885518ea2f..998c58fb5e569 100644 --- a/src/test/run-pass/unboxed-closures-unique-type-id.rs +++ b/src/test/run-pass/unboxed-closures-unique-type-id.rs @@ -1,12 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // This code used to produce the following ICE: // diff --git a/src/test/run-pass/unboxed-closures-zero-args.rs b/src/test/run-pass/unboxed-closures-zero-args.rs index 9e6a7cce1fd2a..262ab90412506 100644 --- a/src/test/run-pass/unboxed-closures-zero-args.rs +++ b/src/test/run-pass/unboxed-closures-zero-args.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn main() { diff --git a/src/test/run-pass/underscore-lifetimes.rs b/src/test/run-pass/underscore-lifetimes.rs index 4dd1a565c9f14..8785ec727544d 100644 --- a/src/test/run-pass/underscore-lifetimes.rs +++ b/src/test/run-pass/underscore-lifetimes.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo<'a>(&'a u8); fn foo(x: &u8) -> Foo<'_> { diff --git a/src/test/run-pass/underscore-method-after-integer.rs b/src/test/run-pass/underscore-method-after-integer.rs index af91256421101..f9c06d1e4f147 100644 --- a/src/test/run-pass/underscore-method-after-integer.rs +++ b/src/test/run-pass/underscore-method-after-integer.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Tr : Sized { fn _method_on_numbers(self) {} } diff --git a/src/test/run-pass/uniform-paths/basic-nested.rs b/src/test/run-pass/uniform-paths/basic-nested.rs index 954736dfd907c..7f4b8acdefe02 100644 --- a/src/test/run-pass/uniform-paths/basic-nested.rs +++ b/src/test/run-pass/uniform-paths/basic-nested.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 #![feature(decl_macro, uniform_paths)] diff --git a/src/test/run-pass/uniform-paths/basic.rs b/src/test/run-pass/uniform-paths/basic.rs index 59a0404e4c360..3b8cbf6efd135 100644 --- a/src/test/run-pass/uniform-paths/basic.rs +++ b/src/test/run-pass/uniform-paths/basic.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 #![feature(uniform_paths)] diff --git a/src/test/run-pass/uniform-paths/macros-nested.rs b/src/test/run-pass/uniform-paths/macros-nested.rs index 9cf05cd956039..552aed29fa3a9 100644 --- a/src/test/run-pass/uniform-paths/macros-nested.rs +++ b/src/test/run-pass/uniform-paths/macros-nested.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 #![feature(uniform_paths)] diff --git a/src/test/run-pass/uniform-paths/macros.rs b/src/test/run-pass/uniform-paths/macros.rs index ad74f5d0876bb..0ad9ce4f345c9 100644 --- a/src/test/run-pass/uniform-paths/macros.rs +++ b/src/test/run-pass/uniform-paths/macros.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 #![feature(uniform_paths)] diff --git a/src/test/run-pass/uniform-paths/same-crate.rs b/src/test/run-pass/uniform-paths/same-crate.rs index a3eefa7134c47..fca2ce33e1575 100644 --- a/src/test/run-pass/uniform-paths/same-crate.rs +++ b/src/test/run-pass/uniform-paths/same-crate.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 #![feature(uniform_paths)] diff --git a/src/test/run-pass/unify-return-ty.rs b/src/test/run-pass/unify-return-ty.rs index 01b55ebb8e26e..3f743a7da4066 100644 --- a/src/test/run-pass/unify-return-ty.rs +++ b/src/test/run-pass/unify-return-ty.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that the tail expr in null() has its type // unified with the type *T, and so the type variable // in that type gets resolved. diff --git a/src/test/run-pass/uninit-empty-types.rs b/src/test/run-pass/uninit-empty-types.rs index 8c69704b3bd19..b59971b349802 100644 --- a/src/test/run-pass/uninit-empty-types.rs +++ b/src/test/run-pass/uninit-empty-types.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test the uninit() construct returning various empty types. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/uninstantiable-struct.rs b/src/test/run-pass/uninstantiable-struct.rs index d974017157655..d016d8319f870 100644 --- a/src/test/run-pass/uninstantiable-struct.rs +++ b/src/test/run-pass/uninstantiable-struct.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Z(&'static Z); pub fn main() {} diff --git a/src/test/run-pass/union/auxiliary/union.rs b/src/test/run-pass/union/auxiliary/union.rs index 2c4945622abdc..e785e35aeb8bd 100644 --- a/src/test/run-pass/union/auxiliary/union.rs +++ b/src/test/run-pass/union/auxiliary/union.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub union U { pub a: u8, pub b: u16, diff --git a/src/test/run-pass/union/union-align.rs b/src/test/run-pass/union/union-align.rs index 54e4e12d24fa5..d4f3eacd101bc 100644 --- a/src/test/run-pass/union/union-align.rs +++ b/src/test/run-pass/union/union-align.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(untagged_unions)] use std::mem::{size_of, size_of_val, align_of, align_of_val}; diff --git a/src/test/run-pass/union/union-backcomp.rs b/src/test/run-pass/union/union-backcomp.rs index b706a81850ce8..3be67d537f057 100644 --- a/src/test/run-pass/union/union-backcomp.rs +++ b/src/test/run-pass/union/union-backcomp.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! union { () => (struct S;) } diff --git a/src/test/run-pass/union/union-basic.rs b/src/test/run-pass/union/union-basic.rs index 079f6a6b641e9..2a64e72566e4a 100644 --- a/src/test/run-pass/union/union-basic.rs +++ b/src/test/run-pass/union/union-basic.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:union.rs extern crate union; diff --git a/src/test/run-pass/union/union-c-interop.rs b/src/test/run-pass/union/union-c-interop.rs index dd16bf2e4a38e..f5dce2534039b 100644 --- a/src/test/run-pass/union/union-c-interop.rs +++ b/src/test/run-pass/union/union-c-interop.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare no libc to test ffi with #[derive(Clone, Copy)] diff --git a/src/test/run-pass/union/union-const-codegen.rs b/src/test/run-pass/union/union-const-codegen.rs index 77270364bb5e9..8731c1f7223e5 100644 --- a/src/test/run-pass/union/union-const-codegen.rs +++ b/src/test/run-pass/union/union-const-codegen.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - union U { a: u64, b: u64, diff --git a/src/test/run-pass/union/union-const-eval-field.rs b/src/test/run-pass/union/union-const-eval-field.rs index a380b01dcc13f..7b910ea9afa8c 100644 --- a/src/test/run-pass/union/union-const-eval-field.rs +++ b/src/test/run-pass/union/union-const-eval-field.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_fn)] type Field1 = (i32, u32); diff --git a/src/test/run-pass/union/union-derive.rs b/src/test/run-pass/union/union-derive.rs index 8ff6f17394f9e..a04243e3a8684 100644 --- a/src/test/run-pass/union/union-derive.rs +++ b/src/test/run-pass/union/union-derive.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Some traits can be derived for unions. #![feature(untagged_unions)] diff --git a/src/test/run-pass/union/union-drop-assign.rs b/src/test/run-pass/union/union-drop-assign.rs index 0da68e43f32a1..7b36d898712cd 100644 --- a/src/test/run-pass/union/union-drop-assign.rs +++ b/src/test/run-pass/union/union-drop-assign.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Drop works for union itself. #![feature(untagged_unions)] diff --git a/src/test/run-pass/union/union-drop.rs b/src/test/run-pass/union/union-drop.rs index 2ca68dc3b6e39..abe8c672c148f 100644 --- a/src/test/run-pass/union/union-drop.rs +++ b/src/test/run-pass/union/union-drop.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Drop works for union itself. #![feature(untagged_unions)] diff --git a/src/test/run-pass/union/union-generic.rs b/src/test/run-pass/union/union-generic.rs index 9293805edbf83..30398edbd52e2 100644 --- a/src/test/run-pass/union/union-generic.rs +++ b/src/test/run-pass/union/union-generic.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(untagged_unions)] union MaybeItem { diff --git a/src/test/run-pass/union/union-inherent-method.rs b/src/test/run-pass/union/union-inherent-method.rs index a88fdc57a3ef4..3581e8216b7b9 100644 --- a/src/test/run-pass/union/union-inherent-method.rs +++ b/src/test/run-pass/union/union-inherent-method.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - union U { a: u8, } diff --git a/src/test/run-pass/union/union-macro.rs b/src/test/run-pass/union/union-macro.rs index b6141ae82c371..08b5ff78eabc2 100644 --- a/src/test/run-pass/union/union-macro.rs +++ b/src/test/run-pass/union/union-macro.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! duplicate { ($i: item) => { mod m1 { diff --git a/src/test/run-pass/union/union-nodrop.rs b/src/test/run-pass/union/union-nodrop.rs index 6295c6120c5ba..16327ba54ef14 100644 --- a/src/test/run-pass/union/union-nodrop.rs +++ b/src/test/run-pass/union/union-nodrop.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(core_intrinsics)] #![feature(untagged_unions)] diff --git a/src/test/run-pass/union/union-overwrite.rs b/src/test/run-pass/union/union-overwrite.rs index 9389a6237bca6..46d1812624b20 100644 --- a/src/test/run-pass/union/union-overwrite.rs +++ b/src/test/run-pass/union/union-overwrite.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(untagged_unions)] #[repr(C)] diff --git a/src/test/run-pass/union/union-packed.rs b/src/test/run-pass/union/union-packed.rs index 61bb04fece095..dd37d64953d8c 100644 --- a/src/test/run-pass/union/union-packed.rs +++ b/src/test/run-pass/union/union-packed.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(untagged_unions)] #![feature(repr_packed)] diff --git a/src/test/run-pass/union/union-pat-refutability.rs b/src/test/run-pass/union/union-pat-refutability.rs index 81607236c9ecd..61e6bfe29e84a 100644 --- a/src/test/run-pass/union/union-pat-refutability.rs +++ b/src/test/run-pass/union/union-pat-refutability.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[repr(u32)] enum Tag { I, F } diff --git a/src/test/run-pass/union/union-trait-impl.rs b/src/test/run-pass/union/union-trait-impl.rs index c1e408cc02ac6..0f9d3b7936ee8 100644 --- a/src/test/run-pass/union/union-trait-impl.rs +++ b/src/test/run-pass/union/union-trait-impl.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt; union U { diff --git a/src/test/run-pass/union/union-transmute.rs b/src/test/run-pass/union/union-transmute.rs index 7233687aaab53..c1d103d68d149 100644 --- a/src/test/run-pass/union/union-transmute.rs +++ b/src/test/run-pass/union/union-transmute.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate core; use core::f32; diff --git a/src/test/run-pass/union/union-with-drop-fields-lint.rs b/src/test/run-pass/union/union-with-drop-fields-lint.rs index 6cb7e82d6b740..f9d9e83451cd6 100644 --- a/src/test/run-pass/union/union-with-drop-fields-lint.rs +++ b/src/test/run-pass/union/union-with-drop-fields-lint.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(untagged_unions)] #![allow(dead_code)] #![allow(unions_with_drop_fields)] diff --git a/src/test/run-pass/uniq-self-in-mut-slot.rs b/src/test/run-pass/uniq-self-in-mut-slot.rs index a4f953ceaf5c3..0483eddeecba0 100644 --- a/src/test/run-pass/uniq-self-in-mut-slot.rs +++ b/src/test/run-pass/uniq-self-in-mut-slot.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] struct X { diff --git a/src/test/run-pass/unique-assign-copy.rs b/src/test/run-pass/unique-assign-copy.rs index 1e36f5287a77d..850a3b908cba3 100644 --- a/src/test/run-pass/unique-assign-copy.rs +++ b/src/test/run-pass/unique-assign-copy.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/unique-assign-drop.rs b/src/test/run-pass/unique-assign-drop.rs index 1227c14ec02f3..e173c71fe2a4e 100644 --- a/src/test/run-pass/unique-assign-drop.rs +++ b/src/test/run-pass/unique-assign-drop.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![allow(dead_assignment)] #![feature(box_syntax)] diff --git a/src/test/run-pass/unique-assign-generic.rs b/src/test/run-pass/unique-assign-generic.rs index 1abc8203305cf..d1f9200d10303 100644 --- a/src/test/run-pass/unique-assign-generic.rs +++ b/src/test/run-pass/unique-assign-generic.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn f(t: T) -> T { diff --git a/src/test/run-pass/unique-assign.rs b/src/test/run-pass/unique-assign.rs index 66b78d27c59f3..a33e478cf2e85 100644 --- a/src/test/run-pass/unique-assign.rs +++ b/src/test/run-pass/unique-assign.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/unique-autoderef-field.rs b/src/test/run-pass/unique-autoderef-field.rs index 4ad465abc48fe..9d9abc63da5be 100644 --- a/src/test/run-pass/unique-autoderef-field.rs +++ b/src/test/run-pass/unique-autoderef-field.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] struct J { j: isize } diff --git a/src/test/run-pass/unique-autoderef-index.rs b/src/test/run-pass/unique-autoderef-index.rs index b0abcfab78ef2..2a356871e49d7 100644 --- a/src/test/run-pass/unique-autoderef-index.rs +++ b/src/test/run-pass/unique-autoderef-index.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/unique-cmp.rs b/src/test/run-pass/unique-cmp.rs index e949215396c66..775822b3a77e7 100644 --- a/src/test/run-pass/unique-cmp.rs +++ b/src/test/run-pass/unique-cmp.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/unique-containing-tag.rs b/src/test/run-pass/unique-containing-tag.rs index 94f523eb39601..4e40fd28e0740 100644 --- a/src/test/run-pass/unique-containing-tag.rs +++ b/src/test/run-pass/unique-containing-tag.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/unique-create.rs b/src/test/run-pass/unique-create.rs index 5ebabf0c29a52..a61a3a45c6a70 100644 --- a/src/test/run-pass/unique-create.rs +++ b/src/test/run-pass/unique-create.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/unique-decl-init-copy.rs b/src/test/run-pass/unique-decl-init-copy.rs index 71197b9d02fbd..cbee2f22de83e 100644 --- a/src/test/run-pass/unique-decl-init-copy.rs +++ b/src/test/run-pass/unique-decl-init-copy.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/unique-decl-init.rs b/src/test/run-pass/unique-decl-init.rs index 2501caddb4632..f85e972486ef8 100644 --- a/src/test/run-pass/unique-decl-init.rs +++ b/src/test/run-pass/unique-decl-init.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/unique-decl-move.rs b/src/test/run-pass/unique-decl-move.rs index fc6421e2e0889..d519cb177e8b9 100644 --- a/src/test/run-pass/unique-decl-move.rs +++ b/src/test/run-pass/unique-decl-move.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/unique-decl.rs b/src/test/run-pass/unique-decl.rs index bbf9b2f47a742..16cadfca1357e 100644 --- a/src/test/run-pass/unique-decl.rs +++ b/src/test/run-pass/unique-decl.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - pub fn main() { let _: Box; } diff --git a/src/test/run-pass/unique-deref.rs b/src/test/run-pass/unique-deref.rs index 8c008683ef347..41410da83f6dd 100644 --- a/src/test/run-pass/unique-deref.rs +++ b/src/test/run-pass/unique-deref.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/unique-destructure.rs b/src/test/run-pass/unique-destructure.rs index 70b4af1886fc1..b06ec35f520a6 100644 --- a/src/test/run-pass/unique-destructure.rs +++ b/src/test/run-pass/unique-destructure.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_patterns)] #![feature(box_syntax)] diff --git a/src/test/run-pass/unique-drop-complex.rs b/src/test/run-pass/unique-drop-complex.rs index bcfb65769da65..508fda2177726 100644 --- a/src/test/run-pass/unique-drop-complex.rs +++ b/src/test/run-pass/unique-drop-complex.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/unique-ffi-symbols.rs b/src/test/run-pass/unique-ffi-symbols.rs index 81563f40e94bb..8704037c13904 100644 --- a/src/test/run-pass/unique-ffi-symbols.rs +++ b/src/test/run-pass/unique-ffi-symbols.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // We used to have a __rust_abi shim that resulted in duplicated symbols // whenever the item path wasn't enough to disambiguate between them. fn main() { diff --git a/src/test/run-pass/unique-fn-arg-move.rs b/src/test/run-pass/unique-fn-arg-move.rs index 45cc530659f97..f30965965be80 100644 --- a/src/test/run-pass/unique-fn-arg-move.rs +++ b/src/test/run-pass/unique-fn-arg-move.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn f(i: Box) { diff --git a/src/test/run-pass/unique-fn-arg-mut.rs b/src/test/run-pass/unique-fn-arg-mut.rs index 77c4fa29558e3..786dc2863409b 100644 --- a/src/test/run-pass/unique-fn-arg-mut.rs +++ b/src/test/run-pass/unique-fn-arg-mut.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn f(i: &mut Box) { diff --git a/src/test/run-pass/unique-fn-arg.rs b/src/test/run-pass/unique-fn-arg.rs index 20a0008ef56ae..084b4ed3bed7f 100644 --- a/src/test/run-pass/unique-fn-arg.rs +++ b/src/test/run-pass/unique-fn-arg.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn f(i: Box) { diff --git a/src/test/run-pass/unique-fn-ret.rs b/src/test/run-pass/unique-fn-ret.rs index 7d88176828e3b..f68796997b100 100644 --- a/src/test/run-pass/unique-fn-ret.rs +++ b/src/test/run-pass/unique-fn-ret.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn f() -> Box { diff --git a/src/test/run-pass/unique-generic-assign.rs b/src/test/run-pass/unique-generic-assign.rs index 2da3b9f05f68e..d004743359689 100644 --- a/src/test/run-pass/unique-generic-assign.rs +++ b/src/test/run-pass/unique-generic-assign.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #976 diff --git a/src/test/run-pass/unique-in-tag.rs b/src/test/run-pass/unique-in-tag.rs index 517cdd0253564..d6c2675c259a4 100644 --- a/src/test/run-pass/unique-in-tag.rs +++ b/src/test/run-pass/unique-in-tag.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn test1() { diff --git a/src/test/run-pass/unique-in-vec-copy.rs b/src/test/run-pass/unique-in-vec-copy.rs index a460aa6ec1025..4adbd09bcdbb1 100644 --- a/src/test/run-pass/unique-in-vec-copy.rs +++ b/src/test/run-pass/unique-in-vec-copy.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/unique-in-vec.rs b/src/test/run-pass/unique-in-vec.rs index a7edc9cc7104a..08a918560f111 100644 --- a/src/test/run-pass/unique-in-vec.rs +++ b/src/test/run-pass/unique-in-vec.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/unique-init.rs b/src/test/run-pass/unique-init.rs index 768614b1e3c92..2aa4107822163 100644 --- a/src/test/run-pass/unique-init.rs +++ b/src/test/run-pass/unique-init.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/unique-kinds.rs b/src/test/run-pass/unique-kinds.rs index 80364114bce43..694386f469950 100644 --- a/src/test/run-pass/unique-kinds.rs +++ b/src/test/run-pass/unique-kinds.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] use std::cmp::PartialEq; diff --git a/src/test/run-pass/unique-log.rs b/src/test/run-pass/unique-log.rs index 0c17acb3d8984..6d9e951591019 100644 --- a/src/test/run-pass/unique-log.rs +++ b/src/test/run-pass/unique-log.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/unique-match-discrim.rs b/src/test/run-pass/unique-match-discrim.rs index 1b0392341e72d..23fcd9e0bfb8c 100644 --- a/src/test/run-pass/unique-match-discrim.rs +++ b/src/test/run-pass/unique-match-discrim.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #961 // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/unique-move-drop.rs b/src/test/run-pass/unique-move-drop.rs index ba865abc3718a..94324c0ae22c5 100644 --- a/src/test/run-pass/unique-move-drop.rs +++ b/src/test/run-pass/unique-move-drop.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![allow(unused_variables)] #![feature(box_syntax)] diff --git a/src/test/run-pass/unique-move-temp.rs b/src/test/run-pass/unique-move-temp.rs index 8c1178b9a7e0e..cc3a939c4c5f1 100644 --- a/src/test/run-pass/unique-move-temp.rs +++ b/src/test/run-pass/unique-move-temp.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/unique-move.rs b/src/test/run-pass/unique-move.rs index e731ca818fe79..5b83b5192ccf0 100644 --- a/src/test/run-pass/unique-move.rs +++ b/src/test/run-pass/unique-move.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/unique-mutable.rs b/src/test/run-pass/unique-mutable.rs index 480060103003e..c6c29a0597f4d 100644 --- a/src/test/run-pass/unique-mutable.rs +++ b/src/test/run-pass/unique-mutable.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/unique-object-move.rs b/src/test/run-pass/unique-object-move.rs index d93df4e96f99c..bb9839360e7c3 100644 --- a/src/test/run-pass/unique-object-move.rs +++ b/src/test/run-pass/unique-object-move.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #5192 // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/unique-pat-2.rs b/src/test/run-pass/unique-pat-2.rs index 12e81a202e9f8..42530c201e6a8 100644 --- a/src/test/run-pass/unique-pat-2.rs +++ b/src/test/run-pass/unique-pat-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_patterns)] #![feature(box_syntax)] diff --git a/src/test/run-pass/unique-pat-3.rs b/src/test/run-pass/unique-pat-3.rs index 9f361d460e0ed..21b1735d4c03e 100644 --- a/src/test/run-pass/unique-pat-3.rs +++ b/src/test/run-pass/unique-pat-3.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] enum bar { u(Box), w(isize), } diff --git a/src/test/run-pass/unique-pat.rs b/src/test/run-pass/unique-pat.rs index 8af160b1f56c0..b5142624040d3 100644 --- a/src/test/run-pass/unique-pat.rs +++ b/src/test/run-pass/unique-pat.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![feature(box_patterns)] #![feature(box_syntax)] diff --git a/src/test/run-pass/unique-rec.rs b/src/test/run-pass/unique-rec.rs index aa3fc8f5bb569..4d2719a8513a8 100644 --- a/src/test/run-pass/unique-rec.rs +++ b/src/test/run-pass/unique-rec.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] struct X { x: isize } diff --git a/src/test/run-pass/unique-send-2.rs b/src/test/run-pass/unique-send-2.rs index 7a0e585e8b0ae..d056a00f7c2ff 100644 --- a/src/test/run-pass/unique-send-2.rs +++ b/src/test/run-pass/unique-send-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support #![feature(box_syntax)] diff --git a/src/test/run-pass/unique-send.rs b/src/test/run-pass/unique-send.rs index 7644da08e4afa..04dbf495f8bfd 100644 --- a/src/test/run-pass/unique-send.rs +++ b/src/test/run-pass/unique-send.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] use std::sync::mpsc::channel; diff --git a/src/test/run-pass/unique-swap.rs b/src/test/run-pass/unique-swap.rs index 6e6fe4e420b25..186d4ef200baf 100644 --- a/src/test/run-pass/unique-swap.rs +++ b/src/test/run-pass/unique-swap.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] use std::mem::swap; diff --git a/src/test/run-pass/unit-like-struct-drop-run.rs b/src/test/run-pass/unit-like-struct-drop-run.rs index ec37be9420db7..7606c6110a5c8 100644 --- a/src/test/run-pass/unit-like-struct-drop-run.rs +++ b/src/test/run-pass/unit-like-struct-drop-run.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support // Make sure the destructor is run for unit-like structs. diff --git a/src/test/run-pass/unit-like-struct.rs b/src/test/run-pass/unit-like-struct.rs index 849b5810c5f14..4d7eafb291ad3 100644 --- a/src/test/run-pass/unit-like-struct.rs +++ b/src/test/run-pass/unit-like-struct.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo; pub fn main() { diff --git a/src/test/run-pass/unit.rs b/src/test/run-pass/unit.rs index 67eceba020c80..47c8dbfb785cf 100644 --- a/src/test/run-pass/unit.rs +++ b/src/test/run-pass/unit.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![allow(unused_variables)] diff --git a/src/test/run-pass/unnamed_argument_mode.rs b/src/test/run-pass/unnamed_argument_mode.rs index d498a70be491e..fa817be270496 100644 --- a/src/test/run-pass/unnamed_argument_mode.rs +++ b/src/test/run-pass/unnamed_argument_mode.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn good(_a: &isize) { diff --git a/src/test/run-pass/unreachable-code-1.rs b/src/test/run-pass/unreachable-code-1.rs index 6448056fb11f4..08403c168120f 100644 --- a/src/test/run-pass/unreachable-code-1.rs +++ b/src/test/run-pass/unreachable-code-1.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![allow(unused_variables)] #![allow(dead_code)] diff --git a/src/test/run-pass/unreachable-code.rs b/src/test/run-pass/unreachable-code.rs index 5cb5e8c4f99cd..6b6023fba4663 100644 --- a/src/test/run-pass/unreachable-code.rs +++ b/src/test/run-pass/unreachable-code.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![allow(path_statements)] #![allow(unreachable_code)] #![allow(unused_variables)] diff --git a/src/test/run-pass/unsafe-coercion.rs b/src/test/run-pass/unsafe-coercion.rs index 8661ebb414ce5..0c977c1ef320a 100644 --- a/src/test/run-pass/unsafe-coercion.rs +++ b/src/test/run-pass/unsafe-coercion.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that safe fns are not a subtype of unsafe fns. diff --git a/src/test/run-pass/unsafe-fn-called-from-unsafe-blk.rs b/src/test/run-pass/unsafe-fn-called-from-unsafe-blk.rs index f3a2ad749a168..c28304723df2e 100644 --- a/src/test/run-pass/unsafe-fn-called-from-unsafe-blk.rs +++ b/src/test/run-pass/unsafe-fn-called-from-unsafe-blk.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // // See also: compile-fail/unsafe-fn-called-from-safe.rs diff --git a/src/test/run-pass/unsafe-fn-called-from-unsafe-fn.rs b/src/test/run-pass/unsafe-fn-called-from-unsafe-fn.rs index 37c72ba8ab065..bc84f12e20443 100644 --- a/src/test/run-pass/unsafe-fn-called-from-unsafe-fn.rs +++ b/src/test/run-pass/unsafe-fn-called-from-unsafe-fn.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // // See also: compile-fail/unsafe-fn-called-from-safe.rs diff --git a/src/test/run-pass/unsafe-pointer-assignability.rs b/src/test/run-pass/unsafe-pointer-assignability.rs index c8ee0f83b9b0c..11e22d7a08ac0 100644 --- a/src/test/run-pass/unsafe-pointer-assignability.rs +++ b/src/test/run-pass/unsafe-pointer-assignability.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn f(x: *const isize) { unsafe { assert_eq!(*x, 3); diff --git a/src/test/run-pass/unsized-locals/reference-unsized-locals.rs b/src/test/run-pass/unsized-locals/reference-unsized-locals.rs index 6ed39a78648a2..3c4c4fb499ede 100644 --- a/src/test/run-pass/unsized-locals/reference-unsized-locals.rs +++ b/src/test/run-pass/unsized-locals/reference-unsized-locals.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unsized_locals)] fn main() { diff --git a/src/test/run-pass/unsized-locals/simple-unsized-locals.rs b/src/test/run-pass/unsized-locals/simple-unsized-locals.rs index 0b1aa6225eb50..555022596c4d0 100644 --- a/src/test/run-pass/unsized-locals/simple-unsized-locals.rs +++ b/src/test/run-pass/unsized-locals/simple-unsized-locals.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unsized_locals)] fn main() { diff --git a/src/test/run-pass/unsized-locals/unsized-exprs.rs b/src/test/run-pass/unsized-locals/unsized-exprs.rs index 9a5e534db25b3..b02526fe225a8 100644 --- a/src/test/run-pass/unsized-locals/unsized-exprs.rs +++ b/src/test/run-pass/unsized-locals/unsized-exprs.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unsized_tuple_coercion, unsized_locals)] struct A(X); diff --git a/src/test/run-pass/unsized-locals/unsized-parameters.rs b/src/test/run-pass/unsized-locals/unsized-parameters.rs index 0314fe1d68662..4a3a8c11688ba 100644 --- a/src/test/run-pass/unsized-locals/unsized-parameters.rs +++ b/src/test/run-pass/unsized-locals/unsized-parameters.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unsized_locals)] pub fn f0(_f: dyn FnOnce()) {} diff --git a/src/test/run-pass/unsized-tuple-impls.rs b/src/test/run-pass/unsized-tuple-impls.rs index 591b19f89e897..17ab317361ee8 100644 --- a/src/test/run-pass/unsized-tuple-impls.rs +++ b/src/test/run-pass/unsized-tuple-impls.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unsized_tuple_coercion)] use std::collections::HashSet; diff --git a/src/test/run-pass/unsized.rs b/src/test/run-pass/unsized.rs index 26f7b767988d2..f92c74804816b 100644 --- a/src/test/run-pass/unsized.rs +++ b/src/test/run-pass/unsized.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test syntax checks for `?Sized` syntax. use std::marker::PhantomData; diff --git a/src/test/run-pass/unsized2.rs b/src/test/run-pass/unsized2.rs index 90b99f98533de..a718ab7ee004c 100644 --- a/src/test/run-pass/unsized2.rs +++ b/src/test/run-pass/unsized2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] // Test sized-ness checking in substitution. diff --git a/src/test/run-pass/unsized3.rs b/src/test/run-pass/unsized3.rs index 6d378cb294e32..eaa65cf37fab8 100644 --- a/src/test/run-pass/unsized3.rs +++ b/src/test/run-pass/unsized3.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test structs with always-unsized fields. diff --git a/src/test/run-pass/unused-move-capture.rs b/src/test/run-pass/unused-move-capture.rs index e5a77d1cdbd9d..baba19c08cd55 100644 --- a/src/test/run-pass/unused-move-capture.rs +++ b/src/test/run-pass/unused-move-capture.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/unused-move.rs b/src/test/run-pass/unused-move.rs index 9a0ea181d996d..74632dbc797fa 100644 --- a/src/test/run-pass/unused-move.rs +++ b/src/test/run-pass/unused-move.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #3878 // Issue Name: Unused move causes a crash // Abstract: zero-fill to block after drop diff --git a/src/test/run-pass/unwind-resource.rs b/src/test/run-pass/unwind-resource.rs index 85ee21e090255..b83108acf5383 100644 --- a/src/test/run-pass/unwind-resource.rs +++ b/src/test/run-pass/unwind-resource.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support use std::sync::mpsc::{channel, Sender}; diff --git a/src/test/run-pass/unwind-unique.rs b/src/test/run-pass/unwind-unique.rs index 321e819881703..07613a6dd64d5 100644 --- a/src/test/run-pass/unwind-unique.rs +++ b/src/test/run-pass/unwind-unique.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support #![feature(box_syntax)] diff --git a/src/test/run-pass/use-crate-name-alias.rs b/src/test/run-pass/use-crate-name-alias.rs index 98594183a00d0..520e72676b097 100644 --- a/src/test/run-pass/use-crate-name-alias.rs +++ b/src/test/run-pass/use-crate-name-alias.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #1706 // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/use-import-export.rs b/src/test/run-pass/use-import-export.rs index 044472606a530..bb6a8ee55bfc8 100644 --- a/src/test/run-pass/use-import-export.rs +++ b/src/test/run-pass/use-import-export.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - // pretty-expanded FIXME #23616 mod foo { diff --git a/src/test/run-pass/use-keyword-2.rs b/src/test/run-pass/use-keyword-2.rs index 60016f5959469..ff52e6808cda9 100644 --- a/src/test/run-pass/use-keyword-2.rs +++ b/src/test/run-pass/use-keyword-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct A; mod test { diff --git a/src/test/run-pass/use-macro-self.rs b/src/test/run-pass/use-macro-self.rs index 66ab00da7f4a7..10d60cbf1f642 100644 --- a/src/test/run-pass/use-macro-self.rs +++ b/src/test/run-pass/use-macro-self.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:use-macro-self.rs #[macro_use] diff --git a/src/test/run-pass/use-mod.rs b/src/test/run-pass/use-mod.rs index 49ad171eaa2b6..983f31c931e20 100644 --- a/src/test/run-pass/use-mod.rs +++ b/src/test/run-pass/use-mod.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub use foo::bar::{self, First}; diff --git a/src/test/run-pass/use-nested-groups.rs b/src/test/run-pass/use-nested-groups.rs index be06e463e3b37..092b4a34e5532 100644 --- a/src/test/run-pass/use-nested-groups.rs +++ b/src/test/run-pass/use-nested-groups.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod a { pub enum B {} diff --git a/src/test/run-pass/use-trait-before-def.rs b/src/test/run-pass/use-trait-before-def.rs index 38952334e4d58..d9e4a806414b7 100644 --- a/src/test/run-pass/use-trait-before-def.rs +++ b/src/test/run-pass/use-trait-before-def.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #1761 // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/use-uninit-match.rs b/src/test/run-pass/use-uninit-match.rs index 9e606384f3fa1..53659db57e250 100644 --- a/src/test/run-pass/use-uninit-match.rs +++ b/src/test/run-pass/use-uninit-match.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - fn foo(o: myoption) -> isize { let mut x: isize = 5; match o { diff --git a/src/test/run-pass/use-uninit-match2.rs b/src/test/run-pass/use-uninit-match2.rs index dc0a6a26bc025..07ac43d99d592 100644 --- a/src/test/run-pass/use-uninit-match2.rs +++ b/src/test/run-pass/use-uninit-match2.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - fn foo(o: myoption) -> isize { let mut x: isize; match o { diff --git a/src/test/run-pass/use.rs b/src/test/run-pass/use.rs index 09a3849b9153b..0b44f3aafb6f8 100644 --- a/src/test/run-pass/use.rs +++ b/src/test/run-pass/use.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![allow(unused_imports)] diff --git a/src/test/run-pass/use_inline_dtor.rs b/src/test/run-pass/use_inline_dtor.rs index 0f55a357a00f4..0873d185575b1 100644 --- a/src/test/run-pass/use_inline_dtor.rs +++ b/src/test/run-pass/use_inline_dtor.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:inline_dtor.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/using-target-feature-unstable.rs b/src/test/run-pass/using-target-feature-unstable.rs index 614c8d4e1d477..05b1d93a697bc 100644 --- a/src/test/run-pass/using-target-feature-unstable.rs +++ b/src/test/run-pass/using-target-feature-unstable.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // only-x86_64 // aux-build:using-target-feature-unstable.rs diff --git a/src/test/run-pass/utf8-bom.rs b/src/test/run-pass/utf8-bom.rs index c3052a928d6d6..90874c9b2e384 100644 --- a/src/test/run-pass/utf8-bom.rs +++ b/src/test/run-pass/utf8-bom.rs @@ -1,12 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // This file has utf-8 BOM, it should be compiled normally without error. diff --git a/src/test/run-pass/utf8.rs b/src/test/run-pass/utf8.rs index ec1c6970ea0c9..b908afbd5b643 100644 --- a/src/test/run-pass/utf8.rs +++ b/src/test/run-pass/utf8.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { let yen: char = '¥'; // 0xa5 let c_cedilla: char = 'ç'; // 0xe7 diff --git a/src/test/run-pass/utf8_chars.rs b/src/test/run-pass/utf8_chars.rs index b2550e77a8a37..c29d8557b7063 100644 --- a/src/test/run-pass/utf8_chars.rs +++ b/src/test/run-pass/utf8_chars.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::str; pub fn main() { diff --git a/src/test/run-pass/utf8_idents.rs b/src/test/run-pass/utf8_idents.rs index 579070a295adf..8d7bd80e7fba0 100644 --- a/src/test/run-pass/utf8_idents.rs +++ b/src/test/run-pass/utf8_idents.rs @@ -1,12 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // #![feature(non_ascii_idents)] diff --git a/src/test/run-pass/variadic-ffi.rs b/src/test/run-pass/variadic-ffi.rs index 2198ead106bb7..3539c8d6b72ad 100644 --- a/src/test/run-pass/variadic-ffi.rs +++ b/src/test/run-pass/variadic-ffi.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare no libc to test ffi with #[link(name = "rust_test_helpers", kind = "static")] diff --git a/src/test/run-pass/variance-intersection-of-ref-and-opt-ref.rs b/src/test/run-pass/variance-intersection-of-ref-and-opt-ref.rs index 948d68e0ccd7d..fde151400be47 100644 --- a/src/test/run-pass/variance-intersection-of-ref-and-opt-ref.rs +++ b/src/test/run-pass/variance-intersection-of-ref-and-opt-ref.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Elaborated version of the opening example from RFC 738. This failed // to compile before variance because invariance of `Option` prevented // us from approximating the lifetimes of `field1` and `field2` to a diff --git a/src/test/run-pass/variance-iterators-in-libcore.rs b/src/test/run-pass/variance-iterators-in-libcore.rs index b9677d5ba8598..32b56bd0b5ad5 100644 --- a/src/test/run-pass/variance-iterators-in-libcore.rs +++ b/src/test/run-pass/variance-iterators-in-libcore.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(warnings)] use std::iter::Zip; diff --git a/src/test/run-pass/variance-vec-covariant.rs b/src/test/run-pass/variance-vec-covariant.rs index caec6df5a4d81..4548eb633b5ab 100644 --- a/src/test/run-pass/variance-vec-covariant.rs +++ b/src/test/run-pass/variance-vec-covariant.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that vec is now covariant in its argument type. #![allow(dead_code)] diff --git a/src/test/run-pass/variant-attributes.rs b/src/test/run-pass/variant-attributes.rs index 18987d1e016b1..2669681e910f7 100644 --- a/src/test/run-pass/variant-attributes.rs +++ b/src/test/run-pass/variant-attributes.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pp-exact - Make sure we actually print the attributes // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/variant-structs-trivial.rs b/src/test/run-pass/variant-structs-trivial.rs index 6961cd4977d96..a0e2fbc775522 100644 --- a/src/test/run-pass/variant-structs-trivial.rs +++ b/src/test/run-pass/variant-structs-trivial.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 enum Foo { diff --git a/src/test/run-pass/vec-concat.rs b/src/test/run-pass/vec-concat.rs index 8ba8df57e542c..f11be33034630 100644 --- a/src/test/run-pass/vec-concat.rs +++ b/src/test/run-pass/vec-concat.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::vec; pub fn main() { diff --git a/src/test/run-pass/vec-dst.rs b/src/test/run-pass/vec-dst.rs index cf4222b405e80..2b9051697a20e 100644 --- a/src/test/run-pass/vec-dst.rs +++ b/src/test/run-pass/vec-dst.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/vec-fixed-length.rs b/src/test/run-pass/vec-fixed-length.rs index befb27e6ccb00..8e9390daa0389 100644 --- a/src/test/run-pass/vec-fixed-length.rs +++ b/src/test/run-pass/vec-fixed-length.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::mem::size_of; #[cfg(not(target_pointer_width = "64"))] diff --git a/src/test/run-pass/vec-growth.rs b/src/test/run-pass/vec-growth.rs index 5bf6a457df9b3..6afd2757de401 100644 --- a/src/test/run-pass/vec-growth.rs +++ b/src/test/run-pass/vec-growth.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - pub fn main() { let mut v = vec![1]; v.push(2); diff --git a/src/test/run-pass/vec-late-init.rs b/src/test/run-pass/vec-late-init.rs index 420f6a429f1f8..6715248d4dd66 100644 --- a/src/test/run-pass/vec-late-init.rs +++ b/src/test/run-pass/vec-late-init.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { let mut later: Vec ; if true { later = vec![1]; } else { later = vec![2]; } diff --git a/src/test/run-pass/vec-macro-no-std.rs b/src/test/run-pass/vec-macro-no-std.rs index 56ff9cb24774b..0b724bd012227 100644 --- a/src/test/run-pass/vec-macro-no-std.rs +++ b/src/test/run-pass/vec-macro-no-std.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no no_std executables #![feature(lang_items, start, libc, alloc)] diff --git a/src/test/run-pass/vec-macro-repeat.rs b/src/test/run-pass/vec-macro-repeat.rs index d178041b85e1e..e2ec0e13c0f67 100644 --- a/src/test/run-pass/vec-macro-repeat.rs +++ b/src/test/run-pass/vec-macro-repeat.rs @@ -1,15 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - pub fn main() { assert_eq!(vec![1; 3], vec![1, 1, 1]); assert_eq!(vec![1; 2], vec![1, 1]); diff --git a/src/test/run-pass/vec-macro-rvalue-scope.rs b/src/test/run-pass/vec-macro-rvalue-scope.rs index 305755347d04b..38e3ea1ffaa7e 100644 --- a/src/test/run-pass/vec-macro-rvalue-scope.rs +++ b/src/test/run-pass/vec-macro-rvalue-scope.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn one() -> i32 { 1 } // Make sure the vec![...] macro doesn't introduce hidden rvalue diff --git a/src/test/run-pass/vec-macro-with-brackets.rs b/src/test/run-pass/vec-macro-with-brackets.rs index cccf807572a42..84e410746c2fc 100644 --- a/src/test/run-pass/vec-macro-with-brackets.rs +++ b/src/test/run-pass/vec-macro-with-brackets.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 macro_rules! vec [ diff --git a/src/test/run-pass/vec-macro-with-trailing-comma.rs b/src/test/run-pass/vec-macro-with-trailing-comma.rs index 135ecb4749845..c7583ba4327bf 100644 --- a/src/test/run-pass/vec-macro-with-trailing-comma.rs +++ b/src/test/run-pass/vec-macro-with-trailing-comma.rs @@ -1,15 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - pub fn main() { assert_eq!(vec![1], vec![1,]); assert_eq!(vec![1, 2, 3], vec![1, 2, 3,]); diff --git a/src/test/run-pass/vec-matching-autoslice.rs b/src/test/run-pass/vec-matching-autoslice.rs index 7268536a51fad..6475eab44201a 100644 --- a/src/test/run-pass/vec-matching-autoslice.rs +++ b/src/test/run-pass/vec-matching-autoslice.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { let x = [1, 2, 3]; match x { diff --git a/src/test/run-pass/vec-matching-fixed.rs b/src/test/run-pass/vec-matching-fixed.rs index 060d152488a97..1048738c12ec8 100644 --- a/src/test/run-pass/vec-matching-fixed.rs +++ b/src/test/run-pass/vec-matching-fixed.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(slice_patterns)] fn a() { diff --git a/src/test/run-pass/vec-matching-fold.rs b/src/test/run-pass/vec-matching-fold.rs index 1a30f875580c2..3743fd07d52d8 100644 --- a/src/test/run-pass/vec-matching-fold.rs +++ b/src/test/run-pass/vec-matching-fold.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(slice_patterns)] use std::fmt::Debug; diff --git a/src/test/run-pass/vec-matching-legal-tail-element-borrow.rs b/src/test/run-pass/vec-matching-legal-tail-element-borrow.rs index eecc3e7afdbb4..fb5ffe685a831 100644 --- a/src/test/run-pass/vec-matching-legal-tail-element-borrow.rs +++ b/src/test/run-pass/vec-matching-legal-tail-element-borrow.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(slice_patterns)] pub fn main() { diff --git a/src/test/run-pass/vec-matching.rs b/src/test/run-pass/vec-matching.rs index ace418f216068..48fa50605aeba 100644 --- a/src/test/run-pass/vec-matching.rs +++ b/src/test/run-pass/vec-matching.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(slice_patterns)] fn a() { diff --git a/src/test/run-pass/vec-push.rs b/src/test/run-pass/vec-push.rs index 14a52cc4b5c55..7ee2220d0edc2 100644 --- a/src/test/run-pass/vec-push.rs +++ b/src/test/run-pass/vec-push.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { let mut v = vec![1, 2, 3]; v.push(1); } diff --git a/src/test/run-pass/vec-repeat-with-cast.rs b/src/test/run-pass/vec-repeat-with-cast.rs index a6ca02d4fa90d..4b945ac1fbe34 100644 --- a/src/test/run-pass/vec-repeat-with-cast.rs +++ b/src/test/run-pass/vec-repeat-with-cast.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 pub fn main() { let _a = [0; 1 as usize]; } diff --git a/src/test/run-pass/vec-slice-drop.rs b/src/test/run-pass/vec-slice-drop.rs index 86d34d38f744f..4a9abf1cec09b 100644 --- a/src/test/run-pass/vec-slice-drop.rs +++ b/src/test/run-pass/vec-slice-drop.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cell::Cell; // Make sure that destructors get run on slice literals diff --git a/src/test/run-pass/vec-slice.rs b/src/test/run-pass/vec-slice.rs index a7e6cae93b34b..8cde2f6d47034 100644 --- a/src/test/run-pass/vec-slice.rs +++ b/src/test/run-pass/vec-slice.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { let v = vec![1,2,3,4,5]; let v2 = &v[1..3]; diff --git a/src/test/run-pass/vec-tail-matching.rs b/src/test/run-pass/vec-tail-matching.rs index 4f31405ead500..e9f16bd157356 100644 --- a/src/test/run-pass/vec-tail-matching.rs +++ b/src/test/run-pass/vec-tail-matching.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(slice_patterns)] struct Foo { diff --git a/src/test/run-pass/vec-to_str.rs b/src/test/run-pass/vec-to_str.rs index 1fed6a0be486c..614cf7d444b74 100644 --- a/src/test/run-pass/vec-to_str.rs +++ b/src/test/run-pass/vec-to_str.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { assert_eq!(format!("{:?}", vec![0, 1]), "[0, 1]".to_string()); diff --git a/src/test/run-pass/vec.rs b/src/test/run-pass/vec.rs index 9cacb9db20ea9..b32deb601deb5 100644 --- a/src/test/run-pass/vec.rs +++ b/src/test/run-pass/vec.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - pub fn main() { let v: Vec = vec![10, 20]; assert_eq!(v[0], 10); diff --git a/src/test/run-pass/vec_cycle.rs b/src/test/run-pass/vec_cycle.rs index d5da8b35b6db4..cec90648ab458 100644 --- a/src/test/run-pass/vec_cycle.rs +++ b/src/test/run-pass/vec_cycle.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cell::Cell; #[derive(Debug)] diff --git a/src/test/run-pass/vec_cycle_wrapped.rs b/src/test/run-pass/vec_cycle_wrapped.rs index 56480268a01b2..5a2e0ba7b1544 100644 --- a/src/test/run-pass/vec_cycle_wrapped.rs +++ b/src/test/run-pass/vec_cycle_wrapped.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cell::Cell; #[derive(Debug)] diff --git a/src/test/run-pass/vector-no-ann-2.rs b/src/test/run-pass/vector-no-ann-2.rs index 09e70cf03cada..727b1844d76c7 100644 --- a/src/test/run-pass/vector-no-ann-2.rs +++ b/src/test/run-pass/vector-no-ann-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/volatile-fat-ptr.rs b/src/test/run-pass/volatile-fat-ptr.rs index 03ba5587fcec8..03942c893f590 100644 --- a/src/test/run-pass/volatile-fat-ptr.rs +++ b/src/test/run-pass/volatile-fat-ptr.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(volatile)] use std::ptr::{read_volatile, write_volatile}; diff --git a/src/test/run-pass/wait-forked-but-failed-child.rs b/src/test/run-pass/wait-forked-but-failed-child.rs index dc47108e183df..a4d029741cafd 100644 --- a/src/test/run-pass/wait-forked-but-failed-child.rs +++ b/src/test/run-pass/wait-forked-but-failed-child.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/warn-ctypes-inhibit.rs b/src/test/run-pass/warn-ctypes-inhibit.rs index 81a3c94eec313..9d59654c434af 100644 --- a/src/test/run-pass/warn-ctypes-inhibit.rs +++ b/src/test/run-pass/warn-ctypes-inhibit.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-D improper-ctypes // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/weak-lang-item.rs b/src/test/run-pass/weak-lang-item.rs index d9f4ec2892035..9a36606a46509 100644 --- a/src/test/run-pass/weak-lang-item.rs +++ b/src/test/run-pass/weak-lang-item.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:weak-lang-items.rs // ignore-emscripten no threads support diff --git a/src/test/run-pass/weak-new-uninhabited-issue-48493.rs b/src/test/run-pass/weak-new-uninhabited-issue-48493.rs index eb57c12ed12c6..4f93800b864b7 100644 --- a/src/test/run-pass/weak-new-uninhabited-issue-48493.rs +++ b/src/test/run-pass/weak-new-uninhabited-issue-48493.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { enum Void {} std::rc::Weak::::new(); diff --git a/src/test/run-pass/weird-exit-code.rs b/src/test/run-pass/weird-exit-code.rs index cdd6a9b5331de..9456cbbe6f7bb 100644 --- a/src/test/run-pass/weird-exit-code.rs +++ b/src/test/run-pass/weird-exit-code.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // On Windows the GetExitCodeProcess API is used to get the exit code of a // process, but it's easy to mistake a process exiting with the code 259 as // "still running" because this is the value of the STILL_ACTIVE constant. Make diff --git a/src/test/run-pass/weird-exprs.rs b/src/test/run-pass/weird-exprs.rs index 35120e428a7bd..838838d08bc4f 100644 --- a/src/test/run-pass/weird-exprs.rs +++ b/src/test/run-pass/weird-exprs.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z borrowck=compare #![recursion_limit = "128"] diff --git a/src/test/run-pass/wf-bound-region-in-object-type.rs b/src/test/run-pass/wf-bound-region-in-object-type.rs index cdb5e3fe1d4ae..e3efcc64d221e 100644 --- a/src/test/run-pass/wf-bound-region-in-object-type.rs +++ b/src/test/run-pass/wf-bound-region-in-object-type.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the `wf` checker properly handles bound regions in object // types. Compiling this code used to trigger an ICE. diff --git a/src/test/run-pass/where-clause-bounds-inconsistency.rs b/src/test/run-pass/where-clause-bounds-inconsistency.rs index fa07861d79932..81a38f83eed45 100644 --- a/src/test/run-pass/where-clause-bounds-inconsistency.rs +++ b/src/test/run-pass/where-clause-bounds-inconsistency.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait Bound { diff --git a/src/test/run-pass/where-clause-early-bound-lifetimes.rs b/src/test/run-pass/where-clause-early-bound-lifetimes.rs index b9f605ec548bc..02cb1701569d1 100644 --- a/src/test/run-pass/where-clause-early-bound-lifetimes.rs +++ b/src/test/run-pass/where-clause-early-bound-lifetimes.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait TheTrait { fn dummy(&self) { } } diff --git a/src/test/run-pass/where-clause-method-substituion.rs b/src/test/run-pass/where-clause-method-substituion.rs index d7aaa0b2f9ca3..fa2414efa5f9d 100644 --- a/src/test/run-pass/where-clause-method-substituion.rs +++ b/src/test/run-pass/where-clause-method-substituion.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 trait Foo { fn dummy(&self, arg: T) { } } diff --git a/src/test/run-pass/where-clause-region-outlives.rs b/src/test/run-pass/where-clause-region-outlives.rs index 60df52bfeb922..a81816c05470a 100644 --- a/src/test/run-pass/where-clause-region-outlives.rs +++ b/src/test/run-pass/where-clause-region-outlives.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct A<'a, 'b> where 'a : 'b { x: &'a isize, y: &'b isize } diff --git a/src/test/run-pass/where-clauses-cross-crate.rs b/src/test/run-pass/where-clauses-cross-crate.rs index 1b349b25ef3c5..90cf0a510d299 100644 --- a/src/test/run-pass/where-clauses-cross-crate.rs +++ b/src/test/run-pass/where-clauses-cross-crate.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:where_clauses_xc.rs extern crate where_clauses_xc; diff --git a/src/test/run-pass/where-clauses-lifetimes.rs b/src/test/run-pass/where-clauses-lifetimes.rs index bba20e8e92e66..4d8ca6a77eb46 100644 --- a/src/test/run-pass/where-clauses-lifetimes.rs +++ b/src/test/run-pass/where-clauses-lifetimes.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 fn foo<'a, I>(mut it: I) where I: Iterator {} diff --git a/src/test/run-pass/where-clauses-method.rs b/src/test/run-pass/where-clauses-method.rs index 29efe727276e4..7f18be698a082 100644 --- a/src/test/run-pass/where-clauses-method.rs +++ b/src/test/run-pass/where-clauses-method.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that a where clause attached to a method allows us to add // additional constraints to a parameter out of scope. diff --git a/src/test/run-pass/where-clauses-unboxed-closures.rs b/src/test/run-pass/where-clauses-unboxed-closures.rs index 8a775caaac6d2..68470cb813e14 100644 --- a/src/test/run-pass/where-clauses-unboxed-closures.rs +++ b/src/test/run-pass/where-clauses-unboxed-closures.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // pretty-expanded FIXME #23616 struct Bencher; diff --git a/src/test/run-pass/where-clauses.rs b/src/test/run-pass/where-clauses.rs index ab1f30c3d1428..872e6abe61578 100644 --- a/src/test/run-pass/where-clauses.rs +++ b/src/test/run-pass/where-clauses.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Equal { fn equal(&self, other: &Self) -> bool; fn equals(&self, this: &T, that: &T, x: &U, y: &U) -> bool diff --git a/src/test/run-pass/where-for-self.rs b/src/test/run-pass/where-for-self.rs index ee19e76c14628..45062115c5024 100644 --- a/src/test/run-pass/where-for-self.rs +++ b/src/test/run-pass/where-for-self.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we can quantify lifetimes outside a constraint (i.e., including // the self type) in a where clause. diff --git a/src/test/run-pass/while-cont.rs b/src/test/run-pass/while-cont.rs index 3e1a232115f7d..655993ca3449c 100644 --- a/src/test/run-pass/while-cont.rs +++ b/src/test/run-pass/while-cont.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #825: Should recheck the loop condition after continuing pub fn main() { let mut i = 1; diff --git a/src/test/run-pass/while-flow-graph.rs b/src/test/run-pass/while-flow-graph.rs index 102a5a7558e0c..9e0dd4be7c01a 100644 --- a/src/test/run-pass/while-flow-graph.rs +++ b/src/test/run-pass/while-flow-graph.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - // pretty-expanded FIXME #23616 pub fn main() { let x: isize = 10; while x == 10 && x == 11 { let _y = 0xf00_usize; } } diff --git a/src/test/run-pass/while-label.rs b/src/test/run-pass/while-label.rs index 8cbb845836f3e..7e75086154a0e 100644 --- a/src/test/run-pass/while-label.rs +++ b/src/test/run-pass/while-label.rs @@ -1,15 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - pub fn main() { let mut i = 100; 'w: while 1 + 1 == 2 { diff --git a/src/test/run-pass/while-let.rs b/src/test/run-pass/while-let.rs index aed6986c5fe5d..69ff9e4f4a620 100644 --- a/src/test/run-pass/while-let.rs +++ b/src/test/run-pass/while-let.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::collections::BinaryHeap; fn make_pq() -> BinaryHeap { diff --git a/src/test/run-pass/while-loop-constraints-2.rs b/src/test/run-pass/while-loop-constraints-2.rs index 6e9e7bc24d6a0..d20b9272d2051 100644 --- a/src/test/run-pass/while-loop-constraints-2.rs +++ b/src/test/run-pass/while-loop-constraints-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_assignment)] #![allow(unused_variables)] diff --git a/src/test/run-pass/while-prelude-drop.rs b/src/test/run-pass/while-prelude-drop.rs index 39ed4f53cf7e4..c31fc8d801972 100644 --- a/src/test/run-pass/while-prelude-drop.rs +++ b/src/test/run-pass/while-prelude-drop.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::string::String; #[derive(PartialEq)] diff --git a/src/test/run-pass/while-with-break.rs b/src/test/run-pass/while-with-break.rs index 4c599e9c42898..5bcc48940a908 100644 --- a/src/test/run-pass/while-with-break.rs +++ b/src/test/run-pass/while-with-break.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub fn main() { let mut i: isize = 90; while i < 100 { diff --git a/src/test/run-pass/while.rs b/src/test/run-pass/while.rs index bf56e76687fa5..ff189c3088745 100644 --- a/src/test/run-pass/while.rs +++ b/src/test/run-pass/while.rs @@ -1,15 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - pub fn main() { let mut x: isize = 10; let mut y: isize = 0; diff --git a/src/test/run-pass/wrapping-int-api.rs b/src/test/run-pass/wrapping-int-api.rs index 5470ad93e1426..fc62caf3b8d7d 100644 --- a/src/test/run-pass/wrapping-int-api.rs +++ b/src/test/run-pass/wrapping-int-api.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test inherent wrapping_* methods for {i,u}{size,8,16,32,64}. use std::{i8, i16, i32, i64, isize}; diff --git a/src/test/run-pass/write-fmt-errors.rs b/src/test/run-pass/write-fmt-errors.rs index e4439087946c1..f95bbfd569a18 100644 --- a/src/test/run-pass/write-fmt-errors.rs +++ b/src/test/run-pass/write-fmt-errors.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt; use std::io::{self, Error, Write, sink}; diff --git a/src/test/run-pass/writealias.rs b/src/test/run-pass/writealias.rs index 7339fe47dc297..37405171a901f 100644 --- a/src/test/run-pass/writealias.rs +++ b/src/test/run-pass/writealias.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::sync::Mutex; struct Point {x: isize, y: isize, z: isize} diff --git a/src/test/run-pass/wrong-hashset-issue-42918.rs b/src/test/run-pass/wrong-hashset-issue-42918.rs index 5a23adeceb5c0..7b90306967e1d 100644 --- a/src/test/run-pass/wrong-hashset-issue-42918.rs +++ b/src/test/run-pass/wrong-hashset-issue-42918.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // compile-flags: -O diff --git a/src/test/run-pass/x86stdcall.rs b/src/test/run-pass/x86stdcall.rs index 69ac68d2583e3..11a45a58895d9 100644 --- a/src/test/run-pass/x86stdcall.rs +++ b/src/test/run-pass/x86stdcall.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare no libc to test ffi with // GetLastError doesn't seem to work with stack switching diff --git a/src/test/run-pass/x86stdcall2.rs b/src/test/run-pass/x86stdcall2.rs index bbdd65f7e5b2d..f79d42ea97a34 100644 --- a/src/test/run-pass/x86stdcall2.rs +++ b/src/test/run-pass/x86stdcall2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub type HANDLE = usize; pub type DWORD = u32; pub type SIZE_T = u32; diff --git a/src/test/run-pass/xcrate-address-insignificant.rs b/src/test/run-pass/xcrate-address-insignificant.rs index 8794ecd061b47..fbf751513f8a1 100644 --- a/src/test/run-pass/xcrate-address-insignificant.rs +++ b/src/test/run-pass/xcrate-address-insignificant.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:xcrate_address_insignificant.rs diff --git a/src/test/run-pass/xcrate-associated-type-defaults.rs b/src/test/run-pass/xcrate-associated-type-defaults.rs index 2dacbe0966ee3..d4b239b3a8e48 100644 --- a/src/test/run-pass/xcrate-associated-type-defaults.rs +++ b/src/test/run-pass/xcrate-associated-type-defaults.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:xcrate_associated_type_defaults.rs extern crate xcrate_associated_type_defaults; diff --git a/src/test/run-pass/xcrate-static-addresses.rs b/src/test/run-pass/xcrate-static-addresses.rs index 43bae9c7ce072..a0fe832ad48d9 100644 --- a/src/test/run-pass/xcrate-static-addresses.rs +++ b/src/test/run-pass/xcrate-static-addresses.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:xcrate_static_addresses.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/xcrate-trait-lifetime-param.rs b/src/test/run-pass/xcrate-trait-lifetime-param.rs index 62d62839ba31b..fc65f3d54404d 100644 --- a/src/test/run-pass/xcrate-trait-lifetime-param.rs +++ b/src/test/run-pass/xcrate-trait-lifetime-param.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:xcrate-trait-lifetime-param.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/xcrate-unit-struct.rs b/src/test/run-pass/xcrate-unit-struct.rs index 78e92053a1120..c4b9a77a32a20 100644 --- a/src/test/run-pass/xcrate-unit-struct.rs +++ b/src/test/run-pass/xcrate-unit-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:xcrate_unit_struct.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/xcrate_generic_fn_nested_return.rs b/src/test/run-pass/xcrate_generic_fn_nested_return.rs index 181c91686823d..d5481b17f57c1 100644 --- a/src/test/run-pass/xcrate_generic_fn_nested_return.rs +++ b/src/test/run-pass/xcrate_generic_fn_nested_return.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:xcrate_generic_fn_nested_return.rs extern crate xcrate_generic_fn_nested_return as test; diff --git a/src/test/run-pass/yield.rs b/src/test/run-pass/yield.rs index db884638622d1..fbcf255b8fd40 100644 --- a/src/test/run-pass/yield.rs +++ b/src/test/run-pass/yield.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/yield1.rs b/src/test/run-pass/yield1.rs index cab68794e1cc4..6d4c2006a025c 100644 --- a/src/test/run-pass/yield1.rs +++ b/src/test/run-pass/yield1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/yield2.rs b/src/test/run-pass/yield2.rs index acc55833133a3..c4ccd2d147558 100644 --- a/src/test/run-pass/yield2.rs +++ b/src/test/run-pass/yield2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::thread; pub fn main() { diff --git a/src/test/run-pass/z-crate-attr.rs b/src/test/run-pass/z-crate-attr.rs index 3df0985a2a38b..f084394130915 100644 --- a/src/test/run-pass/z-crate-attr.rs +++ b/src/test/run-pass/z-crate-attr.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test checks if an unstable feature is enabled with the -Zcrate-attr=feature(foo) flag. If // the exact feature used here is causing problems feel free to replace it with another // perma-unstable feature. diff --git a/src/test/run-pass/zero-size-type-destructors.rs b/src/test/run-pass/zero-size-type-destructors.rs index 18b6c372a5ec2..61c3289e2425a 100644 --- a/src/test/run-pass/zero-size-type-destructors.rs +++ b/src/test/run-pass/zero-size-type-destructors.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - static mut destructions : isize = 3; pub fn foo() { diff --git a/src/test/run-pass/zero-sized-binary-heap-push.rs b/src/test/run-pass/zero-sized-binary-heap-push.rs index 0866a767934d6..d64f87d3806ae 100644 --- a/src/test/run-pass/zero-sized-binary-heap-push.rs +++ b/src/test/run-pass/zero-sized-binary-heap-push.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::BinaryHeap; use std::iter::Iterator; diff --git a/src/test/run-pass/zero-sized-btreemap-insert.rs b/src/test/run-pass/zero-sized-btreemap-insert.rs index aff124c30ec61..519f9da9feb0d 100644 --- a/src/test/run-pass/zero-sized-btreemap-insert.rs +++ b/src/test/run-pass/zero-sized-btreemap-insert.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cmp::{Ord, Ordering, PartialOrd}; use std::collections::BTreeMap; use std::iter::Iterator; diff --git a/src/test/run-pass/zero-sized-linkedlist-push.rs b/src/test/run-pass/zero-sized-linkedlist-push.rs index 9c424854d482c..3a7668b2f1a44 100644 --- a/src/test/run-pass/zero-sized-linkedlist-push.rs +++ b/src/test/run-pass/zero-sized-linkedlist-push.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::LinkedList; use std::iter::Iterator; diff --git a/src/test/run-pass/zero-sized-tuple-struct.rs b/src/test/run-pass/zero-sized-tuple-struct.rs index 9625d6a88ac3c..3bb03d2d2c8cc 100644 --- a/src/test/run-pass/zero-sized-tuple-struct.rs +++ b/src/test/run-pass/zero-sized-tuple-struct.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_assignments)] // Make sure that the constructor args are codegened for zero-sized tuple structs diff --git a/src/test/run-pass/zero-sized-vec-deque-push.rs b/src/test/run-pass/zero-sized-vec-deque-push.rs index d7c7cd28ee441..19bf82beb19fd 100644 --- a/src/test/run-pass/zero-sized-vec-deque-push.rs +++ b/src/test/run-pass/zero-sized-vec-deque-push.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::VecDeque; use std::iter::Iterator; diff --git a/src/test/run-pass/zero-sized-vec-push.rs b/src/test/run-pass/zero-sized-vec-push.rs index e472e9380a369..8568638775d46 100644 --- a/src/test/run-pass/zero-sized-vec-push.rs +++ b/src/test/run-pass/zero-sized-vec-push.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::iter::Iterator; use std::vec::Vec; diff --git a/src/test/run-pass/zero_sized_subslice_match.rs b/src/test/run-pass/zero_sized_subslice_match.rs index d399ef72976f1..30d79c5e5dbfc 100644 --- a/src/test/run-pass/zero_sized_subslice_match.rs +++ b/src/test/run-pass/zero_sized_subslice_match.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(slice_patterns)] fn main() { diff --git a/src/test/rustdoc-ui/deny-intra-link-resolution-failure.rs b/src/test/rustdoc-ui/deny-intra-link-resolution-failure.rs index 85d19c8354788..9e64e6eb3999b 100644 --- a/src/test/rustdoc-ui/deny-intra-link-resolution-failure.rs +++ b/src/test/rustdoc-ui/deny-intra-link-resolution-failure.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(intra_doc_link_resolution_failure)] /// [v2] //~ ERROR diff --git a/src/test/rustdoc-ui/deprecated-attrs.rs b/src/test/rustdoc-ui/deprecated-attrs.rs index dd2e05aeeb4dd..6f6d5b8b654da 100644 --- a/src/test/rustdoc-ui/deprecated-attrs.rs +++ b/src/test/rustdoc-ui/deprecated-attrs.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![doc(no_default_passes, passes = "collapse-docs unindent-comments")] diff --git a/src/test/rustdoc-ui/failed-doctest-output.rs b/src/test/rustdoc-ui/failed-doctest-output.rs index 62e495288cb9b..e3c68d7859279 100644 --- a/src/test/rustdoc-ui/failed-doctest-output.rs +++ b/src/test/rustdoc-ui/failed-doctest-output.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #51162: A failed doctest was not printing its stdout/stderr // FIXME: if/when the output of the test harness can be tested on its own, this test should be // adapted to use that, and that normalize line can go away diff --git a/src/test/rustdoc-ui/intra-doc-alias-ice.rs b/src/test/rustdoc-ui/intra-doc-alias-ice.rs index a459ab5dd2bea..9657d573d5016 100644 --- a/src/test/rustdoc-ui/intra-doc-alias-ice.rs +++ b/src/test/rustdoc-ui/intra-doc-alias-ice.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(intra_doc_link_resolution_failure)] pub type TypeAlias = usize; diff --git a/src/test/rustdoc-ui/intra-links-warning.rs b/src/test/rustdoc-ui/intra-links-warning.rs index d6bc275b57a6a..c7802dfcc1947 100644 --- a/src/test/rustdoc-ui/intra-links-warning.rs +++ b/src/test/rustdoc-ui/intra-links-warning.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass //! Test with [Foo::baz], [Bar::foo], ... diff --git a/src/test/rustdoc-ui/unused.rs b/src/test/rustdoc-ui/unused.rs index 8b53098639232..e82a41b7a7b81 100644 --- a/src/test/rustdoc-ui/unused.rs +++ b/src/test/rustdoc-ui/unused.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass // This test purpose is to check that unused_imports lint isn't fired diff --git a/src/test/rustdoc/all.rs b/src/test/rustdoc/all.rs index 1969cf859eee4..a95d6c4620697 100644 --- a/src/test/rustdoc/all.rs +++ b/src/test/rustdoc/all.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] // @has foo/all.html '//a[@href="struct.Struct.html"]' 'Struct' diff --git a/src/test/rustdoc/assoc-consts.rs b/src/test/rustdoc/assoc-consts.rs index 2edf61288f588..a1d0e3eb51e9a 100644 --- a/src/test/rustdoc/assoc-consts.rs +++ b/src/test/rustdoc/assoc-consts.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub trait Foo { // @has assoc_consts/trait.Foo.html '//*[@class="rust trait"]' \ // 'const FOO: usize;' diff --git a/src/test/rustdoc/assoc-item-cast.rs b/src/test/rustdoc/assoc-item-cast.rs index 24f31b5b1040b..dc62fac6a957d 100644 --- a/src/test/rustdoc/assoc-item-cast.rs +++ b/src/test/rustdoc/assoc-item-cast.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] // ignore-tidy-linelength diff --git a/src/test/rustdoc/assoc-types.rs b/src/test/rustdoc/assoc-types.rs index d152be33f4c74..c5b760b5f2b8d 100644 --- a/src/test/rustdoc/assoc-types.rs +++ b/src/test/rustdoc/assoc-types.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength #![crate_type="lib"] diff --git a/src/test/rustdoc/async-fn.rs b/src/test/rustdoc/async-fn.rs index f3d39deef1730..a0b6c29126092 100644 --- a/src/test/rustdoc/async-fn.rs +++ b/src/test/rustdoc/async-fn.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 // compile-flags:-Z unstable-options diff --git a/src/test/rustdoc/attributes.rs b/src/test/rustdoc/attributes.rs index 22e509001137e..eb0e3f065c7b3 100644 --- a/src/test/rustdoc/attributes.rs +++ b/src/test/rustdoc/attributes.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] // @has foo/fn.f.html '//*[@class="docblock attributes"]' '#[no_mangle]' diff --git a/src/test/rustdoc/auto-impl-for-trait.rs b/src/test/rustdoc/auto-impl-for-trait.rs index 3cd6e7aa4b3d2..bc658fbfc8cce 100644 --- a/src/test/rustdoc/auto-impl-for-trait.rs +++ b/src/test/rustdoc/auto-impl-for-trait.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test for https://github.com/rust-lang/rust/issues/48463 issue. use std::any::Any; diff --git a/src/test/rustdoc/auto-impl-primitive.rs b/src/test/rustdoc/auto-impl-primitive.rs index a3887b33cc2bb..83631b89f281a 100644 --- a/src/test/rustdoc/auto-impl-primitive.rs +++ b/src/test/rustdoc/auto-impl-primitive.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] pub use std::fs::File; diff --git a/src/test/rustdoc/auto-traits.rs b/src/test/rustdoc/auto-traits.rs index 1753c0ebf7353..a1fa611994f1a 100644 --- a/src/test/rustdoc/auto-traits.rs +++ b/src/test/rustdoc/auto-traits.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:auto-traits.rs #![feature(optin_builtin_traits)] diff --git a/src/test/rustdoc/auxiliary/all-item-types.rs b/src/test/rustdoc/auxiliary/all-item-types.rs index 19a0b88ce7d72..f94bd998717a0 100644 --- a/src/test/rustdoc/auxiliary/all-item-types.rs +++ b/src/test/rustdoc/auxiliary/all-item-types.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(extern_types)] pub mod foo_mod {} diff --git a/src/test/rustdoc/auxiliary/auto-traits.rs b/src/test/rustdoc/auxiliary/auto-traits.rs index 70299334b4609..f52210613888d 100644 --- a/src/test/rustdoc/auxiliary/auto-traits.rs +++ b/src/test/rustdoc/auxiliary/auto-traits.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] pub unsafe auto trait Bar {} diff --git a/src/test/rustdoc/auxiliary/empty.rs b/src/test/rustdoc/auxiliary/empty.rs index 3066947052294..e69de29bb2d1d 100644 --- a/src/test/rustdoc/auxiliary/empty.rs +++ b/src/test/rustdoc/auxiliary/empty.rs @@ -1,9 +0,0 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. diff --git a/src/test/rustdoc/auxiliary/extern-impl-trait.rs b/src/test/rustdoc/auxiliary/extern-impl-trait.rs index ba6c3e956953b..dbd543930980b 100644 --- a/src/test/rustdoc/auxiliary/extern-impl-trait.rs +++ b/src/test/rustdoc/auxiliary/extern-impl-trait.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Foo { type Associated; } diff --git a/src/test/rustdoc/auxiliary/extern-links.rs b/src/test/rustdoc/auxiliary/extern-links.rs index 94b7278e9904b..4a835673a596b 100644 --- a/src/test/rustdoc/auxiliary/extern-links.rs +++ b/src/test/rustdoc/auxiliary/extern-links.rs @@ -1,11 +1 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Foo; diff --git a/src/test/rustdoc/auxiliary/external-cross.rs b/src/test/rustdoc/auxiliary/external-cross.rs index 767fb05313adc..473d4ec99f037 100644 --- a/src/test/rustdoc/auxiliary/external-cross.rs +++ b/src/test/rustdoc/auxiliary/external-cross.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(external_doc)] #![deny(missing_doc)] diff --git a/src/test/rustdoc/auxiliary/inline-default-methods.rs b/src/test/rustdoc/auxiliary/inline-default-methods.rs index e21e6ad204384..8a636f449210f 100644 --- a/src/test/rustdoc/auxiliary/inline-default-methods.rs +++ b/src/test/rustdoc/auxiliary/inline-default-methods.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Cmetadata=aux pub trait Foo { diff --git a/src/test/rustdoc/auxiliary/intra-link-extern-crate.rs b/src/test/rustdoc/auxiliary/intra-link-extern-crate.rs index e4a194466cc3f..db3bb38ada0da 100644 --- a/src/test/rustdoc/auxiliary/intra-link-extern-crate.rs +++ b/src/test/rustdoc/auxiliary/intra-link-extern-crate.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name="inner"] //! ooh, i'm a rebel just for [kicks] diff --git a/src/test/rustdoc/auxiliary/issue-13698.rs b/src/test/rustdoc/auxiliary/issue-13698.rs index ecddfe99b3be7..a65ebfe36a497 100644 --- a/src/test/rustdoc/auxiliary/issue-13698.rs +++ b/src/test/rustdoc/auxiliary/issue-13698.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Cmetadata=aux pub trait Foo { diff --git a/src/test/rustdoc/auxiliary/issue-15318.rs b/src/test/rustdoc/auxiliary/issue-15318.rs index 145b4df629995..83cc31b587c29 100644 --- a/src/test/rustdoc/auxiliary/issue-15318.rs +++ b/src/test/rustdoc/auxiliary/issue-15318.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Cmetadata=aux #![doc(html_root_url = "http://example.com/")] diff --git a/src/test/rustdoc/auxiliary/issue-17476.rs b/src/test/rustdoc/auxiliary/issue-17476.rs index 644d1634e9d9c..80c915eb7cfae 100644 --- a/src/test/rustdoc/auxiliary/issue-17476.rs +++ b/src/test/rustdoc/auxiliary/issue-17476.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Cmetadata=aux #![doc(html_root_url = "http://example.com")] diff --git a/src/test/rustdoc/auxiliary/issue-19190-3.rs b/src/test/rustdoc/auxiliary/issue-19190-3.rs index 4462164343128..8c526a89a882e 100644 --- a/src/test/rustdoc/auxiliary/issue-19190-3.rs +++ b/src/test/rustdoc/auxiliary/issue-19190-3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Cmetadata=aux use std::ops::Deref; diff --git a/src/test/rustdoc/auxiliary/issue-20646.rs b/src/test/rustdoc/auxiliary/issue-20646.rs index 815b78a91d9af..8e16f2de0d97a 100644 --- a/src/test/rustdoc/auxiliary/issue-20646.rs +++ b/src/test/rustdoc/auxiliary/issue-20646.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Cmetadata=aux pub trait Trait { diff --git a/src/test/rustdoc/auxiliary/issue-20727.rs b/src/test/rustdoc/auxiliary/issue-20727.rs index 2ec761fad96b5..7ffc1985b058e 100644 --- a/src/test/rustdoc/auxiliary/issue-20727.rs +++ b/src/test/rustdoc/auxiliary/issue-20727.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Cmetadata=aux pub trait Deref { diff --git a/src/test/rustdoc/auxiliary/issue-21092.rs b/src/test/rustdoc/auxiliary/issue-21092.rs index e906311e3aeb4..51ab7de1c546c 100644 --- a/src/test/rustdoc/auxiliary/issue-21092.rs +++ b/src/test/rustdoc/auxiliary/issue-21092.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Cmetadata=aux pub trait Foo { diff --git a/src/test/rustdoc/auxiliary/issue-21801.rs b/src/test/rustdoc/auxiliary/issue-21801.rs index f618edec5985e..732612ff00076 100644 --- a/src/test/rustdoc/auxiliary/issue-21801.rs +++ b/src/test/rustdoc/auxiliary/issue-21801.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Cmetadata=aux pub struct Foo; diff --git a/src/test/rustdoc/auxiliary/issue-22025.rs b/src/test/rustdoc/auxiliary/issue-22025.rs index 35a37e27d912f..5346c0e92bdec 100644 --- a/src/test/rustdoc/auxiliary/issue-22025.rs +++ b/src/test/rustdoc/auxiliary/issue-22025.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Cmetadata=aux pub mod foo { diff --git a/src/test/rustdoc/auxiliary/issue-23207-1.rs b/src/test/rustdoc/auxiliary/issue-23207-1.rs index ec9f2004ebf89..8531d5f1acd3c 100644 --- a/src/test/rustdoc/auxiliary/issue-23207-1.rs +++ b/src/test/rustdoc/auxiliary/issue-23207-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod fmt { pub struct Error; } diff --git a/src/test/rustdoc/auxiliary/issue-23207-2.rs b/src/test/rustdoc/auxiliary/issue-23207-2.rs index 5e9c540ab69d5..e1afb68dc7921 100644 --- a/src/test/rustdoc/auxiliary/issue-23207-2.rs +++ b/src/test/rustdoc/auxiliary/issue-23207-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate issue_23207_1; pub mod fmt { diff --git a/src/test/rustdoc/auxiliary/issue-26606-macro.rs b/src/test/rustdoc/auxiliary/issue-26606-macro.rs index 6059a252bce6e..d60d32526aa36 100644 --- a/src/test/rustdoc/auxiliary/issue-26606-macro.rs +++ b/src/test/rustdoc/auxiliary/issue-26606-macro.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_export] macro_rules! make_item ( ($name: ident) => (pub const $name: usize = 42;) diff --git a/src/test/rustdoc/auxiliary/issue-27362.rs b/src/test/rustdoc/auxiliary/issue-27362.rs index 25de698cad10e..72a53ed3c63ba 100644 --- a/src/test/rustdoc/auxiliary/issue-27362.rs +++ b/src/test/rustdoc/auxiliary/issue-27362.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Cmetadata=aux #![feature(const_fn)] diff --git a/src/test/rustdoc/auxiliary/issue-28927-1.rs b/src/test/rustdoc/auxiliary/issue-28927-1.rs index abcfb9396f4c8..688c73428ddaa 100644 --- a/src/test/rustdoc/auxiliary/issue-28927-1.rs +++ b/src/test/rustdoc/auxiliary/issue-28927-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod detail { pub extern crate issue_28927_2 as inner2; } diff --git a/src/test/rustdoc/auxiliary/issue-28927-2.rs b/src/test/rustdoc/auxiliary/issue-28927-2.rs index c511700504960..7c0937fce20f2 100644 --- a/src/test/rustdoc/auxiliary/issue-28927-2.rs +++ b/src/test/rustdoc/auxiliary/issue-28927-2.rs @@ -1,11 +1 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Baz; diff --git a/src/test/rustdoc/auxiliary/issue-29584.rs b/src/test/rustdoc/auxiliary/issue-29584.rs index 63c79f875efb2..a9b8796c0fe31 100644 --- a/src/test/rustdoc/auxiliary/issue-29584.rs +++ b/src/test/rustdoc/auxiliary/issue-29584.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Cmetadata=aux pub struct Foo; diff --git a/src/test/rustdoc/auxiliary/issue-30109-1.rs b/src/test/rustdoc/auxiliary/issue-30109-1.rs index 59f952a0b29d1..ca05a6a9076c2 100644 --- a/src/test/rustdoc/auxiliary/issue-30109-1.rs +++ b/src/test/rustdoc/auxiliary/issue-30109-1.rs @@ -1,11 +1 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Bar; diff --git a/src/test/rustdoc/auxiliary/issue-34274.rs b/src/test/rustdoc/auxiliary/issue-34274.rs index 72026b6085604..b0c3b4f562985 100644 --- a/src/test/rustdoc/auxiliary/issue-34274.rs +++ b/src/test/rustdoc/auxiliary/issue-34274.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern { pub fn extern_c_fn(); } diff --git a/src/test/rustdoc/auxiliary/issue-36031.rs b/src/test/rustdoc/auxiliary/issue-36031.rs index 6611cc428b0e1..da688139e3462 100644 --- a/src/test/rustdoc/auxiliary/issue-36031.rs +++ b/src/test/rustdoc/auxiliary/issue-36031.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub trait Foo { const FOO: usize; } diff --git a/src/test/rustdoc/auxiliary/issue-40936.rs b/src/test/rustdoc/auxiliary/issue-40936.rs index 54cc18cca23ac..b921e52017323 100644 --- a/src/test/rustdoc/auxiliary/issue-40936.rs +++ b/src/test/rustdoc/auxiliary/issue-40936.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod outermod { pub mod innermod { pub use super::*; diff --git a/src/test/rustdoc/auxiliary/issue-46727.rs b/src/test/rustdoc/auxiliary/issue-46727.rs index f0869f016e666..30dccfa77b5a4 100644 --- a/src/test/rustdoc/auxiliary/issue-46727.rs +++ b/src/test/rustdoc/auxiliary/issue-46727.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Cmetadata=aux pub trait Foo {} diff --git a/src/test/rustdoc/auxiliary/issue-48414.rs b/src/test/rustdoc/auxiliary/issue-48414.rs index 7e0edf76f6ac9..f442ac722128c 100644 --- a/src/test/rustdoc/auxiliary/issue-48414.rs +++ b/src/test/rustdoc/auxiliary/issue-48414.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// Woah, this trait links to [OtherTrait](OtherTrait)! pub trait SomeTrait {} diff --git a/src/test/rustdoc/auxiliary/masked.rs b/src/test/rustdoc/auxiliary/masked.rs index e0d53a72220f9..f289359e52ac9 100644 --- a/src/test/rustdoc/auxiliary/masked.rs +++ b/src/test/rustdoc/auxiliary/masked.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Clone)] pub struct MaskedStruct; diff --git a/src/test/rustdoc/auxiliary/mod-stackoverflow.rs b/src/test/rustdoc/auxiliary/mod-stackoverflow.rs index f03593dbee60b..e0b90f180ee23 100644 --- a/src/test/rustdoc/auxiliary/mod-stackoverflow.rs +++ b/src/test/rustdoc/auxiliary/mod-stackoverflow.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Cmetadata=aux pub mod tree { diff --git a/src/test/rustdoc/auxiliary/pub-use-extern-macros.rs b/src/test/rustdoc/auxiliary/pub-use-extern-macros.rs index 70d174a149daa..7934e07339ab7 100644 --- a/src/test/rustdoc/auxiliary/pub-use-extern-macros.rs +++ b/src/test/rustdoc/auxiliary/pub-use-extern-macros.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![crate_name="macros"] #[macro_export] diff --git a/src/test/rustdoc/auxiliary/reexp_stripped.rs b/src/test/rustdoc/auxiliary/reexp_stripped.rs index 2b061e3997d84..ccc3dc11fd1ec 100644 --- a/src/test/rustdoc/auxiliary/reexp_stripped.rs +++ b/src/test/rustdoc/auxiliary/reexp_stripped.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub use private::Quz; pub use hidden::Bar; diff --git a/src/test/rustdoc/auxiliary/rustdoc-default-impl.rs b/src/test/rustdoc/auxiliary/rustdoc-default-impl.rs index c346c7323d3dc..36e2821c5a8b9 100644 --- a/src/test/rustdoc/auxiliary/rustdoc-default-impl.rs +++ b/src/test/rustdoc/auxiliary/rustdoc-default-impl.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] pub mod bar { diff --git a/src/test/rustdoc/auxiliary/rustdoc-extern-default-method.rs b/src/test/rustdoc/auxiliary/rustdoc-extern-default-method.rs index 861562753f991..12934238a8e92 100644 --- a/src/test/rustdoc/auxiliary/rustdoc-extern-default-method.rs +++ b/src/test/rustdoc/auxiliary/rustdoc-extern-default-method.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="lib"] pub trait Trait { diff --git a/src/test/rustdoc/auxiliary/rustdoc-extern-method.rs b/src/test/rustdoc/auxiliary/rustdoc-extern-method.rs index 96a7a8378b792..e493048d9da34 100644 --- a/src/test/rustdoc/auxiliary/rustdoc-extern-method.rs +++ b/src/test/rustdoc/auxiliary/rustdoc-extern-method.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="lib"] #![feature(unboxed_closures)] diff --git a/src/test/rustdoc/auxiliary/rustdoc-ffi.rs b/src/test/rustdoc/auxiliary/rustdoc-ffi.rs index e06dbe76dbbe7..b74d190b52662 100644 --- a/src/test/rustdoc/auxiliary/rustdoc-ffi.rs +++ b/src/test/rustdoc/auxiliary/rustdoc-ffi.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="lib"] extern "C" { diff --git a/src/test/rustdoc/auxiliary/rustdoc-impl-parts-crosscrate.rs b/src/test/rustdoc/auxiliary/rustdoc-impl-parts-crosscrate.rs index 977d98ca87b10..869aebc774ad4 100644 --- a/src/test/rustdoc/auxiliary/rustdoc-impl-parts-crosscrate.rs +++ b/src/test/rustdoc/auxiliary/rustdoc-impl-parts-crosscrate.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] pub auto trait AnOibit {} diff --git a/src/test/rustdoc/auxiliary/src-links-external.rs b/src/test/rustdoc/auxiliary/src-links-external.rs index 94b7278e9904b..4a835673a596b 100644 --- a/src/test/rustdoc/auxiliary/src-links-external.rs +++ b/src/test/rustdoc/auxiliary/src-links-external.rs @@ -1,11 +1 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Foo; diff --git a/src/test/rustdoc/auxiliary/unit-return.rs b/src/test/rustdoc/auxiliary/unit-return.rs index 1b30a6a43282f..7b9986162c630 100644 --- a/src/test/rustdoc/auxiliary/unit-return.rs +++ b/src/test/rustdoc/auxiliary/unit-return.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn f2(f: F) {} pub fn f3 () + Clone>(f: F) {} diff --git a/src/test/rustdoc/auxiliary/variant-struct.rs b/src/test/rustdoc/auxiliary/variant-struct.rs index d846c0adf6171..0f3d2e5f1b7a0 100644 --- a/src/test/rustdoc/auxiliary/variant-struct.rs +++ b/src/test/rustdoc/auxiliary/variant-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub enum Foo { Bar { qux: (), diff --git a/src/test/rustdoc/blanket-reexport-item.rs b/src/test/rustdoc/blanket-reexport-item.rs index 355bfa0f2f236..a1db90d7606d9 100644 --- a/src/test/rustdoc/blanket-reexport-item.rs +++ b/src/test/rustdoc/blanket-reexport-item.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] // @has foo/struct.S.html '//h3[@id="impl-Into"]//code' 'impl Into for T' diff --git a/src/test/rustdoc/cap-lints.rs b/src/test/rustdoc/cap-lints.rs index 39e753daadbd1..b66f75695f2ab 100644 --- a/src/test/rustdoc/cap-lints.rs +++ b/src/test/rustdoc/cap-lints.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This should fail a normal compile due to non_camel_case_types, // It should pass a doc-compile as it only needs to type-check and // therefore should not concern itself with the lints. diff --git a/src/test/rustdoc/check-styled-link.rs b/src/test/rustdoc/check-styled-link.rs index 1633711e83d9a..b479820dfb2ec 100644 --- a/src/test/rustdoc/check-styled-link.rs +++ b/src/test/rustdoc/check-styled-link.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] pub struct Foo; diff --git a/src/test/rustdoc/codeblock-title.rs b/src/test/rustdoc/codeblock-title.rs index d6cd5a24d915f..2f77929c74e37 100644 --- a/src/test/rustdoc/codeblock-title.rs +++ b/src/test/rustdoc/codeblock-title.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] // ignore-tidy-linelength diff --git a/src/test/rustdoc/const-doc.rs b/src/test/rustdoc/const-doc.rs index 9884e3d2c1995..0c51897fd498e 100644 --- a/src/test/rustdoc/const-doc.rs +++ b/src/test/rustdoc/const-doc.rs @@ -1,14 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::marker::PhantomData; pub struct Foo<'a> { diff --git a/src/test/rustdoc/const-evalutation-ice.rs b/src/test/rustdoc/const-evalutation-ice.rs index 000ed709a8aae..cda290c4ffb9a 100644 --- a/src/test/rustdoc/const-evalutation-ice.rs +++ b/src/test/rustdoc/const-evalutation-ice.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Just check if we don't get an ICE for the _S type. use std::cell::Cell; diff --git a/src/test/rustdoc/const-fn.rs b/src/test/rustdoc/const-fn.rs index c323681f60b0a..2b6f4c7db48dd 100644 --- a/src/test/rustdoc/const-fn.rs +++ b/src/test/rustdoc/const-fn.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_fn)] #![crate_name = "foo"] diff --git a/src/test/rustdoc/const.rs b/src/test/rustdoc/const.rs index 380feb941d6fe..f4c8213fd64e7 100644 --- a/src/test/rustdoc/const.rs +++ b/src/test/rustdoc/const.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="lib"] #![feature(const_fn)] diff --git a/src/test/rustdoc/constructor-imports.rs b/src/test/rustdoc/constructor-imports.rs index c170eadd3c61d..26795c274447d 100644 --- a/src/test/rustdoc/constructor-imports.rs +++ b/src/test/rustdoc/constructor-imports.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] pub mod a { diff --git a/src/test/rustdoc/crate-version.rs b/src/test/rustdoc/crate-version.rs index 07ab5ceedfa02..9ea84ac031211 100644 --- a/src/test/rustdoc/crate-version.rs +++ b/src/test/rustdoc/crate-version.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --crate-version=1.3.37 -Z unstable-options // @has 'crate_version/index.html' '//div[@class="block version"]/p' 'Version 1.3.37' diff --git a/src/test/rustdoc/cross-crate-links.rs b/src/test/rustdoc/cross-crate-links.rs index 7ccfb3d9da675..7c736a4cc1153 100644 --- a/src/test/rustdoc/cross-crate-links.rs +++ b/src/test/rustdoc/cross-crate-links.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:all-item-types.rs // build-aux-docs diff --git a/src/test/rustdoc/default-impl.rs b/src/test/rustdoc/default-impl.rs index 6153a3966342c..f11b3b29b9372 100644 --- a/src/test/rustdoc/default-impl.rs +++ b/src/test/rustdoc/default-impl.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:rustdoc-default-impl.rs // ignore-cross-compile diff --git a/src/test/rustdoc/default-trait-method-link.rs b/src/test/rustdoc/default-trait-method-link.rs index 9cde446eb941e..e4f0bdab16292 100644 --- a/src/test/rustdoc/default-trait-method-link.rs +++ b/src/test/rustdoc/default-trait-method-link.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] // @has foo/trait.Foo.html '//a[@href="../foo/trait.Foo.html#tymethod.req"]' 'req' diff --git a/src/test/rustdoc/deprecated-future.rs b/src/test/rustdoc/deprecated-future.rs index 6feb98dad09c6..383afe86cb405 100644 --- a/src/test/rustdoc/deprecated-future.rs +++ b/src/test/rustdoc/deprecated-future.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(deprecated)] // @has deprecated_future/struct.S.html '//*[@class="stab deprecated"]' \ diff --git a/src/test/rustdoc/deprecated-impls.rs b/src/test/rustdoc/deprecated-impls.rs index bcf0645766b30..5b8f831302f40 100644 --- a/src/test/rustdoc/deprecated-impls.rs +++ b/src/test/rustdoc/deprecated-impls.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] // @has foo/struct.Foo0.html diff --git a/src/test/rustdoc/deprecated.rs b/src/test/rustdoc/deprecated.rs index 744304a62c216..d3381152a2ea6 100644 --- a/src/test/rustdoc/deprecated.rs +++ b/src/test/rustdoc/deprecated.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(deprecated)] // @has deprecated/struct.S.html '//*[@class="stab deprecated"]' \ diff --git a/src/test/rustdoc/doc-assoc-item.rs b/src/test/rustdoc/doc-assoc-item.rs index 36f44295953f0..4d5c9f83e1ee0 100644 --- a/src/test/rustdoc/doc-assoc-item.rs +++ b/src/test/rustdoc/doc-assoc-item.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Foo { x: T, } diff --git a/src/test/rustdoc/doc-cfg-target-feature.rs b/src/test/rustdoc/doc-cfg-target-feature.rs index ddc5e5bb3f8cc..f1b000dc82362 100644 --- a/src/test/rustdoc/doc-cfg-target-feature.rs +++ b/src/test/rustdoc/doc-cfg-target-feature.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // only-x86_64 // compile-flags:--test // should-fail diff --git a/src/test/rustdoc/doc-cfg.rs b/src/test/rustdoc/doc-cfg.rs index ea8a13b034beb..c6984b5b9f34a 100644 --- a/src/test/rustdoc/doc-cfg.rs +++ b/src/test/rustdoc/doc-cfg.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(doc_cfg)] #![feature(target_feature, cfg_target_feature)] diff --git a/src/test/rustdoc/doc-proc-macro.rs b/src/test/rustdoc/doc-proc-macro.rs index b3b403a7b86aa..19172ffa41deb 100644 --- a/src/test/rustdoc/doc-proc-macro.rs +++ b/src/test/rustdoc/doc-proc-macro.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #52129: ICE when trying to document the `quote` proc-macro from proc_macro // As of this writing, we don't currently attempt to document proc-macros. However, we shouldn't diff --git a/src/test/rustdoc/doc-spotlight.rs b/src/test/rustdoc/doc-spotlight.rs index a570aa2d3984f..ddd46c3c2155f 100644 --- a/src/test/rustdoc/doc-spotlight.rs +++ b/src/test/rustdoc/doc-spotlight.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(doc_spotlight)] pub struct Wrapper { diff --git a/src/test/rustdoc/double-quote-escape.rs b/src/test/rustdoc/double-quote-escape.rs index 46e2ca8c760b5..243d8ad7965b8 100644 --- a/src/test/rustdoc/double-quote-escape.rs +++ b/src/test/rustdoc/double-quote-escape.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] // ignore-tidy-linelength diff --git a/src/test/rustdoc/duplicate_impls/impls.rs b/src/test/rustdoc/duplicate_impls/impls.rs index 72e54fe733cdb..6875ad2726d32 100644 --- a/src/test/rustdoc/duplicate_impls/impls.rs +++ b/src/test/rustdoc/duplicate_impls/impls.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Foo; // just so that `Foo` doesn't show up on `Bar`s sidebar diff --git a/src/test/rustdoc/duplicate_impls/issue-33054.rs b/src/test/rustdoc/duplicate_impls/issue-33054.rs index 43a425d4c5e4f..3f7cec1856331 100644 --- a/src/test/rustdoc/duplicate_impls/issue-33054.rs +++ b/src/test/rustdoc/duplicate_impls/issue-33054.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // @has issue_33054/impls/struct.Foo.html // @has - '//code' 'impl Foo' // @has - '//code' 'impl Bar for Foo' diff --git a/src/test/rustdoc/edition-flag.rs b/src/test/rustdoc/edition-flag.rs index 3475b657d2599..5571245f28ddb 100644 --- a/src/test/rustdoc/edition-flag.rs +++ b/src/test/rustdoc/edition-flag.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:--test -Z unstable-options // edition:2018 diff --git a/src/test/rustdoc/empty-mod-private.rs b/src/test/rustdoc/empty-mod-private.rs index 6c6af19be88f9..12576a1b535f7 100644 --- a/src/test/rustdoc/empty-mod-private.rs +++ b/src/test/rustdoc/empty-mod-private.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags: --document-private-items diff --git a/src/test/rustdoc/empty-mod-public.rs b/src/test/rustdoc/empty-mod-public.rs index 413fe16142405..d097fcf839cba 100644 --- a/src/test/rustdoc/empty-mod-public.rs +++ b/src/test/rustdoc/empty-mod-public.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // @has 'empty_mod_public/index.html' '//a[@href="foo/index.html"]' 'foo' // @has 'empty_mod_public/sidebar-items.js' 'foo' // @matches 'empty_mod_public/foo/index.html' '//h1' 'Module empty_mod_public::foo' diff --git a/src/test/rustdoc/empty-section.rs b/src/test/rustdoc/empty-section.rs index 3748313593fc2..67d09fb99b9fd 100644 --- a/src/test/rustdoc/empty-section.rs +++ b/src/test/rustdoc/empty-section.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] #![feature(optin_builtin_traits)] diff --git a/src/test/rustdoc/escape-deref-methods.rs b/src/test/rustdoc/escape-deref-methods.rs index f31b0ddca9ada..a62ad2c400173 100644 --- a/src/test/rustdoc/escape-deref-methods.rs +++ b/src/test/rustdoc/escape-deref-methods.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] use std::ops::{Deref, DerefMut}; diff --git a/src/test/rustdoc/escape-rust-expr.rs b/src/test/rustdoc/escape-rust-expr.rs index 7f9a2bf175a5f..89e05de313084 100644 --- a/src/test/rustdoc/escape-rust-expr.rs +++ b/src/test/rustdoc/escape-rust-expr.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we HTML-escape Rust expressions, where HTML special chars // can occur, and we know it's definitely not markup. diff --git a/src/test/rustdoc/extern-default-method.rs b/src/test/rustdoc/extern-default-method.rs index 10d2884ebae07..810c591c53e1e 100644 --- a/src/test/rustdoc/extern-default-method.rs +++ b/src/test/rustdoc/extern-default-method.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:rustdoc-extern-default-method.rs // ignore-cross-compile diff --git a/src/test/rustdoc/extern-impl-trait.rs b/src/test/rustdoc/extern-impl-trait.rs index 02a8e962fe17b..58bd650feb466 100644 --- a/src/test/rustdoc/extern-impl-trait.rs +++ b/src/test/rustdoc/extern-impl-trait.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:extern-impl-trait.rs #![crate_name = "foo"] diff --git a/src/test/rustdoc/extern-impl.rs b/src/test/rustdoc/extern-impl.rs index 5c64b4118c3ab..f68e10a4d092c 100644 --- a/src/test/rustdoc/extern-impl.rs +++ b/src/test/rustdoc/extern-impl.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] // @has foo/struct.Foo.html diff --git a/src/test/rustdoc/extern-links.rs b/src/test/rustdoc/extern-links.rs index c35a5668dced7..991f869138d93 100644 --- a/src/test/rustdoc/extern-links.rs +++ b/src/test/rustdoc/extern-links.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:extern-links.rs // ignore-cross-compile diff --git a/src/test/rustdoc/extern-method.rs b/src/test/rustdoc/extern-method.rs index c422871867d5d..7fbe5fe43274d 100644 --- a/src/test/rustdoc/extern-method.rs +++ b/src/test/rustdoc/extern-method.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:rustdoc-extern-method.rs // ignore-cross-compile diff --git a/src/test/rustdoc/external-cross.rs b/src/test/rustdoc/external-cross.rs index f4a59cee32dd9..056ed3534624b 100644 --- a/src/test/rustdoc/external-cross.rs +++ b/src/test/rustdoc/external-cross.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:external-cross.rs // ignore-cross-compile diff --git a/src/test/rustdoc/external-doc.rs b/src/test/rustdoc/external-doc.rs index 07e784a6ccfaf..4a13f4069c40a 100644 --- a/src/test/rustdoc/external-doc.rs +++ b/src/test/rustdoc/external-doc.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(external_doc)] // @has external_doc/struct.CanHasDocs.html diff --git a/src/test/rustdoc/ffi.rs b/src/test/rustdoc/ffi.rs index 8511d461703de..8140dfc723c75 100644 --- a/src/test/rustdoc/ffi.rs +++ b/src/test/rustdoc/ffi.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:rustdoc-ffi.rs // ignore-cross-compile diff --git a/src/test/rustdoc/fn-pointer-arg-name.rs b/src/test/rustdoc/fn-pointer-arg-name.rs index af87f1b466974..4293d849df52c 100644 --- a/src/test/rustdoc/fn-pointer-arg-name.rs +++ b/src/test/rustdoc/fn-pointer-arg-name.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] // @has foo/fn.f.html diff --git a/src/test/rustdoc/fn-sidebar.rs b/src/test/rustdoc/fn-sidebar.rs index 4da277a204b71..2fe8ebec1c580 100644 --- a/src/test/rustdoc/fn-sidebar.rs +++ b/src/test/rustdoc/fn-sidebar.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] // @has foo/fn.bar.html diff --git a/src/test/rustdoc/force-target-feature.rs b/src/test/rustdoc/force-target-feature.rs index 08f1f06baa319..b6c10e8341b43 100644 --- a/src/test/rustdoc/force-target-feature.rs +++ b/src/test/rustdoc/force-target-feature.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // only-x86_64 // compile-flags:--test -C target-feature=+avx // should-fail diff --git a/src/test/rustdoc/foreigntype-reexport.rs b/src/test/rustdoc/foreigntype-reexport.rs index 714222de529ee..616826ce7b4a8 100644 --- a/src/test/rustdoc/foreigntype-reexport.rs +++ b/src/test/rustdoc/foreigntype-reexport.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(extern_types)] mod sub { diff --git a/src/test/rustdoc/foreigntype.rs b/src/test/rustdoc/foreigntype.rs index 06447ffaa753d..bd8766c0cf13a 100644 --- a/src/test/rustdoc/foreigntype.rs +++ b/src/test/rustdoc/foreigntype.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(extern_types)] extern { diff --git a/src/test/rustdoc/generic-impl.rs b/src/test/rustdoc/generic-impl.rs index 46e02ed08e00a..03a4d19749967 100644 --- a/src/test/rustdoc/generic-impl.rs +++ b/src/test/rustdoc/generic-impl.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] use std::fmt; diff --git a/src/test/rustdoc/hidden-impls.rs b/src/test/rustdoc/hidden-impls.rs index 203c56e9e2e00..935bfb268637f 100644 --- a/src/test/rustdoc/hidden-impls.rs +++ b/src/test/rustdoc/hidden-impls.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] mod hidden { diff --git a/src/test/rustdoc/hidden-line.rs b/src/test/rustdoc/hidden-line.rs index e05d51c2bac58..f2f6173d26db9 100644 --- a/src/test/rustdoc/hidden-line.rs +++ b/src/test/rustdoc/hidden-line.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// The '# ' lines should be removed from the output, but the #[derive] should be /// retained. /// diff --git a/src/test/rustdoc/hidden-methods.rs b/src/test/rustdoc/hidden-methods.rs index 18f5f086cd1a4..f32edeb11d99c 100644 --- a/src/test/rustdoc/hidden-methods.rs +++ b/src/test/rustdoc/hidden-methods.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] #[doc(hidden)] diff --git a/src/test/rustdoc/hidden-trait-struct-impls.rs b/src/test/rustdoc/hidden-trait-struct-impls.rs index d16932828d04f..1be956ef39308 100644 --- a/src/test/rustdoc/hidden-trait-struct-impls.rs +++ b/src/test/rustdoc/hidden-trait-struct-impls.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] #[doc(hidden)] diff --git a/src/test/rustdoc/impl-disambiguation.rs b/src/test/rustdoc/impl-disambiguation.rs index afe1daf5983a2..9f55318563937 100644 --- a/src/test/rustdoc/impl-disambiguation.rs +++ b/src/test/rustdoc/impl-disambiguation.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] pub trait Foo {} diff --git a/src/test/rustdoc/impl-everywhere.rs b/src/test/rustdoc/impl-everywhere.rs index 62da6f13942d8..9d86dd3c29e98 100644 --- a/src/test/rustdoc/impl-everywhere.rs +++ b/src/test/rustdoc/impl-everywhere.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] pub trait Foo {} diff --git a/src/test/rustdoc/impl-parts-crosscrate.rs b/src/test/rustdoc/impl-parts-crosscrate.rs index 1d055ccbeadef..f9583d1a72296 100644 --- a/src/test/rustdoc/impl-parts-crosscrate.rs +++ b/src/test/rustdoc/impl-parts-crosscrate.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:rustdoc-impl-parts-crosscrate.rs // ignore-cross-compile diff --git a/src/test/rustdoc/impl-parts.rs b/src/test/rustdoc/impl-parts.rs index 6e472da379c59..fbb4e725481c0 100644 --- a/src/test/rustdoc/impl-parts.rs +++ b/src/test/rustdoc/impl-parts.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] pub auto trait AnOibit {} diff --git a/src/test/rustdoc/inline-default-methods.rs b/src/test/rustdoc/inline-default-methods.rs index 055af0160f54c..c97644e7f8723 100644 --- a/src/test/rustdoc/inline-default-methods.rs +++ b/src/test/rustdoc/inline-default-methods.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:inline-default-methods.rs // ignore-cross-compile diff --git a/src/test/rustdoc/inline_cross/assoc-items.rs b/src/test/rustdoc/inline_cross/assoc-items.rs index 95d936883ffa9..93e345c2f551f 100644 --- a/src/test/rustdoc/inline_cross/assoc-items.rs +++ b/src/test/rustdoc/inline_cross/assoc-items.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:assoc-items.rs // build-aux-docs // ignore-cross-compile diff --git a/src/test/rustdoc/inline_cross/auxiliary/assoc-items.rs b/src/test/rustdoc/inline_cross/auxiliary/assoc-items.rs index e955526900e99..5fa299914f626 100644 --- a/src/test/rustdoc/inline_cross/auxiliary/assoc-items.rs +++ b/src/test/rustdoc/inline_cross/auxiliary/assoc-items.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(associated_type_defaults)] pub struct MyStruct; diff --git a/src/test/rustdoc/inline_cross/auxiliary/cross-glob.rs b/src/test/rustdoc/inline_cross/auxiliary/cross-glob.rs index 5067ce9e9a341..cde7f68ff0182 100644 --- a/src/test/rustdoc/inline_cross/auxiliary/cross-glob.rs +++ b/src/test/rustdoc/inline_cross/auxiliary/cross-glob.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "inner"] pub struct SomeStruct; diff --git a/src/test/rustdoc/inline_cross/auxiliary/impl-inline-without-trait.rs b/src/test/rustdoc/inline_cross/auxiliary/impl-inline-without-trait.rs index 5d4adb28cd83a..401a6a44af9a4 100644 --- a/src/test/rustdoc/inline_cross/auxiliary/impl-inline-without-trait.rs +++ b/src/test/rustdoc/inline_cross/auxiliary/impl-inline-without-trait.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait MyTrait { /// docs for my_trait_method fn my_trait_method() {} diff --git a/src/test/rustdoc/inline_cross/auxiliary/issue-33113.rs b/src/test/rustdoc/inline_cross/auxiliary/issue-33113.rs index c476dda269029..4e1f1918e2193 100644 --- a/src/test/rustdoc/inline_cross/auxiliary/issue-33113.rs +++ b/src/test/rustdoc/inline_cross/auxiliary/issue-33113.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name="bar"] pub trait Bar {} diff --git a/src/test/rustdoc/inline_cross/auxiliary/macro-vis.rs b/src/test/rustdoc/inline_cross/auxiliary/macro-vis.rs index 3fce62529c78f..5615a4fdd3dc8 100644 --- a/src/test/rustdoc/inline_cross/auxiliary/macro-vis.rs +++ b/src/test/rustdoc/inline_cross/auxiliary/macro-vis.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "qwop"] /// (written on a spider's web) Some Macro diff --git a/src/test/rustdoc/inline_cross/auxiliary/macros.rs b/src/test/rustdoc/inline_cross/auxiliary/macros.rs index 39b52d68bf1c2..6189b018037ea 100644 --- a/src/test/rustdoc/inline_cross/auxiliary/macros.rs +++ b/src/test/rustdoc/inline_cross/auxiliary/macros.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(staged_api)] #![stable(feature = "rust1", since = "1.0.0")] diff --git a/src/test/rustdoc/inline_cross/auxiliary/renamed-via-module.rs b/src/test/rustdoc/inline_cross/auxiliary/renamed-via-module.rs index 9f7a259a7db03..2e529078239b0 100644 --- a/src/test/rustdoc/inline_cross/auxiliary/renamed-via-module.rs +++ b/src/test/rustdoc/inline_cross/auxiliary/renamed-via-module.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] pub mod iter { diff --git a/src/test/rustdoc/inline_cross/auxiliary/rustdoc-hidden-sig.rs b/src/test/rustdoc/inline_cross/auxiliary/rustdoc-hidden-sig.rs index e2bc153ce0d85..6357b76df0c7a 100644 --- a/src/test/rustdoc/inline_cross/auxiliary/rustdoc-hidden-sig.rs +++ b/src/test/rustdoc/inline_cross/auxiliary/rustdoc-hidden-sig.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Bar; impl Bar { diff --git a/src/test/rustdoc/inline_cross/auxiliary/rustdoc-hidden.rs b/src/test/rustdoc/inline_cross/auxiliary/rustdoc-hidden.rs index aae3eb84fb5dd..0c75b3127cf58 100644 --- a/src/test/rustdoc/inline_cross/auxiliary/rustdoc-hidden.rs +++ b/src/test/rustdoc/inline_cross/auxiliary/rustdoc-hidden.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[doc(hidden)] pub struct Foo; diff --git a/src/test/rustdoc/inline_cross/auxiliary/rustdoc-nonreachable-impls.rs b/src/test/rustdoc/inline_cross/auxiliary/rustdoc-nonreachable-impls.rs index 5fee36959c23d..4e461d3bc3759 100644 --- a/src/test/rustdoc/inline_cross/auxiliary/rustdoc-nonreachable-impls.rs +++ b/src/test/rustdoc/inline_cross/auxiliary/rustdoc-nonreachable-impls.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Foo; pub trait Woof {} diff --git a/src/test/rustdoc/inline_cross/auxiliary/rustdoc-trait-object-impl.rs b/src/test/rustdoc/inline_cross/auxiliary/rustdoc-trait-object-impl.rs index 317262f417512..76913f02cfd82 100644 --- a/src/test/rustdoc/inline_cross/auxiliary/rustdoc-trait-object-impl.rs +++ b/src/test/rustdoc/inline_cross/auxiliary/rustdoc-trait-object-impl.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt; pub trait Bar {} diff --git a/src/test/rustdoc/inline_cross/cross-glob.rs b/src/test/rustdoc/inline_cross/cross-glob.rs index 21cf158c13b03..f97da11a90149 100644 --- a/src/test/rustdoc/inline_cross/cross-glob.rs +++ b/src/test/rustdoc/inline_cross/cross-glob.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:cross-glob.rs // build-aux-docs // ignore-cross-compile diff --git a/src/test/rustdoc/inline_cross/hidden-use.rs b/src/test/rustdoc/inline_cross/hidden-use.rs index dd668c203626d..97715737fd90d 100644 --- a/src/test/rustdoc/inline_cross/hidden-use.rs +++ b/src/test/rustdoc/inline_cross/hidden-use.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:rustdoc-hidden.rs // build-aux-docs // ignore-cross-compile diff --git a/src/test/rustdoc/inline_cross/impl-inline-without-trait.rs b/src/test/rustdoc/inline_cross/impl-inline-without-trait.rs index ea97d9d6ac2c2..cadeccb60c817 100644 --- a/src/test/rustdoc/inline_cross/impl-inline-without-trait.rs +++ b/src/test/rustdoc/inline_cross/impl-inline-without-trait.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:impl-inline-without-trait.rs // build-aux-docs // ignore-cross-compile diff --git a/src/test/rustdoc/inline_cross/inline_hidden.rs b/src/test/rustdoc/inline_cross/inline_hidden.rs index c59b5afd1c483..dcceaadb9680e 100644 --- a/src/test/rustdoc/inline_cross/inline_hidden.rs +++ b/src/test/rustdoc/inline_cross/inline_hidden.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:rustdoc-hidden.rs // build-aux-docs // ignore-cross-compile diff --git a/src/test/rustdoc/inline_cross/issue-28480.rs b/src/test/rustdoc/inline_cross/issue-28480.rs index 6b5c5b2014734..99f5b90077142 100644 --- a/src/test/rustdoc/inline_cross/issue-28480.rs +++ b/src/test/rustdoc/inline_cross/issue-28480.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:rustdoc-hidden-sig.rs // build-aux-docs // ignore-cross-compile diff --git a/src/test/rustdoc/inline_cross/issue-31948-1.rs b/src/test/rustdoc/inline_cross/issue-31948-1.rs index e953b66fce15d..022d155ad578d 100644 --- a/src/test/rustdoc/inline_cross/issue-31948-1.rs +++ b/src/test/rustdoc/inline_cross/issue-31948-1.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:rustdoc-nonreachable-impls.rs // build-aux-docs // ignore-cross-compile diff --git a/src/test/rustdoc/inline_cross/issue-31948-2.rs b/src/test/rustdoc/inline_cross/issue-31948-2.rs index 0423fa1de3b4c..4ce8c853ff073 100644 --- a/src/test/rustdoc/inline_cross/issue-31948-2.rs +++ b/src/test/rustdoc/inline_cross/issue-31948-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:rustdoc-nonreachable-impls.rs // build-aux-docs // ignore-cross-compile diff --git a/src/test/rustdoc/inline_cross/issue-31948.rs b/src/test/rustdoc/inline_cross/issue-31948.rs index 073e8eb50fb25..d5725175e3f0a 100644 --- a/src/test/rustdoc/inline_cross/issue-31948.rs +++ b/src/test/rustdoc/inline_cross/issue-31948.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:rustdoc-nonreachable-impls.rs // build-aux-docs // ignore-cross-compile diff --git a/src/test/rustdoc/inline_cross/issue-32881.rs b/src/test/rustdoc/inline_cross/issue-32881.rs index 948061bdcbed5..4491d0391f47d 100644 --- a/src/test/rustdoc/inline_cross/issue-32881.rs +++ b/src/test/rustdoc/inline_cross/issue-32881.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:rustdoc-trait-object-impl.rs // build-aux-docs // ignore-cross-compile diff --git a/src/test/rustdoc/inline_cross/issue-33113.rs b/src/test/rustdoc/inline_cross/issue-33113.rs index 9ae8fefe730ef..1e633600aeff1 100644 --- a/src/test/rustdoc/inline_cross/issue-33113.rs +++ b/src/test/rustdoc/inline_cross/issue-33113.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-33113.rs // build-aux-docs // ignore-cross-compile diff --git a/src/test/rustdoc/inline_cross/macro-vis.rs b/src/test/rustdoc/inline_cross/macro-vis.rs index 5467a210bfd86..9fefd38ad2c1a 100644 --- a/src/test/rustdoc/inline_cross/macro-vis.rs +++ b/src/test/rustdoc/inline_cross/macro-vis.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:macro-vis.rs // build-aux-docs // ignore-cross-compile diff --git a/src/test/rustdoc/inline_cross/macros.rs b/src/test/rustdoc/inline_cross/macros.rs index 474a1da187549..b387a379ae2a7 100644 --- a/src/test/rustdoc/inline_cross/macros.rs +++ b/src/test/rustdoc/inline_cross/macros.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:macros.rs // build-aux-docs diff --git a/src/test/rustdoc/inline_cross/renamed-via-module.rs b/src/test/rustdoc/inline_cross/renamed-via-module.rs index a4e0154376142..cdedbf0707985 100644 --- a/src/test/rustdoc/inline_cross/renamed-via-module.rs +++ b/src/test/rustdoc/inline_cross/renamed-via-module.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:renamed-via-module.rs // build-aux-docs // ignore-cross-compile diff --git a/src/test/rustdoc/inline_local/glob-extern-no-defaults.rs b/src/test/rustdoc/inline_local/glob-extern-no-defaults.rs index fd2fdd7b8d329..276e4091c0273 100644 --- a/src/test/rustdoc/inline_local/glob-extern-no-defaults.rs +++ b/src/test/rustdoc/inline_local/glob-extern-no-defaults.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --no-defaults #![crate_name = "foo"] diff --git a/src/test/rustdoc/inline_local/glob-extern.rs b/src/test/rustdoc/inline_local/glob-extern.rs index cf899d7728c9d..a23ec3640eea7 100644 --- a/src/test/rustdoc/inline_local/glob-extern.rs +++ b/src/test/rustdoc/inline_local/glob-extern.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] mod mod1 { diff --git a/src/test/rustdoc/inline_local/glob-private-no-defaults.rs b/src/test/rustdoc/inline_local/glob-private-no-defaults.rs index 420b60f2aca9f..ac854ac4320ab 100644 --- a/src/test/rustdoc/inline_local/glob-private-no-defaults.rs +++ b/src/test/rustdoc/inline_local/glob-private-no-defaults.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --no-defaults #![crate_name = "foo"] diff --git a/src/test/rustdoc/inline_local/glob-private.rs b/src/test/rustdoc/inline_local/glob-private.rs index ecc754f012ed1..d294d590e1b62 100644 --- a/src/test/rustdoc/inline_local/glob-private.rs +++ b/src/test/rustdoc/inline_local/glob-private.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] mod mod1 { diff --git a/src/test/rustdoc/inline_local/hidden-use.rs b/src/test/rustdoc/inline_local/hidden-use.rs index 1b1dafcf58bef..a972d376aab33 100644 --- a/src/test/rustdoc/inline_local/hidden-use.rs +++ b/src/test/rustdoc/inline_local/hidden-use.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod private { pub struct Foo {} } diff --git a/src/test/rustdoc/inline_local/issue-28537.rs b/src/test/rustdoc/inline_local/issue-28537.rs index b38e104b7b4ee..da9cc4c940dbe 100644 --- a/src/test/rustdoc/inline_local/issue-28537.rs +++ b/src/test/rustdoc/inline_local/issue-28537.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[doc(hidden)] pub mod foo { pub struct Foo; diff --git a/src/test/rustdoc/inline_local/issue-32343.rs b/src/test/rustdoc/inline_local/issue-32343.rs index a045c9624b1a1..5620ae0dced01 100644 --- a/src/test/rustdoc/inline_local/issue-32343.rs +++ b/src/test/rustdoc/inline_local/issue-32343.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // @!has issue_32343/struct.Foo.html // @has issue_32343/index.html // @has - '//code' 'pub use foo::Foo' diff --git a/src/test/rustdoc/inline_local/please_inline.rs b/src/test/rustdoc/inline_local/please_inline.rs index d237ab8dab01a..48539361fbfb5 100644 --- a/src/test/rustdoc/inline_local/please_inline.rs +++ b/src/test/rustdoc/inline_local/please_inline.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod foo { pub struct Foo; } diff --git a/src/test/rustdoc/intra-link-extern-crate.rs b/src/test/rustdoc/intra-link-extern-crate.rs index 5666f3bd2f2b0..bbe3edaea8cb2 100644 --- a/src/test/rustdoc/intra-link-extern-crate.rs +++ b/src/test/rustdoc/intra-link-extern-crate.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:intra-link-extern-crate.rs // When loading `extern crate` statements, we would pull in their docs at the same time, even diff --git a/src/test/rustdoc/intra-link-private.rs b/src/test/rustdoc/intra-link-private.rs index dbdfbc4e5adca..c99b4d70684aa 100644 --- a/src/test/rustdoc/intra-link-private.rs +++ b/src/test/rustdoc/intra-link-private.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Rustdoc would previously report resolution failures on items that weren't in the public docs. // These failures were legitimate, but not truly relevant - the docs in question couldn't be // checked for accuracy anyway. diff --git a/src/test/rustdoc/intra-link-self.rs b/src/test/rustdoc/intra-link-self.rs index 21317f2af42be..acf975f5c738e 100644 --- a/src/test/rustdoc/intra-link-self.rs +++ b/src/test/rustdoc/intra-link-self.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] // @has foo/index.html '//a/@href' '../foo/struct.Foo.html#method.new' diff --git a/src/test/rustdoc/intra-links.rs b/src/test/rustdoc/intra-links.rs index c822d0f8b21b8..70ea7a1ea7adf 100644 --- a/src/test/rustdoc/intra-links.rs +++ b/src/test/rustdoc/intra-links.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // @has intra_links/index.html // @has - '//a/@href' '../intra_links/struct.ThisType.html' // @has - '//a/@href' '../intra_links/struct.ThisType.html#method.this_method' diff --git a/src/test/rustdoc/invalid.crate.name.rs b/src/test/rustdoc/invalid.crate.name.rs index 4e4946a60a338..c19713b565afe 100644 --- a/src/test/rustdoc/invalid.crate.name.rs +++ b/src/test/rustdoc/invalid.crate.name.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --crate-name foo pub fn foo() {} diff --git a/src/test/rustdoc/issue-12834.rs b/src/test/rustdoc/issue-12834.rs index 30dce27e73894..558009e693777 100644 --- a/src/test/rustdoc/issue-12834.rs +++ b/src/test/rustdoc/issue-12834.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that failing to syntax highlight a rust code-block doesn't cause // rustdoc to fail, while still rendering the code-block (without highlighting). diff --git a/src/test/rustdoc/issue-13698.rs b/src/test/rustdoc/issue-13698.rs index cf9b30a0fe987..2f95d0951e98c 100644 --- a/src/test/rustdoc/issue-13698.rs +++ b/src/test/rustdoc/issue-13698.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-13698.rs // ignore-cross-compile diff --git a/src/test/rustdoc/issue-15169.rs b/src/test/rustdoc/issue-15169.rs index 6ab848b92dbbd..e525d85e21ec0 100644 --- a/src/test/rustdoc/issue-15169.rs +++ b/src/test/rustdoc/issue-15169.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // @has issue_15169/struct.Foo.html '//*[@id="method.eq"]' 'fn eq' #[derive(PartialEq)] pub struct Foo; diff --git a/src/test/rustdoc/issue-15318-2.rs b/src/test/rustdoc/issue-15318-2.rs index 7999af46eebb6..1dbfba988efee 100644 --- a/src/test/rustdoc/issue-15318-2.rs +++ b/src/test/rustdoc/issue-15318-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-15318.rs // ignore-cross-compile diff --git a/src/test/rustdoc/issue-15318-3.rs b/src/test/rustdoc/issue-15318-3.rs index a54824970c751..1f7443a657240 100644 --- a/src/test/rustdoc/issue-15318-3.rs +++ b/src/test/rustdoc/issue-15318-3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // @has issue_15318_3/primitive.pointer.html /// dox diff --git a/src/test/rustdoc/issue-15318.rs b/src/test/rustdoc/issue-15318.rs index bd22548a88805..0349fe2854c8a 100644 --- a/src/test/rustdoc/issue-15318.rs +++ b/src/test/rustdoc/issue-15318.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-15318.rs // ignore-cross-compile diff --git a/src/test/rustdoc/issue-15347.rs b/src/test/rustdoc/issue-15347.rs index c50df6edd484a..fa67da840b7b4 100644 --- a/src/test/rustdoc/issue-15347.rs +++ b/src/test/rustdoc/issue-15347.rs @@ -1,13 +1,3 @@ -// Copyright 2105 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --no-defaults --passes collapse-docs --passes unindent-comments // @has issue_15347/fn.foo.html diff --git a/src/test/rustdoc/issue-16019.rs b/src/test/rustdoc/issue-16019.rs index 7aae6a0595024..239d92378d9bb 100644 --- a/src/test/rustdoc/issue-16019.rs +++ b/src/test/rustdoc/issue-16019.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! define_struct { ($rounds:expr) => ( struct Struct { diff --git a/src/test/rustdoc/issue-16265-1.rs b/src/test/rustdoc/issue-16265-1.rs index c0b99a627ea30..653fd4c5e34e6 100644 --- a/src/test/rustdoc/issue-16265-1.rs +++ b/src/test/rustdoc/issue-16265-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Foo; // @has issue_16265_1/traits/index.html '[src]' diff --git a/src/test/rustdoc/issue-16265-2.rs b/src/test/rustdoc/issue-16265-2.rs index 22a8df407e095..00453a3633328 100644 --- a/src/test/rustdoc/issue-16265-2.rs +++ b/src/test/rustdoc/issue-16265-2.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // @has issue_16265_2/index.html '[src]' trait Y {} diff --git a/src/test/rustdoc/issue-17476.rs b/src/test/rustdoc/issue-17476.rs index dcd3f2a2ba5b8..a5b484c985fff 100644 --- a/src/test/rustdoc/issue-17476.rs +++ b/src/test/rustdoc/issue-17476.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-17476.rs // ignore-cross-compile diff --git a/src/test/rustdoc/issue-18199.rs b/src/test/rustdoc/issue-18199.rs index 275947a18a5e6..bc0c4a5650294 100644 --- a/src/test/rustdoc/issue-18199.rs +++ b/src/test/rustdoc/issue-18199.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:--test #![doc(test(attr(feature(staged_api))))] diff --git a/src/test/rustdoc/issue-19055.rs b/src/test/rustdoc/issue-19055.rs index 609ae22be104b..dbaf744dc4712 100644 --- a/src/test/rustdoc/issue-19055.rs +++ b/src/test/rustdoc/issue-19055.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // @has issue_19055/trait.Any.html pub trait Any {} diff --git a/src/test/rustdoc/issue-19181.rs b/src/test/rustdoc/issue-19181.rs index a2935b73596c3..3dea152fc6ecb 100644 --- a/src/test/rustdoc/issue-19181.rs +++ b/src/test/rustdoc/issue-19181.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:--test // rustdoc should not panic when target crate has compilation errors diff --git a/src/test/rustdoc/issue-19190-2.rs b/src/test/rustdoc/issue-19190-2.rs index 5688c5cba0bbe..b6416e2e5b97e 100644 --- a/src/test/rustdoc/issue-19190-2.rs +++ b/src/test/rustdoc/issue-19190-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::Deref; pub struct Bar; diff --git a/src/test/rustdoc/issue-19190-3.rs b/src/test/rustdoc/issue-19190-3.rs index be2e15dffc0e7..f7366302a1e67 100644 --- a/src/test/rustdoc/issue-19190-3.rs +++ b/src/test/rustdoc/issue-19190-3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-19190-3.rs // ignore-cross-compile diff --git a/src/test/rustdoc/issue-19190.rs b/src/test/rustdoc/issue-19190.rs index 15f7528b4ba21..a7c25538f7c44 100644 --- a/src/test/rustdoc/issue-19190.rs +++ b/src/test/rustdoc/issue-19190.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::Deref; pub struct Foo; diff --git a/src/test/rustdoc/issue-20175.rs b/src/test/rustdoc/issue-20175.rs index 33ec4b75c413d..6a42e2afbf43c 100644 --- a/src/test/rustdoc/issue-20175.rs +++ b/src/test/rustdoc/issue-20175.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Foo { fn foo(&self) {} } diff --git a/src/test/rustdoc/issue-20646.rs b/src/test/rustdoc/issue-20646.rs index 49fac20035fc0..2589e27f21502 100644 --- a/src/test/rustdoc/issue-20646.rs +++ b/src/test/rustdoc/issue-20646.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-20646.rs // ignore-cross-compile diff --git a/src/test/rustdoc/issue-20727-2.rs b/src/test/rustdoc/issue-20727-2.rs index 1f29a9c97972c..7c8b82fbe2114 100644 --- a/src/test/rustdoc/issue-20727-2.rs +++ b/src/test/rustdoc/issue-20727-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-20727.rs // ignore-cross-compile diff --git a/src/test/rustdoc/issue-20727-3.rs b/src/test/rustdoc/issue-20727-3.rs index e4a9dd7e7f142..52032b75aeaf5 100644 --- a/src/test/rustdoc/issue-20727-3.rs +++ b/src/test/rustdoc/issue-20727-3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-20727.rs // ignore-cross-compile diff --git a/src/test/rustdoc/issue-20727-4.rs b/src/test/rustdoc/issue-20727-4.rs index 960e40b070985..84fc6f94a265a 100644 --- a/src/test/rustdoc/issue-20727-4.rs +++ b/src/test/rustdoc/issue-20727-4.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-20727.rs // ignore-cross-compile diff --git a/src/test/rustdoc/issue-20727.rs b/src/test/rustdoc/issue-20727.rs index e38f06c4b317a..f7acffcb4e56a 100644 --- a/src/test/rustdoc/issue-20727.rs +++ b/src/test/rustdoc/issue-20727.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-20727.rs // ignore-cross-compile diff --git a/src/test/rustdoc/issue-21092.rs b/src/test/rustdoc/issue-21092.rs index 8c5bda7584c9f..14f547abd9a68 100644 --- a/src/test/rustdoc/issue-21092.rs +++ b/src/test/rustdoc/issue-21092.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-21092.rs // ignore-cross-compile diff --git a/src/test/rustdoc/issue-21474.rs b/src/test/rustdoc/issue-21474.rs index 553bbeb0cff39..4c530f72b8ab6 100644 --- a/src/test/rustdoc/issue-21474.rs +++ b/src/test/rustdoc/issue-21474.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub use inner::*; mod inner { diff --git a/src/test/rustdoc/issue-21801.rs b/src/test/rustdoc/issue-21801.rs index 4e2c77826b6c0..2a586b6ff6cdc 100644 --- a/src/test/rustdoc/issue-21801.rs +++ b/src/test/rustdoc/issue-21801.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-21801.rs // ignore-cross-compile diff --git a/src/test/rustdoc/issue-22025.rs b/src/test/rustdoc/issue-22025.rs index c0e4e673f94d8..a721a15f463b4 100644 --- a/src/test/rustdoc/issue-22025.rs +++ b/src/test/rustdoc/issue-22025.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-22025.rs // ignore-cross-compile diff --git a/src/test/rustdoc/issue-22038.rs b/src/test/rustdoc/issue-22038.rs index 75df53589454f..2db42b561f7f7 100644 --- a/src/test/rustdoc/issue-22038.rs +++ b/src/test/rustdoc/issue-22038.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern { // @has issue_22038/fn.foo1.html \ // '//*[@class="rust fn"]' 'pub unsafe extern "C" fn foo1()' diff --git a/src/test/rustdoc/issue-23106.rs b/src/test/rustdoc/issue-23106.rs index bfafc6be67c86..8cda2fc33805d 100644 --- a/src/test/rustdoc/issue-23106.rs +++ b/src/test/rustdoc/issue-23106.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:--test /// ``` diff --git a/src/test/rustdoc/issue-23207.rs b/src/test/rustdoc/issue-23207.rs index 4931d158ac3e4..747c59bba6aa5 100644 --- a/src/test/rustdoc/issue-23207.rs +++ b/src/test/rustdoc/issue-23207.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-23207-1.rs // aux-build:issue-23207-2.rs // ignore-cross-compile diff --git a/src/test/rustdoc/issue-23511.rs b/src/test/rustdoc/issue-23511.rs index ee0a5c1aa1b5e..4972a9fb47fff 100644 --- a/src/test/rustdoc/issue-23511.rs +++ b/src/test/rustdoc/issue-23511.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(lang_items)] #![no_std] diff --git a/src/test/rustdoc/issue-23744.rs b/src/test/rustdoc/issue-23744.rs index 25374ac0c746b..642817396b2a0 100644 --- a/src/test/rustdoc/issue-23744.rs +++ b/src/test/rustdoc/issue-23744.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:--test /// Example of rustdoc incorrectly parsing ```rust,should_panic. diff --git a/src/test/rustdoc/issue-23812.rs b/src/test/rustdoc/issue-23812.rs index 37f6749694c40..5dac8d87b089c 100644 --- a/src/test/rustdoc/issue-23812.rs +++ b/src/test/rustdoc/issue-23812.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! doc { (#[$outer:meta] mod $i:ident { #![$inner:meta] }) => ( diff --git a/src/test/rustdoc/issue-25001.rs b/src/test/rustdoc/issue-25001.rs index 0b6a8104661af..3c1580f3786bb 100644 --- a/src/test/rustdoc/issue-25001.rs +++ b/src/test/rustdoc/issue-25001.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // @has issue_25001/struct.Foo.html pub struct Foo(T); diff --git a/src/test/rustdoc/issue-25944.rs b/src/test/rustdoc/issue-25944.rs index c22ecb4a22b3d..49625294bbea0 100644 --- a/src/test/rustdoc/issue-25944.rs +++ b/src/test/rustdoc/issue-25944.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:--test /// ``` diff --git a/src/test/rustdoc/issue-26606.rs b/src/test/rustdoc/issue-26606.rs index 12de76654512d..6de419ec571df 100644 --- a/src/test/rustdoc/issue-26606.rs +++ b/src/test/rustdoc/issue-26606.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-26606-macro.rs // ignore-cross-compile // build-aux-docs diff --git a/src/test/rustdoc/issue-26995.rs b/src/test/rustdoc/issue-26995.rs index bfb440a18392e..fedc9f5174920 100644 --- a/src/test/rustdoc/issue-26995.rs +++ b/src/test/rustdoc/issue-26995.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-windows // compile-flags: --no-defaults diff --git a/src/test/rustdoc/issue-27104.rs b/src/test/rustdoc/issue-27104.rs index 5fa093d8f299b..b74c3eb78ace4 100644 --- a/src/test/rustdoc/issue-27104.rs +++ b/src/test/rustdoc/issue-27104.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:--no-defaults --passes strip-priv-imports // aux-build:empty.rs // ignore-cross-compile diff --git a/src/test/rustdoc/issue-27362.rs b/src/test/rustdoc/issue-27362.rs index b28fb7ec47a8c..3f3878350d515 100644 --- a/src/test/rustdoc/issue-27362.rs +++ b/src/test/rustdoc/issue-27362.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-27362.rs // ignore-cross-compile // ignore-test This test fails on beta/stable #32019 diff --git a/src/test/rustdoc/issue-27759.rs b/src/test/rustdoc/issue-27759.rs index e82e93230aa07..64f7a95d6a387 100644 --- a/src/test/rustdoc/issue-27759.rs +++ b/src/test/rustdoc/issue-27759.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(staged_api)] #![doc(issue_tracker_base_url = "http://issue_url/")] diff --git a/src/test/rustdoc/issue-27862.rs b/src/test/rustdoc/issue-27862.rs index 6b56585ae8aba..ce3978e7e9a8e 100644 --- a/src/test/rustdoc/issue-27862.rs +++ b/src/test/rustdoc/issue-27862.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - /// Test | Table /// ------|------------- /// t = b | id = \|x\| x diff --git a/src/test/rustdoc/issue-28478.rs b/src/test/rustdoc/issue-28478.rs index c1141cb031e4f..cc92f7b2466eb 100644 --- a/src/test/rustdoc/issue-28478.rs +++ b/src/test/rustdoc/issue-28478.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(associated_type_defaults)] // @has issue_28478/trait.Bar.html diff --git a/src/test/rustdoc/issue-28927.rs b/src/test/rustdoc/issue-28927.rs index b3096a949625f..7b535f33bf7e3 100644 --- a/src/test/rustdoc/issue-28927.rs +++ b/src/test/rustdoc/issue-28927.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-28927-2.rs // aux-build:issue-28927-1.rs // ignore-cross-compile diff --git a/src/test/rustdoc/issue-29449.rs b/src/test/rustdoc/issue-29449.rs index f296048e30b54..0d829cf6fcffe 100644 --- a/src/test/rustdoc/issue-29449.rs +++ b/src/test/rustdoc/issue-29449.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // @has issue_29449/struct.Foo.html pub struct Foo; diff --git a/src/test/rustdoc/issue-29503.rs b/src/test/rustdoc/issue-29503.rs index d8b484f6b501b..50f4b78ac60d9 100644 --- a/src/test/rustdoc/issue-29503.rs +++ b/src/test/rustdoc/issue-29503.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt; // @has issue_29503/trait.MyTrait.html diff --git a/src/test/rustdoc/issue-29584.rs b/src/test/rustdoc/issue-29584.rs index 0b5ef7fca8e4c..28e1efec608dc 100644 --- a/src/test/rustdoc/issue-29584.rs +++ b/src/test/rustdoc/issue-29584.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-29584.rs // ignore-cross-compile diff --git a/src/test/rustdoc/issue-30109.rs b/src/test/rustdoc/issue-30109.rs index 2d33e9323d149..e9447538ad782 100644 --- a/src/test/rustdoc/issue-30109.rs +++ b/src/test/rustdoc/issue-30109.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // build-aux-docs // aux-build:issue-30109-1.rs // ignore-cross-compile diff --git a/src/test/rustdoc/issue-30252.rs b/src/test/rustdoc/issue-30252.rs index 11d161fe188e9..c3777362a66d9 100644 --- a/src/test/rustdoc/issue-30252.rs +++ b/src/test/rustdoc/issue-30252.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:--test --cfg feature="bar" /// ```rust diff --git a/src/test/rustdoc/issue-30366.rs b/src/test/rustdoc/issue-30366.rs index e622257b8f00a..c6274a058b0e5 100644 --- a/src/test/rustdoc/issue-30366.rs +++ b/src/test/rustdoc/issue-30366.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // @has issue_30366/index.html '//a/@href' 'http://www.rust-lang.org/' /// Describe it. [Link somewhere][1]. diff --git a/src/test/rustdoc/issue-31808.rs b/src/test/rustdoc/issue-31808.rs index 20105babfd92d..e55c5bd4f7cee 100644 --- a/src/test/rustdoc/issue-31808.rs +++ b/src/test/rustdoc/issue-31808.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that associated item impls on primitive types don't crash rustdoc pub trait Foo { diff --git a/src/test/rustdoc/issue-31899.rs b/src/test/rustdoc/issue-31899.rs index 0722dc4e052e1..e7a8ee239e2f9 100644 --- a/src/test/rustdoc/issue-31899.rs +++ b/src/test/rustdoc/issue-31899.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // @has issue_31899/index.html // @has - 'Make this line a bit longer.' // @!has - 'rust rust-example-rendered' diff --git a/src/test/rustdoc/issue-32374.rs b/src/test/rustdoc/issue-32374.rs index 6d1f8bc1cf9ba..636f958e6ee40 100644 --- a/src/test/rustdoc/issue-32374.rs +++ b/src/test/rustdoc/issue-32374.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(staged_api)] #![doc(issue_tracker_base_url = "http://issue_url/")] diff --git a/src/test/rustdoc/issue-32395.rs b/src/test/rustdoc/issue-32395.rs index 672c8757049d9..91d185796139c 100644 --- a/src/test/rustdoc/issue-32395.rs +++ b/src/test/rustdoc/issue-32395.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:variant-struct.rs // build-aux-docs // ignore-cross-compile diff --git a/src/test/rustdoc/issue-32556.rs b/src/test/rustdoc/issue-32556.rs index 3ab138079a1f0..e1cf115099726 100644 --- a/src/test/rustdoc/issue-32556.rs +++ b/src/test/rustdoc/issue-32556.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// Blah blah blah /// ```ignore (testing rustdoc's handling of ignore) /// bad_assert!(); diff --git a/src/test/rustdoc/issue-32890.rs b/src/test/rustdoc/issue-32890.rs index ef62f12d55e3c..970954433ec72 100644 --- a/src/test/rustdoc/issue-32890.rs +++ b/src/test/rustdoc/issue-32890.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // @has issue_32890/struct.Foo.html pub struct Foo(T); diff --git a/src/test/rustdoc/issue-33069.rs b/src/test/rustdoc/issue-33069.rs index cd227fdef56dd..0213a53cab5d7 100644 --- a/src/test/rustdoc/issue-33069.rs +++ b/src/test/rustdoc/issue-33069.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Bar {} #[doc(hidden)] diff --git a/src/test/rustdoc/issue-33178-1.rs b/src/test/rustdoc/issue-33178-1.rs index a368d6b68b9aa..4dc425346abb2 100644 --- a/src/test/rustdoc/issue-33178-1.rs +++ b/src/test/rustdoc/issue-33178-1.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:empty.rs // aux-build:variant-struct.rs // ignore-cross-compile diff --git a/src/test/rustdoc/issue-33178.rs b/src/test/rustdoc/issue-33178.rs index 2ecb7d9ec44f3..1f45fe7239186 100644 --- a/src/test/rustdoc/issue-33178.rs +++ b/src/test/rustdoc/issue-33178.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:empty.rs // aux-build:variant-struct.rs // build-aux-docs diff --git a/src/test/rustdoc/issue-33302.rs b/src/test/rustdoc/issue-33302.rs index a6ff001b96fb3..9d9caa02a2c4c 100644 --- a/src/test/rustdoc/issue-33302.rs +++ b/src/test/rustdoc/issue-33302.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Ensure constant and array length values are not taken from source // code, which wreaks havoc with macros. diff --git a/src/test/rustdoc/issue-33592.rs b/src/test/rustdoc/issue-33592.rs index c0de4cc38e41e..81450f15c2078 100644 --- a/src/test/rustdoc/issue-33592.rs +++ b/src/test/rustdoc/issue-33592.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] pub trait Foo {} diff --git a/src/test/rustdoc/issue-34025.rs b/src/test/rustdoc/issue-34025.rs index 8c0a7703c91da..9b9f21cb31694 100644 --- a/src/test/rustdoc/issue-34025.rs +++ b/src/test/rustdoc/issue-34025.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] // @!has 'foo/sys/index.html' diff --git a/src/test/rustdoc/issue-34274.rs b/src/test/rustdoc/issue-34274.rs index 12f880421616f..6b96223da2614 100644 --- a/src/test/rustdoc/issue-34274.rs +++ b/src/test/rustdoc/issue-34274.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-34274.rs // build-aux-docs // ignore-cross-compile diff --git a/src/test/rustdoc/issue-34423.rs b/src/test/rustdoc/issue-34423.rs index 460462d8a6610..b429bf8c9ba73 100644 --- a/src/test/rustdoc/issue-34423.rs +++ b/src/test/rustdoc/issue-34423.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Foo; pub trait Bar { diff --git a/src/test/rustdoc/issue-34473.rs b/src/test/rustdoc/issue-34473.rs index a6de638854f65..3f824e6404431 100644 --- a/src/test/rustdoc/issue-34473.rs +++ b/src/test/rustdoc/issue-34473.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] mod second { diff --git a/src/test/rustdoc/issue-34928.rs b/src/test/rustdoc/issue-34928.rs index b2104a0c80f5d..4184086f622ab 100644 --- a/src/test/rustdoc/issue-34928.rs +++ b/src/test/rustdoc/issue-34928.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] pub trait Bar {} diff --git a/src/test/rustdoc/issue-35169-2.rs b/src/test/rustdoc/issue-35169-2.rs index b19fbaa5b9535..0caead100d666 100644 --- a/src/test/rustdoc/issue-35169-2.rs +++ b/src/test/rustdoc/issue-35169-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::Deref; use std::ops::DerefMut; diff --git a/src/test/rustdoc/issue-35169.rs b/src/test/rustdoc/issue-35169.rs index 95231f282e3ed..0978b103076fe 100644 --- a/src/test/rustdoc/issue-35169.rs +++ b/src/test/rustdoc/issue-35169.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::Deref; pub struct Foo; diff --git a/src/test/rustdoc/issue-35488.rs b/src/test/rustdoc/issue-35488.rs index f24166a65f05b..c1bf9ceeac1cc 100644 --- a/src/test/rustdoc/issue-35488.rs +++ b/src/test/rustdoc/issue-35488.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod foo { pub enum Foo { Bar, diff --git a/src/test/rustdoc/issue-36031.rs b/src/test/rustdoc/issue-36031.rs index b025230f91820..af1b32fd22b17 100644 --- a/src/test/rustdoc/issue-36031.rs +++ b/src/test/rustdoc/issue-36031.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-36031.rs // build-aux-docs // ignore-cross-compile diff --git a/src/test/rustdoc/issue-38129.rs b/src/test/rustdoc/issue-38129.rs index 00ccc74d8874d..bf9d5e433046b 100644 --- a/src/test/rustdoc/issue-38129.rs +++ b/src/test/rustdoc/issue-38129.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:--test // This file tests the source-partitioning behavior of rustdoc. diff --git a/src/test/rustdoc/issue-38219.rs b/src/test/rustdoc/issue-38219.rs index 19b338bf560d0..fa57c58c76184 100644 --- a/src/test/rustdoc/issue-38219.rs +++ b/src/test/rustdoc/issue-38219.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:--test // should-fail diff --git a/src/test/rustdoc/issue-40936.rs b/src/test/rustdoc/issue-40936.rs index 3e02eec1b9c30..4d2e4c17b1f9e 100644 --- a/src/test/rustdoc/issue-40936.rs +++ b/src/test/rustdoc/issue-40936.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-40936.rs // build-aux-docs diff --git a/src/test/rustdoc/issue-41783.rs b/src/test/rustdoc/issue-41783.rs index 991cf4cf2b375..cb9b9b1538951 100644 --- a/src/test/rustdoc/issue-41783.rs +++ b/src/test/rustdoc/issue-41783.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // @has issue_41783/struct.Foo.html // @!has - 'space' // @!has - 'comment' diff --git a/src/test/rustdoc/issue-42760.rs b/src/test/rustdoc/issue-42760.rs index f5f5c4f97fd02..b07dc3f6e967b 100644 --- a/src/test/rustdoc/issue-42760.rs +++ b/src/test/rustdoc/issue-42760.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // @has issue_42760/struct.NonGen.html // @has - '//h1' 'Example' diff --git a/src/test/rustdoc/issue-42875.rs b/src/test/rustdoc/issue-42875.rs index ebf7056755eab..292c2077688de 100644 --- a/src/test/rustdoc/issue-42875.rs +++ b/src/test/rustdoc/issue-42875.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --no-defaults #![crate_name = "foo"] diff --git a/src/test/rustdoc/issue-43153.rs b/src/test/rustdoc/issue-43153.rs index 6ac341d8b0224..0fe680f10af34 100644 --- a/src/test/rustdoc/issue-43153.rs +++ b/src/test/rustdoc/issue-43153.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that `include!` in a doc test searches relative to the directory in // which the test is declared. diff --git a/src/test/rustdoc/issue-43701.rs b/src/test/rustdoc/issue-43701.rs index 791d83195990d..44335e961f90d 100644 --- a/src/test/rustdoc/issue-43701.rs +++ b/src/test/rustdoc/issue-43701.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] pub use std::vec::Vec; diff --git a/src/test/rustdoc/issue-43869.rs b/src/test/rustdoc/issue-43869.rs index a5ed3d892ce92..44356848fbfad 100644 --- a/src/test/rustdoc/issue-43869.rs +++ b/src/test/rustdoc/issue-43869.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn g() -> impl Iterator { Some(1u8).into_iter() } diff --git a/src/test/rustdoc/issue-43893.rs b/src/test/rustdoc/issue-43893.rs index a5e343ade3863..61e9407590721 100644 --- a/src/test/rustdoc/issue-43893.rs +++ b/src/test/rustdoc/issue-43893.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cross-compile #![crate_name = "foo"] diff --git a/src/test/rustdoc/issue-45584.rs b/src/test/rustdoc/issue-45584.rs index b0e64557be253..cd8c275d8527b 100644 --- a/src/test/rustdoc/issue-45584.rs +++ b/src/test/rustdoc/issue-45584.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] pub trait Bar {} diff --git a/src/test/rustdoc/issue-46271.rs b/src/test/rustdoc/issue-46271.rs index cc3be08c5688d..b38ef20c551fb 100644 --- a/src/test/rustdoc/issue-46271.rs +++ b/src/test/rustdoc/issue-46271.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // hopefully this doesn't cause an ICE pub fn foo() { diff --git a/src/test/rustdoc/issue-46377.rs b/src/test/rustdoc/issue-46377.rs index db8c7660df1d8..236afb20be53e 100644 --- a/src/test/rustdoc/issue-46377.rs +++ b/src/test/rustdoc/issue-46377.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // @has 'issue_46377/index.html' '//*[@class="docblock-short"]' 'Check out this struct!' /// # Check out this struct! pub struct SomeStruct; diff --git a/src/test/rustdoc/issue-46380-2.rs b/src/test/rustdoc/issue-46380-2.rs index 22408d3522a4b..7004d18dc66c9 100644 --- a/src/test/rustdoc/issue-46380-2.rs +++ b/src/test/rustdoc/issue-46380-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait PublicTrait {} // @has issue_46380_2/struct.PublicStruct.html diff --git a/src/test/rustdoc/issue-46380.rs b/src/test/rustdoc/issue-46380.rs index 85f29ec4b02d1..8837a6b463e88 100644 --- a/src/test/rustdoc/issue-46380.rs +++ b/src/test/rustdoc/issue-46380.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --document-private-items // @has issue_46380/struct.Hidden.html diff --git a/src/test/rustdoc/issue-46727.rs b/src/test/rustdoc/issue-46727.rs index 5b202d8c4fe88..0f991cf676ff7 100644 --- a/src/test/rustdoc/issue-46727.rs +++ b/src/test/rustdoc/issue-46727.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-46727.rs extern crate issue_46727; diff --git a/src/test/rustdoc/issue-46766.rs b/src/test/rustdoc/issue-46766.rs index cf2dd58f45bff..36ab739565b8e 100644 --- a/src/test/rustdoc/issue-46766.rs +++ b/src/test/rustdoc/issue-46766.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] pub enum Enum{Variant} diff --git a/src/test/rustdoc/issue-46767.rs b/src/test/rustdoc/issue-46767.rs index 855de150b0a37..77fe5d9972f77 100644 --- a/src/test/rustdoc/issue-46767.rs +++ b/src/test/rustdoc/issue-46767.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] mod private { diff --git a/src/test/rustdoc/issue-46976.rs b/src/test/rustdoc/issue-46976.rs index ce09f62a552d7..c59f8c72e64c2 100644 --- a/src/test/rustdoc/issue-46976.rs +++ b/src/test/rustdoc/issue-46976.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn ice(f: impl Fn()) {} diff --git a/src/test/rustdoc/issue-47038.rs b/src/test/rustdoc/issue-47038.rs index 453cd663d2c8c..810ddca3eab80 100644 --- a/src/test/rustdoc/issue-47038.rs +++ b/src/test/rustdoc/issue-47038.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(decl_macro)] #![crate_name = "foo"] diff --git a/src/test/rustdoc/issue-47197-blank-line-in-doc-block.rs b/src/test/rustdoc/issue-47197-blank-line-in-doc-block.rs index 8c4d9845f561e..19994475de27c 100644 --- a/src/test/rustdoc/issue-47197-blank-line-in-doc-block.rs +++ b/src/test/rustdoc/issue-47197-blank-line-in-doc-block.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // @has issue_47197_blank_line_in_doc_block/fn.whose_woods_these_are_i_think_i_know.html /** diff --git a/src/test/rustdoc/issue-47639.rs b/src/test/rustdoc/issue-47639.rs index 167c3aaec4ab6..4b3456b86c5e6 100644 --- a/src/test/rustdoc/issue-47639.rs +++ b/src/test/rustdoc/issue-47639.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This should not ICE pub fn test() { macro_rules! foo { diff --git a/src/test/rustdoc/issue-48377.rs b/src/test/rustdoc/issue-48377.rs index d098b1a5b02f1..c32bcf380ea3b 100644 --- a/src/test/rustdoc/issue-48377.rs +++ b/src/test/rustdoc/issue-48377.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:--test //! This is a doc comment diff --git a/src/test/rustdoc/issue-48414.rs b/src/test/rustdoc/issue-48414.rs index 0136f9c4759c7..b35743d887bf3 100644 --- a/src/test/rustdoc/issue-48414.rs +++ b/src/test/rustdoc/issue-48414.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-48414.rs // ICE when resolving paths for a trait that linked to another trait, when both were in an external diff --git a/src/test/rustdoc/issue-51236.rs b/src/test/rustdoc/issue-51236.rs index 541a1c5e19f2a..b57a067f3d9b8 100644 --- a/src/test/rustdoc/issue-51236.rs +++ b/src/test/rustdoc/issue-51236.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::marker::PhantomData; pub mod traits { diff --git a/src/test/rustdoc/keyword.rs b/src/test/rustdoc/keyword.rs index b255ffddafac8..9648a473711fc 100644 --- a/src/test/rustdoc/keyword.rs +++ b/src/test/rustdoc/keyword.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] #![feature(doc_keyword)] diff --git a/src/test/rustdoc/line-breaks.rs b/src/test/rustdoc/line-breaks.rs index a1eabb515a5ce..29c16fcd4f8a3 100644 --- a/src/test/rustdoc/line-breaks.rs +++ b/src/test/rustdoc/line-breaks.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] use std::ops::Add; diff --git a/src/test/rustdoc/link-assoc-const.rs b/src/test/rustdoc/link-assoc-const.rs index aa7ef07d5c0c3..f9eb2b722d6e6 100644 --- a/src/test/rustdoc/link-assoc-const.rs +++ b/src/test/rustdoc/link-assoc-const.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] // @has foo/index.html '//a[@href="../foo/foo/constant.FIRSTCONST.html"]' 'foo::FIRSTCONST' diff --git a/src/test/rustdoc/link-title-escape.rs b/src/test/rustdoc/link-title-escape.rs index e10ff1a991705..29e82cba98d35 100644 --- a/src/test/rustdoc/link-title-escape.rs +++ b/src/test/rustdoc/link-title-escape.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] //! hello [foo] diff --git a/src/test/rustdoc/macros.rs b/src/test/rustdoc/macros.rs index 9aeeb71707c90..c66a2c845bfd8 100644 --- a/src/test/rustdoc/macros.rs +++ b/src/test/rustdoc/macros.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // @has macros/macro.my_macro.html //pre 'macro_rules! my_macro {' // @has - //pre '() => { ... };' // @has - //pre '($a:tt) => { ... };' diff --git a/src/test/rustdoc/manual_impl.rs b/src/test/rustdoc/manual_impl.rs index 54a8a76483341..43c6d072b33f6 100644 --- a/src/test/rustdoc/manual_impl.rs +++ b/src/test/rustdoc/manual_impl.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // @has manual_impl/trait.T.html // @has - '//*[@class="docblock"]' 'Docs associated with the trait definition.' // @has - '//*[@class="docblock"]' 'Docs associated with the trait a_method definition.' diff --git a/src/test/rustdoc/masked.rs b/src/test/rustdoc/masked.rs index 1f398da84e57e..c7ad690d66e3e 100644 --- a/src/test/rustdoc/masked.rs +++ b/src/test/rustdoc/masked.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:masked.rs #![feature(doc_masked)] diff --git a/src/test/rustdoc/method-list.rs b/src/test/rustdoc/method-list.rs index b7112885e888b..f84be3eb3f718 100644 --- a/src/test/rustdoc/method-list.rs +++ b/src/test/rustdoc/method-list.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength #![crate_name = "foo"] diff --git a/src/test/rustdoc/mod-stackoverflow.rs b/src/test/rustdoc/mod-stackoverflow.rs index 1e2f6dbe78045..45b1de2162d97 100644 --- a/src/test/rustdoc/mod-stackoverflow.rs +++ b/src/test/rustdoc/mod-stackoverflow.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:mod-stackoverflow.rs // ignore-cross-compile diff --git a/src/test/rustdoc/module-impls.rs b/src/test/rustdoc/module-impls.rs index 7be3c50073166..198b3446c61b7 100644 --- a/src/test/rustdoc/module-impls.rs +++ b/src/test/rustdoc/module-impls.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] pub use std::marker::Send; diff --git a/src/test/rustdoc/must-use.rs b/src/test/rustdoc/must-use.rs index e293675f5b05d..b52557fe220ee 100644 --- a/src/test/rustdoc/must-use.rs +++ b/src/test/rustdoc/must-use.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // @has must_use/struct.Struct.html //pre '#[must_use]' #[must_use] pub struct Struct { diff --git a/src/test/rustdoc/namespaces.rs b/src/test/rustdoc/namespaces.rs index ec1bc359ab028..ad828e5ee3e25 100644 --- a/src/test/rustdoc/namespaces.rs +++ b/src/test/rustdoc/namespaces.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // issue #34843: rustdoc prioritises documenting reexports from the type namespace mod inner { diff --git a/src/test/rustdoc/negative-impl-sidebar.rs b/src/test/rustdoc/negative-impl-sidebar.rs index dc27b26241d59..838ca0402e48a 100644 --- a/src/test/rustdoc/negative-impl-sidebar.rs +++ b/src/test/rustdoc/negative-impl-sidebar.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] #![crate_name = "foo"] diff --git a/src/test/rustdoc/negative-impl.rs b/src/test/rustdoc/negative-impl.rs index aadabb15d1d2d..8ac87f4f0cb97 100644 --- a/src/test/rustdoc/negative-impl.rs +++ b/src/test/rustdoc/negative-impl.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] // @matches negative_impl/struct.Alpha.html '//pre' "pub struct Alpha" diff --git a/src/test/rustdoc/no-run-still-checks-lints.rs b/src/test/rustdoc/no-run-still-checks-lints.rs index a9df3c3c7f265..9f7d1c8845dc7 100644 --- a/src/test/rustdoc/no-run-still-checks-lints.rs +++ b/src/test/rustdoc/no-run-still-checks-lints.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:--test // should-fail diff --git a/src/test/rustdoc/nul-error.rs b/src/test/rustdoc/nul-error.rs index 2c9d07f190d26..3d30f5f6b77f8 100644 --- a/src/test/rustdoc/nul-error.rs +++ b/src/test/rustdoc/nul-error.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // build-aux-docs // ignore-cross-compile diff --git a/src/test/rustdoc/playground-arg.rs b/src/test/rustdoc/playground-arg.rs index 478477dea61ed..fb1be7397e65d 100644 --- a/src/test/rustdoc/playground-arg.rs +++ b/src/test/rustdoc/playground-arg.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --playground-url=https://example.com/ -Z unstable-options // ignore-tidy-linelength diff --git a/src/test/rustdoc/playground-empty.rs b/src/test/rustdoc/playground-empty.rs index 00881a62dd0a8..229a571ebee07 100644 --- a/src/test/rustdoc/playground-empty.rs +++ b/src/test/rustdoc/playground-empty.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] #![doc(html_playground_url = "")] diff --git a/src/test/rustdoc/playground-none.rs b/src/test/rustdoc/playground-none.rs index 83c312d7ab220..ff51c68d8a22b 100644 --- a/src/test/rustdoc/playground-none.rs +++ b/src/test/rustdoc/playground-none.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] //! module docs diff --git a/src/test/rustdoc/playground.rs b/src/test/rustdoc/playground.rs index 9e7c3aa490180..1b76e6c885349 100644 --- a/src/test/rustdoc/playground.rs +++ b/src/test/rustdoc/playground.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength #![crate_name = "foo"] diff --git a/src/test/rustdoc/prim-title.rs b/src/test/rustdoc/prim-title.rs index 79a3e7f06be68..fa3fd512fada6 100644 --- a/src/test/rustdoc/prim-title.rs +++ b/src/test/rustdoc/prim-title.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] // @has foo/primitive.u8.html '//head/title' 'u8 - Rust' diff --git a/src/test/rustdoc/primitive-generic-impl.rs b/src/test/rustdoc/primitive-generic-impl.rs index b4351b8268c8b..5589507c27eec 100644 --- a/src/test/rustdoc/primitive-generic-impl.rs +++ b/src/test/rustdoc/primitive-generic-impl.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] // we need to reexport something from libstd so that `all_trait_implementations` is called. diff --git a/src/test/rustdoc/primitive-link.rs b/src/test/rustdoc/primitive-link.rs index b0cf8acc7c029..819ef05174a8a 100644 --- a/src/test/rustdoc/primitive-link.rs +++ b/src/test/rustdoc/primitive-link.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] // ignore-tidy-linelength diff --git a/src/test/rustdoc/primitive/primitive-generic-impl.rs b/src/test/rustdoc/primitive/primitive-generic-impl.rs index 1ac1fc95338af..b9c56be0fcffc 100644 --- a/src/test/rustdoc/primitive/primitive-generic-impl.rs +++ b/src/test/rustdoc/primitive/primitive-generic-impl.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[doc(primitive = "i32")] /// Some useless docs, wouhou! mod i32 {} diff --git a/src/test/rustdoc/private-type-alias.rs b/src/test/rustdoc/private-type-alias.rs index 6371908000125..ec7385404f0b2 100644 --- a/src/test/rustdoc/private-type-alias.rs +++ b/src/test/rustdoc/private-type-alias.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - type MyResultPriv = Result; pub type MyResultPub = Result; diff --git a/src/test/rustdoc/pub-method.rs b/src/test/rustdoc/pub-method.rs index 24d566e082eea..01e5141fe2584 100644 --- a/src/test/rustdoc/pub-method.rs +++ b/src/test/rustdoc/pub-method.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags: --document-private-items diff --git a/src/test/rustdoc/pub-restricted.rs b/src/test/rustdoc/pub-restricted.rs index cc8f628cad44b..f75dcc200bdfc 100644 --- a/src/test/rustdoc/pub-restricted.rs +++ b/src/test/rustdoc/pub-restricted.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // compile-flags: --document-private-items diff --git a/src/test/rustdoc/pub-use-extern-macros.rs b/src/test/rustdoc/pub-use-extern-macros.rs index 48fb9bfd2075e..eefe6b4b07361 100644 --- a/src/test/rustdoc/pub-use-extern-macros.rs +++ b/src/test/rustdoc/pub-use-extern-macros.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:pub-use-extern-macros.rs extern crate macros; diff --git a/src/test/rustdoc/recursion1.rs b/src/test/rustdoc/recursion1.rs index 00f7d90fabc38..edf7e440fe7c4 100644 --- a/src/test/rustdoc/recursion1.rs +++ b/src/test/rustdoc/recursion1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] mod m { diff --git a/src/test/rustdoc/recursion2.rs b/src/test/rustdoc/recursion2.rs index 00f7d90fabc38..edf7e440fe7c4 100644 --- a/src/test/rustdoc/recursion2.rs +++ b/src/test/rustdoc/recursion2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] mod m { diff --git a/src/test/rustdoc/recursion3.rs b/src/test/rustdoc/recursion3.rs index 1d9b903a27920..e69b4301646b7 100644 --- a/src/test/rustdoc/recursion3.rs +++ b/src/test/rustdoc/recursion3.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod longhands { pub use super::*; diff --git a/src/test/rustdoc/redirect-const.rs b/src/test/rustdoc/redirect-const.rs index c95e5537c8879..453da8387eadc 100644 --- a/src/test/rustdoc/redirect-const.rs +++ b/src/test/rustdoc/redirect-const.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name="foo"] pub use hidden::STATIC_FOO; diff --git a/src/test/rustdoc/redirect-rename.rs b/src/test/rustdoc/redirect-rename.rs index b7c702dcc1fc5..7de56080e52b9 100644 --- a/src/test/rustdoc/redirect-rename.rs +++ b/src/test/rustdoc/redirect-rename.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] mod hidden { diff --git a/src/test/rustdoc/redirect.rs b/src/test/rustdoc/redirect.rs index 98e66e8c024bd..266b9e798950f 100644 --- a/src/test/rustdoc/redirect.rs +++ b/src/test/rustdoc/redirect.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:reexp_stripped.rs // build-aux-docs // ignore-cross-compile diff --git a/src/test/rustdoc/remove-duplicates.rs b/src/test/rustdoc/remove-duplicates.rs index 6c4f6d0700a53..759bf84db6211 100644 --- a/src/test/rustdoc/remove-duplicates.rs +++ b/src/test/rustdoc/remove-duplicates.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] mod foo { diff --git a/src/test/rustdoc/rustc-macro-crate.rs b/src/test/rustdoc/rustc-macro-crate.rs index d46f968441172..15149eb82e45f 100644 --- a/src/test/rustdoc/rustc-macro-crate.rs +++ b/src/test/rustdoc/rustc-macro-crate.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic // ignore-stage1 diff --git a/src/test/rustdoc/search-index-summaries.rs b/src/test/rustdoc/search-index-summaries.rs index dd195dc33e499..dd9c1a0b47dfc 100644 --- a/src/test/rustdoc/search-index-summaries.rs +++ b/src/test/rustdoc/search-index-summaries.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] // @has 'search-index.js' 'Foo short link.' diff --git a/src/test/rustdoc/search-index.rs b/src/test/rustdoc/search-index.rs index 70b77f6760d8b..f1b78f17277d1 100644 --- a/src/test/rustdoc/search-index.rs +++ b/src/test/rustdoc/search-index.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "rustdoc_test"] use std::ops::Deref; diff --git a/src/test/rustdoc/short-dockblock.rs b/src/test/rustdoc/short-dockblock.rs index cb36110b2912a..5493bca54c5dc 100644 --- a/src/test/rustdoc/short-dockblock.rs +++ b/src/test/rustdoc/short-dockblock.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] // @has foo/index.html '//*[@class="docblock-short"]/p' 'fooo' diff --git a/src/test/rustdoc/sidebar-items.rs b/src/test/rustdoc/sidebar-items.rs index 3ecd6b63510f5..3ba6dbacc8d32 100644 --- a/src/test/rustdoc/sidebar-items.rs +++ b/src/test/rustdoc/sidebar-items.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] // @has foo/trait.Foo.html diff --git a/src/test/rustdoc/smoke.rs b/src/test/rustdoc/smoke.rs index 6ba7018bf226f..c1ed3a0c95351 100644 --- a/src/test/rustdoc/smoke.rs +++ b/src/test/rustdoc/smoke.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // @has smoke/index.html //! Very docs diff --git a/src/test/rustdoc/sort-modules-by-appearance.rs b/src/test/rustdoc/sort-modules-by-appearance.rs index abffe6fb95b99..5be6b98264a10 100644 --- a/src/test/rustdoc/sort-modules-by-appearance.rs +++ b/src/test/rustdoc/sort-modules-by-appearance.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests the rustdoc --sort-modules-by-appearance option, that allows module declarations to appear // in the order they are declared in the source code, rather than only alphabetically. diff --git a/src/test/rustdoc/src-links-external.rs b/src/test/rustdoc/src-links-external.rs index d3307bb4d42c1..171dc3fe10c4d 100644 --- a/src/test/rustdoc/src-links-external.rs +++ b/src/test/rustdoc/src-links-external.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:src-links-external.rs // build-aux-docs // ignore-cross-compile diff --git a/src/test/rustdoc/src-links.rs b/src/test/rustdoc/src-links.rs index e946e2423167a..902a319a7b906 100644 --- a/src/test/rustdoc/src-links.rs +++ b/src/test/rustdoc/src-links.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] //! Dox diff --git a/src/test/rustdoc/src-links/mod.rs b/src/test/rustdoc/src-links/mod.rs index eb5e737b369f9..27b2396811a66 100644 --- a/src/test/rustdoc/src-links/mod.rs +++ b/src/test/rustdoc/src-links/mod.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Dox pub mod bar { diff --git a/src/test/rustdoc/struct-field.rs b/src/test/rustdoc/struct-field.rs index c5016bac7d394..c99169fbca57f 100644 --- a/src/test/rustdoc/struct-field.rs +++ b/src/test/rustdoc/struct-field.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] // ignore-tidy-linelength diff --git a/src/test/rustdoc/structfields.rs b/src/test/rustdoc/structfields.rs index 75d9be856d74c..35cea8afe2146 100644 --- a/src/test/rustdoc/structfields.rs +++ b/src/test/rustdoc/structfields.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // @has structfields/Foo.t.html // @has - struct.Foo.html // @has structfields/struct.Foo.html diff --git a/src/test/rustdoc/synthetic_auto/basic.rs b/src/test/rustdoc/synthetic_auto/basic.rs index 8ff84d11a5009..d5f1269d08a4c 100644 --- a/src/test/rustdoc/synthetic_auto/basic.rs +++ b/src/test/rustdoc/synthetic_auto/basic.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // @has basic/struct.Foo.html // @has - '//code' 'impl Send for Foo where T: Send' // @has - '//code' 'impl Sync for Foo where T: Sync' diff --git a/src/test/rustdoc/synthetic_auto/complex.rs b/src/test/rustdoc/synthetic_auto/complex.rs index a4ebf6d3a7e83..d2533a2dd390e 100644 --- a/src/test/rustdoc/synthetic_auto/complex.rs +++ b/src/test/rustdoc/synthetic_auto/complex.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod foo { pub trait MyTrait<'a> { type MyItem: ?Sized; diff --git a/src/test/rustdoc/synthetic_auto/lifetimes.rs b/src/test/rustdoc/synthetic_auto/lifetimes.rs index 1c1e7bc250526..03b84c7838edc 100644 --- a/src/test/rustdoc/synthetic_auto/lifetimes.rs +++ b/src/test/rustdoc/synthetic_auto/lifetimes.rs @@ -1,12 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. pub struct Inner<'a, T: 'a> { field: &'a T, } diff --git a/src/test/rustdoc/synthetic_auto/manual.rs b/src/test/rustdoc/synthetic_auto/manual.rs index ef6797ecf3c54..c7cfa0c0fa1b8 100644 --- a/src/test/rustdoc/synthetic_auto/manual.rs +++ b/src/test/rustdoc/synthetic_auto/manual.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // @has manual/struct.Foo.html // @has - '//*[@id="synthetic-implementations-list"]/*[@class="impl"]//*/code' 'impl Sync for \ // Foo where T: Sync' diff --git a/src/test/rustdoc/synthetic_auto/negative.rs b/src/test/rustdoc/synthetic_auto/negative.rs index 64480d28240b6..5b6304ed4e471 100644 --- a/src/test/rustdoc/synthetic_auto/negative.rs +++ b/src/test/rustdoc/synthetic_auto/negative.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Inner { field: *mut T, } diff --git a/src/test/rustdoc/synthetic_auto/nested.rs b/src/test/rustdoc/synthetic_auto/nested.rs index ccdbe159b6c5a..75d2ff2af13e1 100644 --- a/src/test/rustdoc/synthetic_auto/nested.rs +++ b/src/test/rustdoc/synthetic_auto/nested.rs @@ -1,12 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. pub struct Inner { field: T, } diff --git a/src/test/rustdoc/synthetic_auto/no-redundancy.rs b/src/test/rustdoc/synthetic_auto/no-redundancy.rs index 24fba221b9937..92402714b9d51 100644 --- a/src/test/rustdoc/synthetic_auto/no-redundancy.rs +++ b/src/test/rustdoc/synthetic_auto/no-redundancy.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Inner { field: T, } diff --git a/src/test/rustdoc/synthetic_auto/project.rs b/src/test/rustdoc/synthetic_auto/project.rs index d588190c4f9d2..6be6b44a4400a 100644 --- a/src/test/rustdoc/synthetic_auto/project.rs +++ b/src/test/rustdoc/synthetic_auto/project.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Inner<'a, T: 'a> { field: &'a T, } diff --git a/src/test/rustdoc/synthetic_auto/static-region.rs b/src/test/rustdoc/synthetic_auto/static-region.rs index 96e8b8ed5f695..d1d50fbc6ba15 100644 --- a/src/test/rustdoc/synthetic_auto/static-region.rs +++ b/src/test/rustdoc/synthetic_auto/static-region.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait OwnedTrait<'a> { type Reader; } diff --git a/src/test/rustdoc/test-lists.rs b/src/test/rustdoc/test-lists.rs index 29f157e0425c9..6a510b9ac5d1c 100644 --- a/src/test/rustdoc/test-lists.rs +++ b/src/test/rustdoc/test-lists.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] // @has foo/fn.f.html diff --git a/src/test/rustdoc/test-parens.rs b/src/test/rustdoc/test-parens.rs index 792dc9c218d56..86919ba877074 100644 --- a/src/test/rustdoc/test-parens.rs +++ b/src/test/rustdoc/test-parens.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] // @has foo/fn.foo.html diff --git a/src/test/rustdoc/test_option_check/bar.rs b/src/test/rustdoc/test_option_check/bar.rs index 51daa80752622..50a182cf7e049 100644 --- a/src/test/rustdoc/test_option_check/bar.rs +++ b/src/test/rustdoc/test_option_check/bar.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --test // check-test-line-numbers-match diff --git a/src/test/rustdoc/test_option_check/test.rs b/src/test/rustdoc/test_option_check/test.rs index a9578c5f434a2..964e8e37ed581 100644 --- a/src/test/rustdoc/test_option_check/test.rs +++ b/src/test/rustdoc/test_option_check/test.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --test // check-test-line-numbers-match diff --git a/src/test/rustdoc/titles.rs b/src/test/rustdoc/titles.rs index a56fa420944f7..3b4c42d865d06 100644 --- a/src/test/rustdoc/titles.rs +++ b/src/test/rustdoc/titles.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] // @matches 'foo/index.html' '//h1' 'Crate foo' diff --git a/src/test/rustdoc/trait-attributes.rs b/src/test/rustdoc/trait-attributes.rs index 00d10408b4c91..971e6b554cca7 100644 --- a/src/test/rustdoc/trait-attributes.rs +++ b/src/test/rustdoc/trait-attributes.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] // ignore-tidy-linelength diff --git a/src/test/rustdoc/trait-self-link.rs b/src/test/rustdoc/trait-self-link.rs index 3233fb96c5c35..51e1fe91f9672 100644 --- a/src/test/rustdoc/trait-self-link.rs +++ b/src/test/rustdoc/trait-self-link.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // @!has trait_self_link/trait.Foo.html //a/@href ../trait_self_link/trait.Foo.html pub trait Foo {} diff --git a/src/test/rustdoc/traits-in-bodies.rs b/src/test/rustdoc/traits-in-bodies.rs index 3acf4af5fd247..270437a5bc557 100644 --- a/src/test/rustdoc/traits-in-bodies.rs +++ b/src/test/rustdoc/traits-in-bodies.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //prior to fixing `everybody_loops` to preserve items, rustdoc would crash on this file, as it //didn't see that `SomeStruct` implemented `Clone` diff --git a/src/test/rustdoc/tuples.rs b/src/test/rustdoc/tuples.rs index 2269b38780df0..53654abff2a8e 100644 --- a/src/test/rustdoc/tuples.rs +++ b/src/test/rustdoc/tuples.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] // @has foo/fn.tuple0.html //pre 'pub fn tuple0(x: ())' diff --git a/src/test/rustdoc/typedef.rs b/src/test/rustdoc/typedef.rs index 4ac91d3545149..80351ff52f5cc 100644 --- a/src/test/rustdoc/typedef.rs +++ b/src/test/rustdoc/typedef.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait MyTrait { fn method_on_mytrait() {} } diff --git a/src/test/rustdoc/union.rs b/src/test/rustdoc/union.rs index 2eb25d9b7ddac..8918622773205 100644 --- a/src/test/rustdoc/union.rs +++ b/src/test/rustdoc/union.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // @has union/union.U.html pub union U { // @has - //pre "pub a: u8" diff --git a/src/test/rustdoc/unit-return.rs b/src/test/rustdoc/unit-return.rs index 757e8979edd4f..ae3a6031519fb 100644 --- a/src/test/rustdoc/unit-return.rs +++ b/src/test/rustdoc/unit-return.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:unit-return.rs #![crate_name = "foo"] diff --git a/src/test/rustdoc/universal-impl-trait.rs b/src/test/rustdoc/universal-impl-trait.rs index 1c1124282d478..b10b1b8658db9 100644 --- a/src/test/rustdoc/universal-impl-trait.rs +++ b/src/test/rustdoc/universal-impl-trait.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] use std::io::Read; diff --git a/src/test/rustdoc/unneeded-trait-implementations-title.rs b/src/test/rustdoc/unneeded-trait-implementations-title.rs index 2c074179e32b5..ac9f4e4aba3e1 100644 --- a/src/test/rustdoc/unneeded-trait-implementations-title.rs +++ b/src/test/rustdoc/unneeded-trait-implementations-title.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] pub struct Bar; diff --git a/src/test/rustdoc/variadic.rs b/src/test/rustdoc/variadic.rs index 6ba776ba4679f..bd8f1775b3d04 100644 --- a/src/test/rustdoc/variadic.rs +++ b/src/test/rustdoc/variadic.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern "C" { // @has variadic/fn.foo.html //pre 'pub unsafe extern "C" fn foo(x: i32, ...)' pub fn foo(x: i32, ...); diff --git a/src/test/rustdoc/viewpath-rename.rs b/src/test/rustdoc/viewpath-rename.rs index 4b6843d33f7ac..546127637928b 100644 --- a/src/test/rustdoc/viewpath-rename.rs +++ b/src/test/rustdoc/viewpath-rename.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] pub mod io { diff --git a/src/test/rustdoc/viewpath-self.rs b/src/test/rustdoc/viewpath-self.rs index 000960ad972ab..a6b6592955fef 100644 --- a/src/test/rustdoc/viewpath-self.rs +++ b/src/test/rustdoc/viewpath-self.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] pub mod io { diff --git a/src/test/rustdoc/where-sized.rs b/src/test/rustdoc/where-sized.rs index c175c839c0f21..fe7cad8c3ef84 100644 --- a/src/test/rustdoc/where-sized.rs +++ b/src/test/rustdoc/where-sized.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] // @has foo/fn.foo.html diff --git a/src/test/rustdoc/where.rs b/src/test/rustdoc/where.rs index e691f7c5bea01..992cddfe72aaf 100644 --- a/src/test/rustdoc/where.rs +++ b/src/test/rustdoc/where.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "foo"] pub trait MyTrait { fn dummy(&self) { } } diff --git a/src/test/rustfix/closure-immutable-outer-variable.rs b/src/test/rustfix/closure-immutable-outer-variable.rs index fe8e2bc6c8ed1..6ed1bc12cb521 100644 --- a/src/test/rustfix/closure-immutable-outer-variable.rs +++ b/src/test/rustfix/closure-immutable-outer-variable.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Point at the captured immutable outer variable fn foo(mut f: Box) { diff --git a/src/test/rustfix/empty-no-fixes.rs b/src/test/rustfix/empty-no-fixes.rs index 39e19566d7652..3724a00ce7ce0 100644 --- a/src/test/rustfix/empty-no-fixes.rs +++ b/src/test/rustfix/empty-no-fixes.rs @@ -1,11 +1 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:--crate-type lib diff --git a/src/test/rustfix/issue-45562.rs b/src/test/rustfix/issue-45562.rs index 39576e9c845e4..a1ac07044e2c2 100644 --- a/src/test/rustfix/issue-45562.rs +++ b/src/test/rustfix/issue-45562.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[no_mangle] pub const RAH: usize = 5; fn main() {} diff --git a/src/test/rustfix/issue-45799-bad-extern-crate-rename-suggestion-formatting.rs b/src/test/rustfix/issue-45799-bad-extern-crate-rename-suggestion-formatting.rs index 7c55f9c4eb9f0..a202b6c389a8c 100644 --- a/src/test/rustfix/issue-45799-bad-extern-crate-rename-suggestion-formatting.rs +++ b/src/test/rustfix/issue-45799-bad-extern-crate-rename-suggestion-formatting.rs @@ -1,12 +1,2 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate std; fn main() {} diff --git a/src/test/rustfix/issue-46756-consider-borrowing-cast-or-binexpr.rs b/src/test/rustfix/issue-46756-consider-borrowing-cast-or-binexpr.rs index d21681747e9d3..9c7ae9657c003 100644 --- a/src/test/rustfix/issue-46756-consider-borrowing-cast-or-binexpr.rs +++ b/src/test/rustfix/issue-46756-consider-borrowing-cast-or-binexpr.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused)] fn light_flows_our_war_of_mocking_words(and_yet: &usize) -> usize { diff --git a/src/test/rustfix/main-no-fixes.rs b/src/test/rustfix/main-no-fixes.rs index 3f07b46791d22..f328e4d9d04c3 100644 --- a/src/test/rustfix/main-no-fixes.rs +++ b/src/test/rustfix/main-no-fixes.rs @@ -1,11 +1 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() {} diff --git a/src/test/rustfix/missing-comma-in-match.rs b/src/test/rustfix/missing-comma-in-match.rs index 8ccad7b9c9411..fed796cffe6f9 100644 --- a/src/test/rustfix/missing-comma-in-match.rs +++ b/src/test/rustfix/missing-comma-in-match.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { match &Some(3) { &None => 1 diff --git a/src/test/rustfix/str-as-char.rs b/src/test/rustfix/str-as-char.rs index fa0e474fc7fb7..b446551fefa29 100644 --- a/src/test/rustfix/str-as-char.rs +++ b/src/test/rustfix/str-as-char.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { println!('●●'); } diff --git a/src/test/rustfix/tuple-float-index.rs b/src/test/rustfix/tuple-float-index.rs index 8bfbd0e74db22..f3280e87a01c2 100644 --- a/src/test/rustfix/tuple-float-index.rs +++ b/src/test/rustfix/tuple-float-index.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main () { diff --git a/src/test/ui-fulldeps/auxiliary/attr_proc_macro.rs b/src/test/ui-fulldeps/auxiliary/attr_proc_macro.rs index 679cb7728680d..b1f54be6bac4b 100644 --- a/src/test/ui-fulldeps/auxiliary/attr_proc_macro.rs +++ b/src/test/ui-fulldeps/auxiliary/attr_proc_macro.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host // no-prefer-dynamic diff --git a/src/test/ui-fulldeps/auxiliary/bang_proc_macro.rs b/src/test/ui-fulldeps/auxiliary/bang_proc_macro.rs index 6484725814a10..16f3b7640290d 100644 --- a/src/test/ui-fulldeps/auxiliary/bang_proc_macro.rs +++ b/src/test/ui-fulldeps/auxiliary/bang_proc_macro.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host // no-prefer-dynamic diff --git a/src/test/ui-fulldeps/auxiliary/derive-clona.rs b/src/test/ui-fulldeps/auxiliary/derive-clona.rs index 719fbdb15ef2a..4a35c9d0dbbda 100644 --- a/src/test/ui-fulldeps/auxiliary/derive-clona.rs +++ b/src/test/ui-fulldeps/auxiliary/derive-clona.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host // no-prefer-dynamic diff --git a/src/test/ui-fulldeps/auxiliary/derive-foo.rs b/src/test/ui-fulldeps/auxiliary/derive-foo.rs index 64dcf72ba2029..3ea027d4f5323 100644 --- a/src/test/ui-fulldeps/auxiliary/derive-foo.rs +++ b/src/test/ui-fulldeps/auxiliary/derive-foo.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host // no-prefer-dynamic diff --git a/src/test/ui-fulldeps/auxiliary/invalid-punct-ident.rs b/src/test/ui-fulldeps/auxiliary/invalid-punct-ident.rs index cc899fa610d13..518dfd0d688d7 100644 --- a/src/test/ui-fulldeps/auxiliary/invalid-punct-ident.rs +++ b/src/test/ui-fulldeps/auxiliary/invalid-punct-ident.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host // no-prefer-dynamic diff --git a/src/test/ui-fulldeps/auxiliary/lifetimes.rs b/src/test/ui-fulldeps/auxiliary/lifetimes.rs index fc59a622bfab0..2291fa6450860 100644 --- a/src/test/ui-fulldeps/auxiliary/lifetimes.rs +++ b/src/test/ui-fulldeps/auxiliary/lifetimes.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/ui-fulldeps/auxiliary/lint_group_plugin_test.rs b/src/test/ui-fulldeps/auxiliary/lint_group_plugin_test.rs index 8ccb5878c4045..75295cd0a5863 100644 --- a/src/test/ui-fulldeps/auxiliary/lint_group_plugin_test.rs +++ b/src/test/ui-fulldeps/auxiliary/lint_group_plugin_test.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host #![feature(plugin_registrar)] diff --git a/src/test/ui-fulldeps/auxiliary/lint_plugin_test.rs b/src/test/ui-fulldeps/auxiliary/lint_plugin_test.rs index 315dad7eea515..ce7f1f0347a78 100644 --- a/src/test/ui-fulldeps/auxiliary/lint_plugin_test.rs +++ b/src/test/ui-fulldeps/auxiliary/lint_plugin_test.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // force-host #![feature(plugin_registrar)] diff --git a/src/test/ui-fulldeps/auxiliary/lint_tool_test.rs b/src/test/ui-fulldeps/auxiliary/lint_tool_test.rs index d7895bd8781ba..3bd67a52aa400 100644 --- a/src/test/ui-fulldeps/auxiliary/lint_tool_test.rs +++ b/src/test/ui-fulldeps/auxiliary/lint_tool_test.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(plugin_registrar)] #![feature(box_syntax, rustc_private)] #![cfg_attr(stage0, feature(macro_vis_matcher))] diff --git a/src/test/ui-fulldeps/custom-derive/auxiliary/plugin.rs b/src/test/ui-fulldeps/custom-derive/auxiliary/plugin.rs index 7be909c3c9e87..a0a6bf7b55b0b 100644 --- a/src/test/ui-fulldeps/custom-derive/auxiliary/plugin.rs +++ b/src/test/ui-fulldeps/custom-derive/auxiliary/plugin.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/ui-fulldeps/custom-derive/issue-36935.rs b/src/test/ui-fulldeps/custom-derive/issue-36935.rs index 5ec79a5520009..b0d9102a41c67 100644 --- a/src/test/ui-fulldeps/custom-derive/issue-36935.rs +++ b/src/test/ui-fulldeps/custom-derive/issue-36935.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:plugin.rs // ignore-stage1 diff --git a/src/test/ui-fulldeps/custom-derive/issue-36935.stderr b/src/test/ui-fulldeps/custom-derive/issue-36935.stderr index ecbe0a9a0c079..d4c91546329ad 100644 --- a/src/test/ui-fulldeps/custom-derive/issue-36935.stderr +++ b/src/test/ui-fulldeps/custom-derive/issue-36935.stderr @@ -1,5 +1,5 @@ error: proc-macro derive panicked - --> $DIR/issue-36935.rs:16:15 + --> $DIR/issue-36935.rs:6:15 | LL | #[derive(Foo, Bar)] //~ ERROR proc-macro derive panicked | ^^^ diff --git a/src/test/ui-fulldeps/deprecated-derive.rs b/src/test/ui-fulldeps/deprecated-derive.rs index a728523d83267..6a0b2283aa39d 100644 --- a/src/test/ui-fulldeps/deprecated-derive.rs +++ b/src/test/ui-fulldeps/deprecated-derive.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass #![feature(rustc_private)] diff --git a/src/test/ui-fulldeps/deprecated-derive.stderr b/src/test/ui-fulldeps/deprecated-derive.stderr index df4bd7f752c1e..27762910e6a4d 100644 --- a/src/test/ui-fulldeps/deprecated-derive.stderr +++ b/src/test/ui-fulldeps/deprecated-derive.stderr @@ -1,5 +1,5 @@ warning: derive(Encodable) is deprecated in favor of derive(RustcEncodable) - --> $DIR/deprecated-derive.rs:18:10 + --> $DIR/deprecated-derive.rs:8:10 | LL | #[derive(Encodable)] | ^^^^^^^^^ diff --git a/src/test/ui-fulldeps/invalid-punct-ident-1.rs b/src/test/ui-fulldeps/invalid-punct-ident-1.rs index 576c156c1059e..2360b1fe8c0fc 100644 --- a/src/test/ui-fulldeps/invalid-punct-ident-1.rs +++ b/src/test/ui-fulldeps/invalid-punct-ident-1.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:invalid-punct-ident.rs #[macro_use] diff --git a/src/test/ui-fulldeps/invalid-punct-ident-1.stderr b/src/test/ui-fulldeps/invalid-punct-ident-1.stderr index 3b3619e2637f8..875941303787c 100644 --- a/src/test/ui-fulldeps/invalid-punct-ident-1.stderr +++ b/src/test/ui-fulldeps/invalid-punct-ident-1.stderr @@ -1,5 +1,5 @@ error: proc macro panicked - --> $DIR/invalid-punct-ident-1.rs:16:1 + --> $DIR/invalid-punct-ident-1.rs:6:1 | LL | invalid_punct!(); //~ ERROR proc macro panicked | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui-fulldeps/invalid-punct-ident-2.rs b/src/test/ui-fulldeps/invalid-punct-ident-2.rs index 874a7d169d19d..9593d47bb13b0 100644 --- a/src/test/ui-fulldeps/invalid-punct-ident-2.rs +++ b/src/test/ui-fulldeps/invalid-punct-ident-2.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:invalid-punct-ident.rs #[macro_use] diff --git a/src/test/ui-fulldeps/invalid-punct-ident-2.stderr b/src/test/ui-fulldeps/invalid-punct-ident-2.stderr index 869c0908bb51a..384d30650f10c 100644 --- a/src/test/ui-fulldeps/invalid-punct-ident-2.stderr +++ b/src/test/ui-fulldeps/invalid-punct-ident-2.stderr @@ -1,5 +1,5 @@ error: proc macro panicked - --> $DIR/invalid-punct-ident-2.rs:16:1 + --> $DIR/invalid-punct-ident-2.rs:6:1 | LL | invalid_ident!(); //~ ERROR proc macro panicked | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui-fulldeps/invalid-punct-ident-3.rs b/src/test/ui-fulldeps/invalid-punct-ident-3.rs index f73bf500545d5..75e3e06f881f3 100644 --- a/src/test/ui-fulldeps/invalid-punct-ident-3.rs +++ b/src/test/ui-fulldeps/invalid-punct-ident-3.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:invalid-punct-ident.rs #[macro_use] diff --git a/src/test/ui-fulldeps/invalid-punct-ident-3.stderr b/src/test/ui-fulldeps/invalid-punct-ident-3.stderr index 716f6ffa09820..fd34459e89766 100644 --- a/src/test/ui-fulldeps/invalid-punct-ident-3.stderr +++ b/src/test/ui-fulldeps/invalid-punct-ident-3.stderr @@ -1,5 +1,5 @@ error: proc macro panicked - --> $DIR/invalid-punct-ident-3.rs:16:1 + --> $DIR/invalid-punct-ident-3.rs:6:1 | LL | invalid_raw_ident!(); //~ ERROR proc macro panicked | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui-fulldeps/invalid-punct-ident-4.rs b/src/test/ui-fulldeps/invalid-punct-ident-4.rs index 1e93c69c6502c..5918782169597 100644 --- a/src/test/ui-fulldeps/invalid-punct-ident-4.rs +++ b/src/test/ui-fulldeps/invalid-punct-ident-4.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:invalid-punct-ident.rs #[macro_use] diff --git a/src/test/ui-fulldeps/invalid-punct-ident-4.stderr b/src/test/ui-fulldeps/invalid-punct-ident-4.stderr index 669a1eb583921..39eb64e555c14 100644 --- a/src/test/ui-fulldeps/invalid-punct-ident-4.stderr +++ b/src/test/ui-fulldeps/invalid-punct-ident-4.stderr @@ -1,11 +1,11 @@ error: unexpected close delimiter: `)` - --> $DIR/invalid-punct-ident-4.rs:16:1 + --> $DIR/invalid-punct-ident-4.rs:6:1 | LL | lexer_failure!(); //~ ERROR proc macro panicked | ^^^^^^^^^^^^^^^^^ unexpected close delimiter error: proc macro panicked - --> $DIR/invalid-punct-ident-4.rs:16:1 + --> $DIR/invalid-punct-ident-4.rs:6:1 | LL | lexer_failure!(); //~ ERROR proc macro panicked | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui-fulldeps/lifetimes.rs b/src/test/ui-fulldeps/lifetimes.rs index 6879848d269b0..591ee8facc5fd 100644 --- a/src/test/ui-fulldeps/lifetimes.rs +++ b/src/test/ui-fulldeps/lifetimes.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:lifetimes.rs #![feature(proc_macro_non_items)] diff --git a/src/test/ui-fulldeps/lifetimes.stderr b/src/test/ui-fulldeps/lifetimes.stderr index 6baf2b16998f1..c873ab68654b8 100644 --- a/src/test/ui-fulldeps/lifetimes.stderr +++ b/src/test/ui-fulldeps/lifetimes.stderr @@ -1,5 +1,5 @@ error: expected type, found `'` - --> $DIR/lifetimes.rs:19:10 + --> $DIR/lifetimes.rs:9:10 | LL | type A = single_quote_alone!(); //~ ERROR expected type, found `'` | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui-fulldeps/lint-group-plugin.rs b/src/test/ui-fulldeps/lint-group-plugin.rs index fee9f45972dfc..00c5a56a482c1 100644 --- a/src/test/ui-fulldeps/lint-group-plugin.rs +++ b/src/test/ui-fulldeps/lint-group-plugin.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass // aux-build:lint_group_plugin_test.rs // ignore-stage1 diff --git a/src/test/ui-fulldeps/lint-group-plugin.stderr b/src/test/ui-fulldeps/lint-group-plugin.stderr index 80a309f27e165..15cffedcc5d3c 100644 --- a/src/test/ui-fulldeps/lint-group-plugin.stderr +++ b/src/test/ui-fulldeps/lint-group-plugin.stderr @@ -1,5 +1,5 @@ warning: item is named 'lintme' - --> $DIR/lint-group-plugin.rs:18:1 + --> $DIR/lint-group-plugin.rs:8:1 | LL | fn lintme() { } //~ WARNING item is named 'lintme' | ^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | fn lintme() { } //~ WARNING item is named 'lintme' = note: #[warn(test_lint)] on by default warning: item is named 'pleaselintme' - --> $DIR/lint-group-plugin.rs:19:1 + --> $DIR/lint-group-plugin.rs:9:1 | LL | fn pleaselintme() { } //~ WARNING item is named 'pleaselintme' | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui-fulldeps/lint-plugin-cmdline-allow.rs b/src/test/ui-fulldeps/lint-plugin-cmdline-allow.rs index 19ce236213454..21042c5e7d084 100644 --- a/src/test/ui-fulldeps/lint-plugin-cmdline-allow.rs +++ b/src/test/ui-fulldeps/lint-plugin-cmdline-allow.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass // aux-build:lint_plugin_test.rs // ignore-stage1 diff --git a/src/test/ui-fulldeps/lint-plugin-cmdline-allow.stderr b/src/test/ui-fulldeps/lint-plugin-cmdline-allow.stderr index cda6ea8bb903b..a9b27beb7dfe8 100644 --- a/src/test/ui-fulldeps/lint-plugin-cmdline-allow.stderr +++ b/src/test/ui-fulldeps/lint-plugin-cmdline-allow.stderr @@ -1,11 +1,11 @@ warning: function is never used: `lintme` - --> $DIR/lint-plugin-cmdline-allow.rs:20:1 + --> $DIR/lint-plugin-cmdline-allow.rs:10:1 | LL | fn lintme() { } | ^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-plugin-cmdline-allow.rs:17:9 + --> $DIR/lint-plugin-cmdline-allow.rs:7:9 | LL | #![warn(unused)] | ^^^^^^ diff --git a/src/test/ui-fulldeps/lint-plugin-cmdline-load.rs b/src/test/ui-fulldeps/lint-plugin-cmdline-load.rs index 27ef9649cf34f..0dca00040bfe6 100644 --- a/src/test/ui-fulldeps/lint-plugin-cmdline-load.rs +++ b/src/test/ui-fulldeps/lint-plugin-cmdline-load.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass // aux-build:lint_plugin_test.rs // ignore-stage1 diff --git a/src/test/ui-fulldeps/lint-plugin-cmdline-load.stderr b/src/test/ui-fulldeps/lint-plugin-cmdline-load.stderr index 33c690a2d9f3e..1beb5b7816cb5 100644 --- a/src/test/ui-fulldeps/lint-plugin-cmdline-load.stderr +++ b/src/test/ui-fulldeps/lint-plugin-cmdline-load.stderr @@ -1,5 +1,5 @@ warning: item is named 'lintme' - --> $DIR/lint-plugin-cmdline-load.rs:18:1 + --> $DIR/lint-plugin-cmdline-load.rs:8:1 | LL | fn lintme() { } //~ WARNING item is named 'lintme' | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui-fulldeps/lint-plugin-forbid-attrs.rs b/src/test/ui-fulldeps/lint-plugin-forbid-attrs.rs index 21b8057431b86..964fed3b37d11 100644 --- a/src/test/ui-fulldeps/lint-plugin-forbid-attrs.rs +++ b/src/test/ui-fulldeps/lint-plugin-forbid-attrs.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:lint_plugin_test.rs // ignore-stage1 diff --git a/src/test/ui-fulldeps/lint-plugin-forbid-attrs.stderr b/src/test/ui-fulldeps/lint-plugin-forbid-attrs.stderr index 56d4a86096f68..11dd75621bf51 100644 --- a/src/test/ui-fulldeps/lint-plugin-forbid-attrs.stderr +++ b/src/test/ui-fulldeps/lint-plugin-forbid-attrs.stderr @@ -1,5 +1,5 @@ error[E0453]: allow(test_lint) overruled by outer forbid(test_lint) - --> $DIR/lint-plugin-forbid-attrs.rs:20:9 + --> $DIR/lint-plugin-forbid-attrs.rs:10:9 | LL | #![forbid(test_lint)] | --------- `forbid` level set here @@ -8,13 +8,13 @@ LL | #[allow(test_lint)] | ^^^^^^^^^ overruled by previous forbid error: item is named 'lintme' - --> $DIR/lint-plugin-forbid-attrs.rs:18:1 + --> $DIR/lint-plugin-forbid-attrs.rs:8:1 | LL | fn lintme() { } //~ ERROR item is named 'lintme' | ^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-plugin-forbid-attrs.rs:16:11 + --> $DIR/lint-plugin-forbid-attrs.rs:6:11 | LL | #![forbid(test_lint)] | ^^^^^^^^^ diff --git a/src/test/ui-fulldeps/lint-plugin.rs b/src/test/ui-fulldeps/lint-plugin.rs index 304cfc3eb6d1d..031f3b86b1438 100644 --- a/src/test/ui-fulldeps/lint-plugin.rs +++ b/src/test/ui-fulldeps/lint-plugin.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass // aux-build:lint_plugin_test.rs // ignore-stage1 diff --git a/src/test/ui-fulldeps/lint-plugin.stderr b/src/test/ui-fulldeps/lint-plugin.stderr index 4a3140925c867..11e3222a1a51c 100644 --- a/src/test/ui-fulldeps/lint-plugin.stderr +++ b/src/test/ui-fulldeps/lint-plugin.stderr @@ -1,5 +1,5 @@ warning: item is named 'lintme' - --> $DIR/lint-plugin.rs:18:1 + --> $DIR/lint-plugin.rs:8:1 | LL | fn lintme() { } //~ WARNING item is named 'lintme' | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui-fulldeps/lint_tool_test.rs b/src/test/ui-fulldeps/lint_tool_test.rs index ccdcd2df31b4f..25bae639a25d4 100644 --- a/src/test/ui-fulldeps/lint_tool_test.rs +++ b/src/test/ui-fulldeps/lint_tool_test.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass // aux-build:lint_tool_test.rs // ignore-stage1 diff --git a/src/test/ui-fulldeps/lint_tool_test.stderr b/src/test/ui-fulldeps/lint_tool_test.stderr index 22d0f458e7d7b..4f5fbb1a8a308 100644 --- a/src/test/ui-fulldeps/lint_tool_test.stderr +++ b/src/test/ui-fulldeps/lint_tool_test.stderr @@ -1,5 +1,5 @@ warning: item is named 'lintme' - --> $DIR/lint_tool_test.rs:19:1 + --> $DIR/lint_tool_test.rs:9:1 | LL | fn lintme() { } //~ WARNING item is named 'lintme' | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui-fulldeps/proc-macro/attribute-spans-preserved.rs b/src/test/ui-fulldeps/proc-macro/attribute-spans-preserved.rs index af47dad9e0bd7..c01fce90593ba 100644 --- a/src/test/ui-fulldeps/proc-macro/attribute-spans-preserved.rs +++ b/src/test/ui-fulldeps/proc-macro/attribute-spans-preserved.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:attribute-spans-preserved.rs extern crate attribute_spans_preserved as foo; diff --git a/src/test/ui-fulldeps/proc-macro/attribute-spans-preserved.stderr b/src/test/ui-fulldeps/proc-macro/attribute-spans-preserved.stderr index 329e5bea61cd5..8371088c4c209 100644 --- a/src/test/ui-fulldeps/proc-macro/attribute-spans-preserved.stderr +++ b/src/test/ui-fulldeps/proc-macro/attribute-spans-preserved.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/attribute-spans-preserved.rs:17:23 + --> $DIR/attribute-spans-preserved.rs:7:23 | LL | #[ foo ( let y: u32 = "z"; ) ] //~ ERROR: mismatched types | ^^^ expected u32, found reference @@ -8,7 +8,7 @@ LL | #[ foo ( let y: u32 = "z"; ) ] //~ ERROR: mismatched types found type `&'static str` error[E0308]: mismatched types - --> $DIR/attribute-spans-preserved.rs:18:23 + --> $DIR/attribute-spans-preserved.rs:8:23 | LL | #[ bar { let x: u32 = "y"; } ] //~ ERROR: mismatched types | ^^^ expected u32, found reference diff --git a/src/test/ui-fulldeps/proc-macro/auxiliary/attribute-spans-preserved.rs b/src/test/ui-fulldeps/proc-macro/auxiliary/attribute-spans-preserved.rs index e725cc7afb82b..e33126c78a995 100644 --- a/src/test/ui-fulldeps/proc-macro/auxiliary/attribute-spans-preserved.rs +++ b/src/test/ui-fulldeps/proc-macro/auxiliary/attribute-spans-preserved.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/ui-fulldeps/proc-macro/auxiliary/derive-panic.rs b/src/test/ui-fulldeps/proc-macro/auxiliary/derive-panic.rs index 3274f0324e1cb..e2e108eb0bc24 100644 --- a/src/test/ui-fulldeps/proc-macro/auxiliary/derive-panic.rs +++ b/src/test/ui-fulldeps/proc-macro/auxiliary/derive-panic.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic // force-host diff --git a/src/test/ui-fulldeps/proc-macro/auxiliary/generate-mod.rs b/src/test/ui-fulldeps/proc-macro/auxiliary/generate-mod.rs index 1ed8ef5202735..8764ecaf423c5 100644 --- a/src/test/ui-fulldeps/proc-macro/auxiliary/generate-mod.rs +++ b/src/test/ui-fulldeps/proc-macro/auxiliary/generate-mod.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass // no-prefer-dynamic diff --git a/src/test/ui-fulldeps/proc-macro/auxiliary/macro-brackets.rs b/src/test/ui-fulldeps/proc-macro/auxiliary/macro-brackets.rs index be1777f3ebd05..7f497955a14eb 100644 --- a/src/test/ui-fulldeps/proc-macro/auxiliary/macro-brackets.rs +++ b/src/test/ui-fulldeps/proc-macro/auxiliary/macro-brackets.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/ui-fulldeps/proc-macro/auxiliary/nested-item-spans.rs b/src/test/ui-fulldeps/proc-macro/auxiliary/nested-item-spans.rs index 6b893150b45e4..28ec99345e03a 100644 --- a/src/test/ui-fulldeps/proc-macro/auxiliary/nested-item-spans.rs +++ b/src/test/ui-fulldeps/proc-macro/auxiliary/nested-item-spans.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/ui-fulldeps/proc-macro/auxiliary/parent-source-spans.rs b/src/test/ui-fulldeps/proc-macro/auxiliary/parent-source-spans.rs index f5590405e61e3..0ca498d8b2e54 100644 --- a/src/test/ui-fulldeps/proc-macro/auxiliary/parent-source-spans.rs +++ b/src/test/ui-fulldeps/proc-macro/auxiliary/parent-source-spans.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![feature(proc_macro_diagnostic, proc_macro_span)] diff --git a/src/test/ui-fulldeps/proc-macro/auxiliary/three-equals.rs b/src/test/ui-fulldeps/proc-macro/auxiliary/three-equals.rs index 70151278947dd..63f3959be65c6 100644 --- a/src/test/ui-fulldeps/proc-macro/auxiliary/three-equals.rs +++ b/src/test/ui-fulldeps/proc-macro/auxiliary/three-equals.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/ui-fulldeps/proc-macro/generate-mod.rs b/src/test/ui-fulldeps/proc-macro/generate-mod.rs index 977faf7decdf5..e5f967416c922 100644 --- a/src/test/ui-fulldeps/proc-macro/generate-mod.rs +++ b/src/test/ui-fulldeps/proc-macro/generate-mod.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Modules generated by transparent proc macros still acts as barriers for names (issue #50504). // aux-build:generate-mod.rs diff --git a/src/test/ui-fulldeps/proc-macro/generate-mod.stderr b/src/test/ui-fulldeps/proc-macro/generate-mod.stderr index a981b1bc8b85a..1177fc6e575a7 100644 --- a/src/test/ui-fulldeps/proc-macro/generate-mod.stderr +++ b/src/test/ui-fulldeps/proc-macro/generate-mod.stderr @@ -1,29 +1,29 @@ error[E0412]: cannot find type `FromOutside` in this scope - --> $DIR/generate-mod.rs:19:1 + --> $DIR/generate-mod.rs:9:1 | LL | generate_mod::check!(); //~ ERROR cannot find type `FromOutside` in this scope | ^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope error[E0412]: cannot find type `Outer` in this scope - --> $DIR/generate-mod.rs:19:1 + --> $DIR/generate-mod.rs:9:1 | LL | generate_mod::check!(); //~ ERROR cannot find type `FromOutside` in this scope | ^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope error[E0412]: cannot find type `FromOutside` in this scope - --> $DIR/generate-mod.rs:22:1 + --> $DIR/generate-mod.rs:12:1 | LL | #[generate_mod::check_attr] //~ ERROR cannot find type `FromOutside` in this scope | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope error[E0412]: cannot find type `OuterAttr` in this scope - --> $DIR/generate-mod.rs:22:1 + --> $DIR/generate-mod.rs:12:1 | LL | #[generate_mod::check_attr] //~ ERROR cannot find type `FromOutside` in this scope | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope warning: cannot find type `FromOutside` in this scope - --> $DIR/generate-mod.rs:26:10 + --> $DIR/generate-mod.rs:16:10 | LL | #[derive(generate_mod::CheckDerive)] //~ WARN cannot find type `FromOutside` in this scope | ^^^^^^^^^^^^^^^^^^^^^^^^^ names from parent modules are not accessible without an explicit import @@ -33,7 +33,7 @@ LL | #[derive(generate_mod::CheckDerive)] //~ WARN cannot find type `FromOutside = note: for more information, see issue #50504 warning: cannot find type `OuterDerive` in this scope - --> $DIR/generate-mod.rs:26:10 + --> $DIR/generate-mod.rs:16:10 | LL | #[derive(generate_mod::CheckDerive)] //~ WARN cannot find type `FromOutside` in this scope | ^^^^^^^^^^^^^^^^^^^^^^^^^ names from parent modules are not accessible without an explicit import @@ -42,7 +42,7 @@ LL | #[derive(generate_mod::CheckDerive)] //~ WARN cannot find type `FromOutside = note: for more information, see issue #50504 warning: cannot find type `FromOutside` in this scope - --> $DIR/generate-mod.rs:33:14 + --> $DIR/generate-mod.rs:23:14 | LL | #[derive(generate_mod::CheckDerive)] //~ WARN cannot find type `FromOutside` in this scope | ^^^^^^^^^^^^^^^^^^^^^^^^^ names from parent modules are not accessible without an explicit import @@ -51,7 +51,7 @@ LL | #[derive(generate_mod::CheckDerive)] //~ WARN cannot find type `FromOut = note: for more information, see issue #50504 warning: cannot find type `OuterDerive` in this scope - --> $DIR/generate-mod.rs:33:14 + --> $DIR/generate-mod.rs:23:14 | LL | #[derive(generate_mod::CheckDerive)] //~ WARN cannot find type `FromOutside` in this scope | ^^^^^^^^^^^^^^^^^^^^^^^^^ names from parent modules are not accessible without an explicit import diff --git a/src/test/ui-fulldeps/proc-macro/invalid-attributes.rs b/src/test/ui-fulldeps/proc-macro/invalid-attributes.rs index 8b940a0f40585..0433516142b92 100644 --- a/src/test/ui-fulldeps/proc-macro/invalid-attributes.rs +++ b/src/test/ui-fulldeps/proc-macro/invalid-attributes.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/ui-fulldeps/proc-macro/invalid-attributes.stderr b/src/test/ui-fulldeps/proc-macro/invalid-attributes.stderr index 5fd87362db23b..1cca02d45e063 100644 --- a/src/test/ui-fulldeps/proc-macro/invalid-attributes.stderr +++ b/src/test/ui-fulldeps/proc-macro/invalid-attributes.stderr @@ -1,35 +1,35 @@ error: `#[proc_macro]` attribute does not take any arguments - --> $DIR/invalid-attributes.rs:19:1 + --> $DIR/invalid-attributes.rs:9:1 | LL | #[proc_macro = "test"] //~ ERROR: does not take any arguments | ^^^^^^^^^^^^^^^^^^^^^^ error: `#[proc_macro]` attribute does not take any arguments - --> $DIR/invalid-attributes.rs:22:1 + --> $DIR/invalid-attributes.rs:12:1 | LL | #[proc_macro()] //~ ERROR: does not take any arguments | ^^^^^^^^^^^^^^^ error: `#[proc_macro]` attribute does not take any arguments - --> $DIR/invalid-attributes.rs:25:1 + --> $DIR/invalid-attributes.rs:15:1 | LL | #[proc_macro(x)] //~ ERROR: does not take any arguments | ^^^^^^^^^^^^^^^^ error: `#[proc_macro_attribute]` attribute does not take any arguments - --> $DIR/invalid-attributes.rs:28:1 + --> $DIR/invalid-attributes.rs:18:1 | LL | #[proc_macro_attribute = "test"] //~ ERROR: does not take any arguments | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: `#[proc_macro_attribute]` attribute does not take any arguments - --> $DIR/invalid-attributes.rs:31:1 + --> $DIR/invalid-attributes.rs:21:1 | LL | #[proc_macro_attribute()] //~ ERROR: does not take any arguments | ^^^^^^^^^^^^^^^^^^^^^^^^^ error: `#[proc_macro_attribute]` attribute does not take any arguments - --> $DIR/invalid-attributes.rs:34:1 + --> $DIR/invalid-attributes.rs:24:1 | LL | #[proc_macro_attribute(x)] //~ ERROR: does not take any arguments | ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui-fulldeps/proc-macro/load-panic.rs b/src/test/ui-fulldeps/proc-macro/load-panic.rs index 462eaf0341704..fa279c559fbf1 100644 --- a/src/test/ui-fulldeps/proc-macro/load-panic.rs +++ b/src/test/ui-fulldeps/proc-macro/load-panic.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:derive-panic.rs // compile-flags:--error-format human diff --git a/src/test/ui-fulldeps/proc-macro/load-panic.stderr b/src/test/ui-fulldeps/proc-macro/load-panic.stderr index 30ad53f9041f0..b448c804bff59 100644 --- a/src/test/ui-fulldeps/proc-macro/load-panic.stderr +++ b/src/test/ui-fulldeps/proc-macro/load-panic.stderr @@ -1,5 +1,5 @@ error: proc-macro derive panicked - --> $DIR/load-panic.rs:17:10 + --> $DIR/load-panic.rs:7:10 | LL | #[derive(A)] | ^ diff --git a/src/test/ui-fulldeps/proc-macro/macro-brackets.rs b/src/test/ui-fulldeps/proc-macro/macro-brackets.rs index b29f2775201b8..c46abf03654ce 100644 --- a/src/test/ui-fulldeps/proc-macro/macro-brackets.rs +++ b/src/test/ui-fulldeps/proc-macro/macro-brackets.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:macro-brackets.rs extern crate macro_brackets as bar; diff --git a/src/test/ui-fulldeps/proc-macro/macro-brackets.stderr b/src/test/ui-fulldeps/proc-macro/macro-brackets.stderr index 7c263d38df971..a3cc7d485cd39 100644 --- a/src/test/ui-fulldeps/proc-macro/macro-brackets.stderr +++ b/src/test/ui-fulldeps/proc-macro/macro-brackets.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/macro-brackets.rs:21:21 + --> $DIR/macro-brackets.rs:11:21 | LL | id![static X: u32 = 'a';]; //~ ERROR: mismatched types | ^^^ expected u32, found char diff --git a/src/test/ui-fulldeps/proc-macro/macro-namespace-reserved-2.rs b/src/test/ui-fulldeps/proc-macro/macro-namespace-reserved-2.rs index fa05ad2fc605b..3bb9e77e83ab9 100644 --- a/src/test/ui-fulldeps/proc-macro/macro-namespace-reserved-2.rs +++ b/src/test/ui-fulldeps/proc-macro/macro-namespace-reserved-2.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/ui-fulldeps/proc-macro/macro-namespace-reserved-2.stderr b/src/test/ui-fulldeps/proc-macro/macro-namespace-reserved-2.stderr index 9def03e94506a..f046c40639f78 100644 --- a/src/test/ui-fulldeps/proc-macro/macro-namespace-reserved-2.stderr +++ b/src/test/ui-fulldeps/proc-macro/macro-namespace-reserved-2.stderr @@ -1,53 +1,53 @@ error: can't use a procedural macro from the same crate that defines it - --> $DIR/macro-namespace-reserved-2.rs:34:5 + --> $DIR/macro-namespace-reserved-2.rs:24:5 | LL | my_macro!(); //~ ERROR can't use a procedural macro from the same crate that defines it | ^^^^^^^^ error: can't use a procedural macro from the same crate that defines it - --> $DIR/macro-namespace-reserved-2.rs:37:5 + --> $DIR/macro-namespace-reserved-2.rs:27:5 | LL | my_macro_attr!(); //~ ERROR can't use a procedural macro from the same crate that defines it | ^^^^^^^^^^^^^ error: can't use a procedural macro from the same crate that defines it - --> $DIR/macro-namespace-reserved-2.rs:40:5 + --> $DIR/macro-namespace-reserved-2.rs:30:5 | LL | MyTrait!(); //~ ERROR can't use a procedural macro from the same crate that defines it | ^^^^^^^ error: can't use a procedural macro from the same crate that defines it - --> $DIR/macro-namespace-reserved-2.rs:43:3 + --> $DIR/macro-namespace-reserved-2.rs:33:3 | LL | #[my_macro] //~ ERROR can't use a procedural macro from the same crate that defines it | ^^^^^^^^ error: can't use a procedural macro from the same crate that defines it - --> $DIR/macro-namespace-reserved-2.rs:45:3 + --> $DIR/macro-namespace-reserved-2.rs:35:3 | LL | #[my_macro_attr] //~ ERROR can't use a procedural macro from the same crate that defines it | ^^^^^^^^^^^^^ error: can't use a procedural macro from the same crate that defines it - --> $DIR/macro-namespace-reserved-2.rs:47:3 + --> $DIR/macro-namespace-reserved-2.rs:37:3 | LL | #[MyTrait] //~ ERROR can't use a procedural macro from the same crate that defines it | ^^^^^^^ error: can't use a procedural macro from the same crate that defines it - --> $DIR/macro-namespace-reserved-2.rs:50:10 + --> $DIR/macro-namespace-reserved-2.rs:40:10 | LL | #[derive(my_macro)] //~ ERROR can't use a procedural macro from the same crate that defines it | ^^^^^^^^ error: can't use a procedural macro from the same crate that defines it - --> $DIR/macro-namespace-reserved-2.rs:52:10 + --> $DIR/macro-namespace-reserved-2.rs:42:10 | LL | #[derive(my_macro_attr)] //~ ERROR can't use a procedural macro from the same crate that defines it | ^^^^^^^^^^^^^ error: can't use a procedural macro from the same crate that defines it - --> $DIR/macro-namespace-reserved-2.rs:54:10 + --> $DIR/macro-namespace-reserved-2.rs:44:10 | LL | #[derive(MyTrait)] //~ ERROR can't use a procedural macro from the same crate that defines it | ^^^^^^^ diff --git a/src/test/ui-fulldeps/proc-macro/macro-namespace-reserved.rs b/src/test/ui-fulldeps/proc-macro/macro-namespace-reserved.rs index e7bb05de88c8a..53e49b79e19dc 100644 --- a/src/test/ui-fulldeps/proc-macro/macro-namespace-reserved.rs +++ b/src/test/ui-fulldeps/proc-macro/macro-namespace-reserved.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![feature(decl_macro)] diff --git a/src/test/ui-fulldeps/proc-macro/macro-namespace-reserved.stderr b/src/test/ui-fulldeps/proc-macro/macro-namespace-reserved.stderr index 44b51edcc0b59..9e7a9d044310b 100644 --- a/src/test/ui-fulldeps/proc-macro/macro-namespace-reserved.stderr +++ b/src/test/ui-fulldeps/proc-macro/macro-namespace-reserved.stderr @@ -1,5 +1,5 @@ error[E0428]: the name `my_macro` is defined multiple times - --> $DIR/macro-namespace-reserved.rs:34:1 + --> $DIR/macro-namespace-reserved.rs:24:1 | LL | pub fn my_macro(input: TokenStream) -> TokenStream { | -------------------------------------------------- previous definition of the macro `my_macro` here @@ -10,7 +10,7 @@ LL | macro my_macro() {} //~ ERROR the name `my_macro` is defined multiple times = note: `my_macro` must be defined only once in the macro namespace of this module error[E0428]: the name `my_macro_attr` is defined multiple times - --> $DIR/macro-namespace-reserved.rs:35:1 + --> $DIR/macro-namespace-reserved.rs:25:1 | LL | pub fn my_macro_attr(input: TokenStream, _: TokenStream) -> TokenStream { | ----------------------------------------------------------------------- previous definition of the macro `my_macro_attr` here @@ -21,7 +21,7 @@ LL | macro my_macro_attr() {} //~ ERROR the name `my_macro_attr` is defined mult = note: `my_macro_attr` must be defined only once in the macro namespace of this module error[E0428]: the name `MyTrait` is defined multiple times - --> $DIR/macro-namespace-reserved.rs:36:1 + --> $DIR/macro-namespace-reserved.rs:26:1 | LL | #[proc_macro_derive(MyTrait)] | ------- previous definition of the macro `MyTrait` here @@ -32,7 +32,7 @@ LL | macro MyTrait() {} //~ ERROR the name `MyTrait` is defined multiple times = note: `MyTrait` must be defined only once in the macro namespace of this module error[E0428]: the name `SameName` is defined multiple times - --> $DIR/macro-namespace-reserved.rs:44:1 + --> $DIR/macro-namespace-reserved.rs:34:1 | LL | #[proc_macro_derive(SameName)] | -------- previous definition of the macro `SameName` here diff --git a/src/test/ui-fulldeps/proc-macro/nested-item-spans.rs b/src/test/ui-fulldeps/proc-macro/nested-item-spans.rs index 8f059d6344df6..e365b74b3be8f 100644 --- a/src/test/ui-fulldeps/proc-macro/nested-item-spans.rs +++ b/src/test/ui-fulldeps/proc-macro/nested-item-spans.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:nested-item-spans.rs extern crate nested_item_spans; diff --git a/src/test/ui-fulldeps/proc-macro/nested-item-spans.stderr b/src/test/ui-fulldeps/proc-macro/nested-item-spans.stderr index 75140747e8c76..cba4b73486c13 100644 --- a/src/test/ui-fulldeps/proc-macro/nested-item-spans.stderr +++ b/src/test/ui-fulldeps/proc-macro/nested-item-spans.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/nested-item-spans.rs:20:22 + --> $DIR/nested-item-spans.rs:10:22 | LL | let x: u32 = "x"; //~ ERROR: mismatched types | ^^^ expected u32, found reference @@ -8,7 +8,7 @@ LL | let x: u32 = "x"; //~ ERROR: mismatched types found type `&'static str` error[E0308]: mismatched types - --> $DIR/nested-item-spans.rs:29:22 + --> $DIR/nested-item-spans.rs:19:22 | LL | let x: u32 = "x"; //~ ERROR: mismatched types | ^^^ expected u32, found reference diff --git a/src/test/ui-fulldeps/proc-macro/non-root.rs b/src/test/ui-fulldeps/proc-macro/non-root.rs index 2440488578814..54fd9bfe22513 100644 --- a/src/test/ui-fulldeps/proc-macro/non-root.rs +++ b/src/test/ui-fulldeps/proc-macro/non-root.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/ui-fulldeps/proc-macro/non-root.stderr b/src/test/ui-fulldeps/proc-macro/non-root.stderr index 23222a2b85145..44ff63b19bcd1 100644 --- a/src/test/ui-fulldeps/proc-macro/non-root.stderr +++ b/src/test/ui-fulldeps/proc-macro/non-root.stderr @@ -1,5 +1,5 @@ error: functions tagged with `#[proc_macro]` must currently reside in the root of the crate - --> $DIR/non-root.rs:20:5 + --> $DIR/non-root.rs:10:5 | LL | pub fn foo(arg: TokenStream) -> TokenStream { arg } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui-fulldeps/proc-macro/parent-source-spans.rs b/src/test/ui-fulldeps/proc-macro/parent-source-spans.rs index 18f5b0f506cc2..b0a10e7f0a560 100644 --- a/src/test/ui-fulldeps/proc-macro/parent-source-spans.rs +++ b/src/test/ui-fulldeps/proc-macro/parent-source-spans.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:parent-source-spans.rs // ignore-stage1 diff --git a/src/test/ui-fulldeps/proc-macro/parent-source-spans.stderr b/src/test/ui-fulldeps/proc-macro/parent-source-spans.stderr index 0442c4f6ce71f..c39d4c19eb500 100644 --- a/src/test/ui-fulldeps/proc-macro/parent-source-spans.stderr +++ b/src/test/ui-fulldeps/proc-macro/parent-source-spans.stderr @@ -1,5 +1,5 @@ error: first final: "hello" - --> $DIR/parent-source-spans.rs:27:12 + --> $DIR/parent-source-spans.rs:17:12 | LL | three!($a, $b); | ^^ @@ -8,7 +8,7 @@ LL | one!("hello", "world"); | ----------------------- in this macro invocation error: second final: "world" - --> $DIR/parent-source-spans.rs:27:16 + --> $DIR/parent-source-spans.rs:17:16 | LL | three!($a, $b); | ^^ @@ -17,7 +17,7 @@ LL | one!("hello", "world"); | ----------------------- in this macro invocation error: first parent: "hello" - --> $DIR/parent-source-spans.rs:21:5 + --> $DIR/parent-source-spans.rs:11:5 | LL | two!($a, $b); | ^^^^^^^^^^^^^ @@ -26,7 +26,7 @@ LL | one!("hello", "world"); | ----------------------- in this macro invocation error: second parent: "world" - --> $DIR/parent-source-spans.rs:21:5 + --> $DIR/parent-source-spans.rs:11:5 | LL | two!($a, $b); | ^^^^^^^^^^^^^ @@ -35,31 +35,31 @@ LL | one!("hello", "world"); | ----------------------- in this macro invocation error: first grandparent: "hello" - --> $DIR/parent-source-spans.rs:44:5 + --> $DIR/parent-source-spans.rs:34:5 | LL | one!("hello", "world"); | ^^^^^^^^^^^^^^^^^^^^^^^ error: second grandparent: "world" - --> $DIR/parent-source-spans.rs:44:5 + --> $DIR/parent-source-spans.rs:34:5 | LL | one!("hello", "world"); | ^^^^^^^^^^^^^^^^^^^^^^^ error: first source: "hello" - --> $DIR/parent-source-spans.rs:44:5 + --> $DIR/parent-source-spans.rs:34:5 | LL | one!("hello", "world"); | ^^^^^^^^^^^^^^^^^^^^^^^ error: second source: "world" - --> $DIR/parent-source-spans.rs:44:5 + --> $DIR/parent-source-spans.rs:34:5 | LL | one!("hello", "world"); | ^^^^^^^^^^^^^^^^^^^^^^^ error: first final: "yay" - --> $DIR/parent-source-spans.rs:27:12 + --> $DIR/parent-source-spans.rs:17:12 | LL | three!($a, $b); | ^^ @@ -68,7 +68,7 @@ LL | two!("yay", "rust"); | -------------------- in this macro invocation error: second final: "rust" - --> $DIR/parent-source-spans.rs:27:16 + --> $DIR/parent-source-spans.rs:17:16 | LL | three!($a, $b); | ^^ @@ -77,49 +77,49 @@ LL | two!("yay", "rust"); | -------------------- in this macro invocation error: first parent: "yay" - --> $DIR/parent-source-spans.rs:50:5 + --> $DIR/parent-source-spans.rs:40:5 | LL | two!("yay", "rust"); | ^^^^^^^^^^^^^^^^^^^^ error: second parent: "rust" - --> $DIR/parent-source-spans.rs:50:5 + --> $DIR/parent-source-spans.rs:40:5 | LL | two!("yay", "rust"); | ^^^^^^^^^^^^^^^^^^^^ error: first source: "yay" - --> $DIR/parent-source-spans.rs:50:5 + --> $DIR/parent-source-spans.rs:40:5 | LL | two!("yay", "rust"); | ^^^^^^^^^^^^^^^^^^^^ error: second source: "rust" - --> $DIR/parent-source-spans.rs:50:5 + --> $DIR/parent-source-spans.rs:40:5 | LL | two!("yay", "rust"); | ^^^^^^^^^^^^^^^^^^^^ error: first final: "hip" - --> $DIR/parent-source-spans.rs:56:12 + --> $DIR/parent-source-spans.rs:46:12 | LL | three!("hip", "hop"); | ^^^^^ error: second final: "hop" - --> $DIR/parent-source-spans.rs:56:19 + --> $DIR/parent-source-spans.rs:46:19 | LL | three!("hip", "hop"); | ^^^^^ error: first source: "hip" - --> $DIR/parent-source-spans.rs:56:12 + --> $DIR/parent-source-spans.rs:46:12 | LL | three!("hip", "hop"); | ^^^^^ error: second source: "hop" - --> $DIR/parent-source-spans.rs:56:19 + --> $DIR/parent-source-spans.rs:46:19 | LL | three!("hip", "hop"); | ^^^^^ diff --git a/src/test/ui-fulldeps/proc-macro/signature.rs b/src/test/ui-fulldeps/proc-macro/signature.rs index f2ea6f778cd26..a93c4206494bd 100644 --- a/src/test/ui-fulldeps/proc-macro/signature.rs +++ b/src/test/ui-fulldeps/proc-macro/signature.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "proc-macro"] #![allow(warnings)] diff --git a/src/test/ui-fulldeps/proc-macro/signature.stderr b/src/test/ui-fulldeps/proc-macro/signature.stderr index fdd10c3c5b903..7dde53ac6ac8b 100644 --- a/src/test/ui-fulldeps/proc-macro/signature.stderr +++ b/src/test/ui-fulldeps/proc-macro/signature.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/signature.rs:17:1 + --> $DIR/signature.rs:7:1 | LL | / pub unsafe extern fn foo(a: i32, b: u32) -> u32 { LL | | //~^ ERROR: mismatched types diff --git a/src/test/ui-fulldeps/proc-macro/three-equals.rs b/src/test/ui-fulldeps/proc-macro/three-equals.rs index f6b0e90da0014..72f5f82fffbc7 100644 --- a/src/test/ui-fulldeps/proc-macro/three-equals.rs +++ b/src/test/ui-fulldeps/proc-macro/three-equals.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:three-equals.rs // ignore-stage1 diff --git a/src/test/ui-fulldeps/proc-macro/three-equals.stderr b/src/test/ui-fulldeps/proc-macro/three-equals.stderr index 1a0337f93f9ac..e38343348dd94 100644 --- a/src/test/ui-fulldeps/proc-macro/three-equals.stderr +++ b/src/test/ui-fulldeps/proc-macro/three-equals.stderr @@ -1,5 +1,5 @@ error: found 2 equal signs, need exactly 3 - --> $DIR/three-equals.rs:25:5 + --> $DIR/three-equals.rs:15:5 | LL | three_equals!(==); //~ ERROR found 2 equal signs, need exactly 3 | ^^^^^^^^^^^^^^^^^^ @@ -7,38 +7,38 @@ LL | three_equals!(==); //~ ERROR found 2 equal signs, need exactly 3 = help: input must be: `===` error: expected EOF, found `=`. - --> $DIR/three-equals.rs:28:21 + --> $DIR/three-equals.rs:18:21 | LL | three_equals!(=====); //~ ERROR expected EOF | ^^ | note: last good input was here - --> $DIR/three-equals.rs:28:21 + --> $DIR/three-equals.rs:18:21 | LL | three_equals!(=====); //~ ERROR expected EOF | ^^ = help: input must be: `===` error: expected `=`, found `abc`. - --> $DIR/three-equals.rs:31:19 + --> $DIR/three-equals.rs:21:19 | LL | three_equals!(abc); //~ ERROR expected `=` | ^^^ error: expected `=`, found `!`. - --> $DIR/three-equals.rs:34:19 + --> $DIR/three-equals.rs:24:19 | LL | three_equals!(!!); //~ ERROR expected `=` | ^ error: expected EOF, found `a`. - --> $DIR/three-equals.rs:37:22 + --> $DIR/three-equals.rs:27:22 | LL | three_equals!(===a); //~ ERROR expected EOF | ^ | note: last good input was here - --> $DIR/three-equals.rs:37:21 + --> $DIR/three-equals.rs:27:21 | LL | three_equals!(===a); //~ ERROR expected EOF | ^ diff --git a/src/test/ui-fulldeps/resolve-error.rs b/src/test/ui-fulldeps/resolve-error.rs index 1940151357c8f..bb242f302496e 100644 --- a/src/test/ui-fulldeps/resolve-error.rs +++ b/src/test/ui-fulldeps/resolve-error.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:derive-foo.rs // aux-build:derive-clona.rs // aux-build:attr_proc_macro.rs diff --git a/src/test/ui-fulldeps/resolve-error.stderr b/src/test/ui-fulldeps/resolve-error.stderr index 278409c688ab9..cf7de578c7d42 100644 --- a/src/test/ui-fulldeps/resolve-error.stderr +++ b/src/test/ui-fulldeps/resolve-error.stderr @@ -1,47 +1,47 @@ error: cannot find derive macro `FooWithLongNan` in this scope - --> $DIR/resolve-error.rs:36:10 + --> $DIR/resolve-error.rs:26:10 | LL | #[derive(FooWithLongNan)] | ^^^^^^^^^^^^^^ help: try: `FooWithLongName` error: cannot find derive macro `Dlone` in this scope - --> $DIR/resolve-error.rs:46:10 + --> $DIR/resolve-error.rs:36:10 | LL | #[derive(Dlone)] | ^^^^^ help: try: `Clone` error: cannot find derive macro `Dlona` in this scope - --> $DIR/resolve-error.rs:50:10 + --> $DIR/resolve-error.rs:40:10 | LL | #[derive(Dlona)] | ^^^^^ help: try: `Clona` error: cannot find derive macro `attr_proc_macra` in this scope - --> $DIR/resolve-error.rs:54:10 + --> $DIR/resolve-error.rs:44:10 | LL | #[derive(attr_proc_macra)] | ^^^^^^^^^^^^^^^ error: cannot find macro `FooWithLongNama!` in this scope - --> $DIR/resolve-error.rs:59:5 + --> $DIR/resolve-error.rs:49:5 | LL | FooWithLongNama!(); | ^^^^^^^^^^^^^^^ help: you could try the macro: `FooWithLongNam` error: cannot find macro `attr_proc_macra!` in this scope - --> $DIR/resolve-error.rs:62:5 + --> $DIR/resolve-error.rs:52:5 | LL | attr_proc_macra!(); | ^^^^^^^^^^^^^^^ help: you could try the macro: `attr_proc_mac` error: cannot find macro `Dlona!` in this scope - --> $DIR/resolve-error.rs:65:5 + --> $DIR/resolve-error.rs:55:5 | LL | Dlona!(); | ^^^^^ error: cannot find macro `bang_proc_macrp!` in this scope - --> $DIR/resolve-error.rs:68:5 + --> $DIR/resolve-error.rs:58:5 | LL | bang_proc_macrp!(); | ^^^^^^^^^^^^^^^ help: you could try the macro: `bang_proc_macro` diff --git a/src/test/ui-fulldeps/rust-2018/auxiliary/suggestions-not-always-applicable.rs b/src/test/ui-fulldeps/rust-2018/auxiliary/suggestions-not-always-applicable.rs index 7ae4731fde196..6f1853e34f67e 100644 --- a/src/test/ui-fulldeps/rust-2018/auxiliary/suggestions-not-always-applicable.rs +++ b/src/test/ui-fulldeps/rust-2018/auxiliary/suggestions-not-always-applicable.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "proc-macro"] diff --git a/src/test/ui-fulldeps/rust-2018/proc-macro-crate-in-paths.rs b/src/test/ui-fulldeps/rust-2018/proc-macro-crate-in-paths.rs index 1068c05874589..9a2307154074c 100644 --- a/src/test/ui-fulldeps/rust-2018/proc-macro-crate-in-paths.rs +++ b/src/test/ui-fulldeps/rust-2018/proc-macro-crate-in-paths.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![crate_type = "proc-macro"] diff --git a/src/test/ui-fulldeps/rust-2018/suggestions-not-always-applicable.fixed b/src/test/ui-fulldeps/rust-2018/suggestions-not-always-applicable.fixed index b64ebed030588..f0ca24714ed48 100644 --- a/src/test/ui-fulldeps/rust-2018/suggestions-not-always-applicable.fixed +++ b/src/test/ui-fulldeps/rust-2018/suggestions-not-always-applicable.fixed @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:suggestions-not-always-applicable.rs // edition:2015 // run-rustfix diff --git a/src/test/ui-fulldeps/rust-2018/suggestions-not-always-applicable.rs b/src/test/ui-fulldeps/rust-2018/suggestions-not-always-applicable.rs index b64ebed030588..f0ca24714ed48 100644 --- a/src/test/ui-fulldeps/rust-2018/suggestions-not-always-applicable.rs +++ b/src/test/ui-fulldeps/rust-2018/suggestions-not-always-applicable.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:suggestions-not-always-applicable.rs // edition:2015 // run-rustfix diff --git a/src/test/ui-fulldeps/rust-2018/suggestions-not-always-applicable.stderr b/src/test/ui-fulldeps/rust-2018/suggestions-not-always-applicable.stderr index 76dc139b58f07..646eff9572cbe 100644 --- a/src/test/ui-fulldeps/rust-2018/suggestions-not-always-applicable.stderr +++ b/src/test/ui-fulldeps/rust-2018/suggestions-not-always-applicable.stderr @@ -1,11 +1,11 @@ warning: absolute paths must start with `self`, `super`, `crate`, or an external crate name in the 2018 edition - --> $DIR/suggestions-not-always-applicable.rs:27:5 + --> $DIR/suggestions-not-always-applicable.rs:17:5 | LL | #[foo] //~ WARN: absolute paths must start with | ^^^^^^ | note: lint level defined here - --> $DIR/suggestions-not-always-applicable.rs:18:9 + --> $DIR/suggestions-not-always-applicable.rs:8:9 | LL | #![warn(rust_2018_compatibility)] | ^^^^^^^^^^^^^^^^^^^^^^^ @@ -14,7 +14,7 @@ LL | #![warn(rust_2018_compatibility)] = note: for more information, see issue TBD warning: absolute paths must start with `self`, `super`, `crate`, or an external crate name in the 2018 edition - --> $DIR/suggestions-not-always-applicable.rs:27:5 + --> $DIR/suggestions-not-always-applicable.rs:17:5 | LL | #[foo] //~ WARN: absolute paths must start with | ^^^^^^ diff --git a/src/test/ui-fulldeps/unnecessary-extern-crate.rs b/src/test/ui-fulldeps/unnecessary-extern-crate.rs index ea3e0587958b1..878ee59ecdd08 100644 --- a/src/test/ui-fulldeps/unnecessary-extern-crate.rs +++ b/src/test/ui-fulldeps/unnecessary-extern-crate.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 #![deny(unused_extern_crates)] diff --git a/src/test/ui-fulldeps/unnecessary-extern-crate.stderr b/src/test/ui-fulldeps/unnecessary-extern-crate.stderr index a4307112157b0..423746895df0b 100644 --- a/src/test/ui-fulldeps/unnecessary-extern-crate.stderr +++ b/src/test/ui-fulldeps/unnecessary-extern-crate.stderr @@ -1,95 +1,95 @@ error: unused extern crate - --> $DIR/unnecessary-extern-crate.rs:16:1 + --> $DIR/unnecessary-extern-crate.rs:6:1 | LL | extern crate alloc; | ^^^^^^^^^^^^^^^^^^^ help: remove it | note: lint level defined here - --> $DIR/unnecessary-extern-crate.rs:13:9 + --> $DIR/unnecessary-extern-crate.rs:3:9 | LL | #![deny(unused_extern_crates)] | ^^^^^^^^^^^^^^^^^^^^ error: unused extern crate - --> $DIR/unnecessary-extern-crate.rs:19:1 + --> $DIR/unnecessary-extern-crate.rs:9:1 | LL | extern crate alloc as x; | ^^^^^^^^^^^^^^^^^^^^^^^^ help: remove it error: `extern crate` is not idiomatic in the new edition - --> $DIR/unnecessary-extern-crate.rs:26:1 + --> $DIR/unnecessary-extern-crate.rs:16:1 | LL | pub extern crate test as y; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: convert it to a `pub use` error: `extern crate` is not idiomatic in the new edition - --> $DIR/unnecessary-extern-crate.rs:30:1 + --> $DIR/unnecessary-extern-crate.rs:20:1 | LL | pub extern crate libc; | ^^^^^^^^^^^^^^^^^^^^^^ help: convert it to a `pub use` error: `extern crate` is not idiomatic in the new edition - --> $DIR/unnecessary-extern-crate.rs:34:1 + --> $DIR/unnecessary-extern-crate.rs:24:1 | LL | pub(crate) extern crate libc as a; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: convert it to a `pub(crate) use` error: `extern crate` is not idiomatic in the new edition - --> $DIR/unnecessary-extern-crate.rs:38:1 + --> $DIR/unnecessary-extern-crate.rs:28:1 | LL | crate extern crate libc as b; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: convert it to a `crate use` error: `extern crate` is not idiomatic in the new edition - --> $DIR/unnecessary-extern-crate.rs:43:5 + --> $DIR/unnecessary-extern-crate.rs:33:5 | LL | pub(in crate::foo) extern crate libc as c; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: convert it to a `pub(in crate::foo) use` error: `extern crate` is not idiomatic in the new edition - --> $DIR/unnecessary-extern-crate.rs:47:5 + --> $DIR/unnecessary-extern-crate.rs:37:5 | LL | pub(super) extern crate libc as d; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: convert it to a `pub(super) use` error: unused extern crate - --> $DIR/unnecessary-extern-crate.rs:51:5 + --> $DIR/unnecessary-extern-crate.rs:41:5 | LL | extern crate alloc; | ^^^^^^^^^^^^^^^^^^^ help: remove it error: unused extern crate - --> $DIR/unnecessary-extern-crate.rs:55:5 + --> $DIR/unnecessary-extern-crate.rs:45:5 | LL | extern crate alloc as x; | ^^^^^^^^^^^^^^^^^^^^^^^^ help: remove it error: `extern crate` is not idiomatic in the new edition - --> $DIR/unnecessary-extern-crate.rs:59:5 + --> $DIR/unnecessary-extern-crate.rs:49:5 | LL | pub extern crate test; | ^^^^^^^^^^^^^^^^^^^^^^ help: convert it to a `pub use` error: `extern crate` is not idiomatic in the new edition - --> $DIR/unnecessary-extern-crate.rs:63:5 + --> $DIR/unnecessary-extern-crate.rs:53:5 | LL | pub extern crate test as y; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: convert it to a `pub use` error: unused extern crate - --> $DIR/unnecessary-extern-crate.rs:68:9 + --> $DIR/unnecessary-extern-crate.rs:58:9 | LL | extern crate alloc; | ^^^^^^^^^^^^^^^^^^^ help: remove it error: unused extern crate - --> $DIR/unnecessary-extern-crate.rs:72:9 + --> $DIR/unnecessary-extern-crate.rs:62:9 | LL | extern crate alloc as x; | ^^^^^^^^^^^^^^^^^^^^^^^^ help: remove it error: `extern crate` is not idiomatic in the new edition - --> $DIR/unnecessary-extern-crate.rs:76:9 + --> $DIR/unnecessary-extern-crate.rs:66:9 | LL | pub(in crate::foo::bar) extern crate libc as e; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: convert it to a `pub(in crate::foo::bar) use` diff --git a/src/test/ui/E0501.ast.nll.stderr b/src/test/ui/E0501.ast.nll.stderr index a9abc79400e67..7f69d47cc7081 100644 --- a/src/test/ui/E0501.ast.nll.stderr +++ b/src/test/ui/E0501.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0501]: cannot borrow `*a` as mutable because previous closure requires unique access - --> $DIR/E0501.rs:28:23 + --> $DIR/E0501.rs:18:23 | LL | let bar = || { | -- closure construction occurs here @@ -13,7 +13,7 @@ LL | drop(bar); | --- borrow later used here error[E0501]: cannot borrow `*a` as immutable because previous closure requires unique access - --> $DIR/E0501.rs:31:23 + --> $DIR/E0501.rs:21:23 | LL | let bar = || { | -- closure construction occurs here diff --git a/src/test/ui/E0501.ast.stderr b/src/test/ui/E0501.ast.stderr index 229b16650173e..e0bd7a08d7f5b 100644 --- a/src/test/ui/E0501.ast.stderr +++ b/src/test/ui/E0501.ast.stderr @@ -1,5 +1,5 @@ error[E0501]: cannot borrow `*a` as mutable because previous closure requires unique access - --> $DIR/E0501.rs:28:23 + --> $DIR/E0501.rs:18:23 | LL | let bar = || { | -- closure construction occurs here @@ -13,7 +13,7 @@ LL | } | - borrow from closure ends here error[E0501]: cannot borrow `*a` as immutable because previous closure requires unique access - --> $DIR/E0501.rs:31:23 + --> $DIR/E0501.rs:21:23 | LL | let bar = || { | -- closure construction occurs here diff --git a/src/test/ui/E0501.mir.stderr b/src/test/ui/E0501.mir.stderr index a9abc79400e67..7f69d47cc7081 100644 --- a/src/test/ui/E0501.mir.stderr +++ b/src/test/ui/E0501.mir.stderr @@ -1,5 +1,5 @@ error[E0501]: cannot borrow `*a` as mutable because previous closure requires unique access - --> $DIR/E0501.rs:28:23 + --> $DIR/E0501.rs:18:23 | LL | let bar = || { | -- closure construction occurs here @@ -13,7 +13,7 @@ LL | drop(bar); | --- borrow later used here error[E0501]: cannot borrow `*a` as immutable because previous closure requires unique access - --> $DIR/E0501.rs:31:23 + --> $DIR/E0501.rs:21:23 | LL | let bar = || { | -- closure construction occurs here diff --git a/src/test/ui/E0501.rs b/src/test/ui/E0501.rs index 5643e1ef09146..a710e23a67049 100644 --- a/src/test/ui/E0501.rs +++ b/src/test/ui/E0501.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/E0506.ast.nll.stderr b/src/test/ui/E0506.ast.nll.stderr index cf6b8d9c8d1d5..b66c1d129a79a 100644 --- a/src/test/ui/E0506.ast.nll.stderr +++ b/src/test/ui/E0506.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `fancy_num` because it is borrowed - --> $DIR/E0506.rs:21:5 + --> $DIR/E0506.rs:11:5 | LL | let fancy_ref = &fancy_num; | ---------- borrow of `fancy_num` occurs here diff --git a/src/test/ui/E0506.ast.stderr b/src/test/ui/E0506.ast.stderr index 54b4e16368157..d459dcdc21994 100644 --- a/src/test/ui/E0506.ast.stderr +++ b/src/test/ui/E0506.ast.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `fancy_num` because it is borrowed - --> $DIR/E0506.rs:21:5 + --> $DIR/E0506.rs:11:5 | LL | let fancy_ref = &fancy_num; | --------- borrow of `fancy_num` occurs here diff --git a/src/test/ui/E0506.mir.stderr b/src/test/ui/E0506.mir.stderr index cf6b8d9c8d1d5..b66c1d129a79a 100644 --- a/src/test/ui/E0506.mir.stderr +++ b/src/test/ui/E0506.mir.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `fancy_num` because it is borrowed - --> $DIR/E0506.rs:21:5 + --> $DIR/E0506.rs:11:5 | LL | let fancy_ref = &fancy_num; | ---------- borrow of `fancy_num` occurs here diff --git a/src/test/ui/E0506.rs b/src/test/ui/E0506.rs index c4a7f257394e7..04aaa008b5a2e 100644 --- a/src/test/ui/E0506.rs +++ b/src/test/ui/E0506.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/E0508-fail.ast.nll.stderr b/src/test/ui/E0508-fail.ast.nll.stderr index fda6c24dc8710..4cc1cf89d6cb9 100644 --- a/src/test/ui/E0508-fail.ast.nll.stderr +++ b/src/test/ui/E0508-fail.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0508]: cannot move out of type `[NonCopy; 1]`, a non-copy array - --> $DIR/E0508-fail.rs:18:18 + --> $DIR/E0508-fail.rs:8:18 | LL | let _value = array[0]; //[ast]~ ERROR [E0508] | ^^^^^^^^ diff --git a/src/test/ui/E0508-fail.ast.stderr b/src/test/ui/E0508-fail.ast.stderr index faf7411af317b..57959c96f63ec 100644 --- a/src/test/ui/E0508-fail.ast.stderr +++ b/src/test/ui/E0508-fail.ast.stderr @@ -1,5 +1,5 @@ error[E0508]: cannot move out of type `[NonCopy; 1]`, a non-copy array - --> $DIR/E0508-fail.rs:18:18 + --> $DIR/E0508-fail.rs:8:18 | LL | let _value = array[0]; //[ast]~ ERROR [E0508] | ^^^^^^^^ diff --git a/src/test/ui/E0508-fail.mir.stderr b/src/test/ui/E0508-fail.mir.stderr index fda6c24dc8710..4cc1cf89d6cb9 100644 --- a/src/test/ui/E0508-fail.mir.stderr +++ b/src/test/ui/E0508-fail.mir.stderr @@ -1,5 +1,5 @@ error[E0508]: cannot move out of type `[NonCopy; 1]`, a non-copy array - --> $DIR/E0508-fail.rs:18:18 + --> $DIR/E0508-fail.rs:8:18 | LL | let _value = array[0]; //[ast]~ ERROR [E0508] | ^^^^^^^^ diff --git a/src/test/ui/E0508-fail.rs b/src/test/ui/E0508-fail.rs index 0c3dce6b0346a..20eac6cd3519f 100644 --- a/src/test/ui/E0508-fail.rs +++ b/src/test/ui/E0508-fail.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/E0508.nll.stderr b/src/test/ui/E0508.nll.stderr index 025ff874bced4..82fdce2112ecf 100644 --- a/src/test/ui/E0508.nll.stderr +++ b/src/test/ui/E0508.nll.stderr @@ -1,5 +1,5 @@ error[E0508]: cannot move out of type `[NonCopy; 1]`, a non-copy array - --> $DIR/E0508.rs:15:18 + --> $DIR/E0508.rs:5:18 | LL | let _value = array[0]; //~ ERROR [E0508] | ^^^^^^^^ diff --git a/src/test/ui/E0508.rs b/src/test/ui/E0508.rs index 86445ad89821c..072c3d66183e3 100644 --- a/src/test/ui/E0508.rs +++ b/src/test/ui/E0508.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct NonCopy; fn main() { diff --git a/src/test/ui/E0508.stderr b/src/test/ui/E0508.stderr index 28ce0d971c69d..1e7b4071d5d79 100644 --- a/src/test/ui/E0508.stderr +++ b/src/test/ui/E0508.stderr @@ -1,5 +1,5 @@ error[E0508]: cannot move out of type `[NonCopy; 1]`, a non-copy array - --> $DIR/E0508.rs:15:18 + --> $DIR/E0508.rs:5:18 | LL | let _value = array[0]; //~ ERROR [E0508] | ^^^^^^^^ diff --git a/src/test/ui/E0583.rs b/src/test/ui/E0583.rs index 3a5255d0f5fe3..969de79c05865 100644 --- a/src/test/ui/E0583.rs +++ b/src/test/ui/E0583.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod module_that_doesnt_exist; //~ ERROR E0583 fn main() { diff --git a/src/test/ui/E0583.stderr b/src/test/ui/E0583.stderr index 82e1cccbb68af..33b584ccefeba 100644 --- a/src/test/ui/E0583.stderr +++ b/src/test/ui/E0583.stderr @@ -1,5 +1,5 @@ error[E0583]: file not found for module `module_that_doesnt_exist` - --> $DIR/E0583.rs:11:5 + --> $DIR/E0583.rs:1:5 | LL | mod module_that_doesnt_exist; //~ ERROR E0583 | ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/E0594.ast.nll.stderr b/src/test/ui/E0594.ast.nll.stderr index f96eb01abe4e7..54681a29b81bc 100644 --- a/src/test/ui/E0594.ast.nll.stderr +++ b/src/test/ui/E0594.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to immutable static item `NUM` - --> $DIR/E0594.rs:17:5 + --> $DIR/E0594.rs:7:5 | LL | NUM = 20; //[ast]~ ERROR E0594 | ^^^^^^^^ cannot assign diff --git a/src/test/ui/E0594.ast.stderr b/src/test/ui/E0594.ast.stderr index f84c1f56ad01c..4eb9ba133ae55 100644 --- a/src/test/ui/E0594.ast.stderr +++ b/src/test/ui/E0594.ast.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to immutable static item - --> $DIR/E0594.rs:17:5 + --> $DIR/E0594.rs:7:5 | LL | NUM = 20; //[ast]~ ERROR E0594 | ^^^^^^^^ diff --git a/src/test/ui/E0594.mir.stderr b/src/test/ui/E0594.mir.stderr index f96eb01abe4e7..54681a29b81bc 100644 --- a/src/test/ui/E0594.mir.stderr +++ b/src/test/ui/E0594.mir.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to immutable static item `NUM` - --> $DIR/E0594.rs:17:5 + --> $DIR/E0594.rs:7:5 | LL | NUM = 20; //[ast]~ ERROR E0594 | ^^^^^^^^ cannot assign diff --git a/src/test/ui/E0594.rs b/src/test/ui/E0594.rs index e5e96451d1360..a8ca2fe61613a 100644 --- a/src/test/ui/E0594.rs +++ b/src/test/ui/E0594.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/E0596.ast.nll.stderr b/src/test/ui/E0596.ast.nll.stderr index 589db4a032d38..e5da6649f5aaf 100644 --- a/src/test/ui/E0596.ast.nll.stderr +++ b/src/test/ui/E0596.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable - --> $DIR/E0596.rs:16:13 + --> $DIR/E0596.rs:6:13 | LL | let x = 1; | - help: consider changing this to be mutable: `mut x` diff --git a/src/test/ui/E0596.ast.stderr b/src/test/ui/E0596.ast.stderr index d88530b21647e..0d4c585e3b4b1 100644 --- a/src/test/ui/E0596.ast.stderr +++ b/src/test/ui/E0596.ast.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow immutable local variable `x` as mutable - --> $DIR/E0596.rs:16:18 + --> $DIR/E0596.rs:6:18 | LL | let x = 1; | - consider changing this to `mut x` diff --git a/src/test/ui/E0596.mir.stderr b/src/test/ui/E0596.mir.stderr index 589db4a032d38..e5da6649f5aaf 100644 --- a/src/test/ui/E0596.mir.stderr +++ b/src/test/ui/E0596.mir.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable - --> $DIR/E0596.rs:16:13 + --> $DIR/E0596.rs:6:13 | LL | let x = 1; | - help: consider changing this to be mutable: `mut x` diff --git a/src/test/ui/E0596.rs b/src/test/ui/E0596.rs index 52bdff55d86a3..3ea2d64a404c7 100644 --- a/src/test/ui/E0596.rs +++ b/src/test/ui/E0596.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/E0642.rs b/src/test/ui/E0642.rs index 58ccfc56ab79a..8b74e5abe19df 100644 --- a/src/test/ui/E0642.rs +++ b/src/test/ui/E0642.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Clone, Copy)] struct S; diff --git a/src/test/ui/E0642.stderr b/src/test/ui/E0642.stderr index 34c163e210970..c3a230d5acf3c 100644 --- a/src/test/ui/E0642.stderr +++ b/src/test/ui/E0642.stderr @@ -1,5 +1,5 @@ error[E0642]: patterns aren't allowed in methods without bodies - --> $DIR/E0642.rs:15:12 + --> $DIR/E0642.rs:5:12 | LL | fn foo((x, y): (i32, i32)); //~ ERROR patterns aren't allowed in methods without bodies | ^^^^^^ @@ -9,7 +9,7 @@ LL | fn foo(_: (i32, i32)); //~ ERROR patterns aren't allowed in methods wit | ^ error[E0642]: patterns aren't allowed in methods without bodies - --> $DIR/E0642.rs:17:12 + --> $DIR/E0642.rs:7:12 | LL | fn bar((x, y): (i32, i32)) {} //~ ERROR patterns aren't allowed in methods without bodies | ^^^^^^ diff --git a/src/test/ui/E0660.rs b/src/test/ui/E0660.rs index 2981e4ea8b3a3..6280d39061035 100644 --- a/src/test/ui/E0660.rs +++ b/src/test/ui/E0660.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(asm)] fn main() { diff --git a/src/test/ui/E0660.stderr b/src/test/ui/E0660.stderr index e8acb282be94d..d355531ef5d91 100644 --- a/src/test/ui/E0660.stderr +++ b/src/test/ui/E0660.stderr @@ -1,11 +1,11 @@ error[E0660]: malformed inline assembly - --> $DIR/E0660.rs:15:5 + --> $DIR/E0660.rs:5:5 | LL | asm!("nop" "nop"); | ^^^^^^^^^^^^^^^^^^ error[E0660]: malformed inline assembly - --> $DIR/E0660.rs:17:5 + --> $DIR/E0660.rs:7:5 | LL | asm!("nop" "nop" : "=r"(a)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/E0661.rs b/src/test/ui/E0661.rs index 2410eba02451f..8d355a8a021e2 100644 --- a/src/test/ui/E0661.rs +++ b/src/test/ui/E0661.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(asm)] fn main() { diff --git a/src/test/ui/E0661.stderr b/src/test/ui/E0661.stderr index 90aeca5612ae4..1f41f89608fdf 100644 --- a/src/test/ui/E0661.stderr +++ b/src/test/ui/E0661.stderr @@ -1,5 +1,5 @@ error[E0661]: output operand constraint lacks '=' or '+' - --> $DIR/E0661.rs:15:18 + --> $DIR/E0661.rs:5:18 | LL | asm!("nop" : "r"(a)); | ^^^ diff --git a/src/test/ui/E0662.rs b/src/test/ui/E0662.rs index 700540fd1e0c0..7fe528c474599 100644 --- a/src/test/ui/E0662.rs +++ b/src/test/ui/E0662.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(asm)] fn main() { diff --git a/src/test/ui/E0662.stderr b/src/test/ui/E0662.stderr index 31655ca198794..2156b43973fc3 100644 --- a/src/test/ui/E0662.stderr +++ b/src/test/ui/E0662.stderr @@ -1,5 +1,5 @@ error[E0662]: input operand constraint contains '=' - --> $DIR/E0662.rs:16:12 + --> $DIR/E0662.rs:6:12 | LL | : "=test"("a") //~ ERROR E0662 | ^^^^^^^ diff --git a/src/test/ui/E0663.rs b/src/test/ui/E0663.rs index dea2b9156b7e9..e5b8156cfb32a 100644 --- a/src/test/ui/E0663.rs +++ b/src/test/ui/E0663.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(asm)] fn main() { diff --git a/src/test/ui/E0663.stderr b/src/test/ui/E0663.stderr index 0a287620f20e1..66667a6dc884f 100644 --- a/src/test/ui/E0663.stderr +++ b/src/test/ui/E0663.stderr @@ -1,5 +1,5 @@ error[E0663]: input operand constraint contains '+' - --> $DIR/E0663.rs:16:12 + --> $DIR/E0663.rs:6:12 | LL | : "+test"("a") //~ ERROR E0663 | ^^^^^^^ diff --git a/src/test/ui/E0664.rs b/src/test/ui/E0664.rs index 9773f604c468b..29ec7ced4fd6e 100644 --- a/src/test/ui/E0664.rs +++ b/src/test/ui/E0664.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(asm)] fn main() { diff --git a/src/test/ui/E0664.stderr b/src/test/ui/E0664.stderr index 1e79c84cbc8c4..972b10379d430 100644 --- a/src/test/ui/E0664.stderr +++ b/src/test/ui/E0664.stderr @@ -1,5 +1,5 @@ error[E0664]: clobber should not be surrounded by braces - --> $DIR/E0664.rs:17:12 + --> $DIR/E0664.rs:7:12 | LL | : "{eax}" //~ ERROR E0664 | ^^^^^^^ diff --git a/src/test/ui/E0665.rs b/src/test/ui/E0665.rs index 0a0bd3f59052c..cfd42bd9aac32 100644 --- a/src/test/ui/E0665.rs +++ b/src/test/ui/E0665.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Default)] //~ ERROR E0665 enum Food { Sweet, diff --git a/src/test/ui/E0665.stderr b/src/test/ui/E0665.stderr index 268224cac3826..e044d60653121 100644 --- a/src/test/ui/E0665.stderr +++ b/src/test/ui/E0665.stderr @@ -1,5 +1,5 @@ error[E0665]: `Default` cannot be derived for enums, only structs - --> $DIR/E0665.rs:11:10 + --> $DIR/E0665.rs:1:10 | LL | #[derive(Default)] //~ ERROR E0665 | ^^^^^^^ diff --git a/src/test/ui/E0705.rs b/src/test/ui/E0705.rs index 2e3492937acb9..2fb758dc1938e 100644 --- a/src/test/ui/E0705.rs +++ b/src/test/ui/E0705.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![feature(impl_header_lifetime_elision)] diff --git a/src/test/ui/E0705.stderr b/src/test/ui/E0705.stderr index c40064d38d2ff..2653aa751ff34 100644 --- a/src/test/ui/E0705.stderr +++ b/src/test/ui/E0705.stderr @@ -1,5 +1,5 @@ warning[E0705]: the feature `impl_header_lifetime_elision` is included in the Rust 2018 edition - --> $DIR/E0705.rs:13:12 + --> $DIR/E0705.rs:3:12 | LL | #![feature(impl_header_lifetime_elision)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/absolute-paths-in-nested-use-groups.rs b/src/test/ui/absolute-paths-in-nested-use-groups.rs index fe052f2f47ffd..96b5131674c75 100644 --- a/src/test/ui/absolute-paths-in-nested-use-groups.rs +++ b/src/test/ui/absolute-paths-in-nested-use-groups.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_imports)] mod foo {} diff --git a/src/test/ui/absolute-paths-in-nested-use-groups.stderr b/src/test/ui/absolute-paths-in-nested-use-groups.stderr index e88d26718a01e..a06af45ccb0d8 100644 --- a/src/test/ui/absolute-paths-in-nested-use-groups.stderr +++ b/src/test/ui/absolute-paths-in-nested-use-groups.stderr @@ -1,17 +1,17 @@ error[E0433]: failed to resolve. crate root in paths can only be used in start position - --> $DIR/absolute-paths-in-nested-use-groups.rs:16:5 + --> $DIR/absolute-paths-in-nested-use-groups.rs:6:5 | LL | ::bar, //~ ERROR crate root in paths can only be used in start position | ^ crate root in paths can only be used in start position error[E0433]: failed to resolve. `super` in paths can only be used in start position - --> $DIR/absolute-paths-in-nested-use-groups.rs:17:5 + --> $DIR/absolute-paths-in-nested-use-groups.rs:7:5 | LL | super::bar, //~ ERROR `super` in paths can only be used in start position | ^^^^^ `super` in paths can only be used in start position error[E0433]: failed to resolve. `self` in paths can only be used in start position - --> $DIR/absolute-paths-in-nested-use-groups.rs:18:5 + --> $DIR/absolute-paths-in-nested-use-groups.rs:8:5 | LL | self::bar, //~ ERROR `self` in paths can only be used in start position | ^^^^ `self` in paths can only be used in start position diff --git a/src/test/ui/access-mode-in-closures.nll.stderr b/src/test/ui/access-mode-in-closures.nll.stderr index b9de60f43f703..0a5c5e9969621 100644 --- a/src/test/ui/access-mode-in-closures.nll.stderr +++ b/src/test/ui/access-mode-in-closures.nll.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/access-mode-in-closures.rs:19:15 + --> $DIR/access-mode-in-closures.rs:8:15 | LL | match *s { sty(v) => v } //~ ERROR cannot move out | ^^ - data moved here @@ -8,7 +8,7 @@ LL | match *s { sty(v) => v } //~ ERROR cannot move out | help: consider removing the `*`: `s` | note: move occurs because `v` has type `std::vec::Vec`, which does not implement the `Copy` trait - --> $DIR/access-mode-in-closures.rs:19:24 + --> $DIR/access-mode-in-closures.rs:8:24 | LL | match *s { sty(v) => v } //~ ERROR cannot move out | ^ diff --git a/src/test/ui/access-mode-in-closures.rs b/src/test/ui/access-mode-in-closures.rs index bad192fc2cfea..742b162281502 100644 --- a/src/test/ui/access-mode-in-closures.rs +++ b/src/test/ui/access-mode-in-closures.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct sty(Vec ); fn unpack(_unpack: F) where F: FnOnce(&sty) -> Vec {} diff --git a/src/test/ui/access-mode-in-closures.stderr b/src/test/ui/access-mode-in-closures.stderr index daecbb6ed2993..0b4f9ebf0bb90 100644 --- a/src/test/ui/access-mode-in-closures.stderr +++ b/src/test/ui/access-mode-in-closures.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/access-mode-in-closures.rs:19:15 + --> $DIR/access-mode-in-closures.rs:8:15 | LL | match *s { sty(v) => v } //~ ERROR cannot move out | ^^ - hint: to prevent move, use `ref v` or `ref mut v` diff --git a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-1.rs b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-1.rs index e398f16a065bd..6061876b86e1b 100644 --- a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-1.rs +++ b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-1.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-C panic=abort #![feature(alloc_error_handler, panic_implementation)] diff --git a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-1.stderr b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-1.stderr index 6dd905ceab405..8efbf7f78d91e 100644 --- a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-1.stderr +++ b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-1.stderr @@ -1,11 +1,11 @@ error: return type should be `!` - --> $DIR/alloc-error-handler-bad-signature-1.rs:22:6 + --> $DIR/alloc-error-handler-bad-signature-1.rs:12:6 | LL | ) -> () //~ ERROR return type should be `!` | ^^ error: argument should be `Layout` - --> $DIR/alloc-error-handler-bad-signature-1.rs:21:11 + --> $DIR/alloc-error-handler-bad-signature-1.rs:11:11 | LL | info: &Layout, //~ ERROR argument should be `Layout` | ^^^^^^^ diff --git a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-2.rs b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-2.rs index 4fee9d27e5175..2de2ed9affa4d 100644 --- a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-2.rs +++ b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-2.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-C panic=abort #![feature(alloc_error_handler, panic_implementation)] diff --git a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-2.stderr b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-2.stderr index c1fcdc7583360..95ef9a0522c34 100644 --- a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-2.stderr +++ b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-2.stderr @@ -1,11 +1,11 @@ error: return type should be `!` - --> $DIR/alloc-error-handler-bad-signature-2.rs:22:3 + --> $DIR/alloc-error-handler-bad-signature-2.rs:12:3 | LL | ) { //~ ERROR return type should be `!` | ^ error: argument should be `Layout` - --> $DIR/alloc-error-handler-bad-signature-2.rs:21:11 + --> $DIR/alloc-error-handler-bad-signature-2.rs:11:11 | LL | info: Layout, //~ ERROR argument should be `Layout` | ^^^^^^ diff --git a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-3.rs b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-3.rs index 828a78055d5f2..776b6502ad088 100644 --- a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-3.rs +++ b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-3.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-C panic=abort #![feature(alloc_error_handler, panic_implementation)] diff --git a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-3.stderr b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-3.stderr index 9b792c46c24b9..af6c216fe036f 100644 --- a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-3.stderr +++ b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-3.stderr @@ -1,5 +1,5 @@ error: function should have one argument - --> $DIR/alloc-error-handler-bad-signature-3.rs:20:1 + --> $DIR/alloc-error-handler-bad-signature-3.rs:10:1 | LL | / fn oom() -> ! { //~ ERROR function should have one argument LL | | loop {} diff --git a/src/test/ui/allocator-submodule.rs b/src/test/ui/allocator-submodule.rs index 39b65766924f9..a1cca50ba9817 100644 --- a/src/test/ui/allocator-submodule.rs +++ b/src/test/ui/allocator-submodule.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that it is possible to create a global allocator in a submodule, rather than in the crate // root. diff --git a/src/test/ui/allocator-submodule.stderr b/src/test/ui/allocator-submodule.stderr index 06e0d36e8a2b1..32c7211cd1641 100644 --- a/src/test/ui/allocator-submodule.stderr +++ b/src/test/ui/allocator-submodule.stderr @@ -1,5 +1,5 @@ error: `global_allocator` cannot be used in submodules - --> $DIR/allocator-submodule.rs:37:5 + --> $DIR/allocator-submodule.rs:27:5 | LL | static MY_HEAP: MyAlloc = MyAlloc; //~ ERROR global_allocator | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/allocator/auxiliary/system-allocator.rs b/src/test/ui/allocator/auxiliary/system-allocator.rs index e5650d5b7b099..97b86bbc96d07 100644 --- a/src/test/ui/allocator/auxiliary/system-allocator.rs +++ b/src/test/ui/allocator/auxiliary/system-allocator.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "rlib"] diff --git a/src/test/ui/allocator/auxiliary/system-allocator2.rs b/src/test/ui/allocator/auxiliary/system-allocator2.rs index e5650d5b7b099..97b86bbc96d07 100644 --- a/src/test/ui/allocator/auxiliary/system-allocator2.rs +++ b/src/test/ui/allocator/auxiliary/system-allocator2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "rlib"] diff --git a/src/test/ui/allocator/function-allocator.rs b/src/test/ui/allocator/function-allocator.rs index 989c102b86e69..d53f6e9b72e88 100644 --- a/src/test/ui/allocator/function-allocator.rs +++ b/src/test/ui/allocator/function-allocator.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #[global_allocator] fn foo() {} //~ ERROR: allocators must be statics diff --git a/src/test/ui/allocator/function-allocator.stderr b/src/test/ui/allocator/function-allocator.stderr index 8649b6b124452..ecb6e4d4ecde2 100644 --- a/src/test/ui/allocator/function-allocator.stderr +++ b/src/test/ui/allocator/function-allocator.stderr @@ -1,5 +1,5 @@ error: allocators must be statics - --> $DIR/function-allocator.rs:13:1 + --> $DIR/function-allocator.rs:2:1 | LL | fn foo() {} //~ ERROR: allocators must be statics | ^^^^^^^^^^^ diff --git a/src/test/ui/allocator/not-an-allocator.rs b/src/test/ui/allocator/not-an-allocator.rs index 6559335960ac5..417c371bdbf61 100644 --- a/src/test/ui/allocator/not-an-allocator.rs +++ b/src/test/ui/allocator/not-an-allocator.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[global_allocator] static A: usize = 0; //~^ the trait bound `usize: diff --git a/src/test/ui/allocator/not-an-allocator.stderr b/src/test/ui/allocator/not-an-allocator.stderr index 757c5066a6608..dd2cf36ff1b83 100644 --- a/src/test/ui/allocator/not-an-allocator.stderr +++ b/src/test/ui/allocator/not-an-allocator.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `usize: std::alloc::GlobalAlloc` is not satisfied - --> $DIR/not-an-allocator.rs:12:1 + --> $DIR/not-an-allocator.rs:2:1 | LL | static A: usize = 0; | ^^^^^^^^^^^^^^^^^^^^ the trait `std::alloc::GlobalAlloc` is not implemented for `usize` @@ -7,7 +7,7 @@ LL | static A: usize = 0; = note: required by `std::alloc::GlobalAlloc::alloc` error[E0277]: the trait bound `usize: std::alloc::GlobalAlloc` is not satisfied - --> $DIR/not-an-allocator.rs:12:1 + --> $DIR/not-an-allocator.rs:2:1 | LL | static A: usize = 0; | ^^^^^^^^^^^^^^^^^^^^ the trait `std::alloc::GlobalAlloc` is not implemented for `usize` @@ -15,7 +15,7 @@ LL | static A: usize = 0; = note: required by `std::alloc::GlobalAlloc::dealloc` error[E0277]: the trait bound `usize: std::alloc::GlobalAlloc` is not satisfied - --> $DIR/not-an-allocator.rs:12:1 + --> $DIR/not-an-allocator.rs:2:1 | LL | static A: usize = 0; | ^^^^^^^^^^^^^^^^^^^^ the trait `std::alloc::GlobalAlloc` is not implemented for `usize` @@ -23,7 +23,7 @@ LL | static A: usize = 0; = note: required by `std::alloc::GlobalAlloc::realloc` error[E0277]: the trait bound `usize: std::alloc::GlobalAlloc` is not satisfied - --> $DIR/not-an-allocator.rs:12:1 + --> $DIR/not-an-allocator.rs:2:1 | LL | static A: usize = 0; | ^^^^^^^^^^^^^^^^^^^^ the trait `std::alloc::GlobalAlloc` is not implemented for `usize` diff --git a/src/test/ui/allocator/two-allocators.rs b/src/test/ui/allocator/two-allocators.rs index 7a97a11df2033..c967a45c7b485 100644 --- a/src/test/ui/allocator/two-allocators.rs +++ b/src/test/ui/allocator/two-allocators.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::alloc::System; #[global_allocator] diff --git a/src/test/ui/allocator/two-allocators.stderr b/src/test/ui/allocator/two-allocators.stderr index 5285ee93f2d6a..da247f6c316c3 100644 --- a/src/test/ui/allocator/two-allocators.stderr +++ b/src/test/ui/allocator/two-allocators.stderr @@ -1,5 +1,5 @@ error: cannot define more than one #[global_allocator] - --> $DIR/two-allocators.rs:16:1 + --> $DIR/two-allocators.rs:6:1 | LL | static B: System = System; | ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/allocator/two-allocators2.rs b/src/test/ui/allocator/two-allocators2.rs index e747140dfe560..b7a07cc274e1d 100644 --- a/src/test/ui/allocator/two-allocators2.rs +++ b/src/test/ui/allocator/two-allocators2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:system-allocator.rs // no-prefer-dynamic // error-pattern: the #[global_allocator] in diff --git a/src/test/ui/allocator/two-allocators3.rs b/src/test/ui/allocator/two-allocators3.rs index dd86b02bd20ec..8a06335c0318a 100644 --- a/src/test/ui/allocator/two-allocators3.rs +++ b/src/test/ui/allocator/two-allocators3.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:system-allocator.rs // aux-build:system-allocator2.rs // no-prefer-dynamic diff --git a/src/test/ui/anon-params-deprecated.rs b/src/test/ui/anon-params-deprecated.rs index 4d37ba920f3d6..4ee1b2f71948d 100644 --- a/src/test/ui/anon-params-deprecated.rs +++ b/src/test/ui/anon-params-deprecated.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![forbid(anonymous_parameters)] // Test for the anonymous_parameters deprecation lint (RFC 1685) diff --git a/src/test/ui/anon-params-deprecated.stderr b/src/test/ui/anon-params-deprecated.stderr index fa13b8d97e5d9..f38f53fb07a12 100644 --- a/src/test/ui/anon-params-deprecated.stderr +++ b/src/test/ui/anon-params-deprecated.stderr @@ -1,11 +1,11 @@ error: anonymous parameters are deprecated and will be removed in the next edition. - --> $DIR/anon-params-deprecated.rs:15:12 + --> $DIR/anon-params-deprecated.rs:5:12 | LL | fn foo(i32); //~ ERROR anonymous parameters are deprecated | ^^^ help: Try naming the parameter or explicitly ignoring it: `_: i32` | note: lint level defined here - --> $DIR/anon-params-deprecated.rs:11:11 + --> $DIR/anon-params-deprecated.rs:1:11 | LL | #![forbid(anonymous_parameters)] | ^^^^^^^^^^^^^^^^^^^^ @@ -13,7 +13,7 @@ LL | #![forbid(anonymous_parameters)] = note: for more information, see issue #41686 error: anonymous parameters are deprecated and will be removed in the next edition. - --> $DIR/anon-params-deprecated.rs:18:30 + --> $DIR/anon-params-deprecated.rs:8:30 | LL | fn bar_with_default_impl(String, String) {} | ^^^^^^ help: Try naming the parameter or explicitly ignoring it: `_: String` @@ -22,7 +22,7 @@ LL | fn bar_with_default_impl(String, String) {} = note: for more information, see issue #41686 error: anonymous parameters are deprecated and will be removed in the next edition. - --> $DIR/anon-params-deprecated.rs:18:38 + --> $DIR/anon-params-deprecated.rs:8:38 | LL | fn bar_with_default_impl(String, String) {} | ^^^^^^ help: Try naming the parameter or explicitly ignoring it: `_: String` diff --git a/src/test/ui/anonymous-higher-ranked-lifetime.rs b/src/test/ui/anonymous-higher-ranked-lifetime.rs index 295e3d1a73521..55b1667da50b1 100644 --- a/src/test/ui/anonymous-higher-ranked-lifetime.rs +++ b/src/test/ui/anonymous-higher-ranked-lifetime.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { f1(|_: (), _: ()| {}); //~ ERROR type mismatch f2(|_: (), _: ()| {}); //~ ERROR type mismatch diff --git a/src/test/ui/anonymous-higher-ranked-lifetime.stderr b/src/test/ui/anonymous-higher-ranked-lifetime.stderr index 809d111d74e65..d2c722e32b210 100644 --- a/src/test/ui/anonymous-higher-ranked-lifetime.stderr +++ b/src/test/ui/anonymous-higher-ranked-lifetime.stderr @@ -1,5 +1,5 @@ error[E0631]: type mismatch in closure arguments - --> $DIR/anonymous-higher-ranked-lifetime.rs:12:5 + --> $DIR/anonymous-higher-ranked-lifetime.rs:2:5 | LL | f1(|_: (), _: ()| {}); //~ ERROR type mismatch | ^^ -------------- found signature of `fn((), ()) -> _` @@ -7,13 +7,13 @@ LL | f1(|_: (), _: ()| {}); //~ ERROR type mismatch | expected signature of `for<'r, 's> fn(&'r (), &'s ()) -> _` | note: required by `f1` - --> $DIR/anonymous-higher-ranked-lifetime.rs:26:1 + --> $DIR/anonymous-higher-ranked-lifetime.rs:16:1 | LL | fn f1(_: F) where F: Fn(&(), &()) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0631]: type mismatch in closure arguments - --> $DIR/anonymous-higher-ranked-lifetime.rs:13:5 + --> $DIR/anonymous-higher-ranked-lifetime.rs:3:5 | LL | f2(|_: (), _: ()| {}); //~ ERROR type mismatch | ^^ -------------- found signature of `fn((), ()) -> _` @@ -21,13 +21,13 @@ LL | f2(|_: (), _: ()| {}); //~ ERROR type mismatch | expected signature of `for<'a, 'r> fn(&'a (), &'r ()) -> _` | note: required by `f2` - --> $DIR/anonymous-higher-ranked-lifetime.rs:27:1 + --> $DIR/anonymous-higher-ranked-lifetime.rs:17:1 | LL | fn f2(_: F) where F: for<'a> Fn(&'a (), &()) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0631]: type mismatch in closure arguments - --> $DIR/anonymous-higher-ranked-lifetime.rs:14:5 + --> $DIR/anonymous-higher-ranked-lifetime.rs:4:5 | LL | f3(|_: (), _: ()| {}); //~ ERROR type mismatch | ^^ -------------- found signature of `fn((), ()) -> _` @@ -35,13 +35,13 @@ LL | f3(|_: (), _: ()| {}); //~ ERROR type mismatch | expected signature of `for<'r> fn(&(), &'r ()) -> _` | note: required by `f3` - --> $DIR/anonymous-higher-ranked-lifetime.rs:28:1 + --> $DIR/anonymous-higher-ranked-lifetime.rs:18:1 | LL | fn f3<'a, F>(_: F) where F: Fn(&'a (), &()) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0631]: type mismatch in closure arguments - --> $DIR/anonymous-higher-ranked-lifetime.rs:15:5 + --> $DIR/anonymous-higher-ranked-lifetime.rs:5:5 | LL | f4(|_: (), _: ()| {}); //~ ERROR type mismatch | ^^ -------------- found signature of `fn((), ()) -> _` @@ -49,13 +49,13 @@ LL | f4(|_: (), _: ()| {}); //~ ERROR type mismatch | expected signature of `for<'s, 'r> fn(&'s (), &'r ()) -> _` | note: required by `f4` - --> $DIR/anonymous-higher-ranked-lifetime.rs:29:1 + --> $DIR/anonymous-higher-ranked-lifetime.rs:19:1 | LL | fn f4(_: F) where F: for<'r> Fn(&(), &'r ()) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0631]: type mismatch in closure arguments - --> $DIR/anonymous-higher-ranked-lifetime.rs:16:5 + --> $DIR/anonymous-higher-ranked-lifetime.rs:6:5 | LL | f5(|_: (), _: ()| {}); //~ ERROR type mismatch | ^^ -------------- found signature of `fn((), ()) -> _` @@ -63,13 +63,13 @@ LL | f5(|_: (), _: ()| {}); //~ ERROR type mismatch | expected signature of `for<'r> fn(&'r (), &'r ()) -> _` | note: required by `f5` - --> $DIR/anonymous-higher-ranked-lifetime.rs:30:1 + --> $DIR/anonymous-higher-ranked-lifetime.rs:20:1 | LL | fn f5(_: F) where F: for<'r> Fn(&'r (), &'r ()) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0631]: type mismatch in closure arguments - --> $DIR/anonymous-higher-ranked-lifetime.rs:17:5 + --> $DIR/anonymous-higher-ranked-lifetime.rs:7:5 | LL | g1(|_: (), _: ()| {}); //~ ERROR type mismatch | ^^ -------------- found signature of `fn((), ()) -> _` @@ -77,13 +77,13 @@ LL | g1(|_: (), _: ()| {}); //~ ERROR type mismatch | expected signature of `for<'r> fn(&'r (), std::boxed::Box<(dyn for<'s> std::ops::Fn(&'s ()) + 'static)>) -> _` | note: required by `g1` - --> $DIR/anonymous-higher-ranked-lifetime.rs:33:1 + --> $DIR/anonymous-higher-ranked-lifetime.rs:23:1 | LL | fn g1(_: F) where F: Fn(&(), Box) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0631]: type mismatch in closure arguments - --> $DIR/anonymous-higher-ranked-lifetime.rs:18:5 + --> $DIR/anonymous-higher-ranked-lifetime.rs:8:5 | LL | g2(|_: (), _: ()| {}); //~ ERROR type mismatch | ^^ -------------- found signature of `fn((), ()) -> _` @@ -91,13 +91,13 @@ LL | g2(|_: (), _: ()| {}); //~ ERROR type mismatch | expected signature of `for<'r> fn(&'r (), for<'s> fn(&'s ())) -> _` | note: required by `g2` - --> $DIR/anonymous-higher-ranked-lifetime.rs:34:1 + --> $DIR/anonymous-higher-ranked-lifetime.rs:24:1 | LL | fn g2(_: F) where F: Fn(&(), fn(&())) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0631]: type mismatch in closure arguments - --> $DIR/anonymous-higher-ranked-lifetime.rs:19:5 + --> $DIR/anonymous-higher-ranked-lifetime.rs:9:5 | LL | g3(|_: (), _: ()| {}); //~ ERROR type mismatch | ^^ -------------- found signature of `fn((), ()) -> _` @@ -105,13 +105,13 @@ LL | g3(|_: (), _: ()| {}); //~ ERROR type mismatch | expected signature of `for<'s> fn(&'s (), std::boxed::Box<(dyn for<'r> std::ops::Fn(&'r ()) + 'static)>) -> _` | note: required by `g3` - --> $DIR/anonymous-higher-ranked-lifetime.rs:35:1 + --> $DIR/anonymous-higher-ranked-lifetime.rs:25:1 | LL | fn g3(_: F) where F: for<'s> Fn(&'s (), Box) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0631]: type mismatch in closure arguments - --> $DIR/anonymous-higher-ranked-lifetime.rs:20:5 + --> $DIR/anonymous-higher-ranked-lifetime.rs:10:5 | LL | g4(|_: (), _: ()| {}); //~ ERROR type mismatch | ^^ -------------- found signature of `fn((), ()) -> _` @@ -119,13 +119,13 @@ LL | g4(|_: (), _: ()| {}); //~ ERROR type mismatch | expected signature of `for<'s> fn(&'s (), for<'r> fn(&'r ())) -> _` | note: required by `g4` - --> $DIR/anonymous-higher-ranked-lifetime.rs:36:1 + --> $DIR/anonymous-higher-ranked-lifetime.rs:26:1 | LL | fn g4(_: F) where F: Fn(&(), for<'r> fn(&'r ())) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0631]: type mismatch in closure arguments - --> $DIR/anonymous-higher-ranked-lifetime.rs:21:5 + --> $DIR/anonymous-higher-ranked-lifetime.rs:11:5 | LL | h1(|_: (), _: (), _: (), _: ()| {}); //~ ERROR type mismatch | ^^ ---------------------------- found signature of `fn((), (), (), ()) -> _` @@ -133,13 +133,13 @@ LL | h1(|_: (), _: (), _: (), _: ()| {}); //~ ERROR type mismatch | expected signature of `for<'r, 's> fn(&'r (), std::boxed::Box<(dyn for<'t0> std::ops::Fn(&'t0 ()) + 'static)>, &'s (), for<'t0, 't1> fn(&'t0 (), &'t1 ())) -> _` | note: required by `h1` - --> $DIR/anonymous-higher-ranked-lifetime.rs:39:1 + --> $DIR/anonymous-higher-ranked-lifetime.rs:29:1 | LL | fn h1(_: F) where F: Fn(&(), Box, &(), fn(&(), &())) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0631]: type mismatch in closure arguments - --> $DIR/anonymous-higher-ranked-lifetime.rs:22:5 + --> $DIR/anonymous-higher-ranked-lifetime.rs:12:5 | LL | h2(|_: (), _: (), _: (), _: ()| {}); //~ ERROR type mismatch | ^^ ---------------------------- found signature of `fn((), (), (), ()) -> _` @@ -147,7 +147,7 @@ LL | h2(|_: (), _: (), _: (), _: ()| {}); //~ ERROR type mismatch | expected signature of `for<'r, 't0> fn(&'r (), std::boxed::Box<(dyn for<'s> std::ops::Fn(&'s ()) + 'static)>, &'t0 (), for<'s, 't1> fn(&'s (), &'t1 ())) -> _` | note: required by `h2` - --> $DIR/anonymous-higher-ranked-lifetime.rs:40:1 + --> $DIR/anonymous-higher-ranked-lifetime.rs:30:1 | LL | fn h2(_: F) where F: for<'t0> Fn(&(), Box, &'t0 (), fn(&(), &())) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/arbitrary-self-types-not-object-safe.rs b/src/test/ui/arbitrary-self-types-not-object-safe.rs index 48918b996ef59..5bb59a33a7116 100644 --- a/src/test/ui/arbitrary-self-types-not-object-safe.rs +++ b/src/test/ui/arbitrary-self-types-not-object-safe.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![feature(arbitrary_self_types)] use std::rc::Rc; diff --git a/src/test/ui/arbitrary-self-types-not-object-safe.stderr b/src/test/ui/arbitrary-self-types-not-object-safe.stderr index ec9e65fc4c62d..5c68543d4a778 100644 --- a/src/test/ui/arbitrary-self-types-not-object-safe.stderr +++ b/src/test/ui/arbitrary-self-types-not-object-safe.stderr @@ -1,5 +1,5 @@ error[E0038]: the trait `Foo` cannot be made into an object - --> $DIR/arbitrary-self-types-not-object-safe.rs:40:33 + --> $DIR/arbitrary-self-types-not-object-safe.rs:31:33 | LL | let x = Box::new(5usize) as Box; | ^^^^^^^^ the trait `Foo` cannot be made into an object @@ -7,7 +7,7 @@ LL | let x = Box::new(5usize) as Box; = note: method `foo` has a non-standard `self` type error[E0038]: the trait `Foo` cannot be made into an object - --> $DIR/arbitrary-self-types-not-object-safe.rs:40:13 + --> $DIR/arbitrary-self-types-not-object-safe.rs:31:13 | LL | let x = Box::new(5usize) as Box; | ^^^^^^^^^^^^^^^^ the trait `Foo` cannot be made into an object diff --git a/src/test/ui/arg-count-mismatch.rs b/src/test/ui/arg-count-mismatch.rs index 673314ec4c997..cf7487069c14a 100644 --- a/src/test/ui/arg-count-mismatch.rs +++ b/src/test/ui/arg-count-mismatch.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: parameters were supplied fn f(x: isize) { } diff --git a/src/test/ui/arg-count-mismatch.stderr b/src/test/ui/arg-count-mismatch.stderr index 699e36f3472d6..44f160413636a 100644 --- a/src/test/ui/arg-count-mismatch.stderr +++ b/src/test/ui/arg-count-mismatch.stderr @@ -1,5 +1,5 @@ error[E0061]: this function takes 1 parameter but 0 parameters were supplied - --> $DIR/arg-count-mismatch.rs:15:28 + --> $DIR/arg-count-mismatch.rs:5:28 | LL | fn f(x: isize) { } | -------------- defined here diff --git a/src/test/ui/arg-type-mismatch.rs b/src/test/ui/arg-type-mismatch.rs index 1f657ca58326e..04ce2888785be 100644 --- a/src/test/ui/arg-type-mismatch.rs +++ b/src/test/ui/arg-type-mismatch.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // error-pattern: mismatched types fn f(x: isize) { } diff --git a/src/test/ui/arg-type-mismatch.stderr b/src/test/ui/arg-type-mismatch.stderr index 2b24d9db3f5b6..d41abd1aa816d 100644 --- a/src/test/ui/arg-type-mismatch.stderr +++ b/src/test/ui/arg-type-mismatch.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/arg-type-mismatch.rs:16:30 + --> $DIR/arg-type-mismatch.rs:5:30 | LL | fn main() { let i: (); i = f(()); } | ^^ expected isize, found () diff --git a/src/test/ui/array-break-length.rs b/src/test/ui/array-break-length.rs index c3cfff0e1f642..ab15ce6e8d8e0 100644 --- a/src/test/ui/array-break-length.rs +++ b/src/test/ui/array-break-length.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { loop { |_: [_; break]| {} //~ ERROR: `break` outside of loop diff --git a/src/test/ui/array-break-length.stderr b/src/test/ui/array-break-length.stderr index 114245b9cc77b..bba4753046109 100644 --- a/src/test/ui/array-break-length.stderr +++ b/src/test/ui/array-break-length.stderr @@ -1,11 +1,11 @@ error[E0268]: `break` outside of loop - --> $DIR/array-break-length.rs:13:17 + --> $DIR/array-break-length.rs:3:17 | LL | |_: [_; break]| {} //~ ERROR: `break` outside of loop | ^^^^^ cannot break outside of a loop error[E0268]: `continue` outside of loop - --> $DIR/array-break-length.rs:17:17 + --> $DIR/array-break-length.rs:7:17 | LL | |_: [_; continue]| {} //~ ERROR: `continue` outside of loop | ^^^^^^^^ cannot break outside of a loop diff --git a/src/test/ui/array-not-vector.rs b/src/test/ui/array-not-vector.rs index 47e1c09f380b8..80b40ef25c3e0 100644 --- a/src/test/ui/array-not-vector.rs +++ b/src/test/ui/array-not-vector.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let _x: i32 = [1, 2, 3]; //~^ ERROR mismatched types diff --git a/src/test/ui/array-not-vector.stderr b/src/test/ui/array-not-vector.stderr index 83bf058c449c9..b5a5389db093a 100644 --- a/src/test/ui/array-not-vector.stderr +++ b/src/test/ui/array-not-vector.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/array-not-vector.rs:12:19 + --> $DIR/array-not-vector.rs:2:19 | LL | let _x: i32 = [1, 2, 3]; | ^^^^^^^^^ expected i32, found array of 3 elements @@ -8,7 +8,7 @@ LL | let _x: i32 = [1, 2, 3]; found type `[{integer}; 3]` error[E0308]: mismatched types - --> $DIR/array-not-vector.rs:19:20 + --> $DIR/array-not-vector.rs:9:20 | LL | let _y: &i32 = x; | ^ expected i32, found slice diff --git a/src/test/ui/array_const_index-0.rs b/src/test/ui/array_const_index-0.rs index 91007fcd63a28..dbf97deca1927 100644 --- a/src/test/ui/array_const_index-0.rs +++ b/src/test/ui/array_const_index-0.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const A: &'static [i32] = &[]; const B: i32 = (&A)[1]; //~^ index out of bounds: the len is 0 but the index is 1 diff --git a/src/test/ui/array_const_index-0.stderr b/src/test/ui/array_const_index-0.stderr index b71d224f4f0eb..66f783287e8d0 100644 --- a/src/test/ui/array_const_index-0.stderr +++ b/src/test/ui/array_const_index-0.stderr @@ -1,5 +1,5 @@ error: this constant cannot be used - --> $DIR/array_const_index-0.rs:12:1 + --> $DIR/array_const_index-0.rs:2:1 | LL | const B: i32 = (&A)[1]; | ^^^^^^^^^^^^^^^-------^ diff --git a/src/test/ui/array_const_index-1.rs b/src/test/ui/array_const_index-1.rs index 66739d308a70f..7284efffbab59 100644 --- a/src/test/ui/array_const_index-1.rs +++ b/src/test/ui/array_const_index-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const A: [i32; 0] = []; const B: i32 = A[1]; //~^ index out of bounds: the len is 0 but the index is 1 diff --git a/src/test/ui/array_const_index-1.stderr b/src/test/ui/array_const_index-1.stderr index 02f86a693af0c..25c87592c8d6c 100644 --- a/src/test/ui/array_const_index-1.stderr +++ b/src/test/ui/array_const_index-1.stderr @@ -1,5 +1,5 @@ error: this constant cannot be used - --> $DIR/array_const_index-1.rs:12:1 + --> $DIR/array_const_index-1.rs:2:1 | LL | const B: i32 = A[1]; | ^^^^^^^^^^^^^^^----^ diff --git a/src/test/ui/as-ref.rs b/src/test/ui/as-ref.rs index ae1c98c8564bf..822d10f2ca7b3 100644 --- a/src/test/ui/as-ref.rs +++ b/src/test/ui/as-ref.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo; fn takes_ref(_: &Foo) {} diff --git a/src/test/ui/as-ref.stderr b/src/test/ui/as-ref.stderr index 27016445ec5ad..8ca54e8006cf3 100644 --- a/src/test/ui/as-ref.stderr +++ b/src/test/ui/as-ref.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/as-ref.rs:16:27 + --> $DIR/as-ref.rs:6:27 | LL | opt.map(|arg| takes_ref(arg)); | - ^^^ expected &Foo, found struct `Foo` @@ -10,7 +10,7 @@ LL | opt.map(|arg| takes_ref(arg)); found type `Foo` error[E0308]: mismatched types - --> $DIR/as-ref.rs:18:37 + --> $DIR/as-ref.rs:8:37 | LL | opt.and_then(|arg| Some(takes_ref(arg))); | - ^^^ expected &Foo, found struct `Foo` @@ -21,7 +21,7 @@ LL | opt.and_then(|arg| Some(takes_ref(arg))); found type `Foo` error[E0308]: mismatched types - --> $DIR/as-ref.rs:21:27 + --> $DIR/as-ref.rs:11:27 | LL | opt.map(|arg| takes_ref(arg)); | - ^^^ expected &Foo, found struct `Foo` @@ -32,7 +32,7 @@ LL | opt.map(|arg| takes_ref(arg)); found type `Foo` error[E0308]: mismatched types - --> $DIR/as-ref.rs:23:35 + --> $DIR/as-ref.rs:13:35 | LL | opt.and_then(|arg| Ok(takes_ref(arg))); | - ^^^ expected &Foo, found struct `Foo` diff --git a/src/test/ui/asm/asm-bad-clobber.rs b/src/test/ui/asm/asm-bad-clobber.rs index c2b54e37e399d..1cb64af036e63 100644 --- a/src/test/ui/asm/asm-bad-clobber.rs +++ b/src/test/ui/asm/asm-bad-clobber.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-android // ignore-arm // ignore-aarch64 diff --git a/src/test/ui/asm/asm-bad-clobber.stderr b/src/test/ui/asm/asm-bad-clobber.stderr index 81ab006a18ad3..a279421241fac 100644 --- a/src/test/ui/asm/asm-bad-clobber.stderr +++ b/src/test/ui/asm/asm-bad-clobber.stderr @@ -1,5 +1,5 @@ error[E0664]: clobber should not be surrounded by braces - --> $DIR/asm-bad-clobber.rs:32:37 + --> $DIR/asm-bad-clobber.rs:22:37 | LL | asm!("xor %eax, %eax" : : : "{eax}"); | ^^^^^^^ diff --git a/src/test/ui/asm/asm-in-bad-modifier.rs b/src/test/ui/asm/asm-in-bad-modifier.rs index 2eefd4235bcfe..38cd11e251586 100644 --- a/src/test/ui/asm/asm-in-bad-modifier.rs +++ b/src/test/ui/asm/asm-in-bad-modifier.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-s390x // ignore-emscripten // ignore-powerpc diff --git a/src/test/ui/asm/asm-in-bad-modifier.stderr b/src/test/ui/asm/asm-in-bad-modifier.stderr index dcb11bd1e7630..339875390185d 100644 --- a/src/test/ui/asm/asm-in-bad-modifier.stderr +++ b/src/test/ui/asm/asm-in-bad-modifier.stderr @@ -1,11 +1,11 @@ error[E0662]: input operand constraint contains '=' - --> $DIR/asm-in-bad-modifier.rs:33:39 + --> $DIR/asm-in-bad-modifier.rs:23:39 | LL | asm!("mov $1, $0" : "=r"(x) : "=r"(5)); //~ ERROR operand constraint contains '=' | ^^^^ error[E0663]: input operand constraint contains '+' - --> $DIR/asm-in-bad-modifier.rs:34:39 + --> $DIR/asm-in-bad-modifier.rs:24:39 | LL | asm!("mov $1, $0" : "=r"(y) : "+r"(5)); //~ ERROR operand constraint contains '+' | ^^^^ diff --git a/src/test/ui/asm/asm-misplaced-option.rs b/src/test/ui/asm/asm-misplaced-option.rs index bfc1fd68fe07b..e27b2a73059c4 100644 --- a/src/test/ui/asm/asm-misplaced-option.rs +++ b/src/test/ui/asm/asm-misplaced-option.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-android // ignore-arm // ignore-aarch64 diff --git a/src/test/ui/asm/asm-misplaced-option.stderr b/src/test/ui/asm/asm-misplaced-option.stderr index 46723918a3afe..4dc75c3f9beb9 100644 --- a/src/test/ui/asm/asm-misplaced-option.stderr +++ b/src/test/ui/asm/asm-misplaced-option.stderr @@ -1,17 +1,17 @@ warning: unrecognized option - --> $DIR/asm-misplaced-option.rs:36:64 + --> $DIR/asm-misplaced-option.rs:26:64 | LL | asm!("mov $1, $0" : "=r"(x) : "r"(5_usize), "0"(x) : : "cc"); | ^^^^ warning: expected a clobber, found an option - --> $DIR/asm-misplaced-option.rs:43:80 + --> $DIR/asm-misplaced-option.rs:33:80 | LL | asm!("add $2, $1; mov $1, $0" : "=r"(x) : "r"(x), "r"(8_usize) : "cc", "volatile"); | ^^^^^^^^^^ error: compilation successful - --> $DIR/asm-misplaced-option.rs:31:1 + --> $DIR/asm-misplaced-option.rs:21:1 | LL | / pub fn main() { //~ ERROR compilation successful LL | | // assignment not dead diff --git a/src/test/ui/asm/asm-out-assign-imm.nll.stderr b/src/test/ui/asm/asm-out-assign-imm.nll.stderr index 45b0c84275be4..5176370cf6c4f 100644 --- a/src/test/ui/asm/asm-out-assign-imm.nll.stderr +++ b/src/test/ui/asm/asm-out-assign-imm.nll.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `x` - --> $DIR/asm-out-assign-imm.rs:34:9 + --> $DIR/asm-out-assign-imm.rs:24:9 | LL | let x: isize; | - consider changing this to `mut x` diff --git a/src/test/ui/asm/asm-out-assign-imm.rs b/src/test/ui/asm/asm-out-assign-imm.rs index 73143f1154631..7a8be2a133ec7 100644 --- a/src/test/ui/asm/asm-out-assign-imm.rs +++ b/src/test/ui/asm/asm-out-assign-imm.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-s390x // ignore-emscripten // ignore-powerpc diff --git a/src/test/ui/asm/asm-out-assign-imm.stderr b/src/test/ui/asm/asm-out-assign-imm.stderr index 83cb8092e16a2..8cd3731142d59 100644 --- a/src/test/ui/asm/asm-out-assign-imm.stderr +++ b/src/test/ui/asm/asm-out-assign-imm.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `x` - --> $DIR/asm-out-assign-imm.rs:34:9 + --> $DIR/asm-out-assign-imm.rs:24:9 | LL | x = 1; | ----- first assignment to `x` diff --git a/src/test/ui/asm/asm-out-no-modifier.rs b/src/test/ui/asm/asm-out-no-modifier.rs index 40d2ded8a885b..d9142b9f2e0c8 100644 --- a/src/test/ui/asm/asm-out-no-modifier.rs +++ b/src/test/ui/asm/asm-out-no-modifier.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-s390x // ignore-emscripten // ignore-powerpc diff --git a/src/test/ui/asm/asm-out-no-modifier.stderr b/src/test/ui/asm/asm-out-no-modifier.stderr index 4e9d7b884b3b7..12a33e451fb05 100644 --- a/src/test/ui/asm/asm-out-no-modifier.stderr +++ b/src/test/ui/asm/asm-out-no-modifier.stderr @@ -1,5 +1,5 @@ error[E0661]: output operand constraint lacks '=' or '+' - --> $DIR/asm-out-no-modifier.rs:32:29 + --> $DIR/asm-out-no-modifier.rs:22:29 | LL | asm!("mov $1, $0" : "r"(x) : "r"(5)); //~ ERROR output operand constraint lacks '=' | ^^^ diff --git a/src/test/ui/asm/asm-out-read-uninit.ast.stderr b/src/test/ui/asm/asm-out-read-uninit.ast.stderr index 5f6685e5c1c9f..cf74298be4a5d 100644 --- a/src/test/ui/asm/asm-out-read-uninit.ast.stderr +++ b/src/test/ui/asm/asm-out-read-uninit.ast.stderr @@ -1,5 +1,5 @@ error[E0381]: use of possibly uninitialized variable: `x` - --> $DIR/asm-out-read-uninit.rs:35:43 + --> $DIR/asm-out-read-uninit.rs:25:43 | LL | asm!("mov $1, $0" : "=r"(x) : "r"(x)); | ^ use of possibly uninitialized `x` diff --git a/src/test/ui/asm/asm-out-read-uninit.mir.stderr b/src/test/ui/asm/asm-out-read-uninit.mir.stderr index 5f6685e5c1c9f..cf74298be4a5d 100644 --- a/src/test/ui/asm/asm-out-read-uninit.mir.stderr +++ b/src/test/ui/asm/asm-out-read-uninit.mir.stderr @@ -1,5 +1,5 @@ error[E0381]: use of possibly uninitialized variable: `x` - --> $DIR/asm-out-read-uninit.rs:35:43 + --> $DIR/asm-out-read-uninit.rs:25:43 | LL | asm!("mov $1, $0" : "=r"(x) : "r"(x)); | ^ use of possibly uninitialized `x` diff --git a/src/test/ui/asm/asm-out-read-uninit.rs b/src/test/ui/asm/asm-out-read-uninit.rs index c308a9f085081..44dd0503c3bbf 100644 --- a/src/test/ui/asm/asm-out-read-uninit.rs +++ b/src/test/ui/asm/asm-out-read-uninit.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-s390x // ignore-emscripten // ignore-powerpc diff --git a/src/test/ui/assign-imm-local-twice.ast.nll.stderr b/src/test/ui/assign-imm-local-twice.ast.nll.stderr index 6d415eb733318..ef04d210b0faf 100644 --- a/src/test/ui/assign-imm-local-twice.ast.nll.stderr +++ b/src/test/ui/assign-imm-local-twice.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `v` - --> $DIR/assign-imm-local-twice.rs:20:5 + --> $DIR/assign-imm-local-twice.rs:10:5 | LL | let v: isize; | - consider changing this to `mut v` diff --git a/src/test/ui/assign-imm-local-twice.ast.stderr b/src/test/ui/assign-imm-local-twice.ast.stderr index 32752621e149f..36ff3cfb4c5bc 100644 --- a/src/test/ui/assign-imm-local-twice.ast.stderr +++ b/src/test/ui/assign-imm-local-twice.ast.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `v` - --> $DIR/assign-imm-local-twice.rs:20:5 + --> $DIR/assign-imm-local-twice.rs:10:5 | LL | v = 1; //[ast]~ NOTE first assignment | ----- first assignment to `v` diff --git a/src/test/ui/assign-imm-local-twice.mir.stderr b/src/test/ui/assign-imm-local-twice.mir.stderr index 6d415eb733318..ef04d210b0faf 100644 --- a/src/test/ui/assign-imm-local-twice.mir.stderr +++ b/src/test/ui/assign-imm-local-twice.mir.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `v` - --> $DIR/assign-imm-local-twice.rs:20:5 + --> $DIR/assign-imm-local-twice.rs:10:5 | LL | let v: isize; | - consider changing this to `mut v` diff --git a/src/test/ui/assign-imm-local-twice.rs b/src/test/ui/assign-imm-local-twice.rs index ee9dafdd49eb8..ef214051bc6e7 100644 --- a/src/test/ui/assign-imm-local-twice.rs +++ b/src/test/ui/assign-imm-local-twice.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Zborrowck=mir diff --git a/src/test/ui/assign-to-method.rs b/src/test/ui/assign-to-method.rs index 4518ce36b6da1..c3d71a69933b4 100644 --- a/src/test/ui/assign-to-method.rs +++ b/src/test/ui/assign-to-method.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct cat { meows : usize, diff --git a/src/test/ui/assign-to-method.stderr b/src/test/ui/assign-to-method.stderr index 930b4512572c2..00ada7fc2322b 100644 --- a/src/test/ui/assign-to-method.stderr +++ b/src/test/ui/assign-to-method.stderr @@ -1,5 +1,5 @@ error[E0615]: attempted to take value of method `speak` on type `cat` - --> $DIR/assign-to-method.rs:30:8 + --> $DIR/assign-to-method.rs:20:8 | LL | nyan.speak = || println!("meow"); //~ ERROR attempted to take value of method | ^^^^^ diff --git a/src/test/ui/assignment-operator-unimplemented.rs b/src/test/ui/assignment-operator-unimplemented.rs index 5b24c6bd79f96..21df464d5e450 100644 --- a/src/test/ui/assignment-operator-unimplemented.rs +++ b/src/test/ui/assignment-operator-unimplemented.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo; fn main() { diff --git a/src/test/ui/assignment-operator-unimplemented.stderr b/src/test/ui/assignment-operator-unimplemented.stderr index 983d698c63ebe..1d7adb129d0e1 100644 --- a/src/test/ui/assignment-operator-unimplemented.stderr +++ b/src/test/ui/assignment-operator-unimplemented.stderr @@ -1,5 +1,5 @@ error[E0368]: binary assignment operation `+=` cannot be applied to type `Foo` - --> $DIR/assignment-operator-unimplemented.rs:16:3 + --> $DIR/assignment-operator-unimplemented.rs:6:3 | LL | a += *b; //~ Error: binary assignment operation `+=` cannot be applied to type `Foo` | -^^^^^^ diff --git a/src/test/ui/assoc-inherent.rs b/src/test/ui/assoc-inherent.rs index 7eab831258f2e..fe34be3731736 100644 --- a/src/test/ui/assoc-inherent.rs +++ b/src/test/ui/assoc-inherent.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test associated types are forbidden in inherent impls. struct Foo; diff --git a/src/test/ui/assoc-inherent.stderr b/src/test/ui/assoc-inherent.stderr index 11497cba0ffaa..1a555bd53ac83 100644 --- a/src/test/ui/assoc-inherent.stderr +++ b/src/test/ui/assoc-inherent.stderr @@ -1,5 +1,5 @@ error[E0202]: associated types are not allowed in inherent impls - --> $DIR/assoc-inherent.rs:16:5 + --> $DIR/assoc-inherent.rs:6:5 | LL | type Bar = isize; //~ERROR associated types are not allowed in inherent impls | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/associated-const/associated-const-ambiguity-report.rs b/src/test/ui/associated-const/associated-const-ambiguity-report.rs index 5051e78d1ba17..927d2c69efa06 100644 --- a/src/test/ui/associated-const/associated-const-ambiguity-report.rs +++ b/src/test/ui/associated-const/associated-const-ambiguity-report.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Foo { const ID: i32; } diff --git a/src/test/ui/associated-const/associated-const-ambiguity-report.stderr b/src/test/ui/associated-const/associated-const-ambiguity-report.stderr index 0832b1a2605b0..47748609b1629 100644 --- a/src/test/ui/associated-const/associated-const-ambiguity-report.stderr +++ b/src/test/ui/associated-const/associated-const-ambiguity-report.stderr @@ -1,16 +1,16 @@ error[E0034]: multiple applicable items in scope - --> $DIR/associated-const-ambiguity-report.rs:28:16 + --> $DIR/associated-const-ambiguity-report.rs:17:16 | LL | const X: i32 = ::ID; //~ ERROR E0034 | ^^^^^^^^^ multiple `ID` found | note: candidate #1 is defined in an impl of the trait `Foo` for the type `i32` - --> $DIR/associated-const-ambiguity-report.rs:21:5 + --> $DIR/associated-const-ambiguity-report.rs:10:5 | LL | const ID: i32 = 1; | ^^^^^^^^^^^^^^^^^^ note: candidate #2 is defined in an impl of the trait `Bar` for the type `i32` - --> $DIR/associated-const-ambiguity-report.rs:25:5 + --> $DIR/associated-const-ambiguity-report.rs:14:5 | LL | const ID: i32 = 3; | ^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/associated-const/associated-const-array-len.rs b/src/test/ui/associated-const/associated-const-array-len.rs index 2cc10f0f956b7..17d7824273ea7 100644 --- a/src/test/ui/associated-const/associated-const-array-len.rs +++ b/src/test/ui/associated-const/associated-const-array-len.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Foo { const ID: usize; } diff --git a/src/test/ui/associated-const/associated-const-array-len.stderr b/src/test/ui/associated-const/associated-const-array-len.stderr index 5504af8fecd2c..ff56d112c8184 100644 --- a/src/test/ui/associated-const/associated-const-array-len.stderr +++ b/src/test/ui/associated-const/associated-const-array-len.stderr @@ -1,11 +1,11 @@ error[E0277]: the trait bound `i32: Foo` is not satisfied - --> $DIR/associated-const-array-len.rs:16:16 + --> $DIR/associated-const-array-len.rs:5:16 | LL | const X: [i32; ::ID] = [0, 1, 2]; | ^^^^^^^^^^^^^^^^ the trait `Foo` is not implemented for `i32` | note: required by `Foo::ID` - --> $DIR/associated-const-array-len.rs:13:5 + --> $DIR/associated-const-array-len.rs:2:5 | LL | const ID: usize; | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/associated-const/associated-const-dead-code.rs b/src/test/ui/associated-const/associated-const-dead-code.rs index 42db13f4f3bd4..c47e474d2dd74 100644 --- a/src/test/ui/associated-const/associated-const-dead-code.rs +++ b/src/test/ui/associated-const/associated-const-dead-code.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(dead_code)] struct MyFoo; diff --git a/src/test/ui/associated-const/associated-const-dead-code.stderr b/src/test/ui/associated-const/associated-const-dead-code.stderr index ee0658121838a..8c6d76bbdf68c 100644 --- a/src/test/ui/associated-const/associated-const-dead-code.stderr +++ b/src/test/ui/associated-const/associated-const-dead-code.stderr @@ -1,11 +1,11 @@ error: associated const is never used: `BAR` - --> $DIR/associated-const-dead-code.rs:16:5 + --> $DIR/associated-const-dead-code.rs:6:5 | LL | const BAR: u32 = 1; | ^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/associated-const-dead-code.rs:11:9 + --> $DIR/associated-const-dead-code.rs:1:9 | LL | #![deny(dead_code)] | ^^^^^^^^^ diff --git a/src/test/ui/associated-const/associated-const-generic-obligations.rs b/src/test/ui/associated-const/associated-const-generic-obligations.rs index 45f53418dca50..e0b502edaa15e 100644 --- a/src/test/ui/associated-const/associated-const-generic-obligations.rs +++ b/src/test/ui/associated-const/associated-const-generic-obligations.rs @@ -1,14 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Foo { type Out: Sized; } diff --git a/src/test/ui/associated-const/associated-const-generic-obligations.stderr b/src/test/ui/associated-const/associated-const-generic-obligations.stderr index 97986a27c6415..e4b86d84cafc9 100644 --- a/src/test/ui/associated-const/associated-const-generic-obligations.stderr +++ b/src/test/ui/associated-const/associated-const-generic-obligations.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `T: Foo` is not satisfied - --> $DIR/associated-const-generic-obligations.rs:25:5 + --> $DIR/associated-const-generic-obligations.rs:14:5 | LL | const FROM: &'static str = "foo"; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Foo` is not implemented for `T` diff --git a/src/test/ui/associated-const/associated-const-impl-wrong-lifetime.rs b/src/test/ui/associated-const/associated-const-impl-wrong-lifetime.rs index 77653b27fb538..08260ec8f4d63 100644 --- a/src/test/ui/associated-const/associated-const-impl-wrong-lifetime.rs +++ b/src/test/ui/associated-const/associated-const-impl-wrong-lifetime.rs @@ -1,14 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Foo { const NAME: &'static str; } diff --git a/src/test/ui/associated-const/associated-const-impl-wrong-lifetime.stderr b/src/test/ui/associated-const/associated-const-impl-wrong-lifetime.stderr index f8375899e3e01..c213cfeeafa1f 100644 --- a/src/test/ui/associated-const/associated-const-impl-wrong-lifetime.stderr +++ b/src/test/ui/associated-const/associated-const-impl-wrong-lifetime.stderr @@ -1,13 +1,13 @@ error[E0308]: mismatched types - --> $DIR/associated-const-impl-wrong-lifetime.rs:18:5 + --> $DIR/associated-const-impl-wrong-lifetime.rs:7:5 | LL | const NAME: &'a str = "unit"; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lifetime mismatch | = note: expected type `&'static str` found type `&'a str` -note: the lifetime 'a as defined on the impl at 17:6... - --> $DIR/associated-const-impl-wrong-lifetime.rs:17:6 +note: the lifetime 'a as defined on the impl at 6:6... + --> $DIR/associated-const-impl-wrong-lifetime.rs:6:6 | LL | impl<'a> Foo for &'a () { | ^^ diff --git a/src/test/ui/associated-const/associated-const-impl-wrong-type.rs b/src/test/ui/associated-const/associated-const-impl-wrong-type.rs index 240dfd160974b..1aad749c1ebe2 100644 --- a/src/test/ui/associated-const/associated-const-impl-wrong-type.rs +++ b/src/test/ui/associated-const/associated-const-impl-wrong-type.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Foo { const BAR: u32; } diff --git a/src/test/ui/associated-const/associated-const-impl-wrong-type.stderr b/src/test/ui/associated-const/associated-const-impl-wrong-type.stderr index cfccacaee282a..0693d99282dcc 100644 --- a/src/test/ui/associated-const/associated-const-impl-wrong-type.stderr +++ b/src/test/ui/associated-const/associated-const-impl-wrong-type.stderr @@ -1,5 +1,5 @@ error[E0326]: implemented const `BAR` has an incompatible type for trait - --> $DIR/associated-const-impl-wrong-type.rs:19:16 + --> $DIR/associated-const-impl-wrong-type.rs:8:16 | LL | const BAR: u32; | --- type in trait diff --git a/src/test/ui/associated-const/associated-const-in-trait.rs b/src/test/ui/associated-const/associated-const-in-trait.rs index f837d9ab8e530..187708a60b449 100644 --- a/src/test/ui/associated-const/associated-const-in-trait.rs +++ b/src/test/ui/associated-const/associated-const-in-trait.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // #29924 #![feature(const_fn, associated_consts)] diff --git a/src/test/ui/associated-const/associated-const-in-trait.stderr b/src/test/ui/associated-const/associated-const-in-trait.stderr index 7804e44f2d722..44a92639b5d7e 100644 --- a/src/test/ui/associated-const/associated-const-in-trait.stderr +++ b/src/test/ui/associated-const/associated-const-in-trait.stderr @@ -1,5 +1,5 @@ error[E0038]: the trait `Trait` cannot be made into an object - --> $DIR/associated-const-in-trait.rs:19:6 + --> $DIR/associated-const-in-trait.rs:9:6 | LL | impl Trait { | ^^^^^ the trait `Trait` cannot be made into an object diff --git a/src/test/ui/associated-const/associated-const-no-item.rs b/src/test/ui/associated-const/associated-const-no-item.rs index f9a57cd6d75ef..35fb662f63aee 100644 --- a/src/test/ui/associated-const/associated-const-no-item.rs +++ b/src/test/ui/associated-const/associated-const-no-item.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Foo { const ID: i32; } diff --git a/src/test/ui/associated-const/associated-const-no-item.stderr b/src/test/ui/associated-const/associated-const-no-item.stderr index a09c04ea0b2fd..cd60132efdd65 100644 --- a/src/test/ui/associated-const/associated-const-no-item.stderr +++ b/src/test/ui/associated-const/associated-const-no-item.stderr @@ -1,5 +1,5 @@ error[E0599]: no associated item named `ID` found for type `i32` in the current scope - --> $DIR/associated-const-no-item.rs:16:16 + --> $DIR/associated-const-no-item.rs:5:16 | LL | const X: i32 = ::ID; | ^^^^^^^^^ associated item not found in `i32` diff --git a/src/test/ui/associated-const/associated-const-private-impl.rs b/src/test/ui/associated-const/associated-const-private-impl.rs index b5accfff5bbf5..3ee3134acc42d 100644 --- a/src/test/ui/associated-const/associated-const-private-impl.rs +++ b/src/test/ui/associated-const/associated-const-private-impl.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - mod bar1 { pub use self::bar2::Foo; mod bar2 { diff --git a/src/test/ui/associated-const/associated-const-private-impl.stderr b/src/test/ui/associated-const/associated-const-private-impl.stderr index 65be3753bacce..7af55174b1905 100644 --- a/src/test/ui/associated-const/associated-const-private-impl.stderr +++ b/src/test/ui/associated-const/associated-const-private-impl.stderr @@ -1,5 +1,5 @@ error[E0624]: associated constant `ID` is private - --> $DIR/associated-const-private-impl.rs:24:19 + --> $DIR/associated-const-private-impl.rs:13:19 | LL | assert_eq!(1, bar1::Foo::ID); | ^^^^^^^^^^^^^ diff --git a/src/test/ui/associated-const/associated-const-type-parameter-arms.rs b/src/test/ui/associated-const/associated-const-type-parameter-arms.rs index 630a234fa6641..3f260d84e4c0a 100644 --- a/src/test/ui/associated-const/associated-const-type-parameter-arms.rs +++ b/src/test/ui/associated-const/associated-const-type-parameter-arms.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub enum EFoo { A, B, C, D } pub trait Foo { diff --git a/src/test/ui/associated-const/associated-const-type-parameter-arms.stderr b/src/test/ui/associated-const/associated-const-type-parameter-arms.stderr index a88dd4d995503..1ccf9febd4bdc 100644 --- a/src/test/ui/associated-const/associated-const-type-parameter-arms.stderr +++ b/src/test/ui/associated-const/associated-const-type-parameter-arms.stderr @@ -1,11 +1,11 @@ error[E0158]: associated consts cannot be referenced in patterns - --> $DIR/associated-const-type-parameter-arms.rs:31:9 + --> $DIR/associated-const-type-parameter-arms.rs:20:9 | LL | A::X => println!("A::X"), | ^^^^ error[E0158]: associated consts cannot be referenced in patterns - --> $DIR/associated-const-type-parameter-arms.rs:33:9 + --> $DIR/associated-const-type-parameter-arms.rs:22:9 | LL | B::X => println!("B::X"), | ^^^^ diff --git a/src/test/ui/associated-const/associated-const-type-parameter-arrays-2.rs b/src/test/ui/associated-const/associated-const-type-parameter-arrays-2.rs index d196cf2215601..f1f82caf7d40b 100644 --- a/src/test/ui/associated-const/associated-const-type-parameter-arrays-2.rs +++ b/src/test/ui/associated-const/associated-const-type-parameter-arrays-2.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub trait Foo { const Y: usize; } diff --git a/src/test/ui/associated-const/associated-const-type-parameter-arrays-2.stderr b/src/test/ui/associated-const/associated-const-type-parameter-arrays-2.stderr index a440f1f82f1b5..573b8ed39bcaa 100644 --- a/src/test/ui/associated-const/associated-const-type-parameter-arrays-2.stderr +++ b/src/test/ui/associated-const/associated-const-type-parameter-arrays-2.stderr @@ -1,12 +1,12 @@ error[E0277]: the trait bound `A: Foo` is not satisfied - --> $DIR/associated-const-type-parameter-arrays-2.rs:27:22 + --> $DIR/associated-const-type-parameter-arrays-2.rs:16:22 | LL | let _array = [4; ::Y]; | ^^^^^^^^^^^^^ the trait `Foo` is not implemented for `A` | = help: consider adding a `where A: Foo` bound note: required by `Foo::Y` - --> $DIR/associated-const-type-parameter-arrays-2.rs:13:5 + --> $DIR/associated-const-type-parameter-arrays-2.rs:2:5 | LL | const Y: usize; | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/associated-const/associated-const-type-parameter-arrays.rs b/src/test/ui/associated-const/associated-const-type-parameter-arrays.rs index 0b24cab2a681c..d51821059fc13 100644 --- a/src/test/ui/associated-const/associated-const-type-parameter-arrays.rs +++ b/src/test/ui/associated-const/associated-const-type-parameter-arrays.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub trait Foo { const Y: usize; } diff --git a/src/test/ui/associated-const/associated-const-type-parameter-arrays.stderr b/src/test/ui/associated-const/associated-const-type-parameter-arrays.stderr index 4889154636002..bf1ee38571404 100644 --- a/src/test/ui/associated-const/associated-const-type-parameter-arrays.stderr +++ b/src/test/ui/associated-const/associated-const-type-parameter-arrays.stderr @@ -1,12 +1,12 @@ error[E0277]: the trait bound `A: Foo` is not satisfied - --> $DIR/associated-const-type-parameter-arrays.rs:27:23 + --> $DIR/associated-const-type-parameter-arrays.rs:16:23 | LL | let _array: [u32; ::Y]; | ^^^^^^^^^^^^^ the trait `Foo` is not implemented for `A` | = help: consider adding a `where A: Foo` bound note: required by `Foo::Y` - --> $DIR/associated-const-type-parameter-arrays.rs:13:5 + --> $DIR/associated-const-type-parameter-arrays.rs:2:5 | LL | const Y: usize; | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/associated-const/associated-const-upper-case-lint.rs b/src/test/ui/associated-const/associated-const-upper-case-lint.rs index 497ff426b2fae..c851b27bac04a 100644 --- a/src/test/ui/associated-const/associated-const-upper-case-lint.rs +++ b/src/test/ui/associated-const/associated-const-upper-case-lint.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(non_upper_case_globals)] #![allow(dead_code)] diff --git a/src/test/ui/associated-const/associated-const-upper-case-lint.stderr b/src/test/ui/associated-const/associated-const-upper-case-lint.stderr index 7a5cad69094f5..43feb03761bdd 100644 --- a/src/test/ui/associated-const/associated-const-upper-case-lint.stderr +++ b/src/test/ui/associated-const/associated-const-upper-case-lint.stderr @@ -1,11 +1,11 @@ error: associated constant `not_upper` should have an upper case name such as `NOT_UPPER` - --> $DIR/associated-const-upper-case-lint.rs:17:5 + --> $DIR/associated-const-upper-case-lint.rs:7:5 | LL | const not_upper: bool = true; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/associated-const-upper-case-lint.rs:11:9 + --> $DIR/associated-const-upper-case-lint.rs:1:9 | LL | #![deny(non_upper_case_globals)] | ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/associated-item/associated-item-duplicate-names-2.rs b/src/test/ui/associated-item/associated-item-duplicate-names-2.rs index 85ea949b9c8da..550c7ae394b45 100644 --- a/src/test/ui/associated-item/associated-item-duplicate-names-2.rs +++ b/src/test/ui/associated-item/associated-item-duplicate-names-2.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct Foo; impl Foo { diff --git a/src/test/ui/associated-item/associated-item-duplicate-names-2.stderr b/src/test/ui/associated-item/associated-item-duplicate-names-2.stderr index 3b9be8976b42e..6cc63de35d746 100644 --- a/src/test/ui/associated-item/associated-item-duplicate-names-2.stderr +++ b/src/test/ui/associated-item/associated-item-duplicate-names-2.stderr @@ -1,5 +1,5 @@ error[E0201]: duplicate definitions with name `bar`: - --> $DIR/associated-item-duplicate-names-2.rs:16:5 + --> $DIR/associated-item-duplicate-names-2.rs:5:5 | LL | const bar: bool = true; | ----------------------- previous definition of `bar` here diff --git a/src/test/ui/associated-item/associated-item-duplicate-names-3.rs b/src/test/ui/associated-item/associated-item-duplicate-names-3.rs index 12cab13d0b9b3..6aa1b483eebdd 100644 --- a/src/test/ui/associated-item/associated-item-duplicate-names-3.rs +++ b/src/test/ui/associated-item/associated-item-duplicate-names-3.rs @@ -1,12 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // Before the introduction of the "duplicate associated type" error, the // program below used to result in the "ambiguous associated type" error E0223, diff --git a/src/test/ui/associated-item/associated-item-duplicate-names-3.stderr b/src/test/ui/associated-item/associated-item-duplicate-names-3.stderr index 3edf59f2010f1..07ce5e621a626 100644 --- a/src/test/ui/associated-item/associated-item-duplicate-names-3.stderr +++ b/src/test/ui/associated-item/associated-item-duplicate-names-3.stderr @@ -1,5 +1,5 @@ error[E0201]: duplicate definitions with name `Bar`: - --> $DIR/associated-item-duplicate-names-3.rs:23:5 + --> $DIR/associated-item-duplicate-names-3.rs:14:5 | LL | type Bar = i16; | --------------- previous definition of `Bar` here diff --git a/src/test/ui/associated-item/associated-item-duplicate-names.rs b/src/test/ui/associated-item/associated-item-duplicate-names.rs index a2fc1bc017767..6677fad687645 100644 --- a/src/test/ui/associated-item/associated-item-duplicate-names.rs +++ b/src/test/ui/associated-item/associated-item-duplicate-names.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test for issue #23969 diff --git a/src/test/ui/associated-item/associated-item-duplicate-names.stderr b/src/test/ui/associated-item/associated-item-duplicate-names.stderr index 4b060a991f9d7..2bbe912521455 100644 --- a/src/test/ui/associated-item/associated-item-duplicate-names.stderr +++ b/src/test/ui/associated-item/associated-item-duplicate-names.stderr @@ -1,5 +1,5 @@ error[E0201]: duplicate definitions with name `Ty`: - --> $DIR/associated-item-duplicate-names.rs:21:5 + --> $DIR/associated-item-duplicate-names.rs:11:5 | LL | type Ty = (); | ------------- previous definition of `Ty` here @@ -7,7 +7,7 @@ LL | type Ty = usize; //~ ERROR duplicate definitions | ^^^^^^^^^^^^^^^^ duplicate definition error[E0201]: duplicate definitions with name `BAR`: - --> $DIR/associated-item-duplicate-names.rs:23:5 + --> $DIR/associated-item-duplicate-names.rs:13:5 | LL | const BAR: u32 = 7; | ------------------- previous definition of `BAR` here diff --git a/src/test/ui/associated-path-shl.rs b/src/test/ui/associated-path-shl.rs index 7daf0d3c4e297..d159082ab7ad5 100644 --- a/src/test/ui/associated-path-shl.rs +++ b/src/test/ui/associated-path-shl.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that associated paths starting with `<<` are successfully parsed. fn main() { diff --git a/src/test/ui/associated-path-shl.stderr b/src/test/ui/associated-path-shl.stderr index fa41d4abff482..3b62b1b01f48c 100644 --- a/src/test/ui/associated-path-shl.stderr +++ b/src/test/ui/associated-path-shl.stderr @@ -1,35 +1,35 @@ error[E0412]: cannot find type `A` in this scope - --> $DIR/associated-path-shl.rs:14:14 + --> $DIR/associated-path-shl.rs:4:14 | LL | let _: <::B>::C; //~ ERROR cannot find type `A` in this scope | ^ not found in this scope error[E0412]: cannot find type `A` in this scope - --> $DIR/associated-path-shl.rs:15:15 + --> $DIR/associated-path-shl.rs:5:15 | LL | let _ = <::B>::C; //~ ERROR cannot find type `A` in this scope | ^ not found in this scope error[E0412]: cannot find type `A` in this scope - --> $DIR/associated-path-shl.rs:16:11 + --> $DIR/associated-path-shl.rs:6:11 | LL | let <::B>::C; //~ ERROR cannot find type `A` in this scope | ^ not found in this scope error[E0412]: cannot find type `A` in this scope - --> $DIR/associated-path-shl.rs:17:17 + --> $DIR/associated-path-shl.rs:7:17 | LL | let 0 ..= <::B>::C; //~ ERROR cannot find type `A` in this scope | ^ not found in this scope error[E0412]: cannot find type `A` in this scope - --> $DIR/associated-path-shl.rs:19:7 + --> $DIR/associated-path-shl.rs:9:7 | LL | <::B>::C; //~ ERROR cannot find type `A` in this scope | ^ not found in this scope error[E0029]: only char and numeric types are allowed in range patterns - --> $DIR/associated-path-shl.rs:17:15 + --> $DIR/associated-path-shl.rs:7:15 | LL | let 0 ..= <::B>::C; //~ ERROR cannot find type `A` in this scope | ^^^^^^^^^^^ ranges require char or numeric types diff --git a/src/test/ui/associated-type/associated-type-projection-ambig-between-bound-and-where-clause.rs b/src/test/ui/associated-type/associated-type-projection-ambig-between-bound-and-where-clause.rs index ce97019a2b266..c85d41c7f5195 100644 --- a/src/test/ui/associated-type/associated-type-projection-ambig-between-bound-and-where-clause.rs +++ b/src/test/ui/associated-type/associated-type-projection-ambig-between-bound-and-where-clause.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test equality constraints in a where clause where the type being // equated appears in a supertrait. diff --git a/src/test/ui/associated-type/associated-type-projection-ambig-between-bound-and-where-clause.stderr b/src/test/ui/associated-type/associated-type-projection-ambig-between-bound-and-where-clause.stderr index 2706dda1c5209..9ec6ffb05657a 100644 --- a/src/test/ui/associated-type/associated-type-projection-ambig-between-bound-and-where-clause.stderr +++ b/src/test/ui/associated-type/associated-type-projection-ambig-between-bound-and-where-clause.stderr @@ -1,5 +1,5 @@ error[E0221]: ambiguous associated type `Color` in bounds of `C` - --> $DIR/associated-type-projection-ambig-between-bound-and-where-clause.rs:26:24 + --> $DIR/associated-type-projection-ambig-between-bound-and-where-clause.rs:16:24 | LL | type Color; | ----------- ambiguous `Color` from `Vehicle` @@ -11,7 +11,7 @@ LL | fn a(_: C::Color) { | ^^^^^^^^ ambiguous associated type `Color` error[E0221]: ambiguous associated type `Color` in bounds of `C` - --> $DIR/associated-type-projection-ambig-between-bound-and-where-clause.rs:30:12 + --> $DIR/associated-type-projection-ambig-between-bound-and-where-clause.rs:20:12 | LL | type Color; | ----------- ambiguous `Color` from `Vehicle` @@ -23,7 +23,7 @@ LL | fn b(_: C::Color) where C : Vehicle+Box { | ^^^^^^^^ ambiguous associated type `Color` error[E0221]: ambiguous associated type `Color` in bounds of `C` - --> $DIR/associated-type-projection-ambig-between-bound-and-where-clause.rs:34:12 + --> $DIR/associated-type-projection-ambig-between-bound-and-where-clause.rs:24:12 | LL | type Color; | ----------- ambiguous `Color` from `Vehicle` @@ -35,7 +35,7 @@ LL | fn c(_: C::Color) where C : Vehicle, C : Box { | ^^^^^^^^ ambiguous associated type `Color` error[E0221]: ambiguous associated type `Color` in bounds of `X` - --> $DIR/associated-type-projection-ambig-between-bound-and-where-clause.rs:45:20 + --> $DIR/associated-type-projection-ambig-between-bound-and-where-clause.rs:35:20 | LL | type Color; | ----------- ambiguous `Color` from `Vehicle` @@ -47,7 +47,7 @@ LL | fn e(&self, _: X::Color) where X : Box; | ^^^^^^^^ ambiguous associated type `Color` error[E0221]: ambiguous associated type `Color` in bounds of `X` - --> $DIR/associated-type-projection-ambig-between-bound-and-where-clause.rs:48:20 + --> $DIR/associated-type-projection-ambig-between-bound-and-where-clause.rs:38:20 | LL | type Color; | ----------- ambiguous `Color` from `Vehicle` @@ -59,7 +59,7 @@ LL | fn f(&self, _: X::Color) where X : Box { } | ^^^^^^^^ ambiguous associated type `Color` error[E0221]: ambiguous associated type `Color` in bounds of `X` - --> $DIR/associated-type-projection-ambig-between-bound-and-where-clause.rs:40:20 + --> $DIR/associated-type-projection-ambig-between-bound-and-where-clause.rs:30:20 | LL | type Color; | ----------- ambiguous `Color` from `Vehicle` diff --git a/src/test/ui/associated-type/associated-type-projection-from-multiple-supertraits.rs b/src/test/ui/associated-type/associated-type-projection-from-multiple-supertraits.rs index 5536566c61992..df9143d685ff3 100644 --- a/src/test/ui/associated-type/associated-type-projection-from-multiple-supertraits.rs +++ b/src/test/ui/associated-type/associated-type-projection-from-multiple-supertraits.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test equality constraints in a where clause where the type being // equated appears in a supertrait. diff --git a/src/test/ui/associated-type/associated-type-projection-from-multiple-supertraits.stderr b/src/test/ui/associated-type/associated-type-projection-from-multiple-supertraits.stderr index 7a10b6d021f54..f47960acde2b9 100644 --- a/src/test/ui/associated-type/associated-type-projection-from-multiple-supertraits.stderr +++ b/src/test/ui/associated-type/associated-type-projection-from-multiple-supertraits.stderr @@ -1,5 +1,5 @@ error[E0221]: ambiguous associated type `Color` in bounds of `C` - --> $DIR/associated-type-projection-from-multiple-supertraits.rs:29:32 + --> $DIR/associated-type-projection-from-multiple-supertraits.rs:19:32 | LL | type Color; | ----------- ambiguous `Color` from `Vehicle` @@ -11,7 +11,7 @@ LL | fn dent(c: C, color: C::Color) { | ^^^^^^^^ ambiguous associated type `Color` error[E0221]: ambiguous associated type `Color` in bounds of `BoxCar` - --> $DIR/associated-type-projection-from-multiple-supertraits.rs:33:33 + --> $DIR/associated-type-projection-from-multiple-supertraits.rs:23:33 | LL | type Color; | ----------- ambiguous `Color` from `Vehicle` @@ -23,13 +23,13 @@ LL | fn dent_object(c: BoxCar) { | ^^^^^^^^^^^ ambiguous associated type `Color` error[E0191]: the value of the associated type `Color` (from the trait `Vehicle`) must be specified - --> $DIR/associated-type-projection-from-multiple-supertraits.rs:33:26 + --> $DIR/associated-type-projection-from-multiple-supertraits.rs:23:26 | LL | fn dent_object(c: BoxCar) { | ^^^^^^^^^^^^^^^^^^^ missing associated type `Color` value error[E0221]: ambiguous associated type `Color` in bounds of `C` - --> $DIR/associated-type-projection-from-multiple-supertraits.rs:38:29 + --> $DIR/associated-type-projection-from-multiple-supertraits.rs:28:29 | LL | type Color; | ----------- ambiguous `Color` from `Vehicle` diff --git a/src/test/ui/associated-type/associated-type-projection-from-supertrait.rs b/src/test/ui/associated-type/associated-type-projection-from-supertrait.rs index b388b6a28e340..06dfe490b8bd3 100644 --- a/src/test/ui/associated-type/associated-type-projection-from-supertrait.rs +++ b/src/test/ui/associated-type/associated-type-projection-from-supertrait.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test equality constraints in a where clause where the type being // equated appears in a supertrait. diff --git a/src/test/ui/associated-type/associated-type-projection-from-supertrait.stderr b/src/test/ui/associated-type/associated-type-projection-from-supertrait.stderr index 4bc09b624c8a1..8c7b4a1333c1f 100644 --- a/src/test/ui/associated-type/associated-type-projection-from-supertrait.stderr +++ b/src/test/ui/associated-type/associated-type-projection-from-supertrait.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/associated-type-projection-from-supertrait.rs:43:23 + --> $DIR/associated-type-projection-from-supertrait.rs:33:23 | LL | fn b() { dent(ModelT, Blue); } //~ ERROR mismatched types | ^^^^ expected struct `Black`, found struct `Blue` @@ -8,7 +8,7 @@ LL | fn b() { dent(ModelT, Blue); } //~ ERROR mismatched types found type `Blue` error[E0308]: mismatched types - --> $DIR/associated-type-projection-from-supertrait.rs:44:23 + --> $DIR/associated-type-projection-from-supertrait.rs:34:23 | LL | fn c() { dent(ModelU, Black); } //~ ERROR mismatched types | ^^^^^ expected struct `Blue`, found struct `Black` @@ -17,7 +17,7 @@ LL | fn c() { dent(ModelU, Black); } //~ ERROR mismatched types found type `Black` error[E0308]: mismatched types - --> $DIR/associated-type-projection-from-supertrait.rs:50:28 + --> $DIR/associated-type-projection-from-supertrait.rs:40:28 | LL | fn f() { ModelT.chip_paint(Blue); } //~ ERROR mismatched types | ^^^^ expected struct `Black`, found struct `Blue` @@ -26,7 +26,7 @@ LL | fn f() { ModelT.chip_paint(Blue); } //~ ERROR mismatched types found type `Blue` error[E0308]: mismatched types - --> $DIR/associated-type-projection-from-supertrait.rs:51:28 + --> $DIR/associated-type-projection-from-supertrait.rs:41:28 | LL | fn g() { ModelU.chip_paint(Black); } //~ ERROR mismatched types | ^^^^^ expected struct `Blue`, found struct `Black` diff --git a/src/test/ui/associated-types/associated-types-ICE-when-projecting-out-of-err.rs b/src/test/ui/associated-types/associated-types-ICE-when-projecting-out-of-err.rs index 75b60aa8d10b7..707bcac78bf92 100644 --- a/src/test/ui/associated-types/associated-types-ICE-when-projecting-out-of-err.rs +++ b/src/test/ui/associated-types/associated-types-ICE-when-projecting-out-of-err.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we do not ICE when the self type is `ty::err`, but rather // just propagate the error. diff --git a/src/test/ui/associated-types/associated-types-ICE-when-projecting-out-of-err.stderr b/src/test/ui/associated-types/associated-types-ICE-when-projecting-out-of-err.stderr index 7924ab7444406..8c3463a2832e0 100644 --- a/src/test/ui/associated-types/associated-types-ICE-when-projecting-out-of-err.stderr +++ b/src/test/ui/associated-types/associated-types-ICE-when-projecting-out-of-err.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `(): Add` is not satisfied - --> $DIR/associated-types-ICE-when-projecting-out-of-err.rs:33:11 + --> $DIR/associated-types-ICE-when-projecting-out-of-err.rs:23:11 | LL | r = r + a; | ^ the trait `Add` is not implemented for `()` diff --git a/src/test/ui/associated-types/associated-types-binding-to-type-defined-in-supertrait.rs b/src/test/ui/associated-types/associated-types-binding-to-type-defined-in-supertrait.rs index b1194154911c9..653130843c8de 100644 --- a/src/test/ui/associated-types/associated-types-binding-to-type-defined-in-supertrait.rs +++ b/src/test/ui/associated-types/associated-types-binding-to-type-defined-in-supertrait.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test equality constraints in a where clause where the type being // equated appears in a supertrait. diff --git a/src/test/ui/associated-types/associated-types-binding-to-type-defined-in-supertrait.stderr b/src/test/ui/associated-types/associated-types-binding-to-type-defined-in-supertrait.stderr index c43ff1ae4cbee..126fb572d992a 100644 --- a/src/test/ui/associated-types/associated-types-binding-to-type-defined-in-supertrait.stderr +++ b/src/test/ui/associated-types/associated-types-binding-to-type-defined-in-supertrait.stderr @@ -1,5 +1,5 @@ error[E0271]: type mismatch resolving `::Color == Blue` - --> $DIR/associated-types-binding-to-type-defined-in-supertrait.rs:47:10 + --> $DIR/associated-types-binding-to-type-defined-in-supertrait.rs:37:10 | LL | fn b() { blue_car(ModelT); } //~ ERROR type mismatch | ^^^^^^^^ expected struct `Black`, found struct `Blue` @@ -7,13 +7,13 @@ LL | fn b() { blue_car(ModelT); } //~ ERROR type mismatch = note: expected type `Black` found type `Blue` note: required by `blue_car` - --> $DIR/associated-types-binding-to-type-defined-in-supertrait.rs:43:1 + --> $DIR/associated-types-binding-to-type-defined-in-supertrait.rs:33:1 | LL | fn blue_car>(c: C) { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0271]: type mismatch resolving `::Color == Black` - --> $DIR/associated-types-binding-to-type-defined-in-supertrait.rs:48:10 + --> $DIR/associated-types-binding-to-type-defined-in-supertrait.rs:38:10 | LL | fn c() { black_car(ModelU); } //~ ERROR type mismatch | ^^^^^^^^^ expected struct `Blue`, found struct `Black` @@ -21,7 +21,7 @@ LL | fn c() { black_car(ModelU); } //~ ERROR type mismatch = note: expected type `Blue` found type `Black` note: required by `black_car` - --> $DIR/associated-types-binding-to-type-defined-in-supertrait.rs:40:1 + --> $DIR/associated-types-binding-to-type-defined-in-supertrait.rs:30:1 | LL | fn black_car>(c: C) { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/associated-types/associated-types-bound-failure.rs b/src/test/ui/associated-types/associated-types-bound-failure.rs index cd21fb949cb84..883ac363b44e5 100644 --- a/src/test/ui/associated-types/associated-types-bound-failure.rs +++ b/src/test/ui/associated-types/associated-types-bound-failure.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test equality constraints on associated types in a where clause. pub trait ToInt { diff --git a/src/test/ui/associated-types/associated-types-bound-failure.stderr b/src/test/ui/associated-types/associated-types-bound-failure.stderr index 067dfeb454ce8..784a53f106a99 100644 --- a/src/test/ui/associated-types/associated-types-bound-failure.stderr +++ b/src/test/ui/associated-types/associated-types-bound-failure.stderr @@ -1,12 +1,12 @@ error[E0277]: the trait bound `::R: ToInt` is not satisfied - --> $DIR/associated-types-bound-failure.rs:27:5 + --> $DIR/associated-types-bound-failure.rs:17:5 | LL | ToInt::to_int(&g.get()) //~ ERROR E0277 | ^^^^^^^^^^^^^ the trait `ToInt` is not implemented for `::R` | = help: consider adding a `where ::R: ToInt` bound note: required by `ToInt::to_int` - --> $DIR/associated-types-bound-failure.rs:14:5 + --> $DIR/associated-types-bound-failure.rs:4:5 | LL | fn to_int(&self) -> isize; | ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/associated-types/associated-types-coherence-failure.rs b/src/test/ui/associated-types/associated-types-coherence-failure.rs index 786a25500a886..fe1201ea06f18 100644 --- a/src/test/ui/associated-types/associated-types-coherence-failure.rs +++ b/src/test/ui/associated-types/associated-types-coherence-failure.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that coherence detects overlap when some of the types in the // impls are projections of associated type. Issue #20624. diff --git a/src/test/ui/associated-types/associated-types-coherence-failure.stderr b/src/test/ui/associated-types/associated-types-coherence-failure.stderr index 85d4bf784587e..2c53b0a2248fa 100644 --- a/src/test/ui/associated-types/associated-types-coherence-failure.stderr +++ b/src/test/ui/associated-types/associated-types-coherence-failure.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `IntoCow<'_, _>` for type `Cow<'_, _>`: - --> $DIR/associated-types-coherence-failure.rs:31:1 + --> $DIR/associated-types-coherence-failure.rs:21:1 | LL | impl<'a, B: ?Sized> IntoCow<'a, B> for ::Owned where B: ToOwned { | ----------------------------------------------------------------------------- first implementation here @@ -8,7 +8,7 @@ LL | impl<'a, B: ?Sized> IntoCow<'a, B> for Cow<'a, B> where B: ToOwned { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Cow<'_, _>` error[E0119]: conflicting implementations of trait `IntoCow<'_, _>` for type `&_`: - --> $DIR/associated-types-coherence-failure.rs:38:1 + --> $DIR/associated-types-coherence-failure.rs:28:1 | LL | impl<'a, B: ?Sized> IntoCow<'a, B> for ::Owned where B: ToOwned { | ----------------------------------------------------------------------------- first implementation here diff --git a/src/test/ui/associated-types/associated-types-eq-1.rs b/src/test/ui/associated-types/associated-types-eq-1.rs index 6f2ee854543da..c371138ff45b1 100644 --- a/src/test/ui/associated-types/associated-types-eq-1.rs +++ b/src/test/ui/associated-types/associated-types-eq-1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test equality constraints on associated types. Check that unsupported syntax // does not ICE. diff --git a/src/test/ui/associated-types/associated-types-eq-1.stderr b/src/test/ui/associated-types/associated-types-eq-1.stderr index 81bb2ae4ce22f..a517bf86a87eb 100644 --- a/src/test/ui/associated-types/associated-types-eq-1.stderr +++ b/src/test/ui/associated-types/associated-types-eq-1.stderr @@ -1,5 +1,5 @@ error[E0412]: cannot find type `A` in this scope - --> $DIR/associated-types-eq-1.rs:20:12 + --> $DIR/associated-types-eq-1.rs:10:12 | LL | let _: A = x.boo(); //~ ERROR cannot find type `A` in this scope | ^ did you mean `I`? diff --git a/src/test/ui/associated-types/associated-types-eq-2.rs b/src/test/ui/associated-types/associated-types-eq-2.rs index 755a9f2d73f62..18e38d4466702 100644 --- a/src/test/ui/associated-types/associated-types-eq-2.rs +++ b/src/test/ui/associated-types/associated-types-eq-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test equality constraints on associated types. Check we get an error when an // equality constraint is used in a qualified path. diff --git a/src/test/ui/associated-types/associated-types-eq-2.stderr b/src/test/ui/associated-types/associated-types-eq-2.stderr index 0b80f3472dcc9..23ee8cd23b5c3 100644 --- a/src/test/ui/associated-types/associated-types-eq-2.stderr +++ b/src/test/ui/associated-types/associated-types-eq-2.stderr @@ -1,5 +1,5 @@ error[E0229]: associated type bindings are not allowed here - --> $DIR/associated-types-eq-2.rs:26:30 + --> $DIR/associated-types-eq-2.rs:16:30 | LL | fn baz(x: &>::A) {} | ^^^^^ associated type not allowed here diff --git a/src/test/ui/associated-types/associated-types-eq-3.rs b/src/test/ui/associated-types/associated-types-eq-3.rs index cb952f6534f0e..1a58dcca9e249 100644 --- a/src/test/ui/associated-types/associated-types-eq-3.rs +++ b/src/test/ui/associated-types/associated-types-eq-3.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test equality constraints on associated types. Check we get type errors // where we should. diff --git a/src/test/ui/associated-types/associated-types-eq-3.stderr b/src/test/ui/associated-types/associated-types-eq-3.stderr index d8b2be0e1b00d..c1a8e2002be61 100644 --- a/src/test/ui/associated-types/associated-types-eq-3.stderr +++ b/src/test/ui/associated-types/associated-types-eq-3.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/associated-types-eq-3.rs:33:18 + --> $DIR/associated-types-eq-3.rs:23:18 | LL | let _: Bar = x.boo(); | ^^^^^^^ expected struct `Bar`, found associated type @@ -8,7 +8,7 @@ LL | let _: Bar = x.boo(); found type `::A` error[E0271]: type mismatch resolving `::A == Bar` - --> $DIR/associated-types-eq-3.rs:48:5 + --> $DIR/associated-types-eq-3.rs:38:5 | LL | foo1(a); | ^^^^ expected usize, found struct `Bar` @@ -16,13 +16,13 @@ LL | foo1(a); = note: expected type `usize` found type `Bar` note: required by `foo1` - --> $DIR/associated-types-eq-3.rs:28:1 + --> $DIR/associated-types-eq-3.rs:18:1 | LL | fn foo1>(x: I) { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0271]: type mismatch resolving `::A == Bar` - --> $DIR/associated-types-eq-3.rs:51:9 + --> $DIR/associated-types-eq-3.rs:41:9 | LL | baz(&a); | ^^ expected usize, found struct `Bar` diff --git a/src/test/ui/associated-types/associated-types-eq-expr-path.rs b/src/test/ui/associated-types/associated-types-eq-expr-path.rs index 847393ba2b89f..143992f29f197 100644 --- a/src/test/ui/associated-types/associated-types-eq-expr-path.rs +++ b/src/test/ui/associated-types/associated-types-eq-expr-path.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that an associated type cannot be bound in an expression path. trait Foo { diff --git a/src/test/ui/associated-types/associated-types-eq-expr-path.stderr b/src/test/ui/associated-types/associated-types-eq-expr-path.stderr index 36c31cd3f0560..bd354cf3e16f2 100644 --- a/src/test/ui/associated-types/associated-types-eq-expr-path.stderr +++ b/src/test/ui/associated-types/associated-types-eq-expr-path.stderr @@ -1,5 +1,5 @@ error[E0229]: associated type bindings are not allowed here - --> $DIR/associated-types-eq-expr-path.rs:24:26 + --> $DIR/associated-types-eq-expr-path.rs:14:26 | LL | let x: isize = Foo::::bar(); | ^^^^^^^ associated type not allowed here diff --git a/src/test/ui/associated-types/associated-types-eq-hr.rs b/src/test/ui/associated-types/associated-types-eq-hr.rs index 52a2ca9082d23..d0245a07e40bd 100644 --- a/src/test/ui/associated-types/associated-types-eq-hr.rs +++ b/src/test/ui/associated-types/associated-types-eq-hr.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check testing of equality constraints in a higher-ranked context. pub trait TheTrait { diff --git a/src/test/ui/associated-types/associated-types-eq-hr.stderr b/src/test/ui/associated-types/associated-types-eq-hr.stderr index 5081a2649d1a2..5e04dc5f8c5d9 100644 --- a/src/test/ui/associated-types/associated-types-eq-hr.stderr +++ b/src/test/ui/associated-types/associated-types-eq-hr.stderr @@ -1,5 +1,5 @@ error[E0271]: type mismatch resolving `for<'x> >::A == &'x isize` - --> $DIR/associated-types-eq-hr.rs:92:5 + --> $DIR/associated-types-eq-hr.rs:82:5 | LL | foo::(); //~ ERROR type mismatch | ^^^^^^^^^^^^^^^^^ expected usize, found isize @@ -7,7 +7,7 @@ LL | foo::(); //~ ERROR type mismatch = note: expected type `&usize` found type `&isize` note: required by `foo` - --> $DIR/associated-types-eq-hr.rs:54:1 + --> $DIR/associated-types-eq-hr.rs:44:1 | LL | / fn foo() LL | | where T : for<'x> TheTrait<&'x isize, A = &'x isize> @@ -17,7 +17,7 @@ LL | | } | |_^ error[E0271]: type mismatch resolving `for<'x> >::A == &'x usize` - --> $DIR/associated-types-eq-hr.rs:94:5 + --> $DIR/associated-types-eq-hr.rs:84:5 | LL | bar::(); //~ ERROR type mismatch | ^^^^^^^^^^^^^^^^ expected isize, found usize @@ -25,7 +25,7 @@ LL | bar::(); //~ ERROR type mismatch = note: expected type `&isize` found type `&usize` note: required by `bar` - --> $DIR/associated-types-eq-hr.rs:60:1 + --> $DIR/associated-types-eq-hr.rs:50:1 | LL | / fn bar() LL | | where T : for<'x> TheTrait<&'x isize, A = &'x usize> @@ -35,7 +35,7 @@ LL | | } | |_^ error[E0277]: the trait bound `for<'x, 'y> Tuple: TheTrait<(&'x isize, &'y isize)>` is not satisfied - --> $DIR/associated-types-eq-hr.rs:97:5 + --> $DIR/associated-types-eq-hr.rs:87:5 | LL | tuple_one::(); | ^^^^^^^^^^^^^^^^^^ the trait `for<'x, 'y> TheTrait<(&'x isize, &'y isize)>` is not implemented for `Tuple` @@ -43,7 +43,7 @@ LL | tuple_one::(); = help: the following implementations were found: > note: required by `tuple_one` - --> $DIR/associated-types-eq-hr.rs:66:1 + --> $DIR/associated-types-eq-hr.rs:56:1 | LL | / fn tuple_one() LL | | where T : for<'x,'y> TheTrait<(&'x isize, &'y isize), A = &'x isize> @@ -53,13 +53,13 @@ LL | | } | |_^ error[E0271]: type mismatch resolving `for<'x, 'y> >::A == &'x isize` - --> $DIR/associated-types-eq-hr.rs:97:5 + --> $DIR/associated-types-eq-hr.rs:87:5 | LL | tuple_one::(); | ^^^^^^^^^^^^^^^^^^ expected bound lifetime parameter 'x, found concrete lifetime | note: required by `tuple_one` - --> $DIR/associated-types-eq-hr.rs:66:1 + --> $DIR/associated-types-eq-hr.rs:56:1 | LL | / fn tuple_one() LL | | where T : for<'x,'y> TheTrait<(&'x isize, &'y isize), A = &'x isize> @@ -69,7 +69,7 @@ LL | | } | |_^ error[E0277]: the trait bound `for<'x, 'y> Tuple: TheTrait<(&'x isize, &'y isize)>` is not satisfied - --> $DIR/associated-types-eq-hr.rs:101:5 + --> $DIR/associated-types-eq-hr.rs:91:5 | LL | tuple_two::(); | ^^^^^^^^^^^^^^^^^^ the trait `for<'x, 'y> TheTrait<(&'x isize, &'y isize)>` is not implemented for `Tuple` @@ -77,7 +77,7 @@ LL | tuple_two::(); = help: the following implementations were found: > note: required by `tuple_two` - --> $DIR/associated-types-eq-hr.rs:72:1 + --> $DIR/associated-types-eq-hr.rs:62:1 | LL | / fn tuple_two() LL | | where T : for<'x,'y> TheTrait<(&'x isize, &'y isize), A = &'y isize> @@ -87,13 +87,13 @@ LL | | } | |_^ error[E0271]: type mismatch resolving `for<'x, 'y> >::A == &'y isize` - --> $DIR/associated-types-eq-hr.rs:101:5 + --> $DIR/associated-types-eq-hr.rs:91:5 | LL | tuple_two::(); | ^^^^^^^^^^^^^^^^^^ expected bound lifetime parameter 'x, found concrete lifetime | note: required by `tuple_two` - --> $DIR/associated-types-eq-hr.rs:72:1 + --> $DIR/associated-types-eq-hr.rs:62:1 | LL | / fn tuple_two() LL | | where T : for<'x,'y> TheTrait<(&'x isize, &'y isize), A = &'y isize> @@ -103,7 +103,7 @@ LL | | } | |_^ error[E0277]: the trait bound `for<'x, 'y> Tuple: TheTrait<(&'x isize, &'y isize)>` is not satisfied - --> $DIR/associated-types-eq-hr.rs:107:5 + --> $DIR/associated-types-eq-hr.rs:97:5 | LL | tuple_four::(); | ^^^^^^^^^^^^^^^^^^^ the trait `for<'x, 'y> TheTrait<(&'x isize, &'y isize)>` is not implemented for `Tuple` @@ -111,7 +111,7 @@ LL | tuple_four::(); = help: the following implementations were found: > note: required by `tuple_four` - --> $DIR/associated-types-eq-hr.rs:84:1 + --> $DIR/associated-types-eq-hr.rs:74:1 | LL | / fn tuple_four() LL | | where T : for<'x,'y> TheTrait<(&'x isize, &'y isize)> diff --git a/src/test/ui/associated-types/associated-types-for-unimpl-trait.rs b/src/test/ui/associated-types/associated-types-for-unimpl-trait.rs index a6fcb9cff13ea..5b10d1dc2fdb5 100644 --- a/src/test/ui/associated-types/associated-types-for-unimpl-trait.rs +++ b/src/test/ui/associated-types/associated-types-for-unimpl-trait.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Get { type Value; fn get(&self) -> ::Value; diff --git a/src/test/ui/associated-types/associated-types-for-unimpl-trait.stderr b/src/test/ui/associated-types/associated-types-for-unimpl-trait.stderr index e6c15e465b625..9f033687a0072 100644 --- a/src/test/ui/associated-types/associated-types-for-unimpl-trait.stderr +++ b/src/test/ui/associated-types/associated-types-for-unimpl-trait.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `Self: Get` is not satisfied - --> $DIR/associated-types-for-unimpl-trait.rs:17:5 + --> $DIR/associated-types-for-unimpl-trait.rs:7:5 | LL | fn uhoh(&self, foo: U, bar: ::Value) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Get` is not implemented for `Self` diff --git a/src/test/ui/associated-types/associated-types-in-ambiguous-context.rs b/src/test/ui/associated-types/associated-types-in-ambiguous-context.rs index becbc27138b77..1b1ea9d52a98d 100644 --- a/src/test/ui/associated-types/associated-types-in-ambiguous-context.rs +++ b/src/test/ui/associated-types/associated-types-in-ambiguous-context.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Get { type Value; fn get(&self) -> ::Value; diff --git a/src/test/ui/associated-types/associated-types-in-ambiguous-context.stderr b/src/test/ui/associated-types/associated-types-in-ambiguous-context.stderr index c45873ffd5308..12c345a773c61 100644 --- a/src/test/ui/associated-types/associated-types-in-ambiguous-context.stderr +++ b/src/test/ui/associated-types/associated-types-in-ambiguous-context.stderr @@ -1,5 +1,5 @@ error[E0223]: ambiguous associated type - --> $DIR/associated-types-in-ambiguous-context.rs:16:36 + --> $DIR/associated-types-in-ambiguous-context.rs:6:36 | LL | fn get(x: T, y: U) -> Get::Value {} | ^^^^^^^^^^ ambiguous associated type @@ -7,7 +7,7 @@ LL | fn get(x: T, y: U) -> Get::Value {} = note: specify the type using the syntax `::Value` error[E0223]: ambiguous associated type - --> $DIR/associated-types-in-ambiguous-context.rs:25:10 + --> $DIR/associated-types-in-ambiguous-context.rs:15:10 | LL | type X = std::ops::Deref::Target; | ^^^^^^^^^^^^^^^^^^^^^^^ ambiguous associated type @@ -15,7 +15,7 @@ LL | type X = std::ops::Deref::Target; = note: specify the type using the syntax `::Target` error[E0223]: ambiguous associated type - --> $DIR/associated-types-in-ambiguous-context.rs:21:23 + --> $DIR/associated-types-in-ambiguous-context.rs:11:23 | LL | fn grab(&self) -> Grab::Value; | ^^^^^^^^^^^ ambiguous associated type diff --git a/src/test/ui/associated-types/associated-types-incomplete-object.rs b/src/test/ui/associated-types/associated-types-incomplete-object.rs index 9f1df14605b69..df1b98151a5ef 100644 --- a/src/test/ui/associated-types/associated-types-incomplete-object.rs +++ b/src/test/ui/associated-types/associated-types-incomplete-object.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that the user gets an error if they omit a binding from an // object type. diff --git a/src/test/ui/associated-types/associated-types-incomplete-object.stderr b/src/test/ui/associated-types/associated-types-incomplete-object.stderr index 95b1c63125005..5c91be1442913 100644 --- a/src/test/ui/associated-types/associated-types-incomplete-object.stderr +++ b/src/test/ui/associated-types/associated-types-incomplete-object.stderr @@ -1,23 +1,23 @@ error[E0191]: the value of the associated type `B` (from the trait `Foo`) must be specified - --> $DIR/associated-types-incomplete-object.rs:33:26 + --> $DIR/associated-types-incomplete-object.rs:23:26 | LL | let b = &42isize as &Foo; | ^^^^^^^^^^^^ missing associated type `B` value error[E0191]: the value of the associated type `A` (from the trait `Foo`) must be specified - --> $DIR/associated-types-incomplete-object.rs:36:26 + --> $DIR/associated-types-incomplete-object.rs:26:26 | LL | let c = &42isize as &Foo; | ^^^^^^^^^^^ missing associated type `A` value error[E0191]: the value of the associated type `A` (from the trait `Foo`) must be specified - --> $DIR/associated-types-incomplete-object.rs:39:26 + --> $DIR/associated-types-incomplete-object.rs:29:26 | LL | let d = &42isize as &Foo; | ^^^ missing associated type `A` value error[E0191]: the value of the associated type `B` (from the trait `Foo`) must be specified - --> $DIR/associated-types-incomplete-object.rs:39:26 + --> $DIR/associated-types-incomplete-object.rs:29:26 | LL | let d = &42isize as &Foo; | ^^^ missing associated type `B` value diff --git a/src/test/ui/associated-types/associated-types-invalid-trait-ref-issue-18865.rs b/src/test/ui/associated-types/associated-types-invalid-trait-ref-issue-18865.rs index 83726a1676d26..3bd3f3a757c53 100644 --- a/src/test/ui/associated-types/associated-types-invalid-trait-ref-issue-18865.rs +++ b/src/test/ui/associated-types/associated-types-invalid-trait-ref-issue-18865.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we report an error if the trait ref in a qualified type // uses invalid type arguments. diff --git a/src/test/ui/associated-types/associated-types-invalid-trait-ref-issue-18865.stderr b/src/test/ui/associated-types/associated-types-invalid-trait-ref-issue-18865.stderr index 40cba5e68340f..01f66a18d25bd 100644 --- a/src/test/ui/associated-types/associated-types-invalid-trait-ref-issue-18865.stderr +++ b/src/test/ui/associated-types/associated-types-invalid-trait-ref-issue-18865.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `T: Foo` is not satisfied - --> $DIR/associated-types-invalid-trait-ref-issue-18865.rs:20:12 + --> $DIR/associated-types-invalid-trait-ref-issue-18865.rs:10:12 | LL | let u: >::Bar = t.get_bar(); | ^^^^^^^^^^^^^^^^^^^^^^ the trait `Foo` is not implemented for `T` diff --git a/src/test/ui/associated-types/associated-types-issue-17359.rs b/src/test/ui/associated-types/associated-types-issue-17359.rs index 82258f124d323..88a8a6490e683 100644 --- a/src/test/ui/associated-types/associated-types-issue-17359.rs +++ b/src/test/ui/associated-types/associated-types-issue-17359.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we do not ICE when an impl is missing an associated type (and that we report // a useful error, of course). diff --git a/src/test/ui/associated-types/associated-types-issue-17359.stderr b/src/test/ui/associated-types/associated-types-issue-17359.stderr index 8ba8194bdedf0..e05da8c4e4e8b 100644 --- a/src/test/ui/associated-types/associated-types-issue-17359.stderr +++ b/src/test/ui/associated-types/associated-types-issue-17359.stderr @@ -1,5 +1,5 @@ error[E0046]: not all trait items implemented, missing: `Type` - --> $DIR/associated-types-issue-17359.rs:18:1 + --> $DIR/associated-types-issue-17359.rs:8:1 | LL | type Type; | ---------- `Type` from trait diff --git a/src/test/ui/associated-types/associated-types-issue-20346.rs b/src/test/ui/associated-types/associated-types-issue-20346.rs index a00aa8364bde2..0cce847e1be54 100644 --- a/src/test/ui/associated-types/associated-types-issue-20346.rs +++ b/src/test/ui/associated-types/associated-types-issue-20346.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we reliably check the value of the associated type. #![crate_type = "lib"] diff --git a/src/test/ui/associated-types/associated-types-issue-20346.stderr b/src/test/ui/associated-types/associated-types-issue-20346.stderr index 6f3dfbe0898ec..27b5b1e00f9ec 100644 --- a/src/test/ui/associated-types/associated-types-issue-20346.stderr +++ b/src/test/ui/associated-types/associated-types-issue-20346.stderr @@ -1,5 +1,5 @@ error[E0271]: type mismatch resolving ` as Iterator>::Item == std::option::Option` - --> $DIR/associated-types-issue-20346.rs:44:5 + --> $DIR/associated-types-issue-20346.rs:34:5 | LL | is_iterator_of::, _>(&adapter); //~ ERROR type mismatch | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected type parameter, found enum `std::option::Option` @@ -7,7 +7,7 @@ LL | is_iterator_of::, _>(&adapter); //~ ERROR type mismatch = note: expected type `T` found type `std::option::Option` note: required by `is_iterator_of` - --> $DIR/associated-types-issue-20346.rs:25:1 + --> $DIR/associated-types-issue-20346.rs:15:1 | LL | fn is_iterator_of>(_: &I) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/associated-types/associated-types-multiple-types-one-trait.rs b/src/test/ui/associated-types/associated-types-multiple-types-one-trait.rs index 9436f825de89d..daeaf90117f0d 100644 --- a/src/test/ui/associated-types/associated-types-multiple-types-one-trait.rs +++ b/src/test/ui/associated-types/associated-types-multiple-types-one-trait.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { type X; type Y; diff --git a/src/test/ui/associated-types/associated-types-multiple-types-one-trait.stderr b/src/test/ui/associated-types/associated-types-multiple-types-one-trait.stderr index c38a5f6e7f455..ec8852d9f186e 100644 --- a/src/test/ui/associated-types/associated-types-multiple-types-one-trait.stderr +++ b/src/test/ui/associated-types/associated-types-multiple-types-one-trait.stderr @@ -1,5 +1,5 @@ error[E0271]: type mismatch resolving `::Y == i32` - --> $DIR/associated-types-multiple-types-one-trait.rs:23:5 + --> $DIR/associated-types-multiple-types-one-trait.rs:13:5 | LL | want_y(t); //~ ERROR type mismatch | ^^^^^^ expected associated type, found i32 @@ -7,13 +7,13 @@ LL | want_y(t); //~ ERROR type mismatch = note: expected type `::Y` found type `i32` note: required by `want_y` - --> $DIR/associated-types-multiple-types-one-trait.rs:54:1 + --> $DIR/associated-types-multiple-types-one-trait.rs:44:1 | LL | fn want_y>(t: &T) { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0271]: type mismatch resolving `::X == u32` - --> $DIR/associated-types-multiple-types-one-trait.rs:28:5 + --> $DIR/associated-types-multiple-types-one-trait.rs:18:5 | LL | want_x(t); //~ ERROR type mismatch | ^^^^^^ expected associated type, found u32 @@ -21,7 +21,7 @@ LL | want_x(t); //~ ERROR type mismatch = note: expected type `::X` found type `u32` note: required by `want_x` - --> $DIR/associated-types-multiple-types-one-trait.rs:52:1 + --> $DIR/associated-types-multiple-types-one-trait.rs:42:1 | LL | fn want_x>(t: &T) { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/associated-types/associated-types-no-suitable-bound.rs b/src/test/ui/associated-types/associated-types-no-suitable-bound.rs index baf56ffec8692..d42460a4c072d 100644 --- a/src/test/ui/associated-types/associated-types-no-suitable-bound.rs +++ b/src/test/ui/associated-types/associated-types-no-suitable-bound.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Get { type Value; fn get(&self) -> ::Value; diff --git a/src/test/ui/associated-types/associated-types-no-suitable-bound.stderr b/src/test/ui/associated-types/associated-types-no-suitable-bound.stderr index 84802d49caa4e..ada9cacbee523 100644 --- a/src/test/ui/associated-types/associated-types-no-suitable-bound.stderr +++ b/src/test/ui/associated-types/associated-types-no-suitable-bound.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `T: Get` is not satisfied - --> $DIR/associated-types-no-suitable-bound.rs:21:5 + --> $DIR/associated-types-no-suitable-bound.rs:11:5 | LL | fn uhoh(foo: ::Value) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Get` is not implemented for `T` diff --git a/src/test/ui/associated-types/associated-types-no-suitable-supertrait-2.rs b/src/test/ui/associated-types/associated-types-no-suitable-supertrait-2.rs index e0f0f3c47ae5e..17dfa1773dddb 100644 --- a/src/test/ui/associated-types/associated-types-no-suitable-supertrait-2.rs +++ b/src/test/ui/associated-types/associated-types-no-suitable-supertrait-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we get an error when you use `::Value` in // the trait definition but `Self` does not, in fact, implement `Get`. // diff --git a/src/test/ui/associated-types/associated-types-no-suitable-supertrait-2.stderr b/src/test/ui/associated-types/associated-types-no-suitable-supertrait-2.stderr index 712b95f8e547f..56cd6d09caddc 100644 --- a/src/test/ui/associated-types/associated-types-no-suitable-supertrait-2.stderr +++ b/src/test/ui/associated-types/associated-types-no-suitable-supertrait-2.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `Self: Get` is not satisfied - --> $DIR/associated-types-no-suitable-supertrait-2.rs:27:5 + --> $DIR/associated-types-no-suitable-supertrait-2.rs:17:5 | LL | fn uhoh(&self, foo: U, bar: ::Value) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Get` is not implemented for `Self` diff --git a/src/test/ui/associated-types/associated-types-no-suitable-supertrait.rs b/src/test/ui/associated-types/associated-types-no-suitable-supertrait.rs index ec38595e8fe06..c373c5855cdc0 100644 --- a/src/test/ui/associated-types/associated-types-no-suitable-supertrait.rs +++ b/src/test/ui/associated-types/associated-types-no-suitable-supertrait.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we get an error when you use `::Value` in // the trait definition but `Self` does not, in fact, implement `Get`. // diff --git a/src/test/ui/associated-types/associated-types-no-suitable-supertrait.stderr b/src/test/ui/associated-types/associated-types-no-suitable-supertrait.stderr index 6927146ffbc44..71175d36f645f 100644 --- a/src/test/ui/associated-types/associated-types-no-suitable-supertrait.stderr +++ b/src/test/ui/associated-types/associated-types-no-suitable-supertrait.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `Self: Get` is not satisfied - --> $DIR/associated-types-no-suitable-supertrait.rs:27:5 + --> $DIR/associated-types-no-suitable-supertrait.rs:17:5 | LL | fn uhoh(&self, foo: U, bar: ::Value) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Get` is not implemented for `Self` @@ -7,7 +7,7 @@ LL | fn uhoh(&self, foo: U, bar: ::Value) {} = help: consider adding a `where Self: Get` bound error[E0277]: the trait bound `(T, U): Get` is not satisfied - --> $DIR/associated-types-no-suitable-supertrait.rs:32:5 + --> $DIR/associated-types-no-suitable-supertrait.rs:22:5 | LL | fn uhoh(&self, foo: U, bar: <(T, U) as Get>::Value) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Get` is not implemented for `(T, U)` diff --git a/src/test/ui/associated-types/associated-types-outlives.nll.stderr b/src/test/ui/associated-types/associated-types-outlives.nll.stderr index 384ed8f32847b..c58dc314e8a9d 100644 --- a/src/test/ui/associated-types/associated-types-outlives.nll.stderr +++ b/src/test/ui/associated-types/associated-types-outlives.nll.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `x` because it is borrowed - --> $DIR/associated-types-outlives.rs:32:14 + --> $DIR/associated-types-outlives.rs:22:14 | LL | 's: loop { y = denormalise(&x); break } | -- borrow of `x` occurs here diff --git a/src/test/ui/associated-types/associated-types-outlives.rs b/src/test/ui/associated-types/associated-types-outlives.rs index f070ab6799c08..55c276280b97a 100644 --- a/src/test/ui/associated-types/associated-types-outlives.rs +++ b/src/test/ui/associated-types/associated-types-outlives.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #24622. The older associated types code // was erroneously assuming that all projections outlived the current // fn body, causing this (invalid) code to be accepted. diff --git a/src/test/ui/associated-types/associated-types-outlives.stderr b/src/test/ui/associated-types/associated-types-outlives.stderr index 6d46392d94bb4..4cf3e473cf192 100644 --- a/src/test/ui/associated-types/associated-types-outlives.stderr +++ b/src/test/ui/associated-types/associated-types-outlives.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `x` because it is borrowed - --> $DIR/associated-types-outlives.rs:32:14 + --> $DIR/associated-types-outlives.rs:22:14 | LL | 's: loop { y = denormalise(&x); break } | - borrow of `x` occurs here diff --git a/src/test/ui/associated-types/associated-types-overridden-default.rs b/src/test/ui/associated-types/associated-types-overridden-default.rs index 946a4b2f73ac4..629fc7a7668ad 100644 --- a/src/test/ui/associated-types/associated-types-overridden-default.rs +++ b/src/test/ui/associated-types/associated-types-overridden-default.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(associated_type_defaults)] pub trait Tr { diff --git a/src/test/ui/associated-types/associated-types-overridden-default.stderr b/src/test/ui/associated-types/associated-types-overridden-default.stderr index e9a480be0678d..79fb9a613c2da 100644 --- a/src/test/ui/associated-types/associated-types-overridden-default.stderr +++ b/src/test/ui/associated-types/associated-types-overridden-default.stderr @@ -1,5 +1,5 @@ error[E0399]: the following trait items need to be reimplemented as `Assoc` was overridden: `Assoc2`, `C`, `foo` - --> $DIR/associated-types-overridden-default.rs:21:5 + --> $DIR/associated-types-overridden-default.rs:11:5 | LL | type Assoc = (); | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/associated-types/associated-types-path-1.rs b/src/test/ui/associated-types/associated-types-path-1.rs index ab061ca4d8da6..46a5c9e7ca01e 100644 --- a/src/test/ui/associated-types/associated-types-path-1.rs +++ b/src/test/ui/associated-types/associated-types-path-1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we have one and only one associated type per ref. pub trait Foo { diff --git a/src/test/ui/associated-types/associated-types-path-1.stderr b/src/test/ui/associated-types/associated-types-path-1.stderr index 04147922d9cf1..5f5fb7a273bfd 100644 --- a/src/test/ui/associated-types/associated-types-path-1.stderr +++ b/src/test/ui/associated-types/associated-types-path-1.stderr @@ -1,11 +1,11 @@ error[E0220]: associated type `A` not found for `T` - --> $DIR/associated-types-path-1.rs:20:23 + --> $DIR/associated-types-path-1.rs:10:23 | LL | pub fn f1(a: T, x: T::A) {} //~ERROR associated type `A` not found | ^^^^ associated type `A` not found error[E0221]: ambiguous associated type `A` in bounds of `T` - --> $DIR/associated-types-path-1.rs:21:34 + --> $DIR/associated-types-path-1.rs:11:34 | LL | type A; | ------- ambiguous `A` from `Foo` diff --git a/src/test/ui/associated-types/associated-types-path-2.rs b/src/test/ui/associated-types/associated-types-path-2.rs index d62f6b0f1a371..b28b60e70081b 100644 --- a/src/test/ui/associated-types/associated-types-path-2.rs +++ b/src/test/ui/associated-types/associated-types-path-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test type checking of uses of associated types via sugary paths. pub trait Foo { diff --git a/src/test/ui/associated-types/associated-types-path-2.stderr b/src/test/ui/associated-types/associated-types-path-2.stderr index 403b4fd4d8ead..be7097a018255 100644 --- a/src/test/ui/associated-types/associated-types-path-2.stderr +++ b/src/test/ui/associated-types/associated-types-path-2.stderr @@ -1,47 +1,47 @@ error[E0308]: mismatched types - --> $DIR/associated-types-path-2.rs:29:14 + --> $DIR/associated-types-path-2.rs:19:14 | LL | f1(2i32, 4i32); | ^^^^ expected u32, found i32 error[E0277]: the trait bound `u32: Foo` is not satisfied - --> $DIR/associated-types-path-2.rs:39:5 + --> $DIR/associated-types-path-2.rs:29:5 | LL | f1(2u32, 4u32); | ^^ the trait `Foo` is not implemented for `u32` | note: required by `f1` - --> $DIR/associated-types-path-2.rs:23:1 + --> $DIR/associated-types-path-2.rs:13:1 | LL | pub fn f1(a: T, x: T::A) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `u32: Foo` is not satisfied - --> $DIR/associated-types-path-2.rs:39:5 + --> $DIR/associated-types-path-2.rs:29:5 | LL | f1(2u32, 4u32); | ^^^^^^^^^^^^^^ the trait `Foo` is not implemented for `u32` error[E0277]: the trait bound `u32: Foo` is not satisfied - --> $DIR/associated-types-path-2.rs:45:5 + --> $DIR/associated-types-path-2.rs:35:5 | LL | f1(2u32, 4i32); | ^^ the trait `Foo` is not implemented for `u32` | note: required by `f1` - --> $DIR/associated-types-path-2.rs:23:1 + --> $DIR/associated-types-path-2.rs:13:1 | LL | pub fn f1(a: T, x: T::A) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `u32: Foo` is not satisfied - --> $DIR/associated-types-path-2.rs:45:5 + --> $DIR/associated-types-path-2.rs:35:5 | LL | f1(2u32, 4i32); | ^^^^^^^^^^^^^^ the trait `Foo` is not implemented for `u32` error[E0308]: mismatched types - --> $DIR/associated-types-path-2.rs:51:18 + --> $DIR/associated-types-path-2.rs:41:18 | LL | let _: i32 = f2(2i32); | ^^^^^^^^ expected i32, found u32 diff --git a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn-body.nll.stderr b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn-body.nll.stderr index 5b8223ff29258..d34aeb982cf90 100644 --- a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn-body.nll.stderr +++ b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn-body.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/associated-types-project-from-hrtb-in-fn-body.rs:32:12 + --> $DIR/associated-types-project-from-hrtb-in-fn-body.rs:22:12 | LL | let z: I::A = if cond { x } else { y }; | ^^^^ error: unsatisfied lifetime constraints - --> $DIR/associated-types-project-from-hrtb-in-fn-body.rs:32:29 + --> $DIR/associated-types-project-from-hrtb-in-fn-body.rs:22:29 | LL | fn bar<'a, 'b, I : for<'x> Foo<&'x isize>>( | -- -- lifetime `'b` defined here @@ -16,7 +16,7 @@ LL | let z: I::A = if cond { x } else { y }; | ^ assignment requires that `'a` must outlive `'b` error: unsatisfied lifetime constraints - --> $DIR/associated-types-project-from-hrtb-in-fn-body.rs:32:40 + --> $DIR/associated-types-project-from-hrtb-in-fn-body.rs:22:40 | LL | fn bar<'a, 'b, I : for<'x> Foo<&'x isize>>( | -- -- lifetime `'b` defined here diff --git a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn-body.rs b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn-body.rs index 5451a20d8166f..9434a88e633c2 100644 --- a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn-body.rs +++ b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn-body.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check projection of an associated type out of a higher-ranked // trait-bound in the context of a function body. diff --git a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn-body.stderr b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn-body.stderr index 12bbfb24910cb..d5310c47fcf1e 100644 --- a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn-body.stderr +++ b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn-body.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/associated-types-project-from-hrtb-in-fn-body.rs:32:40 + --> $DIR/associated-types-project-from-hrtb-in-fn-body.rs:22:40 | LL | x: >::A, | --------- these two types are declared with different lifetimes... diff --git a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn.rs b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn.rs index a79d5c4649a49..bf13c410cc60b 100644 --- a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn.rs +++ b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check projection of an associated type out of a higher-ranked trait-bound // in the context of a function signature. diff --git a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn.stderr b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn.stderr index 399f4d9409a7a..e06ad648613d9 100644 --- a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn.stderr +++ b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn.stderr @@ -1,5 +1,5 @@ error[E0212]: cannot extract an associated type from a higher-ranked trait bound in this context - --> $DIR/associated-types-project-from-hrtb-in-fn.rs:21:8 + --> $DIR/associated-types-project-from-hrtb-in-fn.rs:11:8 | LL | x: I::A) | ^^^^ diff --git a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-struct.rs b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-struct.rs index e6251a0d318a3..20f11ecf63823 100644 --- a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-struct.rs +++ b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-struct.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check projection of an associated type out of a higher-ranked trait-bound // in the context of a struct definition. diff --git a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-struct.stderr b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-struct.stderr index 05c0c38c79f33..4c9b7951393c5 100644 --- a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-struct.stderr +++ b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-struct.stderr @@ -1,5 +1,5 @@ error[E0212]: cannot extract an associated type from a higher-ranked trait bound in this context - --> $DIR/associated-types-project-from-hrtb-in-struct.rs:21:12 + --> $DIR/associated-types-project-from-hrtb-in-struct.rs:11:12 | LL | field: I::A | ^^^^ diff --git a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.rs b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.rs index af46a1b42d078..cb52c2b4f15d6 100644 --- a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.rs +++ b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check projection of an associated type out of a higher-ranked trait-bound // in the context of a method definition in a trait. diff --git a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.stderr b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.stderr index ccd568b62533d..445e1b19023f5 100644 --- a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.stderr +++ b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.stderr @@ -1,5 +1,5 @@ error[E0212]: cannot extract an associated type from a higher-ranked trait bound in this context - --> $DIR/associated-types-project-from-hrtb-in-trait-method.rs:21:32 + --> $DIR/associated-types-project-from-hrtb-in-trait-method.rs:11:32 | LL | fn some_method(&self, arg: I::A); | ^^^^ diff --git a/src/test/ui/associated-types/associated-types-projection-to-unrelated-trait-in-method-without-default.rs b/src/test/ui/associated-types/associated-types-projection-to-unrelated-trait-in-method-without-default.rs index 3f72391ff90c7..fc38b26f50b62 100644 --- a/src/test/ui/associated-types/associated-types-projection-to-unrelated-trait-in-method-without-default.rs +++ b/src/test/ui/associated-types/associated-types-projection-to-unrelated-trait-in-method-without-default.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we get an error when you use `::Value` in // the trait definition even if there is no default method. diff --git a/src/test/ui/associated-types/associated-types-projection-to-unrelated-trait-in-method-without-default.stderr b/src/test/ui/associated-types/associated-types-projection-to-unrelated-trait-in-method-without-default.stderr index e7e68dcf852dc..a260e37918254 100644 --- a/src/test/ui/associated-types/associated-types-projection-to-unrelated-trait-in-method-without-default.stderr +++ b/src/test/ui/associated-types/associated-types-projection-to-unrelated-trait-in-method-without-default.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `Self: Get` is not satisfied - --> $DIR/associated-types-projection-to-unrelated-trait-in-method-without-default.rs:19:5 + --> $DIR/associated-types-projection-to-unrelated-trait-in-method-without-default.rs:9:5 | LL | fn okay(&self, foo: U, bar: ::Value); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Get` is not implemented for `Self` diff --git a/src/test/ui/associated-types/associated-types-subtyping-1.rs b/src/test/ui/associated-types/associated-types-subtyping-1.rs index c3acffff240b5..731d7d13d08e4 100644 --- a/src/test/ui/associated-types/associated-types-subtyping-1.rs +++ b/src/test/ui/associated-types/associated-types-subtyping-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-compare-mode-nll #![allow(unused_variables)] diff --git a/src/test/ui/associated-types/associated-types-subtyping-1.stderr b/src/test/ui/associated-types/associated-types-subtyping-1.stderr index 3cc7b07a20c59..77914dbae795a 100644 --- a/src/test/ui/associated-types/associated-types-subtyping-1.stderr +++ b/src/test/ui/associated-types/associated-types-subtyping-1.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/associated-types-subtyping-1.rs:36:38 + --> $DIR/associated-types-subtyping-1.rs:26:38 | LL | fn method2<'a,'b,T>(x: &'a T, y: &'b T) | ----- ----- these two types are declared with different lifetimes... @@ -8,7 +8,7 @@ LL | let _c: >::Type = a; //~ ERROR E0623 | ^ ...but data from `y` flows into `x` here error[E0623]: lifetime mismatch - --> $DIR/associated-types-subtyping-1.rs:45:38 + --> $DIR/associated-types-subtyping-1.rs:35:38 | LL | fn method3<'a,'b,T>(x: &'a T, y: &'b T) | ----- ----- these two types are declared with different lifetimes... diff --git a/src/test/ui/associated-types/associated-types-unconstrained.rs b/src/test/ui/associated-types/associated-types-unconstrained.rs index aecbf217a5b25..99424836ece2f 100644 --- a/src/test/ui/associated-types/associated-types-unconstrained.rs +++ b/src/test/ui/associated-types/associated-types-unconstrained.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that an associated type cannot be bound in an expression path. trait Foo { diff --git a/src/test/ui/associated-types/associated-types-unconstrained.stderr b/src/test/ui/associated-types/associated-types-unconstrained.stderr index abb220c96c6c6..da14a69ae306a 100644 --- a/src/test/ui/associated-types/associated-types-unconstrained.stderr +++ b/src/test/ui/associated-types/associated-types-unconstrained.stderr @@ -1,5 +1,5 @@ error[E0284]: type annotations required: cannot resolve `<_ as Foo>::A == _` - --> $DIR/associated-types-unconstrained.rs:24:20 + --> $DIR/associated-types-unconstrained.rs:14:20 | LL | let x: isize = Foo::bar(); | ^^^^^^^^ diff --git a/src/test/ui/associated-types/associated-types-unsized.rs b/src/test/ui/associated-types/associated-types-unsized.rs index c561ae861ed2a..a9bc24e44d165 100644 --- a/src/test/ui/associated-types/associated-types-unsized.rs +++ b/src/test/ui/associated-types/associated-types-unsized.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Get { type Value: ?Sized; fn get(&self) -> ::Value; diff --git a/src/test/ui/associated-types/associated-types-unsized.stderr b/src/test/ui/associated-types/associated-types-unsized.stderr index 09e3cb8c126a3..bc85620d1a404 100644 --- a/src/test/ui/associated-types/associated-types-unsized.stderr +++ b/src/test/ui/associated-types/associated-types-unsized.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `::Value` cannot be known at compilation time - --> $DIR/associated-types-unsized.rs:17:9 + --> $DIR/associated-types-unsized.rs:7:9 | LL | let x = t.get(); //~ ERROR the size for values of type | ^ doesn't have a size known at compile-time diff --git a/src/test/ui/associated-types/bound-lifetime-constrained.clause.stderr b/src/test/ui/associated-types/bound-lifetime-constrained.clause.stderr index 23a67b5b064b6..f089f27f0a653 100644 --- a/src/test/ui/associated-types/bound-lifetime-constrained.clause.stderr +++ b/src/test/ui/associated-types/bound-lifetime-constrained.clause.stderr @@ -1,11 +1,11 @@ error[E0582]: binding for associated type `Output` references lifetime `'a`, which does not appear in the trait input types - --> $DIR/bound-lifetime-constrained.rs:48:63 + --> $DIR/bound-lifetime-constrained.rs:38:63 | LL | fn clause1() where T: for<'a> Fn(<() as Foo<'a>>::Item) -> &'a i32 { | ^^^^^^^ error[E0582]: binding for associated type `Output` references lifetime `'a`, which does not appear in the trait input types - --> $DIR/bound-lifetime-constrained.rs:53:42 + --> $DIR/bound-lifetime-constrained.rs:43:42 | LL | fn clause2() where T: for<'a> Fn() -> <() as Foo<'a>>::Item { | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/associated-types/bound-lifetime-constrained.func.stderr b/src/test/ui/associated-types/bound-lifetime-constrained.func.stderr index c969baeaefeb7..88d15a17199d9 100644 --- a/src/test/ui/associated-types/bound-lifetime-constrained.func.stderr +++ b/src/test/ui/associated-types/bound-lifetime-constrained.func.stderr @@ -1,11 +1,11 @@ error[E0581]: return type references lifetime `'a`, which is not constrained by the fn input types - --> $DIR/bound-lifetime-constrained.rs:26:50 + --> $DIR/bound-lifetime-constrained.rs:16:50 | LL | fn func1(_: for<'a> fn(<() as Foo<'a>>::Item) -> &'a i32) { | ^^^^^^^ error[E0581]: return type references lifetime `'a`, which is not constrained by the fn input types - --> $DIR/bound-lifetime-constrained.rs:33:29 + --> $DIR/bound-lifetime-constrained.rs:23:29 | LL | fn func2(_: for<'a> fn() -> <() as Foo<'a>>::Item) { | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/associated-types/bound-lifetime-constrained.object.stderr b/src/test/ui/associated-types/bound-lifetime-constrained.object.stderr index f24fed0f02ea2..9258854245c84 100644 --- a/src/test/ui/associated-types/bound-lifetime-constrained.object.stderr +++ b/src/test/ui/associated-types/bound-lifetime-constrained.object.stderr @@ -1,11 +1,11 @@ error[E0582]: binding for associated type `Output` references lifetime `'a`, which does not appear in the trait input types - --> $DIR/bound-lifetime-constrained.rs:38:56 + --> $DIR/bound-lifetime-constrained.rs:28:56 | LL | fn object1(_: Box Fn(<() as Foo<'a>>::Item) -> &'a i32>) { | ^^^^^^^ error[E0582]: binding for associated type `Output` references lifetime `'a`, which does not appear in the trait input types - --> $DIR/bound-lifetime-constrained.rs:43:35 + --> $DIR/bound-lifetime-constrained.rs:33:35 | LL | fn object2(_: Box Fn() -> <() as Foo<'a>>::Item>) { | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/associated-types/bound-lifetime-constrained.rs b/src/test/ui/associated-types/bound-lifetime-constrained.rs index 9ba5045f2a053..b590f88b60dca 100644 --- a/src/test/ui/associated-types/bound-lifetime-constrained.rs +++ b/src/test/ui/associated-types/bound-lifetime-constrained.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: func object clause #![allow(dead_code)] diff --git a/src/test/ui/associated-types/bound-lifetime-in-binding-only.angle.stderr b/src/test/ui/associated-types/bound-lifetime-in-binding-only.angle.stderr index 5df8a828012c7..fee64c0f663b7 100644 --- a/src/test/ui/associated-types/bound-lifetime-in-binding-only.angle.stderr +++ b/src/test/ui/associated-types/bound-lifetime-in-binding-only.angle.stderr @@ -1,23 +1,23 @@ error[E0582]: binding for associated type `Item` references lifetime `'a`, which does not appear in the trait input types - --> $DIR/bound-lifetime-in-binding-only.rs:22:25 + --> $DIR/bound-lifetime-in-binding-only.rs:12:25 | LL | fn angle Foo>() { | ^^^^^^^^^^^^ error[E0582]: binding for associated type `Item` references lifetime `'a`, which does not appear in the trait input types - --> $DIR/bound-lifetime-in-binding-only.rs:27:37 + --> $DIR/bound-lifetime-in-binding-only.rs:17:37 | LL | fn angle1() where T: for<'a> Foo { | ^^^^^^^^^^^^ error[E0582]: binding for associated type `Item` references lifetime `'a`, which does not appear in the trait input types - --> $DIR/bound-lifetime-in-binding-only.rs:32:37 + --> $DIR/bound-lifetime-in-binding-only.rs:22:37 | LL | fn angle2() where for<'a> T: Foo { | ^^^^^^^^^^^^ error[E0582]: binding for associated type `Item` references lifetime `'a`, which does not appear in the trait input types - --> $DIR/bound-lifetime-in-binding-only.rs:37:27 + --> $DIR/bound-lifetime-in-binding-only.rs:27:27 | LL | fn angle3(_: &for<'a> Foo) { | ^^^^^^^^^^^^ diff --git a/src/test/ui/associated-types/bound-lifetime-in-binding-only.elision.stderr b/src/test/ui/associated-types/bound-lifetime-in-binding-only.elision.stderr index 0a12aa76a785b..99c10739e4db3 100644 --- a/src/test/ui/associated-types/bound-lifetime-in-binding-only.elision.stderr +++ b/src/test/ui/associated-types/bound-lifetime-in-binding-only.elision.stderr @@ -1,5 +1,5 @@ error[E0106]: missing lifetime specifier - --> $DIR/bound-lifetime-in-binding-only.rs:62:23 + --> $DIR/bound-lifetime-in-binding-only.rs:52:23 | LL | fn elision &i32>() { | ^ expected lifetime parameter diff --git a/src/test/ui/associated-types/bound-lifetime-in-binding-only.ok.stderr b/src/test/ui/associated-types/bound-lifetime-in-binding-only.ok.stderr index 53594cb83fc67..3a5ff9d795631 100644 --- a/src/test/ui/associated-types/bound-lifetime-in-binding-only.ok.stderr +++ b/src/test/ui/associated-types/bound-lifetime-in-binding-only.ok.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/bound-lifetime-in-binding-only.rs:81:1 + --> $DIR/bound-lifetime-in-binding-only.rs:71:1 | LL | fn main() { } //[ok]~ ERROR compilation successful | ^^^^^^^^^^^^^ diff --git a/src/test/ui/associated-types/bound-lifetime-in-binding-only.paren.stderr b/src/test/ui/associated-types/bound-lifetime-in-binding-only.paren.stderr index 39a5366080b68..8c9480027e62a 100644 --- a/src/test/ui/associated-types/bound-lifetime-in-binding-only.paren.stderr +++ b/src/test/ui/associated-types/bound-lifetime-in-binding-only.paren.stderr @@ -1,23 +1,23 @@ error[E0582]: binding for associated type `Output` references lifetime `'a`, which does not appear in the trait input types - --> $DIR/bound-lifetime-in-binding-only.rs:42:29 + --> $DIR/bound-lifetime-in-binding-only.rs:32:29 | LL | fn paren Fn() -> &'a i32>() { | ^^^^^^^ error[E0582]: binding for associated type `Output` references lifetime `'a`, which does not appear in the trait input types - --> $DIR/bound-lifetime-in-binding-only.rs:47:41 + --> $DIR/bound-lifetime-in-binding-only.rs:37:41 | LL | fn paren1() where T: for<'a> Fn() -> &'a i32 { | ^^^^^^^ error[E0582]: binding for associated type `Output` references lifetime `'a`, which does not appear in the trait input types - --> $DIR/bound-lifetime-in-binding-only.rs:52:41 + --> $DIR/bound-lifetime-in-binding-only.rs:42:41 | LL | fn paren2() where for<'a> T: Fn() -> &'a i32 { | ^^^^^^^ error[E0582]: binding for associated type `Output` references lifetime `'a`, which does not appear in the trait input types - --> $DIR/bound-lifetime-in-binding-only.rs:57:31 + --> $DIR/bound-lifetime-in-binding-only.rs:47:31 | LL | fn paren3(_: &for<'a> Fn() -> &'a i32) { | ^^^^^^^ diff --git a/src/test/ui/associated-types/bound-lifetime-in-binding-only.rs b/src/test/ui/associated-types/bound-lifetime-in-binding-only.rs index 7cb0623315e1e..e1989d35bbb8c 100644 --- a/src/test/ui/associated-types/bound-lifetime-in-binding-only.rs +++ b/src/test/ui/associated-types/bound-lifetime-in-binding-only.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: angle paren ok elision #![allow(dead_code)] diff --git a/src/test/ui/associated-types/bound-lifetime-in-return-only.elision.stderr b/src/test/ui/associated-types/bound-lifetime-in-return-only.elision.stderr index 8fefdfd4d19ef..cd4b2c98fc481 100644 --- a/src/test/ui/associated-types/bound-lifetime-in-return-only.elision.stderr +++ b/src/test/ui/associated-types/bound-lifetime-in-return-only.elision.stderr @@ -1,5 +1,5 @@ error[E0106]: missing lifetime specifier - --> $DIR/bound-lifetime-in-return-only.rs:44:23 + --> $DIR/bound-lifetime-in-return-only.rs:34:23 | LL | fn elision(_: fn() -> &i32) { | ^ expected lifetime parameter diff --git a/src/test/ui/associated-types/bound-lifetime-in-return-only.local.stderr b/src/test/ui/associated-types/bound-lifetime-in-return-only.local.stderr index ce2cfa6765d17..788cf667c8d28 100644 --- a/src/test/ui/associated-types/bound-lifetime-in-return-only.local.stderr +++ b/src/test/ui/associated-types/bound-lifetime-in-return-only.local.stderr @@ -1,5 +1,5 @@ error[E0581]: return type references lifetime `'a`, which is not constrained by the fn input types - --> $DIR/bound-lifetime-in-return-only.rs:33:28 + --> $DIR/bound-lifetime-in-return-only.rs:23:28 | LL | let _: for<'a> fn() -> &'a i32 = loop { }; | ^^^^^^^ diff --git a/src/test/ui/associated-types/bound-lifetime-in-return-only.ok.stderr b/src/test/ui/associated-types/bound-lifetime-in-return-only.ok.stderr index 21bef7e5e52c7..650383b531cfa 100644 --- a/src/test/ui/associated-types/bound-lifetime-in-return-only.ok.stderr +++ b/src/test/ui/associated-types/bound-lifetime-in-return-only.ok.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/bound-lifetime-in-return-only.rs:59:1 + --> $DIR/bound-lifetime-in-return-only.rs:49:1 | LL | fn main() { } //[ok]~ ERROR compilation successful | ^^^^^^^^^^^^^ diff --git a/src/test/ui/associated-types/bound-lifetime-in-return-only.rs b/src/test/ui/associated-types/bound-lifetime-in-return-only.rs index b9b1317cef50f..5a7e086fd476c 100644 --- a/src/test/ui/associated-types/bound-lifetime-in-return-only.rs +++ b/src/test/ui/associated-types/bound-lifetime-in-return-only.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: sig local structure ok elision #![allow(dead_code)] diff --git a/src/test/ui/associated-types/bound-lifetime-in-return-only.sig.stderr b/src/test/ui/associated-types/bound-lifetime-in-return-only.sig.stderr index 26a1585463a13..64dad461999fa 100644 --- a/src/test/ui/associated-types/bound-lifetime-in-return-only.sig.stderr +++ b/src/test/ui/associated-types/bound-lifetime-in-return-only.sig.stderr @@ -1,11 +1,11 @@ error[E0581]: return type references lifetime `'a`, which is not constrained by the fn input types - --> $DIR/bound-lifetime-in-return-only.rs:22:28 + --> $DIR/bound-lifetime-in-return-only.rs:12:28 | LL | fn sig1(_: for<'a> fn() -> &'a i32) { | ^^^^^^^ error[E0581]: return type references lifetime `'a`, which is not constrained by the fn input types - --> $DIR/bound-lifetime-in-return-only.rs:27:39 + --> $DIR/bound-lifetime-in-return-only.rs:17:39 | LL | fn sig2(_: for<'a, 'b> fn(&'b i32) -> &'a i32) { | ^^^^^^^ diff --git a/src/test/ui/associated-types/bound-lifetime-in-return-only.structure.stderr b/src/test/ui/associated-types/bound-lifetime-in-return-only.structure.stderr index db52e4de69bce..f7833500d00c4 100644 --- a/src/test/ui/associated-types/bound-lifetime-in-return-only.structure.stderr +++ b/src/test/ui/associated-types/bound-lifetime-in-return-only.structure.stderr @@ -1,5 +1,5 @@ error[E0581]: return type references lifetime `'a`, which is not constrained by the fn input types - --> $DIR/bound-lifetime-in-return-only.rs:39:24 + --> $DIR/bound-lifetime-in-return-only.rs:29:24 | LL | x: for<'a> fn() -> &'a i32 | ^^^^^^^ diff --git a/src/test/ui/associated-types/cache/chrono-scan.rs b/src/test/ui/associated-types/cache/chrono-scan.rs index a753527ea53d5..d37bc81fd1532 100644 --- a/src/test/ui/associated-types/cache/chrono-scan.rs +++ b/src/test/ui/associated-types/cache/chrono-scan.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![allow(warnings)] diff --git a/src/test/ui/associated-types/cache/chrono-scan.stderr b/src/test/ui/associated-types/cache/chrono-scan.stderr index 99281e745656d..564fc03bec8a8 100644 --- a/src/test/ui/associated-types/cache/chrono-scan.stderr +++ b/src/test/ui/associated-types/cache/chrono-scan.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/chrono-scan.rs:39:1 + --> $DIR/chrono-scan.rs:29:1 | LL | fn main() { } //~ ERROR compilation successful | ^^^^^^^^^^^^^ diff --git a/src/test/ui/associated-types/cache/elision.rs b/src/test/ui/associated-types/cache/elision.rs index d1117328c8657..0697bc4b94fef 100644 --- a/src/test/ui/associated-types/cache/elision.rs +++ b/src/test/ui/associated-types/cache/elision.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![allow(warnings)] diff --git a/src/test/ui/associated-types/cache/elision.stderr b/src/test/ui/associated-types/cache/elision.stderr index c5314b58002c0..8a169a57837cb 100644 --- a/src/test/ui/associated-types/cache/elision.stderr +++ b/src/test/ui/associated-types/cache/elision.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/elision.rs:34:1 + --> $DIR/elision.rs:24:1 | LL | fn main() { } //~ ERROR compilation successful | ^^^^^^^^^^^^^ diff --git a/src/test/ui/associated-types/cache/project-fn-ret-contravariant.krisskross.nll.stderr b/src/test/ui/associated-types/cache/project-fn-ret-contravariant.krisskross.nll.stderr index ac758a8926f28..b1cdab6417140 100644 --- a/src/test/ui/associated-types/cache/project-fn-ret-contravariant.krisskross.nll.stderr +++ b/src/test/ui/associated-types/cache/project-fn-ret-contravariant.krisskross.nll.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/project-fn-ret-contravariant.rs:53:16 + --> $DIR/project-fn-ret-contravariant.rs:43:16 | LL | let a = bar(foo, y); | ^^^ warning: not reporting region error due to nll - --> $DIR/project-fn-ret-contravariant.rs:54:16 + --> $DIR/project-fn-ret-contravariant.rs:44:16 | LL | let b = bar(foo, x); | ^^^ error: unsatisfied lifetime constraints - --> $DIR/project-fn-ret-contravariant.rs:53:12 + --> $DIR/project-fn-ret-contravariant.rs:43:12 | LL | fn transmute<'a,'b>(x: &'a u32, y: &'b u32) -> (&'a u32, &'b u32) { | -- -- lifetime `'b` defined here @@ -21,7 +21,7 @@ LL | let a = bar(foo, y); | ^^^^^^^^^^^ assignment requires that `'b` must outlive `'a` error: unsatisfied lifetime constraints - --> $DIR/project-fn-ret-contravariant.rs:54:12 + --> $DIR/project-fn-ret-contravariant.rs:44:12 | LL | fn transmute<'a,'b>(x: &'a u32, y: &'b u32) -> (&'a u32, &'b u32) { | -- -- lifetime `'b` defined here diff --git a/src/test/ui/associated-types/cache/project-fn-ret-contravariant.krisskross.stderr b/src/test/ui/associated-types/cache/project-fn-ret-contravariant.krisskross.stderr index 6cecf68ffffe1..f89561d9d86c6 100644 --- a/src/test/ui/associated-types/cache/project-fn-ret-contravariant.krisskross.stderr +++ b/src/test/ui/associated-types/cache/project-fn-ret-contravariant.krisskross.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/project-fn-ret-contravariant.rs:55:5 + --> $DIR/project-fn-ret-contravariant.rs:45:5 | LL | fn transmute<'a,'b>(x: &'a u32, y: &'b u32) -> (&'a u32, &'b u32) { | ------- ------------------ @@ -10,7 +10,7 @@ LL | (a, b) //[krisskross]~ ERROR 55:5: 55:6: lifetime mismatch [E0623] | ^ ...but data from `y` is returned here error[E0623]: lifetime mismatch - --> $DIR/project-fn-ret-contravariant.rs:55:8 + --> $DIR/project-fn-ret-contravariant.rs:45:8 | LL | fn transmute<'a,'b>(x: &'a u32, y: &'b u32) -> (&'a u32, &'b u32) { | ------- ------------------ diff --git a/src/test/ui/associated-types/cache/project-fn-ret-contravariant.ok.stderr b/src/test/ui/associated-types/cache/project-fn-ret-contravariant.ok.stderr index c92aa37a60fb7..15bbea671c50f 100644 --- a/src/test/ui/associated-types/cache/project-fn-ret-contravariant.ok.stderr +++ b/src/test/ui/associated-types/cache/project-fn-ret-contravariant.ok.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/project-fn-ret-contravariant.rs:60:1 + --> $DIR/project-fn-ret-contravariant.rs:50:1 | LL | fn main() { } | ^^^^^^^^^^^^^ diff --git a/src/test/ui/associated-types/cache/project-fn-ret-contravariant.oneuse.stderr b/src/test/ui/associated-types/cache/project-fn-ret-contravariant.oneuse.stderr index c92aa37a60fb7..15bbea671c50f 100644 --- a/src/test/ui/associated-types/cache/project-fn-ret-contravariant.oneuse.stderr +++ b/src/test/ui/associated-types/cache/project-fn-ret-contravariant.oneuse.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/project-fn-ret-contravariant.rs:60:1 + --> $DIR/project-fn-ret-contravariant.rs:50:1 | LL | fn main() { } | ^^^^^^^^^^^^^ diff --git a/src/test/ui/associated-types/cache/project-fn-ret-contravariant.rs b/src/test/ui/associated-types/cache/project-fn-ret-contravariant.rs index a5e8f4068e661..ee9ba54e477e6 100644 --- a/src/test/ui/associated-types/cache/project-fn-ret-contravariant.rs +++ b/src/test/ui/associated-types/cache/project-fn-ret-contravariant.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unboxed_closures)] #![feature(rustc_attrs)] diff --git a/src/test/ui/associated-types/cache/project-fn-ret-contravariant.transmute.nll.stderr b/src/test/ui/associated-types/cache/project-fn-ret-contravariant.transmute.nll.stderr index 75c35d077c4c4..81ccd84c393fd 100644 --- a/src/test/ui/associated-types/cache/project-fn-ret-contravariant.transmute.nll.stderr +++ b/src/test/ui/associated-types/cache/project-fn-ret-contravariant.transmute.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/project-fn-ret-contravariant.rs:48:8 + --> $DIR/project-fn-ret-contravariant.rs:38:8 | LL | bar(foo, x) //[transmute]~ ERROR E0495 | ^^^ error: unsatisfied lifetime constraints - --> $DIR/project-fn-ret-contravariant.rs:48:4 + --> $DIR/project-fn-ret-contravariant.rs:38:4 | LL | fn baz<'a,'b>(x: &'a u32) -> &'static u32 { | -- lifetime `'a` defined here diff --git a/src/test/ui/associated-types/cache/project-fn-ret-contravariant.transmute.stderr b/src/test/ui/associated-types/cache/project-fn-ret-contravariant.transmute.stderr index 9d42c8e3c6388..ab148365c9199 100644 --- a/src/test/ui/associated-types/cache/project-fn-ret-contravariant.transmute.stderr +++ b/src/test/ui/associated-types/cache/project-fn-ret-contravariant.transmute.stderr @@ -1,22 +1,22 @@ error[E0495]: cannot infer an appropriate lifetime due to conflicting requirements - --> $DIR/project-fn-ret-contravariant.rs:48:8 + --> $DIR/project-fn-ret-contravariant.rs:38:8 | LL | bar(foo, x) //[transmute]~ ERROR E0495 | ^^^ | -note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 47:8... - --> $DIR/project-fn-ret-contravariant.rs:47:8 +note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 37:8... + --> $DIR/project-fn-ret-contravariant.rs:37:8 | LL | fn baz<'a,'b>(x: &'a u32) -> &'static u32 { | ^^ note: ...so that reference does not outlive borrowed content - --> $DIR/project-fn-ret-contravariant.rs:48:13 + --> $DIR/project-fn-ret-contravariant.rs:38:13 | LL | bar(foo, x) //[transmute]~ ERROR E0495 | ^ = note: but, the lifetime must be valid for the static lifetime... note: ...so that reference does not outlive borrowed content - --> $DIR/project-fn-ret-contravariant.rs:48:4 + --> $DIR/project-fn-ret-contravariant.rs:38:4 | LL | bar(foo, x) //[transmute]~ ERROR E0495 | ^^^^^^^^^^^ diff --git a/src/test/ui/associated-types/cache/project-fn-ret-invariant.krisskross.nll.stderr b/src/test/ui/associated-types/cache/project-fn-ret-invariant.krisskross.nll.stderr index 4b2ba24eb0eb8..1255835485c2f 100644 --- a/src/test/ui/associated-types/cache/project-fn-ret-invariant.krisskross.nll.stderr +++ b/src/test/ui/associated-types/cache/project-fn-ret-invariant.krisskross.nll.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/project-fn-ret-invariant.rs:63:16 + --> $DIR/project-fn-ret-invariant.rs:53:16 | LL | let a = bar(foo, y); //[krisskross]~ ERROR E0623 | ^^^ warning: not reporting region error due to nll - --> $DIR/project-fn-ret-invariant.rs:64:16 + --> $DIR/project-fn-ret-invariant.rs:54:16 | LL | let b = bar(foo, x); | ^^^ error: unsatisfied lifetime constraints - --> $DIR/project-fn-ret-invariant.rs:63:12 + --> $DIR/project-fn-ret-invariant.rs:53:12 | LL | fn transmute<'a,'b>(x: Type<'a>, y: Type<'b>) -> (Type<'a>, Type<'b>) { | -- -- lifetime `'b` defined here @@ -21,7 +21,7 @@ LL | let a = bar(foo, y); //[krisskross]~ ERROR E0623 | ^^^^^^^^^^^ assignment requires that `'b` must outlive `'a` error: unsatisfied lifetime constraints - --> $DIR/project-fn-ret-invariant.rs:64:12 + --> $DIR/project-fn-ret-invariant.rs:54:12 | LL | fn transmute<'a,'b>(x: Type<'a>, y: Type<'b>) -> (Type<'a>, Type<'b>) { | -- -- lifetime `'b` defined here diff --git a/src/test/ui/associated-types/cache/project-fn-ret-invariant.krisskross.stderr b/src/test/ui/associated-types/cache/project-fn-ret-invariant.krisskross.stderr index e867ac4baac6a..46901b44c4b6d 100644 --- a/src/test/ui/associated-types/cache/project-fn-ret-invariant.krisskross.stderr +++ b/src/test/ui/associated-types/cache/project-fn-ret-invariant.krisskross.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/project-fn-ret-invariant.rs:63:21 + --> $DIR/project-fn-ret-invariant.rs:53:21 | LL | fn transmute<'a,'b>(x: Type<'a>, y: Type<'b>) -> (Type<'a>, Type<'b>) { | -------- -------------------- @@ -9,7 +9,7 @@ LL | let a = bar(foo, y); //[krisskross]~ ERROR E0623 | ^ ...but data from `x` is returned here error[E0623]: lifetime mismatch - --> $DIR/project-fn-ret-invariant.rs:65:8 + --> $DIR/project-fn-ret-invariant.rs:55:8 | LL | fn transmute<'a,'b>(x: Type<'a>, y: Type<'b>) -> (Type<'a>, Type<'b>) { | -------- -------------------- diff --git a/src/test/ui/associated-types/cache/project-fn-ret-invariant.ok.stderr b/src/test/ui/associated-types/cache/project-fn-ret-invariant.ok.stderr index e3e620ea3a03e..8110ed40cfe4e 100644 --- a/src/test/ui/associated-types/cache/project-fn-ret-invariant.ok.stderr +++ b/src/test/ui/associated-types/cache/project-fn-ret-invariant.ok.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/project-fn-ret-invariant.rs:69:1 + --> $DIR/project-fn-ret-invariant.rs:59:1 | LL | fn main() { } | ^^^^^^^^^^^^^ diff --git a/src/test/ui/associated-types/cache/project-fn-ret-invariant.oneuse.nll.stderr b/src/test/ui/associated-types/cache/project-fn-ret-invariant.oneuse.nll.stderr index a669c7ac73bc5..a9520367121ac 100644 --- a/src/test/ui/associated-types/cache/project-fn-ret-invariant.oneuse.nll.stderr +++ b/src/test/ui/associated-types/cache/project-fn-ret-invariant.oneuse.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/project-fn-ret-invariant.rs:47:12 + --> $DIR/project-fn-ret-invariant.rs:37:12 | LL | let f = foo; // <-- No consistent type can be inferred for `f` here. | ^^^ error: unsatisfied lifetime constraints - --> $DIR/project-fn-ret-invariant.rs:48:12 + --> $DIR/project-fn-ret-invariant.rs:38:12 | LL | fn baz<'a,'b>(x: Type<'a>, y: Type<'b>) -> (Type<'a>, Type<'b>) { | -- -- lifetime `'b` defined here @@ -16,7 +16,7 @@ LL | let a = bar(f, x); | ^^^^^^^^^ argument requires that `'a` must outlive `'b` error: unsatisfied lifetime constraints - --> $DIR/project-fn-ret-invariant.rs:49:12 + --> $DIR/project-fn-ret-invariant.rs:39:12 | LL | fn baz<'a,'b>(x: Type<'a>, y: Type<'b>) -> (Type<'a>, Type<'b>) { | -- -- lifetime `'b` defined here diff --git a/src/test/ui/associated-types/cache/project-fn-ret-invariant.oneuse.stderr b/src/test/ui/associated-types/cache/project-fn-ret-invariant.oneuse.stderr index 7c86e20fe64d6..5f004cbe7bef1 100644 --- a/src/test/ui/associated-types/cache/project-fn-ret-invariant.oneuse.stderr +++ b/src/test/ui/associated-types/cache/project-fn-ret-invariant.oneuse.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/project-fn-ret-invariant.rs:49:19 + --> $DIR/project-fn-ret-invariant.rs:39:19 | LL | fn baz<'a,'b>(x: Type<'a>, y: Type<'b>) -> (Type<'a>, Type<'b>) { | -------- -------------------- diff --git a/src/test/ui/associated-types/cache/project-fn-ret-invariant.rs b/src/test/ui/associated-types/cache/project-fn-ret-invariant.rs index 6e4bdd4b21c79..4704ee8d3ae9d 100644 --- a/src/test/ui/associated-types/cache/project-fn-ret-invariant.rs +++ b/src/test/ui/associated-types/cache/project-fn-ret-invariant.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unboxed_closures)] #![feature(rustc_attrs)] diff --git a/src/test/ui/associated-types/cache/project-fn-ret-invariant.transmute.nll.stderr b/src/test/ui/associated-types/cache/project-fn-ret-invariant.transmute.nll.stderr index 604974a25008d..f86897815dac0 100644 --- a/src/test/ui/associated-types/cache/project-fn-ret-invariant.transmute.nll.stderr +++ b/src/test/ui/associated-types/cache/project-fn-ret-invariant.transmute.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/project-fn-ret-invariant.rs:58:8 + --> $DIR/project-fn-ret-invariant.rs:48:8 | LL | bar(foo, x) //[transmute]~ ERROR E0495 | ^^^ error: unsatisfied lifetime constraints - --> $DIR/project-fn-ret-invariant.rs:58:4 + --> $DIR/project-fn-ret-invariant.rs:48:4 | LL | fn baz<'a,'b>(x: Type<'a>) -> Type<'static> { | -- lifetime `'a` defined here diff --git a/src/test/ui/associated-types/cache/project-fn-ret-invariant.transmute.stderr b/src/test/ui/associated-types/cache/project-fn-ret-invariant.transmute.stderr index 6432ab9e57d73..947844c45c408 100644 --- a/src/test/ui/associated-types/cache/project-fn-ret-invariant.transmute.stderr +++ b/src/test/ui/associated-types/cache/project-fn-ret-invariant.transmute.stderr @@ -1,11 +1,11 @@ error[E0495]: cannot infer an appropriate lifetime for lifetime parameter `'a` due to conflicting requirements - --> $DIR/project-fn-ret-invariant.rs:58:8 + --> $DIR/project-fn-ret-invariant.rs:48:8 | LL | bar(foo, x) //[transmute]~ ERROR E0495 | ^^^ | -note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 54:8... - --> $DIR/project-fn-ret-invariant.rs:54:8 +note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 44:8... + --> $DIR/project-fn-ret-invariant.rs:44:8 | LL | fn baz<'a,'b>(x: Type<'a>) -> Type<'static> { | ^^ diff --git a/src/test/ui/associated-types/higher-ranked-projection.bad.stderr b/src/test/ui/associated-types/higher-ranked-projection.bad.stderr index 1351d14fe0087..cc69e849fe144 100644 --- a/src/test/ui/associated-types/higher-ranked-projection.bad.stderr +++ b/src/test/ui/associated-types/higher-ranked-projection.bad.stderr @@ -1,11 +1,11 @@ error[E0271]: type mismatch resolving `for<'a> <&'a _ as Mirror>::Image == _` - --> $DIR/higher-ranked-projection.rs:35:5 + --> $DIR/higher-ranked-projection.rs:25:5 | LL | foo(()); | ^^^ expected bound lifetime parameter 'a, found concrete lifetime | note: required by `foo` - --> $DIR/higher-ranked-projection.rs:24:1 + --> $DIR/higher-ranked-projection.rs:14:1 | LL | / fn foo(_t: T) LL | | where for<'a> &'a T: Mirror diff --git a/src/test/ui/associated-types/higher-ranked-projection.good.stderr b/src/test/ui/associated-types/higher-ranked-projection.good.stderr index 861827f329bea..632fe493e1f3f 100644 --- a/src/test/ui/associated-types/higher-ranked-projection.good.stderr +++ b/src/test/ui/associated-types/higher-ranked-projection.good.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/higher-ranked-projection.rs:34:1 + --> $DIR/higher-ranked-projection.rs:24:1 | LL | / fn main() { //[good]~ ERROR compilation successful LL | | foo(()); diff --git a/src/test/ui/associated-types/higher-ranked-projection.rs b/src/test/ui/associated-types/higher-ranked-projection.rs index 12341fa8db38f..be6300c418293 100644 --- a/src/test/ui/associated-types/higher-ranked-projection.rs +++ b/src/test/ui/associated-types/higher-ranked-projection.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] // revisions: good bad diff --git a/src/test/ui/associated-types/issue-36499.rs b/src/test/ui/associated-types/issue-36499.rs index b5b3ecbb580ae..7f8f13ef8d4ac 100644 --- a/src/test/ui/associated-types/issue-36499.rs +++ b/src/test/ui/associated-types/issue-36499.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: aborting due to previous error fn main() { diff --git a/src/test/ui/associated-types/issue-36499.stderr b/src/test/ui/associated-types/issue-36499.stderr index 5167c47a6cfcd..ff450f60acc68 100644 --- a/src/test/ui/associated-types/issue-36499.stderr +++ b/src/test/ui/associated-types/issue-36499.stderr @@ -1,5 +1,5 @@ error: expected expression, found `+` - --> $DIR/issue-36499.rs:14:9 + --> $DIR/issue-36499.rs:4:9 | LL | 2 + +2; | ^ expected expression diff --git a/src/test/ui/async-fn-multiple-lifetimes.rs b/src/test/ui/async-fn-multiple-lifetimes.rs index aab4974e2e7a1..6156617c4da65 100644 --- a/src/test/ui/async-fn-multiple-lifetimes.rs +++ b/src/test/ui/async-fn-multiple-lifetimes.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 #![feature(arbitrary_self_types, async_await, await_macro, futures_api, pin)] diff --git a/src/test/ui/async-fn-multiple-lifetimes.stderr b/src/test/ui/async-fn-multiple-lifetimes.stderr index 1d34673a0050d..071349b23facc 100644 --- a/src/test/ui/async-fn-multiple-lifetimes.stderr +++ b/src/test/ui/async-fn-multiple-lifetimes.stderr @@ -1,5 +1,5 @@ error[E0709]: multiple different lifetimes used in arguments of `async fn` - --> $DIR/async-fn-multiple-lifetimes.rs:17:47 + --> $DIR/async-fn-multiple-lifetimes.rs:7:47 | LL | async fn multiple_named_lifetimes<'a, 'b>(_: &'a u8, _: &'b u8) {} | ^^ ^^ different lifetime here @@ -9,7 +9,7 @@ LL | async fn multiple_named_lifetimes<'a, 'b>(_: &'a u8, _: &'b u8) {} = help: `async fn` can only accept borrowed values with identical lifetimes error[E0707]: multiple elided lifetimes used in arguments of `async fn` - --> $DIR/async-fn-multiple-lifetimes.rs:26:39 + --> $DIR/async-fn-multiple-lifetimes.rs:16:39 | LL | async fn multiple_elided_lifetimes(_: &u8, _: &u8) {} | ^ ^ different lifetime here @@ -19,7 +19,7 @@ LL | async fn multiple_elided_lifetimes(_: &u8, _: &u8) {} = help: consider giving these arguments named lifetimes error[E0106]: missing lifetime specifier - --> $DIR/async-fn-multiple-lifetimes.rs:26:39 + --> $DIR/async-fn-multiple-lifetimes.rs:16:39 | LL | async fn multiple_elided_lifetimes(_: &u8, _: &u8) {} | ^ expected lifetime parameter diff --git a/src/test/ui/async-matches-expr.rs b/src/test/ui/async-matches-expr.rs index d6959f9ddd805..f375d58d98495 100644 --- a/src/test/ui/async-matches-expr.rs +++ b/src/test/ui/async-matches-expr.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass // edition:2018 diff --git a/src/test/ui/attempted-access-non-fatal.rs b/src/test/ui/attempted-access-non-fatal.rs index 3d6c46f5ce3e1..e50c1f23c51cc 100644 --- a/src/test/ui/attempted-access-non-fatal.rs +++ b/src/test/ui/attempted-access-non-fatal.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that bogus field access is non-fatal fn main() { let x = 0; diff --git a/src/test/ui/attempted-access-non-fatal.stderr b/src/test/ui/attempted-access-non-fatal.stderr index d056a3eff6fc7..2fee49acdf4b7 100644 --- a/src/test/ui/attempted-access-non-fatal.stderr +++ b/src/test/ui/attempted-access-non-fatal.stderr @@ -1,11 +1,11 @@ error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields - --> $DIR/attempted-access-non-fatal.rs:14:15 + --> $DIR/attempted-access-non-fatal.rs:4:15 | LL | let _ = x.foo; //~ `{integer}` is a primitive type and therefore doesn't have fields [E0610] | ^^^ error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields - --> $DIR/attempted-access-non-fatal.rs:15:15 + --> $DIR/attempted-access-non-fatal.rs:5:15 | LL | let _ = x.bar; //~ `{integer}` is a primitive type and therefore doesn't have fields [E0610] | ^^^ diff --git a/src/test/ui/attr-eq-token-tree.rs b/src/test/ui/attr-eq-token-tree.rs index c759e62dba0b5..f28f76db9389d 100644 --- a/src/test/ui/attr-eq-token-tree.rs +++ b/src/test/ui/attr-eq-token-tree.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![feature(custom_attribute, unrestricted_attribute_tokens)] diff --git a/src/test/ui/attr-usage-inline.rs b/src/test/ui/attr-usage-inline.rs index 250905dbdcd8c..1996f4a692c18 100644 --- a/src/test/ui/attr-usage-inline.rs +++ b/src/test/ui/attr-usage-inline.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] #[inline] diff --git a/src/test/ui/attr-usage-inline.stderr b/src/test/ui/attr-usage-inline.stderr index 171bd949e10c6..3030a2f8f1d62 100644 --- a/src/test/ui/attr-usage-inline.stderr +++ b/src/test/ui/attr-usage-inline.stderr @@ -1,5 +1,5 @@ error[E0518]: attribute should be applied to function or closure - --> $DIR/attr-usage-inline.rs:16:1 + --> $DIR/attr-usage-inline.rs:6:1 | LL | #[inline] //~ ERROR: attribute should be applied to function or closure | ^^^^^^^^^ diff --git a/src/test/ui/attr-usage-repr.rs b/src/test/ui/attr-usage-repr.rs index 437907008777a..498bf4d284a73 100644 --- a/src/test/ui/attr-usage-repr.rs +++ b/src/test/ui/attr-usage-repr.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(repr_simd)] #[repr(C)] //~ ERROR: attribute should be applied to struct, enum or union diff --git a/src/test/ui/attr-usage-repr.stderr b/src/test/ui/attr-usage-repr.stderr index 8d5e49a81f01c..990984bbb2b3d 100644 --- a/src/test/ui/attr-usage-repr.stderr +++ b/src/test/ui/attr-usage-repr.stderr @@ -1,5 +1,5 @@ error[E0517]: attribute should be applied to struct, enum or union - --> $DIR/attr-usage-repr.rs:13:8 + --> $DIR/attr-usage-repr.rs:3:8 | LL | #[repr(C)] //~ ERROR: attribute should be applied to struct, enum or union | ^ @@ -7,7 +7,7 @@ LL | fn f() {} | --------- not a struct, enum or union error[E0517]: attribute should be applied to enum - --> $DIR/attr-usage-repr.rs:25:8 + --> $DIR/attr-usage-repr.rs:15:8 | LL | #[repr(i8)] //~ ERROR: attribute should be applied to enum | ^^ @@ -15,7 +15,7 @@ LL | struct SInt(f64, f64); | ---------------------- not an enum error[E0517]: attribute should be applied to struct or union - --> $DIR/attr-usage-repr.rs:31:8 + --> $DIR/attr-usage-repr.rs:21:8 | LL | #[repr(align(8))] //~ ERROR: attribute should be applied to struct | ^^^^^^^^ @@ -23,7 +23,7 @@ LL | enum EAlign { A, B } | -------------------- not a struct or union error[E0517]: attribute should be applied to struct or union - --> $DIR/attr-usage-repr.rs:34:8 + --> $DIR/attr-usage-repr.rs:24:8 | LL | #[repr(packed)] //~ ERROR: attribute should be applied to struct | ^^^^^^ @@ -31,7 +31,7 @@ LL | enum EPacked { A, B } | --------------------- not a struct or union error[E0517]: attribute should be applied to struct - --> $DIR/attr-usage-repr.rs:37:8 + --> $DIR/attr-usage-repr.rs:27:8 | LL | #[repr(simd)] //~ ERROR: attribute should be applied to struct | ^^^^ diff --git a/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-1.rs b/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-1.rs index ec7885f1f44f9..d7feb03853077 100644 --- a/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-1.rs +++ b/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-1.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test checks variations on `<#[attr] 'a, #[oops]>`, where // `#[oops]` is left dangling (that is, it is unattached, with no // formal binding following it). diff --git a/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-1.stderr b/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-1.stderr index afab999b02e6b..75c0d91ee1791 100644 --- a/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-1.stderr +++ b/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-1.stderr @@ -1,5 +1,5 @@ error: trailing attribute after lifetime parameters - --> $DIR/attrs-with-no-formal-in-generics-1.rs:19:25 + --> $DIR/attrs-with-no-formal-in-generics-1.rs:9:25 | LL | impl<#[rustc_1] 'a, 'b, #[oops]> RefIntPair<'a, 'b> { | ^^^^^^^ diff --git a/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-2.rs b/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-2.rs index efe2d5561a832..f9db6a5f72af9 100644 --- a/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-2.rs +++ b/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test checks variations on `<#[attr] 'a, #[oops]>`, where // `#[oops]` is left dangling (that is, it is unattached, with no // formal binding following it). diff --git a/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-2.stderr b/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-2.stderr index 8bff45ea9890a..7585c6dd738a2 100644 --- a/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-2.stderr +++ b/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-2.stderr @@ -1,5 +1,5 @@ error: trailing attribute after type parameters - --> $DIR/attrs-with-no-formal-in-generics-2.rs:19:35 + --> $DIR/attrs-with-no-formal-in-generics-2.rs:9:35 | LL | impl<#[rustc_1] 'a, #[rustc_2] T, #[oops]> RefAny<'a, T> {} | ^^^^^^^ diff --git a/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-3.rs b/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-3.rs index e7d5b94d24226..343a2d7a563d1 100644 --- a/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-3.rs +++ b/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-3.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test checks variations on `<#[attr] 'a, #[oops]>`, where // `#[oops]` is left dangling (that is, it is unattached, with no // formal binding following it). diff --git a/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-3.stderr b/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-3.stderr index 351c788f84fd1..91960510de4db 100644 --- a/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-3.stderr +++ b/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-3.stderr @@ -1,5 +1,5 @@ error: trailing attribute after lifetime parameters - --> $DIR/attrs-with-no-formal-in-generics-3.rs:18:38 + --> $DIR/attrs-with-no-formal-in-generics-3.rs:8:38 | LL | where Q: for <#[rustc_1] 'a, 'b, #[oops]> Fn(RefIntPair<'a,'b>) -> &'b u32 | ^^^^^^^ diff --git a/src/test/ui/augmented-assignments.nll.stderr b/src/test/ui/augmented-assignments.nll.stderr index 57a86227f764d..5814a29a1724d 100644 --- a/src/test/ui/augmented-assignments.nll.stderr +++ b/src/test/ui/augmented-assignments.nll.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `x` because it is borrowed - --> $DIR/augmented-assignments.rs:26:5 + --> $DIR/augmented-assignments.rs:16:5 | LL | x //~ error: use of moved value: `x` | - @@ -15,7 +15,7 @@ LL | | x; //~ value moved here | borrow later used here error[E0596]: cannot borrow `y` as mutable, as it is not declared as mutable - --> $DIR/augmented-assignments.rs:30:5 + --> $DIR/augmented-assignments.rs:20:5 | LL | let y = Int(2); | - help: consider changing this to be mutable: `mut y` diff --git a/src/test/ui/augmented-assignments.rs b/src/test/ui/augmented-assignments.rs index 82f5c49eeb7ae..5e350026c5460 100644 --- a/src/test/ui/augmented-assignments.rs +++ b/src/test/ui/augmented-assignments.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::AddAssign; struct Int(i32); diff --git a/src/test/ui/augmented-assignments.stderr b/src/test/ui/augmented-assignments.stderr index 953af813c3821..8c04c90625168 100644 --- a/src/test/ui/augmented-assignments.stderr +++ b/src/test/ui/augmented-assignments.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow immutable local variable `y` as mutable - --> $DIR/augmented-assignments.rs:30:5 + --> $DIR/augmented-assignments.rs:20:5 | LL | let y = Int(2); | - consider changing this to `mut y` @@ -8,7 +8,7 @@ LL | y //~ error: cannot borrow immutable local variable `y` as mutable | ^ cannot borrow mutably error[E0382]: use of moved value: `x` - --> $DIR/augmented-assignments.rs:23:5 + --> $DIR/augmented-assignments.rs:13:5 | LL | x //~ error: use of moved value: `x` | ^ value used here after move diff --git a/src/test/ui/auto-ref-slice-plus-ref.rs b/src/test/ui/auto-ref-slice-plus-ref.rs index 324e925964779..00b279d3226c1 100644 --- a/src/test/ui/auto-ref-slice-plus-ref.rs +++ b/src/test/ui/auto-ref-slice-plus-ref.rs @@ -1,14 +1,3 @@ -// Copyright 2012-14 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn main() { // Testing that method lookup does not automatically borrow diff --git a/src/test/ui/auto-ref-slice-plus-ref.stderr b/src/test/ui/auto-ref-slice-plus-ref.stderr index f62ac84a185a3..ab57fec0e7337 100644 --- a/src/test/ui/auto-ref-slice-plus-ref.stderr +++ b/src/test/ui/auto-ref-slice-plus-ref.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `test_mut` found for type `std::vec::Vec<{integer}>` in the current scope - --> $DIR/auto-ref-slice-plus-ref.rs:18:7 + --> $DIR/auto-ref-slice-plus-ref.rs:7:7 | LL | a.test_mut(); //~ ERROR no method named `test_mut` found | ^^^^^^^^ @@ -10,7 +10,7 @@ LL | a.test_mut(); //~ ERROR no method named `test_mut` found = help: did you mean `get_mut`? error[E0599]: no method named `test` found for type `std::vec::Vec<{integer}>` in the current scope - --> $DIR/auto-ref-slice-plus-ref.rs:19:7 + --> $DIR/auto-ref-slice-plus-ref.rs:8:7 | LL | a.test(); //~ ERROR no method named `test` found | ^^^^ @@ -20,7 +20,7 @@ LL | a.test(); //~ ERROR no method named `test` found candidate #1: `MyIter` error[E0599]: no method named `test` found for type `[{integer}; 1]` in the current scope - --> $DIR/auto-ref-slice-plus-ref.rs:21:11 + --> $DIR/auto-ref-slice-plus-ref.rs:10:11 | LL | ([1]).test(); //~ ERROR no method named `test` found | ^^^^ @@ -30,7 +30,7 @@ LL | ([1]).test(); //~ ERROR no method named `test` found candidate #1: `MyIter` error[E0599]: no method named `test` found for type `&[{integer}; 1]` in the current scope - --> $DIR/auto-ref-slice-plus-ref.rs:22:12 + --> $DIR/auto-ref-slice-plus-ref.rs:11:12 | LL | (&[1]).test(); //~ ERROR no method named `test` found | ^^^^ diff --git a/src/test/ui/auto-trait-validation.rs b/src/test/ui/auto-trait-validation.rs index 92b222e1322b8..34d6c3da00ee3 100644 --- a/src/test/ui/auto-trait-validation.rs +++ b/src/test/ui/auto-trait-validation.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] auto trait Generic {} diff --git a/src/test/ui/auto-trait-validation.stderr b/src/test/ui/auto-trait-validation.stderr index a6bd887021ee1..e077982069e07 100644 --- a/src/test/ui/auto-trait-validation.stderr +++ b/src/test/ui/auto-trait-validation.stderr @@ -1,17 +1,17 @@ error[E0567]: auto traits cannot have generic parameters - --> $DIR/auto-trait-validation.rs:13:1 + --> $DIR/auto-trait-validation.rs:3:1 | LL | auto trait Generic {} | ^^^^^^^^^^^^^^^^^^^^^^^^ error[E0568]: auto traits cannot have super traits - --> $DIR/auto-trait-validation.rs:15:1 + --> $DIR/auto-trait-validation.rs:5:1 | LL | auto trait Bound : Copy {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0380]: auto traits cannot have methods or associated items - --> $DIR/auto-trait-validation.rs:17:1 + --> $DIR/auto-trait-validation.rs:7:1 | LL | auto trait MyTrait { fn foo() {} } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/autoderef-full-lval.rs b/src/test/ui/autoderef-full-lval.rs index c152fdd929682..2a4733ea5de27 100644 --- a/src/test/ui/autoderef-full-lval.rs +++ b/src/test/ui/autoderef-full-lval.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] struct clam { diff --git a/src/test/ui/autoderef-full-lval.stderr b/src/test/ui/autoderef-full-lval.stderr index df8eeb5d171c6..b92259b69df8e 100644 --- a/src/test/ui/autoderef-full-lval.stderr +++ b/src/test/ui/autoderef-full-lval.stderr @@ -1,5 +1,5 @@ error[E0369]: binary operation `+` cannot be applied to type `std::boxed::Box` - --> $DIR/autoderef-full-lval.rs:25:20 + --> $DIR/autoderef-full-lval.rs:15:20 | LL | let z: isize = a.x + b.y; | ^^^^^^^^^ @@ -7,7 +7,7 @@ LL | let z: isize = a.x + b.y; = note: an implementation of `std::ops::Add` might be missing for `std::boxed::Box` error[E0369]: binary operation `+` cannot be applied to type `std::boxed::Box` - --> $DIR/autoderef-full-lval.rs:31:25 + --> $DIR/autoderef-full-lval.rs:21:25 | LL | let answer: isize = forty.a + two.a; | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/auxiliary/cdylib-dep.rs b/src/test/ui/auxiliary/cdylib-dep.rs index a3d0222a14c97..8bd2b3353b8f3 100644 --- a/src/test/ui/auxiliary/cdylib-dep.rs +++ b/src/test/ui/auxiliary/cdylib-dep.rs @@ -1,11 +1 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "dylib"] diff --git a/src/test/ui/auxiliary/changing-crates-a1.rs b/src/test/ui/auxiliary/changing-crates-a1.rs index 18162c5f756b8..bc0559b8b80b1 100644 --- a/src/test/ui/auxiliary/changing-crates-a1.rs +++ b/src/test/ui/auxiliary/changing-crates-a1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "a"] pub fn foo() {} diff --git a/src/test/ui/auxiliary/changing-crates-a2.rs b/src/test/ui/auxiliary/changing-crates-a2.rs index 28eae023d684b..fafc6d5b1693b 100644 --- a/src/test/ui/auxiliary/changing-crates-a2.rs +++ b/src/test/ui/auxiliary/changing-crates-a2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "a"] pub fn foo() { println!("hello!"); } diff --git a/src/test/ui/auxiliary/changing-crates-b.rs b/src/test/ui/auxiliary/changing-crates-b.rs index 7b1190fc08580..f9ce29e4c4cab 100644 --- a/src/test/ui/auxiliary/changing-crates-b.rs +++ b/src/test/ui/auxiliary/changing-crates-b.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "b"] extern crate a; diff --git a/src/test/ui/auxiliary/default_ty_param_cross_crate_crate.rs b/src/test/ui/auxiliary/default_ty_param_cross_crate_crate.rs index 4bd8ecacb96b3..612f99dbcf884 100644 --- a/src/test/ui/auxiliary/default_ty_param_cross_crate_crate.rs +++ b/src/test/ui/auxiliary/default_ty_param_cross_crate_crate.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] #![crate_name = "default_param_test"] #![feature(default_type_parameter_fallback)] diff --git a/src/test/ui/auxiliary/define_macro.rs b/src/test/ui/auxiliary/define_macro.rs index 6b6b14a896b29..4956907c55ea9 100644 --- a/src/test/ui/auxiliary/define_macro.rs +++ b/src/test/ui/auxiliary/define_macro.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_export] macro_rules! define_macro { ($i:ident) => { diff --git a/src/test/ui/auxiliary/empty-struct.rs b/src/test/ui/auxiliary/empty-struct.rs index 4a30286563422..3fb40f6bfa960 100644 --- a/src/test/ui/auxiliary/empty-struct.rs +++ b/src/test/ui/auxiliary/empty-struct.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct XEmpty1 {} pub struct XEmpty2; pub struct XEmpty6(); diff --git a/src/test/ui/auxiliary/extern-statics.rs b/src/test/ui/auxiliary/extern-statics.rs index 07f70b177b3b5..725fde518d81f 100644 --- a/src/test/ui/auxiliary/extern-statics.rs +++ b/src/test/ui/auxiliary/extern-statics.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern { pub static XA: u8; pub static mut XB: u8; diff --git a/src/test/ui/auxiliary/lto-duplicate-symbols1.rs b/src/test/ui/auxiliary/lto-duplicate-symbols1.rs index ea09327bd19e1..9d510f2626f3a 100644 --- a/src/test/ui/auxiliary/lto-duplicate-symbols1.rs +++ b/src/test/ui/auxiliary/lto-duplicate-symbols1.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "rlib"] diff --git a/src/test/ui/auxiliary/lto-duplicate-symbols2.rs b/src/test/ui/auxiliary/lto-duplicate-symbols2.rs index ea09327bd19e1..9d510f2626f3a 100644 --- a/src/test/ui/auxiliary/lto-duplicate-symbols2.rs +++ b/src/test/ui/auxiliary/lto-duplicate-symbols2.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "rlib"] diff --git a/src/test/ui/auxiliary/namespaced_enums.rs b/src/test/ui/auxiliary/namespaced_enums.rs index 3bf39b788db6e..d3548c76cf2a6 100644 --- a/src/test/ui/auxiliary/namespaced_enums.rs +++ b/src/test/ui/auxiliary/namespaced_enums.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub enum Foo { A, B(isize), diff --git a/src/test/ui/auxiliary/noexporttypelib.rs b/src/test/ui/auxiliary/noexporttypelib.rs index 5ae8e0d298e53..67889cc5f657f 100644 --- a/src/test/ui/auxiliary/noexporttypelib.rs +++ b/src/test/ui/auxiliary/noexporttypelib.rs @@ -1,12 +1,2 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub type oint = Option; pub fn foo() -> oint { Some(3) } diff --git a/src/test/ui/auxiliary/orphan_check_diagnostics.rs b/src/test/ui/auxiliary/orphan_check_diagnostics.rs index cf3e9903b5ad0..6b2c42b69b928 100644 --- a/src/test/ui/auxiliary/orphan_check_diagnostics.rs +++ b/src/test/ui/auxiliary/orphan_check_diagnostics.rs @@ -1,11 +1 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait RemoteTrait { fn dummy(&self) { } } diff --git a/src/test/ui/auxiliary/removing-extern-crate.rs b/src/test/ui/auxiliary/removing-extern-crate.rs index 4275e80e7fe8b..65e2cc340450f 100644 --- a/src/test/ui/auxiliary/removing-extern-crate.rs +++ b/src/test/ui/auxiliary/removing-extern-crate.rs @@ -1,11 +1 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // intentionally blank diff --git a/src/test/ui/auxiliary/rmeta_meta.rs b/src/test/ui/auxiliary/rmeta_meta.rs index 4207fc2373b17..6d8ed95bd3863 100644 --- a/src/test/ui/auxiliary/rmeta_meta.rs +++ b/src/test/ui/auxiliary/rmeta_meta.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic // compile-flags: --emit=metadata diff --git a/src/test/ui/auxiliary/rmeta_rlib.rs b/src/test/ui/auxiliary/rmeta_rlib.rs index 6096c4df05bb0..4a05710db667c 100644 --- a/src/test/ui/auxiliary/rmeta_rlib.rs +++ b/src/test/ui/auxiliary/rmeta_rlib.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="rlib"] pub struct Foo { diff --git a/src/test/ui/auxiliary/stability_cfg2.rs b/src/test/ui/auxiliary/stability_cfg2.rs index a59f4b4e8f44b..8a2899584b903 100644 --- a/src/test/ui/auxiliary/stability_cfg2.rs +++ b/src/test/ui/auxiliary/stability_cfg2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:--cfg foo #![cfg_attr(foo, unstable(feature = "unstable_test_feature", issue = "0"))] diff --git a/src/test/ui/auxiliary/weak-lang-items.rs b/src/test/ui/auxiliary/weak-lang-items.rs index 6434e62b6f703..7a698cf76ae51 100644 --- a/src/test/ui/auxiliary/weak-lang-items.rs +++ b/src/test/ui/auxiliary/weak-lang-items.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic // This aux-file will require the eh_personality function to be codegen'd, but diff --git a/src/test/ui/auxiliary/xc_private_method_lib.rs b/src/test/ui/auxiliary/xc_private_method_lib.rs index 5e7bc61943be5..4d5ec6de39219 100644 --- a/src/test/ui/auxiliary/xc_private_method_lib.rs +++ b/src/test/ui/auxiliary/xc_private_method_lib.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="lib"] pub struct Struct { diff --git a/src/test/ui/bad/bad-const-type.rs b/src/test/ui/bad/bad-const-type.rs index 5547d19868d34..b46f5933010de 100644 --- a/src/test/ui/bad/bad-const-type.rs +++ b/src/test/ui/bad/bad-const-type.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - static i: String = 10; //~^ ERROR mismatched types //~| expected type `std::string::String` diff --git a/src/test/ui/bad/bad-const-type.stderr b/src/test/ui/bad/bad-const-type.stderr index fbde1573200aa..694e692a5bec5 100644 --- a/src/test/ui/bad/bad-const-type.stderr +++ b/src/test/ui/bad/bad-const-type.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/bad-const-type.rs:11:20 + --> $DIR/bad-const-type.rs:1:20 | LL | static i: String = 10; | ^^ diff --git a/src/test/ui/bad/bad-crate-name.rs b/src/test/ui/bad/bad-crate-name.rs index 70e1806a20b54..837d5c3541222 100644 --- a/src/test/ui/bad/bad-crate-name.rs +++ b/src/test/ui/bad/bad-crate-name.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate krate-name-here; //~^ ERROR crate name using dashes are not valid in `extern crate` statements //~| ERROR can't find crate for `krate_name_here` diff --git a/src/test/ui/bad/bad-crate-name.stderr b/src/test/ui/bad/bad-crate-name.stderr index 8348badeeeb17..a08535a77571a 100644 --- a/src/test/ui/bad/bad-crate-name.stderr +++ b/src/test/ui/bad/bad-crate-name.stderr @@ -1,5 +1,5 @@ error: crate name using dashes are not valid in `extern crate` statements - --> $DIR/bad-crate-name.rs:11:14 + --> $DIR/bad-crate-name.rs:1:14 | LL | extern crate krate-name-here; | ^^^^^^^^^^^^^^^ dash-separated idents are not valid @@ -9,7 +9,7 @@ LL | extern crate krate_name_here; | ^ ^ error[E0463]: can't find crate for `krate_name_here` - --> $DIR/bad-crate-name.rs:11:1 + --> $DIR/bad-crate-name.rs:1:1 | LL | extern crate krate-name-here; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't find crate diff --git a/src/test/ui/bad/bad-env-capture.rs b/src/test/ui/bad/bad-env-capture.rs index 6a5e4cfef895a..83fd2544fc8d8 100644 --- a/src/test/ui/bad/bad-env-capture.rs +++ b/src/test/ui/bad/bad-env-capture.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: can't capture dynamic environment in a fn item fn foo() { let x: isize; diff --git a/src/test/ui/bad/bad-env-capture.stderr b/src/test/ui/bad/bad-env-capture.stderr index bf460d2a81e9c..04975b0378098 100644 --- a/src/test/ui/bad/bad-env-capture.stderr +++ b/src/test/ui/bad/bad-env-capture.stderr @@ -1,5 +1,5 @@ error[E0434]: can't capture dynamic environment in a fn item - --> $DIR/bad-env-capture.rs:14:27 + --> $DIR/bad-env-capture.rs:4:27 | LL | fn bar() { log(debug, x); } | ^ @@ -7,13 +7,13 @@ LL | fn bar() { log(debug, x); } = help: use the `|| { ... }` closure form instead error[E0425]: cannot find function `log` in this scope - --> $DIR/bad-env-capture.rs:14:16 + --> $DIR/bad-env-capture.rs:4:16 | LL | fn bar() { log(debug, x); } | ^^^ not found in this scope error[E0425]: cannot find value `debug` in this scope - --> $DIR/bad-env-capture.rs:14:20 + --> $DIR/bad-env-capture.rs:4:20 | LL | fn bar() { log(debug, x); } | ^^^^^ not found in this scope diff --git a/src/test/ui/bad/bad-env-capture2.rs b/src/test/ui/bad/bad-env-capture2.rs index cf67c73c53979..b04569c9d7228 100644 --- a/src/test/ui/bad/bad-env-capture2.rs +++ b/src/test/ui/bad/bad-env-capture2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: can't capture dynamic environment in a fn item fn foo(x: isize) { fn bar() { log(debug, x); } diff --git a/src/test/ui/bad/bad-env-capture2.stderr b/src/test/ui/bad/bad-env-capture2.stderr index 8d5703d29f50c..f7524c6a09f0e 100644 --- a/src/test/ui/bad/bad-env-capture2.stderr +++ b/src/test/ui/bad/bad-env-capture2.stderr @@ -1,5 +1,5 @@ error[E0434]: can't capture dynamic environment in a fn item - --> $DIR/bad-env-capture2.rs:13:27 + --> $DIR/bad-env-capture2.rs:3:27 | LL | fn bar() { log(debug, x); } | ^ @@ -7,13 +7,13 @@ LL | fn bar() { log(debug, x); } = help: use the `|| { ... }` closure form instead error[E0425]: cannot find function `log` in this scope - --> $DIR/bad-env-capture2.rs:13:16 + --> $DIR/bad-env-capture2.rs:3:16 | LL | fn bar() { log(debug, x); } | ^^^ not found in this scope error[E0425]: cannot find value `debug` in this scope - --> $DIR/bad-env-capture2.rs:13:20 + --> $DIR/bad-env-capture2.rs:3:20 | LL | fn bar() { log(debug, x); } | ^^^^^ not found in this scope diff --git a/src/test/ui/bad/bad-env-capture3.rs b/src/test/ui/bad/bad-env-capture3.rs index a30c6770b87ff..62f12fd1a6d67 100644 --- a/src/test/ui/bad/bad-env-capture3.rs +++ b/src/test/ui/bad/bad-env-capture3.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: can't capture dynamic environment in a fn item fn foo(x: isize) { fn mth() { diff --git a/src/test/ui/bad/bad-env-capture3.stderr b/src/test/ui/bad/bad-env-capture3.stderr index 258f7d43b56a8..137612c979088 100644 --- a/src/test/ui/bad/bad-env-capture3.stderr +++ b/src/test/ui/bad/bad-env-capture3.stderr @@ -1,5 +1,5 @@ error[E0434]: can't capture dynamic environment in a fn item - --> $DIR/bad-env-capture3.rs:14:31 + --> $DIR/bad-env-capture3.rs:4:31 | LL | fn bar() { log(debug, x); } | ^ @@ -7,13 +7,13 @@ LL | fn bar() { log(debug, x); } = help: use the `|| { ... }` closure form instead error[E0425]: cannot find function `log` in this scope - --> $DIR/bad-env-capture3.rs:14:20 + --> $DIR/bad-env-capture3.rs:4:20 | LL | fn bar() { log(debug, x); } | ^^^ not found in this scope error[E0425]: cannot find value `debug` in this scope - --> $DIR/bad-env-capture3.rs:14:24 + --> $DIR/bad-env-capture3.rs:4:24 | LL | fn bar() { log(debug, x); } | ^^^^^ not found in this scope diff --git a/src/test/ui/bad/bad-expr-lhs.rs b/src/test/ui/bad/bad-expr-lhs.rs index c7d2f2c472f49..2cd8bc9d47333 100644 --- a/src/test/ui/bad/bad-expr-lhs.rs +++ b/src/test/ui/bad/bad-expr-lhs.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { 1 = 2; //~ ERROR invalid left-hand side expression 1 += 2; //~ ERROR invalid left-hand side expression diff --git a/src/test/ui/bad/bad-expr-lhs.stderr b/src/test/ui/bad/bad-expr-lhs.stderr index 5937beef9c7a2..590d73bc3f5ef 100644 --- a/src/test/ui/bad/bad-expr-lhs.stderr +++ b/src/test/ui/bad/bad-expr-lhs.stderr @@ -1,29 +1,29 @@ error[E0070]: invalid left-hand side expression - --> $DIR/bad-expr-lhs.rs:12:5 + --> $DIR/bad-expr-lhs.rs:2:5 | LL | 1 = 2; //~ ERROR invalid left-hand side expression | ^^^^^ left-hand of expression not valid error[E0067]: invalid left-hand side expression - --> $DIR/bad-expr-lhs.rs:13:5 + --> $DIR/bad-expr-lhs.rs:3:5 | LL | 1 += 2; //~ ERROR invalid left-hand side expression | ^ invalid expression for left-hand side error[E0070]: invalid left-hand side expression - --> $DIR/bad-expr-lhs.rs:14:5 + --> $DIR/bad-expr-lhs.rs:4:5 | LL | (1, 2) = (3, 4); //~ ERROR invalid left-hand side expression | ^^^^^^^^^^^^^^^ left-hand of expression not valid error[E0070]: invalid left-hand side expression - --> $DIR/bad-expr-lhs.rs:17:5 + --> $DIR/bad-expr-lhs.rs:7:5 | LL | (a, b) = (3, 4); //~ ERROR invalid left-hand side expression | ^^^^^^^^^^^^^^^ left-hand of expression not valid error[E0070]: invalid left-hand side expression - --> $DIR/bad-expr-lhs.rs:19:5 + --> $DIR/bad-expr-lhs.rs:9:5 | LL | None = Some(3); //~ ERROR invalid left-hand side expression | ^^^^^^^^^^^^^^ left-hand of expression not valid diff --git a/src/test/ui/bad/bad-expr-path.rs b/src/test/ui/bad/bad-expr-path.rs index bd62dc663776b..99ba93253d16f 100644 --- a/src/test/ui/bad/bad-expr-path.rs +++ b/src/test/ui/bad/bad-expr-path.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod m1 {} fn main(arguments: Vec) { //~ ERROR main function has wrong type diff --git a/src/test/ui/bad/bad-expr-path.stderr b/src/test/ui/bad/bad-expr-path.stderr index a1ac17c78d6a0..71ac9a16ba62c 100644 --- a/src/test/ui/bad/bad-expr-path.stderr +++ b/src/test/ui/bad/bad-expr-path.stderr @@ -1,23 +1,23 @@ error[E0425]: cannot find function `log` in this scope - --> $DIR/bad-expr-path.rs:14:5 + --> $DIR/bad-expr-path.rs:4:5 | LL | log(debug, m1::arguments); | ^^^ not found in this scope error[E0425]: cannot find value `debug` in this scope - --> $DIR/bad-expr-path.rs:14:9 + --> $DIR/bad-expr-path.rs:4:9 | LL | log(debug, m1::arguments); | ^^^^^ not found in this scope error[E0425]: cannot find value `arguments` in module `m1` - --> $DIR/bad-expr-path.rs:14:20 + --> $DIR/bad-expr-path.rs:4:20 | LL | log(debug, m1::arguments); | ^^^^^^^^^ not found in `m1` error[E0580]: main function has wrong type - --> $DIR/bad-expr-path.rs:13:1 + --> $DIR/bad-expr-path.rs:3:1 | LL | fn main(arguments: Vec) { //~ ERROR main function has wrong type | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ incorrect number of function parameters diff --git a/src/test/ui/bad/bad-expr-path2.rs b/src/test/ui/bad/bad-expr-path2.rs index 06b72d1ed47f4..43bd2908042a5 100644 --- a/src/test/ui/bad/bad-expr-path2.rs +++ b/src/test/ui/bad/bad-expr-path2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod m1 { pub mod arguments {} } diff --git a/src/test/ui/bad/bad-expr-path2.stderr b/src/test/ui/bad/bad-expr-path2.stderr index bb7d01c72fe97..343de94182e9a 100644 --- a/src/test/ui/bad/bad-expr-path2.stderr +++ b/src/test/ui/bad/bad-expr-path2.stderr @@ -1,23 +1,23 @@ error[E0425]: cannot find function `log` in this scope - --> $DIR/bad-expr-path2.rs:16:5 + --> $DIR/bad-expr-path2.rs:6:5 | LL | log(debug, m1::arguments); | ^^^ not found in this scope error[E0425]: cannot find value `debug` in this scope - --> $DIR/bad-expr-path2.rs:16:9 + --> $DIR/bad-expr-path2.rs:6:9 | LL | log(debug, m1::arguments); | ^^^^^ not found in this scope error[E0423]: expected value, found module `m1::arguments` - --> $DIR/bad-expr-path2.rs:16:16 + --> $DIR/bad-expr-path2.rs:6:16 | LL | log(debug, m1::arguments); | ^^^^^^^^^^^^^ not a value error[E0580]: main function has wrong type - --> $DIR/bad-expr-path2.rs:15:1 + --> $DIR/bad-expr-path2.rs:5:1 | LL | fn main(arguments: Vec) { //~ ERROR main function has wrong type | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ incorrect number of function parameters diff --git a/src/test/ui/bad/bad-extern-link-attrs.rs b/src/test/ui/bad/bad-extern-link-attrs.rs index ff63d4b739aef..f042832fba082 100644 --- a/src/test/ui/bad/bad-extern-link-attrs.rs +++ b/src/test/ui/bad/bad-extern-link-attrs.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[link()] //~ ERROR: specified without `name = #[link(name = "")] //~ ERROR: with empty name #[link(name = "foo")] diff --git a/src/test/ui/bad/bad-extern-link-attrs.stderr b/src/test/ui/bad/bad-extern-link-attrs.stderr index 5e58bcd009492..6732e8553f3f1 100644 --- a/src/test/ui/bad/bad-extern-link-attrs.stderr +++ b/src/test/ui/bad/bad-extern-link-attrs.stderr @@ -1,17 +1,17 @@ error[E0459]: #[link(...)] specified without `name = "foo"` - --> $DIR/bad-extern-link-attrs.rs:11:1 + --> $DIR/bad-extern-link-attrs.rs:1:1 | LL | #[link()] //~ ERROR: specified without `name = | ^^^^^^^^^ missing `name` argument error[E0454]: #[link(name = "")] given with empty name - --> $DIR/bad-extern-link-attrs.rs:12:1 + --> $DIR/bad-extern-link-attrs.rs:2:1 | LL | #[link(name = "")] //~ ERROR: with empty name | ^^^^^^^^^^^^^^^^^^ empty name given error[E0458]: unknown kind: `bar` - --> $DIR/bad-extern-link-attrs.rs:14:1 + --> $DIR/bad-extern-link-attrs.rs:4:1 | LL | #[link(name = "foo", kind = "bar")] //~ ERROR: unknown kind | ^^^^^^^^^^^^^^^^^^^^^------------^^ diff --git a/src/test/ui/bad/bad-intrinsic-monomorphization.rs b/src/test/ui/bad/bad-intrinsic-monomorphization.rs index 2fe94d43acdd1..b56e1ea039cf1 100644 --- a/src/test/ui/bad/bad-intrinsic-monomorphization.rs +++ b/src/test/ui/bad/bad-intrinsic-monomorphization.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(repr_simd, platform_intrinsics, core_intrinsics)] #![allow(warnings)] #![crate_type = "rlib"] diff --git a/src/test/ui/bad/bad-intrinsic-monomorphization.stderr b/src/test/ui/bad/bad-intrinsic-monomorphization.stderr index a088dd0aa4395..dee33f574d84a 100644 --- a/src/test/ui/bad/bad-intrinsic-monomorphization.stderr +++ b/src/test/ui/bad/bad-intrinsic-monomorphization.stderr @@ -1,17 +1,17 @@ error[E0511]: invalid monomorphization of `cttz` intrinsic: expected basic integer type, found `Foo` - --> $DIR/bad-intrinsic-monomorphization.rs:28:5 + --> $DIR/bad-intrinsic-monomorphization.rs:18:5 | LL | intrinsics::cttz(v) | ^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `fadd_fast` intrinsic: expected basic float type, found `Foo` - --> $DIR/bad-intrinsic-monomorphization.rs:33:5 + --> $DIR/bad-intrinsic-monomorphization.rs:23:5 | LL | intrinsics::fadd_fast(a, b) | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_add` intrinsic: expected SIMD input type, found non-SIMD `Foo` - --> $DIR/bad-intrinsic-monomorphization.rs:38:5 + --> $DIR/bad-intrinsic-monomorphization.rs:28:5 | LL | simd_add(a, b) | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/bad/bad-lint-cap.rs b/src/test/ui/bad/bad-lint-cap.rs index cb9c347af603c..e65c8319d1ad3 100644 --- a/src/test/ui/bad/bad-lint-cap.rs +++ b/src/test/ui/bad/bad-lint-cap.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --cap-lints test // error-pattern: unknown lint level: `test` diff --git a/src/test/ui/bad/bad-lint-cap2.rs b/src/test/ui/bad/bad-lint-cap2.rs index cb9fb973a0193..8bc8aca20490b 100644 --- a/src/test/ui/bad/bad-lint-cap2.rs +++ b/src/test/ui/bad/bad-lint-cap2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --cap-lints deny #![warn(unused)] diff --git a/src/test/ui/bad/bad-lint-cap2.stderr b/src/test/ui/bad/bad-lint-cap2.stderr index 7471aa21e58cc..d7ec41489d156 100644 --- a/src/test/ui/bad/bad-lint-cap2.stderr +++ b/src/test/ui/bad/bad-lint-cap2.stderr @@ -1,11 +1,11 @@ error: unused import: `std::option` - --> $DIR/bad-lint-cap2.rs:16:5 + --> $DIR/bad-lint-cap2.rs:6:5 | LL | use std::option; //~ ERROR | ^^^^^^^^^^^ | note: lint level defined here - --> $DIR/bad-lint-cap2.rs:14:9 + --> $DIR/bad-lint-cap2.rs:4:9 | LL | #![deny(warnings)] | ^^^^^^^^ diff --git a/src/test/ui/bad/bad-lint-cap3.rs b/src/test/ui/bad/bad-lint-cap3.rs index c9394954c5fbd..e4e91f95825f1 100644 --- a/src/test/ui/bad/bad-lint-cap3.rs +++ b/src/test/ui/bad/bad-lint-cap3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --cap-lints warn #![warn(unused)] diff --git a/src/test/ui/bad/bad-lint-cap3.stderr b/src/test/ui/bad/bad-lint-cap3.stderr index d32246073146f..f2bc4f3e34000 100644 --- a/src/test/ui/bad/bad-lint-cap3.stderr +++ b/src/test/ui/bad/bad-lint-cap3.stderr @@ -1,18 +1,18 @@ warning: unused import: `std::option` - --> $DIR/bad-lint-cap3.rs:17:5 + --> $DIR/bad-lint-cap3.rs:7:5 | LL | use std::option; //~ WARN | ^^^^^^^^^^^ | note: lint level defined here - --> $DIR/bad-lint-cap3.rs:14:9 + --> $DIR/bad-lint-cap3.rs:4:9 | LL | #![deny(warnings)] | ^^^^^^^^ = note: #[warn(unused_imports)] implied by #[warn(warnings)] error: compilation successful - --> $DIR/bad-lint-cap3.rs:20:1 + --> $DIR/bad-lint-cap3.rs:10:1 | LL | fn main() {} //~ ERROR: compilation successful | ^^^^^^^^^^^^ diff --git a/src/test/ui/bad/bad-main.rs b/src/test/ui/bad/bad-main.rs index b73b4a6af6e89..c9e2f02f071b2 100644 --- a/src/test/ui/bad/bad-main.rs +++ b/src/test/ui/bad/bad-main.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main(x: isize) { } //~ ERROR: main function has wrong type [E0580] diff --git a/src/test/ui/bad/bad-main.stderr b/src/test/ui/bad/bad-main.stderr index 3388e0866e56a..1a9c11f7b42af 100644 --- a/src/test/ui/bad/bad-main.stderr +++ b/src/test/ui/bad/bad-main.stderr @@ -1,5 +1,5 @@ error[E0580]: main function has wrong type - --> $DIR/bad-main.rs:11:1 + --> $DIR/bad-main.rs:1:1 | LL | fn main(x: isize) { } //~ ERROR: main function has wrong type [E0580] | ^^^^^^^^^^^^^^^^^ incorrect number of function parameters diff --git a/src/test/ui/bad/bad-method-typaram-kind.rs b/src/test/ui/bad/bad-method-typaram-kind.rs index 7cef3f13dfc2c..7ab926fc90f5d 100644 --- a/src/test/ui/bad/bad-method-typaram-kind.rs +++ b/src/test/ui/bad/bad-method-typaram-kind.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo() { 1.bar::(); //~ ERROR `T` cannot be sent between threads safely } diff --git a/src/test/ui/bad/bad-method-typaram-kind.stderr b/src/test/ui/bad/bad-method-typaram-kind.stderr index ed0c49a4f6651..8232bdd23a643 100644 --- a/src/test/ui/bad/bad-method-typaram-kind.stderr +++ b/src/test/ui/bad/bad-method-typaram-kind.stderr @@ -1,5 +1,5 @@ error[E0277]: `T` cannot be sent between threads safely - --> $DIR/bad-method-typaram-kind.rs:12:7 + --> $DIR/bad-method-typaram-kind.rs:2:7 | LL | 1.bar::(); //~ ERROR `T` cannot be sent between threads safely | ^^^ `T` cannot be sent between threads safely diff --git a/src/test/ui/bad/bad-mid-path-type-params.rs b/src/test/ui/bad/bad-mid-path-type-params.rs index 1ee70d9bddea0..016b1d617e0f6 100644 --- a/src/test/ui/bad/bad-mid-path-type-params.rs +++ b/src/test/ui/bad/bad-mid-path-type-params.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S { contents: T, } diff --git a/src/test/ui/bad/bad-mid-path-type-params.stderr b/src/test/ui/bad/bad-mid-path-type-params.stderr index 7901f1f0fba20..ab01a9ad9c57f 100644 --- a/src/test/ui/bad/bad-mid-path-type-params.stderr +++ b/src/test/ui/bad/bad-mid-path-type-params.stderr @@ -1,23 +1,23 @@ error[E0087]: wrong number of type arguments: expected 1, found 2 - --> $DIR/bad-mid-path-type-params.rs:40:28 + --> $DIR/bad-mid-path-type-params.rs:30:28 | LL | let _ = S::new::(1, 1.0); | ^^^ unexpected type argument error[E0107]: wrong number of lifetime arguments: expected 0, found 1 - --> $DIR/bad-mid-path-type-params.rs:43:17 + --> $DIR/bad-mid-path-type-params.rs:33:17 | LL | let _ = S::<'a,isize>::new::(1, 1.0); | ^^ unexpected lifetime argument error[E0087]: wrong number of type arguments: expected 1, found 2 - --> $DIR/bad-mid-path-type-params.rs:46:36 + --> $DIR/bad-mid-path-type-params.rs:36:36 | LL | let _: S2 = Trait::new::(1, 1.0); | ^^^ unexpected type argument error[E0088]: wrong number of lifetime arguments: expected 0, found 1 - --> $DIR/bad-mid-path-type-params.rs:49:25 + --> $DIR/bad-mid-path-type-params.rs:39:25 | LL | let _: S2 = Trait::<'a,isize>::new::(1, 1.0); | ^^ unexpected lifetime argument diff --git a/src/test/ui/bad/bad-module.rs b/src/test/ui/bad/bad-module.rs index 6987d06ef12c3..477a0435d51f0 100644 --- a/src/test/ui/bad/bad-module.rs +++ b/src/test/ui/bad/bad-module.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let foo = thing::len(Vec::new()); //~^ ERROR failed to resolve. Use of undeclared type or module `thing` diff --git a/src/test/ui/bad/bad-module.stderr b/src/test/ui/bad/bad-module.stderr index 8c19922dcabe9..944d91539e762 100644 --- a/src/test/ui/bad/bad-module.stderr +++ b/src/test/ui/bad/bad-module.stderr @@ -1,11 +1,11 @@ error[E0433]: failed to resolve. Use of undeclared type or module `thing` - --> $DIR/bad-module.rs:12:15 + --> $DIR/bad-module.rs:2:15 | LL | let foo = thing::len(Vec::new()); | ^^^^^ Use of undeclared type or module `thing` error[E0433]: failed to resolve. Use of undeclared type or module `foo` - --> $DIR/bad-module.rs:15:15 + --> $DIR/bad-module.rs:5:15 | LL | let foo = foo::bar::baz(); | ^^^ Use of undeclared type or module `foo` diff --git a/src/test/ui/bad/bad-sized.rs b/src/test/ui/bad/bad-sized.rs index a58aebee77be7..0da4e456f088d 100644 --- a/src/test/ui/bad/bad-sized.rs +++ b/src/test/ui/bad/bad-sized.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Trait {} pub fn main() { diff --git a/src/test/ui/bad/bad-sized.stderr b/src/test/ui/bad/bad-sized.stderr index 5f8013826d9ce..57a204659f145 100644 --- a/src/test/ui/bad/bad-sized.stderr +++ b/src/test/ui/bad/bad-sized.stderr @@ -1,11 +1,11 @@ error[E0225]: only auto traits can be used as additional traits in a trait object - --> $DIR/bad-sized.rs:14:24 + --> $DIR/bad-sized.rs:4:24 | LL | let x: Vec = Vec::new(); | ^^^^^ non-auto additional trait error[E0277]: the size for values of type `dyn Trait` cannot be known at compilation time - --> $DIR/bad-sized.rs:14:12 + --> $DIR/bad-sized.rs:4:12 | LL | let x: Vec = Vec::new(); | ^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time @@ -15,7 +15,7 @@ LL | let x: Vec = Vec::new(); = note: required by `std::vec::Vec` error[E0277]: the size for values of type `dyn Trait` cannot be known at compilation time - --> $DIR/bad-sized.rs:14:33 + --> $DIR/bad-sized.rs:4:33 | LL | let x: Vec = Vec::new(); | ^^^^^^^^ doesn't have a size known at compile-time diff --git a/src/test/ui/bad/bad-type-env-capture.rs b/src/test/ui/bad/bad-type-env-capture.rs index c1547dd82b3b2..d2e6dff125273 100644 --- a/src/test/ui/bad/bad-type-env-capture.rs +++ b/src/test/ui/bad/bad-type-env-capture.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo() { fn bar(b: T) { } //~ ERROR can't use type parameters from outer } diff --git a/src/test/ui/bad/bad-type-env-capture.stderr b/src/test/ui/bad/bad-type-env-capture.stderr index 3cb087ab09afb..5558a44006180 100644 --- a/src/test/ui/bad/bad-type-env-capture.stderr +++ b/src/test/ui/bad/bad-type-env-capture.stderr @@ -1,5 +1,5 @@ error[E0401]: can't use type parameters from outer function - --> $DIR/bad-type-env-capture.rs:12:15 + --> $DIR/bad-type-env-capture.rs:2:15 | LL | fn foo() { | - type variable from outer function diff --git a/src/test/ui/bastion-of-the-turbofish.rs b/src/test/ui/bastion-of-the-turbofish.rs index bd789737552c1..180facf54a803 100644 --- a/src/test/ui/bastion-of-the-turbofish.rs +++ b/src/test/ui/bastion-of-the-turbofish.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass // Bastion of the Turbofish diff --git a/src/test/ui/binary-op-on-double-ref.rs b/src/test/ui/binary-op-on-double-ref.rs index 8b31be911b89a..6490cc7fe5689 100644 --- a/src/test/ui/binary-op-on-double-ref.rs +++ b/src/test/ui/binary-op-on-double-ref.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let v = vec![1, 2, 3, 4, 5, 6, 7, 8, 9]; let vr = v.iter().filter(|x| { diff --git a/src/test/ui/binary-op-on-double-ref.stderr b/src/test/ui/binary-op-on-double-ref.stderr index c89defa3dd196..f298902e3ff12 100644 --- a/src/test/ui/binary-op-on-double-ref.stderr +++ b/src/test/ui/binary-op-on-double-ref.stderr @@ -1,5 +1,5 @@ error[E0369]: binary operation `%` cannot be applied to type `&&{integer}` - --> $DIR/binary-op-on-double-ref.rs:14:9 + --> $DIR/binary-op-on-double-ref.rs:4:9 | LL | x % 2 == 0 | ^^^^^ diff --git a/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-2.rs b/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-2.rs index 2a5c7136dc377..238f2d958c625 100644 --- a/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-2.rs +++ b/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct X { x: (), } impl Drop for X { diff --git a/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-2.stderr b/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-2.stderr index 2f05755eabda9..427b1a722d994 100644 --- a/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-2.stderr +++ b/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-2.stderr @@ -1,5 +1,5 @@ error[E0009]: cannot bind by-move and by-ref in the same pattern - --> $DIR/bind-by-move-neither-can-live-while-the-other-survives-2.rs:22:23 + --> $DIR/bind-by-move-neither-can-live-while-the-other-survives-2.rs:12:23 | LL | Some((ref _y, _z)) => { }, //~ ERROR cannot bind by-move and by-ref in the same pattern | ------ ^^ by-move pattern here diff --git a/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-3.rs b/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-3.rs index 3d3ccb606bfbb..db5c4ea948bd2 100644 --- a/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-3.rs +++ b/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-3.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct X { x: (), } impl Drop for X { diff --git a/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-3.stderr b/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-3.stderr index a573b9a04ba26..fba69838427cf 100644 --- a/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-3.stderr +++ b/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-3.stderr @@ -1,5 +1,5 @@ error[E0009]: cannot bind by-move and by-ref in the same pattern - --> $DIR/bind-by-move-neither-can-live-while-the-other-survives-3.rs:24:38 + --> $DIR/bind-by-move-neither-can-live-while-the-other-survives-3.rs:14:38 | LL | double_option::some2(ref _y, _z) => { }, | ------ ^^ by-move pattern here diff --git a/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-4.rs b/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-4.rs index 8c7542fbe6b3d..41dafd2b5bf72 100644 --- a/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-4.rs +++ b/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-4.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct X { x: (), } impl Drop for X { diff --git a/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-4.stderr b/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-4.stderr index e38916b8b273d..9ebbedcfe6009 100644 --- a/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-4.stderr +++ b/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-4.stderr @@ -1,5 +1,5 @@ error[E0009]: cannot bind by-move and by-ref in the same pattern - --> $DIR/bind-by-move-neither-can-live-while-the-other-survives-4.rs:22:15 + --> $DIR/bind-by-move-neither-can-live-while-the-other-survives-4.rs:12:15 | LL | Some((_y, ref _z)) => { }, //~ ERROR cannot bind by-move and by-ref in the same pattern | ^^ ------ both by-ref and by-move used diff --git a/src/test/ui/bind-by-move/bind-by-move-no-guards.rs b/src/test/ui/bind-by-move/bind-by-move-no-guards.rs index bb6060f2543e2..bc9b3a8de4ef5 100644 --- a/src/test/ui/bind-by-move/bind-by-move-no-guards.rs +++ b/src/test/ui/bind-by-move/bind-by-move-no-guards.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::sync::mpsc::channel; fn main() { diff --git a/src/test/ui/bind-by-move/bind-by-move-no-guards.stderr b/src/test/ui/bind-by-move/bind-by-move-no-guards.stderr index ed516cd559ebb..2af2b0d660efa 100644 --- a/src/test/ui/bind-by-move/bind-by-move-no-guards.stderr +++ b/src/test/ui/bind-by-move/bind-by-move-no-guards.stderr @@ -1,5 +1,5 @@ error[E0008]: cannot bind by-move into a pattern guard - --> $DIR/bind-by-move-no-guards.rs:18:14 + --> $DIR/bind-by-move-no-guards.rs:8:14 | LL | Some(z) if z.recv().unwrap() => { panic!() }, | ^ moves value into pattern guard diff --git a/src/test/ui/binop/binop-bitxor-str.rs b/src/test/ui/binop/binop-bitxor-str.rs index 3f26e3ce904cf..6021c344dfb65 100644 --- a/src/test/ui/binop/binop-bitxor-str.rs +++ b/src/test/ui/binop/binop-bitxor-str.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:`^` cannot be applied to type `std::string::String` fn main() { let x = "a".to_string() ^ "b".to_string(); } diff --git a/src/test/ui/binop/binop-bitxor-str.stderr b/src/test/ui/binop/binop-bitxor-str.stderr index a6804a6d42cd9..4404fde9200c8 100644 --- a/src/test/ui/binop/binop-bitxor-str.stderr +++ b/src/test/ui/binop/binop-bitxor-str.stderr @@ -1,5 +1,5 @@ error[E0369]: binary operation `^` cannot be applied to type `std::string::String` - --> $DIR/binop-bitxor-str.rs:13:21 + --> $DIR/binop-bitxor-str.rs:3:21 | LL | fn main() { let x = "a".to_string() ^ "b".to_string(); } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/binop/binop-consume-args.rs b/src/test/ui/binop/binop-consume-args.rs index c525a67c7e9f8..8d6c725d75603 100644 --- a/src/test/ui/binop/binop-consume-args.rs +++ b/src/test/ui/binop/binop-consume-args.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that binary operators consume their arguments use std::ops::{Add, Sub, Mul, Div, Rem, BitAnd, BitXor, BitOr, Shl, Shr}; diff --git a/src/test/ui/binop/binop-consume-args.stderr b/src/test/ui/binop/binop-consume-args.stderr index 07627d3711b2b..0b5d2200b9ffc 100644 --- a/src/test/ui/binop/binop-consume-args.stderr +++ b/src/test/ui/binop/binop-consume-args.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `lhs` - --> $DIR/binop-consume-args.rs:17:10 + --> $DIR/binop-consume-args.rs:7:10 | LL | lhs + rhs; | --- value moved here @@ -9,7 +9,7 @@ LL | drop(lhs); //~ ERROR use of moved value: `lhs` = note: move occurs because `lhs` has type `A`, which does not implement the `Copy` trait error[E0382]: use of moved value: `rhs` - --> $DIR/binop-consume-args.rs:18:10 + --> $DIR/binop-consume-args.rs:8:10 | LL | lhs + rhs; | --- value moved here @@ -20,7 +20,7 @@ LL | drop(rhs); //~ ERROR use of moved value: `rhs` = note: move occurs because `rhs` has type `B`, which does not implement the `Copy` trait error[E0382]: use of moved value: `lhs` - --> $DIR/binop-consume-args.rs:23:10 + --> $DIR/binop-consume-args.rs:13:10 | LL | lhs - rhs; | --- value moved here @@ -30,7 +30,7 @@ LL | drop(lhs); //~ ERROR use of moved value: `lhs` = note: move occurs because `lhs` has type `A`, which does not implement the `Copy` trait error[E0382]: use of moved value: `rhs` - --> $DIR/binop-consume-args.rs:24:10 + --> $DIR/binop-consume-args.rs:14:10 | LL | lhs - rhs; | --- value moved here @@ -41,7 +41,7 @@ LL | drop(rhs); //~ ERROR use of moved value: `rhs` = note: move occurs because `rhs` has type `B`, which does not implement the `Copy` trait error[E0382]: use of moved value: `lhs` - --> $DIR/binop-consume-args.rs:29:10 + --> $DIR/binop-consume-args.rs:19:10 | LL | lhs * rhs; | --- value moved here @@ -51,7 +51,7 @@ LL | drop(lhs); //~ ERROR use of moved value: `lhs` = note: move occurs because `lhs` has type `A`, which does not implement the `Copy` trait error[E0382]: use of moved value: `rhs` - --> $DIR/binop-consume-args.rs:30:10 + --> $DIR/binop-consume-args.rs:20:10 | LL | lhs * rhs; | --- value moved here @@ -62,7 +62,7 @@ LL | drop(rhs); //~ ERROR use of moved value: `rhs` = note: move occurs because `rhs` has type `B`, which does not implement the `Copy` trait error[E0382]: use of moved value: `lhs` - --> $DIR/binop-consume-args.rs:35:10 + --> $DIR/binop-consume-args.rs:25:10 | LL | lhs / rhs; | --- value moved here @@ -72,7 +72,7 @@ LL | drop(lhs); //~ ERROR use of moved value: `lhs` = note: move occurs because `lhs` has type `A`, which does not implement the `Copy` trait error[E0382]: use of moved value: `rhs` - --> $DIR/binop-consume-args.rs:36:10 + --> $DIR/binop-consume-args.rs:26:10 | LL | lhs / rhs; | --- value moved here @@ -83,7 +83,7 @@ LL | drop(rhs); //~ ERROR use of moved value: `rhs` = note: move occurs because `rhs` has type `B`, which does not implement the `Copy` trait error[E0382]: use of moved value: `lhs` - --> $DIR/binop-consume-args.rs:41:10 + --> $DIR/binop-consume-args.rs:31:10 | LL | lhs % rhs; | --- value moved here @@ -93,7 +93,7 @@ LL | drop(lhs); //~ ERROR use of moved value: `lhs` = note: move occurs because `lhs` has type `A`, which does not implement the `Copy` trait error[E0382]: use of moved value: `rhs` - --> $DIR/binop-consume-args.rs:42:10 + --> $DIR/binop-consume-args.rs:32:10 | LL | lhs % rhs; | --- value moved here @@ -104,7 +104,7 @@ LL | drop(rhs); //~ ERROR use of moved value: `rhs` = note: move occurs because `rhs` has type `B`, which does not implement the `Copy` trait error[E0382]: use of moved value: `lhs` - --> $DIR/binop-consume-args.rs:47:10 + --> $DIR/binop-consume-args.rs:37:10 | LL | lhs & rhs; | --- value moved here @@ -114,7 +114,7 @@ LL | drop(lhs); //~ ERROR use of moved value: `lhs` = note: move occurs because `lhs` has type `A`, which does not implement the `Copy` trait error[E0382]: use of moved value: `rhs` - --> $DIR/binop-consume-args.rs:48:10 + --> $DIR/binop-consume-args.rs:38:10 | LL | lhs & rhs; | --- value moved here @@ -125,7 +125,7 @@ LL | drop(rhs); //~ ERROR use of moved value: `rhs` = note: move occurs because `rhs` has type `B`, which does not implement the `Copy` trait error[E0382]: use of moved value: `lhs` - --> $DIR/binop-consume-args.rs:53:10 + --> $DIR/binop-consume-args.rs:43:10 | LL | lhs | rhs; | --- value moved here @@ -135,7 +135,7 @@ LL | drop(lhs); //~ ERROR use of moved value: `lhs` = note: move occurs because `lhs` has type `A`, which does not implement the `Copy` trait error[E0382]: use of moved value: `rhs` - --> $DIR/binop-consume-args.rs:54:10 + --> $DIR/binop-consume-args.rs:44:10 | LL | lhs | rhs; | --- value moved here @@ -146,7 +146,7 @@ LL | drop(rhs); //~ ERROR use of moved value: `rhs` = note: move occurs because `rhs` has type `B`, which does not implement the `Copy` trait error[E0382]: use of moved value: `lhs` - --> $DIR/binop-consume-args.rs:59:10 + --> $DIR/binop-consume-args.rs:49:10 | LL | lhs ^ rhs; | --- value moved here @@ -156,7 +156,7 @@ LL | drop(lhs); //~ ERROR use of moved value: `lhs` = note: move occurs because `lhs` has type `A`, which does not implement the `Copy` trait error[E0382]: use of moved value: `rhs` - --> $DIR/binop-consume-args.rs:60:10 + --> $DIR/binop-consume-args.rs:50:10 | LL | lhs ^ rhs; | --- value moved here @@ -167,7 +167,7 @@ LL | drop(rhs); //~ ERROR use of moved value: `rhs` = note: move occurs because `rhs` has type `B`, which does not implement the `Copy` trait error[E0382]: use of moved value: `lhs` - --> $DIR/binop-consume-args.rs:65:10 + --> $DIR/binop-consume-args.rs:55:10 | LL | lhs << rhs; | --- value moved here @@ -177,7 +177,7 @@ LL | drop(lhs); //~ ERROR use of moved value: `lhs` = note: move occurs because `lhs` has type `A`, which does not implement the `Copy` trait error[E0382]: use of moved value: `rhs` - --> $DIR/binop-consume-args.rs:66:10 + --> $DIR/binop-consume-args.rs:56:10 | LL | lhs << rhs; | --- value moved here @@ -188,7 +188,7 @@ LL | drop(rhs); //~ ERROR use of moved value: `rhs` = note: move occurs because `rhs` has type `B`, which does not implement the `Copy` trait error[E0382]: use of moved value: `lhs` - --> $DIR/binop-consume-args.rs:71:10 + --> $DIR/binop-consume-args.rs:61:10 | LL | lhs >> rhs; | --- value moved here @@ -198,7 +198,7 @@ LL | drop(lhs); //~ ERROR use of moved value: `lhs` = note: move occurs because `lhs` has type `A`, which does not implement the `Copy` trait error[E0382]: use of moved value: `rhs` - --> $DIR/binop-consume-args.rs:72:10 + --> $DIR/binop-consume-args.rs:62:10 | LL | lhs >> rhs; | --- value moved here diff --git a/src/test/ui/binop/binop-logic-float.rs b/src/test/ui/binop/binop-logic-float.rs index f3fb5a08c8541..c95c1d30d1ce3 100644 --- a/src/test/ui/binop/binop-logic-float.rs +++ b/src/test/ui/binop/binop-logic-float.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = 1.0_f32 || 2.0_f32; } //~^ ERROR mismatched types //~| ERROR mismatched types diff --git a/src/test/ui/binop/binop-logic-float.stderr b/src/test/ui/binop/binop-logic-float.stderr index 947ee4e2427b0..5a94307ff85ee 100644 --- a/src/test/ui/binop/binop-logic-float.stderr +++ b/src/test/ui/binop/binop-logic-float.stderr @@ -1,11 +1,11 @@ error[E0308]: mismatched types - --> $DIR/binop-logic-float.rs:11:21 + --> $DIR/binop-logic-float.rs:1:21 | LL | fn main() { let x = 1.0_f32 || 2.0_f32; } | ^^^^^^^ expected bool, found f32 error[E0308]: mismatched types - --> $DIR/binop-logic-float.rs:11:32 + --> $DIR/binop-logic-float.rs:1:32 | LL | fn main() { let x = 1.0_f32 || 2.0_f32; } | ^^^^^^^ expected bool, found f32 diff --git a/src/test/ui/binop/binop-logic-int.rs b/src/test/ui/binop/binop-logic-int.rs index f5e53f84c16e6..e71daa2dd62d4 100644 --- a/src/test/ui/binop/binop-logic-int.rs +++ b/src/test/ui/binop/binop-logic-int.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = 1 && 2; } //~^ ERROR mismatched types //~| ERROR mismatched types diff --git a/src/test/ui/binop/binop-logic-int.stderr b/src/test/ui/binop/binop-logic-int.stderr index 56f7601ace2b6..9ca9e64211c82 100644 --- a/src/test/ui/binop/binop-logic-int.stderr +++ b/src/test/ui/binop/binop-logic-int.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/binop-logic-int.rs:11:21 + --> $DIR/binop-logic-int.rs:1:21 | LL | fn main() { let x = 1 && 2; } | ^ expected bool, found integral variable @@ -8,7 +8,7 @@ LL | fn main() { let x = 1 && 2; } found type `{integer}` error[E0308]: mismatched types - --> $DIR/binop-logic-int.rs:11:26 + --> $DIR/binop-logic-int.rs:1:26 | LL | fn main() { let x = 1 && 2; } | ^ expected bool, found integral variable diff --git a/src/test/ui/binop/binop-move-semantics.nll.stderr b/src/test/ui/binop/binop-move-semantics.nll.stderr index 98762a0f6cfff..f12f61485db36 100644 --- a/src/test/ui/binop/binop-move-semantics.nll.stderr +++ b/src/test/ui/binop/binop-move-semantics.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `x` - --> $DIR/binop-move-semantics.rs:18:5 + --> $DIR/binop-move-semantics.rs:8:5 | LL | x | - value moved here @@ -10,7 +10,7 @@ LL | x; //~ ERROR: use of moved value = note: move occurs because `x` has type `T`, which does not implement the `Copy` trait error[E0382]: borrow of moved value: `x` - --> $DIR/binop-move-semantics.rs:24:5 + --> $DIR/binop-move-semantics.rs:14:5 | LL | x | - value moved here @@ -21,19 +21,19 @@ LL | x.clone(); //~ ERROR: use of moved value = note: move occurs because `x` has type `T`, which does not implement the `Copy` trait error[E0507]: cannot move out of borrowed content - --> $DIR/binop-move-semantics.rs:40:5 + --> $DIR/binop-move-semantics.rs:30:5 | LL | *m //~ ERROR: cannot move out of borrowed content | ^^ cannot move out of borrowed content error[E0507]: cannot move out of borrowed content - --> $DIR/binop-move-semantics.rs:42:5 + --> $DIR/binop-move-semantics.rs:32:5 | LL | *n; //~ ERROR: cannot move out of borrowed content | ^^ cannot move out of borrowed content error[E0502]: cannot borrow `f` as immutable because it is also borrowed as mutable - --> $DIR/binop-move-semantics.rs:64:5 + --> $DIR/binop-move-semantics.rs:54:5 | LL | &mut f | ------ @@ -48,7 +48,7 @@ LL | | &f; //~ ERROR: cannot borrow `f` as immutable because it is also bor | immutable borrow occurs here error[E0502]: cannot borrow `f` as mutable because it is also borrowed as immutable - --> $DIR/binop-move-semantics.rs:72:5 + --> $DIR/binop-move-semantics.rs:62:5 | LL | &f | -- diff --git a/src/test/ui/binop/binop-move-semantics.rs b/src/test/ui/binop/binop-move-semantics.rs index cff0064497aff..f2a5427e3a152 100644 --- a/src/test/ui/binop/binop-move-semantics.rs +++ b/src/test/ui/binop/binop-move-semantics.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that move restrictions are enforced on overloaded binary operations use std::ops::Add; diff --git a/src/test/ui/binop/binop-move-semantics.stderr b/src/test/ui/binop/binop-move-semantics.stderr index 81b8a336a2048..b1dc70d379d40 100644 --- a/src/test/ui/binop/binop-move-semantics.stderr +++ b/src/test/ui/binop/binop-move-semantics.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `x` - --> $DIR/binop-move-semantics.rs:18:5 + --> $DIR/binop-move-semantics.rs:8:5 | LL | x | - value moved here @@ -10,7 +10,7 @@ LL | x; //~ ERROR: use of moved value = note: move occurs because `x` has type `T`, which does not implement the `Copy` trait error[E0382]: use of moved value: `x` - --> $DIR/binop-move-semantics.rs:24:5 + --> $DIR/binop-move-semantics.rs:14:5 | LL | x | - value moved here @@ -21,7 +21,7 @@ LL | x.clone(); //~ ERROR: use of moved value = note: move occurs because `x` has type `T`, which does not implement the `Copy` trait error[E0505]: cannot move out of `x` because it is borrowed - --> $DIR/binop-move-semantics.rs:31:5 + --> $DIR/binop-move-semantics.rs:21:5 | LL | let m = &x; | - borrow of `x` occurs here @@ -30,7 +30,7 @@ LL | x //~ ERROR: cannot move out of `x` because it is borrowed | ^ move out of `x` occurs here error[E0505]: cannot move out of `y` because it is borrowed - --> $DIR/binop-move-semantics.rs:33:5 + --> $DIR/binop-move-semantics.rs:23:5 | LL | let n = &mut y; | - borrow of `y` occurs here @@ -39,19 +39,19 @@ LL | y; //~ ERROR: cannot move out of `y` because it is borrowed | ^ move out of `y` occurs here error[E0507]: cannot move out of borrowed content - --> $DIR/binop-move-semantics.rs:40:5 + --> $DIR/binop-move-semantics.rs:30:5 | LL | *m //~ ERROR: cannot move out of borrowed content | ^^ cannot move out of borrowed content error[E0507]: cannot move out of borrowed content - --> $DIR/binop-move-semantics.rs:42:5 + --> $DIR/binop-move-semantics.rs:32:5 | LL | *n; //~ ERROR: cannot move out of borrowed content | ^^ cannot move out of borrowed content error[E0502]: cannot borrow `f` as immutable because it is also borrowed as mutable - --> $DIR/binop-move-semantics.rs:64:6 + --> $DIR/binop-move-semantics.rs:54:6 | LL | &mut f | - mutable borrow occurs here @@ -63,7 +63,7 @@ LL | &f; //~ ERROR: cannot borrow `f` as immutable because it is also borro | mutable borrow ends here error[E0502]: cannot borrow `f` as mutable because it is also borrowed as immutable - --> $DIR/binop-move-semantics.rs:72:10 + --> $DIR/binop-move-semantics.rs:62:10 | LL | &f | - immutable borrow occurs here diff --git a/src/test/ui/binop/binop-mul-bool.rs b/src/test/ui/binop/binop-mul-bool.rs index a36477fc1836c..3d5349ba880fc 100644 --- a/src/test/ui/binop/binop-mul-bool.rs +++ b/src/test/ui/binop/binop-mul-bool.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:`*` cannot be applied to type `bool` fn main() { let x = true * false; } diff --git a/src/test/ui/binop/binop-mul-bool.stderr b/src/test/ui/binop/binop-mul-bool.stderr index 1df50876c26d9..194181b9c11c3 100644 --- a/src/test/ui/binop/binop-mul-bool.stderr +++ b/src/test/ui/binop/binop-mul-bool.stderr @@ -1,5 +1,5 @@ error[E0369]: binary operation `*` cannot be applied to type `bool` - --> $DIR/binop-mul-bool.rs:13:21 + --> $DIR/binop-mul-bool.rs:3:21 | LL | fn main() { let x = true * false; } | ^^^^^^^^^^^^ diff --git a/src/test/ui/binop/binop-typeck.rs b/src/test/ui/binop/binop-typeck.rs index 8f17288e991d4..e1185cfba266c 100644 --- a/src/test/ui/binop/binop-typeck.rs +++ b/src/test/ui/binop/binop-typeck.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // issue #500 fn main() { diff --git a/src/test/ui/binop/binop-typeck.stderr b/src/test/ui/binop/binop-typeck.stderr index 1ff81779f3d64..928e836c0b51e 100644 --- a/src/test/ui/binop/binop-typeck.stderr +++ b/src/test/ui/binop/binop-typeck.stderr @@ -1,5 +1,5 @@ error[E0369]: binary operation `+` cannot be applied to type `bool` - --> $DIR/binop-typeck.rs:16:13 + --> $DIR/binop-typeck.rs:6:13 | LL | let z = x + y; | ^^^^^ diff --git a/src/test/ui/blind/blind-item-block-item-shadow.rs b/src/test/ui/blind/blind-item-block-item-shadow.rs index eeadecf627dae..d90ef77e2990a 100644 --- a/src/test/ui/blind/blind-item-block-item-shadow.rs +++ b/src/test/ui/blind/blind-item-block-item-shadow.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod foo { pub struct Bar; } fn main() { diff --git a/src/test/ui/blind/blind-item-block-item-shadow.stderr b/src/test/ui/blind/blind-item-block-item-shadow.stderr index 5adc953e4058e..27c9b972bd016 100644 --- a/src/test/ui/blind/blind-item-block-item-shadow.stderr +++ b/src/test/ui/blind/blind-item-block-item-shadow.stderr @@ -1,5 +1,5 @@ error[E0255]: the name `Bar` is defined multiple times - --> $DIR/blind-item-block-item-shadow.rs:16:13 + --> $DIR/blind-item-block-item-shadow.rs:6:13 | LL | struct Bar; | ----------- previous definition of the type `Bar` here diff --git a/src/test/ui/blind/blind-item-block-middle.rs b/src/test/ui/blind/blind-item-block-middle.rs index a501a5cd3ec4c..9c9c0046e66ac 100644 --- a/src/test/ui/blind/blind-item-block-middle.rs +++ b/src/test/ui/blind/blind-item-block-middle.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod foo { pub struct bar; } fn main() { diff --git a/src/test/ui/blind/blind-item-block-middle.stderr b/src/test/ui/blind/blind-item-block-middle.stderr index 0123fd01173ac..43e33cd281684 100644 --- a/src/test/ui/blind/blind-item-block-middle.stderr +++ b/src/test/ui/blind/blind-item-block-middle.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/blind-item-block-middle.rs:14:9 + --> $DIR/blind-item-block-middle.rs:4:9 | LL | let bar = 5; | ^^^ expected integral variable, found struct `foo::bar` diff --git a/src/test/ui/blind/blind-item-item-shadow.rs b/src/test/ui/blind/blind-item-item-shadow.rs index 38f9a552e1b04..82d07ea70919b 100644 --- a/src/test/ui/blind/blind-item-item-shadow.rs +++ b/src/test/ui/blind/blind-item-item-shadow.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod foo { pub mod foo { } } use foo::foo; diff --git a/src/test/ui/blind/blind-item-item-shadow.stderr b/src/test/ui/blind/blind-item-item-shadow.stderr index 240ea6061b975..4f94937b74bf1 100644 --- a/src/test/ui/blind/blind-item-item-shadow.stderr +++ b/src/test/ui/blind/blind-item-item-shadow.stderr @@ -1,5 +1,5 @@ error[E0255]: the name `foo` is defined multiple times - --> $DIR/blind-item-item-shadow.rs:13:5 + --> $DIR/blind-item-item-shadow.rs:3:5 | LL | mod foo { pub mod foo { } } | ------- previous definition of the module `foo` here diff --git a/src/test/ui/block-result/block-must-not-have-result-do.rs b/src/test/ui/block-result/block-must-not-have-result-do.rs index 2a6c71dbe3923..4fdb69778cb2f 100644 --- a/src/test/ui/block-result/block-must-not-have-result-do.rs +++ b/src/test/ui/block-result/block-must-not-have-result-do.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { loop { true //~ ERROR mismatched types diff --git a/src/test/ui/block-result/block-must-not-have-result-do.stderr b/src/test/ui/block-result/block-must-not-have-result-do.stderr index d864d767957da..151315d34f27c 100644 --- a/src/test/ui/block-result/block-must-not-have-result-do.stderr +++ b/src/test/ui/block-result/block-must-not-have-result-do.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/block-must-not-have-result-do.rs:13:9 + --> $DIR/block-must-not-have-result-do.rs:3:9 | LL | true //~ ERROR mismatched types | ^^^^ expected (), found bool diff --git a/src/test/ui/block-result/block-must-not-have-result-res.rs b/src/test/ui/block-result/block-must-not-have-result-res.rs index 8728685fc8b02..98689fe124d5c 100644 --- a/src/test/ui/block-result/block-must-not-have-result-res.rs +++ b/src/test/ui/block-result/block-must-not-have-result-res.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct r; impl Drop for r { diff --git a/src/test/ui/block-result/block-must-not-have-result-res.stderr b/src/test/ui/block-result/block-must-not-have-result-res.stderr index 005a3ab9b5df1..29885cac234fb 100644 --- a/src/test/ui/block-result/block-must-not-have-result-res.stderr +++ b/src/test/ui/block-result/block-must-not-have-result-res.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/block-must-not-have-result-res.rs:15:9 + --> $DIR/block-must-not-have-result-res.rs:5:9 | LL | fn drop(&mut self) { | - expected `()` because of default return type diff --git a/src/test/ui/block-result/block-must-not-have-result-while.rs b/src/test/ui/block-result/block-must-not-have-result-while.rs index a0fb470e1e4d0..96597631396df 100644 --- a/src/test/ui/block-result/block-must-not-have-result-while.rs +++ b/src/test/ui/block-result/block-must-not-have-result-while.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { while true { true //~ ERROR mismatched types diff --git a/src/test/ui/block-result/block-must-not-have-result-while.stderr b/src/test/ui/block-result/block-must-not-have-result-while.stderr index a003ae871cadc..d41eae1a43299 100644 --- a/src/test/ui/block-result/block-must-not-have-result-while.stderr +++ b/src/test/ui/block-result/block-must-not-have-result-while.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/block-must-not-have-result-while.rs:13:9 + --> $DIR/block-must-not-have-result-while.rs:3:9 | LL | true //~ ERROR mismatched types | ^^^^ expected (), found bool diff --git a/src/test/ui/block-result/consider-removing-last-semi.rs b/src/test/ui/block-result/consider-removing-last-semi.rs index 0d4deb3c8041b..f8cdccba27e20 100644 --- a/src/test/ui/block-result/consider-removing-last-semi.rs +++ b/src/test/ui/block-result/consider-removing-last-semi.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn f() -> String { //~ ERROR mismatched types 0u8; "bla".to_string(); diff --git a/src/test/ui/block-result/consider-removing-last-semi.stderr b/src/test/ui/block-result/consider-removing-last-semi.stderr index a0855c317379f..870da00680f42 100644 --- a/src/test/ui/block-result/consider-removing-last-semi.stderr +++ b/src/test/ui/block-result/consider-removing-last-semi.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/consider-removing-last-semi.rs:11:18 + --> $DIR/consider-removing-last-semi.rs:1:18 | LL | fn f() -> String { //~ ERROR mismatched types | __________________^ @@ -13,7 +13,7 @@ LL | | } found type `()` error[E0308]: mismatched types - --> $DIR/consider-removing-last-semi.rs:16:18 + --> $DIR/consider-removing-last-semi.rs:6:18 | LL | fn g() -> String { //~ ERROR mismatched types | __________________^ diff --git a/src/test/ui/block-result/issue-11714.rs b/src/test/ui/block-result/issue-11714.rs index bc3936582aae9..3dda7e8019187 100644 --- a/src/test/ui/block-result/issue-11714.rs +++ b/src/test/ui/block-result/issue-11714.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn blah() -> i32 { //~ ERROR mismatched types 1 diff --git a/src/test/ui/block-result/issue-11714.stderr b/src/test/ui/block-result/issue-11714.stderr index e9cd728123475..8bb37395c5cca 100644 --- a/src/test/ui/block-result/issue-11714.stderr +++ b/src/test/ui/block-result/issue-11714.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-11714.rs:11:18 + --> $DIR/issue-11714.rs:1:18 | LL | fn blah() -> i32 { //~ ERROR mismatched types | __________________^ diff --git a/src/test/ui/block-result/issue-13428.rs b/src/test/ui/block-result/issue-13428.rs index 36520301f552d..ac85964353a34 100644 --- a/src/test/ui/block-result/issue-13428.rs +++ b/src/test/ui/block-result/issue-13428.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #13428 fn foo() -> String { //~ ERROR mismatched types diff --git a/src/test/ui/block-result/issue-13428.stderr b/src/test/ui/block-result/issue-13428.stderr index 888ee5a2d19a5..516baa8e5f104 100644 --- a/src/test/ui/block-result/issue-13428.stderr +++ b/src/test/ui/block-result/issue-13428.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-13428.rs:13:20 + --> $DIR/issue-13428.rs:3:20 | LL | fn foo() -> String { //~ ERROR mismatched types | ____________________^ @@ -16,7 +16,7 @@ LL | | } found type `()` error[E0308]: mismatched types - --> $DIR/issue-13428.rs:21:20 + --> $DIR/issue-13428.rs:11:20 | LL | fn bar() -> String { //~ ERROR mismatched types | ____________________^ diff --git a/src/test/ui/block-result/issue-13624.rs b/src/test/ui/block-result/issue-13624.rs index e4ed87c3cb0cd..7b6a0775e1629 100644 --- a/src/test/ui/block-result/issue-13624.rs +++ b/src/test/ui/block-result/issue-13624.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod a { pub enum Enum { EnumStructVariant { x: u8, y: u8, z: u8 } diff --git a/src/test/ui/block-result/issue-13624.stderr b/src/test/ui/block-result/issue-13624.stderr index e54e22522f252..b38633b0ffeea 100644 --- a/src/test/ui/block-result/issue-13624.stderr +++ b/src/test/ui/block-result/issue-13624.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-13624.rs:17:5 + --> $DIR/issue-13624.rs:7:5 | LL | pub fn get_enum_struct_variant() -> () { | -- expected `()` because of return type @@ -10,7 +10,7 @@ LL | Enum::EnumStructVariant { x: 1, y: 2, z: 3 } found type `a::Enum` error[E0308]: mismatched types - --> $DIR/issue-13624.rs:32:9 + --> $DIR/issue-13624.rs:22:9 | LL | a::Enum::EnumStructVariant { x, y, z } => { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected (), found enum `a::Enum` diff --git a/src/test/ui/block-result/issue-20862.rs b/src/test/ui/block-result/issue-20862.rs index 9df6358399869..e435fd7aee9e8 100644 --- a/src/test/ui/block-result/issue-20862.rs +++ b/src/test/ui/block-result/issue-20862.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo(x: i32) { |y| x + y //~^ ERROR: mismatched types diff --git a/src/test/ui/block-result/issue-20862.stderr b/src/test/ui/block-result/issue-20862.stderr index 990fb404c9466..3a794aa74c41a 100644 --- a/src/test/ui/block-result/issue-20862.stderr +++ b/src/test/ui/block-result/issue-20862.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-20862.rs:12:5 + --> $DIR/issue-20862.rs:2:5 | LL | fn foo(x: i32) { | - possibly return type missing here? @@ -7,10 +7,10 @@ LL | |y| x + y | ^^^^^^^^^ expected (), found closure | = note: expected type `()` - found type `[closure@$DIR/issue-20862.rs:12:5: 12:14 x:_]` + found type `[closure@$DIR/issue-20862.rs:2:5: 2:14 x:_]` error[E0618]: expected function, found `()` - --> $DIR/issue-20862.rs:17:13 + --> $DIR/issue-20862.rs:7:13 | LL | let x = foo(5)(2); | ^^^^^^^^^ not a function diff --git a/src/test/ui/block-result/issue-22645.rs b/src/test/ui/block-result/issue-22645.rs index 81f66e3e2cfee..5f7fb8dd32bd2 100644 --- a/src/test/ui/block-result/issue-22645.rs +++ b/src/test/ui/block-result/issue-22645.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::Add; trait Scalar {} diff --git a/src/test/ui/block-result/issue-22645.stderr b/src/test/ui/block-result/issue-22645.stderr index c94dd7086266a..9cb1a6c5d7d52 100644 --- a/src/test/ui/block-result/issue-22645.stderr +++ b/src/test/ui/block-result/issue-22645.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `{integer}: Scalar` is not satisfied - --> $DIR/issue-22645.rs:25:5 + --> $DIR/issue-22645.rs:15:5 | LL | b + 3 //~ ERROR E0277 | ^ the trait `Scalar` is not implemented for `{integer}` @@ -9,7 +9,7 @@ LL | b + 3 //~ ERROR E0277 = note: required because of the requirements on the impl of `std::ops::Add<{integer}>` for `Bob` error[E0308]: mismatched types - --> $DIR/issue-22645.rs:25:3 + --> $DIR/issue-22645.rs:15:3 | LL | fn main() { | - expected `()` because of default return type diff --git a/src/test/ui/block-result/issue-3563.rs b/src/test/ui/block-result/issue-3563.rs index 31a363a6b863d..9b313d3e9b278 100644 --- a/src/test/ui/block-result/issue-3563.rs +++ b/src/test/ui/block-result/issue-3563.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait A { fn a(&self) { || self.b() diff --git a/src/test/ui/block-result/issue-3563.stderr b/src/test/ui/block-result/issue-3563.stderr index c4dee857574b8..7f386630de590 100644 --- a/src/test/ui/block-result/issue-3563.stderr +++ b/src/test/ui/block-result/issue-3563.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `b` found for type `&Self` in the current scope - --> $DIR/issue-3563.rs:13:17 + --> $DIR/issue-3563.rs:3:17 | LL | || self.b() | ^ diff --git a/src/test/ui/block-result/issue-5500.rs b/src/test/ui/block-result/issue-5500.rs index 1cbb7588e17df..5a549bb07ea33 100644 --- a/src/test/ui/block-result/issue-5500.rs +++ b/src/test/ui/block-result/issue-5500.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { &panic!() //~^ ERROR mismatched types diff --git a/src/test/ui/block-result/issue-5500.stderr b/src/test/ui/block-result/issue-5500.stderr index 27018b5da7bd8..0d9c9d8143d31 100644 --- a/src/test/ui/block-result/issue-5500.stderr +++ b/src/test/ui/block-result/issue-5500.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-5500.rs:12:5 + --> $DIR/issue-5500.rs:2:5 | LL | fn main() { | - expected `()` because of default return type diff --git a/src/test/ui/block-result/unexpected-return-on-unit.rs b/src/test/ui/block-result/unexpected-return-on-unit.rs index 3cf76365c77b1..433dee5dd13bd 100644 --- a/src/test/ui/block-result/unexpected-return-on-unit.rs +++ b/src/test/ui/block-result/unexpected-return-on-unit.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we do some basic error correcton in the tokeniser (and don't spew // too many bogus errors). diff --git a/src/test/ui/block-result/unexpected-return-on-unit.stderr b/src/test/ui/block-result/unexpected-return-on-unit.stderr index 585cfb3d0d35f..50af4734202dd 100644 --- a/src/test/ui/block-result/unexpected-return-on-unit.stderr +++ b/src/test/ui/block-result/unexpected-return-on-unit.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/unexpected-return-on-unit.rs:19:5 + --> $DIR/unexpected-return-on-unit.rs:9:5 | LL | foo() //~ ERROR mismatched types | ^^^^^ expected (), found usize diff --git a/src/test/ui/bogus-tag.rs b/src/test/ui/bogus-tag.rs index 46536cc85750c..6e11891a90f5b 100644 --- a/src/test/ui/bogus-tag.rs +++ b/src/test/ui/bogus-tag.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum color { rgb(isize, isize, isize), rgba(isize, isize, isize, isize), } fn main() { diff --git a/src/test/ui/bogus-tag.stderr b/src/test/ui/bogus-tag.stderr index f9917b07f070b..92a3360f8ada7 100644 --- a/src/test/ui/bogus-tag.stderr +++ b/src/test/ui/bogus-tag.stderr @@ -1,5 +1,5 @@ error[E0599]: no variant named `hsl` found for type `color` in the current scope - --> $DIR/bogus-tag.rs:18:7 + --> $DIR/bogus-tag.rs:7:7 | LL | enum color { rgb(isize, isize, isize), rgba(isize, isize, isize, isize), } | ---------- variant `hsl` not found here diff --git a/src/test/ui/borrowck/assign_mutable_fields.nll.stderr b/src/test/ui/borrowck/assign_mutable_fields.nll.stderr index 5147075347283..a21145040ea5a 100644 --- a/src/test/ui/borrowck/assign_mutable_fields.nll.stderr +++ b/src/test/ui/borrowck/assign_mutable_fields.nll.stderr @@ -1,5 +1,5 @@ error[E0381]: use of possibly uninitialized variable: `x` - --> $DIR/assign_mutable_fields.rs:29:10 + --> $DIR/assign_mutable_fields.rs:19:10 | LL | drop(x); //~ ERROR | ^ use of possibly uninitialized `x` diff --git a/src/test/ui/borrowck/assign_mutable_fields.rs b/src/test/ui/borrowck/assign_mutable_fields.rs index 4e41f44ef5bb3..3c9bd87ea31e9 100644 --- a/src/test/ui/borrowck/assign_mutable_fields.rs +++ b/src/test/ui/borrowck/assign_mutable_fields.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Currently, we permit you to assign to individual fields of a mut // var, but we do not permit you to use the complete var afterwards. // We hope to fix this at some point. diff --git a/src/test/ui/borrowck/assign_mutable_fields.stderr b/src/test/ui/borrowck/assign_mutable_fields.stderr index 677887babd038..9024e7cf01cb4 100644 --- a/src/test/ui/borrowck/assign_mutable_fields.stderr +++ b/src/test/ui/borrowck/assign_mutable_fields.stderr @@ -1,17 +1,17 @@ error[E0381]: use of possibly uninitialized variable: `x.0` - --> $DIR/assign_mutable_fields.rs:21:10 + --> $DIR/assign_mutable_fields.rs:11:10 | LL | drop(x.0); //~ ERROR | ^^^ use of possibly uninitialized `x.0` error[E0381]: use of possibly uninitialized variable: `x.1` - --> $DIR/assign_mutable_fields.rs:22:10 + --> $DIR/assign_mutable_fields.rs:12:10 | LL | drop(x.1); //~ ERROR | ^^^ use of possibly uninitialized `x.1` error[E0381]: use of possibly uninitialized variable: `x` - --> $DIR/assign_mutable_fields.rs:29:10 + --> $DIR/assign_mutable_fields.rs:19:10 | LL | drop(x); //~ ERROR | ^ use of possibly uninitialized `x` diff --git a/src/test/ui/borrowck/borrow-immutable-upvar-mutation.nll.stderr b/src/test/ui/borrowck/borrow-immutable-upvar-mutation.nll.stderr index 631add3e62d85..9174a6976113b 100644 --- a/src/test/ui/borrowck/borrow-immutable-upvar-mutation.nll.stderr +++ b/src/test/ui/borrowck/borrow-immutable-upvar-mutation.nll.stderr @@ -1,71 +1,71 @@ error[E0594]: cannot assign to `x`, as it is a captured variable in a `Fn` closure - --> $DIR/borrow-immutable-upvar-mutation.rs:25:27 + --> $DIR/borrow-immutable-upvar-mutation.rs:15:27 | LL | let _f = to_fn(|| x = 42); //~ ERROR cannot assign | ^^^^^^ cannot assign | help: consider changing this to accept closures that implement `FnMut` - --> $DIR/borrow-immutable-upvar-mutation.rs:25:24 + --> $DIR/borrow-immutable-upvar-mutation.rs:15:24 | LL | let _f = to_fn(|| x = 42); //~ ERROR cannot assign | ^^^^^^^^^ error[E0596]: cannot borrow `y` as mutable, as it is a captured variable in a `Fn` closure - --> $DIR/borrow-immutable-upvar-mutation.rs:28:31 + --> $DIR/borrow-immutable-upvar-mutation.rs:18:31 | LL | let _g = to_fn(|| set(&mut y)); //~ ERROR cannot borrow | ^^^^^^ cannot borrow as mutable | help: consider changing this to accept closures that implement `FnMut` - --> $DIR/borrow-immutable-upvar-mutation.rs:28:24 + --> $DIR/borrow-immutable-upvar-mutation.rs:18:24 | LL | let _g = to_fn(|| set(&mut y)); //~ ERROR cannot borrow | ^^^^^^^^^^^^^^ error[E0594]: cannot assign to `z`, as it is a captured variable in a `Fn` closure - --> $DIR/borrow-immutable-upvar-mutation.rs:31:55 + --> $DIR/borrow-immutable-upvar-mutation.rs:21:55 | LL | let _h = to_fn_mut(|| { set(&mut z); to_fn(|| z = 42); }); //~ ERROR cannot assign | ^^^^^^ cannot assign | help: consider changing this to accept closures that implement `FnMut` - --> $DIR/borrow-immutable-upvar-mutation.rs:31:52 + --> $DIR/borrow-immutable-upvar-mutation.rs:21:52 | LL | let _h = to_fn_mut(|| { set(&mut z); to_fn(|| z = 42); }); //~ ERROR cannot assign | ^^^^^^^^^ error[E0594]: cannot assign to `x`, as it is a captured variable in a `Fn` closure - --> $DIR/borrow-immutable-upvar-mutation.rs:37:32 + --> $DIR/borrow-immutable-upvar-mutation.rs:27:32 | LL | let _f = to_fn(move || x = 42); //~ ERROR cannot assign | ^^^^^^ cannot assign | help: consider changing this to accept closures that implement `FnMut` - --> $DIR/borrow-immutable-upvar-mutation.rs:37:24 + --> $DIR/borrow-immutable-upvar-mutation.rs:27:24 | LL | let _f = to_fn(move || x = 42); //~ ERROR cannot assign | ^^^^^^^^^^^^^^ error[E0596]: cannot borrow `y` as mutable, as it is a captured variable in a `Fn` closure - --> $DIR/borrow-immutable-upvar-mutation.rs:40:36 + --> $DIR/borrow-immutable-upvar-mutation.rs:30:36 | LL | let _g = to_fn(move || set(&mut y)); //~ ERROR cannot borrow | ^^^^^^ cannot borrow as mutable | help: consider changing this to accept closures that implement `FnMut` - --> $DIR/borrow-immutable-upvar-mutation.rs:40:24 + --> $DIR/borrow-immutable-upvar-mutation.rs:30:24 | LL | let _g = to_fn(move || set(&mut y)); //~ ERROR cannot borrow | ^^^^^^^^^^^^^^^^^^^ error[E0594]: cannot assign to `z`, as it is a captured variable in a `Fn` closure - --> $DIR/borrow-immutable-upvar-mutation.rs:43:65 + --> $DIR/borrow-immutable-upvar-mutation.rs:33:65 | LL | let _h = to_fn_mut(move || { set(&mut z); to_fn(move || z = 42); }); //~ ERROR cannot assign | ^^^^^^ cannot assign | help: consider changing this to accept closures that implement `FnMut` - --> $DIR/borrow-immutable-upvar-mutation.rs:43:57 + --> $DIR/borrow-immutable-upvar-mutation.rs:33:57 | LL | let _h = to_fn_mut(move || { set(&mut z); to_fn(move || z = 42); }); //~ ERROR cannot assign | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/borrowck/borrow-immutable-upvar-mutation.rs b/src/test/ui/borrowck/borrow-immutable-upvar-mutation.rs index 00f51973a41ad..fed8bc95b6b86 100644 --- a/src/test/ui/borrowck/borrow-immutable-upvar-mutation.rs +++ b/src/test/ui/borrowck/borrow-immutable-upvar-mutation.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unboxed_closures)] // Tests that we can't assign to or mutably borrow upvars from `Fn` diff --git a/src/test/ui/borrowck/borrow-immutable-upvar-mutation.stderr b/src/test/ui/borrowck/borrow-immutable-upvar-mutation.stderr index 740e1820f4f3c..505604ab597d4 100644 --- a/src/test/ui/borrowck/borrow-immutable-upvar-mutation.stderr +++ b/src/test/ui/borrowck/borrow-immutable-upvar-mutation.stderr @@ -1,73 +1,73 @@ error[E0387]: cannot assign to data in a captured outer variable in an `Fn` closure - --> $DIR/borrow-immutable-upvar-mutation.rs:25:27 + --> $DIR/borrow-immutable-upvar-mutation.rs:15:27 | LL | let _f = to_fn(|| x = 42); //~ ERROR cannot assign | ^^^^^^ | help: consider changing this closure to take self by mutable reference - --> $DIR/borrow-immutable-upvar-mutation.rs:25:24 + --> $DIR/borrow-immutable-upvar-mutation.rs:15:24 | LL | let _f = to_fn(|| x = 42); //~ ERROR cannot assign | ^^^^^^^^^ error[E0387]: cannot borrow data mutably in a captured outer variable in an `Fn` closure - --> $DIR/borrow-immutable-upvar-mutation.rs:28:36 + --> $DIR/borrow-immutable-upvar-mutation.rs:18:36 | LL | let _g = to_fn(|| set(&mut y)); //~ ERROR cannot borrow | ^ | help: consider changing this closure to take self by mutable reference - --> $DIR/borrow-immutable-upvar-mutation.rs:28:24 + --> $DIR/borrow-immutable-upvar-mutation.rs:18:24 | LL | let _g = to_fn(|| set(&mut y)); //~ ERROR cannot borrow | ^^^^^^^^^^^^^^ error[E0387]: cannot assign to data in a captured outer variable in an `Fn` closure - --> $DIR/borrow-immutable-upvar-mutation.rs:31:55 + --> $DIR/borrow-immutable-upvar-mutation.rs:21:55 | LL | let _h = to_fn_mut(|| { set(&mut z); to_fn(|| z = 42); }); //~ ERROR cannot assign | ^^^^^^ | help: consider changing this closure to take self by mutable reference - --> $DIR/borrow-immutable-upvar-mutation.rs:31:52 + --> $DIR/borrow-immutable-upvar-mutation.rs:21:52 | LL | let _h = to_fn_mut(|| { set(&mut z); to_fn(|| z = 42); }); //~ ERROR cannot assign | ^^^^^^^^^ error[E0594]: cannot assign to captured outer variable in an `Fn` closure - --> $DIR/borrow-immutable-upvar-mutation.rs:37:32 + --> $DIR/borrow-immutable-upvar-mutation.rs:27:32 | LL | let _f = to_fn(move || x = 42); //~ ERROR cannot assign | ^^^^^^ | = note: `Fn` closures cannot capture their enclosing environment for modifications help: consider changing this closure to take self by mutable reference - --> $DIR/borrow-immutable-upvar-mutation.rs:37:24 + --> $DIR/borrow-immutable-upvar-mutation.rs:27:24 | LL | let _f = to_fn(move || x = 42); //~ ERROR cannot assign | ^^^^^^^^^^^^^^ error[E0596]: cannot borrow captured outer variable in an `Fn` closure as mutable - --> $DIR/borrow-immutable-upvar-mutation.rs:40:41 + --> $DIR/borrow-immutable-upvar-mutation.rs:30:41 | LL | let _g = to_fn(move || set(&mut y)); //~ ERROR cannot borrow | ^ | help: consider changing this closure to take self by mutable reference - --> $DIR/borrow-immutable-upvar-mutation.rs:40:24 + --> $DIR/borrow-immutable-upvar-mutation.rs:30:24 | LL | let _g = to_fn(move || set(&mut y)); //~ ERROR cannot borrow | ^^^^^^^^^^^^^^^^^^^ error[E0594]: cannot assign to captured outer variable in an `Fn` closure - --> $DIR/borrow-immutable-upvar-mutation.rs:43:65 + --> $DIR/borrow-immutable-upvar-mutation.rs:33:65 | LL | let _h = to_fn_mut(move || { set(&mut z); to_fn(move || z = 42); }); //~ ERROR cannot assign | ^^^^^^ | = note: `Fn` closures cannot capture their enclosing environment for modifications help: consider changing this closure to take self by mutable reference - --> $DIR/borrow-immutable-upvar-mutation.rs:43:57 + --> $DIR/borrow-immutable-upvar-mutation.rs:33:57 | LL | let _h = to_fn_mut(move || { set(&mut z); to_fn(move || z = 42); }); //~ ERROR cannot assign | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/borrowck/borrow-tuple-fields.nll.stderr b/src/test/ui/borrowck/borrow-tuple-fields.nll.stderr index 855488e1eef1b..1879d7825d38c 100644 --- a/src/test/ui/borrowck/borrow-tuple-fields.nll.stderr +++ b/src/test/ui/borrowck/borrow-tuple-fields.nll.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `x` because it is borrowed - --> $DIR/borrow-tuple-fields.rs:22:13 + --> $DIR/borrow-tuple-fields.rs:12:13 | LL | let r = &x.0; | ---- borrow of `x.0` occurs here @@ -10,7 +10,7 @@ LL | r.use_ref(); | - borrow later used here error[E0502]: cannot borrow `x.0` as mutable because it is also borrowed as immutable - --> $DIR/borrow-tuple-fields.rs:28:13 + --> $DIR/borrow-tuple-fields.rs:18:13 | LL | let a = &x.0; | ---- immutable borrow occurs here @@ -20,7 +20,7 @@ LL | a.use_ref(); | - borrow later used here error[E0499]: cannot borrow `x.0` as mutable more than once at a time - --> $DIR/borrow-tuple-fields.rs:33:13 + --> $DIR/borrow-tuple-fields.rs:23:13 | LL | let a = &mut x.0; | -------- first mutable borrow occurs here @@ -30,7 +30,7 @@ LL | a.use_ref(); | - borrow later used here error[E0505]: cannot move out of `x` because it is borrowed - --> $DIR/borrow-tuple-fields.rs:38:13 + --> $DIR/borrow-tuple-fields.rs:28:13 | LL | let r = &x.0; | ---- borrow of `x.0` occurs here @@ -40,7 +40,7 @@ LL | r.use_ref(); | - borrow later used here error[E0502]: cannot borrow `x.0` as mutable because it is also borrowed as immutable - --> $DIR/borrow-tuple-fields.rs:43:13 + --> $DIR/borrow-tuple-fields.rs:33:13 | LL | let a = &x.0; | ---- immutable borrow occurs here @@ -50,7 +50,7 @@ LL | a.use_ref(); | - borrow later used here error[E0499]: cannot borrow `x.0` as mutable more than once at a time - --> $DIR/borrow-tuple-fields.rs:48:13 + --> $DIR/borrow-tuple-fields.rs:38:13 | LL | let a = &mut x.0; | -------- first mutable borrow occurs here diff --git a/src/test/ui/borrowck/borrow-tuple-fields.rs b/src/test/ui/borrowck/borrow-tuple-fields.rs index de3a5c799cbbf..3e24a1b29c920 100644 --- a/src/test/ui/borrowck/borrow-tuple-fields.rs +++ b/src/test/ui/borrowck/borrow-tuple-fields.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] diff --git a/src/test/ui/borrowck/borrow-tuple-fields.stderr b/src/test/ui/borrowck/borrow-tuple-fields.stderr index 1cbfcdfc06a3a..a62e7287e683f 100644 --- a/src/test/ui/borrowck/borrow-tuple-fields.stderr +++ b/src/test/ui/borrowck/borrow-tuple-fields.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `x` because it is borrowed - --> $DIR/borrow-tuple-fields.rs:22:9 + --> $DIR/borrow-tuple-fields.rs:12:9 | LL | let r = &x.0; | --- borrow of `x.0` occurs here @@ -7,7 +7,7 @@ LL | let y = x; //~ ERROR cannot move out of `x` because it is borrowed | ^ move out of `x` occurs here error[E0502]: cannot borrow `x.0` as mutable because it is also borrowed as immutable - --> $DIR/borrow-tuple-fields.rs:28:18 + --> $DIR/borrow-tuple-fields.rs:18:18 | LL | let a = &x.0; | --- immutable borrow occurs here @@ -18,7 +18,7 @@ LL | } | - immutable borrow ends here error[E0499]: cannot borrow `x.0` as mutable more than once at a time - --> $DIR/borrow-tuple-fields.rs:33:18 + --> $DIR/borrow-tuple-fields.rs:23:18 | LL | let a = &mut x.0; | --- first mutable borrow occurs here @@ -29,7 +29,7 @@ LL | } | - first borrow ends here error[E0505]: cannot move out of `x` because it is borrowed - --> $DIR/borrow-tuple-fields.rs:38:9 + --> $DIR/borrow-tuple-fields.rs:28:9 | LL | let r = &x.0; | --- borrow of `x.0` occurs here @@ -37,7 +37,7 @@ LL | let y = x; //~ ERROR cannot move out of `x` because it is borrowed | ^ move out of `x` occurs here error[E0502]: cannot borrow `x.0` as mutable because it is also borrowed as immutable - --> $DIR/borrow-tuple-fields.rs:43:18 + --> $DIR/borrow-tuple-fields.rs:33:18 | LL | let a = &x.0; | --- immutable borrow occurs here @@ -48,7 +48,7 @@ LL | } | - immutable borrow ends here error[E0499]: cannot borrow `x.0` as mutable more than once at a time - --> $DIR/borrow-tuple-fields.rs:48:18 + --> $DIR/borrow-tuple-fields.rs:38:18 | LL | let a = &mut x.0; | --- first mutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-access-permissions.ast.nll.stderr b/src/test/ui/borrowck/borrowck-access-permissions.ast.nll.stderr index 0df5e0c6e6692..0d771a55d5995 100644 --- a/src/test/ui/borrowck/borrowck-access-permissions.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-access-permissions.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable - --> $DIR/borrowck-access-permissions.rs:22:19 + --> $DIR/borrowck-access-permissions.rs:12:19 | LL | let x = 1; | - help: consider changing this to be mutable: `mut x` @@ -8,13 +8,13 @@ LL | let _y1 = &mut x; //[ast]~ ERROR [E0596] | ^^^^^^ cannot borrow as mutable error[E0596]: cannot borrow immutable static item `static_x` as mutable - --> $DIR/borrowck-access-permissions.rs:28:19 + --> $DIR/borrowck-access-permissions.rs:18:19 | LL | let _y1 = &mut static_x; //[ast]~ ERROR [E0596] | ^^^^^^^^^^^^^ cannot borrow as mutable error[E0596]: cannot borrow `*box_x` as mutable, as `box_x` is not declared as mutable - --> $DIR/borrowck-access-permissions.rs:37:19 + --> $DIR/borrowck-access-permissions.rs:27:19 | LL | let box_x = Box::new(1); | ----- help: consider changing this to be mutable: `mut box_x` @@ -23,7 +23,7 @@ LL | let _y1 = &mut *box_x; //[ast]~ ERROR [E0596] | ^^^^^^^^^^^ cannot borrow as mutable error[E0596]: cannot borrow `*ref_x` as mutable, as it is behind a `&` reference - --> $DIR/borrowck-access-permissions.rs:46:19 + --> $DIR/borrowck-access-permissions.rs:36:19 | LL | let ref_x = &x; | -- help: consider changing this to be a mutable reference: `&mut x` @@ -32,7 +32,7 @@ LL | let _y1 = &mut *ref_x; //[ast]~ ERROR [E0596] | ^^^^^^^^^^^ `ref_x` is a `&` reference, so the data it refers to cannot be borrowed as mutable error[E0596]: cannot borrow `*ptr_x` as mutable, as it is behind a `*const` pointer - --> $DIR/borrowck-access-permissions.rs:56:23 + --> $DIR/borrowck-access-permissions.rs:46:23 | LL | let ptr_x : *const _ = &x; | -- help: consider changing this to be a mutable pointer: `&mut x` @@ -41,7 +41,7 @@ LL | let _y1 = &mut *ptr_x; //[ast]~ ERROR [E0596] | ^^^^^^^^^^^ `ptr_x` is a `*const` pointer, so the data it refers to cannot be borrowed as mutable error[E0596]: cannot borrow `*foo_ref.f` as mutable, as it is behind a `&` reference - --> $DIR/borrowck-access-permissions.rs:66:18 + --> $DIR/borrowck-access-permissions.rs:56:18 | LL | let foo_ref = &foo; | ---- help: consider changing this to be a mutable reference: `&mut foo` diff --git a/src/test/ui/borrowck/borrowck-access-permissions.ast.stderr b/src/test/ui/borrowck/borrowck-access-permissions.ast.stderr index b17245673e02a..8a7ab46875f11 100644 --- a/src/test/ui/borrowck/borrowck-access-permissions.ast.stderr +++ b/src/test/ui/borrowck/borrowck-access-permissions.ast.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow immutable local variable `x` as mutable - --> $DIR/borrowck-access-permissions.rs:22:24 + --> $DIR/borrowck-access-permissions.rs:12:24 | LL | let x = 1; | - consider changing this to `mut x` @@ -8,13 +8,13 @@ LL | let _y1 = &mut x; //[ast]~ ERROR [E0596] | ^ cannot borrow mutably error[E0596]: cannot borrow immutable static item as mutable - --> $DIR/borrowck-access-permissions.rs:28:24 + --> $DIR/borrowck-access-permissions.rs:18:24 | LL | let _y1 = &mut static_x; //[ast]~ ERROR [E0596] | ^^^^^^^^ error[E0596]: cannot borrow immutable `Box` content `*box_x` as mutable - --> $DIR/borrowck-access-permissions.rs:37:24 + --> $DIR/borrowck-access-permissions.rs:27:24 | LL | let box_x = Box::new(1); | ----- consider changing this to `mut box_x` @@ -23,19 +23,19 @@ LL | let _y1 = &mut *box_x; //[ast]~ ERROR [E0596] | ^^^^^^ cannot borrow as mutable error[E0596]: cannot borrow immutable borrowed content `*ref_x` as mutable - --> $DIR/borrowck-access-permissions.rs:46:24 + --> $DIR/borrowck-access-permissions.rs:36:24 | LL | let _y1 = &mut *ref_x; //[ast]~ ERROR [E0596] | ^^^^^^ cannot borrow as mutable error[E0596]: cannot borrow immutable dereference of raw pointer `*ptr_x` as mutable - --> $DIR/borrowck-access-permissions.rs:56:28 + --> $DIR/borrowck-access-permissions.rs:46:28 | LL | let _y1 = &mut *ptr_x; //[ast]~ ERROR [E0596] | ^^^^^^ cannot borrow as mutable error[E0389]: cannot borrow data mutably in a `&` reference - --> $DIR/borrowck-access-permissions.rs:66:23 + --> $DIR/borrowck-access-permissions.rs:56:23 | LL | let _y = &mut *foo_ref.f; //[ast]~ ERROR [E0389] | ^^^^^^^^^^ assignment into an immutable reference diff --git a/src/test/ui/borrowck/borrowck-access-permissions.mir.stderr b/src/test/ui/borrowck/borrowck-access-permissions.mir.stderr index 0df5e0c6e6692..0d771a55d5995 100644 --- a/src/test/ui/borrowck/borrowck-access-permissions.mir.stderr +++ b/src/test/ui/borrowck/borrowck-access-permissions.mir.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable - --> $DIR/borrowck-access-permissions.rs:22:19 + --> $DIR/borrowck-access-permissions.rs:12:19 | LL | let x = 1; | - help: consider changing this to be mutable: `mut x` @@ -8,13 +8,13 @@ LL | let _y1 = &mut x; //[ast]~ ERROR [E0596] | ^^^^^^ cannot borrow as mutable error[E0596]: cannot borrow immutable static item `static_x` as mutable - --> $DIR/borrowck-access-permissions.rs:28:19 + --> $DIR/borrowck-access-permissions.rs:18:19 | LL | let _y1 = &mut static_x; //[ast]~ ERROR [E0596] | ^^^^^^^^^^^^^ cannot borrow as mutable error[E0596]: cannot borrow `*box_x` as mutable, as `box_x` is not declared as mutable - --> $DIR/borrowck-access-permissions.rs:37:19 + --> $DIR/borrowck-access-permissions.rs:27:19 | LL | let box_x = Box::new(1); | ----- help: consider changing this to be mutable: `mut box_x` @@ -23,7 +23,7 @@ LL | let _y1 = &mut *box_x; //[ast]~ ERROR [E0596] | ^^^^^^^^^^^ cannot borrow as mutable error[E0596]: cannot borrow `*ref_x` as mutable, as it is behind a `&` reference - --> $DIR/borrowck-access-permissions.rs:46:19 + --> $DIR/borrowck-access-permissions.rs:36:19 | LL | let ref_x = &x; | -- help: consider changing this to be a mutable reference: `&mut x` @@ -32,7 +32,7 @@ LL | let _y1 = &mut *ref_x; //[ast]~ ERROR [E0596] | ^^^^^^^^^^^ `ref_x` is a `&` reference, so the data it refers to cannot be borrowed as mutable error[E0596]: cannot borrow `*ptr_x` as mutable, as it is behind a `*const` pointer - --> $DIR/borrowck-access-permissions.rs:56:23 + --> $DIR/borrowck-access-permissions.rs:46:23 | LL | let ptr_x : *const _ = &x; | -- help: consider changing this to be a mutable pointer: `&mut x` @@ -41,7 +41,7 @@ LL | let _y1 = &mut *ptr_x; //[ast]~ ERROR [E0596] | ^^^^^^^^^^^ `ptr_x` is a `*const` pointer, so the data it refers to cannot be borrowed as mutable error[E0596]: cannot borrow `*foo_ref.f` as mutable, as it is behind a `&` reference - --> $DIR/borrowck-access-permissions.rs:66:18 + --> $DIR/borrowck-access-permissions.rs:56:18 | LL | let foo_ref = &foo; | ---- help: consider changing this to be a mutable reference: `&mut foo` diff --git a/src/test/ui/borrowck/borrowck-access-permissions.rs b/src/test/ui/borrowck/borrowck-access-permissions.rs index 00a3da860746d..993742f427e03 100644 --- a/src/test/ui/borrowck/borrowck-access-permissions.rs +++ b/src/test/ui/borrowck/borrowck-access-permissions.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/borrowck/borrowck-and-init.nll.stderr b/src/test/ui/borrowck/borrowck-and-init.nll.stderr index 0b1b157f3e055..b4b02cf208ae7 100644 --- a/src/test/ui/borrowck/borrowck-and-init.nll.stderr +++ b/src/test/ui/borrowck/borrowck-and-init.nll.stderr @@ -1,5 +1,5 @@ error[E0381]: borrow of possibly uninitialized variable: `i` - --> $DIR/borrowck-and-init.rs:15:20 + --> $DIR/borrowck-and-init.rs:5:20 | LL | println!("{}", i); //~ ERROR use of possibly uninitialized variable: `i` | ^ use of possibly uninitialized `i` diff --git a/src/test/ui/borrowck/borrowck-and-init.rs b/src/test/ui/borrowck/borrowck-and-init.rs index 92f16d8ffcedb..ff076c55cad24 100644 --- a/src/test/ui/borrowck/borrowck-and-init.rs +++ b/src/test/ui/borrowck/borrowck-and-init.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let i: isize; diff --git a/src/test/ui/borrowck/borrowck-and-init.stderr b/src/test/ui/borrowck/borrowck-and-init.stderr index 2cbc57d66e9b8..42b658871dfaa 100644 --- a/src/test/ui/borrowck/borrowck-and-init.stderr +++ b/src/test/ui/borrowck/borrowck-and-init.stderr @@ -1,5 +1,5 @@ error[E0381]: use of possibly uninitialized variable: `i` - --> $DIR/borrowck-and-init.rs:15:20 + --> $DIR/borrowck-and-init.rs:5:20 | LL | println!("{}", i); //~ ERROR use of possibly uninitialized variable: `i` | ^ use of possibly uninitialized `i` diff --git a/src/test/ui/borrowck/borrowck-anon-fields-struct.nll.stderr b/src/test/ui/borrowck/borrowck-anon-fields-struct.nll.stderr index 0fe9106249be9..1bd64fe3a5386 100644 --- a/src/test/ui/borrowck/borrowck-anon-fields-struct.nll.stderr +++ b/src/test/ui/borrowck/borrowck-anon-fields-struct.nll.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `y` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-anon-fields-struct.rs:23:19 + --> $DIR/borrowck-anon-fields-struct.rs:13:19 | LL | Y(ref mut a, _) => a | --------- mutable borrow occurs here @@ -11,7 +11,7 @@ LL | *a += 1; | ------- borrow later used here error[E0502]: cannot borrow `y` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-anon-fields-struct.rs:38:19 + --> $DIR/borrowck-anon-fields-struct.rs:28:19 | LL | Y(ref mut a, _) => a | --------- mutable borrow occurs here @@ -23,7 +23,7 @@ LL | *a += 1; | ------- borrow later used here error[E0499]: cannot borrow `y.0` as mutable more than once at a time - --> $DIR/borrowck-anon-fields-struct.rs:39:11 + --> $DIR/borrowck-anon-fields-struct.rs:29:11 | LL | Y(ref mut a, _) => a | --------- first mutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-anon-fields-struct.rs b/src/test/ui/borrowck/borrowck-anon-fields-struct.rs index 5ee2b89dd9839..a05dfe62b2868 100644 --- a/src/test/ui/borrowck/borrowck-anon-fields-struct.rs +++ b/src/test/ui/borrowck/borrowck-anon-fields-struct.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that we are able to distinguish when loans borrow different // anonymous fields of a tuple vs the same anonymous field. diff --git a/src/test/ui/borrowck/borrowck-anon-fields-struct.stderr b/src/test/ui/borrowck/borrowck-anon-fields-struct.stderr index e635a2392e1e3..9c36a9fe875f5 100644 --- a/src/test/ui/borrowck/borrowck-anon-fields-struct.stderr +++ b/src/test/ui/borrowck/borrowck-anon-fields-struct.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `y.0` as mutable more than once at a time - --> $DIR/borrowck-anon-fields-struct.rs:39:11 + --> $DIR/borrowck-anon-fields-struct.rs:29:11 | LL | Y(ref mut a, _) => a | --------- first mutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-anon-fields-tuple.nll.stderr b/src/test/ui/borrowck/borrowck-anon-fields-tuple.nll.stderr index 015174a9e4579..64e00beaf94bb 100644 --- a/src/test/ui/borrowck/borrowck-anon-fields-tuple.nll.stderr +++ b/src/test/ui/borrowck/borrowck-anon-fields-tuple.nll.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `y` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-anon-fields-tuple.rs:21:19 + --> $DIR/borrowck-anon-fields-tuple.rs:11:19 | LL | (ref mut a, _) => a | --------- mutable borrow occurs here @@ -11,7 +11,7 @@ LL | *a += 1; | ------- borrow later used here error[E0502]: cannot borrow `y` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-anon-fields-tuple.rs:36:19 + --> $DIR/borrowck-anon-fields-tuple.rs:26:19 | LL | (ref mut a, _) => a | --------- mutable borrow occurs here @@ -23,7 +23,7 @@ LL | *a += 1; | ------- borrow later used here error[E0499]: cannot borrow `y.0` as mutable more than once at a time - --> $DIR/borrowck-anon-fields-tuple.rs:37:10 + --> $DIR/borrowck-anon-fields-tuple.rs:27:10 | LL | (ref mut a, _) => a | --------- first mutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-anon-fields-tuple.rs b/src/test/ui/borrowck/borrowck-anon-fields-tuple.rs index ebaed01756fb2..de2a8d8326808 100644 --- a/src/test/ui/borrowck/borrowck-anon-fields-tuple.rs +++ b/src/test/ui/borrowck/borrowck-anon-fields-tuple.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that we are able to distinguish when loans borrow different // anonymous fields of a tuple vs the same anonymous field. diff --git a/src/test/ui/borrowck/borrowck-anon-fields-tuple.stderr b/src/test/ui/borrowck/borrowck-anon-fields-tuple.stderr index d05d1c31f9d67..4b823f396afc5 100644 --- a/src/test/ui/borrowck/borrowck-anon-fields-tuple.stderr +++ b/src/test/ui/borrowck/borrowck-anon-fields-tuple.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `y.0` as mutable more than once at a time - --> $DIR/borrowck-anon-fields-tuple.rs:37:10 + --> $DIR/borrowck-anon-fields-tuple.rs:27:10 | LL | (ref mut a, _) => a | --------- first mutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-anon-fields-variant.nll.stderr b/src/test/ui/borrowck/borrowck-anon-fields-variant.nll.stderr index e4b9f2f2329c6..935ab8d87c3ae 100644 --- a/src/test/ui/borrowck/borrowck-anon-fields-variant.nll.stderr +++ b/src/test/ui/borrowck/borrowck-anon-fields-variant.nll.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `y` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-anon-fields-variant.rs:26:19 + --> $DIR/borrowck-anon-fields-variant.rs:16:19 | LL | Foo::Y(ref mut a, _) => a, | --------- mutable borrow occurs here @@ -11,7 +11,7 @@ LL | *a += 1; | ------- borrow later used here error[E0502]: cannot borrow `y` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-anon-fields-variant.rs:43:19 + --> $DIR/borrowck-anon-fields-variant.rs:33:19 | LL | Foo::Y(ref mut a, _) => a, | --------- mutable borrow occurs here @@ -23,7 +23,7 @@ LL | *a += 1; | ------- borrow later used here error[E0499]: cannot borrow `y.0` as mutable more than once at a time - --> $DIR/borrowck-anon-fields-variant.rs:44:14 + --> $DIR/borrowck-anon-fields-variant.rs:34:14 | LL | Foo::Y(ref mut a, _) => a, | --------- first mutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-anon-fields-variant.rs b/src/test/ui/borrowck/borrowck-anon-fields-variant.rs index 4e1b85283a6b1..c27435608c4a4 100644 --- a/src/test/ui/borrowck/borrowck-anon-fields-variant.rs +++ b/src/test/ui/borrowck/borrowck-anon-fields-variant.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that we are able to distinguish when loans borrow different // anonymous fields of an enum variant vs the same anonymous field. diff --git a/src/test/ui/borrowck/borrowck-anon-fields-variant.stderr b/src/test/ui/borrowck/borrowck-anon-fields-variant.stderr index 817d0154a63a5..1e94cdebaec6a 100644 --- a/src/test/ui/borrowck/borrowck-anon-fields-variant.stderr +++ b/src/test/ui/borrowck/borrowck-anon-fields-variant.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `y.0` as mutable more than once at a time - --> $DIR/borrowck-anon-fields-variant.rs:44:14 + --> $DIR/borrowck-anon-fields-variant.rs:34:14 | LL | Foo::Y(ref mut a, _) => a, | --------- first mutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-argument.nll.stderr b/src/test/ui/borrowck/borrowck-argument.nll.stderr index 4470566eabbca..9e7f0930ee57d 100644 --- a/src/test/ui/borrowck/borrowck-argument.nll.stderr +++ b/src/test/ui/borrowck/borrowck-argument.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `arg` as mutable, as it is not declared as mutable - --> $DIR/borrowck-argument.rs:20:5 + --> $DIR/borrowck-argument.rs:10:5 | LL | fn func(arg: S) { | --- help: consider changing this to be mutable: `mut arg` @@ -7,7 +7,7 @@ LL | arg.mutate(); //~ ERROR: cannot borrow immutable argument | ^^^ cannot borrow as mutable error[E0596]: cannot borrow `arg` as mutable, as it is not declared as mutable - --> $DIR/borrowck-argument.rs:25:9 + --> $DIR/borrowck-argument.rs:15:9 | LL | fn method(&self, arg: S) { | --- help: consider changing this to be mutable: `mut arg` @@ -15,7 +15,7 @@ LL | arg.mutate(); //~ ERROR: cannot borrow immutable argument | ^^^ cannot borrow as mutable error[E0596]: cannot borrow `arg` as mutable, as it is not declared as mutable - --> $DIR/borrowck-argument.rs:31:9 + --> $DIR/borrowck-argument.rs:21:9 | LL | fn default(&self, arg: S) { | --- help: consider changing this to be mutable: `mut arg` @@ -23,7 +23,7 @@ LL | arg.mutate(); //~ ERROR: cannot borrow immutable argument | ^^^ cannot borrow as mutable error[E0596]: cannot borrow `arg` as mutable, as it is not declared as mutable - --> $DIR/borrowck-argument.rs:42:17 + --> $DIR/borrowck-argument.rs:32:17 | LL | (|arg: S| { arg.mutate() })(s); //~ ERROR: cannot borrow immutable argument | --- ^^^ cannot borrow as mutable diff --git a/src/test/ui/borrowck/borrowck-argument.rs b/src/test/ui/borrowck/borrowck-argument.rs index 3230689e53c8a..e1f1adec8380c 100644 --- a/src/test/ui/borrowck/borrowck-argument.rs +++ b/src/test/ui/borrowck/borrowck-argument.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Copy, Clone)] struct S; diff --git a/src/test/ui/borrowck/borrowck-argument.stderr b/src/test/ui/borrowck/borrowck-argument.stderr index 2a7a7b3ffeeae..3100f02013d9b 100644 --- a/src/test/ui/borrowck/borrowck-argument.stderr +++ b/src/test/ui/borrowck/borrowck-argument.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow immutable argument `arg` as mutable - --> $DIR/borrowck-argument.rs:20:5 + --> $DIR/borrowck-argument.rs:10:5 | LL | fn func(arg: S) { | --- consider changing this to `mut arg` @@ -7,7 +7,7 @@ LL | arg.mutate(); //~ ERROR: cannot borrow immutable argument | ^^^ cannot borrow mutably error[E0596]: cannot borrow immutable argument `arg` as mutable - --> $DIR/borrowck-argument.rs:25:9 + --> $DIR/borrowck-argument.rs:15:9 | LL | fn method(&self, arg: S) { | --- consider changing this to `mut arg` @@ -15,7 +15,7 @@ LL | arg.mutate(); //~ ERROR: cannot borrow immutable argument | ^^^ cannot borrow mutably error[E0596]: cannot borrow immutable argument `arg` as mutable - --> $DIR/borrowck-argument.rs:31:9 + --> $DIR/borrowck-argument.rs:21:9 | LL | fn default(&self, arg: S) { | --- consider changing this to `mut arg` @@ -23,7 +23,7 @@ LL | arg.mutate(); //~ ERROR: cannot borrow immutable argument | ^^^ cannot borrow mutably error[E0596]: cannot borrow immutable argument `arg` as mutable - --> $DIR/borrowck-argument.rs:42:17 + --> $DIR/borrowck-argument.rs:32:17 | LL | (|arg: S| { arg.mutate() })(s); //~ ERROR: cannot borrow immutable argument | --- ^^^ cannot borrow mutably diff --git a/src/test/ui/borrowck/borrowck-asm.ast.nll.stderr b/src/test/ui/borrowck/borrowck-asm.ast.nll.stderr index 6936d32a78971..87161498f921d 100644 --- a/src/test/ui/borrowck/borrowck-asm.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-asm.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `x` - --> $DIR/borrowck-asm.rs:37:17 + --> $DIR/borrowck-asm.rs:27:17 | LL | asm!("nop" : : "r"(x)); | - value moved here @@ -10,7 +10,7 @@ LL | let z = x; //[ast]~ ERROR use of moved value: `x` = note: move occurs because `x` has type `&mut isize`, which does not implement the `Copy` trait error[E0503]: cannot use `x` because it was mutably borrowed - --> $DIR/borrowck-asm.rs:45:32 + --> $DIR/borrowck-asm.rs:35:32 | LL | let y = &mut x; | ------ borrow of `x` occurs here @@ -22,7 +22,7 @@ LL | let z = y; | - borrow later used here error[E0384]: cannot assign twice to immutable variable `x` - --> $DIR/borrowck-asm.rs:54:13 + --> $DIR/borrowck-asm.rs:44:13 | LL | let x = 3; | - @@ -34,7 +34,7 @@ LL | asm!("nop" : "=r"(x)); //[ast]~ ERROR cannot assign twice | ^^^^^^^^^^^^^^^^^^^^^^ cannot assign twice to immutable variable error[E0384]: cannot assign twice to immutable variable `x` - --> $DIR/borrowck-asm.rs:70:13 + --> $DIR/borrowck-asm.rs:60:13 | LL | let x = 3; | - @@ -46,13 +46,13 @@ LL | asm!("nop" : "+r"(x)); //[ast]~ ERROR cannot assign twice | ^^^^^^^^^^^^^^^^^^^^^^ cannot assign twice to immutable variable error[E0381]: use of possibly uninitialized variable: `x` - --> $DIR/borrowck-asm.rs:78:13 + --> $DIR/borrowck-asm.rs:68:13 | LL | asm!("nop" : "=*r"(x)); //[ast]~ ERROR use of possibly uninitialized variable | ^^^^^^^^^^^^^^^^^^^^^^^ use of possibly uninitialized `x` error[E0506]: cannot assign to `x` because it is borrowed - --> $DIR/borrowck-asm.rs:87:13 + --> $DIR/borrowck-asm.rs:77:13 | LL | let y = &*x; | --- borrow of `x` occurs here @@ -64,7 +64,7 @@ LL | let z = y; | - borrow later used here error[E0382]: use of moved value: `x` - --> $DIR/borrowck-asm.rs:96:40 + --> $DIR/borrowck-asm.rs:86:40 | LL | asm!("nop" : : "r"(x), "r"(x) ); //[ast]~ ERROR use of moved value | - ^ value used here after move diff --git a/src/test/ui/borrowck/borrowck-asm.ast.stderr b/src/test/ui/borrowck/borrowck-asm.ast.stderr index e2e54aa9b8ad9..f8b58989dbc7f 100644 --- a/src/test/ui/borrowck/borrowck-asm.ast.stderr +++ b/src/test/ui/borrowck/borrowck-asm.ast.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `x` - --> $DIR/borrowck-asm.rs:37:13 + --> $DIR/borrowck-asm.rs:27:13 | LL | asm!("nop" : : "r"(x)); | - value moved here @@ -10,7 +10,7 @@ LL | let z = x; //[ast]~ ERROR use of moved value: `x` = note: move occurs because `x` has type `&mut isize`, which does not implement the `Copy` trait error[E0503]: cannot use `x` because it was mutably borrowed - --> $DIR/borrowck-asm.rs:45:32 + --> $DIR/borrowck-asm.rs:35:32 | LL | let y = &mut x; | - borrow of `x` occurs here @@ -19,7 +19,7 @@ LL | asm!("nop" : : "r"(x)); //[ast]~ ERROR cannot use | ^ use of borrowed `x` error[E0384]: cannot assign twice to immutable variable `x` - --> $DIR/borrowck-asm.rs:54:13 + --> $DIR/borrowck-asm.rs:44:13 | LL | let x = 3; | - first assignment to `x` @@ -28,7 +28,7 @@ LL | asm!("nop" : "=r"(x)); //[ast]~ ERROR cannot assign twice | ^^^^^^^^^^^^^^^^^^^^^^ cannot assign twice to immutable variable error[E0506]: cannot assign to `a` because it is borrowed - --> $DIR/borrowck-asm.rs:60:13 + --> $DIR/borrowck-asm.rs:50:13 | LL | let b = &*a; | -- borrow of `a` occurs here @@ -37,7 +37,7 @@ LL | asm!("nop" : "=r"(a)); //[ast]~ ERROR cannot assign to `a` bec | ^^^^^^^^^^^^^^^^^^^^^^ assignment to borrowed `a` occurs here error[E0384]: cannot assign twice to immutable variable `x` - --> $DIR/borrowck-asm.rs:70:13 + --> $DIR/borrowck-asm.rs:60:13 | LL | let x = 3; | - first assignment to `x` @@ -46,13 +46,13 @@ LL | asm!("nop" : "+r"(x)); //[ast]~ ERROR cannot assign twice | ^^^^^^^^^^^^^^^^^^^^^^ cannot assign twice to immutable variable error[E0381]: use of possibly uninitialized variable: `x` - --> $DIR/borrowck-asm.rs:78:32 + --> $DIR/borrowck-asm.rs:68:32 | LL | asm!("nop" : "=*r"(x)); //[ast]~ ERROR use of possibly uninitialized variable | ^ use of possibly uninitialized `x` error[E0506]: cannot assign to `x` because it is borrowed - --> $DIR/borrowck-asm.rs:87:13 + --> $DIR/borrowck-asm.rs:77:13 | LL | let y = &*x; | -- borrow of `x` occurs here @@ -61,7 +61,7 @@ LL | asm!("nop" : "+r"(x)); //[ast]~ ERROR cannot assign to `x` bec | ^^^^^^^^^^^^^^^^^^^^^^ assignment to borrowed `x` occurs here error[E0382]: use of moved value: `x` - --> $DIR/borrowck-asm.rs:96:40 + --> $DIR/borrowck-asm.rs:86:40 | LL | asm!("nop" : : "r"(x), "r"(x) ); //[ast]~ ERROR use of moved value | - ^ value used here after move diff --git a/src/test/ui/borrowck/borrowck-asm.mir.stderr b/src/test/ui/borrowck/borrowck-asm.mir.stderr index 6936d32a78971..87161498f921d 100644 --- a/src/test/ui/borrowck/borrowck-asm.mir.stderr +++ b/src/test/ui/borrowck/borrowck-asm.mir.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `x` - --> $DIR/borrowck-asm.rs:37:17 + --> $DIR/borrowck-asm.rs:27:17 | LL | asm!("nop" : : "r"(x)); | - value moved here @@ -10,7 +10,7 @@ LL | let z = x; //[ast]~ ERROR use of moved value: `x` = note: move occurs because `x` has type `&mut isize`, which does not implement the `Copy` trait error[E0503]: cannot use `x` because it was mutably borrowed - --> $DIR/borrowck-asm.rs:45:32 + --> $DIR/borrowck-asm.rs:35:32 | LL | let y = &mut x; | ------ borrow of `x` occurs here @@ -22,7 +22,7 @@ LL | let z = y; | - borrow later used here error[E0384]: cannot assign twice to immutable variable `x` - --> $DIR/borrowck-asm.rs:54:13 + --> $DIR/borrowck-asm.rs:44:13 | LL | let x = 3; | - @@ -34,7 +34,7 @@ LL | asm!("nop" : "=r"(x)); //[ast]~ ERROR cannot assign twice | ^^^^^^^^^^^^^^^^^^^^^^ cannot assign twice to immutable variable error[E0384]: cannot assign twice to immutable variable `x` - --> $DIR/borrowck-asm.rs:70:13 + --> $DIR/borrowck-asm.rs:60:13 | LL | let x = 3; | - @@ -46,13 +46,13 @@ LL | asm!("nop" : "+r"(x)); //[ast]~ ERROR cannot assign twice | ^^^^^^^^^^^^^^^^^^^^^^ cannot assign twice to immutable variable error[E0381]: use of possibly uninitialized variable: `x` - --> $DIR/borrowck-asm.rs:78:13 + --> $DIR/borrowck-asm.rs:68:13 | LL | asm!("nop" : "=*r"(x)); //[ast]~ ERROR use of possibly uninitialized variable | ^^^^^^^^^^^^^^^^^^^^^^^ use of possibly uninitialized `x` error[E0506]: cannot assign to `x` because it is borrowed - --> $DIR/borrowck-asm.rs:87:13 + --> $DIR/borrowck-asm.rs:77:13 | LL | let y = &*x; | --- borrow of `x` occurs here @@ -64,7 +64,7 @@ LL | let z = y; | - borrow later used here error[E0382]: use of moved value: `x` - --> $DIR/borrowck-asm.rs:96:40 + --> $DIR/borrowck-asm.rs:86:40 | LL | asm!("nop" : : "r"(x), "r"(x) ); //[ast]~ ERROR use of moved value | - ^ value used here after move diff --git a/src/test/ui/borrowck/borrowck-asm.rs b/src/test/ui/borrowck/borrowck-asm.rs index d9816401b33c4..560c87c8d7220 100644 --- a/src/test/ui/borrowck/borrowck-asm.rs +++ b/src/test/ui/borrowck/borrowck-asm.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-s390x // ignore-emscripten // ignore-powerpc diff --git a/src/test/ui/borrowck/borrowck-assign-comp-idx.nll.stderr b/src/test/ui/borrowck/borrowck-assign-comp-idx.nll.stderr index f4568d7c9eb8a..0327ecdb7af46 100644 --- a/src/test/ui/borrowck/borrowck-assign-comp-idx.nll.stderr +++ b/src/test/ui/borrowck/borrowck-assign-comp-idx.nll.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `p` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-assign-comp-idx.rs:22:5 + --> $DIR/borrowck-assign-comp-idx.rs:12:5 | LL | let q: &isize = &p[0]; | - immutable borrow occurs here @@ -11,7 +11,7 @@ LL | println!("{}", *q); | -- borrow later used here error[E0502]: cannot borrow `p` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-assign-comp-idx.rs:37:9 + --> $DIR/borrowck-assign-comp-idx.rs:27:9 | LL | / borrow( LL | | &p, diff --git a/src/test/ui/borrowck/borrowck-assign-comp-idx.rs b/src/test/ui/borrowck/borrowck-assign-comp-idx.rs index 1e665a12a195b..f4dffeb8c385b 100644 --- a/src/test/ui/borrowck/borrowck-assign-comp-idx.rs +++ b/src/test/ui/borrowck/borrowck-assign-comp-idx.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Point { x: isize, y: isize, diff --git a/src/test/ui/borrowck/borrowck-assign-comp-idx.stderr b/src/test/ui/borrowck/borrowck-assign-comp-idx.stderr index 69a69b36fc737..9997aa4190e3f 100644 --- a/src/test/ui/borrowck/borrowck-assign-comp-idx.stderr +++ b/src/test/ui/borrowck/borrowck-assign-comp-idx.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `p` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-assign-comp-idx.rs:22:5 + --> $DIR/borrowck-assign-comp-idx.rs:12:5 | LL | let q: &isize = &p[0]; | - immutable borrow occurs here @@ -11,7 +11,7 @@ LL | } | - immutable borrow ends here error[E0502]: cannot borrow `p` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-assign-comp-idx.rs:37:9 + --> $DIR/borrowck-assign-comp-idx.rs:27:9 | LL | &p, | - immutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-assign-comp.ast.nll.stderr b/src/test/ui/borrowck/borrowck-assign-comp.ast.nll.stderr index 2a1fbfd43bfb0..afa9e81db8eb5 100644 --- a/src/test/ui/borrowck/borrowck-assign-comp.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-assign-comp.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `p.x` because it is borrowed - --> $DIR/borrowck-assign-comp.rs:23:5 + --> $DIR/borrowck-assign-comp.rs:13:5 | LL | let q = &p; | -- borrow of `p.x` occurs here @@ -11,7 +11,7 @@ LL | q.x; | --- borrow later used here error[E0506]: cannot assign to `p` because it is borrowed - --> $DIR/borrowck-assign-comp.rs:34:5 + --> $DIR/borrowck-assign-comp.rs:24:5 | LL | let q = &p.y; | ---- borrow of `p` occurs here @@ -22,7 +22,7 @@ LL | *q; // stretch loan | -- borrow later used here error[E0506]: cannot assign to `p.y` because it is borrowed - --> $DIR/borrowck-assign-comp.rs:46:5 + --> $DIR/borrowck-assign-comp.rs:36:5 | LL | let q = &p.y; | ---- borrow of `p.y` occurs here diff --git a/src/test/ui/borrowck/borrowck-assign-comp.ast.stderr b/src/test/ui/borrowck/borrowck-assign-comp.ast.stderr index 9e5e0e197a93b..637e6d43879b6 100644 --- a/src/test/ui/borrowck/borrowck-assign-comp.ast.stderr +++ b/src/test/ui/borrowck/borrowck-assign-comp.ast.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `p.x` because it is borrowed - --> $DIR/borrowck-assign-comp.rs:23:5 + --> $DIR/borrowck-assign-comp.rs:13:5 | LL | let q = &p; | - borrow of `p.x` occurs here @@ -8,7 +8,7 @@ LL | p.x = 5; //[ast]~ ERROR cannot assign to `p.x` | ^^^^^^^ assignment to borrowed `p.x` occurs here error[E0506]: cannot assign to `p` because it is borrowed - --> $DIR/borrowck-assign-comp.rs:34:5 + --> $DIR/borrowck-assign-comp.rs:24:5 | LL | let q = &p.y; | --- borrow of `p` occurs here @@ -16,7 +16,7 @@ LL | p = point {x: 5, y: 7};//[ast]~ ERROR cannot assign to `p` | ^^^^^^^^^^^^^^^^^^^^^^ assignment to borrowed `p` occurs here error[E0506]: cannot assign to `p.y` because it is borrowed - --> $DIR/borrowck-assign-comp.rs:46:5 + --> $DIR/borrowck-assign-comp.rs:36:5 | LL | let q = &p.y; | --- borrow of `p.y` occurs here diff --git a/src/test/ui/borrowck/borrowck-assign-comp.mir.stderr b/src/test/ui/borrowck/borrowck-assign-comp.mir.stderr index 2a1fbfd43bfb0..afa9e81db8eb5 100644 --- a/src/test/ui/borrowck/borrowck-assign-comp.mir.stderr +++ b/src/test/ui/borrowck/borrowck-assign-comp.mir.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `p.x` because it is borrowed - --> $DIR/borrowck-assign-comp.rs:23:5 + --> $DIR/borrowck-assign-comp.rs:13:5 | LL | let q = &p; | -- borrow of `p.x` occurs here @@ -11,7 +11,7 @@ LL | q.x; | --- borrow later used here error[E0506]: cannot assign to `p` because it is borrowed - --> $DIR/borrowck-assign-comp.rs:34:5 + --> $DIR/borrowck-assign-comp.rs:24:5 | LL | let q = &p.y; | ---- borrow of `p` occurs here @@ -22,7 +22,7 @@ LL | *q; // stretch loan | -- borrow later used here error[E0506]: cannot assign to `p.y` because it is borrowed - --> $DIR/borrowck-assign-comp.rs:46:5 + --> $DIR/borrowck-assign-comp.rs:36:5 | LL | let q = &p.y; | ---- borrow of `p.y` occurs here diff --git a/src/test/ui/borrowck/borrowck-assign-comp.rs b/src/test/ui/borrowck/borrowck-assign-comp.rs index d68420eb205c7..0bf4a1d00422e 100644 --- a/src/test/ui/borrowck/borrowck-assign-comp.rs +++ b/src/test/ui/borrowck/borrowck-assign-comp.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.nll.stderr b/src/test/ui/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.nll.stderr index eb4c1ff025b02..469199d69b91e 100644 --- a/src/test/ui/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.nll.stderr +++ b/src/test/ui/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.nll.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to `*s.pointer` which is behind a `&` reference - --> $DIR/borrowck-assign-to-andmut-in-aliasable-loc.rs:19:5 + --> $DIR/borrowck-assign-to-andmut-in-aliasable-loc.rs:9:5 | LL | fn a(s: &S) { | -- help: consider changing this to be a mutable reference: `&mut S<'_>` @@ -7,7 +7,7 @@ LL | *s.pointer += 1; //~ ERROR cannot assign | ^^^^^^^^^^^^^^^ `s` is a `&` reference, so the data it refers to cannot be written error[E0594]: cannot assign to `*s.pointer` which is behind a `&` reference - --> $DIR/borrowck-assign-to-andmut-in-aliasable-loc.rs:27:5 + --> $DIR/borrowck-assign-to-andmut-in-aliasable-loc.rs:17:5 | LL | fn c(s: & &mut S) { | -------- help: consider changing this to be a mutable reference: `&mut &mut S<'_>` diff --git a/src/test/ui/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.rs b/src/test/ui/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.rs index d66cdb99a7463..879c03791eb77 100644 --- a/src/test/ui/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.rs +++ b/src/test/ui/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that assignments to an `&mut` pointer which is found in a // borrowed (but otherwise non-aliasable) location is illegal. diff --git a/src/test/ui/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.stderr b/src/test/ui/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.stderr index 4fb65988eee9d..76e7ee841f827 100644 --- a/src/test/ui/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.stderr +++ b/src/test/ui/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.stderr @@ -1,5 +1,5 @@ error[E0389]: cannot assign to data in a `&` reference - --> $DIR/borrowck-assign-to-andmut-in-aliasable-loc.rs:19:5 + --> $DIR/borrowck-assign-to-andmut-in-aliasable-loc.rs:9:5 | LL | fn a(s: &S) { | -- use `&mut S` here to make mutable @@ -7,7 +7,7 @@ LL | *s.pointer += 1; //~ ERROR cannot assign | ^^^^^^^^^^^^^^^ assignment into an immutable reference error[E0389]: cannot assign to data in a `&` reference - --> $DIR/borrowck-assign-to-andmut-in-aliasable-loc.rs:27:5 + --> $DIR/borrowck-assign-to-andmut-in-aliasable-loc.rs:17:5 | LL | fn c(s: & &mut S) { | -------- use `&mut &mut S` here to make mutable diff --git a/src/test/ui/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.nll.stderr b/src/test/ui/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.nll.stderr index 8ca7229b42a69..8e3e9d41f8c0e 100644 --- a/src/test/ui/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.nll.stderr +++ b/src/test/ui/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.nll.stderr @@ -1,5 +1,5 @@ error[E0503]: cannot use `*y.pointer` because it was mutably borrowed - --> $DIR/borrowck-assign-to-andmut-in-borrowed-loc.rs:28:9 + --> $DIR/borrowck-assign-to-andmut-in-borrowed-loc.rs:18:9 | LL | let z = copy_borrowed_ptr(&mut y); | ------ borrow of `y` occurs here @@ -9,7 +9,7 @@ LL | *z.pointer += 1; | --------------- borrow later used here error[E0506]: cannot assign to `*y.pointer` because it is borrowed - --> $DIR/borrowck-assign-to-andmut-in-borrowed-loc.rs:28:9 + --> $DIR/borrowck-assign-to-andmut-in-borrowed-loc.rs:18:9 | LL | let z = copy_borrowed_ptr(&mut y); | ------ borrow of `*y.pointer` occurs here diff --git a/src/test/ui/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.rs b/src/test/ui/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.rs index 77aa57ef1b5ba..98080d47c647b 100644 --- a/src/test/ui/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.rs +++ b/src/test/ui/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that assignments to an `&mut` pointer which is found in a // borrowed (but otherwise non-aliasable) location is illegal. diff --git a/src/test/ui/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.stderr b/src/test/ui/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.stderr index 9a7c833050500..d4639581223de 100644 --- a/src/test/ui/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.stderr +++ b/src/test/ui/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `*y.pointer` because it is borrowed - --> $DIR/borrowck-assign-to-andmut-in-borrowed-loc.rs:28:9 + --> $DIR/borrowck-assign-to-andmut-in-borrowed-loc.rs:18:9 | LL | let z = copy_borrowed_ptr(&mut y); | - borrow of `*y.pointer` occurs here diff --git a/src/test/ui/borrowck/borrowck-assign-to-constants.ast.nll.stderr b/src/test/ui/borrowck/borrowck-assign-to-constants.ast.nll.stderr index 861fe2f2c5065..0a30a490a643b 100644 --- a/src/test/ui/borrowck/borrowck-assign-to-constants.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-assign-to-constants.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to immutable static item `foo` - --> $DIR/borrowck-assign-to-constants.rs:18:5 + --> $DIR/borrowck-assign-to-constants.rs:8:5 | LL | foo = 6; //[ast]~ ERROR cannot assign to immutable static item | ^^^^^^^ cannot assign diff --git a/src/test/ui/borrowck/borrowck-assign-to-constants.ast.stderr b/src/test/ui/borrowck/borrowck-assign-to-constants.ast.stderr index 09ddf8387cefc..4111f55d9f2b2 100644 --- a/src/test/ui/borrowck/borrowck-assign-to-constants.ast.stderr +++ b/src/test/ui/borrowck/borrowck-assign-to-constants.ast.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to immutable static item - --> $DIR/borrowck-assign-to-constants.rs:18:5 + --> $DIR/borrowck-assign-to-constants.rs:8:5 | LL | foo = 6; //[ast]~ ERROR cannot assign to immutable static item | ^^^^^^^ diff --git a/src/test/ui/borrowck/borrowck-assign-to-constants.mir.stderr b/src/test/ui/borrowck/borrowck-assign-to-constants.mir.stderr index 861fe2f2c5065..0a30a490a643b 100644 --- a/src/test/ui/borrowck/borrowck-assign-to-constants.mir.stderr +++ b/src/test/ui/borrowck/borrowck-assign-to-constants.mir.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to immutable static item `foo` - --> $DIR/borrowck-assign-to-constants.rs:18:5 + --> $DIR/borrowck-assign-to-constants.rs:8:5 | LL | foo = 6; //[ast]~ ERROR cannot assign to immutable static item | ^^^^^^^ cannot assign diff --git a/src/test/ui/borrowck/borrowck-assign-to-constants.rs b/src/test/ui/borrowck/borrowck-assign-to-constants.rs index 57002dd40fc95..768b2a5f7438e 100644 --- a/src/test/ui/borrowck/borrowck-assign-to-constants.rs +++ b/src/test/ui/borrowck/borrowck-assign-to-constants.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/borrowck/borrowck-auto-mut-ref-to-immut-var.nll.stderr b/src/test/ui/borrowck/borrowck-auto-mut-ref-to-immut-var.nll.stderr index b41d5cd3623cd..53aaa4a2957e9 100644 --- a/src/test/ui/borrowck/borrowck-auto-mut-ref-to-immut-var.nll.stderr +++ b/src/test/ui/borrowck/borrowck-auto-mut-ref-to-immut-var.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable - --> $DIR/borrowck-auto-mut-ref-to-immut-var.rs:25:5 + --> $DIR/borrowck-auto-mut-ref-to-immut-var.rs:15:5 | LL | let x = Foo { x: 3 }; | - help: consider changing this to be mutable: `mut x` diff --git a/src/test/ui/borrowck/borrowck-auto-mut-ref-to-immut-var.rs b/src/test/ui/borrowck/borrowck-auto-mut-ref-to-immut-var.rs index ea020dc068521..247e3da186be8 100644 --- a/src/test/ui/borrowck/borrowck-auto-mut-ref-to-immut-var.rs +++ b/src/test/ui/borrowck/borrowck-auto-mut-ref-to-immut-var.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that auto-ref can't create mutable aliases to immutable memory. struct Foo { diff --git a/src/test/ui/borrowck/borrowck-auto-mut-ref-to-immut-var.stderr b/src/test/ui/borrowck/borrowck-auto-mut-ref-to-immut-var.stderr index ca6b86e5ca686..3762241863f02 100644 --- a/src/test/ui/borrowck/borrowck-auto-mut-ref-to-immut-var.stderr +++ b/src/test/ui/borrowck/borrowck-auto-mut-ref-to-immut-var.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow immutable local variable `x` as mutable - --> $DIR/borrowck-auto-mut-ref-to-immut-var.rs:25:5 + --> $DIR/borrowck-auto-mut-ref-to-immut-var.rs:15:5 | LL | let x = Foo { x: 3 }; | - consider changing this to `mut x` diff --git a/src/test/ui/borrowck/borrowck-autoref-3261.nll.stderr b/src/test/ui/borrowck/borrowck-autoref-3261.nll.stderr index eb26676cde24b..ce97c91eef54a 100644 --- a/src/test/ui/borrowck/borrowck-autoref-3261.nll.stderr +++ b/src/test/ui/borrowck/borrowck-autoref-3261.nll.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/borrowck-autoref-3261.rs:25:9 + --> $DIR/borrowck-autoref-3261.rs:15:9 | LL | (&mut x).with( | -------- diff --git a/src/test/ui/borrowck/borrowck-autoref-3261.rs b/src/test/ui/borrowck/borrowck-autoref-3261.rs index d5f09305808f0..2ff3d5bd3db9f 100644 --- a/src/test/ui/borrowck/borrowck-autoref-3261.rs +++ b/src/test/ui/borrowck/borrowck-autoref-3261.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Either { Left(T), Right(U) } struct X(Either<(usize,usize), fn()>); diff --git a/src/test/ui/borrowck/borrowck-autoref-3261.stderr b/src/test/ui/borrowck/borrowck-autoref-3261.stderr index c9e649dee0c25..7a5430ac15c37 100644 --- a/src/test/ui/borrowck/borrowck-autoref-3261.stderr +++ b/src/test/ui/borrowck/borrowck-autoref-3261.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/borrowck-autoref-3261.rs:25:9 + --> $DIR/borrowck-autoref-3261.rs:15:9 | LL | (&mut x).with( | - first mutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-bad-nested-calls-free.nll.stderr b/src/test/ui/borrowck/borrowck-bad-nested-calls-free.nll.stderr index 73f533a6b9699..048202a5067a6 100644 --- a/src/test/ui/borrowck/borrowck-bad-nested-calls-free.nll.stderr +++ b/src/test/ui/borrowck/borrowck-bad-nested-calls-free.nll.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `a` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-bad-nested-calls-free.rs:35:17 + --> $DIR/borrowck-bad-nested-calls-free.rs:25:17 | LL | / add( LL | | &*a, @@ -10,7 +10,7 @@ LL | | rewrite(&mut a)); //~ ERROR cannot borrow | mutable borrow occurs here error[E0502]: cannot borrow `a` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-bad-nested-calls-free.rs:42:17 + --> $DIR/borrowck-bad-nested-calls-free.rs:32:17 | LL | / add( LL | | &*a, diff --git a/src/test/ui/borrowck/borrowck-bad-nested-calls-free.rs b/src/test/ui/borrowck/borrowck-bad-nested-calls-free.rs index 7913f9ac90300..3abc56153b78a 100644 --- a/src/test/ui/borrowck/borrowck-bad-nested-calls-free.rs +++ b/src/test/ui/borrowck/borrowck-bad-nested-calls-free.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we detect nested calls that could free pointers evaluated // for earlier arguments. diff --git a/src/test/ui/borrowck/borrowck-bad-nested-calls-free.stderr b/src/test/ui/borrowck/borrowck-bad-nested-calls-free.stderr index 461d2fec58961..165530d270af9 100644 --- a/src/test/ui/borrowck/borrowck-bad-nested-calls-free.stderr +++ b/src/test/ui/borrowck/borrowck-bad-nested-calls-free.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `a` as mutable because `*a` is also borrowed as immutable - --> $DIR/borrowck-bad-nested-calls-free.rs:35:22 + --> $DIR/borrowck-bad-nested-calls-free.rs:25:22 | LL | &*a, | -- immutable borrow occurs here @@ -9,7 +9,7 @@ LL | rewrite(&mut a)); //~ ERROR cannot borrow | mutable borrow occurs here error[E0502]: cannot borrow `a` as mutable because `*a` is also borrowed as immutable - --> $DIR/borrowck-bad-nested-calls-free.rs:42:22 + --> $DIR/borrowck-bad-nested-calls-free.rs:32:22 | LL | &*a, | -- immutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-bad-nested-calls-move.nll.stderr b/src/test/ui/borrowck/borrowck-bad-nested-calls-move.nll.stderr index ecb70068fed30..f6ec78cec8445 100644 --- a/src/test/ui/borrowck/borrowck-bad-nested-calls-move.nll.stderr +++ b/src/test/ui/borrowck/borrowck-bad-nested-calls-move.nll.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `a` because it is borrowed - --> $DIR/borrowck-bad-nested-calls-move.rs:35:9 + --> $DIR/borrowck-bad-nested-calls-move.rs:25:9 | LL | / add( LL | | &*a, @@ -10,7 +10,7 @@ LL | | a); //~ ERROR cannot move | move out of `a` occurs here error[E0505]: cannot move out of `a` because it is borrowed - --> $DIR/borrowck-bad-nested-calls-move.rs:42:9 + --> $DIR/borrowck-bad-nested-calls-move.rs:32:9 | LL | / add( LL | | &*a, diff --git a/src/test/ui/borrowck/borrowck-bad-nested-calls-move.rs b/src/test/ui/borrowck/borrowck-bad-nested-calls-move.rs index e24d4e87add83..fd8df78a5d5a1 100644 --- a/src/test/ui/borrowck/borrowck-bad-nested-calls-move.rs +++ b/src/test/ui/borrowck/borrowck-bad-nested-calls-move.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we detect nested calls that could free pointers evaluated // for earlier arguments. diff --git a/src/test/ui/borrowck/borrowck-bad-nested-calls-move.stderr b/src/test/ui/borrowck/borrowck-bad-nested-calls-move.stderr index 7ed1f2c6583ba..b2c680f39521e 100644 --- a/src/test/ui/borrowck/borrowck-bad-nested-calls-move.stderr +++ b/src/test/ui/borrowck/borrowck-bad-nested-calls-move.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `a` because it is borrowed - --> $DIR/borrowck-bad-nested-calls-move.rs:35:9 + --> $DIR/borrowck-bad-nested-calls-move.rs:25:9 | LL | &*a, | -- borrow of `*a` occurs here @@ -7,7 +7,7 @@ LL | a); //~ ERROR cannot move | ^ move out of `a` occurs here error[E0505]: cannot move out of `a` because it is borrowed - --> $DIR/borrowck-bad-nested-calls-move.rs:42:9 + --> $DIR/borrowck-bad-nested-calls-move.rs:32:9 | LL | &*a, | -- borrow of `*a` occurs here diff --git a/src/test/ui/borrowck/borrowck-block-unint.nll.stderr b/src/test/ui/borrowck/borrowck-block-unint.nll.stderr index f3246c12bd9a8..ea17fafc93908 100644 --- a/src/test/ui/borrowck/borrowck-block-unint.nll.stderr +++ b/src/test/ui/borrowck/borrowck-block-unint.nll.stderr @@ -1,5 +1,5 @@ error[E0381]: borrow of possibly uninitialized variable: `x` - --> $DIR/borrowck-block-unint.rs:14:11 + --> $DIR/borrowck-block-unint.rs:4:11 | LL | force(|| { //~ ERROR capture of possibly uninitialized variable: `x` | ^^ use of possibly uninitialized `x` diff --git a/src/test/ui/borrowck/borrowck-block-unint.rs b/src/test/ui/borrowck/borrowck-block-unint.rs index a09ee43924543..3c6e9cb5578b4 100644 --- a/src/test/ui/borrowck/borrowck-block-unint.rs +++ b/src/test/ui/borrowck/borrowck-block-unint.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn force(f: F) where F: FnOnce() { f(); } fn main() { let x: isize; diff --git a/src/test/ui/borrowck/borrowck-block-unint.stderr b/src/test/ui/borrowck/borrowck-block-unint.stderr index 53aa8919fd87c..6e7af76fc2e89 100644 --- a/src/test/ui/borrowck/borrowck-block-unint.stderr +++ b/src/test/ui/borrowck/borrowck-block-unint.stderr @@ -1,5 +1,5 @@ error[E0381]: capture of possibly uninitialized variable: `x` - --> $DIR/borrowck-block-unint.rs:14:11 + --> $DIR/borrowck-block-unint.rs:4:11 | LL | force(|| { //~ ERROR capture of possibly uninitialized variable: `x` | ^^ use of possibly uninitialized `x` diff --git a/src/test/ui/borrowck/borrowck-borrow-from-owned-ptr.nll.stderr b/src/test/ui/borrowck/borrowck-borrow-from-owned-ptr.nll.stderr index 08d66eb034459..6ed3a2e184f33 100644 --- a/src/test/ui/borrowck/borrowck-borrow-from-owned-ptr.nll.stderr +++ b/src/test/ui/borrowck/borrowck-borrow-from-owned-ptr.nll.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `foo.bar1` as mutable more than once at a time - --> $DIR/borrowck-borrow-from-owned-ptr.rs:29:17 + --> $DIR/borrowck-borrow-from-owned-ptr.rs:18:17 | LL | let bar1 = &mut foo.bar1; | ------------- first mutable borrow occurs here @@ -9,7 +9,7 @@ LL | *bar1; | ----- borrow later used here error[E0502]: cannot borrow `foo.bar1` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-borrow-from-owned-ptr.rs:36:17 + --> $DIR/borrowck-borrow-from-owned-ptr.rs:25:17 | LL | let bar1 = &mut foo.bar1; | ------------- mutable borrow occurs here @@ -19,7 +19,7 @@ LL | *bar1; | ----- borrow later used here error[E0502]: cannot borrow `foo.bar1` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-borrow-from-owned-ptr.rs:43:17 + --> $DIR/borrowck-borrow-from-owned-ptr.rs:32:17 | LL | let bar1 = &foo.bar1; | --------- immutable borrow occurs here @@ -29,7 +29,7 @@ LL | *bar1; | ----- borrow later used here error[E0502]: cannot borrow `*foo` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-borrow-from-owned-ptr.rs:72:11 + --> $DIR/borrowck-borrow-from-owned-ptr.rs:61:11 | LL | let bar1 = &mut foo.bar1; | ------------- mutable borrow occurs here @@ -40,7 +40,7 @@ LL | *bar1; | ----- borrow later used here error[E0499]: cannot borrow `foo.bar1` as mutable more than once at a time - --> $DIR/borrowck-borrow-from-owned-ptr.rs:73:21 + --> $DIR/borrowck-borrow-from-owned-ptr.rs:62:21 | LL | let bar1 = &mut foo.bar1; | ------------- first mutable borrow occurs here @@ -52,7 +52,7 @@ LL | *bar1; | ----- borrow later used here error[E0502]: cannot borrow `foo.bar1` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-borrow-from-owned-ptr.rs:82:17 + --> $DIR/borrowck-borrow-from-owned-ptr.rs:71:17 | LL | let bar1 = &mut foo.bar1.int1; | ------------------ mutable borrow occurs here @@ -63,7 +63,7 @@ LL | *bar1; | ----- borrow later used here error[E0502]: cannot borrow `*foo` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-borrow-from-owned-ptr.rs:83:17 + --> $DIR/borrowck-borrow-from-owned-ptr.rs:72:17 | LL | let bar1 = &mut foo.bar1.int1; | ------------------ mutable borrow occurs here @@ -74,7 +74,7 @@ LL | *bar1; | ----- borrow later used here error[E0499]: cannot borrow `foo.bar1` as mutable more than once at a time - --> $DIR/borrowck-borrow-from-owned-ptr.rs:90:17 + --> $DIR/borrowck-borrow-from-owned-ptr.rs:79:17 | LL | let bar1 = &mut foo.bar1.int1; | ------------------ first mutable borrow occurs here @@ -84,7 +84,7 @@ LL | *bar1; | ----- borrow later used here error[E0499]: cannot borrow `*foo` as mutable more than once at a time - --> $DIR/borrowck-borrow-from-owned-ptr.rs:97:17 + --> $DIR/borrowck-borrow-from-owned-ptr.rs:86:17 | LL | let bar1 = &mut foo.bar1.int1; | ------------------ first mutable borrow occurs here @@ -94,7 +94,7 @@ LL | *bar1; | ----- borrow later used here error[E0502]: cannot borrow `foo.bar1` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-borrow-from-owned-ptr.rs:104:17 + --> $DIR/borrowck-borrow-from-owned-ptr.rs:93:17 | LL | let bar1 = &foo.bar1.int1; | -------------- immutable borrow occurs here @@ -104,7 +104,7 @@ LL | *bar1; | ----- borrow later used here error[E0502]: cannot borrow `*foo` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-borrow-from-owned-ptr.rs:111:17 + --> $DIR/borrowck-borrow-from-owned-ptr.rs:100:17 | LL | let bar1 = &foo.bar1.int1; | -------------- immutable borrow occurs here @@ -114,7 +114,7 @@ LL | *bar1; | ----- borrow later used here error[E0596]: cannot borrow `foo.bar1` as mutable, as `foo` is not declared as mutable - --> $DIR/borrowck-borrow-from-owned-ptr.rs:132:16 + --> $DIR/borrowck-borrow-from-owned-ptr.rs:121:16 | LL | let foo = make_foo(); | --- help: consider changing this to be mutable: `mut foo` diff --git a/src/test/ui/borrowck/borrowck-borrow-from-owned-ptr.rs b/src/test/ui/borrowck/borrowck-borrow-from-owned-ptr.rs index e5091a92581b4..1435837bf3bae 100644 --- a/src/test/ui/borrowck/borrowck-borrow-from-owned-ptr.rs +++ b/src/test/ui/borrowck/borrowck-borrow-from-owned-ptr.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #[derive(Copy, Clone)] struct Foo { bar1: Bar, diff --git a/src/test/ui/borrowck/borrowck-borrow-from-owned-ptr.stderr b/src/test/ui/borrowck/borrowck-borrow-from-owned-ptr.stderr index 9fc030f604c11..d5bf3e080f66a 100644 --- a/src/test/ui/borrowck/borrowck-borrow-from-owned-ptr.stderr +++ b/src/test/ui/borrowck/borrowck-borrow-from-owned-ptr.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `foo.bar1` as mutable more than once at a time - --> $DIR/borrowck-borrow-from-owned-ptr.rs:29:22 + --> $DIR/borrowck-borrow-from-owned-ptr.rs:18:22 | LL | let bar1 = &mut foo.bar1; | -------- first mutable borrow occurs here @@ -10,7 +10,7 @@ LL | } | - first borrow ends here error[E0502]: cannot borrow `foo.bar1` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-borrow-from-owned-ptr.rs:36:18 + --> $DIR/borrowck-borrow-from-owned-ptr.rs:25:18 | LL | let bar1 = &mut foo.bar1; | -------- mutable borrow occurs here @@ -21,7 +21,7 @@ LL | } | - mutable borrow ends here error[E0502]: cannot borrow `foo.bar1` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-borrow-from-owned-ptr.rs:43:22 + --> $DIR/borrowck-borrow-from-owned-ptr.rs:32:22 | LL | let bar1 = &foo.bar1; | -------- immutable borrow occurs here @@ -32,7 +32,7 @@ LL | } | - immutable borrow ends here error[E0499]: cannot borrow `foo` (via `foo.bar2`) as mutable more than once at a time - --> $DIR/borrowck-borrow-from-owned-ptr.rs:57:22 + --> $DIR/borrowck-borrow-from-owned-ptr.rs:46:22 | LL | let bar1 = &mut foo.bar1; | -------- first mutable borrow occurs here (via `foo.bar1`) @@ -43,7 +43,7 @@ LL | } | - first borrow ends here error[E0499]: cannot borrow `foo` (via `foo.bar2`) as mutable more than once at a time - --> $DIR/borrowck-borrow-from-owned-ptr.rs:64:42 + --> $DIR/borrowck-borrow-from-owned-ptr.rs:53:42 | LL | Foo { bar1: ref mut _bar1, bar2: ref mut _bar2 } => {} | ------------- ^^^^^^^^^^^^^ second mutable borrow occurs here (via `foo.bar2`) @@ -54,7 +54,7 @@ LL | } | - first borrow ends here error[E0499]: cannot borrow `foo.bar1` as mutable more than once at a time - --> $DIR/borrowck-borrow-from-owned-ptr.rs:73:21 + --> $DIR/borrowck-borrow-from-owned-ptr.rs:62:21 | LL | let bar1 = &mut foo.bar1; | -------- first mutable borrow occurs here @@ -66,7 +66,7 @@ LL | } | - first borrow ends here error[E0502]: cannot borrow `foo.bar1` as immutable because `foo.bar1.int1` is also borrowed as mutable - --> $DIR/borrowck-borrow-from-owned-ptr.rs:82:18 + --> $DIR/borrowck-borrow-from-owned-ptr.rs:71:18 | LL | let bar1 = &mut foo.bar1.int1; | ------------- mutable borrow occurs here @@ -77,7 +77,7 @@ LL | } | - mutable borrow ends here error[E0502]: cannot borrow `*foo` as immutable because `foo.bar1.int1` is also borrowed as mutable - --> $DIR/borrowck-borrow-from-owned-ptr.rs:83:18 + --> $DIR/borrowck-borrow-from-owned-ptr.rs:72:18 | LL | let bar1 = &mut foo.bar1.int1; | ------------- mutable borrow occurs here @@ -89,7 +89,7 @@ LL | } | - mutable borrow ends here error[E0499]: cannot borrow `foo.bar1` as mutable more than once at a time - --> $DIR/borrowck-borrow-from-owned-ptr.rs:90:22 + --> $DIR/borrowck-borrow-from-owned-ptr.rs:79:22 | LL | let bar1 = &mut foo.bar1.int1; | ------------- first mutable borrow occurs here @@ -100,7 +100,7 @@ LL | } | - first borrow ends here error[E0499]: cannot borrow `*foo` as mutable more than once at a time - --> $DIR/borrowck-borrow-from-owned-ptr.rs:97:22 + --> $DIR/borrowck-borrow-from-owned-ptr.rs:86:22 | LL | let bar1 = &mut foo.bar1.int1; | ------------- first mutable borrow occurs here @@ -111,7 +111,7 @@ LL | } | - first borrow ends here error[E0502]: cannot borrow `foo.bar1` as mutable because `foo.bar1.int1` is also borrowed as immutable - --> $DIR/borrowck-borrow-from-owned-ptr.rs:104:22 + --> $DIR/borrowck-borrow-from-owned-ptr.rs:93:22 | LL | let bar1 = &foo.bar1.int1; | ------------- immutable borrow occurs here @@ -122,7 +122,7 @@ LL | } | - immutable borrow ends here error[E0502]: cannot borrow `*foo` as mutable because `foo.bar1.int1` is also borrowed as immutable - --> $DIR/borrowck-borrow-from-owned-ptr.rs:111:22 + --> $DIR/borrowck-borrow-from-owned-ptr.rs:100:22 | LL | let bar1 = &foo.bar1.int1; | ------------- immutable borrow occurs here @@ -133,7 +133,7 @@ LL | } | - immutable borrow ends here error[E0502]: cannot borrow `foo` (via `foo.bar2`) as immutable because `foo` is also borrowed as mutable (via `foo.bar1`) - --> $DIR/borrowck-borrow-from-owned-ptr.rs:126:18 + --> $DIR/borrowck-borrow-from-owned-ptr.rs:115:18 | LL | let bar1 = &mut foo.bar1; | -------- mutable borrow occurs here (via `foo.bar1`) @@ -144,7 +144,7 @@ LL | } | - mutable borrow ends here error[E0596]: cannot borrow field `foo.bar1` of immutable binding as mutable - --> $DIR/borrowck-borrow-from-owned-ptr.rs:132:21 + --> $DIR/borrowck-borrow-from-owned-ptr.rs:121:21 | LL | let foo = make_foo(); | --- consider changing this to `mut foo` @@ -152,7 +152,7 @@ LL | let bar1 = &mut foo.bar1; //~ ERROR cannot borrow | ^^^^^^^^ cannot mutably borrow field of immutable binding error[E0499]: cannot borrow `foo` (via `foo.bar2.int2`) as mutable more than once at a time - --> $DIR/borrowck-borrow-from-owned-ptr.rs:139:21 + --> $DIR/borrowck-borrow-from-owned-ptr.rs:128:21 | LL | let bar1 = &mut foo.bar1.int1; | ------------- first mutable borrow occurs here (via `foo.bar1.int1`) diff --git a/src/test/ui/borrowck/borrowck-borrow-from-stack-variable.nll.stderr b/src/test/ui/borrowck/borrowck-borrow-from-stack-variable.nll.stderr index 8d1b9ca672ac9..eacf1c8e8309d 100644 --- a/src/test/ui/borrowck/borrowck-borrow-from-stack-variable.nll.stderr +++ b/src/test/ui/borrowck/borrowck-borrow-from-stack-variable.nll.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `foo.bar1` as mutable more than once at a time - --> $DIR/borrowck-borrow-from-stack-variable.rs:28:17 + --> $DIR/borrowck-borrow-from-stack-variable.rs:18:17 | LL | let bar1 = &mut foo.bar1; | ------------- first mutable borrow occurs here @@ -9,7 +9,7 @@ LL | *bar1; | ----- borrow later used here error[E0502]: cannot borrow `foo.bar1` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-borrow-from-stack-variable.rs:35:17 + --> $DIR/borrowck-borrow-from-stack-variable.rs:25:17 | LL | let bar1 = &mut foo.bar1; | ------------- mutable borrow occurs here @@ -19,7 +19,7 @@ LL | *bar1; | ----- borrow later used here error[E0502]: cannot borrow `foo.bar1` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-borrow-from-stack-variable.rs:42:17 + --> $DIR/borrowck-borrow-from-stack-variable.rs:32:17 | LL | let bar1 = &foo.bar1; | --------- immutable borrow occurs here @@ -29,7 +29,7 @@ LL | *bar1; | ----- borrow later used here error[E0502]: cannot borrow `foo` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-borrow-from-stack-variable.rs:70:11 + --> $DIR/borrowck-borrow-from-stack-variable.rs:60:11 | LL | let bar1 = &mut foo.bar1; | ------------- mutable borrow occurs here @@ -40,7 +40,7 @@ LL | *bar1; | ----- borrow later used here error[E0499]: cannot borrow `foo.bar1` as mutable more than once at a time - --> $DIR/borrowck-borrow-from-stack-variable.rs:71:21 + --> $DIR/borrowck-borrow-from-stack-variable.rs:61:21 | LL | let bar1 = &mut foo.bar1; | ------------- first mutable borrow occurs here @@ -52,7 +52,7 @@ LL | *bar1; | ----- borrow later used here error[E0502]: cannot borrow `foo.bar1` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-borrow-from-stack-variable.rs:80:17 + --> $DIR/borrowck-borrow-from-stack-variable.rs:70:17 | LL | let bar1 = &mut foo.bar1.int1; | ------------------ mutable borrow occurs here @@ -63,7 +63,7 @@ LL | *bar1; | ----- borrow later used here error[E0502]: cannot borrow `foo` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-borrow-from-stack-variable.rs:81:17 + --> $DIR/borrowck-borrow-from-stack-variable.rs:71:17 | LL | let bar1 = &mut foo.bar1.int1; | ------------------ mutable borrow occurs here @@ -74,7 +74,7 @@ LL | *bar1; | ----- borrow later used here error[E0499]: cannot borrow `foo.bar1` as mutable more than once at a time - --> $DIR/borrowck-borrow-from-stack-variable.rs:88:17 + --> $DIR/borrowck-borrow-from-stack-variable.rs:78:17 | LL | let bar1 = &mut foo.bar1.int1; | ------------------ first mutable borrow occurs here @@ -84,7 +84,7 @@ LL | *bar1; | ----- borrow later used here error[E0499]: cannot borrow `foo` as mutable more than once at a time - --> $DIR/borrowck-borrow-from-stack-variable.rs:95:17 + --> $DIR/borrowck-borrow-from-stack-variable.rs:85:17 | LL | let bar1 = &mut foo.bar1.int1; | ------------------ first mutable borrow occurs here @@ -94,7 +94,7 @@ LL | *bar1; | ----- borrow later used here error[E0502]: cannot borrow `foo.bar1` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-borrow-from-stack-variable.rs:102:17 + --> $DIR/borrowck-borrow-from-stack-variable.rs:92:17 | LL | let bar1 = &foo.bar1.int1; | -------------- immutable borrow occurs here @@ -104,7 +104,7 @@ LL | *bar1; | ----- borrow later used here error[E0502]: cannot borrow `foo` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-borrow-from-stack-variable.rs:109:17 + --> $DIR/borrowck-borrow-from-stack-variable.rs:99:17 | LL | let bar1 = &foo.bar1.int1; | -------------- immutable borrow occurs here @@ -114,7 +114,7 @@ LL | *bar1; | ----- borrow later used here error[E0596]: cannot borrow `foo.bar1` as mutable, as `foo` is not declared as mutable - --> $DIR/borrowck-borrow-from-stack-variable.rs:130:16 + --> $DIR/borrowck-borrow-from-stack-variable.rs:120:16 | LL | let foo = make_foo(); | --- help: consider changing this to be mutable: `mut foo` diff --git a/src/test/ui/borrowck/borrowck-borrow-from-stack-variable.rs b/src/test/ui/borrowck/borrowck-borrow-from-stack-variable.rs index 440be93dfdca1..231f6beab85d6 100644 --- a/src/test/ui/borrowck/borrowck-borrow-from-stack-variable.rs +++ b/src/test/ui/borrowck/borrowck-borrow-from-stack-variable.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Copy, Clone)] struct Foo { bar1: Bar, diff --git a/src/test/ui/borrowck/borrowck-borrow-from-stack-variable.stderr b/src/test/ui/borrowck/borrowck-borrow-from-stack-variable.stderr index cd0d6aa4ca379..8a3a9710dcce6 100644 --- a/src/test/ui/borrowck/borrowck-borrow-from-stack-variable.stderr +++ b/src/test/ui/borrowck/borrowck-borrow-from-stack-variable.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `foo.bar1` as mutable more than once at a time - --> $DIR/borrowck-borrow-from-stack-variable.rs:28:22 + --> $DIR/borrowck-borrow-from-stack-variable.rs:18:22 | LL | let bar1 = &mut foo.bar1; | -------- first mutable borrow occurs here @@ -10,7 +10,7 @@ LL | } | - first borrow ends here error[E0502]: cannot borrow `foo.bar1` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-borrow-from-stack-variable.rs:35:18 + --> $DIR/borrowck-borrow-from-stack-variable.rs:25:18 | LL | let bar1 = &mut foo.bar1; | -------- mutable borrow occurs here @@ -21,7 +21,7 @@ LL | } | - mutable borrow ends here error[E0502]: cannot borrow `foo.bar1` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-borrow-from-stack-variable.rs:42:22 + --> $DIR/borrowck-borrow-from-stack-variable.rs:32:22 | LL | let bar1 = &foo.bar1; | -------- immutable borrow occurs here @@ -32,7 +32,7 @@ LL | } | - immutable borrow ends here error[E0499]: cannot borrow `foo.bar1` as mutable more than once at a time - --> $DIR/borrowck-borrow-from-stack-variable.rs:71:21 + --> $DIR/borrowck-borrow-from-stack-variable.rs:61:21 | LL | let bar1 = &mut foo.bar1; | -------- first mutable borrow occurs here @@ -44,7 +44,7 @@ LL | } | - first borrow ends here error[E0502]: cannot borrow `foo.bar1` as immutable because `foo.bar1.int1` is also borrowed as mutable - --> $DIR/borrowck-borrow-from-stack-variable.rs:80:18 + --> $DIR/borrowck-borrow-from-stack-variable.rs:70:18 | LL | let bar1 = &mut foo.bar1.int1; | ------------- mutable borrow occurs here @@ -55,7 +55,7 @@ LL | } | - mutable borrow ends here error[E0502]: cannot borrow `foo` as immutable because `foo.bar1.int1` is also borrowed as mutable - --> $DIR/borrowck-borrow-from-stack-variable.rs:81:18 + --> $DIR/borrowck-borrow-from-stack-variable.rs:71:18 | LL | let bar1 = &mut foo.bar1.int1; | ------------- mutable borrow occurs here @@ -67,7 +67,7 @@ LL | } | - mutable borrow ends here error[E0499]: cannot borrow `foo.bar1` as mutable more than once at a time - --> $DIR/borrowck-borrow-from-stack-variable.rs:88:22 + --> $DIR/borrowck-borrow-from-stack-variable.rs:78:22 | LL | let bar1 = &mut foo.bar1.int1; | ------------- first mutable borrow occurs here @@ -78,7 +78,7 @@ LL | } | - first borrow ends here error[E0499]: cannot borrow `foo` as mutable more than once at a time - --> $DIR/borrowck-borrow-from-stack-variable.rs:95:22 + --> $DIR/borrowck-borrow-from-stack-variable.rs:85:22 | LL | let bar1 = &mut foo.bar1.int1; | ------------- first mutable borrow occurs here @@ -89,7 +89,7 @@ LL | } | - first borrow ends here error[E0502]: cannot borrow `foo.bar1` as mutable because `foo.bar1.int1` is also borrowed as immutable - --> $DIR/borrowck-borrow-from-stack-variable.rs:102:22 + --> $DIR/borrowck-borrow-from-stack-variable.rs:92:22 | LL | let bar1 = &foo.bar1.int1; | ------------- immutable borrow occurs here @@ -100,7 +100,7 @@ LL | } | - immutable borrow ends here error[E0502]: cannot borrow `foo` as mutable because `foo.bar1.int1` is also borrowed as immutable - --> $DIR/borrowck-borrow-from-stack-variable.rs:109:22 + --> $DIR/borrowck-borrow-from-stack-variable.rs:99:22 | LL | let bar1 = &foo.bar1.int1; | ------------- immutable borrow occurs here @@ -111,7 +111,7 @@ LL | } | - immutable borrow ends here error[E0596]: cannot borrow field `foo.bar1` of immutable binding as mutable - --> $DIR/borrowck-borrow-from-stack-variable.rs:130:21 + --> $DIR/borrowck-borrow-from-stack-variable.rs:120:21 | LL | let foo = make_foo(); | --- consider changing this to `mut foo` diff --git a/src/test/ui/borrowck/borrowck-borrow-from-temporary.rs b/src/test/ui/borrowck/borrowck-borrow-from-temporary.rs index f7514df800d99..e7ca1a90f8c93 100644 --- a/src/test/ui/borrowck/borrowck-borrow-from-temporary.rs +++ b/src/test/ui/borrowck/borrowck-borrow-from-temporary.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test lifetimes are linked properly when we take reference // to interior. diff --git a/src/test/ui/borrowck/borrowck-borrow-from-temporary.stderr b/src/test/ui/borrowck/borrowck-borrow-from-temporary.stderr index 7dcfb3e3c87dd..0726e3d5d5e60 100644 --- a/src/test/ui/borrowck/borrowck-borrow-from-temporary.stderr +++ b/src/test/ui/borrowck/borrowck-borrow-from-temporary.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/borrowck-borrow-from-temporary.rs:19:24 + --> $DIR/borrowck-borrow-from-temporary.rs:9:24 | LL | let &Foo(ref x) = &id(Foo(3)); //~ ERROR borrowed value does not live long enough | ^^^^^^^^^^ temporary value does not live long enough @@ -7,8 +7,8 @@ LL | x LL | } | - temporary value only lives until here | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 18:8... - --> $DIR/borrowck-borrow-from-temporary.rs:18:8 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 8:8... + --> $DIR/borrowck-borrow-from-temporary.rs:8:8 | LL | fn foo<'a>() -> &'a isize { | ^^ diff --git a/src/test/ui/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.nll.stderr b/src/test/ui/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.nll.stderr index c2b7d790eeac0..7d7e305a31f31 100644 --- a/src/test/ui/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.nll.stderr +++ b/src/test/ui/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `*a` as mutable, as `a` is not declared as mutable - --> $DIR/borrowck-borrow-immut-deref-of-box-as-mut.rs:22:5 + --> $DIR/borrowck-borrow-immut-deref-of-box-as-mut.rs:12:5 | LL | let a: Box<_> = box A; | - help: consider changing this to be mutable: `mut a` diff --git a/src/test/ui/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.rs b/src/test/ui/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.rs index 3662e23a4122f..8d528182c0d35 100644 --- a/src/test/ui/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.rs +++ b/src/test/ui/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] struct A; diff --git a/src/test/ui/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.stderr b/src/test/ui/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.stderr index d852125a775d1..b4e3632509437 100644 --- a/src/test/ui/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.stderr +++ b/src/test/ui/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow immutable `Box` content `*a` as mutable - --> $DIR/borrowck-borrow-immut-deref-of-box-as-mut.rs:22:5 + --> $DIR/borrowck-borrow-immut-deref-of-box-as-mut.rs:12:5 | LL | let a: Box<_> = box A; | - consider changing this to `mut a` diff --git a/src/test/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.nll.stderr b/src/test/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.nll.stderr index 8c30e6ac00207..2c66878f7276a 100644 --- a/src/test/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.nll.stderr +++ b/src/test/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.nll.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to `**t1` which is behind a `&` reference - --> $DIR/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs:19:5 + --> $DIR/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs:9:5 | LL | let t1 = t0; | -- help: consider changing this to be a mutable reference: `&mut &mut isize` @@ -8,7 +8,7 @@ LL | **t1 = 22; //~ ERROR cannot assign | ^^^^^^^^^ `t1` is a `&` reference, so the data it refers to cannot be written error[E0502]: cannot borrow `**t0` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs:24:21 + --> $DIR/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs:14:21 | LL | let t1 = &mut *t0; | -------- mutable borrow occurs here @@ -18,7 +18,7 @@ LL | **t1 = 22; | --------- borrow later used here error[E0596]: cannot borrow `**t0` as mutable, as it is behind a `&` reference - --> $DIR/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs:29:26 + --> $DIR/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs:19:26 | LL | fn foo4(t0: & &mut isize) { | ------------ help: consider changing this to be a mutable reference: `&mut &mut isize` diff --git a/src/test/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs b/src/test/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs index d60751eddc7bc..75bf320dd5b1e 100644 --- a/src/test/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs +++ b/src/test/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that attempt to reborrow an `&mut` pointer in an aliasable // location yields an error. // diff --git a/src/test/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.stderr b/src/test/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.stderr index f90ffa8c35a86..ff2969f53480c 100644 --- a/src/test/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.stderr +++ b/src/test/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.stderr @@ -1,11 +1,11 @@ error[E0389]: cannot assign to data in a `&` reference - --> $DIR/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs:19:5 + --> $DIR/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs:9:5 | LL | **t1 = 22; //~ ERROR cannot assign | ^^^^^^^^^ assignment into an immutable reference error[E0502]: cannot borrow `**t0` as immutable because `*t0` is also borrowed as mutable - --> $DIR/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs:24:22 + --> $DIR/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs:14:22 | LL | let t1 = &mut *t0; | --- mutable borrow occurs here @@ -16,7 +16,7 @@ LL | } | - mutable borrow ends here error[E0389]: cannot borrow data mutably in a `&` reference - --> $DIR/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs:29:31 + --> $DIR/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs:19:31 | LL | fn foo4(t0: & &mut isize) { | ------------ use `&mut &mut isize` here to make mutable diff --git a/src/test/ui/borrowck/borrowck-borrow-mut-object-twice.nll.stderr b/src/test/ui/borrowck/borrowck-borrow-mut-object-twice.nll.stderr index 9c3d0b170d90e..ec84cfa019b60 100644 --- a/src/test/ui/borrowck/borrowck-borrow-mut-object-twice.nll.stderr +++ b/src/test/ui/borrowck/borrowck-borrow-mut-object-twice.nll.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `*x` as mutable more than once at a time - --> $DIR/borrowck-borrow-mut-object-twice.rs:23:5 + --> $DIR/borrowck-borrow-mut-object-twice.rs:13:5 | LL | let y = x.f1(); | - first mutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-borrow-mut-object-twice.rs b/src/test/ui/borrowck/borrowck-borrow-mut-object-twice.rs index 63a64631f44a0..5e853afd38c87 100644 --- a/src/test/ui/borrowck/borrowck-borrow-mut-object-twice.rs +++ b/src/test/ui/borrowck/borrowck-borrow-mut-object-twice.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that `&mut` objects cannot be borrowed twice, just like // other `&mut` pointers. diff --git a/src/test/ui/borrowck/borrowck-borrow-mut-object-twice.stderr b/src/test/ui/borrowck/borrowck-borrow-mut-object-twice.stderr index de2fa8db96f64..abfce9857f7c1 100644 --- a/src/test/ui/borrowck/borrowck-borrow-mut-object-twice.stderr +++ b/src/test/ui/borrowck/borrowck-borrow-mut-object-twice.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `*x` as mutable more than once at a time - --> $DIR/borrowck-borrow-mut-object-twice.rs:23:5 + --> $DIR/borrowck-borrow-mut-object-twice.rs:13:5 | LL | let y = x.f1(); | - first mutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-borrow-overloaded-auto-deref.nll.stderr b/src/test/ui/borrowck/borrowck-borrow-overloaded-auto-deref.nll.stderr index 522cdfd94d7c0..ecb013b7a1603 100644 --- a/src/test/ui/borrowck/borrowck-borrow-overloaded-auto-deref.nll.stderr +++ b/src/test/ui/borrowck/borrowck-borrow-overloaded-auto-deref.nll.stderr @@ -1,83 +1,83 @@ error[E0596]: cannot borrow data in a `&` reference as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:57:19 + --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:47:19 | LL | let __isize = &mut x.y; //~ ERROR cannot borrow | ^^^^^^^^ cannot borrow as mutable error[E0596]: cannot borrow data in a `&` reference as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:61:19 + --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:51:19 | LL | let __isize = &mut x.y; //~ ERROR cannot borrow | ^^^^^^^^ cannot borrow as mutable error[E0596]: cannot borrow data in a `&` reference as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:69:5 + --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:59:5 | LL | &mut x.y //~ ERROR cannot borrow | ^^^^^^^^ cannot borrow as mutable error[E0596]: cannot borrow data in a `&` reference as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:73:5 + --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:63:5 | LL | &mut x.y //~ ERROR cannot borrow | ^^^^^^^^ cannot borrow as mutable error[E0594]: cannot assign to data in a `&` reference - --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:77:5 + --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:67:5 | LL | x.y = 3; //~ ERROR cannot assign | ^^^^^^^ cannot assign error[E0594]: cannot assign to data in a `&` reference - --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:81:5 + --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:71:5 | LL | x.y = 3; //~ ERROR cannot assign | ^^^^^^^ cannot assign error[E0594]: cannot assign to data in a `&` reference - --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:85:5 + --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:75:5 | LL | x.y = 3; //~ ERROR cannot assign | ^^^^^^^ cannot assign error[E0596]: cannot borrow data in a `&` reference as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:93:5 + --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:83:5 | LL | x.set(0, 0); //~ ERROR cannot borrow | ^ cannot borrow as mutable error[E0596]: cannot borrow data in a `&` reference as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:97:5 + --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:87:5 | LL | x.set(0, 0); //~ ERROR cannot borrow | ^ cannot borrow as mutable error[E0596]: cannot borrow data in a `&` reference as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:105:5 + --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:95:5 | LL | x.y_mut() //~ ERROR cannot borrow | ^ cannot borrow as mutable error[E0596]: cannot borrow data in a `&` reference as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:109:5 + --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:99:5 | LL | x.y_mut() //~ ERROR cannot borrow | ^ cannot borrow as mutable error[E0596]: cannot borrow data in a `&` reference as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:113:6 + --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:103:6 | LL | *x.y_mut() = 3; //~ ERROR cannot borrow | ^ cannot borrow as mutable error[E0596]: cannot borrow data in a `&` reference as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:117:6 + --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:107:6 | LL | *x.y_mut() = 3; //~ ERROR cannot borrow | ^ cannot borrow as mutable error[E0596]: cannot borrow data in a `&` reference as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:121:6 + --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:111:6 | LL | *x.y_mut() = 3; //~ ERROR cannot borrow | ^ cannot borrow as mutable diff --git a/src/test/ui/borrowck/borrowck-borrow-overloaded-auto-deref.rs b/src/test/ui/borrowck/borrowck-borrow-overloaded-auto-deref.rs index 693ed29bd0506..01dc0af855052 100644 --- a/src/test/ui/borrowck/borrowck-borrow-overloaded-auto-deref.rs +++ b/src/test/ui/borrowck/borrowck-borrow-overloaded-auto-deref.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test how overloaded deref interacts with borrows when only // Deref and not DerefMut is implemented. diff --git a/src/test/ui/borrowck/borrowck-borrow-overloaded-auto-deref.stderr b/src/test/ui/borrowck/borrowck-borrow-overloaded-auto-deref.stderr index 31563fbaa1c98..c6f9c655a11dc 100644 --- a/src/test/ui/borrowck/borrowck-borrow-overloaded-auto-deref.stderr +++ b/src/test/ui/borrowck/borrowck-borrow-overloaded-auto-deref.stderr @@ -1,83 +1,83 @@ error[E0596]: cannot borrow field of immutable binding as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:57:24 + --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:47:24 | LL | let __isize = &mut x.y; //~ ERROR cannot borrow | ^^^ cannot mutably borrow field of immutable binding error[E0596]: cannot borrow field of immutable binding as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:61:24 + --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:51:24 | LL | let __isize = &mut x.y; //~ ERROR cannot borrow | ^^^ cannot mutably borrow field of immutable binding error[E0596]: cannot borrow field of immutable binding as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:69:10 + --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:59:10 | LL | &mut x.y //~ ERROR cannot borrow | ^^^ cannot mutably borrow field of immutable binding error[E0596]: cannot borrow field of immutable binding as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:73:10 + --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:63:10 | LL | &mut x.y //~ ERROR cannot borrow | ^^^ cannot mutably borrow field of immutable binding error[E0594]: cannot assign to field of immutable binding - --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:77:5 + --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:67:5 | LL | x.y = 3; //~ ERROR cannot assign | ^^^^^^^ cannot mutably borrow field of immutable binding error[E0594]: cannot assign to field of immutable binding - --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:81:5 + --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:71:5 | LL | x.y = 3; //~ ERROR cannot assign | ^^^^^^^ cannot mutably borrow field of immutable binding error[E0594]: cannot assign to field of immutable binding - --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:85:5 + --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:75:5 | LL | x.y = 3; //~ ERROR cannot assign | ^^^^^^^ cannot mutably borrow field of immutable binding error[E0596]: cannot borrow immutable borrowed content as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:93:5 + --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:83:5 | LL | x.set(0, 0); //~ ERROR cannot borrow | ^ cannot borrow as mutable error[E0596]: cannot borrow immutable borrowed content as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:97:5 + --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:87:5 | LL | x.set(0, 0); //~ ERROR cannot borrow | ^ cannot borrow as mutable error[E0596]: cannot borrow immutable borrowed content as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:105:5 + --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:95:5 | LL | x.y_mut() //~ ERROR cannot borrow | ^ cannot borrow as mutable error[E0596]: cannot borrow immutable borrowed content as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:109:5 + --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:99:5 | LL | x.y_mut() //~ ERROR cannot borrow | ^ cannot borrow as mutable error[E0596]: cannot borrow immutable borrowed content as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:113:6 + --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:103:6 | LL | *x.y_mut() = 3; //~ ERROR cannot borrow | ^ cannot borrow as mutable error[E0596]: cannot borrow immutable borrowed content as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:117:6 + --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:107:6 | LL | *x.y_mut() = 3; //~ ERROR cannot borrow | ^ cannot borrow as mutable error[E0596]: cannot borrow immutable borrowed content as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:121:6 + --> $DIR/borrowck-borrow-overloaded-auto-deref.rs:111:6 | LL | *x.y_mut() = 3; //~ ERROR cannot borrow | ^ cannot borrow as mutable diff --git a/src/test/ui/borrowck/borrowck-borrow-overloaded-deref.nll.stderr b/src/test/ui/borrowck/borrowck-borrow-overloaded-deref.nll.stderr index 1e8d81fe76e97..1c3131806be2d 100644 --- a/src/test/ui/borrowck/borrowck-borrow-overloaded-deref.nll.stderr +++ b/src/test/ui/borrowck/borrowck-borrow-overloaded-deref.nll.stderr @@ -1,41 +1,41 @@ error[E0596]: cannot borrow data in a `&` reference as mutable - --> $DIR/borrowck-borrow-overloaded-deref.rs:33:19 + --> $DIR/borrowck-borrow-overloaded-deref.rs:23:19 | LL | let __isize = &mut *x; //~ ERROR cannot borrow | ^^^^^^^ cannot borrow as mutable error[E0596]: cannot borrow data in a `&` reference as mutable - --> $DIR/borrowck-borrow-overloaded-deref.rs:37:19 + --> $DIR/borrowck-borrow-overloaded-deref.rs:27:19 | LL | let __isize = &mut *x; //~ ERROR cannot borrow | ^^^^^^^ cannot borrow as mutable error[E0596]: cannot borrow data in a `&` reference as mutable - --> $DIR/borrowck-borrow-overloaded-deref.rs:45:5 + --> $DIR/borrowck-borrow-overloaded-deref.rs:35:5 | LL | &mut **x //~ ERROR cannot borrow | ^^^^^^^^ cannot borrow as mutable error[E0596]: cannot borrow data in a `&` reference as mutable - --> $DIR/borrowck-borrow-overloaded-deref.rs:49:5 + --> $DIR/borrowck-borrow-overloaded-deref.rs:39:5 | LL | &mut **x //~ ERROR cannot borrow | ^^^^^^^^ cannot borrow as mutable error[E0594]: cannot assign to data in a `&` reference - --> $DIR/borrowck-borrow-overloaded-deref.rs:53:5 + --> $DIR/borrowck-borrow-overloaded-deref.rs:43:5 | LL | *x = 3; //~ ERROR cannot assign | ^^^^^^ cannot assign error[E0594]: cannot assign to data in a `&` reference - --> $DIR/borrowck-borrow-overloaded-deref.rs:57:5 + --> $DIR/borrowck-borrow-overloaded-deref.rs:47:5 | LL | **x = 3; //~ ERROR cannot assign | ^^^^^^^ cannot assign error[E0594]: cannot assign to data in a `&` reference - --> $DIR/borrowck-borrow-overloaded-deref.rs:61:5 + --> $DIR/borrowck-borrow-overloaded-deref.rs:51:5 | LL | **x = 3; //~ ERROR cannot assign | ^^^^^^^ cannot assign diff --git a/src/test/ui/borrowck/borrowck-borrow-overloaded-deref.rs b/src/test/ui/borrowck/borrowck-borrow-overloaded-deref.rs index 5b916243b9ee5..39fa70c4e59ef 100644 --- a/src/test/ui/borrowck/borrowck-borrow-overloaded-deref.rs +++ b/src/test/ui/borrowck/borrowck-borrow-overloaded-deref.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test how overloaded deref interacts with borrows when only // Deref and not DerefMut is implemented. diff --git a/src/test/ui/borrowck/borrowck-borrow-overloaded-deref.stderr b/src/test/ui/borrowck/borrowck-borrow-overloaded-deref.stderr index 641f943b6ce48..41e7cc210c8f5 100644 --- a/src/test/ui/borrowck/borrowck-borrow-overloaded-deref.stderr +++ b/src/test/ui/borrowck/borrowck-borrow-overloaded-deref.stderr @@ -1,41 +1,41 @@ error[E0596]: cannot borrow immutable borrowed content as mutable - --> $DIR/borrowck-borrow-overloaded-deref.rs:33:24 + --> $DIR/borrowck-borrow-overloaded-deref.rs:23:24 | LL | let __isize = &mut *x; //~ ERROR cannot borrow | ^^ cannot borrow as mutable error[E0596]: cannot borrow immutable borrowed content as mutable - --> $DIR/borrowck-borrow-overloaded-deref.rs:37:24 + --> $DIR/borrowck-borrow-overloaded-deref.rs:27:24 | LL | let __isize = &mut *x; //~ ERROR cannot borrow | ^^ cannot borrow as mutable error[E0596]: cannot borrow immutable borrowed content as mutable - --> $DIR/borrowck-borrow-overloaded-deref.rs:45:10 + --> $DIR/borrowck-borrow-overloaded-deref.rs:35:10 | LL | &mut **x //~ ERROR cannot borrow | ^^^ cannot borrow as mutable error[E0596]: cannot borrow immutable borrowed content as mutable - --> $DIR/borrowck-borrow-overloaded-deref.rs:49:10 + --> $DIR/borrowck-borrow-overloaded-deref.rs:39:10 | LL | &mut **x //~ ERROR cannot borrow | ^^^ cannot borrow as mutable error[E0594]: cannot assign to immutable borrowed content - --> $DIR/borrowck-borrow-overloaded-deref.rs:53:5 + --> $DIR/borrowck-borrow-overloaded-deref.rs:43:5 | LL | *x = 3; //~ ERROR cannot assign | ^^^^^^ cannot borrow as mutable error[E0594]: cannot assign to immutable borrowed content - --> $DIR/borrowck-borrow-overloaded-deref.rs:57:5 + --> $DIR/borrowck-borrow-overloaded-deref.rs:47:5 | LL | **x = 3; //~ ERROR cannot assign | ^^^^^^^ cannot borrow as mutable error[E0594]: cannot assign to immutable borrowed content - --> $DIR/borrowck-borrow-overloaded-deref.rs:61:5 + --> $DIR/borrowck-borrow-overloaded-deref.rs:51:5 | LL | **x = 3; //~ ERROR cannot assign | ^^^^^^^ cannot borrow as mutable diff --git a/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue-2.nll.stderr b/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue-2.nll.stderr index 8f42fb4562721..175f950fd4d46 100644 --- a/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue-2.nll.stderr +++ b/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue-2.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/borrowck-borrowed-uniq-rvalue-2.rs:32:20 + --> $DIR/borrowck-borrowed-uniq-rvalue-2.rs:22:20 | LL | let x = defer(&vec!["Goodbye", "world!"]); | ^^^^^^^^^^^^^^^^^^^^^^^^^ - temporary value only lives until here diff --git a/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue-2.rs b/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue-2.rs index 9178aadeeebe1..0ad8afb0c3246 100644 --- a/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue-2.rs +++ b/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: borrowed value does not live long enough struct defer<'a> { diff --git a/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue-2.stderr b/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue-2.stderr index 890b2894943dd..c7fba4c139b4a 100644 --- a/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue-2.stderr +++ b/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue-2.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/borrowck-borrowed-uniq-rvalue-2.rs:32:20 + --> $DIR/borrowck-borrowed-uniq-rvalue-2.rs:22:20 | LL | let x = defer(&vec!["Goodbye", "world!"]); | ^^^^^^^^^^^^^^^^^^^^^^^^^ - temporary value dropped here while still borrowed diff --git a/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue.nll.stderr b/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue.nll.stderr index 04f74af41141c..7ff296e3e7449 100644 --- a/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue.nll.stderr +++ b/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/borrowck-borrowed-uniq-rvalue.rs:20:28 + --> $DIR/borrowck-borrowed-uniq-rvalue.rs:10:28 | LL | buggy_map.insert(42, &*Box::new(1)); //~ ERROR borrowed value does not live long enough | ^^^^^^^^^^^ - temporary value only lives until here diff --git a/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue.rs b/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue.rs index f58eca7c8ae39..88bd106d6f35e 100644 --- a/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue.rs +++ b/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //buggy.rs #![feature(box_syntax)] diff --git a/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue.stderr b/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue.stderr index 7defd1ee936a6..bf4674035ead2 100644 --- a/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue.stderr +++ b/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/borrowck-borrowed-uniq-rvalue.rs:20:27 + --> $DIR/borrowck-borrowed-uniq-rvalue.rs:10:27 | LL | buggy_map.insert(42, &*Box::new(1)); //~ ERROR borrowed value does not live long enough | ^^^^^^^^^^^^ - borrowed value dropped here while still borrowed diff --git a/src/test/ui/borrowck/borrowck-box-insensitivity.nll.stderr b/src/test/ui/borrowck/borrowck-box-insensitivity.nll.stderr index 601f05b499c75..955cb533172a4 100644 --- a/src/test/ui/borrowck/borrowck-box-insensitivity.nll.stderr +++ b/src/test/ui/borrowck/borrowck-box-insensitivity.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `a.y` - --> $DIR/borrowck-box-insensitivity.rs:46:14 + --> $DIR/borrowck-box-insensitivity.rs:36:14 | LL | let _x = a.x; | --- value moved here @@ -10,7 +10,7 @@ LL | let _y = a.y; //~ ERROR use of moved = note: move occurs because `a.x` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0382]: use of moved value: `a.y` - --> $DIR/borrowck-box-insensitivity.rs:108:14 + --> $DIR/borrowck-box-insensitivity.rs:98:14 | LL | let _x = a.x.x; | ----- value moved here diff --git a/src/test/ui/borrowck/borrowck-box-insensitivity.rs b/src/test/ui/borrowck/borrowck-box-insensitivity.rs index 75bf6bce04b39..56b5c7aadbd1b 100644 --- a/src/test/ui/borrowck/borrowck-box-insensitivity.rs +++ b/src/test/ui/borrowck/borrowck-box-insensitivity.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] struct A { diff --git a/src/test/ui/borrowck/borrowck-box-insensitivity.stderr b/src/test/ui/borrowck/borrowck-box-insensitivity.stderr index 5bf1fc0817868..9f11346966c7a 100644 --- a/src/test/ui/borrowck/borrowck-box-insensitivity.stderr +++ b/src/test/ui/borrowck/borrowck-box-insensitivity.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `a` - --> $DIR/borrowck-box-insensitivity.rs:37:9 + --> $DIR/borrowck-box-insensitivity.rs:27:9 | LL | let _x = a.x; | -- value moved here @@ -10,7 +10,7 @@ LL | let _y = a.y; //~ ERROR use of moved = note: move occurs because `a.x` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0382]: use of moved value: `a` - --> $DIR/borrowck-box-insensitivity.rs:46:9 + --> $DIR/borrowck-box-insensitivity.rs:36:9 | LL | let _x = a.x; | -- value moved here @@ -21,7 +21,7 @@ LL | let _y = a.y; //~ ERROR use of moved = note: move occurs because `a.x` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0382]: use of moved value: `a` - --> $DIR/borrowck-box-insensitivity.rs:55:15 + --> $DIR/borrowck-box-insensitivity.rs:45:15 | LL | let _x = a.x; | -- value moved here @@ -32,7 +32,7 @@ LL | let _y = &a.y; //~ ERROR use of moved = note: move occurs because `a.x` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0505]: cannot move out of `a.y` because it is borrowed - --> $DIR/borrowck-box-insensitivity.rs:63:9 + --> $DIR/borrowck-box-insensitivity.rs:53:9 | LL | let _x = &a.x; | --- borrow of `a.x` occurs here @@ -40,7 +40,7 @@ LL | let _y = a.y; | ^^ move out of `a.y` occurs here error[E0503]: cannot use `a.y` because it was mutably borrowed - --> $DIR/borrowck-box-insensitivity.rs:71:9 + --> $DIR/borrowck-box-insensitivity.rs:61:9 | LL | let _x = &mut a.x; | --- borrow of `a.x` occurs here @@ -48,7 +48,7 @@ LL | let _y = a.y; //~ ERROR cannot use | ^^ use of borrowed `a.x` error[E0505]: cannot move out of `a.y` because it is borrowed - --> $DIR/borrowck-box-insensitivity.rs:77:9 + --> $DIR/borrowck-box-insensitivity.rs:67:9 | LL | let _x = &mut a.x; | --- borrow of `a.x` occurs here @@ -56,7 +56,7 @@ LL | let _y = a.y; | ^^ move out of `a.y` occurs here error[E0502]: cannot borrow `a` (via `a.y`) as immutable because `a` is also borrowed as mutable (via `a.x`) - --> $DIR/borrowck-box-insensitivity.rs:85:15 + --> $DIR/borrowck-box-insensitivity.rs:75:15 | LL | let _x = &mut a.x; | --- mutable borrow occurs here (via `a.x`) @@ -67,7 +67,7 @@ LL | } | - mutable borrow ends here error[E0502]: cannot borrow `a` (via `a.y`) as mutable because `a` is also borrowed as immutable (via `a.x`) - --> $DIR/borrowck-box-insensitivity.rs:92:19 + --> $DIR/borrowck-box-insensitivity.rs:82:19 | LL | let _x = &a.x; | --- immutable borrow occurs here (via `a.x`) @@ -78,7 +78,7 @@ LL | } | - immutable borrow ends here error[E0382]: use of collaterally moved value: `a.y` - --> $DIR/borrowck-box-insensitivity.rs:100:9 + --> $DIR/borrowck-box-insensitivity.rs:90:9 | LL | let _x = a.x.x; | -- value moved here @@ -89,7 +89,7 @@ LL | let _y = a.y; //~ ERROR use of collaterally moved = note: move occurs because `a.x.x` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0382]: use of collaterally moved value: `a.y` - --> $DIR/borrowck-box-insensitivity.rs:108:9 + --> $DIR/borrowck-box-insensitivity.rs:98:9 | LL | let _x = a.x.x; | -- value moved here @@ -100,7 +100,7 @@ LL | let _y = a.y; //~ ERROR use of collaterally moved = note: move occurs because `a.x.x` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0382]: use of collaterally moved value: `a.y` - --> $DIR/borrowck-box-insensitivity.rs:116:15 + --> $DIR/borrowck-box-insensitivity.rs:106:15 | LL | let _x = a.x.x; | -- value moved here @@ -111,7 +111,7 @@ LL | let _y = &a.y; //~ ERROR use of collaterally moved = note: move occurs because `a.x.x` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0505]: cannot move out of `a.y` because it is borrowed - --> $DIR/borrowck-box-insensitivity.rs:124:9 + --> $DIR/borrowck-box-insensitivity.rs:114:9 | LL | let _x = &a.x.x; | ----- borrow of `a.x.x` occurs here @@ -120,7 +120,7 @@ LL | let _y = a.y; | ^^ move out of `a.y` occurs here error[E0503]: cannot use `a.y` because it was mutably borrowed - --> $DIR/borrowck-box-insensitivity.rs:132:9 + --> $DIR/borrowck-box-insensitivity.rs:122:9 | LL | let _x = &mut a.x.x; | ----- borrow of `a.x.x` occurs here @@ -128,7 +128,7 @@ LL | let _y = a.y; //~ ERROR cannot use | ^^ use of borrowed `a.x.x` error[E0505]: cannot move out of `a.y` because it is borrowed - --> $DIR/borrowck-box-insensitivity.rs:138:9 + --> $DIR/borrowck-box-insensitivity.rs:128:9 | LL | let _x = &mut a.x.x; | ----- borrow of `a.x.x` occurs here @@ -136,7 +136,7 @@ LL | let _y = a.y; | ^^ move out of `a.y` occurs here error[E0502]: cannot borrow `a.y` as immutable because `a.x.x` is also borrowed as mutable - --> $DIR/borrowck-box-insensitivity.rs:147:15 + --> $DIR/borrowck-box-insensitivity.rs:137:15 | LL | let _x = &mut a.x.x; | ----- mutable borrow occurs here @@ -148,7 +148,7 @@ LL | } | - mutable borrow ends here error[E0502]: cannot borrow `a.y` as mutable because `a.x.x` is also borrowed as immutable - --> $DIR/borrowck-box-insensitivity.rs:155:19 + --> $DIR/borrowck-box-insensitivity.rs:145:19 | LL | let _x = &a.x.x; | ----- immutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-break-uninit-2.nll.stderr b/src/test/ui/borrowck/borrowck-break-uninit-2.nll.stderr index 8c961838ca4ee..177a27387728e 100644 --- a/src/test/ui/borrowck/borrowck-break-uninit-2.nll.stderr +++ b/src/test/ui/borrowck/borrowck-break-uninit-2.nll.stderr @@ -1,5 +1,5 @@ error[E0381]: borrow of possibly uninitialized variable: `x` - --> $DIR/borrowck-break-uninit-2.rs:19:20 + --> $DIR/borrowck-break-uninit-2.rs:9:20 | LL | println!("{}", x); //~ ERROR use of possibly uninitialized variable: `x` | ^ use of possibly uninitialized `x` diff --git a/src/test/ui/borrowck/borrowck-break-uninit-2.rs b/src/test/ui/borrowck/borrowck-break-uninit-2.rs index 82a6c92abafcf..95ccb2e1b931c 100644 --- a/src/test/ui/borrowck/borrowck-break-uninit-2.rs +++ b/src/test/ui/borrowck/borrowck-break-uninit-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo() -> isize { let x: isize; diff --git a/src/test/ui/borrowck/borrowck-break-uninit-2.stderr b/src/test/ui/borrowck/borrowck-break-uninit-2.stderr index 4d7d1a0ed2227..e574c0ff8a85b 100644 --- a/src/test/ui/borrowck/borrowck-break-uninit-2.stderr +++ b/src/test/ui/borrowck/borrowck-break-uninit-2.stderr @@ -1,5 +1,5 @@ error[E0381]: use of possibly uninitialized variable: `x` - --> $DIR/borrowck-break-uninit-2.rs:19:20 + --> $DIR/borrowck-break-uninit-2.rs:9:20 | LL | println!("{}", x); //~ ERROR use of possibly uninitialized variable: `x` | ^ use of possibly uninitialized `x` diff --git a/src/test/ui/borrowck/borrowck-break-uninit.nll.stderr b/src/test/ui/borrowck/borrowck-break-uninit.nll.stderr index 4441c727539ea..64d1e629fecdb 100644 --- a/src/test/ui/borrowck/borrowck-break-uninit.nll.stderr +++ b/src/test/ui/borrowck/borrowck-break-uninit.nll.stderr @@ -1,5 +1,5 @@ error[E0381]: borrow of possibly uninitialized variable: `x` - --> $DIR/borrowck-break-uninit.rs:19:20 + --> $DIR/borrowck-break-uninit.rs:9:20 | LL | println!("{}", x); //~ ERROR use of possibly uninitialized variable: `x` | ^ use of possibly uninitialized `x` diff --git a/src/test/ui/borrowck/borrowck-break-uninit.rs b/src/test/ui/borrowck/borrowck-break-uninit.rs index 8a6a036945b78..827637cfb956f 100644 --- a/src/test/ui/borrowck/borrowck-break-uninit.rs +++ b/src/test/ui/borrowck/borrowck-break-uninit.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo() -> isize { let x: isize; diff --git a/src/test/ui/borrowck/borrowck-break-uninit.stderr b/src/test/ui/borrowck/borrowck-break-uninit.stderr index 9d5a21319ab3d..1a853c35d00e0 100644 --- a/src/test/ui/borrowck/borrowck-break-uninit.stderr +++ b/src/test/ui/borrowck/borrowck-break-uninit.stderr @@ -1,5 +1,5 @@ error[E0381]: use of possibly uninitialized variable: `x` - --> $DIR/borrowck-break-uninit.rs:19:20 + --> $DIR/borrowck-break-uninit.rs:9:20 | LL | println!("{}", x); //~ ERROR use of possibly uninitialized variable: `x` | ^ use of possibly uninitialized `x` diff --git a/src/test/ui/borrowck/borrowck-closures-mut-and-imm.ast.nll.stderr b/src/test/ui/borrowck/borrowck-closures-mut-and-imm.ast.nll.stderr index f24d0ed046a57..a13614190f266 100644 --- a/src/test/ui/borrowck/borrowck-closures-mut-and-imm.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-closures-mut-and-imm.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-closures-mut-and-imm.rs:31:14 + --> $DIR/borrowck-closures-mut-and-imm.rs:21:14 | LL | let c1 = || x = 4; | -- - first borrow occurs due to use of `x` in closure @@ -14,7 +14,7 @@ LL | drop(c1); | -- borrow later used here error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-closures-mut-and-imm.rs:39:14 + --> $DIR/borrowck-closures-mut-and-imm.rs:29:14 | LL | let c1 = || set(&mut x); | -- - first borrow occurs due to use of `x` in closure @@ -29,7 +29,7 @@ LL | drop(c1); | -- borrow later used here error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-closures-mut-and-imm.rs:47:14 + --> $DIR/borrowck-closures-mut-and-imm.rs:37:14 | LL | let c1 = || set(&mut x); | -- - first borrow occurs due to use of `x` in closure @@ -44,7 +44,7 @@ LL | drop(c1); | -- borrow later used here error[E0506]: cannot assign to `x` because it is borrowed - --> $DIR/borrowck-closures-mut-and-imm.rs:55:5 + --> $DIR/borrowck-closures-mut-and-imm.rs:45:5 | LL | let c2 = || x * 5; | -- - borrow occurs due to use in closure @@ -57,7 +57,7 @@ LL | drop(c2); | -- borrow later used here error[E0506]: cannot assign to `x` because it is borrowed - --> $DIR/borrowck-closures-mut-and-imm.rs:63:5 + --> $DIR/borrowck-closures-mut-and-imm.rs:53:5 | LL | let c1 = || get(&x); | -- - borrow occurs due to use in closure @@ -70,7 +70,7 @@ LL | drop(c1); | -- borrow later used here error[E0506]: cannot assign to `*x` because it is borrowed - --> $DIR/borrowck-closures-mut-and-imm.rs:71:5 + --> $DIR/borrowck-closures-mut-and-imm.rs:61:5 | LL | let c1 = || get(&*x); | -- - borrow occurs due to use in closure @@ -83,7 +83,7 @@ LL | drop(c1); | -- borrow later used here error[E0506]: cannot assign to `*x.f` because it is borrowed - --> $DIR/borrowck-closures-mut-and-imm.rs:83:5 + --> $DIR/borrowck-closures-mut-and-imm.rs:73:5 | LL | let c1 = || get(&*x.f); | -- - borrow occurs due to use in closure @@ -96,7 +96,7 @@ LL | drop(c1); | -- borrow later used here error[E0502]: cannot borrow `x` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-closures-mut-and-imm.rs:95:14 + --> $DIR/borrowck-closures-mut-and-imm.rs:85:14 | LL | let c1 = || get(&*x.f); | -- - first borrow occurs due to use of `x` in closure diff --git a/src/test/ui/borrowck/borrowck-closures-mut-and-imm.ast.stderr b/src/test/ui/borrowck/borrowck-closures-mut-and-imm.ast.stderr index 628fbbd1901ef..363889c684626 100644 --- a/src/test/ui/borrowck/borrowck-closures-mut-and-imm.ast.stderr +++ b/src/test/ui/borrowck/borrowck-closures-mut-and-imm.ast.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-closures-mut-and-imm.rs:31:14 + --> $DIR/borrowck-closures-mut-and-imm.rs:21:14 | LL | let c1 = || x = 4; | -- - previous borrow occurs due to use of `x` in closure @@ -14,7 +14,7 @@ LL | } | - mutable borrow ends here error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-closures-mut-and-imm.rs:39:14 + --> $DIR/borrowck-closures-mut-and-imm.rs:29:14 | LL | let c1 = || set(&mut x); | -- - previous borrow occurs due to use of `x` in closure @@ -29,7 +29,7 @@ LL | } | - mutable borrow ends here error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-closures-mut-and-imm.rs:47:14 + --> $DIR/borrowck-closures-mut-and-imm.rs:37:14 | LL | let c1 = || set(&mut x); | -- - previous borrow occurs due to use of `x` in closure @@ -44,7 +44,7 @@ LL | } | - mutable borrow ends here error[E0506]: cannot assign to `x` because it is borrowed - --> $DIR/borrowck-closures-mut-and-imm.rs:55:5 + --> $DIR/borrowck-closures-mut-and-imm.rs:45:5 | LL | let c2 = || x * 5; | -- borrow of `x` occurs here @@ -52,7 +52,7 @@ LL | x = 5; //[ast]~ ERROR cannot assign | ^^^^^ assignment to borrowed `x` occurs here error[E0506]: cannot assign to `x` because it is borrowed - --> $DIR/borrowck-closures-mut-and-imm.rs:63:5 + --> $DIR/borrowck-closures-mut-and-imm.rs:53:5 | LL | let c1 = || get(&x); | -- borrow of `x` occurs here @@ -60,7 +60,7 @@ LL | x = 5; //[ast]~ ERROR cannot assign | ^^^^^ assignment to borrowed `x` occurs here error[E0506]: cannot assign to `*x` because it is borrowed - --> $DIR/borrowck-closures-mut-and-imm.rs:71:5 + --> $DIR/borrowck-closures-mut-and-imm.rs:61:5 | LL | let c1 = || get(&*x); | -- borrow of `*x` occurs here @@ -68,7 +68,7 @@ LL | *x = 5; //[ast]~ ERROR cannot assign to `*x` | ^^^^^^ assignment to borrowed `*x` occurs here error[E0506]: cannot assign to `*x.f` because it is borrowed - --> $DIR/borrowck-closures-mut-and-imm.rs:83:5 + --> $DIR/borrowck-closures-mut-and-imm.rs:73:5 | LL | let c1 = || get(&*x.f); | -- borrow of `*x.f` occurs here @@ -76,7 +76,7 @@ LL | *x.f = 5; //[ast]~ ERROR cannot assign to `*x.f` | ^^^^^^^^ assignment to borrowed `*x.f` occurs here error[E0502]: cannot borrow `x` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-closures-mut-and-imm.rs:95:14 + --> $DIR/borrowck-closures-mut-and-imm.rs:85:14 | LL | let c1 = || get(&*x.f); | -- - previous borrow occurs due to use of `x` in closure diff --git a/src/test/ui/borrowck/borrowck-closures-mut-and-imm.mir.stderr b/src/test/ui/borrowck/borrowck-closures-mut-and-imm.mir.stderr index f24d0ed046a57..a13614190f266 100644 --- a/src/test/ui/borrowck/borrowck-closures-mut-and-imm.mir.stderr +++ b/src/test/ui/borrowck/borrowck-closures-mut-and-imm.mir.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-closures-mut-and-imm.rs:31:14 + --> $DIR/borrowck-closures-mut-and-imm.rs:21:14 | LL | let c1 = || x = 4; | -- - first borrow occurs due to use of `x` in closure @@ -14,7 +14,7 @@ LL | drop(c1); | -- borrow later used here error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-closures-mut-and-imm.rs:39:14 + --> $DIR/borrowck-closures-mut-and-imm.rs:29:14 | LL | let c1 = || set(&mut x); | -- - first borrow occurs due to use of `x` in closure @@ -29,7 +29,7 @@ LL | drop(c1); | -- borrow later used here error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-closures-mut-and-imm.rs:47:14 + --> $DIR/borrowck-closures-mut-and-imm.rs:37:14 | LL | let c1 = || set(&mut x); | -- - first borrow occurs due to use of `x` in closure @@ -44,7 +44,7 @@ LL | drop(c1); | -- borrow later used here error[E0506]: cannot assign to `x` because it is borrowed - --> $DIR/borrowck-closures-mut-and-imm.rs:55:5 + --> $DIR/borrowck-closures-mut-and-imm.rs:45:5 | LL | let c2 = || x * 5; | -- - borrow occurs due to use in closure @@ -57,7 +57,7 @@ LL | drop(c2); | -- borrow later used here error[E0506]: cannot assign to `x` because it is borrowed - --> $DIR/borrowck-closures-mut-and-imm.rs:63:5 + --> $DIR/borrowck-closures-mut-and-imm.rs:53:5 | LL | let c1 = || get(&x); | -- - borrow occurs due to use in closure @@ -70,7 +70,7 @@ LL | drop(c1); | -- borrow later used here error[E0506]: cannot assign to `*x` because it is borrowed - --> $DIR/borrowck-closures-mut-and-imm.rs:71:5 + --> $DIR/borrowck-closures-mut-and-imm.rs:61:5 | LL | let c1 = || get(&*x); | -- - borrow occurs due to use in closure @@ -83,7 +83,7 @@ LL | drop(c1); | -- borrow later used here error[E0506]: cannot assign to `*x.f` because it is borrowed - --> $DIR/borrowck-closures-mut-and-imm.rs:83:5 + --> $DIR/borrowck-closures-mut-and-imm.rs:73:5 | LL | let c1 = || get(&*x.f); | -- - borrow occurs due to use in closure @@ -96,7 +96,7 @@ LL | drop(c1); | -- borrow later used here error[E0502]: cannot borrow `x` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-closures-mut-and-imm.rs:95:14 + --> $DIR/borrowck-closures-mut-and-imm.rs:85:14 | LL | let c1 = || get(&*x.f); | -- - first borrow occurs due to use of `x` in closure diff --git a/src/test/ui/borrowck/borrowck-closures-mut-and-imm.rs b/src/test/ui/borrowck/borrowck-closures-mut-and-imm.rs index 9057ba0790712..3a802bcbb3e42 100644 --- a/src/test/ui/borrowck/borrowck-closures-mut-and-imm.rs +++ b/src/test/ui/borrowck/borrowck-closures-mut-and-imm.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that two closures cannot simultaneously have mutable // and immutable access to the variable. Issue #6801. diff --git a/src/test/ui/borrowck/borrowck-closures-mut-of-imm.nll.stderr b/src/test/ui/borrowck/borrowck-closures-mut-of-imm.nll.stderr index e8fae63a5d617..bc51541a37b95 100644 --- a/src/test/ui/borrowck/borrowck-closures-mut-of-imm.nll.stderr +++ b/src/test/ui/borrowck/borrowck-closures-mut-of-imm.nll.stderr @@ -1,11 +1,11 @@ error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference - --> $DIR/borrowck-closures-mut-of-imm.rs:23:21 + --> $DIR/borrowck-closures-mut-of-imm.rs:13:21 | LL | let c1 = || set(&mut *x); | ^^^^^^^ cannot borrow as mutable error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference - --> $DIR/borrowck-closures-mut-of-imm.rs:25:21 + --> $DIR/borrowck-closures-mut-of-imm.rs:15:21 | LL | let c2 = || set(&mut *x); | ^^^^^^^ cannot borrow as mutable diff --git a/src/test/ui/borrowck/borrowck-closures-mut-of-imm.rs b/src/test/ui/borrowck/borrowck-closures-mut-of-imm.rs index dc2f0e8395f08..cac8a2d596d99 100644 --- a/src/test/ui/borrowck/borrowck-closures-mut-of-imm.rs +++ b/src/test/ui/borrowck/borrowck-closures-mut-of-imm.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that two closures cannot simultaneously have mutable // and immutable access to the variable. Issue #6801. diff --git a/src/test/ui/borrowck/borrowck-closures-mut-of-imm.stderr b/src/test/ui/borrowck/borrowck-closures-mut-of-imm.stderr index 87eb52b6aa605..95c1a16257d19 100644 --- a/src/test/ui/borrowck/borrowck-closures-mut-of-imm.stderr +++ b/src/test/ui/borrowck/borrowck-closures-mut-of-imm.stderr @@ -1,5 +1,5 @@ error[E0524]: two closures require unique access to `x` at the same time - --> $DIR/borrowck-closures-mut-of-imm.rs:25:14 + --> $DIR/borrowck-closures-mut-of-imm.rs:15:14 | LL | let c1 = || set(&mut *x); | -- - previous borrow occurs due to use of `x` in closure @@ -15,13 +15,13 @@ LL | } | - borrow from first closure ends here error[E0596]: cannot borrow immutable borrowed content `***x` as mutable - --> $DIR/borrowck-closures-mut-of-imm.rs:23:26 + --> $DIR/borrowck-closures-mut-of-imm.rs:13:26 | LL | let c1 = || set(&mut *x); | ^^ cannot borrow as mutable error[E0596]: cannot borrow immutable borrowed content `***x` as mutable - --> $DIR/borrowck-closures-mut-of-imm.rs:25:26 + --> $DIR/borrowck-closures-mut-of-imm.rs:15:26 | LL | let c2 = || set(&mut *x); | ^^ cannot borrow as mutable diff --git a/src/test/ui/borrowck/borrowck-closures-two-mut-fail.nll.stderr b/src/test/ui/borrowck/borrowck-closures-two-mut-fail.nll.stderr index c96799c85f206..45ffdd57682ce 100644 --- a/src/test/ui/borrowck/borrowck-closures-two-mut-fail.nll.stderr +++ b/src/test/ui/borrowck/borrowck-closures-two-mut-fail.nll.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/borrowck-closures-two-mut-fail.rs:26:24 + --> $DIR/borrowck-closures-two-mut-fail.rs:16:24 | LL | let c1 = to_fn_mut(|| x = 4); | -- - first borrow occurs due to use of `x` in closure @@ -13,7 +13,7 @@ LL | c1; | -- borrow later used here error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/borrowck-closures-two-mut-fail.rs:37:24 + --> $DIR/borrowck-closures-two-mut-fail.rs:27:24 | LL | let c1 = to_fn_mut(|| set(&mut x)); | -- - first borrow occurs due to use of `x` in closure @@ -27,7 +27,7 @@ LL | c1; | -- borrow later used here error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/borrowck-closures-two-mut-fail.rs:44:24 + --> $DIR/borrowck-closures-two-mut-fail.rs:34:24 | LL | let c1 = to_fn_mut(|| x = 5); | -- - first borrow occurs due to use of `x` in closure @@ -41,7 +41,7 @@ LL | c1; | -- borrow later used here error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/borrowck-closures-two-mut-fail.rs:51:24 + --> $DIR/borrowck-closures-two-mut-fail.rs:41:24 | LL | let c1 = to_fn_mut(|| x = 5); | -- - first borrow occurs due to use of `x` in closure @@ -56,7 +56,7 @@ LL | c1; | -- borrow later used here error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/borrowck-closures-two-mut-fail.rs:63:24 + --> $DIR/borrowck-closures-two-mut-fail.rs:53:24 | LL | let c1 = to_fn_mut(|| set(&mut *x.f)); | -- - first borrow occurs due to use of `x` in closure diff --git a/src/test/ui/borrowck/borrowck-closures-two-mut-fail.rs b/src/test/ui/borrowck/borrowck-closures-two-mut-fail.rs index 66ebd346dab62..2a1757231db85 100644 --- a/src/test/ui/borrowck/borrowck-closures-two-mut-fail.rs +++ b/src/test/ui/borrowck/borrowck-closures-two-mut-fail.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that two closures cannot simultaneously have mutable // access to the variable, whether that mutable access be used // for direct assignment or for taking mutable ref. Issue #6801. diff --git a/src/test/ui/borrowck/borrowck-closures-two-mut-fail.stderr b/src/test/ui/borrowck/borrowck-closures-two-mut-fail.stderr index 59104cc4be9b9..cb8f5b4366bfd 100644 --- a/src/test/ui/borrowck/borrowck-closures-two-mut-fail.stderr +++ b/src/test/ui/borrowck/borrowck-closures-two-mut-fail.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/borrowck-closures-two-mut-fail.rs:26:24 + --> $DIR/borrowck-closures-two-mut-fail.rs:16:24 | LL | let c1 = to_fn_mut(|| x = 4); | -- - previous borrow occurs due to use of `x` in closure @@ -14,7 +14,7 @@ LL | } | - first borrow ends here error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/borrowck-closures-two-mut-fail.rs:37:24 + --> $DIR/borrowck-closures-two-mut-fail.rs:27:24 | LL | let c1 = to_fn_mut(|| set(&mut x)); | -- - previous borrow occurs due to use of `x` in closure @@ -29,7 +29,7 @@ LL | } | - first borrow ends here error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/borrowck-closures-two-mut-fail.rs:44:24 + --> $DIR/borrowck-closures-two-mut-fail.rs:34:24 | LL | let c1 = to_fn_mut(|| x = 5); | -- - previous borrow occurs due to use of `x` in closure @@ -44,7 +44,7 @@ LL | } | - first borrow ends here error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/borrowck-closures-two-mut-fail.rs:51:24 + --> $DIR/borrowck-closures-two-mut-fail.rs:41:24 | LL | let c1 = to_fn_mut(|| x = 5); | -- - previous borrow occurs due to use of `x` in closure @@ -59,7 +59,7 @@ LL | } | - first borrow ends here error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/borrowck-closures-two-mut-fail.rs:63:24 + --> $DIR/borrowck-closures-two-mut-fail.rs:53:24 | LL | let c1 = to_fn_mut(|| set(&mut *x.f)); | -- - previous borrow occurs due to use of `x` in closure diff --git a/src/test/ui/borrowck/borrowck-closures-two-mut.rs b/src/test/ui/borrowck/borrowck-closures-two-mut.rs index 55e73af9e6a1b..1fced982f8d68 100644 --- a/src/test/ui/borrowck/borrowck-closures-two-mut.rs +++ b/src/test/ui/borrowck/borrowck-closures-two-mut.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that two closures cannot simultaneously have mutable // access to the variable, whether that mutable access be used // for direct assignment or for taking mutable ref. Issue #6801. diff --git a/src/test/ui/borrowck/borrowck-closures-two-mut.stderr b/src/test/ui/borrowck/borrowck-closures-two-mut.stderr index 6186c3839193d..616cf0b32f7f4 100644 --- a/src/test/ui/borrowck/borrowck-closures-two-mut.stderr +++ b/src/test/ui/borrowck/borrowck-closures-two-mut.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `x` as mutable more than once at a time (Ast) - --> $DIR/borrowck-closures-two-mut.rs:24:24 + --> $DIR/borrowck-closures-two-mut.rs:14:24 | LL | let c1 = to_fn_mut(|| x = 4); | -- - previous borrow occurs due to use of `x` in closure @@ -14,7 +14,7 @@ LL | } | - first borrow ends here error[E0499]: cannot borrow `x` as mutable more than once at a time (Ast) - --> $DIR/borrowck-closures-two-mut.rs:36:24 + --> $DIR/borrowck-closures-two-mut.rs:26:24 | LL | let c1 = to_fn_mut(|| set(&mut x)); | -- - previous borrow occurs due to use of `x` in closure @@ -29,7 +29,7 @@ LL | } | - first borrow ends here error[E0499]: cannot borrow `x` as mutable more than once at a time (Ast) - --> $DIR/borrowck-closures-two-mut.rs:44:24 + --> $DIR/borrowck-closures-two-mut.rs:34:24 | LL | let c1 = to_fn_mut(|| x = 5); | -- - previous borrow occurs due to use of `x` in closure @@ -44,7 +44,7 @@ LL | } | - first borrow ends here error[E0499]: cannot borrow `x` as mutable more than once at a time (Ast) - --> $DIR/borrowck-closures-two-mut.rs:52:24 + --> $DIR/borrowck-closures-two-mut.rs:42:24 | LL | let c1 = to_fn_mut(|| x = 5); | -- - previous borrow occurs due to use of `x` in closure @@ -59,7 +59,7 @@ LL | } | - first borrow ends here error[E0499]: cannot borrow `x` as mutable more than once at a time (Ast) - --> $DIR/borrowck-closures-two-mut.rs:65:24 + --> $DIR/borrowck-closures-two-mut.rs:55:24 | LL | let c1 = to_fn_mut(|| set(&mut *x.f)); | -- - previous borrow occurs due to use of `x` in closure @@ -74,7 +74,7 @@ LL | } | - first borrow ends here error[E0499]: cannot borrow `x` as mutable more than once at a time (Mir) - --> $DIR/borrowck-closures-two-mut.rs:24:24 + --> $DIR/borrowck-closures-two-mut.rs:14:24 | LL | let c1 = to_fn_mut(|| x = 4); | -- - first borrow occurs due to use of `x` in closure @@ -89,7 +89,7 @@ LL | drop((c1, c2)); | -- borrow later used here error[E0499]: cannot borrow `x` as mutable more than once at a time (Mir) - --> $DIR/borrowck-closures-two-mut.rs:36:24 + --> $DIR/borrowck-closures-two-mut.rs:26:24 | LL | let c1 = to_fn_mut(|| set(&mut x)); | -- - first borrow occurs due to use of `x` in closure @@ -104,7 +104,7 @@ LL | drop((c1, c2)); | -- borrow later used here error[E0499]: cannot borrow `x` as mutable more than once at a time (Mir) - --> $DIR/borrowck-closures-two-mut.rs:44:24 + --> $DIR/borrowck-closures-two-mut.rs:34:24 | LL | let c1 = to_fn_mut(|| x = 5); | -- - first borrow occurs due to use of `x` in closure @@ -119,7 +119,7 @@ LL | drop((c1, c2)); | -- borrow later used here error[E0499]: cannot borrow `x` as mutable more than once at a time (Mir) - --> $DIR/borrowck-closures-two-mut.rs:52:24 + --> $DIR/borrowck-closures-two-mut.rs:42:24 | LL | let c1 = to_fn_mut(|| x = 5); | -- - first borrow occurs due to use of `x` in closure @@ -134,7 +134,7 @@ LL | drop((c1, c2)); | -- borrow later used here error[E0499]: cannot borrow `x` as mutable more than once at a time (Mir) - --> $DIR/borrowck-closures-two-mut.rs:65:24 + --> $DIR/borrowck-closures-two-mut.rs:55:24 | LL | let c1 = to_fn_mut(|| set(&mut *x.f)); | -- - first borrow occurs due to use of `x` in closure diff --git a/src/test/ui/borrowck/borrowck-closures-unique-imm.nll.stderr b/src/test/ui/borrowck/borrowck-closures-unique-imm.nll.stderr index b8f17570a6471..789a5a87c31c6 100644 --- a/src/test/ui/borrowck/borrowck-closures-unique-imm.nll.stderr +++ b/src/test/ui/borrowck/borrowck-closures-unique-imm.nll.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `this.x` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-closures-unique-imm.rs:23:9 + --> $DIR/borrowck-closures-unique-imm.rs:11:9 | LL | let p = &this.x; | ------- immutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-closures-unique-imm.rs b/src/test/ui/borrowck/borrowck-closures-unique-imm.rs index c4b15a9c0fe4d..0dd004769105a 100644 --- a/src/test/ui/borrowck/borrowck-closures-unique-imm.rs +++ b/src/test/ui/borrowck/borrowck-closures-unique-imm.rs @@ -1,15 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - struct Foo { x: isize, } diff --git a/src/test/ui/borrowck/borrowck-closures-unique-imm.stderr b/src/test/ui/borrowck/borrowck-closures-unique-imm.stderr index 5ab9685850ee4..1b661b70d7f5b 100644 --- a/src/test/ui/borrowck/borrowck-closures-unique-imm.stderr +++ b/src/test/ui/borrowck/borrowck-closures-unique-imm.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `this.x` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-closures-unique-imm.rs:23:14 + --> $DIR/borrowck-closures-unique-imm.rs:11:14 | LL | let p = &this.x; | ------ immutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-closures-unique.nll.stderr b/src/test/ui/borrowck/borrowck-closures-unique.nll.stderr index 17519ccb1438d..3a1d9390b24eb 100644 --- a/src/test/ui/borrowck/borrowck-closures-unique.nll.stderr +++ b/src/test/ui/borrowck/borrowck-closures-unique.nll.stderr @@ -1,5 +1,5 @@ error[E0500]: closure requires unique access to `x` but it is already borrowed - --> $DIR/borrowck-closures-unique.rs:36:14 + --> $DIR/borrowck-closures-unique.rs:26:14 | LL | let c1 = || get(x); | -- - first borrow occurs due to use of `x` in closure @@ -13,7 +13,7 @@ LL | c1; | -- borrow later used here error[E0500]: closure requires unique access to `x` but it is already borrowed - --> $DIR/borrowck-closures-unique.rs:42:14 + --> $DIR/borrowck-closures-unique.rs:32:14 | LL | let c1 = || get(x); | -- - first borrow occurs due to use of `x` in closure @@ -27,7 +27,7 @@ LL | c1; | -- borrow later used here error[E0524]: two closures require unique access to `x` at the same time - --> $DIR/borrowck-closures-unique.rs:48:14 + --> $DIR/borrowck-closures-unique.rs:38:14 | LL | let c1 = || set(x); | -- - first borrow occurs due to use of `x` in closure @@ -41,7 +41,7 @@ LL | c1; | -- borrow later used here error[E0594]: cannot assign to `x`, as it is not declared as mutable - --> $DIR/borrowck-closures-unique.rs:57:38 + --> $DIR/borrowck-closures-unique.rs:47:38 | LL | fn e(x: &'static mut isize) { | - help: consider changing this to be mutable: `mut x` diff --git a/src/test/ui/borrowck/borrowck-closures-unique.rs b/src/test/ui/borrowck/borrowck-closures-unique.rs index caf5785f481c2..a4655ebba116e 100644 --- a/src/test/ui/borrowck/borrowck-closures-unique.rs +++ b/src/test/ui/borrowck/borrowck-closures-unique.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that a closure which requires mutable access to the referent // of an `&mut` requires a "unique" borrow -- that is, the variable to // be borrowed (here, `x`) will not be borrowed *mutably*, but diff --git a/src/test/ui/borrowck/borrowck-closures-unique.stderr b/src/test/ui/borrowck/borrowck-closures-unique.stderr index cfcb81b31e700..94181ad2400d7 100644 --- a/src/test/ui/borrowck/borrowck-closures-unique.stderr +++ b/src/test/ui/borrowck/borrowck-closures-unique.stderr @@ -1,5 +1,5 @@ error[E0500]: closure requires unique access to `x` but it is already borrowed - --> $DIR/borrowck-closures-unique.rs:36:14 + --> $DIR/borrowck-closures-unique.rs:26:14 | LL | let c1 = || get(x); | -- - previous borrow occurs due to use of `x` in closure @@ -14,7 +14,7 @@ LL | } | - borrow ends here error[E0500]: closure requires unique access to `x` but it is already borrowed - --> $DIR/borrowck-closures-unique.rs:42:14 + --> $DIR/borrowck-closures-unique.rs:32:14 | LL | let c1 = || get(x); | -- - previous borrow occurs due to use of `x` in closure @@ -29,7 +29,7 @@ LL | } | - borrow ends here error[E0524]: two closures require unique access to `x` at the same time - --> $DIR/borrowck-closures-unique.rs:48:14 + --> $DIR/borrowck-closures-unique.rs:38:14 | LL | let c1 = || set(x); | -- - previous borrow occurs due to use of `x` in closure @@ -44,7 +44,7 @@ LL | } | - borrow from first closure ends here error[E0595]: closure cannot assign to immutable argument `x` - --> $DIR/borrowck-closures-unique.rs:57:14 + --> $DIR/borrowck-closures-unique.rs:47:14 | LL | let c1 = |y: &'static mut isize| x = y; //~ ERROR closure cannot assign to immutable argument | ^^^^^^^^^^^^^^^^^^^^^^^ cannot borrow mutably @@ -54,7 +54,7 @@ LL | x //~ ERROR closure cannot assign to immutable argument | ^ error[E0595]: closure cannot assign to immutable argument `x` - --> $DIR/borrowck-closures-unique.rs:62:14 + --> $DIR/borrowck-closures-unique.rs:52:14 | LL | let c1 = || x = panic!(); //~ ERROR closure cannot assign to immutable argument | ^^ cannot borrow mutably diff --git a/src/test/ui/borrowck/borrowck-closures-use-after-free.nll.stderr b/src/test/ui/borrowck/borrowck-closures-use-after-free.nll.stderr index dc73929989ce1..d105e3a02c53b 100644 --- a/src/test/ui/borrowck/borrowck-closures-use-after-free.nll.stderr +++ b/src/test/ui/borrowck/borrowck-closures-use-after-free.nll.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `*ptr` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-closures-use-after-free.rs:32:8 + --> $DIR/borrowck-closures-use-after-free.rs:22:8 | LL | let mut test = |foo: &Foo| { | ----------- mutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-closures-use-after-free.rs b/src/test/ui/borrowck/borrowck-closures-use-after-free.rs index bb474342a7c6f..e9f65c4ff7df4 100644 --- a/src/test/ui/borrowck/borrowck-closures-use-after-free.rs +++ b/src/test/ui/borrowck/borrowck-closures-use-after-free.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that a closure which mutates a local variable // cannot also be supplied a borrowed version of that // variable's contents. Issue #11192. diff --git a/src/test/ui/borrowck/borrowck-closures-use-after-free.stderr b/src/test/ui/borrowck/borrowck-closures-use-after-free.stderr index 7beb31f394489..b41a4a0c6768c 100644 --- a/src/test/ui/borrowck/borrowck-closures-use-after-free.stderr +++ b/src/test/ui/borrowck/borrowck-closures-use-after-free.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `*ptr` as immutable because `ptr` is also borrowed as mutable - --> $DIR/borrowck-closures-use-after-free.rs:32:9 + --> $DIR/borrowck-closures-use-after-free.rs:22:9 | LL | let mut test = |foo: &Foo| { | ----------- mutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-consume-unsize-vec.rs b/src/test/ui/borrowck/borrowck-consume-unsize-vec.rs index 32490e0dc7de2..347f0212c7fa1 100644 --- a/src/test/ui/borrowck/borrowck-consume-unsize-vec.rs +++ b/src/test/ui/borrowck/borrowck-consume-unsize-vec.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we report an error if an upcast box is moved twice. fn consume(_: Box<[i32]>) { diff --git a/src/test/ui/borrowck/borrowck-consume-unsize-vec.stderr b/src/test/ui/borrowck/borrowck-consume-unsize-vec.stderr index 8199ce70e2a92..2fc2248000f3d 100644 --- a/src/test/ui/borrowck/borrowck-consume-unsize-vec.stderr +++ b/src/test/ui/borrowck/borrowck-consume-unsize-vec.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `b` - --> $DIR/borrowck-consume-unsize-vec.rs:18:13 + --> $DIR/borrowck-consume-unsize-vec.rs:8:13 | LL | consume(b); | - value moved here diff --git a/src/test/ui/borrowck/borrowck-consume-upcast-box.nll.stderr b/src/test/ui/borrowck/borrowck-consume-upcast-box.nll.stderr index b999e09284773..7357d0973dbc0 100644 --- a/src/test/ui/borrowck/borrowck-consume-upcast-box.nll.stderr +++ b/src/test/ui/borrowck/borrowck-consume-upcast-box.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `b` - --> $DIR/borrowck-consume-upcast-box.rs:20:13 + --> $DIR/borrowck-consume-upcast-box.rs:10:13 | LL | consume(b); | - value moved here diff --git a/src/test/ui/borrowck/borrowck-consume-upcast-box.rs b/src/test/ui/borrowck/borrowck-consume-upcast-box.rs index 5bcafa675c7cb..ed669c4d90151 100644 --- a/src/test/ui/borrowck/borrowck-consume-upcast-box.rs +++ b/src/test/ui/borrowck/borrowck-consume-upcast-box.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we report an error if an upcast box is moved twice. trait Foo { fn dummy(&self); } diff --git a/src/test/ui/borrowck/borrowck-consume-upcast-box.stderr b/src/test/ui/borrowck/borrowck-consume-upcast-box.stderr index 159933a615509..aef1671342ef4 100644 --- a/src/test/ui/borrowck/borrowck-consume-upcast-box.stderr +++ b/src/test/ui/borrowck/borrowck-consume-upcast-box.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `b` - --> $DIR/borrowck-consume-upcast-box.rs:20:13 + --> $DIR/borrowck-consume-upcast-box.rs:10:13 | LL | consume(b); | - value moved here diff --git a/src/test/ui/borrowck/borrowck-describe-lvalue.ast.nll.stderr b/src/test/ui/borrowck/borrowck-describe-lvalue.ast.nll.stderr index ae706ef64dd22..448e5261b13aa 100644 --- a/src/test/ui/borrowck/borrowck-describe-lvalue.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-describe-lvalue.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/borrowck-describe-lvalue.rs:295:13 + --> $DIR/borrowck-describe-lvalue.rs:285:13 | LL | let y = &mut x; | ------ first mutable borrow occurs here @@ -10,7 +10,7 @@ LL | *y = 1; | ------ borrow later used here error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/borrowck-describe-lvalue.rs:307:20 + --> $DIR/borrowck-describe-lvalue.rs:297:20 | LL | let y = &mut x; | ------ first mutable borrow occurs here @@ -21,12 +21,12 @@ LL | *y = 1; | ------ borrow later used here error: unsatisfied lifetime constraints - --> $DIR/borrowck-describe-lvalue.rs:305:16 + --> $DIR/borrowck-describe-lvalue.rs:295:16 | LL | || { | -- | || - | |return type of closure is [closure@$DIR/borrowck-describe-lvalue.rs:305:16: 311:18 x:&'2 mut i32] + | |return type of closure is [closure@$DIR/borrowck-describe-lvalue.rs:295:16: 301:18 x:&'2 mut i32] | lifetime `'1` represents this closure's body LL | / || { //[mir]~ ERROR unsatisfied lifetime constraints LL | | let y = &mut x; @@ -40,7 +40,7 @@ LL | | } = note: closure implements `FnMut`, so references to captured variables can't escape the closure error[E0503]: cannot use `f.x` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:53:9 + --> $DIR/borrowck-describe-lvalue.rs:43:9 | LL | let x = f.x(); | - borrow of `f` occurs here @@ -51,7 +51,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `g.0` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:61:9 + --> $DIR/borrowck-describe-lvalue.rs:51:9 | LL | let x = g.x(); | - borrow of `g` occurs here @@ -62,7 +62,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `h.0` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:69:9 + --> $DIR/borrowck-describe-lvalue.rs:59:9 | LL | let x = &mut h.0; | -------- borrow of `h.0` occurs here @@ -73,7 +73,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `e` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:77:15 + --> $DIR/borrowck-describe-lvalue.rs:67:15 | LL | let x = e.x(); | - borrow of `e` occurs here @@ -84,7 +84,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `e.0` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:78:20 + --> $DIR/borrowck-describe-lvalue.rs:68:20 | LL | let x = e.x(); | - borrow of `e` occurs here @@ -96,7 +96,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `u.a` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:88:9 + --> $DIR/borrowck-describe-lvalue.rs:78:9 | LL | let x = &mut u.a; | -------- borrow of `u.a` occurs here @@ -107,7 +107,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `f.x` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:96:9 + --> $DIR/borrowck-describe-lvalue.rs:86:9 | LL | let x = f.x(); | - borrow of `*f` occurs here @@ -118,7 +118,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `g.0` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:104:9 + --> $DIR/borrowck-describe-lvalue.rs:94:9 | LL | let x = g.x(); | - borrow of `*g` occurs here @@ -129,7 +129,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `h.0` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:112:9 + --> $DIR/borrowck-describe-lvalue.rs:102:9 | LL | let x = &mut h.0; | -------- borrow of `h.0` occurs here @@ -140,7 +140,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `*e` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:120:15 + --> $DIR/borrowck-describe-lvalue.rs:110:15 | LL | let x = e.x(); | - borrow of `*e` occurs here @@ -151,7 +151,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `e.0` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:121:20 + --> $DIR/borrowck-describe-lvalue.rs:111:20 | LL | let x = e.x(); | - borrow of `*e` occurs here @@ -163,7 +163,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `u.a` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:131:9 + --> $DIR/borrowck-describe-lvalue.rs:121:9 | LL | let x = &mut u.a; | -------- borrow of `u.a` occurs here @@ -174,7 +174,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:139:15 + --> $DIR/borrowck-describe-lvalue.rs:129:15 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -185,7 +185,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v[..]` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:140:15 + --> $DIR/borrowck-describe-lvalue.rs:130:15 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -197,7 +197,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:145:15 + --> $DIR/borrowck-describe-lvalue.rs:135:15 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -209,7 +209,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v[..]` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:146:18 + --> $DIR/borrowck-describe-lvalue.rs:136:18 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -221,7 +221,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:151:15 + --> $DIR/borrowck-describe-lvalue.rs:141:15 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -233,7 +233,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v[..]` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:152:25 + --> $DIR/borrowck-describe-lvalue.rs:142:25 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -245,7 +245,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:157:15 + --> $DIR/borrowck-describe-lvalue.rs:147:15 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -257,7 +257,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v[..]` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:158:28 + --> $DIR/borrowck-describe-lvalue.rs:148:28 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -269,7 +269,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:169:15 + --> $DIR/borrowck-describe-lvalue.rs:159:15 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -280,7 +280,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v[..]` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:170:15 + --> $DIR/borrowck-describe-lvalue.rs:160:15 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -292,7 +292,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:175:15 + --> $DIR/borrowck-describe-lvalue.rs:165:15 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -304,7 +304,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v[..]` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:176:18 + --> $DIR/borrowck-describe-lvalue.rs:166:18 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -316,7 +316,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:181:15 + --> $DIR/borrowck-describe-lvalue.rs:171:15 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -328,7 +328,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v[..]` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:182:15 + --> $DIR/borrowck-describe-lvalue.rs:172:15 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -340,7 +340,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:187:15 + --> $DIR/borrowck-describe-lvalue.rs:177:15 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -352,7 +352,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v[..]` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:188:18 + --> $DIR/borrowck-describe-lvalue.rs:178:18 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -364,7 +364,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `e` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:201:15 + --> $DIR/borrowck-describe-lvalue.rs:191:15 | LL | let x = &mut e; | ------ borrow of `e` occurs here @@ -375,7 +375,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `e` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:202:13 + --> $DIR/borrowck-describe-lvalue.rs:192:13 | LL | let x = &mut e; | ------ borrow of `e` occurs here @@ -387,7 +387,7 @@ LL | drop(x); | - borrow later used here error[E0502]: cannot borrow `e.0` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-describe-lvalue.rs:202:18 + --> $DIR/borrowck-describe-lvalue.rs:192:18 | LL | let x = &mut e; | ------ mutable borrow occurs here @@ -399,7 +399,7 @@ LL | drop(x); | - borrow later used here error[E0502]: cannot borrow `e.x` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-describe-lvalue.rs:207:23 + --> $DIR/borrowck-describe-lvalue.rs:197:23 | LL | let x = &mut e; | ------ mutable borrow occurs here @@ -411,7 +411,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `s` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:220:15 + --> $DIR/borrowck-describe-lvalue.rs:210:15 | LL | let x = &mut s; | ------ borrow of `s` occurs here @@ -422,7 +422,7 @@ LL | drop(x); | - borrow later used here error[E0502]: cannot borrow `s.y.0` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-describe-lvalue.rs:221:22 + --> $DIR/borrowck-describe-lvalue.rs:211:22 | LL | let x = &mut s; | ------ mutable borrow occurs here @@ -434,7 +434,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `s` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:227:15 + --> $DIR/borrowck-describe-lvalue.rs:217:15 | LL | let x = &mut s; | ------ borrow of `s` occurs here @@ -446,7 +446,7 @@ LL | drop(x); | - borrow later used here error[E0502]: cannot borrow `s.x.y` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-describe-lvalue.rs:228:28 + --> $DIR/borrowck-describe-lvalue.rs:218:28 | LL | let x = &mut s; | ------ mutable borrow occurs here @@ -458,7 +458,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `*v` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:271:9 + --> $DIR/borrowck-describe-lvalue.rs:261:9 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -469,7 +469,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v[..].y` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:271:9 + --> $DIR/borrowck-describe-lvalue.rs:261:9 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -480,7 +480,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:282:15 + --> $DIR/borrowck-describe-lvalue.rs:272:15 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -491,7 +491,7 @@ LL | drop(x); | - borrow later used here error[E0502]: cannot borrow `v[..].x` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-describe-lvalue.rs:283:24 + --> $DIR/borrowck-describe-lvalue.rs:273:24 | LL | let x = &mut v; | ------ mutable borrow occurs here @@ -503,7 +503,7 @@ LL | drop(x); | - borrow later used here error[E0502]: cannot borrow `*block.current` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-describe-lvalue.rs:245:29 + --> $DIR/borrowck-describe-lvalue.rs:235:29 | LL | let x = &mut block; | ---------- mutable borrow occurs here @@ -514,7 +514,7 @@ LL | drop(x); | - borrow later used here error[E0502]: cannot borrow `*block.current` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-describe-lvalue.rs:260:33 + --> $DIR/borrowck-describe-lvalue.rs:250:33 | LL | let x = &mut block; | ---------- mutable borrow occurs here @@ -525,7 +525,7 @@ LL | drop(x); | - borrow later used here error[E0382]: use of moved value: `x` - --> $DIR/borrowck-describe-lvalue.rs:318:22 + --> $DIR/borrowck-describe-lvalue.rs:308:22 | LL | drop(x); | - value moved here diff --git a/src/test/ui/borrowck/borrowck-describe-lvalue.ast.stderr b/src/test/ui/borrowck/borrowck-describe-lvalue.ast.stderr index ca9b2dda8bcf3..0bd8dc30af902 100644 --- a/src/test/ui/borrowck/borrowck-describe-lvalue.ast.stderr +++ b/src/test/ui/borrowck/borrowck-describe-lvalue.ast.stderr @@ -1,5 +1,5 @@ error[E0503]: cannot use `f.x` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:53:9 + --> $DIR/borrowck-describe-lvalue.rs:43:9 | LL | let x = f.x(); | - borrow of `f` occurs here @@ -7,7 +7,7 @@ LL | f.x; //[ast]~ ERROR cannot use `f.x` because it was mutably borrowe | ^^^ use of borrowed `f` error[E0503]: cannot use `g.0` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:61:9 + --> $DIR/borrowck-describe-lvalue.rs:51:9 | LL | let x = g.x(); | - borrow of `g` occurs here @@ -15,7 +15,7 @@ LL | g.0; //[ast]~ ERROR cannot use `g.0` because it was mutably borrowe | ^^^ use of borrowed `g` error[E0503]: cannot use `h.0` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:69:9 + --> $DIR/borrowck-describe-lvalue.rs:59:9 | LL | let x = &mut h.0; | --- borrow of `h.0` occurs here @@ -23,7 +23,7 @@ LL | h.0; //[ast]~ ERROR cannot use `h.0` because it was mutably borrowe | ^^^ use of borrowed `h.0` error[E0503]: cannot use `e.0` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:78:20 + --> $DIR/borrowck-describe-lvalue.rs:68:20 | LL | let x = e.x(); | - borrow of `e` occurs here @@ -32,7 +32,7 @@ LL | Baz::X(value) => value | ^^^^^ use of borrowed `e` error[E0503]: cannot use `u.a` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:88:9 + --> $DIR/borrowck-describe-lvalue.rs:78:9 | LL | let x = &mut u.a; | --- borrow of `u.a` occurs here @@ -40,7 +40,7 @@ LL | u.a; //[ast]~ ERROR cannot use `u.a` because it was mutably borrowe | ^^^ use of borrowed `u.a` error[E0503]: cannot use `f.x` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:96:9 + --> $DIR/borrowck-describe-lvalue.rs:86:9 | LL | let x = f.x(); | - borrow of `*f` occurs here @@ -48,7 +48,7 @@ LL | f.x; //[ast]~ ERROR cannot use `f.x` because it was mutably borrowe | ^^^ use of borrowed `*f` error[E0503]: cannot use `g.0` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:104:9 + --> $DIR/borrowck-describe-lvalue.rs:94:9 | LL | let x = g.x(); | - borrow of `*g` occurs here @@ -56,7 +56,7 @@ LL | g.0; //[ast]~ ERROR cannot use `g.0` because it was mutably borrowe | ^^^ use of borrowed `*g` error[E0503]: cannot use `h.0` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:112:9 + --> $DIR/borrowck-describe-lvalue.rs:102:9 | LL | let x = &mut h.0; | --- borrow of `h.0` occurs here @@ -64,7 +64,7 @@ LL | h.0; //[ast]~ ERROR cannot use `h.0` because it was mutably borrowe | ^^^ use of borrowed `h.0` error[E0503]: cannot use `e.0` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:121:20 + --> $DIR/borrowck-describe-lvalue.rs:111:20 | LL | let x = e.x(); | - borrow of `*e` occurs here @@ -73,7 +73,7 @@ LL | Baz::X(value) => value | ^^^^^ use of borrowed `*e` error[E0503]: cannot use `u.a` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:131:9 + --> $DIR/borrowck-describe-lvalue.rs:121:9 | LL | let x = &mut u.a; | --- borrow of `u.a` occurs here @@ -81,7 +81,7 @@ LL | u.a; //[ast]~ ERROR cannot use `u.a` because it was mutably borrowe | ^^^ use of borrowed `u.a` error[E0503]: cannot use `v[..]` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:140:15 + --> $DIR/borrowck-describe-lvalue.rs:130:15 | LL | let x = &mut v; | - borrow of `v` occurs here @@ -90,7 +90,7 @@ LL | &[x, _, .., _, _] => println!("{}", x), | ^ use of borrowed `v` error[E0503]: cannot use `v[..]` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:146:18 + --> $DIR/borrowck-describe-lvalue.rs:136:18 | LL | let x = &mut v; | - borrow of `v` occurs here @@ -99,7 +99,7 @@ LL | &[_, x, .., _, _] => println!("{}", x), | ^ use of borrowed `v` error[E0503]: cannot use `v[..]` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:152:25 + --> $DIR/borrowck-describe-lvalue.rs:142:25 | LL | let x = &mut v; | - borrow of `v` occurs here @@ -108,7 +108,7 @@ LL | &[_, _, .., x, _] => println!("{}", x), | ^ use of borrowed `v` error[E0503]: cannot use `v[..]` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:158:28 + --> $DIR/borrowck-describe-lvalue.rs:148:28 | LL | let x = &mut v; | - borrow of `v` occurs here @@ -117,7 +117,7 @@ LL | &[_, _, .., _, x] => println!("{}", x), | ^ use of borrowed `v` error[E0503]: cannot use `v[..]` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:170:15 + --> $DIR/borrowck-describe-lvalue.rs:160:15 | LL | let x = &mut v; | - borrow of `v` occurs here @@ -126,7 +126,7 @@ LL | &[x..] => println!("{:?}", x), | ^ use of borrowed `v` error[E0503]: cannot use `v[..]` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:176:18 + --> $DIR/borrowck-describe-lvalue.rs:166:18 | LL | let x = &mut v; | - borrow of `v` occurs here @@ -135,7 +135,7 @@ LL | &[_, x..] => println!("{:?}", x), | ^ use of borrowed `v` error[E0503]: cannot use `v[..]` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:182:15 + --> $DIR/borrowck-describe-lvalue.rs:172:15 | LL | let x = &mut v; | - borrow of `v` occurs here @@ -144,7 +144,7 @@ LL | &[x.., _] => println!("{:?}", x), | ^ use of borrowed `v` error[E0503]: cannot use `v[..]` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:188:18 + --> $DIR/borrowck-describe-lvalue.rs:178:18 | LL | let x = &mut v; | - borrow of `v` occurs here @@ -153,7 +153,7 @@ LL | &[_, x.., _] => println!("{:?}", x), | ^ use of borrowed `v` error[E0502]: cannot borrow `e.0` as immutable because `e` is also borrowed as mutable - --> $DIR/borrowck-describe-lvalue.rs:202:18 + --> $DIR/borrowck-describe-lvalue.rs:192:18 | LL | let x = &mut e; | - mutable borrow occurs here @@ -165,7 +165,7 @@ LL | } | - mutable borrow ends here error[E0502]: cannot borrow `e.x` as immutable because `e` is also borrowed as mutable - --> $DIR/borrowck-describe-lvalue.rs:207:23 + --> $DIR/borrowck-describe-lvalue.rs:197:23 | LL | let x = &mut e; | - mutable borrow occurs here @@ -177,7 +177,7 @@ LL | } | - mutable borrow ends here error[E0502]: cannot borrow `s.y.0` as immutable because `s` is also borrowed as mutable - --> $DIR/borrowck-describe-lvalue.rs:221:22 + --> $DIR/borrowck-describe-lvalue.rs:211:22 | LL | let x = &mut s; | - mutable borrow occurs here @@ -189,7 +189,7 @@ LL | } | - mutable borrow ends here error[E0502]: cannot borrow `s.x.y` as immutable because `s` is also borrowed as mutable - --> $DIR/borrowck-describe-lvalue.rs:228:28 + --> $DIR/borrowck-describe-lvalue.rs:218:28 | LL | let x = &mut s; | - mutable borrow occurs here @@ -201,7 +201,7 @@ LL | } | - mutable borrow ends here error[E0503]: cannot use `v[..].y` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:271:9 + --> $DIR/borrowck-describe-lvalue.rs:261:9 | LL | let x = &mut v; | - borrow of `v` occurs here @@ -209,7 +209,7 @@ LL | v[0].y; | ^^^^^^ use of borrowed `v` error[E0499]: cannot borrow `**x` as mutable more than once at a time - --> $DIR/borrowck-describe-lvalue.rs:295:18 + --> $DIR/borrowck-describe-lvalue.rs:285:18 | LL | let y = &mut x; | - first mutable borrow occurs here @@ -220,7 +220,7 @@ LL | }; | - first borrow ends here error[E0499]: cannot borrow `**x` as mutable more than once at a time - --> $DIR/borrowck-describe-lvalue.rs:307:25 + --> $DIR/borrowck-describe-lvalue.rs:297:25 | LL | let y = &mut x; | - first mutable borrow occurs here @@ -231,7 +231,7 @@ LL | } | - first borrow ends here error[E0382]: use of moved value: `x` - --> $DIR/borrowck-describe-lvalue.rs:318:22 + --> $DIR/borrowck-describe-lvalue.rs:308:22 | LL | drop(x); | - value moved here diff --git a/src/test/ui/borrowck/borrowck-describe-lvalue.mir.stderr b/src/test/ui/borrowck/borrowck-describe-lvalue.mir.stderr index ae706ef64dd22..448e5261b13aa 100644 --- a/src/test/ui/borrowck/borrowck-describe-lvalue.mir.stderr +++ b/src/test/ui/borrowck/borrowck-describe-lvalue.mir.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/borrowck-describe-lvalue.rs:295:13 + --> $DIR/borrowck-describe-lvalue.rs:285:13 | LL | let y = &mut x; | ------ first mutable borrow occurs here @@ -10,7 +10,7 @@ LL | *y = 1; | ------ borrow later used here error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/borrowck-describe-lvalue.rs:307:20 + --> $DIR/borrowck-describe-lvalue.rs:297:20 | LL | let y = &mut x; | ------ first mutable borrow occurs here @@ -21,12 +21,12 @@ LL | *y = 1; | ------ borrow later used here error: unsatisfied lifetime constraints - --> $DIR/borrowck-describe-lvalue.rs:305:16 + --> $DIR/borrowck-describe-lvalue.rs:295:16 | LL | || { | -- | || - | |return type of closure is [closure@$DIR/borrowck-describe-lvalue.rs:305:16: 311:18 x:&'2 mut i32] + | |return type of closure is [closure@$DIR/borrowck-describe-lvalue.rs:295:16: 301:18 x:&'2 mut i32] | lifetime `'1` represents this closure's body LL | / || { //[mir]~ ERROR unsatisfied lifetime constraints LL | | let y = &mut x; @@ -40,7 +40,7 @@ LL | | } = note: closure implements `FnMut`, so references to captured variables can't escape the closure error[E0503]: cannot use `f.x` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:53:9 + --> $DIR/borrowck-describe-lvalue.rs:43:9 | LL | let x = f.x(); | - borrow of `f` occurs here @@ -51,7 +51,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `g.0` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:61:9 + --> $DIR/borrowck-describe-lvalue.rs:51:9 | LL | let x = g.x(); | - borrow of `g` occurs here @@ -62,7 +62,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `h.0` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:69:9 + --> $DIR/borrowck-describe-lvalue.rs:59:9 | LL | let x = &mut h.0; | -------- borrow of `h.0` occurs here @@ -73,7 +73,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `e` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:77:15 + --> $DIR/borrowck-describe-lvalue.rs:67:15 | LL | let x = e.x(); | - borrow of `e` occurs here @@ -84,7 +84,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `e.0` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:78:20 + --> $DIR/borrowck-describe-lvalue.rs:68:20 | LL | let x = e.x(); | - borrow of `e` occurs here @@ -96,7 +96,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `u.a` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:88:9 + --> $DIR/borrowck-describe-lvalue.rs:78:9 | LL | let x = &mut u.a; | -------- borrow of `u.a` occurs here @@ -107,7 +107,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `f.x` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:96:9 + --> $DIR/borrowck-describe-lvalue.rs:86:9 | LL | let x = f.x(); | - borrow of `*f` occurs here @@ -118,7 +118,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `g.0` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:104:9 + --> $DIR/borrowck-describe-lvalue.rs:94:9 | LL | let x = g.x(); | - borrow of `*g` occurs here @@ -129,7 +129,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `h.0` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:112:9 + --> $DIR/borrowck-describe-lvalue.rs:102:9 | LL | let x = &mut h.0; | -------- borrow of `h.0` occurs here @@ -140,7 +140,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `*e` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:120:15 + --> $DIR/borrowck-describe-lvalue.rs:110:15 | LL | let x = e.x(); | - borrow of `*e` occurs here @@ -151,7 +151,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `e.0` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:121:20 + --> $DIR/borrowck-describe-lvalue.rs:111:20 | LL | let x = e.x(); | - borrow of `*e` occurs here @@ -163,7 +163,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `u.a` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:131:9 + --> $DIR/borrowck-describe-lvalue.rs:121:9 | LL | let x = &mut u.a; | -------- borrow of `u.a` occurs here @@ -174,7 +174,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:139:15 + --> $DIR/borrowck-describe-lvalue.rs:129:15 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -185,7 +185,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v[..]` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:140:15 + --> $DIR/borrowck-describe-lvalue.rs:130:15 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -197,7 +197,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:145:15 + --> $DIR/borrowck-describe-lvalue.rs:135:15 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -209,7 +209,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v[..]` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:146:18 + --> $DIR/borrowck-describe-lvalue.rs:136:18 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -221,7 +221,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:151:15 + --> $DIR/borrowck-describe-lvalue.rs:141:15 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -233,7 +233,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v[..]` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:152:25 + --> $DIR/borrowck-describe-lvalue.rs:142:25 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -245,7 +245,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:157:15 + --> $DIR/borrowck-describe-lvalue.rs:147:15 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -257,7 +257,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v[..]` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:158:28 + --> $DIR/borrowck-describe-lvalue.rs:148:28 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -269,7 +269,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:169:15 + --> $DIR/borrowck-describe-lvalue.rs:159:15 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -280,7 +280,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v[..]` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:170:15 + --> $DIR/borrowck-describe-lvalue.rs:160:15 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -292,7 +292,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:175:15 + --> $DIR/borrowck-describe-lvalue.rs:165:15 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -304,7 +304,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v[..]` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:176:18 + --> $DIR/borrowck-describe-lvalue.rs:166:18 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -316,7 +316,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:181:15 + --> $DIR/borrowck-describe-lvalue.rs:171:15 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -328,7 +328,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v[..]` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:182:15 + --> $DIR/borrowck-describe-lvalue.rs:172:15 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -340,7 +340,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:187:15 + --> $DIR/borrowck-describe-lvalue.rs:177:15 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -352,7 +352,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v[..]` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:188:18 + --> $DIR/borrowck-describe-lvalue.rs:178:18 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -364,7 +364,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `e` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:201:15 + --> $DIR/borrowck-describe-lvalue.rs:191:15 | LL | let x = &mut e; | ------ borrow of `e` occurs here @@ -375,7 +375,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `e` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:202:13 + --> $DIR/borrowck-describe-lvalue.rs:192:13 | LL | let x = &mut e; | ------ borrow of `e` occurs here @@ -387,7 +387,7 @@ LL | drop(x); | - borrow later used here error[E0502]: cannot borrow `e.0` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-describe-lvalue.rs:202:18 + --> $DIR/borrowck-describe-lvalue.rs:192:18 | LL | let x = &mut e; | ------ mutable borrow occurs here @@ -399,7 +399,7 @@ LL | drop(x); | - borrow later used here error[E0502]: cannot borrow `e.x` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-describe-lvalue.rs:207:23 + --> $DIR/borrowck-describe-lvalue.rs:197:23 | LL | let x = &mut e; | ------ mutable borrow occurs here @@ -411,7 +411,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `s` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:220:15 + --> $DIR/borrowck-describe-lvalue.rs:210:15 | LL | let x = &mut s; | ------ borrow of `s` occurs here @@ -422,7 +422,7 @@ LL | drop(x); | - borrow later used here error[E0502]: cannot borrow `s.y.0` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-describe-lvalue.rs:221:22 + --> $DIR/borrowck-describe-lvalue.rs:211:22 | LL | let x = &mut s; | ------ mutable borrow occurs here @@ -434,7 +434,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `s` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:227:15 + --> $DIR/borrowck-describe-lvalue.rs:217:15 | LL | let x = &mut s; | ------ borrow of `s` occurs here @@ -446,7 +446,7 @@ LL | drop(x); | - borrow later used here error[E0502]: cannot borrow `s.x.y` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-describe-lvalue.rs:228:28 + --> $DIR/borrowck-describe-lvalue.rs:218:28 | LL | let x = &mut s; | ------ mutable borrow occurs here @@ -458,7 +458,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `*v` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:271:9 + --> $DIR/borrowck-describe-lvalue.rs:261:9 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -469,7 +469,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v[..].y` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:271:9 + --> $DIR/borrowck-describe-lvalue.rs:261:9 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -480,7 +480,7 @@ LL | drop(x); | - borrow later used here error[E0503]: cannot use `v` because it was mutably borrowed - --> $DIR/borrowck-describe-lvalue.rs:282:15 + --> $DIR/borrowck-describe-lvalue.rs:272:15 | LL | let x = &mut v; | ------ borrow of `v` occurs here @@ -491,7 +491,7 @@ LL | drop(x); | - borrow later used here error[E0502]: cannot borrow `v[..].x` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-describe-lvalue.rs:283:24 + --> $DIR/borrowck-describe-lvalue.rs:273:24 | LL | let x = &mut v; | ------ mutable borrow occurs here @@ -503,7 +503,7 @@ LL | drop(x); | - borrow later used here error[E0502]: cannot borrow `*block.current` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-describe-lvalue.rs:245:29 + --> $DIR/borrowck-describe-lvalue.rs:235:29 | LL | let x = &mut block; | ---------- mutable borrow occurs here @@ -514,7 +514,7 @@ LL | drop(x); | - borrow later used here error[E0502]: cannot borrow `*block.current` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-describe-lvalue.rs:260:33 + --> $DIR/borrowck-describe-lvalue.rs:250:33 | LL | let x = &mut block; | ---------- mutable borrow occurs here @@ -525,7 +525,7 @@ LL | drop(x); | - borrow later used here error[E0382]: use of moved value: `x` - --> $DIR/borrowck-describe-lvalue.rs:318:22 + --> $DIR/borrowck-describe-lvalue.rs:308:22 | LL | drop(x); | - value moved here diff --git a/src/test/ui/borrowck/borrowck-describe-lvalue.rs b/src/test/ui/borrowck/borrowck-describe-lvalue.rs index b821c7cfa34ff..b2154643a51e5 100644 --- a/src/test/ui/borrowck/borrowck-describe-lvalue.rs +++ b/src/test/ui/borrowck/borrowck-describe-lvalue.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/borrowck/borrowck-drop-from-guard.rs b/src/test/ui/borrowck/borrowck-drop-from-guard.rs index 496aa84b593f3..67a2275dcf74f 100644 --- a/src/test/ui/borrowck/borrowck-drop-from-guard.rs +++ b/src/test/ui/borrowck/borrowck-drop-from-guard.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - //compile-flags: -Z borrowck=mir fn foo(_:String) {} diff --git a/src/test/ui/borrowck/borrowck-drop-from-guard.stderr b/src/test/ui/borrowck/borrowck-drop-from-guard.stderr index e28b500ce63f0..d395b7734f9b7 100644 --- a/src/test/ui/borrowck/borrowck-drop-from-guard.stderr +++ b/src/test/ui/borrowck/borrowck-drop-from-guard.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `my_str` - --> $DIR/borrowck-drop-from-guard.rs:22:23 + --> $DIR/borrowck-drop-from-guard.rs:11:23 | LL | Some(_) if { drop(my_str); false } => {} | ------ value moved here diff --git a/src/test/ui/borrowck/borrowck-escaping-closure-error-1.nll.stderr b/src/test/ui/borrowck/borrowck-escaping-closure-error-1.nll.stderr index 426419a7b3b7f..b26c68621597c 100644 --- a/src/test/ui/borrowck/borrowck-escaping-closure-error-1.nll.stderr +++ b/src/test/ui/borrowck/borrowck-escaping-closure-error-1.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `books` does not live long enough - --> $DIR/borrowck-escaping-closure-error-1.rs:23:14 + --> $DIR/borrowck-escaping-closure-error-1.rs:13:14 | LL | spawn(|| books.push(4)); | -- ^^^^^ borrowed value does not live long enough diff --git a/src/test/ui/borrowck/borrowck-escaping-closure-error-1.rs b/src/test/ui/borrowck/borrowck-escaping-closure-error-1.rs index 87e40df7663ba..11c0610aa0cae 100644 --- a/src/test/ui/borrowck/borrowck-escaping-closure-error-1.rs +++ b/src/test/ui/borrowck/borrowck-escaping-closure-error-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::thread::spawn; // Test that we give a custom error (E0373) for the case where a diff --git a/src/test/ui/borrowck/borrowck-escaping-closure-error-1.stderr b/src/test/ui/borrowck/borrowck-escaping-closure-error-1.stderr index eb1fa53d7558a..16ba61d9972c4 100644 --- a/src/test/ui/borrowck/borrowck-escaping-closure-error-1.stderr +++ b/src/test/ui/borrowck/borrowck-escaping-closure-error-1.stderr @@ -1,5 +1,5 @@ error[E0373]: closure may outlive the current function, but it borrows `books`, which is owned by the current function - --> $DIR/borrowck-escaping-closure-error-1.rs:23:11 + --> $DIR/borrowck-escaping-closure-error-1.rs:13:11 | LL | spawn(|| books.push(4)); | ^^ ----- `books` is borrowed here diff --git a/src/test/ui/borrowck/borrowck-escaping-closure-error-2.nll.stderr b/src/test/ui/borrowck/borrowck-escaping-closure-error-2.nll.stderr index d5f3a0ed6d82e..df6a9604ce387 100644 --- a/src/test/ui/borrowck/borrowck-escaping-closure-error-2.nll.stderr +++ b/src/test/ui/borrowck/borrowck-escaping-closure-error-2.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `books` does not live long enough - --> $DIR/borrowck-escaping-closure-error-2.rs:21:17 + --> $DIR/borrowck-escaping-closure-error-2.rs:11:17 | LL | Box::new(|| books.push(4)) | -- ^^^^^ borrowed value does not live long enough @@ -9,8 +9,8 @@ LL | //~^ ERROR E0373 LL | } | - `books` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 19:8... - --> $DIR/borrowck-escaping-closure-error-2.rs:19:8 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 9:8... + --> $DIR/borrowck-escaping-closure-error-2.rs:9:8 | LL | fn foo<'a>(x: &'a i32) -> Box { | ^^ diff --git a/src/test/ui/borrowck/borrowck-escaping-closure-error-2.rs b/src/test/ui/borrowck/borrowck-escaping-closure-error-2.rs index 67700be890b1f..a44e3031e256f 100644 --- a/src/test/ui/borrowck/borrowck-escaping-closure-error-2.rs +++ b/src/test/ui/borrowck/borrowck-escaping-closure-error-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we give a custom error (E0373) for the case where a // closure is escaping current frame, and offer a suggested code edit. // I refrained from including the precise message here, but the diff --git a/src/test/ui/borrowck/borrowck-escaping-closure-error-2.stderr b/src/test/ui/borrowck/borrowck-escaping-closure-error-2.stderr index 1343c0a1f5b71..960f65da5f0b2 100644 --- a/src/test/ui/borrowck/borrowck-escaping-closure-error-2.stderr +++ b/src/test/ui/borrowck/borrowck-escaping-closure-error-2.stderr @@ -1,5 +1,5 @@ error[E0373]: closure may outlive the current function, but it borrows `books`, which is owned by the current function - --> $DIR/borrowck-escaping-closure-error-2.rs:21:14 + --> $DIR/borrowck-escaping-closure-error-2.rs:11:14 | LL | Box::new(|| books.push(4)) | ^^ ----- `books` is borrowed here diff --git a/src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.edition.stderr b/src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.edition.stderr index fa82efa353384..9059ef438d0f5 100644 --- a/src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.edition.stderr +++ b/src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.edition.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-feature-nll-overrides-migrate.rs:32:17 + --> $DIR/borrowck-feature-nll-overrides-migrate.rs:22:17 | LL | (|| { let bar = foo; bar.take() })(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of borrowed content diff --git a/src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.rs b/src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.rs index 104c0886311d0..4eefc5859ff54 100644 --- a/src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.rs +++ b/src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This is a test that the `#![feature(nll)]` opt-in overrides the // migration mode. The intention here is to emulate the goal behavior // that `--edition 2018` effects on borrowck (modeled here by `-Z diff --git a/src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.zflag.stderr b/src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.zflag.stderr index fa82efa353384..9059ef438d0f5 100644 --- a/src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.zflag.stderr +++ b/src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.zflag.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-feature-nll-overrides-migrate.rs:32:17 + --> $DIR/borrowck-feature-nll-overrides-migrate.rs:22:17 | LL | (|| { let bar = foo; bar.take() })(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of borrowed content diff --git a/src/test/ui/borrowck/borrowck-field-sensitivity.nll.stderr b/src/test/ui/borrowck/borrowck-field-sensitivity.nll.stderr index fb300d32b05e9..00e7e422b0234 100644 --- a/src/test/ui/borrowck/borrowck-field-sensitivity.nll.stderr +++ b/src/test/ui/borrowck/borrowck-field-sensitivity.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `*x.b` - --> $DIR/borrowck-field-sensitivity.rs:18:10 + --> $DIR/borrowck-field-sensitivity.rs:8:10 | LL | drop(x.b); | --- value moved here @@ -7,7 +7,7 @@ LL | drop(*x.b); //~ ERROR use of moved value: `*x.b` | ^^^^ value used here after move error[E0382]: use of moved value: `*x.b` - --> $DIR/borrowck-field-sensitivity.rs:24:10 + --> $DIR/borrowck-field-sensitivity.rs:14:10 | LL | let y = A { a: 3, .. x }; | ---------------- value moved here @@ -15,7 +15,7 @@ LL | drop(*x.b); //~ ERROR use of moved value: `*x.b` | ^^^^ value used here after move error[E0382]: borrow of moved value: `x.b` - --> $DIR/borrowck-field-sensitivity.rs:30:13 + --> $DIR/borrowck-field-sensitivity.rs:20:13 | LL | drop(x.b); | --- value moved here @@ -25,7 +25,7 @@ LL | let p = &x.b; //~ ERROR use of moved value: `x.b` = note: move occurs because `x.b` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0382]: borrow of moved value: `x.b` - --> $DIR/borrowck-field-sensitivity.rs:37:13 + --> $DIR/borrowck-field-sensitivity.rs:27:13 | LL | let _y = A { a: 3, .. x }; | ---------------- value moved here @@ -35,7 +35,7 @@ LL | let p = &x.b; //~ ERROR use of moved value: `x.b` = note: move occurs because `x.b` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0505]: cannot move out of `x.b` because it is borrowed - --> $DIR/borrowck-field-sensitivity.rs:44:10 + --> $DIR/borrowck-field-sensitivity.rs:34:10 | LL | let p = &x.b; | ---- borrow of `x.b` occurs here @@ -45,7 +45,7 @@ LL | drop(**p); | --- borrow later used here error[E0505]: cannot move out of `x.b` because it is borrowed - --> $DIR/borrowck-field-sensitivity.rs:51:14 + --> $DIR/borrowck-field-sensitivity.rs:41:14 | LL | let p = &x.b; | ---- borrow of `x.b` occurs here @@ -55,7 +55,7 @@ LL | drop(**p); | --- borrow later used here error[E0499]: cannot borrow `x.a` as mutable more than once at a time - --> $DIR/borrowck-field-sensitivity.rs:58:13 + --> $DIR/borrowck-field-sensitivity.rs:48:13 | LL | let p = &mut x.a; | -------- first mutable borrow occurs here @@ -65,7 +65,7 @@ LL | drop(*p); | -- borrow later used here error[E0382]: use of moved value: `x.b` - --> $DIR/borrowck-field-sensitivity.rs:66:10 + --> $DIR/borrowck-field-sensitivity.rs:56:10 | LL | drop(x.b); | --- value moved here @@ -75,7 +75,7 @@ LL | drop(x.b); //~ ERROR use of moved value: `x.b` = note: move occurs because `x.b` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0382]: use of moved value: `x.b` - --> $DIR/borrowck-field-sensitivity.rs:72:10 + --> $DIR/borrowck-field-sensitivity.rs:62:10 | LL | let _y = A { a: 3, .. x }; | ---------------- value moved here @@ -85,7 +85,7 @@ LL | drop(x.b); //~ ERROR use of moved value: `x.b` = note: move occurs because `x.b` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0382]: use of moved value: `x.b` - --> $DIR/borrowck-field-sensitivity.rs:78:14 + --> $DIR/borrowck-field-sensitivity.rs:68:14 | LL | drop(x.b); | --- value moved here @@ -95,7 +95,7 @@ LL | let _z = A { a: 3, .. x }; //~ ERROR use of moved value: `x.b` = note: move occurs because `x.b` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0382]: use of moved value: `x.b` - --> $DIR/borrowck-field-sensitivity.rs:84:14 + --> $DIR/borrowck-field-sensitivity.rs:74:14 | LL | let _y = A { a: 3, .. x }; | ---------------- value moved here diff --git a/src/test/ui/borrowck/borrowck-field-sensitivity.rs b/src/test/ui/borrowck/borrowck-field-sensitivity.rs index 13fd5fce95569..1e9e6d68a518a 100644 --- a/src/test/ui/borrowck/borrowck-field-sensitivity.rs +++ b/src/test/ui/borrowck/borrowck-field-sensitivity.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] struct A { a: isize, b: Box } diff --git a/src/test/ui/borrowck/borrowck-field-sensitivity.stderr b/src/test/ui/borrowck/borrowck-field-sensitivity.stderr index e5eba3790a0bc..bfab5cbe536dd 100644 --- a/src/test/ui/borrowck/borrowck-field-sensitivity.stderr +++ b/src/test/ui/borrowck/borrowck-field-sensitivity.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `*x.b` - --> $DIR/borrowck-field-sensitivity.rs:18:10 + --> $DIR/borrowck-field-sensitivity.rs:8:10 | LL | drop(x.b); | --- value moved here @@ -9,7 +9,7 @@ LL | drop(*x.b); //~ ERROR use of moved value: `*x.b` = note: move occurs because `x.b` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0382]: use of moved value: `*x.b` - --> $DIR/borrowck-field-sensitivity.rs:24:10 + --> $DIR/borrowck-field-sensitivity.rs:14:10 | LL | let y = A { a: 3, .. x }; | - value moved here @@ -19,7 +19,7 @@ LL | drop(*x.b); //~ ERROR use of moved value: `*x.b` = note: move occurs because `x.b` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0382]: use of moved value: `x.b` - --> $DIR/borrowck-field-sensitivity.rs:30:14 + --> $DIR/borrowck-field-sensitivity.rs:20:14 | LL | drop(x.b); | --- value moved here @@ -29,7 +29,7 @@ LL | let p = &x.b; //~ ERROR use of moved value: `x.b` = note: move occurs because `x.b` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0382]: use of moved value: `x.b` - --> $DIR/borrowck-field-sensitivity.rs:37:14 + --> $DIR/borrowck-field-sensitivity.rs:27:14 | LL | let _y = A { a: 3, .. x }; | - value moved here @@ -39,7 +39,7 @@ LL | let p = &x.b; //~ ERROR use of moved value: `x.b` = note: move occurs because `x.b` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0505]: cannot move out of `x.b` because it is borrowed - --> $DIR/borrowck-field-sensitivity.rs:44:10 + --> $DIR/borrowck-field-sensitivity.rs:34:10 | LL | let p = &x.b; | --- borrow of `x.b` occurs here @@ -47,7 +47,7 @@ LL | drop(x.b); //~ ERROR cannot move out of `x.b` because it is borrowed | ^^^ move out of `x.b` occurs here error[E0505]: cannot move out of `x.b` because it is borrowed - --> $DIR/borrowck-field-sensitivity.rs:51:27 + --> $DIR/borrowck-field-sensitivity.rs:41:27 | LL | let p = &x.b; | --- borrow of `x.b` occurs here @@ -55,7 +55,7 @@ LL | let _y = A { a: 3, .. x }; //~ ERROR cannot move out of `x.b` because i | ^ move out of `x.b` occurs here error[E0499]: cannot borrow `x.a` as mutable more than once at a time - --> $DIR/borrowck-field-sensitivity.rs:58:18 + --> $DIR/borrowck-field-sensitivity.rs:48:18 | LL | let p = &mut x.a; | --- first mutable borrow occurs here @@ -66,7 +66,7 @@ LL | } | - first borrow ends here error[E0382]: use of moved value: `x.b` - --> $DIR/borrowck-field-sensitivity.rs:66:10 + --> $DIR/borrowck-field-sensitivity.rs:56:10 | LL | drop(x.b); | --- value moved here @@ -76,7 +76,7 @@ LL | drop(x.b); //~ ERROR use of moved value: `x.b` = note: move occurs because `x.b` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0382]: use of moved value: `x.b` - --> $DIR/borrowck-field-sensitivity.rs:72:10 + --> $DIR/borrowck-field-sensitivity.rs:62:10 | LL | let _y = A { a: 3, .. x }; | - value moved here @@ -86,7 +86,7 @@ LL | drop(x.b); //~ ERROR use of moved value: `x.b` = note: move occurs because `x.b` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0382]: use of moved value: `x.b` - --> $DIR/borrowck-field-sensitivity.rs:78:27 + --> $DIR/borrowck-field-sensitivity.rs:68:27 | LL | drop(x.b); | --- value moved here @@ -96,7 +96,7 @@ LL | let _z = A { a: 3, .. x }; //~ ERROR use of moved value: `x.b` = note: move occurs because `x.b` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0382]: use of moved value: `x.b` - --> $DIR/borrowck-field-sensitivity.rs:84:27 + --> $DIR/borrowck-field-sensitivity.rs:74:27 | LL | let _y = A { a: 3, .. x }; | - value moved here @@ -106,19 +106,19 @@ LL | let _z = A { a: 4, .. x }; //~ ERROR use of moved value: `x.b` = note: move occurs because `x.b` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0381]: use of possibly uninitialized variable: `x.a` - --> $DIR/borrowck-field-sensitivity.rs:92:10 + --> $DIR/borrowck-field-sensitivity.rs:82:10 | LL | drop(x.a); //~ ERROR use of possibly uninitialized variable: `x.a` | ^^^ use of possibly uninitialized `x.a` error[E0381]: use of possibly uninitialized variable: `x.a` - --> $DIR/borrowck-field-sensitivity.rs:98:14 + --> $DIR/borrowck-field-sensitivity.rs:88:14 | LL | let p = &x.a; //~ ERROR use of possibly uninitialized variable: `x.a` | ^^^ use of possibly uninitialized `x.a` error[E0381]: use of possibly uninitialized variable: `x.b` - --> $DIR/borrowck-field-sensitivity.rs:105:10 + --> $DIR/borrowck-field-sensitivity.rs:95:10 | LL | drop(x.b); //~ ERROR use of possibly uninitialized variable: `x.b` | ^^^ use of possibly uninitialized `x.b` diff --git a/src/test/ui/borrowck/borrowck-fn-in-const-a.ast.stderr b/src/test/ui/borrowck/borrowck-fn-in-const-a.ast.stderr index 4d0c762ca77c9..6a5c5047fb237 100644 --- a/src/test/ui/borrowck/borrowck-fn-in-const-a.ast.stderr +++ b/src/test/ui/borrowck/borrowck-fn-in-const-a.ast.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-fn-in-const-a.rs:19:16 + --> $DIR/borrowck-fn-in-const-a.rs:9:16 | LL | return *x //[ast]~ ERROR cannot move out of borrowed content [E0507] | ^^ cannot move out of borrowed content diff --git a/src/test/ui/borrowck/borrowck-fn-in-const-a.mir.stderr b/src/test/ui/borrowck/borrowck-fn-in-const-a.mir.stderr index 4d0c762ca77c9..6a5c5047fb237 100644 --- a/src/test/ui/borrowck/borrowck-fn-in-const-a.mir.stderr +++ b/src/test/ui/borrowck/borrowck-fn-in-const-a.mir.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-fn-in-const-a.rs:19:16 + --> $DIR/borrowck-fn-in-const-a.rs:9:16 | LL | return *x //[ast]~ ERROR cannot move out of borrowed content [E0507] | ^^ cannot move out of borrowed content diff --git a/src/test/ui/borrowck/borrowck-fn-in-const-a.rs b/src/test/ui/borrowck/borrowck-fn-in-const-a.rs index 33b78cb26d8e3..17663a30ca76d 100644 --- a/src/test/ui/borrowck/borrowck-fn-in-const-a.rs +++ b/src/test/ui/borrowck/borrowck-fn-in-const-a.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/borrowck/borrowck-fn-in-const-c.nll.stderr b/src/test/ui/borrowck/borrowck-fn-in-const-c.nll.stderr index 827b66cf068b4..5fa007d12c0e9 100644 --- a/src/test/ui/borrowck/borrowck-fn-in-const-c.nll.stderr +++ b/src/test/ui/borrowck/borrowck-fn-in-const-c.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `local.inner` does not live long enough - --> $DIR/borrowck-fn-in-const-c.rs:27:16 + --> $DIR/borrowck-fn-in-const-c.rs:17:16 | LL | return &local.inner; //~ ERROR does not live long enough | ^^^^^^^^^^^^ borrowed value does not live long enough diff --git a/src/test/ui/borrowck/borrowck-fn-in-const-c.rs b/src/test/ui/borrowck/borrowck-fn-in-const-c.rs index e607397e920e2..d0a2e5b037df4 100644 --- a/src/test/ui/borrowck/borrowck-fn-in-const-c.rs +++ b/src/test/ui/borrowck/borrowck-fn-in-const-c.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we check fns appearing in constant declarations. // Issue #22382. diff --git a/src/test/ui/borrowck/borrowck-fn-in-const-c.stderr b/src/test/ui/borrowck/borrowck-fn-in-const-c.stderr index 1dda8d4186034..f6e7e99393c8c 100644 --- a/src/test/ui/borrowck/borrowck-fn-in-const-c.stderr +++ b/src/test/ui/borrowck/borrowck-fn-in-const-c.stderr @@ -1,5 +1,5 @@ error[E0597]: `local.inner` does not live long enough - --> $DIR/borrowck-fn-in-const-c.rs:27:17 + --> $DIR/borrowck-fn-in-const-c.rs:17:17 | LL | return &local.inner; //~ ERROR does not live long enough | ^^^^^^^^^^^ borrowed value does not live long enough diff --git a/src/test/ui/borrowck/borrowck-for-loop-correct-cmt-for-pattern.nll.stderr b/src/test/ui/borrowck/borrowck-for-loop-correct-cmt-for-pattern.nll.stderr index 25eb69ad9377d..8ba6a07b3d2d4 100644 --- a/src/test/ui/borrowck/borrowck-for-loop-correct-cmt-for-pattern.nll.stderr +++ b/src/test/ui/borrowck/borrowck-for-loop-correct-cmt-for-pattern.nll.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-for-loop-correct-cmt-for-pattern.rs:22:15 + --> $DIR/borrowck-for-loop-correct-cmt-for-pattern.rs:12:15 | LL | for &a in x.iter() { //~ ERROR cannot move out | -- ^^^^^^^^ cannot move out of borrowed content @@ -8,13 +8,13 @@ LL | for &a in x.iter() { //~ ERROR cannot move out | help: consider removing the `&`: `a` | note: move occurs because `a` has type `&mut i32`, which does not implement the `Copy` trait - --> $DIR/borrowck-for-loop-correct-cmt-for-pattern.rs:22:10 + --> $DIR/borrowck-for-loop-correct-cmt-for-pattern.rs:12:10 | LL | for &a in x.iter() { //~ ERROR cannot move out | ^ error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-for-loop-correct-cmt-for-pattern.rs:28:15 + --> $DIR/borrowck-for-loop-correct-cmt-for-pattern.rs:18:15 | LL | for &a in &f.a { //~ ERROR cannot move out | -- ^^^^ cannot move out of borrowed content @@ -23,13 +23,13 @@ LL | for &a in &f.a { //~ ERROR cannot move out | help: consider removing the `&`: `a` | note: move occurs because `a` has type `std::boxed::Box`, which does not implement the `Copy` trait - --> $DIR/borrowck-for-loop-correct-cmt-for-pattern.rs:28:10 + --> $DIR/borrowck-for-loop-correct-cmt-for-pattern.rs:18:10 | LL | for &a in &f.a { //~ ERROR cannot move out | ^ error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-for-loop-correct-cmt-for-pattern.rs:32:15 + --> $DIR/borrowck-for-loop-correct-cmt-for-pattern.rs:22:15 | LL | for &a in x.iter() { //~ ERROR cannot move out | -- ^^^^^^^^ cannot move out of borrowed content @@ -38,7 +38,7 @@ LL | for &a in x.iter() { //~ ERROR cannot move out | help: consider removing the `&`: `a` | note: move occurs because `a` has type `std::boxed::Box`, which does not implement the `Copy` trait - --> $DIR/borrowck-for-loop-correct-cmt-for-pattern.rs:32:10 + --> $DIR/borrowck-for-loop-correct-cmt-for-pattern.rs:22:10 | LL | for &a in x.iter() { //~ ERROR cannot move out | ^ diff --git a/src/test/ui/borrowck/borrowck-for-loop-correct-cmt-for-pattern.rs b/src/test/ui/borrowck/borrowck-for-loop-correct-cmt-for-pattern.rs index 31ec5aea7f3a6..de75368578d9f 100644 --- a/src/test/ui/borrowck/borrowck-for-loop-correct-cmt-for-pattern.rs +++ b/src/test/ui/borrowck/borrowck-for-loop-correct-cmt-for-pattern.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #16205. #![feature(box_syntax)] diff --git a/src/test/ui/borrowck/borrowck-for-loop-correct-cmt-for-pattern.stderr b/src/test/ui/borrowck/borrowck-for-loop-correct-cmt-for-pattern.stderr index baa8a668cd930..1a7e2cb69632c 100644 --- a/src/test/ui/borrowck/borrowck-for-loop-correct-cmt-for-pattern.stderr +++ b/src/test/ui/borrowck/borrowck-for-loop-correct-cmt-for-pattern.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-for-loop-correct-cmt-for-pattern.rs:22:9 + --> $DIR/borrowck-for-loop-correct-cmt-for-pattern.rs:12:9 | LL | for &a in x.iter() { //~ ERROR cannot move out | ^- @@ -8,7 +8,7 @@ LL | for &a in x.iter() { //~ ERROR cannot move out | cannot move out of borrowed content error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-for-loop-correct-cmt-for-pattern.rs:28:9 + --> $DIR/borrowck-for-loop-correct-cmt-for-pattern.rs:18:9 | LL | for &a in &f.a { //~ ERROR cannot move out | ^- @@ -17,7 +17,7 @@ LL | for &a in &f.a { //~ ERROR cannot move out | cannot move out of borrowed content error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-for-loop-correct-cmt-for-pattern.rs:32:9 + --> $DIR/borrowck-for-loop-correct-cmt-for-pattern.rs:22:9 | LL | for &a in x.iter() { //~ ERROR cannot move out | ^- diff --git a/src/test/ui/borrowck/borrowck-for-loop-head-linkage.nll.stderr b/src/test/ui/borrowck/borrowck-for-loop-head-linkage.nll.stderr index c3f71d60072b9..266791f043b94 100644 --- a/src/test/ui/borrowck/borrowck-for-loop-head-linkage.nll.stderr +++ b/src/test/ui/borrowck/borrowck-for-loop-head-linkage.nll.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `vector` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-for-loop-head-linkage.rs:17:9 + --> $DIR/borrowck-for-loop-head-linkage.rs:7:9 | LL | for &x in &vector { | ------- @@ -11,7 +11,7 @@ LL | vector.extend(repeat(0)); //~ ERROR cannot borrow | ^^^^^^^^^^^^^^^^^^^^^^^^ mutable borrow occurs here error[E0502]: cannot borrow `vector` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-for-loop-head-linkage.rs:18:9 + --> $DIR/borrowck-for-loop-head-linkage.rs:8:9 | LL | for &x in &vector { | ------- diff --git a/src/test/ui/borrowck/borrowck-for-loop-head-linkage.rs b/src/test/ui/borrowck/borrowck-for-loop-head-linkage.rs index b79fc5b2bf622..a84b695aafb8b 100644 --- a/src/test/ui/borrowck/borrowck-for-loop-head-linkage.rs +++ b/src/test/ui/borrowck/borrowck-for-loop-head-linkage.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::iter::repeat; fn main() { diff --git a/src/test/ui/borrowck/borrowck-for-loop-head-linkage.stderr b/src/test/ui/borrowck/borrowck-for-loop-head-linkage.stderr index fd00138356d25..85008948a1c0f 100644 --- a/src/test/ui/borrowck/borrowck-for-loop-head-linkage.stderr +++ b/src/test/ui/borrowck/borrowck-for-loop-head-linkage.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `vector` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-for-loop-head-linkage.rs:17:9 + --> $DIR/borrowck-for-loop-head-linkage.rs:7:9 | LL | for &x in &vector { | ------ @@ -11,7 +11,7 @@ LL | vector.extend(repeat(0)); //~ ERROR cannot borrow | ^^^^^^ mutable borrow occurs here error[E0502]: cannot borrow `vector` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-for-loop-head-linkage.rs:18:9 + --> $DIR/borrowck-for-loop-head-linkage.rs:8:9 | LL | for &x in &vector { | ------ diff --git a/src/test/ui/borrowck/borrowck-if-no-else.rs b/src/test/ui/borrowck/borrowck-if-no-else.rs index 74b542800b9e9..044db99d54c1f 100644 --- a/src/test/ui/borrowck/borrowck-if-no-else.rs +++ b/src/test/ui/borrowck/borrowck-if-no-else.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo(x: isize) { println!("{}", x); } fn main() { diff --git a/src/test/ui/borrowck/borrowck-if-no-else.stderr b/src/test/ui/borrowck/borrowck-if-no-else.stderr index 6c4a53a37d9c8..f6d199d788bf8 100644 --- a/src/test/ui/borrowck/borrowck-if-no-else.stderr +++ b/src/test/ui/borrowck/borrowck-if-no-else.stderr @@ -1,5 +1,5 @@ error[E0381]: use of possibly uninitialized variable: `x` - --> $DIR/borrowck-if-no-else.rs:15:9 + --> $DIR/borrowck-if-no-else.rs:5:9 | LL | foo(x); //~ ERROR use of possibly uninitialized variable: `x` | ^ use of possibly uninitialized `x` diff --git a/src/test/ui/borrowck/borrowck-if-with-else.rs b/src/test/ui/borrowck/borrowck-if-with-else.rs index f3b02d12854a8..f632d61a6c3c1 100644 --- a/src/test/ui/borrowck/borrowck-if-with-else.rs +++ b/src/test/ui/borrowck/borrowck-if-with-else.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo(x: isize) { println!("{}", x); } fn main() { diff --git a/src/test/ui/borrowck/borrowck-if-with-else.stderr b/src/test/ui/borrowck/borrowck-if-with-else.stderr index 097d11e387e84..e569fbdeca1e7 100644 --- a/src/test/ui/borrowck/borrowck-if-with-else.stderr +++ b/src/test/ui/borrowck/borrowck-if-with-else.stderr @@ -1,5 +1,5 @@ error[E0381]: use of possibly uninitialized variable: `x` - --> $DIR/borrowck-if-with-else.rs:20:9 + --> $DIR/borrowck-if-with-else.rs:10:9 | LL | foo(x); //~ ERROR use of possibly uninitialized variable: `x` | ^ use of possibly uninitialized `x` diff --git a/src/test/ui/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.ast.nll.stderr b/src/test/ui/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.ast.nll.stderr index 0a1bc2c195902..d3708b5cf2bbb 100644 --- a/src/test/ui/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `_a` because it is borrowed - --> $DIR/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.rs:19:9 + --> $DIR/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.rs:9:9 | LL | let b = &mut _a; | ------- borrow of `_a` occurs here diff --git a/src/test/ui/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.ast.stderr b/src/test/ui/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.ast.stderr index cb6d9875a9222..618edf57bb26e 100644 --- a/src/test/ui/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.ast.stderr +++ b/src/test/ui/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.ast.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `_a` because it is borrowed - --> $DIR/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.rs:19:9 + --> $DIR/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.rs:9:9 | LL | let b = &mut _a; | -- borrow of `_a` occurs here diff --git a/src/test/ui/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.mir.stderr b/src/test/ui/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.mir.stderr index 0a1bc2c195902..d3708b5cf2bbb 100644 --- a/src/test/ui/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.mir.stderr +++ b/src/test/ui/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.mir.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `_a` because it is borrowed - --> $DIR/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.rs:19:9 + --> $DIR/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.rs:9:9 | LL | let b = &mut _a; | ------- borrow of `_a` occurs here diff --git a/src/test/ui/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.rs b/src/test/ui/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.rs index 6f0e0f43f6088..334d2e008b956 100644 --- a/src/test/ui/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.rs +++ b/src/test/ui/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/borrowck/borrowck-in-static.nll.stderr b/src/test/ui/borrowck/borrowck-in-static.nll.stderr index 45fa1764f7027..ff094ecf70746 100644 --- a/src/test/ui/borrowck/borrowck-in-static.nll.stderr +++ b/src/test/ui/borrowck/borrowck-in-static.nll.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of captured variable in an `Fn` closure - --> $DIR/borrowck-in-static.rs:15:17 + --> $DIR/borrowck-in-static.rs:5:17 | LL | let x = Box::new(0); | - captured outer variable diff --git a/src/test/ui/borrowck/borrowck-in-static.rs b/src/test/ui/borrowck/borrowck-in-static.rs index 16b0e8638de39..c08f4138bfb39 100644 --- a/src/test/ui/borrowck/borrowck-in-static.rs +++ b/src/test/ui/borrowck/borrowck-in-static.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // check that borrowck looks inside consts/statics static FN : &'static (Fn() -> (BoxBox>) + Sync) = &|| { diff --git a/src/test/ui/borrowck/borrowck-in-static.stderr b/src/test/ui/borrowck/borrowck-in-static.stderr index 356fad07666e7..400f3cd1c3e78 100644 --- a/src/test/ui/borrowck/borrowck-in-static.stderr +++ b/src/test/ui/borrowck/borrowck-in-static.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of captured outer variable in an `Fn` closure - --> $DIR/borrowck-in-static.rs:15:17 + --> $DIR/borrowck-in-static.rs:5:17 | LL | let x = Box::new(0); | - captured outer variable diff --git a/src/test/ui/borrowck/borrowck-init-in-called-fn-expr.rs b/src/test/ui/borrowck/borrowck-init-in-called-fn-expr.rs index 5b32fd2d19872..f7457781adc3e 100644 --- a/src/test/ui/borrowck/borrowck-init-in-called-fn-expr.rs +++ b/src/test/ui/borrowck/borrowck-init-in-called-fn-expr.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let j = || -> isize { let i: isize; diff --git a/src/test/ui/borrowck/borrowck-init-in-called-fn-expr.stderr b/src/test/ui/borrowck/borrowck-init-in-called-fn-expr.stderr index e55603c451f5b..0195dc60eb3ee 100644 --- a/src/test/ui/borrowck/borrowck-init-in-called-fn-expr.stderr +++ b/src/test/ui/borrowck/borrowck-init-in-called-fn-expr.stderr @@ -1,5 +1,5 @@ error[E0381]: use of possibly uninitialized variable: `i` - --> $DIR/borrowck-init-in-called-fn-expr.rs:14:9 + --> $DIR/borrowck-init-in-called-fn-expr.rs:4:9 | LL | i //~ ERROR use of possibly uninitialized variable: `i` | ^ use of possibly uninitialized `i` diff --git a/src/test/ui/borrowck/borrowck-init-in-fn-expr.rs b/src/test/ui/borrowck/borrowck-init-in-fn-expr.rs index 65f1a1fa098ae..5055814625539 100644 --- a/src/test/ui/borrowck/borrowck-init-in-fn-expr.rs +++ b/src/test/ui/borrowck/borrowck-init-in-fn-expr.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let f = || -> isize { let i: isize; diff --git a/src/test/ui/borrowck/borrowck-init-in-fn-expr.stderr b/src/test/ui/borrowck/borrowck-init-in-fn-expr.stderr index 406fb5e68349b..dfa63f71c6956 100644 --- a/src/test/ui/borrowck/borrowck-init-in-fn-expr.stderr +++ b/src/test/ui/borrowck/borrowck-init-in-fn-expr.stderr @@ -1,5 +1,5 @@ error[E0381]: use of possibly uninitialized variable: `i` - --> $DIR/borrowck-init-in-fn-expr.rs:14:9 + --> $DIR/borrowck-init-in-fn-expr.rs:4:9 | LL | i //~ ERROR use of possibly uninitialized variable: `i` | ^ use of possibly uninitialized `i` diff --git a/src/test/ui/borrowck/borrowck-init-in-fru.ast.nll.stderr b/src/test/ui/borrowck/borrowck-init-in-fru.ast.nll.stderr index cac9d890dae0f..7cb4bb4d982f0 100644 --- a/src/test/ui/borrowck/borrowck-init-in-fru.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-init-in-fru.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0381]: use of possibly uninitialized variable: `origin.y` - --> $DIR/borrowck-init-in-fru.rs:22:5 + --> $DIR/borrowck-init-in-fru.rs:12:5 | LL | origin = point {x: 10,.. origin}; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ use of possibly uninitialized `origin.y` diff --git a/src/test/ui/borrowck/borrowck-init-in-fru.ast.stderr b/src/test/ui/borrowck/borrowck-init-in-fru.ast.stderr index a5c1ef7f4f52c..2d3a4e98c1600 100644 --- a/src/test/ui/borrowck/borrowck-init-in-fru.ast.stderr +++ b/src/test/ui/borrowck/borrowck-init-in-fru.ast.stderr @@ -1,5 +1,5 @@ error[E0381]: use of possibly uninitialized variable: `origin.y` - --> $DIR/borrowck-init-in-fru.rs:22:30 + --> $DIR/borrowck-init-in-fru.rs:12:30 | LL | origin = point {x: 10,.. origin}; | ^^^^^^ use of possibly uninitialized `origin.y` diff --git a/src/test/ui/borrowck/borrowck-init-in-fru.mir.stderr b/src/test/ui/borrowck/borrowck-init-in-fru.mir.stderr index cac9d890dae0f..7cb4bb4d982f0 100644 --- a/src/test/ui/borrowck/borrowck-init-in-fru.mir.stderr +++ b/src/test/ui/borrowck/borrowck-init-in-fru.mir.stderr @@ -1,5 +1,5 @@ error[E0381]: use of possibly uninitialized variable: `origin.y` - --> $DIR/borrowck-init-in-fru.rs:22:5 + --> $DIR/borrowck-init-in-fru.rs:12:5 | LL | origin = point {x: 10,.. origin}; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ use of possibly uninitialized `origin.y` diff --git a/src/test/ui/borrowck/borrowck-init-in-fru.rs b/src/test/ui/borrowck/borrowck-init-in-fru.rs index 1ec0f98077477..d0083d6221720 100644 --- a/src/test/ui/borrowck/borrowck-init-in-fru.rs +++ b/src/test/ui/borrowck/borrowck-init-in-fru.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/borrowck/borrowck-init-op-equal.rs b/src/test/ui/borrowck/borrowck-init-op-equal.rs index e0d93fd1d475b..d3fa852ac91ba 100644 --- a/src/test/ui/borrowck/borrowck-init-op-equal.rs +++ b/src/test/ui/borrowck/borrowck-init-op-equal.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn test() { let v: isize; v += 1; //~ ERROR use of possibly uninitialized variable: `v` diff --git a/src/test/ui/borrowck/borrowck-init-op-equal.stderr b/src/test/ui/borrowck/borrowck-init-op-equal.stderr index b8e91e356c106..414124040aa26 100644 --- a/src/test/ui/borrowck/borrowck-init-op-equal.stderr +++ b/src/test/ui/borrowck/borrowck-init-op-equal.stderr @@ -1,5 +1,5 @@ error[E0381]: use of possibly uninitialized variable: `v` - --> $DIR/borrowck-init-op-equal.rs:14:5 + --> $DIR/borrowck-init-op-equal.rs:3:5 | LL | v += 1; //~ ERROR use of possibly uninitialized variable: `v` | ^^^^^^ use of possibly uninitialized `v` diff --git a/src/test/ui/borrowck/borrowck-init-plus-equal.rs b/src/test/ui/borrowck/borrowck-init-plus-equal.rs index a036286f3634a..d895a2e16b537 100644 --- a/src/test/ui/borrowck/borrowck-init-plus-equal.rs +++ b/src/test/ui/borrowck/borrowck-init-plus-equal.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn test() { let mut v: isize; v = v + 1; //~ ERROR use of possibly uninitialized variable: `v` diff --git a/src/test/ui/borrowck/borrowck-init-plus-equal.stderr b/src/test/ui/borrowck/borrowck-init-plus-equal.stderr index f49c06c0c8659..124a60b8a5021 100644 --- a/src/test/ui/borrowck/borrowck-init-plus-equal.stderr +++ b/src/test/ui/borrowck/borrowck-init-plus-equal.stderr @@ -1,5 +1,5 @@ error[E0381]: use of possibly uninitialized variable: `v` - --> $DIR/borrowck-init-plus-equal.rs:13:9 + --> $DIR/borrowck-init-plus-equal.rs:3:9 | LL | v = v + 1; //~ ERROR use of possibly uninitialized variable: `v` | ^ use of possibly uninitialized `v` diff --git a/src/test/ui/borrowck/borrowck-insert-during-each.nll.stderr b/src/test/ui/borrowck/borrowck-insert-during-each.nll.stderr index e403b076ab406..81a7839b23455 100644 --- a/src/test/ui/borrowck/borrowck-insert-during-each.nll.stderr +++ b/src/test/ui/borrowck/borrowck-insert-during-each.nll.stderr @@ -1,5 +1,5 @@ error[E0501]: cannot borrow `*f` as mutable because previous closure requires unique access - --> $DIR/borrowck-insert-during-each.rs:26:3 + --> $DIR/borrowck-insert-during-each.rs:16:3 | LL | f.foo( | ___^ @@ -16,7 +16,7 @@ LL | || }) | borrow later used here error[E0500]: closure requires unique access to `f` but it is already borrowed - --> $DIR/borrowck-insert-during-each.rs:27:9 + --> $DIR/borrowck-insert-during-each.rs:17:9 | LL | f.foo( | - diff --git a/src/test/ui/borrowck/borrowck-insert-during-each.rs b/src/test/ui/borrowck/borrowck-insert-during-each.rs index 8499ebb8ac370..025da4d613dbb 100644 --- a/src/test/ui/borrowck/borrowck-insert-during-each.rs +++ b/src/test/ui/borrowck/borrowck-insert-during-each.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::HashSet; struct Foo { diff --git a/src/test/ui/borrowck/borrowck-insert-during-each.stderr b/src/test/ui/borrowck/borrowck-insert-during-each.stderr index 30648edffd817..021b5b27ae702 100644 --- a/src/test/ui/borrowck/borrowck-insert-during-each.stderr +++ b/src/test/ui/borrowck/borrowck-insert-during-each.stderr @@ -1,5 +1,5 @@ error[E0500]: closure requires unique access to `f` but `*f` is already borrowed - --> $DIR/borrowck-insert-during-each.rs:27:9 + --> $DIR/borrowck-insert-during-each.rs:17:9 | LL | f.foo( | - borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-issue-14498.ast.nll.stderr b/src/test/ui/borrowck/borrowck-issue-14498.ast.nll.stderr index d90eda41164fe..81610536c52b8 100644 --- a/src/test/ui/borrowck/borrowck-issue-14498.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-issue-14498.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to `***p` which is behind a `&` reference - --> $DIR/borrowck-issue-14498.rs:29:5 + --> $DIR/borrowck-issue-14498.rs:19:5 | LL | let p = &y; | -- help: consider changing this to be a mutable reference: `&mut y` @@ -7,7 +7,7 @@ LL | ***p = 2; //[ast]~ ERROR cannot assign to data in a `&` reference | ^^^^^^^^ `p` is a `&` reference, so the data it refers to cannot be written error[E0506]: cannot assign to `**y` because it is borrowed - --> $DIR/borrowck-issue-14498.rs:39:5 + --> $DIR/borrowck-issue-14498.rs:29:5 | LL | let p = &y; | -- borrow of `**y` occurs here @@ -19,7 +19,7 @@ LL | drop(p); | - borrow later used here error[E0506]: cannot assign to `**y` because it is borrowed - --> $DIR/borrowck-issue-14498.rs:50:5 + --> $DIR/borrowck-issue-14498.rs:40:5 | LL | let p = &y; | -- borrow of `**y` occurs here @@ -31,7 +31,7 @@ LL | drop(p); | - borrow later used here error[E0506]: cannot assign to `**y` because it is borrowed - --> $DIR/borrowck-issue-14498.rs:61:5 + --> $DIR/borrowck-issue-14498.rs:51:5 | LL | let p = &y; | -- borrow of `**y` occurs here @@ -43,7 +43,7 @@ LL | drop(p); | - borrow later used here error[E0506]: cannot assign to `**y` because it is borrowed - --> $DIR/borrowck-issue-14498.rs:72:5 + --> $DIR/borrowck-issue-14498.rs:62:5 | LL | let p = &y; | -- borrow of `**y` occurs here @@ -55,7 +55,7 @@ LL | drop(p); | - borrow later used here error[E0506]: cannot assign to `**y.a` because it is borrowed - --> $DIR/borrowck-issue-14498.rs:83:5 + --> $DIR/borrowck-issue-14498.rs:73:5 | LL | let p = &y.a; | ---- borrow of `**y.a` occurs here @@ -67,7 +67,7 @@ LL | drop(p); | - borrow later used here error[E0506]: cannot assign to `**y.a` because it is borrowed - --> $DIR/borrowck-issue-14498.rs:94:5 + --> $DIR/borrowck-issue-14498.rs:84:5 | LL | let p = &y.a; | ---- borrow of `**y.a` occurs here @@ -79,7 +79,7 @@ LL | drop(p); | - borrow later used here error[E0506]: cannot assign to `**y.a` because it is borrowed - --> $DIR/borrowck-issue-14498.rs:105:5 + --> $DIR/borrowck-issue-14498.rs:95:5 | LL | let p = &y.a; | ---- borrow of `**y.a` occurs here @@ -91,7 +91,7 @@ LL | drop(p); | - borrow later used here error[E0506]: cannot assign to `**y.a` because it is borrowed - --> $DIR/borrowck-issue-14498.rs:116:5 + --> $DIR/borrowck-issue-14498.rs:106:5 | LL | let p = &y.a; | ---- borrow of `**y.a` occurs here diff --git a/src/test/ui/borrowck/borrowck-issue-14498.ast.stderr b/src/test/ui/borrowck/borrowck-issue-14498.ast.stderr index ffb793e48dfcf..59249dadcb0a6 100644 --- a/src/test/ui/borrowck/borrowck-issue-14498.ast.stderr +++ b/src/test/ui/borrowck/borrowck-issue-14498.ast.stderr @@ -1,11 +1,11 @@ error[E0389]: cannot assign to data in a `&` reference - --> $DIR/borrowck-issue-14498.rs:29:5 + --> $DIR/borrowck-issue-14498.rs:19:5 | LL | ***p = 2; //[ast]~ ERROR cannot assign to data in a `&` reference | ^^^^^^^^ assignment into an immutable reference error[E0506]: cannot assign to `**y` because it is borrowed - --> $DIR/borrowck-issue-14498.rs:39:5 + --> $DIR/borrowck-issue-14498.rs:29:5 | LL | let p = &y; | - borrow of `**y` occurs here @@ -14,7 +14,7 @@ LL | **y = 2; //[ast]~ ERROR cannot assign to `**y` because it is borrowed | ^^^^^^^ assignment to borrowed `**y` occurs here error[E0506]: cannot assign to `**y` because it is borrowed - --> $DIR/borrowck-issue-14498.rs:50:5 + --> $DIR/borrowck-issue-14498.rs:40:5 | LL | let p = &y; | - borrow of `**y` occurs here @@ -23,7 +23,7 @@ LL | **y = 2; //[ast]~ ERROR cannot assign to `**y` because it is borrowed | ^^^^^^^ assignment to borrowed `**y` occurs here error[E0506]: cannot assign to `**y` because it is borrowed - --> $DIR/borrowck-issue-14498.rs:61:5 + --> $DIR/borrowck-issue-14498.rs:51:5 | LL | let p = &y; | - borrow of `**y` occurs here @@ -32,7 +32,7 @@ LL | **y = 2; //[ast]~ ERROR cannot assign to `**y` because it is borrowed | ^^^^^^^ assignment to borrowed `**y` occurs here error[E0506]: cannot assign to `**y` because it is borrowed - --> $DIR/borrowck-issue-14498.rs:72:5 + --> $DIR/borrowck-issue-14498.rs:62:5 | LL | let p = &y; | - borrow of `**y` occurs here @@ -41,7 +41,7 @@ LL | **y = 2; //[ast]~ ERROR cannot assign to `**y` because it is borrowed | ^^^^^^^ assignment to borrowed `**y` occurs here error[E0506]: cannot assign to `**y.a` because it is borrowed - --> $DIR/borrowck-issue-14498.rs:83:5 + --> $DIR/borrowck-issue-14498.rs:73:5 | LL | let p = &y.a; | --- borrow of `**y.a` occurs here @@ -50,7 +50,7 @@ LL | **y.a = 2; //[ast]~ ERROR cannot assign to `**y.a` because it is borrow | ^^^^^^^^^ assignment to borrowed `**y.a` occurs here error[E0506]: cannot assign to `**y.a` because it is borrowed - --> $DIR/borrowck-issue-14498.rs:94:5 + --> $DIR/borrowck-issue-14498.rs:84:5 | LL | let p = &y.a; | --- borrow of `**y.a` occurs here @@ -59,7 +59,7 @@ LL | **y.a = 2; //[ast]~ ERROR cannot assign to `**y.a` because it is borrow | ^^^^^^^^^ assignment to borrowed `**y.a` occurs here error[E0506]: cannot assign to `**y.a` because it is borrowed - --> $DIR/borrowck-issue-14498.rs:105:5 + --> $DIR/borrowck-issue-14498.rs:95:5 | LL | let p = &y.a; | --- borrow of `**y.a` occurs here @@ -68,7 +68,7 @@ LL | **y.a = 2; //[ast]~ ERROR cannot assign to `**y.a` because it is borrow | ^^^^^^^^^ assignment to borrowed `**y.a` occurs here error[E0506]: cannot assign to `**y.a` because it is borrowed - --> $DIR/borrowck-issue-14498.rs:116:5 + --> $DIR/borrowck-issue-14498.rs:106:5 | LL | let p = &y.a; | --- borrow of `**y.a` occurs here diff --git a/src/test/ui/borrowck/borrowck-issue-14498.mir.stderr b/src/test/ui/borrowck/borrowck-issue-14498.mir.stderr index d90eda41164fe..81610536c52b8 100644 --- a/src/test/ui/borrowck/borrowck-issue-14498.mir.stderr +++ b/src/test/ui/borrowck/borrowck-issue-14498.mir.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to `***p` which is behind a `&` reference - --> $DIR/borrowck-issue-14498.rs:29:5 + --> $DIR/borrowck-issue-14498.rs:19:5 | LL | let p = &y; | -- help: consider changing this to be a mutable reference: `&mut y` @@ -7,7 +7,7 @@ LL | ***p = 2; //[ast]~ ERROR cannot assign to data in a `&` reference | ^^^^^^^^ `p` is a `&` reference, so the data it refers to cannot be written error[E0506]: cannot assign to `**y` because it is borrowed - --> $DIR/borrowck-issue-14498.rs:39:5 + --> $DIR/borrowck-issue-14498.rs:29:5 | LL | let p = &y; | -- borrow of `**y` occurs here @@ -19,7 +19,7 @@ LL | drop(p); | - borrow later used here error[E0506]: cannot assign to `**y` because it is borrowed - --> $DIR/borrowck-issue-14498.rs:50:5 + --> $DIR/borrowck-issue-14498.rs:40:5 | LL | let p = &y; | -- borrow of `**y` occurs here @@ -31,7 +31,7 @@ LL | drop(p); | - borrow later used here error[E0506]: cannot assign to `**y` because it is borrowed - --> $DIR/borrowck-issue-14498.rs:61:5 + --> $DIR/borrowck-issue-14498.rs:51:5 | LL | let p = &y; | -- borrow of `**y` occurs here @@ -43,7 +43,7 @@ LL | drop(p); | - borrow later used here error[E0506]: cannot assign to `**y` because it is borrowed - --> $DIR/borrowck-issue-14498.rs:72:5 + --> $DIR/borrowck-issue-14498.rs:62:5 | LL | let p = &y; | -- borrow of `**y` occurs here @@ -55,7 +55,7 @@ LL | drop(p); | - borrow later used here error[E0506]: cannot assign to `**y.a` because it is borrowed - --> $DIR/borrowck-issue-14498.rs:83:5 + --> $DIR/borrowck-issue-14498.rs:73:5 | LL | let p = &y.a; | ---- borrow of `**y.a` occurs here @@ -67,7 +67,7 @@ LL | drop(p); | - borrow later used here error[E0506]: cannot assign to `**y.a` because it is borrowed - --> $DIR/borrowck-issue-14498.rs:94:5 + --> $DIR/borrowck-issue-14498.rs:84:5 | LL | let p = &y.a; | ---- borrow of `**y.a` occurs here @@ -79,7 +79,7 @@ LL | drop(p); | - borrow later used here error[E0506]: cannot assign to `**y.a` because it is borrowed - --> $DIR/borrowck-issue-14498.rs:105:5 + --> $DIR/borrowck-issue-14498.rs:95:5 | LL | let p = &y.a; | ---- borrow of `**y.a` occurs here @@ -91,7 +91,7 @@ LL | drop(p); | - borrow later used here error[E0506]: cannot assign to `**y.a` because it is borrowed - --> $DIR/borrowck-issue-14498.rs:116:5 + --> $DIR/borrowck-issue-14498.rs:106:5 | LL | let p = &y.a; | ---- borrow of `**y.a` occurs here diff --git a/src/test/ui/borrowck/borrowck-issue-14498.rs b/src/test/ui/borrowck/borrowck-issue-14498.rs index 3c5f932af47ce..da62c5a950731 100644 --- a/src/test/ui/borrowck/borrowck-issue-14498.rs +++ b/src/test/ui/borrowck/borrowck-issue-14498.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This tests that we can't modify Box<&mut T> contents while they // are borrowed (#14498). // diff --git a/src/test/ui/borrowck/borrowck-issue-2657-1.nll.stderr b/src/test/ui/borrowck/borrowck-issue-2657-1.nll.stderr index 8d2bef315c854..3da8d8f8c4757 100644 --- a/src/test/ui/borrowck/borrowck-issue-2657-1.nll.stderr +++ b/src/test/ui/borrowck/borrowck-issue-2657-1.nll.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `x` because it is borrowed - --> $DIR/borrowck-issue-2657-1.rs:19:18 + --> $DIR/borrowck-issue-2657-1.rs:9:18 | LL | Some(ref _y) => { | ------ borrow of `x.0` occurs here diff --git a/src/test/ui/borrowck/borrowck-issue-2657-1.rs b/src/test/ui/borrowck/borrowck-issue-2657-1.rs index 3eb939c0ddadd..c38293740edaa 100644 --- a/src/test/ui/borrowck/borrowck-issue-2657-1.rs +++ b/src/test/ui/borrowck/borrowck-issue-2657-1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] diff --git a/src/test/ui/borrowck/borrowck-issue-2657-1.stderr b/src/test/ui/borrowck/borrowck-issue-2657-1.stderr index 532f0e6fb0092..7663822094d86 100644 --- a/src/test/ui/borrowck/borrowck-issue-2657-1.stderr +++ b/src/test/ui/borrowck/borrowck-issue-2657-1.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `x` because it is borrowed - --> $DIR/borrowck-issue-2657-1.rs:19:13 + --> $DIR/borrowck-issue-2657-1.rs:9:13 | LL | Some(ref _y) => { | ------ borrow of `x.0` occurs here diff --git a/src/test/ui/borrowck/borrowck-issue-2657-2.nll.stderr b/src/test/ui/borrowck/borrowck-issue-2657-2.nll.stderr index cdbfab8bd054a..061c458f73e58 100644 --- a/src/test/ui/borrowck/borrowck-issue-2657-2.nll.stderr +++ b/src/test/ui/borrowck/borrowck-issue-2657-2.nll.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-issue-2657-2.rs:17:18 + --> $DIR/borrowck-issue-2657-2.rs:7:18 | LL | let _b = *y; //~ ERROR cannot move out | ^^ diff --git a/src/test/ui/borrowck/borrowck-issue-2657-2.rs b/src/test/ui/borrowck/borrowck-issue-2657-2.rs index a389a4a5593f0..cea5611048744 100644 --- a/src/test/ui/borrowck/borrowck-issue-2657-2.rs +++ b/src/test/ui/borrowck/borrowck-issue-2657-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn main() { diff --git a/src/test/ui/borrowck/borrowck-issue-2657-2.stderr b/src/test/ui/borrowck/borrowck-issue-2657-2.stderr index 42baecd7943dd..7e718786caa37 100644 --- a/src/test/ui/borrowck/borrowck-issue-2657-2.stderr +++ b/src/test/ui/borrowck/borrowck-issue-2657-2.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-issue-2657-2.rs:17:18 + --> $DIR/borrowck-issue-2657-2.rs:7:18 | LL | let _b = *y; //~ ERROR cannot move out | ^^ diff --git a/src/test/ui/borrowck/borrowck-issue-48962.rs b/src/test/ui/borrowck/borrowck-issue-48962.rs index e3bbfd9d5fef6..e7df319a0bb70 100644 --- a/src/test/ui/borrowck/borrowck-issue-48962.rs +++ b/src/test/ui/borrowck/borrowck-issue-48962.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] struct Node { diff --git a/src/test/ui/borrowck/borrowck-issue-48962.stderr b/src/test/ui/borrowck/borrowck-issue-48962.stderr index 4448cedda69af..9d53d82265eca 100644 --- a/src/test/ui/borrowck/borrowck-issue-48962.stderr +++ b/src/test/ui/borrowck/borrowck-issue-48962.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `src` - --> $DIR/borrowck-issue-48962.rs:26:5 + --> $DIR/borrowck-issue-48962.rs:16:5 | LL | {src}; | --- value moved here @@ -9,7 +9,7 @@ LL | src.next = None; //~ ERROR use of moved value: `src` [E0382] = note: move occurs because `src` has type `&mut Node`, which does not implement the `Copy` trait error[E0382]: use of moved value: `src` - --> $DIR/borrowck-issue-48962.rs:32:5 + --> $DIR/borrowck-issue-48962.rs:22:5 | LL | {src}; | --- value moved here diff --git a/src/test/ui/borrowck/borrowck-lend-flow-if.rs b/src/test/ui/borrowck/borrowck-lend-flow-if.rs index 3df174b4fb83a..693adb20eaef3 100644 --- a/src/test/ui/borrowck/borrowck-lend-flow-if.rs +++ b/src/test/ui/borrowck/borrowck-lend-flow-if.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-compare-mode-nll // Note: the borrowck analysis is currently flow-insensitive. diff --git a/src/test/ui/borrowck/borrowck-lend-flow-if.stderr b/src/test/ui/borrowck/borrowck-lend-flow-if.stderr index c53c4e46d4f25..5afa781fa745b 100644 --- a/src/test/ui/borrowck/borrowck-lend-flow-if.stderr +++ b/src/test/ui/borrowck/borrowck-lend-flow-if.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `*v` as mutable because `v` is also borrowed as immutable - --> $DIR/borrowck-lend-flow-if.rs:40:21 + --> $DIR/borrowck-lend-flow-if.rs:30:21 | LL | _w = &v; | - immutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-lend-flow-loop.nll.stderr b/src/test/ui/borrowck/borrowck-lend-flow-loop.nll.stderr index c46e94866ab5a..f98b7f57ebc2a 100644 --- a/src/test/ui/borrowck/borrowck-lend-flow-loop.nll.stderr +++ b/src/test/ui/borrowck/borrowck-lend-flow-loop.nll.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `*v` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-lend-flow-loop.rs:45:16 + --> $DIR/borrowck-lend-flow-loop.rs:35:16 | LL | let mut x = &mut v; | ------ mutable borrow occurs here @@ -11,7 +11,7 @@ LL | *x = box 5; | -- borrow used here in later iteration of loop error[E0502]: cannot borrow `*v` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-lend-flow-loop.rs:109:16 + --> $DIR/borrowck-lend-flow-loop.rs:99:16 | LL | **x += 1; | -------- borrow used here in later iteration of loop diff --git a/src/test/ui/borrowck/borrowck-lend-flow-loop.rs b/src/test/ui/borrowck/borrowck-lend-flow-loop.rs index f09e7ffd7e4b7..9b78633e94268 100644 --- a/src/test/ui/borrowck/borrowck-lend-flow-loop.rs +++ b/src/test/ui/borrowck/borrowck-lend-flow-loop.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Note: the borrowck analysis is currently flow-insensitive. // Therefore, some of these errors are marked as spurious and could be // corrected by a simple change to the analysis. The others are diff --git a/src/test/ui/borrowck/borrowck-lend-flow-loop.stderr b/src/test/ui/borrowck/borrowck-lend-flow-loop.stderr index 534e30b564d7f..275ec7800daca 100644 --- a/src/test/ui/borrowck/borrowck-lend-flow-loop.stderr +++ b/src/test/ui/borrowck/borrowck-lend-flow-loop.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `*v` as immutable because `v` is also borrowed as mutable - --> $DIR/borrowck-lend-flow-loop.rs:35:17 + --> $DIR/borrowck-lend-flow-loop.rs:25:17 | LL | let mut x = &mut v; | - mutable borrow occurs here @@ -11,7 +11,7 @@ LL | } | - mutable borrow ends here error[E0502]: cannot borrow `*v` as immutable because `v` is also borrowed as mutable - --> $DIR/borrowck-lend-flow-loop.rs:45:17 + --> $DIR/borrowck-lend-flow-loop.rs:35:17 | LL | let mut x = &mut v; | - mutable borrow occurs here @@ -23,7 +23,7 @@ LL | } | - mutable borrow ends here error[E0502]: cannot borrow `*v` as mutable because `v` is also borrowed as immutable - --> $DIR/borrowck-lend-flow-loop.rs:57:25 + --> $DIR/borrowck-lend-flow-loop.rs:47:25 | LL | borrow_mut(&mut *v); //~ ERROR cannot borrow | ^^ mutable borrow occurs here @@ -34,7 +34,7 @@ LL | } | - immutable borrow ends here error[E0502]: cannot borrow `*v` as mutable because `v` is also borrowed as immutable - --> $DIR/borrowck-lend-flow-loop.rs:69:25 + --> $DIR/borrowck-lend-flow-loop.rs:59:25 | LL | borrow_mut(&mut *v); //~ ERROR cannot borrow | ^^ mutable borrow occurs here @@ -45,7 +45,7 @@ LL | } | - immutable borrow ends here error[E0502]: cannot borrow `*v` as mutable because `v` is also borrowed as immutable - --> $DIR/borrowck-lend-flow-loop.rs:86:21 + --> $DIR/borrowck-lend-flow-loop.rs:76:21 | LL | _x = &v; | - immutable borrow occurs here @@ -56,7 +56,7 @@ LL | } | - immutable borrow ends here error[E0502]: cannot borrow `*v` as mutable because `v` is also borrowed as immutable - --> $DIR/borrowck-lend-flow-loop.rs:100:21 + --> $DIR/borrowck-lend-flow-loop.rs:90:21 | LL | _x = &v; | - immutable borrow occurs here @@ -67,7 +67,7 @@ LL | } | - immutable borrow ends here error[E0502]: cannot borrow `*v` as immutable because `v` is also borrowed as mutable - --> $DIR/borrowck-lend-flow-loop.rs:109:17 + --> $DIR/borrowck-lend-flow-loop.rs:99:17 | LL | borrow(&*v); //~ ERROR cannot borrow | ^^ immutable borrow occurs here @@ -79,7 +79,7 @@ LL | } | - mutable borrow ends here error[E0499]: cannot borrow `v` as mutable more than once at a time - --> $DIR/borrowck-lend-flow-loop.rs:111:22 + --> $DIR/borrowck-lend-flow-loop.rs:101:22 | LL | x = &mut v; //~ ERROR cannot borrow | ^ mutable borrow starts here in previous iteration of loop diff --git a/src/test/ui/borrowck/borrowck-lend-flow-match.ast.nll.stderr b/src/test/ui/borrowck/borrowck-lend-flow-match.ast.nll.stderr index 0b6eabfb7edd8..02289e0f4ec98 100644 --- a/src/test/ui/borrowck/borrowck-lend-flow-match.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-lend-flow-match.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `x` because it is borrowed - --> $DIR/borrowck-lend-flow-match.rs:28:13 + --> $DIR/borrowck-lend-flow-match.rs:18:13 | LL | Some(ref r) => { | ----- borrow of `x` occurs here diff --git a/src/test/ui/borrowck/borrowck-lend-flow-match.ast.stderr b/src/test/ui/borrowck/borrowck-lend-flow-match.ast.stderr index 0fcc6bbbc83d4..23eb814788f65 100644 --- a/src/test/ui/borrowck/borrowck-lend-flow-match.ast.stderr +++ b/src/test/ui/borrowck/borrowck-lend-flow-match.ast.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `x` because it is borrowed - --> $DIR/borrowck-lend-flow-match.rs:28:13 + --> $DIR/borrowck-lend-flow-match.rs:18:13 | LL | Some(ref r) => { | ----- borrow of `x` occurs here diff --git a/src/test/ui/borrowck/borrowck-lend-flow-match.mir.stderr b/src/test/ui/borrowck/borrowck-lend-flow-match.mir.stderr index 0b6eabfb7edd8..02289e0f4ec98 100644 --- a/src/test/ui/borrowck/borrowck-lend-flow-match.mir.stderr +++ b/src/test/ui/borrowck/borrowck-lend-flow-match.mir.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `x` because it is borrowed - --> $DIR/borrowck-lend-flow-match.rs:28:13 + --> $DIR/borrowck-lend-flow-match.rs:18:13 | LL | Some(ref r) => { | ----- borrow of `x` occurs here diff --git a/src/test/ui/borrowck/borrowck-lend-flow-match.rs b/src/test/ui/borrowck/borrowck-lend-flow-match.rs index f2f3e7914227c..4cd2a239b4e78 100644 --- a/src/test/ui/borrowck/borrowck-lend-flow-match.rs +++ b/src/test/ui/borrowck/borrowck-lend-flow-match.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/borrowck/borrowck-lend-flow.rs b/src/test/ui/borrowck/borrowck-lend-flow.rs index 27a21f0e40a66..022d6becc349f 100644 --- a/src/test/ui/borrowck/borrowck-lend-flow.rs +++ b/src/test/ui/borrowck/borrowck-lend-flow.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-compare-mode-nll // Note: the borrowck analysis is currently flow-insensitive. diff --git a/src/test/ui/borrowck/borrowck-lend-flow.stderr b/src/test/ui/borrowck/borrowck-lend-flow.stderr index abb83c8dfc883..c9503bd81f739 100644 --- a/src/test/ui/borrowck/borrowck-lend-flow.stderr +++ b/src/test/ui/borrowck/borrowck-lend-flow.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `*v` as mutable because `v` is also borrowed as immutable - --> $DIR/borrowck-lend-flow.rs:36:21 + --> $DIR/borrowck-lend-flow.rs:26:21 | LL | let _w = &v; | - immutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-loan-blocks-move-cc.nll.stderr b/src/test/ui/borrowck/borrowck-loan-blocks-move-cc.nll.stderr index 6f0f23b24c646..4497cfb71d19a 100644 --- a/src/test/ui/borrowck/borrowck-loan-blocks-move-cc.nll.stderr +++ b/src/test/ui/borrowck/borrowck-loan-blocks-move-cc.nll.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `v` because it is borrowed - --> $DIR/borrowck-loan-blocks-move-cc.rs:24:19 + --> $DIR/borrowck-loan-blocks-move-cc.rs:14:19 | LL | let w = &v; | -- borrow of `v` occurs here @@ -12,7 +12,7 @@ LL | w.use_ref(); | - borrow later used here error[E0505]: cannot move out of `v` because it is borrowed - --> $DIR/borrowck-loan-blocks-move-cc.rs:34:19 + --> $DIR/borrowck-loan-blocks-move-cc.rs:24:19 | LL | let w = &v; | -- borrow of `v` occurs here diff --git a/src/test/ui/borrowck/borrowck-loan-blocks-move-cc.rs b/src/test/ui/borrowck/borrowck-loan-blocks-move-cc.rs index 27296085d9a41..29a20473f4847 100644 --- a/src/test/ui/borrowck/borrowck-loan-blocks-move-cc.rs +++ b/src/test/ui/borrowck/borrowck-loan-blocks-move-cc.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] use std::thread; diff --git a/src/test/ui/borrowck/borrowck-loan-blocks-move-cc.stderr b/src/test/ui/borrowck/borrowck-loan-blocks-move-cc.stderr index 575672959929c..b170635b4b997 100644 --- a/src/test/ui/borrowck/borrowck-loan-blocks-move-cc.stderr +++ b/src/test/ui/borrowck/borrowck-loan-blocks-move-cc.stderr @@ -1,5 +1,5 @@ error[E0504]: cannot move `v` into closure because it is borrowed - --> $DIR/borrowck-loan-blocks-move-cc.rs:25:27 + --> $DIR/borrowck-loan-blocks-move-cc.rs:15:27 | LL | let w = &v; | - borrow of `v` occurs here @@ -8,7 +8,7 @@ LL | println!("v={}", *v); | ^ move into closure occurs here error[E0504]: cannot move `v` into closure because it is borrowed - --> $DIR/borrowck-loan-blocks-move-cc.rs:35:27 + --> $DIR/borrowck-loan-blocks-move-cc.rs:25:27 | LL | let w = &v; | - borrow of `v` occurs here diff --git a/src/test/ui/borrowck/borrowck-loan-blocks-move.nll.stderr b/src/test/ui/borrowck/borrowck-loan-blocks-move.nll.stderr index 432137cdae1ba..450102f0c6622 100644 --- a/src/test/ui/borrowck/borrowck-loan-blocks-move.nll.stderr +++ b/src/test/ui/borrowck/borrowck-loan-blocks-move.nll.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `v` because it is borrowed - --> $DIR/borrowck-loan-blocks-move.rs:21:10 + --> $DIR/borrowck-loan-blocks-move.rs:11:10 | LL | let w = &v; | -- borrow of `v` occurs here diff --git a/src/test/ui/borrowck/borrowck-loan-blocks-move.rs b/src/test/ui/borrowck/borrowck-loan-blocks-move.rs index b1241ae020efc..bde73219f70ed 100644 --- a/src/test/ui/borrowck/borrowck-loan-blocks-move.rs +++ b/src/test/ui/borrowck/borrowck-loan-blocks-move.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] diff --git a/src/test/ui/borrowck/borrowck-loan-blocks-move.stderr b/src/test/ui/borrowck/borrowck-loan-blocks-move.stderr index 5edbf6a9b2c21..ba6e34c2ec826 100644 --- a/src/test/ui/borrowck/borrowck-loan-blocks-move.stderr +++ b/src/test/ui/borrowck/borrowck-loan-blocks-move.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `v` because it is borrowed - --> $DIR/borrowck-loan-blocks-move.rs:21:10 + --> $DIR/borrowck-loan-blocks-move.rs:11:10 | LL | let w = &v; | - borrow of `v` occurs here diff --git a/src/test/ui/borrowck/borrowck-loan-blocks-mut-uniq.nll.stderr b/src/test/ui/borrowck/borrowck-loan-blocks-mut-uniq.nll.stderr index 5c3cd46a87d9c..eb5cff994941c 100644 --- a/src/test/ui/borrowck/borrowck-loan-blocks-mut-uniq.nll.stderr +++ b/src/test/ui/borrowck/borrowck-loan-blocks-mut-uniq.nll.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `v` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-loan-blocks-mut-uniq.rs:20:12 + --> $DIR/borrowck-loan-blocks-mut-uniq.rs:10:12 | LL | borrow(&*v, | - --- immutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-loan-blocks-mut-uniq.rs b/src/test/ui/borrowck/borrowck-loan-blocks-mut-uniq.rs index 32d8088549d4f..da30bfa29bbf7 100644 --- a/src/test/ui/borrowck/borrowck-loan-blocks-mut-uniq.rs +++ b/src/test/ui/borrowck/borrowck-loan-blocks-mut-uniq.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn borrow(v: &isize, f: F) where F: FnOnce(&isize) { diff --git a/src/test/ui/borrowck/borrowck-loan-blocks-mut-uniq.stderr b/src/test/ui/borrowck/borrowck-loan-blocks-mut-uniq.stderr index 752322dec87c6..6aa2d5d189d25 100644 --- a/src/test/ui/borrowck/borrowck-loan-blocks-mut-uniq.stderr +++ b/src/test/ui/borrowck/borrowck-loan-blocks-mut-uniq.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `v` as mutable because `*v` is also borrowed as immutable - --> $DIR/borrowck-loan-blocks-mut-uniq.rs:20:12 + --> $DIR/borrowck-loan-blocks-mut-uniq.rs:10:12 | LL | borrow(&*v, | -- immutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-loan-in-overloaded-op.nll.stderr b/src/test/ui/borrowck/borrowck-loan-in-overloaded-op.nll.stderr index 03ddfb4c9032a..265f268fb1f96 100644 --- a/src/test/ui/borrowck/borrowck-loan-in-overloaded-op.nll.stderr +++ b/src/test/ui/borrowck/borrowck-loan-in-overloaded-op.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: borrow of moved value: `x` - --> $DIR/borrowck-loan-in-overloaded-op.rs:31:20 + --> $DIR/borrowck-loan-in-overloaded-op.rs:21:20 | LL | let _y = {x} + x.clone(); // the `{x}` forces a move to occur | - ^ value borrowed here after move diff --git a/src/test/ui/borrowck/borrowck-loan-in-overloaded-op.rs b/src/test/ui/borrowck/borrowck-loan-in-overloaded-op.rs index a9079cfc27d83..6dde63cb2b983 100644 --- a/src/test/ui/borrowck/borrowck-loan-in-overloaded-op.rs +++ b/src/test/ui/borrowck/borrowck-loan-in-overloaded-op.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_patterns)] #![feature(box_syntax)] diff --git a/src/test/ui/borrowck/borrowck-loan-in-overloaded-op.stderr b/src/test/ui/borrowck/borrowck-loan-in-overloaded-op.stderr index 7cd54e293b010..5c7c2618578f4 100644 --- a/src/test/ui/borrowck/borrowck-loan-in-overloaded-op.stderr +++ b/src/test/ui/borrowck/borrowck-loan-in-overloaded-op.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `x` - --> $DIR/borrowck-loan-in-overloaded-op.rs:31:20 + --> $DIR/borrowck-loan-in-overloaded-op.rs:21:20 | LL | let _y = {x} + x.clone(); // the `{x}` forces a move to occur | - ^ value used here after move diff --git a/src/test/ui/borrowck/borrowck-loan-of-static-data-issue-27616.nll.stderr b/src/test/ui/borrowck/borrowck-loan-of-static-data-issue-27616.nll.stderr index eb9e72a6c5c78..1c42ce8d3fbe7 100644 --- a/src/test/ui/borrowck/borrowck-loan-of-static-data-issue-27616.nll.stderr +++ b/src/test/ui/borrowck/borrowck-loan-of-static-data-issue-27616.nll.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `*s` because it is borrowed - --> $DIR/borrowck-loan-of-static-data-issue-27616.rs:26:5 + --> $DIR/borrowck-loan-of-static-data-issue-27616.rs:16:5 | LL | let alias: &'static mut String = s; | - borrow of `*s` occurs here diff --git a/src/test/ui/borrowck/borrowck-loan-of-static-data-issue-27616.rs b/src/test/ui/borrowck/borrowck-loan-of-static-data-issue-27616.rs index 228e71025fdf4..cb801ef1b5bfa 100644 --- a/src/test/ui/borrowck/borrowck-loan-of-static-data-issue-27616.rs +++ b/src/test/ui/borrowck/borrowck-loan-of-static-data-issue-27616.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::mem; fn leak(mut b: Box) -> &'static mut T { diff --git a/src/test/ui/borrowck/borrowck-loan-of-static-data-issue-27616.stderr b/src/test/ui/borrowck/borrowck-loan-of-static-data-issue-27616.stderr index 3f5e09b74432c..eceb923e776b7 100644 --- a/src/test/ui/borrowck/borrowck-loan-of-static-data-issue-27616.stderr +++ b/src/test/ui/borrowck/borrowck-loan-of-static-data-issue-27616.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `*s` because it is borrowed - --> $DIR/borrowck-loan-of-static-data-issue-27616.rs:26:5 + --> $DIR/borrowck-loan-of-static-data-issue-27616.rs:16:5 | LL | let alias: &'static mut String = s; | - borrow of `*s` occurs here diff --git a/src/test/ui/borrowck/borrowck-loan-rcvr-overloaded-op.nll.stderr b/src/test/ui/borrowck/borrowck-loan-rcvr-overloaded-op.nll.stderr index b7c871625870c..7d5f96e0474eb 100644 --- a/src/test/ui/borrowck/borrowck-loan-rcvr-overloaded-op.nll.stderr +++ b/src/test/ui/borrowck/borrowck-loan-rcvr-overloaded-op.nll.stderr @@ -1,5 +1,5 @@ error[E0503]: cannot use `p` because it was mutably borrowed - --> $DIR/borrowck-loan-rcvr-overloaded-op.rs:48:5 + --> $DIR/borrowck-loan-rcvr-overloaded-op.rs:38:5 | LL | let q = &mut p; | ------ borrow of `p` occurs here @@ -11,7 +11,7 @@ LL | *q + 3; // OK to use the new alias `q` | -- borrow later used here error[E0502]: cannot borrow `p` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-loan-rcvr-overloaded-op.rs:49:5 + --> $DIR/borrowck-loan-rcvr-overloaded-op.rs:39:5 | LL | let q = &mut p; | ------ mutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-loan-rcvr-overloaded-op.rs b/src/test/ui/borrowck/borrowck-loan-rcvr-overloaded-op.rs index cce55b6c941b9..4da10fd44ce3f 100644 --- a/src/test/ui/borrowck/borrowck-loan-rcvr-overloaded-op.rs +++ b/src/test/ui/borrowck/borrowck-loan-rcvr-overloaded-op.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::Add; #[derive(Copy, Clone)] diff --git a/src/test/ui/borrowck/borrowck-loan-rcvr-overloaded-op.stderr b/src/test/ui/borrowck/borrowck-loan-rcvr-overloaded-op.stderr index 4db1d1f298e52..b4f7a9af666f4 100644 --- a/src/test/ui/borrowck/borrowck-loan-rcvr-overloaded-op.stderr +++ b/src/test/ui/borrowck/borrowck-loan-rcvr-overloaded-op.stderr @@ -1,5 +1,5 @@ error[E0503]: cannot use `p` because it was mutably borrowed - --> $DIR/borrowck-loan-rcvr-overloaded-op.rs:48:5 + --> $DIR/borrowck-loan-rcvr-overloaded-op.rs:38:5 | LL | let q = &mut p; | - borrow of `p` occurs here @@ -8,7 +8,7 @@ LL | p + 3; //~ ERROR cannot use `p` | ^ use of borrowed `p` error[E0502]: cannot borrow `p` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-loan-rcvr-overloaded-op.rs:49:5 + --> $DIR/borrowck-loan-rcvr-overloaded-op.rs:39:5 | LL | let q = &mut p; | - mutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-loan-rcvr.nll.stderr b/src/test/ui/borrowck/borrowck-loan-rcvr.nll.stderr index a5b81027c2fc4..0e8d3cbe6834f 100644 --- a/src/test/ui/borrowck/borrowck-loan-rcvr.nll.stderr +++ b/src/test/ui/borrowck/borrowck-loan-rcvr.nll.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `p` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-loan-rcvr.rs:34:14 + --> $DIR/borrowck-loan-rcvr.rs:23:14 | LL | p.blockm(|| { //~ ERROR cannot borrow `p` as mutable | - ^^ mutable borrow occurs here @@ -12,7 +12,7 @@ LL | | }) | |______- borrow later used here error[E0502]: cannot borrow `p` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-loan-rcvr.rs:45:5 + --> $DIR/borrowck-loan-rcvr.rs:34:5 | LL | let l = &mut p; | ------ mutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-loan-rcvr.rs b/src/test/ui/borrowck/borrowck-loan-rcvr.rs index 014b27f9659b0..82592007e4db4 100644 --- a/src/test/ui/borrowck/borrowck-loan-rcvr.rs +++ b/src/test/ui/borrowck/borrowck-loan-rcvr.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct point { x: isize, y: isize } trait methods { diff --git a/src/test/ui/borrowck/borrowck-loan-rcvr.stderr b/src/test/ui/borrowck/borrowck-loan-rcvr.stderr index f5d3cfb383464..eb0bbec0bc772 100644 --- a/src/test/ui/borrowck/borrowck-loan-rcvr.stderr +++ b/src/test/ui/borrowck/borrowck-loan-rcvr.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `p` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-loan-rcvr.rs:34:14 + --> $DIR/borrowck-loan-rcvr.rs:23:14 | LL | p.blockm(|| { //~ ERROR cannot borrow `p` as mutable | - ^^ mutable borrow occurs here @@ -11,7 +11,7 @@ LL | }) | - immutable borrow ends here error[E0502]: cannot borrow `p` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-loan-rcvr.rs:45:5 + --> $DIR/borrowck-loan-rcvr.rs:34:5 | LL | let l = &mut p; | - mutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-loan-vec-content.nll.stderr b/src/test/ui/borrowck/borrowck-loan-vec-content.nll.stderr index 492e90914ea70..d34710058d1e5 100644 --- a/src/test/ui/borrowck/borrowck-loan-vec-content.nll.stderr +++ b/src/test/ui/borrowck/borrowck-loan-vec-content.nll.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `v` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-loan-vec-content.rs:28:9 + --> $DIR/borrowck-loan-vec-content.rs:18:9 | LL | / takes_imm_elt( LL | | &v[0], diff --git a/src/test/ui/borrowck/borrowck-loan-vec-content.rs b/src/test/ui/borrowck/borrowck-loan-vec-content.rs index c5de95f8fc042..300ec88c5cd9d 100644 --- a/src/test/ui/borrowck/borrowck-loan-vec-content.rs +++ b/src/test/ui/borrowck/borrowck-loan-vec-content.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Here we check that it is allowed to lend out an element of a // (locally rooted) mutable, unique vector, and that we then prevent // modifications to the contents. diff --git a/src/test/ui/borrowck/borrowck-loan-vec-content.stderr b/src/test/ui/borrowck/borrowck-loan-vec-content.stderr index 2fcfd1fb08d05..6a565ff2f10d4 100644 --- a/src/test/ui/borrowck/borrowck-loan-vec-content.stderr +++ b/src/test/ui/borrowck/borrowck-loan-vec-content.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `v` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-loan-vec-content.rs:28:9 + --> $DIR/borrowck-loan-vec-content.rs:18:9 | LL | &v[0], | - immutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-local-borrow-outlives-fn.ast.nll.stderr b/src/test/ui/borrowck/borrowck-local-borrow-outlives-fn.ast.nll.stderr index 97bf509a45840..a59940853be89 100644 --- a/src/test/ui/borrowck/borrowck-local-borrow-outlives-fn.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-local-borrow-outlives-fn.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `x` does not live long enough - --> $DIR/borrowck-local-borrow-outlives-fn.rs:15:5 + --> $DIR/borrowck-local-borrow-outlives-fn.rs:5:5 | LL | &x | ^^ borrowed value does not live long enough diff --git a/src/test/ui/borrowck/borrowck-local-borrow-outlives-fn.ast.stderr b/src/test/ui/borrowck/borrowck-local-borrow-outlives-fn.ast.stderr index af1d294c387bf..6eda8a439baa4 100644 --- a/src/test/ui/borrowck/borrowck-local-borrow-outlives-fn.ast.stderr +++ b/src/test/ui/borrowck/borrowck-local-borrow-outlives-fn.ast.stderr @@ -1,5 +1,5 @@ error[E0597]: `x` does not live long enough - --> $DIR/borrowck-local-borrow-outlives-fn.rs:15:6 + --> $DIR/borrowck-local-borrow-outlives-fn.rs:5:6 | LL | &x | ^ borrowed value does not live long enough diff --git a/src/test/ui/borrowck/borrowck-local-borrow-outlives-fn.mir.stderr b/src/test/ui/borrowck/borrowck-local-borrow-outlives-fn.mir.stderr index 97bf509a45840..a59940853be89 100644 --- a/src/test/ui/borrowck/borrowck-local-borrow-outlives-fn.mir.stderr +++ b/src/test/ui/borrowck/borrowck-local-borrow-outlives-fn.mir.stderr @@ -1,5 +1,5 @@ error[E0597]: `x` does not live long enough - --> $DIR/borrowck-local-borrow-outlives-fn.rs:15:5 + --> $DIR/borrowck-local-borrow-outlives-fn.rs:5:5 | LL | &x | ^^ borrowed value does not live long enough diff --git a/src/test/ui/borrowck/borrowck-local-borrow-outlives-fn.rs b/src/test/ui/borrowck/borrowck-local-borrow-outlives-fn.rs index 0d5feb6b9cc84..01423dada1109 100644 --- a/src/test/ui/borrowck/borrowck-local-borrow-outlives-fn.rs +++ b/src/test/ui/borrowck/borrowck-local-borrow-outlives-fn.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/borrowck/borrowck-local-borrow-with-panic-outlives-fn.ast.nll.stderr b/src/test/ui/borrowck/borrowck-local-borrow-with-panic-outlives-fn.ast.nll.stderr index 5e2b469e68fd1..48f6c3c92b6ca 100644 --- a/src/test/ui/borrowck/borrowck-local-borrow-with-panic-outlives-fn.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-local-borrow-with-panic-outlives-fn.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `z.1` does not live long enough - --> $DIR/borrowck-local-borrow-with-panic-outlives-fn.rs:16:15 + --> $DIR/borrowck-local-borrow-with-panic-outlives-fn.rs:6:15 | LL | *x = Some(&mut z.1); | ^^^^^^^^ borrowed value does not live long enough diff --git a/src/test/ui/borrowck/borrowck-local-borrow-with-panic-outlives-fn.ast.stderr b/src/test/ui/borrowck/borrowck-local-borrow-with-panic-outlives-fn.ast.stderr index 0c61c13345c1c..89a0e6cd8290c 100644 --- a/src/test/ui/borrowck/borrowck-local-borrow-with-panic-outlives-fn.ast.stderr +++ b/src/test/ui/borrowck/borrowck-local-borrow-with-panic-outlives-fn.ast.stderr @@ -1,5 +1,5 @@ error[E0597]: `z.1` does not live long enough - --> $DIR/borrowck-local-borrow-with-panic-outlives-fn.rs:16:20 + --> $DIR/borrowck-local-borrow-with-panic-outlives-fn.rs:6:20 | LL | *x = Some(&mut z.1); | ^^^ borrowed value does not live long enough diff --git a/src/test/ui/borrowck/borrowck-local-borrow-with-panic-outlives-fn.mir.stderr b/src/test/ui/borrowck/borrowck-local-borrow-with-panic-outlives-fn.mir.stderr index 5e2b469e68fd1..48f6c3c92b6ca 100644 --- a/src/test/ui/borrowck/borrowck-local-borrow-with-panic-outlives-fn.mir.stderr +++ b/src/test/ui/borrowck/borrowck-local-borrow-with-panic-outlives-fn.mir.stderr @@ -1,5 +1,5 @@ error[E0597]: `z.1` does not live long enough - --> $DIR/borrowck-local-borrow-with-panic-outlives-fn.rs:16:15 + --> $DIR/borrowck-local-borrow-with-panic-outlives-fn.rs:6:15 | LL | *x = Some(&mut z.1); | ^^^^^^^^ borrowed value does not live long enough diff --git a/src/test/ui/borrowck/borrowck-local-borrow-with-panic-outlives-fn.rs b/src/test/ui/borrowck/borrowck-local-borrow-with-panic-outlives-fn.rs index 2c9ace4825dfc..9ead465eadab7 100644 --- a/src/test/ui/borrowck/borrowck-local-borrow-with-panic-outlives-fn.rs +++ b/src/test/ui/borrowck/borrowck-local-borrow-with-panic-outlives-fn.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/borrowck/borrowck-match-already-borrowed.ast.nll.stderr b/src/test/ui/borrowck/borrowck-match-already-borrowed.ast.nll.stderr index 8dec40520c4e3..d14fcb2260efe 100644 --- a/src/test/ui/borrowck/borrowck-match-already-borrowed.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-match-already-borrowed.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0503]: cannot use `foo` because it was mutably borrowed - --> $DIR/borrowck-match-already-borrowed.rs:22:19 + --> $DIR/borrowck-match-already-borrowed.rs:12:19 | LL | let p = &mut foo; | -------- borrow of `foo` occurs here @@ -10,7 +10,7 @@ LL | drop(p); | - borrow later used here error[E0503]: cannot use `foo` because it was mutably borrowed - --> $DIR/borrowck-match-already-borrowed.rs:23:9 + --> $DIR/borrowck-match-already-borrowed.rs:13:9 | LL | let p = &mut foo; | -------- borrow of `foo` occurs here @@ -22,7 +22,7 @@ LL | drop(p); | - borrow later used here error[E0503]: cannot use `foo.0` because it was mutably borrowed - --> $DIR/borrowck-match-already-borrowed.rs:25:16 + --> $DIR/borrowck-match-already-borrowed.rs:15:16 | LL | let p = &mut foo; | -------- borrow of `foo` occurs here @@ -34,7 +34,7 @@ LL | drop(p); | - borrow later used here error[E0503]: cannot use `x` because it was mutably borrowed - --> $DIR/borrowck-match-already-borrowed.rs:35:19 + --> $DIR/borrowck-match-already-borrowed.rs:25:19 | LL | let r = &mut x; | ------ borrow of `x` occurs here @@ -45,7 +45,7 @@ LL | drop(r); | - borrow later used here error[E0503]: cannot use `x` because it was mutably borrowed - --> $DIR/borrowck-match-already-borrowed.rs:36:9 + --> $DIR/borrowck-match-already-borrowed.rs:26:9 | LL | let r = &mut x; | ------ borrow of `x` occurs here @@ -57,7 +57,7 @@ LL | drop(r); | - borrow later used here error[E0503]: cannot use `x` because it was mutably borrowed - --> $DIR/borrowck-match-already-borrowed.rs:38:9 + --> $DIR/borrowck-match-already-borrowed.rs:28:9 | LL | let r = &mut x; | ------ borrow of `x` occurs here diff --git a/src/test/ui/borrowck/borrowck-match-already-borrowed.ast.stderr b/src/test/ui/borrowck/borrowck-match-already-borrowed.ast.stderr index 2e49f90a16997..1a0b911b77251 100644 --- a/src/test/ui/borrowck/borrowck-match-already-borrowed.ast.stderr +++ b/src/test/ui/borrowck/borrowck-match-already-borrowed.ast.stderr @@ -1,5 +1,5 @@ error[E0503]: cannot use `(foo as Foo::A).0` because it was mutably borrowed - --> $DIR/borrowck-match-already-borrowed.rs:25:16 + --> $DIR/borrowck-match-already-borrowed.rs:15:16 | LL | let p = &mut foo; | --- borrow of `foo` occurs here @@ -8,7 +8,7 @@ LL | Foo::A(x) => x //[ast]~ ERROR [E0503] | ^ use of borrowed `foo` error[E0503]: cannot use `x` because it was mutably borrowed - --> $DIR/borrowck-match-already-borrowed.rs:36:9 + --> $DIR/borrowck-match-already-borrowed.rs:26:9 | LL | let r = &mut x; | - borrow of `x` occurs here @@ -17,7 +17,7 @@ LL | x => x + 1, //[ast]~ ERROR [E0503] | ^ use of borrowed `x` error[E0503]: cannot use `x` because it was mutably borrowed - --> $DIR/borrowck-match-already-borrowed.rs:38:9 + --> $DIR/borrowck-match-already-borrowed.rs:28:9 | LL | let r = &mut x; | - borrow of `x` occurs here diff --git a/src/test/ui/borrowck/borrowck-match-already-borrowed.mir.stderr b/src/test/ui/borrowck/borrowck-match-already-borrowed.mir.stderr index 8dec40520c4e3..d14fcb2260efe 100644 --- a/src/test/ui/borrowck/borrowck-match-already-borrowed.mir.stderr +++ b/src/test/ui/borrowck/borrowck-match-already-borrowed.mir.stderr @@ -1,5 +1,5 @@ error[E0503]: cannot use `foo` because it was mutably borrowed - --> $DIR/borrowck-match-already-borrowed.rs:22:19 + --> $DIR/borrowck-match-already-borrowed.rs:12:19 | LL | let p = &mut foo; | -------- borrow of `foo` occurs here @@ -10,7 +10,7 @@ LL | drop(p); | - borrow later used here error[E0503]: cannot use `foo` because it was mutably borrowed - --> $DIR/borrowck-match-already-borrowed.rs:23:9 + --> $DIR/borrowck-match-already-borrowed.rs:13:9 | LL | let p = &mut foo; | -------- borrow of `foo` occurs here @@ -22,7 +22,7 @@ LL | drop(p); | - borrow later used here error[E0503]: cannot use `foo.0` because it was mutably borrowed - --> $DIR/borrowck-match-already-borrowed.rs:25:16 + --> $DIR/borrowck-match-already-borrowed.rs:15:16 | LL | let p = &mut foo; | -------- borrow of `foo` occurs here @@ -34,7 +34,7 @@ LL | drop(p); | - borrow later used here error[E0503]: cannot use `x` because it was mutably borrowed - --> $DIR/borrowck-match-already-borrowed.rs:35:19 + --> $DIR/borrowck-match-already-borrowed.rs:25:19 | LL | let r = &mut x; | ------ borrow of `x` occurs here @@ -45,7 +45,7 @@ LL | drop(r); | - borrow later used here error[E0503]: cannot use `x` because it was mutably borrowed - --> $DIR/borrowck-match-already-borrowed.rs:36:9 + --> $DIR/borrowck-match-already-borrowed.rs:26:9 | LL | let r = &mut x; | ------ borrow of `x` occurs here @@ -57,7 +57,7 @@ LL | drop(r); | - borrow later used here error[E0503]: cannot use `x` because it was mutably borrowed - --> $DIR/borrowck-match-already-borrowed.rs:38:9 + --> $DIR/borrowck-match-already-borrowed.rs:28:9 | LL | let r = &mut x; | ------ borrow of `x` occurs here diff --git a/src/test/ui/borrowck/borrowck-match-already-borrowed.rs b/src/test/ui/borrowck/borrowck-match-already-borrowed.rs index c2136e62a7b22..391b017496036 100644 --- a/src/test/ui/borrowck/borrowck-match-already-borrowed.rs +++ b/src/test/ui/borrowck/borrowck-match-already-borrowed.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/borrowck/borrowck-match-binding-is-assignment.ast.nll.stderr b/src/test/ui/borrowck/borrowck-match-binding-is-assignment.ast.nll.stderr index 0191e0765b382..2af2ebff54b9d 100644 --- a/src/test/ui/borrowck/borrowck-match-binding-is-assignment.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-match-binding-is-assignment.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `x` - --> $DIR/borrowck-match-binding-is-assignment.rs:27:13 + --> $DIR/borrowck-match-binding-is-assignment.rs:17:13 | LL | x => { | - @@ -10,7 +10,7 @@ LL | x += 1; //[ast]~ ERROR cannot assign twice to immutable variabl | ^^^^^^ cannot assign twice to immutable variable error[E0384]: cannot assign twice to immutable variable `x` - --> $DIR/borrowck-match-binding-is-assignment.rs:34:13 + --> $DIR/borrowck-match-binding-is-assignment.rs:24:13 | LL | E::Foo(x) => { | - @@ -21,7 +21,7 @@ LL | x += 1; //[ast]~ ERROR cannot assign twice to immutable variabl | ^^^^^^ cannot assign twice to immutable variable error[E0384]: cannot assign twice to immutable variable `x` - --> $DIR/borrowck-match-binding-is-assignment.rs:41:13 + --> $DIR/borrowck-match-binding-is-assignment.rs:31:13 | LL | S { bar: x } => { | - @@ -32,7 +32,7 @@ LL | x += 1; //[ast]~ ERROR cannot assign twice to immutable variabl | ^^^^^^ cannot assign twice to immutable variable error[E0384]: cannot assign twice to immutable variable `x` - --> $DIR/borrowck-match-binding-is-assignment.rs:48:13 + --> $DIR/borrowck-match-binding-is-assignment.rs:38:13 | LL | (x,) => { | - @@ -43,7 +43,7 @@ LL | x += 1; //[ast]~ ERROR cannot assign twice to immutable variabl | ^^^^^^ cannot assign twice to immutable variable error[E0384]: cannot assign twice to immutable variable `x` - --> $DIR/borrowck-match-binding-is-assignment.rs:55:13 + --> $DIR/borrowck-match-binding-is-assignment.rs:45:13 | LL | [x,_,_] => { | - diff --git a/src/test/ui/borrowck/borrowck-match-binding-is-assignment.ast.stderr b/src/test/ui/borrowck/borrowck-match-binding-is-assignment.ast.stderr index 0d776f44daad3..e7bd9dfee12f4 100644 --- a/src/test/ui/borrowck/borrowck-match-binding-is-assignment.ast.stderr +++ b/src/test/ui/borrowck/borrowck-match-binding-is-assignment.ast.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `x` - --> $DIR/borrowck-match-binding-is-assignment.rs:27:13 + --> $DIR/borrowck-match-binding-is-assignment.rs:17:13 | LL | x => { | - first assignment to `x` @@ -7,7 +7,7 @@ LL | x += 1; //[ast]~ ERROR cannot assign twice to immutable variabl | ^^^^^^ cannot assign twice to immutable variable error[E0384]: cannot assign twice to immutable variable `x` - --> $DIR/borrowck-match-binding-is-assignment.rs:34:13 + --> $DIR/borrowck-match-binding-is-assignment.rs:24:13 | LL | E::Foo(x) => { | - first assignment to `x` @@ -15,7 +15,7 @@ LL | x += 1; //[ast]~ ERROR cannot assign twice to immutable variabl | ^^^^^^ cannot assign twice to immutable variable error[E0384]: cannot assign twice to immutable variable `x` - --> $DIR/borrowck-match-binding-is-assignment.rs:41:13 + --> $DIR/borrowck-match-binding-is-assignment.rs:31:13 | LL | S { bar: x } => { | - first assignment to `x` @@ -23,7 +23,7 @@ LL | x += 1; //[ast]~ ERROR cannot assign twice to immutable variabl | ^^^^^^ cannot assign twice to immutable variable error[E0384]: cannot assign twice to immutable variable `x` - --> $DIR/borrowck-match-binding-is-assignment.rs:48:13 + --> $DIR/borrowck-match-binding-is-assignment.rs:38:13 | LL | (x,) => { | - first assignment to `x` @@ -31,7 +31,7 @@ LL | x += 1; //[ast]~ ERROR cannot assign twice to immutable variabl | ^^^^^^ cannot assign twice to immutable variable error[E0384]: cannot assign twice to immutable variable `x` - --> $DIR/borrowck-match-binding-is-assignment.rs:55:13 + --> $DIR/borrowck-match-binding-is-assignment.rs:45:13 | LL | [x,_,_] => { | - first assignment to `x` diff --git a/src/test/ui/borrowck/borrowck-match-binding-is-assignment.mir.stderr b/src/test/ui/borrowck/borrowck-match-binding-is-assignment.mir.stderr index 0191e0765b382..2af2ebff54b9d 100644 --- a/src/test/ui/borrowck/borrowck-match-binding-is-assignment.mir.stderr +++ b/src/test/ui/borrowck/borrowck-match-binding-is-assignment.mir.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `x` - --> $DIR/borrowck-match-binding-is-assignment.rs:27:13 + --> $DIR/borrowck-match-binding-is-assignment.rs:17:13 | LL | x => { | - @@ -10,7 +10,7 @@ LL | x += 1; //[ast]~ ERROR cannot assign twice to immutable variabl | ^^^^^^ cannot assign twice to immutable variable error[E0384]: cannot assign twice to immutable variable `x` - --> $DIR/borrowck-match-binding-is-assignment.rs:34:13 + --> $DIR/borrowck-match-binding-is-assignment.rs:24:13 | LL | E::Foo(x) => { | - @@ -21,7 +21,7 @@ LL | x += 1; //[ast]~ ERROR cannot assign twice to immutable variabl | ^^^^^^ cannot assign twice to immutable variable error[E0384]: cannot assign twice to immutable variable `x` - --> $DIR/borrowck-match-binding-is-assignment.rs:41:13 + --> $DIR/borrowck-match-binding-is-assignment.rs:31:13 | LL | S { bar: x } => { | - @@ -32,7 +32,7 @@ LL | x += 1; //[ast]~ ERROR cannot assign twice to immutable variabl | ^^^^^^ cannot assign twice to immutable variable error[E0384]: cannot assign twice to immutable variable `x` - --> $DIR/borrowck-match-binding-is-assignment.rs:48:13 + --> $DIR/borrowck-match-binding-is-assignment.rs:38:13 | LL | (x,) => { | - @@ -43,7 +43,7 @@ LL | x += 1; //[ast]~ ERROR cannot assign twice to immutable variabl | ^^^^^^ cannot assign twice to immutable variable error[E0384]: cannot assign twice to immutable variable `x` - --> $DIR/borrowck-match-binding-is-assignment.rs:55:13 + --> $DIR/borrowck-match-binding-is-assignment.rs:45:13 | LL | [x,_,_] => { | - diff --git a/src/test/ui/borrowck/borrowck-match-binding-is-assignment.rs b/src/test/ui/borrowck/borrowck-match-binding-is-assignment.rs index 30047f84041f1..2c9c41ca10e09 100644 --- a/src/test/ui/borrowck/borrowck-match-binding-is-assignment.rs +++ b/src/test/ui/borrowck/borrowck-match-binding-is-assignment.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/borrowck/borrowck-migrate-to-nll.edition.stderr b/src/test/ui/borrowck/borrowck-migrate-to-nll.edition.stderr index f5a9db364065f..49124231284d4 100644 --- a/src/test/ui/borrowck/borrowck-migrate-to-nll.edition.stderr +++ b/src/test/ui/borrowck/borrowck-migrate-to-nll.edition.stderr @@ -1,5 +1,5 @@ warning[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-migrate-to-nll.rs:35:17 + --> $DIR/borrowck-migrate-to-nll.rs:25:17 | LL | (|| { let bar = foo; bar.take() })(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of borrowed content @@ -9,7 +9,7 @@ LL | (|| { let bar = foo; bar.take() })(); This warning will become a hard error in the future. warning[E0507]: cannot move out of `foo`, as it is immutable for the pattern guard - --> $DIR/borrowck-migrate-to-nll.rs:35:17 + --> $DIR/borrowck-migrate-to-nll.rs:25:17 | LL | (|| { let bar = foo; bar.take() })(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/borrowck/borrowck-migrate-to-nll.rs b/src/test/ui/borrowck/borrowck-migrate-to-nll.rs index bb6b29072e257..5b7018df91931 100644 --- a/src/test/ui/borrowck/borrowck-migrate-to-nll.rs +++ b/src/test/ui/borrowck/borrowck-migrate-to-nll.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This is a test of the borrowck migrate mode. It leverages #27282, a // bug that is fixed by NLL: this code is (unsoundly) accepted by // AST-borrowck, but is correctly rejected by the NLL borrowck. diff --git a/src/test/ui/borrowck/borrowck-migrate-to-nll.zflag.stderr b/src/test/ui/borrowck/borrowck-migrate-to-nll.zflag.stderr index f5a9db364065f..49124231284d4 100644 --- a/src/test/ui/borrowck/borrowck-migrate-to-nll.zflag.stderr +++ b/src/test/ui/borrowck/borrowck-migrate-to-nll.zflag.stderr @@ -1,5 +1,5 @@ warning[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-migrate-to-nll.rs:35:17 + --> $DIR/borrowck-migrate-to-nll.rs:25:17 | LL | (|| { let bar = foo; bar.take() })(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of borrowed content @@ -9,7 +9,7 @@ LL | (|| { let bar = foo; bar.take() })(); This warning will become a hard error in the future. warning[E0507]: cannot move out of `foo`, as it is immutable for the pattern guard - --> $DIR/borrowck-migrate-to-nll.rs:35:17 + --> $DIR/borrowck-migrate-to-nll.rs:25:17 | LL | (|| { let bar = foo; bar.take() })(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/borrowck/borrowck-move-by-capture.nll.stderr b/src/test/ui/borrowck/borrowck-move-by-capture.nll.stderr index 9f56b26648b2a..b8a0117441779 100644 --- a/src/test/ui/borrowck/borrowck-move-by-capture.nll.stderr +++ b/src/test/ui/borrowck/borrowck-move-by-capture.nll.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of captured variable in an `FnMut` closure - --> $DIR/borrowck-move-by-capture.rs:19:29 + --> $DIR/borrowck-move-by-capture.rs:9:29 | LL | let bar: Box<_> = box 3; | --- captured outer variable diff --git a/src/test/ui/borrowck/borrowck-move-by-capture.rs b/src/test/ui/borrowck/borrowck-move-by-capture.rs index bad521210439f..a825ed5e89acd 100644 --- a/src/test/ui/borrowck/borrowck-move-by-capture.rs +++ b/src/test/ui/borrowck/borrowck-move-by-capture.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax,unboxed_closures)] fn to_fn_mut>(f: F) -> F { f } diff --git a/src/test/ui/borrowck/borrowck-move-by-capture.stderr b/src/test/ui/borrowck/borrowck-move-by-capture.stderr index a88af1596efdc..9c485fb48ca74 100644 --- a/src/test/ui/borrowck/borrowck-move-by-capture.stderr +++ b/src/test/ui/borrowck/borrowck-move-by-capture.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of captured outer variable in an `FnMut` closure - --> $DIR/borrowck-move-by-capture.rs:19:29 + --> $DIR/borrowck-move-by-capture.rs:9:29 | LL | let bar: Box<_> = box 3; | --- captured outer variable diff --git a/src/test/ui/borrowck/borrowck-move-error-with-note.nll.stderr b/src/test/ui/borrowck/borrowck-move-error-with-note.nll.stderr index 2df520a936c9d..9386278886f6b 100644 --- a/src/test/ui/borrowck/borrowck-move-error-with-note.nll.stderr +++ b/src/test/ui/borrowck/borrowck-move-error-with-note.nll.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-move-error-with-note.rs:21:11 + --> $DIR/borrowck-move-error-with-note.rs:11:11 | LL | match *f { //~ ERROR cannot move out of | ^^ @@ -15,7 +15,7 @@ LL | Foo::Foo2(num) => (), | --- ...and here | note: move occurs because these variables have types that don't implement the `Copy` trait - --> $DIR/borrowck-move-error-with-note.rs:23:19 + --> $DIR/borrowck-move-error-with-note.rs:13:19 | LL | Foo::Foo1(num1, | ^^^^ @@ -25,7 +25,7 @@ LL | Foo::Foo2(num) => (), | ^^^ error[E0509]: cannot move out of type `S`, which implements the `Drop` trait - --> $DIR/borrowck-move-error-with-note.rs:39:11 + --> $DIR/borrowck-move-error-with-note.rs:29:11 | LL | match (S {f: "foo".to_string(), g: "bar".to_string()}) { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of here @@ -36,7 +36,7 @@ LL | g: _t | -- ...and here | note: move occurs because these variables have types that don't implement the `Copy` trait - --> $DIR/borrowck-move-error-with-note.rs:42:16 + --> $DIR/borrowck-move-error-with-note.rs:32:16 | LL | f: _s, | ^^ @@ -44,7 +44,7 @@ LL | g: _t | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-move-error-with-note.rs:57:11 + --> $DIR/borrowck-move-error-with-note.rs:47:11 | LL | match a.a { //~ ERROR cannot move out of | ^^^ @@ -56,7 +56,7 @@ LL | n => { | - data moved here | note: move occurs because `n` has type `std::boxed::Box`, which does not implement the `Copy` trait - --> $DIR/borrowck-move-error-with-note.rs:59:9 + --> $DIR/borrowck-move-error-with-note.rs:49:9 | LL | n => { | ^ diff --git a/src/test/ui/borrowck/borrowck-move-error-with-note.rs b/src/test/ui/borrowck/borrowck-move-error-with-note.rs index e0491159a687e..d2dab2eacca42 100644 --- a/src/test/ui/borrowck/borrowck-move-error-with-note.rs +++ b/src/test/ui/borrowck/borrowck-move-error-with-note.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] enum Foo { diff --git a/src/test/ui/borrowck/borrowck-move-error-with-note.stderr b/src/test/ui/borrowck/borrowck-move-error-with-note.stderr index 81ed058e47f46..07009b42e4da1 100644 --- a/src/test/ui/borrowck/borrowck-move-error-with-note.stderr +++ b/src/test/ui/borrowck/borrowck-move-error-with-note.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-move-error-with-note.rs:21:11 + --> $DIR/borrowck-move-error-with-note.rs:11:11 | LL | match *f { //~ ERROR cannot move out of | ^^ cannot move out of borrowed content @@ -12,7 +12,7 @@ LL | Foo::Foo2(num) => (), | --- ...and here (use `ref num` or `ref mut num`) error[E0509]: cannot move out of type `S`, which implements the `Drop` trait - --> $DIR/borrowck-move-error-with-note.rs:40:9 + --> $DIR/borrowck-move-error-with-note.rs:30:9 | LL | / S { //~ ERROR cannot move out of type `S`, which implements the `Drop` trait LL | | //~| cannot move out of here @@ -24,7 +24,7 @@ LL | | } => {} | |_________^ cannot move out of here error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-move-error-with-note.rs:57:11 + --> $DIR/borrowck-move-error-with-note.rs:47:11 | LL | match a.a { //~ ERROR cannot move out of | ^ cannot move out of borrowed content diff --git a/src/test/ui/borrowck/borrowck-move-from-subpath-of-borrowed-path.nll.stderr b/src/test/ui/borrowck/borrowck-move-from-subpath-of-borrowed-path.nll.stderr index bd5d19ffe054c..b7fa2247e32f7 100644 --- a/src/test/ui/borrowck/borrowck-move-from-subpath-of-borrowed-path.nll.stderr +++ b/src/test/ui/borrowck/borrowck-move-from-subpath-of-borrowed-path.nll.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `*a` because it is borrowed - --> $DIR/borrowck-move-from-subpath-of-borrowed-path.rs:22:13 + --> $DIR/borrowck-move-from-subpath-of-borrowed-path.rs:12:13 | LL | let b = &a; | -- borrow of `a` occurs here diff --git a/src/test/ui/borrowck/borrowck-move-from-subpath-of-borrowed-path.rs b/src/test/ui/borrowck/borrowck-move-from-subpath-of-borrowed-path.rs index 1216fb89667e8..e058c80651679 100644 --- a/src/test/ui/borrowck/borrowck-move-from-subpath-of-borrowed-path.rs +++ b/src/test/ui/borrowck/borrowck-move-from-subpath-of-borrowed-path.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // verify that an error is raised when trying to move out of a // borrowed path. diff --git a/src/test/ui/borrowck/borrowck-move-from-subpath-of-borrowed-path.stderr b/src/test/ui/borrowck/borrowck-move-from-subpath-of-borrowed-path.stderr index e5557eca6de03..2ed888051f61e 100644 --- a/src/test/ui/borrowck/borrowck-move-from-subpath-of-borrowed-path.stderr +++ b/src/test/ui/borrowck/borrowck-move-from-subpath-of-borrowed-path.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `*a` because it is borrowed - --> $DIR/borrowck-move-from-subpath-of-borrowed-path.rs:22:9 + --> $DIR/borrowck-move-from-subpath-of-borrowed-path.rs:12:9 | LL | let b = &a; | - borrow of `a` occurs here diff --git a/src/test/ui/borrowck/borrowck-move-from-unsafe-ptr.nll.stderr b/src/test/ui/borrowck/borrowck-move-from-unsafe-ptr.nll.stderr index f823a6f08d789..e63887176a66f 100644 --- a/src/test/ui/borrowck/borrowck-move-from-unsafe-ptr.nll.stderr +++ b/src/test/ui/borrowck/borrowck-move-from-unsafe-ptr.nll.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-move-from-unsafe-ptr.rs:13:13 + --> $DIR/borrowck-move-from-unsafe-ptr.rs:2:13 | LL | let y = *x; //~ ERROR cannot move out of dereference of raw pointer | ^^ diff --git a/src/test/ui/borrowck/borrowck-move-from-unsafe-ptr.rs b/src/test/ui/borrowck/borrowck-move-from-unsafe-ptr.rs index 9a39ff6206bfb..bf8ff9cf0a9da 100644 --- a/src/test/ui/borrowck/borrowck-move-from-unsafe-ptr.rs +++ b/src/test/ui/borrowck/borrowck-move-from-unsafe-ptr.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - unsafe fn foo(x: *const Box) -> Box { let y = *x; //~ ERROR cannot move out of dereference of raw pointer return y; diff --git a/src/test/ui/borrowck/borrowck-move-from-unsafe-ptr.stderr b/src/test/ui/borrowck/borrowck-move-from-unsafe-ptr.stderr index cad155103f0c9..62a522600388d 100644 --- a/src/test/ui/borrowck/borrowck-move-from-unsafe-ptr.stderr +++ b/src/test/ui/borrowck/borrowck-move-from-unsafe-ptr.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of dereference of raw pointer - --> $DIR/borrowck-move-from-unsafe-ptr.rs:13:13 + --> $DIR/borrowck-move-from-unsafe-ptr.rs:2:13 | LL | let y = *x; //~ ERROR cannot move out of dereference of raw pointer | ^^ diff --git a/src/test/ui/borrowck/borrowck-move-in-irrefut-pat.ast.nll.stderr b/src/test/ui/borrowck/borrowck-move-in-irrefut-pat.ast.nll.stderr index 49c2ec0dcf4e7..c18fce9f4fd55 100644 --- a/src/test/ui/borrowck/borrowck-move-in-irrefut-pat.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-move-in-irrefut-pat.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-move-in-irrefut-pat.rs:16:13 + --> $DIR/borrowck-move-in-irrefut-pat.rs:6:13 | LL | fn arg_item(&_x: &String) {} | ^-- @@ -9,13 +9,13 @@ LL | fn arg_item(&_x: &String) {} | help: consider removing the `&`: `_x` | note: move occurs because `_x` has type `std::string::String`, which does not implement the `Copy` trait - --> $DIR/borrowck-move-in-irrefut-pat.rs:16:14 + --> $DIR/borrowck-move-in-irrefut-pat.rs:6:14 | LL | fn arg_item(&_x: &String) {} | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-move-in-irrefut-pat.rs:21:11 + --> $DIR/borrowck-move-in-irrefut-pat.rs:11:11 | LL | with(|&_x| ()) | ^-- @@ -25,13 +25,13 @@ LL | with(|&_x| ()) | help: consider removing the `&`: `_x` | note: move occurs because `_x` has type `std::string::String`, which does not implement the `Copy` trait - --> $DIR/borrowck-move-in-irrefut-pat.rs:21:12 + --> $DIR/borrowck-move-in-irrefut-pat.rs:11:12 | LL | with(|&_x| ()) | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-move-in-irrefut-pat.rs:27:15 + --> $DIR/borrowck-move-in-irrefut-pat.rs:17:15 | LL | let &_x = &"hi".to_string(); | --- ^^^^^^^^^^^^^^^^^ cannot move out of borrowed content @@ -40,7 +40,7 @@ LL | let &_x = &"hi".to_string(); | help: consider removing the `&`: `_x` | note: move occurs because `_x` has type `std::string::String`, which does not implement the `Copy` trait - --> $DIR/borrowck-move-in-irrefut-pat.rs:27:10 + --> $DIR/borrowck-move-in-irrefut-pat.rs:17:10 | LL | let &_x = &"hi".to_string(); | ^^ diff --git a/src/test/ui/borrowck/borrowck-move-in-irrefut-pat.ast.stderr b/src/test/ui/borrowck/borrowck-move-in-irrefut-pat.ast.stderr index fa7fb649c8d30..019ed96661fc2 100644 --- a/src/test/ui/borrowck/borrowck-move-in-irrefut-pat.ast.stderr +++ b/src/test/ui/borrowck/borrowck-move-in-irrefut-pat.ast.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-move-in-irrefut-pat.rs:16:13 + --> $DIR/borrowck-move-in-irrefut-pat.rs:6:13 | LL | fn arg_item(&_x: &String) {} | ^-- @@ -8,7 +8,7 @@ LL | fn arg_item(&_x: &String) {} | cannot move out of borrowed content error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-move-in-irrefut-pat.rs:21:11 + --> $DIR/borrowck-move-in-irrefut-pat.rs:11:11 | LL | with(|&_x| ()) | ^-- @@ -17,7 +17,7 @@ LL | with(|&_x| ()) | cannot move out of borrowed content error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-move-in-irrefut-pat.rs:27:9 + --> $DIR/borrowck-move-in-irrefut-pat.rs:17:9 | LL | let &_x = &"hi".to_string(); | ^-- diff --git a/src/test/ui/borrowck/borrowck-move-in-irrefut-pat.mir.stderr b/src/test/ui/borrowck/borrowck-move-in-irrefut-pat.mir.stderr index 49c2ec0dcf4e7..c18fce9f4fd55 100644 --- a/src/test/ui/borrowck/borrowck-move-in-irrefut-pat.mir.stderr +++ b/src/test/ui/borrowck/borrowck-move-in-irrefut-pat.mir.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-move-in-irrefut-pat.rs:16:13 + --> $DIR/borrowck-move-in-irrefut-pat.rs:6:13 | LL | fn arg_item(&_x: &String) {} | ^-- @@ -9,13 +9,13 @@ LL | fn arg_item(&_x: &String) {} | help: consider removing the `&`: `_x` | note: move occurs because `_x` has type `std::string::String`, which does not implement the `Copy` trait - --> $DIR/borrowck-move-in-irrefut-pat.rs:16:14 + --> $DIR/borrowck-move-in-irrefut-pat.rs:6:14 | LL | fn arg_item(&_x: &String) {} | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-move-in-irrefut-pat.rs:21:11 + --> $DIR/borrowck-move-in-irrefut-pat.rs:11:11 | LL | with(|&_x| ()) | ^-- @@ -25,13 +25,13 @@ LL | with(|&_x| ()) | help: consider removing the `&`: `_x` | note: move occurs because `_x` has type `std::string::String`, which does not implement the `Copy` trait - --> $DIR/borrowck-move-in-irrefut-pat.rs:21:12 + --> $DIR/borrowck-move-in-irrefut-pat.rs:11:12 | LL | with(|&_x| ()) | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-move-in-irrefut-pat.rs:27:15 + --> $DIR/borrowck-move-in-irrefut-pat.rs:17:15 | LL | let &_x = &"hi".to_string(); | --- ^^^^^^^^^^^^^^^^^ cannot move out of borrowed content @@ -40,7 +40,7 @@ LL | let &_x = &"hi".to_string(); | help: consider removing the `&`: `_x` | note: move occurs because `_x` has type `std::string::String`, which does not implement the `Copy` trait - --> $DIR/borrowck-move-in-irrefut-pat.rs:27:10 + --> $DIR/borrowck-move-in-irrefut-pat.rs:17:10 | LL | let &_x = &"hi".to_string(); | ^^ diff --git a/src/test/ui/borrowck/borrowck-move-in-irrefut-pat.rs b/src/test/ui/borrowck/borrowck-move-in-irrefut-pat.rs index 5fdde484f8220..c63f4f60bef48 100644 --- a/src/test/ui/borrowck/borrowck-move-in-irrefut-pat.rs +++ b/src/test/ui/borrowck/borrowck-move-in-irrefut-pat.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/borrowck/borrowck-move-moved-value-into-closure.ast.nll.stderr b/src/test/ui/borrowck/borrowck-move-moved-value-into-closure.ast.nll.stderr index d896ff491c646..24b9b4338a58c 100644 --- a/src/test/ui/borrowck/borrowck-move-moved-value-into-closure.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-move-moved-value-into-closure.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `t` - --> $DIR/borrowck-move-moved-value-into-closure.rs:24:12 + --> $DIR/borrowck-move-moved-value-into-closure.rs:14:12 | LL | call_f(move|| { *t + 1 }); | ------ - variable moved due to use in closure diff --git a/src/test/ui/borrowck/borrowck-move-moved-value-into-closure.ast.stderr b/src/test/ui/borrowck/borrowck-move-moved-value-into-closure.ast.stderr index c7576b1b32ddb..308dac8329294 100644 --- a/src/test/ui/borrowck/borrowck-move-moved-value-into-closure.ast.stderr +++ b/src/test/ui/borrowck/borrowck-move-moved-value-into-closure.ast.stderr @@ -1,5 +1,5 @@ error[E0382]: capture of moved value: `t` - --> $DIR/borrowck-move-moved-value-into-closure.rs:24:22 + --> $DIR/borrowck-move-moved-value-into-closure.rs:14:22 | LL | call_f(move|| { *t + 1 }); | ------ value moved (into closure) here diff --git a/src/test/ui/borrowck/borrowck-move-moved-value-into-closure.mir.stderr b/src/test/ui/borrowck/borrowck-move-moved-value-into-closure.mir.stderr index d896ff491c646..24b9b4338a58c 100644 --- a/src/test/ui/borrowck/borrowck-move-moved-value-into-closure.mir.stderr +++ b/src/test/ui/borrowck/borrowck-move-moved-value-into-closure.mir.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `t` - --> $DIR/borrowck-move-moved-value-into-closure.rs:24:12 + --> $DIR/borrowck-move-moved-value-into-closure.rs:14:12 | LL | call_f(move|| { *t + 1 }); | ------ - variable moved due to use in closure diff --git a/src/test/ui/borrowck/borrowck-move-moved-value-into-closure.rs b/src/test/ui/borrowck/borrowck-move-moved-value-into-closure.rs index 2bd6f75df1b1f..271553370e3fb 100644 --- a/src/test/ui/borrowck/borrowck-move-moved-value-into-closure.rs +++ b/src/test/ui/borrowck/borrowck-move-moved-value-into-closure.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/borrowck/borrowck-move-mut-base-ptr.nll.stderr b/src/test/ui/borrowck/borrowck-move-mut-base-ptr.nll.stderr index 9d31d2b4aff9f..ce6433d5a527f 100644 --- a/src/test/ui/borrowck/borrowck-move-mut-base-ptr.nll.stderr +++ b/src/test/ui/borrowck/borrowck-move-mut-base-ptr.nll.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `t0` because it is borrowed - --> $DIR/borrowck-move-mut-base-ptr.rs:20:14 + --> $DIR/borrowck-move-mut-base-ptr.rs:10:14 | LL | let p: &isize = &*t0; // Freezes `*t0` | ---- borrow of `*t0` occurs here diff --git a/src/test/ui/borrowck/borrowck-move-mut-base-ptr.rs b/src/test/ui/borrowck/borrowck-move-mut-base-ptr.rs index eb7b310a8bf07..10fc1437253bd 100644 --- a/src/test/ui/borrowck/borrowck-move-mut-base-ptr.rs +++ b/src/test/ui/borrowck/borrowck-move-mut-base-ptr.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that attempt to move `&mut` pointer while pointee is borrowed // yields an error. // diff --git a/src/test/ui/borrowck/borrowck-move-mut-base-ptr.stderr b/src/test/ui/borrowck/borrowck-move-mut-base-ptr.stderr index 33ccd148f5b1d..224bf0fded875 100644 --- a/src/test/ui/borrowck/borrowck-move-mut-base-ptr.stderr +++ b/src/test/ui/borrowck/borrowck-move-mut-base-ptr.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `t0` because it is borrowed - --> $DIR/borrowck-move-mut-base-ptr.rs:20:9 + --> $DIR/borrowck-move-mut-base-ptr.rs:10:9 | LL | let p: &isize = &*t0; // Freezes `*t0` | --- borrow of `*t0` occurs here diff --git a/src/test/ui/borrowck/borrowck-move-out-from-array.ast.nll.stderr b/src/test/ui/borrowck/borrowck-move-out-from-array.ast.nll.stderr index d67b63b5aa71a..2e5477c573bbe 100644 --- a/src/test/ui/borrowck/borrowck-move-out-from-array.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-move-out-from-array.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `a[..]` - --> $DIR/borrowck-move-out-from-array.rs:20:14 + --> $DIR/borrowck-move-out-from-array.rs:10:14 | LL | let [_, _x] = a; | -- value moved here @@ -7,7 +7,7 @@ LL | let [.., _y] = a; //[ast]~ ERROR [E0382] | ^^ value used here after move error[E0382]: use of moved value: `a[..]` - --> $DIR/borrowck-move-out-from-array.rs:27:10 + --> $DIR/borrowck-move-out-from-array.rs:17:10 | LL | let [_x, _] = a; | -- value moved here diff --git a/src/test/ui/borrowck/borrowck-move-out-from-array.ast.stderr b/src/test/ui/borrowck/borrowck-move-out-from-array.ast.stderr index d19c23dce5f5f..f866ff9e9bae1 100644 --- a/src/test/ui/borrowck/borrowck-move-out-from-array.ast.stderr +++ b/src/test/ui/borrowck/borrowck-move-out-from-array.ast.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `a[..]` - --> $DIR/borrowck-move-out-from-array.rs:20:14 + --> $DIR/borrowck-move-out-from-array.rs:10:14 | LL | let [_, _x] = a; | -- value moved here @@ -9,7 +9,7 @@ LL | let [.., _y] = a; //[ast]~ ERROR [E0382] = note: move occurs because `a[..]` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0382]: use of moved value: `a[..]` - --> $DIR/borrowck-move-out-from-array.rs:27:10 + --> $DIR/borrowck-move-out-from-array.rs:17:10 | LL | let [_x, _] = a; | -- value moved here diff --git a/src/test/ui/borrowck/borrowck-move-out-from-array.mir.stderr b/src/test/ui/borrowck/borrowck-move-out-from-array.mir.stderr index d67b63b5aa71a..2e5477c573bbe 100644 --- a/src/test/ui/borrowck/borrowck-move-out-from-array.mir.stderr +++ b/src/test/ui/borrowck/borrowck-move-out-from-array.mir.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `a[..]` - --> $DIR/borrowck-move-out-from-array.rs:20:14 + --> $DIR/borrowck-move-out-from-array.rs:10:14 | LL | let [_, _x] = a; | -- value moved here @@ -7,7 +7,7 @@ LL | let [.., _y] = a; //[ast]~ ERROR [E0382] | ^^ value used here after move error[E0382]: use of moved value: `a[..]` - --> $DIR/borrowck-move-out-from-array.rs:27:10 + --> $DIR/borrowck-move-out-from-array.rs:17:10 | LL | let [_x, _] = a; | -- value moved here diff --git a/src/test/ui/borrowck/borrowck-move-out-from-array.rs b/src/test/ui/borrowck/borrowck-move-out-from-array.rs index 0db31cef0ed77..503e7b99525eb 100644 --- a/src/test/ui/borrowck/borrowck-move-out-from-array.rs +++ b/src/test/ui/borrowck/borrowck-move-out-from-array.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/borrowck/borrowck-move-out-of-overloaded-auto-deref.ast.stderr b/src/test/ui/borrowck/borrowck-move-out-of-overloaded-auto-deref.ast.stderr index 94f7eba63a1ca..e55898aca5c06 100644 --- a/src/test/ui/borrowck/borrowck-move-out-of-overloaded-auto-deref.ast.stderr +++ b/src/test/ui/borrowck/borrowck-move-out-of-overloaded-auto-deref.ast.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-move-out-of-overloaded-auto-deref.rs:17:14 + --> $DIR/borrowck-move-out-of-overloaded-auto-deref.rs:7:14 | LL | let _x = Rc::new(vec![1, 2]).into_iter(); | ^^^^^^^^^^^^^^^^^^^ cannot move out of borrowed content diff --git a/src/test/ui/borrowck/borrowck-move-out-of-overloaded-auto-deref.mir.stderr b/src/test/ui/borrowck/borrowck-move-out-of-overloaded-auto-deref.mir.stderr index 94f7eba63a1ca..e55898aca5c06 100644 --- a/src/test/ui/borrowck/borrowck-move-out-of-overloaded-auto-deref.mir.stderr +++ b/src/test/ui/borrowck/borrowck-move-out-of-overloaded-auto-deref.mir.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-move-out-of-overloaded-auto-deref.rs:17:14 + --> $DIR/borrowck-move-out-of-overloaded-auto-deref.rs:7:14 | LL | let _x = Rc::new(vec![1, 2]).into_iter(); | ^^^^^^^^^^^^^^^^^^^ cannot move out of borrowed content diff --git a/src/test/ui/borrowck/borrowck-move-out-of-overloaded-auto-deref.rs b/src/test/ui/borrowck/borrowck-move-out-of-overloaded-auto-deref.rs index af9202d8d7792..5ced89478dc9c 100644 --- a/src/test/ui/borrowck/borrowck-move-out-of-overloaded-auto-deref.rs +++ b/src/test/ui/borrowck/borrowck-move-out-of-overloaded-auto-deref.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/borrowck/borrowck-move-out-of-overloaded-deref.nll.stderr b/src/test/ui/borrowck/borrowck-move-out-of-overloaded-deref.nll.stderr index b9c47e6e8cfe9..8a6f20a398300 100644 --- a/src/test/ui/borrowck/borrowck-move-out-of-overloaded-deref.nll.stderr +++ b/src/test/ui/borrowck/borrowck-move-out-of-overloaded-deref.nll.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-move-out-of-overloaded-deref.rs:14:14 + --> $DIR/borrowck-move-out-of-overloaded-deref.rs:4:14 | LL | let _x = *Rc::new("hi".to_string()); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/borrowck/borrowck-move-out-of-overloaded-deref.rs b/src/test/ui/borrowck/borrowck-move-out-of-overloaded-deref.rs index fffcf575ab08e..d5b60139fa6b1 100644 --- a/src/test/ui/borrowck/borrowck-move-out-of-overloaded-deref.rs +++ b/src/test/ui/borrowck/borrowck-move-out-of-overloaded-deref.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::rc::Rc; pub fn main() { diff --git a/src/test/ui/borrowck/borrowck-move-out-of-overloaded-deref.stderr b/src/test/ui/borrowck/borrowck-move-out-of-overloaded-deref.stderr index df5d911f6a88d..cd8d146ab1eaa 100644 --- a/src/test/ui/borrowck/borrowck-move-out-of-overloaded-deref.stderr +++ b/src/test/ui/borrowck/borrowck-move-out-of-overloaded-deref.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-move-out-of-overloaded-deref.rs:14:14 + --> $DIR/borrowck-move-out-of-overloaded-deref.rs:4:14 | LL | let _x = *Rc::new("hi".to_string()); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/borrowck/borrowck-move-out-of-static-item.ast.stderr b/src/test/ui/borrowck/borrowck-move-out-of-static-item.ast.stderr index 65f70a7984fe4..752d5330e0279 100644 --- a/src/test/ui/borrowck/borrowck-move-out-of-static-item.ast.stderr +++ b/src/test/ui/borrowck/borrowck-move-out-of-static-item.ast.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of static item - --> $DIR/borrowck-move-out-of-static-item.rs:28:10 + --> $DIR/borrowck-move-out-of-static-item.rs:18:10 | LL | test(BAR); //[ast]~ ERROR cannot move out of static item [E0507] | ^^^ cannot move out of static item diff --git a/src/test/ui/borrowck/borrowck-move-out-of-static-item.mir.stderr b/src/test/ui/borrowck/borrowck-move-out-of-static-item.mir.stderr index 65f70a7984fe4..752d5330e0279 100644 --- a/src/test/ui/borrowck/borrowck-move-out-of-static-item.mir.stderr +++ b/src/test/ui/borrowck/borrowck-move-out-of-static-item.mir.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of static item - --> $DIR/borrowck-move-out-of-static-item.rs:28:10 + --> $DIR/borrowck-move-out-of-static-item.rs:18:10 | LL | test(BAR); //[ast]~ ERROR cannot move out of static item [E0507] | ^^^ cannot move out of static item diff --git a/src/test/ui/borrowck/borrowck-move-out-of-static-item.rs b/src/test/ui/borrowck/borrowck-move-out-of-static-item.rs index 79eb68c95a037..d68d5de5c014b 100644 --- a/src/test/ui/borrowck/borrowck-move-out-of-static-item.rs +++ b/src/test/ui/borrowck/borrowck-move-out-of-static-item.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/borrowck/borrowck-move-out-of-struct-with-dtor.ast.nll.stderr b/src/test/ui/borrowck/borrowck-move-out-of-struct-with-dtor.ast.nll.stderr index 34f9f035188b8..7025ce08fedf6 100644 --- a/src/test/ui/borrowck/borrowck-move-out-of-struct-with-dtor.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-move-out-of-struct-with-dtor.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0509]: cannot move out of type `S`, which implements the `Drop` trait - --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:20:11 + --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:10:11 | LL | match (S {f:"foo".to_string()}) { | ^^^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of here @@ -8,13 +8,13 @@ LL | S {f:_s} => {} | -- data moved here | note: move occurs because `_s` has type `std::string::String`, which does not implement the `Copy` trait - --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:22:14 + --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:12:14 | LL | S {f:_s} => {} | ^^ error[E0509]: cannot move out of type `S`, which implements the `Drop` trait - --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:28:20 + --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:18:20 | LL | let S {f:_s} = S {f:"foo".to_string()}; | -- ^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of here @@ -22,13 +22,13 @@ LL | let S {f:_s} = S {f:"foo".to_string()}; | data moved here | note: move occurs because `_s` has type `std::string::String`, which does not implement the `Copy` trait - --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:28:14 + --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:18:14 | LL | let S {f:_s} = S {f:"foo".to_string()}; | ^^ error[E0509]: cannot move out of type `S`, which implements the `Drop` trait - --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:33:19 + --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:23:19 | LL | fn move_in_fn_arg(S {f:_s}: S) { | ^^^^^--^ @@ -37,7 +37,7 @@ LL | fn move_in_fn_arg(S {f:_s}: S) { | cannot move out of here | note: move occurs because `_s` has type `std::string::String`, which does not implement the `Copy` trait - --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:33:24 + --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:23:24 | LL | fn move_in_fn_arg(S {f:_s}: S) { | ^^ diff --git a/src/test/ui/borrowck/borrowck-move-out-of-struct-with-dtor.ast.stderr b/src/test/ui/borrowck/borrowck-move-out-of-struct-with-dtor.ast.stderr index 4384f046d1642..0b025fa175a5f 100644 --- a/src/test/ui/borrowck/borrowck-move-out-of-struct-with-dtor.ast.stderr +++ b/src/test/ui/borrowck/borrowck-move-out-of-struct-with-dtor.ast.stderr @@ -1,5 +1,5 @@ error[E0509]: cannot move out of type `S`, which implements the `Drop` trait - --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:22:9 + --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:12:9 | LL | S {f:_s} => {} | ^^^^^--^ @@ -8,7 +8,7 @@ LL | S {f:_s} => {} | cannot move out of here error[E0509]: cannot move out of type `S`, which implements the `Drop` trait - --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:28:9 + --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:18:9 | LL | let S {f:_s} = S {f:"foo".to_string()}; | ^^^^^--^ @@ -17,7 +17,7 @@ LL | let S {f:_s} = S {f:"foo".to_string()}; | cannot move out of here error[E0509]: cannot move out of type `S`, which implements the `Drop` trait - --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:33:19 + --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:23:19 | LL | fn move_in_fn_arg(S {f:_s}: S) { | ^^^^^--^ diff --git a/src/test/ui/borrowck/borrowck-move-out-of-struct-with-dtor.mir.stderr b/src/test/ui/borrowck/borrowck-move-out-of-struct-with-dtor.mir.stderr index 34f9f035188b8..7025ce08fedf6 100644 --- a/src/test/ui/borrowck/borrowck-move-out-of-struct-with-dtor.mir.stderr +++ b/src/test/ui/borrowck/borrowck-move-out-of-struct-with-dtor.mir.stderr @@ -1,5 +1,5 @@ error[E0509]: cannot move out of type `S`, which implements the `Drop` trait - --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:20:11 + --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:10:11 | LL | match (S {f:"foo".to_string()}) { | ^^^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of here @@ -8,13 +8,13 @@ LL | S {f:_s} => {} | -- data moved here | note: move occurs because `_s` has type `std::string::String`, which does not implement the `Copy` trait - --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:22:14 + --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:12:14 | LL | S {f:_s} => {} | ^^ error[E0509]: cannot move out of type `S`, which implements the `Drop` trait - --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:28:20 + --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:18:20 | LL | let S {f:_s} = S {f:"foo".to_string()}; | -- ^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of here @@ -22,13 +22,13 @@ LL | let S {f:_s} = S {f:"foo".to_string()}; | data moved here | note: move occurs because `_s` has type `std::string::String`, which does not implement the `Copy` trait - --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:28:14 + --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:18:14 | LL | let S {f:_s} = S {f:"foo".to_string()}; | ^^ error[E0509]: cannot move out of type `S`, which implements the `Drop` trait - --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:33:19 + --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:23:19 | LL | fn move_in_fn_arg(S {f:_s}: S) { | ^^^^^--^ @@ -37,7 +37,7 @@ LL | fn move_in_fn_arg(S {f:_s}: S) { | cannot move out of here | note: move occurs because `_s` has type `std::string::String`, which does not implement the `Copy` trait - --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:33:24 + --> $DIR/borrowck-move-out-of-struct-with-dtor.rs:23:24 | LL | fn move_in_fn_arg(S {f:_s}: S) { | ^^ diff --git a/src/test/ui/borrowck/borrowck-move-out-of-struct-with-dtor.rs b/src/test/ui/borrowck/borrowck-move-out-of-struct-with-dtor.rs index 4bb66ace02687..cdd71d889ab2f 100644 --- a/src/test/ui/borrowck/borrowck-move-out-of-struct-with-dtor.rs +++ b/src/test/ui/borrowck/borrowck-move-out-of-struct-with-dtor.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.nll.stderr b/src/test/ui/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.nll.stderr index 278c33c71e245..cecba15acce96 100644 --- a/src/test/ui/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.nll.stderr +++ b/src/test/ui/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.nll.stderr @@ -1,5 +1,5 @@ error[E0509]: cannot move out of type `S`, which implements the `Drop` trait - --> $DIR/borrowck-move-out-of-tuple-struct-with-dtor.rs:17:11 + --> $DIR/borrowck-move-out-of-tuple-struct-with-dtor.rs:7:11 | LL | match S("foo".to_string()) { | ^^^^^^^^^^^^^^^^^^^^ cannot move out of here @@ -7,13 +7,13 @@ LL | S(_s) => {} | -- data moved here | note: move occurs because `_s` has type `std::string::String`, which does not implement the `Copy` trait - --> $DIR/borrowck-move-out-of-tuple-struct-with-dtor.rs:18:11 + --> $DIR/borrowck-move-out-of-tuple-struct-with-dtor.rs:8:11 | LL | S(_s) => {} | ^^ error[E0509]: cannot move out of type `S`, which implements the `Drop` trait - --> $DIR/borrowck-move-out-of-tuple-struct-with-dtor.rs:24:17 + --> $DIR/borrowck-move-out-of-tuple-struct-with-dtor.rs:14:17 | LL | let S(_s) = S("foo".to_string()); | -- ^^^^^^^^^^^^^^^^^^^^ cannot move out of here @@ -21,13 +21,13 @@ LL | let S(_s) = S("foo".to_string()); | data moved here | note: move occurs because `_s` has type `std::string::String`, which does not implement the `Copy` trait - --> $DIR/borrowck-move-out-of-tuple-struct-with-dtor.rs:24:11 + --> $DIR/borrowck-move-out-of-tuple-struct-with-dtor.rs:14:11 | LL | let S(_s) = S("foo".to_string()); | ^^ error[E0509]: cannot move out of type `S`, which implements the `Drop` trait - --> $DIR/borrowck-move-out-of-tuple-struct-with-dtor.rs:28:19 + --> $DIR/borrowck-move-out-of-tuple-struct-with-dtor.rs:18:19 | LL | fn move_in_fn_arg(S(_s): S) { | ^^--^ @@ -36,7 +36,7 @@ LL | fn move_in_fn_arg(S(_s): S) { | cannot move out of here | note: move occurs because `_s` has type `std::string::String`, which does not implement the `Copy` trait - --> $DIR/borrowck-move-out-of-tuple-struct-with-dtor.rs:28:21 + --> $DIR/borrowck-move-out-of-tuple-struct-with-dtor.rs:18:21 | LL | fn move_in_fn_arg(S(_s): S) { | ^^ diff --git a/src/test/ui/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.rs b/src/test/ui/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.rs index f5fedb8d487ee..bb294111add7e 100644 --- a/src/test/ui/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.rs +++ b/src/test/ui/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S(String); impl Drop for S { fn drop(&mut self) { } diff --git a/src/test/ui/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.stderr b/src/test/ui/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.stderr index 78a065b60da58..134b5e3481efd 100644 --- a/src/test/ui/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.stderr +++ b/src/test/ui/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.stderr @@ -1,5 +1,5 @@ error[E0509]: cannot move out of type `S`, which implements the `Drop` trait - --> $DIR/borrowck-move-out-of-tuple-struct-with-dtor.rs:18:9 + --> $DIR/borrowck-move-out-of-tuple-struct-with-dtor.rs:8:9 | LL | S(_s) => {} | ^^--^ @@ -8,7 +8,7 @@ LL | S(_s) => {} | cannot move out of here error[E0509]: cannot move out of type `S`, which implements the `Drop` trait - --> $DIR/borrowck-move-out-of-tuple-struct-with-dtor.rs:24:9 + --> $DIR/borrowck-move-out-of-tuple-struct-with-dtor.rs:14:9 | LL | let S(_s) = S("foo".to_string()); | ^^--^ @@ -17,7 +17,7 @@ LL | let S(_s) = S("foo".to_string()); | cannot move out of here error[E0509]: cannot move out of type `S`, which implements the `Drop` trait - --> $DIR/borrowck-move-out-of-tuple-struct-with-dtor.rs:28:19 + --> $DIR/borrowck-move-out-of-tuple-struct-with-dtor.rs:18:19 | LL | fn move_in_fn_arg(S(_s): S) { | ^^--^ diff --git a/src/test/ui/borrowck/borrowck-move-out-of-vec-tail.nll.stderr b/src/test/ui/borrowck/borrowck-move-out-of-vec-tail.nll.stderr index f3430ba4e06c9..9aaeefd4cfc32 100644 --- a/src/test/ui/borrowck/borrowck-move-out-of-vec-tail.nll.stderr +++ b/src/test/ui/borrowck/borrowck-move-out-of-vec-tail.nll.stderr @@ -1,5 +1,5 @@ error[E0508]: cannot move out of type `[Foo]`, a non-copy slice - --> $DIR/borrowck-move-out-of-vec-tail.rs:29:19 + --> $DIR/borrowck-move-out-of-vec-tail.rs:19:19 | LL | match tail { | ^^^^ cannot move out of here @@ -10,7 +10,7 @@ LL | Foo { string: b }] => { | - ...and here | note: move occurs because these variables have types that don't implement the `Copy` trait - --> $DIR/borrowck-move-out-of-vec-tail.rs:30:33 + --> $DIR/borrowck-move-out-of-vec-tail.rs:20:33 | LL | &[Foo { string: a }, | ^ diff --git a/src/test/ui/borrowck/borrowck-move-out-of-vec-tail.rs b/src/test/ui/borrowck/borrowck-move-out-of-vec-tail.rs index 938ce3f2cb880..5f6e01f2df0ff 100644 --- a/src/test/ui/borrowck/borrowck-move-out-of-vec-tail.rs +++ b/src/test/ui/borrowck/borrowck-move-out-of-vec-tail.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we do not permit moves from &[] matched by a vec pattern. #![feature(slice_patterns)] diff --git a/src/test/ui/borrowck/borrowck-move-out-of-vec-tail.stderr b/src/test/ui/borrowck/borrowck-move-out-of-vec-tail.stderr index c4051e5a25567..156ba0d4d7bb2 100644 --- a/src/test/ui/borrowck/borrowck-move-out-of-vec-tail.stderr +++ b/src/test/ui/borrowck/borrowck-move-out-of-vec-tail.stderr @@ -1,5 +1,5 @@ error[E0508]: cannot move out of type `[Foo]`, a non-copy slice - --> $DIR/borrowck-move-out-of-vec-tail.rs:30:18 + --> $DIR/borrowck-move-out-of-vec-tail.rs:20:18 | LL | &[Foo { string: a }, | ^ - hint: to prevent move, use `ref a` or `ref mut a` diff --git a/src/test/ui/borrowck/borrowck-move-subcomponent.nll.stderr b/src/test/ui/borrowck/borrowck-move-subcomponent.nll.stderr index cd8d0cdfee2c9..3bb5351f97ba3 100644 --- a/src/test/ui/borrowck/borrowck-move-subcomponent.nll.stderr +++ b/src/test/ui/borrowck/borrowck-move-subcomponent.nll.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `a.x` because it is borrowed - --> $DIR/borrowck-move-subcomponent.rs:25:14 + --> $DIR/borrowck-move-subcomponent.rs:15:14 | LL | let pb = &a; | -- borrow of `a` occurs here diff --git a/src/test/ui/borrowck/borrowck-move-subcomponent.rs b/src/test/ui/borrowck/borrowck-move-subcomponent.rs index 88871dda659cf..4185632c4e291 100644 --- a/src/test/ui/borrowck/borrowck-move-subcomponent.rs +++ b/src/test/ui/borrowck/borrowck-move-subcomponent.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that the borrow checker checks all components of a path when moving // out. diff --git a/src/test/ui/borrowck/borrowck-move-subcomponent.stderr b/src/test/ui/borrowck/borrowck-move-subcomponent.stderr index f249f0f22cd35..187cdbbf81565 100644 --- a/src/test/ui/borrowck/borrowck-move-subcomponent.stderr +++ b/src/test/ui/borrowck/borrowck-move-subcomponent.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `a.x` because it is borrowed - --> $DIR/borrowck-move-subcomponent.rs:25:14 + --> $DIR/borrowck-move-subcomponent.rs:15:14 | LL | let pb = &a; | - borrow of `a` occurs here diff --git a/src/test/ui/borrowck/borrowck-multiple-captures.nll.stderr b/src/test/ui/borrowck/borrowck-multiple-captures.nll.stderr index ce1880c584a6e..6f4cad2a01e48 100644 --- a/src/test/ui/borrowck/borrowck-multiple-captures.nll.stderr +++ b/src/test/ui/borrowck/borrowck-multiple-captures.nll.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `x1` because it is borrowed - --> $DIR/borrowck-multiple-captures.rs:22:19 + --> $DIR/borrowck-multiple-captures.rs:12:19 | LL | let p1 = &x1; | --- borrow of `x1` occurs here @@ -13,7 +13,7 @@ LL | borrow(&*p1); | ---- borrow later used here error[E0505]: cannot move out of `x2` because it is borrowed - --> $DIR/borrowck-multiple-captures.rs:22:19 + --> $DIR/borrowck-multiple-captures.rs:12:19 | LL | let p2 = &x2; | --- borrow of `x2` occurs here @@ -27,7 +27,7 @@ LL | borrow(&*p2); | ---- borrow later used here error[E0382]: use of moved value: `x1` - --> $DIR/borrowck-multiple-captures.rs:35:19 + --> $DIR/borrowck-multiple-captures.rs:25:19 | LL | drop(x1); | -- value moved here @@ -40,7 +40,7 @@ LL | drop(x1); //~ ERROR capture of moved value: `x1` = note: move occurs because `x1` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0382]: use of moved value: `x2` - --> $DIR/borrowck-multiple-captures.rs:35:19 + --> $DIR/borrowck-multiple-captures.rs:25:19 | LL | drop(x2); | -- value moved here @@ -53,7 +53,7 @@ LL | drop(x2); //~ ERROR capture of moved value: `x2` = note: move occurs because `x2` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0382]: use of moved value: `x` - --> $DIR/borrowck-multiple-captures.rs:46:14 + --> $DIR/borrowck-multiple-captures.rs:36:14 | LL | drop(x); //~ ERROR cannot move `x` into closure because it is borrowed | - value moved here @@ -63,7 +63,7 @@ LL | drop(x); //~ ERROR use of moved value: `x` = note: move occurs because `x` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0505]: cannot move out of `x` because it is borrowed - --> $DIR/borrowck-multiple-captures.rs:44:19 + --> $DIR/borrowck-multiple-captures.rs:34:19 | LL | let p = &x; | -- borrow of `x` occurs here @@ -76,7 +76,7 @@ LL | borrow(&*p); | --- borrow later used here error[E0382]: use of moved value: `x` - --> $DIR/borrowck-multiple-captures.rs:56:14 + --> $DIR/borrowck-multiple-captures.rs:46:14 | LL | drop(x); //~ ERROR capture of moved value: `x` | - value moved here @@ -86,7 +86,7 @@ LL | drop(x); //~ ERROR use of moved value: `x` = note: move occurs because `x` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0382]: use of moved value: `x` - --> $DIR/borrowck-multiple-captures.rs:54:19 + --> $DIR/borrowck-multiple-captures.rs:44:19 | LL | drop(x); | - value moved here diff --git a/src/test/ui/borrowck/borrowck-multiple-captures.rs b/src/test/ui/borrowck/borrowck-multiple-captures.rs index 042b914ce41a4..ad753781cd60f 100644 --- a/src/test/ui/borrowck/borrowck-multiple-captures.rs +++ b/src/test/ui/borrowck/borrowck-multiple-captures.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] use std::thread; diff --git a/src/test/ui/borrowck/borrowck-multiple-captures.stderr b/src/test/ui/borrowck/borrowck-multiple-captures.stderr index 3163ca6345288..3cdd094260833 100644 --- a/src/test/ui/borrowck/borrowck-multiple-captures.stderr +++ b/src/test/ui/borrowck/borrowck-multiple-captures.stderr @@ -1,5 +1,5 @@ error[E0504]: cannot move `x1` into closure because it is borrowed - --> $DIR/borrowck-multiple-captures.rs:23:14 + --> $DIR/borrowck-multiple-captures.rs:13:14 | LL | let p1 = &x1; | -- borrow of `x1` occurs here @@ -8,7 +8,7 @@ LL | drop(x1); //~ ERROR cannot move `x1` into closure because it is bor | ^^ move into closure occurs here error[E0504]: cannot move `x2` into closure because it is borrowed - --> $DIR/borrowck-multiple-captures.rs:24:14 + --> $DIR/borrowck-multiple-captures.rs:14:14 | LL | let p2 = &x2; | -- borrow of `x2` occurs here @@ -17,7 +17,7 @@ LL | drop(x2); //~ ERROR cannot move `x2` into closure because it is bor | ^^ move into closure occurs here error[E0382]: capture of moved value: `x1` - --> $DIR/borrowck-multiple-captures.rs:36:14 + --> $DIR/borrowck-multiple-captures.rs:26:14 | LL | drop(x1); | -- value moved here @@ -28,7 +28,7 @@ LL | drop(x1); //~ ERROR capture of moved value: `x1` = note: move occurs because `x1` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0382]: capture of moved value: `x2` - --> $DIR/borrowck-multiple-captures.rs:37:14 + --> $DIR/borrowck-multiple-captures.rs:27:14 | LL | drop(x2); | -- value moved here @@ -39,7 +39,7 @@ LL | drop(x2); //~ ERROR capture of moved value: `x2` = note: move occurs because `x2` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0504]: cannot move `x` into closure because it is borrowed - --> $DIR/borrowck-multiple-captures.rs:45:14 + --> $DIR/borrowck-multiple-captures.rs:35:14 | LL | let p = &x; | - borrow of `x` occurs here @@ -48,7 +48,7 @@ LL | drop(x); //~ ERROR cannot move `x` into closure because it is borro | ^ move into closure occurs here error[E0382]: use of moved value: `x` - --> $DIR/borrowck-multiple-captures.rs:46:14 + --> $DIR/borrowck-multiple-captures.rs:36:14 | LL | drop(x); //~ ERROR cannot move `x` into closure because it is borrowed | - value moved here @@ -58,7 +58,7 @@ LL | drop(x); //~ ERROR use of moved value: `x` = note: move occurs because `x` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0382]: capture of moved value: `x` - --> $DIR/borrowck-multiple-captures.rs:55:14 + --> $DIR/borrowck-multiple-captures.rs:45:14 | LL | drop(x); | - value moved here @@ -69,7 +69,7 @@ LL | drop(x); //~ ERROR capture of moved value: `x` = note: move occurs because `x` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0382]: use of moved value: `x` - --> $DIR/borrowck-multiple-captures.rs:56:14 + --> $DIR/borrowck-multiple-captures.rs:46:14 | LL | drop(x); //~ ERROR capture of moved value: `x` | - value moved here diff --git a/src/test/ui/borrowck/borrowck-mut-addr-of-imm-var.nll.stderr b/src/test/ui/borrowck/borrowck-mut-addr-of-imm-var.nll.stderr index 352ace41d9308..be69be6341172 100644 --- a/src/test/ui/borrowck/borrowck-mut-addr-of-imm-var.nll.stderr +++ b/src/test/ui/borrowck/borrowck-mut-addr-of-imm-var.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable - --> $DIR/borrowck-mut-addr-of-imm-var.rs:13:25 + --> $DIR/borrowck-mut-addr-of-imm-var.rs:3:25 | LL | let x: isize = 3; | - help: consider changing this to be mutable: `mut x` diff --git a/src/test/ui/borrowck/borrowck-mut-addr-of-imm-var.rs b/src/test/ui/borrowck/borrowck-mut-addr-of-imm-var.rs index b6626a835e454..a79a239cbe004 100644 --- a/src/test/ui/borrowck/borrowck-mut-addr-of-imm-var.rs +++ b/src/test/ui/borrowck/borrowck-mut-addr-of-imm-var.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x: isize = 3; let y: &mut isize = &mut x; //~ ERROR cannot borrow diff --git a/src/test/ui/borrowck/borrowck-mut-addr-of-imm-var.stderr b/src/test/ui/borrowck/borrowck-mut-addr-of-imm-var.stderr index 0859a4e0f5550..2525dd764f129 100644 --- a/src/test/ui/borrowck/borrowck-mut-addr-of-imm-var.stderr +++ b/src/test/ui/borrowck/borrowck-mut-addr-of-imm-var.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow immutable local variable `x` as mutable - --> $DIR/borrowck-mut-addr-of-imm-var.rs:13:30 + --> $DIR/borrowck-mut-addr-of-imm-var.rs:3:30 | LL | let x: isize = 3; | - consider changing this to `mut x` diff --git a/src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.ast.nll.stderr b/src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.ast.nll.stderr index b3c86a56091d2..0a6bff8a4dbcd 100644 --- a/src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/borrowck-mut-borrow-linear-errors.rs:23:30 + --> $DIR/borrowck-mut-borrow-linear-errors.rs:13:30 | LL | 1 => { addr.push(&mut x); } //[ast]~ ERROR [E0499] | ---- ^^^^^^ second mutable borrow occurs here @@ -10,7 +10,7 @@ LL | _ => { addr.push(&mut x); } //[ast]~ ERROR [E0499] | ------ first mutable borrow occurs here error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/borrowck-mut-borrow-linear-errors.rs:25:30 + --> $DIR/borrowck-mut-borrow-linear-errors.rs:15:30 | LL | 1 => { addr.push(&mut x); } //[ast]~ ERROR [E0499] | ---- borrow used here in later iteration of loop @@ -22,7 +22,7 @@ LL | _ => { addr.push(&mut x); } //[ast]~ ERROR [E0499] | ------ first mutable borrow occurs here error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/borrowck-mut-borrow-linear-errors.rs:27:30 + --> $DIR/borrowck-mut-borrow-linear-errors.rs:17:30 | LL | _ => { addr.push(&mut x); } //[ast]~ ERROR [E0499] | ^^^^^^ mutable borrow starts here in previous iteration of loop diff --git a/src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.ast.stderr b/src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.ast.stderr index 7a43cf1542276..dafb60c959afd 100644 --- a/src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.ast.stderr +++ b/src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.ast.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/borrowck-mut-borrow-linear-errors.rs:23:35 + --> $DIR/borrowck-mut-borrow-linear-errors.rs:13:35 | LL | 1 => { addr.push(&mut x); } //[ast]~ ERROR [E0499] | ^ mutable borrow starts here in previous iteration of loop @@ -8,7 +8,7 @@ LL | } | - mutable borrow ends here error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/borrowck-mut-borrow-linear-errors.rs:25:35 + --> $DIR/borrowck-mut-borrow-linear-errors.rs:15:35 | LL | 1 => { addr.push(&mut x); } //[ast]~ ERROR [E0499] | - first mutable borrow occurs here @@ -20,7 +20,7 @@ LL | } | - first borrow ends here error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/borrowck-mut-borrow-linear-errors.rs:27:35 + --> $DIR/borrowck-mut-borrow-linear-errors.rs:17:35 | LL | 1 => { addr.push(&mut x); } //[ast]~ ERROR [E0499] | - first mutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.mir.stderr b/src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.mir.stderr index b3c86a56091d2..0a6bff8a4dbcd 100644 --- a/src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.mir.stderr +++ b/src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.mir.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/borrowck-mut-borrow-linear-errors.rs:23:30 + --> $DIR/borrowck-mut-borrow-linear-errors.rs:13:30 | LL | 1 => { addr.push(&mut x); } //[ast]~ ERROR [E0499] | ---- ^^^^^^ second mutable borrow occurs here @@ -10,7 +10,7 @@ LL | _ => { addr.push(&mut x); } //[ast]~ ERROR [E0499] | ------ first mutable borrow occurs here error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/borrowck-mut-borrow-linear-errors.rs:25:30 + --> $DIR/borrowck-mut-borrow-linear-errors.rs:15:30 | LL | 1 => { addr.push(&mut x); } //[ast]~ ERROR [E0499] | ---- borrow used here in later iteration of loop @@ -22,7 +22,7 @@ LL | _ => { addr.push(&mut x); } //[ast]~ ERROR [E0499] | ------ first mutable borrow occurs here error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/borrowck-mut-borrow-linear-errors.rs:27:30 + --> $DIR/borrowck-mut-borrow-linear-errors.rs:17:30 | LL | _ => { addr.push(&mut x); } //[ast]~ ERROR [E0499] | ^^^^^^ mutable borrow starts here in previous iteration of loop diff --git a/src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.rs b/src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.rs index 7b0a71815a5f0..bb0b26ecf0663 100644 --- a/src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.rs +++ b/src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test to ensure we only report an error for the first issued loan that // conflicts with a new loan, as opposed to every issued loan. This keeps us // down to O(n) errors (for n problem lines), instead of O(n^2) errors. diff --git a/src/test/ui/borrowck/borrowck-mut-borrow-of-mut-base-ptr.nll.stderr b/src/test/ui/borrowck/borrowck-mut-borrow-of-mut-base-ptr.nll.stderr index 0684e787bae7f..e2a8646148416 100644 --- a/src/test/ui/borrowck/borrowck-mut-borrow-of-mut-base-ptr.nll.stderr +++ b/src/test/ui/borrowck/borrowck-mut-borrow-of-mut-base-ptr.nll.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `t0` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-mut-borrow-of-mut-base-ptr.rs:21:18 + --> $DIR/borrowck-mut-borrow-of-mut-base-ptr.rs:11:18 | LL | let p: &isize = &*t0; // Freezes `*t0` | ---- immutable borrow occurs here @@ -10,7 +10,7 @@ LL | p.use_ref(); | - borrow later used here error[E0499]: cannot borrow `t0` as mutable more than once at a time - --> $DIR/borrowck-mut-borrow-of-mut-base-ptr.rs:29:18 + --> $DIR/borrowck-mut-borrow-of-mut-base-ptr.rs:19:18 | LL | let p: &mut isize = &mut *t0; // Claims `*t0` | -------- first mutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-mut-borrow-of-mut-base-ptr.rs b/src/test/ui/borrowck/borrowck-mut-borrow-of-mut-base-ptr.rs index 45768ef51146e..32caa46647593 100644 --- a/src/test/ui/borrowck/borrowck-mut-borrow-of-mut-base-ptr.rs +++ b/src/test/ui/borrowck/borrowck-mut-borrow-of-mut-base-ptr.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that attempt to mutably borrow `&mut` pointer while pointee is // borrowed yields an error. // diff --git a/src/test/ui/borrowck/borrowck-mut-borrow-of-mut-base-ptr.stderr b/src/test/ui/borrowck/borrowck-mut-borrow-of-mut-base-ptr.stderr index d5b8831962978..154a283b43b5b 100644 --- a/src/test/ui/borrowck/borrowck-mut-borrow-of-mut-base-ptr.stderr +++ b/src/test/ui/borrowck/borrowck-mut-borrow-of-mut-base-ptr.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `t0` as mutable because `*t0` is also borrowed as immutable - --> $DIR/borrowck-mut-borrow-of-mut-base-ptr.rs:21:23 + --> $DIR/borrowck-mut-borrow-of-mut-base-ptr.rs:11:23 | LL | let p: &isize = &*t0; // Freezes `*t0` | --- immutable borrow occurs here @@ -10,7 +10,7 @@ LL | } | - immutable borrow ends here error[E0499]: cannot borrow `t0` as mutable more than once at a time - --> $DIR/borrowck-mut-borrow-of-mut-base-ptr.rs:29:23 + --> $DIR/borrowck-mut-borrow-of-mut-base-ptr.rs:19:23 | LL | let p: &mut isize = &mut *t0; // Claims `*t0` | --- first mutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-mut-slice-of-imm-vec.nll.stderr b/src/test/ui/borrowck/borrowck-mut-slice-of-imm-vec.nll.stderr index 7c151da3c368b..5a9ec98a2db06 100644 --- a/src/test/ui/borrowck/borrowck-mut-slice-of-imm-vec.nll.stderr +++ b/src/test/ui/borrowck/borrowck-mut-slice-of-imm-vec.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `v` as mutable, as it is not declared as mutable - --> $DIR/borrowck-mut-slice-of-imm-vec.rs:17:11 + --> $DIR/borrowck-mut-slice-of-imm-vec.rs:7:11 | LL | let v = vec![1, 2, 3]; | - help: consider changing this to be mutable: `mut v` diff --git a/src/test/ui/borrowck/borrowck-mut-slice-of-imm-vec.rs b/src/test/ui/borrowck/borrowck-mut-slice-of-imm-vec.rs index 4e0304e20c00d..8e23571cedcdd 100644 --- a/src/test/ui/borrowck/borrowck-mut-slice-of-imm-vec.rs +++ b/src/test/ui/borrowck/borrowck-mut-slice-of-imm-vec.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn write(v: &mut [isize]) { v[0] += 1; } diff --git a/src/test/ui/borrowck/borrowck-mut-slice-of-imm-vec.stderr b/src/test/ui/borrowck/borrowck-mut-slice-of-imm-vec.stderr index e2fd9d771f1aa..c8c22e5726e5b 100644 --- a/src/test/ui/borrowck/borrowck-mut-slice-of-imm-vec.stderr +++ b/src/test/ui/borrowck/borrowck-mut-slice-of-imm-vec.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow immutable local variable `v` as mutable - --> $DIR/borrowck-mut-slice-of-imm-vec.rs:17:16 + --> $DIR/borrowck-mut-slice-of-imm-vec.rs:7:16 | LL | let v = vec![1, 2, 3]; | - consider changing this to `mut v` diff --git a/src/test/ui/borrowck/borrowck-mutate-in-guard.rs b/src/test/ui/borrowck/borrowck-mutate-in-guard.rs index e35edca639e45..2bda3deee1596 100644 --- a/src/test/ui/borrowck/borrowck-mutate-in-guard.rs +++ b/src/test/ui/borrowck/borrowck-mutate-in-guard.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Enum<'a> { A(&'a isize), B(bool), diff --git a/src/test/ui/borrowck/borrowck-mutate-in-guard.stderr b/src/test/ui/borrowck/borrowck-mutate-in-guard.stderr index 7a111a1bbccc4..9e40856deb031 100644 --- a/src/test/ui/borrowck/borrowck-mutate-in-guard.stderr +++ b/src/test/ui/borrowck/borrowck-mutate-in-guard.stderr @@ -1,17 +1,17 @@ error[E0302]: cannot assign in a pattern guard - --> $DIR/borrowck-mutate-in-guard.rs:20:25 + --> $DIR/borrowck-mutate-in-guard.rs:10:25 | LL | Enum::A(_) if { x = Enum::B(false); false } => 1, | ^^^^^^^^^^^^^^^^^^ assignment in pattern guard error[E0301]: cannot mutably borrow in a pattern guard - --> $DIR/borrowck-mutate-in-guard.rs:22:38 + --> $DIR/borrowck-mutate-in-guard.rs:12:38 | LL | Enum::A(_) if { let y = &mut x; *y = Enum::B(false); false } => 1, | ^ borrowed mutably in pattern guard error[E0302]: cannot assign in a pattern guard - --> $DIR/borrowck-mutate-in-guard.rs:22:41 + --> $DIR/borrowck-mutate-in-guard.rs:12:41 | LL | Enum::A(_) if { let y = &mut x; *y = Enum::B(false); false } => 1, | ^^^^^^^^^^^^^^^^^^^ assignment in pattern guard diff --git a/src/test/ui/borrowck/borrowck-no-cycle-in-exchange-heap.nll.stderr b/src/test/ui/borrowck/borrowck-no-cycle-in-exchange-heap.nll.stderr index 9bb1e825f2598..50fba2a762d6d 100644 --- a/src/test/ui/borrowck/borrowck-no-cycle-in-exchange-heap.nll.stderr +++ b/src/test/ui/borrowck/borrowck-no-cycle-in-exchange-heap.nll.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `x` because it is borrowed - --> $DIR/borrowck-no-cycle-in-exchange-heap.rs:26:15 + --> $DIR/borrowck-no-cycle-in-exchange-heap.rs:16:15 | LL | cycle::node(ref mut y) => { | --------- borrow of `x.0` occurs here diff --git a/src/test/ui/borrowck/borrowck-no-cycle-in-exchange-heap.rs b/src/test/ui/borrowck/borrowck-no-cycle-in-exchange-heap.rs index 8cb7423f3cb5e..b9bf8221b28c1 100644 --- a/src/test/ui/borrowck/borrowck-no-cycle-in-exchange-heap.rs +++ b/src/test/ui/borrowck/borrowck-no-cycle-in-exchange-heap.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] struct node_ { diff --git a/src/test/ui/borrowck/borrowck-no-cycle-in-exchange-heap.stderr b/src/test/ui/borrowck/borrowck-no-cycle-in-exchange-heap.stderr index 693f25e243cb1..d0c811fe5465d 100644 --- a/src/test/ui/borrowck/borrowck-no-cycle-in-exchange-heap.stderr +++ b/src/test/ui/borrowck/borrowck-no-cycle-in-exchange-heap.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `x` because it is borrowed - --> $DIR/borrowck-no-cycle-in-exchange-heap.rs:26:15 + --> $DIR/borrowck-no-cycle-in-exchange-heap.rs:16:15 | LL | cycle::node(ref mut y) => { | --------- borrow of `x.0` occurs here diff --git a/src/test/ui/borrowck/borrowck-object-lifetime.nll.stderr b/src/test/ui/borrowck/borrowck-object-lifetime.nll.stderr index e4e2dfe86bd83..724d23f397254 100644 --- a/src/test/ui/borrowck/borrowck-object-lifetime.nll.stderr +++ b/src/test/ui/borrowck/borrowck-object-lifetime.nll.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `*x` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-object-lifetime.rs:30:13 + --> $DIR/borrowck-object-lifetime.rs:20:13 | LL | let y = x.borrowed(); | - immutable borrow occurs here @@ -9,7 +9,7 @@ LL | y.use_ref(); | - borrow later used here error[E0502]: cannot borrow `x` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-object-lifetime.rs:36:13 + --> $DIR/borrowck-object-lifetime.rs:26:13 | LL | let y = x.borrowed(); | - immutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-object-lifetime.rs b/src/test/ui/borrowck/borrowck-object-lifetime.rs index cb7486aefa28b..495516cf97634 100644 --- a/src/test/ui/borrowck/borrowck-object-lifetime.rs +++ b/src/test/ui/borrowck/borrowck-object-lifetime.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that borrows that occur due to calls to object methods // properly "claim" the object path. diff --git a/src/test/ui/borrowck/borrowck-object-lifetime.stderr b/src/test/ui/borrowck/borrowck-object-lifetime.stderr index 5e9045d3e3868..b22d05b8a2a82 100644 --- a/src/test/ui/borrowck/borrowck-object-lifetime.stderr +++ b/src/test/ui/borrowck/borrowck-object-lifetime.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `*x` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-object-lifetime.rs:30:13 + --> $DIR/borrowck-object-lifetime.rs:20:13 | LL | let y = x.borrowed(); | - immutable borrow occurs here @@ -10,7 +10,7 @@ LL | } | - immutable borrow ends here error[E0502]: cannot borrow `x` as mutable because `*x` is also borrowed as immutable - --> $DIR/borrowck-object-lifetime.rs:36:18 + --> $DIR/borrowck-object-lifetime.rs:26:18 | LL | let y = x.borrowed(); | - immutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-or-init.nll.stderr b/src/test/ui/borrowck/borrowck-or-init.nll.stderr index dd8bf87973516..dcd2c18dcaa23 100644 --- a/src/test/ui/borrowck/borrowck-or-init.nll.stderr +++ b/src/test/ui/borrowck/borrowck-or-init.nll.stderr @@ -1,5 +1,5 @@ error[E0381]: borrow of possibly uninitialized variable: `i` - --> $DIR/borrowck-or-init.rs:15:20 + --> $DIR/borrowck-or-init.rs:5:20 | LL | println!("{}", i); //~ ERROR use of possibly uninitialized variable: `i` | ^ use of possibly uninitialized `i` diff --git a/src/test/ui/borrowck/borrowck-or-init.rs b/src/test/ui/borrowck/borrowck-or-init.rs index 27871a6ab16cd..5b1487831a689 100644 --- a/src/test/ui/borrowck/borrowck-or-init.rs +++ b/src/test/ui/borrowck/borrowck-or-init.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let i: isize; diff --git a/src/test/ui/borrowck/borrowck-or-init.stderr b/src/test/ui/borrowck/borrowck-or-init.stderr index bc1c3a51667fb..60024c08303ac 100644 --- a/src/test/ui/borrowck/borrowck-or-init.stderr +++ b/src/test/ui/borrowck/borrowck-or-init.stderr @@ -1,5 +1,5 @@ error[E0381]: use of possibly uninitialized variable: `i` - --> $DIR/borrowck-or-init.rs:15:20 + --> $DIR/borrowck-or-init.rs:5:20 | LL | println!("{}", i); //~ ERROR use of possibly uninitialized variable: `i` | ^ use of possibly uninitialized `i` diff --git a/src/test/ui/borrowck/borrowck-overloaded-call.nll.stderr b/src/test/ui/borrowck/borrowck-overloaded-call.nll.stderr index dc8d731dede74..a032e9e695c1d 100644 --- a/src/test/ui/borrowck/borrowck-overloaded-call.nll.stderr +++ b/src/test/ui/borrowck/borrowck-overloaded-call.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `s` as mutable, as it is not declared as mutable - --> $DIR/borrowck-overloaded-call.rs:77:5 + --> $DIR/borrowck-overloaded-call.rs:67:5 | LL | let s = SFnMut { | - help: consider changing this to be mutable: `mut s` @@ -8,7 +8,7 @@ LL | s(3); //~ ERROR cannot borrow immutable local variable `s` as mutable | ^ cannot borrow as mutable error[E0382]: use of moved value: `s` - --> $DIR/borrowck-overloaded-call.rs:85:5 + --> $DIR/borrowck-overloaded-call.rs:75:5 | LL | s(" world".to_string()); | - value moved here diff --git a/src/test/ui/borrowck/borrowck-overloaded-call.rs b/src/test/ui/borrowck/borrowck-overloaded-call.rs index 41f3e472cd125..86fd5a1725df1 100644 --- a/src/test/ui/borrowck/borrowck-overloaded-call.rs +++ b/src/test/ui/borrowck/borrowck-overloaded-call.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(fn_traits, unboxed_closures)] use std::ops::{Fn, FnMut, FnOnce}; diff --git a/src/test/ui/borrowck/borrowck-overloaded-call.stderr b/src/test/ui/borrowck/borrowck-overloaded-call.stderr index 213d78339e2a4..1345fd8897bfc 100644 --- a/src/test/ui/borrowck/borrowck-overloaded-call.stderr +++ b/src/test/ui/borrowck/borrowck-overloaded-call.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `s` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-overloaded-call.rs:69:5 + --> $DIR/borrowck-overloaded-call.rs:59:5 | LL | let sp = &mut s; | - mutable borrow occurs here @@ -9,7 +9,7 @@ LL | } | - mutable borrow ends here error[E0596]: cannot borrow immutable local variable `s` as mutable - --> $DIR/borrowck-overloaded-call.rs:77:5 + --> $DIR/borrowck-overloaded-call.rs:67:5 | LL | let s = SFnMut { | - consider changing this to `mut s` @@ -18,7 +18,7 @@ LL | s(3); //~ ERROR cannot borrow immutable local variable `s` as mutable | ^ cannot borrow mutably error[E0382]: use of moved value: `s` - --> $DIR/borrowck-overloaded-call.rs:85:5 + --> $DIR/borrowck-overloaded-call.rs:75:5 | LL | s(" world".to_string()); | - value moved here diff --git a/src/test/ui/borrowck/borrowck-overloaded-index-and-overloaded-deref.ast.nll.stderr b/src/test/ui/borrowck/borrowck-overloaded-index-and-overloaded-deref.ast.nll.stderr index 874e6d74b643c..f33fb55f9cdfc 100644 --- a/src/test/ui/borrowck/borrowck-overloaded-index-and-overloaded-deref.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-overloaded-index-and-overloaded-deref.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `v` because it is borrowed - --> $DIR/borrowck-overloaded-index-and-overloaded-deref.rs:44:5 + --> $DIR/borrowck-overloaded-index-and-overloaded-deref.rs:34:5 | LL | let i = &v[0].f; | - borrow of `v` occurs here diff --git a/src/test/ui/borrowck/borrowck-overloaded-index-and-overloaded-deref.ast.stderr b/src/test/ui/borrowck/borrowck-overloaded-index-and-overloaded-deref.ast.stderr index 8343b60dfbfa8..59841ee2dbedd 100644 --- a/src/test/ui/borrowck/borrowck-overloaded-index-and-overloaded-deref.ast.stderr +++ b/src/test/ui/borrowck/borrowck-overloaded-index-and-overloaded-deref.ast.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `v` because it is borrowed - --> $DIR/borrowck-overloaded-index-and-overloaded-deref.rs:44:5 + --> $DIR/borrowck-overloaded-index-and-overloaded-deref.rs:34:5 | LL | let i = &v[0].f; | - borrow of `v` occurs here diff --git a/src/test/ui/borrowck/borrowck-overloaded-index-and-overloaded-deref.mir.stderr b/src/test/ui/borrowck/borrowck-overloaded-index-and-overloaded-deref.mir.stderr index 874e6d74b643c..f33fb55f9cdfc 100644 --- a/src/test/ui/borrowck/borrowck-overloaded-index-and-overloaded-deref.mir.stderr +++ b/src/test/ui/borrowck/borrowck-overloaded-index-and-overloaded-deref.mir.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `v` because it is borrowed - --> $DIR/borrowck-overloaded-index-and-overloaded-deref.rs:44:5 + --> $DIR/borrowck-overloaded-index-and-overloaded-deref.rs:34:5 | LL | let i = &v[0].f; | - borrow of `v` occurs here diff --git a/src/test/ui/borrowck/borrowck-overloaded-index-and-overloaded-deref.rs b/src/test/ui/borrowck/borrowck-overloaded-index-and-overloaded-deref.rs index 931d053ae7b9f..348d99f4f9898 100644 --- a/src/test/ui/borrowck/borrowck-overloaded-index-and-overloaded-deref.rs +++ b/src/test/ui/borrowck/borrowck-overloaded-index-and-overloaded-deref.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we properly record borrows when we are doing an // overloaded, autoderef of a value obtained via an overloaded index // operator. The accounting of the all the implicit things going on diff --git a/src/test/ui/borrowck/borrowck-overloaded-index-autoderef.nll.stderr b/src/test/ui/borrowck/borrowck-overloaded-index-autoderef.nll.stderr index 994492d8575c9..da0d242d37cfe 100644 --- a/src/test/ui/borrowck/borrowck-overloaded-index-autoderef.nll.stderr +++ b/src/test/ui/borrowck/borrowck-overloaded-index-autoderef.nll.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `*f` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-overloaded-index-autoderef.rs:47:14 + --> $DIR/borrowck-overloaded-index-autoderef.rs:37:14 | LL | let p = &mut f[&s]; | - mutable borrow occurs here @@ -9,7 +9,7 @@ LL | p.use_mut(); | - borrow later used here error[E0499]: cannot borrow `*f` as mutable more than once at a time - --> $DIR/borrowck-overloaded-index-autoderef.rs:53:18 + --> $DIR/borrowck-overloaded-index-autoderef.rs:43:18 | LL | let p = &mut f[&s]; | - first mutable borrow occurs here @@ -19,7 +19,7 @@ LL | p.use_mut(); | - borrow later used here error[E0499]: cannot borrow `f.foo` as mutable more than once at a time - --> $DIR/borrowck-overloaded-index-autoderef.rs:63:18 + --> $DIR/borrowck-overloaded-index-autoderef.rs:53:18 | LL | let p = &mut f.foo[&s]; | ----- first mutable borrow occurs here @@ -29,7 +29,7 @@ LL | p.use_mut(); | - borrow later used here error[E0502]: cannot borrow `f.foo` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-overloaded-index-autoderef.rs:75:18 + --> $DIR/borrowck-overloaded-index-autoderef.rs:65:18 | LL | let p = &f.foo[&s]; | ----- immutable borrow occurs here @@ -39,7 +39,7 @@ LL | p.use_ref(); | - borrow later used here error[E0506]: cannot assign to `f.foo` because it is borrowed - --> $DIR/borrowck-overloaded-index-autoderef.rs:81:5 + --> $DIR/borrowck-overloaded-index-autoderef.rs:71:5 | LL | let p = &f.foo[&s]; | ----- borrow of `f.foo` occurs here @@ -49,7 +49,7 @@ LL | p.use_ref(); | - borrow later used here error[E0506]: cannot assign to `*f` because it is borrowed - --> $DIR/borrowck-overloaded-index-autoderef.rs:87:5 + --> $DIR/borrowck-overloaded-index-autoderef.rs:77:5 | LL | let p = &f.foo[&s]; | ----- borrow of `*f` occurs here @@ -59,7 +59,7 @@ LL | p.use_ref(); | - borrow later used here error[E0506]: cannot assign to `f.foo` because it is borrowed - --> $DIR/borrowck-overloaded-index-autoderef.rs:93:5 + --> $DIR/borrowck-overloaded-index-autoderef.rs:83:5 | LL | let p = &mut f.foo[&s]; | ----- borrow of `f.foo` occurs here @@ -69,7 +69,7 @@ LL | p.use_mut(); | - borrow later used here error[E0506]: cannot assign to `*f` because it is borrowed - --> $DIR/borrowck-overloaded-index-autoderef.rs:99:5 + --> $DIR/borrowck-overloaded-index-autoderef.rs:89:5 | LL | let p = &mut f.foo[&s]; | ----- borrow of `*f` occurs here diff --git a/src/test/ui/borrowck/borrowck-overloaded-index-autoderef.rs b/src/test/ui/borrowck/borrowck-overloaded-index-autoderef.rs index 5ab3d75f18178..3d3a3afd341da 100644 --- a/src/test/ui/borrowck/borrowck-overloaded-index-autoderef.rs +++ b/src/test/ui/borrowck/borrowck-overloaded-index-autoderef.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we still see borrowck errors of various kinds when using // indexing and autoderef in combination. diff --git a/src/test/ui/borrowck/borrowck-overloaded-index-autoderef.stderr b/src/test/ui/borrowck/borrowck-overloaded-index-autoderef.stderr index 7a17a5570e4be..9bc83f84339c7 100644 --- a/src/test/ui/borrowck/borrowck-overloaded-index-autoderef.stderr +++ b/src/test/ui/borrowck/borrowck-overloaded-index-autoderef.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `*f` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-overloaded-index-autoderef.rs:47:14 + --> $DIR/borrowck-overloaded-index-autoderef.rs:37:14 | LL | let p = &mut f[&s]; | - mutable borrow occurs here @@ -10,7 +10,7 @@ LL | } | - mutable borrow ends here error[E0499]: cannot borrow `*f` as mutable more than once at a time - --> $DIR/borrowck-overloaded-index-autoderef.rs:53:18 + --> $DIR/borrowck-overloaded-index-autoderef.rs:43:18 | LL | let p = &mut f[&s]; | - first mutable borrow occurs here @@ -21,7 +21,7 @@ LL | } | - first borrow ends here error[E0499]: cannot borrow `f.foo` as mutable more than once at a time - --> $DIR/borrowck-overloaded-index-autoderef.rs:63:18 + --> $DIR/borrowck-overloaded-index-autoderef.rs:53:18 | LL | let p = &mut f.foo[&s]; | ----- first mutable borrow occurs here @@ -32,7 +32,7 @@ LL | } | - first borrow ends here error[E0502]: cannot borrow `f.foo` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-overloaded-index-autoderef.rs:75:18 + --> $DIR/borrowck-overloaded-index-autoderef.rs:65:18 | LL | let p = &f.foo[&s]; | ----- immutable borrow occurs here @@ -43,7 +43,7 @@ LL | } | - immutable borrow ends here error[E0506]: cannot assign to `f.foo` because it is borrowed - --> $DIR/borrowck-overloaded-index-autoderef.rs:81:5 + --> $DIR/borrowck-overloaded-index-autoderef.rs:71:5 | LL | let p = &f.foo[&s]; | ----- borrow of `f.foo` occurs here @@ -51,7 +51,7 @@ LL | f.foo = g; //~ ERROR cannot assign | ^^^^^^^^^ assignment to borrowed `f.foo` occurs here error[E0506]: cannot assign to `*f` because it is borrowed - --> $DIR/borrowck-overloaded-index-autoderef.rs:87:5 + --> $DIR/borrowck-overloaded-index-autoderef.rs:77:5 | LL | let p = &f.foo[&s]; | ----- borrow of `*f` occurs here @@ -59,7 +59,7 @@ LL | *f = g; //~ ERROR cannot assign | ^^^^^^ assignment to borrowed `*f` occurs here error[E0506]: cannot assign to `f.foo` because it is borrowed - --> $DIR/borrowck-overloaded-index-autoderef.rs:93:5 + --> $DIR/borrowck-overloaded-index-autoderef.rs:83:5 | LL | let p = &mut f.foo[&s]; | ----- borrow of `f.foo` occurs here @@ -67,7 +67,7 @@ LL | f.foo = g; //~ ERROR cannot assign | ^^^^^^^^^ assignment to borrowed `f.foo` occurs here error[E0506]: cannot assign to `*f` because it is borrowed - --> $DIR/borrowck-overloaded-index-autoderef.rs:99:5 + --> $DIR/borrowck-overloaded-index-autoderef.rs:89:5 | LL | let p = &mut f.foo[&s]; | ----- borrow of `*f` occurs here diff --git a/src/test/ui/borrowck/borrowck-overloaded-index-move-from-vec.nll.stderr b/src/test/ui/borrowck/borrowck-overloaded-index-move-from-vec.nll.stderr index 92e10c258c269..dbd805f1d2652 100644 --- a/src/test/ui/borrowck/borrowck-overloaded-index-move-from-vec.nll.stderr +++ b/src/test/ui/borrowck/borrowck-overloaded-index-move-from-vec.nll.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-overloaded-index-move-from-vec.rs:30:15 + --> $DIR/borrowck-overloaded-index-move-from-vec.rs:20:15 | LL | let bad = v[0]; | ^^^^ diff --git a/src/test/ui/borrowck/borrowck-overloaded-index-move-from-vec.rs b/src/test/ui/borrowck/borrowck-overloaded-index-move-from-vec.rs index df72c2b0af72a..76dd97ea242e3 100644 --- a/src/test/ui/borrowck/borrowck-overloaded-index-move-from-vec.rs +++ b/src/test/ui/borrowck/borrowck-overloaded-index-move-from-vec.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] use std::ops::Index; diff --git a/src/test/ui/borrowck/borrowck-overloaded-index-move-from-vec.stderr b/src/test/ui/borrowck/borrowck-overloaded-index-move-from-vec.stderr index 56246cbf770a6..fe655dc8b131f 100644 --- a/src/test/ui/borrowck/borrowck-overloaded-index-move-from-vec.stderr +++ b/src/test/ui/borrowck/borrowck-overloaded-index-move-from-vec.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of indexed content - --> $DIR/borrowck-overloaded-index-move-from-vec.rs:30:15 + --> $DIR/borrowck-overloaded-index-move-from-vec.rs:20:15 | LL | let bad = v[0]; | ^^^^ diff --git a/src/test/ui/borrowck/borrowck-overloaded-index-move-index.nll.stderr b/src/test/ui/borrowck/borrowck-overloaded-index-move-index.nll.stderr index 824d8298ecbc6..f8f6c1c6ca338 100644 --- a/src/test/ui/borrowck/borrowck-overloaded-index-move-index.nll.stderr +++ b/src/test/ui/borrowck/borrowck-overloaded-index-move-index.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `s` - --> $DIR/borrowck-overloaded-index-move-index.rs:63:7 + --> $DIR/borrowck-overloaded-index-move-index.rs:53:7 | LL | println!("{}", f[s]); | - value moved here diff --git a/src/test/ui/borrowck/borrowck-overloaded-index-move-index.rs b/src/test/ui/borrowck/borrowck-overloaded-index-move-index.rs index d8615d1905338..519452a2d4412 100644 --- a/src/test/ui/borrowck/borrowck-overloaded-index-move-index.rs +++ b/src/test/ui/borrowck/borrowck-overloaded-index-move-index.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::{Index, IndexMut}; struct Foo { diff --git a/src/test/ui/borrowck/borrowck-overloaded-index-move-index.stderr b/src/test/ui/borrowck/borrowck-overloaded-index-move-index.stderr index cfa5a6e317d1b..7ea311f3e7f2f 100644 --- a/src/test/ui/borrowck/borrowck-overloaded-index-move-index.stderr +++ b/src/test/ui/borrowck/borrowck-overloaded-index-move-index.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `s` because it is borrowed - --> $DIR/borrowck-overloaded-index-move-index.rs:60:22 + --> $DIR/borrowck-overloaded-index-move-index.rs:50:22 | LL | let rs = &mut s; | - borrow of `s` occurs here @@ -8,7 +8,7 @@ LL | println!("{}", f[s]); | ^ move out of `s` occurs here error[E0505]: cannot move out of `s` because it is borrowed - --> $DIR/borrowck-overloaded-index-move-index.rs:63:7 + --> $DIR/borrowck-overloaded-index-move-index.rs:53:7 | LL | let rs = &mut s; | - borrow of `s` occurs here @@ -17,7 +17,7 @@ LL | f[s] = 10; | ^ move out of `s` occurs here error[E0382]: use of moved value: `s` - --> $DIR/borrowck-overloaded-index-move-index.rs:63:7 + --> $DIR/borrowck-overloaded-index-move-index.rs:53:7 | LL | println!("{}", f[s]); | - value moved here diff --git a/src/test/ui/borrowck/borrowck-overloaded-index-ref-index.ast.nll.stderr b/src/test/ui/borrowck/borrowck-overloaded-index-ref-index.ast.nll.stderr index 3a2bfb18cb9e6..7e8065b254c09 100644 --- a/src/test/ui/borrowck/borrowck-overloaded-index-ref-index.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-overloaded-index-ref-index.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `s` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-overloaded-index-ref-index.rs:62:22 + --> $DIR/borrowck-overloaded-index-ref-index.rs:52:22 | LL | let rs = &mut s; | ------ mutable borrow occurs here @@ -10,7 +10,7 @@ LL | drop(rs); | -- borrow later used here error[E0502]: cannot borrow `s` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-overloaded-index-ref-index.rs:65:7 + --> $DIR/borrowck-overloaded-index-ref-index.rs:55:7 | LL | let rs = &mut s; | ------ mutable borrow occurs here @@ -22,7 +22,7 @@ LL | drop(rs); | -- borrow later used here error[E0594]: cannot assign to data in a `&` reference - --> $DIR/borrowck-overloaded-index-ref-index.rs:71:5 + --> $DIR/borrowck-overloaded-index-ref-index.rs:61:5 | LL | s[2] = 20; | ^^^^^^^^^ cannot assign diff --git a/src/test/ui/borrowck/borrowck-overloaded-index-ref-index.ast.stderr b/src/test/ui/borrowck/borrowck-overloaded-index-ref-index.ast.stderr index 8675c5b7ac6a8..f97f0464fc009 100644 --- a/src/test/ui/borrowck/borrowck-overloaded-index-ref-index.ast.stderr +++ b/src/test/ui/borrowck/borrowck-overloaded-index-ref-index.ast.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to immutable indexed content - --> $DIR/borrowck-overloaded-index-ref-index.rs:71:5 + --> $DIR/borrowck-overloaded-index-ref-index.rs:61:5 | LL | s[2] = 20; | ^^^^^^^^^ cannot borrow as mutable @@ -7,7 +7,7 @@ LL | s[2] = 20; = help: trait `IndexMut` is required to modify indexed content, but it is not implemented for `Bar` error[E0502]: cannot borrow `s` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-overloaded-index-ref-index.rs:62:23 + --> $DIR/borrowck-overloaded-index-ref-index.rs:52:23 | LL | let rs = &mut s; | - mutable borrow occurs here @@ -18,7 +18,7 @@ LL | } | - mutable borrow ends here error[E0502]: cannot borrow `s` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-overloaded-index-ref-index.rs:65:8 + --> $DIR/borrowck-overloaded-index-ref-index.rs:55:8 | LL | let rs = &mut s; | - mutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-overloaded-index-ref-index.mir.stderr b/src/test/ui/borrowck/borrowck-overloaded-index-ref-index.mir.stderr index 3a2bfb18cb9e6..7e8065b254c09 100644 --- a/src/test/ui/borrowck/borrowck-overloaded-index-ref-index.mir.stderr +++ b/src/test/ui/borrowck/borrowck-overloaded-index-ref-index.mir.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `s` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-overloaded-index-ref-index.rs:62:22 + --> $DIR/borrowck-overloaded-index-ref-index.rs:52:22 | LL | let rs = &mut s; | ------ mutable borrow occurs here @@ -10,7 +10,7 @@ LL | drop(rs); | -- borrow later used here error[E0502]: cannot borrow `s` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-overloaded-index-ref-index.rs:65:7 + --> $DIR/borrowck-overloaded-index-ref-index.rs:55:7 | LL | let rs = &mut s; | ------ mutable borrow occurs here @@ -22,7 +22,7 @@ LL | drop(rs); | -- borrow later used here error[E0594]: cannot assign to data in a `&` reference - --> $DIR/borrowck-overloaded-index-ref-index.rs:71:5 + --> $DIR/borrowck-overloaded-index-ref-index.rs:61:5 | LL | s[2] = 20; | ^^^^^^^^^ cannot assign diff --git a/src/test/ui/borrowck/borrowck-overloaded-index-ref-index.rs b/src/test/ui/borrowck/borrowck-overloaded-index-ref-index.rs index f4f40e0407fde..53cab520e4361 100644 --- a/src/test/ui/borrowck/borrowck-overloaded-index-ref-index.rs +++ b/src/test/ui/borrowck/borrowck-overloaded-index-ref-index.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/borrowck/borrowck-partial-reinit-1.nll.stderr b/src/test/ui/borrowck/borrowck-partial-reinit-1.nll.stderr index 0444bf97c65ce..09a85bd7c13a9 100644 --- a/src/test/ui/borrowck/borrowck-partial-reinit-1.nll.stderr +++ b/src/test/ui/borrowck/borrowck-partial-reinit-1.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: assign of moved value: `t` - --> $DIR/borrowck-partial-reinit-1.rs:37:5 + --> $DIR/borrowck-partial-reinit-1.rs:27:5 | LL | drop(t); | - value moved here @@ -9,7 +9,7 @@ LL | t.b = Some(u); = note: move occurs because `t` has type `Test2`, which does not implement the `Copy` trait error[E0382]: assign of moved value: `t` - --> $DIR/borrowck-partial-reinit-1.rs:43:5 + --> $DIR/borrowck-partial-reinit-1.rs:33:5 | LL | drop(t); | - value moved here diff --git a/src/test/ui/borrowck/borrowck-partial-reinit-1.rs b/src/test/ui/borrowck/borrowck-partial-reinit-1.rs index 1ee040a0705ae..f763759152cb3 100644 --- a/src/test/ui/borrowck/borrowck-partial-reinit-1.rs +++ b/src/test/ui/borrowck/borrowck-partial-reinit-1.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Test; struct Test2 { diff --git a/src/test/ui/borrowck/borrowck-partial-reinit-1.stderr b/src/test/ui/borrowck/borrowck-partial-reinit-1.stderr index c03921cd3dd9a..23f5035369d62 100644 --- a/src/test/ui/borrowck/borrowck-partial-reinit-1.stderr +++ b/src/test/ui/borrowck/borrowck-partial-reinit-1.stderr @@ -1,11 +1,11 @@ error[E0383]: partial reinitialization of uninitialized structure `t` - --> $DIR/borrowck-partial-reinit-1.rs:37:5 + --> $DIR/borrowck-partial-reinit-1.rs:27:5 | LL | t.b = Some(u); | ^^^^^^^^^^^^^ error[E0383]: partial reinitialization of uninitialized structure `t` - --> $DIR/borrowck-partial-reinit-1.rs:43:5 + --> $DIR/borrowck-partial-reinit-1.rs:33:5 | LL | t.0 = Some(u); | ^^^^^^^^^^^^^ diff --git a/src/test/ui/borrowck/borrowck-partial-reinit-2.nll.stderr b/src/test/ui/borrowck/borrowck-partial-reinit-2.nll.stderr index 14272fa3ed5d5..03608a1b99d24 100644 --- a/src/test/ui/borrowck/borrowck-partial-reinit-2.nll.stderr +++ b/src/test/ui/borrowck/borrowck-partial-reinit-2.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: assign of moved value: `t` - --> $DIR/borrowck-partial-reinit-2.rs:25:5 + --> $DIR/borrowck-partial-reinit-2.rs:15:5 | LL | let mut u = Test { a: 2, b: Some(Box::new(t))}; | - value moved here diff --git a/src/test/ui/borrowck/borrowck-partial-reinit-2.rs b/src/test/ui/borrowck/borrowck-partial-reinit-2.rs index c9cdeff9c7a17..986c20e361c30 100644 --- a/src/test/ui/borrowck/borrowck-partial-reinit-2.rs +++ b/src/test/ui/borrowck/borrowck-partial-reinit-2.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Test { a: isize, b: Option>, diff --git a/src/test/ui/borrowck/borrowck-partial-reinit-2.stderr b/src/test/ui/borrowck/borrowck-partial-reinit-2.stderr index 4ed87b9529250..891f608850808 100644 --- a/src/test/ui/borrowck/borrowck-partial-reinit-2.stderr +++ b/src/test/ui/borrowck/borrowck-partial-reinit-2.stderr @@ -1,5 +1,5 @@ error[E0383]: partial reinitialization of uninitialized structure `t` - --> $DIR/borrowck-partial-reinit-2.rs:25:5 + --> $DIR/borrowck-partial-reinit-2.rs:15:5 | LL | t.b = Some(Box::new(u)); | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/borrowck/borrowck-partial-reinit-3.nll.stderr b/src/test/ui/borrowck/borrowck-partial-reinit-3.nll.stderr index 3979f1e67536d..05f5411eed68c 100644 --- a/src/test/ui/borrowck/borrowck-partial-reinit-3.nll.stderr +++ b/src/test/ui/borrowck/borrowck-partial-reinit-3.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: assign of moved value: `x.0` - --> $DIR/borrowck-partial-reinit-3.rs:20:5 + --> $DIR/borrowck-partial-reinit-3.rs:11:5 | LL | mem::drop(x.0); | --- value moved here diff --git a/src/test/ui/borrowck/borrowck-partial-reinit-3.rs b/src/test/ui/borrowck/borrowck-partial-reinit-3.rs index 0aa73892b8229..c7fbd7fc88135 100644 --- a/src/test/ui/borrowck/borrowck-partial-reinit-3.rs +++ b/src/test/ui/borrowck/borrowck-partial-reinit-3.rs @@ -1,12 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. use std::mem; struct Test { f: usize } diff --git a/src/test/ui/borrowck/borrowck-partial-reinit-3.stderr b/src/test/ui/borrowck/borrowck-partial-reinit-3.stderr index 66465c0737454..262317444cb45 100644 --- a/src/test/ui/borrowck/borrowck-partial-reinit-3.stderr +++ b/src/test/ui/borrowck/borrowck-partial-reinit-3.stderr @@ -1,5 +1,5 @@ error[E0383]: partial reinitialization of uninitialized structure `x.0` - --> $DIR/borrowck-partial-reinit-3.rs:20:5 + --> $DIR/borrowck-partial-reinit-3.rs:11:5 | LL | x.0.f = 3; | ^^^^^^^^^ diff --git a/src/test/ui/borrowck/borrowck-partial-reinit-4.nll.stderr b/src/test/ui/borrowck/borrowck-partial-reinit-4.nll.stderr index e1ede72a7c9ba..f0a9a7dd5e243 100644 --- a/src/test/ui/borrowck/borrowck-partial-reinit-4.nll.stderr +++ b/src/test/ui/borrowck/borrowck-partial-reinit-4.nll.stderr @@ -1,5 +1,5 @@ error[E0381]: assign of possibly uninitialized variable: `x.0` - --> $DIR/borrowck-partial-reinit-4.rs:27:5 + --> $DIR/borrowck-partial-reinit-4.rs:17:5 | LL | (x.0).0 = Some(Test); | ^^^^^^^ use of possibly uninitialized `x.0` diff --git a/src/test/ui/borrowck/borrowck-partial-reinit-4.rs b/src/test/ui/borrowck/borrowck-partial-reinit-4.rs index 774e04ecb298e..ffa6b11b6fa62 100644 --- a/src/test/ui/borrowck/borrowck-partial-reinit-4.rs +++ b/src/test/ui/borrowck/borrowck-partial-reinit-4.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Test; struct Test2(Option); diff --git a/src/test/ui/borrowck/borrowck-partial-reinit-4.stderr b/src/test/ui/borrowck/borrowck-partial-reinit-4.stderr index 229a53ad82717..8ca8e7e13c6e2 100644 --- a/src/test/ui/borrowck/borrowck-partial-reinit-4.stderr +++ b/src/test/ui/borrowck/borrowck-partial-reinit-4.stderr @@ -1,5 +1,5 @@ error[E0383]: partial reinitialization of uninitialized structure `x.0` - --> $DIR/borrowck-partial-reinit-4.rs:27:5 + --> $DIR/borrowck-partial-reinit-4.rs:17:5 | LL | (x.0).0 = Some(Test); | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/borrowck/borrowck-pat-reassign-binding.ast.nll.stderr b/src/test/ui/borrowck/borrowck-pat-reassign-binding.ast.nll.stderr index cfcf177efa3eb..d65ba12295d5d 100644 --- a/src/test/ui/borrowck/borrowck-pat-reassign-binding.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-pat-reassign-binding.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `x` because it is borrowed - --> $DIR/borrowck-pat-reassign-binding.rs:23:11 + --> $DIR/borrowck-pat-reassign-binding.rs:13:11 | LL | Some(ref i) => { | ----- borrow of `x` occurs here diff --git a/src/test/ui/borrowck/borrowck-pat-reassign-binding.ast.stderr b/src/test/ui/borrowck/borrowck-pat-reassign-binding.ast.stderr index fdc04e226a52b..207f971acff7d 100644 --- a/src/test/ui/borrowck/borrowck-pat-reassign-binding.ast.stderr +++ b/src/test/ui/borrowck/borrowck-pat-reassign-binding.ast.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `x` because it is borrowed - --> $DIR/borrowck-pat-reassign-binding.rs:23:11 + --> $DIR/borrowck-pat-reassign-binding.rs:13:11 | LL | Some(ref i) => { | ----- borrow of `x` occurs here diff --git a/src/test/ui/borrowck/borrowck-pat-reassign-binding.mir.stderr b/src/test/ui/borrowck/borrowck-pat-reassign-binding.mir.stderr index cfcf177efa3eb..d65ba12295d5d 100644 --- a/src/test/ui/borrowck/borrowck-pat-reassign-binding.mir.stderr +++ b/src/test/ui/borrowck/borrowck-pat-reassign-binding.mir.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `x` because it is borrowed - --> $DIR/borrowck-pat-reassign-binding.rs:23:11 + --> $DIR/borrowck-pat-reassign-binding.rs:13:11 | LL | Some(ref i) => { | ----- borrow of `x` occurs here diff --git a/src/test/ui/borrowck/borrowck-pat-reassign-binding.rs b/src/test/ui/borrowck/borrowck-pat-reassign-binding.rs index d917a0abb88d0..9befa9162d51c 100644 --- a/src/test/ui/borrowck/borrowck-pat-reassign-binding.rs +++ b/src/test/ui/borrowck/borrowck-pat-reassign-binding.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/borrowck/borrowck-reborrow-from-mut.nll.stderr b/src/test/ui/borrowck/borrowck-reborrow-from-mut.nll.stderr index 4c81bb8eb3086..5fdd2f053b5b0 100644 --- a/src/test/ui/borrowck/borrowck-reborrow-from-mut.nll.stderr +++ b/src/test/ui/borrowck/borrowck-reborrow-from-mut.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `foo.bar1` as mutable, as it is behind a `&` reference - --> $DIR/borrowck-reborrow-from-mut.rs:98:17 + --> $DIR/borrowck-reborrow-from-mut.rs:88:17 | LL | fn borrow_mut_from_imm(foo: &Foo) { | ---- help: consider changing this to be a mutable reference: `&mut Foo` diff --git a/src/test/ui/borrowck/borrowck-reborrow-from-mut.rs b/src/test/ui/borrowck/borrowck-reborrow-from-mut.rs index 6f5dfa67be50d..51341dae5201b 100644 --- a/src/test/ui/borrowck/borrowck-reborrow-from-mut.rs +++ b/src/test/ui/borrowck/borrowck-reborrow-from-mut.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { bar1: Bar, bar2: Bar diff --git a/src/test/ui/borrowck/borrowck-reborrow-from-mut.stderr b/src/test/ui/borrowck/borrowck-reborrow-from-mut.stderr index 00660ff84841b..070e631283dc5 100644 --- a/src/test/ui/borrowck/borrowck-reborrow-from-mut.stderr +++ b/src/test/ui/borrowck/borrowck-reborrow-from-mut.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `foo.bar1` as mutable more than once at a time - --> $DIR/borrowck-reborrow-from-mut.rs:23:22 + --> $DIR/borrowck-reborrow-from-mut.rs:13:22 | LL | let _bar1 = &mut foo.bar1; | -------- first mutable borrow occurs here @@ -9,7 +9,7 @@ LL | } | - first borrow ends here error[E0502]: cannot borrow `foo.bar1` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-reborrow-from-mut.rs:28:18 + --> $DIR/borrowck-reborrow-from-mut.rs:18:18 | LL | let _bar1 = &mut foo.bar1; | -------- mutable borrow occurs here @@ -19,7 +19,7 @@ LL | } | - mutable borrow ends here error[E0502]: cannot borrow `foo.bar1` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-reborrow-from-mut.rs:33:22 + --> $DIR/borrowck-reborrow-from-mut.rs:23:22 | LL | let _bar1 = &foo.bar1; | -------- immutable borrow occurs here @@ -29,7 +29,7 @@ LL | } | - immutable borrow ends here error[E0499]: cannot borrow `foo.bar1` as mutable more than once at a time - --> $DIR/borrowck-reborrow-from-mut.rs:55:21 + --> $DIR/borrowck-reborrow-from-mut.rs:45:21 | LL | let _bar1 = &mut foo.bar1; | -------- first mutable borrow occurs here @@ -41,7 +41,7 @@ LL | } | - first borrow ends here error[E0502]: cannot borrow `foo.bar1` as immutable because `foo.bar1.int1` is also borrowed as mutable - --> $DIR/borrowck-reborrow-from-mut.rs:62:18 + --> $DIR/borrowck-reborrow-from-mut.rs:52:18 | LL | let _bar1 = &mut foo.bar1.int1; | ------------- mutable borrow occurs here @@ -52,7 +52,7 @@ LL | } | - mutable borrow ends here error[E0502]: cannot borrow `*foo` as immutable because `foo.bar1.int1` is also borrowed as mutable - --> $DIR/borrowck-reborrow-from-mut.rs:63:18 + --> $DIR/borrowck-reborrow-from-mut.rs:53:18 | LL | let _bar1 = &mut foo.bar1.int1; | ------------- mutable borrow occurs here @@ -63,7 +63,7 @@ LL | } | - mutable borrow ends here error[E0499]: cannot borrow `foo.bar1` as mutable more than once at a time - --> $DIR/borrowck-reborrow-from-mut.rs:68:22 + --> $DIR/borrowck-reborrow-from-mut.rs:58:22 | LL | let _bar1 = &mut foo.bar1.int1; | ------------- first mutable borrow occurs here @@ -73,7 +73,7 @@ LL | } | - first borrow ends here error[E0499]: cannot borrow `*foo` as mutable more than once at a time - --> $DIR/borrowck-reborrow-from-mut.rs:73:22 + --> $DIR/borrowck-reborrow-from-mut.rs:63:22 | LL | let _bar1 = &mut foo.bar1.int1; | ------------- first mutable borrow occurs here @@ -83,7 +83,7 @@ LL | } | - first borrow ends here error[E0502]: cannot borrow `foo.bar1` as mutable because `foo.bar1.int1` is also borrowed as immutable - --> $DIR/borrowck-reborrow-from-mut.rs:78:22 + --> $DIR/borrowck-reborrow-from-mut.rs:68:22 | LL | let _bar1 = &foo.bar1.int1; | ------------- immutable borrow occurs here @@ -93,7 +93,7 @@ LL | } | - immutable borrow ends here error[E0502]: cannot borrow `*foo` as mutable because `foo.bar1.int1` is also borrowed as immutable - --> $DIR/borrowck-reborrow-from-mut.rs:83:22 + --> $DIR/borrowck-reborrow-from-mut.rs:73:22 | LL | let _bar1 = &foo.bar1.int1; | ------------- immutable borrow occurs here @@ -103,7 +103,7 @@ LL | } | - immutable borrow ends here error[E0596]: cannot borrow field `foo.bar1` of immutable binding as mutable - --> $DIR/borrowck-reborrow-from-mut.rs:98:22 + --> $DIR/borrowck-reborrow-from-mut.rs:88:22 | LL | fn borrow_mut_from_imm(foo: &Foo) { | ---- use `&mut Foo` here to make mutable diff --git a/src/test/ui/borrowck/borrowck-reborrow-from-shorter-lived-andmut.nll.stderr b/src/test/ui/borrowck/borrowck-reborrow-from-shorter-lived-andmut.nll.stderr index b7aad5c2b80dc..25dc7b5df5514 100644 --- a/src/test/ui/borrowck/borrowck-reborrow-from-shorter-lived-andmut.nll.stderr +++ b/src/test/ui/borrowck/borrowck-reborrow-from-shorter-lived-andmut.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/borrowck-reborrow-from-shorter-lived-andmut.rs:19:18 + --> $DIR/borrowck-reborrow-from-shorter-lived-andmut.rs:9:18 | LL | S { pointer: &mut *p.pointer } | ^^^^^^^^^^^^^^^ error: unsatisfied lifetime constraints - --> $DIR/borrowck-reborrow-from-shorter-lived-andmut.rs:19:5 + --> $DIR/borrowck-reborrow-from-shorter-lived-andmut.rs:9:5 | LL | fn copy_borrowed_ptr<'a,'b>(p: &'a mut S<'b>) -> S<'b> { | -- -- lifetime `'b` defined here diff --git a/src/test/ui/borrowck/borrowck-reborrow-from-shorter-lived-andmut.rs b/src/test/ui/borrowck/borrowck-reborrow-from-shorter-lived-andmut.rs index af85e68f5debe..a7c9200d35ad1 100644 --- a/src/test/ui/borrowck/borrowck-reborrow-from-shorter-lived-andmut.rs +++ b/src/test/ui/borrowck/borrowck-reborrow-from-shorter-lived-andmut.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that assignments to an `&mut` pointer which is found in a // borrowed (but otherwise non-aliasable) location is illegal. diff --git a/src/test/ui/borrowck/borrowck-reborrow-from-shorter-lived-andmut.stderr b/src/test/ui/borrowck/borrowck-reborrow-from-shorter-lived-andmut.stderr index 52dabfaa1d481..67b6f64eaa64f 100644 --- a/src/test/ui/borrowck/borrowck-reborrow-from-shorter-lived-andmut.stderr +++ b/src/test/ui/borrowck/borrowck-reborrow-from-shorter-lived-andmut.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/borrowck-reborrow-from-shorter-lived-andmut.rs:19:5 + --> $DIR/borrowck-reborrow-from-shorter-lived-andmut.rs:9:5 | LL | fn copy_borrowed_ptr<'a,'b>(p: &'a mut S<'b>) -> S<'b> { | ------------- ----- diff --git a/src/test/ui/borrowck/borrowck-ref-mut-of-imm.nll.stderr b/src/test/ui/borrowck/borrowck-ref-mut-of-imm.nll.stderr index ccea5d9565be1..67948ad387928 100644 --- a/src/test/ui/borrowck/borrowck-ref-mut-of-imm.nll.stderr +++ b/src/test/ui/borrowck/borrowck-ref-mut-of-imm.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `x.0` as mutable, as `x` is not declared as mutable - --> $DIR/borrowck-ref-mut-of-imm.rs:14:12 + --> $DIR/borrowck-ref-mut-of-imm.rs:4:12 | LL | fn destructure(x: Option) -> isize { | - help: consider changing this to be mutable: `mut x` diff --git a/src/test/ui/borrowck/borrowck-ref-mut-of-imm.rs b/src/test/ui/borrowck/borrowck-ref-mut-of-imm.rs index 1784b72a69927..ae5bb8591f9b8 100644 --- a/src/test/ui/borrowck/borrowck-ref-mut-of-imm.rs +++ b/src/test/ui/borrowck/borrowck-ref-mut-of-imm.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn destructure(x: Option) -> isize { match x { None => 0, diff --git a/src/test/ui/borrowck/borrowck-ref-mut-of-imm.stderr b/src/test/ui/borrowck/borrowck-ref-mut-of-imm.stderr index 2e2a1224306cb..1341a08d57292 100644 --- a/src/test/ui/borrowck/borrowck-ref-mut-of-imm.stderr +++ b/src/test/ui/borrowck/borrowck-ref-mut-of-imm.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow field `(x as std::prelude::v1::Some).0` of immutable binding as mutable - --> $DIR/borrowck-ref-mut-of-imm.rs:14:12 + --> $DIR/borrowck-ref-mut-of-imm.rs:4:12 | LL | fn destructure(x: Option) -> isize { | - consider changing this to `mut x` diff --git a/src/test/ui/borrowck/borrowck-reinit.rs b/src/test/ui/borrowck/borrowck-reinit.rs index 2e07577c5eade..e8e38a92c81e9 100644 --- a/src/test/ui/borrowck/borrowck-reinit.rs +++ b/src/test/ui/borrowck/borrowck-reinit.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z borrowck=compare fn main() { diff --git a/src/test/ui/borrowck/borrowck-reinit.stderr b/src/test/ui/borrowck/borrowck-reinit.stderr index 654afa421868a..918452726a06c 100644 --- a/src/test/ui/borrowck/borrowck-reinit.stderr +++ b/src/test/ui/borrowck/borrowck-reinit.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `x` (Ast) - --> $DIR/borrowck-reinit.rs:18:16 + --> $DIR/borrowck-reinit.rs:8:16 | LL | drop(x); | - value moved here @@ -9,7 +9,7 @@ LL | let _ = (1,x); //~ ERROR use of moved value: `x` (Ast) = note: move occurs because `x` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0382]: use of moved value: `x` (Mir) - --> $DIR/borrowck-reinit.rs:18:16 + --> $DIR/borrowck-reinit.rs:8:16 | LL | drop(x); | - value moved here diff --git a/src/test/ui/borrowck/borrowck-report-with-custom-diagnostic.nll.stderr b/src/test/ui/borrowck/borrowck-report-with-custom-diagnostic.nll.stderr index fa600f0559f17..66997e8131638 100644 --- a/src/test/ui/borrowck/borrowck-report-with-custom-diagnostic.nll.stderr +++ b/src/test/ui/borrowck/borrowck-report-with-custom-diagnostic.nll.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-report-with-custom-diagnostic.rs:17:13 + --> $DIR/borrowck-report-with-custom-diagnostic.rs:8:13 | LL | let y = &mut x; | ------ mutable borrow occurs here @@ -11,7 +11,7 @@ LL | y.use_mut(); | - borrow later used here error[E0502]: cannot borrow `x` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-report-with-custom-diagnostic.rs:30:21 + --> $DIR/borrowck-report-with-custom-diagnostic.rs:21:21 | LL | let y = &x; | -- immutable borrow occurs here @@ -23,7 +23,7 @@ LL | y.use_ref(); | - borrow later used here error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/borrowck-report-with-custom-diagnostic.rs:45:17 + --> $DIR/borrowck-report-with-custom-diagnostic.rs:36:17 | LL | let y = &mut x; | ------ first mutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-report-with-custom-diagnostic.rs b/src/test/ui/borrowck/borrowck-report-with-custom-diagnostic.rs index 2bc65287982af..6f323d9122753 100644 --- a/src/test/ui/borrowck/borrowck-report-with-custom-diagnostic.rs +++ b/src/test/ui/borrowck/borrowck-report-with-custom-diagnostic.rs @@ -1,12 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![feature(rustc_attrs)] #![allow(dead_code)] fn main() { #![rustc_error] // rust-lang/rust#49855 diff --git a/src/test/ui/borrowck/borrowck-report-with-custom-diagnostic.stderr b/src/test/ui/borrowck/borrowck-report-with-custom-diagnostic.stderr index 1fe052cef7111..cb65ea11205d7 100644 --- a/src/test/ui/borrowck/borrowck-report-with-custom-diagnostic.stderr +++ b/src/test/ui/borrowck/borrowck-report-with-custom-diagnostic.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-report-with-custom-diagnostic.rs:17:14 + --> $DIR/borrowck-report-with-custom-diagnostic.rs:8:14 | LL | let y = &mut x; | - mutable borrow occurs here @@ -11,7 +11,7 @@ LL | } | - mutable borrow ends here error[E0502]: cannot borrow `x` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-report-with-custom-diagnostic.rs:30:26 + --> $DIR/borrowck-report-with-custom-diagnostic.rs:21:26 | LL | let y = &x; | - immutable borrow occurs here @@ -23,7 +23,7 @@ LL | } | - immutable borrow ends here error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/borrowck-report-with-custom-diagnostic.rs:45:22 + --> $DIR/borrowck-report-with-custom-diagnostic.rs:36:22 | LL | let y = &mut x; | - first mutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-return-variable-on-stack-via-clone.nll.stderr b/src/test/ui/borrowck/borrowck-return-variable-on-stack-via-clone.nll.stderr index 93436d0ca9745..6c2ac5a1c65a4 100644 --- a/src/test/ui/borrowck/borrowck-return-variable-on-stack-via-clone.nll.stderr +++ b/src/test/ui/borrowck/borrowck-return-variable-on-stack-via-clone.nll.stderr @@ -1,13 +1,13 @@ error[E0597]: `x` does not live long enough - --> $DIR/borrowck-return-variable-on-stack-via-clone.rs:17:5 + --> $DIR/borrowck-return-variable-on-stack-via-clone.rs:7:5 | LL | (&x).clone() //~ ERROR `x` does not live long enough | ^^^^ borrowed value does not live long enough LL | } | - `x` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 16:9... - --> $DIR/borrowck-return-variable-on-stack-via-clone.rs:16:9 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 6:9... + --> $DIR/borrowck-return-variable-on-stack-via-clone.rs:6:9 | LL | fn leak<'a, T>(x: T) -> &'a T { | ^^ diff --git a/src/test/ui/borrowck/borrowck-return-variable-on-stack-via-clone.rs b/src/test/ui/borrowck/borrowck-return-variable-on-stack-via-clone.rs index 7529943f0bc59..f8cdc3ed97c40 100644 --- a/src/test/ui/borrowck/borrowck-return-variable-on-stack-via-clone.rs +++ b/src/test/ui/borrowck/borrowck-return-variable-on-stack-via-clone.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that when we clone a `&T` pointer we properly relate the // lifetime of the pointer which results to the pointer being cloned. // Bugs in method resolution have sometimes broken this connection. diff --git a/src/test/ui/borrowck/borrowck-return-variable-on-stack-via-clone.stderr b/src/test/ui/borrowck/borrowck-return-variable-on-stack-via-clone.stderr index 69d5229244bdb..b54941eed1be5 100644 --- a/src/test/ui/borrowck/borrowck-return-variable-on-stack-via-clone.stderr +++ b/src/test/ui/borrowck/borrowck-return-variable-on-stack-via-clone.stderr @@ -1,13 +1,13 @@ error[E0597]: `x` does not live long enough - --> $DIR/borrowck-return-variable-on-stack-via-clone.rs:17:7 + --> $DIR/borrowck-return-variable-on-stack-via-clone.rs:7:7 | LL | (&x).clone() //~ ERROR `x` does not live long enough | ^ borrowed value does not live long enough LL | } | - borrowed value only lives until here | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 16:9... - --> $DIR/borrowck-return-variable-on-stack-via-clone.rs:16:9 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 6:9... + --> $DIR/borrowck-return-variable-on-stack-via-clone.rs:6:9 | LL | fn leak<'a, T>(x: T) -> &'a T { | ^^ diff --git a/src/test/ui/borrowck/borrowck-return.rs b/src/test/ui/borrowck/borrowck-return.rs index 74d435b35e7eb..e5bee2ca4bfeb 100644 --- a/src/test/ui/borrowck/borrowck-return.rs +++ b/src/test/ui/borrowck/borrowck-return.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn f() -> isize { let x: isize; return x; //~ ERROR use of possibly uninitialized variable: `x` diff --git a/src/test/ui/borrowck/borrowck-return.stderr b/src/test/ui/borrowck/borrowck-return.stderr index 7223289b376e1..b8a5ce8dc99bf 100644 --- a/src/test/ui/borrowck/borrowck-return.stderr +++ b/src/test/ui/borrowck/borrowck-return.stderr @@ -1,5 +1,5 @@ error[E0381]: use of possibly uninitialized variable: `x` - --> $DIR/borrowck-return.rs:13:12 + --> $DIR/borrowck-return.rs:3:12 | LL | return x; //~ ERROR use of possibly uninitialized variable: `x` | ^ use of possibly uninitialized `x` diff --git a/src/test/ui/borrowck/borrowck-slice-pattern-element-loan.rs b/src/test/ui/borrowck/borrowck-slice-pattern-element-loan.rs index da36f494eb686..5de8dd3305e37 100644 --- a/src/test/ui/borrowck/borrowck-slice-pattern-element-loan.rs +++ b/src/test/ui/borrowck/borrowck-slice-pattern-element-loan.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //compile-flags: -Z borrowck=mir #![feature(slice_patterns)] diff --git a/src/test/ui/borrowck/borrowck-slice-pattern-element-loan.stderr b/src/test/ui/borrowck/borrowck-slice-pattern-element-loan.stderr index 16d401ec7f9bf..708609fcbc9e0 100644 --- a/src/test/ui/borrowck/borrowck-slice-pattern-element-loan.stderr +++ b/src/test/ui/borrowck/borrowck-slice-pattern-element-loan.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `s[..]` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-slice-pattern-element-loan.rs:28:20 + --> $DIR/borrowck-slice-pattern-element-loan.rs:18:20 | LL | if let [ref first, ref second, ..] = *s { | ---------- immutable borrow occurs here @@ -9,7 +9,7 @@ LL | nop(&[first, second, second2, third]); | ------ borrow later used here error[E0502]: cannot borrow `s[..]` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-slice-pattern-element-loan.rs:44:21 + --> $DIR/borrowck-slice-pattern-element-loan.rs:34:21 | LL | if let [.., ref fourth, ref third, _, ref first] = *s { | --------- immutable borrow occurs here @@ -19,7 +19,7 @@ LL | nop(&[first, third, third2, fourth]); | ----- borrow later used here error[E0502]: cannot borrow `s[..]` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-slice-pattern-element-loan.rs:55:20 + --> $DIR/borrowck-slice-pattern-element-loan.rs:45:20 | LL | if let [.., _, ref from_end4, ref from_end3, _, ref from_end1] = *s { | ------------- immutable borrow occurs here @@ -30,7 +30,7 @@ LL | nop(&[from_begin1, from_end1, from_end3, from_end4]); | --------- borrow later used here error[E0502]: cannot borrow `s[..]` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-slice-pattern-element-loan.rs:58:23 + --> $DIR/borrowck-slice-pattern-element-loan.rs:48:23 | LL | if let [.., _, ref from_end4, ref from_end3, _, ref from_end1] = *s { | ------------- immutable borrow occurs here @@ -41,7 +41,7 @@ LL | nop(&[from_begin2, from_end1, from_end3, from_end4]); | --------- borrow later used here error[E0502]: cannot borrow `s[..]` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-slice-pattern-element-loan.rs:61:26 + --> $DIR/borrowck-slice-pattern-element-loan.rs:51:26 | LL | if let [.., _, ref from_end4, ref from_end3, _, ref from_end1] = *s { | ------------- immutable borrow occurs here @@ -52,7 +52,7 @@ LL | nop(&[from_begin3, from_end1, from_end3, from_end4]); | --------- borrow later used here error[E0502]: cannot borrow `s[..]` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-slice-pattern-element-loan.rs:69:21 + --> $DIR/borrowck-slice-pattern-element-loan.rs:59:21 | LL | if let [ref from_begin0, ref from_begin1, _, ref from_begin3, _, ..] = *s { | --------------- immutable borrow occurs here @@ -63,7 +63,7 @@ LL | nop(&[from_begin0, from_begin1, from_begin3, from_end2]); | ----------- borrow later used here error[E0502]: cannot borrow `s[..]` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-slice-pattern-element-loan.rs:72:21 + --> $DIR/borrowck-slice-pattern-element-loan.rs:62:21 | LL | if let [ref from_begin0, ref from_begin1, _, ref from_begin3, _, ..] = *s { | --------------- immutable borrow occurs here @@ -74,7 +74,7 @@ LL | nop(&[from_begin0, from_begin1, from_begin3, from_end3]); | ----------- borrow later used here error[E0502]: cannot borrow `s[..]` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-slice-pattern-element-loan.rs:75:21 + --> $DIR/borrowck-slice-pattern-element-loan.rs:65:21 | LL | if let [ref from_begin0, ref from_begin1, _, ref from_begin3, _, ..] = *s { | --------------- immutable borrow occurs here @@ -85,7 +85,7 @@ LL | nop(&[from_begin0, from_begin1, from_begin3, from_end4]); | ----------- borrow later used here error[E0502]: cannot borrow `s[..]` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-slice-pattern-element-loan.rs:92:20 + --> $DIR/borrowck-slice-pattern-element-loan.rs:82:20 | LL | if let [ref first, ref second, ..] = *s { | ---------- immutable borrow occurs here @@ -95,7 +95,7 @@ LL | nop(&[first, second]); | ------ borrow later used here error[E0502]: cannot borrow `s[..]` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-slice-pattern-element-loan.rs:110:17 + --> $DIR/borrowck-slice-pattern-element-loan.rs:100:17 | LL | if let [.., ref second, ref first] = *s { | ---------- immutable borrow occurs here @@ -105,7 +105,7 @@ LL | nop(&[first, second]); | ------ borrow later used here error[E0502]: cannot borrow `s[..]` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-slice-pattern-element-loan.rs:119:17 + --> $DIR/borrowck-slice-pattern-element-loan.rs:109:17 | LL | if let [_, _, _, ref s1..] = *s { | ------ immutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-storage-dead.rs b/src/test/ui/borrowck/borrowck-storage-dead.rs index bc01088696da6..72c3bc1371985 100644 --- a/src/test/ui/borrowck/borrowck-storage-dead.rs +++ b/src/test/ui/borrowck/borrowck-storage-dead.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z borrowck=compare fn ok() { diff --git a/src/test/ui/borrowck/borrowck-storage-dead.stderr b/src/test/ui/borrowck/borrowck-storage-dead.stderr index edb7c13cf8bdb..057d40d74cfe9 100644 --- a/src/test/ui/borrowck/borrowck-storage-dead.stderr +++ b/src/test/ui/borrowck/borrowck-storage-dead.stderr @@ -1,11 +1,11 @@ error[E0381]: use of possibly uninitialized variable: `x` (Ast) - --> $DIR/borrowck-storage-dead.rs:28:17 + --> $DIR/borrowck-storage-dead.rs:18:17 | LL | let _ = x + 1; //~ERROR (Ast) [E0381] | ^ use of possibly uninitialized `x` error[E0381]: use of possibly uninitialized variable: `x` (Mir) - --> $DIR/borrowck-storage-dead.rs:28:17 + --> $DIR/borrowck-storage-dead.rs:18:17 | LL | let _ = x + 1; //~ERROR (Ast) [E0381] | ^ use of possibly uninitialized `x` diff --git a/src/test/ui/borrowck/borrowck-struct-update-with-dtor.ast.nll.stderr b/src/test/ui/borrowck/borrowck-struct-update-with-dtor.ast.nll.stderr index a811f5d4defc8..dbc9ece0c8f86 100644 --- a/src/test/ui/borrowck/borrowck-struct-update-with-dtor.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-struct-update-with-dtor.ast.nll.stderr @@ -1,11 +1,11 @@ error[E0509]: cannot move out of type `S`, which implements the `Drop` trait - --> $DIR/borrowck-struct-update-with-dtor.rs:25:15 + --> $DIR/borrowck-struct-update-with-dtor.rs:15:15 | LL | let _s2 = S{a: 2, ..s0}; | ^^^^^^^^^^^^^ cannot move out of here error[E0509]: cannot move out of type `T`, which implements the `Drop` trait - --> $DIR/borrowck-struct-update-with-dtor.rs:31:15 + --> $DIR/borrowck-struct-update-with-dtor.rs:21:15 | LL | let _s2 = T{a: 2, ..s0}; | ^^^^^^^^^^^^^ cannot move out of here diff --git a/src/test/ui/borrowck/borrowck-struct-update-with-dtor.ast.stderr b/src/test/ui/borrowck/borrowck-struct-update-with-dtor.ast.stderr index aebee2c33216b..bc0a954b46d01 100644 --- a/src/test/ui/borrowck/borrowck-struct-update-with-dtor.ast.stderr +++ b/src/test/ui/borrowck/borrowck-struct-update-with-dtor.ast.stderr @@ -1,11 +1,11 @@ error[E0509]: cannot move out of type `S`, which implements the `Drop` trait - --> $DIR/borrowck-struct-update-with-dtor.rs:25:25 + --> $DIR/borrowck-struct-update-with-dtor.rs:15:25 | LL | let _s2 = S{a: 2, ..s0}; | ^^ cannot move out of here error[E0509]: cannot move out of type `T`, which implements the `Drop` trait - --> $DIR/borrowck-struct-update-with-dtor.rs:31:25 + --> $DIR/borrowck-struct-update-with-dtor.rs:21:25 | LL | let _s2 = T{a: 2, ..s0}; | ^^ cannot move out of here diff --git a/src/test/ui/borrowck/borrowck-struct-update-with-dtor.mir.stderr b/src/test/ui/borrowck/borrowck-struct-update-with-dtor.mir.stderr index a811f5d4defc8..dbc9ece0c8f86 100644 --- a/src/test/ui/borrowck/borrowck-struct-update-with-dtor.mir.stderr +++ b/src/test/ui/borrowck/borrowck-struct-update-with-dtor.mir.stderr @@ -1,11 +1,11 @@ error[E0509]: cannot move out of type `S`, which implements the `Drop` trait - --> $DIR/borrowck-struct-update-with-dtor.rs:25:15 + --> $DIR/borrowck-struct-update-with-dtor.rs:15:15 | LL | let _s2 = S{a: 2, ..s0}; | ^^^^^^^^^^^^^ cannot move out of here error[E0509]: cannot move out of type `T`, which implements the `Drop` trait - --> $DIR/borrowck-struct-update-with-dtor.rs:31:15 + --> $DIR/borrowck-struct-update-with-dtor.rs:21:15 | LL | let _s2 = T{a: 2, ..s0}; | ^^^^^^^^^^^^^ cannot move out of here diff --git a/src/test/ui/borrowck/borrowck-struct-update-with-dtor.rs b/src/test/ui/borrowck/borrowck-struct-update-with-dtor.rs index f90651687a53f..da5bb6366314a 100644 --- a/src/test/ui/borrowck/borrowck-struct-update-with-dtor.rs +++ b/src/test/ui/borrowck/borrowck-struct-update-with-dtor.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/borrowck/borrowck-swap-mut-base-ptr.nll.stderr b/src/test/ui/borrowck/borrowck-swap-mut-base-ptr.nll.stderr index 5f605694c5bcc..515b5e90e23a0 100644 --- a/src/test/ui/borrowck/borrowck-swap-mut-base-ptr.nll.stderr +++ b/src/test/ui/borrowck/borrowck-swap-mut-base-ptr.nll.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `t0` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-swap-mut-base-ptr.rs:23:10 + --> $DIR/borrowck-swap-mut-base-ptr.rs:13:10 | LL | let p: &isize = &*t0; // Freezes `*t0` | ---- immutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-swap-mut-base-ptr.rs b/src/test/ui/borrowck/borrowck-swap-mut-base-ptr.rs index b4b78bbb747fb..3d40d319226a1 100644 --- a/src/test/ui/borrowck/borrowck-swap-mut-base-ptr.rs +++ b/src/test/ui/borrowck/borrowck-swap-mut-base-ptr.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that attempt to swap `&mut` pointer while pointee is borrowed // yields an error. // diff --git a/src/test/ui/borrowck/borrowck-swap-mut-base-ptr.stderr b/src/test/ui/borrowck/borrowck-swap-mut-base-ptr.stderr index 27824725e53ed..35007216dace1 100644 --- a/src/test/ui/borrowck/borrowck-swap-mut-base-ptr.stderr +++ b/src/test/ui/borrowck/borrowck-swap-mut-base-ptr.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `t0` as mutable because `*t0` is also borrowed as immutable - --> $DIR/borrowck-swap-mut-base-ptr.rs:23:15 + --> $DIR/borrowck-swap-mut-base-ptr.rs:13:15 | LL | let p: &isize = &*t0; // Freezes `*t0` | --- immutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.ast.nll.stderr b/src/test/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.ast.nll.stderr index 7373457e71988..34d08a026dd35 100644 --- a/src/test/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0712]: thread-local variable borrowed past end of function - --> $DIR/borrowck-thread-local-static-borrow-outlives-fn.rs:21:20 + --> $DIR/borrowck-thread-local-static-borrow-outlives-fn.rs:11:20 | LL | assert_static(&FOO); //[ast]~ ERROR [E0597] | ^^^^ thread-local variables cannot be borrowed beyond the end of the function diff --git a/src/test/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.ast.stderr b/src/test/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.ast.stderr index 27e0dba5095b2..5d0b4fbbc0819 100644 --- a/src/test/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.ast.stderr +++ b/src/test/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.ast.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/borrowck-thread-local-static-borrow-outlives-fn.rs:21:21 + --> $DIR/borrowck-thread-local-static-borrow-outlives-fn.rs:11:21 | LL | assert_static(&FOO); //[ast]~ ERROR [E0597] | ^^^ - temporary value only lives until here diff --git a/src/test/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.mir.stderr b/src/test/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.mir.stderr index 7373457e71988..34d08a026dd35 100644 --- a/src/test/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.mir.stderr +++ b/src/test/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.mir.stderr @@ -1,5 +1,5 @@ error[E0712]: thread-local variable borrowed past end of function - --> $DIR/borrowck-thread-local-static-borrow-outlives-fn.rs:21:20 + --> $DIR/borrowck-thread-local-static-borrow-outlives-fn.rs:11:20 | LL | assert_static(&FOO); //[ast]~ ERROR [E0597] | ^^^^ thread-local variables cannot be borrowed beyond the end of the function diff --git a/src/test/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.rs b/src/test/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.rs index 7aa02558446e3..6fd6acc834666 100644 --- a/src/test/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.rs +++ b/src/test/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/borrowck/borrowck-unary-move.ast.nll.stderr b/src/test/ui/borrowck/borrowck-unary-move.ast.nll.stderr index caeaa173bb85e..53dc6a77887d4 100644 --- a/src/test/ui/borrowck/borrowck-unary-move.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-unary-move.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `x` because it is borrowed - --> $DIR/borrowck-unary-move.rs:17:10 + --> $DIR/borrowck-unary-move.rs:7:10 | LL | let y = &*x; | --- borrow of `*x` occurs here diff --git a/src/test/ui/borrowck/borrowck-unary-move.ast.stderr b/src/test/ui/borrowck/borrowck-unary-move.ast.stderr index 968fbb4526d04..9383298af9bfe 100644 --- a/src/test/ui/borrowck/borrowck-unary-move.ast.stderr +++ b/src/test/ui/borrowck/borrowck-unary-move.ast.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `x` because it is borrowed - --> $DIR/borrowck-unary-move.rs:17:10 + --> $DIR/borrowck-unary-move.rs:7:10 | LL | let y = &*x; | -- borrow of `*x` occurs here diff --git a/src/test/ui/borrowck/borrowck-unary-move.mir.stderr b/src/test/ui/borrowck/borrowck-unary-move.mir.stderr index caeaa173bb85e..53dc6a77887d4 100644 --- a/src/test/ui/borrowck/borrowck-unary-move.mir.stderr +++ b/src/test/ui/borrowck/borrowck-unary-move.mir.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `x` because it is borrowed - --> $DIR/borrowck-unary-move.rs:17:10 + --> $DIR/borrowck-unary-move.rs:7:10 | LL | let y = &*x; | --- borrow of `*x` occurs here diff --git a/src/test/ui/borrowck/borrowck-unary-move.rs b/src/test/ui/borrowck/borrowck-unary-move.rs index 8163ce2993926..4e023ac859937 100644 --- a/src/test/ui/borrowck/borrowck-unary-move.rs +++ b/src/test/ui/borrowck/borrowck-unary-move.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/borrowck/borrowck-unboxed-closures.nll.stderr b/src/test/ui/borrowck/borrowck-unboxed-closures.nll.stderr index 3fbb747db24f1..d7f872e175ff7 100644 --- a/src/test/ui/borrowck/borrowck-unboxed-closures.nll.stderr +++ b/src/test/ui/borrowck/borrowck-unboxed-closures.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `f` as mutable, as it is not declared as mutable - --> $DIR/borrowck-unboxed-closures.rs:17:5 + --> $DIR/borrowck-unboxed-closures.rs:7:5 | LL | fn b isize>(f: F) { | - help: consider changing this to be mutable: `mut f` @@ -7,7 +7,7 @@ LL | f(1, 2); //~ ERROR cannot borrow immutable argument | ^ cannot borrow as mutable error[E0382]: use of moved value: `f` - --> $DIR/borrowck-unboxed-closures.rs:22:5 + --> $DIR/borrowck-unboxed-closures.rs:12:5 | LL | f(1, 2); | - value moved here diff --git a/src/test/ui/borrowck/borrowck-unboxed-closures.rs b/src/test/ui/borrowck/borrowck-unboxed-closures.rs index 4813b4b6a72cd..906db6ec12ce3 100644 --- a/src/test/ui/borrowck/borrowck-unboxed-closures.rs +++ b/src/test/ui/borrowck/borrowck-unboxed-closures.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn a isize>(mut f: F) { let g = &mut f; f(1, 2); //~ ERROR cannot borrow `f` as immutable diff --git a/src/test/ui/borrowck/borrowck-unboxed-closures.stderr b/src/test/ui/borrowck/borrowck-unboxed-closures.stderr index 03b835d30770b..3cecbfed2263f 100644 --- a/src/test/ui/borrowck/borrowck-unboxed-closures.stderr +++ b/src/test/ui/borrowck/borrowck-unboxed-closures.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `f` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-unboxed-closures.rs:13:5 + --> $DIR/borrowck-unboxed-closures.rs:3:5 | LL | let g = &mut f; | - mutable borrow occurs here @@ -9,7 +9,7 @@ LL | } | - mutable borrow ends here error[E0596]: cannot borrow immutable argument `f` as mutable - --> $DIR/borrowck-unboxed-closures.rs:17:5 + --> $DIR/borrowck-unboxed-closures.rs:7:5 | LL | fn b isize>(f: F) { | - consider changing this to `mut f` @@ -17,7 +17,7 @@ LL | f(1, 2); //~ ERROR cannot borrow immutable argument | ^ cannot borrow mutably error[E0382]: use of moved value: `f` - --> $DIR/borrowck-unboxed-closures.rs:22:5 + --> $DIR/borrowck-unboxed-closures.rs:12:5 | LL | f(1, 2); | - value moved here diff --git a/src/test/ui/borrowck/borrowck-uninit-after-item.rs b/src/test/ui/borrowck/borrowck-uninit-after-item.rs index acd827d6c620b..83f3752a1a850 100644 --- a/src/test/ui/borrowck/borrowck-uninit-after-item.rs +++ b/src/test/ui/borrowck/borrowck-uninit-after-item.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let bar; fn baz(_x: isize) { } diff --git a/src/test/ui/borrowck/borrowck-uninit-after-item.stderr b/src/test/ui/borrowck/borrowck-uninit-after-item.stderr index 17f9c0197ab79..f658b64f11f41 100644 --- a/src/test/ui/borrowck/borrowck-uninit-after-item.stderr +++ b/src/test/ui/borrowck/borrowck-uninit-after-item.stderr @@ -1,5 +1,5 @@ error[E0381]: use of possibly uninitialized variable: `bar` - --> $DIR/borrowck-uninit-after-item.rs:14:9 + --> $DIR/borrowck-uninit-after-item.rs:4:9 | LL | baz(bar); //~ ERROR use of possibly uninitialized variable: `bar` | ^^^ use of possibly uninitialized `bar` diff --git a/src/test/ui/borrowck/borrowck-uninit-field-access.ast.nll.stderr b/src/test/ui/borrowck/borrowck-uninit-field-access.ast.nll.stderr index 9c7dbd7e77884..d844992d4c69a 100644 --- a/src/test/ui/borrowck/borrowck-uninit-field-access.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-uninit-field-access.ast.nll.stderr @@ -1,11 +1,11 @@ error[E0381]: use of possibly uninitialized variable: `a.x` - --> $DIR/borrowck-uninit-field-access.rs:34:13 + --> $DIR/borrowck-uninit-field-access.rs:24:13 | LL | let _ = a.x + 1; //[ast]~ ERROR use of possibly uninitialized variable: `a.x` | ^^^ use of possibly uninitialized `a.x` error[E0382]: use of moved value: `line1.origin.x` - --> $DIR/borrowck-uninit-field-access.rs:39:13 + --> $DIR/borrowck-uninit-field-access.rs:29:13 | LL | let _moved = line1.origin; | ------------ value moved here @@ -15,7 +15,7 @@ LL | let _ = line1.origin.x + 1; //[ast]~ ERROR use of moved value: `line1.o = note: move occurs because `line1.origin` has type `Point`, which does not implement the `Copy` trait error[E0382]: use of moved value: `line2` - --> $DIR/borrowck-uninit-field-access.rs:44:5 + --> $DIR/borrowck-uninit-field-access.rs:34:5 | LL | let _moved = (line2.origin, line2.middle); | ------------ value moved here diff --git a/src/test/ui/borrowck/borrowck-uninit-field-access.ast.stderr b/src/test/ui/borrowck/borrowck-uninit-field-access.ast.stderr index 8536bf22de905..8c05272e5fbae 100644 --- a/src/test/ui/borrowck/borrowck-uninit-field-access.ast.stderr +++ b/src/test/ui/borrowck/borrowck-uninit-field-access.ast.stderr @@ -1,11 +1,11 @@ error[E0381]: use of possibly uninitialized variable: `a.x` - --> $DIR/borrowck-uninit-field-access.rs:34:13 + --> $DIR/borrowck-uninit-field-access.rs:24:13 | LL | let _ = a.x + 1; //[ast]~ ERROR use of possibly uninitialized variable: `a.x` | ^^^ use of possibly uninitialized `a.x` error[E0382]: use of moved value: `line1.origin.x` - --> $DIR/borrowck-uninit-field-access.rs:39:13 + --> $DIR/borrowck-uninit-field-access.rs:29:13 | LL | let _moved = line1.origin; | ------ value moved here @@ -15,7 +15,7 @@ LL | let _ = line1.origin.x + 1; //[ast]~ ERROR use of moved value: `line1.o = note: move occurs because `line1.origin` has type `Point`, which does not implement the `Copy` trait error[E0382]: use of partially moved value: `line2` - --> $DIR/borrowck-uninit-field-access.rs:44:5 + --> $DIR/borrowck-uninit-field-access.rs:34:5 | LL | let _moved = (line2.origin, line2.middle); | ------------ value moved here diff --git a/src/test/ui/borrowck/borrowck-uninit-field-access.mir.stderr b/src/test/ui/borrowck/borrowck-uninit-field-access.mir.stderr index 9c7dbd7e77884..d844992d4c69a 100644 --- a/src/test/ui/borrowck/borrowck-uninit-field-access.mir.stderr +++ b/src/test/ui/borrowck/borrowck-uninit-field-access.mir.stderr @@ -1,11 +1,11 @@ error[E0381]: use of possibly uninitialized variable: `a.x` - --> $DIR/borrowck-uninit-field-access.rs:34:13 + --> $DIR/borrowck-uninit-field-access.rs:24:13 | LL | let _ = a.x + 1; //[ast]~ ERROR use of possibly uninitialized variable: `a.x` | ^^^ use of possibly uninitialized `a.x` error[E0382]: use of moved value: `line1.origin.x` - --> $DIR/borrowck-uninit-field-access.rs:39:13 + --> $DIR/borrowck-uninit-field-access.rs:29:13 | LL | let _moved = line1.origin; | ------------ value moved here @@ -15,7 +15,7 @@ LL | let _ = line1.origin.x + 1; //[ast]~ ERROR use of moved value: `line1.o = note: move occurs because `line1.origin` has type `Point`, which does not implement the `Copy` trait error[E0382]: use of moved value: `line2` - --> $DIR/borrowck-uninit-field-access.rs:44:5 + --> $DIR/borrowck-uninit-field-access.rs:34:5 | LL | let _moved = (line2.origin, line2.middle); | ------------ value moved here diff --git a/src/test/ui/borrowck/borrowck-uninit-field-access.rs b/src/test/ui/borrowck/borrowck-uninit-field-access.rs index eec7df84c82f7..ab19b2d773519 100644 --- a/src/test/ui/borrowck/borrowck-uninit-field-access.rs +++ b/src/test/ui/borrowck/borrowck-uninit-field-access.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/borrowck/borrowck-uninit-in-assignop.rs b/src/test/ui/borrowck/borrowck-uninit-in-assignop.rs index e253ecc74b9a5..bfb0dd4301dd1 100644 --- a/src/test/ui/borrowck/borrowck-uninit-in-assignop.rs +++ b/src/test/ui/borrowck/borrowck-uninit-in-assignop.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that the use of uninitialized variable in assignment operator // expression is detected. diff --git a/src/test/ui/borrowck/borrowck-uninit-in-assignop.stderr b/src/test/ui/borrowck/borrowck-uninit-in-assignop.stderr index 7d905f647619b..a685f0ecf3c04 100644 --- a/src/test/ui/borrowck/borrowck-uninit-in-assignop.stderr +++ b/src/test/ui/borrowck/borrowck-uninit-in-assignop.stderr @@ -1,59 +1,59 @@ error[E0381]: use of possibly uninitialized variable: `x` - --> $DIR/borrowck-uninit-in-assignop.rs:16:5 + --> $DIR/borrowck-uninit-in-assignop.rs:6:5 | LL | x += 1; //~ ERROR use of possibly uninitialized variable: `x` | ^^^^^^ use of possibly uninitialized `x` error[E0381]: use of possibly uninitialized variable: `x` - --> $DIR/borrowck-uninit-in-assignop.rs:19:5 + --> $DIR/borrowck-uninit-in-assignop.rs:9:5 | LL | x -= 1; //~ ERROR use of possibly uninitialized variable: `x` | ^^^^^^ use of possibly uninitialized `x` error[E0381]: use of possibly uninitialized variable: `x` - --> $DIR/borrowck-uninit-in-assignop.rs:22:5 + --> $DIR/borrowck-uninit-in-assignop.rs:12:5 | LL | x *= 1; //~ ERROR use of possibly uninitialized variable: `x` | ^^^^^^ use of possibly uninitialized `x` error[E0381]: use of possibly uninitialized variable: `x` - --> $DIR/borrowck-uninit-in-assignop.rs:25:5 + --> $DIR/borrowck-uninit-in-assignop.rs:15:5 | LL | x /= 1; //~ ERROR use of possibly uninitialized variable: `x` | ^^^^^^ use of possibly uninitialized `x` error[E0381]: use of possibly uninitialized variable: `x` - --> $DIR/borrowck-uninit-in-assignop.rs:28:5 + --> $DIR/borrowck-uninit-in-assignop.rs:18:5 | LL | x %= 1; //~ ERROR use of possibly uninitialized variable: `x` | ^^^^^^ use of possibly uninitialized `x` error[E0381]: use of possibly uninitialized variable: `x` - --> $DIR/borrowck-uninit-in-assignop.rs:31:5 + --> $DIR/borrowck-uninit-in-assignop.rs:21:5 | LL | x ^= 1; //~ ERROR use of possibly uninitialized variable: `x` | ^^^^^^ use of possibly uninitialized `x` error[E0381]: use of possibly uninitialized variable: `x` - --> $DIR/borrowck-uninit-in-assignop.rs:34:5 + --> $DIR/borrowck-uninit-in-assignop.rs:24:5 | LL | x &= 1; //~ ERROR use of possibly uninitialized variable: `x` | ^^^^^^ use of possibly uninitialized `x` error[E0381]: use of possibly uninitialized variable: `x` - --> $DIR/borrowck-uninit-in-assignop.rs:37:5 + --> $DIR/borrowck-uninit-in-assignop.rs:27:5 | LL | x |= 1; //~ ERROR use of possibly uninitialized variable: `x` | ^^^^^^ use of possibly uninitialized `x` error[E0381]: use of possibly uninitialized variable: `x` - --> $DIR/borrowck-uninit-in-assignop.rs:40:5 + --> $DIR/borrowck-uninit-in-assignop.rs:30:5 | LL | x <<= 1; //~ ERROR use of possibly uninitialized variable: `x` | ^^^^^^^ use of possibly uninitialized `x` error[E0381]: use of possibly uninitialized variable: `x` - --> $DIR/borrowck-uninit-in-assignop.rs:43:5 + --> $DIR/borrowck-uninit-in-assignop.rs:33:5 | LL | x >>= 1; //~ ERROR use of possibly uninitialized variable: `x` | ^^^^^^^ use of possibly uninitialized `x` diff --git a/src/test/ui/borrowck/borrowck-uninit-ref-chain.ast.nll.stderr b/src/test/ui/borrowck/borrowck-uninit-ref-chain.ast.nll.stderr index bd9836e3174fb..dbdbfac101f7e 100644 --- a/src/test/ui/borrowck/borrowck-uninit-ref-chain.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-uninit-ref-chain.ast.nll.stderr @@ -1,29 +1,29 @@ error[E0381]: borrow of possibly uninitialized variable: `**x` - --> $DIR/borrowck-uninit-ref-chain.rs:21:14 + --> $DIR/borrowck-uninit-ref-chain.rs:11:14 | LL | let _y = &**x; //[ast]~ ERROR use of possibly uninitialized variable: `**x` [E0381] | ^^^^ use of possibly uninitialized `**x` error[E0381]: borrow of possibly uninitialized variable: `**x` - --> $DIR/borrowck-uninit-ref-chain.rs:25:14 + --> $DIR/borrowck-uninit-ref-chain.rs:15:14 | LL | let _y = &**x; //[ast]~ ERROR use of possibly uninitialized variable: `**x` [E0381] | ^^^^ use of possibly uninitialized `**x` error[E0381]: borrow of possibly uninitialized variable: `**x` - --> $DIR/borrowck-uninit-ref-chain.rs:29:14 + --> $DIR/borrowck-uninit-ref-chain.rs:19:14 | LL | let _y = &**x; //[ast]~ ERROR use of possibly uninitialized variable: `**x` [E0381] | ^^^^ use of possibly uninitialized `**x` error[E0381]: borrow of possibly uninitialized variable: `a.y` - --> $DIR/borrowck-uninit-ref-chain.rs:46:14 + --> $DIR/borrowck-uninit-ref-chain.rs:36:14 | LL | let _b = &a.y; //[ast]~ ERROR use of possibly uninitialized variable: `a.y` [E0381] | ^^^^ use of possibly uninitialized `a.y` error[E0381]: borrow of possibly uninitialized variable: `**a.y` - --> $DIR/borrowck-uninit-ref-chain.rs:51:14 + --> $DIR/borrowck-uninit-ref-chain.rs:41:14 | LL | let _b = &**a.y; //[ast]~ ERROR use of possibly uninitialized variable: `**a.y` [E0381] | ^^^^^^ use of possibly uninitialized `**a.y` diff --git a/src/test/ui/borrowck/borrowck-uninit-ref-chain.ast.stderr b/src/test/ui/borrowck/borrowck-uninit-ref-chain.ast.stderr index 6b51414e5a200..e8ebf8c2dd048 100644 --- a/src/test/ui/borrowck/borrowck-uninit-ref-chain.ast.stderr +++ b/src/test/ui/borrowck/borrowck-uninit-ref-chain.ast.stderr @@ -1,41 +1,41 @@ error[E0381]: use of possibly uninitialized variable: `**x` - --> $DIR/borrowck-uninit-ref-chain.rs:21:15 + --> $DIR/borrowck-uninit-ref-chain.rs:11:15 | LL | let _y = &**x; //[ast]~ ERROR use of possibly uninitialized variable: `**x` [E0381] | ^^^ use of possibly uninitialized `**x` error[E0381]: use of possibly uninitialized variable: `**x` - --> $DIR/borrowck-uninit-ref-chain.rs:25:15 + --> $DIR/borrowck-uninit-ref-chain.rs:15:15 | LL | let _y = &**x; //[ast]~ ERROR use of possibly uninitialized variable: `**x` [E0381] | ^^^ use of possibly uninitialized `**x` error[E0381]: use of possibly uninitialized variable: `**x` - --> $DIR/borrowck-uninit-ref-chain.rs:29:15 + --> $DIR/borrowck-uninit-ref-chain.rs:19:15 | LL | let _y = &**x; //[ast]~ ERROR use of possibly uninitialized variable: `**x` [E0381] | ^^^ use of possibly uninitialized `**x` error[E0381]: use of possibly uninitialized variable: `a.x` - --> $DIR/borrowck-uninit-ref-chain.rs:35:15 + --> $DIR/borrowck-uninit-ref-chain.rs:25:15 | LL | let _b = &a.x; //[ast]~ ERROR use of possibly uninitialized variable: `a.x` [E0381] | ^^^ use of possibly uninitialized `a.x` error[E0381]: use of possibly uninitialized variable: `**a.x` - --> $DIR/borrowck-uninit-ref-chain.rs:40:15 + --> $DIR/borrowck-uninit-ref-chain.rs:30:15 | LL | let _b = &**a.x; //[ast]~ ERROR use of possibly uninitialized variable: `**a.x` [E0381] | ^^^^^ use of possibly uninitialized `**a.x` error[E0381]: use of possibly uninitialized variable: `a.y` - --> $DIR/borrowck-uninit-ref-chain.rs:46:15 + --> $DIR/borrowck-uninit-ref-chain.rs:36:15 | LL | let _b = &a.y; //[ast]~ ERROR use of possibly uninitialized variable: `a.y` [E0381] | ^^^ use of possibly uninitialized `a.y` error[E0381]: use of possibly uninitialized variable: `**a.y` - --> $DIR/borrowck-uninit-ref-chain.rs:51:15 + --> $DIR/borrowck-uninit-ref-chain.rs:41:15 | LL | let _b = &**a.y; //[ast]~ ERROR use of possibly uninitialized variable: `**a.y` [E0381] | ^^^^^ use of possibly uninitialized `**a.y` diff --git a/src/test/ui/borrowck/borrowck-uninit-ref-chain.mir.stderr b/src/test/ui/borrowck/borrowck-uninit-ref-chain.mir.stderr index bd9836e3174fb..dbdbfac101f7e 100644 --- a/src/test/ui/borrowck/borrowck-uninit-ref-chain.mir.stderr +++ b/src/test/ui/borrowck/borrowck-uninit-ref-chain.mir.stderr @@ -1,29 +1,29 @@ error[E0381]: borrow of possibly uninitialized variable: `**x` - --> $DIR/borrowck-uninit-ref-chain.rs:21:14 + --> $DIR/borrowck-uninit-ref-chain.rs:11:14 | LL | let _y = &**x; //[ast]~ ERROR use of possibly uninitialized variable: `**x` [E0381] | ^^^^ use of possibly uninitialized `**x` error[E0381]: borrow of possibly uninitialized variable: `**x` - --> $DIR/borrowck-uninit-ref-chain.rs:25:14 + --> $DIR/borrowck-uninit-ref-chain.rs:15:14 | LL | let _y = &**x; //[ast]~ ERROR use of possibly uninitialized variable: `**x` [E0381] | ^^^^ use of possibly uninitialized `**x` error[E0381]: borrow of possibly uninitialized variable: `**x` - --> $DIR/borrowck-uninit-ref-chain.rs:29:14 + --> $DIR/borrowck-uninit-ref-chain.rs:19:14 | LL | let _y = &**x; //[ast]~ ERROR use of possibly uninitialized variable: `**x` [E0381] | ^^^^ use of possibly uninitialized `**x` error[E0381]: borrow of possibly uninitialized variable: `a.y` - --> $DIR/borrowck-uninit-ref-chain.rs:46:14 + --> $DIR/borrowck-uninit-ref-chain.rs:36:14 | LL | let _b = &a.y; //[ast]~ ERROR use of possibly uninitialized variable: `a.y` [E0381] | ^^^^ use of possibly uninitialized `a.y` error[E0381]: borrow of possibly uninitialized variable: `**a.y` - --> $DIR/borrowck-uninit-ref-chain.rs:51:14 + --> $DIR/borrowck-uninit-ref-chain.rs:41:14 | LL | let _b = &**a.y; //[ast]~ ERROR use of possibly uninitialized variable: `**a.y` [E0381] | ^^^^^^ use of possibly uninitialized `**a.y` diff --git a/src/test/ui/borrowck/borrowck-uninit-ref-chain.rs b/src/test/ui/borrowck/borrowck-uninit-ref-chain.rs index c52b1f0bf64c0..7ac8ee2c00b5f 100644 --- a/src/test/ui/borrowck/borrowck-uninit-ref-chain.rs +++ b/src/test/ui/borrowck/borrowck-uninit-ref-chain.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/borrowck/borrowck-uninit.rs b/src/test/ui/borrowck/borrowck-uninit.rs index f4b73bc889fb7..71c1f596fa21b 100644 --- a/src/test/ui/borrowck/borrowck-uninit.rs +++ b/src/test/ui/borrowck/borrowck-uninit.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo(x: isize) { println!("{}", x); } fn main() { diff --git a/src/test/ui/borrowck/borrowck-uninit.stderr b/src/test/ui/borrowck/borrowck-uninit.stderr index ce78001dc64aa..5e3428e20b1fb 100644 --- a/src/test/ui/borrowck/borrowck-uninit.stderr +++ b/src/test/ui/borrowck/borrowck-uninit.stderr @@ -1,5 +1,5 @@ error[E0381]: use of possibly uninitialized variable: `x` - --> $DIR/borrowck-uninit.rs:15:9 + --> $DIR/borrowck-uninit.rs:5:9 | LL | foo(x); //~ ERROR use of possibly uninitialized variable: `x` | ^ use of possibly uninitialized `x` diff --git a/src/test/ui/borrowck/borrowck-union-borrow-nested.nll.stderr b/src/test/ui/borrowck/borrowck-union-borrow-nested.nll.stderr index eaba196f8ac7a..6bb6fc4cf29a1 100644 --- a/src/test/ui/borrowck/borrowck-union-borrow-nested.nll.stderr +++ b/src/test/ui/borrowck/borrowck-union-borrow-nested.nll.stderr @@ -1,5 +1,5 @@ error[E0503]: cannot use `u.c` because it was mutably borrowed - --> $DIR/borrowck-union-borrow-nested.rs:36:21 + --> $DIR/borrowck-union-borrow-nested.rs:24:21 | LL | let ra = &mut u.s.a; | ---------- borrow of `u.s.a` occurs here diff --git a/src/test/ui/borrowck/borrowck-union-borrow-nested.rs b/src/test/ui/borrowck/borrowck-union-borrow-nested.rs index 0839d2430a970..b3a6670fa4881 100644 --- a/src/test/ui/borrowck/borrowck-union-borrow-nested.rs +++ b/src/test/ui/borrowck/borrowck-union-borrow-nested.rs @@ -1,15 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - #[derive(Clone, Copy)] struct S { a: u8, diff --git a/src/test/ui/borrowck/borrowck-union-borrow-nested.stderr b/src/test/ui/borrowck/borrowck-union-borrow-nested.stderr index 8f90254469b59..199a13352c4a0 100644 --- a/src/test/ui/borrowck/borrowck-union-borrow-nested.stderr +++ b/src/test/ui/borrowck/borrowck-union-borrow-nested.stderr @@ -1,5 +1,5 @@ error[E0503]: cannot use `u.c` because it was mutably borrowed - --> $DIR/borrowck-union-borrow-nested.rs:36:17 + --> $DIR/borrowck-union-borrow-nested.rs:24:17 | LL | let ra = &mut u.s.a; | ----- borrow of `u.s.a` occurs here diff --git a/src/test/ui/borrowck/borrowck-union-borrow.ast.nll.stderr b/src/test/ui/borrowck/borrowck-union-borrow.ast.nll.stderr index 2f14826fa1253..0aa0e903138fe 100644 --- a/src/test/ui/borrowck/borrowck-union-borrow.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-union-borrow.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `u.a` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-union-borrow.rs:37:23 + --> $DIR/borrowck-union-borrow.rs:27:23 | LL | let ra = &u.a; | ---- immutable borrow occurs here @@ -10,7 +10,7 @@ LL | drop(ra); | -- borrow later used here error[E0506]: cannot assign to `u.a` because it is borrowed - --> $DIR/borrowck-union-borrow.rs:43:13 + --> $DIR/borrowck-union-borrow.rs:33:13 | LL | let ra = &u.a; | ---- borrow of `u.a` occurs here @@ -21,7 +21,7 @@ LL | drop(ra); | -- borrow later used here error[E0502]: cannot borrow `u.b` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-union-borrow.rs:60:23 + --> $DIR/borrowck-union-borrow.rs:50:23 | LL | let ra = &u.a; | ---- immutable borrow occurs here @@ -32,7 +32,7 @@ LL | drop(ra); | -- borrow later used here error[E0506]: cannot assign to `u.b` because it is borrowed - --> $DIR/borrowck-union-borrow.rs:66:13 + --> $DIR/borrowck-union-borrow.rs:56:13 | LL | let ra = &u.a; | ---- borrow of `u.b` occurs here @@ -43,7 +43,7 @@ LL | drop(ra); | -- borrow later used here error[E0502]: cannot borrow `u.a` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-union-borrow.rs:73:22 + --> $DIR/borrowck-union-borrow.rs:63:22 | LL | let rma = &mut u.a; | -------- mutable borrow occurs here @@ -54,7 +54,7 @@ LL | drop(rma); | --- borrow later used here error[E0503]: cannot use `u.a` because it was mutably borrowed - --> $DIR/borrowck-union-borrow.rs:79:21 + --> $DIR/borrowck-union-borrow.rs:69:21 | LL | let ra = &mut u.a; | -------- borrow of `u.a` occurs here @@ -65,7 +65,7 @@ LL | drop(ra); | -- borrow later used here error[E0499]: cannot borrow `u.a` as mutable more than once at a time - --> $DIR/borrowck-union-borrow.rs:85:24 + --> $DIR/borrowck-union-borrow.rs:75:24 | LL | let rma = &mut u.a; | -------- first mutable borrow occurs here @@ -76,7 +76,7 @@ LL | drop(rma); | --- borrow later used here error[E0506]: cannot assign to `u.a` because it is borrowed - --> $DIR/borrowck-union-borrow.rs:91:13 + --> $DIR/borrowck-union-borrow.rs:81:13 | LL | let rma = &mut u.a; | -------- borrow of `u.a` occurs here @@ -87,7 +87,7 @@ LL | drop(rma); | --- borrow later used here error[E0502]: cannot borrow `u.b` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-union-borrow.rs:98:22 + --> $DIR/borrowck-union-borrow.rs:88:22 | LL | let rma = &mut u.a; | -------- mutable borrow occurs here @@ -98,7 +98,7 @@ LL | drop(rma); | --- borrow later used here error[E0503]: cannot use `u.b` because it was mutably borrowed - --> $DIR/borrowck-union-borrow.rs:104:21 + --> $DIR/borrowck-union-borrow.rs:94:21 | LL | let ra = &mut u.a; | -------- borrow of `u.a` occurs here @@ -109,7 +109,7 @@ LL | drop(ra); | -- borrow later used here error[E0499]: cannot borrow `u.b` as mutable more than once at a time - --> $DIR/borrowck-union-borrow.rs:111:24 + --> $DIR/borrowck-union-borrow.rs:101:24 | LL | let rma = &mut u.a; | -------- first mutable borrow occurs here @@ -120,7 +120,7 @@ LL | drop(rma); | --- borrow later used here error[E0506]: cannot assign to `u.b` because it is borrowed - --> $DIR/borrowck-union-borrow.rs:117:13 + --> $DIR/borrowck-union-borrow.rs:107:13 | LL | let rma = &mut u.a; | -------- borrow of `u.b` occurs here diff --git a/src/test/ui/borrowck/borrowck-union-borrow.ast.stderr b/src/test/ui/borrowck/borrowck-union-borrow.ast.stderr index 9a02070579213..0f786b81d3a25 100644 --- a/src/test/ui/borrowck/borrowck-union-borrow.ast.stderr +++ b/src/test/ui/borrowck/borrowck-union-borrow.ast.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `u.a` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-union-borrow.rs:37:28 + --> $DIR/borrowck-union-borrow.rs:27:28 | LL | let ra = &u.a; | --- immutable borrow occurs here @@ -10,7 +10,7 @@ LL | } | - immutable borrow ends here error[E0506]: cannot assign to `u.a` because it is borrowed - --> $DIR/borrowck-union-borrow.rs:43:13 + --> $DIR/borrowck-union-borrow.rs:33:13 | LL | let ra = &u.a; | --- borrow of `u.a` occurs here @@ -18,7 +18,7 @@ LL | u.a = 1; //[ast]~ ERROR cannot assign to `u.a` because it is bo | ^^^^^^^ assignment to borrowed `u.a` occurs here error[E0502]: cannot borrow `u` (via `u.b`) as mutable because `u` is also borrowed as immutable (via `u.a`) - --> $DIR/borrowck-union-borrow.rs:60:28 + --> $DIR/borrowck-union-borrow.rs:50:28 | LL | let ra = &u.a; | --- immutable borrow occurs here (via `u.a`) @@ -29,7 +29,7 @@ LL | } | - immutable borrow ends here error[E0506]: cannot assign to `u.b` because it is borrowed - --> $DIR/borrowck-union-borrow.rs:66:13 + --> $DIR/borrowck-union-borrow.rs:56:13 | LL | let ra = &u.a; | --- borrow of `u.b` occurs here @@ -37,7 +37,7 @@ LL | u.b = 1; //[ast]~ ERROR cannot assign to `u.b` because it is bo | ^^^^^^^ assignment to borrowed `u.b` occurs here error[E0502]: cannot borrow `u.a` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-union-borrow.rs:73:23 + --> $DIR/borrowck-union-borrow.rs:63:23 | LL | let rma = &mut u.a; | --- mutable borrow occurs here @@ -48,7 +48,7 @@ LL | } | - mutable borrow ends here error[E0503]: cannot use `u.a` because it was mutably borrowed - --> $DIR/borrowck-union-borrow.rs:79:17 + --> $DIR/borrowck-union-borrow.rs:69:17 | LL | let ra = &mut u.a; | --- borrow of `u.a` occurs here @@ -56,7 +56,7 @@ LL | let a = u.a; //[ast]~ ERROR cannot use `u.a` because it was mut | ^ use of borrowed `u.a` error[E0499]: cannot borrow `u.a` as mutable more than once at a time - --> $DIR/borrowck-union-borrow.rs:85:29 + --> $DIR/borrowck-union-borrow.rs:75:29 | LL | let rma = &mut u.a; | --- first mutable borrow occurs here @@ -67,7 +67,7 @@ LL | } | - first borrow ends here error[E0506]: cannot assign to `u.a` because it is borrowed - --> $DIR/borrowck-union-borrow.rs:91:13 + --> $DIR/borrowck-union-borrow.rs:81:13 | LL | let rma = &mut u.a; | --- borrow of `u.a` occurs here @@ -75,7 +75,7 @@ LL | u.a = 1; //[ast]~ ERROR cannot assign to `u.a` because it is bo | ^^^^^^^ assignment to borrowed `u.a` occurs here error[E0502]: cannot borrow `u` (via `u.b`) as immutable because `u` is also borrowed as mutable (via `u.a`) - --> $DIR/borrowck-union-borrow.rs:98:23 + --> $DIR/borrowck-union-borrow.rs:88:23 | LL | let rma = &mut u.a; | --- mutable borrow occurs here (via `u.a`) @@ -86,7 +86,7 @@ LL | } | - mutable borrow ends here error[E0503]: cannot use `u.b` because it was mutably borrowed - --> $DIR/borrowck-union-borrow.rs:104:17 + --> $DIR/borrowck-union-borrow.rs:94:17 | LL | let ra = &mut u.a; | --- borrow of `u.a` occurs here @@ -94,7 +94,7 @@ LL | let b = u.b; //[ast]~ ERROR cannot use `u.b` because it was mut | ^ use of borrowed `u.a` error[E0499]: cannot borrow `u` (via `u.b`) as mutable more than once at a time - --> $DIR/borrowck-union-borrow.rs:111:29 + --> $DIR/borrowck-union-borrow.rs:101:29 | LL | let rma = &mut u.a; | --- first mutable borrow occurs here (via `u.a`) @@ -105,7 +105,7 @@ LL | } | - first borrow ends here error[E0506]: cannot assign to `u.b` because it is borrowed - --> $DIR/borrowck-union-borrow.rs:117:13 + --> $DIR/borrowck-union-borrow.rs:107:13 | LL | let rma = &mut u.a; | --- borrow of `u.b` occurs here diff --git a/src/test/ui/borrowck/borrowck-union-borrow.mir.stderr b/src/test/ui/borrowck/borrowck-union-borrow.mir.stderr index 2f14826fa1253..0aa0e903138fe 100644 --- a/src/test/ui/borrowck/borrowck-union-borrow.mir.stderr +++ b/src/test/ui/borrowck/borrowck-union-borrow.mir.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `u.a` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-union-borrow.rs:37:23 + --> $DIR/borrowck-union-borrow.rs:27:23 | LL | let ra = &u.a; | ---- immutable borrow occurs here @@ -10,7 +10,7 @@ LL | drop(ra); | -- borrow later used here error[E0506]: cannot assign to `u.a` because it is borrowed - --> $DIR/borrowck-union-borrow.rs:43:13 + --> $DIR/borrowck-union-borrow.rs:33:13 | LL | let ra = &u.a; | ---- borrow of `u.a` occurs here @@ -21,7 +21,7 @@ LL | drop(ra); | -- borrow later used here error[E0502]: cannot borrow `u.b` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-union-borrow.rs:60:23 + --> $DIR/borrowck-union-borrow.rs:50:23 | LL | let ra = &u.a; | ---- immutable borrow occurs here @@ -32,7 +32,7 @@ LL | drop(ra); | -- borrow later used here error[E0506]: cannot assign to `u.b` because it is borrowed - --> $DIR/borrowck-union-borrow.rs:66:13 + --> $DIR/borrowck-union-borrow.rs:56:13 | LL | let ra = &u.a; | ---- borrow of `u.b` occurs here @@ -43,7 +43,7 @@ LL | drop(ra); | -- borrow later used here error[E0502]: cannot borrow `u.a` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-union-borrow.rs:73:22 + --> $DIR/borrowck-union-borrow.rs:63:22 | LL | let rma = &mut u.a; | -------- mutable borrow occurs here @@ -54,7 +54,7 @@ LL | drop(rma); | --- borrow later used here error[E0503]: cannot use `u.a` because it was mutably borrowed - --> $DIR/borrowck-union-borrow.rs:79:21 + --> $DIR/borrowck-union-borrow.rs:69:21 | LL | let ra = &mut u.a; | -------- borrow of `u.a` occurs here @@ -65,7 +65,7 @@ LL | drop(ra); | -- borrow later used here error[E0499]: cannot borrow `u.a` as mutable more than once at a time - --> $DIR/borrowck-union-borrow.rs:85:24 + --> $DIR/borrowck-union-borrow.rs:75:24 | LL | let rma = &mut u.a; | -------- first mutable borrow occurs here @@ -76,7 +76,7 @@ LL | drop(rma); | --- borrow later used here error[E0506]: cannot assign to `u.a` because it is borrowed - --> $DIR/borrowck-union-borrow.rs:91:13 + --> $DIR/borrowck-union-borrow.rs:81:13 | LL | let rma = &mut u.a; | -------- borrow of `u.a` occurs here @@ -87,7 +87,7 @@ LL | drop(rma); | --- borrow later used here error[E0502]: cannot borrow `u.b` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-union-borrow.rs:98:22 + --> $DIR/borrowck-union-borrow.rs:88:22 | LL | let rma = &mut u.a; | -------- mutable borrow occurs here @@ -98,7 +98,7 @@ LL | drop(rma); | --- borrow later used here error[E0503]: cannot use `u.b` because it was mutably borrowed - --> $DIR/borrowck-union-borrow.rs:104:21 + --> $DIR/borrowck-union-borrow.rs:94:21 | LL | let ra = &mut u.a; | -------- borrow of `u.a` occurs here @@ -109,7 +109,7 @@ LL | drop(ra); | -- borrow later used here error[E0499]: cannot borrow `u.b` as mutable more than once at a time - --> $DIR/borrowck-union-borrow.rs:111:24 + --> $DIR/borrowck-union-borrow.rs:101:24 | LL | let rma = &mut u.a; | -------- first mutable borrow occurs here @@ -120,7 +120,7 @@ LL | drop(rma); | --- borrow later used here error[E0506]: cannot assign to `u.b` because it is borrowed - --> $DIR/borrowck-union-borrow.rs:117:13 + --> $DIR/borrowck-union-borrow.rs:107:13 | LL | let rma = &mut u.a; | -------- borrow of `u.b` occurs here diff --git a/src/test/ui/borrowck/borrowck-union-borrow.rs b/src/test/ui/borrowck/borrowck-union-borrow.rs index 97193bd019123..62647a2f5e85e 100644 --- a/src/test/ui/borrowck/borrowck-union-borrow.rs +++ b/src/test/ui/borrowck/borrowck-union-borrow.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/borrowck/borrowck-union-move-assign.nll.stderr b/src/test/ui/borrowck/borrowck-union-move-assign.nll.stderr index 2a877050e4c87..b2d59c5fe7dc6 100644 --- a/src/test/ui/borrowck/borrowck-union-move-assign.nll.stderr +++ b/src/test/ui/borrowck/borrowck-union-move-assign.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `u.a` - --> $DIR/borrowck-union-move-assign.rs:27:21 + --> $DIR/borrowck-union-move-assign.rs:17:21 | LL | let a = u.a; | --- value moved here @@ -9,7 +9,7 @@ LL | let a = u.a; //~ ERROR use of moved value: `u.a` = note: move occurs because `u` has type `U`, which does not implement the `Copy` trait error[E0382]: use of moved value: `u.a` - --> $DIR/borrowck-union-move-assign.rs:33:21 + --> $DIR/borrowck-union-move-assign.rs:23:21 | LL | let a = u.a; | --- value moved here @@ -20,7 +20,7 @@ LL | let a = u.a; // OK = note: move occurs because `u` has type `U`, which does not implement the `Copy` trait error[E0382]: use of moved value: `u.a` - --> $DIR/borrowck-union-move-assign.rs:39:21 + --> $DIR/borrowck-union-move-assign.rs:29:21 | LL | let a = u.a; | --- value moved here diff --git a/src/test/ui/borrowck/borrowck-union-move-assign.rs b/src/test/ui/borrowck/borrowck-union-move-assign.rs index d4d7bc6b0f7c5..1bb4325203610 100644 --- a/src/test/ui/borrowck/borrowck-union-move-assign.rs +++ b/src/test/ui/borrowck/borrowck-union-move-assign.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(untagged_unions)] // Non-copy diff --git a/src/test/ui/borrowck/borrowck-union-move-assign.stderr b/src/test/ui/borrowck/borrowck-union-move-assign.stderr index b0924d28c9c56..f304dc3a12427 100644 --- a/src/test/ui/borrowck/borrowck-union-move-assign.stderr +++ b/src/test/ui/borrowck/borrowck-union-move-assign.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `u.a` - --> $DIR/borrowck-union-move-assign.rs:27:17 + --> $DIR/borrowck-union-move-assign.rs:17:17 | LL | let a = u.a; | - value moved here diff --git a/src/test/ui/borrowck/borrowck-union-move.nll.stderr b/src/test/ui/borrowck/borrowck-union-move.nll.stderr index 6fd6a1c82a1a0..338ba0f7206db 100644 --- a/src/test/ui/borrowck/borrowck-union-move.nll.stderr +++ b/src/test/ui/borrowck/borrowck-union-move.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `u.n1` - --> $DIR/borrowck-union-move.rs:36:21 + --> $DIR/borrowck-union-move.rs:26:21 | LL | let a = u.n1; | ---- value moved here @@ -9,7 +9,7 @@ LL | let a = u.n1; //~ ERROR use of moved value: `u.n1` = note: move occurs because `u` has type `Unn`, which does not implement the `Copy` trait error[E0382]: use of moved value: `u` - --> $DIR/borrowck-union-move.rs:41:21 + --> $DIR/borrowck-union-move.rs:31:21 | LL | let a = u.n1; | ---- value moved here @@ -19,7 +19,7 @@ LL | let a = u; //~ ERROR use of partially moved value: `u` = note: move occurs because `u` has type `Unn`, which does not implement the `Copy` trait error[E0382]: use of moved value: `u.n2` - --> $DIR/borrowck-union-move.rs:46:21 + --> $DIR/borrowck-union-move.rs:36:21 | LL | let a = u.n1; | ---- value moved here @@ -29,7 +29,7 @@ LL | let a = u.n2; //~ ERROR use of moved value: `u.n2` = note: move occurs because `u` has type `Unn`, which does not implement the `Copy` trait error[E0382]: use of moved value: `u.n` - --> $DIR/borrowck-union-move.rs:73:21 + --> $DIR/borrowck-union-move.rs:63:21 | LL | let a = u.n; | --- value moved here @@ -39,7 +39,7 @@ LL | let a = u.n; //~ ERROR use of moved value: `u.n` = note: move occurs because `u` has type `Ucn`, which does not implement the `Copy` trait error[E0382]: use of moved value: `u.c` - --> $DIR/borrowck-union-move.rs:78:21 + --> $DIR/borrowck-union-move.rs:68:21 | LL | let a = u.n; | --- value moved here @@ -49,7 +49,7 @@ LL | let a = u.c; //~ ERROR use of moved value: `u.c` = note: move occurs because `u` has type `Ucn`, which does not implement the `Copy` trait error[E0382]: use of moved value: `u` - --> $DIR/borrowck-union-move.rs:93:21 + --> $DIR/borrowck-union-move.rs:83:21 | LL | let a = u.n; | --- value moved here diff --git a/src/test/ui/borrowck/borrowck-union-move.rs b/src/test/ui/borrowck/borrowck-union-move.rs index 5320244cf43b3..e2480604f29c7 100644 --- a/src/test/ui/borrowck/borrowck-union-move.rs +++ b/src/test/ui/borrowck/borrowck-union-move.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(untagged_unions)] #[derive(Clone, Copy)] diff --git a/src/test/ui/borrowck/borrowck-union-move.stderr b/src/test/ui/borrowck/borrowck-union-move.stderr index d3e441bbbf481..ebd8bdc69c023 100644 --- a/src/test/ui/borrowck/borrowck-union-move.stderr +++ b/src/test/ui/borrowck/borrowck-union-move.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `u.n1` - --> $DIR/borrowck-union-move.rs:36:17 + --> $DIR/borrowck-union-move.rs:26:17 | LL | let a = u.n1; | - value moved here @@ -9,7 +9,7 @@ LL | let a = u.n1; //~ ERROR use of moved value: `u.n1` = note: move occurs because `u.n1` has type `NonCopy`, which does not implement the `Copy` trait error[E0382]: use of partially moved value: `u` - --> $DIR/borrowck-union-move.rs:41:17 + --> $DIR/borrowck-union-move.rs:31:17 | LL | let a = u.n1; | - value moved here @@ -19,7 +19,7 @@ LL | let a = u; //~ ERROR use of partially moved value: `u` = note: move occurs because `u.n2` has type `[type error]`, which does not implement the `Copy` trait error[E0382]: use of moved value: `u.n2` - --> $DIR/borrowck-union-move.rs:46:17 + --> $DIR/borrowck-union-move.rs:36:17 | LL | let a = u.n1; | - value moved here @@ -29,7 +29,7 @@ LL | let a = u.n2; //~ ERROR use of moved value: `u.n2` = note: move occurs because `u.n2` has type `[type error]`, which does not implement the `Copy` trait error[E0382]: use of moved value: `u.n` - --> $DIR/borrowck-union-move.rs:73:17 + --> $DIR/borrowck-union-move.rs:63:17 | LL | let a = u.n; | - value moved here @@ -39,7 +39,7 @@ LL | let a = u.n; //~ ERROR use of moved value: `u.n` = note: move occurs because `u.n` has type `NonCopy`, which does not implement the `Copy` trait error[E0382]: use of moved value: `u.c` - --> $DIR/borrowck-union-move.rs:78:17 + --> $DIR/borrowck-union-move.rs:68:17 | LL | let a = u.n; | - value moved here @@ -49,7 +49,7 @@ LL | let a = u.c; //~ ERROR use of moved value: `u.c` = note: move occurs because `u.c` has type `[type error]`, which does not implement the `Copy` trait error[E0382]: use of partially moved value: `u` - --> $DIR/borrowck-union-move.rs:93:17 + --> $DIR/borrowck-union-move.rs:83:17 | LL | let a = u.n; | - value moved here diff --git a/src/test/ui/borrowck/borrowck-union-uninitialized.nll.stderr b/src/test/ui/borrowck/borrowck-union-uninitialized.nll.stderr index 49bc6d3263660..f5802772631ea 100644 --- a/src/test/ui/borrowck/borrowck-union-uninitialized.nll.stderr +++ b/src/test/ui/borrowck/borrowck-union-uninitialized.nll.stderr @@ -1,5 +1,5 @@ error[E0381]: use of possibly uninitialized variable: `u.a` - --> $DIR/borrowck-union-uninitialized.rs:26:18 + --> $DIR/borrowck-union-uninitialized.rs:16:18 | LL | let ua = u.a; //~ ERROR use of possibly uninitialized variable: `u.a` | ^^^ use of possibly uninitialized `u.a` diff --git a/src/test/ui/borrowck/borrowck-union-uninitialized.rs b/src/test/ui/borrowck/borrowck-union-uninitialized.rs index 81376a1a169d4..e7d456ea746cf 100644 --- a/src/test/ui/borrowck/borrowck-union-uninitialized.rs +++ b/src/test/ui/borrowck/borrowck-union-uninitialized.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S { a: u8, } diff --git a/src/test/ui/borrowck/borrowck-union-uninitialized.stderr b/src/test/ui/borrowck/borrowck-union-uninitialized.stderr index 901d1ecc50642..c8b22dd1c9efd 100644 --- a/src/test/ui/borrowck/borrowck-union-uninitialized.stderr +++ b/src/test/ui/borrowck/borrowck-union-uninitialized.stderr @@ -1,11 +1,11 @@ error[E0381]: use of possibly uninitialized variable: `s.a` - --> $DIR/borrowck-union-uninitialized.rs:25:13 + --> $DIR/borrowck-union-uninitialized.rs:15:13 | LL | let sa = s.a; //~ ERROR use of possibly uninitialized variable: `s.a` | ^^ use of possibly uninitialized `s.a` error[E0381]: use of possibly uninitialized variable: `u.a` - --> $DIR/borrowck-union-uninitialized.rs:26:13 + --> $DIR/borrowck-union-uninitialized.rs:16:13 | LL | let ua = u.a; //~ ERROR use of possibly uninitialized variable: `u.a` | ^^ use of possibly uninitialized `u.a` diff --git a/src/test/ui/borrowck/borrowck-uniq-via-lend.nll.stderr b/src/test/ui/borrowck/borrowck-uniq-via-lend.nll.stderr index a918550fabfc1..25d4f5426ebe8 100644 --- a/src/test/ui/borrowck/borrowck-uniq-via-lend.nll.stderr +++ b/src/test/ui/borrowck/borrowck-uniq-via-lend.nll.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `*v` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-uniq-via-lend.rs:46:12 + --> $DIR/borrowck-uniq-via-lend.rs:36:12 | LL | let w = &mut v; | ------ mutable borrow occurs here @@ -9,7 +9,7 @@ LL | w.use_mut(); | - borrow later used here error[E0502]: cannot borrow `*v` as immutable because it is also borrowed as mutable - --> $DIR/borrowck-uniq-via-lend.rs:63:12 + --> $DIR/borrowck-uniq-via-lend.rs:53:12 | LL | x = &mut v; | ------ mutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-uniq-via-lend.rs b/src/test/ui/borrowck/borrowck-uniq-via-lend.rs index 6fbadc9be25d2..f62880788edb7 100644 --- a/src/test/ui/borrowck/borrowck-uniq-via-lend.rs +++ b/src/test/ui/borrowck/borrowck-uniq-via-lend.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] diff --git a/src/test/ui/borrowck/borrowck-uniq-via-lend.stderr b/src/test/ui/borrowck/borrowck-uniq-via-lend.stderr index 00b4344018396..14a9551acc6ea 100644 --- a/src/test/ui/borrowck/borrowck-uniq-via-lend.stderr +++ b/src/test/ui/borrowck/borrowck-uniq-via-lend.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `*v` as immutable because `v` is also borrowed as mutable - --> $DIR/borrowck-uniq-via-lend.rs:46:13 + --> $DIR/borrowck-uniq-via-lend.rs:36:13 | LL | let w = &mut v; | - mutable borrow occurs here @@ -10,7 +10,7 @@ LL | } | - mutable borrow ends here error[E0502]: cannot borrow `*v` as immutable because `v` is also borrowed as mutable - --> $DIR/borrowck-uniq-via-lend.rs:63:13 + --> $DIR/borrowck-uniq-via-lend.rs:53:13 | LL | x = &mut v; | - mutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-use-in-index-lvalue.ast.nll.stderr b/src/test/ui/borrowck/borrowck-use-in-index-lvalue.ast.nll.stderr index d69693eb03532..54cba779030e5 100644 --- a/src/test/ui/borrowck/borrowck-use-in-index-lvalue.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-use-in-index-lvalue.ast.nll.stderr @@ -1,11 +1,11 @@ error[E0381]: use of possibly uninitialized variable: `*w` - --> $DIR/borrowck-use-in-index-lvalue.rs:16:5 + --> $DIR/borrowck-use-in-index-lvalue.rs:6:5 | LL | w[5] = 0; //[ast]~ ERROR use of possibly uninitialized variable: `*w` [E0381] | ^^^^ use of possibly uninitialized `*w` error[E0381]: use of possibly uninitialized variable: `*w` - --> $DIR/borrowck-use-in-index-lvalue.rs:20:5 + --> $DIR/borrowck-use-in-index-lvalue.rs:10:5 | LL | w[5] = 0; //[ast]~ ERROR use of possibly uninitialized variable: `*w` [E0381] | ^^^^ use of possibly uninitialized `*w` diff --git a/src/test/ui/borrowck/borrowck-use-in-index-lvalue.ast.stderr b/src/test/ui/borrowck/borrowck-use-in-index-lvalue.ast.stderr index 3a33081dfcdd2..abe515788292b 100644 --- a/src/test/ui/borrowck/borrowck-use-in-index-lvalue.ast.stderr +++ b/src/test/ui/borrowck/borrowck-use-in-index-lvalue.ast.stderr @@ -1,11 +1,11 @@ error[E0381]: use of possibly uninitialized variable: `*w` - --> $DIR/borrowck-use-in-index-lvalue.rs:16:5 + --> $DIR/borrowck-use-in-index-lvalue.rs:6:5 | LL | w[5] = 0; //[ast]~ ERROR use of possibly uninitialized variable: `*w` [E0381] | ^^^^^^^^ use of possibly uninitialized `*w` error[E0381]: use of possibly uninitialized variable: `*w` - --> $DIR/borrowck-use-in-index-lvalue.rs:20:5 + --> $DIR/borrowck-use-in-index-lvalue.rs:10:5 | LL | w[5] = 0; //[ast]~ ERROR use of possibly uninitialized variable: `*w` [E0381] | ^^^^^^^^ use of possibly uninitialized `*w` diff --git a/src/test/ui/borrowck/borrowck-use-in-index-lvalue.mir.stderr b/src/test/ui/borrowck/borrowck-use-in-index-lvalue.mir.stderr index d69693eb03532..54cba779030e5 100644 --- a/src/test/ui/borrowck/borrowck-use-in-index-lvalue.mir.stderr +++ b/src/test/ui/borrowck/borrowck-use-in-index-lvalue.mir.stderr @@ -1,11 +1,11 @@ error[E0381]: use of possibly uninitialized variable: `*w` - --> $DIR/borrowck-use-in-index-lvalue.rs:16:5 + --> $DIR/borrowck-use-in-index-lvalue.rs:6:5 | LL | w[5] = 0; //[ast]~ ERROR use of possibly uninitialized variable: `*w` [E0381] | ^^^^ use of possibly uninitialized `*w` error[E0381]: use of possibly uninitialized variable: `*w` - --> $DIR/borrowck-use-in-index-lvalue.rs:20:5 + --> $DIR/borrowck-use-in-index-lvalue.rs:10:5 | LL | w[5] = 0; //[ast]~ ERROR use of possibly uninitialized variable: `*w` [E0381] | ^^^^ use of possibly uninitialized `*w` diff --git a/src/test/ui/borrowck/borrowck-use-in-index-lvalue.rs b/src/test/ui/borrowck/borrowck-use-in-index-lvalue.rs index eb99f78f461f4..f953dec444ab9 100644 --- a/src/test/ui/borrowck/borrowck-use-in-index-lvalue.rs +++ b/src/test/ui/borrowck/borrowck-use-in-index-lvalue.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/borrowck/borrowck-use-mut-borrow.nll.stderr b/src/test/ui/borrowck/borrowck-use-mut-borrow.nll.stderr index 2289dd688cfd7..e7b972fb0141a 100644 --- a/src/test/ui/borrowck/borrowck-use-mut-borrow.nll.stderr +++ b/src/test/ui/borrowck/borrowck-use-mut-borrow.nll.stderr @@ -1,5 +1,5 @@ error[E0503]: cannot use `x` because it was mutably borrowed - --> $DIR/borrowck-use-mut-borrow.rs:21:10 + --> $DIR/borrowck-use-mut-borrow.rs:11:10 | LL | let p = &mut x; | ------ borrow of `x` occurs here @@ -9,7 +9,7 @@ LL | *p = 2; | ------ borrow later used here error[E0503]: cannot use `x` because it was mutably borrowed - --> $DIR/borrowck-use-mut-borrow.rs:28:10 + --> $DIR/borrowck-use-mut-borrow.rs:18:10 | LL | let p = &mut x.a; | -------- borrow of `x.a` occurs here @@ -19,7 +19,7 @@ LL | *p = 3; | ------ borrow later used here error[E0503]: cannot use `x.a` because it was mutably borrowed - --> $DIR/borrowck-use-mut-borrow.rs:35:10 + --> $DIR/borrowck-use-mut-borrow.rs:25:10 | LL | let p = &mut x; | ------ borrow of `x` occurs here @@ -29,7 +29,7 @@ LL | p.a = 3; | ------- borrow later used here error[E0503]: cannot use `x.a` because it was mutably borrowed - --> $DIR/borrowck-use-mut-borrow.rs:42:10 + --> $DIR/borrowck-use-mut-borrow.rs:32:10 | LL | let p = &mut x.a; | -------- borrow of `x.a` occurs here @@ -39,7 +39,7 @@ LL | *p = 3; | ------ borrow later used here error[E0503]: cannot use `x.a` because it was mutably borrowed - --> $DIR/borrowck-use-mut-borrow.rs:49:13 + --> $DIR/borrowck-use-mut-borrow.rs:39:13 | LL | let p = &mut x; | ------ borrow of `x` occurs here @@ -50,7 +50,7 @@ LL | p.a = 4; | ------- borrow later used here error[E0503]: cannot use `x.a` because it was mutably borrowed - --> $DIR/borrowck-use-mut-borrow.rs:57:13 + --> $DIR/borrowck-use-mut-borrow.rs:47:13 | LL | let p = &mut x.a; | -------- borrow of `x.a` occurs here @@ -61,7 +61,7 @@ LL | *p = 4; | ------ borrow later used here error[E0503]: cannot use `*x` because it was mutably borrowed - --> $DIR/borrowck-use-mut-borrow.rs:65:10 + --> $DIR/borrowck-use-mut-borrow.rs:55:10 | LL | let p = &mut x; | ------ borrow of `x` occurs here @@ -71,7 +71,7 @@ LL | **p = 2; | ------- borrow later used here error[E0503]: cannot use `*x.b` because it was mutably borrowed - --> $DIR/borrowck-use-mut-borrow.rs:72:10 + --> $DIR/borrowck-use-mut-borrow.rs:62:10 | LL | let p = &mut x; | ------ borrow of `x` occurs here @@ -81,7 +81,7 @@ LL | p.a = 3; | ------- borrow later used here error[E0503]: cannot use `*x.b` because it was mutably borrowed - --> $DIR/borrowck-use-mut-borrow.rs:79:10 + --> $DIR/borrowck-use-mut-borrow.rs:69:10 | LL | let p = &mut x.b; | -------- borrow of `x.b` occurs here diff --git a/src/test/ui/borrowck/borrowck-use-mut-borrow.rs b/src/test/ui/borrowck/borrowck-use-mut-borrow.rs index c11e58651aa76..95b165d6ef22f 100644 --- a/src/test/ui/borrowck/borrowck-use-mut-borrow.rs +++ b/src/test/ui/borrowck/borrowck-use-mut-borrow.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] #[derive(Copy, Clone)] diff --git a/src/test/ui/borrowck/borrowck-use-mut-borrow.stderr b/src/test/ui/borrowck/borrowck-use-mut-borrow.stderr index c5bfd813a791e..b6b09f008a4e0 100644 --- a/src/test/ui/borrowck/borrowck-use-mut-borrow.stderr +++ b/src/test/ui/borrowck/borrowck-use-mut-borrow.stderr @@ -1,5 +1,5 @@ error[E0503]: cannot use `x` because it was mutably borrowed - --> $DIR/borrowck-use-mut-borrow.rs:21:10 + --> $DIR/borrowck-use-mut-borrow.rs:11:10 | LL | let p = &mut x; | - borrow of `x` occurs here @@ -7,7 +7,7 @@ LL | drop(x); //~ ERROR cannot use `x` because it was mutably borrowed | ^ use of borrowed `x` error[E0503]: cannot use `x` because it was mutably borrowed - --> $DIR/borrowck-use-mut-borrow.rs:28:10 + --> $DIR/borrowck-use-mut-borrow.rs:18:10 | LL | let p = &mut x.a; | --- borrow of `x.a` occurs here @@ -15,7 +15,7 @@ LL | drop(x); //~ ERROR cannot use `x` because it was mutably borrowed | ^ use of borrowed `x.a` error[E0503]: cannot use `x.a` because it was mutably borrowed - --> $DIR/borrowck-use-mut-borrow.rs:35:10 + --> $DIR/borrowck-use-mut-borrow.rs:25:10 | LL | let p = &mut x; | - borrow of `x` occurs here @@ -23,7 +23,7 @@ LL | drop(x.a); //~ ERROR cannot use `x.a` because it was mutably borrowed | ^^^ use of borrowed `x` error[E0503]: cannot use `x.a` because it was mutably borrowed - --> $DIR/borrowck-use-mut-borrow.rs:42:10 + --> $DIR/borrowck-use-mut-borrow.rs:32:10 | LL | let p = &mut x.a; | --- borrow of `x.a` occurs here @@ -31,7 +31,7 @@ LL | drop(x.a); //~ ERROR cannot use `x.a` because it was mutably borrowed | ^^^ use of borrowed `x.a` error[E0503]: cannot use `x.a` because it was mutably borrowed - --> $DIR/borrowck-use-mut-borrow.rs:49:26 + --> $DIR/borrowck-use-mut-borrow.rs:39:26 | LL | let p = &mut x; | - borrow of `x` occurs here @@ -39,7 +39,7 @@ LL | let y = A { b: 3, .. x }; //~ ERROR cannot use `x.a` because it was mut | ^ use of borrowed `x` error[E0503]: cannot use `x.a` because it was mutably borrowed - --> $DIR/borrowck-use-mut-borrow.rs:57:26 + --> $DIR/borrowck-use-mut-borrow.rs:47:26 | LL | let p = &mut x.a; | --- borrow of `x.a` occurs here @@ -47,7 +47,7 @@ LL | let y = A { b: 3, .. x }; //~ ERROR cannot use `x.a` because it was mut | ^ use of borrowed `x.a` error[E0503]: cannot use `*x` because it was mutably borrowed - --> $DIR/borrowck-use-mut-borrow.rs:65:10 + --> $DIR/borrowck-use-mut-borrow.rs:55:10 | LL | let p = &mut x; | - borrow of `x` occurs here @@ -55,7 +55,7 @@ LL | drop(*x); //~ ERROR cannot use `*x` because it was mutably borrowed | ^^ use of borrowed `x` error[E0503]: cannot use `*x.b` because it was mutably borrowed - --> $DIR/borrowck-use-mut-borrow.rs:72:10 + --> $DIR/borrowck-use-mut-borrow.rs:62:10 | LL | let p = &mut x; | - borrow of `x` occurs here @@ -63,7 +63,7 @@ LL | drop(*x.b); //~ ERROR cannot use `*x.b` because it was mutably borrowed | ^^^^ use of borrowed `x` error[E0503]: cannot use `*x.b` because it was mutably borrowed - --> $DIR/borrowck-use-mut-borrow.rs:79:10 + --> $DIR/borrowck-use-mut-borrow.rs:69:10 | LL | let p = &mut x.b; | --- borrow of `x.b` occurs here diff --git a/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast-trait.ast.nll.stderr b/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast-trait.ast.nll.stderr index b96379db650bb..69a9ed359dc87 100644 --- a/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast-trait.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast-trait.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0381]: borrow of possibly uninitialized variable: `*x` - --> $DIR/borrowck-use-uninitialized-in-cast-trait.rs:22:13 + --> $DIR/borrowck-use-uninitialized-in-cast-trait.rs:12:13 | LL | let y = x as *const Foo; //[ast]~ ERROR use of possibly uninitialized variable: `*x` | ^ use of possibly uninitialized `*x` diff --git a/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast-trait.ast.stderr b/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast-trait.ast.stderr index 47ea9f33b1e25..ecb8922ff8df8 100644 --- a/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast-trait.ast.stderr +++ b/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast-trait.ast.stderr @@ -1,5 +1,5 @@ error[E0381]: use of possibly uninitialized variable: `*x` - --> $DIR/borrowck-use-uninitialized-in-cast-trait.rs:22:13 + --> $DIR/borrowck-use-uninitialized-in-cast-trait.rs:12:13 | LL | let y = x as *const Foo; //[ast]~ ERROR use of possibly uninitialized variable: `*x` | ^ use of possibly uninitialized `*x` diff --git a/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast-trait.mir.stderr b/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast-trait.mir.stderr index b96379db650bb..69a9ed359dc87 100644 --- a/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast-trait.mir.stderr +++ b/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast-trait.mir.stderr @@ -1,5 +1,5 @@ error[E0381]: borrow of possibly uninitialized variable: `*x` - --> $DIR/borrowck-use-uninitialized-in-cast-trait.rs:22:13 + --> $DIR/borrowck-use-uninitialized-in-cast-trait.rs:12:13 | LL | let y = x as *const Foo; //[ast]~ ERROR use of possibly uninitialized variable: `*x` | ^ use of possibly uninitialized `*x` diff --git a/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast-trait.rs b/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast-trait.rs index 57c2d508356bc..518228a50ff56 100644 --- a/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast-trait.rs +++ b/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast-trait.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast.ast.nll.stderr b/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast.ast.nll.stderr index 6eddbd934d54e..158465834735d 100644 --- a/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0381]: borrow of possibly uninitialized variable: `*x` - --> $DIR/borrowck-use-uninitialized-in-cast.rs:20:13 + --> $DIR/borrowck-use-uninitialized-in-cast.rs:10:13 | LL | let y = x as *const i32; //[ast]~ ERROR use of possibly uninitialized variable: `*x` [E0381] | ^ use of possibly uninitialized `*x` diff --git a/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast.ast.stderr b/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast.ast.stderr index 75109abad51f1..d3ddf24d22dd1 100644 --- a/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast.ast.stderr +++ b/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast.ast.stderr @@ -1,5 +1,5 @@ error[E0381]: use of possibly uninitialized variable: `*x` - --> $DIR/borrowck-use-uninitialized-in-cast.rs:20:13 + --> $DIR/borrowck-use-uninitialized-in-cast.rs:10:13 | LL | let y = x as *const i32; //[ast]~ ERROR use of possibly uninitialized variable: `*x` [E0381] | ^ use of possibly uninitialized `*x` diff --git a/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast.mir.stderr b/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast.mir.stderr index 6eddbd934d54e..158465834735d 100644 --- a/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast.mir.stderr +++ b/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast.mir.stderr @@ -1,5 +1,5 @@ error[E0381]: borrow of possibly uninitialized variable: `*x` - --> $DIR/borrowck-use-uninitialized-in-cast.rs:20:13 + --> $DIR/borrowck-use-uninitialized-in-cast.rs:10:13 | LL | let y = x as *const i32; //[ast]~ ERROR use of possibly uninitialized variable: `*x` [E0381] | ^ use of possibly uninitialized `*x` diff --git a/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast.rs b/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast.rs index dbc20d020577e..e15479bde283d 100644 --- a/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast.rs +++ b/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/borrowck/borrowck-vec-pattern-element-loan.nll.stderr b/src/test/ui/borrowck/borrowck-vec-pattern-element-loan.nll.stderr index 374256c6bd6b9..64e89e4d43df1 100644 --- a/src/test/ui/borrowck/borrowck-vec-pattern-element-loan.nll.stderr +++ b/src/test/ui/borrowck/borrowck-vec-pattern-element-loan.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `vec` does not live long enough - --> $DIR/borrowck-vec-pattern-element-loan.rs:15:25 + --> $DIR/borrowck-vec-pattern-element-loan.rs:5:25 | LL | let vec: &[isize] = &vec; //~ ERROR does not live long enough | ^^^^ borrowed value does not live long enough @@ -7,14 +7,14 @@ LL | let vec: &[isize] = &vec; //~ ERROR does not live long enough LL | } | - `vec` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 13:6... - --> $DIR/borrowck-vec-pattern-element-loan.rs:13:6 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 3:6... + --> $DIR/borrowck-vec-pattern-element-loan.rs:3:6 | LL | fn a<'a>() -> &'a [isize] { | ^^ error[E0597]: `vec` does not live long enough - --> $DIR/borrowck-vec-pattern-element-loan.rs:25:25 + --> $DIR/borrowck-vec-pattern-element-loan.rs:15:25 | LL | let vec: &[isize] = &vec; //~ ERROR does not live long enough | ^^^^ borrowed value does not live long enough @@ -22,14 +22,14 @@ LL | let vec: &[isize] = &vec; //~ ERROR does not live long enough LL | } | - `vec` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 23:6... - --> $DIR/borrowck-vec-pattern-element-loan.rs:23:6 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 13:6... + --> $DIR/borrowck-vec-pattern-element-loan.rs:13:6 | LL | fn b<'a>() -> &'a [isize] { | ^^ error[E0597]: `vec` does not live long enough - --> $DIR/borrowck-vec-pattern-element-loan.rs:35:25 + --> $DIR/borrowck-vec-pattern-element-loan.rs:25:25 | LL | let vec: &[isize] = &vec; //~ ERROR does not live long enough | ^^^^ borrowed value does not live long enough @@ -37,8 +37,8 @@ LL | let vec: &[isize] = &vec; //~ ERROR does not live long enough LL | } | - `vec` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 33:6... - --> $DIR/borrowck-vec-pattern-element-loan.rs:33:6 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 23:6... + --> $DIR/borrowck-vec-pattern-element-loan.rs:23:6 | LL | fn c<'a>() -> &'a [isize] { | ^^ diff --git a/src/test/ui/borrowck/borrowck-vec-pattern-element-loan.rs b/src/test/ui/borrowck/borrowck-vec-pattern-element-loan.rs index 0fd6923326ab3..0de5132466bfb 100644 --- a/src/test/ui/borrowck/borrowck-vec-pattern-element-loan.rs +++ b/src/test/ui/borrowck/borrowck-vec-pattern-element-loan.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(slice_patterns)] fn a<'a>() -> &'a [isize] { diff --git a/src/test/ui/borrowck/borrowck-vec-pattern-element-loan.stderr b/src/test/ui/borrowck/borrowck-vec-pattern-element-loan.stderr index 656a25d14fc94..b2fcb2f8cd1b7 100644 --- a/src/test/ui/borrowck/borrowck-vec-pattern-element-loan.stderr +++ b/src/test/ui/borrowck/borrowck-vec-pattern-element-loan.stderr @@ -1,5 +1,5 @@ error[E0597]: `vec` does not live long enough - --> $DIR/borrowck-vec-pattern-element-loan.rs:15:26 + --> $DIR/borrowck-vec-pattern-element-loan.rs:5:26 | LL | let vec: &[isize] = &vec; //~ ERROR does not live long enough | ^^^ borrowed value does not live long enough @@ -7,14 +7,14 @@ LL | let vec: &[isize] = &vec; //~ ERROR does not live long enough LL | } | - borrowed value only lives until here | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 13:6... - --> $DIR/borrowck-vec-pattern-element-loan.rs:13:6 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 3:6... + --> $DIR/borrowck-vec-pattern-element-loan.rs:3:6 | LL | fn a<'a>() -> &'a [isize] { | ^^ error[E0597]: `vec` does not live long enough - --> $DIR/borrowck-vec-pattern-element-loan.rs:25:26 + --> $DIR/borrowck-vec-pattern-element-loan.rs:15:26 | LL | let vec: &[isize] = &vec; //~ ERROR does not live long enough | ^^^ borrowed value does not live long enough @@ -22,14 +22,14 @@ LL | let vec: &[isize] = &vec; //~ ERROR does not live long enough LL | } | - borrowed value only lives until here | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 23:6... - --> $DIR/borrowck-vec-pattern-element-loan.rs:23:6 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 13:6... + --> $DIR/borrowck-vec-pattern-element-loan.rs:13:6 | LL | fn b<'a>() -> &'a [isize] { | ^^ error[E0597]: `vec` does not live long enough - --> $DIR/borrowck-vec-pattern-element-loan.rs:35:26 + --> $DIR/borrowck-vec-pattern-element-loan.rs:25:26 | LL | let vec: &[isize] = &vec; //~ ERROR does not live long enough | ^^^ borrowed value does not live long enough @@ -37,8 +37,8 @@ LL | let vec: &[isize] = &vec; //~ ERROR does not live long enough LL | } | - borrowed value only lives until here | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 33:6... - --> $DIR/borrowck-vec-pattern-element-loan.rs:33:6 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 23:6... + --> $DIR/borrowck-vec-pattern-element-loan.rs:23:6 | LL | fn c<'a>() -> &'a [isize] { | ^^ diff --git a/src/test/ui/borrowck/borrowck-vec-pattern-loan-from-mut.nll.stderr b/src/test/ui/borrowck/borrowck-vec-pattern-loan-from-mut.nll.stderr index 9b73991ce30d8..a1d0cc8120e95 100644 --- a/src/test/ui/borrowck/borrowck-vec-pattern-loan-from-mut.nll.stderr +++ b/src/test/ui/borrowck/borrowck-vec-pattern-loan-from-mut.nll.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `v` as mutable more than once at a time - --> $DIR/borrowck-vec-pattern-loan-from-mut.rs:18:13 + --> $DIR/borrowck-vec-pattern-loan-from-mut.rs:8:13 | LL | let vb: &mut [isize] = &mut v; | ------ first mutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-vec-pattern-loan-from-mut.rs b/src/test/ui/borrowck/borrowck-vec-pattern-loan-from-mut.rs index 505c8c6d53581..4d99a92b18ba8 100644 --- a/src/test/ui/borrowck/borrowck-vec-pattern-loan-from-mut.rs +++ b/src/test/ui/borrowck/borrowck-vec-pattern-loan-from-mut.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(slice_patterns)] fn a() { diff --git a/src/test/ui/borrowck/borrowck-vec-pattern-loan-from-mut.stderr b/src/test/ui/borrowck/borrowck-vec-pattern-loan-from-mut.stderr index 7015923af0aaa..caadcb3611545 100644 --- a/src/test/ui/borrowck/borrowck-vec-pattern-loan-from-mut.stderr +++ b/src/test/ui/borrowck/borrowck-vec-pattern-loan-from-mut.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `v` as mutable more than once at a time - --> $DIR/borrowck-vec-pattern-loan-from-mut.rs:18:13 + --> $DIR/borrowck-vec-pattern-loan-from-mut.rs:8:13 | LL | let vb: &mut [isize] = &mut v; | - first mutable borrow occurs here diff --git a/src/test/ui/borrowck/borrowck-vec-pattern-move-tail.ast.nll.stderr b/src/test/ui/borrowck/borrowck-vec-pattern-move-tail.ast.nll.stderr index f99e2cec33028..9577a41bb182e 100644 --- a/src/test/ui/borrowck/borrowck-vec-pattern-move-tail.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-vec-pattern-move-tail.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `a[..]` because it is borrowed - --> $DIR/borrowck-vec-pattern-move-tail.rs:24:5 + --> $DIR/borrowck-vec-pattern-move-tail.rs:16:5 | LL | [1, 2, ref tail..] => tail, | -------- borrow of `a[..]` occurs here diff --git a/src/test/ui/borrowck/borrowck-vec-pattern-move-tail.ast.stderr b/src/test/ui/borrowck/borrowck-vec-pattern-move-tail.ast.stderr index 2b32de6944a4c..c456dac316db8 100644 --- a/src/test/ui/borrowck/borrowck-vec-pattern-move-tail.ast.stderr +++ b/src/test/ui/borrowck/borrowck-vec-pattern-move-tail.ast.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `a[..]` because it is borrowed - --> $DIR/borrowck-vec-pattern-move-tail.rs:24:5 + --> $DIR/borrowck-vec-pattern-move-tail.rs:16:5 | LL | [1, 2, ref tail..] => tail, | -------- borrow of `a[..]` occurs here diff --git a/src/test/ui/borrowck/borrowck-vec-pattern-move-tail.cmp.stderr b/src/test/ui/borrowck/borrowck-vec-pattern-move-tail.cmp.stderr index a6aa9cd6d2a13..0e4a3cd6c1b50 100644 --- a/src/test/ui/borrowck/borrowck-vec-pattern-move-tail.cmp.stderr +++ b/src/test/ui/borrowck/borrowck-vec-pattern-move-tail.cmp.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `a[..]` because it is borrowed (Ast) - --> $DIR/borrowck-vec-pattern-move-tail.rs:24:5 + --> $DIR/borrowck-vec-pattern-move-tail.rs:16:5 | LL | [1, 2, ref tail..] => tail, | -------- borrow of `a[..]` occurs here @@ -8,7 +8,7 @@ LL | a[2] = 0; //[ast]~ ERROR cannot assign to `a[..]` because it is borrowe | ^^^^^^^^ assignment to borrowed `a[..]` occurs here error[E0506]: cannot assign to `a[..]` because it is borrowed (Mir) - --> $DIR/borrowck-vec-pattern-move-tail.rs:24:5 + --> $DIR/borrowck-vec-pattern-move-tail.rs:16:5 | LL | [1, 2, ref tail..] => tail, | -------- borrow of `a[..]` occurs here diff --git a/src/test/ui/borrowck/borrowck-vec-pattern-move-tail.rs b/src/test/ui/borrowck/borrowck-vec-pattern-move-tail.rs index 94877b27d5888..540f9333bc063 100644 --- a/src/test/ui/borrowck/borrowck-vec-pattern-move-tail.rs +++ b/src/test/ui/borrowck/borrowck-vec-pattern-move-tail.rs @@ -1,13 +1,5 @@ - -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // revisions: ast cmp //[cmp]compile-flags: -Z borrowck=compare diff --git a/src/test/ui/borrowck/borrowck-vec-pattern-nesting.nll.stderr b/src/test/ui/borrowck/borrowck-vec-pattern-nesting.nll.stderr index d5b17119d85f5..6a3c051e34989 100644 --- a/src/test/ui/borrowck/borrowck-vec-pattern-nesting.nll.stderr +++ b/src/test/ui/borrowck/borrowck-vec-pattern-nesting.nll.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `vec[..]` because it is borrowed - --> $DIR/borrowck-vec-pattern-nesting.rs:20:13 + --> $DIR/borrowck-vec-pattern-nesting.rs:10:13 | LL | [box ref _a, _, _] => { | ------ borrow of `vec[..]` occurs here @@ -11,7 +11,7 @@ LL | _a.use_ref(); | -- borrow later used here error[E0506]: cannot assign to `vec[..]` because it is borrowed - --> $DIR/borrowck-vec-pattern-nesting.rs:33:13 + --> $DIR/borrowck-vec-pattern-nesting.rs:23:13 | LL | &mut [ref _b..] => { | ------ borrow of `vec[..]` occurs here @@ -23,7 +23,7 @@ LL | _b.use_ref(); | -- borrow later used here error[E0508]: cannot move out of type `[std::boxed::Box]`, a non-copy slice - --> $DIR/borrowck-vec-pattern-nesting.rs:43:11 + --> $DIR/borrowck-vec-pattern-nesting.rs:33:11 | LL | match vec { | ^^^ cannot move out of here @@ -31,7 +31,7 @@ LL | &mut [_a, //~ ERROR cannot move out | -- data moved here | note: move occurs because `_a` has type `std::boxed::Box`, which does not implement the `Copy` trait - --> $DIR/borrowck-vec-pattern-nesting.rs:44:15 + --> $DIR/borrowck-vec-pattern-nesting.rs:34:15 | LL | &mut [_a, //~ ERROR cannot move out | ^^ @@ -45,7 +45,7 @@ LL | ] => { | error[E0508]: cannot move out of type `[std::boxed::Box]`, a non-copy slice - --> $DIR/borrowck-vec-pattern-nesting.rs:57:13 + --> $DIR/borrowck-vec-pattern-nesting.rs:47:13 | LL | let a = vec[0]; //~ ERROR cannot move out | ^^^^^^ @@ -54,7 +54,7 @@ LL | let a = vec[0]; //~ ERROR cannot move out | help: consider borrowing here: `&vec[0]` error[E0508]: cannot move out of type `[std::boxed::Box]`, a non-copy slice - --> $DIR/borrowck-vec-pattern-nesting.rs:64:11 + --> $DIR/borrowck-vec-pattern-nesting.rs:54:11 | LL | match vec { | ^^^ cannot move out of here @@ -63,7 +63,7 @@ LL | _b] => {} | -- data moved here | note: move occurs because `_b` has type `std::boxed::Box`, which does not implement the `Copy` trait - --> $DIR/borrowck-vec-pattern-nesting.rs:67:10 + --> $DIR/borrowck-vec-pattern-nesting.rs:57:10 | LL | _b] => {} | ^^ @@ -75,7 +75,7 @@ LL | _b] => {} | error[E0508]: cannot move out of type `[std::boxed::Box]`, a non-copy slice - --> $DIR/borrowck-vec-pattern-nesting.rs:70:13 + --> $DIR/borrowck-vec-pattern-nesting.rs:60:13 | LL | let a = vec[0]; //~ ERROR cannot move out | ^^^^^^ @@ -84,7 +84,7 @@ LL | let a = vec[0]; //~ ERROR cannot move out | help: consider borrowing here: `&vec[0]` error[E0508]: cannot move out of type `[std::boxed::Box]`, a non-copy slice - --> $DIR/borrowck-vec-pattern-nesting.rs:77:11 + --> $DIR/borrowck-vec-pattern-nesting.rs:67:11 | LL | match vec { | ^^^ cannot move out of here @@ -97,13 +97,13 @@ LL | &mut [_a, _b, _c] => {} //~ ERROR cannot move out | help: consider removing the `&mut`: `[_a, _b, _c]` | note: move occurs because these variables have types that don't implement the `Copy` trait - --> $DIR/borrowck-vec-pattern-nesting.rs:78:15 + --> $DIR/borrowck-vec-pattern-nesting.rs:68:15 | LL | &mut [_a, _b, _c] => {} //~ ERROR cannot move out | ^^ ^^ ^^ error[E0508]: cannot move out of type `[std::boxed::Box]`, a non-copy slice - --> $DIR/borrowck-vec-pattern-nesting.rs:82:13 + --> $DIR/borrowck-vec-pattern-nesting.rs:72:13 | LL | let a = vec[0]; //~ ERROR cannot move out | ^^^^^^ diff --git a/src/test/ui/borrowck/borrowck-vec-pattern-nesting.rs b/src/test/ui/borrowck/borrowck-vec-pattern-nesting.rs index 63dac0a83004a..46203b7a3deed 100644 --- a/src/test/ui/borrowck/borrowck-vec-pattern-nesting.rs +++ b/src/test/ui/borrowck/borrowck-vec-pattern-nesting.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_patterns)] #![feature(box_syntax)] #![feature(slice_patterns)] diff --git a/src/test/ui/borrowck/borrowck-vec-pattern-nesting.stderr b/src/test/ui/borrowck/borrowck-vec-pattern-nesting.stderr index a03e1eab7ad06..25825fea15877 100644 --- a/src/test/ui/borrowck/borrowck-vec-pattern-nesting.stderr +++ b/src/test/ui/borrowck/borrowck-vec-pattern-nesting.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `vec[..]` because it is borrowed - --> $DIR/borrowck-vec-pattern-nesting.rs:20:13 + --> $DIR/borrowck-vec-pattern-nesting.rs:10:13 | LL | [box ref _a, _, _] => { | ------ borrow of `vec[..]` occurs here @@ -8,7 +8,7 @@ LL | vec[0] = box 4; //~ ERROR cannot assign | ^^^^^^^^^^^^^^ assignment to borrowed `vec[..]` occurs here error[E0506]: cannot assign to `vec[..]` because it is borrowed - --> $DIR/borrowck-vec-pattern-nesting.rs:33:13 + --> $DIR/borrowck-vec-pattern-nesting.rs:23:13 | LL | &mut [ref _b..] => { | ------ borrow of `vec[..]` occurs here @@ -17,7 +17,7 @@ LL | vec[0] = box 4; //~ ERROR cannot assign | ^^^^^^^^^^^^^^ assignment to borrowed `vec[..]` occurs here error[E0508]: cannot move out of type `[std::boxed::Box]`, a non-copy slice - --> $DIR/borrowck-vec-pattern-nesting.rs:44:14 + --> $DIR/borrowck-vec-pattern-nesting.rs:34:14 | LL | &mut [_a, //~ ERROR cannot move out | ^-- hint: to prevent move, use `ref _a` or `ref mut _a` @@ -30,7 +30,7 @@ LL | | ] => { | |_________^ cannot move out of here error[E0508]: cannot move out of type `[std::boxed::Box]`, a non-copy slice - --> $DIR/borrowck-vec-pattern-nesting.rs:57:13 + --> $DIR/borrowck-vec-pattern-nesting.rs:47:13 | LL | let a = vec[0]; //~ ERROR cannot move out | ^^^^^^ @@ -39,7 +39,7 @@ LL | let a = vec[0]; //~ ERROR cannot move out | help: consider using a reference instead: `&vec[0]` error[E0508]: cannot move out of type `[std::boxed::Box]`, a non-copy slice - --> $DIR/borrowck-vec-pattern-nesting.rs:65:14 + --> $DIR/borrowck-vec-pattern-nesting.rs:55:14 | LL | &mut [ //~ ERROR cannot move out | ______________^ @@ -50,7 +50,7 @@ LL | | _b] => {} | hint: to prevent move, use `ref _b` or `ref mut _b` error[E0508]: cannot move out of type `[std::boxed::Box]`, a non-copy slice - --> $DIR/borrowck-vec-pattern-nesting.rs:70:13 + --> $DIR/borrowck-vec-pattern-nesting.rs:60:13 | LL | let a = vec[0]; //~ ERROR cannot move out | ^^^^^^ @@ -59,7 +59,7 @@ LL | let a = vec[0]; //~ ERROR cannot move out | help: consider using a reference instead: `&vec[0]` error[E0508]: cannot move out of type `[std::boxed::Box]`, a non-copy slice - --> $DIR/borrowck-vec-pattern-nesting.rs:78:14 + --> $DIR/borrowck-vec-pattern-nesting.rs:68:14 | LL | &mut [_a, _b, _c] => {} //~ ERROR cannot move out | ^--^^--^^--^ @@ -70,7 +70,7 @@ LL | &mut [_a, _b, _c] => {} //~ ERROR cannot move out | cannot move out of here error[E0508]: cannot move out of type `[std::boxed::Box]`, a non-copy slice - --> $DIR/borrowck-vec-pattern-nesting.rs:82:13 + --> $DIR/borrowck-vec-pattern-nesting.rs:72:13 | LL | let a = vec[0]; //~ ERROR cannot move out | ^^^^^^ diff --git a/src/test/ui/borrowck/borrowck-vec-pattern-tail-element-loan.nll.stderr b/src/test/ui/borrowck/borrowck-vec-pattern-tail-element-loan.nll.stderr index 6d45f1541a0fe..073e60ecc052e 100644 --- a/src/test/ui/borrowck/borrowck-vec-pattern-tail-element-loan.nll.stderr +++ b/src/test/ui/borrowck/borrowck-vec-pattern-tail-element-loan.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `vec` does not live long enough - --> $DIR/borrowck-vec-pattern-tail-element-loan.rs:15:25 + --> $DIR/borrowck-vec-pattern-tail-element-loan.rs:5:25 | LL | let vec: &[isize] = &vec; //~ ERROR `vec` does not live long enough | ^^^^ borrowed value does not live long enough @@ -7,8 +7,8 @@ LL | let vec: &[isize] = &vec; //~ ERROR `vec` does not live long enough LL | } | - `vec` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 13:6... - --> $DIR/borrowck-vec-pattern-tail-element-loan.rs:13:6 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 3:6... + --> $DIR/borrowck-vec-pattern-tail-element-loan.rs:3:6 | LL | fn a<'a>() -> &'a isize { | ^^ diff --git a/src/test/ui/borrowck/borrowck-vec-pattern-tail-element-loan.rs b/src/test/ui/borrowck/borrowck-vec-pattern-tail-element-loan.rs index cd8f3ebefe628..b18052a689936 100644 --- a/src/test/ui/borrowck/borrowck-vec-pattern-tail-element-loan.rs +++ b/src/test/ui/borrowck/borrowck-vec-pattern-tail-element-loan.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(slice_patterns)] fn a<'a>() -> &'a isize { diff --git a/src/test/ui/borrowck/borrowck-vec-pattern-tail-element-loan.stderr b/src/test/ui/borrowck/borrowck-vec-pattern-tail-element-loan.stderr index 36343c1bde6d6..a4584aac0e8d7 100644 --- a/src/test/ui/borrowck/borrowck-vec-pattern-tail-element-loan.stderr +++ b/src/test/ui/borrowck/borrowck-vec-pattern-tail-element-loan.stderr @@ -1,5 +1,5 @@ error[E0597]: `vec` does not live long enough - --> $DIR/borrowck-vec-pattern-tail-element-loan.rs:15:26 + --> $DIR/borrowck-vec-pattern-tail-element-loan.rs:5:26 | LL | let vec: &[isize] = &vec; //~ ERROR `vec` does not live long enough | ^^^ borrowed value does not live long enough @@ -7,8 +7,8 @@ LL | let vec: &[isize] = &vec; //~ ERROR `vec` does not live long enough LL | } | - borrowed value only lives until here | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 13:6... - --> $DIR/borrowck-vec-pattern-tail-element-loan.rs:13:6 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 3:6... + --> $DIR/borrowck-vec-pattern-tail-element-loan.rs:3:6 | LL | fn a<'a>() -> &'a isize { | ^^ diff --git a/src/test/ui/borrowck/borrowck-while-break.nll.stderr b/src/test/ui/borrowck/borrowck-while-break.nll.stderr index de2ba578962e6..1defa3da60ce8 100644 --- a/src/test/ui/borrowck/borrowck-while-break.nll.stderr +++ b/src/test/ui/borrowck/borrowck-while-break.nll.stderr @@ -1,5 +1,5 @@ error[E0381]: borrow of possibly uninitialized variable: `v` - --> $DIR/borrowck-while-break.rs:17:20 + --> $DIR/borrowck-while-break.rs:7:20 | LL | println!("{}", v); //~ ERROR use of possibly uninitialized variable: `v` | ^ use of possibly uninitialized `v` diff --git a/src/test/ui/borrowck/borrowck-while-break.rs b/src/test/ui/borrowck/borrowck-while-break.rs index 8cdf1da5c934c..293760efba5e5 100644 --- a/src/test/ui/borrowck/borrowck-while-break.rs +++ b/src/test/ui/borrowck/borrowck-while-break.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn test(cond: bool) { let v; while cond { diff --git a/src/test/ui/borrowck/borrowck-while-break.stderr b/src/test/ui/borrowck/borrowck-while-break.stderr index eaaecdb5bbbd9..f35d43162b244 100644 --- a/src/test/ui/borrowck/borrowck-while-break.stderr +++ b/src/test/ui/borrowck/borrowck-while-break.stderr @@ -1,5 +1,5 @@ error[E0381]: use of possibly uninitialized variable: `v` - --> $DIR/borrowck-while-break.rs:17:20 + --> $DIR/borrowck-while-break.rs:7:20 | LL | println!("{}", v); //~ ERROR use of possibly uninitialized variable: `v` | ^ use of possibly uninitialized `v` diff --git a/src/test/ui/borrowck/borrowck-while-cond.rs b/src/test/ui/borrowck/borrowck-while-cond.rs index 27d42d666ea1d..28a5fb18a7f1d 100644 --- a/src/test/ui/borrowck/borrowck-while-cond.rs +++ b/src/test/ui/borrowck/borrowck-while-cond.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x: bool; while x { } //~ ERROR use of possibly uninitialized variable: `x` diff --git a/src/test/ui/borrowck/borrowck-while-cond.stderr b/src/test/ui/borrowck/borrowck-while-cond.stderr index 41ef9e800bde4..2b5414b42cd0d 100644 --- a/src/test/ui/borrowck/borrowck-while-cond.stderr +++ b/src/test/ui/borrowck/borrowck-while-cond.stderr @@ -1,5 +1,5 @@ error[E0381]: use of possibly uninitialized variable: `x` - --> $DIR/borrowck-while-cond.rs:13:11 + --> $DIR/borrowck-while-cond.rs:3:11 | LL | while x { } //~ ERROR use of possibly uninitialized variable: `x` | ^ use of possibly uninitialized `x` diff --git a/src/test/ui/borrowck/borrowck-while.rs b/src/test/ui/borrowck/borrowck-while.rs index e3566e9bb920d..4274fa997a0ab 100644 --- a/src/test/ui/borrowck/borrowck-while.rs +++ b/src/test/ui/borrowck/borrowck-while.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn f() -> isize { let mut x: isize; while 1 == 1 { x = 10; } diff --git a/src/test/ui/borrowck/borrowck-while.stderr b/src/test/ui/borrowck/borrowck-while.stderr index 9fb2dcaa436d9..e8aff0d22c2c0 100644 --- a/src/test/ui/borrowck/borrowck-while.stderr +++ b/src/test/ui/borrowck/borrowck-while.stderr @@ -1,5 +1,5 @@ error[E0381]: use of possibly uninitialized variable: `x` - --> $DIR/borrowck-while.rs:14:12 + --> $DIR/borrowck-while.rs:4:12 | LL | return x; //~ ERROR use of possibly uninitialized variable: `x` | ^ use of possibly uninitialized `x` diff --git a/src/test/ui/borrowck/immutable-arg.rs b/src/test/ui/borrowck/immutable-arg.rs index 7c387ed080821..82056d5be533b 100644 --- a/src/test/ui/borrowck/immutable-arg.rs +++ b/src/test/ui/borrowck/immutable-arg.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //compile-flags: -Z emit-end-regions -Z borrowck=compare fn foo(_x: u32) { diff --git a/src/test/ui/borrowck/immutable-arg.stderr b/src/test/ui/borrowck/immutable-arg.stderr index 1cf68795bf07f..4cf562c3dae0a 100644 --- a/src/test/ui/borrowck/immutable-arg.stderr +++ b/src/test/ui/borrowck/immutable-arg.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `_x` (Ast) - --> $DIR/immutable-arg.rs:14:5 + --> $DIR/immutable-arg.rs:4:5 | LL | fn foo(_x: u32) { | -- first assignment to `_x` @@ -7,7 +7,7 @@ LL | _x = 4; | ^^^^^^ cannot assign twice to immutable variable error[E0384]: cannot assign to immutable argument `_x` (Mir) - --> $DIR/immutable-arg.rs:14:5 + --> $DIR/immutable-arg.rs:4:5 | LL | fn foo(_x: u32) { | -- consider changing this to `mut _x` diff --git a/src/test/ui/borrowck/index-mut-help.nll.stderr b/src/test/ui/borrowck/index-mut-help.nll.stderr index cc058f1fde5da..01aca396b0fdb 100644 --- a/src/test/ui/borrowck/index-mut-help.nll.stderr +++ b/src/test/ui/borrowck/index-mut-help.nll.stderr @@ -1,17 +1,17 @@ error[E0596]: cannot borrow data in a `&` reference as mutable - --> $DIR/index-mut-help.rs:21:5 + --> $DIR/index-mut-help.rs:11:5 | LL | map["peter"].clear(); //~ ERROR | ^^^^^^^^^^^^ cannot borrow as mutable error[E0594]: cannot assign to data in a `&` reference - --> $DIR/index-mut-help.rs:22:5 + --> $DIR/index-mut-help.rs:12:5 | LL | map["peter"] = "0".to_string(); //~ ERROR | ^^^^^^^^^^^^ cannot assign error[E0596]: cannot borrow data in a `&` reference as mutable - --> $DIR/index-mut-help.rs:23:13 + --> $DIR/index-mut-help.rs:13:13 | LL | let _ = &mut map["peter"]; //~ ERROR | ^^^^^^^^^^^^^^^^^ cannot borrow as mutable diff --git a/src/test/ui/borrowck/index-mut-help.rs b/src/test/ui/borrowck/index-mut-help.rs index a4df0ced2f292..d57ef975d9634 100644 --- a/src/test/ui/borrowck/index-mut-help.rs +++ b/src/test/ui/borrowck/index-mut-help.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // When mutably indexing a type that implements `Index` but not `IndexMut`, a // special 'help' message is added to the output. diff --git a/src/test/ui/borrowck/index-mut-help.stderr b/src/test/ui/borrowck/index-mut-help.stderr index b8b35ed3ed30a..985fa9f0361ee 100644 --- a/src/test/ui/borrowck/index-mut-help.stderr +++ b/src/test/ui/borrowck/index-mut-help.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow immutable indexed content as mutable - --> $DIR/index-mut-help.rs:21:5 + --> $DIR/index-mut-help.rs:11:5 | LL | map["peter"].clear(); //~ ERROR | ^^^^^^^^^^^^ cannot borrow as mutable @@ -7,7 +7,7 @@ LL | map["peter"].clear(); //~ ERROR = help: trait `IndexMut` is required to modify indexed content, but it is not implemented for `std::collections::HashMap<&str, std::string::String>` error[E0594]: cannot assign to immutable indexed content - --> $DIR/index-mut-help.rs:22:5 + --> $DIR/index-mut-help.rs:12:5 | LL | map["peter"] = "0".to_string(); //~ ERROR | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot borrow as mutable @@ -15,7 +15,7 @@ LL | map["peter"] = "0".to_string(); //~ ERROR = help: trait `IndexMut` is required to modify indexed content, but it is not implemented for `std::collections::HashMap<&str, std::string::String>` error[E0596]: cannot borrow immutable indexed content as mutable - --> $DIR/index-mut-help.rs:23:18 + --> $DIR/index-mut-help.rs:13:18 | LL | let _ = &mut map["peter"]; //~ ERROR | ^^^^^^^^^^^^ cannot borrow as mutable diff --git a/src/test/ui/borrowck/issue-41962.rs b/src/test/ui/borrowck/issue-41962.rs index 2a94e05016d4e..b4444cde07d5d 100644 --- a/src/test/ui/borrowck/issue-41962.rs +++ b/src/test/ui/borrowck/issue-41962.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z borrowck=compare pub fn main(){ diff --git a/src/test/ui/borrowck/issue-41962.stderr b/src/test/ui/borrowck/issue-41962.stderr index b6e005a6673eb..c706d76ba10e7 100644 --- a/src/test/ui/borrowck/issue-41962.stderr +++ b/src/test/ui/borrowck/issue-41962.stderr @@ -1,5 +1,5 @@ error[E0382]: use of partially moved value: `maybe` (Ast) - --> $DIR/issue-41962.rs:17:30 + --> $DIR/issue-41962.rs:7:30 | LL | if let Some(thing) = maybe { | ----- ^^^^^ value used here after move @@ -9,7 +9,7 @@ LL | if let Some(thing) = maybe { = note: move occurs because the value has type `std::vec::Vec`, which does not implement the `Copy` trait error[E0382]: use of moved value: `(maybe as std::prelude::v1::Some).0` (Ast) - --> $DIR/issue-41962.rs:17:21 + --> $DIR/issue-41962.rs:7:21 | LL | if let Some(thing) = maybe { | ^^^^^ value moved here in previous iteration of loop @@ -17,7 +17,7 @@ LL | if let Some(thing) = maybe { = note: move occurs because the value has type `std::vec::Vec`, which does not implement the `Copy` trait error[E0382]: use of moved value: `maybe` (Mir) - --> $DIR/issue-41962.rs:17:16 + --> $DIR/issue-41962.rs:7:16 | LL | if let Some(thing) = maybe { | ^^^^^-----^ @@ -28,7 +28,7 @@ LL | if let Some(thing) = maybe { = note: move occurs because value has type `std::vec::Vec`, which does not implement the `Copy` trait error[E0382]: use of moved value (Mir) - --> $DIR/issue-41962.rs:17:21 + --> $DIR/issue-41962.rs:7:21 | LL | if let Some(thing) = maybe { | ^^^^^ value moved here in previous iteration of loop @@ -36,7 +36,7 @@ LL | if let Some(thing) = maybe { = note: move occurs because value has type `std::vec::Vec`, which does not implement the `Copy` trait error[E0382]: use of moved value: `maybe` (Mir) - --> $DIR/issue-41962.rs:17:30 + --> $DIR/issue-41962.rs:7:30 | LL | if let Some(thing) = maybe { | ----- ^^^^^ value used here after move @@ -46,7 +46,7 @@ LL | if let Some(thing) = maybe { = note: move occurs because value has type `std::vec::Vec`, which does not implement the `Copy` trait error[E0382]: borrow of moved value: `maybe` (Mir) - --> $DIR/issue-41962.rs:17:30 + --> $DIR/issue-41962.rs:7:30 | LL | if let Some(thing) = maybe { | ----- ^^^^^ value borrowed here after move diff --git a/src/test/ui/borrowck/issue-45983.ast.stderr b/src/test/ui/borrowck/issue-45983.ast.stderr index db7cedffd8f72..9cb83c92cae84 100644 --- a/src/test/ui/borrowck/issue-45983.ast.stderr +++ b/src/test/ui/borrowck/issue-45983.ast.stderr @@ -1,5 +1,5 @@ error: borrowed data cannot be stored outside of its closure - --> $DIR/issue-45983.rs:36:27 + --> $DIR/issue-45983.rs:26:27 | LL | let x = None; | - borrowed data cannot be stored into here... diff --git a/src/test/ui/borrowck/issue-45983.migrate.stderr b/src/test/ui/borrowck/issue-45983.migrate.stderr index db7cedffd8f72..9cb83c92cae84 100644 --- a/src/test/ui/borrowck/issue-45983.migrate.stderr +++ b/src/test/ui/borrowck/issue-45983.migrate.stderr @@ -1,5 +1,5 @@ error: borrowed data cannot be stored outside of its closure - --> $DIR/issue-45983.rs:36:27 + --> $DIR/issue-45983.rs:26:27 | LL | let x = None; | - borrowed data cannot be stored into here... diff --git a/src/test/ui/borrowck/issue-45983.nll.stderr b/src/test/ui/borrowck/issue-45983.nll.stderr index 9d62c7dba75ff..e56495b3af08e 100644 --- a/src/test/ui/borrowck/issue-45983.nll.stderr +++ b/src/test/ui/borrowck/issue-45983.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/issue-45983.rs:36:27 + --> $DIR/issue-45983.rs:26:27 | LL | give_any(|y| x = Some(y)); | ^ error: borrowed data escapes outside of closure - --> $DIR/issue-45983.rs:36:18 + --> $DIR/issue-45983.rs:26:18 | LL | let x = None; | - `x` is declared here, outside of the closure body @@ -15,7 +15,7 @@ LL | give_any(|y| x = Some(y)); | `y` is a reference that is only valid in the closure body error[E0594]: cannot assign to `x`, as it is not declared as mutable - --> $DIR/issue-45983.rs:36:18 + --> $DIR/issue-45983.rs:26:18 | LL | let x = None; | - help: consider changing this to be mutable: `mut x` diff --git a/src/test/ui/borrowck/issue-45983.rs b/src/test/ui/borrowck/issue-45983.rs index 5ed425e958a58..f2362e0976733 100644 --- a/src/test/ui/borrowck/issue-45983.rs +++ b/src/test/ui/borrowck/issue-45983.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // As documented in Issue #45983, this test is evaluating the quality // of our diagnostics on erroneous code using higher-ranked closures. // diff --git a/src/test/ui/borrowck/issue-51117.nll.stderr b/src/test/ui/borrowck/issue-51117.nll.stderr index 1ddca21320211..5ee84b9ca7f15 100644 --- a/src/test/ui/borrowck/issue-51117.nll.stderr +++ b/src/test/ui/borrowck/issue-51117.nll.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `*bar` as mutable more than once at a time - --> $DIR/issue-51117.rs:20:13 + --> $DIR/issue-51117.rs:10:13 | LL | Some(baz) => { | --- first mutable borrow occurs here diff --git a/src/test/ui/borrowck/issue-51117.rs b/src/test/ui/borrowck/issue-51117.rs index 0a1e672b57761..e4664e4f3ea8d 100644 --- a/src/test/ui/borrowck/issue-51117.rs +++ b/src/test/ui/borrowck/issue-51117.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #51117 in borrowck interaction with match // default bindings. The borrow of `*bar` created by `baz` was failing // to register as a conflict with `bar.take()`. diff --git a/src/test/ui/borrowck/issue-51117.stderr b/src/test/ui/borrowck/issue-51117.stderr index cb434f9b322fe..783ba8df1a6e7 100644 --- a/src/test/ui/borrowck/issue-51117.stderr +++ b/src/test/ui/borrowck/issue-51117.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `*bar` as mutable more than once at a time - --> $DIR/issue-51117.rs:20:13 + --> $DIR/issue-51117.rs:10:13 | LL | Some(baz) => { | --- first mutable borrow occurs here diff --git a/src/test/ui/borrowck/issue-51348-multi-ref-mut-in-guard.rs b/src/test/ui/borrowck/issue-51348-multi-ref-mut-in-guard.rs index c9d39fa360efb..a8bfdbad38ba4 100644 --- a/src/test/ui/borrowck/issue-51348-multi-ref-mut-in-guard.rs +++ b/src/test/ui/borrowck/issue-51348-multi-ref-mut-in-guard.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // We used to ICE if you had a single match arm with multiple // candidate patterns with `ref mut` identifiers used in the arm's // guard. diff --git a/src/test/ui/borrowck/issue-51415.nll.stderr b/src/test/ui/borrowck/issue-51415.nll.stderr index d4340938eebc1..b025374257f7c 100644 --- a/src/test/ui/borrowck/issue-51415.nll.stderr +++ b/src/test/ui/borrowck/issue-51415.nll.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/issue-51415.rs:16:42 + --> $DIR/issue-51415.rs:6:42 | LL | let opt = a.iter().enumerate().find(|(_, &s)| { | ^^^^^-^ @@ -8,7 +8,7 @@ LL | let opt = a.iter().enumerate().find(|(_, &s)| { | cannot move out of borrowed content | note: move occurs because `s` has type `std::string::String`, which does not implement the `Copy` trait - --> $DIR/issue-51415.rs:16:47 + --> $DIR/issue-51415.rs:6:47 | LL | let opt = a.iter().enumerate().find(|(_, &s)| { | ^ diff --git a/src/test/ui/borrowck/issue-51415.rs b/src/test/ui/borrowck/issue-51415.rs index 9067a50a8476d..f031308fb7871 100644 --- a/src/test/ui/borrowck/issue-51415.rs +++ b/src/test/ui/borrowck/issue-51415.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #51415: match default bindings were failing to // see the "move out" implied by `&s` below. diff --git a/src/test/ui/borrowck/issue-51415.stderr b/src/test/ui/borrowck/issue-51415.stderr index b4b0bc7594305..895c35e4e776a 100644 --- a/src/test/ui/borrowck/issue-51415.stderr +++ b/src/test/ui/borrowck/issue-51415.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/issue-51415.rs:16:46 + --> $DIR/issue-51415.rs:6:46 | LL | let opt = a.iter().enumerate().find(|(_, &s)| { | ^- diff --git a/src/test/ui/borrowck/issue-52713-bug.rs b/src/test/ui/borrowck/issue-52713-bug.rs index 4ecba64b27112..460e6b4bbae4d 100644 --- a/src/test/ui/borrowck/issue-52713-bug.rs +++ b/src/test/ui/borrowck/issue-52713-bug.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for a bug in #52713: this was an optimization for // computing liveness that wound up accidentally causing the program // below to be accepted. diff --git a/src/test/ui/borrowck/issue-52713-bug.stderr b/src/test/ui/borrowck/issue-52713-bug.stderr index 7d9b57400dda3..4e6d0d45bf081 100644 --- a/src/test/ui/borrowck/issue-52713-bug.stderr +++ b/src/test/ui/borrowck/issue-52713-bug.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `x` because it is borrowed - --> $DIR/issue-52713-bug.rs:24:5 + --> $DIR/issue-52713-bug.rs:14:5 | LL | let y = &x; | -- borrow of `x` occurs here diff --git a/src/test/ui/borrowck/issue-52967-edition-2018-needs-two-phase-borrows.rs b/src/test/ui/borrowck/issue-52967-edition-2018-needs-two-phase-borrows.rs index 3b53fb9fc4283..dcf047c545fe9 100644 --- a/src/test/ui/borrowck/issue-52967-edition-2018-needs-two-phase-borrows.rs +++ b/src/test/ui/borrowck/issue-52967-edition-2018-needs-two-phase-borrows.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This is a regression test for #52967, where we discovered that in // the initial deployment of NLL for the 2018 edition, I forgot to // turn on two-phase-borrows in addition to `-Z borrowck=migrate`. diff --git a/src/test/ui/borrowck/issue-7573.nll.stderr b/src/test/ui/borrowck/issue-7573.nll.stderr index b0fbcd3ad9f39..3f8ddb3b65dee 100644 --- a/src/test/ui/borrowck/issue-7573.nll.stderr +++ b/src/test/ui/borrowck/issue-7573.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/issue-7573.rs:27:31 + --> $DIR/issue-7573.rs:16:31 | LL | let mut lines_to_use: Vec<&CrateId> = Vec::new(); | ^ error: borrowed data escapes outside of closure - --> $DIR/issue-7573.rs:32:9 + --> $DIR/issue-7573.rs:21:9 | LL | let mut lines_to_use: Vec<&CrateId> = Vec::new(); | ---------------- `lines_to_use` is declared here, outside of the closure body diff --git a/src/test/ui/borrowck/issue-7573.rs b/src/test/ui/borrowck/issue-7573.rs index 8f1545fa00986..20a6a5c92f149 100644 --- a/src/test/ui/borrowck/issue-7573.rs +++ b/src/test/ui/borrowck/issue-7573.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub struct CrateId { local_path: String, junk: String diff --git a/src/test/ui/borrowck/issue-7573.stderr b/src/test/ui/borrowck/issue-7573.stderr index 41a804adfe369..fed79ef4f559e 100644 --- a/src/test/ui/borrowck/issue-7573.stderr +++ b/src/test/ui/borrowck/issue-7573.stderr @@ -1,5 +1,5 @@ error: borrowed data cannot be stored outside of its closure - --> $DIR/issue-7573.rs:32:27 + --> $DIR/issue-7573.rs:21:27 | LL | let mut lines_to_use: Vec<&CrateId> = Vec::new(); | - cannot infer an appropriate lifetime... diff --git a/src/test/ui/borrowck/move-in-static-initializer-issue-38520.ast.stderr b/src/test/ui/borrowck/move-in-static-initializer-issue-38520.ast.stderr index 4c399ab6014df..b468ec1566790 100644 --- a/src/test/ui/borrowck/move-in-static-initializer-issue-38520.ast.stderr +++ b/src/test/ui/borrowck/move-in-static-initializer-issue-38520.ast.stderr @@ -1,11 +1,11 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/move-in-static-initializer-issue-38520.rs:27:23 + --> $DIR/move-in-static-initializer-issue-38520.rs:17:23 | LL | static Y: usize = get(*&X); //[ast]~ ERROR E0507 | ^^^ cannot move out of borrowed content error[E0507]: cannot move out of borrowed content - --> $DIR/move-in-static-initializer-issue-38520.rs:29:22 + --> $DIR/move-in-static-initializer-issue-38520.rs:19:22 | LL | const Z: usize = get(*&X); //[ast]~ ERROR E0507 | ^^^ cannot move out of borrowed content diff --git a/src/test/ui/borrowck/move-in-static-initializer-issue-38520.mir.stderr b/src/test/ui/borrowck/move-in-static-initializer-issue-38520.mir.stderr index 4c399ab6014df..b468ec1566790 100644 --- a/src/test/ui/borrowck/move-in-static-initializer-issue-38520.mir.stderr +++ b/src/test/ui/borrowck/move-in-static-initializer-issue-38520.mir.stderr @@ -1,11 +1,11 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/move-in-static-initializer-issue-38520.rs:27:23 + --> $DIR/move-in-static-initializer-issue-38520.rs:17:23 | LL | static Y: usize = get(*&X); //[ast]~ ERROR E0507 | ^^^ cannot move out of borrowed content error[E0507]: cannot move out of borrowed content - --> $DIR/move-in-static-initializer-issue-38520.rs:29:22 + --> $DIR/move-in-static-initializer-issue-38520.rs:19:22 | LL | const Z: usize = get(*&X); //[ast]~ ERROR E0507 | ^^^ cannot move out of borrowed content diff --git a/src/test/ui/borrowck/move-in-static-initializer-issue-38520.rs b/src/test/ui/borrowck/move-in-static-initializer-issue-38520.rs index 508e09318ae11..a8eeef942e639 100644 --- a/src/test/ui/borrowck/move-in-static-initializer-issue-38520.rs +++ b/src/test/ui/borrowck/move-in-static-initializer-issue-38520.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/borrowck/mut-borrow-in-loop.nll.stderr b/src/test/ui/borrowck/mut-borrow-in-loop.nll.stderr index 92225369c9271..e3c49b00826f7 100644 --- a/src/test/ui/borrowck/mut-borrow-in-loop.nll.stderr +++ b/src/test/ui/borrowck/mut-borrow-in-loop.nll.stderr @@ -1,35 +1,35 @@ error[E0499]: cannot borrow `*arg` as mutable more than once at a time - --> $DIR/mut-borrow-in-loop.rs:20:25 + --> $DIR/mut-borrow-in-loop.rs:10:25 | LL | (self.func)(arg) //~ ERROR cannot borrow | ^^^ mutable borrow starts here in previous iteration of loop | -note: borrowed value must be valid for the lifetime 'a as defined on the impl at 17:6... - --> $DIR/mut-borrow-in-loop.rs:17:6 +note: borrowed value must be valid for the lifetime 'a as defined on the impl at 7:6... + --> $DIR/mut-borrow-in-loop.rs:7:6 | LL | impl<'a, T : 'a> FuncWrapper<'a, T> { | ^^ error[E0499]: cannot borrow `*arg` as mutable more than once at a time - --> $DIR/mut-borrow-in-loop.rs:26:25 + --> $DIR/mut-borrow-in-loop.rs:16:25 | LL | (self.func)(arg) //~ ERROR cannot borrow | ^^^ mutable borrow starts here in previous iteration of loop | -note: borrowed value must be valid for the lifetime 'a as defined on the impl at 17:6... - --> $DIR/mut-borrow-in-loop.rs:17:6 +note: borrowed value must be valid for the lifetime 'a as defined on the impl at 7:6... + --> $DIR/mut-borrow-in-loop.rs:7:6 | LL | impl<'a, T : 'a> FuncWrapper<'a, T> { | ^^ error[E0499]: cannot borrow `*arg` as mutable more than once at a time - --> $DIR/mut-borrow-in-loop.rs:33:25 + --> $DIR/mut-borrow-in-loop.rs:23:25 | LL | (self.func)(arg) //~ ERROR cannot borrow | ^^^ mutable borrow starts here in previous iteration of loop | -note: borrowed value must be valid for the lifetime 'a as defined on the impl at 17:6... - --> $DIR/mut-borrow-in-loop.rs:17:6 +note: borrowed value must be valid for the lifetime 'a as defined on the impl at 7:6... + --> $DIR/mut-borrow-in-loop.rs:7:6 | LL | impl<'a, T : 'a> FuncWrapper<'a, T> { | ^^ diff --git a/src/test/ui/borrowck/mut-borrow-in-loop.rs b/src/test/ui/borrowck/mut-borrow-in-loop.rs index 31b50d8e531c0..6b65b903757ac 100644 --- a/src/test/ui/borrowck/mut-borrow-in-loop.rs +++ b/src/test/ui/borrowck/mut-borrow-in-loop.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // produce special borrowck message inside all kinds of loops struct FuncWrapper<'a, T : 'a> { diff --git a/src/test/ui/borrowck/mut-borrow-in-loop.stderr b/src/test/ui/borrowck/mut-borrow-in-loop.stderr index cda59d3bc68be..749e0e172f775 100644 --- a/src/test/ui/borrowck/mut-borrow-in-loop.stderr +++ b/src/test/ui/borrowck/mut-borrow-in-loop.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `*arg` as mutable more than once at a time - --> $DIR/mut-borrow-in-loop.rs:20:25 + --> $DIR/mut-borrow-in-loop.rs:10:25 | LL | (self.func)(arg) //~ ERROR cannot borrow | ^^^ mutable borrow starts here in previous iteration of loop @@ -8,7 +8,7 @@ LL | } | - mutable borrow ends here error[E0499]: cannot borrow `*arg` as mutable more than once at a time - --> $DIR/mut-borrow-in-loop.rs:26:25 + --> $DIR/mut-borrow-in-loop.rs:16:25 | LL | (self.func)(arg) //~ ERROR cannot borrow | ^^^ mutable borrow starts here in previous iteration of loop @@ -17,7 +17,7 @@ LL | } | - mutable borrow ends here error[E0499]: cannot borrow `*arg` as mutable more than once at a time - --> $DIR/mut-borrow-in-loop.rs:33:25 + --> $DIR/mut-borrow-in-loop.rs:23:25 | LL | (self.func)(arg) //~ ERROR cannot borrow | ^^^ mutable borrow starts here in previous iteration of loop diff --git a/src/test/ui/borrowck/mut-borrow-of-mut-ref.nll.stderr b/src/test/ui/borrowck/mut-borrow-of-mut-ref.nll.stderr index ece3c62e6a940..5ee31b5efd091 100644 --- a/src/test/ui/borrowck/mut-borrow-of-mut-ref.nll.stderr +++ b/src/test/ui/borrowck/mut-borrow-of-mut-ref.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `b` as mutable, as it is not declared as mutable - --> $DIR/mut-borrow-of-mut-ref.rs:18:7 + --> $DIR/mut-borrow-of-mut-ref.rs:8:7 | LL | fn f(b: &mut i32) { | - help: consider changing this to be mutable: `mut b` diff --git a/src/test/ui/borrowck/mut-borrow-of-mut-ref.rs b/src/test/ui/borrowck/mut-borrow-of-mut-ref.rs index 75b9da5202341..212f706953e6b 100644 --- a/src/test/ui/borrowck/mut-borrow-of-mut-ref.rs +++ b/src/test/ui/borrowck/mut-borrow-of-mut-ref.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Suggest not mutably borrowing a mutable reference fn main() { diff --git a/src/test/ui/borrowck/mut-borrow-of-mut-ref.stderr b/src/test/ui/borrowck/mut-borrow-of-mut-ref.stderr index 885164cdc0603..5278056ac0f51 100644 --- a/src/test/ui/borrowck/mut-borrow-of-mut-ref.stderr +++ b/src/test/ui/borrowck/mut-borrow-of-mut-ref.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow immutable argument `b` as mutable - --> $DIR/mut-borrow-of-mut-ref.rs:18:12 + --> $DIR/mut-borrow-of-mut-ref.rs:8:12 | LL | g(&mut b) //~ ERROR cannot borrow | ^ cannot borrow mutably diff --git a/src/test/ui/borrowck/mut-borrow-outside-loop.nll.stderr b/src/test/ui/borrowck/mut-borrow-outside-loop.nll.stderr index 02e5b44c17c4a..31e0f02fde395 100644 --- a/src/test/ui/borrowck/mut-borrow-outside-loop.nll.stderr +++ b/src/test/ui/borrowck/mut-borrow-outside-loop.nll.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `void` as mutable more than once at a time - --> $DIR/mut-borrow-outside-loop.rs:17:18 + --> $DIR/mut-borrow-outside-loop.rs:7:18 | LL | let first = &mut void; | --------- first mutable borrow occurs here @@ -9,7 +9,7 @@ LL | first.use_mut(); | ----- borrow later used here error[E0499]: cannot borrow `inner_void` as mutable more than once at a time - --> $DIR/mut-borrow-outside-loop.rs:25:28 + --> $DIR/mut-borrow-outside-loop.rs:15:28 | LL | let inner_first = &mut inner_void; | --------------- first mutable borrow occurs here diff --git a/src/test/ui/borrowck/mut-borrow-outside-loop.rs b/src/test/ui/borrowck/mut-borrow-outside-loop.rs index aba520bd864d2..c02bfbf873907 100644 --- a/src/test/ui/borrowck/mut-borrow-outside-loop.rs +++ b/src/test/ui/borrowck/mut-borrow-outside-loop.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ensure borrowck messages are correct outside special case #![feature(rustc_attrs)] fn main() { #![rustc_error] // rust-lang/rust#49855 diff --git a/src/test/ui/borrowck/mut-borrow-outside-loop.stderr b/src/test/ui/borrowck/mut-borrow-outside-loop.stderr index 95e9fa19129be..1b32d8589b522 100644 --- a/src/test/ui/borrowck/mut-borrow-outside-loop.stderr +++ b/src/test/ui/borrowck/mut-borrow-outside-loop.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `void` as mutable more than once at a time - --> $DIR/mut-borrow-outside-loop.rs:17:23 + --> $DIR/mut-borrow-outside-loop.rs:7:23 | LL | let first = &mut void; | ---- first mutable borrow occurs here @@ -10,7 +10,7 @@ LL | } | - first borrow ends here error[E0499]: cannot borrow `inner_void` as mutable more than once at a time - --> $DIR/mut-borrow-outside-loop.rs:25:33 + --> $DIR/mut-borrow-outside-loop.rs:15:33 | LL | let inner_first = &mut inner_void; | ---------- first mutable borrow occurs here diff --git a/src/test/ui/borrowck/mutability-errors.nll.stderr b/src/test/ui/borrowck/mutability-errors.nll.stderr index 14c41bb81b2c6..6dd3582f95f5d 100644 --- a/src/test/ui/borrowck/mutability-errors.nll.stderr +++ b/src/test/ui/borrowck/mutability-errors.nll.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to `*x` which is behind a `&` reference - --> $DIR/mutability-errors.rs:19:5 + --> $DIR/mutability-errors.rs:9:5 | LL | fn named_ref(x: &(i32,)) { | ------- help: consider changing this to be a mutable reference: `&mut (i32,)` @@ -7,7 +7,7 @@ LL | *x = (1,); //~ ERROR | ^^^^^^^^^ `x` is a `&` reference, so the data it refers to cannot be written error[E0594]: cannot assign to `x.0` which is behind a `&` reference - --> $DIR/mutability-errors.rs:20:5 + --> $DIR/mutability-errors.rs:10:5 | LL | fn named_ref(x: &(i32,)) { | ------- help: consider changing this to be a mutable reference: `&mut (i32,)` @@ -16,7 +16,7 @@ LL | x.0 = 1; //~ ERROR | ^^^^^^^ `x` is a `&` reference, so the data it refers to cannot be written error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference - --> $DIR/mutability-errors.rs:21:5 + --> $DIR/mutability-errors.rs:11:5 | LL | fn named_ref(x: &(i32,)) { | ------- help: consider changing this to be a mutable reference: `&mut (i32,)` @@ -25,7 +25,7 @@ LL | &mut *x; //~ ERROR | ^^^^^^^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable error[E0596]: cannot borrow `x.0` as mutable, as it is behind a `&` reference - --> $DIR/mutability-errors.rs:22:5 + --> $DIR/mutability-errors.rs:12:5 | LL | fn named_ref(x: &(i32,)) { | ------- help: consider changing this to be a mutable reference: `&mut (i32,)` @@ -34,31 +34,31 @@ LL | &mut x.0; //~ ERROR | ^^^^^^^^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable error[E0594]: cannot assign to data in a `&` reference - --> $DIR/mutability-errors.rs:26:5 + --> $DIR/mutability-errors.rs:16:5 | LL | *f() = (1,); //~ ERROR | ^^^^^^^^^^^ cannot assign error[E0594]: cannot assign to data in a `&` reference - --> $DIR/mutability-errors.rs:27:5 + --> $DIR/mutability-errors.rs:17:5 | LL | f().0 = 1; //~ ERROR | ^^^^^^^^^ cannot assign error[E0596]: cannot borrow data in a `&` reference as mutable - --> $DIR/mutability-errors.rs:28:5 + --> $DIR/mutability-errors.rs:18:5 | LL | &mut *f(); //~ ERROR | ^^^^^^^^^ cannot borrow as mutable error[E0596]: cannot borrow data in a `&` reference as mutable - --> $DIR/mutability-errors.rs:29:5 + --> $DIR/mutability-errors.rs:19:5 | LL | &mut f().0; //~ ERROR | ^^^^^^^^^^ cannot borrow as mutable error[E0594]: cannot assign to `*x` which is behind a `*const` pointer - --> $DIR/mutability-errors.rs:33:5 + --> $DIR/mutability-errors.rs:23:5 | LL | unsafe fn named_ptr(x: *const (i32,)) { | ------------- help: consider changing this to be a mutable pointer: `*mut (i32,)` @@ -66,7 +66,7 @@ LL | *x = (1,); //~ ERROR | ^^^^^^^^^ `x` is a `*const` pointer, so the data it refers to cannot be written error[E0594]: cannot assign to `x.0` which is behind a `*const` pointer - --> $DIR/mutability-errors.rs:34:5 + --> $DIR/mutability-errors.rs:24:5 | LL | unsafe fn named_ptr(x: *const (i32,)) { | ------------- help: consider changing this to be a mutable pointer: `*mut (i32,)` @@ -75,7 +75,7 @@ LL | (*x).0 = 1; //~ ERROR | ^^^^^^^^^^ `x` is a `*const` pointer, so the data it refers to cannot be written error[E0596]: cannot borrow `*x` as mutable, as it is behind a `*const` pointer - --> $DIR/mutability-errors.rs:35:5 + --> $DIR/mutability-errors.rs:25:5 | LL | unsafe fn named_ptr(x: *const (i32,)) { | ------------- help: consider changing this to be a mutable pointer: `*mut (i32,)` @@ -84,7 +84,7 @@ LL | &mut *x; //~ ERROR | ^^^^^^^ `x` is a `*const` pointer, so the data it refers to cannot be borrowed as mutable error[E0596]: cannot borrow `x.0` as mutable, as it is behind a `*const` pointer - --> $DIR/mutability-errors.rs:36:5 + --> $DIR/mutability-errors.rs:26:5 | LL | unsafe fn named_ptr(x: *const (i32,)) { | ------------- help: consider changing this to be a mutable pointer: `*mut (i32,)` @@ -93,37 +93,37 @@ LL | &mut (*x).0; //~ ERROR | ^^^^^^^^^^^ `x` is a `*const` pointer, so the data it refers to cannot be borrowed as mutable error[E0594]: cannot assign to data in a `*const` pointer - --> $DIR/mutability-errors.rs:40:5 + --> $DIR/mutability-errors.rs:30:5 | LL | *f() = (1,); //~ ERROR | ^^^^^^^^^^^ cannot assign error[E0594]: cannot assign to data in a `*const` pointer - --> $DIR/mutability-errors.rs:41:5 + --> $DIR/mutability-errors.rs:31:5 | LL | (*f()).0 = 1; //~ ERROR | ^^^^^^^^^^^^ cannot assign error[E0596]: cannot borrow data in a `*const` pointer as mutable - --> $DIR/mutability-errors.rs:42:5 + --> $DIR/mutability-errors.rs:32:5 | LL | &mut *f(); //~ ERROR | ^^^^^^^^^ cannot borrow as mutable error[E0596]: cannot borrow data in a `*const` pointer as mutable - --> $DIR/mutability-errors.rs:43:5 + --> $DIR/mutability-errors.rs:33:5 | LL | &mut (*f()).0; //~ ERROR | ^^^^^^^^^^^^^ cannot borrow as mutable error[E0594]: cannot assign to `x`, as it is a captured variable in a `Fn` closure - --> $DIR/mutability-errors.rs:50:9 + --> $DIR/mutability-errors.rs:40:9 | LL | x = (1,); //~ ERROR | ^^^^^^^^ cannot assign | help: consider changing this to accept closures that implement `FnMut` - --> $DIR/mutability-errors.rs:49:12 + --> $DIR/mutability-errors.rs:39:12 | LL | fn_ref(|| { | ____________^ @@ -135,13 +135,13 @@ LL | | }); | |_____^ error[E0594]: cannot assign to `x.0`, as `Fn` closures cannot mutate their captured variables - --> $DIR/mutability-errors.rs:51:9 + --> $DIR/mutability-errors.rs:41:9 | LL | x.0 = 1; //~ ERROR | ^^^^^^^ cannot assign | help: consider changing this to accept closures that implement `FnMut` - --> $DIR/mutability-errors.rs:49:12 + --> $DIR/mutability-errors.rs:39:12 | LL | fn_ref(|| { | ____________^ @@ -153,13 +153,13 @@ LL | | }); | |_____^ error[E0596]: cannot borrow `x` as mutable, as it is a captured variable in a `Fn` closure - --> $DIR/mutability-errors.rs:52:9 + --> $DIR/mutability-errors.rs:42:9 | LL | &mut x; //~ ERROR | ^^^^^^ cannot borrow as mutable | help: consider changing this to accept closures that implement `FnMut` - --> $DIR/mutability-errors.rs:49:12 + --> $DIR/mutability-errors.rs:39:12 | LL | fn_ref(|| { | ____________^ @@ -171,13 +171,13 @@ LL | | }); | |_____^ error[E0596]: cannot borrow `x.0` as mutable, as `Fn` closures cannot mutate their captured variables - --> $DIR/mutability-errors.rs:53:9 + --> $DIR/mutability-errors.rs:43:9 | LL | &mut x.0; //~ ERROR | ^^^^^^^^ cannot borrow as mutable | help: consider changing this to accept closures that implement `FnMut` - --> $DIR/mutability-errors.rs:49:12 + --> $DIR/mutability-errors.rs:39:12 | LL | fn_ref(|| { | ____________^ @@ -189,13 +189,13 @@ LL | | }); | |_____^ error[E0594]: cannot assign to `x`, as it is a captured variable in a `Fn` closure - --> $DIR/mutability-errors.rs:56:9 + --> $DIR/mutability-errors.rs:46:9 | LL | x = (1,); //~ ERROR | ^^^^^^^^ cannot assign | help: consider changing this to accept closures that implement `FnMut` - --> $DIR/mutability-errors.rs:55:12 + --> $DIR/mutability-errors.rs:45:12 | LL | fn_ref(move || { | ____________^ @@ -207,13 +207,13 @@ LL | | }); | |_____^ error[E0594]: cannot assign to `x.0`, as `Fn` closures cannot mutate their captured variables - --> $DIR/mutability-errors.rs:57:9 + --> $DIR/mutability-errors.rs:47:9 | LL | x.0 = 1; //~ ERROR | ^^^^^^^ cannot assign | help: consider changing this to accept closures that implement `FnMut` - --> $DIR/mutability-errors.rs:55:12 + --> $DIR/mutability-errors.rs:45:12 | LL | fn_ref(move || { | ____________^ @@ -225,13 +225,13 @@ LL | | }); | |_____^ error[E0596]: cannot borrow `x` as mutable, as it is a captured variable in a `Fn` closure - --> $DIR/mutability-errors.rs:58:9 + --> $DIR/mutability-errors.rs:48:9 | LL | &mut x; //~ ERROR | ^^^^^^ cannot borrow as mutable | help: consider changing this to accept closures that implement `FnMut` - --> $DIR/mutability-errors.rs:55:12 + --> $DIR/mutability-errors.rs:45:12 | LL | fn_ref(move || { | ____________^ @@ -243,13 +243,13 @@ LL | | }); | |_____^ error[E0596]: cannot borrow `x.0` as mutable, as `Fn` closures cannot mutate their captured variables - --> $DIR/mutability-errors.rs:59:9 + --> $DIR/mutability-errors.rs:49:9 | LL | &mut x.0; //~ ERROR | ^^^^^^^^ cannot borrow as mutable | help: consider changing this to accept closures that implement `FnMut` - --> $DIR/mutability-errors.rs:55:12 + --> $DIR/mutability-errors.rs:45:12 | LL | fn_ref(move || { | ____________^ @@ -261,7 +261,7 @@ LL | | }); | |_____^ error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable - --> $DIR/mutability-errors.rs:64:5 + --> $DIR/mutability-errors.rs:54:5 | LL | fn imm_local(x: (i32,)) { | - help: consider changing this to be mutable: `mut x` @@ -269,7 +269,7 @@ LL | &mut x; //~ ERROR | ^^^^^^ cannot borrow as mutable error[E0596]: cannot borrow `x.0` as mutable, as `x` is not declared as mutable - --> $DIR/mutability-errors.rs:65:5 + --> $DIR/mutability-errors.rs:55:5 | LL | fn imm_local(x: (i32,)) { | - help: consider changing this to be mutable: `mut x` @@ -278,7 +278,7 @@ LL | &mut x.0; //~ ERROR | ^^^^^^^^ cannot borrow as mutable error[E0594]: cannot assign to `x`, as it is not declared as mutable - --> $DIR/mutability-errors.rs:70:9 + --> $DIR/mutability-errors.rs:60:9 | LL | fn imm_capture(x: (i32,)) { | - help: consider changing this to be mutable: `mut x` @@ -287,7 +287,7 @@ LL | x = (1,); | ^^^^^^^^ cannot assign error[E0594]: cannot assign to `x.0`, as `x` is not declared as mutable - --> $DIR/mutability-errors.rs:71:9 + --> $DIR/mutability-errors.rs:61:9 | LL | fn imm_capture(x: (i32,)) { | - help: consider changing this to be mutable: `mut x` @@ -296,7 +296,7 @@ LL | x.0 = 1; | ^^^^^^^ cannot assign error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable - --> $DIR/mutability-errors.rs:72:9 + --> $DIR/mutability-errors.rs:62:9 | LL | fn imm_capture(x: (i32,)) { | - help: consider changing this to be mutable: `mut x` @@ -305,7 +305,7 @@ LL | &mut x; | ^^^^^^ cannot borrow as mutable error[E0596]: cannot borrow `x.0` as mutable, as `x` is not declared as mutable - --> $DIR/mutability-errors.rs:73:9 + --> $DIR/mutability-errors.rs:63:9 | LL | fn imm_capture(x: (i32,)) { | - help: consider changing this to be mutable: `mut x` @@ -314,7 +314,7 @@ LL | &mut x.0; | ^^^^^^^^ cannot borrow as mutable error[E0594]: cannot assign to `x`, as it is not declared as mutable - --> $DIR/mutability-errors.rs:76:9 + --> $DIR/mutability-errors.rs:66:9 | LL | fn imm_capture(x: (i32,)) { | - help: consider changing this to be mutable: `mut x` @@ -323,7 +323,7 @@ LL | x = (1,); //~ ERROR | ^^^^^^^^ cannot assign error[E0594]: cannot assign to `x.0`, as `x` is not declared as mutable - --> $DIR/mutability-errors.rs:77:9 + --> $DIR/mutability-errors.rs:67:9 | LL | fn imm_capture(x: (i32,)) { | - help: consider changing this to be mutable: `mut x` @@ -332,7 +332,7 @@ LL | x.0 = 1; //~ ERROR | ^^^^^^^ cannot assign error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable - --> $DIR/mutability-errors.rs:78:9 + --> $DIR/mutability-errors.rs:68:9 | LL | fn imm_capture(x: (i32,)) { | - help: consider changing this to be mutable: `mut x` @@ -341,7 +341,7 @@ LL | &mut x; //~ ERROR | ^^^^^^ cannot borrow as mutable error[E0596]: cannot borrow `x.0` as mutable, as `x` is not declared as mutable - --> $DIR/mutability-errors.rs:79:9 + --> $DIR/mutability-errors.rs:69:9 | LL | fn imm_capture(x: (i32,)) { | - help: consider changing this to be mutable: `mut x` @@ -350,25 +350,25 @@ LL | &mut x.0; //~ ERROR | ^^^^^^^^ cannot borrow as mutable error[E0594]: cannot assign to immutable static item `X` - --> $DIR/mutability-errors.rs:86:5 + --> $DIR/mutability-errors.rs:76:5 | LL | X = (1,); //~ ERROR | ^^^^^^^^ cannot assign error[E0594]: cannot assign to `X.0`, as `X` is an immutable static item - --> $DIR/mutability-errors.rs:87:5 + --> $DIR/mutability-errors.rs:77:5 | LL | X.0 = 1; //~ ERROR | ^^^^^^^ cannot assign error[E0596]: cannot borrow immutable static item `X` as mutable - --> $DIR/mutability-errors.rs:88:5 + --> $DIR/mutability-errors.rs:78:5 | LL | &mut X; //~ ERROR | ^^^^^^ cannot borrow as mutable error[E0596]: cannot borrow `X.0` as mutable, as `X` is an immutable static item - --> $DIR/mutability-errors.rs:89:5 + --> $DIR/mutability-errors.rs:79:5 | LL | &mut X.0; //~ ERROR | ^^^^^^^^ cannot borrow as mutable diff --git a/src/test/ui/borrowck/mutability-errors.rs b/src/test/ui/borrowck/mutability-errors.rs index 0b4548cbebb7d..26f7f605ebeb8 100644 --- a/src/test/ui/borrowck/mutability-errors.rs +++ b/src/test/ui/borrowck/mutability-errors.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // All the possible mutability error cases. #![allow(unused)] diff --git a/src/test/ui/borrowck/mutability-errors.stderr b/src/test/ui/borrowck/mutability-errors.stderr index d77254f31414b..53ef21b9f8d19 100644 --- a/src/test/ui/borrowck/mutability-errors.stderr +++ b/src/test/ui/borrowck/mutability-errors.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to immutable borrowed content `*x` - --> $DIR/mutability-errors.rs:19:5 + --> $DIR/mutability-errors.rs:9:5 | LL | fn named_ref(x: &(i32,)) { | ------- use `&mut (i32,)` here to make mutable @@ -7,7 +7,7 @@ LL | *x = (1,); //~ ERROR | ^^^^^^^^^ cannot borrow as mutable error[E0594]: cannot assign to field `x.0` of immutable binding - --> $DIR/mutability-errors.rs:20:5 + --> $DIR/mutability-errors.rs:10:5 | LL | fn named_ref(x: &(i32,)) { | ------- use `&mut (i32,)` here to make mutable @@ -16,7 +16,7 @@ LL | x.0 = 1; //~ ERROR | ^^^^^^^ cannot mutably borrow field of immutable binding error[E0596]: cannot borrow immutable borrowed content `*x` as mutable - --> $DIR/mutability-errors.rs:21:10 + --> $DIR/mutability-errors.rs:11:10 | LL | fn named_ref(x: &(i32,)) { | ------- use `&mut (i32,)` here to make mutable @@ -25,7 +25,7 @@ LL | &mut *x; //~ ERROR | ^^ cannot borrow as mutable error[E0596]: cannot borrow field `x.0` of immutable binding as mutable - --> $DIR/mutability-errors.rs:22:10 + --> $DIR/mutability-errors.rs:12:10 | LL | fn named_ref(x: &(i32,)) { | ------- use `&mut (i32,)` here to make mutable @@ -34,85 +34,85 @@ LL | &mut x.0; //~ ERROR | ^^^ cannot mutably borrow field of immutable binding error[E0594]: cannot assign to immutable borrowed content - --> $DIR/mutability-errors.rs:26:5 + --> $DIR/mutability-errors.rs:16:5 | LL | *f() = (1,); //~ ERROR | ^^^^^^^^^^^ cannot borrow as mutable error[E0594]: cannot assign to field of immutable binding - --> $DIR/mutability-errors.rs:27:5 + --> $DIR/mutability-errors.rs:17:5 | LL | f().0 = 1; //~ ERROR | ^^^^^^^^^ cannot mutably borrow field of immutable binding error[E0596]: cannot borrow immutable borrowed content as mutable - --> $DIR/mutability-errors.rs:28:10 + --> $DIR/mutability-errors.rs:18:10 | LL | &mut *f(); //~ ERROR | ^^^^ cannot borrow as mutable error[E0596]: cannot borrow field of immutable binding as mutable - --> $DIR/mutability-errors.rs:29:10 + --> $DIR/mutability-errors.rs:19:10 | LL | &mut f().0; //~ ERROR | ^^^^^ cannot mutably borrow field of immutable binding error[E0594]: cannot assign to immutable dereference of raw pointer `*x` - --> $DIR/mutability-errors.rs:33:5 + --> $DIR/mutability-errors.rs:23:5 | LL | *x = (1,); //~ ERROR | ^^^^^^^^^ cannot borrow as mutable error[E0594]: cannot assign to field `x.0` of immutable binding - --> $DIR/mutability-errors.rs:34:5 + --> $DIR/mutability-errors.rs:24:5 | LL | (*x).0 = 1; //~ ERROR | ^^^^^^^^^^ cannot mutably borrow field of immutable binding error[E0596]: cannot borrow immutable dereference of raw pointer `*x` as mutable - --> $DIR/mutability-errors.rs:35:10 + --> $DIR/mutability-errors.rs:25:10 | LL | &mut *x; //~ ERROR | ^^ cannot borrow as mutable error[E0596]: cannot borrow field `x.0` of immutable binding as mutable - --> $DIR/mutability-errors.rs:36:10 + --> $DIR/mutability-errors.rs:26:10 | LL | &mut (*x).0; //~ ERROR | ^^^^^^ cannot mutably borrow field of immutable binding error[E0594]: cannot assign to immutable dereference of raw pointer - --> $DIR/mutability-errors.rs:40:5 + --> $DIR/mutability-errors.rs:30:5 | LL | *f() = (1,); //~ ERROR | ^^^^^^^^^^^ cannot borrow as mutable error[E0594]: cannot assign to field of immutable binding - --> $DIR/mutability-errors.rs:41:5 + --> $DIR/mutability-errors.rs:31:5 | LL | (*f()).0 = 1; //~ ERROR | ^^^^^^^^^^^^ cannot mutably borrow field of immutable binding error[E0596]: cannot borrow immutable dereference of raw pointer as mutable - --> $DIR/mutability-errors.rs:42:10 + --> $DIR/mutability-errors.rs:32:10 | LL | &mut *f(); //~ ERROR | ^^^^ cannot borrow as mutable error[E0596]: cannot borrow field of immutable binding as mutable - --> $DIR/mutability-errors.rs:43:10 + --> $DIR/mutability-errors.rs:33:10 | LL | &mut (*f()).0; //~ ERROR | ^^^^^^^^ cannot mutably borrow field of immutable binding error[E0387]: cannot assign to data in a captured outer variable in an `Fn` closure - --> $DIR/mutability-errors.rs:50:9 + --> $DIR/mutability-errors.rs:40:9 | LL | x = (1,); //~ ERROR | ^^^^^^^^ | help: consider changing this closure to take self by mutable reference - --> $DIR/mutability-errors.rs:49:12 + --> $DIR/mutability-errors.rs:39:12 | LL | fn_ref(|| { | ____________^ @@ -124,13 +124,13 @@ LL | | }); | |_____^ error[E0387]: cannot assign to data in a captured outer variable in an `Fn` closure - --> $DIR/mutability-errors.rs:51:9 + --> $DIR/mutability-errors.rs:41:9 | LL | x.0 = 1; //~ ERROR | ^^^^^^^ | help: consider changing this closure to take self by mutable reference - --> $DIR/mutability-errors.rs:49:12 + --> $DIR/mutability-errors.rs:39:12 | LL | fn_ref(|| { | ____________^ @@ -142,13 +142,13 @@ LL | | }); | |_____^ error[E0387]: cannot borrow data mutably in a captured outer variable in an `Fn` closure - --> $DIR/mutability-errors.rs:52:14 + --> $DIR/mutability-errors.rs:42:14 | LL | &mut x; //~ ERROR | ^ | help: consider changing this closure to take self by mutable reference - --> $DIR/mutability-errors.rs:49:12 + --> $DIR/mutability-errors.rs:39:12 | LL | fn_ref(|| { | ____________^ @@ -160,13 +160,13 @@ LL | | }); | |_____^ error[E0387]: cannot borrow data mutably in a captured outer variable in an `Fn` closure - --> $DIR/mutability-errors.rs:53:14 + --> $DIR/mutability-errors.rs:43:14 | LL | &mut x.0; //~ ERROR | ^^^ | help: consider changing this closure to take self by mutable reference - --> $DIR/mutability-errors.rs:49:12 + --> $DIR/mutability-errors.rs:39:12 | LL | fn_ref(|| { | ____________^ @@ -178,14 +178,14 @@ LL | | }); | |_____^ error[E0594]: cannot assign to captured outer variable in an `Fn` closure - --> $DIR/mutability-errors.rs:56:9 + --> $DIR/mutability-errors.rs:46:9 | LL | x = (1,); //~ ERROR | ^^^^^^^^ | = note: `Fn` closures cannot capture their enclosing environment for modifications help: consider changing this closure to take self by mutable reference - --> $DIR/mutability-errors.rs:55:12 + --> $DIR/mutability-errors.rs:45:12 | LL | fn_ref(move || { | ____________^ @@ -197,19 +197,19 @@ LL | | }); | |_____^ error[E0594]: cannot assign to field `x.0` of immutable binding - --> $DIR/mutability-errors.rs:57:9 + --> $DIR/mutability-errors.rs:47:9 | LL | x.0 = 1; //~ ERROR | ^^^^^^^ cannot mutably borrow field of immutable binding error[E0596]: cannot borrow captured outer variable in an `Fn` closure as mutable - --> $DIR/mutability-errors.rs:58:14 + --> $DIR/mutability-errors.rs:48:14 | LL | &mut x; //~ ERROR | ^ | help: consider changing this closure to take self by mutable reference - --> $DIR/mutability-errors.rs:55:12 + --> $DIR/mutability-errors.rs:45:12 | LL | fn_ref(move || { | ____________^ @@ -221,13 +221,13 @@ LL | | }); | |_____^ error[E0596]: cannot borrow field `x.0` of immutable binding as mutable - --> $DIR/mutability-errors.rs:59:14 + --> $DIR/mutability-errors.rs:49:14 | LL | &mut x.0; //~ ERROR | ^^^ cannot mutably borrow field of immutable binding error[E0596]: cannot borrow immutable argument `x` as mutable - --> $DIR/mutability-errors.rs:64:10 + --> $DIR/mutability-errors.rs:54:10 | LL | fn imm_local(x: (i32,)) { | - consider changing this to `mut x` @@ -235,7 +235,7 @@ LL | &mut x; //~ ERROR | ^ cannot borrow mutably error[E0596]: cannot borrow field `x.0` of immutable binding as mutable - --> $DIR/mutability-errors.rs:65:10 + --> $DIR/mutability-errors.rs:55:10 | LL | fn imm_local(x: (i32,)) { | - consider changing this to `mut x` @@ -244,7 +244,7 @@ LL | &mut x.0; //~ ERROR | ^^^ cannot mutably borrow field of immutable binding error[E0595]: closure cannot assign to immutable argument `x` - --> $DIR/mutability-errors.rs:69:5 + --> $DIR/mutability-errors.rs:59:5 | LL | fn imm_capture(x: (i32,)) { | - consider changing this to `mut x` @@ -252,7 +252,7 @@ LL | || { //~ ERROR | ^^ cannot borrow mutably error[E0594]: cannot assign to captured outer variable in an `FnMut` closure - --> $DIR/mutability-errors.rs:76:9 + --> $DIR/mutability-errors.rs:66:9 | LL | fn imm_capture(x: (i32,)) { | - help: consider making `x` mutable: `mut x` @@ -261,43 +261,43 @@ LL | x = (1,); //~ ERROR | ^^^^^^^^ error[E0594]: cannot assign to field `x.0` of immutable binding - --> $DIR/mutability-errors.rs:77:9 + --> $DIR/mutability-errors.rs:67:9 | LL | x.0 = 1; //~ ERROR | ^^^^^^^ cannot mutably borrow field of immutable binding error[E0596]: cannot borrow captured outer variable in an `FnMut` closure as mutable - --> $DIR/mutability-errors.rs:78:14 + --> $DIR/mutability-errors.rs:68:14 | LL | &mut x; //~ ERROR | ^ error[E0596]: cannot borrow field `x.0` of immutable binding as mutable - --> $DIR/mutability-errors.rs:79:14 + --> $DIR/mutability-errors.rs:69:14 | LL | &mut x.0; //~ ERROR | ^^^ cannot mutably borrow field of immutable binding error[E0594]: cannot assign to immutable static item - --> $DIR/mutability-errors.rs:86:5 + --> $DIR/mutability-errors.rs:76:5 | LL | X = (1,); //~ ERROR | ^^^^^^^^ error[E0594]: cannot assign to field of immutable binding - --> $DIR/mutability-errors.rs:87:5 + --> $DIR/mutability-errors.rs:77:5 | LL | X.0 = 1; //~ ERROR | ^^^^^^^ cannot mutably borrow field of immutable binding error[E0596]: cannot borrow immutable static item as mutable - --> $DIR/mutability-errors.rs:88:10 + --> $DIR/mutability-errors.rs:78:10 | LL | &mut X; //~ ERROR | ^ error[E0596]: cannot borrow field of immutable binding as mutable - --> $DIR/mutability-errors.rs:89:10 + --> $DIR/mutability-errors.rs:79:10 | LL | &mut X.0; //~ ERROR | ^^^ cannot mutably borrow field of immutable binding diff --git a/src/test/ui/borrowck/promote-ref-mut-in-let-issue-46557.nll.stderr b/src/test/ui/borrowck/promote-ref-mut-in-let-issue-46557.nll.stderr index 52f1547bce6f8..e9faa64561c78 100644 --- a/src/test/ui/borrowck/promote-ref-mut-in-let-issue-46557.nll.stderr +++ b/src/test/ui/borrowck/promote-ref-mut-in-let-issue-46557.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/promote-ref-mut-in-let-issue-46557.rs:15:21 + --> $DIR/promote-ref-mut-in-let-issue-46557.rs:5:21 | LL | let ref mut x = 1234543; //~ ERROR | ^^^^^^^ temporary value does not live long enough @@ -10,7 +10,7 @@ LL | } = note: borrowed value must be valid for the static lifetime... error[E0597]: borrowed value does not live long enough - --> $DIR/promote-ref-mut-in-let-issue-46557.rs:20:25 + --> $DIR/promote-ref-mut-in-let-issue-46557.rs:10:25 | LL | let (ref mut x, ) = (1234543, ); //~ ERROR | ^^^^^^^^^^^ temporary value does not live long enough @@ -21,7 +21,7 @@ LL | } = note: borrowed value must be valid for the static lifetime... error[E0597]: borrowed value does not live long enough - --> $DIR/promote-ref-mut-in-let-issue-46557.rs:25:11 + --> $DIR/promote-ref-mut-in-let-issue-46557.rs:15:11 | LL | match 1234543 { | ^^^^^^^ temporary value does not live long enough @@ -32,7 +32,7 @@ LL | } = note: borrowed value must be valid for the static lifetime... error[E0597]: borrowed value does not live long enough - --> $DIR/promote-ref-mut-in-let-issue-46557.rs:31:11 + --> $DIR/promote-ref-mut-in-let-issue-46557.rs:21:11 | LL | match (123443,) { | ^^^^^^^^^ temporary value does not live long enough @@ -43,7 +43,7 @@ LL | } = note: borrowed value must be valid for the static lifetime... error[E0597]: borrowed value does not live long enough - --> $DIR/promote-ref-mut-in-let-issue-46557.rs:37:10 + --> $DIR/promote-ref-mut-in-let-issue-46557.rs:27:10 | LL | &mut 1234543 //~ ERROR | ^^^^^^^ temporary value does not live long enough diff --git a/src/test/ui/borrowck/promote-ref-mut-in-let-issue-46557.rs b/src/test/ui/borrowck/promote-ref-mut-in-let-issue-46557.rs index 4c5f458d6a35f..ae305b68941e7 100644 --- a/src/test/ui/borrowck/promote-ref-mut-in-let-issue-46557.rs +++ b/src/test/ui/borrowck/promote-ref-mut-in-let-issue-46557.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we fail to promote the constant here which has a `ref // mut` borrow. diff --git a/src/test/ui/borrowck/promote-ref-mut-in-let-issue-46557.stderr b/src/test/ui/borrowck/promote-ref-mut-in-let-issue-46557.stderr index 931eb7da744e9..51e47fd44d90b 100644 --- a/src/test/ui/borrowck/promote-ref-mut-in-let-issue-46557.stderr +++ b/src/test/ui/borrowck/promote-ref-mut-in-let-issue-46557.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/promote-ref-mut-in-let-issue-46557.rs:15:9 + --> $DIR/promote-ref-mut-in-let-issue-46557.rs:5:9 | LL | let ref mut x = 1234543; //~ ERROR | ^^^^^^^^^ temporary value does not live long enough @@ -10,7 +10,7 @@ LL | } = note: borrowed value must be valid for the static lifetime... error[E0597]: borrowed value does not live long enough - --> $DIR/promote-ref-mut-in-let-issue-46557.rs:20:10 + --> $DIR/promote-ref-mut-in-let-issue-46557.rs:10:10 | LL | let (ref mut x, ) = (1234543, ); //~ ERROR | ^^^^^^^^^ borrowed value does not live long enough @@ -21,7 +21,7 @@ LL | } = note: borrowed value must be valid for the static lifetime... error[E0597]: borrowed value does not live long enough - --> $DIR/promote-ref-mut-in-let-issue-46557.rs:26:9 + --> $DIR/promote-ref-mut-in-let-issue-46557.rs:16:9 | LL | ref mut x => x //~ ERROR | ^^^^^^^^^ temporary value does not live long enough @@ -32,7 +32,7 @@ LL | } = note: borrowed value must be valid for the static lifetime... error[E0597]: borrowed value does not live long enough - --> $DIR/promote-ref-mut-in-let-issue-46557.rs:32:10 + --> $DIR/promote-ref-mut-in-let-issue-46557.rs:22:10 | LL | (ref mut x,) => x, //~ ERROR | ^^^^^^^^^ borrowed value does not live long enough @@ -43,7 +43,7 @@ LL | } = note: borrowed value must be valid for the static lifetime... error[E0597]: borrowed value does not live long enough - --> $DIR/promote-ref-mut-in-let-issue-46557.rs:37:10 + --> $DIR/promote-ref-mut-in-let-issue-46557.rs:27:10 | LL | &mut 1234543 //~ ERROR | ^^^^^^^ temporary value does not live long enough diff --git a/src/test/ui/borrowck/reassignment_immutable_fields.nll.stderr b/src/test/ui/borrowck/reassignment_immutable_fields.nll.stderr index 97f3bf5b81f66..1800932de6c6f 100644 --- a/src/test/ui/borrowck/reassignment_immutable_fields.nll.stderr +++ b/src/test/ui/borrowck/reassignment_immutable_fields.nll.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to `x.0`, as `x` is not declared as mutable - --> $DIR/reassignment_immutable_fields.rs:17:5 + --> $DIR/reassignment_immutable_fields.rs:7:5 | LL | let x: (u32, u32); | - help: consider changing this to be mutable: `mut x` @@ -7,7 +7,7 @@ LL | x.0 = 1; //~ ERROR | ^^^^^^^ cannot assign error[E0594]: cannot assign to `x.1`, as `x` is not declared as mutable - --> $DIR/reassignment_immutable_fields.rs:18:5 + --> $DIR/reassignment_immutable_fields.rs:8:5 | LL | let x: (u32, u32); | - help: consider changing this to be mutable: `mut x` @@ -16,7 +16,7 @@ LL | x.1 = 22; //~ ERROR | ^^^^^^^^ cannot assign error[E0594]: cannot assign to `x.0`, as `x` is not declared as mutable - --> $DIR/reassignment_immutable_fields.rs:25:5 + --> $DIR/reassignment_immutable_fields.rs:15:5 | LL | let x: (u32, u32); | - help: consider changing this to be mutable: `mut x` @@ -24,7 +24,7 @@ LL | x.0 = 1; //~ ERROR | ^^^^^^^ cannot assign error[E0594]: cannot assign to `x.1`, as `x` is not declared as mutable - --> $DIR/reassignment_immutable_fields.rs:26:5 + --> $DIR/reassignment_immutable_fields.rs:16:5 | LL | let x: (u32, u32); | - help: consider changing this to be mutable: `mut x` @@ -33,7 +33,7 @@ LL | x.1 = 22; //~ ERROR | ^^^^^^^^ cannot assign error[E0381]: use of possibly uninitialized variable: `x` - --> $DIR/reassignment_immutable_fields.rs:27:10 + --> $DIR/reassignment_immutable_fields.rs:17:10 | LL | drop(x); //~ ERROR | ^ use of possibly uninitialized `x` diff --git a/src/test/ui/borrowck/reassignment_immutable_fields.rs b/src/test/ui/borrowck/reassignment_immutable_fields.rs index c49ae2f9567fc..4529e32a6928e 100644 --- a/src/test/ui/borrowck/reassignment_immutable_fields.rs +++ b/src/test/ui/borrowck/reassignment_immutable_fields.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test is currently disallowed, but we hope someday to support it. // // FIXME(#21232) diff --git a/src/test/ui/borrowck/reassignment_immutable_fields.stderr b/src/test/ui/borrowck/reassignment_immutable_fields.stderr index 54d12f8fae85d..2e19f72017b91 100644 --- a/src/test/ui/borrowck/reassignment_immutable_fields.stderr +++ b/src/test/ui/borrowck/reassignment_immutable_fields.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to field `x.0` of immutable binding - --> $DIR/reassignment_immutable_fields.rs:17:5 + --> $DIR/reassignment_immutable_fields.rs:7:5 | LL | let x: (u32, u32); | - consider changing this to `mut x` @@ -7,7 +7,7 @@ LL | x.0 = 1; //~ ERROR | ^^^^^^^ cannot mutably borrow field of immutable binding error[E0594]: cannot assign to field `x.1` of immutable binding - --> $DIR/reassignment_immutable_fields.rs:18:5 + --> $DIR/reassignment_immutable_fields.rs:8:5 | LL | let x: (u32, u32); | - consider changing this to `mut x` @@ -16,19 +16,19 @@ LL | x.1 = 22; //~ ERROR | ^^^^^^^^ cannot mutably borrow field of immutable binding error[E0381]: use of possibly uninitialized variable: `x.0` - --> $DIR/reassignment_immutable_fields.rs:19:10 + --> $DIR/reassignment_immutable_fields.rs:9:10 | LL | drop(x.0); //~ ERROR | ^^^ use of possibly uninitialized `x.0` error[E0381]: use of possibly uninitialized variable: `x.1` - --> $DIR/reassignment_immutable_fields.rs:20:10 + --> $DIR/reassignment_immutable_fields.rs:10:10 | LL | drop(x.1); //~ ERROR | ^^^ use of possibly uninitialized `x.1` error[E0594]: cannot assign to field `x.0` of immutable binding - --> $DIR/reassignment_immutable_fields.rs:25:5 + --> $DIR/reassignment_immutable_fields.rs:15:5 | LL | let x: (u32, u32); | - consider changing this to `mut x` @@ -36,7 +36,7 @@ LL | x.0 = 1; //~ ERROR | ^^^^^^^ cannot mutably borrow field of immutable binding error[E0594]: cannot assign to field `x.1` of immutable binding - --> $DIR/reassignment_immutable_fields.rs:26:5 + --> $DIR/reassignment_immutable_fields.rs:16:5 | LL | let x: (u32, u32); | - consider changing this to `mut x` @@ -45,7 +45,7 @@ LL | x.1 = 22; //~ ERROR | ^^^^^^^^ cannot mutably borrow field of immutable binding error[E0381]: use of possibly uninitialized variable: `x` - --> $DIR/reassignment_immutable_fields.rs:27:10 + --> $DIR/reassignment_immutable_fields.rs:17:10 | LL | drop(x); //~ ERROR | ^ use of possibly uninitialized `x` diff --git a/src/test/ui/borrowck/reassignment_immutable_fields_overlapping.nll.stderr b/src/test/ui/borrowck/reassignment_immutable_fields_overlapping.nll.stderr index c433d6e25c9de..96ed2ac2942a7 100644 --- a/src/test/ui/borrowck/reassignment_immutable_fields_overlapping.nll.stderr +++ b/src/test/ui/borrowck/reassignment_immutable_fields_overlapping.nll.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to `x.a`, as `x` is not declared as mutable - --> $DIR/reassignment_immutable_fields_overlapping.rs:22:5 + --> $DIR/reassignment_immutable_fields_overlapping.rs:12:5 | LL | let x: Foo; | - help: consider changing this to be mutable: `mut x` @@ -7,7 +7,7 @@ LL | x.a = 1; //~ ERROR | ^^^^^^^ cannot assign error[E0594]: cannot assign to `x.b`, as `x` is not declared as mutable - --> $DIR/reassignment_immutable_fields_overlapping.rs:23:5 + --> $DIR/reassignment_immutable_fields_overlapping.rs:13:5 | LL | let x: Foo; | - help: consider changing this to be mutable: `mut x` diff --git a/src/test/ui/borrowck/reassignment_immutable_fields_overlapping.rs b/src/test/ui/borrowck/reassignment_immutable_fields_overlapping.rs index add23ec8f245b..d7aad6c01bd26 100644 --- a/src/test/ui/borrowck/reassignment_immutable_fields_overlapping.rs +++ b/src/test/ui/borrowck/reassignment_immutable_fields_overlapping.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This should never be allowed -- `foo.a` and `foo.b` are // overlapping, so since `x` is not `mut` we should not permit // reassignment. diff --git a/src/test/ui/borrowck/reassignment_immutable_fields_overlapping.stderr b/src/test/ui/borrowck/reassignment_immutable_fields_overlapping.stderr index 70849905f92ab..48d00bfd8e52a 100644 --- a/src/test/ui/borrowck/reassignment_immutable_fields_overlapping.stderr +++ b/src/test/ui/borrowck/reassignment_immutable_fields_overlapping.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to field `x.a` of immutable binding - --> $DIR/reassignment_immutable_fields_overlapping.rs:22:5 + --> $DIR/reassignment_immutable_fields_overlapping.rs:12:5 | LL | let x: Foo; | - consider changing this to `mut x` @@ -7,7 +7,7 @@ LL | x.a = 1; //~ ERROR | ^^^^^^^ cannot mutably borrow field of immutable binding error[E0594]: cannot assign to field `x.b` of immutable binding - --> $DIR/reassignment_immutable_fields_overlapping.rs:23:5 + --> $DIR/reassignment_immutable_fields_overlapping.rs:13:5 | LL | let x: Foo; | - consider changing this to `mut x` diff --git a/src/test/ui/borrowck/reassignment_immutable_fields_twice.nll.stderr b/src/test/ui/borrowck/reassignment_immutable_fields_twice.nll.stderr index 2160ae20c425a..d34d32c437bfc 100644 --- a/src/test/ui/borrowck/reassignment_immutable_fields_twice.nll.stderr +++ b/src/test/ui/borrowck/reassignment_immutable_fields_twice.nll.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to `x.0`, as `x` is not declared as mutable - --> $DIR/reassignment_immutable_fields_twice.rs:17:5 + --> $DIR/reassignment_immutable_fields_twice.rs:7:5 | LL | let x: (u32, u32); | - help: consider changing this to be mutable: `mut x` @@ -8,7 +8,7 @@ LL | x.0 = 1; //~ ERROR | ^^^^^^^ cannot assign error[E0594]: cannot assign to `x.0`, as `x` is not declared as mutable - --> $DIR/reassignment_immutable_fields_twice.rs:22:5 + --> $DIR/reassignment_immutable_fields_twice.rs:12:5 | LL | let x: (u32, u32); | - help: consider changing this to be mutable: `mut x` @@ -16,7 +16,7 @@ LL | x.0 = 1; //~ ERROR | ^^^^^^^ cannot assign error[E0594]: cannot assign to `x.0`, as `x` is not declared as mutable - --> $DIR/reassignment_immutable_fields_twice.rs:23:5 + --> $DIR/reassignment_immutable_fields_twice.rs:13:5 | LL | let x: (u32, u32); | - help: consider changing this to be mutable: `mut x` @@ -25,7 +25,7 @@ LL | x.0 = 22; //~ ERROR | ^^^^^^^^ cannot assign error[E0594]: cannot assign to `x.1`, as `x` is not declared as mutable - --> $DIR/reassignment_immutable_fields_twice.rs:24:5 + --> $DIR/reassignment_immutable_fields_twice.rs:14:5 | LL | let x: (u32, u32); | - help: consider changing this to be mutable: `mut x` diff --git a/src/test/ui/borrowck/reassignment_immutable_fields_twice.rs b/src/test/ui/borrowck/reassignment_immutable_fields_twice.rs index c7e7e5c453357..a10baf627f30b 100644 --- a/src/test/ui/borrowck/reassignment_immutable_fields_twice.rs +++ b/src/test/ui/borrowck/reassignment_immutable_fields_twice.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This should never be allowed -- since `x` is not `mut`, so `x.0` // cannot be assigned twice. diff --git a/src/test/ui/borrowck/reassignment_immutable_fields_twice.stderr b/src/test/ui/borrowck/reassignment_immutable_fields_twice.stderr index b3c013d8b1f49..f3d8919da1477 100644 --- a/src/test/ui/borrowck/reassignment_immutable_fields_twice.stderr +++ b/src/test/ui/borrowck/reassignment_immutable_fields_twice.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to field `x.0` of immutable binding - --> $DIR/reassignment_immutable_fields_twice.rs:17:5 + --> $DIR/reassignment_immutable_fields_twice.rs:7:5 | LL | let x: (u32, u32); | - consider changing this to `mut x` @@ -8,7 +8,7 @@ LL | x.0 = 1; //~ ERROR | ^^^^^^^ cannot mutably borrow field of immutable binding error[E0594]: cannot assign to field `x.0` of immutable binding - --> $DIR/reassignment_immutable_fields_twice.rs:22:5 + --> $DIR/reassignment_immutable_fields_twice.rs:12:5 | LL | let x: (u32, u32); | - consider changing this to `mut x` @@ -16,7 +16,7 @@ LL | x.0 = 1; //~ ERROR | ^^^^^^^ cannot mutably borrow field of immutable binding error[E0594]: cannot assign to field `x.0` of immutable binding - --> $DIR/reassignment_immutable_fields_twice.rs:23:5 + --> $DIR/reassignment_immutable_fields_twice.rs:13:5 | LL | let x: (u32, u32); | - consider changing this to `mut x` @@ -25,7 +25,7 @@ LL | x.0 = 22; //~ ERROR | ^^^^^^^^ cannot mutably borrow field of immutable binding error[E0594]: cannot assign to field `x.1` of immutable binding - --> $DIR/reassignment_immutable_fields_twice.rs:24:5 + --> $DIR/reassignment_immutable_fields_twice.rs:14:5 | LL | let x: (u32, u32); | - consider changing this to `mut x` diff --git a/src/test/ui/borrowck/regions-bound-missing-bound-in-impl.rs b/src/test/ui/borrowck/regions-bound-missing-bound-in-impl.rs index 04f90ea9ad3a2..da918ba92b863 100644 --- a/src/test/ui/borrowck/regions-bound-missing-bound-in-impl.rs +++ b/src/test/ui/borrowck/regions-bound-missing-bound-in-impl.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that explicit region bounds are allowed on the various // nominal types (but not on other types) and that they are type // checked. diff --git a/src/test/ui/borrowck/regions-bound-missing-bound-in-impl.stderr b/src/test/ui/borrowck/regions-bound-missing-bound-in-impl.stderr index b139369014e44..8d6ac6275062e 100644 --- a/src/test/ui/borrowck/regions-bound-missing-bound-in-impl.stderr +++ b/src/test/ui/borrowck/regions-bound-missing-bound-in-impl.stderr @@ -1,5 +1,5 @@ error[E0195]: lifetime parameters or bounds on method `no_bound` do not match the trait declaration - --> $DIR/regions-bound-missing-bound-in-impl.rs:29:16 + --> $DIR/regions-bound-missing-bound-in-impl.rs:19:16 | LL | fn no_bound<'b>(self, b: Inv<'b>); | ---- lifetimes in impl do not match this method in trait @@ -8,7 +8,7 @@ LL | fn no_bound<'b:'a>(self, b: Inv<'b>) { | ^^^^^^^ lifetimes do not match method in trait error[E0195]: lifetime parameters or bounds on method `has_bound` do not match the trait declaration - --> $DIR/regions-bound-missing-bound-in-impl.rs:33:17 + --> $DIR/regions-bound-missing-bound-in-impl.rs:23:17 | LL | fn has_bound<'b:'a>(self, b: Inv<'b>); | ------- lifetimes in impl do not match this method in trait @@ -17,26 +17,26 @@ LL | fn has_bound<'b>(self, b: Inv<'b>) { | ^^^^ lifetimes do not match method in trait error[E0308]: method not compatible with trait - --> $DIR/regions-bound-missing-bound-in-impl.rs:37:5 + --> $DIR/regions-bound-missing-bound-in-impl.rs:27:5 | LL | fn wrong_bound1<'b,'c,'d:'a+'c>(self, b: Inv<'b>, c: Inv<'c>, d: Inv<'d>) { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lifetime mismatch | = note: expected type `fn(&'a isize, Inv<'c>, Inv<'c>, Inv<'d>)` found type `fn(&'a isize, Inv<'_>, Inv<'c>, Inv<'d>)` -note: the lifetime 'c as defined on the method body at 37:24... - --> $DIR/regions-bound-missing-bound-in-impl.rs:37:24 +note: the lifetime 'c as defined on the method body at 27:24... + --> $DIR/regions-bound-missing-bound-in-impl.rs:27:24 | LL | fn wrong_bound1<'b,'c,'d:'a+'c>(self, b: Inv<'b>, c: Inv<'c>, d: Inv<'d>) { | ^^ -note: ...does not necessarily outlive the lifetime 'c as defined on the method body at 37:24 - --> $DIR/regions-bound-missing-bound-in-impl.rs:37:24 +note: ...does not necessarily outlive the lifetime 'c as defined on the method body at 27:24 + --> $DIR/regions-bound-missing-bound-in-impl.rs:27:24 | LL | fn wrong_bound1<'b,'c,'d:'a+'c>(self, b: Inv<'b>, c: Inv<'c>, d: Inv<'d>) { | ^^ error[E0195]: lifetime parameters or bounds on method `wrong_bound2` do not match the trait declaration - --> $DIR/regions-bound-missing-bound-in-impl.rs:51:5 + --> $DIR/regions-bound-missing-bound-in-impl.rs:41:5 | LL | fn wrong_bound2<'b,'c,'d:'a+'b>(self, b: Inv<'b>, c: Inv<'c>, d: Inv<'d>); | ---------------- lifetimes in impl do not match this method in trait @@ -45,7 +45,7 @@ LL | fn wrong_bound2(self, b: Inv, c: Inv, d: Inv) { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lifetimes do not match method in trait error[E0276]: impl has stricter requirements than trait - --> $DIR/regions-bound-missing-bound-in-impl.rs:58:5 + --> $DIR/regions-bound-missing-bound-in-impl.rs:48:5 | LL | fn another_bound<'x: 'a>(self, x: Inv<'x>, y: Inv<'t>); | ------------------------------------------------------- definition of `another_bound` from trait diff --git a/src/test/ui/borrowck/regions-escape-bound-fn-2.nll.stderr b/src/test/ui/borrowck/regions-escape-bound-fn-2.nll.stderr index 1a18817e94365..9ad20baed4b20 100644 --- a/src/test/ui/borrowck/regions-escape-bound-fn-2.nll.stderr +++ b/src/test/ui/borrowck/regions-escape-bound-fn-2.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/regions-escape-bound-fn-2.rs:18:27 + --> $DIR/regions-escape-bound-fn-2.rs:8:27 | LL | with_int(|y| x = Some(y)); | ^ error: borrowed data escapes outside of closure - --> $DIR/regions-escape-bound-fn-2.rs:18:18 + --> $DIR/regions-escape-bound-fn-2.rs:8:18 | LL | let mut x = None; | ----- `x` is declared here, outside of the closure body diff --git a/src/test/ui/borrowck/regions-escape-bound-fn-2.rs b/src/test/ui/borrowck/regions-escape-bound-fn-2.rs index 1c38dee99a7b0..cb423032b4610 100644 --- a/src/test/ui/borrowck/regions-escape-bound-fn-2.rs +++ b/src/test/ui/borrowck/regions-escape-bound-fn-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn with_int(f: F) where F: FnOnce(&isize) { let x = 3; f(&x); diff --git a/src/test/ui/borrowck/regions-escape-bound-fn-2.stderr b/src/test/ui/borrowck/regions-escape-bound-fn-2.stderr index 05654a9356484..4b37edafa1273 100644 --- a/src/test/ui/borrowck/regions-escape-bound-fn-2.stderr +++ b/src/test/ui/borrowck/regions-escape-bound-fn-2.stderr @@ -1,5 +1,5 @@ error: borrowed data cannot be stored outside of its closure - --> $DIR/regions-escape-bound-fn-2.rs:18:27 + --> $DIR/regions-escape-bound-fn-2.rs:8:27 | LL | let mut x = None; | ----- borrowed data cannot be stored into here... diff --git a/src/test/ui/borrowck/regions-escape-bound-fn.nll.stderr b/src/test/ui/borrowck/regions-escape-bound-fn.nll.stderr index 62ea9a0854bde..be23cdc6a1074 100644 --- a/src/test/ui/borrowck/regions-escape-bound-fn.nll.stderr +++ b/src/test/ui/borrowck/regions-escape-bound-fn.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/regions-escape-bound-fn.rs:18:22 + --> $DIR/regions-escape-bound-fn.rs:8:22 | LL | with_int(|y| x = Some(y)); | ^^^^^^^ error: borrowed data escapes outside of closure - --> $DIR/regions-escape-bound-fn.rs:18:18 + --> $DIR/regions-escape-bound-fn.rs:8:18 | LL | let mut x: Option<&isize> = None; | ----- `x` is declared here, outside of the closure body diff --git a/src/test/ui/borrowck/regions-escape-bound-fn.rs b/src/test/ui/borrowck/regions-escape-bound-fn.rs index c22742371acbc..772df3e6c5822 100644 --- a/src/test/ui/borrowck/regions-escape-bound-fn.rs +++ b/src/test/ui/borrowck/regions-escape-bound-fn.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn with_int(f: F) where F: FnOnce(&isize) { let x = 3; f(&x); diff --git a/src/test/ui/borrowck/regions-escape-bound-fn.stderr b/src/test/ui/borrowck/regions-escape-bound-fn.stderr index 5f05ee90d072c..4973d5306f959 100644 --- a/src/test/ui/borrowck/regions-escape-bound-fn.stderr +++ b/src/test/ui/borrowck/regions-escape-bound-fn.stderr @@ -1,5 +1,5 @@ error: borrowed data cannot be stored outside of its closure - --> $DIR/regions-escape-bound-fn.rs:18:27 + --> $DIR/regions-escape-bound-fn.rs:8:27 | LL | let mut x: Option<&isize> = None; | ----- borrowed data cannot be stored into here... diff --git a/src/test/ui/borrowck/regions-escape-unboxed-closure.nll.stderr b/src/test/ui/borrowck/regions-escape-unboxed-closure.nll.stderr index 44eead9fb5a98..74a0ae8db1c1f 100644 --- a/src/test/ui/borrowck/regions-escape-unboxed-closure.nll.stderr +++ b/src/test/ui/borrowck/regions-escape-unboxed-closure.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/regions-escape-unboxed-closure.rs:16:27 + --> $DIR/regions-escape-unboxed-closure.rs:6:27 | LL | with_int(&mut |y| x = Some(y)); | ^^^^^^^ error: borrowed data escapes outside of closure - --> $DIR/regions-escape-unboxed-closure.rs:16:23 + --> $DIR/regions-escape-unboxed-closure.rs:6:23 | LL | let mut x: Option<&isize> = None; | ----- `x` is declared here, outside of the closure body diff --git a/src/test/ui/borrowck/regions-escape-unboxed-closure.rs b/src/test/ui/borrowck/regions-escape-unboxed-closure.rs index 5a214504df4c1..62ddf4decfcab 100644 --- a/src/test/ui/borrowck/regions-escape-unboxed-closure.rs +++ b/src/test/ui/borrowck/regions-escape-unboxed-closure.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn with_int(f: &mut FnMut(&isize)) { } diff --git a/src/test/ui/borrowck/regions-escape-unboxed-closure.stderr b/src/test/ui/borrowck/regions-escape-unboxed-closure.stderr index c90dd2417d0e0..047e290acae14 100644 --- a/src/test/ui/borrowck/regions-escape-unboxed-closure.stderr +++ b/src/test/ui/borrowck/regions-escape-unboxed-closure.stderr @@ -1,5 +1,5 @@ error: borrowed data cannot be stored outside of its closure - --> $DIR/regions-escape-unboxed-closure.rs:16:32 + --> $DIR/regions-escape-unboxed-closure.rs:6:32 | LL | let mut x: Option<&isize> = None; | ----- borrowed data cannot be stored into here... diff --git a/src/test/ui/borrowck/two-phase-across-loop.rs b/src/test/ui/borrowck/two-phase-across-loop.rs index e03a0355b48d6..b1a4c54f49b15 100644 --- a/src/test/ui/borrowck/two-phase-across-loop.rs +++ b/src/test/ui/borrowck/two-phase-across-loop.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that a borrow which starts as a 2-phase borrow and gets // carried around a loop winds up conflicting with itself. diff --git a/src/test/ui/borrowck/two-phase-across-loop.stderr b/src/test/ui/borrowck/two-phase-across-loop.stderr index 65c3d27923ef5..10ff0ca604c5a 100644 --- a/src/test/ui/borrowck/two-phase-across-loop.stderr +++ b/src/test/ui/borrowck/two-phase-across-loop.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `foo` as mutable more than once at a time - --> $DIR/two-phase-across-loop.rs:29:22 + --> $DIR/two-phase-across-loop.rs:19:22 | LL | strings.push(foo.get_string()); //~ ERROR cannot borrow `foo` as mutable | ^^^ mutable borrow starts here in previous iteration of loop diff --git a/src/test/ui/borrowck/two-phase-activation-sharing-interference.nll_target.stderr b/src/test/ui/borrowck/two-phase-activation-sharing-interference.nll_target.stderr index 5a7f33e5b56a3..44c7ade73d9c7 100644 --- a/src/test/ui/borrowck/two-phase-activation-sharing-interference.nll_target.stderr +++ b/src/test/ui/borrowck/two-phase-activation-sharing-interference.nll_target.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable - --> $DIR/two-phase-activation-sharing-interference.rs:42:15 + --> $DIR/two-phase-activation-sharing-interference.rs:32:15 | LL | let y = &mut x; | ------ mutable borrow occurs here @@ -10,7 +10,7 @@ LL | *y += 1; | ------- borrow later used here error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable - --> $DIR/two-phase-activation-sharing-interference.rs:50:13 + --> $DIR/two-phase-activation-sharing-interference.rs:40:13 | LL | let y = &mut x; | ------ mutable borrow occurs here @@ -21,7 +21,7 @@ LL | *y += 1; | ------- borrow later used here error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable - --> $DIR/two-phase-activation-sharing-interference.rs:61:13 + --> $DIR/two-phase-activation-sharing-interference.rs:51:13 | LL | let y = &mut x; | ------ mutable borrow occurs here @@ -32,7 +32,7 @@ LL | *y += 1; | ------- borrow later used here error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable - --> $DIR/two-phase-activation-sharing-interference.rs:72:14 + --> $DIR/two-phase-activation-sharing-interference.rs:62:14 | LL | let y = &mut x; | ------ mutable borrow occurs here diff --git a/src/test/ui/borrowck/two-phase-activation-sharing-interference.rs b/src/test/ui/borrowck/two-phase-activation-sharing-interference.rs index 77b237e34f2b7..5754220e824f5 100644 --- a/src/test/ui/borrowck/two-phase-activation-sharing-interference.rs +++ b/src/test/ui/borrowck/two-phase-activation-sharing-interference.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // revisions: nll_target diff --git a/src/test/ui/borrowck/two-phase-allow-access-during-reservation.nll_target.stderr b/src/test/ui/borrowck/two-phase-allow-access-during-reservation.nll_target.stderr index 45cfc836017b1..232876e6f0b74 100644 --- a/src/test/ui/borrowck/two-phase-allow-access-during-reservation.nll_target.stderr +++ b/src/test/ui/borrowck/two-phase-allow-access-during-reservation.nll_target.stderr @@ -1,5 +1,5 @@ error[E0503]: cannot use `i` because it was mutably borrowed - --> $DIR/two-phase-allow-access-during-reservation.rs:40:19 + --> $DIR/two-phase-allow-access-during-reservation.rs:30:19 | LL | /*1*/ let p = &mut i; // (reservation of `i` starts here) | ------ borrow of `i` occurs here @@ -11,7 +11,7 @@ LL | /*3*/ *p += 1; // (mutable borrow of `i` starts here, since `p` | ------- borrow later used here error[E0503]: cannot use `i` because it was mutably borrowed - --> $DIR/two-phase-allow-access-during-reservation.rs:45:19 + --> $DIR/two-phase-allow-access-during-reservation.rs:35:19 | LL | /*1*/ let p = &mut i; // (reservation of `i` starts here) | ------ borrow of `i` occurs here diff --git a/src/test/ui/borrowck/two-phase-allow-access-during-reservation.rs b/src/test/ui/borrowck/two-phase-allow-access-during-reservation.rs index 5deabf9376482..e428964939aff 100644 --- a/src/test/ui/borrowck/two-phase-allow-access-during-reservation.rs +++ b/src/test/ui/borrowck/two-phase-allow-access-during-reservation.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // revisions: nll_target diff --git a/src/test/ui/borrowck/two-phase-cannot-nest-mut-self-calls.rs b/src/test/ui/borrowck/two-phase-cannot-nest-mut-self-calls.rs index 15700a1d61a1f..fd1b8841b4e8a 100644 --- a/src/test/ui/borrowck/two-phase-cannot-nest-mut-self-calls.rs +++ b/src/test/ui/borrowck/two-phase-cannot-nest-mut-self-calls.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z borrowck=mir -Z two-phase-borrows // This is the third counter-example from Niko's blog post diff --git a/src/test/ui/borrowck/two-phase-cannot-nest-mut-self-calls.stderr b/src/test/ui/borrowck/two-phase-cannot-nest-mut-self-calls.stderr index 942a38febdd49..17ade61b091e0 100644 --- a/src/test/ui/borrowck/two-phase-cannot-nest-mut-self-calls.stderr +++ b/src/test/ui/borrowck/two-phase-cannot-nest-mut-self-calls.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `vec` as mutable because it is also borrowed as immutable - --> $DIR/two-phase-cannot-nest-mut-self-calls.rs:26:9 + --> $DIR/two-phase-cannot-nest-mut-self-calls.rs:16:9 | LL | vec.get({ | --- diff --git a/src/test/ui/borrowck/two-phase-method-receivers.rs b/src/test/ui/borrowck/two-phase-method-receivers.rs index 6d7ed61bdd8b5..f1df1a6a2c899 100644 --- a/src/test/ui/borrowck/two-phase-method-receivers.rs +++ b/src/test/ui/borrowck/two-phase-method-receivers.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z borrowck=mir -Z two-phase-borrows // run-pass diff --git a/src/test/ui/borrowck/two-phase-multi-mut.rs b/src/test/ui/borrowck/two-phase-multi-mut.rs index 2b82362885573..ed3d257da9f0f 100644 --- a/src/test/ui/borrowck/two-phase-multi-mut.rs +++ b/src/test/ui/borrowck/two-phase-multi-mut.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] struct Foo { diff --git a/src/test/ui/borrowck/two-phase-multi-mut.stderr b/src/test/ui/borrowck/two-phase-multi-mut.stderr index a7e1dd9536453..16f6b262626e2 100644 --- a/src/test/ui/borrowck/two-phase-multi-mut.stderr +++ b/src/test/ui/borrowck/two-phase-multi-mut.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `foo` as mutable more than once at a time - --> $DIR/two-phase-multi-mut.rs:23:5 + --> $DIR/two-phase-multi-mut.rs:13:5 | LL | foo.method(&mut foo); | ^^^^^^^^^^^--------^ @@ -9,7 +9,7 @@ LL | foo.method(&mut foo); | borrow later used here error[E0499]: cannot borrow `foo` as mutable more than once at a time - --> $DIR/two-phase-multi-mut.rs:23:16 + --> $DIR/two-phase-multi-mut.rs:13:16 | LL | foo.method(&mut foo); | -----------^^^^^^^^- diff --git a/src/test/ui/borrowck/two-phase-multiple-activations.rs b/src/test/ui/borrowck/two-phase-multiple-activations.rs index 9ea9696511b71..38ba094864069 100644 --- a/src/test/ui/borrowck/two-phase-multiple-activations.rs +++ b/src/test/ui/borrowck/two-phase-multiple-activations.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z borrowck=mir -Z two-phase-borrows // run-pass diff --git a/src/test/ui/borrowck/two-phase-nonrecv-autoref.ast.nll.stderr b/src/test/ui/borrowck/two-phase-nonrecv-autoref.ast.nll.stderr index a8651c0e741bf..1840fce0c3b17 100644 --- a/src/test/ui/borrowck/two-phase-nonrecv-autoref.ast.nll.stderr +++ b/src/test/ui/borrowck/two-phase-nonrecv-autoref.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `*f` as mutable more than once at a time - --> $DIR/two-phase-nonrecv-autoref.rs:70:11 + --> $DIR/two-phase-nonrecv-autoref.rs:60:11 | LL | f(f(10)); | --^----- @@ -9,7 +9,7 @@ LL | f(f(10)); | borrow later used here error[E0382]: use of moved value: `*f` - --> $DIR/two-phase-nonrecv-autoref.rs:79:11 + --> $DIR/two-phase-nonrecv-autoref.rs:69:11 | LL | f(f(10)); | - ^ value used here after move @@ -17,7 +17,7 @@ LL | f(f(10)); | value moved here error[E0499]: cannot borrow `*f` as mutable more than once at a time - --> $DIR/two-phase-nonrecv-autoref.rs:86:11 + --> $DIR/two-phase-nonrecv-autoref.rs:76:11 | LL | f(f(10)); | --^----- @@ -27,19 +27,19 @@ LL | f(f(10)); | borrow later used here error[E0161]: cannot move a value of type dyn std::ops::FnOnce(i32) -> i32: the size of dyn std::ops::FnOnce(i32) -> i32 cannot be statically determined - --> $DIR/two-phase-nonrecv-autoref.rs:95:9 + --> $DIR/two-phase-nonrecv-autoref.rs:85:9 | LL | f(f(10)); | ^ error[E0161]: cannot move a value of type dyn std::ops::FnOnce(i32) -> i32: the size of dyn std::ops::FnOnce(i32) -> i32 cannot be statically determined - --> $DIR/two-phase-nonrecv-autoref.rs:95:11 + --> $DIR/two-phase-nonrecv-autoref.rs:85:11 | LL | f(f(10)); | ^ error[E0382]: use of moved value: `*f` - --> $DIR/two-phase-nonrecv-autoref.rs:95:11 + --> $DIR/two-phase-nonrecv-autoref.rs:85:11 | LL | f(f(10)); | - ^ value used here after move @@ -47,7 +47,7 @@ LL | f(f(10)); | value moved here error[E0502]: cannot borrow `a` as immutable because it is also borrowed as mutable - --> $DIR/two-phase-nonrecv-autoref.rs:139:27 + --> $DIR/two-phase-nonrecv-autoref.rs:129:27 | LL | double_access(&mut a, &a); | ----------------------^^- @@ -57,7 +57,7 @@ LL | double_access(&mut a, &a); | borrow later used here error[E0502]: cannot borrow `i` as immutable because it is also borrowed as mutable - --> $DIR/two-phase-nonrecv-autoref.rs:167:7 + --> $DIR/two-phase-nonrecv-autoref.rs:157:7 | LL | i[i[3]] = 4; | --^---- @@ -67,7 +67,7 @@ LL | i[i[3]] = 4; | borrow later used here error[E0502]: cannot borrow `i` as immutable because it is also borrowed as mutable - --> $DIR/two-phase-nonrecv-autoref.rs:173:7 + --> $DIR/two-phase-nonrecv-autoref.rs:163:7 | LL | i[i[3]] = i[4]; | --^---- diff --git a/src/test/ui/borrowck/two-phase-nonrecv-autoref.ast.stderr b/src/test/ui/borrowck/two-phase-nonrecv-autoref.ast.stderr index b64323a5cc421..426939f371ca5 100644 --- a/src/test/ui/borrowck/two-phase-nonrecv-autoref.ast.stderr +++ b/src/test/ui/borrowck/two-phase-nonrecv-autoref.ast.stderr @@ -1,5 +1,5 @@ error[E0503]: cannot use `*x` because it was mutably borrowed - --> $DIR/two-phase-nonrecv-autoref.rs:41:12 + --> $DIR/two-phase-nonrecv-autoref.rs:31:12 | LL | foo(x, *x); | - ^^ use of borrowed `*x` @@ -7,7 +7,7 @@ LL | foo(x, *x); | borrow of `*x` occurs here error[E0499]: cannot borrow `*f` as mutable more than once at a time - --> $DIR/two-phase-nonrecv-autoref.rs:70:11 + --> $DIR/two-phase-nonrecv-autoref.rs:60:11 | LL | f(f(10)); | - ^ - first borrow ends here @@ -16,7 +16,7 @@ LL | f(f(10)); | first mutable borrow occurs here error[E0382]: use of moved value: `*f` - --> $DIR/two-phase-nonrecv-autoref.rs:79:11 + --> $DIR/two-phase-nonrecv-autoref.rs:69:11 | LL | f(f(10)); | - ^ value used here after move @@ -26,7 +26,7 @@ LL | f(f(10)); = note: move occurs because `*f` has type `F`, which does not implement the `Copy` trait error[E0499]: cannot borrow `*f` as mutable more than once at a time - --> $DIR/two-phase-nonrecv-autoref.rs:86:11 + --> $DIR/two-phase-nonrecv-autoref.rs:76:11 | LL | f(f(10)); | - ^ - first borrow ends here @@ -35,7 +35,7 @@ LL | f(f(10)); | first mutable borrow occurs here error[E0382]: use of moved value: `*f` - --> $DIR/two-phase-nonrecv-autoref.rs:95:11 + --> $DIR/two-phase-nonrecv-autoref.rs:85:11 | LL | f(f(10)); | - ^ value used here after move @@ -45,7 +45,7 @@ LL | f(f(10)); = note: move occurs because `*f` has type `(dyn std::ops::FnOnce(i32) -> i32 + 'static)`, which does not implement the `Copy` trait error[E0502]: cannot borrow `a` as immutable because it is also borrowed as mutable - --> $DIR/two-phase-nonrecv-autoref.rs:139:28 + --> $DIR/two-phase-nonrecv-autoref.rs:129:28 | LL | double_access(&mut a, &a); | - ^- mutable borrow ends here @@ -54,7 +54,7 @@ LL | double_access(&mut a, &a); | mutable borrow occurs here error[E0502]: cannot borrow `a` as immutable because it is also borrowed as mutable - --> $DIR/two-phase-nonrecv-autoref.rs:145:9 + --> $DIR/two-phase-nonrecv-autoref.rs:135:9 | LL | a.m(a.i(10)); | - ^ - mutable borrow ends here @@ -63,7 +63,7 @@ LL | a.m(a.i(10)); | mutable borrow occurs here error[E0502]: cannot borrow `i` as immutable because it is also borrowed as mutable - --> $DIR/two-phase-nonrecv-autoref.rs:167:7 + --> $DIR/two-phase-nonrecv-autoref.rs:157:7 | LL | i[i[3]] = 4; | - ^ - mutable borrow ends here @@ -72,7 +72,7 @@ LL | i[i[3]] = 4; | mutable borrow occurs here error[E0502]: cannot borrow `i` as immutable because it is also borrowed as mutable - --> $DIR/two-phase-nonrecv-autoref.rs:173:7 + --> $DIR/two-phase-nonrecv-autoref.rs:163:7 | LL | i[i[3]] = i[4]; | - ^ - mutable borrow ends here @@ -81,7 +81,7 @@ LL | i[i[3]] = i[4]; | mutable borrow occurs here error[E0502]: cannot borrow `v` as immutable because it is also borrowed as mutable - --> $DIR/two-phase-nonrecv-autoref.rs:182:12 + --> $DIR/two-phase-nonrecv-autoref.rs:172:12 | LL | v.push(v.len()); | - ^ - mutable borrow ends here @@ -90,7 +90,7 @@ LL | v.push(v.len()); | mutable borrow occurs here error[E0502]: cannot borrow `s` as immutable because it is also borrowed as mutable - --> $DIR/two-phase-nonrecv-autoref.rs:193:9 + --> $DIR/two-phase-nonrecv-autoref.rs:183:9 | LL | s.m(s.i(10)); | - ^ - mutable borrow ends here @@ -99,7 +99,7 @@ LL | s.m(s.i(10)); | mutable borrow occurs here error[E0502]: cannot borrow `t` as immutable because it is also borrowed as mutable - --> $DIR/two-phase-nonrecv-autoref.rs:198:9 + --> $DIR/two-phase-nonrecv-autoref.rs:188:9 | LL | t.m(t.i(10)); | - ^ - mutable borrow ends here diff --git a/src/test/ui/borrowck/two-phase-nonrecv-autoref.nll.stderr b/src/test/ui/borrowck/two-phase-nonrecv-autoref.nll.stderr index a8651c0e741bf..1840fce0c3b17 100644 --- a/src/test/ui/borrowck/two-phase-nonrecv-autoref.nll.stderr +++ b/src/test/ui/borrowck/two-phase-nonrecv-autoref.nll.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `*f` as mutable more than once at a time - --> $DIR/two-phase-nonrecv-autoref.rs:70:11 + --> $DIR/two-phase-nonrecv-autoref.rs:60:11 | LL | f(f(10)); | --^----- @@ -9,7 +9,7 @@ LL | f(f(10)); | borrow later used here error[E0382]: use of moved value: `*f` - --> $DIR/two-phase-nonrecv-autoref.rs:79:11 + --> $DIR/two-phase-nonrecv-autoref.rs:69:11 | LL | f(f(10)); | - ^ value used here after move @@ -17,7 +17,7 @@ LL | f(f(10)); | value moved here error[E0499]: cannot borrow `*f` as mutable more than once at a time - --> $DIR/two-phase-nonrecv-autoref.rs:86:11 + --> $DIR/two-phase-nonrecv-autoref.rs:76:11 | LL | f(f(10)); | --^----- @@ -27,19 +27,19 @@ LL | f(f(10)); | borrow later used here error[E0161]: cannot move a value of type dyn std::ops::FnOnce(i32) -> i32: the size of dyn std::ops::FnOnce(i32) -> i32 cannot be statically determined - --> $DIR/two-phase-nonrecv-autoref.rs:95:9 + --> $DIR/two-phase-nonrecv-autoref.rs:85:9 | LL | f(f(10)); | ^ error[E0161]: cannot move a value of type dyn std::ops::FnOnce(i32) -> i32: the size of dyn std::ops::FnOnce(i32) -> i32 cannot be statically determined - --> $DIR/two-phase-nonrecv-autoref.rs:95:11 + --> $DIR/two-phase-nonrecv-autoref.rs:85:11 | LL | f(f(10)); | ^ error[E0382]: use of moved value: `*f` - --> $DIR/two-phase-nonrecv-autoref.rs:95:11 + --> $DIR/two-phase-nonrecv-autoref.rs:85:11 | LL | f(f(10)); | - ^ value used here after move @@ -47,7 +47,7 @@ LL | f(f(10)); | value moved here error[E0502]: cannot borrow `a` as immutable because it is also borrowed as mutable - --> $DIR/two-phase-nonrecv-autoref.rs:139:27 + --> $DIR/two-phase-nonrecv-autoref.rs:129:27 | LL | double_access(&mut a, &a); | ----------------------^^- @@ -57,7 +57,7 @@ LL | double_access(&mut a, &a); | borrow later used here error[E0502]: cannot borrow `i` as immutable because it is also borrowed as mutable - --> $DIR/two-phase-nonrecv-autoref.rs:167:7 + --> $DIR/two-phase-nonrecv-autoref.rs:157:7 | LL | i[i[3]] = 4; | --^---- @@ -67,7 +67,7 @@ LL | i[i[3]] = 4; | borrow later used here error[E0502]: cannot borrow `i` as immutable because it is also borrowed as mutable - --> $DIR/two-phase-nonrecv-autoref.rs:173:7 + --> $DIR/two-phase-nonrecv-autoref.rs:163:7 | LL | i[i[3]] = i[4]; | --^---- diff --git a/src/test/ui/borrowck/two-phase-nonrecv-autoref.rs b/src/test/ui/borrowck/two-phase-nonrecv-autoref.rs index 30752e8ddb108..89ec06370f1cc 100644 --- a/src/test/ui/borrowck/two-phase-nonrecv-autoref.rs +++ b/src/test/ui/borrowck/two-phase-nonrecv-autoref.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast nll //[ast]compile-flags: //[nll]compile-flags: -Z borrowck=mir -Z two-phase-borrows diff --git a/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.rs b/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.rs index f9326d944b8e4..13c1df7db2bc7 100644 --- a/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.rs +++ b/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z borrowck=mir -Z two-phase-borrows // This is similar to two-phase-reservation-sharing-interference.rs diff --git a/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.stderr b/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.stderr index 2ac10a82f7b05..ad4636a4a91c6 100644 --- a/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.stderr +++ b/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/two-phase-reservation-sharing-interference-2.rs:27:1 + --> $DIR/two-phase-reservation-sharing-interference-2.rs:17:1 | LL | / fn main() { //~ ERROR compilation successful LL | | let mut v = vec![0, 1, 2]; diff --git a/src/test/ui/borrowck/two-phase-reservation-sharing-interference.nll_target.stderr b/src/test/ui/borrowck/two-phase-reservation-sharing-interference.nll_target.stderr index 62a548af62b5f..3f41c60d5f20c 100644 --- a/src/test/ui/borrowck/two-phase-reservation-sharing-interference.nll_target.stderr +++ b/src/test/ui/borrowck/two-phase-reservation-sharing-interference.nll_target.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `vec` as mutable because it is also borrowed as immutable - --> $DIR/two-phase-reservation-sharing-interference.rs:46:17 + --> $DIR/two-phase-reservation-sharing-interference.rs:36:17 | LL | let shared = &vec; | ---- immutable borrow occurs here diff --git a/src/test/ui/borrowck/two-phase-reservation-sharing-interference.rs b/src/test/ui/borrowck/two-phase-reservation-sharing-interference.rs index 1e86603c19e8d..f5fa8218edc71 100644 --- a/src/test/ui/borrowck/two-phase-reservation-sharing-interference.rs +++ b/src/test/ui/borrowck/two-phase-reservation-sharing-interference.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // revisions: nll_target diff --git a/src/test/ui/borrowck/two-phase-sneaky.nll.stderr b/src/test/ui/borrowck/two-phase-sneaky.nll.stderr index 26a6271bbdea2..ba4d4ca81f30b 100644 --- a/src/test/ui/borrowck/two-phase-sneaky.nll.stderr +++ b/src/test/ui/borrowck/two-phase-sneaky.nll.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `v` as mutable more than once at a time - --> $DIR/two-phase-sneaky.rs:22:9 + --> $DIR/two-phase-sneaky.rs:12:9 | LL | v[0].push_str({ | - diff --git a/src/test/ui/borrowck/two-phase-sneaky.rs b/src/test/ui/borrowck/two-phase-sneaky.rs index eec4b470d75f7..abfa13da6af00 100644 --- a/src/test/ui/borrowck/two-phase-sneaky.rs +++ b/src/test/ui/borrowck/two-phase-sneaky.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // cmpile-flags: -Z borrowck=mir -Z two-phase-borrows // This is the first counter-example from Niko's blog post diff --git a/src/test/ui/borrowck/two-phase-sneaky.stderr b/src/test/ui/borrowck/two-phase-sneaky.stderr index 1ab9c18848270..38f24ccd6068b 100644 --- a/src/test/ui/borrowck/two-phase-sneaky.stderr +++ b/src/test/ui/borrowck/two-phase-sneaky.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `v` as mutable more than once at a time - --> $DIR/two-phase-sneaky.rs:22:9 + --> $DIR/two-phase-sneaky.rs:12:9 | LL | v[0].push_str({ | - first mutable borrow occurs here diff --git a/src/test/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.nll.stderr b/src/test/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.nll.stderr index 0eb5fc8c32435..d6125cfd72108 100644 --- a/src/test/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.nll.stderr +++ b/src/test/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.nll.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of captured variable in an `Fn` closure - --> $DIR/unboxed-closures-move-upvar-from-non-once-ref-closure.rs:21:9 + --> $DIR/unboxed-closures-move-upvar-from-non-once-ref-closure.rs:11:9 | LL | let y = vec![format!("World")]; | - captured outer variable diff --git a/src/test/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.rs b/src/test/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.rs index cd9f1636c3f4d..4c6a05338a1ea 100644 --- a/src/test/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.rs +++ b/src/test/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that a by-ref `FnMut` closure gets an error when it tries to // consume a value. diff --git a/src/test/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.stderr b/src/test/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.stderr index f2f8ae8c08c2c..bdfd6fb7e5539 100644 --- a/src/test/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.stderr +++ b/src/test/ui/borrowck/unboxed-closures-move-upvar-from-non-once-ref-closure.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of captured outer variable in an `Fn` closure - --> $DIR/unboxed-closures-move-upvar-from-non-once-ref-closure.rs:21:9 + --> $DIR/unboxed-closures-move-upvar-from-non-once-ref-closure.rs:11:9 | LL | let y = vec![format!("World")]; | - captured outer variable diff --git a/src/test/ui/bounds-lifetime.rs b/src/test/ui/bounds-lifetime.rs index 5bfaa6c54fa9f..8abfe3e4b7623 100644 --- a/src/test/ui/bounds-lifetime.rs +++ b/src/test/ui/bounds-lifetime.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - type A = for<'b, 'a: 'b> fn(); //~ ERROR lifetime bounds cannot be used in this context type B = for<'b, 'a: 'b,> fn(); //~ ERROR lifetime bounds cannot be used in this context type C = for<'b, 'a: 'b +> fn(); //~ ERROR lifetime bounds cannot be used in this context diff --git a/src/test/ui/bounds-lifetime.stderr b/src/test/ui/bounds-lifetime.stderr index cbd140c13bece..d57cb40b2a84d 100644 --- a/src/test/ui/bounds-lifetime.stderr +++ b/src/test/ui/bounds-lifetime.stderr @@ -1,29 +1,29 @@ error: lifetime bounds cannot be used in this context - --> $DIR/bounds-lifetime.rs:11:22 + --> $DIR/bounds-lifetime.rs:1:22 | LL | type A = for<'b, 'a: 'b> fn(); //~ ERROR lifetime bounds cannot be used in this context | ^^ error: lifetime bounds cannot be used in this context - --> $DIR/bounds-lifetime.rs:12:22 + --> $DIR/bounds-lifetime.rs:2:22 | LL | type B = for<'b, 'a: 'b,> fn(); //~ ERROR lifetime bounds cannot be used in this context | ^^ error: lifetime bounds cannot be used in this context - --> $DIR/bounds-lifetime.rs:13:22 + --> $DIR/bounds-lifetime.rs:3:22 | LL | type C = for<'b, 'a: 'b +> fn(); //~ ERROR lifetime bounds cannot be used in this context | ^^ error: only lifetime parameters can be used in this context - --> $DIR/bounds-lifetime.rs:14:18 + --> $DIR/bounds-lifetime.rs:4:18 | LL | type D = for<'a, T> fn(); //~ ERROR only lifetime parameters can be used in this context | ^ error: only lifetime parameters can be used in this context - --> $DIR/bounds-lifetime.rs:15:14 + --> $DIR/bounds-lifetime.rs:5:14 | LL | type E = for Fn(); //~ ERROR only lifetime parameters can be used in this context | ^ diff --git a/src/test/ui/break-outside-loop.rs b/src/test/ui/break-outside-loop.rs index 1f257b8a5cba8..fef298f7c3919 100644 --- a/src/test/ui/break-outside-loop.rs +++ b/src/test/ui/break-outside-loop.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { t: String } diff --git a/src/test/ui/break-outside-loop.stderr b/src/test/ui/break-outside-loop.stderr index 820272d7e801b..5e008a064772b 100644 --- a/src/test/ui/break-outside-loop.stderr +++ b/src/test/ui/break-outside-loop.stderr @@ -1,29 +1,29 @@ error[E0268]: `break` outside of loop - --> $DIR/break-outside-loop.rs:20:15 + --> $DIR/break-outside-loop.rs:10:15 | LL | let pth = break; //~ ERROR: `break` outside of loop | ^^^^^ cannot break outside of a loop error[E0268]: `continue` outside of loop - --> $DIR/break-outside-loop.rs:21:17 + --> $DIR/break-outside-loop.rs:11:17 | LL | if cond() { continue } //~ ERROR: `continue` outside of loop | ^^^^^^^^ cannot break outside of a loop error[E0267]: `break` inside of a closure - --> $DIR/break-outside-loop.rs:27:25 + --> $DIR/break-outside-loop.rs:17:25 | LL | if cond() { break } //~ ERROR: `break` inside of a closure | ^^^^^ cannot break inside of a closure error[E0267]: `continue` inside of a closure - --> $DIR/break-outside-loop.rs:28:25 + --> $DIR/break-outside-loop.rs:18:25 | LL | if cond() { continue } //~ ERROR: `continue` inside of a closure | ^^^^^^^^ cannot break inside of a closure error[E0268]: `break` outside of loop - --> $DIR/break-outside-loop.rs:34:25 + --> $DIR/break-outside-loop.rs:24:25 | LL | let unconstrained = break; //~ ERROR: `break` outside of loop | ^^^^^ cannot break outside of a loop diff --git a/src/test/ui/break-while-condition.rs b/src/test/ui/break-while-condition.rs index 050b479d485f6..6064e6ab00235 100644 --- a/src/test/ui/break-while-condition.rs +++ b/src/test/ui/break-while-condition.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(never_type)] fn main() { diff --git a/src/test/ui/break-while-condition.stderr b/src/test/ui/break-while-condition.stderr index 9d22dcce4540c..3e81753a4105f 100644 --- a/src/test/ui/break-while-condition.stderr +++ b/src/test/ui/break-while-condition.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/break-while-condition.rs:19:20 + --> $DIR/break-while-condition.rs:9:20 | LL | let _: ! = { //~ ERROR mismatched types | ____________________^ @@ -11,7 +11,7 @@ LL | | }; found type `()` error[E0308]: mismatched types - --> $DIR/break-while-condition.rs:26:13 + --> $DIR/break-while-condition.rs:16:13 | LL | / while false { //~ ERROR mismatched types LL | | break @@ -22,7 +22,7 @@ LL | | } found type `()` error[E0308]: mismatched types - --> $DIR/break-while-condition.rs:34:13 + --> $DIR/break-while-condition.rs:24:13 | LL | / while false { //~ ERROR mismatched types LL | | return diff --git a/src/test/ui/builtin-superkinds/auxiliary/trait_superkinds_in_metadata.rs b/src/test/ui/builtin-superkinds/auxiliary/trait_superkinds_in_metadata.rs index 0fa2d3459f433..acfd1e13e93e3 100644 --- a/src/test/ui/builtin-superkinds/auxiliary/trait_superkinds_in_metadata.rs +++ b/src/test/ui/builtin-superkinds/auxiliary/trait_superkinds_in_metadata.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test library crate for cross-crate usages of traits inheriting // from the builtin kinds. Mostly tests metadata correctness. diff --git a/src/test/ui/builtin-superkinds/builtin-superkinds-double-superkind.rs b/src/test/ui/builtin-superkinds/builtin-superkinds-double-superkind.rs index 3f7f2adabdfb1..e716489c24a9f 100644 --- a/src/test/ui/builtin-superkinds/builtin-superkinds-double-superkind.rs +++ b/src/test/ui/builtin-superkinds/builtin-superkinds-double-superkind.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test for traits that inherit from multiple builtin kinds at once, // testing that all such kinds must be present on implementing types. diff --git a/src/test/ui/builtin-superkinds/builtin-superkinds-double-superkind.stderr b/src/test/ui/builtin-superkinds/builtin-superkinds-double-superkind.stderr index a462fcf4de4d6..9771436d167df 100644 --- a/src/test/ui/builtin-superkinds/builtin-superkinds-double-superkind.stderr +++ b/src/test/ui/builtin-superkinds/builtin-superkinds-double-superkind.stderr @@ -1,5 +1,5 @@ error[E0277]: `T` cannot be sent between threads safely - --> $DIR/builtin-superkinds-double-superkind.rs:16:24 + --> $DIR/builtin-superkinds-double-superkind.rs:6:24 | LL | impl Foo for (T,) { } | ^^^ `T` cannot be sent between threads safely @@ -9,7 +9,7 @@ LL | impl Foo for (T,) { } = note: required because it appears within the type `(T,)` error[E0277]: `T` cannot be shared between threads safely - --> $DIR/builtin-superkinds-double-superkind.rs:19:16 + --> $DIR/builtin-superkinds-double-superkind.rs:9:16 | LL | impl Foo for (T,T) { } | ^^^ `T` cannot be shared between threads safely diff --git a/src/test/ui/builtin-superkinds/builtin-superkinds-in-metadata.rs b/src/test/ui/builtin-superkinds/builtin-superkinds-in-metadata.rs index 88b5a3fbb55b6..b4555a1809ad4 100644 --- a/src/test/ui/builtin-superkinds/builtin-superkinds-in-metadata.rs +++ b/src/test/ui/builtin-superkinds/builtin-superkinds-in-metadata.rs @@ -1,14 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // aux-build:trait_superkinds_in_metadata.rs // Test for traits inheriting from the builtin kinds cross-crate. diff --git a/src/test/ui/builtin-superkinds/builtin-superkinds-in-metadata.stderr b/src/test/ui/builtin-superkinds/builtin-superkinds-in-metadata.stderr index dcc7e3cd35086..61c18a24fb0c9 100644 --- a/src/test/ui/builtin-superkinds/builtin-superkinds-in-metadata.stderr +++ b/src/test/ui/builtin-superkinds/builtin-superkinds-in-metadata.stderr @@ -1,5 +1,5 @@ error[E0277]: `T` cannot be sent between threads safely - --> $DIR/builtin-superkinds-in-metadata.rs:24:23 + --> $DIR/builtin-superkinds-in-metadata.rs:13:23 | LL | impl RequiresRequiresShareAndSend for X { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `T` cannot be sent between threads safely diff --git a/src/test/ui/builtin-superkinds/builtin-superkinds-self-type.rs b/src/test/ui/builtin-superkinds/builtin-superkinds-self-type.rs index 3065ecfaa302d..6fba87b31975a 100644 --- a/src/test/ui/builtin-superkinds/builtin-superkinds-self-type.rs +++ b/src/test/ui/builtin-superkinds/builtin-superkinds-self-type.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests (negatively) the ability for the Self type in default methods // to use capabilities granted by builtin kinds as supertraits. diff --git a/src/test/ui/builtin-superkinds/builtin-superkinds-self-type.stderr b/src/test/ui/builtin-superkinds/builtin-superkinds-self-type.stderr index f96393d4b8543..2fdb3836dd969 100644 --- a/src/test/ui/builtin-superkinds/builtin-superkinds-self-type.stderr +++ b/src/test/ui/builtin-superkinds/builtin-superkinds-self-type.stderr @@ -1,5 +1,5 @@ error[E0310]: the parameter type `T` may not live long enough - --> $DIR/builtin-superkinds-self-type.rs:20:16 + --> $DIR/builtin-superkinds-self-type.rs:10:16 | LL | impl Foo for T { } | -- ^^^ @@ -7,7 +7,7 @@ LL | impl Foo for T { } | help: consider adding an explicit lifetime bound `T: 'static`... | note: ...so that the type `T` will meet its required lifetime bounds - --> $DIR/builtin-superkinds-self-type.rs:20:16 + --> $DIR/builtin-superkinds-self-type.rs:10:16 | LL | impl Foo for T { } | ^^^ diff --git a/src/test/ui/builtin-superkinds/builtin-superkinds-simple.rs b/src/test/ui/builtin-superkinds/builtin-superkinds-simple.rs index 22dc9598d29ca..afafc0943834d 100644 --- a/src/test/ui/builtin-superkinds/builtin-superkinds-simple.rs +++ b/src/test/ui/builtin-superkinds/builtin-superkinds-simple.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Basic test for traits inheriting from the builtin kinds, checking // the type contents of the implementing type (that's not a typaram). diff --git a/src/test/ui/builtin-superkinds/builtin-superkinds-simple.stderr b/src/test/ui/builtin-superkinds/builtin-superkinds-simple.stderr index 043953e7a2bfc..a0ff64077c4b3 100644 --- a/src/test/ui/builtin-superkinds/builtin-superkinds-simple.stderr +++ b/src/test/ui/builtin-superkinds/builtin-superkinds-simple.stderr @@ -1,5 +1,5 @@ error[E0277]: `std::rc::Rc` cannot be sent between threads safely - --> $DIR/builtin-superkinds-simple.rs:16:6 + --> $DIR/builtin-superkinds-simple.rs:6:6 | LL | impl Foo for std::rc::Rc { } | ^^^ `std::rc::Rc` cannot be sent between threads safely diff --git a/src/test/ui/builtin-superkinds/builtin-superkinds-typaram-not-send.rs b/src/test/ui/builtin-superkinds/builtin-superkinds-typaram-not-send.rs index e0b2043c1107c..74ae62711ebcf 100644 --- a/src/test/ui/builtin-superkinds/builtin-superkinds-typaram-not-send.rs +++ b/src/test/ui/builtin-superkinds/builtin-superkinds-typaram-not-send.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Basic test for traits inheriting from the builtin kinds. trait Foo : Send { } diff --git a/src/test/ui/builtin-superkinds/builtin-superkinds-typaram-not-send.stderr b/src/test/ui/builtin-superkinds/builtin-superkinds-typaram-not-send.stderr index 00bad2e80ef9a..dc5479e5e2da6 100644 --- a/src/test/ui/builtin-superkinds/builtin-superkinds-typaram-not-send.stderr +++ b/src/test/ui/builtin-superkinds/builtin-superkinds-typaram-not-send.stderr @@ -1,5 +1,5 @@ error[E0277]: `T` cannot be sent between threads safely - --> $DIR/builtin-superkinds-typaram-not-send.rs:15:24 + --> $DIR/builtin-superkinds-typaram-not-send.rs:5:24 | LL | impl Foo for T { } | ^^^ `T` cannot be sent between threads safely diff --git a/src/test/ui/by-move-pattern-binding.nll.stderr b/src/test/ui/by-move-pattern-binding.nll.stderr index 491b5b5bd74ab..4b4a989368a78 100644 --- a/src/test/ui/by-move-pattern-binding.nll.stderr +++ b/src/test/ui/by-move-pattern-binding.nll.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/by-move-pattern-binding.rs:24:11 + --> $DIR/by-move-pattern-binding.rs:14:11 | LL | match &s.x { | ^^^^ cannot move out of borrowed content @@ -11,7 +11,7 @@ LL | &E::Bar(identifier) => f(identifier.clone()) //~ ERROR cannot move | help: consider removing the `&`: `E::Bar(identifier)` | note: move occurs because `identifier` has type `std::string::String`, which does not implement the `Copy` trait - --> $DIR/by-move-pattern-binding.rs:26:17 + --> $DIR/by-move-pattern-binding.rs:16:17 | LL | &E::Bar(identifier) => f(identifier.clone()) //~ ERROR cannot move | ^^^^^^^^^^ diff --git a/src/test/ui/by-move-pattern-binding.rs b/src/test/ui/by-move-pattern-binding.rs index a49256d1bfc03..455b206e53f1a 100644 --- a/src/test/ui/by-move-pattern-binding.rs +++ b/src/test/ui/by-move-pattern-binding.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum E { Foo, Bar(String) diff --git a/src/test/ui/by-move-pattern-binding.stderr b/src/test/ui/by-move-pattern-binding.stderr index a20de4ba42a5b..d3c5e2caa4294 100644 --- a/src/test/ui/by-move-pattern-binding.stderr +++ b/src/test/ui/by-move-pattern-binding.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/by-move-pattern-binding.rs:26:9 + --> $DIR/by-move-pattern-binding.rs:16:9 | LL | &E::Bar(identifier) => f(identifier.clone()) //~ ERROR cannot move | ^^^^^^^^----------^ diff --git a/src/test/ui/call-fn-never-arg-wrong-type.rs b/src/test/ui/call-fn-never-arg-wrong-type.rs index 583befed1e828..7ed1162171f1c 100644 --- a/src/test/ui/call-fn-never-arg-wrong-type.rs +++ b/src/test/ui/call-fn-never-arg-wrong-type.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we can't pass other types for ! #![feature(never_type)] diff --git a/src/test/ui/call-fn-never-arg-wrong-type.stderr b/src/test/ui/call-fn-never-arg-wrong-type.stderr index 84ed8d15a425d..602963ee89cd5 100644 --- a/src/test/ui/call-fn-never-arg-wrong-type.stderr +++ b/src/test/ui/call-fn-never-arg-wrong-type.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/call-fn-never-arg-wrong-type.rs:20:9 + --> $DIR/call-fn-never-arg-wrong-type.rs:10:9 | LL | foo("wow"); //~ ERROR mismatched types | ^^^^^ expected !, found reference diff --git a/src/test/ui/can-begin-expr-check.rs b/src/test/ui/can-begin-expr-check.rs index 68f219c6ed993..35aed067c697a 100644 --- a/src/test/ui/can-begin-expr-check.rs +++ b/src/test/ui/can-begin-expr-check.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { return; diff --git a/src/test/ui/can-begin-expr-check.stderr b/src/test/ui/can-begin-expr-check.stderr index ddcb69c5ee3cf..f25b348816b6a 100644 --- a/src/test/ui/can-begin-expr-check.stderr +++ b/src/test/ui/can-begin-expr-check.stderr @@ -1,5 +1,5 @@ error: expected one of `.`, `;`, `?`, `}`, or an operator, found `enum` - --> $DIR/can-begin-expr-check.rs:29:12 + --> $DIR/can-begin-expr-check.rs:19:12 | LL | return enum; //~ ERROR expected one of `.`, `;`, `?`, `}`, or an operator, found `enum` | ^^^^ expected one of `.`, `;`, `?`, `}`, or an operator here diff --git a/src/test/ui/cannot-mutate-captured-non-mut-var.ast.nll.stderr b/src/test/ui/cannot-mutate-captured-non-mut-var.ast.nll.stderr index a7ffc06872c2e..581dcde59f5e9 100644 --- a/src/test/ui/cannot-mutate-captured-non-mut-var.ast.nll.stderr +++ b/src/test/ui/cannot-mutate-captured-non-mut-var.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to `x`, as it is not declared as mutable - --> $DIR/cannot-mutate-captured-non-mut-var.rs:23:25 + --> $DIR/cannot-mutate-captured-non-mut-var.rs:13:25 | LL | let x = 1; | - help: consider changing this to be mutable: `mut x` @@ -7,7 +7,7 @@ LL | to_fn_once(move|| { x = 2; }); | ^^^^^ cannot assign error[E0596]: cannot borrow `s` as mutable, as it is not declared as mutable - --> $DIR/cannot-mutate-captured-non-mut-var.rs:28:25 + --> $DIR/cannot-mutate-captured-non-mut-var.rs:18:25 | LL | let s = std::io::stdin(); | - help: consider changing this to be mutable: `mut s` diff --git a/src/test/ui/cannot-mutate-captured-non-mut-var.ast.stderr b/src/test/ui/cannot-mutate-captured-non-mut-var.ast.stderr index 02d57ca48f232..1098c16aaf63f 100644 --- a/src/test/ui/cannot-mutate-captured-non-mut-var.ast.stderr +++ b/src/test/ui/cannot-mutate-captured-non-mut-var.ast.stderr @@ -1,11 +1,11 @@ error[E0594]: cannot assign to immutable captured outer variable in an `FnOnce` closure `x` - --> $DIR/cannot-mutate-captured-non-mut-var.rs:23:25 + --> $DIR/cannot-mutate-captured-non-mut-var.rs:13:25 | LL | to_fn_once(move|| { x = 2; }); | ^^^^^ error[E0596]: cannot borrow immutable captured outer variable in an `FnOnce` closure `s` as mutable - --> $DIR/cannot-mutate-captured-non-mut-var.rs:28:25 + --> $DIR/cannot-mutate-captured-non-mut-var.rs:18:25 | LL | to_fn_once(move|| { s.read_to_end(&mut Vec::new()); }); | ^ diff --git a/src/test/ui/cannot-mutate-captured-non-mut-var.mir.stderr b/src/test/ui/cannot-mutate-captured-non-mut-var.mir.stderr index a7ffc06872c2e..581dcde59f5e9 100644 --- a/src/test/ui/cannot-mutate-captured-non-mut-var.mir.stderr +++ b/src/test/ui/cannot-mutate-captured-non-mut-var.mir.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to `x`, as it is not declared as mutable - --> $DIR/cannot-mutate-captured-non-mut-var.rs:23:25 + --> $DIR/cannot-mutate-captured-non-mut-var.rs:13:25 | LL | let x = 1; | - help: consider changing this to be mutable: `mut x` @@ -7,7 +7,7 @@ LL | to_fn_once(move|| { x = 2; }); | ^^^^^ cannot assign error[E0596]: cannot borrow `s` as mutable, as it is not declared as mutable - --> $DIR/cannot-mutate-captured-non-mut-var.rs:28:25 + --> $DIR/cannot-mutate-captured-non-mut-var.rs:18:25 | LL | let s = std::io::stdin(); | - help: consider changing this to be mutable: `mut s` diff --git a/src/test/ui/cannot-mutate-captured-non-mut-var.rs b/src/test/ui/cannot-mutate-captured-non-mut-var.rs index 6bd52f00788e6..18257d09fa090 100644 --- a/src/test/ui/cannot-mutate-captured-non-mut-var.rs +++ b/src/test/ui/cannot-mutate-captured-non-mut-var.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/capture1.rs b/src/test/ui/capture1.rs index 984385f4cc0eb..2938c084537d0 100644 --- a/src/test/ui/capture1.rs +++ b/src/test/ui/capture1.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // error-pattern: can't capture dynamic environment in a fn item fn main() { diff --git a/src/test/ui/capture1.stderr b/src/test/ui/capture1.stderr index 82eb1b64cfc58..ad8434709d5eb 100644 --- a/src/test/ui/capture1.stderr +++ b/src/test/ui/capture1.stderr @@ -1,5 +1,5 @@ error[E0434]: can't capture dynamic environment in a fn item - --> $DIR/capture1.rs:16:32 + --> $DIR/capture1.rs:5:32 | LL | fn foo() -> isize { return bar; } | ^^^ diff --git a/src/test/ui/cast/cast-as-bool.rs b/src/test/ui/cast/cast-as-bool.rs index 68e26c23e4432..7a0bd0ec098e3 100644 --- a/src/test/ui/cast/cast-as-bool.rs +++ b/src/test/ui/cast/cast-as-bool.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let u = 5 as bool; //~^ ERROR cannot cast as `bool` diff --git a/src/test/ui/cast/cast-as-bool.stderr b/src/test/ui/cast/cast-as-bool.stderr index 050a18ec9d3e3..086d08a569a28 100644 --- a/src/test/ui/cast/cast-as-bool.stderr +++ b/src/test/ui/cast/cast-as-bool.stderr @@ -1,5 +1,5 @@ error[E0054]: cannot cast as `bool` - --> $DIR/cast-as-bool.rs:12:13 + --> $DIR/cast-as-bool.rs:2:13 | LL | let u = 5 as bool; | ^^^^^^^^^ unsupported cast diff --git a/src/test/ui/cast/cast-errors-issue-43825.rs b/src/test/ui/cast/cast-errors-issue-43825.rs index 65b391205e386..00e0da44bbf9f 100644 --- a/src/test/ui/cast/cast-errors-issue-43825.rs +++ b/src/test/ui/cast/cast-errors-issue-43825.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let error = error; //~ ERROR cannot find value `error` diff --git a/src/test/ui/cast/cast-errors-issue-43825.stderr b/src/test/ui/cast/cast-errors-issue-43825.stderr index 6dbbadde5c6f9..cfd1ca25a96a3 100644 --- a/src/test/ui/cast/cast-errors-issue-43825.stderr +++ b/src/test/ui/cast/cast-errors-issue-43825.stderr @@ -1,5 +1,5 @@ error[E0425]: cannot find value `error` in this scope - --> $DIR/cast-errors-issue-43825.rs:12:17 + --> $DIR/cast-errors-issue-43825.rs:2:17 | LL | let error = error; //~ ERROR cannot find value `error` | ^^^^^ not found in this scope diff --git a/src/test/ui/cast/cast-from-nil.rs b/src/test/ui/cast/cast-from-nil.rs index ab22d35248073..b5ceef76ac20e 100644 --- a/src/test/ui/cast/cast-from-nil.rs +++ b/src/test/ui/cast/cast-from-nil.rs @@ -1,12 +1,2 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: non-primitive cast: `()` as `u32` fn main() { let u = (assert!(true) as u32); } diff --git a/src/test/ui/cast/cast-from-nil.stderr b/src/test/ui/cast/cast-from-nil.stderr index 4400007f93d4a..c8e3628a7ded8 100644 --- a/src/test/ui/cast/cast-from-nil.stderr +++ b/src/test/ui/cast/cast-from-nil.stderr @@ -1,5 +1,5 @@ error[E0605]: non-primitive cast: `()` as `u32` - --> $DIR/cast-from-nil.rs:12:21 + --> $DIR/cast-from-nil.rs:2:21 | LL | fn main() { let u = (assert!(true) as u32); } | ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/cast/cast-ptr-to-int-const.rs b/src/test/ui/cast/cast-ptr-to-int-const.rs index 8764cb72b8cc1..70b4869ef63ce 100644 --- a/src/test/ui/cast/cast-ptr-to-int-const.rs +++ b/src/test/ui/cast/cast-ptr-to-int-const.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // gate-test-const_raw_ptr_to_usize_cast fn main() { diff --git a/src/test/ui/cast/cast-ptr-to-int-const.stderr b/src/test/ui/cast/cast-ptr-to-int-const.stderr index 7c3b4e42138e7..3cce07d64ecd0 100644 --- a/src/test/ui/cast/cast-ptr-to-int-const.stderr +++ b/src/test/ui/cast/cast-ptr-to-int-const.stderr @@ -1,5 +1,5 @@ error[E0658]: casting pointers to integers in constants is unstable (see issue #51910) - --> $DIR/cast-ptr-to-int-const.rs:14:20 + --> $DIR/cast-ptr-to-int-const.rs:4:20 | LL | const X: u32 = main as u32; //~ ERROR casting pointers to integers in constants is unstable | ^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | const X: u32 = main as u32; //~ ERROR casting pointers to integers in c = help: add #![feature(const_raw_ptr_to_usize_cast)] to the crate attributes to enable error[E0658]: casting pointers to integers in constants is unstable (see issue #51910) - --> $DIR/cast-ptr-to-int-const.rs:16:20 + --> $DIR/cast-ptr-to-int-const.rs:6:20 | LL | const Z: u32 = &Y as *const u32 as u32; //~ ERROR is unstable | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/cast/cast-rfc0401-2.rs b/src/test/ui/cast/cast-rfc0401-2.rs index 0dac707688d66..7709aa34104cc 100644 --- a/src/test/ui/cast/cast-rfc0401-2.rs +++ b/src/test/ui/cast/cast-rfc0401-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // RFC 401 test extracted into distinct file. This is because some the // change to suppress "derived" errors wound up suppressing this error // message, since the fallback for `3` doesn't occur. diff --git a/src/test/ui/cast/cast-rfc0401-2.stderr b/src/test/ui/cast/cast-rfc0401-2.stderr index f7ffa24595977..3bf6e5367f06d 100644 --- a/src/test/ui/cast/cast-rfc0401-2.stderr +++ b/src/test/ui/cast/cast-rfc0401-2.stderr @@ -1,5 +1,5 @@ error[E0054]: cannot cast as `bool` - --> $DIR/cast-rfc0401-2.rs:16:13 + --> $DIR/cast-rfc0401-2.rs:6:13 | LL | let _ = 3 as bool; | ^^^^^^^^^ unsupported cast diff --git a/src/test/ui/cast/cast-to-bare-fn.rs b/src/test/ui/cast/cast-to-bare-fn.rs index d5a998c6e4b6b..1992f26378f69 100644 --- a/src/test/ui/cast/cast-to-bare-fn.rs +++ b/src/test/ui/cast/cast-to-bare-fn.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo(_x: isize) { } fn main() { diff --git a/src/test/ui/cast/cast-to-bare-fn.stderr b/src/test/ui/cast/cast-to-bare-fn.stderr index ed07f37f4f138..84933dca929a4 100644 --- a/src/test/ui/cast/cast-to-bare-fn.stderr +++ b/src/test/ui/cast/cast-to-bare-fn.stderr @@ -1,5 +1,5 @@ error[E0605]: non-primitive cast: `fn(isize) {foo}` as `extern "C" fn() -> isize` - --> $DIR/cast-to-bare-fn.rs:15:13 + --> $DIR/cast-to-bare-fn.rs:5:13 | LL | let x = foo as extern "C" fn() -> isize; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | let x = foo as extern "C" fn() -> isize; = note: an `as` expression can only be used to convert between primitive types. Consider using the `From` trait error[E0605]: non-primitive cast: `u64` as `fn(isize) -> (isize, isize)` - --> $DIR/cast-to-bare-fn.rs:17:13 + --> $DIR/cast-to-bare-fn.rs:7:13 | LL | let y = v as extern "Rust" fn(isize) -> (isize, isize); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/cast/cast-to-nil.rs b/src/test/ui/cast/cast-to-nil.rs index 27d9e8a42b188..085bb09e631db 100644 --- a/src/test/ui/cast/cast-to-nil.rs +++ b/src/test/ui/cast/cast-to-nil.rs @@ -1,12 +1,2 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: non-primitive cast: `u32` as `()` fn main() { let u = 0u32 as (); } diff --git a/src/test/ui/cast/cast-to-nil.stderr b/src/test/ui/cast/cast-to-nil.stderr index f7ee68e3d2bb0..478f6b69dafc8 100644 --- a/src/test/ui/cast/cast-to-nil.stderr +++ b/src/test/ui/cast/cast-to-nil.stderr @@ -1,5 +1,5 @@ error[E0605]: non-primitive cast: `u32` as `()` - --> $DIR/cast-to-nil.rs:12:21 + --> $DIR/cast-to-nil.rs:2:21 | LL | fn main() { let u = 0u32 as (); } | ^^^^^^^^^^ diff --git a/src/test/ui/cast/cast-to-unsized-trait-object-suggestion.rs b/src/test/ui/cast/cast-to-unsized-trait-object-suggestion.rs index 010b5a1b1067e..ac859c512637e 100644 --- a/src/test/ui/cast/cast-to-unsized-trait-object-suggestion.rs +++ b/src/test/ui/cast/cast-to-unsized-trait-object-suggestion.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { &1 as Send; //~ ERROR cast to unsized Box::new(1) as Send; //~ ERROR cast to unsized diff --git a/src/test/ui/cast/cast-to-unsized-trait-object-suggestion.stderr b/src/test/ui/cast/cast-to-unsized-trait-object-suggestion.stderr index 1e871d4728420..37c6ba1b909c9 100644 --- a/src/test/ui/cast/cast-to-unsized-trait-object-suggestion.stderr +++ b/src/test/ui/cast/cast-to-unsized-trait-object-suggestion.stderr @@ -1,5 +1,5 @@ error[E0620]: cast to unsized type: `&{integer}` as `dyn std::marker::Send` - --> $DIR/cast-to-unsized-trait-object-suggestion.rs:12:5 + --> $DIR/cast-to-unsized-trait-object-suggestion.rs:2:5 | LL | &1 as Send; //~ ERROR cast to unsized | ^^^^^^---- @@ -7,7 +7,7 @@ LL | &1 as Send; //~ ERROR cast to unsized | help: try casting to a reference instead: `&Send` error[E0620]: cast to unsized type: `std::boxed::Box<{integer}>` as `dyn std::marker::Send` - --> $DIR/cast-to-unsized-trait-object-suggestion.rs:13:5 + --> $DIR/cast-to-unsized-trait-object-suggestion.rs:3:5 | LL | Box::new(1) as Send; //~ ERROR cast to unsized | ^^^^^^^^^^^^^^^---- diff --git a/src/test/ui/cast_char.rs b/src/test/ui/cast_char.rs index 4dfa5037bc555..8c319af9c96e7 100644 --- a/src/test/ui/cast_char.rs +++ b/src/test/ui/cast_char.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(overflowing_literals)] fn main() { diff --git a/src/test/ui/cast_char.stderr b/src/test/ui/cast_char.stderr index 600d7e61a0986..570ca7cba8635 100644 --- a/src/test/ui/cast_char.stderr +++ b/src/test/ui/cast_char.stderr @@ -1,17 +1,17 @@ error: only u8 can be cast into char - --> $DIR/cast_char.rs:14:23 + --> $DIR/cast_char.rs:4:23 | LL | const XYZ: char = 0x1F888 as char; | ^^^^^^^^^^^^^^^ help: use a char literal instead: `'/u{1F888}'` | note: lint level defined here - --> $DIR/cast_char.rs:11:9 + --> $DIR/cast_char.rs:1:9 | LL | #![deny(overflowing_literals)] | ^^^^^^^^^^^^^^^^^^^^ error: only u8 can be cast into char - --> $DIR/cast_char.rs:16:22 + --> $DIR/cast_char.rs:6:22 | LL | const XY: char = 129160 as char; | ^^^^^^^^^^^^^^ help: use a char literal instead: `'/u{1F888}'` diff --git a/src/test/ui/casts-differing-anon.rs b/src/test/ui/casts-differing-anon.rs index 05a03d3b17961..cba178104c99f 100644 --- a/src/test/ui/casts-differing-anon.rs +++ b/src/test/ui/casts-differing-anon.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt; fn foo() -> Box { diff --git a/src/test/ui/casts-differing-anon.stderr b/src/test/ui/casts-differing-anon.stderr index dac24af671cf1..8e09a7cd83b53 100644 --- a/src/test/ui/casts-differing-anon.stderr +++ b/src/test/ui/casts-differing-anon.stderr @@ -1,5 +1,5 @@ error[E0606]: casting `*mut impl std::fmt::Debug+?Sized` as `*mut impl std::fmt::Debug+?Sized` is invalid - --> $DIR/casts-differing-anon.rs:31:13 + --> $DIR/casts-differing-anon.rs:21:13 | LL | b_raw = f_raw as *mut _; //~ ERROR is invalid | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/casts-issue-46365.rs b/src/test/ui/casts-issue-46365.rs index 79f636e413f00..2e7c26b54e41b 100644 --- a/src/test/ui/casts-issue-46365.rs +++ b/src/test/ui/casts-issue-46365.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Lorem { ipsum: Ipsum //~ ERROR cannot find type `Ipsum` } diff --git a/src/test/ui/casts-issue-46365.stderr b/src/test/ui/casts-issue-46365.stderr index 08ba5e4b32100..91edfaf410ea6 100644 --- a/src/test/ui/casts-issue-46365.stderr +++ b/src/test/ui/casts-issue-46365.stderr @@ -1,5 +1,5 @@ error[E0412]: cannot find type `Ipsum` in this scope - --> $DIR/casts-issue-46365.rs:12:12 + --> $DIR/casts-issue-46365.rs:2:12 | LL | ipsum: Ipsum //~ ERROR cannot find type `Ipsum` | ^^^^^ not found in this scope diff --git a/src/test/ui/cdylib-deps-must-be-static.rs b/src/test/ui/cdylib-deps-must-be-static.rs index 0a06e01cab01c..241cc96fec04f 100644 --- a/src/test/ui/cdylib-deps-must-be-static.rs +++ b/src/test/ui/cdylib-deps-must-be-static.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: crate `cdylib_dep` required to be available in rlib format, but was not found // aux-build:cdylib-dep.rs // ignore-musl diff --git a/src/test/ui/cfg-arg-invalid.rs b/src/test/ui/cfg-arg-invalid.rs index 404630399c601..eae4c6f833097 100644 --- a/src/test/ui/cfg-arg-invalid.rs +++ b/src/test/ui/cfg-arg-invalid.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --cfg a{b} // error-pattern: invalid --cfg argument: a{b} fn main() {} diff --git a/src/test/ui/cfg-attr-cfg-2.rs b/src/test/ui/cfg-attr-cfg-2.rs index 58a62d45ea5d7..898c5bac85077 100644 --- a/src/test/ui/cfg-attr-cfg-2.rs +++ b/src/test/ui/cfg-attr-cfg-2.rs @@ -1,12 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // error-pattern: `main` function not found // compile-flags: --cfg foo diff --git a/src/test/ui/cfg-attr-crate-2.rs b/src/test/ui/cfg-attr-crate-2.rs index a79c7663861d7..9345229704a67 100644 --- a/src/test/ui/cfg-attr-crate-2.rs +++ b/src/test/ui/cfg-attr-crate-2.rs @@ -1,12 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // compile-flags: --cfg broken diff --git a/src/test/ui/cfg-attr-crate-2.stderr b/src/test/ui/cfg-attr-crate-2.stderr index 7b66c8f5e40f0..00cac0004fd69 100644 --- a/src/test/ui/cfg-attr-crate-2.stderr +++ b/src/test/ui/cfg-attr-crate-2.stderr @@ -1,5 +1,5 @@ error[E0658]: no_core is experimental (see issue #29639) - --> $DIR/cfg-attr-crate-2.rs:15:21 + --> $DIR/cfg-attr-crate-2.rs:6:21 | LL | #![cfg_attr(broken, no_core)] //~ ERROR no_core is experimental | ^^^^^^^^ diff --git a/src/test/ui/cfg-attr-invalid-predicate.rs b/src/test/ui/cfg-attr-invalid-predicate.rs index 09fe6cec49c2e..9d8842eee81c6 100644 --- a/src/test/ui/cfg-attr-invalid-predicate.rs +++ b/src/test/ui/cfg-attr-invalid-predicate.rs @@ -1,12 +1,2 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[cfg(foo(bar))] //~ ERROR invalid predicate `foo` fn main() {} diff --git a/src/test/ui/cfg-attr-invalid-predicate.stderr b/src/test/ui/cfg-attr-invalid-predicate.stderr index 5a89f9766d166..d75a0389851a8 100644 --- a/src/test/ui/cfg-attr-invalid-predicate.stderr +++ b/src/test/ui/cfg-attr-invalid-predicate.stderr @@ -1,5 +1,5 @@ error[E0537]: invalid predicate `foo` - --> $DIR/cfg-attr-invalid-predicate.rs:11:7 + --> $DIR/cfg-attr-invalid-predicate.rs:1:7 | LL | #[cfg(foo(bar))] //~ ERROR invalid predicate `foo` | ^^^^^^^^ diff --git a/src/test/ui/cfg-attr-unknown-attribute-macro-expansion.rs b/src/test/ui/cfg-attr-unknown-attribute-macro-expansion.rs index afcb896b43c2a..1ed2ddcda444a 100644 --- a/src/test/ui/cfg-attr-unknown-attribute-macro-expansion.rs +++ b/src/test/ui/cfg-attr-unknown-attribute-macro-expansion.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! foo { () => { #[cfg_attr(all(), unknown)] //~ ERROR `unknown` is currently unknown diff --git a/src/test/ui/cfg-attr-unknown-attribute-macro-expansion.stderr b/src/test/ui/cfg-attr-unknown-attribute-macro-expansion.stderr index 0f51c7d68c642..c5097c15c3c81 100644 --- a/src/test/ui/cfg-attr-unknown-attribute-macro-expansion.stderr +++ b/src/test/ui/cfg-attr-unknown-attribute-macro-expansion.stderr @@ -1,5 +1,5 @@ error[E0658]: The attribute `unknown` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/cfg-attr-unknown-attribute-macro-expansion.rs:13:27 + --> $DIR/cfg-attr-unknown-attribute-macro-expansion.rs:3:27 | LL | #[cfg_attr(all(), unknown)] //~ ERROR `unknown` is currently unknown | ^^^^^^^ diff --git a/src/test/ui/cfg-empty-codemap.rs b/src/test/ui/cfg-empty-codemap.rs index f06d22d985f49..97e3ac37b8e25 100644 --- a/src/test/ui/cfg-empty-codemap.rs +++ b/src/test/ui/cfg-empty-codemap.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that empty source_maps don't ICE (#23301) // compile-flags: --cfg "" diff --git a/src/test/ui/cfg-in-crate-1.rs b/src/test/ui/cfg-in-crate-1.rs index bbccf2bcd0f81..8561cd8301309 100644 --- a/src/test/ui/cfg-in-crate-1.rs +++ b/src/test/ui/cfg-in-crate-1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: `main` function not found #![cfg(bar)] diff --git a/src/test/ui/cfg-non-opt-expr.rs b/src/test/ui/cfg-non-opt-expr.rs index a4b24fa8b4bf6..05da4cd7a75c1 100644 --- a/src/test/ui/cfg-non-opt-expr.rs +++ b/src/test/ui/cfg-non-opt-expr.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(stmt_expr_attributes)] fn main() { diff --git a/src/test/ui/cfg-non-opt-expr.stderr b/src/test/ui/cfg-non-opt-expr.stderr index 0511c5755462e..ddb96cde495a0 100644 --- a/src/test/ui/cfg-non-opt-expr.stderr +++ b/src/test/ui/cfg-non-opt-expr.stderr @@ -1,23 +1,23 @@ error: removing an expression is not supported in this position - --> $DIR/cfg-non-opt-expr.rs:14:13 + --> $DIR/cfg-non-opt-expr.rs:4:13 | LL | let _ = #[cfg(unset)] (); | ^^^^^^^^^^^^^ error: removing an expression is not supported in this position - --> $DIR/cfg-non-opt-expr.rs:16:21 + --> $DIR/cfg-non-opt-expr.rs:6:21 | LL | let _ = 1 + 2 + #[cfg(unset)] 3; | ^^^^^^^^^^^^^ error: removing an expression is not supported in this position - --> $DIR/cfg-non-opt-expr.rs:18:23 + --> $DIR/cfg-non-opt-expr.rs:8:23 | LL | let _ = [1, 2, 3][#[cfg(unset)] 1]; | ^^^^^^^^^^^^^ error: removing an expression is not supported in this position - --> $DIR/cfg-non-opt-expr.rs:20:13 + --> $DIR/cfg-non-opt-expr.rs:10:13 | LL | let _ = #[test] (); | ^^^^^^^ diff --git a/src/test/ui/cfg_attr_path.rs b/src/test/ui/cfg_attr_path.rs index 7d799850a651e..a45fee76e97da 100644 --- a/src/test/ui/cfg_attr_path.rs +++ b/src/test/ui/cfg_attr_path.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![allow(dead_code)] #![deny(unused_attributes)] // c.f #35584 diff --git a/src/test/ui/cfg_attr_path.stderr b/src/test/ui/cfg_attr_path.stderr index 67e59d054d5c1..d3364c1692a35 100644 --- a/src/test/ui/cfg_attr_path.stderr +++ b/src/test/ui/cfg_attr_path.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/cfg_attr_path.rs:21:1 + --> $DIR/cfg_attr_path.rs:11:1 | LL | / fn main() { //~ ERROR compilation successful LL | | let _ = auxiliary::namespaced_enums::Foo::A; diff --git a/src/test/ui/chalkify/lower_env1.rs b/src/test/ui/chalkify/lower_env1.rs index fc20ad0e08b2a..45203ae5361ad 100644 --- a/src/test/ui/chalkify/lower_env1.rs +++ b/src/test/ui/chalkify/lower_env1.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![allow(dead_code)] diff --git a/src/test/ui/chalkify/lower_env1.stderr b/src/test/ui/chalkify/lower_env1.stderr index d6673f6a8a6fb..6a3d16c233163 100644 --- a/src/test/ui/chalkify/lower_env1.stderr +++ b/src/test/ui/chalkify/lower_env1.stderr @@ -1,5 +1,5 @@ error: program clause dump - --> $DIR/lower_env1.rs:16:1 + --> $DIR/lower_env1.rs:6:1 | LL | #[rustc_dump_program_clauses] //~ ERROR program clause dump | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -10,7 +10,7 @@ LL | #[rustc_dump_program_clauses] //~ ERROR program clause dump = note: WellFormed(Self: Bar) :- Implemented(Self: Bar), WellFormed(Self: Foo), WellFormed(Self: Foo). error: program clause dump - --> $DIR/lower_env1.rs:19:1 + --> $DIR/lower_env1.rs:9:1 | LL | #[rustc_dump_env_program_clauses] //~ ERROR program clause dump | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/chalkify/lower_impl.rs b/src/test/ui/chalkify/lower_impl.rs index b38b87cdb1236..1bd44a9f49895 100644 --- a/src/test/ui/chalkify/lower_impl.rs +++ b/src/test/ui/chalkify/lower_impl.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] trait Foo { } diff --git a/src/test/ui/chalkify/lower_impl.stderr b/src/test/ui/chalkify/lower_impl.stderr index c497d76f8d4f9..51b06f5b60488 100644 --- a/src/test/ui/chalkify/lower_impl.stderr +++ b/src/test/ui/chalkify/lower_impl.stderr @@ -1,5 +1,5 @@ error: program clause dump - --> $DIR/lower_impl.rs:15:1 + --> $DIR/lower_impl.rs:5:1 | LL | #[rustc_dump_program_clauses] //~ ERROR program clause dump | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | #[rustc_dump_program_clauses] //~ ERROR program clause dump = note: Implemented(T: Foo) :- ProjectionEq(::Item == i32), TypeOutlives(T : 'static), Implemented(T: std::iter::Iterator), Implemented(T: std::marker::Sized). error: program clause dump - --> $DIR/lower_impl.rs:23:5 + --> $DIR/lower_impl.rs:13:5 | LL | #[rustc_dump_program_clauses] //~ ERROR program clause dump | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/chalkify/lower_struct.rs b/src/test/ui/chalkify/lower_struct.rs index 9287555a05684..691209f6ed6cb 100644 --- a/src/test/ui/chalkify/lower_struct.rs +++ b/src/test/ui/chalkify/lower_struct.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #[rustc_dump_program_clauses] //~ ERROR program clause dump diff --git a/src/test/ui/chalkify/lower_struct.stderr b/src/test/ui/chalkify/lower_struct.stderr index d6cc9c8e9a401..3207f922f7590 100644 --- a/src/test/ui/chalkify/lower_struct.stderr +++ b/src/test/ui/chalkify/lower_struct.stderr @@ -1,5 +1,5 @@ error: program clause dump - --> $DIR/lower_struct.rs:13:1 + --> $DIR/lower_struct.rs:3:1 | LL | #[rustc_dump_program_clauses] //~ ERROR program clause dump | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/chalkify/lower_trait.rs b/src/test/ui/chalkify/lower_trait.rs index 7c0f233a645cb..070b2f74b45a9 100644 --- a/src/test/ui/chalkify/lower_trait.rs +++ b/src/test/ui/chalkify/lower_trait.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #[rustc_dump_program_clauses] //~ ERROR program clause dump diff --git a/src/test/ui/chalkify/lower_trait.stderr b/src/test/ui/chalkify/lower_trait.stderr index c4e768415d60b..91b12caa832a6 100644 --- a/src/test/ui/chalkify/lower_trait.stderr +++ b/src/test/ui/chalkify/lower_trait.stderr @@ -1,5 +1,5 @@ error: program clause dump - --> $DIR/lower_trait.rs:13:1 + --> $DIR/lower_trait.rs:3:1 | LL | #[rustc_dump_program_clauses] //~ ERROR program clause dump | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/chalkify/lower_trait_higher_rank.rs b/src/test/ui/chalkify/lower_trait_higher_rank.rs index 47e9398d3647e..3c3896be811a3 100644 --- a/src/test/ui/chalkify/lower_trait_higher_rank.rs +++ b/src/test/ui/chalkify/lower_trait_higher_rank.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #[rustc_dump_program_clauses] //~ ERROR program clause dump diff --git a/src/test/ui/chalkify/lower_trait_higher_rank.stderr b/src/test/ui/chalkify/lower_trait_higher_rank.stderr index afb2cd4b56332..b373cdecfcb49 100644 --- a/src/test/ui/chalkify/lower_trait_higher_rank.stderr +++ b/src/test/ui/chalkify/lower_trait_higher_rank.stderr @@ -1,5 +1,5 @@ error: program clause dump - --> $DIR/lower_trait_higher_rank.rs:13:1 + --> $DIR/lower_trait_higher_rank.rs:3:1 | LL | #[rustc_dump_program_clauses] //~ ERROR program clause dump | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/chalkify/lower_trait_where_clause.rs b/src/test/ui/chalkify/lower_trait_where_clause.rs index 67ee7c28b6a4e..f8ff53f209f34 100644 --- a/src/test/ui/chalkify/lower_trait_where_clause.rs +++ b/src/test/ui/chalkify/lower_trait_where_clause.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] use std::fmt::{Debug, Display}; diff --git a/src/test/ui/chalkify/lower_trait_where_clause.stderr b/src/test/ui/chalkify/lower_trait_where_clause.stderr index 5ea397d424b63..7e453faaef3b1 100644 --- a/src/test/ui/chalkify/lower_trait_where_clause.stderr +++ b/src/test/ui/chalkify/lower_trait_where_clause.stderr @@ -1,5 +1,5 @@ error: program clause dump - --> $DIR/lower_trait_where_clause.rs:16:1 + --> $DIR/lower_trait_where_clause.rs:6:1 | LL | #[rustc_dump_program_clauses] //~ ERROR program clause dump | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/changing-crates.rs b/src/test/ui/changing-crates.rs index 5963a58a2d2f9..60c043bc43f88 100644 --- a/src/test/ui/changing-crates.rs +++ b/src/test/ui/changing-crates.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-msvc FIXME #31306 // note that these aux-build directives must be in this order diff --git a/src/test/ui/changing-crates.stderr b/src/test/ui/changing-crates.stderr index d8de685c7d7a2..a8b986d67f875 100644 --- a/src/test/ui/changing-crates.stderr +++ b/src/test/ui/changing-crates.stderr @@ -1,5 +1,5 @@ error[E0460]: found possibly newer version of crate `a` which `b` depends on - --> $DIR/changing-crates.rs:20:1 + --> $DIR/changing-crates.rs:10:1 | LL | extern crate b; //~ ERROR: found possibly newer version of crate `a` which `b` depends on | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/check-static-immutable-mut-slices.rs b/src/test/ui/check-static-immutable-mut-slices.rs index 1804b9e04c2c9..d5e9fb2dede93 100644 --- a/src/test/ui/check-static-immutable-mut-slices.rs +++ b/src/test/ui/check-static-immutable-mut-slices.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Checks that immutable static items can't have mutable slices static TEST: &'static mut [isize] = &mut []; diff --git a/src/test/ui/check-static-immutable-mut-slices.stderr b/src/test/ui/check-static-immutable-mut-slices.stderr index b0a7cd1221ba9..4f4bf16a0ff69 100644 --- a/src/test/ui/check-static-immutable-mut-slices.stderr +++ b/src/test/ui/check-static-immutable-mut-slices.stderr @@ -1,5 +1,5 @@ error[E0017]: references in statics may only refer to immutable values - --> $DIR/check-static-immutable-mut-slices.rs:13:37 + --> $DIR/check-static-immutable-mut-slices.rs:3:37 | LL | static TEST: &'static mut [isize] = &mut []; | ^^^^^^^ statics require immutable values diff --git a/src/test/ui/check-static-values-constraints.nll.stderr b/src/test/ui/check-static-values-constraints.nll.stderr index 5522e22fb1fa2..d2f6c7510a91d 100644 --- a/src/test/ui/check-static-values-constraints.nll.stderr +++ b/src/test/ui/check-static-values-constraints.nll.stderr @@ -1,5 +1,5 @@ error[E0493]: destructors cannot be evaluated at compile-time - --> $DIR/check-static-values-constraints.rs:75:43 + --> $DIR/check-static-values-constraints.rs:65:43 | LL | ..SafeStruct{field1: SafeEnum::Variant3(WithDtor), | ___________________________________________^ @@ -8,49 +8,49 @@ LL | | field2: SafeEnum::Va | |________________________________________________________________________________^ statics cannot evaluate destructors error[E0010]: allocations are not allowed in statics - --> $DIR/check-static-values-constraints.rs:89:33 + --> $DIR/check-static-values-constraints.rs:79:33 | LL | static STATIC11: Box = box MyOwned; | ^^^^^^^^^^^ allocation not allowed in statics error[E0015]: calls in statics are limited to constant functions, tuple structs and tuple variants - --> $DIR/check-static-values-constraints.rs:99:32 + --> $DIR/check-static-values-constraints.rs:89:32 | LL | field2: SafeEnum::Variant4("str".to_string()) | ^^^^^^^^^^^^^^^^^ error[E0010]: allocations are not allowed in statics - --> $DIR/check-static-values-constraints.rs:104:5 + --> $DIR/check-static-values-constraints.rs:94:5 | LL | box MyOwned, //~ ERROR allocations are not allowed in statics | ^^^^^^^^^^^ allocation not allowed in statics error[E0010]: allocations are not allowed in statics - --> $DIR/check-static-values-constraints.rs:105:5 + --> $DIR/check-static-values-constraints.rs:95:5 | LL | box MyOwned, //~ ERROR allocations are not allowed in statics | ^^^^^^^^^^^ allocation not allowed in statics error[E0010]: allocations are not allowed in statics - --> $DIR/check-static-values-constraints.rs:109:6 + --> $DIR/check-static-values-constraints.rs:99:6 | LL | &box MyOwned, //~ ERROR allocations are not allowed in statics | ^^^^^^^^^^^ allocation not allowed in statics error[E0010]: allocations are not allowed in statics - --> $DIR/check-static-values-constraints.rs:110:6 + --> $DIR/check-static-values-constraints.rs:100:6 | LL | &box MyOwned, //~ ERROR allocations are not allowed in statics | ^^^^^^^^^^^ allocation not allowed in statics error[E0010]: allocations are not allowed in statics - --> $DIR/check-static-values-constraints.rs:116:5 + --> $DIR/check-static-values-constraints.rs:106:5 | LL | box 3; | ^^^^^ allocation not allowed in statics error[E0507]: cannot move out of static item - --> $DIR/check-static-values-constraints.rs:120:45 + --> $DIR/check-static-values-constraints.rs:110:45 | LL | let y = { static x: Box = box 3; x }; | ^ @@ -59,7 +59,7 @@ LL | let y = { static x: Box = box 3; x }; | help: consider borrowing here: `&x` error[E0010]: allocations are not allowed in statics - --> $DIR/check-static-values-constraints.rs:120:38 + --> $DIR/check-static-values-constraints.rs:110:38 | LL | let y = { static x: Box = box 3; x }; | ^^^^^ allocation not allowed in statics diff --git a/src/test/ui/check-static-values-constraints.rs b/src/test/ui/check-static-values-constraints.rs index 37f665960c8c8..eb0fc39e1bf15 100644 --- a/src/test/ui/check-static-values-constraints.rs +++ b/src/test/ui/check-static-values-constraints.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Verifies all possible restrictions for statics values. #![allow(warnings)] diff --git a/src/test/ui/check-static-values-constraints.stderr b/src/test/ui/check-static-values-constraints.stderr index ac979a3fa7cfc..450a9ba0c0d11 100644 --- a/src/test/ui/check-static-values-constraints.stderr +++ b/src/test/ui/check-static-values-constraints.stderr @@ -1,5 +1,5 @@ error[E0493]: destructors cannot be evaluated at compile-time - --> $DIR/check-static-values-constraints.rs:75:43 + --> $DIR/check-static-values-constraints.rs:65:43 | LL | ..SafeStruct{field1: SafeEnum::Variant3(WithDtor), | ___________________________________________^ @@ -8,55 +8,55 @@ LL | | field2: SafeEnum::Va | |________________________________________________________________________________^ statics cannot evaluate destructors error[E0010]: allocations are not allowed in statics - --> $DIR/check-static-values-constraints.rs:89:33 + --> $DIR/check-static-values-constraints.rs:79:33 | LL | static STATIC11: Box = box MyOwned; | ^^^^^^^^^^^ allocation not allowed in statics error[E0015]: calls in statics are limited to constant functions, tuple structs and tuple variants - --> $DIR/check-static-values-constraints.rs:99:32 + --> $DIR/check-static-values-constraints.rs:89:32 | LL | field2: SafeEnum::Variant4("str".to_string()) | ^^^^^^^^^^^^^^^^^ error[E0010]: allocations are not allowed in statics - --> $DIR/check-static-values-constraints.rs:104:5 + --> $DIR/check-static-values-constraints.rs:94:5 | LL | box MyOwned, //~ ERROR allocations are not allowed in statics | ^^^^^^^^^^^ allocation not allowed in statics error[E0010]: allocations are not allowed in statics - --> $DIR/check-static-values-constraints.rs:105:5 + --> $DIR/check-static-values-constraints.rs:95:5 | LL | box MyOwned, //~ ERROR allocations are not allowed in statics | ^^^^^^^^^^^ allocation not allowed in statics error[E0010]: allocations are not allowed in statics - --> $DIR/check-static-values-constraints.rs:109:6 + --> $DIR/check-static-values-constraints.rs:99:6 | LL | &box MyOwned, //~ ERROR allocations are not allowed in statics | ^^^^^^^^^^^ allocation not allowed in statics error[E0010]: allocations are not allowed in statics - --> $DIR/check-static-values-constraints.rs:110:6 + --> $DIR/check-static-values-constraints.rs:100:6 | LL | &box MyOwned, //~ ERROR allocations are not allowed in statics | ^^^^^^^^^^^ allocation not allowed in statics error[E0010]: allocations are not allowed in statics - --> $DIR/check-static-values-constraints.rs:116:5 + --> $DIR/check-static-values-constraints.rs:106:5 | LL | box 3; | ^^^^^ allocation not allowed in statics error[E0507]: cannot move out of static item - --> $DIR/check-static-values-constraints.rs:120:45 + --> $DIR/check-static-values-constraints.rs:110:45 | LL | let y = { static x: Box = box 3; x }; | ^ cannot move out of static item error[E0010]: allocations are not allowed in statics - --> $DIR/check-static-values-constraints.rs:120:38 + --> $DIR/check-static-values-constraints.rs:110:38 | LL | let y = { static x: Box = box 3; x }; | ^^^^^ allocation not allowed in statics diff --git a/src/test/ui/check_match/issue-35609.rs b/src/test/ui/check_match/issue-35609.rs index d52718b7bf41f..8ef75e3511e8a 100644 --- a/src/test/ui/check_match/issue-35609.rs +++ b/src/test/ui/check_match/issue-35609.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Enum { A, B, C, D, E, F } diff --git a/src/test/ui/check_match/issue-35609.stderr b/src/test/ui/check_match/issue-35609.stderr index 418573171f1ea..7a517e856cbe2 100644 --- a/src/test/ui/check_match/issue-35609.stderr +++ b/src/test/ui/check_match/issue-35609.stderr @@ -1,47 +1,47 @@ error[E0004]: non-exhaustive patterns: `(B, _)`, `(C, _)`, `(D, _)` and 2 more not covered - --> $DIR/issue-35609.rs:20:11 + --> $DIR/issue-35609.rs:10:11 | LL | match (A, ()) { //~ ERROR non-exhaustive | ^^^^^^^ patterns `(B, _)`, `(C, _)`, `(D, _)` and 2 more not covered error[E0004]: non-exhaustive patterns: `(_, B)`, `(_, C)`, `(_, D)` and 2 more not covered - --> $DIR/issue-35609.rs:24:11 + --> $DIR/issue-35609.rs:14:11 | LL | match (A, A) { //~ ERROR non-exhaustive | ^^^^^^ patterns `(_, B)`, `(_, C)`, `(_, D)` and 2 more not covered error[E0004]: non-exhaustive patterns: `((B, _), _)`, `((C, _), _)`, `((D, _), _)` and 2 more not covered - --> $DIR/issue-35609.rs:28:11 + --> $DIR/issue-35609.rs:18:11 | LL | match ((A, ()), ()) { //~ ERROR non-exhaustive | ^^^^^^^^^^^^^ patterns `((B, _), _)`, `((C, _), _)`, `((D, _), _)` and 2 more not covered error[E0004]: non-exhaustive patterns: `((B, _), _)`, `((C, _), _)`, `((D, _), _)` and 2 more not covered - --> $DIR/issue-35609.rs:32:11 + --> $DIR/issue-35609.rs:22:11 | LL | match ((A, ()), A) { //~ ERROR non-exhaustive | ^^^^^^^^^^^^ patterns `((B, _), _)`, `((C, _), _)`, `((D, _), _)` and 2 more not covered error[E0004]: non-exhaustive patterns: `((B, _), _)`, `((C, _), _)`, `((D, _), _)` and 2 more not covered - --> $DIR/issue-35609.rs:36:11 + --> $DIR/issue-35609.rs:26:11 | LL | match ((A, ()), ()) { //~ ERROR non-exhaustive | ^^^^^^^^^^^^^ patterns `((B, _), _)`, `((C, _), _)`, `((D, _), _)` and 2 more not covered error[E0004]: non-exhaustive patterns: `S(B, _)`, `S(C, _)`, `S(D, _)` and 2 more not covered - --> $DIR/issue-35609.rs:41:11 + --> $DIR/issue-35609.rs:31:11 | LL | match S(A, ()) { //~ ERROR non-exhaustive | ^^^^^^^^ patterns `S(B, _)`, `S(C, _)`, `S(D, _)` and 2 more not covered error[E0004]: non-exhaustive patterns: `Sd { x: B, .. }`, `Sd { x: C, .. }`, `Sd { x: D, .. }` and 2 more not covered - --> $DIR/issue-35609.rs:45:11 + --> $DIR/issue-35609.rs:35:11 | LL | match (Sd { x: A, y: () }) { //~ ERROR non-exhaustive | ^^^^^^^^^^^^^^^^^^^^ patterns `Sd { x: B, .. }`, `Sd { x: C, .. }`, `Sd { x: D, .. }` and 2 more not covered error[E0004]: non-exhaustive patterns: `Some(B)`, `Some(C)`, `Some(D)` and 2 more not covered - --> $DIR/issue-35609.rs:49:11 + --> $DIR/issue-35609.rs:39:11 | LL | match Some(A) { //~ ERROR non-exhaustive | ^^^^^^^ patterns `Some(B)`, `Some(C)`, `Some(D)` and 2 more not covered diff --git a/src/test/ui/check_match/issue-43253.rs b/src/test/ui/check_match/issue-43253.rs index aace8c0c02b20..5d084248a7f99 100644 --- a/src/test/ui/check_match/issue-43253.rs +++ b/src/test/ui/check_match/issue-43253.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![feature(exclusive_range_pattern)] diff --git a/src/test/ui/check_match/issue-43253.stderr b/src/test/ui/check_match/issue-43253.stderr index 2af6a2a636841..d961f623e1fa7 100644 --- a/src/test/ui/check_match/issue-43253.stderr +++ b/src/test/ui/check_match/issue-43253.stderr @@ -1,23 +1,23 @@ warning: unreachable pattern - --> $DIR/issue-43253.rs:39:9 + --> $DIR/issue-43253.rs:29:9 | LL | 9 => {}, | ^ | note: lint level defined here - --> $DIR/issue-43253.rs:14:9 + --> $DIR/issue-43253.rs:4:9 | LL | #![warn(unreachable_patterns)] | ^^^^^^^^^^^^^^^^^^^^ warning: unreachable pattern - --> $DIR/issue-43253.rs:45:9 + --> $DIR/issue-43253.rs:35:9 | LL | 8..=9 => {}, | ^^^^^ warning: unreachable pattern - --> $DIR/issue-43253.rs:51:9 + --> $DIR/issue-43253.rs:41:9 | LL | 9..=9 => {}, | ^^^^^ diff --git a/src/test/ui/class-cast-to-trait.rs b/src/test/ui/class-cast-to-trait.rs index af83b0ecbf22c..909f2073d9b1b 100644 --- a/src/test/ui/class-cast-to-trait.rs +++ b/src/test/ui/class-cast-to-trait.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] trait noisy { diff --git a/src/test/ui/class-cast-to-trait.stderr b/src/test/ui/class-cast-to-trait.stderr index c1e08807f97c1..6c3e7334e7140 100644 --- a/src/test/ui/class-cast-to-trait.stderr +++ b/src/test/ui/class-cast-to-trait.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `eat` found for type `std::boxed::Box` in the current scope - --> $DIR/class-cast-to-trait.rs:63:8 + --> $DIR/class-cast-to-trait.rs:53:8 | LL | nyan.eat(); //~ ERROR no method named `eat` found | ^^^ diff --git a/src/test/ui/class-method-missing.rs b/src/test/ui/class-method-missing.rs index 46b100a4d399e..7286ae8bf976d 100644 --- a/src/test/ui/class-method-missing.rs +++ b/src/test/ui/class-method-missing.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait animal { fn eat(&self); } diff --git a/src/test/ui/class-method-missing.stderr b/src/test/ui/class-method-missing.stderr index c1da06e3a3ad6..6a5f99aa74bf4 100644 --- a/src/test/ui/class-method-missing.stderr +++ b/src/test/ui/class-method-missing.stderr @@ -1,5 +1,5 @@ error[E0046]: not all trait items implemented, missing: `eat` - --> $DIR/class-method-missing.rs:19:1 + --> $DIR/class-method-missing.rs:9:1 | LL | fn eat(&self); | -------------- `eat` from trait diff --git a/src/test/ui/class-missing-self.rs b/src/test/ui/class-missing-self.rs index 372bf4cac8734..fa34ae73c33ad 100644 --- a/src/test/ui/class-missing-self.rs +++ b/src/test/ui/class-missing-self.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct cat { meows : usize, } diff --git a/src/test/ui/class-missing-self.stderr b/src/test/ui/class-missing-self.stderr index 33bf62e70873e..484778f83ec58 100644 --- a/src/test/ui/class-missing-self.stderr +++ b/src/test/ui/class-missing-self.stderr @@ -1,11 +1,11 @@ error[E0425]: cannot find value `meows` in this scope - --> $DIR/class-missing-self.rs:19:7 + --> $DIR/class-missing-self.rs:9:7 | LL | meows += 1; //~ ERROR cannot find value `meows` in this scope | ^^^^^ help: try: `self.meows` error[E0425]: cannot find function `sleep` in this scope - --> $DIR/class-missing-self.rs:20:7 + --> $DIR/class-missing-self.rs:10:7 | LL | sleep(); //~ ERROR cannot find function `sleep` in this scope | ^^^^^ not found in this scope diff --git a/src/test/ui/cleanup-rvalue-scopes-cf.rs b/src/test/ui/cleanup-rvalue-scopes-cf.rs index 0f83bf80d2453..106dbd324ff9e 100644 --- a/src/test/ui/cleanup-rvalue-scopes-cf.rs +++ b/src/test/ui/cleanup-rvalue-scopes-cf.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-compare-mode-nll // Test that the borrow checker prevents pointers to temporaries diff --git a/src/test/ui/cleanup-rvalue-scopes-cf.stderr b/src/test/ui/cleanup-rvalue-scopes-cf.stderr index e1de4a2a8d49b..561403d1b42de 100644 --- a/src/test/ui/cleanup-rvalue-scopes-cf.stderr +++ b/src/test/ui/cleanup-rvalue-scopes-cf.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/cleanup-rvalue-scopes-cf.rs:38:19 + --> $DIR/cleanup-rvalue-scopes-cf.rs:28:19 | LL | let _x = arg(&AddFlags(1)); //~ ERROR value does not live long enough | ^^^^^^^^^^^ - temporary value dropped here while still borrowed @@ -12,7 +12,7 @@ LL | } = note: consider using a `let` binding to increase its lifetime error[E0597]: borrowed value does not live long enough - --> $DIR/cleanup-rvalue-scopes-cf.rs:39:14 + --> $DIR/cleanup-rvalue-scopes-cf.rs:29:14 | LL | let _x = AddFlags(1).get(); //~ ERROR value does not live long enough | ^^^^^^^^^^^ - temporary value dropped here while still borrowed @@ -25,7 +25,7 @@ LL | } = note: consider using a `let` binding to increase its lifetime error[E0597]: borrowed value does not live long enough - --> $DIR/cleanup-rvalue-scopes-cf.rs:40:21 + --> $DIR/cleanup-rvalue-scopes-cf.rs:30:21 | LL | let _x = &*arg(&AddFlags(1)); //~ ERROR value does not live long enough | ^^^^^^^^^^^ - temporary value dropped here while still borrowed @@ -38,7 +38,7 @@ LL | } = note: consider using a `let` binding to increase its lifetime error[E0597]: borrowed value does not live long enough - --> $DIR/cleanup-rvalue-scopes-cf.rs:41:24 + --> $DIR/cleanup-rvalue-scopes-cf.rs:31:24 | LL | let ref _x = *arg(&AddFlags(1)); //~ ERROR value does not live long enough | ^^^^^^^^^^^ - temporary value dropped here while still borrowed @@ -51,7 +51,7 @@ LL | } = note: consider using a `let` binding to increase its lifetime error[E0597]: borrowed value does not live long enough - --> $DIR/cleanup-rvalue-scopes-cf.rs:42:24 + --> $DIR/cleanup-rvalue-scopes-cf.rs:32:24 | LL | let &ref _x = arg(&AddFlags(1)); //~ ERROR value does not live long enough | ^^^^^^^^^^^ - temporary value dropped here while still borrowed @@ -64,7 +64,7 @@ LL | } = note: consider using a `let` binding to increase its lifetime error[E0597]: borrowed value does not live long enough - --> $DIR/cleanup-rvalue-scopes-cf.rs:43:14 + --> $DIR/cleanup-rvalue-scopes-cf.rs:33:14 | LL | let _x = AddFlags(1).get(); //~ ERROR value does not live long enough | ^^^^^^^^^^^ - temporary value dropped here while still borrowed @@ -77,7 +77,7 @@ LL | } = note: consider using a `let` binding to increase its lifetime error[E0597]: borrowed value does not live long enough - --> $DIR/cleanup-rvalue-scopes-cf.rs:44:34 + --> $DIR/cleanup-rvalue-scopes-cf.rs:34:34 | LL | let Box { f: _x } = Box { f: AddFlags(1).get() }; //~ ERROR value does not live long enough | ^^^^^^^^^^^ - temporary value dropped here while still borrowed diff --git a/src/test/ui/closure-expected-type/expect-fn-supply-fn-multiple.rs b/src/test/ui/closure-expected-type/expect-fn-supply-fn-multiple.rs index 32efb01c0fe81..1bfaecd16c0b6 100644 --- a/src/test/ui/closure-expected-type/expect-fn-supply-fn-multiple.rs +++ b/src/test/ui/closure-expected-type/expect-fn-supply-fn-multiple.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![allow(warnings)] diff --git a/src/test/ui/closure-expected-type/expect-fn-supply-fn.nll.stderr b/src/test/ui/closure-expected-type/expect-fn-supply-fn.nll.stderr index fe857001bfaef..bf6a34e5e1ee7 100644 --- a/src/test/ui/closure-expected-type/expect-fn-supply-fn.nll.stderr +++ b/src/test/ui/closure-expected-type/expect-fn-supply-fn.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/expect-fn-supply-fn.rs:24:52 + --> $DIR/expect-fn-supply-fn.rs:14:52 | LL | with_closure_expecting_fn_with_free_region(|x: fn(&'x u32), y| {}); | ^^^^^^^^^^^ error[E0631]: type mismatch in closure arguments - --> $DIR/expect-fn-supply-fn.rs:40:5 + --> $DIR/expect-fn-supply-fn.rs:30:5 | LL | with_closure_expecting_fn_with_free_region(|x: fn(&u32), y| {}); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ---------------- found signature of `fn(for<'r> fn(&'r u32), _) -> _` @@ -13,7 +13,7 @@ LL | with_closure_expecting_fn_with_free_region(|x: fn(&u32), y| {}); | expected signature of `for<'a, 'r> fn(fn(&'a u32), &'r i32) -> _` | note: required by `with_closure_expecting_fn_with_free_region` - --> $DIR/expect-fn-supply-fn.rs:11:1 + --> $DIR/expect-fn-supply-fn.rs:1:1 | LL | / fn with_closure_expecting_fn_with_free_region(_: F) LL | | where F: for<'a> FnOnce(fn(&'a u32), &i32) @@ -22,7 +22,7 @@ LL | | } | |_^ error[E0631]: type mismatch in closure arguments - --> $DIR/expect-fn-supply-fn.rs:47:5 + --> $DIR/expect-fn-supply-fn.rs:37:5 | LL | with_closure_expecting_fn_with_bound_region(|x: fn(&'x u32), y| {}); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ------------------- found signature of `fn(fn(&'x u32), _) -> _` @@ -30,7 +30,7 @@ LL | with_closure_expecting_fn_with_bound_region(|x: fn(&'x u32), y| {}); | expected signature of `for<'r> fn(for<'s> fn(&'s u32), &'r i32) -> _` | note: required by `with_closure_expecting_fn_with_bound_region` - --> $DIR/expect-fn-supply-fn.rs:16:1 + --> $DIR/expect-fn-supply-fn.rs:6:1 | LL | / fn with_closure_expecting_fn_with_bound_region(_: F) LL | | where F: FnOnce(fn(&u32), &i32) @@ -39,7 +39,7 @@ LL | | } | |_^ error[E0631]: type mismatch in closure arguments - --> $DIR/expect-fn-supply-fn.rs:56:5 + --> $DIR/expect-fn-supply-fn.rs:46:5 | LL | with_closure_expecting_fn_with_bound_region(|_x: Foo<'_>, y| {}); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ---------------- found signature of `for<'r> fn(fn(&'r u32), _) -> _` @@ -47,7 +47,7 @@ LL | with_closure_expecting_fn_with_bound_region(|_x: Foo<'_>, y| {}); | expected signature of `for<'r> fn(for<'s> fn(&'s u32), &'r i32) -> _` | note: required by `with_closure_expecting_fn_with_bound_region` - --> $DIR/expect-fn-supply-fn.rs:16:1 + --> $DIR/expect-fn-supply-fn.rs:6:1 | LL | / fn with_closure_expecting_fn_with_bound_region(_: F) LL | | where F: FnOnce(fn(&u32), &i32) diff --git a/src/test/ui/closure-expected-type/expect-fn-supply-fn.rs b/src/test/ui/closure-expected-type/expect-fn-supply-fn.rs index 63284c98020fc..8c7d3cbad33c4 100644 --- a/src/test/ui/closure-expected-type/expect-fn-supply-fn.rs +++ b/src/test/ui/closure-expected-type/expect-fn-supply-fn.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn with_closure_expecting_fn_with_free_region(_: F) where F: for<'a> FnOnce(fn(&'a u32), &i32) { diff --git a/src/test/ui/closure-expected-type/expect-fn-supply-fn.stderr b/src/test/ui/closure-expected-type/expect-fn-supply-fn.stderr index 4dca5922910f2..9c85743106776 100644 --- a/src/test/ui/closure-expected-type/expect-fn-supply-fn.stderr +++ b/src/test/ui/closure-expected-type/expect-fn-supply-fn.stderr @@ -1,43 +1,43 @@ error[E0308]: mismatched types - --> $DIR/expect-fn-supply-fn.rs:24:52 + --> $DIR/expect-fn-supply-fn.rs:14:52 | LL | with_closure_expecting_fn_with_free_region(|x: fn(&'x u32), y| {}); | ^^^^^^^^^^^ lifetime mismatch | = note: expected type `fn(&u32)` found type `fn(&'x u32)` -note: the anonymous lifetime #2 defined on the body at 24:48... - --> $DIR/expect-fn-supply-fn.rs:24:48 +note: the anonymous lifetime #2 defined on the body at 14:48... + --> $DIR/expect-fn-supply-fn.rs:14:48 | LL | with_closure_expecting_fn_with_free_region(|x: fn(&'x u32), y| {}); | ^^^^^^^^^^^^^^^^^^^^^^ -note: ...does not necessarily outlive the lifetime 'x as defined on the function body at 21:36 - --> $DIR/expect-fn-supply-fn.rs:21:36 +note: ...does not necessarily outlive the lifetime 'x as defined on the function body at 11:36 + --> $DIR/expect-fn-supply-fn.rs:11:36 | LL | fn expect_free_supply_free_from_fn<'x>(x: &'x u32) { | ^^ error[E0308]: mismatched types - --> $DIR/expect-fn-supply-fn.rs:24:52 + --> $DIR/expect-fn-supply-fn.rs:14:52 | LL | with_closure_expecting_fn_with_free_region(|x: fn(&'x u32), y| {}); | ^^^^^^^^^^^ lifetime mismatch | = note: expected type `fn(&u32)` found type `fn(&'x u32)` -note: the lifetime 'x as defined on the function body at 21:36... - --> $DIR/expect-fn-supply-fn.rs:21:36 +note: the lifetime 'x as defined on the function body at 11:36... + --> $DIR/expect-fn-supply-fn.rs:11:36 | LL | fn expect_free_supply_free_from_fn<'x>(x: &'x u32) { | ^^ -note: ...does not necessarily outlive the anonymous lifetime #2 defined on the body at 24:48 - --> $DIR/expect-fn-supply-fn.rs:24:48 +note: ...does not necessarily outlive the anonymous lifetime #2 defined on the body at 14:48 + --> $DIR/expect-fn-supply-fn.rs:14:48 | LL | with_closure_expecting_fn_with_free_region(|x: fn(&'x u32), y| {}); | ^^^^^^^^^^^^^^^^^^^^^^ error[E0631]: type mismatch in closure arguments - --> $DIR/expect-fn-supply-fn.rs:40:5 + --> $DIR/expect-fn-supply-fn.rs:30:5 | LL | with_closure_expecting_fn_with_free_region(|x: fn(&u32), y| {}); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ---------------- found signature of `fn(for<'r> fn(&'r u32), _) -> _` @@ -45,7 +45,7 @@ LL | with_closure_expecting_fn_with_free_region(|x: fn(&u32), y| {}); | expected signature of `for<'a, 'r> fn(fn(&'a u32), &'r i32) -> _` | note: required by `with_closure_expecting_fn_with_free_region` - --> $DIR/expect-fn-supply-fn.rs:11:1 + --> $DIR/expect-fn-supply-fn.rs:1:1 | LL | / fn with_closure_expecting_fn_with_free_region(_: F) LL | | where F: for<'a> FnOnce(fn(&'a u32), &i32) @@ -54,7 +54,7 @@ LL | | } | |_^ error[E0631]: type mismatch in closure arguments - --> $DIR/expect-fn-supply-fn.rs:47:5 + --> $DIR/expect-fn-supply-fn.rs:37:5 | LL | with_closure_expecting_fn_with_bound_region(|x: fn(&'x u32), y| {}); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ------------------- found signature of `fn(fn(&'x u32), _) -> _` @@ -62,7 +62,7 @@ LL | with_closure_expecting_fn_with_bound_region(|x: fn(&'x u32), y| {}); | expected signature of `for<'r> fn(for<'s> fn(&'s u32), &'r i32) -> _` | note: required by `with_closure_expecting_fn_with_bound_region` - --> $DIR/expect-fn-supply-fn.rs:16:1 + --> $DIR/expect-fn-supply-fn.rs:6:1 | LL | / fn with_closure_expecting_fn_with_bound_region(_: F) LL | | where F: FnOnce(fn(&u32), &i32) @@ -71,7 +71,7 @@ LL | | } | |_^ error[E0631]: type mismatch in closure arguments - --> $DIR/expect-fn-supply-fn.rs:56:5 + --> $DIR/expect-fn-supply-fn.rs:46:5 | LL | with_closure_expecting_fn_with_bound_region(|_x: Foo<'_>, y| {}); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ---------------- found signature of `for<'r> fn(fn(&'r u32), _) -> _` @@ -79,7 +79,7 @@ LL | with_closure_expecting_fn_with_bound_region(|_x: Foo<'_>, y| {}); | expected signature of `for<'r> fn(for<'s> fn(&'s u32), &'r i32) -> _` | note: required by `with_closure_expecting_fn_with_bound_region` - --> $DIR/expect-fn-supply-fn.rs:16:1 + --> $DIR/expect-fn-supply-fn.rs:6:1 | LL | / fn with_closure_expecting_fn_with_bound_region(_: F) LL | | where F: FnOnce(fn(&u32), &i32) diff --git a/src/test/ui/closure-expected-type/expect-infer-var-appearing-twice.rs b/src/test/ui/closure-expected-type/expect-infer-var-appearing-twice.rs index bef69a4b0b9f8..e5ec6b271e749 100644 --- a/src/test/ui/closure-expected-type/expect-infer-var-appearing-twice.rs +++ b/src/test/ui/closure-expected-type/expect-infer-var-appearing-twice.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn with_closure(_: F) where F: FnOnce(A, A) { diff --git a/src/test/ui/closure-expected-type/expect-infer-var-appearing-twice.stderr b/src/test/ui/closure-expected-type/expect-infer-var-appearing-twice.stderr index 51dcf5eb3dae9..7a0938e9f7e5e 100644 --- a/src/test/ui/closure-expected-type/expect-infer-var-appearing-twice.stderr +++ b/src/test/ui/closure-expected-type/expect-infer-var-appearing-twice.stderr @@ -1,5 +1,5 @@ error[E0631]: type mismatch in closure arguments - --> $DIR/expect-infer-var-appearing-twice.rs:24:5 + --> $DIR/expect-infer-var-appearing-twice.rs:14:5 | LL | with_closure(|x: u32, y: i32| { | ^^^^^^^^^^^^ ---------------- found signature of `fn(u32, i32) -> _` @@ -7,7 +7,7 @@ LL | with_closure(|x: u32, y: i32| { | expected signature of `fn(_, _) -> _` | note: required by `with_closure` - --> $DIR/expect-infer-var-appearing-twice.rs:11:1 + --> $DIR/expect-infer-var-appearing-twice.rs:1:1 | LL | / fn with_closure(_: F) LL | | where F: FnOnce(A, A) diff --git a/src/test/ui/closure-expected-type/expect-infer-var-supply-ty-with-bound-region.rs b/src/test/ui/closure-expected-type/expect-infer-var-supply-ty-with-bound-region.rs index 6767aa62f784d..3e42284b72c3f 100644 --- a/src/test/ui/closure-expected-type/expect-infer-var-supply-ty-with-bound-region.rs +++ b/src/test/ui/closure-expected-type/expect-infer-var-supply-ty-with-bound-region.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass fn with_closure(_: F) diff --git a/src/test/ui/closure-expected-type/expect-infer-var-supply-ty-with-free-region.rs b/src/test/ui/closure-expected-type/expect-infer-var-supply-ty-with-free-region.rs index aea5cb21e635e..cf417d7c2a8e8 100644 --- a/src/test/ui/closure-expected-type/expect-infer-var-supply-ty-with-free-region.rs +++ b/src/test/ui/closure-expected-type/expect-infer-var-supply-ty-with-free-region.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass fn with_closure(_: F) diff --git a/src/test/ui/closure-expected-type/expect-two-infer-vars-supply-ty-with-bound-region.rs b/src/test/ui/closure-expected-type/expect-two-infer-vars-supply-ty-with-bound-region.rs index 377eaadbd6af0..97d7a51a72bb1 100644 --- a/src/test/ui/closure-expected-type/expect-two-infer-vars-supply-ty-with-bound-region.rs +++ b/src/test/ui/closure-expected-type/expect-two-infer-vars-supply-ty-with-bound-region.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn with_closure(_: F) where F: FnOnce(A, B) { diff --git a/src/test/ui/closure-expected-type/expect-two-infer-vars-supply-ty-with-bound-region.stderr b/src/test/ui/closure-expected-type/expect-two-infer-vars-supply-ty-with-bound-region.stderr index 273fb2a2dd287..7dd996cce5d45 100644 --- a/src/test/ui/closure-expected-type/expect-two-infer-vars-supply-ty-with-bound-region.stderr +++ b/src/test/ui/closure-expected-type/expect-two-infer-vars-supply-ty-with-bound-region.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/expect-two-infer-vars-supply-ty-with-bound-region.rs:18:27 + --> $DIR/expect-two-infer-vars-supply-ty-with-bound-region.rs:8:27 | LL | with_closure(|x: u32, y| {}); //~ ERROR E0282 | ^ consider giving this closure parameter a type diff --git a/src/test/ui/closure-expected.rs b/src/test/ui/closure-expected.rs index ff52948ca8559..9b15a63da28d7 100644 --- a/src/test/ui/closure-expected.rs +++ b/src/test/ui/closure-expected.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = Some(1); let y = x.or_else(4); diff --git a/src/test/ui/closure-expected.stderr b/src/test/ui/closure-expected.stderr index 0da506b5b8139..ff77423577db6 100644 --- a/src/test/ui/closure-expected.stderr +++ b/src/test/ui/closure-expected.stderr @@ -1,5 +1,5 @@ error[E0277]: expected a `std::ops::FnOnce<()>` closure, found `{integer}` - --> $DIR/closure-expected.rs:13:15 + --> $DIR/closure-expected.rs:3:15 | LL | let y = x.or_else(4); | ^^^^^^^ expected an `FnOnce<()>` closure, found `{integer}` diff --git a/src/test/ui/closure_context/issue-26046-fn-mut.rs b/src/test/ui/closure_context/issue-26046-fn-mut.rs index 3b179a475e794..e5840181e41ef 100644 --- a/src/test/ui/closure_context/issue-26046-fn-mut.rs +++ b/src/test/ui/closure_context/issue-26046-fn-mut.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo() -> Box { let num = 5; diff --git a/src/test/ui/closure_context/issue-26046-fn-mut.stderr b/src/test/ui/closure_context/issue-26046-fn-mut.stderr index ac98d9427e45e..bdfd26f6871ab 100644 --- a/src/test/ui/closure_context/issue-26046-fn-mut.stderr +++ b/src/test/ui/closure_context/issue-26046-fn-mut.stderr @@ -1,5 +1,5 @@ error[E0525]: expected a closure that implements the `Fn` trait, but this closure only implements `FnMut` - --> $DIR/issue-26046-fn-mut.rs:14:19 + --> $DIR/issue-26046-fn-mut.rs:4:19 | LL | let closure = || { //~ ERROR expected a closure that | ^^ this closure implements `FnMut`, not `Fn` diff --git a/src/test/ui/closure_context/issue-26046-fn-once.rs b/src/test/ui/closure_context/issue-26046-fn-once.rs index cf15985ee83ea..d33420c52a035 100644 --- a/src/test/ui/closure_context/issue-26046-fn-once.rs +++ b/src/test/ui/closure_context/issue-26046-fn-once.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn get_closure() -> Box Vec> { let vec = vec![1u8, 2u8]; diff --git a/src/test/ui/closure_context/issue-26046-fn-once.stderr b/src/test/ui/closure_context/issue-26046-fn-once.stderr index e09fdb5fb7787..e7bcbb9e63083 100644 --- a/src/test/ui/closure_context/issue-26046-fn-once.stderr +++ b/src/test/ui/closure_context/issue-26046-fn-once.stderr @@ -1,5 +1,5 @@ error[E0525]: expected a closure that implements the `Fn` trait, but this closure only implements `FnOnce` - --> $DIR/issue-26046-fn-once.rs:14:19 + --> $DIR/issue-26046-fn-once.rs:4:19 | LL | let closure = move || { //~ ERROR expected a closure | ^^^^^^^ this closure implements `FnOnce`, not `Fn` diff --git a/src/test/ui/closure_context/issue-42065.nll.stderr b/src/test/ui/closure_context/issue-42065.nll.stderr index bda8a3b85f758..15d74261685be 100644 --- a/src/test/ui/closure_context/issue-42065.nll.stderr +++ b/src/test/ui/closure_context/issue-42065.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `debug_dump_dict` - --> $DIR/issue-42065.rs:21:5 + --> $DIR/issue-42065.rs:11:5 | LL | debug_dump_dict(); | --------------- value moved here diff --git a/src/test/ui/closure_context/issue-42065.rs b/src/test/ui/closure_context/issue-42065.rs index 9daa76d858ffb..c506600f4d931 100644 --- a/src/test/ui/closure_context/issue-42065.rs +++ b/src/test/ui/closure_context/issue-42065.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::HashMap; fn main() { diff --git a/src/test/ui/closure_context/issue-42065.stderr b/src/test/ui/closure_context/issue-42065.stderr index 5c2105c4f7954..69d98654048cb 100644 --- a/src/test/ui/closure_context/issue-42065.stderr +++ b/src/test/ui/closure_context/issue-42065.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `debug_dump_dict` - --> $DIR/issue-42065.rs:21:5 + --> $DIR/issue-42065.rs:11:5 | LL | debug_dump_dict(); | --------------- value moved here @@ -7,7 +7,7 @@ LL | debug_dump_dict(); | ^^^^^^^^^^^^^^^ value used here after move | note: closure cannot be invoked more than once because it moves the variable `dict` out of its environment - --> $DIR/issue-42065.rs:16:29 + --> $DIR/issue-42065.rs:6:29 | LL | for (key, value) in dict { | ^^^^ diff --git a/src/test/ui/closure_promotion.rs b/src/test/ui/closure_promotion.rs index 8826661f84a4b..5880328324060 100644 --- a/src/test/ui/closure_promotion.rs +++ b/src/test/ui/closure_promotion.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-compare-mode-nll #![allow(const_err)] diff --git a/src/test/ui/closure_promotion.stderr b/src/test/ui/closure_promotion.stderr index 8f08796b5c60b..ecbf1b54e01b1 100644 --- a/src/test/ui/closure_promotion.stderr +++ b/src/test/ui/closure_promotion.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/closure_promotion.rs:18:26 + --> $DIR/closure_promotion.rs:8:26 | LL | let x: &'static _ = &|| { let z = 3; z }; //~ ERROR does not live long enough | ^^^^^^^^^^^^^^^^^^^ temporary value does not live long enough diff --git a/src/test/ui/closures/closure-array-break-length.rs b/src/test/ui/closures/closure-array-break-length.rs index 8be5b925a399e..ac17bfdc941c8 100644 --- a/src/test/ui/closures/closure-array-break-length.rs +++ b/src/test/ui/closures/closure-array-break-length.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { |_: [_; continue]| {}; //~ ERROR: `continue` outside of loop diff --git a/src/test/ui/closures/closure-array-break-length.stderr b/src/test/ui/closures/closure-array-break-length.stderr index f62b135437092..fa7a63b642e6f 100644 --- a/src/test/ui/closures/closure-array-break-length.stderr +++ b/src/test/ui/closures/closure-array-break-length.stderr @@ -1,17 +1,17 @@ error[E0268]: `continue` outside of loop - --> $DIR/closure-array-break-length.rs:12:13 + --> $DIR/closure-array-break-length.rs:2:13 | LL | |_: [_; continue]| {}; //~ ERROR: `continue` outside of loop | ^^^^^^^^ cannot break outside of a loop error[E0268]: `continue` outside of loop - --> $DIR/closure-array-break-length.rs:14:19 + --> $DIR/closure-array-break-length.rs:4:19 | LL | while |_: [_; continue]| {} {} //~ ERROR: `continue` outside of loop | ^^^^^^^^ cannot break outside of a loop error[E0268]: `break` outside of loop - --> $DIR/closure-array-break-length.rs:16:19 + --> $DIR/closure-array-break-length.rs:6:19 | LL | while |_: [_; break]| {} {} //~ ERROR: `break` outside of loop | ^^^^^ cannot break outside of a loop diff --git a/src/test/ui/closures/closure-bounds-cant-promote-superkind-in-struct.rs b/src/test/ui/closures/closure-bounds-cant-promote-superkind-in-struct.rs index 12e9fb30902b5..039cf3e04648a 100644 --- a/src/test/ui/closures/closure-bounds-cant-promote-superkind-in-struct.rs +++ b/src/test/ui/closures/closure-bounds-cant-promote-superkind-in-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct X where F: FnOnce() + 'static + Send { field: F, } diff --git a/src/test/ui/closures/closure-bounds-cant-promote-superkind-in-struct.stderr b/src/test/ui/closures/closure-bounds-cant-promote-superkind-in-struct.stderr index e1b18b1d49e10..7d637fed8ab62 100644 --- a/src/test/ui/closures/closure-bounds-cant-promote-superkind-in-struct.stderr +++ b/src/test/ui/closures/closure-bounds-cant-promote-superkind-in-struct.stderr @@ -1,5 +1,5 @@ error[E0277]: `F` cannot be sent between threads safely - --> $DIR/closure-bounds-cant-promote-superkind-in-struct.rs:15:1 + --> $DIR/closure-bounds-cant-promote-superkind-in-struct.rs:5:1 | LL | / fn foo(blk: F) -> X where F: FnOnce() + 'static { LL | | //~^ ERROR `F` cannot be sent between threads safely @@ -10,7 +10,7 @@ LL | | } = help: the trait `std::marker::Send` is not implemented for `F` = help: consider adding a `where F: std::marker::Send` bound note: required by `X` - --> $DIR/closure-bounds-cant-promote-superkind-in-struct.rs:11:1 + --> $DIR/closure-bounds-cant-promote-superkind-in-struct.rs:1:1 | LL | struct X where F: FnOnce() + 'static + Send { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/closures/closure-bounds-static-cant-capture-borrowed.nll.stderr b/src/test/ui/closures/closure-bounds-static-cant-capture-borrowed.nll.stderr index ca82020a2ccb1..afbd51661642f 100644 --- a/src/test/ui/closures/closure-bounds-static-cant-capture-borrowed.nll.stderr +++ b/src/test/ui/closures/closure-bounds-static-cant-capture-borrowed.nll.stderr @@ -1,5 +1,5 @@ warning: not reporting region error due to nll - --> $DIR/closure-bounds-static-cant-capture-borrowed.rs:15:9 + --> $DIR/closure-bounds-static-cant-capture-borrowed.rs:5:9 | LL | bar(|| { | _________^ @@ -9,7 +9,7 @@ LL | | }) | |_____^ error[E0621]: explicit lifetime required in the type of `x` - --> $DIR/closure-bounds-static-cant-capture-borrowed.rs:15:5 + --> $DIR/closure-bounds-static-cant-capture-borrowed.rs:5:5 | LL | fn foo(x: &()) { | --- help: add explicit lifetime `'static` to the type of `x`: `&'static ()` @@ -20,7 +20,7 @@ LL | | }) | |______^ lifetime `'static` required error[E0597]: `x` does not live long enough - --> $DIR/closure-bounds-static-cant-capture-borrowed.rs:17:17 + --> $DIR/closure-bounds-static-cant-capture-borrowed.rs:7:17 | LL | bar(|| { | -- value captured here diff --git a/src/test/ui/closures/closure-bounds-static-cant-capture-borrowed.rs b/src/test/ui/closures/closure-bounds-static-cant-capture-borrowed.rs index 1ffba68263a9a..4fa5d54431c60 100644 --- a/src/test/ui/closures/closure-bounds-static-cant-capture-borrowed.rs +++ b/src/test/ui/closures/closure-bounds-static-cant-capture-borrowed.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn bar(blk: F) where F: FnOnce() + 'static { } diff --git a/src/test/ui/closures/closure-bounds-static-cant-capture-borrowed.stderr b/src/test/ui/closures/closure-bounds-static-cant-capture-borrowed.stderr index 825f469c33063..f50c3e3b53159 100644 --- a/src/test/ui/closures/closure-bounds-static-cant-capture-borrowed.stderr +++ b/src/test/ui/closures/closure-bounds-static-cant-capture-borrowed.stderr @@ -1,5 +1,5 @@ error[E0621]: explicit lifetime required in the type of `x` - --> $DIR/closure-bounds-static-cant-capture-borrowed.rs:15:5 + --> $DIR/closure-bounds-static-cant-capture-borrowed.rs:5:5 | LL | fn foo(x: &()) { | --- help: add explicit lifetime `'static` to the type of `x`: `&'static ()` diff --git a/src/test/ui/closures/closure-bounds-subtype.rs b/src/test/ui/closures/closure-bounds-subtype.rs index db26535b004ac..4888cbfcc1fd9 100644 --- a/src/test/ui/closures/closure-bounds-subtype.rs +++ b/src/test/ui/closures/closure-bounds-subtype.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn take_any(_: F) where F: FnOnce() { } diff --git a/src/test/ui/closures/closure-bounds-subtype.stderr b/src/test/ui/closures/closure-bounds-subtype.stderr index ffe486d446822..d018956d026c9 100644 --- a/src/test/ui/closures/closure-bounds-subtype.stderr +++ b/src/test/ui/closures/closure-bounds-subtype.stderr @@ -1,5 +1,5 @@ error[E0277]: `F` cannot be shared between threads safely - --> $DIR/closure-bounds-subtype.rs:24:5 + --> $DIR/closure-bounds-subtype.rs:13:5 | LL | take_const_owned(f); //~ ERROR `F` cannot be shared between threads safely [E0277] | ^^^^^^^^^^^^^^^^ `F` cannot be shared between threads safely @@ -7,7 +7,7 @@ LL | take_const_owned(f); //~ ERROR `F` cannot be shared between threads saf = help: the trait `std::marker::Sync` is not implemented for `F` = help: consider adding a `where F: std::marker::Sync` bound note: required by `take_const_owned` - --> $DIR/closure-bounds-subtype.rs:15:1 + --> $DIR/closure-bounds-subtype.rs:4:1 | LL | fn take_const_owned(_: F) where F: FnOnce() + Sync + Send { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/closures/closure-expected-type/expect-region-supply-region.nll.stderr b/src/test/ui/closures/closure-expected-type/expect-region-supply-region.nll.stderr index 8658c618bf24c..13ad7e75be6d7 100644 --- a/src/test/ui/closures/closure-expected-type/expect-region-supply-region.nll.stderr +++ b/src/test/ui/closures/closure-expected-type/expect-region-supply-region.nll.stderr @@ -1,29 +1,29 @@ warning: not reporting region error due to nll - --> $DIR/expect-region-supply-region.rs:28:13 + --> $DIR/expect-region-supply-region.rs:18:13 | LL | f = Some(x); //~ ERROR borrowed data cannot be stored outside of its closure | ^^^^^^^ warning: not reporting region error due to nll - --> $DIR/expect-region-supply-region.rs:38:13 + --> $DIR/expect-region-supply-region.rs:28:13 | LL | f = Some(x); //~ ERROR borrowed data cannot be stored outside of its closure | ^^^^^^^ warning: not reporting region error due to nll - --> $DIR/expect-region-supply-region.rs:47:33 + --> $DIR/expect-region-supply-region.rs:37:33 | LL | closure_expecting_bound(|x: &'x u32| { | ^^^^^^^ warning: not reporting region error due to nll - --> $DIR/expect-region-supply-region.rs:52:13 + --> $DIR/expect-region-supply-region.rs:42:13 | LL | f = Some(x); | ^^^^^^^ error: borrowed data escapes outside of closure - --> $DIR/expect-region-supply-region.rs:28:9 + --> $DIR/expect-region-supply-region.rs:18:9 | LL | let mut f: Option<&u32> = None; | ----- `f` is declared here, outside of the closure body @@ -33,7 +33,7 @@ LL | f = Some(x); //~ ERROR borrowed data cannot be stored outside of it | ^^^^^^^^^^^ `x` escapes the closure body here error: borrowed data escapes outside of closure - --> $DIR/expect-region-supply-region.rs:38:9 + --> $DIR/expect-region-supply-region.rs:28:9 | LL | let mut f: Option<&u32> = None; | ----- `f` is declared here, outside of the closure body @@ -43,7 +43,7 @@ LL | f = Some(x); //~ ERROR borrowed data cannot be stored outside of it | ^^^^^^^^^^^ `x` escapes the closure body here error: borrowed data escapes outside of closure - --> $DIR/expect-region-supply-region.rs:52:9 + --> $DIR/expect-region-supply-region.rs:42:9 | LL | let mut f: Option<&u32> = None; | ----- `f` is declared here, outside of the closure body diff --git a/src/test/ui/closures/closure-expected-type/expect-region-supply-region.rs b/src/test/ui/closures/closure-expected-type/expect-region-supply-region.rs index a464c5853e1c1..28a6ab77a915e 100644 --- a/src/test/ui/closures/closure-expected-type/expect-region-supply-region.rs +++ b/src/test/ui/closures/closure-expected-type/expect-region-supply-region.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(warnings)] fn closure_expecting_bound(_: F) diff --git a/src/test/ui/closures/closure-expected-type/expect-region-supply-region.stderr b/src/test/ui/closures/closure-expected-type/expect-region-supply-region.stderr index 56b43bbd7d34c..633dd4f5c62a6 100644 --- a/src/test/ui/closures/closure-expected-type/expect-region-supply-region.stderr +++ b/src/test/ui/closures/closure-expected-type/expect-region-supply-region.stderr @@ -1,5 +1,5 @@ error: borrowed data cannot be stored outside of its closure - --> $DIR/expect-region-supply-region.rs:28:18 + --> $DIR/expect-region-supply-region.rs:18:18 | LL | let mut f: Option<&u32> = None; | ----- borrowed data cannot be stored into here... @@ -9,7 +9,7 @@ LL | f = Some(x); //~ ERROR borrowed data cannot be stored outside of it | ^ cannot be stored outside of its closure error: borrowed data cannot be stored outside of its closure - --> $DIR/expect-region-supply-region.rs:38:18 + --> $DIR/expect-region-supply-region.rs:28:18 | LL | let mut f: Option<&u32> = None; | ----- borrowed data cannot be stored into here... @@ -19,15 +19,15 @@ LL | f = Some(x); //~ ERROR borrowed data cannot be stored outside of it | ^ cannot be stored outside of its closure error[E0308]: mismatched types - --> $DIR/expect-region-supply-region.rs:47:33 + --> $DIR/expect-region-supply-region.rs:37:33 | LL | closure_expecting_bound(|x: &'x u32| { | ^^^^^^^ lifetime mismatch | = note: expected type `&u32` found type `&'x u32` -note: the anonymous lifetime #2 defined on the body at 47:29... - --> $DIR/expect-region-supply-region.rs:47:29 +note: the anonymous lifetime #2 defined on the body at 37:29... + --> $DIR/expect-region-supply-region.rs:37:29 | LL | closure_expecting_bound(|x: &'x u32| { | _____________________________^ @@ -38,27 +38,27 @@ LL | | LL | | //~^ ERROR borrowed data cannot be stored outside of its closure LL | | }); | |_____^ -note: ...does not necessarily outlive the lifetime 'x as defined on the function body at 42:30 - --> $DIR/expect-region-supply-region.rs:42:30 +note: ...does not necessarily outlive the lifetime 'x as defined on the function body at 32:30 + --> $DIR/expect-region-supply-region.rs:32:30 | LL | fn expect_bound_supply_named<'x>() { | ^^ error[E0308]: mismatched types - --> $DIR/expect-region-supply-region.rs:47:33 + --> $DIR/expect-region-supply-region.rs:37:33 | LL | closure_expecting_bound(|x: &'x u32| { | ^^^^^^^ lifetime mismatch | = note: expected type `&u32` found type `&'x u32` -note: the lifetime 'x as defined on the function body at 42:30... - --> $DIR/expect-region-supply-region.rs:42:30 +note: the lifetime 'x as defined on the function body at 32:30... + --> $DIR/expect-region-supply-region.rs:32:30 | LL | fn expect_bound_supply_named<'x>() { | ^^ -note: ...does not necessarily outlive the anonymous lifetime #2 defined on the body at 47:29 - --> $DIR/expect-region-supply-region.rs:47:29 +note: ...does not necessarily outlive the anonymous lifetime #2 defined on the body at 37:29 + --> $DIR/expect-region-supply-region.rs:37:29 | LL | closure_expecting_bound(|x: &'x u32| { | _____________________________^ @@ -71,7 +71,7 @@ LL | | }); | |_____^ error: borrowed data cannot be stored outside of its closure - --> $DIR/expect-region-supply-region.rs:52:18 + --> $DIR/expect-region-supply-region.rs:42:18 | LL | let mut f: Option<&u32> = None; | ----- borrowed data cannot be stored into here... diff --git a/src/test/ui/closures/closure-immutable-outer-variable.fixed b/src/test/ui/closures/closure-immutable-outer-variable.fixed index b3a0d592f7601..22164a24d8bf0 100644 --- a/src/test/ui/closures/closure-immutable-outer-variable.fixed +++ b/src/test/ui/closures/closure-immutable-outer-variable.fixed @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix // Point at the captured immutable outer variable diff --git a/src/test/ui/closures/closure-immutable-outer-variable.nll.stderr b/src/test/ui/closures/closure-immutable-outer-variable.nll.stderr index d91c1199b3f82..0c4d90f4c531a 100644 --- a/src/test/ui/closures/closure-immutable-outer-variable.nll.stderr +++ b/src/test/ui/closures/closure-immutable-outer-variable.nll.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to `y`, as it is not declared as mutable - --> $DIR/closure-immutable-outer-variable.rs:21:26 + --> $DIR/closure-immutable-outer-variable.rs:11:26 | LL | let y = true; | - help: consider changing this to be mutable: `mut y` diff --git a/src/test/ui/closures/closure-immutable-outer-variable.rs b/src/test/ui/closures/closure-immutable-outer-variable.rs index e162678460c6c..fc4e3857268a8 100644 --- a/src/test/ui/closures/closure-immutable-outer-variable.rs +++ b/src/test/ui/closures/closure-immutable-outer-variable.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix // Point at the captured immutable outer variable diff --git a/src/test/ui/closures/closure-immutable-outer-variable.stderr b/src/test/ui/closures/closure-immutable-outer-variable.stderr index 0ee11d8cf15de..c6a6ebd931c68 100644 --- a/src/test/ui/closures/closure-immutable-outer-variable.stderr +++ b/src/test/ui/closures/closure-immutable-outer-variable.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to captured outer variable in an `FnMut` closure - --> $DIR/closure-immutable-outer-variable.rs:21:26 + --> $DIR/closure-immutable-outer-variable.rs:11:26 | LL | let y = true; | - help: consider making `y` mutable: `mut y` diff --git a/src/test/ui/closures/closure-move-sync.rs b/src/test/ui/closures/closure-move-sync.rs index e096e7ca3a06b..580cd1af4f303 100644 --- a/src/test/ui/closures/closure-move-sync.rs +++ b/src/test/ui/closures/closure-move-sync.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::thread; use std::sync::mpsc::channel; diff --git a/src/test/ui/closures/closure-move-sync.stderr b/src/test/ui/closures/closure-move-sync.stderr index 076bae8dbd7af..8afebc7c74816 100644 --- a/src/test/ui/closures/closure-move-sync.stderr +++ b/src/test/ui/closures/closure-move-sync.stderr @@ -1,23 +1,23 @@ error[E0277]: `std::sync::mpsc::Receiver<()>` cannot be shared between threads safely - --> $DIR/closure-move-sync.rs:16:13 + --> $DIR/closure-move-sync.rs:6:13 | LL | let t = thread::spawn(|| { | ^^^^^^^^^^^^^ `std::sync::mpsc::Receiver<()>` cannot be shared between threads safely | = help: the trait `std::marker::Sync` is not implemented for `std::sync::mpsc::Receiver<()>` = note: required because of the requirements on the impl of `std::marker::Send` for `&std::sync::mpsc::Receiver<()>` - = note: required because it appears within the type `[closure@$DIR/closure-move-sync.rs:16:27: 19:6 recv:&std::sync::mpsc::Receiver<()>]` + = note: required because it appears within the type `[closure@$DIR/closure-move-sync.rs:6:27: 9:6 recv:&std::sync::mpsc::Receiver<()>]` = note: required by `std::thread::spawn` error[E0277]: `std::sync::mpsc::Sender<()>` cannot be shared between threads safely - --> $DIR/closure-move-sync.rs:28:5 + --> $DIR/closure-move-sync.rs:18:5 | LL | thread::spawn(|| tx.send(()).unwrap()); | ^^^^^^^^^^^^^ `std::sync::mpsc::Sender<()>` cannot be shared between threads safely | = help: the trait `std::marker::Sync` is not implemented for `std::sync::mpsc::Sender<()>` = note: required because of the requirements on the impl of `std::marker::Send` for `&std::sync::mpsc::Sender<()>` - = note: required because it appears within the type `[closure@$DIR/closure-move-sync.rs:28:19: 28:42 tx:&std::sync::mpsc::Sender<()>]` + = note: required because it appears within the type `[closure@$DIR/closure-move-sync.rs:18:19: 18:42 tx:&std::sync::mpsc::Sender<()>]` = note: required by `std::thread::spawn` error: aborting due to 2 previous errors diff --git a/src/test/ui/closures/closure-no-fn-1.rs b/src/test/ui/closures/closure-no-fn-1.rs index 10c99703a97ff..48c3e47252062 100644 --- a/src/test/ui/closures/closure-no-fn-1.rs +++ b/src/test/ui/closures/closure-no-fn-1.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Ensure that capturing closures are never coerced to fns // Especially interesting as non-capturing closures can be. diff --git a/src/test/ui/closures/closure-no-fn-1.stderr b/src/test/ui/closures/closure-no-fn-1.stderr index 4786a6836cd89..6d07c6b035ee4 100644 --- a/src/test/ui/closures/closure-no-fn-1.stderr +++ b/src/test/ui/closures/closure-no-fn-1.stderr @@ -1,11 +1,11 @@ error[E0308]: mismatched types - --> $DIR/closure-no-fn-1.rs:16:29 + --> $DIR/closure-no-fn-1.rs:6:29 | LL | let foo: fn(u8) -> u8 = |v: u8| { a += v; a }; | ^^^^^^^^^^^^^^^^^^^^^ expected fn pointer, found closure | = note: expected type `fn(u8) -> u8` - found type `[closure@$DIR/closure-no-fn-1.rs:16:29: 16:50 a:_]` + found type `[closure@$DIR/closure-no-fn-1.rs:6:29: 6:50 a:_]` error: aborting due to previous error diff --git a/src/test/ui/closures/closure-no-fn-2.rs b/src/test/ui/closures/closure-no-fn-2.rs index a6438bb5f2418..f3066f7a33018 100644 --- a/src/test/ui/closures/closure-no-fn-2.rs +++ b/src/test/ui/closures/closure-no-fn-2.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Ensure that capturing closures are never coerced to fns // Especially interesting as non-capturing closures can be. diff --git a/src/test/ui/closures/closure-no-fn-2.stderr b/src/test/ui/closures/closure-no-fn-2.stderr index 1aad49777dc90..5adcdf6058b71 100644 --- a/src/test/ui/closures/closure-no-fn-2.stderr +++ b/src/test/ui/closures/closure-no-fn-2.stderr @@ -1,11 +1,11 @@ error[E0308]: mismatched types - --> $DIR/closure-no-fn-2.rs:16:27 + --> $DIR/closure-no-fn-2.rs:6:27 | LL | let bar: fn() -> u8 = || { b }; | ^^^^^^^^ expected fn pointer, found closure | = note: expected type `fn() -> u8` - found type `[closure@$DIR/closure-no-fn-2.rs:16:27: 16:35 b:_]` + found type `[closure@$DIR/closure-no-fn-2.rs:6:27: 6:35 b:_]` error: aborting due to previous error diff --git a/src/test/ui/closures/closure-no-fn-3.rs b/src/test/ui/closures/closure-no-fn-3.rs index 6584c16c9dec6..53217c2f199c2 100644 --- a/src/test/ui/closures/closure-no-fn-3.rs +++ b/src/test/ui/closures/closure-no-fn-3.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Ensure that capturing closures are never coerced to fns // Especially interesting as non-capturing closures can be. diff --git a/src/test/ui/closures/closure-no-fn-3.stderr b/src/test/ui/closures/closure-no-fn-3.stderr index bd28045c1b98d..ab6056b65473e 100644 --- a/src/test/ui/closures/closure-no-fn-3.stderr +++ b/src/test/ui/closures/closure-no-fn-3.stderr @@ -1,5 +1,5 @@ -error[E0605]: non-primitive cast: `[closure@$DIR/closure-no-fn-3.rs:16:27: 16:37 b:_]` as `fn() -> u8` - --> $DIR/closure-no-fn-3.rs:16:27 +error[E0605]: non-primitive cast: `[closure@$DIR/closure-no-fn-3.rs:6:27: 6:37 b:_]` as `fn() -> u8` + --> $DIR/closure-no-fn-3.rs:6:27 | LL | let baz: fn() -> u8 = (|| { b }) as fn() -> u8; | ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/closures/closure-referencing-itself-issue-25954.rs b/src/test/ui/closures/closure-referencing-itself-issue-25954.rs index 9357d0e761571..7dd0e51797d8e 100644 --- a/src/test/ui/closures/closure-referencing-itself-issue-25954.rs +++ b/src/test/ui/closures/closure-referencing-itself-issue-25954.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #25954: detect and reject a closure type that // references itself. diff --git a/src/test/ui/closures/closure-referencing-itself-issue-25954.stderr b/src/test/ui/closures/closure-referencing-itself-issue-25954.stderr index fa00d9fd9a4d2..f60be43bba813 100644 --- a/src/test/ui/closures/closure-referencing-itself-issue-25954.stderr +++ b/src/test/ui/closures/closure-referencing-itself-issue-25954.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/closure-referencing-itself-issue-25954.rs:25:13 + --> $DIR/closure-referencing-itself-issue-25954.rs:15:13 | LL | let q = || p.b.set(5i32); //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^ cyclic type of infinite size diff --git a/src/test/ui/closures/closure-reform-bad.rs b/src/test/ui/closures/closure-reform-bad.rs index 490734d463da4..0ba48ab518442 100644 --- a/src/test/ui/closures/closure-reform-bad.rs +++ b/src/test/ui/closures/closure-reform-bad.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ diff --git a/src/test/ui/closures/closure-reform-bad.stderr b/src/test/ui/closures/closure-reform-bad.stderr index a4e181753690f..76f88d0490745 100644 --- a/src/test/ui/closures/closure-reform-bad.stderr +++ b/src/test/ui/closures/closure-reform-bad.stderr @@ -1,11 +1,11 @@ error[E0308]: mismatched types - --> $DIR/closure-reform-bad.rs:21:15 + --> $DIR/closure-reform-bad.rs:11:15 | LL | call_bare(f) //~ ERROR mismatched types | ^ expected fn pointer, found closure | = note: expected type `for<'r> fn(&'r str)` - found type `[closure@$DIR/closure-reform-bad.rs:20:13: 20:50 string:_]` + found type `[closure@$DIR/closure-reform-bad.rs:10:13: 10:50 string:_]` error: aborting due to previous error diff --git a/src/test/ui/closures/closure-wrong-kind.rs b/src/test/ui/closures/closure-wrong-kind.rs index a387e4c5ece11..9bf38bfb66b62 100644 --- a/src/test/ui/closures/closure-wrong-kind.rs +++ b/src/test/ui/closures/closure-wrong-kind.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ diff --git a/src/test/ui/closures/closure-wrong-kind.stderr b/src/test/ui/closures/closure-wrong-kind.stderr index 636f30770a9a3..b289ea2964426 100644 --- a/src/test/ui/closures/closure-wrong-kind.stderr +++ b/src/test/ui/closures/closure-wrong-kind.stderr @@ -1,5 +1,5 @@ error[E0525]: expected a closure that implements the `Fn` trait, but this closure only implements `FnOnce` - --> $DIR/closure-wrong-kind.rs:20:19 + --> $DIR/closure-wrong-kind.rs:10:19 | LL | let closure = |_| foo(x); //~ ERROR E0525 | ^^^^^^^^-^ diff --git a/src/test/ui/codemap_tests/bad-format-args.rs b/src/test/ui/codemap_tests/bad-format-args.rs index df7d5fe927ed9..9f90185774467 100644 --- a/src/test/ui/codemap_tests/bad-format-args.rs +++ b/src/test/ui/codemap_tests/bad-format-args.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { format!(); //~ ERROR requires at least a format string argument format!("" 1); //~ ERROR expected token: `,` diff --git a/src/test/ui/codemap_tests/bad-format-args.stderr b/src/test/ui/codemap_tests/bad-format-args.stderr index 1c801f2a79039..38320416b4509 100644 --- a/src/test/ui/codemap_tests/bad-format-args.stderr +++ b/src/test/ui/codemap_tests/bad-format-args.stderr @@ -1,5 +1,5 @@ error: requires at least a format string argument - --> $DIR/bad-format-args.rs:12:5 + --> $DIR/bad-format-args.rs:2:5 | LL | format!(); //~ ERROR requires at least a format string argument | ^^^^^^^^^^ @@ -7,13 +7,13 @@ LL | format!(); //~ ERROR requires at least a format string argument = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) error: expected token: `,` - --> $DIR/bad-format-args.rs:13:16 + --> $DIR/bad-format-args.rs:3:16 | LL | format!("" 1); //~ ERROR expected token: `,` | ^ error: expected token: `,` - --> $DIR/bad-format-args.rs:14:19 + --> $DIR/bad-format-args.rs:4:19 | LL | format!("", 1 1); //~ ERROR expected token: `,` | ^ diff --git a/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.rs b/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.rs index 532d173011d7f..f35fbad7cd6df 100644 --- a/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.rs +++ b/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] trait C {} diff --git a/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr b/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr index 7975966bf8099..5f8bc387a3d29 100644 --- a/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr +++ b/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr @@ -1,5 +1,5 @@ error[E0592]: duplicate definitions with name `f` - --> $DIR/coherence-overlapping-inherent-impl-trait.rs:14:10 + --> $DIR/coherence-overlapping-inherent-impl-trait.rs:4:10 | LL | impl C { fn f() {} } //~ ERROR duplicate | ^^^^^^^^^ duplicate definitions for `f` diff --git a/src/test/ui/codemap_tests/empty_span.rs b/src/test/ui/codemap_tests/empty_span.rs index 8e0395e3c5033..4d52b391280a7 100644 --- a/src/test/ui/codemap_tests/empty_span.rs +++ b/src/test/ui/codemap_tests/empty_span.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] fn main() { struct Foo; diff --git a/src/test/ui/codemap_tests/empty_span.stderr b/src/test/ui/codemap_tests/empty_span.stderr index 9383bfc92a870..f52856770978e 100644 --- a/src/test/ui/codemap_tests/empty_span.stderr +++ b/src/test/ui/codemap_tests/empty_span.stderr @@ -1,5 +1,5 @@ error[E0321]: cross-crate traits with a default impl, like `std::marker::Send`, can only be implemented for a struct/enum type, not `&'static main::Foo` - --> $DIR/empty_span.rs:17:5 + --> $DIR/empty_span.rs:7:5 | LL | unsafe impl Send for &'static Foo { } //~ ERROR cross-crate traits with a default impl | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't implement cross-crate trait with a default impl for non-struct/enum type diff --git a/src/test/ui/codemap_tests/huge_multispan_highlight.nll.stderr b/src/test/ui/codemap_tests/huge_multispan_highlight.nll.stderr index 8251f04d353f7..7fdeb03acbd6c 100644 --- a/src/test/ui/codemap_tests/huge_multispan_highlight.nll.stderr +++ b/src/test/ui/codemap_tests/huge_multispan_highlight.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable - --> $DIR/huge_multispan_highlight.rs:100:13 + --> $DIR/huge_multispan_highlight.rs:90:13 | LL | let x = "foo"; | - help: consider changing this to be mutable: `mut x` diff --git a/src/test/ui/codemap_tests/huge_multispan_highlight.rs b/src/test/ui/codemap_tests/huge_multispan_highlight.rs index cf593eab85329..623c59081d0fe 100644 --- a/src/test/ui/codemap_tests/huge_multispan_highlight.rs +++ b/src/test/ui/codemap_tests/huge_multispan_highlight.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = "foo"; diff --git a/src/test/ui/codemap_tests/huge_multispan_highlight.stderr b/src/test/ui/codemap_tests/huge_multispan_highlight.stderr index 68818f50cd273..6892d5e1e29fe 100644 --- a/src/test/ui/codemap_tests/huge_multispan_highlight.stderr +++ b/src/test/ui/codemap_tests/huge_multispan_highlight.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow immutable local variable `x` as mutable - --> $DIR/huge_multispan_highlight.rs:100:18 + --> $DIR/huge_multispan_highlight.rs:90:18 | LL | let x = "foo"; | - consider changing this to `mut x` diff --git a/src/test/ui/codemap_tests/issue-11715.nll.stderr b/src/test/ui/codemap_tests/issue-11715.nll.stderr index c0eeb63447d55..25b9b27fe13ae 100644 --- a/src/test/ui/codemap_tests/issue-11715.nll.stderr +++ b/src/test/ui/codemap_tests/issue-11715.nll.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/issue-11715.rs:100:13 + --> $DIR/issue-11715.rs:5:13 | LL | let y = &mut x; | ------ first mutable borrow occurs here diff --git a/src/test/ui/codemap_tests/issue-11715.rs b/src/test/ui/codemap_tests/issue-11715.rs index 415aa3687083b..617d57ff75a48 100644 --- a/src/test/ui/codemap_tests/issue-11715.rs +++ b/src/test/ui/codemap_tests/issue-11715.rs @@ -1,98 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #![feature(rustc_attrs)] fn main() { #![rustc_error] // rust-lang/rust#49855 let mut x = "foo"; diff --git a/src/test/ui/codemap_tests/issue-11715.stderr b/src/test/ui/codemap_tests/issue-11715.stderr index eb73c69c5dcf0..8f320a4e19b2d 100644 --- a/src/test/ui/codemap_tests/issue-11715.stderr +++ b/src/test/ui/codemap_tests/issue-11715.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/issue-11715.rs:100:18 + --> $DIR/issue-11715.rs:5:18 | LL | let y = &mut x; | - first mutable borrow occurs here diff --git a/src/test/ui/codemap_tests/issue-28308.rs b/src/test/ui/codemap_tests/issue-28308.rs index c71c28ed62520..81493f8c45311 100644 --- a/src/test/ui/codemap_tests/issue-28308.rs +++ b/src/test/ui/codemap_tests/issue-28308.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { assert!("foo"); //~^ ERROR cannot apply unary operator `!` diff --git a/src/test/ui/codemap_tests/issue-28308.stderr b/src/test/ui/codemap_tests/issue-28308.stderr index 15c159a3b153c..d44c157003dfb 100644 --- a/src/test/ui/codemap_tests/issue-28308.stderr +++ b/src/test/ui/codemap_tests/issue-28308.stderr @@ -1,5 +1,5 @@ error[E0600]: cannot apply unary operator `!` to type `&'static str` - --> $DIR/issue-28308.rs:12:5 + --> $DIR/issue-28308.rs:2:5 | LL | assert!("foo"); | ^^^^^^^^^^^^^^^ cannot apply unary operator `!` diff --git a/src/test/ui/codemap_tests/one_line.nll.stderr b/src/test/ui/codemap_tests/one_line.nll.stderr index 52ce3787f5885..b8f4e2d36cd68 100644 --- a/src/test/ui/codemap_tests/one_line.nll.stderr +++ b/src/test/ui/codemap_tests/one_line.nll.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `v` as mutable more than once at a time - --> $DIR/one_line.rs:13:12 + --> $DIR/one_line.rs:3:12 | LL | v.push(v.pop().unwrap()); //~ ERROR cannot borrow | -------^---------------- diff --git a/src/test/ui/codemap_tests/one_line.rs b/src/test/ui/codemap_tests/one_line.rs index 3fb35dd26acab..bb36813dbddf5 100644 --- a/src/test/ui/codemap_tests/one_line.rs +++ b/src/test/ui/codemap_tests/one_line.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let mut v = vec![Some("foo"), Some("bar")]; v.push(v.pop().unwrap()); //~ ERROR cannot borrow diff --git a/src/test/ui/codemap_tests/one_line.stderr b/src/test/ui/codemap_tests/one_line.stderr index 5a6d474ed1667..2ea793c096942 100644 --- a/src/test/ui/codemap_tests/one_line.stderr +++ b/src/test/ui/codemap_tests/one_line.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `v` as mutable more than once at a time - --> $DIR/one_line.rs:13:12 + --> $DIR/one_line.rs:3:12 | LL | v.push(v.pop().unwrap()); //~ ERROR cannot borrow | - ^ - first borrow ends here diff --git a/src/test/ui/codemap_tests/overlapping_inherent_impls.rs b/src/test/ui/codemap_tests/overlapping_inherent_impls.rs index 18e77ddfd2c5b..66af212267d16 100644 --- a/src/test/ui/codemap_tests/overlapping_inherent_impls.rs +++ b/src/test/ui/codemap_tests/overlapping_inherent_impls.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that you cannot define items with the same name in overlapping inherent // impl blocks. diff --git a/src/test/ui/codemap_tests/overlapping_inherent_impls.stderr b/src/test/ui/codemap_tests/overlapping_inherent_impls.stderr index db729ac34f32b..1b20b699d9f8d 100644 --- a/src/test/ui/codemap_tests/overlapping_inherent_impls.stderr +++ b/src/test/ui/codemap_tests/overlapping_inherent_impls.stderr @@ -1,5 +1,5 @@ error[E0592]: duplicate definitions with name `id` - --> $DIR/overlapping_inherent_impls.rs:19:5 + --> $DIR/overlapping_inherent_impls.rs:9:5 | LL | fn id() {} //~ ERROR duplicate definitions | ^^^^^^^^^^ duplicate definitions for `id` @@ -8,7 +8,7 @@ LL | fn id() {} | ---------- other definition for `id` error[E0592]: duplicate definitions with name `bar` - --> $DIR/overlapping_inherent_impls.rs:29:5 + --> $DIR/overlapping_inherent_impls.rs:19:5 | LL | fn bar(&self) {} //~ ERROR duplicate definitions | ^^^^^^^^^^^^^^^^ duplicate definitions for `bar` @@ -17,7 +17,7 @@ LL | fn bar(&self) {} | ---------------- other definition for `bar` error[E0592]: duplicate definitions with name `baz` - --> $DIR/overlapping_inherent_impls.rs:39:5 + --> $DIR/overlapping_inherent_impls.rs:29:5 | LL | fn baz(&self) {} //~ ERROR duplicate definitions | ^^^^^^^^^^^^^^^^ duplicate definitions for `baz` diff --git a/src/test/ui/codemap_tests/overlapping_spans.nll.stderr b/src/test/ui/codemap_tests/overlapping_spans.nll.stderr index e334472f9d6e1..607cbbb3fda28 100644 --- a/src/test/ui/codemap_tests/overlapping_spans.nll.stderr +++ b/src/test/ui/codemap_tests/overlapping_spans.nll.stderr @@ -1,5 +1,5 @@ error[E0509]: cannot move out of type `S`, which implements the `Drop` trait - --> $DIR/overlapping_spans.rs:20:11 + --> $DIR/overlapping_spans.rs:10:11 | LL | match (S {f:"foo".to_string()}) { | ^^^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of here @@ -7,7 +7,7 @@ LL | S {f:_s} => {} //~ ERROR cannot move out | -- data moved here | note: move occurs because `_s` has type `std::string::String`, which does not implement the `Copy` trait - --> $DIR/overlapping_spans.rs:21:14 + --> $DIR/overlapping_spans.rs:11:14 | LL | S {f:_s} => {} //~ ERROR cannot move out | ^^ diff --git a/src/test/ui/codemap_tests/overlapping_spans.rs b/src/test/ui/codemap_tests/overlapping_spans.rs index 467e90bd5a51b..680f889321ce7 100644 --- a/src/test/ui/codemap_tests/overlapping_spans.rs +++ b/src/test/ui/codemap_tests/overlapping_spans.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug)] struct Foo { } diff --git a/src/test/ui/codemap_tests/overlapping_spans.stderr b/src/test/ui/codemap_tests/overlapping_spans.stderr index 62a4f08e15661..1c92dd981ed8d 100644 --- a/src/test/ui/codemap_tests/overlapping_spans.stderr +++ b/src/test/ui/codemap_tests/overlapping_spans.stderr @@ -1,5 +1,5 @@ error[E0509]: cannot move out of type `S`, which implements the `Drop` trait - --> $DIR/overlapping_spans.rs:21:9 + --> $DIR/overlapping_spans.rs:11:9 | LL | S {f:_s} => {} //~ ERROR cannot move out | ^^^^^--^ diff --git a/src/test/ui/codemap_tests/tab.rs b/src/test/ui/codemap_tests/tab.rs index b8dedb0daf5f0..64569f2e72b1e 100644 --- a/src/test/ui/codemap_tests/tab.rs +++ b/src/test/ui/codemap_tests/tab.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-tab fn main() { diff --git a/src/test/ui/codemap_tests/tab.stderr b/src/test/ui/codemap_tests/tab.stderr index c466610bcec82..80b5773fda33a 100644 --- a/src/test/ui/codemap_tests/tab.stderr +++ b/src/test/ui/codemap_tests/tab.stderr @@ -1,11 +1,11 @@ error[E0425]: cannot find value `bar` in this scope - --> $DIR/tab.rs:14:2 + --> $DIR/tab.rs:4:2 | LL | bar; //~ ERROR cannot find value `bar` | ^^^ not found in this scope error[E0308]: mismatched types - --> $DIR/tab.rs:18:2 + --> $DIR/tab.rs:8:2 | LL | fn foo() { | - help: try adding a return type: `-> &'static str` diff --git a/src/test/ui/codemap_tests/tab_2.rs b/src/test/ui/codemap_tests/tab_2.rs index b759a4abcae21..644697c3239aa 100644 --- a/src/test/ui/codemap_tests/tab_2.rs +++ b/src/test/ui/codemap_tests/tab_2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-tab fn main() { diff --git a/src/test/ui/codemap_tests/tab_2.stderr b/src/test/ui/codemap_tests/tab_2.stderr index d8ad5955caeaa..f7eec3eb8da8e 100644 --- a/src/test/ui/codemap_tests/tab_2.stderr +++ b/src/test/ui/codemap_tests/tab_2.stderr @@ -1,5 +1,5 @@ error: unterminated double quote string - --> $DIR/tab_2.rs:14:7 + --> $DIR/tab_2.rs:4:7 | LL | """; //~ ERROR unterminated double quote | ___________________^ diff --git a/src/test/ui/codemap_tests/tab_3.nll.stderr b/src/test/ui/codemap_tests/tab_3.nll.stderr index c56cb7772c81b..55117ff2b1876 100644 --- a/src/test/ui/codemap_tests/tab_3.nll.stderr +++ b/src/test/ui/codemap_tests/tab_3.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: borrow of moved value: `some_vec` - --> $DIR/tab_3.rs:17:20 + --> $DIR/tab_3.rs:7:20 | LL | some_vec.into_iter(); | -------- value moved here diff --git a/src/test/ui/codemap_tests/tab_3.rs b/src/test/ui/codemap_tests/tab_3.rs index ea235ed71a9e6..4fd5b70f7ae37 100644 --- a/src/test/ui/codemap_tests/tab_3.rs +++ b/src/test/ui/codemap_tests/tab_3.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-tab fn main() { diff --git a/src/test/ui/codemap_tests/tab_3.stderr b/src/test/ui/codemap_tests/tab_3.stderr index d960c0b7da80c..6e93ae1306961 100644 --- a/src/test/ui/codemap_tests/tab_3.stderr +++ b/src/test/ui/codemap_tests/tab_3.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `some_vec` - --> $DIR/tab_3.rs:17:20 + --> $DIR/tab_3.rs:7:20 | LL | some_vec.into_iter(); | -------- value moved here diff --git a/src/test/ui/codemap_tests/two_files.rs b/src/test/ui/codemap_tests/two_files.rs index 4c99ee67598bc..71d97d3c28972 100644 --- a/src/test/ui/codemap_tests/two_files.rs +++ b/src/test/ui/codemap_tests/two_files.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - include!("two_files_data.rs"); struct Baz { } diff --git a/src/test/ui/codemap_tests/two_files.stderr b/src/test/ui/codemap_tests/two_files.stderr index e247e86fbcb22..2c52634326cb3 100644 --- a/src/test/ui/codemap_tests/two_files.stderr +++ b/src/test/ui/codemap_tests/two_files.stderr @@ -1,5 +1,5 @@ error[E0404]: expected trait, found type alias `Bar` - --> $DIR/two_files.rs:15:6 + --> $DIR/two_files.rs:5:6 | LL | impl Bar for Baz { } //~ ERROR expected trait, found type alias | ^^^ type aliases cannot be used for traits diff --git a/src/test/ui/codemap_tests/two_files_data.rs b/src/test/ui/codemap_tests/two_files_data.rs index a3dcea0546d38..db8ab14e67371 100644 --- a/src/test/ui/codemap_tests/two_files_data.rs +++ b/src/test/ui/codemap_tests/two_files_data.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-test trait Foo { } diff --git a/src/test/ui/codemap_tests/unicode.rs b/src/test/ui/codemap_tests/unicode.rs index ac22906a62330..7180e903b5c3c 100644 --- a/src/test/ui/codemap_tests/unicode.rs +++ b/src/test/ui/codemap_tests/unicode.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern "路濫狼á́́" fn foo() {} //~ ERROR invalid ABI fn main() { } diff --git a/src/test/ui/codemap_tests/unicode.stderr b/src/test/ui/codemap_tests/unicode.stderr index ee11a6662c2c7..1ba6ac447889b 100644 --- a/src/test/ui/codemap_tests/unicode.stderr +++ b/src/test/ui/codemap_tests/unicode.stderr @@ -1,5 +1,5 @@ error[E0703]: invalid ABI: found `路濫狼á́́` - --> $DIR/unicode.rs:11:8 + --> $DIR/unicode.rs:1:8 | LL | extern "路濫狼á́́" fn foo() {} //~ ERROR invalid ABI | ^^^^^^^^^ invalid ABI diff --git a/src/test/ui/codemap_tests/unicode_2.rs b/src/test/ui/codemap_tests/unicode_2.rs index c01b0b286afca..fa69115b2daaf 100644 --- a/src/test/ui/codemap_tests/unicode_2.rs +++ b/src/test/ui/codemap_tests/unicode_2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(non_ascii_idents)] fn main() { diff --git a/src/test/ui/codemap_tests/unicode_2.stderr b/src/test/ui/codemap_tests/unicode_2.stderr index b7f7f7fc5ce9f..1bc7452b9f2db 100644 --- a/src/test/ui/codemap_tests/unicode_2.stderr +++ b/src/test/ui/codemap_tests/unicode_2.stderr @@ -1,5 +1,5 @@ error: invalid width `7` for integer literal - --> $DIR/unicode_2.rs:14:25 + --> $DIR/unicode_2.rs:4:25 | LL | let _ = ("a̐éö̲", 0u7); //~ ERROR invalid width | ^^^ @@ -7,7 +7,7 @@ LL | let _ = ("a̐éö̲", 0u7); //~ ERROR invalid width = help: valid widths are 8, 16, 32, 64 and 128 error: invalid width `42` for integer literal - --> $DIR/unicode_2.rs:15:20 + --> $DIR/unicode_2.rs:5:20 | LL | let _ = ("아あ", 1i42); //~ ERROR invalid width | ^^^^ @@ -15,7 +15,7 @@ LL | let _ = ("아あ", 1i42); //~ ERROR invalid width = help: valid widths are 8, 16, 32, 64 and 128 error[E0425]: cannot find value `a̐é` in this scope - --> $DIR/unicode_2.rs:16:13 + --> $DIR/unicode_2.rs:6:13 | LL | let _ = a̐é; //~ ERROR cannot find | ^^ not found in this scope diff --git a/src/test/ui/codemap_tests/unicode_3.rs b/src/test/ui/codemap_tests/unicode_3.rs index 5e6dde7413bd7..ff6d54468b8ec 100644 --- a/src/test/ui/codemap_tests/unicode_3.rs +++ b/src/test/ui/codemap_tests/unicode_3.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass fn main() { diff --git a/src/test/ui/codemap_tests/unicode_3.stderr b/src/test/ui/codemap_tests/unicode_3.stderr index 1a44d39aa27a2..56f4f73131f57 100644 --- a/src/test/ui/codemap_tests/unicode_3.stderr +++ b/src/test/ui/codemap_tests/unicode_3.stderr @@ -1,5 +1,5 @@ warning: denote infinite loops with `loop { ... }` - --> $DIR/unicode_3.rs:14:45 + --> $DIR/unicode_3.rs:4:45 | LL | let s = "ZͨA͑ͦ͒͋ͤ͑̚L̄͑͋Ĝͨͥ̿͒̽̈́Oͥ͛ͭ!̏"; while true { break; } | ^^^^^^^^^^ help: use `loop` diff --git a/src/test/ui/coercion/coerce-expect-unsized-ascribed.rs b/src/test/ui/coercion/coerce-expect-unsized-ascribed.rs index ef65927fc5d41..9a4e134cb39a4 100644 --- a/src/test/ui/coercion/coerce-expect-unsized-ascribed.rs +++ b/src/test/ui/coercion/coerce-expect-unsized-ascribed.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // A version of coerce-expect-unsized that uses type ascription. // Doesn't work so far, but supposed to work eventually diff --git a/src/test/ui/coercion/coerce-expect-unsized-ascribed.stderr b/src/test/ui/coercion/coerce-expect-unsized-ascribed.stderr index 894fbbf202a9a..5ad3889666b79 100644 --- a/src/test/ui/coercion/coerce-expect-unsized-ascribed.stderr +++ b/src/test/ui/coercion/coerce-expect-unsized-ascribed.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/coerce-expect-unsized-ascribed.rs:19:13 + --> $DIR/coerce-expect-unsized-ascribed.rs:9:13 | LL | let _ = box { [1, 2, 3] }: Box<[i32]>; //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^ expected slice, found array of 3 elements @@ -8,7 +8,7 @@ LL | let _ = box { [1, 2, 3] }: Box<[i32]>; //~ ERROR mismatched types found type `std::boxed::Box<[i32; 3]>` error[E0308]: mismatched types - --> $DIR/coerce-expect-unsized-ascribed.rs:20:13 + --> $DIR/coerce-expect-unsized-ascribed.rs:10:13 | LL | let _ = box if true { [1, 2, 3] } else { [1, 3, 4] }: Box<[i32]>; //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected slice, found array of 3 elements @@ -17,7 +17,7 @@ LL | let _ = box if true { [1, 2, 3] } else { [1, 3, 4] }: Box<[i32]>; //~ E found type `std::boxed::Box<[i32; 3]>` error[E0308]: mismatched types - --> $DIR/coerce-expect-unsized-ascribed.rs:21:13 + --> $DIR/coerce-expect-unsized-ascribed.rs:11:13 | LL | let _ = box match true { true => [1, 2, 3], false => [1, 3, 4] }: Box<[i32]>; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected slice, found array of 3 elements @@ -26,16 +26,16 @@ LL | let _ = box match true { true => [1, 2, 3], false => [1, 3, 4] }: Box<[ found type `std::boxed::Box<[i32; 3]>` error[E0308]: mismatched types - --> $DIR/coerce-expect-unsized-ascribed.rs:23:13 + --> $DIR/coerce-expect-unsized-ascribed.rs:13:13 | LL | let _ = box { |x| (x as u8) }: Box _>; //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^^^^^ expected trait std::ops::Fn, found closure | = note: expected type `std::boxed::Box u8>` - found type `std::boxed::Box<[closure@$DIR/coerce-expect-unsized-ascribed.rs:23:19: 23:32]>` + found type `std::boxed::Box<[closure@$DIR/coerce-expect-unsized-ascribed.rs:13:19: 13:32]>` error[E0308]: mismatched types - --> $DIR/coerce-expect-unsized-ascribed.rs:24:13 + --> $DIR/coerce-expect-unsized-ascribed.rs:14:13 | LL | let _ = box if true { false } else { true }: Box; //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected trait std::fmt::Debug, found bool @@ -44,7 +44,7 @@ LL | let _ = box if true { false } else { true }: Box; //~ ERROR mism found type `std::boxed::Box` error[E0308]: mismatched types - --> $DIR/coerce-expect-unsized-ascribed.rs:25:13 + --> $DIR/coerce-expect-unsized-ascribed.rs:15:13 | LL | let _ = box match true { true => 'a', false => 'b' }: Box; //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected trait std::fmt::Debug, found char @@ -53,7 +53,7 @@ LL | let _ = box match true { true => 'a', false => 'b' }: Box; //~ E found type `std::boxed::Box` error[E0308]: mismatched types - --> $DIR/coerce-expect-unsized-ascribed.rs:27:13 + --> $DIR/coerce-expect-unsized-ascribed.rs:17:13 | LL | let _ = &{ [1, 2, 3] }: &[i32]; //~ ERROR mismatched types | ^^^^^^^^^^^^^^ expected slice, found array of 3 elements @@ -62,7 +62,7 @@ LL | let _ = &{ [1, 2, 3] }: &[i32]; //~ ERROR mismatched types found type `&[i32; 3]` error[E0308]: mismatched types - --> $DIR/coerce-expect-unsized-ascribed.rs:28:13 + --> $DIR/coerce-expect-unsized-ascribed.rs:18:13 | LL | let _ = &if true { [1, 2, 3] } else { [1, 3, 4] }: &[i32]; //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected slice, found array of 3 elements @@ -71,7 +71,7 @@ LL | let _ = &if true { [1, 2, 3] } else { [1, 3, 4] }: &[i32]; //~ ERROR mi found type `&[i32; 3]` error[E0308]: mismatched types - --> $DIR/coerce-expect-unsized-ascribed.rs:29:13 + --> $DIR/coerce-expect-unsized-ascribed.rs:19:13 | LL | let _ = &match true { true => [1, 2, 3], false => [1, 3, 4] }: &[i32]; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected slice, found array of 3 elements @@ -80,16 +80,16 @@ LL | let _ = &match true { true => [1, 2, 3], false => [1, 3, 4] }: &[i32]; found type `&[i32; 3]` error[E0308]: mismatched types - --> $DIR/coerce-expect-unsized-ascribed.rs:31:13 + --> $DIR/coerce-expect-unsized-ascribed.rs:21:13 | LL | let _ = &{ |x| (x as u8) }: &Fn(i32) -> _; //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^^ expected trait std::ops::Fn, found closure | = note: expected type `&dyn std::ops::Fn(i32) -> u8` - found type `&[closure@$DIR/coerce-expect-unsized-ascribed.rs:31:16: 31:29]` + found type `&[closure@$DIR/coerce-expect-unsized-ascribed.rs:21:16: 21:29]` error[E0308]: mismatched types - --> $DIR/coerce-expect-unsized-ascribed.rs:32:13 + --> $DIR/coerce-expect-unsized-ascribed.rs:22:13 | LL | let _ = &if true { false } else { true }: &Debug; //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected trait std::fmt::Debug, found bool @@ -98,7 +98,7 @@ LL | let _ = &if true { false } else { true }: &Debug; //~ ERROR mismatched found type `&bool` error[E0308]: mismatched types - --> $DIR/coerce-expect-unsized-ascribed.rs:33:13 + --> $DIR/coerce-expect-unsized-ascribed.rs:23:13 | LL | let _ = &match true { true => 'a', false => 'b' }: &Debug; //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected trait std::fmt::Debug, found char @@ -107,7 +107,7 @@ LL | let _ = &match true { true => 'a', false => 'b' }: &Debug; //~ ERROR mi found type `&char` error[E0308]: mismatched types - --> $DIR/coerce-expect-unsized-ascribed.rs:35:13 + --> $DIR/coerce-expect-unsized-ascribed.rs:25:13 | LL | let _ = Box::new([1, 2, 3]): Box<[i32]>; //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^^^ expected slice, found array of 3 elements @@ -116,13 +116,13 @@ LL | let _ = Box::new([1, 2, 3]): Box<[i32]>; //~ ERROR mismatched types found type `std::boxed::Box<[i32; 3]>` error[E0308]: mismatched types - --> $DIR/coerce-expect-unsized-ascribed.rs:36:13 + --> $DIR/coerce-expect-unsized-ascribed.rs:26:13 | LL | let _ = Box::new(|x| (x as u8)): Box _>; //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^^^^^^^ expected trait std::ops::Fn, found closure | = note: expected type `std::boxed::Box _>` - found type `std::boxed::Box<[closure@$DIR/coerce-expect-unsized-ascribed.rs:36:22: 36:35]>` + found type `std::boxed::Box<[closure@$DIR/coerce-expect-unsized-ascribed.rs:26:22: 26:35]>` error: aborting due to 14 previous errors diff --git a/src/test/ui/coercion/coerce-mut.rs b/src/test/ui/coercion/coerce-mut.rs index bc3d58ef33db0..409fb8e86beb9 100644 --- a/src/test/ui/coercion/coerce-mut.rs +++ b/src/test/ui/coercion/coerce-mut.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn f(x: &mut i32) {} fn main() { diff --git a/src/test/ui/coercion/coerce-mut.stderr b/src/test/ui/coercion/coerce-mut.stderr index 5e460b199a150..f8e3d6e60d650 100644 --- a/src/test/ui/coercion/coerce-mut.stderr +++ b/src/test/ui/coercion/coerce-mut.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/coerce-mut.rs:15:7 + --> $DIR/coerce-mut.rs:5:7 | LL | f(&x); | ^^ types differ in mutability diff --git a/src/test/ui/coercion/coerce-overloaded-autoderef.ast.nll.stderr b/src/test/ui/coercion/coerce-overloaded-autoderef.ast.nll.stderr index 29b6f0575627c..d7fb121c15eb9 100644 --- a/src/test/ui/coercion/coerce-overloaded-autoderef.ast.nll.stderr +++ b/src/test/ui/coercion/coerce-overloaded-autoderef.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `*x` as mutable more than once at a time - --> $DIR/coerce-overloaded-autoderef.rs:22:24 + --> $DIR/coerce-overloaded-autoderef.rs:12:24 | LL | let y = borrow_mut(x); | - first mutable borrow occurs here @@ -10,7 +10,7 @@ LL | drop((y, z)); | - borrow later used here error[E0506]: cannot assign to `**x` because it is borrowed - --> $DIR/coerce-overloaded-autoderef.rs:31:5 + --> $DIR/coerce-overloaded-autoderef.rs:21:5 | LL | let y = borrow(x); | - borrow of `**x` occurs here @@ -22,7 +22,7 @@ LL | drop((y, z)); | - borrow later used here error[E0499]: cannot borrow `*x` as mutable more than once at a time - --> $DIR/coerce-overloaded-autoderef.rs:38:20 + --> $DIR/coerce-overloaded-autoderef.rs:28:20 | LL | borrow_mut2(x, x); | ---------------^- @@ -32,7 +32,7 @@ LL | borrow_mut2(x, x); | borrow later used here error[E0502]: cannot borrow `*x` as mutable because it is also borrowed as immutable - --> $DIR/coerce-overloaded-autoderef.rs:44:5 + --> $DIR/coerce-overloaded-autoderef.rs:34:5 | LL | borrow2(x, x); | ^^^^^^^^^^^-^ diff --git a/src/test/ui/coercion/coerce-overloaded-autoderef.ast.stderr b/src/test/ui/coercion/coerce-overloaded-autoderef.ast.stderr index 3bb5ec7200243..54215f56bca7a 100644 --- a/src/test/ui/coercion/coerce-overloaded-autoderef.ast.stderr +++ b/src/test/ui/coercion/coerce-overloaded-autoderef.ast.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `*x` as mutable more than once at a time - --> $DIR/coerce-overloaded-autoderef.rs:22:24 + --> $DIR/coerce-overloaded-autoderef.rs:12:24 | LL | let y = borrow_mut(x); | - first mutable borrow occurs here @@ -10,7 +10,7 @@ LL | } | - first borrow ends here error[E0506]: cannot assign to `**x` because it is borrowed - --> $DIR/coerce-overloaded-autoderef.rs:31:5 + --> $DIR/coerce-overloaded-autoderef.rs:21:5 | LL | let y = borrow(x); | - borrow of `**x` occurs here @@ -19,7 +19,7 @@ LL | **x += 1; | ^^^^^^^^ assignment to borrowed `**x` occurs here error[E0499]: cannot borrow `*x` as mutable more than once at a time - --> $DIR/coerce-overloaded-autoderef.rs:38:20 + --> $DIR/coerce-overloaded-autoderef.rs:28:20 | LL | borrow_mut2(x, x); | - ^- first borrow ends here @@ -28,7 +28,7 @@ LL | borrow_mut2(x, x); | first mutable borrow occurs here error[E0502]: cannot borrow `*x` as immutable because it is also borrowed as mutable - --> $DIR/coerce-overloaded-autoderef.rs:44:16 + --> $DIR/coerce-overloaded-autoderef.rs:34:16 | LL | borrow2(x, x); | - ^- mutable borrow ends here diff --git a/src/test/ui/coercion/coerce-overloaded-autoderef.mir.nll.stderr b/src/test/ui/coercion/coerce-overloaded-autoderef.mir.nll.stderr index 29b6f0575627c..d7fb121c15eb9 100644 --- a/src/test/ui/coercion/coerce-overloaded-autoderef.mir.nll.stderr +++ b/src/test/ui/coercion/coerce-overloaded-autoderef.mir.nll.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `*x` as mutable more than once at a time - --> $DIR/coerce-overloaded-autoderef.rs:22:24 + --> $DIR/coerce-overloaded-autoderef.rs:12:24 | LL | let y = borrow_mut(x); | - first mutable borrow occurs here @@ -10,7 +10,7 @@ LL | drop((y, z)); | - borrow later used here error[E0506]: cannot assign to `**x` because it is borrowed - --> $DIR/coerce-overloaded-autoderef.rs:31:5 + --> $DIR/coerce-overloaded-autoderef.rs:21:5 | LL | let y = borrow(x); | - borrow of `**x` occurs here @@ -22,7 +22,7 @@ LL | drop((y, z)); | - borrow later used here error[E0499]: cannot borrow `*x` as mutable more than once at a time - --> $DIR/coerce-overloaded-autoderef.rs:38:20 + --> $DIR/coerce-overloaded-autoderef.rs:28:20 | LL | borrow_mut2(x, x); | ---------------^- @@ -32,7 +32,7 @@ LL | borrow_mut2(x, x); | borrow later used here error[E0502]: cannot borrow `*x` as mutable because it is also borrowed as immutable - --> $DIR/coerce-overloaded-autoderef.rs:44:5 + --> $DIR/coerce-overloaded-autoderef.rs:34:5 | LL | borrow2(x, x); | ^^^^^^^^^^^-^ diff --git a/src/test/ui/coercion/coerce-overloaded-autoderef.mir.stderr b/src/test/ui/coercion/coerce-overloaded-autoderef.mir.stderr index fbc49a7e91f88..14af0f2444f48 100644 --- a/src/test/ui/coercion/coerce-overloaded-autoderef.mir.stderr +++ b/src/test/ui/coercion/coerce-overloaded-autoderef.mir.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `*x` as mutable more than once at a time - --> $DIR/coerce-overloaded-autoderef.rs:22:24 + --> $DIR/coerce-overloaded-autoderef.rs:12:24 | LL | let y = borrow_mut(x); | - first mutable borrow occurs here @@ -10,7 +10,7 @@ LL | drop((y, z)); | - borrow later used here error[E0506]: cannot assign to `**x` because it is borrowed - --> $DIR/coerce-overloaded-autoderef.rs:31:5 + --> $DIR/coerce-overloaded-autoderef.rs:21:5 | LL | let y = borrow(x); | - borrow of `**x` occurs here @@ -22,7 +22,7 @@ LL | drop((y, z)); | - borrow later used here error[E0499]: cannot borrow `*x` as mutable more than once at a time - --> $DIR/coerce-overloaded-autoderef.rs:38:20 + --> $DIR/coerce-overloaded-autoderef.rs:28:20 | LL | borrow_mut2(x, x); | ---------------^- @@ -32,7 +32,7 @@ LL | borrow_mut2(x, x); | borrow later used here error[E0502]: cannot borrow `*x` as immutable because it is also borrowed as mutable - --> $DIR/coerce-overloaded-autoderef.rs:44:16 + --> $DIR/coerce-overloaded-autoderef.rs:34:16 | LL | borrow2(x, x); | -----------^- diff --git a/src/test/ui/coercion/coerce-overloaded-autoderef.rs b/src/test/ui/coercion/coerce-overloaded-autoderef.rs index 5a05f59c6f402..ec72745cd71ed 100644 --- a/src/test/ui/coercion/coerce-overloaded-autoderef.rs +++ b/src/test/ui/coercion/coerce-overloaded-autoderef.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/coercion/coerce-to-bang-cast.rs b/src/test/ui/coercion/coerce-to-bang-cast.rs index 14a06b306d82a..8ef1948084654 100644 --- a/src/test/ui/coercion/coerce-to-bang-cast.rs +++ b/src/test/ui/coercion/coerce-to-bang-cast.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(never_type)] fn foo(x: usize, y: !, z: usize) { } diff --git a/src/test/ui/coercion/coerce-to-bang-cast.stderr b/src/test/ui/coercion/coerce-to-bang-cast.stderr index fde9414451233..2982801f4613c 100644 --- a/src/test/ui/coercion/coerce-to-bang-cast.stderr +++ b/src/test/ui/coercion/coerce-to-bang-cast.stderr @@ -1,5 +1,5 @@ error[E0605]: non-primitive cast: `i32` as `!` - --> $DIR/coerce-to-bang-cast.rs:16:13 + --> $DIR/coerce-to-bang-cast.rs:6:13 | LL | let y = {return; 22} as !; | ^^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | let y = {return; 22} as !; = note: an `as` expression can only be used to convert between primitive types. Consider using the `From` trait error[E0605]: non-primitive cast: `i32` as `!` - --> $DIR/coerce-to-bang-cast.rs:21:13 + --> $DIR/coerce-to-bang-cast.rs:11:13 | LL | let y = 22 as !; //~ ERROR non-primitive cast | ^^^^^^^ diff --git a/src/test/ui/coercion/coerce-to-bang.rs b/src/test/ui/coercion/coerce-to-bang.rs index 8b4e2c3c051e8..1e06934d09f9e 100644 --- a/src/test/ui/coercion/coerce-to-bang.rs +++ b/src/test/ui/coercion/coerce-to-bang.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(never_type)] fn foo(x: usize, y: !, z: usize) { } diff --git a/src/test/ui/coercion/coerce-to-bang.stderr b/src/test/ui/coercion/coerce-to-bang.stderr index bf490cd20aa65..0795765ef2d8e 100644 --- a/src/test/ui/coercion/coerce-to-bang.stderr +++ b/src/test/ui/coercion/coerce-to-bang.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/coerce-to-bang.rs:16:17 + --> $DIR/coerce-to-bang.rs:6:17 | LL | foo(return, 22, 44); | ^^ expected !, found integral variable @@ -8,7 +8,7 @@ LL | foo(return, 22, 44); found type `{integer}` error[E0308]: mismatched types - --> $DIR/coerce-to-bang.rs:28:13 + --> $DIR/coerce-to-bang.rs:18:13 | LL | foo(22, 44, return); //~ ERROR mismatched types | ^^ expected !, found integral variable @@ -17,7 +17,7 @@ LL | foo(22, 44, return); //~ ERROR mismatched types found type `{integer}` error[E0308]: mismatched types - --> $DIR/coerce-to-bang.rs:36:12 + --> $DIR/coerce-to-bang.rs:26:12 | LL | foo(a, b, c); // ... and hence a reference to `a` is expected to diverge. | ^ expected !, found integral variable @@ -26,7 +26,7 @@ LL | foo(a, b, c); // ... and hence a reference to `a` is expected to diverg found type `{integer}` error[E0308]: mismatched types - --> $DIR/coerce-to-bang.rs:46:12 + --> $DIR/coerce-to-bang.rs:36:12 | LL | foo(a, b, c); //~ ERROR mismatched types | ^ expected !, found integral variable @@ -35,7 +35,7 @@ LL | foo(a, b, c); //~ ERROR mismatched types found type `{integer}` error[E0308]: mismatched types - --> $DIR/coerce-to-bang.rs:55:12 + --> $DIR/coerce-to-bang.rs:45:12 | LL | foo(a, b, c); //~ ERROR mismatched types | ^ expected !, found integral variable @@ -44,7 +44,7 @@ LL | foo(a, b, c); //~ ERROR mismatched types found type `{integer}` error[E0308]: mismatched types - --> $DIR/coerce-to-bang.rs:60:21 + --> $DIR/coerce-to-bang.rs:50:21 | LL | let x: [!; 2] = [return, 22]; //~ ERROR mismatched types | ^^^^^^^^^^^^ expected !, found integral variable @@ -53,7 +53,7 @@ LL | let x: [!; 2] = [return, 22]; //~ ERROR mismatched types found type `[{integer}; 2]` error[E0308]: mismatched types - --> $DIR/coerce-to-bang.rs:65:22 + --> $DIR/coerce-to-bang.rs:55:22 | LL | let x: [!; 2] = [22, return]; //~ ERROR mismatched types | ^^ expected !, found integral variable @@ -62,7 +62,7 @@ LL | let x: [!; 2] = [22, return]; //~ ERROR mismatched types found type `{integer}` error[E0308]: mismatched types - --> $DIR/coerce-to-bang.rs:70:37 + --> $DIR/coerce-to-bang.rs:60:37 | LL | let x: (usize, !, usize) = (22, 44, 66); //~ ERROR mismatched types | ^^ expected !, found integral variable @@ -71,7 +71,7 @@ LL | let x: (usize, !, usize) = (22, 44, 66); //~ ERROR mismatched types found type `{integer}` error[E0308]: mismatched types - --> $DIR/coerce-to-bang.rs:75:41 + --> $DIR/coerce-to-bang.rs:65:41 | LL | let x: (usize, !, usize) = (return, 44, 66); | ^^ expected !, found integral variable @@ -80,7 +80,7 @@ LL | let x: (usize, !, usize) = (return, 44, 66); found type `{integer}` error[E0308]: mismatched types - --> $DIR/coerce-to-bang.rs:86:37 + --> $DIR/coerce-to-bang.rs:76:37 | LL | let x: (usize, !, usize) = (22, 44, return); //~ ERROR mismatched types | ^^ expected !, found integral variable diff --git a/src/test/ui/coercion/coercion-missing-tail-expected-type.rs b/src/test/ui/coercion/coercion-missing-tail-expected-type.rs index b235a0f21360c..20a4407e9a1c0 100644 --- a/src/test/ui/coercion/coercion-missing-tail-expected-type.rs +++ b/src/test/ui/coercion/coercion-missing-tail-expected-type.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // #41425 -- error message "mismatched types" has wrong types fn plus_one(x: i32) -> i32 { //~ ERROR mismatched types diff --git a/src/test/ui/coercion/coercion-missing-tail-expected-type.stderr b/src/test/ui/coercion/coercion-missing-tail-expected-type.stderr index 84b6c961a2531..18adf9a46cc84 100644 --- a/src/test/ui/coercion/coercion-missing-tail-expected-type.stderr +++ b/src/test/ui/coercion/coercion-missing-tail-expected-type.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/coercion-missing-tail-expected-type.rs:13:28 + --> $DIR/coercion-missing-tail-expected-type.rs:3:28 | LL | fn plus_one(x: i32) -> i32 { //~ ERROR mismatched types | ____________________________^ @@ -12,7 +12,7 @@ LL | | } found type `()` error[E0308]: mismatched types - --> $DIR/coercion-missing-tail-expected-type.rs:17:29 + --> $DIR/coercion-missing-tail-expected-type.rs:7:29 | LL | fn foo() -> Result { //~ ERROR mismatched types | _____________________________^ diff --git a/src/test/ui/coercion/coercion-slice.rs b/src/test/ui/coercion/coercion-slice.rs index 7c5a4e0c3c6f6..312b634c9fd0b 100644 --- a/src/test/ui/coercion/coercion-slice.rs +++ b/src/test/ui/coercion/coercion-slice.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that we forbid coercion from `[T; n]` to `&[T]` fn main() { diff --git a/src/test/ui/coercion/coercion-slice.stderr b/src/test/ui/coercion/coercion-slice.stderr index 47a77d4277370..6fa712371178b 100644 --- a/src/test/ui/coercion/coercion-slice.stderr +++ b/src/test/ui/coercion/coercion-slice.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/coercion-slice.rs:14:21 + --> $DIR/coercion-slice.rs:4:21 | LL | let _: &[i32] = [0]; | ^^^ diff --git a/src/test/ui/coherence/auxiliary/coherence_copy_like_lib.rs b/src/test/ui/coherence/auxiliary/coherence_copy_like_lib.rs index d3d389c6a8bd5..b5b4802c112de 100644 --- a/src/test/ui/coherence/auxiliary/coherence_copy_like_lib.rs +++ b/src/test/ui/coherence/auxiliary/coherence_copy_like_lib.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] #![feature(fundamental)] diff --git a/src/test/ui/coherence/auxiliary/coherence_inherent_cc_lib.rs b/src/test/ui/coherence/auxiliary/coherence_inherent_cc_lib.rs index 0458636a401ef..08d22fbedf5cc 100644 --- a/src/test/ui/coherence/auxiliary/coherence_inherent_cc_lib.rs +++ b/src/test/ui/coherence/auxiliary/coherence_inherent_cc_lib.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // See coherence_inherent_cc.rs pub trait TheTrait { diff --git a/src/test/ui/coherence/auxiliary/coherence_lib.rs b/src/test/ui/coherence/auxiliary/coherence_lib.rs index daa123849e4e7..9a5ec82430639 100644 --- a/src/test/ui/coherence/auxiliary/coherence_lib.rs +++ b/src/test/ui/coherence/auxiliary/coherence_lib.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="lib"] pub trait Remote { diff --git a/src/test/ui/coherence/auxiliary/coherence_orphan_lib.rs b/src/test/ui/coherence/auxiliary/coherence_orphan_lib.rs index b22d12300c7d1..2664ef5506957 100644 --- a/src/test/ui/coherence/auxiliary/coherence_orphan_lib.rs +++ b/src/test/ui/coherence/auxiliary/coherence_orphan_lib.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait TheTrait { fn the_fn(&self); } diff --git a/src/test/ui/coherence/auxiliary/go_trait.rs b/src/test/ui/coherence/auxiliary/go_trait.rs index 044bb606b40e2..aa0ec22896d73 100644 --- a/src/test/ui/coherence/auxiliary/go_trait.rs +++ b/src/test/ui/coherence/auxiliary/go_trait.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(specialization)] // Common code used for tests that model the Fn/FnMut/FnOnce hierarchy. diff --git a/src/test/ui/coherence/auxiliary/trait_impl_conflict.rs b/src/test/ui/coherence/auxiliary/trait_impl_conflict.rs index 3190ce430ad67..5e5f017ed451f 100644 --- a/src/test/ui/coherence/auxiliary/trait_impl_conflict.rs +++ b/src/test/ui/coherence/auxiliary/trait_impl_conflict.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Foo { fn foo() {} } diff --git a/src/test/ui/coherence/coherence-all-remote.rs b/src/test/ui/coherence/coherence-all-remote.rs index 7a5340041c21b..5c3bfee822f1c 100644 --- a/src/test/ui/coherence/coherence-all-remote.rs +++ b/src/test/ui/coherence/coherence-all-remote.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:coherence_lib.rs extern crate coherence_lib as lib; diff --git a/src/test/ui/coherence/coherence-all-remote.stderr b/src/test/ui/coherence/coherence-all-remote.stderr index 1f71969989bda..3ee8a658eea39 100644 --- a/src/test/ui/coherence/coherence-all-remote.stderr +++ b/src/test/ui/coherence/coherence-all-remote.stderr @@ -1,5 +1,5 @@ error[E0210]: type parameter `T` must be used as the type parameter for some local type (e.g. `MyStruct`) - --> $DIR/coherence-all-remote.rs:16:1 + --> $DIR/coherence-all-remote.rs:6:1 | LL | impl Remote1 for isize { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type parameter `T` must be used as the type parameter for some local type diff --git a/src/test/ui/coherence/coherence-bigint-param.rs b/src/test/ui/coherence/coherence-bigint-param.rs index 32c5b6693814e..d199c1c216946 100644 --- a/src/test/ui/coherence/coherence-bigint-param.rs +++ b/src/test/ui/coherence/coherence-bigint-param.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:coherence_lib.rs extern crate coherence_lib as lib; diff --git a/src/test/ui/coherence/coherence-bigint-param.stderr b/src/test/ui/coherence/coherence-bigint-param.stderr index 7d2796ee6905c..dcd66bd1dd54c 100644 --- a/src/test/ui/coherence/coherence-bigint-param.stderr +++ b/src/test/ui/coherence/coherence-bigint-param.stderr @@ -1,5 +1,5 @@ error[E0210]: type parameter `T` must be used as the type parameter for some local type (e.g. `MyStruct`) - --> $DIR/coherence-bigint-param.rs:18:1 + --> $DIR/coherence-bigint-param.rs:8:1 | LL | impl Remote1 for T { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type parameter `T` must be used as the type parameter for some local type diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.rs b/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.rs index 434d77828b44a..46d878859e0e6 100644 --- a/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.rs +++ b/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt::Debug; use std::default::Default; diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.stderr b/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.stderr index 7dbcda06511b8..9dd08b9e5583a 100644 --- a/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.stderr +++ b/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `MyTrait`: - --> $DIR/coherence-blanket-conflicts-with-blanket-implemented.rs:34:1 + --> $DIR/coherence-blanket-conflicts-with-blanket-implemented.rs:24:1 | LL | impl MyTrait for T { | -------------------------- first implementation here diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-unimplemented.rs b/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-unimplemented.rs index 7ad5cd71ca8c2..0044760161e5c 100644 --- a/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-unimplemented.rs +++ b/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-unimplemented.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt::Debug; use std::default::Default; diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-unimplemented.stderr b/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-unimplemented.stderr index faabfb6c7c0c4..1719bc60a04de 100644 --- a/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-unimplemented.stderr +++ b/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-unimplemented.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `MyTrait`: - --> $DIR/coherence-blanket-conflicts-with-blanket-unimplemented.rs:30:1 + --> $DIR/coherence-blanket-conflicts-with-blanket-unimplemented.rs:20:1 | LL | impl MyTrait for T { | -------------------------- first implementation here diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-cross-crate.rs b/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-cross-crate.rs index b3ef79c6cc01e..4c62741d2e4b4 100644 --- a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-cross-crate.rs +++ b/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-cross-crate.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:go_trait.rs extern crate go_trait; diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-cross-crate.stderr b/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-cross-crate.stderr index 38aff37bfcca4..5872f609e90c0 100644 --- a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-cross-crate.stderr +++ b/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-cross-crate.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `go_trait::GoMut` for type `MyThingy`: - --> $DIR/coherence-blanket-conflicts-with-specific-cross-crate.rs:25:1 + --> $DIR/coherence-blanket-conflicts-with-specific-cross-crate.rs:15:1 | LL | impl GoMut for MyThingy { //~ ERROR conflicting implementations | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.rs b/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.rs index 1defe6c8b20e3..42ce638f13705 100644 --- a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.rs +++ b/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt::Debug; use std::default::Default; diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.stderr b/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.stderr index a5992406262fc..9de354d8cf67f 100644 --- a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.stderr +++ b/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `MyTrait` for type `MyType`: - --> $DIR/coherence-blanket-conflicts-with-specific-multidispatch.rs:32:1 + --> $DIR/coherence-blanket-conflicts-with-specific-multidispatch.rs:22:1 | LL | impl MyTrait for T { | ------------------------ first implementation here diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-trait.rs b/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-trait.rs index 5c5c4d32d675c..78da8330ba3c5 100644 --- a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-trait.rs +++ b/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-trait.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that a blank impl for all T:PartialEq conflicts with an impl for some // specific T when T:PartialEq. diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-trait.stderr b/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-trait.stderr index 9a6e0071eb7b6..c3f06a952c4b7 100644 --- a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-trait.stderr +++ b/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-trait.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `MyTrait` for type `MyType`: - --> $DIR/coherence-blanket-conflicts-with-specific-trait.rs:30:1 + --> $DIR/coherence-blanket-conflicts-with-specific-trait.rs:20:1 | LL | impl MyTrait for T { | -------------------------------- first implementation here diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific.rs b/src/test/ui/coherence/coherence-blanket-conflicts-with-specific.rs index 57d71b44b0f6b..db5f83c865a6f 100644 --- a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific.rs +++ b/src/test/ui/coherence/coherence-blanket-conflicts-with-specific.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt::Debug; use std::default::Default; diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific.stderr b/src/test/ui/coherence/coherence-blanket-conflicts-with-specific.stderr index 955cd3b125faf..0b04c5fd0bddf 100644 --- a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific.stderr +++ b/src/test/ui/coherence/coherence-blanket-conflicts-with-specific.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `MyTrait` for type `MyType`: - --> $DIR/coherence-blanket-conflicts-with-specific.rs:29:1 + --> $DIR/coherence-blanket-conflicts-with-specific.rs:19:1 | LL | impl MyTrait for T { | --------------------- first implementation here diff --git a/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.rs b/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.rs index 8e9d1eff34580..2165fdee5e08c 100644 --- a/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.rs +++ b/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] #![feature(overlapping_marker_traits)] diff --git a/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.stderr b/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.stderr index a2a869daff063..0a8bbc4bc50a8 100644 --- a/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.stderr +++ b/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `std::marker::Send` for type `TestType<_>`: - --> $DIR/coherence-conflicting-negative-trait-impl.rs:20:1 + --> $DIR/coherence-conflicting-negative-trait-impl.rs:10:1 | LL | unsafe impl Send for TestType {} | ---------------------------------------------------- first implementation here @@ -8,7 +8,7 @@ LL | impl !Send for TestType {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `TestType<_>` error[E0119]: conflicting implementations of trait `std::marker::Send` for type `TestType`: - --> $DIR/coherence-conflicting-negative-trait-impl.rs:25:1 + --> $DIR/coherence-conflicting-negative-trait-impl.rs:15:1 | LL | unsafe impl Send for TestType {} | ------------------------------------------- first implementation here diff --git a/src/test/ui/coherence/coherence-cow.a.stderr b/src/test/ui/coherence/coherence-cow.a.stderr index f05333348ec3a..a0262eaf319da 100644 --- a/src/test/ui/coherence/coherence-cow.a.stderr +++ b/src/test/ui/coherence/coherence-cow.a.stderr @@ -1,5 +1,5 @@ error[E0210]: type parameter `T` must be used as the type parameter for some local type (e.g. `MyStruct`) - --> $DIR/coherence-cow.rs:26:1 + --> $DIR/coherence-cow.rs:16:1 | LL | impl Remote for Pair> { } //[a]~ ERROR E0210 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type parameter `T` must be used as the type parameter for some local type diff --git a/src/test/ui/coherence/coherence-cow.b.stderr b/src/test/ui/coherence/coherence-cow.b.stderr index 269bcd576af5a..be49a682e96a4 100644 --- a/src/test/ui/coherence/coherence-cow.b.stderr +++ b/src/test/ui/coherence/coherence-cow.b.stderr @@ -1,5 +1,5 @@ error[E0210]: type parameter `T` must be used as the type parameter for some local type (e.g. `MyStruct`) - --> $DIR/coherence-cow.rs:29:1 + --> $DIR/coherence-cow.rs:19:1 | LL | impl Remote for Pair,T> { } //[b]~ ERROR E0210 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type parameter `T` must be used as the type parameter for some local type diff --git a/src/test/ui/coherence/coherence-cow.c.stderr b/src/test/ui/coherence/coherence-cow.c.stderr index e89308db054ff..2609eb9072944 100644 --- a/src/test/ui/coherence/coherence-cow.c.stderr +++ b/src/test/ui/coherence/coherence-cow.c.stderr @@ -1,5 +1,5 @@ error[E0210]: type parameter `T` must be used as the type parameter for some local type (e.g. `MyStruct`) - --> $DIR/coherence-cow.rs:32:1 + --> $DIR/coherence-cow.rs:22:1 | LL | impl Remote for Pair,U> { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type parameter `T` must be used as the type parameter for some local type diff --git a/src/test/ui/coherence/coherence-cow.rs b/src/test/ui/coherence/coherence-cow.rs index 86ae5b44d9db0..d72adf7a5319f 100644 --- a/src/test/ui/coherence/coherence-cow.rs +++ b/src/test/ui/coherence/coherence-cow.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: a b c // aux-build:coherence_lib.rs diff --git a/src/test/ui/coherence/coherence-cross-crate-conflict.rs b/src/test/ui/coherence/coherence-cross-crate-conflict.rs index aac870293fd55..07dd585e8c48b 100644 --- a/src/test/ui/coherence/coherence-cross-crate-conflict.rs +++ b/src/test/ui/coherence/coherence-cross-crate-conflict.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // The error here is strictly due to orphan rules; the impl here // generalizes the one upstream diff --git a/src/test/ui/coherence/coherence-cross-crate-conflict.stderr b/src/test/ui/coherence/coherence-cross-crate-conflict.stderr index ee11967cc0d3a..8e19735737d49 100644 --- a/src/test/ui/coherence/coherence-cross-crate-conflict.stderr +++ b/src/test/ui/coherence/coherence-cross-crate-conflict.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `trait_impl_conflict::Foo` for type `isize`: - --> $DIR/coherence-cross-crate-conflict.rs:18:1 + --> $DIR/coherence-cross-crate-conflict.rs:8:1 | LL | impl Foo for A { | ^^^^^^^^^^^^^^^^^ @@ -8,7 +8,7 @@ LL | impl Foo for A { - impl trait_impl_conflict::Foo for isize; error[E0210]: type parameter `A` must be used as the type parameter for some local type (e.g. `MyStruct`) - --> $DIR/coherence-cross-crate-conflict.rs:18:1 + --> $DIR/coherence-cross-crate-conflict.rs:8:1 | LL | impl Foo for A { | ^^^^^^^^^^^^^^^^^ type parameter `A` must be used as the type parameter for some local type diff --git a/src/test/ui/coherence/coherence-default-trait-impl.rs b/src/test/ui/coherence/coherence-default-trait-impl.rs index 751d0a14c57ee..df267ca7bd93d 100644 --- a/src/test/ui/coherence/coherence-default-trait-impl.rs +++ b/src/test/ui/coherence/coherence-default-trait-impl.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] auto trait MySafeTrait {} diff --git a/src/test/ui/coherence/coherence-default-trait-impl.stderr b/src/test/ui/coherence/coherence-default-trait-impl.stderr index b7d9364f23771..6309d60dd9675 100644 --- a/src/test/ui/coherence/coherence-default-trait-impl.stderr +++ b/src/test/ui/coherence/coherence-default-trait-impl.stderr @@ -1,11 +1,11 @@ error[E0199]: implementing the trait `MySafeTrait` is not unsafe - --> $DIR/coherence-default-trait-impl.rs:17:1 + --> $DIR/coherence-default-trait-impl.rs:7:1 | LL | unsafe impl MySafeTrait for Foo {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0200]: the trait `MyUnsafeTrait` requires an `unsafe impl` declaration - --> $DIR/coherence-default-trait-impl.rs:22:1 + --> $DIR/coherence-default-trait-impl.rs:12:1 | LL | impl MyUnsafeTrait for Foo {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/coherence/coherence-error-suppression.rs b/src/test/ui/coherence/coherence-error-suppression.rs index 56d2455ca2126..f48652e3499a0 100644 --- a/src/test/ui/coherence/coherence-error-suppression.rs +++ b/src/test/ui/coherence/coherence-error-suppression.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // check that error types in coherence do not cause error cascades. trait Foo {} diff --git a/src/test/ui/coherence/coherence-error-suppression.stderr b/src/test/ui/coherence/coherence-error-suppression.stderr index 8cf3fe760f127..17a3c62772005 100644 --- a/src/test/ui/coherence/coherence-error-suppression.stderr +++ b/src/test/ui/coherence/coherence-error-suppression.stderr @@ -1,5 +1,5 @@ error[E0412]: cannot find type `DoesNotExist` in this scope - --> $DIR/coherence-error-suppression.rs:19:14 + --> $DIR/coherence-error-suppression.rs:9:14 | LL | impl Foo for DoesNotExist {} //~ ERROR cannot find type `DoesNotExist` in this scope | ^^^^^^^^^^^^ not found in this scope diff --git a/src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.rs b/src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.rs index 8bb9556fcc075..e5a7250872f4b 100644 --- a/src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.rs +++ b/src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we give suitable error messages when the user attempts to // impl a trait `Trait` for its own object type. diff --git a/src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.stderr b/src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.stderr index 5d62a86b96f07..a19b00194c341 100644 --- a/src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.stderr +++ b/src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.stderr @@ -1,5 +1,5 @@ error[E0038]: the trait `NotObjectSafe` cannot be made into an object - --> $DIR/coherence-impl-trait-for-trait-object-safe.rs:17:6 + --> $DIR/coherence-impl-trait-for-trait-object-safe.rs:7:6 | LL | impl NotObjectSafe for NotObjectSafe { } //~ ERROR E0038 | ^^^^^^^^^^^^^ the trait `NotObjectSafe` cannot be made into an object diff --git a/src/test/ui/coherence/coherence-impl-trait-for-trait.rs b/src/test/ui/coherence/coherence-impl-trait-for-trait.rs index cd75b0e34f24b..e4d59eedcabd0 100644 --- a/src/test/ui/coherence/coherence-impl-trait-for-trait.rs +++ b/src/test/ui/coherence/coherence-impl-trait-for-trait.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we give suitable error messages when the user attempts to // impl a trait `Trait` for its own object type. diff --git a/src/test/ui/coherence/coherence-impl-trait-for-trait.stderr b/src/test/ui/coherence/coherence-impl-trait-for-trait.stderr index 26e702d1fde04..05abef145b7e3 100644 --- a/src/test/ui/coherence/coherence-impl-trait-for-trait.stderr +++ b/src/test/ui/coherence/coherence-impl-trait-for-trait.stderr @@ -1,17 +1,17 @@ error[E0371]: the object type `(dyn Baz + 'static)` automatically implements the trait `Foo` - --> $DIR/coherence-impl-trait-for-trait.rs:19:1 + --> $DIR/coherence-impl-trait-for-trait.rs:9:1 | LL | impl Foo for Baz { } //~ ERROR E0371 | ^^^^^^^^^^^^^^^^ `(dyn Baz + 'static)` automatically implements trait `Foo` error[E0371]: the object type `(dyn Baz + 'static)` automatically implements the trait `Bar` - --> $DIR/coherence-impl-trait-for-trait.rs:20:1 + --> $DIR/coherence-impl-trait-for-trait.rs:10:1 | LL | impl Bar for Baz { } //~ ERROR E0371 | ^^^^^^^^^^^^^^^^ `(dyn Baz + 'static)` automatically implements trait `Bar` error[E0371]: the object type `(dyn Baz + 'static)` automatically implements the trait `Baz` - --> $DIR/coherence-impl-trait-for-trait.rs:21:1 + --> $DIR/coherence-impl-trait-for-trait.rs:11:1 | LL | impl Baz for Baz { } //~ ERROR E0371 | ^^^^^^^^^^^^^^^^ `(dyn Baz + 'static)` automatically implements trait `Baz` diff --git a/src/test/ui/coherence/coherence-impls-copy.rs b/src/test/ui/coherence/coherence-impls-copy.rs index f48790d1f4039..5bfdfc8f40aec 100644 --- a/src/test/ui/coherence/coherence-impls-copy.rs +++ b/src/test/ui/coherence/coherence-impls-copy.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] use std::marker::Copy; diff --git a/src/test/ui/coherence/coherence-impls-copy.stderr b/src/test/ui/coherence/coherence-impls-copy.stderr index 24e7e85b1a961..8a1662229ff1c 100644 --- a/src/test/ui/coherence/coherence-impls-copy.stderr +++ b/src/test/ui/coherence/coherence-impls-copy.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `std::marker::Copy` for type `i32`: - --> $DIR/coherence-impls-copy.rs:15:1 + --> $DIR/coherence-impls-copy.rs:5:1 | LL | impl Copy for i32 {} | ^^^^^^^^^^^^^^^^^ @@ -8,7 +8,7 @@ LL | impl Copy for i32 {} - impl std::marker::Copy for i32; error[E0119]: conflicting implementations of trait `std::marker::Copy` for type `&NotSync`: - --> $DIR/coherence-impls-copy.rs:41:1 + --> $DIR/coherence-impls-copy.rs:31:1 | LL | impl Copy for &'static NotSync {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -18,7 +18,7 @@ LL | impl Copy for &'static NotSync {} where T: ?Sized; error[E0119]: conflicting implementations of trait `std::marker::Copy` for type `&[NotSync]`: - --> $DIR/coherence-impls-copy.rs:48:1 + --> $DIR/coherence-impls-copy.rs:38:1 | LL | impl Copy for &'static [NotSync] {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -28,25 +28,25 @@ LL | impl Copy for &'static [NotSync] {} where T: ?Sized; error[E0206]: the trait `Copy` may not be implemented for this type - --> $DIR/coherence-impls-copy.rs:33:15 + --> $DIR/coherence-impls-copy.rs:23:15 | LL | impl Copy for &'static mut MyType {} | ^^^^^^^^^^^^^^^^^^^ type is not a structure or enumeration error[E0206]: the trait `Copy` may not be implemented for this type - --> $DIR/coherence-impls-copy.rs:37:15 + --> $DIR/coherence-impls-copy.rs:27:15 | LL | impl Copy for (MyType, MyType) {} | ^^^^^^^^^^^^^^^^ type is not a structure or enumeration error[E0206]: the trait `Copy` may not be implemented for this type - --> $DIR/coherence-impls-copy.rs:44:15 + --> $DIR/coherence-impls-copy.rs:34:15 | LL | impl Copy for [MyType] {} | ^^^^^^^^ type is not a structure or enumeration error[E0117]: only traits defined in the current crate can be implemented for arbitrary types - --> $DIR/coherence-impls-copy.rs:15:1 + --> $DIR/coherence-impls-copy.rs:5:1 | LL | impl Copy for i32 {} | ^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate @@ -55,7 +55,7 @@ LL | impl Copy for i32 {} = note: define and implement a trait or new type instead error[E0117]: only traits defined in the current crate can be implemented for arbitrary types - --> $DIR/coherence-impls-copy.rs:37:1 + --> $DIR/coherence-impls-copy.rs:27:1 | LL | impl Copy for (MyType, MyType) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate @@ -64,7 +64,7 @@ LL | impl Copy for (MyType, MyType) {} = note: define and implement a trait or new type instead error[E0117]: only traits defined in the current crate can be implemented for arbitrary types - --> $DIR/coherence-impls-copy.rs:44:1 + --> $DIR/coherence-impls-copy.rs:34:1 | LL | impl Copy for [MyType] {} | ^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate @@ -73,7 +73,7 @@ LL | impl Copy for [MyType] {} = note: define and implement a trait or new type instead error[E0117]: only traits defined in the current crate can be implemented for arbitrary types - --> $DIR/coherence-impls-copy.rs:48:1 + --> $DIR/coherence-impls-copy.rs:38:1 | LL | impl Copy for &'static [NotSync] {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate diff --git a/src/test/ui/coherence/coherence-impls-send.rs b/src/test/ui/coherence/coherence-impls-send.rs index 9caaee41aeb1d..b2a9c5be65843 100644 --- a/src/test/ui/coherence/coherence-impls-send.rs +++ b/src/test/ui/coherence/coherence-impls-send.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] #![feature(overlapping_marker_traits)] diff --git a/src/test/ui/coherence/coherence-impls-send.stderr b/src/test/ui/coherence/coherence-impls-send.stderr index 4e7e228b23f3d..02d90eea8fe6a 100644 --- a/src/test/ui/coherence/coherence-impls-send.stderr +++ b/src/test/ui/coherence/coherence-impls-send.stderr @@ -1,5 +1,5 @@ error[E0117]: only traits defined in the current crate can be implemented for arbitrary types - --> $DIR/coherence-impls-send.rs:27:1 + --> $DIR/coherence-impls-send.rs:17:1 | LL | unsafe impl Send for (MyType, MyType) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate @@ -8,13 +8,13 @@ LL | unsafe impl Send for (MyType, MyType) {} = note: define and implement a trait or new type instead error[E0321]: cross-crate traits with a default impl, like `std::marker::Send`, can only be implemented for a struct/enum type, not `&'static NotSync` - --> $DIR/coherence-impls-send.rs:30:1 + --> $DIR/coherence-impls-send.rs:20:1 | LL | unsafe impl Send for &'static NotSync {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't implement cross-crate trait with a default impl for non-struct/enum type error[E0117]: only traits defined in the current crate can be implemented for arbitrary types - --> $DIR/coherence-impls-send.rs:33:1 + --> $DIR/coherence-impls-send.rs:23:1 | LL | unsafe impl Send for [MyType] {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate @@ -23,7 +23,7 @@ LL | unsafe impl Send for [MyType] {} = note: define and implement a trait or new type instead error[E0117]: only traits defined in the current crate can be implemented for arbitrary types - --> $DIR/coherence-impls-send.rs:36:1 + --> $DIR/coherence-impls-send.rs:26:1 | LL | unsafe impl Send for &'static [NotSync] {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate diff --git a/src/test/ui/coherence/coherence-impls-sized.rs b/src/test/ui/coherence/coherence-impls-sized.rs index 60b5d14d1587a..7af1344f95d9e 100644 --- a/src/test/ui/coherence/coherence-impls-sized.rs +++ b/src/test/ui/coherence/coherence-impls-sized.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] use std::marker::Copy; diff --git a/src/test/ui/coherence/coherence-impls-sized.stderr b/src/test/ui/coherence/coherence-impls-sized.stderr index 683fb0aaa68a7..fbe08a59f5258 100644 --- a/src/test/ui/coherence/coherence-impls-sized.stderr +++ b/src/test/ui/coherence/coherence-impls-sized.stderr @@ -1,41 +1,41 @@ error[E0322]: explicit impls for the `Sized` trait are not permitted - --> $DIR/coherence-impls-sized.rs:24:1 + --> $DIR/coherence-impls-sized.rs:14:1 | LL | impl Sized for TestE {} //~ ERROR E0322 | ^^^^^^^^^^^^^^^^^^^^ impl of 'Sized' not allowed error[E0322]: explicit impls for the `Sized` trait are not permitted - --> $DIR/coherence-impls-sized.rs:27:1 + --> $DIR/coherence-impls-sized.rs:17:1 | LL | impl Sized for MyType {} //~ ERROR E0322 | ^^^^^^^^^^^^^^^^^^^^^ impl of 'Sized' not allowed error[E0322]: explicit impls for the `Sized` trait are not permitted - --> $DIR/coherence-impls-sized.rs:30:1 + --> $DIR/coherence-impls-sized.rs:20:1 | LL | impl Sized for (MyType, MyType) {} //~ ERROR E0322 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl of 'Sized' not allowed error[E0322]: explicit impls for the `Sized` trait are not permitted - --> $DIR/coherence-impls-sized.rs:34:1 + --> $DIR/coherence-impls-sized.rs:24:1 | LL | impl Sized for &'static NotSync {} //~ ERROR E0322 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl of 'Sized' not allowed error[E0322]: explicit impls for the `Sized` trait are not permitted - --> $DIR/coherence-impls-sized.rs:37:1 + --> $DIR/coherence-impls-sized.rs:27:1 | LL | impl Sized for [MyType] {} //~ ERROR E0322 | ^^^^^^^^^^^^^^^^^^^^^^^ impl of 'Sized' not allowed error[E0322]: explicit impls for the `Sized` trait are not permitted - --> $DIR/coherence-impls-sized.rs:41:1 + --> $DIR/coherence-impls-sized.rs:31:1 | LL | impl Sized for &'static [NotSync] {} //~ ERROR E0322 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl of 'Sized' not allowed error[E0117]: only traits defined in the current crate can be implemented for arbitrary types - --> $DIR/coherence-impls-sized.rs:30:1 + --> $DIR/coherence-impls-sized.rs:20:1 | LL | impl Sized for (MyType, MyType) {} //~ ERROR E0322 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate @@ -44,7 +44,7 @@ LL | impl Sized for (MyType, MyType) {} //~ ERROR E0322 = note: define and implement a trait or new type instead error[E0117]: only traits defined in the current crate can be implemented for arbitrary types - --> $DIR/coherence-impls-sized.rs:37:1 + --> $DIR/coherence-impls-sized.rs:27:1 | LL | impl Sized for [MyType] {} //~ ERROR E0322 | ^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate @@ -53,7 +53,7 @@ LL | impl Sized for [MyType] {} //~ ERROR E0322 = note: define and implement a trait or new type instead error[E0117]: only traits defined in the current crate can be implemented for arbitrary types - --> $DIR/coherence-impls-sized.rs:41:1 + --> $DIR/coherence-impls-sized.rs:31:1 | LL | impl Sized for &'static [NotSync] {} //~ ERROR E0322 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate diff --git a/src/test/ui/coherence/coherence-inherited-assoc-ty-cycle-err.rs b/src/test/ui/coherence/coherence-inherited-assoc-ty-cycle-err.rs index 5db901b5ba1c2..92bfeb1bf8afb 100644 --- a/src/test/ui/coherence/coherence-inherited-assoc-ty-cycle-err.rs +++ b/src/test/ui/coherence/coherence-inherited-assoc-ty-cycle-err.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Formerly this ICEd with the following message: // Tried to project an inherited associated type during coherence checking, // which is currently not supported. diff --git a/src/test/ui/coherence/coherence-inherited-assoc-ty-cycle-err.stderr b/src/test/ui/coherence/coherence-inherited-assoc-ty-cycle-err.stderr index 5dba448a96333..0b9f03db5c6b7 100644 --- a/src/test/ui/coherence/coherence-inherited-assoc-ty-cycle-err.stderr +++ b/src/test/ui/coherence/coherence-inherited-assoc-ty-cycle-err.stderr @@ -1,12 +1,12 @@ error[E0391]: cycle detected when processing `Trait` - --> $DIR/coherence-inherited-assoc-ty-cycle-err.rs:19:1 + --> $DIR/coherence-inherited-assoc-ty-cycle-err.rs:9:1 | LL | trait Trait { type Assoc; } | ^^^^^^^^^^^^^^ | = note: ...which again requires processing `Trait`, completing the cycle note: cycle used when coherence checking all impls of trait `Trait` - --> $DIR/coherence-inherited-assoc-ty-cycle-err.rs:19:1 + --> $DIR/coherence-inherited-assoc-ty-cycle-err.rs:9:1 | LL | trait Trait { type Assoc; } | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/coherence/coherence-lone-type-parameter.rs b/src/test/ui/coherence/coherence-lone-type-parameter.rs index e78f392b386bb..7d52945b9dd64 100644 --- a/src/test/ui/coherence/coherence-lone-type-parameter.rs +++ b/src/test/ui/coherence/coherence-lone-type-parameter.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:coherence_lib.rs extern crate coherence_lib as lib; diff --git a/src/test/ui/coherence/coherence-lone-type-parameter.stderr b/src/test/ui/coherence/coherence-lone-type-parameter.stderr index 6389bc0e7aba7..fe4a93b792c36 100644 --- a/src/test/ui/coherence/coherence-lone-type-parameter.stderr +++ b/src/test/ui/coherence/coherence-lone-type-parameter.stderr @@ -1,5 +1,5 @@ error[E0210]: type parameter `T` must be used as the type parameter for some local type (e.g. `MyStruct`) - --> $DIR/coherence-lone-type-parameter.rs:16:1 + --> $DIR/coherence-lone-type-parameter.rs:6:1 | LL | impl Remote for T { } | ^^^^^^^^^^^^^^^^^^^^ type parameter `T` must be used as the type parameter for some local type diff --git a/src/test/ui/coherence/coherence-negative-impls-safe.rs b/src/test/ui/coherence/coherence-negative-impls-safe.rs index 1ae07b6468557..050e47fd6a892 100644 --- a/src/test/ui/coherence/coherence-negative-impls-safe.rs +++ b/src/test/ui/coherence/coherence-negative-impls-safe.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] use std::marker::Send; diff --git a/src/test/ui/coherence/coherence-negative-impls-safe.stderr b/src/test/ui/coherence/coherence-negative-impls-safe.stderr index 7373f79942f73..c47c9d25e3614 100644 --- a/src/test/ui/coherence/coherence-negative-impls-safe.stderr +++ b/src/test/ui/coherence/coherence-negative-impls-safe.stderr @@ -1,5 +1,5 @@ error[E0198]: negative impls cannot be unsafe - --> $DIR/coherence-negative-impls-safe.rs:17:1 + --> $DIR/coherence-negative-impls-safe.rs:7:1 | LL | unsafe impl !Send for TestType {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/coherence/coherence-no-direct-lifetime-dispatch.rs b/src/test/ui/coherence/coherence-no-direct-lifetime-dispatch.rs index 47026cd32d411..0a648c28ec658 100644 --- a/src/test/ui/coherence/coherence-no-direct-lifetime-dispatch.rs +++ b/src/test/ui/coherence/coherence-no-direct-lifetime-dispatch.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that you cannot *directly* dispatch on lifetime requirements trait MyTrait { fn foo() {} } diff --git a/src/test/ui/coherence/coherence-no-direct-lifetime-dispatch.stderr b/src/test/ui/coherence/coherence-no-direct-lifetime-dispatch.stderr index 669c5e3a4a6d8..f1cc0088cf1ef 100644 --- a/src/test/ui/coherence/coherence-no-direct-lifetime-dispatch.stderr +++ b/src/test/ui/coherence/coherence-no-direct-lifetime-dispatch.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `MyTrait`: - --> $DIR/coherence-no-direct-lifetime-dispatch.rs:16:1 + --> $DIR/coherence-no-direct-lifetime-dispatch.rs:6:1 | LL | impl MyTrait for T {} | --------------------- first implementation here diff --git a/src/test/ui/coherence/coherence-orphan.rs b/src/test/ui/coherence/coherence-orphan.rs index 80efc7b75e2c7..ace3ebcc9e8b0 100644 --- a/src/test/ui/coherence/coherence-orphan.rs +++ b/src/test/ui/coherence/coherence-orphan.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:coherence_orphan_lib.rs #![feature(optin_builtin_traits)] diff --git a/src/test/ui/coherence/coherence-orphan.stderr b/src/test/ui/coherence/coherence-orphan.stderr index ee863533237e0..1b32faf970cb7 100644 --- a/src/test/ui/coherence/coherence-orphan.stderr +++ b/src/test/ui/coherence/coherence-orphan.stderr @@ -1,5 +1,5 @@ error[E0117]: only traits defined in the current crate can be implemented for arbitrary types - --> $DIR/coherence-orphan.rs:21:1 + --> $DIR/coherence-orphan.rs:11:1 | LL | impl TheTrait for isize { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate @@ -8,7 +8,7 @@ LL | impl TheTrait for isize { } = note: define and implement a trait or new type instead error[E0117]: only traits defined in the current crate can be implemented for arbitrary types - --> $DIR/coherence-orphan.rs:28:1 + --> $DIR/coherence-orphan.rs:18:1 | LL | impl !Send for Vec { } | ^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate diff --git a/src/test/ui/coherence/coherence-overlap-all-t-and-tuple.rs b/src/test/ui/coherence/coherence-overlap-all-t-and-tuple.rs index 1fad608db6c3b..19aad6927ba56 100644 --- a/src/test/ui/coherence/coherence-overlap-all-t-and-tuple.rs +++ b/src/test/ui/coherence/coherence-overlap-all-t-and-tuple.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we detect an overlap here in the case where: // // for some type X: diff --git a/src/test/ui/coherence/coherence-overlap-all-t-and-tuple.stderr b/src/test/ui/coherence/coherence-overlap-all-t-and-tuple.stderr index 993de789ef5d8..2bb3031edce09 100644 --- a/src/test/ui/coherence/coherence-overlap-all-t-and-tuple.stderr +++ b/src/test/ui/coherence/coherence-overlap-all-t-and-tuple.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `From<(_,)>` for type `(_,)`: - --> $DIR/coherence-overlap-all-t-and-tuple.rs:26:1 + --> $DIR/coherence-overlap-all-t-and-tuple.rs:16:1 | LL | impl From for T { | ---------------------- first implementation here diff --git a/src/test/ui/coherence/coherence-overlap-downstream-inherent.rs b/src/test/ui/coherence/coherence-overlap-downstream-inherent.rs index fd6e1d339f383..5dea33e330b62 100644 --- a/src/test/ui/coherence/coherence-overlap-downstream-inherent.rs +++ b/src/test/ui/coherence/coherence-overlap-downstream-inherent.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that we consider `T: Sugar + Fruit` to be ambiguous, even // though no impls are found. diff --git a/src/test/ui/coherence/coherence-overlap-downstream-inherent.stderr b/src/test/ui/coherence/coherence-overlap-downstream-inherent.stderr index 29df3f9c37a39..9a060edb5b1bf 100644 --- a/src/test/ui/coherence/coherence-overlap-downstream-inherent.stderr +++ b/src/test/ui/coherence/coherence-overlap-downstream-inherent.stderr @@ -1,5 +1,5 @@ error[E0592]: duplicate definitions with name `dummy` - --> $DIR/coherence-overlap-downstream-inherent.rs:17:26 + --> $DIR/coherence-overlap-downstream-inherent.rs:7:26 | LL | impl Sweet { fn dummy(&self) { } } | ^^^^^^^^^^^^^^^^^^^ duplicate definitions for `dummy` @@ -8,7 +8,7 @@ LL | impl Sweet { fn dummy(&self) { } } | ------------------- other definition for `dummy` error[E0592]: duplicate definitions with name `f` - --> $DIR/coherence-overlap-downstream-inherent.rs:23:38 + --> $DIR/coherence-overlap-downstream-inherent.rs:13:38 | LL | impl A where T: Bar { fn f(&self) {} } | ^^^^^^^^^^^^^^ duplicate definitions for `f` diff --git a/src/test/ui/coherence/coherence-overlap-downstream.rs b/src/test/ui/coherence/coherence-overlap-downstream.rs index 63898ef9a20a7..738ec0e3d4550 100644 --- a/src/test/ui/coherence/coherence-overlap-downstream.rs +++ b/src/test/ui/coherence/coherence-overlap-downstream.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that we consider `T: Sugar + Fruit` to be ambiguous, even // though no impls are found. diff --git a/src/test/ui/coherence/coherence-overlap-downstream.stderr b/src/test/ui/coherence/coherence-overlap-downstream.stderr index 8e14e4f9bda16..6fb398562d6be 100644 --- a/src/test/ui/coherence/coherence-overlap-downstream.stderr +++ b/src/test/ui/coherence/coherence-overlap-downstream.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `Sweet`: - --> $DIR/coherence-overlap-downstream.rs:18:1 + --> $DIR/coherence-overlap-downstream.rs:8:1 | LL | impl Sweet for T { } | ------------------------- first implementation here @@ -7,7 +7,7 @@ LL | impl Sweet for T { } | ^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation error[E0119]: conflicting implementations of trait `Foo<_>` for type `i32`: - --> $DIR/coherence-overlap-downstream.rs:24:1 + --> $DIR/coherence-overlap-downstream.rs:14:1 | LL | impl Foo for T where T: Bar {} | --------------------------------------- first implementation here diff --git a/src/test/ui/coherence/coherence-overlap-issue-23516-inherent.rs b/src/test/ui/coherence/coherence-overlap-issue-23516-inherent.rs index 94a7bdbc69e41..a272e620fcab3 100644 --- a/src/test/ui/coherence/coherence-overlap-issue-23516-inherent.rs +++ b/src/test/ui/coherence/coherence-overlap-issue-23516-inherent.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that we consider `Box: !Sugar` to be ambiguous, even // though we see no impl of `Sugar` for `Box`. Therefore, an overlap // error is reported for the following pair of impls (#23516). diff --git a/src/test/ui/coherence/coherence-overlap-issue-23516-inherent.stderr b/src/test/ui/coherence/coherence-overlap-issue-23516-inherent.stderr index d217a4d2cdf90..6e5d116bce243 100644 --- a/src/test/ui/coherence/coherence-overlap-issue-23516-inherent.stderr +++ b/src/test/ui/coherence/coherence-overlap-issue-23516-inherent.stderr @@ -1,5 +1,5 @@ error[E0592]: duplicate definitions with name `dummy` - --> $DIR/coherence-overlap-issue-23516-inherent.rs:19:25 + --> $DIR/coherence-overlap-issue-23516-inherent.rs:9:25 | LL | impl Cake { fn dummy(&self) { } } | ^^^^^^^^^^^^^^^^^^^ duplicate definitions for `dummy` diff --git a/src/test/ui/coherence/coherence-overlap-issue-23516.rs b/src/test/ui/coherence/coherence-overlap-issue-23516.rs index 3cd184b9be9c6..63e42e8f412dd 100644 --- a/src/test/ui/coherence/coherence-overlap-issue-23516.rs +++ b/src/test/ui/coherence/coherence-overlap-issue-23516.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that we consider `Box: !Sugar` to be ambiguous, even // though we see no impl of `Sugar` for `Box`. Therefore, an overlap // error is reported for the following pair of impls (#23516). diff --git a/src/test/ui/coherence/coherence-overlap-issue-23516.stderr b/src/test/ui/coherence/coherence-overlap-issue-23516.stderr index ea2ecda6f0de9..fe4c5cf3490dd 100644 --- a/src/test/ui/coherence/coherence-overlap-issue-23516.stderr +++ b/src/test/ui/coherence/coherence-overlap-issue-23516.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `Sweet` for type `std::boxed::Box<_>`: - --> $DIR/coherence-overlap-issue-23516.rs:18:1 + --> $DIR/coherence-overlap-issue-23516.rs:8:1 | LL | impl Sweet for T { } | ------------------------- first implementation here diff --git a/src/test/ui/coherence/coherence-overlap-messages.rs b/src/test/ui/coherence/coherence-overlap-messages.rs index a10deeafbe67e..e7ce40dc43aec 100644 --- a/src/test/ui/coherence/coherence-overlap-messages.rs +++ b/src/test/ui/coherence/coherence-overlap-messages.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn foo() {} } impl Foo for T {} diff --git a/src/test/ui/coherence/coherence-overlap-messages.stderr b/src/test/ui/coherence/coherence-overlap-messages.stderr index 60023c6c2495b..f78482fc59796 100644 --- a/src/test/ui/coherence/coherence-overlap-messages.stderr +++ b/src/test/ui/coherence/coherence-overlap-messages.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `Foo`: - --> $DIR/coherence-overlap-messages.rs:14:1 + --> $DIR/coherence-overlap-messages.rs:4:1 | LL | impl Foo for T {} | ----------------- first implementation here @@ -7,7 +7,7 @@ LL | impl Foo for U {} //~ ERROR conflicting implementations of trait `Foo`: | ^^^^^^^^^^^^^^^^^ conflicting implementation error[E0119]: conflicting implementations of trait `Bar` for type `(u8, u8)`: - --> $DIR/coherence-overlap-messages.rs:19:1 + --> $DIR/coherence-overlap-messages.rs:9:1 | LL | impl Bar for (T, u8) {} | ----------------------- first implementation here @@ -15,7 +15,7 @@ LL | impl Bar for (u8, T) {} //~ ERROR conflicting implementations of trait ` | ^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `(u8, u8)` error[E0119]: conflicting implementations of trait `Baz` for type `u8`: - --> $DIR/coherence-overlap-messages.rs:24:1 + --> $DIR/coherence-overlap-messages.rs:14:1 | LL | impl Baz for T {} | --------------------- first implementation here @@ -23,7 +23,7 @@ LL | impl Baz for u8 {} //~ ERROR conflicting implementations of trait `Ba | ^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `u8` error[E0119]: conflicting implementations of trait `Quux<_, _>`: - --> $DIR/coherence-overlap-messages.rs:29:1 + --> $DIR/coherence-overlap-messages.rs:19:1 | LL | impl Quux for T {} | ------------------------------ first implementation here @@ -31,7 +31,7 @@ LL | impl Quux for T {} //~ ERROR conflicting implementations of tra | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation error[E0119]: conflicting implementations of trait `Quux<_, _>`: - --> $DIR/coherence-overlap-messages.rs:30:1 + --> $DIR/coherence-overlap-messages.rs:20:1 | LL | impl Quux for T {} | ------------------------------ first implementation here diff --git a/src/test/ui/coherence/coherence-overlap-upstream-inherent.rs b/src/test/ui/coherence/coherence-overlap-upstream-inherent.rs index a5a6a88a128be..c5d59c6655abe 100644 --- a/src/test/ui/coherence/coherence-overlap-upstream-inherent.rs +++ b/src/test/ui/coherence/coherence-overlap-upstream-inherent.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that we consider `i16: Remote` to be ambiguous, even // though the upstream crate doesn't implement it for now. diff --git a/src/test/ui/coherence/coherence-overlap-upstream-inherent.stderr b/src/test/ui/coherence/coherence-overlap-upstream-inherent.stderr index 6c6f0dc248339..195b7dba74d84 100644 --- a/src/test/ui/coherence/coherence-overlap-upstream-inherent.stderr +++ b/src/test/ui/coherence/coherence-overlap-upstream-inherent.stderr @@ -1,5 +1,5 @@ error[E0592]: duplicate definitions with name `dummy` - --> $DIR/coherence-overlap-upstream-inherent.rs:21:32 + --> $DIR/coherence-overlap-upstream-inherent.rs:11:32 | LL | impl A where T: Remote { fn dummy(&self) { } } | ^^^^^^^^^^^^^^^^^^^ duplicate definitions for `dummy` diff --git a/src/test/ui/coherence/coherence-overlap-upstream.rs b/src/test/ui/coherence/coherence-overlap-upstream.rs index f772848cb5869..47dd7a78fe88f 100644 --- a/src/test/ui/coherence/coherence-overlap-upstream.rs +++ b/src/test/ui/coherence/coherence-overlap-upstream.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that we consider `i16: Remote` to be ambiguous, even // though the upstream crate doesn't implement it for now. diff --git a/src/test/ui/coherence/coherence-overlap-upstream.stderr b/src/test/ui/coherence/coherence-overlap-upstream.stderr index 794c830cc5bf5..4095949df1344 100644 --- a/src/test/ui/coherence/coherence-overlap-upstream.stderr +++ b/src/test/ui/coherence/coherence-overlap-upstream.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `Foo` for type `i16`: - --> $DIR/coherence-overlap-upstream.rs:22:1 + --> $DIR/coherence-overlap-upstream.rs:12:1 | LL | impl Foo for T where T: Remote {} | --------------------------------- first implementation here diff --git a/src/test/ui/coherence/coherence-overlapping-pairs.rs b/src/test/ui/coherence/coherence-overlapping-pairs.rs index ba9dc53e8680f..11b74ebacc5bc 100644 --- a/src/test/ui/coherence/coherence-overlapping-pairs.rs +++ b/src/test/ui/coherence/coherence-overlapping-pairs.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:coherence_lib.rs extern crate coherence_lib as lib; diff --git a/src/test/ui/coherence/coherence-overlapping-pairs.stderr b/src/test/ui/coherence/coherence-overlapping-pairs.stderr index 41d478885549f..098422e339e93 100644 --- a/src/test/ui/coherence/coherence-overlapping-pairs.stderr +++ b/src/test/ui/coherence/coherence-overlapping-pairs.stderr @@ -1,5 +1,5 @@ error[E0210]: type parameter `T` must be used as the type parameter for some local type (e.g. `MyStruct`) - --> $DIR/coherence-overlapping-pairs.rs:18:1 + --> $DIR/coherence-overlapping-pairs.rs:8:1 | LL | impl Remote for lib::Pair { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type parameter `T` must be used as the type parameter for some local type diff --git a/src/test/ui/coherence/coherence-pair-covered-uncovered-1.rs b/src/test/ui/coherence/coherence-pair-covered-uncovered-1.rs index f55efef14fade..f41e93aa994db 100644 --- a/src/test/ui/coherence/coherence-pair-covered-uncovered-1.rs +++ b/src/test/ui/coherence/coherence-pair-covered-uncovered-1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the same coverage rules apply even if the local type appears in the // list of type parameters, not the self type. diff --git a/src/test/ui/coherence/coherence-pair-covered-uncovered-1.stderr b/src/test/ui/coherence/coherence-pair-covered-uncovered-1.stderr index 3545593fb6d5c..522f4ac7766e6 100644 --- a/src/test/ui/coherence/coherence-pair-covered-uncovered-1.stderr +++ b/src/test/ui/coherence/coherence-pair-covered-uncovered-1.stderr @@ -1,5 +1,5 @@ error[E0210]: type parameter `T` must be used as the type parameter for some local type (e.g. `MyStruct`) - --> $DIR/coherence-pair-covered-uncovered-1.rs:21:1 + --> $DIR/coherence-pair-covered-uncovered-1.rs:11:1 | LL | impl Remote1>> for i32 { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type parameter `T` must be used as the type parameter for some local type diff --git a/src/test/ui/coherence/coherence-pair-covered-uncovered.rs b/src/test/ui/coherence/coherence-pair-covered-uncovered.rs index 0642dff4b2825..2400e9ec67904 100644 --- a/src/test/ui/coherence/coherence-pair-covered-uncovered.rs +++ b/src/test/ui/coherence/coherence-pair-covered-uncovered.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:coherence_lib.rs extern crate coherence_lib as lib; diff --git a/src/test/ui/coherence/coherence-pair-covered-uncovered.stderr b/src/test/ui/coherence/coherence-pair-covered-uncovered.stderr index f58cb4648cbfc..7a97b39939107 100644 --- a/src/test/ui/coherence/coherence-pair-covered-uncovered.stderr +++ b/src/test/ui/coherence/coherence-pair-covered-uncovered.stderr @@ -1,5 +1,5 @@ error[E0210]: type parameter `T` must be used as the type parameter for some local type (e.g. `MyStruct`) - --> $DIR/coherence-pair-covered-uncovered.rs:18:1 + --> $DIR/coherence-pair-covered-uncovered.rs:8:1 | LL | impl Remote for Pair> { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type parameter `T` must be used as the type parameter for some local type diff --git a/src/test/ui/coherence/coherence-projection-conflict-orphan.rs b/src/test/ui/coherence/coherence-projection-conflict-orphan.rs index 784ff0cd5e0aa..31325bea7c91b 100644 --- a/src/test/ui/coherence/coherence-projection-conflict-orphan.rs +++ b/src/test/ui/coherence/coherence-projection-conflict-orphan.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] // Here we expect a coherence conflict because, even though `i32` does diff --git a/src/test/ui/coherence/coherence-projection-conflict-orphan.stderr b/src/test/ui/coherence/coherence-projection-conflict-orphan.stderr index a0fcf072fa813..6929d9f3312c7 100644 --- a/src/test/ui/coherence/coherence-projection-conflict-orphan.stderr +++ b/src/test/ui/coherence/coherence-projection-conflict-orphan.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `Foo` for type `i32`: - --> $DIR/coherence-projection-conflict-orphan.rs:26:1 + --> $DIR/coherence-projection-conflict-orphan.rs:16:1 | LL | impl Foo for i32 { } | --------------------- first implementation here diff --git a/src/test/ui/coherence/coherence-projection-conflict-ty-param.rs b/src/test/ui/coherence/coherence-projection-conflict-ty-param.rs index 120d9046389a1..490c7e24f5740 100644 --- a/src/test/ui/coherence/coherence-projection-conflict-ty-param.rs +++ b/src/test/ui/coherence/coherence-projection-conflict-ty-param.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Coherence error results because we do not know whether `T: Foo

` or not // for the second impl. diff --git a/src/test/ui/coherence/coherence-projection-conflict-ty-param.stderr b/src/test/ui/coherence/coherence-projection-conflict-ty-param.stderr index cfbf96bc1c851..92717e3f67a0e 100644 --- a/src/test/ui/coherence/coherence-projection-conflict-ty-param.stderr +++ b/src/test/ui/coherence/coherence-projection-conflict-ty-param.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `Foo<_>` for type `std::option::Option<_>`: - --> $DIR/coherence-projection-conflict-ty-param.rs:20:1 + --> $DIR/coherence-projection-conflict-ty-param.rs:10:1 | LL | impl > Foo

for Option {} | ---------------------------------------- first implementation here diff --git a/src/test/ui/coherence/coherence-projection-conflict.rs b/src/test/ui/coherence/coherence-projection-conflict.rs index 3c32ab38b93dc..34f078f9a8c35 100644 --- a/src/test/ui/coherence/coherence-projection-conflict.rs +++ b/src/test/ui/coherence/coherence-projection-conflict.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::marker::PhantomData; pub trait Foo

{ fn foo() {} } diff --git a/src/test/ui/coherence/coherence-projection-conflict.stderr b/src/test/ui/coherence/coherence-projection-conflict.stderr index 3832faf28d820..1b0b4e1708f9a 100644 --- a/src/test/ui/coherence/coherence-projection-conflict.stderr +++ b/src/test/ui/coherence/coherence-projection-conflict.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `Foo` for type `i32`: - --> $DIR/coherence-projection-conflict.rs:21:1 + --> $DIR/coherence-projection-conflict.rs:11:1 | LL | impl Foo for i32 { } | --------------------- first implementation here diff --git a/src/test/ui/coherence/coherence-projection-ok-orphan.rs b/src/test/ui/coherence/coherence-projection-ok-orphan.rs index a52af0873a823..e9c0be3dc7448 100644 --- a/src/test/ui/coherence/coherence-projection-ok-orphan.rs +++ b/src/test/ui/coherence/coherence-projection-ok-orphan.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![allow(dead_code)] diff --git a/src/test/ui/coherence/coherence-projection-ok-orphan.stderr b/src/test/ui/coherence/coherence-projection-ok-orphan.stderr index 1b9a32525bfac..0340539f04d34 100644 --- a/src/test/ui/coherence/coherence-projection-ok-orphan.stderr +++ b/src/test/ui/coherence/coherence-projection-ok-orphan.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/coherence-projection-ok-orphan.rs:29:1 + --> $DIR/coherence-projection-ok-orphan.rs:19:1 | LL | fn main() {} //~ ERROR compilation successful | ^^^^^^^^^^^^ diff --git a/src/test/ui/coherence/coherence-projection-ok.rs b/src/test/ui/coherence/coherence-projection-ok.rs index af88f3744eaeb..2f95704016f6e 100644 --- a/src/test/ui/coherence/coherence-projection-ok.rs +++ b/src/test/ui/coherence/coherence-projection-ok.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] pub trait Foo

= self.child.get(); | ^^^^ diff --git a/src/test/ui/issues/issue-36708.rs b/src/test/ui/issues/issue-36708.rs index 92a724a7e966a..c9d9f2a6d5015 100644 --- a/src/test/ui/issues/issue-36708.rs +++ b/src/test/ui/issues/issue-36708.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-36708.rs extern crate issue_36708 as lib; diff --git a/src/test/ui/issues/issue-36708.stderr b/src/test/ui/issues/issue-36708.stderr index 4e28a769f5069..835094c4fdc5e 100644 --- a/src/test/ui/issues/issue-36708.stderr +++ b/src/test/ui/issues/issue-36708.stderr @@ -1,5 +1,5 @@ error[E0049]: method `foo` has 1 type parameter but its trait declaration has 0 type parameters - --> $DIR/issue-36708.rs:18:11 + --> $DIR/issue-36708.rs:8:11 | LL | fn foo() {} | ^^^ found 1 type parameter, expected 0 diff --git a/src/test/ui/issues/issue-3680.rs b/src/test/ui/issues/issue-3680.rs index e698e6da5294e..3604203082d89 100644 --- a/src/test/ui/issues/issue-3680.rs +++ b/src/test/ui/issues/issue-3680.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { match None { Err(_) => () diff --git a/src/test/ui/issues/issue-3680.stderr b/src/test/ui/issues/issue-3680.stderr index 4fea4789dbdaa..78c3f92fb53b5 100644 --- a/src/test/ui/issues/issue-3680.stderr +++ b/src/test/ui/issues/issue-3680.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-3680.rs:13:9 + --> $DIR/issue-3680.rs:3:9 | LL | Err(_) => () | ^^^^^^ expected enum `std::option::Option`, found enum `std::result::Result` diff --git a/src/test/ui/issues/issue-36839.rs b/src/test/ui/issues/issue-36839.rs index 3e34b25067279..a963b0ba473d3 100644 --- a/src/test/ui/issues/issue-36839.rs +++ b/src/test/ui/issues/issue-36839.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] pub trait Foo { diff --git a/src/test/ui/issues/issue-36839.stderr b/src/test/ui/issues/issue-36839.stderr index dd78668801c58..19bdda2a9109d 100644 --- a/src/test/ui/issues/issue-36839.stderr +++ b/src/test/ui/issues/issue-36839.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-36839.rs:30:1 + --> $DIR/issue-36839.rs:20:1 | LL | / fn main() { //~ ERROR compilation successful LL | | let _m: &Broken = &(); diff --git a/src/test/ui/issues/issue-36881.rs b/src/test/ui/issues/issue-36881.rs index 0f5aa24926beb..2b0508d08ea67 100644 --- a/src/test/ui/issues/issue-36881.rs +++ b/src/test/ui/issues/issue-36881.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-36881-aux.rs fn main() { diff --git a/src/test/ui/issues/issue-36881.stderr b/src/test/ui/issues/issue-36881.stderr index 39132fde7625c..44a7cfb1c949c 100644 --- a/src/test/ui/issues/issue-36881.stderr +++ b/src/test/ui/issues/issue-36881.stderr @@ -1,5 +1,5 @@ error[E0432]: unresolved import `issue_36881_aux` - --> $DIR/issue-36881.rs:16:9 + --> $DIR/issue-36881.rs:6:9 | LL | use issue_36881_aux::Foo; //~ ERROR unresolved import | ^^^^^^^^^^^^^^^ Maybe a missing `extern crate issue_36881_aux;`? diff --git a/src/test/ui/issues/issue-3702-2.rs b/src/test/ui/issues/issue-3702-2.rs index 325f05841f408..c3a92a23cef50 100644 --- a/src/test/ui/issues/issue-3702-2.rs +++ b/src/test/ui/issues/issue-3702-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait ToPrimitive { fn to_int(&self) -> isize { 0 } } diff --git a/src/test/ui/issues/issue-3702-2.stderr b/src/test/ui/issues/issue-3702-2.stderr index 9ec400db47f18..11d24b38061e8 100644 --- a/src/test/ui/issues/issue-3702-2.stderr +++ b/src/test/ui/issues/issue-3702-2.stderr @@ -1,16 +1,16 @@ error[E0034]: multiple applicable items in scope - --> $DIR/issue-3702-2.rs:26:14 + --> $DIR/issue-3702-2.rs:16:14 | LL | self.to_int() + other.to_int() //~ ERROR multiple applicable items in scope | ^^^^^^ multiple `to_int` found | note: candidate #1 is defined in an impl of the trait `ToPrimitive` for the type `isize` - --> $DIR/issue-3702-2.rs:12:5 + --> $DIR/issue-3702-2.rs:2:5 | LL | fn to_int(&self) -> isize { 0 } | ^^^^^^^^^^^^^^^^^^^^^^^^^ note: candidate #2 is defined in an impl of the trait `Add` for the type `isize` - --> $DIR/issue-3702-2.rs:24:5 + --> $DIR/issue-3702-2.rs:14:5 | LL | fn to_int(&self) -> isize { *self } | ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-37026.rs b/src/test/ui/issues/issue-37026.rs index 95fd5d1222e69..fd678a717d049 100644 --- a/src/test/ui/issues/issue-37026.rs +++ b/src/test/ui/issues/issue-37026.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:empty-struct.rs extern crate empty_struct; diff --git a/src/test/ui/issues/issue-37026.stderr b/src/test/ui/issues/issue-37026.stderr index c53ec5b55ce25..39a500cf5653b 100644 --- a/src/test/ui/issues/issue-37026.stderr +++ b/src/test/ui/issues/issue-37026.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-37026.rs:16:9 + --> $DIR/issue-37026.rs:6:9 | LL | let empty_struct::XEmpty2 = (); //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^^^^^ expected (), found struct `empty_struct::XEmpty2` @@ -8,7 +8,7 @@ LL | let empty_struct::XEmpty2 = (); //~ ERROR mismatched types found type `empty_struct::XEmpty2` error[E0308]: mismatched types - --> $DIR/issue-37026.rs:17:9 + --> $DIR/issue-37026.rs:7:9 | LL | let empty_struct::XEmpty6(..) = (); //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^^^^^^^^^ expected (), found struct `empty_struct::XEmpty6` diff --git a/src/test/ui/issues/issue-37051.rs b/src/test/ui/issues/issue-37051.rs index ab08e1899a0ee..a9165257f004c 100644 --- a/src/test/ui/issues/issue-37051.rs +++ b/src/test/ui/issues/issue-37051.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs, associated_type_defaults)] #![allow(warnings)] diff --git a/src/test/ui/issues/issue-37051.stderr b/src/test/ui/issues/issue-37051.stderr index b0404088d4d8a..7dd602b87757c 100644 --- a/src/test/ui/issues/issue-37051.stderr +++ b/src/test/ui/issues/issue-37051.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-37051.rs:28:1 + --> $DIR/issue-37051.rs:18:1 | LL | / fn main() { //~ ERROR compilation successful LL | | } diff --git a/src/test/ui/issues/issue-3707.rs b/src/test/ui/issues/issue-3707.rs index ad56b125b087f..844a2dc00698e 100644 --- a/src/test/ui/issues/issue-3707.rs +++ b/src/test/ui/issues/issue-3707.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Obj { member: usize } diff --git a/src/test/ui/issues/issue-3707.stderr b/src/test/ui/issues/issue-3707.stderr index c6d28fecaf9b8..436dcbee862a7 100644 --- a/src/test/ui/issues/issue-3707.stderr +++ b/src/test/ui/issues/issue-3707.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `boom` found for type `&Obj` in the current scope - --> $DIR/issue-3707.rs:20:14 + --> $DIR/issue-3707.rs:10:14 | LL | self.boom(); //~ ERROR no method named `boom` found for type `&Obj` in the current scope | -----^^^^ @@ -9,7 +9,7 @@ LL | self.boom(); //~ ERROR no method named `boom` found for type `&Obj` | = note: found the following associated functions; to be used as methods, functions must have a `self` parameter note: the candidate is defined in an impl for the type `Obj` - --> $DIR/issue-3707.rs:16:5 + --> $DIR/issue-3707.rs:6:5 | LL | pub fn boom() -> bool { | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-37131.rs b/src/test/ui/issues/issue-37131.rs index efb0b249a8a59..aa3b6ea86bbe0 100644 --- a/src/test/ui/issues/issue-37131.rs +++ b/src/test/ui/issues/issue-37131.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that compiling for a target which is not installed will result in a helpful // error message. diff --git a/src/test/ui/issues/issue-37311-type-length-limit/issue-37311.rs b/src/test/ui/issues/issue-37311-type-length-limit/issue-37311.rs index 1e05bdb0c6086..9a8dafe13940a 100644 --- a/src/test/ui/issues/issue-37311-type-length-limit/issue-37311.rs +++ b/src/test/ui/issues/issue-37311-type-length-limit/issue-37311.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Mirror { type Image; } diff --git a/src/test/ui/issues/issue-37311-type-length-limit/issue-37311.stderr b/src/test/ui/issues/issue-37311-type-length-limit/issue-37311.stderr index a563c84435906..fa1ee227f0bf2 100644 --- a/src/test/ui/issues/issue-37311-type-length-limit/issue-37311.stderr +++ b/src/test/ui/issues/issue-37311-type-length-limit/issue-37311.stderr @@ -1,5 +1,5 @@ error: reached the type-length limit while instantiating `<(&(&(&(&(&(&(&(&(&(&(&(&(&(&(&(&(&(&(&(), &()), &(&()...` - --> $DIR/issue-37311.rs:23:5 + --> $DIR/issue-37311.rs:13:5 | LL | / fn recurse(&self) { //~ ERROR reached the type-length limit LL | | (self, self).recurse(); diff --git a/src/test/ui/issues/issue-37323.rs b/src/test/ui/issues/issue-37323.rs index 98806cdd1b9af..007334eb40a9f 100644 --- a/src/test/ui/issues/issue-37323.rs +++ b/src/test/ui/issues/issue-37323.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![allow(warnings)] diff --git a/src/test/ui/issues/issue-37323.stderr b/src/test/ui/issues/issue-37323.stderr index a83923a591023..6f214c1bb5a00 100644 --- a/src/test/ui/issues/issue-37323.stderr +++ b/src/test/ui/issues/issue-37323.stderr @@ -1,16 +1,16 @@ error[E0491]: in type `&'a NestedB<'b>`, reference has a longer lifetime than the data it references - --> $DIR/issue-37323.rs:19:5 + --> $DIR/issue-37323.rs:9:5 | LL | x: &'a NestedB<'b> | ^^^^^^^^^^^^^^^^^^ | -note: the pointer is valid for the lifetime 'a as defined on the struct at 18:16 - --> $DIR/issue-37323.rs:18:16 +note: the pointer is valid for the lifetime 'a as defined on the struct at 8:16 + --> $DIR/issue-37323.rs:8:16 | LL | struct NestedA<'a, 'b> { | ^^ -note: but the referenced data is only valid for the lifetime 'b as defined on the struct at 18:20 - --> $DIR/issue-37323.rs:18:20 +note: but the referenced data is only valid for the lifetime 'b as defined on the struct at 8:20 + --> $DIR/issue-37323.rs:8:20 | LL | struct NestedA<'a, 'b> { | ^^ diff --git a/src/test/ui/issues/issue-37366.rs b/src/test/ui/issues/issue-37366.rs index 2a4808fb186bb..c14abd91b2c12 100644 --- a/src/test/ui/issues/issue-37366.rs +++ b/src/test/ui/issues/issue-37366.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten #![feature(rustc_attrs, asm)] diff --git a/src/test/ui/issues/issue-37366.stderr b/src/test/ui/issues/issue-37366.stderr index 8667feccf9971..d105f3a00e139 100644 --- a/src/test/ui/issues/issue-37366.stderr +++ b/src/test/ui/issues/issue-37366.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-37366.rs:25:1 + --> $DIR/issue-37366.rs:15:1 | LL | / fn main() { //~ ERROR compilation successful LL | | } diff --git a/src/test/ui/issues/issue-37510.rs b/src/test/ui/issues/issue-37510.rs index 53c91f323d081..b20987507ec0f 100644 --- a/src/test/ui/issues/issue-37510.rs +++ b/src/test/ui/issues/issue-37510.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] fn foo(_: &mut i32) -> bool { true } diff --git a/src/test/ui/issues/issue-37510.stderr b/src/test/ui/issues/issue-37510.stderr index 48db0d5e2023d..bc1e3d4ca4916 100644 --- a/src/test/ui/issues/issue-37510.stderr +++ b/src/test/ui/issues/issue-37510.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-37510.rs:16:1 + --> $DIR/issue-37510.rs:6:1 | LL | / fn main() { //~ ERROR compilation successful LL | | let opt = Some(92); diff --git a/src/test/ui/issues/issue-37515.rs b/src/test/ui/issues/issue-37515.rs index d5733f9819387..d28b375bf8bbd 100644 --- a/src/test/ui/issues/issue-37515.rs +++ b/src/test/ui/issues/issue-37515.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![warn(unused)] diff --git a/src/test/ui/issues/issue-37515.stderr b/src/test/ui/issues/issue-37515.stderr index 68e983f23b034..217c95273b1cb 100644 --- a/src/test/ui/issues/issue-37515.stderr +++ b/src/test/ui/issues/issue-37515.stderr @@ -1,18 +1,18 @@ warning: type alias is never used: `Z` - --> $DIR/issue-37515.rs:14:1 + --> $DIR/issue-37515.rs:4:1 | LL | type Z = for<'x> Send; | ^^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/issue-37515.rs:12:9 + --> $DIR/issue-37515.rs:2:9 | LL | #![warn(unused)] | ^^^^^^ = note: #[warn(dead_code)] implied by #[warn(unused)] error: compilation successful - --> $DIR/issue-37515.rs:18:1 + --> $DIR/issue-37515.rs:8:1 | LL | / fn main() { //~ ERROR compilation successful LL | | } diff --git a/src/test/ui/issues/issue-37534.rs b/src/test/ui/issues/issue-37534.rs index 70c8f92de63cb..9386b4516a330 100644 --- a/src/test/ui/issues/issue-37534.rs +++ b/src/test/ui/issues/issue-37534.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { } //~^ ERROR cannot find trait `Hash` in this scope //~^^ ERROR parameter `T` is never used diff --git a/src/test/ui/issues/issue-37534.stderr b/src/test/ui/issues/issue-37534.stderr index c4fc9db31f5e2..fe143540b735f 100644 --- a/src/test/ui/issues/issue-37534.stderr +++ b/src/test/ui/issues/issue-37534.stderr @@ -1,5 +1,5 @@ error[E0405]: cannot find trait `Hash` in this scope - --> $DIR/issue-37534.rs:11:16 + --> $DIR/issue-37534.rs:1:16 | LL | struct Foo { } | ^^^^ not found in this scope @@ -9,13 +9,13 @@ LL | use std::hash::Hash; | warning: default bound relaxed for a type parameter, but this does nothing because the given bound is not a default. Only `?Sized` is supported - --> $DIR/issue-37534.rs:11:12 + --> $DIR/issue-37534.rs:1:12 | LL | struct Foo { } | ^ error[E0392]: parameter `T` is never used - --> $DIR/issue-37534.rs:11:12 + --> $DIR/issue-37534.rs:1:12 | LL | struct Foo { } | ^ unused type parameter diff --git a/src/test/ui/issues/issue-37550.rs b/src/test/ui/issues/issue-37550.rs index af1f6ef5ed4ac..8c2c2d6956fa6 100644 --- a/src/test/ui/issues/issue-37550.rs +++ b/src/test/ui/issues/issue-37550.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_fn)] const fn x() { diff --git a/src/test/ui/issues/issue-37550.stderr b/src/test/ui/issues/issue-37550.stderr index 7468510de6a33..d559e112e3543 100644 --- a/src/test/ui/issues/issue-37550.stderr +++ b/src/test/ui/issues/issue-37550.stderr @@ -1,5 +1,5 @@ error[E0658]: let bindings in constant functions are unstable (see issue #48821) - --> $DIR/issue-37550.rs:14:13 + --> $DIR/issue-37550.rs:4:13 | LL | let t = true; | ^^^^ @@ -7,7 +7,7 @@ LL | let t = true; = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: statements in constant functions are unstable (see issue #48821) - --> $DIR/issue-37550.rs:14:13 + --> $DIR/issue-37550.rs:4:13 | LL | let t = true; | ^^^^ @@ -15,7 +15,7 @@ LL | let t = true; = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: let bindings in constant functions are unstable (see issue #48821) - --> $DIR/issue-37550.rs:17:13 + --> $DIR/issue-37550.rs:7:13 | LL | let x = || t; | ^^^^ @@ -23,7 +23,7 @@ LL | let x = || t; = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: statements in constant functions are unstable (see issue #48821) - --> $DIR/issue-37550.rs:17:13 + --> $DIR/issue-37550.rs:7:13 | LL | let x = || t; | ^^^^ diff --git a/src/test/ui/issues/issue-37576.rs b/src/test/ui/issues/issue-37576.rs index e3c1ada878df5..e7f933ab22ea7 100644 --- a/src/test/ui/issues/issue-37576.rs +++ b/src/test/ui/issues/issue-37576.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { 'test_1: while break 'test_1 {} while break {} diff --git a/src/test/ui/issues/issue-37576.stderr b/src/test/ui/issues/issue-37576.stderr index b663c8b8a2838..d19e1f45393a3 100644 --- a/src/test/ui/issues/issue-37576.stderr +++ b/src/test/ui/issues/issue-37576.stderr @@ -1,47 +1,47 @@ error[E0590]: `break` or `continue` with no label in the condition of a `while` loop - --> $DIR/issue-37576.rs:13:11 + --> $DIR/issue-37576.rs:3:11 | LL | while break {} | ^^^^^ unlabeled `break` in the condition of a `while` loop error[E0590]: `break` or `continue` with no label in the condition of a `while` loop - --> $DIR/issue-37576.rs:17:22 + --> $DIR/issue-37576.rs:7:22 | LL | while let true = break {} | ^^^^^ unlabeled `break` in the condition of a `while` loop error[E0590]: `break` or `continue` with no label in the condition of a `while` loop - --> $DIR/issue-37576.rs:21:18 + --> $DIR/issue-37576.rs:11:18 | LL | loop { while break {} } | ^^^^^ unlabeled `break` in the condition of a `while` loop error[E0590]: `break` or `continue` with no label in the condition of a `while` loop - --> $DIR/issue-37576.rs:29:15 + --> $DIR/issue-37576.rs:19:15 | LL | while break {} | ^^^^^ unlabeled `break` in the condition of a `while` loop error[E0590]: `break` or `continue` with no label in the condition of a `while` loop - --> $DIR/issue-37576.rs:35:11 + --> $DIR/issue-37576.rs:25:11 | LL | while continue {} | ^^^^^^^^ unlabeled `continue` in the condition of a `while` loop error[E0590]: `break` or `continue` with no label in the condition of a `while` loop - --> $DIR/issue-37576.rs:39:22 + --> $DIR/issue-37576.rs:29:22 | LL | while let true = continue {} | ^^^^^^^^ unlabeled `continue` in the condition of a `while` loop error[E0590]: `break` or `continue` with no label in the condition of a `while` loop - --> $DIR/issue-37576.rs:43:18 + --> $DIR/issue-37576.rs:33:18 | LL | loop { while continue {} } | ^^^^^^^^ unlabeled `continue` in the condition of a `while` loop error[E0590]: `break` or `continue` with no label in the condition of a `while` loop - --> $DIR/issue-37576.rs:51:15 + --> $DIR/issue-37576.rs:41:15 | LL | while continue {} | ^^^^^^^^ unlabeled `continue` in the condition of a `while` loop diff --git a/src/test/ui/issues/issue-3763.rs b/src/test/ui/issues/issue-3763.rs index 851f5dfeabe8a..5d17a30ab3624 100644 --- a/src/test/ui/issues/issue-3763.rs +++ b/src/test/ui/issues/issue-3763.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod my_mod { pub struct MyStruct { priv_field: isize diff --git a/src/test/ui/issues/issue-3763.stderr b/src/test/ui/issues/issue-3763.stderr index 0dd7d6819e824..f37b923d5dcfb 100644 --- a/src/test/ui/issues/issue-3763.stderr +++ b/src/test/ui/issues/issue-3763.stderr @@ -1,29 +1,29 @@ error[E0616]: field `priv_field` of struct `my_mod::MyStruct` is private - --> $DIR/issue-3763.rs:25:19 + --> $DIR/issue-3763.rs:15:19 | LL | let _woohoo = (&my_struct).priv_field; | ^^^^^^^^^^^^^^^^^^^^^^^ error[E0616]: field `priv_field` of struct `my_mod::MyStruct` is private - --> $DIR/issue-3763.rs:28:19 + --> $DIR/issue-3763.rs:18:19 | LL | let _woohoo = (Box::new(my_struct)).priv_field; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0624]: method `happyfun` is private - --> $DIR/issue-3763.rs:31:18 + --> $DIR/issue-3763.rs:21:18 | LL | (&my_struct).happyfun(); //~ ERROR method `happyfun` is private | ^^^^^^^^ error[E0624]: method `happyfun` is private - --> $DIR/issue-3763.rs:33:27 + --> $DIR/issue-3763.rs:23:27 | LL | (Box::new(my_struct)).happyfun(); //~ ERROR method `happyfun` is private | ^^^^^^^^ error[E0616]: field `priv_field` of struct `my_mod::MyStruct` is private - --> $DIR/issue-3763.rs:34:16 + --> $DIR/issue-3763.rs:24:16 | LL | let nope = my_struct.priv_field; | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-37665.rs b/src/test/ui/issues/issue-37665.rs index 81ed4375e7793..c20782a7eb4b8 100644 --- a/src/test/ui/issues/issue-37665.rs +++ b/src/test/ui/issues/issue-37665.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z unpretty=mir // ignore-cloudabi no std::path diff --git a/src/test/ui/issues/issue-37665.stderr b/src/test/ui/issues/issue-37665.stderr index cdf9129c00212..0022ab73e1ad9 100644 --- a/src/test/ui/issues/issue-37665.stderr +++ b/src/test/ui/issues/issue-37665.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-37665.rs:20:17 + --> $DIR/issue-37665.rs:10:17 | LL | let x: () = 0; //~ ERROR: mismatched types | ^ expected (), found integral variable diff --git a/src/test/ui/issues/issue-3779.rs b/src/test/ui/issues/issue-3779.rs index 7490960da3677..901c1be80ca06 100644 --- a/src/test/ui/issues/issue-3779.rs +++ b/src/test/ui/issues/issue-3779.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S { //~^ ERROR E0072 element: Option diff --git a/src/test/ui/issues/issue-3779.stderr b/src/test/ui/issues/issue-3779.stderr index f5e89638f1614..3538cb199c3e0 100644 --- a/src/test/ui/issues/issue-3779.stderr +++ b/src/test/ui/issues/issue-3779.stderr @@ -1,5 +1,5 @@ error[E0072]: recursive type `S` has infinite size - --> $DIR/issue-3779.rs:11:1 + --> $DIR/issue-3779.rs:1:1 | LL | struct S { | ^^^^^^^^ recursive type has infinite size diff --git a/src/test/ui/issues/issue-37884.rs b/src/test/ui/issues/issue-37884.rs index ea6403a3eef34..ee37481b23f72 100644 --- a/src/test/ui/issues/issue-37884.rs +++ b/src/test/ui/issues/issue-37884.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct RepeatMut<'a, T>(T, &'a ()); impl<'a, T: 'a> Iterator for RepeatMut<'a, T> { diff --git a/src/test/ui/issues/issue-37884.stderr b/src/test/ui/issues/issue-37884.stderr index f01b623aced42..f791c6df72f2e 100644 --- a/src/test/ui/issues/issue-37884.stderr +++ b/src/test/ui/issues/issue-37884.stderr @@ -1,5 +1,5 @@ error[E0308]: method not compatible with trait - --> $DIR/issue-37884.rs:16:5 + --> $DIR/issue-37884.rs:6:5 | LL | / fn next(&'a mut self) -> Option LL | | //~^ ERROR method not compatible with trait @@ -11,8 +11,8 @@ LL | | } | = note: expected type `fn(&mut RepeatMut<'a, T>) -> std::option::Option<&mut T>` found type `fn(&'a mut RepeatMut<'a, T>) -> std::option::Option<&mut T>` -note: the anonymous lifetime #1 defined on the method body at 16:5... - --> $DIR/issue-37884.rs:16:5 +note: the anonymous lifetime #1 defined on the method body at 6:5... + --> $DIR/issue-37884.rs:6:5 | LL | / fn next(&'a mut self) -> Option LL | | //~^ ERROR method not compatible with trait @@ -21,8 +21,8 @@ LL | | { LL | | Some(&mut self.0) LL | | } | |_____^ -note: ...does not necessarily outlive the lifetime 'a as defined on the impl at 13:6 - --> $DIR/issue-37884.rs:13:6 +note: ...does not necessarily outlive the lifetime 'a as defined on the impl at 3:6 + --> $DIR/issue-37884.rs:3:6 | LL | impl<'a, T: 'a> Iterator for RepeatMut<'a, T> { | ^^ diff --git a/src/test/ui/issues/issue-37887.rs b/src/test/ui/issues/issue-37887.rs index f120bbbfc9f1a..58f0c6b651ad6 100644 --- a/src/test/ui/issues/issue-37887.rs +++ b/src/test/ui/issues/issue-37887.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { extern crate libc; //~ ERROR use of unstable use libc::*; //~ ERROR unresolved import diff --git a/src/test/ui/issues/issue-37887.stderr b/src/test/ui/issues/issue-37887.stderr index 8448466087d66..db456d5fd4a9f 100644 --- a/src/test/ui/issues/issue-37887.stderr +++ b/src/test/ui/issues/issue-37887.stderr @@ -1,11 +1,11 @@ error[E0432]: unresolved import `libc` - --> $DIR/issue-37887.rs:13:9 + --> $DIR/issue-37887.rs:3:9 | LL | use libc::*; //~ ERROR unresolved import | ^^^^ Maybe a missing `extern crate libc;`? error[E0658]: use of unstable library feature 'libc': use `libc` from crates.io (see issue #27783) - --> $DIR/issue-37887.rs:12:5 + --> $DIR/issue-37887.rs:2:5 | LL | extern crate libc; //~ ERROR use of unstable | ^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-38160.rs b/src/test/ui/issues/issue-38160.rs index 311d0ceb4d37b..158c2057228e8 100644 --- a/src/test/ui/issues/issue-38160.rs +++ b/src/test/ui/issues/issue-38160.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(associated_consts, rustc_attrs)] #![allow(warnings)] diff --git a/src/test/ui/issues/issue-38160.stderr b/src/test/ui/issues/issue-38160.stderr index 1277d84a0320c..f9c866d4d2670 100644 --- a/src/test/ui/issues/issue-38160.stderr +++ b/src/test/ui/issues/issue-38160.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-38160.rs:31:1 + --> $DIR/issue-38160.rs:21:1 | LL | fn main() {} //~ ERROR compilation successful | ^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-3820.rs b/src/test/ui/issues/issue-3820.rs index 28de76f18da76..fbf60ce278df2 100644 --- a/src/test/ui/issues/issue-3820.rs +++ b/src/test/ui/issues/issue-3820.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Thing { x: isize } diff --git a/src/test/ui/issues/issue-3820.stderr b/src/test/ui/issues/issue-3820.stderr index cdd14e9da7bf5..0a36ac7616bb3 100644 --- a/src/test/ui/issues/issue-3820.stderr +++ b/src/test/ui/issues/issue-3820.stderr @@ -1,5 +1,5 @@ error[E0369]: binary operation `*` cannot be applied to type `Thing` - --> $DIR/issue-3820.rs:24:13 + --> $DIR/issue-3820.rs:14:13 | LL | let w = u * 3; //~ ERROR binary operation `*` cannot be applied to type `Thing` | ^^^^^ diff --git a/src/test/ui/issues/issue-38293.rs b/src/test/ui/issues/issue-38293.rs index 1867bafa7e3d2..3b1393600ba87 100644 --- a/src/test/ui/issues/issue-38293.rs +++ b/src/test/ui/issues/issue-38293.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that `fn foo::bar::{self}` only imports `bar` in the type namespace. mod foo { diff --git a/src/test/ui/issues/issue-38293.stderr b/src/test/ui/issues/issue-38293.stderr index 73f5425cfc0bb..409670074d9f3 100644 --- a/src/test/ui/issues/issue-38293.stderr +++ b/src/test/ui/issues/issue-38293.stderr @@ -1,11 +1,11 @@ error[E0432]: unresolved import `foo::f` - --> $DIR/issue-38293.rs:16:14 + --> $DIR/issue-38293.rs:6:14 | LL | use foo::f::{self}; //~ ERROR unresolved import `foo::f` | ^^^^ no `f` in `foo` error[E0423]: expected function, found module `baz` - --> $DIR/issue-38293.rs:25:5 + --> $DIR/issue-38293.rs:15:5 | LL | baz(); //~ ERROR expected function, found module `baz` | ^^^ not a function diff --git a/src/test/ui/issues/issue-38381.rs b/src/test/ui/issues/issue-38381.rs index 6b7dde117dfd6..e545ff16d37c3 100644 --- a/src/test/ui/issues/issue-38381.rs +++ b/src/test/ui/issues/issue-38381.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] use std::ops::Deref; diff --git a/src/test/ui/issues/issue-38381.stderr b/src/test/ui/issues/issue-38381.stderr index baa6338a37ead..81b8963818b5c 100644 --- a/src/test/ui/issues/issue-38381.stderr +++ b/src/test/ui/issues/issue-38381.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-38381.rs:16:1 + --> $DIR/issue-38381.rs:6:1 | LL | / fn main() { //~ ERROR compilation successful LL | | let _x: fn(&i32) -> <&i32 as Deref>::Target = unimplemented!(); diff --git a/src/test/ui/issues/issue-38404.rs b/src/test/ui/issues/issue-38404.rs index a2b0d0a60c0db..cddd75e267c42 100644 --- a/src/test/ui/issues/issue-38404.rs +++ b/src/test/ui/issues/issue-38404.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait A: std::ops::Add + Sized {} trait B: A {} trait C: A> {} diff --git a/src/test/ui/issues/issue-38404.stderr b/src/test/ui/issues/issue-38404.stderr index ac55be75f5b14..06bcf220f1836 100644 --- a/src/test/ui/issues/issue-38404.stderr +++ b/src/test/ui/issues/issue-38404.stderr @@ -1,5 +1,5 @@ error[E0038]: the trait `B` cannot be made into an object - --> $DIR/issue-38404.rs:13:15 + --> $DIR/issue-38404.rs:3:15 | LL | trait C: A> {} | ^^^^^^^^^^^^^^^^^^ the trait `B` cannot be made into an object diff --git a/src/test/ui/issues/issue-38412.rs b/src/test/ui/issues/issue-38412.rs index b4feadbacf740..a7c818d9bcb70 100644 --- a/src/test/ui/issues/issue-38412.rs +++ b/src/test/ui/issues/issue-38412.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let Box(a) = loop { }; //~^ ERROR expected tuple struct/variant, found struct `Box` diff --git a/src/test/ui/issues/issue-38412.stderr b/src/test/ui/issues/issue-38412.stderr index 96851436d6ccf..c44a0bfc8b027 100644 --- a/src/test/ui/issues/issue-38412.stderr +++ b/src/test/ui/issues/issue-38412.stderr @@ -1,5 +1,5 @@ error[E0532]: expected tuple struct/variant, found struct `Box` - --> $DIR/issue-38412.rs:12:9 + --> $DIR/issue-38412.rs:2:9 | LL | let Box(a) = loop { }; | ^^^ constructor is not visible here due to private fields diff --git a/src/test/ui/issues/issue-38458.rs b/src/test/ui/issues/issue-38458.rs index 56eb5f874cd61..665a8fdf8e26e 100644 --- a/src/test/ui/issues/issue-38458.rs +++ b/src/test/ui/issues/issue-38458.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const x: () = { return; //~ ERROR return statement outside of function body }; diff --git a/src/test/ui/issues/issue-38458.stderr b/src/test/ui/issues/issue-38458.stderr index d870da63d89c6..541a36233ca26 100644 --- a/src/test/ui/issues/issue-38458.stderr +++ b/src/test/ui/issues/issue-38458.stderr @@ -1,5 +1,5 @@ error[E0572]: return statement outside of function body - --> $DIR/issue-38458.rs:12:5 + --> $DIR/issue-38458.rs:2:5 | LL | return; //~ ERROR return statement outside of function body | ^^^^^^ diff --git a/src/test/ui/issues/issue-38604.rs b/src/test/ui/issues/issue-38604.rs index c1939a7707f39..c172595a245cd 100644 --- a/src/test/ui/issues/issue-38604.rs +++ b/src/test/ui/issues/issue-38604.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Q {} trait Foo where u32: Q { fn foo(&self); diff --git a/src/test/ui/issues/issue-38604.stderr b/src/test/ui/issues/issue-38604.stderr index 78aee9172f539..30b4d2b53ff30 100644 --- a/src/test/ui/issues/issue-38604.stderr +++ b/src/test/ui/issues/issue-38604.stderr @@ -1,5 +1,5 @@ error[E0038]: the trait `Foo` cannot be made into an object - --> $DIR/issue-38604.rs:24:13 + --> $DIR/issue-38604.rs:14:13 | LL | let _f: Box = //~ ERROR `Foo` cannot be made into an object | ^^^^^^^^ the trait `Foo` cannot be made into an object @@ -7,7 +7,7 @@ LL | let _f: Box = //~ ERROR `Foo` cannot be made into an object = note: the trait cannot use `Self` as a type parameter in the supertraits or where-clauses error[E0038]: the trait `Foo` cannot be made into an object - --> $DIR/issue-38604.rs:25:9 + --> $DIR/issue-38604.rs:15:9 | LL | Box::new(()); //~ ERROR `Foo` cannot be made into an object | ^^^^^^^^^^^^ the trait `Foo` cannot be made into an object diff --git a/src/test/ui/issues/issue-38715.rs b/src/test/ui/issues/issue-38715.rs index 552653c21bad6..ec261dc3849cb 100644 --- a/src/test/ui/issues/issue-38715.rs +++ b/src/test/ui/issues/issue-38715.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_export] macro_rules! foo { ($i:ident) => {} } diff --git a/src/test/ui/issues/issue-38715.stderr b/src/test/ui/issues/issue-38715.stderr index a0dbcbd18c673..8d067c8c2ad3f 100644 --- a/src/test/ui/issues/issue-38715.stderr +++ b/src/test/ui/issues/issue-38715.stderr @@ -1,5 +1,5 @@ error: a macro named `foo` has already been exported - --> $DIR/issue-38715.rs:15:1 + --> $DIR/issue-38715.rs:5:1 | LL | macro_rules! foo { () => {} } //~ ERROR a macro named `foo` has already been exported | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `foo` already exported @@ -8,7 +8,7 @@ LL | macro_rules! foo { () => {} } //~ ERROR a macro named `foo` has already bee = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition! = note: for more information, see issue #35896 note: previous macro export is now shadowed - --> $DIR/issue-38715.rs:12:1 + --> $DIR/issue-38715.rs:2:1 | LL | macro_rules! foo { ($i:ident) => {} } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-38821.rs b/src/test/ui/issues/issue-38821.rs index 63de780e109eb..6753860e9ff80 100644 --- a/src/test/ui/issues/issue-38821.rs +++ b/src/test/ui/issues/issue-38821.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Nullable(T); pub trait NotNull {} diff --git a/src/test/ui/issues/issue-38821.stderr b/src/test/ui/issues/issue-38821.stderr index f23f0ae99e9ab..dbd204ec299d7 100644 --- a/src/test/ui/issues/issue-38821.stderr +++ b/src/test/ui/issues/issue-38821.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `::SqlType: NotNull` is not satisfied - --> $DIR/issue-38821.rs:33:17 + --> $DIR/issue-38821.rs:23:17 | LL | #[derive(Debug, Copy, Clone)] | ^^^^ the trait `NotNull` is not implemented for `::SqlType` diff --git a/src/test/ui/issues/issue-38857.rs b/src/test/ui/issues/issue-38857.rs index b38b1b9fdc6d1..5a49ccc2dd68b 100644 --- a/src/test/ui/issues/issue-38857.rs +++ b/src/test/ui/issues/issue-38857.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let a = std::sys::imp::process::process_common::StdioPipes { ..panic!() }; //~^ ERROR failed to resolve. Could not find `imp` in `sys` [E0433] diff --git a/src/test/ui/issues/issue-38857.stderr b/src/test/ui/issues/issue-38857.stderr index 985927c25a1ae..4f2ff60b730a3 100644 --- a/src/test/ui/issues/issue-38857.stderr +++ b/src/test/ui/issues/issue-38857.stderr @@ -1,11 +1,11 @@ error[E0433]: failed to resolve. Could not find `imp` in `sys` - --> $DIR/issue-38857.rs:12:23 + --> $DIR/issue-38857.rs:2:23 | LL | let a = std::sys::imp::process::process_common::StdioPipes { ..panic!() }; | ^^^ Could not find `imp` in `sys` error[E0603]: module `sys` is private - --> $DIR/issue-38857.rs:12:13 + --> $DIR/issue-38857.rs:2:13 | LL | let a = std::sys::imp::process::process_common::StdioPipes { ..panic!() }; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-38868.rs b/src/test/ui/issues/issue-38868.rs index c7e1da7094f2b..b0e5c371345df 100644 --- a/src/test/ui/issues/issue-38868.rs +++ b/src/test/ui/issues/issue-38868.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct List { head: T, } diff --git a/src/test/ui/issues/issue-38868.stderr b/src/test/ui/issues/issue-38868.stderr index 3a8ffe7d5e9c6..ae975ca78c11b 100644 --- a/src/test/ui/issues/issue-38868.stderr +++ b/src/test/ui/issues/issue-38868.stderr @@ -1,5 +1,5 @@ error[E0366]: Implementations of Drop cannot be specialized - --> $DIR/issue-38868.rs:15:1 + --> $DIR/issue-38868.rs:5:1 | LL | / impl Drop for List { //~ ERROR E0366 LL | | fn drop(&mut self) { @@ -9,7 +9,7 @@ LL | | } | |_^ | note: Use same sequence of generic type and region parameters that is on the struct/enum definition - --> $DIR/issue-38868.rs:11:1 + --> $DIR/issue-38868.rs:1:1 | LL | / pub struct List { LL | | head: T, diff --git a/src/test/ui/issues/issue-38875/auxiliary/issue_38875_b.rs b/src/test/ui/issues/issue-38875/auxiliary/issue_38875_b.rs index dd58735209b8f..e9f7fefb6fb8e 100644 --- a/src/test/ui/issues/issue-38875/auxiliary/issue_38875_b.rs +++ b/src/test/ui/issues/issue-38875/auxiliary/issue_38875_b.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub const FOO: usize = *&0; diff --git a/src/test/ui/issues/issue-38875/issue_38875.rs b/src/test/ui/issues/issue-38875/issue_38875.rs index d9debe34c4d5a..5a652c43db3a9 100644 --- a/src/test/ui/issues/issue-38875/issue_38875.rs +++ b/src/test/ui/issues/issue-38875/issue_38875.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_38875_b.rs // compile-pass diff --git a/src/test/ui/issues/issue-38919.rs b/src/test/ui/issues/issue-38919.rs index e6cee4afd59fe..60a8793b4e6be 100644 --- a/src/test/ui/issues/issue-38919.rs +++ b/src/test/ui/issues/issue-38919.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo() { T::Item; //~ ERROR no associated item named `Item` found for type `T` in the current scope } diff --git a/src/test/ui/issues/issue-38919.stderr b/src/test/ui/issues/issue-38919.stderr index b80367d7c6cff..41da422c1b960 100644 --- a/src/test/ui/issues/issue-38919.stderr +++ b/src/test/ui/issues/issue-38919.stderr @@ -1,5 +1,5 @@ error[E0599]: no associated item named `Item` found for type `T` in the current scope - --> $DIR/issue-38919.rs:12:5 + --> $DIR/issue-38919.rs:2:5 | LL | T::Item; //~ ERROR no associated item named `Item` found for type `T` in the current scope | ^^^^^^^ associated item not found in `T` diff --git a/src/test/ui/issues/issue-38954.rs b/src/test/ui/issues/issue-38954.rs index 7f01ed3f82013..61df411b1f92b 100644 --- a/src/test/ui/issues/issue-38954.rs +++ b/src/test/ui/issues/issue-38954.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn _test(ref _p: str) {} //~^ ERROR the size for values of type diff --git a/src/test/ui/issues/issue-38954.stderr b/src/test/ui/issues/issue-38954.stderr index 9bc937b97c9a1..06093ecbc331b 100644 --- a/src/test/ui/issues/issue-38954.stderr +++ b/src/test/ui/issues/issue-38954.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `str` cannot be known at compilation time - --> $DIR/issue-38954.rs:11:23 + --> $DIR/issue-38954.rs:1:23 | LL | fn _test(ref _p: str) {} | ^ doesn't have a size known at compile-time diff --git a/src/test/ui/issues/issue-39211.rs b/src/test/ui/issues/issue-39211.rs index 96ba1c8399786..db101ae248cb6 100644 --- a/src/test/ui/issues/issue-39211.rs +++ b/src/test/ui/issues/issue-39211.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(associated_consts)] trait VecN { diff --git a/src/test/ui/issues/issue-39211.stderr b/src/test/ui/issues/issue-39211.stderr index 6859c6caeb04a..b9134445455af 100644 --- a/src/test/ui/issues/issue-39211.stderr +++ b/src/test/ui/issues/issue-39211.stderr @@ -1,5 +1,5 @@ error[E0220]: associated type `Row` not found for `M` - --> $DIR/issue-39211.rs:21:17 + --> $DIR/issue-39211.rs:11:17 | LL | let a = [3; M::Row::DIM]; //~ ERROR associated type `Row` not found for `M` | ^^^^^^^^^^^ associated type `Row` not found diff --git a/src/test/ui/issues/issue-39362.rs b/src/test/ui/issues/issue-39362.rs index 9d8abbfc65d07..ea3c8f88e0b36 100644 --- a/src/test/ui/issues/issue-39362.rs +++ b/src/test/ui/issues/issue-39362.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Foo { Bar { bar: Bar, id: usize } } diff --git a/src/test/ui/issues/issue-39362.stderr b/src/test/ui/issues/issue-39362.stderr index 3e613553deae2..06385127e94fe 100644 --- a/src/test/ui/issues/issue-39362.stderr +++ b/src/test/ui/issues/issue-39362.stderr @@ -1,5 +1,5 @@ error[E0004]: non-exhaustive patterns: `Bar { bar: C, .. }`, `Bar { bar: D, .. }`, `Bar { bar: E, .. }` and 1 more not covered - --> $DIR/issue-39362.rs:20:11 + --> $DIR/issue-39362.rs:10:11 | LL | match f { | ^ patterns `Bar { bar: C, .. }`, `Bar { bar: D, .. }`, `Bar { bar: E, .. }` and 1 more not covered diff --git a/src/test/ui/issues/issue-39388.rs b/src/test/ui/issues/issue-39388.rs index 15eef429eab97..e5b1cd93614bb 100644 --- a/src/test/ui/issues/issue-39388.rs +++ b/src/test/ui/issues/issue-39388.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_macros)] macro_rules! assign { diff --git a/src/test/ui/issues/issue-39388.stderr b/src/test/ui/issues/issue-39388.stderr index dc19487f3af65..00d6598aeaf2a 100644 --- a/src/test/ui/issues/issue-39388.stderr +++ b/src/test/ui/issues/issue-39388.stderr @@ -1,5 +1,5 @@ error: expected `*` or `+` - --> $DIR/issue-39388.rs:14:22 + --> $DIR/issue-39388.rs:4:22 | LL | (($($a:tt)*) = ($($b:tt))*) => { //~ ERROR expected `*` or `+` | ^^^^^^^ diff --git a/src/test/ui/issues/issue-39404.rs b/src/test/ui/issues/issue-39404.rs index 56bfe27a4ffd0..2229f2c3900c3 100644 --- a/src/test/ui/issues/issue-39404.rs +++ b/src/test/ui/issues/issue-39404.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused)] macro_rules! m { ($i) => {} } diff --git a/src/test/ui/issues/issue-39404.stderr b/src/test/ui/issues/issue-39404.stderr index 435a03c28583d..bffea49362a4d 100644 --- a/src/test/ui/issues/issue-39404.stderr +++ b/src/test/ui/issues/issue-39404.stderr @@ -1,5 +1,5 @@ error: missing fragment specifier - --> $DIR/issue-39404.rs:13:19 + --> $DIR/issue-39404.rs:3:19 | LL | macro_rules! m { ($i) => {} } | ^^ diff --git a/src/test/ui/issues/issue-39559-2.rs b/src/test/ui/issues/issue-39559-2.rs index f01fd1fd8f144..3a52e4d6216a5 100644 --- a/src/test/ui/issues/issue-39559-2.rs +++ b/src/test/ui/issues/issue-39559-2.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Dim { fn dim() -> usize; } diff --git a/src/test/ui/issues/issue-39559-2.stderr b/src/test/ui/issues/issue-39559-2.stderr index 91520a7ec0867..bbf74edfa7654 100644 --- a/src/test/ui/issues/issue-39559-2.stderr +++ b/src/test/ui/issues/issue-39559-2.stderr @@ -1,23 +1,23 @@ error[E0015]: calls in constants are limited to constant functions, tuple structs and tuple variants - --> $DIR/issue-39559-2.rs:24:24 + --> $DIR/issue-39559-2.rs:14:24 | LL | let array: [usize; Dim3::dim()] | ^^^^^^^^^^^ error[E0015]: calls in constants are limited to constant functions, tuple structs and tuple variants - --> $DIR/issue-39559-2.rs:27:15 + --> $DIR/issue-39559-2.rs:17:15 | LL | = [0; Dim3::dim()]; | ^^^^^^^^^^^ error[E0080]: could not evaluate repeat length - --> $DIR/issue-39559-2.rs:27:15 + --> $DIR/issue-39559-2.rs:17:15 | LL | = [0; Dim3::dim()]; | ^^^^^^^^^^^ calling non-const fn `::dim` error[E0080]: could not evaluate constant expression - --> $DIR/issue-39559-2.rs:24:16 + --> $DIR/issue-39559-2.rs:14:16 | LL | let array: [usize; Dim3::dim()] | ^^^^^^^^-----------^ diff --git a/src/test/ui/issues/issue-39559.rs b/src/test/ui/issues/issue-39559.rs index 2da21fb14bd3c..5af48ca4c0dbc 100644 --- a/src/test/ui/issues/issue-39559.rs +++ b/src/test/ui/issues/issue-39559.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Dim { fn dim() -> usize; } diff --git a/src/test/ui/issues/issue-39559.stderr b/src/test/ui/issues/issue-39559.stderr index 2ce6dfdbe44cd..7653cadc6a777 100644 --- a/src/test/ui/issues/issue-39559.stderr +++ b/src/test/ui/issues/issue-39559.stderr @@ -1,5 +1,5 @@ error[E0599]: no function or associated item named `dim` found for type `D` in the current scope - --> $DIR/issue-39559.rs:24:18 + --> $DIR/issue-39559.rs:14:18 | LL | entries: [T; D::dim()], | ^^^^^^ function or associated item not found in `D` diff --git a/src/test/ui/issues/issue-39616.rs b/src/test/ui/issues/issue-39616.rs index 13b4c0896e75c..3d8e28e5c2f52 100644 --- a/src/test/ui/issues/issue-39616.rs +++ b/src/test/ui/issues/issue-39616.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo(a: [0; 1]) {} //~ ERROR expected type, found `0` //~| ERROR expected one of `)`, `,`, `->`, `where`, or `{`, found `]` // FIXME(jseyfried): avoid emitting the second error (preexisting) diff --git a/src/test/ui/issues/issue-39616.stderr b/src/test/ui/issues/issue-39616.stderr index eebf47afb54c4..082c3a6853a14 100644 --- a/src/test/ui/issues/issue-39616.stderr +++ b/src/test/ui/issues/issue-39616.stderr @@ -1,11 +1,11 @@ error: expected type, found `0` - --> $DIR/issue-39616.rs:11:12 + --> $DIR/issue-39616.rs:1:12 | LL | fn foo(a: [0; 1]) {} //~ ERROR expected type, found `0` | ^ error: expected one of `)`, `,`, `->`, `where`, or `{`, found `]` - --> $DIR/issue-39616.rs:11:16 + --> $DIR/issue-39616.rs:1:16 | LL | fn foo(a: [0; 1]) {} //~ ERROR expected type, found `0` | ^ expected one of `)`, `,`, `->`, `where`, or `{` here diff --git a/src/test/ui/issues/issue-39687.rs b/src/test/ui/issues/issue-39687.rs index 404465e6a0fa7..cbb721fbb57c3 100644 --- a/src/test/ui/issues/issue-39687.rs +++ b/src/test/ui/issues/issue-39687.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(fn_traits)] fn main() { diff --git a/src/test/ui/issues/issue-39687.stderr b/src/test/ui/issues/issue-39687.stderr index 9f8d0910d87b7..886de1d6faffc 100644 --- a/src/test/ui/issues/issue-39687.stderr +++ b/src/test/ui/issues/issue-39687.stderr @@ -1,5 +1,5 @@ error[E0229]: associated type bindings are not allowed here - --> $DIR/issue-39687.rs:14:16 + --> $DIR/issue-39687.rs:4:16 | LL | ::call; | ^^ associated type not allowed here diff --git a/src/test/ui/issues/issue-3973.rs b/src/test/ui/issues/issue-3973.rs index 67a934fccce4e..4e00915683a2d 100644 --- a/src/test/ui/issues/issue-3973.rs +++ b/src/test/ui/issues/issue-3973.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Point { x: f64, y: f64, diff --git a/src/test/ui/issues/issue-3973.stderr b/src/test/ui/issues/issue-3973.stderr index 9be07614ec176..0f9c15647492e 100644 --- a/src/test/ui/issues/issue-3973.stderr +++ b/src/test/ui/issues/issue-3973.stderr @@ -1,5 +1,5 @@ error[E0407]: method `new` is not a member of trait `ToString_` - --> $DIR/issue-3973.rs:21:5 + --> $DIR/issue-3973.rs:11:5 | LL | / fn new(x: f64, y: f64) -> Point { LL | | //~^ ERROR method `new` is not a member of trait `ToString_` @@ -8,7 +8,7 @@ LL | | } | |_____^ not a member of trait `ToString_` error[E0599]: no function or associated item named `new` found for type `Point` in the current scope - --> $DIR/issue-3973.rs:32:13 + --> $DIR/issue-3973.rs:22:13 | LL | struct Point { | ------------ function or associated item `new` not found for this diff --git a/src/test/ui/issues/issue-39848.rs b/src/test/ui/issues/issue-39848.rs index d5ca009d310f7..5d1db7be85733 100644 --- a/src/test/ui/issues/issue-39848.rs +++ b/src/test/ui/issues/issue-39848.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! get_opt { ($tgt:expr, $field:ident) => { if $tgt.has_$field() {} diff --git a/src/test/ui/issues/issue-39848.stderr b/src/test/ui/issues/issue-39848.stderr index 9ca39dbaa3436..fe5fad59538f5 100644 --- a/src/test/ui/issues/issue-39848.stderr +++ b/src/test/ui/issues/issue-39848.stderr @@ -1,5 +1,5 @@ error: expected `{`, found `foo` - --> $DIR/issue-39848.rs:18:19 + --> $DIR/issue-39848.rs:8:19 | LL | if $tgt.has_$field() {} | -- - help: try placing this code inside a block: `{ foo(); }` diff --git a/src/test/ui/issues/issue-3993.rs b/src/test/ui/issues/issue-3993.rs index fae5eb5127237..9dea54ea779e1 100644 --- a/src/test/ui/issues/issue-3993.rs +++ b/src/test/ui/issues/issue-3993.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use zoo::fly; //~ ERROR: function `fly` is private mod zoo { diff --git a/src/test/ui/issues/issue-3993.stderr b/src/test/ui/issues/issue-3993.stderr index 4b569f2dea957..4a729c95c3358 100644 --- a/src/test/ui/issues/issue-3993.stderr +++ b/src/test/ui/issues/issue-3993.stderr @@ -1,5 +1,5 @@ error[E0603]: function `fly` is private - --> $DIR/issue-3993.rs:11:5 + --> $DIR/issue-3993.rs:1:5 | LL | use zoo::fly; //~ ERROR: function `fly` is private | ^^^^^^^^ diff --git a/src/test/ui/issues/issue-39970.rs b/src/test/ui/issues/issue-39970.rs index 65ea1baa4a126..f51e3b522e1c5 100644 --- a/src/test/ui/issues/issue-39970.rs +++ b/src/test/ui/issues/issue-39970.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Array<'a> { type Element: 'a; } diff --git a/src/test/ui/issues/issue-39970.stderr b/src/test/ui/issues/issue-39970.stderr index 397d7b8e650d2..e4f158706457c 100644 --- a/src/test/ui/issues/issue-39970.stderr +++ b/src/test/ui/issues/issue-39970.stderr @@ -1,5 +1,5 @@ error[E0271]: type mismatch resolving `for<'a> <() as Array<'a>>::Element == ()` - --> $DIR/issue-39970.rs:29:5 + --> $DIR/issue-39970.rs:19:5 | LL | <() as Visit>::visit(); | ^^^^^^^^^^^^^^^^^^^^ expected &(), found () @@ -8,7 +8,7 @@ LL | <() as Visit>::visit(); found type `()` = note: required because of the requirements on the impl of `Visit` for `()` note: required by `Visit::visit` - --> $DIR/issue-39970.rs:16:5 + --> $DIR/issue-39970.rs:6:5 | LL | fn visit() {} | ^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-39974.rs b/src/test/ui/issues/issue-39974.rs index 6f6b775a2a3c6..5c89a0dc0beb1 100644 --- a/src/test/ui/issues/issue-39974.rs +++ b/src/test/ui/issues/issue-39974.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const LENGTH: f64 = 2; struct Thing { diff --git a/src/test/ui/issues/issue-39974.stderr b/src/test/ui/issues/issue-39974.stderr index ddd149ccba83d..41bfb6dbb8542 100644 --- a/src/test/ui/issues/issue-39974.stderr +++ b/src/test/ui/issues/issue-39974.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-39974.rs:14:19 + --> $DIR/issue-39974.rs:4:19 | LL | f: [[f64; 2]; LENGTH], | ^^^^^^ expected usize, found f64 diff --git a/src/test/ui/issues/issue-40000.rs b/src/test/ui/issues/issue-40000.rs index 7daf4bcbaa44b..2d1e1d07a26ff 100644 --- a/src/test/ui/issues/issue-40000.rs +++ b/src/test/ui/issues/issue-40000.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let bar: fn(&mut u32) = |_| {}; diff --git a/src/test/ui/issues/issue-40000.stderr b/src/test/ui/issues/issue-40000.stderr index 26e52a7ecdbbc..3ff5870348109 100644 --- a/src/test/ui/issues/issue-40000.stderr +++ b/src/test/ui/issues/issue-40000.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-40000.rs:16:9 + --> $DIR/issue-40000.rs:6:9 | LL | foo(bar); //~ ERROR mismatched types | ^^^ expected concrete lifetime, found bound lifetime parameter diff --git a/src/test/ui/issues/issue-40288-2.nll.stderr b/src/test/ui/issues/issue-40288-2.nll.stderr index dcc9e0a8a65a5..c009a13127c59 100644 --- a/src/test/ui/issues/issue-40288-2.nll.stderr +++ b/src/test/ui/issues/issue-40288-2.nll.stderr @@ -1,41 +1,41 @@ warning: not reporting region error due to nll - --> $DIR/issue-40288-2.rs:17:20 + --> $DIR/issue-40288-2.rs:7:20 | LL | slice[0] = y; | ^ warning: not reporting region error due to nll - --> $DIR/issue-40288-2.rs:16:20 + --> $DIR/issue-40288-2.rs:6:20 | LL | let slice: &mut [_] = &mut out; | ^^^^^^^^ warning: not reporting region error due to nll - --> $DIR/issue-40288-2.rs:14:19 + --> $DIR/issue-40288-2.rs:4:19 | LL | let mut out = [x]; | ^^^ warning: not reporting region error due to nll - --> $DIR/issue-40288-2.rs:32:20 + --> $DIR/issue-40288-2.rs:22:20 | LL | dst.head = y; | ^ warning: not reporting region error due to nll - --> $DIR/issue-40288-2.rs:31:18 + --> $DIR/issue-40288-2.rs:21:18 | LL | let dst: &mut Struct<_, [()]> = &mut out; | ^^^^^^^^^^^^^^^^^^^^ warning: not reporting region error due to nll - --> $DIR/issue-40288-2.rs:29:19 + --> $DIR/issue-40288-2.rs:19:19 | LL | let mut out = Struct { head: x, _tail: [()] }; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0621]: explicit lifetime required in the type of `y` - --> $DIR/issue-40288-2.rs:17:9 + --> $DIR/issue-40288-2.rs:7:9 | LL | fn lifetime_transmute_slice<'a, T: ?Sized>(x: &'a T, y: &T) -> &'a T { | -- help: add explicit lifetime `'a` to the type of `y`: `&'a T` @@ -44,7 +44,7 @@ LL | slice[0] = y; | ^^^^^^^^^^^^ lifetime `'a` required error[E0621]: explicit lifetime required in the type of `y` - --> $DIR/issue-40288-2.rs:32:9 + --> $DIR/issue-40288-2.rs:22:9 | LL | fn lifetime_transmute_struct<'a, T: ?Sized>(x: &'a T, y: &T) -> &'a T { | -- help: add explicit lifetime `'a` to the type of `y`: `&'a T` diff --git a/src/test/ui/issues/issue-40288-2.rs b/src/test/ui/issues/issue-40288-2.rs index e16a7ecf6b908..b617713ee362b 100644 --- a/src/test/ui/issues/issue-40288-2.rs +++ b/src/test/ui/issues/issue-40288-2.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn prove_static(_: &'static T) {} fn lifetime_transmute_slice<'a, T: ?Sized>(x: &'a T, y: &T) -> &'a T { diff --git a/src/test/ui/issues/issue-40288-2.stderr b/src/test/ui/issues/issue-40288-2.stderr index fd0b4c01636d1..2c64856b08f8d 100644 --- a/src/test/ui/issues/issue-40288-2.stderr +++ b/src/test/ui/issues/issue-40288-2.stderr @@ -1,5 +1,5 @@ error[E0621]: explicit lifetime required in the type of `y` - --> $DIR/issue-40288-2.rs:19:5 + --> $DIR/issue-40288-2.rs:9:5 | LL | fn lifetime_transmute_slice<'a, T: ?Sized>(x: &'a T, y: &T) -> &'a T { | -- help: add explicit lifetime `'a` to the type of `y`: `&'a T` @@ -8,7 +8,7 @@ LL | out[0] | ^^^^^^ lifetime `'a` required error[E0621]: explicit lifetime required in the type of `y` - --> $DIR/issue-40288-2.rs:34:5 + --> $DIR/issue-40288-2.rs:24:5 | LL | fn lifetime_transmute_struct<'a, T: ?Sized>(x: &'a T, y: &T) -> &'a T { | -- help: add explicit lifetime `'a` to the type of `y`: `&'a T` diff --git a/src/test/ui/issues/issue-40288.nll.stderr b/src/test/ui/issues/issue-40288.nll.stderr index bd4efa10f3d51..bb4110948d54f 100644 --- a/src/test/ui/issues/issue-40288.nll.stderr +++ b/src/test/ui/issues/issue-40288.nll.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `*refr` because it is borrowed - --> $DIR/issue-40288.rs:26:5 + --> $DIR/issue-40288.rs:16:5 | LL | save_ref(&*refr, &mut out); | ------ borrow of `*refr` occurs here diff --git a/src/test/ui/issues/issue-40288.rs b/src/test/ui/issues/issue-40288.rs index b5418e85bec78..60204c1175476 100644 --- a/src/test/ui/issues/issue-40288.rs +++ b/src/test/ui/issues/issue-40288.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn save_ref<'a>(refr: &'a i32, to: &mut [&'a i32]) { for val in &mut *to { *val = refr; diff --git a/src/test/ui/issues/issue-40288.stderr b/src/test/ui/issues/issue-40288.stderr index e69c3bc83a646..2ac5964f5da7f 100644 --- a/src/test/ui/issues/issue-40288.stderr +++ b/src/test/ui/issues/issue-40288.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `*refr` because it is borrowed - --> $DIR/issue-40288.rs:26:5 + --> $DIR/issue-40288.rs:16:5 | LL | save_ref(&*refr, &mut out); | ----- borrow of `*refr` occurs here diff --git a/src/test/ui/issues/issue-40350.rs b/src/test/ui/issues/issue-40350.rs index 39249ee4718b1..6a5b83b135e39 100644 --- a/src/test/ui/issues/issue-40350.rs +++ b/src/test/ui/issues/issue-40350.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![allow(warnings)] diff --git a/src/test/ui/issues/issue-40350.stderr b/src/test/ui/issues/issue-40350.stderr index ad85bf2a77814..82b76261ad443 100644 --- a/src/test/ui/issues/issue-40350.stderr +++ b/src/test/ui/issues/issue-40350.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-40350.rs:22:1 + --> $DIR/issue-40350.rs:12:1 | LL | fn main() {} | ^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-40402-ref-hints/issue-40402-1.nll.stderr b/src/test/ui/issues/issue-40402-ref-hints/issue-40402-1.nll.stderr index 9020d3778c373..a4847568ba0cb 100644 --- a/src/test/ui/issues/issue-40402-ref-hints/issue-40402-1.nll.stderr +++ b/src/test/ui/issues/issue-40402-ref-hints/issue-40402-1.nll.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/issue-40402-1.rs:19:13 + --> $DIR/issue-40402-1.rs:9:13 | LL | let e = f.v[0]; //~ ERROR cannot move out of indexed content | ^^^^^^ diff --git a/src/test/ui/issues/issue-40402-ref-hints/issue-40402-1.rs b/src/test/ui/issues/issue-40402-ref-hints/issue-40402-1.rs index f2de2030bd196..6bb0b6f1cfb04 100644 --- a/src/test/ui/issues/issue-40402-ref-hints/issue-40402-1.rs +++ b/src/test/ui/issues/issue-40402-ref-hints/issue-40402-1.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we do not suggest `ref f` here in the `main()` function. struct Foo { pub v: Vec, diff --git a/src/test/ui/issues/issue-40402-ref-hints/issue-40402-1.stderr b/src/test/ui/issues/issue-40402-ref-hints/issue-40402-1.stderr index 70be30e4f71d9..87b98bbcedb6a 100644 --- a/src/test/ui/issues/issue-40402-ref-hints/issue-40402-1.stderr +++ b/src/test/ui/issues/issue-40402-ref-hints/issue-40402-1.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of indexed content - --> $DIR/issue-40402-1.rs:19:13 + --> $DIR/issue-40402-1.rs:9:13 | LL | let e = f.v[0]; //~ ERROR cannot move out of indexed content | ^^^^^^ diff --git a/src/test/ui/issues/issue-40402-ref-hints/issue-40402-2.nll.stderr b/src/test/ui/issues/issue-40402-ref-hints/issue-40402-2.nll.stderr index a80e9a5fe091f..5c23021ee2c87 100644 --- a/src/test/ui/issues/issue-40402-ref-hints/issue-40402-2.nll.stderr +++ b/src/test/ui/issues/issue-40402-ref-hints/issue-40402-2.nll.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/issue-40402-2.rs:15:18 + --> $DIR/issue-40402-2.rs:5:18 | LL | let (a, b) = x[0]; //~ ERROR cannot move out of indexed content | - - ^^^^ @@ -10,7 +10,7 @@ LL | let (a, b) = x[0]; //~ ERROR cannot move out of indexed content | data moved here | note: move occurs because these variables have types that don't implement the `Copy` trait - --> $DIR/issue-40402-2.rs:15:10 + --> $DIR/issue-40402-2.rs:5:10 | LL | let (a, b) = x[0]; //~ ERROR cannot move out of indexed content | ^ ^ diff --git a/src/test/ui/issues/issue-40402-ref-hints/issue-40402-2.rs b/src/test/ui/issues/issue-40402-ref-hints/issue-40402-2.rs index 894923605c024..0b8f40c5eff7f 100644 --- a/src/test/ui/issues/issue-40402-ref-hints/issue-40402-2.rs +++ b/src/test/ui/issues/issue-40402-ref-hints/issue-40402-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we do suggest `(ref a, ref b)` here, since `a` and `b` // are nested within a pattern fn main() { diff --git a/src/test/ui/issues/issue-40402-ref-hints/issue-40402-2.stderr b/src/test/ui/issues/issue-40402-ref-hints/issue-40402-2.stderr index 4ed28963b5b9f..d64cd96e959ff 100644 --- a/src/test/ui/issues/issue-40402-ref-hints/issue-40402-2.stderr +++ b/src/test/ui/issues/issue-40402-ref-hints/issue-40402-2.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of indexed content - --> $DIR/issue-40402-2.rs:15:18 + --> $DIR/issue-40402-2.rs:5:18 | LL | let (a, b) = x[0]; //~ ERROR cannot move out of indexed content | - - ^^^^ cannot move out of indexed content diff --git a/src/test/ui/issues/issue-40510-1.nll.stderr b/src/test/ui/issues/issue-40510-1.nll.stderr index 3a579c04de176..00ca90ad54d6c 100644 --- a/src/test/ui/issues/issue-40510-1.nll.stderr +++ b/src/test/ui/issues/issue-40510-1.nll.stderr @@ -1,5 +1,5 @@ error: unsatisfied lifetime constraints - --> $DIR/issue-40510-1.rs:18:9 + --> $DIR/issue-40510-1.rs:8:9 | LL | || { | -- diff --git a/src/test/ui/issues/issue-40510-1.rs b/src/test/ui/issues/issue-40510-1.rs index 142092ff41eb3..d607c805ec9e1 100644 --- a/src/test/ui/issues/issue-40510-1.rs +++ b/src/test/ui/issues/issue-40510-1.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![allow(unused)] diff --git a/src/test/ui/issues/issue-40510-1.stderr b/src/test/ui/issues/issue-40510-1.stderr index 1f5a41fce9688..68d5084233558 100644 --- a/src/test/ui/issues/issue-40510-1.stderr +++ b/src/test/ui/issues/issue-40510-1.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-40510-1.rs:23:1 + --> $DIR/issue-40510-1.rs:13:1 | LL | fn main() {} //~ ERROR compilation successful | ^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-40510-2.rs b/src/test/ui/issues/issue-40510-2.rs index 0fe5658482263..e6d19632371a2 100644 --- a/src/test/ui/issues/issue-40510-2.rs +++ b/src/test/ui/issues/issue-40510-2.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![allow(unused)] diff --git a/src/test/ui/issues/issue-40510-2.stderr b/src/test/ui/issues/issue-40510-2.stderr index 03998af50c2d3..cea928a307dfc 100644 --- a/src/test/ui/issues/issue-40510-2.stderr +++ b/src/test/ui/issues/issue-40510-2.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-40510-2.rs:23:1 + --> $DIR/issue-40510-2.rs:13:1 | LL | fn main() {} //~ ERROR compilation successful | ^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-40510-3.nll.stderr b/src/test/ui/issues/issue-40510-3.nll.stderr index 84ab2a8216deb..ec49b3113eef3 100644 --- a/src/test/ui/issues/issue-40510-3.nll.stderr +++ b/src/test/ui/issues/issue-40510-3.nll.stderr @@ -1,10 +1,10 @@ error: unsatisfied lifetime constraints - --> $DIR/issue-40510-3.rs:18:9 + --> $DIR/issue-40510-3.rs:8:9 | LL | || { | -- | || - | |return type of closure is [closure@$DIR/issue-40510-3.rs:18:9: 20:10 x:&'2 mut std::vec::Vec<()>] + | |return type of closure is [closure@$DIR/issue-40510-3.rs:8:9: 10:10 x:&'2 mut std::vec::Vec<()>] | lifetime `'1` represents this closure's body LL | / || { LL | | x.push(()) diff --git a/src/test/ui/issues/issue-40510-3.rs b/src/test/ui/issues/issue-40510-3.rs index afa8f15ee570a..0cf09dd19753a 100644 --- a/src/test/ui/issues/issue-40510-3.rs +++ b/src/test/ui/issues/issue-40510-3.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![allow(unused)] diff --git a/src/test/ui/issues/issue-40510-3.stderr b/src/test/ui/issues/issue-40510-3.stderr index c77b5cc830365..3d263cf0977c0 100644 --- a/src/test/ui/issues/issue-40510-3.stderr +++ b/src/test/ui/issues/issue-40510-3.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-40510-3.rs:25:1 + --> $DIR/issue-40510-3.rs:15:1 | LL | fn main() {} //~ ERROR compilation successful | ^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-40510-4.rs b/src/test/ui/issues/issue-40510-4.rs index a39c500225b9b..65e026181168b 100644 --- a/src/test/ui/issues/issue-40510-4.rs +++ b/src/test/ui/issues/issue-40510-4.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![allow(unused)] diff --git a/src/test/ui/issues/issue-40510-4.stderr b/src/test/ui/issues/issue-40510-4.stderr index 1f3cd00fb483b..7710ffa2259d5 100644 --- a/src/test/ui/issues/issue-40510-4.stderr +++ b/src/test/ui/issues/issue-40510-4.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-40510-4.rs:25:1 + --> $DIR/issue-40510-4.rs:15:1 | LL | fn main() {} //~ ERROR compilation successful | ^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-40610.rs b/src/test/ui/issues/issue-40610.rs index aec20b4ad87b7..104cf7f54e5f3 100644 --- a/src/test/ui/issues/issue-40610.rs +++ b/src/test/ui/issues/issue-40610.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn f(_: &[f32]) {} fn main() { diff --git a/src/test/ui/issues/issue-40610.stderr b/src/test/ui/issues/issue-40610.stderr index faf1a4d1c3866..f441d65b91e43 100644 --- a/src/test/ui/issues/issue-40610.stderr +++ b/src/test/ui/issues/issue-40610.stderr @@ -1,5 +1,5 @@ error[E0369]: binary operation `+` cannot be applied to type `()` - --> $DIR/issue-40610.rs:14:5 + --> $DIR/issue-40610.rs:4:5 | LL | () + f(&[1.0]); | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-40749.rs b/src/test/ui/issues/issue-40749.rs index 261ed49d10c1e..14908c3653e28 100644 --- a/src/test/ui/issues/issue-40749.rs +++ b/src/test/ui/issues/issue-40749.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { [0; ..10]; //~^ ERROR mismatched types diff --git a/src/test/ui/issues/issue-40749.stderr b/src/test/ui/issues/issue-40749.stderr index b76d469d116f8..be050d4470c0f 100644 --- a/src/test/ui/issues/issue-40749.stderr +++ b/src/test/ui/issues/issue-40749.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-40749.rs:12:9 + --> $DIR/issue-40749.rs:2:9 | LL | [0; ..10]; | ^^^^ expected usize, found struct `std::ops::RangeTo` diff --git a/src/test/ui/issues/issue-40782.rs b/src/test/ui/issues/issue-40782.rs index 10dc177c7e95d..55fec04e0e01a 100644 --- a/src/test/ui/issues/issue-40782.rs +++ b/src/test/ui/issues/issue-40782.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { for i 0..2 { //~ ERROR missing `in` } diff --git a/src/test/ui/issues/issue-40782.stderr b/src/test/ui/issues/issue-40782.stderr index bd646d7ce8c3a..03f051adc6e32 100644 --- a/src/test/ui/issues/issue-40782.stderr +++ b/src/test/ui/issues/issue-40782.stderr @@ -1,5 +1,5 @@ error: missing `in` in `for` loop - --> $DIR/issue-40782.rs:12:10 + --> $DIR/issue-40782.rs:2:10 | LL | for i 0..2 { //~ ERROR missing `in` | ^ help: try adding `in` here diff --git a/src/test/ui/issues/issue-40845.rs b/src/test/ui/issues/issue-40845.rs index c5604a0427b2a..c9102f4417c17 100644 --- a/src/test/ui/issues/issue-40845.rs +++ b/src/test/ui/issues/issue-40845.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait T { m!(); } //~ ERROR cannot find macro `m!` in this scope struct S; diff --git a/src/test/ui/issues/issue-40845.stderr b/src/test/ui/issues/issue-40845.stderr index 2e8f008a52dd7..a8d75025279de 100644 --- a/src/test/ui/issues/issue-40845.stderr +++ b/src/test/ui/issues/issue-40845.stderr @@ -1,11 +1,11 @@ error: cannot find macro `m!` in this scope - --> $DIR/issue-40845.rs:14:10 + --> $DIR/issue-40845.rs:4:10 | LL | impl S { m!(); } //~ ERROR cannot find macro `m!` in this scope | ^ error: cannot find macro `m!` in this scope - --> $DIR/issue-40845.rs:11:11 + --> $DIR/issue-40845.rs:1:11 | LL | trait T { m!(); } //~ ERROR cannot find macro `m!` in this scope | ^ diff --git a/src/test/ui/issues/issue-40861.rs b/src/test/ui/issues/issue-40861.rs index 75d58c58538da..d8a8384a544f8 100644 --- a/src/test/ui/issues/issue-40861.rs +++ b/src/test/ui/issues/issue-40861.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn f(_: &[f32]) {} fn main() { diff --git a/src/test/ui/issues/issue-40861.stderr b/src/test/ui/issues/issue-40861.stderr index dbde40fb25e06..fd417116310bc 100644 --- a/src/test/ui/issues/issue-40861.stderr +++ b/src/test/ui/issues/issue-40861.stderr @@ -1,5 +1,5 @@ error[E0608]: cannot index into a value of type `()` - --> $DIR/issue-40861.rs:14:5 + --> $DIR/issue-40861.rs:4:5 | LL | ()[f(&[1.0])]; | ^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-41139.nll.stderr b/src/test/ui/issues/issue-41139.nll.stderr index 3f79c66252a0b..4dd017b0a9191 100644 --- a/src/test/ui/issues/issue-41139.nll.stderr +++ b/src/test/ui/issues/issue-41139.nll.stderr @@ -1,5 +1,5 @@ error[E0161]: cannot move a value of type dyn Trait: the size of dyn Trait cannot be statically determined - --> $DIR/issue-41139.rs:16:23 + --> $DIR/issue-41139.rs:6:23 | LL | let t : &Trait = &get_function()(); | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-41139.rs b/src/test/ui/issues/issue-41139.rs index 0509a4387bae4..0bfbea11b0e08 100644 --- a/src/test/ui/issues/issue-41139.rs +++ b/src/test/ui/issues/issue-41139.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Trait {} fn get_function<'a>() -> &'a Fn() -> Trait { panic!("") } diff --git a/src/test/ui/issues/issue-41139.stderr b/src/test/ui/issues/issue-41139.stderr index 9d0e19df3f28e..3e3de7b7cf12d 100644 --- a/src/test/ui/issues/issue-41139.stderr +++ b/src/test/ui/issues/issue-41139.stderr @@ -1,5 +1,5 @@ error[E0161]: cannot move a value of type (dyn Trait + 'static): the size of (dyn Trait + 'static) cannot be statically determined - --> $DIR/issue-41139.rs:16:23 + --> $DIR/issue-41139.rs:6:23 | LL | let t : &Trait = &get_function()(); | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-41229-ref-str.rs b/src/test/ui/issues/issue-41229-ref-str.rs index 5d7546e1bc4b3..fe5e6cd6ec5b1 100644 --- a/src/test/ui/issues/issue-41229-ref-str.rs +++ b/src/test/ui/issues/issue-41229-ref-str.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn example(ref s: str) {} //~^ ERROR the size for values of type diff --git a/src/test/ui/issues/issue-41229-ref-str.stderr b/src/test/ui/issues/issue-41229-ref-str.stderr index e4a34fdaf48a4..c4fe54e78ed95 100644 --- a/src/test/ui/issues/issue-41229-ref-str.stderr +++ b/src/test/ui/issues/issue-41229-ref-str.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `str` cannot be known at compilation time - --> $DIR/issue-41229-ref-str.rs:11:28 + --> $DIR/issue-41229-ref-str.rs:1:28 | LL | pub fn example(ref s: str) {} | ^ doesn't have a size known at compile-time diff --git a/src/test/ui/issues/issue-41255.rs b/src/test/ui/issues/issue-41255.rs index 29912de37eb0e..395ab8601bcc5 100644 --- a/src/test/ui/issues/issue-41255.rs +++ b/src/test/ui/issues/issue-41255.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Matching against float literals should result in a linter error #![feature(exclusive_range_pattern)] diff --git a/src/test/ui/issues/issue-41255.stderr b/src/test/ui/issues/issue-41255.stderr index 03100b6db769a..05e930de27af8 100644 --- a/src/test/ui/issues/issue-41255.stderr +++ b/src/test/ui/issues/issue-41255.stderr @@ -1,11 +1,11 @@ error: floating-point types cannot be used in patterns - --> $DIR/issue-41255.rs:20:9 + --> $DIR/issue-41255.rs:10:9 | LL | 5.0 => {}, //~ ERROR floating-point types cannot be used in patterns | ^^^ | note: lint level defined here - --> $DIR/issue-41255.rs:15:11 + --> $DIR/issue-41255.rs:5:11 | LL | #![forbid(illegal_floating_point_literal_pattern)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -13,7 +13,7 @@ LL | #![forbid(illegal_floating_point_literal_pattern)] = note: for more information, see issue #41620 error: floating-point types cannot be used in patterns - --> $DIR/issue-41255.rs:22:9 + --> $DIR/issue-41255.rs:12:9 | LL | 5.0f32 => {}, //~ ERROR floating-point types cannot be used in patterns | ^^^^^^ @@ -22,7 +22,7 @@ LL | 5.0f32 => {}, //~ ERROR floating-point types cannot be used in patt = note: for more information, see issue #41620 error: floating-point types cannot be used in patterns - --> $DIR/issue-41255.rs:24:10 + --> $DIR/issue-41255.rs:14:10 | LL | -5.0 => {}, //~ ERROR floating-point types cannot be used in patterns | ^^^ @@ -31,7 +31,7 @@ LL | -5.0 => {}, //~ ERROR floating-point types cannot be used in patter = note: for more information, see issue #41620 error: floating-point types cannot be used in patterns - --> $DIR/issue-41255.rs:26:9 + --> $DIR/issue-41255.rs:16:9 | LL | 1.0 .. 33.0 => {}, //~ ERROR floating-point types cannot be used in patterns | ^^^ @@ -40,7 +40,7 @@ LL | 1.0 .. 33.0 => {}, //~ ERROR floating-point types cannot be used in = note: for more information, see issue #41620 error: floating-point types cannot be used in patterns - --> $DIR/issue-41255.rs:26:16 + --> $DIR/issue-41255.rs:16:16 | LL | 1.0 .. 33.0 => {}, //~ ERROR floating-point types cannot be used in patterns | ^^^^ @@ -49,7 +49,7 @@ LL | 1.0 .. 33.0 => {}, //~ ERROR floating-point types cannot be used in = note: for more information, see issue #41620 error: floating-point types cannot be used in patterns - --> $DIR/issue-41255.rs:30:9 + --> $DIR/issue-41255.rs:20:9 | LL | 39.0 ..= 70.0 => {}, //~ ERROR floating-point types cannot be used in patterns | ^^^^ @@ -58,7 +58,7 @@ LL | 39.0 ..= 70.0 => {}, //~ ERROR floating-point types cannot be used = note: for more information, see issue #41620 error: floating-point types cannot be used in patterns - --> $DIR/issue-41255.rs:30:18 + --> $DIR/issue-41255.rs:20:18 | LL | 39.0 ..= 70.0 => {}, //~ ERROR floating-point types cannot be used in patterns | ^^^^ @@ -67,7 +67,7 @@ LL | 39.0 ..= 70.0 => {}, //~ ERROR floating-point types cannot be used = note: for more information, see issue #41620 error: floating-point types cannot be used in patterns - --> $DIR/issue-41255.rs:39:10 + --> $DIR/issue-41255.rs:29:10 | LL | (3.14, 1) => {}, //~ ERROR floating-point types cannot be used | ^^^^ @@ -76,7 +76,7 @@ LL | (3.14, 1) => {}, //~ ERROR floating-point types cannot be used = note: for more information, see issue #41620 error: floating-point types cannot be used in patterns - --> $DIR/issue-41255.rs:46:18 + --> $DIR/issue-41255.rs:36:18 | LL | Foo { x: 2.0 } => {}, //~ ERROR floating-point types cannot be used | ^^^ diff --git a/src/test/ui/issues/issue-41394.rs b/src/test/ui/issues/issue-41394.rs index 89f11edaec862..92688d5b7d060 100644 --- a/src/test/ui/issues/issue-41394.rs +++ b/src/test/ui/issues/issue-41394.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Foo { A = "" + 1 //~^ ERROR binary operation `+` cannot be applied to type `&str` diff --git a/src/test/ui/issues/issue-41394.stderr b/src/test/ui/issues/issue-41394.stderr index 9e4afb3b28ac1..f4106b6c77ad4 100644 --- a/src/test/ui/issues/issue-41394.stderr +++ b/src/test/ui/issues/issue-41394.stderr @@ -1,5 +1,5 @@ error[E0369]: binary operation `+` cannot be applied to type `&str` - --> $DIR/issue-41394.rs:12:9 + --> $DIR/issue-41394.rs:2:9 | LL | A = "" + 1 | ^^^^^^ diff --git a/src/test/ui/issues/issue-41549.rs b/src/test/ui/issues/issue-41549.rs index 67be194c8ed2a..ff30caacc9cd2 100644 --- a/src/test/ui/issues/issue-41549.rs +++ b/src/test/ui/issues/issue-41549.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_41549.rs diff --git a/src/test/ui/issues/issue-41549.stderr b/src/test/ui/issues/issue-41549.stderr index e5362727d9411..b144387ac44bc 100644 --- a/src/test/ui/issues/issue-41549.stderr +++ b/src/test/ui/issues/issue-41549.stderr @@ -1,5 +1,5 @@ error[E0326]: implemented const `CONST` has an incompatible type for trait - --> $DIR/issue-41549.rs:19:18 + --> $DIR/issue-41549.rs:9:18 | LL | const CONST: () = (); //~ ERROR incompatible type for trait | ^^ expected u32, found () diff --git a/src/test/ui/issues/issue-41652/auxiliary/issue_41652_b.rs b/src/test/ui/issues/issue-41652/auxiliary/issue_41652_b.rs index 0b714432f1615..2ce21b0366ee6 100644 --- a/src/test/ui/issues/issue-41652/auxiliary/issue_41652_b.rs +++ b/src/test/ui/issues/issue-41652/auxiliary/issue_41652_b.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Tr { // Note: The function needs to be declared over multiple lines to reproduce // the crash. DO NOT reformat. diff --git a/src/test/ui/issues/issue-41652/issue_41652.rs b/src/test/ui/issues/issue-41652/issue_41652.rs index a4e92820e21e5..1348f12b08392 100644 --- a/src/test/ui/issues/issue-41652/issue_41652.rs +++ b/src/test/ui/issues/issue-41652/issue_41652.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_41652_b.rs extern crate issue_41652_b; diff --git a/src/test/ui/issues/issue-41652/issue_41652.stderr b/src/test/ui/issues/issue-41652/issue_41652.stderr index 3f76b25692cf1..d4584dc9cd577 100644 --- a/src/test/ui/issues/issue-41652/issue_41652.stderr +++ b/src/test/ui/issues/issue-41652/issue_41652.stderr @@ -1,5 +1,5 @@ error[E0689]: can't call method `f` on ambiguous numeric type `{integer}` - --> $DIR/issue_41652.rs:19:11 + --> $DIR/issue_41652.rs:9:11 | LL | 3.f() | ^ diff --git a/src/test/ui/issues/issue-41726.nll.stderr b/src/test/ui/issues/issue-41726.nll.stderr index 06ff743a0f5ed..7c01378872f83 100644 --- a/src/test/ui/issues/issue-41726.nll.stderr +++ b/src/test/ui/issues/issue-41726.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow data in a `&` reference as mutable - --> $DIR/issue-41726.rs:15:9 + --> $DIR/issue-41726.rs:5:9 | LL | things[src.as_str()].sort(); //~ ERROR cannot borrow immutable | ^^^^^^^^^^^^^^^^^^^^ cannot borrow as mutable diff --git a/src/test/ui/issues/issue-41726.rs b/src/test/ui/issues/issue-41726.rs index c8cd9209bceb4..41dcaa8e280b8 100644 --- a/src/test/ui/issues/issue-41726.rs +++ b/src/test/ui/issues/issue-41726.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::HashMap; fn main() { let things: HashMap> = HashMap::new(); diff --git a/src/test/ui/issues/issue-41726.stderr b/src/test/ui/issues/issue-41726.stderr index c79196e014042..e6b92dc9dfeaf 100644 --- a/src/test/ui/issues/issue-41726.stderr +++ b/src/test/ui/issues/issue-41726.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow immutable indexed content as mutable - --> $DIR/issue-41726.rs:15:9 + --> $DIR/issue-41726.rs:5:9 | LL | things[src.as_str()].sort(); //~ ERROR cannot borrow immutable | ^^^^^^^^^^^^^^^^^^^^ cannot borrow as mutable diff --git a/src/test/ui/issues/issue-41742.rs b/src/test/ui/issues/issue-41742.rs index 067531e036ad8..afe311b4d1785 100644 --- a/src/test/ui/issues/issue-41742.rs +++ b/src/test/ui/issues/issue-41742.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::{Index, IndexMut}; struct S; diff --git a/src/test/ui/issues/issue-41742.stderr b/src/test/ui/issues/issue-41742.stderr index 314b44f603acd..03a9710f67975 100644 --- a/src/test/ui/issues/issue-41742.stderr +++ b/src/test/ui/issues/issue-41742.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-41742.rs:34:7 + --> $DIR/issue-41742.rs:24:7 | LL | H["?"].f(); //~ ERROR mismatched types | ^^^ expected u32, found reference diff --git a/src/test/ui/issues/issue-41776.rs b/src/test/ui/issues/issue-41776.rs index 5f108e0a1ed81..24696d86d0fae 100644 --- a/src/test/ui/issues/issue-41776.rs +++ b/src/test/ui/issues/issue-41776.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { include!(line!()); //~ ERROR argument must be a string literal } diff --git a/src/test/ui/issues/issue-41776.stderr b/src/test/ui/issues/issue-41776.stderr index 9742f091f04a9..1806f68f14aee 100644 --- a/src/test/ui/issues/issue-41776.stderr +++ b/src/test/ui/issues/issue-41776.stderr @@ -1,5 +1,5 @@ error: argument must be a string literal - --> $DIR/issue-41776.rs:12:14 + --> $DIR/issue-41776.rs:2:14 | LL | include!(line!()); //~ ERROR argument must be a string literal | ^^^^^^^ diff --git a/src/test/ui/issues/issue-41880.rs b/src/test/ui/issues/issue-41880.rs index 23a2b78a76908..16facc5a78f8d 100644 --- a/src/test/ui/issues/issue-41880.rs +++ b/src/test/ui/issues/issue-41880.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn iterate(initial: T, f: F) -> Iterate { Iterate { state: initial, diff --git a/src/test/ui/issues/issue-41880.stderr b/src/test/ui/issues/issue-41880.stderr index fa9fdbd81940e..359a2340240a7 100644 --- a/src/test/ui/issues/issue-41880.stderr +++ b/src/test/ui/issues/issue-41880.stderr @@ -1,5 +1,5 @@ -error[E0599]: no method named `iter` found for type `Iterate<{integer}, [closure@$DIR/issue-41880.rs:36:24: 36:31]>` in the current scope - --> $DIR/issue-41880.rs:37:24 +error[E0599]: no method named `iter` found for type `Iterate<{integer}, [closure@$DIR/issue-41880.rs:26:24: 26:31]>` in the current scope + --> $DIR/issue-41880.rs:27:24 | LL | pub struct Iterate { | ------------------------ method `iter` not found for this diff --git a/src/test/ui/issues/issue-41974.rs b/src/test/ui/issues/issue-41974.rs index 5c9077783c794..7875b432d7be4 100644 --- a/src/test/ui/issues/issue-41974.rs +++ b/src/test/ui/issues/issue-41974.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Copy, Clone)] struct Flags; diff --git a/src/test/ui/issues/issue-41974.stderr b/src/test/ui/issues/issue-41974.stderr index eca40ed43557d..27ddc86616522 100644 --- a/src/test/ui/issues/issue-41974.stderr +++ b/src/test/ui/issues/issue-41974.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `std::ops::Drop` for type `std::boxed::Box<_>`: - --> $DIR/issue-41974.rs:17:1 + --> $DIR/issue-41974.rs:7:1 | LL | impl Drop for T where T: A { //~ ERROR E0119 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -10,13 +10,13 @@ LL | impl Drop for T where T: A { //~ ERROR E0119 = note: downstream crates may implement trait `A` for type `std::boxed::Box<_>` error[E0120]: the Drop trait may only be implemented on structures - --> $DIR/issue-41974.rs:17:18 + --> $DIR/issue-41974.rs:7:18 | LL | impl Drop for T where T: A { //~ ERROR E0119 | ^ implementing Drop requires a struct error[E0210]: type parameter `T` must be used as the type parameter for some local type (e.g. `MyStruct`) - --> $DIR/issue-41974.rs:17:1 + --> $DIR/issue-41974.rs:7:1 | LL | impl Drop for T where T: A { //~ ERROR E0119 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type parameter `T` must be used as the type parameter for some local type diff --git a/src/test/ui/issues/issue-41998.rs b/src/test/ui/issues/issue-41998.rs index 406aadcd2129d..a330e76d33957 100644 --- a/src/test/ui/issues/issue-41998.rs +++ b/src/test/ui/issues/issue-41998.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #[rustc_error] diff --git a/src/test/ui/issues/issue-41998.stderr b/src/test/ui/issues/issue-41998.stderr index e757c7f3a4463..2be37c54ce9ab 100644 --- a/src/test/ui/issues/issue-41998.stderr +++ b/src/test/ui/issues/issue-41998.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-41998.rs:14:1 + --> $DIR/issue-41998.rs:4:1 | LL | / fn main() { //~ ERROR compilation successful LL | | if ('x' as char) < ('y' as char) { diff --git a/src/test/ui/issues/issue-4201.rs b/src/test/ui/issues/issue-4201.rs index b1f668d9c5e21..c9098c843f92f 100644 --- a/src/test/ui/issues/issue-4201.rs +++ b/src/test/ui/issues/issue-4201.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let a = if true { 0 diff --git a/src/test/ui/issues/issue-4201.stderr b/src/test/ui/issues/issue-4201.stderr index 40de077ce764f..ebeb870183e45 100644 --- a/src/test/ui/issues/issue-4201.stderr +++ b/src/test/ui/issues/issue-4201.stderr @@ -1,5 +1,5 @@ error[E0317]: if may be missing an else clause - --> $DIR/issue-4201.rs:14:12 + --> $DIR/issue-4201.rs:4:12 | LL | } else if false { | ____________^ diff --git a/src/test/ui/issues/issue-42060.rs b/src/test/ui/issues/issue-42060.rs index 23df42d03c4e0..da7c03032eb87 100644 --- a/src/test/ui/issues/issue-42060.rs +++ b/src/test/ui/issues/issue-42060.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let thing = (); let other: typeof(thing) = thing; //~ ERROR attempt to use a non-constant value in a constant diff --git a/src/test/ui/issues/issue-42060.stderr b/src/test/ui/issues/issue-42060.stderr index 69abac8ee7e3a..cad2bb2a67be5 100644 --- a/src/test/ui/issues/issue-42060.stderr +++ b/src/test/ui/issues/issue-42060.stderr @@ -1,23 +1,23 @@ error[E0435]: attempt to use a non-constant value in a constant - --> $DIR/issue-42060.rs:13:23 + --> $DIR/issue-42060.rs:3:23 | LL | let other: typeof(thing) = thing; //~ ERROR attempt to use a non-constant value in a constant | ^^^^^ non-constant value error[E0435]: attempt to use a non-constant value in a constant - --> $DIR/issue-42060.rs:19:13 + --> $DIR/issue-42060.rs:9:13 | LL | ::N //~ ERROR attempt to use a non-constant value in a constant | ^ non-constant value error[E0516]: `typeof` is a reserved keyword but unimplemented - --> $DIR/issue-42060.rs:13:16 + --> $DIR/issue-42060.rs:3:16 | LL | let other: typeof(thing) = thing; //~ ERROR attempt to use a non-constant value in a constant | ^^^^^^^^^^^^^ reserved keyword error[E0516]: `typeof` is a reserved keyword but unimplemented - --> $DIR/issue-42060.rs:19:6 + --> $DIR/issue-42060.rs:9:6 | LL | ::N //~ ERROR attempt to use a non-constant value in a constant | ^^^^^^^^^ reserved keyword diff --git a/src/test/ui/issues/issue-42106.nll.stderr b/src/test/ui/issues/issue-42106.nll.stderr index 39e3c218f4089..82e5a5f58f378 100644 --- a/src/test/ui/issues/issue-42106.nll.stderr +++ b/src/test/ui/issues/issue-42106.nll.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `*collection` as mutable because it is also borrowed as immutable - --> $DIR/issue-42106.rs:13:5 + --> $DIR/issue-42106.rs:3:5 | LL | let _a = &collection; | ----------- immutable borrow occurs here diff --git a/src/test/ui/issues/issue-42106.rs b/src/test/ui/issues/issue-42106.rs index b177a14af333c..5e688693bf9ed 100644 --- a/src/test/ui/issues/issue-42106.rs +++ b/src/test/ui/issues/issue-42106.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn do_something(collection: &mut Vec) { let _a = &collection; collection.swap(1, 2); //~ ERROR also borrowed as immutable diff --git a/src/test/ui/issues/issue-42106.stderr b/src/test/ui/issues/issue-42106.stderr index d77ff315ce7fc..e1018a89d2091 100644 --- a/src/test/ui/issues/issue-42106.stderr +++ b/src/test/ui/issues/issue-42106.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `*collection` as mutable because `collection` is also borrowed as immutable - --> $DIR/issue-42106.rs:13:5 + --> $DIR/issue-42106.rs:3:5 | LL | let _a = &collection; | ---------- immutable borrow occurs here diff --git a/src/test/ui/issues/issue-42312.rs b/src/test/ui/issues/issue-42312.rs index f7705297dfdba..b1c651f665b72 100644 --- a/src/test/ui/issues/issue-42312.rs +++ b/src/test/ui/issues/issue-42312.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::Deref; pub trait Foo { diff --git a/src/test/ui/issues/issue-42312.stderr b/src/test/ui/issues/issue-42312.stderr index 912d791b6bc3a..12a436639dddf 100644 --- a/src/test/ui/issues/issue-42312.stderr +++ b/src/test/ui/issues/issue-42312.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `::Target` cannot be known at compilation time - --> $DIR/issue-42312.rs:14:29 + --> $DIR/issue-42312.rs:4:29 | LL | fn baz(_: Self::Target) where Self: Deref {} | ^ doesn't have a size known at compile-time @@ -11,7 +11,7 @@ LL | fn baz(_: Self::Target) where Self: Deref {} = help: unsized locals are gated as an unstable feature error[E0277]: the size for values of type `(dyn std::string::ToString + 'static)` cannot be known at compilation time - --> $DIR/issue-42312.rs:18:23 + --> $DIR/issue-42312.rs:8:23 | LL | pub fn f(_: ToString) {} | ^ doesn't have a size known at compile-time diff --git a/src/test/ui/issues/issue-42344.nll.stderr b/src/test/ui/issues/issue-42344.nll.stderr index 1abc448dbb090..046a45241cdd7 100644 --- a/src/test/ui/issues/issue-42344.nll.stderr +++ b/src/test/ui/issues/issue-42344.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `*TAB[..]` as mutable, as `TAB` is an immutable static item - --> $DIR/issue-42344.rs:14:5 + --> $DIR/issue-42344.rs:4:5 | LL | TAB[0].iter_mut(); //~ ERROR cannot borrow data mutably in a `&` reference [E0389] | ^^^^^^ cannot borrow as mutable diff --git a/src/test/ui/issues/issue-42344.rs b/src/test/ui/issues/issue-42344.rs index 2f11ff402beed..5f1bb4f91bb84 100644 --- a/src/test/ui/issues/issue-42344.rs +++ b/src/test/ui/issues/issue-42344.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - static TAB: [&mut [u8]; 0] = []; pub unsafe fn test() { diff --git a/src/test/ui/issues/issue-42344.stderr b/src/test/ui/issues/issue-42344.stderr index 92bbe70d9ce57..cb0fe78d10205 100644 --- a/src/test/ui/issues/issue-42344.stderr +++ b/src/test/ui/issues/issue-42344.stderr @@ -1,5 +1,5 @@ error[E0389]: cannot borrow data mutably in a `&` reference - --> $DIR/issue-42344.rs:14:5 + --> $DIR/issue-42344.rs:4:5 | LL | TAB[0].iter_mut(); //~ ERROR cannot borrow data mutably in a `&` reference [E0389] | ^^^^^^ assignment into an immutable reference diff --git a/src/test/ui/issues/issue-4265.rs b/src/test/ui/issues/issue-4265.rs index 62db68dcbb2ee..2596079d37906 100644 --- a/src/test/ui/issues/issue-4265.rs +++ b/src/test/ui/issues/issue-4265.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { baz: usize } diff --git a/src/test/ui/issues/issue-4265.stderr b/src/test/ui/issues/issue-4265.stderr index 8f22c6757c222..b5fce14914d65 100644 --- a/src/test/ui/issues/issue-4265.stderr +++ b/src/test/ui/issues/issue-4265.stderr @@ -1,5 +1,5 @@ error[E0201]: duplicate definitions with name `bar`: - --> $DIR/issue-4265.rs:20:5 + --> $DIR/issue-4265.rs:10:5 | LL | / fn bar() { LL | | Foo { baz: 0 }.bar(); diff --git a/src/test/ui/issues/issue-42755.rs b/src/test/ui/issues/issue-42755.rs index dd53a1c71a5bc..c2d6c528499fc 100644 --- a/src/test/ui/issues/issue-42755.rs +++ b/src/test/ui/issues/issue-42755.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![cfg_attr(stage0, feature(macro_vis_matcher))] macro_rules! foo { diff --git a/src/test/ui/issues/issue-42755.stderr b/src/test/ui/issues/issue-42755.stderr index 9143906199616..5f04f6fb21085 100644 --- a/src/test/ui/issues/issue-42755.stderr +++ b/src/test/ui/issues/issue-42755.stderr @@ -1,5 +1,5 @@ error: repetition matches empty token tree - --> $DIR/issue-42755.rs:14:7 + --> $DIR/issue-42755.rs:4:7 | LL | ($($p:vis)*) => {} //~ ERROR repetition matches empty token tree | ^^^^^^^^ diff --git a/src/test/ui/issues/issue-42796.nll.stderr b/src/test/ui/issues/issue-42796.nll.stderr index fda7cf9ae8ed7..19c6a1fd557b4 100644 --- a/src/test/ui/issues/issue-42796.nll.stderr +++ b/src/test/ui/issues/issue-42796.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: borrow of moved value: `s` - --> $DIR/issue-42796.rs:28:20 + --> $DIR/issue-42796.rs:18:20 | LL | let mut s_copy = s; | - value moved here diff --git a/src/test/ui/issues/issue-42796.rs b/src/test/ui/issues/issue-42796.rs index b07c23c3fc72d..98b91270b7d30 100644 --- a/src/test/ui/issues/issue-42796.rs +++ b/src/test/ui/issues/issue-42796.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Mirror { type Image; } diff --git a/src/test/ui/issues/issue-42796.stderr b/src/test/ui/issues/issue-42796.stderr index 9c2481b2f90aa..530eedd68e6a1 100644 --- a/src/test/ui/issues/issue-42796.stderr +++ b/src/test/ui/issues/issue-42796.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `s` - --> $DIR/issue-42796.rs:28:20 + --> $DIR/issue-42796.rs:18:20 | LL | let mut s_copy = s; | ---------- value moved here diff --git a/src/test/ui/issues/issue-42880.rs b/src/test/ui/issues/issue-42880.rs index ebb1ec425d1da..b61ba80e27abd 100644 --- a/src/test/ui/issues/issue-42880.rs +++ b/src/test/ui/issues/issue-42880.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - type Value = String; fn main() { diff --git a/src/test/ui/issues/issue-42880.stderr b/src/test/ui/issues/issue-42880.stderr index cf1c3022a2273..7d8bae9cafc6f 100644 --- a/src/test/ui/issues/issue-42880.stderr +++ b/src/test/ui/issues/issue-42880.stderr @@ -1,5 +1,5 @@ error[E0599]: no associated item named `String` found for type `std::string::String` in the current scope - --> $DIR/issue-42880.rs:14:15 + --> $DIR/issue-42880.rs:4:15 | LL | let f = |&Value::String(_)| (); //~ ERROR no associated item named | ^^^^^^^^^^^^^^^^ associated item not found in `std::string::String` diff --git a/src/test/ui/issues/issue-42954.fixed b/src/test/ui/issues/issue-42954.fixed index d05996fb8b91b..a73054c92570e 100644 --- a/src/test/ui/issues/issue-42954.fixed +++ b/src/test/ui/issues/issue-42954.fixed @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix #![allow(unused_must_use, unused_comparisons)] diff --git a/src/test/ui/issues/issue-42954.rs b/src/test/ui/issues/issue-42954.rs index 8226cedc0c421..5f9b0e31da5cc 100644 --- a/src/test/ui/issues/issue-42954.rs +++ b/src/test/ui/issues/issue-42954.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix #![allow(unused_must_use, unused_comparisons)] diff --git a/src/test/ui/issues/issue-42954.stderr b/src/test/ui/issues/issue-42954.stderr index aa332602f9e8f..6a89724de5f70 100644 --- a/src/test/ui/issues/issue-42954.stderr +++ b/src/test/ui/issues/issue-42954.stderr @@ -1,5 +1,5 @@ error: `<` is interpreted as a start of generic arguments for `u32`, not a comparison - --> $DIR/issue-42954.rs:17:19 + --> $DIR/issue-42954.rs:7:19 | LL | $i as u32 < 0 //~ `<` is interpreted as a start of generic arguments | --------- ^ - interpreted as generic arguments diff --git a/src/test/ui/issues/issue-43023.rs b/src/test/ui/issues/issue-43023.rs index 6a5f7a1136aaa..32bd66f5a939c 100644 --- a/src/test/ui/issues/issue-43023.rs +++ b/src/test/ui/issues/issue-43023.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S; impl S { diff --git a/src/test/ui/issues/issue-43023.stderr b/src/test/ui/issues/issue-43023.stderr index 2aa1efa9ca8dc..b620cc5d74e8b 100644 --- a/src/test/ui/issues/issue-43023.stderr +++ b/src/test/ui/issues/issue-43023.stderr @@ -1,17 +1,17 @@ error: `derive` may only be applied to structs, enums and unions - --> $DIR/issue-43023.rs:14:5 + --> $DIR/issue-43023.rs:4:5 | LL | #[derive(Debug)] //~ ERROR `derive` may only be applied to structs, enums and unions | ^^^^^^^^^^^^^^^^ error: `derive` may only be applied to structs, enums and unions - --> $DIR/issue-43023.rs:21:5 + --> $DIR/issue-43023.rs:11:5 | LL | #[derive(Debug)] //~ ERROR `derive` may only be applied to structs, enums and unions | ^^^^^^^^^^^^^^^^ error: `derive` may only be applied to structs, enums and unions - --> $DIR/issue-43023.rs:26:5 + --> $DIR/issue-43023.rs:16:5 | LL | #[derive(Debug)] //~ ERROR `derive` may only be applied to structs, enums and unions | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-43105.rs b/src/test/ui/issues/issue-43105.rs index 8a0471135afc4..3814ef4ca9498 100644 --- a/src/test/ui/issues/issue-43105.rs +++ b/src/test/ui/issues/issue-43105.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn xyz() -> u8 { 42 } const NUM: u8 = xyz(); diff --git a/src/test/ui/issues/issue-43105.stderr b/src/test/ui/issues/issue-43105.stderr index 18da9310503ea..5a61652799103 100644 --- a/src/test/ui/issues/issue-43105.stderr +++ b/src/test/ui/issues/issue-43105.stderr @@ -1,11 +1,11 @@ error[E0015]: calls in constants are limited to constant functions, tuple structs and tuple variants - --> $DIR/issue-43105.rs:13:17 + --> $DIR/issue-43105.rs:3:17 | LL | const NUM: u8 = xyz(); | ^^^^^ error[E0080]: could not evaluate constant pattern - --> $DIR/issue-43105.rs:18:9 + --> $DIR/issue-43105.rs:8:9 | LL | const NUM: u8 = xyz(); | ----- calling non-const fn `xyz` diff --git a/src/test/ui/issues/issue-43162.rs b/src/test/ui/issues/issue-43162.rs index b236283f75764..782eb42293a07 100644 --- a/src/test/ui/issues/issue-43162.rs +++ b/src/test/ui/issues/issue-43162.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo() -> bool { //~^ ERROR E0308 break true; //~ ERROR E0268 diff --git a/src/test/ui/issues/issue-43162.stderr b/src/test/ui/issues/issue-43162.stderr index 4b3b4638f26ca..8b02476841d2e 100644 --- a/src/test/ui/issues/issue-43162.stderr +++ b/src/test/ui/issues/issue-43162.stderr @@ -1,17 +1,17 @@ error[E0268]: `break` outside of loop - --> $DIR/issue-43162.rs:13:5 + --> $DIR/issue-43162.rs:3:5 | LL | break true; //~ ERROR E0268 | ^^^^^^^^^^ cannot break outside of a loop error[E0268]: `break` outside of loop - --> $DIR/issue-43162.rs:17:5 + --> $DIR/issue-43162.rs:7:5 | LL | break {}; //~ ERROR E0268 | ^^^^^^^^ cannot break outside of a loop error[E0308]: mismatched types - --> $DIR/issue-43162.rs:11:18 + --> $DIR/issue-43162.rs:1:18 | LL | fn foo() -> bool { | __________________^ diff --git a/src/test/ui/issues/issue-43189.rs b/src/test/ui/issues/issue-43189.rs index 154bee5d1d4f3..14d80129d018b 100644 --- a/src/test/ui/issues/issue-43189.rs +++ b/src/test/ui/issues/issue-43189.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue 46112: An extern crate pub re-exporting libcore was causing // paths rooted from `std` to be misrendered in the diagnostic output. diff --git a/src/test/ui/issues/issue-43189.stderr b/src/test/ui/issues/issue-43189.stderr index b2a02401c592b..e364650da40a1 100644 --- a/src/test/ui/issues/issue-43189.stderr +++ b/src/test/ui/issues/issue-43189.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `a` found for type `()` in the current scope - --> $DIR/issue-43189.rs:20:8 + --> $DIR/issue-43189.rs:10:8 | LL | ().a(); | ^ diff --git a/src/test/ui/issues/issue-43196.rs b/src/test/ui/issues/issue-43196.rs index ff53c9a5a5498..81e5205ce330d 100644 --- a/src/test/ui/issues/issue-43196.rs +++ b/src/test/ui/issues/issue-43196.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { | } diff --git a/src/test/ui/issues/issue-43196.stderr b/src/test/ui/issues/issue-43196.stderr index 2418f517168a4..32efe23c72b58 100644 --- a/src/test/ui/issues/issue-43196.stderr +++ b/src/test/ui/issues/issue-43196.stderr @@ -1,5 +1,5 @@ error: expected `|`, found `}` - --> $DIR/issue-43196.rs:13:1 + --> $DIR/issue-43196.rs:3:1 | LL | | | - expected `|` here @@ -7,7 +7,7 @@ LL | } | ^ unexpected token error: expected item, found `|` - --> $DIR/issue-43196.rs:15:1 + --> $DIR/issue-43196.rs:5:1 | LL | | | ^ expected item diff --git a/src/test/ui/issues/issue-4321.rs b/src/test/ui/issues/issue-4321.rs index d589680b0ecda..9715f2eba2fc8 100644 --- a/src/test/ui/issues/issue-4321.rs +++ b/src/test/ui/issues/issue-4321.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let tup = (true, true); println!("foo {:}", match tup { //~ ERROR non-exhaustive patterns: `(true, false)` not covered diff --git a/src/test/ui/issues/issue-4321.stderr b/src/test/ui/issues/issue-4321.stderr index db52cd557f1be..7817fdcbce99c 100644 --- a/src/test/ui/issues/issue-4321.stderr +++ b/src/test/ui/issues/issue-4321.stderr @@ -1,5 +1,5 @@ error[E0004]: non-exhaustive patterns: `(true, false)` not covered - --> $DIR/issue-4321.rs:13:31 + --> $DIR/issue-4321.rs:3:31 | LL | println!("foo {:}", match tup { //~ ERROR non-exhaustive patterns: `(true, false)` not covered | ^^^ pattern `(true, false)` not covered diff --git a/src/test/ui/issues/issue-43250.rs b/src/test/ui/issues/issue-43250.rs index e1d34f339dc60..24d70d2964bb2 100644 --- a/src/test/ui/issues/issue-43250.rs +++ b/src/test/ui/issues/issue-43250.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let mut y; const C: u32 = 0; diff --git a/src/test/ui/issues/issue-43250.stderr b/src/test/ui/issues/issue-43250.stderr index a05d4d41cc7d7..f729c5cf10cea 100644 --- a/src/test/ui/issues/issue-43250.stderr +++ b/src/test/ui/issues/issue-43250.stderr @@ -1,11 +1,11 @@ error: arbitrary expressions aren't allowed in patterns - --> $DIR/issue-43250.rs:19:8 + --> $DIR/issue-43250.rs:9:8 | LL | m!(y); | ^ error: arbitrary expressions aren't allowed in patterns - --> $DIR/issue-43250.rs:21:8 + --> $DIR/issue-43250.rs:11:8 | LL | m!(C); | ^ diff --git a/src/test/ui/issues/issue-4335.nll.stderr b/src/test/ui/issues/issue-4335.nll.stderr index a9345e86f7248..30b1330340e61 100644 --- a/src/test/ui/issues/issue-4335.nll.stderr +++ b/src/test/ui/issues/issue-4335.nll.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of captured variable in an `FnMut` closure - --> $DIR/issue-4335.rs:16:20 + --> $DIR/issue-4335.rs:6:20 | LL | fn f<'r, T>(v: &'r T) -> Box T + 'r> { | - captured outer variable @@ -7,7 +7,7 @@ LL | id(Box::new(|| *v)) | ^^ cannot move out of captured variable in an `FnMut` closure error[E0597]: `v` does not live long enough - --> $DIR/issue-4335.rs:16:21 + --> $DIR/issue-4335.rs:6:21 | LL | id(Box::new(|| *v)) | -- ^ borrowed value does not live long enough @@ -17,8 +17,8 @@ LL | id(Box::new(|| *v)) LL | } | - `v` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'r as defined on the function body at 15:6... - --> $DIR/issue-4335.rs:15:6 +note: borrowed value must be valid for the lifetime 'r as defined on the function body at 5:6... + --> $DIR/issue-4335.rs:5:6 | LL | fn f<'r, T>(v: &'r T) -> Box T + 'r> { | ^^ diff --git a/src/test/ui/issues/issue-4335.rs b/src/test/ui/issues/issue-4335.rs index 540504eb07ec1..d3c9954cdb051 100644 --- a/src/test/ui/issues/issue-4335.rs +++ b/src/test/ui/issues/issue-4335.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(fn_traits)] fn id(t: T) -> T { t } diff --git a/src/test/ui/issues/issue-4335.stderr b/src/test/ui/issues/issue-4335.stderr index 80f5b445bb641..9ef8e16bbd3c9 100644 --- a/src/test/ui/issues/issue-4335.stderr +++ b/src/test/ui/issues/issue-4335.stderr @@ -1,5 +1,5 @@ error[E0373]: closure may outlive the current function, but it borrows `v`, which is owned by the current function - --> $DIR/issue-4335.rs:16:17 + --> $DIR/issue-4335.rs:6:17 | LL | id(Box::new(|| *v)) | ^^ - `v` is borrowed here @@ -11,7 +11,7 @@ LL | id(Box::new(move || *v)) | ^^^^^^^ error[E0507]: cannot move out of borrowed content - --> $DIR/issue-4335.rs:16:20 + --> $DIR/issue-4335.rs:6:20 | LL | id(Box::new(|| *v)) | ^^ cannot move out of borrowed content diff --git a/src/test/ui/issues/issue-43355.rs b/src/test/ui/issues/issue-43355.rs index d793a78799a70..809300d6d1968 100644 --- a/src/test/ui/issues/issue-43355.rs +++ b/src/test/ui/issues/issue-43355.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Trait1 { type Output; } diff --git a/src/test/ui/issues/issue-43355.stderr b/src/test/ui/issues/issue-43355.stderr index dbcf1b52b89c6..039f10447c072 100644 --- a/src/test/ui/issues/issue-43355.stderr +++ b/src/test/ui/issues/issue-43355.stderr @@ -1,5 +1,5 @@ error: conflicting implementations of trait `Trait1>` for type `A`: (E0119) - --> $DIR/issue-43355.rs:23:1 + --> $DIR/issue-43355.rs:13:1 | LL | impl Trait1 for T where T: Trait2 { | --------------------------------------------- first implementation here diff --git a/src/test/ui/issues/issue-43420-no-over-suggest.rs b/src/test/ui/issues/issue-43420-no-over-suggest.rs index 8c5bde45baed0..4365bff5af566 100644 --- a/src/test/ui/issues/issue-43420-no-over-suggest.rs +++ b/src/test/ui/issues/issue-43420-no-over-suggest.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // check that we substitute type parameters before we suggest anything - otherwise // we would suggest function such as `as_slice` for the `&[u16]`. diff --git a/src/test/ui/issues/issue-43420-no-over-suggest.stderr b/src/test/ui/issues/issue-43420-no-over-suggest.stderr index 80bbdd11289ac..bd51d7e116953 100644 --- a/src/test/ui/issues/issue-43420-no-over-suggest.stderr +++ b/src/test/ui/issues/issue-43420-no-over-suggest.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-43420-no-over-suggest.rs:18:9 + --> $DIR/issue-43420-no-over-suggest.rs:8:9 | LL | foo(&a); //~ ERROR mismatched types | ^^ expected slice, found struct `std::vec::Vec` diff --git a/src/test/ui/issues/issue-43424.rs b/src/test/ui/issues/issue-43424.rs index 431fc8a5aa2b2..b3f76d8b04992 100644 --- a/src/test/ui/issues/issue-43424.rs +++ b/src/test/ui/issues/issue-43424.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused)] macro_rules! m { diff --git a/src/test/ui/issues/issue-43424.stderr b/src/test/ui/issues/issue-43424.stderr index 3a9a316470399..c81ea20170c71 100644 --- a/src/test/ui/issues/issue-43424.stderr +++ b/src/test/ui/issues/issue-43424.stderr @@ -1,5 +1,5 @@ error: unexpected generic arguments in path - --> $DIR/issue-43424.rs:20:4 + --> $DIR/issue-43424.rs:10:4 | LL | m!(inline); //~ ERROR: unexpected generic arguments in path | ^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-43431.rs b/src/test/ui/issues/issue-43431.rs index 1e6366e068a89..e7ec35105f754 100644 --- a/src/test/ui/issues/issue-43431.rs +++ b/src/test/ui/issues/issue-43431.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(fn_traits)] trait CallSingle { diff --git a/src/test/ui/issues/issue-43431.stderr b/src/test/ui/issues/issue-43431.stderr index 3eb8fac6c0ff5..4edb528699d47 100644 --- a/src/test/ui/issues/issue-43431.stderr +++ b/src/test/ui/issues/issue-43431.stderr @@ -1,5 +1,5 @@ error[E0229]: associated type bindings are not allowed here - --> $DIR/issue-43431.rs:19:27 + --> $DIR/issue-43431.rs:9:27 | LL | B>::call(self, (a,)) | ^ associated type not allowed here diff --git a/src/test/ui/issues/issue-4366-2.rs b/src/test/ui/issues/issue-4366-2.rs index 33abc196a6bf3..a6e6e346b119f 100644 --- a/src/test/ui/issues/issue-4366-2.rs +++ b/src/test/ui/issues/issue-4366-2.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ensures that 'use foo:*' doesn't import non-public item use m1::*; diff --git a/src/test/ui/issues/issue-4366-2.stderr b/src/test/ui/issues/issue-4366-2.stderr index 1c9a9eb25c371..3cce0ad60d413 100644 --- a/src/test/ui/issues/issue-4366-2.stderr +++ b/src/test/ui/issues/issue-4366-2.stderr @@ -1,5 +1,5 @@ error[E0412]: cannot find type `bar` in this scope - --> $DIR/issue-4366-2.rs:25:21 + --> $DIR/issue-4366-2.rs:15:21 | LL | fn sub() -> bar { 1 } | ^^^ not found in this scope @@ -9,7 +9,7 @@ LL | use a::b::bar; | error[E0423]: expected function, found module `foo` - --> $DIR/issue-4366-2.rs:35:5 + --> $DIR/issue-4366-2.rs:25:5 | LL | foo(); //~ ERROR expected function, found module `foo` | ^^^ not a function diff --git a/src/test/ui/issues/issue-4366.rs b/src/test/ui/issues/issue-4366.rs index 47fd426592c1d..b7949e1549a50 100644 --- a/src/test/ui/issues/issue-4366.rs +++ b/src/test/ui/issues/issue-4366.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // regression test for issue 4366 // ensures that 'use foo:*' doesn't import non-public 'use' statements in the diff --git a/src/test/ui/issues/issue-4366.stderr b/src/test/ui/issues/issue-4366.stderr index e78aec9d0e86f..2bad7b17d642e 100644 --- a/src/test/ui/issues/issue-4366.stderr +++ b/src/test/ui/issues/issue-4366.stderr @@ -1,5 +1,5 @@ error[E0425]: cannot find function `foo` in this scope - --> $DIR/issue-4366.rs:28:29 + --> $DIR/issue-4366.rs:18:29 | LL | fn sub() -> isize { foo(); 1 } //~ ERROR cannot find function `foo` in this scope | ^^^ not found in this scope diff --git a/src/test/ui/issues/issue-43733.rs b/src/test/ui/issues/issue-43733.rs index 7b1364ff41c40..91192e3360c2c 100644 --- a/src/test/ui/issues/issue-43733.rs +++ b/src/test/ui/issues/issue-43733.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_fn)] #![feature(thread_local)] #![feature(cfg_target_thread_local, thread_local_internals)] diff --git a/src/test/ui/issues/issue-43733.stderr b/src/test/ui/issues/issue-43733.stderr index 5f91d3d2266db..38fa93d446188 100644 --- a/src/test/ui/issues/issue-43733.stderr +++ b/src/test/ui/issues/issue-43733.stderr @@ -1,5 +1,5 @@ error[E0133]: call to unsafe function is unsafe and requires unsafe function or block - --> $DIR/issue-43733.rs:30:5 + --> $DIR/issue-43733.rs:20:5 | LL | __KEY.get() //~ ERROR call to unsafe function is unsafe | ^^^^^^^^^^^ call to unsafe function @@ -7,7 +7,7 @@ LL | __KEY.get() //~ ERROR call to unsafe function is unsafe = note: consult the function's documentation for information on how to avoid undefined behavior error[E0133]: call to unsafe function is unsafe and requires unsafe function or block - --> $DIR/issue-43733.rs:34:5 + --> $DIR/issue-43733.rs:24:5 | LL | std::thread::LocalKey::new(__getit, Default::default); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ call to unsafe function diff --git a/src/test/ui/issues/issue-43784-associated-type.rs b/src/test/ui/issues/issue-43784-associated-type.rs index 94b5c0034a76d..dd9824ad23aae 100644 --- a/src/test/ui/issues/issue-43784-associated-type.rs +++ b/src/test/ui/issues/issue-43784-associated-type.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Partial: Copy { } diff --git a/src/test/ui/issues/issue-43784-associated-type.stderr b/src/test/ui/issues/issue-43784-associated-type.stderr index 798d8c6601668..a1df295851c66 100644 --- a/src/test/ui/issues/issue-43784-associated-type.stderr +++ b/src/test/ui/issues/issue-43784-associated-type.stderr @@ -3,7 +3,7 @@ error[E0601]: `main` function not found in crate `issue_43784_associated_type` = note: consider adding a `main` function to `$DIR/issue-43784-associated-type.rs` error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied - --> $DIR/issue-43784-associated-type.rs:23:9 + --> $DIR/issue-43784-associated-type.rs:13:9 | LL | impl Complete for T { //~ ERROR the trait bound `T: std::marker::Copy` is not satisfied | ^^^^^^^^ the trait `std::marker::Copy` is not implemented for `T` diff --git a/src/test/ui/issues/issue-43784-supertrait.rs b/src/test/ui/issues/issue-43784-supertrait.rs index e70df113da33c..093d883164598 100644 --- a/src/test/ui/issues/issue-43784-supertrait.rs +++ b/src/test/ui/issues/issue-43784-supertrait.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Partial: Copy { } diff --git a/src/test/ui/issues/issue-43784-supertrait.stderr b/src/test/ui/issues/issue-43784-supertrait.stderr index 8646b315abdab..c66fe2e78b226 100644 --- a/src/test/ui/issues/issue-43784-supertrait.stderr +++ b/src/test/ui/issues/issue-43784-supertrait.stderr @@ -3,7 +3,7 @@ error[E0601]: `main` function not found in crate `issue_43784_supertrait` = note: consider adding a `main` function to `$DIR/issue-43784-supertrait.rs` error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied - --> $DIR/issue-43784-supertrait.rs:18:9 + --> $DIR/issue-43784-supertrait.rs:8:9 | LL | impl Complete for T {} //~ ERROR the trait bound `T: std::marker::Copy` is not satisfied | ^^^^^^^^ the trait `std::marker::Copy` is not implemented for `T` diff --git a/src/test/ui/issues/issue-43806.rs b/src/test/ui/issues/issue-43806.rs index 7757a503c7e87..cbfbfa35afbd9 100644 --- a/src/test/ui/issues/issue-43806.rs +++ b/src/test/ui/issues/issue-43806.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass #![deny(unused_results)] diff --git a/src/test/ui/issues/issue-43925.rs b/src/test/ui/issues/issue-43925.rs index 7875c16c0e496..1f3bee38e8cbc 100644 --- a/src/test/ui/issues/issue-43925.rs +++ b/src/test/ui/issues/issue-43925.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[link(name="foo", cfg("rlib"))] //~ ERROR invalid argument for `cfg(..)` extern {} diff --git a/src/test/ui/issues/issue-43925.stderr b/src/test/ui/issues/issue-43925.stderr index e93ea9c7bc7a5..e73c2122a03fc 100644 --- a/src/test/ui/issues/issue-43925.stderr +++ b/src/test/ui/issues/issue-43925.stderr @@ -1,5 +1,5 @@ error: invalid argument for `cfg(..)` - --> $DIR/issue-43925.rs:11:24 + --> $DIR/issue-43925.rs:1:24 | LL | #[link(name="foo", cfg("rlib"))] //~ ERROR invalid argument for `cfg(..)` | ^^^^^^ diff --git a/src/test/ui/issues/issue-43926.rs b/src/test/ui/issues/issue-43926.rs index 5d510b643a349..c56a796187a2a 100644 --- a/src/test/ui/issues/issue-43926.rs +++ b/src/test/ui/issues/issue-43926.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[link(name="foo", cfg())] //~ ERROR `cfg()` must have an argument extern {} diff --git a/src/test/ui/issues/issue-43926.stderr b/src/test/ui/issues/issue-43926.stderr index 80d8c5c981436..9dc9cfe5db2ac 100644 --- a/src/test/ui/issues/issue-43926.stderr +++ b/src/test/ui/issues/issue-43926.stderr @@ -1,5 +1,5 @@ error: `cfg()` must have an argument - --> $DIR/issue-43926.rs:11:20 + --> $DIR/issue-43926.rs:1:20 | LL | #[link(name="foo", cfg())] //~ ERROR `cfg()` must have an argument | ^^^^^ diff --git a/src/test/ui/issues/issue-43988.rs b/src/test/ui/issues/issue-43988.rs index 6361af7648258..b2a203546fe07 100644 --- a/src/test/ui/issues/issue-43988.rs +++ b/src/test/ui/issues/issue-43988.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(stmt_expr_attributes)] fn main() { diff --git a/src/test/ui/issues/issue-43988.stderr b/src/test/ui/issues/issue-43988.stderr index 7237851f778e6..811816d0087b8 100644 --- a/src/test/ui/issues/issue-43988.stderr +++ b/src/test/ui/issues/issue-43988.stderr @@ -1,5 +1,5 @@ warning: `repr` attribute must have a hint - --> $DIR/issue-43988.rs:34:5 + --> $DIR/issue-43988.rs:24:5 | LL | #[repr] | ^^^^^^^ needs a hint @@ -9,7 +9,7 @@ LL | #[repr] = note: for more information, visit warning: `repr` attribute must have a hint - --> $DIR/issue-43988.rs:46:14 + --> $DIR/issue-43988.rs:36:14 | LL | let _z = #[repr] 1; | ^^^^^^^ needs a hint @@ -18,7 +18,7 @@ LL | let _z = #[repr] 1; = note: for more information, visit error[E0518]: attribute should be applied to function or closure - --> $DIR/issue-43988.rs:15:5 + --> $DIR/issue-43988.rs:5:5 | LL | #[inline] | ^^^^^^^^^ @@ -26,7 +26,7 @@ LL | let _a = 4; | ----------- not a function or closure error[E0518]: attribute should be applied to function or closure - --> $DIR/issue-43988.rs:20:5 + --> $DIR/issue-43988.rs:10:5 | LL | #[inline(XYZ)] | ^^^^^^^^^^^^^^ @@ -34,7 +34,7 @@ LL | let _b = 4; | ----------- not a function or closure error[E0517]: attribute should not be applied to a statement - --> $DIR/issue-43988.rs:24:5 + --> $DIR/issue-43988.rs:14:5 | LL | #[repr(nothing)] | ^^^^^^^^^^^^^^^^ @@ -42,7 +42,7 @@ LL | let _x = 0; | ----------- not a struct, enum or union error[E0517]: attribute should not be applied to an expression - --> $DIR/issue-43988.rs:28:5 + --> $DIR/issue-43988.rs:18:5 | LL | #[repr(something_not_real)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -52,7 +52,7 @@ LL | | }; | |_____- not defining a struct, enum or union error[E0517]: attribute should not be applied to a statement - --> $DIR/issue-43988.rs:34:5 + --> $DIR/issue-43988.rs:24:5 | LL | #[repr] | ^^^^^^^ @@ -60,7 +60,7 @@ LL | let _y = "123"; | --------------- not a struct, enum or union error[E0518]: attribute should be applied to function or closure - --> $DIR/issue-43988.rs:42:5 + --> $DIR/issue-43988.rs:32:5 | LL | #[inline(ABC)] | ^^^^^^^^^^^^^^ @@ -68,7 +68,7 @@ LL | foo(); | ----- not a function or closure error[E0517]: attribute should not be applied to an expression - --> $DIR/issue-43988.rs:46:14 + --> $DIR/issue-43988.rs:36:14 | LL | let _z = #[repr] 1; | ^^^^^^^ - not defining a struct, enum or union diff --git a/src/test/ui/issues/issue-44021.rs b/src/test/ui/issues/issue-44021.rs index b6ec21b94c73f..0b9558cc91e1f 100644 --- a/src/test/ui/issues/issue-44021.rs +++ b/src/test/ui/issues/issue-44021.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct MyStruct; impl MyStruct { fn f() {|x, y} //~ ERROR expected one of `:`, `@`, or `|`, found `}` diff --git a/src/test/ui/issues/issue-44021.stderr b/src/test/ui/issues/issue-44021.stderr index 2c74531cf2441..03f11312d4655 100644 --- a/src/test/ui/issues/issue-44021.stderr +++ b/src/test/ui/issues/issue-44021.stderr @@ -1,5 +1,5 @@ error: expected one of `:`, `@`, or `|`, found `}` - --> $DIR/issue-44021.rs:13:18 + --> $DIR/issue-44021.rs:3:18 | LL | fn f() {|x, y} //~ ERROR expected one of `:`, `@`, or `|`, found `}` | ^ expected one of `:`, `@`, or `|` here diff --git a/src/test/ui/issues/issue-44023.rs b/src/test/ui/issues/issue-44023.rs index 97b82dc58dcfc..4c38ddfcdf189 100644 --- a/src/test/ui/issues/issue-44023.rs +++ b/src/test/ui/issues/issue-44023.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(non_ascii_idents)] pub fn main () {} diff --git a/src/test/ui/issues/issue-44023.stderr b/src/test/ui/issues/issue-44023.stderr index 3baf7ec0277b1..21cfe07e3e6e4 100644 --- a/src/test/ui/issues/issue-44023.stderr +++ b/src/test/ui/issues/issue-44023.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-44023.rs:15:42 + --> $DIR/issue-44023.rs:5:42 | LL | fn საჭმელად_გემრიელი_სადილი ( ) -> isize { //~ ERROR mismatched types | __________________________________________^ diff --git a/src/test/ui/issues/issue-44078.rs b/src/test/ui/issues/issue-44078.rs index 356a7be0b419e..b8c0e285ffcab 100644 --- a/src/test/ui/issues/issue-44078.rs +++ b/src/test/ui/issues/issue-44078.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { "😊""; //~ ERROR unterminated double quote } diff --git a/src/test/ui/issues/issue-44078.stderr b/src/test/ui/issues/issue-44078.stderr index e8dce656f65b4..e7f46130f112f 100644 --- a/src/test/ui/issues/issue-44078.stderr +++ b/src/test/ui/issues/issue-44078.stderr @@ -1,5 +1,5 @@ error: unterminated double quote string - --> $DIR/issue-44078.rs:12:8 + --> $DIR/issue-44078.rs:2:8 | LL | "😊""; //~ ERROR unterminated double quote | _________^ diff --git a/src/test/ui/issues/issue-44239.rs b/src/test/ui/issues/issue-44239.rs index 131c65266425b..99a865f75a498 100644 --- a/src/test/ui/issues/issue-44239.rs +++ b/src/test/ui/issues/issue-44239.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let n = 0; diff --git a/src/test/ui/issues/issue-44239.stderr b/src/test/ui/issues/issue-44239.stderr index 43d4968a89fd7..bc5a6a03f0314 100644 --- a/src/test/ui/issues/issue-44239.stderr +++ b/src/test/ui/issues/issue-44239.stderr @@ -1,5 +1,5 @@ error[E0435]: attempt to use a non-constant value in a constant - --> $DIR/issue-44239.rs:16:26 + --> $DIR/issue-44239.rs:6:26 | LL | const N: usize = n; | ^ non-constant value diff --git a/src/test/ui/issues/issue-44373.rs b/src/test/ui/issues/issue-44373.rs index d744ad11c5c72..13e9fa9ea6743 100644 --- a/src/test/ui/issues/issue-44373.rs +++ b/src/test/ui/issues/issue-44373.rs @@ -1,14 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - static FOO: u32 = 50; fn main() { diff --git a/src/test/ui/issues/issue-44373.stderr b/src/test/ui/issues/issue-44373.stderr index 17a634ba747a3..5a4bf18f3d5aa 100644 --- a/src/test/ui/issues/issue-44373.stderr +++ b/src/test/ui/issues/issue-44373.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/issue-44373.rs:15:42 + --> $DIR/issue-44373.rs:4:42 | LL | let _val: &'static [&'static u32] = &[&FOO]; //~ ERROR borrowed value does not live long enough | ^^^^^^ temporary value does not live long enough diff --git a/src/test/ui/issues/issue-44406.rs b/src/test/ui/issues/issue-44406.rs index 8e99caff4efa2..83bbf884a4ff8 100644 --- a/src/test/ui/issues/issue-44406.rs +++ b/src/test/ui/issues/issue-44406.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! foo { ($rest: tt) => { bar(baz: $rest) diff --git a/src/test/ui/issues/issue-44406.stderr b/src/test/ui/issues/issue-44406.stderr index 5cd9b3f065eb8..45ea586373c3c 100644 --- a/src/test/ui/issues/issue-44406.stderr +++ b/src/test/ui/issues/issue-44406.stderr @@ -1,11 +1,11 @@ error: expected identifier, found keyword `true` - --> $DIR/issue-44406.rs:18:10 + --> $DIR/issue-44406.rs:8:10 | LL | foo!(true); //~ ERROR expected type, found keyword | ^^^^ expected identifier, found keyword error: expected type, found keyword `true` - --> $DIR/issue-44406.rs:18:10 + --> $DIR/issue-44406.rs:8:10 | LL | bar(baz: $rest) | - help: try using a semicolon: `;` diff --git a/src/test/ui/issues/issue-44415.rs b/src/test/ui/issues/issue-44415.rs index 5d295510844ab..68d4c8b6b2ada 100644 --- a/src/test/ui/issues/issue-44415.rs +++ b/src/test/ui/issues/issue-44415.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //~^^^^^^^^^^ ERROR cycle detected when computing layout of #![feature(const_fn)] diff --git a/src/test/ui/issues/issue-44415.stderr b/src/test/ui/issues/issue-44415.stderr index ac2072c513ea0..4a1d7cf62fda7 100644 --- a/src/test/ui/issues/issue-44415.stderr +++ b/src/test/ui/issues/issue-44415.stderr @@ -2,13 +2,13 @@ error[E0391]: cycle detected when computing layout of `Foo` | note: ...which requires normalizing `ParamEnvAnd { param_env: ParamEnv { caller_bounds: [], reveal: All }, value: [u8; _] }`... note: ...which requires const-evaluating `Foo::bytes::{{constant}}`... - --> $DIR/issue-44415.rs:19:26 + --> $DIR/issue-44415.rs:9:26 | LL | bytes: [u8; unsafe { intrinsics::size_of::() }], | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ = note: ...which again requires computing layout of `Foo`, completing the cycle note: cycle used when const-evaluating `Foo::bytes::{{constant}}` - --> $DIR/issue-44415.rs:19:26 + --> $DIR/issue-44415.rs:9:26 | LL | bytes: [u8; unsafe { intrinsics::size_of::() }], | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-45087-unreachable-unsafe.rs b/src/test/ui/issues/issue-45087-unreachable-unsafe.rs index 5af0bf6be56e9..5edf7a47e2f67 100644 --- a/src/test/ui/issues/issue-45087-unreachable-unsafe.rs +++ b/src/test/ui/issues/issue-45087-unreachable-unsafe.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { return; *(1 as *mut u32) = 42; diff --git a/src/test/ui/issues/issue-45087-unreachable-unsafe.stderr b/src/test/ui/issues/issue-45087-unreachable-unsafe.stderr index 8a967838bc3b2..d112d7f46612f 100644 --- a/src/test/ui/issues/issue-45087-unreachable-unsafe.stderr +++ b/src/test/ui/issues/issue-45087-unreachable-unsafe.stderr @@ -1,5 +1,5 @@ error[E0133]: dereference of raw pointer is unsafe and requires unsafe function or block - --> $DIR/issue-45087-unreachable-unsafe.rs:13:5 + --> $DIR/issue-45087-unreachable-unsafe.rs:3:5 | LL | *(1 as *mut u32) = 42; | ^^^^^^^^^^^^^^^^^^^^^ dereference of raw pointer diff --git a/src/test/ui/issues/issue-45107-unnecessary-unsafe-in-closure.rs b/src/test/ui/issues/issue-45107-unnecessary-unsafe-in-closure.rs index 2fce8d723d39c..de275ff701a61 100644 --- a/src/test/ui/issues/issue-45107-unnecessary-unsafe-in-closure.rs +++ b/src/test/ui/issues/issue-45107-unnecessary-unsafe-in-closure.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[deny(unused_unsafe)] fn main() { let mut v = Vec::::with_capacity(24); diff --git a/src/test/ui/issues/issue-45107-unnecessary-unsafe-in-closure.stderr b/src/test/ui/issues/issue-45107-unnecessary-unsafe-in-closure.stderr index eaf7569100ad3..3510112daf0a5 100644 --- a/src/test/ui/issues/issue-45107-unnecessary-unsafe-in-closure.stderr +++ b/src/test/ui/issues/issue-45107-unnecessary-unsafe-in-closure.stderr @@ -1,5 +1,5 @@ error: unnecessary `unsafe` block - --> $DIR/issue-45107-unnecessary-unsafe-in-closure.rs:17:13 + --> $DIR/issue-45107-unnecessary-unsafe-in-closure.rs:7:13 | LL | unsafe { | ------ because it's nested under this `unsafe` block @@ -8,13 +8,13 @@ LL | unsafe { //~ ERROR unnecessary `unsafe` | ^^^^^^ unnecessary `unsafe` block | note: lint level defined here - --> $DIR/issue-45107-unnecessary-unsafe-in-closure.rs:11:8 + --> $DIR/issue-45107-unnecessary-unsafe-in-closure.rs:1:8 | LL | #[deny(unused_unsafe)] | ^^^^^^^^^^^^^ error: unnecessary `unsafe` block - --> $DIR/issue-45107-unnecessary-unsafe-in-closure.rs:19:38 + --> $DIR/issue-45107-unnecessary-unsafe-in-closure.rs:9:38 | LL | unsafe { | ------ because it's nested under this `unsafe` block @@ -23,7 +23,7 @@ LL | |w: &mut Vec| { unsafe { //~ ERROR unnecessary `unsafe | ^^^^^^ unnecessary `unsafe` block error: unnecessary `unsafe` block - --> $DIR/issue-45107-unnecessary-unsafe-in-closure.rs:23:34 + --> $DIR/issue-45107-unnecessary-unsafe-in-closure.rs:13:34 | LL | unsafe { | ------ because it's nested under this `unsafe` block diff --git a/src/test/ui/issues/issue-45157.rs b/src/test/ui/issues/issue-45157.rs index a906d193d995e..c2c9ed62d4edc 100644 --- a/src/test/ui/issues/issue-45157.rs +++ b/src/test/ui/issues/issue-45157.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused)] #![feature(nll)] diff --git a/src/test/ui/issues/issue-45157.stderr b/src/test/ui/issues/issue-45157.stderr index e528a84ebd1a5..a528a85066089 100644 --- a/src/test/ui/issues/issue-45157.stderr +++ b/src/test/ui/issues/issue-45157.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `u.z.c` as immutable because it is also borrowed as mutable - --> $DIR/issue-45157.rs:37:20 + --> $DIR/issue-45157.rs:27:20 | LL | let mref = &mut u.s.a; | ---------- mutable borrow occurs here diff --git a/src/test/ui/issues/issue-4517.rs b/src/test/ui/issues/issue-4517.rs index fbd8972cbfaa6..bbe81f3fc7820 100644 --- a/src/test/ui/issues/issue-4517.rs +++ b/src/test/ui/issues/issue-4517.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn bar(int_param: usize) {} fn main() { diff --git a/src/test/ui/issues/issue-4517.stderr b/src/test/ui/issues/issue-4517.stderr index ca96c396fd0bf..7d88e55044093 100644 --- a/src/test/ui/issues/issue-4517.stderr +++ b/src/test/ui/issues/issue-4517.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-4517.rs:15:9 + --> $DIR/issue-4517.rs:5:9 | LL | bar(foo); | ^^^ expected usize, found array of 4 elements diff --git a/src/test/ui/issues/issue-45199.ast.nll.stderr b/src/test/ui/issues/issue-45199.ast.nll.stderr index ce39776252b6a..a9865335c2ea2 100644 --- a/src/test/ui/issues/issue-45199.ast.nll.stderr +++ b/src/test/ui/issues/issue-45199.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `b` - --> $DIR/issue-45199.rs:19:5 + --> $DIR/issue-45199.rs:9:5 | LL | let b: Box; | - consider changing this to `mut b` @@ -11,7 +11,7 @@ LL | b = Box::new(2); //[ast]~ ERROR cannot assign twice to immutable var | ^ cannot assign twice to immutable variable error[E0384]: cannot assign twice to immutable variable `b` - --> $DIR/issue-45199.rs:29:5 + --> $DIR/issue-45199.rs:19:5 | LL | let b = Box::new(1); //[ast]~ NOTE first assignment | - @@ -23,7 +23,7 @@ LL | b = Box::new(2); //[ast]~ ERROR cannot assign twice to immutable | ^ cannot assign twice to immutable variable error[E0384]: cannot assign to immutable argument `b` - --> $DIR/issue-45199.rs:37:5 + --> $DIR/issue-45199.rs:27:5 | LL | fn test_args(b: Box) { //[ast]~ NOTE first assignment | - consider changing this to `mut b` diff --git a/src/test/ui/issues/issue-45199.ast.stderr b/src/test/ui/issues/issue-45199.ast.stderr index ff8f78b511635..4a59e549fb3e6 100644 --- a/src/test/ui/issues/issue-45199.ast.stderr +++ b/src/test/ui/issues/issue-45199.ast.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `b` - --> $DIR/issue-45199.rs:19:5 + --> $DIR/issue-45199.rs:9:5 | LL | b = Box::new(1); //[ast]~ NOTE first assignment | --------------- first assignment to `b` @@ -8,7 +8,7 @@ LL | b = Box::new(2); //[ast]~ ERROR cannot assign twice to immutable var | ^^^^^^^^^^^^^^^ cannot assign twice to immutable variable error[E0384]: cannot assign twice to immutable variable `b` - --> $DIR/issue-45199.rs:29:5 + --> $DIR/issue-45199.rs:19:5 | LL | let b = Box::new(1); //[ast]~ NOTE first assignment | - first assignment to `b` @@ -17,7 +17,7 @@ LL | b = Box::new(2); //[ast]~ ERROR cannot assign twice to immutable | ^^^^^^^^^^^^^^^ cannot assign twice to immutable variable error[E0384]: cannot assign twice to immutable variable `b` - --> $DIR/issue-45199.rs:37:5 + --> $DIR/issue-45199.rs:27:5 | LL | fn test_args(b: Box) { //[ast]~ NOTE first assignment | - first assignment to `b` diff --git a/src/test/ui/issues/issue-45199.mir.stderr b/src/test/ui/issues/issue-45199.mir.stderr index ce39776252b6a..a9865335c2ea2 100644 --- a/src/test/ui/issues/issue-45199.mir.stderr +++ b/src/test/ui/issues/issue-45199.mir.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `b` - --> $DIR/issue-45199.rs:19:5 + --> $DIR/issue-45199.rs:9:5 | LL | let b: Box; | - consider changing this to `mut b` @@ -11,7 +11,7 @@ LL | b = Box::new(2); //[ast]~ ERROR cannot assign twice to immutable var | ^ cannot assign twice to immutable variable error[E0384]: cannot assign twice to immutable variable `b` - --> $DIR/issue-45199.rs:29:5 + --> $DIR/issue-45199.rs:19:5 | LL | let b = Box::new(1); //[ast]~ NOTE first assignment | - @@ -23,7 +23,7 @@ LL | b = Box::new(2); //[ast]~ ERROR cannot assign twice to immutable | ^ cannot assign twice to immutable variable error[E0384]: cannot assign to immutable argument `b` - --> $DIR/issue-45199.rs:37:5 + --> $DIR/issue-45199.rs:27:5 | LL | fn test_args(b: Box) { //[ast]~ NOTE first assignment | - consider changing this to `mut b` diff --git a/src/test/ui/issues/issue-45199.rs b/src/test/ui/issues/issue-45199.rs index 61e19ffc0d293..2c041b063ba36 100644 --- a/src/test/ui/issues/issue-45199.rs +++ b/src/test/ui/issues/issue-45199.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Zborrowck=mir diff --git a/src/test/ui/issues/issue-45296.rs b/src/test/ui/issues/issue-45296.rs index 965747cfa05ca..f242c1d29372f 100644 --- a/src/test/ui/issues/issue-45296.rs +++ b/src/test/ui/issues/issue-45296.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let unused = (); diff --git a/src/test/ui/issues/issue-45296.stderr b/src/test/ui/issues/issue-45296.stderr index 96ee3ccc89dae..afea28fb7aaf8 100644 --- a/src/test/ui/issues/issue-45296.stderr +++ b/src/test/ui/issues/issue-45296.stderr @@ -1,5 +1,5 @@ error: an inner attribute is not permitted in this context - --> $DIR/issue-45296.rs:14:7 + --> $DIR/issue-45296.rs:4:7 | LL | #![allow(unused_variables)] //~ ERROR not permitted in this context | ^ diff --git a/src/test/ui/issues/issue-45562.fixed b/src/test/ui/issues/issue-45562.fixed index 7c01f0d1ee532..c23f5909bbe22 100644 --- a/src/test/ui/issues/issue-45562.fixed +++ b/src/test/ui/issues/issue-45562.fixed @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix #[no_mangle] pub static RAH: usize = 5; diff --git a/src/test/ui/issues/issue-45562.rs b/src/test/ui/issues/issue-45562.rs index c27d52fcdd392..8ac4f6794f66c 100644 --- a/src/test/ui/issues/issue-45562.rs +++ b/src/test/ui/issues/issue-45562.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix #[no_mangle] pub const RAH: usize = 5; diff --git a/src/test/ui/issues/issue-45562.stderr b/src/test/ui/issues/issue-45562.stderr index d9e624cadc705..b97b9cd6727f3 100644 --- a/src/test/ui/issues/issue-45562.stderr +++ b/src/test/ui/issues/issue-45562.stderr @@ -1,5 +1,5 @@ error: const items should never be #[no_mangle] - --> $DIR/issue-45562.rs:13:14 + --> $DIR/issue-45562.rs:3:14 | LL | #[no_mangle] pub const RAH: usize = 5; | ---------^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-45696-long-live-borrows-in-boxes.rs b/src/test/ui/issues/issue-45696-long-live-borrows-in-boxes.rs index 881f37c2e0b0e..9f86caeaea9e9 100644 --- a/src/test/ui/issues/issue-45696-long-live-borrows-in-boxes.rs +++ b/src/test/ui/issues/issue-45696-long-live-borrows-in-boxes.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // rust-lang/rust#45696: This test is checking that we can return // mutable borrows owned by boxes even when the boxes are dropped. // diff --git a/src/test/ui/issues/issue-45696-no-variant-box-recur.rs b/src/test/ui/issues/issue-45696-no-variant-box-recur.rs index 8624dbd28dceb..867da22221aee 100644 --- a/src/test/ui/issues/issue-45696-no-variant-box-recur.rs +++ b/src/test/ui/issues/issue-45696-no-variant-box-recur.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // rust-lang/rust#45696: This test checks the compiler won't infinite // loop when you declare a variable of type `struct A(Box, ...);` // (which is impossible to construct but *is* possible to declare; see diff --git a/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.ast.stderr b/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.ast.stderr index 6172a5e35a8d9..f74a2aca1a05c 100644 --- a/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.ast.stderr +++ b/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.ast.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:89:1 + --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:79:1 | LL | / fn main() { //[ast]~ ERROR compilation successful LL | | //[migrate]~^ ERROR compilation successful diff --git a/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.migrate.stderr b/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.migrate.stderr index da0dfac2d18b1..f5f83e0540d33 100644 --- a/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.migrate.stderr +++ b/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.migrate.stderr @@ -1,5 +1,5 @@ warning[E0597]: `*s.0` does not live long enough - --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:63:5 + --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:53:5 | LL | &mut *s.0 //[nll]~ ERROR `*s.0` does not live long enough [E0597] | ^^^^^^^^^ borrowed value does not live long enough @@ -7,8 +7,8 @@ LL | &mut *s.0 //[nll]~ ERROR `*s.0` does not live long enough [E0597] LL | } | - `*s.0` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 62:14... - --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:62:14 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 52:14... + --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:52:14 | LL | fn scribbled<'a>(s: Scribble<'a>) -> &'a mut u32 { | ^^ @@ -17,7 +17,7 @@ LL | fn scribbled<'a>(s: Scribble<'a>) -> &'a mut u32 { This warning will become a hard error in the future. warning[E0597]: `*s.0` does not live long enough - --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:73:5 + --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:63:5 | LL | &mut *(*s).0 //[nll]~ ERROR `*s.0` does not live long enough [E0597] | ^^^^^^^^^^^^ borrowed value does not live long enough @@ -25,8 +25,8 @@ LL | &mut *(*s).0 //[nll]~ ERROR `*s.0` does not live long enough [E0597] LL | } | - `*s.0` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 72:20... - --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:72:20 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 62:20... + --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:62:20 | LL | fn boxed_scribbled<'a>(s: Box>) -> &'a mut u32 { | ^^ @@ -35,7 +35,7 @@ LL | fn boxed_scribbled<'a>(s: Box>) -> &'a mut u32 { This warning will become a hard error in the future. warning[E0597]: `*s.0` does not live long enough - --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:83:5 + --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:73:5 | LL | &mut *(**s).0 //[nll]~ ERROR `*s.0` does not live long enough [E0597] | ^^^^^^^^^^^^^ borrowed value does not live long enough @@ -43,8 +43,8 @@ LL | &mut *(**s).0 //[nll]~ ERROR `*s.0` does not live long enough [E0597] LL | } | - `*s.0` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 82:26... - --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:82:26 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 72:26... + --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:72:26 | LL | fn boxed_boxed_scribbled<'a>(s: Box>>) -> &'a mut u32 { | ^^ @@ -53,7 +53,7 @@ LL | fn boxed_boxed_scribbled<'a>(s: Box>>) -> &'a mut u32 { This warning will become a hard error in the future. error: compilation successful - --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:89:1 + --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:79:1 | LL | / fn main() { //[ast]~ ERROR compilation successful LL | | //[migrate]~^ ERROR compilation successful diff --git a/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.nll.stderr b/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.nll.stderr index 09cbc2f945129..97aa279dc8977 100644 --- a/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.nll.stderr +++ b/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `*s.0` does not live long enough - --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:63:5 + --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:53:5 | LL | &mut *s.0 //[nll]~ ERROR `*s.0` does not live long enough [E0597] | ^^^^^^^^^ borrowed value does not live long enough @@ -7,14 +7,14 @@ LL | &mut *s.0 //[nll]~ ERROR `*s.0` does not live long enough [E0597] LL | } | - `*s.0` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 62:14... - --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:62:14 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 52:14... + --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:52:14 | LL | fn scribbled<'a>(s: Scribble<'a>) -> &'a mut u32 { | ^^ error[E0597]: `*s.0` does not live long enough - --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:73:5 + --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:63:5 | LL | &mut *(*s).0 //[nll]~ ERROR `*s.0` does not live long enough [E0597] | ^^^^^^^^^^^^ borrowed value does not live long enough @@ -22,14 +22,14 @@ LL | &mut *(*s).0 //[nll]~ ERROR `*s.0` does not live long enough [E0597] LL | } | - `*s.0` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 72:20... - --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:72:20 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 62:20... + --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:62:20 | LL | fn boxed_scribbled<'a>(s: Box>) -> &'a mut u32 { | ^^ error[E0597]: `*s.0` does not live long enough - --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:83:5 + --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:73:5 | LL | &mut *(**s).0 //[nll]~ ERROR `*s.0` does not live long enough [E0597] | ^^^^^^^^^^^^^ borrowed value does not live long enough @@ -37,8 +37,8 @@ LL | &mut *(**s).0 //[nll]~ ERROR `*s.0` does not live long enough [E0597] LL | } | - `*s.0` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 82:26... - --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:82:26 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 72:26... + --> $DIR/issue-45696-scribble-on-boxed-borrow.rs:72:26 | LL | fn boxed_boxed_scribbled<'a>(s: Box>>) -> &'a mut u32 { | ^^ diff --git a/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.rs b/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.rs index 5a4874249e2f4..f515314207016 100644 --- a/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.rs +++ b/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // rust-lang/rust#45696: This test is checking that we *cannot* return // mutable borrows that would be scribbled over by destructors before // the return occurs. diff --git a/src/test/ui/issues/issue-45697-1.rs b/src/test/ui/issues/issue-45697-1.rs index b8be209833a6e..0901cf1558f1c 100644 --- a/src/test/ui/issues/issue-45697-1.rs +++ b/src/test/ui/issues/issue-45697-1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that assignments to an `&mut` pointer which is found in a // borrowed (but otherwise non-aliasable) location is illegal. diff --git a/src/test/ui/issues/issue-45697-1.stderr b/src/test/ui/issues/issue-45697-1.stderr index cf108691a0e4f..8d3907206081f 100644 --- a/src/test/ui/issues/issue-45697-1.stderr +++ b/src/test/ui/issues/issue-45697-1.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `*y.pointer` because it is borrowed (Ast) - --> $DIR/issue-45697-1.rs:30:9 + --> $DIR/issue-45697-1.rs:20:9 | LL | let z = copy_borrowed_ptr(&mut y); | - borrow of `*y.pointer` occurs here @@ -7,7 +7,7 @@ LL | *y.pointer += 1; | ^^^^^^^^^^^^^^^ assignment to borrowed `*y.pointer` occurs here error[E0503]: cannot use `*y.pointer` because it was mutably borrowed (Mir) - --> $DIR/issue-45697-1.rs:30:9 + --> $DIR/issue-45697-1.rs:20:9 | LL | let z = copy_borrowed_ptr(&mut y); | ------ borrow of `y` occurs here @@ -18,7 +18,7 @@ LL | *z.pointer += 1; | --------------- borrow later used here error[E0506]: cannot assign to `*y.pointer` because it is borrowed (Mir) - --> $DIR/issue-45697-1.rs:30:9 + --> $DIR/issue-45697-1.rs:20:9 | LL | let z = copy_borrowed_ptr(&mut y); | ------ borrow of `*y.pointer` occurs here diff --git a/src/test/ui/issues/issue-45697.rs b/src/test/ui/issues/issue-45697.rs index 27acc2c89f75d..d79c6bf3ae43e 100644 --- a/src/test/ui/issues/issue-45697.rs +++ b/src/test/ui/issues/issue-45697.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that assignments to an `&mut` pointer which is found in a // borrowed (but otherwise non-aliasable) location is illegal. diff --git a/src/test/ui/issues/issue-45697.stderr b/src/test/ui/issues/issue-45697.stderr index a85972fcd7a1c..5085d36febac3 100644 --- a/src/test/ui/issues/issue-45697.stderr +++ b/src/test/ui/issues/issue-45697.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `*y.pointer` because it is borrowed (Ast) - --> $DIR/issue-45697.rs:30:9 + --> $DIR/issue-45697.rs:20:9 | LL | let z = copy_borrowed_ptr(&mut y); | - borrow of `*y.pointer` occurs here @@ -7,7 +7,7 @@ LL | *y.pointer += 1; | ^^^^^^^^^^^^^^^ assignment to borrowed `*y.pointer` occurs here error[E0503]: cannot use `*y.pointer` because it was mutably borrowed (Mir) - --> $DIR/issue-45697.rs:30:9 + --> $DIR/issue-45697.rs:20:9 | LL | let z = copy_borrowed_ptr(&mut y); | ------ borrow of `y` occurs here @@ -18,7 +18,7 @@ LL | *z.pointer += 1; | --------------- borrow later used here error[E0506]: cannot assign to `*y.pointer` because it is borrowed (Mir) - --> $DIR/issue-45697.rs:30:9 + --> $DIR/issue-45697.rs:20:9 | LL | let z = copy_borrowed_ptr(&mut y); | ------ borrow of `*y.pointer` occurs here diff --git a/src/test/ui/issues/issue-45729-unsafe-in-generator.rs b/src/test/ui/issues/issue-45729-unsafe-in-generator.rs index b42ced07583f4..638a1994bb5ed 100644 --- a/src/test/ui/issues/issue-45729-unsafe-in-generator.rs +++ b/src/test/ui/issues/issue-45729-unsafe-in-generator.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators)] fn main() { diff --git a/src/test/ui/issues/issue-45729-unsafe-in-generator.stderr b/src/test/ui/issues/issue-45729-unsafe-in-generator.stderr index 3fad5209fd5ea..2aab6807aaa21 100644 --- a/src/test/ui/issues/issue-45729-unsafe-in-generator.stderr +++ b/src/test/ui/issues/issue-45729-unsafe-in-generator.stderr @@ -1,5 +1,5 @@ error[E0133]: dereference of raw pointer is unsafe and requires unsafe function or block - --> $DIR/issue-45729-unsafe-in-generator.rs:15:9 + --> $DIR/issue-45729-unsafe-in-generator.rs:5:9 | LL | *(1 as *mut u32) = 42; | ^^^^^^^^^^^^^^^^^^^^^ dereference of raw pointer diff --git a/src/test/ui/issues/issue-45730.rs b/src/test/ui/issues/issue-45730.rs index d733c8e6de26f..5709125e5f01b 100644 --- a/src/test/ui/issues/issue-45730.rs +++ b/src/test/ui/issues/issue-45730.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt; fn main() { let x: *const _ = 0 as _; //~ ERROR cannot cast diff --git a/src/test/ui/issues/issue-45730.stderr b/src/test/ui/issues/issue-45730.stderr index aa5773e3dbff1..4f2784c6c362b 100644 --- a/src/test/ui/issues/issue-45730.stderr +++ b/src/test/ui/issues/issue-45730.stderr @@ -1,5 +1,5 @@ error[E0641]: cannot cast to a pointer of an unknown kind - --> $DIR/issue-45730.rs:13:23 + --> $DIR/issue-45730.rs:3:23 | LL | let x: *const _ = 0 as _; //~ ERROR cannot cast | ^^^^^- @@ -9,7 +9,7 @@ LL | let x: *const _ = 0 as _; //~ ERROR cannot cast = note: The type information given here is insufficient to check whether the pointer cast is valid error[E0641]: cannot cast to a pointer of an unknown kind - --> $DIR/issue-45730.rs:15:23 + --> $DIR/issue-45730.rs:5:23 | LL | let x: *const _ = 0 as *const _; //~ ERROR cannot cast | ^^^^^-------- @@ -19,7 +19,7 @@ LL | let x: *const _ = 0 as *const _; //~ ERROR cannot cast = note: The type information given here is insufficient to check whether the pointer cast is valid error[E0641]: cannot cast to a pointer of an unknown kind - --> $DIR/issue-45730.rs:18:13 + --> $DIR/issue-45730.rs:8:13 | LL | let x = 0 as *const i32 as *const _ as *mut _; //~ ERROR cannot cast | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^------ diff --git a/src/test/ui/issues/issue-45799-bad-extern-crate-rename-suggestion-formatting.fixed b/src/test/ui/issues/issue-45799-bad-extern-crate-rename-suggestion-formatting.fixed index e3287030408d1..b463848ae94a8 100644 --- a/src/test/ui/issues/issue-45799-bad-extern-crate-rename-suggestion-formatting.fixed +++ b/src/test/ui/issues/issue-45799-bad-extern-crate-rename-suggestion-formatting.fixed @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix extern crate std as other_std; diff --git a/src/test/ui/issues/issue-45799-bad-extern-crate-rename-suggestion-formatting.rs b/src/test/ui/issues/issue-45799-bad-extern-crate-rename-suggestion-formatting.rs index f47ea474d510b..1b491ac7efe06 100644 --- a/src/test/ui/issues/issue-45799-bad-extern-crate-rename-suggestion-formatting.rs +++ b/src/test/ui/issues/issue-45799-bad-extern-crate-rename-suggestion-formatting.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix extern crate std; diff --git a/src/test/ui/issues/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr b/src/test/ui/issues/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr index ecdfec2b3bfd6..61f21233813a6 100644 --- a/src/test/ui/issues/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr +++ b/src/test/ui/issues/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr @@ -1,5 +1,5 @@ error[E0259]: the name `std` is defined multiple times - --> $DIR/issue-45799-bad-extern-crate-rename-suggestion-formatting.rs:13:1 + --> $DIR/issue-45799-bad-extern-crate-rename-suggestion-formatting.rs:3:1 | LL | extern crate std; | ^^^^^^^^^^^^^^^^^ `std` reimported here diff --git a/src/test/ui/issues/issue-45801.rs b/src/test/ui/issues/issue-45801.rs index 7823a7d6ba8b5..780baa896676b 100644 --- a/src/test/ui/issues/issue-45801.rs +++ b/src/test/ui/issues/issue-45801.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Params; pub trait Plugin { diff --git a/src/test/ui/issues/issue-45801.stderr b/src/test/ui/issues/issue-45801.stderr index 91c14be88338e..099cf4e383426 100644 --- a/src/test/ui/issues/issue-45801.stderr +++ b/src/test/ui/issues/issue-45801.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `Params: Plugin` is not satisfied - --> $DIR/issue-45801.rs:31:9 + --> $DIR/issue-45801.rs:21:9 | LL | req.get_ref::(); | ^^^^^^^ the trait `Plugin` is not implemented for `Params` diff --git a/src/test/ui/issues/issue-45965.rs b/src/test/ui/issues/issue-45965.rs index 0b82f2b32ffb9..15649f777e090 100644 --- a/src/test/ui/issues/issue-45965.rs +++ b/src/test/ui/issues/issue-45965.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let a = |r: f64| if r != 0.0(r != 0.0) { 1.0 } else { 0.0 }; //~^ ERROR expected function, found `{float}` diff --git a/src/test/ui/issues/issue-45965.stderr b/src/test/ui/issues/issue-45965.stderr index 2b3870feef37c..0230c71292bb6 100644 --- a/src/test/ui/issues/issue-45965.stderr +++ b/src/test/ui/issues/issue-45965.stderr @@ -1,5 +1,5 @@ error[E0618]: expected function, found `{float}` - --> $DIR/issue-45965.rs:12:30 + --> $DIR/issue-45965.rs:2:30 | LL | let a = |r: f64| if r != 0.0(r != 0.0) { 1.0 } else { 0.0 }; | ^^^^^^^^^^^^^ not a function diff --git a/src/test/ui/issues/issue-46023.ast.nll.stderr b/src/test/ui/issues/issue-46023.ast.nll.stderr index bda629d48affc..05dbe42732b62 100644 --- a/src/test/ui/issues/issue-46023.ast.nll.stderr +++ b/src/test/ui/issues/issue-46023.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to `x`, as it is not declared as mutable - --> $DIR/issue-46023.rs:18:9 + --> $DIR/issue-46023.rs:8:9 | LL | let x = 0; | - help: consider changing this to be mutable: `mut x` diff --git a/src/test/ui/issues/issue-46023.ast.stderr b/src/test/ui/issues/issue-46023.ast.stderr index 42fe73d88e6b9..ace48f8be6b29 100644 --- a/src/test/ui/issues/issue-46023.ast.stderr +++ b/src/test/ui/issues/issue-46023.ast.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to captured outer variable in an `FnMut` closure - --> $DIR/issue-46023.rs:18:9 + --> $DIR/issue-46023.rs:8:9 | LL | let x = 0; | - help: consider making `x` mutable: `mut x` diff --git a/src/test/ui/issues/issue-46023.mir.stderr b/src/test/ui/issues/issue-46023.mir.stderr index bda629d48affc..05dbe42732b62 100644 --- a/src/test/ui/issues/issue-46023.mir.stderr +++ b/src/test/ui/issues/issue-46023.mir.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to `x`, as it is not declared as mutable - --> $DIR/issue-46023.rs:18:9 + --> $DIR/issue-46023.rs:8:9 | LL | let x = 0; | - help: consider changing this to be mutable: `mut x` diff --git a/src/test/ui/issues/issue-46023.rs b/src/test/ui/issues/issue-46023.rs index d5c8cd6d0f8fc..5e7d020b12e53 100644 --- a/src/test/ui/issues/issue-46023.rs +++ b/src/test/ui/issues/issue-46023.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z emit-end-regions -Z borrowck=mir diff --git a/src/test/ui/issues/issue-46036.rs b/src/test/ui/issues/issue-46036.rs index b5cdded4d304a..c517bbe57e82b 100644 --- a/src/test/ui/issues/issue-46036.rs +++ b/src/test/ui/issues/issue-46036.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue 46036: [NLL] false edges on infinite loops // Infinite loops should create false edges to the cleanup block. #![feature(nll)] diff --git a/src/test/ui/issues/issue-46036.stderr b/src/test/ui/issues/issue-46036.stderr index 463abaede88f9..8cd8afda9d8dc 100644 --- a/src/test/ui/issues/issue-46036.stderr +++ b/src/test/ui/issues/issue-46036.stderr @@ -1,5 +1,5 @@ error[E0597]: `a` does not live long enough - --> $DIR/issue-46036.rs:19:24 + --> $DIR/issue-46036.rs:9:24 | LL | let foo = Foo { x: &a }; //~ ERROR E0597 | ^^ borrowed value does not live long enough diff --git a/src/test/ui/issues/issue-46112.rs b/src/test/ui/issues/issue-46112.rs index 698005b5d3068..3e99417b1fc84 100644 --- a/src/test/ui/issues/issue-46112.rs +++ b/src/test/ui/issues/issue-46112.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue 46112: An extern crate pub re-exporting libcore was causing // paths rooted from `std` to be misrendered in the diagnostic output. diff --git a/src/test/ui/issues/issue-46112.stderr b/src/test/ui/issues/issue-46112.stderr index 796187b93aa94..939d945c19133 100644 --- a/src/test/ui/issues/issue-46112.stderr +++ b/src/test/ui/issues/issue-46112.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-46112.rs:19:21 + --> $DIR/issue-46112.rs:9:21 | LL | fn main() { test(Ok(())); } | ^^ diff --git a/src/test/ui/issues/issue-46186.rs b/src/test/ui/issues/issue-46186.rs index 1440b9e8cdc5f..de7d13a228084 100644 --- a/src/test/ui/issues/issue-46186.rs +++ b/src/test/ui/issues/issue-46186.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Struct { a: usize, }; //~ ERROR expected item, found `;` diff --git a/src/test/ui/issues/issue-46186.stderr b/src/test/ui/issues/issue-46186.stderr index c64d5c68a79b0..11a1fc072c974 100644 --- a/src/test/ui/issues/issue-46186.stderr +++ b/src/test/ui/issues/issue-46186.stderr @@ -1,5 +1,5 @@ error: expected item, found `;` - --> $DIR/issue-46186.rs:13:2 + --> $DIR/issue-46186.rs:3:2 | LL | }; //~ ERROR expected item, found `;` | ^ help: consider removing this semicolon diff --git a/src/test/ui/issues/issue-46302.rs b/src/test/ui/issues/issue-46302.rs index 6ae6b549b070e..ba681d84eff84 100644 --- a/src/test/ui/issues/issue-46302.rs +++ b/src/test/ui/issues/issue-46302.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo() { let s = "abc"; let u: &str = if true { s[..2] } else { s }; diff --git a/src/test/ui/issues/issue-46302.stderr b/src/test/ui/issues/issue-46302.stderr index 8e399136fadba..8eb3a4dda34e8 100644 --- a/src/test/ui/issues/issue-46302.stderr +++ b/src/test/ui/issues/issue-46302.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-46302.rs:13:27 + --> $DIR/issue-46302.rs:3:27 | LL | let u: &str = if true { s[..2] } else { s }; | ^^^^^^ diff --git a/src/test/ui/issues/issue-46311.rs b/src/test/ui/issues/issue-46311.rs index 82f55f2c14241..1233a49c582b1 100644 --- a/src/test/ui/issues/issue-46311.rs +++ b/src/test/ui/issues/issue-46311.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { 'break: loop { //~ ERROR invalid label name `'break` } diff --git a/src/test/ui/issues/issue-46311.stderr b/src/test/ui/issues/issue-46311.stderr index 790399c75ee0f..8ceb1d62c25c7 100644 --- a/src/test/ui/issues/issue-46311.stderr +++ b/src/test/ui/issues/issue-46311.stderr @@ -1,5 +1,5 @@ error: invalid label name `'break` - --> $DIR/issue-46311.rs:12:5 + --> $DIR/issue-46311.rs:2:5 | LL | 'break: loop { //~ ERROR invalid label name `'break` | ^^^^^^ diff --git a/src/test/ui/issues/issue-46332.rs b/src/test/ui/issues/issue-46332.rs index d094497e246d0..bed74e3138a66 100644 --- a/src/test/ui/issues/issue-46332.rs +++ b/src/test/ui/issues/issue-46332.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Original Levenshtein distance for both of this is 1. We improved accuracy with // additional case insensitive comparison. diff --git a/src/test/ui/issues/issue-46332.stderr b/src/test/ui/issues/issue-46332.stderr index 06553767cc973..785deb77ef7a2 100644 --- a/src/test/ui/issues/issue-46332.stderr +++ b/src/test/ui/issues/issue-46332.stderr @@ -1,5 +1,5 @@ error[E0422]: cannot find struct, variant or union type `TyUInt` in this scope - --> $DIR/issue-46332.rs:19:5 + --> $DIR/issue-46332.rs:9:5 | LL | TyUInt {}; | ^^^^^^ did you mean `TyUint`? diff --git a/src/test/ui/issues/issue-46438.rs b/src/test/ui/issues/issue-46438.rs index d84b58133853f..a16c4c31d81c4 100644 --- a/src/test/ui/issues/issue-46438.rs +++ b/src/test/ui/issues/issue-46438.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! m { ($my_type: ty) => { impl $my_type for u8 {} diff --git a/src/test/ui/issues/issue-46438.stderr b/src/test/ui/issues/issue-46438.stderr index b0d6229d24b1f..c670459c78166 100644 --- a/src/test/ui/issues/issue-46438.stderr +++ b/src/test/ui/issues/issue-46438.stderr @@ -1,5 +1,5 @@ error: expected a trait, found type - --> $DIR/issue-46438.rs:21:4 + --> $DIR/issue-46438.rs:11:4 | LL | m!(&'static u8); //~ ERROR expected a trait, found type | ^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-46471-1.rs b/src/test/ui/issues/issue-46471-1.rs index 0dbcdea89f940..e212b3f0cf30c 100644 --- a/src/test/ui/issues/issue-46471-1.rs +++ b/src/test/ui/issues/issue-46471-1.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z emit-end-regions -Z borrowck=compare fn main() { diff --git a/src/test/ui/issues/issue-46471-1.stderr b/src/test/ui/issues/issue-46471-1.stderr index 7d12827dda5d2..1c191ceaceb2c 100644 --- a/src/test/ui/issues/issue-46471-1.stderr +++ b/src/test/ui/issues/issue-46471-1.stderr @@ -1,5 +1,5 @@ error[E0597]: `z` does not live long enough (Ast) - --> $DIR/issue-46471-1.rs:16:14 + --> $DIR/issue-46471-1.rs:6:14 | LL | &mut z | ^ borrowed value does not live long enough @@ -10,7 +10,7 @@ LL | } | - borrowed value needs to live until here error[E0597]: `z` does not live long enough (Mir) - --> $DIR/issue-46471-1.rs:16:9 + --> $DIR/issue-46471-1.rs:6:9 | LL | let y = { | _____________- diff --git a/src/test/ui/issues/issue-46471.rs b/src/test/ui/issues/issue-46471.rs index 8faedb738429f..5d55ae8edcb83 100644 --- a/src/test/ui/issues/issue-46471.rs +++ b/src/test/ui/issues/issue-46471.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z emit-end-regions -Z borrowck=compare fn foo() -> &'static u32 { diff --git a/src/test/ui/issues/issue-46471.stderr b/src/test/ui/issues/issue-46471.stderr index 560c341b4df05..a72e7396a16fb 100644 --- a/src/test/ui/issues/issue-46471.stderr +++ b/src/test/ui/issues/issue-46471.stderr @@ -1,5 +1,5 @@ error[E0597]: `x` does not live long enough (Ast) - --> $DIR/issue-46471.rs:15:6 + --> $DIR/issue-46471.rs:5:6 | LL | &x | ^ borrowed value does not live long enough @@ -10,7 +10,7 @@ LL | } = note: borrowed value must be valid for the static lifetime... error[E0597]: `x` does not live long enough (Mir) - --> $DIR/issue-46471.rs:15:5 + --> $DIR/issue-46471.rs:5:5 | LL | &x | ^^ borrowed value does not live long enough diff --git a/src/test/ui/issues/issue-46472.rs b/src/test/ui/issues/issue-46472.rs index 02c4dd7cb21d8..26040c98aa3f9 100644 --- a/src/test/ui/issues/issue-46472.rs +++ b/src/test/ui/issues/issue-46472.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z emit-end-regions -Z borrowck=compare fn bar<'a>() -> &'a mut u32 { diff --git a/src/test/ui/issues/issue-46472.stderr b/src/test/ui/issues/issue-46472.stderr index 9e5acf56d26ca..98b2dbd15b505 100644 --- a/src/test/ui/issues/issue-46472.stderr +++ b/src/test/ui/issues/issue-46472.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough (Ast) - --> $DIR/issue-46472.rs:14:10 + --> $DIR/issue-46472.rs:4:10 | LL | &mut 4 | ^ temporary value does not live long enough @@ -7,14 +7,14 @@ LL | &mut 4 LL | } | - temporary value only lives until here | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 13:8... - --> $DIR/issue-46472.rs:13:8 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 3:8... + --> $DIR/issue-46472.rs:3:8 | LL | fn bar<'a>() -> &'a mut u32 { | ^^ error[E0597]: borrowed value does not live long enough (Mir) - --> $DIR/issue-46472.rs:14:10 + --> $DIR/issue-46472.rs:4:10 | LL | &mut 4 | ^ temporary value does not live long enough @@ -22,8 +22,8 @@ LL | &mut 4 LL | } | - temporary value only lives until here | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 13:8... - --> $DIR/issue-46472.rs:13:8 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 3:8... + --> $DIR/issue-46472.rs:3:8 | LL | fn bar<'a>() -> &'a mut u32 { | ^^ diff --git a/src/test/ui/issues/issue-46576.rs b/src/test/ui/issues/issue-46576.rs index 636a1e9a06428..821d2724bc3e3 100644 --- a/src/test/ui/issues/issue-46576.rs +++ b/src/test/ui/issues/issue-46576.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no std::fs support #![allow(dead_code)] diff --git a/src/test/ui/issues/issue-46576.stderr b/src/test/ui/issues/issue-46576.stderr index 0590de0bd359d..4b66219dd3d19 100644 --- a/src/test/ui/issues/issue-46576.stderr +++ b/src/test/ui/issues/issue-46576.stderr @@ -1,11 +1,11 @@ error: unused import: `BufRead` - --> $DIR/issue-46576.rs:17:15 + --> $DIR/issue-46576.rs:7:15 | LL | use std::io::{BufRead, BufReader, Read}; | ^^^^^^^ | note: lint level defined here - --> $DIR/issue-46576.rs:14:9 + --> $DIR/issue-46576.rs:4:9 | LL | #![deny(unused_imports)] | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-46604.ast.nll.stderr b/src/test/ui/issues/issue-46604.ast.nll.stderr index a4ee0d4e2a3a9..ed23a69edb987 100644 --- a/src/test/ui/issues/issue-46604.ast.nll.stderr +++ b/src/test/ui/issues/issue-46604.ast.nll.stderr @@ -1,11 +1,11 @@ error[E0017]: references in statics may only refer to immutable values - --> $DIR/issue-46604.rs:14:25 + --> $DIR/issue-46604.rs:4:25 | LL | static buf: &mut [u8] = &mut [1u8,2,3,4,5,7]; //[ast]~ ERROR E0017 | ^^^^^^^^^^^^^^^^^^^^ statics require immutable values error[E0594]: cannot assign to `buf[..]`, as `buf` is an immutable static item - --> $DIR/issue-46604.rs:20:5 + --> $DIR/issue-46604.rs:10:5 | LL | buf[0]=2; //[ast]~ ERROR E0389 | ^^^^^^^^ cannot assign diff --git a/src/test/ui/issues/issue-46604.ast.stderr b/src/test/ui/issues/issue-46604.ast.stderr index 713ba476a1c27..14b9242ba0c3d 100644 --- a/src/test/ui/issues/issue-46604.ast.stderr +++ b/src/test/ui/issues/issue-46604.ast.stderr @@ -1,11 +1,11 @@ error[E0017]: references in statics may only refer to immutable values - --> $DIR/issue-46604.rs:14:25 + --> $DIR/issue-46604.rs:4:25 | LL | static buf: &mut [u8] = &mut [1u8,2,3,4,5,7]; //[ast]~ ERROR E0017 | ^^^^^^^^^^^^^^^^^^^^ statics require immutable values error[E0389]: cannot assign to data in a `&` reference - --> $DIR/issue-46604.rs:20:5 + --> $DIR/issue-46604.rs:10:5 | LL | buf[0]=2; //[ast]~ ERROR E0389 | ^^^^^^^^ assignment into an immutable reference diff --git a/src/test/ui/issues/issue-46604.mir.stderr b/src/test/ui/issues/issue-46604.mir.stderr index a4ee0d4e2a3a9..ed23a69edb987 100644 --- a/src/test/ui/issues/issue-46604.mir.stderr +++ b/src/test/ui/issues/issue-46604.mir.stderr @@ -1,11 +1,11 @@ error[E0017]: references in statics may only refer to immutable values - --> $DIR/issue-46604.rs:14:25 + --> $DIR/issue-46604.rs:4:25 | LL | static buf: &mut [u8] = &mut [1u8,2,3,4,5,7]; //[ast]~ ERROR E0017 | ^^^^^^^^^^^^^^^^^^^^ statics require immutable values error[E0594]: cannot assign to `buf[..]`, as `buf` is an immutable static item - --> $DIR/issue-46604.rs:20:5 + --> $DIR/issue-46604.rs:10:5 | LL | buf[0]=2; //[ast]~ ERROR E0389 | ^^^^^^^^ cannot assign diff --git a/src/test/ui/issues/issue-46604.rs b/src/test/ui/issues/issue-46604.rs index dc14eca1e6734..34fe3af3ab6ca 100644 --- a/src/test/ui/issues/issue-46604.rs +++ b/src/test/ui/issues/issue-46604.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.fixed b/src/test/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.fixed index 77171cad6e714..8668d8acd5b30 100644 --- a/src/test/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.fixed +++ b/src/test/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.fixed @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix #![allow(unused)] diff --git a/src/test/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.rs b/src/test/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.rs index e5ea9b5ed099d..c8494612ca340 100644 --- a/src/test/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.rs +++ b/src/test/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix #![allow(unused)] diff --git a/src/test/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.stderr b/src/test/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.stderr index 9c492751ca1a0..1eeca3e75b003 100644 --- a/src/test/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.stderr +++ b/src/test/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-46756-consider-borrowing-cast-or-binexpr.rs:22:42 + --> $DIR/issue-46756-consider-borrowing-cast-or-binexpr.rs:12:42 | LL | light_flows_our_war_of_mocking_words(behold as usize); | ^^^^^^^^^^^^^^^ @@ -11,7 +11,7 @@ LL | light_flows_our_war_of_mocking_words(behold as usize); found type `usize` error[E0308]: mismatched types - --> $DIR/issue-46756-consider-borrowing-cast-or-binexpr.rs:24:42 + --> $DIR/issue-46756-consider-borrowing-cast-or-binexpr.rs:14:42 | LL | light_flows_our_war_of_mocking_words(with_tears + 4); | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-46771.rs b/src/test/ui/issues/issue-46771.rs index f8bcd8861f3a6..2b5241e5ff64b 100644 --- a/src/test/ui/issues/issue-46771.rs +++ b/src/test/ui/issues/issue-46771.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { struct Foo; (1 .. 2).find(|_| Foo(0) == 0); //~ ERROR expected function, found `main::Foo` diff --git a/src/test/ui/issues/issue-46771.stderr b/src/test/ui/issues/issue-46771.stderr index 0d57d61e9ffe6..f05416cfa923c 100644 --- a/src/test/ui/issues/issue-46771.stderr +++ b/src/test/ui/issues/issue-46771.stderr @@ -1,5 +1,5 @@ error[E0618]: expected function, found `main::Foo` - --> $DIR/issue-46771.rs:13:23 + --> $DIR/issue-46771.rs:3:23 | LL | struct Foo; | ----------- `main::Foo` defined here diff --git a/src/test/ui/issues/issue-46843.rs b/src/test/ui/issues/issue-46843.rs index d88b4e568b034..a310de624d271 100644 --- a/src/test/ui/issues/issue-46843.rs +++ b/src/test/ui/issues/issue-46843.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Thing { This, That } fn non_const() -> Thing { diff --git a/src/test/ui/issues/issue-46843.stderr b/src/test/ui/issues/issue-46843.stderr index 9b752f41f59e4..d02561e4a2727 100644 --- a/src/test/ui/issues/issue-46843.stderr +++ b/src/test/ui/issues/issue-46843.stderr @@ -1,11 +1,11 @@ error[E0015]: calls in constants are limited to constant functions, tuple structs and tuple variants - --> $DIR/issue-46843.rs:17:26 + --> $DIR/issue-46843.rs:7:26 | LL | pub const Q: i32 = match non_const() { //~ ERROR E0015 | ^^^^^^^^^^^ error[E0019]: constant contains unimplemented expression type - --> $DIR/issue-46843.rs:18:5 + --> $DIR/issue-46843.rs:8:5 | LL | Thing::This => 1, //~ ERROR unimplemented expression type | ^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-46983.rs b/src/test/ui/issues/issue-46983.rs index ebbd474b1c2b2..a5c1e17a58c3b 100644 --- a/src/test/ui/issues/issue-46983.rs +++ b/src/test/ui/issues/issue-46983.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] fn foo(x: &u32) -> &'static u32 { diff --git a/src/test/ui/issues/issue-46983.stderr b/src/test/ui/issues/issue-46983.stderr index c4f2b3eba7dda..43d351ec905e3 100644 --- a/src/test/ui/issues/issue-46983.stderr +++ b/src/test/ui/issues/issue-46983.stderr @@ -1,5 +1,5 @@ error[E0621]: explicit lifetime required in the type of `x` - --> $DIR/issue-46983.rs:14:5 + --> $DIR/issue-46983.rs:4:5 | LL | fn foo(x: &u32) -> &'static u32 { | ---- help: add explicit lifetime `'static` to the type of `x`: `&'static u32` diff --git a/src/test/ui/issues/issue-47073-zero-padded-tuple-struct-indices.rs b/src/test/ui/issues/issue-47073-zero-padded-tuple-struct-indices.rs index c59a9bc4170bd..6cd1f144359ba 100644 --- a/src/test/ui/issues/issue-47073-zero-padded-tuple-struct-indices.rs +++ b/src/test/ui/issues/issue-47073-zero-padded-tuple-struct-indices.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - type Guilty = bool; type FineDollars = u32; diff --git a/src/test/ui/issues/issue-47073-zero-padded-tuple-struct-indices.stderr b/src/test/ui/issues/issue-47073-zero-padded-tuple-struct-indices.stderr index 4a1c9b554a931..6e8d1ef2f7b9e 100644 --- a/src/test/ui/issues/issue-47073-zero-padded-tuple-struct-indices.stderr +++ b/src/test/ui/issues/issue-47073-zero-padded-tuple-struct-indices.stderr @@ -1,11 +1,11 @@ error[E0609]: no field `00` on type `Verdict` - --> $DIR/issue-47073-zero-padded-tuple-struct-indices.rs:18:30 + --> $DIR/issue-47073-zero-padded-tuple-struct-indices.rs:8:30 | LL | let _condemned = justice.00; | ^^ did you mean `0`? error[E0609]: no field `001` on type `Verdict` - --> $DIR/issue-47073-zero-padded-tuple-struct-indices.rs:20:31 + --> $DIR/issue-47073-zero-padded-tuple-struct-indices.rs:10:31 | LL | let _punishment = justice.001; | ^^^ unknown field diff --git a/src/test/ui/issues/issue-47094.rs b/src/test/ui/issues/issue-47094.rs index 2b78c7d9b708d..6c78a3ba964b4 100644 --- a/src/test/ui/issues/issue-47094.rs +++ b/src/test/ui/issues/issue-47094.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #[repr(C,u8)] diff --git a/src/test/ui/issues/issue-47094.stderr b/src/test/ui/issues/issue-47094.stderr index f4b622a00fee6..16bcec0c7bb3a 100644 --- a/src/test/ui/issues/issue-47094.stderr +++ b/src/test/ui/issues/issue-47094.stderr @@ -1,11 +1,11 @@ warning[E0566]: conflicting representation hints - --> $DIR/issue-47094.rs:13:8 + --> $DIR/issue-47094.rs:3:8 | LL | #[repr(C,u8)] | ^ ^^ warning[E0566]: conflicting representation hints - --> $DIR/issue-47094.rs:19:8 + --> $DIR/issue-47094.rs:9:8 | LL | #[repr(C)] | ^ diff --git a/src/test/ui/issues/issue-47184.rs b/src/test/ui/issues/issue-47184.rs index 0831b7e0af8e2..f965fbf0e0c8f 100644 --- a/src/test/ui/issues/issue-47184.rs +++ b/src/test/ui/issues/issue-47184.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] fn main() { diff --git a/src/test/ui/issues/issue-47184.stderr b/src/test/ui/issues/issue-47184.stderr index 32a9783e9c213..a466f09c66efe 100644 --- a/src/test/ui/issues/issue-47184.stderr +++ b/src/test/ui/issues/issue-47184.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/issue-47184.rs:14:44 + --> $DIR/issue-47184.rs:4:44 | LL | let _vec: Vec<&'static String> = vec![&String::new()]; | ^^^^^^^^^^^^^ - temporary value only lives until here diff --git a/src/test/ui/issues/issue-47309.rs b/src/test/ui/issues/issue-47309.rs index 1b9ff36f7145d..a9aeecb61b6a5 100644 --- a/src/test/ui/issues/issue-47309.rs +++ b/src/test/ui/issues/issue-47309.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Make sure that the mono-item collector does not crash when trying to // instantiate a default impl of a method with lifetime parameters. // See https://github.com/rust-lang/rust/issues/47309 diff --git a/src/test/ui/issues/issue-4736.rs b/src/test/ui/issues/issue-4736.rs index 19803079d0224..799d2d4809860 100644 --- a/src/test/ui/issues/issue-4736.rs +++ b/src/test/ui/issues/issue-4736.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct NonCopyable(()); fn main() { diff --git a/src/test/ui/issues/issue-4736.stderr b/src/test/ui/issues/issue-4736.stderr index 6c0acc0b63f40..eac7e65064d49 100644 --- a/src/test/ui/issues/issue-4736.stderr +++ b/src/test/ui/issues/issue-4736.stderr @@ -1,5 +1,5 @@ error[E0560]: struct `NonCopyable` has no field named `p` - --> $DIR/issue-4736.rs:14:26 + --> $DIR/issue-4736.rs:4:26 | LL | let z = NonCopyable{ p: () }; //~ ERROR struct `NonCopyable` has no field named `p` | ^ field does not exist - did you mean `0`? diff --git a/src/test/ui/issues/issue-47377.rs b/src/test/ui/issues/issue-47377.rs index f294008cfd0d5..7a2e0fe6d21df 100644 --- a/src/test/ui/issues/issue-47377.rs +++ b/src/test/ui/issues/issue-47377.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // ignore-tidy-tab fn main() { let b = "hello"; diff --git a/src/test/ui/issues/issue-47377.stderr b/src/test/ui/issues/issue-47377.stderr index 66c4a1277a0f1..1e945727746e9 100644 --- a/src/test/ui/issues/issue-47377.stderr +++ b/src/test/ui/issues/issue-47377.stderr @@ -1,5 +1,5 @@ error[E0369]: binary operation `+` cannot be applied to type `&str` - --> $DIR/issue-47377.rs:13:12 + --> $DIR/issue-47377.rs:4:12 | LL | let _a = b + ", World!"; | ^^^^^^^^^^^^^^ `+` can't be used to concatenate two `&str` strings diff --git a/src/test/ui/issues/issue-47380.rs b/src/test/ui/issues/issue-47380.rs index e43a967253ca8..61e096622252b 100644 --- a/src/test/ui/issues/issue-47380.rs +++ b/src/test/ui/issues/issue-47380.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. fn main() { let b = "hello"; println!("🦀🦀🦀🦀🦀"); let _a = b + ", World!"; diff --git a/src/test/ui/issues/issue-47380.stderr b/src/test/ui/issues/issue-47380.stderr index 585a2ec64d06c..84c5df3ca897b 100644 --- a/src/test/ui/issues/issue-47380.stderr +++ b/src/test/ui/issues/issue-47380.stderr @@ -1,5 +1,5 @@ error[E0369]: binary operation `+` cannot be applied to type `&str` - --> $DIR/issue-47380.rs:12:33 + --> $DIR/issue-47380.rs:3:33 | LL | println!("🦀🦀🦀🦀🦀"); let _a = b + ", World!"; | ^^^^^^^^^^^^^^ `+` can't be used to concatenate two `&str` strings diff --git a/src/test/ui/issues/issue-47412.rs b/src/test/ui/issues/issue-47412.rs index 683ef876f4e37..2d1ea72280b2d 100644 --- a/src/test/ui/issues/issue-47412.rs +++ b/src/test/ui/issues/issue-47412.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Copy, Clone)] enum Void {} diff --git a/src/test/ui/issues/issue-47412.stderr b/src/test/ui/issues/issue-47412.stderr index d8a47efc0aaa4..0f003c44b70aa 100644 --- a/src/test/ui/issues/issue-47412.stderr +++ b/src/test/ui/issues/issue-47412.stderr @@ -1,5 +1,5 @@ error[E0133]: access to union field is unsafe and requires unsafe function or block - --> $DIR/issue-47412.rs:21:11 + --> $DIR/issue-47412.rs:11:11 | LL | match u.void {} | ^^^^^^ access to union field @@ -7,7 +7,7 @@ LL | match u.void {} = note: the field may not be properly initialized: using uninitialized data will cause undefined behavior error[E0133]: dereference of raw pointer is unsafe and requires unsafe function or block - --> $DIR/issue-47412.rs:27:11 + --> $DIR/issue-47412.rs:17:11 | LL | match *ptr {} | ^^^^ dereference of raw pointer diff --git a/src/test/ui/issues/issue-47511.rs b/src/test/ui/issues/issue-47511.rs index df4ff301bc9ce..0f33b52577b70 100644 --- a/src/test/ui/issues/issue-47511.rs +++ b/src/test/ui/issues/issue-47511.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #47511: anonymous lifetimes can appear // unconstrained in a return type, but only if they appear just once // in the input, as the input to a projection. diff --git a/src/test/ui/issues/issue-47511.stderr b/src/test/ui/issues/issue-47511.stderr index 6ee71fc6c73d3..42f2cd1bb1401 100644 --- a/src/test/ui/issues/issue-47511.stderr +++ b/src/test/ui/issues/issue-47511.stderr @@ -1,5 +1,5 @@ error[E0581]: return type references an anonymous lifetime which is not constrained by the fn input types - --> $DIR/issue-47511.rs:15:15 + --> $DIR/issue-47511.rs:5:15 | LL | fn f(_: X) -> X { | ^ @@ -7,7 +7,7 @@ LL | fn f(_: X) -> X { = note: lifetimes appearing in an associated type are not considered constrained error[E0581]: return type references lifetime `'a`, which is not constrained by the fn input types - --> $DIR/issue-47511.rs:20:23 + --> $DIR/issue-47511.rs:10:23 | LL | fn g<'a>(_: X<'a>) -> X<'a> { | ^^^^^ diff --git a/src/test/ui/issues/issue-47623.rs b/src/test/ui/issues/issue-47623.rs index 0c886fdb52faa..ad8aa4c1a2bd6 100644 --- a/src/test/ui/issues/issue-47623.rs +++ b/src/test/ui/issues/issue-47623.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use self; //~ERROR `self` imports are only allowed within a { } list fn main() {} diff --git a/src/test/ui/issues/issue-47623.stderr b/src/test/ui/issues/issue-47623.stderr index 8cbed1c293e1f..eb160ff86aec9 100644 --- a/src/test/ui/issues/issue-47623.stderr +++ b/src/test/ui/issues/issue-47623.stderr @@ -1,5 +1,5 @@ error[E0429]: `self` imports are only allowed within a { } list - --> $DIR/issue-47623.rs:11:5 + --> $DIR/issue-47623.rs:1:5 | LL | use self; //~ERROR `self` imports are only allowed within a { } list | ^^^^ diff --git a/src/test/ui/issues/issue-47646.rs b/src/test/ui/issues/issue-47646.rs index 7a6d6dd3fe1b4..c3c07bf641161 100644 --- a/src/test/ui/issues/issue-47646.rs +++ b/src/test/ui/issues/issue-47646.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(warnings)] #![feature(nll)] diff --git a/src/test/ui/issues/issue-47646.stderr b/src/test/ui/issues/issue-47646.stderr index 4bdce85d18b5f..f7ba810680155 100644 --- a/src/test/ui/issues/issue-47646.stderr +++ b/src/test/ui/issues/issue-47646.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `heap` as immutable because it is also borrowed as mutable - --> $DIR/issue-47646.rs:22:30 + --> $DIR/issue-47646.rs:12:30 | LL | let borrow = heap.peek_mut(); | ---- mutable borrow occurs here diff --git a/src/test/ui/issues/issue-47706-trait.rs b/src/test/ui/issues/issue-47706-trait.rs index 4ce653547da03..8fb4e0855687d 100644 --- a/src/test/ui/issues/issue-47706-trait.rs +++ b/src/test/ui/issues/issue-47706-trait.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait T { fn f(&self, _: ()) { None::<()>.map(Self::f); diff --git a/src/test/ui/issues/issue-47706-trait.stderr b/src/test/ui/issues/issue-47706-trait.stderr index 717b3eb0b5625..5f8f8564249c8 100644 --- a/src/test/ui/issues/issue-47706-trait.stderr +++ b/src/test/ui/issues/issue-47706-trait.stderr @@ -1,5 +1,5 @@ error[E0593]: function is expected to take a single 0-tuple as argument, but it takes 2 distinct arguments - --> $DIR/issue-47706-trait.rs:13:20 + --> $DIR/issue-47706-trait.rs:3:20 | LL | fn f(&self, _: ()) { | ------------------ takes 2 distinct arguments diff --git a/src/test/ui/issues/issue-47706.rs b/src/test/ui/issues/issue-47706.rs index 9c521dd647963..f47c1e694442f 100644 --- a/src/test/ui/issues/issue-47706.rs +++ b/src/test/ui/issues/issue-47706.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Foo { foo: Option, } diff --git a/src/test/ui/issues/issue-47706.stderr b/src/test/ui/issues/issue-47706.stderr index 0a5c8beccd131..fa2e00cde4dff 100644 --- a/src/test/ui/issues/issue-47706.stderr +++ b/src/test/ui/issues/issue-47706.stderr @@ -1,5 +1,5 @@ error[E0593]: function is expected to take 1 argument, but it takes 2 arguments - --> $DIR/issue-47706.rs:21:18 + --> $DIR/issue-47706.rs:11:18 | LL | pub fn new(foo: Option, _: ()) -> Foo { | ------------------------------------------ takes 2 arguments @@ -8,7 +8,7 @@ LL | self.foo.map(Foo::new) | ^^^ expected function that takes 1 argument error[E0593]: function is expected to take 0 arguments, but it takes 1 argument - --> $DIR/issue-47706.rs:37:5 + --> $DIR/issue-47706.rs:27:5 | LL | Bar(i32), | -------- takes 1 argument @@ -17,7 +17,7 @@ LL | foo(Qux::Bar); | ^^^ expected function that takes 0 arguments | note: required by `foo` - --> $DIR/issue-47706.rs:30:1 + --> $DIR/issue-47706.rs:20:1 | LL | / fn foo(f: F) LL | | where diff --git a/src/test/ui/issues/issue-47715.rs b/src/test/ui/issues/issue-47715.rs index b6b720f088aee..478ac6a2e8910 100644 --- a/src/test/ui/issues/issue-47715.rs +++ b/src/test/ui/issues/issue-47715.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo {} trait Bar {} diff --git a/src/test/ui/issues/issue-47715.stderr b/src/test/ui/issues/issue-47715.stderr index 29b6afe7d0729..296de362db1b1 100644 --- a/src/test/ui/issues/issue-47715.stderr +++ b/src/test/ui/issues/issue-47715.stderr @@ -1,23 +1,23 @@ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/issue-47715.rs:19:37 + --> $DIR/issue-47715.rs:9:37 | LL | struct Container> { | ^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/issue-47715.rs:24:30 + --> $DIR/issue-47715.rs:14:30 | LL | enum Enum> { | ^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/issue-47715.rs:29:32 + --> $DIR/issue-47715.rs:19:32 | LL | union Union + Copy> { | ^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/issue-47715.rs:34:30 + --> $DIR/issue-47715.rs:24:30 | LL | type Type> = T; | ^^^^^^^^ diff --git a/src/test/ui/issues/issue-48131.rs b/src/test/ui/issues/issue-48131.rs index 9eb567a5d3eb0..b3cc350acf532 100644 --- a/src/test/ui/issues/issue-48131.rs +++ b/src/test/ui/issues/issue-48131.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This note is annotated because the purpose of the test // is to ensure that certain other notes are not generated. #![deny(unused_unsafe)] //~ NOTE diff --git a/src/test/ui/issues/issue-48131.stderr b/src/test/ui/issues/issue-48131.stderr index d0ba1a1c37d0e..6e454173f8bc0 100644 --- a/src/test/ui/issues/issue-48131.stderr +++ b/src/test/ui/issues/issue-48131.stderr @@ -1,17 +1,17 @@ error: unnecessary `unsafe` block - --> $DIR/issue-48131.rs:18:9 + --> $DIR/issue-48131.rs:8:9 | LL | unsafe { /* unnecessary */ } //~ ERROR unnecessary `unsafe` | ^^^^^^ unnecessary `unsafe` block | note: lint level defined here - --> $DIR/issue-48131.rs:13:9 + --> $DIR/issue-48131.rs:3:9 | LL | #![deny(unused_unsafe)] //~ NOTE | ^^^^^^^^^^^^^ error: unnecessary `unsafe` block - --> $DIR/issue-48131.rs:29:13 + --> $DIR/issue-48131.rs:19:13 | LL | unsafe { /* unnecessary */ } //~ ERROR unnecessary `unsafe` | ^^^^^^ unnecessary `unsafe` block diff --git a/src/test/ui/issues/issue-48132.rs b/src/test/ui/issues/issue-48132.rs index 87fee986de768..b3cef78f3e6b4 100644 --- a/src/test/ui/issues/issue-48132.rs +++ b/src/test/ui/issues/issue-48132.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #48132. This was failing due to problems around // the projection caching and dropck type enumeration. diff --git a/src/test/ui/issues/issue-48179.rs b/src/test/ui/issues/issue-48179.rs index 745b59e0658f1..245f13b2b609d 100644 --- a/src/test/ui/issues/issue-48179.rs +++ b/src/test/ui/issues/issue-48179.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #48132. This was failing due to problems around // the projection caching and dropck type enumeration. diff --git a/src/test/ui/issues/issue-48276.rs b/src/test/ui/issues/issue-48276.rs index 30d11a2e37f15..f55c056fa67d2 100644 --- a/src/test/ui/issues/issue-48276.rs +++ b/src/test/ui/issues/issue-48276.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #48276 - ICE when self type does not match what is // required by a trait and regions are involved. diff --git a/src/test/ui/issues/issue-48276.stderr b/src/test/ui/issues/issue-48276.stderr index db4894aa6916a..370905ee0dfb1 100644 --- a/src/test/ui/issues/issue-48276.stderr +++ b/src/test/ui/issues/issue-48276.stderr @@ -1,5 +1,5 @@ error[E0185]: method `from` has a `&self` declaration in the impl, but not in the trait - --> $DIR/issue-48276.rs:21:5 + --> $DIR/issue-48276.rs:11:5 | LL | fn from(a: A) -> Self; | ---------------------- trait method declared without `&self` @@ -8,7 +8,7 @@ LL | fn from(self: &'a Self) -> &'b str { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `&self` used in impl error[E0185]: method `from` has a `&self` declaration in the impl, but not in the trait - --> $DIR/issue-48276.rs:30:5 + --> $DIR/issue-48276.rs:20:5 | LL | fn from(&self) -> B { | ^^^^^^^^^^^^^^^^^^^ `&self` used in impl @@ -16,7 +16,7 @@ LL | fn from(&self) -> B { = note: `from` from trait: `fn(T) -> Self` error[E0185]: method `from` has a `&self` declaration in the impl, but not in the trait - --> $DIR/issue-48276.rs:37:5 + --> $DIR/issue-48276.rs:27:5 | LL | fn from(&self) -> &'static str { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `&self` used in impl diff --git a/src/test/ui/issues/issue-48364.rs b/src/test/ui/issues/issue-48364.rs index 82cb722a65600..14ee75e7c9cb6 100644 --- a/src/test/ui/issues/issue-48364.rs +++ b/src/test/ui/issues/issue-48364.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo() -> bool { b"".starts_with(stringify!(foo)) //~^ ERROR mismatched types diff --git a/src/test/ui/issues/issue-48364.stderr b/src/test/ui/issues/issue-48364.stderr index b420654a32d8c..7a1ba5bb19361 100644 --- a/src/test/ui/issues/issue-48364.stderr +++ b/src/test/ui/issues/issue-48364.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-48364.rs:12:21 + --> $DIR/issue-48364.rs:2:21 | LL | b"".starts_with(stringify!(foo)) | ^^^^^^^^^^^^^^^ expected slice, found str diff --git a/src/test/ui/issues/issue-48636.fixed b/src/test/ui/issues/issue-48636.fixed index 0ff33c42b1c82..39e6c98b1f5b9 100644 --- a/src/test/ui/issues/issue-48636.fixed +++ b/src/test/ui/issues/issue-48636.fixed @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix #![allow(dead_code)] diff --git a/src/test/ui/issues/issue-48636.rs b/src/test/ui/issues/issue-48636.rs index 2ac41211347b5..bcf57772b515f 100644 --- a/src/test/ui/issues/issue-48636.rs +++ b/src/test/ui/issues/issue-48636.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix #![allow(dead_code)] diff --git a/src/test/ui/issues/issue-48636.stderr b/src/test/ui/issues/issue-48636.stderr index c4706f982ed74..de335d2c29b18 100644 --- a/src/test/ui/issues/issue-48636.stderr +++ b/src/test/ui/issues/issue-48636.stderr @@ -1,5 +1,5 @@ error[E0585]: found a documentation comment that doesn't document anything - --> $DIR/issue-48636.rs:17:5 + --> $DIR/issue-48636.rs:7:5 | LL | x: u8 | - help: missing comma here: `,` diff --git a/src/test/ui/issues/issue-48728.rs b/src/test/ui/issues/issue-48728.rs index 251ebf5d418b0..8405a30478bde 100644 --- a/src/test/ui/issues/issue-48728.rs +++ b/src/test/ui/issues/issue-48728.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #48728, an ICE that occurred computing // coherence "help" information. diff --git a/src/test/ui/issues/issue-48728.stderr b/src/test/ui/issues/issue-48728.stderr index 937266d6d5573..e2f549ac4256c 100644 --- a/src/test/ui/issues/issue-48728.stderr +++ b/src/test/ui/issues/issue-48728.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `std::clone::Clone` for type `Node<[_]>`: - --> $DIR/issue-48728.rs:14:10 + --> $DIR/issue-48728.rs:4:10 | LL | #[derive(Clone)] //~ ERROR conflicting implementations of trait `std::clone::Clone` | ^^^^^ conflicting implementation for `Node<[_]>` diff --git a/src/test/ui/issues/issue-48803.rs b/src/test/ui/issues/issue-48803.rs index c6d14ace8b344..bc1bc29c98f2e 100644 --- a/src/test/ui/issues/issue-48803.rs +++ b/src/test/ui/issues/issue-48803.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] fn flatten<'a, 'b, T>(x: &'a &'b T) -> &'a T { diff --git a/src/test/ui/issues/issue-48803.stderr b/src/test/ui/issues/issue-48803.stderr index b37e2c07d23d7..2635520ef0786 100644 --- a/src/test/ui/issues/issue-48803.stderr +++ b/src/test/ui/issues/issue-48803.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `x` because it is borrowed - --> $DIR/issue-48803.rs:22:5 + --> $DIR/issue-48803.rs:12:5 | LL | let y = &x; | -- borrow of `x` occurs here diff --git a/src/test/ui/issues/issue-48838.rs b/src/test/ui/issues/issue-48838.rs index ab52a32869f21..057a424dfef47 100644 --- a/src/test/ui/issues/issue-48838.rs +++ b/src/test/ui/issues/issue-48838.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Functions { Square = |x| x, //~ ERROR mismatched types } diff --git a/src/test/ui/issues/issue-48838.stderr b/src/test/ui/issues/issue-48838.stderr index 2c7e682a982e2..32eea5e5fbb8f 100644 --- a/src/test/ui/issues/issue-48838.stderr +++ b/src/test/ui/issues/issue-48838.stderr @@ -1,11 +1,11 @@ error[E0308]: mismatched types - --> $DIR/issue-48838.rs:12:14 + --> $DIR/issue-48838.rs:2:14 | LL | Square = |x| x, //~ ERROR mismatched types | ^^^^^ expected isize, found closure | = note: expected type `isize` - found type `[closure@$DIR/issue-48838.rs:12:14: 12:19]` + found type `[closure@$DIR/issue-48838.rs:2:14: 2:19]` error: aborting due to previous error diff --git a/src/test/ui/issues/issue-49040.rs b/src/test/ui/issues/issue-49040.rs index 866ecd9e1d951..7c8d3d0ee69a9 100644 --- a/src/test/ui/issues/issue-49040.rs +++ b/src/test/ui/issues/issue-49040.rs @@ -1,12 +1,2 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_variables)]; //~ ERROR expected item, found `;` fn main() {} diff --git a/src/test/ui/issues/issue-49040.stderr b/src/test/ui/issues/issue-49040.stderr index b6f624dac7db6..eec88f0c3f3b3 100644 --- a/src/test/ui/issues/issue-49040.stderr +++ b/src/test/ui/issues/issue-49040.stderr @@ -1,5 +1,5 @@ error: expected item, found `;` - --> $DIR/issue-49040.rs:11:28 + --> $DIR/issue-49040.rs:1:28 | LL | #![allow(unused_variables)]; //~ ERROR expected item, found `;` | ^ help: consider removing this semicolon diff --git a/src/test/ui/issues/issue-49074.rs b/src/test/ui/issues/issue-49074.rs index d255fac5427b6..dbd96e96191e1 100644 --- a/src/test/ui/issues/issue-49074.rs +++ b/src/test/ui/issues/issue-49074.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that unknown attribute error is shown even if there are unresolved macros. #[marco_use] // typo diff --git a/src/test/ui/issues/issue-49074.stderr b/src/test/ui/issues/issue-49074.stderr index 6c9d1eac35684..8de4d081413b1 100644 --- a/src/test/ui/issues/issue-49074.stderr +++ b/src/test/ui/issues/issue-49074.stderr @@ -1,5 +1,5 @@ error[E0658]: The attribute `marco_use` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/issue-49074.rs:13:3 + --> $DIR/issue-49074.rs:3:3 | LL | #[marco_use] // typo | ^^^^^^^^^ diff --git a/src/test/ui/issues/issue-49257.rs b/src/test/ui/issues/issue-49257.rs index f288a2b217428..a7fa19d52fd09 100644 --- a/src/test/ui/issues/issue-49257.rs +++ b/src/test/ui/issues/issue-49257.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test for #49257: // emits good diagnostics for `..` pattern fragments not in the last position. diff --git a/src/test/ui/issues/issue-49257.stderr b/src/test/ui/issues/issue-49257.stderr index 40179832b49b2..f5a6f6e25bb4d 100644 --- a/src/test/ui/issues/issue-49257.stderr +++ b/src/test/ui/issues/issue-49257.stderr @@ -1,5 +1,5 @@ error: expected `}`, found `,` - --> $DIR/issue-49257.rs:20:19 + --> $DIR/issue-49257.rs:10:19 | LL | let Point { .., y, } = p; //~ ERROR expected `}`, found `,` | --^ @@ -12,7 +12,7 @@ LL | let Point { y, .. } = p; //~ ERROR expected `}`, found `,` | -- ^^^^ error: expected `}`, found `,` - --> $DIR/issue-49257.rs:21:19 + --> $DIR/issue-49257.rs:11:19 | LL | let Point { .., y } = p; //~ ERROR expected `}`, found `,` | --^ @@ -25,7 +25,7 @@ LL | let Point { y , .. } = p; //~ ERROR expected `}`, found `,` | -- ^^^^^^ error: expected `}`, found `,` - --> $DIR/issue-49257.rs:22:19 + --> $DIR/issue-49257.rs:12:19 | LL | let Point { .., } = p; //~ ERROR expected `}`, found `,` | --^ diff --git a/src/test/ui/issues/issue-4935.rs b/src/test/ui/issues/issue-4935.rs index 5b6e2c75a1c8f..3b258c35682c4 100644 --- a/src/test/ui/issues/issue-4935.rs +++ b/src/test/ui/issues/issue-4935.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #4935 fn foo(a: usize) {} diff --git a/src/test/ui/issues/issue-4935.stderr b/src/test/ui/issues/issue-4935.stderr index 25efd54443ae1..42869ab483180 100644 --- a/src/test/ui/issues/issue-4935.stderr +++ b/src/test/ui/issues/issue-4935.stderr @@ -1,5 +1,5 @@ error[E0061]: this function takes 1 parameter but 2 parameters were supplied - --> $DIR/issue-4935.rs:15:13 + --> $DIR/issue-4935.rs:5:13 | LL | fn foo(a: usize) {} | ---------------- defined here diff --git a/src/test/ui/issues/issue-49579.rs b/src/test/ui/issues/issue-49579.rs index e4e97c58d8aa3..fa7b2ca458d08 100644 --- a/src/test/ui/issues/issue-49579.rs +++ b/src/test/ui/issues/issue-49579.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // compile-pass #![feature(nll)] diff --git a/src/test/ui/issues/issue-4968.rs b/src/test/ui/issues/issue-4968.rs index 77588e5c221fd..3bf65c5ce8e6e 100644 --- a/src/test/ui/issues/issue-4968.rs +++ b/src/test/ui/issues/issue-4968.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #4968 const A: (isize,isize) = (4,2); diff --git a/src/test/ui/issues/issue-4968.stderr b/src/test/ui/issues/issue-4968.stderr index a9d58eda6e82e..2f6b4b95882fc 100644 --- a/src/test/ui/issues/issue-4968.stderr +++ b/src/test/ui/issues/issue-4968.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-4968.rs:15:16 + --> $DIR/issue-4968.rs:5:16 | LL | match 42 { A => () } | ^ expected integral variable, found tuple diff --git a/src/test/ui/issues/issue-4972.rs b/src/test/ui/issues/issue-4972.rs index f384dba7c9e3d..9c95a9794766b 100644 --- a/src/test/ui/issues/issue-4972.rs +++ b/src/test/ui/issues/issue-4972.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_patterns)] #![feature(box_syntax)] diff --git a/src/test/ui/issues/issue-4972.stderr b/src/test/ui/issues/issue-4972.stderr index e9c1bdb6f8621..30664c90ce811 100644 --- a/src/test/ui/issues/issue-4972.stderr +++ b/src/test/ui/issues/issue-4972.stderr @@ -1,5 +1,5 @@ error[E0033]: type `std::boxed::Box<(dyn MyTrait + 'static)>` cannot be dereferenced - --> $DIR/issue-4972.rs:24:25 + --> $DIR/issue-4972.rs:14:25 | LL | TraitWrapper::A(box ref map) => map, //~ ERROR cannot be dereferenced | ^^^^^^^^^^^ type `std::boxed::Box<(dyn MyTrait + 'static)>` cannot be dereferenced diff --git a/src/test/ui/issues/issue-49824.nll.stderr b/src/test/ui/issues/issue-49824.nll.stderr index df43158ec9c7c..386a0a58989a3 100644 --- a/src/test/ui/issues/issue-49824.nll.stderr +++ b/src/test/ui/issues/issue-49824.nll.stderr @@ -1,10 +1,10 @@ error: unsatisfied lifetime constraints - --> $DIR/issue-49824.rs:22:9 + --> $DIR/issue-49824.rs:12:9 | LL | || { | -- | || - | |return type of closure is [closure@$DIR/issue-49824.rs:22:9: 24:10 x:&'2 mut i32] + | |return type of closure is [closure@$DIR/issue-49824.rs:12:9: 14:10 x:&'2 mut i32] | lifetime `'1` represents this closure's body LL | / || { LL | | let _y = &mut x; diff --git a/src/test/ui/issues/issue-49824.rs b/src/test/ui/issues/issue-49824.rs index 1f3e575288427..58cada5d31ea0 100644 --- a/src/test/ui/issues/issue-49824.rs +++ b/src/test/ui/issues/issue-49824.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] // This test checks that a failure occurs with NLL but does not fail with the diff --git a/src/test/ui/issues/issue-49824.stderr b/src/test/ui/issues/issue-49824.stderr index b6cafe5e9e994..f487c363ea674 100644 --- a/src/test/ui/issues/issue-49824.stderr +++ b/src/test/ui/issues/issue-49824.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-49824.rs:18:1 + --> $DIR/issue-49824.rs:8:1 | LL | / fn main() { LL | | //~^ compilation successful diff --git a/src/test/ui/issues/issue-49851/compiler-builtins-error.rs b/src/test/ui/issues/issue-49851/compiler-builtins-error.rs index db82f22c6d977..0163da0771e9b 100644 --- a/src/test/ui/issues/issue-49851/compiler-builtins-error.rs +++ b/src/test/ui/issues/issue-49851/compiler-builtins-error.rs @@ -1,13 +1,6 @@ //~ ERROR 1:1: 1:1: can't find crate for `core` [E0463] -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // compile-flags: --target thumbv7em-none-eabihf #![deny(unsafe_code)] diff --git a/src/test/ui/issues/issue-49934.rs b/src/test/ui/issues/issue-49934.rs index 3e30e7a6450fc..59ca6cc292db9 100644 --- a/src/test/ui/issues/issue-49934.rs +++ b/src/test/ui/issues/issue-49934.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![feature(stmt_expr_attributes)] diff --git a/src/test/ui/issues/issue-49934.stderr b/src/test/ui/issues/issue-49934.stderr index 298230b8b29f7..295f4f1b559a7 100644 --- a/src/test/ui/issues/issue-49934.stderr +++ b/src/test/ui/issues/issue-49934.stderr @@ -1,5 +1,5 @@ warning: `#[derive]` does nothing on macro invocations - --> $DIR/issue-49934.rs:30:5 + --> $DIR/issue-49934.rs:20:5 | LL | #[derive(Debug)] | ^^^^^^^^^^^^^^^^ @@ -7,43 +7,43 @@ LL | #[derive(Debug)] = note: this may become a hard error in a future release warning: unused attribute - --> $DIR/issue-49934.rs:16:8 + --> $DIR/issue-49934.rs:6:8 | LL | fn foo<#[derive(Debug)] T>() { //~ WARN unused attribute | ^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/issue-49934.rs:14:9 + --> $DIR/issue-49934.rs:4:9 | LL | #![warn(unused_attributes)] //~ NOTE lint level defined here | ^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-49934.rs:18:9 + --> $DIR/issue-49934.rs:8:9 | LL | #[derive(Debug)] //~ WARN unused attribute | ^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-49934.rs:36:5 + --> $DIR/issue-49934.rs:26:5 | LL | #[derive(Debug)] //~ WARN unused attribute | ^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-49934.rs:40:5 + --> $DIR/issue-49934.rs:30:5 | LL | #[derive(Debug)] //~ WARN unused attribute | ^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-49934.rs:44:13 + --> $DIR/issue-49934.rs:34:13 | LL | let _ = #[derive(Debug)] "Hello, world!"; | ^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-49934.rs:49:9 + --> $DIR/issue-49934.rs:39:9 | LL | #[derive(Debug)] //~ WARN unused attribute | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-50187.rs b/src/test/ui/issues/issue-50187.rs index ccb2742841cc5..cda1c4d5faae6 100644 --- a/src/test/ui/issues/issue-50187.rs +++ b/src/test/ui/issues/issue-50187.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![feature(decl_macro)] diff --git a/src/test/ui/issues/issue-50264-inner-deref-trait/option_deref.rs b/src/test/ui/issues/issue-50264-inner-deref-trait/option_deref.rs index 4c67fb3bef103..f82eafcaffa9a 100644 --- a/src/test/ui/issues/issue-50264-inner-deref-trait/option_deref.rs +++ b/src/test/ui/issues/issue-50264-inner-deref-trait/option_deref.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(inner_deref)] fn main() { diff --git a/src/test/ui/issues/issue-50264-inner-deref-trait/option_deref.stderr b/src/test/ui/issues/issue-50264-inner-deref-trait/option_deref.stderr index a56cd6e8d2f53..a286118f5d1cb 100644 --- a/src/test/ui/issues/issue-50264-inner-deref-trait/option_deref.stderr +++ b/src/test/ui/issues/issue-50264-inner-deref-trait/option_deref.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `deref` found for type `std::option::Option<{integer}>` in the current scope - --> $DIR/option_deref.rs:14:29 + --> $DIR/option_deref.rs:4:29 | LL | let _result = &Some(42).deref(); | ^^^^^ diff --git a/src/test/ui/issues/issue-50264-inner-deref-trait/result_deref.rs b/src/test/ui/issues/issue-50264-inner-deref-trait/result_deref.rs index 73bdf0b920907..43a68e37dd0c3 100644 --- a/src/test/ui/issues/issue-50264-inner-deref-trait/result_deref.rs +++ b/src/test/ui/issues/issue-50264-inner-deref-trait/result_deref.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(inner_deref)] fn main() { diff --git a/src/test/ui/issues/issue-50264-inner-deref-trait/result_deref.stderr b/src/test/ui/issues/issue-50264-inner-deref-trait/result_deref.stderr index d3d7c1993ca5a..8e407c4ecb958 100644 --- a/src/test/ui/issues/issue-50264-inner-deref-trait/result_deref.stderr +++ b/src/test/ui/issues/issue-50264-inner-deref-trait/result_deref.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `deref` found for type `std::result::Result<{integer}, _>` in the current scope - --> $DIR/result_deref.rs:14:27 + --> $DIR/result_deref.rs:4:27 | LL | let _result = &Ok(42).deref(); | ^^^^^ diff --git a/src/test/ui/issues/issue-50264-inner-deref-trait/result_deref_err.rs b/src/test/ui/issues/issue-50264-inner-deref-trait/result_deref_err.rs index 5d1e7472d8f18..4be2000f058a5 100644 --- a/src/test/ui/issues/issue-50264-inner-deref-trait/result_deref_err.rs +++ b/src/test/ui/issues/issue-50264-inner-deref-trait/result_deref_err.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(inner_deref)] fn main() { diff --git a/src/test/ui/issues/issue-50264-inner-deref-trait/result_deref_err.stderr b/src/test/ui/issues/issue-50264-inner-deref-trait/result_deref_err.stderr index bf75687b21f74..b8cf49ea0258c 100644 --- a/src/test/ui/issues/issue-50264-inner-deref-trait/result_deref_err.stderr +++ b/src/test/ui/issues/issue-50264-inner-deref-trait/result_deref_err.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `deref_err` found for type `std::result::Result<_, {integer}>` in the current scope - --> $DIR/result_deref_err.rs:14:28 + --> $DIR/result_deref_err.rs:4:28 | LL | let _result = &Err(41).deref_err(); | ^^^^^^^^^ diff --git a/src/test/ui/issues/issue-50264-inner-deref-trait/result_deref_ok.rs b/src/test/ui/issues/issue-50264-inner-deref-trait/result_deref_ok.rs index bee8e0c062bae..a706cde734805 100644 --- a/src/test/ui/issues/issue-50264-inner-deref-trait/result_deref_ok.rs +++ b/src/test/ui/issues/issue-50264-inner-deref-trait/result_deref_ok.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(inner_deref)] fn main() { diff --git a/src/test/ui/issues/issue-50264-inner-deref-trait/result_deref_ok.stderr b/src/test/ui/issues/issue-50264-inner-deref-trait/result_deref_ok.stderr index a77333a756816..73bfce501a7c0 100644 --- a/src/test/ui/issues/issue-50264-inner-deref-trait/result_deref_ok.stderr +++ b/src/test/ui/issues/issue-50264-inner-deref-trait/result_deref_ok.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `deref_ok` found for type `std::result::Result<{integer}, _>` in the current scope - --> $DIR/result_deref_ok.rs:14:27 + --> $DIR/result_deref_ok.rs:4:27 | LL | let _result = &Ok(42).deref_ok(); | ^^^^^^^^ diff --git a/src/test/ui/issues/issue-50403.rs b/src/test/ui/issues/issue-50403.rs index 8d4c6c5140fd6..012057fc28092 100644 --- a/src/test/ui/issues/issue-50403.rs +++ b/src/test/ui/issues/issue-50403.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(concat_idents)] fn main() { diff --git a/src/test/ui/issues/issue-50403.stderr b/src/test/ui/issues/issue-50403.stderr index f2871c72e25af..f84d9d7769daf 100644 --- a/src/test/ui/issues/issue-50403.stderr +++ b/src/test/ui/issues/issue-50403.stderr @@ -1,5 +1,5 @@ error: concat_idents! takes 1 or more arguments. - --> $DIR/issue-50403.rs:14:13 + --> $DIR/issue-50403.rs:4:13 | LL | let x = concat_idents!(); //~ ERROR concat_idents! takes 1 or more arguments | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-50471.rs b/src/test/ui/issues/issue-50471.rs index ce2947144af45..6868d481962b5 100644 --- a/src/test/ui/issues/issue-50471.rs +++ b/src/test/ui/issues/issue-50471.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass fn main() { diff --git a/src/test/ui/issues/issue-50480.rs b/src/test/ui/issues/issue-50480.rs index 3427cf6bf9ca2..48c139ed5c9a2 100644 --- a/src/test/ui/issues/issue-50480.rs +++ b/src/test/ui/issues/issue-50480.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Clone, Copy)] //~^ ERROR the trait `Copy` may not be implemented for this type struct Foo(NotDefined, ::Item, Vec, String); diff --git a/src/test/ui/issues/issue-50480.stderr b/src/test/ui/issues/issue-50480.stderr index f5281fec4d1ea..7834a3efd2c20 100644 --- a/src/test/ui/issues/issue-50480.stderr +++ b/src/test/ui/issues/issue-50480.stderr @@ -1,11 +1,11 @@ error[E0412]: cannot find type `NotDefined` in this scope - --> $DIR/issue-50480.rs:13:12 + --> $DIR/issue-50480.rs:3:12 | LL | struct Foo(NotDefined, ::Item, Vec, String); | ^^^^^^^^^^ not found in this scope error[E0277]: the trait bound `i32: std::iter::Iterator` is not satisfied - --> $DIR/issue-50480.rs:13:24 + --> $DIR/issue-50480.rs:3:24 | LL | struct Foo(NotDefined, ::Item, Vec, String); | ^^^^^^^^^^^^^^^^^^^^^^^ `i32` is not an iterator; maybe try calling `.iter()` or a similar method @@ -13,7 +13,7 @@ LL | struct Foo(NotDefined, ::Item, Vec, String); = help: the trait `std::iter::Iterator` is not implemented for `i32` error[E0204]: the trait `Copy` may not be implemented for this type - --> $DIR/issue-50480.rs:11:17 + --> $DIR/issue-50480.rs:1:17 | LL | #[derive(Clone, Copy)] | ^^^^ diff --git a/src/test/ui/issues/issue-50576.rs b/src/test/ui/issues/issue-50576.rs index b2032fb226bd1..e0c36b8273af0 100644 --- a/src/test/ui/issues/issue-50576.rs +++ b/src/test/ui/issues/issue-50576.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { |bool: [u8; break 'L]| 0; //~^ ERROR [E0426] diff --git a/src/test/ui/issues/issue-50576.stderr b/src/test/ui/issues/issue-50576.stderr index e661be2133900..98624d141a616 100644 --- a/src/test/ui/issues/issue-50576.stderr +++ b/src/test/ui/issues/issue-50576.stderr @@ -1,17 +1,17 @@ error[E0426]: use of undeclared label `'L` - --> $DIR/issue-50576.rs:12:23 + --> $DIR/issue-50576.rs:2:23 | LL | |bool: [u8; break 'L]| 0; | ^^ undeclared label `'L` error[E0268]: `break` outside of loop - --> $DIR/issue-50576.rs:12:17 + --> $DIR/issue-50576.rs:2:17 | LL | |bool: [u8; break 'L]| 0; | ^^^^^^^^ cannot break outside of a loop error[E0268]: `break` outside of loop - --> $DIR/issue-50576.rs:15:16 + --> $DIR/issue-50576.rs:5:16 | LL | Vec::<[u8; break]>::new(); //~ ERROR [E0268] | ^^^^^ cannot break outside of a loop diff --git a/src/test/ui/issues/issue-50577.rs b/src/test/ui/issues/issue-50577.rs index 6fd680c151916..f0f1dc6c28667 100644 --- a/src/test/ui/issues/issue-50577.rs +++ b/src/test/ui/issues/issue-50577.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { enum Foo { Drop = assert_eq!(1, 1) diff --git a/src/test/ui/issues/issue-50577.stderr b/src/test/ui/issues/issue-50577.stderr index 8751303a0db9b..f26f5a9a9ba22 100644 --- a/src/test/ui/issues/issue-50577.stderr +++ b/src/test/ui/issues/issue-50577.stderr @@ -1,5 +1,5 @@ error[E0317]: if may be missing an else clause - --> $DIR/issue-50577.rs:13:16 + --> $DIR/issue-50577.rs:3:16 | LL | Drop = assert_eq!(1, 1) | ^^^^^^^^^^^^^^^^ expected (), found isize diff --git a/src/test/ui/issues/issue-50581.rs b/src/test/ui/issues/issue-50581.rs index 97b3f81eaf5fb..12bb9930eca40 100644 --- a/src/test/ui/issues/issue-50581.rs +++ b/src/test/ui/issues/issue-50581.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { |_: [u8; break]| (); //~ ERROR [E0268] } diff --git a/src/test/ui/issues/issue-50581.stderr b/src/test/ui/issues/issue-50581.stderr index 38a87b1e78a1b..70ac9ecc9edf5 100644 --- a/src/test/ui/issues/issue-50581.stderr +++ b/src/test/ui/issues/issue-50581.stderr @@ -1,5 +1,5 @@ error[E0268]: `break` outside of loop - --> $DIR/issue-50581.rs:12:14 + --> $DIR/issue-50581.rs:2:14 | LL | |_: [u8; break]| (); //~ ERROR [E0268] | ^^^^^ cannot break outside of a loop diff --git a/src/test/ui/issues/issue-50585.rs b/src/test/ui/issues/issue-50585.rs index 0c063d4cdb03b..ca2ece8d53bec 100644 --- a/src/test/ui/issues/issue-50585.rs +++ b/src/test/ui/issues/issue-50585.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { |y: Vec<[(); for x in 0..2 {}]>| {}; //~^ ERROR mismatched types diff --git a/src/test/ui/issues/issue-50585.stderr b/src/test/ui/issues/issue-50585.stderr index e4edc18c3f8e4..4c41da8fc33a9 100644 --- a/src/test/ui/issues/issue-50585.stderr +++ b/src/test/ui/issues/issue-50585.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-50585.rs:12:18 + --> $DIR/issue-50585.rs:2:18 | LL | |y: Vec<[(); for x in 0..2 {}]>| {}; | ^^^^^^^^^^^^^^^^ expected usize, found () diff --git a/src/test/ui/issues/issue-50599.rs b/src/test/ui/issues/issue-50599.rs index f46a562ce7a18..00588735b9a59 100644 --- a/src/test/ui/issues/issue-50599.rs +++ b/src/test/ui/issues/issue-50599.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { const N: u32 = 1_000; const M: usize = (f64::from(N) * std::f64::LOG10_2) as usize; //~ ERROR cannot find value diff --git a/src/test/ui/issues/issue-50599.stderr b/src/test/ui/issues/issue-50599.stderr index 8337a31ec140b..0ae2ab73179c8 100644 --- a/src/test/ui/issues/issue-50599.stderr +++ b/src/test/ui/issues/issue-50599.stderr @@ -1,5 +1,5 @@ error[E0425]: cannot find value `LOG10_2` in module `std::f64` - --> $DIR/issue-50599.rs:13:48 + --> $DIR/issue-50599.rs:3:48 | LL | const M: usize = (f64::from(N) * std::f64::LOG10_2) as usize; //~ ERROR cannot find value | ^^^^^^^ not found in `std::f64` diff --git a/src/test/ui/issues/issue-50600.rs b/src/test/ui/issues/issue-50600.rs index 6169a7770bfc4..963e607afcfd4 100644 --- a/src/test/ui/issues/issue-50600.rs +++ b/src/test/ui/issues/issue-50600.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo ( fn([u8; |x: u8| {}]), //~ ERROR mismatched types ); diff --git a/src/test/ui/issues/issue-50600.stderr b/src/test/ui/issues/issue-50600.stderr index a72dbace24862..36219390c519e 100644 --- a/src/test/ui/issues/issue-50600.stderr +++ b/src/test/ui/issues/issue-50600.stderr @@ -1,11 +1,11 @@ error[E0308]: mismatched types - --> $DIR/issue-50600.rs:12:13 + --> $DIR/issue-50600.rs:2:13 | LL | fn([u8; |x: u8| {}]), //~ ERROR mismatched types | ^^^^^^^^^^ expected usize, found closure | = note: expected type `usize` - found type `[closure@$DIR/issue-50600.rs:12:13: 12:23]` + found type `[closure@$DIR/issue-50600.rs:2:13: 2:23]` error: aborting due to previous error diff --git a/src/test/ui/issues/issue-50618.rs b/src/test/ui/issues/issue-50618.rs index ed427c293df47..5f762bc431e12 100644 --- a/src/test/ui/issues/issue-50618.rs +++ b/src/test/ui/issues/issue-50618.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Point { pub x: u64, pub y: u64, diff --git a/src/test/ui/issues/issue-50618.stderr b/src/test/ui/issues/issue-50618.stderr index 07cc5a1318aa4..1ac5dde66e9e5 100644 --- a/src/test/ui/issues/issue-50618.stderr +++ b/src/test/ui/issues/issue-50618.stderr @@ -1,5 +1,5 @@ error[E0560]: struct `Point` has no field named `nonexistent` - --> $DIR/issue-50618.rs:24:13 + --> $DIR/issue-50618.rs:14:13 | LL | nonexistent: 0, | ^^^^^^^^^^^ `Point` does not have this field diff --git a/src/test/ui/issues/issue-5062.rs b/src/test/ui/issues/issue-5062.rs index ebfa4975d4d75..2db0a8e25b462 100644 --- a/src/test/ui/issues/issue-5062.rs +++ b/src/test/ui/issues/issue-5062.rs @@ -1,12 +1,2 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { format!("{:?}", None); } //~^ ERROR type annotations needed [E0282] diff --git a/src/test/ui/issues/issue-5062.stderr b/src/test/ui/issues/issue-5062.stderr index 988c5c137b4bf..0f5c6d8d4bf9a 100644 --- a/src/test/ui/issues/issue-5062.stderr +++ b/src/test/ui/issues/issue-5062.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/issue-5062.rs:11:29 + --> $DIR/issue-5062.rs:1:29 | LL | fn main() { format!("{:?}", None); } | ^^^^ cannot infer type for `T` diff --git a/src/test/ui/issues/issue-5067.rs b/src/test/ui/issues/issue-5067.rs index 267362f902d72..526a68311462e 100644 --- a/src/test/ui/issues/issue-5067.rs +++ b/src/test/ui/issues/issue-5067.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_macros)] macro_rules! foo { diff --git a/src/test/ui/issues/issue-5067.stderr b/src/test/ui/issues/issue-5067.stderr index 2ea3ea5204c9c..433b7c8c04907 100644 --- a/src/test/ui/issues/issue-5067.stderr +++ b/src/test/ui/issues/issue-5067.stderr @@ -1,59 +1,59 @@ error: repetition matches empty token tree - --> $DIR/issue-5067.rs:14:8 + --> $DIR/issue-5067.rs:4:8 | LL | ( $()* ) => {}; | ^^ error: repetition matches empty token tree - --> $DIR/issue-5067.rs:16:8 + --> $DIR/issue-5067.rs:6:8 | LL | ( $()+ ) => {}; | ^^ error: repetition matches empty token tree - --> $DIR/issue-5067.rs:22:9 + --> $DIR/issue-5067.rs:12:9 | LL | ( [$()*] ) => {}; | ^^ error: repetition matches empty token tree - --> $DIR/issue-5067.rs:24:9 + --> $DIR/issue-5067.rs:14:9 | LL | ( [$()+] ) => {}; | ^^ error: repetition matches empty token tree - --> $DIR/issue-5067.rs:30:8 + --> $DIR/issue-5067.rs:20:8 | LL | ( $($()* $(),* $(a)* $(a),* )* ) => {}; | ^^^^^^^^^^^^^^^^^^^^^^^^^^ error: repetition matches empty token tree - --> $DIR/issue-5067.rs:32:8 + --> $DIR/issue-5067.rs:22:8 | LL | ( $($()* $(),* $(a)* $(a),* )+ ) => {}; | ^^^^^^^^^^^^^^^^^^^^^^^^^^ error: repetition matches empty token tree - --> $DIR/issue-5067.rs:38:12 + --> $DIR/issue-5067.rs:28:12 | LL | ( $(a $()+)* ) => {}; | ^^ error: repetition matches empty token tree - --> $DIR/issue-5067.rs:40:12 + --> $DIR/issue-5067.rs:30:12 | LL | ( $(a $()*)+ ) => {}; | ^^ error: repetition matches empty token tree - --> $DIR/issue-5067.rs:48:18 + --> $DIR/issue-5067.rs:38:18 | LL | (a $e1:expr $($(, a $e2:expr)*)*) => ([$e1 $($(, $e2)*)*]); | ^^^^^^^^^^^^^^^^^^ error: repetition matches empty token tree - --> $DIR/issue-5067.rs:60:8 + --> $DIR/issue-5067.rs:50:8 | LL | ( $()* ) => {} | ^^ diff --git a/src/test/ui/issues/issue-50688.rs b/src/test/ui/issues/issue-50688.rs index ff45cf639decd..88f898b86f914 100644 --- a/src/test/ui/issues/issue-50688.rs +++ b/src/test/ui/issues/issue-50688.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { [1; || {}]; //~ ERROR mismatched types } diff --git a/src/test/ui/issues/issue-50688.stderr b/src/test/ui/issues/issue-50688.stderr index 094b0e1ec89b2..2a1315c9a015d 100644 --- a/src/test/ui/issues/issue-50688.stderr +++ b/src/test/ui/issues/issue-50688.stderr @@ -1,11 +1,11 @@ error[E0308]: mismatched types - --> $DIR/issue-50688.rs:12:9 + --> $DIR/issue-50688.rs:2:9 | LL | [1; || {}]; //~ ERROR mismatched types | ^^^^^ expected usize, found closure | = note: expected type `usize` - found type `[closure@$DIR/issue-50688.rs:12:9: 12:14]` + found type `[closure@$DIR/issue-50688.rs:2:9: 2:14]` error: aborting due to previous error diff --git a/src/test/ui/issues/issue-50714-1.rs b/src/test/ui/issues/issue-50714-1.rs index f0e496a88fbd1..31de3f3c0a1b8 100644 --- a/src/test/ui/issues/issue-50714-1.rs +++ b/src/test/ui/issues/issue-50714-1.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue 50714, make sure that this isn't a linker error. #![no_std] diff --git a/src/test/ui/issues/issue-50714-1.stderr b/src/test/ui/issues/issue-50714-1.stderr index 5c92516cbc504..e5fdd18d3328e 100644 --- a/src/test/ui/issues/issue-50714-1.stderr +++ b/src/test/ui/issues/issue-50714-1.stderr @@ -1,5 +1,5 @@ error[E0647]: start function is not allowed to have a `where` clause - --> $DIR/issue-50714-1.rs:19:56 + --> $DIR/issue-50714-1.rs:9:56 | LL | fn start(_: isize, _: *const *const u8) -> isize where fn(&()): Eq { //~ ERROR [E0647] | ^^^^^^^^^^^ start function cannot have a `where` clause diff --git a/src/test/ui/issues/issue-50714.rs b/src/test/ui/issues/issue-50714.rs index 08d975326dfaa..3683d4bdaccd5 100644 --- a/src/test/ui/issues/issue-50714.rs +++ b/src/test/ui/issues/issue-50714.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue 50714, make sure that this isn't a linker error. fn main() where fn(&()): Eq {} //~ ERROR [E0646] diff --git a/src/test/ui/issues/issue-50714.stderr b/src/test/ui/issues/issue-50714.stderr index e2c99980e1b7e..d7631adc7b26f 100644 --- a/src/test/ui/issues/issue-50714.stderr +++ b/src/test/ui/issues/issue-50714.stderr @@ -1,5 +1,5 @@ error[E0646]: `main` function is not allowed to have a `where` clause - --> $DIR/issue-50714.rs:13:17 + --> $DIR/issue-50714.rs:3:17 | LL | fn main() where fn(&()): Eq {} //~ ERROR [E0646] | ^^^^^^^^^^^ `main` cannot have a `where` clause diff --git a/src/test/ui/issues/issue-50761.rs b/src/test/ui/issues/issue-50761.rs index 6c87d52093473..bcf3ebcd60a5e 100644 --- a/src/test/ui/issues/issue-50761.rs +++ b/src/test/ui/issues/issue-50761.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Confirm that we don't accidentally divide or mod by zero in llvm_type // compile-pass diff --git a/src/test/ui/issues/issue-50781.rs b/src/test/ui/issues/issue-50781.rs index 43830869da7f2..edf8d82b48050 100644 --- a/src/test/ui/issues/issue-50781.rs +++ b/src/test/ui/issues/issue-50781.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(where_clauses_object_safety)] trait Trait {} diff --git a/src/test/ui/issues/issue-50781.stderr b/src/test/ui/issues/issue-50781.stderr index 047b847e67e81..11de59f9f0095 100644 --- a/src/test/ui/issues/issue-50781.stderr +++ b/src/test/ui/issues/issue-50781.stderr @@ -1,11 +1,11 @@ error: the trait `X` cannot be made into an object - --> $DIR/issue-50781.rs:16:5 + --> $DIR/issue-50781.rs:6:5 | LL | fn foo(&self) where Self: Trait; //~ ERROR the trait `X` cannot be made into an object | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/issue-50781.rs:11:9 + --> $DIR/issue-50781.rs:1:9 | LL | #![deny(where_clauses_object_safety)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-50802.rs b/src/test/ui/issues/issue-50802.rs index 6342d0757ee53..dece55968b6a6 100644 --- a/src/test/ui/issues/issue-50802.rs +++ b/src/test/ui/issues/issue-50802.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[allow(unreachable_code)] fn main() { diff --git a/src/test/ui/issues/issue-50802.stderr b/src/test/ui/issues/issue-50802.stderr index 9da2648b376f7..9a2ae79429397 100644 --- a/src/test/ui/issues/issue-50802.stderr +++ b/src/test/ui/issues/issue-50802.stderr @@ -1,5 +1,5 @@ error[E0590]: `break` or `continue` with no label in the condition of a `while` loop - --> $DIR/issue-50802.rs:15:21 + --> $DIR/issue-50802.rs:5:21 | LL | break while continue { //~ ERROR E0590 | ^^^^^^^^ unlabeled `continue` in the condition of a `while` loop diff --git a/src/test/ui/issues/issue-50825-1.rs b/src/test/ui/issues/issue-50825-1.rs index 1eee9b7c883c6..ee4316029a829 100644 --- a/src/test/ui/issues/issue-50825-1.rs +++ b/src/test/ui/issues/issue-50825-1.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass // regression test for issue #50825 // Make sure that the `impl` bound (): X is preferred over diff --git a/src/test/ui/issues/issue-50825.rs b/src/test/ui/issues/issue-50825.rs index e45156b96cd2c..1ece2e9fc8475 100644 --- a/src/test/ui/issues/issue-50825.rs +++ b/src/test/ui/issues/issue-50825.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass // regression test for issue #50825 // Make sure that the built-in bound {integer}: Sized is preferred over diff --git a/src/test/ui/issues/issue-5099.rs b/src/test/ui/issues/issue-5099.rs index 1bb6f34b8e93f..d00fff3280920 100644 --- a/src/test/ui/issues/issue-5099.rs +++ b/src/test/ui/issues/issue-5099.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait B < A > { fn a() -> A { this.a } } //~ ERROR cannot find value `this` in this scope fn main() {} diff --git a/src/test/ui/issues/issue-5099.stderr b/src/test/ui/issues/issue-5099.stderr index 26a26f731cf3e..d103c968979a1 100644 --- a/src/test/ui/issues/issue-5099.stderr +++ b/src/test/ui/issues/issue-5099.stderr @@ -1,5 +1,5 @@ error[E0425]: cannot find value `this` in this scope - --> $DIR/issue-5099.rs:12:31 + --> $DIR/issue-5099.rs:1:31 | LL | trait B < A > { fn a() -> A { this.a } } //~ ERROR cannot find value `this` in this scope | ^^^^ not found in this scope diff --git a/src/test/ui/issues/issue-50993.rs b/src/test/ui/issues/issue-50993.rs index d6cdd7380010f..772c45dee11d7 100644 --- a/src/test/ui/issues/issue-50993.rs +++ b/src/test/ui/issues/issue-50993.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --crate-type dylib --target thumbv7em-none-eabihf // compile-pass // error-pattern: dropping unsupported crate type `dylib` for target `thumbv7em-none-eabihf` diff --git a/src/test/ui/issues/issue-5100.rs b/src/test/ui/issues/issue-5100.rs index 9ef780aac8e27..505dfbb27de17 100644 --- a/src/test/ui/issues/issue-5100.rs +++ b/src/test/ui/issues/issue-5100.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_patterns)] #![feature(box_syntax)] diff --git a/src/test/ui/issues/issue-5100.stderr b/src/test/ui/issues/issue-5100.stderr index 6f5a84966bf35..ad731b132f772 100644 --- a/src/test/ui/issues/issue-5100.stderr +++ b/src/test/ui/issues/issue-5100.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-5100.rs:18:9 + --> $DIR/issue-5100.rs:8:9 | LL | A::B => (), | ^^^^ expected tuple, found enum `A` @@ -8,7 +8,7 @@ LL | A::B => (), found type `A` error[E0308]: mismatched types - --> $DIR/issue-5100.rs:27:9 + --> $DIR/issue-5100.rs:17:9 | LL | (true, false, false) => () | ^^^^^^^^^^^^^^^^^^^^ expected a tuple with 2 elements, found one with 3 elements @@ -17,7 +17,7 @@ LL | (true, false, false) => () found type `(_, _, _)` error[E0308]: mismatched types - --> $DIR/issue-5100.rs:35:9 + --> $DIR/issue-5100.rs:25:9 | LL | (true, false, false) => () | ^^^^^^^^^^^^^^^^^^^^ expected a tuple with 2 elements, found one with 3 elements @@ -26,7 +26,7 @@ LL | (true, false, false) => () found type `(_, _, _)` error[E0308]: mismatched types - --> $DIR/issue-5100.rs:43:9 + --> $DIR/issue-5100.rs:33:9 | LL | box (true, false) => () | ^^^^^^^^^^^^^^^^^ expected tuple, found struct `std::boxed::Box` @@ -35,7 +35,7 @@ LL | box (true, false) => () found type `std::boxed::Box<_>` error[E0308]: mismatched types - --> $DIR/issue-5100.rs:50:9 + --> $DIR/issue-5100.rs:40:9 | LL | &(true, false) => () | ^^^^^^^^^^^^^^ expected tuple, found reference @@ -44,7 +44,7 @@ LL | &(true, false) => () found type `&_` error[E0618]: expected function, found `(char, char)` - --> $DIR/issue-5100.rs:58:14 + --> $DIR/issue-5100.rs:48:14 | LL | let v = [('a', 'b') //~ ERROR expected function, found `(char, char)` | ______________^ @@ -52,7 +52,7 @@ LL | | ('c', 'd'), | |_______________________^ not a function error[E0308]: mismatched types - --> $DIR/issue-5100.rs:65:19 + --> $DIR/issue-5100.rs:55:19 | LL | let x: char = true; //~ ERROR mismatched types | ^^^^ expected char, found bool diff --git a/src/test/ui/issues/issue-51022.rs b/src/test/ui/issues/issue-51022.rs index 831c3e5fda084..cebdfe00c1b9d 100644 --- a/src/test/ui/issues/issue-51022.rs +++ b/src/test/ui/issues/issue-51022.rs @@ -1,12 +1,2 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main<'a>() { } //~^ ERROR `main` function is not allowed to have generic parameters [E0131] diff --git a/src/test/ui/issues/issue-51022.stderr b/src/test/ui/issues/issue-51022.stderr index 1daa8dfbba689..5e196bd4e25a5 100644 --- a/src/test/ui/issues/issue-51022.stderr +++ b/src/test/ui/issues/issue-51022.stderr @@ -1,5 +1,5 @@ error[E0131]: `main` function is not allowed to have generic parameters - --> $DIR/issue-51022.rs:11:8 + --> $DIR/issue-51022.rs:1:8 | LL | fn main<'a>() { } | ^^^^ `main` cannot have generic parameters diff --git a/src/test/ui/issues/issue-51044.rs b/src/test/ui/issues/issue-51044.rs index 6424c4229bda8..628d7876965d5 100644 --- a/src/test/ui/issues/issue-51044.rs +++ b/src/test/ui/issues/issue-51044.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass // regression test for issue #50825 // Check that the feature gate normalizes associated types. diff --git a/src/test/ui/issues/issue-51102.rs b/src/test/ui/issues/issue-51102.rs index c8f106687ae1c..41446cd29b0df 100644 --- a/src/test/ui/issues/issue-51102.rs +++ b/src/test/ui/issues/issue-51102.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum SimpleEnum { NoState, } diff --git a/src/test/ui/issues/issue-51102.stderr b/src/test/ui/issues/issue-51102.stderr index a4bd0fb914fee..1b2948db2d6c3 100644 --- a/src/test/ui/issues/issue-51102.stderr +++ b/src/test/ui/issues/issue-51102.stderr @@ -1,11 +1,11 @@ error[E0026]: struct `SimpleStruct` does not have a field named `state` - --> $DIR/issue-51102.rs:23:17 + --> $DIR/issue-51102.rs:13:17 | LL | state: 0, | ^^^^^^^^ struct `SimpleStruct` does not have this field error[E0025]: field `no_state_here` bound multiple times in the pattern - --> $DIR/issue-51102.rs:34:17 + --> $DIR/issue-51102.rs:24:17 | LL | no_state_here: 0, | ---------------- first use of `no_state_here` @@ -13,7 +13,7 @@ LL | no_state_here: 1 | ^^^^^^^^^^^^^^^^ multiple uses of `no_state_here` in pattern error[E0026]: variant `SimpleEnum::NoState` does not have a field named `state` - --> $DIR/issue-51102.rs:43:17 + --> $DIR/issue-51102.rs:33:17 | LL | state: 0 | ^^^^^^^^ variant `SimpleEnum::NoState` does not have this field diff --git a/src/test/ui/issues/issue-51116.rs b/src/test/ui/issues/issue-51116.rs index c01559b11261c..c0a74a679efd1 100644 --- a/src/test/ui/issues/issue-51116.rs +++ b/src/test/ui/issues/issue-51116.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let tiles = Default::default(); for row in &mut tiles { diff --git a/src/test/ui/issues/issue-51116.stderr b/src/test/ui/issues/issue-51116.stderr index fc84ee9028d3b..4c1870eb8c9f3 100644 --- a/src/test/ui/issues/issue-51116.stderr +++ b/src/test/ui/issues/issue-51116.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/issue-51116.rs:16:13 + --> $DIR/issue-51116.rs:6:13 | LL | for tile in row { | --- the element type for this iterator is not specified diff --git a/src/test/ui/issues/issue-51244.nll.stderr b/src/test/ui/issues/issue-51244.nll.stderr index ce02ae2aec23f..7a4935fafc6e9 100644 --- a/src/test/ui/issues/issue-51244.nll.stderr +++ b/src/test/ui/issues/issue-51244.nll.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to `*my_ref` which is behind a `&` reference - --> $DIR/issue-51244.rs:13:5 + --> $DIR/issue-51244.rs:3:5 | LL | let ref my_ref @ _ = 0; | -------------- help: consider changing this to be a mutable reference: `ref mut my_ref @ _` diff --git a/src/test/ui/issues/issue-51244.rs b/src/test/ui/issues/issue-51244.rs index 50a21184a98b9..d365181013172 100644 --- a/src/test/ui/issues/issue-51244.rs +++ b/src/test/ui/issues/issue-51244.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let ref my_ref @ _ = 0; *my_ref = 0; //~ ERROR cannot assign to immutable borrowed content `*my_ref` [E0594] diff --git a/src/test/ui/issues/issue-51244.stderr b/src/test/ui/issues/issue-51244.stderr index 997a74295e565..a5b06aa228290 100644 --- a/src/test/ui/issues/issue-51244.stderr +++ b/src/test/ui/issues/issue-51244.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to immutable borrowed content `*my_ref` - --> $DIR/issue-51244.rs:13:5 + --> $DIR/issue-51244.rs:3:5 | LL | let ref my_ref @ _ = 0; | -------------- help: use a mutable reference instead: `ref mut my_ref @ _` diff --git a/src/test/ui/issues/issue-51279.rs b/src/test/ui/issues/issue-51279.rs index 4639d73e44d3d..caef23043cba3 100644 --- a/src/test/ui/issues/issue-51279.rs +++ b/src/test/ui/issues/issue-51279.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct X<#[cfg(none)] 'a, #[cfg(none)] T>(&'a T); //~^ ERROR #[cfg] cannot be applied on a generic parameter //~^^ ERROR #[cfg] cannot be applied on a generic parameter diff --git a/src/test/ui/issues/issue-51279.stderr b/src/test/ui/issues/issue-51279.stderr index 38d5a5acc50fe..89786f72e182e 100644 --- a/src/test/ui/issues/issue-51279.stderr +++ b/src/test/ui/issues/issue-51279.stderr @@ -1,47 +1,47 @@ error: #[cfg] cannot be applied on a generic parameter - --> $DIR/issue-51279.rs:11:14 + --> $DIR/issue-51279.rs:1:14 | LL | pub struct X<#[cfg(none)] 'a, #[cfg(none)] T>(&'a T); | ^^^^^^^^^^^^ error: #[cfg] cannot be applied on a generic parameter - --> $DIR/issue-51279.rs:11:31 + --> $DIR/issue-51279.rs:1:31 | LL | pub struct X<#[cfg(none)] 'a, #[cfg(none)] T>(&'a T); | ^^^^^^^^^^^^ error: #[cfg] cannot be applied on a generic parameter - --> $DIR/issue-51279.rs:15:6 + --> $DIR/issue-51279.rs:5:6 | LL | impl<#[cfg(none)] 'a, #[cfg(none)] T> X<'a, T> {} | ^^^^^^^^^^^^ error: #[cfg] cannot be applied on a generic parameter - --> $DIR/issue-51279.rs:15:23 + --> $DIR/issue-51279.rs:5:23 | LL | impl<#[cfg(none)] 'a, #[cfg(none)] T> X<'a, T> {} | ^^^^^^^^^^^^ error: #[cfg] cannot be applied on a generic parameter - --> $DIR/issue-51279.rs:19:10 + --> $DIR/issue-51279.rs:9:10 | LL | pub fn f<#[cfg(none)] 'a, #[cfg(none)] T>(_: &'a T) {} | ^^^^^^^^^^^^ error: #[cfg] cannot be applied on a generic parameter - --> $DIR/issue-51279.rs:19:27 + --> $DIR/issue-51279.rs:9:27 | LL | pub fn f<#[cfg(none)] 'a, #[cfg(none)] T>(_: &'a T) {} | ^^^^^^^^^^^^ error: #[cfg_attr] cannot be applied on a generic parameter - --> $DIR/issue-51279.rs:28:13 + --> $DIR/issue-51279.rs:18:13 | LL | unsafe impl<#[cfg_attr(none, may_dangle)] T> Drop for M { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: #[cfg] cannot be applied on a generic parameter - --> $DIR/issue-51279.rs:33:23 + --> $DIR/issue-51279.rs:23:23 | LL | type Z<#[ignored] 'a, #[cfg(none)] T> = X<'a, T>; | ^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-51515.rs b/src/test/ui/issues/issue-51515.rs index 3e0a3b757a3d6..64d9822bab4da 100644 --- a/src/test/ui/issues/issue-51515.rs +++ b/src/test/ui/issues/issue-51515.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] fn main() { diff --git a/src/test/ui/issues/issue-51515.stderr b/src/test/ui/issues/issue-51515.stderr index 3e7349b5acabf..bcfed6d3bf88f 100644 --- a/src/test/ui/issues/issue-51515.stderr +++ b/src/test/ui/issues/issue-51515.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to `*foo` which is behind a `&` reference - --> $DIR/issue-51515.rs:17:5 + --> $DIR/issue-51515.rs:7:5 | LL | let foo = &16; | --- help: consider changing this to be a mutable reference: `&mut 16` @@ -8,7 +8,7 @@ LL | *foo = 32; | ^^^^^^^^^ `foo` is a `&` reference, so the data it refers to cannot be written error[E0594]: cannot assign to `*bar` which is behind a `&` reference - --> $DIR/issue-51515.rs:22:5 + --> $DIR/issue-51515.rs:12:5 | LL | let bar = foo; | --- help: consider changing this to be a mutable reference: `&mut i32` diff --git a/src/test/ui/issues/issue-5153.rs b/src/test/ui/issues/issue-5153.rs index 9b49886961d7b..551880ae009fb 100644 --- a/src/test/ui/issues/issue-5153.rs +++ b/src/test/ui/issues/issue-5153.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn foo(self: Box); } diff --git a/src/test/ui/issues/issue-5153.stderr b/src/test/ui/issues/issue-5153.stderr index 6f8dce109e1e8..48adfee0dec03 100644 --- a/src/test/ui/issues/issue-5153.stderr +++ b/src/test/ui/issues/issue-5153.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `foo` found for type `&dyn Foo` in the current scope - --> $DIR/issue-5153.rs:20:23 + --> $DIR/issue-5153.rs:10:23 | LL | (&5isize as &Foo).foo(); | ^^^ diff --git a/src/test/ui/issues/issue-51632-try-desugar-incompatible-types.fixed b/src/test/ui/issues/issue-51632-try-desugar-incompatible-types.fixed index 016cff914bd2d..4388ccc202810 100644 --- a/src/test/ui/issues/issue-51632-try-desugar-incompatible-types.fixed +++ b/src/test/ui/issues/issue-51632-try-desugar-incompatible-types.fixed @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix #![allow(dead_code)] diff --git a/src/test/ui/issues/issue-51632-try-desugar-incompatible-types.rs b/src/test/ui/issues/issue-51632-try-desugar-incompatible-types.rs index 315773a85f004..1bd9de418bef9 100644 --- a/src/test/ui/issues/issue-51632-try-desugar-incompatible-types.rs +++ b/src/test/ui/issues/issue-51632-try-desugar-incompatible-types.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix #![allow(dead_code)] diff --git a/src/test/ui/issues/issue-51632-try-desugar-incompatible-types.stderr b/src/test/ui/issues/issue-51632-try-desugar-incompatible-types.stderr index a50af5624c0cf..f5504d9e79b33 100644 --- a/src/test/ui/issues/issue-51632-try-desugar-incompatible-types.stderr +++ b/src/test/ui/issues/issue-51632-try-desugar-incompatible-types.stderr @@ -1,5 +1,5 @@ error[E0308]: try expression alternatives have incompatible types - --> $DIR/issue-51632-try-desugar-incompatible-types.rs:20:5 + --> $DIR/issue-51632-try-desugar-incompatible-types.rs:10:5 | LL | missing_discourses()? | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-51714.rs b/src/test/ui/issues/issue-51714.rs index 2b9d51f81b988..b52e3ac6abd84 100644 --- a/src/test/ui/issues/issue-51714.rs +++ b/src/test/ui/issues/issue-51714.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { |_: [_; return || {}] | {}; //~^ ERROR return statement outside of function body diff --git a/src/test/ui/issues/issue-51714.stderr b/src/test/ui/issues/issue-51714.stderr index ddc70bfb38e01..47a8b415b0cf0 100644 --- a/src/test/ui/issues/issue-51714.stderr +++ b/src/test/ui/issues/issue-51714.stderr @@ -1,29 +1,29 @@ error[E0572]: return statement outside of function body - --> $DIR/issue-51714.rs:12:14 + --> $DIR/issue-51714.rs:2:14 | LL | |_: [_; return || {}] | {}; | ^^^^^^^^^^^^ error[E0572]: return statement outside of function body - --> $DIR/issue-51714.rs:15:10 + --> $DIR/issue-51714.rs:5:10 | LL | [(); return || {}]; | ^^^^^^^^^^^^ error[E0572]: return statement outside of function body - --> $DIR/issue-51714.rs:18:10 + --> $DIR/issue-51714.rs:8:10 | LL | [(); return |ice| {}]; | ^^^^^^^^^^^^^^^ error[E0572]: return statement outside of function body - --> $DIR/issue-51714.rs:21:10 + --> $DIR/issue-51714.rs:11:10 | LL | [(); return while let Some(n) = Some(0) {}]; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0165]: irrefutable while-let pattern - --> $DIR/issue-51714.rs:21:27 + --> $DIR/issue-51714.rs:11:27 | LL | [(); return while let Some(n) = Some(0) {}]; | ^^^^^^^ irrefutable pattern diff --git a/src/test/ui/issues/issue-51848.rs b/src/test/ui/issues/issue-51848.rs index ec90d3f62d232..4792bdd64f005 100644 --- a/src/test/ui/issues/issue-51848.rs +++ b/src/test/ui/issues/issue-51848.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // In case of macro expansion, the errors should be matched using the deepest callsite in the // macro call stack whose span is in the current file diff --git a/src/test/ui/issues/issue-51848.stderr b/src/test/ui/issues/issue-51848.stderr index 8e5001dca3386..62937fc8c3ec9 100644 --- a/src/test/ui/issues/issue-51848.stderr +++ b/src/test/ui/issues/issue-51848.stderr @@ -1,5 +1,5 @@ error: invalid format string: expected `'}'` but string was terminated - --> $DIR/issue-51848.rs:16:20 + --> $DIR/issue-51848.rs:6:20 | LL | println!("{"); //~ ERROR invalid | ^ expected `'}'` in format string @@ -10,7 +10,7 @@ LL | macro_with_error!(); = note: if you intended to print `{`, you can escape it using `{{` error: invalid format string: unmatched `}` found - --> $DIR/issue-51848.rs:28:15 + --> $DIR/issue-51848.rs:18:15 | LL | println!("}"); //~ ERROR invalid | ^ unmatched `}` in format string diff --git a/src/test/ui/issues/issue-51874.rs b/src/test/ui/issues/issue-51874.rs index 63425274d4c49..d9d7e36b50e9b 100644 --- a/src/test/ui/issues/issue-51874.rs +++ b/src/test/ui/issues/issue-51874.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let a = (1.0).pow(1.0); //~ ERROR can't call method `pow` on ambiguous numeric type } diff --git a/src/test/ui/issues/issue-51874.stderr b/src/test/ui/issues/issue-51874.stderr index 8674645357189..38c380c4bab80 100644 --- a/src/test/ui/issues/issue-51874.stderr +++ b/src/test/ui/issues/issue-51874.stderr @@ -1,5 +1,5 @@ error[E0689]: can't call method `pow` on ambiguous numeric type `{float}` - --> $DIR/issue-51874.rs:12:19 + --> $DIR/issue-51874.rs:2:19 | LL | let a = (1.0).pow(1.0); //~ ERROR can't call method `pow` on ambiguous numeric type | ^^^ diff --git a/src/test/ui/issues/issue-52023-array-size-pointer-cast.rs b/src/test/ui/issues/issue-52023-array-size-pointer-cast.rs index 02bed69f0d40e..cc756ce815f15 100644 --- a/src/test/ui/issues/issue-52023-array-size-pointer-cast.rs +++ b/src/test/ui/issues/issue-52023-array-size-pointer-cast.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let _ = [0; (&0 as *const i32) as usize]; //~ ERROR casting pointers to integers in constants } diff --git a/src/test/ui/issues/issue-52023-array-size-pointer-cast.stderr b/src/test/ui/issues/issue-52023-array-size-pointer-cast.stderr index 74270c2bef798..ad58c3094165e 100644 --- a/src/test/ui/issues/issue-52023-array-size-pointer-cast.stderr +++ b/src/test/ui/issues/issue-52023-array-size-pointer-cast.stderr @@ -1,5 +1,5 @@ error[E0658]: casting pointers to integers in constants is unstable (see issue #51910) - --> $DIR/issue-52023-array-size-pointer-cast.rs:12:17 + --> $DIR/issue-52023-array-size-pointer-cast.rs:2:17 | LL | let _ = [0; (&0 as *const i32) as usize]; //~ ERROR casting pointers to integers in constants | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-52049.nll.stderr b/src/test/ui/issues/issue-52049.nll.stderr index 6f71f1676119a..1818f67d0f0f7 100644 --- a/src/test/ui/issues/issue-52049.nll.stderr +++ b/src/test/ui/issues/issue-52049.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/issue-52049.rs:16:10 + --> $DIR/issue-52049.rs:6:10 | LL | foo(&unpromotable(5u32)); | ^^^^^^^^^^^^^^^^^^ temporary value does not live long enough diff --git a/src/test/ui/issues/issue-52049.rs b/src/test/ui/issues/issue-52049.rs index daff2258d3620..23b21cf4e615d 100644 --- a/src/test/ui/issues/issue-52049.rs +++ b/src/test/ui/issues/issue-52049.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo(_: &'static u32) {} fn unpromotable(t: T) -> T { t } diff --git a/src/test/ui/issues/issue-52049.stderr b/src/test/ui/issues/issue-52049.stderr index e1e501023fcef..45381765f8c09 100644 --- a/src/test/ui/issues/issue-52049.stderr +++ b/src/test/ui/issues/issue-52049.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/issue-52049.rs:16:10 + --> $DIR/issue-52049.rs:6:10 | LL | foo(&unpromotable(5u32)); | ^^^^^^^^^^^^^^^^^^ - temporary value only lives until here diff --git a/src/test/ui/issues/issue-52057.rs b/src/test/ui/issues/issue-52057.rs index 533623fd38900..356efd5dfedba 100644 --- a/src/test/ui/issues/issue-52057.rs +++ b/src/test/ui/issues/issue-52057.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #52057. There is an implied bound // that `I: 'a` where `'a` is the lifetime of `self` in `parse_first`; // but to observe that, one must normalize first. diff --git a/src/test/ui/issues/issue-52126-assign-op-invariance.nll.stderr b/src/test/ui/issues/issue-52126-assign-op-invariance.nll.stderr index e3e389d11970a..7ef0ccb62e429 100644 --- a/src/test/ui/issues/issue-52126-assign-op-invariance.nll.stderr +++ b/src/test/ui/issues/issue-52126-assign-op-invariance.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `line` does not live long enough - --> $DIR/issue-52126-assign-op-invariance.rs:44:28 + --> $DIR/issue-52126-assign-op-invariance.rs:34:28 | LL | let v: Vec<&str> = line.split_whitespace().collect(); | ^^^^ borrowed value does not live long enough diff --git a/src/test/ui/issues/issue-52126-assign-op-invariance.rs b/src/test/ui/issues/issue-52126-assign-op-invariance.rs index b26ad9bc37dd1..2ac44164ab0ac 100644 --- a/src/test/ui/issues/issue-52126-assign-op-invariance.rs +++ b/src/test/ui/issues/issue-52126-assign-op-invariance.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue 52126: With respect to variance, the assign-op's like += were // accidentally lumped together with other binary op's. In both cases // we were coercing the LHS of the op to the expected supertype. diff --git a/src/test/ui/issues/issue-52126-assign-op-invariance.stderr b/src/test/ui/issues/issue-52126-assign-op-invariance.stderr index a4ea8085c12af..b07b8d5281e8f 100644 --- a/src/test/ui/issues/issue-52126-assign-op-invariance.stderr +++ b/src/test/ui/issues/issue-52126-assign-op-invariance.stderr @@ -1,5 +1,5 @@ error[E0597]: `line` does not live long enough - --> $DIR/issue-52126-assign-op-invariance.rs:44:28 + --> $DIR/issue-52126-assign-op-invariance.rs:34:28 | LL | let v: Vec<&str> = line.split_whitespace().collect(); | ^^^^ borrowed value does not live long enough diff --git a/src/test/ui/issues/issue-5216.rs b/src/test/ui/issues/issue-5216.rs index 81424577d491b..fd490884fa1fc 100644 --- a/src/test/ui/issues/issue-5216.rs +++ b/src/test/ui/issues/issue-5216.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn f() { } struct S(Box); pub static C: S = S(f); //~ ERROR mismatched types diff --git a/src/test/ui/issues/issue-5216.stderr b/src/test/ui/issues/issue-5216.stderr index 7ea329749a0a4..5afea5873d568 100644 --- a/src/test/ui/issues/issue-5216.stderr +++ b/src/test/ui/issues/issue-5216.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-5216.rs:13:21 + --> $DIR/issue-5216.rs:3:21 | LL | pub static C: S = S(f); //~ ERROR mismatched types | ^ expected struct `std::boxed::Box`, found fn item @@ -8,7 +8,7 @@ LL | pub static C: S = S(f); //~ ERROR mismatched types found type `fn() {f}` error[E0308]: mismatched types - --> $DIR/issue-5216.rs:18:19 + --> $DIR/issue-5216.rs:8:19 | LL | pub static D: T = g; //~ ERROR mismatched types | ^ expected struct `std::boxed::Box`, found fn item diff --git a/src/test/ui/issues/issue-52213.nll.stderr b/src/test/ui/issues/issue-52213.nll.stderr index 7a04aeb963547..d4dd3a1a07a9e 100644 --- a/src/test/ui/issues/issue-52213.nll.stderr +++ b/src/test/ui/issues/issue-52213.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/issue-52213.rs:12:11 + --> $DIR/issue-52213.rs:2:11 | LL | match (&t,) { //~ ERROR cannot infer an appropriate lifetime | ^^^^^ error: unsatisfied lifetime constraints - --> $DIR/issue-52213.rs:13:20 + --> $DIR/issue-52213.rs:3:20 | LL | fn transmute_lifetime<'a, 'b, T>(t: &'a (T,)) -> &'b T { | -- -- lifetime `'b` defined here diff --git a/src/test/ui/issues/issue-52213.rs b/src/test/ui/issues/issue-52213.rs index 810379c63d3e1..c4ce4946b2e28 100644 --- a/src/test/ui/issues/issue-52213.rs +++ b/src/test/ui/issues/issue-52213.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn transmute_lifetime<'a, 'b, T>(t: &'a (T,)) -> &'b T { match (&t,) { //~ ERROR cannot infer an appropriate lifetime ((u,),) => u, diff --git a/src/test/ui/issues/issue-52213.stderr b/src/test/ui/issues/issue-52213.stderr index 3c650881d7bdf..4d3346f325ddf 100644 --- a/src/test/ui/issues/issue-52213.stderr +++ b/src/test/ui/issues/issue-52213.stderr @@ -1,24 +1,24 @@ error[E0495]: cannot infer an appropriate lifetime due to conflicting requirements - --> $DIR/issue-52213.rs:12:11 + --> $DIR/issue-52213.rs:2:11 | LL | match (&t,) { //~ ERROR cannot infer an appropriate lifetime | ^^^^^ | -note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 11:23... - --> $DIR/issue-52213.rs:11:23 +note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 1:23... + --> $DIR/issue-52213.rs:1:23 | LL | fn transmute_lifetime<'a, 'b, T>(t: &'a (T,)) -> &'b T { | ^^ = note: ...so that the types are compatible: expected (&&(T,),) found (&&'a (T,),) -note: but, the lifetime must be valid for the lifetime 'b as defined on the function body at 11:27... - --> $DIR/issue-52213.rs:11:27 +note: but, the lifetime must be valid for the lifetime 'b as defined on the function body at 1:27... + --> $DIR/issue-52213.rs:1:27 | LL | fn transmute_lifetime<'a, 'b, T>(t: &'a (T,)) -> &'b T { | ^^ note: ...so that reference does not outlive borrowed content - --> $DIR/issue-52213.rs:13:20 + --> $DIR/issue-52213.rs:3:20 | LL | ((u,),) => u, | ^ diff --git a/src/test/ui/issues/issue-5239-1.rs b/src/test/ui/issues/issue-5239-1.rs index f88b6931344a6..708ae34c6c6ae 100644 --- a/src/test/ui/issues/issue-5239-1.rs +++ b/src/test/ui/issues/issue-5239-1.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #5239 fn main() { diff --git a/src/test/ui/issues/issue-5239-1.stderr b/src/test/ui/issues/issue-5239-1.stderr index 7ae01fb7d6012..e7d683a1cb6f9 100644 --- a/src/test/ui/issues/issue-5239-1.stderr +++ b/src/test/ui/issues/issue-5239-1.stderr @@ -1,5 +1,5 @@ error[E0368]: binary assignment operation `+=` cannot be applied to type `&isize` - --> $DIR/issue-5239-1.rs:14:30 + --> $DIR/issue-5239-1.rs:4:30 | LL | let x = |ref x: isize| { x += 1; }; | -^^^^^ diff --git a/src/test/ui/issues/issue-52489.rs b/src/test/ui/issues/issue-52489.rs index c43cc12ca0229..2ac7971c73961 100644 --- a/src/test/ui/issues/issue-52489.rs +++ b/src/test/ui/issues/issue-52489.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 // aux-build:issue-52489.rs diff --git a/src/test/ui/issues/issue-52489.stderr b/src/test/ui/issues/issue-52489.stderr index 5b38a0789ad7f..9b003b224eab0 100644 --- a/src/test/ui/issues/issue-52489.stderr +++ b/src/test/ui/issues/issue-52489.stderr @@ -1,5 +1,5 @@ error[E0658]: use of unstable library feature 'issue_52489_unstable' - --> $DIR/issue-52489.rs:14:5 + --> $DIR/issue-52489.rs:4:5 | LL | use issue_52489; | ^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-52533-1.nll.stderr b/src/test/ui/issues/issue-52533-1.nll.stderr index 2dfa46dc2288e..d14e3b82001c2 100644 --- a/src/test/ui/issues/issue-52533-1.nll.stderr +++ b/src/test/ui/issues/issue-52533-1.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/issue-52533-1.rs:19:18 + --> $DIR/issue-52533-1.rs:9:18 | LL | gimme(|x, y| y) | ^ error: unsatisfied lifetime constraints - --> $DIR/issue-52533-1.rs:19:18 + --> $DIR/issue-52533-1.rs:9:18 | LL | gimme(|x, y| y) | - - ^ closure was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1` diff --git a/src/test/ui/issues/issue-52533-1.rs b/src/test/ui/issues/issue-52533-1.rs index 22af5a8670257..c80f43237fc76 100644 --- a/src/test/ui/issues/issue-52533-1.rs +++ b/src/test/ui/issues/issue-52533-1.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(warnings)] struct Foo<'a, 'b, T: 'a + 'b> { x: &'a T, y: &'b T } diff --git a/src/test/ui/issues/issue-52533-1.stderr b/src/test/ui/issues/issue-52533-1.stderr index 38deb7d66de08..c719c00ef2239 100644 --- a/src/test/ui/issues/issue-52533-1.stderr +++ b/src/test/ui/issues/issue-52533-1.stderr @@ -1,18 +1,18 @@ error[E0308]: mismatched types - --> $DIR/issue-52533-1.rs:19:18 + --> $DIR/issue-52533-1.rs:9:18 | LL | gimme(|x, y| y) | ^ lifetime mismatch | = note: expected type `&Foo<'_, '_, u32>` found type `&Foo<'_, '_, u32>` -note: the anonymous lifetime #4 defined on the body at 19:11... - --> $DIR/issue-52533-1.rs:19:11 +note: the anonymous lifetime #4 defined on the body at 9:11... + --> $DIR/issue-52533-1.rs:9:11 | LL | gimme(|x, y| y) | ^^^^^^^^ -note: ...does not necessarily outlive the anonymous lifetime #3 defined on the body at 19:11 - --> $DIR/issue-52533-1.rs:19:11 +note: ...does not necessarily outlive the anonymous lifetime #3 defined on the body at 9:11 + --> $DIR/issue-52533-1.rs:9:11 | LL | gimme(|x, y| y) | ^^^^^^^^ diff --git a/src/test/ui/issues/issue-52533.nll.stderr b/src/test/ui/issues/issue-52533.nll.stderr index 17218429822e8..631a38d89bcf5 100644 --- a/src/test/ui/issues/issue-52533.nll.stderr +++ b/src/test/ui/issues/issue-52533.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/issue-52533.rs:15:16 + --> $DIR/issue-52533.rs:5:16 | LL | foo(|a, b| b) | ^ error: unsatisfied lifetime constraints - --> $DIR/issue-52533.rs:15:16 + --> $DIR/issue-52533.rs:5:16 | LL | foo(|a, b| b) | - - ^ closure was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1` diff --git a/src/test/ui/issues/issue-52533.rs b/src/test/ui/issues/issue-52533.rs index 08f2805cefd6d..a35f5a80a87fe 100644 --- a/src/test/ui/issues/issue-52533.rs +++ b/src/test/ui/issues/issue-52533.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo(_: impl for<'a> FnOnce(&'a u32, &u32) -> &'a u32) { } diff --git a/src/test/ui/issues/issue-52533.stderr b/src/test/ui/issues/issue-52533.stderr index 76a2470a2e03e..586548002072e 100644 --- a/src/test/ui/issues/issue-52533.stderr +++ b/src/test/ui/issues/issue-52533.stderr @@ -1,16 +1,16 @@ error[E0312]: lifetime of reference outlives lifetime of borrowed content... - --> $DIR/issue-52533.rs:15:16 + --> $DIR/issue-52533.rs:5:16 | LL | foo(|a, b| b) | ^ | -note: ...the reference is valid for the anonymous lifetime #2 defined on the body at 15:9... - --> $DIR/issue-52533.rs:15:9 +note: ...the reference is valid for the anonymous lifetime #2 defined on the body at 5:9... + --> $DIR/issue-52533.rs:5:9 | LL | foo(|a, b| b) | ^^^^^^^^ -note: ...but the borrowed content is only valid for the anonymous lifetime #3 defined on the body at 15:9 - --> $DIR/issue-52533.rs:15:9 +note: ...but the borrowed content is only valid for the anonymous lifetime #3 defined on the body at 5:9 + --> $DIR/issue-52533.rs:5:9 | LL | foo(|a, b| b) | ^^^^^^^^ diff --git a/src/test/ui/issues/issue-53348.rs b/src/test/ui/issues/issue-53348.rs index 46ab07dad6e47..733413f0e1713 100644 --- a/src/test/ui/issues/issue-53348.rs +++ b/src/test/ui/issues/issue-53348.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let mut v = vec!["hello", "this", "is", "a", "test"]; diff --git a/src/test/ui/issues/issue-53348.stderr b/src/test/ui/issues/issue-53348.stderr index 9aab4928ffa57..ca07b1de43591 100644 --- a/src/test/ui/issues/issue-53348.stderr +++ b/src/test/ui/issues/issue-53348.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-53348.rs:20:13 + --> $DIR/issue-53348.rs:10:13 | LL | a = *i.to_string(); | ^^^^^^^^^^^^^^ expected struct `std::string::String`, found str diff --git a/src/test/ui/issues/issue-5358-1.rs b/src/test/ui/issues/issue-5358-1.rs index d8aad54fd3ee9..6b23be2030de9 100644 --- a/src/test/ui/issues/issue-5358-1.rs +++ b/src/test/ui/issues/issue-5358-1.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Either { Left(T), Right(U) } struct S(Either); diff --git a/src/test/ui/issues/issue-5358-1.stderr b/src/test/ui/issues/issue-5358-1.stderr index abaea462fcc5f..dbbafb38e6580 100644 --- a/src/test/ui/issues/issue-5358-1.stderr +++ b/src/test/ui/issues/issue-5358-1.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-5358-1.rs:16:9 + --> $DIR/issue-5358-1.rs:6:9 | LL | Either::Right(_) => {} | ^^^^^^^^^^^^^^^^ expected struct `S`, found enum `Either` diff --git a/src/test/ui/issues/issue-5439.rs b/src/test/ui/issues/issue-5439.rs index 4e618f3d85848..cd039506f3816 100644 --- a/src/test/ui/issues/issue-5439.rs +++ b/src/test/ui/issues/issue-5439.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] struct Foo { diff --git a/src/test/ui/issues/issue-5439.stderr b/src/test/ui/issues/issue-5439.stderr index 87e20f3a03d03..847bc7695807b 100644 --- a/src/test/ui/issues/issue-5439.stderr +++ b/src/test/ui/issues/issue-5439.stderr @@ -1,5 +1,5 @@ error[E0560]: struct `Foo` has no field named `nonexistent` - --> $DIR/issue-5439.rs:23:26 + --> $DIR/issue-5439.rs:13:26 | LL | return box Foo { nonexistent: self, foo: i }; //~ ERROR: no field named | ^^^^^^^^^^^ `Foo` does not have this field diff --git a/src/test/ui/issues/issue-5500-1.ast.stderr b/src/test/ui/issues/issue-5500-1.ast.stderr index 611eea533b296..fe2ffdcdf6221 100644 --- a/src/test/ui/issues/issue-5500-1.ast.stderr +++ b/src/test/ui/issues/issue-5500-1.ast.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to field `_iter.node` of immutable binding - --> $DIR/issue-5500-1.rs:22:5 + --> $DIR/issue-5500-1.rs:12:5 | LL | let _iter = TrieMapIterator{node: &a}; | ----- consider changing this to `mut _iter` diff --git a/src/test/ui/issues/issue-5500-1.mir.stderr b/src/test/ui/issues/issue-5500-1.mir.stderr index 465485e5e290c..f10d545ea7c0f 100644 --- a/src/test/ui/issues/issue-5500-1.mir.stderr +++ b/src/test/ui/issues/issue-5500-1.mir.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to field `_iter.node` of immutable binding (Ast) - --> $DIR/issue-5500-1.rs:22:5 + --> $DIR/issue-5500-1.rs:12:5 | LL | let _iter = TrieMapIterator{node: &a}; | ----- consider changing this to `mut _iter` diff --git a/src/test/ui/issues/issue-5500-1.rs b/src/test/ui/issues/issue-5500-1.rs index 8d6efa774a361..e8043563c7359 100644 --- a/src/test/ui/issues/issue-5500-1.rs +++ b/src/test/ui/issues/issue-5500-1.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-compare-mode-nll // revisions: ast mir //[mir]compile-flags: -Z borrowck=compare diff --git a/src/test/ui/issues/issue-5844.rs b/src/test/ui/issues/issue-5844.rs index 02e5b9b092197..afb9af47ad5dc 100644 --- a/src/test/ui/issues/issue-5844.rs +++ b/src/test/ui/issues/issue-5844.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //aux-build:issue_5844_aux.rs extern crate issue_5844_aux; diff --git a/src/test/ui/issues/issue-5844.stderr b/src/test/ui/issues/issue-5844.stderr index 05b0b63439fff..876151fb25cb4 100644 --- a/src/test/ui/issues/issue-5844.stderr +++ b/src/test/ui/issues/issue-5844.stderr @@ -1,5 +1,5 @@ error[E0133]: call to unsafe function is unsafe and requires unsafe function or block - --> $DIR/issue-5844.rs:16:5 + --> $DIR/issue-5844.rs:6:5 | LL | issue_5844_aux::rand(); //~ ERROR: requires unsafe | ^^^^^^^^^^^^^^^^^^^^^^ call to unsafe function diff --git a/src/test/ui/issues/issue-5883.rs b/src/test/ui/issues/issue-5883.rs index a91f5d281dd90..b4a73ba99c574 100644 --- a/src/test/ui/issues/issue-5883.rs +++ b/src/test/ui/issues/issue-5883.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait A {} struct Struct { diff --git a/src/test/ui/issues/issue-5883.stderr b/src/test/ui/issues/issue-5883.stderr index 63dabd86ca89e..398d42c94fa48 100644 --- a/src/test/ui/issues/issue-5883.stderr +++ b/src/test/ui/issues/issue-5883.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `(dyn A + 'static)` cannot be known at compilation time - --> $DIR/issue-5883.rs:17:15 + --> $DIR/issue-5883.rs:7:15 | LL | fn new_struct(r: A+'static) | ^ doesn't have a size known at compile-time @@ -10,7 +10,7 @@ LL | fn new_struct(r: A+'static) = help: unsized locals are gated as an unstable feature error[E0277]: the size for values of type `(dyn A + 'static)` cannot be known at compilation time - --> $DIR/issue-5883.rs:18:8 + --> $DIR/issue-5883.rs:8:8 | LL | -> Struct { //~^ ERROR the size for values of type | ^^^^^^ doesn't have a size known at compile-time diff --git a/src/test/ui/issues/issue-5927.rs b/src/test/ui/issues/issue-5927.rs index bb802f353afd0..847936cc95402 100644 --- a/src/test/ui/issues/issue-5927.rs +++ b/src/test/ui/issues/issue-5927.rs @@ -1,14 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn main() { let z = match 3 { x(1) => x(1) //~ ERROR cannot find tuple struct/variant `x` in this scope diff --git a/src/test/ui/issues/issue-5927.stderr b/src/test/ui/issues/issue-5927.stderr index f8b9b15678d49..189eefe51b914 100644 --- a/src/test/ui/issues/issue-5927.stderr +++ b/src/test/ui/issues/issue-5927.stderr @@ -1,11 +1,11 @@ error[E0531]: cannot find tuple struct/variant `x` in this scope - --> $DIR/issue-5927.rs:14:9 + --> $DIR/issue-5927.rs:3:9 | LL | x(1) => x(1) //~ ERROR cannot find tuple struct/variant `x` in this scope | ^ not found in this scope error[E0425]: cannot find function `x` in this scope - --> $DIR/issue-5927.rs:14:17 + --> $DIR/issue-5927.rs:3:17 | LL | x(1) => x(1) //~ ERROR cannot find tuple struct/variant `x` in this scope | ^ not found in this scope diff --git a/src/test/ui/issues/issue-5997-enum.rs b/src/test/ui/issues/issue-5997-enum.rs index 463fdaa106926..0987117ecd402 100644 --- a/src/test/ui/issues/issue-5997-enum.rs +++ b/src/test/ui/issues/issue-5997-enum.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn f() -> bool { enum E { V(Z) } //~^ ERROR can't use type parameters from outer function diff --git a/src/test/ui/issues/issue-5997-enum.stderr b/src/test/ui/issues/issue-5997-enum.stderr index 9f26f653ebd9e..5c26dc92c8584 100644 --- a/src/test/ui/issues/issue-5997-enum.stderr +++ b/src/test/ui/issues/issue-5997-enum.stderr @@ -1,5 +1,5 @@ error[E0401]: can't use type parameters from outer function - --> $DIR/issue-5997-enum.rs:12:16 + --> $DIR/issue-5997-enum.rs:2:16 | LL | fn f() -> bool { | - - type variable from outer function diff --git a/src/test/ui/issues/issue-5997-struct.rs b/src/test/ui/issues/issue-5997-struct.rs index af9e66b770bba..04ac489a55c50 100644 --- a/src/test/ui/issues/issue-5997-struct.rs +++ b/src/test/ui/issues/issue-5997-struct.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn f() -> bool { struct S(T); //~ ERROR can't use type parameters from outer function diff --git a/src/test/ui/issues/issue-5997-struct.stderr b/src/test/ui/issues/issue-5997-struct.stderr index fd6d67bd1280c..1d05d13242e8e 100644 --- a/src/test/ui/issues/issue-5997-struct.stderr +++ b/src/test/ui/issues/issue-5997-struct.stderr @@ -1,5 +1,5 @@ error[E0401]: can't use type parameters from outer function - --> $DIR/issue-5997-struct.rs:12:14 + --> $DIR/issue-5997-struct.rs:2:14 | LL | fn f() -> bool { | - - type variable from outer function diff --git a/src/test/ui/issues/issue-6458-2.rs b/src/test/ui/issues/issue-6458-2.rs index 87cf2b3f740c1..b18cae3ed1ac8 100644 --- a/src/test/ui/issues/issue-6458-2.rs +++ b/src/test/ui/issues/issue-6458-2.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { // Unconstrained type: format!("{:?}", None); diff --git a/src/test/ui/issues/issue-6458-2.stderr b/src/test/ui/issues/issue-6458-2.stderr index e192c2c3be3cc..b5da2bf096cb3 100644 --- a/src/test/ui/issues/issue-6458-2.stderr +++ b/src/test/ui/issues/issue-6458-2.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/issue-6458-2.rs:13:21 + --> $DIR/issue-6458-2.rs:3:21 | LL | format!("{:?}", None); | ^^^^ cannot infer type for `T` diff --git a/src/test/ui/issues/issue-6458-3.rs b/src/test/ui/issues/issue-6458-3.rs index 038f6043fa667..d4f8886e9b065 100644 --- a/src/test/ui/issues/issue-6458-3.rs +++ b/src/test/ui/issues/issue-6458-3.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::mem; fn main() { diff --git a/src/test/ui/issues/issue-6458-3.stderr b/src/test/ui/issues/issue-6458-3.stderr index c09b2643dfa21..784497c959d6c 100644 --- a/src/test/ui/issues/issue-6458-3.stderr +++ b/src/test/ui/issues/issue-6458-3.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/issue-6458-3.rs:14:5 + --> $DIR/issue-6458-3.rs:4:5 | LL | mem::transmute(0); | ^^^^^^^^^^^^^^ cannot infer type for `U` diff --git a/src/test/ui/issues/issue-6458-4.rs b/src/test/ui/issues/issue-6458-4.rs index 45934d03ed4f9..054a5c15c3f8a 100644 --- a/src/test/ui/issues/issue-6458-4.rs +++ b/src/test/ui/issues/issue-6458-4.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo(b: bool) -> Result { //~ ERROR mismatched types Err("bar".to_string()); } diff --git a/src/test/ui/issues/issue-6458-4.stderr b/src/test/ui/issues/issue-6458-4.stderr index 13b0ace64652d..3e621c17cdcb6 100644 --- a/src/test/ui/issues/issue-6458-4.stderr +++ b/src/test/ui/issues/issue-6458-4.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-6458-4.rs:11:40 + --> $DIR/issue-6458-4.rs:1:40 | LL | fn foo(b: bool) -> Result { //~ ERROR mismatched types | ________________________________________^ diff --git a/src/test/ui/issues/issue-6458.rs b/src/test/ui/issues/issue-6458.rs index b4e7c0c40cfb7..16718e90deb51 100644 --- a/src/test/ui/issues/issue-6458.rs +++ b/src/test/ui/issues/issue-6458.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::marker; pub struct TypeWithState(marker::PhantomData); diff --git a/src/test/ui/issues/issue-6458.stderr b/src/test/ui/issues/issue-6458.stderr index 701795c748dc2..d59d872ba93b0 100644 --- a/src/test/ui/issues/issue-6458.stderr +++ b/src/test/ui/issues/issue-6458.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/issue-6458.rs:19:4 + --> $DIR/issue-6458.rs:9:4 | LL | foo(TypeWithState(marker::PhantomData)); | ^^^ cannot infer type for `State` diff --git a/src/test/ui/issues/issue-6596-1.rs b/src/test/ui/issues/issue-6596-1.rs index ce8a3a80e1f84..5da54451346a5 100644 --- a/src/test/ui/issues/issue-6596-1.rs +++ b/src/test/ui/issues/issue-6596-1.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - macro_rules! e { ($inp:ident) => ( $nonexistent diff --git a/src/test/ui/issues/issue-6596-1.stderr b/src/test/ui/issues/issue-6596-1.stderr index b7055ab19d0c5..2a4ece2f2425f 100644 --- a/src/test/ui/issues/issue-6596-1.stderr +++ b/src/test/ui/issues/issue-6596-1.stderr @@ -1,5 +1,5 @@ error: unknown macro variable `nonexistent` - --> $DIR/issue-6596-1.rs:14:9 + --> $DIR/issue-6596-1.rs:3:9 | LL | $nonexistent | ^^^^^^^^^^^^ unknown macro variable diff --git a/src/test/ui/issues/issue-6596-2.rs b/src/test/ui/issues/issue-6596-2.rs index 3e18de6178a63..056a720bc5c6e 100644 --- a/src/test/ui/issues/issue-6596-2.rs +++ b/src/test/ui/issues/issue-6596-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(macro_rules)] macro_rules! g { diff --git a/src/test/ui/issues/issue-6596-2.stderr b/src/test/ui/issues/issue-6596-2.stderr index f2ed17f35e697..99decd177ef61 100644 --- a/src/test/ui/issues/issue-6596-2.stderr +++ b/src/test/ui/issues/issue-6596-2.stderr @@ -1,5 +1,5 @@ error: unknown macro variable `nonexistent` - --> $DIR/issue-6596-2.rs:15:16 + --> $DIR/issue-6596-2.rs:5:16 | LL | { $inp $nonexistent } | ^^^^^^^^^^^^ unknown macro variable @@ -8,7 +8,7 @@ LL | g!(foo); | -------- in this macro invocation error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `nonexistent` - --> $DIR/issue-6596-2.rs:15:16 + --> $DIR/issue-6596-2.rs:5:16 | LL | { $inp $nonexistent } | ^^^^^^^^^^^^ expected one of 8 possible tokens here diff --git a/src/test/ui/issues/issue-6642.rs b/src/test/ui/issues/issue-6642.rs index 1fe10ba7a27bb..f80f6fffe89f8 100644 --- a/src/test/ui/issues/issue-6642.rs +++ b/src/test/ui/issues/issue-6642.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct A; impl A { fn m(&self) { diff --git a/src/test/ui/issues/issue-6642.stderr b/src/test/ui/issues/issue-6642.stderr index 1762af52eb065..a99d9b3cd77c3 100644 --- a/src/test/ui/issues/issue-6642.stderr +++ b/src/test/ui/issues/issue-6642.stderr @@ -1,5 +1,5 @@ error[E0434]: can't capture dynamic environment in a fn item - --> $DIR/issue-6642.rs:15:13 + --> $DIR/issue-6642.rs:5:13 | LL | self.m() //~ ERROR can't capture dynamic environment in a fn item | ^^^^ diff --git a/src/test/ui/issues/issue-6738.rs b/src/test/ui/issues/issue-6738.rs index 447d0e061ee54..a2f8dfe9c493c 100644 --- a/src/test/ui/issues/issue-6738.rs +++ b/src/test/ui/issues/issue-6738.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { x: T, } diff --git a/src/test/ui/issues/issue-6738.stderr b/src/test/ui/issues/issue-6738.stderr index 8c0aff9d9abdb..82b670bd03bc5 100644 --- a/src/test/ui/issues/issue-6738.stderr +++ b/src/test/ui/issues/issue-6738.stderr @@ -1,5 +1,5 @@ error[E0368]: binary assignment operation `+=` cannot be applied to type `T` - --> $DIR/issue-6738.rs:16:9 + --> $DIR/issue-6738.rs:6:9 | LL | self.x += v.x; | ------^^^^^^^ diff --git a/src/test/ui/issues/issue-6801.nll.stderr b/src/test/ui/issues/issue-6801.nll.stderr index 3ca2f39470da7..2c0fedf351a23 100644 --- a/src/test/ui/issues/issue-6801.nll.stderr +++ b/src/test/ui/issues/issue-6801.nll.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `x` because it is borrowed - --> $DIR/issue-6801.rs:29:13 + --> $DIR/issue-6801.rs:19:13 | LL | let sq = || { *x * *x }; | -- - borrow occurs due to use in closure diff --git a/src/test/ui/issues/issue-6801.rs b/src/test/ui/issues/issue-6801.rs index 792d27c179bc4..694d86feb5a34 100644 --- a/src/test/ui/issues/issue-6801.rs +++ b/src/test/ui/issues/issue-6801.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Creating a stack closure which references a box and then // transferring ownership of the box before invoking the stack // closure results in a crash. diff --git a/src/test/ui/issues/issue-6801.stderr b/src/test/ui/issues/issue-6801.stderr index 8a1c669f0b2f6..fa0e1928ba4bd 100644 --- a/src/test/ui/issues/issue-6801.stderr +++ b/src/test/ui/issues/issue-6801.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `x` because it is borrowed - --> $DIR/issue-6801.rs:29:13 + --> $DIR/issue-6801.rs:19:13 | LL | let sq = || { *x * *x }; | -- borrow of `x` occurs here diff --git a/src/test/ui/issues/issue-6804.rs b/src/test/ui/issues/issue-6804.rs index fffa27ab842ad..da73e2bd397d6 100644 --- a/src/test/ui/issues/issue-6804.rs +++ b/src/test/ui/issues/issue-6804.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Matching against NaN should result in a warning #![allow(unused)] diff --git a/src/test/ui/issues/issue-6804.stderr b/src/test/ui/issues/issue-6804.stderr index 45eefbfaf8ead..965148d478e00 100644 --- a/src/test/ui/issues/issue-6804.stderr +++ b/src/test/ui/issues/issue-6804.stderr @@ -1,11 +1,11 @@ error: floating-point types cannot be used in patterns - --> $DIR/issue-6804.rs:21:9 + --> $DIR/issue-6804.rs:11:9 | LL | NAN => {}, //~ ERROR floating-point types cannot be used | ^^^ | note: lint level defined here - --> $DIR/issue-6804.rs:14:9 + --> $DIR/issue-6804.rs:4:9 | LL | #![deny(illegal_floating_point_literal_pattern)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -13,7 +13,7 @@ LL | #![deny(illegal_floating_point_literal_pattern)] = note: for more information, see issue #41620 error: floating-point types cannot be used in patterns - --> $DIR/issue-6804.rs:27:10 + --> $DIR/issue-6804.rs:17:10 | LL | [NAN, _] => {}, //~ ERROR floating-point types cannot be used | ^^^ diff --git a/src/test/ui/issues/issue-6936.rs b/src/test/ui/issues/issue-6936.rs index 8eb16edcbd3d3..26531bba9ece5 100644 --- a/src/test/ui/issues/issue-6936.rs +++ b/src/test/ui/issues/issue-6936.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct T; mod t1 { diff --git a/src/test/ui/issues/issue-6936.stderr b/src/test/ui/issues/issue-6936.stderr index 48fcbf40622a2..b3fe1ddc48348 100644 --- a/src/test/ui/issues/issue-6936.stderr +++ b/src/test/ui/issues/issue-6936.stderr @@ -1,5 +1,5 @@ error[E0428]: the name `Foo` is defined multiple times - --> $DIR/issue-6936.rs:15:5 + --> $DIR/issue-6936.rs:5:5 | LL | type Foo = ::T; | --------------- previous definition of the type `Foo` here @@ -9,7 +9,7 @@ LL | mod Foo {} //~ ERROR the name `Foo` is defined multiple times = note: `Foo` must be defined only once in the type namespace of this module error[E0428]: the name `Foo` is defined multiple times - --> $DIR/issue-6936.rs:20:5 + --> $DIR/issue-6936.rs:10:5 | LL | type Foo = ::T; | --------------- previous definition of the type `Foo` here @@ -19,7 +19,7 @@ LL | struct Foo; //~ ERROR the name `Foo` is defined multiple times = note: `Foo` must be defined only once in the type namespace of this module error[E0428]: the name `Foo` is defined multiple times - --> $DIR/issue-6936.rs:25:5 + --> $DIR/issue-6936.rs:15:5 | LL | type Foo = ::T; | --------------- previous definition of the type `Foo` here @@ -29,7 +29,7 @@ LL | enum Foo {} //~ ERROR the name `Foo` is defined multiple times = note: `Foo` must be defined only once in the type namespace of this module error[E0428]: the name `Bar` is defined multiple times - --> $DIR/issue-6936.rs:35:5 + --> $DIR/issue-6936.rs:25:5 | LL | type Bar = T; | ---------------- previous definition of the type `Bar` here diff --git a/src/test/ui/issues/issue-7013.rs b/src/test/ui/issues/issue-7013.rs index 0c19780bcb4ca..ee68aa8623b37 100644 --- a/src/test/ui/issues/issue-7013.rs +++ b/src/test/ui/issues/issue-7013.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] use std::cell::RefCell; diff --git a/src/test/ui/issues/issue-7013.stderr b/src/test/ui/issues/issue-7013.stderr index fec6e06a699a2..22185c7da344b 100644 --- a/src/test/ui/issues/issue-7013.stderr +++ b/src/test/ui/issues/issue-7013.stderr @@ -1,5 +1,5 @@ error[E0277]: `std::rc::Rc>` cannot be sent between threads safely - --> $DIR/issue-7013.rs:36:19 + --> $DIR/issue-7013.rs:26:19 | LL | let a = A {v: box B{v: None} as Box}; | ^^^^^^^^^^^^^^ `std::rc::Rc>` cannot be sent between threads safely diff --git a/src/test/ui/issues/issue-7044.rs b/src/test/ui/issues/issue-7044.rs index 9b72c24935695..a6e22bc5237ab 100644 --- a/src/test/ui/issues/issue-7044.rs +++ b/src/test/ui/issues/issue-7044.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - static X: isize = 0; struct X; //~ ERROR the name `X` is defined multiple times diff --git a/src/test/ui/issues/issue-7044.stderr b/src/test/ui/issues/issue-7044.stderr index 02707b2d21ebe..46c5d164e42c7 100644 --- a/src/test/ui/issues/issue-7044.stderr +++ b/src/test/ui/issues/issue-7044.stderr @@ -1,5 +1,5 @@ error[E0428]: the name `X` is defined multiple times - --> $DIR/issue-7044.rs:12:1 + --> $DIR/issue-7044.rs:2:1 | LL | static X: isize = 0; | -------------------- previous definition of the value `X` here diff --git a/src/test/ui/issues/issue-7061.rs b/src/test/ui/issues/issue-7061.rs index b99f5b707ee2d..66ae90034e7f5 100644 --- a/src/test/ui/issues/issue-7061.rs +++ b/src/test/ui/issues/issue-7061.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct BarStruct; impl<'a> BarStruct { diff --git a/src/test/ui/issues/issue-7061.stderr b/src/test/ui/issues/issue-7061.stderr index 4f142ba95bc5e..96c539f629ed9 100644 --- a/src/test/ui/issues/issue-7061.stderr +++ b/src/test/ui/issues/issue-7061.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-7061.rs:14:46 + --> $DIR/issue-7061.rs:4:46 | LL | fn foo(&'a mut self) -> Box { self } | -------------- ^^^^ expected struct `std::boxed::Box`, found mutable reference diff --git a/src/test/ui/issues/issue-7092.rs b/src/test/ui/issues/issue-7092.rs index 26e1597b1db4b..b49a262f896c2 100644 --- a/src/test/ui/issues/issue-7092.rs +++ b/src/test/ui/issues/issue-7092.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Whatever { } diff --git a/src/test/ui/issues/issue-7092.stderr b/src/test/ui/issues/issue-7092.stderr index 3c8160982891d..aa24182e3a39d 100644 --- a/src/test/ui/issues/issue-7092.stderr +++ b/src/test/ui/issues/issue-7092.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-7092.rs:16:9 + --> $DIR/issue-7092.rs:6:9 | LL | Some(field) => | ^^^^^^^^^^^ expected enum `Whatever`, found enum `std::option::Option` diff --git a/src/test/ui/issues/issue-7246.rs b/src/test/ui/issues/issue-7246.rs index 7e8d431bf1920..bf2794eb632b6 100644 --- a/src/test/ui/issues/issue-7246.rs +++ b/src/test/ui/issues/issue-7246.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(unreachable_code)] #![allow(dead_code)] diff --git a/src/test/ui/issues/issue-7246.stderr b/src/test/ui/issues/issue-7246.stderr index 75c716e5a04fd..5b8652597d3f7 100644 --- a/src/test/ui/issues/issue-7246.stderr +++ b/src/test/ui/issues/issue-7246.stderr @@ -1,11 +1,11 @@ error: unreachable statement - --> $DIR/issue-7246.rs:17:5 + --> $DIR/issue-7246.rs:7:5 | LL | if *ptr::null() {}; //~ ERROR unreachable | ^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/issue-7246.rs:11:9 + --> $DIR/issue-7246.rs:1:9 | LL | #![deny(unreachable_code)] | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-7364.rs b/src/test/ui/issues/issue-7364.rs index 801a1301ad774..3f9c2ef48a7af 100644 --- a/src/test/ui/issues/issue-7364.rs +++ b/src/test/ui/issues/issue-7364.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] use std::cell::RefCell; diff --git a/src/test/ui/issues/issue-7364.stderr b/src/test/ui/issues/issue-7364.stderr index b0d732bdb6fa6..0e4d6ff1d71fa 100644 --- a/src/test/ui/issues/issue-7364.stderr +++ b/src/test/ui/issues/issue-7364.stderr @@ -1,11 +1,11 @@ error[E0010]: allocations are not allowed in statics - --> $DIR/issue-7364.rs:16:37 + --> $DIR/issue-7364.rs:6:37 | LL | static boxed: Box> = box RefCell::new(0); | ^^^^^^^^^^^^^^^^^^^ allocation not allowed in statics error[E0277]: `std::cell::RefCell` cannot be shared between threads safely - --> $DIR/issue-7364.rs:16:1 + --> $DIR/issue-7364.rs:6:1 | LL | static boxed: Box> = box RefCell::new(0); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `std::cell::RefCell` cannot be shared between threads safely diff --git a/src/test/ui/issues/issue-7607-1.rs b/src/test/ui/issues/issue-7607-1.rs index 9bcdd690187e8..5221f2c529bc6 100644 --- a/src/test/ui/issues/issue-7607-1.rs +++ b/src/test/ui/issues/issue-7607-1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { x: isize } diff --git a/src/test/ui/issues/issue-7607-1.stderr b/src/test/ui/issues/issue-7607-1.stderr index bebf1c1ae98cf..ffe03f521e005 100644 --- a/src/test/ui/issues/issue-7607-1.stderr +++ b/src/test/ui/issues/issue-7607-1.stderr @@ -1,5 +1,5 @@ error[E0412]: cannot find type `Fo` in this scope - --> $DIR/issue-7607-1.rs:15:6 + --> $DIR/issue-7607-1.rs:5:6 | LL | impl Fo { //~ ERROR cannot find type `Fo` in this scope | ^^ did you mean `Fn`? diff --git a/src/test/ui/issues/issue-7813.rs b/src/test/ui/issues/issue-7813.rs index 39a87bfaf7440..ce549bde60117 100644 --- a/src/test/ui/issues/issue-7813.rs +++ b/src/test/ui/issues/issue-7813.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let v = &[]; //~ ERROR type annotations needed let it = v.iter(); diff --git a/src/test/ui/issues/issue-7813.stderr b/src/test/ui/issues/issue-7813.stderr index 3ab01982057b4..da5fc6357a66a 100644 --- a/src/test/ui/issues/issue-7813.stderr +++ b/src/test/ui/issues/issue-7813.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/issue-7813.rs:12:13 + --> $DIR/issue-7813.rs:2:13 | LL | let v = &[]; //~ ERROR type annotations needed | - ^^^ cannot infer type diff --git a/src/test/ui/issues/issue-7867.rs b/src/test/ui/issues/issue-7867.rs index 016df6cb6ef81..a1997fbf19aae 100644 --- a/src/test/ui/issues/issue-7867.rs +++ b/src/test/ui/issues/issue-7867.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum A { B, C } mod foo { pub fn bar() {} } diff --git a/src/test/ui/issues/issue-7867.stderr b/src/test/ui/issues/issue-7867.stderr index 03ab54d112f2c..1d3a0ff065913 100644 --- a/src/test/ui/issues/issue-7867.stderr +++ b/src/test/ui/issues/issue-7867.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-7867.rs:17:9 + --> $DIR/issue-7867.rs:7:9 | LL | A::B => (), | ^^^^ expected tuple, found enum `A` diff --git a/src/test/ui/issues/issue-7950.rs b/src/test/ui/issues/issue-7950.rs index dd3a48cb15559..7add8afee437f 100644 --- a/src/test/ui/issues/issue-7950.rs +++ b/src/test/ui/issues/issue-7950.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // tests the good error message, not "missing module Foo" or something else unexpected struct Foo; diff --git a/src/test/ui/issues/issue-7950.stderr b/src/test/ui/issues/issue-7950.stderr index 750127981b1cc..169ce5429f5af 100644 --- a/src/test/ui/issues/issue-7950.stderr +++ b/src/test/ui/issues/issue-7950.stderr @@ -1,5 +1,5 @@ error[E0599]: no function or associated item named `bar` found for type `Foo` in the current scope - --> $DIR/issue-7950.rs:16:5 + --> $DIR/issue-7950.rs:6:5 | LL | struct Foo; | ----------- function or associated item `bar` not found for this diff --git a/src/test/ui/issues/issue-7970a.rs b/src/test/ui/issues/issue-7970a.rs index b97c3037770a6..dae906410ed61 100644 --- a/src/test/ui/issues/issue-7970a.rs +++ b/src/test/ui/issues/issue-7970a.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! one_arg_macro { ($fmt:expr) => (print!(concat!($fmt, "\n"))); } diff --git a/src/test/ui/issues/issue-7970a.stderr b/src/test/ui/issues/issue-7970a.stderr index 7ad95717185b8..697b029e4d099 100644 --- a/src/test/ui/issues/issue-7970a.stderr +++ b/src/test/ui/issues/issue-7970a.stderr @@ -1,5 +1,5 @@ error: unexpected end of macro invocation - --> $DIR/issue-7970a.rs:16:5 + --> $DIR/issue-7970a.rs:6:5 | LL | one_arg_macro!(); | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-7970b.rs b/src/test/ui/issues/issue-7970b.rs index 0cff90f281b90..1c4abce39598c 100644 --- a/src/test/ui/issues/issue-7970b.rs +++ b/src/test/ui/issues/issue-7970b.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() {} macro_rules! test {} diff --git a/src/test/ui/issues/issue-7970b.stderr b/src/test/ui/issues/issue-7970b.stderr index b2feb677863d9..333b4d9802e93 100644 --- a/src/test/ui/issues/issue-7970b.stderr +++ b/src/test/ui/issues/issue-7970b.stderr @@ -1,5 +1,5 @@ error: unexpected end of macro invocation - --> $DIR/issue-7970b.rs:13:1 + --> $DIR/issue-7970b.rs:3:1 | LL | macro_rules! test {} | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-8153.rs b/src/test/ui/issues/issue-8153.rs index 457918b54d4ae..81a8f5338ebd5 100644 --- a/src/test/ui/issues/issue-8153.rs +++ b/src/test/ui/issues/issue-8153.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that duplicate methods in impls are not allowed struct Foo; diff --git a/src/test/ui/issues/issue-8153.stderr b/src/test/ui/issues/issue-8153.stderr index 03fb89f8ccc97..800b0277c9ac8 100644 --- a/src/test/ui/issues/issue-8153.stderr +++ b/src/test/ui/issues/issue-8153.stderr @@ -1,5 +1,5 @@ error[E0201]: duplicate definitions with name `bar`: - --> $DIR/issue-8153.rs:21:5 + --> $DIR/issue-8153.rs:11:5 | LL | fn bar(&self) -> isize {1} | -------------------------- previous definition of `bar` here diff --git a/src/test/ui/issues/issue-8208.rs b/src/test/ui/issues/issue-8208.rs index 670b6bd46e7d8..ad94f99098db8 100644 --- a/src/test/ui/issues/issue-8208.rs +++ b/src/test/ui/issues/issue-8208.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use self::*; //~ ERROR: unresolved import `self::*` [E0432] //~^ Cannot glob-import a module into itself. diff --git a/src/test/ui/issues/issue-8208.stderr b/src/test/ui/issues/issue-8208.stderr index 73a9a6a51becd..6de95fb953a9f 100644 --- a/src/test/ui/issues/issue-8208.stderr +++ b/src/test/ui/issues/issue-8208.stderr @@ -1,17 +1,17 @@ error[E0432]: unresolved import `self::*` - --> $DIR/issue-8208.rs:11:5 + --> $DIR/issue-8208.rs:1:5 | LL | use self::*; //~ ERROR: unresolved import `self::*` [E0432] | ^^^^^^^ Cannot glob-import a module into itself. error[E0432]: unresolved import `foo::*` - --> $DIR/issue-8208.rs:15:9 + --> $DIR/issue-8208.rs:5:9 | LL | use foo::*; //~ ERROR: unresolved import `foo::*` [E0432] | ^^^^^^ Cannot glob-import a module into itself. error[E0432]: unresolved import `super::bar::*` - --> $DIR/issue-8208.rs:19:13 + --> $DIR/issue-8208.rs:9:13 | LL | use super::bar::*; | ^^^^^^^^^^^^^ Cannot glob-import a module into itself. diff --git a/src/test/ui/issues/issue-8460-const.rs b/src/test/ui/issues/issue-8460-const.rs index b0d6cb5df875a..611d280f774c0 100644 --- a/src/test/ui/issues/issue-8460-const.rs +++ b/src/test/ui/issues/issue-8460-const.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(const_err)] use std::{isize, i8, i16, i32, i64}; diff --git a/src/test/ui/issues/issue-8460-const.stderr b/src/test/ui/issues/issue-8460-const.stderr index db35cde756923..31b1da4f804ab 100644 --- a/src/test/ui/issues/issue-8460-const.stderr +++ b/src/test/ui/issues/issue-8460-const.stderr @@ -1,245 +1,245 @@ error: attempt to divide with overflow - --> $DIR/issue-8460-const.rs:17:36 + --> $DIR/issue-8460-const.rs:7:36 | LL | assert!(thread::spawn(move|| { isize::MIN / -1; }).join().is_err()); | ^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/issue-8460-const.rs:11:9 + --> $DIR/issue-8460-const.rs:1:9 | LL | #![deny(const_err)] | ^^^^^^^^^ error: this expression will panic at runtime - --> $DIR/issue-8460-const.rs:17:36 + --> $DIR/issue-8460-const.rs:7:36 | LL | assert!(thread::spawn(move|| { isize::MIN / -1; }).join().is_err()); | ^^^^^^^^^^^^^^^ attempt to divide with overflow error: attempt to divide with overflow - --> $DIR/issue-8460-const.rs:20:36 + --> $DIR/issue-8460-const.rs:10:36 | LL | assert!(thread::spawn(move|| { i8::MIN / -1; }).join().is_err()); | ^^^^^^^^^^^^ error: this expression will panic at runtime - --> $DIR/issue-8460-const.rs:20:36 + --> $DIR/issue-8460-const.rs:10:36 | LL | assert!(thread::spawn(move|| { i8::MIN / -1; }).join().is_err()); | ^^^^^^^^^^^^ attempt to divide with overflow error: attempt to divide with overflow - --> $DIR/issue-8460-const.rs:23:36 + --> $DIR/issue-8460-const.rs:13:36 | LL | assert!(thread::spawn(move|| { i16::MIN / -1; }).join().is_err()); | ^^^^^^^^^^^^^ error: this expression will panic at runtime - --> $DIR/issue-8460-const.rs:23:36 + --> $DIR/issue-8460-const.rs:13:36 | LL | assert!(thread::spawn(move|| { i16::MIN / -1; }).join().is_err()); | ^^^^^^^^^^^^^ attempt to divide with overflow error: attempt to divide with overflow - --> $DIR/issue-8460-const.rs:26:36 + --> $DIR/issue-8460-const.rs:16:36 | LL | assert!(thread::spawn(move|| { i32::MIN / -1; }).join().is_err()); | ^^^^^^^^^^^^^ error: this expression will panic at runtime - --> $DIR/issue-8460-const.rs:26:36 + --> $DIR/issue-8460-const.rs:16:36 | LL | assert!(thread::spawn(move|| { i32::MIN / -1; }).join().is_err()); | ^^^^^^^^^^^^^ attempt to divide with overflow error: attempt to divide with overflow - --> $DIR/issue-8460-const.rs:29:36 + --> $DIR/issue-8460-const.rs:19:36 | LL | assert!(thread::spawn(move|| { i64::MIN / -1; }).join().is_err()); | ^^^^^^^^^^^^^ error: this expression will panic at runtime - --> $DIR/issue-8460-const.rs:29:36 + --> $DIR/issue-8460-const.rs:19:36 | LL | assert!(thread::spawn(move|| { i64::MIN / -1; }).join().is_err()); | ^^^^^^^^^^^^^ attempt to divide with overflow error: attempt to divide by zero - --> $DIR/issue-8460-const.rs:32:36 + --> $DIR/issue-8460-const.rs:22:36 | LL | assert!(thread::spawn(move|| { 1isize / 0; }).join().is_err()); | ^^^^^^^^^^ error: this expression will panic at runtime - --> $DIR/issue-8460-const.rs:32:36 + --> $DIR/issue-8460-const.rs:22:36 | LL | assert!(thread::spawn(move|| { 1isize / 0; }).join().is_err()); | ^^^^^^^^^^ attempt to divide by zero error: attempt to divide by zero - --> $DIR/issue-8460-const.rs:35:36 + --> $DIR/issue-8460-const.rs:25:36 | LL | assert!(thread::spawn(move|| { 1i8 / 0; }).join().is_err()); | ^^^^^^^ error: this expression will panic at runtime - --> $DIR/issue-8460-const.rs:35:36 + --> $DIR/issue-8460-const.rs:25:36 | LL | assert!(thread::spawn(move|| { 1i8 / 0; }).join().is_err()); | ^^^^^^^ attempt to divide by zero error: attempt to divide by zero - --> $DIR/issue-8460-const.rs:38:36 + --> $DIR/issue-8460-const.rs:28:36 | LL | assert!(thread::spawn(move|| { 1i16 / 0; }).join().is_err()); | ^^^^^^^^ error: this expression will panic at runtime - --> $DIR/issue-8460-const.rs:38:36 + --> $DIR/issue-8460-const.rs:28:36 | LL | assert!(thread::spawn(move|| { 1i16 / 0; }).join().is_err()); | ^^^^^^^^ attempt to divide by zero error: attempt to divide by zero - --> $DIR/issue-8460-const.rs:41:36 + --> $DIR/issue-8460-const.rs:31:36 | LL | assert!(thread::spawn(move|| { 1i32 / 0; }).join().is_err()); | ^^^^^^^^ error: this expression will panic at runtime - --> $DIR/issue-8460-const.rs:41:36 + --> $DIR/issue-8460-const.rs:31:36 | LL | assert!(thread::spawn(move|| { 1i32 / 0; }).join().is_err()); | ^^^^^^^^ attempt to divide by zero error: attempt to divide by zero - --> $DIR/issue-8460-const.rs:44:36 + --> $DIR/issue-8460-const.rs:34:36 | LL | assert!(thread::spawn(move|| { 1i64 / 0; }).join().is_err()); | ^^^^^^^^ error: this expression will panic at runtime - --> $DIR/issue-8460-const.rs:44:36 + --> $DIR/issue-8460-const.rs:34:36 | LL | assert!(thread::spawn(move|| { 1i64 / 0; }).join().is_err()); | ^^^^^^^^ attempt to divide by zero error: attempt to calculate the remainder with overflow - --> $DIR/issue-8460-const.rs:47:36 + --> $DIR/issue-8460-const.rs:37:36 | LL | assert!(thread::spawn(move|| { isize::MIN % -1; }).join().is_err()); | ^^^^^^^^^^^^^^^ error: this expression will panic at runtime - --> $DIR/issue-8460-const.rs:47:36 + --> $DIR/issue-8460-const.rs:37:36 | LL | assert!(thread::spawn(move|| { isize::MIN % -1; }).join().is_err()); | ^^^^^^^^^^^^^^^ attempt to calculate the remainder with overflow error: attempt to calculate the remainder with overflow - --> $DIR/issue-8460-const.rs:50:36 + --> $DIR/issue-8460-const.rs:40:36 | LL | assert!(thread::spawn(move|| { i8::MIN % -1; }).join().is_err()); | ^^^^^^^^^^^^ error: this expression will panic at runtime - --> $DIR/issue-8460-const.rs:50:36 + --> $DIR/issue-8460-const.rs:40:36 | LL | assert!(thread::spawn(move|| { i8::MIN % -1; }).join().is_err()); | ^^^^^^^^^^^^ attempt to calculate the remainder with overflow error: attempt to calculate the remainder with overflow - --> $DIR/issue-8460-const.rs:53:36 + --> $DIR/issue-8460-const.rs:43:36 | LL | assert!(thread::spawn(move|| { i16::MIN % -1; }).join().is_err()); | ^^^^^^^^^^^^^ error: this expression will panic at runtime - --> $DIR/issue-8460-const.rs:53:36 + --> $DIR/issue-8460-const.rs:43:36 | LL | assert!(thread::spawn(move|| { i16::MIN % -1; }).join().is_err()); | ^^^^^^^^^^^^^ attempt to calculate the remainder with overflow error: attempt to calculate the remainder with overflow - --> $DIR/issue-8460-const.rs:56:36 + --> $DIR/issue-8460-const.rs:46:36 | LL | assert!(thread::spawn(move|| { i32::MIN % -1; }).join().is_err()); | ^^^^^^^^^^^^^ error: this expression will panic at runtime - --> $DIR/issue-8460-const.rs:56:36 + --> $DIR/issue-8460-const.rs:46:36 | LL | assert!(thread::spawn(move|| { i32::MIN % -1; }).join().is_err()); | ^^^^^^^^^^^^^ attempt to calculate the remainder with overflow error: attempt to calculate the remainder with overflow - --> $DIR/issue-8460-const.rs:59:36 + --> $DIR/issue-8460-const.rs:49:36 | LL | assert!(thread::spawn(move|| { i64::MIN % -1; }).join().is_err()); | ^^^^^^^^^^^^^ error: this expression will panic at runtime - --> $DIR/issue-8460-const.rs:59:36 + --> $DIR/issue-8460-const.rs:49:36 | LL | assert!(thread::spawn(move|| { i64::MIN % -1; }).join().is_err()); | ^^^^^^^^^^^^^ attempt to calculate the remainder with overflow error: attempt to calculate the remainder with a divisor of zero - --> $DIR/issue-8460-const.rs:62:36 + --> $DIR/issue-8460-const.rs:52:36 | LL | assert!(thread::spawn(move|| { 1isize % 0; }).join().is_err()); | ^^^^^^^^^^ error: this expression will panic at runtime - --> $DIR/issue-8460-const.rs:62:36 + --> $DIR/issue-8460-const.rs:52:36 | LL | assert!(thread::spawn(move|| { 1isize % 0; }).join().is_err()); | ^^^^^^^^^^ attempt to calculate the remainder with a divisor of zero error: attempt to calculate the remainder with a divisor of zero - --> $DIR/issue-8460-const.rs:65:36 + --> $DIR/issue-8460-const.rs:55:36 | LL | assert!(thread::spawn(move|| { 1i8 % 0; }).join().is_err()); | ^^^^^^^ error: this expression will panic at runtime - --> $DIR/issue-8460-const.rs:65:36 + --> $DIR/issue-8460-const.rs:55:36 | LL | assert!(thread::spawn(move|| { 1i8 % 0; }).join().is_err()); | ^^^^^^^ attempt to calculate the remainder with a divisor of zero error: attempt to calculate the remainder with a divisor of zero - --> $DIR/issue-8460-const.rs:68:36 + --> $DIR/issue-8460-const.rs:58:36 | LL | assert!(thread::spawn(move|| { 1i16 % 0; }).join().is_err()); | ^^^^^^^^ error: this expression will panic at runtime - --> $DIR/issue-8460-const.rs:68:36 + --> $DIR/issue-8460-const.rs:58:36 | LL | assert!(thread::spawn(move|| { 1i16 % 0; }).join().is_err()); | ^^^^^^^^ attempt to calculate the remainder with a divisor of zero error: attempt to calculate the remainder with a divisor of zero - --> $DIR/issue-8460-const.rs:71:36 + --> $DIR/issue-8460-const.rs:61:36 | LL | assert!(thread::spawn(move|| { 1i32 % 0; }).join().is_err()); | ^^^^^^^^ error: this expression will panic at runtime - --> $DIR/issue-8460-const.rs:71:36 + --> $DIR/issue-8460-const.rs:61:36 | LL | assert!(thread::spawn(move|| { 1i32 % 0; }).join().is_err()); | ^^^^^^^^ attempt to calculate the remainder with a divisor of zero error: attempt to calculate the remainder with a divisor of zero - --> $DIR/issue-8460-const.rs:74:36 + --> $DIR/issue-8460-const.rs:64:36 | LL | assert!(thread::spawn(move|| { 1i64 % 0; }).join().is_err()); | ^^^^^^^^ error: this expression will panic at runtime - --> $DIR/issue-8460-const.rs:74:36 + --> $DIR/issue-8460-const.rs:64:36 | LL | assert!(thread::spawn(move|| { 1i64 % 0; }).join().is_err()); | ^^^^^^^^ attempt to calculate the remainder with a divisor of zero diff --git a/src/test/ui/issues/issue-8640.rs b/src/test/ui/issues/issue-8640.rs index c4ca3acf08061..51a02a32ec8e5 100644 --- a/src/test/ui/issues/issue-8640.rs +++ b/src/test/ui/issues/issue-8640.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[allow(unused_imports)] mod foo { diff --git a/src/test/ui/issues/issue-8640.stderr b/src/test/ui/issues/issue-8640.stderr index 68fdea6e22805..95a53a11c4b04 100644 --- a/src/test/ui/issues/issue-8640.stderr +++ b/src/test/ui/issues/issue-8640.stderr @@ -1,5 +1,5 @@ error[E0255]: the name `bar` is defined multiple times - --> $DIR/issue-8640.rs:15:5 + --> $DIR/issue-8640.rs:5:5 | LL | use baz::bar; | -------- previous import of the module `bar` here diff --git a/src/test/ui/issues/issue-8727.rs b/src/test/ui/issues/issue-8727.rs index fc88a2c81b4e8..aaf9442bb3f33 100644 --- a/src/test/ui/issues/issue-8727.rs +++ b/src/test/ui/issues/issue-8727.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Verify the compiler fails with an error on infinite function // recursions. diff --git a/src/test/ui/issues/issue-8727.stderr b/src/test/ui/issues/issue-8727.stderr index 28fb71bcc17c1..b52d26307d063 100644 --- a/src/test/ui/issues/issue-8727.stderr +++ b/src/test/ui/issues/issue-8727.stderr @@ -1,5 +1,5 @@ warning: function cannot return without recurring - --> $DIR/issue-8727.rs:14:1 + --> $DIR/issue-8727.rs:4:1 | LL | fn generic() { | ^^^^^^^^^^^^^^^ cannot return without recurring @@ -10,7 +10,7 @@ LL | generic::>(); = help: a `loop` may express intention better if this is on purpose error: reached the recursion limit while instantiating `generic::>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>` - --> $DIR/issue-8727.rs:14:1 + --> $DIR/issue-8727.rs:4:1 | LL | / fn generic() { LL | | generic::>(); diff --git a/src/test/ui/issues/issue-8761.rs b/src/test/ui/issues/issue-8761.rs index f8424ea64ef9e..e69927c8457cf 100644 --- a/src/test/ui/issues/issue-8761.rs +++ b/src/test/ui/issues/issue-8761.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Foo { A = 1i64, //~^ ERROR mismatched types diff --git a/src/test/ui/issues/issue-8761.stderr b/src/test/ui/issues/issue-8761.stderr index b8144df383576..fc0c14076019f 100644 --- a/src/test/ui/issues/issue-8761.stderr +++ b/src/test/ui/issues/issue-8761.stderr @@ -1,11 +1,11 @@ error[E0308]: mismatched types - --> $DIR/issue-8761.rs:12:9 + --> $DIR/issue-8761.rs:2:9 | LL | A = 1i64, | ^^^^ expected isize, found i64 error[E0308]: mismatched types - --> $DIR/issue-8761.rs:15:9 + --> $DIR/issue-8761.rs:5:9 | LL | B = 2u8 | ^^^ expected isize, found u8 diff --git a/src/test/ui/issues/issue-8767.rs b/src/test/ui/issues/issue-8767.rs index 926cae788aa52..972101a0bc3ee 100644 --- a/src/test/ui/issues/issue-8767.rs +++ b/src/test/ui/issues/issue-8767.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - impl B { //~ ERROR cannot find type `B` in this scope } diff --git a/src/test/ui/issues/issue-8767.stderr b/src/test/ui/issues/issue-8767.stderr index d03e20ba270f0..80280f8c53589 100644 --- a/src/test/ui/issues/issue-8767.stderr +++ b/src/test/ui/issues/issue-8767.stderr @@ -1,5 +1,5 @@ error[E0412]: cannot find type `B` in this scope - --> $DIR/issue-8767.rs:11:6 + --> $DIR/issue-8767.rs:1:6 | LL | impl B { //~ ERROR cannot find type `B` in this scope | ^ not found in this scope diff --git a/src/test/ui/issues/issue-9575.rs b/src/test/ui/issues/issue-9575.rs index 9295eeb1779b0..bac4ac1d208d2 100644 --- a/src/test/ui/issues/issue-9575.rs +++ b/src/test/ui/issues/issue-9575.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(start)] #[start] diff --git a/src/test/ui/issues/issue-9575.stderr b/src/test/ui/issues/issue-9575.stderr index d52669777bdd7..1483e427a6a3c 100644 --- a/src/test/ui/issues/issue-9575.stderr +++ b/src/test/ui/issues/issue-9575.stderr @@ -1,5 +1,5 @@ error[E0308]: start function has wrong type - --> $DIR/issue-9575.rs:14:1 + --> $DIR/issue-9575.rs:4:1 | LL | fn start(argc: isize, argv: *const *const u8, crate_map: *const u8) -> isize { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ incorrect number of function parameters diff --git a/src/test/ui/issues/issue-9725.rs b/src/test/ui/issues/issue-9725.rs index f53122d19c1bd..360effbd11947 100644 --- a/src/test/ui/issues/issue-9725.rs +++ b/src/test/ui/issues/issue-9725.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct A { foo: isize } fn main() { diff --git a/src/test/ui/issues/issue-9725.stderr b/src/test/ui/issues/issue-9725.stderr index 1d7fdad82a024..eafe92e4688a8 100644 --- a/src/test/ui/issues/issue-9725.stderr +++ b/src/test/ui/issues/issue-9725.stderr @@ -1,11 +1,11 @@ error[E0416]: identifier `foo` is bound more than once in the same pattern - --> $DIR/issue-9725.rs:14:18 + --> $DIR/issue-9725.rs:4:18 | LL | let A { foo, foo } = A { foo: 3 }; | ^^^ used in a pattern more than once error[E0025]: field `foo` bound multiple times in the pattern - --> $DIR/issue-9725.rs:14:18 + --> $DIR/issue-9725.rs:4:18 | LL | let A { foo, foo } = A { foo: 3 }; | --- ^^^ multiple uses of `foo` in pattern diff --git a/src/test/ui/issues/issue-9814.rs b/src/test/ui/issues/issue-9814.rs index 226734b84d638..a87478e221b08 100644 --- a/src/test/ui/issues/issue-9814.rs +++ b/src/test/ui/issues/issue-9814.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Verify that single-variant enums can't be de-referenced // Regression test for issue #9814 diff --git a/src/test/ui/issues/issue-9814.stderr b/src/test/ui/issues/issue-9814.stderr index 2e85bd46fe610..fe105a9c3cef3 100644 --- a/src/test/ui/issues/issue-9814.stderr +++ b/src/test/ui/issues/issue-9814.stderr @@ -1,5 +1,5 @@ error[E0614]: type `Foo` cannot be dereferenced - --> $DIR/issue-9814.rs:17:13 + --> $DIR/issue-9814.rs:7:13 | LL | let _ = *Foo::Bar(2); //~ ERROR type `Foo` cannot be dereferenced | ^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-pr29383.rs b/src/test/ui/issues/issue-pr29383.rs index b60c537e1e6f7..334fdacb81ec4 100644 --- a/src/test/ui/issues/issue-pr29383.rs +++ b/src/test/ui/issues/issue-pr29383.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum E { A, B, diff --git a/src/test/ui/issues/issue-pr29383.stderr b/src/test/ui/issues/issue-pr29383.stderr index 9b8956da7a2d1..1fe49f8fb14a6 100644 --- a/src/test/ui/issues/issue-pr29383.stderr +++ b/src/test/ui/issues/issue-pr29383.stderr @@ -1,11 +1,11 @@ error[E0532]: expected tuple struct/variant, found unit variant `E::A` - --> $DIR/issue-pr29383.rs:19:14 + --> $DIR/issue-pr29383.rs:9:14 | LL | Some(E::A(..)) => {} //~ ERROR expected tuple struct/variant, found unit variant `E::A` | ^^^^ not a tuple struct/variant error[E0532]: expected tuple struct/variant, found unit variant `E::B` - --> $DIR/issue-pr29383.rs:20:14 + --> $DIR/issue-pr29383.rs:10:14 | LL | Some(E::B(..)) => {} //~ ERROR expected tuple struct/variant, found unit variant `E::B` | ^^^^ not a tuple struct/variant diff --git a/src/test/ui/issues/issue32829.rs b/src/test/ui/issues/issue32829.rs index 2b223bac8e67b..9db9d30411d6f 100644 --- a/src/test/ui/issues/issue32829.rs +++ b/src/test/ui/issues/issue32829.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength #![feature(const_fn)] diff --git a/src/test/ui/issues/issue32829.stderr b/src/test/ui/issues/issue32829.stderr index dad0880dbdfd7..c2a665e56d482 100644 --- a/src/test/ui/issues/issue32829.stderr +++ b/src/test/ui/issues/issue32829.stderr @@ -1,5 +1,5 @@ error[E0658]: statements in constants are unstable (see issue #48821) - --> $DIR/issue32829.rs:17:9 + --> $DIR/issue32829.rs:7:9 | LL | 5; | ^ @@ -7,13 +7,13 @@ LL | 5; = help: add #![feature(const_let)] to the crate attributes to enable error[E0015]: calls in constants are limited to constant functions, tuple structs and tuple variants - --> $DIR/issue32829.rs:25:9 + --> $DIR/issue32829.rs:15:9 | LL | invalid(); | ^^^^^^^^^ error[E0658]: statements in constants are unstable (see issue #48821) - --> $DIR/issue32829.rs:25:9 + --> $DIR/issue32829.rs:15:9 | LL | invalid(); | ^^^^^^^^^ @@ -21,7 +21,7 @@ LL | invalid(); = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: statements in constants are unstable (see issue #48821) - --> $DIR/issue32829.rs:34:9 + --> $DIR/issue32829.rs:24:9 | LL | valid(); | ^^^^^^^ @@ -29,7 +29,7 @@ LL | valid(); = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: statements in statics are unstable (see issue #48821) - --> $DIR/issue32829.rs:42:9 + --> $DIR/issue32829.rs:32:9 | LL | 5; | ^ @@ -37,13 +37,13 @@ LL | 5; = help: add #![feature(const_let)] to the crate attributes to enable error[E0015]: calls in statics are limited to constant functions, tuple structs and tuple variants - --> $DIR/issue32829.rs:50:9 + --> $DIR/issue32829.rs:40:9 | LL | invalid(); | ^^^^^^^^^ error[E0658]: statements in statics are unstable (see issue #48821) - --> $DIR/issue32829.rs:50:9 + --> $DIR/issue32829.rs:40:9 | LL | invalid(); | ^^^^^^^^^ @@ -51,7 +51,7 @@ LL | invalid(); = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: statements in statics are unstable (see issue #48821) - --> $DIR/issue32829.rs:59:9 + --> $DIR/issue32829.rs:49:9 | LL | valid(); | ^^^^^^^ @@ -59,7 +59,7 @@ LL | valid(); = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: statements in statics are unstable (see issue #48821) - --> $DIR/issue32829.rs:67:9 + --> $DIR/issue32829.rs:57:9 | LL | 5; | ^ @@ -67,13 +67,13 @@ LL | 5; = help: add #![feature(const_let)] to the crate attributes to enable error[E0015]: calls in statics are limited to constant functions, tuple structs and tuple variants - --> $DIR/issue32829.rs:75:9 + --> $DIR/issue32829.rs:65:9 | LL | invalid(); | ^^^^^^^^^ error[E0658]: statements in statics are unstable (see issue #48821) - --> $DIR/issue32829.rs:75:9 + --> $DIR/issue32829.rs:65:9 | LL | invalid(); | ^^^^^^^^^ @@ -81,7 +81,7 @@ LL | invalid(); = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: statements in statics are unstable (see issue #48821) - --> $DIR/issue32829.rs:84:9 + --> $DIR/issue32829.rs:74:9 | LL | valid(); | ^^^^^^^ diff --git a/src/test/ui/keyword/keyword-extern-as-identifier.rs b/src/test/ui/keyword/keyword-extern-as-identifier.rs index 3e44585395788..6775290a26bd5 100644 --- a/src/test/ui/keyword/keyword-extern-as-identifier.rs +++ b/src/test/ui/keyword/keyword-extern-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(extern_in_paths)] fn main() { diff --git a/src/test/ui/keyword/keyword-extern-as-identifier.stderr b/src/test/ui/keyword/keyword-extern-as-identifier.stderr index 523da8d32c403..ef2a4b3ff3c30 100644 --- a/src/test/ui/keyword/keyword-extern-as-identifier.stderr +++ b/src/test/ui/keyword/keyword-extern-as-identifier.stderr @@ -1,5 +1,5 @@ error[E0531]: cannot find unit struct/variant or constant `extern` in this scope - --> $DIR/keyword-extern-as-identifier.rs:14:9 + --> $DIR/keyword-extern-as-identifier.rs:4:9 | LL | let extern = 0; //~ ERROR cannot find unit struct/variant or constant `extern` in this scope | ^^^^^^ not found in this scope diff --git a/src/test/ui/keyword/keyword-false-as-identifier.rs b/src/test/ui/keyword/keyword-false-as-identifier.rs index f246d6e75df8d..6382f841b04ff 100644 --- a/src/test/ui/keyword/keyword-false-as-identifier.rs +++ b/src/test/ui/keyword/keyword-false-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let false = 22; //~ error: mismatched types } diff --git a/src/test/ui/keyword/keyword-false-as-identifier.stderr b/src/test/ui/keyword/keyword-false-as-identifier.stderr index 13f675404f6b5..de5dfcfbe4360 100644 --- a/src/test/ui/keyword/keyword-false-as-identifier.stderr +++ b/src/test/ui/keyword/keyword-false-as-identifier.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/keyword-false-as-identifier.rs:12:9 + --> $DIR/keyword-false-as-identifier.rs:2:9 | LL | let false = 22; //~ error: mismatched types | ^^^^^ expected integral variable, found bool diff --git a/src/test/ui/keyword/keyword-self-as-identifier.rs b/src/test/ui/keyword/keyword-self-as-identifier.rs index b50fc68bed6be..b30002cddafea 100644 --- a/src/test/ui/keyword/keyword-self-as-identifier.rs +++ b/src/test/ui/keyword/keyword-self-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let Self = 22; //~ ERROR cannot find unit struct/variant or constant `Self` in this scope } diff --git a/src/test/ui/keyword/keyword-self-as-identifier.stderr b/src/test/ui/keyword/keyword-self-as-identifier.stderr index c47f4aeabefd8..6ea19620a6609 100644 --- a/src/test/ui/keyword/keyword-self-as-identifier.stderr +++ b/src/test/ui/keyword/keyword-self-as-identifier.stderr @@ -1,5 +1,5 @@ error[E0531]: cannot find unit struct/variant or constant `Self` in this scope - --> $DIR/keyword-self-as-identifier.rs:12:9 + --> $DIR/keyword-self-as-identifier.rs:2:9 | LL | let Self = 22; //~ ERROR cannot find unit struct/variant or constant `Self` in this scope | ^^^^ not found in this scope diff --git a/src/test/ui/keyword/keyword-super-as-identifier.rs b/src/test/ui/keyword/keyword-super-as-identifier.rs index 54dac771f01ed..342c2260a548c 100644 --- a/src/test/ui/keyword/keyword-super-as-identifier.rs +++ b/src/test/ui/keyword/keyword-super-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let super = 22; //~ ERROR failed to resolve. There are too many initial `super`s } diff --git a/src/test/ui/keyword/keyword-super-as-identifier.stderr b/src/test/ui/keyword/keyword-super-as-identifier.stderr index 649be45c22459..a0036c6127ebf 100644 --- a/src/test/ui/keyword/keyword-super-as-identifier.stderr +++ b/src/test/ui/keyword/keyword-super-as-identifier.stderr @@ -1,5 +1,5 @@ error[E0433]: failed to resolve. There are too many initial `super`s. - --> $DIR/keyword-super-as-identifier.rs:12:9 + --> $DIR/keyword-super-as-identifier.rs:2:9 | LL | let super = 22; //~ ERROR failed to resolve. There are too many initial `super`s | ^^^^^ There are too many initial `super`s. diff --git a/src/test/ui/keyword/keyword-super.rs b/src/test/ui/keyword/keyword-super.rs index 02047bd639ff9..55d2208c8fe51 100644 --- a/src/test/ui/keyword/keyword-super.rs +++ b/src/test/ui/keyword/keyword-super.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let super: isize; //~ ERROR failed to resolve. There are too many initial `super`s } diff --git a/src/test/ui/keyword/keyword-super.stderr b/src/test/ui/keyword/keyword-super.stderr index ac692ad45d2bd..ac23327143886 100644 --- a/src/test/ui/keyword/keyword-super.stderr +++ b/src/test/ui/keyword/keyword-super.stderr @@ -1,5 +1,5 @@ error[E0433]: failed to resolve. There are too many initial `super`s. - --> $DIR/keyword-super.rs:12:9 + --> $DIR/keyword-super.rs:2:9 | LL | let super: isize; //~ ERROR failed to resolve. There are too many initial `super`s | ^^^^^ There are too many initial `super`s. diff --git a/src/test/ui/keyword/keyword-true-as-identifier.rs b/src/test/ui/keyword/keyword-true-as-identifier.rs index b09d09db560f5..8c4ad7e2a6697 100644 --- a/src/test/ui/keyword/keyword-true-as-identifier.rs +++ b/src/test/ui/keyword/keyword-true-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let true = 22; //~ error: mismatched types } diff --git a/src/test/ui/keyword/keyword-true-as-identifier.stderr b/src/test/ui/keyword/keyword-true-as-identifier.stderr index 776470ba77c9e..cc5c6fe45565f 100644 --- a/src/test/ui/keyword/keyword-true-as-identifier.stderr +++ b/src/test/ui/keyword/keyword-true-as-identifier.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/keyword-true-as-identifier.rs:12:9 + --> $DIR/keyword-true-as-identifier.rs:2:9 | LL | let true = 22; //~ error: mismatched types | ^^^^ expected integral variable, found bool diff --git a/src/test/ui/kindck/kindck-copy.rs b/src/test/ui/kindck/kindck-copy.rs index 747fe2d2046ae..dadeb9569644c 100644 --- a/src/test/ui/kindck/kindck-copy.rs +++ b/src/test/ui/kindck/kindck-copy.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test which of the builtin types are considered POD. use std::rc::Rc; diff --git a/src/test/ui/kindck/kindck-copy.stderr b/src/test/ui/kindck/kindck-copy.stderr index 8d72d91268918..65c06b8308c9b 100644 --- a/src/test/ui/kindck/kindck-copy.stderr +++ b/src/test/ui/kindck/kindck-copy.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `&'static mut isize: std::marker::Copy` is not satisfied - --> $DIR/kindck-copy.rs:37:5 + --> $DIR/kindck-copy.rs:27:5 | LL | assert_copy::<&'static mut isize>(); //~ ERROR : std::marker::Copy` is not satisfied | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `&'static mut isize` @@ -7,13 +7,13 @@ LL | assert_copy::<&'static mut isize>(); //~ ERROR : std::marker::Copy` is = help: the following implementations were found: note: required by `assert_copy` - --> $DIR/kindck-copy.rs:15:1 + --> $DIR/kindck-copy.rs:5:1 | LL | fn assert_copy() { } | ^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `&'a mut isize: std::marker::Copy` is not satisfied - --> $DIR/kindck-copy.rs:38:5 + --> $DIR/kindck-copy.rs:28:5 | LL | assert_copy::<&'a mut isize>(); //~ ERROR : std::marker::Copy` is not satisfied | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `&'a mut isize` @@ -21,115 +21,115 @@ LL | assert_copy::<&'a mut isize>(); //~ ERROR : std::marker::Copy` is not = help: the following implementations were found: note: required by `assert_copy` - --> $DIR/kindck-copy.rs:15:1 + --> $DIR/kindck-copy.rs:5:1 | LL | fn assert_copy() { } | ^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `std::boxed::Box: std::marker::Copy` is not satisfied - --> $DIR/kindck-copy.rs:41:5 + --> $DIR/kindck-copy.rs:31:5 | LL | assert_copy::>(); //~ ERROR : std::marker::Copy` is not satisfied | ^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `std::boxed::Box` | note: required by `assert_copy` - --> $DIR/kindck-copy.rs:15:1 + --> $DIR/kindck-copy.rs:5:1 | LL | fn assert_copy() { } | ^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `std::string::String: std::marker::Copy` is not satisfied - --> $DIR/kindck-copy.rs:42:5 + --> $DIR/kindck-copy.rs:32:5 | LL | assert_copy::(); //~ ERROR : std::marker::Copy` is not satisfied | ^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `std::string::String` | note: required by `assert_copy` - --> $DIR/kindck-copy.rs:15:1 + --> $DIR/kindck-copy.rs:5:1 | LL | fn assert_copy() { } | ^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `std::vec::Vec: std::marker::Copy` is not satisfied - --> $DIR/kindck-copy.rs:43:5 + --> $DIR/kindck-copy.rs:33:5 | LL | assert_copy:: >(); //~ ERROR : std::marker::Copy` is not satisfied | ^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `std::vec::Vec` | note: required by `assert_copy` - --> $DIR/kindck-copy.rs:15:1 + --> $DIR/kindck-copy.rs:5:1 | LL | fn assert_copy() { } | ^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `std::boxed::Box<&'a mut isize>: std::marker::Copy` is not satisfied - --> $DIR/kindck-copy.rs:44:5 + --> $DIR/kindck-copy.rs:34:5 | LL | assert_copy::>(); //~ ERROR : std::marker::Copy` is not satisfied | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `std::boxed::Box<&'a mut isize>` | note: required by `assert_copy` - --> $DIR/kindck-copy.rs:15:1 + --> $DIR/kindck-copy.rs:5:1 | LL | fn assert_copy() { } | ^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `std::boxed::Box: std::marker::Copy` is not satisfied - --> $DIR/kindck-copy.rs:52:5 + --> $DIR/kindck-copy.rs:42:5 | LL | assert_copy::>(); //~ ERROR : std::marker::Copy` is not satisfied | ^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `std::boxed::Box` | note: required by `assert_copy` - --> $DIR/kindck-copy.rs:15:1 + --> $DIR/kindck-copy.rs:5:1 | LL | fn assert_copy() { } | ^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `std::boxed::Box: std::marker::Copy` is not satisfied - --> $DIR/kindck-copy.rs:53:5 + --> $DIR/kindck-copy.rs:43:5 | LL | assert_copy::>(); //~ ERROR : std::marker::Copy` is not satisfied | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `std::boxed::Box` | note: required by `assert_copy` - --> $DIR/kindck-copy.rs:15:1 + --> $DIR/kindck-copy.rs:5:1 | LL | fn assert_copy() { } | ^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `&'a mut (dyn Dummy + std::marker::Send + 'a): std::marker::Copy` is not satisfied - --> $DIR/kindck-copy.rs:56:5 + --> $DIR/kindck-copy.rs:46:5 | LL | assert_copy::<&'a mut (Dummy+Send)>(); //~ ERROR : std::marker::Copy` is not satisfied | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `&'a mut (dyn Dummy + std::marker::Send + 'a)` | note: required by `assert_copy` - --> $DIR/kindck-copy.rs:15:1 + --> $DIR/kindck-copy.rs:5:1 | LL | fn assert_copy() { } | ^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `MyNoncopyStruct: std::marker::Copy` is not satisfied - --> $DIR/kindck-copy.rs:74:5 + --> $DIR/kindck-copy.rs:64:5 | LL | assert_copy::(); //~ ERROR : std::marker::Copy` is not satisfied | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `MyNoncopyStruct` | note: required by `assert_copy` - --> $DIR/kindck-copy.rs:15:1 + --> $DIR/kindck-copy.rs:5:1 | LL | fn assert_copy() { } | ^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `std::rc::Rc: std::marker::Copy` is not satisfied - --> $DIR/kindck-copy.rs:77:5 + --> $DIR/kindck-copy.rs:67:5 | LL | assert_copy::>(); //~ ERROR : std::marker::Copy` is not satisfied | ^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `std::rc::Rc` | note: required by `assert_copy` - --> $DIR/kindck-copy.rs:15:1 + --> $DIR/kindck-copy.rs:5:1 | LL | fn assert_copy() { } | ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/kindck/kindck-impl-type-params-2.rs b/src/test/ui/kindck/kindck-impl-type-params-2.rs index 21aefc4f9c1bc..ac9cc1a08f33d 100644 --- a/src/test/ui/kindck/kindck-impl-type-params-2.rs +++ b/src/test/ui/kindck/kindck-impl-type-params-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] trait Foo { diff --git a/src/test/ui/kindck/kindck-impl-type-params-2.stderr b/src/test/ui/kindck/kindck-impl-type-params-2.stderr index e4c02085ddb79..bd971c903727b 100644 --- a/src/test/ui/kindck/kindck-impl-type-params-2.stderr +++ b/src/test/ui/kindck/kindck-impl-type-params-2.stderr @@ -1,12 +1,12 @@ error[E0277]: the trait bound `std::boxed::Box<{integer}>: std::marker::Copy` is not satisfied - --> $DIR/kindck-impl-type-params-2.rs:23:5 + --> $DIR/kindck-impl-type-params-2.rs:13:5 | LL | take_param(&x); | ^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `std::boxed::Box<{integer}>` | = note: required because of the requirements on the impl of `Foo` for `std::boxed::Box<{integer}>` note: required by `take_param` - --> $DIR/kindck-impl-type-params-2.rs:19:1 + --> $DIR/kindck-impl-type-params-2.rs:9:1 | LL | fn take_param(foo: &T) { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/kindck/kindck-impl-type-params.nll.stderr b/src/test/ui/kindck/kindck-impl-type-params.nll.stderr index 8f24baf7fc46f..749adea22531b 100644 --- a/src/test/ui/kindck/kindck-impl-type-params.nll.stderr +++ b/src/test/ui/kindck/kindck-impl-type-params.nll.stderr @@ -1,5 +1,5 @@ error[E0277]: `T` cannot be sent between threads safely - --> $DIR/kindck-impl-type-params.rs:28:13 + --> $DIR/kindck-impl-type-params.rs:18:13 | LL | let a = &t as &Gettable; | ^^ `T` cannot be sent between threads safely @@ -10,7 +10,7 @@ LL | let a = &t as &Gettable; = note: required for the cast to the object type `dyn Gettable` error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied - --> $DIR/kindck-impl-type-params.rs:28:13 + --> $DIR/kindck-impl-type-params.rs:18:13 | LL | let a = &t as &Gettable; | ^^ the trait `std::marker::Copy` is not implemented for `T` @@ -20,7 +20,7 @@ LL | let a = &t as &Gettable; = note: required for the cast to the object type `dyn Gettable` error[E0277]: `T` cannot be sent between threads safely - --> $DIR/kindck-impl-type-params.rs:35:27 + --> $DIR/kindck-impl-type-params.rs:25:27 | LL | let a: &Gettable = &t; | ^^ `T` cannot be sent between threads safely @@ -31,7 +31,7 @@ LL | let a: &Gettable = &t; = note: required for the cast to the object type `dyn Gettable` error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied - --> $DIR/kindck-impl-type-params.rs:35:27 + --> $DIR/kindck-impl-type-params.rs:25:27 | LL | let a: &Gettable = &t; | ^^ the trait `std::marker::Copy` is not implemented for `T` @@ -41,13 +41,13 @@ LL | let a: &Gettable = &t; = note: required for the cast to the object type `dyn Gettable` warning: not reporting region error due to nll - --> $DIR/kindck-impl-type-params.rs:42:13 + --> $DIR/kindck-impl-type-params.rs:32:13 | LL | let a = &t as &Gettable<&'a isize>; | ^^ error[E0277]: the trait bound `std::string::String: std::marker::Copy` is not satisfied - --> $DIR/kindck-impl-type-params.rs:48:13 + --> $DIR/kindck-impl-type-params.rs:38:13 | LL | let a = t as Box>; | ^ the trait `std::marker::Copy` is not implemented for `std::string::String` @@ -56,7 +56,7 @@ LL | let a = t as Box>; = note: required for the cast to the object type `dyn Gettable` error[E0277]: the trait bound `foo3::Foo: std::marker::Copy` is not satisfied - --> $DIR/kindck-impl-type-params.rs:56:33 + --> $DIR/kindck-impl-type-params.rs:46:33 | LL | let a: Box> = t; | ^ the trait `std::marker::Copy` is not implemented for `foo3::Foo` diff --git a/src/test/ui/kindck/kindck-impl-type-params.rs b/src/test/ui/kindck/kindck-impl-type-params.rs index 3a0e66f58e076..a47e418709dcd 100644 --- a/src/test/ui/kindck/kindck-impl-type-params.rs +++ b/src/test/ui/kindck/kindck-impl-type-params.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #14061: tests the interaction between generic implementation // parameter bounds and trait objects. diff --git a/src/test/ui/kindck/kindck-impl-type-params.stderr b/src/test/ui/kindck/kindck-impl-type-params.stderr index b938d40c76566..03cd480babead 100644 --- a/src/test/ui/kindck/kindck-impl-type-params.stderr +++ b/src/test/ui/kindck/kindck-impl-type-params.stderr @@ -1,5 +1,5 @@ error[E0277]: `T` cannot be sent between threads safely - --> $DIR/kindck-impl-type-params.rs:28:13 + --> $DIR/kindck-impl-type-params.rs:18:13 | LL | let a = &t as &Gettable; | ^^ `T` cannot be sent between threads safely @@ -10,7 +10,7 @@ LL | let a = &t as &Gettable; = note: required for the cast to the object type `dyn Gettable` error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied - --> $DIR/kindck-impl-type-params.rs:28:13 + --> $DIR/kindck-impl-type-params.rs:18:13 | LL | let a = &t as &Gettable; | ^^ the trait `std::marker::Copy` is not implemented for `T` @@ -20,7 +20,7 @@ LL | let a = &t as &Gettable; = note: required for the cast to the object type `dyn Gettable` error[E0277]: `T` cannot be sent between threads safely - --> $DIR/kindck-impl-type-params.rs:35:27 + --> $DIR/kindck-impl-type-params.rs:25:27 | LL | let a: &Gettable = &t; | ^^ `T` cannot be sent between threads safely @@ -31,7 +31,7 @@ LL | let a: &Gettable = &t; = note: required for the cast to the object type `dyn Gettable` error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied - --> $DIR/kindck-impl-type-params.rs:35:27 + --> $DIR/kindck-impl-type-params.rs:25:27 | LL | let a: &Gettable = &t; | ^^ the trait `std::marker::Copy` is not implemented for `T` @@ -41,7 +41,7 @@ LL | let a: &Gettable = &t; = note: required for the cast to the object type `dyn Gettable` error[E0477]: the type `&'a isize` does not fulfill the required lifetime - --> $DIR/kindck-impl-type-params.rs:42:13 + --> $DIR/kindck-impl-type-params.rs:32:13 | LL | let a = &t as &Gettable<&'a isize>; | ^^ @@ -49,7 +49,7 @@ LL | let a = &t as &Gettable<&'a isize>; = note: type must satisfy the static lifetime error[E0277]: the trait bound `std::string::String: std::marker::Copy` is not satisfied - --> $DIR/kindck-impl-type-params.rs:48:13 + --> $DIR/kindck-impl-type-params.rs:38:13 | LL | let a = t as Box>; | ^ the trait `std::marker::Copy` is not implemented for `std::string::String` @@ -58,7 +58,7 @@ LL | let a = t as Box>; = note: required for the cast to the object type `dyn Gettable` error[E0277]: the trait bound `foo3::Foo: std::marker::Copy` is not satisfied - --> $DIR/kindck-impl-type-params.rs:56:33 + --> $DIR/kindck-impl-type-params.rs:46:33 | LL | let a: Box> = t; | ^ the trait `std::marker::Copy` is not implemented for `foo3::Foo` diff --git a/src/test/ui/kindck/kindck-inherited-copy-bound.rs b/src/test/ui/kindck/kindck-inherited-copy-bound.rs index 0731fbaf01c43..0134636fa0d3c 100644 --- a/src/test/ui/kindck/kindck-inherited-copy-bound.rs +++ b/src/test/ui/kindck/kindck-inherited-copy-bound.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that Copy bounds inherited by trait are checked. #![feature(box_syntax)] diff --git a/src/test/ui/kindck/kindck-inherited-copy-bound.stderr b/src/test/ui/kindck/kindck-inherited-copy-bound.stderr index 542ecc0c00482..fe8e02e354776 100644 --- a/src/test/ui/kindck/kindck-inherited-copy-bound.stderr +++ b/src/test/ui/kindck/kindck-inherited-copy-bound.stderr @@ -1,18 +1,18 @@ error[E0277]: the trait bound `std::boxed::Box<{integer}>: std::marker::Copy` is not satisfied - --> $DIR/kindck-inherited-copy-bound.rs:28:5 + --> $DIR/kindck-inherited-copy-bound.rs:18:5 | LL | take_param(&x); //~ ERROR E0277 | ^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `std::boxed::Box<{integer}>` | = note: required because of the requirements on the impl of `Foo` for `std::boxed::Box<{integer}>` note: required by `take_param` - --> $DIR/kindck-inherited-copy-bound.rs:24:1 + --> $DIR/kindck-inherited-copy-bound.rs:14:1 | LL | fn take_param(foo: &T) { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0038]: the trait `Foo` cannot be made into an object - --> $DIR/kindck-inherited-copy-bound.rs:34:19 + --> $DIR/kindck-inherited-copy-bound.rs:24:19 | LL | let z = &x as &Foo; | ^^^^ the trait `Foo` cannot be made into an object @@ -20,7 +20,7 @@ LL | let z = &x as &Foo; = note: the trait cannot require that `Self : Sized` error[E0038]: the trait `Foo` cannot be made into an object - --> $DIR/kindck-inherited-copy-bound.rs:34:13 + --> $DIR/kindck-inherited-copy-bound.rs:24:13 | LL | let z = &x as &Foo; | ^^ the trait `Foo` cannot be made into an object diff --git a/src/test/ui/kindck/kindck-nonsendable-1.rs b/src/test/ui/kindck/kindck-nonsendable-1.rs index 43c212b2af582..eaff5b1b9947e 100644 --- a/src/test/ui/kindck/kindck-nonsendable-1.rs +++ b/src/test/ui/kindck/kindck-nonsendable-1.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::rc::Rc; fn foo(_x: Rc) {} diff --git a/src/test/ui/kindck/kindck-nonsendable-1.stderr b/src/test/ui/kindck/kindck-nonsendable-1.stderr index a8aa02e1d627a..2aacd2741d388 100644 --- a/src/test/ui/kindck/kindck-nonsendable-1.stderr +++ b/src/test/ui/kindck/kindck-nonsendable-1.stderr @@ -1,13 +1,13 @@ error[E0277]: `std::rc::Rc` cannot be sent between threads safely - --> $DIR/kindck-nonsendable-1.rs:20:5 + --> $DIR/kindck-nonsendable-1.rs:9:5 | LL | bar(move|| foo(x)); | ^^^ `std::rc::Rc` cannot be sent between threads safely | - = help: within `[closure@$DIR/kindck-nonsendable-1.rs:20:9: 20:22 x:std::rc::Rc]`, the trait `std::marker::Send` is not implemented for `std::rc::Rc` - = note: required because it appears within the type `[closure@$DIR/kindck-nonsendable-1.rs:20:9: 20:22 x:std::rc::Rc]` + = help: within `[closure@$DIR/kindck-nonsendable-1.rs:9:9: 9:22 x:std::rc::Rc]`, the trait `std::marker::Send` is not implemented for `std::rc::Rc` + = note: required because it appears within the type `[closure@$DIR/kindck-nonsendable-1.rs:9:9: 9:22 x:std::rc::Rc]` note: required by `bar` - --> $DIR/kindck-nonsendable-1.rs:16:1 + --> $DIR/kindck-nonsendable-1.rs:5:1 | LL | fn bar(_: F) { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/kindck/kindck-send-object.rs b/src/test/ui/kindck/kindck-send-object.rs index 82b9787854903..97f46c3953d51 100644 --- a/src/test/ui/kindck/kindck-send-object.rs +++ b/src/test/ui/kindck/kindck-send-object.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test which of the builtin types are considered sendable. The tests // in this file all test the "kind" violates detected during kindck. // See all `regions-bounded-by-send.rs` diff --git a/src/test/ui/kindck/kindck-send-object.stderr b/src/test/ui/kindck/kindck-send-object.stderr index e342352d590c8..8d9935660292f 100644 --- a/src/test/ui/kindck/kindck-send-object.stderr +++ b/src/test/ui/kindck/kindck-send-object.stderr @@ -1,5 +1,5 @@ error[E0277]: `(dyn Dummy + 'static)` cannot be shared between threads safely - --> $DIR/kindck-send-object.rs:22:5 + --> $DIR/kindck-send-object.rs:12:5 | LL | assert_send::<&'static (Dummy+'static)>(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `(dyn Dummy + 'static)` cannot be shared between threads safely @@ -7,13 +7,13 @@ LL | assert_send::<&'static (Dummy+'static)>(); = help: the trait `std::marker::Sync` is not implemented for `(dyn Dummy + 'static)` = note: required because of the requirements on the impl of `std::marker::Send` for `&'static (dyn Dummy + 'static)` note: required by `assert_send` - --> $DIR/kindck-send-object.rs:15:1 + --> $DIR/kindck-send-object.rs:5:1 | LL | fn assert_send() { } | ^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: `dyn Dummy` cannot be sent between threads safely - --> $DIR/kindck-send-object.rs:27:5 + --> $DIR/kindck-send-object.rs:17:5 | LL | assert_send::>(); | ^^^^^^^^^^^^^^^^^^^^^^^^^ `dyn Dummy` cannot be sent between threads safely @@ -22,7 +22,7 @@ LL | assert_send::>(); = note: required because of the requirements on the impl of `std::marker::Send` for `std::ptr::Unique` = note: required because it appears within the type `std::boxed::Box` note: required by `assert_send` - --> $DIR/kindck-send-object.rs:15:1 + --> $DIR/kindck-send-object.rs:5:1 | LL | fn assert_send() { } | ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/kindck/kindck-send-object1.nll.stderr b/src/test/ui/kindck/kindck-send-object1.nll.stderr index 6613a29cd7688..b61ae62011a39 100644 --- a/src/test/ui/kindck/kindck-send-object1.nll.stderr +++ b/src/test/ui/kindck/kindck-send-object1.nll.stderr @@ -1,5 +1,5 @@ error[E0277]: `(dyn Dummy + 'a)` cannot be shared between threads safely - --> $DIR/kindck-send-object1.rs:20:5 + --> $DIR/kindck-send-object1.rs:10:5 | LL | assert_send::<&'a Dummy>(); | ^^^^^^^^^^^^^^^^^^^^^^^^ `(dyn Dummy + 'a)` cannot be shared between threads safely @@ -7,19 +7,19 @@ LL | assert_send::<&'a Dummy>(); = help: the trait `std::marker::Sync` is not implemented for `(dyn Dummy + 'a)` = note: required because of the requirements on the impl of `std::marker::Send` for `&'a (dyn Dummy + 'a)` note: required by `assert_send` - --> $DIR/kindck-send-object1.rs:15:1 + --> $DIR/kindck-send-object1.rs:5:1 | LL | fn assert_send() { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: not reporting region error due to nll - --> $DIR/kindck-send-object1.rs:24:5 + --> $DIR/kindck-send-object1.rs:14:5 | LL | assert_send::<&'a (Dummy+Sync)>(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: `(dyn Dummy + 'a)` cannot be sent between threads safely - --> $DIR/kindck-send-object1.rs:39:5 + --> $DIR/kindck-send-object1.rs:29:5 | LL | assert_send::>(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `(dyn Dummy + 'a)` cannot be sent between threads safely @@ -28,7 +28,7 @@ LL | assert_send::>(); = note: required because of the requirements on the impl of `std::marker::Send` for `std::ptr::Unique<(dyn Dummy + 'a)>` = note: required because it appears within the type `std::boxed::Box<(dyn Dummy + 'a)>` note: required by `assert_send` - --> $DIR/kindck-send-object1.rs:15:1 + --> $DIR/kindck-send-object1.rs:5:1 | LL | fn assert_send() { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/kindck/kindck-send-object1.rs b/src/test/ui/kindck/kindck-send-object1.rs index 853630aa41628..341985467de6c 100644 --- a/src/test/ui/kindck/kindck-send-object1.rs +++ b/src/test/ui/kindck/kindck-send-object1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test which object types are considered sendable. This test // is broken into two parts because some errors occur in distinct // phases in the compiler. See kindck-send-object2.rs as well! diff --git a/src/test/ui/kindck/kindck-send-object1.stderr b/src/test/ui/kindck/kindck-send-object1.stderr index d906b7d9e1699..4f2d09a60f564 100644 --- a/src/test/ui/kindck/kindck-send-object1.stderr +++ b/src/test/ui/kindck/kindck-send-object1.stderr @@ -1,5 +1,5 @@ error[E0277]: `(dyn Dummy + 'a)` cannot be shared between threads safely - --> $DIR/kindck-send-object1.rs:20:5 + --> $DIR/kindck-send-object1.rs:10:5 | LL | assert_send::<&'a Dummy>(); | ^^^^^^^^^^^^^^^^^^^^^^^^ `(dyn Dummy + 'a)` cannot be shared between threads safely @@ -7,13 +7,13 @@ LL | assert_send::<&'a Dummy>(); = help: the trait `std::marker::Sync` is not implemented for `(dyn Dummy + 'a)` = note: required because of the requirements on the impl of `std::marker::Send` for `&'a (dyn Dummy + 'a)` note: required by `assert_send` - --> $DIR/kindck-send-object1.rs:15:1 + --> $DIR/kindck-send-object1.rs:5:1 | LL | fn assert_send() { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0477]: the type `&'a (dyn Dummy + std::marker::Sync + 'a)` does not fulfill the required lifetime - --> $DIR/kindck-send-object1.rs:24:5 + --> $DIR/kindck-send-object1.rs:14:5 | LL | assert_send::<&'a (Dummy+Sync)>(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -21,7 +21,7 @@ LL | assert_send::<&'a (Dummy+Sync)>(); = note: type must satisfy the static lifetime error[E0277]: `(dyn Dummy + 'a)` cannot be sent between threads safely - --> $DIR/kindck-send-object1.rs:39:5 + --> $DIR/kindck-send-object1.rs:29:5 | LL | assert_send::>(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `(dyn Dummy + 'a)` cannot be sent between threads safely @@ -30,7 +30,7 @@ LL | assert_send::>(); = note: required because of the requirements on the impl of `std::marker::Send` for `std::ptr::Unique<(dyn Dummy + 'a)>` = note: required because it appears within the type `std::boxed::Box<(dyn Dummy + 'a)>` note: required by `assert_send` - --> $DIR/kindck-send-object1.rs:15:1 + --> $DIR/kindck-send-object1.rs:5:1 | LL | fn assert_send() { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/kindck/kindck-send-object2.rs b/src/test/ui/kindck/kindck-send-object2.rs index 0265f888e7c31..911ad988081f5 100644 --- a/src/test/ui/kindck/kindck-send-object2.rs +++ b/src/test/ui/kindck/kindck-send-object2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Continue kindck-send-object1.rs. fn assert_send() { } diff --git a/src/test/ui/kindck/kindck-send-object2.stderr b/src/test/ui/kindck/kindck-send-object2.stderr index 475159cd40032..db79989dc5f6c 100644 --- a/src/test/ui/kindck/kindck-send-object2.stderr +++ b/src/test/ui/kindck/kindck-send-object2.stderr @@ -1,5 +1,5 @@ error[E0277]: `(dyn Dummy + 'static)` cannot be shared between threads safely - --> $DIR/kindck-send-object2.rs:17:5 + --> $DIR/kindck-send-object2.rs:7:5 | LL | assert_send::<&'static Dummy>(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `(dyn Dummy + 'static)` cannot be shared between threads safely @@ -7,13 +7,13 @@ LL | assert_send::<&'static Dummy>(); = help: the trait `std::marker::Sync` is not implemented for `(dyn Dummy + 'static)` = note: required because of the requirements on the impl of `std::marker::Send` for `&'static (dyn Dummy + 'static)` note: required by `assert_send` - --> $DIR/kindck-send-object2.rs:13:1 + --> $DIR/kindck-send-object2.rs:3:1 | LL | fn assert_send() { } | ^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: `dyn Dummy` cannot be sent between threads safely - --> $DIR/kindck-send-object2.rs:22:5 + --> $DIR/kindck-send-object2.rs:12:5 | LL | assert_send::>(); | ^^^^^^^^^^^^^^^^^^^^^^^^^ `dyn Dummy` cannot be sent between threads safely @@ -22,7 +22,7 @@ LL | assert_send::>(); = note: required because of the requirements on the impl of `std::marker::Send` for `std::ptr::Unique` = note: required because it appears within the type `std::boxed::Box` note: required by `assert_send` - --> $DIR/kindck-send-object2.rs:13:1 + --> $DIR/kindck-send-object2.rs:3:1 | LL | fn assert_send() { } | ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/kindck/kindck-send-owned.rs b/src/test/ui/kindck/kindck-send-owned.rs index e48460a87537f..65efb69041d59 100644 --- a/src/test/ui/kindck/kindck-send-owned.rs +++ b/src/test/ui/kindck/kindck-send-owned.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test which of the builtin types are considered sendable. fn assert_send() { } diff --git a/src/test/ui/kindck/kindck-send-owned.stderr b/src/test/ui/kindck/kindck-send-owned.stderr index f5781bd968e2e..75c757dc54646 100644 --- a/src/test/ui/kindck/kindck-send-owned.stderr +++ b/src/test/ui/kindck/kindck-send-owned.stderr @@ -1,5 +1,5 @@ error[E0277]: `*mut u8` cannot be sent between threads safely - --> $DIR/kindck-send-owned.rs:22:5 + --> $DIR/kindck-send-owned.rs:12:5 | LL | assert_send::>(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ `*mut u8` cannot be sent between threads safely @@ -8,7 +8,7 @@ LL | assert_send::>(); = note: required because of the requirements on the impl of `std::marker::Send` for `std::ptr::Unique<*mut u8>` = note: required because it appears within the type `std::boxed::Box<*mut u8>` note: required by `assert_send` - --> $DIR/kindck-send-owned.rs:13:1 + --> $DIR/kindck-send-owned.rs:3:1 | LL | fn assert_send() { } | ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/kindck/kindck-send-unsafe.rs b/src/test/ui/kindck/kindck-send-unsafe.rs index 99b995b0906b4..4ef30a71fa358 100644 --- a/src/test/ui/kindck/kindck-send-unsafe.rs +++ b/src/test/ui/kindck/kindck-send-unsafe.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate core; fn assert_send() { } diff --git a/src/test/ui/kindck/kindck-send-unsafe.stderr b/src/test/ui/kindck/kindck-send-unsafe.stderr index 846de09ba3cb0..2fbb07a0df51a 100644 --- a/src/test/ui/kindck/kindck-send-unsafe.stderr +++ b/src/test/ui/kindck/kindck-send-unsafe.stderr @@ -1,12 +1,12 @@ error[E0277]: `*mut &'a isize` cannot be sent between threads safely - --> $DIR/kindck-send-unsafe.rs:16:5 + --> $DIR/kindck-send-unsafe.rs:6:5 | LL | assert_send::<*mut &'a isize>(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `*mut &'a isize` cannot be sent between threads safely | = help: the trait `std::marker::Send` is not implemented for `*mut &'a isize` note: required by `assert_send` - --> $DIR/kindck-send-unsafe.rs:13:1 + --> $DIR/kindck-send-unsafe.rs:3:1 | LL | fn assert_send() { } | ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/label/label-static.rs b/src/test/ui/label/label-static.rs index a0fb25ea06eac..95e764d01870a 100644 --- a/src/test/ui/label/label-static.rs +++ b/src/test/ui/label/label-static.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { 'static: loop { //~ ERROR invalid label name `'static` break 'static //~ ERROR invalid label name `'static` diff --git a/src/test/ui/label/label-static.stderr b/src/test/ui/label/label-static.stderr index f5b6eba00899c..52ab547aa7bb0 100644 --- a/src/test/ui/label/label-static.stderr +++ b/src/test/ui/label/label-static.stderr @@ -1,11 +1,11 @@ error: invalid label name `'static` - --> $DIR/label-static.rs:12:5 + --> $DIR/label-static.rs:2:5 | LL | 'static: loop { //~ ERROR invalid label name `'static` | ^^^^^^^ error: invalid label name `'static` - --> $DIR/label-static.rs:13:15 + --> $DIR/label-static.rs:3:15 | LL | break 'static //~ ERROR invalid label name `'static` | ^^^^^^^ diff --git a/src/test/ui/label/label-underscore.rs b/src/test/ui/label/label-underscore.rs index 30411bf878909..de67f3d2c3e47 100644 --- a/src/test/ui/label/label-underscore.rs +++ b/src/test/ui/label/label-underscore.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { '_: loop { //~ ERROR invalid label name `'_` break '_ //~ ERROR invalid label name `'_` diff --git a/src/test/ui/label/label-underscore.stderr b/src/test/ui/label/label-underscore.stderr index 9a567094c82f1..a4925c8619edc 100644 --- a/src/test/ui/label/label-underscore.stderr +++ b/src/test/ui/label/label-underscore.stderr @@ -1,11 +1,11 @@ error: invalid label name `'_` - --> $DIR/label-underscore.rs:12:5 + --> $DIR/label-underscore.rs:2:5 | LL | '_: loop { //~ ERROR invalid label name `'_` | ^^ error: invalid label name `'_` - --> $DIR/label-underscore.rs:13:15 + --> $DIR/label-underscore.rs:3:15 | LL | break '_ //~ ERROR invalid label name `'_` | ^^ diff --git a/src/test/ui/label/label_break_value_continue.rs b/src/test/ui/label/label_break_value_continue.rs index 4a505dff3d467..e0deb30c9503b 100644 --- a/src/test/ui/label/label_break_value_continue.rs +++ b/src/test/ui/label/label_break_value_continue.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(label_break_value)] #![allow(unused_labels)] diff --git a/src/test/ui/label/label_break_value_continue.stderr b/src/test/ui/label/label_break_value_continue.stderr index 12a21a8a59441..c0decc8255244 100644 --- a/src/test/ui/label/label_break_value_continue.stderr +++ b/src/test/ui/label/label_break_value_continue.stderr @@ -1,17 +1,17 @@ error[E0695]: unlabeled `continue` inside of a labeled block - --> $DIR/label_break_value_continue.rs:17:9 + --> $DIR/label_break_value_continue.rs:7:9 | LL | continue; //~ ERROR unlabeled `continue` inside of a labeled block | ^^^^^^^^ `continue` statements that would diverge to or through a labeled block need to bear a label error[E0696]: `continue` pointing to a labeled block - --> $DIR/label_break_value_continue.rs:24:9 + --> $DIR/label_break_value_continue.rs:14:9 | LL | continue 'b; //~ ERROR `continue` pointing to a labeled block | ^^^^^^^^^^^ labeled blocks cannot be `continue`'d | note: labeled block the continue points to - --> $DIR/label_break_value_continue.rs:23:5 + --> $DIR/label_break_value_continue.rs:13:5 | LL | / 'b: { LL | | continue 'b; //~ ERROR `continue` pointing to a labeled block @@ -19,7 +19,7 @@ LL | | } | |_____^ error[E0695]: unlabeled `continue` inside of a labeled block - --> $DIR/label_break_value_continue.rs:32:13 + --> $DIR/label_break_value_continue.rs:22:13 | LL | continue; //~ ERROR unlabeled `continue` inside of a labeled block | ^^^^^^^^ `continue` statements that would diverge to or through a labeled block need to bear a label diff --git a/src/test/ui/label/label_break_value_illegal_uses.rs b/src/test/ui/label/label_break_value_illegal_uses.rs index 8315104d37ff4..81cb17743809a 100644 --- a/src/test/ui/label/label_break_value_illegal_uses.rs +++ b/src/test/ui/label/label_break_value_illegal_uses.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(label_break_value)] // These are forbidden occurrences of label-break-value diff --git a/src/test/ui/label/label_break_value_illegal_uses.stderr b/src/test/ui/label/label_break_value_illegal_uses.stderr index 0ab1ad2c24200..b76bdc8f83be0 100644 --- a/src/test/ui/label/label_break_value_illegal_uses.stderr +++ b/src/test/ui/label/label_break_value_illegal_uses.stderr @@ -1,11 +1,11 @@ error: expected one of `extern`, `fn`, or `{`, found `'b` - --> $DIR/label_break_value_illegal_uses.rs:16:12 + --> $DIR/label_break_value_illegal_uses.rs:6:12 | LL | unsafe 'b: {} //~ ERROR expected one of `extern`, `fn`, or `{` | ^^ expected one of `extern`, `fn`, or `{` here error: expected `{`, found `'b` - --> $DIR/label_break_value_illegal_uses.rs:20:13 + --> $DIR/label_break_value_illegal_uses.rs:10:13 | LL | if true 'b: {} //~ ERROR expected `{`, found `'b` | -- ^^---- @@ -14,7 +14,7 @@ LL | if true 'b: {} //~ ERROR expected `{`, found `'b` | this `if` statement has a condition, but no block error: expected `{`, found `'b` - --> $DIR/label_break_value_illegal_uses.rs:24:21 + --> $DIR/label_break_value_illegal_uses.rs:14:21 | LL | if true {} else 'b: {} //~ ERROR expected `{`, found `'b` | ^^---- @@ -22,7 +22,7 @@ LL | if true {} else 'b: {} //~ ERROR expected `{`, found `'b` | help: try placing this code inside a block: `{ 'b: { } }` error: expected one of `.`, `?`, `{`, or an operator, found `'b` - --> $DIR/label_break_value_illegal_uses.rs:28:17 + --> $DIR/label_break_value_illegal_uses.rs:18:17 | LL | match false 'b: {} //~ ERROR expected one of `.`, `?`, `{`, or an operator | ^^ expected one of `.`, `?`, `{`, or an operator here diff --git a/src/test/ui/label/label_break_value_unlabeled_break.rs b/src/test/ui/label/label_break_value_unlabeled_break.rs index 454ebd4c6cf6d..fa0c70edc7881 100644 --- a/src/test/ui/label/label_break_value_unlabeled_break.rs +++ b/src/test/ui/label/label_break_value_unlabeled_break.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(label_break_value)] #![allow(unused_labels)] diff --git a/src/test/ui/label/label_break_value_unlabeled_break.stderr b/src/test/ui/label/label_break_value_unlabeled_break.stderr index 62c4a12231baf..1d6e27d4c3d0f 100644 --- a/src/test/ui/label/label_break_value_unlabeled_break.stderr +++ b/src/test/ui/label/label_break_value_unlabeled_break.stderr @@ -1,11 +1,11 @@ error[E0695]: unlabeled `break` inside of a labeled block - --> $DIR/label_break_value_unlabeled_break.rs:17:9 + --> $DIR/label_break_value_unlabeled_break.rs:7:9 | LL | break; //~ ERROR unlabeled `break` inside of a labeled block | ^^^^^ `break` statements that would diverge to or through a labeled block need to bear a label error[E0695]: unlabeled `break` inside of a labeled block - --> $DIR/label_break_value_unlabeled_break.rs:25:13 + --> $DIR/label_break_value_unlabeled_break.rs:15:13 | LL | break; //~ ERROR unlabeled `break` inside of a labeled block | ^^^^^ `break` statements that would diverge to or through a labeled block need to bear a label diff --git a/src/test/ui/lang-item-missing.rs b/src/test/ui/lang-item-missing.rs index ce2fa2548c3aa..4e26343242e01 100644 --- a/src/test/ui/lang-item-missing.rs +++ b/src/test/ui/lang-item-missing.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that a missing lang item (in this case `sized`) does not cause an ICE, // see #17392. diff --git a/src/test/ui/lexical-scopes.rs b/src/test/ui/lexical-scopes.rs index 39da0d47a95f3..46cfdf1efa8f0 100644 --- a/src/test/ui/lexical-scopes.rs +++ b/src/test/ui/lexical-scopes.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct T { i: i32 } fn f() { let t = T { i: 0 }; //~ ERROR expected struct, variant or union type, found type parameter `T` diff --git a/src/test/ui/lexical-scopes.stderr b/src/test/ui/lexical-scopes.stderr index 3a6ae52c68dc6..7ac629b5dea19 100644 --- a/src/test/ui/lexical-scopes.stderr +++ b/src/test/ui/lexical-scopes.stderr @@ -1,5 +1,5 @@ error[E0574]: expected struct, variant or union type, found type parameter `T` - --> $DIR/lexical-scopes.rs:13:13 + --> $DIR/lexical-scopes.rs:3:13 | LL | let t = T { i: 0 }; //~ ERROR expected struct, variant or union type, found type parameter `T` | ^ not a struct, variant or union type @@ -9,7 +9,7 @@ LL | use T; | error[E0599]: no function or associated item named `f` found for type `Foo` in the current scope - --> $DIR/lexical-scopes.rs:20:5 + --> $DIR/lexical-scopes.rs:10:5 | LL | Foo::f(); //~ ERROR no function or associated item named `f` | ^^^^^^ function or associated item not found in `Foo` diff --git a/src/test/ui/lifetime_starts_expressions.rs b/src/test/ui/lifetime_starts_expressions.rs index ffe1d7c353b8e..e0098793e1f21 100644 --- a/src/test/ui/lifetime_starts_expressions.rs +++ b/src/test/ui/lifetime_starts_expressions.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo() -> u32 { return 'label: loop { break 'label 42; }; } diff --git a/src/test/ui/lifetime_starts_expressions.stderr b/src/test/ui/lifetime_starts_expressions.stderr index de42f1daa1eff..20efc1fab56b1 100644 --- a/src/test/ui/lifetime_starts_expressions.stderr +++ b/src/test/ui/lifetime_starts_expressions.stderr @@ -1,11 +1,11 @@ error: expected identifier, found keyword `loop` - --> $DIR/lifetime_starts_expressions.rs:16:26 + --> $DIR/lifetime_starts_expressions.rs:6:26 | LL | loop { break 'label: loop { break 'label 42; }; } | ^^^^ expected identifier, found keyword error: expected type, found keyword `loop` - --> $DIR/lifetime_starts_expressions.rs:16:26 + --> $DIR/lifetime_starts_expressions.rs:6:26 | LL | loop { break 'label: loop { break 'label 42; }; } | ^^^^ expecting a type here because of type ascription diff --git a/src/test/ui/lifetimes/auxiliary/lifetime_bound_will_change_warning_lib.rs b/src/test/ui/lifetimes/auxiliary/lifetime_bound_will_change_warning_lib.rs index 95f8b39c48745..58f1b81cf4d56 100644 --- a/src/test/ui/lifetimes/auxiliary/lifetime_bound_will_change_warning_lib.rs +++ b/src/test/ui/lifetimes/auxiliary/lifetime_bound_will_change_warning_lib.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] // Helper for testing that we get suitable warnings when lifetime diff --git a/src/test/ui/lifetimes/borrowck-let-suggestion.nll.stderr b/src/test/ui/lifetimes/borrowck-let-suggestion.nll.stderr index a485c80f3b0d8..5eb394f55a3c4 100644 --- a/src/test/ui/lifetimes/borrowck-let-suggestion.nll.stderr +++ b/src/test/ui/lifetimes/borrowck-let-suggestion.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/borrowck-let-suggestion.rs:12:17 + --> $DIR/borrowck-let-suggestion.rs:2:17 | LL | let mut x = vec![1].iter(); | ^^^^^^^ - temporary value only lives until here diff --git a/src/test/ui/lifetimes/borrowck-let-suggestion.rs b/src/test/ui/lifetimes/borrowck-let-suggestion.rs index 37d6e35182827..1deb0457e95af 100644 --- a/src/test/ui/lifetimes/borrowck-let-suggestion.rs +++ b/src/test/ui/lifetimes/borrowck-let-suggestion.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn f() { let mut x = vec![1].iter(); //~^ ERROR borrowed value does not live long enough diff --git a/src/test/ui/lifetimes/borrowck-let-suggestion.stderr b/src/test/ui/lifetimes/borrowck-let-suggestion.stderr index a7ff1fd9d0a73..7a95137ac9274 100644 --- a/src/test/ui/lifetimes/borrowck-let-suggestion.stderr +++ b/src/test/ui/lifetimes/borrowck-let-suggestion.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/borrowck-let-suggestion.rs:12:17 + --> $DIR/borrowck-let-suggestion.rs:2:17 | LL | let mut x = vec![1].iter(); | ^^^^^^^ - temporary value dropped here while still borrowed diff --git a/src/test/ui/lifetimes/lifetime-bound-will-change-warning.nll.stderr b/src/test/ui/lifetimes/lifetime-bound-will-change-warning.nll.stderr index ab9bb19563127..abd8999c5dc74 100644 --- a/src/test/ui/lifetimes/lifetime-bound-will-change-warning.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-bound-will-change-warning.nll.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/lifetime-bound-will-change-warning.rs:44:13 + --> $DIR/lifetime-bound-will-change-warning.rs:34:13 | LL | ref_obj(x) //~ ERROR mismatched types | ^ warning: not reporting region error due to nll - --> $DIR/lifetime-bound-will-change-warning.rs:49:18 + --> $DIR/lifetime-bound-will-change-warning.rs:39:18 | LL | lib::ref_obj(x) //~ ERROR mismatched types | ^ error: borrowed data escapes outside of function - --> $DIR/lifetime-bound-will-change-warning.rs:44:5 + --> $DIR/lifetime-bound-will-change-warning.rs:34:5 | LL | fn test2<'a>(x: &'a Box) { | - `x` is a reference that is only valid in the function body @@ -20,7 +20,7 @@ LL | ref_obj(x) //~ ERROR mismatched types | ^^^^^^^^^^ `x` escapes the function body here error: borrowed data escapes outside of function - --> $DIR/lifetime-bound-will-change-warning.rs:49:5 + --> $DIR/lifetime-bound-will-change-warning.rs:39:5 | LL | fn test2cc<'a>(x: &'a Box) { | - `x` is a reference that is only valid in the function body diff --git a/src/test/ui/lifetimes/lifetime-bound-will-change-warning.rs b/src/test/ui/lifetimes/lifetime-bound-will-change-warning.rs index 7e9a4f82478bd..ee64e9d80fa5a 100644 --- a/src/test/ui/lifetimes/lifetime-bound-will-change-warning.rs +++ b/src/test/ui/lifetimes/lifetime-bound-will-change-warning.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:lifetime_bound_will_change_warning_lib.rs // Test that various corner cases cause an error. These are tests diff --git a/src/test/ui/lifetimes/lifetime-bound-will-change-warning.stderr b/src/test/ui/lifetimes/lifetime-bound-will-change-warning.stderr index 01f215c97f2b4..a283a0b29e6c4 100644 --- a/src/test/ui/lifetimes/lifetime-bound-will-change-warning.stderr +++ b/src/test/ui/lifetimes/lifetime-bound-will-change-warning.stderr @@ -1,28 +1,28 @@ error[E0308]: mismatched types - --> $DIR/lifetime-bound-will-change-warning.rs:44:13 + --> $DIR/lifetime-bound-will-change-warning.rs:34:13 | LL | ref_obj(x) //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `&std::boxed::Box<(dyn std::ops::Fn() + 'static)>` found type `&std::boxed::Box<(dyn std::ops::Fn() + 'a)>` -note: the lifetime 'a as defined on the function body at 42:10... - --> $DIR/lifetime-bound-will-change-warning.rs:42:10 +note: the lifetime 'a as defined on the function body at 32:10... + --> $DIR/lifetime-bound-will-change-warning.rs:32:10 | LL | fn test2<'a>(x: &'a Box) { | ^^ = note: ...does not necessarily outlive the static lifetime error[E0308]: mismatched types - --> $DIR/lifetime-bound-will-change-warning.rs:49:18 + --> $DIR/lifetime-bound-will-change-warning.rs:39:18 | LL | lib::ref_obj(x) //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `&std::boxed::Box<(dyn std::ops::Fn() + 'static)>` found type `&std::boxed::Box<(dyn std::ops::Fn() + 'a)>` -note: the lifetime 'a as defined on the function body at 47:12... - --> $DIR/lifetime-bound-will-change-warning.rs:47:12 +note: the lifetime 'a as defined on the function body at 37:12... + --> $DIR/lifetime-bound-will-change-warning.rs:37:12 | LL | fn test2cc<'a>(x: &'a Box) { | ^^ diff --git a/src/test/ui/lifetimes/lifetime-doesnt-live-long-enough.rs b/src/test/ui/lifetimes/lifetime-doesnt-live-long-enough.rs index 0099a8bc10f5a..0ba28fc4fc74b 100644 --- a/src/test/ui/lifetimes/lifetime-doesnt-live-long-enough.rs +++ b/src/test/ui/lifetimes/lifetime-doesnt-live-long-enough.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait ListItem<'a> { fn list_name() -> &'a str; } diff --git a/src/test/ui/lifetimes/lifetime-doesnt-live-long-enough.stderr b/src/test/ui/lifetimes/lifetime-doesnt-live-long-enough.stderr index ea79990bbb1fb..d70e53f3fc851 100644 --- a/src/test/ui/lifetimes/lifetime-doesnt-live-long-enough.stderr +++ b/src/test/ui/lifetimes/lifetime-doesnt-live-long-enough.stderr @@ -1,5 +1,5 @@ error[E0309]: the parameter type `T` may not live long enough - --> $DIR/lifetime-doesnt-live-long-enough.rs:18:5 + --> $DIR/lifetime-doesnt-live-long-enough.rs:8:5 | LL | struct List<'a, T: ListItem<'a>> { | -- help: consider adding an explicit lifetime bound `T: 'a`... @@ -7,13 +7,13 @@ LL | slice: &'a [T] | ^^^^^^^^^^^^^^ | note: ...so that the reference type `&'a [T]` does not outlive the data it points at - --> $DIR/lifetime-doesnt-live-long-enough.rs:18:5 + --> $DIR/lifetime-doesnt-live-long-enough.rs:8:5 | LL | slice: &'a [T] | ^^^^^^^^^^^^^^ error[E0310]: the parameter type `T` may not live long enough - --> $DIR/lifetime-doesnt-live-long-enough.rs:29:5 + --> $DIR/lifetime-doesnt-live-long-enough.rs:19:5 | LL | struct Foo { | - help: consider adding an explicit lifetime bound `T: 'static`... @@ -21,13 +21,13 @@ LL | foo: &'static T | ^^^^^^^^^^^^^^^ | note: ...so that the reference type `&'static T` does not outlive the data it points at - --> $DIR/lifetime-doesnt-live-long-enough.rs:29:5 + --> $DIR/lifetime-doesnt-live-long-enough.rs:19:5 | LL | foo: &'static T | ^^^^^^^^^^^^^^^ error[E0309]: the parameter type `K` may not live long enough - --> $DIR/lifetime-doesnt-live-long-enough.rs:34:5 + --> $DIR/lifetime-doesnt-live-long-enough.rs:24:5 | LL | trait X: Sized { | - help: consider adding an explicit lifetime bound `K: 'a`... @@ -35,26 +35,26 @@ LL | fn foo<'a, L: X<&'a Nested>>(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | note: ...so that the reference type `&'a Nested` does not outlive the data it points at - --> $DIR/lifetime-doesnt-live-long-enough.rs:34:5 + --> $DIR/lifetime-doesnt-live-long-enough.rs:24:5 | LL | fn foo<'a, L: X<&'a Nested>>(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0309]: the parameter type `Self` may not live long enough - --> $DIR/lifetime-doesnt-live-long-enough.rs:38:5 + --> $DIR/lifetime-doesnt-live-long-enough.rs:28:5 | LL | fn bar<'a, L: X<&'a Nested>>(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = help: consider adding an explicit lifetime bound `Self: 'a`... note: ...so that the reference type `&'a Nested` does not outlive the data it points at - --> $DIR/lifetime-doesnt-live-long-enough.rs:38:5 + --> $DIR/lifetime-doesnt-live-long-enough.rs:28:5 | LL | fn bar<'a, L: X<&'a Nested>>(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0309]: the parameter type `L` may not live long enough - --> $DIR/lifetime-doesnt-live-long-enough.rs:42:5 + --> $DIR/lifetime-doesnt-live-long-enough.rs:32:5 | LL | fn baz<'a, L, M: X<&'a Nested>>() { | ^ - help: consider adding an explicit lifetime bound `L: 'a`... @@ -65,7 +65,7 @@ LL | | } | |_____^ | note: ...so that the reference type `&'a Nested` does not outlive the data it points at - --> $DIR/lifetime-doesnt-live-long-enough.rs:42:5 + --> $DIR/lifetime-doesnt-live-long-enough.rs:32:5 | LL | / fn baz<'a, L, M: X<&'a Nested>>() { LL | | //~^ ERROR may not live long enough @@ -73,7 +73,7 @@ LL | | } | |_____^ error[E0309]: the parameter type `K` may not live long enough - --> $DIR/lifetime-doesnt-live-long-enough.rs:51:5 + --> $DIR/lifetime-doesnt-live-long-enough.rs:41:5 | LL | impl Nested { | - help: consider adding an explicit lifetime bound `K: 'a`... @@ -83,7 +83,7 @@ LL | | } | |_____^ | note: ...so that the reference type `&'a Nested` does not outlive the data it points at - --> $DIR/lifetime-doesnt-live-long-enough.rs:51:5 + --> $DIR/lifetime-doesnt-live-long-enough.rs:41:5 | LL | / fn generic_in_parent<'a, L: X<&'a Nested>>() { LL | | //~^ ERROR may not live long enough @@ -91,7 +91,7 @@ LL | | } | |_____^ error[E0309]: the parameter type `M` may not live long enough - --> $DIR/lifetime-doesnt-live-long-enough.rs:54:5 + --> $DIR/lifetime-doesnt-live-long-enough.rs:44:5 | LL | fn generic_in_child<'a, 'b, L: X<&'a Nested>, M: 'b>() { | ^ -- help: consider adding an explicit lifetime bound `M: 'a`... @@ -102,7 +102,7 @@ LL | | } | |_____^ | note: ...so that the reference type `&'a Nested` does not outlive the data it points at - --> $DIR/lifetime-doesnt-live-long-enough.rs:54:5 + --> $DIR/lifetime-doesnt-live-long-enough.rs:44:5 | LL | / fn generic_in_child<'a, 'b, L: X<&'a Nested>, M: 'b>() { LL | | //~^ ERROR may not live long enough diff --git a/src/test/ui/lifetimes/lifetime-elision-return-type-requires-explicit-lifetime.rs b/src/test/ui/lifetimes/lifetime-elision-return-type-requires-explicit-lifetime.rs index a5fada7869e86..7a2eba518fefa 100644 --- a/src/test/ui/lifetimes/lifetime-elision-return-type-requires-explicit-lifetime.rs +++ b/src/test/ui/lifetimes/lifetime-elision-return-type-requires-explicit-lifetime.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Lifetime annotation needed because we have no arguments. fn f() -> &isize { //~ ERROR missing lifetime specifier panic!() diff --git a/src/test/ui/lifetimes/lifetime-elision-return-type-requires-explicit-lifetime.stderr b/src/test/ui/lifetimes/lifetime-elision-return-type-requires-explicit-lifetime.stderr index 30cff86ed1d40..2dec3cf60e871 100644 --- a/src/test/ui/lifetimes/lifetime-elision-return-type-requires-explicit-lifetime.stderr +++ b/src/test/ui/lifetimes/lifetime-elision-return-type-requires-explicit-lifetime.stderr @@ -1,5 +1,5 @@ error[E0106]: missing lifetime specifier - --> $DIR/lifetime-elision-return-type-requires-explicit-lifetime.rs:12:11 + --> $DIR/lifetime-elision-return-type-requires-explicit-lifetime.rs:2:11 | LL | fn f() -> &isize { //~ ERROR missing lifetime specifier | ^ expected lifetime parameter @@ -8,7 +8,7 @@ LL | fn f() -> &isize { //~ ERROR missing lifetime specifier = help: consider giving it a 'static lifetime error[E0106]: missing lifetime specifier - --> $DIR/lifetime-elision-return-type-requires-explicit-lifetime.rs:17:33 + --> $DIR/lifetime-elision-return-type-requires-explicit-lifetime.rs:7:33 | LL | fn g(_x: &isize, _y: &isize) -> &isize { //~ ERROR missing lifetime specifier | ^ expected lifetime parameter @@ -16,7 +16,7 @@ LL | fn g(_x: &isize, _y: &isize) -> &isize { //~ ERROR missing lifetime spec = help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from `_x` or `_y` error[E0106]: missing lifetime specifier - --> $DIR/lifetime-elision-return-type-requires-explicit-lifetime.rs:27:19 + --> $DIR/lifetime-elision-return-type-requires-explicit-lifetime.rs:17:19 | LL | fn h(_x: &Foo) -> &isize { //~ ERROR missing lifetime specifier | ^ expected lifetime parameter @@ -24,7 +24,7 @@ LL | fn h(_x: &Foo) -> &isize { //~ ERROR missing lifetime specifier = help: this function's return type contains a borrowed value, but the signature does not say which one of `_x`'s 2 lifetimes it is borrowed from error[E0106]: missing lifetime specifier - --> $DIR/lifetime-elision-return-type-requires-explicit-lifetime.rs:31:20 + --> $DIR/lifetime-elision-return-type-requires-explicit-lifetime.rs:21:20 | LL | fn i(_x: isize) -> &isize { //~ ERROR missing lifetime specifier | ^ expected lifetime parameter @@ -33,7 +33,7 @@ LL | fn i(_x: isize) -> &isize { //~ ERROR missing lifetime specifier = help: consider giving it an explicit bounded or 'static lifetime error[E0106]: missing lifetime specifier - --> $DIR/lifetime-elision-return-type-requires-explicit-lifetime.rs:44:24 + --> $DIR/lifetime-elision-return-type-requires-explicit-lifetime.rs:34:24 | LL | fn j(_x: StaticStr) -> &isize { //~ ERROR missing lifetime specifier | ^ expected lifetime parameter @@ -42,7 +42,7 @@ LL | fn j(_x: StaticStr) -> &isize { //~ ERROR missing lifetime specifier = help: consider giving it an explicit bounded or 'static lifetime error[E0106]: missing lifetime specifier - --> $DIR/lifetime-elision-return-type-requires-explicit-lifetime.rs:50:49 + --> $DIR/lifetime-elision-return-type-requires-explicit-lifetime.rs:40:49 | LL | fn k<'a, T: WithLifetime<'a>>(_x: T::Output) -> &isize { | ^ expected lifetime parameter diff --git a/src/test/ui/lifetimes/lifetime-errors/42701_one_named_and_one_anonymous.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/42701_one_named_and_one_anonymous.nll.stderr index 3fb0252315cbf..59826a4d1c9c0 100644 --- a/src/test/ui/lifetimes/lifetime-errors/42701_one_named_and_one_anonymous.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/42701_one_named_and_one_anonymous.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/42701_one_named_and_one_anonymous.rs:20:9 + --> $DIR/42701_one_named_and_one_anonymous.rs:10:9 | LL | &*x //~ ERROR explicit lifetime | ^^^ error[E0621]: explicit lifetime required in the type of `x` - --> $DIR/42701_one_named_and_one_anonymous.rs:20:9 + --> $DIR/42701_one_named_and_one_anonymous.rs:10:9 | LL | fn foo2<'a>(a: &'a Foo, x: &i32) -> &'a i32 { | ---- help: add explicit lifetime `'a` to the type of `x`: `&'a i32` diff --git a/src/test/ui/lifetimes/lifetime-errors/42701_one_named_and_one_anonymous.rs b/src/test/ui/lifetimes/lifetime-errors/42701_one_named_and_one_anonymous.rs index 5ded42e7c972c..b0c09c7514e27 100644 --- a/src/test/ui/lifetimes/lifetime-errors/42701_one_named_and_one_anonymous.rs +++ b/src/test/ui/lifetimes/lifetime-errors/42701_one_named_and_one_anonymous.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { field: i32, } diff --git a/src/test/ui/lifetimes/lifetime-errors/42701_one_named_and_one_anonymous.stderr b/src/test/ui/lifetimes/lifetime-errors/42701_one_named_and_one_anonymous.stderr index b886450336d26..6211a9a114176 100644 --- a/src/test/ui/lifetimes/lifetime-errors/42701_one_named_and_one_anonymous.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/42701_one_named_and_one_anonymous.stderr @@ -1,5 +1,5 @@ error[E0621]: explicit lifetime required in the type of `x` - --> $DIR/42701_one_named_and_one_anonymous.rs:20:9 + --> $DIR/42701_one_named_and_one_anonymous.rs:10:9 | LL | fn foo2<'a>(a: &'a Foo, x: &i32) -> &'a i32 { | ---- help: add explicit lifetime `'a` to the type of `x`: `&'a i32` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.nll.stderr index 817d7c8736375..4d611d000b782 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex1-return-one-existing-name-early-bound-in-struct.rs:21:21 + --> $DIR/ex1-return-one-existing-name-early-bound-in-struct.rs:11:21 | LL | other //~ ERROR explicit lifetime | ^^^^^ error[E0621]: explicit lifetime required in the type of `other` - --> $DIR/ex1-return-one-existing-name-early-bound-in-struct.rs:21:21 + --> $DIR/ex1-return-one-existing-name-early-bound-in-struct.rs:11:21 | LL | fn bar(&self, other: Foo) -> Foo<'a> { | --- help: add explicit lifetime `'a` to the type of `other`: `Foo<'a>` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.rs b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.rs index 1705767834fb2..35f70dd1982f3 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Clone)] enum Foo<'a> { Bar(&'a str), diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.stderr index 5847f755b3ca6..9fe1679936d87 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.stderr @@ -1,5 +1,5 @@ error[E0621]: explicit lifetime required in the type of `other` - --> $DIR/ex1-return-one-existing-name-early-bound-in-struct.rs:21:21 + --> $DIR/ex1-return-one-existing-name-early-bound-in-struct.rs:11:21 | LL | fn bar(&self, other: Foo) -> Foo<'a> { | --- help: add explicit lifetime `'a` to the type of `other`: `Foo<'a>` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-2.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-2.nll.stderr index a10c38a88d4c4..f3bd204ec3b04 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-2.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-2.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex1-return-one-existing-name-if-else-2.rs:12:16 + --> $DIR/ex1-return-one-existing-name-if-else-2.rs:2:16 | LL | if x > y { x } else { y } //~ ERROR explicit lifetime | ^ error[E0621]: explicit lifetime required in the type of `x` - --> $DIR/ex1-return-one-existing-name-if-else-2.rs:12:16 + --> $DIR/ex1-return-one-existing-name-if-else-2.rs:2:16 | LL | fn foo<'a>(x: &i32, y: &'a i32) -> &'a i32 { | ---- help: add explicit lifetime `'a` to the type of `x`: `&'a i32` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-2.rs b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-2.rs index 964f2f1c003ec..9b15b378dc185 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-2.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo<'a>(x: &i32, y: &'a i32) -> &'a i32 { if x > y { x } else { y } //~ ERROR explicit lifetime } diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-2.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-2.stderr index a4e1fe5e18377..94ec5248eb00e 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-2.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-2.stderr @@ -1,5 +1,5 @@ error[E0621]: explicit lifetime required in the type of `x` - --> $DIR/ex1-return-one-existing-name-if-else-2.rs:12:16 + --> $DIR/ex1-return-one-existing-name-if-else-2.rs:2:16 | LL | fn foo<'a>(x: &i32, y: &'a i32) -> &'a i32 { | ---- help: add explicit lifetime `'a` to the type of `x`: `&'a i32` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-3.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-3.nll.stderr index e33b89c56d5d8..e71611ed4756d 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-3.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-3.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex1-return-one-existing-name-if-else-3.rs:12:27 + --> $DIR/ex1-return-one-existing-name-if-else-3.rs:2:27 | LL | if x > y { x } else { y } //~ ERROR explicit lifetime | ^ error[E0621]: explicit lifetime required in parameter type - --> $DIR/ex1-return-one-existing-name-if-else-3.rs:12:27 + --> $DIR/ex1-return-one-existing-name-if-else-3.rs:2:27 | LL | fn foo<'a>((x, y): (&'a i32, &i32)) -> &'a i32 { | --------------- help: add explicit lifetime `'a` to type: `(&'a i32, &'a i32)` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-3.rs b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-3.rs index 96d5c5bb16100..6b062125cc0b1 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-3.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-3.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo<'a>((x, y): (&'a i32, &i32)) -> &'a i32 { if x > y { x } else { y } //~ ERROR explicit lifetime } diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-3.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-3.stderr index a260c7bf7e957..4be638bf4c210 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-3.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-3.stderr @@ -1,5 +1,5 @@ error[E0621]: explicit lifetime required in parameter type - --> $DIR/ex1-return-one-existing-name-if-else-3.rs:12:27 + --> $DIR/ex1-return-one-existing-name-if-else-3.rs:2:27 | LL | fn foo<'a>((x, y): (&'a i32, &i32)) -> &'a i32 { | --------------- help: add explicit lifetime `'a` to type: `(&'a i32, &'a i32)` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.nll.stderr index a3b2c3f6f19c3..e74b0dbc869bd 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex1-return-one-existing-name-if-else-using-impl-2.rs:14:15 + --> $DIR/ex1-return-one-existing-name-if-else-using-impl-2.rs:4:15 | LL | if x > y { x } else { y } //~ ERROR explicit lifetime | ^ error[E0621]: explicit lifetime required in the type of `x` - --> $DIR/ex1-return-one-existing-name-if-else-using-impl-2.rs:14:15 + --> $DIR/ex1-return-one-existing-name-if-else-using-impl-2.rs:4:15 | LL | fn foo<'a>(x: &i32, y: &'a i32) -> &'a i32 { | ---- help: add explicit lifetime `'a` to the type of `x`: `&'a i32` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.rs b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.rs index 5cf52fe79f014..7bc3fa623ee90 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn foo<'a>(x: &i32, y: &'a i32) -> &'a i32 { diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.stderr index 8eac8761bd4e1..d61271b81ac1d 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.stderr @@ -1,5 +1,5 @@ error[E0621]: explicit lifetime required in the type of `x` - --> $DIR/ex1-return-one-existing-name-if-else-using-impl-2.rs:14:15 + --> $DIR/ex1-return-one-existing-name-if-else-using-impl-2.rs:4:15 | LL | fn foo<'a>(x: &i32, y: &'a i32) -> &'a i32 { | ---- help: add explicit lifetime `'a` to the type of `x`: `&'a i32` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.nll.stderr index e13a710508d05..e518af1c7b6be 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex1-return-one-existing-name-if-else-using-impl-3.rs:18:36 + --> $DIR/ex1-return-one-existing-name-if-else-using-impl-3.rs:8:36 | LL | if true { &self.field } else { x } //~ ERROR explicit lifetime | ^ error[E0621]: explicit lifetime required in the type of `x` - --> $DIR/ex1-return-one-existing-name-if-else-using-impl-3.rs:18:36 + --> $DIR/ex1-return-one-existing-name-if-else-using-impl-3.rs:8:36 | LL | fn foo<'a>(&'a self, x: &i32) -> &i32 { | ---- help: add explicit lifetime `'a` to the type of `x`: `&'a i32` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.rs b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.rs index 3727ddf91298e..a1126d6bb1543 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { field: i32 } diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.stderr index 0ae98aeb8438d..15642be44b7ed 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.stderr @@ -1,5 +1,5 @@ error[E0621]: explicit lifetime required in the type of `x` - --> $DIR/ex1-return-one-existing-name-if-else-using-impl-3.rs:18:36 + --> $DIR/ex1-return-one-existing-name-if-else-using-impl-3.rs:8:36 | LL | fn foo<'a>(&'a self, x: &i32) -> &i32 { | ---- help: add explicit lifetime `'a` to the type of `x`: `&'a i32` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.nll.stderr index 4ce3a613c315e..038d9382b2675 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex1-return-one-existing-name-if-else-using-impl.rs:21:20 + --> $DIR/ex1-return-one-existing-name-if-else-using-impl.rs:11:20 | LL | if x > y { x } else { y } //~ ERROR lifetime mismatch | ^ error: unsatisfied lifetime constraints - --> $DIR/ex1-return-one-existing-name-if-else-using-impl.rs:21:20 + --> $DIR/ex1-return-one-existing-name-if-else-using-impl.rs:11:20 | LL | fn foo<'a>(x: &i32, y: &'a i32) -> &'a i32 { | -- - let's call the lifetime of this reference `'1` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.rs b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.rs index cec73d79ec21b..12024bd10800b 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn foo<'a>(x: &i32, y: &'a i32) -> &'a i32; diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.stderr index 0eb8afbb26b67..1eaa9c8339f7a 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/ex1-return-one-existing-name-if-else-using-impl.rs:21:20 + --> $DIR/ex1-return-one-existing-name-if-else-using-impl.rs:11:20 | LL | fn foo<'a>(x: &i32, y: &'a i32) -> &'a i32 { | ---- ------- diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else.nll.stderr index 5b4b28acee7c8..a91349a451a2b 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex1-return-one-existing-name-if-else.rs:12:27 + --> $DIR/ex1-return-one-existing-name-if-else.rs:2:27 | LL | if x > y { x } else { y } //~ ERROR explicit lifetime | ^ error[E0621]: explicit lifetime required in the type of `y` - --> $DIR/ex1-return-one-existing-name-if-else.rs:12:27 + --> $DIR/ex1-return-one-existing-name-if-else.rs:2:27 | LL | fn foo<'a>(x: &'a i32, y: &i32) -> &'a i32 { | ---- help: add explicit lifetime `'a` to the type of `y`: `&'a i32` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else.rs b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else.rs index 5ee2663317e96..f72d567bbd85f 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo<'a>(x: &'a i32, y: &i32) -> &'a i32 { if x > y { x } else { y } //~ ERROR explicit lifetime } diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else.stderr index b68b90e77dee5..d48adf1680806 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else.stderr @@ -1,5 +1,5 @@ error[E0621]: explicit lifetime required in the type of `y` - --> $DIR/ex1-return-one-existing-name-if-else.rs:12:27 + --> $DIR/ex1-return-one-existing-name-if-else.rs:2:27 | LL | fn foo<'a>(x: &'a i32, y: &i32) -> &'a i32 { | ---- help: add explicit lifetime `'a` to the type of `y`: `&'a i32` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.nll.stderr index 272ae0b12519a..0a37058423168 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex1-return-one-existing-name-return-type-is-anon.rs:18:5 + --> $DIR/ex1-return-one-existing-name-return-type-is-anon.rs:8:5 | LL | x //~ ERROR lifetime mismatch | ^ error: unsatisfied lifetime constraints - --> $DIR/ex1-return-one-existing-name-return-type-is-anon.rs:18:5 + --> $DIR/ex1-return-one-existing-name-return-type-is-anon.rs:8:5 | LL | fn foo<'a>(&self, x: &'a i32) -> &i32 { | -- - let's call the lifetime of this reference `'1` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.rs b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.rs index 4d57c61ba9e2e..ef5dd1160fb34 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { field: i32 } diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.stderr index b6dfdff60be22..f4b2efa8438c6 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/ex1-return-one-existing-name-return-type-is-anon.rs:18:5 + --> $DIR/ex1-return-one-existing-name-return-type-is-anon.rs:8:5 | LL | fn foo<'a>(&self, x: &'a i32) -> &i32 { | ------- ---- diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.nll.stderr index 2106546325b2d..2cb32f733a568 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex1-return-one-existing-name-self-is-anon.rs:18:30 + --> $DIR/ex1-return-one-existing-name-self-is-anon.rs:8:30 | LL | if true { x } else { self } //~ ERROR lifetime mismatch | ^^^^ error: unsatisfied lifetime constraints - --> $DIR/ex1-return-one-existing-name-self-is-anon.rs:18:30 + --> $DIR/ex1-return-one-existing-name-self-is-anon.rs:8:30 | LL | fn foo<'a>(&self, x: &'a Foo) -> &'a Foo { | -- - let's call the lifetime of this reference `'1` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.rs b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.rs index a6ccf4a53d155..597d20dbacd43 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { field: i32, } diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.stderr index 6c32adc11ce05..328c69bb65868 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/ex1-return-one-existing-name-self-is-anon.rs:18:30 + --> $DIR/ex1-return-one-existing-name-self-is-anon.rs:8:30 | LL | fn foo<'a>(&self, x: &'a Foo) -> &'a Foo { | ----- ------- diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1b-return-no-names-if-else.rs b/src/test/ui/lifetimes/lifetime-errors/ex1b-return-no-names-if-else.rs index 7f5b23728fd31..d1263a4acb28a 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1b-return-no-names-if-else.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex1b-return-no-names-if-else.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo(x: &i32, y: &i32) -> &i32 { //~ ERROR missing lifetime if x > y { x } else { y } } diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1b-return-no-names-if-else.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1b-return-no-names-if-else.stderr index 4710ebfa9679b..9fc1124685c59 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex1b-return-no-names-if-else.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex1b-return-no-names-if-else.stderr @@ -1,5 +1,5 @@ error[E0106]: missing lifetime specifier - --> $DIR/ex1b-return-no-names-if-else.rs:11:29 + --> $DIR/ex1b-return-no-names-if-else.rs:1:29 | LL | fn foo(x: &i32, y: &i32) -> &i32 { //~ ERROR missing lifetime | ^ expected lifetime parameter diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-2.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-2.nll.stderr index a5fa83266a3db..a92a3cb9d8606 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-2.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-2.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex2a-push-one-existing-name-2.rs:16:12 + --> $DIR/ex2a-push-one-existing-name-2.rs:6:12 | LL | y.push(x); //~ ERROR explicit lifetime | ^ error[E0621]: explicit lifetime required in the type of `x` - --> $DIR/ex2a-push-one-existing-name-2.rs:16:5 + --> $DIR/ex2a-push-one-existing-name-2.rs:6:5 | LL | fn foo<'a>(x: Ref, y: &mut Vec>) { | -------- help: add explicit lifetime `'a` to the type of `x`: `Ref<'a, i32>` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-2.rs b/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-2.rs index f35a7555d708b..998a48ce20c26 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-2.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Ref<'a, T: 'a> { data: &'a T } diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-2.stderr b/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-2.stderr index 6f0a5179d6b0a..3df29e62a283b 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-2.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-2.stderr @@ -1,5 +1,5 @@ error[E0621]: explicit lifetime required in the type of `x` - --> $DIR/ex2a-push-one-existing-name-2.rs:16:12 + --> $DIR/ex2a-push-one-existing-name-2.rs:6:12 | LL | fn foo<'a>(x: Ref, y: &mut Vec>) { | -------- help: add explicit lifetime `'a` to the type of `x`: `Ref<'a, i32>` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-early-bound.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-early-bound.nll.stderr index c5f3510fa0ed2..b9e004afcdac3 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-early-bound.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-early-bound.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex2a-push-one-existing-name-early-bound.rs:17:12 + --> $DIR/ex2a-push-one-existing-name-early-bound.rs:8:12 | LL | x.push(y); //~ ERROR explicit lifetime required | ^ error[E0282]: type annotations needed - --> $DIR/ex2a-push-one-existing-name-early-bound.rs:20:9 + --> $DIR/ex2a-push-one-existing-name-early-bound.rs:11:9 | LL | let x = baz; | - ^^^ cannot infer type for `T` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-early-bound.rs b/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-early-bound.rs index 18a720f345d7f..6d4eda99f7af7 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-early-bound.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-early-bound.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. trait Foo<'a> {} impl<'a, T> Foo<'a> for T {} diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-early-bound.stderr b/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-early-bound.stderr index a8286ba2952fc..0fd085c39f282 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-early-bound.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-early-bound.stderr @@ -1,5 +1,5 @@ error[E0621]: explicit lifetime required in the type of `y` - --> $DIR/ex2a-push-one-existing-name-early-bound.rs:17:12 + --> $DIR/ex2a-push-one-existing-name-early-bound.rs:8:12 | LL | fn baz<'a, 'b, T>(x: &mut Vec<&'a T>, y: &T) | -- help: add explicit lifetime `'a` to the type of `y`: `&'a T` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name.nll.stderr index 294a9106619a0..3197a65d37c83 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex2a-push-one-existing-name.rs:16:12 + --> $DIR/ex2a-push-one-existing-name.rs:6:12 | LL | x.push(y); //~ ERROR explicit lifetime | ^ error[E0621]: explicit lifetime required in the type of `y` - --> $DIR/ex2a-push-one-existing-name.rs:16:5 + --> $DIR/ex2a-push-one-existing-name.rs:6:5 | LL | fn foo<'a>(x: &mut Vec>, y: Ref) { | -------- help: add explicit lifetime `'a` to the type of `y`: `Ref<'a, i32>` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name.rs b/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name.rs index 1834395bd3b82..5188ea1cc9cb0 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Ref<'a, T: 'a> { data: &'a T } diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name.stderr b/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name.stderr index ebe465aa58152..a669e33ab098e 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name.stderr @@ -1,5 +1,5 @@ error[E0621]: explicit lifetime required in the type of `y` - --> $DIR/ex2a-push-one-existing-name.rs:16:12 + --> $DIR/ex2a-push-one-existing-name.rs:6:12 | LL | fn foo<'a>(x: &mut Vec>, y: Ref) { | -------- help: add explicit lifetime `'a` to the type of `y`: `Ref<'a, i32>` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2b-push-no-existing-names.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex2b-push-no-existing-names.nll.stderr index b7c252cac9bc7..59f867693b835 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex2b-push-no-existing-names.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex2b-push-no-existing-names.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex2b-push-no-existing-names.rs:16:12 + --> $DIR/ex2b-push-no-existing-names.rs:6:12 | LL | x.push(y); //~ ERROR lifetime mismatch | ^ error: unsatisfied lifetime constraints - --> $DIR/ex2b-push-no-existing-names.rs:16:5 + --> $DIR/ex2b-push-no-existing-names.rs:6:5 | LL | fn foo(x: &mut Vec>, y: Ref) { | - - has type `Ref<'1, i32>` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2b-push-no-existing-names.rs b/src/test/ui/lifetimes/lifetime-errors/ex2b-push-no-existing-names.rs index 6cf626adf82e3..82e0c9bc26e89 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex2b-push-no-existing-names.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex2b-push-no-existing-names.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Ref<'a, T: 'a> { data: &'a T } diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2b-push-no-existing-names.stderr b/src/test/ui/lifetimes/lifetime-errors/ex2b-push-no-existing-names.stderr index 9884c0f351162..7ac61df495486 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex2b-push-no-existing-names.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex2b-push-no-existing-names.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/ex2b-push-no-existing-names.rs:16:12 + --> $DIR/ex2b-push-no-existing-names.rs:6:12 | LL | fn foo(x: &mut Vec>, y: Ref) { | -------- -------- these two types are declared with different lifetimes... diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2c-push-inference-variable.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex2c-push-inference-variable.nll.stderr index c34278b4d9fa1..58e5220ad833f 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex2c-push-inference-variable.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex2c-push-inference-variable.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex2c-push-inference-variable.rs:16:13 + --> $DIR/ex2c-push-inference-variable.rs:6:13 | LL | let z = Ref { data: y.data }; | ^^^ error: unsatisfied lifetime constraints - --> $DIR/ex2c-push-inference-variable.rs:17:5 + --> $DIR/ex2c-push-inference-variable.rs:7:5 | LL | fn foo<'a, 'b, 'c>(x: &'a mut Vec>, y: Ref<'c, i32>) { | -- -- lifetime `'c` defined here diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2c-push-inference-variable.rs b/src/test/ui/lifetimes/lifetime-errors/ex2c-push-inference-variable.rs index 36bd1c32286e1..7f15aee5f08e4 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex2c-push-inference-variable.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex2c-push-inference-variable.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Ref<'a, T: 'a> { data: &'a T } diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2c-push-inference-variable.stderr b/src/test/ui/lifetimes/lifetime-errors/ex2c-push-inference-variable.stderr index 114024c2fb02e..bfa9c0d15f0f9 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex2c-push-inference-variable.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex2c-push-inference-variable.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/ex2c-push-inference-variable.rs:17:12 + --> $DIR/ex2c-push-inference-variable.rs:7:12 | LL | fn foo<'a, 'b, 'c>(x: &'a mut Vec>, y: Ref<'c, i32>) { | ------------ ------------ these two types are declared with different lifetimes... diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2d-push-inference-variable-2.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex2d-push-inference-variable-2.nll.stderr index 3097d18e86c67..dc3e38be188cf 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex2d-push-inference-variable-2.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex2d-push-inference-variable-2.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex2d-push-inference-variable-2.rs:17:13 + --> $DIR/ex2d-push-inference-variable-2.rs:7:13 | LL | let b = Ref { data: y.data }; | ^^^ error: unsatisfied lifetime constraints - --> $DIR/ex2d-push-inference-variable-2.rs:18:5 + --> $DIR/ex2d-push-inference-variable-2.rs:8:5 | LL | fn foo<'a, 'b, 'c>(x: &'a mut Vec>, y: Ref<'c, i32>) { | -- -- lifetime `'c` defined here diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2d-push-inference-variable-2.rs b/src/test/ui/lifetimes/lifetime-errors/ex2d-push-inference-variable-2.rs index 96316819e937f..ee77d9e7fde1a 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex2d-push-inference-variable-2.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex2d-push-inference-variable-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Ref<'a, T: 'a> { data: &'a T } diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2d-push-inference-variable-2.stderr b/src/test/ui/lifetimes/lifetime-errors/ex2d-push-inference-variable-2.stderr index 32fc8b42f42e6..2db81f8aba6e8 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex2d-push-inference-variable-2.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex2d-push-inference-variable-2.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/ex2d-push-inference-variable-2.rs:16:33 + --> $DIR/ex2d-push-inference-variable-2.rs:6:33 | LL | fn foo<'a, 'b, 'c>(x: &'a mut Vec>, y: Ref<'c, i32>) { | ------------ ------------ these two types are declared with different lifetimes... diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2e-push-inference-variable-3.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex2e-push-inference-variable-3.nll.stderr index ce0e9be300698..9aa0364aeec0b 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex2e-push-inference-variable-3.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex2e-push-inference-variable-3.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex2e-push-inference-variable-3.rs:17:13 + --> $DIR/ex2e-push-inference-variable-3.rs:7:13 | LL | let b = Ref { data: y.data }; | ^^^ error: unsatisfied lifetime constraints - --> $DIR/ex2e-push-inference-variable-3.rs:18:5 + --> $DIR/ex2e-push-inference-variable-3.rs:8:5 | LL | fn foo<'a, 'b, 'c>(x: &'a mut Vec>, y: Ref<'c, i32>) { | -- -- lifetime `'c` defined here diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2e-push-inference-variable-3.rs b/src/test/ui/lifetimes/lifetime-errors/ex2e-push-inference-variable-3.rs index 9352ebc77f5b2..e2a795a071ced 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex2e-push-inference-variable-3.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex2e-push-inference-variable-3.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Ref<'a, T: 'a> { data: &'a T } diff --git a/src/test/ui/lifetimes/lifetime-errors/ex2e-push-inference-variable-3.stderr b/src/test/ui/lifetimes/lifetime-errors/ex2e-push-inference-variable-3.stderr index f62848ffa8c13..85a6dba928932 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex2e-push-inference-variable-3.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex2e-push-inference-variable-3.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/ex2e-push-inference-variable-3.rs:16:33 + --> $DIR/ex2e-push-inference-variable-3.rs:6:33 | LL | fn foo<'a, 'b, 'c>(x: &'a mut Vec>, y: Ref<'c, i32>) { | ------------ ------------ these two types are declared with different lifetimes... diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-2.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-2.nll.stderr index c7f1a0ede3c1c..1a14ad9879690 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-2.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-2.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex3-both-anon-regions-2.rs:12:10 + --> $DIR/ex3-both-anon-regions-2.rs:2:10 | LL | *v = x; //~ ERROR lifetime mismatch | ^ error: unsatisfied lifetime constraints - --> $DIR/ex3-both-anon-regions-2.rs:12:5 + --> $DIR/ex3-both-anon-regions-2.rs:2:5 | LL | fn foo(&mut (ref mut v, w): &mut (&u8, &u8), x: &u8) { | - - let's call the lifetime of this reference `'1` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-2.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-2.rs index 62d7d56f9f703..1ff96aadd9387 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-2.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo(&mut (ref mut v, w): &mut (&u8, &u8), x: &u8) { *v = x; //~ ERROR lifetime mismatch } diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-2.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-2.stderr index 5e110b43fb4a8..b8f97d145772b 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-2.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-2.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/ex3-both-anon-regions-2.rs:12:10 + --> $DIR/ex3-both-anon-regions-2.rs:2:10 | LL | fn foo(&mut (ref mut v, w): &mut (&u8, &u8), x: &u8) { | --- --- these two types are declared with different lifetimes... diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-3.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-3.nll.stderr index 09980e44c52d6..461b5aa92c373 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-3.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-3.nll.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/ex3-both-anon-regions-3.rs:12:13 + --> $DIR/ex3-both-anon-regions-3.rs:2:13 | LL | z.push((x,y)); //~ ERROR lifetime mismatch | ^ warning: not reporting region error due to nll - --> $DIR/ex3-both-anon-regions-3.rs:12:15 + --> $DIR/ex3-both-anon-regions-3.rs:2:15 | LL | z.push((x,y)); //~ ERROR lifetime mismatch | ^ error: unsatisfied lifetime constraints - --> $DIR/ex3-both-anon-regions-3.rs:12:5 + --> $DIR/ex3-both-anon-regions-3.rs:2:5 | LL | fn foo(z: &mut Vec<(&u8,&u8)>, (x, y): (&u8, &u8)) { | - - let's call the lifetime of this reference `'1` @@ -21,7 +21,7 @@ LL | z.push((x,y)); //~ ERROR lifetime mismatch | ^^^^^^^^^^^^^ argument requires that `'1` must outlive `'2` error: unsatisfied lifetime constraints - --> $DIR/ex3-both-anon-regions-3.rs:12:5 + --> $DIR/ex3-both-anon-regions-3.rs:2:5 | LL | fn foo(z: &mut Vec<(&u8,&u8)>, (x, y): (&u8, &u8)) { | - - let's call the lifetime of this reference `'1` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-3.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-3.rs index fe6b40c05a603..c04b5d3a3eb71 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-3.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-3.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo(z: &mut Vec<(&u8,&u8)>, (x, y): (&u8, &u8)) { z.push((x,y)); //~ ERROR lifetime mismatch //~^ ERROR lifetime mismatch diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-3.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-3.stderr index 5a584296d3ba9..acfe809b6785b 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-3.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-3.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/ex3-both-anon-regions-3.rs:12:13 + --> $DIR/ex3-both-anon-regions-3.rs:2:13 | LL | fn foo(z: &mut Vec<(&u8,&u8)>, (x, y): (&u8, &u8)) { | --- --- these two types are declared with different lifetimes... @@ -7,7 +7,7 @@ LL | z.push((x,y)); //~ ERROR lifetime mismatch | ^ ...but data flows into `z` here error[E0623]: lifetime mismatch - --> $DIR/ex3-both-anon-regions-3.rs:12:15 + --> $DIR/ex3-both-anon-regions-3.rs:2:15 | LL | fn foo(z: &mut Vec<(&u8,&u8)>, (x, y): (&u8, &u8)) { | --- --- these two types are declared with different lifetimes... diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.nll.stderr index 618817fd57b31..99aa74ab25d26 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex3-both-anon-regions-both-are-structs-2.rs:16:11 + --> $DIR/ex3-both-anon-regions-both-are-structs-2.rs:7:11 | LL | x.b = y.b; //~ ERROR lifetime mismatch | ^^^ error: unsatisfied lifetime constraints - --> $DIR/ex3-both-anon-regions-both-are-structs-2.rs:16:5 + --> $DIR/ex3-both-anon-regions-both-are-structs-2.rs:7:5 | LL | fn foo(mut x: Ref, y: Ref) { | ----- - has type `Ref<'_, '1>` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.rs index f16120ddc22a0..94bb80924073b 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. struct Ref<'a, 'b> { a: &'a u32, b: &'b u32, diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.stderr index 158f40f2969a4..cb1ca5e1485b0 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/ex3-both-anon-regions-both-are-structs-2.rs:16:11 + --> $DIR/ex3-both-anon-regions-both-are-structs-2.rs:7:11 | LL | fn foo(mut x: Ref, y: Ref) { | --- --- these two types are declared with different lifetimes... diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.nll.stderr index b4767afd4138a..fdb2609f141f1 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex3-both-anon-regions-both-are-structs-3.rs:16:11 + --> $DIR/ex3-both-anon-regions-both-are-structs-3.rs:7:11 | LL | x.a = x.b; //~ ERROR lifetime mismatch | ^^^ error: unsatisfied lifetime constraints - --> $DIR/ex3-both-anon-regions-both-are-structs-3.rs:16:5 + --> $DIR/ex3-both-anon-regions-both-are-structs-3.rs:7:5 | LL | fn foo(mut x: Ref) { | ----- diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.rs index 78e6dc2d3e75f..3b22aef6f3242 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. struct Ref<'a, 'b> { a: &'a u32, b: &'b u32, diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.stderr index 546789eedcb98..863ec9806fca1 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/ex3-both-anon-regions-both-are-structs-3.rs:16:11 + --> $DIR/ex3-both-anon-regions-both-are-structs-3.rs:7:11 | LL | fn foo(mut x: Ref) { | --- diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.nll.stderr index e2fcbaa4c3c55..2e166beac3731 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex3-both-anon-regions-both-are-structs-4.rs:16:11 + --> $DIR/ex3-both-anon-regions-both-are-structs-4.rs:7:11 | LL | x.a = x.b; //~ ERROR lifetime mismatch | ^^^ error: unsatisfied lifetime constraints - --> $DIR/ex3-both-anon-regions-both-are-structs-4.rs:16:5 + --> $DIR/ex3-both-anon-regions-both-are-structs-4.rs:7:5 | LL | fn foo(mut x: Ref) { | ----- diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.rs index 78e6dc2d3e75f..3b22aef6f3242 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. struct Ref<'a, 'b> { a: &'a u32, b: &'b u32, diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.stderr index ccc5e02ab704c..e75ad98d6eb44 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/ex3-both-anon-regions-both-are-structs-4.rs:16:11 + --> $DIR/ex3-both-anon-regions-both-are-structs-4.rs:7:11 | LL | fn foo(mut x: Ref) { | --- diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.nll.stderr index aed0dcc1a67ea..767bc1ea35154 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex3-both-anon-regions-both-are-structs-earlybound-regions.rs:18:12 + --> $DIR/ex3-both-anon-regions-both-are-structs-earlybound-regions.rs:9:12 | LL | x.push(y); //~ ERROR lifetime mismatch | ^ error: unsatisfied lifetime constraints - --> $DIR/ex3-both-anon-regions-both-are-structs-earlybound-regions.rs:18:5 + --> $DIR/ex3-both-anon-regions-both-are-structs-earlybound-regions.rs:9:5 | LL | fn foo<'a, 'b>(mut x: Vec>, y: Ref<'b>) | -- -- lifetime `'b` defined here diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.rs index ffec0e8d5bbb6..87f9cc17726cd 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. struct Ref<'a> { x: &'a u32, } diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.stderr index f69bcb6429782..57174385b4dd8 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/ex3-both-anon-regions-both-are-structs-earlybound-regions.rs:18:12 + --> $DIR/ex3-both-anon-regions-both-are-structs-earlybound-regions.rs:9:12 | LL | fn foo<'a, 'b>(mut x: Vec>, y: Ref<'b>) | ------- ------- these two types are declared with different lifetimes... diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.nll.stderr index 7790d37d1c40d..6665e0d554a32 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex3-both-anon-regions-both-are-structs-latebound-regions.rs:15:12 + --> $DIR/ex3-both-anon-regions-both-are-structs-latebound-regions.rs:6:12 | LL | x.push(y); //~ ERROR lifetime mismatch | ^ error: unsatisfied lifetime constraints - --> $DIR/ex3-both-anon-regions-both-are-structs-latebound-regions.rs:15:5 + --> $DIR/ex3-both-anon-regions-both-are-structs-latebound-regions.rs:6:5 | LL | fn foo<'a, 'b>(mut x: Vec>, y: Ref<'b>) { | -- -- lifetime `'b` defined here diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.rs index 16d18f309516c..4be76c2a0da54 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. struct Ref<'a> { x: &'a u32, } diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.stderr index f9530c436a0a9..caa7397979bce 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/ex3-both-anon-regions-both-are-structs-latebound-regions.rs:15:12 + --> $DIR/ex3-both-anon-regions-both-are-structs-latebound-regions.rs:6:12 | LL | fn foo<'a, 'b>(mut x: Vec>, y: Ref<'b>) { | ------- ------- these two types are declared with different lifetimes... diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs.nll.stderr index 79f1a8c0ccf7d..22da662687fd9 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex3-both-anon-regions-both-are-structs.rs:15:12 + --> $DIR/ex3-both-anon-regions-both-are-structs.rs:6:12 | LL | x.push(y); //~ ERROR lifetime mismatch | ^ error: unsatisfied lifetime constraints - --> $DIR/ex3-both-anon-regions-both-are-structs.rs:15:5 + --> $DIR/ex3-both-anon-regions-both-are-structs.rs:6:5 | LL | fn foo(mut x: Vec, y: Ref) { | ----- - has type `Ref<'1>` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs.rs index 3b90b3474a140..8fbb405a23d95 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. struct Ref<'a> { x: &'a u32, } diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs.stderr index 243103e2d1802..27d5f5da7e537 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/ex3-both-anon-regions-both-are-structs.rs:15:12 + --> $DIR/ex3-both-anon-regions-both-are-structs.rs:6:12 | LL | fn foo(mut x: Vec, y: Ref) { | --- --- these two types are declared with different lifetimes... diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-latebound-regions.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-latebound-regions.nll.stderr index 459a93813a8ca..01986f7e5050b 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-latebound-regions.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-latebound-regions.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex3-both-anon-regions-latebound-regions.rs:12:12 + --> $DIR/ex3-both-anon-regions-latebound-regions.rs:2:12 | LL | x.push(y); //~ ERROR lifetime mismatch | ^ error: unsatisfied lifetime constraints - --> $DIR/ex3-both-anon-regions-latebound-regions.rs:12:5 + --> $DIR/ex3-both-anon-regions-latebound-regions.rs:2:5 | LL | fn foo<'a,'b>(x: &mut Vec<&'a u8>, y: &'b u8) { | -- -- lifetime `'b` defined here diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-latebound-regions.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-latebound-regions.rs index 966b4f0b6c329..7938d11a90532 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-latebound-regions.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-latebound-regions.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo<'a,'b>(x: &mut Vec<&'a u8>, y: &'b u8) { x.push(y); //~ ERROR lifetime mismatch } diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-latebound-regions.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-latebound-regions.stderr index c4dd282343176..97da7f8ac6df8 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-latebound-regions.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-latebound-regions.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/ex3-both-anon-regions-latebound-regions.rs:12:12 + --> $DIR/ex3-both-anon-regions-latebound-regions.rs:2:12 | LL | fn foo<'a,'b>(x: &mut Vec<&'a u8>, y: &'b u8) { | ------ ------ these two types are declared with different lifetimes... diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.nll.stderr index 0bacd894e6e9a..d5c60bcb1afe3 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex3-both-anon-regions-one-is-struct-2.rs:14:9 + --> $DIR/ex3-both-anon-regions-one-is-struct-2.rs:4:9 | LL | y = x.b; //~ ERROR lifetime mismatch | ^^^ error: unsatisfied lifetime constraints - --> $DIR/ex3-both-anon-regions-one-is-struct-2.rs:14:5 + --> $DIR/ex3-both-anon-regions-one-is-struct-2.rs:4:5 | LL | fn foo(mut x: Ref, y: &u32) { | ----- - let's call the lifetime of this reference `'2` @@ -15,7 +15,7 @@ LL | y = x.b; //~ ERROR lifetime mismatch | ^^^^^^^ requires that `'1` must outlive `'2` error[E0384]: cannot assign to immutable argument `y` - --> $DIR/ex3-both-anon-regions-one-is-struct-2.rs:14:5 + --> $DIR/ex3-both-anon-regions-one-is-struct-2.rs:4:5 | LL | fn foo(mut x: Ref, y: &u32) { | - consider changing this to `mut y` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.rs index 055c3f804685a..1e6425cf5ca9d 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Ref<'a, 'b> { a: &'a u32, b: &'b u32 } fn foo(mut x: Ref, y: &u32) { diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.stderr index 52293e453061f..8c4e3daed4cae 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/ex3-both-anon-regions-one-is-struct-2.rs:14:9 + --> $DIR/ex3-both-anon-regions-one-is-struct-2.rs:4:9 | LL | fn foo(mut x: Ref, y: &u32) { | --- ---- diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.nll.stderr index f40c67b8d114c..d9d0a8166f153 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex3-both-anon-regions-one-is-struct-3.rs:14:11 + --> $DIR/ex3-both-anon-regions-one-is-struct-3.rs:4:11 | LL | y.b = x; //~ ERROR lifetime mismatch | ^ error: unsatisfied lifetime constraints - --> $DIR/ex3-both-anon-regions-one-is-struct-3.rs:14:5 + --> $DIR/ex3-both-anon-regions-one-is-struct-3.rs:4:5 | LL | fn foo(mut y: Ref, x: &u32) { | ----- - let's call the lifetime of this reference `'1` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.rs index 474da4a7d1613..02838362c80a7 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Ref<'a, 'b> { a: &'a u32, b: &'b u32 } fn foo(mut y: Ref, x: &u32) { diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.stderr index b5d10e573c4e1..b443707bbae4c 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/ex3-both-anon-regions-one-is-struct-3.rs:14:11 + --> $DIR/ex3-both-anon-regions-one-is-struct-3.rs:4:11 | LL | fn foo(mut y: Ref, x: &u32) { | --- ---- these two types are declared with different lifetimes... diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.nll.stderr index f9168dcf5837b..6388e1d4ab837 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex3-both-anon-regions-one-is-struct-4.rs:14:11 + --> $DIR/ex3-both-anon-regions-one-is-struct-4.rs:4:11 | LL | y.b = x; //~ ERROR lifetime mismatch | ^ error: unsatisfied lifetime constraints - --> $DIR/ex3-both-anon-regions-one-is-struct-4.rs:14:5 + --> $DIR/ex3-both-anon-regions-one-is-struct-4.rs:4:5 | LL | fn foo(mut y: Ref, x: &u32) { | ----- - let's call the lifetime of this reference `'1` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.rs index 474da4a7d1613..02838362c80a7 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Ref<'a, 'b> { a: &'a u32, b: &'b u32 } fn foo(mut y: Ref, x: &u32) { diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.stderr index 089132995206f..77d43cd17c8fd 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/ex3-both-anon-regions-one-is-struct-4.rs:14:11 + --> $DIR/ex3-both-anon-regions-one-is-struct-4.rs:4:11 | LL | fn foo(mut y: Ref, x: &u32) { | --- ---- these two types are declared with different lifetimes... diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct.nll.stderr index c43f847723240..74be42d875b50 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex3-both-anon-regions-one-is-struct.rs:17:11 + --> $DIR/ex3-both-anon-regions-one-is-struct.rs:7:11 | LL | x.b = y; //~ ERROR lifetime mismatch | ^ error: unsatisfied lifetime constraints - --> $DIR/ex3-both-anon-regions-one-is-struct.rs:17:5 + --> $DIR/ex3-both-anon-regions-one-is-struct.rs:7:5 | LL | fn foo(mut x: Ref, y: &u32) { | ----- - let's call the lifetime of this reference `'1` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct.rs index 1ffaec7ba00d3..7c827510be8ae 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Ref<'a, 'b> { a: &'a u32, b: &'b u32, diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct.stderr index 133611ae48940..eef3aa50e0f2e 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/ex3-both-anon-regions-one-is-struct.rs:17:11 + --> $DIR/ex3-both-anon-regions-one-is-struct.rs:7:11 | LL | fn foo(mut x: Ref, y: &u32) { | --- ---- these two types are declared with different lifetimes... diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.nll.stderr index 9680e8c2f6935..e9131dfb3f429 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex3-both-anon-regions-return-type-is-anon.rs:17:5 + --> $DIR/ex3-both-anon-regions-return-type-is-anon.rs:7:5 | LL | x //~ ERROR lifetime mismatch | ^ error: unsatisfied lifetime constraints - --> $DIR/ex3-both-anon-regions-return-type-is-anon.rs:17:5 + --> $DIR/ex3-both-anon-regions-return-type-is-anon.rs:7:5 | LL | fn foo<'a>(&self, x: &i32) -> &i32 { | - - let's call the lifetime of this reference `'1` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.rs index 97af35980105d..09852403d934a 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { field: i32 } diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.stderr index 01ea885b63ea4..917b90fd47f90 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/ex3-both-anon-regions-return-type-is-anon.rs:17:5 + --> $DIR/ex3-both-anon-regions-return-type-is-anon.rs:7:5 | LL | fn foo<'a>(&self, x: &i32) -> &i32 { | ---- ---- diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-self-is-anon.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-self-is-anon.nll.stderr index 6fbe8e982093e..f0f7bca72d4c4 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-self-is-anon.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-self-is-anon.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex3-both-anon-regions-self-is-anon.rs:17:19 + --> $DIR/ex3-both-anon-regions-self-is-anon.rs:7:19 | LL | if true { x } else { self } //~ ERROR lifetime mismatch | ^ error: unsatisfied lifetime constraints - --> $DIR/ex3-both-anon-regions-self-is-anon.rs:17:19 + --> $DIR/ex3-both-anon-regions-self-is-anon.rs:7:19 | LL | fn foo<'a>(&self, x: &Foo) -> &Foo { | - - let's call the lifetime of this reference `'1` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-self-is-anon.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-self-is-anon.rs index e6f4f0966ca62..33aa199938f83 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-self-is-anon.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-self-is-anon.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { field: i32, } diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-self-is-anon.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-self-is-anon.stderr index aa5ab5402959c..a2ba41ef4f09a 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-self-is-anon.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-self-is-anon.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/ex3-both-anon-regions-self-is-anon.rs:17:19 + --> $DIR/ex3-both-anon-regions-self-is-anon.rs:7:19 | LL | fn foo<'a>(&self, x: &Foo) -> &Foo { | ---- ---- diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-fn-items.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-fn-items.nll.stderr index 2829ec3500043..b689319a40102 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-fn-items.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-fn-items.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex3-both-anon-regions-using-fn-items.rs:11:10 + --> $DIR/ex3-both-anon-regions-using-fn-items.rs:2:10 | LL | y.push(z); //~ ERROR lifetime mismatch | ^ error[E0596]: cannot borrow `y` as mutable, as it is not declared as mutable - --> $DIR/ex3-both-anon-regions-using-fn-items.rs:11:3 + --> $DIR/ex3-both-anon-regions-using-fn-items.rs:2:3 | LL | fn foo(x:fn(&u8, &u8), y: Vec<&u8>, z: &u8) { | - help: consider changing this to be mutable: `mut y` @@ -13,7 +13,7 @@ LL | y.push(z); //~ ERROR lifetime mismatch | ^ cannot borrow as mutable error: unsatisfied lifetime constraints - --> $DIR/ex3-both-anon-regions-using-fn-items.rs:11:3 + --> $DIR/ex3-both-anon-regions-using-fn-items.rs:2:3 | LL | fn foo(x:fn(&u8, &u8), y: Vec<&u8>, z: &u8) { | - - let's call the lifetime of this reference `'1` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-fn-items.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-fn-items.rs index db53acf5afceb..f9f1a75df5863 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-fn-items.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-fn-items.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. fn foo(x:fn(&u8, &u8), y: Vec<&u8>, z: &u8) { y.push(z); //~ ERROR lifetime mismatch } diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-fn-items.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-fn-items.stderr index 8a9ee9a05b810..43e54d640859d 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-fn-items.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-fn-items.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/ex3-both-anon-regions-using-fn-items.rs:11:10 + --> $DIR/ex3-both-anon-regions-using-fn-items.rs:2:10 | LL | fn foo(x:fn(&u8, &u8), y: Vec<&u8>, z: &u8) { | --- --- these two types are declared with different lifetimes... diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-impl-items.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-impl-items.nll.stderr index 44d68df4b5590..67eb68fa268db 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-impl-items.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-impl-items.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex3-both-anon-regions-using-impl-items.rs:15:16 + --> $DIR/ex3-both-anon-regions-using-impl-items.rs:6:16 | LL | x.push(y); //~ ERROR lifetime mismatch | ^ error: unsatisfied lifetime constraints - --> $DIR/ex3-both-anon-regions-using-impl-items.rs:15:9 + --> $DIR/ex3-both-anon-regions-using-impl-items.rs:6:9 | LL | fn foo(x: &mut Vec<&u8>, y: &u8) { | - - let's call the lifetime of this reference `'1` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-impl-items.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-impl-items.rs index b3ef06f189897..6f95d5a710dfb 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-impl-items.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-impl-items.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. trait Foo { fn foo<'a>(x: &mut Vec<&u8>, y: &u8); } diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-impl-items.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-impl-items.stderr index 65c9ea4e757ff..39896a3c8a059 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-impl-items.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-impl-items.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/ex3-both-anon-regions-using-impl-items.rs:15:16 + --> $DIR/ex3-both-anon-regions-using-impl-items.rs:6:16 | LL | fn foo(x: &mut Vec<&u8>, y: &u8) { | --- --- these two types are declared with different lifetimes... diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-trait-objects.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-trait-objects.nll.stderr index 5d3c6f38ad808..d69f6e354db95 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-trait-objects.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-trait-objects.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex3-both-anon-regions-using-trait-objects.rs:11:10 + --> $DIR/ex3-both-anon-regions-using-trait-objects.rs:2:10 | LL | y.push(z); //~ ERROR lifetime mismatch | ^ error[E0596]: cannot borrow `y` as mutable, as it is not declared as mutable - --> $DIR/ex3-both-anon-regions-using-trait-objects.rs:11:3 + --> $DIR/ex3-both-anon-regions-using-trait-objects.rs:2:3 | LL | fn foo(x:Box , y: Vec<&u8>, z: &u8) { | - help: consider changing this to be mutable: `mut y` @@ -13,7 +13,7 @@ LL | y.push(z); //~ ERROR lifetime mismatch | ^ cannot borrow as mutable error: unsatisfied lifetime constraints - --> $DIR/ex3-both-anon-regions-using-trait-objects.rs:11:3 + --> $DIR/ex3-both-anon-regions-using-trait-objects.rs:2:3 | LL | fn foo(x:Box , y: Vec<&u8>, z: &u8) { | - - let's call the lifetime of this reference `'1` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-trait-objects.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-trait-objects.rs index ebde6a3b53ff6..324a5846c94ae 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-trait-objects.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-trait-objects.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. fn foo(x:Box , y: Vec<&u8>, z: &u8) { y.push(z); //~ ERROR lifetime mismatch } diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-trait-objects.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-trait-objects.stderr index 43ca5cd603f13..46eca5ea64f6c 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-trait-objects.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-trait-objects.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/ex3-both-anon-regions-using-trait-objects.rs:11:10 + --> $DIR/ex3-both-anon-regions-using-trait-objects.rs:2:10 | LL | fn foo(x:Box , y: Vec<&u8>, z: &u8) { | --- --- these two types are declared with different lifetimes... diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions.nll.stderr index 6460e5d687ff0..79f9441e5e1e8 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions.nll.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ex3-both-anon-regions.rs:12:12 + --> $DIR/ex3-both-anon-regions.rs:2:12 | LL | x.push(y); //~ ERROR lifetime mismatch | ^ error: unsatisfied lifetime constraints - --> $DIR/ex3-both-anon-regions.rs:12:5 + --> $DIR/ex3-both-anon-regions.rs:2:5 | LL | fn foo(x: &mut Vec<&u8>, y: &u8) { | - - let's call the lifetime of this reference `'1` diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions.rs index f88eca494eb5a..44195dadbb9f1 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions.rs +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo(x: &mut Vec<&u8>, y: &u8) { x.push(y); //~ ERROR lifetime mismatch } diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions.stderr index 57187a47239c2..07d6cafd63395 100644 --- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/ex3-both-anon-regions.rs:12:12 + --> $DIR/ex3-both-anon-regions.rs:2:12 | LL | fn foo(x: &mut Vec<&u8>, y: &u8) { | --- --- these two types are declared with different lifetimes... diff --git a/src/test/ui/lifetimes/lifetime-errors/liveness-assign-imm-local-notes.rs b/src/test/ui/lifetimes/lifetime-errors/liveness-assign-imm-local-notes.rs index 6b0ca2ce9e004..99949e17b6f4a 100644 --- a/src/test/ui/lifetimes/lifetime-errors/liveness-assign-imm-local-notes.rs +++ b/src/test/ui/lifetimes/lifetime-errors/liveness-assign-imm-local-notes.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // FIXME: Change to UI Test // Check notes are placed on an assignment that can actually precede the current assignment // Don't emit a first assignment for assignment in a loop. diff --git a/src/test/ui/lifetimes/lifetime-errors/liveness-assign-imm-local-notes.stderr b/src/test/ui/lifetimes/lifetime-errors/liveness-assign-imm-local-notes.stderr index 0620235371a39..3fb5dbaa49a03 100644 --- a/src/test/ui/lifetimes/lifetime-errors/liveness-assign-imm-local-notes.stderr +++ b/src/test/ui/lifetimes/lifetime-errors/liveness-assign-imm-local-notes.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `x` (Ast) - --> $DIR/liveness-assign-imm-local-notes.rs:23:9 + --> $DIR/liveness-assign-imm-local-notes.rs:13:9 | LL | x = 2; | ----- first assignment to `x` @@ -7,7 +7,7 @@ LL | x = 3; //~ ERROR (Ast) [E0384] | ^^^^^ cannot assign twice to immutable variable error[E0384]: cannot assign twice to immutable variable `x` (Ast) - --> $DIR/liveness-assign-imm-local-notes.rs:35:13 + --> $DIR/liveness-assign-imm-local-notes.rs:25:13 | LL | x = 2; | ----- first assignment to `x` @@ -15,13 +15,13 @@ LL | x = 3; //~ ERROR (Ast) [E0384] | ^^^^^ cannot assign twice to immutable variable error[E0384]: cannot assign twice to immutable variable `x` (Ast) - --> $DIR/liveness-assign-imm-local-notes.rs:45:13 + --> $DIR/liveness-assign-imm-local-notes.rs:35:13 | LL | x = 1; //~ ERROR (Ast) [E0384] | ^^^^^ cannot assign twice to immutable variable error[E0384]: cannot assign twice to immutable variable `x` (Ast) - --> $DIR/liveness-assign-imm-local-notes.rs:48:13 + --> $DIR/liveness-assign-imm-local-notes.rs:38:13 | LL | x = 1; //~ ERROR (Ast) [E0384] | ----- first assignment to `x` @@ -30,7 +30,7 @@ LL | x = 2; //~ ERROR (Ast) [E0384] | ^^^^^ cannot assign twice to immutable variable error[E0384]: cannot assign twice to immutable variable `x` (Mir) - --> $DIR/liveness-assign-imm-local-notes.rs:23:9 + --> $DIR/liveness-assign-imm-local-notes.rs:13:9 | LL | let x; | - consider changing this to `mut x` @@ -41,7 +41,7 @@ LL | x = 3; //~ ERROR (Ast) [E0384] | ^^^^^ cannot assign twice to immutable variable error[E0384]: cannot assign twice to immutable variable `x` (Mir) - --> $DIR/liveness-assign-imm-local-notes.rs:35:13 + --> $DIR/liveness-assign-imm-local-notes.rs:25:13 | LL | let x; | - consider changing this to `mut x` @@ -52,7 +52,7 @@ LL | x = 3; //~ ERROR (Ast) [E0384] | ^^^^^ cannot assign twice to immutable variable error[E0384]: cannot assign twice to immutable variable `x` (Mir) - --> $DIR/liveness-assign-imm-local-notes.rs:45:13 + --> $DIR/liveness-assign-imm-local-notes.rs:35:13 | LL | let x; | - consider changing this to `mut x` @@ -61,7 +61,7 @@ LL | x = 1; //~ ERROR (Ast) [E0384] | ^^^^^ cannot assign twice to immutable variable error[E0384]: cannot assign twice to immutable variable `x` (Mir) - --> $DIR/liveness-assign-imm-local-notes.rs:48:13 + --> $DIR/liveness-assign-imm-local-notes.rs:38:13 | LL | let x; | - consider changing this to `mut x` diff --git a/src/test/ui/lifetimes/lifetime-no-keyword.rs b/src/test/ui/lifetimes/lifetime-no-keyword.rs index d583c4fc6c6b8..f466f44f5a599 100644 --- a/src/test/ui/lifetimes/lifetime-no-keyword.rs +++ b/src/test/ui/lifetimes/lifetime-no-keyword.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo<'a>(a: &'a isize) { } fn bar(a: &'static isize) { } fn baz<'let>(a: &'let isize) { } //~ ERROR lifetimes cannot use keyword names diff --git a/src/test/ui/lifetimes/lifetime-no-keyword.stderr b/src/test/ui/lifetimes/lifetime-no-keyword.stderr index 1dcbe336c69ae..912befff01cc0 100644 --- a/src/test/ui/lifetimes/lifetime-no-keyword.stderr +++ b/src/test/ui/lifetimes/lifetime-no-keyword.stderr @@ -1,23 +1,23 @@ error: lifetimes cannot use keyword names - --> $DIR/lifetime-no-keyword.rs:13:8 + --> $DIR/lifetime-no-keyword.rs:3:8 | LL | fn baz<'let>(a: &'let isize) { } //~ ERROR lifetimes cannot use keyword names | ^^^^ error: lifetimes cannot use keyword names - --> $DIR/lifetime-no-keyword.rs:13:18 + --> $DIR/lifetime-no-keyword.rs:3:18 | LL | fn baz<'let>(a: &'let isize) { } //~ ERROR lifetimes cannot use keyword names | ^^^^ error: lifetimes cannot use keyword names - --> $DIR/lifetime-no-keyword.rs:15:8 + --> $DIR/lifetime-no-keyword.rs:5:8 | LL | fn zab<'self>(a: &'self isize) { } //~ ERROR lifetimes cannot use keyword names | ^^^^^ error: lifetimes cannot use keyword names - --> $DIR/lifetime-no-keyword.rs:15:19 + --> $DIR/lifetime-no-keyword.rs:5:19 | LL | fn zab<'self>(a: &'self isize) { } //~ ERROR lifetimes cannot use keyword names | ^^^^^ diff --git a/src/test/ui/linkage2.rs b/src/test/ui/linkage2.rs index afae4a451d699..6d1410a90bd21 100644 --- a/src/test/ui/linkage2.rs +++ b/src/test/ui/linkage2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(linkage)] extern { diff --git a/src/test/ui/linkage2.stderr b/src/test/ui/linkage2.stderr index d9edac160da40..64213f1270adb 100644 --- a/src/test/ui/linkage2.stderr +++ b/src/test/ui/linkage2.stderr @@ -1,5 +1,5 @@ error: must have type `*const T` or `*mut T` - --> $DIR/linkage2.rs:14:32 + --> $DIR/linkage2.rs:4:32 | LL | #[linkage = "extern_weak"] static foo: i32; | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/linkage3.rs b/src/test/ui/linkage3.rs index c222989ed6677..f094a0d53e941 100644 --- a/src/test/ui/linkage3.rs +++ b/src/test/ui/linkage3.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(linkage)] extern { diff --git a/src/test/ui/linkage3.stderr b/src/test/ui/linkage3.stderr index 3429ced8ce4f5..a03593ff2c68e 100644 --- a/src/test/ui/linkage3.stderr +++ b/src/test/ui/linkage3.stderr @@ -1,5 +1,5 @@ error: invalid linkage specified - --> $DIR/linkage3.rs:14:24 + --> $DIR/linkage3.rs:4:24 | LL | #[linkage = "foo"] static foo: *const i32; | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/linkage4.rs b/src/test/ui/linkage4.rs index 1cf6e90d6c855..3b935f9723dc1 100644 --- a/src/test/ui/linkage4.rs +++ b/src/test/ui/linkage4.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[linkage = "external"] static foo: isize = 0; //~^^ ERROR: the `linkage` attribute is experimental and not portable diff --git a/src/test/ui/linkage4.stderr b/src/test/ui/linkage4.stderr index c04f88d37a5f4..fd86671204e52 100644 --- a/src/test/ui/linkage4.stderr +++ b/src/test/ui/linkage4.stderr @@ -1,5 +1,5 @@ error[E0658]: the `linkage` attribute is experimental and not portable across platforms (see issue #29603) - --> $DIR/linkage4.rs:11:1 + --> $DIR/linkage4.rs:1:1 | LL | #[linkage = "external"] | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/auxiliary/inherited_stability.rs b/src/test/ui/lint/auxiliary/inherited_stability.rs index f690cbd029d5f..57af0d3ec9ccf 100644 --- a/src/test/ui/lint/auxiliary/inherited_stability.rs +++ b/src/test/ui/lint/auxiliary/inherited_stability.rs @@ -1,12 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![crate_name="inherited_stability"] #![crate_type = "lib"] #![unstable(feature = "unstable_test_feature", issue = "0")] diff --git a/src/test/ui/lint/auxiliary/lint_output_format.rs b/src/test/ui/lint/auxiliary/lint_output_format.rs index 6ba66f3e45fec..5facb556122ed 100644 --- a/src/test/ui/lint/auxiliary/lint_output_format.rs +++ b/src/test/ui/lint/auxiliary/lint_output_format.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name="lint_output_format"] #![crate_type = "lib"] #![feature(staged_api)] diff --git a/src/test/ui/lint/auxiliary/lint_stability.rs b/src/test/ui/lint/auxiliary/lint_stability.rs index 5547458abbef8..3188d706ab057 100644 --- a/src/test/ui/lint/auxiliary/lint_stability.rs +++ b/src/test/ui/lint/auxiliary/lint_stability.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name="lint_stability"] #![crate_type = "lib"] #![feature(staged_api)] diff --git a/src/test/ui/lint/auxiliary/lint_stability_fields.rs b/src/test/ui/lint/auxiliary/lint_stability_fields.rs index 6b79c36fc0587..2787da7cb7109 100644 --- a/src/test/ui/lint/auxiliary/lint_stability_fields.rs +++ b/src/test/ui/lint/auxiliary/lint_stability_fields.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(staged_api)] #![stable(feature = "rust1", since = "1.0.0")] diff --git a/src/test/ui/lint/auxiliary/lint_unused_extern_crate.rs b/src/test/ui/lint/auxiliary/lint_unused_extern_crate.rs index 2661b1f4eb49b..b76b4321d62aa 100644 --- a/src/test/ui/lint/auxiliary/lint_unused_extern_crate.rs +++ b/src/test/ui/lint/auxiliary/lint_unused_extern_crate.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn foo() {} diff --git a/src/test/ui/lint/auxiliary/lint_unused_extern_crate2.rs b/src/test/ui/lint/auxiliary/lint_unused_extern_crate2.rs index b61667cfd882c..b76b4321d62aa 100644 --- a/src/test/ui/lint/auxiliary/lint_unused_extern_crate2.rs +++ b/src/test/ui/lint/auxiliary/lint_unused_extern_crate2.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn foo() {} diff --git a/src/test/ui/lint/auxiliary/lint_unused_extern_crate3.rs b/src/test/ui/lint/auxiliary/lint_unused_extern_crate3.rs index b61667cfd882c..b76b4321d62aa 100644 --- a/src/test/ui/lint/auxiliary/lint_unused_extern_crate3.rs +++ b/src/test/ui/lint/auxiliary/lint_unused_extern_crate3.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn foo() {} diff --git a/src/test/ui/lint/auxiliary/lint_unused_extern_crate4.rs b/src/test/ui/lint/auxiliary/lint_unused_extern_crate4.rs index fc4bca865c932..e69de29bb2d1d 100644 --- a/src/test/ui/lint/auxiliary/lint_unused_extern_crate4.rs +++ b/src/test/ui/lint/auxiliary/lint_unused_extern_crate4.rs @@ -1,9 +0,0 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. diff --git a/src/test/ui/lint/auxiliary/lint_unused_extern_crate5.rs b/src/test/ui/lint/auxiliary/lint_unused_extern_crate5.rs index fc4bca865c932..e69de29bb2d1d 100644 --- a/src/test/ui/lint/auxiliary/lint_unused_extern_crate5.rs +++ b/src/test/ui/lint/auxiliary/lint_unused_extern_crate5.rs @@ -1,9 +0,0 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. diff --git a/src/test/ui/lint/auxiliary/lints-in-foreign-macros.rs b/src/test/ui/lint/auxiliary/lints-in-foreign-macros.rs index cf8e9c18de3c0..b969d9dbaa3e3 100644 --- a/src/test/ui/lint/auxiliary/lints-in-foreign-macros.rs +++ b/src/test/ui/lint/auxiliary/lints-in-foreign-macros.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_export] macro_rules! bar { () => {use std::string::ToString;} diff --git a/src/test/ui/lint/auxiliary/stability_cfg1.rs b/src/test/ui/lint/auxiliary/stability_cfg1.rs index c839993b047ec..2e027cc272f1f 100644 --- a/src/test/ui/lint/auxiliary/stability_cfg1.rs +++ b/src/test/ui/lint/auxiliary/stability_cfg1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![cfg_attr(foo, experimental)] #![cfg_attr(not(foo), stable(feature = "test_feature", since = "1.0.0"))] #![feature(staged_api)] diff --git a/src/test/ui/lint/auxiliary/stability_cfg2.rs b/src/test/ui/lint/auxiliary/stability_cfg2.rs index a59f4b4e8f44b..8a2899584b903 100644 --- a/src/test/ui/lint/auxiliary/stability_cfg2.rs +++ b/src/test/ui/lint/auxiliary/stability_cfg2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:--cfg foo #![cfg_attr(foo, unstable(feature = "unstable_test_feature", issue = "0"))] diff --git a/src/test/ui/lint/command-line-lint-group-allow.rs b/src/test/ui/lint/command-line-lint-group-allow.rs index 4e12067f9949b..ac98724d03757 100644 --- a/src/test/ui/lint/command-line-lint-group-allow.rs +++ b/src/test/ui/lint/command-line-lint-group-allow.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -A bad-style // compile-pass diff --git a/src/test/ui/lint/command-line-lint-group-deny.rs b/src/test/ui/lint/command-line-lint-group-deny.rs index 6ffc9b5aa1701..da999f33e200f 100644 --- a/src/test/ui/lint/command-line-lint-group-deny.rs +++ b/src/test/ui/lint/command-line-lint-group-deny.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -D bad-style fn main() { diff --git a/src/test/ui/lint/command-line-lint-group-deny.stderr b/src/test/ui/lint/command-line-lint-group-deny.stderr index 45a20434dd255..c6a8f33829863 100644 --- a/src/test/ui/lint/command-line-lint-group-deny.stderr +++ b/src/test/ui/lint/command-line-lint-group-deny.stderr @@ -1,5 +1,5 @@ error: variable `_InappropriateCamelCasing` should have a snake case name such as `_inappropriate_camel_casing` - --> $DIR/command-line-lint-group-deny.rs:14:9 + --> $DIR/command-line-lint-group-deny.rs:4:9 | LL | let _InappropriateCamelCasing = true; //~ ERROR should have a snake | ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/command-line-lint-group-forbid.rs b/src/test/ui/lint/command-line-lint-group-forbid.rs index eb4645a4fc8dd..4e5c2aca5e0d6 100644 --- a/src/test/ui/lint/command-line-lint-group-forbid.rs +++ b/src/test/ui/lint/command-line-lint-group-forbid.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -F bad-style fn main() { diff --git a/src/test/ui/lint/command-line-lint-group-forbid.stderr b/src/test/ui/lint/command-line-lint-group-forbid.stderr index 1fe51c6278637..2c11cca96398b 100644 --- a/src/test/ui/lint/command-line-lint-group-forbid.stderr +++ b/src/test/ui/lint/command-line-lint-group-forbid.stderr @@ -1,5 +1,5 @@ error: variable `_InappropriateCamelCasing` should have a snake case name such as `_inappropriate_camel_casing` - --> $DIR/command-line-lint-group-forbid.rs:14:9 + --> $DIR/command-line-lint-group-forbid.rs:4:9 | LL | let _InappropriateCamelCasing = true; //~ ERROR should have a snake | ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/command-line-lint-group-warn.rs b/src/test/ui/lint/command-line-lint-group-warn.rs index 76cee225b7c18..73dd656f60cf4 100644 --- a/src/test/ui/lint/command-line-lint-group-warn.rs +++ b/src/test/ui/lint/command-line-lint-group-warn.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -W bad-style // compile-pass diff --git a/src/test/ui/lint/command-line-lint-group-warn.stderr b/src/test/ui/lint/command-line-lint-group-warn.stderr index e46285096357f..3939461ef5742 100644 --- a/src/test/ui/lint/command-line-lint-group-warn.stderr +++ b/src/test/ui/lint/command-line-lint-group-warn.stderr @@ -1,5 +1,5 @@ warning: variable `_InappropriateCamelCasing` should have a snake case name such as `_inappropriate_camel_casing` - --> $DIR/command-line-lint-group-warn.rs:15:9 + --> $DIR/command-line-lint-group-warn.rs:5:9 | LL | let _InappropriateCamelCasing = true; | ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/inclusive-range-pattern-syntax.fixed b/src/test/ui/lint/inclusive-range-pattern-syntax.fixed index d16859df79e25..26fc2504e203d 100644 --- a/src/test/ui/lint/inclusive-range-pattern-syntax.fixed +++ b/src/test/ui/lint/inclusive-range-pattern-syntax.fixed @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass // run-rustfix diff --git a/src/test/ui/lint/inclusive-range-pattern-syntax.rs b/src/test/ui/lint/inclusive-range-pattern-syntax.rs index 9d418aec0858f..8750d6f9584e0 100644 --- a/src/test/ui/lint/inclusive-range-pattern-syntax.rs +++ b/src/test/ui/lint/inclusive-range-pattern-syntax.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass // run-rustfix diff --git a/src/test/ui/lint/inclusive-range-pattern-syntax.stderr b/src/test/ui/lint/inclusive-range-pattern-syntax.stderr index de04fed589b23..fd7a17cf2cb2f 100644 --- a/src/test/ui/lint/inclusive-range-pattern-syntax.stderr +++ b/src/test/ui/lint/inclusive-range-pattern-syntax.stderr @@ -1,11 +1,11 @@ warning: `...` range patterns are deprecated - --> $DIR/inclusive-range-pattern-syntax.rs:19:10 + --> $DIR/inclusive-range-pattern-syntax.rs:9:10 | LL | 1...2 => {} | ^^^ help: use `..=` for an inclusive range | note: lint level defined here - --> $DIR/inclusive-range-pattern-syntax.rs:14:9 + --> $DIR/inclusive-range-pattern-syntax.rs:4:9 | LL | #![warn(ellipsis_inclusive_range_patterns)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/issue-47390-unused-variable-in-struct-pattern.rs b/src/test/ui/lint/issue-47390-unused-variable-in-struct-pattern.rs index bac3f00ffc79d..7d3fd441ae5db 100644 --- a/src/test/ui/lint/issue-47390-unused-variable-in-struct-pattern.rs +++ b/src/test/ui/lint/issue-47390-unused-variable-in-struct-pattern.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![feature(box_syntax)] diff --git a/src/test/ui/lint/issue-47390-unused-variable-in-struct-pattern.stderr b/src/test/ui/lint/issue-47390-unused-variable-in-struct-pattern.stderr index a8b0e3e4250ea..1875d3f853f4f 100644 --- a/src/test/ui/lint/issue-47390-unused-variable-in-struct-pattern.stderr +++ b/src/test/ui/lint/issue-47390-unused-variable-in-struct-pattern.stderr @@ -1,42 +1,42 @@ warning: unused variable: `i_think_continually` - --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:36:9 + --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:26:9 | LL | let i_think_continually = 2; | ^^^^^^^^^^^^^^^^^^^ help: consider using `_i_think_continually` instead | note: lint level defined here - --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:15:9 + --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:5:9 | LL | #![warn(unused)] // UI tests pass `-A unused` (#43896) | ^^^^^^ = note: #[warn(unused_variables)] implied by #[warn(unused)] warning: unused variable: `mut_unused_var` - --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:43:13 + --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:33:13 | LL | let mut mut_unused_var = 1; | ^^^^^^^^^^^^^^ help: consider using `_mut_unused_var` instead warning: unused variable: `var` - --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:45:14 + --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:35:14 | LL | let (mut var, unused_var) = (1, 2); | ^^^ help: consider using `_var` instead warning: unused variable: `unused_var` - --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:45:19 + --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:35:19 | LL | let (mut var, unused_var) = (1, 2); | ^^^^^^^^^^ help: consider using `_unused_var` instead warning: unused variable: `corridors_of_light` - --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:47:26 + --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:37:26 | LL | if let SoulHistory { corridors_of_light, | ^^^^^^^^^^^^^^^^^^ help: try ignoring the field: `corridors_of_light: _` warning: variable `hours_are_suns` is assigned to, but never used - --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:48:30 + --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:38:30 | LL | mut hours_are_suns, | ^^^^^^^^^^^^^^ @@ -44,62 +44,62 @@ LL | mut hours_are_suns, = note: consider using `_hours_are_suns` instead warning: value assigned to `hours_are_suns` is never read - --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:50:9 + --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:40:9 | LL | hours_are_suns = false; | ^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:15:9 + --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:5:9 | LL | #![warn(unused)] // UI tests pass `-A unused` (#43896) | ^^^^^^ = note: #[warn(unused_assignments)] implied by #[warn(unused)] warning: unused variable: `fire` - --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:54:32 + --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:44:32 | LL | let LovelyAmbition { lips, fire } = the_spirit; | ^^^^ help: try ignoring the field: `fire: _` warning: unused variable: `case` - --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:63:23 + --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:53:23 | LL | Large::Suit { case } => {} | ^^^^ help: try ignoring the field: `case: _` warning: unused variable: `case` - --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:68:24 + --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:58:24 | LL | &Large::Suit { case } => {} | ^^^^ help: try ignoring the field: `case: _` warning: unused variable: `case` - --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:73:27 + --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:63:27 | LL | box Large::Suit { case } => {} | ^^^^ help: try ignoring the field: `case: _` warning: unused variable: `case` - --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:78:24 + --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:68:24 | LL | (Large::Suit { case },) => {} | ^^^^ help: try ignoring the field: `case: _` warning: unused variable: `case` - --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:83:24 + --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:73:24 | LL | [Large::Suit { case }] => {} | ^^^^ help: try ignoring the field: `case: _` warning: unused variable: `case` - --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:88:29 + --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:78:29 | LL | Tuple(Large::Suit { case }, ()) => {} | ^^^^ help: try ignoring the field: `case: _` warning: variable does not need to be mutable - --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:43:9 + --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:33:9 | LL | let mut mut_unused_var = 1; | ----^^^^^^^^^^^^^^ @@ -107,14 +107,14 @@ LL | let mut mut_unused_var = 1; | help: remove this `mut` | note: lint level defined here - --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:15:9 + --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:5:9 | LL | #![warn(unused)] // UI tests pass `-A unused` (#43896) | ^^^^^^ = note: #[warn(unused_mut)] implied by #[warn(unused)] warning: variable does not need to be mutable - --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:45:10 + --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:35:10 | LL | let (mut var, unused_var) = (1, 2); | ----^^^ diff --git a/src/test/ui/lint/issue-47775-nested-macro-unnecessary-parens-arg.rs b/src/test/ui/lint/issue-47775-nested-macro-unnecessary-parens-arg.rs index 7f623727aac63..8872c0047fda5 100644 --- a/src/test/ui/lint/issue-47775-nested-macro-unnecessary-parens-arg.rs +++ b/src/test/ui/lint/issue-47775-nested-macro-unnecessary-parens-arg.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![warn(unused_parens)] diff --git a/src/test/ui/lint/issue-47775-nested-macro-unnecessary-parens-arg.stderr b/src/test/ui/lint/issue-47775-nested-macro-unnecessary-parens-arg.stderr index ac5df471c5558..57cdcd70e9db4 100644 --- a/src/test/ui/lint/issue-47775-nested-macro-unnecessary-parens-arg.stderr +++ b/src/test/ui/lint/issue-47775-nested-macro-unnecessary-parens-arg.stderr @@ -1,5 +1,5 @@ warning: unnecessary parentheses around function argument - --> $DIR/issue-47775-nested-macro-unnecessary-parens-arg.rs:32:83 + --> $DIR/issue-47775-nested-macro-unnecessary-parens-arg.rs:22:83 | LL | #[allow(dead_code)] fn the_night_for_the_morrow() -> Option { Some((2)) } | ^^^ help: remove these parentheses @@ -8,7 +8,7 @@ LL | and_the_heavens_reject_not!(); | ------------------------------ in this macro invocation | note: lint level defined here - --> $DIR/issue-47775-nested-macro-unnecessary-parens-arg.rs:13:9 + --> $DIR/issue-47775-nested-macro-unnecessary-parens-arg.rs:3:9 | LL | #![warn(unused_parens)] | ^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/issue-50589-multiple-associated-types.rs b/src/test/ui/lint/issue-50589-multiple-associated-types.rs index 2c789a139cd3a..ff65dda8bfb3a 100644 --- a/src/test/ui/lint/issue-50589-multiple-associated-types.rs +++ b/src/test/ui/lint/issue-50589-multiple-associated-types.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass use std::iter::Iterator; diff --git a/src/test/ui/lint/issue-50589-multiple-associated-types.stderr b/src/test/ui/lint/issue-50589-multiple-associated-types.stderr index 7f0a1ee1f3307..de6a9bcc0e15a 100644 --- a/src/test/ui/lint/issue-50589-multiple-associated-types.stderr +++ b/src/test/ui/lint/issue-50589-multiple-associated-types.stderr @@ -1,5 +1,5 @@ warning: associated type binding `Item` specified more than once - --> $DIR/issue-50589-multiple-associated-types.rs:17:39 + --> $DIR/issue-50589-multiple-associated-types.rs:7:39 | LL | fn test() -> Box> { | --------- ^^^^^^^^^^^ used more than once @@ -11,7 +11,7 @@ LL | fn test() -> Box> { = note: for more information, see issue #50589 warning: associated type binding `Item` specified more than once - --> $DIR/issue-50589-multiple-associated-types.rs:17:39 + --> $DIR/issue-50589-multiple-associated-types.rs:7:39 | LL | fn test() -> Box> { | --------- ^^^^^^^^^^^ used more than once diff --git a/src/test/ui/lint/lint-anon-param-edition.fixed b/src/test/ui/lint/lint-anon-param-edition.fixed index c4379b496f8d4..6e192d3ae9481 100644 --- a/src/test/ui/lint/lint-anon-param-edition.fixed +++ b/src/test/ui/lint/lint-anon-param-edition.fixed @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // tests that the anonymous_parameters lint is warn-by-default on the 2018 edition // compile-pass diff --git a/src/test/ui/lint/lint-anon-param-edition.rs b/src/test/ui/lint/lint-anon-param-edition.rs index 13eb5dfd816ab..876e940b0ba24 100644 --- a/src/test/ui/lint/lint-anon-param-edition.rs +++ b/src/test/ui/lint/lint-anon-param-edition.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // tests that the anonymous_parameters lint is warn-by-default on the 2018 edition // compile-pass diff --git a/src/test/ui/lint/lint-anon-param-edition.stderr b/src/test/ui/lint/lint-anon-param-edition.stderr index de347770aec77..461f209975d78 100644 --- a/src/test/ui/lint/lint-anon-param-edition.stderr +++ b/src/test/ui/lint/lint-anon-param-edition.stderr @@ -1,5 +1,5 @@ warning: anonymous parameters are deprecated and will be removed in the next edition. - --> $DIR/lint-anon-param-edition.rs:18:12 + --> $DIR/lint-anon-param-edition.rs:8:12 | LL | fn foo(u8); | ^^ help: Try naming the parameter or explicitly ignoring it: `_: u8` diff --git a/src/test/ui/lint/lint-attr-non-item-node.rs b/src/test/ui/lint/lint-attr-non-item-node.rs index 930f69e51e176..3f05e83a77d1b 100644 --- a/src/test/ui/lint/lint-attr-non-item-node.rs +++ b/src/test/ui/lint/lint-attr-non-item-node.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Checks that lint attributes work on non-item AST nodes fn main() { diff --git a/src/test/ui/lint/lint-attr-non-item-node.stderr b/src/test/ui/lint/lint-attr-non-item-node.stderr index 33d096c5bcfb5..2c95831f3759f 100644 --- a/src/test/ui/lint/lint-attr-non-item-node.stderr +++ b/src/test/ui/lint/lint-attr-non-item-node.stderr @@ -1,11 +1,11 @@ error: unreachable statement - --> $DIR/lint-attr-non-item-node.rs:17:9 + --> $DIR/lint-attr-non-item-node.rs:7:9 | LL | "unreachable"; //~ ERROR unreachable statement | ^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-attr-non-item-node.rs:14:12 + --> $DIR/lint-attr-non-item-node.rs:4:12 | LL | #[deny(unreachable_code)] | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-change-warnings.rs b/src/test/ui/lint/lint-change-warnings.rs index 19e253e3b8e53..37af3b7612c2c 100644 --- a/src/test/ui/lint/lint-change-warnings.rs +++ b/src/test/ui/lint/lint-change-warnings.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(warnings)] #![allow(dead_code)] diff --git a/src/test/ui/lint/lint-change-warnings.stderr b/src/test/ui/lint/lint-change-warnings.stderr index 353802f5c283b..7d7a066613ace 100644 --- a/src/test/ui/lint/lint-change-warnings.stderr +++ b/src/test/ui/lint/lint-change-warnings.stderr @@ -1,18 +1,18 @@ error: denote infinite loops with `loop { ... }` - --> $DIR/lint-change-warnings.rs:15:5 + --> $DIR/lint-change-warnings.rs:5:5 | LL | while true {} //~ ERROR: infinite | ^^^^^^^^^^ help: use `loop` | note: lint level defined here - --> $DIR/lint-change-warnings.rs:11:9 + --> $DIR/lint-change-warnings.rs:1:9 | LL | #![deny(warnings)] | ^^^^^^^^ = note: #[deny(while_true)] implied by #[deny(warnings)] warning: denote infinite loops with `loop { ... }` - --> $DIR/lint-change-warnings.rs:25:5 + --> $DIR/lint-change-warnings.rs:15:5 | LL | while true {} //~ WARNING: infinite | ^^^^^^^^^^ help: use `loop` @@ -20,13 +20,13 @@ LL | while true {} //~ WARNING: infinite = note: #[warn(while_true)] on by default error: denote infinite loops with `loop { ... }` - --> $DIR/lint-change-warnings.rs:30:5 + --> $DIR/lint-change-warnings.rs:20:5 | LL | while true {} //~ ERROR: infinite | ^^^^^^^^^^ help: use `loop` | note: lint level defined here - --> $DIR/lint-change-warnings.rs:28:10 + --> $DIR/lint-change-warnings.rs:18:10 | LL | #[forbid(warnings)] | ^^^^^^^^ diff --git a/src/test/ui/lint/lint-ctypes-enum.rs b/src/test/ui/lint/lint-ctypes-enum.rs index 7b7ffd8fc107c..f347c2761c322 100644 --- a/src/test/ui/lint/lint-ctypes-enum.rs +++ b/src/test/ui/lint/lint-ctypes-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(improper_ctypes)] #![allow(dead_code)] diff --git a/src/test/ui/lint/lint-ctypes-enum.stderr b/src/test/ui/lint/lint-ctypes-enum.stderr index 9b1c04b2a1dd1..dd33cc77458d7 100644 --- a/src/test/ui/lint/lint-ctypes-enum.stderr +++ b/src/test/ui/lint/lint-ctypes-enum.stderr @@ -1,43 +1,43 @@ error: `extern` block uses type `U` which is not FFI-safe: enum has no representation hint - --> $DIR/lint-ctypes-enum.rs:30:13 + --> $DIR/lint-ctypes-enum.rs:20:13 | LL | fn uf(x: U); //~ ERROR enum has no representation hint | ^ | note: lint level defined here - --> $DIR/lint-ctypes-enum.rs:11:9 + --> $DIR/lint-ctypes-enum.rs:1:9 | LL | #![deny(improper_ctypes)] | ^^^^^^^^^^^^^^^ = help: consider adding a #[repr(...)] attribute to this enum note: type defined here - --> $DIR/lint-ctypes-enum.rs:15:1 + --> $DIR/lint-ctypes-enum.rs:5:1 | LL | enum U { A } | ^^^^^^^^^^^^ error: `extern` block uses type `B` which is not FFI-safe: enum has no representation hint - --> $DIR/lint-ctypes-enum.rs:31:13 + --> $DIR/lint-ctypes-enum.rs:21:13 | LL | fn bf(x: B); //~ ERROR enum has no representation hint | ^ | = help: consider adding a #[repr(...)] attribute to this enum note: type defined here - --> $DIR/lint-ctypes-enum.rs:16:1 + --> $DIR/lint-ctypes-enum.rs:6:1 | LL | enum B { C, D } | ^^^^^^^^^^^^^^^ error: `extern` block uses type `T` which is not FFI-safe: enum has no representation hint - --> $DIR/lint-ctypes-enum.rs:32:13 + --> $DIR/lint-ctypes-enum.rs:22:13 | LL | fn tf(x: T); //~ ERROR enum has no representation hint | ^ | = help: consider adding a #[repr(...)] attribute to this enum note: type defined here - --> $DIR/lint-ctypes-enum.rs:17:1 + --> $DIR/lint-ctypes-enum.rs:7:1 | LL | enum T { E, F, G } | ^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-ctypes.rs b/src/test/ui/lint/lint-ctypes.rs index b8b1a675c5f6d..f43c1a97330c8 100644 --- a/src/test/ui/lint/lint-ctypes.rs +++ b/src/test/ui/lint/lint-ctypes.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(improper_ctypes)] #![feature(libc)] diff --git a/src/test/ui/lint/lint-ctypes.stderr b/src/test/ui/lint/lint-ctypes.stderr index b97e4662660fb..29a5bd427c135 100644 --- a/src/test/ui/lint/lint-ctypes.stderr +++ b/src/test/ui/lint/lint-ctypes.stderr @@ -1,36 +1,36 @@ error: `extern` block uses type `Foo` which is not FFI-safe: this struct has unspecified layout - --> $DIR/lint-ctypes.rs:54:28 + --> $DIR/lint-ctypes.rs:44:28 | LL | pub fn ptr_type1(size: *const Foo); //~ ERROR: uses type `Foo` | ^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-ctypes.rs:11:9 + --> $DIR/lint-ctypes.rs:1:9 | LL | #![deny(improper_ctypes)] | ^^^^^^^^^^^^^^^ = help: consider adding a #[repr(C)] or #[repr(transparent)] attribute to this struct note: type defined here - --> $DIR/lint-ctypes.rs:32:1 + --> $DIR/lint-ctypes.rs:22:1 | LL | pub struct Foo; | ^^^^^^^^^^^^^^^ error: `extern` block uses type `Foo` which is not FFI-safe: this struct has unspecified layout - --> $DIR/lint-ctypes.rs:55:28 + --> $DIR/lint-ctypes.rs:45:28 | LL | pub fn ptr_type2(size: *const Foo); //~ ERROR: uses type `Foo` | ^^^^^^^^^^ | = help: consider adding a #[repr(C)] or #[repr(transparent)] attribute to this struct note: type defined here - --> $DIR/lint-ctypes.rs:32:1 + --> $DIR/lint-ctypes.rs:22:1 | LL | pub struct Foo; | ^^^^^^^^^^^^^^^ error: `extern` block uses type `[u32]` which is not FFI-safe: slices have no C equivalent - --> $DIR/lint-ctypes.rs:56:26 + --> $DIR/lint-ctypes.rs:46:26 | LL | pub fn slice_type(p: &[u32]); //~ ERROR: uses type `[u32]` | ^^^^^^ @@ -38,7 +38,7 @@ LL | pub fn slice_type(p: &[u32]); //~ ERROR: uses type `[u32]` = help: consider using a raw pointer instead error: `extern` block uses type `str` which is not FFI-safe: string slices have no C equivalent - --> $DIR/lint-ctypes.rs:57:24 + --> $DIR/lint-ctypes.rs:47:24 | LL | pub fn str_type(p: &str); //~ ERROR: uses type `str` | ^^^^ @@ -46,7 +46,7 @@ LL | pub fn str_type(p: &str); //~ ERROR: uses type `str` = help: consider using `*const u8` and a length instead error: `extern` block uses type `std::boxed::Box` which is not FFI-safe: this struct has unspecified layout - --> $DIR/lint-ctypes.rs:58:24 + --> $DIR/lint-ctypes.rs:48:24 | LL | pub fn box_type(p: Box); //~ ERROR uses type `std::boxed::Box` | ^^^^^^^^ @@ -54,7 +54,7 @@ LL | pub fn box_type(p: Box); //~ ERROR uses type `std::boxed::Box = help: consider adding a #[repr(C)] or #[repr(transparent)] attribute to this struct error: `extern` block uses type `char` which is not FFI-safe: the `char` type has no C equivalent - --> $DIR/lint-ctypes.rs:59:25 + --> $DIR/lint-ctypes.rs:49:25 | LL | pub fn char_type(p: char); //~ ERROR uses type `char` | ^^^^ @@ -62,25 +62,25 @@ LL | pub fn char_type(p: char); //~ ERROR uses type `char` = help: consider using `u32` or `libc::wchar_t` instead error: `extern` block uses type `i128` which is not FFI-safe: 128-bit integers don't currently have a known stable ABI - --> $DIR/lint-ctypes.rs:60:25 + --> $DIR/lint-ctypes.rs:50:25 | LL | pub fn i128_type(p: i128); //~ ERROR uses type `i128` | ^^^^ error: `extern` block uses type `u128` which is not FFI-safe: 128-bit integers don't currently have a known stable ABI - --> $DIR/lint-ctypes.rs:61:25 + --> $DIR/lint-ctypes.rs:51:25 | LL | pub fn u128_type(p: u128); //~ ERROR uses type `u128` | ^^^^ error: `extern` block uses type `dyn std::clone::Clone` which is not FFI-safe: trait objects have no C equivalent - --> $DIR/lint-ctypes.rs:62:26 + --> $DIR/lint-ctypes.rs:52:26 | LL | pub fn trait_type(p: &Clone); //~ ERROR uses type `dyn std::clone::Clone` | ^^^^^^ error: `extern` block uses type `(i32, i32)` which is not FFI-safe: tuples have unspecified layout - --> $DIR/lint-ctypes.rs:63:26 + --> $DIR/lint-ctypes.rs:53:26 | LL | pub fn tuple_type(p: (i32, i32)); //~ ERROR uses type `(i32, i32)` | ^^^^^^^^^^ @@ -88,7 +88,7 @@ LL | pub fn tuple_type(p: (i32, i32)); //~ ERROR uses type `(i32, i32)` = help: consider using a struct instead error: `extern` block uses type `(i32, i32)` which is not FFI-safe: tuples have unspecified layout - --> $DIR/lint-ctypes.rs:64:27 + --> $DIR/lint-ctypes.rs:54:27 | LL | pub fn tuple_type2(p: I32Pair); //~ ERROR uses type `(i32, i32)` | ^^^^^^^ @@ -96,32 +96,32 @@ LL | pub fn tuple_type2(p: I32Pair); //~ ERROR uses type `(i32, i32)` = help: consider using a struct instead error: `extern` block uses type `ZeroSize` which is not FFI-safe: this struct has no fields - --> $DIR/lint-ctypes.rs:65:25 + --> $DIR/lint-ctypes.rs:55:25 | LL | pub fn zero_size(p: ZeroSize); //~ ERROR struct has no fields | ^^^^^^^^ | = help: consider adding a member to this struct note: type defined here - --> $DIR/lint-ctypes.rs:28:1 + --> $DIR/lint-ctypes.rs:18:1 | LL | pub struct ZeroSize; | ^^^^^^^^^^^^^^^^^^^^ error: `extern` block uses type `ZeroSizeWithPhantomData` which is not FFI-safe: composed only of PhantomData - --> $DIR/lint-ctypes.rs:66:33 + --> $DIR/lint-ctypes.rs:56:33 | LL | pub fn zero_size_phantom(p: ZeroSizeWithPhantomData); //~ ERROR composed only of PhantomData | ^^^^^^^^^^^^^^^^^^^^^^^ error: `extern` block uses type `std::marker::PhantomData` which is not FFI-safe: composed only of PhantomData - --> $DIR/lint-ctypes.rs:68:12 + --> $DIR/lint-ctypes.rs:58:12 | LL | -> ::std::marker::PhantomData; //~ ERROR: composed only of PhantomData | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: `extern` block uses type `fn()` which is not FFI-safe: this function pointer has Rust-specific calling convention - --> $DIR/lint-ctypes.rs:69:23 + --> $DIR/lint-ctypes.rs:59:23 | LL | pub fn fn_type(p: RustFn); //~ ERROR function pointer has Rust-specific | ^^^^^^ @@ -129,7 +129,7 @@ LL | pub fn fn_type(p: RustFn); //~ ERROR function pointer has Rust-specific = help: consider using an `extern fn(...) -> ...` function pointer instead error: `extern` block uses type `fn()` which is not FFI-safe: this function pointer has Rust-specific calling convention - --> $DIR/lint-ctypes.rs:70:24 + --> $DIR/lint-ctypes.rs:60:24 | LL | pub fn fn_type2(p: fn()); //~ ERROR function pointer has Rust-specific | ^^^^ @@ -137,7 +137,7 @@ LL | pub fn fn_type2(p: fn()); //~ ERROR function pointer has Rust-specific = help: consider using an `extern fn(...) -> ...` function pointer instead error: `extern` block uses type `std::boxed::Box` which is not FFI-safe: this struct has unspecified layout - --> $DIR/lint-ctypes.rs:71:28 + --> $DIR/lint-ctypes.rs:61:28 | LL | pub fn fn_contained(p: RustBadRet); //~ ERROR: uses type `std::boxed::Box` | ^^^^^^^^^^ @@ -145,13 +145,13 @@ LL | pub fn fn_contained(p: RustBadRet); //~ ERROR: uses type `std::boxed::B = help: consider adding a #[repr(C)] or #[repr(transparent)] attribute to this struct error: `extern` block uses type `i128` which is not FFI-safe: 128-bit integers don't currently have a known stable ABI - --> $DIR/lint-ctypes.rs:72:32 + --> $DIR/lint-ctypes.rs:62:32 | LL | pub fn transparent_i128(p: TransparentI128); //~ ERROR: uses type `i128` | ^^^^^^^^^^^^^^^ error: `extern` block uses type `str` which is not FFI-safe: string slices have no C equivalent - --> $DIR/lint-ctypes.rs:73:31 + --> $DIR/lint-ctypes.rs:63:31 | LL | pub fn transparent_str(p: TransparentStr); //~ ERROR: uses type `str` | ^^^^^^^^^^^^^^ @@ -159,7 +159,7 @@ LL | pub fn transparent_str(p: TransparentStr); //~ ERROR: uses type `str` = help: consider using `*const u8` and a length instead error: `extern` block uses type `std::boxed::Box` which is not FFI-safe: this struct has unspecified layout - --> $DIR/lint-ctypes.rs:74:30 + --> $DIR/lint-ctypes.rs:64:30 | LL | pub fn transparent_fn(p: TransparentBadFn); //~ ERROR: uses type `std::boxed::Box` | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-dead-code-1.rs b/src/test/ui/lint/lint-dead-code-1.rs index 2fe72365bab1c..4fdf6a2ac744c 100644 --- a/src/test/ui/lint/lint-dead-code-1.rs +++ b/src/test/ui/lint/lint-dead-code-1.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![no_std] #![allow(unused_variables)] #![allow(non_camel_case_types)] diff --git a/src/test/ui/lint/lint-dead-code-1.stderr b/src/test/ui/lint/lint-dead-code-1.stderr index 9802b7e8f383b..70f15ae323a24 100644 --- a/src/test/ui/lint/lint-dead-code-1.stderr +++ b/src/test/ui/lint/lint-dead-code-1.stderr @@ -1,59 +1,59 @@ error: struct is never constructed: `Bar` - --> $DIR/lint-dead-code-1.rs:22:5 + --> $DIR/lint-dead-code-1.rs:12:5 | LL | pub struct Bar; //~ ERROR: struct is never constructed | ^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-dead-code-1.rs:15:9 + --> $DIR/lint-dead-code-1.rs:5:9 | LL | #![deny(dead_code)] | ^^^^^^^^^ error: static item is never used: `priv_static` - --> $DIR/lint-dead-code-1.rs:30:1 + --> $DIR/lint-dead-code-1.rs:20:1 | LL | static priv_static: isize = 0; //~ ERROR: static item is never used | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: constant item is never used: `priv_const` - --> $DIR/lint-dead-code-1.rs:37:1 + --> $DIR/lint-dead-code-1.rs:27:1 | LL | const priv_const: isize = 0; //~ ERROR: constant item is never used | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: struct is never constructed: `PrivStruct` - --> $DIR/lint-dead-code-1.rs:45:1 + --> $DIR/lint-dead-code-1.rs:35:1 | LL | struct PrivStruct; //~ ERROR: struct is never constructed | ^^^^^^^^^^^^^^^^^^ error: enum is never used: `priv_enum` - --> $DIR/lint-dead-code-1.rs:74:1 + --> $DIR/lint-dead-code-1.rs:64:1 | LL | enum priv_enum { foo2, bar2 } //~ ERROR: enum is never used | ^^^^^^^^^^^^^^ error: variant is never constructed: `bar3` - --> $DIR/lint-dead-code-1.rs:77:5 + --> $DIR/lint-dead-code-1.rs:67:5 | LL | bar3 //~ ERROR variant is never constructed | ^^^^ error: function is never used: `priv_fn` - --> $DIR/lint-dead-code-1.rs:98:1 + --> $DIR/lint-dead-code-1.rs:88:1 | LL | fn priv_fn() { //~ ERROR: function is never used | ^^^^^^^^^^^^ error: function is never used: `foo` - --> $DIR/lint-dead-code-1.rs:103:1 + --> $DIR/lint-dead-code-1.rs:93:1 | LL | fn foo() { //~ ERROR: function is never used | ^^^^^^^^ error: function is never used: `bar` - --> $DIR/lint-dead-code-1.rs:108:1 + --> $DIR/lint-dead-code-1.rs:98:1 | LL | fn bar() { //~ ERROR: function is never used | ^^^^^^^^ diff --git a/src/test/ui/lint/lint-dead-code-2.rs b/src/test/ui/lint/lint-dead-code-2.rs index 4a0e4f4319e0a..88db4f88c3feb 100644 --- a/src/test/ui/lint/lint-dead-code-2.rs +++ b/src/test/ui/lint/lint-dead-code-2.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_variables)] #![deny(dead_code)] #![feature(main, start)] diff --git a/src/test/ui/lint/lint-dead-code-2.stderr b/src/test/ui/lint/lint-dead-code-2.stderr index 6e713c84f16fe..d17149104dbaa 100644 --- a/src/test/ui/lint/lint-dead-code-2.stderr +++ b/src/test/ui/lint/lint-dead-code-2.stderr @@ -1,23 +1,23 @@ error: function is never used: `dead_fn` - --> $DIR/lint-dead-code-2.rs:32:1 + --> $DIR/lint-dead-code-2.rs:22:1 | LL | fn dead_fn() {} //~ ERROR: function is never used | ^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-dead-code-2.rs:12:9 + --> $DIR/lint-dead-code-2.rs:2:9 | LL | #![deny(dead_code)] | ^^^^^^^^^ error: function is never used: `dead_fn2` - --> $DIR/lint-dead-code-2.rs:35:1 + --> $DIR/lint-dead-code-2.rs:25:1 | LL | fn dead_fn2() {} //~ ERROR: function is never used | ^^^^^^^^^^^^^ error: function is never used: `main` - --> $DIR/lint-dead-code-2.rs:48:1 + --> $DIR/lint-dead-code-2.rs:38:1 | LL | fn main() { //~ ERROR: function is never used | ^^^^^^^^^ diff --git a/src/test/ui/lint/lint-dead-code-3.rs b/src/test/ui/lint/lint-dead-code-3.rs index 112d363095253..00b250f83dd6f 100644 --- a/src/test/ui/lint/lint-dead-code-3.rs +++ b/src/test/ui/lint/lint-dead-code-3.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_variables)] #![allow(non_camel_case_types)] #![deny(dead_code)] diff --git a/src/test/ui/lint/lint-dead-code-3.stderr b/src/test/ui/lint/lint-dead-code-3.stderr index 994e93e855764..72bcac22de8cb 100644 --- a/src/test/ui/lint/lint-dead-code-3.stderr +++ b/src/test/ui/lint/lint-dead-code-3.stderr @@ -1,35 +1,35 @@ error: struct is never constructed: `Foo` - --> $DIR/lint-dead-code-3.rs:23:1 + --> $DIR/lint-dead-code-3.rs:13:1 | LL | struct Foo; //~ ERROR: struct is never constructed | ^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-dead-code-3.rs:13:9 + --> $DIR/lint-dead-code-3.rs:3:9 | LL | #![deny(dead_code)] | ^^^^^^^^^ error: method is never used: `foo` - --> $DIR/lint-dead-code-3.rs:25:5 + --> $DIR/lint-dead-code-3.rs:15:5 | LL | fn foo(&self) { //~ ERROR: method is never used | ^^^^^^^^^^^^^ error: function is never used: `bar` - --> $DIR/lint-dead-code-3.rs:30:1 + --> $DIR/lint-dead-code-3.rs:20:1 | LL | fn bar() { //~ ERROR: function is never used | ^^^^^^^^ error: enum is never used: `c_void` - --> $DIR/lint-dead-code-3.rs:69:1 + --> $DIR/lint-dead-code-3.rs:59:1 | LL | enum c_void {} //~ ERROR: enum is never used | ^^^^^^^^^^^ error: foreign function is never used: `free` - --> $DIR/lint-dead-code-3.rs:71:5 + --> $DIR/lint-dead-code-3.rs:61:5 | LL | fn free(p: *const c_void); //~ ERROR: foreign function is never used | ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-dead-code-4.rs b/src/test/ui/lint/lint-dead-code-4.rs index 1296cf46e6fe4..3f4a9e210401e 100644 --- a/src/test/ui/lint/lint-dead-code-4.rs +++ b/src/test/ui/lint/lint-dead-code-4.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_variables)] #![allow(non_camel_case_types)] #![deny(dead_code)] diff --git a/src/test/ui/lint/lint-dead-code-4.stderr b/src/test/ui/lint/lint-dead-code-4.stderr index fce2cf768987e..62de048d5e919 100644 --- a/src/test/ui/lint/lint-dead-code-4.stderr +++ b/src/test/ui/lint/lint-dead-code-4.stderr @@ -1,23 +1,23 @@ error: field is never used: `b` - --> $DIR/lint-dead-code-4.rs:17:5 + --> $DIR/lint-dead-code-4.rs:7:5 | LL | b: bool, //~ ERROR: field is never used | ^^^^^^^ | note: lint level defined here - --> $DIR/lint-dead-code-4.rs:13:9 + --> $DIR/lint-dead-code-4.rs:3:9 | LL | #![deny(dead_code)] | ^^^^^^^^^ error: variant is never constructed: `X` - --> $DIR/lint-dead-code-4.rs:25:5 + --> $DIR/lint-dead-code-4.rs:15:5 | LL | X, //~ ERROR variant is never constructed | ^ error: variant is never constructed: `Y` - --> $DIR/lint-dead-code-4.rs:26:5 + --> $DIR/lint-dead-code-4.rs:16:5 | LL | / Y { //~ ERROR variant is never constructed LL | | a: String, @@ -27,43 +27,43 @@ LL | | }, | |_____^ error: enum is never used: `ABC` - --> $DIR/lint-dead-code-4.rs:34:1 + --> $DIR/lint-dead-code-4.rs:24:1 | LL | enum ABC { //~ ERROR enum is never used | ^^^^^^^^ error: variant is never constructed: `I` - --> $DIR/lint-dead-code-4.rs:46:5 + --> $DIR/lint-dead-code-4.rs:36:5 | LL | I, //~ ERROR variant is never constructed | ^ error: field is never used: `b` - --> $DIR/lint-dead-code-4.rs:49:9 + --> $DIR/lint-dead-code-4.rs:39:9 | LL | b: i32, //~ ERROR field is never used | ^^^^^^ error: field is never used: `c` - --> $DIR/lint-dead-code-4.rs:50:9 + --> $DIR/lint-dead-code-4.rs:40:9 | LL | c: i32, //~ ERROR field is never used | ^^^^^^ error: variant is never constructed: `K` - --> $DIR/lint-dead-code-4.rs:52:5 + --> $DIR/lint-dead-code-4.rs:42:5 | LL | K //~ ERROR variant is never constructed | ^ error: field is never used: `x` - --> $DIR/lint-dead-code-4.rs:71:5 + --> $DIR/lint-dead-code-4.rs:61:5 | LL | x: usize, //~ ERROR: field is never used | ^^^^^^^^ error: field is never used: `c` - --> $DIR/lint-dead-code-4.rs:73:5 + --> $DIR/lint-dead-code-4.rs:63:5 | LL | c: bool, //~ ERROR: field is never used | ^^^^^^^ diff --git a/src/test/ui/lint/lint-dead-code-5.rs b/src/test/ui/lint/lint-dead-code-5.rs index ee5cf24823d40..764a23e4e49e9 100644 --- a/src/test/ui/lint/lint-dead-code-5.rs +++ b/src/test/ui/lint/lint-dead-code-5.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_variables)] #![deny(dead_code)] diff --git a/src/test/ui/lint/lint-dead-code-5.stderr b/src/test/ui/lint/lint-dead-code-5.stderr index 37ca0f479f59b..e6c2354783a21 100644 --- a/src/test/ui/lint/lint-dead-code-5.stderr +++ b/src/test/ui/lint/lint-dead-code-5.stderr @@ -1,29 +1,29 @@ error: variant is never constructed: `Variant2` - --> $DIR/lint-dead-code-5.rs:16:5 + --> $DIR/lint-dead-code-5.rs:6:5 | LL | Variant2 //~ ERROR: variant is never constructed | ^^^^^^^^ | note: lint level defined here - --> $DIR/lint-dead-code-5.rs:12:9 + --> $DIR/lint-dead-code-5.rs:2:9 | LL | #![deny(dead_code)] | ^^^^^^^^^ error: variant is never constructed: `Variant5` - --> $DIR/lint-dead-code-5.rs:23:5 + --> $DIR/lint-dead-code-5.rs:13:5 | LL | Variant5 { _x: isize }, //~ ERROR: variant is never constructed: `Variant5` | ^^^^^^^^^^^^^^^^^^^^^^ error: variant is never constructed: `Variant6` - --> $DIR/lint-dead-code-5.rs:24:5 + --> $DIR/lint-dead-code-5.rs:14:5 | LL | Variant6(isize), //~ ERROR: variant is never constructed: `Variant6` | ^^^^^^^^^^^^^^^ error: enum is never used: `Enum3` - --> $DIR/lint-dead-code-5.rs:28:1 + --> $DIR/lint-dead-code-5.rs:18:1 | LL | enum Enum3 { //~ ERROR: enum is never used | ^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-dead-code-type-alias.rs b/src/test/ui/lint/lint-dead-code-type-alias.rs index aaa01aa6bbe0b..86daf3ea04dbd 100644 --- a/src/test/ui/lint/lint-dead-code-type-alias.rs +++ b/src/test/ui/lint/lint-dead-code-type-alias.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(dead_code)] type Used = u8; diff --git a/src/test/ui/lint/lint-dead-code-type-alias.stderr b/src/test/ui/lint/lint-dead-code-type-alias.stderr index bd11e64c7814c..a4d4727be7ca4 100644 --- a/src/test/ui/lint/lint-dead-code-type-alias.stderr +++ b/src/test/ui/lint/lint-dead-code-type-alias.stderr @@ -1,11 +1,11 @@ error: type alias is never used: `Unused` - --> $DIR/lint-dead-code-type-alias.rs:14:1 + --> $DIR/lint-dead-code-type-alias.rs:4:1 | LL | type Unused = u8; //~ ERROR type alias is never used | ^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-dead-code-type-alias.rs:11:9 + --> $DIR/lint-dead-code-type-alias.rs:1:9 | LL | #![deny(dead_code)] | ^^^^^^^^^ diff --git a/src/test/ui/lint/lint-dead-code-variant.rs b/src/test/ui/lint/lint-dead-code-variant.rs index 3301560c31500..295ed16d4cf0b 100644 --- a/src/test/ui/lint/lint-dead-code-variant.rs +++ b/src/test/ui/lint/lint-dead-code-variant.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(dead_code)] #[derive(Clone)] diff --git a/src/test/ui/lint/lint-dead-code-variant.stderr b/src/test/ui/lint/lint-dead-code-variant.stderr index 05b7e35337aaf..b9465e73b0d79 100644 --- a/src/test/ui/lint/lint-dead-code-variant.stderr +++ b/src/test/ui/lint/lint-dead-code-variant.stderr @@ -1,11 +1,11 @@ error: variant is never constructed: `Variant1` - --> $DIR/lint-dead-code-variant.rs:15:5 + --> $DIR/lint-dead-code-variant.rs:5:5 | LL | Variant1, //~ ERROR: variant is never constructed | ^^^^^^^^ | note: lint level defined here - --> $DIR/lint-dead-code-variant.rs:11:9 + --> $DIR/lint-dead-code-variant.rs:1:9 | LL | #![deny(dead_code)] | ^^^^^^^^^ diff --git a/src/test/ui/lint/lint-directives-on-use-items-issue-10534.rs b/src/test/ui/lint/lint-directives-on-use-items-issue-10534.rs index 18159aec70844..e5cb0d3df0e7c 100644 --- a/src/test/ui/lint/lint-directives-on-use-items-issue-10534.rs +++ b/src/test/ui/lint/lint-directives-on-use-items-issue-10534.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(unused_imports)] #![allow(non_upper_case_globals)] diff --git a/src/test/ui/lint/lint-directives-on-use-items-issue-10534.stderr b/src/test/ui/lint/lint-directives-on-use-items-issue-10534.stderr index 2c4602ae20bde..170b98a12a848 100644 --- a/src/test/ui/lint/lint-directives-on-use-items-issue-10534.stderr +++ b/src/test/ui/lint/lint-directives-on-use-items-issue-10534.stderr @@ -1,23 +1,23 @@ error: unused import: `a::x` - --> $DIR/lint-directives-on-use-items-issue-10534.rs:22:9 + --> $DIR/lint-directives-on-use-items-issue-10534.rs:12:9 | LL | use a::x; //~ ERROR: unused import | ^^^^ | note: lint level defined here - --> $DIR/lint-directives-on-use-items-issue-10534.rs:11:9 + --> $DIR/lint-directives-on-use-items-issue-10534.rs:1:9 | LL | #![deny(unused_imports)] | ^^^^^^^^^^^^^^ error: unused import: `a::y` - --> $DIR/lint-directives-on-use-items-issue-10534.rs:31:9 + --> $DIR/lint-directives-on-use-items-issue-10534.rs:21:9 | LL | use a::y; //~ ERROR: unused import | ^^^^ | note: lint level defined here - --> $DIR/lint-directives-on-use-items-issue-10534.rs:30:12 + --> $DIR/lint-directives-on-use-items-issue-10534.rs:20:12 | LL | #[deny(unused_imports)] | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-exceeding-bitshifts.rs b/src/test/ui/lint/lint-exceeding-bitshifts.rs index 5ebfcc4926baa..0f397a7efe81f 100644 --- a/src/test/ui/lint/lint-exceeding-bitshifts.rs +++ b/src/test/ui/lint/lint-exceeding-bitshifts.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(exceeding_bitshifts, const_err)] #![allow(unused_variables)] #![allow(dead_code)] diff --git a/src/test/ui/lint/lint-exceeding-bitshifts.stderr b/src/test/ui/lint/lint-exceeding-bitshifts.stderr index 5124a69195a34..be739eb41bd34 100644 --- a/src/test/ui/lint/lint-exceeding-bitshifts.stderr +++ b/src/test/ui/lint/lint-exceeding-bitshifts.stderr @@ -1,113 +1,113 @@ error: attempt to shift left with overflow - --> $DIR/lint-exceeding-bitshifts.rs:17:15 + --> $DIR/lint-exceeding-bitshifts.rs:7:15 | LL | let n = 1u8 << 8; //~ ERROR: attempt to shift left with overflow | ^^^^^^^^ | note: lint level defined here - --> $DIR/lint-exceeding-bitshifts.rs:11:9 + --> $DIR/lint-exceeding-bitshifts.rs:1:9 | LL | #![deny(exceeding_bitshifts, const_err)] | ^^^^^^^^^^^^^^^^^^^ error: attempt to shift left with overflow - --> $DIR/lint-exceeding-bitshifts.rs:19:15 + --> $DIR/lint-exceeding-bitshifts.rs:9:15 | LL | let n = 1u16 << 16; //~ ERROR: attempt to shift left with overflow | ^^^^^^^^^^ error: attempt to shift left with overflow - --> $DIR/lint-exceeding-bitshifts.rs:21:15 + --> $DIR/lint-exceeding-bitshifts.rs:11:15 | LL | let n = 1u32 << 32; //~ ERROR: attempt to shift left with overflow | ^^^^^^^^^^ error: attempt to shift left with overflow - --> $DIR/lint-exceeding-bitshifts.rs:23:15 + --> $DIR/lint-exceeding-bitshifts.rs:13:15 | LL | let n = 1u64 << 64; //~ ERROR: attempt to shift left with overflow | ^^^^^^^^^^ error: attempt to shift left with overflow - --> $DIR/lint-exceeding-bitshifts.rs:25:15 + --> $DIR/lint-exceeding-bitshifts.rs:15:15 | LL | let n = 1i8 << 8; //~ ERROR: attempt to shift left with overflow | ^^^^^^^^ error: attempt to shift left with overflow - --> $DIR/lint-exceeding-bitshifts.rs:27:15 + --> $DIR/lint-exceeding-bitshifts.rs:17:15 | LL | let n = 1i16 << 16; //~ ERROR: attempt to shift left with overflow | ^^^^^^^^^^ error: attempt to shift left with overflow - --> $DIR/lint-exceeding-bitshifts.rs:29:15 + --> $DIR/lint-exceeding-bitshifts.rs:19:15 | LL | let n = 1i32 << 32; //~ ERROR: attempt to shift left with overflow | ^^^^^^^^^^ error: attempt to shift left with overflow - --> $DIR/lint-exceeding-bitshifts.rs:31:15 + --> $DIR/lint-exceeding-bitshifts.rs:21:15 | LL | let n = 1i64 << 64; //~ ERROR: attempt to shift left with overflow | ^^^^^^^^^^ error: attempt to shift right with overflow - --> $DIR/lint-exceeding-bitshifts.rs:34:15 + --> $DIR/lint-exceeding-bitshifts.rs:24:15 | LL | let n = 1u8 >> 8; //~ ERROR: attempt to shift right with overflow | ^^^^^^^^ error: attempt to shift right with overflow - --> $DIR/lint-exceeding-bitshifts.rs:36:15 + --> $DIR/lint-exceeding-bitshifts.rs:26:15 | LL | let n = 1u16 >> 16; //~ ERROR: attempt to shift right with overflow | ^^^^^^^^^^ error: attempt to shift right with overflow - --> $DIR/lint-exceeding-bitshifts.rs:38:15 + --> $DIR/lint-exceeding-bitshifts.rs:28:15 | LL | let n = 1u32 >> 32; //~ ERROR: attempt to shift right with overflow | ^^^^^^^^^^ error: attempt to shift right with overflow - --> $DIR/lint-exceeding-bitshifts.rs:40:15 + --> $DIR/lint-exceeding-bitshifts.rs:30:15 | LL | let n = 1u64 >> 64; //~ ERROR: attempt to shift right with overflow | ^^^^^^^^^^ error: attempt to shift right with overflow - --> $DIR/lint-exceeding-bitshifts.rs:42:15 + --> $DIR/lint-exceeding-bitshifts.rs:32:15 | LL | let n = 1i8 >> 8; //~ ERROR: attempt to shift right with overflow | ^^^^^^^^ error: attempt to shift right with overflow - --> $DIR/lint-exceeding-bitshifts.rs:44:15 + --> $DIR/lint-exceeding-bitshifts.rs:34:15 | LL | let n = 1i16 >> 16; //~ ERROR: attempt to shift right with overflow | ^^^^^^^^^^ error: attempt to shift right with overflow - --> $DIR/lint-exceeding-bitshifts.rs:46:15 + --> $DIR/lint-exceeding-bitshifts.rs:36:15 | LL | let n = 1i32 >> 32; //~ ERROR: attempt to shift right with overflow | ^^^^^^^^^^ error: attempt to shift right with overflow - --> $DIR/lint-exceeding-bitshifts.rs:48:15 + --> $DIR/lint-exceeding-bitshifts.rs:38:15 | LL | let n = 1i64 >> 64; //~ ERROR: attempt to shift right with overflow | ^^^^^^^^^^ error: attempt to shift left with overflow - --> $DIR/lint-exceeding-bitshifts.rs:52:15 + --> $DIR/lint-exceeding-bitshifts.rs:42:15 | LL | let n = n << 8; //~ ERROR: attempt to shift left with overflow | ^^^^^^ error: attempt to shift left with overflow - --> $DIR/lint-exceeding-bitshifts.rs:54:15 + --> $DIR/lint-exceeding-bitshifts.rs:44:15 | LL | let n = 1u8 << -8; //~ ERROR: attempt to shift left with overflow | ^^^^^^^^^ diff --git a/src/test/ui/lint/lint-exceeding-bitshifts2.rs b/src/test/ui/lint/lint-exceeding-bitshifts2.rs index 3ba300eb7c4ab..bde4865aa3f9e 100644 --- a/src/test/ui/lint/lint-exceeding-bitshifts2.rs +++ b/src/test/ui/lint/lint-exceeding-bitshifts2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(exceeding_bitshifts, const_err)] #![allow(unused_variables)] #![allow(dead_code)] diff --git a/src/test/ui/lint/lint-exceeding-bitshifts2.stderr b/src/test/ui/lint/lint-exceeding-bitshifts2.stderr index 17b4235a73f22..0adcde02acb7b 100644 --- a/src/test/ui/lint/lint-exceeding-bitshifts2.stderr +++ b/src/test/ui/lint/lint-exceeding-bitshifts2.stderr @@ -1,23 +1,23 @@ error: attempt to shift left with overflow - --> $DIR/lint-exceeding-bitshifts2.rs:17:15 + --> $DIR/lint-exceeding-bitshifts2.rs:7:15 | LL | let n = 1u8 << (4+4); //~ ERROR: attempt to shift left with overflow | ^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-exceeding-bitshifts2.rs:11:9 + --> $DIR/lint-exceeding-bitshifts2.rs:1:9 | LL | #![deny(exceeding_bitshifts, const_err)] | ^^^^^^^^^^^^^^^^^^^ error: attempt to shift left with overflow - --> $DIR/lint-exceeding-bitshifts2.rs:25:15 + --> $DIR/lint-exceeding-bitshifts2.rs:15:15 | LL | let n = 1_isize << BITS; //~ ERROR: attempt to shift left with overflow | ^^^^^^^^^^^^^^^ error: attempt to shift left with overflow - --> $DIR/lint-exceeding-bitshifts2.rs:26:15 + --> $DIR/lint-exceeding-bitshifts2.rs:16:15 | LL | let n = 1_usize << BITS; //~ ERROR: attempt to shift left with overflow | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-forbid-attr.rs b/src/test/ui/lint/lint-forbid-attr.rs index 65e01600c1042..082b5430bf471 100644 --- a/src/test/ui/lint/lint-forbid-attr.rs +++ b/src/test/ui/lint/lint-forbid-attr.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![forbid(deprecated)] #[allow(deprecated)] diff --git a/src/test/ui/lint/lint-forbid-attr.stderr b/src/test/ui/lint/lint-forbid-attr.stderr index aa0c0c1f5c2ba..6e1e2b3e1478b 100644 --- a/src/test/ui/lint/lint-forbid-attr.stderr +++ b/src/test/ui/lint/lint-forbid-attr.stderr @@ -1,5 +1,5 @@ error[E0453]: allow(deprecated) overruled by outer forbid(deprecated) - --> $DIR/lint-forbid-attr.rs:13:9 + --> $DIR/lint-forbid-attr.rs:3:9 | LL | #![forbid(deprecated)] | ---------- `forbid` level set here diff --git a/src/test/ui/lint/lint-forbid-cmdline.rs b/src/test/ui/lint/lint-forbid-cmdline.rs index 6a4d17b33de73..150685c3186aa 100644 --- a/src/test/ui/lint/lint-forbid-cmdline.rs +++ b/src/test/ui/lint/lint-forbid-cmdline.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -F deprecated #[allow(deprecated)] //~ ERROR allow(deprecated) overruled by outer forbid(deprecated) diff --git a/src/test/ui/lint/lint-forbid-cmdline.stderr b/src/test/ui/lint/lint-forbid-cmdline.stderr index 37a2699e89866..35539f0e87770 100644 --- a/src/test/ui/lint/lint-forbid-cmdline.stderr +++ b/src/test/ui/lint/lint-forbid-cmdline.stderr @@ -1,5 +1,5 @@ error[E0453]: allow(deprecated) overruled by outer forbid(deprecated) - --> $DIR/lint-forbid-cmdline.rs:13:9 + --> $DIR/lint-forbid-cmdline.rs:3:9 | LL | #[allow(deprecated)] //~ ERROR allow(deprecated) overruled by outer forbid(deprecated) | ^^^^^^^^^^ overruled by previous forbid diff --git a/src/test/ui/lint/lint-group-nonstandard-style.rs b/src/test/ui/lint/lint-group-nonstandard-style.rs index 55d6168e6e008..1e99764df15be 100644 --- a/src/test/ui/lint/lint-group-nonstandard-style.rs +++ b/src/test/ui/lint/lint-group-nonstandard-style.rs @@ -1,12 +1,6 @@ // Copyright 2014–2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![deny(nonstandard_style)] #![allow(dead_code)] diff --git a/src/test/ui/lint/lint-group-nonstandard-style.stderr b/src/test/ui/lint/lint-group-nonstandard-style.stderr index 6979510e50048..0456a4d56f620 100644 --- a/src/test/ui/lint/lint-group-nonstandard-style.stderr +++ b/src/test/ui/lint/lint-group-nonstandard-style.stderr @@ -1,63 +1,63 @@ error: function `CamelCase` should have a snake case name such as `camel_case` - --> $DIR/lint-group-nonstandard-style.rs:14:1 + --> $DIR/lint-group-nonstandard-style.rs:8:1 | LL | fn CamelCase() {} //~ ERROR should have a snake | ^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-group-nonstandard-style.rs:11:9 + --> $DIR/lint-group-nonstandard-style.rs:5:9 | LL | #![deny(nonstandard_style)] | ^^^^^^^^^^^^^^^^^ = note: #[deny(non_snake_case)] implied by #[deny(nonstandard_style)] error: function `CamelCase` should have a snake case name such as `camel_case` - --> $DIR/lint-group-nonstandard-style.rs:22:9 + --> $DIR/lint-group-nonstandard-style.rs:16:9 | LL | fn CamelCase() {} //~ ERROR should have a snake | ^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-group-nonstandard-style.rs:20:14 + --> $DIR/lint-group-nonstandard-style.rs:14:14 | LL | #[forbid(nonstandard_style)] | ^^^^^^^^^^^^^^^^^ = note: #[forbid(non_snake_case)] implied by #[forbid(nonstandard_style)] error: static variable `bad` should have an upper case name such as `BAD` - --> $DIR/lint-group-nonstandard-style.rs:24:9 + --> $DIR/lint-group-nonstandard-style.rs:18:9 | LL | static bad: isize = 1; //~ ERROR should have an upper | ^^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-group-nonstandard-style.rs:20:14 + --> $DIR/lint-group-nonstandard-style.rs:14:14 | LL | #[forbid(nonstandard_style)] | ^^^^^^^^^^^^^^^^^ = note: #[forbid(non_upper_case_globals)] implied by #[forbid(nonstandard_style)] warning: function `CamelCase` should have a snake case name such as `camel_case` - --> $DIR/lint-group-nonstandard-style.rs:30:9 + --> $DIR/lint-group-nonstandard-style.rs:24:9 | LL | fn CamelCase() {} //~ WARN should have a snake | ^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-group-nonstandard-style.rs:28:17 + --> $DIR/lint-group-nonstandard-style.rs:22:17 | LL | #![warn(nonstandard_style)] | ^^^^^^^^^^^^^^^^^ = note: #[warn(non_snake_case)] implied by #[warn(nonstandard_style)] warning: type `snake_case` should have a camel case name such as `SnakeCase` - --> $DIR/lint-group-nonstandard-style.rs:32:9 + --> $DIR/lint-group-nonstandard-style.rs:26:9 | LL | struct snake_case; //~ WARN should have a camel | ^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-group-nonstandard-style.rs:28:17 + --> $DIR/lint-group-nonstandard-style.rs:22:17 | LL | #![warn(nonstandard_style)] | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-group-style.rs b/src/test/ui/lint/lint-group-style.rs index 9f33f57f48a28..14c7a26fb48a3 100644 --- a/src/test/ui/lint/lint-group-style.rs +++ b/src/test/ui/lint/lint-group-style.rs @@ -1,12 +1,6 @@ // Copyright 2014–2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![deny(bad_style)] #![allow(dead_code)] diff --git a/src/test/ui/lint/lint-group-style.stderr b/src/test/ui/lint/lint-group-style.stderr index c1b15160bc501..0357db6c5486f 100644 --- a/src/test/ui/lint/lint-group-style.stderr +++ b/src/test/ui/lint/lint-group-style.stderr @@ -1,63 +1,63 @@ error: function `CamelCase` should have a snake case name such as `camel_case` - --> $DIR/lint-group-style.rs:14:1 + --> $DIR/lint-group-style.rs:8:1 | LL | fn CamelCase() {} //~ ERROR should have a snake | ^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-group-style.rs:11:9 + --> $DIR/lint-group-style.rs:5:9 | LL | #![deny(bad_style)] | ^^^^^^^^^ = note: #[deny(non_snake_case)] implied by #[deny(bad_style)] error: function `CamelCase` should have a snake case name such as `camel_case` - --> $DIR/lint-group-style.rs:22:9 + --> $DIR/lint-group-style.rs:16:9 | LL | fn CamelCase() {} //~ ERROR should have a snake | ^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-group-style.rs:20:14 + --> $DIR/lint-group-style.rs:14:14 | LL | #[forbid(bad_style)] | ^^^^^^^^^ = note: #[forbid(non_snake_case)] implied by #[forbid(bad_style)] error: static variable `bad` should have an upper case name such as `BAD` - --> $DIR/lint-group-style.rs:24:9 + --> $DIR/lint-group-style.rs:18:9 | LL | static bad: isize = 1; //~ ERROR should have an upper | ^^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-group-style.rs:20:14 + --> $DIR/lint-group-style.rs:14:14 | LL | #[forbid(bad_style)] | ^^^^^^^^^ = note: #[forbid(non_upper_case_globals)] implied by #[forbid(bad_style)] warning: function `CamelCase` should have a snake case name such as `camel_case` - --> $DIR/lint-group-style.rs:30:9 + --> $DIR/lint-group-style.rs:24:9 | LL | fn CamelCase() {} //~ WARN should have a snake | ^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-group-style.rs:28:17 + --> $DIR/lint-group-style.rs:22:17 | LL | #![warn(bad_style)] | ^^^^^^^^^ = note: #[warn(non_snake_case)] implied by #[warn(bad_style)] warning: type `snake_case` should have a camel case name such as `SnakeCase` - --> $DIR/lint-group-style.rs:32:9 + --> $DIR/lint-group-style.rs:26:9 | LL | struct snake_case; //~ WARN should have a camel | ^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-group-style.rs:28:17 + --> $DIR/lint-group-style.rs:22:17 | LL | #![warn(bad_style)] | ^^^^^^^^^ diff --git a/src/test/ui/lint/lint-impl-fn.rs b/src/test/ui/lint/lint-impl-fn.rs index 54a720d75b5ad..46874d95c32fb 100644 --- a/src/test/ui/lint/lint-impl-fn.rs +++ b/src/test/ui/lint/lint-impl-fn.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(while_true)] #![allow(dead_code)] diff --git a/src/test/ui/lint/lint-impl-fn.stderr b/src/test/ui/lint/lint-impl-fn.stderr index ed37e8778759e..b0a3f61978435 100644 --- a/src/test/ui/lint/lint-impl-fn.stderr +++ b/src/test/ui/lint/lint-impl-fn.stderr @@ -1,35 +1,35 @@ error: denote infinite loops with `loop { ... }` - --> $DIR/lint-impl-fn.rs:20:21 + --> $DIR/lint-impl-fn.rs:10:21 | LL | fn bar(&self) { while true {} } //~ ERROR: infinite loops | ^^^^^^^^^^ help: use `loop` | note: lint level defined here - --> $DIR/lint-impl-fn.rs:19:12 + --> $DIR/lint-impl-fn.rs:9:12 | LL | #[deny(while_true)] | ^^^^^^^^^^ error: denote infinite loops with `loop { ... }` - --> $DIR/lint-impl-fn.rs:28:25 + --> $DIR/lint-impl-fn.rs:18:25 | LL | fn foo(&self) { while true {} } //~ ERROR: infinite loops | ^^^^^^^^^^ help: use `loop` | note: lint level defined here - --> $DIR/lint-impl-fn.rs:23:8 + --> $DIR/lint-impl-fn.rs:13:8 | LL | #[deny(while_true)] | ^^^^^^^^^^ error: denote infinite loops with `loop { ... }` - --> $DIR/lint-impl-fn.rs:37:5 + --> $DIR/lint-impl-fn.rs:27:5 | LL | while true {} //~ ERROR: infinite loops | ^^^^^^^^^^ help: use `loop` | note: lint level defined here - --> $DIR/lint-impl-fn.rs:35:8 + --> $DIR/lint-impl-fn.rs:25:8 | LL | #[deny(while_true)] | ^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-malformed.rs b/src/test/ui/lint/lint-malformed.rs index ad5e3aa3f0606..e9232497c3f04 100644 --- a/src/test/ui/lint/lint-malformed.rs +++ b/src/test/ui/lint/lint-malformed.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny = "foo"] //~ ERROR malformed lint attribute #![allow(bar = "baz")] //~ ERROR malformed lint attribute diff --git a/src/test/ui/lint/lint-malformed.stderr b/src/test/ui/lint/lint-malformed.stderr index 7b8155cb41066..554b0250d0a1e 100644 --- a/src/test/ui/lint/lint-malformed.stderr +++ b/src/test/ui/lint/lint-malformed.stderr @@ -1,11 +1,11 @@ error[E0452]: malformed lint attribute - --> $DIR/lint-malformed.rs:11:1 + --> $DIR/lint-malformed.rs:1:1 | LL | #![deny = "foo"] //~ ERROR malformed lint attribute | ^^^^^^^^^^^^^^^^ error[E0452]: malformed lint attribute - --> $DIR/lint-malformed.rs:12:10 + --> $DIR/lint-malformed.rs:2:10 | LL | #![allow(bar = "baz")] //~ ERROR malformed lint attribute | ^^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-misplaced-attr.rs b/src/test/ui/lint/lint-misplaced-attr.rs index 18ea5a383f6b4..e5ad7a53e0cc9 100644 --- a/src/test/ui/lint/lint-misplaced-attr.rs +++ b/src/test/ui/lint/lint-misplaced-attr.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // When denying at the crate level, be sure to not get random warnings from the // injected intrinsics by the compiler. diff --git a/src/test/ui/lint/lint-misplaced-attr.stderr b/src/test/ui/lint/lint-misplaced-attr.stderr index 17f29a6ba79ed..2a28d54619c6d 100644 --- a/src/test/ui/lint/lint-misplaced-attr.stderr +++ b/src/test/ui/lint/lint-misplaced-attr.stderr @@ -1,29 +1,29 @@ error: unused attribute - --> $DIR/lint-misplaced-attr.rs:17:5 + --> $DIR/lint-misplaced-attr.rs:7:5 | LL | #![crate_type = "bin"] //~ ERROR unused attribute | ^^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-misplaced-attr.rs:14:9 + --> $DIR/lint-misplaced-attr.rs:4:9 | LL | #![deny(unused_attributes)] | ^^^^^^^^^^^^^^^^^ error: crate-level attribute should be in the root module - --> $DIR/lint-misplaced-attr.rs:17:5 + --> $DIR/lint-misplaced-attr.rs:7:5 | LL | #![crate_type = "bin"] //~ ERROR unused attribute | ^^^^^^^^^^^^^^^^^^^^^^ error: unused attribute - --> $DIR/lint-misplaced-attr.rs:21:1 + --> $DIR/lint-misplaced-attr.rs:11:1 | LL | #[crate_type = "bin"] fn main() {} //~ ERROR unused attribute | ^^^^^^^^^^^^^^^^^^^^^ error: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/lint-misplaced-attr.rs:21:1 + --> $DIR/lint-misplaced-attr.rs:11:1 | LL | #[crate_type = "bin"] fn main() {} //~ ERROR unused attribute | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-missing-copy-implementations.rs b/src/test/ui/lint/lint-missing-copy-implementations.rs index 94a11aac06785..918f40de15378 100644 --- a/src/test/ui/lint/lint-missing-copy-implementations.rs +++ b/src/test/ui/lint/lint-missing-copy-implementations.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // See issue 19712 #![deny(missing_copy_implementations)] diff --git a/src/test/ui/lint/lint-missing-copy-implementations.stderr b/src/test/ui/lint/lint-missing-copy-implementations.stderr index 3cb89ef794a49..30da3ac879ea8 100644 --- a/src/test/ui/lint/lint-missing-copy-implementations.stderr +++ b/src/test/ui/lint/lint-missing-copy-implementations.stderr @@ -1,5 +1,5 @@ error: type could implement `Copy`; consider adding `impl Copy` - --> $DIR/lint-missing-copy-implementations.rs:16:5 + --> $DIR/lint-missing-copy-implementations.rs:6:5 | LL | / pub struct Foo { //~ ERROR type could implement `Copy`; consider adding `impl Copy` LL | | pub field: i32 @@ -7,7 +7,7 @@ LL | | } | |_____^ | note: lint level defined here - --> $DIR/lint-missing-copy-implementations.rs:13:9 + --> $DIR/lint-missing-copy-implementations.rs:3:9 | LL | #![deny(missing_copy_implementations)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-missing-doc.rs b/src/test/ui/lint/lint-missing-doc.rs index 4add67f61e0a9..a2466d28fb028 100644 --- a/src/test/ui/lint/lint-missing-doc.rs +++ b/src/test/ui/lint/lint-missing-doc.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // When denying at the crate level, be sure to not get random warnings from the // injected intrinsics by the compiler. #![deny(missing_docs)] diff --git a/src/test/ui/lint/lint-missing-doc.stderr b/src/test/ui/lint/lint-missing-doc.stderr index e61d56d851875..ea5a14bca7cf3 100644 --- a/src/test/ui/lint/lint-missing-doc.stderr +++ b/src/test/ui/lint/lint-missing-doc.stderr @@ -1,119 +1,119 @@ error: missing documentation for a type alias - --> $DIR/lint-missing-doc.rs:21:1 + --> $DIR/lint-missing-doc.rs:11:1 | LL | pub type PubTypedef = String; //~ ERROR: missing documentation for a type alias | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-missing-doc.rs:13:9 + --> $DIR/lint-missing-doc.rs:3:9 | LL | #![deny(missing_docs)] | ^^^^^^^^^^^^ error: missing documentation for a struct - --> $DIR/lint-missing-doc.rs:28:1 + --> $DIR/lint-missing-doc.rs:18:1 | LL | pub struct PubFoo { //~ ERROR: missing documentation for a struct | ^^^^^^^^^^^^^^^^^ error: missing documentation for a struct field - --> $DIR/lint-missing-doc.rs:29:5 + --> $DIR/lint-missing-doc.rs:19:5 | LL | pub a: isize, //~ ERROR: missing documentation for a struct field | ^^^^^^^^^^^^ error: missing documentation for a module - --> $DIR/lint-missing-doc.rs:40:1 + --> $DIR/lint-missing-doc.rs:30:1 | LL | pub mod pub_module_no_dox {} //~ ERROR: missing documentation for a module | ^^^^^^^^^^^^^^^^^^^^^^^^^ error: missing documentation for a function - --> $DIR/lint-missing-doc.rs:44:1 + --> $DIR/lint-missing-doc.rs:34:1 | LL | pub fn foo2() {} //~ ERROR: missing documentation for a function | ^^^^^^^^^^^^^ error: missing documentation for a trait - --> $DIR/lint-missing-doc.rs:62:1 + --> $DIR/lint-missing-doc.rs:52:1 | LL | pub trait C { //~ ERROR: missing documentation for a trait | ^^^^^^^^^^^ error: missing documentation for a trait method - --> $DIR/lint-missing-doc.rs:63:5 + --> $DIR/lint-missing-doc.rs:53:5 | LL | fn foo(&self); //~ ERROR: missing documentation for a trait method | ^^^^^^^^^^^^^^ error: missing documentation for a trait method - --> $DIR/lint-missing-doc.rs:64:5 + --> $DIR/lint-missing-doc.rs:54:5 | LL | fn foo_with_impl(&self) {} //~ ERROR: missing documentation for a trait method | ^^^^^^^^^^^^^^^^^^^^^^^ error: missing documentation for an associated type - --> $DIR/lint-missing-doc.rs:74:5 + --> $DIR/lint-missing-doc.rs:64:5 | LL | type AssociatedType; //~ ERROR: missing documentation for an associated type | ^^^^^^^^^^^^^^^^^^^^ error: missing documentation for an associated type - --> $DIR/lint-missing-doc.rs:75:5 + --> $DIR/lint-missing-doc.rs:65:5 | LL | type AssociatedTypeDef = Self; //~ ERROR: missing documentation for an associated type | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: missing documentation for a method - --> $DIR/lint-missing-doc.rs:91:5 + --> $DIR/lint-missing-doc.rs:81:5 | LL | pub fn foo() {} //~ ERROR: missing documentation for a method | ^^^^^^^^^^^^ error: missing documentation for an enum - --> $DIR/lint-missing-doc.rs:128:1 + --> $DIR/lint-missing-doc.rs:118:1 | LL | pub enum PubBaz { //~ ERROR: missing documentation for an enum | ^^^^^^^^^^^^^^^ error: missing documentation for a variant - --> $DIR/lint-missing-doc.rs:129:5 + --> $DIR/lint-missing-doc.rs:119:5 | LL | PubBazA { //~ ERROR: missing documentation for a variant | ^^^^^^^ error: missing documentation for a struct field - --> $DIR/lint-missing-doc.rs:130:9 + --> $DIR/lint-missing-doc.rs:120:9 | LL | a: isize, //~ ERROR: missing documentation for a struct field | ^^^^^^^^ error: missing documentation for a constant - --> $DIR/lint-missing-doc.rs:161:1 + --> $DIR/lint-missing-doc.rs:151:1 | LL | pub const FOO4: u32 = 0; //~ ERROR: missing documentation for a const | ^^^^^^^^^^^^^^^^^^^^^^^^ error: missing documentation for a static - --> $DIR/lint-missing-doc.rs:171:1 + --> $DIR/lint-missing-doc.rs:161:1 | LL | pub static BAR4: u32 = 0; //~ ERROR: missing documentation for a static | ^^^^^^^^^^^^^^^^^^^^^^^^^ error: missing documentation for a function - --> $DIR/lint-missing-doc.rs:177:5 + --> $DIR/lint-missing-doc.rs:167:5 | LL | pub fn undocumented1() {} //~ ERROR: missing documentation for a function | ^^^^^^^^^^^^^^^^^^^^^^ error: missing documentation for a function - --> $DIR/lint-missing-doc.rs:178:5 + --> $DIR/lint-missing-doc.rs:168:5 | LL | pub fn undocumented2() {} //~ ERROR: missing documentation for a function | ^^^^^^^^^^^^^^^^^^^^^^ error: missing documentation for a function - --> $DIR/lint-missing-doc.rs:184:9 + --> $DIR/lint-missing-doc.rs:174:9 | LL | pub fn also_undocumented1() {} //~ ERROR: missing documentation for a function | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-non-camel-case-types.rs b/src/test/ui/lint/lint-non-camel-case-types.rs index 5dcdf3a863f87..6ca7a3b58133e 100644 --- a/src/test/ui/lint/lint-non-camel-case-types.rs +++ b/src/test/ui/lint/lint-non-camel-case-types.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![forbid(non_camel_case_types)] #![allow(dead_code)] diff --git a/src/test/ui/lint/lint-non-camel-case-types.stderr b/src/test/ui/lint/lint-non-camel-case-types.stderr index 85610dc7fa379..b352b82165612 100644 --- a/src/test/ui/lint/lint-non-camel-case-types.stderr +++ b/src/test/ui/lint/lint-non-camel-case-types.stderr @@ -1,17 +1,17 @@ error: type `ONE_TWO_THREE` should have a camel case name such as `OneTwoThree` - --> $DIR/lint-non-camel-case-types.rs:14:1 + --> $DIR/lint-non-camel-case-types.rs:4:1 | LL | struct ONE_TWO_THREE; | ^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-non-camel-case-types.rs:11:11 + --> $DIR/lint-non-camel-case-types.rs:1:11 | LL | #![forbid(non_camel_case_types)] | ^^^^^^^^^^^^^^^^^^^^ error: type `foo` should have a camel case name such as `Foo` - --> $DIR/lint-non-camel-case-types.rs:17:1 + --> $DIR/lint-non-camel-case-types.rs:7:1 | LL | / struct foo { //~ ERROR type `foo` should have a camel case name such as `Foo` LL | | bar: isize, @@ -19,7 +19,7 @@ LL | | } | |_^ error: type `foo2` should have a camel case name such as `Foo2` - --> $DIR/lint-non-camel-case-types.rs:21:1 + --> $DIR/lint-non-camel-case-types.rs:11:1 | LL | / enum foo2 { //~ ERROR type `foo2` should have a camel case name such as `Foo2` LL | | Bar @@ -27,7 +27,7 @@ LL | | } | |_^ error: type `foo3` should have a camel case name such as `Foo3` - --> $DIR/lint-non-camel-case-types.rs:25:1 + --> $DIR/lint-non-camel-case-types.rs:15:1 | LL | / struct foo3 { //~ ERROR type `foo3` should have a camel case name such as `Foo3` LL | | bar: isize @@ -35,19 +35,19 @@ LL | | } | |_^ error: type `foo4` should have a camel case name such as `Foo4` - --> $DIR/lint-non-camel-case-types.rs:29:1 + --> $DIR/lint-non-camel-case-types.rs:19:1 | LL | type foo4 = isize; //~ ERROR type `foo4` should have a camel case name such as `Foo4` | ^^^^^^^^^^^^^^^^^^ error: variant `bar` should have a camel case name such as `Bar` - --> $DIR/lint-non-camel-case-types.rs:32:5 + --> $DIR/lint-non-camel-case-types.rs:22:5 | LL | bar //~ ERROR variant `bar` should have a camel case name such as `Bar` | ^^^ error: trait `foo6` should have a camel case name such as `Foo6` - --> $DIR/lint-non-camel-case-types.rs:35:1 + --> $DIR/lint-non-camel-case-types.rs:25:1 | LL | / trait foo6 { //~ ERROR trait `foo6` should have a camel case name such as `Foo6` LL | | fn dummy(&self) { } @@ -55,31 +55,31 @@ LL | | } | |_^ error: type parameter `ty` should have a camel case name such as `Ty` - --> $DIR/lint-non-camel-case-types.rs:39:6 + --> $DIR/lint-non-camel-case-types.rs:29:6 | LL | fn f(_: ty) {} //~ ERROR type parameter `ty` should have a camel case name such as `Ty` | ^^ error: type `__` should have a camel case name such as `CamelCase` - --> $DIR/lint-non-camel-case-types.rs:46:1 + --> $DIR/lint-non-camel-case-types.rs:36:1 | LL | type __ = isize; //~ ERROR type `__` should have a camel case name such as `CamelCase` | ^^^^^^^^^^^^^^^^ error: type `X86__64` should have a camel case name such as `X86_64` - --> $DIR/lint-non-camel-case-types.rs:50:1 + --> $DIR/lint-non-camel-case-types.rs:40:1 | LL | struct X86__64; //~ ERROR type `X86__64` should have a camel case name such as `X86_64` | ^^^^^^^^^^^^^^^ error: type `Abc_123` should have a camel case name such as `Abc123` - --> $DIR/lint-non-camel-case-types.rs:52:1 + --> $DIR/lint-non-camel-case-types.rs:42:1 | LL | struct Abc_123; //~ ERROR type `Abc_123` should have a camel case name such as `Abc123` | ^^^^^^^^^^^^^^^ error: type `A1_b2_c3` should have a camel case name such as `A1B2C3` - --> $DIR/lint-non-camel-case-types.rs:54:1 + --> $DIR/lint-non-camel-case-types.rs:44:1 | LL | struct A1_b2_c3; //~ ERROR type `A1_b2_c3` should have a camel case name such as `A1B2C3` | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-non-snake-case-crate-2.rs b/src/test/ui/lint/lint-non-snake-case-crate-2.rs index fe22c21df244a..56c35c256f2a2 100644 --- a/src/test/ui/lint/lint-non-snake-case-crate-2.rs +++ b/src/test/ui/lint/lint-non-snake-case-crate-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --crate-name NonSnakeCase // error-pattern: crate `NonSnakeCase` should have a snake case name such as `non_snake_case` diff --git a/src/test/ui/lint/lint-non-snake-case-crate-2.stderr b/src/test/ui/lint/lint-non-snake-case-crate-2.stderr index ce49d9a0b8074..eef7f1c79ee5f 100644 --- a/src/test/ui/lint/lint-non-snake-case-crate-2.stderr +++ b/src/test/ui/lint/lint-non-snake-case-crate-2.stderr @@ -1,7 +1,7 @@ error: crate `NonSnakeCase` should have a snake case name such as `non_snake_case` | note: lint level defined here - --> $DIR/lint-non-snake-case-crate-2.rs:14:9 + --> $DIR/lint-non-snake-case-crate-2.rs:4:9 | LL | #![deny(non_snake_case)] | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-non-snake-case-crate.rs b/src/test/ui/lint/lint-non-snake-case-crate.rs index 9ca0a34e6ff26..221ce611db5d2 100644 --- a/src/test/ui/lint/lint-non-snake-case-crate.rs +++ b/src/test/ui/lint/lint-non-snake-case-crate.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "NonSnakeCase"] //~^ ERROR crate `NonSnakeCase` should have a snake case name such as `non_snake_case` #![deny(non_snake_case)] diff --git a/src/test/ui/lint/lint-non-snake-case-crate.stderr b/src/test/ui/lint/lint-non-snake-case-crate.stderr index 4d55661daa0ec..6d8112091ece6 100644 --- a/src/test/ui/lint/lint-non-snake-case-crate.stderr +++ b/src/test/ui/lint/lint-non-snake-case-crate.stderr @@ -1,11 +1,11 @@ error: crate `NonSnakeCase` should have a snake case name such as `non_snake_case` - --> $DIR/lint-non-snake-case-crate.rs:11:1 + --> $DIR/lint-non-snake-case-crate.rs:1:1 | LL | #![crate_name = "NonSnakeCase"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-non-snake-case-crate.rs:13:9 + --> $DIR/lint-non-snake-case-crate.rs:3:9 | LL | #![deny(non_snake_case)] | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-non-snake-case-functions.rs b/src/test/ui/lint/lint-non-snake-case-functions.rs index 6cfdc6ad90b91..5ad454a7a52d5 100644 --- a/src/test/ui/lint/lint-non-snake-case-functions.rs +++ b/src/test/ui/lint/lint-non-snake-case-functions.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(non_snake_case)] #![allow(dead_code)] diff --git a/src/test/ui/lint/lint-non-snake-case-functions.stderr b/src/test/ui/lint/lint-non-snake-case-functions.stderr index f7ac48da90118..508fb225437e4 100644 --- a/src/test/ui/lint/lint-non-snake-case-functions.stderr +++ b/src/test/ui/lint/lint-non-snake-case-functions.stderr @@ -1,59 +1,59 @@ error: method `Foo_Method` should have a snake case name such as `foo_method` - --> $DIR/lint-non-snake-case-functions.rs:17:5 + --> $DIR/lint-non-snake-case-functions.rs:7:5 | LL | fn Foo_Method() {} | ^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-non-snake-case-functions.rs:11:9 + --> $DIR/lint-non-snake-case-functions.rs:1:9 | LL | #![deny(non_snake_case)] | ^^^^^^^^^^^^^^ error: method `foo__method` should have a snake case name such as `foo_method` - --> $DIR/lint-non-snake-case-functions.rs:21:5 + --> $DIR/lint-non-snake-case-functions.rs:11:5 | LL | fn foo__method(&self) {} | ^^^^^^^^^^^^^^^^^^^^^^^^ error: method `xyZ` should have a snake case name such as `xy_z` - --> $DIR/lint-non-snake-case-functions.rs:24:5 + --> $DIR/lint-non-snake-case-functions.rs:14:5 | LL | pub fn xyZ(&mut self) {} | ^^^^^^^^^^^^^^^^^^^^^^^^ error: method `render_HTML` should have a snake case name such as `render_html` - --> $DIR/lint-non-snake-case-functions.rs:27:5 + --> $DIR/lint-non-snake-case-functions.rs:17:5 | LL | fn render_HTML() {} | ^^^^^^^^^^^^^^^^^^^ error: trait method `ABC` should have a snake case name such as `abc` - --> $DIR/lint-non-snake-case-functions.rs:32:5 + --> $DIR/lint-non-snake-case-functions.rs:22:5 | LL | fn ABC(); | ^^^^^^^^^ error: trait method `a_b_C` should have a snake case name such as `a_b_c` - --> $DIR/lint-non-snake-case-functions.rs:35:5 + --> $DIR/lint-non-snake-case-functions.rs:25:5 | LL | fn a_b_C(&self) {} | ^^^^^^^^^^^^^^^^^^ error: trait method `something__else` should have a snake case name such as `something_else` - --> $DIR/lint-non-snake-case-functions.rs:38:5 + --> $DIR/lint-non-snake-case-functions.rs:28:5 | LL | fn something__else(&mut self); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: function `Cookie` should have a snake case name such as `cookie` - --> $DIR/lint-non-snake-case-functions.rs:48:1 + --> $DIR/lint-non-snake-case-functions.rs:38:1 | LL | fn Cookie() {} | ^^^^^^^^^^^^^^ error: function `bi_S_Cuit` should have a snake case name such as `bi_s_cuit` - --> $DIR/lint-non-snake-case-functions.rs:51:1 + --> $DIR/lint-non-snake-case-functions.rs:41:1 | LL | pub fn bi_S_Cuit() {} | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-non-snake-case-lifetimes.rs b/src/test/ui/lint/lint-non-snake-case-lifetimes.rs index 64669d90d06bf..c7af431bafc3a 100644 --- a/src/test/ui/lint/lint-non-snake-case-lifetimes.rs +++ b/src/test/ui/lint/lint-non-snake-case-lifetimes.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(non_snake_case)] #![allow(dead_code)] diff --git a/src/test/ui/lint/lint-non-snake-case-lifetimes.stderr b/src/test/ui/lint/lint-non-snake-case-lifetimes.stderr index dc9b5b8cd75ba..694a5a2252565 100644 --- a/src/test/ui/lint/lint-non-snake-case-lifetimes.stderr +++ b/src/test/ui/lint/lint-non-snake-case-lifetimes.stderr @@ -1,11 +1,11 @@ error: lifetime `'FooBar` should have a snake case name such as `'foo_bar` - --> $DIR/lint-non-snake-case-lifetimes.rs:14:6 + --> $DIR/lint-non-snake-case-lifetimes.rs:4:6 | LL | fn f<'FooBar>( //~ ERROR lifetime `'FooBar` should have a snake case name such as `'foo_bar` | ^^^^^^^ | note: lint level defined here - --> $DIR/lint-non-snake-case-lifetimes.rs:11:9 + --> $DIR/lint-non-snake-case-lifetimes.rs:1:9 | LL | #![deny(non_snake_case)] | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-non-snake-case-modules.rs b/src/test/ui/lint/lint-non-snake-case-modules.rs index 5bc84698ec905..90f45a4f41315 100644 --- a/src/test/ui/lint/lint-non-snake-case-modules.rs +++ b/src/test/ui/lint/lint-non-snake-case-modules.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(non_snake_case)] #![allow(dead_code)] diff --git a/src/test/ui/lint/lint-non-snake-case-modules.stderr b/src/test/ui/lint/lint-non-snake-case-modules.stderr index d55d80f31b523..ec3accf2ae882 100644 --- a/src/test/ui/lint/lint-non-snake-case-modules.stderr +++ b/src/test/ui/lint/lint-non-snake-case-modules.stderr @@ -1,5 +1,5 @@ error: module `FooBar` should have a snake case name such as `foo_bar` - --> $DIR/lint-non-snake-case-modules.rs:14:1 + --> $DIR/lint-non-snake-case-modules.rs:4:1 | LL | / mod FooBar { //~ ERROR module `FooBar` should have a snake case name such as `foo_bar` LL | | pub struct S; @@ -7,7 +7,7 @@ LL | | } | |_^ | note: lint level defined here - --> $DIR/lint-non-snake-case-modules.rs:11:9 + --> $DIR/lint-non-snake-case-modules.rs:1:9 | LL | #![deny(non_snake_case)] | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-non-uppercase-statics.rs b/src/test/ui/lint/lint-non-uppercase-statics.rs index 84cc24a00109f..9424bef3dfbf2 100644 --- a/src/test/ui/lint/lint-non-uppercase-statics.rs +++ b/src/test/ui/lint/lint-non-uppercase-statics.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![forbid(non_upper_case_globals)] #![allow(dead_code)] diff --git a/src/test/ui/lint/lint-non-uppercase-statics.stderr b/src/test/ui/lint/lint-non-uppercase-statics.stderr index 0d56c577734ab..9c3dbb2fdeae5 100644 --- a/src/test/ui/lint/lint-non-uppercase-statics.stderr +++ b/src/test/ui/lint/lint-non-uppercase-statics.stderr @@ -1,17 +1,17 @@ error: static variable `foo` should have an upper case name such as `FOO` - --> $DIR/lint-non-uppercase-statics.rs:14:1 + --> $DIR/lint-non-uppercase-statics.rs:4:1 | LL | static foo: isize = 1; //~ ERROR static variable `foo` should have an upper case name such as `FOO` | ^^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-non-uppercase-statics.rs:11:11 + --> $DIR/lint-non-uppercase-statics.rs:1:11 | LL | #![forbid(non_upper_case_globals)] | ^^^^^^^^^^^^^^^^^^^^^^ error: static variable `bar` should have an upper case name such as `BAR` - --> $DIR/lint-non-uppercase-statics.rs:16:1 + --> $DIR/lint-non-uppercase-statics.rs:6:1 | LL | static mut bar: isize = 1; | ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-obsolete-attr.rs b/src/test/ui/lint/lint-obsolete-attr.rs index b234f08d04a42..149948b5a6da2 100644 --- a/src/test/ui/lint/lint-obsolete-attr.rs +++ b/src/test/ui/lint/lint-obsolete-attr.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // When denying at the crate level, be sure to not get random warnings from the // injected intrinsics by the compiler. diff --git a/src/test/ui/lint/lint-obsolete-attr.stderr b/src/test/ui/lint/lint-obsolete-attr.stderr index 4a8a55e260efa..c71bde54acfbc 100644 --- a/src/test/ui/lint/lint-obsolete-attr.stderr +++ b/src/test/ui/lint/lint-obsolete-attr.stderr @@ -1,17 +1,17 @@ error: unused attribute - --> $DIR/lint-obsolete-attr.rs:18:1 + --> $DIR/lint-obsolete-attr.rs:8:1 | LL | #[ab_isize="stdcall"] extern {} //~ ERROR unused attribute | ^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-obsolete-attr.rs:14:9 + --> $DIR/lint-obsolete-attr.rs:4:9 | LL | #![deny(unused_attributes)] | ^^^^^^^^^^^^^^^^^ error: unused attribute - --> $DIR/lint-obsolete-attr.rs:20:1 + --> $DIR/lint-obsolete-attr.rs:10:1 | LL | #[fixed_stack_segment] fn f() {} //~ ERROR unused attribute | ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-output-format-2.rs b/src/test/ui/lint/lint-output-format-2.rs index e87ddde7413d2..f2ac14837e801 100644 --- a/src/test/ui/lint/lint-output-format-2.rs +++ b/src/test/ui/lint/lint-output-format-2.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:lint_output_format.rs #![feature(unstable_test_feature)] diff --git a/src/test/ui/lint/lint-output-format-2.stderr b/src/test/ui/lint/lint-output-format-2.stderr index 8c6247688e80c..dc3ce77bb46ac 100644 --- a/src/test/ui/lint/lint-output-format-2.stderr +++ b/src/test/ui/lint/lint-output-format-2.stderr @@ -1,5 +1,5 @@ warning: use of deprecated item 'lint_output_format::foo': text - --> $DIR/lint-output-format-2.rs:17:26 + --> $DIR/lint-output-format-2.rs:7:26 | LL | use lint_output_format::{foo, bar}; | ^^^ @@ -7,13 +7,13 @@ LL | use lint_output_format::{foo, bar}; = note: #[warn(deprecated)] on by default warning: use of deprecated item 'lint_output_format::foo': text - --> $DIR/lint-output-format-2.rs:22:14 + --> $DIR/lint-output-format-2.rs:12:14 | LL | let _x = foo(); | ^^^ error: compilation successful - --> $DIR/lint-output-format-2.rs:21:1 + --> $DIR/lint-output-format-2.rs:11:1 | LL | / fn main() { //~ ERROR: compilation successful LL | | let _x = foo(); diff --git a/src/test/ui/lint/lint-output-format.rs b/src/test/ui/lint/lint-output-format.rs index 81e0b708b8739..169a98c9483c7 100644 --- a/src/test/ui/lint/lint-output-format.rs +++ b/src/test/ui/lint/lint-output-format.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -F unused_features // aux-build:lint_output_format.rs diff --git a/src/test/ui/lint/lint-output-format.stderr b/src/test/ui/lint/lint-output-format.stderr index bcc279929c657..4dcd8c2316439 100644 --- a/src/test/ui/lint/lint-output-format.stderr +++ b/src/test/ui/lint/lint-output-format.stderr @@ -1,5 +1,5 @@ error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-output-format.rs:16:1 + --> $DIR/lint-output-format.rs:6:1 | LL | extern crate lint_output_format; //~ ERROR use of unstable library feature | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | extern crate lint_output_format; //~ ERROR use of unstable library feature = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-output-format.rs:17:31 + --> $DIR/lint-output-format.rs:7:31 | LL | use lint_output_format::{foo, bar}; //~ ERROR use of unstable library feature | ^^^ @@ -15,7 +15,7 @@ LL | use lint_output_format::{foo, bar}; //~ ERROR use of unstable library featu = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-output-format.rs:21:14 + --> $DIR/lint-output-format.rs:11:14 | LL | let _y = bar(); //~ ERROR use of unstable library feature | ^^^ diff --git a/src/test/ui/lint/lint-owned-heap-memory.rs b/src/test/ui/lint/lint-owned-heap-memory.rs index 9c68da8beafd6..7ef18c28c1ab7 100644 --- a/src/test/ui/lint/lint-owned-heap-memory.rs +++ b/src/test/ui/lint/lint-owned-heap-memory.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] #![forbid(box_pointers)] #![feature(box_syntax)] diff --git a/src/test/ui/lint/lint-owned-heap-memory.stderr b/src/test/ui/lint/lint-owned-heap-memory.stderr index 5b61d30fd3923..572b82b3366ba 100644 --- a/src/test/ui/lint/lint-owned-heap-memory.stderr +++ b/src/test/ui/lint/lint-owned-heap-memory.stderr @@ -1,17 +1,17 @@ error: type uses owned (Box type) pointers: std::boxed::Box - --> $DIR/lint-owned-heap-memory.rs:16:5 + --> $DIR/lint-owned-heap-memory.rs:6:5 | LL | x: Box //~ ERROR type uses owned | ^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-owned-heap-memory.rs:12:11 + --> $DIR/lint-owned-heap-memory.rs:2:11 | LL | #![forbid(box_pointers)] | ^^^^^^^^^^^^ error: type uses owned (Box type) pointers: std::boxed::Box - --> $DIR/lint-owned-heap-memory.rs:20:29 + --> $DIR/lint-owned-heap-memory.rs:10:29 | LL | let _x : Foo = Foo {x : box 10}; | ^^^^^^ diff --git a/src/test/ui/lint/lint-qualification.rs b/src/test/ui/lint/lint-qualification.rs index 57c2166565f96..2aa4526b8169b 100644 --- a/src/test/ui/lint/lint-qualification.rs +++ b/src/test/ui/lint/lint-qualification.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(unused_qualifications)] mod foo { diff --git a/src/test/ui/lint/lint-qualification.stderr b/src/test/ui/lint/lint-qualification.stderr index f4c8186caf704..953ff0f5f652d 100644 --- a/src/test/ui/lint/lint-qualification.stderr +++ b/src/test/ui/lint/lint-qualification.stderr @@ -1,11 +1,11 @@ error: unnecessary qualification - --> $DIR/lint-qualification.rs:19:5 + --> $DIR/lint-qualification.rs:9:5 | LL | foo::bar(); //~ ERROR: unnecessary qualification | ^^^^^^^^ | note: lint level defined here - --> $DIR/lint-qualification.rs:11:9 + --> $DIR/lint-qualification.rs:1:9 | LL | #![deny(unused_qualifications)] | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-removed-allow.rs b/src/test/ui/lint/lint-removed-allow.rs index 9f84190ea18a1..30ba4f02f061f 100644 --- a/src/test/ui/lint/lint-removed-allow.rs +++ b/src/test/ui/lint/lint-removed-allow.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // No warnings about removed lint when // allow(renamed_and_removed_lints) diff --git a/src/test/ui/lint/lint-removed-allow.stderr b/src/test/ui/lint/lint-removed-allow.stderr index 8f4c757e54be2..3af983165eb17 100644 --- a/src/test/ui/lint/lint-removed-allow.stderr +++ b/src/test/ui/lint/lint-removed-allow.stderr @@ -1,11 +1,11 @@ error: unused variable: `unused` - --> $DIR/lint-removed-allow.rs:18:17 + --> $DIR/lint-removed-allow.rs:8:17 | LL | fn main() { let unused = (); } //~ ERROR unused | ^^^^^^ help: consider using `_unused` instead | note: lint level defined here - --> $DIR/lint-removed-allow.rs:17:8 + --> $DIR/lint-removed-allow.rs:7:8 | LL | #[deny(unused_variables)] | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-removed-cmdline.rs b/src/test/ui/lint/lint-removed-cmdline.rs index 09725b201466a..462beabb9451c 100644 --- a/src/test/ui/lint/lint-removed-cmdline.rs +++ b/src/test/ui/lint/lint-removed-cmdline.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // The raw_pointer_derived lint warns about its removal // cc #30346 diff --git a/src/test/ui/lint/lint-removed-cmdline.stderr b/src/test/ui/lint/lint-removed-cmdline.stderr index 86faeec954228..191509c5a180c 100644 --- a/src/test/ui/lint/lint-removed-cmdline.stderr +++ b/src/test/ui/lint/lint-removed-cmdline.stderr @@ -3,13 +3,13 @@ warning: lint `raw_pointer_derive` has been removed: `using derive with raw poin = note: requested on the command line with `-D raw_pointer_derive` error: unused variable: `unused` - --> $DIR/lint-removed-cmdline.rs:22:17 + --> $DIR/lint-removed-cmdline.rs:12:17 | LL | fn main() { let unused = (); } | ^^^^^^ help: consider using `_unused` instead | note: lint level defined here - --> $DIR/lint-removed-cmdline.rs:21:8 + --> $DIR/lint-removed-cmdline.rs:11:8 | LL | #[deny(warnings)] | ^^^^^^^^ diff --git a/src/test/ui/lint/lint-removed.rs b/src/test/ui/lint/lint-removed.rs index 4e53852008f13..92f4372c2bc7e 100644 --- a/src/test/ui/lint/lint-removed.rs +++ b/src/test/ui/lint/lint-removed.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // The raw_pointer_derived lint was removed, but is now reported by // the renamed_and_removed_lints lint, which means it's a warning by // default, and allowed in cargo dependency builds. diff --git a/src/test/ui/lint/lint-removed.stderr b/src/test/ui/lint/lint-removed.stderr index 7d66186f34969..34fa85b0d8b9f 100644 --- a/src/test/ui/lint/lint-removed.stderr +++ b/src/test/ui/lint/lint-removed.stderr @@ -1,5 +1,5 @@ warning: lint `raw_pointer_derive` has been removed: `using derive with raw pointers is ok` - --> $DIR/lint-removed.rs:16:8 + --> $DIR/lint-removed.rs:6:8 | LL | #[deny(raw_pointer_derive)] //~ WARN `raw_pointer_derive` has been removed | ^^^^^^^^^^^^^^^^^^ @@ -7,13 +7,13 @@ LL | #[deny(raw_pointer_derive)] //~ WARN `raw_pointer_derive` has been removed = note: #[warn(renamed_and_removed_lints)] on by default error: unused variable: `unused` - --> $DIR/lint-removed.rs:18:17 + --> $DIR/lint-removed.rs:8:17 | LL | fn main() { let unused = (); } //~ ERROR unused | ^^^^^^ help: consider using `_unused` instead | note: lint level defined here - --> $DIR/lint-removed.rs:17:8 + --> $DIR/lint-removed.rs:7:8 | LL | #[deny(unused_variables)] | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-renamed-allow.rs b/src/test/ui/lint/lint-renamed-allow.rs index f6b94e8982632..9cf6f329c6cf9 100644 --- a/src/test/ui/lint/lint-renamed-allow.rs +++ b/src/test/ui/lint/lint-renamed-allow.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // No warnings about renamed lint when // allow(renamed_and_removed_lints) diff --git a/src/test/ui/lint/lint-renamed-allow.stderr b/src/test/ui/lint/lint-renamed-allow.stderr index 6b2eb27270131..390b4c3f38abd 100644 --- a/src/test/ui/lint/lint-renamed-allow.stderr +++ b/src/test/ui/lint/lint-renamed-allow.stderr @@ -1,11 +1,11 @@ error: unused variable: `unused` - --> $DIR/lint-renamed-allow.rs:18:17 + --> $DIR/lint-renamed-allow.rs:8:17 | LL | fn main() { let unused = (); } //~ ERROR unused | ^^^^^^ help: consider using `_unused` instead | note: lint level defined here - --> $DIR/lint-renamed-allow.rs:17:8 + --> $DIR/lint-renamed-allow.rs:7:8 | LL | #[deny(unused)] | ^^^^^^ diff --git a/src/test/ui/lint/lint-renamed-cmdline.rs b/src/test/ui/lint/lint-renamed-cmdline.rs index f5abf2733b977..c873771e3081c 100644 --- a/src/test/ui/lint/lint-renamed-cmdline.rs +++ b/src/test/ui/lint/lint-renamed-cmdline.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-D bare_trait_object // error-pattern:lint `bare_trait_object` has been renamed to `bare_trait_objects` diff --git a/src/test/ui/lint/lint-renamed-cmdline.stderr b/src/test/ui/lint/lint-renamed-cmdline.stderr index 5e154a0033db7..78a05bdc89f01 100644 --- a/src/test/ui/lint/lint-renamed-cmdline.stderr +++ b/src/test/ui/lint/lint-renamed-cmdline.stderr @@ -3,13 +3,13 @@ warning: lint `bare_trait_object` has been renamed to `bare_trait_objects` = note: requested on the command line with `-D bare_trait_object` error: unused variable: `unused` - --> $DIR/lint-renamed-cmdline.rs:18:17 + --> $DIR/lint-renamed-cmdline.rs:8:17 | LL | fn main() { let unused = (); } | ^^^^^^ help: consider using `_unused` instead | note: lint level defined here - --> $DIR/lint-renamed-cmdline.rs:17:8 + --> $DIR/lint-renamed-cmdline.rs:7:8 | LL | #[deny(unused)] | ^^^^^^ diff --git a/src/test/ui/lint/lint-renamed.rs b/src/test/ui/lint/lint-renamed.rs index c147ec5cf9505..ca32994305390 100644 --- a/src/test/ui/lint/lint-renamed.rs +++ b/src/test/ui/lint/lint-renamed.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[deny(bare_trait_object)] //~^ WARN lint `bare_trait_object` has been renamed to `bare_trait_objects` #[deny(unused)] diff --git a/src/test/ui/lint/lint-renamed.stderr b/src/test/ui/lint/lint-renamed.stderr index a87efc9e92c4b..1296fef5a4c63 100644 --- a/src/test/ui/lint/lint-renamed.stderr +++ b/src/test/ui/lint/lint-renamed.stderr @@ -1,5 +1,5 @@ warning: lint `bare_trait_object` has been renamed to `bare_trait_objects` - --> $DIR/lint-renamed.rs:11:8 + --> $DIR/lint-renamed.rs:1:8 | LL | #[deny(bare_trait_object)] | ^^^^^^^^^^^^^^^^^ help: use the new name: `bare_trait_objects` @@ -7,13 +7,13 @@ LL | #[deny(bare_trait_object)] = note: #[warn(renamed_and_removed_lints)] on by default error: unused variable: `unused` - --> $DIR/lint-renamed.rs:14:17 + --> $DIR/lint-renamed.rs:4:17 | LL | fn main() { let unused = (); } //~ ERROR unused | ^^^^^^ help: consider using `_unused` instead | note: lint level defined here - --> $DIR/lint-renamed.rs:13:8 + --> $DIR/lint-renamed.rs:3:8 | LL | #[deny(unused)] | ^^^^^^ diff --git a/src/test/ui/lint/lint-shorthand-field.rs b/src/test/ui/lint/lint-shorthand-field.rs index 97a976a493f80..846fcf062d48f 100644 --- a/src/test/ui/lint/lint-shorthand-field.rs +++ b/src/test/ui/lint/lint-shorthand-field.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(bad_style, unused_variables)] #![deny(non_shorthand_field_patterns)] diff --git a/src/test/ui/lint/lint-shorthand-field.stderr b/src/test/ui/lint/lint-shorthand-field.stderr index 516be532f5d63..32c69fdddcbf4 100644 --- a/src/test/ui/lint/lint-shorthand-field.stderr +++ b/src/test/ui/lint/lint-shorthand-field.stderr @@ -1,5 +1,5 @@ error: the `x:` in this pattern is redundant - --> $DIR/lint-shorthand-field.rs:22:13 + --> $DIR/lint-shorthand-field.rs:12:13 | LL | x: x, //~ ERROR the `x:` in this pattern is redundant | --^^ @@ -7,13 +7,13 @@ LL | x: x, //~ ERROR the `x:` in this pattern is redundant | help: remove this | note: lint level defined here - --> $DIR/lint-shorthand-field.rs:12:9 + --> $DIR/lint-shorthand-field.rs:2:9 | LL | #![deny(non_shorthand_field_patterns)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: the `y:` in this pattern is redundant - --> $DIR/lint-shorthand-field.rs:23:13 + --> $DIR/lint-shorthand-field.rs:13:13 | LL | y: ref y, //~ ERROR the `y:` in this pattern is redundant | --^^^^^^ diff --git a/src/test/ui/lint/lint-stability-2.rs b/src/test/ui/lint/lint-stability-2.rs index 1f2fa077cafc8..12e7b086d35d1 100644 --- a/src/test/ui/lint/lint-stability-2.rs +++ b/src/test/ui/lint/lint-stability-2.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:lint_stability.rs // aux-build:stability_cfg1.rs diff --git a/src/test/ui/lint/lint-stability-2.stderr b/src/test/ui/lint/lint-stability-2.stderr index e87e051443360..4142ce5af7932 100644 --- a/src/test/ui/lint/lint-stability-2.stderr +++ b/src/test/ui/lint/lint-stability-2.stderr @@ -1,5 +1,5 @@ error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-2.rs:50:13 + --> $DIR/lint-stability-2.rs:40:13 | LL | foo.method_deprecated_unstable(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | foo.method_deprecated_unstable(); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-2.rs:52:9 + --> $DIR/lint-stability-2.rs:42:9 | LL | Foo::method_deprecated_unstable(&foo); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -15,7 +15,7 @@ LL | Foo::method_deprecated_unstable(&foo); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-2.rs:54:9 + --> $DIR/lint-stability-2.rs:44:9 | LL | ::method_deprecated_unstable(&foo); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -23,7 +23,7 @@ LL | ::method_deprecated_unstable(&foo); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-2.rs:56:13 + --> $DIR/lint-stability-2.rs:46:13 | LL | foo.trait_deprecated_unstable(); | ^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -31,7 +31,7 @@ LL | foo.trait_deprecated_unstable(); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-2.rs:58:9 + --> $DIR/lint-stability-2.rs:48:9 | LL | ::trait_deprecated_unstable(&foo); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -39,7 +39,7 @@ LL | ::trait_deprecated_unstable(&foo); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-2.rs:61:13 + --> $DIR/lint-stability-2.rs:51:13 | LL | foo.method_deprecated_unstable_text(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -47,7 +47,7 @@ LL | foo.method_deprecated_unstable_text(); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-2.rs:63:9 + --> $DIR/lint-stability-2.rs:53:9 | LL | Foo::method_deprecated_unstable_text(&foo); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -55,7 +55,7 @@ LL | Foo::method_deprecated_unstable_text(&foo); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-2.rs:65:9 + --> $DIR/lint-stability-2.rs:55:9 | LL | ::method_deprecated_unstable_text(&foo); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -63,7 +63,7 @@ LL | ::method_deprecated_unstable_text(&foo); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-2.rs:67:13 + --> $DIR/lint-stability-2.rs:57:13 | LL | foo.trait_deprecated_unstable_text(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -71,7 +71,7 @@ LL | foo.trait_deprecated_unstable_text(); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-2.rs:69:9 + --> $DIR/lint-stability-2.rs:59:9 | LL | ::trait_deprecated_unstable_text(&foo); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -79,7 +79,7 @@ LL | ::trait_deprecated_unstable_text(&foo); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-2.rs:72:13 + --> $DIR/lint-stability-2.rs:62:13 | LL | foo.method_unstable(); //~ ERROR use of unstable library feature | ^^^^^^^^^^^^^^^ @@ -87,7 +87,7 @@ LL | foo.method_unstable(); //~ ERROR use of unstable library feature = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-2.rs:73:9 + --> $DIR/lint-stability-2.rs:63:9 | LL | Foo::method_unstable(&foo); //~ ERROR use of unstable library feature | ^^^^^^^^^^^^^^^^^^^^ @@ -95,7 +95,7 @@ LL | Foo::method_unstable(&foo); //~ ERROR use of unstable library featu = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-2.rs:74:9 + --> $DIR/lint-stability-2.rs:64:9 | LL | ::method_unstable(&foo); //~ ERROR use of unstable library feature | ^^^^^^^^^^^^^^^^^^^^^^ @@ -103,7 +103,7 @@ LL | ::method_unstable(&foo); //~ ERROR use of unstable library fea = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-2.rs:75:13 + --> $DIR/lint-stability-2.rs:65:13 | LL | foo.trait_unstable(); //~ ERROR use of unstable library feature | ^^^^^^^^^^^^^^ @@ -111,7 +111,7 @@ LL | foo.trait_unstable(); //~ ERROR use of unstable library feature = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-2.rs:76:9 + --> $DIR/lint-stability-2.rs:66:9 | LL | ::trait_unstable(&foo); //~ ERROR use of unstable library feature | ^^^^^^^^^^^^^^^^^^^^^ @@ -119,7 +119,7 @@ LL | ::trait_unstable(&foo); //~ ERROR use of unstable library feat = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature': text - --> $DIR/lint-stability-2.rs:78:13 + --> $DIR/lint-stability-2.rs:68:13 | LL | foo.method_unstable_text(); | ^^^^^^^^^^^^^^^^^^^^ @@ -127,7 +127,7 @@ LL | foo.method_unstable_text(); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature': text - --> $DIR/lint-stability-2.rs:80:9 + --> $DIR/lint-stability-2.rs:70:9 | LL | Foo::method_unstable_text(&foo); | ^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -135,7 +135,7 @@ LL | Foo::method_unstable_text(&foo); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature': text - --> $DIR/lint-stability-2.rs:82:9 + --> $DIR/lint-stability-2.rs:72:9 | LL | ::method_unstable_text(&foo); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -143,7 +143,7 @@ LL | ::method_unstable_text(&foo); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature': text - --> $DIR/lint-stability-2.rs:84:13 + --> $DIR/lint-stability-2.rs:74:13 | LL | foo.trait_unstable_text(); | ^^^^^^^^^^^^^^^^^^^ @@ -151,7 +151,7 @@ LL | foo.trait_unstable_text(); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature': text - --> $DIR/lint-stability-2.rs:86:9 + --> $DIR/lint-stability-2.rs:76:9 | LL | ::trait_unstable_text(&foo); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -159,7 +159,7 @@ LL | ::trait_unstable_text(&foo); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-2.rs:141:13 + --> $DIR/lint-stability-2.rs:131:13 | LL | foo.trait_deprecated_unstable(); | ^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -167,7 +167,7 @@ LL | foo.trait_deprecated_unstable(); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-2.rs:143:9 + --> $DIR/lint-stability-2.rs:133:9 | LL | ::trait_deprecated_unstable(&foo); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -175,7 +175,7 @@ LL | ::trait_deprecated_unstable(&foo); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-2.rs:145:13 + --> $DIR/lint-stability-2.rs:135:13 | LL | foo.trait_deprecated_unstable_text(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -183,7 +183,7 @@ LL | foo.trait_deprecated_unstable_text(); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-2.rs:147:9 + --> $DIR/lint-stability-2.rs:137:9 | LL | ::trait_deprecated_unstable_text(&foo); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -191,7 +191,7 @@ LL | ::trait_deprecated_unstable_text(&foo); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-2.rs:149:13 + --> $DIR/lint-stability-2.rs:139:13 | LL | foo.trait_unstable(); //~ ERROR use of unstable library feature | ^^^^^^^^^^^^^^ @@ -199,7 +199,7 @@ LL | foo.trait_unstable(); //~ ERROR use of unstable library feature = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-2.rs:150:9 + --> $DIR/lint-stability-2.rs:140:9 | LL | ::trait_unstable(&foo); //~ ERROR use of unstable library feature | ^^^^^^^^^^^^^^^^^^^^^ @@ -207,7 +207,7 @@ LL | ::trait_unstable(&foo); //~ ERROR use of unstable library feat = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature': text - --> $DIR/lint-stability-2.rs:151:13 + --> $DIR/lint-stability-2.rs:141:13 | LL | foo.trait_unstable_text(); | ^^^^^^^^^^^^^^^^^^^ @@ -215,7 +215,7 @@ LL | foo.trait_unstable_text(); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature': text - --> $DIR/lint-stability-2.rs:153:9 + --> $DIR/lint-stability-2.rs:143:9 | LL | ::trait_unstable_text(&foo); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -223,7 +223,7 @@ LL | ::trait_unstable_text(&foo); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-2.rs:164:13 + --> $DIR/lint-stability-2.rs:154:13 | LL | foo.trait_deprecated_unstable(); | ^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -231,7 +231,7 @@ LL | foo.trait_deprecated_unstable(); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-2.rs:166:13 + --> $DIR/lint-stability-2.rs:156:13 | LL | foo.trait_deprecated_unstable_text(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -239,7 +239,7 @@ LL | foo.trait_deprecated_unstable_text(); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-2.rs:168:13 + --> $DIR/lint-stability-2.rs:158:13 | LL | foo.trait_unstable(); //~ ERROR use of unstable library feature | ^^^^^^^^^^^^^^ @@ -247,7 +247,7 @@ LL | foo.trait_unstable(); //~ ERROR use of unstable library feature = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature': text - --> $DIR/lint-stability-2.rs:169:13 + --> $DIR/lint-stability-2.rs:159:13 | LL | foo.trait_unstable_text(); | ^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-stability-deprecated.rs b/src/test/ui/lint/lint-stability-deprecated.rs index de2c27bdcbcca..62e51b4921512 100644 --- a/src/test/ui/lint/lint-stability-deprecated.rs +++ b/src/test/ui/lint/lint-stability-deprecated.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:lint_stability.rs // aux-build:inherited_stability.rs // aux-build:stability_cfg1.rs diff --git a/src/test/ui/lint/lint-stability-deprecated.stderr b/src/test/ui/lint/lint-stability-deprecated.stderr index afebb4f36a4ad..bb26bcf434814 100644 --- a/src/test/ui/lint/lint-stability-deprecated.stderr +++ b/src/test/ui/lint/lint-stability-deprecated.stderr @@ -1,641 +1,641 @@ warning: use of deprecated item 'lint_stability::deprecated': text - --> $DIR/lint-stability-deprecated.rs:36:9 + --> $DIR/lint-stability-deprecated.rs:26:9 | LL | deprecated(); //~ WARN use of deprecated item 'lint_stability::deprecated' | ^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-stability-deprecated.rs:17:9 + --> $DIR/lint-stability-deprecated.rs:7:9 | LL | #![warn(deprecated)] | ^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated': text - --> $DIR/lint-stability-deprecated.rs:41:9 + --> $DIR/lint-stability-deprecated.rs:31:9 | LL | Trait::trait_deprecated(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated': text - --> $DIR/lint-stability-deprecated.rs:43:9 + --> $DIR/lint-stability-deprecated.rs:33:9 | LL | ::trait_deprecated(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::deprecated_text': text - --> $DIR/lint-stability-deprecated.rs:45:9 + --> $DIR/lint-stability-deprecated.rs:35:9 | LL | deprecated_text(); //~ WARN use of deprecated item 'lint_stability::deprecated_text': text | ^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text - --> $DIR/lint-stability-deprecated.rs:50:9 + --> $DIR/lint-stability-deprecated.rs:40:9 | LL | Trait::trait_deprecated_text(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text - --> $DIR/lint-stability-deprecated.rs:52:9 + --> $DIR/lint-stability-deprecated.rs:42:9 | LL | ::trait_deprecated_text(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::deprecated_unstable': text - --> $DIR/lint-stability-deprecated.rs:54:9 + --> $DIR/lint-stability-deprecated.rs:44:9 | LL | deprecated_unstable(); //~ WARN use of deprecated item 'lint_stability::deprecated_unstable' | ^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable': text - --> $DIR/lint-stability-deprecated.rs:59:9 + --> $DIR/lint-stability-deprecated.rs:49:9 | LL | Trait::trait_deprecated_unstable(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable' | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable': text - --> $DIR/lint-stability-deprecated.rs:61:9 + --> $DIR/lint-stability-deprecated.rs:51:9 | LL | ::trait_deprecated_unstable(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable' | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::deprecated_unstable_text': text - --> $DIR/lint-stability-deprecated.rs:63:9 + --> $DIR/lint-stability-deprecated.rs:53:9 | LL | deprecated_unstable_text(); //~ WARN use of deprecated item 'lint_stability::deprecated_unstable_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text - --> $DIR/lint-stability-deprecated.rs:68:9 + --> $DIR/lint-stability-deprecated.rs:58:9 | LL | Trait::trait_deprecated_unstable_text(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text - --> $DIR/lint-stability-deprecated.rs:70:9 + --> $DIR/lint-stability-deprecated.rs:60:9 | LL | ::trait_deprecated_unstable_text(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::DeprecatedStruct': text - --> $DIR/lint-stability-deprecated.rs:117:17 + --> $DIR/lint-stability-deprecated.rs:107:17 | LL | let _ = DeprecatedStruct { //~ WARN use of deprecated item 'lint_stability::DeprecatedStruct' | ^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::DeprecatedUnstableStruct': text - --> $DIR/lint-stability-deprecated.rs:120:17 + --> $DIR/lint-stability-deprecated.rs:110:17 | LL | let _ = DeprecatedUnstableStruct { | ^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::DeprecatedUnitStruct': text - --> $DIR/lint-stability-deprecated.rs:127:17 + --> $DIR/lint-stability-deprecated.rs:117:17 | LL | let _ = DeprecatedUnitStruct; //~ WARN use of deprecated item 'lint_stability::DeprecatedUnitStruct' | ^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::DeprecatedUnstableUnitStruct': text - --> $DIR/lint-stability-deprecated.rs:128:17 + --> $DIR/lint-stability-deprecated.rs:118:17 | LL | let _ = DeprecatedUnstableUnitStruct; //~ WARN use of deprecated item 'lint_stability::DeprecatedUnstableUnitStruct' | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Enum::DeprecatedVariant': text - --> $DIR/lint-stability-deprecated.rs:132:17 + --> $DIR/lint-stability-deprecated.rs:122:17 | LL | let _ = Enum::DeprecatedVariant; //~ WARN use of deprecated item 'lint_stability::Enum::DeprecatedVariant' | ^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Enum::DeprecatedUnstableVariant': text - --> $DIR/lint-stability-deprecated.rs:133:17 + --> $DIR/lint-stability-deprecated.rs:123:17 | LL | let _ = Enum::DeprecatedUnstableVariant; //~ WARN use of deprecated item 'lint_stability::Enum::DeprecatedUnstableVariant' | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::DeprecatedTupleStruct': text - --> $DIR/lint-stability-deprecated.rs:137:17 + --> $DIR/lint-stability-deprecated.rs:127:17 | LL | let _ = DeprecatedTupleStruct (1); //~ WARN use of deprecated item 'lint_stability::DeprecatedTupleStruct' | ^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::DeprecatedUnstableTupleStruct': text - --> $DIR/lint-stability-deprecated.rs:138:17 + --> $DIR/lint-stability-deprecated.rs:128:17 | LL | let _ = DeprecatedUnstableTupleStruct (1); //~ WARN use of deprecated item 'lint_stability::DeprecatedUnstableTupleStruct' | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::deprecated_text': text - --> $DIR/lint-stability-deprecated.rs:147:25 + --> $DIR/lint-stability-deprecated.rs:137:25 | LL | macro_test_arg!(deprecated_text()); //~ WARN use of deprecated item 'lint_stability::deprecated_text': text | ^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::deprecated_unstable_text': text - --> $DIR/lint-stability-deprecated.rs:148:25 + --> $DIR/lint-stability-deprecated.rs:138:25 | LL | macro_test_arg!(deprecated_unstable_text()); //~ WARN use of deprecated item 'lint_stability::deprecated_unstable_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::deprecated_text': text - --> $DIR/lint-stability-deprecated.rs:149:41 + --> $DIR/lint-stability-deprecated.rs:139:41 | LL | macro_test_arg!(macro_test_arg!(deprecated_text())); //~ WARN use of deprecated item 'lint_stability::deprecated_text': text | ^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated': text - --> $DIR/lint-stability-deprecated.rs:154:9 + --> $DIR/lint-stability-deprecated.rs:144:9 | LL | Trait::trait_deprecated(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated': text - --> $DIR/lint-stability-deprecated.rs:156:9 + --> $DIR/lint-stability-deprecated.rs:146:9 | LL | ::trait_deprecated(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text - --> $DIR/lint-stability-deprecated.rs:158:9 + --> $DIR/lint-stability-deprecated.rs:148:9 | LL | Trait::trait_deprecated_text(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text - --> $DIR/lint-stability-deprecated.rs:160:9 + --> $DIR/lint-stability-deprecated.rs:150:9 | LL | ::trait_deprecated_text(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable': text - --> $DIR/lint-stability-deprecated.rs:162:9 + --> $DIR/lint-stability-deprecated.rs:152:9 | LL | Trait::trait_deprecated_unstable(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable' | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable': text - --> $DIR/lint-stability-deprecated.rs:164:9 + --> $DIR/lint-stability-deprecated.rs:154:9 | LL | ::trait_deprecated_unstable(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable' | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text - --> $DIR/lint-stability-deprecated.rs:166:9 + --> $DIR/lint-stability-deprecated.rs:156:9 | LL | Trait::trait_deprecated_unstable_text(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text - --> $DIR/lint-stability-deprecated.rs:168:9 + --> $DIR/lint-stability-deprecated.rs:158:9 | LL | ::trait_deprecated_unstable_text(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::DeprecatedTrait': text - --> $DIR/lint-stability-deprecated.rs:196:10 + --> $DIR/lint-stability-deprecated.rs:186:10 | LL | impl DeprecatedTrait for S {} //~ WARN use of deprecated item 'lint_stability::DeprecatedTrait': text | ^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::DeprecatedTrait': text - --> $DIR/lint-stability-deprecated.rs:198:25 + --> $DIR/lint-stability-deprecated.rs:188:25 | LL | trait LocalTrait2 : DeprecatedTrait { } //~ WARN use of deprecated item 'lint_stability::DeprecatedTrait': text | ^^^^^^^^^^^^^^^ warning: use of deprecated item 'inheritance::inherited_stability::unstable_mod::deprecated': text - --> $DIR/lint-stability-deprecated.rs:217:9 + --> $DIR/lint-stability-deprecated.rs:207:9 | LL | unstable_mod::deprecated(); //~ WARN use of deprecated item 'inheritance::inherited_stability::unstable_mod::deprecated': text | ^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'this_crate::deprecated': text - --> $DIR/lint-stability-deprecated.rs:339:9 + --> $DIR/lint-stability-deprecated.rs:329:9 | LL | deprecated(); //~ WARN use of deprecated item 'this_crate::deprecated' | ^^^^^^^^^^ warning: use of deprecated item 'this_crate::Trait::trait_deprecated': text - --> $DIR/lint-stability-deprecated.rs:344:9 + --> $DIR/lint-stability-deprecated.rs:334:9 | LL | Trait::trait_deprecated(&foo); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'this_crate::Trait::trait_deprecated': text - --> $DIR/lint-stability-deprecated.rs:346:9 + --> $DIR/lint-stability-deprecated.rs:336:9 | LL | ::trait_deprecated(&foo); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'this_crate::deprecated_text': text - --> $DIR/lint-stability-deprecated.rs:348:9 + --> $DIR/lint-stability-deprecated.rs:338:9 | LL | deprecated_text(); //~ WARN use of deprecated item 'this_crate::deprecated_text': text | ^^^^^^^^^^^^^^^ warning: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text - --> $DIR/lint-stability-deprecated.rs:353:9 + --> $DIR/lint-stability-deprecated.rs:343:9 | LL | Trait::trait_deprecated_text(&foo); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text - --> $DIR/lint-stability-deprecated.rs:355:9 + --> $DIR/lint-stability-deprecated.rs:345:9 | LL | ::trait_deprecated_text(&foo); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'this_crate::DeprecatedStruct': text - --> $DIR/lint-stability-deprecated.rs:393:17 + --> $DIR/lint-stability-deprecated.rs:383:17 | LL | let _ = DeprecatedStruct { | ^^^^^^^^^^^^^^^^ warning: use of deprecated item 'this_crate::DeprecatedUnitStruct': text - --> $DIR/lint-stability-deprecated.rs:400:17 + --> $DIR/lint-stability-deprecated.rs:390:17 | LL | let _ = DeprecatedUnitStruct; //~ WARN use of deprecated item 'this_crate::DeprecatedUnitStruct' | ^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'this_crate::Enum::DeprecatedVariant': text - --> $DIR/lint-stability-deprecated.rs:404:17 + --> $DIR/lint-stability-deprecated.rs:394:17 | LL | let _ = Enum::DeprecatedVariant; //~ WARN use of deprecated item 'this_crate::Enum::DeprecatedVariant' | ^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'this_crate::DeprecatedTupleStruct': text - --> $DIR/lint-stability-deprecated.rs:408:17 + --> $DIR/lint-stability-deprecated.rs:398:17 | LL | let _ = DeprecatedTupleStruct (1); //~ WARN use of deprecated item 'this_crate::DeprecatedTupleStruct' | ^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'this_crate::Trait::trait_deprecated': text - --> $DIR/lint-stability-deprecated.rs:415:9 + --> $DIR/lint-stability-deprecated.rs:405:9 | LL | Trait::trait_deprecated(&foo); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'this_crate::Trait::trait_deprecated': text - --> $DIR/lint-stability-deprecated.rs:417:9 + --> $DIR/lint-stability-deprecated.rs:407:9 | LL | ::trait_deprecated(&foo); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text - --> $DIR/lint-stability-deprecated.rs:419:9 + --> $DIR/lint-stability-deprecated.rs:409:9 | LL | Trait::trait_deprecated_text(&foo); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text - --> $DIR/lint-stability-deprecated.rs:421:9 + --> $DIR/lint-stability-deprecated.rs:411:9 | LL | ::trait_deprecated_text(&foo); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'this_crate::test_fn_body::fn_in_body': text - --> $DIR/lint-stability-deprecated.rs:448:9 + --> $DIR/lint-stability-deprecated.rs:438:9 | LL | fn_in_body(); //~ WARN use of deprecated item 'this_crate::test_fn_body::fn_in_body': text | ^^^^^^^^^^ warning: use of deprecated item 'this_crate::DeprecatedTrait': text - --> $DIR/lint-stability-deprecated.rs:468:10 + --> $DIR/lint-stability-deprecated.rs:458:10 | LL | impl DeprecatedTrait for S { } //~ WARN use of deprecated item 'this_crate::DeprecatedTrait' | ^^^^^^^^^^^^^^^ warning: use of deprecated item 'this_crate::DeprecatedTrait': text - --> $DIR/lint-stability-deprecated.rs:470:24 + --> $DIR/lint-stability-deprecated.rs:460:24 | LL | trait LocalTrait : DeprecatedTrait { } //~ WARN use of deprecated item 'this_crate::DeprecatedTrait' | ^^^^^^^^^^^^^^^ warning: use of deprecated item 'this_crate::MethodTester::test_method_body::fn_in_body': text - --> $DIR/lint-stability-deprecated.rs:456:13 + --> $DIR/lint-stability-deprecated.rs:446:13 | LL | fn_in_body(); //~ WARN use of deprecated item 'this_crate::MethodTester::test_method_body::fn_in_body': text | ^^^^^^^^^^ warning: use of deprecated item 'lint_stability::TraitWithAssociatedTypes::TypeDeprecated': text - --> $DIR/lint-stability-deprecated.rs:109:48 + --> $DIR/lint-stability-deprecated.rs:99:48 | LL | struct S2(T::TypeDeprecated); | ^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::TraitWithAssociatedTypes::TypeDeprecated': text - --> $DIR/lint-stability-deprecated.rs:113:13 + --> $DIR/lint-stability-deprecated.rs:103:13 | LL | TypeDeprecated = u16, | ^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::MethodTester::method_deprecated': text - --> $DIR/lint-stability-deprecated.rs:37:13 + --> $DIR/lint-stability-deprecated.rs:27:13 | LL | foo.method_deprecated(); //~ WARN use of deprecated item 'lint_stability::MethodTester::method_deprecated' | ^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::MethodTester::method_deprecated': text - --> $DIR/lint-stability-deprecated.rs:38:9 + --> $DIR/lint-stability-deprecated.rs:28:9 | LL | Foo::method_deprecated(&foo); //~ WARN use of deprecated item 'lint_stability::MethodTester::method_deprecated' | ^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::MethodTester::method_deprecated': text - --> $DIR/lint-stability-deprecated.rs:39:9 + --> $DIR/lint-stability-deprecated.rs:29:9 | LL | ::method_deprecated(&foo); //~ WARN use of deprecated item 'lint_stability::MethodTester::method_deprecated' | ^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated': text - --> $DIR/lint-stability-deprecated.rs:40:13 + --> $DIR/lint-stability-deprecated.rs:30:13 | LL | foo.trait_deprecated(); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated': text - --> $DIR/lint-stability-deprecated.rs:42:9 + --> $DIR/lint-stability-deprecated.rs:32:9 | LL | ::trait_deprecated(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::MethodTester::method_deprecated_text': text - --> $DIR/lint-stability-deprecated.rs:46:13 + --> $DIR/lint-stability-deprecated.rs:36:13 | LL | foo.method_deprecated_text(); //~ WARN use of deprecated item 'lint_stability::MethodTester::method_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::MethodTester::method_deprecated_text': text - --> $DIR/lint-stability-deprecated.rs:47:9 + --> $DIR/lint-stability-deprecated.rs:37:9 | LL | Foo::method_deprecated_text(&foo); //~ WARN use of deprecated item 'lint_stability::MethodTester::method_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::MethodTester::method_deprecated_text': text - --> $DIR/lint-stability-deprecated.rs:48:9 + --> $DIR/lint-stability-deprecated.rs:38:9 | LL | ::method_deprecated_text(&foo); //~ WARN use of deprecated item 'lint_stability::MethodTester::method_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text - --> $DIR/lint-stability-deprecated.rs:49:13 + --> $DIR/lint-stability-deprecated.rs:39:13 | LL | foo.trait_deprecated_text(); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text - --> $DIR/lint-stability-deprecated.rs:51:9 + --> $DIR/lint-stability-deprecated.rs:41:9 | LL | ::trait_deprecated_text(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::MethodTester::method_deprecated_unstable': text - --> $DIR/lint-stability-deprecated.rs:55:13 + --> $DIR/lint-stability-deprecated.rs:45:13 | LL | foo.method_deprecated_unstable(); //~ WARN use of deprecated item 'lint_stability::MethodTester::method_deprecated_unstable' | ^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::MethodTester::method_deprecated_unstable': text - --> $DIR/lint-stability-deprecated.rs:56:9 + --> $DIR/lint-stability-deprecated.rs:46:9 | LL | Foo::method_deprecated_unstable(&foo); //~ WARN use of deprecated item 'lint_stability::MethodTester::method_deprecated_unstable' | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::MethodTester::method_deprecated_unstable': text - --> $DIR/lint-stability-deprecated.rs:57:9 + --> $DIR/lint-stability-deprecated.rs:47:9 | LL | ::method_deprecated_unstable(&foo); //~ WARN use of deprecated item 'lint_stability::MethodTester::method_deprecated_unstable' | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable': text - --> $DIR/lint-stability-deprecated.rs:58:13 + --> $DIR/lint-stability-deprecated.rs:48:13 | LL | foo.trait_deprecated_unstable(); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable' | ^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable': text - --> $DIR/lint-stability-deprecated.rs:60:9 + --> $DIR/lint-stability-deprecated.rs:50:9 | LL | ::trait_deprecated_unstable(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable' | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::MethodTester::method_deprecated_unstable_text': text - --> $DIR/lint-stability-deprecated.rs:64:13 + --> $DIR/lint-stability-deprecated.rs:54:13 | LL | foo.method_deprecated_unstable_text(); //~ WARN use of deprecated item 'lint_stability::MethodTester::method_deprecated_unstable_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::MethodTester::method_deprecated_unstable_text': text - --> $DIR/lint-stability-deprecated.rs:65:9 + --> $DIR/lint-stability-deprecated.rs:55:9 | LL | Foo::method_deprecated_unstable_text(&foo); //~ WARN use of deprecated item 'lint_stability::MethodTester::method_deprecated_unstable_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::MethodTester::method_deprecated_unstable_text': text - --> $DIR/lint-stability-deprecated.rs:66:9 + --> $DIR/lint-stability-deprecated.rs:56:9 | LL | ::method_deprecated_unstable_text(&foo); //~ WARN use of deprecated item 'lint_stability::MethodTester::method_deprecated_unstable_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text - --> $DIR/lint-stability-deprecated.rs:67:13 + --> $DIR/lint-stability-deprecated.rs:57:13 | LL | foo.trait_deprecated_unstable_text(); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text - --> $DIR/lint-stability-deprecated.rs:69:9 + --> $DIR/lint-stability-deprecated.rs:59:9 | LL | ::trait_deprecated_unstable_text(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::DeprecatedStruct::i': text - --> $DIR/lint-stability-deprecated.rs:118:13 + --> $DIR/lint-stability-deprecated.rs:108:13 | LL | i: 0 //~ WARN use of deprecated item 'lint_stability::DeprecatedStruct::i' | ^^^^ warning: use of deprecated item 'lint_stability::DeprecatedUnstableStruct::i': text - --> $DIR/lint-stability-deprecated.rs:122:13 + --> $DIR/lint-stability-deprecated.rs:112:13 | LL | i: 0 //~ WARN use of deprecated item 'lint_stability::DeprecatedUnstableStruct::i' | ^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated': text - --> $DIR/lint-stability-deprecated.rs:153:13 + --> $DIR/lint-stability-deprecated.rs:143:13 | LL | foo.trait_deprecated(); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated': text - --> $DIR/lint-stability-deprecated.rs:155:9 + --> $DIR/lint-stability-deprecated.rs:145:9 | LL | ::trait_deprecated(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text - --> $DIR/lint-stability-deprecated.rs:157:13 + --> $DIR/lint-stability-deprecated.rs:147:13 | LL | foo.trait_deprecated_text(); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text - --> $DIR/lint-stability-deprecated.rs:159:9 + --> $DIR/lint-stability-deprecated.rs:149:9 | LL | ::trait_deprecated_text(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable': text - --> $DIR/lint-stability-deprecated.rs:161:13 + --> $DIR/lint-stability-deprecated.rs:151:13 | LL | foo.trait_deprecated_unstable(); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable' | ^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable': text - --> $DIR/lint-stability-deprecated.rs:163:9 + --> $DIR/lint-stability-deprecated.rs:153:9 | LL | ::trait_deprecated_unstable(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable' | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text - --> $DIR/lint-stability-deprecated.rs:165:13 + --> $DIR/lint-stability-deprecated.rs:155:13 | LL | foo.trait_deprecated_unstable_text(); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text - --> $DIR/lint-stability-deprecated.rs:167:9 + --> $DIR/lint-stability-deprecated.rs:157:9 | LL | ::trait_deprecated_unstable_text(&foo); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated': text - --> $DIR/lint-stability-deprecated.rs:184:13 + --> $DIR/lint-stability-deprecated.rs:174:13 | LL | foo.trait_deprecated(); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text - --> $DIR/lint-stability-deprecated.rs:185:13 + --> $DIR/lint-stability-deprecated.rs:175:13 | LL | foo.trait_deprecated_text(); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable': text - --> $DIR/lint-stability-deprecated.rs:186:13 + --> $DIR/lint-stability-deprecated.rs:176:13 | LL | foo.trait_deprecated_unstable(); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable' | ^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text - --> $DIR/lint-stability-deprecated.rs:187:13 + --> $DIR/lint-stability-deprecated.rs:177:13 | LL | foo.trait_deprecated_unstable_text(); //~ WARN use of deprecated item 'lint_stability::Trait::trait_deprecated_unstable_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'this_crate::MethodTester::method_deprecated': text - --> $DIR/lint-stability-deprecated.rs:340:13 + --> $DIR/lint-stability-deprecated.rs:330:13 | LL | foo.method_deprecated(); //~ WARN use of deprecated item 'this_crate::MethodTester::method_deprecated' | ^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'this_crate::MethodTester::method_deprecated': text - --> $DIR/lint-stability-deprecated.rs:341:9 + --> $DIR/lint-stability-deprecated.rs:331:9 | LL | Foo::method_deprecated(&foo); //~ WARN use of deprecated item 'this_crate::MethodTester::method_deprecated' | ^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'this_crate::MethodTester::method_deprecated': text - --> $DIR/lint-stability-deprecated.rs:342:9 + --> $DIR/lint-stability-deprecated.rs:332:9 | LL | ::method_deprecated(&foo); //~ WARN use of deprecated item 'this_crate::MethodTester::method_deprecated' | ^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'this_crate::Trait::trait_deprecated': text - --> $DIR/lint-stability-deprecated.rs:343:13 + --> $DIR/lint-stability-deprecated.rs:333:13 | LL | foo.trait_deprecated(); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^ warning: use of deprecated item 'this_crate::Trait::trait_deprecated': text - --> $DIR/lint-stability-deprecated.rs:345:9 + --> $DIR/lint-stability-deprecated.rs:335:9 | LL | ::trait_deprecated(&foo); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'this_crate::MethodTester::method_deprecated_text': text - --> $DIR/lint-stability-deprecated.rs:349:13 + --> $DIR/lint-stability-deprecated.rs:339:13 | LL | foo.method_deprecated_text(); //~ WARN use of deprecated item 'this_crate::MethodTester::method_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'this_crate::MethodTester::method_deprecated_text': text - --> $DIR/lint-stability-deprecated.rs:350:9 + --> $DIR/lint-stability-deprecated.rs:340:9 | LL | Foo::method_deprecated_text(&foo); //~ WARN use of deprecated item 'this_crate::MethodTester::method_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'this_crate::MethodTester::method_deprecated_text': text - --> $DIR/lint-stability-deprecated.rs:351:9 + --> $DIR/lint-stability-deprecated.rs:341:9 | LL | ::method_deprecated_text(&foo); //~ WARN use of deprecated item 'this_crate::MethodTester::method_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text - --> $DIR/lint-stability-deprecated.rs:352:13 + --> $DIR/lint-stability-deprecated.rs:342:13 | LL | foo.trait_deprecated_text(); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text - --> $DIR/lint-stability-deprecated.rs:354:9 + --> $DIR/lint-stability-deprecated.rs:344:9 | LL | ::trait_deprecated_text(&foo); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'this_crate::DeprecatedStruct::i': text - --> $DIR/lint-stability-deprecated.rs:395:13 + --> $DIR/lint-stability-deprecated.rs:385:13 | LL | i: 0 //~ WARN use of deprecated item 'this_crate::DeprecatedStruct::i' | ^^^^ warning: use of deprecated item 'this_crate::Trait::trait_deprecated': text - --> $DIR/lint-stability-deprecated.rs:414:13 + --> $DIR/lint-stability-deprecated.rs:404:13 | LL | foo.trait_deprecated(); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^ warning: use of deprecated item 'this_crate::Trait::trait_deprecated': text - --> $DIR/lint-stability-deprecated.rs:416:9 + --> $DIR/lint-stability-deprecated.rs:406:9 | LL | ::trait_deprecated(&foo); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text - --> $DIR/lint-stability-deprecated.rs:418:13 + --> $DIR/lint-stability-deprecated.rs:408:13 | LL | foo.trait_deprecated_text(); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text - --> $DIR/lint-stability-deprecated.rs:420:9 + --> $DIR/lint-stability-deprecated.rs:410:9 | LL | ::trait_deprecated_text(&foo); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: use of deprecated item 'this_crate::Trait::trait_deprecated': text - --> $DIR/lint-stability-deprecated.rs:437:13 + --> $DIR/lint-stability-deprecated.rs:427:13 | LL | foo.trait_deprecated(); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^ warning: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text - --> $DIR/lint-stability-deprecated.rs:438:13 + --> $DIR/lint-stability-deprecated.rs:428:13 | LL | foo.trait_deprecated_text(); //~ WARN use of deprecated item 'this_crate::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^ error: compilation successful - --> $DIR/lint-stability-deprecated.rs:473:16 + --> $DIR/lint-stability-deprecated.rs:463:16 | LL | #[rustc_error] fn main() {} //~ ERROR: compilation successful | ^^^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-stability-fields-deprecated.rs b/src/test/ui/lint/lint-stability-fields-deprecated.rs index 0ad4466d0e271..9d5b7c51cc82b 100644 --- a/src/test/ui/lint/lint-stability-fields-deprecated.rs +++ b/src/test/ui/lint/lint-stability-fields-deprecated.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:lint_stability_fields.rs #![deny(deprecated)] diff --git a/src/test/ui/lint/lint-stability-fields-deprecated.stderr b/src/test/ui/lint/lint-stability-fields-deprecated.stderr index f7bc87ee9d914..488be75ae52b0 100644 --- a/src/test/ui/lint/lint-stability-fields-deprecated.stderr +++ b/src/test/ui/lint/lint-stability-fields-deprecated.stderr @@ -1,377 +1,377 @@ error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated': text - --> $DIR/lint-stability-fields-deprecated.rs:104:17 + --> $DIR/lint-stability-fields-deprecated.rs:94:17 | LL | let x = Deprecated { | ^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-stability-fields-deprecated.rs:13:9 + --> $DIR/lint-stability-fields-deprecated.rs:3:9 | LL | #![deny(deprecated)] | ^^^^^^^^^^ error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated': text - --> $DIR/lint-stability-fields-deprecated.rs:121:13 + --> $DIR/lint-stability-fields-deprecated.rs:111:13 | LL | let Deprecated { | ^^^^^^^^^^ error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated': text - --> $DIR/lint-stability-fields-deprecated.rs:131:13 + --> $DIR/lint-stability-fields-deprecated.rs:121:13 | LL | let Deprecated | ^^^^^^^^^^ error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated2': text - --> $DIR/lint-stability-fields-deprecated.rs:136:17 + --> $DIR/lint-stability-fields-deprecated.rs:126:17 | LL | let x = Deprecated2(1, 2, 3); | ^^^^^^^^^^^ error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated2': text - --> $DIR/lint-stability-fields-deprecated.rs:146:13 + --> $DIR/lint-stability-fields-deprecated.rs:136:13 | LL | let Deprecated2 | ^^^^^^^^^^^ error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated2': text - --> $DIR/lint-stability-fields-deprecated.rs:155:13 + --> $DIR/lint-stability-fields-deprecated.rs:145:13 | LL | let Deprecated2 | ^^^^^^^^^^^ error: use of deprecated item 'this_crate::Deprecated': text - --> $DIR/lint-stability-fields-deprecated.rs:291:17 + --> $DIR/lint-stability-fields-deprecated.rs:281:17 | LL | let x = Deprecated { | ^^^^^^^^^^ error: use of deprecated item 'this_crate::Deprecated': text - --> $DIR/lint-stability-fields-deprecated.rs:308:13 + --> $DIR/lint-stability-fields-deprecated.rs:298:13 | LL | let Deprecated { | ^^^^^^^^^^ error: use of deprecated item 'this_crate::Deprecated': text - --> $DIR/lint-stability-fields-deprecated.rs:318:13 + --> $DIR/lint-stability-fields-deprecated.rs:308:13 | LL | let Deprecated | ^^^^^^^^^^ error: use of deprecated item 'this_crate::Deprecated2': text - --> $DIR/lint-stability-fields-deprecated.rs:323:17 + --> $DIR/lint-stability-fields-deprecated.rs:313:17 | LL | let x = Deprecated2(1, 2, 3); | ^^^^^^^^^^^ error: use of deprecated item 'this_crate::Deprecated2': text - --> $DIR/lint-stability-fields-deprecated.rs:333:13 + --> $DIR/lint-stability-fields-deprecated.rs:323:13 | LL | let Deprecated2 | ^^^^^^^^^^^ error: use of deprecated item 'this_crate::Deprecated2': text - --> $DIR/lint-stability-fields-deprecated.rs:342:13 + --> $DIR/lint-stability-fields-deprecated.rs:332:13 | LL | let Deprecated2 | ^^^^^^^^^^^ error: use of deprecated item 'cross_crate::lint_stability_fields::Stable::override2': text - --> $DIR/lint-stability-fields-deprecated.rs:28:13 + --> $DIR/lint-stability-fields-deprecated.rs:18:13 | LL | override2: 3, | ^^^^^^^^^^^^ error: use of deprecated item 'cross_crate::lint_stability_fields::Stable::override2': text - --> $DIR/lint-stability-fields-deprecated.rs:34:17 + --> $DIR/lint-stability-fields-deprecated.rs:24:17 | LL | let _ = x.override2; | ^^^^^^^^^^^ error: use of deprecated item 'cross_crate::lint_stability_fields::Stable::override2': text - --> $DIR/lint-stability-fields-deprecated.rs:40:13 + --> $DIR/lint-stability-fields-deprecated.rs:30:13 | LL | override2: _ | ^^^^^^^^^^^^ error: use of deprecated item 'cross_crate::lint_stability_fields::Stable2::2': text - --> $DIR/lint-stability-fields-deprecated.rs:50:17 + --> $DIR/lint-stability-fields-deprecated.rs:40:17 | LL | let _ = x.2; | ^^^ error: use of deprecated item 'cross_crate::lint_stability_fields::Stable2::2': text - --> $DIR/lint-stability-fields-deprecated.rs:55:20 + --> $DIR/lint-stability-fields-deprecated.rs:45:20 | LL | _) | ^ error: use of deprecated item 'cross_crate::lint_stability_fields::Unstable::override2': text - --> $DIR/lint-stability-fields-deprecated.rs:65:13 + --> $DIR/lint-stability-fields-deprecated.rs:55:13 | LL | override2: 3, | ^^^^^^^^^^^^ error: use of deprecated item 'cross_crate::lint_stability_fields::Unstable::override2': text - --> $DIR/lint-stability-fields-deprecated.rs:71:17 + --> $DIR/lint-stability-fields-deprecated.rs:61:17 | LL | let _ = x.override2; | ^^^^^^^^^^^ error: use of deprecated item 'cross_crate::lint_stability_fields::Unstable::override2': text - --> $DIR/lint-stability-fields-deprecated.rs:77:13 + --> $DIR/lint-stability-fields-deprecated.rs:67:13 | LL | override2: _ | ^^^^^^^^^^^^ error: use of deprecated item 'cross_crate::lint_stability_fields::Unstable2::2': text - --> $DIR/lint-stability-fields-deprecated.rs:90:17 + --> $DIR/lint-stability-fields-deprecated.rs:80:17 | LL | let _ = x.2; | ^^^ error: use of deprecated item 'cross_crate::lint_stability_fields::Unstable2::2': text - --> $DIR/lint-stability-fields-deprecated.rs:96:14 + --> $DIR/lint-stability-fields-deprecated.rs:86:14 | LL | _) | ^ error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated::inherit': text - --> $DIR/lint-stability-fields-deprecated.rs:106:13 + --> $DIR/lint-stability-fields-deprecated.rs:96:13 | LL | inherit: 1, | ^^^^^^^^^^ error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated::override1': text - --> $DIR/lint-stability-fields-deprecated.rs:108:13 + --> $DIR/lint-stability-fields-deprecated.rs:98:13 | LL | override1: 2, | ^^^^^^^^^^^^ error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated::override2': text - --> $DIR/lint-stability-fields-deprecated.rs:110:13 + --> $DIR/lint-stability-fields-deprecated.rs:100:13 | LL | override2: 3, | ^^^^^^^^^^^^ error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated::inherit': text - --> $DIR/lint-stability-fields-deprecated.rs:114:17 + --> $DIR/lint-stability-fields-deprecated.rs:104:17 | LL | let _ = x.inherit; | ^^^^^^^^^ error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated::override1': text - --> $DIR/lint-stability-fields-deprecated.rs:116:17 + --> $DIR/lint-stability-fields-deprecated.rs:106:17 | LL | let _ = x.override1; | ^^^^^^^^^^^ error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated::override2': text - --> $DIR/lint-stability-fields-deprecated.rs:118:17 + --> $DIR/lint-stability-fields-deprecated.rs:108:17 | LL | let _ = x.override2; | ^^^^^^^^^^^ error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated::inherit': text - --> $DIR/lint-stability-fields-deprecated.rs:123:13 + --> $DIR/lint-stability-fields-deprecated.rs:113:13 | LL | inherit: _, | ^^^^^^^^^^ error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated::override1': text - --> $DIR/lint-stability-fields-deprecated.rs:125:13 + --> $DIR/lint-stability-fields-deprecated.rs:115:13 | LL | override1: _, | ^^^^^^^^^^^^ error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated::override2': text - --> $DIR/lint-stability-fields-deprecated.rs:127:13 + --> $DIR/lint-stability-fields-deprecated.rs:117:13 | LL | override2: _ | ^^^^^^^^^^^^ error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated2::0': text - --> $DIR/lint-stability-fields-deprecated.rs:139:17 + --> $DIR/lint-stability-fields-deprecated.rs:129:17 | LL | let _ = x.0; | ^^^ error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated2::1': text - --> $DIR/lint-stability-fields-deprecated.rs:141:17 + --> $DIR/lint-stability-fields-deprecated.rs:131:17 | LL | let _ = x.1; | ^^^ error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated2::2': text - --> $DIR/lint-stability-fields-deprecated.rs:143:17 + --> $DIR/lint-stability-fields-deprecated.rs:133:17 | LL | let _ = x.2; | ^^^ error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated2::0': text - --> $DIR/lint-stability-fields-deprecated.rs:148:14 + --> $DIR/lint-stability-fields-deprecated.rs:138:14 | LL | (_, | ^ error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated2::1': text - --> $DIR/lint-stability-fields-deprecated.rs:150:14 + --> $DIR/lint-stability-fields-deprecated.rs:140:14 | LL | _, | ^ error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated2::2': text - --> $DIR/lint-stability-fields-deprecated.rs:152:14 + --> $DIR/lint-stability-fields-deprecated.rs:142:14 | LL | _) | ^ error: use of deprecated item 'this_crate::Stable::override2': text - --> $DIR/lint-stability-fields-deprecated.rs:215:13 + --> $DIR/lint-stability-fields-deprecated.rs:205:13 | LL | override2: 3, | ^^^^^^^^^^^^ error: use of deprecated item 'this_crate::Stable::override2': text - --> $DIR/lint-stability-fields-deprecated.rs:221:17 + --> $DIR/lint-stability-fields-deprecated.rs:211:17 | LL | let _ = x.override2; | ^^^^^^^^^^^ error: use of deprecated item 'this_crate::Stable::override2': text - --> $DIR/lint-stability-fields-deprecated.rs:227:13 + --> $DIR/lint-stability-fields-deprecated.rs:217:13 | LL | override2: _ | ^^^^^^^^^^^^ error: use of deprecated item 'this_crate::Stable2::2': text - --> $DIR/lint-stability-fields-deprecated.rs:237:17 + --> $DIR/lint-stability-fields-deprecated.rs:227:17 | LL | let _ = x.2; | ^^^ error: use of deprecated item 'this_crate::Stable2::2': text - --> $DIR/lint-stability-fields-deprecated.rs:242:20 + --> $DIR/lint-stability-fields-deprecated.rs:232:20 | LL | _) | ^ error: use of deprecated item 'this_crate::Unstable::override2': text - --> $DIR/lint-stability-fields-deprecated.rs:252:13 + --> $DIR/lint-stability-fields-deprecated.rs:242:13 | LL | override2: 3, | ^^^^^^^^^^^^ error: use of deprecated item 'this_crate::Unstable::override2': text - --> $DIR/lint-stability-fields-deprecated.rs:258:17 + --> $DIR/lint-stability-fields-deprecated.rs:248:17 | LL | let _ = x.override2; | ^^^^^^^^^^^ error: use of deprecated item 'this_crate::Unstable::override2': text - --> $DIR/lint-stability-fields-deprecated.rs:264:13 + --> $DIR/lint-stability-fields-deprecated.rs:254:13 | LL | override2: _ | ^^^^^^^^^^^^ error: use of deprecated item 'this_crate::Unstable2::2': text - --> $DIR/lint-stability-fields-deprecated.rs:277:17 + --> $DIR/lint-stability-fields-deprecated.rs:267:17 | LL | let _ = x.2; | ^^^ error: use of deprecated item 'this_crate::Unstable2::2': text - --> $DIR/lint-stability-fields-deprecated.rs:283:14 + --> $DIR/lint-stability-fields-deprecated.rs:273:14 | LL | _) | ^ error: use of deprecated item 'this_crate::Deprecated::inherit': text - --> $DIR/lint-stability-fields-deprecated.rs:293:13 + --> $DIR/lint-stability-fields-deprecated.rs:283:13 | LL | inherit: 1, | ^^^^^^^^^^ error: use of deprecated item 'this_crate::Deprecated::override1': text - --> $DIR/lint-stability-fields-deprecated.rs:295:13 + --> $DIR/lint-stability-fields-deprecated.rs:285:13 | LL | override1: 2, | ^^^^^^^^^^^^ error: use of deprecated item 'this_crate::Deprecated::override2': text - --> $DIR/lint-stability-fields-deprecated.rs:297:13 + --> $DIR/lint-stability-fields-deprecated.rs:287:13 | LL | override2: 3, | ^^^^^^^^^^^^ error: use of deprecated item 'this_crate::Deprecated::inherit': text - --> $DIR/lint-stability-fields-deprecated.rs:301:17 + --> $DIR/lint-stability-fields-deprecated.rs:291:17 | LL | let _ = x.inherit; | ^^^^^^^^^ error: use of deprecated item 'this_crate::Deprecated::override1': text - --> $DIR/lint-stability-fields-deprecated.rs:303:17 + --> $DIR/lint-stability-fields-deprecated.rs:293:17 | LL | let _ = x.override1; | ^^^^^^^^^^^ error: use of deprecated item 'this_crate::Deprecated::override2': text - --> $DIR/lint-stability-fields-deprecated.rs:305:17 + --> $DIR/lint-stability-fields-deprecated.rs:295:17 | LL | let _ = x.override2; | ^^^^^^^^^^^ error: use of deprecated item 'this_crate::Deprecated::inherit': text - --> $DIR/lint-stability-fields-deprecated.rs:310:13 + --> $DIR/lint-stability-fields-deprecated.rs:300:13 | LL | inherit: _, | ^^^^^^^^^^ error: use of deprecated item 'this_crate::Deprecated::override1': text - --> $DIR/lint-stability-fields-deprecated.rs:312:13 + --> $DIR/lint-stability-fields-deprecated.rs:302:13 | LL | override1: _, | ^^^^^^^^^^^^ error: use of deprecated item 'this_crate::Deprecated::override2': text - --> $DIR/lint-stability-fields-deprecated.rs:314:13 + --> $DIR/lint-stability-fields-deprecated.rs:304:13 | LL | override2: _ | ^^^^^^^^^^^^ error: use of deprecated item 'this_crate::Deprecated2::0': text - --> $DIR/lint-stability-fields-deprecated.rs:326:17 + --> $DIR/lint-stability-fields-deprecated.rs:316:17 | LL | let _ = x.0; | ^^^ error: use of deprecated item 'this_crate::Deprecated2::1': text - --> $DIR/lint-stability-fields-deprecated.rs:328:17 + --> $DIR/lint-stability-fields-deprecated.rs:318:17 | LL | let _ = x.1; | ^^^ error: use of deprecated item 'this_crate::Deprecated2::2': text - --> $DIR/lint-stability-fields-deprecated.rs:330:17 + --> $DIR/lint-stability-fields-deprecated.rs:320:17 | LL | let _ = x.2; | ^^^ error: use of deprecated item 'this_crate::Deprecated2::0': text - --> $DIR/lint-stability-fields-deprecated.rs:335:14 + --> $DIR/lint-stability-fields-deprecated.rs:325:14 | LL | (_, | ^ error: use of deprecated item 'this_crate::Deprecated2::1': text - --> $DIR/lint-stability-fields-deprecated.rs:337:14 + --> $DIR/lint-stability-fields-deprecated.rs:327:14 | LL | _, | ^ error: use of deprecated item 'this_crate::Deprecated2::2': text - --> $DIR/lint-stability-fields-deprecated.rs:339:14 + --> $DIR/lint-stability-fields-deprecated.rs:329:14 | LL | _) | ^ diff --git a/src/test/ui/lint/lint-stability-fields.rs b/src/test/ui/lint/lint-stability-fields.rs index db6b64dabfe4b..9be8710bd4cef 100644 --- a/src/test/ui/lint/lint-stability-fields.rs +++ b/src/test/ui/lint/lint-stability-fields.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:lint_stability_fields.rs #![allow(deprecated)] #![allow(dead_code)] diff --git a/src/test/ui/lint/lint-stability-fields.stderr b/src/test/ui/lint/lint-stability-fields.stderr index 2f176062c305d..93f8075b2b273 100644 --- a/src/test/ui/lint/lint-stability-fields.stderr +++ b/src/test/ui/lint/lint-stability-fields.stderr @@ -1,5 +1,5 @@ error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:61:17 + --> $DIR/lint-stability-fields.rs:51:17 | LL | let x = Unstable { //~ ERROR use of unstable | ^^^^^^^^ @@ -7,7 +7,7 @@ LL | let x = Unstable { //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:71:13 + --> $DIR/lint-stability-fields.rs:61:13 | LL | let Unstable { //~ ERROR use of unstable | ^^^^^^^^ @@ -15,7 +15,7 @@ LL | let Unstable { //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:77:13 + --> $DIR/lint-stability-fields.rs:67:13 | LL | let Unstable //~ ERROR use of unstable | ^^^^^^^^ @@ -23,7 +23,7 @@ LL | let Unstable //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:82:17 + --> $DIR/lint-stability-fields.rs:72:17 | LL | let x = reexport::Unstable2(1, 2, 3); //~ ERROR use of unstable | ^^^^^^^^^^^^^^^^^^^ @@ -31,7 +31,7 @@ LL | let x = reexport::Unstable2(1, 2, 3); //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:84:17 + --> $DIR/lint-stability-fields.rs:74:17 | LL | let x = Unstable2(1, 2, 3); //~ ERROR use of unstable | ^^^^^^^^^ @@ -39,7 +39,7 @@ LL | let x = Unstable2(1, 2, 3); //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:90:13 + --> $DIR/lint-stability-fields.rs:80:13 | LL | let Unstable2 //~ ERROR use of unstable | ^^^^^^^^^ @@ -47,7 +47,7 @@ LL | let Unstable2 //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:95:13 + --> $DIR/lint-stability-fields.rs:85:13 | LL | let Unstable2 //~ ERROR use of unstable | ^^^^^^^^^ @@ -55,7 +55,7 @@ LL | let Unstable2 //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:100:17 + --> $DIR/lint-stability-fields.rs:90:17 | LL | let x = Deprecated { //~ ERROR use of unstable | ^^^^^^^^^^ @@ -63,7 +63,7 @@ LL | let x = Deprecated { //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:110:13 + --> $DIR/lint-stability-fields.rs:100:13 | LL | let Deprecated { //~ ERROR use of unstable | ^^^^^^^^^^ @@ -71,7 +71,7 @@ LL | let Deprecated { //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:116:13 + --> $DIR/lint-stability-fields.rs:106:13 | LL | let Deprecated //~ ERROR use of unstable | ^^^^^^^^^^ @@ -79,7 +79,7 @@ LL | let Deprecated //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:120:17 + --> $DIR/lint-stability-fields.rs:110:17 | LL | let x = Deprecated2(1, 2, 3); //~ ERROR use of unstable | ^^^^^^^^^^^ @@ -87,7 +87,7 @@ LL | let x = Deprecated2(1, 2, 3); //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:126:13 + --> $DIR/lint-stability-fields.rs:116:13 | LL | let Deprecated2 //~ ERROR use of unstable | ^^^^^^^^^^^ @@ -95,7 +95,7 @@ LL | let Deprecated2 //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:131:13 + --> $DIR/lint-stability-fields.rs:121:13 | LL | let Deprecated2 //~ ERROR use of unstable | ^^^^^^^^^^^ @@ -103,7 +103,7 @@ LL | let Deprecated2 //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:31:13 + --> $DIR/lint-stability-fields.rs:21:13 | LL | override1: 2, //~ ERROR use of unstable | ^^^^^^^^^^^^ @@ -111,7 +111,7 @@ LL | override1: 2, //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:32:13 + --> $DIR/lint-stability-fields.rs:22:13 | LL | override2: 3, //~ ERROR use of unstable | ^^^^^^^^^^^^ @@ -119,7 +119,7 @@ LL | override2: 3, //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:36:17 + --> $DIR/lint-stability-fields.rs:26:17 | LL | let _ = x.override1; //~ ERROR use of unstable | ^^^^^^^^^^^ @@ -127,7 +127,7 @@ LL | let _ = x.override1; //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:37:17 + --> $DIR/lint-stability-fields.rs:27:17 | LL | let _ = x.override2; //~ ERROR use of unstable | ^^^^^^^^^^^ @@ -135,7 +135,7 @@ LL | let _ = x.override2; //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:41:13 + --> $DIR/lint-stability-fields.rs:31:13 | LL | override1: _, //~ ERROR use of unstable | ^^^^^^^^^^^^ @@ -143,7 +143,7 @@ LL | override1: _, //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:42:13 + --> $DIR/lint-stability-fields.rs:32:13 | LL | override2: _ //~ ERROR use of unstable | ^^^^^^^^^^^^ @@ -151,7 +151,7 @@ LL | override2: _ //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:50:17 + --> $DIR/lint-stability-fields.rs:40:17 | LL | let _ = x.1; //~ ERROR use of unstable | ^^^ @@ -159,7 +159,7 @@ LL | let _ = x.1; //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:51:17 + --> $DIR/lint-stability-fields.rs:41:17 | LL | let _ = x.2; //~ ERROR use of unstable | ^^^ @@ -167,7 +167,7 @@ LL | let _ = x.2; //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:54:20 + --> $DIR/lint-stability-fields.rs:44:20 | LL | _, //~ ERROR use of unstable | ^ @@ -175,7 +175,7 @@ LL | _, //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:55:20 + --> $DIR/lint-stability-fields.rs:45:20 | LL | _) //~ ERROR use of unstable | ^ @@ -183,7 +183,7 @@ LL | _) //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:62:13 + --> $DIR/lint-stability-fields.rs:52:13 | LL | inherit: 1, //~ ERROR use of unstable | ^^^^^^^^^^ @@ -191,7 +191,7 @@ LL | inherit: 1, //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:64:13 + --> $DIR/lint-stability-fields.rs:54:13 | LL | override2: 3, //~ ERROR use of unstable | ^^^^^^^^^^^^ @@ -199,7 +199,7 @@ LL | override2: 3, //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:67:17 + --> $DIR/lint-stability-fields.rs:57:17 | LL | let _ = x.inherit; //~ ERROR use of unstable | ^^^^^^^^^ @@ -207,7 +207,7 @@ LL | let _ = x.inherit; //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:69:17 + --> $DIR/lint-stability-fields.rs:59:17 | LL | let _ = x.override2; //~ ERROR use of unstable | ^^^^^^^^^^^ @@ -215,7 +215,7 @@ LL | let _ = x.override2; //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:72:13 + --> $DIR/lint-stability-fields.rs:62:13 | LL | inherit: _, //~ ERROR use of unstable | ^^^^^^^^^^ @@ -223,7 +223,7 @@ LL | inherit: _, //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:74:13 + --> $DIR/lint-stability-fields.rs:64:13 | LL | override2: _ //~ ERROR use of unstable | ^^^^^^^^^^^^ @@ -231,7 +231,7 @@ LL | override2: _ //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:86:17 + --> $DIR/lint-stability-fields.rs:76:17 | LL | let _ = x.0; //~ ERROR use of unstable | ^^^ @@ -239,7 +239,7 @@ LL | let _ = x.0; //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:88:17 + --> $DIR/lint-stability-fields.rs:78:17 | LL | let _ = x.2; //~ ERROR use of unstable | ^^^ @@ -247,7 +247,7 @@ LL | let _ = x.2; //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:91:14 + --> $DIR/lint-stability-fields.rs:81:14 | LL | (_, //~ ERROR use of unstable | ^ @@ -255,7 +255,7 @@ LL | (_, //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:93:14 + --> $DIR/lint-stability-fields.rs:83:14 | LL | _) //~ ERROR use of unstable | ^ @@ -263,7 +263,7 @@ LL | _) //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:101:13 + --> $DIR/lint-stability-fields.rs:91:13 | LL | inherit: 1, //~ ERROR use of unstable | ^^^^^^^^^^ @@ -271,7 +271,7 @@ LL | inherit: 1, //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:103:13 + --> $DIR/lint-stability-fields.rs:93:13 | LL | override2: 3, //~ ERROR use of unstable | ^^^^^^^^^^^^ @@ -279,7 +279,7 @@ LL | override2: 3, //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:106:17 + --> $DIR/lint-stability-fields.rs:96:17 | LL | let _ = x.inherit; //~ ERROR use of unstable | ^^^^^^^^^ @@ -287,7 +287,7 @@ LL | let _ = x.inherit; //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:108:17 + --> $DIR/lint-stability-fields.rs:98:17 | LL | let _ = x.override2; //~ ERROR use of unstable | ^^^^^^^^^^^ @@ -295,7 +295,7 @@ LL | let _ = x.override2; //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:111:13 + --> $DIR/lint-stability-fields.rs:101:13 | LL | inherit: _, //~ ERROR use of unstable | ^^^^^^^^^^ @@ -303,7 +303,7 @@ LL | inherit: _, //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:113:13 + --> $DIR/lint-stability-fields.rs:103:13 | LL | override2: _ //~ ERROR use of unstable | ^^^^^^^^^^^^ @@ -311,7 +311,7 @@ LL | override2: _ //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:122:17 + --> $DIR/lint-stability-fields.rs:112:17 | LL | let _ = x.0; //~ ERROR use of unstable | ^^^ @@ -319,7 +319,7 @@ LL | let _ = x.0; //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:124:17 + --> $DIR/lint-stability-fields.rs:114:17 | LL | let _ = x.2; //~ ERROR use of unstable | ^^^ @@ -327,7 +327,7 @@ LL | let _ = x.2; //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:127:14 + --> $DIR/lint-stability-fields.rs:117:14 | LL | (_, //~ ERROR use of unstable | ^ @@ -335,7 +335,7 @@ LL | (_, //~ ERROR use of unstable = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability-fields.rs:129:14 + --> $DIR/lint-stability-fields.rs:119:14 | LL | _) //~ ERROR use of unstable | ^ diff --git a/src/test/ui/lint/lint-stability.rs b/src/test/ui/lint/lint-stability.rs index 720b1235d47f6..6ff79083f46ff 100644 --- a/src/test/ui/lint/lint-stability.rs +++ b/src/test/ui/lint/lint-stability.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:lint_stability.rs // aux-build:inherited_stability.rs // aux-build:stability_cfg1.rs diff --git a/src/test/ui/lint/lint-stability.stderr b/src/test/ui/lint/lint-stability.stderr index 893c70f85f13f..03c42e59c679a 100644 --- a/src/test/ui/lint/lint-stability.stderr +++ b/src/test/ui/lint/lint-stability.stderr @@ -1,5 +1,5 @@ error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:27:5 + --> $DIR/lint-stability.rs:17:5 | LL | extern crate stability_cfg2; //~ ERROR use of unstable library feature | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | extern crate stability_cfg2; //~ ERROR use of unstable library feature = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:55:9 + --> $DIR/lint-stability.rs:45:9 | LL | deprecated_unstable(); | ^^^^^^^^^^^^^^^^^^^ @@ -15,7 +15,7 @@ LL | deprecated_unstable(); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:57:9 + --> $DIR/lint-stability.rs:47:9 | LL | Trait::trait_deprecated_unstable(&foo); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -23,7 +23,7 @@ LL | Trait::trait_deprecated_unstable(&foo); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:59:9 + --> $DIR/lint-stability.rs:49:9 | LL | ::trait_deprecated_unstable(&foo); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -31,7 +31,7 @@ LL | ::trait_deprecated_unstable(&foo); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:62:9 + --> $DIR/lint-stability.rs:52:9 | LL | deprecated_unstable_text(); | ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -39,7 +39,7 @@ LL | deprecated_unstable_text(); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:64:9 + --> $DIR/lint-stability.rs:54:9 | LL | Trait::trait_deprecated_unstable_text(&foo); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -47,7 +47,7 @@ LL | Trait::trait_deprecated_unstable_text(&foo); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:66:9 + --> $DIR/lint-stability.rs:56:9 | LL | ::trait_deprecated_unstable_text(&foo); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -55,7 +55,7 @@ LL | ::trait_deprecated_unstable_text(&foo); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:69:9 + --> $DIR/lint-stability.rs:59:9 | LL | unstable(); //~ ERROR use of unstable library feature | ^^^^^^^^ @@ -63,7 +63,7 @@ LL | unstable(); //~ ERROR use of unstable library feature = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:70:9 + --> $DIR/lint-stability.rs:60:9 | LL | Trait::trait_unstable(&foo); //~ ERROR use of unstable library feature | ^^^^^^^^^^^^^^^^^^^^^ @@ -71,7 +71,7 @@ LL | Trait::trait_unstable(&foo); //~ ERROR use of unstable library feat = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:71:9 + --> $DIR/lint-stability.rs:61:9 | LL | ::trait_unstable(&foo); //~ ERROR use of unstable library feature | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -79,7 +79,7 @@ LL | ::trait_unstable(&foo); //~ ERROR use of unstable lib = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature': text - --> $DIR/lint-stability.rs:73:9 + --> $DIR/lint-stability.rs:63:9 | LL | unstable_text(); | ^^^^^^^^^^^^^ @@ -87,7 +87,7 @@ LL | unstable_text(); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature': text - --> $DIR/lint-stability.rs:75:9 + --> $DIR/lint-stability.rs:65:9 | LL | Trait::trait_unstable_text(&foo); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -95,7 +95,7 @@ LL | Trait::trait_unstable_text(&foo); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature': text - --> $DIR/lint-stability.rs:77:9 + --> $DIR/lint-stability.rs:67:9 | LL | ::trait_unstable_text(&foo); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -103,7 +103,7 @@ LL | ::trait_unstable_text(&foo); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:109:17 + --> $DIR/lint-stability.rs:99:17 | LL | let _ = DeprecatedUnstableStruct { | ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -111,7 +111,7 @@ LL | let _ = DeprecatedUnstableStruct { = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:113:17 + --> $DIR/lint-stability.rs:103:17 | LL | let _ = UnstableStruct { i: 0 }; //~ ERROR use of unstable library feature | ^^^^^^^^^^^^^^ @@ -119,7 +119,7 @@ LL | let _ = UnstableStruct { i: 0 }; //~ ERROR use of unstable library = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:117:17 + --> $DIR/lint-stability.rs:107:17 | LL | let _ = DeprecatedUnstableUnitStruct; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -127,7 +127,7 @@ LL | let _ = DeprecatedUnstableUnitStruct; = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:119:17 + --> $DIR/lint-stability.rs:109:17 | LL | let _ = UnstableUnitStruct; //~ ERROR use of unstable library feature | ^^^^^^^^^^^^^^^^^^ @@ -135,7 +135,7 @@ LL | let _ = UnstableUnitStruct; //~ ERROR use of unstable library featu = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:123:17 + --> $DIR/lint-stability.rs:113:17 | LL | let _ = Enum::DeprecatedUnstableVariant; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -143,7 +143,7 @@ LL | let _ = Enum::DeprecatedUnstableVariant; = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:125:17 + --> $DIR/lint-stability.rs:115:17 | LL | let _ = Enum::UnstableVariant; //~ ERROR use of unstable library feature | ^^^^^^^^^^^^^^^^^^^^^ @@ -151,7 +151,7 @@ LL | let _ = Enum::UnstableVariant; //~ ERROR use of unstable library fe = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:129:17 + --> $DIR/lint-stability.rs:119:17 | LL | let _ = DeprecatedUnstableTupleStruct (1); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -159,7 +159,7 @@ LL | let _ = DeprecatedUnstableTupleStruct (1); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:131:17 + --> $DIR/lint-stability.rs:121:17 | LL | let _ = UnstableTupleStruct (1); //~ ERROR use of unstable library feature | ^^^^^^^^^^^^^^^^^^^ @@ -167,7 +167,7 @@ LL | let _ = UnstableTupleStruct (1); //~ ERROR use of unstable library = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:140:25 + --> $DIR/lint-stability.rs:130:25 | LL | macro_test_arg!(deprecated_unstable_text()); | ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -175,7 +175,7 @@ LL | macro_test_arg!(deprecated_unstable_text()); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:154:9 + --> $DIR/lint-stability.rs:144:9 | LL | Trait::trait_deprecated_unstable(&foo); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -183,7 +183,7 @@ LL | Trait::trait_deprecated_unstable(&foo); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:156:9 + --> $DIR/lint-stability.rs:146:9 | LL | ::trait_deprecated_unstable(&foo); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -191,7 +191,7 @@ LL | ::trait_deprecated_unstable(&foo); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:158:9 + --> $DIR/lint-stability.rs:148:9 | LL | Trait::trait_deprecated_unstable_text(&foo); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -199,7 +199,7 @@ LL | Trait::trait_deprecated_unstable_text(&foo); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:160:9 + --> $DIR/lint-stability.rs:150:9 | LL | ::trait_deprecated_unstable_text(&foo); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -207,7 +207,7 @@ LL | ::trait_deprecated_unstable_text(&foo); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:162:9 + --> $DIR/lint-stability.rs:152:9 | LL | Trait::trait_unstable(&foo); //~ ERROR use of unstable library feature | ^^^^^^^^^^^^^^^^^^^^^ @@ -215,7 +215,7 @@ LL | Trait::trait_unstable(&foo); //~ ERROR use of unstable library feat = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:163:9 + --> $DIR/lint-stability.rs:153:9 | LL | ::trait_unstable(&foo); //~ ERROR use of unstable library feature | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -223,7 +223,7 @@ LL | ::trait_unstable(&foo); //~ ERROR use of unstable lib = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature': text - --> $DIR/lint-stability.rs:164:9 + --> $DIR/lint-stability.rs:154:9 | LL | Trait::trait_unstable_text(&foo); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -231,7 +231,7 @@ LL | Trait::trait_unstable_text(&foo); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature': text - --> $DIR/lint-stability.rs:166:9 + --> $DIR/lint-stability.rs:156:9 | LL | ::trait_unstable_text(&foo); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -239,7 +239,7 @@ LL | ::trait_unstable_text(&foo); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:182:10 + --> $DIR/lint-stability.rs:172:10 | LL | impl UnstableTrait for S { } //~ ERROR use of unstable library feature | ^^^^^^^^^^^^^ @@ -247,7 +247,7 @@ LL | impl UnstableTrait for S { } //~ ERROR use of unstable library feature = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:184:24 + --> $DIR/lint-stability.rs:174:24 | LL | trait LocalTrait : UnstableTrait { } //~ ERROR use of unstable library feature | ^^^^^^^^^^^^^ @@ -255,7 +255,7 @@ LL | trait LocalTrait : UnstableTrait { } //~ ERROR use of unstable library = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:189:9 + --> $DIR/lint-stability.rs:179:9 | LL | fn trait_unstable(&self) {} //~ ERROR use of unstable library feature | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -263,7 +263,7 @@ LL | fn trait_unstable(&self) {} //~ ERROR use of unstable library featu = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:194:5 + --> $DIR/lint-stability.rs:184:5 | LL | extern crate inherited_stability; //~ ERROR use of unstable library feature | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -271,7 +271,7 @@ LL | extern crate inherited_stability; //~ ERROR use of unstable library fea = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:195:9 + --> $DIR/lint-stability.rs:185:9 | LL | use self::inherited_stability::*; //~ ERROR use of unstable library feature | ^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -279,7 +279,7 @@ LL | use self::inherited_stability::*; //~ ERROR use of unstable library fea = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:198:9 + --> $DIR/lint-stability.rs:188:9 | LL | unstable(); //~ ERROR use of unstable library feature | ^^^^^^^^ @@ -287,7 +287,7 @@ LL | unstable(); //~ ERROR use of unstable library feature = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:201:9 + --> $DIR/lint-stability.rs:191:9 | LL | stable_mod::unstable(); //~ ERROR use of unstable library feature | ^^^^^^^^^^^^^^^^^^^^ @@ -295,7 +295,7 @@ LL | stable_mod::unstable(); //~ ERROR use of unstable library feature = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:205:9 + --> $DIR/lint-stability.rs:195:9 | LL | unstable_mod::unstable(); //~ ERROR use of unstable library feature | ^^^^^^^^^^^^^^^^^^^^^^ @@ -303,7 +303,7 @@ LL | unstable_mod::unstable(); //~ ERROR use of unstable library feature = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:207:17 + --> $DIR/lint-stability.rs:197:17 | LL | let _ = Unstable::UnstableVariant; //~ ERROR use of unstable library feature | ^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -311,7 +311,7 @@ LL | let _ = Unstable::UnstableVariant; //~ ERROR use of unstable librar = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:98:48 + --> $DIR/lint-stability.rs:88:48 | LL | struct S1(T::TypeUnstable); | ^^^^^^^^^^^^^^^ @@ -319,7 +319,7 @@ LL | struct S1(T::TypeUnstable); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/lint-stability.rs:102:13 + --> $DIR/lint-stability.rs:92:13 | LL | TypeUnstable = u8, //~ ERROR use of unstable library feature | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-stability2.rs b/src/test/ui/lint/lint-stability2.rs index d2ec00d649506..9710d0826c71f 100644 --- a/src/test/ui/lint/lint-stability2.rs +++ b/src/test/ui/lint/lint-stability2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:lint_stability.rs // error-pattern: use of deprecated item diff --git a/src/test/ui/lint/lint-stability2.stderr b/src/test/ui/lint/lint-stability2.stderr index 5585fc9f83a19..6599da564f52b 100644 --- a/src/test/ui/lint/lint-stability2.stderr +++ b/src/test/ui/lint/lint-stability2.stderr @@ -1,11 +1,11 @@ error: use of deprecated item 'lint_stability::deprecated': text - --> $DIR/lint-stability2.rs:22:5 + --> $DIR/lint-stability2.rs:12:5 | LL | macro_test!(); | ^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-stability2.rs:14:9 + --> $DIR/lint-stability2.rs:4:9 | LL | #![deny(deprecated)] | ^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-stability3.rs b/src/test/ui/lint/lint-stability3.rs index 44a36f215f3d4..3d2cc6890b812 100644 --- a/src/test/ui/lint/lint-stability3.rs +++ b/src/test/ui/lint/lint-stability3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:lint_stability.rs // error-pattern: use of deprecated item diff --git a/src/test/ui/lint/lint-stability3.stderr b/src/test/ui/lint/lint-stability3.stderr index 722223f624354..84274e6406972 100644 --- a/src/test/ui/lint/lint-stability3.stderr +++ b/src/test/ui/lint/lint-stability3.stderr @@ -1,11 +1,11 @@ error: use of deprecated item 'lint_stability::deprecated_text': text - --> $DIR/lint-stability3.rs:23:5 + --> $DIR/lint-stability3.rs:13:5 | LL | macro_test_arg_nested!(deprecated_text); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-stability3.rs:14:9 + --> $DIR/lint-stability3.rs:4:9 | LL | #![deny(deprecated)] | ^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-type-limits.rs b/src/test/ui/lint/lint-type-limits.rs index 29929c120c30f..2b140f86964ca 100644 --- a/src/test/ui/lint/lint-type-limits.rs +++ b/src/test/ui/lint/lint-type-limits.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] // compile-flags: -D unused-comparisons diff --git a/src/test/ui/lint/lint-type-limits.stderr b/src/test/ui/lint/lint-type-limits.stderr index 49b379a9901d0..14ef953d294e0 100644 --- a/src/test/ui/lint/lint-type-limits.stderr +++ b/src/test/ui/lint/lint-type-limits.stderr @@ -1,5 +1,5 @@ error: comparison is useless due to type limits - --> $DIR/lint-type-limits.rs:18:11 + --> $DIR/lint-type-limits.rs:8:11 | LL | while i >= 0 { //~ ERROR comparison is useless due to type limits | ^^^^^^ @@ -7,49 +7,49 @@ LL | while i >= 0 { //~ ERROR comparison is useless due to type limits = note: requested on the command line with `-D unused-comparisons` error: comparison is useless due to type limits - --> $DIR/lint-type-limits.rs:29:13 + --> $DIR/lint-type-limits.rs:19:13 | LL | let _ = u > 255; //~ ERROR comparison is useless due to type limits | ^^^^^^^ error: comparison is useless due to type limits - --> $DIR/lint-type-limits.rs:30:13 + --> $DIR/lint-type-limits.rs:20:13 | LL | let _ = 255 < u; //~ ERROR comparison is useless due to type limits | ^^^^^^^ error: comparison is useless due to type limits - --> $DIR/lint-type-limits.rs:31:13 + --> $DIR/lint-type-limits.rs:21:13 | LL | let _ = u < 0; //~ ERROR comparison is useless due to type limits | ^^^^^ error: comparison is useless due to type limits - --> $DIR/lint-type-limits.rs:32:13 + --> $DIR/lint-type-limits.rs:22:13 | LL | let _ = 0 > u; //~ ERROR comparison is useless due to type limits | ^^^^^ error: comparison is useless due to type limits - --> $DIR/lint-type-limits.rs:33:13 + --> $DIR/lint-type-limits.rs:23:13 | LL | let _ = u <= 255; //~ ERROR comparison is useless due to type limits | ^^^^^^^^ error: comparison is useless due to type limits - --> $DIR/lint-type-limits.rs:34:13 + --> $DIR/lint-type-limits.rs:24:13 | LL | let _ = 255 >= u; //~ ERROR comparison is useless due to type limits | ^^^^^^^^ error: comparison is useless due to type limits - --> $DIR/lint-type-limits.rs:35:13 + --> $DIR/lint-type-limits.rs:25:13 | LL | let _ = u >= 0; //~ ERROR comparison is useless due to type limits | ^^^^^^ error: comparison is useless due to type limits - --> $DIR/lint-type-limits.rs:36:13 + --> $DIR/lint-type-limits.rs:26:13 | LL | let _ = 0 <= u; //~ ERROR comparison is useless due to type limits | ^^^^^^ diff --git a/src/test/ui/lint/lint-type-limits2.rs b/src/test/ui/lint/lint-type-limits2.rs index 8fc18d16469e3..9c69ba12cf79e 100644 --- a/src/test/ui/lint/lint-type-limits2.rs +++ b/src/test/ui/lint/lint-type-limits2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] // compile-flags: -D unused-comparisons diff --git a/src/test/ui/lint/lint-type-limits2.stderr b/src/test/ui/lint/lint-type-limits2.stderr index a7abf7ad36494..3118bcec05e85 100644 --- a/src/test/ui/lint/lint-type-limits2.stderr +++ b/src/test/ui/lint/lint-type-limits2.stderr @@ -1,5 +1,5 @@ error: comparison is useless due to type limits - --> $DIR/lint-type-limits2.rs:22:5 + --> $DIR/lint-type-limits2.rs:12:5 | LL | 128 > bar() //~ ERROR comparison is useless due to type limits | ^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | 128 > bar() //~ ERROR comparison is useless due to type limits = note: requested on the command line with `-D unused-comparisons` warning: literal out of range for i8 - --> $DIR/lint-type-limits2.rs:22:5 + --> $DIR/lint-type-limits2.rs:12:5 | LL | 128 > bar() //~ ERROR comparison is useless due to type limits | ^^^ diff --git a/src/test/ui/lint/lint-type-limits3.rs b/src/test/ui/lint/lint-type-limits3.rs index b09dc0acdbf91..3e95ad212eb16 100644 --- a/src/test/ui/lint/lint-type-limits3.rs +++ b/src/test/ui/lint/lint-type-limits3.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] // compile-flags: -D unused-comparisons diff --git a/src/test/ui/lint/lint-type-limits3.stderr b/src/test/ui/lint/lint-type-limits3.stderr index b6e14ac64e506..5e30b1646a755 100644 --- a/src/test/ui/lint/lint-type-limits3.stderr +++ b/src/test/ui/lint/lint-type-limits3.stderr @@ -1,5 +1,5 @@ error: comparison is useless due to type limits - --> $DIR/lint-type-limits3.rs:18:11 + --> $DIR/lint-type-limits3.rs:8:11 | LL | while 200 != i { //~ ERROR comparison is useless due to type limits | ^^^^^^^^ @@ -7,7 +7,7 @@ LL | while 200 != i { //~ ERROR comparison is useless due to type limits = note: requested on the command line with `-D unused-comparisons` warning: literal out of range for i8 - --> $DIR/lint-type-limits3.rs:18:11 + --> $DIR/lint-type-limits3.rs:8:11 | LL | while 200 != i { //~ ERROR comparison is useless due to type limits | ^^^ diff --git a/src/test/ui/lint/lint-type-overflow.rs b/src/test/ui/lint/lint-type-overflow.rs index ce336905c0139..847cdf31dc788 100644 --- a/src/test/ui/lint/lint-type-overflow.rs +++ b/src/test/ui/lint/lint-type-overflow.rs @@ -1,12 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // #![deny(overflowing_literals)] diff --git a/src/test/ui/lint/lint-type-overflow.stderr b/src/test/ui/lint/lint-type-overflow.stderr index 67f4537e1e64f..987ee8a640c9c 100644 --- a/src/test/ui/lint/lint-type-overflow.stderr +++ b/src/test/ui/lint/lint-type-overflow.stderr @@ -1,113 +1,113 @@ error: literal out of range for u8 - --> $DIR/lint-type-overflow.rs:21:18 + --> $DIR/lint-type-overflow.rs:12:18 | LL | let x1: u8 = 256; //~ error: literal out of range for u8 | ^^^ | note: lint level defined here - --> $DIR/lint-type-overflow.rs:12:9 + --> $DIR/lint-type-overflow.rs:3:9 | LL | #![deny(overflowing_literals)] | ^^^^^^^^^^^^^^^^^^^^ error: literal out of range for u8 - --> $DIR/lint-type-overflow.rs:24:14 + --> $DIR/lint-type-overflow.rs:15:14 | LL | let x1 = 256_u8; //~ error: literal out of range for u8 | ^^^^^^ error: literal out of range for i8 - --> $DIR/lint-type-overflow.rs:27:18 + --> $DIR/lint-type-overflow.rs:18:18 | LL | let x1: i8 = 128; //~ error: literal out of range for i8 | ^^^ error: literal out of range for i8 - --> $DIR/lint-type-overflow.rs:29:19 + --> $DIR/lint-type-overflow.rs:20:19 | LL | let x3: i8 = -129; //~ error: literal out of range for i8 | ^^^ error: literal out of range for i8 - --> $DIR/lint-type-overflow.rs:30:19 + --> $DIR/lint-type-overflow.rs:21:19 | LL | let x3: i8 = -(129); //~ error: literal out of range for i8 | ^^^^^ error: literal out of range for i8 - --> $DIR/lint-type-overflow.rs:31:20 + --> $DIR/lint-type-overflow.rs:22:20 | LL | let x3: i8 = -{129}; //~ error: literal out of range for i8 | ^^^ error: literal out of range for i8 - --> $DIR/lint-type-overflow.rs:33:10 + --> $DIR/lint-type-overflow.rs:24:10 | LL | test(1000); //~ error: literal out of range for i8 | ^^^^ error: literal out of range for i8 - --> $DIR/lint-type-overflow.rs:35:13 + --> $DIR/lint-type-overflow.rs:26:13 | LL | let x = 128_i8; //~ error: literal out of range for i8 | ^^^^^^ error: literal out of range for i8 - --> $DIR/lint-type-overflow.rs:39:14 + --> $DIR/lint-type-overflow.rs:30:14 | LL | let x = -129_i8; //~ error: literal out of range for i8 | ^^^^^^ error: literal out of range for i32 - --> $DIR/lint-type-overflow.rs:43:18 + --> $DIR/lint-type-overflow.rs:34:18 | LL | let x: i32 = 2147483648; //~ error: literal out of range for i32 | ^^^^^^^^^^ error: literal out of range for i32 - --> $DIR/lint-type-overflow.rs:44:13 + --> $DIR/lint-type-overflow.rs:35:13 | LL | let x = 2147483648_i32; //~ error: literal out of range for i32 | ^^^^^^^^^^^^^^ error: literal out of range for i32 - --> $DIR/lint-type-overflow.rs:47:19 + --> $DIR/lint-type-overflow.rs:38:19 | LL | let x: i32 = -2147483649; //~ error: literal out of range for i32 | ^^^^^^^^^^ error: literal out of range for i32 - --> $DIR/lint-type-overflow.rs:48:14 + --> $DIR/lint-type-overflow.rs:39:14 | LL | let x = -2147483649_i32; //~ error: literal out of range for i32 | ^^^^^^^^^^^^^^ error: literal out of range for i32 - --> $DIR/lint-type-overflow.rs:49:13 + --> $DIR/lint-type-overflow.rs:40:13 | LL | let x = 2147483648; //~ error: literal out of range for i32 | ^^^^^^^^^^ error: literal out of range for i64 - --> $DIR/lint-type-overflow.rs:51:13 + --> $DIR/lint-type-overflow.rs:42:13 | LL | let x = 9223372036854775808_i64; //~ error: literal out of range for i64 | ^^^^^^^^^^^^^^^^^^^^^^^ error: literal out of range for i64 - --> $DIR/lint-type-overflow.rs:53:13 + --> $DIR/lint-type-overflow.rs:44:13 | LL | let x = 18446744073709551615_i64; //~ error: literal out of range for i64 | ^^^^^^^^^^^^^^^^^^^^^^^^ error: literal out of range for i64 - --> $DIR/lint-type-overflow.rs:54:19 + --> $DIR/lint-type-overflow.rs:45:19 | LL | let x: i64 = -9223372036854775809; //~ error: literal out of range for i64 | ^^^^^^^^^^^^^^^^^^^ error: literal out of range for i64 - --> $DIR/lint-type-overflow.rs:55:14 + --> $DIR/lint-type-overflow.rs:46:14 | LL | let x = -9223372036854775809_i64; //~ error: literal out of range for i64 | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-type-overflow2.rs b/src/test/ui/lint/lint-type-overflow2.rs index f7cf8a68d5684..2c74481c80c83 100644 --- a/src/test/ui/lint/lint-type-overflow2.rs +++ b/src/test/ui/lint/lint-type-overflow2.rs @@ -1,12 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // #![warn(overflowing_literals)] diff --git a/src/test/ui/lint/lint-type-overflow2.stderr b/src/test/ui/lint/lint-type-overflow2.stderr index ecfd2584bba42..c3457021d9e1a 100644 --- a/src/test/ui/lint/lint-type-overflow2.stderr +++ b/src/test/ui/lint/lint-type-overflow2.stderr @@ -1,41 +1,41 @@ warning: literal out of range for i8 - --> $DIR/lint-type-overflow2.rs:19:20 + --> $DIR/lint-type-overflow2.rs:10:20 | LL | let x2: i8 = --128; //~ warn: literal out of range for i8 | ^^^ | note: lint level defined here - --> $DIR/lint-type-overflow2.rs:12:9 + --> $DIR/lint-type-overflow2.rs:3:9 | LL | #![warn(overflowing_literals)] | ^^^^^^^^^^^^^^^^^^^^ warning: literal out of range for f32 - --> $DIR/lint-type-overflow2.rs:21:14 + --> $DIR/lint-type-overflow2.rs:12:14 | LL | let x = -3.40282357e+38_f32; //~ warn: literal out of range for f32 | ^^^^^^^^^^^^^^^^^^ warning: literal out of range for f32 - --> $DIR/lint-type-overflow2.rs:22:14 + --> $DIR/lint-type-overflow2.rs:13:14 | LL | let x = 3.40282357e+38_f32; //~ warn: literal out of range for f32 | ^^^^^^^^^^^^^^^^^^ warning: literal out of range for f64 - --> $DIR/lint-type-overflow2.rs:23:14 + --> $DIR/lint-type-overflow2.rs:14:14 | LL | let x = -1.7976931348623159e+308_f64; //~ warn: literal out of range for f64 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: literal out of range for f64 - --> $DIR/lint-type-overflow2.rs:24:14 + --> $DIR/lint-type-overflow2.rs:15:14 | LL | let x = 1.7976931348623159e+308_f64; //~ warn: literal out of range for f64 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: compilation successful - --> $DIR/lint-type-overflow2.rs:18:1 + --> $DIR/lint-type-overflow2.rs:9:1 | LL | / fn main() { //~ ERROR: compilation successful LL | | let x2: i8 = --128; //~ warn: literal out of range for i8 diff --git a/src/test/ui/lint/lint-unconditional-recursion.rs b/src/test/ui/lint/lint-unconditional-recursion.rs index bfc144615a2d8..cb3001c3759e1 100644 --- a/src/test/ui/lint/lint-unconditional-recursion.rs +++ b/src/test/ui/lint/lint-unconditional-recursion.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(unconditional_recursion)] #![allow(dead_code)] diff --git a/src/test/ui/lint/lint-unconditional-recursion.stderr b/src/test/ui/lint/lint-unconditional-recursion.stderr index 933c191551dac..9a63f458835ad 100644 --- a/src/test/ui/lint/lint-unconditional-recursion.stderr +++ b/src/test/ui/lint/lint-unconditional-recursion.stderr @@ -1,5 +1,5 @@ error: function cannot return without recurring - --> $DIR/lint-unconditional-recursion.rs:14:1 + --> $DIR/lint-unconditional-recursion.rs:4:1 | LL | fn foo() { //~ ERROR function cannot return without recurring | ^^^^^^^^ cannot return without recurring @@ -7,14 +7,14 @@ LL | foo(); | ----- recursive call site | note: lint level defined here - --> $DIR/lint-unconditional-recursion.rs:11:9 + --> $DIR/lint-unconditional-recursion.rs:1:9 | LL | #![deny(unconditional_recursion)] | ^^^^^^^^^^^^^^^^^^^^^^^ = help: a `loop` may express intention better if this is on purpose error: function cannot return without recurring - --> $DIR/lint-unconditional-recursion.rs:24:1 + --> $DIR/lint-unconditional-recursion.rs:14:1 | LL | fn baz() { //~ ERROR function cannot return without recurring | ^^^^^^^^ cannot return without recurring @@ -28,7 +28,7 @@ LL | baz() = help: a `loop` may express intention better if this is on purpose error: function cannot return without recurring - --> $DIR/lint-unconditional-recursion.rs:36:1 + --> $DIR/lint-unconditional-recursion.rs:26:1 | LL | fn quz() -> bool { //~ ERROR function cannot return without recurring | ^^^^^^^^^^^^^^^^ cannot return without recurring @@ -42,7 +42,7 @@ LL | loop { quz(); } = help: a `loop` may express intention better if this is on purpose error: function cannot return without recurring - --> $DIR/lint-unconditional-recursion.rs:47:5 + --> $DIR/lint-unconditional-recursion.rs:37:5 | LL | fn bar(&self) { //~ ERROR function cannot return without recurring | ^^^^^^^^^^^^^ cannot return without recurring @@ -52,7 +52,7 @@ LL | self.bar() = help: a `loop` may express intention better if this is on purpose error: function cannot return without recurring - --> $DIR/lint-unconditional-recursion.rs:53:5 + --> $DIR/lint-unconditional-recursion.rs:43:5 | LL | fn bar(&self) { //~ ERROR function cannot return without recurring | ^^^^^^^^^^^^^ cannot return without recurring @@ -63,7 +63,7 @@ LL | self.bar() = help: a `loop` may express intention better if this is on purpose error: function cannot return without recurring - --> $DIR/lint-unconditional-recursion.rs:62:5 + --> $DIR/lint-unconditional-recursion.rs:52:5 | LL | fn bar(&self) { //~ ERROR function cannot return without recurring | ^^^^^^^^^^^^^ cannot return without recurring @@ -73,7 +73,7 @@ LL | 0.bar() = help: a `loop` may express intention better if this is on purpose error: function cannot return without recurring - --> $DIR/lint-unconditional-recursion.rs:75:5 + --> $DIR/lint-unconditional-recursion.rs:65:5 | LL | fn bar(&self) { //~ ERROR function cannot return without recurring | ^^^^^^^^^^^^^ cannot return without recurring @@ -83,7 +83,7 @@ LL | Foo2::bar(self) = help: a `loop` may express intention better if this is on purpose error: function cannot return without recurring - --> $DIR/lint-unconditional-recursion.rs:81:5 + --> $DIR/lint-unconditional-recursion.rs:71:5 | LL | fn bar(&self) { //~ ERROR function cannot return without recurring | ^^^^^^^^^^^^^ cannot return without recurring @@ -94,7 +94,7 @@ LL | Foo2::bar(self) = help: a `loop` may express intention better if this is on purpose error: function cannot return without recurring - --> $DIR/lint-unconditional-recursion.rs:91:5 + --> $DIR/lint-unconditional-recursion.rs:81:5 | LL | fn qux(&self) { //~ ERROR function cannot return without recurring | ^^^^^^^^^^^^^ cannot return without recurring @@ -104,7 +104,7 @@ LL | self.qux(); = help: a `loop` may express intention better if this is on purpose error: function cannot return without recurring - --> $DIR/lint-unconditional-recursion.rs:96:5 + --> $DIR/lint-unconditional-recursion.rs:86:5 | LL | fn as_ref(&self) -> &Self { //~ ERROR function cannot return without recurring | ^^^^^^^^^^^^^^^^^^^^^^^^^ cannot return without recurring @@ -114,7 +114,7 @@ LL | Baz::as_ref(self) = help: a `loop` may express intention better if this is on purpose error: function cannot return without recurring - --> $DIR/lint-unconditional-recursion.rs:103:5 + --> $DIR/lint-unconditional-recursion.rs:93:5 | LL | fn default() -> Baz { //~ ERROR function cannot return without recurring | ^^^^^^^^^^^^^^^^^^^ cannot return without recurring @@ -124,7 +124,7 @@ LL | let x = Default::default(); = help: a `loop` may express intention better if this is on purpose error: function cannot return without recurring - --> $DIR/lint-unconditional-recursion.rs:112:5 + --> $DIR/lint-unconditional-recursion.rs:102:5 | LL | fn deref(&self) -> &() { //~ ERROR function cannot return without recurring | ^^^^^^^^^^^^^^^^^^^^^^ cannot return without recurring @@ -134,7 +134,7 @@ LL | &**self = help: a `loop` may express intention better if this is on purpose error: function cannot return without recurring - --> $DIR/lint-unconditional-recursion.rs:119:5 + --> $DIR/lint-unconditional-recursion.rs:109:5 | LL | fn index(&self, x: usize) -> &Baz { //~ ERROR function cannot return without recurring | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot return without recurring @@ -144,7 +144,7 @@ LL | &self[x] = help: a `loop` may express intention better if this is on purpose error: function cannot return without recurring - --> $DIR/lint-unconditional-recursion.rs:128:5 + --> $DIR/lint-unconditional-recursion.rs:118:5 | LL | fn deref(&self) -> &Baz { //~ ERROR function cannot return without recurring | ^^^^^^^^^^^^^^^^^^^^^^^ cannot return without recurring diff --git a/src/test/ui/lint/lint-unexported-no-mangle.rs b/src/test/ui/lint/lint-unexported-no-mangle.rs index cd64dfa7a47dd..90fbf34c63f01 100644 --- a/src/test/ui/lint/lint-unexported-no-mangle.rs +++ b/src/test/ui/lint/lint-unexported-no-mangle.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-F private_no_mangle_fns -F no_mangle_const_items -F private_no_mangle_statics #[no_mangle] diff --git a/src/test/ui/lint/lint-unexported-no-mangle.stderr b/src/test/ui/lint/lint-unexported-no-mangle.stderr index e7d49f339e6d8..e72c09354ebe8 100644 --- a/src/test/ui/lint/lint-unexported-no-mangle.stderr +++ b/src/test/ui/lint/lint-unexported-no-mangle.stderr @@ -1,5 +1,5 @@ error: function is marked #[no_mangle], but not exported - --> $DIR/lint-unexported-no-mangle.rs:14:1 + --> $DIR/lint-unexported-no-mangle.rs:4:1 | LL | fn foo() { //~ ERROR function is marked #[no_mangle], but not exported | ^ @@ -12,7 +12,7 @@ LL | | } = note: requested on the command line with `-F private-no-mangle-fns` error: const items should never be #[no_mangle] - --> $DIR/lint-unexported-no-mangle.rs:19:1 + --> $DIR/lint-unexported-no-mangle.rs:9:1 | LL | const FOO: u64 = 1; //~ ERROR const items should never be #[no_mangle] | -----^^^^^^^^^^^^^^ @@ -22,7 +22,7 @@ LL | const FOO: u64 = 1; //~ ERROR const items should never be #[no_mangle] = note: requested on the command line with `-F no-mangle-const-items` error: const items should never be #[no_mangle] - --> $DIR/lint-unexported-no-mangle.rs:22:1 + --> $DIR/lint-unexported-no-mangle.rs:12:1 | LL | pub const PUB_FOO: u64 = 1; //~ ERROR const items should never be #[no_mangle] | ---------^^^^^^^^^^^^^^^^^^ @@ -30,7 +30,7 @@ LL | pub const PUB_FOO: u64 = 1; //~ ERROR const items should never be #[no_mang | help: try a static value: `pub static` error: static is marked #[no_mangle], but not exported - --> $DIR/lint-unexported-no-mangle.rs:33:1 + --> $DIR/lint-unexported-no-mangle.rs:23:1 | LL | static PRIVATE_BAR: u64 = 1; //~ ERROR static is marked #[no_mangle], but not exported | -^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-unknown-attr.rs b/src/test/ui/lint/lint-unknown-attr.rs index af4e81be1951d..828b869c12e23 100644 --- a/src/test/ui/lint/lint-unknown-attr.rs +++ b/src/test/ui/lint/lint-unknown-attr.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // When denying at the crate level, be sure to not get random warnings from the // injected intrinsics by the compiler. diff --git a/src/test/ui/lint/lint-unknown-attr.stderr b/src/test/ui/lint/lint-unknown-attr.stderr index 5f915232c14c3..435b03b1f658d 100644 --- a/src/test/ui/lint/lint-unknown-attr.stderr +++ b/src/test/ui/lint/lint-unknown-attr.stderr @@ -1,23 +1,23 @@ error: unused attribute - --> $DIR/lint-unknown-attr.rs:19:1 + --> $DIR/lint-unknown-attr.rs:9:1 | LL | #[dance] mod a {} //~ ERROR unused attribute | ^^^^^^^^ | note: lint level defined here - --> $DIR/lint-unknown-attr.rs:15:9 + --> $DIR/lint-unknown-attr.rs:5:9 | LL | #![deny(unused_attributes)] | ^^^^^^^^^^^^^^^^^ error: unused attribute - --> $DIR/lint-unknown-attr.rs:21:1 + --> $DIR/lint-unknown-attr.rs:11:1 | LL | #[dance] fn main() {} //~ ERROR unused attribute | ^^^^^^^^ error: unused attribute - --> $DIR/lint-unknown-attr.rs:17:1 + --> $DIR/lint-unknown-attr.rs:7:1 | LL | #![mutable_doc] //~ ERROR unused attribute | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-unknown-feature-default.rs b/src/test/ui/lint/lint-unknown-feature-default.rs index 5a0568f05e6e1..d77a50daa5495 100644 --- a/src/test/ui/lint/lint-unknown-feature-default.rs +++ b/src/test/ui/lint/lint-unknown-feature-default.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests the default for the unused_features lint #![allow(stable_features)] diff --git a/src/test/ui/lint/lint-unknown-feature-default.stderr b/src/test/ui/lint/lint-unknown-feature-default.stderr index bd4079ffd2e09..e9fd1487b1e63 100644 --- a/src/test/ui/lint/lint-unknown-feature-default.stderr +++ b/src/test/ui/lint/lint-unknown-feature-default.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/lint-unknown-feature-default.rs:20:1 + --> $DIR/lint-unknown-feature-default.rs:10:1 | LL | fn main() { } //~ ERROR: compilation successful | ^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-unknown-feature.rs b/src/test/ui/lint/lint-unknown-feature.rs index 81f99f9949284..1d7fbbbbde930 100644 --- a/src/test/ui/lint/lint-unknown-feature.rs +++ b/src/test/ui/lint/lint-unknown-feature.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![warn(unused_features)] #![allow(stable_features)] diff --git a/src/test/ui/lint/lint-unknown-feature.stderr b/src/test/ui/lint/lint-unknown-feature.stderr index e2744c03872a4..22f81913e00ab 100644 --- a/src/test/ui/lint/lint-unknown-feature.stderr +++ b/src/test/ui/lint/lint-unknown-feature.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/lint-unknown-feature.rs:20:1 + --> $DIR/lint-unknown-feature.rs:10:1 | LL | fn main() {} //~ ERROR: compilation successful | ^^^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-unknown-lint-cmdline.rs b/src/test/ui/lint/lint-unknown-lint-cmdline.rs index 0c41959f8a710..67a0c932891de 100644 --- a/src/test/ui/lint/lint-unknown-lint-cmdline.rs +++ b/src/test/ui/lint/lint-unknown-lint-cmdline.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-D bogus // error-pattern:unknown lint diff --git a/src/test/ui/lint/lint-unknown-lint.rs b/src/test/ui/lint/lint-unknown-lint.rs index 2de8d849d1915..f75e4fe70321e 100644 --- a/src/test/ui/lint/lint-unknown-lint.rs +++ b/src/test/ui/lint/lint-unknown-lint.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(not_a_real_lint)] //~ WARN unknown lint #![deny(unused)] fn main() { let unused = (); } //~ ERROR unused variable diff --git a/src/test/ui/lint/lint-unknown-lint.stderr b/src/test/ui/lint/lint-unknown-lint.stderr index b398a2f3690fb..0f60f87cc3df8 100644 --- a/src/test/ui/lint/lint-unknown-lint.stderr +++ b/src/test/ui/lint/lint-unknown-lint.stderr @@ -1,5 +1,5 @@ warning: unknown lint: `not_a_real_lint` - --> $DIR/lint-unknown-lint.rs:11:10 + --> $DIR/lint-unknown-lint.rs:1:10 | LL | #![allow(not_a_real_lint)] //~ WARN unknown lint | ^^^^^^^^^^^^^^^ @@ -7,13 +7,13 @@ LL | #![allow(not_a_real_lint)] //~ WARN unknown lint = note: #[warn(unknown_lints)] on by default error: unused variable: `unused` - --> $DIR/lint-unknown-lint.rs:13:17 + --> $DIR/lint-unknown-lint.rs:3:17 | LL | fn main() { let unused = (); } //~ ERROR unused variable | ^^^^^^ help: consider using `_unused` instead | note: lint level defined here - --> $DIR/lint-unknown-lint.rs:12:9 + --> $DIR/lint-unknown-lint.rs:2:9 | LL | #![deny(unused)] | ^^^^^^ diff --git a/src/test/ui/lint/lint-unnecessary-import-braces.rs b/src/test/ui/lint/lint-unnecessary-import-braces.rs index 214a03c13f4e5..9a3398a8734e6 100644 --- a/src/test/ui/lint/lint-unnecessary-import-braces.rs +++ b/src/test/ui/lint/lint-unnecessary-import-braces.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(unused_import_braces)] use test::{A}; //~ ERROR braces around A is unnecessary diff --git a/src/test/ui/lint/lint-unnecessary-import-braces.stderr b/src/test/ui/lint/lint-unnecessary-import-braces.stderr index a4fd474e5cced..40e7ab4dd1392 100644 --- a/src/test/ui/lint/lint-unnecessary-import-braces.stderr +++ b/src/test/ui/lint/lint-unnecessary-import-braces.stderr @@ -1,11 +1,11 @@ error: braces around A is unnecessary - --> $DIR/lint-unnecessary-import-braces.rs:13:1 + --> $DIR/lint-unnecessary-import-braces.rs:3:1 | LL | use test::{A}; //~ ERROR braces around A is unnecessary | ^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-unnecessary-import-braces.rs:11:9 + --> $DIR/lint-unnecessary-import-braces.rs:1:9 | LL | #![deny(unused_import_braces)] | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-unnecessary-parens.rs b/src/test/ui/lint/lint-unnecessary-parens.rs index 7cd0a6bbf0fd0..dc74d69bd8d54 100644 --- a/src/test/ui/lint/lint-unnecessary-parens.rs +++ b/src/test/ui/lint/lint-unnecessary-parens.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(unused_parens)] #[derive(Eq, PartialEq)] diff --git a/src/test/ui/lint/lint-unnecessary-parens.stderr b/src/test/ui/lint/lint-unnecessary-parens.stderr index 8861524b18584..c14ebb6be9761 100644 --- a/src/test/ui/lint/lint-unnecessary-parens.stderr +++ b/src/test/ui/lint/lint-unnecessary-parens.stderr @@ -1,77 +1,77 @@ error: unnecessary parentheses around `return` value - --> $DIR/lint-unnecessary-parens.rs:20:12 + --> $DIR/lint-unnecessary-parens.rs:10:12 | LL | return (1); //~ ERROR unnecessary parentheses around `return` value | ^^^ help: remove these parentheses | note: lint level defined here - --> $DIR/lint-unnecessary-parens.rs:11:9 + --> $DIR/lint-unnecessary-parens.rs:1:9 | LL | #![deny(unused_parens)] | ^^^^^^^^^^^^^ error: unnecessary parentheses around `return` value - --> $DIR/lint-unnecessary-parens.rs:23:12 + --> $DIR/lint-unnecessary-parens.rs:13:12 | LL | return (X { y }); //~ ERROR unnecessary parentheses around `return` value | ^^^^^^^^^ help: remove these parentheses error: unnecessary parentheses around function argument - --> $DIR/lint-unnecessary-parens.rs:28:9 + --> $DIR/lint-unnecessary-parens.rs:18:9 | LL | bar((true)); //~ ERROR unnecessary parentheses around function argument | ^^^^^^ help: remove these parentheses error: unnecessary parentheses around `if` condition - --> $DIR/lint-unnecessary-parens.rs:30:8 + --> $DIR/lint-unnecessary-parens.rs:20:8 | LL | if (true) {} //~ ERROR unnecessary parentheses around `if` condition | ^^^^^^ help: remove these parentheses error: unnecessary parentheses around `while` condition - --> $DIR/lint-unnecessary-parens.rs:31:11 + --> $DIR/lint-unnecessary-parens.rs:21:11 | LL | while (true) {} //~ ERROR unnecessary parentheses around `while` condition | ^^^^^^ help: remove these parentheses error: unnecessary parentheses around `match` head expression - --> $DIR/lint-unnecessary-parens.rs:32:11 + --> $DIR/lint-unnecessary-parens.rs:22:11 | LL | match (true) { //~ ERROR unnecessary parentheses around `match` head expression | ^^^^^^ help: remove these parentheses error: unnecessary parentheses around `if let` head expression - --> $DIR/lint-unnecessary-parens.rs:35:16 + --> $DIR/lint-unnecessary-parens.rs:25:16 | LL | if let 1 = (1) {} //~ ERROR unnecessary parentheses around `if let` head expression | ^^^ help: remove these parentheses error: unnecessary parentheses around `while let` head expression - --> $DIR/lint-unnecessary-parens.rs:36:19 + --> $DIR/lint-unnecessary-parens.rs:26:19 | LL | while let 1 = (2) {} //~ ERROR unnecessary parentheses around `while let` head expression | ^^^ help: remove these parentheses error: unnecessary parentheses around method argument - --> $DIR/lint-unnecessary-parens.rs:50:24 + --> $DIR/lint-unnecessary-parens.rs:40:24 | LL | X { y: false }.foo((true)); //~ ERROR unnecessary parentheses around method argument | ^^^^^^ help: remove these parentheses error: unnecessary parentheses around assigned value - --> $DIR/lint-unnecessary-parens.rs:52:18 + --> $DIR/lint-unnecessary-parens.rs:42:18 | LL | let mut _a = (0); //~ ERROR unnecessary parentheses around assigned value | ^^^ help: remove these parentheses error: unnecessary parentheses around assigned value - --> $DIR/lint-unnecessary-parens.rs:53:10 + --> $DIR/lint-unnecessary-parens.rs:43:10 | LL | _a = (0); //~ ERROR unnecessary parentheses around assigned value | ^^^ help: remove these parentheses error: unnecessary parentheses around assigned value - --> $DIR/lint-unnecessary-parens.rs:54:11 + --> $DIR/lint-unnecessary-parens.rs:44:11 | LL | _a += (1); //~ ERROR unnecessary parentheses around assigned value | ^^^ help: remove these parentheses diff --git a/src/test/ui/lint/lint-unsafe-code.rs b/src/test/ui/lint/lint-unsafe-code.rs index 10f245aaaf9d7..735f33f601f9d 100644 --- a/src/test/ui/lint/lint-unsafe-code.rs +++ b/src/test/ui/lint/lint-unsafe-code.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_unsafe)] #![allow(dead_code)] #![deny(unsafe_code)] diff --git a/src/test/ui/lint/lint-unsafe-code.stderr b/src/test/ui/lint/lint-unsafe-code.stderr index ee2aba066ecac..e2dd45e2c8a31 100644 --- a/src/test/ui/lint/lint-unsafe-code.stderr +++ b/src/test/ui/lint/lint-unsafe-code.stderr @@ -1,89 +1,89 @@ error: declaration of an `unsafe` function - --> $DIR/lint-unsafe-code.rs:33:1 + --> $DIR/lint-unsafe-code.rs:23:1 | LL | unsafe fn baz() {} //~ ERROR: declaration of an `unsafe` function | ^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-unsafe-code.rs:13:9 + --> $DIR/lint-unsafe-code.rs:3:9 | LL | #![deny(unsafe_code)] | ^^^^^^^^^^^ error: declaration of an `unsafe` trait - --> $DIR/lint-unsafe-code.rs:34:1 + --> $DIR/lint-unsafe-code.rs:24:1 | LL | unsafe trait Foo {} //~ ERROR: declaration of an `unsafe` trait | ^^^^^^^^^^^^^^^^^^^ error: implementation of an `unsafe` trait - --> $DIR/lint-unsafe-code.rs:35:1 + --> $DIR/lint-unsafe-code.rs:25:1 | LL | unsafe impl Foo for Bar {} //~ ERROR: implementation of an `unsafe` trait | ^^^^^^^^^^^^^^^^^^^^^^^^^^ error: declaration of an `unsafe` method - --> $DIR/lint-unsafe-code.rs:38:5 + --> $DIR/lint-unsafe-code.rs:28:5 | LL | unsafe fn baz(&self); //~ ERROR: declaration of an `unsafe` method | ^^^^^^^^^^^^^^^^^^^^^ error: implementation of an `unsafe` method - --> $DIR/lint-unsafe-code.rs:39:5 + --> $DIR/lint-unsafe-code.rs:29:5 | LL | unsafe fn provided(&self) {} //~ ERROR: implementation of an `unsafe` method | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: implementation of an `unsafe` method - --> $DIR/lint-unsafe-code.rs:40:5 + --> $DIR/lint-unsafe-code.rs:30:5 | LL | unsafe fn provided_override(&self) {} //~ ERROR: implementation of an `unsafe` method | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: implementation of an `unsafe` method - --> $DIR/lint-unsafe-code.rs:44:5 + --> $DIR/lint-unsafe-code.rs:34:5 | LL | unsafe fn baz(&self) {} //~ ERROR: implementation of an `unsafe` method | ^^^^^^^^^^^^^^^^^^^^^^^ error: implementation of an `unsafe` method - --> $DIR/lint-unsafe-code.rs:45:5 + --> $DIR/lint-unsafe-code.rs:35:5 | LL | unsafe fn provided_override(&self) {} //~ ERROR: implementation of an `unsafe` method | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: implementation of an `unsafe` method - --> $DIR/lint-unsafe-code.rs:64:5 + --> $DIR/lint-unsafe-code.rs:54:5 | LL | unsafe fn provided_override(&self) {} //~ ERROR: implementation of an `unsafe` method | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: implementation of an `unsafe` method - --> $DIR/lint-unsafe-code.rs:75:5 + --> $DIR/lint-unsafe-code.rs:65:5 | LL | unsafe fn provided(&self) {} //~ ERROR: implementation of an `unsafe` method | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: implementation of an `unsafe` method - --> $DIR/lint-unsafe-code.rs:81:5 + --> $DIR/lint-unsafe-code.rs:71:5 | LL | unsafe fn provided(&self) {} //~ ERROR: implementation of an `unsafe` method | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: implementation of an `unsafe` method - --> $DIR/lint-unsafe-code.rs:85:5 + --> $DIR/lint-unsafe-code.rs:75:5 | LL | unsafe fn baz(&self) {} //~ ERROR: implementation of an `unsafe` method | ^^^^^^^^^^^^^^^^^^^^^^^ error: usage of an `unsafe` block - --> $DIR/lint-unsafe-code.rs:96:5 + --> $DIR/lint-unsafe-code.rs:86:5 | LL | unsafe {} //~ ERROR: usage of an `unsafe` block | ^^^^^^^^^ error: usage of an `unsafe` block - --> $DIR/lint-unsafe-code.rs:29:9 + --> $DIR/lint-unsafe-code.rs:19:9 | LL | unsafe {} //~ ERROR: usage of an `unsafe` block | ^^^^^^^^^ diff --git a/src/test/ui/lint/lint-unused-extern-crate.rs b/src/test/ui/lint/lint-unused-extern-crate.rs index 4ef185ee71c5a..d5e4da526a1d5 100644 --- a/src/test/ui/lint/lint-unused-extern-crate.rs +++ b/src/test/ui/lint/lint-unused-extern-crate.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:lint_unused_extern_crate.rs // aux-build:lint_unused_extern_crate2.rs // aux-build:lint_unused_extern_crate3.rs diff --git a/src/test/ui/lint/lint-unused-extern-crate.stderr b/src/test/ui/lint/lint-unused-extern-crate.stderr index 3a488b1e073a5..46499515fa751 100644 --- a/src/test/ui/lint/lint-unused-extern-crate.stderr +++ b/src/test/ui/lint/lint-unused-extern-crate.stderr @@ -1,17 +1,17 @@ error: unused extern crate - --> $DIR/lint-unused-extern-crate.rs:21:1 + --> $DIR/lint-unused-extern-crate.rs:11:1 | LL | extern crate lint_unused_extern_crate5; //~ ERROR: unused extern crate | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove it | note: lint level defined here - --> $DIR/lint-unused-extern-crate.rs:17:9 + --> $DIR/lint-unused-extern-crate.rs:7:9 | LL | #![deny(unused_extern_crates)] | ^^^^^^^^^^^^^^^^^^^^ error: unused extern crate - --> $DIR/lint-unused-extern-crate.rs:39:5 + --> $DIR/lint-unused-extern-crate.rs:29:5 | LL | extern crate lint_unused_extern_crate2; //~ ERROR unused extern crate | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove it diff --git a/src/test/ui/lint/lint-unused-imports.rs b/src/test/ui/lint/lint-unused-imports.rs index 5bb2ab75c53fd..f61fc98edf723 100644 --- a/src/test/ui/lint/lint-unused-imports.rs +++ b/src/test/ui/lint/lint-unused-imports.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(unused_imports)] #![allow(dead_code)] diff --git a/src/test/ui/lint/lint-unused-imports.stderr b/src/test/ui/lint/lint-unused-imports.stderr index a0292b6907ed3..214f4a472dc7e 100644 --- a/src/test/ui/lint/lint-unused-imports.stderr +++ b/src/test/ui/lint/lint-unused-imports.stderr @@ -1,53 +1,53 @@ error: unused import: `use std::fmt::{};` - --> $DIR/lint-unused-imports.rs:18:1 + --> $DIR/lint-unused-imports.rs:8:1 | LL | use std::fmt::{}; | ^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/lint-unused-imports.rs:11:9 + --> $DIR/lint-unused-imports.rs:1:9 | LL | #![deny(unused_imports)] | ^^^^^^^^^^^^^^ error: unused imports: `None`, `Some` - --> $DIR/lint-unused-imports.rs:22:27 + --> $DIR/lint-unused-imports.rs:12:27 | LL | use std::option::Option::{Some, None}; | ^^^^ ^^^^ error: unused import: `test::A` - --> $DIR/lint-unused-imports.rs:25:5 + --> $DIR/lint-unused-imports.rs:15:5 | LL | use test::A; //~ ERROR unused import: `test::A` | ^^^^^^^ error: unused import: `bar` - --> $DIR/lint-unused-imports.rs:34:18 + --> $DIR/lint-unused-imports.rs:24:18 | LL | use test2::{foo, bar}; //~ ERROR unused import: `bar` | ^^^ error: unused import: `foo::Square` - --> $DIR/lint-unused-imports.rs:62:13 + --> $DIR/lint-unused-imports.rs:52:13 | LL | use foo::Square; //~ ERROR unused import: `foo::Square` | ^^^^^^^^^^^ error: unused import: `self::g` - --> $DIR/lint-unused-imports.rs:78:9 + --> $DIR/lint-unused-imports.rs:68:9 | LL | use self::g; //~ ERROR unused import: `self::g` | ^^^^^^^ error: unused import: `test2::foo` - --> $DIR/lint-unused-imports.rs:87:9 + --> $DIR/lint-unused-imports.rs:77:9 | LL | use test2::foo; //~ ERROR unused import: `test2::foo` | ^^^^^^^^^^ error: unused import: `test::B2` - --> $DIR/lint-unused-imports.rs:30:5 + --> $DIR/lint-unused-imports.rs:20:5 | LL | use test::B2; //~ ERROR unused import: `test::B2` | ^^^^^^^^ diff --git a/src/test/ui/lint/lint-unused-mut-self.rs b/src/test/ui/lint/lint-unused-mut-self.rs index 370f664e43033..3c709d0793980 100644 --- a/src/test/ui/lint/lint-unused-mut-self.rs +++ b/src/test/ui/lint/lint-unused-mut-self.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_assignments)] #![allow(unused_variables)] #![allow(dead_code)] diff --git a/src/test/ui/lint/lint-unused-mut-self.stderr b/src/test/ui/lint/lint-unused-mut-self.stderr index af2baaa2e0a33..62be0c8f159c6 100644 --- a/src/test/ui/lint/lint-unused-mut-self.stderr +++ b/src/test/ui/lint/lint-unused-mut-self.stderr @@ -1,5 +1,5 @@ error: variable does not need to be mutable - --> $DIR/lint-unused-mut-self.rs:18:12 + --> $DIR/lint-unused-mut-self.rs:8:12 | LL | fn foo(mut self) {} //~ ERROR: variable does not need to be mutable | ----^^^^ @@ -7,13 +7,13 @@ LL | fn foo(mut self) {} //~ ERROR: variable does not need to be mutable | help: remove this `mut` | note: lint level defined here - --> $DIR/lint-unused-mut-self.rs:14:9 + --> $DIR/lint-unused-mut-self.rs:4:9 | LL | #![deny(unused_mut)] | ^^^^^^^^^^ error: variable does not need to be mutable - --> $DIR/lint-unused-mut-self.rs:19:12 + --> $DIR/lint-unused-mut-self.rs:9:12 | LL | fn bar(mut self: Box) {} //~ ERROR: variable does not need to be mutable | ----^^^^ diff --git a/src/test/ui/lint/lint-unused-mut-variables.lexical.stderr b/src/test/ui/lint/lint-unused-mut-variables.lexical.stderr index 40f68c6782781..42ae9e7700ea5 100644 --- a/src/test/ui/lint/lint-unused-mut-variables.lexical.stderr +++ b/src/test/ui/lint/lint-unused-mut-variables.lexical.stderr @@ -1,5 +1,5 @@ error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:59:14 + --> $DIR/lint-unused-mut-variables.rs:49:14 | LL | let x = |mut y: isize| 10; //[lexical]~ ERROR: variable does not need to be mutable | ----^ @@ -7,13 +7,13 @@ LL | let x = |mut y: isize| 10; //[lexical]~ ERROR: variable does not need t | help: remove this `mut` | note: lint level defined here - --> $DIR/lint-unused-mut-variables.rs:19:9 + --> $DIR/lint-unused-mut-variables.rs:9:9 | LL | #![deny(unused_mut)] | ^^^^^^^^^^ error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:24:9 + --> $DIR/lint-unused-mut-variables.rs:14:9 | LL | let mut a = 3; //[lexical]~ ERROR: variable does not need to be mutable | ----^ @@ -21,7 +21,7 @@ LL | let mut a = 3; //[lexical]~ ERROR: variable does not need to be mutable | help: remove this `mut` error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:26:9 + --> $DIR/lint-unused-mut-variables.rs:16:9 | LL | let mut a = 2; //[lexical]~ ERROR: variable does not need to be mutable | ----^ @@ -29,7 +29,7 @@ LL | let mut a = 2; //[lexical]~ ERROR: variable does not need to be mutable | help: remove this `mut` error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:28:9 + --> $DIR/lint-unused-mut-variables.rs:18:9 | LL | let mut b = 3; //[lexical]~ ERROR: variable does not need to be mutable | ----^ @@ -37,7 +37,7 @@ LL | let mut b = 3; //[lexical]~ ERROR: variable does not need to be mutable | help: remove this `mut` error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:30:9 + --> $DIR/lint-unused-mut-variables.rs:20:9 | LL | let mut a = vec![3]; //[lexical]~ ERROR: variable does not need to be mutable | ----^ @@ -45,7 +45,7 @@ LL | let mut a = vec![3]; //[lexical]~ ERROR: variable does not need to be m | help: remove this `mut` error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:32:10 + --> $DIR/lint-unused-mut-variables.rs:22:10 | LL | let (mut a, b) = (1, 2); //[lexical]~ ERROR: variable does not need to be mutable | ----^ @@ -53,7 +53,7 @@ LL | let (mut a, b) = (1, 2); //[lexical]~ ERROR: variable does not need to | help: remove this `mut` error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:34:9 + --> $DIR/lint-unused-mut-variables.rs:24:9 | LL | let mut a; //[lexical]~ ERROR: variable does not need to be mutable | ----^ @@ -61,7 +61,7 @@ LL | let mut a; //[lexical]~ ERROR: variable does not need to be mutable | help: remove this `mut` error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:38:9 + --> $DIR/lint-unused-mut-variables.rs:28:9 | LL | let mut b; //[lexical]~ ERROR: variable does not need to be mutable | ----^ @@ -69,7 +69,7 @@ LL | let mut b; //[lexical]~ ERROR: variable does not need to be mutable | help: remove this `mut` error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:47:9 + --> $DIR/lint-unused-mut-variables.rs:37:9 | LL | mut x => {} //[lexical]~ ERROR: variable does not need to be mutable | ----^ @@ -77,7 +77,7 @@ LL | mut x => {} //[lexical]~ ERROR: variable does not need to be mutabl | help: remove this `mut` error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:51:8 + --> $DIR/lint-unused-mut-variables.rs:41:8 | LL | (mut x, 1) | //[lexical]~ ERROR: variable does not need to be mutable | ----^ @@ -85,7 +85,7 @@ LL | (mut x, 1) | //[lexical]~ ERROR: variable does not need to be mutable | help: remove this `mut` error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:64:9 + --> $DIR/lint-unused-mut-variables.rs:54:9 | LL | let mut a = &mut 5; //[lexical]~ ERROR: variable does not need to be mutable | ----^ @@ -93,7 +93,7 @@ LL | let mut a = &mut 5; //[lexical]~ ERROR: variable does not need to be mu | help: remove this `mut` error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:69:9 + --> $DIR/lint-unused-mut-variables.rs:59:9 | LL | let mut b = (&mut a,); //[lexical]~ ERROR: variable does not need to be mutable | ----^ @@ -101,7 +101,7 @@ LL | let mut b = (&mut a,); //[lexical]~ ERROR: variable does not need to be | help: remove this `mut` error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:72:9 + --> $DIR/lint-unused-mut-variables.rs:62:9 | LL | let mut x = &mut 1; //[lexical]~ ERROR: variable does not need to be mutable | ----^ @@ -109,7 +109,7 @@ LL | let mut x = &mut 1; //[lexical]~ ERROR: variable does not need to be mu | help: remove this `mut` error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:84:9 + --> $DIR/lint-unused-mut-variables.rs:74:9 | LL | let mut v : &mut Vec<()> = &mut vec![]; //[lexical]~ ERROR: variable does not need to be mutable | ----^ @@ -117,7 +117,7 @@ LL | let mut v : &mut Vec<()> = &mut vec![]; //[lexical]~ ERROR: variable do | help: remove this `mut` error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:61:13 + --> $DIR/lint-unused-mut-variables.rs:51:13 | LL | fn what(mut foo: isize) {} //[lexical]~ ERROR: variable does not need to be mutable | ----^^^ @@ -125,7 +125,7 @@ LL | fn what(mut foo: isize) {} //[lexical]~ ERROR: variable does not need t | help: remove this `mut` error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:79:20 + --> $DIR/lint-unused-mut-variables.rs:69:20 | LL | fn mut_ref_arg(mut arg : &mut [u8]) -> &mut [u8] { | ----^^^ @@ -133,7 +133,7 @@ LL | fn mut_ref_arg(mut arg : &mut [u8]) -> &mut [u8] { | help: remove this `mut` error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:143:9 + --> $DIR/lint-unused-mut-variables.rs:133:9 | LL | let mut b = vec![2]; //[lexical]~ ERROR: variable does not need to be mutable | ----^ @@ -141,7 +141,7 @@ LL | let mut b = vec![2]; //[lexical]~ ERROR: variable does not need to be m | help: remove this `mut` | note: lint level defined here - --> $DIR/lint-unused-mut-variables.rs:139:8 + --> $DIR/lint-unused-mut-variables.rs:129:8 | LL | #[deny(unused_mut)] | ^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-unused-mut-variables.nll.stderr b/src/test/ui/lint/lint-unused-mut-variables.nll.stderr index 40f68c6782781..42ae9e7700ea5 100644 --- a/src/test/ui/lint/lint-unused-mut-variables.nll.stderr +++ b/src/test/ui/lint/lint-unused-mut-variables.nll.stderr @@ -1,5 +1,5 @@ error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:59:14 + --> $DIR/lint-unused-mut-variables.rs:49:14 | LL | let x = |mut y: isize| 10; //[lexical]~ ERROR: variable does not need to be mutable | ----^ @@ -7,13 +7,13 @@ LL | let x = |mut y: isize| 10; //[lexical]~ ERROR: variable does not need t | help: remove this `mut` | note: lint level defined here - --> $DIR/lint-unused-mut-variables.rs:19:9 + --> $DIR/lint-unused-mut-variables.rs:9:9 | LL | #![deny(unused_mut)] | ^^^^^^^^^^ error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:24:9 + --> $DIR/lint-unused-mut-variables.rs:14:9 | LL | let mut a = 3; //[lexical]~ ERROR: variable does not need to be mutable | ----^ @@ -21,7 +21,7 @@ LL | let mut a = 3; //[lexical]~ ERROR: variable does not need to be mutable | help: remove this `mut` error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:26:9 + --> $DIR/lint-unused-mut-variables.rs:16:9 | LL | let mut a = 2; //[lexical]~ ERROR: variable does not need to be mutable | ----^ @@ -29,7 +29,7 @@ LL | let mut a = 2; //[lexical]~ ERROR: variable does not need to be mutable | help: remove this `mut` error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:28:9 + --> $DIR/lint-unused-mut-variables.rs:18:9 | LL | let mut b = 3; //[lexical]~ ERROR: variable does not need to be mutable | ----^ @@ -37,7 +37,7 @@ LL | let mut b = 3; //[lexical]~ ERROR: variable does not need to be mutable | help: remove this `mut` error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:30:9 + --> $DIR/lint-unused-mut-variables.rs:20:9 | LL | let mut a = vec![3]; //[lexical]~ ERROR: variable does not need to be mutable | ----^ @@ -45,7 +45,7 @@ LL | let mut a = vec![3]; //[lexical]~ ERROR: variable does not need to be m | help: remove this `mut` error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:32:10 + --> $DIR/lint-unused-mut-variables.rs:22:10 | LL | let (mut a, b) = (1, 2); //[lexical]~ ERROR: variable does not need to be mutable | ----^ @@ -53,7 +53,7 @@ LL | let (mut a, b) = (1, 2); //[lexical]~ ERROR: variable does not need to | help: remove this `mut` error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:34:9 + --> $DIR/lint-unused-mut-variables.rs:24:9 | LL | let mut a; //[lexical]~ ERROR: variable does not need to be mutable | ----^ @@ -61,7 +61,7 @@ LL | let mut a; //[lexical]~ ERROR: variable does not need to be mutable | help: remove this `mut` error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:38:9 + --> $DIR/lint-unused-mut-variables.rs:28:9 | LL | let mut b; //[lexical]~ ERROR: variable does not need to be mutable | ----^ @@ -69,7 +69,7 @@ LL | let mut b; //[lexical]~ ERROR: variable does not need to be mutable | help: remove this `mut` error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:47:9 + --> $DIR/lint-unused-mut-variables.rs:37:9 | LL | mut x => {} //[lexical]~ ERROR: variable does not need to be mutable | ----^ @@ -77,7 +77,7 @@ LL | mut x => {} //[lexical]~ ERROR: variable does not need to be mutabl | help: remove this `mut` error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:51:8 + --> $DIR/lint-unused-mut-variables.rs:41:8 | LL | (mut x, 1) | //[lexical]~ ERROR: variable does not need to be mutable | ----^ @@ -85,7 +85,7 @@ LL | (mut x, 1) | //[lexical]~ ERROR: variable does not need to be mutable | help: remove this `mut` error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:64:9 + --> $DIR/lint-unused-mut-variables.rs:54:9 | LL | let mut a = &mut 5; //[lexical]~ ERROR: variable does not need to be mutable | ----^ @@ -93,7 +93,7 @@ LL | let mut a = &mut 5; //[lexical]~ ERROR: variable does not need to be mu | help: remove this `mut` error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:69:9 + --> $DIR/lint-unused-mut-variables.rs:59:9 | LL | let mut b = (&mut a,); //[lexical]~ ERROR: variable does not need to be mutable | ----^ @@ -101,7 +101,7 @@ LL | let mut b = (&mut a,); //[lexical]~ ERROR: variable does not need to be | help: remove this `mut` error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:72:9 + --> $DIR/lint-unused-mut-variables.rs:62:9 | LL | let mut x = &mut 1; //[lexical]~ ERROR: variable does not need to be mutable | ----^ @@ -109,7 +109,7 @@ LL | let mut x = &mut 1; //[lexical]~ ERROR: variable does not need to be mu | help: remove this `mut` error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:84:9 + --> $DIR/lint-unused-mut-variables.rs:74:9 | LL | let mut v : &mut Vec<()> = &mut vec![]; //[lexical]~ ERROR: variable does not need to be mutable | ----^ @@ -117,7 +117,7 @@ LL | let mut v : &mut Vec<()> = &mut vec![]; //[lexical]~ ERROR: variable do | help: remove this `mut` error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:61:13 + --> $DIR/lint-unused-mut-variables.rs:51:13 | LL | fn what(mut foo: isize) {} //[lexical]~ ERROR: variable does not need to be mutable | ----^^^ @@ -125,7 +125,7 @@ LL | fn what(mut foo: isize) {} //[lexical]~ ERROR: variable does not need t | help: remove this `mut` error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:79:20 + --> $DIR/lint-unused-mut-variables.rs:69:20 | LL | fn mut_ref_arg(mut arg : &mut [u8]) -> &mut [u8] { | ----^^^ @@ -133,7 +133,7 @@ LL | fn mut_ref_arg(mut arg : &mut [u8]) -> &mut [u8] { | help: remove this `mut` error: variable does not need to be mutable - --> $DIR/lint-unused-mut-variables.rs:143:9 + --> $DIR/lint-unused-mut-variables.rs:133:9 | LL | let mut b = vec![2]; //[lexical]~ ERROR: variable does not need to be mutable | ----^ @@ -141,7 +141,7 @@ LL | let mut b = vec![2]; //[lexical]~ ERROR: variable does not need to be m | help: remove this `mut` | note: lint level defined here - --> $DIR/lint-unused-mut-variables.rs:139:8 + --> $DIR/lint-unused-mut-variables.rs:129:8 | LL | #[deny(unused_mut)] | ^^^^^^^^^^ diff --git a/src/test/ui/lint/lint-unused-mut-variables.rs b/src/test/ui/lint/lint-unused-mut-variables.rs index 14d836074dca3..8f61bd6744e87 100644 --- a/src/test/ui/lint/lint-unused-mut-variables.rs +++ b/src/test/ui/lint/lint-unused-mut-variables.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: lexical nll #![cfg_attr(nll, feature(nll))] diff --git a/src/test/ui/lint/lint-uppercase-variables.rs b/src/test/ui/lint/lint-uppercase-variables.rs index 1d947684792dd..33c2968e610c9 100644 --- a/src/test/ui/lint/lint-uppercase-variables.rs +++ b/src/test/ui/lint/lint-uppercase-variables.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![warn(unused)] #![allow(dead_code)] #![deny(non_snake_case)] diff --git a/src/test/ui/lint/lint-uppercase-variables.stderr b/src/test/ui/lint/lint-uppercase-variables.stderr index c8381d89adc61..f8564668e920f 100644 --- a/src/test/ui/lint/lint-uppercase-variables.stderr +++ b/src/test/ui/lint/lint-uppercase-variables.stderr @@ -1,48 +1,48 @@ warning[E0170]: pattern binding `Foo` is named the same as one of the variants of the type `foo::Foo` - --> $DIR/lint-uppercase-variables.rs:32:9 + --> $DIR/lint-uppercase-variables.rs:22:9 | LL | Foo => {} | ^^^ help: to match on the variant, qualify the path: `foo::Foo::Foo` warning: unused variable: `Foo` - --> $DIR/lint-uppercase-variables.rs:32:9 + --> $DIR/lint-uppercase-variables.rs:22:9 | LL | Foo => {} | ^^^ help: consider using `_Foo` instead | note: lint level defined here - --> $DIR/lint-uppercase-variables.rs:11:9 + --> $DIR/lint-uppercase-variables.rs:1:9 | LL | #![warn(unused)] | ^^^^^^ = note: #[warn(unused_variables)] implied by #[warn(unused)] error: structure field `X` should have a snake case name such as `x` - --> $DIR/lint-uppercase-variables.rs:20:5 + --> $DIR/lint-uppercase-variables.rs:10:5 | LL | X: usize //~ ERROR structure field `X` should have a snake case name such as `x` | ^^^^^^^^ | note: lint level defined here - --> $DIR/lint-uppercase-variables.rs:13:9 + --> $DIR/lint-uppercase-variables.rs:3:9 | LL | #![deny(non_snake_case)] | ^^^^^^^^^^^^^^ error: variable `Xx` should have a snake case name such as `xx` - --> $DIR/lint-uppercase-variables.rs:23:9 + --> $DIR/lint-uppercase-variables.rs:13:9 | LL | fn test(Xx: usize) { //~ ERROR variable `Xx` should have a snake case name such as `xx` | ^^ error: variable `Test` should have a snake case name such as `test` - --> $DIR/lint-uppercase-variables.rs:28:9 + --> $DIR/lint-uppercase-variables.rs:18:9 | LL | let Test: usize = 0; //~ ERROR variable `Test` should have a snake case name such as `test` | ^^^^ error: variable `Foo` should have a snake case name such as `foo` - --> $DIR/lint-uppercase-variables.rs:32:9 + --> $DIR/lint-uppercase-variables.rs:22:9 | LL | Foo => {} | ^^^ diff --git a/src/test/ui/lint/lints-in-foreign-macros.rs b/src/test/ui/lint/lints-in-foreign-macros.rs index 0f9003877cc06..34f1445b95105 100644 --- a/src/test/ui/lint/lints-in-foreign-macros.rs +++ b/src/test/ui/lint/lints-in-foreign-macros.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:lints-in-foreign-macros.rs // compile-pass diff --git a/src/test/ui/lint/lints-in-foreign-macros.stderr b/src/test/ui/lint/lints-in-foreign-macros.stderr index e9f6d3d381541..7c81bc04801c0 100644 --- a/src/test/ui/lint/lints-in-foreign-macros.stderr +++ b/src/test/ui/lint/lints-in-foreign-macros.stderr @@ -1,5 +1,5 @@ warning: unused import: `std::string::ToString` - --> $DIR/lints-in-foreign-macros.rs:20:16 + --> $DIR/lints-in-foreign-macros.rs:10:16 | LL | () => {use std::string::ToString;} //~ WARN: unused import | ^^^^^^^^^^^^^^^^^^^^^ @@ -8,19 +8,19 @@ LL | mod a { foo!(); } | ------- in this macro invocation | note: lint level defined here - --> $DIR/lints-in-foreign-macros.rs:14:9 + --> $DIR/lints-in-foreign-macros.rs:4:9 | LL | #![warn(unused_imports)] | ^^^^^^^^^^^^^^ warning: unused import: `std::string::ToString` - --> $DIR/lints-in-foreign-macros.rs:25:18 + --> $DIR/lints-in-foreign-macros.rs:15:18 | LL | mod c { baz!(use std::string::ToString;); } //~ WARN: unused import | ^^^^^^^^^^^^^^^^^^^^^ warning: unused import: `std::string::ToString` - --> $DIR/lints-in-foreign-macros.rs:26:19 + --> $DIR/lints-in-foreign-macros.rs:16:19 | LL | mod d { baz2!(use std::string::ToString;); } //~ WARN: unused import | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/must-use-ops.rs b/src/test/ui/lint/must-use-ops.rs index c0575f817c8d1..60baa2349876c 100644 --- a/src/test/ui/lint/must-use-ops.rs +++ b/src/test/ui/lint/must-use-ops.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #50124 - Test warning for unused operator expressions // compile-pass diff --git a/src/test/ui/lint/must-use-ops.stderr b/src/test/ui/lint/must-use-ops.stderr index 5703536ef48fd..353844821b70a 100644 --- a/src/test/ui/lint/must-use-ops.stderr +++ b/src/test/ui/lint/must-use-ops.stderr @@ -1,131 +1,131 @@ warning: unused comparison which must be used - --> $DIR/must-use-ops.rs:22:5 + --> $DIR/must-use-ops.rs:12:5 | LL | val == 1; | ^^^^^^^^ | note: lint level defined here - --> $DIR/must-use-ops.rs:15:9 + --> $DIR/must-use-ops.rs:5:9 | LL | #![warn(unused_must_use)] | ^^^^^^^^^^^^^^^ warning: unused comparison which must be used - --> $DIR/must-use-ops.rs:23:5 + --> $DIR/must-use-ops.rs:13:5 | LL | val < 1; | ^^^^^^^ warning: unused comparison which must be used - --> $DIR/must-use-ops.rs:24:5 + --> $DIR/must-use-ops.rs:14:5 | LL | val <= 1; | ^^^^^^^^ warning: unused comparison which must be used - --> $DIR/must-use-ops.rs:25:5 + --> $DIR/must-use-ops.rs:15:5 | LL | val != 1; | ^^^^^^^^ warning: unused comparison which must be used - --> $DIR/must-use-ops.rs:26:5 + --> $DIR/must-use-ops.rs:16:5 | LL | val >= 1; | ^^^^^^^^ warning: unused comparison which must be used - --> $DIR/must-use-ops.rs:27:5 + --> $DIR/must-use-ops.rs:17:5 | LL | val > 1; | ^^^^^^^ warning: unused arithmetic operation which must be used - --> $DIR/must-use-ops.rs:30:5 + --> $DIR/must-use-ops.rs:20:5 | LL | val + 2; | ^^^^^^^ warning: unused arithmetic operation which must be used - --> $DIR/must-use-ops.rs:31:5 + --> $DIR/must-use-ops.rs:21:5 | LL | val - 2; | ^^^^^^^ warning: unused arithmetic operation which must be used - --> $DIR/must-use-ops.rs:32:5 + --> $DIR/must-use-ops.rs:22:5 | LL | val / 2; | ^^^^^^^ warning: unused arithmetic operation which must be used - --> $DIR/must-use-ops.rs:33:5 + --> $DIR/must-use-ops.rs:23:5 | LL | val * 2; | ^^^^^^^ warning: unused arithmetic operation which must be used - --> $DIR/must-use-ops.rs:34:5 + --> $DIR/must-use-ops.rs:24:5 | LL | val % 2; | ^^^^^^^ warning: unused logical operation which must be used - --> $DIR/must-use-ops.rs:37:5 + --> $DIR/must-use-ops.rs:27:5 | LL | true && true; | ^^^^^^^^^^^^ warning: unused logical operation which must be used - --> $DIR/must-use-ops.rs:38:5 + --> $DIR/must-use-ops.rs:28:5 | LL | false || true; | ^^^^^^^^^^^^^ warning: unused bitwise operation which must be used - --> $DIR/must-use-ops.rs:41:5 + --> $DIR/must-use-ops.rs:31:5 | LL | 5 ^ val; | ^^^^^^^ warning: unused bitwise operation which must be used - --> $DIR/must-use-ops.rs:42:5 + --> $DIR/must-use-ops.rs:32:5 | LL | 5 & val; | ^^^^^^^ warning: unused bitwise operation which must be used - --> $DIR/must-use-ops.rs:43:5 + --> $DIR/must-use-ops.rs:33:5 | LL | 5 | val; | ^^^^^^^ warning: unused bitwise operation which must be used - --> $DIR/must-use-ops.rs:44:5 + --> $DIR/must-use-ops.rs:34:5 | LL | 5 << val; | ^^^^^^^^ warning: unused bitwise operation which must be used - --> $DIR/must-use-ops.rs:45:5 + --> $DIR/must-use-ops.rs:35:5 | LL | 5 >> val; | ^^^^^^^^ warning: unused unary operation which must be used - --> $DIR/must-use-ops.rs:48:5 + --> $DIR/must-use-ops.rs:38:5 | LL | !val; | ^^^^ warning: unused unary operation which must be used - --> $DIR/must-use-ops.rs:49:5 + --> $DIR/must-use-ops.rs:39:5 | LL | -val; | ^^^^ warning: unused unary operation which must be used - --> $DIR/must-use-ops.rs:50:5 + --> $DIR/must-use-ops.rs:40:5 | LL | *val_pointer; | ^^^^^^^^^^^^ diff --git a/src/test/ui/lint/not_found.rs b/src/test/ui/lint/not_found.rs index fa3b491db6225..a3e301d6bd039 100644 --- a/src/test/ui/lint/not_found.rs +++ b/src/test/ui/lint/not_found.rs @@ -1,12 +1,6 @@ // Copyright 2014–2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // compile-pass diff --git a/src/test/ui/lint/not_found.stderr b/src/test/ui/lint/not_found.stderr index 603b5410444cd..a53c23d43de80 100644 --- a/src/test/ui/lint/not_found.stderr +++ b/src/test/ui/lint/not_found.stderr @@ -1,5 +1,5 @@ warning: unknown lint: `FOO_BAR` - --> $DIR/not_found.rs:16:9 + --> $DIR/not_found.rs:10:9 | LL | #[allow(FOO_BAR)] | ^^^^^^^ @@ -7,13 +7,13 @@ LL | #[allow(FOO_BAR)] = note: #[warn(unknown_lints)] on by default warning: unknown lint: `DEAD_CODE` - --> $DIR/not_found.rs:18:8 + --> $DIR/not_found.rs:12:8 | LL | #[warn(DEAD_CODE)] | ^^^^^^^^^ help: lowercase the lint name: `dead_code` warning: unknown lint: `Warnings` - --> $DIR/not_found.rs:20:8 + --> $DIR/not_found.rs:14:8 | LL | #[deny(Warnings)] | ^^^^^^^^ help: lowercase the lint name: `warnings` diff --git a/src/test/ui/lint/outer-forbid.rs b/src/test/ui/lint/outer-forbid.rs index d72f307b46124..003c929fc1681 100644 --- a/src/test/ui/lint/outer-forbid.rs +++ b/src/test/ui/lint/outer-forbid.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Forbidding a group (here, `unused`) overrules subsequent allowance of both // the group, and an individual lint in the group (here, `unused_variables`); // and, forbidding an individual lint (here, `non_snake_case`) overrules diff --git a/src/test/ui/lint/outer-forbid.stderr b/src/test/ui/lint/outer-forbid.stderr index e49dcd4a2d19d..332cdd95b4457 100644 --- a/src/test/ui/lint/outer-forbid.stderr +++ b/src/test/ui/lint/outer-forbid.stderr @@ -1,5 +1,5 @@ error[E0453]: allow(unused_variables) overruled by outer forbid(unused) - --> $DIR/outer-forbid.rs:19:9 + --> $DIR/outer-forbid.rs:9:9 | LL | #![forbid(unused, non_snake_case)] | ------ `forbid` level set here @@ -8,7 +8,7 @@ LL | #[allow(unused_variables)] //~ ERROR overruled | ^^^^^^^^^^^^^^^^ overruled by previous forbid error[E0453]: allow(unused) overruled by outer forbid(unused) - --> $DIR/outer-forbid.rs:22:9 + --> $DIR/outer-forbid.rs:12:9 | LL | #![forbid(unused, non_snake_case)] | ------ `forbid` level set here @@ -17,7 +17,7 @@ LL | #[allow(unused)] //~ ERROR overruled | ^^^^^^ overruled by previous forbid error[E0453]: allow(bad_style) overruled by outer forbid(non_snake_case) - --> $DIR/outer-forbid.rs:25:9 + --> $DIR/outer-forbid.rs:15:9 | LL | #![forbid(unused, non_snake_case)] | -------------- `forbid` level set here diff --git a/src/test/ui/lint/suggestions.rs b/src/test/ui/lint/suggestions.rs index 4da2700cb9fdb..7ac244d5a5bfd 100644 --- a/src/test/ui/lint/suggestions.rs +++ b/src/test/ui/lint/suggestions.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-tab #![warn(unused_mut, unused_parens)] // UI tests pass `-A unused`—see Issue #43896 diff --git a/src/test/ui/lint/suggestions.stderr b/src/test/ui/lint/suggestions.stderr index 8e5dac8be7827..92599f6ece7ec 100644 --- a/src/test/ui/lint/suggestions.stderr +++ b/src/test/ui/lint/suggestions.stderr @@ -1,17 +1,17 @@ warning: unnecessary parentheses around assigned value - --> $DIR/suggestions.rs:64:21 + --> $DIR/suggestions.rs:54:21 | LL | let mut a = (1); | ^^^ help: remove these parentheses | note: lint level defined here - --> $DIR/suggestions.rs:13:21 + --> $DIR/suggestions.rs:3:21 | LL | #![warn(unused_mut, unused_parens)] // UI tests pass `-A unused`—see Issue #43896 | ^^^^^^^^^^^^^ warning: use of deprecated attribute `no_debug`: the `#[no_debug]` attribute was an experimental feature that has been deprecated due to lack of demand. See https://github.com/rust-lang/rust/issues/29721 - --> $DIR/suggestions.rs:57:1 + --> $DIR/suggestions.rs:47:1 | LL | #[no_debug] // should suggest removal of deprecated attribute | ^^^^^^^^^^^ help: remove this attribute @@ -19,7 +19,7 @@ LL | #[no_debug] // should suggest removal of deprecated attribute = note: #[warn(deprecated)] on by default warning: variable does not need to be mutable - --> $DIR/suggestions.rs:64:13 + --> $DIR/suggestions.rs:54:13 | LL | let mut a = (1); | ----^ @@ -27,13 +27,13 @@ LL | let mut a = (1); | help: remove this `mut` | note: lint level defined here - --> $DIR/suggestions.rs:13:9 + --> $DIR/suggestions.rs:3:9 | LL | #![warn(unused_mut, unused_parens)] // UI tests pass `-A unused`—see Issue #43896 | ^^^^^^^^^^ warning: variable does not need to be mutable - --> $DIR/suggestions.rs:70:13 + --> $DIR/suggestions.rs:60:13 | LL | let mut | _____________^ @@ -45,7 +45,7 @@ LL | || b = 1; | help: remove this `mut` warning: static is marked #[no_mangle], but not exported - --> $DIR/suggestions.rs:16:14 + --> $DIR/suggestions.rs:6:14 | LL | #[no_mangle] static SHENZHOU: usize = 1; | -^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -55,7 +55,7 @@ LL | #[no_mangle] static SHENZHOU: usize = 1; = note: #[warn(private_no_mangle_statics)] on by default error: const items should never be #[no_mangle] - --> $DIR/suggestions.rs:19:14 + --> $DIR/suggestions.rs:9:14 | LL | #[no_mangle] const DISCOVERY: usize = 1; | -----^^^^^^^^^^^^^^^^^^^^^^ @@ -65,7 +65,7 @@ LL | #[no_mangle] const DISCOVERY: usize = 1; = note: #[deny(no_mangle_const_items)] on by default warning: functions generic over types must be mangled - --> $DIR/suggestions.rs:25:1 + --> $DIR/suggestions.rs:15:1 | LL | #[no_mangle] | ------------ help: remove this attribute @@ -76,7 +76,7 @@ LL | pub fn defiant(_t: T) {} = note: #[warn(no_mangle_generic_items)] on by default warning: function is marked #[no_mangle], but not exported - --> $DIR/suggestions.rs:29:1 + --> $DIR/suggestions.rs:19:1 | LL | fn rio_grande() {} | -^^^^^^^^^^^^^^^^^ @@ -86,7 +86,7 @@ LL | fn rio_grande() {} = note: #[warn(private_no_mangle_fns)] on by default warning: static is marked #[no_mangle], but not exported - --> $DIR/suggestions.rs:37:18 + --> $DIR/suggestions.rs:27:18 | LL | #[no_mangle] pub static DAUNTLESS: bool = true; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -94,7 +94,7 @@ LL | #[no_mangle] pub static DAUNTLESS: bool = true; = help: try exporting the item with a `pub use` statement warning: function is marked #[no_mangle], but not exported - --> $DIR/suggestions.rs:40:18 + --> $DIR/suggestions.rs:30:18 | LL | #[no_mangle] pub fn val_jean() {} | ^^^^^^^^^^^^^^^^^^^^ @@ -102,7 +102,7 @@ LL | #[no_mangle] pub fn val_jean() {} = help: try exporting the item with a `pub use` statement warning: static is marked #[no_mangle], but not exported - --> $DIR/suggestions.rs:45:18 + --> $DIR/suggestions.rs:35:18 | LL | #[no_mangle] pub(crate) static VETAR: bool = true; | ----------^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -110,7 +110,7 @@ LL | #[no_mangle] pub(crate) static VETAR: bool = true; | help: try making it public: `pub` warning: function is marked #[no_mangle], but not exported - --> $DIR/suggestions.rs:48:18 + --> $DIR/suggestions.rs:38:18 | LL | #[no_mangle] pub(crate) fn crossfield() {} | ----------^^^^^^^^^^^^^^^^^^^ @@ -118,7 +118,7 @@ LL | #[no_mangle] pub(crate) fn crossfield() {} | help: try making it public: `pub` warning: denote infinite loops with `loop { ... }` - --> $DIR/suggestions.rs:61:5 + --> $DIR/suggestions.rs:51:5 | LL | while true { | ^^^^^^^^^^ help: use `loop` @@ -126,7 +126,7 @@ LL | while true { = note: #[warn(while_true)] on by default warning: the `warp_factor:` in this pattern is redundant - --> $DIR/suggestions.rs:76:23 + --> $DIR/suggestions.rs:66:23 | LL | Equinox { warp_factor: warp_factor } => {} | ------------^^^^^^^^^^^^ diff --git a/src/test/ui/lint/test-inner-fn.rs b/src/test/ui/lint/test-inner-fn.rs index 4304c96197f96..fbcd8691fabb6 100644 --- a/src/test/ui/lint/test-inner-fn.rs +++ b/src/test/ui/lint/test-inner-fn.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --test -D unnameable_test_functions #[test] diff --git a/src/test/ui/lint/test-inner-fn.stderr b/src/test/ui/lint/test-inner-fn.stderr index 37f0c161036ee..e947be0106b00 100644 --- a/src/test/ui/lint/test-inner-fn.stderr +++ b/src/test/ui/lint/test-inner-fn.stderr @@ -1,5 +1,5 @@ error: cannot test inner function - --> $DIR/test-inner-fn.rs:15:5 + --> $DIR/test-inner-fn.rs:5:5 | LL | #[test] //~ ERROR cannot test inner function [unnameable_test_functions] | ^^^^^^^ @@ -7,7 +7,7 @@ LL | #[test] //~ ERROR cannot test inner function [unnameable_test_functions = note: requested on the command line with `-D unnameable-test-functions` error: cannot test inner function - --> $DIR/test-inner-fn.rs:23:9 + --> $DIR/test-inner-fn.rs:13:9 | LL | #[test] //~ ERROR cannot test inner function [unnameable_test_functions] | ^^^^^^^ diff --git a/src/test/ui/lint/trivial-casts-featuring-type-ascription.rs b/src/test/ui/lint/trivial-casts-featuring-type-ascription.rs index fba3724ae4907..96bf2dcfbbf8f 100644 --- a/src/test/ui/lint/trivial-casts-featuring-type-ascription.rs +++ b/src/test/ui/lint/trivial-casts-featuring-type-ascription.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(trivial_casts, trivial_numeric_casts)] #![feature(type_ascription)] diff --git a/src/test/ui/lint/trivial-casts-featuring-type-ascription.stderr b/src/test/ui/lint/trivial-casts-featuring-type-ascription.stderr index a77135c875d79..c1a4b393cd6ed 100644 --- a/src/test/ui/lint/trivial-casts-featuring-type-ascription.stderr +++ b/src/test/ui/lint/trivial-casts-featuring-type-ascription.stderr @@ -1,24 +1,24 @@ error: trivial numeric cast: `i32` as `i32` - --> $DIR/trivial-casts-featuring-type-ascription.rs:15:22 + --> $DIR/trivial-casts-featuring-type-ascription.rs:5:22 | LL | let lugubrious = 12i32 as i32; | ^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/trivial-casts-featuring-type-ascription.rs:11:24 + --> $DIR/trivial-casts-featuring-type-ascription.rs:1:24 | LL | #![deny(trivial_casts, trivial_numeric_casts)] | ^^^^^^^^^^^^^^^^^^^^^ = help: cast can be replaced by coercion; this might require type ascription or a temporary variable error: trivial cast: `&u32` as `*const u32` - --> $DIR/trivial-casts-featuring-type-ascription.rs:18:13 + --> $DIR/trivial-casts-featuring-type-ascription.rs:8:13 | LL | let _ = haunted as *const u32; | ^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/trivial-casts-featuring-type-ascription.rs:11:9 + --> $DIR/trivial-casts-featuring-type-ascription.rs:1:9 | LL | #![deny(trivial_casts, trivial_numeric_casts)] | ^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/trivial-casts.rs b/src/test/ui/lint/trivial-casts.rs index 759b282c0da92..b17de624acb0e 100644 --- a/src/test/ui/lint/trivial-casts.rs +++ b/src/test/ui/lint/trivial-casts.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(trivial_casts, trivial_numeric_casts)] fn main() { diff --git a/src/test/ui/lint/trivial-casts.stderr b/src/test/ui/lint/trivial-casts.stderr index d52869f4bed61..f411db1ab0e5a 100644 --- a/src/test/ui/lint/trivial-casts.stderr +++ b/src/test/ui/lint/trivial-casts.stderr @@ -1,24 +1,24 @@ error: trivial numeric cast: `i32` as `i32` - --> $DIR/trivial-casts.rs:14:22 + --> $DIR/trivial-casts.rs:4:22 | LL | let lugubrious = 12i32 as i32; | ^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/trivial-casts.rs:11:24 + --> $DIR/trivial-casts.rs:1:24 | LL | #![deny(trivial_casts, trivial_numeric_casts)] | ^^^^^^^^^^^^^^^^^^^^^ = help: cast can be replaced by coercion; this might require a temporary variable error: trivial cast: `&u32` as `*const u32` - --> $DIR/trivial-casts.rs:17:13 + --> $DIR/trivial-casts.rs:7:13 | LL | let _ = haunted as *const u32; | ^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/trivial-casts.rs:11:9 + --> $DIR/trivial-casts.rs:1:9 | LL | #![deny(trivial_casts, trivial_numeric_casts)] | ^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/type-overflow.rs b/src/test/ui/lint/type-overflow.rs index 6e1e3ee8f437c..2ccc52a0413e0 100644 --- a/src/test/ui/lint/type-overflow.rs +++ b/src/test/ui/lint/type-overflow.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass fn main() { diff --git a/src/test/ui/lint/type-overflow.stderr b/src/test/ui/lint/type-overflow.stderr index 6f5d3d07aea2d..3c4a37c4adf56 100644 --- a/src/test/ui/lint/type-overflow.stderr +++ b/src/test/ui/lint/type-overflow.stderr @@ -1,5 +1,5 @@ warning: literal out of range for i8 - --> $DIR/type-overflow.rs:14:17 + --> $DIR/type-overflow.rs:4:17 | LL | let error = 255i8; //~WARNING literal out of range for i8 | ^^^^^ @@ -7,7 +7,7 @@ LL | let error = 255i8; //~WARNING literal out of range for i8 = note: #[warn(overflowing_literals)] on by default warning: literal out of range for i8 - --> $DIR/type-overflow.rs:19:16 + --> $DIR/type-overflow.rs:9:16 | LL | let fail = 0b1000_0001i8; //~WARNING literal out of range for i8 | ^^^^^^^^^^^^^ help: consider using `u8` instead: `0b1000_0001u8` @@ -15,7 +15,7 @@ LL | let fail = 0b1000_0001i8; //~WARNING literal out of range for i8 = note: the literal `0b1000_0001i8` (decimal `129`) does not fit into an `i8` and will become `-127i8` warning: literal out of range for i64 - --> $DIR/type-overflow.rs:21:16 + --> $DIR/type-overflow.rs:11:16 | LL | let fail = 0x8000_0000_0000_0000i64; //~WARNING literal out of range for i64 | ^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using `u64` instead: `0x8000_0000_0000_0000u64` @@ -23,7 +23,7 @@ LL | let fail = 0x8000_0000_0000_0000i64; //~WARNING literal out of range fo = note: the literal `0x8000_0000_0000_0000i64` (decimal `9223372036854775808`) does not fit into an `i64` and will become `-9223372036854775808i64` warning: literal out of range for u32 - --> $DIR/type-overflow.rs:23:16 + --> $DIR/type-overflow.rs:13:16 | LL | let fail = 0x1_FFFF_FFFFu32; //~WARNING literal out of range for u32 | ^^^^^^^^^^^^^^^^ help: consider using `u64` instead: `0x1_FFFF_FFFFu64` @@ -31,7 +31,7 @@ LL | let fail = 0x1_FFFF_FFFFu32; //~WARNING literal out of range for u32 = note: the literal `0x1_FFFF_FFFFu32` (decimal `8589934591`) does not fit into an `u32` and will become `4294967295u32` warning: literal out of range for i128 - --> $DIR/type-overflow.rs:25:22 + --> $DIR/type-overflow.rs:15:22 | LL | let fail: i128 = 0x8000_0000_0000_0000_0000_0000_0000_0000; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -40,7 +40,7 @@ LL | let fail: i128 = 0x8000_0000_0000_0000_0000_0000_0000_0000; = help: consider using `u128` instead warning: literal out of range for i32 - --> $DIR/type-overflow.rs:28:16 + --> $DIR/type-overflow.rs:18:16 | LL | let fail = 0x8FFF_FFFF_FFFF_FFFE; //~WARNING literal out of range for i32 | ^^^^^^^^^^^^^^^^^^^^^ @@ -49,7 +49,7 @@ LL | let fail = 0x8FFF_FFFF_FFFF_FFFE; //~WARNING literal out of range for i = help: consider using `i128` instead warning: literal out of range for i8 - --> $DIR/type-overflow.rs:30:17 + --> $DIR/type-overflow.rs:20:17 | LL | let fail = -0b1111_1111i8; //~WARNING literal out of range for i8 | ^^^^^^^^^^^^^ help: consider using `i16` instead: `0b1111_1111i16` diff --git a/src/test/ui/lint/unreachable_pub-pub_crate.rs b/src/test/ui/lint/unreachable_pub-pub_crate.rs index 0089617b11c0b..d8577c83a5f0b 100644 --- a/src/test/ui/lint/unreachable_pub-pub_crate.rs +++ b/src/test/ui/lint/unreachable_pub-pub_crate.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This is just like unreachable_pub.rs, but without the // `crate_visibility_modifier` feature (so that we can test the suggestions to // use `pub(crate)` that are given when that feature is off, as opposed to the diff --git a/src/test/ui/lint/unreachable_pub-pub_crate.stderr b/src/test/ui/lint/unreachable_pub-pub_crate.stderr index 1cbfbd211255d..85af3fed9f93f 100644 --- a/src/test/ui/lint/unreachable_pub-pub_crate.stderr +++ b/src/test/ui/lint/unreachable_pub-pub_crate.stderr @@ -1,5 +1,5 @@ warning: unreachable `pub` item - --> $DIR/unreachable_pub-pub_crate.rs:26:5 + --> $DIR/unreachable_pub-pub_crate.rs:16:5 | LL | pub use std::fmt; | ---^^^^^^^^^^^^^^ @@ -7,14 +7,14 @@ LL | pub use std::fmt; | help: consider restricting its visibility: `pub(crate)` | note: lint level defined here - --> $DIR/unreachable_pub-pub_crate.rs:22:9 + --> $DIR/unreachable_pub-pub_crate.rs:12:9 | LL | #![warn(unreachable_pub)] | ^^^^^^^^^^^^^^^ = help: or consider exporting it for use by other crates warning: unreachable `pub` item - --> $DIR/unreachable_pub-pub_crate.rs:27:24 + --> $DIR/unreachable_pub-pub_crate.rs:17:24 | LL | pub use std::env::{Args}; // braced-use has different item spans than unbraced | --- ^^^^ @@ -24,7 +24,7 @@ LL | pub use std::env::{Args}; // braced-use has different item spans than u = help: or consider exporting it for use by other crates warning: unreachable `pub` item - --> $DIR/unreachable_pub-pub_crate.rs:29:5 + --> $DIR/unreachable_pub-pub_crate.rs:19:5 | LL | pub struct Hydrogen { | ---^^^^^^^^^^^^^^^^ @@ -34,7 +34,7 @@ LL | pub struct Hydrogen { = help: or consider exporting it for use by other crates warning: unreachable `pub` field - --> $DIR/unreachable_pub-pub_crate.rs:31:9 + --> $DIR/unreachable_pub-pub_crate.rs:21:9 | LL | pub neutrons: usize, | ---^^^^^^^^^^^^^^^^ @@ -42,7 +42,7 @@ LL | pub neutrons: usize, | help: consider restricting its visibility: `pub(crate)` warning: unreachable `pub` item - --> $DIR/unreachable_pub-pub_crate.rs:37:9 + --> $DIR/unreachable_pub-pub_crate.rs:27:9 | LL | pub fn count_neutrons(&self) -> usize { self.neutrons } | ---^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -50,7 +50,7 @@ LL | pub fn count_neutrons(&self) -> usize { self.neutrons } | help: consider restricting its visibility: `pub(crate)` warning: unreachable `pub` item - --> $DIR/unreachable_pub-pub_crate.rs:41:5 + --> $DIR/unreachable_pub-pub_crate.rs:31:5 | LL | pub enum Helium {} | ---^^^^^^^^^^^^ @@ -60,7 +60,7 @@ LL | pub enum Helium {} = help: or consider exporting it for use by other crates warning: unreachable `pub` item - --> $DIR/unreachable_pub-pub_crate.rs:42:5 + --> $DIR/unreachable_pub-pub_crate.rs:32:5 | LL | pub union Lithium { c1: usize, c2: u8 } | ---^^^^^^^^^^^^^^ @@ -70,7 +70,7 @@ LL | pub union Lithium { c1: usize, c2: u8 } = help: or consider exporting it for use by other crates warning: unreachable `pub` item - --> $DIR/unreachable_pub-pub_crate.rs:43:5 + --> $DIR/unreachable_pub-pub_crate.rs:33:5 | LL | pub fn beryllium() {} | ---^^^^^^^^^^^^^^^ @@ -80,7 +80,7 @@ LL | pub fn beryllium() {} = help: or consider exporting it for use by other crates warning: unreachable `pub` item - --> $DIR/unreachable_pub-pub_crate.rs:44:5 + --> $DIR/unreachable_pub-pub_crate.rs:34:5 | LL | pub trait Boron {} | ---^^^^^^^^^^^^ @@ -90,7 +90,7 @@ LL | pub trait Boron {} = help: or consider exporting it for use by other crates warning: unreachable `pub` item - --> $DIR/unreachable_pub-pub_crate.rs:45:5 + --> $DIR/unreachable_pub-pub_crate.rs:35:5 | LL | pub const CARBON: usize = 1; | ---^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -100,7 +100,7 @@ LL | pub const CARBON: usize = 1; = help: or consider exporting it for use by other crates warning: unreachable `pub` item - --> $DIR/unreachable_pub-pub_crate.rs:46:5 + --> $DIR/unreachable_pub-pub_crate.rs:36:5 | LL | pub static NITROGEN: usize = 2; | ---^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -110,7 +110,7 @@ LL | pub static NITROGEN: usize = 2; = help: or consider exporting it for use by other crates warning: unreachable `pub` item - --> $DIR/unreachable_pub-pub_crate.rs:47:5 + --> $DIR/unreachable_pub-pub_crate.rs:37:5 | LL | pub type Oxygen = bool; | ---^^^^^^^^^^^^^^^^^^^^ @@ -120,7 +120,7 @@ LL | pub type Oxygen = bool; = help: or consider exporting it for use by other crates warning: unreachable `pub` item - --> $DIR/unreachable_pub-pub_crate.rs:50:47 + --> $DIR/unreachable_pub-pub_crate.rs:40:47 | LL | ($visibility: vis, $name: ident) => { $visibility struct $name {} } | ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -134,7 +134,7 @@ LL | define_empty_struct_with_visibility!(pub, Fluorine); = help: or consider exporting it for use by other crates warning: unreachable `pub` item - --> $DIR/unreachable_pub-pub_crate.rs:55:9 + --> $DIR/unreachable_pub-pub_crate.rs:45:9 | LL | pub fn catalyze() -> bool; | ---^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/unreachable_pub.rs b/src/test/ui/lint/unreachable_pub.rs index 7fd4a90109071..c5bdf624ddea6 100644 --- a/src/test/ui/lint/unreachable_pub.rs +++ b/src/test/ui/lint/unreachable_pub.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![feature(crate_visibility_modifier)] diff --git a/src/test/ui/lint/unreachable_pub.stderr b/src/test/ui/lint/unreachable_pub.stderr index 25046055aa024..209a9907e932a 100644 --- a/src/test/ui/lint/unreachable_pub.stderr +++ b/src/test/ui/lint/unreachable_pub.stderr @@ -1,5 +1,5 @@ warning: unreachable `pub` item - --> $DIR/unreachable_pub.rs:21:5 + --> $DIR/unreachable_pub.rs:11:5 | LL | pub use std::fmt; | ---^^^^^^^^^^^^^^ @@ -7,14 +7,14 @@ LL | pub use std::fmt; | help: consider restricting its visibility: `crate` | note: lint level defined here - --> $DIR/unreachable_pub.rs:17:9 + --> $DIR/unreachable_pub.rs:7:9 | LL | #![warn(unreachable_pub)] | ^^^^^^^^^^^^^^^ = help: or consider exporting it for use by other crates warning: unreachable `pub` item - --> $DIR/unreachable_pub.rs:22:24 + --> $DIR/unreachable_pub.rs:12:24 | LL | pub use std::env::{Args}; // braced-use has different item spans than unbraced | --- ^^^^ @@ -24,7 +24,7 @@ LL | pub use std::env::{Args}; // braced-use has different item spans than u = help: or consider exporting it for use by other crates warning: unreachable `pub` item - --> $DIR/unreachable_pub.rs:24:5 + --> $DIR/unreachable_pub.rs:14:5 | LL | pub struct Hydrogen { | ---^^^^^^^^^^^^^^^^ @@ -34,7 +34,7 @@ LL | pub struct Hydrogen { = help: or consider exporting it for use by other crates warning: unreachable `pub` field - --> $DIR/unreachable_pub.rs:26:9 + --> $DIR/unreachable_pub.rs:16:9 | LL | pub neutrons: usize, | ---^^^^^^^^^^^^^^^^ @@ -42,7 +42,7 @@ LL | pub neutrons: usize, | help: consider restricting its visibility: `crate` warning: unreachable `pub` item - --> $DIR/unreachable_pub.rs:32:9 + --> $DIR/unreachable_pub.rs:22:9 | LL | pub fn count_neutrons(&self) -> usize { self.neutrons } | ---^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -50,7 +50,7 @@ LL | pub fn count_neutrons(&self) -> usize { self.neutrons } | help: consider restricting its visibility: `crate` warning: unreachable `pub` item - --> $DIR/unreachable_pub.rs:36:5 + --> $DIR/unreachable_pub.rs:26:5 | LL | pub enum Helium {} | ---^^^^^^^^^^^^ @@ -60,7 +60,7 @@ LL | pub enum Helium {} = help: or consider exporting it for use by other crates warning: unreachable `pub` item - --> $DIR/unreachable_pub.rs:37:5 + --> $DIR/unreachable_pub.rs:27:5 | LL | pub union Lithium { c1: usize, c2: u8 } | ---^^^^^^^^^^^^^^ @@ -70,7 +70,7 @@ LL | pub union Lithium { c1: usize, c2: u8 } = help: or consider exporting it for use by other crates warning: unreachable `pub` item - --> $DIR/unreachable_pub.rs:38:5 + --> $DIR/unreachable_pub.rs:28:5 | LL | pub fn beryllium() {} | ---^^^^^^^^^^^^^^^ @@ -80,7 +80,7 @@ LL | pub fn beryllium() {} = help: or consider exporting it for use by other crates warning: unreachable `pub` item - --> $DIR/unreachable_pub.rs:39:5 + --> $DIR/unreachable_pub.rs:29:5 | LL | pub trait Boron {} | ---^^^^^^^^^^^^ @@ -90,7 +90,7 @@ LL | pub trait Boron {} = help: or consider exporting it for use by other crates warning: unreachable `pub` item - --> $DIR/unreachable_pub.rs:40:5 + --> $DIR/unreachable_pub.rs:30:5 | LL | pub const CARBON: usize = 1; | ---^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -100,7 +100,7 @@ LL | pub const CARBON: usize = 1; = help: or consider exporting it for use by other crates warning: unreachable `pub` item - --> $DIR/unreachable_pub.rs:41:5 + --> $DIR/unreachable_pub.rs:31:5 | LL | pub static NITROGEN: usize = 2; | ---^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -110,7 +110,7 @@ LL | pub static NITROGEN: usize = 2; = help: or consider exporting it for use by other crates warning: unreachable `pub` item - --> $DIR/unreachable_pub.rs:42:5 + --> $DIR/unreachable_pub.rs:32:5 | LL | pub type Oxygen = bool; | ---^^^^^^^^^^^^^^^^^^^^ @@ -120,7 +120,7 @@ LL | pub type Oxygen = bool; = help: or consider exporting it for use by other crates warning: unreachable `pub` item - --> $DIR/unreachable_pub.rs:45:47 + --> $DIR/unreachable_pub.rs:35:47 | LL | ($visibility: vis, $name: ident) => { $visibility struct $name {} } | ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -134,7 +134,7 @@ LL | define_empty_struct_with_visibility!(pub, Fluorine); = help: or consider exporting it for use by other crates warning: unreachable `pub` item - --> $DIR/unreachable_pub.rs:50:9 + --> $DIR/unreachable_pub.rs:40:9 | LL | pub fn catalyze() -> bool; | ---^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/unused_labels.rs b/src/test/ui/lint/unused_labels.rs index 23add604da6ab..26ab9fbe5c8f2 100644 --- a/src/test/ui/lint/unused_labels.rs +++ b/src/test/ui/lint/unused_labels.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // The output should warn when a loop label is not used. However, it // should also deal with the edge cases where a label is shadowed, // within nested loops diff --git a/src/test/ui/lint/unused_labels.stderr b/src/test/ui/lint/unused_labels.stderr index 825f5e281f0b9..39d0a7850efad 100644 --- a/src/test/ui/lint/unused_labels.stderr +++ b/src/test/ui/lint/unused_labels.stderr @@ -1,59 +1,59 @@ warning: unused label - --> $DIR/unused_labels.rs:21:5 + --> $DIR/unused_labels.rs:11:5 | LL | 'unused_while_label: while 0 == 0 { | ^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/unused_labels.rs:18:9 + --> $DIR/unused_labels.rs:8:9 | LL | #![warn(unused_labels)] | ^^^^^^^^^^^^^ warning: unused label - --> $DIR/unused_labels.rs:26:5 + --> $DIR/unused_labels.rs:16:5 | LL | 'unused_while_let_label: while let Some(_) = opt { | ^^^^^^^^^^^^^^^^^^^^^^^ warning: unused label - --> $DIR/unused_labels.rs:30:5 + --> $DIR/unused_labels.rs:20:5 | LL | 'unused_for_label: for _ in 0..10 { | ^^^^^^^^^^^^^^^^^ warning: unused label - --> $DIR/unused_labels.rs:46:9 + --> $DIR/unused_labels.rs:36:9 | LL | 'unused_loop_label_inner_2: for _ in 0..10 { | ^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused label - --> $DIR/unused_labels.rs:52:5 + --> $DIR/unused_labels.rs:42:5 | LL | 'unused_loop_label_outer_3: for _ in 0..10 { | ^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused label - --> $DIR/unused_labels.rs:70:5 + --> $DIR/unused_labels.rs:60:5 | LL | 'many_used_shadowed: for _ in 0..10 { | ^^^^^^^^^^^^^^^^^^^ warning: unused label - --> $DIR/unused_labels.rs:82:5 + --> $DIR/unused_labels.rs:72:5 | LL | 'unused_loop_label: loop { | ^^^^^^^^^^^^^^^^^^ warning: unused label - --> $DIR/unused_labels.rs:88:5 + --> $DIR/unused_labels.rs:78:5 | LL | 'unused_block_label: { | ^^^^^^^^^^^^^^^^^^^ warning: label name `'many_used_shadowed` shadows a label name that is already in scope - --> $DIR/unused_labels.rs:72:9 + --> $DIR/unused_labels.rs:62:9 | LL | 'many_used_shadowed: for _ in 0..10 { | ------------------- first declared here diff --git a/src/test/ui/lint/unused_parens_json_suggestion.rs b/src/test/ui/lint/unused_parens_json_suggestion.rs index 187e7f31dfd71..1291b6df881c4 100644 --- a/src/test/ui/lint/unused_parens_json_suggestion.rs +++ b/src/test/ui/lint/unused_parens_json_suggestion.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --error-format pretty-json -Zunstable-options // compile-pass diff --git a/src/test/ui/lint/unused_parens_json_suggestion.stderr b/src/test/ui/lint/unused_parens_json_suggestion.stderr index 2a9bd2948ffeb..07d96d5c48250 100644 --- a/src/test/ui/lint/unused_parens_json_suggestion.stderr +++ b/src/test/ui/lint/unused_parens_json_suggestion.stderr @@ -8,10 +8,10 @@ "spans": [ { "file_name": "$DIR/unused_parens_json_suggestion.rs", - "byte_start": 1043, - "byte_end": 1056, - "line_start": 25, - "line_end": 25, + "byte_start": 576, + "byte_end": 589, + "line_start": 15, + "line_end": 15, "column_start": 14, "column_end": 27, "is_primary": true, @@ -36,10 +36,10 @@ "spans": [ { "file_name": "$DIR/unused_parens_json_suggestion.rs", - "byte_start": 889, - "byte_end": 902, - "line_start": 20, - "line_end": 20, + "byte_start": 422, + "byte_end": 435, + "line_start": 10, + "line_end": 10, "column_start": 9, "column_end": 22, "is_primary": true, @@ -66,10 +66,10 @@ "spans": [ { "file_name": "$DIR/unused_parens_json_suggestion.rs", - "byte_start": 1043, - "byte_end": 1056, - "line_start": 25, - "line_end": 25, + "byte_start": 576, + "byte_end": 589, + "line_start": 15, + "line_end": 15, "column_start": 14, "column_end": 27, "is_primary": true, @@ -91,13 +91,13 @@ } ], "rendered": "warning: unnecessary parentheses around assigned value - --> $DIR/unused_parens_json_suggestion.rs:25:14 + --> $DIR/unused_parens_json_suggestion.rs:15:14 | LL | let _a = (1 / (2 + 3)); | ^^^^^^^^^^^^^ help: remove these parentheses | note: lint level defined here - --> $DIR/unused_parens_json_suggestion.rs:20:9 + --> $DIR/unused_parens_json_suggestion.rs:10:9 | LL | #![warn(unused_parens)] | ^^^^^^^^^^^^^ diff --git a/src/test/ui/lint/use_suggestion_json.rs b/src/test/ui/lint/use_suggestion_json.rs index c097a8f13429e..3bdbaa55f2df8 100644 --- a/src/test/ui/lint/use_suggestion_json.rs +++ b/src/test/ui/lint/use_suggestion_json.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi // compile-flags: --error-format pretty-json -Zunstable-options diff --git a/src/test/ui/lint/use_suggestion_json.stderr b/src/test/ui/lint/use_suggestion_json.stderr index ce2657a44953b..dee7f2f9b160b 100644 --- a/src/test/ui/lint/use_suggestion_json.stderr +++ b/src/test/ui/lint/use_suggestion_json.stderr @@ -73,10 +73,10 @@ mod foo { "spans": [ { "file_name": "$DIR/use_suggestion_json.rs", - "byte_start": 907, - "byte_end": 911, - "line_start": 21, - "line_end": 21, + "byte_start": 440, + "byte_end": 444, + "line_start": 11, + "line_end": 11, "column_start": 12, "column_end": 16, "is_primary": true, @@ -101,10 +101,10 @@ mod foo { "spans": [ { "file_name": "$DIR/use_suggestion_json.rs", - "byte_start": 884, - "byte_end": 884, - "line_start": 20, - "line_end": 20, + "byte_start": 417, + "byte_end": 417, + "line_start": 10, + "line_end": 10, "column_start": 1, "column_end": 1, "is_primary": true, @@ -124,10 +124,10 @@ mod foo { }, { "file_name": "$DIR/use_suggestion_json.rs", - "byte_start": 884, - "byte_end": 884, - "line_start": 20, - "line_end": 20, + "byte_start": 417, + "byte_end": 417, + "line_start": 10, + "line_end": 10, "column_start": 1, "column_end": 1, "is_primary": true, @@ -147,10 +147,10 @@ mod foo { }, { "file_name": "$DIR/use_suggestion_json.rs", - "byte_start": 884, - "byte_end": 884, - "line_start": 20, - "line_end": 20, + "byte_start": 417, + "byte_end": 417, + "line_start": 10, + "line_end": 10, "column_start": 1, "column_end": 1, "is_primary": true, @@ -170,10 +170,10 @@ mod foo { }, { "file_name": "$DIR/use_suggestion_json.rs", - "byte_start": 884, - "byte_end": 884, - "line_start": 20, - "line_end": 20, + "byte_start": 417, + "byte_end": 417, + "line_start": 10, + "line_end": 10, "column_start": 1, "column_end": 1, "is_primary": true, @@ -193,10 +193,10 @@ mod foo { }, { "file_name": "$DIR/use_suggestion_json.rs", - "byte_start": 884, - "byte_end": 884, - "line_start": 20, - "line_end": 20, + "byte_start": 417, + "byte_end": 417, + "line_start": 10, + "line_end": 10, "column_start": 1, "column_end": 1, "is_primary": true, @@ -216,10 +216,10 @@ mod foo { }, { "file_name": "$DIR/use_suggestion_json.rs", - "byte_start": 884, - "byte_end": 884, - "line_start": 20, - "line_end": 20, + "byte_start": 417, + "byte_end": 417, + "line_start": 10, + "line_end": 10, "column_start": 1, "column_end": 1, "is_primary": true, @@ -239,10 +239,10 @@ mod foo { }, { "file_name": "$DIR/use_suggestion_json.rs", - "byte_start": 884, - "byte_end": 884, - "line_start": 20, - "line_end": 20, + "byte_start": 417, + "byte_end": 417, + "line_start": 10, + "line_end": 10, "column_start": 1, "column_end": 1, "is_primary": true, @@ -262,10 +262,10 @@ mod foo { }, { "file_name": "$DIR/use_suggestion_json.rs", - "byte_start": 884, - "byte_end": 884, - "line_start": 20, - "line_end": 20, + "byte_start": 417, + "byte_end": 417, + "line_start": 10, + "line_end": 10, "column_start": 1, "column_end": 1, "is_primary": true, @@ -285,10 +285,10 @@ mod foo { }, { "file_name": "$DIR/use_suggestion_json.rs", - "byte_start": 884, - "byte_end": 884, - "line_start": 20, - "line_end": 20, + "byte_start": 417, + "byte_end": 417, + "line_start": 10, + "line_end": 10, "column_start": 1, "column_end": 1, "is_primary": true, @@ -308,10 +308,10 @@ mod foo { }, { "file_name": "$DIR/use_suggestion_json.rs", - "byte_start": 884, - "byte_end": 884, - "line_start": 20, - "line_end": 20, + "byte_start": 417, + "byte_end": 417, + "line_start": 10, + "line_end": 10, "column_start": 1, "column_end": 1, "is_primary": true, @@ -331,10 +331,10 @@ mod foo { }, { "file_name": "$DIR/use_suggestion_json.rs", - "byte_start": 884, - "byte_end": 884, - "line_start": 20, - "line_end": 20, + "byte_start": 417, + "byte_end": 417, + "line_start": 10, + "line_end": 10, "column_start": 1, "column_end": 1, "is_primary": true, @@ -354,10 +354,10 @@ mod foo { }, { "file_name": "$DIR/use_suggestion_json.rs", - "byte_start": 884, - "byte_end": 884, - "line_start": 20, - "line_end": 20, + "byte_start": 417, + "byte_end": 417, + "line_start": 10, + "line_end": 10, "column_start": 1, "column_end": 1, "is_primary": true, @@ -381,7 +381,7 @@ mod foo { } ], "rendered": "error[E0412]: cannot find type `Iter` in this scope - --> $DIR/use_suggestion_json.rs:21:12 + --> $DIR/use_suggestion_json.rs:11:12 | LL | let x: Iter; | ^^^^ not found in this scope diff --git a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.ast.nll.stderr b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.ast.nll.stderr index 58a76bd2cf385..5e162ad830dbd 100644 --- a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.ast.nll.stderr +++ b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `v` - --> $DIR/liveness-assign-imm-local-in-loop.rs:18:9 + --> $DIR/liveness-assign-imm-local-in-loop.rs:8:9 | LL | let v: isize; | - consider changing this to `mut v` diff --git a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.ast.stderr b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.ast.stderr index 54419fd5b256c..1a8f2bb0d62af 100644 --- a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.ast.stderr +++ b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.ast.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `v` - --> $DIR/liveness-assign-imm-local-in-loop.rs:18:9 + --> $DIR/liveness-assign-imm-local-in-loop.rs:8:9 | LL | v = 1; //[ast]~ ERROR cannot assign twice to immutable variable | ^^^^^ cannot assign twice to immutable variable diff --git a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.mir.stderr b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.mir.stderr index 58a76bd2cf385..5e162ad830dbd 100644 --- a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.mir.stderr +++ b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.mir.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `v` - --> $DIR/liveness-assign-imm-local-in-loop.rs:18:9 + --> $DIR/liveness-assign-imm-local-in-loop.rs:8:9 | LL | let v: isize; | - consider changing this to `mut v` diff --git a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.rs b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.rs index 7bc3680ca7723..a9784fe733479 100644 --- a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.rs +++ b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Zborrowck=mir diff --git a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.ast.nll.stderr b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.ast.nll.stderr index 091547ed1228a..48c696a136d81 100644 --- a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.ast.nll.stderr +++ b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `v` - --> $DIR/liveness-assign-imm-local-in-op-eq.rs:19:5 + --> $DIR/liveness-assign-imm-local-in-op-eq.rs:9:5 | LL | let v: isize; | - consider changing this to `mut v` diff --git a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.ast.stderr b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.ast.stderr index a98c3c29bd2e8..6e50bc86c85d1 100644 --- a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.ast.stderr +++ b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.ast.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `v` - --> $DIR/liveness-assign-imm-local-in-op-eq.rs:19:5 + --> $DIR/liveness-assign-imm-local-in-op-eq.rs:9:5 | LL | v = 2; //[ast]~ NOTE first assignment | ----- first assignment to `v` diff --git a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.mir.stderr b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.mir.stderr index 091547ed1228a..48c696a136d81 100644 --- a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.mir.stderr +++ b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.mir.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `v` - --> $DIR/liveness-assign-imm-local-in-op-eq.rs:19:5 + --> $DIR/liveness-assign-imm-local-in-op-eq.rs:9:5 | LL | let v: isize; | - consider changing this to `mut v` diff --git a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.rs b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.rs index 7812cdd8684f6..3bd271a1e9a3e 100644 --- a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.rs +++ b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Zborrowck=mir diff --git a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.ast.nll.stderr b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.ast.nll.stderr index e954b1f5e0f8b..790e4ae3d4ac2 100644 --- a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.ast.nll.stderr +++ b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `b` - --> $DIR/liveness-assign-imm-local-with-drop.rs:19:5 + --> $DIR/liveness-assign-imm-local-with-drop.rs:9:5 | LL | let b = Box::new(1); //[ast]~ NOTE first assignment | - diff --git a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.ast.stderr b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.ast.stderr index 6abcf175f488a..e6de67cae0b9f 100644 --- a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.ast.stderr +++ b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.ast.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `b` - --> $DIR/liveness-assign-imm-local-with-drop.rs:19:5 + --> $DIR/liveness-assign-imm-local-with-drop.rs:9:5 | LL | let b = Box::new(1); //[ast]~ NOTE first assignment | - first assignment to `b` diff --git a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.mir.stderr b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.mir.stderr index e954b1f5e0f8b..790e4ae3d4ac2 100644 --- a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.mir.stderr +++ b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.mir.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `b` - --> $DIR/liveness-assign-imm-local-with-drop.rs:19:5 + --> $DIR/liveness-assign-imm-local-with-drop.rs:9:5 | LL | let b = Box::new(1); //[ast]~ NOTE first assignment | - diff --git a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.rs b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.rs index bb61a9037d906..0594cd7d6e8c7 100644 --- a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.rs +++ b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Zborrowck=mir diff --git a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.ast.nll.stderr b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.ast.nll.stderr index 70a6ab3edf803..90e16dec632d8 100644 --- a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.ast.nll.stderr +++ b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `v` - --> $DIR/liveness-assign-imm-local-with-init.rs:19:5 + --> $DIR/liveness-assign-imm-local-with-init.rs:9:5 | LL | let v: isize = 1; //[ast]~ NOTE first assignment | - diff --git a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.ast.stderr b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.ast.stderr index 47c780e83e8c2..57095ed30b45d 100644 --- a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.ast.stderr +++ b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.ast.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `v` - --> $DIR/liveness-assign-imm-local-with-init.rs:19:5 + --> $DIR/liveness-assign-imm-local-with-init.rs:9:5 | LL | let v: isize = 1; //[ast]~ NOTE first assignment | - first assignment to `v` diff --git a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.mir.stderr b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.mir.stderr index 70a6ab3edf803..90e16dec632d8 100644 --- a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.mir.stderr +++ b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.mir.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `v` - --> $DIR/liveness-assign-imm-local-with-init.rs:19:5 + --> $DIR/liveness-assign-imm-local-with-init.rs:9:5 | LL | let v: isize = 1; //[ast]~ NOTE first assignment | - diff --git a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.rs b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.rs index 672e9fab83743..3ba585789a55d 100644 --- a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.rs +++ b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Zborrowck=mir diff --git a/src/test/ui/liveness/liveness-closure-require-ret.rs b/src/test/ui/liveness/liveness-closure-require-ret.rs index 17cd8231222f2..b86d1fe4a660c 100644 --- a/src/test/ui/liveness/liveness-closure-require-ret.rs +++ b/src/test/ui/liveness/liveness-closure-require-ret.rs @@ -1,12 +1,2 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn force(f: F) -> isize where F: FnOnce() -> isize { f() } fn main() { println!("{}", force(|| {})); } //~ ERROR mismatched types diff --git a/src/test/ui/liveness/liveness-closure-require-ret.stderr b/src/test/ui/liveness/liveness-closure-require-ret.stderr index 569640c9e20ce..3133efdedd762 100644 --- a/src/test/ui/liveness/liveness-closure-require-ret.stderr +++ b/src/test/ui/liveness/liveness-closure-require-ret.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/liveness-closure-require-ret.rs:12:37 + --> $DIR/liveness-closure-require-ret.rs:2:37 | LL | fn main() { println!("{}", force(|| {})); } //~ ERROR mismatched types | ^^ expected isize, found () diff --git a/src/test/ui/liveness/liveness-dead.rs b/src/test/ui/liveness/liveness-dead.rs index ddd8fc68c43a3..7d420afde4b72 100644 --- a/src/test/ui/liveness/liveness-dead.rs +++ b/src/test/ui/liveness/liveness-dead.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] #![deny(unused_assignments)] diff --git a/src/test/ui/liveness/liveness-dead.stderr b/src/test/ui/liveness/liveness-dead.stderr index 6709fee0abb72..25921cf5248db 100644 --- a/src/test/ui/liveness/liveness-dead.stderr +++ b/src/test/ui/liveness/liveness-dead.stderr @@ -1,29 +1,29 @@ error: value assigned to `x` is never read - --> $DIR/liveness-dead.rs:19:13 + --> $DIR/liveness-dead.rs:9:13 | LL | let mut x: isize = 3; //~ ERROR: value assigned to `x` is never read | ^ | note: lint level defined here - --> $DIR/liveness-dead.rs:12:9 + --> $DIR/liveness-dead.rs:2:9 | LL | #![deny(unused_assignments)] | ^^^^^^^^^^^^^^^^^^ error: value assigned to `x` is never read - --> $DIR/liveness-dead.rs:27:5 + --> $DIR/liveness-dead.rs:17:5 | LL | x = 4; //~ ERROR: value assigned to `x` is never read | ^ error: value passed to `x` is never read - --> $DIR/liveness-dead.rs:30:11 + --> $DIR/liveness-dead.rs:20:11 | LL | fn f4(mut x: i32) { //~ ERROR: value passed to `x` is never read | ^ error: value assigned to `x` is never read - --> $DIR/liveness-dead.rs:37:5 + --> $DIR/liveness-dead.rs:27:5 | LL | x = 4; //~ ERROR: value assigned to `x` is never read | ^ diff --git a/src/test/ui/liveness/liveness-forgot-ret.rs b/src/test/ui/liveness/liveness-forgot-ret.rs index 1ee4be08a1c50..b8c2bc7343892 100644 --- a/src/test/ui/liveness/liveness-forgot-ret.rs +++ b/src/test/ui/liveness/liveness-forgot-ret.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn god_exists(a: isize) -> bool { return god_exists(a); } fn f(a: isize) -> isize { if god_exists(a) { return 5; }; } diff --git a/src/test/ui/liveness/liveness-forgot-ret.stderr b/src/test/ui/liveness/liveness-forgot-ret.stderr index 8da489bc9ab89..b89112259004f 100644 --- a/src/test/ui/liveness/liveness-forgot-ret.stderr +++ b/src/test/ui/liveness/liveness-forgot-ret.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/liveness-forgot-ret.rs:13:25 + --> $DIR/liveness-forgot-ret.rs:3:25 | LL | fn f(a: isize) -> isize { if god_exists(a) { return 5; }; } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected isize, found () diff --git a/src/test/ui/liveness/liveness-issue-2163.rs b/src/test/ui/liveness/liveness-issue-2163.rs index 69bceec8c3225..a632b5b9c93ca 100644 --- a/src/test/ui/liveness/liveness-issue-2163.rs +++ b/src/test/ui/liveness/liveness-issue-2163.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::vec::Vec; fn main() { diff --git a/src/test/ui/liveness/liveness-issue-2163.stderr b/src/test/ui/liveness/liveness-issue-2163.stderr index 66cd67821be30..e91994d9a2299 100644 --- a/src/test/ui/liveness/liveness-issue-2163.stderr +++ b/src/test/ui/liveness/liveness-issue-2163.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/liveness-issue-2163.rs:15:30 + --> $DIR/liveness-issue-2163.rs:5:30 | LL | a.iter().all(|_| -> bool { | ______________________________^ diff --git a/src/test/ui/liveness/liveness-missing-ret2.rs b/src/test/ui/liveness/liveness-missing-ret2.rs index a35eb1af4f336..a18669f725e31 100644 --- a/src/test/ui/liveness/liveness-missing-ret2.rs +++ b/src/test/ui/liveness/liveness-missing-ret2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn f() -> isize { //~ ERROR mismatched types // Make sure typestate doesn't interpret this match expression as // the function result diff --git a/src/test/ui/liveness/liveness-missing-ret2.stderr b/src/test/ui/liveness/liveness-missing-ret2.stderr index b7bbea6225dea..e5f74786bc608 100644 --- a/src/test/ui/liveness/liveness-missing-ret2.stderr +++ b/src/test/ui/liveness/liveness-missing-ret2.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/liveness-missing-ret2.rs:11:17 + --> $DIR/liveness-missing-ret2.rs:1:17 | LL | fn f() -> isize { //~ ERROR mismatched types | _________________^ diff --git a/src/test/ui/liveness/liveness-move-call-arg.rs b/src/test/ui/liveness/liveness-move-call-arg.rs index 9340964c1fb0d..98d12f5747aae 100644 --- a/src/test/ui/liveness/liveness-move-call-arg.rs +++ b/src/test/ui/liveness/liveness-move-call-arg.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn take(_x: Box) {} diff --git a/src/test/ui/liveness/liveness-move-call-arg.stderr b/src/test/ui/liveness/liveness-move-call-arg.stderr index f3423b8f5faa2..21d285463e384 100644 --- a/src/test/ui/liveness/liveness-move-call-arg.stderr +++ b/src/test/ui/liveness/liveness-move-call-arg.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `x` - --> $DIR/liveness-move-call-arg.rs:19:14 + --> $DIR/liveness-move-call-arg.rs:9:14 | LL | take(x); //~ ERROR use of moved value: `x` | ^ value moved here in previous iteration of loop diff --git a/src/test/ui/liveness/liveness-move-in-loop.rs b/src/test/ui/liveness/liveness-move-in-loop.rs index 65ccaceac0821..eb3288a28e2bc 100644 --- a/src/test/ui/liveness/liveness-move-in-loop.rs +++ b/src/test/ui/liveness/liveness-move-in-loop.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn main() { diff --git a/src/test/ui/liveness/liveness-move-in-loop.stderr b/src/test/ui/liveness/liveness-move-in-loop.stderr index decc7659a644f..d00c2d6ac35ec 100644 --- a/src/test/ui/liveness/liveness-move-in-loop.stderr +++ b/src/test/ui/liveness/liveness-move-in-loop.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `y` - --> $DIR/liveness-move-in-loop.rs:21:25 + --> $DIR/liveness-move-in-loop.rs:11:25 | LL | x = y; //~ ERROR use of moved value | ^ value moved here in previous iteration of loop diff --git a/src/test/ui/liveness/liveness-move-in-while.nll.stderr b/src/test/ui/liveness/liveness-move-in-while.nll.stderr index 5ca5dc647090d..0cf44654e2b8d 100644 --- a/src/test/ui/liveness/liveness-move-in-while.nll.stderr +++ b/src/test/ui/liveness/liveness-move-in-while.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: borrow of moved value: `y` - --> $DIR/liveness-move-in-while.rs:17:24 + --> $DIR/liveness-move-in-while.rs:7:24 | LL | println!("{}", y); //~ ERROR use of moved value: `y` | ^ value borrowed here after move @@ -9,7 +9,7 @@ LL | while true { while true { while true { x = y; x.clone(); } } } = note: move occurs because `y` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0382]: use of moved value: `y` - --> $DIR/liveness-move-in-while.rs:18:52 + --> $DIR/liveness-move-in-while.rs:8:52 | LL | while true { while true { while true { x = y; x.clone(); } } } | ^ value moved here in previous iteration of loop diff --git a/src/test/ui/liveness/liveness-move-in-while.rs b/src/test/ui/liveness/liveness-move-in-while.rs index cadfd48712111..a43e75982a1d1 100644 --- a/src/test/ui/liveness/liveness-move-in-while.rs +++ b/src/test/ui/liveness/liveness-move-in-while.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn main() { diff --git a/src/test/ui/liveness/liveness-move-in-while.stderr b/src/test/ui/liveness/liveness-move-in-while.stderr index 7ac3ea38cb5ce..91f722cb42288 100644 --- a/src/test/ui/liveness/liveness-move-in-while.stderr +++ b/src/test/ui/liveness/liveness-move-in-while.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `y` - --> $DIR/liveness-move-in-while.rs:17:24 + --> $DIR/liveness-move-in-while.rs:7:24 | LL | println!("{}", y); //~ ERROR use of moved value: `y` | ^ value used here after move @@ -9,7 +9,7 @@ LL | while true { while true { while true { x = y; x.clone(); } } } = note: move occurs because `y` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0382]: use of moved value: `y` - --> $DIR/liveness-move-in-while.rs:18:52 + --> $DIR/liveness-move-in-while.rs:8:52 | LL | while true { while true { while true { x = y; x.clone(); } } } | ^ value moved here in previous iteration of loop diff --git a/src/test/ui/liveness/liveness-return-last-stmt-semi.rs b/src/test/ui/liveness/liveness-return-last-stmt-semi.rs index 663c0275b82a7..e8909c4a5ae9b 100644 --- a/src/test/ui/liveness/liveness-return-last-stmt-semi.rs +++ b/src/test/ui/liveness/liveness-return-last-stmt-semi.rs @@ -1,12 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // regression test for #8005 diff --git a/src/test/ui/liveness/liveness-return-last-stmt-semi.stderr b/src/test/ui/liveness/liveness-return-last-stmt-semi.stderr index 1fa001879a0a9..3aa81a405a6b5 100644 --- a/src/test/ui/liveness/liveness-return-last-stmt-semi.stderr +++ b/src/test/ui/liveness/liveness-return-last-stmt-semi.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/liveness-return-last-stmt-semi.rs:13:45 + --> $DIR/liveness-return-last-stmt-semi.rs:4:45 | LL | macro_rules! test { () => { fn foo() -> i32 { 1; } } } | ^^^-^^ @@ -14,7 +14,7 @@ LL | test!(); found type `()` error[E0308]: mismatched types - --> $DIR/liveness-return-last-stmt-semi.rs:16:23 + --> $DIR/liveness-return-last-stmt-semi.rs:7:23 | LL | fn no_return() -> i32 {} //~ ERROR mismatched types | ^^ expected i32, found () @@ -23,7 +23,7 @@ LL | fn no_return() -> i32 {} //~ ERROR mismatched types found type `()` error[E0308]: mismatched types - --> $DIR/liveness-return-last-stmt-semi.rs:18:23 + --> $DIR/liveness-return-last-stmt-semi.rs:9:23 | LL | fn bar(x: u32) -> u32 { //~ ERROR mismatched types | _______________________^ @@ -36,7 +36,7 @@ LL | | } found type `()` error[E0308]: mismatched types - --> $DIR/liveness-return-last-stmt-semi.rs:22:23 + --> $DIR/liveness-return-last-stmt-semi.rs:13:23 | LL | fn baz(x: u64) -> u32 { //~ ERROR mismatched types | _______________________^ diff --git a/src/test/ui/liveness/liveness-unused.rs b/src/test/ui/liveness/liveness-unused.rs index d056d6be806f7..9c7be15fcc84c 100644 --- a/src/test/ui/liveness/liveness-unused.rs +++ b/src/test/ui/liveness/liveness-unused.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![warn(unused)] #![deny(unused_variables)] #![deny(unused_assignments)] diff --git a/src/test/ui/liveness/liveness-unused.stderr b/src/test/ui/liveness/liveness-unused.stderr index 2846f242fbe4c..af61be8596106 100644 --- a/src/test/ui/liveness/liveness-unused.stderr +++ b/src/test/ui/liveness/liveness-unused.stderr @@ -1,48 +1,48 @@ warning: unreachable statement - --> $DIR/liveness-unused.rs:102:9 + --> $DIR/liveness-unused.rs:92:9 | LL | drop(*x as i32); //~ WARNING unreachable statement | ^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/liveness-unused.rs:11:9 + --> $DIR/liveness-unused.rs:1:9 | LL | #![warn(unused)] | ^^^^^^ = note: #[warn(unreachable_code)] implied by #[warn(unused)] error: unused variable: `x` - --> $DIR/liveness-unused.rs:18:7 + --> $DIR/liveness-unused.rs:8:7 | LL | fn f1(x: isize) { | ^ help: consider using `_x` instead | note: lint level defined here - --> $DIR/liveness-unused.rs:12:9 + --> $DIR/liveness-unused.rs:2:9 | LL | #![deny(unused_variables)] | ^^^^^^^^^^^^^^^^ error: unused variable: `x` - --> $DIR/liveness-unused.rs:22:8 + --> $DIR/liveness-unused.rs:12:8 | LL | fn f1b(x: &mut isize) { | ^ help: consider using `_x` instead error: unused variable: `x` - --> $DIR/liveness-unused.rs:30:9 + --> $DIR/liveness-unused.rs:20:9 | LL | let x: isize; | ^ help: consider using `_x` instead error: unused variable: `x` - --> $DIR/liveness-unused.rs:35:9 + --> $DIR/liveness-unused.rs:25:9 | LL | let x = 3; | ^ help: consider using `_x` instead error: variable `x` is assigned to, but never used - --> $DIR/liveness-unused.rs:40:13 + --> $DIR/liveness-unused.rs:30:13 | LL | let mut x = 3; | ^ @@ -50,19 +50,19 @@ LL | let mut x = 3; = note: consider using `_x` instead error: value assigned to `x` is never read - --> $DIR/liveness-unused.rs:42:5 + --> $DIR/liveness-unused.rs:32:5 | LL | x += 4; | ^ | note: lint level defined here - --> $DIR/liveness-unused.rs:13:9 + --> $DIR/liveness-unused.rs:3:9 | LL | #![deny(unused_assignments)] | ^^^^^^^^^^^^^^^^^^ error: variable `z` is assigned to, but never used - --> $DIR/liveness-unused.rs:47:13 + --> $DIR/liveness-unused.rs:37:13 | LL | let mut z = 3; | ^ @@ -70,31 +70,31 @@ LL | let mut z = 3; = note: consider using `_z` instead error: unused variable: `i` - --> $DIR/liveness-unused.rs:69:12 + --> $DIR/liveness-unused.rs:59:12 | LL | Some(i) => { | ^ help: consider using `_i` instead error: unused variable: `x` - --> $DIR/liveness-unused.rs:89:9 + --> $DIR/liveness-unused.rs:79:9 | LL | for x in 1..10 { } | ^ help: consider using `_x` instead error: unused variable: `x` - --> $DIR/liveness-unused.rs:94:10 + --> $DIR/liveness-unused.rs:84:10 | LL | for (x, _) in [1, 2, 3].iter().enumerate() { } | ^ help: consider using `_x` instead error: unused variable: `x` - --> $DIR/liveness-unused.rs:99:13 + --> $DIR/liveness-unused.rs:89:13 | LL | for (_, x) in [1, 2, 3].iter().enumerate() { | ^ help: consider using `_x` instead error: variable `x` is assigned to, but never used - --> $DIR/liveness-unused.rs:122:9 + --> $DIR/liveness-unused.rs:112:9 | LL | let x; | ^ @@ -102,7 +102,7 @@ LL | let x; = note: consider using `_x` instead error: value assigned to `x` is never read - --> $DIR/liveness-unused.rs:126:9 + --> $DIR/liveness-unused.rs:116:9 | LL | x = 0; //~ ERROR value assigned to `x` is never read | ^ diff --git a/src/test/ui/liveness/liveness-use-after-move.nll.stderr b/src/test/ui/liveness/liveness-use-after-move.nll.stderr index 62d9a8b115a19..7496d02fe5b5a 100644 --- a/src/test/ui/liveness/liveness-use-after-move.nll.stderr +++ b/src/test/ui/liveness/liveness-use-after-move.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: borrow of moved value: `*x` - --> $DIR/liveness-use-after-move.rs:16:20 + --> $DIR/liveness-use-after-move.rs:6:20 | LL | let y = x; | - value moved here diff --git a/src/test/ui/liveness/liveness-use-after-move.rs b/src/test/ui/liveness/liveness-use-after-move.rs index 6fcab38003033..157587c7a7b54 100644 --- a/src/test/ui/liveness/liveness-use-after-move.rs +++ b/src/test/ui/liveness/liveness-use-after-move.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn main() { diff --git a/src/test/ui/liveness/liveness-use-after-move.stderr b/src/test/ui/liveness/liveness-use-after-move.stderr index be6f89c735788..62475943d0e3d 100644 --- a/src/test/ui/liveness/liveness-use-after-move.stderr +++ b/src/test/ui/liveness/liveness-use-after-move.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `*x` - --> $DIR/liveness-use-after-move.rs:16:20 + --> $DIR/liveness-use-after-move.rs:6:20 | LL | let y = x; | - value moved here diff --git a/src/test/ui/liveness/liveness-use-after-send.nll.stderr b/src/test/ui/liveness/liveness-use-after-send.nll.stderr index dbffe6c9135da..2b55b5d59732b 100644 --- a/src/test/ui/liveness/liveness-use-after-send.nll.stderr +++ b/src/test/ui/liveness/liveness-use-after-send.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: borrow of moved value: `message` - --> $DIR/liveness-use-after-send.rs:26:20 + --> $DIR/liveness-use-after-send.rs:16:20 | LL | send(ch, message); | ------- value moved here diff --git a/src/test/ui/liveness/liveness-use-after-send.rs b/src/test/ui/liveness/liveness-use-after-send.rs index 03d8d62e0b4d5..7e837d610d636 100644 --- a/src/test/ui/liveness/liveness-use-after-send.rs +++ b/src/test/ui/liveness/liveness-use-after-send.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::marker; fn send(ch: _chan, data: T) { diff --git a/src/test/ui/liveness/liveness-use-after-send.stderr b/src/test/ui/liveness/liveness-use-after-send.stderr index 94499aabb9709..1fdb1d3ec39bc 100644 --- a/src/test/ui/liveness/liveness-use-after-send.stderr +++ b/src/test/ui/liveness/liveness-use-after-send.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `message` - --> $DIR/liveness-use-after-send.rs:26:20 + --> $DIR/liveness-use-after-send.rs:16:20 | LL | send(ch, message); | ------- value moved here diff --git a/src/test/ui/loops/loop-break-value-no-repeat.rs b/src/test/ui/loops/loop-break-value-no-repeat.rs index f24840eca5441..1c0b7a0181f4a 100644 --- a/src/test/ui/loops/loop-break-value-no-repeat.rs +++ b/src/test/ui/loops/loop-break-value-no-repeat.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_variables)] use std::ptr; diff --git a/src/test/ui/loops/loop-break-value-no-repeat.stderr b/src/test/ui/loops/loop-break-value-no-repeat.stderr index 68a2bab1674e8..f5c6544a815ab 100644 --- a/src/test/ui/loops/loop-break-value-no-repeat.stderr +++ b/src/test/ui/loops/loop-break-value-no-repeat.stderr @@ -1,5 +1,5 @@ error[E0571]: `break` with value from a `for` loop - --> $DIR/loop-break-value-no-repeat.rs:22:9 + --> $DIR/loop-break-value-no-repeat.rs:12:9 | LL | break 22 //~ ERROR `break` with value from a `for` loop | ^^^^^^^^ can only break with a value inside `loop` or breakable block diff --git a/src/test/ui/loops/loop-break-value.rs b/src/test/ui/loops/loop-break-value.rs index 938f7fba2a032..b80c847deb967 100644 --- a/src/test/ui/loops/loop-break-value.rs +++ b/src/test/ui/loops/loop-break-value.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(never_type)] fn main() { diff --git a/src/test/ui/loops/loop-break-value.stderr b/src/test/ui/loops/loop-break-value.stderr index ca286285c3857..8fc4ec94366a5 100644 --- a/src/test/ui/loops/loop-break-value.stderr +++ b/src/test/ui/loops/loop-break-value.stderr @@ -1,5 +1,5 @@ error[E0571]: `break` with value from a `while` loop - --> $DIR/loop-break-value.rs:38:9 + --> $DIR/loop-break-value.rs:28:9 | LL | break (); //~ ERROR `break` with value from a `while` loop | ^^^^^^^^ can only break with a value inside `loop` or breakable block @@ -9,7 +9,7 @@ LL | break; //~ ERROR `break` with value from a `while` loop | ^^^^^ error[E0571]: `break` with value from a `while` loop - --> $DIR/loop-break-value.rs:40:13 + --> $DIR/loop-break-value.rs:30:13 | LL | break 'while_loop 123; | ^^^^^^^^^^^^^^^^^^^^^ can only break with a value inside `loop` or breakable block @@ -19,7 +19,7 @@ LL | break; | ^^^^^ error[E0571]: `break` with value from a `while let` loop - --> $DIR/loop-break-value.rs:48:12 + --> $DIR/loop-break-value.rs:38:12 | LL | if break () { //~ ERROR `break` with value from a `while let` loop | ^^^^^^^^ can only break with a value inside `loop` or breakable block @@ -29,7 +29,7 @@ LL | if break { //~ ERROR `break` with value from a `while let` loop | ^^^^^ error[E0571]: `break` with value from a `while let` loop - --> $DIR/loop-break-value.rs:53:9 + --> $DIR/loop-break-value.rs:43:9 | LL | break None; | ^^^^^^^^^^ can only break with a value inside `loop` or breakable block @@ -39,7 +39,7 @@ LL | break; | ^^^^^ error[E0571]: `break` with value from a `while let` loop - --> $DIR/loop-break-value.rs:59:13 + --> $DIR/loop-break-value.rs:49:13 | LL | break 'while_let_loop "nope"; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can only break with a value inside `loop` or breakable block @@ -49,7 +49,7 @@ LL | break; | ^^^^^ error[E0571]: `break` with value from a `for` loop - --> $DIR/loop-break-value.rs:66:9 + --> $DIR/loop-break-value.rs:56:9 | LL | break (); //~ ERROR `break` with value from a `for` loop | ^^^^^^^^ can only break with a value inside `loop` or breakable block @@ -59,7 +59,7 @@ LL | break; //~ ERROR `break` with value from a `for` loop | ^^^^^ error[E0571]: `break` with value from a `for` loop - --> $DIR/loop-break-value.rs:67:9 + --> $DIR/loop-break-value.rs:57:9 | LL | break [()]; | ^^^^^^^^^^ can only break with a value inside `loop` or breakable block @@ -69,7 +69,7 @@ LL | break; | ^^^^^ error[E0571]: `break` with value from a `for` loop - --> $DIR/loop-break-value.rs:74:13 + --> $DIR/loop-break-value.rs:64:13 | LL | break 'for_loop Some(17); | ^^^^^^^^^^^^^^^^^^^^^^^^ can only break with a value inside `loop` or breakable block @@ -79,7 +79,7 @@ LL | break; | ^^^^^ error[E0308]: mismatched types - --> $DIR/loop-break-value.rs:14:31 + --> $DIR/loop-break-value.rs:4:31 | LL | let val: ! = loop { break break; }; | ^^^^^ expected (), found ! @@ -88,7 +88,7 @@ LL | let val: ! = loop { break break; }; found type `!` error[E0308]: mismatched types - --> $DIR/loop-break-value.rs:21:19 + --> $DIR/loop-break-value.rs:11:19 | LL | break 123; //~ ERROR mismatched types | ^^^ expected &str, found integral variable @@ -97,7 +97,7 @@ LL | break 123; //~ ERROR mismatched types found type `{integer}` error[E0308]: mismatched types - --> $DIR/loop-break-value.rs:26:15 + --> $DIR/loop-break-value.rs:16:15 | LL | break "asdf"; //~ ERROR mismatched types | ^^^^^^ expected i32, found reference @@ -106,7 +106,7 @@ LL | break "asdf"; //~ ERROR mismatched types found type `&'static str` error[E0308]: mismatched types - --> $DIR/loop-break-value.rs:31:31 + --> $DIR/loop-break-value.rs:21:31 | LL | break 'outer_loop "nope"; //~ ERROR mismatched types | ^^^^^^ expected i32, found reference @@ -115,7 +115,7 @@ LL | break 'outer_loop "nope"; //~ ERROR mismatched types found type `&'static str` error[E0308]: mismatched types - --> $DIR/loop-break-value.rs:83:26 + --> $DIR/loop-break-value.rs:73:26 | LL | break 'c 123; //~ ERROR mismatched types | ^^^ expected (), found integral variable @@ -124,7 +124,7 @@ LL | break 'c 123; //~ ERROR mismatched types found type `{integer}` error[E0308]: mismatched types - --> $DIR/loop-break-value.rs:90:15 + --> $DIR/loop-break-value.rs:80:15 | LL | break (break, break); //~ ERROR mismatched types | ^^^^^^^^^^^^^^ expected (), found tuple @@ -133,7 +133,7 @@ LL | break (break, break); //~ ERROR mismatched types found type `(!, !)` error[E0308]: mismatched types - --> $DIR/loop-break-value.rs:95:15 + --> $DIR/loop-break-value.rs:85:15 | LL | break 2; //~ ERROR mismatched types | ^ expected (), found integral variable @@ -142,7 +142,7 @@ LL | break 2; //~ ERROR mismatched types found type `{integer}` error[E0308]: mismatched types - --> $DIR/loop-break-value.rs:100:9 + --> $DIR/loop-break-value.rs:90:9 | LL | break; //~ ERROR mismatched types | ^^^^^ expected (), found integral variable diff --git a/src/test/ui/loops/loop-labeled-break-value.rs b/src/test/ui/loops/loop-labeled-break-value.rs index f0792c145d2a2..3488b057bc5d2 100644 --- a/src/test/ui/loops/loop-labeled-break-value.rs +++ b/src/test/ui/loops/loop-labeled-break-value.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { loop { let _: i32 = loop { break }; //~ ERROR mismatched types diff --git a/src/test/ui/loops/loop-labeled-break-value.stderr b/src/test/ui/loops/loop-labeled-break-value.stderr index 7d140aa8aac4d..5cfd86ea50478 100644 --- a/src/test/ui/loops/loop-labeled-break-value.stderr +++ b/src/test/ui/loops/loop-labeled-break-value.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/loop-labeled-break-value.rs:13:29 + --> $DIR/loop-labeled-break-value.rs:3:29 | LL | let _: i32 = loop { break }; //~ ERROR mismatched types | ^^^^^ expected (), found i32 @@ -8,7 +8,7 @@ LL | let _: i32 = loop { break }; //~ ERROR mismatched types found type `i32` error[E0308]: mismatched types - --> $DIR/loop-labeled-break-value.rs:16:37 + --> $DIR/loop-labeled-break-value.rs:6:37 | LL | let _: i32 = 'inner: loop { break 'inner }; //~ ERROR mismatched types | ^^^^^^^^^^^^ expected (), found i32 @@ -17,7 +17,7 @@ LL | let _: i32 = 'inner: loop { break 'inner }; //~ ERROR mismatched ty found type `i32` error[E0308]: mismatched types - --> $DIR/loop-labeled-break-value.rs:19:45 + --> $DIR/loop-labeled-break-value.rs:9:45 | LL | let _: i32 = 'inner2: loop { loop { break 'inner2 } }; //~ ERROR mismatched types | ^^^^^^^^^^^^^ expected (), found i32 diff --git a/src/test/ui/loops/loop-proper-liveness.nll.stderr b/src/test/ui/loops/loop-proper-liveness.nll.stderr index cbf7094d83743..745f0876b404d 100644 --- a/src/test/ui/loops/loop-proper-liveness.nll.stderr +++ b/src/test/ui/loops/loop-proper-liveness.nll.stderr @@ -1,5 +1,5 @@ error[E0381]: borrow of possibly uninitialized variable: `x` - --> $DIR/loop-proper-liveness.rs:19:22 + --> $DIR/loop-proper-liveness.rs:9:22 | LL | println!("{:?}", x); //~ ERROR use of possibly uninitialized variable | ^ use of possibly uninitialized `x` diff --git a/src/test/ui/loops/loop-proper-liveness.rs b/src/test/ui/loops/loop-proper-liveness.rs index e411313c273b7..fd9d6612220c7 100644 --- a/src/test/ui/loops/loop-proper-liveness.rs +++ b/src/test/ui/loops/loop-proper-liveness.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn test1() { // In this test the outer 'a loop may terminate without `x` getting initialised. Although the // `x = loop { ... }` statement is reached, the value itself ends up never being computed and diff --git a/src/test/ui/loops/loop-proper-liveness.stderr b/src/test/ui/loops/loop-proper-liveness.stderr index 554abea91e320..b8fb3fe00ee54 100644 --- a/src/test/ui/loops/loop-proper-liveness.stderr +++ b/src/test/ui/loops/loop-proper-liveness.stderr @@ -1,5 +1,5 @@ error[E0381]: use of possibly uninitialized variable: `x` - --> $DIR/loop-proper-liveness.rs:19:22 + --> $DIR/loop-proper-liveness.rs:9:22 | LL | println!("{:?}", x); //~ ERROR use of possibly uninitialized variable | ^ use of possibly uninitialized `x` diff --git a/src/test/ui/loops/loop-properly-diverging-2.rs b/src/test/ui/loops/loop-properly-diverging-2.rs index c22091ce63cc2..97b3972c135f1 100644 --- a/src/test/ui/loops/loop-properly-diverging-2.rs +++ b/src/test/ui/loops/loop-properly-diverging-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn forever2() -> i32 { let x: i32 = loop { break }; //~ ERROR mismatched types x diff --git a/src/test/ui/loops/loop-properly-diverging-2.stderr b/src/test/ui/loops/loop-properly-diverging-2.stderr index f9836538382a3..5bd088fa0114c 100644 --- a/src/test/ui/loops/loop-properly-diverging-2.stderr +++ b/src/test/ui/loops/loop-properly-diverging-2.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/loop-properly-diverging-2.rs:12:23 + --> $DIR/loop-properly-diverging-2.rs:2:23 | LL | let x: i32 = loop { break }; //~ ERROR mismatched types | ^^^^^ expected (), found i32 diff --git a/src/test/ui/loops/loops-reject-duplicate-labels-2.rs b/src/test/ui/loops/loops-reject-duplicate-labels-2.rs index b273e7a0c7c9e..d912e74b12a3d 100644 --- a/src/test/ui/loops/loops-reject-duplicate-labels-2.rs +++ b/src/test/ui/loops/loops-reject-duplicate-labels-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] // ignore-tidy-linelength diff --git a/src/test/ui/loops/loops-reject-duplicate-labels-2.stderr b/src/test/ui/loops/loops-reject-duplicate-labels-2.stderr index 41b4a850f1bfb..f2ff8b63fdd19 100644 --- a/src/test/ui/loops/loops-reject-duplicate-labels-2.stderr +++ b/src/test/ui/loops/loops-reject-duplicate-labels-2.stderr @@ -1,5 +1,5 @@ warning: label name `'fl` shadows a label name that is already in scope - --> $DIR/loops-reject-duplicate-labels-2.rs:24:7 + --> $DIR/loops-reject-duplicate-labels-2.rs:14:7 | LL | { 'fl: for _ in 0..10 { break; } } | --- first declared here @@ -7,7 +7,7 @@ LL | { 'fl: loop { break; } } //~ WARN label name `'fl` shadows | ^^^ lifetime 'fl already in scope warning: label name `'lf` shadows a label name that is already in scope - --> $DIR/loops-reject-duplicate-labels-2.rs:26:7 + --> $DIR/loops-reject-duplicate-labels-2.rs:16:7 | LL | { 'lf: loop { break; } } | --- first declared here @@ -15,7 +15,7 @@ LL | { 'lf: for _ in 0..10 { break; } } //~ WARN label name `'lf` shadows | ^^^ lifetime 'lf already in scope warning: label name `'wl` shadows a label name that is already in scope - --> $DIR/loops-reject-duplicate-labels-2.rs:28:7 + --> $DIR/loops-reject-duplicate-labels-2.rs:18:7 | LL | { 'wl: while 2 > 1 { break; } } | --- first declared here @@ -23,7 +23,7 @@ LL | { 'wl: loop { break; } } //~ WARN label name `'wl` shadows | ^^^ lifetime 'wl already in scope warning: label name `'lw` shadows a label name that is already in scope - --> $DIR/loops-reject-duplicate-labels-2.rs:30:7 + --> $DIR/loops-reject-duplicate-labels-2.rs:20:7 | LL | { 'lw: loop { break; } } | --- first declared here @@ -31,7 +31,7 @@ LL | { 'lw: while 2 > 1 { break; } } //~ WARN label name `'lw` shadows | ^^^ lifetime 'lw already in scope warning: label name `'fw` shadows a label name that is already in scope - --> $DIR/loops-reject-duplicate-labels-2.rs:32:7 + --> $DIR/loops-reject-duplicate-labels-2.rs:22:7 | LL | { 'fw: for _ in 0..10 { break; } } | --- first declared here @@ -39,7 +39,7 @@ LL | { 'fw: while 2 > 1 { break; } } //~ WARN label name `'fw` shadows | ^^^ lifetime 'fw already in scope warning: label name `'wf` shadows a label name that is already in scope - --> $DIR/loops-reject-duplicate-labels-2.rs:34:7 + --> $DIR/loops-reject-duplicate-labels-2.rs:24:7 | LL | { 'wf: while 2 > 1 { break; } } | --- first declared here @@ -47,7 +47,7 @@ LL | { 'wf: for _ in 0..10 { break; } } //~ WARN label name `'wf` shadows | ^^^ lifetime 'wf already in scope warning: label name `'tl` shadows a label name that is already in scope - --> $DIR/loops-reject-duplicate-labels-2.rs:36:7 + --> $DIR/loops-reject-duplicate-labels-2.rs:26:7 | LL | { 'tl: while let Some(_) = None:: { break; } } | --- first declared here @@ -55,7 +55,7 @@ LL | { 'tl: loop { break; } } //~ WARN label name `'tl` shadows | ^^^ lifetime 'tl already in scope warning: label name `'lt` shadows a label name that is already in scope - --> $DIR/loops-reject-duplicate-labels-2.rs:38:7 + --> $DIR/loops-reject-duplicate-labels-2.rs:28:7 | LL | { 'lt: loop { break; } } | --- first declared here @@ -63,7 +63,7 @@ LL | { 'lt: while let Some(_) = None:: { break; } } | ^^^ lifetime 'lt already in scope error: compilation successful - --> $DIR/loops-reject-duplicate-labels-2.rs:43:1 + --> $DIR/loops-reject-duplicate-labels-2.rs:33:1 | LL | / pub fn main() { //~ ERROR compilation successful LL | | foo(); diff --git a/src/test/ui/loops/loops-reject-duplicate-labels.rs b/src/test/ui/loops/loops-reject-duplicate-labels.rs index ad24f69871c85..1d81f11442d9d 100644 --- a/src/test/ui/loops/loops-reject-duplicate-labels.rs +++ b/src/test/ui/loops/loops-reject-duplicate-labels.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] // ignore-tidy-linelength diff --git a/src/test/ui/loops/loops-reject-duplicate-labels.stderr b/src/test/ui/loops/loops-reject-duplicate-labels.stderr index d0cb81544f828..27017a3257e38 100644 --- a/src/test/ui/loops/loops-reject-duplicate-labels.stderr +++ b/src/test/ui/loops/loops-reject-duplicate-labels.stderr @@ -1,5 +1,5 @@ warning: label name `'fl` shadows a label name that is already in scope - --> $DIR/loops-reject-duplicate-labels.rs:21:5 + --> $DIR/loops-reject-duplicate-labels.rs:11:5 | LL | 'fl: for _ in 0..10 { break; } | --- first declared here @@ -7,7 +7,7 @@ LL | 'fl: loop { break; } //~ WARN label name `'fl` shadows a labe | ^^^ lifetime 'fl already in scope warning: label name `'lf` shadows a label name that is already in scope - --> $DIR/loops-reject-duplicate-labels.rs:24:5 + --> $DIR/loops-reject-duplicate-labels.rs:14:5 | LL | 'lf: loop { break; } | --- first declared here @@ -15,7 +15,7 @@ LL | 'lf: for _ in 0..10 { break; } //~ WARN label name `'lf` shadows a labe | ^^^ lifetime 'lf already in scope warning: label name `'wl` shadows a label name that is already in scope - --> $DIR/loops-reject-duplicate-labels.rs:26:5 + --> $DIR/loops-reject-duplicate-labels.rs:16:5 | LL | 'wl: while 2 > 1 { break; } | --- first declared here @@ -23,7 +23,7 @@ LL | 'wl: loop { break; } //~ WARN label name `'wl` shadows a labe | ^^^ lifetime 'wl already in scope warning: label name `'lw` shadows a label name that is already in scope - --> $DIR/loops-reject-duplicate-labels.rs:28:5 + --> $DIR/loops-reject-duplicate-labels.rs:18:5 | LL | 'lw: loop { break; } | --- first declared here @@ -31,7 +31,7 @@ LL | 'lw: while 2 > 1 { break; } //~ WARN label name `'lw` shadows a labe | ^^^ lifetime 'lw already in scope warning: label name `'fw` shadows a label name that is already in scope - --> $DIR/loops-reject-duplicate-labels.rs:30:5 + --> $DIR/loops-reject-duplicate-labels.rs:20:5 | LL | 'fw: for _ in 0..10 { break; } | --- first declared here @@ -39,7 +39,7 @@ LL | 'fw: while 2 > 1 { break; } //~ WARN label name `'fw` shadows a labe | ^^^ lifetime 'fw already in scope warning: label name `'wf` shadows a label name that is already in scope - --> $DIR/loops-reject-duplicate-labels.rs:32:5 + --> $DIR/loops-reject-duplicate-labels.rs:22:5 | LL | 'wf: while 2 > 1 { break; } | --- first declared here @@ -47,7 +47,7 @@ LL | 'wf: for _ in 0..10 { break; } //~ WARN label name `'wf` shadows a labe | ^^^ lifetime 'wf already in scope warning: label name `'tl` shadows a label name that is already in scope - --> $DIR/loops-reject-duplicate-labels.rs:34:5 + --> $DIR/loops-reject-duplicate-labels.rs:24:5 | LL | 'tl: while let Some(_) = None:: { break; } | --- first declared here @@ -55,7 +55,7 @@ LL | 'tl: loop { break; } //~ WARN label name `'tl` shadows a labe | ^^^ lifetime 'tl already in scope warning: label name `'lt` shadows a label name that is already in scope - --> $DIR/loops-reject-duplicate-labels.rs:36:5 + --> $DIR/loops-reject-duplicate-labels.rs:26:5 | LL | 'lt: loop { break; } | --- first declared here @@ -63,7 +63,7 @@ LL | 'lt: while let Some(_) = None:: { break; } | ^^^ lifetime 'lt already in scope error: compilation successful - --> $DIR/loops-reject-duplicate-labels.rs:50:1 + --> $DIR/loops-reject-duplicate-labels.rs:40:1 | LL | / pub fn main() { //~ ERROR compilation successful LL | | let s = S; diff --git a/src/test/ui/loops/loops-reject-labels-shadowing-lifetimes.rs b/src/test/ui/loops/loops-reject-labels-shadowing-lifetimes.rs index 74da125d575a0..3e7d6140da284 100644 --- a/src/test/ui/loops/loops-reject-labels-shadowing-lifetimes.rs +++ b/src/test/ui/loops/loops-reject-labels-shadowing-lifetimes.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #21633: reject duplicate loop labels in function bodies. // This is testing interaction between lifetime-params and labels. diff --git a/src/test/ui/loops/loops-reject-labels-shadowing-lifetimes.stderr b/src/test/ui/loops/loops-reject-labels-shadowing-lifetimes.stderr index af524d5b01766..d7580c2b09c87 100644 --- a/src/test/ui/loops/loops-reject-labels-shadowing-lifetimes.stderr +++ b/src/test/ui/loops/loops-reject-labels-shadowing-lifetimes.stderr @@ -1,5 +1,5 @@ warning: label name `'a` shadows a lifetime name that is already in scope - --> $DIR/loops-reject-labels-shadowing-lifetimes.rs:20:9 + --> $DIR/loops-reject-labels-shadowing-lifetimes.rs:10:9 | LL | fn foo<'a>() { | -- first declared here @@ -7,7 +7,7 @@ LL | 'a: loop { break 'a; } | ^^ lifetime 'a already in scope warning: label name `'bad` shadows a lifetime name that is already in scope - --> $DIR/loops-reject-labels-shadowing-lifetimes.rs:45:13 + --> $DIR/loops-reject-labels-shadowing-lifetimes.rs:35:13 | LL | impl<'bad, 'c> Struct<'bad, 'c> { | ---- first declared here @@ -16,7 +16,7 @@ LL | 'bad: loop { break 'bad; } | ^^^^ lifetime 'bad already in scope warning: label name `'bad` shadows a lifetime name that is already in scope - --> $DIR/loops-reject-labels-shadowing-lifetimes.rs:52:13 + --> $DIR/loops-reject-labels-shadowing-lifetimes.rs:42:13 | LL | impl<'b, 'bad> Struct<'b, 'bad> { | ---- first declared here @@ -25,7 +25,7 @@ LL | 'bad: loop { break 'bad; } | ^^^^ lifetime 'bad already in scope warning: label name `'bad` shadows a lifetime name that is already in scope - --> $DIR/loops-reject-labels-shadowing-lifetimes.rs:59:13 + --> $DIR/loops-reject-labels-shadowing-lifetimes.rs:49:13 | LL | fn meth_bad3<'bad>(x: &'bad i8) { | ---- first declared here @@ -33,7 +33,7 @@ LL | 'bad: loop { break 'bad; } | ^^^^ lifetime 'bad already in scope warning: label name `'bad` shadows a lifetime name that is already in scope - --> $DIR/loops-reject-labels-shadowing-lifetimes.rs:64:13 + --> $DIR/loops-reject-labels-shadowing-lifetimes.rs:54:13 | LL | fn meth_bad4<'a,'bad>(x: &'a i8, y: &'bad i8) { | ---- first declared here @@ -41,7 +41,7 @@ LL | 'bad: loop { break 'bad; } | ^^^^ lifetime 'bad already in scope warning: label name `'bad` shadows a lifetime name that is already in scope - --> $DIR/loops-reject-labels-shadowing-lifetimes.rs:71:13 + --> $DIR/loops-reject-labels-shadowing-lifetimes.rs:61:13 | LL | impl <'bad, 'e> Enum<'bad, 'e> { | ---- first declared here @@ -50,7 +50,7 @@ LL | 'bad: loop { break 'bad; } | ^^^^ lifetime 'bad already in scope warning: label name `'bad` shadows a lifetime name that is already in scope - --> $DIR/loops-reject-labels-shadowing-lifetimes.rs:77:13 + --> $DIR/loops-reject-labels-shadowing-lifetimes.rs:67:13 | LL | impl <'d, 'bad> Enum<'d, 'bad> { | ---- first declared here @@ -59,7 +59,7 @@ LL | 'bad: loop { break 'bad; } | ^^^^ lifetime 'bad already in scope warning: label name `'bad` shadows a lifetime name that is already in scope - --> $DIR/loops-reject-labels-shadowing-lifetimes.rs:83:13 + --> $DIR/loops-reject-labels-shadowing-lifetimes.rs:73:13 | LL | fn meth_bad3<'bad>(x: &'bad i8) { | ---- first declared here @@ -67,7 +67,7 @@ LL | 'bad: loop { break 'bad; } | ^^^^ lifetime 'bad already in scope warning: label name `'bad` shadows a lifetime name that is already in scope - --> $DIR/loops-reject-labels-shadowing-lifetimes.rs:88:13 + --> $DIR/loops-reject-labels-shadowing-lifetimes.rs:78:13 | LL | fn meth_bad4<'a,'bad>(x: &'bad i8) { | ---- first declared here @@ -75,7 +75,7 @@ LL | 'bad: loop { break 'bad; } | ^^^^ lifetime 'bad already in scope warning: label name `'bad` shadows a lifetime name that is already in scope - --> $DIR/loops-reject-labels-shadowing-lifetimes.rs:98:13 + --> $DIR/loops-reject-labels-shadowing-lifetimes.rs:88:13 | LL | trait HasDefaultMethod1<'bad> { | ---- first declared here @@ -84,7 +84,7 @@ LL | 'bad: loop { break 'bad; } | ^^^^ lifetime 'bad already in scope warning: label name `'bad` shadows a lifetime name that is already in scope - --> $DIR/loops-reject-labels-shadowing-lifetimes.rs:104:13 + --> $DIR/loops-reject-labels-shadowing-lifetimes.rs:94:13 | LL | trait HasDefaultMethod2<'a,'bad> { | ---- first declared here @@ -93,7 +93,7 @@ LL | 'bad: loop { break 'bad; } | ^^^^ lifetime 'bad already in scope warning: label name `'bad` shadows a lifetime name that is already in scope - --> $DIR/loops-reject-labels-shadowing-lifetimes.rs:110:13 + --> $DIR/loops-reject-labels-shadowing-lifetimes.rs:100:13 | LL | fn meth_bad<'bad>(&self) { | ---- first declared here @@ -101,7 +101,7 @@ LL | 'bad: loop { break 'bad; } | ^^^^ lifetime 'bad already in scope error: compilation successful - --> $DIR/loops-reject-labels-shadowing-lifetimes.rs:117:1 + --> $DIR/loops-reject-labels-shadowing-lifetimes.rs:107:1 | LL | / pub fn main() { //~ ERROR compilation successful LL | | foo(); diff --git a/src/test/ui/loops/loops-reject-lifetime-shadowing-label.rs b/src/test/ui/loops/loops-reject-lifetime-shadowing-label.rs index 077e57c9579e3..deea46cde6a87 100644 --- a/src/test/ui/loops/loops-reject-lifetime-shadowing-label.rs +++ b/src/test/ui/loops/loops-reject-lifetime-shadowing-label.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![allow(dead_code, unused_variables)] diff --git a/src/test/ui/loops/loops-reject-lifetime-shadowing-label.stderr b/src/test/ui/loops/loops-reject-lifetime-shadowing-label.stderr index 999cfb9cc3c6b..10872c24958e4 100644 --- a/src/test/ui/loops/loops-reject-lifetime-shadowing-label.stderr +++ b/src/test/ui/loops/loops-reject-lifetime-shadowing-label.stderr @@ -1,5 +1,5 @@ warning: lifetime name `'a` shadows a label name that is already in scope - --> $DIR/loops-reject-lifetime-shadowing-label.rs:31:51 + --> $DIR/loops-reject-lifetime-shadowing-label.rs:21:51 | LL | 'a: loop { | -- first declared here @@ -7,7 +7,7 @@ LL | let b = Box::new(|x: &i8| *x) as Box Fn(&'a i8) -> i8>; | ^^ lifetime 'a already in scope error: compilation successful - --> $DIR/loops-reject-lifetime-shadowing-label.rs:39:1 + --> $DIR/loops-reject-lifetime-shadowing-label.rs:29:1 | LL | / pub fn main() { //~ ERROR compilation successful LL | | foo(); diff --git a/src/test/ui/lto-duplicate-symbols.rs b/src/test/ui/lto-duplicate-symbols.rs index 9c1dbfc2af93b..c95e9fbf40661 100644 --- a/src/test/ui/lto-duplicate-symbols.rs +++ b/src/test/ui/lto-duplicate-symbols.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:lto-duplicate-symbols1.rs // aux-build:lto-duplicate-symbols2.rs // error-pattern:Linking globals named 'foo': symbol multiply defined! diff --git a/src/test/ui/lub-glb/old-lub-glb-hr.rs b/src/test/ui/lub-glb/old-lub-glb-hr.rs index 7526b2f946c12..049905467769e 100644 --- a/src/test/ui/lub-glb/old-lub-glb-hr.rs +++ b/src/test/ui/lub-glb/old-lub-glb-hr.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we give a note when the old LUB/GLB algorithm would have // succeeded but the new code (which is stricter) gives an error. diff --git a/src/test/ui/lub-glb/old-lub-glb-hr.stderr b/src/test/ui/lub-glb/old-lub-glb-hr.stderr index 9b40062bd57b9..885b095c132ec 100644 --- a/src/test/ui/lub-glb/old-lub-glb-hr.stderr +++ b/src/test/ui/lub-glb/old-lub-glb-hr.stderr @@ -1,5 +1,5 @@ error[E0308]: match arms have incompatible types - --> $DIR/old-lub-glb-hr.rs:18:13 + --> $DIR/old-lub-glb-hr.rs:8:13 | LL | let z = match 22 { //~ ERROR incompatible types | _____________^ diff --git a/src/test/ui/lub-glb/old-lub-glb-object.rs b/src/test/ui/lub-glb/old-lub-glb-object.rs index 63dcfa3fc1e91..309f2d0ea7663 100644 --- a/src/test/ui/lub-glb/old-lub-glb-object.rs +++ b/src/test/ui/lub-glb/old-lub-glb-object.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we give a note when the old LUB/GLB algorithm would have // succeeded but the new code (which is stricter) gives an error. diff --git a/src/test/ui/lub-glb/old-lub-glb-object.stderr b/src/test/ui/lub-glb/old-lub-glb-object.stderr index 79442bd108a67..f5665a748dbdf 100644 --- a/src/test/ui/lub-glb/old-lub-glb-object.stderr +++ b/src/test/ui/lub-glb/old-lub-glb-object.stderr @@ -1,5 +1,5 @@ error[E0308]: match arms have incompatible types - --> $DIR/old-lub-glb-object.rs:20:13 + --> $DIR/old-lub-glb-object.rs:10:13 | LL | let z = match 22 { //~ ERROR incompatible types | _____________^ diff --git a/src/test/ui/lub-if.nll.stderr b/src/test/ui/lub-if.nll.stderr index d3f5cdca1759e..4fe8c42f76bca 100644 --- a/src/test/ui/lub-if.nll.stderr +++ b/src/test/ui/lub-if.nll.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/lub-if.rs:38:9 + --> $DIR/lub-if.rs:28:9 | LL | s //~ ERROR E0312 | ^ warning: not reporting region error due to nll - --> $DIR/lub-if.rs:45:9 + --> $DIR/lub-if.rs:35:9 | LL | s //~ ERROR E0312 | ^ error: unsatisfied lifetime constraints - --> $DIR/lub-if.rs:38:9 + --> $DIR/lub-if.rs:28:9 | LL | pub fn opt_str2<'a>(maybestr: &'a Option) -> &'static str { | -- lifetime `'a` defined here @@ -20,7 +20,7 @@ LL | s //~ ERROR E0312 | ^ returning this value requires that `'a` must outlive `'static` error: unsatisfied lifetime constraints - --> $DIR/lub-if.rs:45:9 + --> $DIR/lub-if.rs:35:9 | LL | pub fn opt_str3<'a>(maybestr: &'a Option) -> &'static str { | -- lifetime `'a` defined here diff --git a/src/test/ui/lub-if.rs b/src/test/ui/lub-if.rs index 8d2a0fd07e80a..132b83810ead7 100644 --- a/src/test/ui/lub-if.rs +++ b/src/test/ui/lub-if.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we correctly consider the type of `match` to be the LUB // of the various arms, particularly in the case where regions are // involved. diff --git a/src/test/ui/lub-if.stderr b/src/test/ui/lub-if.stderr index 4a436810170d5..2cf12ba60414d 100644 --- a/src/test/ui/lub-if.stderr +++ b/src/test/ui/lub-if.stderr @@ -1,25 +1,25 @@ error[E0312]: lifetime of reference outlives lifetime of borrowed content... - --> $DIR/lub-if.rs:38:9 + --> $DIR/lub-if.rs:28:9 | LL | s //~ ERROR E0312 | ^ | = note: ...the reference is valid for the static lifetime... -note: ...but the borrowed content is only valid for the lifetime 'a as defined on the function body at 33:17 - --> $DIR/lub-if.rs:33:17 +note: ...but the borrowed content is only valid for the lifetime 'a as defined on the function body at 23:17 + --> $DIR/lub-if.rs:23:17 | LL | pub fn opt_str2<'a>(maybestr: &'a Option) -> &'static str { | ^^ error[E0312]: lifetime of reference outlives lifetime of borrowed content... - --> $DIR/lub-if.rs:45:9 + --> $DIR/lub-if.rs:35:9 | LL | s //~ ERROR E0312 | ^ | = note: ...the reference is valid for the static lifetime... -note: ...but the borrowed content is only valid for the lifetime 'a as defined on the function body at 42:17 - --> $DIR/lub-if.rs:42:17 +note: ...but the borrowed content is only valid for the lifetime 'a as defined on the function body at 32:17 + --> $DIR/lub-if.rs:32:17 | LL | pub fn opt_str3<'a>(maybestr: &'a Option) -> &'static str { | ^^ diff --git a/src/test/ui/lub-match.nll.stderr b/src/test/ui/lub-match.nll.stderr index bbddcc7d8b36a..2a0e58010fff9 100644 --- a/src/test/ui/lub-match.nll.stderr +++ b/src/test/ui/lub-match.nll.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/lub-match.rs:40:13 + --> $DIR/lub-match.rs:30:13 | LL | s //~ ERROR E0312 | ^ warning: not reporting region error due to nll - --> $DIR/lub-match.rs:49:13 + --> $DIR/lub-match.rs:39:13 | LL | s //~ ERROR E0312 | ^ error: unsatisfied lifetime constraints - --> $DIR/lub-match.rs:40:13 + --> $DIR/lub-match.rs:30:13 | LL | pub fn opt_str2<'a>(maybestr: &'a Option) -> &'static str { | -- lifetime `'a` defined here @@ -20,7 +20,7 @@ LL | s //~ ERROR E0312 | ^ returning this value requires that `'a` must outlive `'static` error: unsatisfied lifetime constraints - --> $DIR/lub-match.rs:49:13 + --> $DIR/lub-match.rs:39:13 | LL | pub fn opt_str3<'a>(maybestr: &'a Option) -> &'static str { | -- lifetime `'a` defined here diff --git a/src/test/ui/lub-match.rs b/src/test/ui/lub-match.rs index b9423feb5c1cd..1cd4a02a3ef55 100644 --- a/src/test/ui/lub-match.rs +++ b/src/test/ui/lub-match.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we correctly consider the type of `match` to be the LUB // of the various arms, particularly in the case where regions are // involved. diff --git a/src/test/ui/lub-match.stderr b/src/test/ui/lub-match.stderr index 3543676ad2f2e..0db27f91717b0 100644 --- a/src/test/ui/lub-match.stderr +++ b/src/test/ui/lub-match.stderr @@ -1,25 +1,25 @@ error[E0312]: lifetime of reference outlives lifetime of borrowed content... - --> $DIR/lub-match.rs:40:13 + --> $DIR/lub-match.rs:30:13 | LL | s //~ ERROR E0312 | ^ | = note: ...the reference is valid for the static lifetime... -note: ...but the borrowed content is only valid for the lifetime 'a as defined on the function body at 35:17 - --> $DIR/lub-match.rs:35:17 +note: ...but the borrowed content is only valid for the lifetime 'a as defined on the function body at 25:17 + --> $DIR/lub-match.rs:25:17 | LL | pub fn opt_str2<'a>(maybestr: &'a Option) -> &'static str { | ^^ error[E0312]: lifetime of reference outlives lifetime of borrowed content... - --> $DIR/lub-match.rs:49:13 + --> $DIR/lub-match.rs:39:13 | LL | s //~ ERROR E0312 | ^ | = note: ...the reference is valid for the static lifetime... -note: ...but the borrowed content is only valid for the lifetime 'a as defined on the function body at 45:17 - --> $DIR/lub-match.rs:45:17 +note: ...but the borrowed content is only valid for the lifetime 'a as defined on the function body at 35:17 + --> $DIR/lub-match.rs:35:17 | LL | pub fn opt_str3<'a>(maybestr: &'a Option) -> &'static str { | ^^ diff --git a/src/test/ui/macro_backtrace/auxiliary/ping.rs b/src/test/ui/macro_backtrace/auxiliary/ping.rs index e4131dde8f720..efddb209cdaa0 100644 --- a/src/test/ui/macro_backtrace/auxiliary/ping.rs +++ b/src/test/ui/macro_backtrace/auxiliary/ping.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the macro backtrace facility works (supporting file) // a non-local macro diff --git a/src/test/ui/macro_backtrace/main.rs b/src/test/ui/macro_backtrace/main.rs index 72a5c0d5e3728..fd2f1b7a286ac 100644 --- a/src/test/ui/macro_backtrace/main.rs +++ b/src/test/ui/macro_backtrace/main.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the macro backtrace facility works // aux-build:ping.rs // compile-flags: -Z external-macro-backtrace diff --git a/src/test/ui/macro_backtrace/main.stderr b/src/test/ui/macro_backtrace/main.stderr index 10eabca63538d..039c43e01e5b3 100644 --- a/src/test/ui/macro_backtrace/main.stderr +++ b/src/test/ui/macro_backtrace/main.stderr @@ -1,5 +1,5 @@ error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `error` - --> $DIR/main.rs:19:20 + --> $DIR/main.rs:9:20 | LL | / macro_rules! pong { LL | | () => { syntax error }; @@ -11,7 +11,7 @@ LL | pong!(); | -------- in this macro invocation error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `error` - --> $DIR/main.rs:19:20 + --> $DIR/main.rs:9:20 | LL | / macro_rules! pong { LL | | () => { syntax error }; @@ -31,7 +31,7 @@ LL | ( ) => { pong ! ( ) ; } | in this expansion of `ping!` error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `error` - --> $DIR/main.rs:19:20 + --> $DIR/main.rs:9:20 | LL | / macro_rules! pong { LL | | () => { syntax error }; diff --git a/src/test/ui/macros/auxiliary/macro-in-other-crate.rs b/src/test/ui/macros/auxiliary/macro-in-other-crate.rs index c787cedc2d0ea..feda084634abe 100644 --- a/src/test/ui/macros/auxiliary/macro-in-other-crate.rs +++ b/src/test/ui/macros/auxiliary/macro-in-other-crate.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_export] macro_rules! mac { ($ident:ident) => { let $ident = 42; } diff --git a/src/test/ui/macros/auxiliary/macro_crate_nonterminal.rs b/src/test/ui/macros/auxiliary/macro_crate_nonterminal.rs index 4f75e2b5d7565..2e2440462ae4e 100644 --- a/src/test/ui/macros/auxiliary/macro_crate_nonterminal.rs +++ b/src/test/ui/macros/auxiliary/macro_crate_nonterminal.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn increment(x: usize) -> usize { x + 1 } diff --git a/src/test/ui/macros/auxiliary/two_macros.rs b/src/test/ui/macros/auxiliary/two_macros.rs index 060960f0dbc88..2330c75c8e0cb 100644 --- a/src/test/ui/macros/auxiliary/two_macros.rs +++ b/src/test/ui/macros/auxiliary/two_macros.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_export] macro_rules! macro_one { () => ("one") } diff --git a/src/test/ui/macros/auxiliary/unstable-macros.rs b/src/test/ui/macros/auxiliary/unstable-macros.rs index 836164a721a46..b8d580702c9bc 100644 --- a/src/test/ui/macros/auxiliary/unstable-macros.rs +++ b/src/test/ui/macros/auxiliary/unstable-macros.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(staged_api)] #![stable(feature = "unit_test", since = "1.0.0")] diff --git a/src/test/ui/macros/bad-concat.rs b/src/test/ui/macros/bad-concat.rs index e7adee8ce8597..263cd074d5a26 100644 --- a/src/test/ui/macros/bad-concat.rs +++ b/src/test/ui/macros/bad-concat.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x: u32 = 42; let y: f64 = 3.14; diff --git a/src/test/ui/macros/bad-concat.stderr b/src/test/ui/macros/bad-concat.stderr index b97e4f268241c..4316fd312c739 100644 --- a/src/test/ui/macros/bad-concat.stderr +++ b/src/test/ui/macros/bad-concat.stderr @@ -1,5 +1,5 @@ error: expected a literal - --> $DIR/bad-concat.rs:15:21 + --> $DIR/bad-concat.rs:5:21 | LL | let _ = concat!(x, y, z, "bar"); | ^ ^ ^ diff --git a/src/test/ui/macros/bad_hello.rs b/src/test/ui/macros/bad_hello.rs index cccaf7998c98b..aaa9e243a2d32 100644 --- a/src/test/ui/macros/bad_hello.rs +++ b/src/test/ui/macros/bad_hello.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { println!(3 + 4); //~^ ERROR format argument must be a string literal diff --git a/src/test/ui/macros/bad_hello.stderr b/src/test/ui/macros/bad_hello.stderr index c675eede2152b..ab3cbf058baa5 100644 --- a/src/test/ui/macros/bad_hello.stderr +++ b/src/test/ui/macros/bad_hello.stderr @@ -1,5 +1,5 @@ error: format argument must be a string literal - --> $DIR/bad_hello.rs:12:14 + --> $DIR/bad_hello.rs:2:14 | LL | println!(3 + 4); | ^^^^^ @@ -9,7 +9,7 @@ LL | println!("{}", 3 + 4); | ^^^^^ error: format argument must be a string literal - --> $DIR/bad_hello.rs:14:14 + --> $DIR/bad_hello.rs:4:14 | LL | println!(3, 4); | ^ diff --git a/src/test/ui/macros/format-foreign.rs b/src/test/ui/macros/format-foreign.rs index ac00ce3af9624..ac65838f21d85 100644 --- a/src/test/ui/macros/format-foreign.rs +++ b/src/test/ui/macros/format-foreign.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { println!("%.*3$s %s!\n", "Hello,", "World", 4); //~ ERROR multiple unused formatting arguments println!("%1$*2$.*3$f", 123.456); //~ ERROR never used diff --git a/src/test/ui/macros/format-foreign.stderr b/src/test/ui/macros/format-foreign.stderr index d5e2b514c405c..41c3c9d75c0aa 100644 --- a/src/test/ui/macros/format-foreign.stderr +++ b/src/test/ui/macros/format-foreign.stderr @@ -1,5 +1,5 @@ error: multiple unused formatting arguments - --> $DIR/format-foreign.rs:12:30 + --> $DIR/format-foreign.rs:2:30 | LL | println!("%.*3$s %s!/n", "Hello,", "World", 4); //~ ERROR multiple unused formatting arguments | -------------- ^^^^^^^^ ^^^^^^^ ^ @@ -13,7 +13,7 @@ LL | println!("{:.2$} {}!/n", "Hello,", "World", 4); //~ ERROR multiple unus | ^^^^^^ ^^ error: argument never used - --> $DIR/format-foreign.rs:13:29 + --> $DIR/format-foreign.rs:3:29 | LL | println!("%1$*2$.*3$f", 123.456); //~ ERROR never used | ----------- ^^^^^^^ @@ -23,7 +23,7 @@ LL | println!("%1$*2$.*3$f", 123.456); //~ ERROR never used = note: printf formatting not supported; see the documentation for `std::fmt` error: multiple unused formatting arguments - --> $DIR/format-foreign.rs:16:7 + --> $DIR/format-foreign.rs:6:7 | LL | println!(r###"%.*3$s | ______________- @@ -41,7 +41,7 @@ LL | {}!/n | error: argument never used - --> $DIR/format-foreign.rs:22:30 + --> $DIR/format-foreign.rs:12:30 | LL | println!("{} %f", "one", 2.0); //~ ERROR never used | ------- ^^^ @@ -49,7 +49,7 @@ LL | println!("{} %f", "one", 2.0); //~ ERROR never used | formatting specifier missing error: named argument never used - --> $DIR/format-foreign.rs:24:39 + --> $DIR/format-foreign.rs:14:39 | LL | println!("Hi there, $NAME.", NAME="Tim"); //~ ERROR never used | ----- ^^^^^ @@ -59,7 +59,7 @@ LL | println!("Hi there, $NAME.", NAME="Tim"); //~ ERROR never used = note: shell formatting not supported; see the documentation for `std::fmt` error: multiple unused formatting arguments - --> $DIR/format-foreign.rs:25:32 + --> $DIR/format-foreign.rs:15:32 | LL | println!("$1 $0 $$ $NAME", 1, 2, NAME=3); | ---------------- ^ ^ ^ diff --git a/src/test/ui/macros/format-unused-lables.rs b/src/test/ui/macros/format-unused-lables.rs index 3347a1215cede..56382b1011c44 100644 --- a/src/test/ui/macros/format-unused-lables.rs +++ b/src/test/ui/macros/format-unused-lables.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { println!("Test", 123, 456, 789); //~^ ERROR multiple unused formatting arguments diff --git a/src/test/ui/macros/format-unused-lables.stderr b/src/test/ui/macros/format-unused-lables.stderr index 67ffeec67cc8b..c94ff2a16714d 100644 --- a/src/test/ui/macros/format-unused-lables.stderr +++ b/src/test/ui/macros/format-unused-lables.stderr @@ -1,5 +1,5 @@ error: multiple unused formatting arguments - --> $DIR/format-unused-lables.rs:12:22 + --> $DIR/format-unused-lables.rs:2:22 | LL | println!("Test", 123, 456, 789); | ------ ^^^ ^^^ ^^^ @@ -7,7 +7,7 @@ LL | println!("Test", 123, 456, 789); | multiple missing formatting specifiers error: multiple unused formatting arguments - --> $DIR/format-unused-lables.rs:16:9 + --> $DIR/format-unused-lables.rs:6:9 | LL | println!("Test2", | ------- multiple missing formatting specifiers @@ -19,7 +19,7 @@ LL | 789 | ^^^ error: named argument never used - --> $DIR/format-unused-lables.rs:21:35 + --> $DIR/format-unused-lables.rs:11:35 | LL | println!("Some stuff", UNUSED="args"); //~ ERROR named argument never used | ------------ ^^^^^^ @@ -27,7 +27,7 @@ LL | println!("Some stuff", UNUSED="args"); //~ ERROR named argument never u | formatting specifier missing error: multiple unused formatting arguments - --> $DIR/format-unused-lables.rs:24:9 + --> $DIR/format-unused-lables.rs:14:9 | LL | println!("Some more $STUFF", | ------------------ diff --git a/src/test/ui/macros/issue-30143.rs b/src/test/ui/macros/issue-30143.rs index b7fb5b3af999a..ac4c1da5cb705 100644 --- a/src/test/ui/macros/issue-30143.rs +++ b/src/test/ui/macros/issue-30143.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt::Write; fn main() { diff --git a/src/test/ui/macros/issue-30143.stderr b/src/test/ui/macros/issue-30143.stderr index 56834f68f847c..f0c604a23ffa4 100644 --- a/src/test/ui/macros/issue-30143.stderr +++ b/src/test/ui/macros/issue-30143.stderr @@ -1,5 +1,5 @@ error: format argument must be a string literal - --> $DIR/issue-30143.rs:14:14 + --> $DIR/issue-30143.rs:4:14 | LL | println!(0); | ^ @@ -9,7 +9,7 @@ LL | println!("{}", 0); | ^^^^^ error: format argument must be a string literal - --> $DIR/issue-30143.rs:16:15 + --> $DIR/issue-30143.rs:6:15 | LL | eprintln!('a'); | ^^^ @@ -19,7 +19,7 @@ LL | eprintln!("{}", 'a'); | ^^^^^ error: format argument must be a string literal - --> $DIR/issue-30143.rs:19:17 + --> $DIR/issue-30143.rs:9:17 | LL | writeln!(s, true).unwrap(); | ^^^^ diff --git a/src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep-feature-flag.rs b/src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep-feature-flag.rs index 63a4ef16a2581..708524a75f6aa 100644 --- a/src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep-feature-flag.rs +++ b/src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep-feature-flag.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test behavior of `?` macro _kleene op_ under the 2015 edition. Namely, it doesn't exist, even // with the feature flag. diff --git a/src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep-feature-flag.stderr b/src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep-feature-flag.stderr index 5f687900421bf..e61f22224a3f6 100644 --- a/src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep-feature-flag.stderr +++ b/src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep-feature-flag.stderr @@ -1,5 +1,5 @@ error: expected `*` or `+` - --> $DIR/macro-at-most-once-rep-2015-ques-rep-feature-flag.rs:20:10 + --> $DIR/macro-at-most-once-rep-2015-ques-rep-feature-flag.rs:10:10 | LL | ($(a)?) => {} //~ERROR expected `*` or `+` | ^ @@ -7,7 +7,7 @@ LL | ($(a)?) => {} //~ERROR expected `*` or `+` = note: `?` is not a macro repetition operator error: expected `*` or `+` - --> $DIR/macro-at-most-once-rep-2015-ques-rep-feature-flag.rs:24:11 + --> $DIR/macro-at-most-once-rep-2015-ques-rep-feature-flag.rs:14:11 | LL | ($(a),?) => {} //~ERROR expected `*` or `+` | ^ diff --git a/src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep.rs b/src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep.rs index 64848d050cb1e..2d8d2ecf9d7b4 100644 --- a/src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep.rs +++ b/src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test behavior of `?` macro _kleene op_ under the 2015 edition. Namely, it doesn't exist. // edition:2015 diff --git a/src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep.stderr b/src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep.stderr index 8681b5d5be54e..b27b60459d633 100644 --- a/src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep.stderr +++ b/src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep.stderr @@ -1,5 +1,5 @@ error: expected `*` or `+` - --> $DIR/macro-at-most-once-rep-2015-ques-rep.rs:16:10 + --> $DIR/macro-at-most-once-rep-2015-ques-rep.rs:6:10 | LL | ($(a)?) => {} //~ERROR expected `*` or `+` | ^ @@ -7,7 +7,7 @@ LL | ($(a)?) => {} //~ERROR expected `*` or `+` = note: `?` is not a macro repetition operator error: expected `*` or `+` - --> $DIR/macro-at-most-once-rep-2015-ques-rep.rs:20:11 + --> $DIR/macro-at-most-once-rep-2015-ques-rep.rs:10:11 | LL | ($(a),?) => {} //~ERROR expected `*` or `+` | ^ diff --git a/src/test/ui/macros/macro-at-most-once-rep-2015-ques-sep.rs b/src/test/ui/macros/macro-at-most-once-rep-2015-ques-sep.rs index a7857991079fe..c8c920ff3f87a 100644 --- a/src/test/ui/macros/macro-at-most-once-rep-2015-ques-sep.rs +++ b/src/test/ui/macros/macro-at-most-once-rep-2015-ques-sep.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test behavior of `?` macro _separator_ under the 2015 edition. Namely, `?` can be used as a // separator, but you get a migration warning for the edition. diff --git a/src/test/ui/macros/macro-at-most-once-rep-2015-ques-sep.stderr b/src/test/ui/macros/macro-at-most-once-rep-2015-ques-sep.stderr index db1872c24134a..b171cf8b34df7 100644 --- a/src/test/ui/macros/macro-at-most-once-rep-2015-ques-sep.stderr +++ b/src/test/ui/macros/macro-at-most-once-rep-2015-ques-sep.stderr @@ -1,11 +1,11 @@ warning: using `?` as a separator is deprecated and will be a hard error in an upcoming edition - --> $DIR/macro-at-most-once-rep-2015-ques-sep.rs:20:10 + --> $DIR/macro-at-most-once-rep-2015-ques-sep.rs:10:10 | LL | ($(a)?*) => {} //~WARN using `?` as a separator | ^ | note: lint level defined here - --> $DIR/macro-at-most-once-rep-2015-ques-sep.rs:17:9 + --> $DIR/macro-at-most-once-rep-2015-ques-sep.rs:7:9 | LL | #![warn(rust_2018_compatibility)] | ^^^^^^^^^^^^^^^^^^^^^^^ @@ -14,7 +14,7 @@ LL | #![warn(rust_2018_compatibility)] = note: for more information, see issue #48075 warning: using `?` as a separator is deprecated and will be a hard error in an upcoming edition - --> $DIR/macro-at-most-once-rep-2015-ques-sep.rs:25:10 + --> $DIR/macro-at-most-once-rep-2015-ques-sep.rs:15:10 | LL | ($(a)?+) => {} //~WARN using `?` as a separator | ^ diff --git a/src/test/ui/macros/macro-at-most-once-rep-2018-feature-gate.rs b/src/test/ui/macros/macro-at-most-once-rep-2018-feature-gate.rs index ffabf9bcdf685..96600ead6604f 100644 --- a/src/test/ui/macros/macro-at-most-once-rep-2018-feature-gate.rs +++ b/src/test/ui/macros/macro-at-most-once-rep-2018-feature-gate.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Feature gate test for macro_at_most_once_rep under 2018 edition. // gate-test-macro_at_most_once_rep diff --git a/src/test/ui/macros/macro-at-most-once-rep-2018-feature-gate.stderr b/src/test/ui/macros/macro-at-most-once-rep-2018-feature-gate.stderr index 22f1c94fced6f..87fc1125a5379 100644 --- a/src/test/ui/macros/macro-at-most-once-rep-2018-feature-gate.stderr +++ b/src/test/ui/macros/macro-at-most-once-rep-2018-feature-gate.stderr @@ -1,5 +1,5 @@ error[E0658]: using the `?` macro Kleene operator for "at most one" repetition is unstable (see issue #48075) - --> $DIR/macro-at-most-once-rep-2018-feature-gate.rs:17:10 + --> $DIR/macro-at-most-once-rep-2018-feature-gate.rs:7:10 | LL | ($(a)?) => {} | ^ @@ -7,13 +7,13 @@ LL | ($(a)?) => {} = help: add #![feature(macro_at_most_once_rep)] to the crate attributes to enable error: expected `*` or `+` - --> $DIR/macro-at-most-once-rep-2018-feature-gate.rs:17:10 + --> $DIR/macro-at-most-once-rep-2018-feature-gate.rs:7:10 | LL | ($(a)?) => {} | ^ error: expected `*` or `+` - --> $DIR/macro-at-most-once-rep-2018-feature-gate.rs:23:11 + --> $DIR/macro-at-most-once-rep-2018-feature-gate.rs:13:11 | LL | ($(a),?) => {} //~ERROR expected `*` or `+` | ^ @@ -21,7 +21,7 @@ LL | ($(a),?) => {} //~ERROR expected `*` or `+` = note: `?` is not a macro repetition operator error[E0658]: using the `?` macro Kleene operator for "at most one" repetition is unstable (see issue #48075) - --> $DIR/macro-at-most-once-rep-2018-feature-gate.rs:27:10 + --> $DIR/macro-at-most-once-rep-2018-feature-gate.rs:17:10 | LL | ($(a)?+) => {} | ^ @@ -29,13 +29,13 @@ LL | ($(a)?+) => {} = help: add #![feature(macro_at_most_once_rep)] to the crate attributes to enable error: expected `*` or `+` - --> $DIR/macro-at-most-once-rep-2018-feature-gate.rs:27:10 + --> $DIR/macro-at-most-once-rep-2018-feature-gate.rs:17:10 | LL | ($(a)?+) => {} | ^ error[E0658]: using the `?` macro Kleene operator for "at most one" repetition is unstable (see issue #48075) - --> $DIR/macro-at-most-once-rep-2018-feature-gate.rs:33:10 + --> $DIR/macro-at-most-once-rep-2018-feature-gate.rs:23:10 | LL | ($(a)?*) => {} | ^ @@ -43,25 +43,25 @@ LL | ($(a)?*) => {} = help: add #![feature(macro_at_most_once_rep)] to the crate attributes to enable error: expected `*` or `+` - --> $DIR/macro-at-most-once-rep-2018-feature-gate.rs:33:10 + --> $DIR/macro-at-most-once-rep-2018-feature-gate.rs:23:10 | LL | ($(a)?*) => {} | ^ error: no rules expected the token `?` - --> $DIR/macro-at-most-once-rep-2018-feature-gate.rs:41:11 + --> $DIR/macro-at-most-once-rep-2018-feature-gate.rs:31:11 | LL | foo!(a?); //~ ERROR no rules expected the token `?` | ^ error: no rules expected the token `?` - --> $DIR/macro-at-most-once-rep-2018-feature-gate.rs:42:11 + --> $DIR/macro-at-most-once-rep-2018-feature-gate.rs:32:11 | LL | foo!(a?a); //~ ERROR no rules expected the token `?` | ^ error: no rules expected the token `?` - --> $DIR/macro-at-most-once-rep-2018-feature-gate.rs:43:11 + --> $DIR/macro-at-most-once-rep-2018-feature-gate.rs:33:11 | LL | foo!(a?a?a); //~ ERROR no rules expected the token `?` | ^ diff --git a/src/test/ui/macros/macro-at-most-once-rep-2018.rs b/src/test/ui/macros/macro-at-most-once-rep-2018.rs index 5dabe8d952801..a1a6ed492040d 100644 --- a/src/test/ui/macros/macro-at-most-once-rep-2018.rs +++ b/src/test/ui/macros/macro-at-most-once-rep-2018.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that `?` is a Kleene op and not a macro separator in the 2018 edition. // edition:2018 diff --git a/src/test/ui/macros/macro-at-most-once-rep-2018.stderr b/src/test/ui/macros/macro-at-most-once-rep-2018.stderr index 0a15bdb10686d..a64b3b8395841 100644 --- a/src/test/ui/macros/macro-at-most-once-rep-2018.stderr +++ b/src/test/ui/macros/macro-at-most-once-rep-2018.stderr @@ -1,71 +1,71 @@ error: the `?` macro repetition operator does not take a separator - --> $DIR/macro-at-most-once-rep-2018.rs:22:10 + --> $DIR/macro-at-most-once-rep-2018.rs:12:10 | LL | ($(a),?) => {} //~ERROR the `?` macro repetition operator | ^ error: no rules expected the token `?` - --> $DIR/macro-at-most-once-rep-2018.rs:36:11 + --> $DIR/macro-at-most-once-rep-2018.rs:26:11 | LL | foo!(a?); //~ ERROR no rules expected the token `?` | ^ error: no rules expected the token `?` - --> $DIR/macro-at-most-once-rep-2018.rs:37:11 + --> $DIR/macro-at-most-once-rep-2018.rs:27:11 | LL | foo!(a?a); //~ ERROR no rules expected the token `?` | ^ error: no rules expected the token `?` - --> $DIR/macro-at-most-once-rep-2018.rs:38:11 + --> $DIR/macro-at-most-once-rep-2018.rs:28:11 | LL | foo!(a?a?a); //~ ERROR no rules expected the token `?` | ^ error: unexpected end of macro invocation - --> $DIR/macro-at-most-once-rep-2018.rs:40:5 + --> $DIR/macro-at-most-once-rep-2018.rs:30:5 | LL | barplus!(); //~ERROR unexpected end of macro invocation | ^^^^^^^^^^^ error: unexpected end of macro invocation - --> $DIR/macro-at-most-once-rep-2018.rs:41:14 + --> $DIR/macro-at-most-once-rep-2018.rs:31:14 | LL | barplus!(a); //~ERROR unexpected end of macro invocation | ^ error: no rules expected the token `?` - --> $DIR/macro-at-most-once-rep-2018.rs:42:15 + --> $DIR/macro-at-most-once-rep-2018.rs:32:15 | LL | barplus!(a?); //~ ERROR no rules expected the token `?` | ^ error: no rules expected the token `?` - --> $DIR/macro-at-most-once-rep-2018.rs:43:15 + --> $DIR/macro-at-most-once-rep-2018.rs:33:15 | LL | barplus!(a?a); //~ ERROR no rules expected the token `?` | ^ error: unexpected end of macro invocation - --> $DIR/macro-at-most-once-rep-2018.rs:47:5 + --> $DIR/macro-at-most-once-rep-2018.rs:37:5 | LL | barstar!(); //~ERROR unexpected end of macro invocation | ^^^^^^^^^^^ error: unexpected end of macro invocation - --> $DIR/macro-at-most-once-rep-2018.rs:48:14 + --> $DIR/macro-at-most-once-rep-2018.rs:38:14 | LL | barstar!(a); //~ERROR unexpected end of macro invocation | ^ error: no rules expected the token `?` - --> $DIR/macro-at-most-once-rep-2018.rs:49:15 + --> $DIR/macro-at-most-once-rep-2018.rs:39:15 | LL | barstar!(a?); //~ ERROR no rules expected the token `?` | ^ error: no rules expected the token `?` - --> $DIR/macro-at-most-once-rep-2018.rs:50:15 + --> $DIR/macro-at-most-once-rep-2018.rs:40:15 | LL | barstar!(a?a); //~ ERROR no rules expected the token `?` | ^ diff --git a/src/test/ui/macros/macro-attribute.rs b/src/test/ui/macros/macro-attribute.rs index 111375b369363..7ddac2745c5a4 100644 --- a/src/test/ui/macros/macro-attribute.rs +++ b/src/test/ui/macros/macro-attribute.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unrestricted_attribute_tokens)] #[doc = $not_there] //~ ERROR expected `]`, found `not_there` diff --git a/src/test/ui/macros/macro-attribute.stderr b/src/test/ui/macros/macro-attribute.stderr index c403872ecb385..fd4e7252d530d 100644 --- a/src/test/ui/macros/macro-attribute.stderr +++ b/src/test/ui/macros/macro-attribute.stderr @@ -1,5 +1,5 @@ error: expected `]`, found `not_there` - --> $DIR/macro-attribute.rs:13:10 + --> $DIR/macro-attribute.rs:3:10 | LL | #[doc = $not_there] //~ ERROR expected `]`, found `not_there` | ^^^^^^^^^ expected `]` diff --git a/src/test/ui/macros/macro-backtrace-invalid-internals.rs b/src/test/ui/macros/macro-backtrace-invalid-internals.rs index 0bc2dd5a601bd..9501e7cd07c6f 100644 --- a/src/test/ui/macros/macro-backtrace-invalid-internals.rs +++ b/src/test/ui/macros/macro-backtrace-invalid-internals.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Macros in statement vs expression position handle backtraces differently. macro_rules! fake_method_stmt { diff --git a/src/test/ui/macros/macro-backtrace-invalid-internals.stderr b/src/test/ui/macros/macro-backtrace-invalid-internals.stderr index ec8eee6573989..353ae1d0ea698 100644 --- a/src/test/ui/macros/macro-backtrace-invalid-internals.stderr +++ b/src/test/ui/macros/macro-backtrace-invalid-internals.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `fake` found for type `{integer}` in the current scope - --> $DIR/macro-backtrace-invalid-internals.rs:15:13 + --> $DIR/macro-backtrace-invalid-internals.rs:5:13 | LL | 1.fake() //~ ERROR no method | ^^^^ @@ -8,7 +8,7 @@ LL | fake_method_stmt!(); | -------------------- in this macro invocation error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields - --> $DIR/macro-backtrace-invalid-internals.rs:21:13 + --> $DIR/macro-backtrace-invalid-internals.rs:11:13 | LL | 1.fake //~ ERROR doesn't have fields | ^^^^ @@ -17,7 +17,7 @@ LL | fake_field_stmt!(); | ------------------- in this macro invocation error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields - --> $DIR/macro-backtrace-invalid-internals.rs:27:15 + --> $DIR/macro-backtrace-invalid-internals.rs:17:15 | LL | (1).0 //~ ERROR doesn't have fields | ^ @@ -26,7 +26,7 @@ LL | fake_anon_field_stmt!(); | ------------------------ in this macro invocation error[E0689]: can't call method `neg` on ambiguous numeric type `{float}` - --> $DIR/macro-backtrace-invalid-internals.rs:51:15 + --> $DIR/macro-backtrace-invalid-internals.rs:41:15 | LL | 2.0.neg() //~ ERROR can't call method `neg` on ambiguous numeric type `{float}` | ^^^ @@ -39,7 +39,7 @@ LL | 2.0_f32.neg() //~ ERROR can't call method `neg` on ambiguous nume | ^^^^^^^ error[E0599]: no method named `fake` found for type `{integer}` in the current scope - --> $DIR/macro-backtrace-invalid-internals.rs:33:13 + --> $DIR/macro-backtrace-invalid-internals.rs:23:13 | LL | 1.fake() //~ ERROR no method | ^^^^ @@ -48,7 +48,7 @@ LL | let _ = fake_method_expr!(); | ------------------- in this macro invocation error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields - --> $DIR/macro-backtrace-invalid-internals.rs:39:13 + --> $DIR/macro-backtrace-invalid-internals.rs:29:13 | LL | 1.fake //~ ERROR doesn't have fields | ^^^^ @@ -57,7 +57,7 @@ LL | let _ = fake_field_expr!(); | ------------------ in this macro invocation error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields - --> $DIR/macro-backtrace-invalid-internals.rs:45:15 + --> $DIR/macro-backtrace-invalid-internals.rs:35:15 | LL | (1).0 //~ ERROR doesn't have fields | ^ @@ -66,7 +66,7 @@ LL | let _ = fake_anon_field_expr!(); | ----------------------- in this macro invocation error[E0689]: can't call method `neg` on ambiguous numeric type `{float}` - --> $DIR/macro-backtrace-invalid-internals.rs:57:15 + --> $DIR/macro-backtrace-invalid-internals.rs:47:15 | LL | 2.0.neg() //~ ERROR can't call method `neg` on ambiguous numeric type `{float}` | ^^^ diff --git a/src/test/ui/macros/macro-backtrace-nested.rs b/src/test/ui/macros/macro-backtrace-nested.rs index d261633c60c86..13d80163dd8b3 100644 --- a/src/test/ui/macros/macro-backtrace-nested.rs +++ b/src/test/ui/macros/macro-backtrace-nested.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // In expression position, but not statement position, when we expand a macro, // we replace the span of the expanded expression with that of the call site. diff --git a/src/test/ui/macros/macro-backtrace-nested.stderr b/src/test/ui/macros/macro-backtrace-nested.stderr index a4fe702c0d934..61a11231efef5 100644 --- a/src/test/ui/macros/macro-backtrace-nested.stderr +++ b/src/test/ui/macros/macro-backtrace-nested.stderr @@ -1,5 +1,5 @@ error[E0425]: cannot find value `fake` in this scope - --> $DIR/macro-backtrace-nested.rs:15:12 + --> $DIR/macro-backtrace-nested.rs:5:12 | LL | () => (fake) //~ ERROR cannot find | ^^^^ not found in this scope @@ -8,7 +8,7 @@ LL | 1 + call_nested_expr!(); | ------------------- in this macro invocation error[E0425]: cannot find value `fake` in this scope - --> $DIR/macro-backtrace-nested.rs:15:12 + --> $DIR/macro-backtrace-nested.rs:5:12 | LL | () => (fake) //~ ERROR cannot find | ^^^^ not found in this scope diff --git a/src/test/ui/macros/macro-backtrace-println.rs b/src/test/ui/macros/macro-backtrace-println.rs index 6f035bc9d2355..859dd019dcb29 100644 --- a/src/test/ui/macros/macro-backtrace-println.rs +++ b/src/test/ui/macros/macro-backtrace-println.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // The `format_args!` syntax extension issues errors before code expansion // has completed, but we still need a backtrace. diff --git a/src/test/ui/macros/macro-backtrace-println.stderr b/src/test/ui/macros/macro-backtrace-println.stderr index 8f2eb0173a499..c24a88c4159fd 100644 --- a/src/test/ui/macros/macro-backtrace-println.stderr +++ b/src/test/ui/macros/macro-backtrace-println.stderr @@ -1,5 +1,5 @@ error: 1 positional argument in format string, but no arguments were given - --> $DIR/macro-backtrace-println.rs:24:30 + --> $DIR/macro-backtrace-println.rs:14:30 | LL | ($fmt:expr) => (myprint!(concat!($fmt, "/n"))); //~ ERROR no arguments were given | ^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/macros/macro-comma-behavior.core.stderr b/src/test/ui/macros/macro-comma-behavior.core.stderr index 5ff31f050790e..b3988717b372d 100644 --- a/src/test/ui/macros/macro-comma-behavior.core.stderr +++ b/src/test/ui/macros/macro-comma-behavior.core.stderr @@ -1,41 +1,41 @@ error: 1 positional argument in format string, but no arguments were given - --> $DIR/macro-comma-behavior.rs:27:23 + --> $DIR/macro-comma-behavior.rs:17:23 | LL | assert_eq!(1, 1, "{}",); | ^^ error: 1 positional argument in format string, but no arguments were given - --> $DIR/macro-comma-behavior.rs:30:23 + --> $DIR/macro-comma-behavior.rs:20:23 | LL | assert_ne!(1, 2, "{}",); | ^^ error: 1 positional argument in format string, but no arguments were given - --> $DIR/macro-comma-behavior.rs:36:29 + --> $DIR/macro-comma-behavior.rs:26:29 | LL | debug_assert_eq!(1, 1, "{}",); | ^^ error: 1 positional argument in format string, but no arguments were given - --> $DIR/macro-comma-behavior.rs:39:29 + --> $DIR/macro-comma-behavior.rs:29:29 | LL | debug_assert_ne!(1, 2, "{}",); | ^^ error: 1 positional argument in format string, but no arguments were given - --> $DIR/macro-comma-behavior.rs:60:19 + --> $DIR/macro-comma-behavior.rs:50:19 | LL | format_args!("{}",); | ^^ error: 1 positional argument in format string, but no arguments were given - --> $DIR/macro-comma-behavior.rs:78:21 + --> $DIR/macro-comma-behavior.rs:68:21 | LL | unimplemented!("{}",); | ^^ error: 1 positional argument in format string, but no arguments were given - --> $DIR/macro-comma-behavior.rs:87:24 + --> $DIR/macro-comma-behavior.rs:77:24 | LL | write!(f, "{}",)?; | ^^ diff --git a/src/test/ui/macros/macro-comma-behavior.rs b/src/test/ui/macros/macro-comma-behavior.rs index 620e57b463d1a..7bd4cb0d2e7ca 100644 --- a/src/test/ui/macros/macro-comma-behavior.rs +++ b/src/test/ui/macros/macro-comma-behavior.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Companion test to the similarly-named file in run-pass. // compile-flags: -C debug_assertions=yes diff --git a/src/test/ui/macros/macro-comma-behavior.std.stderr b/src/test/ui/macros/macro-comma-behavior.std.stderr index a87271ed026f9..8759d4efae615 100644 --- a/src/test/ui/macros/macro-comma-behavior.std.stderr +++ b/src/test/ui/macros/macro-comma-behavior.std.stderr @@ -1,59 +1,59 @@ error: 1 positional argument in format string, but no arguments were given - --> $DIR/macro-comma-behavior.rs:27:23 + --> $DIR/macro-comma-behavior.rs:17:23 | LL | assert_eq!(1, 1, "{}",); | ^^ error: 1 positional argument in format string, but no arguments were given - --> $DIR/macro-comma-behavior.rs:30:23 + --> $DIR/macro-comma-behavior.rs:20:23 | LL | assert_ne!(1, 2, "{}",); | ^^ error: 1 positional argument in format string, but no arguments were given - --> $DIR/macro-comma-behavior.rs:36:29 + --> $DIR/macro-comma-behavior.rs:26:29 | LL | debug_assert_eq!(1, 1, "{}",); | ^^ error: 1 positional argument in format string, but no arguments were given - --> $DIR/macro-comma-behavior.rs:39:29 + --> $DIR/macro-comma-behavior.rs:29:29 | LL | debug_assert_ne!(1, 2, "{}",); | ^^ error: 1 positional argument in format string, but no arguments were given - --> $DIR/macro-comma-behavior.rs:44:18 + --> $DIR/macro-comma-behavior.rs:34:18 | LL | eprint!("{}",); | ^^ error: 1 positional argument in format string, but no arguments were given - --> $DIR/macro-comma-behavior.rs:56:18 + --> $DIR/macro-comma-behavior.rs:46:18 | LL | format!("{}",); | ^^ error: 1 positional argument in format string, but no arguments were given - --> $DIR/macro-comma-behavior.rs:60:19 + --> $DIR/macro-comma-behavior.rs:50:19 | LL | format_args!("{}",); | ^^ error: 1 positional argument in format string, but no arguments were given - --> $DIR/macro-comma-behavior.rs:67:17 + --> $DIR/macro-comma-behavior.rs:57:17 | LL | print!("{}",); | ^^ error: 1 positional argument in format string, but no arguments were given - --> $DIR/macro-comma-behavior.rs:78:21 + --> $DIR/macro-comma-behavior.rs:68:21 | LL | unimplemented!("{}",); | ^^ error: 1 positional argument in format string, but no arguments were given - --> $DIR/macro-comma-behavior.rs:87:24 + --> $DIR/macro-comma-behavior.rs:77:24 | LL | write!(f, "{}",)?; | ^^ diff --git a/src/test/ui/macros/macro-comma-support.rs b/src/test/ui/macros/macro-comma-support.rs index e5fe9b4dd7f10..7df5b62339f67 100644 --- a/src/test/ui/macros/macro-comma-support.rs +++ b/src/test/ui/macros/macro-comma-support.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This is a companion to the similarly-named test in run-pass. // // It tests macros that unavoidably produce compile errors. diff --git a/src/test/ui/macros/macro-comma-support.stderr b/src/test/ui/macros/macro-comma-support.stderr index 2ebba22d7a1ca..a4bb8a9b32fb2 100644 --- a/src/test/ui/macros/macro-comma-support.stderr +++ b/src/test/ui/macros/macro-comma-support.stderr @@ -1,11 +1,11 @@ error: lel - --> $DIR/macro-comma-support.rs:16:5 + --> $DIR/macro-comma-support.rs:6:5 | LL | compile_error!("lel"); //~ ERROR lel | ^^^^^^^^^^^^^^^^^^^^^^ error: lel - --> $DIR/macro-comma-support.rs:17:5 + --> $DIR/macro-comma-support.rs:7:5 | LL | compile_error!("lel",); //~ ERROR lel | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/macros/macro-context.rs b/src/test/ui/macros/macro-context.rs index 56b3d5d0defb0..9130c3d921c52 100644 --- a/src/test/ui/macros/macro-context.rs +++ b/src/test/ui/macros/macro-context.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // (typeof used because it's surprisingly hard to find an unparsed token after a stmt) macro_rules! m { () => ( i ; typeof ); //~ ERROR expected expression, found reserved keyword `typeof` diff --git a/src/test/ui/macros/macro-context.stderr b/src/test/ui/macros/macro-context.stderr index b3e67fb2607cd..a08825f9ff65b 100644 --- a/src/test/ui/macros/macro-context.stderr +++ b/src/test/ui/macros/macro-context.stderr @@ -1,41 +1,41 @@ error: macro expansion ignores token `;` and any following - --> $DIR/macro-context.rs:13:15 + --> $DIR/macro-context.rs:3:15 | LL | () => ( i ; typeof ); //~ ERROR expected expression, found reserved keyword `typeof` | ^ | note: caused by the macro expansion here; the usage of `m!` is likely invalid in type context - --> $DIR/macro-context.rs:20:12 + --> $DIR/macro-context.rs:10:12 | LL | let a: m!(); | ^^^^ error: macro expansion ignores token `typeof` and any following - --> $DIR/macro-context.rs:13:17 + --> $DIR/macro-context.rs:3:17 | LL | () => ( i ; typeof ); //~ ERROR expected expression, found reserved keyword `typeof` | ^^^^^^ | note: caused by the macro expansion here; the usage of `m!` is likely invalid in expression context - --> $DIR/macro-context.rs:21:13 + --> $DIR/macro-context.rs:11:13 | LL | let i = m!(); | ^^^^ error: macro expansion ignores token `;` and any following - --> $DIR/macro-context.rs:13:15 + --> $DIR/macro-context.rs:3:15 | LL | () => ( i ; typeof ); //~ ERROR expected expression, found reserved keyword `typeof` | ^ | note: caused by the macro expansion here; the usage of `m!` is likely invalid in pattern context - --> $DIR/macro-context.rs:23:9 + --> $DIR/macro-context.rs:13:9 | LL | m!() => {} | ^^^^ error: expected expression, found reserved keyword `typeof` - --> $DIR/macro-context.rs:13:17 + --> $DIR/macro-context.rs:3:17 | LL | () => ( i ; typeof ); //~ ERROR expected expression, found reserved keyword `typeof` | ^^^^^^ expected expression diff --git a/src/test/ui/macros/macro-crate-nonterminal-non-root.rs b/src/test/ui/macros/macro-crate-nonterminal-non-root.rs index 76211b88bd7c3..67899556f8adf 100644 --- a/src/test/ui/macros/macro-crate-nonterminal-non-root.rs +++ b/src/test/ui/macros/macro-crate-nonterminal-non-root.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:macro_crate_nonterminal.rs mod foo { diff --git a/src/test/ui/macros/macro-crate-nonterminal-non-root.stderr b/src/test/ui/macros/macro-crate-nonterminal-non-root.stderr index 029128ae92a9f..a1af9ba175845 100644 --- a/src/test/ui/macros/macro-crate-nonterminal-non-root.stderr +++ b/src/test/ui/macros/macro-crate-nonterminal-non-root.stderr @@ -1,5 +1,5 @@ error[E0468]: an `extern crate` loading macros must be at the crate root - --> $DIR/macro-crate-nonterminal-non-root.rs:15:5 + --> $DIR/macro-crate-nonterminal-non-root.rs:5:5 | LL | extern crate macro_crate_nonterminal; //~ ERROR must be at the crate root | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/macros/macro-error.rs b/src/test/ui/macros/macro-error.rs index 82a5aa4872913..59ed79e91f09b 100644 --- a/src/test/ui/macros/macro-error.rs +++ b/src/test/ui/macros/macro-error.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! foo { ($a:expr) => a; //~ ERROR macro rhs must be delimited } diff --git a/src/test/ui/macros/macro-error.stderr b/src/test/ui/macros/macro-error.stderr index 42808eb2a6b0d..f56b67e7cd06a 100644 --- a/src/test/ui/macros/macro-error.stderr +++ b/src/test/ui/macros/macro-error.stderr @@ -1,11 +1,11 @@ error: macro rhs must be delimited - --> $DIR/macro-error.rs:12:18 + --> $DIR/macro-error.rs:2:18 | LL | ($a:expr) => a; //~ ERROR macro rhs must be delimited | ^ error: non-type macro in type position: cfg - --> $DIR/macro-error.rs:18:12 + --> $DIR/macro-error.rs:8:12 | LL | let _: cfg!(foo) = (); //~ ERROR non-type macro in type position | ^^^ diff --git a/src/test/ui/macros/macro-expanded-include/foo/mod.rs b/src/test/ui/macros/macro-expanded-include/foo/mod.rs index 888bdf5179a23..a8bfa0299f66f 100644 --- a/src/test/ui/macros/macro-expanded-include/foo/mod.rs +++ b/src/test/ui/macros/macro-expanded-include/foo/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-test macro_rules! m { diff --git a/src/test/ui/macros/macro-expanded-include/test.rs b/src/test/ui/macros/macro-expanded-include/test.rs index 4afb61ab76cf7..0f485f127ea06 100644 --- a/src/test/ui/macros/macro-expanded-include/test.rs +++ b/src/test/ui/macros/macro-expanded-include/test.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten no asm! support #![feature(asm, rustc_attrs)] diff --git a/src/test/ui/macros/macro-expanded-include/test.stderr b/src/test/ui/macros/macro-expanded-include/test.stderr index 3ef0275cfbeec..bc9f391d7d156 100644 --- a/src/test/ui/macros/macro-expanded-include/test.stderr +++ b/src/test/ui/macros/macro-expanded-include/test.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/test.rs:23:1 + --> $DIR/test.rs:13:1 | LL | fn main() {} //~ ERROR compilation successful | ^^^^^^^^^^^^ diff --git a/src/test/ui/macros/macro-expansion-tests.rs b/src/test/ui/macros/macro-expansion-tests.rs index 06f2d86e5d9ba..38f4937c1272c 100644 --- a/src/test/ui/macros/macro-expansion-tests.rs +++ b/src/test/ui/macros/macro-expansion-tests.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_macros)] mod macros_cant_escape_fns { diff --git a/src/test/ui/macros/macro-expansion-tests.stderr b/src/test/ui/macros/macro-expansion-tests.stderr index a3d4f3cd3489f..4ad9ade95a052 100644 --- a/src/test/ui/macros/macro-expansion-tests.stderr +++ b/src/test/ui/macros/macro-expansion-tests.stderr @@ -1,5 +1,5 @@ error: cannot find macro `m!` in this scope - --> $DIR/macro-expansion-tests.rs:17:21 + --> $DIR/macro-expansion-tests.rs:7:21 | LL | fn g() -> i32 { m!() } | ^ @@ -7,7 +7,7 @@ LL | fn g() -> i32 { m!() } = help: have you added the `#[macro_use]` on the module/import? error: cannot find macro `m!` in this scope - --> $DIR/macro-expansion-tests.rs:25:21 + --> $DIR/macro-expansion-tests.rs:15:21 | LL | fn g() -> i32 { m!() } | ^ diff --git a/src/test/ui/macros/macro-follow.rs b/src/test/ui/macros/macro-follow.rs index 6e80e9b574bcf..f4a1931da5aec 100644 --- a/src/test/ui/macros/macro-follow.rs +++ b/src/test/ui/macros/macro-follow.rs @@ -1,12 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // Check the macro follow sets (see corresponding rpass test). diff --git a/src/test/ui/macros/macro-follow.stderr b/src/test/ui/macros/macro-follow.stderr index ccd658af89fbb..39818e396ce43 100644 --- a/src/test/ui/macros/macro-follow.stderr +++ b/src/test/ui/macros/macro-follow.stderr @@ -1,509 +1,509 @@ error: `$p:pat` is followed by `(`, which is not allowed for `pat` fragments - --> $DIR/macro-follow.rs:17:14 + --> $DIR/macro-follow.rs:8:14 | LL | ($p:pat ()) => {}; //~ERROR `$p:pat` is followed by `(` | ^ error: `$p:pat` is followed by `[`, which is not allowed for `pat` fragments - --> $DIR/macro-follow.rs:18:14 + --> $DIR/macro-follow.rs:9:14 | LL | ($p:pat []) => {}; //~ERROR `$p:pat` is followed by `[` | ^ error: `$p:pat` is followed by `{`, which is not allowed for `pat` fragments - --> $DIR/macro-follow.rs:19:14 + --> $DIR/macro-follow.rs:10:14 | LL | ($p:pat {}) => {}; //~ERROR `$p:pat` is followed by `{` | ^ error: `$p:pat` is followed by `:`, which is not allowed for `pat` fragments - --> $DIR/macro-follow.rs:20:13 + --> $DIR/macro-follow.rs:11:13 | LL | ($p:pat :) => {}; //~ERROR `$p:pat` is followed by `:` | ^ error: `$p:pat` is followed by `>`, which is not allowed for `pat` fragments - --> $DIR/macro-follow.rs:21:13 + --> $DIR/macro-follow.rs:12:13 | LL | ($p:pat >) => {}; //~ERROR `$p:pat` is followed by `>` | ^ error: `$p:pat` is followed by `+`, which is not allowed for `pat` fragments - --> $DIR/macro-follow.rs:22:13 + --> $DIR/macro-follow.rs:13:13 | LL | ($p:pat +) => {}; //~ERROR `$p:pat` is followed by `+` | ^ error: `$p:pat` is followed by `ident`, which is not allowed for `pat` fragments - --> $DIR/macro-follow.rs:23:13 + --> $DIR/macro-follow.rs:14:13 | LL | ($p:pat ident) => {}; //~ERROR `$p:pat` is followed by `ident` | ^^^^^ error: `$p:pat` is followed by `$p:pat`, which is not allowed for `pat` fragments - --> $DIR/macro-follow.rs:24:13 + --> $DIR/macro-follow.rs:15:13 | LL | ($p:pat $p:pat) => {}; //~ERROR `$p:pat` is followed by `$p:pat` | ^^^^^^ error: `$p:pat` is followed by `$e:expr`, which is not allowed for `pat` fragments - --> $DIR/macro-follow.rs:25:13 + --> $DIR/macro-follow.rs:16:13 | LL | ($p:pat $e:expr) => {}; //~ERROR `$p:pat` is followed by `$e:expr` | ^^^^^^^ error: `$p:pat` is followed by `$t:ty`, which is not allowed for `pat` fragments - --> $DIR/macro-follow.rs:26:13 + --> $DIR/macro-follow.rs:17:13 | LL | ($p:pat $t:ty) => {}; //~ERROR `$p:pat` is followed by `$t:ty` | ^^^^^ error: `$p:pat` is followed by `$s:stmt`, which is not allowed for `pat` fragments - --> $DIR/macro-follow.rs:27:13 + --> $DIR/macro-follow.rs:18:13 | LL | ($p:pat $s:stmt) => {}; //~ERROR `$p:pat` is followed by `$s:stmt` | ^^^^^^^ error: `$p:pat` is followed by `$p:path`, which is not allowed for `pat` fragments - --> $DIR/macro-follow.rs:28:13 + --> $DIR/macro-follow.rs:19:13 | LL | ($p:pat $p:path) => {}; //~ERROR `$p:pat` is followed by `$p:path` | ^^^^^^^ error: `$p:pat` is followed by `$b:block`, which is not allowed for `pat` fragments - --> $DIR/macro-follow.rs:29:13 + --> $DIR/macro-follow.rs:20:13 | LL | ($p:pat $b:block) => {}; //~ERROR `$p:pat` is followed by `$b:block` | ^^^^^^^^ error: `$p:pat` is followed by `$i:ident`, which is not allowed for `pat` fragments - --> $DIR/macro-follow.rs:30:13 + --> $DIR/macro-follow.rs:21:13 | LL | ($p:pat $i:ident) => {}; //~ERROR `$p:pat` is followed by `$i:ident` | ^^^^^^^^ error: `$p:pat` is followed by `$t:tt`, which is not allowed for `pat` fragments - --> $DIR/macro-follow.rs:31:13 + --> $DIR/macro-follow.rs:22:13 | LL | ($p:pat $t:tt) => {}; //~ERROR `$p:pat` is followed by `$t:tt` | ^^^^^ error: `$p:pat` is followed by `$i:item`, which is not allowed for `pat` fragments - --> $DIR/macro-follow.rs:32:13 + --> $DIR/macro-follow.rs:23:13 | LL | ($p:pat $i:item) => {}; //~ERROR `$p:pat` is followed by `$i:item` | ^^^^^^^ error: `$p:pat` is followed by `$m:meta`, which is not allowed for `pat` fragments - --> $DIR/macro-follow.rs:33:13 + --> $DIR/macro-follow.rs:24:13 | LL | ($p:pat $m:meta) => {}; //~ERROR `$p:pat` is followed by `$m:meta` | ^^^^^^^ error: `$e:expr` is followed by `(`, which is not allowed for `expr` fragments - --> $DIR/macro-follow.rs:37:15 + --> $DIR/macro-follow.rs:28:15 | LL | ($e:expr ()) => {}; //~ERROR `$e:expr` is followed by `(` | ^ error: `$e:expr` is followed by `[`, which is not allowed for `expr` fragments - --> $DIR/macro-follow.rs:38:15 + --> $DIR/macro-follow.rs:29:15 | LL | ($e:expr []) => {}; //~ERROR `$e:expr` is followed by `[` | ^ error: `$e:expr` is followed by `{`, which is not allowed for `expr` fragments - --> $DIR/macro-follow.rs:39:15 + --> $DIR/macro-follow.rs:30:15 | LL | ($e:expr {}) => {}; //~ERROR `$e:expr` is followed by `{` | ^ error: `$e:expr` is followed by `=`, which is not allowed for `expr` fragments - --> $DIR/macro-follow.rs:40:14 + --> $DIR/macro-follow.rs:31:14 | LL | ($e:expr =) => {}; //~ERROR `$e:expr` is followed by `=` | ^ error: `$e:expr` is followed by `|`, which is not allowed for `expr` fragments - --> $DIR/macro-follow.rs:41:14 + --> $DIR/macro-follow.rs:32:14 | LL | ($e:expr |) => {}; //~ERROR `$e:expr` is followed by `|` | ^ error: `$e:expr` is followed by `:`, which is not allowed for `expr` fragments - --> $DIR/macro-follow.rs:42:14 + --> $DIR/macro-follow.rs:33:14 | LL | ($e:expr :) => {}; //~ERROR `$e:expr` is followed by `:` | ^ error: `$e:expr` is followed by `>`, which is not allowed for `expr` fragments - --> $DIR/macro-follow.rs:43:14 + --> $DIR/macro-follow.rs:34:14 | LL | ($e:expr >) => {}; //~ERROR `$e:expr` is followed by `>` | ^ error: `$e:expr` is followed by `+`, which is not allowed for `expr` fragments - --> $DIR/macro-follow.rs:44:14 + --> $DIR/macro-follow.rs:35:14 | LL | ($e:expr +) => {}; //~ERROR `$e:expr` is followed by `+` | ^ error: `$e:expr` is followed by `ident`, which is not allowed for `expr` fragments - --> $DIR/macro-follow.rs:45:14 + --> $DIR/macro-follow.rs:36:14 | LL | ($e:expr ident) => {}; //~ERROR `$e:expr` is followed by `ident` | ^^^^^ error: `$e:expr` is followed by `if`, which is not allowed for `expr` fragments - --> $DIR/macro-follow.rs:46:14 + --> $DIR/macro-follow.rs:37:14 | LL | ($e:expr if) => {}; //~ERROR `$e:expr` is followed by `if` | ^^ error: `$e:expr` is followed by `in`, which is not allowed for `expr` fragments - --> $DIR/macro-follow.rs:47:14 + --> $DIR/macro-follow.rs:38:14 | LL | ($e:expr in) => {}; //~ERROR `$e:expr` is followed by `in` | ^^ error: `$e:expr` is followed by `$p:pat`, which is not allowed for `expr` fragments - --> $DIR/macro-follow.rs:48:14 + --> $DIR/macro-follow.rs:39:14 | LL | ($e:expr $p:pat) => {}; //~ERROR `$e:expr` is followed by `$p:pat` | ^^^^^^ error: `$e:expr` is followed by `$e:expr`, which is not allowed for `expr` fragments - --> $DIR/macro-follow.rs:49:14 + --> $DIR/macro-follow.rs:40:14 | LL | ($e:expr $e:expr) => {}; //~ERROR `$e:expr` is followed by `$e:expr` | ^^^^^^^ error: `$e:expr` is followed by `$t:ty`, which is not allowed for `expr` fragments - --> $DIR/macro-follow.rs:50:14 + --> $DIR/macro-follow.rs:41:14 | LL | ($e:expr $t:ty) => {}; //~ERROR `$e:expr` is followed by `$t:ty` | ^^^^^ error: `$e:expr` is followed by `$s:stmt`, which is not allowed for `expr` fragments - --> $DIR/macro-follow.rs:51:14 + --> $DIR/macro-follow.rs:42:14 | LL | ($e:expr $s:stmt) => {}; //~ERROR `$e:expr` is followed by `$s:stmt` | ^^^^^^^ error: `$e:expr` is followed by `$p:path`, which is not allowed for `expr` fragments - --> $DIR/macro-follow.rs:52:14 + --> $DIR/macro-follow.rs:43:14 | LL | ($e:expr $p:path) => {}; //~ERROR `$e:expr` is followed by `$p:path` | ^^^^^^^ error: `$e:expr` is followed by `$b:block`, which is not allowed for `expr` fragments - --> $DIR/macro-follow.rs:53:14 + --> $DIR/macro-follow.rs:44:14 | LL | ($e:expr $b:block) => {}; //~ERROR `$e:expr` is followed by `$b:block` | ^^^^^^^^ error: `$e:expr` is followed by `$i:ident`, which is not allowed for `expr` fragments - --> $DIR/macro-follow.rs:54:14 + --> $DIR/macro-follow.rs:45:14 | LL | ($e:expr $i:ident) => {}; //~ERROR `$e:expr` is followed by `$i:ident` | ^^^^^^^^ error: `$e:expr` is followed by `$t:tt`, which is not allowed for `expr` fragments - --> $DIR/macro-follow.rs:55:14 + --> $DIR/macro-follow.rs:46:14 | LL | ($e:expr $t:tt) => {}; //~ERROR `$e:expr` is followed by `$t:tt` | ^^^^^ error: `$e:expr` is followed by `$i:item`, which is not allowed for `expr` fragments - --> $DIR/macro-follow.rs:56:14 + --> $DIR/macro-follow.rs:47:14 | LL | ($e:expr $i:item) => {}; //~ERROR `$e:expr` is followed by `$i:item` | ^^^^^^^ error: `$e:expr` is followed by `$m:meta`, which is not allowed for `expr` fragments - --> $DIR/macro-follow.rs:57:14 + --> $DIR/macro-follow.rs:48:14 | LL | ($e:expr $m:meta) => {}; //~ERROR `$e:expr` is followed by `$m:meta` | ^^^^^^^ error: `$t:ty` is followed by `(`, which is not allowed for `ty` fragments - --> $DIR/macro-follow.rs:62:13 + --> $DIR/macro-follow.rs:53:13 | LL | ($t:ty ()) => {}; //~ERROR `$t:ty` is followed by `(` | ^ error: `$t:ty` is followed by `+`, which is not allowed for `ty` fragments - --> $DIR/macro-follow.rs:64:12 + --> $DIR/macro-follow.rs:55:12 | LL | ($t:ty +) => {}; //~ERROR `$t:ty` is followed by `+` | ^ error: `$t:ty` is followed by `ident`, which is not allowed for `ty` fragments - --> $DIR/macro-follow.rs:65:12 + --> $DIR/macro-follow.rs:56:12 | LL | ($t:ty ident) => {}; //~ERROR `$t:ty` is followed by `ident` | ^^^^^ error: `$t:ty` is followed by `if`, which is not allowed for `ty` fragments - --> $DIR/macro-follow.rs:66:12 + --> $DIR/macro-follow.rs:57:12 | LL | ($t:ty if) => {}; //~ERROR `$t:ty` is followed by `if` | ^^ error: `$t:ty` is followed by `$p:pat`, which is not allowed for `ty` fragments - --> $DIR/macro-follow.rs:67:12 + --> $DIR/macro-follow.rs:58:12 | LL | ($t:ty $p:pat) => {}; //~ERROR `$t:ty` is followed by `$p:pat` | ^^^^^^ error: `$t:ty` is followed by `$e:expr`, which is not allowed for `ty` fragments - --> $DIR/macro-follow.rs:68:12 + --> $DIR/macro-follow.rs:59:12 | LL | ($t:ty $e:expr) => {}; //~ERROR `$t:ty` is followed by `$e:expr` | ^^^^^^^ error: `$t:ty` is followed by `$t:ty`, which is not allowed for `ty` fragments - --> $DIR/macro-follow.rs:69:12 + --> $DIR/macro-follow.rs:60:12 | LL | ($t:ty $t:ty) => {}; //~ERROR `$t:ty` is followed by `$t:ty` | ^^^^^ error: `$t:ty` is followed by `$s:stmt`, which is not allowed for `ty` fragments - --> $DIR/macro-follow.rs:70:12 + --> $DIR/macro-follow.rs:61:12 | LL | ($t:ty $s:stmt) => {}; //~ERROR `$t:ty` is followed by `$s:stmt` | ^^^^^^^ error: `$t:ty` is followed by `$p:path`, which is not allowed for `ty` fragments - --> $DIR/macro-follow.rs:71:12 + --> $DIR/macro-follow.rs:62:12 | LL | ($t:ty $p:path) => {}; //~ERROR `$t:ty` is followed by `$p:path` | ^^^^^^^ error: `$t:ty` is followed by `$i:ident`, which is not allowed for `ty` fragments - --> $DIR/macro-follow.rs:73:12 + --> $DIR/macro-follow.rs:64:12 | LL | ($t:ty $i:ident) => {}; //~ERROR `$t:ty` is followed by `$i:ident` | ^^^^^^^^ error: `$t:ty` is followed by `$t:tt`, which is not allowed for `ty` fragments - --> $DIR/macro-follow.rs:74:12 + --> $DIR/macro-follow.rs:65:12 | LL | ($t:ty $t:tt) => {}; //~ERROR `$t:ty` is followed by `$t:tt` | ^^^^^ error: `$t:ty` is followed by `$i:item`, which is not allowed for `ty` fragments - --> $DIR/macro-follow.rs:75:12 + --> $DIR/macro-follow.rs:66:12 | LL | ($t:ty $i:item) => {}; //~ERROR `$t:ty` is followed by `$i:item` | ^^^^^^^ error: `$t:ty` is followed by `$m:meta`, which is not allowed for `ty` fragments - --> $DIR/macro-follow.rs:76:12 + --> $DIR/macro-follow.rs:67:12 | LL | ($t:ty $m:meta) => {}; //~ERROR `$t:ty` is followed by `$m:meta` | ^^^^^^^ error: `$s:stmt` is followed by `(`, which is not allowed for `stmt` fragments - --> $DIR/macro-follow.rs:80:15 + --> $DIR/macro-follow.rs:71:15 | LL | ($s:stmt ()) => {}; //~ERROR `$s:stmt` is followed by `(` | ^ error: `$s:stmt` is followed by `[`, which is not allowed for `stmt` fragments - --> $DIR/macro-follow.rs:81:15 + --> $DIR/macro-follow.rs:72:15 | LL | ($s:stmt []) => {}; //~ERROR `$s:stmt` is followed by `[` | ^ error: `$s:stmt` is followed by `{`, which is not allowed for `stmt` fragments - --> $DIR/macro-follow.rs:82:15 + --> $DIR/macro-follow.rs:73:15 | LL | ($s:stmt {}) => {}; //~ERROR `$s:stmt` is followed by `{` | ^ error: `$s:stmt` is followed by `=`, which is not allowed for `stmt` fragments - --> $DIR/macro-follow.rs:83:14 + --> $DIR/macro-follow.rs:74:14 | LL | ($s:stmt =) => {}; //~ERROR `$s:stmt` is followed by `=` | ^ error: `$s:stmt` is followed by `|`, which is not allowed for `stmt` fragments - --> $DIR/macro-follow.rs:84:14 + --> $DIR/macro-follow.rs:75:14 | LL | ($s:stmt |) => {}; //~ERROR `$s:stmt` is followed by `|` | ^ error: `$s:stmt` is followed by `:`, which is not allowed for `stmt` fragments - --> $DIR/macro-follow.rs:85:14 + --> $DIR/macro-follow.rs:76:14 | LL | ($s:stmt :) => {}; //~ERROR `$s:stmt` is followed by `:` | ^ error: `$s:stmt` is followed by `>`, which is not allowed for `stmt` fragments - --> $DIR/macro-follow.rs:86:14 + --> $DIR/macro-follow.rs:77:14 | LL | ($s:stmt >) => {}; //~ERROR `$s:stmt` is followed by `>` | ^ error: `$s:stmt` is followed by `+`, which is not allowed for `stmt` fragments - --> $DIR/macro-follow.rs:87:14 + --> $DIR/macro-follow.rs:78:14 | LL | ($s:stmt +) => {}; //~ERROR `$s:stmt` is followed by `+` | ^ error: `$s:stmt` is followed by `ident`, which is not allowed for `stmt` fragments - --> $DIR/macro-follow.rs:88:14 + --> $DIR/macro-follow.rs:79:14 | LL | ($s:stmt ident) => {}; //~ERROR `$s:stmt` is followed by `ident` | ^^^^^ error: `$s:stmt` is followed by `if`, which is not allowed for `stmt` fragments - --> $DIR/macro-follow.rs:89:14 + --> $DIR/macro-follow.rs:80:14 | LL | ($s:stmt if) => {}; //~ERROR `$s:stmt` is followed by `if` | ^^ error: `$s:stmt` is followed by `in`, which is not allowed for `stmt` fragments - --> $DIR/macro-follow.rs:90:14 + --> $DIR/macro-follow.rs:81:14 | LL | ($s:stmt in) => {}; //~ERROR `$s:stmt` is followed by `in` | ^^ error: `$s:stmt` is followed by `$p:pat`, which is not allowed for `stmt` fragments - --> $DIR/macro-follow.rs:91:14 + --> $DIR/macro-follow.rs:82:14 | LL | ($s:stmt $p:pat) => {}; //~ERROR `$s:stmt` is followed by `$p:pat` | ^^^^^^ error: `$s:stmt` is followed by `$e:expr`, which is not allowed for `stmt` fragments - --> $DIR/macro-follow.rs:92:14 + --> $DIR/macro-follow.rs:83:14 | LL | ($s:stmt $e:expr) => {}; //~ERROR `$s:stmt` is followed by `$e:expr` | ^^^^^^^ error: `$s:stmt` is followed by `$t:ty`, which is not allowed for `stmt` fragments - --> $DIR/macro-follow.rs:93:14 + --> $DIR/macro-follow.rs:84:14 | LL | ($s:stmt $t:ty) => {}; //~ERROR `$s:stmt` is followed by `$t:ty` | ^^^^^ error: `$s:stmt` is followed by `$s:stmt`, which is not allowed for `stmt` fragments - --> $DIR/macro-follow.rs:94:14 + --> $DIR/macro-follow.rs:85:14 | LL | ($s:stmt $s:stmt) => {}; //~ERROR `$s:stmt` is followed by `$s:stmt` | ^^^^^^^ error: `$s:stmt` is followed by `$p:path`, which is not allowed for `stmt` fragments - --> $DIR/macro-follow.rs:95:14 + --> $DIR/macro-follow.rs:86:14 | LL | ($s:stmt $p:path) => {}; //~ERROR `$s:stmt` is followed by `$p:path` | ^^^^^^^ error: `$s:stmt` is followed by `$b:block`, which is not allowed for `stmt` fragments - --> $DIR/macro-follow.rs:96:14 + --> $DIR/macro-follow.rs:87:14 | LL | ($s:stmt $b:block) => {}; //~ERROR `$s:stmt` is followed by `$b:block` | ^^^^^^^^ error: `$s:stmt` is followed by `$i:ident`, which is not allowed for `stmt` fragments - --> $DIR/macro-follow.rs:97:14 + --> $DIR/macro-follow.rs:88:14 | LL | ($s:stmt $i:ident) => {}; //~ERROR `$s:stmt` is followed by `$i:ident` | ^^^^^^^^ error: `$s:stmt` is followed by `$t:tt`, which is not allowed for `stmt` fragments - --> $DIR/macro-follow.rs:98:14 + --> $DIR/macro-follow.rs:89:14 | LL | ($s:stmt $t:tt) => {}; //~ERROR `$s:stmt` is followed by `$t:tt` | ^^^^^ error: `$s:stmt` is followed by `$i:item`, which is not allowed for `stmt` fragments - --> $DIR/macro-follow.rs:99:14 + --> $DIR/macro-follow.rs:90:14 | LL | ($s:stmt $i:item) => {}; //~ERROR `$s:stmt` is followed by `$i:item` | ^^^^^^^ error: `$s:stmt` is followed by `$m:meta`, which is not allowed for `stmt` fragments - --> $DIR/macro-follow.rs:100:14 + --> $DIR/macro-follow.rs:91:14 | LL | ($s:stmt $m:meta) => {}; //~ERROR `$s:stmt` is followed by `$m:meta` | ^^^^^^^ error: `$p:path` is followed by `(`, which is not allowed for `path` fragments - --> $DIR/macro-follow.rs:104:15 + --> $DIR/macro-follow.rs:95:15 | LL | ($p:path ()) => {}; //~ERROR `$p:path` is followed by `(` | ^ error: `$p:path` is followed by `+`, which is not allowed for `path` fragments - --> $DIR/macro-follow.rs:106:14 + --> $DIR/macro-follow.rs:97:14 | LL | ($p:path +) => {}; //~ERROR `$p:path` is followed by `+` | ^ error: `$p:path` is followed by `ident`, which is not allowed for `path` fragments - --> $DIR/macro-follow.rs:107:14 + --> $DIR/macro-follow.rs:98:14 | LL | ($p:path ident) => {}; //~ERROR `$p:path` is followed by `ident` | ^^^^^ error: `$p:path` is followed by `if`, which is not allowed for `path` fragments - --> $DIR/macro-follow.rs:108:14 + --> $DIR/macro-follow.rs:99:14 | LL | ($p:path if) => {}; //~ERROR `$p:path` is followed by `if` | ^^ error: `$p:path` is followed by `$p:pat`, which is not allowed for `path` fragments - --> $DIR/macro-follow.rs:109:14 + --> $DIR/macro-follow.rs:100:14 | LL | ($p:path $p:pat) => {}; //~ERROR `$p:path` is followed by `$p:pat` | ^^^^^^ error: `$p:path` is followed by `$e:expr`, which is not allowed for `path` fragments - --> $DIR/macro-follow.rs:110:14 + --> $DIR/macro-follow.rs:101:14 | LL | ($p:path $e:expr) => {}; //~ERROR `$p:path` is followed by `$e:expr` | ^^^^^^^ error: `$p:path` is followed by `$t:ty`, which is not allowed for `path` fragments - --> $DIR/macro-follow.rs:111:14 + --> $DIR/macro-follow.rs:102:14 | LL | ($p:path $t:ty) => {}; //~ERROR `$p:path` is followed by `$t:ty` | ^^^^^ error: `$p:path` is followed by `$s:stmt`, which is not allowed for `path` fragments - --> $DIR/macro-follow.rs:112:14 + --> $DIR/macro-follow.rs:103:14 | LL | ($p:path $s:stmt) => {}; //~ERROR `$p:path` is followed by `$s:stmt` | ^^^^^^^ error: `$p:path` is followed by `$p:path`, which is not allowed for `path` fragments - --> $DIR/macro-follow.rs:113:14 + --> $DIR/macro-follow.rs:104:14 | LL | ($p:path $p:path) => {}; //~ERROR `$p:path` is followed by `$p:path` | ^^^^^^^ error: `$p:path` is followed by `$i:ident`, which is not allowed for `path` fragments - --> $DIR/macro-follow.rs:115:14 + --> $DIR/macro-follow.rs:106:14 | LL | ($p:path $i:ident) => {}; //~ERROR `$p:path` is followed by `$i:ident` | ^^^^^^^^ error: `$p:path` is followed by `$t:tt`, which is not allowed for `path` fragments - --> $DIR/macro-follow.rs:116:14 + --> $DIR/macro-follow.rs:107:14 | LL | ($p:path $t:tt) => {}; //~ERROR `$p:path` is followed by `$t:tt` | ^^^^^ error: `$p:path` is followed by `$i:item`, which is not allowed for `path` fragments - --> $DIR/macro-follow.rs:117:14 + --> $DIR/macro-follow.rs:108:14 | LL | ($p:path $i:item) => {}; //~ERROR `$p:path` is followed by `$i:item` | ^^^^^^^ error: `$p:path` is followed by `$m:meta`, which is not allowed for `path` fragments - --> $DIR/macro-follow.rs:118:14 + --> $DIR/macro-follow.rs:109:14 | LL | ($p:path $m:meta) => {}; //~ERROR `$p:path` is followed by `$m:meta` | ^^^^^^^ diff --git a/src/test/ui/macros/macro-followed-by-seq-bad.rs b/src/test/ui/macros/macro-followed-by-seq-bad.rs index 21cc946ded605..b73742f77ea58 100644 --- a/src/test/ui/macros/macro-followed-by-seq-bad.rs +++ b/src/test/ui/macros/macro-followed-by-seq-bad.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #25436: check that things which can be // followed by any token also permit X* to come afterwards. diff --git a/src/test/ui/macros/macro-followed-by-seq-bad.stderr b/src/test/ui/macros/macro-followed-by-seq-bad.stderr index bb070334d36e9..9505e678ff362 100644 --- a/src/test/ui/macros/macro-followed-by-seq-bad.stderr +++ b/src/test/ui/macros/macro-followed-by-seq-bad.stderr @@ -1,11 +1,11 @@ error: `$a:expr` is followed by `$b:tt`, which is not allowed for `expr` fragments - --> $DIR/macro-followed-by-seq-bad.rs:17:15 + --> $DIR/macro-followed-by-seq-bad.rs:7:15 | LL | ( $a:expr $($b:tt)* ) => { }; //~ ERROR not allowed for `expr` fragments | ^^^^^ error: `$a:ty` is followed by `$b:tt`, which is not allowed for `ty` fragments - --> $DIR/macro-followed-by-seq-bad.rs:18:13 + --> $DIR/macro-followed-by-seq-bad.rs:8:13 | LL | ( $a:ty $($b:tt)* ) => { }; //~ ERROR not allowed for `ty` fragments | ^^^^^ diff --git a/src/test/ui/macros/macro-inner-attributes.rs b/src/test/ui/macros/macro-inner-attributes.rs index 1111b21d4550c..4d65f93bb45c9 100644 --- a/src/test/ui/macros/macro-inner-attributes.rs +++ b/src/test/ui/macros/macro-inner-attributes.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(custom_attribute)] macro_rules! test { ($nm:ident, diff --git a/src/test/ui/macros/macro-inner-attributes.stderr b/src/test/ui/macros/macro-inner-attributes.stderr index 11922bc448bc4..7dc889d5aaef3 100644 --- a/src/test/ui/macros/macro-inner-attributes.stderr +++ b/src/test/ui/macros/macro-inner-attributes.stderr @@ -1,5 +1,5 @@ error[E0433]: failed to resolve. Use of undeclared type or module `a` - --> $DIR/macro-inner-attributes.rs:27:5 + --> $DIR/macro-inner-attributes.rs:17:5 | LL | a::bar(); | ^ Use of undeclared type or module `a` diff --git a/src/test/ui/macros/macro-input-future-proofing.rs b/src/test/ui/macros/macro-input-future-proofing.rs index e5fdba63b0f15..9a5bdb08a8ec8 100644 --- a/src/test/ui/macros/macro-input-future-proofing.rs +++ b/src/test/ui/macros/macro-input-future-proofing.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_macros)] macro_rules! errors_everywhere { diff --git a/src/test/ui/macros/macro-input-future-proofing.stderr b/src/test/ui/macros/macro-input-future-proofing.stderr index aed7a8a119ced..4c79ae66b8609 100644 --- a/src/test/ui/macros/macro-input-future-proofing.stderr +++ b/src/test/ui/macros/macro-input-future-proofing.stderr @@ -1,53 +1,53 @@ error: `$ty:ty` is followed by `<`, which is not allowed for `ty` fragments - --> $DIR/macro-input-future-proofing.rs:14:13 + --> $DIR/macro-input-future-proofing.rs:4:13 | LL | ($ty:ty <) => (); //~ ERROR `$ty:ty` is followed by `<`, which is not allowed for `ty` | ^ error: `$ty:ty` is followed by `<`, which is not allowed for `ty` fragments - --> $DIR/macro-input-future-proofing.rs:15:13 + --> $DIR/macro-input-future-proofing.rs:5:13 | LL | ($ty:ty < foo ,) => (); //~ ERROR `$ty:ty` is followed by `<`, which is not allowed for `ty` | ^ error: `$pa:pat` is followed by `>`, which is not allowed for `pat` fragments - --> $DIR/macro-input-future-proofing.rs:21:14 + --> $DIR/macro-input-future-proofing.rs:11:14 | LL | ($pa:pat >) => (); //~ ERROR `$pa:pat` is followed by `>`, which is not allowed for `pat` | ^ error: `$pa:pat` is followed by `$pb:pat`, which is not allowed for `pat` fragments - --> $DIR/macro-input-future-proofing.rs:23:14 + --> $DIR/macro-input-future-proofing.rs:13:14 | LL | ($pa:pat $pb:pat $ty:ty ,) => (); | ^^^^^^^ error: `$pb:pat` is followed by `$ty:ty`, which is not allowed for `pat` fragments - --> $DIR/macro-input-future-proofing.rs:23:22 + --> $DIR/macro-input-future-proofing.rs:13:22 | LL | ($pa:pat $pb:pat $ty:ty ,) => (); | ^^^^^^ error: `$ty:ty` is followed by `-`, which is not allowed for `ty` fragments - --> $DIR/macro-input-future-proofing.rs:26:17 + --> $DIR/macro-input-future-proofing.rs:16:17 | LL | ($($ty:ty)* -) => (); //~ ERROR `$ty:ty` is followed by `-` | ^ error: `$b:ty` is followed by `-`, which is not allowed for `ty` fragments - --> $DIR/macro-input-future-proofing.rs:27:23 + --> $DIR/macro-input-future-proofing.rs:17:23 | LL | ($($a:ty, $b:ty)* -) => (); //~ ERROR `$b:ty` is followed by `-` | ^ error: `$ty:ty` is followed by `-`, which is not allowed for `ty` fragments - --> $DIR/macro-input-future-proofing.rs:28:7 + --> $DIR/macro-input-future-proofing.rs:18:7 | LL | ($($ty:ty)-+) => (); //~ ERROR `$ty:ty` is followed by `-`, which is not allowed for `ty` | ^^^^^^^^ error: `$a:expr` is followed by `$b:tt`, which is not allowed for `expr` fragments - --> $DIR/macro-input-future-proofing.rs:29:21 + --> $DIR/macro-input-future-proofing.rs:19:21 | LL | ( $($a:expr)* $($b:tt)* ) => { }; | ^^^^^ diff --git a/src/test/ui/macros/macro-invalid-fragment-spec.rs b/src/test/ui/macros/macro-invalid-fragment-spec.rs index 630e481f75ed0..dc4d75096af8b 100644 --- a/src/test/ui/macros/macro-invalid-fragment-spec.rs +++ b/src/test/ui/macros/macro-invalid-fragment-spec.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! foo( ($x:foo) => () //~^ ERROR invalid fragment specifier diff --git a/src/test/ui/macros/macro-invalid-fragment-spec.stderr b/src/test/ui/macros/macro-invalid-fragment-spec.stderr index 765621f51d4fd..1f95a3dc579d1 100644 --- a/src/test/ui/macros/macro-invalid-fragment-spec.stderr +++ b/src/test/ui/macros/macro-invalid-fragment-spec.stderr @@ -1,5 +1,5 @@ error: invalid fragment specifier `foo` - --> $DIR/macro-invalid-fragment-spec.rs:12:6 + --> $DIR/macro-invalid-fragment-spec.rs:2:6 | LL | ($x:foo) => () | ^^^^^^ diff --git a/src/test/ui/macros/macro-local-data-key-priv.rs b/src/test/ui/macros/macro-local-data-key-priv.rs index 3ae629cd89529..2e4f88f9aa9d5 100644 --- a/src/test/ui/macros/macro-local-data-key-priv.rs +++ b/src/test/ui/macros/macro-local-data-key-priv.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // check that the local data keys are private by default. mod bar { diff --git a/src/test/ui/macros/macro-local-data-key-priv.stderr b/src/test/ui/macros/macro-local-data-key-priv.stderr index 57f4f790cb11c..d87eddb06f945 100644 --- a/src/test/ui/macros/macro-local-data-key-priv.stderr +++ b/src/test/ui/macros/macro-local-data-key-priv.stderr @@ -1,5 +1,5 @@ error[E0603]: constant `baz` is private - --> $DIR/macro-local-data-key-priv.rs:18:5 + --> $DIR/macro-local-data-key-priv.rs:8:5 | LL | bar::baz.with(|_| ()); | ^^^^^^^^ diff --git a/src/test/ui/macros/macro-match-nonterminal.rs b/src/test/ui/macros/macro-match-nonterminal.rs index 6cca729e2c286..6d4b32c9bc9a0 100644 --- a/src/test/ui/macros/macro-match-nonterminal.rs +++ b/src/test/ui/macros/macro-match-nonterminal.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! test { ($a, $b) => (()); } //~ ERROR missing fragment fn main() { diff --git a/src/test/ui/macros/macro-match-nonterminal.stderr b/src/test/ui/macros/macro-match-nonterminal.stderr index 26648c443cb12..15eafbde0a23d 100644 --- a/src/test/ui/macros/macro-match-nonterminal.stderr +++ b/src/test/ui/macros/macro-match-nonterminal.stderr @@ -1,5 +1,5 @@ error: missing fragment specifier - --> $DIR/macro-match-nonterminal.rs:11:24 + --> $DIR/macro-match-nonterminal.rs:1:24 | LL | macro_rules! test { ($a, $b) => (()); } //~ ERROR missing fragment | ^ diff --git a/src/test/ui/macros/macro-missing-delimiters.rs b/src/test/ui/macros/macro-missing-delimiters.rs index eed2a207e89ef..290d7615e60a4 100644 --- a/src/test/ui/macros/macro-missing-delimiters.rs +++ b/src/test/ui/macros/macro-missing-delimiters.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! baz( baz => () //~ ERROR invalid macro matcher; ); diff --git a/src/test/ui/macros/macro-missing-delimiters.stderr b/src/test/ui/macros/macro-missing-delimiters.stderr index eb43e39ea56bb..63cf1826f7721 100644 --- a/src/test/ui/macros/macro-missing-delimiters.stderr +++ b/src/test/ui/macros/macro-missing-delimiters.stderr @@ -1,5 +1,5 @@ error: invalid macro matcher; matchers must be contained in balanced delimiters - --> $DIR/macro-missing-delimiters.rs:12:5 + --> $DIR/macro-missing-delimiters.rs:2:5 | LL | baz => () //~ ERROR invalid macro matcher; | ^^^ diff --git a/src/test/ui/macros/macro-missing-fragment.rs b/src/test/ui/macros/macro-missing-fragment.rs index 66f4ce55be8e3..1d0b0889b4cef 100644 --- a/src/test/ui/macros/macro-missing-fragment.rs +++ b/src/test/ui/macros/macro-missing-fragment.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! m { ( $( any_token $field_rust_type )* ) => {}; //~ ERROR missing fragment } diff --git a/src/test/ui/macros/macro-missing-fragment.stderr b/src/test/ui/macros/macro-missing-fragment.stderr index 48e07ed9dbdbb..8c4026760ca1c 100644 --- a/src/test/ui/macros/macro-missing-fragment.stderr +++ b/src/test/ui/macros/macro-missing-fragment.stderr @@ -1,5 +1,5 @@ error: missing fragment specifier - --> $DIR/macro-missing-fragment.rs:12:20 + --> $DIR/macro-missing-fragment.rs:2:20 | LL | ( $( any_token $field_rust_type )* ) => {}; //~ ERROR missing fragment | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/macros/macro-name-typo.rs b/src/test/ui/macros/macro-name-typo.rs index 7fadbf2a90bba..1ddc419d302ac 100644 --- a/src/test/ui/macros/macro-name-typo.rs +++ b/src/test/ui/macros/macro-name-typo.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { printlx!("oh noes!"); //~ ERROR cannot find } diff --git a/src/test/ui/macros/macro-name-typo.stderr b/src/test/ui/macros/macro-name-typo.stderr index 4152d2eb96ea3..5af9828fd9820 100644 --- a/src/test/ui/macros/macro-name-typo.stderr +++ b/src/test/ui/macros/macro-name-typo.stderr @@ -1,5 +1,5 @@ error: cannot find macro `printlx!` in this scope - --> $DIR/macro-name-typo.rs:12:5 + --> $DIR/macro-name-typo.rs:2:5 | LL | printlx!("oh noes!"); //~ ERROR cannot find | ^^^^^^^ help: you could try the macro: `println` diff --git a/src/test/ui/macros/macro-non-lifetime.rs b/src/test/ui/macros/macro-non-lifetime.rs index 647d7aaa759c3..c74aaf42bf21b 100644 --- a/src/test/ui/macros/macro-non-lifetime.rs +++ b/src/test/ui/macros/macro-non-lifetime.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test for issue #50381: non-lifetime passed to :lifetime. #![feature(macro_lifetime_matcher)] diff --git a/src/test/ui/macros/macro-non-lifetime.stderr b/src/test/ui/macros/macro-non-lifetime.stderr index 93b7f481842ac..30bb7800e0362 100644 --- a/src/test/ui/macros/macro-non-lifetime.stderr +++ b/src/test/ui/macros/macro-non-lifetime.stderr @@ -1,5 +1,5 @@ error: no rules expected the token `a` - --> $DIR/macro-non-lifetime.rs:18:8 + --> $DIR/macro-non-lifetime.rs:8:8 | LL | m!(a); | ^ diff --git a/src/test/ui/macros/macro-outer-attributes.rs b/src/test/ui/macros/macro-outer-attributes.rs index acb58596fe45a..aa70060425f65 100644 --- a/src/test/ui/macros/macro-outer-attributes.rs +++ b/src/test/ui/macros/macro-outer-attributes.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(custom_attribute)] macro_rules! test { ($nm:ident, diff --git a/src/test/ui/macros/macro-outer-attributes.stderr b/src/test/ui/macros/macro-outer-attributes.stderr index 4cc8cd5dc90e8..f9413250076b2 100644 --- a/src/test/ui/macros/macro-outer-attributes.stderr +++ b/src/test/ui/macros/macro-outer-attributes.stderr @@ -1,5 +1,5 @@ error[E0425]: cannot find function `bar` in module `a` - --> $DIR/macro-outer-attributes.rs:28:8 + --> $DIR/macro-outer-attributes.rs:18:8 | LL | a::bar(); //~ ERROR cannot find function `bar` in module `a` | ^^^ not found in `a` diff --git a/src/test/ui/macros/macro-parameter-span.rs b/src/test/ui/macros/macro-parameter-span.rs index 3b168fec953f2..5609f84e141b6 100644 --- a/src/test/ui/macros/macro-parameter-span.rs +++ b/src/test/ui/macros/macro-parameter-span.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! foo { ($id: ident) => { $id diff --git a/src/test/ui/macros/macro-parameter-span.stderr b/src/test/ui/macros/macro-parameter-span.stderr index 749221e9bf0b5..c7dcb12d3d109 100644 --- a/src/test/ui/macros/macro-parameter-span.stderr +++ b/src/test/ui/macros/macro-parameter-span.stderr @@ -1,5 +1,5 @@ error[E0425]: cannot find value `x` in this scope - --> $DIR/macro-parameter-span.rs:21:9 + --> $DIR/macro-parameter-span.rs:11:9 | LL | x //~ ERROR cannot find value `x` in this scope | ^ not found in this scope diff --git a/src/test/ui/macros/macro-path-prelude-fail-1.rs b/src/test/ui/macros/macro-path-prelude-fail-1.rs index e1181eb741bf9..fe56ce489f004 100644 --- a/src/test/ui/macros/macro-path-prelude-fail-1.rs +++ b/src/test/ui/macros/macro-path-prelude-fail-1.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(extern_prelude)] mod m { diff --git a/src/test/ui/macros/macro-path-prelude-fail-1.stderr b/src/test/ui/macros/macro-path-prelude-fail-1.stderr index fc74937d91200..db512e7f6d436 100644 --- a/src/test/ui/macros/macro-path-prelude-fail-1.stderr +++ b/src/test/ui/macros/macro-path-prelude-fail-1.stderr @@ -1,11 +1,11 @@ error[E0433]: failed to resolve. Not a module `Vec` - --> $DIR/macro-path-prelude-fail-1.rs:15:9 + --> $DIR/macro-path-prelude-fail-1.rs:5:9 | LL | Vec::clone!(); //~ ERROR failed to resolve. Not a module `Vec` | ^^^ Not a module `Vec` error[E0433]: failed to resolve. Not a module `u8` - --> $DIR/macro-path-prelude-fail-1.rs:16:9 + --> $DIR/macro-path-prelude-fail-1.rs:6:9 | LL | u8::clone!(); //~ ERROR failed to resolve. Not a module `u8` | ^^ Not a module `u8` diff --git a/src/test/ui/macros/macro-path-prelude-fail-2.rs b/src/test/ui/macros/macro-path-prelude-fail-2.rs index 82258dac37b86..c9f72b9801c02 100644 --- a/src/test/ui/macros/macro-path-prelude-fail-2.rs +++ b/src/test/ui/macros/macro-path-prelude-fail-2.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod m { fn check() { Result::Ok!(); //~ ERROR fail to resolve non-ident macro path diff --git a/src/test/ui/macros/macro-path-prelude-fail-2.stderr b/src/test/ui/macros/macro-path-prelude-fail-2.stderr index 876ee2584e9aa..7d0b9e37abc43 100644 --- a/src/test/ui/macros/macro-path-prelude-fail-2.stderr +++ b/src/test/ui/macros/macro-path-prelude-fail-2.stderr @@ -1,5 +1,5 @@ error: fail to resolve non-ident macro path - --> $DIR/macro-path-prelude-fail-2.rs:13:9 + --> $DIR/macro-path-prelude-fail-2.rs:3:9 | LL | Result::Ok!(); //~ ERROR fail to resolve non-ident macro path | ^^^^^^^^^^ diff --git a/src/test/ui/macros/macro-path-prelude-fail-3.rs b/src/test/ui/macros/macro-path-prelude-fail-3.rs index c706b8f613dd7..510e7940a0337 100644 --- a/src/test/ui/macros/macro-path-prelude-fail-3.rs +++ b/src/test/ui/macros/macro-path-prelude-fail-3.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(inline)] //~ ERROR cannot find derive macro `inline` in this scope struct S; diff --git a/src/test/ui/macros/macro-path-prelude-fail-3.stderr b/src/test/ui/macros/macro-path-prelude-fail-3.stderr index a8edf54d22048..8776c272da905 100644 --- a/src/test/ui/macros/macro-path-prelude-fail-3.stderr +++ b/src/test/ui/macros/macro-path-prelude-fail-3.stderr @@ -1,11 +1,11 @@ error: cannot find derive macro `inline` in this scope - --> $DIR/macro-path-prelude-fail-3.rs:11:10 + --> $DIR/macro-path-prelude-fail-3.rs:1:10 | LL | #[derive(inline)] //~ ERROR cannot find derive macro `inline` in this scope | ^^^^^^ error: cannot find macro `inline!` in this scope - --> $DIR/macro-path-prelude-fail-3.rs:15:5 + --> $DIR/macro-path-prelude-fail-3.rs:5:5 | LL | inline!(); //~ ERROR cannot find macro `inline!` in this scope | ^^^^^^ help: you could try the macro: `line` diff --git a/src/test/ui/macros/macro-path-prelude-pass.rs b/src/test/ui/macros/macro-path-prelude-pass.rs index 1f281d4a68603..3d35d53f777db 100644 --- a/src/test/ui/macros/macro-path-prelude-pass.rs +++ b/src/test/ui/macros/macro-path-prelude-pass.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![feature(extern_prelude)] diff --git a/src/test/ui/macros/macro-path-prelude-shadowing.rs b/src/test/ui/macros/macro-path-prelude-shadowing.rs index 6831cd81d7dae..600b55c64d460 100644 --- a/src/test/ui/macros/macro-path-prelude-shadowing.rs +++ b/src/test/ui/macros/macro-path-prelude-shadowing.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:macro-in-other-crate.rs #![feature(decl_macro, extern_prelude)] diff --git a/src/test/ui/macros/macro-path-prelude-shadowing.stderr b/src/test/ui/macros/macro-path-prelude-shadowing.stderr index c0892f97376e3..fa1e57cecce59 100644 --- a/src/test/ui/macros/macro-path-prelude-shadowing.stderr +++ b/src/test/ui/macros/macro-path-prelude-shadowing.stderr @@ -1,16 +1,16 @@ error[E0659]: `std` is ambiguous - --> $DIR/macro-path-prelude-shadowing.rs:39:9 + --> $DIR/macro-path-prelude-shadowing.rs:29:9 | LL | std::panic!(); //~ ERROR `std` is ambiguous | ^^^^^^^^^^ | note: `std` could refer to the name imported here - --> $DIR/macro-path-prelude-shadowing.rs:37:9 + --> $DIR/macro-path-prelude-shadowing.rs:27:9 | LL | use m2::*; // glob-import user-defined `std` | ^^^^^ note: `std` could also refer to the name defined here - --> $DIR/macro-path-prelude-shadowing.rs:39:9 + --> $DIR/macro-path-prelude-shadowing.rs:29:9 | LL | std::panic!(); //~ ERROR `std` is ambiguous | ^^^ diff --git a/src/test/ui/macros/macro-reexport-removed.rs b/src/test/ui/macros/macro-reexport-removed.rs index bab583da37b4d..fb33794a5ca06 100644 --- a/src/test/ui/macros/macro-reexport-removed.rs +++ b/src/test/ui/macros/macro-reexport-removed.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:two_macros.rs #![feature(macro_reexport)] //~ ERROR feature has been removed diff --git a/src/test/ui/macros/macro-reexport-removed.stderr b/src/test/ui/macros/macro-reexport-removed.stderr index 8f954158a6315..7c3555a92ed8b 100644 --- a/src/test/ui/macros/macro-reexport-removed.stderr +++ b/src/test/ui/macros/macro-reexport-removed.stderr @@ -1,17 +1,17 @@ error[E0557]: feature has been removed - --> $DIR/macro-reexport-removed.rs:13:12 + --> $DIR/macro-reexport-removed.rs:3:12 | LL | #![feature(macro_reexport)] //~ ERROR feature has been removed | ^^^^^^^^^^^^^^ | note: subsumed by `pub use` - --> $DIR/macro-reexport-removed.rs:13:12 + --> $DIR/macro-reexport-removed.rs:3:12 | LL | #![feature(macro_reexport)] //~ ERROR feature has been removed | ^^^^^^^^^^^^^^ error[E0658]: The attribute `macro_reexport` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/macro-reexport-removed.rs:15:3 + --> $DIR/macro-reexport-removed.rs:5:3 | LL | #[macro_reexport(macro_one)] //~ ERROR attribute `macro_reexport` is currently unknown | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/macros/macro-shadowing.rs b/src/test/ui/macros/macro-shadowing.rs index 61abaf8a2ddf8..1f9f59d7644a9 100644 --- a/src/test/ui/macros/macro-shadowing.rs +++ b/src/test/ui/macros/macro-shadowing.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:two_macros.rs #![allow(unused_macros)] diff --git a/src/test/ui/macros/macro-shadowing.stderr b/src/test/ui/macros/macro-shadowing.stderr index 28f09509a6233..df1de9c3c3df1 100644 --- a/src/test/ui/macros/macro-shadowing.stderr +++ b/src/test/ui/macros/macro-shadowing.stderr @@ -1,5 +1,5 @@ error: `macro_two` is already in scope - --> $DIR/macro-shadowing.rs:22:5 + --> $DIR/macro-shadowing.rs:12:5 | LL | #[macro_use] //~ ERROR `macro_two` is already in scope | ^^^^^^^^^^^^ @@ -10,7 +10,7 @@ LL | m1!(); = note: macro-expanded `#[macro_use]`s may not shadow existing macros (see RFC 1560) error: `foo` is already in scope - --> $DIR/macro-shadowing.rs:20:5 + --> $DIR/macro-shadowing.rs:10:5 | LL | macro_rules! foo { () => {} } //~ ERROR `foo` is already in scope | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/macros/macro-stability.rs b/src/test/ui/macros/macro-stability.rs index a4b922c0fe19c..7d1ee6a43b6ad 100644 --- a/src/test/ui/macros/macro-stability.rs +++ b/src/test/ui/macros/macro-stability.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:unstable-macros.rs #![feature(staged_api)] diff --git a/src/test/ui/macros/macro-stability.stderr b/src/test/ui/macros/macro-stability.stderr index 947133f287d06..e5c535a08e1c3 100644 --- a/src/test/ui/macros/macro-stability.stderr +++ b/src/test/ui/macros/macro-stability.stderr @@ -1,5 +1,5 @@ error[E0658]: macro unstable_macro! is unstable - --> $DIR/macro-stability.rs:21:5 + --> $DIR/macro-stability.rs:11:5 | LL | unstable_macro!(); //~ ERROR: macro unstable_macro! is unstable | ^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/macros/macro-stmt-matchers.rs b/src/test/ui/macros/macro-stmt-matchers.rs index 8f46d3301eb37..aa1464c5f2094 100644 --- a/src/test/ui/macros/macro-stmt-matchers.rs +++ b/src/test/ui/macros/macro-stmt-matchers.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #[rustc_error] diff --git a/src/test/ui/macros/macro-stmt-matchers.stderr b/src/test/ui/macros/macro-stmt-matchers.stderr index ef6210bb6f7e8..6f5307e5e158a 100644 --- a/src/test/ui/macros/macro-stmt-matchers.stderr +++ b/src/test/ui/macros/macro-stmt-matchers.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/macro-stmt-matchers.rs:14:1 + --> $DIR/macro-stmt-matchers.rs:4:1 | LL | / fn main() { //~ ERROR compilation successful LL | | macro_rules! m { ($s:stmt;) => { $s } } diff --git a/src/test/ui/macros/macro-tt-matchers.rs b/src/test/ui/macros/macro-tt-matchers.rs index 7255e7d00b611..8d9addb762510 100644 --- a/src/test/ui/macros/macro-tt-matchers.rs +++ b/src/test/ui/macros/macro-tt-matchers.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![allow(dead_code)] diff --git a/src/test/ui/macros/macro-tt-matchers.stderr b/src/test/ui/macros/macro-tt-matchers.stderr index b7551c1bd93b1..ec973a2aa29a6 100644 --- a/src/test/ui/macros/macro-tt-matchers.stderr +++ b/src/test/ui/macros/macro-tt-matchers.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/macro-tt-matchers.rs:21:1 + --> $DIR/macro-tt-matchers.rs:11:1 | LL | fn main() {} //~ ERROR compilation successful | ^^^^^^^^^^^^ diff --git a/src/test/ui/macros/macro-use-bad-args-1.rs b/src/test/ui/macros/macro-use-bad-args-1.rs index a07cc83441173..1fcb1bdafd5ed 100644 --- a/src/test/ui/macros/macro-use-bad-args-1.rs +++ b/src/test/ui/macros/macro-use-bad-args-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![no_std] #[allow(unused_extern_crates)] diff --git a/src/test/ui/macros/macro-use-bad-args-1.stderr b/src/test/ui/macros/macro-use-bad-args-1.stderr index 19a8c7c0382d1..c0e88b1653fc4 100644 --- a/src/test/ui/macros/macro-use-bad-args-1.stderr +++ b/src/test/ui/macros/macro-use-bad-args-1.stderr @@ -1,5 +1,5 @@ error[E0466]: bad macro import - --> $DIR/macro-use-bad-args-1.rs:14:13 + --> $DIR/macro-use-bad-args-1.rs:4:13 | LL | #[macro_use(foo(bar))] //~ ERROR bad macro import | ^^^^^^^^ diff --git a/src/test/ui/macros/macro-use-bad-args-2.rs b/src/test/ui/macros/macro-use-bad-args-2.rs index 89004f1689774..47d2019aefe83 100644 --- a/src/test/ui/macros/macro-use-bad-args-2.rs +++ b/src/test/ui/macros/macro-use-bad-args-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![no_std] #[allow(unused_extern_crates)] diff --git a/src/test/ui/macros/macro-use-bad-args-2.stderr b/src/test/ui/macros/macro-use-bad-args-2.stderr index 0ac18201d791e..be3d681020c26 100644 --- a/src/test/ui/macros/macro-use-bad-args-2.stderr +++ b/src/test/ui/macros/macro-use-bad-args-2.stderr @@ -1,5 +1,5 @@ error[E0466]: bad macro import - --> $DIR/macro-use-bad-args-2.rs:14:13 + --> $DIR/macro-use-bad-args-2.rs:4:13 | LL | #[macro_use(foo="bar")] //~ ERROR bad macro import | ^^^^^^^^^ diff --git a/src/test/ui/macros/macro-use-scope.rs b/src/test/ui/macros/macro-use-scope.rs index 9d389413ba9ad..97dd91a2958cb 100644 --- a/src/test/ui/macros/macro-use-scope.rs +++ b/src/test/ui/macros/macro-use-scope.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:two_macros.rs #![feature(rustc_attrs)] diff --git a/src/test/ui/macros/macro-use-scope.stderr b/src/test/ui/macros/macro-use-scope.stderr index 2e81750d43bbc..2c153e4df7dfb 100644 --- a/src/test/ui/macros/macro-use-scope.stderr +++ b/src/test/ui/macros/macro-use-scope.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/macro-use-scope.rs:32:1 + --> $DIR/macro-use-scope.rs:22:1 | LL | fn main() {} //~ ERROR compilation successful | ^^^^^^^^^^^^ diff --git a/src/test/ui/macros/macro-use-undef.rs b/src/test/ui/macros/macro-use-undef.rs index dd725aae95e89..ae3054e7b8290 100644 --- a/src/test/ui/macros/macro-use-undef.rs +++ b/src/test/ui/macros/macro-use-undef.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:two_macros.rs #[macro_use(macro_two, no_way)] //~ ERROR imported macro not found diff --git a/src/test/ui/macros/macro-use-undef.stderr b/src/test/ui/macros/macro-use-undef.stderr index 6fc57a34794d5..4d9fa3aeb137d 100644 --- a/src/test/ui/macros/macro-use-undef.stderr +++ b/src/test/ui/macros/macro-use-undef.stderr @@ -1,5 +1,5 @@ error[E0469]: imported macro not found - --> $DIR/macro-use-undef.rs:13:24 + --> $DIR/macro-use-undef.rs:3:24 | LL | #[macro_use(macro_two, no_way)] //~ ERROR imported macro not found | ^^^^^^ diff --git a/src/test/ui/macros/macro-use-wrong-name.rs b/src/test/ui/macros/macro-use-wrong-name.rs index 143ecb4ce5e0a..d142b5800034b 100644 --- a/src/test/ui/macros/macro-use-wrong-name.rs +++ b/src/test/ui/macros/macro-use-wrong-name.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:two_macros.rs #[macro_use(macro_one)] diff --git a/src/test/ui/macros/macro-use-wrong-name.stderr b/src/test/ui/macros/macro-use-wrong-name.stderr index 26271a2162352..d178d4e4a60fa 100644 --- a/src/test/ui/macros/macro-use-wrong-name.stderr +++ b/src/test/ui/macros/macro-use-wrong-name.stderr @@ -1,5 +1,5 @@ error: cannot find macro `macro_two!` in this scope - --> $DIR/macro-use-wrong-name.rs:17:5 + --> $DIR/macro-use-wrong-name.rs:7:5 | LL | macro_two!(); | ^^^^^^^^^ help: you could try the macro: `macro_one` diff --git a/src/test/ui/macros/macro_path_as_generic_bound.rs b/src/test/ui/macros/macro_path_as_generic_bound.rs index 85cf597489da9..663f85688ec9a 100644 --- a/src/test/ui/macros/macro_path_as_generic_bound.rs +++ b/src/test/ui/macros/macro_path_as_generic_bound.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo {} macro_rules! foo(($t:path) => { diff --git a/src/test/ui/macros/macro_path_as_generic_bound.stderr b/src/test/ui/macros/macro_path_as_generic_bound.stderr index 0f9f0607c5bf2..b9582329206ed 100644 --- a/src/test/ui/macros/macro_path_as_generic_bound.stderr +++ b/src/test/ui/macros/macro_path_as_generic_bound.stderr @@ -1,5 +1,5 @@ error[E0433]: failed to resolve. Use of undeclared type or module `m` - --> $DIR/macro_path_as_generic_bound.rs:17:6 + --> $DIR/macro_path_as_generic_bound.rs:7:6 | LL | foo!(m::m2::A); //~ ERROR failed to resolve | ^ Use of undeclared type or module `m` diff --git a/src/test/ui/macros/macro_undefined.rs b/src/test/ui/macros/macro_undefined.rs index 4a812739a6b26..6ca1eb568616c 100644 --- a/src/test/ui/macros/macro_undefined.rs +++ b/src/test/ui/macros/macro_undefined.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test macro_undefined issue mod m { diff --git a/src/test/ui/macros/macro_undefined.stderr b/src/test/ui/macros/macro_undefined.stderr index 87b039f483485..b9a76e07a007b 100644 --- a/src/test/ui/macros/macro_undefined.stderr +++ b/src/test/ui/macros/macro_undefined.stderr @@ -1,5 +1,5 @@ error: cannot find macro `k!` in this scope - --> $DIR/macro_undefined.rs:21:5 + --> $DIR/macro_undefined.rs:11:5 | LL | k!(); //~ ERROR cannot find | ^ help: you could try the macro: `kl` diff --git a/src/test/ui/macros/macros-in-extern.rs b/src/test/ui/macros/macros-in-extern.rs index 40053853b15a7..bba8b15cdb035 100644 --- a/src/test/ui/macros/macros-in-extern.rs +++ b/src/test/ui/macros/macros-in-extern.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32 #![feature(decl_macro)] diff --git a/src/test/ui/macros/macros-in-extern.stderr b/src/test/ui/macros/macros-in-extern.stderr index 60492d34451c8..1d0c28752bcaa 100644 --- a/src/test/ui/macros/macros-in-extern.stderr +++ b/src/test/ui/macros/macros-in-extern.stderr @@ -1,5 +1,5 @@ error[E0658]: macro invocations in `extern {}` blocks are experimental (see issue #49476) - --> $DIR/macros-in-extern.rs:36:5 + --> $DIR/macros-in-extern.rs:26:5 | LL | returns_isize!(rust_get_test_int); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | returns_isize!(rust_get_test_int); = help: add #![feature(macros_in_extern)] to the crate attributes to enable error[E0658]: macro invocations in `extern {}` blocks are experimental (see issue #49476) - --> $DIR/macros-in-extern.rs:38:5 + --> $DIR/macros-in-extern.rs:28:5 | LL | takes_u32_returns_u32!(rust_dbg_extern_identity_u32); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -15,7 +15,7 @@ LL | takes_u32_returns_u32!(rust_dbg_extern_identity_u32); = help: add #![feature(macros_in_extern)] to the crate attributes to enable error[E0658]: macro invocations in `extern {}` blocks are experimental (see issue #49476) - --> $DIR/macros-in-extern.rs:40:5 + --> $DIR/macros-in-extern.rs:30:5 | LL | emits_nothing!(); | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/macros/macros-nonfatal-errors.rs b/src/test/ui/macros/macros-nonfatal-errors.rs index ce2dfb906c5ce..e2cba5c3ef84e 100644 --- a/src/test/ui/macros/macros-nonfatal-errors.rs +++ b/src/test/ui/macros/macros-nonfatal-errors.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // normalize-stderr-test: "The system cannot find the file specified\." -> "No such file or directory" // ignore-tidy-linelength diff --git a/src/test/ui/macros/macros-nonfatal-errors.stderr b/src/test/ui/macros/macros-nonfatal-errors.stderr index 81e250d5ea09e..6ee3cc7b5f728 100644 --- a/src/test/ui/macros/macros-nonfatal-errors.stderr +++ b/src/test/ui/macros/macros-nonfatal-errors.stderr @@ -1,47 +1,47 @@ error[E0665]: `Default` cannot be derived for enums, only structs - --> $DIR/macros-nonfatal-errors.rs:20:10 + --> $DIR/macros-nonfatal-errors.rs:10:10 | LL | #[derive(Default)] //~ ERROR | ^^^^^^^ error: inline assembly must be a string literal - --> $DIR/macros-nonfatal-errors.rs:24:10 + --> $DIR/macros-nonfatal-errors.rs:14:10 | LL | asm!(invalid); //~ ERROR | ^^^^^^^ error: concat_idents! requires ident args. - --> $DIR/macros-nonfatal-errors.rs:26:5 + --> $DIR/macros-nonfatal-errors.rs:16:5 | LL | concat_idents!("not", "idents"); //~ ERROR | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: argument must be a string literal - --> $DIR/macros-nonfatal-errors.rs:28:17 + --> $DIR/macros-nonfatal-errors.rs:18:17 | LL | option_env!(invalid); //~ ERROR | ^^^^^^^ error: expected string literal - --> $DIR/macros-nonfatal-errors.rs:29:10 + --> $DIR/macros-nonfatal-errors.rs:19:10 | LL | env!(invalid); //~ ERROR | ^^^^^^^ error: expected string literal - --> $DIR/macros-nonfatal-errors.rs:30:10 + --> $DIR/macros-nonfatal-errors.rs:20:10 | LL | env!(foo, abr, baz); //~ ERROR | ^^^ error: environment variable `RUST_HOPEFULLY_THIS_DOESNT_EXIST` not defined - --> $DIR/macros-nonfatal-errors.rs:31:5 + --> $DIR/macros-nonfatal-errors.rs:21:5 | LL | env!("RUST_HOPEFULLY_THIS_DOESNT_EXIST"); //~ ERROR | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: format argument must be a string literal - --> $DIR/macros-nonfatal-errors.rs:33:13 + --> $DIR/macros-nonfatal-errors.rs:23:13 | LL | format!(invalid); //~ ERROR | ^^^^^^^ @@ -51,37 +51,37 @@ LL | format!("{}", invalid); //~ ERROR | ^^^^^ error: argument must be a string literal - --> $DIR/macros-nonfatal-errors.rs:35:14 + --> $DIR/macros-nonfatal-errors.rs:25:14 | LL | include!(invalid); //~ ERROR | ^^^^^^^ error: argument must be a string literal - --> $DIR/macros-nonfatal-errors.rs:37:18 + --> $DIR/macros-nonfatal-errors.rs:27:18 | LL | include_str!(invalid); //~ ERROR | ^^^^^^^ error: couldn't read $DIR/i'd be quite surprised if a file with this name existed: No such file or directory (os error 2) - --> $DIR/macros-nonfatal-errors.rs:38:5 + --> $DIR/macros-nonfatal-errors.rs:28:5 | LL | include_str!("i'd be quite surprised if a file with this name existed"); //~ ERROR | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: argument must be a string literal - --> $DIR/macros-nonfatal-errors.rs:39:20 + --> $DIR/macros-nonfatal-errors.rs:29:20 | LL | include_bytes!(invalid); //~ ERROR | ^^^^^^^ error: couldn't read $DIR/i'd be quite surprised if a file with this name existed: No such file or directory (os error 2) - --> $DIR/macros-nonfatal-errors.rs:40:5 + --> $DIR/macros-nonfatal-errors.rs:30:5 | LL | include_bytes!("i'd be quite surprised if a file with this name existed"); //~ ERROR | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: trace_macros! accepts only `true` or `false` - --> $DIR/macros-nonfatal-errors.rs:42:5 + --> $DIR/macros-nonfatal-errors.rs:32:5 | LL | trace_macros!(invalid); //~ ERROR | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/macros/missing-comma.rs b/src/test/ui/macros/missing-comma.rs index 07e69b9619d1f..1e146875bcc76 100644 --- a/src/test/ui/macros/missing-comma.rs +++ b/src/test/ui/macros/missing-comma.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! foo { ($a:ident) => (); ($a:ident, $b:ident) => (); diff --git a/src/test/ui/macros/missing-comma.stderr b/src/test/ui/macros/missing-comma.stderr index 9d8de87e5bb7f..c414798314719 100644 --- a/src/test/ui/macros/missing-comma.stderr +++ b/src/test/ui/macros/missing-comma.stderr @@ -1,11 +1,11 @@ error: expected token: `,` - --> $DIR/missing-comma.rs:20:19 + --> $DIR/missing-comma.rs:10:19 | LL | println!("{}" a); | ^ error: no rules expected the token `b` - --> $DIR/missing-comma.rs:22:12 + --> $DIR/missing-comma.rs:12:12 | LL | foo!(a b); | -^ @@ -13,7 +13,7 @@ LL | foo!(a b); | help: missing comma here error: no rules expected the token `e` - --> $DIR/missing-comma.rs:24:21 + --> $DIR/missing-comma.rs:14:21 | LL | foo!(a, b, c, d e); | -^ @@ -21,7 +21,7 @@ LL | foo!(a, b, c, d e); | help: missing comma here error: no rules expected the token `d` - --> $DIR/missing-comma.rs:26:18 + --> $DIR/missing-comma.rs:16:18 | LL | foo!(a, b, c d, e); | -^ @@ -29,7 +29,7 @@ LL | foo!(a, b, c d, e); | help: missing comma here error: no rules expected the token `d` - --> $DIR/missing-comma.rs:28:18 + --> $DIR/missing-comma.rs:18:18 | LL | foo!(a, b, c d e); | ^ diff --git a/src/test/ui/macros/nonterminal-matching.rs b/src/test/ui/macros/nonterminal-matching.rs index 54d280a63e798..0ccdf6e5f2e74 100644 --- a/src/test/ui/macros/nonterminal-matching.rs +++ b/src/test/ui/macros/nonterminal-matching.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we are refusing to match on complex nonterminals for which tokens are // unavailable and we'd have to go through AST comparisons. diff --git a/src/test/ui/macros/nonterminal-matching.stderr b/src/test/ui/macros/nonterminal-matching.stderr index bf2221d52a492..4ba2f934bb808 100644 --- a/src/test/ui/macros/nonterminal-matching.stderr +++ b/src/test/ui/macros/nonterminal-matching.stderr @@ -1,5 +1,5 @@ error: no rules expected the token `enum E { }` - --> $DIR/nonterminal-matching.rs:29:10 + --> $DIR/nonterminal-matching.rs:19:10 | LL | n!(a $nt_item b); //~ ERROR no rules expected the token `enum E { }` | ^^^^^^^^ diff --git a/src/test/ui/macros/span-covering-argument-1.nll.stderr b/src/test/ui/macros/span-covering-argument-1.nll.stderr index 3947f6c0f11fc..2ac881107b96a 100644 --- a/src/test/ui/macros/span-covering-argument-1.nll.stderr +++ b/src/test/ui/macros/span-covering-argument-1.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `foo` as mutable, as it is not declared as mutable - --> $DIR/span-covering-argument-1.rs:15:14 + --> $DIR/span-covering-argument-1.rs:5:14 | LL | let $s = 0; | -- help: consider changing this to be mutable: `mut foo` diff --git a/src/test/ui/macros/span-covering-argument-1.rs b/src/test/ui/macros/span-covering-argument-1.rs index bfc137fc7b26d..0256aaf901e3a 100644 --- a/src/test/ui/macros/span-covering-argument-1.rs +++ b/src/test/ui/macros/span-covering-argument-1.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! bad { ($s:ident whatever) => { { diff --git a/src/test/ui/macros/span-covering-argument-1.stderr b/src/test/ui/macros/span-covering-argument-1.stderr index c67095d9ee759..fa04217a783f2 100644 --- a/src/test/ui/macros/span-covering-argument-1.stderr +++ b/src/test/ui/macros/span-covering-argument-1.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow immutable local variable `foo` as mutable - --> $DIR/span-covering-argument-1.rs:15:19 + --> $DIR/span-covering-argument-1.rs:5:19 | LL | let $s = 0; | -- consider changing this to `mut $s` diff --git a/src/test/ui/macros/trace-macro.rs b/src/test/ui/macros/trace-macro.rs index 996b172c87b01..efd658dd2b9a8 100644 --- a/src/test/ui/macros/trace-macro.rs +++ b/src/test/ui/macros/trace-macro.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z trace-macros // compile-pass diff --git a/src/test/ui/macros/trace-macro.stderr b/src/test/ui/macros/trace-macro.stderr index 4b716ff27446a..ebfed41bc280e 100644 --- a/src/test/ui/macros/trace-macro.stderr +++ b/src/test/ui/macros/trace-macro.stderr @@ -1,5 +1,5 @@ note: trace_macro - --> $DIR/trace-macro.rs:15:5 + --> $DIR/trace-macro.rs:5:5 | LL | println!("Hello, World!"); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/macros/trace_faulty_macros.rs b/src/test/ui/macros/trace_faulty_macros.rs index ced1a7f68fb53..627d58abf4ca2 100644 --- a/src/test/ui/macros/trace_faulty_macros.rs +++ b/src/test/ui/macros/trace_faulty_macros.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z trace-macros #![recursion_limit="4"] diff --git a/src/test/ui/macros/trace_faulty_macros.stderr b/src/test/ui/macros/trace_faulty_macros.stderr index a9ffef8ef8090..ad8d33952dfe5 100644 --- a/src/test/ui/macros/trace_faulty_macros.stderr +++ b/src/test/ui/macros/trace_faulty_macros.stderr @@ -1,5 +1,5 @@ error: no rules expected the token `bcd` - --> $DIR/trace_faulty_macros.rs:17:26 + --> $DIR/trace_faulty_macros.rs:7:26 | LL | my_faulty_macro!(bcd); //~ ERROR no rules | ^^^ @@ -8,7 +8,7 @@ LL | my_faulty_macro!(); | ------------------- in this macro invocation note: trace_macro - --> $DIR/trace_faulty_macros.rs:43:5 + --> $DIR/trace_faulty_macros.rs:33:5 | LL | my_faulty_macro!(); | ^^^^^^^^^^^^^^^^^^^ @@ -18,7 +18,7 @@ LL | my_faulty_macro!(); = note: expanding `my_faulty_macro! { bcd }` error: recursion limit reached while expanding the macro `my_recursive_macro` - --> $DIR/trace_faulty_macros.rs:32:9 + --> $DIR/trace_faulty_macros.rs:22:9 | LL | my_recursive_macro!(); //~ ERROR recursion limit | ^^^^^^^^^^^^^^^^^^^^^^ @@ -29,7 +29,7 @@ LL | my_recursive_macro!(); = help: consider adding a `#![recursion_limit="8"]` attribute to your crate note: trace_macro - --> $DIR/trace_faulty_macros.rs:44:5 + --> $DIR/trace_faulty_macros.rs:34:5 | LL | my_recursive_macro!(); | ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/main-wrong-location.rs b/src/test/ui/main-wrong-location.rs index 45be5f1478718..d7ed5128195e9 100644 --- a/src/test/ui/main-wrong-location.rs +++ b/src/test/ui/main-wrong-location.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod m { // An inferred main entry point (that doesn't use #[main]) // must appear at the top of the crate diff --git a/src/test/ui/main-wrong-location.stderr b/src/test/ui/main-wrong-location.stderr index a5ef92f14bbc5..b30931f2f2301 100644 --- a/src/test/ui/main-wrong-location.stderr +++ b/src/test/ui/main-wrong-location.stderr @@ -2,7 +2,7 @@ error[E0601]: `main` function not found in crate `main_wrong_location` | = note: the main function must be defined at the crate level but you have one or more functions named 'main' that are not defined at the crate level. Either move the definition or attach the `#[main]` attribute to override this behavior. note: here is a function named 'main' - --> $DIR/main-wrong-location.rs:14:5 + --> $DIR/main-wrong-location.rs:4:5 | LL | fn main() { } | ^^^^^^^^^^^^^ diff --git a/src/test/ui/main-wrong-type.rs b/src/test/ui/main-wrong-type.rs index 402cd3a2d31b6..dac4d4ac9aaf7 100644 --- a/src/test/ui/main-wrong-type.rs +++ b/src/test/ui/main-wrong-type.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S { x: isize, y: isize, diff --git a/src/test/ui/main-wrong-type.stderr b/src/test/ui/main-wrong-type.stderr index 15094bd1fbb41..c00c67af572b7 100644 --- a/src/test/ui/main-wrong-type.stderr +++ b/src/test/ui/main-wrong-type.stderr @@ -1,5 +1,5 @@ error[E0580]: main function has wrong type - --> $DIR/main-wrong-type.rs:16:1 + --> $DIR/main-wrong-type.rs:6:1 | LL | fn main(foo: S) { | ^^^^^^^^^^^^^^^ incorrect number of function parameters diff --git a/src/test/ui/malformed/malformed-derive-entry.rs b/src/test/ui/malformed/malformed-derive-entry.rs index ac000628f2b04..5978258b5d8da 100644 --- a/src/test/ui/malformed/malformed-derive-entry.rs +++ b/src/test/ui/malformed/malformed-derive-entry.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Copy(Bad))] //~^ ERROR expected one of `)`, `,`, or `::`, found `(` struct Test1; diff --git a/src/test/ui/malformed/malformed-derive-entry.stderr b/src/test/ui/malformed/malformed-derive-entry.stderr index b1984f5243043..b3474220eec02 100644 --- a/src/test/ui/malformed/malformed-derive-entry.stderr +++ b/src/test/ui/malformed/malformed-derive-entry.stderr @@ -1,23 +1,23 @@ error: expected one of `)`, `,`, or `::`, found `(` - --> $DIR/malformed-derive-entry.rs:11:14 + --> $DIR/malformed-derive-entry.rs:1:14 | LL | #[derive(Copy(Bad))] | ^ expected one of `)`, `,`, or `::` here error: expected one of `)`, `,`, or `::`, found `=` - --> $DIR/malformed-derive-entry.rs:15:14 + --> $DIR/malformed-derive-entry.rs:5:14 | LL | #[derive(Copy="bad")] | ^ expected one of `)`, `,`, or `::` here warning: empty trait list in `derive` - --> $DIR/malformed-derive-entry.rs:19:1 + --> $DIR/malformed-derive-entry.rs:9:1 | LL | #[derive()] | ^^^^^^^^^^^ warning: empty trait list in `derive` - --> $DIR/malformed-derive-entry.rs:23:1 + --> $DIR/malformed-derive-entry.rs:13:1 | LL | #[derive] | ^^^^^^^^^ diff --git a/src/test/ui/malformed/malformed-plugin-1.rs b/src/test/ui/malformed/malformed-plugin-1.rs index 214a5e5e3eb11..c5a251d28fa58 100644 --- a/src/test/ui/malformed/malformed-plugin-1.rs +++ b/src/test/ui/malformed/malformed-plugin-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(plugin)] #![plugin] //~ ERROR malformed plugin attribute diff --git a/src/test/ui/malformed/malformed-plugin-1.stderr b/src/test/ui/malformed/malformed-plugin-1.stderr index 5ceabc3b8ba1e..4124fd6e4a6d4 100644 --- a/src/test/ui/malformed/malformed-plugin-1.stderr +++ b/src/test/ui/malformed/malformed-plugin-1.stderr @@ -1,5 +1,5 @@ error[E0498]: malformed plugin attribute - --> $DIR/malformed-plugin-1.rs:12:1 + --> $DIR/malformed-plugin-1.rs:2:1 | LL | #![plugin] //~ ERROR malformed plugin attribute | ^^^^^^^^^^ diff --git a/src/test/ui/malformed/malformed-plugin-2.rs b/src/test/ui/malformed/malformed-plugin-2.rs index 1b112608beeb2..96a3138e712ca 100644 --- a/src/test/ui/malformed/malformed-plugin-2.rs +++ b/src/test/ui/malformed/malformed-plugin-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(plugin)] #![plugin="bleh"] //~ ERROR malformed plugin attribute diff --git a/src/test/ui/malformed/malformed-plugin-2.stderr b/src/test/ui/malformed/malformed-plugin-2.stderr index 56c87f9f8dd8c..308db46b6fc9f 100644 --- a/src/test/ui/malformed/malformed-plugin-2.stderr +++ b/src/test/ui/malformed/malformed-plugin-2.stderr @@ -1,5 +1,5 @@ error[E0498]: malformed plugin attribute - --> $DIR/malformed-plugin-2.rs:12:1 + --> $DIR/malformed-plugin-2.rs:2:1 | LL | #![plugin="bleh"] //~ ERROR malformed plugin attribute | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/malformed/malformed-plugin-3.rs b/src/test/ui/malformed/malformed-plugin-3.rs index 0c948831de217..1b70ff3bdb7c1 100644 --- a/src/test/ui/malformed/malformed-plugin-3.rs +++ b/src/test/ui/malformed/malformed-plugin-3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(plugin)] #![plugin(foo="bleh")] //~ ERROR malformed plugin attribute diff --git a/src/test/ui/malformed/malformed-plugin-3.stderr b/src/test/ui/malformed/malformed-plugin-3.stderr index fff52c649e8eb..6f19a11714901 100644 --- a/src/test/ui/malformed/malformed-plugin-3.stderr +++ b/src/test/ui/malformed/malformed-plugin-3.stderr @@ -1,5 +1,5 @@ error[E0498]: malformed plugin attribute - --> $DIR/malformed-plugin-3.rs:12:1 + --> $DIR/malformed-plugin-3.rs:2:1 | LL | #![plugin(foo="bleh")] //~ ERROR malformed plugin attribute | ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/malformed_macro_lhs.rs b/src/test/ui/malformed_macro_lhs.rs index 0b437be5393ed..f57d2fb4dc9f8 100644 --- a/src/test/ui/malformed_macro_lhs.rs +++ b/src/test/ui/malformed_macro_lhs.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! my_precioooous { t => (1); //~ ERROR invalid macro matcher } diff --git a/src/test/ui/malformed_macro_lhs.stderr b/src/test/ui/malformed_macro_lhs.stderr index 6b4241890b12b..ab09bc10b86f0 100644 --- a/src/test/ui/malformed_macro_lhs.stderr +++ b/src/test/ui/malformed_macro_lhs.stderr @@ -1,5 +1,5 @@ error: invalid macro matcher; matchers must be contained in balanced delimiters - --> $DIR/malformed_macro_lhs.rs:12:5 + --> $DIR/malformed_macro_lhs.rs:2:5 | LL | t => (1); //~ ERROR invalid macro matcher | ^ diff --git a/src/test/ui/manual/manual-link-bad-form.rs b/src/test/ui/manual/manual-link-bad-form.rs index fc4fa838a5693..9d092ae6db48b 100644 --- a/src/test/ui/manual/manual-link-bad-form.rs +++ b/src/test/ui/manual/manual-link-bad-form.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-l static= // error-pattern: empty library name given via `-l` diff --git a/src/test/ui/manual/manual-link-bad-kind.rs b/src/test/ui/manual/manual-link-bad-kind.rs index e9cbdb099480c..86830a599b5dc 100644 --- a/src/test/ui/manual/manual-link-bad-kind.rs +++ b/src/test/ui/manual/manual-link-bad-kind.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-l bar=foo // error-pattern: unknown library kind `bar`, expected one of dylib, framework, or static diff --git a/src/test/ui/manual/manual-link-bad-search-path.rs b/src/test/ui/manual/manual-link-bad-search-path.rs index 2bf61cbe24ca3..0fe23b02aa9e9 100644 --- a/src/test/ui/manual/manual-link-bad-search-path.rs +++ b/src/test/ui/manual/manual-link-bad-search-path.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-L native= // error-pattern: empty search path given via `-L` diff --git a/src/test/ui/manual/manual-link-framework.rs b/src/test/ui/manual/manual-link-framework.rs index 1ecf63813e9ab..0474526fcc1cf 100644 --- a/src/test/ui/manual/manual-link-framework.rs +++ b/src/test/ui/manual/manual-link-framework.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-macos // ignore-ios // compile-flags:-l framework=foo diff --git a/src/test/ui/map-types.rs b/src/test/ui/map-types.rs index e8ff9e817af2c..dab7863415f6e 100644 --- a/src/test/ui/map-types.rs +++ b/src/test/ui/map-types.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] use std::collections::HashMap; diff --git a/src/test/ui/map-types.stderr b/src/test/ui/map-types.stderr index 722113c752548..9aa9804424214 100644 --- a/src/test/ui/map-types.stderr +++ b/src/test/ui/map-types.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `std::boxed::Box>: Map` is not satisfied - --> $DIR/map-types.rs:27:37 + --> $DIR/map-types.rs:17:37 | LL | let y: Box> = Box::new(x); | ^^^^^^^^^^^ the trait `Map` is not implemented for `std::boxed::Box>` diff --git a/src/test/ui/match/match-argm-statics-2.rs b/src/test/ui/match/match-argm-statics-2.rs index 70e148627c47e..ad220d2f4319a 100644 --- a/src/test/ui/match/match-argm-statics-2.rs +++ b/src/test/ui/match/match-argm-statics-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use self::Direction::{North, East, South, West}; #[derive(PartialEq, Eq)] diff --git a/src/test/ui/match/match-argm-statics-2.stderr b/src/test/ui/match/match-argm-statics-2.stderr index 485b2a3202fff..3e6f22ab87513 100644 --- a/src/test/ui/match/match-argm-statics-2.stderr +++ b/src/test/ui/match/match-argm-statics-2.stderr @@ -1,17 +1,17 @@ error[E0004]: non-exhaustive patterns: `(true, false)` not covered - --> $DIR/match-argm-statics-2.rs:27:11 + --> $DIR/match-argm-statics-2.rs:17:11 | LL | match (true, false) { | ^^^^^^^^^^^^^ pattern `(true, false)` not covered error[E0004]: non-exhaustive patterns: `Some(Some(West))` not covered - --> $DIR/match-argm-statics-2.rs:39:11 + --> $DIR/match-argm-statics-2.rs:29:11 | LL | match Some(Some(North)) { | ^^^^^^^^^^^^^^^^^ pattern `Some(Some(West))` not covered error[E0004]: non-exhaustive patterns: `Foo { bar: Some(North), baz: NewBool(true) }` not covered - --> $DIR/match-argm-statics-2.rs:58:11 + --> $DIR/match-argm-statics-2.rs:48:11 | LL | match (Foo { bar: Some(North), baz: NewBool(true) }) { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ pattern `Foo { bar: Some(North), baz: NewBool(true) }` not covered diff --git a/src/test/ui/match/match-arm-statics.rs b/src/test/ui/match/match-arm-statics.rs index 40d73ab51c762..91db76ebb9f01 100644 --- a/src/test/ui/match/match-arm-statics.rs +++ b/src/test/ui/match/match-arm-statics.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] #![deny(unreachable_patterns)] diff --git a/src/test/ui/match/match-arm-statics.stderr b/src/test/ui/match/match-arm-statics.stderr index 8862be2254f02..3d9e900a4e988 100644 --- a/src/test/ui/match/match-arm-statics.stderr +++ b/src/test/ui/match/match-arm-statics.stderr @@ -1,23 +1,23 @@ error: unreachable pattern - --> $DIR/match-arm-statics.rs:35:9 + --> $DIR/match-arm-statics.rs:25:9 | LL | (true, true) => () | ^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/match-arm-statics.rs:12:9 + --> $DIR/match-arm-statics.rs:2:9 | LL | #![deny(unreachable_patterns)] | ^^^^^^^^^^^^^^^^^^^^ error: unreachable pattern - --> $DIR/match-arm-statics.rs:50:9 + --> $DIR/match-arm-statics.rs:40:9 | LL | Some(Some(East)) => (), | ^^^^^^^^^^^^^^^^ error: unreachable pattern - --> $DIR/match-arm-statics.rs:70:9 + --> $DIR/match-arm-statics.rs:60:9 | LL | Foo { bar: Some(EAST), baz: NewBool(false) } => () | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/match/match-byte-array-patterns-2.rs b/src/test/ui/match/match-byte-array-patterns-2.rs index abb770df107f1..a3a47d23bef4c 100644 --- a/src/test/ui/match/match-byte-array-patterns-2.rs +++ b/src/test/ui/match/match-byte-array-patterns-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let buf = &[0, 1, 2, 3]; diff --git a/src/test/ui/match/match-byte-array-patterns-2.stderr b/src/test/ui/match/match-byte-array-patterns-2.stderr index bc52376d82441..4030cd39448a0 100644 --- a/src/test/ui/match/match-byte-array-patterns-2.stderr +++ b/src/test/ui/match/match-byte-array-patterns-2.stderr @@ -1,11 +1,11 @@ error[E0004]: non-exhaustive patterns: `&[_, _, _, _]` not covered - --> $DIR/match-byte-array-patterns-2.rs:14:11 + --> $DIR/match-byte-array-patterns-2.rs:4:11 | LL | match buf { //~ ERROR non-exhaustive | ^^^ pattern `&[_, _, _, _]` not covered error[E0004]: non-exhaustive patterns: `&[]`, `&[_]`, `&[_, _]` and 3 more not covered - --> $DIR/match-byte-array-patterns-2.rs:20:11 + --> $DIR/match-byte-array-patterns-2.rs:10:11 | LL | match buf { //~ ERROR non-exhaustive | ^^^ patterns `&[]`, `&[_]`, `&[_, _]` and 3 more not covered diff --git a/src/test/ui/match/match-byte-array-patterns.rs b/src/test/ui/match/match-byte-array-patterns.rs index 9db4319b78682..7541ea3e2e263 100644 --- a/src/test/ui/match/match-byte-array-patterns.rs +++ b/src/test/ui/match/match-byte-array-patterns.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(slice_patterns)] #![deny(unreachable_patterns)] diff --git a/src/test/ui/match/match-byte-array-patterns.stderr b/src/test/ui/match/match-byte-array-patterns.stderr index da3d57743aabd..a23f185366664 100644 --- a/src/test/ui/match/match-byte-array-patterns.stderr +++ b/src/test/ui/match/match-byte-array-patterns.stderr @@ -1,53 +1,53 @@ error: unreachable pattern - --> $DIR/match-byte-array-patterns.rs:19:9 + --> $DIR/match-byte-array-patterns.rs:9:9 | LL | &[0x41, 0x41, 0x41, 0x41] => {} //~ ERROR unreachable pattern | ^^^^^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/match-byte-array-patterns.rs:12:9 + --> $DIR/match-byte-array-patterns.rs:2:9 | LL | #![deny(unreachable_patterns)] | ^^^^^^^^^^^^^^^^^^^^ error: unreachable pattern - --> $DIR/match-byte-array-patterns.rs:25:9 + --> $DIR/match-byte-array-patterns.rs:15:9 | LL | b"AAAA" => {}, //~ ERROR unreachable pattern | ^^^^^^^ error: unreachable pattern - --> $DIR/match-byte-array-patterns.rs:31:9 + --> $DIR/match-byte-array-patterns.rs:21:9 | LL | b"AAAA" => {}, //~ ERROR unreachable pattern | ^^^^^^^ error: unreachable pattern - --> $DIR/match-byte-array-patterns.rs:37:9 + --> $DIR/match-byte-array-patterns.rs:27:9 | LL | b"AAAA" => {}, //~ ERROR unreachable pattern | ^^^^^^^ error: unreachable pattern - --> $DIR/match-byte-array-patterns.rs:45:9 + --> $DIR/match-byte-array-patterns.rs:35:9 | LL | &[0x41, 0x41, 0x41, 0x41] => {} //~ ERROR unreachable pattern | ^^^^^^^^^^^^^^^^^^^^^^^^^ error: unreachable pattern - --> $DIR/match-byte-array-patterns.rs:51:9 + --> $DIR/match-byte-array-patterns.rs:41:9 | LL | b"AAAA" => {}, //~ ERROR unreachable pattern | ^^^^^^^ error: unreachable pattern - --> $DIR/match-byte-array-patterns.rs:57:9 + --> $DIR/match-byte-array-patterns.rs:47:9 | LL | b"AAAA" => {}, //~ ERROR unreachable pattern | ^^^^^^^ error: unreachable pattern - --> $DIR/match-byte-array-patterns.rs:63:9 + --> $DIR/match-byte-array-patterns.rs:53:9 | LL | b"AAAA" => {}, //~ ERROR unreachable pattern | ^^^^^^^ diff --git a/src/test/ui/match/match-ill-type2.rs b/src/test/ui/match/match-ill-type2.rs index aa47ea670fd70..6612f6e392fc7 100644 --- a/src/test/ui/match/match-ill-type2.rs +++ b/src/test/ui/match/match-ill-type2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { match 1i32 { 1i32 => 1, diff --git a/src/test/ui/match/match-ill-type2.stderr b/src/test/ui/match/match-ill-type2.stderr index b649a38476eb2..116d26ac71210 100644 --- a/src/test/ui/match/match-ill-type2.stderr +++ b/src/test/ui/match/match-ill-type2.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/match-ill-type2.rs:14:9 + --> $DIR/match-ill-type2.rs:4:9 | LL | 2u32 => 1, //~ ERROR mismatched types | ^^^^ expected i32, found u32 diff --git a/src/test/ui/match/match-join.rs b/src/test/ui/match/match-join.rs index 888094fd016ac..b0f2593c85364 100644 --- a/src/test/ui/match/match-join.rs +++ b/src/test/ui/match/match-join.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // a good test that we merge paths correctly in the presence of a // variable that's used before it's declared diff --git a/src/test/ui/match/match-join.stderr b/src/test/ui/match/match-join.stderr index a4a8a9d717409..6e08c92bedb54 100644 --- a/src/test/ui/match/match-join.stderr +++ b/src/test/ui/match/match-join.stderr @@ -1,5 +1,5 @@ error[E0425]: cannot find value `x` in this scope - --> $DIR/match-join.rs:19:20 + --> $DIR/match-join.rs:9:20 | LL | println!("{}", x); //~ ERROR cannot find value `x` in this scope | ^ not found in this scope diff --git a/src/test/ui/match/match-no-arms-unreachable-after.rs b/src/test/ui/match/match-no-arms-unreachable-after.rs index db08f5e5e66a3..8f83fd1a31803 100644 --- a/src/test/ui/match/match-no-arms-unreachable-after.rs +++ b/src/test/ui/match/match-no-arms-unreachable-after.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(warnings)] #![deny(unreachable_code)] diff --git a/src/test/ui/match/match-no-arms-unreachable-after.stderr b/src/test/ui/match/match-no-arms-unreachable-after.stderr index 35fae051870e0..bd136245c1ae9 100644 --- a/src/test/ui/match/match-no-arms-unreachable-after.stderr +++ b/src/test/ui/match/match-no-arms-unreachable-after.stderr @@ -1,11 +1,11 @@ error: unreachable statement - --> $DIR/match-no-arms-unreachable-after.rs:18:5 + --> $DIR/match-no-arms-unreachable-after.rs:8:5 | LL | let x = 2; //~ ERROR unreachable | ^^^^^^^^^^ | note: lint level defined here - --> $DIR/match-no-arms-unreachable-after.rs:12:9 + --> $DIR/match-no-arms-unreachable-after.rs:2:9 | LL | #![deny(unreachable_code)] | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/match/match-non-exhaustive.rs b/src/test/ui/match/match-non-exhaustive.rs index a24d2ed4b7fba..3b210a115d21a 100644 --- a/src/test/ui/match/match-non-exhaustive.rs +++ b/src/test/ui/match/match-non-exhaustive.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { match 0 { 1 => () } //~ ERROR non-exhaustive patterns match 0 { 0 if false => () } //~ ERROR non-exhaustive patterns diff --git a/src/test/ui/match/match-non-exhaustive.stderr b/src/test/ui/match/match-non-exhaustive.stderr index 04f09caceed3d..b2f861c589af9 100644 --- a/src/test/ui/match/match-non-exhaustive.stderr +++ b/src/test/ui/match/match-non-exhaustive.stderr @@ -1,11 +1,11 @@ error[E0004]: non-exhaustive patterns: `_` not covered - --> $DIR/match-non-exhaustive.rs:12:11 + --> $DIR/match-non-exhaustive.rs:2:11 | LL | match 0 { 1 => () } //~ ERROR non-exhaustive patterns | ^ pattern `_` not covered error[E0004]: non-exhaustive patterns: `_` not covered - --> $DIR/match-non-exhaustive.rs:13:11 + --> $DIR/match-non-exhaustive.rs:3:11 | LL | match 0 { 0 if false => () } //~ ERROR non-exhaustive patterns | ^ pattern `_` not covered diff --git a/src/test/ui/match/match-pattern-field-mismatch-2.rs b/src/test/ui/match/match-pattern-field-mismatch-2.rs index aed9130d60e4b..cd0775dd698dc 100644 --- a/src/test/ui/match/match-pattern-field-mismatch-2.rs +++ b/src/test/ui/match/match-pattern-field-mismatch-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { enum color { rgb(usize, usize, usize), diff --git a/src/test/ui/match/match-pattern-field-mismatch-2.stderr b/src/test/ui/match/match-pattern-field-mismatch-2.stderr index b43fa9149bd2b..1b52b4589a725 100644 --- a/src/test/ui/match/match-pattern-field-mismatch-2.stderr +++ b/src/test/ui/match/match-pattern-field-mismatch-2.stderr @@ -1,5 +1,5 @@ error[E0532]: expected tuple struct/variant, found unit variant `color::no_color` - --> $DIR/match-pattern-field-mismatch-2.rs:22:11 + --> $DIR/match-pattern-field-mismatch-2.rs:12:11 | LL | color::no_color(_) => { } | ^^^^^^^^^^^^^^^ not a tuple struct/variant diff --git a/src/test/ui/match/match-pattern-field-mismatch.rs b/src/test/ui/match/match-pattern-field-mismatch.rs index ddd5d63317011..29c2ece7fe1a5 100644 --- a/src/test/ui/match/match-pattern-field-mismatch.rs +++ b/src/test/ui/match/match-pattern-field-mismatch.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { enum color { rgb(usize, usize, usize), diff --git a/src/test/ui/match/match-pattern-field-mismatch.stderr b/src/test/ui/match/match-pattern-field-mismatch.stderr index d975f9afc7c0b..5c990feeaa546 100644 --- a/src/test/ui/match/match-pattern-field-mismatch.stderr +++ b/src/test/ui/match/match-pattern-field-mismatch.stderr @@ -1,5 +1,5 @@ error[E0023]: this pattern has 2 fields, but the corresponding tuple variant has 3 fields - --> $DIR/match-pattern-field-mismatch.rs:20:11 + --> $DIR/match-pattern-field-mismatch.rs:10:11 | LL | color::rgb(_, _) => { } | ^^^^^^^^^^^^^^^^ expected 3 fields, found 2 diff --git a/src/test/ui/match/match-privately-empty.rs b/src/test/ui/match/match-privately-empty.rs index 8777ef2ffe33c..315eb03d16564 100644 --- a/src/test/ui/match/match-privately-empty.rs +++ b/src/test/ui/match/match-privately-empty.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(never_type)] #![feature(exhaustive_patterns)] diff --git a/src/test/ui/match/match-privately-empty.stderr b/src/test/ui/match/match-privately-empty.stderr index 04b4ce00e9b82..23ca64e50af78 100644 --- a/src/test/ui/match/match-privately-empty.stderr +++ b/src/test/ui/match/match-privately-empty.stderr @@ -1,5 +1,5 @@ error[E0004]: non-exhaustive patterns: `Some(Private { misc: true, .. })` not covered - --> $DIR/match-privately-empty.rs:23:11 + --> $DIR/match-privately-empty.rs:13:11 | LL | match private::DATA { | ^^^^^^^^^^^^^ pattern `Some(Private { misc: true, .. })` not covered diff --git a/src/test/ui/match/match-range-fail-2.rs b/src/test/ui/match/match-range-fail-2.rs index b42e2ff919acb..19e6e12958bf3 100644 --- a/src/test/ui/match/match-range-fail-2.rs +++ b/src/test/ui/match/match-range-fail-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(exclusive_range_pattern)] fn main() { diff --git a/src/test/ui/match/match-range-fail-2.stderr b/src/test/ui/match/match-range-fail-2.stderr index 616f74ed858ba..b9e4534fdf5de 100644 --- a/src/test/ui/match/match-range-fail-2.stderr +++ b/src/test/ui/match/match-range-fail-2.stderr @@ -1,17 +1,17 @@ error[E0030]: lower range bound must be less than or equal to upper - --> $DIR/match-range-fail-2.rs:15:9 + --> $DIR/match-range-fail-2.rs:5:9 | LL | 6 ..= 1 => { } | ^ lower bound larger than upper bound error[E0579]: lower range bound must be less than upper - --> $DIR/match-range-fail-2.rs:21:9 + --> $DIR/match-range-fail-2.rs:11:9 | LL | 0 .. 0 => { } | ^ error[E0030]: lower range bound must be less than or equal to upper - --> $DIR/match-range-fail-2.rs:27:9 + --> $DIR/match-range-fail-2.rs:17:9 | LL | 0xFFFF_FFFF_FFFF_FFFF ..= 1 => { } | ^^^^^^^^^^^^^^^^^^^^^ lower bound larger than upper bound diff --git a/src/test/ui/match/match-range-fail-dominate.rs b/src/test/ui/match/match-range-fail-dominate.rs index 256aa180f4a59..99069183e4eda 100644 --- a/src/test/ui/match/match-range-fail-dominate.rs +++ b/src/test/ui/match/match-range-fail-dominate.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //error-pattern: unreachable //error-pattern: unreachable //error-pattern: unreachable diff --git a/src/test/ui/match/match-range-fail-dominate.stderr b/src/test/ui/match/match-range-fail-dominate.stderr index d75630e09c507..d35394aa38ba0 100644 --- a/src/test/ui/match/match-range-fail-dominate.stderr +++ b/src/test/ui/match/match-range-fail-dominate.stderr @@ -1,35 +1,35 @@ error: unreachable pattern - --> $DIR/match-range-fail-dominate.rs:22:7 + --> $DIR/match-range-fail-dominate.rs:12:7 | LL | 5 ... 6 => { } | ^^^^^^^ | note: lint level defined here - --> $DIR/match-range-fail-dominate.rs:17:9 + --> $DIR/match-range-fail-dominate.rs:7:9 | LL | #![deny(unreachable_patterns)] | ^^^^^^^^^^^^^^^^^^^^ error: unreachable pattern - --> $DIR/match-range-fail-dominate.rs:28:7 + --> $DIR/match-range-fail-dominate.rs:18:7 | LL | 4 ... 6 => { } | ^^^^^^^ error: unreachable pattern - --> $DIR/match-range-fail-dominate.rs:34:7 + --> $DIR/match-range-fail-dominate.rs:24:7 | LL | 4 ... 6 => { } | ^^^^^^^ error: unreachable pattern - --> $DIR/match-range-fail-dominate.rs:40:7 + --> $DIR/match-range-fail-dominate.rs:30:7 | LL | 'a' ... 'z' => {} | ^^^^^^^^^^^ warning: floating-point types cannot be used in patterns - --> $DIR/match-range-fail-dominate.rs:45:7 + --> $DIR/match-range-fail-dominate.rs:35:7 | LL | 0.01f64 ... 6.5f64 => {} | ^^^^^^^ @@ -39,7 +39,7 @@ LL | 0.01f64 ... 6.5f64 => {} = note: for more information, see issue #41620 warning: floating-point types cannot be used in patterns - --> $DIR/match-range-fail-dominate.rs:45:19 + --> $DIR/match-range-fail-dominate.rs:35:19 | LL | 0.01f64 ... 6.5f64 => {} | ^^^^^^ @@ -48,7 +48,7 @@ LL | 0.01f64 ... 6.5f64 => {} = note: for more information, see issue #41620 warning: floating-point types cannot be used in patterns - --> $DIR/match-range-fail-dominate.rs:46:7 + --> $DIR/match-range-fail-dominate.rs:36:7 | LL | 0.02f64 => {} | ^^^^^^^ @@ -57,7 +57,7 @@ LL | 0.02f64 => {} = note: for more information, see issue #41620 error: unreachable pattern - --> $DIR/match-range-fail-dominate.rs:46:7 + --> $DIR/match-range-fail-dominate.rs:36:7 | LL | 0.02f64 => {} | ^^^^^^^ diff --git a/src/test/ui/match/match-range-fail.rs b/src/test/ui/match/match-range-fail.rs index ca99b0c7b8938..8a3678577b4e3 100644 --- a/src/test/ui/match/match-range-fail.rs +++ b/src/test/ui/match/match-range-fail.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { match "wow" { "bar" ..= "foo" => { } diff --git a/src/test/ui/match/match-range-fail.stderr b/src/test/ui/match/match-range-fail.stderr index dbc251020a930..8d067c703b731 100644 --- a/src/test/ui/match/match-range-fail.stderr +++ b/src/test/ui/match/match-range-fail.stderr @@ -1,5 +1,5 @@ error[E0029]: only char and numeric types are allowed in range patterns - --> $DIR/match-range-fail.rs:13:9 + --> $DIR/match-range-fail.rs:3:9 | LL | "bar" ..= "foo" => { } | ^^^^^^^^^^^^^^^ ranges require char or numeric types @@ -8,7 +8,7 @@ LL | "bar" ..= "foo" => { } = note: end type: &'static str error[E0029]: only char and numeric types are allowed in range patterns - --> $DIR/match-range-fail.rs:20:16 + --> $DIR/match-range-fail.rs:10:16 | LL | 10 ..= "what" => () | ^^^^^^ ranges require char or numeric types @@ -17,7 +17,7 @@ LL | 10 ..= "what" => () = note: end type: &'static str error[E0308]: mismatched types - --> $DIR/match-range-fail.rs:27:9 + --> $DIR/match-range-fail.rs:17:9 | LL | 'c' ..= 100 => { } | ^^^^^^^^^^^ expected integral variable, found char diff --git a/src/test/ui/match/match-ref-ice.rs b/src/test/ui/match/match-ref-ice.rs index cb8f8fad532fa..dee110f96cd63 100644 --- a/src/test/ui/match/match-ref-ice.rs +++ b/src/test/ui/match/match-ref-ice.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(unreachable_patterns)] // The arity of `ref x` is always 1. If the pattern is compared to some non-structural type whose diff --git a/src/test/ui/match/match-ref-ice.stderr b/src/test/ui/match/match-ref-ice.stderr index 1dc87afddea6d..faefd9f212904 100644 --- a/src/test/ui/match/match-ref-ice.stderr +++ b/src/test/ui/match/match-ref-ice.stderr @@ -1,11 +1,11 @@ error: unreachable pattern - --> $DIR/match-ref-ice.rs:23:9 + --> $DIR/match-ref-ice.rs:13:9 | LL | [1, 2, 3] => (), //~ ERROR unreachable pattern | ^^^^^^^^^ | note: lint level defined here - --> $DIR/match-ref-ice.rs:11:9 + --> $DIR/match-ref-ice.rs:1:9 | LL | #![deny(unreachable_patterns)] | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/match/match-ref-mut-invariance.nll.stderr b/src/test/ui/match/match-ref-mut-invariance.nll.stderr index 26fcaa65d77f9..addd55d55d49a 100644 --- a/src/test/ui/match/match-ref-mut-invariance.nll.stderr +++ b/src/test/ui/match/match-ref-mut-invariance.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/match-ref-mut-invariance.rs:20:37 + --> $DIR/match-ref-mut-invariance.rs:10:37 | LL | match self.0 { ref mut x => x } //~ ERROR mismatched types | ^ error: unsatisfied lifetime constraints - --> $DIR/match-ref-mut-invariance.rs:19:49 + --> $DIR/match-ref-mut-invariance.rs:9:49 | LL | impl<'b> S<'b> { | -- lifetime `'b` defined here diff --git a/src/test/ui/match/match-ref-mut-invariance.rs b/src/test/ui/match/match-ref-mut-invariance.rs index c2b54a972bdc0..50b0ede09c22f 100644 --- a/src/test/ui/match/match-ref-mut-invariance.rs +++ b/src/test/ui/match/match-ref-mut-invariance.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that when making a ref mut binding with type `&mut T`, the // type `T` must match precisely the type `U` of the value being // matched, and in particular cannot be some supertype of `U`. Issue diff --git a/src/test/ui/match/match-ref-mut-invariance.stderr b/src/test/ui/match/match-ref-mut-invariance.stderr index 24677fe859727..61552b44c2757 100644 --- a/src/test/ui/match/match-ref-mut-invariance.stderr +++ b/src/test/ui/match/match-ref-mut-invariance.stderr @@ -1,18 +1,18 @@ error[E0308]: mismatched types - --> $DIR/match-ref-mut-invariance.rs:20:37 + --> $DIR/match-ref-mut-invariance.rs:10:37 | LL | match self.0 { ref mut x => x } //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `&'a mut &'a i32` found type `&'a mut &'b i32` -note: the lifetime 'a as defined on the method body at 19:12... - --> $DIR/match-ref-mut-invariance.rs:19:12 +note: the lifetime 'a as defined on the method body at 9:12... + --> $DIR/match-ref-mut-invariance.rs:9:12 | LL | fn bar<'a>(&'a mut self) -> &'a mut &'a i32 { | ^^ -note: ...does not necessarily outlive the lifetime 'b as defined on the impl at 18:6 - --> $DIR/match-ref-mut-invariance.rs:18:6 +note: ...does not necessarily outlive the lifetime 'b as defined on the impl at 8:6 + --> $DIR/match-ref-mut-invariance.rs:8:6 | LL | impl<'b> S<'b> { | ^^ diff --git a/src/test/ui/match/match-ref-mut-let-invariance.nll.stderr b/src/test/ui/match/match-ref-mut-let-invariance.nll.stderr index b1ec6adee9ea0..b8ffcfd7ab5ae 100644 --- a/src/test/ui/match/match-ref-mut-let-invariance.nll.stderr +++ b/src/test/ui/match/match-ref-mut-let-invariance.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/match-ref-mut-let-invariance.rs:21:9 + --> $DIR/match-ref-mut-let-invariance.rs:11:9 | LL | x //~ ERROR mismatched types | ^ error: unsatisfied lifetime constraints - --> $DIR/match-ref-mut-let-invariance.rs:19:49 + --> $DIR/match-ref-mut-let-invariance.rs:9:49 | LL | impl<'b> S<'b> { | -- lifetime `'b` defined here diff --git a/src/test/ui/match/match-ref-mut-let-invariance.rs b/src/test/ui/match/match-ref-mut-let-invariance.rs index ea16c61dfd4d1..a62eb714a4d3d 100644 --- a/src/test/ui/match/match-ref-mut-let-invariance.rs +++ b/src/test/ui/match/match-ref-mut-let-invariance.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that when making a ref mut binding with type `&mut T`, the // type `T` must match precisely the type `U` of the value being // matched, and in particular cannot be some supertype of `U`. Issue diff --git a/src/test/ui/match/match-ref-mut-let-invariance.stderr b/src/test/ui/match/match-ref-mut-let-invariance.stderr index cc096d68ebdcc..26ec0697f410e 100644 --- a/src/test/ui/match/match-ref-mut-let-invariance.stderr +++ b/src/test/ui/match/match-ref-mut-let-invariance.stderr @@ -1,18 +1,18 @@ error[E0308]: mismatched types - --> $DIR/match-ref-mut-let-invariance.rs:21:9 + --> $DIR/match-ref-mut-let-invariance.rs:11:9 | LL | x //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `&'a mut &'a i32` found type `&'a mut &'b i32` -note: the lifetime 'a as defined on the method body at 19:12... - --> $DIR/match-ref-mut-let-invariance.rs:19:12 +note: the lifetime 'a as defined on the method body at 9:12... + --> $DIR/match-ref-mut-let-invariance.rs:9:12 | LL | fn bar<'a>(&'a mut self) -> &'a mut &'a i32 { | ^^ -note: ...does not necessarily outlive the lifetime 'b as defined on the impl at 18:6 - --> $DIR/match-ref-mut-let-invariance.rs:18:6 +note: ...does not necessarily outlive the lifetime 'b as defined on the impl at 8:6 + --> $DIR/match-ref-mut-let-invariance.rs:8:6 | LL | impl<'b> S<'b> { | ^^ diff --git a/src/test/ui/match/match-slice-patterns.rs b/src/test/ui/match/match-slice-patterns.rs index a8ec95da3d872..afbeb61e4415a 100644 --- a/src/test/ui/match/match-slice-patterns.rs +++ b/src/test/ui/match/match-slice-patterns.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(slice_patterns)] fn check(list: &[Option<()>]) { diff --git a/src/test/ui/match/match-slice-patterns.stderr b/src/test/ui/match/match-slice-patterns.stderr index cefd7df8b78d0..2b817498aba9f 100644 --- a/src/test/ui/match/match-slice-patterns.stderr +++ b/src/test/ui/match/match-slice-patterns.stderr @@ -1,5 +1,5 @@ error[E0004]: non-exhaustive patterns: `&[_, Some(_), None, _]` not covered - --> $DIR/match-slice-patterns.rs:14:11 + --> $DIR/match-slice-patterns.rs:4:11 | LL | match list { | ^^^^ pattern `&[_, Some(_), None, _]` not covered diff --git a/src/test/ui/match/match-static-const-lc.rs b/src/test/ui/match/match-static-const-lc.rs index afc858c0c299e..c79da6e7fb8a2 100644 --- a/src/test/ui/match/match-static-const-lc.rs +++ b/src/test/ui/match/match-static-const-lc.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #7526: lowercase static constants in patterns look like bindings #![allow(dead_code)] diff --git a/src/test/ui/match/match-static-const-lc.stderr b/src/test/ui/match/match-static-const-lc.stderr index 08eb5712875e8..1ddb831bf9de9 100644 --- a/src/test/ui/match/match-static-const-lc.stderr +++ b/src/test/ui/match/match-static-const-lc.stderr @@ -1,23 +1,23 @@ error: constant in pattern `a` should have an upper case name such as `A` - --> $DIR/match-static-const-lc.rs:21:13 + --> $DIR/match-static-const-lc.rs:11:13 | LL | (0, a) => 0, | ^ | note: lint level defined here - --> $DIR/match-static-const-lc.rs:14:9 + --> $DIR/match-static-const-lc.rs:4:9 | LL | #![deny(non_upper_case_globals)] | ^^^^^^^^^^^^^^^^^^^^^^ error: constant in pattern `aha` should have an upper case name such as `AHA` - --> $DIR/match-static-const-lc.rs:36:13 + --> $DIR/match-static-const-lc.rs:26:13 | LL | (0, aha) => 0, | ^^^ error: constant in pattern `not_okay` should have an upper case name such as `NOT_OKAY` - --> $DIR/match-static-const-lc.rs:50:13 + --> $DIR/match-static-const-lc.rs:40:13 | LL | (0, not_okay) => 0, | ^^^^^^^^ diff --git a/src/test/ui/match/match-struct.rs b/src/test/ui/match/match-struct.rs index 0dbdda1f9ba1e..5961e09a200a1 100644 --- a/src/test/ui/match/match-struct.rs +++ b/src/test/ui/match/match-struct.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct S { a: isize } enum E { C(isize) } diff --git a/src/test/ui/match/match-struct.stderr b/src/test/ui/match/match-struct.stderr index 43f17b2d747b3..bad41485a53b1 100644 --- a/src/test/ui/match/match-struct.stderr +++ b/src/test/ui/match/match-struct.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/match-struct.rs:17:9 + --> $DIR/match-struct.rs:6:9 | LL | E::C(_) => (), | ^^^^^^^ expected struct `S`, found enum `E` diff --git a/src/test/ui/match/match-tag-nullary.rs b/src/test/ui/match/match-tag-nullary.rs index 0fb262003592b..486167febe10c 100644 --- a/src/test/ui/match/match-tag-nullary.rs +++ b/src/test/ui/match/match-tag-nullary.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: mismatched types enum a { A, } diff --git a/src/test/ui/match/match-tag-nullary.stderr b/src/test/ui/match/match-tag-nullary.stderr index 869d8ac7747c4..e4e7d2085f0e3 100644 --- a/src/test/ui/match/match-tag-nullary.stderr +++ b/src/test/ui/match/match-tag-nullary.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/match-tag-nullary.rs:16:40 + --> $DIR/match-tag-nullary.rs:6:40 | LL | fn main() { let x: a = a::A; match x { b::B => { } } } | ^^^^ expected enum `a`, found enum `b` diff --git a/src/test/ui/match/match-tag-unary.rs b/src/test/ui/match/match-tag-unary.rs index 48733fd423d46..26daf77a3fd38 100644 --- a/src/test/ui/match/match-tag-unary.rs +++ b/src/test/ui/match/match-tag-unary.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: mismatched types enum a { A(isize), } diff --git a/src/test/ui/match/match-tag-unary.stderr b/src/test/ui/match/match-tag-unary.stderr index bb4deee2569d1..81d843c7d2e33 100644 --- a/src/test/ui/match/match-tag-unary.stderr +++ b/src/test/ui/match/match-tag-unary.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/match-tag-unary.rs:16:43 + --> $DIR/match-tag-unary.rs:6:43 | LL | fn main() { let x: a = a::A(0); match x { b::B(y) => { } } } | ^^^^^^^ expected enum `a`, found enum `b` diff --git a/src/test/ui/match/match-unreachable-warning-with-diverging-discrim.rs b/src/test/ui/match/match-unreachable-warning-with-diverging-discrim.rs index aae0f3135d8f5..79a40af7e0ec9 100644 --- a/src/test/ui/match/match-unreachable-warning-with-diverging-discrim.rs +++ b/src/test/ui/match/match-unreachable-warning-with-diverging-discrim.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_parens)] #![deny(unreachable_code)] diff --git a/src/test/ui/match/match-unreachable-warning-with-diverging-discrim.stderr b/src/test/ui/match/match-unreachable-warning-with-diverging-discrim.stderr index 10a86f92fe151..2f887e4527e72 100644 --- a/src/test/ui/match/match-unreachable-warning-with-diverging-discrim.stderr +++ b/src/test/ui/match/match-unreachable-warning-with-diverging-discrim.stderr @@ -1,11 +1,11 @@ error: unreachable expression - --> $DIR/match-unreachable-warning-with-diverging-discrim.rs:15:5 + --> $DIR/match-unreachable-warning-with-diverging-discrim.rs:5:5 | LL | match (return) { } //~ ERROR unreachable expression | ^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/match-unreachable-warning-with-diverging-discrim.rs:12:9 + --> $DIR/match-unreachable-warning-with-diverging-discrim.rs:2:9 | LL | #![deny(unreachable_code)] | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/match/match-unresolved-one-arm.rs b/src/test/ui/match/match-unresolved-one-arm.rs index ea0f8db99e893..fa65d87b3abbd 100644 --- a/src/test/ui/match/match-unresolved-one-arm.rs +++ b/src/test/ui/match/match-unresolved-one-arm.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo() -> T { panic!("Rocks for my pillow") } fn main() { diff --git a/src/test/ui/match/match-unresolved-one-arm.stderr b/src/test/ui/match/match-unresolved-one-arm.stderr index fa689a8092b7a..b013933eaae6a 100644 --- a/src/test/ui/match/match-unresolved-one-arm.stderr +++ b/src/test/ui/match/match-unresolved-one-arm.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/match-unresolved-one-arm.rs:14:9 + --> $DIR/match-unresolved-one-arm.rs:4:9 | LL | let x = match () { //~ ERROR type annotations needed | ^ diff --git a/src/test/ui/match/match-vec-fixed.rs b/src/test/ui/match/match-vec-fixed.rs index 05971d70167bd..e611779dec274 100644 --- a/src/test/ui/match/match-vec-fixed.rs +++ b/src/test/ui/match/match-vec-fixed.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(unreachable_patterns)] fn a() { diff --git a/src/test/ui/match/match-vec-fixed.stderr b/src/test/ui/match/match-vec-fixed.stderr index 1b85034ef6bc3..f4b426bea325c 100644 --- a/src/test/ui/match/match-vec-fixed.stderr +++ b/src/test/ui/match/match-vec-fixed.stderr @@ -1,17 +1,17 @@ error: unreachable pattern - --> $DIR/match-vec-fixed.rs:17:9 + --> $DIR/match-vec-fixed.rs:7:9 | LL | [_, _, _] => {} //~ ERROR unreachable pattern | ^^^^^^^^^ | note: lint level defined here - --> $DIR/match-vec-fixed.rs:11:9 + --> $DIR/match-vec-fixed.rs:1:9 | LL | #![deny(unreachable_patterns)] | ^^^^^^^^^^^^^^^^^^^^ error: unreachable pattern - --> $DIR/match-vec-fixed.rs:21:9 + --> $DIR/match-vec-fixed.rs:11:9 | LL | [_, 1, _] => {} //~ ERROR unreachable pattern | ^^^^^^^^^ diff --git a/src/test/ui/match/match-vec-mismatch-2.rs b/src/test/ui/match/match-vec-mismatch-2.rs index 52c5375f4e7d1..553095837d3c0 100644 --- a/src/test/ui/match/match-vec-mismatch-2.rs +++ b/src/test/ui/match/match-vec-mismatch-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { match () { [()] => { } diff --git a/src/test/ui/match/match-vec-mismatch-2.stderr b/src/test/ui/match/match-vec-mismatch-2.stderr index 66f58bdff3253..5247bea62ceb9 100644 --- a/src/test/ui/match/match-vec-mismatch-2.stderr +++ b/src/test/ui/match/match-vec-mismatch-2.stderr @@ -1,5 +1,5 @@ error[E0529]: expected an array or slice, found `()` - --> $DIR/match-vec-mismatch-2.rs:13:9 + --> $DIR/match-vec-mismatch-2.rs:3:9 | LL | [()] => { } | ^^^^ pattern cannot match with input type `()` diff --git a/src/test/ui/match/match-vec-mismatch.rs b/src/test/ui/match/match-vec-mismatch.rs index d737aa0029bf8..5e61c1b22a085 100644 --- a/src/test/ui/match/match-vec-mismatch.rs +++ b/src/test/ui/match/match-vec-mismatch.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(slice_patterns)] fn main() { diff --git a/src/test/ui/match/match-vec-mismatch.stderr b/src/test/ui/match/match-vec-mismatch.stderr index c30ddf9d0fa54..93a407760a517 100644 --- a/src/test/ui/match/match-vec-mismatch.stderr +++ b/src/test/ui/match/match-vec-mismatch.stderr @@ -1,29 +1,29 @@ error[E0425]: cannot find value `does_not_exist` in this scope - --> $DIR/match-vec-mismatch.rs:38:11 + --> $DIR/match-vec-mismatch.rs:28:11 | LL | match does_not_exist { //~ ERROR cannot find value `does_not_exist` in this scope | ^^^^^^^^^^^^^^ not found in this scope error[E0529]: expected an array or slice, found `std::string::String` - --> $DIR/match-vec-mismatch.rs:15:9 + --> $DIR/match-vec-mismatch.rs:5:9 | LL | ['f', 'o', ..] => {} | ^^^^^^^^^^^^^^ pattern cannot match with input type `std::string::String` error[E0527]: pattern requires 1 elements but array has 3 - --> $DIR/match-vec-mismatch.rs:30:9 + --> $DIR/match-vec-mismatch.rs:20:9 | LL | [0] => {}, //~ ERROR pattern requires | ^^^ expected 3 elements error[E0528]: pattern requires at least 4 elements but array has 3 - --> $DIR/match-vec-mismatch.rs:35:9 + --> $DIR/match-vec-mismatch.rs:25:9 | LL | [0, 1, 2, 3, x..] => {} //~ ERROR pattern requires | ^^^^^^^^^^^^^^^^^ pattern cannot match array of 3 elements error[E0282]: type annotations needed - --> $DIR/match-vec-mismatch.rs:46:9 + --> $DIR/match-vec-mismatch.rs:36:9 | LL | [] => {} //~ ERROR type annotations needed | ^^ cannot infer type diff --git a/src/test/ui/match/match-vec-unreachable.rs b/src/test/ui/match/match-vec-unreachable.rs index d6e3fdbe08844..9e167f37ba9d9 100644 --- a/src/test/ui/match/match-vec-unreachable.rs +++ b/src/test/ui/match/match-vec-unreachable.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(slice_patterns)] #![deny(unreachable_patterns)] diff --git a/src/test/ui/match/match-vec-unreachable.stderr b/src/test/ui/match/match-vec-unreachable.stderr index e8869e86bf957..71e3d8c5e31cd 100644 --- a/src/test/ui/match/match-vec-unreachable.stderr +++ b/src/test/ui/match/match-vec-unreachable.stderr @@ -1,23 +1,23 @@ error: unreachable pattern - --> $DIR/match-vec-unreachable.rs:19:9 + --> $DIR/match-vec-unreachable.rs:9:9 | LL | [(1, 2), (2, 3), b] => (), //~ ERROR unreachable pattern | ^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/match-vec-unreachable.rs:12:9 + --> $DIR/match-vec-unreachable.rs:2:9 | LL | #![deny(unreachable_patterns)] | ^^^^^^^^^^^^^^^^^^^^ error: unreachable pattern - --> $DIR/match-vec-unreachable.rs:29:9 + --> $DIR/match-vec-unreachable.rs:19:9 | LL | [_, _, _, _, _] => { } //~ ERROR unreachable pattern | ^^^^^^^^^^^^^^^ error: unreachable pattern - --> $DIR/match-vec-unreachable.rs:37:9 + --> $DIR/match-vec-unreachable.rs:27:9 | LL | ['a', 'b', 'c'] => {} //~ ERROR unreachable pattern | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/maybe-bounds-where-cpass.rs b/src/test/ui/maybe-bounds-where-cpass.rs index f10526200ff14..f926db67ed2e7 100644 --- a/src/test/ui/maybe-bounds-where-cpass.rs +++ b/src/test/ui/maybe-bounds-where-cpass.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] struct S(*const T) where T: ?Sized; diff --git a/src/test/ui/maybe-bounds-where-cpass.stderr b/src/test/ui/maybe-bounds-where-cpass.stderr index d60e4cdffb4f5..eb0a51eba4dc6 100644 --- a/src/test/ui/maybe-bounds-where-cpass.stderr +++ b/src/test/ui/maybe-bounds-where-cpass.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/maybe-bounds-where-cpass.rs:16:1 + --> $DIR/maybe-bounds-where-cpass.rs:6:1 | LL | / fn main() { //~ ERROR compilation successful LL | | let u = vec![1, 2, 3]; diff --git a/src/test/ui/maybe-bounds-where.rs b/src/test/ui/maybe-bounds-where.rs index 211fac2ee234c..cf011653c2041 100644 --- a/src/test/ui/maybe-bounds-where.rs +++ b/src/test/ui/maybe-bounds-where.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S1(T) where (T): ?Sized; //~^ ERROR `?Trait` bounds are only permitted at the point where a type parameter is declared diff --git a/src/test/ui/maybe-bounds-where.stderr b/src/test/ui/maybe-bounds-where.stderr index 02aafecb7a4f4..562e597728ebd 100644 --- a/src/test/ui/maybe-bounds-where.stderr +++ b/src/test/ui/maybe-bounds-where.stderr @@ -1,41 +1,41 @@ error: `?Trait` bounds are only permitted at the point where a type parameter is declared - --> $DIR/maybe-bounds-where.rs:11:23 + --> $DIR/maybe-bounds-where.rs:1:23 | LL | struct S1(T) where (T): ?Sized; | ^^^ error: `?Trait` bounds are only permitted at the point where a type parameter is declared - --> $DIR/maybe-bounds-where.rs:14:23 + --> $DIR/maybe-bounds-where.rs:4:23 | LL | struct S2(T) where u8: ?Sized; | ^^ error: `?Trait` bounds are only permitted at the point where a type parameter is declared - --> $DIR/maybe-bounds-where.rs:17:23 + --> $DIR/maybe-bounds-where.rs:7:23 | LL | struct S3(T) where &'static T: ?Sized; | ^^^^^^^^^^ error: `?Trait` bounds are only permitted at the point where a type parameter is declared - --> $DIR/maybe-bounds-where.rs:22:31 + --> $DIR/maybe-bounds-where.rs:12:31 | LL | struct S4(T) where for<'a> T: ?Trait<'a>; | ^ error: `?Trait` bounds are only permitted at the point where a type parameter is declared - --> $DIR/maybe-bounds-where.rs:30:18 + --> $DIR/maybe-bounds-where.rs:20:18 | LL | fn f() where T: ?Sized {} | ^ error[E0203]: type parameter has more than one relaxed default bound, only one is supported - --> $DIR/maybe-bounds-where.rs:25:11 + --> $DIR/maybe-bounds-where.rs:15:11 | LL | struct S5(*const T) where T: ?Trait<'static> + ?Sized; | ^ warning: default bound relaxed for a type parameter, but this does nothing because the given bound is not a default. Only `?Sized` is supported - --> $DIR/maybe-bounds-where.rs:25:11 + --> $DIR/maybe-bounds-where.rs:15:11 | LL | struct S5(*const T) where T: ?Trait<'static> + ?Sized; | ^ diff --git a/src/test/ui/maybe-bounds.rs b/src/test/ui/maybe-bounds.rs index ec8a6b8ffdc9d..3e07026fb7d71 100644 --- a/src/test/ui/maybe-bounds.rs +++ b/src/test/ui/maybe-bounds.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Tr: ?Sized {} //~ ERROR `?Trait` is not permitted in supertraits type A1 = Tr + (?Sized); //~ ERROR `?Trait` is not permitted in trait object types diff --git a/src/test/ui/maybe-bounds.stderr b/src/test/ui/maybe-bounds.stderr index db8f7ad816655..58f5b790c097c 100644 --- a/src/test/ui/maybe-bounds.stderr +++ b/src/test/ui/maybe-bounds.stderr @@ -1,5 +1,5 @@ error: `?Trait` is not permitted in supertraits - --> $DIR/maybe-bounds.rs:11:11 + --> $DIR/maybe-bounds.rs:1:11 | LL | trait Tr: ?Sized {} //~ ERROR `?Trait` is not permitted in supertraits | ^^^^^^ @@ -7,13 +7,13 @@ LL | trait Tr: ?Sized {} //~ ERROR `?Trait` is not permitted in supertraits = note: traits are `?Sized` by default error: `?Trait` is not permitted in trait object types - --> $DIR/maybe-bounds.rs:13:16 + --> $DIR/maybe-bounds.rs:3:16 | LL | type A1 = Tr + (?Sized); //~ ERROR `?Trait` is not permitted in trait object types | ^^^^^^^^ error: `?Trait` is not permitted in trait object types - --> $DIR/maybe-bounds.rs:14:24 + --> $DIR/maybe-bounds.rs:4:24 | LL | type A2 = for<'a> Tr + (?Sized); //~ ERROR `?Trait` is not permitted in trait object types | ^^^^^^^^ diff --git a/src/test/ui/meta-expected-error-correct-rev.a.stderr b/src/test/ui/meta-expected-error-correct-rev.a.stderr index 20b93068c648f..b561a9e5b3afc 100644 --- a/src/test/ui/meta-expected-error-correct-rev.a.stderr +++ b/src/test/ui/meta-expected-error-correct-rev.a.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/meta-expected-error-correct-rev.rs:17:18 + --> $DIR/meta-expected-error-correct-rev.rs:7:18 | LL | let x: u32 = 22_usize; //[a]~ ERROR mismatched types | ^^^^^^^^ expected u32, found usize diff --git a/src/test/ui/meta-expected-error-correct-rev.rs b/src/test/ui/meta-expected-error-correct-rev.rs index bd70879d13e5f..b06a64b15c87c 100644 --- a/src/test/ui/meta-expected-error-correct-rev.rs +++ b/src/test/ui/meta-expected-error-correct-rev.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: a // Counterpart to `meta-expected-error-wrong-rev.rs` diff --git a/src/test/ui/methods/auxiliary/ambig_impl_2_lib.rs b/src/test/ui/methods/auxiliary/ambig_impl_2_lib.rs index 4ba0ccdba9bf7..8d6e212f2bf34 100644 --- a/src/test/ui/methods/auxiliary/ambig_impl_2_lib.rs +++ b/src/test/ui/methods/auxiliary/ambig_impl_2_lib.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait me { fn me(&self) -> usize; } diff --git a/src/test/ui/methods/auxiliary/macro-in-other-crate.rs b/src/test/ui/methods/auxiliary/macro-in-other-crate.rs index c787cedc2d0ea..feda084634abe 100644 --- a/src/test/ui/methods/auxiliary/macro-in-other-crate.rs +++ b/src/test/ui/methods/auxiliary/macro-in-other-crate.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_export] macro_rules! mac { ($ident:ident) => { let $ident = 42; } diff --git a/src/test/ui/methods/method-ambig-one-trait-unknown-int-type.rs b/src/test/ui/methods/method-ambig-one-trait-unknown-int-type.rs index 9acf5a52166e0..07e1665b08e04 100644 --- a/src/test/ui/methods/method-ambig-one-trait-unknown-int-type.rs +++ b/src/test/ui/methods/method-ambig-one-trait-unknown-int-type.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we invoking `foo()` successfully resolves to the trait `foo` // (prompting the mismatched types error) but does not influence the choice // of what kind of `Vec` we have, eventually leading to a type error. diff --git a/src/test/ui/methods/method-ambig-one-trait-unknown-int-type.stderr b/src/test/ui/methods/method-ambig-one-trait-unknown-int-type.stderr index 7f034b9e53d80..53a07f5196e4b 100644 --- a/src/test/ui/methods/method-ambig-one-trait-unknown-int-type.stderr +++ b/src/test/ui/methods/method-ambig-one-trait-unknown-int-type.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/method-ambig-one-trait-unknown-int-type.rs:34:17 + --> $DIR/method-ambig-one-trait-unknown-int-type.rs:24:17 | LL | let mut x = Vec::new(); | ----- ^^^^^^^^ cannot infer type for `T` @@ -7,7 +7,7 @@ LL | let mut x = Vec::new(); | consider giving `x` a type error[E0308]: mismatched types - --> $DIR/method-ambig-one-trait-unknown-int-type.rs:43:20 + --> $DIR/method-ambig-one-trait-unknown-int-type.rs:33:20 | LL | let y: usize = x.foo(); //~ ERROR mismatched types | ^^^^^^^ expected usize, found isize diff --git a/src/test/ui/methods/method-ambig-two-traits-cross-crate.rs b/src/test/ui/methods/method-ambig-two-traits-cross-crate.rs index c1d4551fd9ec4..9d9da490a0058 100644 --- a/src/test/ui/methods/method-ambig-two-traits-cross-crate.rs +++ b/src/test/ui/methods/method-ambig-two-traits-cross-crate.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test an ambiguity scenario where one copy of the method is available // from a trait imported from another crate. diff --git a/src/test/ui/methods/method-ambig-two-traits-cross-crate.stderr b/src/test/ui/methods/method-ambig-two-traits-cross-crate.stderr index 7a75f20f65a49..d4f40a5983847 100644 --- a/src/test/ui/methods/method-ambig-two-traits-cross-crate.stderr +++ b/src/test/ui/methods/method-ambig-two-traits-cross-crate.stderr @@ -1,11 +1,11 @@ error[E0034]: multiple applicable items in scope - --> $DIR/method-ambig-two-traits-cross-crate.rs:21:21 + --> $DIR/method-ambig-two-traits-cross-crate.rs:11:21 | LL | fn main() { 1_usize.me(); } //~ ERROR E0034 | ^^ multiple `me` found | note: candidate #1 is defined in an impl of the trait `me2` for the type `usize` - --> $DIR/method-ambig-two-traits-cross-crate.rs:20:22 + --> $DIR/method-ambig-two-traits-cross-crate.rs:10:22 | LL | impl me2 for usize { fn me(&self) -> usize { *self } } | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/methods/method-ambig-two-traits-from-bounds.rs b/src/test/ui/methods/method-ambig-two-traits-from-bounds.rs index 184927c01357a..e3cc5557f42cc 100644 --- a/src/test/ui/methods/method-ambig-two-traits-from-bounds.rs +++ b/src/test/ui/methods/method-ambig-two-traits-from-bounds.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait A { fn foo(&self); } trait B { fn foo(&self); } diff --git a/src/test/ui/methods/method-ambig-two-traits-from-bounds.stderr b/src/test/ui/methods/method-ambig-two-traits-from-bounds.stderr index 06003d900b798..a805ca3ca56b2 100644 --- a/src/test/ui/methods/method-ambig-two-traits-from-bounds.stderr +++ b/src/test/ui/methods/method-ambig-two-traits-from-bounds.stderr @@ -1,17 +1,17 @@ error[E0034]: multiple applicable items in scope - --> $DIR/method-ambig-two-traits-from-bounds.rs:15:7 + --> $DIR/method-ambig-two-traits-from-bounds.rs:5:7 | LL | t.foo(); //~ ERROR E0034 | ^^^ multiple `foo` found | note: candidate #1 is defined in the trait `A` - --> $DIR/method-ambig-two-traits-from-bounds.rs:11:11 + --> $DIR/method-ambig-two-traits-from-bounds.rs:1:11 | LL | trait A { fn foo(&self); } | ^^^^^^^^^^^^^^ = help: to disambiguate the method call, write `A::foo(t)` instead note: candidate #2 is defined in the trait `B` - --> $DIR/method-ambig-two-traits-from-bounds.rs:12:11 + --> $DIR/method-ambig-two-traits-from-bounds.rs:2:11 | LL | trait B { fn foo(&self); } | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/methods/method-ambig-two-traits-with-default-method.rs b/src/test/ui/methods/method-ambig-two-traits-with-default-method.rs index 17312fb186941..aa7094b9e6ea8 100644 --- a/src/test/ui/methods/method-ambig-two-traits-with-default-method.rs +++ b/src/test/ui/methods/method-ambig-two-traits-with-default-method.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we correctly report an ambiguity where two applicable traits // are in scope and the method being invoked is a default method not // defined directly in the impl. diff --git a/src/test/ui/methods/method-ambig-two-traits-with-default-method.stderr b/src/test/ui/methods/method-ambig-two-traits-with-default-method.stderr index d67e17d228f78..cbb1754935a97 100644 --- a/src/test/ui/methods/method-ambig-two-traits-with-default-method.stderr +++ b/src/test/ui/methods/method-ambig-two-traits-with-default-method.stderr @@ -1,16 +1,16 @@ error[E0034]: multiple applicable items in scope - --> $DIR/method-ambig-two-traits-with-default-method.rs:22:13 + --> $DIR/method-ambig-two-traits-with-default-method.rs:12:13 | LL | 1_usize.method(); //~ ERROR E0034 | ^^^^^^ multiple `method` found | note: candidate #1 is defined in an impl of the trait `Foo` for the type `usize` - --> $DIR/method-ambig-two-traits-with-default-method.rs:15:13 + --> $DIR/method-ambig-two-traits-with-default-method.rs:5:13 | LL | trait Foo { fn method(&self) {} } | ^^^^^^^^^^^^^^^^ note: candidate #2 is defined in an impl of the trait `Bar` for the type `usize` - --> $DIR/method-ambig-two-traits-with-default-method.rs:16:13 + --> $DIR/method-ambig-two-traits-with-default-method.rs:6:13 | LL | trait Bar { fn method(&self) {} } | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/methods/method-call-err-msg.rs b/src/test/ui/methods/method-call-err-msg.rs index 3434cf96fce94..e0dec0a4a705f 100644 --- a/src/test/ui/methods/method-call-err-msg.rs +++ b/src/test/ui/methods/method-call-err-msg.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that parameter cardinality or missing method error gets span exactly. pub struct Foo; diff --git a/src/test/ui/methods/method-call-err-msg.stderr b/src/test/ui/methods/method-call-err-msg.stderr index 3e5bbdfa8f84c..2113add63d61d 100644 --- a/src/test/ui/methods/method-call-err-msg.stderr +++ b/src/test/ui/methods/method-call-err-msg.stderr @@ -1,5 +1,5 @@ error[E0061]: this function takes 0 parameters but 1 parameter was supplied - --> $DIR/method-call-err-msg.rs:22:7 + --> $DIR/method-call-err-msg.rs:12:7 | LL | fn zero(self) -> Foo { self } | -------------------- defined here @@ -8,7 +8,7 @@ LL | x.zero(0) //~ ERROR this function takes 0 parameters but 1 parameter | ^^^^ expected 0 parameters error[E0061]: this function takes 1 parameter but 0 parameters were supplied - --> $DIR/method-call-err-msg.rs:23:7 + --> $DIR/method-call-err-msg.rs:13:7 | LL | fn one(self, _: isize) -> Foo { self } | ----------------------------- defined here @@ -17,7 +17,7 @@ LL | .one() //~ ERROR this function takes 1 parameter but 0 parameters | ^^^ expected 1 parameter error[E0061]: this function takes 2 parameters but 1 parameter was supplied - --> $DIR/method-call-err-msg.rs:24:7 + --> $DIR/method-call-err-msg.rs:14:7 | LL | fn two(self, _: isize, _: isize) -> Foo { self } | --------------------------------------- defined here @@ -26,7 +26,7 @@ LL | .two(0); //~ ERROR this function takes 2 parameters but 1 parameter | ^^^ expected 2 parameters error[E0599]: no method named `take` found for type `Foo` in the current scope - --> $DIR/method-call-err-msg.rs:28:7 + --> $DIR/method-call-err-msg.rs:18:7 | LL | pub struct Foo; | --------------- method `take` not found for this diff --git a/src/test/ui/methods/method-call-lifetime-args-fail.rs b/src/test/ui/methods/method-call-lifetime-args-fail.rs index 980ada9020c48..938a7f5575e35 100644 --- a/src/test/ui/methods/method-call-lifetime-args-fail.rs +++ b/src/test/ui/methods/method-call-lifetime-args-fail.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S; impl S { diff --git a/src/test/ui/methods/method-call-lifetime-args-fail.stderr b/src/test/ui/methods/method-call-lifetime-args-fail.stderr index d86a9f48e003e..e5a2809262ea3 100644 --- a/src/test/ui/methods/method-call-lifetime-args-fail.stderr +++ b/src/test/ui/methods/method-call-lifetime-args-fail.stderr @@ -1,191 +1,191 @@ error[E0090]: wrong number of lifetime arguments: expected 2, found 1 - --> $DIR/method-call-lifetime-args-fail.rs:26:7 + --> $DIR/method-call-lifetime-args-fail.rs:16:7 | LL | S.early::<'static>(); | ^^^^^ expected 2 lifetime arguments error[E0088]: wrong number of lifetime arguments: expected 2, found 3 - --> $DIR/method-call-lifetime-args-fail.rs:28:33 + --> $DIR/method-call-lifetime-args-fail.rs:18:33 | LL | S.early::<'static, 'static, 'static>(); | ^^^^^^^ unexpected lifetime argument error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-fail.rs:37:15 + --> $DIR/method-call-lifetime-args-fail.rs:27:15 | LL | S::late::<'static>(S, &0, &0); | ^^^^^^^ | note: the late bound lifetime parameter is introduced here - --> $DIR/method-call-lifetime-args-fail.rs:14:13 + --> $DIR/method-call-lifetime-args-fail.rs:4:13 | LL | fn late<'a, 'b>(self, _: &'a u8, _: &'b u8) {} | ^^ error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-fail.rs:39:15 + --> $DIR/method-call-lifetime-args-fail.rs:29:15 | LL | S::late::<'static, 'static>(S, &0, &0); | ^^^^^^^ | note: the late bound lifetime parameter is introduced here - --> $DIR/method-call-lifetime-args-fail.rs:14:13 + --> $DIR/method-call-lifetime-args-fail.rs:4:13 | LL | fn late<'a, 'b>(self, _: &'a u8, _: &'b u8) {} | ^^ error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-fail.rs:41:15 + --> $DIR/method-call-lifetime-args-fail.rs:31:15 | LL | S::late::<'static, 'static, 'static>(S, &0, &0); | ^^^^^^^ | note: the late bound lifetime parameter is introduced here - --> $DIR/method-call-lifetime-args-fail.rs:14:13 + --> $DIR/method-call-lifetime-args-fail.rs:4:13 | LL | fn late<'a, 'b>(self, _: &'a u8, _: &'b u8) {} | ^^ error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-fail.rs:44:21 + --> $DIR/method-call-lifetime-args-fail.rs:34:21 | LL | S::late_early::<'static, 'static>(S, &0); | ^^^^^^^ | note: the late bound lifetime parameter is introduced here - --> $DIR/method-call-lifetime-args-fail.rs:17:19 + --> $DIR/method-call-lifetime-args-fail.rs:7:19 | LL | fn late_early<'a, 'b>(self, _: &'a u8) -> &'b u8 { loop {} } | ^^ error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-fail.rs:46:21 + --> $DIR/method-call-lifetime-args-fail.rs:36:21 | LL | S::late_early::<'static, 'static, 'static>(S, &0); | ^^^^^^^ | note: the late bound lifetime parameter is introduced here - --> $DIR/method-call-lifetime-args-fail.rs:17:19 + --> $DIR/method-call-lifetime-args-fail.rs:7:19 | LL | fn late_early<'a, 'b>(self, _: &'a u8) -> &'b u8 { loop {} } | ^^ error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-fail.rs:50:24 + --> $DIR/method-call-lifetime-args-fail.rs:40:24 | LL | S::late_implicit::<'static>(S, &0, &0); | ^^^^^^^ | note: the late bound lifetime parameter is introduced here - --> $DIR/method-call-lifetime-args-fail.rs:15:31 + --> $DIR/method-call-lifetime-args-fail.rs:5:31 | LL | fn late_implicit(self, _: &u8, _: &u8) {} | ^ error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-fail.rs:52:24 + --> $DIR/method-call-lifetime-args-fail.rs:42:24 | LL | S::late_implicit::<'static, 'static>(S, &0, &0); | ^^^^^^^ | note: the late bound lifetime parameter is introduced here - --> $DIR/method-call-lifetime-args-fail.rs:15:31 + --> $DIR/method-call-lifetime-args-fail.rs:5:31 | LL | fn late_implicit(self, _: &u8, _: &u8) {} | ^ error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-fail.rs:54:24 + --> $DIR/method-call-lifetime-args-fail.rs:44:24 | LL | S::late_implicit::<'static, 'static, 'static>(S, &0, &0); | ^^^^^^^ | note: the late bound lifetime parameter is introduced here - --> $DIR/method-call-lifetime-args-fail.rs:15:31 + --> $DIR/method-call-lifetime-args-fail.rs:5:31 | LL | fn late_implicit(self, _: &u8, _: &u8) {} | ^ error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-fail.rs:57:30 + --> $DIR/method-call-lifetime-args-fail.rs:47:30 | LL | S::late_implicit_early::<'static, 'static>(S, &0); | ^^^^^^^ | note: the late bound lifetime parameter is introduced here - --> $DIR/method-call-lifetime-args-fail.rs:18:41 + --> $DIR/method-call-lifetime-args-fail.rs:8:41 | LL | fn late_implicit_early<'b>(self, _: &u8) -> &'b u8 { loop {} } | ^ error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-fail.rs:59:30 + --> $DIR/method-call-lifetime-args-fail.rs:49:30 | LL | S::late_implicit_early::<'static, 'static, 'static>(S, &0); | ^^^^^^^ | note: the late bound lifetime parameter is introduced here - --> $DIR/method-call-lifetime-args-fail.rs:18:41 + --> $DIR/method-call-lifetime-args-fail.rs:8:41 | LL | fn late_implicit_early<'b>(self, _: &u8) -> &'b u8 { loop {} } | ^ error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-fail.rs:62:35 + --> $DIR/method-call-lifetime-args-fail.rs:52:35 | LL | S::late_implicit_self_early::<'static, 'static>(&S); | ^^^^^^^ | note: the late bound lifetime parameter is introduced here - --> $DIR/method-call-lifetime-args-fail.rs:19:37 + --> $DIR/method-call-lifetime-args-fail.rs:9:37 | LL | fn late_implicit_self_early<'b>(&self) -> &'b u8 { loop {} } | ^ error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-fail.rs:64:35 + --> $DIR/method-call-lifetime-args-fail.rs:54:35 | LL | S::late_implicit_self_early::<'static, 'static, 'static>(&S); | ^^^^^^^ | note: the late bound lifetime parameter is introduced here - --> $DIR/method-call-lifetime-args-fail.rs:19:37 + --> $DIR/method-call-lifetime-args-fail.rs:9:37 | LL | fn late_implicit_self_early<'b>(&self) -> &'b u8 { loop {} } | ^ error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-fail.rs:67:28 + --> $DIR/method-call-lifetime-args-fail.rs:57:28 | LL | S::late_unused_early::<'static, 'static>(S); | ^^^^^^^ | note: the late bound lifetime parameter is introduced here - --> $DIR/method-call-lifetime-args-fail.rs:20:26 + --> $DIR/method-call-lifetime-args-fail.rs:10:26 | LL | fn late_unused_early<'a, 'b>(self) -> &'b u8 { loop {} } | ^^ error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-fail.rs:69:28 + --> $DIR/method-call-lifetime-args-fail.rs:59:28 | LL | S::late_unused_early::<'static, 'static, 'static>(S); | ^^^^^^^ | note: the late bound lifetime parameter is introduced here - --> $DIR/method-call-lifetime-args-fail.rs:20:26 + --> $DIR/method-call-lifetime-args-fail.rs:10:26 | LL | fn late_unused_early<'a, 'b>(self) -> &'b u8 { loop {} } | ^^ error[E0090]: wrong number of lifetime arguments: expected 2, found 1 - --> $DIR/method-call-lifetime-args-fail.rs:73:5 + --> $DIR/method-call-lifetime-args-fail.rs:63:5 | LL | S::early::<'static>(S); | ^^^^^^^^^^^^^^^^^^^ expected 2 lifetime arguments error[E0088]: wrong number of lifetime arguments: expected 2, found 3 - --> $DIR/method-call-lifetime-args-fail.rs:75:34 + --> $DIR/method-call-lifetime-args-fail.rs:65:34 | LL | S::early::<'static, 'static, 'static>(S); | ^^^^^^^ unexpected lifetime argument diff --git a/src/test/ui/methods/method-call-lifetime-args-lint-fail.rs b/src/test/ui/methods/method-call-lifetime-args-lint-fail.rs index b2a94e0af420d..36a1a2fda6995 100644 --- a/src/test/ui/methods/method-call-lifetime-args-lint-fail.rs +++ b/src/test/ui/methods/method-call-lifetime-args-lint-fail.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(late_bound_lifetime_arguments)] #![allow(unused)] diff --git a/src/test/ui/methods/method-call-lifetime-args-lint-fail.stderr b/src/test/ui/methods/method-call-lifetime-args-lint-fail.stderr index 34747edc2a0ae..b510a08ae3775 100644 --- a/src/test/ui/methods/method-call-lifetime-args-lint-fail.stderr +++ b/src/test/ui/methods/method-call-lifetime-args-lint-fail.stderr @@ -1,5 +1,5 @@ error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-lint-fail.rs:33:14 + --> $DIR/method-call-lifetime-args-lint-fail.rs:23:14 | LL | fn late<'a, 'b>(self, _: &'a u8, _: &'b u8) {} | -- the late bound lifetime parameter is introduced here @@ -8,7 +8,7 @@ LL | S.late::<'static>(&0, &0); | ^^^^^^^ | note: lint level defined here - --> $DIR/method-call-lifetime-args-lint-fail.rs:11:9 + --> $DIR/method-call-lifetime-args-lint-fail.rs:1:9 | LL | #![deny(late_bound_lifetime_arguments)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -16,7 +16,7 @@ LL | #![deny(late_bound_lifetime_arguments)] = note: for more information, see issue #42868 error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-lint-fail.rs:36:14 + --> $DIR/method-call-lifetime-args-lint-fail.rs:26:14 | LL | fn late<'a, 'b>(self, _: &'a u8, _: &'b u8) {} | -- the late bound lifetime parameter is introduced here @@ -28,7 +28,7 @@ LL | S.late::<'static, 'static>(&0, &0); = note: for more information, see issue #42868 error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-lint-fail.rs:39:14 + --> $DIR/method-call-lifetime-args-lint-fail.rs:29:14 | LL | fn late<'a, 'b>(self, _: &'a u8, _: &'b u8) {} | -- the late bound lifetime parameter is introduced here @@ -40,7 +40,7 @@ LL | S.late::<'static, 'static, 'static>(&0, &0); = note: for more information, see issue #42868 error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-lint-fail.rs:43:20 + --> $DIR/method-call-lifetime-args-lint-fail.rs:33:20 | LL | fn late_early<'a, 'b>(self, _: &'a u8) -> &'b u8 { loop {} } | -- the late bound lifetime parameter is introduced here @@ -52,7 +52,7 @@ LL | S.late_early::<'static>(&0); = note: for more information, see issue #42868 error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-lint-fail.rs:46:20 + --> $DIR/method-call-lifetime-args-lint-fail.rs:36:20 | LL | fn late_early<'a, 'b>(self, _: &'a u8) -> &'b u8 { loop {} } | -- the late bound lifetime parameter is introduced here @@ -64,7 +64,7 @@ LL | S.late_early::<'static, 'static>(&0); = note: for more information, see issue #42868 error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-lint-fail.rs:49:20 + --> $DIR/method-call-lifetime-args-lint-fail.rs:39:20 | LL | fn late_early<'a, 'b>(self, _: &'a u8) -> &'b u8 { loop {} } | -- the late bound lifetime parameter is introduced here @@ -76,7 +76,7 @@ LL | S.late_early::<'static, 'static, 'static>(&0); = note: for more information, see issue #42868 error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-lint-fail.rs:54:23 + --> $DIR/method-call-lifetime-args-lint-fail.rs:44:23 | LL | fn late_implicit(self, _: &u8, _: &u8) {} | - the late bound lifetime parameter is introduced here @@ -88,7 +88,7 @@ LL | S.late_implicit::<'static>(&0, &0); = note: for more information, see issue #42868 error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-lint-fail.rs:57:23 + --> $DIR/method-call-lifetime-args-lint-fail.rs:47:23 | LL | fn late_implicit(self, _: &u8, _: &u8) {} | - the late bound lifetime parameter is introduced here @@ -100,7 +100,7 @@ LL | S.late_implicit::<'static, 'static>(&0, &0); = note: for more information, see issue #42868 error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-lint-fail.rs:60:23 + --> $DIR/method-call-lifetime-args-lint-fail.rs:50:23 | LL | fn late_implicit(self, _: &u8, _: &u8) {} | - the late bound lifetime parameter is introduced here @@ -112,7 +112,7 @@ LL | S.late_implicit::<'static, 'static, 'static>(&0, &0); = note: for more information, see issue #42868 error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-lint-fail.rs:64:29 + --> $DIR/method-call-lifetime-args-lint-fail.rs:54:29 | LL | fn late_implicit_early<'b>(self, _: &u8) -> &'b u8 { loop {} } | - the late bound lifetime parameter is introduced here @@ -124,7 +124,7 @@ LL | S.late_implicit_early::<'static>(&0); = note: for more information, see issue #42868 error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-lint-fail.rs:67:29 + --> $DIR/method-call-lifetime-args-lint-fail.rs:57:29 | LL | fn late_implicit_early<'b>(self, _: &u8) -> &'b u8 { loop {} } | - the late bound lifetime parameter is introduced here @@ -136,7 +136,7 @@ LL | S.late_implicit_early::<'static, 'static>(&0); = note: for more information, see issue #42868 error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-lint-fail.rs:70:29 + --> $DIR/method-call-lifetime-args-lint-fail.rs:60:29 | LL | fn late_implicit_early<'b>(self, _: &u8) -> &'b u8 { loop {} } | - the late bound lifetime parameter is introduced here @@ -148,7 +148,7 @@ LL | S.late_implicit_early::<'static, 'static, 'static>(&0); = note: for more information, see issue #42868 error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-lint-fail.rs:79:21 + --> $DIR/method-call-lifetime-args-lint-fail.rs:69:21 | LL | fn late_early<'a, 'b>(self, _: &'a u8) -> &'b u8 { loop {} } | -- the late bound lifetime parameter is introduced here @@ -160,7 +160,7 @@ LL | S::late_early::<'static>(S, &0); = note: for more information, see issue #42868 error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-lint-fail.rs:83:30 + --> $DIR/method-call-lifetime-args-lint-fail.rs:73:30 | LL | fn late_implicit_early<'b>(self, _: &u8) -> &'b u8 { loop {} } | - the late bound lifetime parameter is introduced here @@ -172,7 +172,7 @@ LL | S::late_implicit_early::<'static>(S, &0); = note: for more information, see issue #42868 error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-lint-fail.rs:92:9 + --> $DIR/method-call-lifetime-args-lint-fail.rs:82:9 | LL | fn f<'early, 'late, T: 'early>() {} | ----- the late bound lifetime parameter is introduced here diff --git a/src/test/ui/methods/method-call-lifetime-args-lint.rs b/src/test/ui/methods/method-call-lifetime-args-lint.rs index f9a4f712e571c..14729e1e27e3c 100644 --- a/src/test/ui/methods/method-call-lifetime-args-lint.rs +++ b/src/test/ui/methods/method-call-lifetime-args-lint.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(late_bound_lifetime_arguments)] #![allow(unused)] diff --git a/src/test/ui/methods/method-call-lifetime-args-lint.stderr b/src/test/ui/methods/method-call-lifetime-args-lint.stderr index 1cb6804fa47fb..eb1d4fe2e504e 100644 --- a/src/test/ui/methods/method-call-lifetime-args-lint.stderr +++ b/src/test/ui/methods/method-call-lifetime-args-lint.stderr @@ -1,5 +1,5 @@ error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-lint.rs:22:14 + --> $DIR/method-call-lifetime-args-lint.rs:12:14 | LL | fn late<'a, 'b>(self, _: &'a u8, _: &'b u8) {} | -- the late bound lifetime parameter is introduced here @@ -8,7 +8,7 @@ LL | S.late::<'static>(&0, &0); | ^^^^^^^ | note: lint level defined here - --> $DIR/method-call-lifetime-args-lint.rs:11:9 + --> $DIR/method-call-lifetime-args-lint.rs:1:9 | LL | #![deny(late_bound_lifetime_arguments)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -16,7 +16,7 @@ LL | #![deny(late_bound_lifetime_arguments)] = note: for more information, see issue #42868 error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-lint.rs:26:23 + --> $DIR/method-call-lifetime-args-lint.rs:16:23 | LL | fn late_implicit(self, _: &u8, _: &u8) {} | - the late bound lifetime parameter is introduced here diff --git a/src/test/ui/methods/method-call-lifetime-args-subst-index.rs b/src/test/ui/methods/method-call-lifetime-args-subst-index.rs index a9505e4f936a1..9ae4300551496 100644 --- a/src/test/ui/methods/method-call-lifetime-args-subst-index.rs +++ b/src/test/ui/methods/method-call-lifetime-args-subst-index.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![allow(unused)] diff --git a/src/test/ui/methods/method-call-lifetime-args-subst-index.stderr b/src/test/ui/methods/method-call-lifetime-args-subst-index.stderr index 2848ff88c174c..a1c4e7c44ca7f 100644 --- a/src/test/ui/methods/method-call-lifetime-args-subst-index.stderr +++ b/src/test/ui/methods/method-call-lifetime-args-subst-index.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/method-call-lifetime-args-subst-index.rs:25:1 + --> $DIR/method-call-lifetime-args-subst-index.rs:15:1 | LL | fn main() {} //~ ERROR compilation successful | ^^^^^^^^^^^^ diff --git a/src/test/ui/methods/method-call-lifetime-args-unresolved.rs b/src/test/ui/methods/method-call-lifetime-args-unresolved.rs index 4910bfaf4f60d..d16ba3df47b63 100644 --- a/src/test/ui/methods/method-call-lifetime-args-unresolved.rs +++ b/src/test/ui/methods/method-call-lifetime-args-unresolved.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { 0.clone::<'a>(); //~ ERROR use of undeclared lifetime name `'a` } diff --git a/src/test/ui/methods/method-call-lifetime-args-unresolved.stderr b/src/test/ui/methods/method-call-lifetime-args-unresolved.stderr index 8eb860d947435..25432177a8598 100644 --- a/src/test/ui/methods/method-call-lifetime-args-unresolved.stderr +++ b/src/test/ui/methods/method-call-lifetime-args-unresolved.stderr @@ -1,5 +1,5 @@ error[E0261]: use of undeclared lifetime name `'a` - --> $DIR/method-call-lifetime-args-unresolved.rs:12:15 + --> $DIR/method-call-lifetime-args-unresolved.rs:2:15 | LL | 0.clone::<'a>(); //~ ERROR use of undeclared lifetime name `'a` | ^^ undeclared lifetime diff --git a/src/test/ui/methods/method-call-lifetime-args.rs b/src/test/ui/methods/method-call-lifetime-args.rs index 7ce3ebb8beec4..3292e9fcdf80b 100644 --- a/src/test/ui/methods/method-call-lifetime-args.rs +++ b/src/test/ui/methods/method-call-lifetime-args.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S; impl S { diff --git a/src/test/ui/methods/method-call-lifetime-args.stderr b/src/test/ui/methods/method-call-lifetime-args.stderr index 8bc48cc8e734c..64ae79e9bb2b7 100644 --- a/src/test/ui/methods/method-call-lifetime-args.stderr +++ b/src/test/ui/methods/method-call-lifetime-args.stderr @@ -1,23 +1,23 @@ error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args.rs:19:15 + --> $DIR/method-call-lifetime-args.rs:9:15 | LL | S::late::<'static>(S, &0, &0); | ^^^^^^^ | note: the late bound lifetime parameter is introduced here - --> $DIR/method-call-lifetime-args.rs:14:13 + --> $DIR/method-call-lifetime-args.rs:4:13 | LL | fn late<'a, 'b>(self, _: &'a u8, _: &'b u8) {} | ^^ error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args.rs:21:24 + --> $DIR/method-call-lifetime-args.rs:11:24 | LL | S::late_implicit::<'static>(S, &0, &0); | ^^^^^^^ | note: the late bound lifetime parameter is introduced here - --> $DIR/method-call-lifetime-args.rs:15:31 + --> $DIR/method-call-lifetime-args.rs:5:31 | LL | fn late_implicit(self, _: &u8, _: &u8) {} | ^ diff --git a/src/test/ui/methods/method-call-type-binding.rs b/src/test/ui/methods/method-call-type-binding.rs index 6c0793ee78f19..f547ca8d1c2ac 100644 --- a/src/test/ui/methods/method-call-type-binding.rs +++ b/src/test/ui/methods/method-call-type-binding.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { 0.clone::(); //~ ERROR associated type bindings are not allowed here } diff --git a/src/test/ui/methods/method-call-type-binding.stderr b/src/test/ui/methods/method-call-type-binding.stderr index aafc84804b5e3..27d6f93490bb8 100644 --- a/src/test/ui/methods/method-call-type-binding.stderr +++ b/src/test/ui/methods/method-call-type-binding.stderr @@ -1,5 +1,5 @@ error[E0229]: associated type bindings are not allowed here - --> $DIR/method-call-type-binding.rs:12:15 + --> $DIR/method-call-type-binding.rs:2:15 | LL | 0.clone::(); //~ ERROR associated type bindings are not allowed here | ^^^^^^ associated type not allowed here diff --git a/src/test/ui/methods/method-macro-backtrace.rs b/src/test/ui/methods/method-macro-backtrace.rs index f3c227849dcbe..00fe32b7c152a 100644 --- a/src/test/ui/methods/method-macro-backtrace.rs +++ b/src/test/ui/methods/method-macro-backtrace.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // forbid-output: in this expansion of macro_rules! make_method { diff --git a/src/test/ui/methods/method-macro-backtrace.stderr b/src/test/ui/methods/method-macro-backtrace.stderr index 28f46dba1ccab..81098bbceb052 100644 --- a/src/test/ui/methods/method-macro-backtrace.stderr +++ b/src/test/ui/methods/method-macro-backtrace.stderr @@ -1,5 +1,5 @@ error[E0201]: duplicate definitions with name `bar`: - --> $DIR/method-macro-backtrace.rs:32:5 + --> $DIR/method-macro-backtrace.rs:22:5 | LL | fn bar(&self) { } | ----------------- previous definition of `bar` here diff --git a/src/test/ui/methods/method-missing-call.rs b/src/test/ui/methods/method-missing-call.rs index 7a6ea94d977d4..7ce1e9a4f1bda 100644 --- a/src/test/ui/methods/method-missing-call.rs +++ b/src/test/ui/methods/method-missing-call.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests to make sure that parens are needed for method calls without arguments. // outputs text to make sure either an anonymous function is provided or // open-close '()' parens are given diff --git a/src/test/ui/methods/method-missing-call.stderr b/src/test/ui/methods/method-missing-call.stderr index 82d04cb06dd4c..22c907ed0024e 100644 --- a/src/test/ui/methods/method-missing-call.stderr +++ b/src/test/ui/methods/method-missing-call.stderr @@ -1,13 +1,13 @@ error[E0615]: attempted to take value of method `get_x` on type `Point` - --> $DIR/method-missing-call.rs:32:26 + --> $DIR/method-missing-call.rs:22:26 | LL | .get_x;//~ ERROR attempted to take value of method `get_x` on type `Point` | ^^^^^ | = help: maybe a `()` to call it is missing? -error[E0615]: attempted to take value of method `filter_map` on type `std::iter::Filter, [closure@$DIR/method-missing-call.rs:37:20: 37:25]>, [closure@$DIR/method-missing-call.rs:38:23: 38:35]>` - --> $DIR/method-missing-call.rs:39:16 +error[E0615]: attempted to take value of method `filter_map` on type `std::iter::Filter, [closure@$DIR/method-missing-call.rs:27:20: 27:25]>, [closure@$DIR/method-missing-call.rs:28:23: 28:35]>` + --> $DIR/method-missing-call.rs:29:16 | LL | .filter_map; //~ ERROR attempted to take value of method `filter_map` on type | ^^^^^^^^^^ diff --git a/src/test/ui/methods/method-on-ambiguous-numeric-type.rs b/src/test/ui/methods/method-on-ambiguous-numeric-type.rs index 2b6e830ec5962..82f47438d5053 100644 --- a/src/test/ui/methods/method-on-ambiguous-numeric-type.rs +++ b/src/test/ui/methods/method-on-ambiguous-numeric-type.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:macro-in-other-crate.rs #[macro_use] extern crate macro_in_other_crate; diff --git a/src/test/ui/methods/method-on-ambiguous-numeric-type.stderr b/src/test/ui/methods/method-on-ambiguous-numeric-type.stderr index 796520e0ec71b..40e765abe2784 100644 --- a/src/test/ui/methods/method-on-ambiguous-numeric-type.stderr +++ b/src/test/ui/methods/method-on-ambiguous-numeric-type.stderr @@ -1,5 +1,5 @@ error[E0689]: can't call method `neg` on ambiguous numeric type `{float}` - --> $DIR/method-on-ambiguous-numeric-type.rs:20:17 + --> $DIR/method-on-ambiguous-numeric-type.rs:10:17 | LL | let x = 2.0.neg(); | ^^^ @@ -9,7 +9,7 @@ LL | let x = 2.0_f32.neg(); | ^^^^^^^ error[E0689]: can't call method `neg` on ambiguous numeric type `{float}` - --> $DIR/method-on-ambiguous-numeric-type.rs:24:15 + --> $DIR/method-on-ambiguous-numeric-type.rs:14:15 | LL | let x = y.neg(); | ^^^ @@ -19,7 +19,7 @@ LL | let y: f32 = 2.0; | ^^^^^^ error[E0689]: can't call method `pow` on ambiguous numeric type `{integer}` - --> $DIR/method-on-ambiguous-numeric-type.rs:29:26 + --> $DIR/method-on-ambiguous-numeric-type.rs:19:26 | LL | for i in 0..100 { | - you must specify a type for this binding, like `i32` @@ -27,7 +27,7 @@ LL | println!("{}", i.pow(2)); | ^^^ error[E0689]: can't call method `pow` on ambiguous numeric type `{integer}` - --> $DIR/method-on-ambiguous-numeric-type.rs:34:15 + --> $DIR/method-on-ambiguous-numeric-type.rs:24:15 | LL | local_bar.pow(2); | ^^^ @@ -37,7 +37,7 @@ LL | ($ident:ident) => { let $ident: i32 = 42; } | ^^^^^^^^^^^ error[E0689]: can't call method `pow` on ambiguous numeric type `{integer}` - --> $DIR/method-on-ambiguous-numeric-type.rs:40:9 + --> $DIR/method-on-ambiguous-numeric-type.rs:30:9 | LL | mac!(bar); | ---------- you must specify a type for this binding, like `i32` diff --git a/src/test/ui/methods/method-path-in-pattern.rs b/src/test/ui/methods/method-path-in-pattern.rs index 671a518073c37..fb1cf7f71e70a 100644 --- a/src/test/ui/methods/method-path-in-pattern.rs +++ b/src/test/ui/methods/method-path-in-pattern.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo; impl Foo { diff --git a/src/test/ui/methods/method-path-in-pattern.stderr b/src/test/ui/methods/method-path-in-pattern.stderr index 1fae336c79c58..03d6509c915d5 100644 --- a/src/test/ui/methods/method-path-in-pattern.stderr +++ b/src/test/ui/methods/method-path-in-pattern.stderr @@ -1,17 +1,17 @@ error[E0533]: expected unit struct/variant or constant, found method `::bar` - --> $DIR/method-path-in-pattern.rs:25:9 + --> $DIR/method-path-in-pattern.rs:15:9 | LL | Foo::bar => {} | ^^^^^^^^ error[E0533]: expected unit struct/variant or constant, found method `::bar` - --> $DIR/method-path-in-pattern.rs:29:9 + --> $DIR/method-path-in-pattern.rs:19:9 | LL | ::bar => {} | ^^^^^^^^^^ error[E0533]: expected unit struct/variant or constant, found method `::trait_bar` - --> $DIR/method-path-in-pattern.rs:33:9 + --> $DIR/method-path-in-pattern.rs:23:9 | LL | ::trait_bar => {} | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/methods/method-resolvable-path-in-pattern.rs b/src/test/ui/methods/method-resolvable-path-in-pattern.rs index 4d8959466b948..1d373cfa6a767 100644 --- a/src/test/ui/methods/method-resolvable-path-in-pattern.rs +++ b/src/test/ui/methods/method-resolvable-path-in-pattern.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo; trait MyTrait { diff --git a/src/test/ui/methods/method-resolvable-path-in-pattern.stderr b/src/test/ui/methods/method-resolvable-path-in-pattern.stderr index c86367dac087b..f631c92172021 100644 --- a/src/test/ui/methods/method-resolvable-path-in-pattern.stderr +++ b/src/test/ui/methods/method-resolvable-path-in-pattern.stderr @@ -1,5 +1,5 @@ error[E0532]: expected unit struct/variant or constant, found method `MyTrait::trait_bar` - --> $DIR/method-resolvable-path-in-pattern.rs:21:9 + --> $DIR/method-resolvable-path-in-pattern.rs:11:9 | LL | ::trait_bar => {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ not a unit struct/variant or constant diff --git a/src/test/ui/methods/method-self-arg-1.rs b/src/test/ui/methods/method-self-arg-1.rs index 4c8800878f07d..48be31d94f2ee 100644 --- a/src/test/ui/methods/method-self-arg-1.rs +++ b/src/test/ui/methods/method-self-arg-1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test method calls with self as an argument cannot subvert type checking. struct Foo; diff --git a/src/test/ui/methods/method-self-arg-1.stderr b/src/test/ui/methods/method-self-arg-1.stderr index 4a5ac2b5aed81..0756e9b68f2a3 100644 --- a/src/test/ui/methods/method-self-arg-1.stderr +++ b/src/test/ui/methods/method-self-arg-1.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/method-self-arg-1.rs:21:14 + --> $DIR/method-self-arg-1.rs:11:14 | LL | Foo::bar(x); //~ ERROR mismatched types | ^ @@ -11,7 +11,7 @@ LL | Foo::bar(x); //~ ERROR mismatched types found type `Foo` error[E0308]: mismatched types - --> $DIR/method-self-arg-1.rs:25:14 + --> $DIR/method-self-arg-1.rs:15:14 | LL | Foo::bar(&42); //~ ERROR mismatched types | ^^^ expected struct `Foo`, found integral variable diff --git a/src/test/ui/methods/method-self-arg-2.nll.stderr b/src/test/ui/methods/method-self-arg-2.nll.stderr index f876aa281d111..536480c9d001f 100644 --- a/src/test/ui/methods/method-self-arg-2.nll.stderr +++ b/src/test/ui/methods/method-self-arg-2.nll.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable - --> $DIR/method-self-arg-2.rs:25:14 + --> $DIR/method-self-arg-2.rs:15:14 | LL | let y = &mut x; | ------ mutable borrow occurs here @@ -9,7 +9,7 @@ LL | y.use_mut(); | - borrow later used here error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/method-self-arg-2.rs:30:14 + --> $DIR/method-self-arg-2.rs:20:14 | LL | let y = &mut x; | ------ first mutable borrow occurs here diff --git a/src/test/ui/methods/method-self-arg-2.rs b/src/test/ui/methods/method-self-arg-2.rs index cba4e6da6d99b..0f8c048ac989d 100644 --- a/src/test/ui/methods/method-self-arg-2.rs +++ b/src/test/ui/methods/method-self-arg-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test method calls with self as an argument cannot subvert borrow checking. diff --git a/src/test/ui/methods/method-self-arg-2.stderr b/src/test/ui/methods/method-self-arg-2.stderr index 0bfa6034135a2..9746ac316d92f 100644 --- a/src/test/ui/methods/method-self-arg-2.stderr +++ b/src/test/ui/methods/method-self-arg-2.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable - --> $DIR/method-self-arg-2.rs:25:15 + --> $DIR/method-self-arg-2.rs:15:15 | LL | let y = &mut x; | - mutable borrow occurs here @@ -10,7 +10,7 @@ LL | } | - mutable borrow ends here error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/method-self-arg-2.rs:30:19 + --> $DIR/method-self-arg-2.rs:20:19 | LL | let y = &mut x; | - first mutable borrow occurs here diff --git a/src/test/ui/minus-string.rs b/src/test/ui/minus-string.rs index 1ba30c67a03cf..946c587ce43b4 100644 --- a/src/test/ui/minus-string.rs +++ b/src/test/ui/minus-string.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:cannot apply unary operator `-` to type `std::string::String` fn main() { -"foo".to_string(); } diff --git a/src/test/ui/minus-string.stderr b/src/test/ui/minus-string.stderr index cbbb11ae33a15..9177082cf0b7d 100644 --- a/src/test/ui/minus-string.stderr +++ b/src/test/ui/minus-string.stderr @@ -1,5 +1,5 @@ error[E0600]: cannot apply unary operator `-` to type `std::string::String` - --> $DIR/minus-string.rs:13:13 + --> $DIR/minus-string.rs:3:13 | LL | fn main() { -"foo".to_string(); } | ^^^^^^^^^^^^^^^^^^ cannot apply unary operator `-` diff --git a/src/test/ui/mir-dataflow/def-inits-1.rs b/src/test/ui/mir-dataflow/def-inits-1.rs index f5f0ede6864f4..07ac1900bc71c 100644 --- a/src/test/ui/mir-dataflow/def-inits-1.rs +++ b/src/test/ui/mir-dataflow/def-inits-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // General test of maybe_uninits state computed by MIR dataflow. #![feature(nll)] diff --git a/src/test/ui/mir-dataflow/def-inits-1.stderr b/src/test/ui/mir-dataflow/def-inits-1.stderr index 84d3c66ac33f9..93debd6c15d5a 100644 --- a/src/test/ui/mir-dataflow/def-inits-1.stderr +++ b/src/test/ui/mir-dataflow/def-inits-1.stderr @@ -1,23 +1,23 @@ error: rustc_peek: bit not set - --> $DIR/def-inits-1.rs:25:14 + --> $DIR/def-inits-1.rs:15:14 | LL | unsafe { rustc_peek(&ret); } //~ ERROR rustc_peek: bit not set | ^^^^^^^^^^^^^^^^ error: rustc_peek: bit not set - --> $DIR/def-inits-1.rs:41:14 + --> $DIR/def-inits-1.rs:31:14 | LL | unsafe { rustc_peek(&z); } //~ ERROR rustc_peek: bit not set | ^^^^^^^^^^^^^^ error: rustc_peek: bit not set - --> $DIR/def-inits-1.rs:44:14 + --> $DIR/def-inits-1.rs:34:14 | LL | unsafe { rustc_peek(&y); } //~ ERROR rustc_peek: bit not set | ^^^^^^^^^^^^^^ error: rustc_peek: bit not set - --> $DIR/def-inits-1.rs:52:14 + --> $DIR/def-inits-1.rs:42:14 | LL | unsafe { rustc_peek(&x); } //~ ERROR rustc_peek: bit not set | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/mir-dataflow/inits-1.rs b/src/test/ui/mir-dataflow/inits-1.rs index 595f01f7c94b3..13f900e4a75ee 100644 --- a/src/test/ui/mir-dataflow/inits-1.rs +++ b/src/test/ui/mir-dataflow/inits-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // General test of maybe_inits state computed by MIR dataflow. #![feature(nll)] diff --git a/src/test/ui/mir-dataflow/inits-1.stderr b/src/test/ui/mir-dataflow/inits-1.stderr index c39c9c8efba3e..7ee61e6be2c8c 100644 --- a/src/test/ui/mir-dataflow/inits-1.stderr +++ b/src/test/ui/mir-dataflow/inits-1.stderr @@ -1,17 +1,17 @@ error: rustc_peek: bit not set - --> $DIR/inits-1.rs:25:14 + --> $DIR/inits-1.rs:15:14 | LL | unsafe { rustc_peek(&ret); } //~ ERROR rustc_peek: bit not set | ^^^^^^^^^^^^^^^^ error: rustc_peek: bit not set - --> $DIR/inits-1.rs:45:14 + --> $DIR/inits-1.rs:35:14 | LL | unsafe { rustc_peek(&y); } //~ ERROR rustc_peek: bit not set | ^^^^^^^^^^^^^^ error: rustc_peek: bit not set - --> $DIR/inits-1.rs:53:14 + --> $DIR/inits-1.rs:43:14 | LL | unsafe { rustc_peek(&x); } //~ ERROR rustc_peek: bit not set | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/mir-dataflow/uninits-1.rs b/src/test/ui/mir-dataflow/uninits-1.rs index bb10c03254e3c..4c64359693296 100644 --- a/src/test/ui/mir-dataflow/uninits-1.rs +++ b/src/test/ui/mir-dataflow/uninits-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // General test of maybe_uninits state computed by MIR dataflow. #![feature(nll)] diff --git a/src/test/ui/mir-dataflow/uninits-1.stderr b/src/test/ui/mir-dataflow/uninits-1.stderr index c76012404ef82..21ad0b3c2c16e 100644 --- a/src/test/ui/mir-dataflow/uninits-1.stderr +++ b/src/test/ui/mir-dataflow/uninits-1.stderr @@ -1,29 +1,29 @@ error: rustc_peek: bit not set - --> $DIR/uninits-1.rs:29:14 + --> $DIR/uninits-1.rs:19:14 | LL | unsafe { rustc_peek(&x) }; //~ ERROR rustc_peek: bit not set | ^^^^^^^^^^^^^^ error: rustc_peek: bit not set - --> $DIR/uninits-1.rs:30:14 + --> $DIR/uninits-1.rs:20:14 | LL | unsafe { rustc_peek(&y) }; //~ ERROR rustc_peek: bit not set | ^^^^^^^^^^^^^^ error: rustc_peek: bit not set - --> $DIR/uninits-1.rs:31:14 + --> $DIR/uninits-1.rs:21:14 | LL | unsafe { rustc_peek(&z) }; //~ ERROR rustc_peek: bit not set | ^^^^^^^^^^^^^^ error: rustc_peek: bit not set - --> $DIR/uninits-1.rs:47:14 + --> $DIR/uninits-1.rs:37:14 | LL | unsafe { rustc_peek(&x); } //~ ERROR rustc_peek: bit not set | ^^^^^^^^^^^^^^ error: rustc_peek: bit not set - --> $DIR/uninits-1.rs:55:14 + --> $DIR/uninits-1.rs:45:14 | LL | unsafe { rustc_peek(&ret); } //~ ERROR rustc_peek: bit not set | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/mir-dataflow/uninits-2.rs b/src/test/ui/mir-dataflow/uninits-2.rs index 9854ea779b3ad..2247e68d097fc 100644 --- a/src/test/ui/mir-dataflow/uninits-2.rs +++ b/src/test/ui/mir-dataflow/uninits-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // General test of maybe_uninits state computed by MIR dataflow. #![feature(nll)] diff --git a/src/test/ui/mir-dataflow/uninits-2.stderr b/src/test/ui/mir-dataflow/uninits-2.stderr index 8ed735111bd2f..08959ce3b1329 100644 --- a/src/test/ui/mir-dataflow/uninits-2.stderr +++ b/src/test/ui/mir-dataflow/uninits-2.stderr @@ -1,5 +1,5 @@ error: rustc_peek: bit not set - --> $DIR/uninits-2.rs:25:14 + --> $DIR/uninits-2.rs:15:14 | LL | unsafe { rustc_peek(&x) }; //~ ERROR rustc_peek: bit not set | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/mir-unpretty.rs b/src/test/ui/mir-unpretty.rs index fa9365021575f..30620c69feae3 100644 --- a/src/test/ui/mir-unpretty.rs +++ b/src/test/ui/mir-unpretty.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z unpretty=mir fn main() { diff --git a/src/test/ui/mir-unpretty.stderr b/src/test/ui/mir-unpretty.stderr index 5a53b69ebbb59..913999c2290ba 100644 --- a/src/test/ui/mir-unpretty.stderr +++ b/src/test/ui/mir-unpretty.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/mir-unpretty.rs:14:17 + --> $DIR/mir-unpretty.rs:4:17 | LL | let x: () = 0; //~ ERROR: mismatched types | ^ expected (), found integral variable diff --git a/src/test/ui/mir_check_nonconst.rs b/src/test/ui/mir_check_nonconst.rs index 898ee8bbd44ed..b8ec0c3c449ff 100644 --- a/src/test/ui/mir_check_nonconst.rs +++ b/src/test/ui/mir_check_nonconst.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] struct Foo { a: u8 } diff --git a/src/test/ui/mir_check_nonconst.stderr b/src/test/ui/mir_check_nonconst.stderr index 1fddaf30576c5..30f68ba43722d 100644 --- a/src/test/ui/mir_check_nonconst.stderr +++ b/src/test/ui/mir_check_nonconst.stderr @@ -1,5 +1,5 @@ error[E0015]: calls in statics are limited to constant functions, tuple structs and tuple variants - --> $DIR/mir_check_nonconst.rs:18:19 + --> $DIR/mir_check_nonconst.rs:8:19 | LL | static foo: Foo = bar(); | ^^^^^ diff --git a/src/test/ui/mismatched_types/E0053.rs b/src/test/ui/mismatched_types/E0053.rs index c09d6673aebcc..d3146ce549057 100644 --- a/src/test/ui/mismatched_types/E0053.rs +++ b/src/test/ui/mismatched_types/E0053.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn foo(x: u16); fn bar(&self); diff --git a/src/test/ui/mismatched_types/E0053.stderr b/src/test/ui/mismatched_types/E0053.stderr index f707a600f29e3..582772d6fb368 100644 --- a/src/test/ui/mismatched_types/E0053.stderr +++ b/src/test/ui/mismatched_types/E0053.stderr @@ -1,5 +1,5 @@ error[E0053]: method `foo` has an incompatible type for trait - --> $DIR/E0053.rs:19:15 + --> $DIR/E0053.rs:9:15 | LL | fn foo(x: u16); | --- type in trait @@ -11,7 +11,7 @@ LL | fn foo(x: i16) { } found type `fn(i16)` error[E0053]: method `bar` has an incompatible type for trait - --> $DIR/E0053.rs:21:12 + --> $DIR/E0053.rs:11:12 | LL | fn bar(&self); | ----- type in trait diff --git a/src/test/ui/mismatched_types/E0409.rs b/src/test/ui/mismatched_types/E0409.rs index 345020f2eae10..3710534cc0e34 100644 --- a/src/test/ui/mismatched_types/E0409.rs +++ b/src/test/ui/mismatched_types/E0409.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = (0, 2); diff --git a/src/test/ui/mismatched_types/E0409.stderr b/src/test/ui/mismatched_types/E0409.stderr index a1bfcafe05399..4d5bfceb74e95 100644 --- a/src/test/ui/mismatched_types/E0409.stderr +++ b/src/test/ui/mismatched_types/E0409.stderr @@ -1,5 +1,5 @@ error[E0409]: variable `y` is bound in inconsistent ways within the same match arm - --> $DIR/E0409.rs:15:23 + --> $DIR/E0409.rs:5:23 | LL | (0, ref y) | (y, 0) => {} //~ ERROR E0409 | - ^ bound in different ways @@ -7,7 +7,7 @@ LL | (0, ref y) | (y, 0) => {} //~ ERROR E0409 | first binding error[E0308]: mismatched types - --> $DIR/E0409.rs:15:23 + --> $DIR/E0409.rs:5:23 | LL | (0, ref y) | (y, 0) => {} //~ ERROR E0409 | ^ expected &{integer}, found integral variable diff --git a/src/test/ui/mismatched_types/E0631.rs b/src/test/ui/mismatched_types/E0631.rs index 7e5490b37c43e..a293946583069 100644 --- a/src/test/ui/mismatched_types/E0631.rs +++ b/src/test/ui/mismatched_types/E0631.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unboxed_closures)] fn foo(_: F) {} diff --git a/src/test/ui/mismatched_types/E0631.stderr b/src/test/ui/mismatched_types/E0631.stderr index 647e0a215aa53..df320a2059b85 100644 --- a/src/test/ui/mismatched_types/E0631.stderr +++ b/src/test/ui/mismatched_types/E0631.stderr @@ -1,5 +1,5 @@ error[E0631]: type mismatch in closure arguments - --> $DIR/E0631.rs:17:5 + --> $DIR/E0631.rs:7:5 | LL | foo(|_: isize| {}); //~ ERROR type mismatch | ^^^ ---------- found signature of `fn(isize) -> _` @@ -7,13 +7,13 @@ LL | foo(|_: isize| {}); //~ ERROR type mismatch | expected signature of `fn(usize) -> _` | note: required by `foo` - --> $DIR/E0631.rs:13:1 + --> $DIR/E0631.rs:3:1 | LL | fn foo(_: F) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0631]: type mismatch in closure arguments - --> $DIR/E0631.rs:18:5 + --> $DIR/E0631.rs:8:5 | LL | bar(|_: isize| {}); //~ ERROR type mismatch | ^^^ ---------- found signature of `fn(isize) -> _` @@ -21,13 +21,13 @@ LL | bar(|_: isize| {}); //~ ERROR type mismatch | expected signature of `fn(usize) -> _` | note: required by `bar` - --> $DIR/E0631.rs:14:1 + --> $DIR/E0631.rs:4:1 | LL | fn bar>(_: F) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0631]: type mismatch in function arguments - --> $DIR/E0631.rs:19:5 + --> $DIR/E0631.rs:9:5 | LL | fn f(_: u64) {} | ------------ found signature of `fn(u64) -> _` @@ -36,13 +36,13 @@ LL | foo(f); //~ ERROR type mismatch | ^^^ expected signature of `fn(usize) -> _` | note: required by `foo` - --> $DIR/E0631.rs:13:1 + --> $DIR/E0631.rs:3:1 | LL | fn foo(_: F) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0631]: type mismatch in function arguments - --> $DIR/E0631.rs:20:5 + --> $DIR/E0631.rs:10:5 | LL | fn f(_: u64) {} | ------------ found signature of `fn(u64) -> _` @@ -51,7 +51,7 @@ LL | bar(f); //~ ERROR type mismatch | ^^^ expected signature of `fn(usize) -> _` | note: required by `bar` - --> $DIR/E0631.rs:14:1 + --> $DIR/E0631.rs:4:1 | LL | fn bar>(_: F) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/mismatched_types/abridged.rs b/src/test/ui/mismatched_types/abridged.rs index f496df58f734e..41ab6d4c57844 100644 --- a/src/test/ui/mismatched_types/abridged.rs +++ b/src/test/ui/mismatched_types/abridged.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Bar { Qux, Zar, diff --git a/src/test/ui/mismatched_types/abridged.stderr b/src/test/ui/mismatched_types/abridged.stderr index 1b2ea514f3e93..5256148c771f3 100644 --- a/src/test/ui/mismatched_types/abridged.stderr +++ b/src/test/ui/mismatched_types/abridged.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/abridged.rs:26:5 + --> $DIR/abridged.rs:16:5 | LL | fn a() -> Foo { | --- expected `Foo` because of return type @@ -10,7 +10,7 @@ LL | Some(Foo { bar: 1 }) //~ ERROR mismatched types found type `std::option::Option` error[E0308]: mismatched types - --> $DIR/abridged.rs:30:5 + --> $DIR/abridged.rs:20:5 | LL | fn a2() -> Foo { | --- expected `Foo` because of return type @@ -21,7 +21,7 @@ LL | Ok(Foo { bar: 1}) //~ ERROR mismatched types found type `std::result::Result` error[E0308]: mismatched types - --> $DIR/abridged.rs:34:5 + --> $DIR/abridged.rs:24:5 | LL | fn b() -> Option { | ----------- expected `std::option::Option` because of return type @@ -32,7 +32,7 @@ LL | Foo { bar: 1 } //~ ERROR mismatched types found type `Foo` error[E0308]: mismatched types - --> $DIR/abridged.rs:38:5 + --> $DIR/abridged.rs:28:5 | LL | fn c() -> Result { | ---------------- expected `std::result::Result` because of return type @@ -43,7 +43,7 @@ LL | Foo { bar: 1 } //~ ERROR mismatched types found type `Foo` error[E0308]: mismatched types - --> $DIR/abridged.rs:49:5 + --> $DIR/abridged.rs:39:5 | LL | fn d() -> X, String> { | ---------------------------- expected `X, std::string::String>` because of return type @@ -55,7 +55,7 @@ LL | x //~ ERROR mismatched types found type `X, {integer}>` error[E0308]: mismatched types - --> $DIR/abridged.rs:60:5 + --> $DIR/abridged.rs:50:5 | LL | fn e() -> X, String> { | ---------------------------- expected `X, std::string::String>` because of return type diff --git a/src/test/ui/mismatched_types/binops.rs b/src/test/ui/mismatched_types/binops.rs index 86785f24f3637..621599ddb8f9d 100644 --- a/src/test/ui/mismatched_types/binops.rs +++ b/src/test/ui/mismatched_types/binops.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { 1 + Some(1); //~ ERROR cannot add `std::option::Option<{integer}>` to `{integer}` 2 as usize - Some(1); //~ ERROR cannot subtract `std::option::Option<{integer}>` from `usize` diff --git a/src/test/ui/mismatched_types/binops.stderr b/src/test/ui/mismatched_types/binops.stderr index 4c6d95efadb15..76ea0ab54c3dc 100644 --- a/src/test/ui/mismatched_types/binops.stderr +++ b/src/test/ui/mismatched_types/binops.stderr @@ -1,5 +1,5 @@ error[E0277]: cannot add `std::option::Option<{integer}>` to `{integer}` - --> $DIR/binops.rs:12:7 + --> $DIR/binops.rs:2:7 | LL | 1 + Some(1); //~ ERROR cannot add `std::option::Option<{integer}>` to `{integer}` | ^ no implementation for `{integer} + std::option::Option<{integer}>` @@ -7,7 +7,7 @@ LL | 1 + Some(1); //~ ERROR cannot add `std::option::Option<{integer}>` to ` = help: the trait `std::ops::Add>` is not implemented for `{integer}` error[E0277]: cannot subtract `std::option::Option<{integer}>` from `usize` - --> $DIR/binops.rs:13:16 + --> $DIR/binops.rs:3:16 | LL | 2 as usize - Some(1); //~ ERROR cannot subtract `std::option::Option<{integer}>` from `usize` | ^ no implementation for `usize - std::option::Option<{integer}>` @@ -15,7 +15,7 @@ LL | 2 as usize - Some(1); //~ ERROR cannot subtract `std::option::Option<{i = help: the trait `std::ops::Sub>` is not implemented for `usize` error[E0277]: cannot multiply `()` to `{integer}` - --> $DIR/binops.rs:14:7 + --> $DIR/binops.rs:4:7 | LL | 3 * (); //~ ERROR cannot multiply `()` to `{integer}` | ^ no implementation for `{integer} * ()` @@ -23,7 +23,7 @@ LL | 3 * (); //~ ERROR cannot multiply `()` to `{integer}` = help: the trait `std::ops::Mul<()>` is not implemented for `{integer}` error[E0277]: cannot divide `{integer}` by `&str` - --> $DIR/binops.rs:15:7 + --> $DIR/binops.rs:5:7 | LL | 4 / ""; //~ ERROR cannot divide `{integer}` by `&str` | ^ no implementation for `{integer} / &str` @@ -31,7 +31,7 @@ LL | 4 / ""; //~ ERROR cannot divide `{integer}` by `&str` = help: the trait `std::ops::Div<&str>` is not implemented for `{integer}` error[E0277]: can't compare `{integer}` with `std::string::String` - --> $DIR/binops.rs:16:7 + --> $DIR/binops.rs:6:7 | LL | 5 < String::new(); //~ ERROR can't compare `{integer}` with `std::string::String` | ^ no implementation for `{integer} < std::string::String` and `{integer} > std::string::String` @@ -39,7 +39,7 @@ LL | 5 < String::new(); //~ ERROR can't compare `{integer}` with `std::strin = help: the trait `std::cmp::PartialOrd` is not implemented for `{integer}` error[E0277]: can't compare `{integer}` with `std::result::Result<{integer}, _>` - --> $DIR/binops.rs:17:7 + --> $DIR/binops.rs:7:7 | LL | 6 == Ok(1); //~ ERROR can't compare `{integer}` with `std::result::Result<{integer}, _>` | ^^ no implementation for `{integer} == std::result::Result<{integer}, _>` diff --git a/src/test/ui/mismatched_types/cast-rfc0401.rs b/src/test/ui/mismatched_types/cast-rfc0401.rs index 6be6bb4391ae6..a5e03a18e6af2 100644 --- a/src/test/ui/mismatched_types/cast-rfc0401.rs +++ b/src/test/ui/mismatched_types/cast-rfc0401.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn illegal_cast(u: *const U) -> *const V { u as *const V //~ ERROR is invalid diff --git a/src/test/ui/mismatched_types/cast-rfc0401.stderr b/src/test/ui/mismatched_types/cast-rfc0401.stderr index 81fe49328116d..e220349c6df12 100644 --- a/src/test/ui/mismatched_types/cast-rfc0401.stderr +++ b/src/test/ui/mismatched_types/cast-rfc0401.stderr @@ -1,5 +1,5 @@ error[E0606]: casting `*const U` as `*const V` is invalid - --> $DIR/cast-rfc0401.rs:13:5 + --> $DIR/cast-rfc0401.rs:3:5 | LL | u as *const V //~ ERROR is invalid | ^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | u as *const V //~ ERROR is invalid = note: vtable kinds may not match error[E0606]: casting `*const U` as `*const str` is invalid - --> $DIR/cast-rfc0401.rs:18:5 + --> $DIR/cast-rfc0401.rs:8:5 | LL | u as *const str //~ ERROR is invalid | ^^^^^^^^^^^^^^^ @@ -15,13 +15,13 @@ LL | u as *const str //~ ERROR is invalid = note: vtable kinds may not match error[E0609]: no field `f` on type `fn() {main}` - --> $DIR/cast-rfc0401.rs:75:18 + --> $DIR/cast-rfc0401.rs:65:18 | LL | let _ = main.f as *const u32; //~ ERROR no field | ^ error[E0605]: non-primitive cast: `*const u8` as `&u8` - --> $DIR/cast-rfc0401.rs:39:13 + --> $DIR/cast-rfc0401.rs:29:13 | LL | let _ = v as &u8; //~ ERROR non-primitive cast | ^^^^^^^^ @@ -29,7 +29,7 @@ LL | let _ = v as &u8; //~ ERROR non-primitive cast = note: an `as` expression can only be used to convert between primitive types. Consider using the `From` trait error[E0605]: non-primitive cast: `*const u8` as `E` - --> $DIR/cast-rfc0401.rs:40:13 + --> $DIR/cast-rfc0401.rs:30:13 | LL | let _ = v as E; //~ ERROR non-primitive cast | ^^^^^^ @@ -37,7 +37,7 @@ LL | let _ = v as E; //~ ERROR non-primitive cast = note: an `as` expression can only be used to convert between primitive types. Consider using the `From` trait error[E0605]: non-primitive cast: `*const u8` as `fn()` - --> $DIR/cast-rfc0401.rs:41:13 + --> $DIR/cast-rfc0401.rs:31:13 | LL | let _ = v as fn(); //~ ERROR non-primitive cast | ^^^^^^^^^ @@ -45,7 +45,7 @@ LL | let _ = v as fn(); //~ ERROR non-primitive cast = note: an `as` expression can only be used to convert between primitive types. Consider using the `From` trait error[E0605]: non-primitive cast: `*const u8` as `(u32,)` - --> $DIR/cast-rfc0401.rs:42:13 + --> $DIR/cast-rfc0401.rs:32:13 | LL | let _ = v as (u32,); //~ ERROR non-primitive cast | ^^^^^^^^^^^ @@ -53,7 +53,7 @@ LL | let _ = v as (u32,); //~ ERROR non-primitive cast = note: an `as` expression can only be used to convert between primitive types. Consider using the `From` trait error[E0605]: non-primitive cast: `std::option::Option<&*const u8>` as `*const u8` - --> $DIR/cast-rfc0401.rs:43:13 + --> $DIR/cast-rfc0401.rs:33:13 | LL | let _ = Some(&v) as *const u8; //~ ERROR non-primitive cast | ^^^^^^^^^^^^^^^^^^^^^ @@ -61,19 +61,19 @@ LL | let _ = Some(&v) as *const u8; //~ ERROR non-primitive cast = note: an `as` expression can only be used to convert between primitive types. Consider using the `From` trait error[E0606]: casting `*const u8` as `f32` is invalid - --> $DIR/cast-rfc0401.rs:45:13 + --> $DIR/cast-rfc0401.rs:35:13 | LL | let _ = v as f32; //~ ERROR is invalid | ^^^^^^^^ error[E0606]: casting `fn() {main}` as `f64` is invalid - --> $DIR/cast-rfc0401.rs:46:13 + --> $DIR/cast-rfc0401.rs:36:13 | LL | let _ = main as f64; //~ ERROR is invalid | ^^^^^^^^^^^ error[E0606]: casting `&*const u8` as `usize` is invalid - --> $DIR/cast-rfc0401.rs:47:13 + --> $DIR/cast-rfc0401.rs:37:13 | LL | let _ = &v as usize; //~ ERROR is invalid | ^^^^^^^^^^^ @@ -81,13 +81,13 @@ LL | let _ = &v as usize; //~ ERROR is invalid = help: cast through a raw pointer first error[E0606]: casting `f32` as `*const u8` is invalid - --> $DIR/cast-rfc0401.rs:48:13 + --> $DIR/cast-rfc0401.rs:38:13 | LL | let _ = f as *const u8; //~ ERROR is invalid | ^^^^^^^^^^^^^^ error[E0054]: cannot cast as `bool` - --> $DIR/cast-rfc0401.rs:49:13 + --> $DIR/cast-rfc0401.rs:39:13 | LL | let _ = 3_i32 as bool; //~ ERROR cannot cast | ^^^^^^^^^^^^^ unsupported cast @@ -95,7 +95,7 @@ LL | let _ = 3_i32 as bool; //~ ERROR cannot cast = help: compare with zero instead error[E0054]: cannot cast as `bool` - --> $DIR/cast-rfc0401.rs:50:13 + --> $DIR/cast-rfc0401.rs:40:13 | LL | let _ = E::A as bool; //~ ERROR cannot cast | ^^^^^^^^^^^^ unsupported cast @@ -103,13 +103,13 @@ LL | let _ = E::A as bool; //~ ERROR cannot cast = help: compare with zero instead error[E0604]: only `u8` can be cast as `char`, not `u32` - --> $DIR/cast-rfc0401.rs:51:13 + --> $DIR/cast-rfc0401.rs:41:13 | LL | let _ = 0x61u32 as char; //~ ERROR can be cast as | ^^^^^^^^^^^^^^^ error[E0606]: casting `bool` as `f32` is invalid - --> $DIR/cast-rfc0401.rs:53:13 + --> $DIR/cast-rfc0401.rs:43:13 | LL | let _ = false as f32; //~ ERROR is invalid | ^^^^^^^^^^^^ @@ -117,7 +117,7 @@ LL | let _ = false as f32; //~ ERROR is invalid = help: cast through an integer first error[E0606]: casting `E` as `f32` is invalid - --> $DIR/cast-rfc0401.rs:54:13 + --> $DIR/cast-rfc0401.rs:44:13 | LL | let _ = E::A as f32; //~ ERROR is invalid | ^^^^^^^^^^^ @@ -125,7 +125,7 @@ LL | let _ = E::A as f32; //~ ERROR is invalid = help: cast through an integer first error[E0606]: casting `char` as `f32` is invalid - --> $DIR/cast-rfc0401.rs:55:13 + --> $DIR/cast-rfc0401.rs:45:13 | LL | let _ = 'a' as f32; //~ ERROR is invalid | ^^^^^^^^^^ @@ -133,67 +133,67 @@ LL | let _ = 'a' as f32; //~ ERROR is invalid = help: cast through an integer first error[E0606]: casting `bool` as `*const u8` is invalid - --> $DIR/cast-rfc0401.rs:57:13 + --> $DIR/cast-rfc0401.rs:47:13 | LL | let _ = false as *const u8; //~ ERROR is invalid | ^^^^^^^^^^^^^^^^^^ error[E0606]: casting `E` as `*const u8` is invalid - --> $DIR/cast-rfc0401.rs:58:13 + --> $DIR/cast-rfc0401.rs:48:13 | LL | let _ = E::A as *const u8; //~ ERROR is invalid | ^^^^^^^^^^^^^^^^^ error[E0606]: casting `char` as `*const u8` is invalid - --> $DIR/cast-rfc0401.rs:59:13 + --> $DIR/cast-rfc0401.rs:49:13 | LL | let _ = 'a' as *const u8; //~ ERROR is invalid | ^^^^^^^^^^^^^^^^ error[E0606]: casting `usize` as `*const [u8]` is invalid - --> $DIR/cast-rfc0401.rs:61:13 + --> $DIR/cast-rfc0401.rs:51:13 | LL | let _ = 42usize as *const [u8]; //~ ERROR is invalid | ^^^^^^^^^^^^^^^^^^^^^^ error[E0607]: cannot cast thin pointer `*const u8` to fat pointer `*const [u8]` - --> $DIR/cast-rfc0401.rs:62:13 + --> $DIR/cast-rfc0401.rs:52:13 | LL | let _ = v as *const [u8]; //~ ERROR cannot cast | ^^^^^^^^^^^^^^^^ error[E0606]: casting `&dyn Foo` as `*const str` is invalid - --> $DIR/cast-rfc0401.rs:64:13 + --> $DIR/cast-rfc0401.rs:54:13 | LL | let _ = foo as *const str; //~ ERROR is invalid | ^^^^^^^^^^^^^^^^^ error[E0606]: casting `&dyn Foo` as `*mut str` is invalid - --> $DIR/cast-rfc0401.rs:65:13 + --> $DIR/cast-rfc0401.rs:55:13 | LL | let _ = foo as *mut str; //~ ERROR is invalid | ^^^^^^^^^^^^^^^ error[E0606]: casting `fn() {main}` as `*mut str` is invalid - --> $DIR/cast-rfc0401.rs:66:13 + --> $DIR/cast-rfc0401.rs:56:13 | LL | let _ = main as *mut str; //~ ERROR is invalid | ^^^^^^^^^^^^^^^^ error[E0606]: casting `&f32` as `*mut f32` is invalid - --> $DIR/cast-rfc0401.rs:67:13 + --> $DIR/cast-rfc0401.rs:57:13 | LL | let _ = &f as *mut f32; //~ ERROR is invalid | ^^^^^^^^^^^^^^ error[E0606]: casting `&f32` as `*const f64` is invalid - --> $DIR/cast-rfc0401.rs:68:13 + --> $DIR/cast-rfc0401.rs:58:13 | LL | let _ = &f as *const f64; //~ ERROR is invalid | ^^^^^^^^^^^^^^^^ error[E0606]: casting `*const [i8]` as `usize` is invalid - --> $DIR/cast-rfc0401.rs:69:13 + --> $DIR/cast-rfc0401.rs:59:13 | LL | let _ = fat_sv as usize; //~ ERROR is invalid | ^^^^^^^^^^^^^^^ @@ -201,7 +201,7 @@ LL | let _ = fat_sv as usize; //~ ERROR is invalid = help: cast through a thin pointer first error[E0606]: casting `*const dyn Foo` as `*const [u16]` is invalid - --> $DIR/cast-rfc0401.rs:78:13 + --> $DIR/cast-rfc0401.rs:68:13 | LL | let _ = cf as *const [u16]; //~ ERROR is invalid | ^^^^^^^^^^^^^^^^^^ @@ -209,7 +209,7 @@ LL | let _ = cf as *const [u16]; //~ ERROR is invalid = note: vtable kinds may not match error[E0606]: casting `*const dyn Foo` as `*const dyn Bar` is invalid - --> $DIR/cast-rfc0401.rs:79:13 + --> $DIR/cast-rfc0401.rs:69:13 | LL | let _ = cf as *const Bar; //~ ERROR is invalid | ^^^^^^^^^^^^^^^^ @@ -217,7 +217,7 @@ LL | let _ = cf as *const Bar; //~ ERROR is invalid = note: vtable kinds may not match error[E0277]: the size for values of type `[u8]` cannot be known at compilation time - --> $DIR/cast-rfc0401.rs:63:13 + --> $DIR/cast-rfc0401.rs:53:13 | LL | let _ = fat_v as *const Foo; //~ ERROR the size for values of type | ^^^^^ doesn't have a size known at compile-time @@ -227,7 +227,7 @@ LL | let _ = fat_v as *const Foo; //~ ERROR the size for values of type = note: required for the cast to the object type `dyn Foo` error[E0277]: the size for values of type `str` cannot be known at compilation time - --> $DIR/cast-rfc0401.rs:72:13 + --> $DIR/cast-rfc0401.rs:62:13 | LL | let _ = a as *const Foo; //~ ERROR the size for values of type | ^ doesn't have a size known at compile-time @@ -237,13 +237,13 @@ LL | let _ = a as *const Foo; //~ ERROR the size for values of type = note: required for the cast to the object type `dyn Foo` error[E0606]: casting `&{float}` as `f32` is invalid - --> $DIR/cast-rfc0401.rs:81:30 + --> $DIR/cast-rfc0401.rs:71:30 | LL | vec![0.0].iter().map(|s| s as f32).collect::>(); //~ ERROR is invalid | ^^^^^^^^ cannot cast `&{float}` as `f32` | help: did you mean `*s`? - --> $DIR/cast-rfc0401.rs:81:30 + --> $DIR/cast-rfc0401.rs:71:30 | LL | vec![0.0].iter().map(|s| s as f32).collect::>(); //~ ERROR is invalid | ^ diff --git a/src/test/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.fixed b/src/test/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.fixed index 1a7608fea6e27..efba0543b483e 100644 --- a/src/test/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.fixed +++ b/src/test/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.fixed @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #47244: in this specific scenario, when the // expected type indicated 1 argument but the closure takes two, we // would (early on) create type variables for the type of `b`. If the diff --git a/src/test/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.rs b/src/test/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.rs index 0ca0753490a2f..3ddb93d12f7d8 100644 --- a/src/test/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.rs +++ b/src/test/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #47244: in this specific scenario, when the // expected type indicated 1 argument but the closure takes two, we // would (early on) create type variables for the type of `b`. If the diff --git a/src/test/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.stderr b/src/test/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.stderr index c95d8157b0ce1..00a4f9d48ffe5 100644 --- a/src/test/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.stderr +++ b/src/test/ui/mismatched_types/closure-arg-count-expected-type-issue-47244.stderr @@ -1,5 +1,5 @@ error[E0593]: closure is expected to take a single 2-tuple as argument, but it takes 2 distinct arguments - --> $DIR/closure-arg-count-expected-type-issue-47244.rs:26:23 + --> $DIR/closure-arg-count-expected-type-issue-47244.rs:16:23 | LL | let _n = m.iter().map(|_, b| { | ^^^ ------ takes 2 distinct arguments diff --git a/src/test/ui/mismatched_types/closure-arg-count.rs b/src/test/ui/mismatched_types/closure-arg-count.rs index 9eb11148a8bce..fb3b20024695e 100644 --- a/src/test/ui/mismatched_types/closure-arg-count.rs +++ b/src/test/ui/mismatched_types/closure-arg-count.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unboxed_closures)] fn f>(_: F) {} diff --git a/src/test/ui/mismatched_types/closure-arg-count.stderr b/src/test/ui/mismatched_types/closure-arg-count.stderr index 057cf6efa1dea..5e9318fd39663 100644 --- a/src/test/ui/mismatched_types/closure-arg-count.stderr +++ b/src/test/ui/mismatched_types/closure-arg-count.stderr @@ -1,5 +1,5 @@ error[E0593]: closure is expected to take 2 arguments, but it takes 0 arguments - --> $DIR/closure-arg-count.rs:15:15 + --> $DIR/closure-arg-count.rs:5:15 | LL | [1, 2, 3].sort_by(|| panic!()); | ^^^^^^^ -- takes 0 arguments @@ -11,7 +11,7 @@ LL | [1, 2, 3].sort_by(|_, _| panic!()); | ^^^^^^ error[E0593]: closure is expected to take 2 arguments, but it takes 1 argument - --> $DIR/closure-arg-count.rs:17:15 + --> $DIR/closure-arg-count.rs:7:15 | LL | [1, 2, 3].sort_by(|tuple| panic!()); | ^^^^^^^ ------- takes 1 argument @@ -19,7 +19,7 @@ LL | [1, 2, 3].sort_by(|tuple| panic!()); | expected closure that takes 2 arguments error[E0593]: closure is expected to take 2 distinct arguments, but it takes a single 2-tuple as argument - --> $DIR/closure-arg-count.rs:19:15 + --> $DIR/closure-arg-count.rs:9:15 | LL | [1, 2, 3].sort_by(|(tuple, tuple2)| panic!()); | ^^^^^^^ ----------------- takes a single 2-tuple as argument @@ -31,7 +31,7 @@ LL | [1, 2, 3].sort_by(|tuple, tuple2| panic!()); | ^^^^^^^^^^^^^^^ error[E0593]: closure is expected to take 2 distinct arguments, but it takes a single 2-tuple as argument - --> $DIR/closure-arg-count.rs:21:15 + --> $DIR/closure-arg-count.rs:11:15 | LL | [1, 2, 3].sort_by(|(tuple, tuple2): (usize, _)| panic!()); | ^^^^^^^ ----------------------------- takes a single 2-tuple as argument @@ -43,7 +43,7 @@ LL | [1, 2, 3].sort_by(|tuple, tuple2| panic!()); | ^^^^^^^^^^^^^^^ error[E0593]: closure is expected to take 1 argument, but it takes 0 arguments - --> $DIR/closure-arg-count.rs:23:5 + --> $DIR/closure-arg-count.rs:13:5 | LL | f(|| panic!()); | ^ -- takes 0 arguments @@ -51,7 +51,7 @@ LL | f(|| panic!()); | expected closure that takes 1 argument | note: required by `f` - --> $DIR/closure-arg-count.rs:13:1 + --> $DIR/closure-arg-count.rs:3:1 | LL | fn f>(_: F) {} | ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -61,7 +61,7 @@ LL | f(|_| panic!()); | ^^^ error[E0593]: closure is expected to take a single 2-tuple as argument, but it takes 2 distinct arguments - --> $DIR/closure-arg-count.rs:26:53 + --> $DIR/closure-arg-count.rs:16:53 | LL | let _it = vec![1, 2, 3].into_iter().enumerate().map(|i, x| i); | ^^^ ------ takes 2 distinct arguments @@ -73,7 +73,7 @@ LL | let _it = vec![1, 2, 3].into_iter().enumerate().map(|(i, x)| i); | ^^^^^^^^ error[E0593]: closure is expected to take a single 2-tuple as argument, but it takes 2 distinct arguments - --> $DIR/closure-arg-count.rs:28:53 + --> $DIR/closure-arg-count.rs:18:53 | LL | let _it = vec![1, 2, 3].into_iter().enumerate().map(|i: usize, x| i); | ^^^ ------------- takes 2 distinct arguments @@ -85,7 +85,7 @@ LL | let _it = vec![1, 2, 3].into_iter().enumerate().map(|(i, x)| i); | ^^^^^^^^ error[E0593]: closure is expected to take a single 2-tuple as argument, but it takes 3 distinct arguments - --> $DIR/closure-arg-count.rs:30:53 + --> $DIR/closure-arg-count.rs:20:53 | LL | let _it = vec![1, 2, 3].into_iter().enumerate().map(|i, x, y| i); | ^^^ --------- takes 3 distinct arguments @@ -93,7 +93,7 @@ LL | let _it = vec![1, 2, 3].into_iter().enumerate().map(|i, x, y| i); | expected closure that takes a single 2-tuple as argument error[E0593]: function is expected to take a single 2-tuple as argument, but it takes 0 arguments - --> $DIR/closure-arg-count.rs:32:53 + --> $DIR/closure-arg-count.rs:22:53 | LL | let _it = vec![1, 2, 3].into_iter().enumerate().map(foo); | ^^^ expected function that takes a single 2-tuple as argument @@ -102,7 +102,7 @@ LL | fn foo() {} | -------- takes 0 arguments error[E0593]: closure is expected to take a single 2-tuple as argument, but it takes 3 distinct arguments - --> $DIR/closure-arg-count.rs:35:53 + --> $DIR/closure-arg-count.rs:25:53 | LL | let bar = |i, x, y| i; | --------- takes 3 distinct arguments @@ -110,7 +110,7 @@ LL | let _it = vec![1, 2, 3].into_iter().enumerate().map(bar); | ^^^ expected closure that takes a single 2-tuple as argument error[E0593]: function is expected to take a single 2-tuple as argument, but it takes 2 distinct arguments - --> $DIR/closure-arg-count.rs:37:53 + --> $DIR/closure-arg-count.rs:27:53 | LL | let _it = vec![1, 2, 3].into_iter().enumerate().map(qux); | ^^^ expected function that takes a single 2-tuple as argument @@ -119,13 +119,13 @@ LL | fn qux(x: usize, y: usize) {} | -------------------------- takes 2 distinct arguments error[E0593]: function is expected to take 1 argument, but it takes 2 arguments - --> $DIR/closure-arg-count.rs:40:41 + --> $DIR/closure-arg-count.rs:30:41 | LL | let _it = vec![1, 2, 3].into_iter().map(usize::checked_add); | ^^^ expected function that takes 1 argument error[E0593]: function is expected to take 0 arguments, but it takes 1 argument - --> $DIR/closure-arg-count.rs:43:5 + --> $DIR/closure-arg-count.rs:33:5 | LL | call(Foo); | ^^^^ expected function that takes 0 arguments @@ -134,7 +134,7 @@ LL | struct Foo(u8); | --------------- takes 1 argument | note: required by `call` - --> $DIR/closure-arg-count.rs:50:1 + --> $DIR/closure-arg-count.rs:40:1 | LL | fn call(_: F) where F: FnOnce() -> R {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/mismatched_types/closure-arg-type-mismatch.rs b/src/test/ui/mismatched_types/closure-arg-type-mismatch.rs index 566998c374e9e..c5d9e4b9b766b 100644 --- a/src/test/ui/mismatched_types/closure-arg-type-mismatch.rs +++ b/src/test/ui/mismatched_types/closure-arg-type-mismatch.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let a = [(1u32, 2u32)]; a.iter().map(|_: (u32, u32)| 45); //~ ERROR type mismatch diff --git a/src/test/ui/mismatched_types/closure-arg-type-mismatch.stderr b/src/test/ui/mismatched_types/closure-arg-type-mismatch.stderr index 62e646c8d3942..5dd6887005e83 100644 --- a/src/test/ui/mismatched_types/closure-arg-type-mismatch.stderr +++ b/src/test/ui/mismatched_types/closure-arg-type-mismatch.stderr @@ -1,5 +1,5 @@ error[E0631]: type mismatch in closure arguments - --> $DIR/closure-arg-type-mismatch.rs:13:14 + --> $DIR/closure-arg-type-mismatch.rs:3:14 | LL | a.iter().map(|_: (u32, u32)| 45); //~ ERROR type mismatch | ^^^ ------------------ found signature of `fn((u32, u32)) -> _` @@ -7,7 +7,7 @@ LL | a.iter().map(|_: (u32, u32)| 45); //~ ERROR type mismatch | expected signature of `fn(&(u32, u32)) -> _` error[E0631]: type mismatch in closure arguments - --> $DIR/closure-arg-type-mismatch.rs:14:14 + --> $DIR/closure-arg-type-mismatch.rs:4:14 | LL | a.iter().map(|_: &(u16, u16)| 45); //~ ERROR type mismatch | ^^^ ------------------- found signature of `for<'r> fn(&'r (u16, u16)) -> _` @@ -15,7 +15,7 @@ LL | a.iter().map(|_: &(u16, u16)| 45); //~ ERROR type mismatch | expected signature of `fn(&(u32, u32)) -> _` error[E0631]: type mismatch in closure arguments - --> $DIR/closure-arg-type-mismatch.rs:15:14 + --> $DIR/closure-arg-type-mismatch.rs:5:14 | LL | a.iter().map(|_: (u16, u16)| 45); //~ ERROR type mismatch | ^^^ ------------------ found signature of `fn((u16, u16)) -> _` @@ -23,7 +23,7 @@ LL | a.iter().map(|_: (u16, u16)| 45); //~ ERROR type mismatch | expected signature of `fn(&(u32, u32)) -> _` error[E0631]: type mismatch in function arguments - --> $DIR/closure-arg-type-mismatch.rs:20:5 + --> $DIR/closure-arg-type-mismatch.rs:10:5 | LL | baz(f); //~ ERROR type mismatch | ^^^ @@ -32,19 +32,19 @@ LL | baz(f); //~ ERROR type mismatch | found signature of `fn(*mut &'a u32) -> _` | note: required by `baz` - --> $DIR/closure-arg-type-mismatch.rs:18:1 + --> $DIR/closure-arg-type-mismatch.rs:8:1 | LL | fn baz(_: F) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0271]: type mismatch resolving `for<'r> >::Output == ()` - --> $DIR/closure-arg-type-mismatch.rs:20:5 + --> $DIR/closure-arg-type-mismatch.rs:10:5 | LL | baz(f); //~ ERROR type mismatch | ^^^ expected bound lifetime parameter, found concrete lifetime | note: required by `baz` - --> $DIR/closure-arg-type-mismatch.rs:18:1 + --> $DIR/closure-arg-type-mismatch.rs:8:1 | LL | fn baz(_: F) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/mismatched_types/closure-mismatch.rs b/src/test/ui/mismatched_types/closure-mismatch.rs index 5a74e8f933de0..40a4641fe7196 100644 --- a/src/test/ui/mismatched_types/closure-mismatch.rs +++ b/src/test/ui/mismatched_types/closure-mismatch.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo {} impl Foo for T {} diff --git a/src/test/ui/mismatched_types/closure-mismatch.stderr b/src/test/ui/mismatched_types/closure-mismatch.stderr index cb03d0ea4cca3..e55047e96c297 100644 --- a/src/test/ui/mismatched_types/closure-mismatch.stderr +++ b/src/test/ui/mismatched_types/closure-mismatch.stderr @@ -1,27 +1,27 @@ -error[E0271]: type mismatch resolving `for<'r> <[closure@$DIR/closure-mismatch.rs:18:9: 18:15] as std::ops::FnOnce<(&'r (),)>>::Output == ()` - --> $DIR/closure-mismatch.rs:18:5 +error[E0271]: type mismatch resolving `for<'r> <[closure@$DIR/closure-mismatch.rs:8:9: 8:15] as std::ops::FnOnce<(&'r (),)>>::Output == ()` + --> $DIR/closure-mismatch.rs:8:5 | LL | baz(|_| ()); //~ ERROR type mismatch | ^^^ expected bound lifetime parameter, found concrete lifetime | - = note: required because of the requirements on the impl of `Foo` for `[closure@$DIR/closure-mismatch.rs:18:9: 18:15]` + = note: required because of the requirements on the impl of `Foo` for `[closure@$DIR/closure-mismatch.rs:8:9: 8:15]` note: required by `baz` - --> $DIR/closure-mismatch.rs:15:1 + --> $DIR/closure-mismatch.rs:5:1 | LL | fn baz(_: T) {} | ^^^^^^^^^^^^^^^^^^^^ error[E0631]: type mismatch in closure arguments - --> $DIR/closure-mismatch.rs:18:5 + --> $DIR/closure-mismatch.rs:8:5 | LL | baz(|_| ()); //~ ERROR type mismatch | ^^^ ------ found signature of `fn(_) -> _` | | | expected signature of `for<'r> fn(&'r ()) -> _` | - = note: required because of the requirements on the impl of `Foo` for `[closure@$DIR/closure-mismatch.rs:18:9: 18:15]` + = note: required because of the requirements on the impl of `Foo` for `[closure@$DIR/closure-mismatch.rs:8:9: 8:15]` note: required by `baz` - --> $DIR/closure-mismatch.rs:15:1 + --> $DIR/closure-mismatch.rs:5:1 | LL | fn baz(_: T) {} | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/mismatched_types/const-fn-in-trait.rs b/src/test/ui/mismatched_types/const-fn-in-trait.rs index e0d5c19f12558..7fcbd7e7e8bb2 100644 --- a/src/test/ui/mismatched_types/const-fn-in-trait.rs +++ b/src/test/ui/mismatched_types/const-fn-in-trait.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // rustc-env:RUST_NEW_ERROR_FORMAT #![feature(const_fn)] diff --git a/src/test/ui/mismatched_types/const-fn-in-trait.stderr b/src/test/ui/mismatched_types/const-fn-in-trait.stderr index ba248e076d4b4..e1482d7c45079 100644 --- a/src/test/ui/mismatched_types/const-fn-in-trait.stderr +++ b/src/test/ui/mismatched_types/const-fn-in-trait.stderr @@ -1,11 +1,11 @@ error[E0379]: trait fns cannot be declared const - --> $DIR/const-fn-in-trait.rs:17:5 + --> $DIR/const-fn-in-trait.rs:7:5 | LL | const fn g(); //~ ERROR cannot be declared const | ^^^^^ trait fns cannot be const error[E0379]: trait fns cannot be declared const - --> $DIR/const-fn-in-trait.rs:21:5 + --> $DIR/const-fn-in-trait.rs:11:5 | LL | const fn f() -> u32 { 22 } //~ ERROR cannot be declared const | ^^^^^ trait fns cannot be const diff --git a/src/test/ui/mismatched_types/fn-variance-1.rs b/src/test/ui/mismatched_types/fn-variance-1.rs index 2b797ef7681c4..b8a6c9a9b2bb1 100644 --- a/src/test/ui/mismatched_types/fn-variance-1.rs +++ b/src/test/ui/mismatched_types/fn-variance-1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn takes_imm(x: &isize) { } fn takes_mut(x: &mut isize) { } diff --git a/src/test/ui/mismatched_types/fn-variance-1.stderr b/src/test/ui/mismatched_types/fn-variance-1.stderr index 221ee79bd67e8..0fb1a5346f322 100644 --- a/src/test/ui/mismatched_types/fn-variance-1.stderr +++ b/src/test/ui/mismatched_types/fn-variance-1.stderr @@ -1,5 +1,5 @@ error[E0631]: type mismatch in function arguments - --> $DIR/fn-variance-1.rs:21:5 + --> $DIR/fn-variance-1.rs:11:5 | LL | fn takes_mut(x: &mut isize) { } | --------------------------- found signature of `for<'r> fn(&'r mut isize) -> _` @@ -8,13 +8,13 @@ LL | apply(&3, takes_mut); | ^^^^^ expected signature of `fn(&{integer}) -> _` | note: required by `apply` - --> $DIR/fn-variance-1.rs:15:1 + --> $DIR/fn-variance-1.rs:5:1 | LL | fn apply(t: T, f: F) where F: FnOnce(T) { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0631]: type mismatch in function arguments - --> $DIR/fn-variance-1.rs:25:5 + --> $DIR/fn-variance-1.rs:15:5 | LL | fn takes_imm(x: &isize) { } | ----------------------- found signature of `for<'r> fn(&'r isize) -> _` @@ -23,7 +23,7 @@ LL | apply(&mut 3, takes_imm); | ^^^^^ expected signature of `fn(&mut {integer}) -> _` | note: required by `apply` - --> $DIR/fn-variance-1.rs:15:1 + --> $DIR/fn-variance-1.rs:5:1 | LL | fn apply(t: T, f: F) where F: FnOnce(T) { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/mismatched_types/for-loop-has-unit-body.rs b/src/test/ui/mismatched_types/for-loop-has-unit-body.rs index 4ffee75348a8d..a9433d7de6e17 100644 --- a/src/test/ui/mismatched_types/for-loop-has-unit-body.rs +++ b/src/test/ui/mismatched_types/for-loop-has-unit-body.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { for x in 0..3 { x //~ ERROR mismatched types diff --git a/src/test/ui/mismatched_types/for-loop-has-unit-body.stderr b/src/test/ui/mismatched_types/for-loop-has-unit-body.stderr index 1fed52883973b..1de8e18c587ba 100644 --- a/src/test/ui/mismatched_types/for-loop-has-unit-body.stderr +++ b/src/test/ui/mismatched_types/for-loop-has-unit-body.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/for-loop-has-unit-body.rs:13:9 + --> $DIR/for-loop-has-unit-body.rs:3:9 | LL | x //~ ERROR mismatched types | ^ expected (), found integral variable diff --git a/src/test/ui/mismatched_types/issue-19109.rs b/src/test/ui/mismatched_types/issue-19109.rs index 0f85218fcb8e0..030b7a40ca6fe 100644 --- a/src/test/ui/mismatched_types/issue-19109.rs +++ b/src/test/ui/mismatched_types/issue-19109.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Trait { } fn function(t: &mut Trait) { diff --git a/src/test/ui/mismatched_types/issue-19109.stderr b/src/test/ui/mismatched_types/issue-19109.stderr index 018ea941d12da..db2d484edff07 100644 --- a/src/test/ui/mismatched_types/issue-19109.stderr +++ b/src/test/ui/mismatched_types/issue-19109.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-19109.rs:14:5 + --> $DIR/issue-19109.rs:4:5 | LL | fn function(t: &mut Trait) { | - help: try adding a return type: `-> *mut dyn Trait` diff --git a/src/test/ui/mismatched_types/issue-26480.rs b/src/test/ui/mismatched_types/issue-26480.rs index 33c5e74fafa1f..d140e12b04d38 100644 --- a/src/test/ui/mismatched_types/issue-26480.rs +++ b/src/test/ui/mismatched_types/issue-26480.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern { fn write(fildes: i32, buf: *const i8, nbyte: u64) -> i64; } diff --git a/src/test/ui/mismatched_types/issue-26480.stderr b/src/test/ui/mismatched_types/issue-26480.stderr index ff047a28adcf4..11aa6cd7c1ba8 100644 --- a/src/test/ui/mismatched_types/issue-26480.stderr +++ b/src/test/ui/mismatched_types/issue-26480.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-26480.rs:26:19 + --> $DIR/issue-26480.rs:16:19 | LL | $arr.len() * size_of($arr[0])); //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected u64, found usize @@ -8,7 +8,7 @@ LL | write!(hello); | -------------- in this macro invocation error[E0605]: non-primitive cast: `{integer}` as `()` - --> $DIR/issue-26480.rs:32:19 + --> $DIR/issue-26480.rs:22:19 | LL | ($x:expr) => ($x as ()) //~ ERROR non-primitive cast | ^^^^^^^^ diff --git a/src/test/ui/mismatched_types/issue-35030.rs b/src/test/ui/mismatched_types/issue-35030.rs index 503b2e08c39bb..e7012aa61a4bd 100644 --- a/src/test/ui/mismatched_types/issue-35030.rs +++ b/src/test/ui/mismatched_types/issue-35030.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // rustc-env:RUST_NEW_ERROR_FORMAT trait Parser { diff --git a/src/test/ui/mismatched_types/issue-35030.stderr b/src/test/ui/mismatched_types/issue-35030.stderr index 062bda4468a39..6a3e7d930cf29 100644 --- a/src/test/ui/mismatched_types/issue-35030.stderr +++ b/src/test/ui/mismatched_types/issue-35030.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-35030.rs:19:14 + --> $DIR/issue-35030.rs:9:14 | LL | Some(true) //~ ERROR mismatched types | ^^^^ expected type parameter, found bool diff --git a/src/test/ui/mismatched_types/issue-36053-2.rs b/src/test/ui/mismatched_types/issue-36053-2.rs index bf72e584b562b..9035e3380b0c5 100644 --- a/src/test/ui/mismatched_types/issue-36053-2.rs +++ b/src/test/ui/mismatched_types/issue-36053-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #36053. ICE was caused due to obligations // being added to a special, dedicated fulfillment cx during // a probe. diff --git a/src/test/ui/mismatched_types/issue-36053-2.stderr b/src/test/ui/mismatched_types/issue-36053-2.stderr index 86a92a70287e9..2de72f2b63a4e 100644 --- a/src/test/ui/mismatched_types/issue-36053-2.stderr +++ b/src/test/ui/mismatched_types/issue-36053-2.stderr @@ -1,15 +1,15 @@ -error[E0599]: no method named `count` found for type `std::iter::Filter>, [closure@$DIR/issue-36053-2.rs:17:39: 17:53]>` in the current scope - --> $DIR/issue-36053-2.rs:17:55 +error[E0599]: no method named `count` found for type `std::iter::Filter>, [closure@$DIR/issue-36053-2.rs:7:39: 7:53]>` in the current scope + --> $DIR/issue-36053-2.rs:7:55 | LL | once::<&str>("str").fuse().filter(|a: &str| true).count(); | ^^^^^ | = note: the method `count` exists but the following trait bounds were not satisfied: - `std::iter::Filter>, [closure@$DIR/issue-36053-2.rs:17:39: 17:53]> : std::iter::Iterator` - `&mut std::iter::Filter>, [closure@$DIR/issue-36053-2.rs:17:39: 17:53]> : std::iter::Iterator` + `std::iter::Filter>, [closure@$DIR/issue-36053-2.rs:7:39: 7:53]> : std::iter::Iterator` + `&mut std::iter::Filter>, [closure@$DIR/issue-36053-2.rs:7:39: 7:53]> : std::iter::Iterator` error[E0631]: type mismatch in closure arguments - --> $DIR/issue-36053-2.rs:17:32 + --> $DIR/issue-36053-2.rs:7:32 | LL | once::<&str>("str").fuse().filter(|a: &str| true).count(); | ^^^^^^ -------------- found signature of `for<'r> fn(&'r str) -> _` diff --git a/src/test/ui/mismatched_types/issue-38371.rs b/src/test/ui/mismatched_types/issue-38371.rs index 8e613d4edba14..d2cd2b88ab706 100644 --- a/src/test/ui/mismatched_types/issue-38371.rs +++ b/src/test/ui/mismatched_types/issue-38371.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { } diff --git a/src/test/ui/mismatched_types/issue-38371.stderr b/src/test/ui/mismatched_types/issue-38371.stderr index dd5da76907515..f702a4f47f10c 100644 --- a/src/test/ui/mismatched_types/issue-38371.stderr +++ b/src/test/ui/mismatched_types/issue-38371.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-38371.rs:14:8 + --> $DIR/issue-38371.rs:4:8 | LL | fn foo(&foo: Foo) { //~ ERROR mismatched types | ^^^^ expected struct `Foo`, found reference @@ -9,7 +9,7 @@ LL | fn foo(&foo: Foo) { //~ ERROR mismatched types = help: did you mean `foo: &Foo`? error[E0308]: mismatched types - --> $DIR/issue-38371.rs:28:9 + --> $DIR/issue-38371.rs:18:9 | LL | fn agh(&&bar: &u32) { //~ ERROR mismatched types | ^^^^ expected u32, found reference @@ -19,7 +19,7 @@ LL | fn agh(&&bar: &u32) { //~ ERROR mismatched types = help: did you mean `bar: &u32`? error[E0308]: mismatched types - --> $DIR/issue-38371.rs:31:8 + --> $DIR/issue-38371.rs:21:8 | LL | fn bgh(&&bar: u32) { //~ ERROR mismatched types | ^^^^^ expected u32, found reference @@ -28,7 +28,7 @@ LL | fn bgh(&&bar: u32) { //~ ERROR mismatched types found type `&_` error[E0529]: expected an array or slice, found `u32` - --> $DIR/issue-38371.rs:34:9 + --> $DIR/issue-38371.rs:24:9 | LL | fn ugh(&[bar]: &u32) { //~ ERROR expected an array or slice | ^^^^^ pattern cannot match with input type `u32` diff --git a/src/test/ui/mismatched_types/main.rs b/src/test/ui/mismatched_types/main.rs index 7cf1de7cfee3f..16c18ddda291a 100644 --- a/src/test/ui/mismatched_types/main.rs +++ b/src/test/ui/mismatched_types/main.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x: u32 = ( //~ ERROR mismatched types ); diff --git a/src/test/ui/mismatched_types/main.stderr b/src/test/ui/mismatched_types/main.stderr index ce6f2ee6e0524..57e95e4133376 100644 --- a/src/test/ui/mismatched_types/main.stderr +++ b/src/test/ui/mismatched_types/main.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/main.rs:12:18 + --> $DIR/main.rs:2:18 | LL | let x: u32 = ( //~ ERROR mismatched types | __________________^ diff --git a/src/test/ui/mismatched_types/method-help-unsatisfied-bound.rs b/src/test/ui/mismatched_types/method-help-unsatisfied-bound.rs index 2c7b8218de081..83cea16846515 100644 --- a/src/test/ui/mismatched_types/method-help-unsatisfied-bound.rs +++ b/src/test/ui/mismatched_types/method-help-unsatisfied-bound.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo; fn main() { diff --git a/src/test/ui/mismatched_types/method-help-unsatisfied-bound.stderr b/src/test/ui/mismatched_types/method-help-unsatisfied-bound.stderr index 471c15f6d72d5..9721dc8ba4e6c 100644 --- a/src/test/ui/mismatched_types/method-help-unsatisfied-bound.stderr +++ b/src/test/ui/mismatched_types/method-help-unsatisfied-bound.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `unwrap` found for type `std::result::Result<(), Foo>` in the current scope - --> $DIR/method-help-unsatisfied-bound.rs:15:7 + --> $DIR/method-help-unsatisfied-bound.rs:5:7 | LL | a.unwrap(); | ^^^^^^ diff --git a/src/test/ui/mismatched_types/overloaded-calls-bad.rs b/src/test/ui/mismatched_types/overloaded-calls-bad.rs index 00edc07db81b1..73e74a97f06b0 100644 --- a/src/test/ui/mismatched_types/overloaded-calls-bad.rs +++ b/src/test/ui/mismatched_types/overloaded-calls-bad.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(fn_traits, unboxed_closures)] use std::ops::FnMut; diff --git a/src/test/ui/mismatched_types/overloaded-calls-bad.stderr b/src/test/ui/mismatched_types/overloaded-calls-bad.stderr index d841a340431a6..51975abd720fd 100644 --- a/src/test/ui/mismatched_types/overloaded-calls-bad.stderr +++ b/src/test/ui/mismatched_types/overloaded-calls-bad.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/overloaded-calls-bad.rs:38:17 + --> $DIR/overloaded-calls-bad.rs:28:17 | LL | let ans = s("what"); //~ ERROR mismatched types | ^^^^^^ expected isize, found reference @@ -8,13 +8,13 @@ LL | let ans = s("what"); //~ ERROR mismatched types found type `&'static str` error[E0057]: this function takes 1 parameter but 0 parameters were supplied - --> $DIR/overloaded-calls-bad.rs:39:15 + --> $DIR/overloaded-calls-bad.rs:29:15 | LL | let ans = s(); | ^^^ expected 1 parameter error[E0057]: this function takes 1 parameter but 2 parameters were supplied - --> $DIR/overloaded-calls-bad.rs:41:15 + --> $DIR/overloaded-calls-bad.rs:31:15 | LL | let ans = s("burma", "shave"); | ^^^^^^^^^^^^^^^^^^^ expected 1 parameter diff --git a/src/test/ui/mismatched_types/recovered-block.rs b/src/test/ui/mismatched_types/recovered-block.rs index 8166254e8a68e..cb8ad8092dd82 100644 --- a/src/test/ui/mismatched_types/recovered-block.rs +++ b/src/test/ui/mismatched_types/recovered-block.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no std::env support use std::env; diff --git a/src/test/ui/mismatched_types/recovered-block.stderr b/src/test/ui/mismatched_types/recovered-block.stderr index 75fb7b28a6ea2..7834750630bf3 100644 --- a/src/test/ui/mismatched_types/recovered-block.stderr +++ b/src/test/ui/mismatched_types/recovered-block.stderr @@ -1,5 +1,5 @@ error: missing `struct` for struct definition - --> $DIR/recovered-block.rs:23:8 + --> $DIR/recovered-block.rs:13:8 | LL | pub Foo { text } | ^ @@ -9,7 +9,7 @@ LL | pub struct Foo { text } | ^^^^^^ error: expected one of `(` or `<`, found `{` - --> $DIR/recovered-block.rs:29:9 + --> $DIR/recovered-block.rs:19:9 | LL | Foo { text: "".to_string() } | ^ expected one of `(` or `<` here diff --git a/src/test/ui/mismatched_types/trait-bounds-cant-coerce.rs b/src/test/ui/mismatched_types/trait-bounds-cant-coerce.rs index b2aeabdc1e1cf..be5fab871b42f 100644 --- a/src/test/ui/mismatched_types/trait-bounds-cant-coerce.rs +++ b/src/test/ui/mismatched_types/trait-bounds-cant-coerce.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Foo { fn dummy(&self) { } } diff --git a/src/test/ui/mismatched_types/trait-bounds-cant-coerce.stderr b/src/test/ui/mismatched_types/trait-bounds-cant-coerce.stderr index 15c9fd6bf8fe8..a9b637c81a78f 100644 --- a/src/test/ui/mismatched_types/trait-bounds-cant-coerce.stderr +++ b/src/test/ui/mismatched_types/trait-bounds-cant-coerce.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/trait-bounds-cant-coerce.rs:24:7 + --> $DIR/trait-bounds-cant-coerce.rs:13:7 | LL | a(x); //~ ERROR mismatched types [E0308] | ^ expected trait `Foo + std::marker::Send`, found trait `Foo` diff --git a/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.rs b/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.rs index 420b59a4df1af..3547272e51b51 100644 --- a/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.rs +++ b/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // rustc-env:RUST_NEW_ERROR_FORMAT trait Foo { diff --git a/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.stderr b/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.stderr index 631af21cac5ca..4e54b35029a5f 100644 --- a/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.stderr +++ b/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.stderr @@ -1,5 +1,5 @@ error[E0053]: method `foo` has an incompatible type for trait - --> $DIR/trait-impl-fn-incompatibility.rs:21:15 + --> $DIR/trait-impl-fn-incompatibility.rs:11:15 | LL | fn foo(x: u16); | --- type in trait @@ -11,7 +11,7 @@ LL | fn foo(x: i16) { } //~ ERROR incompatible type found type `fn(i16)` error[E0053]: method `bar` has an incompatible type for trait - --> $DIR/trait-impl-fn-incompatibility.rs:22:28 + --> $DIR/trait-impl-fn-incompatibility.rs:12:28 | LL | fn bar(&mut self, bar: &mut Bar); | -------- type in trait diff --git a/src/test/ui/mismatched_types/unboxed-closures-vtable-mismatch.rs b/src/test/ui/mismatched_types/unboxed-closures-vtable-mismatch.rs index f2237e495a00c..88bea979b97fe 100644 --- a/src/test/ui/mismatched_types/unboxed-closures-vtable-mismatch.rs +++ b/src/test/ui/mismatched_types/unboxed-closures-vtable-mismatch.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unboxed_closures)] use std::ops::FnMut; diff --git a/src/test/ui/mismatched_types/unboxed-closures-vtable-mismatch.stderr b/src/test/ui/mismatched_types/unboxed-closures-vtable-mismatch.stderr index 762f0744d80c9..8db81a8c6835c 100644 --- a/src/test/ui/mismatched_types/unboxed-closures-vtable-mismatch.stderr +++ b/src/test/ui/mismatched_types/unboxed-closures-vtable-mismatch.stderr @@ -1,5 +1,5 @@ error[E0631]: type mismatch in closure arguments - --> $DIR/unboxed-closures-vtable-mismatch.rs:25:13 + --> $DIR/unboxed-closures-vtable-mismatch.rs:15:13 | LL | let f = to_fn_mut(|x: usize, y: isize| -> isize { (x as isize) + y }); | ----------------------------- found signature of `fn(usize, isize) -> _` @@ -8,7 +8,7 @@ LL | let z = call_it(3, f); | ^^^^^^^ expected signature of `fn(isize, isize) -> _` | note: required by `call_it` - --> $DIR/unboxed-closures-vtable-mismatch.rs:17:1 + --> $DIR/unboxed-closures-vtable-mismatch.rs:7:1 | LL | fn call_itisize>(y: isize, mut f: F) -> isize { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/missing/auxiliary/two_macros.rs b/src/test/ui/missing/auxiliary/two_macros.rs index 060960f0dbc88..2330c75c8e0cb 100644 --- a/src/test/ui/missing/auxiliary/two_macros.rs +++ b/src/test/ui/missing/auxiliary/two_macros.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_export] macro_rules! macro_one { () => ("one") } diff --git a/src/test/ui/missing/missing-alloc_error_handler.rs b/src/test/ui/missing/missing-alloc_error_handler.rs index 3842d48f8fab1..bbac68e23c79a 100644 --- a/src/test/ui/missing/missing-alloc_error_handler.rs +++ b/src/test/ui/missing/missing-alloc_error_handler.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C panic=abort // no-prefer-dynamic diff --git a/src/test/ui/missing/missing-allocator.rs b/src/test/ui/missing/missing-allocator.rs index c949dcb635aad..4dccb3153cb84 100644 --- a/src/test/ui/missing/missing-allocator.rs +++ b/src/test/ui/missing/missing-allocator.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C panic=abort // no-prefer-dynamic diff --git a/src/test/ui/missing/missing-block-hint.rs b/src/test/ui/missing/missing-block-hint.rs index 777ff5b9b2650..89db02a9cba84 100644 --- a/src/test/ui/missing/missing-block-hint.rs +++ b/src/test/ui/missing/missing-block-hint.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { { if (foo) => {} //~ ERROR expected `{`, found `=>` diff --git a/src/test/ui/missing/missing-block-hint.stderr b/src/test/ui/missing/missing-block-hint.stderr index a48eff890b331..47b7c42c26cd8 100644 --- a/src/test/ui/missing/missing-block-hint.stderr +++ b/src/test/ui/missing/missing-block-hint.stderr @@ -1,5 +1,5 @@ error: expected `{`, found `=>` - --> $DIR/missing-block-hint.rs:13:18 + --> $DIR/missing-block-hint.rs:3:18 | LL | if (foo) => {} //~ ERROR expected `{`, found `=>` | -- ^^ @@ -7,7 +7,7 @@ LL | if (foo) => {} //~ ERROR expected `{`, found `=>` | this `if` statement has a condition, but no block error: expected `{`, found `bar` - --> $DIR/missing-block-hint.rs:17:13 + --> $DIR/missing-block-hint.rs:7:13 | LL | if (foo) | -- this `if` statement has a condition, but no block diff --git a/src/test/ui/missing/missing-comma-in-match.fixed b/src/test/ui/missing/missing-comma-in-match.fixed index 4832f35f42d2a..de1b9506af9d4 100644 --- a/src/test/ui/missing/missing-comma-in-match.fixed +++ b/src/test/ui/missing/missing-comma-in-match.fixed @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix fn main() { diff --git a/src/test/ui/missing/missing-comma-in-match.rs b/src/test/ui/missing/missing-comma-in-match.rs index e39b20e77ea80..d7d16155cf28a 100644 --- a/src/test/ui/missing/missing-comma-in-match.rs +++ b/src/test/ui/missing/missing-comma-in-match.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix fn main() { diff --git a/src/test/ui/missing/missing-comma-in-match.stderr b/src/test/ui/missing/missing-comma-in-match.stderr index 779359341073e..ae46516f8d187 100644 --- a/src/test/ui/missing/missing-comma-in-match.stderr +++ b/src/test/ui/missing/missing-comma-in-match.stderr @@ -1,5 +1,5 @@ error: expected one of `,`, `.`, `?`, `}`, or an operator, found `=>` - --> $DIR/missing-comma-in-match.rs:16:18 + --> $DIR/missing-comma-in-match.rs:6:18 | LL | &None => 1 | - help: missing a comma here to end this `match` arm diff --git a/src/test/ui/missing/missing-derivable-attr.rs b/src/test/ui/missing/missing-derivable-attr.rs index 7eee51e40764e..58c94de505993 100644 --- a/src/test/ui/missing/missing-derivable-attr.rs +++ b/src/test/ui/missing/missing-derivable-attr.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait MyEq { fn eq(&self, other: &Self) -> bool; } diff --git a/src/test/ui/missing/missing-derivable-attr.stderr b/src/test/ui/missing/missing-derivable-attr.stderr index cccba2f5f3f2f..e3e61bcb391eb 100644 --- a/src/test/ui/missing/missing-derivable-attr.stderr +++ b/src/test/ui/missing/missing-derivable-attr.stderr @@ -1,5 +1,5 @@ error[E0046]: not all trait items implemented, missing: `eq` - --> $DIR/missing-derivable-attr.rs:23:1 + --> $DIR/missing-derivable-attr.rs:13:1 | LL | fn eq(&self, other: &Self) -> bool; | ----------------------------------- `eq` from trait diff --git a/src/test/ui/missing/missing-fields-in-struct-pattern.rs b/src/test/ui/missing/missing-fields-in-struct-pattern.rs index dfde37994998b..24b6b55db6692 100644 --- a/src/test/ui/missing/missing-fields-in-struct-pattern.rs +++ b/src/test/ui/missing/missing-fields-in-struct-pattern.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S(usize, usize, usize, usize); fn main() { diff --git a/src/test/ui/missing/missing-fields-in-struct-pattern.stderr b/src/test/ui/missing/missing-fields-in-struct-pattern.stderr index d1c3260f11e30..5d88a5d03e23b 100644 --- a/src/test/ui/missing/missing-fields-in-struct-pattern.stderr +++ b/src/test/ui/missing/missing-fields-in-struct-pattern.stderr @@ -1,11 +1,11 @@ error[E0026]: struct `S` does not have fields named `a`, `b`, `c`, `d` - --> $DIR/missing-fields-in-struct-pattern.rs:14:16 + --> $DIR/missing-fields-in-struct-pattern.rs:4:16 | LL | if let S { a, b, c, d } = S(1, 2, 3, 4) { | ^ ^ ^ ^ struct `S` does not have these fields error[E0027]: pattern does not mention fields `0`, `1`, `2`, `3` - --> $DIR/missing-fields-in-struct-pattern.rs:14:12 + --> $DIR/missing-fields-in-struct-pattern.rs:4:12 | LL | if let S { a, b, c, d } = S(1, 2, 3, 4) { | ^^^^^^^^^^^^^^^^ missing fields `0`, `1`, `2`, `3` diff --git a/src/test/ui/missing/missing-items/auxiliary/m1.rs b/src/test/ui/missing/missing-items/auxiliary/m1.rs index 49fc586d6b52f..7705066760c50 100644 --- a/src/test/ui/missing/missing-items/auxiliary/m1.rs +++ b/src/test/ui/missing/missing-items/auxiliary/m1.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub trait X { const CONSTANT: u32; type Type; diff --git a/src/test/ui/missing/missing-items/issue-40221.rs b/src/test/ui/missing/missing-items/issue-40221.rs index 526fc3a8658a2..e1f7e975b80e4 100644 --- a/src/test/ui/missing/missing-items/issue-40221.rs +++ b/src/test/ui/missing/missing-items/issue-40221.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum P { C(PC), } diff --git a/src/test/ui/missing/missing-items/issue-40221.stderr b/src/test/ui/missing/missing-items/issue-40221.stderr index 81c9f40f6cfb1..437fb7bbc3131 100644 --- a/src/test/ui/missing/missing-items/issue-40221.stderr +++ b/src/test/ui/missing/missing-items/issue-40221.stderr @@ -1,5 +1,5 @@ error[E0004]: non-exhaustive patterns: `C(QA)` not covered - --> $DIR/issue-40221.rs:21:11 + --> $DIR/issue-40221.rs:11:11 | LL | match proto { //~ ERROR non-exhaustive patterns | ^^^^^ pattern `C(QA)` not covered diff --git a/src/test/ui/missing/missing-items/m2.rs b/src/test/ui/missing/missing-items/m2.rs index f655047f6f5ac..c2a6914abc9ec 100644 --- a/src/test/ui/missing/missing-items/m2.rs +++ b/src/test/ui/missing/missing-items/m2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:m1.rs diff --git a/src/test/ui/missing/missing-items/m2.stderr b/src/test/ui/missing/missing-items/m2.stderr index 3f7a4039eb76b..b2245750518b1 100644 --- a/src/test/ui/missing/missing-items/m2.stderr +++ b/src/test/ui/missing/missing-items/m2.stderr @@ -1,5 +1,5 @@ error[E0046]: not all trait items implemented, missing: `CONSTANT`, `Type`, `method` - --> $DIR/m2.rs:19:1 + --> $DIR/m2.rs:9:1 | LL | impl m1::X for X { //~ ERROR not all trait items implemented | ^^^^^^^^^^^^^^^^ missing `CONSTANT`, `Type`, `method` in implementation diff --git a/src/test/ui/missing/missing-items/missing-type-parameter.rs b/src/test/ui/missing/missing-items/missing-type-parameter.rs index f2d5359fb167b..8a64053a4f003 100644 --- a/src/test/ui/missing/missing-items/missing-type-parameter.rs +++ b/src/test/ui/missing/missing-items/missing-type-parameter.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo() { } fn main() { diff --git a/src/test/ui/missing/missing-items/missing-type-parameter.stderr b/src/test/ui/missing/missing-items/missing-type-parameter.stderr index a27e8aac28f23..619377198e1fc 100644 --- a/src/test/ui/missing/missing-items/missing-type-parameter.stderr +++ b/src/test/ui/missing/missing-items/missing-type-parameter.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/missing-type-parameter.rs:14:5 + --> $DIR/missing-type-parameter.rs:4:5 | LL | foo(); //~ ERROR type annotations needed | ^^^ cannot infer type for `X` diff --git a/src/test/ui/missing/missing-macro-use.rs b/src/test/ui/missing/missing-macro-use.rs index bfe49ea000972..dff4c94fcf413 100644 --- a/src/test/ui/missing/missing-macro-use.rs +++ b/src/test/ui/missing/missing-macro-use.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:two_macros.rs extern crate two_macros; diff --git a/src/test/ui/missing/missing-macro-use.stderr b/src/test/ui/missing/missing-macro-use.stderr index 6986b4d57338a..01a7beb3b0502 100644 --- a/src/test/ui/missing/missing-macro-use.stderr +++ b/src/test/ui/missing/missing-macro-use.stderr @@ -1,5 +1,5 @@ error: cannot find macro `macro_two!` in this scope - --> $DIR/missing-macro-use.rs:16:5 + --> $DIR/missing-macro-use.rs:6:5 | LL | macro_two!(); | ^^^^^^^^^ diff --git a/src/test/ui/missing/missing-main.rs b/src/test/ui/missing/missing-main.rs index 2788a5c2d5854..6ad54453309e0 100644 --- a/src/test/ui/missing/missing-main.rs +++ b/src/test/ui/missing/missing-main.rs @@ -1,12 +1,2 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: `main` function not found fn mian() { } diff --git a/src/test/ui/missing/missing-return.rs b/src/test/ui/missing/missing-return.rs index efd0c827a35f7..6a171753d9e2f 100644 --- a/src/test/ui/missing/missing-return.rs +++ b/src/test/ui/missing/missing-return.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: return fn f() -> isize { } diff --git a/src/test/ui/missing/missing-return.stderr b/src/test/ui/missing/missing-return.stderr index d12a5832877d2..6d42dafd6f163 100644 --- a/src/test/ui/missing/missing-return.stderr +++ b/src/test/ui/missing/missing-return.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/missing-return.rs:13:17 + --> $DIR/missing-return.rs:3:17 | LL | fn f() -> isize { } | ^^^ expected isize, found () diff --git a/src/test/ui/missing/missing-semicolon-warning.rs b/src/test/ui/missing/missing-semicolon-warning.rs index bbc958b87a571..cea9126db7dfe 100644 --- a/src/test/ui/missing/missing-semicolon-warning.rs +++ b/src/test/ui/missing/missing-semicolon-warning.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![allow(unused)] diff --git a/src/test/ui/missing/missing-semicolon-warning.stderr b/src/test/ui/missing/missing-semicolon-warning.stderr index 72319a257d85d..b0dcaf12ddae5 100644 --- a/src/test/ui/missing/missing-semicolon-warning.stderr +++ b/src/test/ui/missing/missing-semicolon-warning.stderr @@ -1,5 +1,5 @@ warning: expected `;`, found `let` - --> $DIR/missing-semicolon-warning.rs:16:12 + --> $DIR/missing-semicolon-warning.rs:6:12 | LL | $( let x = $e1 )*; //~ WARN expected `;` | ^^^ @@ -10,7 +10,7 @@ LL | fn main() { m!(0, 0; 0, 0); } //~ ERROR compilation successful = note: This was erroneously allowed and will become a hard error in a future release warning: expected `;`, found `println` - --> $DIR/missing-semicolon-warning.rs:17:12 + --> $DIR/missing-semicolon-warning.rs:7:12 | LL | $( println!("{}", $e2) )*; //~ WARN expected `;` | ^^^^^^^ @@ -21,7 +21,7 @@ LL | fn main() { m!(0, 0; 0, 0); } //~ ERROR compilation successful = note: This was erroneously allowed and will become a hard error in a future release error: compilation successful - --> $DIR/missing-semicolon-warning.rs:22:1 + --> $DIR/missing-semicolon-warning.rs:12:1 | LL | fn main() { m!(0, 0; 0, 0); } //~ ERROR compilation successful | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/missing/missing-stability.rs b/src/test/ui/missing/missing-stability.rs index 1922efb5e19dc..86841706325f7 100644 --- a/src/test/ui/missing/missing-stability.rs +++ b/src/test/ui/missing/missing-stability.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Checks that exported items without stability attributes cause an error #![crate_type="lib"] diff --git a/src/test/ui/missing/missing-stability.stderr b/src/test/ui/missing/missing-stability.stderr index 6e2802e43c5a2..e55bd00e2c673 100644 --- a/src/test/ui/missing/missing-stability.stderr +++ b/src/test/ui/missing/missing-stability.stderr @@ -1,5 +1,5 @@ error: This node does not have a stability attribute - --> $DIR/missing-stability.rs:18:1 + --> $DIR/missing-stability.rs:8:1 | LL | / pub fn unmarked() { LL | | //~^ ERROR This node does not have a stability attribute @@ -8,7 +8,7 @@ LL | | } | |_^ error: This node does not have a stability attribute - --> $DIR/missing-stability.rs:32:5 + --> $DIR/missing-stability.rs:22:5 | LL | pub fn unmarked() {} | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/missing_debug_impls.rs b/src/test/ui/missing_debug_impls.rs index ddc9081e33bb6..ff919292ae244 100644 --- a/src/test/ui/missing_debug_impls.rs +++ b/src/test/ui/missing_debug_impls.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --crate-type lib #![deny(missing_debug_implementations)] #![allow(unused)] diff --git a/src/test/ui/missing_debug_impls.stderr b/src/test/ui/missing_debug_impls.stderr index 4b4c05f79f055..cceab4b4c0bf8 100644 --- a/src/test/ui/missing_debug_impls.stderr +++ b/src/test/ui/missing_debug_impls.stderr @@ -1,17 +1,17 @@ error: type does not implement `fmt::Debug`; consider adding #[derive(Debug)] or a manual implementation - --> $DIR/missing_debug_impls.rs:17:1 + --> $DIR/missing_debug_impls.rs:7:1 | LL | pub enum A {} //~ ERROR type does not implement `fmt::Debug` | ^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/missing_debug_impls.rs:12:9 + --> $DIR/missing_debug_impls.rs:2:9 | LL | #![deny(missing_debug_implementations)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: type does not implement `fmt::Debug`; consider adding #[derive(Debug)] or a manual implementation - --> $DIR/missing_debug_impls.rs:30:1 + --> $DIR/missing_debug_impls.rs:20:1 | LL | pub struct Foo; //~ ERROR type does not implement `fmt::Debug` | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/missing_non_modrs_mod/foo.rs b/src/test/ui/missing_non_modrs_mod/foo.rs index 7262a26397cb8..4f41316c8f783 100644 --- a/src/test/ui/missing_non_modrs_mod/foo.rs +++ b/src/test/ui/missing_non_modrs_mod/foo.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // ignore-test this is just a helper for the real test in this dir diff --git a/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod.rs b/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod.rs index 9c95f45939367..fef6e03973e9c 100644 --- a/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod.rs +++ b/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-windows mod foo; diff --git a/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod.stderr b/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod.stderr index f494af0ff3ec7..98b74e5f5cbca 100644 --- a/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod.stderr +++ b/src/test/ui/missing_non_modrs_mod/missing_non_modrs_mod.stderr @@ -1,5 +1,5 @@ error[E0583]: file not found for module `missing` - --> $DIR/foo.rs:13:5 + --> $DIR/foo.rs:4:5 | LL | mod missing; | ^^^^^^^ diff --git a/src/test/ui/mod/mod_file_aux.rs b/src/test/ui/mod/mod_file_aux.rs index b7470811f6034..98f42c5cdb129 100644 --- a/src/test/ui/mod/mod_file_aux.rs +++ b/src/test/ui/mod/mod_file_aux.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-test Not a test. Used by other tests pub fn foo() -> isize { 10 } diff --git a/src/test/ui/mod/mod_file_correct_spans.rs b/src/test/ui/mod/mod_file_correct_spans.rs index 1efd9ba8e55eb..c42d2eaa7bd6d 100644 --- a/src/test/ui/mod/mod_file_correct_spans.rs +++ b/src/test/ui/mod/mod_file_correct_spans.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Testing that the source_map is maintained correctly when parsing mods from external files mod mod_file_aux; diff --git a/src/test/ui/mod/mod_file_correct_spans.stderr b/src/test/ui/mod/mod_file_correct_spans.stderr index 6f5e4cc51eb83..73044752b077b 100644 --- a/src/test/ui/mod/mod_file_correct_spans.stderr +++ b/src/test/ui/mod/mod_file_correct_spans.stderr @@ -1,5 +1,5 @@ error[E0425]: cannot find function `bar` in module `mod_file_aux` - --> $DIR/mod_file_correct_spans.rs:16:27 + --> $DIR/mod_file_correct_spans.rs:6:27 | LL | assert!(mod_file_aux::bar() == 10); | ^^^ not found in `mod_file_aux` diff --git a/src/test/ui/mod/mod_file_disambig.rs b/src/test/ui/mod/mod_file_disambig.rs index 27c253234be66..b7365cd16e94b 100644 --- a/src/test/ui/mod/mod_file_disambig.rs +++ b/src/test/ui/mod/mod_file_disambig.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only mod mod_file_disambig_aux; //~ ERROR file for module `mod_file_disambig_aux` found at both diff --git a/src/test/ui/mod/mod_file_disambig.stderr b/src/test/ui/mod/mod_file_disambig.stderr index 16a013ebfdb28..3e094733220da 100644 --- a/src/test/ui/mod/mod_file_disambig.stderr +++ b/src/test/ui/mod/mod_file_disambig.stderr @@ -1,5 +1,5 @@ error[E0584]: file for module `mod_file_disambig_aux` found at both mod_file_disambig_aux.rs and mod_file_disambig_aux/mod.rs - --> $DIR/mod_file_disambig.rs:13:5 + --> $DIR/mod_file_disambig.rs:3:5 | LL | mod mod_file_disambig_aux; //~ ERROR file for module `mod_file_disambig_aux` found at both | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/mod/mod_file_disambig_aux.rs b/src/test/ui/mod/mod_file_disambig_aux.rs index f617b29346358..3bf9609f4edc1 100644 --- a/src/test/ui/mod/mod_file_disambig_aux.rs +++ b/src/test/ui/mod/mod_file_disambig_aux.rs @@ -1,11 +1 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-test not a test. aux file diff --git a/src/test/ui/mod/mod_file_disambig_aux/mod.rs b/src/test/ui/mod/mod_file_disambig_aux/mod.rs index f617b29346358..3bf9609f4edc1 100644 --- a/src/test/ui/mod/mod_file_disambig_aux/mod.rs +++ b/src/test/ui/mod/mod_file_disambig_aux/mod.rs @@ -1,11 +1 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-test not a test. aux file diff --git a/src/test/ui/module-macro_use-arguments.rs b/src/test/ui/module-macro_use-arguments.rs index 6d3038b4820d6..6627b48eb6a2c 100644 --- a/src/test/ui/module-macro_use-arguments.rs +++ b/src/test/ui/module-macro_use-arguments.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use(foo, bar)] //~ ERROR arguments to macro_use are not allowed here mod foo { } diff --git a/src/test/ui/module-macro_use-arguments.stderr b/src/test/ui/module-macro_use-arguments.stderr index c61288776dd3a..4dc6df39a4797 100644 --- a/src/test/ui/module-macro_use-arguments.stderr +++ b/src/test/ui/module-macro_use-arguments.stderr @@ -1,5 +1,5 @@ error: arguments to macro_use are not allowed here - --> $DIR/module-macro_use-arguments.rs:11:1 + --> $DIR/module-macro_use-arguments.rs:1:1 | LL | #[macro_use(foo, bar)] //~ ERROR arguments to macro_use are not allowed here | ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/moves/move-guard-same-consts.rs b/src/test/ui/moves/move-guard-same-consts.rs index 05fe48e0199df..a2beb368b6e60 100644 --- a/src/test/ui/moves/move-guard-same-consts.rs +++ b/src/test/ui/moves/move-guard-same-consts.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // #47295: We used to have a hack of special-casing adjacent amtch // arms whose patterns were composed solely of constants to not have // them linked in the cfg. diff --git a/src/test/ui/moves/move-guard-same-consts.stderr b/src/test/ui/moves/move-guard-same-consts.stderr index 71f90ee7e5457..78a76a47b8a52 100644 --- a/src/test/ui/moves/move-guard-same-consts.stderr +++ b/src/test/ui/moves/move-guard-same-consts.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `x` - --> $DIR/move-guard-same-consts.rs:30:24 + --> $DIR/move-guard-same-consts.rs:20:24 | LL | (1, 2) if take(x) => (), | - value moved here diff --git a/src/test/ui/moves/move-in-guard-1.rs b/src/test/ui/moves/move-in-guard-1.rs index 068bfa3cd7c7b..9c50782e6406c 100644 --- a/src/test/ui/moves/move-in-guard-1.rs +++ b/src/test/ui/moves/move-in-guard-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] pub fn main() { diff --git a/src/test/ui/moves/move-in-guard-1.stderr b/src/test/ui/moves/move-in-guard-1.stderr index 5dd46a61176a5..d4cb538e05d1c 100644 --- a/src/test/ui/moves/move-in-guard-1.stderr +++ b/src/test/ui/moves/move-in-guard-1.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `x` - --> $DIR/move-in-guard-1.rs:20:24 + --> $DIR/move-in-guard-1.rs:10:24 | LL | (1, _) if take(x) => (), | - value moved here diff --git a/src/test/ui/moves/move-in-guard-2.rs b/src/test/ui/moves/move-in-guard-2.rs index 984963b2f830e..f478625a83b3e 100644 --- a/src/test/ui/moves/move-in-guard-2.rs +++ b/src/test/ui/moves/move-in-guard-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] pub fn main() { diff --git a/src/test/ui/moves/move-in-guard-2.stderr b/src/test/ui/moves/move-in-guard-2.stderr index a12d9e98b1bd9..d4e747c9f61d0 100644 --- a/src/test/ui/moves/move-in-guard-2.stderr +++ b/src/test/ui/moves/move-in-guard-2.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `x` - --> $DIR/move-in-guard-2.rs:20:24 + --> $DIR/move-in-guard-2.rs:10:24 | LL | (_, 2) if take(x) => (), //~ ERROR use of moved value: `x` | ^ value moved here in previous iteration of loop diff --git a/src/test/ui/moves/move-into-dead-array-1.nll.stderr b/src/test/ui/moves/move-into-dead-array-1.nll.stderr index 42f43d3f661f4..e3a2a601246d4 100644 --- a/src/test/ui/moves/move-into-dead-array-1.nll.stderr +++ b/src/test/ui/moves/move-into-dead-array-1.nll.stderr @@ -1,5 +1,5 @@ error[E0381]: use of possibly uninitialized variable: `a` - --> $DIR/move-into-dead-array-1.rs:24:5 + --> $DIR/move-into-dead-array-1.rs:14:5 | LL | a[i] = d(); //~ ERROR use of possibly uninitialized variable: `a` | ^^^^ use of possibly uninitialized `a` diff --git a/src/test/ui/moves/move-into-dead-array-1.rs b/src/test/ui/moves/move-into-dead-array-1.rs index 61ccb694fd212..16a18da4a44a3 100644 --- a/src/test/ui/moves/move-into-dead-array-1.rs +++ b/src/test/ui/moves/move-into-dead-array-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Ensure that we cannot move into an uninitialized fixed-size array. struct D { _x: u8 } diff --git a/src/test/ui/moves/move-into-dead-array-1.stderr b/src/test/ui/moves/move-into-dead-array-1.stderr index ac18565f1946e..36f98a76b5473 100644 --- a/src/test/ui/moves/move-into-dead-array-1.stderr +++ b/src/test/ui/moves/move-into-dead-array-1.stderr @@ -1,5 +1,5 @@ error[E0381]: use of possibly uninitialized variable: `a` - --> $DIR/move-into-dead-array-1.rs:24:5 + --> $DIR/move-into-dead-array-1.rs:14:5 | LL | a[i] = d(); //~ ERROR use of possibly uninitialized variable: `a` | ^^^^^^^^^^ use of possibly uninitialized `a` diff --git a/src/test/ui/moves/move-into-dead-array-2.nll.stderr b/src/test/ui/moves/move-into-dead-array-2.nll.stderr index cc6cc4211c067..5b2e1bed0c7bf 100644 --- a/src/test/ui/moves/move-into-dead-array-2.nll.stderr +++ b/src/test/ui/moves/move-into-dead-array-2.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `a` - --> $DIR/move-into-dead-array-2.rs:24:5 + --> $DIR/move-into-dead-array-2.rs:14:5 | LL | drop(a); | - value moved here diff --git a/src/test/ui/moves/move-into-dead-array-2.rs b/src/test/ui/moves/move-into-dead-array-2.rs index d484837c00136..9b66ea35f5689 100644 --- a/src/test/ui/moves/move-into-dead-array-2.rs +++ b/src/test/ui/moves/move-into-dead-array-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Ensure that we cannot move into an uninitialized fixed-size array. struct D { _x: u8 } diff --git a/src/test/ui/moves/move-into-dead-array-2.stderr b/src/test/ui/moves/move-into-dead-array-2.stderr index 0d999e67f9868..417b1ab205407 100644 --- a/src/test/ui/moves/move-into-dead-array-2.stderr +++ b/src/test/ui/moves/move-into-dead-array-2.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `a` - --> $DIR/move-into-dead-array-2.rs:24:5 + --> $DIR/move-into-dead-array-2.rs:14:5 | LL | drop(a); | - value moved here diff --git a/src/test/ui/moves/move-out-of-array-1.rs b/src/test/ui/moves/move-out-of-array-1.rs index 796b13538b22a..77cb73e47b7cc 100644 --- a/src/test/ui/moves/move-out-of-array-1.rs +++ b/src/test/ui/moves/move-out-of-array-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Ensure that we cannot move out of a fixed-size array (especially // when the element type has a destructor). diff --git a/src/test/ui/moves/move-out-of-array-1.stderr b/src/test/ui/moves/move-out-of-array-1.stderr index d015505a46b18..677f0b42f5a27 100644 --- a/src/test/ui/moves/move-out-of-array-1.stderr +++ b/src/test/ui/moves/move-out-of-array-1.stderr @@ -1,5 +1,5 @@ error[E0508]: cannot move out of type `[D; 4]`, a non-copy array - --> $DIR/move-out-of-array-1.rs:27:5 + --> $DIR/move-out-of-array-1.rs:17:5 | LL | a[i] //~ ERROR cannot move out of type `[D; 4]`, a non-copy array | ^^^^ cannot move out of here diff --git a/src/test/ui/moves/move-out-of-slice-1.nll.stderr b/src/test/ui/moves/move-out-of-slice-1.nll.stderr index aa62b457ecdf3..c8c09b31d36b8 100644 --- a/src/test/ui/moves/move-out-of-slice-1.nll.stderr +++ b/src/test/ui/moves/move-out-of-slice-1.nll.stderr @@ -1,5 +1,5 @@ error[E0508]: cannot move out of type `[A]`, a non-copy slice - --> $DIR/move-out-of-slice-1.rs:17:11 + --> $DIR/move-out-of-slice-1.rs:7:11 | LL | match a { | ^ cannot move out of here @@ -7,7 +7,7 @@ LL | box [a] => {}, //~ ERROR cannot move out of type `[A]`, a non-copy | - data moved here | note: move occurs because `a` has type `A`, which does not implement the `Copy` trait - --> $DIR/move-out-of-slice-1.rs:18:14 + --> $DIR/move-out-of-slice-1.rs:8:14 | LL | box [a] => {}, //~ ERROR cannot move out of type `[A]`, a non-copy slice | ^ diff --git a/src/test/ui/moves/move-out-of-slice-1.rs b/src/test/ui/moves/move-out-of-slice-1.rs index 5efbef549ddca..3e0906060e601 100644 --- a/src/test/ui/moves/move-out-of-slice-1.rs +++ b/src/test/ui/moves/move-out-of-slice-1.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_patterns)] struct A; diff --git a/src/test/ui/moves/move-out-of-slice-1.stderr b/src/test/ui/moves/move-out-of-slice-1.stderr index 87e68140774f3..bfdf641986908 100644 --- a/src/test/ui/moves/move-out-of-slice-1.stderr +++ b/src/test/ui/moves/move-out-of-slice-1.stderr @@ -1,5 +1,5 @@ error[E0508]: cannot move out of type `[A]`, a non-copy slice - --> $DIR/move-out-of-slice-1.rs:18:13 + --> $DIR/move-out-of-slice-1.rs:8:13 | LL | box [a] => {}, //~ ERROR cannot move out of type `[A]`, a non-copy slice | ^-^ diff --git a/src/test/ui/moves/move-out-of-tuple-field.nll.stderr b/src/test/ui/moves/move-out-of-tuple-field.nll.stderr index e18db1b48a1ac..2efdc84ca37d1 100644 --- a/src/test/ui/moves/move-out-of-tuple-field.nll.stderr +++ b/src/test/ui/moves/move-out-of-tuple-field.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `x.0` - --> $DIR/move-out-of-tuple-field.rs:18:13 + --> $DIR/move-out-of-tuple-field.rs:8:13 | LL | let y = x.0; | --- value moved here @@ -9,7 +9,7 @@ LL | let z = x.0; //~ ERROR use of moved value: `x.0` = note: move occurs because `x.0` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0382]: use of moved value: `x.0` - --> $DIR/move-out-of-tuple-field.rs:22:13 + --> $DIR/move-out-of-tuple-field.rs:12:13 | LL | let y = x.0; | --- value moved here diff --git a/src/test/ui/moves/move-out-of-tuple-field.rs b/src/test/ui/moves/move-out-of-tuple-field.rs index b739366671963..e5a505bb88d32 100644 --- a/src/test/ui/moves/move-out-of-tuple-field.rs +++ b/src/test/ui/moves/move-out-of-tuple-field.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] struct Foo(Box); diff --git a/src/test/ui/moves/move-out-of-tuple-field.stderr b/src/test/ui/moves/move-out-of-tuple-field.stderr index 1e8acf5a64b21..6839c49c82963 100644 --- a/src/test/ui/moves/move-out-of-tuple-field.stderr +++ b/src/test/ui/moves/move-out-of-tuple-field.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `x.0` - --> $DIR/move-out-of-tuple-field.rs:18:9 + --> $DIR/move-out-of-tuple-field.rs:8:9 | LL | let y = x.0; | - value moved here @@ -9,7 +9,7 @@ LL | let z = x.0; //~ ERROR use of moved value: `x.0` = note: move occurs because `x.0` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0382]: use of moved value: `x.0` - --> $DIR/move-out-of-tuple-field.rs:22:9 + --> $DIR/move-out-of-tuple-field.rs:12:9 | LL | let y = x.0; | - value moved here diff --git a/src/test/ui/moves/moves-based-on-type-access-to-field.nll.stderr b/src/test/ui/moves/moves-based-on-type-access-to-field.nll.stderr index 39c7f0633e37a..22968b329695f 100644 --- a/src/test/ui/moves/moves-based-on-type-access-to-field.nll.stderr +++ b/src/test/ui/moves/moves-based-on-type-access-to-field.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: borrow of moved value: `x` - --> $DIR/moves-based-on-type-access-to-field.rs:21:12 + --> $DIR/moves-based-on-type-access-to-field.rs:11:12 | LL | consume(x.into_iter().next().unwrap()); | - value moved here diff --git a/src/test/ui/moves/moves-based-on-type-access-to-field.rs b/src/test/ui/moves/moves-based-on-type-access-to-field.rs index 63fb4ff02a4ea..c7ea357a5d9a0 100644 --- a/src/test/ui/moves/moves-based-on-type-access-to-field.rs +++ b/src/test/ui/moves/moves-based-on-type-access-to-field.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that if you move from `x.f` or `x[0]`, `x` is inaccessible. // Also tests that we give a more specific error message. diff --git a/src/test/ui/moves/moves-based-on-type-access-to-field.stderr b/src/test/ui/moves/moves-based-on-type-access-to-field.stderr index 81546511e0340..882c1fe1706d2 100644 --- a/src/test/ui/moves/moves-based-on-type-access-to-field.stderr +++ b/src/test/ui/moves/moves-based-on-type-access-to-field.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `x` - --> $DIR/moves-based-on-type-access-to-field.rs:21:12 + --> $DIR/moves-based-on-type-access-to-field.rs:11:12 | LL | consume(x.into_iter().next().unwrap()); | - value moved here diff --git a/src/test/ui/moves/moves-based-on-type-block-bad.nll.stderr b/src/test/ui/moves/moves-based-on-type-block-bad.nll.stderr index 1f22ab1481852..6950a56a5335a 100644 --- a/src/test/ui/moves/moves-based-on-type-block-bad.nll.stderr +++ b/src/test/ui/moves/moves-based-on-type-block-bad.nll.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/moves-based-on-type-block-bad.rs:34:19 + --> $DIR/moves-based-on-type-block-bad.rs:24:19 | LL | match hellothere.x { //~ ERROR cannot move out | ^^^^^^^^^^^^ @@ -11,7 +11,7 @@ LL | box E::Bar(x) => println!("{}", x.to_string()), | - data moved here | note: move occurs because `x` has type `std::boxed::Box`, which does not implement the `Copy` trait - --> $DIR/moves-based-on-type-block-bad.rs:37:28 + --> $DIR/moves-based-on-type-block-bad.rs:27:28 | LL | box E::Bar(x) => println!("{}", x.to_string()), | ^ diff --git a/src/test/ui/moves/moves-based-on-type-block-bad.rs b/src/test/ui/moves/moves-based-on-type-block-bad.rs index dd4c4c843ab8a..99928caa926a4 100644 --- a/src/test/ui/moves/moves-based-on-type-block-bad.rs +++ b/src/test/ui/moves/moves-based-on-type-block-bad.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength #![feature(box_patterns)] diff --git a/src/test/ui/moves/moves-based-on-type-block-bad.stderr b/src/test/ui/moves/moves-based-on-type-block-bad.stderr index f1b882924109b..4ecaed3b69b54 100644 --- a/src/test/ui/moves/moves-based-on-type-block-bad.stderr +++ b/src/test/ui/moves/moves-based-on-type-block-bad.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/moves-based-on-type-block-bad.rs:34:19 + --> $DIR/moves-based-on-type-block-bad.rs:24:19 | LL | match hellothere.x { //~ ERROR cannot move out | ^^^^^^^^^^ cannot move out of borrowed content diff --git a/src/test/ui/moves/moves-based-on-type-capture-clause-bad.nll.stderr b/src/test/ui/moves/moves-based-on-type-capture-clause-bad.nll.stderr index 0081fa67b9d3b..061e871c78a73 100644 --- a/src/test/ui/moves/moves-based-on-type-capture-clause-bad.nll.stderr +++ b/src/test/ui/moves/moves-based-on-type-capture-clause-bad.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: borrow of moved value: `x` - --> $DIR/moves-based-on-type-capture-clause-bad.rs:18:20 + --> $DIR/moves-based-on-type-capture-clause-bad.rs:8:20 | LL | thread::spawn(move|| { | ------ value moved into closure here diff --git a/src/test/ui/moves/moves-based-on-type-capture-clause-bad.rs b/src/test/ui/moves/moves-based-on-type-capture-clause-bad.rs index 32fa773ec8079..d5f44a0b3f75d 100644 --- a/src/test/ui/moves/moves-based-on-type-capture-clause-bad.rs +++ b/src/test/ui/moves/moves-based-on-type-capture-clause-bad.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::thread; fn main() { diff --git a/src/test/ui/moves/moves-based-on-type-capture-clause-bad.stderr b/src/test/ui/moves/moves-based-on-type-capture-clause-bad.stderr index 54b25678819ea..88e58fdf58bcd 100644 --- a/src/test/ui/moves/moves-based-on-type-capture-clause-bad.stderr +++ b/src/test/ui/moves/moves-based-on-type-capture-clause-bad.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `x` - --> $DIR/moves-based-on-type-capture-clause-bad.rs:18:20 + --> $DIR/moves-based-on-type-capture-clause-bad.rs:8:20 | LL | thread::spawn(move|| { | ------ value moved (into closure) here diff --git a/src/test/ui/moves/moves-based-on-type-cyclic-types-issue-4821.nll.stderr b/src/test/ui/moves/moves-based-on-type-cyclic-types-issue-4821.nll.stderr index 50b51c6f3971c..99550235f6969 100644 --- a/src/test/ui/moves/moves-based-on-type-cyclic-types-issue-4821.nll.stderr +++ b/src/test/ui/moves/moves-based-on-type-cyclic-types-issue-4821.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `node` - --> $DIR/moves-based-on-type-cyclic-types-issue-4821.rs:23:13 + --> $DIR/moves-based-on-type-cyclic-types-issue-4821.rs:13:13 | LL | Some(right) => consume(right), | ----- value moved here diff --git a/src/test/ui/moves/moves-based-on-type-cyclic-types-issue-4821.rs b/src/test/ui/moves/moves-based-on-type-cyclic-types-issue-4821.rs index 0c4aae8cfad36..4417fb926d96d 100644 --- a/src/test/ui/moves/moves-based-on-type-cyclic-types-issue-4821.rs +++ b/src/test/ui/moves/moves-based-on-type-cyclic-types-issue-4821.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test for a subtle failure computing kinds of cyclic types, in which // temporary kinds wound up being stored in a cache and used later. // See rustc::ty::type_contents() for more information. diff --git a/src/test/ui/moves/moves-based-on-type-cyclic-types-issue-4821.stderr b/src/test/ui/moves/moves-based-on-type-cyclic-types-issue-4821.stderr index 421d25721e490..7624ba5fe28d9 100644 --- a/src/test/ui/moves/moves-based-on-type-cyclic-types-issue-4821.stderr +++ b/src/test/ui/moves/moves-based-on-type-cyclic-types-issue-4821.stderr @@ -1,5 +1,5 @@ error[E0382]: use of partially moved value: `node` - --> $DIR/moves-based-on-type-cyclic-types-issue-4821.rs:23:13 + --> $DIR/moves-based-on-type-cyclic-types-issue-4821.rs:13:13 | LL | Some(right) => consume(right), | ----- value moved here diff --git a/src/test/ui/moves/moves-based-on-type-distribute-copy-over-paren.nll.stderr b/src/test/ui/moves/moves-based-on-type-distribute-copy-over-paren.nll.stderr index 82420730644c1..10593a6078e3b 100644 --- a/src/test/ui/moves/moves-based-on-type-distribute-copy-over-paren.nll.stderr +++ b/src/test/ui/moves/moves-based-on-type-distribute-copy-over-paren.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: borrow of moved value: `x` - --> $DIR/moves-based-on-type-distribute-copy-over-paren.rs:21:11 + --> $DIR/moves-based-on-type-distribute-copy-over-paren.rs:11:11 | LL | let _y = Foo { f:x }; | - value moved here @@ -10,7 +10,7 @@ LL | touch(&x); //~ ERROR use of moved value: `x` = note: move occurs because `x` has type `std::string::String`, which does not implement the `Copy` trait error[E0382]: borrow of moved value: `x` - --> $DIR/moves-based-on-type-distribute-copy-over-paren.rs:30:11 + --> $DIR/moves-based-on-type-distribute-copy-over-paren.rs:20:11 | LL | let _y = Foo { f:(((x))) }; | ------- value moved here diff --git a/src/test/ui/moves/moves-based-on-type-distribute-copy-over-paren.rs b/src/test/ui/moves/moves-based-on-type-distribute-copy-over-paren.rs index 5329dcaaaf4a2..7c7ca0044e29c 100644 --- a/src/test/ui/moves/moves-based-on-type-distribute-copy-over-paren.rs +++ b/src/test/ui/moves/moves-based-on-type-distribute-copy-over-paren.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that references to move-by-default values trigger moves when // they occur as part of various kinds of expressions. diff --git a/src/test/ui/moves/moves-based-on-type-distribute-copy-over-paren.stderr b/src/test/ui/moves/moves-based-on-type-distribute-copy-over-paren.stderr index 8c40b4db4f791..374ac61e7f5e9 100644 --- a/src/test/ui/moves/moves-based-on-type-distribute-copy-over-paren.stderr +++ b/src/test/ui/moves/moves-based-on-type-distribute-copy-over-paren.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `x` - --> $DIR/moves-based-on-type-distribute-copy-over-paren.rs:21:12 + --> $DIR/moves-based-on-type-distribute-copy-over-paren.rs:11:12 | LL | let _y = Foo { f:x }; | - value moved here @@ -10,7 +10,7 @@ LL | touch(&x); //~ ERROR use of moved value: `x` = note: move occurs because `x` has type `std::string::String`, which does not implement the `Copy` trait error[E0382]: use of moved value: `x` - --> $DIR/moves-based-on-type-distribute-copy-over-paren.rs:30:12 + --> $DIR/moves-based-on-type-distribute-copy-over-paren.rs:20:12 | LL | let _y = Foo { f:(((x))) }; | ------- value moved here diff --git a/src/test/ui/moves/moves-based-on-type-exprs.nll.stderr b/src/test/ui/moves/moves-based-on-type-exprs.nll.stderr index aa248dab85ced..fe44803e2734b 100644 --- a/src/test/ui/moves/moves-based-on-type-exprs.nll.stderr +++ b/src/test/ui/moves/moves-based-on-type-exprs.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: borrow of moved value: `x` - --> $DIR/moves-based-on-type-exprs.rs:22:11 + --> $DIR/moves-based-on-type-exprs.rs:12:11 | LL | let _y = Foo { f:x }; | - value moved here @@ -9,7 +9,7 @@ LL | touch(&x); //~ ERROR use of moved value: `x` = note: move occurs because `x` has type `std::string::String`, which does not implement the `Copy` trait error[E0382]: borrow of moved value: `x` - --> $DIR/moves-based-on-type-exprs.rs:28:11 + --> $DIR/moves-based-on-type-exprs.rs:18:11 | LL | let _y = (x, 3); | - value moved here @@ -19,7 +19,7 @@ LL | touch(&x); //~ ERROR use of moved value: `x` = note: move occurs because `x` has type `std::string::String`, which does not implement the `Copy` trait error[E0382]: borrow of moved value: `x` - --> $DIR/moves-based-on-type-exprs.rs:45:11 + --> $DIR/moves-based-on-type-exprs.rs:35:11 | LL | x | - value moved here @@ -30,7 +30,7 @@ LL | touch(&x); //~ ERROR use of moved value: `x` = note: move occurs because `x` has type `std::string::String`, which does not implement the `Copy` trait error[E0382]: borrow of moved value: `y` - --> $DIR/moves-based-on-type-exprs.rs:46:11 + --> $DIR/moves-based-on-type-exprs.rs:36:11 | LL | y | - value moved here @@ -41,7 +41,7 @@ LL | touch(&y); //~ ERROR use of moved value: `y` = note: move occurs because `y` has type `std::string::String`, which does not implement the `Copy` trait error[E0382]: borrow of moved value: `x` - --> $DIR/moves-based-on-type-exprs.rs:56:11 + --> $DIR/moves-based-on-type-exprs.rs:46:11 | LL | true => x, | - value moved here @@ -52,7 +52,7 @@ LL | touch(&x); //~ ERROR use of moved value: `x` = note: move occurs because `x` has type `std::string::String`, which does not implement the `Copy` trait error[E0382]: borrow of moved value: `y` - --> $DIR/moves-based-on-type-exprs.rs:57:11 + --> $DIR/moves-based-on-type-exprs.rs:47:11 | LL | false => y | - value moved here @@ -63,7 +63,7 @@ LL | touch(&y); //~ ERROR use of moved value: `y` = note: move occurs because `y` has type `std::string::String`, which does not implement the `Copy` trait error[E0382]: borrow of moved value: `x` - --> $DIR/moves-based-on-type-exprs.rs:68:11 + --> $DIR/moves-based-on-type-exprs.rs:58:11 | LL | _ if guard(x) => 10, | - value moved here @@ -74,7 +74,7 @@ LL | touch(&x); //~ ERROR use of moved value: `x` = note: move occurs because `x` has type `std::string::String`, which does not implement the `Copy` trait error[E0382]: borrow of moved value: `x` - --> $DIR/moves-based-on-type-exprs.rs:75:11 + --> $DIR/moves-based-on-type-exprs.rs:65:11 | LL | let _y = [x]; | - value moved here @@ -84,7 +84,7 @@ LL | touch(&x); //~ ERROR use of moved value: `x` = note: move occurs because `x` has type `std::string::String`, which does not implement the `Copy` trait error[E0382]: borrow of moved value: `x` - --> $DIR/moves-based-on-type-exprs.rs:81:11 + --> $DIR/moves-based-on-type-exprs.rs:71:11 | LL | let _y = vec![x]; | - value moved here @@ -94,7 +94,7 @@ LL | touch(&x); //~ ERROR use of moved value: `x` = note: move occurs because `x` has type `std::string::String`, which does not implement the `Copy` trait error[E0382]: borrow of moved value: `x` - --> $DIR/moves-based-on-type-exprs.rs:87:11 + --> $DIR/moves-based-on-type-exprs.rs:77:11 | LL | let _y = x.into_iter().next().unwrap(); | - value moved here @@ -104,7 +104,7 @@ LL | touch(&x); //~ ERROR use of moved value: `x` = note: move occurs because `x` has type `std::vec::Vec`, which does not implement the `Copy` trait error[E0382]: borrow of moved value: `x` - --> $DIR/moves-based-on-type-exprs.rs:93:11 + --> $DIR/moves-based-on-type-exprs.rs:83:11 | LL | let _y = [x.into_iter().next().unwrap(); 1]; | - value moved here diff --git a/src/test/ui/moves/moves-based-on-type-exprs.rs b/src/test/ui/moves/moves-based-on-type-exprs.rs index 194f278259b6b..b058f83291b10 100644 --- a/src/test/ui/moves/moves-based-on-type-exprs.rs +++ b/src/test/ui/moves/moves-based-on-type-exprs.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that references to move-by-default values trigger moves when // they occur as part of various kinds of expressions. diff --git a/src/test/ui/moves/moves-based-on-type-exprs.stderr b/src/test/ui/moves/moves-based-on-type-exprs.stderr index 003ae017b5812..e6177c6b6c836 100644 --- a/src/test/ui/moves/moves-based-on-type-exprs.stderr +++ b/src/test/ui/moves/moves-based-on-type-exprs.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `x` - --> $DIR/moves-based-on-type-exprs.rs:22:12 + --> $DIR/moves-based-on-type-exprs.rs:12:12 | LL | let _y = Foo { f:x }; | - value moved here @@ -9,7 +9,7 @@ LL | touch(&x); //~ ERROR use of moved value: `x` = note: move occurs because `x` has type `std::string::String`, which does not implement the `Copy` trait error[E0382]: use of moved value: `x` - --> $DIR/moves-based-on-type-exprs.rs:28:12 + --> $DIR/moves-based-on-type-exprs.rs:18:12 | LL | let _y = (x, 3); | - value moved here @@ -19,7 +19,7 @@ LL | touch(&x); //~ ERROR use of moved value: `x` = note: move occurs because `x` has type `std::string::String`, which does not implement the `Copy` trait error[E0382]: use of moved value: `x` - --> $DIR/moves-based-on-type-exprs.rs:45:12 + --> $DIR/moves-based-on-type-exprs.rs:35:12 | LL | x | - value moved here @@ -30,7 +30,7 @@ LL | touch(&x); //~ ERROR use of moved value: `x` = note: move occurs because `x` has type `std::string::String`, which does not implement the `Copy` trait error[E0382]: use of moved value: `y` - --> $DIR/moves-based-on-type-exprs.rs:46:12 + --> $DIR/moves-based-on-type-exprs.rs:36:12 | LL | y | - value moved here @@ -41,7 +41,7 @@ LL | touch(&y); //~ ERROR use of moved value: `y` = note: move occurs because `y` has type `std::string::String`, which does not implement the `Copy` trait error[E0382]: use of moved value: `x` - --> $DIR/moves-based-on-type-exprs.rs:56:12 + --> $DIR/moves-based-on-type-exprs.rs:46:12 | LL | true => x, | - value moved here @@ -52,7 +52,7 @@ LL | touch(&x); //~ ERROR use of moved value: `x` = note: move occurs because `x` has type `std::string::String`, which does not implement the `Copy` trait error[E0382]: use of moved value: `y` - --> $DIR/moves-based-on-type-exprs.rs:57:12 + --> $DIR/moves-based-on-type-exprs.rs:47:12 | LL | false => y | - value moved here @@ -63,7 +63,7 @@ LL | touch(&y); //~ ERROR use of moved value: `y` = note: move occurs because `y` has type `std::string::String`, which does not implement the `Copy` trait error[E0382]: use of moved value: `x` - --> $DIR/moves-based-on-type-exprs.rs:68:12 + --> $DIR/moves-based-on-type-exprs.rs:58:12 | LL | _ if guard(x) => 10, | - value moved here @@ -74,7 +74,7 @@ LL | touch(&x); //~ ERROR use of moved value: `x` = note: move occurs because `x` has type `std::string::String`, which does not implement the `Copy` trait error[E0382]: use of moved value: `x` - --> $DIR/moves-based-on-type-exprs.rs:75:12 + --> $DIR/moves-based-on-type-exprs.rs:65:12 | LL | let _y = [x]; | - value moved here @@ -84,7 +84,7 @@ LL | touch(&x); //~ ERROR use of moved value: `x` = note: move occurs because `x` has type `std::string::String`, which does not implement the `Copy` trait error[E0382]: use of moved value: `x` - --> $DIR/moves-based-on-type-exprs.rs:81:12 + --> $DIR/moves-based-on-type-exprs.rs:71:12 | LL | let _y = vec![x]; | - value moved here @@ -94,7 +94,7 @@ LL | touch(&x); //~ ERROR use of moved value: `x` = note: move occurs because `x` has type `std::string::String`, which does not implement the `Copy` trait error[E0382]: use of moved value: `x` - --> $DIR/moves-based-on-type-exprs.rs:87:12 + --> $DIR/moves-based-on-type-exprs.rs:77:12 | LL | let _y = x.into_iter().next().unwrap(); | - value moved here @@ -104,7 +104,7 @@ LL | touch(&x); //~ ERROR use of moved value: `x` = note: move occurs because `x` has type `std::vec::Vec`, which does not implement the `Copy` trait error[E0382]: use of moved value: `x` - --> $DIR/moves-based-on-type-exprs.rs:93:12 + --> $DIR/moves-based-on-type-exprs.rs:83:12 | LL | let _y = [x.into_iter().next().unwrap(); 1]; | - value moved here diff --git a/src/test/ui/moves/moves-based-on-type-match-bindings.nll.stderr b/src/test/ui/moves/moves-based-on-type-match-bindings.nll.stderr index d5b18a6c96298..481c492e16469 100644 --- a/src/test/ui/moves/moves-based-on-type-match-bindings.nll.stderr +++ b/src/test/ui/moves/moves-based-on-type-match-bindings.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: borrow of moved value: `x` - --> $DIR/moves-based-on-type-match-bindings.rs:26:11 + --> $DIR/moves-based-on-type-match-bindings.rs:16:11 | LL | Foo {f} => {} | - value moved here diff --git a/src/test/ui/moves/moves-based-on-type-match-bindings.rs b/src/test/ui/moves/moves-based-on-type-match-bindings.rs index 1fd3d03570a69..59e5a8f684e9a 100644 --- a/src/test/ui/moves/moves-based-on-type-match-bindings.rs +++ b/src/test/ui/moves/moves-based-on-type-match-bindings.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that bindings to move-by-default values trigger moves of the // discriminant. Also tests that the compiler explains the move in // terms of the binding, not the discriminant. diff --git a/src/test/ui/moves/moves-based-on-type-match-bindings.stderr b/src/test/ui/moves/moves-based-on-type-match-bindings.stderr index 62e16df583f87..41ced9dfd935b 100644 --- a/src/test/ui/moves/moves-based-on-type-match-bindings.stderr +++ b/src/test/ui/moves/moves-based-on-type-match-bindings.stderr @@ -1,5 +1,5 @@ error[E0382]: use of partially moved value: `x` - --> $DIR/moves-based-on-type-match-bindings.rs:26:12 + --> $DIR/moves-based-on-type-match-bindings.rs:16:12 | LL | Foo {f} => {} | - value moved here diff --git a/src/test/ui/moves/moves-based-on-type-move-out-of-closure-env-issue-1965.nll.stderr b/src/test/ui/moves/moves-based-on-type-move-out-of-closure-env-issue-1965.nll.stderr index 13a6fc15ce318..7d410f6cabc83 100644 --- a/src/test/ui/moves/moves-based-on-type-move-out-of-closure-env-issue-1965.nll.stderr +++ b/src/test/ui/moves/moves-based-on-type-move-out-of-closure-env-issue-1965.nll.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of captured variable in an `Fn` closure - --> $DIR/moves-based-on-type-move-out-of-closure-env-issue-1965.rs:21:28 + --> $DIR/moves-based-on-type-move-out-of-closure-env-issue-1965.rs:11:28 | LL | let i = box 3; | - captured outer variable diff --git a/src/test/ui/moves/moves-based-on-type-move-out-of-closure-env-issue-1965.rs b/src/test/ui/moves/moves-based-on-type-move-out-of-closure-env-issue-1965.rs index 4251be36ab438..5fcd3392d33e3 100644 --- a/src/test/ui/moves/moves-based-on-type-move-out-of-closure-env-issue-1965.rs +++ b/src/test/ui/moves/moves-based-on-type-move-out-of-closure-env-issue-1965.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax, unboxed_closures)] use std::usize; diff --git a/src/test/ui/moves/moves-based-on-type-move-out-of-closure-env-issue-1965.stderr b/src/test/ui/moves/moves-based-on-type-move-out-of-closure-env-issue-1965.stderr index 43de9016a7d1f..49113a57d2fa5 100644 --- a/src/test/ui/moves/moves-based-on-type-move-out-of-closure-env-issue-1965.stderr +++ b/src/test/ui/moves/moves-based-on-type-move-out-of-closure-env-issue-1965.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of captured outer variable in an `Fn` closure - --> $DIR/moves-based-on-type-move-out-of-closure-env-issue-1965.rs:21:28 + --> $DIR/moves-based-on-type-move-out-of-closure-env-issue-1965.rs:11:28 | LL | let i = box 3; | - captured outer variable diff --git a/src/test/ui/moves/moves-based-on-type-no-recursive-stack-closure.nll.stderr b/src/test/ui/moves/moves-based-on-type-no-recursive-stack-closure.nll.stderr index e23a6beb87eaf..d485239e758ba 100644 --- a/src/test/ui/moves/moves-based-on-type-no-recursive-stack-closure.nll.stderr +++ b/src/test/ui/moves/moves-based-on-type-no-recursive-stack-closure.nll.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `*f` as mutable more than once at a time - --> $DIR/moves-based-on-type-no-recursive-stack-closure.rs:30:27 + --> $DIR/moves-based-on-type-no-recursive-stack-closure.rs:20:27 | LL | (f.c)(f, true); | ------^------- @@ -9,7 +9,7 @@ LL | (f.c)(f, true); | borrow later used here error[E0382]: borrow of moved value: `f` - --> $DIR/moves-based-on-type-no-recursive-stack-closure.rs:42:5 + --> $DIR/moves-based-on-type-no-recursive-stack-closure.rs:32:5 | LL | let mut r = R {c: Box::new(f)}; | - value moved here diff --git a/src/test/ui/moves/moves-based-on-type-no-recursive-stack-closure.rs b/src/test/ui/moves/moves-based-on-type-no-recursive-stack-closure.rs index d529606599994..737a131c9bf6a 100644 --- a/src/test/ui/moves/moves-based-on-type-no-recursive-stack-closure.rs +++ b/src/test/ui/moves/moves-based-on-type-no-recursive-stack-closure.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests correct kind-checking of the reason stack closures without the :Copy // bound must be noncopyable. For details see // http://smallcultfollowing.com/babysteps/blog/2013/04/30/the-case-of-the-recurring-closure/ diff --git a/src/test/ui/moves/moves-based-on-type-no-recursive-stack-closure.stderr b/src/test/ui/moves/moves-based-on-type-no-recursive-stack-closure.stderr index 65cea57f0ed54..05ced7f0107ae 100644 --- a/src/test/ui/moves/moves-based-on-type-no-recursive-stack-closure.stderr +++ b/src/test/ui/moves/moves-based-on-type-no-recursive-stack-closure.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `*f` as mutable more than once at a time - --> $DIR/moves-based-on-type-no-recursive-stack-closure.rs:30:27 + --> $DIR/moves-based-on-type-no-recursive-stack-closure.rs:20:27 | LL | (f.c)(f, true); | ----- ^ - first borrow ends here @@ -8,7 +8,7 @@ LL | (f.c)(f, true); | first mutable borrow occurs here error[E0382]: use of moved value: `f` - --> $DIR/moves-based-on-type-no-recursive-stack-closure.rs:42:5 + --> $DIR/moves-based-on-type-no-recursive-stack-closure.rs:32:5 | LL | let mut r = R {c: Box::new(f)}; | - value moved here diff --git a/src/test/ui/moves/moves-based-on-type-tuple.rs b/src/test/ui/moves/moves-based-on-type-tuple.rs index 27903fee117b3..b1723fb18e32f 100644 --- a/src/test/ui/moves/moves-based-on-type-tuple.rs +++ b/src/test/ui/moves/moves-based-on-type-tuple.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] // compile-flags: -Z emit-end-regions -Z borrowck=compare diff --git a/src/test/ui/moves/moves-based-on-type-tuple.stderr b/src/test/ui/moves/moves-based-on-type-tuple.stderr index b0a3b6bf1fd67..2d2c0a15a002a 100644 --- a/src/test/ui/moves/moves-based-on-type-tuple.stderr +++ b/src/test/ui/moves/moves-based-on-type-tuple.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `x` (Ast) - --> $DIR/moves-based-on-type-tuple.rs:16:13 + --> $DIR/moves-based-on-type-tuple.rs:6:13 | LL | box (x, x) | - ^ value used here after move @@ -9,7 +9,7 @@ LL | box (x, x) = note: move occurs because `x` has type `std::boxed::Box`, which does not implement the `Copy` trait error[E0382]: use of moved value: `x` (Mir) - --> $DIR/moves-based-on-type-tuple.rs:16:13 + --> $DIR/moves-based-on-type-tuple.rs:6:13 | LL | box (x, x) | - ^ value used here after move diff --git a/src/test/ui/moves/moves-sru-moved-field.nll.stderr b/src/test/ui/moves/moves-sru-moved-field.nll.stderr index d1a528c50a1ac..e5daab36f6ee7 100644 --- a/src/test/ui/moves/moves-sru-moved-field.nll.stderr +++ b/src/test/ui/moves/moves-sru-moved-field.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `f.moved` - --> $DIR/moves-sru-moved-field.rs:30:14 + --> $DIR/moves-sru-moved-field.rs:20:14 | LL | let _b = Foo {noncopyable: g, ..f}; | ------------------------- value moved here diff --git a/src/test/ui/moves/moves-sru-moved-field.rs b/src/test/ui/moves/moves-sru-moved-field.rs index 15977fbeb734d..e620e5de92320 100644 --- a/src/test/ui/moves/moves-sru-moved-field.rs +++ b/src/test/ui/moves/moves-sru-moved-field.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] type Noncopyable = Box; diff --git a/src/test/ui/moves/moves-sru-moved-field.stderr b/src/test/ui/moves/moves-sru-moved-field.stderr index 878dd7ba8302c..3d38faa20a1e4 100644 --- a/src/test/ui/moves/moves-sru-moved-field.stderr +++ b/src/test/ui/moves/moves-sru-moved-field.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `f.moved` - --> $DIR/moves-sru-moved-field.rs:30:37 + --> $DIR/moves-sru-moved-field.rs:20:37 | LL | let _b = Foo {noncopyable: g, ..f}; | - value moved here diff --git a/src/test/ui/multiple-main-2.rs b/src/test/ui/multiple-main-2.rs index d9c232d7dac37..6bae664ab7405 100644 --- a/src/test/ui/multiple-main-2.rs +++ b/src/test/ui/multiple-main-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(main)] #[main] diff --git a/src/test/ui/multiple-main-2.stderr b/src/test/ui/multiple-main-2.stderr index e63bbc5cc4306..c761e74bb8723 100644 --- a/src/test/ui/multiple-main-2.stderr +++ b/src/test/ui/multiple-main-2.stderr @@ -1,5 +1,5 @@ error[E0137]: multiple functions with a #[main] attribute - --> $DIR/multiple-main-2.rs:18:1 + --> $DIR/multiple-main-2.rs:8:1 | LL | / fn bar() { LL | | } diff --git a/src/test/ui/multiple-main-3.rs b/src/test/ui/multiple-main-3.rs index 866a59e7a4f62..dbcf1ef4896b2 100644 --- a/src/test/ui/multiple-main-3.rs +++ b/src/test/ui/multiple-main-3.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(main)] #[main] diff --git a/src/test/ui/multiple-main-3.stderr b/src/test/ui/multiple-main-3.stderr index d489e34b8756c..2574f0ef6d81c 100644 --- a/src/test/ui/multiple-main-3.stderr +++ b/src/test/ui/multiple-main-3.stderr @@ -1,5 +1,5 @@ error[E0137]: multiple functions with a #[main] attribute - --> $DIR/multiple-main-3.rs:19:5 + --> $DIR/multiple-main-3.rs:9:5 | LL | / fn main1() { LL | | } diff --git a/src/test/ui/multiple-plugin-registrars.rs b/src/test/ui/multiple-plugin-registrars.rs index f5ebf84b8e0df..d211204b134be 100644 --- a/src/test/ui/multiple-plugin-registrars.rs +++ b/src/test/ui/multiple-plugin-registrars.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: multiple plugin registration functions found #![feature(plugin_registrar)] diff --git a/src/test/ui/multiple-plugin-registrars.stderr b/src/test/ui/multiple-plugin-registrars.stderr index f1370df0f8b15..0e8379841f960 100644 --- a/src/test/ui/multiple-plugin-registrars.stderr +++ b/src/test/ui/multiple-plugin-registrars.stderr @@ -1,12 +1,12 @@ error: multiple plugin registration functions found | note: one is here - --> $DIR/multiple-plugin-registrars.rs:17:1 + --> $DIR/multiple-plugin-registrars.rs:7:1 | LL | pub fn one() {} | ^^^^^^^^^^^^^^^ note: one is here - --> $DIR/multiple-plugin-registrars.rs:20:1 + --> $DIR/multiple-plugin-registrars.rs:10:1 | LL | pub fn two() {} | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/mut/mut-cant-alias.nll.stderr b/src/test/ui/mut/mut-cant-alias.nll.stderr index e2758f810db7d..98fbcd294db4e 100644 --- a/src/test/ui/mut/mut-cant-alias.nll.stderr +++ b/src/test/ui/mut/mut-cant-alias.nll.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `b` as mutable more than once at a time - --> $DIR/mut-cant-alias.rs:19:20 + --> $DIR/mut-cant-alias.rs:9:20 | LL | let b1 = &mut *b; | - first mutable borrow occurs here diff --git a/src/test/ui/mut/mut-cant-alias.rs b/src/test/ui/mut/mut-cant-alias.rs index af7d0e2742a0f..9146b931a1974 100644 --- a/src/test/ui/mut/mut-cant-alias.rs +++ b/src/test/ui/mut/mut-cant-alias.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cell::RefCell; diff --git a/src/test/ui/mut/mut-cant-alias.stderr b/src/test/ui/mut/mut-cant-alias.stderr index b15ffe649dd63..ce942677bed61 100644 --- a/src/test/ui/mut/mut-cant-alias.stderr +++ b/src/test/ui/mut/mut-cant-alias.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `b` as mutable more than once at a time - --> $DIR/mut-cant-alias.rs:19:20 + --> $DIR/mut-cant-alias.rs:9:20 | LL | let b1 = &mut *b; | - first mutable borrow occurs here diff --git a/src/test/ui/mut/mut-cross-borrowing.rs b/src/test/ui/mut/mut-cross-borrowing.rs index 73982fa2811a0..63e49c292eac7 100644 --- a/src/test/ui/mut/mut-cross-borrowing.rs +++ b/src/test/ui/mut/mut-cross-borrowing.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn f(_: &mut isize) {} diff --git a/src/test/ui/mut/mut-cross-borrowing.stderr b/src/test/ui/mut/mut-cross-borrowing.stderr index be32f235be303..8708a135360b7 100644 --- a/src/test/ui/mut/mut-cross-borrowing.stderr +++ b/src/test/ui/mut/mut-cross-borrowing.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/mut-cross-borrowing.rs:17:7 + --> $DIR/mut-cross-borrowing.rs:7:7 | LL | f(x) //~ ERROR mismatched types | ^ diff --git a/src/test/ui/mut/mut-pattern-internal-mutability.ast.nll.stderr b/src/test/ui/mut/mut-pattern-internal-mutability.ast.nll.stderr index 0df303eed779a..793edb79a0b48 100644 --- a/src/test/ui/mut/mut-pattern-internal-mutability.ast.nll.stderr +++ b/src/test/ui/mut/mut-pattern-internal-mutability.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `x` - --> $DIR/mut-pattern-internal-mutability.rs:18:5 + --> $DIR/mut-pattern-internal-mutability.rs:8:5 | LL | let &mut x = foo; | - @@ -10,7 +10,7 @@ LL | x += 1; //[ast]~ ERROR cannot assign twice to immutable variable | ^^^^^^ cannot assign twice to immutable variable error[E0506]: cannot assign to `*foo` because it is borrowed - --> $DIR/mut-pattern-internal-mutability.rs:27:5 + --> $DIR/mut-pattern-internal-mutability.rs:17:5 | LL | let &mut ref x = foo; | ----- borrow of `*foo` occurs here diff --git a/src/test/ui/mut/mut-pattern-internal-mutability.ast.stderr b/src/test/ui/mut/mut-pattern-internal-mutability.ast.stderr index 47a33e320bd78..e3423d5388e43 100644 --- a/src/test/ui/mut/mut-pattern-internal-mutability.ast.stderr +++ b/src/test/ui/mut/mut-pattern-internal-mutability.ast.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `x` - --> $DIR/mut-pattern-internal-mutability.rs:18:5 + --> $DIR/mut-pattern-internal-mutability.rs:8:5 | LL | let &mut x = foo; | - first assignment to `x` @@ -7,7 +7,7 @@ LL | x += 1; //[ast]~ ERROR cannot assign twice to immutable variable | ^^^^^^ cannot assign twice to immutable variable error[E0506]: cannot assign to `*foo` because it is borrowed - --> $DIR/mut-pattern-internal-mutability.rs:27:5 + --> $DIR/mut-pattern-internal-mutability.rs:17:5 | LL | let &mut ref x = foo; | ----- borrow of `*foo` occurs here diff --git a/src/test/ui/mut/mut-pattern-internal-mutability.mir.stderr b/src/test/ui/mut/mut-pattern-internal-mutability.mir.stderr index 0df303eed779a..793edb79a0b48 100644 --- a/src/test/ui/mut/mut-pattern-internal-mutability.mir.stderr +++ b/src/test/ui/mut/mut-pattern-internal-mutability.mir.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `x` - --> $DIR/mut-pattern-internal-mutability.rs:18:5 + --> $DIR/mut-pattern-internal-mutability.rs:8:5 | LL | let &mut x = foo; | - @@ -10,7 +10,7 @@ LL | x += 1; //[ast]~ ERROR cannot assign twice to immutable variable | ^^^^^^ cannot assign twice to immutable variable error[E0506]: cannot assign to `*foo` because it is borrowed - --> $DIR/mut-pattern-internal-mutability.rs:27:5 + --> $DIR/mut-pattern-internal-mutability.rs:17:5 | LL | let &mut ref x = foo; | ----- borrow of `*foo` occurs here diff --git a/src/test/ui/mut/mut-pattern-internal-mutability.rs b/src/test/ui/mut/mut-pattern-internal-mutability.rs index a05ee64937eb7..ffad623e572a7 100644 --- a/src/test/ui/mut/mut-pattern-internal-mutability.rs +++ b/src/test/ui/mut/mut-pattern-internal-mutability.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/mut/mut-pattern-mismatched.rs b/src/test/ui/mut/mut-pattern-mismatched.rs index 7685a5c0808a2..17bf75419b7ac 100644 --- a/src/test/ui/mut/mut-pattern-mismatched.rs +++ b/src/test/ui/mut/mut-pattern-mismatched.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let foo = &mut 1; diff --git a/src/test/ui/mut/mut-pattern-mismatched.stderr b/src/test/ui/mut/mut-pattern-mismatched.stderr index 20bd804addc8f..d50a1a8f273bd 100644 --- a/src/test/ui/mut/mut-pattern-mismatched.stderr +++ b/src/test/ui/mut/mut-pattern-mismatched.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/mut-pattern-mismatched.rs:16:10 + --> $DIR/mut-pattern-mismatched.rs:6:10 | LL | let &_ //~ ERROR mismatched types | ^^ types differ in mutability @@ -8,7 +8,7 @@ LL | let &_ //~ ERROR mismatched types found type `&_` error[E0308]: mismatched types - --> $DIR/mut-pattern-mismatched.rs:25:9 + --> $DIR/mut-pattern-mismatched.rs:15:9 | LL | let &mut _ //~ ERROR mismatched types | ^^^^^^ types differ in mutability diff --git a/src/test/ui/mut/mut-ref.rs b/src/test/ui/mut/mut-ref.rs index 715c4adf2e692..064990e52b96c 100644 --- a/src/test/ui/mut/mut-ref.rs +++ b/src/test/ui/mut/mut-ref.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/ui/mut/mut-ref.stderr b/src/test/ui/mut/mut-ref.stderr index d2df58881a25f..a91483aca4a17 100644 --- a/src/test/ui/mut/mut-ref.stderr +++ b/src/test/ui/mut/mut-ref.stderr @@ -1,5 +1,5 @@ error: the order of `mut` and `ref` is incorrect - --> $DIR/mut-ref.rs:14:9 + --> $DIR/mut-ref.rs:4:9 | LL | let mut ref x = 10; //~ ERROR the order of `mut` and `ref` is incorrect | ^^^^^^^ help: try switching the order: `ref mut` diff --git a/src/test/ui/mut/mut-suggestion.nll.stderr b/src/test/ui/mut/mut-suggestion.nll.stderr index 39a1e93d61975..59faffa446704 100644 --- a/src/test/ui/mut/mut-suggestion.nll.stderr +++ b/src/test/ui/mut/mut-suggestion.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `arg` as mutable, as it is not declared as mutable - --> $DIR/mut-suggestion.rs:21:5 + --> $DIR/mut-suggestion.rs:11:5 | LL | fn func(arg: S) { | --- help: consider changing this to be mutable: `mut arg` @@ -8,7 +8,7 @@ LL | arg.mutate(); | ^^^ cannot borrow as mutable error[E0596]: cannot borrow `local` as mutable, as it is not declared as mutable - --> $DIR/mut-suggestion.rs:29:5 + --> $DIR/mut-suggestion.rs:19:5 | LL | let local = S; | ----- help: consider changing this to be mutable: `mut local` diff --git a/src/test/ui/mut/mut-suggestion.rs b/src/test/ui/mut/mut-suggestion.rs index 0015c8e5c00a1..6966d0bae5b7e 100644 --- a/src/test/ui/mut/mut-suggestion.rs +++ b/src/test/ui/mut/mut-suggestion.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Copy, Clone)] struct S; diff --git a/src/test/ui/mut/mut-suggestion.stderr b/src/test/ui/mut/mut-suggestion.stderr index 4aa964903f59d..c0fa21ca826c0 100644 --- a/src/test/ui/mut/mut-suggestion.stderr +++ b/src/test/ui/mut/mut-suggestion.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow immutable argument `arg` as mutable - --> $DIR/mut-suggestion.rs:21:5 + --> $DIR/mut-suggestion.rs:11:5 | LL | fn func(arg: S) { | --- consider changing this to `mut arg` @@ -8,7 +8,7 @@ LL | arg.mutate(); | ^^^ cannot borrow mutably error[E0596]: cannot borrow immutable local variable `local` as mutable - --> $DIR/mut-suggestion.rs:29:5 + --> $DIR/mut-suggestion.rs:19:5 | LL | let local = S; | ----- consider changing this to `mut local` diff --git a/src/test/ui/mut/mutable-class-fields-2.nll.stderr b/src/test/ui/mut/mutable-class-fields-2.nll.stderr index 3433f9f0b2107..53127922263cd 100644 --- a/src/test/ui/mut/mutable-class-fields-2.nll.stderr +++ b/src/test/ui/mut/mutable-class-fields-2.nll.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to `self.how_hungry` which is behind a `&` reference - --> $DIR/mutable-class-fields-2.rs:19:5 + --> $DIR/mutable-class-fields-2.rs:9:5 | LL | pub fn eat(&self) { | ----- help: consider changing this to be a mutable reference: `&mut self` diff --git a/src/test/ui/mut/mutable-class-fields-2.rs b/src/test/ui/mut/mutable-class-fields-2.rs index 46af3a862c28f..1b6f8ab457808 100644 --- a/src/test/ui/mut/mutable-class-fields-2.rs +++ b/src/test/ui/mut/mutable-class-fields-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct cat { meows : usize, diff --git a/src/test/ui/mut/mutable-class-fields-2.stderr b/src/test/ui/mut/mutable-class-fields-2.stderr index aa588d8acaf71..daeee1117bcc3 100644 --- a/src/test/ui/mut/mutable-class-fields-2.stderr +++ b/src/test/ui/mut/mutable-class-fields-2.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to field `self.how_hungry` of immutable binding - --> $DIR/mutable-class-fields-2.rs:19:5 + --> $DIR/mutable-class-fields-2.rs:9:5 | LL | pub fn eat(&self) { | ----- use `&mut self` here to make mutable diff --git a/src/test/ui/mut/mutable-class-fields.ast.nll.stderr b/src/test/ui/mut/mutable-class-fields.ast.nll.stderr index 033a3bd6cb4c3..377aa29a679db 100644 --- a/src/test/ui/mut/mutable-class-fields.ast.nll.stderr +++ b/src/test/ui/mut/mutable-class-fields.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to `nyan.how_hungry`, as `nyan` is not declared as mutable - --> $DIR/mutable-class-fields.rs:28:3 + --> $DIR/mutable-class-fields.rs:18:3 | LL | let nyan : cat = cat(52, 99); | ---- help: consider changing this to be mutable: `mut nyan` diff --git a/src/test/ui/mut/mutable-class-fields.ast.stderr b/src/test/ui/mut/mutable-class-fields.ast.stderr index 0a4d3a0e96881..93aca6df4fdd6 100644 --- a/src/test/ui/mut/mutable-class-fields.ast.stderr +++ b/src/test/ui/mut/mutable-class-fields.ast.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to field `nyan.how_hungry` of immutable binding - --> $DIR/mutable-class-fields.rs:28:3 + --> $DIR/mutable-class-fields.rs:18:3 | LL | let nyan : cat = cat(52, 99); | ---- consider changing this to `mut nyan` diff --git a/src/test/ui/mut/mutable-class-fields.mir.stderr b/src/test/ui/mut/mutable-class-fields.mir.stderr index 033a3bd6cb4c3..377aa29a679db 100644 --- a/src/test/ui/mut/mutable-class-fields.mir.stderr +++ b/src/test/ui/mut/mutable-class-fields.mir.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to `nyan.how_hungry`, as `nyan` is not declared as mutable - --> $DIR/mutable-class-fields.rs:28:3 + --> $DIR/mutable-class-fields.rs:18:3 | LL | let nyan : cat = cat(52, 99); | ---- help: consider changing this to be mutable: `mut nyan` diff --git a/src/test/ui/mut/mutable-class-fields.rs b/src/test/ui/mut/mutable-class-fields.rs index f138ae93f71a2..a2459cdc26116 100644 --- a/src/test/ui/mut/mutable-class-fields.rs +++ b/src/test/ui/mut/mutable-class-fields.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/mut/mutable-enum-indirect.rs b/src/test/ui/mut/mutable-enum-indirect.rs index 9107745b0e9c4..611ff0d66a24e 100644 --- a/src/test/ui/mut/mutable-enum-indirect.rs +++ b/src/test/ui/mut/mutable-enum-indirect.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that an `&` pointer to something inherently mutable is itself // to be considered mutable. diff --git a/src/test/ui/mut/mutable-enum-indirect.stderr b/src/test/ui/mut/mutable-enum-indirect.stderr index 1ad4b6a151737..1268e487f333d 100644 --- a/src/test/ui/mut/mutable-enum-indirect.stderr +++ b/src/test/ui/mut/mutable-enum-indirect.stderr @@ -1,5 +1,5 @@ error[E0277]: `NoSync` cannot be shared between threads safely - --> $DIR/mutable-enum-indirect.rs:27:5 + --> $DIR/mutable-enum-indirect.rs:17:5 | LL | bar(&x); | ^^^ `NoSync` cannot be shared between threads safely @@ -8,7 +8,7 @@ LL | bar(&x); = note: required because it appears within the type `Foo` = note: required because it appears within the type `&Foo` note: required by `bar` - --> $DIR/mutable-enum-indirect.rs:23:1 + --> $DIR/mutable-enum-indirect.rs:13:1 | LL | fn bar(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/mutexguard-sync.rs b/src/test/ui/mutexguard-sync.rs index 2d4b50eb7b23c..8e1370041dd48 100644 --- a/src/test/ui/mutexguard-sync.rs +++ b/src/test/ui/mutexguard-sync.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // MutexGuard> must not be Sync, that would be unsound. use std::sync::Mutex; use std::cell::Cell; diff --git a/src/test/ui/mutexguard-sync.stderr b/src/test/ui/mutexguard-sync.stderr index 709829e484b45..d1f7d13937578 100644 --- a/src/test/ui/mutexguard-sync.stderr +++ b/src/test/ui/mutexguard-sync.stderr @@ -1,5 +1,5 @@ error[E0277]: `std::cell::Cell` cannot be shared between threads safely - --> $DIR/mutexguard-sync.rs:21:5 + --> $DIR/mutexguard-sync.rs:11:5 | LL | test_sync(guard); | ^^^^^^^^^ `std::cell::Cell` cannot be shared between threads safely @@ -7,7 +7,7 @@ LL | test_sync(guard); = help: the trait `std::marker::Sync` is not implemented for `std::cell::Cell` = note: required because of the requirements on the impl of `std::marker::Sync` for `std::sync::MutexGuard<'_, std::cell::Cell>` note: required by `test_sync` - --> $DIR/mutexguard-sync.rs:15:1 + --> $DIR/mutexguard-sync.rs:5:1 | LL | fn test_sync(_t: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/namespace/auxiliary/namespace-mix.rs b/src/test/ui/namespace/auxiliary/namespace-mix.rs index d82e9bb702283..fb39d29f87fc4 100644 --- a/src/test/ui/namespace/auxiliary/namespace-mix.rs +++ b/src/test/ui/namespace/auxiliary/namespace-mix.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod c { pub struct S {} pub struct TS(); diff --git a/src/test/ui/namespace/auxiliary/namespaced_enums.rs b/src/test/ui/namespace/auxiliary/namespaced_enums.rs index 3bf39b788db6e..d3548c76cf2a6 100644 --- a/src/test/ui/namespace/auxiliary/namespaced_enums.rs +++ b/src/test/ui/namespace/auxiliary/namespaced_enums.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub enum Foo { A, B(isize), diff --git a/src/test/ui/namespace/namespace-mix.rs b/src/test/ui/namespace/namespace-mix.rs index c1c724fc431c7..83852831b09b6 100644 --- a/src/test/ui/namespace/namespace-mix.rs +++ b/src/test/ui/namespace/namespace-mix.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:namespace-mix.rs extern crate namespace_mix; diff --git a/src/test/ui/namespace/namespace-mix.stderr b/src/test/ui/namespace/namespace-mix.stderr index 6d72b6044aebe..57d9c13bb5884 100644 --- a/src/test/ui/namespace/namespace-mix.stderr +++ b/src/test/ui/namespace/namespace-mix.stderr @@ -1,5 +1,5 @@ error[E0423]: expected value, found type alias `m1::S` - --> $DIR/namespace-mix.rs:44:11 + --> $DIR/namespace-mix.rs:34:11 | LL | check(m1::S); //~ ERROR expected value, found type alias `m1::S` | ^^^^- @@ -15,7 +15,7 @@ LL | use namespace_mix::xm2::S; | error[E0423]: expected value, found type alias `xm1::S` - --> $DIR/namespace-mix.rs:50:11 + --> $DIR/namespace-mix.rs:40:11 | LL | check(xm1::S); //~ ERROR expected value, found type alias `xm1::S` | ^^^^^- @@ -31,7 +31,7 @@ LL | use namespace_mix::xm2::S; | error[E0423]: expected value, found struct variant `m7::V` - --> $DIR/namespace-mix.rs:110:11 + --> $DIR/namespace-mix.rs:100:11 | LL | check(m7::V); //~ ERROR expected value, found struct variant `m7::V` | ^^^^- @@ -46,7 +46,7 @@ LL | use namespace_mix::xm8::V; | error[E0423]: expected value, found struct variant `xm7::V` - --> $DIR/namespace-mix.rs:116:11 + --> $DIR/namespace-mix.rs:106:11 | LL | check(xm7::V); //~ ERROR expected value, found struct variant `xm7::V` | ^^^^^- @@ -61,529 +61,529 @@ LL | use namespace_mix::xm8::V; | error[E0277]: the trait bound `c::Item: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:43:5 + --> $DIR/namespace-mix.rs:33:5 | LL | check(m1::S{}); //~ ERROR c::Item | ^^^^^ the trait `Impossible` is not implemented for `c::Item` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `c::S: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:45:5 + --> $DIR/namespace-mix.rs:35:5 | LL | check(m2::S{}); //~ ERROR c::S | ^^^^^ the trait `Impossible` is not implemented for `c::S` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `c::Item: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:46:5 + --> $DIR/namespace-mix.rs:36:5 | LL | check(m2::S); //~ ERROR c::Item | ^^^^^ the trait `Impossible` is not implemented for `c::Item` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `namespace_mix::c::Item: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:49:5 + --> $DIR/namespace-mix.rs:39:5 | LL | check(xm1::S{}); //~ ERROR c::Item | ^^^^^ the trait `Impossible` is not implemented for `namespace_mix::c::Item` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `namespace_mix::c::S: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:51:5 + --> $DIR/namespace-mix.rs:41:5 | LL | check(xm2::S{}); //~ ERROR c::S | ^^^^^ the trait `Impossible` is not implemented for `namespace_mix::c::S` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `namespace_mix::c::Item: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:52:5 + --> $DIR/namespace-mix.rs:42:5 | LL | check(xm2::S); //~ ERROR c::Item | ^^^^^ the trait `Impossible` is not implemented for `namespace_mix::c::Item` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `c::Item: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:65:5 + --> $DIR/namespace-mix.rs:55:5 | LL | check(m3::TS{}); //~ ERROR c::Item | ^^^^^ the trait `Impossible` is not implemented for `c::Item` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `fn() -> c::TS {c::TS::{{constructor}}}: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:66:5 + --> $DIR/namespace-mix.rs:56:5 | LL | check(m3::TS); //~ ERROR c::TS | ^^^^^ the trait `Impossible` is not implemented for `fn() -> c::TS {c::TS::{{constructor}}}` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `c::TS: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:67:5 + --> $DIR/namespace-mix.rs:57:5 | LL | check(m4::TS{}); //~ ERROR c::TS | ^^^^^ the trait `Impossible` is not implemented for `c::TS` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `c::Item: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:68:5 + --> $DIR/namespace-mix.rs:58:5 | LL | check(m4::TS); //~ ERROR c::Item | ^^^^^ the trait `Impossible` is not implemented for `c::Item` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `namespace_mix::c::Item: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:71:5 + --> $DIR/namespace-mix.rs:61:5 | LL | check(xm3::TS{}); //~ ERROR c::Item | ^^^^^ the trait `Impossible` is not implemented for `namespace_mix::c::Item` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `fn() -> namespace_mix::c::TS {namespace_mix::c::TS::{{constructor}}}: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:72:5 + --> $DIR/namespace-mix.rs:62:5 | LL | check(xm3::TS); //~ ERROR c::TS | ^^^^^ the trait `Impossible` is not implemented for `fn() -> namespace_mix::c::TS {namespace_mix::c::TS::{{constructor}}}` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `namespace_mix::c::TS: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:73:5 + --> $DIR/namespace-mix.rs:63:5 | LL | check(xm4::TS{}); //~ ERROR c::TS | ^^^^^ the trait `Impossible` is not implemented for `namespace_mix::c::TS` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `namespace_mix::c::Item: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:74:5 + --> $DIR/namespace-mix.rs:64:5 | LL | check(xm4::TS); //~ ERROR c::Item | ^^^^^ the trait `Impossible` is not implemented for `namespace_mix::c::Item` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `c::Item: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:87:5 + --> $DIR/namespace-mix.rs:77:5 | LL | check(m5::US{}); //~ ERROR c::Item | ^^^^^ the trait `Impossible` is not implemented for `c::Item` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `c::US: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:88:5 + --> $DIR/namespace-mix.rs:78:5 | LL | check(m5::US); //~ ERROR c::US | ^^^^^ the trait `Impossible` is not implemented for `c::US` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `c::US: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:89:5 + --> $DIR/namespace-mix.rs:79:5 | LL | check(m6::US{}); //~ ERROR c::US | ^^^^^ the trait `Impossible` is not implemented for `c::US` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `c::Item: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:90:5 + --> $DIR/namespace-mix.rs:80:5 | LL | check(m6::US); //~ ERROR c::Item | ^^^^^ the trait `Impossible` is not implemented for `c::Item` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `namespace_mix::c::Item: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:93:5 + --> $DIR/namespace-mix.rs:83:5 | LL | check(xm5::US{}); //~ ERROR c::Item | ^^^^^ the trait `Impossible` is not implemented for `namespace_mix::c::Item` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `namespace_mix::c::US: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:94:5 + --> $DIR/namespace-mix.rs:84:5 | LL | check(xm5::US); //~ ERROR c::US | ^^^^^ the trait `Impossible` is not implemented for `namespace_mix::c::US` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `namespace_mix::c::US: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:95:5 + --> $DIR/namespace-mix.rs:85:5 | LL | check(xm6::US{}); //~ ERROR c::US | ^^^^^ the trait `Impossible` is not implemented for `namespace_mix::c::US` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `namespace_mix::c::Item: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:96:5 + --> $DIR/namespace-mix.rs:86:5 | LL | check(xm6::US); //~ ERROR c::Item | ^^^^^ the trait `Impossible` is not implemented for `namespace_mix::c::Item` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `c::Item: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:109:5 + --> $DIR/namespace-mix.rs:99:5 | LL | check(m7::V{}); //~ ERROR c::Item | ^^^^^ the trait `Impossible` is not implemented for `c::Item` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `c::E: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:111:5 + --> $DIR/namespace-mix.rs:101:5 | LL | check(m8::V{}); //~ ERROR c::E | ^^^^^ the trait `Impossible` is not implemented for `c::E` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `c::Item: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:112:5 + --> $DIR/namespace-mix.rs:102:5 | LL | check(m8::V); //~ ERROR c::Item | ^^^^^ the trait `Impossible` is not implemented for `c::Item` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `namespace_mix::c::Item: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:115:5 + --> $DIR/namespace-mix.rs:105:5 | LL | check(xm7::V{}); //~ ERROR c::Item | ^^^^^ the trait `Impossible` is not implemented for `namespace_mix::c::Item` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `namespace_mix::c::E: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:117:5 + --> $DIR/namespace-mix.rs:107:5 | LL | check(xm8::V{}); //~ ERROR c::E | ^^^^^ the trait `Impossible` is not implemented for `namespace_mix::c::E` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `namespace_mix::c::Item: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:118:5 + --> $DIR/namespace-mix.rs:108:5 | LL | check(xm8::V); //~ ERROR c::Item | ^^^^^ the trait `Impossible` is not implemented for `namespace_mix::c::Item` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `c::Item: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:131:5 + --> $DIR/namespace-mix.rs:121:5 | LL | check(m9::TV{}); //~ ERROR c::Item | ^^^^^ the trait `Impossible` is not implemented for `c::Item` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `fn() -> c::E {c::E::TV}: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:132:5 + --> $DIR/namespace-mix.rs:122:5 | LL | check(m9::TV); //~ ERROR c::E | ^^^^^ the trait `Impossible` is not implemented for `fn() -> c::E {c::E::TV}` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `c::E: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:133:5 + --> $DIR/namespace-mix.rs:123:5 | LL | check(mA::TV{}); //~ ERROR c::E | ^^^^^ the trait `Impossible` is not implemented for `c::E` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `c::Item: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:134:5 + --> $DIR/namespace-mix.rs:124:5 | LL | check(mA::TV); //~ ERROR c::Item | ^^^^^ the trait `Impossible` is not implemented for `c::Item` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `namespace_mix::c::Item: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:137:5 + --> $DIR/namespace-mix.rs:127:5 | LL | check(xm9::TV{}); //~ ERROR c::Item | ^^^^^ the trait `Impossible` is not implemented for `namespace_mix::c::Item` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `fn() -> namespace_mix::c::E {namespace_mix::c::E::TV}: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:138:5 + --> $DIR/namespace-mix.rs:128:5 | LL | check(xm9::TV); //~ ERROR c::E | ^^^^^ the trait `Impossible` is not implemented for `fn() -> namespace_mix::c::E {namespace_mix::c::E::TV}` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `namespace_mix::c::E: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:139:5 + --> $DIR/namespace-mix.rs:129:5 | LL | check(xmA::TV{}); //~ ERROR c::E | ^^^^^ the trait `Impossible` is not implemented for `namespace_mix::c::E` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `namespace_mix::c::Item: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:140:5 + --> $DIR/namespace-mix.rs:130:5 | LL | check(xmA::TV); //~ ERROR c::Item | ^^^^^ the trait `Impossible` is not implemented for `namespace_mix::c::Item` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `c::Item: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:153:5 + --> $DIR/namespace-mix.rs:143:5 | LL | check(mB::UV{}); //~ ERROR c::Item | ^^^^^ the trait `Impossible` is not implemented for `c::Item` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `c::E: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:154:5 + --> $DIR/namespace-mix.rs:144:5 | LL | check(mB::UV); //~ ERROR c::E | ^^^^^ the trait `Impossible` is not implemented for `c::E` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `c::E: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:155:5 + --> $DIR/namespace-mix.rs:145:5 | LL | check(mC::UV{}); //~ ERROR c::E | ^^^^^ the trait `Impossible` is not implemented for `c::E` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `c::Item: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:156:5 + --> $DIR/namespace-mix.rs:146:5 | LL | check(mC::UV); //~ ERROR c::Item | ^^^^^ the trait `Impossible` is not implemented for `c::Item` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `namespace_mix::c::Item: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:159:5 + --> $DIR/namespace-mix.rs:149:5 | LL | check(xmB::UV{}); //~ ERROR c::Item | ^^^^^ the trait `Impossible` is not implemented for `namespace_mix::c::Item` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `namespace_mix::c::E: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:160:5 + --> $DIR/namespace-mix.rs:150:5 | LL | check(xmB::UV); //~ ERROR c::E | ^^^^^ the trait `Impossible` is not implemented for `namespace_mix::c::E` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `namespace_mix::c::E: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:161:5 + --> $DIR/namespace-mix.rs:151:5 | LL | check(xmC::UV{}); //~ ERROR c::E | ^^^^^ the trait `Impossible` is not implemented for `namespace_mix::c::E` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `namespace_mix::c::Item: Impossible` is not satisfied - --> $DIR/namespace-mix.rs:162:5 + --> $DIR/namespace-mix.rs:152:5 | LL | check(xmC::UV); //~ ERROR c::Item | ^^^^^ the trait `Impossible` is not implemented for `namespace_mix::c::Item` | note: required by `check` - --> $DIR/namespace-mix.rs:31:1 + --> $DIR/namespace-mix.rs:21:1 | LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/namespace/namespaced-enum-glob-import-no-impls-xcrate.rs b/src/test/ui/namespace/namespaced-enum-glob-import-no-impls-xcrate.rs index 67800f8de4e35..feb94b681849f 100644 --- a/src/test/ui/namespace/namespaced-enum-glob-import-no-impls-xcrate.rs +++ b/src/test/ui/namespace/namespaced-enum-glob-import-no-impls-xcrate.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:namespaced_enums.rs extern crate namespaced_enums; diff --git a/src/test/ui/namespace/namespaced-enum-glob-import-no-impls-xcrate.stderr b/src/test/ui/namespace/namespaced-enum-glob-import-no-impls-xcrate.stderr index 47ecb1248b287..691061f051083 100644 --- a/src/test/ui/namespace/namespaced-enum-glob-import-no-impls-xcrate.stderr +++ b/src/test/ui/namespace/namespaced-enum-glob-import-no-impls-xcrate.stderr @@ -1,23 +1,23 @@ error[E0425]: cannot find function `foo` in this scope - --> $DIR/namespaced-enum-glob-import-no-impls-xcrate.rs:21:5 + --> $DIR/namespaced-enum-glob-import-no-impls-xcrate.rs:11:5 | LL | foo(); //~ ERROR cannot find function `foo` in this scope | ^^^ not found in this scope error[E0425]: cannot find function `foo` in module `m` - --> $DIR/namespaced-enum-glob-import-no-impls-xcrate.rs:22:8 + --> $DIR/namespaced-enum-glob-import-no-impls-xcrate.rs:12:8 | LL | m::foo(); //~ ERROR cannot find function `foo` in module `m` | ^^^ not found in `m` error[E0425]: cannot find function `bar` in this scope - --> $DIR/namespaced-enum-glob-import-no-impls-xcrate.rs:23:5 + --> $DIR/namespaced-enum-glob-import-no-impls-xcrate.rs:13:5 | LL | bar(); //~ ERROR cannot find function `bar` in this scope | ^^^ not found in this scope error[E0425]: cannot find function `bar` in module `m` - --> $DIR/namespaced-enum-glob-import-no-impls-xcrate.rs:24:8 + --> $DIR/namespaced-enum-glob-import-no-impls-xcrate.rs:14:8 | LL | m::bar(); //~ ERROR cannot find function `bar` in module `m` | ^^^ not found in `m` diff --git a/src/test/ui/namespace/namespaced-enum-glob-import-no-impls.rs b/src/test/ui/namespace/namespaced-enum-glob-import-no-impls.rs index d5e659c236e69..ab24f36f9a156 100644 --- a/src/test/ui/namespace/namespaced-enum-glob-import-no-impls.rs +++ b/src/test/ui/namespace/namespaced-enum-glob-import-no-impls.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod m2 { pub enum Foo { A, diff --git a/src/test/ui/namespace/namespaced-enum-glob-import-no-impls.stderr b/src/test/ui/namespace/namespaced-enum-glob-import-no-impls.stderr index 916801df2e858..f53f299fe4dca 100644 --- a/src/test/ui/namespace/namespaced-enum-glob-import-no-impls.stderr +++ b/src/test/ui/namespace/namespaced-enum-glob-import-no-impls.stderr @@ -1,23 +1,23 @@ error[E0425]: cannot find function `foo` in this scope - --> $DIR/namespaced-enum-glob-import-no-impls.rs:31:5 + --> $DIR/namespaced-enum-glob-import-no-impls.rs:21:5 | LL | foo(); //~ ERROR cannot find function `foo` in this scope | ^^^ not found in this scope error[E0425]: cannot find function `foo` in module `m` - --> $DIR/namespaced-enum-glob-import-no-impls.rs:32:8 + --> $DIR/namespaced-enum-glob-import-no-impls.rs:22:8 | LL | m::foo(); //~ ERROR cannot find function `foo` in module `m` | ^^^ not found in `m` error[E0425]: cannot find function `bar` in this scope - --> $DIR/namespaced-enum-glob-import-no-impls.rs:33:5 + --> $DIR/namespaced-enum-glob-import-no-impls.rs:23:5 | LL | bar(); //~ ERROR cannot find function `bar` in this scope | ^^^ not found in this scope error[E0425]: cannot find function `bar` in module `m` - --> $DIR/namespaced-enum-glob-import-no-impls.rs:34:8 + --> $DIR/namespaced-enum-glob-import-no-impls.rs:24:8 | LL | m::bar(); //~ ERROR cannot find function `bar` in module `m` | ^^^ not found in `m` diff --git a/src/test/ui/nested-cfg-attrs.rs b/src/test/ui/nested-cfg-attrs.rs index f0c41ff78548b..c988d42337346 100644 --- a/src/test/ui/nested-cfg-attrs.rs +++ b/src/test/ui/nested-cfg-attrs.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[cfg_attr(all(), cfg_attr(all(), cfg(foo)))] fn f() {} diff --git a/src/test/ui/nested-cfg-attrs.stderr b/src/test/ui/nested-cfg-attrs.stderr index 5501dc8c6ad55..e7cd39114eda0 100644 --- a/src/test/ui/nested-cfg-attrs.stderr +++ b/src/test/ui/nested-cfg-attrs.stderr @@ -1,5 +1,5 @@ error[E0425]: cannot find function `f` in this scope - --> $DIR/nested-cfg-attrs.rs:14:13 + --> $DIR/nested-cfg-attrs.rs:4:13 | LL | fn main() { f() } //~ ERROR cannot find function `f` in this scope | ^ not found in this scope diff --git a/src/test/ui/nested-ty-params.rs b/src/test/ui/nested-ty-params.rs index aac37289bb749..fcdbdb737b6cf 100644 --- a/src/test/ui/nested-ty-params.rs +++ b/src/test/ui/nested-ty-params.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:can't use type parameters from outer function fn hd(v: Vec ) -> U { fn hd1(w: [U]) -> U { return w[0]; } diff --git a/src/test/ui/nested-ty-params.stderr b/src/test/ui/nested-ty-params.stderr index 93b934f610f8c..d0f97a8941f20 100644 --- a/src/test/ui/nested-ty-params.stderr +++ b/src/test/ui/nested-ty-params.stderr @@ -1,5 +1,5 @@ error[E0401]: can't use type parameters from outer function - --> $DIR/nested-ty-params.rs:13:16 + --> $DIR/nested-ty-params.rs:3:16 | LL | fn hd(v: Vec ) -> U { | - type variable from outer function @@ -9,7 +9,7 @@ LL | fn hd1(w: [U]) -> U { return w[0]; } | help: try using a local type parameter instead: `hd1` error[E0401]: can't use type parameters from outer function - --> $DIR/nested-ty-params.rs:13:23 + --> $DIR/nested-ty-params.rs:3:23 | LL | fn hd(v: Vec ) -> U { | - type variable from outer function diff --git a/src/test/ui/nested_impl_trait.rs b/src/test/ui/nested_impl_trait.rs index be0454472dd0b..be2c21a7743ce 100644 --- a/src/test/ui/nested_impl_trait.rs +++ b/src/test/ui/nested_impl_trait.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. use std::fmt::Debug; fn fine(x: impl Into) -> impl Into { x } diff --git a/src/test/ui/nested_impl_trait.stderr b/src/test/ui/nested_impl_trait.stderr index ee53194e2b484..60f57e56ba118 100644 --- a/src/test/ui/nested_impl_trait.stderr +++ b/src/test/ui/nested_impl_trait.stderr @@ -1,5 +1,5 @@ error[E0666]: nested `impl Trait` is not allowed - --> $DIR/nested_impl_trait.rs:14:56 + --> $DIR/nested_impl_trait.rs:5:56 | LL | fn bad_in_ret_position(x: impl Into) -> impl Into { x } | ----------^^^^^^^^^^- @@ -8,7 +8,7 @@ LL | fn bad_in_ret_position(x: impl Into) -> impl Into { x } | outer `impl Trait` error[E0666]: nested `impl Trait` is not allowed - --> $DIR/nested_impl_trait.rs:17:42 + --> $DIR/nested_impl_trait.rs:8:42 | LL | fn bad_in_fn_syntax(x: fn() -> impl Into) {} | ----------^^^^^^^^^^- @@ -17,7 +17,7 @@ LL | fn bad_in_fn_syntax(x: fn() -> impl Into) {} | outer `impl Trait` error[E0666]: nested `impl Trait` is not allowed - --> $DIR/nested_impl_trait.rs:21:37 + --> $DIR/nested_impl_trait.rs:12:37 | LL | fn bad_in_arg_position(_: impl Into) { } | ----------^^^^^^^^^^- @@ -26,7 +26,7 @@ LL | fn bad_in_arg_position(_: impl Into) { } | outer `impl Trait` error[E0666]: nested `impl Trait` is not allowed - --> $DIR/nested_impl_trait.rs:26:44 + --> $DIR/nested_impl_trait.rs:17:44 | LL | fn bad(x: impl Into) -> impl Into { x } | ----------^^^^^^^^^^- @@ -35,13 +35,13 @@ LL | fn bad(x: impl Into) -> impl Into { x } | outer `impl Trait` error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/nested_impl_trait.rs:17:32 + --> $DIR/nested_impl_trait.rs:8:32 | LL | fn bad_in_fn_syntax(x: fn() -> impl Into) {} | ^^^^^^^^^^^^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/nested_impl_trait.rs:34:42 + --> $DIR/nested_impl_trait.rs:25:42 | LL | fn allowed_in_ret_type() -> impl Fn() -> impl Into { | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/never-assign-dead-code.rs b/src/test/ui/never-assign-dead-code.rs index 0fb75b535c6bc..b47fc52de6912 100644 --- a/src/test/ui/never-assign-dead-code.rs +++ b/src/test/ui/never-assign-dead-code.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that an assignment of type ! makes the rest of the block dead code. #![feature(never_type)] diff --git a/src/test/ui/never-assign-dead-code.stderr b/src/test/ui/never-assign-dead-code.stderr index 7c7126c93c673..91affc2a4df29 100644 --- a/src/test/ui/never-assign-dead-code.stderr +++ b/src/test/ui/never-assign-dead-code.stderr @@ -1,37 +1,37 @@ warning: unreachable statement - --> $DIR/never-assign-dead-code.rs:20:5 + --> $DIR/never-assign-dead-code.rs:10:5 | LL | drop(x); //~ WARN unreachable | ^^^^^^^^ | note: lint level defined here - --> $DIR/never-assign-dead-code.rs:15:9 + --> $DIR/never-assign-dead-code.rs:5:9 | LL | #![warn(unused)] | ^^^^^^ = note: #[warn(unreachable_code)] implied by #[warn(unused)] warning: unreachable expression - --> $DIR/never-assign-dead-code.rs:20:5 + --> $DIR/never-assign-dead-code.rs:10:5 | LL | drop(x); //~ WARN unreachable | ^^^^^^^ warning: unused variable: `x` - --> $DIR/never-assign-dead-code.rs:19:9 + --> $DIR/never-assign-dead-code.rs:9:9 | LL | let x: ! = panic!("aah"); //~ WARN unused | ^ help: consider using `_x` instead | note: lint level defined here - --> $DIR/never-assign-dead-code.rs:15:9 + --> $DIR/never-assign-dead-code.rs:5:9 | LL | #![warn(unused)] | ^^^^^^ = note: #[warn(unused_variables)] implied by #[warn(unused)] error: compilation successful - --> $DIR/never-assign-dead-code.rs:18:1 + --> $DIR/never-assign-dead-code.rs:8:1 | LL | / fn main() { //~ ERROR: compilation successful LL | | let x: ! = panic!("aah"); //~ WARN unused diff --git a/src/test/ui/never-assign-wrong-type.rs b/src/test/ui/never-assign-wrong-type.rs index c0dd2cab749f4..67e26f5663f41 100644 --- a/src/test/ui/never-assign-wrong-type.rs +++ b/src/test/ui/never-assign-wrong-type.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we can't use another type in place of ! #![feature(never_type)] diff --git a/src/test/ui/never-assign-wrong-type.stderr b/src/test/ui/never-assign-wrong-type.stderr index 41afe88b3847c..bc61996db99bb 100644 --- a/src/test/ui/never-assign-wrong-type.stderr +++ b/src/test/ui/never-assign-wrong-type.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/never-assign-wrong-type.rs:17:16 + --> $DIR/never-assign-wrong-type.rs:7:16 | LL | let x: ! = "hello"; //~ ERROR mismatched types | ^^^^^^^ expected !, found reference diff --git a/src/test/ui/never_transmute_never.rs b/src/test/ui/never_transmute_never.rs index cbcc47f60c313..ef78eaa2120cf 100644 --- a/src/test/ui/never_transmute_never.rs +++ b/src/test/ui/never_transmute_never.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![crate_type="lib"] diff --git a/src/test/ui/nll/borrow-use-issue-46875.rs b/src/test/ui/nll/borrow-use-issue-46875.rs index 47d69fe8e976c..03db28fc508b1 100644 --- a/src/test/ui/nll/borrow-use-issue-46875.rs +++ b/src/test/ui/nll/borrow-use-issue-46875.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] // run-pass diff --git a/src/test/ui/nll/borrowed-local-error.rs b/src/test/ui/nll/borrowed-local-error.rs index 084d0c159ef39..d37e61b63a814 100644 --- a/src/test/ui/nll/borrowed-local-error.rs +++ b/src/test/ui/nll/borrowed-local-error.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] fn gimme(x: &(u32,)) -> &u32 { diff --git a/src/test/ui/nll/borrowed-local-error.stderr b/src/test/ui/nll/borrowed-local-error.stderr index 28353a8bc2be7..8bbdf19a35ddd 100644 --- a/src/test/ui/nll/borrowed-local-error.stderr +++ b/src/test/ui/nll/borrowed-local-error.stderr @@ -1,5 +1,5 @@ error[E0597]: `v` does not live long enough - --> $DIR/borrowed-local-error.rs:20:9 + --> $DIR/borrowed-local-error.rs:10:9 | LL | let x = gimme({ | _____________- diff --git a/src/test/ui/nll/borrowed-match-issue-45045.rs b/src/test/ui/nll/borrowed-match-issue-45045.rs index 4b95bbd5a052b..da0a942eb0a37 100644 --- a/src/test/ui/nll/borrowed-match-issue-45045.rs +++ b/src/test/ui/nll/borrowed-match-issue-45045.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #45045 #![feature(nll)] diff --git a/src/test/ui/nll/borrowed-match-issue-45045.stderr b/src/test/ui/nll/borrowed-match-issue-45045.stderr index acbba9ee18754..84892a505a0e7 100644 --- a/src/test/ui/nll/borrowed-match-issue-45045.stderr +++ b/src/test/ui/nll/borrowed-match-issue-45045.stderr @@ -1,5 +1,5 @@ error[E0503]: cannot use `e` because it was mutably borrowed - --> $DIR/borrowed-match-issue-45045.rs:24:11 + --> $DIR/borrowed-match-issue-45045.rs:14:11 | LL | let f = &mut e; | ------ borrow of `e` occurs here @@ -11,7 +11,7 @@ LL | *g = Xyz::B; | ----------- borrow later used here error[E0503]: cannot use `e` because it was mutably borrowed - --> $DIR/borrowed-match-issue-45045.rs:25:9 + --> $DIR/borrowed-match-issue-45045.rs:15:9 | LL | let f = &mut e; | ------ borrow of `e` occurs here diff --git a/src/test/ui/nll/borrowed-referent-issue-38899.rs b/src/test/ui/nll/borrowed-referent-issue-38899.rs index d7c15851418b1..7bad6dc2cd335 100644 --- a/src/test/ui/nll/borrowed-referent-issue-38899.rs +++ b/src/test/ui/nll/borrowed-referent-issue-38899.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #38899 #![feature(nll)] diff --git a/src/test/ui/nll/borrowed-referent-issue-38899.stderr b/src/test/ui/nll/borrowed-referent-issue-38899.stderr index 5c5a66e7e21df..afe6e44ab1bf3 100644 --- a/src/test/ui/nll/borrowed-referent-issue-38899.stderr +++ b/src/test/ui/nll/borrowed-referent-issue-38899.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `*block.current` as immutable because it is also borrowed as mutable - --> $DIR/borrowed-referent-issue-38899.rs:24:21 + --> $DIR/borrowed-referent-issue-38899.rs:14:21 | LL | let x = &mut block; | ---------- mutable borrow occurs here diff --git a/src/test/ui/nll/borrowed-temporary-error.rs b/src/test/ui/nll/borrowed-temporary-error.rs index 7aad7205a52a1..fcff4f6cd22db 100644 --- a/src/test/ui/nll/borrowed-temporary-error.rs +++ b/src/test/ui/nll/borrowed-temporary-error.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] fn gimme(x: &(u32,)) -> &u32 { diff --git a/src/test/ui/nll/borrowed-temporary-error.stderr b/src/test/ui/nll/borrowed-temporary-error.stderr index 37746a173eb7a..20ca1c1965e07 100644 --- a/src/test/ui/nll/borrowed-temporary-error.stderr +++ b/src/test/ui/nll/borrowed-temporary-error.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/borrowed-temporary-error.rs:20:10 + --> $DIR/borrowed-temporary-error.rs:10:10 | LL | &(v,) | ^^^^ temporary value does not live long enough diff --git a/src/test/ui/nll/borrowed-universal-error-2.rs b/src/test/ui/nll/borrowed-universal-error-2.rs index 9a59cebfccbe2..3a290731d8bc4 100644 --- a/src/test/ui/nll/borrowed-universal-error-2.rs +++ b/src/test/ui/nll/borrowed-universal-error-2.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] #![allow(warnings)] diff --git a/src/test/ui/nll/borrowed-universal-error-2.stderr b/src/test/ui/nll/borrowed-universal-error-2.stderr index 867e473af2c0e..f9f10368fb5ec 100644 --- a/src/test/ui/nll/borrowed-universal-error-2.stderr +++ b/src/test/ui/nll/borrowed-universal-error-2.stderr @@ -1,5 +1,5 @@ error[E0597]: `v` does not live long enough - --> $DIR/borrowed-universal-error-2.rs:16:5 + --> $DIR/borrowed-universal-error-2.rs:6:5 | LL | &v | ^^ borrowed value does not live long enough @@ -7,8 +7,8 @@ LL | //~^ ERROR `v` does not live long enough [E0597] LL | } | - `v` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 14:8... - --> $DIR/borrowed-universal-error-2.rs:14:8 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 4:8... + --> $DIR/borrowed-universal-error-2.rs:4:8 | LL | fn foo<'a>(x: &'a (u32,)) -> &'a u32 { | ^^ diff --git a/src/test/ui/nll/borrowed-universal-error.rs b/src/test/ui/nll/borrowed-universal-error.rs index 9482b9b140002..5039f6bf1dc9d 100644 --- a/src/test/ui/nll/borrowed-universal-error.rs +++ b/src/test/ui/nll/borrowed-universal-error.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] #![allow(warnings)] diff --git a/src/test/ui/nll/borrowed-universal-error.stderr b/src/test/ui/nll/borrowed-universal-error.stderr index da287980e8c5f..c08a16f2a0871 100644 --- a/src/test/ui/nll/borrowed-universal-error.stderr +++ b/src/test/ui/nll/borrowed-universal-error.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/borrowed-universal-error.rs:20:12 + --> $DIR/borrowed-universal-error.rs:10:12 | LL | gimme(&(v,)) | ^^^^ temporary value does not live long enough @@ -7,8 +7,8 @@ LL | //~^ ERROR borrowed value does not live long enough [E0597] LL | } | - temporary value only lives until here | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 18:8... - --> $DIR/borrowed-universal-error.rs:18:8 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 8:8... + --> $DIR/borrowed-universal-error.rs:8:8 | LL | fn foo<'a>(x: &'a (u32,)) -> &'a u32 { | ^^ diff --git a/src/test/ui/nll/cannot-move-block-spans.nll.stderr b/src/test/ui/nll/cannot-move-block-spans.nll.stderr index 6a4c8f2e8d815..30b4bf75af693 100644 --- a/src/test/ui/nll/cannot-move-block-spans.nll.stderr +++ b/src/test/ui/nll/cannot-move-block-spans.nll.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/cannot-move-block-spans.rs:15:15 + --> $DIR/cannot-move-block-spans.rs:5:15 | LL | let x = { *r }; //~ ERROR | ^^ @@ -8,7 +8,7 @@ LL | let x = { *r }; //~ ERROR | help: consider removing the `*`: `r` error[E0507]: cannot move out of borrowed content - --> $DIR/cannot-move-block-spans.rs:16:22 + --> $DIR/cannot-move-block-spans.rs:6:22 | LL | let y = unsafe { *r }; //~ ERROR | ^^ @@ -17,7 +17,7 @@ LL | let y = unsafe { *r }; //~ ERROR | help: consider removing the `*`: `r` error[E0507]: cannot move out of borrowed content - --> $DIR/cannot-move-block-spans.rs:17:26 + --> $DIR/cannot-move-block-spans.rs:7:26 | LL | let z = loop { break *r; }; //~ ERROR | ^^ @@ -26,7 +26,7 @@ LL | let z = loop { break *r; }; //~ ERROR | help: consider removing the `*`: `r` error[E0508]: cannot move out of type `[std::string::String; 2]`, a non-copy array - --> $DIR/cannot-move-block-spans.rs:21:15 + --> $DIR/cannot-move-block-spans.rs:11:15 | LL | let x = { arr[0] }; //~ ERROR | ^^^^^^ @@ -35,7 +35,7 @@ LL | let x = { arr[0] }; //~ ERROR | help: consider borrowing here: `&arr[0]` error[E0508]: cannot move out of type `[std::string::String; 2]`, a non-copy array - --> $DIR/cannot-move-block-spans.rs:22:22 + --> $DIR/cannot-move-block-spans.rs:12:22 | LL | let y = unsafe { arr[0] }; //~ ERROR | ^^^^^^ @@ -44,7 +44,7 @@ LL | let y = unsafe { arr[0] }; //~ ERROR | help: consider borrowing here: `&arr[0]` error[E0508]: cannot move out of type `[std::string::String; 2]`, a non-copy array - --> $DIR/cannot-move-block-spans.rs:23:26 + --> $DIR/cannot-move-block-spans.rs:13:26 | LL | let z = loop { break arr[0]; }; //~ ERROR | ^^^^^^ @@ -53,7 +53,7 @@ LL | let z = loop { break arr[0]; }; //~ ERROR | help: consider borrowing here: `&arr[0]` error[E0507]: cannot move out of borrowed content - --> $DIR/cannot-move-block-spans.rs:27:38 + --> $DIR/cannot-move-block-spans.rs:17:38 | LL | let x = { let mut u = 0; u += 1; *r }; //~ ERROR | ^^ @@ -62,7 +62,7 @@ LL | let x = { let mut u = 0; u += 1; *r }; //~ ERROR | help: consider removing the `*`: `r` error[E0507]: cannot move out of borrowed content - --> $DIR/cannot-move-block-spans.rs:28:45 + --> $DIR/cannot-move-block-spans.rs:18:45 | LL | let y = unsafe { let mut u = 0; u += 1; *r }; //~ ERROR | ^^ @@ -71,7 +71,7 @@ LL | let y = unsafe { let mut u = 0; u += 1; *r }; //~ ERROR | help: consider removing the `*`: `r` error[E0507]: cannot move out of borrowed content - --> $DIR/cannot-move-block-spans.rs:29:49 + --> $DIR/cannot-move-block-spans.rs:19:49 | LL | let z = loop { let mut u = 0; u += 1; break *r; u += 2; }; //~ ERROR | ^^ diff --git a/src/test/ui/nll/cannot-move-block-spans.rs b/src/test/ui/nll/cannot-move-block-spans.rs index 5a84a4ca48e26..e994fd3d593d1 100644 --- a/src/test/ui/nll/cannot-move-block-spans.rs +++ b/src/test/ui/nll/cannot-move-block-spans.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the we point to the inner expression when moving out to initialize // a variable, and that we don't give a useless suggestion such as &{ *r }. diff --git a/src/test/ui/nll/cannot-move-block-spans.stderr b/src/test/ui/nll/cannot-move-block-spans.stderr index d495690023959..e37c6ff06f7e8 100644 --- a/src/test/ui/nll/cannot-move-block-spans.stderr +++ b/src/test/ui/nll/cannot-move-block-spans.stderr @@ -1,53 +1,53 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/cannot-move-block-spans.rs:15:15 + --> $DIR/cannot-move-block-spans.rs:5:15 | LL | let x = { *r }; //~ ERROR | ^^ cannot move out of borrowed content error[E0507]: cannot move out of borrowed content - --> $DIR/cannot-move-block-spans.rs:16:22 + --> $DIR/cannot-move-block-spans.rs:6:22 | LL | let y = unsafe { *r }; //~ ERROR | ^^ cannot move out of borrowed content error[E0507]: cannot move out of borrowed content - --> $DIR/cannot-move-block-spans.rs:17:26 + --> $DIR/cannot-move-block-spans.rs:7:26 | LL | let z = loop { break *r; }; //~ ERROR | ^^ cannot move out of borrowed content error[E0508]: cannot move out of type `[std::string::String; 2]`, a non-copy array - --> $DIR/cannot-move-block-spans.rs:21:15 + --> $DIR/cannot-move-block-spans.rs:11:15 | LL | let x = { arr[0] }; //~ ERROR | ^^^^^^ cannot move out of here error[E0508]: cannot move out of type `[std::string::String; 2]`, a non-copy array - --> $DIR/cannot-move-block-spans.rs:22:22 + --> $DIR/cannot-move-block-spans.rs:12:22 | LL | let y = unsafe { arr[0] }; //~ ERROR | ^^^^^^ cannot move out of here error[E0508]: cannot move out of type `[std::string::String; 2]`, a non-copy array - --> $DIR/cannot-move-block-spans.rs:23:26 + --> $DIR/cannot-move-block-spans.rs:13:26 | LL | let z = loop { break arr[0]; }; //~ ERROR | ^^^^^^ cannot move out of here error[E0507]: cannot move out of borrowed content - --> $DIR/cannot-move-block-spans.rs:27:38 + --> $DIR/cannot-move-block-spans.rs:17:38 | LL | let x = { let mut u = 0; u += 1; *r }; //~ ERROR | ^^ cannot move out of borrowed content error[E0507]: cannot move out of borrowed content - --> $DIR/cannot-move-block-spans.rs:28:45 + --> $DIR/cannot-move-block-spans.rs:18:45 | LL | let y = unsafe { let mut u = 0; u += 1; *r }; //~ ERROR | ^^ cannot move out of borrowed content error[E0507]: cannot move out of borrowed content - --> $DIR/cannot-move-block-spans.rs:29:49 + --> $DIR/cannot-move-block-spans.rs:19:49 | LL | let z = loop { let mut u = 0; u += 1; break *r; u += 2; }; //~ ERROR | ^^ cannot move out of borrowed content diff --git a/src/test/ui/nll/capture-mut-ref.rs b/src/test/ui/nll/capture-mut-ref.rs index c3c5053af0c17..222f4e71c52fe 100644 --- a/src/test/ui/nll/capture-mut-ref.rs +++ b/src/test/ui/nll/capture-mut-ref.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that capturing a mutable reference by move and assigning to its // referent doesn't make the unused mut lint think that it is mutable. diff --git a/src/test/ui/nll/capture-mut-ref.stderr b/src/test/ui/nll/capture-mut-ref.stderr index 50a77ee10e5b0..327ce0c6e81f0 100644 --- a/src/test/ui/nll/capture-mut-ref.stderr +++ b/src/test/ui/nll/capture-mut-ref.stderr @@ -1,5 +1,5 @@ error: variable does not need to be mutable - --> $DIR/capture-mut-ref.rs:18:9 + --> $DIR/capture-mut-ref.rs:8:9 | LL | let mut x = &mut 0; | ----^ @@ -7,7 +7,7 @@ LL | let mut x = &mut 0; | help: remove this `mut` | note: lint level defined here - --> $DIR/capture-mut-ref.rs:15:9 + --> $DIR/capture-mut-ref.rs:5:9 | LL | #![deny(unused_mut)] | ^^^^^^^^^^ diff --git a/src/test/ui/nll/capture-ref-in-struct.rs b/src/test/ui/nll/capture-ref-in-struct.rs index f49e06bd9e8c8..bf2db32901e68 100644 --- a/src/test/ui/nll/capture-ref-in-struct.rs +++ b/src/test/ui/nll/capture-ref-in-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that a structure which tries to store a pointer to `y` into // `p` (indirectly) fails to compile. diff --git a/src/test/ui/nll/capture-ref-in-struct.stderr b/src/test/ui/nll/capture-ref-in-struct.stderr index 12a9adf6e0ba6..7fafb4474fdb3 100644 --- a/src/test/ui/nll/capture-ref-in-struct.stderr +++ b/src/test/ui/nll/capture-ref-in-struct.stderr @@ -1,5 +1,5 @@ error[E0597]: `y` does not live long enough - --> $DIR/capture-ref-in-struct.rs:31:16 + --> $DIR/capture-ref-in-struct.rs:21:16 | LL | y: &y, | ^^ borrowed value does not live long enough diff --git a/src/test/ui/nll/closure-access-spans.rs b/src/test/ui/nll/closure-access-spans.rs index b49436fabcf74..1e11b4818183b 100644 --- a/src/test/ui/nll/closure-access-spans.rs +++ b/src/test/ui/nll/closure-access-spans.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // check that accesses due to a closure capture give a special note #![feature(nll)] diff --git a/src/test/ui/nll/closure-access-spans.stderr b/src/test/ui/nll/closure-access-spans.stderr index 0042b5d7d529b..6b5317a7fd5cd 100644 --- a/src/test/ui/nll/closure-access-spans.stderr +++ b/src/test/ui/nll/closure-access-spans.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable - --> $DIR/closure-access-spans.rs:17:5 + --> $DIR/closure-access-spans.rs:7:5 | LL | let r = &mut x; | ------ mutable borrow occurs here @@ -11,7 +11,7 @@ LL | r.use_mut(); | - borrow later used here error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/closure-access-spans.rs:23:5 + --> $DIR/closure-access-spans.rs:13:5 | LL | let r = &mut x; | ------ first mutable borrow occurs here @@ -23,7 +23,7 @@ LL | r.use_mut(); | - borrow later used here error[E0500]: closure requires unique access to `x` but it is already borrowed - --> $DIR/closure-access-spans.rs:29:5 + --> $DIR/closure-access-spans.rs:19:5 | LL | let r = &mut x; | ------ borrow occurs here @@ -35,7 +35,7 @@ LL | r.use_mut(); | - borrow later used here error[E0503]: cannot use `x` because it was mutably borrowed - --> $DIR/closure-access-spans.rs:35:13 + --> $DIR/closure-access-spans.rs:25:13 | LL | let r = &mut x; | ------ borrow of `x` occurs here @@ -45,7 +45,7 @@ LL | r.use_ref(); | - borrow later used here error[E0505]: cannot move out of `x` because it is borrowed - --> $DIR/closure-access-spans.rs:41:5 + --> $DIR/closure-access-spans.rs:31:5 | LL | let r = &x; | -- borrow of `x` occurs here @@ -57,7 +57,7 @@ LL | r.use_ref(); | - borrow later used here error[E0382]: borrow of moved value: `x` - --> $DIR/closure-access-spans.rs:47:5 + --> $DIR/closure-access-spans.rs:37:5 | LL | let r = x; | - value moved here @@ -69,7 +69,7 @@ LL | || x.len(); //~ ERROR = note: move occurs because `x` has type `std::string::String`, which does not implement the `Copy` trait error[E0382]: borrow of moved value: `x` - --> $DIR/closure-access-spans.rs:52:5 + --> $DIR/closure-access-spans.rs:42:5 | LL | let r = x; | - value moved here @@ -81,7 +81,7 @@ LL | || x = String::new(); //~ ERROR = note: move occurs because `x` has type `std::string::String`, which does not implement the `Copy` trait error[E0382]: borrow of moved value: `x` - --> $DIR/closure-access-spans.rs:57:5 + --> $DIR/closure-access-spans.rs:47:5 | LL | let r = x; | - value moved here @@ -93,7 +93,7 @@ LL | || *x = String::new(); //~ ERROR = note: move occurs because `x` has type `&mut std::string::String`, which does not implement the `Copy` trait error[E0382]: use of moved value: `x` - --> $DIR/closure-access-spans.rs:62:5 + --> $DIR/closure-access-spans.rs:52:5 | LL | let r = x; | - value moved here diff --git a/src/test/ui/nll/closure-borrow-spans.rs b/src/test/ui/nll/closure-borrow-spans.rs index d62dc27dade8f..7fc301b70380b 100644 --- a/src/test/ui/nll/closure-borrow-spans.rs +++ b/src/test/ui/nll/closure-borrow-spans.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // check that existing borrows due to a closure capture give a special note #![feature(nll)] diff --git a/src/test/ui/nll/closure-borrow-spans.stderr b/src/test/ui/nll/closure-borrow-spans.stderr index 1b9420b3c0bf3..729ef90dafbbf 100644 --- a/src/test/ui/nll/closure-borrow-spans.stderr +++ b/src/test/ui/nll/closure-borrow-spans.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `x` because it is borrowed - --> $DIR/closure-borrow-spans.rs:17:13 + --> $DIR/closure-borrow-spans.rs:7:13 | LL | let f = || x.len(); | -- - borrow occurs due to use in closure @@ -11,7 +11,7 @@ LL | f.use_ref(); | - borrow later used here error[E0502]: cannot borrow `x` as mutable because it is also borrowed as immutable - --> $DIR/closure-borrow-spans.rs:23:13 + --> $DIR/closure-borrow-spans.rs:13:13 | LL | let f = || x; | -- - first borrow occurs due to use of `x` in closure @@ -23,7 +23,7 @@ LL | f.use_ref(); | - borrow later used here error[E0597]: `x` does not live long enough - --> $DIR/closure-borrow-spans.rs:31:16 + --> $DIR/closure-borrow-spans.rs:21:16 | LL | f = || x; //~ ERROR | -- ^ borrowed value does not live long enough @@ -35,7 +35,7 @@ LL | f.use_ref(); | - borrow later used here error[E0506]: cannot assign to `x` because it is borrowed - --> $DIR/closure-borrow-spans.rs:38:5 + --> $DIR/closure-borrow-spans.rs:28:5 | LL | let f = || x; | -- - borrow occurs due to use in closure @@ -47,7 +47,7 @@ LL | f.use_ref(); | - borrow later used here error[E0503]: cannot use `x` because it was mutably borrowed - --> $DIR/closure-borrow-spans.rs:44:13 + --> $DIR/closure-borrow-spans.rs:34:13 | LL | let f = || x = 0; | -- - borrow occurs due to use of `x` in closure @@ -59,7 +59,7 @@ LL | f.use_ref(); | - borrow later used here error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable - --> $DIR/closure-borrow-spans.rs:50:13 + --> $DIR/closure-borrow-spans.rs:40:13 | LL | let f = || x = 0; | -- - first borrow occurs due to use of `x` in closure @@ -71,7 +71,7 @@ LL | f.use_ref(); | - borrow later used here error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/closure-borrow-spans.rs:56:13 + --> $DIR/closure-borrow-spans.rs:46:13 | LL | let f = || x = 0; | -- - first borrow occurs due to use of `x` in closure @@ -83,7 +83,7 @@ LL | f.use_ref(); | - borrow later used here error[E0597]: `x` does not live long enough - --> $DIR/closure-borrow-spans.rs:64:16 + --> $DIR/closure-borrow-spans.rs:54:16 | LL | f = || x = 0; //~ ERROR | -- ^ borrowed value does not live long enough @@ -95,7 +95,7 @@ LL | f.use_ref(); | - borrow later used here error[E0506]: cannot assign to `x` because it is borrowed - --> $DIR/closure-borrow-spans.rs:71:5 + --> $DIR/closure-borrow-spans.rs:61:5 | LL | let f = || x = 0; | -- - borrow occurs due to use in closure @@ -107,7 +107,7 @@ LL | f.use_ref(); | - borrow later used here error[E0505]: cannot move out of `x` because it is borrowed - --> $DIR/closure-borrow-spans.rs:77:13 + --> $DIR/closure-borrow-spans.rs:67:13 | LL | let f = || *x = 0; | -- - borrow occurs due to use in closure @@ -119,7 +119,7 @@ LL | f.use_ref(); | - borrow later used here error[E0501]: cannot borrow `x` as immutable because previous closure requires unique access - --> $DIR/closure-borrow-spans.rs:83:13 + --> $DIR/closure-borrow-spans.rs:73:13 | LL | let f = || *x = 0; | -- - first borrow occurs due to use of `x` in closure @@ -131,7 +131,7 @@ LL | f.use_ref(); | - borrow later used here error[E0501]: cannot borrow `x` as mutable because previous closure requires unique access - --> $DIR/closure-borrow-spans.rs:89:13 + --> $DIR/closure-borrow-spans.rs:79:13 | LL | let f = || *x = 0; | -- - first borrow occurs due to use of `x` in closure @@ -143,7 +143,7 @@ LL | f.use_ref(); | - borrow later used here error[E0597]: `x` does not live long enough - --> $DIR/closure-borrow-spans.rs:98:17 + --> $DIR/closure-borrow-spans.rs:88:17 | LL | f = || *x = 0; //~ ERROR | -- ^ borrowed value does not live long enough @@ -155,7 +155,7 @@ LL | f.use_ref(); | - borrow later used here error[E0506]: cannot assign to `*x` because it is borrowed - --> $DIR/closure-borrow-spans.rs:105:5 + --> $DIR/closure-borrow-spans.rs:95:5 | LL | let f = || *x = 0; | -- - borrow occurs due to use in closure diff --git a/src/test/ui/nll/closure-captures.rs b/src/test/ui/nll/closure-captures.rs index 16385ca2499cc..3a01f86cad890 100644 --- a/src/test/ui/nll/closure-captures.rs +++ b/src/test/ui/nll/closure-captures.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Some cases with closures that might be problems #![allow(unused)] diff --git a/src/test/ui/nll/closure-captures.stderr b/src/test/ui/nll/closure-captures.stderr index a03e104a1b1fb..cdc055f2a37a0 100644 --- a/src/test/ui/nll/closure-captures.stderr +++ b/src/test/ui/nll/closure-captures.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to `x`, as it is not declared as mutable - --> $DIR/closure-captures.rs:20:5 + --> $DIR/closure-captures.rs:10:5 | LL | fn one_closure(x: i32) { | - help: consider changing this to be mutable: `mut x` @@ -8,7 +8,7 @@ LL | x = 1; //~ ERROR | ^^^^^ cannot assign error[E0594]: cannot assign to `x`, as it is not declared as mutable - --> $DIR/closure-captures.rs:22:5 + --> $DIR/closure-captures.rs:12:5 | LL | fn one_closure(x: i32) { | - help: consider changing this to be mutable: `mut x` @@ -17,7 +17,7 @@ LL | x = 1; //~ ERROR | ^^^^^ cannot assign error[E0594]: cannot assign to `x`, as it is not declared as mutable - --> $DIR/closure-captures.rs:28:9 + --> $DIR/closure-captures.rs:18:9 | LL | fn two_closures(x: i32) { | - help: consider changing this to be mutable: `mut x` @@ -26,7 +26,7 @@ LL | x = 1; //~ ERROR | ^^^^^ cannot assign error[E0594]: cannot assign to `x`, as it is not declared as mutable - --> $DIR/closure-captures.rs:32:9 + --> $DIR/closure-captures.rs:22:9 | LL | fn two_closures(x: i32) { | - help: consider changing this to be mutable: `mut x` @@ -35,7 +35,7 @@ LL | x = 1; //~ ERROR | ^^^^^ cannot assign error[E0596]: cannot borrow `x` as mutable, as it is a captured variable in a `Fn` closure - --> $DIR/closure-captures.rs:40:9 + --> $DIR/closure-captures.rs:30:9 | LL | || //~ ERROR | ^^ cannot borrow as mutable @@ -43,7 +43,7 @@ LL | x = 1;} | - mutable borrow occurs due to use of `x` in closure | help: consider changing this to accept closures that implement `FnMut` - --> $DIR/closure-captures.rs:39:12 + --> $DIR/closure-captures.rs:29:12 | LL | fn_ref(|| { | ____________^ @@ -52,7 +52,7 @@ LL | | x = 1;} | |________________^ error[E0596]: cannot borrow `x` as mutable, as it is a captured variable in a `Fn` closure - --> $DIR/closure-captures.rs:44:9 + --> $DIR/closure-captures.rs:34:9 | LL | || //~ ERROR | ^^ cannot borrow as mutable @@ -60,7 +60,7 @@ LL | x = 1;}); | - mutable borrow occurs due to use of `x` in closure | help: consider changing this to accept closures that implement `FnMut` - --> $DIR/closure-captures.rs:43:12 + --> $DIR/closure-captures.rs:33:12 | LL | fn_ref(move || { | ____________^ @@ -69,7 +69,7 @@ LL | | x = 1;}); | |___________^ error[E0594]: cannot assign to `x`, as it is not declared as mutable - --> $DIR/closure-captures.rs:52:10 + --> $DIR/closure-captures.rs:42:10 | LL | fn two_closures_ref(x: i32) { | - help: consider changing this to be mutable: `mut x` @@ -78,7 +78,7 @@ LL | x = 1;} //~ ERROR | ^^^^^ cannot assign error[E0596]: cannot borrow `x` as mutable, as it is a captured variable in a `Fn` closure - --> $DIR/closure-captures.rs:51:9 + --> $DIR/closure-captures.rs:41:9 | LL | || //~ ERROR | ^^ cannot borrow as mutable @@ -86,7 +86,7 @@ LL | x = 1;} //~ ERROR | - mutable borrow occurs due to use of `x` in closure | help: consider changing this to accept closures that implement `FnMut` - --> $DIR/closure-captures.rs:50:12 + --> $DIR/closure-captures.rs:40:12 | LL | fn_ref(|| { | ____________^ @@ -95,7 +95,7 @@ LL | | x = 1;} //~ ERROR | |________________^ error[E0594]: cannot assign to `x`, as it is not declared as mutable - --> $DIR/closure-captures.rs:56:5 + --> $DIR/closure-captures.rs:46:5 | LL | fn two_closures_ref(x: i32) { | - help: consider changing this to be mutable: `mut x` @@ -104,7 +104,7 @@ LL | x = 1;}); //~ ERROR | ^^^^^ cannot assign error[E0596]: cannot borrow `x` as mutable, as it is a captured variable in a `Fn` closure - --> $DIR/closure-captures.rs:55:9 + --> $DIR/closure-captures.rs:45:9 | LL | || //~ ERROR | ^^ cannot borrow as mutable @@ -112,7 +112,7 @@ LL | x = 1;}); //~ ERROR | - mutable borrow occurs due to use of `x` in closure | help: consider changing this to accept closures that implement `FnMut` - --> $DIR/closure-captures.rs:54:12 + --> $DIR/closure-captures.rs:44:12 | LL | fn_ref(move || { | ____________^ @@ -121,7 +121,7 @@ LL | | x = 1;}); //~ ERROR | |___________^ error[E0596]: cannot borrow `x` as mutable, as it is a captured variable in a `Fn` closure - --> $DIR/closure-captures.rs:61:9 + --> $DIR/closure-captures.rs:51:9 | LL | || //~ ERROR | ^^ cannot borrow as mutable @@ -129,7 +129,7 @@ LL | *x = 1;}); | - mutable borrow occurs due to use of `x` in closure | help: consider changing this to accept closures that implement `FnMut` - --> $DIR/closure-captures.rs:60:12 + --> $DIR/closure-captures.rs:50:12 | LL | fn_ref(|| { | ____________^ @@ -138,7 +138,7 @@ LL | | *x = 1;}); | |________________^ error[E0596]: cannot borrow `x` as mutable, as it is a captured variable in a `Fn` closure - --> $DIR/closure-captures.rs:64:9 + --> $DIR/closure-captures.rs:54:9 | LL | || //~ ERROR | ^^ cannot borrow as mutable @@ -146,7 +146,7 @@ LL | *x = 1;}); | - mutable borrow occurs due to use of `x` in closure | help: consider changing this to accept closures that implement `FnMut` - --> $DIR/closure-captures.rs:63:12 + --> $DIR/closure-captures.rs:53:12 | LL | fn_ref(move || { | ____________^ diff --git a/src/test/ui/nll/closure-move-spans.rs b/src/test/ui/nll/closure-move-spans.rs index 7e836275c8bff..ffbfa9f8ae483 100644 --- a/src/test/ui/nll/closure-move-spans.rs +++ b/src/test/ui/nll/closure-move-spans.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // check that moves due to a closure capture give a special note #![feature(nll)] diff --git a/src/test/ui/nll/closure-move-spans.stderr b/src/test/ui/nll/closure-move-spans.stderr index 80b7b4246a747..3ae1912eb10bf 100644 --- a/src/test/ui/nll/closure-move-spans.stderr +++ b/src/test/ui/nll/closure-move-spans.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `x` - --> $DIR/closure-move-spans.rs:17:13 + --> $DIR/closure-move-spans.rs:7:13 | LL | || x; | -- - variable moved due to use in closure @@ -11,7 +11,7 @@ LL | let y = x; //~ ERROR = note: move occurs because `x` has type `std::string::String`, which does not implement the `Copy` trait error[E0382]: borrow of moved value: `x` - --> $DIR/closure-move-spans.rs:22:13 + --> $DIR/closure-move-spans.rs:12:13 | LL | || x; | -- - variable moved due to use in closure @@ -23,7 +23,7 @@ LL | let y = &x; //~ ERROR = note: move occurs because `x` has type `std::string::String`, which does not implement the `Copy` trait error[E0382]: borrow of moved value: `x` - --> $DIR/closure-move-spans.rs:27:13 + --> $DIR/closure-move-spans.rs:17:13 | LL | || x; | -- - variable moved due to use in closure diff --git a/src/test/ui/nll/closure-requirements/escape-argument-callee.rs b/src/test/ui/nll/closure-requirements/escape-argument-callee.rs index 78208d6d7db7d..82393181ecd2a 100644 --- a/src/test/ui/nll/closure-requirements/escape-argument-callee.rs +++ b/src/test/ui/nll/closure-requirements/escape-argument-callee.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test closure that: // // - takes an argument `y` with lifetime `'a` (in the code, it's anonymous) diff --git a/src/test/ui/nll/closure-requirements/escape-argument-callee.stderr b/src/test/ui/nll/closure-requirements/escape-argument-callee.stderr index 862d1f0b179c0..c729b1cf64662 100644 --- a/src/test/ui/nll/closure-requirements/escape-argument-callee.stderr +++ b/src/test/ui/nll/closure-requirements/escape-argument-callee.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/escape-argument-callee.rs:36:50 + --> $DIR/escape-argument-callee.rs:26:50 | LL | let mut closure = expect_sig(|p, y| *p = y); | ^ note: No external requirements - --> $DIR/escape-argument-callee.rs:36:38 + --> $DIR/escape-argument-callee.rs:26:38 | LL | let mut closure = expect_sig(|p, y| *p = y); | ^^^^^^^^^^^^^ @@ -16,7 +16,7 @@ LL | let mut closure = expect_sig(|p, y| *p = y); ] error: unsatisfied lifetime constraints - --> $DIR/escape-argument-callee.rs:36:45 + --> $DIR/escape-argument-callee.rs:26:45 | LL | let mut closure = expect_sig(|p, y| *p = y); | - - ^^^^^^ requires that `'1` must outlive `'2` @@ -25,7 +25,7 @@ LL | let mut closure = expect_sig(|p, y| *p = y); | has type `&mut &'2 i32` note: No external requirements - --> $DIR/escape-argument-callee.rs:30:1 + --> $DIR/escape-argument-callee.rs:20:1 | LL | / fn test() { LL | | let x = 44; diff --git a/src/test/ui/nll/closure-requirements/escape-argument.rs b/src/test/ui/nll/closure-requirements/escape-argument.rs index 7a28cb26f3570..6269659c4539b 100644 --- a/src/test/ui/nll/closure-requirements/escape-argument.rs +++ b/src/test/ui/nll/closure-requirements/escape-argument.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test closure that: // // - takes an argument `y` diff --git a/src/test/ui/nll/closure-requirements/escape-argument.stderr b/src/test/ui/nll/closure-requirements/escape-argument.stderr index a830768b36e1c..9b66abc40f07d 100644 --- a/src/test/ui/nll/closure-requirements/escape-argument.stderr +++ b/src/test/ui/nll/closure-requirements/escape-argument.stderr @@ -1,5 +1,5 @@ note: No external requirements - --> $DIR/escape-argument.rs:36:38 + --> $DIR/escape-argument.rs:26:38 | LL | let mut closure = expect_sig(|p, y| *p = y); | ^^^^^^^^^^^^^ @@ -10,7 +10,7 @@ LL | let mut closure = expect_sig(|p, y| *p = y); ] note: No external requirements - --> $DIR/escape-argument.rs:30:1 + --> $DIR/escape-argument.rs:20:1 | LL | / fn test() { LL | | let x = 44; @@ -24,7 +24,7 @@ LL | | } = note: defining type: DefId(0/0:3 ~ escape_argument[317d]::test[0]) with substs [] error[E0597]: `y` does not live long enough - --> $DIR/escape-argument.rs:37:25 + --> $DIR/escape-argument.rs:27:25 | LL | closure(&mut p, &y); | ^^ borrowed value does not live long enough diff --git a/src/test/ui/nll/closure-requirements/escape-upvar-nested.rs b/src/test/ui/nll/closure-requirements/escape-upvar-nested.rs index ce44903e6e6a8..b94b3d607c92a 100644 --- a/src/test/ui/nll/closure-requirements/escape-upvar-nested.rs +++ b/src/test/ui/nll/closure-requirements/escape-upvar-nested.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // As in `escape-upvar-ref.rs`, test closure that: // // - captures a variable `y` diff --git a/src/test/ui/nll/closure-requirements/escape-upvar-nested.stderr b/src/test/ui/nll/closure-requirements/escape-upvar-nested.stderr index ed2ae2f27b57b..8214ff1fcec18 100644 --- a/src/test/ui/nll/closure-requirements/escape-upvar-nested.stderr +++ b/src/test/ui/nll/closure-requirements/escape-upvar-nested.stderr @@ -1,5 +1,5 @@ note: External requirements - --> $DIR/escape-upvar-nested.rs:31:32 + --> $DIR/escape-upvar-nested.rs:21:32 | LL | let mut closure1 = || p = &y; //~ ERROR `y` does not live long enough [E0597] | ^^^^^^^^^ @@ -14,7 +14,7 @@ LL | let mut closure1 = || p = &y; //~ ERROR `y` does not live long = note: where '_#3r: '_#2r note: External requirements - --> $DIR/escape-upvar-nested.rs:30:27 + --> $DIR/escape-upvar-nested.rs:20:27 | LL | let mut closure = || { | ___________________________^ @@ -33,7 +33,7 @@ LL | | }; = note: where '_#3r: '_#2r note: No external requirements - --> $DIR/escape-upvar-nested.rs:23:1 + --> $DIR/escape-upvar-nested.rs:13:1 | LL | / fn test() { LL | | let x = 44; @@ -47,7 +47,7 @@ LL | | } = note: defining type: DefId(0/0:3 ~ escape_upvar_nested[317d]::test[0]) with substs [] error[E0597]: `y` does not live long enough - --> $DIR/escape-upvar-nested.rs:31:40 + --> $DIR/escape-upvar-nested.rs:21:40 | LL | let mut closure = || { | -- value captured here diff --git a/src/test/ui/nll/closure-requirements/escape-upvar-ref.rs b/src/test/ui/nll/closure-requirements/escape-upvar-ref.rs index 49d31bbc139d7..a916ccd6c21a2 100644 --- a/src/test/ui/nll/closure-requirements/escape-upvar-ref.rs +++ b/src/test/ui/nll/closure-requirements/escape-upvar-ref.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test closure that: // // - captures a variable `y` by reference diff --git a/src/test/ui/nll/closure-requirements/escape-upvar-ref.stderr b/src/test/ui/nll/closure-requirements/escape-upvar-ref.stderr index 8db56deeb1f7a..55ede6ed4aae9 100644 --- a/src/test/ui/nll/closure-requirements/escape-upvar-ref.stderr +++ b/src/test/ui/nll/closure-requirements/escape-upvar-ref.stderr @@ -1,5 +1,5 @@ note: External requirements - --> $DIR/escape-upvar-ref.rs:33:27 + --> $DIR/escape-upvar-ref.rs:23:27 | LL | let mut closure = || p = &y; | ^^^^^^^^^ @@ -14,7 +14,7 @@ LL | let mut closure = || p = &y; = note: where '_#3r: '_#2r note: No external requirements - --> $DIR/escape-upvar-ref.rs:27:1 + --> $DIR/escape-upvar-ref.rs:17:1 | LL | / fn test() { LL | | let x = 44; @@ -28,7 +28,7 @@ LL | | } = note: defining type: DefId(0/0:3 ~ escape_upvar_ref[317d]::test[0]) with substs [] error[E0597]: `y` does not live long enough - --> $DIR/escape-upvar-ref.rs:33:35 + --> $DIR/escape-upvar-ref.rs:23:35 | LL | let mut closure = || p = &y; | -- ^ borrowed value does not live long enough diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.rs b/src/test/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.rs index b879f9a33986d..62cea1d505daa 100644 --- a/src/test/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.rs +++ b/src/test/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test where we fail to approximate due to demanding a postdom // relationship between our upper bounds. diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.stderr b/src/test/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.stderr index 72b7104b99dd3..917c6485c059b 100644 --- a/src/test/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.stderr +++ b/src/test/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/propagate-approximated-fail-no-postdom.rs:55:21 + --> $DIR/propagate-approximated-fail-no-postdom.rs:45:21 | LL | let p = x.get(); | ^^^^^^^ note: No external requirements - --> $DIR/propagate-approximated-fail-no-postdom.rs:53:9 + --> $DIR/propagate-approximated-fail-no-postdom.rs:43:9 | LL | / |_outlives1, _outlives2, _outlives3, x, y| { LL | | // Only works if 'x: 'y: @@ -21,7 +21,7 @@ LL | | }, ] error: unsatisfied lifetime constraints - --> $DIR/propagate-approximated-fail-no-postdom.rs:57:13 + --> $DIR/propagate-approximated-fail-no-postdom.rs:47:13 | LL | |_outlives1, _outlives2, _outlives3, x, y| { | ---------- ---------- has type `std::cell::Cell<&'2 &u32>` @@ -32,7 +32,7 @@ LL | demand_y(x, y, p) //~ ERROR | ^^^^^^^^^^^^^^^^^ argument requires that `'1` must outlive `'2` note: No external requirements - --> $DIR/propagate-approximated-fail-no-postdom.rs:48:1 + --> $DIR/propagate-approximated-fail-no-postdom.rs:38:1 | LL | / fn supply<'a, 'b, 'c>(cell_a: Cell<&'a u32>, cell_b: Cell<&'b u32>, cell_c: Cell<&'c u32>) { LL | | establish_relationships( diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-ref.rs b/src/test/ui/nll/closure-requirements/propagate-approximated-ref.rs index d79be8b83c61f..46d4a9b16ef0f 100644 --- a/src/test/ui/nll/closure-requirements/propagate-approximated-ref.rs +++ b/src/test/ui/nll/closure-requirements/propagate-approximated-ref.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Rather convoluted setup where we infer a relationship between two // free regions in the closure signature (`'a` and `'b`) on the basis // of a relationship between two bound regions (`'x` and `'y`). diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-ref.stderr b/src/test/ui/nll/closure-requirements/propagate-approximated-ref.stderr index fe67ca0293e06..8ff272f6b9e77 100644 --- a/src/test/ui/nll/closure-requirements/propagate-approximated-ref.stderr +++ b/src/test/ui/nll/closure-requirements/propagate-approximated-ref.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/propagate-approximated-ref.rs:57:9 + --> $DIR/propagate-approximated-ref.rs:47:9 | LL | demand_y(x, y, x.get()) //~ WARNING not reporting region error due to nll | ^^^^^^^^^^^^^^^^^^^^^^^ note: External requirements - --> $DIR/propagate-approximated-ref.rs:53:47 + --> $DIR/propagate-approximated-ref.rs:43:47 | LL | establish_relationships(&cell_a, &cell_b, |_outlives1, _outlives2, x, y| { | _______________________________________________^ @@ -24,7 +24,7 @@ LL | | }); = note: where '_#1r: '_#2r note: No external requirements - --> $DIR/propagate-approximated-ref.rs:52:1 + --> $DIR/propagate-approximated-ref.rs:42:1 | LL | / fn supply<'a, 'b>(cell_a: Cell<&'a u32>, cell_b: Cell<&'b u32>) { LL | | establish_relationships(&cell_a, &cell_b, |_outlives1, _outlives2, x, y| { @@ -38,7 +38,7 @@ LL | | } = note: defining type: DefId(0/0:6 ~ propagate_approximated_ref[317d]::supply[0]) with substs [] error: unsatisfied lifetime constraints - --> $DIR/propagate-approximated-ref.rs:53:5 + --> $DIR/propagate-approximated-ref.rs:43:5 | LL | fn supply<'a, 'b>(cell_a: Cell<&'a u32>, cell_b: Cell<&'b u32>) { | -- -- lifetime `'b` defined here diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-comparing-against-free.rs b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-comparing-against-free.rs index a8ab41cebacce..d56a78ede8897 100644 --- a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-comparing-against-free.rs +++ b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-comparing-against-free.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test a case where we setup relationships like `'x: 'a` or `'a: 'x`, // where `'x` is bound in closure type but `'a` is free. This forces // us to approximate `'x` one way or the other. diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-comparing-against-free.stderr b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-comparing-against-free.stderr index 43c39dee2448a..79787b0b763a4 100644 --- a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-comparing-against-free.stderr +++ b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-comparing-against-free.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/propagate-approximated-shorter-to-static-comparing-against-free.rs:31:5 + --> $DIR/propagate-approximated-shorter-to-static-comparing-against-free.rs:21:5 | LL | foo(cell, |cell_a, cell_x| { | ^^^ note: No external requirements - --> $DIR/propagate-approximated-shorter-to-static-comparing-against-free.rs:31:15 + --> $DIR/propagate-approximated-shorter-to-static-comparing-against-free.rs:21:15 | LL | foo(cell, |cell_a, cell_x| { | _______________^ @@ -21,7 +21,7 @@ LL | | }) ] error: borrowed data escapes outside of closure - --> $DIR/propagate-approximated-shorter-to-static-comparing-against-free.rs:33:9 + --> $DIR/propagate-approximated-shorter-to-static-comparing-against-free.rs:23:9 | LL | foo(cell, |cell_a, cell_x| { | ------ ------ `cell_x` is a reference that is only valid in the closure body @@ -32,7 +32,7 @@ LL | cell_a.set(cell_x.get()); // forces 'x: 'a, error in closure | ^^^^^^^^^^^^^^^^^^^^^^^^ `cell_x` escapes the closure body here note: No external requirements - --> $DIR/propagate-approximated-shorter-to-static-comparing-against-free.rs:28:1 + --> $DIR/propagate-approximated-shorter-to-static-comparing-against-free.rs:18:1 | LL | / fn case1() { LL | | let a = 0; @@ -46,7 +46,7 @@ LL | | } = note: defining type: DefId(0/0:5 ~ propagate_approximated_shorter_to_static_comparing_against_free[317d]::case1[0]) with substs [] note: External requirements - --> $DIR/propagate-approximated-shorter-to-static-comparing-against-free.rs:46:15 + --> $DIR/propagate-approximated-shorter-to-static-comparing-against-free.rs:36:15 | LL | foo(cell, |cell_a, cell_x| { | _______________^ @@ -62,7 +62,7 @@ LL | | }) = note: where '_#1r: '_#0r note: No external requirements - --> $DIR/propagate-approximated-shorter-to-static-comparing-against-free.rs:39:1 + --> $DIR/propagate-approximated-shorter-to-static-comparing-against-free.rs:29:1 | LL | / fn case2() { LL | | let a = 0; @@ -76,7 +76,7 @@ LL | | } = note: defining type: DefId(0/0:6 ~ propagate_approximated_shorter_to_static_comparing_against_free[317d]::case2[0]) with substs [] error[E0597]: `a` does not live long enough - --> $DIR/propagate-approximated-shorter-to-static-comparing-against-free.rs:41:26 + --> $DIR/propagate-approximated-shorter-to-static-comparing-against-free.rs:31:26 | LL | let cell = Cell::new(&a); | ^^ borrowed value does not live long enough diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.rs b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.rs index 26faccdde71ae..ccdb5f8c97edd 100644 --- a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.rs +++ b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test a case where we are trying to prove `'x: 'y` and are forced to // approximate the shorter end-point (`'y`) to with `'static`. This is // because `'y` is higher-ranked but we know of no relations to other diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.stderr b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.stderr index c3bbf1035dbc5..5734ac9fcc228 100644 --- a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.stderr +++ b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/propagate-approximated-shorter-to-static-no-bound.rs:49:9 + --> $DIR/propagate-approximated-shorter-to-static-no-bound.rs:39:9 | LL | demand_y(x, y, x.get()) //~ WARNING not reporting region error due to nll | ^^^^^^^^^^^^^^^^^^^^^^^ note: External requirements - --> $DIR/propagate-approximated-shorter-to-static-no-bound.rs:45:47 + --> $DIR/propagate-approximated-shorter-to-static-no-bound.rs:35:47 | LL | establish_relationships(&cell_a, &cell_b, |_outlives, x, y| { | _______________________________________________^ @@ -24,7 +24,7 @@ LL | | }); = note: where '_#1r: '_#0r note: No external requirements - --> $DIR/propagate-approximated-shorter-to-static-no-bound.rs:44:1 + --> $DIR/propagate-approximated-shorter-to-static-no-bound.rs:34:1 | LL | / fn supply<'a, 'b>(cell_a: Cell<&'a u32>, cell_b: Cell<&'b u32>) { LL | | establish_relationships(&cell_a, &cell_b, |_outlives, x, y| { @@ -38,7 +38,7 @@ LL | | } = note: defining type: DefId(0/0:6 ~ propagate_approximated_shorter_to_static_no_bound[317d]::supply[0]) with substs [] error: borrowed data escapes outside of function - --> $DIR/propagate-approximated-shorter-to-static-no-bound.rs:45:5 + --> $DIR/propagate-approximated-shorter-to-static-no-bound.rs:35:5 | LL | fn supply<'a, 'b>(cell_a: Cell<&'a u32>, cell_b: Cell<&'b u32>) { | ------ `cell_a` is a reference that is only valid in the function body diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.rs b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.rs index 703d60371cdfc..bd97ee06f9b94 100644 --- a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.rs +++ b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test a case where we are trying to prove `'x: 'y` and are forced to // approximate the shorter end-point (`'y`) to with `'static`. This is // because `'y` is higher-ranked but we know of only irrelevant diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.stderr b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.stderr index 9f259e2dee590..bd6575f0a96a0 100644 --- a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.stderr +++ b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/propagate-approximated-shorter-to-static-wrong-bound.rs:51:9 + --> $DIR/propagate-approximated-shorter-to-static-wrong-bound.rs:41:9 | LL | demand_y(x, y, x.get()) | ^^^^^^^^^^^^^^^^^^^^^^^ note: External requirements - --> $DIR/propagate-approximated-shorter-to-static-wrong-bound.rs:48:47 + --> $DIR/propagate-approximated-shorter-to-static-wrong-bound.rs:38:47 | LL | establish_relationships(&cell_a, &cell_b, |_outlives1, _outlives2, x, y| { | _______________________________________________^ @@ -24,7 +24,7 @@ LL | | }); = note: where '_#1r: '_#0r note: No external requirements - --> $DIR/propagate-approximated-shorter-to-static-wrong-bound.rs:47:1 + --> $DIR/propagate-approximated-shorter-to-static-wrong-bound.rs:37:1 | LL | / fn supply<'a, 'b>(cell_a: Cell<&'a u32>, cell_b: Cell<&'b u32>) { LL | | establish_relationships(&cell_a, &cell_b, |_outlives1, _outlives2, x, y| { @@ -38,7 +38,7 @@ LL | | } = note: defining type: DefId(0/0:6 ~ propagate_approximated_shorter_to_static_wrong_bound[317d]::supply[0]) with substs [] error: borrowed data escapes outside of function - --> $DIR/propagate-approximated-shorter-to-static-wrong-bound.rs:48:5 + --> $DIR/propagate-approximated-shorter-to-static-wrong-bound.rs:38:5 | LL | fn supply<'a, 'b>(cell_a: Cell<&'a u32>, cell_b: Cell<&'b u32>) { | ------ `cell_a` is a reference that is only valid in the function body diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-val.rs b/src/test/ui/nll/closure-requirements/propagate-approximated-val.rs index bf24557398d16..ee5b72418d483 100644 --- a/src/test/ui/nll/closure-requirements/propagate-approximated-val.rs +++ b/src/test/ui/nll/closure-requirements/propagate-approximated-val.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // A simpler variant of `outlives-from-argument` where cells are // passed by value. // diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-val.stderr b/src/test/ui/nll/closure-requirements/propagate-approximated-val.stderr index ed1fc6e1a712f..2d4e159c99263 100644 --- a/src/test/ui/nll/closure-requirements/propagate-approximated-val.stderr +++ b/src/test/ui/nll/closure-requirements/propagate-approximated-val.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/propagate-approximated-val.rs:50:9 + --> $DIR/propagate-approximated-val.rs:40:9 | LL | demand_y(outlives1, outlives2, x.get()) //~ WARNING not reporting region error due to nll | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ note: External requirements - --> $DIR/propagate-approximated-val.rs:46:45 + --> $DIR/propagate-approximated-val.rs:36:45 | LL | establish_relationships(cell_a, cell_b, |outlives1, outlives2, x, y| { | _____________________________________________^ @@ -24,7 +24,7 @@ LL | | }); = note: where '_#1r: '_#2r note: No external requirements - --> $DIR/propagate-approximated-val.rs:45:1 + --> $DIR/propagate-approximated-val.rs:35:1 | LL | / fn test<'a, 'b>(cell_a: Cell<&'a u32>, cell_b: Cell<&'b u32>) { LL | | establish_relationships(cell_a, cell_b, |outlives1, outlives2, x, y| { @@ -38,7 +38,7 @@ LL | | } = note: defining type: DefId(0/0:6 ~ propagate_approximated_val[317d]::test[0]) with substs [] error: unsatisfied lifetime constraints - --> $DIR/propagate-approximated-val.rs:46:5 + --> $DIR/propagate-approximated-val.rs:36:5 | LL | fn test<'a, 'b>(cell_a: Cell<&'a u32>, cell_b: Cell<&'b u32>) { | -- -- lifetime `'b` defined here diff --git a/src/test/ui/nll/closure-requirements/propagate-despite-same-free-region.rs b/src/test/ui/nll/closure-requirements/propagate-despite-same-free-region.rs index c21c824b22c3b..d1945f4864c9a 100644 --- a/src/test/ui/nll/closure-requirements/propagate-despite-same-free-region.rs +++ b/src/test/ui/nll/closure-requirements/propagate-despite-same-free-region.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test where we might in theory be able to see that the relationship // between two bound regions is true within closure and hence have no // need to propagate; but in fact we do because identity of free diff --git a/src/test/ui/nll/closure-requirements/propagate-despite-same-free-region.stderr b/src/test/ui/nll/closure-requirements/propagate-despite-same-free-region.stderr index 0888b1380e69e..8d7a482415774 100644 --- a/src/test/ui/nll/closure-requirements/propagate-despite-same-free-region.stderr +++ b/src/test/ui/nll/closure-requirements/propagate-despite-same-free-region.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/propagate-despite-same-free-region.rs:54:21 + --> $DIR/propagate-despite-same-free-region.rs:44:21 | LL | let p = x.get(); | ^^^^^^^ note: External requirements - --> $DIR/propagate-despite-same-free-region.rs:52:9 + --> $DIR/propagate-despite-same-free-region.rs:42:9 | LL | / |_outlives1, _outlives2, x, y| { LL | | // Only works if 'x: 'y: @@ -22,7 +22,7 @@ LL | | }, = note: where '_#1r: '_#2r note: No external requirements - --> $DIR/propagate-despite-same-free-region.rs:49:1 + --> $DIR/propagate-despite-same-free-region.rs:39:1 | LL | / fn supply<'a>(cell_a: Cell<&'a u32>) { LL | | establish_relationships( diff --git a/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-no-bounds.rs b/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-no-bounds.rs index 4b1f5231b3e87..576444788c6d1 100644 --- a/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-no-bounds.rs +++ b/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-no-bounds.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Similarly to escape-argument-callee, a test case where the closure // requires a relationship between 2 unrelated higher-ranked regions, // with no helpful relations between the HRRs and free regions. diff --git a/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-no-bounds.stderr b/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-no-bounds.stderr index cd5e6f29f5f48..5547949094aca 100644 --- a/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-no-bounds.stderr +++ b/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-no-bounds.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/propagate-fail-to-approximate-longer-no-bounds.rs:47:9 + --> $DIR/propagate-fail-to-approximate-longer-no-bounds.rs:37:9 | LL | demand_y(x, y, x.get()) | ^^^^^^^^^^^^^^^^^^^^^^^ note: No external requirements - --> $DIR/propagate-fail-to-approximate-longer-no-bounds.rs:45:47 + --> $DIR/propagate-fail-to-approximate-longer-no-bounds.rs:35:47 | LL | establish_relationships(&cell_a, &cell_b, |_outlives, x, y| { | _______________________________________________^ @@ -22,7 +22,7 @@ LL | | }); ] error: unsatisfied lifetime constraints - --> $DIR/propagate-fail-to-approximate-longer-no-bounds.rs:47:9 + --> $DIR/propagate-fail-to-approximate-longer-no-bounds.rs:37:9 | LL | establish_relationships(&cell_a, &cell_b, |_outlives, x, y| { | --------- - has type `&std::cell::Cell<&'1 u32>` @@ -33,7 +33,7 @@ LL | demand_y(x, y, x.get()) | ^^^^^^^^^^^^^^^^^^^^^^^ argument requires that `'1` must outlive `'2` note: No external requirements - --> $DIR/propagate-fail-to-approximate-longer-no-bounds.rs:44:1 + --> $DIR/propagate-fail-to-approximate-longer-no-bounds.rs:34:1 | LL | / fn supply<'a, 'b>(cell_a: Cell<&'a u32>, cell_b: Cell<&'b u32>) { LL | | establish_relationships(&cell_a, &cell_b, |_outlives, x, y| { diff --git a/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-wrong-bounds.rs b/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-wrong-bounds.rs index 62a20c1bfe76e..da2108c2078d8 100644 --- a/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-wrong-bounds.rs +++ b/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-wrong-bounds.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Similarly to escape-argument-callee, a test case where the closure // requires a relationship between 2 unrelated higher-ranked regions, // with no helpful relations between the HRRs and free regions. diff --git a/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-wrong-bounds.stderr b/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-wrong-bounds.stderr index 2176575e0aa12..ae61fe6765047 100644 --- a/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-wrong-bounds.stderr +++ b/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-wrong-bounds.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/propagate-fail-to-approximate-longer-wrong-bounds.rs:51:9 + --> $DIR/propagate-fail-to-approximate-longer-wrong-bounds.rs:41:9 | LL | demand_y(x, y, x.get()) | ^^^^^^^^^^^^^^^^^^^^^^^ note: No external requirements - --> $DIR/propagate-fail-to-approximate-longer-wrong-bounds.rs:49:47 + --> $DIR/propagate-fail-to-approximate-longer-wrong-bounds.rs:39:47 | LL | establish_relationships(&cell_a, &cell_b, |_outlives1, _outlives2, x, y| { | _______________________________________________^ @@ -22,7 +22,7 @@ LL | | }); ] error: unsatisfied lifetime constraints - --> $DIR/propagate-fail-to-approximate-longer-wrong-bounds.rs:51:9 + --> $DIR/propagate-fail-to-approximate-longer-wrong-bounds.rs:41:9 | LL | establish_relationships(&cell_a, &cell_b, |_outlives1, _outlives2, x, y| { | ---------- ---------- has type `&std::cell::Cell<&'2 &u32>` @@ -33,7 +33,7 @@ LL | demand_y(x, y, x.get()) | ^^^^^^^^^^^^^^^^^^^^^^^ argument requires that `'1` must outlive `'2` note: No external requirements - --> $DIR/propagate-fail-to-approximate-longer-wrong-bounds.rs:48:1 + --> $DIR/propagate-fail-to-approximate-longer-wrong-bounds.rs:38:1 | LL | / fn supply<'a, 'b>(cell_a: Cell<&'a u32>, cell_b: Cell<&'b u32>) { LL | | establish_relationships(&cell_a, &cell_b, |_outlives1, _outlives2, x, y| { diff --git a/src/test/ui/nll/closure-requirements/propagate-from-trait-match.rs b/src/test/ui/nll/closure-requirements/propagate-from-trait-match.rs index 7baf24f88f8fa..ead341b15a1c9 100644 --- a/src/test/ui/nll/closure-requirements/propagate-from-trait-match.rs +++ b/src/test/ui/nll/closure-requirements/propagate-from-trait-match.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that regions which appear only in the closure's generics (in // this case, `'a`) are properly mapped to the creator's generics. In // this case, the closure constrains its type parameter `T` to outlive diff --git a/src/test/ui/nll/closure-requirements/propagate-from-trait-match.stderr b/src/test/ui/nll/closure-requirements/propagate-from-trait-match.stderr index 8f8a99df5f052..674a8a2a54a6e 100644 --- a/src/test/ui/nll/closure-requirements/propagate-from-trait-match.stderr +++ b/src/test/ui/nll/closure-requirements/propagate-from-trait-match.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/propagate-from-trait-match.rs:55:9 + --> $DIR/propagate-from-trait-match.rs:45:9 | LL | require(value); | ^^^^^^^ note: External requirements - --> $DIR/propagate-from-trait-match.rs:42:36 + --> $DIR/propagate-from-trait-match.rs:32:36 | LL | establish_relationships(value, |value| { | ____________________________________^ @@ -27,7 +27,7 @@ LL | | }); = note: where T: '_#1r note: No external requirements - --> $DIR/propagate-from-trait-match.rs:38:1 + --> $DIR/propagate-from-trait-match.rs:28:1 | LL | / fn supply<'a, T>(value: T) LL | | where @@ -44,7 +44,7 @@ LL | | } ] error[E0309]: the parameter type `T` may not live long enough - --> $DIR/propagate-from-trait-match.rs:42:36 + --> $DIR/propagate-from-trait-match.rs:32:36 | LL | establish_relationships(value, |value| { | ____________________________________^ diff --git a/src/test/ui/nll/closure-requirements/region-lbr-anon-does-not-outlive-static.rs b/src/test/ui/nll/closure-requirements/region-lbr-anon-does-not-outlive-static.rs index a6b2e531ac28f..9ecd2c883de6a 100644 --- a/src/test/ui/nll/closure-requirements/region-lbr-anon-does-not-outlive-static.rs +++ b/src/test/ui/nll/closure-requirements/region-lbr-anon-does-not-outlive-static.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Basic test for free regions in the NLL code. This test ought to // report an error due to a reborrowing constraint. Right now, we get // a variety of errors from the older, AST-based machinery (notably diff --git a/src/test/ui/nll/closure-requirements/region-lbr-anon-does-not-outlive-static.stderr b/src/test/ui/nll/closure-requirements/region-lbr-anon-does-not-outlive-static.stderr index a019a7224c630..ab1081652d2d7 100644 --- a/src/test/ui/nll/closure-requirements/region-lbr-anon-does-not-outlive-static.stderr +++ b/src/test/ui/nll/closure-requirements/region-lbr-anon-does-not-outlive-static.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/region-lbr-anon-does-not-outlive-static.rs:19:5 + --> $DIR/region-lbr-anon-does-not-outlive-static.rs:9:5 | LL | &*x | ^^^ error[E0621]: explicit lifetime required in the type of `x` - --> $DIR/region-lbr-anon-does-not-outlive-static.rs:19:5 + --> $DIR/region-lbr-anon-does-not-outlive-static.rs:9:5 | LL | fn foo(x: &u32) -> &'static u32 { | ---- help: add explicit lifetime `ReStatic` to the type of `x`: `&ReStatic u32` diff --git a/src/test/ui/nll/closure-requirements/region-lbr-named-does-not-outlive-static.rs b/src/test/ui/nll/closure-requirements/region-lbr-named-does-not-outlive-static.rs index b5e8c95bc13b7..d3e4320879cf3 100644 --- a/src/test/ui/nll/closure-requirements/region-lbr-named-does-not-outlive-static.rs +++ b/src/test/ui/nll/closure-requirements/region-lbr-named-does-not-outlive-static.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Basic test for free regions in the NLL code. This test ought to // report an error due to a reborrowing constraint. Right now, we get // a variety of errors from the older, AST-based machinery (notably diff --git a/src/test/ui/nll/closure-requirements/region-lbr-named-does-not-outlive-static.stderr b/src/test/ui/nll/closure-requirements/region-lbr-named-does-not-outlive-static.stderr index 00d79a9ed7e84..c252e7839d0b6 100644 --- a/src/test/ui/nll/closure-requirements/region-lbr-named-does-not-outlive-static.stderr +++ b/src/test/ui/nll/closure-requirements/region-lbr-named-does-not-outlive-static.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/region-lbr-named-does-not-outlive-static.rs:19:5 + --> $DIR/region-lbr-named-does-not-outlive-static.rs:9:5 | LL | &*x | ^^^ error: unsatisfied lifetime constraints - --> $DIR/region-lbr-named-does-not-outlive-static.rs:19:5 + --> $DIR/region-lbr-named-does-not-outlive-static.rs:9:5 | LL | fn foo<'a>(x: &'a u32) -> &'static u32 { | -- lifetime `'a` defined here diff --git a/src/test/ui/nll/closure-requirements/region-lbr1-does-not-outlive-ebr2.rs b/src/test/ui/nll/closure-requirements/region-lbr1-does-not-outlive-ebr2.rs index a883e7b199473..33252a8964b93 100644 --- a/src/test/ui/nll/closure-requirements/region-lbr1-does-not-outlive-ebr2.rs +++ b/src/test/ui/nll/closure-requirements/region-lbr1-does-not-outlive-ebr2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Basic test for free regions in the NLL code. This test ought to // report an error due to a reborrowing constraint. Right now, we get // a variety of errors from the older, AST-based machinery (notably diff --git a/src/test/ui/nll/closure-requirements/region-lbr1-does-not-outlive-ebr2.stderr b/src/test/ui/nll/closure-requirements/region-lbr1-does-not-outlive-ebr2.stderr index bcdae17c47ce0..ba8cab5cacf8f 100644 --- a/src/test/ui/nll/closure-requirements/region-lbr1-does-not-outlive-ebr2.stderr +++ b/src/test/ui/nll/closure-requirements/region-lbr1-does-not-outlive-ebr2.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/region-lbr1-does-not-outlive-ebr2.rs:19:5 + --> $DIR/region-lbr1-does-not-outlive-ebr2.rs:9:5 | LL | &*x | ^^^ error: unsatisfied lifetime constraints - --> $DIR/region-lbr1-does-not-outlive-ebr2.rs:19:5 + --> $DIR/region-lbr1-does-not-outlive-ebr2.rs:9:5 | LL | fn foo<'a, 'b>(x: &'a u32, y: &'b u32) -> &'b u32 { | -- -- lifetime `'b` defined here diff --git a/src/test/ui/nll/closure-requirements/region-lbr1-does-outlive-lbr2-because-implied-bound.rs b/src/test/ui/nll/closure-requirements/region-lbr1-does-outlive-lbr2-because-implied-bound.rs index 6d2bb30980236..66290f2ff230a 100644 --- a/src/test/ui/nll/closure-requirements/region-lbr1-does-outlive-lbr2-because-implied-bound.rs +++ b/src/test/ui/nll/closure-requirements/region-lbr1-does-outlive-lbr2-because-implied-bound.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Basic test for free regions in the NLL code. This test does not // report an error because of the (implied) bound that `'b: 'a`. diff --git a/src/test/ui/nll/closure-requirements/return-wrong-bound-region.rs b/src/test/ui/nll/closure-requirements/return-wrong-bound-region.rs index d88729d04d95b..48f3bb6079028 100644 --- a/src/test/ui/nll/closure-requirements/return-wrong-bound-region.rs +++ b/src/test/ui/nll/closure-requirements/return-wrong-bound-region.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test closure that takes two references and is supposed to return // the first, but actually returns the second. This should fail within // the closure. diff --git a/src/test/ui/nll/closure-requirements/return-wrong-bound-region.stderr b/src/test/ui/nll/closure-requirements/return-wrong-bound-region.stderr index 8dc10de702f7a..2eef5c3e37a15 100644 --- a/src/test/ui/nll/closure-requirements/return-wrong-bound-region.stderr +++ b/src/test/ui/nll/closure-requirements/return-wrong-bound-region.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/return-wrong-bound-region.rs:21:23 + --> $DIR/return-wrong-bound-region.rs:11:23 | LL | expect_sig(|a, b| b); // ought to return `a` | ^ note: No external requirements - --> $DIR/return-wrong-bound-region.rs:21:16 + --> $DIR/return-wrong-bound-region.rs:11:16 | LL | expect_sig(|a, b| b); // ought to return `a` | ^^^^^^^^ @@ -16,7 +16,7 @@ LL | expect_sig(|a, b| b); // ought to return `a` ] error: unsatisfied lifetime constraints - --> $DIR/return-wrong-bound-region.rs:21:23 + --> $DIR/return-wrong-bound-region.rs:11:23 | LL | expect_sig(|a, b| b); // ought to return `a` | - - ^ closure was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1` @@ -25,7 +25,7 @@ LL | expect_sig(|a, b| b); // ought to return `a` | has type `&'2 i32` note: No external requirements - --> $DIR/return-wrong-bound-region.rs:20:1 + --> $DIR/return-wrong-bound-region.rs:10:1 | LL | / fn test() { LL | | expect_sig(|a, b| b); // ought to return `a` diff --git a/src/test/ui/nll/closure-use-spans.rs b/src/test/ui/nll/closure-use-spans.rs index 7ab382a96bbb4..c7cd519cffbce 100644 --- a/src/test/ui/nll/closure-use-spans.rs +++ b/src/test/ui/nll/closure-use-spans.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // check that liveness due to a closure capture gives a special note #![feature(nll)] diff --git a/src/test/ui/nll/closure-use-spans.stderr b/src/test/ui/nll/closure-use-spans.stderr index 7e5f9621d0955..b2abfcacd0ea4 100644 --- a/src/test/ui/nll/closure-use-spans.stderr +++ b/src/test/ui/nll/closure-use-spans.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `x` because it is borrowed - --> $DIR/closure-use-spans.rs:17:5 + --> $DIR/closure-use-spans.rs:7:5 | LL | let y = &x; | -- borrow of `x` occurs here @@ -9,7 +9,7 @@ LL | || *y; | - borrow later captured here by closure error[E0506]: cannot assign to `x` because it is borrowed - --> $DIR/closure-use-spans.rs:23:5 + --> $DIR/closure-use-spans.rs:13:5 | LL | let y = &mut x; | ------ borrow of `x` occurs here @@ -19,7 +19,7 @@ LL | || *y = 1; | - borrow later captured here by closure error[E0506]: cannot assign to `x` because it is borrowed - --> $DIR/closure-use-spans.rs:29:5 + --> $DIR/closure-use-spans.rs:19:5 | LL | let y = &x; | -- borrow of `x` occurs here diff --git a/src/test/ui/nll/closures-in-loops.rs b/src/test/ui/nll/closures-in-loops.rs index c6113f3a9c50a..d2afa564734c8 100644 --- a/src/test/ui/nll/closures-in-loops.rs +++ b/src/test/ui/nll/closures-in-loops.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test messages where a closure capture conflicts with itself because it's in // a loop. diff --git a/src/test/ui/nll/closures-in-loops.stderr b/src/test/ui/nll/closures-in-loops.stderr index 9758a80362000..23ad6013f69d2 100644 --- a/src/test/ui/nll/closures-in-loops.stderr +++ b/src/test/ui/nll/closures-in-loops.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `x` - --> $DIR/closures-in-loops.rs:18:9 + --> $DIR/closures-in-loops.rs:8:9 | LL | || x; //~ ERROR | ^^ - use occurs due to use in closure @@ -9,7 +9,7 @@ LL | || x; //~ ERROR = note: move occurs because `x` has type `std::string::String`, which does not implement the `Copy` trait error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/closures-in-loops.rs:25:16 + --> $DIR/closures-in-loops.rs:15:16 | LL | v.push(|| x = String::new()); //~ ERROR | ^^ - borrows occur due to use of `x` in closure @@ -17,7 +17,7 @@ LL | v.push(|| x = String::new()); //~ ERROR | mutable borrow starts here in previous iteration of loop error[E0524]: two closures require unique access to `x` at the same time - --> $DIR/closures-in-loops.rs:32:16 + --> $DIR/closures-in-loops.rs:22:16 | LL | v.push(|| *x = String::new()); //~ ERROR | ^^ - borrows occur due to use of `x` in closure diff --git a/src/test/ui/nll/constant-thread-locals-issue-47053.rs b/src/test/ui/nll/constant-thread-locals-issue-47053.rs index 7b1dd9265af0d..4dd01410c5e4d 100644 --- a/src/test/ui/nll/constant-thread-locals-issue-47053.rs +++ b/src/test/ui/nll/constant-thread-locals-issue-47053.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #47053 #![feature(nll)] diff --git a/src/test/ui/nll/constant-thread-locals-issue-47053.stderr b/src/test/ui/nll/constant-thread-locals-issue-47053.stderr index 3aa95fcad0156..77cffbfa72d26 100644 --- a/src/test/ui/nll/constant-thread-locals-issue-47053.stderr +++ b/src/test/ui/nll/constant-thread-locals-issue-47053.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to immutable static item `FOO` - --> $DIR/constant-thread-locals-issue-47053.rs:20:5 + --> $DIR/constant-thread-locals-issue-47053.rs:10:5 | LL | FOO = 6; //~ ERROR cannot assign to immutable static item `FOO` [E0594] | ^^^^^^^ cannot assign diff --git a/src/test/ui/nll/constant.rs b/src/test/ui/nll/constant.rs index 6e2c0ae7bba50..2bc40fcb32783 100644 --- a/src/test/ui/nll/constant.rs +++ b/src/test/ui/nll/constant.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that MIR borrowck and NLL analysis can handle constants of // arbitrary types without ICEs. diff --git a/src/test/ui/nll/decl-macro-illegal-copy.rs b/src/test/ui/nll/decl-macro-illegal-copy.rs index 1525791c88112..38bdb7dd270f8 100644 --- a/src/test/ui/nll/decl-macro-illegal-copy.rs +++ b/src/test/ui/nll/decl-macro-illegal-copy.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #46314 #![feature(nll)] diff --git a/src/test/ui/nll/decl-macro-illegal-copy.stderr b/src/test/ui/nll/decl-macro-illegal-copy.stderr index 8bc25c23e0178..9232ff52393e1 100644 --- a/src/test/ui/nll/decl-macro-illegal-copy.stderr +++ b/src/test/ui/nll/decl-macro-illegal-copy.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `wrapper.inner` - --> $DIR/decl-macro-illegal-copy.rs:32:9 + --> $DIR/decl-macro-illegal-copy.rs:22:9 | LL | $wrapper.inner | -------------- value moved here diff --git a/src/test/ui/nll/do-not-ignore-lifetime-bounds-in-copy.rs b/src/test/ui/nll/do-not-ignore-lifetime-bounds-in-copy.rs index 2a4295fd90a26..2a1321c25510f 100644 --- a/src/test/ui/nll/do-not-ignore-lifetime-bounds-in-copy.rs +++ b/src/test/ui/nll/do-not-ignore-lifetime-bounds-in-copy.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the 'static bound from the Copy impl is respected. Regression test for #29149. #![feature(nll)] diff --git a/src/test/ui/nll/do-not-ignore-lifetime-bounds-in-copy.stderr b/src/test/ui/nll/do-not-ignore-lifetime-bounds-in-copy.stderr index edf32d3d22318..61a729889817e 100644 --- a/src/test/ui/nll/do-not-ignore-lifetime-bounds-in-copy.stderr +++ b/src/test/ui/nll/do-not-ignore-lifetime-bounds-in-copy.stderr @@ -1,5 +1,5 @@ error[E0597]: `s` does not live long enough - --> $DIR/do-not-ignore-lifetime-bounds-in-copy.rs:20:17 + --> $DIR/do-not-ignore-lifetime-bounds-in-copy.rs:10:17 | LL | let a = Foo(&s); //~ ERROR `s` does not live long enough [E0597] | ^^ borrowed value does not live long enough diff --git a/src/test/ui/nll/drop-may-dangle.rs b/src/test/ui/nll/drop-may-dangle.rs index b357b3facf9bb..5c72225b11f0f 100644 --- a/src/test/ui/nll/drop-may-dangle.rs +++ b/src/test/ui/nll/drop-may-dangle.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Basic test for liveness constraints: the region (`R1`) that appears // in the type of `p` includes the points after `&v[0]` up to (but not // including) the call to `use_x`. The `else` branch is not included. diff --git a/src/test/ui/nll/drop-no-may-dangle.rs b/src/test/ui/nll/drop-no-may-dangle.rs index 513609316311a..e3659a2f2f66f 100644 --- a/src/test/ui/nll/drop-no-may-dangle.rs +++ b/src/test/ui/nll/drop-no-may-dangle.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Basic test for liveness constraints: the region (`R1`) that appears // in the type of `p` must include everything until `p` is dropped // because of destructor. (Note that the stderr also identifies this diff --git a/src/test/ui/nll/drop-no-may-dangle.stderr b/src/test/ui/nll/drop-no-may-dangle.stderr index a35271bdcfeff..a4ee147125d21 100644 --- a/src/test/ui/nll/drop-no-may-dangle.stderr +++ b/src/test/ui/nll/drop-no-may-dangle.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `v[..]` because it is borrowed - --> $DIR/drop-no-may-dangle.rs:30:9 + --> $DIR/drop-no-may-dangle.rs:20:9 | LL | let p: WrapMayNotDangle<&usize> = WrapMayNotDangle { value: &v[0] }; | ----- borrow of `v[..]` occurs here @@ -11,7 +11,7 @@ LL | } | - borrow later used here, when `p` is dropped error[E0506]: cannot assign to `v[..]` because it is borrowed - --> $DIR/drop-no-may-dangle.rs:33:5 + --> $DIR/drop-no-may-dangle.rs:23:5 | LL | let p: WrapMayNotDangle<&usize> = WrapMayNotDangle { value: &v[0] }; | ----- borrow of `v[..]` occurs here diff --git a/src/test/ui/nll/extra-unused-mut.rs b/src/test/ui/nll/extra-unused-mut.rs index 472ac2cf1e84c..d5f0b0ddf18bf 100644 --- a/src/test/ui/nll/extra-unused-mut.rs +++ b/src/test/ui/nll/extra-unused-mut.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // extra unused mut lint tests for #51918 // run-pass diff --git a/src/test/ui/nll/generator-distinct-lifetime.rs b/src/test/ui/nll/generator-distinct-lifetime.rs index 64f98456991fd..d479a61baa22b 100644 --- a/src/test/ui/nll/generator-distinct-lifetime.rs +++ b/src/test/ui/nll/generator-distinct-lifetime.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators, nll)] // Test for issue #47189. Here, both `s` and `t` are live for the diff --git a/src/test/ui/nll/generator-upvar-mutability.rs b/src/test/ui/nll/generator-upvar-mutability.rs index a32e076cb93a5..fe4bc6bce1b31 100644 --- a/src/test/ui/nll/generator-upvar-mutability.rs +++ b/src/test/ui/nll/generator-upvar-mutability.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that generators respect the muatability of their upvars. #![feature(generators, nll)] diff --git a/src/test/ui/nll/generator-upvar-mutability.stderr b/src/test/ui/nll/generator-upvar-mutability.stderr index 180a330a30e74..31b061b61d19d 100644 --- a/src/test/ui/nll/generator-upvar-mutability.stderr +++ b/src/test/ui/nll/generator-upvar-mutability.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to `x`, as it is not declared as mutable - --> $DIR/generator-upvar-mutability.rs:18:9 + --> $DIR/generator-upvar-mutability.rs:8:9 | LL | let x = 0; | - help: consider changing this to be mutable: `mut x` diff --git a/src/test/ui/nll/get_default.nll.stderr b/src/test/ui/nll/get_default.nll.stderr index 580dce3c0fe63..3b8e7bc018075 100644 --- a/src/test/ui/nll/get_default.nll.stderr +++ b/src/test/ui/nll/get_default.nll.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `*map` as mutable because it is also borrowed as immutable (Ast) - --> $DIR/get_default.rs:33:17 + --> $DIR/get_default.rs:23:17 | LL | match map.get() { | --- immutable borrow occurs here @@ -11,7 +11,7 @@ LL | } | - immutable borrow ends here error[E0502]: cannot borrow `*map` as mutable because it is also borrowed as immutable (Ast) - --> $DIR/get_default.rs:45:17 + --> $DIR/get_default.rs:35:17 | LL | match map.get() { | --- immutable borrow occurs here @@ -23,7 +23,7 @@ LL | } | - immutable borrow ends here error[E0502]: cannot borrow `*map` as mutable because it is also borrowed as immutable (Ast) - --> $DIR/get_default.rs:51:17 + --> $DIR/get_default.rs:41:17 | LL | match map.get() { | --- immutable borrow occurs here @@ -35,7 +35,7 @@ LL | } | - immutable borrow ends here error[E0502]: cannot borrow `*map` as mutable because it is also borrowed as immutable (Mir) - --> $DIR/get_default.rs:33:17 + --> $DIR/get_default.rs:23:17 | LL | match map.get() { | --- immutable borrow occurs here @@ -43,8 +43,8 @@ LL | match map.get() { LL | map.set(String::new()); // Ideally, this would not error. | ^^^^^^^^^^^^^^^^^^^^^^ mutable borrow occurs here | -note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 26:1... - --> $DIR/get_default.rs:26:1 +note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 16:1... + --> $DIR/get_default.rs:16:1 | LL | / fn ok(map: &mut Map) -> &String { LL | | loop { @@ -56,7 +56,7 @@ LL | | } | |_^ error[E0502]: cannot borrow `*map` as mutable because it is also borrowed as immutable (Mir) - --> $DIR/get_default.rs:45:17 + --> $DIR/get_default.rs:35:17 | LL | match map.get() { | --- immutable borrow occurs here @@ -64,8 +64,8 @@ LL | Some(v) => { LL | map.set(String::new()); // Both AST and MIR error here | ^^^^^^^^^^^^^^^^^^^^^^ mutable borrow occurs here | -note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 41:1... - --> $DIR/get_default.rs:41:1 +note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 31:1... + --> $DIR/get_default.rs:31:1 | LL | / fn err(map: &mut Map) -> &String { LL | | loop { @@ -77,7 +77,7 @@ LL | | } | |_^ error[E0502]: cannot borrow `*map` as mutable because it is also borrowed as immutable (Mir) - --> $DIR/get_default.rs:51:17 + --> $DIR/get_default.rs:41:17 | LL | match map.get() { | --- immutable borrow occurs here @@ -85,8 +85,8 @@ LL | match map.get() { LL | map.set(String::new()); // Ideally, just AST would error here | ^^^^^^^^^^^^^^^^^^^^^^ mutable borrow occurs here | -note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 41:1... - --> $DIR/get_default.rs:41:1 +note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 31:1... + --> $DIR/get_default.rs:31:1 | LL | / fn err(map: &mut Map) -> &String { LL | | loop { diff --git a/src/test/ui/nll/get_default.rs b/src/test/ui/nll/get_default.rs index 1a417b1e28c2e..89f693bfb654e 100644 --- a/src/test/ui/nll/get_default.rs +++ b/src/test/ui/nll/get_default.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Basic test for free regions in the NLL code. This test ought to // report an error due to a reborrowing constraint. Right now, we get // a variety of errors from the older, AST-based machinery (notably diff --git a/src/test/ui/nll/get_default.stderr b/src/test/ui/nll/get_default.stderr index 2f8eab907c7bb..fb5bd6f6de943 100644 --- a/src/test/ui/nll/get_default.stderr +++ b/src/test/ui/nll/get_default.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `*map` as mutable because it is also borrowed as immutable (Ast) - --> $DIR/get_default.rs:33:17 + --> $DIR/get_default.rs:23:17 | LL | match map.get() { | --- immutable borrow occurs here @@ -11,7 +11,7 @@ LL | } | - immutable borrow ends here error[E0502]: cannot borrow `*map` as mutable because it is also borrowed as immutable (Ast) - --> $DIR/get_default.rs:45:17 + --> $DIR/get_default.rs:35:17 | LL | match map.get() { | --- immutable borrow occurs here @@ -23,7 +23,7 @@ LL | } | - immutable borrow ends here error[E0502]: cannot borrow `*map` as mutable because it is also borrowed as immutable (Ast) - --> $DIR/get_default.rs:51:17 + --> $DIR/get_default.rs:41:17 | LL | match map.get() { | --- immutable borrow occurs here @@ -35,7 +35,7 @@ LL | } | - immutable borrow ends here error[E0502]: cannot borrow `*map` as mutable because it is also borrowed as immutable (Mir) - --> $DIR/get_default.rs:33:17 + --> $DIR/get_default.rs:23:17 | LL | match map.get() { | --- immutable borrow occurs here @@ -43,8 +43,8 @@ LL | match map.get() { LL | map.set(String::new()); // Ideally, this would not error. | ^^^ mutable borrow occurs here | -note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 26:1... - --> $DIR/get_default.rs:26:1 +note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 16:1... + --> $DIR/get_default.rs:16:1 | LL | / fn ok(map: &mut Map) -> &String { LL | | loop { @@ -56,7 +56,7 @@ LL | | } | |_^ error[E0502]: cannot borrow `*map` as mutable because it is also borrowed as immutable (Mir) - --> $DIR/get_default.rs:45:17 + --> $DIR/get_default.rs:35:17 | LL | match map.get() { | --- immutable borrow occurs here @@ -64,8 +64,8 @@ LL | Some(v) => { LL | map.set(String::new()); // Both AST and MIR error here | ^^^ mutable borrow occurs here | -note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 41:1... - --> $DIR/get_default.rs:41:1 +note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 31:1... + --> $DIR/get_default.rs:31:1 | LL | / fn err(map: &mut Map) -> &String { LL | | loop { @@ -77,7 +77,7 @@ LL | | } | |_^ error[E0502]: cannot borrow `*map` as mutable because it is also borrowed as immutable (Mir) - --> $DIR/get_default.rs:51:17 + --> $DIR/get_default.rs:41:17 | LL | match map.get() { | --- immutable borrow occurs here @@ -85,8 +85,8 @@ LL | match map.get() { LL | map.set(String::new()); // Ideally, just AST would error here | ^^^ mutable borrow occurs here | -note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 41:1... - --> $DIR/get_default.rs:41:1 +note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 31:1... + --> $DIR/get_default.rs:31:1 | LL | / fn err(map: &mut Map) -> &String { LL | | loop { diff --git a/src/test/ui/nll/guarantor-issue-46974.rs b/src/test/ui/nll/guarantor-issue-46974.rs index 09ce42ce1b551..d0af468cff6cd 100644 --- a/src/test/ui/nll/guarantor-issue-46974.rs +++ b/src/test/ui/nll/guarantor-issue-46974.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that NLL analysis propagates lifetimes correctly through // field accesses, Box accesses, etc. diff --git a/src/test/ui/nll/guarantor-issue-46974.stderr b/src/test/ui/nll/guarantor-issue-46974.stderr index 6fc4812998681..b2ed4c8fcab7f 100644 --- a/src/test/ui/nll/guarantor-issue-46974.stderr +++ b/src/test/ui/nll/guarantor-issue-46974.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `*s` because it is borrowed - --> $DIR/guarantor-issue-46974.rs:19:5 + --> $DIR/guarantor-issue-46974.rs:9:5 | LL | let t = &mut *s; // this borrow should last for the entire function | ------- borrow of `*s` occurs here @@ -10,7 +10,7 @@ LL | *x | -- borrow later used here error[E0621]: explicit lifetime required in the type of `s` - --> $DIR/guarantor-issue-46974.rs:25:5 + --> $DIR/guarantor-issue-46974.rs:15:5 | LL | fn bar(s: &Box<(i32,)>) -> &'static i32 { | ------------ help: add explicit lifetime `'static` to the type of `s`: `&'static std::boxed::Box<(i32,)>` diff --git a/src/test/ui/nll/issue-16223.rs b/src/test/ui/nll/issue-16223.rs index b41376ef443d4..881e202acf8d3 100644 --- a/src/test/ui/nll/issue-16223.rs +++ b/src/test/ui/nll/issue-16223.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #16223: without NLL the `if let` construct together with // the nested box-structure of `Root` causes an unwanted collateral move. diff --git a/src/test/ui/nll/issue-27868.rs b/src/test/ui/nll/issue-27868.rs index 022917a5556e6..b5cf20bc9f965 100644 --- a/src/test/ui/nll/issue-27868.rs +++ b/src/test/ui/nll/issue-27868.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #27868 #![feature(nll)] diff --git a/src/test/ui/nll/issue-27868.stderr b/src/test/ui/nll/issue-27868.stderr index a376829e37b8c..4cbd74fe272d4 100644 --- a/src/test/ui/nll/issue-27868.stderr +++ b/src/test/ui/nll/issue-27868.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `vecvec` because it is borrowed - --> $DIR/issue-27868.rs:36:9 + --> $DIR/issue-27868.rs:26:9 | LL | vecvec[0] += { | ------ diff --git a/src/test/ui/nll/issue-30104.rs b/src/test/ui/nll/issue-30104.rs index 64c32a55d0496..88e49bf8df70d 100644 --- a/src/test/ui/nll/issue-30104.rs +++ b/src/test/ui/nll/issue-30104.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #30104 // compile-pass diff --git a/src/test/ui/nll/issue-31567.rs b/src/test/ui/nll/issue-31567.rs index a0d1faf1f0e84..18c617abefc10 100644 --- a/src/test/ui/nll/issue-31567.rs +++ b/src/test/ui/nll/issue-31567.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #31567: cached results of projections were // causing region relations not to be enforced at all the places where // they have to be enforced. diff --git a/src/test/ui/nll/issue-31567.stderr b/src/test/ui/nll/issue-31567.stderr index 532bc493e7dbc..a91951cae2399 100644 --- a/src/test/ui/nll/issue-31567.stderr +++ b/src/test/ui/nll/issue-31567.stderr @@ -1,5 +1,5 @@ error[E0597]: `*v.0` does not live long enough - --> $DIR/issue-31567.rs:22:26 + --> $DIR/issue-31567.rs:12:26 | LL | let s_inner: &'a S = &*v.0; //~ ERROR `*v.0` does not live long enough | ^^^^^ borrowed value does not live long enough @@ -7,8 +7,8 @@ LL | &s_inner.0 LL | } | - `*v.0` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 21:17... - --> $DIR/issue-31567.rs:21:17 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 11:17... + --> $DIR/issue-31567.rs:11:17 | LL | fn get_dangling<'a>(v: VecWrapper<'a>) -> &'a u32 { | ^^ diff --git a/src/test/ui/nll/issue-43058.rs b/src/test/ui/nll/issue-43058.rs index aeb81636daf1f..c5bae7a12d7e7 100644 --- a/src/test/ui/nll/issue-43058.rs +++ b/src/test/ui/nll/issue-43058.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![feature(nll)] diff --git a/src/test/ui/nll/issue-47022.rs b/src/test/ui/nll/issue-47022.rs index 685823b25c6cf..c0f8efa24981c 100644 --- a/src/test/ui/nll/issue-47022.rs +++ b/src/test/ui/nll/issue-47022.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![allow(warnings)] diff --git a/src/test/ui/nll/issue-47388.rs b/src/test/ui/nll/issue-47388.rs index 39feea08aa489..df47baa3c17f0 100644 --- a/src/test/ui/nll/issue-47388.rs +++ b/src/test/ui/nll/issue-47388.rs @@ -1,12 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![feature(nll)] struct FancyNum { num: u8, diff --git a/src/test/ui/nll/issue-47388.stderr b/src/test/ui/nll/issue-47388.stderr index 96e9f15541447..dda324c2e9890 100644 --- a/src/test/ui/nll/issue-47388.stderr +++ b/src/test/ui/nll/issue-47388.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to `fancy_ref.num` which is behind a `&` reference - --> $DIR/issue-47388.rs:18:5 + --> $DIR/issue-47388.rs:9:5 | LL | let fancy_ref = &(&mut fancy); | ------------- help: consider changing this to be a mutable reference: `&mut (&mut fancy)` diff --git a/src/test/ui/nll/issue-47470.rs b/src/test/ui/nll/issue-47470.rs index c962f193cd5b0..bb74c9f37ebb2 100644 --- a/src/test/ui/nll/issue-47470.rs +++ b/src/test/ui/nll/issue-47470.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #47470: cached results of projections were // causing region relations not to be enforced at all the places where // they have to be enforced. diff --git a/src/test/ui/nll/issue-47470.stderr b/src/test/ui/nll/issue-47470.stderr index e73df61a30371..323b17751c3e8 100644 --- a/src/test/ui/nll/issue-47470.stderr +++ b/src/test/ui/nll/issue-47470.stderr @@ -1,13 +1,13 @@ error[E0597]: `local` does not live long enough - --> $DIR/issue-47470.rs:27:9 + --> $DIR/issue-47470.rs:17:9 | LL | &local //~ ERROR `local` does not live long enough | ^^^^^^ borrowed value does not live long enough LL | } | - `local` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the impl at 23:6... - --> $DIR/issue-47470.rs:23:6 +note: borrowed value must be valid for the lifetime 'a as defined on the impl at 13:6... + --> $DIR/issue-47470.rs:13:6 | LL | impl<'a> Bar for Foo<'a> { | ^^ diff --git a/src/test/ui/nll/issue-48070.rs b/src/test/ui/nll/issue-48070.rs index 71d92c3702e63..c69bd3dbe90a5 100644 --- a/src/test/ui/nll/issue-48070.rs +++ b/src/test/ui/nll/issue-48070.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass // revisions: lxl nll diff --git a/src/test/ui/nll/issue-48238.rs b/src/test/ui/nll/issue-48238.rs index 7c5527ae1e7b1..2e64ea72db28b 100644 --- a/src/test/ui/nll/issue-48238.rs +++ b/src/test/ui/nll/issue-48238.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #48238 #![feature(nll)] diff --git a/src/test/ui/nll/issue-48238.stderr b/src/test/ui/nll/issue-48238.stderr index a48516efdc21b..913effa1c93c0 100644 --- a/src/test/ui/nll/issue-48238.stderr +++ b/src/test/ui/nll/issue-48238.stderr @@ -1,5 +1,5 @@ error: unsatisfied lifetime constraints - --> $DIR/issue-48238.rs:21:13 + --> $DIR/issue-48238.rs:11:13 | LL | move || use_val(&orig); //~ ERROR | ------- ^^^^^^^^^^^^^^ returning this value requires that `'1` must outlive `'2` diff --git a/src/test/ui/nll/issue-48697.rs b/src/test/ui/nll/issue-48697.rs index 69ff82e16a1bf..c60c265b813b8 100644 --- a/src/test/ui/nll/issue-48697.rs +++ b/src/test/ui/nll/issue-48697.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #48697 // compile-pass diff --git a/src/test/ui/nll/issue-50716-1.rs b/src/test/ui/nll/issue-50716-1.rs index ced9b1cde6483..db7e6b30f2718 100644 --- a/src/test/ui/nll/issue-50716-1.rs +++ b/src/test/ui/nll/issue-50716-1.rs @@ -1,12 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // An additional regression test for the issue #50716 “NLL ignores lifetimes // bounds derived from `Sized` requirements” that checks that the fixed compiler diff --git a/src/test/ui/nll/issue-50716.rs b/src/test/ui/nll/issue-50716.rs index beb2ff79e902b..ce4bee366567c 100644 --- a/src/test/ui/nll/issue-50716.rs +++ b/src/test/ui/nll/issue-50716.rs @@ -1,12 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // Regression test for the issue #50716: NLL ignores lifetimes bounds // derived from `Sized` requirements diff --git a/src/test/ui/nll/issue-50716.stderr b/src/test/ui/nll/issue-50716.stderr index f12ab9b4f9602..cf6d3d0029a4c 100644 --- a/src/test/ui/nll/issue-50716.stderr +++ b/src/test/ui/nll/issue-50716.stderr @@ -1,5 +1,5 @@ error: borrowed data escapes outside of function - --> $DIR/issue-50716.rs:25:14 + --> $DIR/issue-50716.rs:16:14 | LL | fn foo<'a, T: 'static>(s: Box<<&'a T as A>::X>) | - `s` is a reference that is only valid in the function body diff --git a/src/test/ui/nll/issue-51244.rs b/src/test/ui/nll/issue-51244.rs index f00ad3d6505be..aaf98ddfa2777 100644 --- a/src/test/ui/nll/issue-51244.rs +++ b/src/test/ui/nll/issue-51244.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] fn main() { diff --git a/src/test/ui/nll/issue-51244.stderr b/src/test/ui/nll/issue-51244.stderr index 4e04aec8fe1af..69efb2ca84751 100644 --- a/src/test/ui/nll/issue-51244.stderr +++ b/src/test/ui/nll/issue-51244.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to `*my_ref` which is behind a `&` reference - --> $DIR/issue-51244.rs:15:5 + --> $DIR/issue-51244.rs:5:5 | LL | let ref my_ref @ _ = 0; | -------------- help: consider changing this to be a mutable reference: `ref mut my_ref @ _` diff --git a/src/test/ui/nll/issue-51268.rs b/src/test/ui/nll/issue-51268.rs index 6edd4a343c2cb..c14146a3de2a1 100644 --- a/src/test/ui/nll/issue-51268.rs +++ b/src/test/ui/nll/issue-51268.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength #![feature(nll)] diff --git a/src/test/ui/nll/issue-51268.stderr b/src/test/ui/nll/issue-51268.stderr index 2ecfe03e7de62..9f6c6421d16b7 100644 --- a/src/test/ui/nll/issue-51268.stderr +++ b/src/test/ui/nll/issue-51268.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `self.thing` as mutable because it is also borrowed as immutable - --> $DIR/issue-51268.rs:28:9 + --> $DIR/issue-51268.rs:18:9 | LL | self.thing.bar(|| { | ^ -- immutable borrow occurs here diff --git a/src/test/ui/nll/issue-51351.rs b/src/test/ui/nll/issue-51351.rs index 62cc3f9692b2a..939993f154f8f 100644 --- a/src/test/ui/nll/issue-51351.rs +++ b/src/test/ui/nll/issue-51351.rs @@ -1,12 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // Regression test for #51351 and #52133: In the case of #51351, // late-bound regions (like 'a) that were unused within the arguments of diff --git a/src/test/ui/nll/issue-51512.rs b/src/test/ui/nll/issue-51512.rs index 4543d2ba638c4..a25059a80778b 100644 --- a/src/test/ui/nll/issue-51512.rs +++ b/src/test/ui/nll/issue-51512.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(warnings)] #![feature(nll)] diff --git a/src/test/ui/nll/issue-51512.stderr b/src/test/ui/nll/issue-51512.stderr index 102de43e5d710..c2617f21d67e7 100644 --- a/src/test/ui/nll/issue-51512.stderr +++ b/src/test/ui/nll/issue-51512.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `range.start` - --> $DIR/issue-51512.rs:17:13 + --> $DIR/issue-51512.rs:7:13 | LL | let r = range; | ----- value moved here diff --git a/src/test/ui/nll/issue-52078.rs b/src/test/ui/nll/issue-52078.rs index 1fd00db536cf6..ebe442adbd945 100644 --- a/src/test/ui/nll/issue-52078.rs +++ b/src/test/ui/nll/issue-52078.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] #![allow(unused_variables)] diff --git a/src/test/ui/nll/issue-52113.rs b/src/test/ui/nll/issue-52113.rs index e484c249d84a5..65571ece77dad 100644 --- a/src/test/ui/nll/issue-52113.rs +++ b/src/test/ui/nll/issue-52113.rs @@ -1,12 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // #![allow(warnings)] diff --git a/src/test/ui/nll/issue-52113.stderr b/src/test/ui/nll/issue-52113.stderr index b21539361e66f..62d7e06e9eb9d 100644 --- a/src/test/ui/nll/issue-52113.stderr +++ b/src/test/ui/nll/issue-52113.stderr @@ -1,5 +1,5 @@ error: unsatisfied lifetime constraints - --> $DIR/issue-52113.rs:43:9 + --> $DIR/issue-52113.rs:34:9 | LL | fn produce_err<'a, 'b: 'a>(data: &'b mut Vec<&'b u32>, value: &'a u32) -> impl Bazinga + 'b { | -- -- lifetime `'b` defined here diff --git a/src/test/ui/nll/issue-52663-span-decl-captured-variable.rs b/src/test/ui/nll/issue-52663-span-decl-captured-variable.rs index dc40b0c44fd02..3e57d26745a95 100644 --- a/src/test/ui/nll/issue-52663-span-decl-captured-variable.rs +++ b/src/test/ui/nll/issue-52663-span-decl-captured-variable.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] fn expect_fn(f: F) where F : Fn() { diff --git a/src/test/ui/nll/issue-52663-span-decl-captured-variable.stderr b/src/test/ui/nll/issue-52663-span-decl-captured-variable.stderr index 51f19565855a7..0162c6bcbd1ec 100644 --- a/src/test/ui/nll/issue-52663-span-decl-captured-variable.stderr +++ b/src/test/ui/nll/issue-52663-span-decl-captured-variable.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of captured variable in an `Fn` closure - --> $DIR/issue-52663-span-decl-captured-variable.rs:20:26 + --> $DIR/issue-52663-span-decl-captured-variable.rs:10:26 | LL | let x = (vec![22], vec![44]); | - captured outer variable diff --git a/src/test/ui/nll/issue-52742.rs b/src/test/ui/nll/issue-52742.rs index c36e4cc70fd58..9f9bd51603fe1 100644 --- a/src/test/ui/nll/issue-52742.rs +++ b/src/test/ui/nll/issue-52742.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] #![feature(in_band_lifetimes)] #![feature(impl_header_lifetime_elision)] diff --git a/src/test/ui/nll/issue-52742.stderr b/src/test/ui/nll/issue-52742.stderr index 515ba55cf6f5b..82c1c657dc4b9 100644 --- a/src/test/ui/nll/issue-52742.stderr +++ b/src/test/ui/nll/issue-52742.stderr @@ -1,5 +1,5 @@ error: unsatisfied lifetime constraints - --> $DIR/issue-52742.rs:26:9 + --> $DIR/issue-52742.rs:16:9 | LL | fn take_bar(&mut self, b: Bar<'_>) { | --------- -- let's call this `'1` diff --git a/src/test/ui/nll/issue-53119.rs b/src/test/ui/nll/issue-53119.rs index bbef4cf345571..97e05c8810d09 100644 --- a/src/test/ui/nll/issue-53119.rs +++ b/src/test/ui/nll/issue-53119.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![feature(nll)] diff --git a/src/test/ui/nll/loan_ends_mid_block_pair.rs b/src/test/ui/nll/loan_ends_mid_block_pair.rs index 97126e98cbf3a..8ff1f1d4391d6 100644 --- a/src/test/ui/nll/loan_ends_mid_block_pair.rs +++ b/src/test/ui/nll/loan_ends_mid_block_pair.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // compile-flags:-Zborrowck=compare #![allow(warnings)] diff --git a/src/test/ui/nll/loan_ends_mid_block_pair.stderr b/src/test/ui/nll/loan_ends_mid_block_pair.stderr index 9afae71edbe11..4ee131296b541 100644 --- a/src/test/ui/nll/loan_ends_mid_block_pair.stderr +++ b/src/test/ui/nll/loan_ends_mid_block_pair.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `data.0` because it is borrowed (Ast) - --> $DIR/loan_ends_mid_block_pair.rs:25:5 + --> $DIR/loan_ends_mid_block_pair.rs:14:5 | LL | let c = &mut data.0; | ------ borrow of `data.0` occurs here @@ -8,7 +8,7 @@ LL | data.0 = 'e'; | ^^^^^^^^^^^^ assignment to borrowed `data.0` occurs here error[E0506]: cannot assign to `data.0` because it is borrowed (Ast) - --> $DIR/loan_ends_mid_block_pair.rs:28:5 + --> $DIR/loan_ends_mid_block_pair.rs:17:5 | LL | let c = &mut data.0; | ------ borrow of `data.0` occurs here @@ -17,7 +17,7 @@ LL | data.0 = 'f'; | ^^^^^^^^^^^^ assignment to borrowed `data.0` occurs here error[E0506]: cannot assign to `data.0` because it is borrowed (Ast) - --> $DIR/loan_ends_mid_block_pair.rs:31:5 + --> $DIR/loan_ends_mid_block_pair.rs:20:5 | LL | let c = &mut data.0; | ------ borrow of `data.0` occurs here @@ -26,7 +26,7 @@ LL | data.0 = 'g'; | ^^^^^^^^^^^^ assignment to borrowed `data.0` occurs here error[E0506]: cannot assign to `data.0` because it is borrowed (Ast) - --> $DIR/loan_ends_mid_block_pair.rs:41:5 + --> $DIR/loan_ends_mid_block_pair.rs:30:5 | LL | let c = &mut data.0; | ------ borrow of `data.0` occurs here @@ -35,7 +35,7 @@ LL | data.0 = 'e'; | ^^^^^^^^^^^^ assignment to borrowed `data.0` occurs here error[E0506]: cannot assign to `data.0` because it is borrowed (Ast) - --> $DIR/loan_ends_mid_block_pair.rs:43:5 + --> $DIR/loan_ends_mid_block_pair.rs:32:5 | LL | let c = &mut data.0; | ------ borrow of `data.0` occurs here @@ -44,7 +44,7 @@ LL | data.0 = 'f'; | ^^^^^^^^^^^^ assignment to borrowed `data.0` occurs here error[E0506]: cannot assign to `data.0` because it is borrowed (Ast) - --> $DIR/loan_ends_mid_block_pair.rs:45:5 + --> $DIR/loan_ends_mid_block_pair.rs:34:5 | LL | let c = &mut data.0; | ------ borrow of `data.0` occurs here @@ -53,7 +53,7 @@ LL | data.0 = 'g'; | ^^^^^^^^^^^^ assignment to borrowed `data.0` occurs here error[E0506]: cannot assign to `data.0` because it is borrowed (Mir) - --> $DIR/loan_ends_mid_block_pair.rs:25:5 + --> $DIR/loan_ends_mid_block_pair.rs:14:5 | LL | let c = &mut data.0; | ----------- borrow of `data.0` occurs here @@ -65,7 +65,7 @@ LL | capitalize(c); | - borrow later used here error[E0506]: cannot assign to `data.0` because it is borrowed (Mir) - --> $DIR/loan_ends_mid_block_pair.rs:28:5 + --> $DIR/loan_ends_mid_block_pair.rs:17:5 | LL | let c = &mut data.0; | ----------- borrow of `data.0` occurs here @@ -77,7 +77,7 @@ LL | capitalize(c); | - borrow later used here error[E0506]: cannot assign to `data.0` because it is borrowed (Mir) - --> $DIR/loan_ends_mid_block_pair.rs:31:5 + --> $DIR/loan_ends_mid_block_pair.rs:20:5 | LL | let c = &mut data.0; | ----------- borrow of `data.0` occurs here diff --git a/src/test/ui/nll/loan_ends_mid_block_vec.rs b/src/test/ui/nll/loan_ends_mid_block_vec.rs index b5357d0ee827c..682e7e3e96fee 100644 --- a/src/test/ui/nll/loan_ends_mid_block_vec.rs +++ b/src/test/ui/nll/loan_ends_mid_block_vec.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // compile-flags:-Zborrowck=compare #![allow(warnings)] diff --git a/src/test/ui/nll/loan_ends_mid_block_vec.stderr b/src/test/ui/nll/loan_ends_mid_block_vec.stderr index 4c739cfe978f9..08294b4ba15e1 100644 --- a/src/test/ui/nll/loan_ends_mid_block_vec.stderr +++ b/src/test/ui/nll/loan_ends_mid_block_vec.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `data` as mutable more than once at a time (Ast) - --> $DIR/loan_ends_mid_block_vec.rs:24:5 + --> $DIR/loan_ends_mid_block_vec.rs:13:5 | LL | let slice = &mut data; | ---- first mutable borrow occurs here @@ -11,7 +11,7 @@ LL | } | - first borrow ends here error[E0499]: cannot borrow `data` as mutable more than once at a time (Ast) - --> $DIR/loan_ends_mid_block_vec.rs:27:5 + --> $DIR/loan_ends_mid_block_vec.rs:16:5 | LL | let slice = &mut data; | ---- first mutable borrow occurs here @@ -23,7 +23,7 @@ LL | } | - first borrow ends here error[E0499]: cannot borrow `data` as mutable more than once at a time (Ast) - --> $DIR/loan_ends_mid_block_vec.rs:30:5 + --> $DIR/loan_ends_mid_block_vec.rs:19:5 | LL | let slice = &mut data; | ---- first mutable borrow occurs here @@ -35,7 +35,7 @@ LL | } | - first borrow ends here error[E0499]: cannot borrow `data` as mutable more than once at a time (Ast) - --> $DIR/loan_ends_mid_block_vec.rs:40:5 + --> $DIR/loan_ends_mid_block_vec.rs:29:5 | LL | let slice = &mut data; | ---- first mutable borrow occurs here @@ -47,7 +47,7 @@ LL | } | - first borrow ends here error[E0499]: cannot borrow `data` as mutable more than once at a time (Ast) - --> $DIR/loan_ends_mid_block_vec.rs:42:5 + --> $DIR/loan_ends_mid_block_vec.rs:31:5 | LL | let slice = &mut data; | ---- first mutable borrow occurs here @@ -59,7 +59,7 @@ LL | } | - first borrow ends here error[E0499]: cannot borrow `data` as mutable more than once at a time (Ast) - --> $DIR/loan_ends_mid_block_vec.rs:44:5 + --> $DIR/loan_ends_mid_block_vec.rs:33:5 | LL | let slice = &mut data; | ---- first mutable borrow occurs here @@ -71,7 +71,7 @@ LL | } | - first borrow ends here error[E0499]: cannot borrow `data` as mutable more than once at a time (Mir) - --> $DIR/loan_ends_mid_block_vec.rs:24:5 + --> $DIR/loan_ends_mid_block_vec.rs:13:5 | LL | let slice = &mut data; | --------- first mutable borrow occurs here @@ -83,7 +83,7 @@ LL | capitalize(slice); | ----- borrow later used here error[E0499]: cannot borrow `data` as mutable more than once at a time (Mir) - --> $DIR/loan_ends_mid_block_vec.rs:27:5 + --> $DIR/loan_ends_mid_block_vec.rs:16:5 | LL | let slice = &mut data; | --------- first mutable borrow occurs here @@ -95,7 +95,7 @@ LL | capitalize(slice); | ----- borrow later used here error[E0499]: cannot borrow `data` as mutable more than once at a time (Mir) - --> $DIR/loan_ends_mid_block_vec.rs:30:5 + --> $DIR/loan_ends_mid_block_vec.rs:19:5 | LL | let slice = &mut data; | --------- first mutable borrow occurs here diff --git a/src/test/ui/nll/match-guards-always-borrow.ast.nll.stderr b/src/test/ui/nll/match-guards-always-borrow.ast.nll.stderr index 54b1fcbd5bbf6..3e90c5a154259 100644 --- a/src/test/ui/nll/match-guards-always-borrow.ast.nll.stderr +++ b/src/test/ui/nll/match-guards-always-borrow.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/match-guards-always-borrow.rs:23:13 + --> $DIR/match-guards-always-borrow.rs:13:13 | LL | (|| { let bar = foo; bar.take() })(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of borrowed content diff --git a/src/test/ui/nll/match-guards-always-borrow.ast.stderr b/src/test/ui/nll/match-guards-always-borrow.ast.stderr index d6186d7561a59..92d76d577d55f 100644 --- a/src/test/ui/nll/match-guards-always-borrow.ast.stderr +++ b/src/test/ui/nll/match-guards-always-borrow.ast.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/match-guards-always-borrow.rs:57:1 + --> $DIR/match-guards-always-borrow.rs:47:1 | LL | / fn main() { //[ast]~ ERROR compilation successful LL | | should_reject_destructive_mutate_in_guard(); diff --git a/src/test/ui/nll/match-guards-always-borrow.mir.stderr b/src/test/ui/nll/match-guards-always-borrow.mir.stderr index 54b1fcbd5bbf6..3e90c5a154259 100644 --- a/src/test/ui/nll/match-guards-always-borrow.mir.stderr +++ b/src/test/ui/nll/match-guards-always-borrow.mir.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/match-guards-always-borrow.rs:23:13 + --> $DIR/match-guards-always-borrow.rs:13:13 | LL | (|| { let bar = foo; bar.take() })(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of borrowed content diff --git a/src/test/ui/nll/match-guards-always-borrow.rs b/src/test/ui/nll/match-guards-always-borrow.rs index 985531446270e..ec4eed6797600 100644 --- a/src/test/ui/nll/match-guards-always-borrow.rs +++ b/src/test/ui/nll/match-guards-always-borrow.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //revisions: ast mir //[mir] compile-flags: -Z borrowck=mir diff --git a/src/test/ui/nll/maybe-initialized-drop-implicit-fragment-drop.rs b/src/test/ui/nll/maybe-initialized-drop-implicit-fragment-drop.rs index 5538eca362974..424847a26d37a 100644 --- a/src/test/ui/nll/maybe-initialized-drop-implicit-fragment-drop.rs +++ b/src/test/ui/nll/maybe-initialized-drop-implicit-fragment-drop.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //compile-flags: -Z emit-end-regions -Zborrowck=mir diff --git a/src/test/ui/nll/maybe-initialized-drop-implicit-fragment-drop.stderr b/src/test/ui/nll/maybe-initialized-drop-implicit-fragment-drop.stderr index 327454ee60e53..58287112e6a5a 100644 --- a/src/test/ui/nll/maybe-initialized-drop-implicit-fragment-drop.stderr +++ b/src/test/ui/nll/maybe-initialized-drop-implicit-fragment-drop.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `x` because it is borrowed - --> $DIR/maybe-initialized-drop-implicit-fragment-drop.rs:32:5 + --> $DIR/maybe-initialized-drop-implicit-fragment-drop.rs:22:5 | LL | let wrap = Wrap { p: &mut x }; | ------ borrow of `x` occurs here diff --git a/src/test/ui/nll/maybe-initialized-drop-uninitialized.rs b/src/test/ui/nll/maybe-initialized-drop-uninitialized.rs index ae815a5efe97c..dd793132e6c9f 100644 --- a/src/test/ui/nll/maybe-initialized-drop-uninitialized.rs +++ b/src/test/ui/nll/maybe-initialized-drop-uninitialized.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z emit-end-regions -Zborrowck=mir // compile-pass diff --git a/src/test/ui/nll/maybe-initialized-drop-with-fragment.rs b/src/test/ui/nll/maybe-initialized-drop-with-fragment.rs index 00d146e0f02d6..04df0d7080812 100644 --- a/src/test/ui/nll/maybe-initialized-drop-with-fragment.rs +++ b/src/test/ui/nll/maybe-initialized-drop-with-fragment.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //compile-flags: -Z emit-end-regions -Zborrowck=mir #![allow(warnings)] diff --git a/src/test/ui/nll/maybe-initialized-drop-with-fragment.stderr b/src/test/ui/nll/maybe-initialized-drop-with-fragment.stderr index 54be12f289545..fad034b67fb3d 100644 --- a/src/test/ui/nll/maybe-initialized-drop-with-fragment.stderr +++ b/src/test/ui/nll/maybe-initialized-drop-with-fragment.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `x` because it is borrowed - --> $DIR/maybe-initialized-drop-with-fragment.rs:31:5 + --> $DIR/maybe-initialized-drop-with-fragment.rs:21:5 | LL | let wrap = Wrap { p: &mut x }; | ------ borrow of `x` occurs here diff --git a/src/test/ui/nll/maybe-initialized-drop-with-uninitialized-fragments.rs b/src/test/ui/nll/maybe-initialized-drop-with-uninitialized-fragments.rs index cd46014a7f5ca..a499419bdbf25 100644 --- a/src/test/ui/nll/maybe-initialized-drop-with-uninitialized-fragments.rs +++ b/src/test/ui/nll/maybe-initialized-drop-with-uninitialized-fragments.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //compile-flags: -Z emit-end-regions -Zborrowck=mir #![allow(warnings)] diff --git a/src/test/ui/nll/maybe-initialized-drop-with-uninitialized-fragments.stderr b/src/test/ui/nll/maybe-initialized-drop-with-uninitialized-fragments.stderr index ee926e4279318..471fcc1c448f0 100644 --- a/src/test/ui/nll/maybe-initialized-drop-with-uninitialized-fragments.stderr +++ b/src/test/ui/nll/maybe-initialized-drop-with-uninitialized-fragments.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `x` because it is borrowed - --> $DIR/maybe-initialized-drop-with-uninitialized-fragments.rs:32:5 + --> $DIR/maybe-initialized-drop-with-uninitialized-fragments.rs:22:5 | LL | let wrap = Wrap { p: &mut x }; | ------ borrow of `x` occurs here diff --git a/src/test/ui/nll/maybe-initialized-drop.rs b/src/test/ui/nll/maybe-initialized-drop.rs index 9a3aca346208d..7b7d6e1ba3727 100644 --- a/src/test/ui/nll/maybe-initialized-drop.rs +++ b/src/test/ui/nll/maybe-initialized-drop.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //compile-flags: -Z emit-end-regions -Zborrowck=mir #![allow(warnings)] diff --git a/src/test/ui/nll/maybe-initialized-drop.stderr b/src/test/ui/nll/maybe-initialized-drop.stderr index cc842c29ccb15..04945a9c8e13e 100644 --- a/src/test/ui/nll/maybe-initialized-drop.stderr +++ b/src/test/ui/nll/maybe-initialized-drop.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `x` because it is borrowed - --> $DIR/maybe-initialized-drop.rs:26:5 + --> $DIR/maybe-initialized-drop.rs:16:5 | LL | let wrap = Wrap { p: &mut x }; | ------ borrow of `x` occurs here diff --git a/src/test/ui/nll/mir_check_cast_closure.rs b/src/test/ui/nll/mir_check_cast_closure.rs index a111699c3f70d..9b70f741b6eb7 100644 --- a/src/test/ui/nll/mir_check_cast_closure.rs +++ b/src/test/ui/nll/mir_check_cast_closure.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z borrowck=mir #![allow(dead_code)] diff --git a/src/test/ui/nll/mir_check_cast_closure.stderr b/src/test/ui/nll/mir_check_cast_closure.stderr index 6805dbf6f3055..0a49264f994b2 100644 --- a/src/test/ui/nll/mir_check_cast_closure.stderr +++ b/src/test/ui/nll/mir_check_cast_closure.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/mir_check_cast_closure.rs:17:5 + --> $DIR/mir_check_cast_closure.rs:7:5 | LL | g | ^ error: unsatisfied lifetime constraints - --> $DIR/mir_check_cast_closure.rs:17:5 + --> $DIR/mir_check_cast_closure.rs:7:5 | LL | fn bar<'a, 'b>() -> fn(&'a u32, &'b u32) -> &'a u32 { | -- -- lifetime `'b` defined here diff --git a/src/test/ui/nll/mir_check_cast_reify.rs b/src/test/ui/nll/mir_check_cast_reify.rs index 3a530c1e7473d..f628d161622e7 100644 --- a/src/test/ui/nll/mir_check_cast_reify.rs +++ b/src/test/ui/nll/mir_check_cast_reify.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Zborrowck=mir #![allow(dead_code)] diff --git a/src/test/ui/nll/mir_check_cast_reify.stderr b/src/test/ui/nll/mir_check_cast_reify.stderr index c6e5fb397b9e6..597c76ad5d78c 100644 --- a/src/test/ui/nll/mir_check_cast_reify.stderr +++ b/src/test/ui/nll/mir_check_cast_reify.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/mir_check_cast_reify.rs:46:25 + --> $DIR/mir_check_cast_reify.rs:36:25 | LL | let f: fn(_) -> _ = foo; | ^^^ error: unsatisfied lifetime constraints - --> $DIR/mir_check_cast_reify.rs:48:5 + --> $DIR/mir_check_cast_reify.rs:38:5 | LL | fn bar<'a>(x: &'a u32) -> &'static u32 { | -- lifetime `'a` defined here diff --git a/src/test/ui/nll/mir_check_cast_unsafe_fn.rs b/src/test/ui/nll/mir_check_cast_unsafe_fn.rs index 4a840da028d81..bfc55a1ec1060 100644 --- a/src/test/ui/nll/mir_check_cast_unsafe_fn.rs +++ b/src/test/ui/nll/mir_check_cast_unsafe_fn.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Zborrowck=mir #![allow(dead_code)] diff --git a/src/test/ui/nll/mir_check_cast_unsafe_fn.stderr b/src/test/ui/nll/mir_check_cast_unsafe_fn.stderr index e8315d341a7f3..f5d4758532799 100644 --- a/src/test/ui/nll/mir_check_cast_unsafe_fn.stderr +++ b/src/test/ui/nll/mir_check_cast_unsafe_fn.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/mir_check_cast_unsafe_fn.rs:18:32 + --> $DIR/mir_check_cast_unsafe_fn.rs:8:32 | LL | let g: unsafe fn(_) -> _ = f; | ^ error: unsatisfied lifetime constraints - --> $DIR/mir_check_cast_unsafe_fn.rs:20:14 + --> $DIR/mir_check_cast_unsafe_fn.rs:10:14 | LL | fn bar<'a>(input: &'a u32, f: fn(&'a u32) -> &'a u32) -> &'static u32 { | -- lifetime `'a` defined here diff --git a/src/test/ui/nll/mir_check_cast_unsize.rs b/src/test/ui/nll/mir_check_cast_unsize.rs index 695dddbf7e9d5..4c37507d7ba74 100644 --- a/src/test/ui/nll/mir_check_cast_unsize.rs +++ b/src/test/ui/nll/mir_check_cast_unsize.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z borrowck=mir #![allow(dead_code)] diff --git a/src/test/ui/nll/mir_check_cast_unsize.stderr b/src/test/ui/nll/mir_check_cast_unsize.stderr index 4219c07673a45..ffd7840c1d8df 100644 --- a/src/test/ui/nll/mir_check_cast_unsize.stderr +++ b/src/test/ui/nll/mir_check_cast_unsize.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/mir_check_cast_unsize.rs:19:5 + --> $DIR/mir_check_cast_unsize.rs:9:5 | LL | x | ^ error: unsatisfied lifetime constraints - --> $DIR/mir_check_cast_unsize.rs:17:46 + --> $DIR/mir_check_cast_unsize.rs:7:46 | LL | fn bar<'a>(x: &'a u32) -> &'static dyn Debug { | ________--____________________________________^ diff --git a/src/test/ui/nll/move-errors.rs b/src/test/ui/nll/move-errors.rs index 6445f166b5719..a34163737096c 100644 --- a/src/test/ui/nll/move-errors.rs +++ b/src/test/ui/nll/move-errors.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused)] #![feature(nll)] diff --git a/src/test/ui/nll/move-errors.stderr b/src/test/ui/nll/move-errors.stderr index 592768363096c..b41aed8989cc3 100644 --- a/src/test/ui/nll/move-errors.stderr +++ b/src/test/ui/nll/move-errors.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/move-errors.rs:19:13 + --> $DIR/move-errors.rs:9:13 | LL | let b = *a; | ^^ @@ -8,7 +8,7 @@ LL | let b = *a; | help: consider removing the `*`: `a` error[E0508]: cannot move out of type `[A; 1]`, a non-copy array - --> $DIR/move-errors.rs:25:13 + --> $DIR/move-errors.rs:15:13 | LL | let b = a[0]; | ^^^^ @@ -17,7 +17,7 @@ LL | let b = a[0]; | help: consider borrowing here: `&a[0]` error[E0507]: cannot move out of borrowed content - --> $DIR/move-errors.rs:32:13 + --> $DIR/move-errors.rs:22:13 | LL | let s = **r; | ^^^ @@ -26,7 +26,7 @@ LL | let s = **r; | help: consider removing the `*`: `*r` error[E0507]: cannot move out of borrowed content - --> $DIR/move-errors.rs:40:13 + --> $DIR/move-errors.rs:30:13 | LL | let s = *r; | ^^ @@ -35,7 +35,7 @@ LL | let s = *r; | help: consider removing the `*`: `r` error[E0508]: cannot move out of type `[A; 1]`, a non-copy array - --> $DIR/move-errors.rs:45:13 + --> $DIR/move-errors.rs:35:13 | LL | let a = [A("".to_string())][0]; | ^^^^^^^^^^^^^^^^^^^^^^ @@ -44,7 +44,7 @@ LL | let a = [A("".to_string())][0]; | help: consider borrowing here: `&[A("".to_string())][0]` error[E0507]: cannot move out of borrowed content - --> $DIR/move-errors.rs:51:16 + --> $DIR/move-errors.rs:41:16 | LL | let A(s) = *a; | - ^^ @@ -54,13 +54,13 @@ LL | let A(s) = *a; | data moved here | note: move occurs because `s` has type `std::string::String`, which does not implement the `Copy` trait - --> $DIR/move-errors.rs:51:11 + --> $DIR/move-errors.rs:41:11 | LL | let A(s) = *a; | ^ error[E0509]: cannot move out of type `D`, which implements the `Drop` trait - --> $DIR/move-errors.rs:57:19 + --> $DIR/move-errors.rs:47:19 | LL | let C(D(s)) = c; | - ^ cannot move out of here @@ -68,19 +68,19 @@ LL | let C(D(s)) = c; | data moved here | note: move occurs because `s` has type `std::string::String`, which does not implement the `Copy` trait - --> $DIR/move-errors.rs:57:13 + --> $DIR/move-errors.rs:47:13 | LL | let C(D(s)) = c; | ^ error[E0507]: cannot move out of borrowed content - --> $DIR/move-errors.rs:64:9 + --> $DIR/move-errors.rs:54:9 | LL | b = *a; | ^^ cannot move out of borrowed content error[E0508]: cannot move out of type `[B; 1]`, a non-copy array - --> $DIR/move-errors.rs:87:11 + --> $DIR/move-errors.rs:77:11 | LL | match x[0] { | ^^^^ @@ -94,7 +94,7 @@ LL | B::V(s) => (), | - ...and here | note: move occurs because these variables have types that don't implement the `Copy` trait - --> $DIR/move-errors.rs:89:14 + --> $DIR/move-errors.rs:79:14 | LL | B::U(d) => (), | ^ @@ -102,7 +102,7 @@ LL | B::V(s) => (), | ^ error[E0509]: cannot move out of type `D`, which implements the `Drop` trait - --> $DIR/move-errors.rs:96:11 + --> $DIR/move-errors.rs:86:11 | LL | match x { | ^ cannot move out of here @@ -111,13 +111,13 @@ LL | B::U(D(s)) => (), | - data moved here | note: move occurs because `s` has type `std::string::String`, which does not implement the `Copy` trait - --> $DIR/move-errors.rs:99:16 + --> $DIR/move-errors.rs:89:16 | LL | B::U(D(s)) => (), | ^ error[E0509]: cannot move out of type `D`, which implements the `Drop` trait - --> $DIR/move-errors.rs:105:11 + --> $DIR/move-errors.rs:95:11 | LL | match x { | ^ cannot move out of here @@ -126,13 +126,13 @@ LL | (D(s), &t) => (), | - data moved here | note: move occurs because `s` has type `std::string::String`, which does not implement the `Copy` trait - --> $DIR/move-errors.rs:108:12 + --> $DIR/move-errors.rs:98:12 | LL | (D(s), &t) => (), | ^ error[E0507]: cannot move out of borrowed content - --> $DIR/move-errors.rs:105:11 + --> $DIR/move-errors.rs:95:11 | LL | match x { | ^ cannot move out of borrowed content @@ -141,13 +141,13 @@ LL | (D(s), &t) => (), | - data moved here | note: move occurs because `t` has type `std::string::String`, which does not implement the `Copy` trait - --> $DIR/move-errors.rs:108:17 + --> $DIR/move-errors.rs:98:17 | LL | (D(s), &t) => (), | ^ error[E0509]: cannot move out of type `F`, which implements the `Drop` trait - --> $DIR/move-errors.rs:115:11 + --> $DIR/move-errors.rs:105:11 | LL | match x { | ^ cannot move out of here @@ -158,13 +158,13 @@ LL | F(s, mut t) => (), | data moved here | note: move occurs because these variables have types that don't implement the `Copy` trait - --> $DIR/move-errors.rs:117:11 + --> $DIR/move-errors.rs:107:11 | LL | F(s, mut t) => (), | ^ ^^^^^ error[E0507]: cannot move out of borrowed content - --> $DIR/move-errors.rs:123:11 + --> $DIR/move-errors.rs:113:11 | LL | match *x { | ^^ @@ -176,7 +176,7 @@ LL | Ok(s) | Err(s) => (), | - data moved here | note: move occurs because `s` has type `std::string::String`, which does not implement the `Copy` trait - --> $DIR/move-errors.rs:125:12 + --> $DIR/move-errors.rs:115:12 | LL | Ok(s) | Err(s) => (), | ^ diff --git a/src/test/ui/nll/normalization-bounds-error.rs b/src/test/ui/nll/normalization-bounds-error.rs index 65b5cc12478c8..d6610e158236c 100644 --- a/src/test/ui/nll/normalization-bounds-error.rs +++ b/src/test/ui/nll/normalization-bounds-error.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we error when a bound from the impl is not satisfied when // normalizing an associated type. diff --git a/src/test/ui/nll/normalization-bounds-error.stderr b/src/test/ui/nll/normalization-bounds-error.stderr index 3548219361fc7..cd88ceb16d05a 100644 --- a/src/test/ui/nll/normalization-bounds-error.stderr +++ b/src/test/ui/nll/normalization-bounds-error.stderr @@ -1,16 +1,16 @@ error[E0495]: cannot infer an appropriate lifetime for lifetime parameter `'d` due to conflicting requirements - --> $DIR/normalization-bounds-error.rs:23:1 + --> $DIR/normalization-bounds-error.rs:13:1 | LL | fn visit_seq<'d, 'a: 'd>() -> <&'a () as Visitor<'d>>::Value {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | -note: first, the lifetime cannot outlive the lifetime 'd as defined on the function body at 23:14... - --> $DIR/normalization-bounds-error.rs:23:14 +note: first, the lifetime cannot outlive the lifetime 'd as defined on the function body at 13:14... + --> $DIR/normalization-bounds-error.rs:13:14 | LL | fn visit_seq<'d, 'a: 'd>() -> <&'a () as Visitor<'d>>::Value {} | ^^ -note: ...but the lifetime must also be valid for the lifetime 'a as defined on the function body at 23:18... - --> $DIR/normalization-bounds-error.rs:23:18 +note: ...but the lifetime must also be valid for the lifetime 'a as defined on the function body at 13:18... + --> $DIR/normalization-bounds-error.rs:13:18 | LL | fn visit_seq<'d, 'a: 'd>() -> <&'a () as Visitor<'d>>::Value {} | ^^ diff --git a/src/test/ui/nll/normalization-bounds.rs b/src/test/ui/nll/normalization-bounds.rs index 722a6c00e750c..ebc19d7cc8350 100644 --- a/src/test/ui/nll/normalization-bounds.rs +++ b/src/test/ui/nll/normalization-bounds.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that lifetime bounds get checked the right way around with NLL enabled. //run-pass diff --git a/src/test/ui/nll/projection-return.rs b/src/test/ui/nll/projection-return.rs index c1abcb434e68f..b2c9a087e0e02 100644 --- a/src/test/ui/nll/projection-return.rs +++ b/src/test/ui/nll/projection-return.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-Zborrowck=mir // compile-pass diff --git a/src/test/ui/nll/promotable-mutable-zst-doesnt-conflict.rs b/src/test/ui/nll/promotable-mutable-zst-doesnt-conflict.rs index be38556961271..061d0d69d099e 100644 --- a/src/test/ui/nll/promotable-mutable-zst-doesnt-conflict.rs +++ b/src/test/ui/nll/promotable-mutable-zst-doesnt-conflict.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that mutable promoted length zero arrays don't check for conflicting // access diff --git a/src/test/ui/nll/reference-carried-through-struct-field.ast.nll.stderr b/src/test/ui/nll/reference-carried-through-struct-field.ast.nll.stderr index caa3173d74610..f28e552901530 100644 --- a/src/test/ui/nll/reference-carried-through-struct-field.ast.nll.stderr +++ b/src/test/ui/nll/reference-carried-through-struct-field.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0503]: cannot use `x` because it was mutably borrowed - --> $DIR/reference-carried-through-struct-field.rs:21:5 + --> $DIR/reference-carried-through-struct-field.rs:11:5 | LL | let wrapper = Wrap { w: &mut x }; | ------ borrow of `x` occurs here diff --git a/src/test/ui/nll/reference-carried-through-struct-field.ast.stderr b/src/test/ui/nll/reference-carried-through-struct-field.ast.stderr index c1022d66070e0..b19d0b5277cea 100644 --- a/src/test/ui/nll/reference-carried-through-struct-field.ast.stderr +++ b/src/test/ui/nll/reference-carried-through-struct-field.ast.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `x` because it is borrowed - --> $DIR/reference-carried-through-struct-field.rs:21:5 + --> $DIR/reference-carried-through-struct-field.rs:11:5 | LL | let wrapper = Wrap { w: &mut x }; | - borrow of `x` occurs here diff --git a/src/test/ui/nll/reference-carried-through-struct-field.mir.stderr b/src/test/ui/nll/reference-carried-through-struct-field.mir.stderr index caa3173d74610..f28e552901530 100644 --- a/src/test/ui/nll/reference-carried-through-struct-field.mir.stderr +++ b/src/test/ui/nll/reference-carried-through-struct-field.mir.stderr @@ -1,5 +1,5 @@ error[E0503]: cannot use `x` because it was mutably borrowed - --> $DIR/reference-carried-through-struct-field.rs:21:5 + --> $DIR/reference-carried-through-struct-field.rs:11:5 | LL | let wrapper = Wrap { w: &mut x }; | ------ borrow of `x` occurs here diff --git a/src/test/ui/nll/reference-carried-through-struct-field.rs b/src/test/ui/nll/reference-carried-through-struct-field.rs index 589a3daa38d85..f7903cba6a22c 100644 --- a/src/test/ui/nll/reference-carried-through-struct-field.rs +++ b/src/test/ui/nll/reference-carried-through-struct-field.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //revisions: ast mir //[mir] compile-flags: -Z borrowck=mir diff --git a/src/test/ui/nll/region-ends-after-if-condition.nll.stderr b/src/test/ui/nll/region-ends-after-if-condition.nll.stderr index fa3a5e0c0d733..2e39733a1d89b 100644 --- a/src/test/ui/nll/region-ends-after-if-condition.nll.stderr +++ b/src/test/ui/nll/region-ends-after-if-condition.nll.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `my_struct.field` as mutable because it is also borrowed as immutable (Ast) - --> $DIR/region-ends-after-if-condition.rs:29:9 + --> $DIR/region-ends-after-if-condition.rs:19:9 | LL | let value = &my_struct.field; | --------------- immutable borrow occurs here @@ -11,7 +11,7 @@ LL | } | - immutable borrow ends here error[E0502]: cannot borrow `my_struct.field` as mutable because it is also borrowed as immutable (Ast) - --> $DIR/region-ends-after-if-condition.rs:39:9 + --> $DIR/region-ends-after-if-condition.rs:29:9 | LL | let value = &my_struct.field; | --------------- immutable borrow occurs here @@ -23,7 +23,7 @@ LL | } | - immutable borrow ends here error[E0502]: cannot borrow `my_struct.field` as mutable because it is also borrowed as immutable (Mir) - --> $DIR/region-ends-after-if-condition.rs:39:9 + --> $DIR/region-ends-after-if-condition.rs:29:9 | LL | let value = &my_struct.field; | ---------------- immutable borrow occurs here diff --git a/src/test/ui/nll/region-ends-after-if-condition.rs b/src/test/ui/nll/region-ends-after-if-condition.rs index e1c47a6bbff2c..1bf13a91b9116 100644 --- a/src/test/ui/nll/region-ends-after-if-condition.rs +++ b/src/test/ui/nll/region-ends-after-if-condition.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Basic test for liveness constraints: the region (`R1`) that appears // in the type of `p` includes the points after `&v[0]` up to (but not // including) the call to `use_x`. The `else` branch is not included. diff --git a/src/test/ui/nll/region-ends-after-if-condition.stderr b/src/test/ui/nll/region-ends-after-if-condition.stderr index d966c62c85f90..e3d308e9ab92a 100644 --- a/src/test/ui/nll/region-ends-after-if-condition.stderr +++ b/src/test/ui/nll/region-ends-after-if-condition.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `my_struct.field` as mutable because it is also borrowed as immutable (Ast) - --> $DIR/region-ends-after-if-condition.rs:29:9 + --> $DIR/region-ends-after-if-condition.rs:19:9 | LL | let value = &my_struct.field; | --------------- immutable borrow occurs here @@ -11,7 +11,7 @@ LL | } | - immutable borrow ends here error[E0502]: cannot borrow `my_struct.field` as mutable because it is also borrowed as immutable (Ast) - --> $DIR/region-ends-after-if-condition.rs:39:9 + --> $DIR/region-ends-after-if-condition.rs:29:9 | LL | let value = &my_struct.field; | --------------- immutable borrow occurs here @@ -23,7 +23,7 @@ LL | } | - immutable borrow ends here error[E0502]: cannot borrow `my_struct.field` as mutable because it is also borrowed as immutable (Mir) - --> $DIR/region-ends-after-if-condition.rs:39:9 + --> $DIR/region-ends-after-if-condition.rs:29:9 | LL | let value = &my_struct.field; | ---------------- immutable borrow occurs here diff --git a/src/test/ui/nll/relate_tys/hr-fn-aaa-as-aba.rs b/src/test/ui/nll/relate_tys/hr-fn-aaa-as-aba.rs index 84c305f5907d1..4f21f64b57477 100644 --- a/src/test/ui/nll/relate_tys/hr-fn-aaa-as-aba.rs +++ b/src/test/ui/nll/relate_tys/hr-fn-aaa-as-aba.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the NLL `relate_tys` code correctly deduces that a // function returning either argument CANNOT be upcast to one // that returns always its first argument. diff --git a/src/test/ui/nll/relate_tys/hr-fn-aaa-as-aba.stderr b/src/test/ui/nll/relate_tys/hr-fn-aaa-as-aba.stderr index e08d848b47140..6a892150842db 100644 --- a/src/test/ui/nll/relate_tys/hr-fn-aaa-as-aba.stderr +++ b/src/test/ui/nll/relate_tys/hr-fn-aaa-as-aba.stderr @@ -1,5 +1,5 @@ error: higher-ranked subtype error - --> $DIR/hr-fn-aaa-as-aba.rs:24:58 + --> $DIR/hr-fn-aaa-as-aba.rs:14:58 | LL | let a: for<'a, 'b> fn(&'a u32, &'b u32) -> &'a u32 = make_it(); | ^^^^^^^^^ diff --git a/src/test/ui/nll/relate_tys/hr-fn-aau-eq-abu.rs b/src/test/ui/nll/relate_tys/hr-fn-aau-eq-abu.rs index 9b8268d9736aa..86fedcc6dfa9f 100644 --- a/src/test/ui/nll/relate_tys/hr-fn-aau-eq-abu.rs +++ b/src/test/ui/nll/relate_tys/hr-fn-aau-eq-abu.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test an interesting corner case that ought to be legal (though the // current code actually gets it wrong, see below): a fn that takes // two arguments that are references with the same lifetime is in fact diff --git a/src/test/ui/nll/relate_tys/hr-fn-aau-eq-abu.stderr b/src/test/ui/nll/relate_tys/hr-fn-aau-eq-abu.stderr index 17e8a32cb2ad9..c52e139af2990 100644 --- a/src/test/ui/nll/relate_tys/hr-fn-aau-eq-abu.stderr +++ b/src/test/ui/nll/relate_tys/hr-fn-aau-eq-abu.stderr @@ -1,5 +1,5 @@ error: higher-ranked subtype error - --> $DIR/hr-fn-aau-eq-abu.rs:33:53 + --> $DIR/hr-fn-aau-eq-abu.rs:23:53 | LL | let a: Cell fn(&'a u32, &'b u32)> = make_cell_aa(); | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/nll/relate_tys/hr-fn-aba-as-aaa.rs b/src/test/ui/nll/relate_tys/hr-fn-aba-as-aaa.rs index 4f73ca3a53921..bac9e26588cae 100644 --- a/src/test/ui/nll/relate_tys/hr-fn-aba-as-aaa.rs +++ b/src/test/ui/nll/relate_tys/hr-fn-aba-as-aaa.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the NLL `relate_tys` code correctly deduces that a // function returning always its first argument can be upcast to one // that returns either first or second argument. diff --git a/src/test/ui/nll/relate_tys/issue-48071.rs b/src/test/ui/nll/relate_tys/issue-48071.rs index c2498cbe50f7e..9b8ac167466f7 100644 --- a/src/test/ui/nll/relate_tys/issue-48071.rs +++ b/src/test/ui/nll/relate_tys/issue-48071.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #48071. This test used to ICE because -- in // the leak-check -- it would pass since we knew that the return type // was `'static`, and hence `'static: 'a` was legal even for a diff --git a/src/test/ui/nll/return-ref-mut-issue-46557.rs b/src/test/ui/nll/return-ref-mut-issue-46557.rs index 79150f340cad8..8f9d88d234455 100644 --- a/src/test/ui/nll/return-ref-mut-issue-46557.rs +++ b/src/test/ui/nll/return-ref-mut-issue-46557.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #46557 #![feature(nll)] diff --git a/src/test/ui/nll/return-ref-mut-issue-46557.stderr b/src/test/ui/nll/return-ref-mut-issue-46557.stderr index f441085f242ed..2a7cf04ea2a0d 100644 --- a/src/test/ui/nll/return-ref-mut-issue-46557.stderr +++ b/src/test/ui/nll/return-ref-mut-issue-46557.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/return-ref-mut-issue-46557.rs:17:21 + --> $DIR/return-ref-mut-issue-46557.rs:7:21 | LL | let ref mut x = 1234543; //~ ERROR borrowed value does not live long enough [E0597] | ^^^^^^^ temporary value does not live long enough diff --git a/src/test/ui/nll/return_from_loop.rs b/src/test/ui/nll/return_from_loop.rs index 13f1ca6431b3d..23a1e0b816cbd 100644 --- a/src/test/ui/nll/return_from_loop.rs +++ b/src/test/ui/nll/return_from_loop.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Basic test for liveness constraints: the region (`R1`) that appears // in the type of `p` includes the points after `&v[0]` up to (but not // including) the call to `use_x`. The `else` branch is not included. diff --git a/src/test/ui/nll/return_from_loop.stderr b/src/test/ui/nll/return_from_loop.stderr index 7130aa64daba3..d94c504926c11 100644 --- a/src/test/ui/nll/return_from_loop.stderr +++ b/src/test/ui/nll/return_from_loop.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `my_struct.field` as mutable more than once at a time (Ast) - --> $DIR/return_from_loop.rs:32:9 + --> $DIR/return_from_loop.rs:22:9 | LL | let value = &mut my_struct.field; | --------------- first mutable borrow occurs here @@ -11,7 +11,7 @@ LL | } | - first borrow ends here error[E0499]: cannot borrow `my_struct.field` as mutable more than once at a time (Ast) - --> $DIR/return_from_loop.rs:45:9 + --> $DIR/return_from_loop.rs:35:9 | LL | let value = &mut my_struct.field; | --------------- first mutable borrow occurs here @@ -23,7 +23,7 @@ LL | } | - first borrow ends here error[E0499]: cannot borrow `my_struct.field` as mutable more than once at a time (Mir) - --> $DIR/return_from_loop.rs:32:9 + --> $DIR/return_from_loop.rs:22:9 | LL | let value = &mut my_struct.field; | -------------------- first mutable borrow occurs here diff --git a/src/test/ui/nll/trait-associated-constant.rs b/src/test/ui/nll/trait-associated-constant.rs index b0f5fbf7160d1..9d3e1a690f001 100644 --- a/src/test/ui/nll/trait-associated-constant.rs +++ b/src/test/ui/nll/trait-associated-constant.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test cases where we put various lifetime constraints on trait // associated constants. diff --git a/src/test/ui/nll/trait-associated-constant.stderr b/src/test/ui/nll/trait-associated-constant.stderr index 07972ecced313..78ef513f3eecb 100644 --- a/src/test/ui/nll/trait-associated-constant.stderr +++ b/src/test/ui/nll/trait-associated-constant.stderr @@ -1,37 +1,37 @@ error[E0308]: mismatched types - --> $DIR/trait-associated-constant.rs:31:5 + --> $DIR/trait-associated-constant.rs:21:5 | LL | const AC: Option<&'c str> = None; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lifetime mismatch | = note: expected type `std::option::Option<&'b str>` found type `std::option::Option<&'c str>` -note: the lifetime 'c as defined on the impl at 30:18... - --> $DIR/trait-associated-constant.rs:30:18 +note: the lifetime 'c as defined on the impl at 20:18... + --> $DIR/trait-associated-constant.rs:20:18 | LL | impl<'a: 'b, 'b, 'c> Anything<'a, 'b> for FailStruct1 { | ^^ -note: ...does not necessarily outlive the lifetime 'b as defined on the impl at 30:14 - --> $DIR/trait-associated-constant.rs:30:14 +note: ...does not necessarily outlive the lifetime 'b as defined on the impl at 20:14 + --> $DIR/trait-associated-constant.rs:20:14 | LL | impl<'a: 'b, 'b, 'c> Anything<'a, 'b> for FailStruct1 { | ^^ error[E0308]: mismatched types - --> $DIR/trait-associated-constant.rs:38:5 + --> $DIR/trait-associated-constant.rs:28:5 | LL | const AC: Option<&'a str> = None; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lifetime mismatch | = note: expected type `std::option::Option<&'b str>` found type `std::option::Option<&'a str>` -note: the lifetime 'a as defined on the impl at 37:6... - --> $DIR/trait-associated-constant.rs:37:6 +note: the lifetime 'a as defined on the impl at 27:6... + --> $DIR/trait-associated-constant.rs:27:6 | LL | impl<'a: 'b, 'b> Anything<'a, 'b> for FailStruct2 { | ^^ -note: ...does not necessarily outlive the lifetime 'b as defined on the impl at 37:14 - --> $DIR/trait-associated-constant.rs:37:14 +note: ...does not necessarily outlive the lifetime 'b as defined on the impl at 27:14 + --> $DIR/trait-associated-constant.rs:27:14 | LL | impl<'a: 'b, 'b> Anything<'a, 'b> for FailStruct2 { | ^^ diff --git a/src/test/ui/nll/ty-outlives/impl-trait-captures.rs b/src/test/ui/nll/ty-outlives/impl-trait-captures.rs index f21127064d4c2..5958145d7f1b5 100644 --- a/src/test/ui/nll/ty-outlives/impl-trait-captures.rs +++ b/src/test/ui/nll/ty-outlives/impl-trait-captures.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-Zborrowck=mir -Zverbose #![allow(warnings)] diff --git a/src/test/ui/nll/ty-outlives/impl-trait-captures.stderr b/src/test/ui/nll/ty-outlives/impl-trait-captures.stderr index a4f0e53386f9f..26631865c69f7 100644 --- a/src/test/ui/nll/ty-outlives/impl-trait-captures.stderr +++ b/src/test/ui/nll/ty-outlives/impl-trait-captures.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/impl-trait-captures.rs:21:5 + --> $DIR/impl-trait-captures.rs:11:5 | LL | x | ^ error[E0621]: explicit lifetime required in the type of `x` - --> $DIR/impl-trait-captures.rs:21:5 + --> $DIR/impl-trait-captures.rs:11:5 | LL | x | ^ lifetime `ReEarlyBound(0, 'a)` required diff --git a/src/test/ui/nll/ty-outlives/impl-trait-outlives.rs b/src/test/ui/nll/ty-outlives/impl-trait-outlives.rs index 182e11da082f8..f306d3acc45db 100644 --- a/src/test/ui/nll/ty-outlives/impl-trait-outlives.rs +++ b/src/test/ui/nll/ty-outlives/impl-trait-outlives.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-Zborrowck=mir -Zverbose #![allow(warnings)] diff --git a/src/test/ui/nll/ty-outlives/impl-trait-outlives.stderr b/src/test/ui/nll/ty-outlives/impl-trait-outlives.stderr index 50b80282e6241..e28a9a2aebd1d 100644 --- a/src/test/ui/nll/ty-outlives/impl-trait-outlives.stderr +++ b/src/test/ui/nll/ty-outlives/impl-trait-outlives.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/impl-trait-outlives.rs:17:35 + --> $DIR/impl-trait-outlives.rs:7:35 | LL | fn no_region<'a, T>(x: Box) -> impl Debug + 'a | ^^^^^^^^^^^^^^^ warning: not reporting region error due to nll - --> $DIR/impl-trait-outlives.rs:33:42 + --> $DIR/impl-trait-outlives.rs:23:42 | LL | fn wrong_region<'a, 'b, T>(x: Box) -> impl Debug + 'a | ^^^^^^^^^^^^^^^ error[E0309]: the parameter type `T` may not live long enough - --> $DIR/impl-trait-outlives.rs:22:5 + --> $DIR/impl-trait-outlives.rs:12:5 | LL | x | ^ @@ -19,7 +19,7 @@ LL | x = help: consider adding an explicit lifetime bound `T: ReEarlyBound(0, 'a)`... error[E0309]: the parameter type `T` may not live long enough - --> $DIR/impl-trait-outlives.rs:38:5 + --> $DIR/impl-trait-outlives.rs:28:5 | LL | x | ^ diff --git a/src/test/ui/nll/ty-outlives/projection-implied-bounds.rs b/src/test/ui/nll/ty-outlives/projection-implied-bounds.rs index d8f077467d9fc..571852a5764cd 100644 --- a/src/test/ui/nll/ty-outlives/projection-implied-bounds.rs +++ b/src/test/ui/nll/ty-outlives/projection-implied-bounds.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-Zborrowck=mir -Zverbose // Test that we can deduce when projections like `T::Item` outlive the diff --git a/src/test/ui/nll/ty-outlives/projection-implied-bounds.stderr b/src/test/ui/nll/ty-outlives/projection-implied-bounds.stderr index 0a2bd3247655a..f3db9d69465f8 100644 --- a/src/test/ui/nll/ty-outlives/projection-implied-bounds.stderr +++ b/src/test/ui/nll/ty-outlives/projection-implied-bounds.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/projection-implied-bounds.rs:45:36 + --> $DIR/projection-implied-bounds.rs:35:36 | LL | twice(value, |value_ref, item| invoke2(value_ref, item)); | ^^^^^^^ error[E0310]: the parameter type `T` may not live long enough - --> $DIR/projection-implied-bounds.rs:45:18 + --> $DIR/projection-implied-bounds.rs:35:18 | LL | twice(value, |value_ref, item| invoke2(value_ref, item)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/nll/ty-outlives/projection-no-regions-closure.rs b/src/test/ui/nll/ty-outlives/projection-no-regions-closure.rs index 4767b75d89c1a..58953b661bea5 100644 --- a/src/test/ui/nll/ty-outlives/projection-no-regions-closure.rs +++ b/src/test/ui/nll/ty-outlives/projection-no-regions-closure.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-Zborrowck=mir -Zverbose // Tests closures that propagate an outlives relationship to their diff --git a/src/test/ui/nll/ty-outlives/projection-no-regions-closure.stderr b/src/test/ui/nll/ty-outlives/projection-no-regions-closure.stderr index 6d2170729ffb9..dbc96e249671b 100644 --- a/src/test/ui/nll/ty-outlives/projection-no-regions-closure.stderr +++ b/src/test/ui/nll/ty-outlives/projection-no-regions-closure.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/projection-no-regions-closure.rs:35:31 + --> $DIR/projection-no-regions-closure.rs:25:31 | LL | with_signature(x, |mut y| Box::new(y.next())) | ^^^^^^^^^^^^^^^^^^ warning: not reporting region error due to nll - --> $DIR/projection-no-regions-closure.rs:53:31 + --> $DIR/projection-no-regions-closure.rs:43:31 | LL | with_signature(x, |mut y| Box::new(y.next())) | ^^^^^^^^^^^^^^^^^^ note: External requirements - --> $DIR/projection-no-regions-closure.rs:35:23 + --> $DIR/projection-no-regions-closure.rs:25:23 | LL | with_signature(x, |mut y| Box::new(y.next())) | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -26,7 +26,7 @@ LL | with_signature(x, |mut y| Box::new(y.next())) = note: where ::Item: '_#2r note: No external requirements - --> $DIR/projection-no-regions-closure.rs:31:1 + --> $DIR/projection-no-regions-closure.rs:21:1 | LL | / fn no_region<'a, T>(x: Box) -> Box LL | | where @@ -43,7 +43,7 @@ LL | | } ] error[E0309]: the associated type `::Item` may not live long enough - --> $DIR/projection-no-regions-closure.rs:35:23 + --> $DIR/projection-no-regions-closure.rs:25:23 | LL | with_signature(x, |mut y| Box::new(y.next())) | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -51,7 +51,7 @@ LL | with_signature(x, |mut y| Box::new(y.next())) = help: consider adding an explicit lifetime bound `::Item: ReEarlyBound(0, 'a)`... note: External requirements - --> $DIR/projection-no-regions-closure.rs:45:23 + --> $DIR/projection-no-regions-closure.rs:35:23 | LL | with_signature(x, |mut y| Box::new(y.next())) | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -66,7 +66,7 @@ LL | with_signature(x, |mut y| Box::new(y.next())) = note: where ::Item: '_#2r note: No external requirements - --> $DIR/projection-no-regions-closure.rs:41:1 + --> $DIR/projection-no-regions-closure.rs:31:1 | LL | / fn correct_region<'a, T>(x: Box) -> Box LL | | where @@ -82,7 +82,7 @@ LL | | } ] note: External requirements - --> $DIR/projection-no-regions-closure.rs:53:23 + --> $DIR/projection-no-regions-closure.rs:43:23 | LL | with_signature(x, |mut y| Box::new(y.next())) | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -98,7 +98,7 @@ LL | with_signature(x, |mut y| Box::new(y.next())) = note: where ::Item: '_#3r note: No external requirements - --> $DIR/projection-no-regions-closure.rs:49:1 + --> $DIR/projection-no-regions-closure.rs:39:1 | LL | / fn wrong_region<'a, 'b, T>(x: Box) -> Box LL | | where @@ -116,7 +116,7 @@ LL | | } ] error[E0309]: the associated type `::Item` may not live long enough - --> $DIR/projection-no-regions-closure.rs:53:23 + --> $DIR/projection-no-regions-closure.rs:43:23 | LL | with_signature(x, |mut y| Box::new(y.next())) | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -124,7 +124,7 @@ LL | with_signature(x, |mut y| Box::new(y.next())) = help: consider adding an explicit lifetime bound `::Item: ReEarlyBound(0, 'a)`... note: External requirements - --> $DIR/projection-no-regions-closure.rs:64:23 + --> $DIR/projection-no-regions-closure.rs:54:23 | LL | with_signature(x, |mut y| Box::new(y.next())) | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -140,7 +140,7 @@ LL | with_signature(x, |mut y| Box::new(y.next())) = note: where ::Item: '_#3r note: No external requirements - --> $DIR/projection-no-regions-closure.rs:59:1 + --> $DIR/projection-no-regions-closure.rs:49:1 | LL | / fn outlives_region<'a, 'b, T>(x: Box) -> Box LL | | where diff --git a/src/test/ui/nll/ty-outlives/projection-no-regions-fn.rs b/src/test/ui/nll/ty-outlives/projection-no-regions-fn.rs index dea2daf7e8eeb..b22528241be61 100644 --- a/src/test/ui/nll/ty-outlives/projection-no-regions-fn.rs +++ b/src/test/ui/nll/ty-outlives/projection-no-regions-fn.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-Zborrowck=mir -Zverbose #![allow(warnings)] diff --git a/src/test/ui/nll/ty-outlives/projection-no-regions-fn.stderr b/src/test/ui/nll/ty-outlives/projection-no-regions-fn.stderr index 3199ec151335d..1faf9dfbb1de2 100644 --- a/src/test/ui/nll/ty-outlives/projection-no-regions-fn.stderr +++ b/src/test/ui/nll/ty-outlives/projection-no-regions-fn.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/projection-no-regions-fn.rs:23:5 + --> $DIR/projection-no-regions-fn.rs:13:5 | LL | Box::new(x.next()) | ^^^^^^^^^^^^^^^^^^ warning: not reporting region error due to nll - --> $DIR/projection-no-regions-fn.rs:39:5 + --> $DIR/projection-no-regions-fn.rs:29:5 | LL | Box::new(x.next()) | ^^^^^^^^^^^^^^^^^^ error[E0309]: the associated type `::Item` may not live long enough - --> $DIR/projection-no-regions-fn.rs:23:5 + --> $DIR/projection-no-regions-fn.rs:13:5 | LL | Box::new(x.next()) | ^^^^^^^^^^^^^^^^^^ @@ -19,7 +19,7 @@ LL | Box::new(x.next()) = help: consider adding an explicit lifetime bound `::Item: ReEarlyBound(0, 'a)`... error[E0309]: the associated type `::Item` may not live long enough - --> $DIR/projection-no-regions-fn.rs:39:5 + --> $DIR/projection-no-regions-fn.rs:29:5 | LL | Box::new(x.next()) | ^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/nll/ty-outlives/projection-one-region-closure.rs b/src/test/ui/nll/ty-outlives/projection-one-region-closure.rs index 0a8801a3c4d6d..1756cfa3ee95a 100644 --- a/src/test/ui/nll/ty-outlives/projection-one-region-closure.rs +++ b/src/test/ui/nll/ty-outlives/projection-one-region-closure.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test cases where we constrain `>::AssocType` to // outlive `'a` and there are no bounds in the trait definition of // `Anything`. This means that the constraint can only be satisfied in two diff --git a/src/test/ui/nll/ty-outlives/projection-one-region-closure.stderr b/src/test/ui/nll/ty-outlives/projection-one-region-closure.stderr index 2b0e682f85161..50f9802111ef8 100644 --- a/src/test/ui/nll/ty-outlives/projection-one-region-closure.stderr +++ b/src/test/ui/nll/ty-outlives/projection-one-region-closure.stderr @@ -1,23 +1,23 @@ warning: not reporting region error due to nll - --> $DIR/projection-one-region-closure.rs:55:39 + --> $DIR/projection-one-region-closure.rs:45:39 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^ warning: not reporting region error due to nll - --> $DIR/projection-one-region-closure.rs:67:39 + --> $DIR/projection-one-region-closure.rs:57:39 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^ warning: not reporting region error due to nll - --> $DIR/projection-one-region-closure.rs:89:39 + --> $DIR/projection-one-region-closure.rs:79:39 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^ note: External requirements - --> $DIR/projection-one-region-closure.rs:55:29 + --> $DIR/projection-one-region-closure.rs:45:29 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -33,7 +33,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); = note: where '_#1r: '_#2r note: No external requirements - --> $DIR/projection-one-region-closure.rs:51:1 + --> $DIR/projection-one-region-closure.rs:41:1 | LL | / fn no_relationships_late<'a, 'b, T>(cell: Cell<&'a ()>, t: T) LL | | where @@ -50,7 +50,7 @@ LL | | } ] error: unsatisfied lifetime constraints - --> $DIR/projection-one-region-closure.rs:55:5 + --> $DIR/projection-one-region-closure.rs:45:5 | LL | fn no_relationships_late<'a, 'b, T>(cell: Cell<&'a ()>, t: T) | -- -- lifetime `'b` defined here @@ -61,7 +61,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ argument requires that `'b` must outlive `'a` error[E0309]: the parameter type `T` may not live long enough - --> $DIR/projection-one-region-closure.rs:55:29 + --> $DIR/projection-one-region-closure.rs:45:29 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -69,7 +69,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); = help: consider adding an explicit lifetime bound `T: ReFree(DefId(0/0:8 ~ projection_one_region_closure[317d]::no_relationships_late[0]), BrNamed(crate0:DefIndex(1:16), 'a))`... note: External requirements - --> $DIR/projection-one-region-closure.rs:67:29 + --> $DIR/projection-one-region-closure.rs:57:29 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -86,7 +86,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); = note: where '_#2r: '_#3r note: No external requirements - --> $DIR/projection-one-region-closure.rs:62:1 + --> $DIR/projection-one-region-closure.rs:52:1 | LL | / fn no_relationships_early<'a, 'b, T>(cell: Cell<&'a ()>, t: T) LL | | where @@ -104,7 +104,7 @@ LL | | } ] error: unsatisfied lifetime constraints - --> $DIR/projection-one-region-closure.rs:67:5 + --> $DIR/projection-one-region-closure.rs:57:5 | LL | fn no_relationships_early<'a, 'b, T>(cell: Cell<&'a ()>, t: T) | -- -- lifetime `'b` defined here @@ -115,7 +115,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ argument requires that `'b` must outlive `'a` error[E0309]: the parameter type `T` may not live long enough - --> $DIR/projection-one-region-closure.rs:67:29 + --> $DIR/projection-one-region-closure.rs:57:29 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -123,7 +123,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); = help: consider adding an explicit lifetime bound `T: ReEarlyBound(0, 'a)`... note: External requirements - --> $DIR/projection-one-region-closure.rs:89:29 + --> $DIR/projection-one-region-closure.rs:79:29 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -140,7 +140,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); = note: where '_#2r: '_#3r note: No external requirements - --> $DIR/projection-one-region-closure.rs:74:1 + --> $DIR/projection-one-region-closure.rs:64:1 | LL | / fn projection_outlives<'a, 'b, T>(cell: Cell<&'a ()>, t: T) LL | | where @@ -158,7 +158,7 @@ LL | | } ] error: unsatisfied lifetime constraints - --> $DIR/projection-one-region-closure.rs:89:5 + --> $DIR/projection-one-region-closure.rs:79:5 | LL | fn projection_outlives<'a, 'b, T>(cell: Cell<&'a ()>, t: T) | -- -- lifetime `'b` defined here @@ -169,7 +169,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ argument requires that `'b` must outlive `'a` error[E0309]: the parameter type `T` may not live long enough - --> $DIR/projection-one-region-closure.rs:89:29 + --> $DIR/projection-one-region-closure.rs:79:29 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -177,7 +177,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); = help: consider adding an explicit lifetime bound `T: ReEarlyBound(0, 'a)`... note: External requirements - --> $DIR/projection-one-region-closure.rs:102:29 + --> $DIR/projection-one-region-closure.rs:92:29 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -194,7 +194,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); = note: where '_#2r: '_#3r note: No external requirements - --> $DIR/projection-one-region-closure.rs:96:1 + --> $DIR/projection-one-region-closure.rs:86:1 | LL | / fn elements_outlive<'a, 'b, T>(cell: Cell<&'a ()>, t: T) LL | | where diff --git a/src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-closure.rs b/src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-closure.rs index 6317d6eca1f1d..17aab21cf4923 100644 --- a/src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-closure.rs +++ b/src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-closure.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test cases where we constrain `>::AssocType` to // outlive `'a` and there is a unique bound in the trait definition of // `Anything` -- i.e., we know that `AssocType` outlives `'b`. In this diff --git a/src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-closure.stderr b/src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-closure.stderr index 739bde4a481c5..da1df1996ba0c 100644 --- a/src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-closure.stderr +++ b/src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-closure.stderr @@ -1,23 +1,23 @@ warning: not reporting region error due to nll - --> $DIR/projection-one-region-trait-bound-closure.rs:47:39 + --> $DIR/projection-one-region-trait-bound-closure.rs:37:39 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^ warning: not reporting region error due to nll - --> $DIR/projection-one-region-trait-bound-closure.rs:58:39 + --> $DIR/projection-one-region-trait-bound-closure.rs:48:39 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^ warning: not reporting region error due to nll - --> $DIR/projection-one-region-trait-bound-closure.rs:79:39 + --> $DIR/projection-one-region-trait-bound-closure.rs:69:39 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^ note: External requirements - --> $DIR/projection-one-region-trait-bound-closure.rs:47:29 + --> $DIR/projection-one-region-trait-bound-closure.rs:37:29 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -32,7 +32,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); = note: where '_#1r: '_#2r note: No external requirements - --> $DIR/projection-one-region-trait-bound-closure.rs:43:1 + --> $DIR/projection-one-region-trait-bound-closure.rs:33:1 | LL | / fn no_relationships_late<'a, 'b, T>(cell: Cell<&'a ()>, t: T) LL | | where @@ -49,7 +49,7 @@ LL | | } ] error: unsatisfied lifetime constraints - --> $DIR/projection-one-region-trait-bound-closure.rs:47:5 + --> $DIR/projection-one-region-trait-bound-closure.rs:37:5 | LL | fn no_relationships_late<'a, 'b, T>(cell: Cell<&'a ()>, t: T) | -- -- lifetime `'b` defined here @@ -60,7 +60,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ argument requires that `'b` must outlive `'a` note: External requirements - --> $DIR/projection-one-region-trait-bound-closure.rs:58:29 + --> $DIR/projection-one-region-trait-bound-closure.rs:48:29 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -76,7 +76,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); = note: where '_#2r: '_#3r note: No external requirements - --> $DIR/projection-one-region-trait-bound-closure.rs:53:1 + --> $DIR/projection-one-region-trait-bound-closure.rs:43:1 | LL | / fn no_relationships_early<'a, 'b, T>(cell: Cell<&'a ()>, t: T) LL | | where @@ -94,7 +94,7 @@ LL | | } ] error: unsatisfied lifetime constraints - --> $DIR/projection-one-region-trait-bound-closure.rs:58:5 + --> $DIR/projection-one-region-trait-bound-closure.rs:48:5 | LL | fn no_relationships_early<'a, 'b, T>(cell: Cell<&'a ()>, t: T) | -- -- lifetime `'b` defined here @@ -105,7 +105,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ argument requires that `'b` must outlive `'a` note: External requirements - --> $DIR/projection-one-region-trait-bound-closure.rs:79:29 + --> $DIR/projection-one-region-trait-bound-closure.rs:69:29 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -121,7 +121,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); = note: where '_#2r: '_#3r note: No external requirements - --> $DIR/projection-one-region-trait-bound-closure.rs:64:1 + --> $DIR/projection-one-region-trait-bound-closure.rs:54:1 | LL | / fn projection_outlives<'a, 'b, T>(cell: Cell<&'a ()>, t: T) LL | | where @@ -139,7 +139,7 @@ LL | | } ] error: unsatisfied lifetime constraints - --> $DIR/projection-one-region-trait-bound-closure.rs:79:5 + --> $DIR/projection-one-region-trait-bound-closure.rs:69:5 | LL | fn projection_outlives<'a, 'b, T>(cell: Cell<&'a ()>, t: T) | -- -- lifetime `'b` defined here @@ -150,7 +150,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ argument requires that `'b` must outlive `'a` note: External requirements - --> $DIR/projection-one-region-trait-bound-closure.rs:90:29 + --> $DIR/projection-one-region-trait-bound-closure.rs:80:29 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -166,7 +166,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); = note: where '_#2r: '_#3r note: No external requirements - --> $DIR/projection-one-region-trait-bound-closure.rs:85:1 + --> $DIR/projection-one-region-trait-bound-closure.rs:75:1 | LL | / fn elements_outlive<'a, 'b, T>(cell: Cell<&'a ()>, t: T) LL | | where @@ -184,7 +184,7 @@ LL | | } ] note: External requirements - --> $DIR/projection-one-region-trait-bound-closure.rs:102:29 + --> $DIR/projection-one-region-trait-bound-closure.rs:92:29 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -199,7 +199,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); = note: where '_#1r: '_#2r note: No external requirements - --> $DIR/projection-one-region-trait-bound-closure.rs:94:1 + --> $DIR/projection-one-region-trait-bound-closure.rs:84:1 | LL | / fn one_region<'a, T>(cell: Cell<&'a ()>, t: T) LL | | where diff --git a/src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-static-closure.rs b/src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-static-closure.rs index 1f2f40196f8ee..452a8ea4f85d2 100644 --- a/src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-static-closure.rs +++ b/src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-static-closure.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test cases where we constrain `>::AssocType` to // outlive `'static`. In this case, we don't get any errors, and in fact // we don't even propagate constraints from the closures to the callers. diff --git a/src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-static-closure.stderr b/src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-static-closure.stderr index 136e143e80edf..2194ba144a80a 100644 --- a/src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-static-closure.stderr +++ b/src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-static-closure.stderr @@ -1,5 +1,5 @@ note: No external requirements - --> $DIR/projection-one-region-trait-bound-static-closure.rs:46:29 + --> $DIR/projection-one-region-trait-bound-static-closure.rs:36:29 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -12,7 +12,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); ] note: No external requirements - --> $DIR/projection-one-region-trait-bound-static-closure.rs:42:1 + --> $DIR/projection-one-region-trait-bound-static-closure.rs:32:1 | LL | / fn no_relationships_late<'a, 'b, T>(cell: Cell<&'a ()>, t: T) LL | | where @@ -28,7 +28,7 @@ LL | | } ] note: No external requirements - --> $DIR/projection-one-region-trait-bound-static-closure.rs:55:29 + --> $DIR/projection-one-region-trait-bound-static-closure.rs:45:29 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -42,7 +42,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); ] note: No external requirements - --> $DIR/projection-one-region-trait-bound-static-closure.rs:50:1 + --> $DIR/projection-one-region-trait-bound-static-closure.rs:40:1 | LL | / fn no_relationships_early<'a, 'b, T>(cell: Cell<&'a ()>, t: T) LL | | where @@ -60,7 +60,7 @@ LL | | } ] note: No external requirements - --> $DIR/projection-one-region-trait-bound-static-closure.rs:74:29 + --> $DIR/projection-one-region-trait-bound-static-closure.rs:64:29 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -74,7 +74,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); ] note: No external requirements - --> $DIR/projection-one-region-trait-bound-static-closure.rs:59:1 + --> $DIR/projection-one-region-trait-bound-static-closure.rs:49:1 | LL | / fn projection_outlives<'a, 'b, T>(cell: Cell<&'a ()>, t: T) LL | | where @@ -92,7 +92,7 @@ LL | | } ] note: No external requirements - --> $DIR/projection-one-region-trait-bound-static-closure.rs:83:29 + --> $DIR/projection-one-region-trait-bound-static-closure.rs:73:29 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -106,7 +106,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); ] note: No external requirements - --> $DIR/projection-one-region-trait-bound-static-closure.rs:78:1 + --> $DIR/projection-one-region-trait-bound-static-closure.rs:68:1 | LL | / fn elements_outlive<'a, 'b, T>(cell: Cell<&'a ()>, t: T) LL | | where @@ -124,7 +124,7 @@ LL | | } ] note: No external requirements - --> $DIR/projection-one-region-trait-bound-static-closure.rs:95:29 + --> $DIR/projection-one-region-trait-bound-static-closure.rs:85:29 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -137,7 +137,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); ] note: No external requirements - --> $DIR/projection-one-region-trait-bound-static-closure.rs:87:1 + --> $DIR/projection-one-region-trait-bound-static-closure.rs:77:1 | LL | / fn one_region<'a, T>(cell: Cell<&'a ()>, t: T) LL | | where diff --git a/src/test/ui/nll/ty-outlives/projection-two-region-trait-bound-closure.rs b/src/test/ui/nll/ty-outlives/projection-two-region-trait-bound-closure.rs index 4e51a2bedc8c5..aa2665a4c27f5 100644 --- a/src/test/ui/nll/ty-outlives/projection-two-region-trait-bound-closure.rs +++ b/src/test/ui/nll/ty-outlives/projection-two-region-trait-bound-closure.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test cases where we constrain `>::AssocType` // to outlive `'a` and there are two bounds in the trait definition of // `Anything` -- i.e., we know that `AssocType` outlives `'a` and diff --git a/src/test/ui/nll/ty-outlives/projection-two-region-trait-bound-closure.stderr b/src/test/ui/nll/ty-outlives/projection-two-region-trait-bound-closure.stderr index 6838e0f3b3d01..139bafd258d03 100644 --- a/src/test/ui/nll/ty-outlives/projection-two-region-trait-bound-closure.stderr +++ b/src/test/ui/nll/ty-outlives/projection-two-region-trait-bound-closure.stderr @@ -1,29 +1,29 @@ warning: not reporting region error due to nll - --> $DIR/projection-two-region-trait-bound-closure.rs:48:39 + --> $DIR/projection-two-region-trait-bound-closure.rs:38:39 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^ warning: not reporting region error due to nll - --> $DIR/projection-two-region-trait-bound-closure.rs:59:39 + --> $DIR/projection-two-region-trait-bound-closure.rs:49:39 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^ warning: not reporting region error due to nll - --> $DIR/projection-two-region-trait-bound-closure.rs:80:39 + --> $DIR/projection-two-region-trait-bound-closure.rs:70:39 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^ warning: not reporting region error due to nll - --> $DIR/projection-two-region-trait-bound-closure.rs:108:39 + --> $DIR/projection-two-region-trait-bound-closure.rs:98:39 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^ note: External requirements - --> $DIR/projection-two-region-trait-bound-closure.rs:48:29 + --> $DIR/projection-two-region-trait-bound-closure.rs:38:29 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -39,7 +39,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); = note: where >::AssocType: '_#3r note: No external requirements - --> $DIR/projection-two-region-trait-bound-closure.rs:44:1 + --> $DIR/projection-two-region-trait-bound-closure.rs:34:1 | LL | / fn no_relationships_late<'a, 'b, 'c, T>(cell: Cell<&'a ()>, t: T) LL | | where @@ -57,7 +57,7 @@ LL | | } ] error[E0309]: the associated type `>::AssocType` may not live long enough - --> $DIR/projection-two-region-trait-bound-closure.rs:48:29 + --> $DIR/projection-two-region-trait-bound-closure.rs:38:29 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -65,7 +65,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); = help: consider adding an explicit lifetime bound `>::AssocType: ReFree(DefId(0/0:8 ~ projection_two_region_trait_bound_closure[317d]::no_relationships_late[0]), BrNamed(crate0:DefIndex(1:18), 'a))`... note: External requirements - --> $DIR/projection-two-region-trait-bound-closure.rs:59:29 + --> $DIR/projection-two-region-trait-bound-closure.rs:49:29 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -82,7 +82,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); = note: where >::AssocType: '_#4r note: No external requirements - --> $DIR/projection-two-region-trait-bound-closure.rs:54:1 + --> $DIR/projection-two-region-trait-bound-closure.rs:44:1 | LL | / fn no_relationships_early<'a, 'b, 'c, T>(cell: Cell<&'a ()>, t: T) LL | | where @@ -101,7 +101,7 @@ LL | | } ] error[E0309]: the associated type `>::AssocType` may not live long enough - --> $DIR/projection-two-region-trait-bound-closure.rs:59:29 + --> $DIR/projection-two-region-trait-bound-closure.rs:49:29 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -109,7 +109,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); = help: consider adding an explicit lifetime bound `>::AssocType: ReEarlyBound(0, 'a)`... note: External requirements - --> $DIR/projection-two-region-trait-bound-closure.rs:80:29 + --> $DIR/projection-two-region-trait-bound-closure.rs:70:29 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -126,7 +126,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); = note: where >::AssocType: '_#4r note: No external requirements - --> $DIR/projection-two-region-trait-bound-closure.rs:65:1 + --> $DIR/projection-two-region-trait-bound-closure.rs:55:1 | LL | / fn projection_outlives<'a, 'b, 'c, T>(cell: Cell<&'a ()>, t: T) LL | | where @@ -145,7 +145,7 @@ LL | | } ] error[E0309]: the associated type `>::AssocType` may not live long enough - --> $DIR/projection-two-region-trait-bound-closure.rs:80:29 + --> $DIR/projection-two-region-trait-bound-closure.rs:70:29 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -153,7 +153,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); = help: consider adding an explicit lifetime bound `>::AssocType: ReEarlyBound(0, 'a)`... note: External requirements - --> $DIR/projection-two-region-trait-bound-closure.rs:91:29 + --> $DIR/projection-two-region-trait-bound-closure.rs:81:29 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -170,7 +170,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); = note: where >::AssocType: '_#4r note: No external requirements - --> $DIR/projection-two-region-trait-bound-closure.rs:86:1 + --> $DIR/projection-two-region-trait-bound-closure.rs:76:1 | LL | / fn elements_outlive1<'a, 'b, 'c, T>(cell: Cell<&'a ()>, t: T) LL | | where @@ -189,7 +189,7 @@ LL | | } ] note: External requirements - --> $DIR/projection-two-region-trait-bound-closure.rs:100:29 + --> $DIR/projection-two-region-trait-bound-closure.rs:90:29 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -206,7 +206,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); = note: where >::AssocType: '_#4r note: No external requirements - --> $DIR/projection-two-region-trait-bound-closure.rs:95:1 + --> $DIR/projection-two-region-trait-bound-closure.rs:85:1 | LL | / fn elements_outlive2<'a, 'b, 'c, T>(cell: Cell<&'a ()>, t: T) LL | | where @@ -225,7 +225,7 @@ LL | | } ] note: External requirements - --> $DIR/projection-two-region-trait-bound-closure.rs:108:29 + --> $DIR/projection-two-region-trait-bound-closure.rs:98:29 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -240,7 +240,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); = note: where >::AssocType: '_#2r note: No external requirements - --> $DIR/projection-two-region-trait-bound-closure.rs:104:1 + --> $DIR/projection-two-region-trait-bound-closure.rs:94:1 | LL | / fn two_regions<'a, 'b, T>(cell: Cell<&'a ()>, t: T) LL | | where @@ -257,7 +257,7 @@ LL | | } ] error: unsatisfied lifetime constraints - --> $DIR/projection-two-region-trait-bound-closure.rs:108:5 + --> $DIR/projection-two-region-trait-bound-closure.rs:98:5 | LL | fn two_regions<'a, 'b, T>(cell: Cell<&'a ()>, t: T) | -- -- lifetime `'b` defined here @@ -268,7 +268,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ argument requires that `'b` must outlive `'a` note: External requirements - --> $DIR/projection-two-region-trait-bound-closure.rs:119:29 + --> $DIR/projection-two-region-trait-bound-closure.rs:109:29 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -284,7 +284,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); = note: where >::AssocType: '_#3r note: No external requirements - --> $DIR/projection-two-region-trait-bound-closure.rs:114:1 + --> $DIR/projection-two-region-trait-bound-closure.rs:104:1 | LL | / fn two_regions_outlive<'a, 'b, T>(cell: Cell<&'a ()>, t: T) LL | | where @@ -302,7 +302,7 @@ LL | | } ] note: External requirements - --> $DIR/projection-two-region-trait-bound-closure.rs:131:29 + --> $DIR/projection-two-region-trait-bound-closure.rs:121:29 | LL | with_signature(cell, t, |cell, t| require(cell, t)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -317,7 +317,7 @@ LL | with_signature(cell, t, |cell, t| require(cell, t)); = note: where >::AssocType: '_#2r note: No external requirements - --> $DIR/projection-two-region-trait-bound-closure.rs:123:1 + --> $DIR/projection-two-region-trait-bound-closure.rs:113:1 | LL | / fn one_region<'a, T>(cell: Cell<&'a ()>, t: T) LL | | where diff --git a/src/test/ui/nll/ty-outlives/ty-param-closure-approximate-lower-bound.rs b/src/test/ui/nll/ty-outlives/ty-param-closure-approximate-lower-bound.rs index 7ff4b484af17b..3b0d9f8078d16 100644 --- a/src/test/ui/nll/ty-outlives/ty-param-closure-approximate-lower-bound.rs +++ b/src/test/ui/nll/ty-outlives/ty-param-closure-approximate-lower-bound.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-Zborrowck=mir -Zverbose #![allow(warnings)] diff --git a/src/test/ui/nll/ty-outlives/ty-param-closure-approximate-lower-bound.stderr b/src/test/ui/nll/ty-outlives/ty-param-closure-approximate-lower-bound.stderr index 87f55b4e14d96..2d1aeab2c07c2 100644 --- a/src/test/ui/nll/ty-outlives/ty-param-closure-approximate-lower-bound.stderr +++ b/src/test/ui/nll/ty-outlives/ty-param-closure-approximate-lower-bound.stderr @@ -1,23 +1,23 @@ warning: not reporting region error due to nll - --> $DIR/ty-param-closure-approximate-lower-bound.rs:34:31 + --> $DIR/ty-param-closure-approximate-lower-bound.rs:24:31 | LL | twice(cell, value, |a, b| invoke(a, b)); | ^^^^^^^^^^^^ warning: not reporting region error due to nll - --> $DIR/ty-param-closure-approximate-lower-bound.rs:42:31 + --> $DIR/ty-param-closure-approximate-lower-bound.rs:32:31 | LL | twice(cell, value, |a, b| invoke(a, b)); | ^^^^^^ warning: not reporting region error due to nll - --> $DIR/ty-param-closure-approximate-lower-bound.rs:42:31 + --> $DIR/ty-param-closure-approximate-lower-bound.rs:32:31 | LL | twice(cell, value, |a, b| invoke(a, b)); | ^^^^^^^^^^^^ note: External requirements - --> $DIR/ty-param-closure-approximate-lower-bound.rs:34:24 + --> $DIR/ty-param-closure-approximate-lower-bound.rs:24:24 | LL | twice(cell, value, |a, b| invoke(a, b)); | ^^^^^^^^^^^^^^^^^^^ @@ -31,7 +31,7 @@ LL | twice(cell, value, |a, b| invoke(a, b)); = note: where T: '_#1r note: No external requirements - --> $DIR/ty-param-closure-approximate-lower-bound.rs:32:1 + --> $DIR/ty-param-closure-approximate-lower-bound.rs:22:1 | LL | / fn generic(value: T) { LL | | let cell = Cell::new(&()); @@ -47,7 +47,7 @@ LL | | } ] note: External requirements - --> $DIR/ty-param-closure-approximate-lower-bound.rs:42:24 + --> $DIR/ty-param-closure-approximate-lower-bound.rs:32:24 | LL | twice(cell, value, |a, b| invoke(a, b)); | ^^^^^^^^^^^^^^^^^^^ @@ -61,7 +61,7 @@ LL | twice(cell, value, |a, b| invoke(a, b)); = note: where T: '_#1r note: No external requirements - --> $DIR/ty-param-closure-approximate-lower-bound.rs:41:1 + --> $DIR/ty-param-closure-approximate-lower-bound.rs:31:1 | LL | / fn generic_fail<'a, T>(cell: Cell<&'a ()>, value: T) { LL | | twice(cell, value, |a, b| invoke(a, b)); @@ -76,7 +76,7 @@ LL | | } ] error[E0309]: the parameter type `T` may not live long enough - --> $DIR/ty-param-closure-approximate-lower-bound.rs:42:24 + --> $DIR/ty-param-closure-approximate-lower-bound.rs:32:24 | LL | twice(cell, value, |a, b| invoke(a, b)); | ^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-return-type.rs b/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-return-type.rs index b5cbd07b99c18..7d8d687078e6a 100644 --- a/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-return-type.rs +++ b/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-return-type.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-Zborrowck=mir -Zverbose #![allow(warnings)] diff --git a/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-return-type.stderr b/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-return-type.stderr index aec0d98c79aa4..90943ba1b42be 100644 --- a/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-return-type.stderr +++ b/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-return-type.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/ty-param-closure-outlives-from-return-type.rs:36:27 + --> $DIR/ty-param-closure-outlives-from-return-type.rs:26:27 | LL | with_signature(x, |y| y) | ^ warning: not reporting region error due to nll - --> $DIR/ty-param-closure-outlives-from-return-type.rs:52:5 + --> $DIR/ty-param-closure-outlives-from-return-type.rs:42:5 | LL | x | ^ note: External requirements - --> $DIR/ty-param-closure-outlives-from-return-type.rs:36:23 + --> $DIR/ty-param-closure-outlives-from-return-type.rs:26:23 | LL | with_signature(x, |y| y) | ^^^^^ @@ -26,7 +26,7 @@ LL | with_signature(x, |y| y) = note: where T: '_#2r note: No external requirements - --> $DIR/ty-param-closure-outlives-from-return-type.rs:25:1 + --> $DIR/ty-param-closure-outlives-from-return-type.rs:15:1 | LL | / fn no_region<'a, T>(x: Box) -> Box LL | | where @@ -43,7 +43,7 @@ LL | | } ] error[E0309]: the parameter type `T` may not live long enough - --> $DIR/ty-param-closure-outlives-from-return-type.rs:36:23 + --> $DIR/ty-param-closure-outlives-from-return-type.rs:26:23 | LL | with_signature(x, |y| y) | ^^^^^ @@ -51,7 +51,7 @@ LL | with_signature(x, |y| y) = help: consider adding an explicit lifetime bound `T: ReEarlyBound(0, 'a)`... error[E0309]: the parameter type `T` may not live long enough - --> $DIR/ty-param-closure-outlives-from-return-type.rs:52:5 + --> $DIR/ty-param-closure-outlives-from-return-type.rs:42:5 | LL | x | ^ diff --git a/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-where-clause.rs b/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-where-clause.rs index edaaeac080d4d..2f109b5be0a41 100644 --- a/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-where-clause.rs +++ b/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-where-clause.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we can propagate `T: 'a` obligations to our caller. See // `correct_region` for an explanation of how this test is setup; it's // somewhat intricate. diff --git a/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-where-clause.stderr b/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-where-clause.stderr index 67a158860d64c..d914441ec5d84 100644 --- a/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-where-clause.stderr +++ b/src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-where-clause.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/ty-param-closure-outlives-from-where-clause.rs:44:9 + --> $DIR/ty-param-closure-outlives-from-where-clause.rs:34:9 | LL | require(&x, &y) | ^^^^^^^ warning: not reporting region error due to nll - --> $DIR/ty-param-closure-outlives-from-where-clause.rs:78:9 + --> $DIR/ty-param-closure-outlives-from-where-clause.rs:68:9 | LL | require(&x, &y) | ^^^^^^^ note: External requirements - --> $DIR/ty-param-closure-outlives-from-where-clause.rs:37:26 + --> $DIR/ty-param-closure-outlives-from-where-clause.rs:27:26 | LL | with_signature(a, b, |x, y| { | __________________________^ @@ -32,7 +32,7 @@ LL | | }) = note: where T: '_#1r note: No external requirements - --> $DIR/ty-param-closure-outlives-from-where-clause.rs:36:1 + --> $DIR/ty-param-closure-outlives-from-where-clause.rs:26:1 | LL | / fn no_region<'a, T>(a: Cell<&'a ()>, b: T) { LL | | with_signature(a, b, |x, y| { @@ -48,7 +48,7 @@ LL | | } ] error[E0309]: the parameter type `T` may not live long enough - --> $DIR/ty-param-closure-outlives-from-where-clause.rs:37:26 + --> $DIR/ty-param-closure-outlives-from-where-clause.rs:27:26 | LL | with_signature(a, b, |x, y| { | __________________________^ @@ -63,7 +63,7 @@ LL | | }) = help: consider adding an explicit lifetime bound `T: ReFree(DefId(0/0:6 ~ ty_param_closure_outlives_from_where_clause[317d]::no_region[0]), BrNamed(crate0:DefIndex(1:14), 'a))`... note: External requirements - --> $DIR/ty-param-closure-outlives-from-where-clause.rs:54:26 + --> $DIR/ty-param-closure-outlives-from-where-clause.rs:44:26 | LL | with_signature(a, b, |x, y| { | __________________________^ @@ -85,7 +85,7 @@ LL | | }) = note: where T: '_#2r note: No external requirements - --> $DIR/ty-param-closure-outlives-from-where-clause.rs:50:1 + --> $DIR/ty-param-closure-outlives-from-where-clause.rs:40:1 | LL | / fn correct_region<'a, T>(a: Cell<&'a ()>, b: T) LL | | where @@ -102,7 +102,7 @@ LL | | } ] note: External requirements - --> $DIR/ty-param-closure-outlives-from-where-clause.rs:75:26 + --> $DIR/ty-param-closure-outlives-from-where-clause.rs:65:26 | LL | with_signature(a, b, |x, y| { | __________________________^ @@ -123,7 +123,7 @@ LL | | }) = note: where T: '_#2r note: No external requirements - --> $DIR/ty-param-closure-outlives-from-where-clause.rs:71:1 + --> $DIR/ty-param-closure-outlives-from-where-clause.rs:61:1 | LL | / fn wrong_region<'a, 'b, T>(a: Cell<&'a ()>, b: T) LL | | where @@ -140,7 +140,7 @@ LL | | } ] error[E0309]: the parameter type `T` may not live long enough - --> $DIR/ty-param-closure-outlives-from-where-clause.rs:75:26 + --> $DIR/ty-param-closure-outlives-from-where-clause.rs:65:26 | LL | with_signature(a, b, |x, y| { | __________________________^ @@ -154,7 +154,7 @@ LL | | }) = help: consider adding an explicit lifetime bound `T: ReFree(DefId(0/0:8 ~ ty_param_closure_outlives_from_where_clause[317d]::wrong_region[0]), BrNamed(crate0:DefIndex(1:20), 'a))`... note: External requirements - --> $DIR/ty-param-closure-outlives-from-where-clause.rs:89:26 + --> $DIR/ty-param-closure-outlives-from-where-clause.rs:79:26 | LL | with_signature(a, b, |x, y| { | __________________________^ @@ -174,7 +174,7 @@ LL | | }) = note: where T: '_#3r note: No external requirements - --> $DIR/ty-param-closure-outlives-from-where-clause.rs:84:1 + --> $DIR/ty-param-closure-outlives-from-where-clause.rs:74:1 | LL | / fn outlives_region<'a, 'b, T>(a: Cell<&'a ()>, b: T) LL | | where diff --git a/src/test/ui/nll/ty-outlives/ty-param-fn-body-nll-feature.rs b/src/test/ui/nll/ty-outlives/ty-param-fn-body-nll-feature.rs index c0c483b3957d4..ec5594375709b 100644 --- a/src/test/ui/nll/ty-outlives/ty-param-fn-body-nll-feature.rs +++ b/src/test/ui/nll/ty-outlives/ty-param-fn-body-nll-feature.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we assume that universal types like `T` outlive the // function body. Same as ty-param-fn-body, but uses `feature(nll)`, // which affects error reporting. diff --git a/src/test/ui/nll/ty-outlives/ty-param-fn-body-nll-feature.stderr b/src/test/ui/nll/ty-outlives/ty-param-fn-body-nll-feature.stderr index dec15f47a0301..b3c02f7f42919 100644 --- a/src/test/ui/nll/ty-outlives/ty-param-fn-body-nll-feature.stderr +++ b/src/test/ui/nll/ty-outlives/ty-param-fn-body-nll-feature.stderr @@ -1,5 +1,5 @@ error[E0309]: the parameter type `T` may not live long enough - --> $DIR/ty-param-fn-body-nll-feature.rs:30:5 + --> $DIR/ty-param-fn-body-nll-feature.rs:20:5 | LL | outlives(cell, t) | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/nll/ty-outlives/ty-param-fn-body.rs b/src/test/ui/nll/ty-outlives/ty-param-fn-body.rs index 6226108ef196f..508b30b035968 100644 --- a/src/test/ui/nll/ty-outlives/ty-param-fn-body.rs +++ b/src/test/ui/nll/ty-outlives/ty-param-fn-body.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-Zborrowck=mir // Test that we assume that universal types like `T` outlive the diff --git a/src/test/ui/nll/ty-outlives/ty-param-fn-body.stderr b/src/test/ui/nll/ty-outlives/ty-param-fn-body.stderr index 537f12234708e..e29282089ae8b 100644 --- a/src/test/ui/nll/ty-outlives/ty-param-fn-body.stderr +++ b/src/test/ui/nll/ty-outlives/ty-param-fn-body.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/ty-param-fn-body.rs:29:5 + --> $DIR/ty-param-fn-body.rs:19:5 | LL | outlives(cell, t) | ^^^^^^^^ error[E0309]: the parameter type `T` may not live long enough - --> $DIR/ty-param-fn-body.rs:29:5 + --> $DIR/ty-param-fn-body.rs:19:5 | LL | outlives(cell, t) | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/nll/ty-outlives/ty-param-fn.rs b/src/test/ui/nll/ty-outlives/ty-param-fn.rs index 258d77eb2b078..5e72269c044d5 100644 --- a/src/test/ui/nll/ty-outlives/ty-param-fn.rs +++ b/src/test/ui/nll/ty-outlives/ty-param-fn.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-Zborrowck=mir #![allow(warnings)] diff --git a/src/test/ui/nll/ty-outlives/ty-param-fn.stderr b/src/test/ui/nll/ty-outlives/ty-param-fn.stderr index 5ce50d8118578..a8168257a679a 100644 --- a/src/test/ui/nll/ty-outlives/ty-param-fn.stderr +++ b/src/test/ui/nll/ty-outlives/ty-param-fn.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/ty-param-fn.rs:21:5 + --> $DIR/ty-param-fn.rs:11:5 | LL | x | ^ warning: not reporting region error due to nll - --> $DIR/ty-param-fn.rs:37:5 + --> $DIR/ty-param-fn.rs:27:5 | LL | x | ^ error[E0309]: the parameter type `T` may not live long enough - --> $DIR/ty-param-fn.rs:21:5 + --> $DIR/ty-param-fn.rs:11:5 | LL | x | ^ @@ -19,7 +19,7 @@ LL | x = help: consider adding an explicit lifetime bound `T: 'a`... error[E0309]: the parameter type `T` may not live long enough - --> $DIR/ty-param-fn.rs:37:5 + --> $DIR/ty-param-fn.rs:27:5 | LL | x | ^ diff --git a/src/test/ui/nll/ty-outlives/ty-param-implied-bounds.rs b/src/test/ui/nll/ty-outlives/ty-param-implied-bounds.rs index 51927d353ecc4..f61f54f80a78b 100644 --- a/src/test/ui/nll/ty-outlives/ty-param-implied-bounds.rs +++ b/src/test/ui/nll/ty-outlives/ty-param-implied-bounds.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-Zborrowck=mir -Zverbose // compile-pass diff --git a/src/test/ui/nll/unused-mut-issue-50343.rs b/src/test/ui/nll/unused-mut-issue-50343.rs index e9110b8114b40..06dbc47355739 100644 --- a/src/test/ui/nll/unused-mut-issue-50343.rs +++ b/src/test/ui/nll/unused-mut-issue-50343.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] #![deny(unused_mut)] diff --git a/src/test/ui/nll/unused-mut-issue-50343.stderr b/src/test/ui/nll/unused-mut-issue-50343.stderr index bfc67e213ecf4..ef31dd7b29a40 100644 --- a/src/test/ui/nll/unused-mut-issue-50343.stderr +++ b/src/test/ui/nll/unused-mut-issue-50343.stderr @@ -1,5 +1,5 @@ error: variable does not need to be mutable - --> $DIR/unused-mut-issue-50343.rs:15:33 + --> $DIR/unused-mut-issue-50343.rs:5:33 | LL | vec![(42, 22)].iter().map(|(mut x, _y)| ()).count(); | ----^ @@ -7,7 +7,7 @@ LL | vec![(42, 22)].iter().map(|(mut x, _y)| ()).count(); | help: remove this `mut` | note: lint level defined here - --> $DIR/unused-mut-issue-50343.rs:12:9 + --> $DIR/unused-mut-issue-50343.rs:2:9 | LL | #![deny(unused_mut)] | ^^^^^^^^^^ diff --git a/src/test/ui/nll/where_clauses_in_functions.rs b/src/test/ui/nll/where_clauses_in_functions.rs index 0efdd19df3c88..81ebb385fd99a 100644 --- a/src/test/ui/nll/where_clauses_in_functions.rs +++ b/src/test/ui/nll/where_clauses_in_functions.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Zborrowck=mir #![allow(dead_code)] diff --git a/src/test/ui/nll/where_clauses_in_functions.stderr b/src/test/ui/nll/where_clauses_in_functions.stderr index 3d5dd4beb04f6..8bfd65e844b86 100644 --- a/src/test/ui/nll/where_clauses_in_functions.stderr +++ b/src/test/ui/nll/where_clauses_in_functions.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/where_clauses_in_functions.rs:23:5 + --> $DIR/where_clauses_in_functions.rs:13:5 | LL | foo(x, y) | ^^^ error: unsatisfied lifetime constraints - --> $DIR/where_clauses_in_functions.rs:23:5 + --> $DIR/where_clauses_in_functions.rs:13:5 | LL | fn bar<'a, 'b>(x: &'a u32, y: &'b u32) -> (&'a u32, &'b u32) { | -- -- lifetime `'b` defined here diff --git a/src/test/ui/nll/where_clauses_in_structs.rs b/src/test/ui/nll/where_clauses_in_structs.rs index 92e7db8617344..6566adf4c5046 100644 --- a/src/test/ui/nll/where_clauses_in_structs.rs +++ b/src/test/ui/nll/where_clauses_in_structs.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z borrowck=mir #![allow(dead_code)] diff --git a/src/test/ui/nll/where_clauses_in_structs.stderr b/src/test/ui/nll/where_clauses_in_structs.stderr index c7ad9879b29cf..fb1e094f1473d 100644 --- a/src/test/ui/nll/where_clauses_in_structs.stderr +++ b/src/test/ui/nll/where_clauses_in_structs.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/where_clauses_in_structs.rs:23:5 + --> $DIR/where_clauses_in_structs.rs:13:5 | LL | Foo { x, y }; | ^^^ error: unsatisfied lifetime constraints - --> $DIR/where_clauses_in_structs.rs:23:11 + --> $DIR/where_clauses_in_structs.rs:13:11 | LL | fn bar<'a, 'b>(x: Cell<&'a u32>, y: Cell<&'b u32>) { | -- -- lifetime `'b` defined here diff --git a/src/test/ui/no-args-non-move-async-closure.rs b/src/test/ui/no-args-non-move-async-closure.rs index 9cb754167cfe5..4f5b2ea3783aa 100644 --- a/src/test/ui/no-args-non-move-async-closure.rs +++ b/src/test/ui/no-args-non-move-async-closure.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 #![feature(arbitrary_self_types, async_await, await_macro, futures_api, pin)] diff --git a/src/test/ui/no-args-non-move-async-closure.stderr b/src/test/ui/no-args-non-move-async-closure.stderr index 752816502ebea..e1d16f669a99c 100644 --- a/src/test/ui/no-args-non-move-async-closure.stderr +++ b/src/test/ui/no-args-non-move-async-closure.stderr @@ -1,5 +1,5 @@ error[E0708]: `async` non-`move` closures with arguments are not currently supported - --> $DIR/no-args-non-move-async-closure.rs:16:13 + --> $DIR/no-args-non-move-async-closure.rs:6:13 | LL | let _ = async |x: u8| {}; | ^^^^^^^^^^^^^ diff --git a/src/test/ui/no-capture-arc.nll.stderr b/src/test/ui/no-capture-arc.nll.stderr index a58d5ad6fa723..e384f55c4fbc9 100644 --- a/src/test/ui/no-capture-arc.nll.stderr +++ b/src/test/ui/no-capture-arc.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: borrow of moved value: `arc_v` - --> $DIR/no-capture-arc.rs:24:18 + --> $DIR/no-capture-arc.rs:14:18 | LL | thread::spawn(move|| { | ------ value moved into closure here @@ -12,7 +12,7 @@ LL | assert_eq!((*arc_v)[2], 3); = note: move occurs because `arc_v` has type `std::sync::Arc>`, which does not implement the `Copy` trait error[E0382]: borrow of moved value: `arc_v` - --> $DIR/no-capture-arc.rs:26:23 + --> $DIR/no-capture-arc.rs:16:23 | LL | thread::spawn(move|| { | ------ value moved into closure here diff --git a/src/test/ui/no-capture-arc.rs b/src/test/ui/no-capture-arc.rs index 5e1d22bf63b89..06f5fb3da3c0b 100644 --- a/src/test/ui/no-capture-arc.rs +++ b/src/test/ui/no-capture-arc.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: use of moved value use std::sync::Arc; diff --git a/src/test/ui/no-capture-arc.stderr b/src/test/ui/no-capture-arc.stderr index d6801d7e6e1ca..0dfa5cdbe9ef3 100644 --- a/src/test/ui/no-capture-arc.stderr +++ b/src/test/ui/no-capture-arc.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `arc_v` - --> $DIR/no-capture-arc.rs:24:18 + --> $DIR/no-capture-arc.rs:14:18 | LL | thread::spawn(move|| { | ------ value moved (into closure) here @@ -10,7 +10,7 @@ LL | assert_eq!((*arc_v)[2], 3); = note: move occurs because `arc_v` has type `std::sync::Arc>`, which does not implement the `Copy` trait error[E0382]: use of moved value: `arc_v` - --> $DIR/no-capture-arc.rs:26:23 + --> $DIR/no-capture-arc.rs:16:23 | LL | thread::spawn(move|| { | ------ value moved (into closure) here diff --git a/src/test/ui/no-implicit-prelude-nested.rs b/src/test/ui/no-implicit-prelude-nested.rs index c64839ad0deb1..9bd46aa1e5178 100644 --- a/src/test/ui/no-implicit-prelude-nested.rs +++ b/src/test/ui/no-implicit-prelude-nested.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that things from the prelude aren't in scope. Use many of them // so that renaming some things won't magically make this test fail // for the wrong reason (e.g. if `Add` changes to `Addition`, and diff --git a/src/test/ui/no-implicit-prelude-nested.stderr b/src/test/ui/no-implicit-prelude-nested.stderr index dd0666a6fd469..7ef4bfbaf9920 100644 --- a/src/test/ui/no-implicit-prelude-nested.stderr +++ b/src/test/ui/no-implicit-prelude-nested.stderr @@ -1,5 +1,5 @@ error[E0405]: cannot find trait `Add` in this scope - --> $DIR/no-implicit-prelude-nested.rs:21:14 + --> $DIR/no-implicit-prelude-nested.rs:11:14 | LL | impl Add for Test {} //~ ERROR cannot find trait `Add` in this scope | ^^^ not found in this scope @@ -9,7 +9,7 @@ LL | use std::ops::Add; | error[E0405]: cannot find trait `Clone` in this scope - --> $DIR/no-implicit-prelude-nested.rs:22:14 + --> $DIR/no-implicit-prelude-nested.rs:12:14 | LL | impl Clone for Test {} //~ ERROR cannot find trait `Clone` in this scope | ^^^^^ not found in this scope @@ -21,7 +21,7 @@ LL | use std::prelude::v1::Clone; | error[E0405]: cannot find trait `Iterator` in this scope - --> $DIR/no-implicit-prelude-nested.rs:23:14 + --> $DIR/no-implicit-prelude-nested.rs:13:14 | LL | impl Iterator for Test {} //~ ERROR cannot find trait `Iterator` in this scope | ^^^^^^^^ not found in this scope @@ -33,7 +33,7 @@ LL | use std::prelude::v1::Iterator; | error[E0405]: cannot find trait `ToString` in this scope - --> $DIR/no-implicit-prelude-nested.rs:24:14 + --> $DIR/no-implicit-prelude-nested.rs:14:14 | LL | impl ToString for Test {} //~ ERROR cannot find trait `ToString` in this scope | ^^^^^^^^ not found in this scope @@ -45,13 +45,13 @@ LL | use std::string::ToString; | error[E0405]: cannot find trait `Writer` in this scope - --> $DIR/no-implicit-prelude-nested.rs:25:14 + --> $DIR/no-implicit-prelude-nested.rs:15:14 | LL | impl Writer for Test {} //~ ERROR cannot find trait `Writer` in this scope | ^^^^^^ not found in this scope error[E0425]: cannot find function `drop` in this scope - --> $DIR/no-implicit-prelude-nested.rs:28:13 + --> $DIR/no-implicit-prelude-nested.rs:18:13 | LL | drop(2) //~ ERROR cannot find function `drop` in this scope | ^^^^ not found in this scope @@ -63,7 +63,7 @@ LL | use std::prelude::v1::drop; | error[E0405]: cannot find trait `Add` in this scope - --> $DIR/no-implicit-prelude-nested.rs:33:10 + --> $DIR/no-implicit-prelude-nested.rs:23:10 | LL | impl Add for Test {} //~ ERROR cannot find trait `Add` in this scope | ^^^ not found in this scope @@ -73,7 +73,7 @@ LL | use std::ops::Add; | error[E0405]: cannot find trait `Clone` in this scope - --> $DIR/no-implicit-prelude-nested.rs:34:10 + --> $DIR/no-implicit-prelude-nested.rs:24:10 | LL | impl Clone for Test {} //~ ERROR cannot find trait `Clone` in this scope | ^^^^^ not found in this scope @@ -85,7 +85,7 @@ LL | use std::prelude::v1::Clone; | error[E0405]: cannot find trait `Iterator` in this scope - --> $DIR/no-implicit-prelude-nested.rs:35:10 + --> $DIR/no-implicit-prelude-nested.rs:25:10 | LL | impl Iterator for Test {} //~ ERROR cannot find trait `Iterator` in this scope | ^^^^^^^^ not found in this scope @@ -97,7 +97,7 @@ LL | use std::prelude::v1::Iterator; | error[E0405]: cannot find trait `ToString` in this scope - --> $DIR/no-implicit-prelude-nested.rs:36:10 + --> $DIR/no-implicit-prelude-nested.rs:26:10 | LL | impl ToString for Test {} //~ ERROR cannot find trait `ToString` in this scope | ^^^^^^^^ not found in this scope @@ -109,13 +109,13 @@ LL | use std::string::ToString; | error[E0405]: cannot find trait `Writer` in this scope - --> $DIR/no-implicit-prelude-nested.rs:37:10 + --> $DIR/no-implicit-prelude-nested.rs:27:10 | LL | impl Writer for Test {} //~ ERROR cannot find trait `Writer` in this scope | ^^^^^^ not found in this scope error[E0425]: cannot find function `drop` in this scope - --> $DIR/no-implicit-prelude-nested.rs:40:9 + --> $DIR/no-implicit-prelude-nested.rs:30:9 | LL | drop(2) //~ ERROR cannot find function `drop` in this scope | ^^^^ not found in this scope @@ -127,7 +127,7 @@ LL | use std::prelude::v1::drop; | error[E0405]: cannot find trait `Add` in this scope - --> $DIR/no-implicit-prelude-nested.rs:48:14 + --> $DIR/no-implicit-prelude-nested.rs:38:14 | LL | impl Add for Test {} //~ ERROR cannot find trait `Add` in this scope | ^^^ not found in this scope @@ -137,7 +137,7 @@ LL | use std::ops::Add; | error[E0405]: cannot find trait `Clone` in this scope - --> $DIR/no-implicit-prelude-nested.rs:49:14 + --> $DIR/no-implicit-prelude-nested.rs:39:14 | LL | impl Clone for Test {} //~ ERROR cannot find trait `Clone` in this scope | ^^^^^ not found in this scope @@ -149,7 +149,7 @@ LL | use std::prelude::v1::Clone; | error[E0405]: cannot find trait `Iterator` in this scope - --> $DIR/no-implicit-prelude-nested.rs:50:14 + --> $DIR/no-implicit-prelude-nested.rs:40:14 | LL | impl Iterator for Test {} //~ ERROR cannot find trait `Iterator` in this scope | ^^^^^^^^ not found in this scope @@ -161,7 +161,7 @@ LL | use std::prelude::v1::Iterator; | error[E0405]: cannot find trait `ToString` in this scope - --> $DIR/no-implicit-prelude-nested.rs:51:14 + --> $DIR/no-implicit-prelude-nested.rs:41:14 | LL | impl ToString for Test {} //~ ERROR cannot find trait `ToString` in this scope | ^^^^^^^^ not found in this scope @@ -173,13 +173,13 @@ LL | use std::string::ToString; | error[E0405]: cannot find trait `Writer` in this scope - --> $DIR/no-implicit-prelude-nested.rs:52:14 + --> $DIR/no-implicit-prelude-nested.rs:42:14 | LL | impl Writer for Test {} //~ ERROR cannot find trait `Writer` in this scope | ^^^^^^ not found in this scope error[E0425]: cannot find function `drop` in this scope - --> $DIR/no-implicit-prelude-nested.rs:55:13 + --> $DIR/no-implicit-prelude-nested.rs:45:13 | LL | drop(2) //~ ERROR cannot find function `drop` in this scope | ^^^^ not found in this scope diff --git a/src/test/ui/no-implicit-prelude.rs b/src/test/ui/no-implicit-prelude.rs index 0e39d9ebdc12b..bbb7a5f1e8d7b 100644 --- a/src/test/ui/no-implicit-prelude.rs +++ b/src/test/ui/no-implicit-prelude.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![no_implicit_prelude] // Test that things from the prelude aren't in scope. Use many of them diff --git a/src/test/ui/no-implicit-prelude.stderr b/src/test/ui/no-implicit-prelude.stderr index ae1098585b7ae..fa82ac6cbe72c 100644 --- a/src/test/ui/no-implicit-prelude.stderr +++ b/src/test/ui/no-implicit-prelude.stderr @@ -1,5 +1,5 @@ error[E0405]: cannot find trait `Add` in this scope - --> $DIR/no-implicit-prelude.rs:20:6 + --> $DIR/no-implicit-prelude.rs:10:6 | LL | impl Add for Test {} //~ ERROR cannot find trait `Add` in this scope | ^^^ not found in this scope @@ -9,7 +9,7 @@ LL | use std::ops::Add; | error[E0405]: cannot find trait `Clone` in this scope - --> $DIR/no-implicit-prelude.rs:21:6 + --> $DIR/no-implicit-prelude.rs:11:6 | LL | impl Clone for Test {} //~ ERROR cannot find trait `Clone` in this scope | ^^^^^ not found in this scope @@ -21,7 +21,7 @@ LL | use std::prelude::v1::Clone; | error[E0405]: cannot find trait `Iterator` in this scope - --> $DIR/no-implicit-prelude.rs:22:6 + --> $DIR/no-implicit-prelude.rs:12:6 | LL | impl Iterator for Test {} //~ ERROR cannot find trait `Iterator` in this scope | ^^^^^^^^ not found in this scope @@ -33,7 +33,7 @@ LL | use std::prelude::v1::Iterator; | error[E0405]: cannot find trait `ToString` in this scope - --> $DIR/no-implicit-prelude.rs:23:6 + --> $DIR/no-implicit-prelude.rs:13:6 | LL | impl ToString for Test {} //~ ERROR cannot find trait `ToString` in this scope | ^^^^^^^^ not found in this scope @@ -45,13 +45,13 @@ LL | use std::string::ToString; | error[E0405]: cannot find trait `Writer` in this scope - --> $DIR/no-implicit-prelude.rs:24:6 + --> $DIR/no-implicit-prelude.rs:14:6 | LL | impl Writer for Test {} //~ ERROR cannot find trait `Writer` in this scope | ^^^^^^ not found in this scope error[E0425]: cannot find function `drop` in this scope - --> $DIR/no-implicit-prelude.rs:27:5 + --> $DIR/no-implicit-prelude.rs:17:5 | LL | drop(2) //~ ERROR cannot find function `drop` in this scope | ^^^^ not found in this scope diff --git a/src/test/ui/no-link.rs b/src/test/ui/no-link.rs index 36efb67cf8032..f97c1074df4e1 100644 --- a/src/test/ui/no-link.rs +++ b/src/test/ui/no-link.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:empty-struct.rs #[no_link] diff --git a/src/test/ui/no-link.stderr b/src/test/ui/no-link.stderr index 3f159ddfbd18a..928ad4232024e 100644 --- a/src/test/ui/no-link.stderr +++ b/src/test/ui/no-link.stderr @@ -1,5 +1,5 @@ error[E0425]: cannot find value `XEmpty1` in module `empty_struct` - --> $DIR/no-link.rs:17:19 + --> $DIR/no-link.rs:7:19 | LL | empty_struct::XEmpty1; //~ ERROR cannot find value `XEmpty1` in module `empty_struct` | ^^^^^^^ not found in `empty_struct` diff --git a/src/test/ui/no-patterns-in-args-2.rs b/src/test/ui/no-patterns-in-args-2.rs index 4d2412c34a5fa..ccf57478b4850 100644 --- a/src/test/ui/no-patterns-in-args-2.rs +++ b/src/test/ui/no-patterns-in-args-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(patterns_in_fns_without_body)] trait Tr { diff --git a/src/test/ui/no-patterns-in-args-2.stderr b/src/test/ui/no-patterns-in-args-2.stderr index 11476169c7d0f..161e7bb4b005f 100644 --- a/src/test/ui/no-patterns-in-args-2.stderr +++ b/src/test/ui/no-patterns-in-args-2.stderr @@ -1,17 +1,17 @@ error[E0642]: patterns aren't allowed in methods without bodies - --> $DIR/no-patterns-in-args-2.rs:16:11 + --> $DIR/no-patterns-in-args-2.rs:6:11 | LL | fn f2(&arg: u8); //~ ERROR patterns aren't allowed in methods without bodies | ^^^^ error: patterns aren't allowed in methods without bodies - --> $DIR/no-patterns-in-args-2.rs:14:11 + --> $DIR/no-patterns-in-args-2.rs:4:11 | LL | fn f1(mut arg: u8); //~ ERROR patterns aren't allowed in methods without bodies | ^^^^^^^ | note: lint level defined here - --> $DIR/no-patterns-in-args-2.rs:11:9 + --> $DIR/no-patterns-in-args-2.rs:1:9 | LL | #![deny(patterns_in_fns_without_body)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/no-patterns-in-args-macro.rs b/src/test/ui/no-patterns-in-args-macro.rs index f85ce8f57ea71..59cb99453987c 100644 --- a/src/test/ui/no-patterns-in-args-macro.rs +++ b/src/test/ui/no-patterns-in-args-macro.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! m { ($pat: pat) => { trait Tr { diff --git a/src/test/ui/no-patterns-in-args-macro.stderr b/src/test/ui/no-patterns-in-args-macro.stderr index 57af3178439e5..28a48bf6a89c4 100644 --- a/src/test/ui/no-patterns-in-args-macro.stderr +++ b/src/test/ui/no-patterns-in-args-macro.stderr @@ -1,17 +1,17 @@ error[E0642]: patterns aren't allowed in methods without bodies - --> $DIR/no-patterns-in-args-macro.rs:30:8 + --> $DIR/no-patterns-in-args-macro.rs:20:8 | LL | m!((bad, pat)); | ^^^^^^^^^^ error[E0561]: patterns aren't allowed in function pointer types - --> $DIR/no-patterns-in-args-macro.rs:30:8 + --> $DIR/no-patterns-in-args-macro.rs:20:8 | LL | m!((bad, pat)); | ^^^^^^^^^^ error[E0130]: patterns aren't allowed in foreign function declarations - --> $DIR/no-patterns-in-args-macro.rs:30:8 + --> $DIR/no-patterns-in-args-macro.rs:20:8 | LL | m!((bad, pat)); | ^^^^^^^^^^ pattern not allowed in foreign function diff --git a/src/test/ui/no-patterns-in-args.rs b/src/test/ui/no-patterns-in-args.rs index 757bd2cb52b77..a774955c1e8a9 100644 --- a/src/test/ui/no-patterns-in-args.rs +++ b/src/test/ui/no-patterns-in-args.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern { fn f1(mut arg: u8); //~ ERROR patterns aren't allowed in foreign function declarations fn f2(&arg: u8); //~ ERROR patterns aren't allowed in foreign function declarations diff --git a/src/test/ui/no-patterns-in-args.stderr b/src/test/ui/no-patterns-in-args.stderr index 8ac1cced28fba..3fd476c4d720e 100644 --- a/src/test/ui/no-patterns-in-args.stderr +++ b/src/test/ui/no-patterns-in-args.stderr @@ -1,29 +1,29 @@ error[E0130]: patterns aren't allowed in foreign function declarations - --> $DIR/no-patterns-in-args.rs:12:11 + --> $DIR/no-patterns-in-args.rs:2:11 | LL | fn f1(mut arg: u8); //~ ERROR patterns aren't allowed in foreign function declarations | ^^^^^^^ pattern not allowed in foreign function error[E0130]: patterns aren't allowed in foreign function declarations - --> $DIR/no-patterns-in-args.rs:13:11 + --> $DIR/no-patterns-in-args.rs:3:11 | LL | fn f2(&arg: u8); //~ ERROR patterns aren't allowed in foreign function declarations | ^^^^ pattern not allowed in foreign function error[E0130]: patterns aren't allowed in foreign function declarations - --> $DIR/no-patterns-in-args.rs:14:11 + --> $DIR/no-patterns-in-args.rs:4:11 | LL | fn f3(arg @ _: u8); //~ ERROR patterns aren't allowed in foreign function declarations | ^^^^^^^ pattern not allowed in foreign function error[E0561]: patterns aren't allowed in function pointer types - --> $DIR/no-patterns-in-args.rs:20:14 + --> $DIR/no-patterns-in-args.rs:10:14 | LL | type A1 = fn(mut arg: u8); //~ ERROR patterns aren't allowed in function pointer types | ^^^^^^^ error[E0561]: patterns aren't allowed in function pointer types - --> $DIR/no-patterns-in-args.rs:21:14 + --> $DIR/no-patterns-in-args.rs:11:14 | LL | type A2 = fn(&arg: u8); //~ ERROR patterns aren't allowed in function pointer types | ^^^^ diff --git a/src/test/ui/no-reuse-move-arc.nll.stderr b/src/test/ui/no-reuse-move-arc.nll.stderr index 902affc80462c..3dc0d1639dbfe 100644 --- a/src/test/ui/no-reuse-move-arc.nll.stderr +++ b/src/test/ui/no-reuse-move-arc.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: borrow of moved value: `arc_v` - --> $DIR/no-reuse-move-arc.rs:22:18 + --> $DIR/no-reuse-move-arc.rs:12:18 | LL | thread::spawn(move|| { | ------ value moved into closure here @@ -12,7 +12,7 @@ LL | assert_eq!((*arc_v)[2], 3); //~ ERROR use of moved value: `arc_v` = note: move occurs because `arc_v` has type `std::sync::Arc>`, which does not implement the `Copy` trait error[E0382]: borrow of moved value: `arc_v` - --> $DIR/no-reuse-move-arc.rs:24:23 + --> $DIR/no-reuse-move-arc.rs:14:23 | LL | thread::spawn(move|| { | ------ value moved into closure here diff --git a/src/test/ui/no-reuse-move-arc.rs b/src/test/ui/no-reuse-move-arc.rs index 76c8a444320d3..b60a7f24999af 100644 --- a/src/test/ui/no-reuse-move-arc.rs +++ b/src/test/ui/no-reuse-move-arc.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::sync::Arc; use std::thread; diff --git a/src/test/ui/no-reuse-move-arc.stderr b/src/test/ui/no-reuse-move-arc.stderr index 91cba6e76ef12..d8ab314e7625e 100644 --- a/src/test/ui/no-reuse-move-arc.stderr +++ b/src/test/ui/no-reuse-move-arc.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `arc_v` - --> $DIR/no-reuse-move-arc.rs:22:18 + --> $DIR/no-reuse-move-arc.rs:12:18 | LL | thread::spawn(move|| { | ------ value moved (into closure) here @@ -10,7 +10,7 @@ LL | assert_eq!((*arc_v)[2], 3); //~ ERROR use of moved value: `arc_v` = note: move occurs because `arc_v` has type `std::sync::Arc>`, which does not implement the `Copy` trait error[E0382]: use of moved value: `arc_v` - --> $DIR/no-reuse-move-arc.rs:24:23 + --> $DIR/no-reuse-move-arc.rs:14:23 | LL | thread::spawn(move|| { | ------ value moved (into closure) here diff --git a/src/test/ui/no-send-res-ports.rs b/src/test/ui/no-send-res-ports.rs index 6825963c48647..0c48add7f5d1b 100644 --- a/src/test/ui/no-send-res-ports.rs +++ b/src/test/ui/no-send-res-ports.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::thread; use std::rc::Rc; diff --git a/src/test/ui/no-send-res-ports.stderr b/src/test/ui/no-send-res-ports.stderr index 936b95413ce34..6425cd3c69486 100644 --- a/src/test/ui/no-send-res-ports.stderr +++ b/src/test/ui/no-send-res-ports.stderr @@ -1,13 +1,13 @@ error[E0277]: `std::rc::Rc<()>` cannot be sent between threads safely - --> $DIR/no-send-res-ports.rs:35:5 + --> $DIR/no-send-res-ports.rs:25:5 | LL | thread::spawn(move|| { | ^^^^^^^^^^^^^ `std::rc::Rc<()>` cannot be sent between threads safely | - = help: within `[closure@$DIR/no-send-res-ports.rs:35:19: 39:6 x:main::foo]`, the trait `std::marker::Send` is not implemented for `std::rc::Rc<()>` + = help: within `[closure@$DIR/no-send-res-ports.rs:25:19: 29:6 x:main::foo]`, the trait `std::marker::Send` is not implemented for `std::rc::Rc<()>` = note: required because it appears within the type `Port<()>` = note: required because it appears within the type `main::foo` - = note: required because it appears within the type `[closure@$DIR/no-send-res-ports.rs:35:19: 39:6 x:main::foo]` + = note: required because it appears within the type `[closure@$DIR/no-send-res-ports.rs:25:19: 29:6 x:main::foo]` = note: required by `std::thread::spawn` error: aborting due to previous error diff --git a/src/test/ui/no-std-inject.rs b/src/test/ui/no-std-inject.rs index 49064853d21d6..09879c791f89f 100644 --- a/src/test/ui/no-std-inject.rs +++ b/src/test/ui/no-std-inject.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![no_std] #![allow(unused_extern_crates)] diff --git a/src/test/ui/no-std-inject.stderr b/src/test/ui/no-std-inject.stderr index c1ea823a9bda0..af5c2be66b732 100644 --- a/src/test/ui/no-std-inject.stderr +++ b/src/test/ui/no-std-inject.stderr @@ -1,5 +1,5 @@ error[E0259]: the name `core` is defined multiple times - --> $DIR/no-std-inject.rs:14:1 + --> $DIR/no-std-inject.rs:4:1 | LL | extern crate core; //~ ERROR: the name `core` is defined multiple times | ^^^^^^^^^^^^^^^^^^ `core` reimported here diff --git a/src/test/ui/no-type-for-node-ice.rs b/src/test/ui/no-type-for-node-ice.rs index f049f69e4bba2..d0cfdbf504dea 100644 --- a/src/test/ui/no-type-for-node-ice.rs +++ b/src/test/ui/no-type-for-node-ice.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Related issues: #20401, #20506, #20614, #20752, #20829, #20846, #20885, #20886 fn main() { diff --git a/src/test/ui/no-type-for-node-ice.stderr b/src/test/ui/no-type-for-node-ice.stderr index c9de7d28af0da..cd1a7ee6fe532 100644 --- a/src/test/ui/no-type-for-node-ice.stderr +++ b/src/test/ui/no-type-for-node-ice.stderr @@ -1,5 +1,5 @@ error[E0609]: no field `homura` on type `&'static str` - --> $DIR/no-type-for-node-ice.rs:14:8 + --> $DIR/no-type-for-node-ice.rs:4:8 | LL | "".homura[""]; //~ no field `homura` on type `&'static str` | ^^^^^^ diff --git a/src/test/ui/no-warn-on-field-replace-issue-34101.rs b/src/test/ui/no-warn-on-field-replace-issue-34101.rs index 2940b891534d3..18a4ad84f90cb 100644 --- a/src/test/ui/no-warn-on-field-replace-issue-34101.rs +++ b/src/test/ui/no-warn-on-field-replace-issue-34101.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue 34101: Circa 2016-06-05, `fn inline` below issued an // erroneous warning from the elaborate_drops pass about moving out of // a field in `Foo`, which has a destructor (and thus cannot have diff --git a/src/test/ui/no-warn-on-field-replace-issue-34101.stderr b/src/test/ui/no-warn-on-field-replace-issue-34101.stderr index 91a90266e5e96..45db3f2219c59 100644 --- a/src/test/ui/no-warn-on-field-replace-issue-34101.stderr +++ b/src/test/ui/no-warn-on-field-replace-issue-34101.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/no-warn-on-field-replace-issue-34101.rs:53:1 + --> $DIR/no-warn-on-field-replace-issue-34101.rs:43:1 | LL | / fn main() { //~ ERROR compilation successful LL | | inline(); diff --git a/src/test/ui/no_crate_type.rs b/src/test/ui/no_crate_type.rs index b2cc5cae69750..43efdac5e8c74 100644 --- a/src/test/ui/no_crate_type.rs +++ b/src/test/ui/no_crate_type.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // regression test for issue 11256 #![crate_type] //~ ERROR `crate_type` requires a value diff --git a/src/test/ui/no_crate_type.stderr b/src/test/ui/no_crate_type.stderr index 87f83f2d8df1c..9d691f3eb54ca 100644 --- a/src/test/ui/no_crate_type.stderr +++ b/src/test/ui/no_crate_type.stderr @@ -1,5 +1,5 @@ error: `crate_type` requires a value - --> $DIR/no_crate_type.rs:12:1 + --> $DIR/no_crate_type.rs:2:1 | LL | #![crate_type] //~ ERROR `crate_type` requires a value | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/no_owned_box_lang_item.rs b/src/test/ui/no_owned_box_lang_item.rs index 1c2bf1573dcc1..4b9961f17aff0 100644 --- a/src/test/ui/no_owned_box_lang_item.rs +++ b/src/test/ui/no_owned_box_lang_item.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we don't ICE when we are missing the owned_box lang item. // error-pattern: requires `owned_box` lang_item diff --git a/src/test/ui/no_send-enum.rs b/src/test/ui/no_send-enum.rs index 83f19ed19efc2..4b4d06f1e32cd 100644 --- a/src/test/ui/no_send-enum.rs +++ b/src/test/ui/no_send-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] use std::marker::Send; diff --git a/src/test/ui/no_send-enum.stderr b/src/test/ui/no_send-enum.stderr index 4d53c5f301306..71e3aee919431 100644 --- a/src/test/ui/no_send-enum.stderr +++ b/src/test/ui/no_send-enum.stderr @@ -1,5 +1,5 @@ error[E0277]: `NoSend` cannot be sent between threads safely - --> $DIR/no_send-enum.rs:26:5 + --> $DIR/no_send-enum.rs:16:5 | LL | bar(x); | ^^^ `NoSend` cannot be sent between threads safely @@ -7,7 +7,7 @@ LL | bar(x); = help: within `Foo`, the trait `std::marker::Send` is not implemented for `NoSend` = note: required because it appears within the type `Foo` note: required by `bar` - --> $DIR/no_send-enum.rs:22:1 + --> $DIR/no_send-enum.rs:12:1 | LL | fn bar(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/no_send-rc.rs b/src/test/ui/no_send-rc.rs index d3616d144229c..6ed0286ef18d9 100644 --- a/src/test/ui/no_send-rc.rs +++ b/src/test/ui/no_send-rc.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::rc::Rc; fn bar(_: T) {} diff --git a/src/test/ui/no_send-rc.stderr b/src/test/ui/no_send-rc.stderr index a0dce6c817c9d..2028cf77374f1 100644 --- a/src/test/ui/no_send-rc.stderr +++ b/src/test/ui/no_send-rc.stderr @@ -1,12 +1,12 @@ error[E0277]: `std::rc::Rc<{integer}>` cannot be sent between threads safely - --> $DIR/no_send-rc.rs:17:5 + --> $DIR/no_send-rc.rs:7:5 | LL | bar(x); | ^^^ `std::rc::Rc<{integer}>` cannot be sent between threads safely | = help: the trait `std::marker::Send` is not implemented for `std::rc::Rc<{integer}>` note: required by `bar` - --> $DIR/no_send-rc.rs:13:1 + --> $DIR/no_send-rc.rs:3:1 | LL | fn bar(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/no_send-struct.rs b/src/test/ui/no_send-struct.rs index d38d993e7e8e6..67816bfee5d02 100644 --- a/src/test/ui/no_send-struct.rs +++ b/src/test/ui/no_send-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] use std::marker::Send; diff --git a/src/test/ui/no_send-struct.stderr b/src/test/ui/no_send-struct.stderr index dc7b5ec67f232..ca4ae054fd0f9 100644 --- a/src/test/ui/no_send-struct.stderr +++ b/src/test/ui/no_send-struct.stderr @@ -1,12 +1,12 @@ error[E0277]: `Foo` cannot be sent between threads safely - --> $DIR/no_send-struct.rs:25:5 + --> $DIR/no_send-struct.rs:15:5 | LL | bar(x); | ^^^ `Foo` cannot be sent between threads safely | = help: the trait `std::marker::Send` is not implemented for `Foo` note: required by `bar` - --> $DIR/no_send-struct.rs:21:1 + --> $DIR/no_send-struct.rs:11:1 | LL | fn bar(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/no_share-enum.rs b/src/test/ui/no_share-enum.rs index 77a7012b3b033..f5edb63cf86e9 100644 --- a/src/test/ui/no_share-enum.rs +++ b/src/test/ui/no_share-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] use std::marker::Sync; diff --git a/src/test/ui/no_share-enum.stderr b/src/test/ui/no_share-enum.stderr index 57b889158d01c..64d791d02623e 100644 --- a/src/test/ui/no_share-enum.stderr +++ b/src/test/ui/no_share-enum.stderr @@ -1,5 +1,5 @@ error[E0277]: `NoSync` cannot be shared between threads safely - --> $DIR/no_share-enum.rs:24:5 + --> $DIR/no_share-enum.rs:14:5 | LL | bar(x); | ^^^ `NoSync` cannot be shared between threads safely @@ -7,7 +7,7 @@ LL | bar(x); = help: within `Foo`, the trait `std::marker::Sync` is not implemented for `NoSync` = note: required because it appears within the type `Foo` note: required by `bar` - --> $DIR/no_share-enum.rs:20:1 + --> $DIR/no_share-enum.rs:10:1 | LL | fn bar(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/no_share-struct.rs b/src/test/ui/no_share-struct.rs index 34e43e9f2aaec..35867d0f2166d 100644 --- a/src/test/ui/no_share-struct.rs +++ b/src/test/ui/no_share-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] use std::marker::Sync; diff --git a/src/test/ui/no_share-struct.stderr b/src/test/ui/no_share-struct.stderr index 66291db5e53e7..fc4bcfb5b3e7e 100644 --- a/src/test/ui/no_share-struct.stderr +++ b/src/test/ui/no_share-struct.stderr @@ -1,12 +1,12 @@ error[E0277]: `Foo` cannot be shared between threads safely - --> $DIR/no_share-struct.rs:22:5 + --> $DIR/no_share-struct.rs:12:5 | LL | bar(x); | ^^^ `Foo` cannot be shared between threads safely | = help: the trait `std::marker::Sync` is not implemented for `Foo` note: required by `bar` - --> $DIR/no_share-struct.rs:18:1 + --> $DIR/no_share-struct.rs:8:1 | LL | fn bar(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/noexporttypeexe.rs b/src/test/ui/noexporttypeexe.rs index c950ef5b68002..651c92830ed8a 100644 --- a/src/test/ui/noexporttypeexe.rs +++ b/src/test/ui/noexporttypeexe.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:noexporttypelib.rs extern crate noexporttypelib; diff --git a/src/test/ui/noexporttypeexe.stderr b/src/test/ui/noexporttypeexe.stderr index 1671b3eae4965..329787fe74444 100644 --- a/src/test/ui/noexporttypeexe.stderr +++ b/src/test/ui/noexporttypeexe.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/noexporttypeexe.rs:20:18 + --> $DIR/noexporttypeexe.rs:10:18 | LL | let x: isize = noexporttypelib::foo(); | ^^^^^^^^^^^^^^^^^^^^^^ expected isize, found enum `std::option::Option` diff --git a/src/test/ui/non-constant-expr-for-arr-len.rs b/src/test/ui/non-constant-expr-for-arr-len.rs index f8f46f30f8d92..1b101d3233f14 100644 --- a/src/test/ui/non-constant-expr-for-arr-len.rs +++ b/src/test/ui/non-constant-expr-for-arr-len.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that non constant exprs fail for array repeat syntax fn main() { diff --git a/src/test/ui/non-constant-expr-for-arr-len.stderr b/src/test/ui/non-constant-expr-for-arr-len.stderr index 9504c84b10ed7..b947cb7e19c20 100644 --- a/src/test/ui/non-constant-expr-for-arr-len.stderr +++ b/src/test/ui/non-constant-expr-for-arr-len.stderr @@ -1,5 +1,5 @@ error[E0435]: attempt to use a non-constant value in a constant - --> $DIR/non-constant-expr-for-arr-len.rs:15:22 + --> $DIR/non-constant-expr-for-arr-len.rs:5:22 | LL | let _x = [0; n]; | ^ non-constant value diff --git a/src/test/ui/non-constant-in-const-path.rs b/src/test/ui/non-constant-in-const-path.rs index 1aae25105a813..343bb98aeb6ed 100644 --- a/src/test/ui/non-constant-in-const-path.rs +++ b/src/test/ui/non-constant-in-const-path.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = 0; match 1 { diff --git a/src/test/ui/non-constant-in-const-path.stderr b/src/test/ui/non-constant-in-const-path.stderr index 91ef9fd81e822..5936f76b2e0a8 100644 --- a/src/test/ui/non-constant-in-const-path.stderr +++ b/src/test/ui/non-constant-in-const-path.stderr @@ -1,5 +1,5 @@ error[E0080]: runtime values cannot be referenced in patterns - --> $DIR/non-constant-in-const-path.rs:14:15 + --> $DIR/non-constant-in-const-path.rs:4:15 | LL | 0 ..= x => {} | ^ diff --git a/src/test/ui/non-copyable-void.rs b/src/test/ui/non-copyable-void.rs index 63e5f963754e2..4f3c2d9404a8d 100644 --- a/src/test/ui/non-copyable-void.rs +++ b/src/test/ui/non-copyable-void.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-wasm32-bare no libc to test ffi with #![feature(libc)] diff --git a/src/test/ui/non-copyable-void.stderr b/src/test/ui/non-copyable-void.stderr index b5c83ec2289a6..4041e1935dcb7 100644 --- a/src/test/ui/non-copyable-void.stderr +++ b/src/test/ui/non-copyable-void.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `clone` found for type `libc::c_void` in the current scope - --> $DIR/non-copyable-void.rs:21:23 + --> $DIR/non-copyable-void.rs:11:23 | LL | let _z = (*y).clone(); | ^^^^^ diff --git a/src/test/ui/non-exhaustive/non-exhaustive-match-nested.rs b/src/test/ui/non-exhaustive/non-exhaustive-match-nested.rs index 1d524217a12a2..46b3d50ec84b8 100644 --- a/src/test/ui/non-exhaustive/non-exhaustive-match-nested.rs +++ b/src/test/ui/non-exhaustive/non-exhaustive-match-nested.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(slice_patterns)] enum t { a(u), b } diff --git a/src/test/ui/non-exhaustive/non-exhaustive-match-nested.stderr b/src/test/ui/non-exhaustive/non-exhaustive-match-nested.stderr index 6fb9788139f8f..2deb4805c4b0d 100644 --- a/src/test/ui/non-exhaustive/non-exhaustive-match-nested.stderr +++ b/src/test/ui/non-exhaustive/non-exhaustive-match-nested.stderr @@ -1,11 +1,11 @@ error[E0004]: non-exhaustive patterns: `(Some(&[]), Err(_))` not covered - --> $DIR/non-exhaustive-match-nested.rs:17:11 + --> $DIR/non-exhaustive-match-nested.rs:7:11 | LL | match (l1, l2) { //~ ERROR non-exhaustive patterns: `(Some(&[]), Err(_))` not covered | ^^^^^^^^ pattern `(Some(&[]), Err(_))` not covered error[E0004]: non-exhaustive patterns: `a(c)` not covered - --> $DIR/non-exhaustive-match-nested.rs:27:11 + --> $DIR/non-exhaustive-match-nested.rs:17:11 | LL | match x { //~ ERROR non-exhaustive patterns: `a(c)` not covered | ^ pattern `a(c)` not covered diff --git a/src/test/ui/non-exhaustive/non-exhaustive-match.rs b/src/test/ui/non-exhaustive/non-exhaustive-match.rs index 13b62429f4693..88f2023fdd9d6 100644 --- a/src/test/ui/non-exhaustive/non-exhaustive-match.rs +++ b/src/test/ui/non-exhaustive/non-exhaustive-match.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(slice_patterns)] #![allow(illegal_floating_point_literal_pattern)] diff --git a/src/test/ui/non-exhaustive/non-exhaustive-match.stderr b/src/test/ui/non-exhaustive/non-exhaustive-match.stderr index f48a0bc15eb6f..b40b82279547a 100644 --- a/src/test/ui/non-exhaustive/non-exhaustive-match.stderr +++ b/src/test/ui/non-exhaustive/non-exhaustive-match.stderr @@ -1,47 +1,47 @@ error[E0004]: non-exhaustive patterns: `a` not covered - --> $DIR/non-exhaustive-match.rs:18:11 + --> $DIR/non-exhaustive-match.rs:8:11 | LL | match x { t::b => { } } //~ ERROR non-exhaustive patterns: `a` not covered | ^ pattern `a` not covered error[E0004]: non-exhaustive patterns: `false` not covered - --> $DIR/non-exhaustive-match.rs:19:11 + --> $DIR/non-exhaustive-match.rs:9:11 | LL | match true { //~ ERROR non-exhaustive patterns: `false` not covered | ^^^^ pattern `false` not covered error[E0004]: non-exhaustive patterns: `Some(_)` not covered - --> $DIR/non-exhaustive-match.rs:22:11 + --> $DIR/non-exhaustive-match.rs:12:11 | LL | match Some(10) { //~ ERROR non-exhaustive patterns: `Some(_)` not covered | ^^^^^^^^ pattern `Some(_)` not covered error[E0004]: non-exhaustive patterns: `(_, _, _)` not covered - --> $DIR/non-exhaustive-match.rs:25:11 + --> $DIR/non-exhaustive-match.rs:15:11 | LL | match (2, 3, 4) { //~ ERROR non-exhaustive patterns: `(_, _, _)` not covered | ^^^^^^^^^ pattern `(_, _, _)` not covered error[E0004]: non-exhaustive patterns: `(a, a)` not covered - --> $DIR/non-exhaustive-match.rs:28:11 + --> $DIR/non-exhaustive-match.rs:18:11 | LL | match (t::a, t::a) { //~ ERROR non-exhaustive patterns: `(a, a)` not covered | ^^^^^^^^^^^^ pattern `(a, a)` not covered error[E0004]: non-exhaustive patterns: `b` not covered - --> $DIR/non-exhaustive-match.rs:32:11 + --> $DIR/non-exhaustive-match.rs:22:11 | LL | match t::a { //~ ERROR non-exhaustive patterns: `b` not covered | ^^^^ pattern `b` not covered error[E0004]: non-exhaustive patterns: `[]` not covered - --> $DIR/non-exhaustive-match.rs:43:11 + --> $DIR/non-exhaustive-match.rs:33:11 | LL | match *vec { //~ ERROR non-exhaustive patterns: `[]` not covered | ^^^^ pattern `[]` not covered error[E0004]: non-exhaustive patterns: `[_, _, _, _]` not covered - --> $DIR/non-exhaustive-match.rs:56:11 + --> $DIR/non-exhaustive-match.rs:46:11 | LL | match *vec { //~ ERROR non-exhaustive patterns: `[_, _, _, _]` not covered | ^^^^ pattern `[_, _, _, _]` not covered diff --git a/src/test/ui/non-exhaustive/non-exhaustive-pattern-witness.rs b/src/test/ui/non-exhaustive/non-exhaustive-pattern-witness.rs index dd14a10a2bcec..9fcd4bdad7264 100644 --- a/src/test/ui/non-exhaustive/non-exhaustive-pattern-witness.rs +++ b/src/test/ui/non-exhaustive/non-exhaustive-pattern-witness.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(slice_patterns)] struct Foo { diff --git a/src/test/ui/non-exhaustive/non-exhaustive-pattern-witness.stderr b/src/test/ui/non-exhaustive/non-exhaustive-pattern-witness.stderr index e364e822ea878..d3a06e7b4b6f8 100644 --- a/src/test/ui/non-exhaustive/non-exhaustive-pattern-witness.stderr +++ b/src/test/ui/non-exhaustive/non-exhaustive-pattern-witness.stderr @@ -1,41 +1,41 @@ error[E0004]: non-exhaustive patterns: `Foo { first: false, second: Some([_, _, _, _]) }` not covered - --> $DIR/non-exhaustive-pattern-witness.rs:19:11 + --> $DIR/non-exhaustive-pattern-witness.rs:9:11 | LL | match (Foo { first: true, second: None }) { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ pattern `Foo { first: false, second: Some([_, _, _, _]) }` not covered error[E0004]: non-exhaustive patterns: `Red` not covered - --> $DIR/non-exhaustive-pattern-witness.rs:35:11 + --> $DIR/non-exhaustive-pattern-witness.rs:25:11 | LL | match Color::Red { | ^^^^^^^^^^ pattern `Red` not covered error[E0004]: non-exhaustive patterns: `East`, `South` and `West` not covered - --> $DIR/non-exhaustive-pattern-witness.rs:47:11 + --> $DIR/non-exhaustive-pattern-witness.rs:37:11 | LL | match Direction::North { | ^^^^^^^^^^^^^^^^ patterns `East`, `South` and `West` not covered error[E0004]: non-exhaustive patterns: `Second`, `Third`, `Fourth` and 8 more not covered - --> $DIR/non-exhaustive-pattern-witness.rs:58:11 + --> $DIR/non-exhaustive-pattern-witness.rs:48:11 | LL | match ExcessiveEnum::First { | ^^^^^^^^^^^^^^^^^^^^ patterns `Second`, `Third`, `Fourth` and 8 more not covered error[E0004]: non-exhaustive patterns: `CustomRGBA { a: true, .. }` not covered - --> $DIR/non-exhaustive-pattern-witness.rs:66:11 + --> $DIR/non-exhaustive-pattern-witness.rs:56:11 | LL | match Color::Red { | ^^^^^^^^^^ pattern `CustomRGBA { a: true, .. }` not covered error[E0004]: non-exhaustive patterns: `[Second(true), Second(false)]` not covered - --> $DIR/non-exhaustive-pattern-witness.rs:82:11 + --> $DIR/non-exhaustive-pattern-witness.rs:72:11 | LL | match *x { | ^^ pattern `[Second(true), Second(false)]` not covered error[E0004]: non-exhaustive patterns: `((), false)` not covered - --> $DIR/non-exhaustive-pattern-witness.rs:95:11 + --> $DIR/non-exhaustive-pattern-witness.rs:85:11 | LL | match ((), false) { | ^^^^^^^^^^^ pattern `((), false)` not covered diff --git a/src/test/ui/non-interger-atomic.rs b/src/test/ui/non-interger-atomic.rs index 2a6e148ca7911..00d07b7fe48e1 100644 --- a/src/test/ui/non-interger-atomic.rs +++ b/src/test/ui/non-interger-atomic.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(core_intrinsics)] #![allow(warnings)] #![crate_type = "rlib"] diff --git a/src/test/ui/non-interger-atomic.stderr b/src/test/ui/non-interger-atomic.stderr index 8cb114dd42c81..9a49ee88d00cc 100644 --- a/src/test/ui/non-interger-atomic.stderr +++ b/src/test/ui/non-interger-atomic.stderr @@ -1,95 +1,95 @@ error[E0511]: invalid monomorphization of `atomic_load` intrinsic: expected basic integer type, found `bool` - --> $DIR/non-interger-atomic.rs:23:5 + --> $DIR/non-interger-atomic.rs:13:5 | LL | intrinsics::atomic_load(p); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `atomic_store` intrinsic: expected basic integer type, found `bool` - --> $DIR/non-interger-atomic.rs:28:5 + --> $DIR/non-interger-atomic.rs:18:5 | LL | intrinsics::atomic_store(p, v); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `atomic_xchg` intrinsic: expected basic integer type, found `bool` - --> $DIR/non-interger-atomic.rs:33:5 + --> $DIR/non-interger-atomic.rs:23:5 | LL | intrinsics::atomic_xchg(p, v); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `atomic_cxchg` intrinsic: expected basic integer type, found `bool` - --> $DIR/non-interger-atomic.rs:38:5 + --> $DIR/non-interger-atomic.rs:28:5 | LL | intrinsics::atomic_cxchg(p, v, v); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `atomic_load` intrinsic: expected basic integer type, found `Foo` - --> $DIR/non-interger-atomic.rs:43:5 + --> $DIR/non-interger-atomic.rs:33:5 | LL | intrinsics::atomic_load(p); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `atomic_store` intrinsic: expected basic integer type, found `Foo` - --> $DIR/non-interger-atomic.rs:48:5 + --> $DIR/non-interger-atomic.rs:38:5 | LL | intrinsics::atomic_store(p, v); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `atomic_xchg` intrinsic: expected basic integer type, found `Foo` - --> $DIR/non-interger-atomic.rs:53:5 + --> $DIR/non-interger-atomic.rs:43:5 | LL | intrinsics::atomic_xchg(p, v); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `atomic_cxchg` intrinsic: expected basic integer type, found `Foo` - --> $DIR/non-interger-atomic.rs:58:5 + --> $DIR/non-interger-atomic.rs:48:5 | LL | intrinsics::atomic_cxchg(p, v, v); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `atomic_load` intrinsic: expected basic integer type, found `&dyn std::ops::Fn()` - --> $DIR/non-interger-atomic.rs:63:5 + --> $DIR/non-interger-atomic.rs:53:5 | LL | intrinsics::atomic_load(p); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `atomic_store` intrinsic: expected basic integer type, found `&dyn std::ops::Fn()` - --> $DIR/non-interger-atomic.rs:68:5 + --> $DIR/non-interger-atomic.rs:58:5 | LL | intrinsics::atomic_store(p, v); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `atomic_xchg` intrinsic: expected basic integer type, found `&dyn std::ops::Fn()` - --> $DIR/non-interger-atomic.rs:73:5 + --> $DIR/non-interger-atomic.rs:63:5 | LL | intrinsics::atomic_xchg(p, v); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `atomic_cxchg` intrinsic: expected basic integer type, found `&dyn std::ops::Fn()` - --> $DIR/non-interger-atomic.rs:78:5 + --> $DIR/non-interger-atomic.rs:68:5 | LL | intrinsics::atomic_cxchg(p, v, v); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `atomic_load` intrinsic: expected basic integer type, found `[u8; 100]` - --> $DIR/non-interger-atomic.rs:83:5 + --> $DIR/non-interger-atomic.rs:73:5 | LL | intrinsics::atomic_load(p); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `atomic_store` intrinsic: expected basic integer type, found `[u8; 100]` - --> $DIR/non-interger-atomic.rs:88:5 + --> $DIR/non-interger-atomic.rs:78:5 | LL | intrinsics::atomic_store(p, v); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `atomic_xchg` intrinsic: expected basic integer type, found `[u8; 100]` - --> $DIR/non-interger-atomic.rs:93:5 + --> $DIR/non-interger-atomic.rs:83:5 | LL | intrinsics::atomic_xchg(p, v); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `atomic_cxchg` intrinsic: expected basic integer type, found `[u8; 100]` - --> $DIR/non-interger-atomic.rs:98:5 + --> $DIR/non-interger-atomic.rs:88:5 | LL | intrinsics::atomic_cxchg(p, v, v); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/non_modrs_mods/foors_mod.rs b/src/test/ui/non_modrs_mods/foors_mod.rs index 7d37c6d939954..13e72c786339e 100644 --- a/src/test/ui/non_modrs_mods/foors_mod.rs +++ b/src/test/ui/non_modrs_mods/foors_mod.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // ignore-test: not a test, used by non_modrs_mods.rs diff --git a/src/test/ui/non_modrs_mods/foors_mod/inner_foors_mod.rs b/src/test/ui/non_modrs_mods/foors_mod/inner_foors_mod.rs index 77cab972352bd..68429e9831f07 100644 --- a/src/test/ui/non_modrs_mods/foors_mod/inner_foors_mod.rs +++ b/src/test/ui/non_modrs_mods/foors_mod/inner_foors_mod.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod innest; diff --git a/src/test/ui/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs b/src/test/ui/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs index b61667cfd882c..b76b4321d62aa 100644 --- a/src/test/ui/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs +++ b/src/test/ui/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn foo() {} diff --git a/src/test/ui/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs b/src/test/ui/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs index b61667cfd882c..b76b4321d62aa 100644 --- a/src/test/ui/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs +++ b/src/test/ui/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn foo() {} diff --git a/src/test/ui/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs b/src/test/ui/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs index 77cab972352bd..68429e9831f07 100644 --- a/src/test/ui/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs +++ b/src/test/ui/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod innest; diff --git a/src/test/ui/non_modrs_mods/modrs_mod/inner_foors_mod.rs b/src/test/ui/non_modrs_mods/modrs_mod/inner_foors_mod.rs index 77cab972352bd..68429e9831f07 100644 --- a/src/test/ui/non_modrs_mods/modrs_mod/inner_foors_mod.rs +++ b/src/test/ui/non_modrs_mods/modrs_mod/inner_foors_mod.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod innest; diff --git a/src/test/ui/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs b/src/test/ui/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs index b61667cfd882c..b76b4321d62aa 100644 --- a/src/test/ui/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs +++ b/src/test/ui/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn foo() {} diff --git a/src/test/ui/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs b/src/test/ui/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs index b61667cfd882c..b76b4321d62aa 100644 --- a/src/test/ui/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs +++ b/src/test/ui/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn foo() {} diff --git a/src/test/ui/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs b/src/test/ui/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs index 77cab972352bd..68429e9831f07 100644 --- a/src/test/ui/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs +++ b/src/test/ui/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod innest; diff --git a/src/test/ui/non_modrs_mods/modrs_mod/mod.rs b/src/test/ui/non_modrs_mods/modrs_mod/mod.rs index 9e3f10f12ed63..f2a2c56b29132 100644 --- a/src/test/ui/non_modrs_mods/modrs_mod/mod.rs +++ b/src/test/ui/non_modrs_mods/modrs_mod/mod.rs @@ -1,12 +1,2 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod inner_modrs_mod; pub mod inner_foors_mod; diff --git a/src/test/ui/non_modrs_mods/non_modrs_mods.rs b/src/test/ui/non_modrs_mods/non_modrs_mods.rs index 9dc85f4d3f92d..56c24749b8520 100644 --- a/src/test/ui/non_modrs_mods/non_modrs_mods.rs +++ b/src/test/ui/non_modrs_mods/non_modrs_mods.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // Tests the formatting of the feature-gate errors for non_modrs_mods // diff --git a/src/test/ui/non_modrs_mods/non_modrs_mods.stderr b/src/test/ui/non_modrs_mods/non_modrs_mods.stderr index c45ab734fd579..c5ca50a70ac7e 100644 --- a/src/test/ui/non_modrs_mods/non_modrs_mods.stderr +++ b/src/test/ui/non_modrs_mods/non_modrs_mods.stderr @@ -1,5 +1,5 @@ error[E0658]: mod statements in non-mod.rs files are unstable (see issue #44660) - --> $DIR/modrs_mod/inner_foors_mod.rs:11:9 + --> $DIR/modrs_mod/inner_foors_mod.rs:1:9 | LL | pub mod innest; | ^^^^^^ @@ -8,7 +8,7 @@ LL | pub mod innest; = help: on stable builds, rename this file to inner_foors_mod/mod.rs error[E0658]: mod statements in non-mod.rs files are unstable (see issue #44660) - --> $DIR/foors_mod.rs:13:9 + --> $DIR/foors_mod.rs:4:9 | LL | pub mod inner_modrs_mod; | ^^^^^^^^^^^^^^^ @@ -17,7 +17,7 @@ LL | pub mod inner_modrs_mod; = help: on stable builds, rename this file to foors_mod/mod.rs error[E0658]: mod statements in non-mod.rs files are unstable (see issue #44660) - --> $DIR/foors_mod.rs:14:9 + --> $DIR/foors_mod.rs:5:9 | LL | pub mod inner_foors_mod; | ^^^^^^^^^^^^^^^ @@ -26,7 +26,7 @@ LL | pub mod inner_foors_mod; = help: on stable builds, rename this file to foors_mod/mod.rs error[E0658]: mod statements in non-mod.rs files are unstable (see issue #44660) - --> $DIR/foors_mod/inner_foors_mod.rs:11:9 + --> $DIR/foors_mod/inner_foors_mod.rs:1:9 | LL | pub mod innest; | ^^^^^^ diff --git a/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs b/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs index 226e6fda0a41f..97441eb5e57a7 100644 --- a/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs +++ b/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod inner_modrs_mod; diff --git a/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs b/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs index b61667cfd882c..b76b4321d62aa 100644 --- a/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs +++ b/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn foo() {} diff --git a/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs b/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs index 77cab972352bd..68429e9831f07 100644 --- a/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs +++ b/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod innest; diff --git a/src/test/ui/noncopyable-class.rs b/src/test/ui/noncopyable-class.rs index f5712b0c957ba..45ad29fbda2e2 100644 --- a/src/test/ui/noncopyable-class.rs +++ b/src/test/ui/noncopyable-class.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , 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 diff --git a/src/test/ui/noncopyable-class.stderr b/src/test/ui/noncopyable-class.stderr index 49ad30e56afd8..fa723e912b7b4 100644 --- a/src/test/ui/noncopyable-class.stderr +++ b/src/test/ui/noncopyable-class.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `clone` found for type `foo` in the current scope - --> $DIR/noncopyable-class.rs:44:16 + --> $DIR/noncopyable-class.rs:34:16 | LL | struct foo { | ---------- method `clone` not found for this diff --git a/src/test/ui/nonscalar-cast.rs b/src/test/ui/nonscalar-cast.rs index 0abbc05eef05d..db170f013c5be 100644 --- a/src/test/ui/nonscalar-cast.rs +++ b/src/test/ui/nonscalar-cast.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug)] struct foo { x: isize diff --git a/src/test/ui/nonscalar-cast.stderr b/src/test/ui/nonscalar-cast.stderr index d66ccd08f557e..e00b0b93205f1 100644 --- a/src/test/ui/nonscalar-cast.stderr +++ b/src/test/ui/nonscalar-cast.stderr @@ -1,5 +1,5 @@ error[E0605]: non-primitive cast: `foo` as `isize` - --> $DIR/nonscalar-cast.rs:17:20 + --> $DIR/nonscalar-cast.rs:7:20 | LL | println!("{}", foo{ x: 1 } as isize); //~ non-primitive cast: `foo` as `isize` [E0605] | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/not-clone-closure.rs b/src/test/ui/not-clone-closure.rs index 967cb3610ca5f..134d52c495c66 100644 --- a/src/test/ui/not-clone-closure.rs +++ b/src/test/ui/not-clone-closure.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that closures do not implement `Clone` if their environment is not `Clone`. struct S(i32); diff --git a/src/test/ui/not-clone-closure.stderr b/src/test/ui/not-clone-closure.stderr index eda9b1c495e70..b583db1e4ba2e 100644 --- a/src/test/ui/not-clone-closure.stderr +++ b/src/test/ui/not-clone-closure.stderr @@ -1,10 +1,10 @@ -error[E0277]: the trait bound `S: std::clone::Clone` is not satisfied in `[closure@$DIR/not-clone-closure.rs:17:17: 19:6 a:S]` - --> $DIR/not-clone-closure.rs:21:23 +error[E0277]: the trait bound `S: std::clone::Clone` is not satisfied in `[closure@$DIR/not-clone-closure.rs:7:17: 9:6 a:S]` + --> $DIR/not-clone-closure.rs:11:23 | LL | let hello = hello.clone(); //~ ERROR the trait bound `S: std::clone::Clone` is not satisfied - | ^^^^^ within `[closure@$DIR/not-clone-closure.rs:17:17: 19:6 a:S]`, the trait `std::clone::Clone` is not implemented for `S` + | ^^^^^ within `[closure@$DIR/not-clone-closure.rs:7:17: 9:6 a:S]`, the trait `std::clone::Clone` is not implemented for `S` | - = note: required because it appears within the type `[closure@$DIR/not-clone-closure.rs:17:17: 19:6 a:S]` + = note: required because it appears within the type `[closure@$DIR/not-clone-closure.rs:7:17: 9:6 a:S]` error: aborting due to previous error diff --git a/src/test/ui/not-copy-closure.nll.stderr b/src/test/ui/not-copy-closure.nll.stderr index b278df5e4b4cf..2f295315a08aa 100644 --- a/src/test/ui/not-copy-closure.nll.stderr +++ b/src/test/ui/not-copy-closure.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `hello` - --> $DIR/not-copy-closure.rs:20:13 + --> $DIR/not-copy-closure.rs:10:13 | LL | let b = hello; | ----- value moved here diff --git a/src/test/ui/not-copy-closure.rs b/src/test/ui/not-copy-closure.rs index 10567c5c961a2..f6530f9a410aa 100644 --- a/src/test/ui/not-copy-closure.rs +++ b/src/test/ui/not-copy-closure.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that closures do not implement `Copy` if their environment is not `Copy`. fn main() { diff --git a/src/test/ui/not-copy-closure.stderr b/src/test/ui/not-copy-closure.stderr index 7193a3ed02782..bdae06d3a66c4 100644 --- a/src/test/ui/not-copy-closure.stderr +++ b/src/test/ui/not-copy-closure.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `hello` - --> $DIR/not-copy-closure.rs:20:9 + --> $DIR/not-copy-closure.rs:10:9 | LL | let b = hello; | - value moved here @@ -7,7 +7,7 @@ LL | let c = hello; //~ ERROR use of moved value: `hello` [E0382] | ^ value used here after move | note: closure cannot be invoked more than once because it moves the variable `a` out of its environment - --> $DIR/not-copy-closure.rs:16:9 + --> $DIR/not-copy-closure.rs:6:9 | LL | a += 1; | ^ diff --git a/src/test/ui/not-enough-arguments.rs b/src/test/ui/not-enough-arguments.rs index c952906e5e89a..309283ed7f4fe 100644 --- a/src/test/ui/not-enough-arguments.rs +++ b/src/test/ui/not-enough-arguments.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that the only error msg we report is the // mismatch between the # of params, and not other // unrelated errors. diff --git a/src/test/ui/not-enough-arguments.stderr b/src/test/ui/not-enough-arguments.stderr index 6a869cc5d5521..c1ee43ea90484 100644 --- a/src/test/ui/not-enough-arguments.stderr +++ b/src/test/ui/not-enough-arguments.stderr @@ -1,5 +1,5 @@ error[E0061]: this function takes 4 parameters but 3 parameters were supplied - --> $DIR/not-enough-arguments.rs:20:3 + --> $DIR/not-enough-arguments.rs:10:3 | LL | fn foo(a: isize, b: isize, c: isize, d:isize) { | --------------------------------------------- defined here diff --git a/src/test/ui/not-panic/not-panic-safe-2.rs b/src/test/ui/not-panic/not-panic-safe-2.rs index 5490acf4bd6c1..cd074281d00ea 100644 --- a/src/test/ui/not-panic/not-panic-safe-2.rs +++ b/src/test/ui/not-panic/not-panic-safe-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] use std::panic::UnwindSafe; diff --git a/src/test/ui/not-panic/not-panic-safe-2.stderr b/src/test/ui/not-panic/not-panic-safe-2.stderr index 19408623ea391..4db127a463932 100644 --- a/src/test/ui/not-panic/not-panic-safe-2.stderr +++ b/src/test/ui/not-panic/not-panic-safe-2.stderr @@ -1,5 +1,5 @@ error[E0277]: the type `std::cell::UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary - --> $DIR/not-panic-safe-2.rs:20:5 + --> $DIR/not-panic-safe-2.rs:10:5 | LL | assert::>>(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ `std::cell::UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary @@ -8,13 +8,13 @@ LL | assert::>>(); = note: required because it appears within the type `std::cell::RefCell` = note: required because of the requirements on the impl of `std::panic::UnwindSafe` for `std::rc::Rc>` note: required by `assert` - --> $DIR/not-panic-safe-2.rs:17:1 + --> $DIR/not-panic-safe-2.rs:7:1 | LL | fn assert() {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the type `std::cell::UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary - --> $DIR/not-panic-safe-2.rs:20:5 + --> $DIR/not-panic-safe-2.rs:10:5 | LL | assert::>>(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ `std::cell::UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary @@ -24,7 +24,7 @@ LL | assert::>>(); = note: required because it appears within the type `std::cell::RefCell` = note: required because of the requirements on the impl of `std::panic::UnwindSafe` for `std::rc::Rc>` note: required by `assert` - --> $DIR/not-panic-safe-2.rs:17:1 + --> $DIR/not-panic-safe-2.rs:7:1 | LL | fn assert() {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/not-panic/not-panic-safe-3.rs b/src/test/ui/not-panic/not-panic-safe-3.rs index 0fac395a11582..b0ba3781f3453 100644 --- a/src/test/ui/not-panic/not-panic-safe-3.rs +++ b/src/test/ui/not-panic/not-panic-safe-3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] use std::panic::UnwindSafe; diff --git a/src/test/ui/not-panic/not-panic-safe-3.stderr b/src/test/ui/not-panic/not-panic-safe-3.stderr index a353c82c68780..1f87f20f2e284 100644 --- a/src/test/ui/not-panic/not-panic-safe-3.stderr +++ b/src/test/ui/not-panic/not-panic-safe-3.stderr @@ -1,5 +1,5 @@ error[E0277]: the type `std::cell::UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary - --> $DIR/not-panic-safe-3.rs:20:5 + --> $DIR/not-panic-safe-3.rs:10:5 | LL | assert::>>(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ `std::cell::UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary @@ -8,13 +8,13 @@ LL | assert::>>(); = note: required because it appears within the type `std::cell::RefCell` = note: required because of the requirements on the impl of `std::panic::UnwindSafe` for `std::sync::Arc>` note: required by `assert` - --> $DIR/not-panic-safe-3.rs:17:1 + --> $DIR/not-panic-safe-3.rs:7:1 | LL | fn assert() {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the type `std::cell::UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary - --> $DIR/not-panic-safe-3.rs:20:5 + --> $DIR/not-panic-safe-3.rs:10:5 | LL | assert::>>(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ `std::cell::UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary @@ -24,7 +24,7 @@ LL | assert::>>(); = note: required because it appears within the type `std::cell::RefCell` = note: required because of the requirements on the impl of `std::panic::UnwindSafe` for `std::sync::Arc>` note: required by `assert` - --> $DIR/not-panic-safe-3.rs:17:1 + --> $DIR/not-panic-safe-3.rs:7:1 | LL | fn assert() {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/not-panic/not-panic-safe-4.rs b/src/test/ui/not-panic/not-panic-safe-4.rs index bf0392018b5dd..ed2760576d83c 100644 --- a/src/test/ui/not-panic/not-panic-safe-4.rs +++ b/src/test/ui/not-panic/not-panic-safe-4.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] use std::panic::UnwindSafe; diff --git a/src/test/ui/not-panic/not-panic-safe-4.stderr b/src/test/ui/not-panic/not-panic-safe-4.stderr index 27d3defe123fe..24f649002960c 100644 --- a/src/test/ui/not-panic/not-panic-safe-4.stderr +++ b/src/test/ui/not-panic/not-panic-safe-4.stderr @@ -1,5 +1,5 @@ error[E0277]: the type `std::cell::UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary - --> $DIR/not-panic-safe-4.rs:19:5 + --> $DIR/not-panic-safe-4.rs:9:5 | LL | assert::<&RefCell>(); | ^^^^^^^^^^^^^^^^^^^^^^^ `std::cell::UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary @@ -8,13 +8,13 @@ LL | assert::<&RefCell>(); = note: required because it appears within the type `std::cell::RefCell` = note: required because of the requirements on the impl of `std::panic::UnwindSafe` for `&std::cell::RefCell` note: required by `assert` - --> $DIR/not-panic-safe-4.rs:16:1 + --> $DIR/not-panic-safe-4.rs:6:1 | LL | fn assert() {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the type `std::cell::UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary - --> $DIR/not-panic-safe-4.rs:19:5 + --> $DIR/not-panic-safe-4.rs:9:5 | LL | assert::<&RefCell>(); | ^^^^^^^^^^^^^^^^^^^^^^^ `std::cell::UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary @@ -24,7 +24,7 @@ LL | assert::<&RefCell>(); = note: required because it appears within the type `std::cell::RefCell` = note: required because of the requirements on the impl of `std::panic::UnwindSafe` for `&std::cell::RefCell` note: required by `assert` - --> $DIR/not-panic-safe-4.rs:16:1 + --> $DIR/not-panic-safe-4.rs:6:1 | LL | fn assert() {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/not-panic/not-panic-safe-5.rs b/src/test/ui/not-panic/not-panic-safe-5.rs index 627a0fe78cf06..e0d37517dd469 100644 --- a/src/test/ui/not-panic/not-panic-safe-5.rs +++ b/src/test/ui/not-panic/not-panic-safe-5.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] use std::panic::UnwindSafe; diff --git a/src/test/ui/not-panic/not-panic-safe-5.stderr b/src/test/ui/not-panic/not-panic-safe-5.stderr index ba3b3fadb6a1b..46400a4b03c12 100644 --- a/src/test/ui/not-panic/not-panic-safe-5.stderr +++ b/src/test/ui/not-panic/not-panic-safe-5.stderr @@ -1,5 +1,5 @@ error[E0277]: the type `std::cell::UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary - --> $DIR/not-panic-safe-5.rs:19:5 + --> $DIR/not-panic-safe-5.rs:9:5 | LL | assert::<*const UnsafeCell>(); //~ ERROR E0277 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `std::cell::UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary @@ -7,7 +7,7 @@ LL | assert::<*const UnsafeCell>(); //~ ERROR E0277 = help: the trait `std::panic::RefUnwindSafe` is not implemented for `std::cell::UnsafeCell` = note: required because of the requirements on the impl of `std::panic::UnwindSafe` for `*const std::cell::UnsafeCell` note: required by `assert` - --> $DIR/not-panic-safe-5.rs:16:1 + --> $DIR/not-panic-safe-5.rs:6:1 | LL | fn assert() {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/not-panic/not-panic-safe-6.rs b/src/test/ui/not-panic/not-panic-safe-6.rs index 950f0a0b53aec..a42e337ad9340 100644 --- a/src/test/ui/not-panic/not-panic-safe-6.rs +++ b/src/test/ui/not-panic/not-panic-safe-6.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] use std::panic::UnwindSafe; diff --git a/src/test/ui/not-panic/not-panic-safe-6.stderr b/src/test/ui/not-panic/not-panic-safe-6.stderr index da6c2a5829480..a4c75ec7c6188 100644 --- a/src/test/ui/not-panic/not-panic-safe-6.stderr +++ b/src/test/ui/not-panic/not-panic-safe-6.stderr @@ -1,5 +1,5 @@ error[E0277]: the type `std::cell::UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary - --> $DIR/not-panic-safe-6.rs:19:5 + --> $DIR/not-panic-safe-6.rs:9:5 | LL | assert::<*mut RefCell>(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ `std::cell::UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary @@ -8,13 +8,13 @@ LL | assert::<*mut RefCell>(); = note: required because it appears within the type `std::cell::RefCell` = note: required because of the requirements on the impl of `std::panic::UnwindSafe` for `*mut std::cell::RefCell` note: required by `assert` - --> $DIR/not-panic-safe-6.rs:16:1 + --> $DIR/not-panic-safe-6.rs:6:1 | LL | fn assert() {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the type `std::cell::UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary - --> $DIR/not-panic-safe-6.rs:19:5 + --> $DIR/not-panic-safe-6.rs:9:5 | LL | assert::<*mut RefCell>(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ `std::cell::UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary @@ -24,7 +24,7 @@ LL | assert::<*mut RefCell>(); = note: required because it appears within the type `std::cell::RefCell` = note: required because of the requirements on the impl of `std::panic::UnwindSafe` for `*mut std::cell::RefCell` note: required by `assert` - --> $DIR/not-panic-safe-6.rs:16:1 + --> $DIR/not-panic-safe-6.rs:6:1 | LL | fn assert() {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/not-panic/not-panic-safe.rs b/src/test/ui/not-panic/not-panic-safe.rs index 0ebf3d3fed7b5..93a8506ab181f 100644 --- a/src/test/ui/not-panic/not-panic-safe.rs +++ b/src/test/ui/not-panic/not-panic-safe.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] #![feature(recover)] diff --git a/src/test/ui/not-panic/not-panic-safe.stderr b/src/test/ui/not-panic/not-panic-safe.stderr index f349b5d2e2622..2d12e697d5a7a 100644 --- a/src/test/ui/not-panic/not-panic-safe.stderr +++ b/src/test/ui/not-panic/not-panic-safe.stderr @@ -1,12 +1,12 @@ error[E0277]: the type `&mut i32` may not be safely transferred across an unwind boundary - --> $DIR/not-panic-safe.rs:19:5 + --> $DIR/not-panic-safe.rs:9:5 | LL | assert::<&mut i32>(); | ^^^^^^^^^^^^^^^^^^ `&mut i32` may not be safely transferred across an unwind boundary | = help: the trait `std::panic::UnwindSafe` is not implemented for `&mut i32` note: required by `assert` - --> $DIR/not-panic-safe.rs:16:1 + --> $DIR/not-panic-safe.rs:6:1 | LL | fn assert() {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/not-sync.rs b/src/test/ui/not-sync.rs index a383244f415c8..70ba1fc5809fb 100644 --- a/src/test/ui/not-sync.rs +++ b/src/test/ui/not-sync.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cell::{Cell, RefCell}; use std::rc::{Rc, Weak}; use std::sync::mpsc::{Receiver, Sender}; diff --git a/src/test/ui/not-sync.stderr b/src/test/ui/not-sync.stderr index 026fd5dd713e8..d102528bc6e92 100644 --- a/src/test/ui/not-sync.stderr +++ b/src/test/ui/not-sync.stderr @@ -1,77 +1,77 @@ error[E0277]: `std::cell::Cell` cannot be shared between threads safely - --> $DIR/not-sync.rs:18:5 + --> $DIR/not-sync.rs:8:5 | LL | test::>(); | ^^^^^^^^^^^^^^^^^ `std::cell::Cell` cannot be shared between threads safely | = help: the trait `std::marker::Sync` is not implemented for `std::cell::Cell` note: required by `test` - --> $DIR/not-sync.rs:15:1 + --> $DIR/not-sync.rs:5:1 | LL | fn test() {} | ^^^^^^^^^^^^^^^^^^ error[E0277]: `std::cell::RefCell` cannot be shared between threads safely - --> $DIR/not-sync.rs:20:5 + --> $DIR/not-sync.rs:10:5 | LL | test::>(); | ^^^^^^^^^^^^^^^^^^^^ `std::cell::RefCell` cannot be shared between threads safely | = help: the trait `std::marker::Sync` is not implemented for `std::cell::RefCell` note: required by `test` - --> $DIR/not-sync.rs:15:1 + --> $DIR/not-sync.rs:5:1 | LL | fn test() {} | ^^^^^^^^^^^^^^^^^^ error[E0277]: `std::rc::Rc` cannot be shared between threads safely - --> $DIR/not-sync.rs:23:5 + --> $DIR/not-sync.rs:13:5 | LL | test::>(); | ^^^^^^^^^^^^^^^ `std::rc::Rc` cannot be shared between threads safely | = help: the trait `std::marker::Sync` is not implemented for `std::rc::Rc` note: required by `test` - --> $DIR/not-sync.rs:15:1 + --> $DIR/not-sync.rs:5:1 | LL | fn test() {} | ^^^^^^^^^^^^^^^^^^ error[E0277]: `std::rc::Weak` cannot be shared between threads safely - --> $DIR/not-sync.rs:25:5 + --> $DIR/not-sync.rs:15:5 | LL | test::>(); | ^^^^^^^^^^^^^^^^^ `std::rc::Weak` cannot be shared between threads safely | = help: the trait `std::marker::Sync` is not implemented for `std::rc::Weak` note: required by `test` - --> $DIR/not-sync.rs:15:1 + --> $DIR/not-sync.rs:5:1 | LL | fn test() {} | ^^^^^^^^^^^^^^^^^^ error[E0277]: `std::sync::mpsc::Receiver` cannot be shared between threads safely - --> $DIR/not-sync.rs:28:5 + --> $DIR/not-sync.rs:18:5 | LL | test::>(); | ^^^^^^^^^^^^^^^^^^^^^ `std::sync::mpsc::Receiver` cannot be shared between threads safely | = help: the trait `std::marker::Sync` is not implemented for `std::sync::mpsc::Receiver` note: required by `test` - --> $DIR/not-sync.rs:15:1 + --> $DIR/not-sync.rs:5:1 | LL | fn test() {} | ^^^^^^^^^^^^^^^^^^ error[E0277]: `std::sync::mpsc::Sender` cannot be shared between threads safely - --> $DIR/not-sync.rs:30:5 + --> $DIR/not-sync.rs:20:5 | LL | test::>(); | ^^^^^^^^^^^^^^^^^^^ `std::sync::mpsc::Sender` cannot be shared between threads safely | = help: the trait `std::marker::Sync` is not implemented for `std::sync::mpsc::Sender` note: required by `test` - --> $DIR/not-sync.rs:15:1 + --> $DIR/not-sync.rs:5:1 | LL | fn test() {} | ^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/numeric/numeric-cast-2.rs b/src/test/ui/numeric/numeric-cast-2.rs index 2092b6bce37c1..ad2de5d2bd516 100644 --- a/src/test/ui/numeric/numeric-cast-2.rs +++ b/src/test/ui/numeric/numeric-cast-2.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo() -> i32 { 4 } diff --git a/src/test/ui/numeric/numeric-cast-2.stderr b/src/test/ui/numeric/numeric-cast-2.stderr index 3d4855837172e..79088f0e2ca2f 100644 --- a/src/test/ui/numeric/numeric-cast-2.stderr +++ b/src/test/ui/numeric/numeric-cast-2.stderr @@ -1,17 +1,17 @@ error[E0308]: mismatched types - --> $DIR/numeric-cast-2.rs:15:18 + --> $DIR/numeric-cast-2.rs:5:18 | LL | let x: u16 = foo(); | ^^^^^ expected u16, found i32 error[E0308]: mismatched types - --> $DIR/numeric-cast-2.rs:17:18 + --> $DIR/numeric-cast-2.rs:7:18 | LL | let y: i64 = x + x; | ^^^^^ expected i64, found u16 error[E0308]: mismatched types - --> $DIR/numeric-cast-2.rs:19:18 + --> $DIR/numeric-cast-2.rs:9:18 | LL | let z: i32 = x + x; | ^^^^^ expected i32, found u16 diff --git a/src/test/ui/numeric/numeric-cast.rs b/src/test/ui/numeric/numeric-cast.rs index 69bfdfa94b13e..39378c288fe56 100644 --- a/src/test/ui/numeric/numeric-cast.rs +++ b/src/test/ui/numeric/numeric-cast.rs @@ -1,14 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn foo(_x: N) {} fn main() { diff --git a/src/test/ui/numeric/numeric-cast.stderr b/src/test/ui/numeric/numeric-cast.stderr index 4aac65ff4cbd2..2c4f6e20f1f0a 100644 --- a/src/test/ui/numeric/numeric-cast.stderr +++ b/src/test/ui/numeric/numeric-cast.stderr @@ -1,143 +1,143 @@ error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:29:18 + --> $DIR/numeric-cast.rs:18:18 | LL | foo::(x_u64); | ^^^^^ expected usize, found u64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:31:18 + --> $DIR/numeric-cast.rs:20:18 | LL | foo::(x_u32); | ^^^^^ expected usize, found u32 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:33:18 + --> $DIR/numeric-cast.rs:22:18 | LL | foo::(x_u16); | ^^^^^ expected usize, found u16 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:35:18 + --> $DIR/numeric-cast.rs:24:18 | LL | foo::(x_u8); | ^^^^ expected usize, found u8 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:37:18 + --> $DIR/numeric-cast.rs:26:18 | LL | foo::(x_isize); | ^^^^^^^ expected usize, found isize error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:39:18 + --> $DIR/numeric-cast.rs:28:18 | LL | foo::(x_i64); | ^^^^^ expected usize, found i64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:41:18 + --> $DIR/numeric-cast.rs:30:18 | LL | foo::(x_i32); | ^^^^^ expected usize, found i32 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:43:18 + --> $DIR/numeric-cast.rs:32:18 | LL | foo::(x_i16); | ^^^^^ expected usize, found i16 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:45:18 + --> $DIR/numeric-cast.rs:34:18 | LL | foo::(x_i8); | ^^^^ expected usize, found i8 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:47:18 + --> $DIR/numeric-cast.rs:36:18 | LL | foo::(x_f64); | ^^^^^ expected usize, found f64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:49:18 + --> $DIR/numeric-cast.rs:38:18 | LL | foo::(x_f32); | ^^^^^ expected usize, found f32 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:52:18 + --> $DIR/numeric-cast.rs:41:18 | LL | foo::(x_usize); | ^^^^^^^ expected isize, found usize error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:54:18 + --> $DIR/numeric-cast.rs:43:18 | LL | foo::(x_u64); | ^^^^^ expected isize, found u64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:56:18 + --> $DIR/numeric-cast.rs:45:18 | LL | foo::(x_u32); | ^^^^^ expected isize, found u32 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:58:18 + --> $DIR/numeric-cast.rs:47:18 | LL | foo::(x_u16); | ^^^^^ expected isize, found u16 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:60:18 + --> $DIR/numeric-cast.rs:49:18 | LL | foo::(x_u8); | ^^^^ expected isize, found u8 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:63:18 + --> $DIR/numeric-cast.rs:52:18 | LL | foo::(x_i64); | ^^^^^ expected isize, found i64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:65:18 + --> $DIR/numeric-cast.rs:54:18 | LL | foo::(x_i32); | ^^^^^ expected isize, found i32 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:67:18 + --> $DIR/numeric-cast.rs:56:18 | LL | foo::(x_i16); | ^^^^^ expected isize, found i16 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:69:18 + --> $DIR/numeric-cast.rs:58:18 | LL | foo::(x_i8); | ^^^^ expected isize, found i8 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:71:18 + --> $DIR/numeric-cast.rs:60:18 | LL | foo::(x_f64); | ^^^^^ expected isize, found f64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:73:18 + --> $DIR/numeric-cast.rs:62:18 | LL | foo::(x_f32); | ^^^^^ expected isize, found f32 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:76:16 + --> $DIR/numeric-cast.rs:65:16 | LL | foo::(x_usize); | ^^^^^^^ expected u64, found usize error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:79:16 + --> $DIR/numeric-cast.rs:68:16 | LL | foo::(x_u32); | ^^^^^ expected u64, found u32 @@ -147,7 +147,7 @@ LL | foo::(x_u32.into()); | ^^^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:81:16 + --> $DIR/numeric-cast.rs:70:16 | LL | foo::(x_u16); | ^^^^^ expected u64, found u16 @@ -157,7 +157,7 @@ LL | foo::(x_u16.into()); | ^^^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:83:16 + --> $DIR/numeric-cast.rs:72:16 | LL | foo::(x_u8); | ^^^^ expected u64, found u8 @@ -167,85 +167,85 @@ LL | foo::(x_u8.into()); | ^^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:85:16 + --> $DIR/numeric-cast.rs:74:16 | LL | foo::(x_isize); | ^^^^^^^ expected u64, found isize error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:87:16 + --> $DIR/numeric-cast.rs:76:16 | LL | foo::(x_i64); | ^^^^^ expected u64, found i64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:89:16 + --> $DIR/numeric-cast.rs:78:16 | LL | foo::(x_i32); | ^^^^^ expected u64, found i32 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:91:16 + --> $DIR/numeric-cast.rs:80:16 | LL | foo::(x_i16); | ^^^^^ expected u64, found i16 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:93:16 + --> $DIR/numeric-cast.rs:82:16 | LL | foo::(x_i8); | ^^^^ expected u64, found i8 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:95:16 + --> $DIR/numeric-cast.rs:84:16 | LL | foo::(x_f64); | ^^^^^ expected u64, found f64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:97:16 + --> $DIR/numeric-cast.rs:86:16 | LL | foo::(x_f32); | ^^^^^ expected u64, found f32 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:100:16 + --> $DIR/numeric-cast.rs:89:16 | LL | foo::(x_usize); | ^^^^^^^ expected i64, found usize error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:102:16 + --> $DIR/numeric-cast.rs:91:16 | LL | foo::(x_u64); | ^^^^^ expected i64, found u64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:104:16 + --> $DIR/numeric-cast.rs:93:16 | LL | foo::(x_u32); | ^^^^^ expected i64, found u32 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:106:16 + --> $DIR/numeric-cast.rs:95:16 | LL | foo::(x_u16); | ^^^^^ expected i64, found u16 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:108:16 + --> $DIR/numeric-cast.rs:97:16 | LL | foo::(x_u8); | ^^^^ expected i64, found u8 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:110:16 + --> $DIR/numeric-cast.rs:99:16 | LL | foo::(x_isize); | ^^^^^^^ expected i64, found isize error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:113:16 + --> $DIR/numeric-cast.rs:102:16 | LL | foo::(x_i32); | ^^^^^ expected i64, found i32 @@ -255,7 +255,7 @@ LL | foo::(x_i32.into()); | ^^^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:115:16 + --> $DIR/numeric-cast.rs:104:16 | LL | foo::(x_i16); | ^^^^^ expected i64, found i16 @@ -265,7 +265,7 @@ LL | foo::(x_i16.into()); | ^^^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:117:16 + --> $DIR/numeric-cast.rs:106:16 | LL | foo::(x_i8); | ^^^^ expected i64, found i8 @@ -275,31 +275,31 @@ LL | foo::(x_i8.into()); | ^^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:119:16 + --> $DIR/numeric-cast.rs:108:16 | LL | foo::(x_f64); | ^^^^^ expected i64, found f64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:121:16 + --> $DIR/numeric-cast.rs:110:16 | LL | foo::(x_f32); | ^^^^^ expected i64, found f32 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:124:16 + --> $DIR/numeric-cast.rs:113:16 | LL | foo::(x_usize); | ^^^^^^^ expected u32, found usize error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:126:16 + --> $DIR/numeric-cast.rs:115:16 | LL | foo::(x_u64); | ^^^^^ expected u32, found u64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:129:16 + --> $DIR/numeric-cast.rs:118:16 | LL | foo::(x_u16); | ^^^^^ expected u32, found u16 @@ -309,7 +309,7 @@ LL | foo::(x_u16.into()); | ^^^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:131:16 + --> $DIR/numeric-cast.rs:120:16 | LL | foo::(x_u8); | ^^^^ expected u32, found u8 @@ -319,91 +319,91 @@ LL | foo::(x_u8.into()); | ^^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:133:16 + --> $DIR/numeric-cast.rs:122:16 | LL | foo::(x_isize); | ^^^^^^^ expected u32, found isize error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:135:16 + --> $DIR/numeric-cast.rs:124:16 | LL | foo::(x_i64); | ^^^^^ expected u32, found i64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:137:16 + --> $DIR/numeric-cast.rs:126:16 | LL | foo::(x_i32); | ^^^^^ expected u32, found i32 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:139:16 + --> $DIR/numeric-cast.rs:128:16 | LL | foo::(x_i16); | ^^^^^ expected u32, found i16 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:141:16 + --> $DIR/numeric-cast.rs:130:16 | LL | foo::(x_i8); | ^^^^ expected u32, found i8 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:143:16 + --> $DIR/numeric-cast.rs:132:16 | LL | foo::(x_f64); | ^^^^^ expected u32, found f64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:145:16 + --> $DIR/numeric-cast.rs:134:16 | LL | foo::(x_f32); | ^^^^^ expected u32, found f32 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:148:16 + --> $DIR/numeric-cast.rs:137:16 | LL | foo::(x_usize); | ^^^^^^^ expected i32, found usize error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:150:16 + --> $DIR/numeric-cast.rs:139:16 | LL | foo::(x_u64); | ^^^^^ expected i32, found u64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:152:16 + --> $DIR/numeric-cast.rs:141:16 | LL | foo::(x_u32); | ^^^^^ expected i32, found u32 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:154:16 + --> $DIR/numeric-cast.rs:143:16 | LL | foo::(x_u16); | ^^^^^ expected i32, found u16 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:156:16 + --> $DIR/numeric-cast.rs:145:16 | LL | foo::(x_u8); | ^^^^ expected i32, found u8 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:158:16 + --> $DIR/numeric-cast.rs:147:16 | LL | foo::(x_isize); | ^^^^^^^ expected i32, found isize error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:160:16 + --> $DIR/numeric-cast.rs:149:16 | LL | foo::(x_i64); | ^^^^^ expected i32, found i64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:163:16 + --> $DIR/numeric-cast.rs:152:16 | LL | foo::(x_i16); | ^^^^^ expected i32, found i16 @@ -413,7 +413,7 @@ LL | foo::(x_i16.into()); | ^^^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:165:16 + --> $DIR/numeric-cast.rs:154:16 | LL | foo::(x_i8); | ^^^^ expected i32, found i8 @@ -423,37 +423,37 @@ LL | foo::(x_i8.into()); | ^^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:167:16 + --> $DIR/numeric-cast.rs:156:16 | LL | foo::(x_f64); | ^^^^^ expected i32, found f64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:169:16 + --> $DIR/numeric-cast.rs:158:16 | LL | foo::(x_f32); | ^^^^^ expected i32, found f32 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:172:16 + --> $DIR/numeric-cast.rs:161:16 | LL | foo::(x_usize); | ^^^^^^^ expected u16, found usize error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:174:16 + --> $DIR/numeric-cast.rs:163:16 | LL | foo::(x_u64); | ^^^^^ expected u16, found u64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:176:16 + --> $DIR/numeric-cast.rs:165:16 | LL | foo::(x_u32); | ^^^^^ expected u16, found u32 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:179:16 + --> $DIR/numeric-cast.rs:168:16 | LL | foo::(x_u8); | ^^^^ expected u16, found u8 @@ -463,97 +463,97 @@ LL | foo::(x_u8.into()); | ^^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:181:16 + --> $DIR/numeric-cast.rs:170:16 | LL | foo::(x_isize); | ^^^^^^^ expected u16, found isize error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:183:16 + --> $DIR/numeric-cast.rs:172:16 | LL | foo::(x_i64); | ^^^^^ expected u16, found i64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:185:16 + --> $DIR/numeric-cast.rs:174:16 | LL | foo::(x_i32); | ^^^^^ expected u16, found i32 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:187:16 + --> $DIR/numeric-cast.rs:176:16 | LL | foo::(x_i16); | ^^^^^ expected u16, found i16 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:189:16 + --> $DIR/numeric-cast.rs:178:16 | LL | foo::(x_i8); | ^^^^ expected u16, found i8 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:191:16 + --> $DIR/numeric-cast.rs:180:16 | LL | foo::(x_f64); | ^^^^^ expected u16, found f64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:193:16 + --> $DIR/numeric-cast.rs:182:16 | LL | foo::(x_f32); | ^^^^^ expected u16, found f32 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:196:16 + --> $DIR/numeric-cast.rs:185:16 | LL | foo::(x_usize); | ^^^^^^^ expected i16, found usize error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:198:16 + --> $DIR/numeric-cast.rs:187:16 | LL | foo::(x_u64); | ^^^^^ expected i16, found u64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:200:16 + --> $DIR/numeric-cast.rs:189:16 | LL | foo::(x_u32); | ^^^^^ expected i16, found u32 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:202:16 + --> $DIR/numeric-cast.rs:191:16 | LL | foo::(x_u16); | ^^^^^ expected i16, found u16 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:204:16 + --> $DIR/numeric-cast.rs:193:16 | LL | foo::(x_u8); | ^^^^ expected i16, found u8 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:206:16 + --> $DIR/numeric-cast.rs:195:16 | LL | foo::(x_isize); | ^^^^^^^ expected i16, found isize error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:208:16 + --> $DIR/numeric-cast.rs:197:16 | LL | foo::(x_i64); | ^^^^^ expected i16, found i64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:210:16 + --> $DIR/numeric-cast.rs:199:16 | LL | foo::(x_i32); | ^^^^^ expected i16, found i32 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:213:16 + --> $DIR/numeric-cast.rs:202:16 | LL | foo::(x_i8); | ^^^^ expected i16, found i8 @@ -563,163 +563,163 @@ LL | foo::(x_i8.into()); | ^^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:215:16 + --> $DIR/numeric-cast.rs:204:16 | LL | foo::(x_f64); | ^^^^^ expected i16, found f64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:217:16 + --> $DIR/numeric-cast.rs:206:16 | LL | foo::(x_f32); | ^^^^^ expected i16, found f32 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:220:15 + --> $DIR/numeric-cast.rs:209:15 | LL | foo::(x_usize); | ^^^^^^^ expected u8, found usize error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:222:15 + --> $DIR/numeric-cast.rs:211:15 | LL | foo::(x_u64); | ^^^^^ expected u8, found u64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:224:15 + --> $DIR/numeric-cast.rs:213:15 | LL | foo::(x_u32); | ^^^^^ expected u8, found u32 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:226:15 + --> $DIR/numeric-cast.rs:215:15 | LL | foo::(x_u16); | ^^^^^ expected u8, found u16 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:229:15 + --> $DIR/numeric-cast.rs:218:15 | LL | foo::(x_isize); | ^^^^^^^ expected u8, found isize error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:231:15 + --> $DIR/numeric-cast.rs:220:15 | LL | foo::(x_i64); | ^^^^^ expected u8, found i64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:233:15 + --> $DIR/numeric-cast.rs:222:15 | LL | foo::(x_i32); | ^^^^^ expected u8, found i32 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:235:15 + --> $DIR/numeric-cast.rs:224:15 | LL | foo::(x_i16); | ^^^^^ expected u8, found i16 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:237:15 + --> $DIR/numeric-cast.rs:226:15 | LL | foo::(x_i8); | ^^^^ expected u8, found i8 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:239:15 + --> $DIR/numeric-cast.rs:228:15 | LL | foo::(x_f64); | ^^^^^ expected u8, found f64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:241:15 + --> $DIR/numeric-cast.rs:230:15 | LL | foo::(x_f32); | ^^^^^ expected u8, found f32 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:244:15 + --> $DIR/numeric-cast.rs:233:15 | LL | foo::(x_usize); | ^^^^^^^ expected i8, found usize error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:246:15 + --> $DIR/numeric-cast.rs:235:15 | LL | foo::(x_u64); | ^^^^^ expected i8, found u64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:248:15 + --> $DIR/numeric-cast.rs:237:15 | LL | foo::(x_u32); | ^^^^^ expected i8, found u32 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:250:15 + --> $DIR/numeric-cast.rs:239:15 | LL | foo::(x_u16); | ^^^^^ expected i8, found u16 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:252:15 + --> $DIR/numeric-cast.rs:241:15 | LL | foo::(x_u8); | ^^^^ expected i8, found u8 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:254:15 + --> $DIR/numeric-cast.rs:243:15 | LL | foo::(x_isize); | ^^^^^^^ expected i8, found isize error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:256:15 + --> $DIR/numeric-cast.rs:245:15 | LL | foo::(x_i64); | ^^^^^ expected i8, found i64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:258:15 + --> $DIR/numeric-cast.rs:247:15 | LL | foo::(x_i32); | ^^^^^ expected i8, found i32 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:260:15 + --> $DIR/numeric-cast.rs:249:15 | LL | foo::(x_i16); | ^^^^^ expected i8, found i16 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:263:15 + --> $DIR/numeric-cast.rs:252:15 | LL | foo::(x_f64); | ^^^^^ expected i8, found f64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:265:15 + --> $DIR/numeric-cast.rs:254:15 | LL | foo::(x_f32); | ^^^^^ expected i8, found f32 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:268:16 + --> $DIR/numeric-cast.rs:257:16 | LL | foo::(x_usize); | ^^^^^^^ expected f64, found usize error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:270:16 + --> $DIR/numeric-cast.rs:259:16 | LL | foo::(x_u64); | ^^^^^ expected f64, found u64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:272:16 + --> $DIR/numeric-cast.rs:261:16 | LL | foo::(x_u32); | ^^^^^ expected f64, found u32 @@ -729,7 +729,7 @@ LL | foo::(x_u32.into()); | ^^^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:274:16 + --> $DIR/numeric-cast.rs:263:16 | LL | foo::(x_u16); | ^^^^^ expected f64, found u16 @@ -739,7 +739,7 @@ LL | foo::(x_u16.into()); | ^^^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:276:16 + --> $DIR/numeric-cast.rs:265:16 | LL | foo::(x_u8); | ^^^^ expected f64, found u8 @@ -749,19 +749,19 @@ LL | foo::(x_u8.into()); | ^^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:278:16 + --> $DIR/numeric-cast.rs:267:16 | LL | foo::(x_isize); | ^^^^^^^ expected f64, found isize error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:280:16 + --> $DIR/numeric-cast.rs:269:16 | LL | foo::(x_i64); | ^^^^^ expected f64, found i64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:282:16 + --> $DIR/numeric-cast.rs:271:16 | LL | foo::(x_i32); | ^^^^^ expected f64, found i32 @@ -771,7 +771,7 @@ LL | foo::(x_i32.into()); | ^^^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:284:16 + --> $DIR/numeric-cast.rs:273:16 | LL | foo::(x_i16); | ^^^^^ expected f64, found i16 @@ -781,7 +781,7 @@ LL | foo::(x_i16.into()); | ^^^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:286:16 + --> $DIR/numeric-cast.rs:275:16 | LL | foo::(x_i8); | ^^^^ expected f64, found i8 @@ -791,7 +791,7 @@ LL | foo::(x_i8.into()); | ^^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:289:16 + --> $DIR/numeric-cast.rs:278:16 | LL | foo::(x_f32); | ^^^^^ expected f64, found f32 @@ -801,25 +801,25 @@ LL | foo::(x_f32.into()); | ^^^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:292:16 + --> $DIR/numeric-cast.rs:281:16 | LL | foo::(x_usize); | ^^^^^^^ expected f32, found usize error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:294:16 + --> $DIR/numeric-cast.rs:283:16 | LL | foo::(x_u64); | ^^^^^ expected f32, found u64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:296:16 + --> $DIR/numeric-cast.rs:285:16 | LL | foo::(x_u32); | ^^^^^ expected f32, found u32 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:298:16 + --> $DIR/numeric-cast.rs:287:16 | LL | foo::(x_u16); | ^^^^^ expected f32, found u16 @@ -829,7 +829,7 @@ LL | foo::(x_u16.into()); | ^^^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:300:16 + --> $DIR/numeric-cast.rs:289:16 | LL | foo::(x_u8); | ^^^^ expected f32, found u8 @@ -839,25 +839,25 @@ LL | foo::(x_u8.into()); | ^^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:302:16 + --> $DIR/numeric-cast.rs:291:16 | LL | foo::(x_isize); | ^^^^^^^ expected f32, found isize error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:304:16 + --> $DIR/numeric-cast.rs:293:16 | LL | foo::(x_i64); | ^^^^^ expected f32, found i64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:306:16 + --> $DIR/numeric-cast.rs:295:16 | LL | foo::(x_i32); | ^^^^^ expected f32, found i32 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:308:16 + --> $DIR/numeric-cast.rs:297:16 | LL | foo::(x_i16); | ^^^^^ expected f32, found i16 @@ -867,7 +867,7 @@ LL | foo::(x_i16.into()); | ^^^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:310:16 + --> $DIR/numeric-cast.rs:299:16 | LL | foo::(x_i8); | ^^^^ expected f32, found i8 @@ -877,13 +877,13 @@ LL | foo::(x_i8.into()); | ^^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:312:16 + --> $DIR/numeric-cast.rs:301:16 | LL | foo::(x_f64); | ^^^^^ expected f32, found f64 error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:316:16 + --> $DIR/numeric-cast.rs:305:16 | LL | foo::(x_u8 as u16); | ^^^^^^^^^^^ expected u32, found u16 @@ -893,7 +893,7 @@ LL | foo::((x_u8 as u16).into()); | ^^^^^^^^^^^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/numeric-cast.rs:318:16 + --> $DIR/numeric-cast.rs:307:16 | LL | foo::(-x_i8); | ^^^^^ expected i32, found i8 diff --git a/src/test/ui/numeric/numeric-fields.rs b/src/test/ui/numeric/numeric-fields.rs index 89d09560369fe..28234bbdff94e 100644 --- a/src/test/ui/numeric/numeric-fields.rs +++ b/src/test/ui/numeric/numeric-fields.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S(u8, u16); fn main() { diff --git a/src/test/ui/numeric/numeric-fields.stderr b/src/test/ui/numeric/numeric-fields.stderr index 68a87da8ded32..1a2ad4a0c0945 100644 --- a/src/test/ui/numeric/numeric-fields.stderr +++ b/src/test/ui/numeric/numeric-fields.stderr @@ -1,5 +1,5 @@ error[E0560]: struct `S` has no field named `0b1` - --> $DIR/numeric-fields.rs:14:15 + --> $DIR/numeric-fields.rs:4:15 | LL | let s = S{0b1: 10, 0: 11}; | ^^^ `S` does not have this field @@ -7,7 +7,7 @@ LL | let s = S{0b1: 10, 0: 11}; = note: available fields are: `0`, `1` error[E0026]: struct `S` does not have a field named `0x1` - --> $DIR/numeric-fields.rs:17:17 + --> $DIR/numeric-fields.rs:7:17 | LL | S{0: a, 0x1: b, ..} => {} | ^^^^^^ struct `S` does not have this field diff --git a/src/test/ui/object-does-not-impl-trait.rs b/src/test/ui/object-does-not-impl-trait.rs index 30f8d5e2f4569..2d72b4588f754 100644 --- a/src/test/ui/object-does-not-impl-trait.rs +++ b/src/test/ui/object-does-not-impl-trait.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that an object type `Box` is not considered to implement the // trait `Foo`. Issue #5087. diff --git a/src/test/ui/object-does-not-impl-trait.stderr b/src/test/ui/object-does-not-impl-trait.stderr index a1ebdf3e66664..0e28875ced63a 100644 --- a/src/test/ui/object-does-not-impl-trait.stderr +++ b/src/test/ui/object-does-not-impl-trait.stderr @@ -1,11 +1,11 @@ error[E0277]: the trait bound `std::boxed::Box: Foo` is not satisfied - --> $DIR/object-does-not-impl-trait.rs:16:31 + --> $DIR/object-does-not-impl-trait.rs:6:31 | LL | fn take_object(f: Box) { take_foo(f); } | ^^^^^^^^ the trait `Foo` is not implemented for `std::boxed::Box` | note: required by `take_foo` - --> $DIR/object-does-not-impl-trait.rs:15:1 + --> $DIR/object-does-not-impl-trait.rs:5:1 | LL | fn take_foo(f: F) {} | ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/object-lifetime/object-lifetime-default-ambiguous.rs b/src/test/ui/object-lifetime/object-lifetime-default-ambiguous.rs index 3df83d91999b9..d14351aef9a48 100644 --- a/src/test/ui/object-lifetime/object-lifetime-default-ambiguous.rs +++ b/src/test/ui/object-lifetime/object-lifetime-default-ambiguous.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that if a struct declares multiple region bounds for a given // type parameter, an explicit lifetime bound is required on object // lifetimes within. diff --git a/src/test/ui/object-lifetime/object-lifetime-default-ambiguous.stderr b/src/test/ui/object-lifetime/object-lifetime-default-ambiguous.stderr index cb603f2c4724a..f079803c901b4 100644 --- a/src/test/ui/object-lifetime/object-lifetime-default-ambiguous.stderr +++ b/src/test/ui/object-lifetime/object-lifetime-default-ambiguous.stderr @@ -1,17 +1,17 @@ error[E0228]: the lifetime bound for this object type cannot be deduced from context; please supply an explicit bound - --> $DIR/object-lifetime-default-ambiguous.rs:33:27 + --> $DIR/object-lifetime-default-ambiguous.rs:23:27 | LL | fn a<'a,'b>(t: Ref2<'a,'b,Test>) { | ^^^^ error[E0228]: the lifetime bound for this object type cannot be deduced from context; please supply an explicit bound - --> $DIR/object-lifetime-default-ambiguous.rs:37:14 + --> $DIR/object-lifetime-default-ambiguous.rs:27:14 | LL | fn b(t: Ref2) { | ^^^^ error[E0228]: the lifetime bound for this object type cannot be deduced from context; please supply an explicit bound - --> $DIR/object-lifetime-default-ambiguous.rs:53:15 + --> $DIR/object-lifetime-default-ambiguous.rs:43:15 | LL | fn f(t: &Ref2) { | ^^^^ diff --git a/src/test/ui/object-lifetime/object-lifetime-default-elision.nll.stderr b/src/test/ui/object-lifetime/object-lifetime-default-elision.nll.stderr index 0d21dddc7c9bc..6869ec347114b 100644 --- a/src/test/ui/object-lifetime/object-lifetime-default-elision.nll.stderr +++ b/src/test/ui/object-lifetime/object-lifetime-default-elision.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/object-lifetime-default-elision.rs:81:5 + --> $DIR/object-lifetime-default-elision.rs:71:5 | LL | ss | ^^ error: unsatisfied lifetime constraints - --> $DIR/object-lifetime-default-elision.rs:64:53 + --> $DIR/object-lifetime-default-elision.rs:54:53 | LL | fn load3<'a,'b>(ss: &'a SomeTrait) -> &'b SomeTrait { | __________--_--______________________________________^ diff --git a/src/test/ui/object-lifetime/object-lifetime-default-elision.rs b/src/test/ui/object-lifetime/object-lifetime-default-elision.rs index e37b6a2bb9c99..cf15a4e8676bd 100644 --- a/src/test/ui/object-lifetime/object-lifetime-default-elision.rs +++ b/src/test/ui/object-lifetime/object-lifetime-default-elision.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test various cases where the old rules under lifetime elision // yield slightly different results than the new rules. diff --git a/src/test/ui/object-lifetime/object-lifetime-default-elision.stderr b/src/test/ui/object-lifetime/object-lifetime-default-elision.stderr index 45e7d8451f71c..d77fb6633b2e8 100644 --- a/src/test/ui/object-lifetime/object-lifetime-default-elision.stderr +++ b/src/test/ui/object-lifetime/object-lifetime-default-elision.stderr @@ -1,21 +1,21 @@ error[E0495]: cannot infer an appropriate lifetime for automatic coercion due to conflicting requirements - --> $DIR/object-lifetime-default-elision.rs:81:5 + --> $DIR/object-lifetime-default-elision.rs:71:5 | LL | ss | ^^ | -note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 64:10... - --> $DIR/object-lifetime-default-elision.rs:64:10 +note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 54:10... + --> $DIR/object-lifetime-default-elision.rs:54:10 | LL | fn load3<'a,'b>(ss: &'a SomeTrait) -> &'b SomeTrait { | ^^ note: ...so that the type `(dyn SomeTrait + 'a)` is not borrowed for too long - --> $DIR/object-lifetime-default-elision.rs:81:5 + --> $DIR/object-lifetime-default-elision.rs:71:5 | LL | ss | ^^ -note: but, the lifetime must be valid for the lifetime 'b as defined on the function body at 64:13... - --> $DIR/object-lifetime-default-elision.rs:64:13 +note: but, the lifetime must be valid for the lifetime 'b as defined on the function body at 54:13... + --> $DIR/object-lifetime-default-elision.rs:54:13 | LL | fn load3<'a,'b>(ss: &'a SomeTrait) -> &'b SomeTrait { | ^^ @@ -24,23 +24,23 @@ LL | fn load3<'a,'b>(ss: &'a SomeTrait) -> &'b SomeTrait { found &dyn SomeTrait error[E0495]: cannot infer an appropriate lifetime due to conflicting requirements - --> $DIR/object-lifetime-default-elision.rs:81:5 + --> $DIR/object-lifetime-default-elision.rs:71:5 | LL | ss | ^^ | -note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 64:10... - --> $DIR/object-lifetime-default-elision.rs:64:10 +note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 54:10... + --> $DIR/object-lifetime-default-elision.rs:54:10 | LL | fn load3<'a,'b>(ss: &'a SomeTrait) -> &'b SomeTrait { | ^^ note: ...so that the declared lifetime parameter bounds are satisfied - --> $DIR/object-lifetime-default-elision.rs:81:5 + --> $DIR/object-lifetime-default-elision.rs:71:5 | LL | ss | ^^ -note: but, the lifetime must be valid for the lifetime 'b as defined on the function body at 64:13... - --> $DIR/object-lifetime-default-elision.rs:64:13 +note: but, the lifetime must be valid for the lifetime 'b as defined on the function body at 54:13... + --> $DIR/object-lifetime-default-elision.rs:54:13 | LL | fn load3<'a,'b>(ss: &'a SomeTrait) -> &'b SomeTrait { | ^^ diff --git a/src/test/ui/object-lifetime/object-lifetime-default-from-box-error.nll.stderr b/src/test/ui/object-lifetime/object-lifetime-default-from-box-error.nll.stderr index 5cfced1a72fbe..31c344cf938d8 100644 --- a/src/test/ui/object-lifetime/object-lifetime-default-from-box-error.nll.stderr +++ b/src/test/ui/object-lifetime/object-lifetime-default-from-box-error.nll.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/object-lifetime-default-from-box-error.rs:28:5 + --> $DIR/object-lifetime-default-from-box-error.rs:18:5 | LL | ss.r //~ ERROR explicit lifetime required in the type of `ss` [E0621] | ^^^^ warning: not reporting region error due to nll - --> $DIR/object-lifetime-default-from-box-error.rs:41:12 + --> $DIR/object-lifetime-default-from-box-error.rs:31:12 | LL | ss.r = b; //~ ERROR 41:12: 41:13: explicit lifetime required in the type of `ss` [E0621] | ^ error[E0621]: explicit lifetime required in the type of `ss` - --> $DIR/object-lifetime-default-from-box-error.rs:24:48 + --> $DIR/object-lifetime-default-from-box-error.rs:14:48 | LL | fn load(ss: &mut SomeStruct) -> Box { | _____________---------------____________________^ @@ -25,13 +25,13 @@ LL | | } | |_^ lifetime `'static` required error[E0507]: cannot move out of borrowed content - --> $DIR/object-lifetime-default-from-box-error.rs:28:5 + --> $DIR/object-lifetime-default-from-box-error.rs:18:5 | LL | ss.r //~ ERROR explicit lifetime required in the type of `ss` [E0621] | ^^^^ cannot move out of borrowed content error[E0621]: explicit lifetime required in the type of `ss` - --> $DIR/object-lifetime-default-from-box-error.rs:41:5 + --> $DIR/object-lifetime-default-from-box-error.rs:31:5 | LL | fn store1<'b>(ss: &mut SomeStruct, b: Box) { | --------------- help: add explicit lifetime `'b` to the type of `ss`: `&mut SomeStruct<'b>` diff --git a/src/test/ui/object-lifetime/object-lifetime-default-from-box-error.rs b/src/test/ui/object-lifetime/object-lifetime-default-from-box-error.rs index b253612bc327b..f29a0d0d73fa8 100644 --- a/src/test/ui/object-lifetime/object-lifetime-default-from-box-error.rs +++ b/src/test/ui/object-lifetime/object-lifetime-default-from-box-error.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test various cases where the defaults should lead to errors being // reported. diff --git a/src/test/ui/object-lifetime/object-lifetime-default-from-box-error.stderr b/src/test/ui/object-lifetime/object-lifetime-default-from-box-error.stderr index 9972930c13eae..6f109aa088f5e 100644 --- a/src/test/ui/object-lifetime/object-lifetime-default-from-box-error.stderr +++ b/src/test/ui/object-lifetime/object-lifetime-default-from-box-error.stderr @@ -1,5 +1,5 @@ error[E0621]: explicit lifetime required in the type of `ss` - --> $DIR/object-lifetime-default-from-box-error.rs:28:5 + --> $DIR/object-lifetime-default-from-box-error.rs:18:5 | LL | fn load(ss: &mut SomeStruct) -> Box { | --------------- help: add explicit lifetime `'static` to the type of `ss`: `&mut SomeStruct<'static>` @@ -8,7 +8,7 @@ LL | ss.r //~ ERROR explicit lifetime required in the type of `ss` [E0621] | ^^^^ lifetime `'static` required error[E0621]: explicit lifetime required in the type of `ss` - --> $DIR/object-lifetime-default-from-box-error.rs:41:12 + --> $DIR/object-lifetime-default-from-box-error.rs:31:12 | LL | fn store1<'b>(ss: &mut SomeStruct, b: Box) { | --------------- help: add explicit lifetime `'b` to the type of `ss`: `&mut SomeStruct<'b>` diff --git a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-box-error.nll.stderr b/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-box-error.nll.stderr index 42bcdf2bd8c55..f80dab9f9fd4b 100644 --- a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-box-error.nll.stderr +++ b/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-box-error.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/object-lifetime-default-from-rptr-box-error.rs:25:12 + --> $DIR/object-lifetime-default-from-rptr-box-error.rs:15:12 | LL | ss.t = t; //~ ERROR mismatched types | ^ error: borrowed data escapes outside of function - --> $DIR/object-lifetime-default-from-rptr-box-error.rs:25:5 + --> $DIR/object-lifetime-default-from-rptr-box-error.rs:15:5 | LL | fn c<'a>(t: &'a Box, mut ss: SomeStruct<'a>) { | - `t` is a reference that is only valid in the function body diff --git a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-box-error.rs b/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-box-error.rs index 98301ef1a0a1d..91b384e00713b 100644 --- a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-box-error.rs +++ b/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-box-error.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the lifetime from the enclosing `&` is "inherited" // through the `Box` struct. diff --git a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-box-error.stderr b/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-box-error.stderr index a59d8090baf14..165f6311ffdfe 100644 --- a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-box-error.stderr +++ b/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-box-error.stderr @@ -1,13 +1,13 @@ error[E0308]: mismatched types - --> $DIR/object-lifetime-default-from-rptr-box-error.rs:25:12 + --> $DIR/object-lifetime-default-from-rptr-box-error.rs:15:12 | LL | ss.t = t; //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `&'a std::boxed::Box<(dyn Test + 'static)>` found type `&'a std::boxed::Box<(dyn Test + 'a)>` -note: the lifetime 'a as defined on the function body at 24:6... - --> $DIR/object-lifetime-default-from-rptr-box-error.rs:24:6 +note: the lifetime 'a as defined on the function body at 14:6... + --> $DIR/object-lifetime-default-from-rptr-box-error.rs:14:6 | LL | fn c<'a>(t: &'a Box, mut ss: SomeStruct<'a>) { | ^^ diff --git a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.nll.stderr b/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.nll.stderr index 73b419d511343..565ec4d6fce82 100644 --- a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.nll.stderr +++ b/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/object-lifetime-default-from-rptr-struct-error.rs:31:12 + --> $DIR/object-lifetime-default-from-rptr-struct-error.rs:21:12 | LL | ss.t = t; //~ ERROR mismatched types | ^ error: borrowed data escapes outside of function - --> $DIR/object-lifetime-default-from-rptr-struct-error.rs:31:5 + --> $DIR/object-lifetime-default-from-rptr-struct-error.rs:21:5 | LL | fn c<'a>(t: &'a MyBox, mut ss: SomeStruct<'a>) { | - `t` is a reference that is only valid in the function body diff --git a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.rs b/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.rs index 836e4fa114263..6a84621f59e44 100644 --- a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.rs +++ b/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the lifetime from the enclosing `&` is "inherited" // through the `MyBox` struct. diff --git a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.stderr b/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.stderr index beda4df5295f1..2f042c05f25bc 100644 --- a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.stderr +++ b/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.stderr @@ -1,13 +1,13 @@ error[E0308]: mismatched types - --> $DIR/object-lifetime-default-from-rptr-struct-error.rs:31:12 + --> $DIR/object-lifetime-default-from-rptr-struct-error.rs:21:12 | LL | ss.t = t; //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `&'a MyBox<(dyn Test + 'static)>` found type `&'a MyBox<(dyn Test + 'a)>` -note: the lifetime 'a as defined on the function body at 30:6... - --> $DIR/object-lifetime-default-from-rptr-struct-error.rs:30:6 +note: the lifetime 'a as defined on the function body at 20:6... + --> $DIR/object-lifetime-default-from-rptr-struct-error.rs:20:6 | LL | fn c<'a>(t: &'a MyBox, mut ss: SomeStruct<'a>) { | ^^ diff --git a/src/test/ui/object-lifetime/object-lifetime-default-mybox.nll.stderr b/src/test/ui/object-lifetime/object-lifetime-default-mybox.nll.stderr index 14a3cbf9e2948..aaaf4860466ec 100644 --- a/src/test/ui/object-lifetime/object-lifetime-default-mybox.nll.stderr +++ b/src/test/ui/object-lifetime/object-lifetime-default-mybox.nll.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/object-lifetime-default-mybox.rs:37:5 + --> $DIR/object-lifetime-default-mybox.rs:27:5 | LL | a //~ ERROR lifetime mismatch | ^ warning: not reporting region error due to nll - --> $DIR/object-lifetime-default-mybox.rs:41:11 + --> $DIR/object-lifetime-default-mybox.rs:31:11 | LL | load0(ss) //~ ERROR mismatched types | ^^ error: unsatisfied lifetime constraints - --> $DIR/object-lifetime-default-mybox.rs:37:5 + --> $DIR/object-lifetime-default-mybox.rs:27:5 | LL | fn load1<'a,'b>(a: &'a MyBox, | -- -- lifetime `'b` defined here @@ -22,7 +22,7 @@ LL | a //~ ERROR lifetime mismatch | ^ function was supposed to return data with lifetime `'b` but it is returning data with lifetime `'a` error: borrowed data escapes outside of function - --> $DIR/object-lifetime-default-mybox.rs:41:5 + --> $DIR/object-lifetime-default-mybox.rs:31:5 | LL | fn load2<'a>(ss: &MyBox) -> MyBox { | -- `ss` is a reference that is only valid in the function body diff --git a/src/test/ui/object-lifetime/object-lifetime-default-mybox.rs b/src/test/ui/object-lifetime/object-lifetime-default-mybox.rs index 54657e76e9702..c94df82a17759 100644 --- a/src/test/ui/object-lifetime/object-lifetime-default-mybox.rs +++ b/src/test/ui/object-lifetime/object-lifetime-default-mybox.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test a "pass-through" object-lifetime-default that produces errors. #![allow(dead_code)] diff --git a/src/test/ui/object-lifetime/object-lifetime-default-mybox.stderr b/src/test/ui/object-lifetime/object-lifetime-default-mybox.stderr index ec00369361750..1a21096741cb9 100644 --- a/src/test/ui/object-lifetime/object-lifetime-default-mybox.stderr +++ b/src/test/ui/object-lifetime/object-lifetime-default-mybox.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/object-lifetime-default-mybox.rs:37:5 + --> $DIR/object-lifetime-default-mybox.rs:27:5 | LL | fn load1<'a,'b>(a: &'a MyBox, | -------------------- this parameter and the return type are declared with different lifetimes... @@ -11,15 +11,15 @@ LL | a //~ ERROR lifetime mismatch | ^ ...but data from `a` is returned here error[E0308]: mismatched types - --> $DIR/object-lifetime-default-mybox.rs:41:11 + --> $DIR/object-lifetime-default-mybox.rs:31:11 | LL | load0(ss) //~ ERROR mismatched types | ^^ lifetime mismatch | = note: expected type `&MyBox<(dyn SomeTrait + 'static)>` found type `&MyBox<(dyn SomeTrait + 'a)>` -note: the lifetime 'a as defined on the function body at 40:10... - --> $DIR/object-lifetime-default-mybox.rs:40:10 +note: the lifetime 'a as defined on the function body at 30:10... + --> $DIR/object-lifetime-default-mybox.rs:30:10 | LL | fn load2<'a>(ss: &MyBox) -> MyBox { | ^^ diff --git a/src/test/ui/object-lifetime/object-lifetime-default.rs b/src/test/ui/object-lifetime/object-lifetime-default.rs index 746a656edb4c9..379b92e6dc7c8 100644 --- a/src/test/ui/object-lifetime/object-lifetime-default.rs +++ b/src/test/ui/object-lifetime/object-lifetime-default.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-compare-mode-nll #![feature(rustc_attrs)] diff --git a/src/test/ui/object-lifetime/object-lifetime-default.stderr b/src/test/ui/object-lifetime/object-lifetime-default.stderr index 7e334a0e8e6bd..443d4ff6537e3 100644 --- a/src/test/ui/object-lifetime/object-lifetime-default.stderr +++ b/src/test/ui/object-lifetime/object-lifetime-default.stderr @@ -1,41 +1,41 @@ error: 'a,Ambiguous - --> $DIR/object-lifetime-default.rs:34:1 + --> $DIR/object-lifetime-default.rs:24:1 | LL | struct G<'a,'b,T:'a,U:'a+'b>(&'a T, &'b U); //~ ERROR 'a,Ambiguous | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: 'a,'b - --> $DIR/object-lifetime-default.rs:31:1 + --> $DIR/object-lifetime-default.rs:21:1 | LL | struct F<'a,'b,T:'a,U:'b>(&'a T, &'b U); //~ ERROR 'a,'b | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: 'b - --> $DIR/object-lifetime-default.rs:28:1 + --> $DIR/object-lifetime-default.rs:18:1 | LL | struct E<'a,'b:'a,T:'b>(&'a T, &'b T); //~ ERROR 'b | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: Ambiguous - --> $DIR/object-lifetime-default.rs:25:1 + --> $DIR/object-lifetime-default.rs:15:1 | LL | struct D<'a,'b,T:'a+'b>(&'a T, &'b T); //~ ERROR Ambiguous | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: 'a - --> $DIR/object-lifetime-default.rs:22:1 + --> $DIR/object-lifetime-default.rs:12:1 | LL | struct C<'a,T:'a>(&'a T); //~ ERROR 'a | ^^^^^^^^^^^^^^^^^^^^^^^^^ error: BaseDefault - --> $DIR/object-lifetime-default.rs:19:1 + --> $DIR/object-lifetime-default.rs:9:1 | LL | struct B<'a,T>(&'a (), T); //~ ERROR BaseDefault | ^^^^^^^^^^^^^^^^^^^^^^^^^^ error: BaseDefault - --> $DIR/object-lifetime-default.rs:16:1 + --> $DIR/object-lifetime-default.rs:6:1 | LL | struct A(T); //~ ERROR BaseDefault | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/object-pointer-types.rs b/src/test/ui/object-pointer-types.rs index 98c14cee942ed..a8a482fb5a6c3 100644 --- a/src/test/ui/object-pointer-types.rs +++ b/src/test/ui/object-pointer-types.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Foo { fn borrowed(&self); fn borrowed_mut(&mut self); diff --git a/src/test/ui/object-pointer-types.stderr b/src/test/ui/object-pointer-types.stderr index 5d8679b8aa532..c5738edb6cf09 100644 --- a/src/test/ui/object-pointer-types.stderr +++ b/src/test/ui/object-pointer-types.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `owned` found for type `&dyn Foo` in the current scope - --> $DIR/object-pointer-types.rs:22:7 + --> $DIR/object-pointer-types.rs:11:7 | LL | x.owned(); //~ ERROR no method named `owned` found | ^^^^^ @@ -9,7 +9,7 @@ LL | x.owned(); //~ ERROR no method named `owned` found candidate #1: `Foo` error[E0599]: no method named `owned` found for type `&mut dyn Foo` in the current scope - --> $DIR/object-pointer-types.rs:28:7 + --> $DIR/object-pointer-types.rs:17:7 | LL | x.owned(); //~ ERROR no method named `owned` found | ^^^^^ @@ -19,7 +19,7 @@ LL | x.owned(); //~ ERROR no method named `owned` found candidate #1: `Foo` error[E0599]: no method named `managed` found for type `std::boxed::Box<(dyn Foo + 'static)>` in the current scope - --> $DIR/object-pointer-types.rs:34:7 + --> $DIR/object-pointer-types.rs:23:7 | LL | x.managed(); //~ ERROR no method named `managed` found | ^^^^^^^ diff --git a/src/test/ui/object-safety/object-safety-associated-consts.rs b/src/test/ui/object-safety/object-safety-associated-consts.rs index 4bce2c5982a12..79b7e541af82a 100644 --- a/src/test/ui/object-safety/object-safety-associated-consts.rs +++ b/src/test/ui/object-safety/object-safety-associated-consts.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we correctly prevent users from making trait objects // from traits with associated consts. diff --git a/src/test/ui/object-safety/object-safety-associated-consts.stderr b/src/test/ui/object-safety/object-safety-associated-consts.stderr index 39ec5a64e9337..96962c10720a2 100644 --- a/src/test/ui/object-safety/object-safety-associated-consts.stderr +++ b/src/test/ui/object-safety/object-safety-associated-consts.stderr @@ -1,5 +1,5 @@ error[E0038]: the trait `Bar` cannot be made into an object - --> $DIR/object-safety-associated-consts.rs:19:1 + --> $DIR/object-safety-associated-consts.rs:9:1 | LL | fn make_bar(t: &T) -> &Bar { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Bar` cannot be made into an object diff --git a/src/test/ui/object-safety/object-safety-by-value-self-use.nll.stderr b/src/test/ui/object-safety/object-safety-by-value-self-use.nll.stderr index cf0ee5882632f..0dd50b2802678 100644 --- a/src/test/ui/object-safety/object-safety-by-value-self-use.nll.stderr +++ b/src/test/ui/object-safety/object-safety-by-value-self-use.nll.stderr @@ -1,5 +1,5 @@ error[E0161]: cannot move a value of type dyn Bar: the size of dyn Bar cannot be statically determined - --> $DIR/object-safety-by-value-self-use.rs:25:5 + --> $DIR/object-safety-by-value-self-use.rs:15:5 | LL | t.bar() //~ ERROR cannot move a value of type (dyn Bar + 'static) | ^ diff --git a/src/test/ui/object-safety/object-safety-by-value-self-use.rs b/src/test/ui/object-safety/object-safety-by-value-self-use.rs index e575bbb6ceab1..dc8ea64ec9ce2 100644 --- a/src/test/ui/object-safety/object-safety-by-value-self-use.rs +++ b/src/test/ui/object-safety/object-safety-by-value-self-use.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that while a trait with by-value self is object-safe, we // can't actually invoke it from an object (yet...?). diff --git a/src/test/ui/object-safety/object-safety-by-value-self-use.stderr b/src/test/ui/object-safety/object-safety-by-value-self-use.stderr index 015284657af78..0711981a5215d 100644 --- a/src/test/ui/object-safety/object-safety-by-value-self-use.stderr +++ b/src/test/ui/object-safety/object-safety-by-value-self-use.stderr @@ -1,5 +1,5 @@ error[E0161]: cannot move a value of type (dyn Bar + 'static): the size of (dyn Bar + 'static) cannot be statically determined - --> $DIR/object-safety-by-value-self-use.rs:25:5 + --> $DIR/object-safety-by-value-self-use.rs:15:5 | LL | t.bar() //~ ERROR cannot move a value of type (dyn Bar + 'static) | ^ diff --git a/src/test/ui/object-safety/object-safety-by-value-self.rs b/src/test/ui/object-safety/object-safety-by-value-self.rs index 5a8772d61425f..15dc98ae99cd5 100644 --- a/src/test/ui/object-safety/object-safety-by-value-self.rs +++ b/src/test/ui/object-safety/object-safety-by-value-self.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that a trait with by-value self is considered object-safe. #![feature(rustc_attrs)] diff --git a/src/test/ui/object-safety/object-safety-by-value-self.stderr b/src/test/ui/object-safety/object-safety-by-value-self.stderr index 61259641c0e84..7b826695c9478 100644 --- a/src/test/ui/object-safety/object-safety-by-value-self.stderr +++ b/src/test/ui/object-safety/object-safety-by-value-self.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/object-safety-by-value-self.rs:55:1 + --> $DIR/object-safety-by-value-self.rs:45:1 | LL | / fn main() { //~ ERROR compilation successful LL | | } diff --git a/src/test/ui/object-safety/object-safety-generics.rs b/src/test/ui/object-safety/object-safety-generics.rs index 969ceeec276f1..5f4aabf5469cb 100644 --- a/src/test/ui/object-safety/object-safety-generics.rs +++ b/src/test/ui/object-safety/object-safety-generics.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we correctly prevent users from making trait objects // from traits with generic methods, unless `where Self : Sized` is // present. diff --git a/src/test/ui/object-safety/object-safety-generics.stderr b/src/test/ui/object-safety/object-safety-generics.stderr index e5dfa6666303a..7ae44794ceba9 100644 --- a/src/test/ui/object-safety/object-safety-generics.stderr +++ b/src/test/ui/object-safety/object-safety-generics.stderr @@ -1,5 +1,5 @@ error[E0038]: the trait `Bar` cannot be made into an object - --> $DIR/object-safety-generics.rs:24:1 + --> $DIR/object-safety-generics.rs:14:1 | LL | fn make_bar(t: &T) -> &Bar { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Bar` cannot be made into an object @@ -7,7 +7,7 @@ LL | fn make_bar(t: &T) -> &Bar { = note: method `bar` has generic type parameters error[E0038]: the trait `Bar` cannot be made into an object - --> $DIR/object-safety-generics.rs:29:1 + --> $DIR/object-safety-generics.rs:19:1 | LL | fn make_bar_explicit(t: &T) -> &Bar { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Bar` cannot be made into an object diff --git a/src/test/ui/object-safety/object-safety-issue-22040.rs b/src/test/ui/object-safety/object-safety-issue-22040.rs index 06d2441d3c024..eb28fcf0d5af2 100644 --- a/src/test/ui/object-safety/object-safety-issue-22040.rs +++ b/src/test/ui/object-safety/object-safety-issue-22040.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #22040. use std::fmt::Debug; diff --git a/src/test/ui/object-safety/object-safety-issue-22040.stderr b/src/test/ui/object-safety/object-safety-issue-22040.stderr index b718e92fc472a..85721f1a5f81c 100644 --- a/src/test/ui/object-safety/object-safety-issue-22040.stderr +++ b/src/test/ui/object-safety/object-safety-issue-22040.stderr @@ -1,5 +1,5 @@ error[E0038]: the trait `Expr` cannot be made into an object - --> $DIR/object-safety-issue-22040.rs:22:23 + --> $DIR/object-safety-issue-22040.rs:12:23 | LL | elements: Vec>, | ^^^^^^^^ the trait `Expr` cannot be made into an object diff --git a/src/test/ui/object-safety/object-safety-mentions-Self.rs b/src/test/ui/object-safety/object-safety-mentions-Self.rs index 0f59a928feff8..8e1bd83cec00a 100644 --- a/src/test/ui/object-safety/object-safety-mentions-Self.rs +++ b/src/test/ui/object-safety/object-safety-mentions-Self.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we correctly prevent users from making trait objects // form traits that make use of `Self` in an argument or return // position, unless `where Self : Sized` is present.. diff --git a/src/test/ui/object-safety/object-safety-mentions-Self.stderr b/src/test/ui/object-safety/object-safety-mentions-Self.stderr index b181be95a5401..ed3aed983cf7a 100644 --- a/src/test/ui/object-safety/object-safety-mentions-Self.stderr +++ b/src/test/ui/object-safety/object-safety-mentions-Self.stderr @@ -1,5 +1,5 @@ error[E0038]: the trait `Bar` cannot be made into an object - --> $DIR/object-safety-mentions-Self.rs:27:1 + --> $DIR/object-safety-mentions-Self.rs:17:1 | LL | fn make_bar(t: &T) -> &Bar { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Bar` cannot be made into an object @@ -7,7 +7,7 @@ LL | fn make_bar(t: &T) -> &Bar { = note: method `bar` references the `Self` type in its arguments or return type error[E0038]: the trait `Baz` cannot be made into an object - --> $DIR/object-safety-mentions-Self.rs:32:1 + --> $DIR/object-safety-mentions-Self.rs:22:1 | LL | fn make_baz(t: &T) -> &Baz { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Baz` cannot be made into an object diff --git a/src/test/ui/object-safety/object-safety-no-static.rs b/src/test/ui/object-safety/object-safety-no-static.rs index dd1d5af3f4a12..4faf9386f9a8b 100644 --- a/src/test/ui/object-safety/object-safety-no-static.rs +++ b/src/test/ui/object-safety/object-safety-no-static.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we correctly prevent users from making trait objects // from traits with static methods. diff --git a/src/test/ui/object-safety/object-safety-no-static.stderr b/src/test/ui/object-safety/object-safety-no-static.stderr index f17d2907148cf..3b8ccb594c181 100644 --- a/src/test/ui/object-safety/object-safety-no-static.stderr +++ b/src/test/ui/object-safety/object-safety-no-static.stderr @@ -1,5 +1,5 @@ error[E0038]: the trait `Foo` cannot be made into an object - --> $DIR/object-safety-no-static.rs:18:1 + --> $DIR/object-safety-no-static.rs:8:1 | LL | fn foo_implicit(b: Box) -> Box { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Foo` cannot be made into an object diff --git a/src/test/ui/object-safety/object-safety-phantom-fn.rs b/src/test/ui/object-safety/object-safety-phantom-fn.rs index 518c45ac9dff6..9f11e493b6ad8 100644 --- a/src/test/ui/object-safety/object-safety-phantom-fn.rs +++ b/src/test/ui/object-safety/object-safety-phantom-fn.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that `Self` appearing in a phantom fn does not make a trait not object safe. #![feature(rustc_attrs)] diff --git a/src/test/ui/object-safety/object-safety-phantom-fn.stderr b/src/test/ui/object-safety/object-safety-phantom-fn.stderr index 645867f460638..6dfb19b03e26b 100644 --- a/src/test/ui/object-safety/object-safety-phantom-fn.stderr +++ b/src/test/ui/object-safety/object-safety-phantom-fn.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/object-safety-phantom-fn.rs:31:1 + --> $DIR/object-safety-phantom-fn.rs:21:1 | LL | / fn main() { //~ ERROR compilation successful LL | | } diff --git a/src/test/ui/object-safety/object-safety-sized-2.rs b/src/test/ui/object-safety/object-safety-sized-2.rs index 3e1942d5a0188..baeb3734677fb 100644 --- a/src/test/ui/object-safety/object-safety-sized-2.rs +++ b/src/test/ui/object-safety/object-safety-sized-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we correctly prevent users from making trait objects // from traits where `Self : Sized`. diff --git a/src/test/ui/object-safety/object-safety-sized-2.stderr b/src/test/ui/object-safety/object-safety-sized-2.stderr index 1e179b662b9ad..2b8bfa341d796 100644 --- a/src/test/ui/object-safety/object-safety-sized-2.stderr +++ b/src/test/ui/object-safety/object-safety-sized-2.stderr @@ -1,5 +1,5 @@ error[E0038]: the trait `Bar` cannot be made into an object - --> $DIR/object-safety-sized-2.rs:20:1 + --> $DIR/object-safety-sized-2.rs:10:1 | LL | fn make_bar(t: &T) -> &Bar { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Bar` cannot be made into an object diff --git a/src/test/ui/object-safety/object-safety-sized.rs b/src/test/ui/object-safety/object-safety-sized.rs index 7c58609c7e91f..77dc7390aff01 100644 --- a/src/test/ui/object-safety/object-safety-sized.rs +++ b/src/test/ui/object-safety/object-safety-sized.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we correctly prevent users from making trait objects // from traits where `Self : Sized`. diff --git a/src/test/ui/object-safety/object-safety-sized.stderr b/src/test/ui/object-safety/object-safety-sized.stderr index a6dd16666c68e..ba98e2f1ef655 100644 --- a/src/test/ui/object-safety/object-safety-sized.stderr +++ b/src/test/ui/object-safety/object-safety-sized.stderr @@ -1,5 +1,5 @@ error[E0038]: the trait `Bar` cannot be made into an object - --> $DIR/object-safety-sized.rs:18:1 + --> $DIR/object-safety-sized.rs:8:1 | LL | fn make_bar(t: &T) -> &Bar { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Bar` cannot be made into an object diff --git a/src/test/ui/object-safety/object-safety-supertrait-mentions-Self.rs b/src/test/ui/object-safety/object-safety-supertrait-mentions-Self.rs index 53b4fc2de9e18..9d0da4e327c7c 100644 --- a/src/test/ui/object-safety/object-safety-supertrait-mentions-Self.rs +++ b/src/test/ui/object-safety/object-safety-supertrait-mentions-Self.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we correctly prevent users from making trait objects // form traits that make use of `Self` in an argument or return position. diff --git a/src/test/ui/object-safety/object-safety-supertrait-mentions-Self.stderr b/src/test/ui/object-safety/object-safety-supertrait-mentions-Self.stderr index f562bc6c54f9c..5db34a23fff64 100644 --- a/src/test/ui/object-safety/object-safety-supertrait-mentions-Self.stderr +++ b/src/test/ui/object-safety/object-safety-supertrait-mentions-Self.stderr @@ -1,5 +1,5 @@ error[E0038]: the trait `Baz` cannot be made into an object - --> $DIR/object-safety-supertrait-mentions-Self.rs:25:31 + --> $DIR/object-safety-supertrait-mentions-Self.rs:15:31 | LL | fn make_baz(t: &T) -> &Baz { | ^^^ the trait `Baz` cannot be made into an object diff --git a/src/test/ui/obsolete-in-place/bad.bad.stderr b/src/test/ui/obsolete-in-place/bad.bad.stderr index f870c09d6e52c..245ecb4ed1cb4 100644 --- a/src/test/ui/obsolete-in-place/bad.bad.stderr +++ b/src/test/ui/obsolete-in-place/bad.bad.stderr @@ -1,5 +1,5 @@ error: emplacement syntax is obsolete (for now, anyway) - --> $DIR/bad.rs:19:5 + --> $DIR/bad.rs:9:5 | LL | x <- y; //[bad]~ ERROR emplacement syntax is obsolete | ^^^^^^ @@ -7,7 +7,7 @@ LL | x <- y; //[bad]~ ERROR emplacement syntax is obsolete = note: for more information, see error: emplacement syntax is obsolete (for now, anyway) - --> $DIR/bad.rs:20:5 + --> $DIR/bad.rs:10:5 | LL | in(foo) { bar }; //[bad]~ ERROR emplacement syntax is obsolete | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/obsolete-in-place/bad.rs b/src/test/ui/obsolete-in-place/bad.rs index 21993e43331a6..f35d297e552ee 100644 --- a/src/test/ui/obsolete-in-place/bad.rs +++ b/src/test/ui/obsolete-in-place/bad.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that `<-` and `in` syntax gets a hard error. // revisions: good bad diff --git a/src/test/ui/obsolete-syntax-impl-for-dotdot.rs b/src/test/ui/obsolete-syntax-impl-for-dotdot.rs index 914621a117d00..e928f09aa6d37 100644 --- a/src/test/ui/obsolete-syntax-impl-for-dotdot.rs +++ b/src/test/ui/obsolete-syntax-impl-for-dotdot.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Trait1 {} trait Trait2 {} diff --git a/src/test/ui/obsolete-syntax-impl-for-dotdot.stderr b/src/test/ui/obsolete-syntax-impl-for-dotdot.stderr index 4a312d745f6c7..793ed26ca6885 100644 --- a/src/test/ui/obsolete-syntax-impl-for-dotdot.stderr +++ b/src/test/ui/obsolete-syntax-impl-for-dotdot.stderr @@ -1,5 +1,5 @@ error: `impl Trait for .. {}` is an obsolete syntax - --> $DIR/obsolete-syntax-impl-for-dotdot.rs:17:1 + --> $DIR/obsolete-syntax-impl-for-dotdot.rs:7:1 | LL | impl Trait2 for .. {} //~ ERROR `impl Trait for .. {}` is an obsolete syntax | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/occurs-check-2.rs b/src/test/ui/occurs-check-2.rs index 5d162fe944ec8..213fd2619cee7 100644 --- a/src/test/ui/occurs-check-2.rs +++ b/src/test/ui/occurs-check-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn main() { diff --git a/src/test/ui/occurs-check-2.stderr b/src/test/ui/occurs-check-2.stderr index 547491c395b35..74e29a5aea728 100644 --- a/src/test/ui/occurs-check-2.stderr +++ b/src/test/ui/occurs-check-2.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/occurs-check-2.rs:17:9 + --> $DIR/occurs-check-2.rs:7:9 | LL | f = box g; | ^^^^^ diff --git a/src/test/ui/occurs-check-3.rs b/src/test/ui/occurs-check-3.rs index ba7688e852485..91c216d7b1c41 100644 --- a/src/test/ui/occurs-check-3.rs +++ b/src/test/ui/occurs-check-3.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:mismatched types // From Issue #778 enum clam { a(T), } diff --git a/src/test/ui/occurs-check-3.stderr b/src/test/ui/occurs-check-3.stderr index 1483d41d72326..eeeacea3871f5 100644 --- a/src/test/ui/occurs-check-3.stderr +++ b/src/test/ui/occurs-check-3.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/occurs-check-3.rs:14:24 + --> $DIR/occurs-check-3.rs:4:24 | LL | fn main() { let c; c = clam::a(c); match c { clam::a::(_) => { } } } | ^^^^^^^^^^ cyclic type of infinite size diff --git a/src/test/ui/occurs-check.rs b/src/test/ui/occurs-check.rs index 2c784365ea989..5f2c2362d24cd 100644 --- a/src/test/ui/occurs-check.rs +++ b/src/test/ui/occurs-check.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn main() { diff --git a/src/test/ui/occurs-check.stderr b/src/test/ui/occurs-check.stderr index c6994d0c5376a..61ce61b1cbeb6 100644 --- a/src/test/ui/occurs-check.stderr +++ b/src/test/ui/occurs-check.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/occurs-check.rs:15:9 + --> $DIR/occurs-check.rs:5:9 | LL | f = box f; | ^^^^^ diff --git a/src/test/ui/old-suffixes-are-really-forbidden.rs b/src/test/ui/old-suffixes-are-really-forbidden.rs index 9a71dc980149c..eea95b7d62653 100644 --- a/src/test/ui/old-suffixes-are-really-forbidden.rs +++ b/src/test/ui/old-suffixes-are-really-forbidden.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let a = 1_is; //~ ERROR invalid suffix let b = 2_us; //~ ERROR invalid suffix diff --git a/src/test/ui/old-suffixes-are-really-forbidden.stderr b/src/test/ui/old-suffixes-are-really-forbidden.stderr index d580a18f46b9b..557e7ef6794cd 100644 --- a/src/test/ui/old-suffixes-are-really-forbidden.stderr +++ b/src/test/ui/old-suffixes-are-really-forbidden.stderr @@ -1,5 +1,5 @@ error: invalid suffix `is` for numeric literal - --> $DIR/old-suffixes-are-really-forbidden.rs:12:13 + --> $DIR/old-suffixes-are-really-forbidden.rs:2:13 | LL | let a = 1_is; //~ ERROR invalid suffix | ^^^^ @@ -7,7 +7,7 @@ LL | let a = 1_is; //~ ERROR invalid suffix = help: the suffix must be one of the integral types (`u32`, `isize`, etc) error: invalid suffix `us` for numeric literal - --> $DIR/old-suffixes-are-really-forbidden.rs:13:13 + --> $DIR/old-suffixes-are-really-forbidden.rs:3:13 | LL | let b = 2_us; //~ ERROR invalid suffix | ^^^^ diff --git a/src/test/ui/on-unimplemented/auxiliary/no_debug.rs b/src/test/ui/on-unimplemented/auxiliary/no_debug.rs index 0f833c6263722..f240d0e1f1fab 100644 --- a/src/test/ui/on-unimplemented/auxiliary/no_debug.rs +++ b/src/test/ui/on-unimplemented/auxiliary/no_debug.rs @@ -1,12 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // ignore-tidy-linelength #![crate_type = "lib"] diff --git a/src/test/ui/on-unimplemented/bad-annotation.rs b/src/test/ui/on-unimplemented/bad-annotation.rs index 286c71bb29908..e5e921ca28f95 100644 --- a/src/test/ui/on-unimplemented/bad-annotation.rs +++ b/src/test/ui/on-unimplemented/bad-annotation.rs @@ -1,12 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // ignore-tidy-linelength #![feature(on_unimplemented)] diff --git a/src/test/ui/on-unimplemented/bad-annotation.stderr b/src/test/ui/on-unimplemented/bad-annotation.stderr index 212eb125f85b3..70f693253ee08 100644 --- a/src/test/ui/on-unimplemented/bad-annotation.stderr +++ b/src/test/ui/on-unimplemented/bad-annotation.stderr @@ -1,5 +1,5 @@ error[E0232]: `#[rustc_on_unimplemented]` requires a value - --> $DIR/bad-annotation.rs:26:1 + --> $DIR/bad-annotation.rs:17:1 | LL | #[rustc_on_unimplemented] //~ ERROR `#[rustc_on_unimplemented]` requires a value | ^^^^^^^^^^^^^^^^^^^^^^^^^ value required here @@ -7,19 +7,19 @@ LL | #[rustc_on_unimplemented] //~ ERROR `#[rustc_on_unimplemented]` requires a = note: eg `#[rustc_on_unimplemented(message="foo")]` error[E0230]: there is no parameter `C` on trait `BadAnnotation2` - --> $DIR/bad-annotation.rs:30:1 + --> $DIR/bad-annotation.rs:21:1 | LL | #[rustc_on_unimplemented = "Unimplemented trait error on `{Self}` with params `<{A},{B},{C}>`"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0231]: only named substitution parameters are allowed - --> $DIR/bad-annotation.rs:35:1 + --> $DIR/bad-annotation.rs:26:1 | LL | #[rustc_on_unimplemented = "Unimplemented trait error on `{Self}` with params `<{A},{B},{}>`"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0232]: this attribute must have a valid value - --> $DIR/bad-annotation.rs:40:26 + --> $DIR/bad-annotation.rs:31:26 | LL | #[rustc_on_unimplemented(lorem="")] | ^^^^^^^^ expected value here @@ -27,7 +27,7 @@ LL | #[rustc_on_unimplemented(lorem="")] = note: eg `#[rustc_on_unimplemented(message="foo")]` error[E0232]: this attribute must have a valid value - --> $DIR/bad-annotation.rs:44:26 + --> $DIR/bad-annotation.rs:35:26 | LL | #[rustc_on_unimplemented(lorem(ipsum(dolor)))] | ^^^^^^^^^^^^^^^^^^^ expected value here @@ -35,7 +35,7 @@ LL | #[rustc_on_unimplemented(lorem(ipsum(dolor)))] = note: eg `#[rustc_on_unimplemented(message="foo")]` error[E0232]: this attribute must have a valid value - --> $DIR/bad-annotation.rs:48:39 + --> $DIR/bad-annotation.rs:39:39 | LL | #[rustc_on_unimplemented(message="x", message="y")] | ^^^^^^^^^^^ expected value here @@ -43,7 +43,7 @@ LL | #[rustc_on_unimplemented(message="x", message="y")] = note: eg `#[rustc_on_unimplemented(message="foo")]` error[E0232]: this attribute must have a valid value - --> $DIR/bad-annotation.rs:52:39 + --> $DIR/bad-annotation.rs:43:39 | LL | #[rustc_on_unimplemented(message="x", on(desugared, message="y"))] | ^^^^^^^^^^^^^^^^^^^^^^^^^^ expected value here @@ -51,13 +51,13 @@ LL | #[rustc_on_unimplemented(message="x", on(desugared, message="y"))] = note: eg `#[rustc_on_unimplemented(message="foo")]` error[E0232]: empty `on`-clause in `#[rustc_on_unimplemented]` - --> $DIR/bad-annotation.rs:56:26 + --> $DIR/bad-annotation.rs:47:26 | LL | #[rustc_on_unimplemented(on(), message="y")] | ^^^^ empty on-clause here error[E0232]: this attribute must have a valid value - --> $DIR/bad-annotation.rs:60:26 + --> $DIR/bad-annotation.rs:51:26 | LL | #[rustc_on_unimplemented(on="x", message="y")] | ^^^^^^ expected value here @@ -65,7 +65,7 @@ LL | #[rustc_on_unimplemented(on="x", message="y")] = note: eg `#[rustc_on_unimplemented(message="foo")]` error[E0232]: this attribute must have a valid value - --> $DIR/bad-annotation.rs:67:40 + --> $DIR/bad-annotation.rs:58:40 | LL | #[rustc_on_unimplemented(on(desugared, on(desugared, message="x")), message="y")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^ expected value here diff --git a/src/test/ui/on-unimplemented/multiple-impls.rs b/src/test/ui/on-unimplemented/multiple-impls.rs index 539f5d63c0b3b..53b222ce306f9 100644 --- a/src/test/ui/on-unimplemented/multiple-impls.rs +++ b/src/test/ui/on-unimplemented/multiple-impls.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test if the on_unimplemented message override works #![feature(on_unimplemented)] diff --git a/src/test/ui/on-unimplemented/multiple-impls.stderr b/src/test/ui/on-unimplemented/multiple-impls.stderr index 23635a3c415d4..5d5db21f7263c 100644 --- a/src/test/ui/on-unimplemented/multiple-impls.stderr +++ b/src/test/ui/on-unimplemented/multiple-impls.stderr @@ -1,18 +1,18 @@ error[E0277]: the trait bound `[i32]: Index` is not satisfied - --> $DIR/multiple-impls.rs:43:5 + --> $DIR/multiple-impls.rs:33:5 | LL | Index::index(&[] as &[i32], 2u32); | ^^^^^^^^^^^^ trait message | = help: the trait `Index` is not implemented for `[i32]` note: required by `Index::index` - --> $DIR/multiple-impls.rs:22:5 + --> $DIR/multiple-impls.rs:12:5 | LL | fn index(&self, index: Idx) -> &Self::Output; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `[i32]: Index` is not satisfied - --> $DIR/multiple-impls.rs:43:5 + --> $DIR/multiple-impls.rs:33:5 | LL | Index::index(&[] as &[i32], 2u32); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ trait message @@ -20,20 +20,20 @@ LL | Index::index(&[] as &[i32], 2u32); = help: the trait `Index` is not implemented for `[i32]` error[E0277]: the trait bound `[i32]: Index>` is not satisfied - --> $DIR/multiple-impls.rs:46:5 + --> $DIR/multiple-impls.rs:36:5 | LL | Index::index(&[] as &[i32], Foo(2u32)); | ^^^^^^^^^^^^ on impl for Foo | = help: the trait `Index>` is not implemented for `[i32]` note: required by `Index::index` - --> $DIR/multiple-impls.rs:22:5 + --> $DIR/multiple-impls.rs:12:5 | LL | fn index(&self, index: Idx) -> &Self::Output; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `[i32]: Index>` is not satisfied - --> $DIR/multiple-impls.rs:46:5 + --> $DIR/multiple-impls.rs:36:5 | LL | Index::index(&[] as &[i32], Foo(2u32)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ on impl for Foo @@ -41,20 +41,20 @@ LL | Index::index(&[] as &[i32], Foo(2u32)); = help: the trait `Index>` is not implemented for `[i32]` error[E0277]: the trait bound `[i32]: Index>` is not satisfied - --> $DIR/multiple-impls.rs:49:5 + --> $DIR/multiple-impls.rs:39:5 | LL | Index::index(&[] as &[i32], Bar(2u32)); | ^^^^^^^^^^^^ on impl for Bar | = help: the trait `Index>` is not implemented for `[i32]` note: required by `Index::index` - --> $DIR/multiple-impls.rs:22:5 + --> $DIR/multiple-impls.rs:12:5 | LL | fn index(&self, index: Idx) -> &Self::Output; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `[i32]: Index>` is not satisfied - --> $DIR/multiple-impls.rs:49:5 + --> $DIR/multiple-impls.rs:39:5 | LL | Index::index(&[] as &[i32], Bar(2u32)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ on impl for Bar diff --git a/src/test/ui/on-unimplemented/no-debug.rs b/src/test/ui/on-unimplemented/no-debug.rs index fff6122c6b34b..858df17ffda0f 100644 --- a/src/test/ui/on-unimplemented/no-debug.rs +++ b/src/test/ui/on-unimplemented/no-debug.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:no_debug.rs extern crate no_debug; diff --git a/src/test/ui/on-unimplemented/no-debug.stderr b/src/test/ui/on-unimplemented/no-debug.stderr index 275cd91a4353c..cbb41263a83c4 100644 --- a/src/test/ui/on-unimplemented/no-debug.stderr +++ b/src/test/ui/on-unimplemented/no-debug.stderr @@ -1,5 +1,5 @@ error[E0277]: `Foo` doesn't implement `std::fmt::Debug` - --> $DIR/no-debug.rs:20:27 + --> $DIR/no-debug.rs:10:27 | LL | println!("{:?} {:?}", Foo, Bar); | ^^^ `Foo` cannot be formatted using `{:?}` @@ -9,7 +9,7 @@ LL | println!("{:?} {:?}", Foo, Bar); = note: required by `std::fmt::Debug::fmt` error[E0277]: `no_debug::Bar` doesn't implement `std::fmt::Debug` - --> $DIR/no-debug.rs:20:32 + --> $DIR/no-debug.rs:10:32 | LL | println!("{:?} {:?}", Foo, Bar); | ^^^ `no_debug::Bar` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug` @@ -18,7 +18,7 @@ LL | println!("{:?} {:?}", Foo, Bar); = note: required by `std::fmt::Debug::fmt` error[E0277]: `Foo` doesn't implement `std::fmt::Display` - --> $DIR/no-debug.rs:21:23 + --> $DIR/no-debug.rs:11:23 | LL | println!("{} {}", Foo, Bar); | ^^^ `Foo` cannot be formatted with the default formatter @@ -28,7 +28,7 @@ LL | println!("{} {}", Foo, Bar); = note: required by `std::fmt::Display::fmt` error[E0277]: `no_debug::Bar` doesn't implement `std::fmt::Display` - --> $DIR/no-debug.rs:21:28 + --> $DIR/no-debug.rs:11:28 | LL | println!("{} {}", Foo, Bar); | ^^^ `no_debug::Bar` cannot be formatted with the default formatter diff --git a/src/test/ui/on-unimplemented/on-impl.rs b/src/test/ui/on-unimplemented/on-impl.rs index da56ae6499344..0ce113c1fc9d5 100644 --- a/src/test/ui/on-unimplemented/on-impl.rs +++ b/src/test/ui/on-unimplemented/on-impl.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test if the on_unimplemented message override works #![feature(on_unimplemented)] diff --git a/src/test/ui/on-unimplemented/on-impl.stderr b/src/test/ui/on-unimplemented/on-impl.stderr index 2b286ad0be7f4..79cf22f609c79 100644 --- a/src/test/ui/on-unimplemented/on-impl.stderr +++ b/src/test/ui/on-unimplemented/on-impl.stderr @@ -1,18 +1,18 @@ error[E0277]: the trait bound `[i32]: Index` is not satisfied - --> $DIR/on-impl.rs:32:5 + --> $DIR/on-impl.rs:22:5 | LL | Index::::index(&[1, 2, 3] as &[i32], 2u32); | ^^^^^^^^^^^^^^^^^^^ a usize is required to index into a slice | = help: the trait `Index` is not implemented for `[i32]` note: required by `Index::index` - --> $DIR/on-impl.rs:19:5 + --> $DIR/on-impl.rs:9:5 | LL | fn index(&self, index: Idx) -> &Self::Output; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `[i32]: Index` is not satisfied - --> $DIR/on-impl.rs:32:5 + --> $DIR/on-impl.rs:22:5 | LL | Index::::index(&[1, 2, 3] as &[i32], 2u32); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ a usize is required to index into a slice diff --git a/src/test/ui/on-unimplemented/on-trait.rs b/src/test/ui/on-unimplemented/on-trait.rs index a5eea55eeb9d4..22afda16f433a 100644 --- a/src/test/ui/on-unimplemented/on-trait.rs +++ b/src/test/ui/on-unimplemented/on-trait.rs @@ -1,12 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // ignore-tidy-linelength #![feature(on_unimplemented)] diff --git a/src/test/ui/on-unimplemented/on-trait.stderr b/src/test/ui/on-unimplemented/on-trait.stderr index 8bd910403b47b..939c2725cc472 100644 --- a/src/test/ui/on-unimplemented/on-trait.stderr +++ b/src/test/ui/on-unimplemented/on-trait.stderr @@ -1,25 +1,25 @@ error[E0277]: the trait bound `std::option::Option>: MyFromIterator<&u8>` is not satisfied - --> $DIR/on-trait.rs:37:30 + --> $DIR/on-trait.rs:28:30 | LL | let y: Option> = collect(x.iter()); // this should give approximately the same error for x.iter().collect() | ^^^^^^^ a collection of type `std::option::Option>` cannot be built from an iterator over elements of type `&u8` | = help: the trait `MyFromIterator<&u8>` is not implemented for `std::option::Option>` note: required by `collect` - --> $DIR/on-trait.rs:31:1 + --> $DIR/on-trait.rs:22:1 | LL | fn collect, B: MyFromIterator>(it: I) -> B { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `std::string::String: Bar::Foo` is not satisfied - --> $DIR/on-trait.rs:40:21 + --> $DIR/on-trait.rs:31:21 | LL | let x: String = foobar(); //~ ERROR | ^^^^^^ test error `std::string::String` with `u8` `_` `u32` in `Bar::Foo` | = help: the trait `Bar::Foo` is not implemented for `std::string::String` note: required by `foobar` - --> $DIR/on-trait.rs:21:1 + --> $DIR/on-trait.rs:12:1 | LL | fn foobar>() -> T { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/on-unimplemented/slice-index.rs b/src/test/ui/on-unimplemented/slice-index.rs index 7d67e89a78e36..40dafad78976d 100644 --- a/src/test/ui/on-unimplemented/slice-index.rs +++ b/src/test/ui/on-unimplemented/slice-index.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test new Index error message for slices // ignore-tidy-linelength diff --git a/src/test/ui/on-unimplemented/slice-index.stderr b/src/test/ui/on-unimplemented/slice-index.stderr index 6a4756eb1c98e..3a32e13e0aa6c 100644 --- a/src/test/ui/on-unimplemented/slice-index.stderr +++ b/src/test/ui/on-unimplemented/slice-index.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `i32: std::slice::SliceIndex<[i32]>` is not satisfied - --> $DIR/slice-index.rs:21:5 + --> $DIR/slice-index.rs:11:5 | LL | x[1i32]; //~ ERROR E0277 | ^^^^^^^ slice indices are of type `usize` or ranges of `usize` @@ -8,7 +8,7 @@ LL | x[1i32]; //~ ERROR E0277 = note: required because of the requirements on the impl of `std::ops::Index` for `[i32]` error[E0277]: the trait bound `std::ops::RangeTo: std::slice::SliceIndex<[i32]>` is not satisfied - --> $DIR/slice-index.rs:22:5 + --> $DIR/slice-index.rs:12:5 | LL | x[..1i32]; //~ ERROR E0277 | ^^^^^^^^^ slice indices are of type `usize` or ranges of `usize` diff --git a/src/test/ui/once-cant-call-twice-on-heap.rs b/src/test/ui/once-cant-call-twice-on-heap.rs index 6441f308f29c6..9aefe1e5a2156 100644 --- a/src/test/ui/once-cant-call-twice-on-heap.rs +++ b/src/test/ui/once-cant-call-twice-on-heap.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Testing guarantees provided by once functions. // This program would segfault if it were legal. diff --git a/src/test/ui/once-cant-call-twice-on-heap.stderr b/src/test/ui/once-cant-call-twice-on-heap.stderr index 81a501f568023..4559425e5be0d 100644 --- a/src/test/ui/once-cant-call-twice-on-heap.stderr +++ b/src/test/ui/once-cant-call-twice-on-heap.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `blk` - --> $DIR/once-cant-call-twice-on-heap.rs:19:5 + --> $DIR/once-cant-call-twice-on-heap.rs:9:5 | LL | blk(); | --- value moved here diff --git a/src/test/ui/opt-in-copy.rs b/src/test/ui/opt-in-copy.rs index bc18b52a0c1c9..0b48418e464a6 100644 --- a/src/test/ui/opt-in-copy.rs +++ b/src/test/ui/opt-in-copy.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct CantCopyThis; struct IWantToCopyThis { diff --git a/src/test/ui/opt-in-copy.stderr b/src/test/ui/opt-in-copy.stderr index c6440804be600..0a275f1aa41d7 100644 --- a/src/test/ui/opt-in-copy.stderr +++ b/src/test/ui/opt-in-copy.stderr @@ -1,5 +1,5 @@ error[E0204]: the trait `Copy` may not be implemented for this type - --> $DIR/opt-in-copy.rs:17:6 + --> $DIR/opt-in-copy.rs:7:6 | LL | but_i_cant: CantCopyThis, | ------------------------ this field does not implement `Copy` @@ -8,7 +8,7 @@ LL | impl Copy for IWantToCopyThis {} | ^^^^ error[E0204]: the trait `Copy` may not be implemented for this type - --> $DIR/opt-in-copy.rs:29:6 + --> $DIR/opt-in-copy.rs:19:6 | LL | ButICant(CantCopyThisEither), | ------------------ this field does not implement `Copy` diff --git a/src/test/ui/or-patter-mismatch.rs b/src/test/ui/or-patter-mismatch.rs index 59508d6ac95f9..3eb96ac2a456b 100644 --- a/src/test/ui/or-patter-mismatch.rs +++ b/src/test/ui/or-patter-mismatch.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: mismatched types enum blah { a(isize, isize, usize), b(isize, isize), } diff --git a/src/test/ui/or-patter-mismatch.stderr b/src/test/ui/or-patter-mismatch.stderr index 8bf4d2e5332ef..6ad90a7239923 100644 --- a/src/test/ui/or-patter-mismatch.stderr +++ b/src/test/ui/or-patter-mismatch.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/or-patter-mismatch.rs:15:68 + --> $DIR/or-patter-mismatch.rs:5:68 | LL | fn main() { match blah::a(1, 1, 2) { blah::a(_, x, y) | blah::b(x, y) => { } } } | ^ expected usize, found isize diff --git a/src/test/ui/order-dependent-cast-inference.rs b/src/test/ui/order-dependent-cast-inference.rs index afcd402343b25..e666209b9129c 100644 --- a/src/test/ui/order-dependent-cast-inference.rs +++ b/src/test/ui/order-dependent-cast-inference.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { // Tests case where inference fails due to the order in which casts are checked. // Ideally this would compile, see #48270. diff --git a/src/test/ui/order-dependent-cast-inference.stderr b/src/test/ui/order-dependent-cast-inference.stderr index 556acc87cffaf..081038c573acf 100644 --- a/src/test/ui/order-dependent-cast-inference.stderr +++ b/src/test/ui/order-dependent-cast-inference.stderr @@ -1,5 +1,5 @@ error[E0641]: cannot cast to a pointer of an unknown kind - --> $DIR/order-dependent-cast-inference.rs:15:17 + --> $DIR/order-dependent-cast-inference.rs:5:17 | LL | let mut y = 0 as *const _; | ^^^^^-------- diff --git a/src/test/ui/orphan-check-diagnostics.rs b/src/test/ui/orphan-check-diagnostics.rs index 8201565c3318d..9a29620ae6532 100644 --- a/src/test/ui/orphan-check-diagnostics.rs +++ b/src/test/ui/orphan-check-diagnostics.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:orphan_check_diagnostics.rs // see #22388 diff --git a/src/test/ui/orphan-check-diagnostics.stderr b/src/test/ui/orphan-check-diagnostics.stderr index dc134dd8d6f54..de04114b529c5 100644 --- a/src/test/ui/orphan-check-diagnostics.stderr +++ b/src/test/ui/orphan-check-diagnostics.stderr @@ -1,5 +1,5 @@ error[E0210]: type parameter `T` must be used as the type parameter for some local type (e.g. `MyStruct`) - --> $DIR/orphan-check-diagnostics.rs:20:1 + --> $DIR/orphan-check-diagnostics.rs:10:1 | LL | impl RemoteTrait for T where T: LocalTrait {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type parameter `T` must be used as the type parameter for some local type diff --git a/src/test/ui/osx-frameworks.rs b/src/test/ui/osx-frameworks.rs index 026ef3c95f663..227e07de9a81e 100644 --- a/src/test/ui/osx-frameworks.rs +++ b/src/test/ui/osx-frameworks.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-macos this is supposed to succeed on osx #[link(name = "foo", kind = "framework")] diff --git a/src/test/ui/osx-frameworks.stderr b/src/test/ui/osx-frameworks.stderr index cdc2357c36ce3..f353291342335 100644 --- a/src/test/ui/osx-frameworks.stderr +++ b/src/test/ui/osx-frameworks.stderr @@ -1,5 +1,5 @@ error[E0455]: native frameworks are only available on macOS targets - --> $DIR/osx-frameworks.rs:13:1 + --> $DIR/osx-frameworks.rs:3:1 | LL | #[link(name = "foo", kind = "framework")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/out-of-order-shadowing.rs b/src/test/ui/out-of-order-shadowing.rs index 1fafaf85112be..6d36bcd4a28df 100644 --- a/src/test/ui/out-of-order-shadowing.rs +++ b/src/test/ui/out-of-order-shadowing.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:define_macro.rs // error-pattern: `bar` is already in scope diff --git a/src/test/ui/out-of-order-shadowing.stderr b/src/test/ui/out-of-order-shadowing.stderr index 78e32e23ff636..01a73d6e043a4 100644 --- a/src/test/ui/out-of-order-shadowing.stderr +++ b/src/test/ui/out-of-order-shadowing.stderr @@ -1,5 +1,5 @@ error: `bar` is already in scope - --> $DIR/out-of-order-shadowing.rs:15:1 + --> $DIR/out-of-order-shadowing.rs:5:1 | LL | define_macro!(bar); | ^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/output-type-mismatch.rs b/src/test/ui/output-type-mismatch.rs index 158e99ac2003e..35097aa9ec61f 100644 --- a/src/test/ui/output-type-mismatch.rs +++ b/src/test/ui/output-type-mismatch.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: mismatched types fn f() { } diff --git a/src/test/ui/output-type-mismatch.stderr b/src/test/ui/output-type-mismatch.stderr index e869dfa78a067..449d312057162 100644 --- a/src/test/ui/output-type-mismatch.stderr +++ b/src/test/ui/output-type-mismatch.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/output-type-mismatch.rs:15:31 + --> $DIR/output-type-mismatch.rs:5:31 | LL | fn main() { let i: isize; i = f(); } | ^^^ expected isize, found () diff --git a/src/test/ui/overlap-marker-trait.rs b/src/test/ui/overlap-marker-trait.rs index a649ae25f34ea..bf39d9c903f80 100644 --- a/src/test/ui/overlap-marker-trait.rs +++ b/src/test/ui/overlap-marker-trait.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test for RFC 1268: we allow overlapping impls of marker traits, // that is, traits without items. In this case, a type `T` is // `MyMarker` if it is either `Debug` or `Display`. This test just diff --git a/src/test/ui/overlap-marker-trait.stderr b/src/test/ui/overlap-marker-trait.stderr index d739dfc59d27b..21ba2367901cd 100644 --- a/src/test/ui/overlap-marker-trait.stderr +++ b/src/test/ui/overlap-marker-trait.stderr @@ -1,11 +1,11 @@ error[E0277]: the trait bound `NotDebugOrDisplay: Marker` is not satisfied - --> $DIR/overlap-marker-trait.rs:40:5 + --> $DIR/overlap-marker-trait.rs:30:5 | LL | is_marker::(); //~ ERROR | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Marker` is not implemented for `NotDebugOrDisplay` | note: required by `is_marker` - --> $DIR/overlap-marker-trait.rs:28:1 + --> $DIR/overlap-marker-trait.rs:18:1 | LL | fn is_marker() { } | ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/overloaded-calls-nontuple.rs b/src/test/ui/overloaded-calls-nontuple.rs index 7113224664b1f..62a7130ddebd1 100644 --- a/src/test/ui/overloaded-calls-nontuple.rs +++ b/src/test/ui/overloaded-calls-nontuple.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(fn_traits, unboxed_closures)] use std::ops::FnMut; diff --git a/src/test/ui/overloaded-calls-nontuple.stderr b/src/test/ui/overloaded-calls-nontuple.stderr index 78b86889553f6..31b5697addaf8 100644 --- a/src/test/ui/overloaded-calls-nontuple.stderr +++ b/src/test/ui/overloaded-calls-nontuple.stderr @@ -1,5 +1,5 @@ error[E0059]: cannot use call notation; the first type parameter for the function trait is neither a tuple nor unit - --> $DIR/overloaded-calls-nontuple.rs:36:10 + --> $DIR/overloaded-calls-nontuple.rs:26:10 | LL | drop(s(3)) //~ ERROR cannot use call notation | ^^^^ diff --git a/src/test/ui/packed-struct/packed-struct-generic-transmute.rs b/src/test/ui/packed-struct/packed-struct-generic-transmute.rs index c96184d598843..a2502a53c9d38 100644 --- a/src/test/ui/packed-struct/packed-struct-generic-transmute.rs +++ b/src/test/ui/packed-struct/packed-struct-generic-transmute.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This assumes the packed and non-packed structs are different sizes. // the error points to the start of the file, not the line with the diff --git a/src/test/ui/packed-struct/packed-struct-generic-transmute.stderr b/src/test/ui/packed-struct/packed-struct-generic-transmute.stderr index 397b1ddba717b..b66cb039b802c 100644 --- a/src/test/ui/packed-struct/packed-struct-generic-transmute.stderr +++ b/src/test/ui/packed-struct/packed-struct-generic-transmute.stderr @@ -1,5 +1,5 @@ error[E0512]: transmute called with types of different sizes - --> $DIR/packed-struct-generic-transmute.rs:34:38 + --> $DIR/packed-struct-generic-transmute.rs:24:38 | LL | let oof: Oof<[u8; 5], i32> = mem::transmute(foo); | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/packed-struct/packed-struct-transmute.rs b/src/test/ui/packed-struct/packed-struct-transmute.rs index 695ffbdb2af9f..3d1580004b80b 100644 --- a/src/test/ui/packed-struct/packed-struct-transmute.rs +++ b/src/test/ui/packed-struct/packed-struct-transmute.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This assumes the packed and non-packed structs are different sizes. // the error points to the start of the file, not the line with the diff --git a/src/test/ui/packed-struct/packed-struct-transmute.stderr b/src/test/ui/packed-struct/packed-struct-transmute.stderr index 5da7d8f7b7e2a..d1fb443f310ec 100644 --- a/src/test/ui/packed-struct/packed-struct-transmute.stderr +++ b/src/test/ui/packed-struct/packed-struct-transmute.stderr @@ -1,5 +1,5 @@ error[E0512]: transmute called with types of different sizes - --> $DIR/packed-struct-transmute.rs:36:24 + --> $DIR/packed-struct-transmute.rs:26:24 | LL | let oof: Oof = mem::transmute(foo); | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/panic-implementation/auxiliary/some-panic-impl.rs b/src/test/ui/panic-implementation/auxiliary/some-panic-impl.rs index db16ac325ac59..db2ba081aae1a 100644 --- a/src/test/ui/panic-implementation/auxiliary/some-panic-impl.rs +++ b/src/test/ui/panic-implementation/auxiliary/some-panic-impl.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "rlib"] diff --git a/src/test/ui/panic-implementation/panic-implementation-bad-signature-1.rs b/src/test/ui/panic-implementation/panic-implementation-bad-signature-1.rs index fec11fdbd7ba1..e11fb1f772e7f 100644 --- a/src/test/ui/panic-implementation/panic-implementation-bad-signature-1.rs +++ b/src/test/ui/panic-implementation/panic-implementation-bad-signature-1.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-C panic=abort #![feature(panic_implementation)] diff --git a/src/test/ui/panic-implementation/panic-implementation-bad-signature-1.stderr b/src/test/ui/panic-implementation/panic-implementation-bad-signature-1.stderr index 0e020fbc78b81..0438d7e4ec3cd 100644 --- a/src/test/ui/panic-implementation/panic-implementation-bad-signature-1.stderr +++ b/src/test/ui/panic-implementation/panic-implementation-bad-signature-1.stderr @@ -1,11 +1,11 @@ error: return type should be `!` - --> $DIR/panic-implementation-bad-signature-1.rs:22:6 + --> $DIR/panic-implementation-bad-signature-1.rs:12:6 | LL | ) -> () //~ ERROR return type should be `!` | ^^ error: argument should be `&PanicInfo` - --> $DIR/panic-implementation-bad-signature-1.rs:21:11 + --> $DIR/panic-implementation-bad-signature-1.rs:11:11 | LL | info: PanicInfo, //~ ERROR argument should be `&PanicInfo` | ^^^^^^^^^ diff --git a/src/test/ui/panic-implementation/panic-implementation-bad-signature-2.rs b/src/test/ui/panic-implementation/panic-implementation-bad-signature-2.rs index 2a628c05699cc..defd4741de51a 100644 --- a/src/test/ui/panic-implementation/panic-implementation-bad-signature-2.rs +++ b/src/test/ui/panic-implementation/panic-implementation-bad-signature-2.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-C panic=abort #![feature(panic_implementation)] diff --git a/src/test/ui/panic-implementation/panic-implementation-bad-signature-2.stderr b/src/test/ui/panic-implementation/panic-implementation-bad-signature-2.stderr index 71ed1efdcf2b8..89a829b62cf33 100644 --- a/src/test/ui/panic-implementation/panic-implementation-bad-signature-2.stderr +++ b/src/test/ui/panic-implementation/panic-implementation-bad-signature-2.stderr @@ -1,5 +1,5 @@ error: argument should be `&PanicInfo` - --> $DIR/panic-implementation-bad-signature-2.rs:21:11 + --> $DIR/panic-implementation-bad-signature-2.rs:11:11 | LL | info: &'static PanicInfo, //~ ERROR argument should be `&PanicInfo` | ^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/panic-implementation/panic-implementation-bad-signature-3.rs b/src/test/ui/panic-implementation/panic-implementation-bad-signature-3.rs index 29337025b7076..7c6cd993691fe 100644 --- a/src/test/ui/panic-implementation/panic-implementation-bad-signature-3.rs +++ b/src/test/ui/panic-implementation/panic-implementation-bad-signature-3.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-C panic=abort #![feature(panic_implementation)] diff --git a/src/test/ui/panic-implementation/panic-implementation-bad-signature-3.stderr b/src/test/ui/panic-implementation/panic-implementation-bad-signature-3.stderr index 3fd29bcd3e998..617e703c8940b 100644 --- a/src/test/ui/panic-implementation/panic-implementation-bad-signature-3.stderr +++ b/src/test/ui/panic-implementation/panic-implementation-bad-signature-3.stderr @@ -1,5 +1,5 @@ error: function should have one argument - --> $DIR/panic-implementation-bad-signature-3.rs:20:1 + --> $DIR/panic-implementation-bad-signature-3.rs:10:1 | LL | / fn panic() -> ! { //~ ERROR function should have one argument LL | | loop {} diff --git a/src/test/ui/panic-implementation/panic-implementation-bad-signature-4.rs b/src/test/ui/panic-implementation/panic-implementation-bad-signature-4.rs index d5f942ba2d62f..cd5e334101bf4 100644 --- a/src/test/ui/panic-implementation/panic-implementation-bad-signature-4.rs +++ b/src/test/ui/panic-implementation/panic-implementation-bad-signature-4.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-C panic=abort #![feature(panic_implementation)] diff --git a/src/test/ui/panic-implementation/panic-implementation-bad-signature-4.stderr b/src/test/ui/panic-implementation/panic-implementation-bad-signature-4.stderr index 362be2fc3b91e..72771e532a9b6 100644 --- a/src/test/ui/panic-implementation/panic-implementation-bad-signature-4.stderr +++ b/src/test/ui/panic-implementation/panic-implementation-bad-signature-4.stderr @@ -1,5 +1,5 @@ error: `#[panic_implementation]` function should have no type parameters - --> $DIR/panic-implementation-bad-signature-4.rs:20:1 + --> $DIR/panic-implementation-bad-signature-4.rs:10:1 | LL | / fn panic(pi: &PanicInfo) -> ! { LL | | //~^ ERROR `#[panic_implementation]` function should have no type parameters diff --git a/src/test/ui/panic-implementation/panic-implementation-duplicate.rs b/src/test/ui/panic-implementation/panic-implementation-duplicate.rs index 017113af409bb..fb61b6583189f 100644 --- a/src/test/ui/panic-implementation/panic-implementation-duplicate.rs +++ b/src/test/ui/panic-implementation/panic-implementation-duplicate.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-C panic=abort #![feature(lang_items)] diff --git a/src/test/ui/panic-implementation/panic-implementation-duplicate.stderr b/src/test/ui/panic-implementation/panic-implementation-duplicate.stderr index d553c02379c37..b7b3e3d4c84e9 100644 --- a/src/test/ui/panic-implementation/panic-implementation-duplicate.stderr +++ b/src/test/ui/panic-implementation/panic-implementation-duplicate.stderr @@ -1,5 +1,5 @@ error[E0152]: duplicate lang item found: `panic_impl`. - --> $DIR/panic-implementation-duplicate.rs:26:1 + --> $DIR/panic-implementation-duplicate.rs:16:1 | LL | / fn panic2(info: &PanicInfo) -> ! { //~ ERROR duplicate lang item found: `panic_impl`. LL | | loop {} @@ -7,7 +7,7 @@ LL | | } | |_^ | note: first defined here. - --> $DIR/panic-implementation-duplicate.rs:21:1 + --> $DIR/panic-implementation-duplicate.rs:11:1 | LL | / fn panic(info: &PanicInfo) -> ! { LL | | loop {} diff --git a/src/test/ui/panic-implementation/panic-implementation-requires-panic-info.rs b/src/test/ui/panic-implementation/panic-implementation-requires-panic-info.rs index 597f44d98326d..9afbe5207bf1f 100644 --- a/src/test/ui/panic-implementation/panic-implementation-requires-panic-info.rs +++ b/src/test/ui/panic-implementation/panic-implementation-requires-panic-info.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-C panic=abort // error-pattern: language item required, but not found: `panic_info` diff --git a/src/test/ui/panic-implementation/panic-implementation-std.rs b/src/test/ui/panic-implementation/panic-implementation-std.rs index f25cd3605c1dd..ecc8139902503 100644 --- a/src/test/ui/panic-implementation/panic-implementation-std.rs +++ b/src/test/ui/panic-implementation/panic-implementation-std.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: duplicate lang item found: `panic_impl`. #![feature(panic_implementation)] diff --git a/src/test/ui/panic-implementation/panic-implementation-std.stderr b/src/test/ui/panic-implementation/panic-implementation-std.stderr index 5016d502cee31..94fc16ad77f47 100644 --- a/src/test/ui/panic-implementation/panic-implementation-std.stderr +++ b/src/test/ui/panic-implementation/panic-implementation-std.stderr @@ -1,5 +1,5 @@ error[E0152]: duplicate lang item found: `panic_impl`. - --> $DIR/panic-implementation-std.rs:18:1 + --> $DIR/panic-implementation-std.rs:8:1 | LL | / fn panic(info: PanicInfo) -> ! { LL | | loop {} diff --git a/src/test/ui/panic-runtime/abort-link-to-unwind-dylib.rs b/src/test/ui/panic-runtime/abort-link-to-unwind-dylib.rs index f392ccd767645..7e1174a273438 100644 --- a/src/test/ui/panic-runtime/abort-link-to-unwind-dylib.rs +++ b/src/test/ui/panic-runtime/abort-link-to-unwind-dylib.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-C panic=abort -C prefer-dynamic // ignore-musl - no dylibs here // ignore-cloudabi diff --git a/src/test/ui/panic-runtime/auxiliary/depends.rs b/src/test/ui/panic-runtime/auxiliary/depends.rs index b90dec9281bc1..e9bc2f4893e3d 100644 --- a/src/test/ui/panic-runtime/auxiliary/depends.rs +++ b/src/test/ui/panic-runtime/auxiliary/depends.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![feature(panic_runtime)] diff --git a/src/test/ui/panic-runtime/auxiliary/needs-panic-runtime.rs b/src/test/ui/panic-runtime/auxiliary/needs-panic-runtime.rs index d6c21fecf6b56..3f030c169f641 100644 --- a/src/test/ui/panic-runtime/auxiliary/needs-panic-runtime.rs +++ b/src/test/ui/panic-runtime/auxiliary/needs-panic-runtime.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![feature(needs_panic_runtime)] diff --git a/src/test/ui/panic-runtime/auxiliary/panic-runtime-abort.rs b/src/test/ui/panic-runtime/auxiliary/panic-runtime-abort.rs index 3b74156b6b017..433301fb43441 100644 --- a/src/test/ui/panic-runtime/auxiliary/panic-runtime-abort.rs +++ b/src/test/ui/panic-runtime/auxiliary/panic-runtime-abort.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-C panic=abort // no-prefer-dynamic diff --git a/src/test/ui/panic-runtime/auxiliary/panic-runtime-lang-items.rs b/src/test/ui/panic-runtime/auxiliary/panic-runtime-lang-items.rs index d9848a554aba5..abe34a39caf34 100644 --- a/src/test/ui/panic-runtime/auxiliary/panic-runtime-lang-items.rs +++ b/src/test/ui/panic-runtime/auxiliary/panic-runtime-lang-items.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "rlib"] diff --git a/src/test/ui/panic-runtime/auxiliary/panic-runtime-unwind.rs b/src/test/ui/panic-runtime/auxiliary/panic-runtime-unwind.rs index 4bb36839d988b..97452a342ab4d 100644 --- a/src/test/ui/panic-runtime/auxiliary/panic-runtime-unwind.rs +++ b/src/test/ui/panic-runtime/auxiliary/panic-runtime-unwind.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-C panic=unwind // no-prefer-dynamic diff --git a/src/test/ui/panic-runtime/auxiliary/panic-runtime-unwind2.rs b/src/test/ui/panic-runtime/auxiliary/panic-runtime-unwind2.rs index 4bb36839d988b..97452a342ab4d 100644 --- a/src/test/ui/panic-runtime/auxiliary/panic-runtime-unwind2.rs +++ b/src/test/ui/panic-runtime/auxiliary/panic-runtime-unwind2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-C panic=unwind // no-prefer-dynamic diff --git a/src/test/ui/panic-runtime/auxiliary/wants-panic-runtime-abort.rs b/src/test/ui/panic-runtime/auxiliary/wants-panic-runtime-abort.rs index e1902e44a60e2..3c0d2d6588ec9 100644 --- a/src/test/ui/panic-runtime/auxiliary/wants-panic-runtime-abort.rs +++ b/src/test/ui/panic-runtime/auxiliary/wants-panic-runtime-abort.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-C panic=abort // no-prefer-dynamic diff --git a/src/test/ui/panic-runtime/auxiliary/wants-panic-runtime-unwind.rs b/src/test/ui/panic-runtime/auxiliary/wants-panic-runtime-unwind.rs index 2183338b24985..d5f0102196f48 100644 --- a/src/test/ui/panic-runtime/auxiliary/wants-panic-runtime-unwind.rs +++ b/src/test/ui/panic-runtime/auxiliary/wants-panic-runtime-unwind.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic #![crate_type = "rlib"] diff --git a/src/test/ui/panic-runtime/bad-panic-flag1.rs b/src/test/ui/panic-runtime/bad-panic-flag1.rs index f067b6b8349b6..3671c484ab7fd 100644 --- a/src/test/ui/panic-runtime/bad-panic-flag1.rs +++ b/src/test/ui/panic-runtime/bad-panic-flag1.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-C panic=foo // error-pattern:either `panic` or `abort` was expected diff --git a/src/test/ui/panic-runtime/bad-panic-flag2.rs b/src/test/ui/panic-runtime/bad-panic-flag2.rs index 0ecf65f080fa9..1a0a12f334a78 100644 --- a/src/test/ui/panic-runtime/bad-panic-flag2.rs +++ b/src/test/ui/panic-runtime/bad-panic-flag2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-C panic // error-pattern:requires either `panic` or `abort` diff --git a/src/test/ui/panic-runtime/libtest-unwinds.rs b/src/test/ui/panic-runtime/libtest-unwinds.rs index 71751034c39b9..47dd8c3efe58e 100644 --- a/src/test/ui/panic-runtime/libtest-unwinds.rs +++ b/src/test/ui/panic-runtime/libtest-unwinds.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:is not compiled with this crate's panic strategy `abort` // compile-flags:-C panic=abort // ignore-wasm32-bare compiled with panic=abort by default diff --git a/src/test/ui/panic-runtime/needs-gate.rs b/src/test/ui/panic-runtime/needs-gate.rs index 1b3b978c40811..9e143adfeb215 100644 --- a/src/test/ui/panic-runtime/needs-gate.rs +++ b/src/test/ui/panic-runtime/needs-gate.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // gate-test-needs_panic_runtime // gate-test-panic_runtime diff --git a/src/test/ui/panic-runtime/needs-gate.stderr b/src/test/ui/panic-runtime/needs-gate.stderr index aa2b97556dce8..75ddda79b2d0e 100644 --- a/src/test/ui/panic-runtime/needs-gate.stderr +++ b/src/test/ui/panic-runtime/needs-gate.stderr @@ -1,5 +1,5 @@ error[E0658]: the `#[panic_runtime]` attribute is an experimental feature (see issue #32837) - --> $DIR/needs-gate.rs:14:1 + --> $DIR/needs-gate.rs:4:1 | LL | #![panic_runtime] //~ ERROR: is an experimental feature | ^^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | #![panic_runtime] //~ ERROR: is an experimental feature = help: add #![feature(panic_runtime)] to the crate attributes to enable error[E0658]: the `#[needs_panic_runtime]` attribute is an experimental feature (see issue #32837) - --> $DIR/needs-gate.rs:15:1 + --> $DIR/needs-gate.rs:5:1 | LL | #![needs_panic_runtime] //~ ERROR: is an experimental feature | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/panic-runtime/runtime-depend-on-needs-runtime.rs b/src/test/ui/panic-runtime/runtime-depend-on-needs-runtime.rs index 7cfdacbd983c1..60f8684968fe0 100644 --- a/src/test/ui/panic-runtime/runtime-depend-on-needs-runtime.rs +++ b/src/test/ui/panic-runtime/runtime-depend-on-needs-runtime.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:needs-panic-runtime.rs // aux-build:depends.rs // error-pattern:cannot depend on a crate that needs a panic runtime diff --git a/src/test/ui/panic-runtime/transitive-link-a-bunch.rs b/src/test/ui/panic-runtime/transitive-link-a-bunch.rs index f886aac9a1041..9b083a640a6d3 100644 --- a/src/test/ui/panic-runtime/transitive-link-a-bunch.rs +++ b/src/test/ui/panic-runtime/transitive-link-a-bunch.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:panic-runtime-unwind.rs // aux-build:panic-runtime-abort.rs // aux-build:wants-panic-runtime-unwind.rs diff --git a/src/test/ui/panic-runtime/want-unwind-got-abort.rs b/src/test/ui/panic-runtime/want-unwind-got-abort.rs index dda92d9a56074..c9ee8a032a3d3 100644 --- a/src/test/ui/panic-runtime/want-unwind-got-abort.rs +++ b/src/test/ui/panic-runtime/want-unwind-got-abort.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:is incompatible with this crate's strategy of `unwind` // aux-build:panic-runtime-abort.rs // aux-build:panic-runtime-lang-items.rs diff --git a/src/test/ui/panic-runtime/want-unwind-got-abort2.rs b/src/test/ui/panic-runtime/want-unwind-got-abort2.rs index 49f719057d2ff..5219826eec62f 100644 --- a/src/test/ui/panic-runtime/want-unwind-got-abort2.rs +++ b/src/test/ui/panic-runtime/want-unwind-got-abort2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:is incompatible with this crate's strategy of `unwind` // aux-build:panic-runtime-abort.rs // aux-build:wants-panic-runtime-abort.rs diff --git a/src/test/ui/panic_implementation-closures.rs b/src/test/ui/panic_implementation-closures.rs index 4fa9a639928f9..6bd34951ef827 100644 --- a/src/test/ui/panic_implementation-closures.rs +++ b/src/test/ui/panic_implementation-closures.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![crate_type = "rlib"] diff --git a/src/test/ui/paren-span.rs b/src/test/ui/paren-span.rs index 8ed5050f3de3c..24fadb24de2ae 100644 --- a/src/test/ui/paren-span.rs +++ b/src/test/ui/paren-span.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Be smart about span of parenthesized expression in macro. macro_rules! paren { diff --git a/src/test/ui/paren-span.stderr b/src/test/ui/paren-span.stderr index df6881a1af312..23e6ade046957 100644 --- a/src/test/ui/paren-span.stderr +++ b/src/test/ui/paren-span.stderr @@ -1,5 +1,5 @@ error[E0616]: field `x` of struct `m::S` is private - --> $DIR/paren-span.rs:29:12 + --> $DIR/paren-span.rs:19:12 | LL | paren!(s.x); //~ ERROR field `x` of struct `m::S` is private | ^^^ diff --git a/src/test/ui/parse-error-correct.rs b/src/test/ui/parse-error-correct.rs index bc7c333723d8e..f167b3595d92f 100644 --- a/src/test/ui/parse-error-correct.rs +++ b/src/test/ui/parse-error-correct.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z continue-parse-after-error // Test that the parser is error correcting missing idents. Despite a parsing diff --git a/src/test/ui/parse-error-correct.stderr b/src/test/ui/parse-error-correct.stderr index 3eb0b19a6aaea..594a3ebc71c7f 100644 --- a/src/test/ui/parse-error-correct.stderr +++ b/src/test/ui/parse-error-correct.stderr @@ -1,17 +1,17 @@ error: unexpected token: `;` - --> $DIR/parse-error-correct.rs:18:15 + --> $DIR/parse-error-correct.rs:8:15 | LL | let x = y.; //~ ERROR unexpected token | ^ error: unexpected token: `(` - --> $DIR/parse-error-correct.rs:19:15 + --> $DIR/parse-error-correct.rs:9:15 | LL | let x = y.(); //~ ERROR unexpected token | ^ error[E0618]: expected function, found `{integer}` - --> $DIR/parse-error-correct.rs:19:13 + --> $DIR/parse-error-correct.rs:9:13 | LL | let y = 42; | - `{integer}` defined here @@ -20,7 +20,7 @@ LL | let x = y.(); //~ ERROR unexpected token | ^^^^ not a function error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields - --> $DIR/parse-error-correct.rs:21:15 + --> $DIR/parse-error-correct.rs:11:15 | LL | let x = y.foo; //~ ERROR `{integer}` is a primitive type and therefore doesn't have fields [E061 | ^^^ diff --git a/src/test/ui/parser-recovery-1.rs b/src/test/ui/parser-recovery-1.rs index 9fb4d6facddab..94f0d2624a8df 100644 --- a/src/test/ui/parser-recovery-1.rs +++ b/src/test/ui/parser-recovery-1.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z continue-parse-after-error // Test that we can recover from missing braces in the parser. diff --git a/src/test/ui/parser-recovery-1.stderr b/src/test/ui/parser-recovery-1.stderr index bf4070682fbb3..b67c4a8a62ddb 100644 --- a/src/test/ui/parser-recovery-1.stderr +++ b/src/test/ui/parser-recovery-1.stderr @@ -1,29 +1,29 @@ error: this file contains an un-closed delimiter - --> $DIR/parser-recovery-1.rs:24:55 + --> $DIR/parser-recovery-1.rs:14:55 | LL | } //~ ERROR this file contains an un-closed delimiter | ^ | help: did you mean to close this delimiter? - --> $DIR/parser-recovery-1.rs:15:11 + --> $DIR/parser-recovery-1.rs:5:11 | LL | trait Foo { | ^ error: unexpected token: `;` - --> $DIR/parser-recovery-1.rs:22:15 + --> $DIR/parser-recovery-1.rs:12:15 | LL | let x = y.; //~ ERROR unexpected token | ^ error[E0425]: cannot find function `foo` in this scope - --> $DIR/parser-recovery-1.rs:17:17 + --> $DIR/parser-recovery-1.rs:7:17 | LL | let x = foo(); //~ ERROR cannot find function `foo` in this scope | ^^^ not found in this scope error[E0425]: cannot find value `y` in this scope - --> $DIR/parser-recovery-1.rs:22:13 + --> $DIR/parser-recovery-1.rs:12:13 | LL | let x = y.; //~ ERROR unexpected token | ^ not found in this scope diff --git a/src/test/ui/parser-recovery-2.rs b/src/test/ui/parser-recovery-2.rs index 03b1a9b876f45..be686ccbc22ed 100644 --- a/src/test/ui/parser-recovery-2.rs +++ b/src/test/ui/parser-recovery-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z continue-parse-after-error // Test that we can recover from mismatched braces in the parser. diff --git a/src/test/ui/parser-recovery-2.stderr b/src/test/ui/parser-recovery-2.stderr index 1025dad3af773..e625255ce3f63 100644 --- a/src/test/ui/parser-recovery-2.stderr +++ b/src/test/ui/parser-recovery-2.stderr @@ -1,5 +1,5 @@ error: incorrect close delimiter: `)` - --> $DIR/parser-recovery-2.rs:18:5 + --> $DIR/parser-recovery-2.rs:8:5 | LL | fn bar() { | - unclosed delimiter @@ -8,19 +8,19 @@ LL | ) //~ ERROR incorrect close delimiter: `)` | ^ incorrect close delimiter error: unexpected token: `;` - --> $DIR/parser-recovery-2.rs:22:15 + --> $DIR/parser-recovery-2.rs:12:15 | LL | let x = y.; //~ ERROR unexpected token | ^ error[E0425]: cannot find function `foo` in this scope - --> $DIR/parser-recovery-2.rs:17:17 + --> $DIR/parser-recovery-2.rs:7:17 | LL | let x = foo(); //~ ERROR cannot find function `foo` in this scope | ^^^ not found in this scope error[E0425]: cannot find value `y` in this scope - --> $DIR/parser-recovery-2.rs:22:13 + --> $DIR/parser-recovery-2.rs:12:13 | LL | let x = y.; //~ ERROR unexpected token | ^ not found in this scope diff --git a/src/test/ui/parser/expected-comma-found-token.rs b/src/test/ui/parser/expected-comma-found-token.rs index f7a632dfaa1a0..a3e6609f98215 100644 --- a/src/test/ui/parser/expected-comma-found-token.rs +++ b/src/test/ui/parser/expected-comma-found-token.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that two closures cannot simultaneously have mutable // access to the variable, whether that mutable access be used // for direct assignment or for taking mutable ref. Issue #6801. diff --git a/src/test/ui/parser/expected-comma-found-token.stderr b/src/test/ui/parser/expected-comma-found-token.stderr index 9a564bb872e38..5bbdbe29416c1 100644 --- a/src/test/ui/parser/expected-comma-found-token.stderr +++ b/src/test/ui/parser/expected-comma-found-token.stderr @@ -1,5 +1,5 @@ error: expected one of `)` or `,`, found `label` - --> $DIR/expected-comma-found-token.rs:19:5 + --> $DIR/expected-comma-found-token.rs:9:5 | LL | message="the message" | - expected one of `)` or `,` here diff --git a/src/test/ui/partialeq_help.rs b/src/test/ui/partialeq_help.rs index ee6d632d1a3ee..c3ba805405b33 100644 --- a/src/test/ui/partialeq_help.rs +++ b/src/test/ui/partialeq_help.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo(a: &T, b: T) { a == b; //~ ERROR E0277 } diff --git a/src/test/ui/partialeq_help.stderr b/src/test/ui/partialeq_help.stderr index 43f13d45684e8..04eb9770c468d 100644 --- a/src/test/ui/partialeq_help.stderr +++ b/src/test/ui/partialeq_help.stderr @@ -1,5 +1,5 @@ error[E0277]: can't compare `&T` with `T` - --> $DIR/partialeq_help.rs:12:7 + --> $DIR/partialeq_help.rs:2:7 | LL | a == b; //~ ERROR E0277 | ^^ no implementation for `&T == T` diff --git a/src/test/ui/path-lookahead.rs b/src/test/ui/path-lookahead.rs index 367a256015558..fd7509a623e31 100644 --- a/src/test/ui/path-lookahead.rs +++ b/src/test/ui/path-lookahead.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass #![warn(unused)] diff --git a/src/test/ui/path-lookahead.stderr b/src/test/ui/path-lookahead.stderr index 89df5e894aa34..73c6884679dde 100644 --- a/src/test/ui/path-lookahead.stderr +++ b/src/test/ui/path-lookahead.stderr @@ -1,31 +1,31 @@ warning: unnecessary parentheses around `return` value - --> $DIR/path-lookahead.rs:18:10 + --> $DIR/path-lookahead.rs:8:10 | LL | return (::to_string(&arg)); //~WARN unnecessary parentheses around `return` value | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove these parentheses | note: lint level defined here - --> $DIR/path-lookahead.rs:13:9 + --> $DIR/path-lookahead.rs:3:9 | LL | #![warn(unused)] | ^^^^^^ = note: #[warn(unused_parens)] implied by #[warn(unused)] warning: function is never used: `with_parens` - --> $DIR/path-lookahead.rs:17:1 + --> $DIR/path-lookahead.rs:7:1 | LL | fn with_parens(arg: T) -> String { //~WARN function is never used: `with_parens` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/path-lookahead.rs:13:9 + --> $DIR/path-lookahead.rs:3:9 | LL | #![warn(unused)] | ^^^^^^ = note: #[warn(dead_code)] implied by #[warn(unused)] warning: function is never used: `no_parens` - --> $DIR/path-lookahead.rs:21:1 + --> $DIR/path-lookahead.rs:11:1 | LL | fn no_parens(arg: T) -> String { //~WARN function is never used: `no_parens` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/pattern/pat-shadow-in-nested-binding.rs b/src/test/ui/pattern/pat-shadow-in-nested-binding.rs index 3dbe08f1908d7..da53a5f4cbfd8 100644 --- a/src/test/ui/pattern/pat-shadow-in-nested-binding.rs +++ b/src/test/ui/pattern/pat-shadow-in-nested-binding.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct foo(usize); fn main() { diff --git a/src/test/ui/pattern/pat-shadow-in-nested-binding.stderr b/src/test/ui/pattern/pat-shadow-in-nested-binding.stderr index 9dd6a318e98df..63e8099031b93 100644 --- a/src/test/ui/pattern/pat-shadow-in-nested-binding.stderr +++ b/src/test/ui/pattern/pat-shadow-in-nested-binding.stderr @@ -1,5 +1,5 @@ error[E0530]: let bindings cannot shadow tuple structs - --> $DIR/pat-shadow-in-nested-binding.rs:14:10 + --> $DIR/pat-shadow-in-nested-binding.rs:4:10 | LL | struct foo(usize); | ------------------ a tuple struct `foo` is defined here diff --git a/src/test/ui/pattern/pat-tuple-bad-type.rs b/src/test/ui/pattern/pat-tuple-bad-type.rs index 251e7b47dcc99..01e793e868599 100644 --- a/src/test/ui/pattern/pat-tuple-bad-type.rs +++ b/src/test/ui/pattern/pat-tuple-bad-type.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x; diff --git a/src/test/ui/pattern/pat-tuple-bad-type.stderr b/src/test/ui/pattern/pat-tuple-bad-type.stderr index d4f80550b3e84..28aa52856c55d 100644 --- a/src/test/ui/pattern/pat-tuple-bad-type.stderr +++ b/src/test/ui/pattern/pat-tuple-bad-type.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/pat-tuple-bad-type.rs:15:9 + --> $DIR/pat-tuple-bad-type.rs:5:9 | LL | let x; | - consider giving `x` a type @@ -10,7 +10,7 @@ LL | (..) => {} //~ ERROR type annotations needed = note: type must be known at this point error[E0308]: mismatched types - --> $DIR/pat-tuple-bad-type.rs:20:9 + --> $DIR/pat-tuple-bad-type.rs:10:9 | LL | (..) => {} //~ ERROR mismatched types | ^^^^ expected u8, found () diff --git a/src/test/ui/pattern/pat-tuple-overfield.rs b/src/test/ui/pattern/pat-tuple-overfield.rs index 851fa5c5be61f..46a5e15ffa52c 100644 --- a/src/test/ui/pattern/pat-tuple-overfield.rs +++ b/src/test/ui/pattern/pat-tuple-overfield.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S(u8, u8, u8); fn main() { diff --git a/src/test/ui/pattern/pat-tuple-overfield.stderr b/src/test/ui/pattern/pat-tuple-overfield.stderr index 2802b42f313d5..4bd374affb366 100644 --- a/src/test/ui/pattern/pat-tuple-overfield.stderr +++ b/src/test/ui/pattern/pat-tuple-overfield.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/pat-tuple-overfield.rs:15:9 + --> $DIR/pat-tuple-overfield.rs:5:9 | LL | (1, 2, 3, 4) => {} //~ ERROR mismatched types | ^^^^^^^^^^^^ expected a tuple with 3 elements, found one with 4 elements @@ -8,7 +8,7 @@ LL | (1, 2, 3, 4) => {} //~ ERROR mismatched types found type `(_, _, _, _)` error[E0308]: mismatched types - --> $DIR/pat-tuple-overfield.rs:16:9 + --> $DIR/pat-tuple-overfield.rs:6:9 | LL | (1, 2, .., 3, 4) => {} //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^ expected a tuple with 3 elements, found one with 4 elements @@ -17,13 +17,13 @@ LL | (1, 2, .., 3, 4) => {} //~ ERROR mismatched types found type `(_, _, _, _)` error[E0023]: this pattern has 4 fields, but the corresponding tuple struct has 3 fields - --> $DIR/pat-tuple-overfield.rs:20:9 + --> $DIR/pat-tuple-overfield.rs:10:9 | LL | S(1, 2, 3, 4) => {} | ^^^^^^^^^^^^^ expected 3 fields, found 4 error[E0023]: this pattern has 4 fields, but the corresponding tuple struct has 3 fields - --> $DIR/pat-tuple-overfield.rs:22:9 + --> $DIR/pat-tuple-overfield.rs:12:9 | LL | S(1, 2, .., 3, 4) => {} | ^^^^^^^^^^^^^^^^^ expected 3 fields, found 4 diff --git a/src/test/ui/pattern/patkind-litrange-no-expr.rs b/src/test/ui/pattern/patkind-litrange-no-expr.rs index 8fef98f815f22..def6c62459e5a 100644 --- a/src/test/ui/pattern/patkind-litrange-no-expr.rs +++ b/src/test/ui/pattern/patkind-litrange-no-expr.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! enum_number { ($name:ident { $($variant:ident = $value:expr, )* }) => { enum $name { diff --git a/src/test/ui/pattern/patkind-litrange-no-expr.stderr b/src/test/ui/pattern/patkind-litrange-no-expr.stderr index f22870fb029a1..4caafa7d3e84b 100644 --- a/src/test/ui/pattern/patkind-litrange-no-expr.stderr +++ b/src/test/ui/pattern/patkind-litrange-no-expr.stderr @@ -1,11 +1,11 @@ error: arbitrary expressions aren't allowed in patterns - --> $DIR/patkind-litrange-no-expr.rs:30:13 + --> $DIR/patkind-litrange-no-expr.rs:20:13 | LL | Arith = 1 + 1, //~ ERROR arbitrary expressions aren't allowed in patterns | ^^^^^ error[E0029]: only char and numeric types are allowed in range patterns - --> $DIR/patkind-litrange-no-expr.rs:30:13 + --> $DIR/patkind-litrange-no-expr.rs:20:13 | LL | Arith = 1 + 1, //~ ERROR arbitrary expressions aren't allowed in patterns | ^^^^^ ranges require char or numeric types diff --git a/src/test/ui/pattern/pattern-binding-disambiguation.rs b/src/test/ui/pattern/pattern-binding-disambiguation.rs index c740f6bb47c3f..2e80ea345dcf7 100644 --- a/src/test/ui/pattern/pattern-binding-disambiguation.rs +++ b/src/test/ui/pattern/pattern-binding-disambiguation.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct UnitStruct; struct TupleStruct(); struct BracedStruct{} diff --git a/src/test/ui/pattern/pattern-binding-disambiguation.stderr b/src/test/ui/pattern/pattern-binding-disambiguation.stderr index 7acdb07e10da6..f86fef3c3715b 100644 --- a/src/test/ui/pattern/pattern-binding-disambiguation.stderr +++ b/src/test/ui/pattern/pattern-binding-disambiguation.stderr @@ -1,5 +1,5 @@ error[E0530]: match bindings cannot shadow tuple structs - --> $DIR/pattern-binding-disambiguation.rs:34:9 + --> $DIR/pattern-binding-disambiguation.rs:24:9 | LL | struct TupleStruct(); | --------------------- a tuple struct `TupleStruct` is defined here @@ -8,7 +8,7 @@ LL | TupleStruct => {} //~ ERROR match bindings cannot shadow tuple stru | ^^^^^^^^^^^ cannot be named the same as a tuple struct error[E0530]: match bindings cannot shadow tuple variants - --> $DIR/pattern-binding-disambiguation.rs:43:9 + --> $DIR/pattern-binding-disambiguation.rs:33:9 | LL | use E::*; | ---- a tuple variant `TupleVariant` is imported here @@ -17,7 +17,7 @@ LL | TupleVariant => {} //~ ERROR match bindings cannot shadow tuple var | ^^^^^^^^^^^^ cannot be named the same as a tuple variant error[E0530]: match bindings cannot shadow struct variants - --> $DIR/pattern-binding-disambiguation.rs:46:9 + --> $DIR/pattern-binding-disambiguation.rs:36:9 | LL | use E::*; | ---- a struct variant `BracedVariant` is imported here @@ -26,7 +26,7 @@ LL | BracedVariant => {} //~ ERROR match bindings cannot shadow struct v | ^^^^^^^^^^^^^ cannot be named the same as a struct variant error[E0530]: match bindings cannot shadow statics - --> $DIR/pattern-binding-disambiguation.rs:52:9 + --> $DIR/pattern-binding-disambiguation.rs:42:9 | LL | static STATIC: () = (); | ----------------------- a static `STATIC` is defined here @@ -35,7 +35,7 @@ LL | STATIC => {} //~ ERROR match bindings cannot shadow statics | ^^^^^^ cannot be named the same as a static error[E0530]: let bindings cannot shadow tuple structs - --> $DIR/pattern-binding-disambiguation.rs:59:9 + --> $DIR/pattern-binding-disambiguation.rs:49:9 | LL | struct TupleStruct(); | --------------------- a tuple struct `TupleStruct` is defined here @@ -44,7 +44,7 @@ LL | let TupleStruct = doesnt_matter; //~ ERROR let bindings cannot shadow t | ^^^^^^^^^^^ cannot be named the same as a tuple struct error[E0530]: let bindings cannot shadow tuple variants - --> $DIR/pattern-binding-disambiguation.rs:62:9 + --> $DIR/pattern-binding-disambiguation.rs:52:9 | LL | use E::*; | ---- a tuple variant `TupleVariant` is imported here @@ -53,7 +53,7 @@ LL | let TupleVariant = doesnt_matter; //~ ERROR let bindings cannot shadow | ^^^^^^^^^^^^ cannot be named the same as a tuple variant error[E0530]: let bindings cannot shadow struct variants - --> $DIR/pattern-binding-disambiguation.rs:63:9 + --> $DIR/pattern-binding-disambiguation.rs:53:9 | LL | use E::*; | ---- a struct variant `BracedVariant` is imported here @@ -62,7 +62,7 @@ LL | let BracedVariant = doesnt_matter; //~ ERROR let bindings cannot shadow | ^^^^^^^^^^^^^ cannot be named the same as a struct variant error[E0530]: let bindings cannot shadow statics - --> $DIR/pattern-binding-disambiguation.rs:65:9 + --> $DIR/pattern-binding-disambiguation.rs:55:9 | LL | static STATIC: () = (); | ----------------------- a static `STATIC` is defined here diff --git a/src/test/ui/pattern/pattern-bindings-after-at.rs b/src/test/ui/pattern/pattern-bindings-after-at.rs index da2a97b0ca8ab..4a24a496857ba 100644 --- a/src/test/ui/pattern/pattern-bindings-after-at.rs +++ b/src/test/ui/pattern/pattern-bindings-after-at.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Option { None, Some(T), diff --git a/src/test/ui/pattern/pattern-bindings-after-at.stderr b/src/test/ui/pattern/pattern-bindings-after-at.stderr index 8c715001baa09..7a3883c585450 100644 --- a/src/test/ui/pattern/pattern-bindings-after-at.stderr +++ b/src/test/ui/pattern/pattern-bindings-after-at.stderr @@ -1,5 +1,5 @@ error[E0303]: pattern bindings are not allowed after an `@` - --> $DIR/pattern-bindings-after-at.rs:18:31 + --> $DIR/pattern-bindings-after-at.rs:8:31 | LL | ref mut z @ &mut Some(ref a) => { | ^^^^^ not allowed after `@` diff --git a/src/test/ui/pattern/pattern-error-continue.rs b/src/test/ui/pattern/pattern-error-continue.rs index e63b84594aa94..e634e0b8ac1d3 100644 --- a/src/test/ui/pattern/pattern-error-continue.rs +++ b/src/test/ui/pattern/pattern-error-continue.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that certain pattern-match type errors are non-fatal enum A { diff --git a/src/test/ui/pattern/pattern-error-continue.stderr b/src/test/ui/pattern/pattern-error-continue.stderr index b24366c48bcbf..007876a6e1344 100644 --- a/src/test/ui/pattern/pattern-error-continue.stderr +++ b/src/test/ui/pattern/pattern-error-continue.stderr @@ -1,11 +1,11 @@ error[E0433]: failed to resolve. Use of undeclared type or module `E` - --> $DIR/pattern-error-continue.rs:45:9 + --> $DIR/pattern-error-continue.rs:35:9 | LL | E::V => {} //~ ERROR failed to resolve. Use of undeclared type or module `E` | ^ Use of undeclared type or module `E` error[E0532]: expected tuple struct/variant, found unit variant `A::D` - --> $DIR/pattern-error-continue.rs:28:9 + --> $DIR/pattern-error-continue.rs:18:9 | LL | A::D(_) => (), //~ ERROR expected tuple struct/variant, found unit variant `A::D` | ^^^- @@ -13,13 +13,13 @@ LL | A::D(_) => (), //~ ERROR expected tuple struct/variant, found | did you mean `B`? error[E0023]: this pattern has 3 fields, but the corresponding tuple variant has 2 fields - --> $DIR/pattern-error-continue.rs:27:9 + --> $DIR/pattern-error-continue.rs:17:9 | LL | A::B(_, _, _) => (), //~ ERROR this pattern has 3 fields, but | ^^^^^^^^^^^^^ expected 2 fields, found 3 error[E0308]: mismatched types - --> $DIR/pattern-error-continue.rs:32:9 + --> $DIR/pattern-error-continue.rs:22:9 | LL | S { .. } => (), | ^^^^^^^^ expected char, found struct `S` @@ -28,7 +28,7 @@ LL | S { .. } => (), found type `S` error[E0308]: mismatched types - --> $DIR/pattern-error-continue.rs:40:7 + --> $DIR/pattern-error-continue.rs:30:7 | LL | f(true); | ^^^^ expected char, found bool diff --git a/src/test/ui/pattern/pattern-ident-path-generics.rs b/src/test/ui/pattern/pattern-ident-path-generics.rs index 0b7886842b49e..48c02623f28f2 100644 --- a/src/test/ui/pattern/pattern-ident-path-generics.rs +++ b/src/test/ui/pattern/pattern-ident-path-generics.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { match Some("foo") { None:: => {} //~ ERROR mismatched types diff --git a/src/test/ui/pattern/pattern-ident-path-generics.stderr b/src/test/ui/pattern/pattern-ident-path-generics.stderr index cd205956571f8..278b3d19d8bc7 100644 --- a/src/test/ui/pattern/pattern-ident-path-generics.stderr +++ b/src/test/ui/pattern/pattern-ident-path-generics.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/pattern-ident-path-generics.rs:13:9 + --> $DIR/pattern-ident-path-generics.rs:3:9 | LL | None:: => {} //~ ERROR mismatched types | ^^^^^^^^^^^^^ expected &str, found isize diff --git a/src/test/ui/pattern/pattern-tyvar-2.rs b/src/test/ui/pattern/pattern-tyvar-2.rs index cd4a98835c8c7..e7f2498a897eb 100644 --- a/src/test/ui/pattern/pattern-tyvar-2.rs +++ b/src/test/ui/pattern/pattern-tyvar-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum bar { t1((), Option>), t2, } // n.b. my change changes this error message, but I think it's right -- tjc diff --git a/src/test/ui/pattern/pattern-tyvar-2.stderr b/src/test/ui/pattern/pattern-tyvar-2.stderr index fd7ab84cc562a..e2c8c8bcf57b8 100644 --- a/src/test/ui/pattern/pattern-tyvar-2.stderr +++ b/src/test/ui/pattern/pattern-tyvar-2.stderr @@ -1,5 +1,5 @@ error[E0369]: binary operation `*` cannot be applied to type `std::vec::Vec` - --> $DIR/pattern-tyvar-2.rs:14:69 + --> $DIR/pattern-tyvar-2.rs:4:69 | LL | fn foo(t: bar) -> isize { match t { bar::t1(_, Some(x)) => { return x * 3; } _ => { panic!(); } } } | ^^^^^ diff --git a/src/test/ui/pattern/pattern-tyvar.rs b/src/test/ui/pattern/pattern-tyvar.rs index be8d3e027e7f2..80e1bcceaa6b1 100644 --- a/src/test/ui/pattern/pattern-tyvar.rs +++ b/src/test/ui/pattern/pattern-tyvar.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: mismatched types enum bar { t1((), Option >), t2, } diff --git a/src/test/ui/pattern/pattern-tyvar.stderr b/src/test/ui/pattern/pattern-tyvar.stderr index 55e09e02a1d8f..9013d0977c18e 100644 --- a/src/test/ui/pattern/pattern-tyvar.stderr +++ b/src/test/ui/pattern/pattern-tyvar.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/pattern-tyvar.rs:17:18 + --> $DIR/pattern-tyvar.rs:7:18 | LL | bar::t1(_, Some::(x)) => { | ^^^^^^^^^^^^^^^^ expected struct `std::vec::Vec`, found isize diff --git a/src/test/ui/phantom-oibit.rs b/src/test/ui/phantom-oibit.rs index 51e7d5da98f4b..04291a70606c9 100644 --- a/src/test/ui/phantom-oibit.rs +++ b/src/test/ui/phantom-oibit.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Ensure that OIBIT checks `T` when it encounters a `PhantomData` field, instead of checking // the `PhantomData` type itself (which almost always implements an auto trait) diff --git a/src/test/ui/phantom-oibit.stderr b/src/test/ui/phantom-oibit.stderr index 5156ba94cef6e..ec8b3181bc553 100644 --- a/src/test/ui/phantom-oibit.stderr +++ b/src/test/ui/phantom-oibit.stderr @@ -1,5 +1,5 @@ error[E0277]: `T` cannot be shared between threads safely - --> $DIR/phantom-oibit.rs:31:5 + --> $DIR/phantom-oibit.rs:21:5 | LL | is_zen(x) | ^^^^^^ `T` cannot be shared between threads safely @@ -10,13 +10,13 @@ LL | is_zen(x) = note: required because it appears within the type `std::marker::PhantomData<&T>` = note: required because it appears within the type `Guard<'_, T>` note: required by `is_zen` - --> $DIR/phantom-oibit.rs:28:1 + --> $DIR/phantom-oibit.rs:18:1 | LL | fn is_zen(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: `T` cannot be shared between threads safely - --> $DIR/phantom-oibit.rs:36:5 + --> $DIR/phantom-oibit.rs:26:5 | LL | is_zen(x) | ^^^^^^ `T` cannot be shared between threads safely @@ -28,7 +28,7 @@ LL | is_zen(x) = note: required because it appears within the type `Guard<'_, T>` = note: required because it appears within the type `Nested>` note: required by `is_zen` - --> $DIR/phantom-oibit.rs:28:1 + --> $DIR/phantom-oibit.rs:18:1 | LL | fn is_zen(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/placement-syntax.rs b/src/test/ui/placement-syntax.rs index 39252597a23e8..ac6fed1558f53 100644 --- a/src/test/ui/placement-syntax.rs +++ b/src/test/ui/placement-syntax.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = -5; if x<-1 { diff --git a/src/test/ui/placement-syntax.stderr b/src/test/ui/placement-syntax.stderr index 933ba96519c44..350aaa9bdddc1 100644 --- a/src/test/ui/placement-syntax.stderr +++ b/src/test/ui/placement-syntax.stderr @@ -1,5 +1,5 @@ error: emplacement syntax is obsolete (for now, anyway) - --> $DIR/placement-syntax.rs:13:8 + --> $DIR/placement-syntax.rs:3:8 | LL | if x<-1 { | ^^^^ diff --git a/src/test/ui/platform-intrinsic-params.rs b/src/test/ui/platform-intrinsic-params.rs index e8a9031dba8db..5759a10e6c5d4 100644 --- a/src/test/ui/platform-intrinsic-params.rs +++ b/src/test/ui/platform-intrinsic-params.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(platform_intrinsics)] extern "platform-intrinsic" { fn x86_mm_movemask_ps() -> i32; //~ERROR found 0, expected 1 diff --git a/src/test/ui/platform-intrinsic-params.stderr b/src/test/ui/platform-intrinsic-params.stderr index e41de9fe02d7c..17671ce6113de 100644 --- a/src/test/ui/platform-intrinsic-params.stderr +++ b/src/test/ui/platform-intrinsic-params.stderr @@ -1,5 +1,5 @@ error[E0444]: platform-specific intrinsic has invalid number of arguments: found 0, expected 1 - --> $DIR/platform-intrinsic-params.rs:13:5 + --> $DIR/platform-intrinsic-params.rs:3:5 | LL | fn x86_mm_movemask_ps() -> i32; //~ERROR found 0, expected 1 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/pptypedef.rs b/src/test/ui/pptypedef.rs index 7ece52e753786..80ebf0242ecc8 100644 --- a/src/test/ui/pptypedef.rs +++ b/src/test/ui/pptypedef.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn let_in(x: T, f: F) where F: FnOnce(T) {} fn main() { diff --git a/src/test/ui/pptypedef.stderr b/src/test/ui/pptypedef.stderr index bde48d86ba56e..32ee1a6aae99d 100644 --- a/src/test/ui/pptypedef.stderr +++ b/src/test/ui/pptypedef.stderr @@ -1,11 +1,11 @@ error[E0308]: mismatched types - --> $DIR/pptypedef.rs:14:37 + --> $DIR/pptypedef.rs:4:37 | LL | let_in(3u32, |i| { assert!(i == 3i32); }); | ^^^^ expected u32, found i32 error[E0308]: mismatched types - --> $DIR/pptypedef.rs:18:37 + --> $DIR/pptypedef.rs:8:37 | LL | let_in(3i32, |i| { assert!(i == 3u32); }); | ^^^^ expected i32, found u32 diff --git a/src/test/ui/prim-with-args.rs b/src/test/ui/prim-with-args.rs index cc0b74dc82a5b..52443a729e5bc 100644 --- a/src/test/ui/prim-with-args.rs +++ b/src/test/ui/prim-with-args.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x: isize; //~ ERROR type parameters are not allowed on this type diff --git a/src/test/ui/prim-with-args.stderr b/src/test/ui/prim-with-args.stderr index bfe7256f8a20e..190c45a1624d1 100644 --- a/src/test/ui/prim-with-args.stderr +++ b/src/test/ui/prim-with-args.stderr @@ -1,131 +1,131 @@ error[E0109]: type parameters are not allowed on this type - --> $DIR/prim-with-args.rs:13:14 + --> $DIR/prim-with-args.rs:3:14 | LL | let x: isize; //~ ERROR type parameters are not allowed on this type | ^^^^^ type parameter not allowed error[E0109]: type parameters are not allowed on this type - --> $DIR/prim-with-args.rs:14:11 + --> $DIR/prim-with-args.rs:4:11 | LL | let x: i8; //~ ERROR type parameters are not allowed on this type | ^^^^^ type parameter not allowed error[E0109]: type parameters are not allowed on this type - --> $DIR/prim-with-args.rs:15:12 + --> $DIR/prim-with-args.rs:5:12 | LL | let x: i16; //~ ERROR type parameters are not allowed on this type | ^^^^^ type parameter not allowed error[E0109]: type parameters are not allowed on this type - --> $DIR/prim-with-args.rs:16:12 + --> $DIR/prim-with-args.rs:6:12 | LL | let x: i32; //~ ERROR type parameters are not allowed on this type | ^^^^^ type parameter not allowed error[E0109]: type parameters are not allowed on this type - --> $DIR/prim-with-args.rs:17:12 + --> $DIR/prim-with-args.rs:7:12 | LL | let x: i64; //~ ERROR type parameters are not allowed on this type | ^^^^^ type parameter not allowed error[E0109]: type parameters are not allowed on this type - --> $DIR/prim-with-args.rs:18:14 + --> $DIR/prim-with-args.rs:8:14 | LL | let x: usize; //~ ERROR type parameters are not allowed on this type | ^^^^^ type parameter not allowed error[E0109]: type parameters are not allowed on this type - --> $DIR/prim-with-args.rs:19:11 + --> $DIR/prim-with-args.rs:9:11 | LL | let x: u8; //~ ERROR type parameters are not allowed on this type | ^^^^^ type parameter not allowed error[E0109]: type parameters are not allowed on this type - --> $DIR/prim-with-args.rs:20:12 + --> $DIR/prim-with-args.rs:10:12 | LL | let x: u16; //~ ERROR type parameters are not allowed on this type | ^^^^^ type parameter not allowed error[E0109]: type parameters are not allowed on this type - --> $DIR/prim-with-args.rs:21:12 + --> $DIR/prim-with-args.rs:11:12 | LL | let x: u32; //~ ERROR type parameters are not allowed on this type | ^^^^^ type parameter not allowed error[E0109]: type parameters are not allowed on this type - --> $DIR/prim-with-args.rs:22:12 + --> $DIR/prim-with-args.rs:12:12 | LL | let x: u64; //~ ERROR type parameters are not allowed on this type | ^^^^^ type parameter not allowed error[E0109]: type parameters are not allowed on this type - --> $DIR/prim-with-args.rs:23:13 + --> $DIR/prim-with-args.rs:13:13 | LL | let x: char; //~ ERROR type parameters are not allowed on this type | ^^^^^ type parameter not allowed error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/prim-with-args.rs:25:14 + --> $DIR/prim-with-args.rs:15:14 | LL | let x: isize<'static>; //~ ERROR lifetime parameters are not allowed on this type | ^^^^^^^ lifetime parameter not allowed error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/prim-with-args.rs:26:11 + --> $DIR/prim-with-args.rs:16:11 | LL | let x: i8<'static>; //~ ERROR lifetime parameters are not allowed on this type | ^^^^^^^ lifetime parameter not allowed error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/prim-with-args.rs:27:12 + --> $DIR/prim-with-args.rs:17:12 | LL | let x: i16<'static>; //~ ERROR lifetime parameters are not allowed on this type | ^^^^^^^ lifetime parameter not allowed error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/prim-with-args.rs:28:12 + --> $DIR/prim-with-args.rs:18:12 | LL | let x: i32<'static>; //~ ERROR lifetime parameters are not allowed on this type | ^^^^^^^ lifetime parameter not allowed error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/prim-with-args.rs:29:12 + --> $DIR/prim-with-args.rs:19:12 | LL | let x: i64<'static>; //~ ERROR lifetime parameters are not allowed on this type | ^^^^^^^ lifetime parameter not allowed error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/prim-with-args.rs:30:14 + --> $DIR/prim-with-args.rs:20:14 | LL | let x: usize<'static>; //~ ERROR lifetime parameters are not allowed on this type | ^^^^^^^ lifetime parameter not allowed error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/prim-with-args.rs:31:11 + --> $DIR/prim-with-args.rs:21:11 | LL | let x: u8<'static>; //~ ERROR lifetime parameters are not allowed on this type | ^^^^^^^ lifetime parameter not allowed error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/prim-with-args.rs:32:12 + --> $DIR/prim-with-args.rs:22:12 | LL | let x: u16<'static>; //~ ERROR lifetime parameters are not allowed on this type | ^^^^^^^ lifetime parameter not allowed error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/prim-with-args.rs:33:12 + --> $DIR/prim-with-args.rs:23:12 | LL | let x: u32<'static>; //~ ERROR lifetime parameters are not allowed on this type | ^^^^^^^ lifetime parameter not allowed error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/prim-with-args.rs:34:12 + --> $DIR/prim-with-args.rs:24:12 | LL | let x: u64<'static>; //~ ERROR lifetime parameters are not allowed on this type | ^^^^^^^ lifetime parameter not allowed error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/prim-with-args.rs:35:13 + --> $DIR/prim-with-args.rs:25:13 | LL | let x: char<'static>; //~ ERROR lifetime parameters are not allowed on this type | ^^^^^^^ lifetime parameter not allowed diff --git a/src/test/ui/print-fuel/print-fuel.rs b/src/test/ui/print-fuel/print-fuel.rs index 96b025128ee9a..16fd4ac552500 100644 --- a/src/test/ui/print-fuel/print-fuel.rs +++ b/src/test/ui/print-fuel/print-fuel.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name="foo"] #![allow(dead_code)] diff --git a/src/test/ui/print_type_sizes/anonymous.rs b/src/test/ui/print_type_sizes/anonymous.rs index aff06a20112e1..4d2a0e27fd1a9 100644 --- a/src/test/ui/print_type_sizes/anonymous.rs +++ b/src/test/ui/print_type_sizes/anonymous.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z print-type-sizes // compile-pass diff --git a/src/test/ui/print_type_sizes/generics.rs b/src/test/ui/print_type_sizes/generics.rs index fa5921cfb1343..723b52a40f720 100644 --- a/src/test/ui/print_type_sizes/generics.rs +++ b/src/test/ui/print_type_sizes/generics.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z print-type-sizes // compile-pass diff --git a/src/test/ui/print_type_sizes/multiple_types.rs b/src/test/ui/print_type_sizes/multiple_types.rs index 3d6cb0d5f3c63..1b1d817420132 100644 --- a/src/test/ui/print_type_sizes/multiple_types.rs +++ b/src/test/ui/print_type_sizes/multiple_types.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z print-type-sizes // compile-pass diff --git a/src/test/ui/print_type_sizes/niche-filling.rs b/src/test/ui/print_type_sizes/niche-filling.rs index 17e7a21cd02e5..bed1e32a60158 100644 --- a/src/test/ui/print_type_sizes/niche-filling.rs +++ b/src/test/ui/print_type_sizes/niche-filling.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z print-type-sizes // compile-pass diff --git a/src/test/ui/print_type_sizes/no_duplicates.rs b/src/test/ui/print_type_sizes/no_duplicates.rs index 17ba4df7f2029..7307c0fd8b406 100644 --- a/src/test/ui/print_type_sizes/no_duplicates.rs +++ b/src/test/ui/print_type_sizes/no_duplicates.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z print-type-sizes // compile-pass diff --git a/src/test/ui/print_type_sizes/packed.rs b/src/test/ui/print_type_sizes/packed.rs index bc11146aa8516..6bc401093b78d 100644 --- a/src/test/ui/print_type_sizes/packed.rs +++ b/src/test/ui/print_type_sizes/packed.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z print-type-sizes // compile-pass diff --git a/src/test/ui/print_type_sizes/padding.rs b/src/test/ui/print_type_sizes/padding.rs index 335303afef96c..c6d927cb1e56e 100644 --- a/src/test/ui/print_type_sizes/padding.rs +++ b/src/test/ui/print_type_sizes/padding.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z print-type-sizes // compile-pass diff --git a/src/test/ui/print_type_sizes/repr-align.rs b/src/test/ui/print_type_sizes/repr-align.rs index 2e4c3ade92dde..fd452f411c51e 100644 --- a/src/test/ui/print_type_sizes/repr-align.rs +++ b/src/test/ui/print_type_sizes/repr-align.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z print-type-sizes // compile-pass diff --git a/src/test/ui/print_type_sizes/repr_int_c.rs b/src/test/ui/print_type_sizes/repr_int_c.rs index 04bb2ab26f3d1..6816bb71a0012 100644 --- a/src/test/ui/print_type_sizes/repr_int_c.rs +++ b/src/test/ui/print_type_sizes/repr_int_c.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z print-type-sizes // compile-pass diff --git a/src/test/ui/print_type_sizes/uninhabited.rs b/src/test/ui/print_type_sizes/uninhabited.rs index 9ae86136a9091..14245d0dc9a28 100644 --- a/src/test/ui/print_type_sizes/uninhabited.rs +++ b/src/test/ui/print_type_sizes/uninhabited.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z print-type-sizes // compile-pass diff --git a/src/test/ui/print_type_sizes/variants.rs b/src/test/ui/print_type_sizes/variants.rs index 52e951bd6843a..aa2d25a3926a5 100644 --- a/src/test/ui/print_type_sizes/variants.rs +++ b/src/test/ui/print_type_sizes/variants.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z print-type-sizes // compile-pass diff --git a/src/test/ui/priv-in-bad-locations.rs b/src/test/ui/priv-in-bad-locations.rs index 8901d8c08e50c..b9f5d4c358657 100644 --- a/src/test/ui/priv-in-bad-locations.rs +++ b/src/test/ui/priv-in-bad-locations.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub extern { //~ ERROR unnecessary visibility qualifier pub fn bar(); } diff --git a/src/test/ui/priv-in-bad-locations.stderr b/src/test/ui/priv-in-bad-locations.stderr index e395a2243df0e..09706a6d255b4 100644 --- a/src/test/ui/priv-in-bad-locations.stderr +++ b/src/test/ui/priv-in-bad-locations.stderr @@ -1,5 +1,5 @@ error[E0449]: unnecessary visibility qualifier - --> $DIR/priv-in-bad-locations.rs:11:1 + --> $DIR/priv-in-bad-locations.rs:1:1 | LL | pub extern { //~ ERROR unnecessary visibility qualifier | ^^^ `pub` not permitted here because it's implied @@ -7,7 +7,7 @@ LL | pub extern { //~ ERROR unnecessary visibility qualifier = note: place qualifiers on individual foreign items instead error[E0449]: unnecessary visibility qualifier - --> $DIR/priv-in-bad-locations.rs:21:1 + --> $DIR/priv-in-bad-locations.rs:11:1 | LL | pub impl B {} //~ ERROR unnecessary visibility qualifier | ^^^ `pub` not permitted here because it's implied @@ -15,13 +15,13 @@ LL | pub impl B {} //~ ERROR unnecessary visibility qualifier = note: place qualifiers on individual impl items instead error[E0449]: unnecessary visibility qualifier - --> $DIR/priv-in-bad-locations.rs:23:1 + --> $DIR/priv-in-bad-locations.rs:13:1 | LL | pub impl A for B { //~ ERROR unnecessary visibility qualifier | ^^^ `pub` not permitted here because it's implied error[E0449]: unnecessary visibility qualifier - --> $DIR/priv-in-bad-locations.rs:24:5 + --> $DIR/priv-in-bad-locations.rs:14:5 | LL | pub fn foo(&self) {} //~ ERROR unnecessary visibility qualifier | ^^^ `pub` not permitted here because it's implied diff --git a/src/test/ui/privacy/associated-item-privacy-inherent.rs b/src/test/ui/privacy/associated-item-privacy-inherent.rs index 63cb6e82c259e..c3ae920238f18 100644 --- a/src/test/ui/privacy/associated-item-privacy-inherent.rs +++ b/src/test/ui/privacy/associated-item-privacy-inherent.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(decl_macro, associated_type_defaults)] #![allow(unused, private_in_public)] diff --git a/src/test/ui/privacy/associated-item-privacy-inherent.stderr b/src/test/ui/privacy/associated-item-privacy-inherent.stderr index 391e5bbb4c012..6471a7914e103 100644 --- a/src/test/ui/privacy/associated-item-privacy-inherent.stderr +++ b/src/test/ui/privacy/associated-item-privacy-inherent.stderr @@ -1,5 +1,5 @@ error: type `for<'r> fn(&'r priv_nominal::Pub) {priv_nominal::Pub::method}` is private - --> $DIR/associated-item-privacy-inherent.rs:23:21 + --> $DIR/associated-item-privacy-inherent.rs:13:21 | LL | let value = Pub::method; | ^^^^^^^^^^^ @@ -8,7 +8,7 @@ LL | priv_nominal::mac!(); | --------------------- in this macro invocation error: type `for<'r> fn(&'r priv_nominal::Pub) {priv_nominal::Pub::method}` is private - --> $DIR/associated-item-privacy-inherent.rs:25:9 + --> $DIR/associated-item-privacy-inherent.rs:15:9 | LL | value; | ^^^^^ @@ -17,7 +17,7 @@ LL | priv_nominal::mac!(); | --------------------- in this macro invocation error: type `for<'r> fn(&'r priv_nominal::Pub) {priv_nominal::Pub::method}` is private - --> $DIR/associated-item-privacy-inherent.rs:27:13 + --> $DIR/associated-item-privacy-inherent.rs:17:13 | LL | Pub.method(); | ^^^^^^ @@ -26,7 +26,7 @@ LL | priv_nominal::mac!(); | --------------------- in this macro invocation error: associated constant `CONST` is private - --> $DIR/associated-item-privacy-inherent.rs:29:9 + --> $DIR/associated-item-privacy-inherent.rs:19:9 | LL | Pub::CONST; | ^^^^^^^^^^ @@ -35,7 +35,7 @@ LL | priv_nominal::mac!(); | --------------------- in this macro invocation error: type `priv_signature::Priv` is private - --> $DIR/associated-item-privacy-inherent.rs:47:21 + --> $DIR/associated-item-privacy-inherent.rs:37:21 | LL | let value = Pub::method; | ^^^^^^^^^^^ @@ -44,7 +44,7 @@ LL | priv_signature::mac!(); | ----------------------- in this macro invocation error: type `priv_signature::Priv` is private - --> $DIR/associated-item-privacy-inherent.rs:49:9 + --> $DIR/associated-item-privacy-inherent.rs:39:9 | LL | value; | ^^^^^ @@ -53,7 +53,7 @@ LL | priv_signature::mac!(); | ----------------------- in this macro invocation error: type `priv_signature::Priv` is private - --> $DIR/associated-item-privacy-inherent.rs:51:13 + --> $DIR/associated-item-privacy-inherent.rs:41:13 | LL | Pub.method(loop {}); | ^^^^^^ @@ -62,7 +62,7 @@ LL | priv_signature::mac!(); | ----------------------- in this macro invocation error: type `priv_substs::Priv` is private - --> $DIR/associated-item-privacy-inherent.rs:67:21 + --> $DIR/associated-item-privacy-inherent.rs:57:21 | LL | let value = Pub::method::; | ^^^^^^^^^^^^^^^^^^^ @@ -71,7 +71,7 @@ LL | priv_substs::mac!(); | -------------------- in this macro invocation error: type `priv_substs::Priv` is private - --> $DIR/associated-item-privacy-inherent.rs:69:9 + --> $DIR/associated-item-privacy-inherent.rs:59:9 | LL | value; | ^^^^^ @@ -80,7 +80,7 @@ LL | priv_substs::mac!(); | -------------------- in this macro invocation error: type `priv_substs::Priv` is private - --> $DIR/associated-item-privacy-inherent.rs:71:9 + --> $DIR/associated-item-privacy-inherent.rs:61:9 | LL | Pub.method::(); | ^^^^^^^^^^^^^^^^^^^^ @@ -89,7 +89,7 @@ LL | priv_substs::mac!(); | -------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-inherent.rs:90:21 + --> $DIR/associated-item-privacy-inherent.rs:80:21 | LL | let value = ::method; | ^^^^^^^^^^^^^ @@ -98,7 +98,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-inherent.rs:92:9 + --> $DIR/associated-item-privacy-inherent.rs:82:9 | LL | value; | ^^^^^ @@ -107,7 +107,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-inherent.rs:94:21 + --> $DIR/associated-item-privacy-inherent.rs:84:21 | LL | let value = Pub::method; | ^^^^^^^^^^^ @@ -116,7 +116,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-inherent.rs:96:9 + --> $DIR/associated-item-privacy-inherent.rs:86:9 | LL | value; | ^^^^^ @@ -125,7 +125,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-inherent.rs:98:21 + --> $DIR/associated-item-privacy-inherent.rs:88:21 | LL | let value = ::static_method; | ^^^^^^^^^^^^^^^^^^^^ @@ -134,7 +134,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-inherent.rs:100:9 + --> $DIR/associated-item-privacy-inherent.rs:90:9 | LL | value; | ^^^^^ @@ -143,7 +143,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-inherent.rs:102:21 + --> $DIR/associated-item-privacy-inherent.rs:92:21 | LL | let value = Pub::static_method; | ^^^^^^^^^^^^^^^^^^ @@ -152,7 +152,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-inherent.rs:104:9 + --> $DIR/associated-item-privacy-inherent.rs:94:9 | LL | value; | ^^^^^ @@ -161,7 +161,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-inherent.rs:106:19 + --> $DIR/associated-item-privacy-inherent.rs:96:19 | LL | Pub(Priv).method(); | ^^^^^^ @@ -170,7 +170,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-inherent.rs:109:10 + --> $DIR/associated-item-privacy-inherent.rs:99:10 | LL | ::CONST; | ^^^ @@ -179,7 +179,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-inherent.rs:111:9 + --> $DIR/associated-item-privacy-inherent.rs:101:9 | LL | Pub::CONST; | ^^^^^^^^^^ diff --git a/src/test/ui/privacy/associated-item-privacy-trait.rs b/src/test/ui/privacy/associated-item-privacy-trait.rs index bdc0c680a92bc..b3d42f0959627 100644 --- a/src/test/ui/privacy/associated-item-privacy-trait.rs +++ b/src/test/ui/privacy/associated-item-privacy-trait.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength #![feature(decl_macro, associated_type_defaults)] diff --git a/src/test/ui/privacy/associated-item-privacy-trait.stderr b/src/test/ui/privacy/associated-item-privacy-trait.stderr index 5aac27346f344..5cf1be82937f8 100644 --- a/src/test/ui/privacy/associated-item-privacy-trait.stderr +++ b/src/test/ui/privacy/associated-item-privacy-trait.stderr @@ -1,5 +1,5 @@ error: type `for<'r> fn(&'r priv_trait::Pub) {::method}` is private - --> $DIR/associated-item-privacy-trait.rs:27:21 + --> $DIR/associated-item-privacy-trait.rs:17:21 | LL | let value = ::method; | ^^^^^^^^^^^^^^^^^^^^^^^ @@ -8,7 +8,7 @@ LL | priv_trait::mac!(); | ------------------- in this macro invocation error: type `for<'r> fn(&'r priv_trait::Pub) {::method}` is private - --> $DIR/associated-item-privacy-trait.rs:29:9 + --> $DIR/associated-item-privacy-trait.rs:19:9 | LL | value; | ^^^^^ @@ -17,7 +17,7 @@ LL | priv_trait::mac!(); | ------------------- in this macro invocation error: type `for<'r> fn(&'r Self) {::method}` is private - --> $DIR/associated-item-privacy-trait.rs:31:13 + --> $DIR/associated-item-privacy-trait.rs:21:13 | LL | Pub.method(); | ^^^^^^ @@ -26,7 +26,7 @@ LL | priv_trait::mac!(); | ------------------- in this macro invocation error: associated constant `PrivTr::CONST` is private - --> $DIR/associated-item-privacy-trait.rs:33:9 + --> $DIR/associated-item-privacy-trait.rs:23:9 | LL | ::CONST; | ^^^^^^^^^^^^^^^^^^^^^^ @@ -35,7 +35,7 @@ LL | priv_trait::mac!(); | ------------------- in this macro invocation error: trait `priv_trait::PrivTr` is private - --> $DIR/associated-item-privacy-trait.rs:35:13 + --> $DIR/associated-item-privacy-trait.rs:25:13 | LL | let _: ::AssocTy; | ^ @@ -44,7 +44,7 @@ LL | priv_trait::mac!(); | ------------------- in this macro invocation error: trait `priv_trait::PrivTr` is private - --> $DIR/associated-item-privacy-trait.rs:35:16 + --> $DIR/associated-item-privacy-trait.rs:25:16 | LL | let _: ::AssocTy; | ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -53,7 +53,7 @@ LL | priv_trait::mac!(); | ------------------- in this macro invocation error: trait `priv_trait::PrivTr` is private - --> $DIR/associated-item-privacy-trait.rs:38:34 + --> $DIR/associated-item-privacy-trait.rs:28:34 | LL | pub type InSignatureTy = ::AssocTy; | ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -62,7 +62,7 @@ LL | priv_trait::mac!(); | ------------------- in this macro invocation error: trait `priv_trait::PrivTr` is private - --> $DIR/associated-item-privacy-trait.rs:40:34 + --> $DIR/associated-item-privacy-trait.rs:30:34 | LL | pub trait InSignatureTr: PrivTr {} | ^^^^^^ @@ -71,7 +71,7 @@ LL | priv_trait::mac!(); | ------------------- in this macro invocation error: trait `priv_trait::PrivTr` is private - --> $DIR/associated-item-privacy-trait.rs:42:14 + --> $DIR/associated-item-privacy-trait.rs:32:14 | LL | impl PrivTr for u8 {} | ^^^^^^ @@ -80,7 +80,7 @@ LL | priv_trait::mac!(); | ------------------- in this macro invocation error: type `priv_signature::Priv` is private - --> $DIR/associated-item-privacy-trait.rs:59:21 + --> $DIR/associated-item-privacy-trait.rs:49:21 | LL | let value = ::method; | ^^^^^^^^^^^^^^^^^^^^^^ @@ -89,7 +89,7 @@ LL | priv_signature::mac!(); | ----------------------- in this macro invocation error: type `priv_signature::Priv` is private - --> $DIR/associated-item-privacy-trait.rs:61:9 + --> $DIR/associated-item-privacy-trait.rs:51:9 | LL | value; | ^^^^^ @@ -98,7 +98,7 @@ LL | priv_signature::mac!(); | ----------------------- in this macro invocation error: type `priv_signature::Priv` is private - --> $DIR/associated-item-privacy-trait.rs:63:13 + --> $DIR/associated-item-privacy-trait.rs:53:13 | LL | Pub.method(loop {}); | ^^^^^^ @@ -107,7 +107,7 @@ LL | priv_signature::mac!(); | ----------------------- in this macro invocation error: type `priv_substs::Priv` is private - --> $DIR/associated-item-privacy-trait.rs:80:21 + --> $DIR/associated-item-privacy-trait.rs:70:21 | LL | let value = ::method::; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -116,7 +116,7 @@ LL | priv_substs::mac!(); | -------------------- in this macro invocation error: type `priv_substs::Priv` is private - --> $DIR/associated-item-privacy-trait.rs:82:9 + --> $DIR/associated-item-privacy-trait.rs:72:9 | LL | value; | ^^^^^ @@ -125,7 +125,7 @@ LL | priv_substs::mac!(); | -------------------- in this macro invocation error: type `priv_substs::Priv` is private - --> $DIR/associated-item-privacy-trait.rs:84:9 + --> $DIR/associated-item-privacy-trait.rs:74:9 | LL | Pub.method::(); | ^^^^^^^^^^^^^^^^^^^^ @@ -134,7 +134,7 @@ LL | priv_substs::mac!(); | -------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-trait.rs:104:21 + --> $DIR/associated-item-privacy-trait.rs:94:21 | LL | let value = ::method; | ^^^^^^^^^^^^^^^^^^^^^^ @@ -143,7 +143,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-trait.rs:106:9 + --> $DIR/associated-item-privacy-trait.rs:96:9 | LL | value; | ^^^^^ @@ -152,7 +152,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-trait.rs:108:21 + --> $DIR/associated-item-privacy-trait.rs:98:21 | LL | let value = >::method; | ^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -161,7 +161,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-trait.rs:110:9 + --> $DIR/associated-item-privacy-trait.rs:100:9 | LL | value; | ^^^^^ @@ -170,7 +170,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-trait.rs:112:9 + --> $DIR/associated-item-privacy-trait.rs:102:9 | LL | Pub.method(); | ^^^^^^^^^^^^ @@ -179,7 +179,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-trait.rs:115:21 + --> $DIR/associated-item-privacy-trait.rs:105:21 | LL | let value = >::method; | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -188,7 +188,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-trait.rs:117:9 + --> $DIR/associated-item-privacy-trait.rs:107:9 | LL | value; | ^^^^^ @@ -197,7 +197,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-trait.rs:119:9 + --> $DIR/associated-item-privacy-trait.rs:109:9 | LL | Priv.method(); | ^^^^^^^^^^^^^ @@ -206,7 +206,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-trait.rs:122:9 + --> $DIR/associated-item-privacy-trait.rs:112:9 | LL | ::CONST; | ^^^^^^^^^^^^^^^^^^^^^ @@ -215,7 +215,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-trait.rs:124:9 + --> $DIR/associated-item-privacy-trait.rs:114:9 | LL | >::CONST; | ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -224,7 +224,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-trait.rs:126:9 + --> $DIR/associated-item-privacy-trait.rs:116:9 | LL | >::CONST; | ^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -233,7 +233,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-trait.rs:129:13 + --> $DIR/associated-item-privacy-trait.rs:119:13 | LL | let _: ::AssocTy; | ^ @@ -242,7 +242,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-trait.rs:129:16 + --> $DIR/associated-item-privacy-trait.rs:119:16 | LL | let _: ::AssocTy; | ^^^^^^^^^^^^^^^^^^^^^^^ @@ -251,7 +251,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-trait.rs:132:13 + --> $DIR/associated-item-privacy-trait.rs:122:13 | LL | let _: >::AssocTy; | ^ @@ -260,7 +260,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-trait.rs:132:16 + --> $DIR/associated-item-privacy-trait.rs:122:16 | LL | let _: >::AssocTy; | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -269,7 +269,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-trait.rs:135:13 + --> $DIR/associated-item-privacy-trait.rs:125:13 | LL | let _: >::AssocTy; | ^ @@ -278,7 +278,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-trait.rs:135:16 + --> $DIR/associated-item-privacy-trait.rs:125:16 | LL | let _: >::AssocTy; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -287,7 +287,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-trait.rs:139:35 + --> $DIR/associated-item-privacy-trait.rs:129:35 | LL | pub type InSignatureTy1 = ::AssocTy; | ^^^^^^^^^^^^^^^^^^^^^^^ @@ -296,7 +296,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-trait.rs:141:35 + --> $DIR/associated-item-privacy-trait.rs:131:35 | LL | pub type InSignatureTy2 = >::AssocTy; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -305,7 +305,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-trait.rs:143:14 + --> $DIR/associated-item-privacy-trait.rs:133:14 | LL | impl PubTr for u8 {} | ^^^^^ diff --git a/src/test/ui/privacy/associated-item-privacy-type-binding.rs b/src/test/ui/privacy/associated-item-privacy-type-binding.rs index 6019369aa2ebb..ff274ab8f1f8d 100644 --- a/src/test/ui/privacy/associated-item-privacy-type-binding.rs +++ b/src/test/ui/privacy/associated-item-privacy-type-binding.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(decl_macro, associated_type_defaults)] #![allow(unused, private_in_public)] diff --git a/src/test/ui/privacy/associated-item-privacy-type-binding.stderr b/src/test/ui/privacy/associated-item-privacy-type-binding.stderr index e762dc62853b0..331e2f689b547 100644 --- a/src/test/ui/privacy/associated-item-privacy-type-binding.stderr +++ b/src/test/ui/privacy/associated-item-privacy-type-binding.stderr @@ -1,5 +1,5 @@ error: type `(dyn priv_trait::PubTr + ')` is private - --> $DIR/associated-item-privacy-type-binding.rs:21:13 + --> $DIR/associated-item-privacy-type-binding.rs:11:13 | LL | let _: Box>; | ^ @@ -8,7 +8,7 @@ LL | priv_trait::mac1!(); | -------------------- in this macro invocation error: type `(dyn priv_trait::PubTr + ')` is private - --> $DIR/associated-item-privacy-type-binding.rs:21:16 + --> $DIR/associated-item-privacy-type-binding.rs:11:16 | LL | let _: Box>; | ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -17,7 +17,7 @@ LL | priv_trait::mac1!(); | -------------------- in this macro invocation error: type `(dyn priv_trait::PubTr + 'static)` is private - --> $DIR/associated-item-privacy-type-binding.rs:24:31 + --> $DIR/associated-item-privacy-type-binding.rs:14:31 | LL | type InSignatureTy2 = Box>; | ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -26,7 +26,7 @@ LL | priv_trait::mac1!(); | -------------------- in this macro invocation error: trait `priv_trait::PrivTr` is private - --> $DIR/associated-item-privacy-type-binding.rs:26:31 + --> $DIR/associated-item-privacy-type-binding.rs:16:31 | LL | trait InSignatureTr2: PubTr {} | ^^^^^^^^^^^^^^^^^^^ @@ -35,7 +35,7 @@ LL | priv_trait::mac1!(); | -------------------- in this macro invocation error: type `(dyn priv_trait::PrivTr + ')` is private - --> $DIR/associated-item-privacy-type-binding.rs:30:13 + --> $DIR/associated-item-privacy-type-binding.rs:20:13 | LL | let _: Box>; | ^ @@ -44,7 +44,7 @@ LL | priv_trait::mac2!(); | -------------------- in this macro invocation error: type `(dyn priv_trait::PrivTr + ')` is private - --> $DIR/associated-item-privacy-type-binding.rs:30:16 + --> $DIR/associated-item-privacy-type-binding.rs:20:16 | LL | let _: Box>; | ^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -53,7 +53,7 @@ LL | priv_trait::mac2!(); | -------------------- in this macro invocation error: type `(dyn priv_trait::PrivTr + 'static)` is private - --> $DIR/associated-item-privacy-type-binding.rs:33:31 + --> $DIR/associated-item-privacy-type-binding.rs:23:31 | LL | type InSignatureTy1 = Box>; | ^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -62,7 +62,7 @@ LL | priv_trait::mac2!(); | -------------------- in this macro invocation error: trait `priv_trait::PrivTr` is private - --> $DIR/associated-item-privacy-type-binding.rs:35:31 + --> $DIR/associated-item-privacy-type-binding.rs:25:31 | LL | trait InSignatureTr1: PrivTr {} | ^^^^^^^^^^^^^^^^^^^^ @@ -71,7 +71,7 @@ LL | priv_trait::mac2!(); | -------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-type-binding.rs:54:13 + --> $DIR/associated-item-privacy-type-binding.rs:44:13 | LL | let _: Box>; | ^ @@ -80,7 +80,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-type-binding.rs:54:16 + --> $DIR/associated-item-privacy-type-binding.rs:44:16 | LL | let _: Box>; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -89,7 +89,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-type-binding.rs:57:13 + --> $DIR/associated-item-privacy-type-binding.rs:47:13 | LL | let _: Box>; | ^ @@ -98,7 +98,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-type-binding.rs:57:16 + --> $DIR/associated-item-privacy-type-binding.rs:47:16 | LL | let _: Box>; | ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -107,7 +107,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-type-binding.rs:60:35 + --> $DIR/associated-item-privacy-type-binding.rs:50:35 | LL | pub type InSignatureTy1 = Box>; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -116,7 +116,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-type-binding.rs:62:35 + --> $DIR/associated-item-privacy-type-binding.rs:52:35 | LL | pub type InSignatureTy2 = Box>; | ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -125,7 +125,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-type-binding.rs:64:31 + --> $DIR/associated-item-privacy-type-binding.rs:54:31 | LL | trait InSignatureTr1: PubTrWithParam {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -134,7 +134,7 @@ LL | priv_parent_substs::mac!(); | --------------------------- in this macro invocation error: type `priv_parent_substs::Priv` is private - --> $DIR/associated-item-privacy-type-binding.rs:66:31 + --> $DIR/associated-item-privacy-type-binding.rs:56:31 | LL | trait InSignatureTr2: PubTr {} | ^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/privacy/auxiliary/cci_class.rs b/src/test/ui/privacy/auxiliary/cci_class.rs index 08a13fd8bcc9a..de2945d746045 100644 --- a/src/test/ui/privacy/auxiliary/cci_class.rs +++ b/src/test/ui/privacy/auxiliary/cci_class.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod kitties { pub struct cat { meows : usize, diff --git a/src/test/ui/privacy/auxiliary/cci_class_5.rs b/src/test/ui/privacy/auxiliary/cci_class_5.rs index 7fe608f1634c2..3aeaa83d30a35 100644 --- a/src/test/ui/privacy/auxiliary/cci_class_5.rs +++ b/src/test/ui/privacy/auxiliary/cci_class_5.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod kitties { pub struct cat { meows : usize, diff --git a/src/test/ui/privacy/auxiliary/privacy_tuple_struct.rs b/src/test/ui/privacy/auxiliary/privacy_tuple_struct.rs index 141b6bdd604fe..223cda4b23628 100644 --- a/src/test/ui/privacy/auxiliary/privacy_tuple_struct.rs +++ b/src/test/ui/privacy/auxiliary/privacy_tuple_struct.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct A(()); pub struct B(isize); pub struct C(pub isize, isize); diff --git a/src/test/ui/privacy/auxiliary/private-inferred-type.rs b/src/test/ui/privacy/auxiliary/private-inferred-type.rs index fc43765f63ce8..7ac913f5b5bd5 100644 --- a/src/test/ui/privacy/auxiliary/private-inferred-type.rs +++ b/src/test/ui/privacy/auxiliary/private-inferred-type.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(decl_macro)] fn priv_fn() {} diff --git a/src/test/ui/privacy/legacy-ctor-visibility.rs b/src/test/ui/privacy/legacy-ctor-visibility.rs index 95144916fd785..7db4be729e8fa 100644 --- a/src/test/ui/privacy/legacy-ctor-visibility.rs +++ b/src/test/ui/privacy/legacy-ctor-visibility.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength #![allow(unused)] diff --git a/src/test/ui/privacy/legacy-ctor-visibility.stderr b/src/test/ui/privacy/legacy-ctor-visibility.stderr index 7652d65a3a4a6..f0590951c081d 100644 --- a/src/test/ui/privacy/legacy-ctor-visibility.stderr +++ b/src/test/ui/privacy/legacy-ctor-visibility.stderr @@ -1,5 +1,5 @@ error: private struct constructors are not usable through re-exports in outer modules - --> $DIR/legacy-ctor-visibility.rs:23:13 + --> $DIR/legacy-ctor-visibility.rs:13:13 | LL | S(10); | ^ diff --git a/src/test/ui/privacy/privacy-in-paths.rs b/src/test/ui/privacy/privacy-in-paths.rs index 0a8689ea6d612..9cee2b89dd536 100644 --- a/src/test/ui/privacy/privacy-in-paths.rs +++ b/src/test/ui/privacy/privacy-in-paths.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod foo { pub use self::bar::S; mod bar { diff --git a/src/test/ui/privacy/privacy-in-paths.stderr b/src/test/ui/privacy/privacy-in-paths.stderr index f0aa3d36479e4..ffc2f36cbafae 100644 --- a/src/test/ui/privacy/privacy-in-paths.stderr +++ b/src/test/ui/privacy/privacy-in-paths.stderr @@ -1,17 +1,17 @@ error[E0603]: module `bar` is private - --> $DIR/privacy-in-paths.rs:34:9 + --> $DIR/privacy-in-paths.rs:24:9 | LL | ::foo::bar::baz::f(); //~ERROR module `bar` is private | ^^^^^^^^^^^^^^^^^^ error[E0603]: module `bar` is private - --> $DIR/privacy-in-paths.rs:35:9 + --> $DIR/privacy-in-paths.rs:25:9 | LL | ::foo::bar::S::f(); //~ERROR module `bar` is private | ^^^^^^^^^^^^^^^^ error[E0603]: trait `T` is private - --> $DIR/privacy-in-paths.rs:36:9 + --> $DIR/privacy-in-paths.rs:26:9 | LL | <() as ::foo::T>::Assoc::f(); //~ERROR trait `T` is private | ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/privacy/privacy-ns1.rs b/src/test/ui/privacy/privacy-ns1.rs index e7e522f99d41f..91cf8e8161994 100644 --- a/src/test/ui/privacy/privacy-ns1.rs +++ b/src/test/ui/privacy/privacy-ns1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check we do the correct privacy checks when we import a name and there is an // item with that name in both the value and type namespaces. diff --git a/src/test/ui/privacy/privacy-ns1.stderr b/src/test/ui/privacy/privacy-ns1.stderr index 503cfbfaa2dc7..e778b6ec3505d 100644 --- a/src/test/ui/privacy/privacy-ns1.stderr +++ b/src/test/ui/privacy/privacy-ns1.stderr @@ -1,5 +1,5 @@ error[E0423]: expected function, found trait `Bar` - --> $DIR/privacy-ns1.rs:30:5 + --> $DIR/privacy-ns1.rs:20:5 | LL | Bar(); //~ ERROR expected function, found trait `Bar` | ^^^ did you mean `Baz`? @@ -13,7 +13,7 @@ LL | use foo3::Bar; | error[E0573]: expected type, found function `Bar` - --> $DIR/privacy-ns1.rs:45:17 + --> $DIR/privacy-ns1.rs:35:17 | LL | let _x: Box; //~ ERROR expected type, found function `Bar` | ^^^ did you mean `Baz`? @@ -27,7 +27,7 @@ LL | use foo3::Bar; | error[E0425]: cannot find function `Bar` in this scope - --> $DIR/privacy-ns1.rs:60:5 + --> $DIR/privacy-ns1.rs:50:5 | LL | Bar(); //~ ERROR cannot find function `Bar` in this scope | ^^^ did you mean `Baz`? @@ -41,7 +41,7 @@ LL | use foo3::Bar; | error[E0412]: cannot find type `Bar` in this scope - --> $DIR/privacy-ns1.rs:61:17 + --> $DIR/privacy-ns1.rs:51:17 | LL | let _x: Box; //~ ERROR cannot find type `Bar` in this scope | ^^^ did you mean `Baz`? diff --git a/src/test/ui/privacy/privacy-ns2.rs b/src/test/ui/privacy/privacy-ns2.rs index ec9396b5e7bcb..c4e400f5adbd9 100644 --- a/src/test/ui/privacy/privacy-ns2.rs +++ b/src/test/ui/privacy/privacy-ns2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check we do the correct privacy checks when we import a name and there is an // item with that name in both the value and type namespaces. diff --git a/src/test/ui/privacy/privacy-ns2.stderr b/src/test/ui/privacy/privacy-ns2.stderr index 0cd341d9a58b5..5c965b4200f7c 100644 --- a/src/test/ui/privacy/privacy-ns2.stderr +++ b/src/test/ui/privacy/privacy-ns2.stderr @@ -1,5 +1,5 @@ error[E0423]: expected function, found trait `Bar` - --> $DIR/privacy-ns2.rs:30:5 + --> $DIR/privacy-ns2.rs:20:5 | LL | Bar(); //~ ERROR expected function, found trait `Bar` | ^^^ not a function @@ -13,7 +13,7 @@ LL | use foo3::Bar; | error[E0423]: expected function, found trait `Bar` - --> $DIR/privacy-ns2.rs:36:5 + --> $DIR/privacy-ns2.rs:26:5 | LL | Bar(); //~ ERROR expected function, found trait `Bar` | ^^^ did you mean `Baz`? @@ -27,7 +27,7 @@ LL | use foo3::Bar; | error[E0573]: expected type, found function `Bar` - --> $DIR/privacy-ns2.rs:51:18 + --> $DIR/privacy-ns2.rs:41:18 | LL | let _x : Box; //~ ERROR expected type, found function `Bar` | ^^^ not a type @@ -41,7 +41,7 @@ LL | use foo3::Bar; | error[E0573]: expected type, found function `Bar` - --> $DIR/privacy-ns2.rs:57:17 + --> $DIR/privacy-ns2.rs:47:17 | LL | let _x: Box; //~ ERROR expected type, found function `Bar` | ^^^ did you mean `Baz`? @@ -55,19 +55,19 @@ LL | use foo3::Bar; | error[E0603]: trait `Bar` is private - --> $DIR/privacy-ns2.rs:70:9 + --> $DIR/privacy-ns2.rs:60:9 | LL | use foo3::Bar; //~ ERROR `Bar` is private | ^^^^^^^^^ error[E0603]: trait `Bar` is private - --> $DIR/privacy-ns2.rs:74:9 + --> $DIR/privacy-ns2.rs:64:9 | LL | use foo3::Bar; //~ ERROR `Bar` is private | ^^^^^^^^^ error[E0603]: trait `Bar` is private - --> $DIR/privacy-ns2.rs:81:16 + --> $DIR/privacy-ns2.rs:71:16 | LL | use foo3::{Bar,Baz}; //~ ERROR `Bar` is private | ^^^ diff --git a/src/test/ui/privacy/privacy-sanity.rs b/src/test/ui/privacy/privacy-sanity.rs index f245b7cef29b9..f83b24c49a10a 100644 --- a/src/test/ui/privacy/privacy-sanity.rs +++ b/src/test/ui/privacy/privacy-sanity.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] pub trait Tr { diff --git a/src/test/ui/privacy/privacy-sanity.stderr b/src/test/ui/privacy/privacy-sanity.stderr index fbfa15f8cb020..b1e3127645e0b 100644 --- a/src/test/ui/privacy/privacy-sanity.stderr +++ b/src/test/ui/privacy/privacy-sanity.stderr @@ -1,29 +1,29 @@ error[E0449]: unnecessary visibility qualifier - --> $DIR/privacy-sanity.rs:23:1 + --> $DIR/privacy-sanity.rs:13:1 | LL | pub impl Tr for S { //~ ERROR unnecessary visibility qualifier | ^^^ `pub` not permitted here because it's implied error[E0449]: unnecessary visibility qualifier - --> $DIR/privacy-sanity.rs:24:5 + --> $DIR/privacy-sanity.rs:14:5 | LL | pub fn f() {} //~ ERROR unnecessary visibility qualifier | ^^^ `pub` not permitted here because it's implied error[E0449]: unnecessary visibility qualifier - --> $DIR/privacy-sanity.rs:25:5 + --> $DIR/privacy-sanity.rs:15:5 | LL | pub const C: u8 = 0; //~ ERROR unnecessary visibility qualifier | ^^^ `pub` not permitted here because it's implied error[E0449]: unnecessary visibility qualifier - --> $DIR/privacy-sanity.rs:26:5 + --> $DIR/privacy-sanity.rs:16:5 | LL | pub type T = u8; //~ ERROR unnecessary visibility qualifier | ^^^ `pub` not permitted here because it's implied error[E0449]: unnecessary visibility qualifier - --> $DIR/privacy-sanity.rs:28:1 + --> $DIR/privacy-sanity.rs:18:1 | LL | pub impl S { //~ ERROR unnecessary visibility qualifier | ^^^ `pub` not permitted here because it's implied @@ -31,7 +31,7 @@ LL | pub impl S { //~ ERROR unnecessary visibility qualifier = note: place qualifiers on individual impl items instead error[E0449]: unnecessary visibility qualifier - --> $DIR/privacy-sanity.rs:33:1 + --> $DIR/privacy-sanity.rs:23:1 | LL | pub extern "C" { //~ ERROR unnecessary visibility qualifier | ^^^ `pub` not permitted here because it's implied @@ -39,31 +39,31 @@ LL | pub extern "C" { //~ ERROR unnecessary visibility qualifier = note: place qualifiers on individual foreign items instead error[E0449]: unnecessary visibility qualifier - --> $DIR/privacy-sanity.rs:49:5 + --> $DIR/privacy-sanity.rs:39:5 | LL | pub impl Tr for S { //~ ERROR unnecessary visibility qualifier | ^^^ `pub` not permitted here because it's implied error[E0449]: unnecessary visibility qualifier - --> $DIR/privacy-sanity.rs:50:9 + --> $DIR/privacy-sanity.rs:40:9 | LL | pub fn f() {} //~ ERROR unnecessary visibility qualifier | ^^^ `pub` not permitted here because it's implied error[E0449]: unnecessary visibility qualifier - --> $DIR/privacy-sanity.rs:51:9 + --> $DIR/privacy-sanity.rs:41:9 | LL | pub const C: u8 = 0; //~ ERROR unnecessary visibility qualifier | ^^^ `pub` not permitted here because it's implied error[E0449]: unnecessary visibility qualifier - --> $DIR/privacy-sanity.rs:52:9 + --> $DIR/privacy-sanity.rs:42:9 | LL | pub type T = u8; //~ ERROR unnecessary visibility qualifier | ^^^ `pub` not permitted here because it's implied error[E0449]: unnecessary visibility qualifier - --> $DIR/privacy-sanity.rs:54:5 + --> $DIR/privacy-sanity.rs:44:5 | LL | pub impl S { //~ ERROR unnecessary visibility qualifier | ^^^ `pub` not permitted here because it's implied @@ -71,7 +71,7 @@ LL | pub impl S { //~ ERROR unnecessary visibility qualifier = note: place qualifiers on individual impl items instead error[E0449]: unnecessary visibility qualifier - --> $DIR/privacy-sanity.rs:59:5 + --> $DIR/privacy-sanity.rs:49:5 | LL | pub extern "C" { //~ ERROR unnecessary visibility qualifier | ^^^ `pub` not permitted here because it's implied @@ -79,31 +79,31 @@ LL | pub extern "C" { //~ ERROR unnecessary visibility qualifier = note: place qualifiers on individual foreign items instead error[E0449]: unnecessary visibility qualifier - --> $DIR/privacy-sanity.rs:78:5 + --> $DIR/privacy-sanity.rs:68:5 | LL | pub impl Tr for S { //~ ERROR unnecessary visibility qualifier | ^^^ `pub` not permitted here because it's implied error[E0449]: unnecessary visibility qualifier - --> $DIR/privacy-sanity.rs:79:9 + --> $DIR/privacy-sanity.rs:69:9 | LL | pub fn f() {} //~ ERROR unnecessary visibility qualifier | ^^^ `pub` not permitted here because it's implied error[E0449]: unnecessary visibility qualifier - --> $DIR/privacy-sanity.rs:80:9 + --> $DIR/privacy-sanity.rs:70:9 | LL | pub const C: u8 = 0; //~ ERROR unnecessary visibility qualifier | ^^^ `pub` not permitted here because it's implied error[E0449]: unnecessary visibility qualifier - --> $DIR/privacy-sanity.rs:81:9 + --> $DIR/privacy-sanity.rs:71:9 | LL | pub type T = u8; //~ ERROR unnecessary visibility qualifier | ^^^ `pub` not permitted here because it's implied error[E0449]: unnecessary visibility qualifier - --> $DIR/privacy-sanity.rs:83:5 + --> $DIR/privacy-sanity.rs:73:5 | LL | pub impl S { //~ ERROR unnecessary visibility qualifier | ^^^ `pub` not permitted here because it's implied @@ -111,7 +111,7 @@ LL | pub impl S { //~ ERROR unnecessary visibility qualifier = note: place qualifiers on individual impl items instead error[E0449]: unnecessary visibility qualifier - --> $DIR/privacy-sanity.rs:88:5 + --> $DIR/privacy-sanity.rs:78:5 | LL | pub extern "C" { //~ ERROR unnecessary visibility qualifier | ^^^ `pub` not permitted here because it's implied diff --git a/src/test/ui/privacy/privacy-ufcs.rs b/src/test/ui/privacy/privacy-ufcs.rs index 28c1a003e39f0..fec7f41340ae9 100644 --- a/src/test/ui/privacy/privacy-ufcs.rs +++ b/src/test/ui/privacy/privacy-ufcs.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test to ensure private traits are inaccessible with UFCS angle-bracket syntax. mod foo { diff --git a/src/test/ui/privacy/privacy-ufcs.stderr b/src/test/ui/privacy/privacy-ufcs.stderr index 2030e2e0f1b9e..a5079955e3acc 100644 --- a/src/test/ui/privacy/privacy-ufcs.stderr +++ b/src/test/ui/privacy/privacy-ufcs.stderr @@ -1,5 +1,5 @@ error[E0603]: trait `Bar` is private - --> $DIR/privacy-ufcs.rs:22:5 + --> $DIR/privacy-ufcs.rs:12:5 | LL | ::baz(); //~ERROR trait `Bar` is private | ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/privacy/privacy1.rs b/src/test/ui/privacy/privacy1.rs index afe8c2fda3d4c..4e1fec7fc702b 100644 --- a/src/test/ui/privacy/privacy1.rs +++ b/src/test/ui/privacy/privacy1.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(lang_items, start, no_core)] #![no_core] // makes debugging this test *a lot* easier (during resolve) diff --git a/src/test/ui/privacy/privacy1.stderr b/src/test/ui/privacy/privacy1.stderr index 344f990699f45..079096e93c898 100644 --- a/src/test/ui/privacy/privacy1.stderr +++ b/src/test/ui/privacy/privacy1.stderr @@ -1,107 +1,107 @@ error[E0603]: module `baz` is private - --> $DIR/privacy1.rs:128:24 + --> $DIR/privacy1.rs:118:24 | LL | use bar::baz::{foo, bar}; | ^^^ error[E0603]: module `baz` is private - --> $DIR/privacy1.rs:128:29 + --> $DIR/privacy1.rs:118:29 | LL | use bar::baz::{foo, bar}; | ^^^ error[E0603]: module `baz` is private - --> $DIR/privacy1.rs:137:13 + --> $DIR/privacy1.rs:127:13 | LL | use bar::baz; | ^^^^^^^^ error[E0603]: module `i` is private - --> $DIR/privacy1.rs:161:9 + --> $DIR/privacy1.rs:151:9 | LL | use self::foo::i::A; //~ ERROR: module `i` is private | ^^^^^^^^^^^^^^^ error[E0603]: module `baz` is private - --> $DIR/privacy1.rs:100:9 + --> $DIR/privacy1.rs:90:9 | LL | ::bar::baz::A::foo(); //~ ERROR: module `baz` is private | ^^^^^^^^^^^^^^^^^^ error[E0603]: module `baz` is private - --> $DIR/privacy1.rs:101:9 + --> $DIR/privacy1.rs:91:9 | LL | ::bar::baz::A::bar(); //~ ERROR: module `baz` is private | ^^^^^^^^^^^^^^^^^^ error[E0603]: module `baz` is private - --> $DIR/privacy1.rs:103:9 + --> $DIR/privacy1.rs:93:9 | LL | ::bar::baz::A.foo2(); //~ ERROR: module `baz` is private | ^^^^^^^^^^^^^ error[E0603]: module `baz` is private - --> $DIR/privacy1.rs:104:9 + --> $DIR/privacy1.rs:94:9 | LL | ::bar::baz::A.bar2(); //~ ERROR: module `baz` is private | ^^^^^^^^^^^^^ error[E0603]: trait `B` is private - --> $DIR/privacy1.rs:108:9 + --> $DIR/privacy1.rs:98:9 | LL | ::bar::B::foo(); //~ ERROR: trait `B` is private | ^^^^^^^^^^^^^ error[E0603]: function `epriv` is private - --> $DIR/privacy1.rs:114:13 + --> $DIR/privacy1.rs:104:13 | LL | ::bar::epriv(); //~ ERROR: function `epriv` is private | ^^^^^^^^^^^^ error[E0603]: module `baz` is private - --> $DIR/privacy1.rs:123:9 + --> $DIR/privacy1.rs:113:9 | LL | ::bar::baz::foo(); //~ ERROR: module `baz` is private | ^^^^^^^^^^^^^^^ error[E0603]: module `baz` is private - --> $DIR/privacy1.rs:124:9 + --> $DIR/privacy1.rs:114:9 | LL | ::bar::baz::bar(); //~ ERROR: module `baz` is private | ^^^^^^^^^^^^^^^ error[E0603]: trait `B` is private - --> $DIR/privacy1.rs:153:10 + --> $DIR/privacy1.rs:143:10 | LL | impl ::bar::B for f32 { fn foo() -> f32 { 1.0 } } | ^^^^^^^^ error[E0624]: method `bar` is private - --> $DIR/privacy1.rs:73:9 + --> $DIR/privacy1.rs:63:9 | LL | self::baz::A::bar(); //~ ERROR: method `bar` is private | ^^^^^^^^^^^^^^^^^ error[E0624]: method `bar` is private - --> $DIR/privacy1.rs:91:5 + --> $DIR/privacy1.rs:81:5 | LL | bar::A::bar(); //~ ERROR: method `bar` is private | ^^^^^^^^^^^ error[E0624]: method `bar` is private - --> $DIR/privacy1.rs:98:9 + --> $DIR/privacy1.rs:88:9 | LL | ::bar::A::bar(); //~ ERROR: method `bar` is private | ^^^^^^^^^^^^^ error[E0624]: method `bar` is private - --> $DIR/privacy1.rs:101:9 + --> $DIR/privacy1.rs:91:9 | LL | ::bar::baz::A::bar(); //~ ERROR: module `baz` is private | ^^^^^^^^^^^^^^^^^^ error[E0624]: method `bar2` is private - --> $DIR/privacy1.rs:104:23 + --> $DIR/privacy1.rs:94:23 | LL | ::bar::baz::A.bar2(); //~ ERROR: module `baz` is private | ^^^^ diff --git a/src/test/ui/privacy/privacy2.rs b/src/test/ui/privacy/privacy2.rs index 113dd28794068..c8fa436bd14fc 100644 --- a/src/test/ui/privacy/privacy2.rs +++ b/src/test/ui/privacy/privacy2.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(start, no_core)] #![no_core] // makes debugging this test *a lot* easier (during resolve) diff --git a/src/test/ui/privacy/privacy2.stderr b/src/test/ui/privacy/privacy2.stderr index ec5567b25e443..9691f8d826cf4 100644 --- a/src/test/ui/privacy/privacy2.stderr +++ b/src/test/ui/privacy/privacy2.stderr @@ -1,11 +1,11 @@ error[E0432]: unresolved import `bar::foo` - --> $DIR/privacy2.rs:27:9 + --> $DIR/privacy2.rs:17:9 | LL | use bar::foo; | ^^^^^^^^ no `foo` in `bar` error[E0603]: function `foo` is private - --> $DIR/privacy2.rs:33:9 + --> $DIR/privacy2.rs:23:9 | LL | use bar::glob::foo; | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/privacy/privacy3.rs b/src/test/ui/privacy/privacy3.rs index b841717bd11d8..5a7cd76a98f6e 100644 --- a/src/test/ui/privacy/privacy3.rs +++ b/src/test/ui/privacy/privacy3.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(start, no_core)] #![no_core] // makes debugging this test *a lot* easier (during resolve) diff --git a/src/test/ui/privacy/privacy3.stderr b/src/test/ui/privacy/privacy3.stderr index 11c71616d9071..22c1e48b07d94 100644 --- a/src/test/ui/privacy/privacy3.stderr +++ b/src/test/ui/privacy/privacy3.stderr @@ -1,5 +1,5 @@ error[E0432]: unresolved import `bar::gpriv` - --> $DIR/privacy3.rs:28:9 + --> $DIR/privacy3.rs:18:9 | LL | use bar::gpriv; | ^^^^^^^^^^ no `gpriv` in `bar` diff --git a/src/test/ui/privacy/privacy4.rs b/src/test/ui/privacy/privacy4.rs index d9f767442845c..fa257b800394f 100644 --- a/src/test/ui/privacy/privacy4.rs +++ b/src/test/ui/privacy/privacy4.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(lang_items, start, no_core)] #![no_core] // makes debugging this test *a lot* easier (during resolve) diff --git a/src/test/ui/privacy/privacy4.stderr b/src/test/ui/privacy/privacy4.stderr index 811f5d5942a7a..84b593f0d9677 100644 --- a/src/test/ui/privacy/privacy4.stderr +++ b/src/test/ui/privacy/privacy4.stderr @@ -1,5 +1,5 @@ error[E0603]: module `glob` is private - --> $DIR/privacy4.rs:31:9 + --> $DIR/privacy4.rs:21:9 | LL | use bar::glob::gpriv; //~ ERROR: module `glob` is private | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/privacy/privacy5.rs b/src/test/ui/privacy/privacy5.rs index 599c1f8716044..741ba0be2c2b6 100644 --- a/src/test/ui/privacy/privacy5.rs +++ b/src/test/ui/privacy/privacy5.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:privacy_tuple_struct.rs extern crate privacy_tuple_struct as other; diff --git a/src/test/ui/privacy/privacy5.stderr b/src/test/ui/privacy/privacy5.stderr index bcb6315136273..34ae376459d76 100644 --- a/src/test/ui/privacy/privacy5.stderr +++ b/src/test/ui/privacy/privacy5.stderr @@ -1,287 +1,287 @@ error[E0603]: tuple struct `A` is private - --> $DIR/privacy5.rs:61:13 + --> $DIR/privacy5.rs:51:13 | LL | let a = a::A(()); //~ ERROR tuple struct `A` is private | ^^^^ error[E0603]: tuple struct `B` is private - --> $DIR/privacy5.rs:62:13 + --> $DIR/privacy5.rs:52:13 | LL | let b = a::B(2); //~ ERROR tuple struct `B` is private | ^^^^ error[E0603]: tuple struct `C` is private - --> $DIR/privacy5.rs:63:13 + --> $DIR/privacy5.rs:53:13 | LL | let c = a::C(2, 3); //~ ERROR tuple struct `C` is private | ^^^^ error[E0603]: tuple struct `A` is private - --> $DIR/privacy5.rs:66:9 + --> $DIR/privacy5.rs:56:9 | LL | let a::A(()) = a; //~ ERROR tuple struct `A` is private | ^^^^ error[E0603]: tuple struct `A` is private - --> $DIR/privacy5.rs:67:9 + --> $DIR/privacy5.rs:57:9 | LL | let a::A(_) = a; //~ ERROR tuple struct `A` is private | ^^^^ error[E0603]: tuple struct `A` is private - --> $DIR/privacy5.rs:68:15 + --> $DIR/privacy5.rs:58:15 | LL | match a { a::A(()) => {} } //~ ERROR tuple struct `A` is private | ^^^^ error[E0603]: tuple struct `A` is private - --> $DIR/privacy5.rs:69:15 + --> $DIR/privacy5.rs:59:15 | LL | match a { a::A(_) => {} } //~ ERROR tuple struct `A` is private | ^^^^ error[E0603]: tuple struct `B` is private - --> $DIR/privacy5.rs:71:9 + --> $DIR/privacy5.rs:61:9 | LL | let a::B(_) = b; //~ ERROR tuple struct `B` is private | ^^^^ error[E0603]: tuple struct `B` is private - --> $DIR/privacy5.rs:72:9 + --> $DIR/privacy5.rs:62:9 | LL | let a::B(_b) = b; //~ ERROR tuple struct `B` is private | ^^^^ error[E0603]: tuple struct `B` is private - --> $DIR/privacy5.rs:73:15 + --> $DIR/privacy5.rs:63:15 | LL | match b { a::B(_) => {} } //~ ERROR tuple struct `B` is private | ^^^^ error[E0603]: tuple struct `B` is private - --> $DIR/privacy5.rs:74:15 + --> $DIR/privacy5.rs:64:15 | LL | match b { a::B(_b) => {} } //~ ERROR tuple struct `B` is private | ^^^^ error[E0603]: tuple struct `B` is private - --> $DIR/privacy5.rs:75:15 + --> $DIR/privacy5.rs:65:15 | LL | match b { a::B(1) => {} a::B(_) => {} } //~ ERROR tuple struct `B` is private | ^^^^ error[E0603]: tuple struct `B` is private - --> $DIR/privacy5.rs:75:29 + --> $DIR/privacy5.rs:65:29 | LL | match b { a::B(1) => {} a::B(_) => {} } //~ ERROR tuple struct `B` is private | ^^^^ error[E0603]: tuple struct `C` is private - --> $DIR/privacy5.rs:78:9 + --> $DIR/privacy5.rs:68:9 | LL | let a::C(_, _) = c; //~ ERROR tuple struct `C` is private | ^^^^ error[E0603]: tuple struct `C` is private - --> $DIR/privacy5.rs:79:9 + --> $DIR/privacy5.rs:69:9 | LL | let a::C(_a, _) = c; //~ ERROR tuple struct `C` is private | ^^^^ error[E0603]: tuple struct `C` is private - --> $DIR/privacy5.rs:80:9 + --> $DIR/privacy5.rs:70:9 | LL | let a::C(_, _b) = c; //~ ERROR tuple struct `C` is private | ^^^^ error[E0603]: tuple struct `C` is private - --> $DIR/privacy5.rs:81:9 + --> $DIR/privacy5.rs:71:9 | LL | let a::C(_a, _b) = c; //~ ERROR tuple struct `C` is private | ^^^^ error[E0603]: tuple struct `C` is private - --> $DIR/privacy5.rs:82:15 + --> $DIR/privacy5.rs:72:15 | LL | match c { a::C(_, _) => {} } //~ ERROR tuple struct `C` is private | ^^^^ error[E0603]: tuple struct `C` is private - --> $DIR/privacy5.rs:83:15 + --> $DIR/privacy5.rs:73:15 | LL | match c { a::C(_a, _) => {} } //~ ERROR tuple struct `C` is private | ^^^^ error[E0603]: tuple struct `C` is private - --> $DIR/privacy5.rs:84:15 + --> $DIR/privacy5.rs:74:15 | LL | match c { a::C(_, _b) => {} } //~ ERROR tuple struct `C` is private | ^^^^ error[E0603]: tuple struct `C` is private - --> $DIR/privacy5.rs:85:15 + --> $DIR/privacy5.rs:75:15 | LL | match c { a::C(_a, _b) => {} } //~ ERROR tuple struct `C` is private | ^^^^ error[E0603]: tuple struct `A` is private - --> $DIR/privacy5.rs:93:14 + --> $DIR/privacy5.rs:83:14 | LL | let a2 = a::A; //~ ERROR tuple struct `A` is private | ^^^^ error[E0603]: tuple struct `B` is private - --> $DIR/privacy5.rs:94:14 + --> $DIR/privacy5.rs:84:14 | LL | let b2 = a::B; //~ ERROR tuple struct `B` is private | ^^^^ error[E0603]: tuple struct `C` is private - --> $DIR/privacy5.rs:95:14 + --> $DIR/privacy5.rs:85:14 | LL | let c2 = a::C; //~ ERROR tuple struct `C` is private | ^^^^ error[E0603]: tuple struct `A` is private - --> $DIR/privacy5.rs:100:13 + --> $DIR/privacy5.rs:90:13 | LL | let a = other::A(()); //~ ERROR tuple struct `A` is private | ^^^^^^^^ error[E0603]: tuple struct `B` is private - --> $DIR/privacy5.rs:101:13 + --> $DIR/privacy5.rs:91:13 | LL | let b = other::B(2); //~ ERROR tuple struct `B` is private | ^^^^^^^^ error[E0603]: tuple struct `C` is private - --> $DIR/privacy5.rs:102:13 + --> $DIR/privacy5.rs:92:13 | LL | let c = other::C(2, 3); //~ ERROR tuple struct `C` is private | ^^^^^^^^ error[E0603]: tuple struct `A` is private - --> $DIR/privacy5.rs:105:9 + --> $DIR/privacy5.rs:95:9 | LL | let other::A(()) = a; //~ ERROR tuple struct `A` is private | ^^^^^^^^ error[E0603]: tuple struct `A` is private - --> $DIR/privacy5.rs:106:9 + --> $DIR/privacy5.rs:96:9 | LL | let other::A(_) = a; //~ ERROR tuple struct `A` is private | ^^^^^^^^ error[E0603]: tuple struct `A` is private - --> $DIR/privacy5.rs:107:15 + --> $DIR/privacy5.rs:97:15 | LL | match a { other::A(()) => {} } //~ ERROR tuple struct `A` is private | ^^^^^^^^ error[E0603]: tuple struct `A` is private - --> $DIR/privacy5.rs:108:15 + --> $DIR/privacy5.rs:98:15 | LL | match a { other::A(_) => {} } //~ ERROR tuple struct `A` is private | ^^^^^^^^ error[E0603]: tuple struct `B` is private - --> $DIR/privacy5.rs:110:9 + --> $DIR/privacy5.rs:100:9 | LL | let other::B(_) = b; //~ ERROR tuple struct `B` is private | ^^^^^^^^ error[E0603]: tuple struct `B` is private - --> $DIR/privacy5.rs:111:9 + --> $DIR/privacy5.rs:101:9 | LL | let other::B(_b) = b; //~ ERROR tuple struct `B` is private | ^^^^^^^^ error[E0603]: tuple struct `B` is private - --> $DIR/privacy5.rs:112:15 + --> $DIR/privacy5.rs:102:15 | LL | match b { other::B(_) => {} } //~ ERROR tuple struct `B` is private | ^^^^^^^^ error[E0603]: tuple struct `B` is private - --> $DIR/privacy5.rs:113:15 + --> $DIR/privacy5.rs:103:15 | LL | match b { other::B(_b) => {} } //~ ERROR tuple struct `B` is private | ^^^^^^^^ error[E0603]: tuple struct `B` is private - --> $DIR/privacy5.rs:114:15 + --> $DIR/privacy5.rs:104:15 | LL | match b { other::B(1) => {} other::B(_) => {} } //~ ERROR tuple struct `B` is private | ^^^^^^^^ error[E0603]: tuple struct `B` is private - --> $DIR/privacy5.rs:114:33 + --> $DIR/privacy5.rs:104:33 | LL | match b { other::B(1) => {} other::B(_) => {} } //~ ERROR tuple struct `B` is private | ^^^^^^^^ error[E0603]: tuple struct `C` is private - --> $DIR/privacy5.rs:117:9 + --> $DIR/privacy5.rs:107:9 | LL | let other::C(_, _) = c; //~ ERROR tuple struct `C` is private | ^^^^^^^^ error[E0603]: tuple struct `C` is private - --> $DIR/privacy5.rs:118:9 + --> $DIR/privacy5.rs:108:9 | LL | let other::C(_a, _) = c; //~ ERROR tuple struct `C` is private | ^^^^^^^^ error[E0603]: tuple struct `C` is private - --> $DIR/privacy5.rs:119:9 + --> $DIR/privacy5.rs:109:9 | LL | let other::C(_, _b) = c; //~ ERROR tuple struct `C` is private | ^^^^^^^^ error[E0603]: tuple struct `C` is private - --> $DIR/privacy5.rs:120:9 + --> $DIR/privacy5.rs:110:9 | LL | let other::C(_a, _b) = c; //~ ERROR tuple struct `C` is private | ^^^^^^^^ error[E0603]: tuple struct `C` is private - --> $DIR/privacy5.rs:121:15 + --> $DIR/privacy5.rs:111:15 | LL | match c { other::C(_, _) => {} } //~ ERROR tuple struct `C` is private | ^^^^^^^^ error[E0603]: tuple struct `C` is private - --> $DIR/privacy5.rs:122:15 + --> $DIR/privacy5.rs:112:15 | LL | match c { other::C(_a, _) => {} } //~ ERROR tuple struct `C` is private | ^^^^^^^^ error[E0603]: tuple struct `C` is private - --> $DIR/privacy5.rs:123:15 + --> $DIR/privacy5.rs:113:15 | LL | match c { other::C(_, _b) => {} } //~ ERROR tuple struct `C` is private | ^^^^^^^^ error[E0603]: tuple struct `C` is private - --> $DIR/privacy5.rs:124:15 + --> $DIR/privacy5.rs:114:15 | LL | match c { other::C(_a, _b) => {} } //~ ERROR tuple struct `C` is private | ^^^^^^^^ error[E0603]: tuple struct `A` is private - --> $DIR/privacy5.rs:132:14 + --> $DIR/privacy5.rs:122:14 | LL | let a2 = other::A; //~ ERROR tuple struct `A` is private | ^^^^^^^^ error[E0603]: tuple struct `B` is private - --> $DIR/privacy5.rs:133:14 + --> $DIR/privacy5.rs:123:14 | LL | let b2 = other::B; //~ ERROR tuple struct `B` is private | ^^^^^^^^ error[E0603]: tuple struct `C` is private - --> $DIR/privacy5.rs:134:14 + --> $DIR/privacy5.rs:124:14 | LL | let c2 = other::C; //~ ERROR tuple struct `C` is private | ^^^^^^^^ diff --git a/src/test/ui/privacy/private-impl-method.rs b/src/test/ui/privacy/private-impl-method.rs index e04380f12acaf..b5587920f1cc9 100644 --- a/src/test/ui/privacy/private-impl-method.rs +++ b/src/test/ui/privacy/private-impl-method.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod a { pub struct Foo { pub x: isize diff --git a/src/test/ui/privacy/private-impl-method.stderr b/src/test/ui/privacy/private-impl-method.stderr index 0e36c7003ee50..8e254b15c7895 100644 --- a/src/test/ui/privacy/private-impl-method.stderr +++ b/src/test/ui/privacy/private-impl-method.stderr @@ -1,5 +1,5 @@ error[E0624]: method `foo` is private - --> $DIR/private-impl-method.rs:30:7 + --> $DIR/private-impl-method.rs:20:7 | LL | s.foo(); //~ ERROR method `foo` is private | ^^^ diff --git a/src/test/ui/privacy/private-in-public-assoc-ty.rs b/src/test/ui/privacy/private-in-public-assoc-ty.rs index 59dee25664252..c6e86ed64ae73 100644 --- a/src/test/ui/privacy/private-in-public-assoc-ty.rs +++ b/src/test/ui/privacy/private-in-public-assoc-ty.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Private types and traits are not allowed in interfaces of associated types. // This test also ensures that the checks are performed even inside private modules. diff --git a/src/test/ui/privacy/private-in-public-assoc-ty.stderr b/src/test/ui/privacy/private-in-public-assoc-ty.stderr index a95547bc5079e..6740277c9a7c1 100644 --- a/src/test/ui/privacy/private-in-public-assoc-ty.stderr +++ b/src/test/ui/privacy/private-in-public-assoc-ty.stderr @@ -1,5 +1,5 @@ warning: private trait `m::PrivTr` in public interface (error E0445) - --> $DIR/private-in-public-assoc-ty.rs:25:5 + --> $DIR/private-in-public-assoc-ty.rs:15:5 | LL | / pub trait PubTr { LL | | //~^ WARN private trait `m::PrivTr` in public interface @@ -15,7 +15,7 @@ LL | | } = note: for more information, see issue #34537 warning: private type `m::Priv` in public interface (error E0446) - --> $DIR/private-in-public-assoc-ty.rs:25:5 + --> $DIR/private-in-public-assoc-ty.rs:15:5 | LL | / pub trait PubTr { LL | | //~^ WARN private trait `m::PrivTr` in public interface @@ -30,7 +30,7 @@ LL | | } = note: for more information, see issue #34537 error[E0446]: private type `m::Priv` in public interface - --> $DIR/private-in-public-assoc-ty.rs:34:9 + --> $DIR/private-in-public-assoc-ty.rs:24:9 | LL | struct Priv; | - `m::Priv` declared as private @@ -39,7 +39,7 @@ LL | type Alias4 = Priv; | ^^^^^^^^^^^^^^^^^^^ can't leak private type error[E0446]: private type `m::Priv` in public interface - --> $DIR/private-in-public-assoc-ty.rs:38:9 + --> $DIR/private-in-public-assoc-ty.rs:28:9 | LL | struct Priv; | - `m::Priv` declared as private diff --git a/src/test/ui/privacy/private-in-public-ill-formed.rs b/src/test/ui/privacy/private-in-public-ill-formed.rs index 480406054adb5..0ef5d89002e49 100644 --- a/src/test/ui/privacy/private-in-public-ill-formed.rs +++ b/src/test/ui/privacy/private-in-public-ill-formed.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod aliases_pub { struct Priv; mod m { diff --git a/src/test/ui/privacy/private-in-public-ill-formed.stderr b/src/test/ui/privacy/private-in-public-ill-formed.stderr index 649f5fc2fcaf9..ab6531cc748ed 100644 --- a/src/test/ui/privacy/private-in-public-ill-formed.stderr +++ b/src/test/ui/privacy/private-in-public-ill-formed.stderr @@ -1,5 +1,5 @@ error[E0118]: no base type found for inherent implementation - --> $DIR/private-in-public-ill-formed.rs:24:10 + --> $DIR/private-in-public-ill-formed.rs:14:10 | LL | impl ::AssocAlias { //~ ERROR no base type found for inherent implementation | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl requires a base type @@ -7,7 +7,7 @@ LL | impl ::AssocAlias { //~ ERROR no base type found for in = note: either implement a trait on it or create a newtype to wrap it instead error[E0118]: no base type found for inherent implementation - --> $DIR/private-in-public-ill-formed.rs:40:10 + --> $DIR/private-in-public-ill-formed.rs:30:10 | LL | impl ::AssocAlias { //~ ERROR no base type found for inherent implementation | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl requires a base type diff --git a/src/test/ui/privacy/private-in-public-lint.rs b/src/test/ui/privacy/private-in-public-lint.rs index fd92300cd1526..8b6e43601608d 100644 --- a/src/test/ui/privacy/private-in-public-lint.rs +++ b/src/test/ui/privacy/private-in-public-lint.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod m1 { pub struct Pub; struct Priv; diff --git a/src/test/ui/privacy/private-in-public-lint.stderr b/src/test/ui/privacy/private-in-public-lint.stderr index 202cb342d8c7f..730ac24d5e54f 100644 --- a/src/test/ui/privacy/private-in-public-lint.stderr +++ b/src/test/ui/privacy/private-in-public-lint.stderr @@ -1,5 +1,5 @@ error[E0446]: private type `m1::Priv` in public interface - --> $DIR/private-in-public-lint.rs:16:9 + --> $DIR/private-in-public-lint.rs:6:9 | LL | struct Priv; | - `m1::Priv` declared as private @@ -8,7 +8,7 @@ LL | pub fn f() -> Priv {Priv} //~ ERROR private type `m1::Priv` in publ | ^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private type error[E0446]: private type `m2::Priv` in public interface - --> $DIR/private-in-public-lint.rs:25:9 + --> $DIR/private-in-public-lint.rs:15:9 | LL | struct Priv; | - `m2::Priv` declared as private diff --git a/src/test/ui/privacy/private-in-public-warn.rs b/src/test/ui/privacy/private-in-public-warn.rs index 6eeb14638e759..0da0d03595d83 100644 --- a/src/test/ui/privacy/private-in-public-warn.rs +++ b/src/test/ui/privacy/private-in-public-warn.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Private types and traits are not allowed in public interfaces. // This test also ensures that the checks are performed even inside private modules. diff --git a/src/test/ui/privacy/private-in-public-warn.stderr b/src/test/ui/privacy/private-in-public-warn.stderr index 04e743a5b0ebf..ab9ff8d64d36c 100644 --- a/src/test/ui/privacy/private-in-public-warn.stderr +++ b/src/test/ui/privacy/private-in-public-warn.stderr @@ -1,11 +1,11 @@ error: private type `types::Priv` in public interface (error E0446) - --> $DIR/private-in-public-warn.rs:25:5 + --> $DIR/private-in-public-warn.rs:15:5 | LL | pub type Alias = Priv; //~ ERROR private type `types::Priv` in public interface | ^^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/private-in-public-warn.rs:15:9 + --> $DIR/private-in-public-warn.rs:5:9 | LL | #![deny(private_in_public)] | ^^^^^^^^^^^^^^^^^ @@ -13,7 +13,7 @@ LL | #![deny(private_in_public)] = note: for more information, see issue #34537 error: private type `types::Priv` in public interface (error E0446) - --> $DIR/private-in-public-warn.rs:28:12 + --> $DIR/private-in-public-warn.rs:18:12 | LL | V1(Priv), //~ ERROR private type `types::Priv` in public interface | ^^^^ @@ -22,7 +22,7 @@ LL | V1(Priv), //~ ERROR private type `types::Priv` in public interface = note: for more information, see issue #34537 error: private type `types::Priv` in public interface (error E0446) - --> $DIR/private-in-public-warn.rs:30:14 + --> $DIR/private-in-public-warn.rs:20:14 | LL | V2 { field: Priv }, //~ ERROR private type `types::Priv` in public interface | ^^^^^^^^^^^ @@ -31,7 +31,7 @@ LL | V2 { field: Priv }, //~ ERROR private type `types::Priv` in public = note: for more information, see issue #34537 error: private type `types::Priv` in public interface (error E0446) - --> $DIR/private-in-public-warn.rs:34:9 + --> $DIR/private-in-public-warn.rs:24:9 | LL | const C: Priv = Priv; //~ ERROR private type `types::Priv` in public interface | ^^^^^^^^^^^^^^^^^^^^^ @@ -40,7 +40,7 @@ LL | const C: Priv = Priv; //~ ERROR private type `types::Priv` in publi = note: for more information, see issue #34537 error[E0446]: private type `types::Priv` in public interface - --> $DIR/private-in-public-warn.rs:36:9 + --> $DIR/private-in-public-warn.rs:26:9 | LL | struct Priv; | - `types::Priv` declared as private @@ -49,7 +49,7 @@ LL | type Alias = Priv; //~ ERROR private type `types::Priv` in public i | ^^^^^^^^^^^^^^^^^^ can't leak private type error: private type `types::Priv` in public interface (error E0446) - --> $DIR/private-in-public-warn.rs:37:9 + --> $DIR/private-in-public-warn.rs:27:9 | LL | fn f1(arg: Priv) {} //~ ERROR private type `types::Priv` in public interface | ^^^^^^^^^^^^^^^^^^^ @@ -58,7 +58,7 @@ LL | fn f1(arg: Priv) {} //~ ERROR private type `types::Priv` in public = note: for more information, see issue #34537 error: private type `types::Priv` in public interface (error E0446) - --> $DIR/private-in-public-warn.rs:39:9 + --> $DIR/private-in-public-warn.rs:29:9 | LL | fn f2() -> Priv { panic!() } //~ ERROR private type `types::Priv` in public interface | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -67,7 +67,7 @@ LL | fn f2() -> Priv { panic!() } //~ ERROR private type `types::Priv` i = note: for more information, see issue #34537 error: private type `types::Priv` in public interface (error E0446) - --> $DIR/private-in-public-warn.rs:43:9 + --> $DIR/private-in-public-warn.rs:33:9 | LL | pub static ES: Priv; //~ ERROR private type `types::Priv` in public interface | ^^^^^^^^^^^^^^^^^^^^ @@ -76,7 +76,7 @@ LL | pub static ES: Priv; //~ ERROR private type `types::Priv` in public = note: for more information, see issue #34537 error: private type `types::Priv` in public interface (error E0446) - --> $DIR/private-in-public-warn.rs:45:9 + --> $DIR/private-in-public-warn.rs:35:9 | LL | pub fn ef1(arg: Priv); //~ ERROR private type `types::Priv` in public interface | ^^^^^^^^^^^^^^^^^^^^^^ @@ -85,7 +85,7 @@ LL | pub fn ef1(arg: Priv); //~ ERROR private type `types::Priv` in publ = note: for more information, see issue #34537 error: private type `types::Priv` in public interface (error E0446) - --> $DIR/private-in-public-warn.rs:47:9 + --> $DIR/private-in-public-warn.rs:37:9 | LL | pub fn ef2() -> Priv; //~ ERROR private type `types::Priv` in public interface | ^^^^^^^^^^^^^^^^^^^^^ @@ -94,7 +94,7 @@ LL | pub fn ef2() -> Priv; //~ ERROR private type `types::Priv` in publi = note: for more information, see issue #34537 error[E0446]: private type `types::Priv` in public interface - --> $DIR/private-in-public-warn.rs:51:9 + --> $DIR/private-in-public-warn.rs:41:9 | LL | struct Priv; | - `types::Priv` declared as private @@ -103,7 +103,7 @@ LL | type Alias = Priv; //~ ERROR private type `types::Priv` in public i | ^^^^^^^^^^^^^^^^^^ can't leak private type error: private trait `traits::PrivTr` in public interface (error E0445) - --> $DIR/private-in-public-warn.rs:60:5 + --> $DIR/private-in-public-warn.rs:50:5 | LL | pub type Alias = T; //~ ERROR private trait `traits::PrivTr` in public interface | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -112,7 +112,7 @@ LL | pub type Alias = T; //~ ERROR private trait `traits::PrivTr` = note: for more information, see issue #34537 error: private trait `traits::PrivTr` in public interface (error E0445) - --> $DIR/private-in-public-warn.rs:62:5 + --> $DIR/private-in-public-warn.rs:52:5 | LL | pub trait Tr1: PrivTr {} //~ ERROR private trait `traits::PrivTr` in public interface | ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -121,7 +121,7 @@ LL | pub trait Tr1: PrivTr {} //~ ERROR private trait `traits::PrivTr` in pu = note: for more information, see issue #34537 error: private trait `traits::PrivTr` in public interface (error E0445) - --> $DIR/private-in-public-warn.rs:64:5 + --> $DIR/private-in-public-warn.rs:54:5 | LL | pub trait Tr2 {} //~ ERROR private trait `traits::PrivTr` in public interface | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -130,7 +130,7 @@ LL | pub trait Tr2 {} //~ ERROR private trait `traits::PrivTr` in = note: for more information, see issue #34537 error: private trait `traits::PrivTr` in public interface (error E0445) - --> $DIR/private-in-public-warn.rs:66:5 + --> $DIR/private-in-public-warn.rs:56:5 | LL | / pub trait Tr3 { LL | | //~^ ERROR private trait `traits::PrivTr` in public interface @@ -145,7 +145,7 @@ LL | | } = note: for more information, see issue #34537 error: private trait `traits::PrivTr` in public interface (error E0445) - --> $DIR/private-in-public-warn.rs:70:9 + --> $DIR/private-in-public-warn.rs:60:9 | LL | fn f(arg: T) {} //~ ERROR private trait `traits::PrivTr` in public interface | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -154,7 +154,7 @@ LL | fn f(arg: T) {} //~ ERROR private trait `traits::PrivTr` = note: for more information, see issue #34537 error: private trait `traits::PrivTr` in public interface (error E0445) - --> $DIR/private-in-public-warn.rs:73:5 + --> $DIR/private-in-public-warn.rs:63:5 | LL | impl Pub {} //~ ERROR private trait `traits::PrivTr` in public interface | ^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -163,7 +163,7 @@ LL | impl Pub {} //~ ERROR private trait `traits::PrivTr` in p = note: for more information, see issue #34537 error: private trait `traits::PrivTr` in public interface (error E0445) - --> $DIR/private-in-public-warn.rs:75:5 + --> $DIR/private-in-public-warn.rs:65:5 | LL | impl PubTr for Pub {} //~ ERROR private trait `traits::PrivTr` in public interface | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -172,7 +172,7 @@ LL | impl PubTr for Pub {} //~ ERROR private trait `traits::Pr = note: for more information, see issue #34537 error: private trait `traits_where::PrivTr` in public interface (error E0445) - --> $DIR/private-in-public-warn.rs:84:5 + --> $DIR/private-in-public-warn.rs:74:5 | LL | pub type Alias where T: PrivTr = T; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -181,7 +181,7 @@ LL | pub type Alias where T: PrivTr = T; = note: for more information, see issue #34537 error: private trait `traits_where::PrivTr` in public interface (error E0445) - --> $DIR/private-in-public-warn.rs:87:5 + --> $DIR/private-in-public-warn.rs:77:5 | LL | pub trait Tr2 where T: PrivTr {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -190,7 +190,7 @@ LL | pub trait Tr2 where T: PrivTr {} = note: for more information, see issue #34537 error: private trait `traits_where::PrivTr` in public interface (error E0445) - --> $DIR/private-in-public-warn.rs:91:9 + --> $DIR/private-in-public-warn.rs:81:9 | LL | fn f(arg: T) where T: PrivTr {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -199,7 +199,7 @@ LL | fn f(arg: T) where T: PrivTr {} = note: for more information, see issue #34537 error: private trait `traits_where::PrivTr` in public interface (error E0445) - --> $DIR/private-in-public-warn.rs:95:5 + --> $DIR/private-in-public-warn.rs:85:5 | LL | impl Pub where T: PrivTr {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -208,7 +208,7 @@ LL | impl Pub where T: PrivTr {} = note: for more information, see issue #34537 error: private trait `traits_where::PrivTr` in public interface (error E0445) - --> $DIR/private-in-public-warn.rs:98:5 + --> $DIR/private-in-public-warn.rs:88:5 | LL | impl PubTr for Pub where T: PrivTr {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -217,7 +217,7 @@ LL | impl PubTr for Pub where T: PrivTr {} = note: for more information, see issue #34537 error: private trait `generics::PrivTr` in public interface (error E0445) - --> $DIR/private-in-public-warn.rs:109:5 + --> $DIR/private-in-public-warn.rs:99:5 | LL | pub trait Tr1: PrivTr {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -226,7 +226,7 @@ LL | pub trait Tr1: PrivTr {} = note: for more information, see issue #34537 error: private type `generics::Priv` in public interface (error E0446) - --> $DIR/private-in-public-warn.rs:112:5 + --> $DIR/private-in-public-warn.rs:102:5 | LL | pub trait Tr2: PubTr {} //~ ERROR private type `generics::Priv` in public interface | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -235,7 +235,7 @@ LL | pub trait Tr2: PubTr {} //~ ERROR private type `generics::Priv` i = note: for more information, see issue #34537 error: private type `generics::Priv` in public interface (error E0446) - --> $DIR/private-in-public-warn.rs:114:5 + --> $DIR/private-in-public-warn.rs:104:5 | LL | pub trait Tr3: PubTr<[Priv; 1]> {} //~ ERROR private type `generics::Priv` in public interface | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -244,7 +244,7 @@ LL | pub trait Tr3: PubTr<[Priv; 1]> {} //~ ERROR private type `generics::Pr = note: for more information, see issue #34537 error: private type `generics::Priv` in public interface (error E0446) - --> $DIR/private-in-public-warn.rs:116:5 + --> $DIR/private-in-public-warn.rs:106:5 | LL | pub trait Tr4: PubTr> {} //~ ERROR private type `generics::Priv` in public interface | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -253,7 +253,7 @@ LL | pub trait Tr4: PubTr> {} //~ ERROR private type `generics::Pr = note: for more information, see issue #34537 error[E0446]: private type `impls::Priv` in public interface - --> $DIR/private-in-public-warn.rs:143:9 + --> $DIR/private-in-public-warn.rs:133:9 | LL | struct Priv; | - `impls::Priv` declared as private @@ -262,7 +262,7 @@ LL | type Alias = Priv; //~ ERROR private type `impls::Priv` in public i | ^^^^^^^^^^^^^^^^^^ can't leak private type error: private type `aliases_pub::Priv` in public interface (error E0446) - --> $DIR/private-in-public-warn.rs:214:9 + --> $DIR/private-in-public-warn.rs:204:9 | LL | pub fn f(arg: Priv) {} //~ ERROR private type `aliases_pub::Priv` in public interface | ^^^^^^^^^^^^^^^^^^^^^^ @@ -271,7 +271,7 @@ LL | pub fn f(arg: Priv) {} //~ ERROR private type `aliases_pub::Priv` i = note: for more information, see issue #34537 error[E0446]: private type `aliases_pub::Priv` in public interface - --> $DIR/private-in-public-warn.rs:218:9 + --> $DIR/private-in-public-warn.rs:208:9 | LL | struct Priv; | - `aliases_pub::Priv` declared as private @@ -280,7 +280,7 @@ LL | type Check = Priv; //~ ERROR private type `aliases_pub::Priv` in pu | ^^^^^^^^^^^^^^^^^^ can't leak private type error[E0446]: private type `aliases_pub::Priv` in public interface - --> $DIR/private-in-public-warn.rs:221:9 + --> $DIR/private-in-public-warn.rs:211:9 | LL | struct Priv; | - `aliases_pub::Priv` declared as private @@ -289,7 +289,7 @@ LL | type Check = Priv; //~ ERROR private type `aliases_pub::Priv` in pu | ^^^^^^^^^^^^^^^^^^ can't leak private type error[E0446]: private type `aliases_pub::Priv` in public interface - --> $DIR/private-in-public-warn.rs:224:9 + --> $DIR/private-in-public-warn.rs:214:9 | LL | struct Priv; | - `aliases_pub::Priv` declared as private @@ -298,7 +298,7 @@ LL | type Check = Priv; //~ ERROR private type `aliases_pub::Priv` in pu | ^^^^^^^^^^^^^^^^^^ can't leak private type error: private trait `aliases_priv::PrivTr1` in public interface (error E0445) - --> $DIR/private-in-public-warn.rs:248:5 + --> $DIR/private-in-public-warn.rs:238:5 | LL | pub trait Tr1: PrivUseAliasTr {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -307,7 +307,7 @@ LL | pub trait Tr1: PrivUseAliasTr {} = note: for more information, see issue #34537 error: private type `aliases_priv::Priv2` in public interface (error E0446) - --> $DIR/private-in-public-warn.rs:251:5 + --> $DIR/private-in-public-warn.rs:241:5 | LL | pub trait Tr2: PrivUseAliasTr {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -316,7 +316,7 @@ LL | pub trait Tr2: PrivUseAliasTr {} = note: for more information, see issue #34537 error: private trait `aliases_priv::PrivTr1` in public interface (error E0445) - --> $DIR/private-in-public-warn.rs:251:5 + --> $DIR/private-in-public-warn.rs:241:5 | LL | pub trait Tr2: PrivUseAliasTr {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/privacy/private-in-public.rs b/src/test/ui/privacy/private-in-public.rs index b865e391d29c1..288298cfbfcf6 100644 --- a/src/test/ui/privacy/private-in-public.rs +++ b/src/test/ui/privacy/private-in-public.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Private types and traits are not allowed in public interfaces. // This test also ensures that the checks are performed even inside private modules. diff --git a/src/test/ui/privacy/private-in-public.stderr b/src/test/ui/privacy/private-in-public.stderr index 586327fbf2664..2bd7503ab5aae 100644 --- a/src/test/ui/privacy/private-in-public.stderr +++ b/src/test/ui/privacy/private-in-public.stderr @@ -1,5 +1,5 @@ error[E0446]: private type `types::Priv` in public interface - --> $DIR/private-in-public.rs:23:5 + --> $DIR/private-in-public.rs:13:5 | LL | struct Priv; | - `types::Priv` declared as private @@ -8,7 +8,7 @@ LL | pub const C: Priv = Priv; //~ ERROR private type `types::Priv` in publi | ^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private type error[E0446]: private type `types::Priv` in public interface - --> $DIR/private-in-public.rs:24:5 + --> $DIR/private-in-public.rs:14:5 | LL | struct Priv; | - `types::Priv` declared as private @@ -17,7 +17,7 @@ LL | pub static S: Priv = Priv; //~ ERROR private type `types::Priv` in publ | ^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private type error[E0446]: private type `types::Priv` in public interface - --> $DIR/private-in-public.rs:25:5 + --> $DIR/private-in-public.rs:15:5 | LL | struct Priv; | - `types::Priv` declared as private @@ -26,7 +26,7 @@ LL | pub fn f1(arg: Priv) {} //~ ERROR private type `types::Priv` in public | ^^^^^^^^^^^^^^^^^^^^^^^ can't leak private type error[E0446]: private type `types::Priv` in public interface - --> $DIR/private-in-public.rs:26:5 + --> $DIR/private-in-public.rs:16:5 | LL | struct Priv; | - `types::Priv` declared as private @@ -35,7 +35,7 @@ LL | pub fn f2() -> Priv { panic!() } //~ ERROR private type `types::Priv` i | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private type error[E0446]: private type `types::Priv` in public interface - --> $DIR/private-in-public.rs:27:19 + --> $DIR/private-in-public.rs:17:19 | LL | struct Priv; | - `types::Priv` declared as private @@ -44,7 +44,7 @@ LL | pub struct S1(pub Priv); //~ ERROR private type `types::Priv` in public | ^^^^^^^^ can't leak private type error[E0446]: private type `types::Priv` in public interface - --> $DIR/private-in-public.rs:28:21 + --> $DIR/private-in-public.rs:18:21 | LL | struct Priv; | - `types::Priv` declared as private @@ -53,7 +53,7 @@ LL | pub struct S2 { pub field: Priv } //~ ERROR private type `types::Priv` | ^^^^^^^^^^^^^^^ can't leak private type error[E0446]: private type `types::Priv` in public interface - --> $DIR/private-in-public.rs:30:9 + --> $DIR/private-in-public.rs:20:9 | LL | struct Priv; | - `types::Priv` declared as private @@ -62,7 +62,7 @@ LL | pub const C: Priv = Priv; //~ ERROR private type `types::Priv` in p | ^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private type error[E0446]: private type `types::Priv` in public interface - --> $DIR/private-in-public.rs:31:9 + --> $DIR/private-in-public.rs:21:9 | LL | struct Priv; | - `types::Priv` declared as private @@ -71,7 +71,7 @@ LL | pub fn f1(arg: Priv) {} //~ ERROR private type `types::Priv` in pub | ^^^^^^^^^^^^^^^^^^^^^^^ can't leak private type error[E0446]: private type `types::Priv` in public interface - --> $DIR/private-in-public.rs:32:9 + --> $DIR/private-in-public.rs:22:9 | LL | struct Priv; | - `types::Priv` declared as private @@ -80,25 +80,25 @@ LL | pub fn f2() -> Priv { panic!() } //~ ERROR private type `types::Pri | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private type error[E0445]: private trait `traits::PrivTr` in public interface - --> $DIR/private-in-public.rs:41:5 + --> $DIR/private-in-public.rs:31:5 | LL | pub enum E { V(T) } //~ ERROR private trait `traits::PrivTr` in public interface | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait error[E0445]: private trait `traits::PrivTr` in public interface - --> $DIR/private-in-public.rs:42:5 + --> $DIR/private-in-public.rs:32:5 | LL | pub fn f(arg: T) {} //~ ERROR private trait `traits::PrivTr` in public interface | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait error[E0445]: private trait `traits::PrivTr` in public interface - --> $DIR/private-in-public.rs:43:5 + --> $DIR/private-in-public.rs:33:5 | LL | pub struct S1(T); //~ ERROR private trait `traits::PrivTr` in public interface | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait error[E0445]: private trait `traits::PrivTr` in public interface - --> $DIR/private-in-public.rs:44:5 + --> $DIR/private-in-public.rs:34:5 | LL | / impl Pub { //~ ERROR private trait `traits::PrivTr` in public interface LL | | pub fn f(arg: U) {} //~ ERROR private trait `traits::PrivTr` in public interface @@ -106,31 +106,31 @@ LL | | } | |_____^ can't leak private trait error[E0445]: private trait `traits::PrivTr` in public interface - --> $DIR/private-in-public.rs:45:9 + --> $DIR/private-in-public.rs:35:9 | LL | pub fn f(arg: U) {} //~ ERROR private trait `traits::PrivTr` in public interface | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait error[E0445]: private trait `traits_where::PrivTr` in public interface - --> $DIR/private-in-public.rs:54:5 + --> $DIR/private-in-public.rs:44:5 | LL | pub enum E where T: PrivTr { V(T) } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait error[E0445]: private trait `traits_where::PrivTr` in public interface - --> $DIR/private-in-public.rs:56:5 + --> $DIR/private-in-public.rs:46:5 | LL | pub fn f(arg: T) where T: PrivTr {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait error[E0445]: private trait `traits_where::PrivTr` in public interface - --> $DIR/private-in-public.rs:58:5 + --> $DIR/private-in-public.rs:48:5 | LL | pub struct S1(T) where T: PrivTr; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait error[E0445]: private trait `traits_where::PrivTr` in public interface - --> $DIR/private-in-public.rs:60:5 + --> $DIR/private-in-public.rs:50:5 | LL | / impl Pub where T: PrivTr { LL | | //~^ ERROR private trait `traits_where::PrivTr` in public interface @@ -140,13 +140,13 @@ LL | | } | |_____^ can't leak private trait error[E0445]: private trait `traits_where::PrivTr` in public interface - --> $DIR/private-in-public.rs:62:9 + --> $DIR/private-in-public.rs:52:9 | LL | pub fn f(arg: U) where U: PrivTr {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait error[E0446]: private type `generics::Priv` in public interface - --> $DIR/private-in-public.rs:73:5 + --> $DIR/private-in-public.rs:63:5 | LL | struct Priv(T); | - `generics::Priv` declared as private @@ -155,7 +155,7 @@ LL | pub fn f1(arg: [Priv; 1]) {} //~ ERROR private type `generics::Priv` in | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private type error[E0446]: private type `generics::Priv` in public interface - --> $DIR/private-in-public.rs:74:5 + --> $DIR/private-in-public.rs:64:5 | LL | struct Priv(T); | - `generics::Priv` declared as private @@ -164,7 +164,7 @@ LL | pub fn f2(arg: Pub) {} //~ ERROR private type `generics::Priv` in | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private type error[E0446]: private type `generics::Priv` in public interface - --> $DIR/private-in-public.rs:75:5 + --> $DIR/private-in-public.rs:65:5 | LL | struct Priv(T); | - `generics::Priv` declared as private @@ -173,7 +173,7 @@ LL | pub fn f3(arg: Priv) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private type error[E0446]: private type `impls::Priv` in public interface - --> $DIR/private-in-public.rs:90:9 + --> $DIR/private-in-public.rs:80:9 | LL | struct Priv; | - `impls::Priv` declared as private @@ -182,7 +182,7 @@ LL | pub fn f(arg: Priv) {} //~ ERROR private type `impls::Priv` in publ | ^^^^^^^^^^^^^^^^^^^^^^ can't leak private type error[E0446]: private type `::Assoc` in public interface - --> $DIR/private-in-public.rs:114:5 + --> $DIR/private-in-public.rs:104:5 | LL | trait PrivTr { | - `::Assoc` declared as private @@ -191,7 +191,7 @@ LL | pub fn f3(arg: ::Assoc) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private type error[E0446]: private type `aliases_pub::Priv` in public interface - --> $DIR/private-in-public.rs:114:5 + --> $DIR/private-in-public.rs:104:5 | LL | struct Priv; | - `aliases_pub::Priv` declared as private @@ -200,7 +200,7 @@ LL | pub fn f3(arg: ::Assoc) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private type error[E0446]: private type `aliases_pub::Priv` in public interface - --> $DIR/private-in-public.rs:119:9 + --> $DIR/private-in-public.rs:109:9 | LL | struct Priv; | - `aliases_pub::Priv` declared as private @@ -209,7 +209,7 @@ LL | pub fn f(arg: Priv) {} //~ ERROR private type `aliases_pub::Priv` i | ^^^^^^^^^^^^^^^^^^^^^^ can't leak private type error[E0446]: private type `aliases_priv::Priv1` in public interface - --> $DIR/private-in-public.rs:141:5 + --> $DIR/private-in-public.rs:131:5 | LL | struct Priv1; | - `aliases_priv::Priv1` declared as private @@ -218,7 +218,7 @@ LL | pub fn f1(arg: PrivUseAlias) {} //~ ERROR private type `aliases_priv::P | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private type error[E0446]: private type `aliases_priv::Priv2` in public interface - --> $DIR/private-in-public.rs:142:5 + --> $DIR/private-in-public.rs:132:5 | LL | struct Priv2; | - `aliases_priv::Priv2` declared as private @@ -227,7 +227,7 @@ LL | pub fn f2(arg: PrivAlias) {} //~ ERROR private type `aliases_priv::Priv | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private type error[E0446]: private type `::Assoc` in public interface - --> $DIR/private-in-public.rs:143:5 + --> $DIR/private-in-public.rs:133:5 | LL | trait PrivTr { | - `::Assoc` declared as private @@ -236,7 +236,7 @@ LL | pub fn f3(arg: ::Assoc) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private type error[E0446]: private type `aliases_priv::Priv` in public interface - --> $DIR/private-in-public.rs:143:5 + --> $DIR/private-in-public.rs:133:5 | LL | struct Priv; | - `aliases_priv::Priv` declared as private @@ -245,7 +245,7 @@ LL | pub fn f3(arg: ::Assoc) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private type error[E0446]: private type `aliases_params::Priv` in public interface - --> $DIR/private-in-public.rs:153:5 + --> $DIR/private-in-public.rs:143:5 | LL | struct Priv; | - `aliases_params::Priv` declared as private @@ -254,7 +254,7 @@ LL | pub fn f2(arg: PrivAliasGeneric) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private type error[E0446]: private type `aliases_params::Priv` in public interface - --> $DIR/private-in-public.rs:155:5 + --> $DIR/private-in-public.rs:145:5 | LL | struct Priv; | - `aliases_params::Priv` declared as private diff --git a/src/test/ui/privacy/private-inferred-type-1.rs b/src/test/ui/privacy/private-inferred-type-1.rs index ba8b3d1810a05..69eeb2a26e643 100644 --- a/src/test/ui/privacy/private-inferred-type-1.rs +++ b/src/test/ui/privacy/private-inferred-type-1.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Arr0 { fn arr0_secret(&self); } diff --git a/src/test/ui/privacy/private-inferred-type-1.stderr b/src/test/ui/privacy/private-inferred-type-1.stderr index 4036152c27fc9..06df7e8478370 100644 --- a/src/test/ui/privacy/private-inferred-type-1.stderr +++ b/src/test/ui/privacy/private-inferred-type-1.stderr @@ -1,11 +1,11 @@ error: type `m::Priv` is private - --> $DIR/private-inferred-type-1.rs:26:5 + --> $DIR/private-inferred-type-1.rs:16:5 | LL | [].arr0_secret(); //~ ERROR type `m::Priv` is private | ^^^^^^^^^^^^^^^^ error: type `m::Priv` is private - --> $DIR/private-inferred-type-1.rs:27:5 + --> $DIR/private-inferred-type-1.rs:17:5 | LL | None.ty_param_secret(); //~ ERROR type `m::Priv` is private | ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/privacy/private-inferred-type-2.rs b/src/test/ui/privacy/private-inferred-type-2.rs index e981f12575015..28b47606d157a 100644 --- a/src/test/ui/privacy/private-inferred-type-2.rs +++ b/src/test/ui/privacy/private-inferred-type-2.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:private-inferred-type.rs extern crate private_inferred_type as ext; diff --git a/src/test/ui/privacy/private-inferred-type-2.stderr b/src/test/ui/privacy/private-inferred-type-2.stderr index 0559473e3616f..7a3f52fa05df7 100644 --- a/src/test/ui/privacy/private-inferred-type-2.stderr +++ b/src/test/ui/privacy/private-inferred-type-2.stderr @@ -1,17 +1,17 @@ error: type `m::Priv` is private - --> $DIR/private-inferred-type-2.rs:26:5 + --> $DIR/private-inferred-type-2.rs:16:5 | LL | m::Pub::get_priv; //~ ERROR type `m::Priv` is private | ^^^^^^^^^^^^^^^^ error: type `m::Priv` is private - --> $DIR/private-inferred-type-2.rs:27:5 + --> $DIR/private-inferred-type-2.rs:17:5 | LL | m::Pub::static_method; //~ ERROR type `m::Priv` is private | ^^^^^^^^^^^^^^^^^^^^^ error: type `ext::Priv` is private - --> $DIR/private-inferred-type-2.rs:28:5 + --> $DIR/private-inferred-type-2.rs:18:5 | LL | ext::Pub::static_method; //~ ERROR type `ext::Priv` is private | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/privacy/private-inferred-type-3.rs b/src/test/ui/privacy/private-inferred-type-3.rs index 0c393f02323ec..97bc70203d730 100644 --- a/src/test/ui/privacy/private-inferred-type-3.rs +++ b/src/test/ui/privacy/private-inferred-type-3.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:private-inferred-type.rs // error-pattern:type `fn() {ext::priv_fn}` is private diff --git a/src/test/ui/privacy/private-inferred-type-3.stderr b/src/test/ui/privacy/private-inferred-type-3.stderr index 3c37a7ee1e8d2..4cee7d318fd51 100644 --- a/src/test/ui/privacy/private-inferred-type-3.stderr +++ b/src/test/ui/privacy/private-inferred-type-3.stderr @@ -1,5 +1,5 @@ error: type `fn() {ext::priv_fn}` is private - --> $DIR/private-inferred-type-3.rs:26:5 + --> $DIR/private-inferred-type-3.rs:16:5 | LL | ext::m!(); | ^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | ext::m!(); = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) error: static `PRIV_STATIC` is private - --> $DIR/private-inferred-type-3.rs:26:5 + --> $DIR/private-inferred-type-3.rs:16:5 | LL | ext::m!(); | ^^^^^^^^^^ @@ -15,7 +15,7 @@ LL | ext::m!(); = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) error: type `ext::PrivEnum` is private - --> $DIR/private-inferred-type-3.rs:26:5 + --> $DIR/private-inferred-type-3.rs:16:5 | LL | ext::m!(); | ^^^^^^^^^^ @@ -23,7 +23,7 @@ LL | ext::m!(); = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) error: type `fn() {::method}` is private - --> $DIR/private-inferred-type-3.rs:26:5 + --> $DIR/private-inferred-type-3.rs:16:5 | LL | ext::m!(); | ^^^^^^^^^^ @@ -31,7 +31,7 @@ LL | ext::m!(); = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) error: type `fn(u8) -> ext::PrivTupleStruct {ext::PrivTupleStruct::{{constructor}}}` is private - --> $DIR/private-inferred-type-3.rs:26:5 + --> $DIR/private-inferred-type-3.rs:16:5 | LL | ext::m!(); | ^^^^^^^^^^ @@ -39,7 +39,7 @@ LL | ext::m!(); = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) error: type `fn(u8) -> ext::PubTupleStruct {ext::PubTupleStruct::{{constructor}}}` is private - --> $DIR/private-inferred-type-3.rs:26:5 + --> $DIR/private-inferred-type-3.rs:16:5 | LL | ext::m!(); | ^^^^^^^^^^ @@ -47,7 +47,7 @@ LL | ext::m!(); = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) error: type `for<'r> fn(&'r ext::Pub) {>::priv_method}` is private - --> $DIR/private-inferred-type-3.rs:26:5 + --> $DIR/private-inferred-type-3.rs:16:5 | LL | ext::m!(); | ^^^^^^^^^^ diff --git a/src/test/ui/privacy/private-inferred-type.rs b/src/test/ui/privacy/private-inferred-type.rs index 3ca8b1eb2ed3a..0b3a2ce636b10 100644 --- a/src/test/ui/privacy/private-inferred-type.rs +++ b/src/test/ui/privacy/private-inferred-type.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(associated_consts)] #![feature(decl_macro)] #![allow(private_in_public)] diff --git a/src/test/ui/privacy/private-inferred-type.stderr b/src/test/ui/privacy/private-inferred-type.stderr index abbe43fe384cb..818e73c5c50b5 100644 --- a/src/test/ui/privacy/private-inferred-type.stderr +++ b/src/test/ui/privacy/private-inferred-type.stderr @@ -1,95 +1,95 @@ error: type `m::Priv` is private - --> $DIR/private-inferred-type.rs:107:9 + --> $DIR/private-inferred-type.rs:97:9 | LL | let _: m::Alias; //~ ERROR type `m::Priv` is private | ^ error: type `m::Priv` is private - --> $DIR/private-inferred-type.rs:107:12 + --> $DIR/private-inferred-type.rs:97:12 | LL | let _: m::Alias; //~ ERROR type `m::Priv` is private | ^^^^^^^^ error: type `m::Priv` is private - --> $DIR/private-inferred-type.rs:109:13 + --> $DIR/private-inferred-type.rs:99:13 | LL | let _: ::AssocTy; //~ ERROR type `m::Priv` is private | ^^^^^^^^ error: type `m::Priv` is private - --> $DIR/private-inferred-type.rs:110:5 + --> $DIR/private-inferred-type.rs:100:5 | LL | m::Alias {}; //~ ERROR type `m::Priv` is private | ^^^^^^^^^^^ error: type `m::Priv` is private - --> $DIR/private-inferred-type.rs:111:5 + --> $DIR/private-inferred-type.rs:101:5 | LL | m::Pub { 0: m::Alias {} }; //~ ERROR type `m::Priv` is private | ^^^^^^^^^^^^^^^^^^^^^^^^^ error: type `m::Priv` is private - --> $DIR/private-inferred-type.rs:113:5 + --> $DIR/private-inferred-type.rs:103:5 | LL | m::Pub::static_method; //~ ERROR type `m::Priv` is private | ^^^^^^^^^^^^^^^^^^^^^ error: type `m::Priv` is private - --> $DIR/private-inferred-type.rs:114:5 + --> $DIR/private-inferred-type.rs:104:5 | LL | m::Pub::INHERENT_ASSOC_CONST; //~ ERROR type `m::Priv` is private | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: type `m::Priv` is private - --> $DIR/private-inferred-type.rs:115:5 + --> $DIR/private-inferred-type.rs:105:5 | LL | m::Pub(0u8).method_with_substs::(); //~ ERROR type `m::Priv` is private | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: type `m::Priv` is private - --> $DIR/private-inferred-type.rs:116:17 + --> $DIR/private-inferred-type.rs:106:17 | LL | m::Pub(0u8).method_with_priv_params(loop{}); //~ ERROR type `m::Priv` is private | ^^^^^^^^^^^^^^^^^^^^^^^ error: type `m::Priv` is private - --> $DIR/private-inferred-type.rs:117:5 + --> $DIR/private-inferred-type.rs:107:5 | LL | ::TRAIT_ASSOC_CONST; //~ ERROR type `m::Priv` is private | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: type `m::Priv` is private - --> $DIR/private-inferred-type.rs:118:6 + --> $DIR/private-inferred-type.rs:108:6 | LL | >::INHERENT_ASSOC_CONST; //~ ERROR type `m::Priv` is private | ^^^^^^^^^^^^^^^^ error: type `m::Priv` is private - --> $DIR/private-inferred-type.rs:119:5 + --> $DIR/private-inferred-type.rs:109:5 | LL | >::INHERENT_ASSOC_CONST_GENERIC_SELF; //~ ERROR type `m::Priv` is private | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: type `m::Priv` is private - --> $DIR/private-inferred-type.rs:120:5 + --> $DIR/private-inferred-type.rs:110:5 | LL | >::static_method_generic_self; //~ ERROR type `m::Priv` is private | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: type `m::Priv` is private - --> $DIR/private-inferred-type.rs:122:5 + --> $DIR/private-inferred-type.rs:112:5 | LL | u8::pub_method; //~ ERROR type `m::Priv` is private | ^^^^^^^^^^^^^^ error: type `adjust::S2` is private - --> $DIR/private-inferred-type.rs:124:5 + --> $DIR/private-inferred-type.rs:114:5 | LL | adjust::S1.method_s3(); //~ ERROR type `adjust::S2` is private | ^^^^^^^^^^ error: type `fn() {m::priv_fn}` is private - --> $DIR/private-inferred-type.rs:49:9 + --> $DIR/private-inferred-type.rs:39:9 | LL | priv_fn; //~ ERROR type `fn() {m::priv_fn}` is private | ^^^^^^^ @@ -98,7 +98,7 @@ LL | m::m!(); | -------- in this macro invocation error: type `m::PrivEnum` is private - --> $DIR/private-inferred-type.rs:51:9 + --> $DIR/private-inferred-type.rs:41:9 | LL | PrivEnum::Variant; //~ ERROR type `m::PrivEnum` is private | ^^^^^^^^^^^^^^^^^ @@ -107,7 +107,7 @@ LL | m::m!(); | -------- in this macro invocation error: type `fn() {::method}` is private - --> $DIR/private-inferred-type.rs:53:9 + --> $DIR/private-inferred-type.rs:43:9 | LL | ::method; //~ ERROR type `fn() {::method}` is private | ^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -116,7 +116,7 @@ LL | m::m!(); | -------- in this macro invocation error: type `fn(u8) -> m::PrivTupleStruct {m::PrivTupleStruct::{{constructor}}}` is private - --> $DIR/private-inferred-type.rs:55:9 + --> $DIR/private-inferred-type.rs:45:9 | LL | PrivTupleStruct; | ^^^^^^^^^^^^^^^ @@ -125,7 +125,7 @@ LL | m::m!(); | -------- in this macro invocation error: type `fn(u8) -> m::PubTupleStruct {m::PubTupleStruct::{{constructor}}}` is private - --> $DIR/private-inferred-type.rs:57:9 + --> $DIR/private-inferred-type.rs:47:9 | LL | PubTupleStruct; | ^^^^^^^^^^^^^^ @@ -134,7 +134,7 @@ LL | m::m!(); | -------- in this macro invocation error: type `for<'r> fn(&'r m::Pub) {>::priv_method}` is private - --> $DIR/private-inferred-type.rs:59:18 + --> $DIR/private-inferred-type.rs:49:18 | LL | Pub(0u8).priv_method(); | ^^^^^^^^^^^ @@ -143,67 +143,67 @@ LL | m::m!(); | -------- in this macro invocation error: trait `m::Trait` is private - --> $DIR/private-inferred-type.rs:128:5 + --> $DIR/private-inferred-type.rs:118:5 | LL | m::leak_anon1(); //~ ERROR trait `m::Trait` is private | ^^^^^^^^^^^^^^^ error: type `m::Priv` is private - --> $DIR/private-inferred-type.rs:129:5 + --> $DIR/private-inferred-type.rs:119:5 | LL | m::leak_anon2(); //~ ERROR type `m::Priv` is private | ^^^^^^^^^^^^^^^ error: type `m::Priv` is private - --> $DIR/private-inferred-type.rs:130:5 + --> $DIR/private-inferred-type.rs:120:5 | LL | m::leak_anon3(); //~ ERROR type `m::Priv` is private | ^^^^^^^^^^^^^^^ error: type `(dyn m::Trait + 'static)` is private - --> $DIR/private-inferred-type.rs:132:5 + --> $DIR/private-inferred-type.rs:122:5 | LL | m::leak_dyn1(); //~ ERROR type `(dyn m::Trait + 'static)` is private | ^^^^^^^^^^^^^^ error: type `m::Priv` is private - --> $DIR/private-inferred-type.rs:133:5 + --> $DIR/private-inferred-type.rs:123:5 | LL | m::leak_dyn2(); //~ ERROR type `m::Priv` is private | ^^^^^^^^^^^^^^ error: type `m::Priv` is private - --> $DIR/private-inferred-type.rs:134:5 + --> $DIR/private-inferred-type.rs:124:5 | LL | m::leak_dyn3(); //~ ERROR type `m::Priv` is private | ^^^^^^^^^^^^^^ error: type `m::Priv` is private - --> $DIR/private-inferred-type.rs:137:13 + --> $DIR/private-inferred-type.rs:127:13 | LL | let a = m::Alias {}; //~ ERROR type `m::Priv` is private | ^^^^^^^^^^^ error: type `m::Priv` is private - --> $DIR/private-inferred-type.rs:138:17 + --> $DIR/private-inferred-type.rs:128:17 | LL | let mut b = a; //~ ERROR type `m::Priv` is private | ^ error: type `m::Priv` is private - --> $DIR/private-inferred-type.rs:139:9 + --> $DIR/private-inferred-type.rs:129:9 | LL | b = a; //~ ERROR type `m::Priv` is private | ^ error: type `m::Priv` is private - --> $DIR/private-inferred-type.rs:140:11 + --> $DIR/private-inferred-type.rs:130:11 | LL | match a { //~ ERROR type `m::Priv` is private | ^ error[E0446]: private type `m::Priv` in public interface - --> $DIR/private-inferred-type.rs:71:36 + --> $DIR/private-inferred-type.rs:61:36 | LL | struct Priv; | - `m::Priv` declared as private @@ -212,7 +212,7 @@ LL | impl TraitWithAssocTy for u8 { type AssocTy = Priv; } | ^^^^^^^^^^^^^^^^^^^^ can't leak private type error[E0446]: private type `adjust::S2` in public interface - --> $DIR/private-inferred-type.rs:93:9 + --> $DIR/private-inferred-type.rs:83:9 | LL | struct S2; | - `adjust::S2` declared as private diff --git a/src/test/ui/privacy/private-item-simple.rs b/src/test/ui/privacy/private-item-simple.rs index 2b9e32b8f5860..1f718ed9201a6 100644 --- a/src/test/ui/privacy/private-item-simple.rs +++ b/src/test/ui/privacy/private-item-simple.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod a { fn f() {} } diff --git a/src/test/ui/privacy/private-item-simple.stderr b/src/test/ui/privacy/private-item-simple.stderr index 811b026eab9e3..5c2267c424fa4 100644 --- a/src/test/ui/privacy/private-item-simple.stderr +++ b/src/test/ui/privacy/private-item-simple.stderr @@ -1,5 +1,5 @@ error[E0603]: function `f` is private - --> $DIR/private-item-simple.rs:16:5 + --> $DIR/private-item-simple.rs:6:5 | LL | a::f(); //~ ERROR function `f` is private | ^^^^ diff --git a/src/test/ui/privacy/private-method-cross-crate.rs b/src/test/ui/privacy/private-method-cross-crate.rs index 68059baa3850d..4da44e0682be9 100644 --- a/src/test/ui/privacy/private-method-cross-crate.rs +++ b/src/test/ui/privacy/private-method-cross-crate.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:cci_class_5.rs extern crate cci_class_5; use cci_class_5::kitties::cat; diff --git a/src/test/ui/privacy/private-method-cross-crate.stderr b/src/test/ui/privacy/private-method-cross-crate.stderr index 27d398c016613..bd28f2e5a8ba8 100644 --- a/src/test/ui/privacy/private-method-cross-crate.stderr +++ b/src/test/ui/privacy/private-method-cross-crate.stderr @@ -1,5 +1,5 @@ error[E0624]: method `nap` is private - --> $DIR/private-method-cross-crate.rs:17:8 + --> $DIR/private-method-cross-crate.rs:7:8 | LL | nyan.nap(); //~ ERROR method `nap` is private | ^^^ diff --git a/src/test/ui/privacy/private-method-inherited.rs b/src/test/ui/privacy/private-method-inherited.rs index c6419991b112c..bc27027e886ba 100644 --- a/src/test/ui/privacy/private-method-inherited.rs +++ b/src/test/ui/privacy/private-method-inherited.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that inherited visibility applies to methods. mod a { diff --git a/src/test/ui/privacy/private-method-inherited.stderr b/src/test/ui/privacy/private-method-inherited.stderr index 3f10750e46ffe..30c1e99ceddb4 100644 --- a/src/test/ui/privacy/private-method-inherited.stderr +++ b/src/test/ui/privacy/private-method-inherited.stderr @@ -1,5 +1,5 @@ error[E0624]: method `f` is private - --> $DIR/private-method-inherited.rs:23:7 + --> $DIR/private-method-inherited.rs:13:7 | LL | x.f(); //~ ERROR method `f` is private | ^ diff --git a/src/test/ui/privacy/private-method.rs b/src/test/ui/privacy/private-method.rs index 16510c2c8c99c..2bf818a814b2f 100644 --- a/src/test/ui/privacy/private-method.rs +++ b/src/test/ui/privacy/private-method.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:method `nap` is private mod kitties { diff --git a/src/test/ui/privacy/private-method.stderr b/src/test/ui/privacy/private-method.stderr index fce03d35e39c0..9e4794b0f677a 100644 --- a/src/test/ui/privacy/private-method.stderr +++ b/src/test/ui/privacy/private-method.stderr @@ -1,5 +1,5 @@ error[E0624]: method `nap` is private - --> $DIR/private-method.rs:34:8 + --> $DIR/private-method.rs:24:8 | LL | nyan.nap(); | ^^^ diff --git a/src/test/ui/privacy/private-struct-field-cross-crate.rs b/src/test/ui/privacy/private-struct-field-cross-crate.rs index 067c17668c612..2efcb7f1d8879 100644 --- a/src/test/ui/privacy/private-struct-field-cross-crate.rs +++ b/src/test/ui/privacy/private-struct-field-cross-crate.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:cci_class.rs extern crate cci_class; use cci_class::kitties::cat; diff --git a/src/test/ui/privacy/private-struct-field-cross-crate.stderr b/src/test/ui/privacy/private-struct-field-cross-crate.stderr index b9401baf0d00d..857f2436aa829 100644 --- a/src/test/ui/privacy/private-struct-field-cross-crate.stderr +++ b/src/test/ui/privacy/private-struct-field-cross-crate.stderr @@ -1,5 +1,5 @@ error[E0616]: field `meows` of struct `cci_class::kitties::cat` is private - --> $DIR/private-struct-field-cross-crate.rs:17:14 + --> $DIR/private-struct-field-cross-crate.rs:7:14 | LL | assert_eq!(nyan.meows, 52); | ^^^^^^^^^^ diff --git a/src/test/ui/privacy/private-struct-field-ctor.rs b/src/test/ui/privacy/private-struct-field-ctor.rs index 0a0f2d490a8ec..2c506f3479745 100644 --- a/src/test/ui/privacy/private-struct-field-ctor.rs +++ b/src/test/ui/privacy/private-struct-field-ctor.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod a { pub struct Foo { x: isize diff --git a/src/test/ui/privacy/private-struct-field-ctor.stderr b/src/test/ui/privacy/private-struct-field-ctor.stderr index 711d265c559b2..943abeed114c8 100644 --- a/src/test/ui/privacy/private-struct-field-ctor.stderr +++ b/src/test/ui/privacy/private-struct-field-ctor.stderr @@ -1,5 +1,5 @@ error[E0451]: field `x` of struct `a::Foo` is private - --> $DIR/private-struct-field-ctor.rs:18:22 + --> $DIR/private-struct-field-ctor.rs:8:22 | LL | let s = a::Foo { x: 1 }; //~ ERROR field `x` of struct `a::Foo` is private | ^^^^ field `x` is private diff --git a/src/test/ui/privacy/private-struct-field-pattern.rs b/src/test/ui/privacy/private-struct-field-pattern.rs index e9dd6cd1d7478..b3da6092abce8 100644 --- a/src/test/ui/privacy/private-struct-field-pattern.rs +++ b/src/test/ui/privacy/private-struct-field-pattern.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use a::Foo; mod a { diff --git a/src/test/ui/privacy/private-struct-field-pattern.stderr b/src/test/ui/privacy/private-struct-field-pattern.stderr index bc09a2a6dafbf..05e6d3d724313 100644 --- a/src/test/ui/privacy/private-struct-field-pattern.stderr +++ b/src/test/ui/privacy/private-struct-field-pattern.stderr @@ -1,5 +1,5 @@ error[E0451]: field `x` of struct `a::Foo` is private - --> $DIR/private-struct-field-pattern.rs:25:15 + --> $DIR/private-struct-field-pattern.rs:15:15 | LL | Foo { x: _ } => {} //~ ERROR field `x` of struct `a::Foo` is private | ^^^^ field `x` is private diff --git a/src/test/ui/privacy/private-struct-field.rs b/src/test/ui/privacy/private-struct-field.rs index 1423117dc816a..216ae20e153f5 100644 --- a/src/test/ui/privacy/private-struct-field.rs +++ b/src/test/ui/privacy/private-struct-field.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod cat { pub struct Cat { meows: usize diff --git a/src/test/ui/privacy/private-struct-field.stderr b/src/test/ui/privacy/private-struct-field.stderr index db16e1ba1fcee..7cb6d6ab4d7e8 100644 --- a/src/test/ui/privacy/private-struct-field.stderr +++ b/src/test/ui/privacy/private-struct-field.stderr @@ -1,5 +1,5 @@ error[E0616]: field `meows` of struct `cat::Cat` is private - --> $DIR/private-struct-field.rs:23:16 + --> $DIR/private-struct-field.rs:13:16 | LL | assert_eq!(nyan.meows, 52); //~ ERROR field `meows` of struct `cat::Cat` is private | ^^^^^^^^^^ diff --git a/src/test/ui/privacy/private-type-in-interface.rs b/src/test/ui/privacy/private-type-in-interface.rs index 4235b4be27158..a801eb03b6995 100644 --- a/src/test/ui/privacy/private-type-in-interface.rs +++ b/src/test/ui/privacy/private-type-in-interface.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:private-inferred-type.rs #![allow(warnings)] diff --git a/src/test/ui/privacy/private-type-in-interface.stderr b/src/test/ui/privacy/private-type-in-interface.stderr index 5b12ed5e5f473..292ce22eb96bc 100644 --- a/src/test/ui/privacy/private-type-in-interface.stderr +++ b/src/test/ui/privacy/private-type-in-interface.stderr @@ -1,65 +1,65 @@ error: type `m::Priv` is private - --> $DIR/private-type-in-interface.rs:25:9 + --> $DIR/private-type-in-interface.rs:15:9 | LL | fn f(_: m::Alias) {} //~ ERROR type `m::Priv` is private | ^^^^^^^^ error: type `m::Priv` is private - --> $DIR/private-type-in-interface.rs:25:6 + --> $DIR/private-type-in-interface.rs:15:6 | LL | fn f(_: m::Alias) {} //~ ERROR type `m::Priv` is private | ^ error: type `ext::Priv` is private - --> $DIR/private-type-in-interface.rs:27:13 + --> $DIR/private-type-in-interface.rs:17:13 | LL | fn f_ext(_: ext::Alias) {} //~ ERROR type `ext::Priv` is private | ^^^^^^^^^^ error: type `ext::Priv` is private - --> $DIR/private-type-in-interface.rs:27:10 + --> $DIR/private-type-in-interface.rs:17:10 | LL | fn f_ext(_: ext::Alias) {} //~ ERROR type `ext::Priv` is private | ^ error: type `m::Priv` is private - --> $DIR/private-type-in-interface.rs:31:6 + --> $DIR/private-type-in-interface.rs:21:6 | LL | impl m::Alias {} //~ ERROR type `m::Priv` is private | ^^^^^^^^ error: type `ext::Priv` is private - --> $DIR/private-type-in-interface.rs:32:14 + --> $DIR/private-type-in-interface.rs:22:14 | LL | impl Tr1 for ext::Alias {} //~ ERROR type `ext::Priv` is private | ^^^^^^^^^^ error: type `m::Priv` is private - --> $DIR/private-type-in-interface.rs:33:10 + --> $DIR/private-type-in-interface.rs:23:10 | LL | type A = ::X; //~ ERROR type `m::Priv` is private | ^^^^^^^^^^^^^^^^^^^^^^^^^ error: type `m::Priv` is private - --> $DIR/private-type-in-interface.rs:37:11 + --> $DIR/private-type-in-interface.rs:27:11 | LL | fn g() -> impl Tr2 { 0 } //~ ERROR type `m::Priv` is private | ^^^^^^^^^^^^^^^^^^ error: type `m::Priv` is private - --> $DIR/private-type-in-interface.rs:37:16 + --> $DIR/private-type-in-interface.rs:27:16 | LL | fn g() -> impl Tr2 { 0 } //~ ERROR type `m::Priv` is private | ^^^^^^^^^^^^^ error: type `ext::Priv` is private - --> $DIR/private-type-in-interface.rs:39:15 + --> $DIR/private-type-in-interface.rs:29:15 | LL | fn g_ext() -> impl Tr2 { 0 } //~ ERROR type `ext::Priv` is private | ^^^^^^^^^^^^^^^^^^^^ error: type `ext::Priv` is private - --> $DIR/private-type-in-interface.rs:39:20 + --> $DIR/private-type-in-interface.rs:29:20 | LL | fn g_ext() -> impl Tr2 { 0 } //~ ERROR type `ext::Priv` is private | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/privacy/private-variant-reexport.rs b/src/test/ui/privacy/private-variant-reexport.rs index 5d770f88155ec..0722b815c147a 100644 --- a/src/test/ui/privacy/private-variant-reexport.rs +++ b/src/test/ui/privacy/private-variant-reexport.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod m1 { pub use ::E::V; //~ ERROR variant `V` is private and cannot be re-exported } diff --git a/src/test/ui/privacy/private-variant-reexport.stderr b/src/test/ui/privacy/private-variant-reexport.stderr index 11e13ab9ba8f1..99f4a41272cd0 100644 --- a/src/test/ui/privacy/private-variant-reexport.stderr +++ b/src/test/ui/privacy/private-variant-reexport.stderr @@ -1,5 +1,5 @@ error: variant `V` is private and cannot be re-exported - --> $DIR/private-variant-reexport.rs:12:13 + --> $DIR/private-variant-reexport.rs:2:13 | LL | pub use ::E::V; //~ ERROR variant `V` is private and cannot be re-exported | ^^^^^^ @@ -8,19 +8,19 @@ LL | enum E { V } | ------ help: consider making the enum public: `pub enum E` error: variant `V` is private and cannot be re-exported - --> $DIR/private-variant-reexport.rs:16:19 + --> $DIR/private-variant-reexport.rs:6:19 | LL | pub use ::E::{V}; //~ ERROR variant `V` is private and cannot be re-exported | ^ error: variant `V` is private and cannot be re-exported - --> $DIR/private-variant-reexport.rs:20:22 + --> $DIR/private-variant-reexport.rs:10:22 | LL | pub use ::E::V::{self}; //~ ERROR variant `V` is private and cannot be re-exported | ^^^^ error: enum is private and its variants cannot be re-exported - --> $DIR/private-variant-reexport.rs:24:13 + --> $DIR/private-variant-reexport.rs:14:13 | LL | pub use ::E::*; //~ ERROR enum is private and its variants cannot be re-exported | ^^^^^^ diff --git a/src/test/ui/privacy/restricted/auxiliary/pub_restricted.rs b/src/test/ui/privacy/restricted/auxiliary/pub_restricted.rs index c4ab96c845619..482d5cdc45d48 100644 --- a/src/test/ui/privacy/restricted/auxiliary/pub_restricted.rs +++ b/src/test/ui/privacy/restricted/auxiliary/pub_restricted.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(crate_visibility_modifier)] pub(crate) struct Crate; diff --git a/src/test/ui/privacy/restricted/lookup-ignores-private.rs b/src/test/ui/privacy/restricted/lookup-ignores-private.rs index abd71b9c90b22..94cfca4c59bae 100644 --- a/src/test/ui/privacy/restricted/lookup-ignores-private.rs +++ b/src/test/ui/privacy/restricted/lookup-ignores-private.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![allow(warnings)] diff --git a/src/test/ui/privacy/restricted/lookup-ignores-private.stderr b/src/test/ui/privacy/restricted/lookup-ignores-private.stderr index 7fc53e8c324a0..267c7c3dfa2db 100644 --- a/src/test/ui/privacy/restricted/lookup-ignores-private.stderr +++ b/src/test/ui/privacy/restricted/lookup-ignores-private.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/lookup-ignores-private.rs:40:1 + --> $DIR/lookup-ignores-private.rs:30:1 | LL | / fn main() { //~ ERROR compilation successful LL | | let s = foo::S::default(); diff --git a/src/test/ui/privacy/restricted/private-in-public.rs b/src/test/ui/privacy/restricted/private-in-public.rs index 4d3f537779740..7cae28970d40c 100644 --- a/src/test/ui/privacy/restricted/private-in-public.rs +++ b/src/test/ui/privacy/restricted/private-in-public.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(crate_visibility_modifier)] mod foo { diff --git a/src/test/ui/privacy/restricted/private-in-public.stderr b/src/test/ui/privacy/restricted/private-in-public.stderr index e0d3abdc213f6..2fb7059e0d40d 100644 --- a/src/test/ui/privacy/restricted/private-in-public.stderr +++ b/src/test/ui/privacy/restricted/private-in-public.stderr @@ -1,5 +1,5 @@ error[E0446]: private type `foo::Priv` in public interface - --> $DIR/private-in-public.rs:18:9 + --> $DIR/private-in-public.rs:8:9 | LL | struct Priv; | - `foo::Priv` declared as private @@ -8,7 +8,7 @@ LL | pub(crate) fn g(_: Priv) {} //~ ERROR E0446 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private type error[E0446]: private type `foo::Priv` in public interface - --> $DIR/private-in-public.rs:19:9 + --> $DIR/private-in-public.rs:9:9 | LL | struct Priv; | - `foo::Priv` declared as private diff --git a/src/test/ui/privacy/restricted/struct-literal-field.rs b/src/test/ui/privacy/restricted/struct-literal-field.rs index 21d90dfea4b6c..9c6104755a4f1 100644 --- a/src/test/ui/privacy/restricted/struct-literal-field.rs +++ b/src/test/ui/privacy/restricted/struct-literal-field.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(warnings)] mod foo { diff --git a/src/test/ui/privacy/restricted/struct-literal-field.stderr b/src/test/ui/privacy/restricted/struct-literal-field.stderr index 6d668c8767a93..0109cae91a0c8 100644 --- a/src/test/ui/privacy/restricted/struct-literal-field.stderr +++ b/src/test/ui/privacy/restricted/struct-literal-field.stderr @@ -1,5 +1,5 @@ error[E0451]: field `x` of struct `foo::bar::S` is private - --> $DIR/struct-literal-field.rs:28:9 + --> $DIR/struct-literal-field.rs:18:9 | LL | S { x: 0 }; //~ ERROR private | ^^^^ field `x` is private diff --git a/src/test/ui/privacy/restricted/test.rs b/src/test/ui/privacy/restricted/test.rs index 8c1d609e24467..f9c8308991a34 100644 --- a/src/test/ui/privacy/restricted/test.rs +++ b/src/test/ui/privacy/restricted/test.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:pub_restricted.rs #![allow(warnings)] diff --git a/src/test/ui/privacy/restricted/test.stderr b/src/test/ui/privacy/restricted/test.stderr index 67a95c3559018..348b77f6442a5 100644 --- a/src/test/ui/privacy/restricted/test.stderr +++ b/src/test/ui/privacy/restricted/test.stderr @@ -1,77 +1,77 @@ error[E0433]: failed to resolve. Maybe a missing `extern crate bad;`? - --> $DIR/test.rs:60:12 + --> $DIR/test.rs:50:12 | LL | pub(in bad::path) mod m1 {} //~ ERROR failed to resolve. Maybe a missing `extern crate bad;`? | ^^^ Maybe a missing `extern crate bad;`? error: visibilities can only be restricted to ancestor modules - --> $DIR/test.rs:61:12 + --> $DIR/test.rs:51:12 | LL | pub(in foo) mod m2 {} //~ ERROR visibilities can only be restricted to ancestor modules | ^^^ error[E0364]: `f` is private, and cannot be re-exported - --> $DIR/test.rs:31:24 + --> $DIR/test.rs:21:24 | LL | pub(super) use foo::bar::f as g; //~ ERROR cannot be re-exported | ^^^^^^^^^^^^^^^^ | note: consider marking `f` as `pub` in the imported module - --> $DIR/test.rs:31:24 + --> $DIR/test.rs:21:24 | LL | pub(super) use foo::bar::f as g; //~ ERROR cannot be re-exported | ^^^^^^^^^^^^^^^^ error[E0603]: struct `Crate` is private - --> $DIR/test.rs:48:9 + --> $DIR/test.rs:38:9 | LL | use pub_restricted::Crate; //~ ERROR private | ^^^^^^^^^^^^^^^^^^^^^ error[E0603]: function `f` is private - --> $DIR/test.rs:40:9 + --> $DIR/test.rs:30:9 | LL | use foo::bar::f; //~ ERROR private | ^^^^^^^^^^^ error[E0616]: field `x` of struct `foo::bar::S` is private - --> $DIR/test.rs:41:5 + --> $DIR/test.rs:31:5 | LL | S::default().x; //~ ERROR private | ^^^^^^^^^^^^^^ error[E0624]: method `f` is private - --> $DIR/test.rs:42:18 + --> $DIR/test.rs:32:18 | LL | S::default().f(); //~ ERROR private | ^ error[E0624]: method `g` is private - --> $DIR/test.rs:43:5 + --> $DIR/test.rs:33:5 | LL | S::g(); //~ ERROR private | ^^^^ error[E0616]: field `y` of struct `pub_restricted::Universe` is private - --> $DIR/test.rs:52:13 + --> $DIR/test.rs:42:13 | LL | let _ = u.y; //~ ERROR private | ^^^ error[E0616]: field `z` of struct `pub_restricted::Universe` is private - --> $DIR/test.rs:53:13 + --> $DIR/test.rs:43:13 | LL | let _ = u.z; //~ ERROR private | ^^^ error[E0624]: method `g` is private - --> $DIR/test.rs:55:7 + --> $DIR/test.rs:45:7 | LL | u.g(); //~ ERROR private | ^ error[E0624]: method `h` is private - --> $DIR/test.rs:56:7 + --> $DIR/test.rs:46:7 | LL | u.h(); //~ ERROR private | ^ diff --git a/src/test/ui/privacy/union-field-privacy-1.rs b/src/test/ui/privacy/union-field-privacy-1.rs index eeebb1b737a94..1ff4d513facff 100644 --- a/src/test/ui/privacy/union-field-privacy-1.rs +++ b/src/test/ui/privacy/union-field-privacy-1.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod m { pub union U { pub a: u8, diff --git a/src/test/ui/privacy/union-field-privacy-1.stderr b/src/test/ui/privacy/union-field-privacy-1.stderr index c93760a1b89cd..d31360dbe6511 100644 --- a/src/test/ui/privacy/union-field-privacy-1.stderr +++ b/src/test/ui/privacy/union-field-privacy-1.stderr @@ -1,11 +1,11 @@ error[E0451]: field `c` of union `m::U` is private - --> $DIR/union-field-privacy-1.rs:22:20 + --> $DIR/union-field-privacy-1.rs:12:20 | LL | let u = m::U { c: 0 }; //~ ERROR field `c` of union `m::U` is private | ^^^^ field `c` is private error[E0451]: field `c` of union `m::U` is private - --> $DIR/union-field-privacy-1.rs:26:16 + --> $DIR/union-field-privacy-1.rs:16:16 | LL | let m::U { c } = u; //~ ERROR field `c` of union `m::U` is private | ^ field `c` is private diff --git a/src/test/ui/privacy/union-field-privacy-2.rs b/src/test/ui/privacy/union-field-privacy-2.rs index d6bb765202da5..48279630c6302 100644 --- a/src/test/ui/privacy/union-field-privacy-2.rs +++ b/src/test/ui/privacy/union-field-privacy-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod m { pub union U { pub a: u8, diff --git a/src/test/ui/privacy/union-field-privacy-2.stderr b/src/test/ui/privacy/union-field-privacy-2.stderr index cc12483a653b0..bd2c834c966d1 100644 --- a/src/test/ui/privacy/union-field-privacy-2.stderr +++ b/src/test/ui/privacy/union-field-privacy-2.stderr @@ -1,5 +1,5 @@ error[E0616]: field `c` of struct `m::U` is private - --> $DIR/union-field-privacy-2.rs:24:13 + --> $DIR/union-field-privacy-2.rs:14:13 | LL | let c = u.c; //~ ERROR field `c` of struct `m::U` is private | ^^^ diff --git a/src/test/ui/ptr-coercion.rs b/src/test/ui/ptr-coercion.rs index 1390c9507c1c2..d1ef88b50e30c 100644 --- a/src/test/ui/ptr-coercion.rs +++ b/src/test/ui/ptr-coercion.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test coercions between pointers which don't do anything fancy like unsizing. // These are testing that we don't lose mutability when converting to raw pointers. diff --git a/src/test/ui/ptr-coercion.stderr b/src/test/ui/ptr-coercion.stderr index c5ed80db1a84a..2499e90db7d91 100644 --- a/src/test/ui/ptr-coercion.stderr +++ b/src/test/ui/ptr-coercion.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/ptr-coercion.rs:17:25 + --> $DIR/ptr-coercion.rs:7:25 | LL | let x: *mut isize = x; //~ ERROR mismatched types | ^ types differ in mutability @@ -8,7 +8,7 @@ LL | let x: *mut isize = x; //~ ERROR mismatched types found type `*const isize` error[E0308]: mismatched types - --> $DIR/ptr-coercion.rs:23:25 + --> $DIR/ptr-coercion.rs:13:25 | LL | let x: *mut isize = &42; //~ ERROR mismatched types | ^^^ types differ in mutability @@ -17,7 +17,7 @@ LL | let x: *mut isize = &42; //~ ERROR mismatched types found type `&isize` error[E0308]: mismatched types - --> $DIR/ptr-coercion.rs:29:25 + --> $DIR/ptr-coercion.rs:19:25 | LL | let x: *mut isize = x; //~ ERROR mismatched types | ^ types differ in mutability diff --git a/src/test/ui/pub/issue-33174-restricted-type-in-public-interface.rs b/src/test/ui/pub/issue-33174-restricted-type-in-public-interface.rs index ec3f48f0347d3..45dfb639922c1 100644 --- a/src/test/ui/pub/issue-33174-restricted-type-in-public-interface.rs +++ b/src/test/ui/pub/issue-33174-restricted-type-in-public-interface.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(non_camel_case_types)] // genus is always capitalized pub(crate) struct Snail; diff --git a/src/test/ui/pub/issue-33174-restricted-type-in-public-interface.stderr b/src/test/ui/pub/issue-33174-restricted-type-in-public-interface.stderr index b35a12f999c8d..ae9a33e9443bc 100644 --- a/src/test/ui/pub/issue-33174-restricted-type-in-public-interface.stderr +++ b/src/test/ui/pub/issue-33174-restricted-type-in-public-interface.stderr @@ -1,5 +1,5 @@ error[E0446]: crate-visible type `Snail` in public interface - --> $DIR/issue-33174-restricted-type-in-public-interface.rs:28:1 + --> $DIR/issue-33174-restricted-type-in-public-interface.rs:18:1 | LL | pub(crate) struct Snail; | ---------- `Snail` declared as crate-visible @@ -8,7 +8,7 @@ LL | pub type Helix_pomatia = Shell; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak crate-visible type error[E0446]: restricted type `sea::Turtle` in public interface - --> $DIR/issue-33174-restricted-type-in-public-interface.rs:31:1 + --> $DIR/issue-33174-restricted-type-in-public-interface.rs:21:1 | LL | pub(super) struct Turtle; | ---------- `sea::Turtle` declared as restricted @@ -17,7 +17,7 @@ LL | pub type Dermochelys_coriacea = Shell; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak restricted type error[E0446]: private type `Tortoise` in public interface - --> $DIR/issue-33174-restricted-type-in-public-interface.rs:34:1 + --> $DIR/issue-33174-restricted-type-in-public-interface.rs:24:1 | LL | struct Tortoise; | - `Tortoise` declared as private diff --git a/src/test/ui/pub/pub-ident-fn-2.rs b/src/test/ui/pub/pub-ident-fn-2.rs index 44884bfcdfdce..cfa177a33eff4 100644 --- a/src/test/ui/pub/pub-ident-fn-2.rs +++ b/src/test/ui/pub/pub-ident-fn-2.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub foo(s: usize) { bar() } //~^ ERROR missing `fn` for method definition diff --git a/src/test/ui/pub/pub-ident-fn-2.stderr b/src/test/ui/pub/pub-ident-fn-2.stderr index bbbb3df876986..119df77e9ff0d 100644 --- a/src/test/ui/pub/pub-ident-fn-2.stderr +++ b/src/test/ui/pub/pub-ident-fn-2.stderr @@ -1,5 +1,5 @@ error: missing `fn` for method definition - --> $DIR/pub-ident-fn-2.rs:11:4 + --> $DIR/pub-ident-fn-2.rs:1:4 | LL | pub foo(s: usize) { bar() } | ^ diff --git a/src/test/ui/pub/pub-ident-fn-or-struct-2.rs b/src/test/ui/pub/pub-ident-fn-or-struct-2.rs index 1ccadc8a40b72..ab1e3a171e743 100644 --- a/src/test/ui/pub/pub-ident-fn-or-struct-2.rs +++ b/src/test/ui/pub/pub-ident-fn-or-struct-2.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub S(); //~^ ERROR missing `fn` or `struct` for method or struct definition diff --git a/src/test/ui/pub/pub-ident-fn-or-struct-2.stderr b/src/test/ui/pub/pub-ident-fn-or-struct-2.stderr index e492a8c47567e..ba9391a02056b 100644 --- a/src/test/ui/pub/pub-ident-fn-or-struct-2.stderr +++ b/src/test/ui/pub/pub-ident-fn-or-struct-2.stderr @@ -1,5 +1,5 @@ error: missing `fn` or `struct` for method or struct definition - --> $DIR/pub-ident-fn-or-struct-2.rs:11:4 + --> $DIR/pub-ident-fn-or-struct-2.rs:1:4 | LL | pub S(); | ---^- help: if you meant to call a macro, try: `S!` diff --git a/src/test/ui/pub/pub-ident-fn-or-struct.rs b/src/test/ui/pub/pub-ident-fn-or-struct.rs index 0664918945b43..fa693e26e253c 100644 --- a/src/test/ui/pub/pub-ident-fn-or-struct.rs +++ b/src/test/ui/pub/pub-ident-fn-or-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub S (foo) bar //~^ ERROR missing `fn` or `struct` for method or struct definition diff --git a/src/test/ui/pub/pub-ident-fn-or-struct.stderr b/src/test/ui/pub/pub-ident-fn-or-struct.stderr index c1bff34cec3e6..d7d333400ef99 100644 --- a/src/test/ui/pub/pub-ident-fn-or-struct.stderr +++ b/src/test/ui/pub/pub-ident-fn-or-struct.stderr @@ -1,5 +1,5 @@ error: missing `fn` or `struct` for method or struct definition - --> $DIR/pub-ident-fn-or-struct.rs:11:4 + --> $DIR/pub-ident-fn-or-struct.rs:1:4 | LL | pub S (foo) bar | ---^- help: if you meant to call a macro, try: `S!` diff --git a/src/test/ui/pub/pub-ident-fn.fixed b/src/test/ui/pub/pub-ident-fn.fixed index f2d0c6c3e1d3f..5a241ac0e1539 100644 --- a/src/test/ui/pub/pub-ident-fn.fixed +++ b/src/test/ui/pub/pub-ident-fn.fixed @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix pub fn foo(_s: usize) -> bool { true } diff --git a/src/test/ui/pub/pub-ident-fn.rs b/src/test/ui/pub/pub-ident-fn.rs index 82c32f57eeae0..3d419fd1576ac 100644 --- a/src/test/ui/pub/pub-ident-fn.rs +++ b/src/test/ui/pub/pub-ident-fn.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix pub foo(_s: usize) -> bool { true } diff --git a/src/test/ui/pub/pub-ident-fn.stderr b/src/test/ui/pub/pub-ident-fn.stderr index f7c96b8b9f4bb..942d289f131f0 100644 --- a/src/test/ui/pub/pub-ident-fn.stderr +++ b/src/test/ui/pub/pub-ident-fn.stderr @@ -1,5 +1,5 @@ error: missing `fn` for method definition - --> $DIR/pub-ident-fn.rs:13:4 + --> $DIR/pub-ident-fn.rs:3:4 | LL | pub foo(_s: usize) -> bool { true } | ^^^ diff --git a/src/test/ui/pub/pub-ident-struct.rs b/src/test/ui/pub/pub-ident-struct.rs index d08d498f87a01..f2e6dfc77b6e0 100644 --- a/src/test/ui/pub/pub-ident-struct.rs +++ b/src/test/ui/pub/pub-ident-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub S { //~^ ERROR missing `struct` for struct definition } diff --git a/src/test/ui/pub/pub-ident-struct.stderr b/src/test/ui/pub/pub-ident-struct.stderr index cd53cea721297..a9f2f89edd998 100644 --- a/src/test/ui/pub/pub-ident-struct.stderr +++ b/src/test/ui/pub/pub-ident-struct.stderr @@ -1,5 +1,5 @@ error: missing `struct` for struct definition - --> $DIR/pub-ident-struct.rs:11:4 + --> $DIR/pub-ident-struct.rs:1:4 | LL | pub S { | ^ diff --git a/src/test/ui/pub/pub-reexport-priv-extern-crate.rs b/src/test/ui/pub/pub-reexport-priv-extern-crate.rs index 2e71e007e9eed..e95d6924026ca 100644 --- a/src/test/ui/pub/pub-reexport-priv-extern-crate.rs +++ b/src/test/ui/pub/pub-reexport-priv-extern-crate.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused)] extern crate core; diff --git a/src/test/ui/pub/pub-reexport-priv-extern-crate.stderr b/src/test/ui/pub/pub-reexport-priv-extern-crate.stderr index d298542bd5da3..e895d51a848b3 100644 --- a/src/test/ui/pub/pub-reexport-priv-extern-crate.stderr +++ b/src/test/ui/pub/pub-reexport-priv-extern-crate.stderr @@ -1,5 +1,5 @@ error: extern crate `core` is private, and cannot be re-exported (error E0365), consider declaring with `pub` - --> $DIR/pub-reexport-priv-extern-crate.rs:14:9 + --> $DIR/pub-reexport-priv-extern-crate.rs:4:9 | LL | pub use core as reexported_core; //~ ERROR `core` is private, and cannot be re-exported | ^^^^^^^^^^^^^^^^^^^^^^^ @@ -9,7 +9,7 @@ LL | pub use core as reexported_core; //~ ERROR `core` is private, and cannot be = note: for more information, see issue #34537 error: extern crate `core` is private, and cannot be re-exported (error E0365), consider declaring with `pub` - --> $DIR/pub-reexport-priv-extern-crate.rs:22:9 + --> $DIR/pub-reexport-priv-extern-crate.rs:12:9 | LL | use foo1::core; //~ ERROR `core` is private, and cannot be re-exported | ^^^^^^^^^^ @@ -18,7 +18,7 @@ LL | use foo1::core; //~ ERROR `core` is private, and cannot be re-exported = note: for more information, see issue #34537 error: extern crate `core` is private, and cannot be re-exported (error E0365), consider declaring with `pub` - --> $DIR/pub-reexport-priv-extern-crate.rs:30:13 + --> $DIR/pub-reexport-priv-extern-crate.rs:20:13 | LL | pub use foo2::bar::core; //~ ERROR `core` is private, and cannot be re-exported | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/pub/pub-restricted-error-fn.rs b/src/test/ui/pub/pub-restricted-error-fn.rs index 58f3d379ed991..56ee02f517c7b 100644 --- a/src/test/ui/pub/pub-restricted-error-fn.rs +++ b/src/test/ui/pub/pub-restricted-error-fn.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(pub_restricted)] pub(crate) () fn foo() {} //~ unmatched visibility diff --git a/src/test/ui/pub/pub-restricted-error-fn.stderr b/src/test/ui/pub/pub-restricted-error-fn.stderr index aa8b0eaf79f68..86fe1b2186f40 100644 --- a/src/test/ui/pub/pub-restricted-error-fn.stderr +++ b/src/test/ui/pub/pub-restricted-error-fn.stderr @@ -1,5 +1,5 @@ error: unmatched visibility `pub` - --> $DIR/pub-restricted-error-fn.rs:13:10 + --> $DIR/pub-restricted-error-fn.rs:3:10 | LL | pub(crate) () fn foo() {} //~ unmatched visibility | ^ diff --git a/src/test/ui/pub/pub-restricted-error.rs b/src/test/ui/pub/pub-restricted-error.rs index 4822d01a591b8..30a112d2271b9 100644 --- a/src/test/ui/pub/pub-restricted-error.rs +++ b/src/test/ui/pub/pub-restricted-error.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(pub_restricted)] struct Bar(pub(())); diff --git a/src/test/ui/pub/pub-restricted-error.stderr b/src/test/ui/pub/pub-restricted-error.stderr index e40cd58f87a30..ca720279946f0 100644 --- a/src/test/ui/pub/pub-restricted-error.stderr +++ b/src/test/ui/pub/pub-restricted-error.stderr @@ -1,5 +1,5 @@ error: expected identifier, found `(` - --> $DIR/pub-restricted-error.rs:16:16 + --> $DIR/pub-restricted-error.rs:6:16 | LL | pub(crate) () foo: usize, //~ ERROR expected identifier | ^ expected identifier diff --git a/src/test/ui/pub/pub-restricted-non-path.rs b/src/test/ui/pub/pub-restricted-non-path.rs index 11428b778edfc..bdad18dbe6535 100644 --- a/src/test/ui/pub/pub-restricted-non-path.rs +++ b/src/test/ui/pub/pub-restricted-non-path.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(pub_restricted)] pub (.) fn afn() {} //~ ERROR expected identifier diff --git a/src/test/ui/pub/pub-restricted-non-path.stderr b/src/test/ui/pub/pub-restricted-non-path.stderr index fc3ca7e93df00..526e964f8ee35 100644 --- a/src/test/ui/pub/pub-restricted-non-path.stderr +++ b/src/test/ui/pub/pub-restricted-non-path.stderr @@ -1,5 +1,5 @@ error: expected identifier, found `.` - --> $DIR/pub-restricted-non-path.rs:13:6 + --> $DIR/pub-restricted-non-path.rs:3:6 | LL | pub (.) fn afn() {} //~ ERROR expected identifier | ^ expected identifier diff --git a/src/test/ui/pub/pub-restricted.rs b/src/test/ui/pub/pub-restricted.rs index 07184d935b437..8793cb9d3357f 100644 --- a/src/test/ui/pub/pub-restricted.rs +++ b/src/test/ui/pub/pub-restricted.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(pub_restricted)] mod a {} diff --git a/src/test/ui/pub/pub-restricted.stderr b/src/test/ui/pub/pub-restricted.stderr index de755dd6a4602..40cf398023b28 100644 --- a/src/test/ui/pub/pub-restricted.stderr +++ b/src/test/ui/pub/pub-restricted.stderr @@ -1,5 +1,5 @@ error[E0704]: incorrect visibility restriction - --> $DIR/pub-restricted.rs:15:6 + --> $DIR/pub-restricted.rs:5:6 | LL | pub (a) fn afn() {} //~ incorrect visibility restriction | ^ help: make this visible only to module `a` with `in`: `in a` @@ -10,7 +10,7 @@ LL | pub (a) fn afn() {} //~ incorrect visibility restriction `pub(in path::to::module)`: visible only on the specified path error[E0704]: incorrect visibility restriction - --> $DIR/pub-restricted.rs:16:6 + --> $DIR/pub-restricted.rs:6:6 | LL | pub (b) fn bfn() {} //~ incorrect visibility restriction | ^ help: make this visible only to module `b` with `in`: `in b` @@ -21,7 +21,7 @@ LL | pub (b) fn bfn() {} //~ incorrect visibility restriction `pub(in path::to::module)`: visible only on the specified path error[E0704]: incorrect visibility restriction - --> $DIR/pub-restricted.rs:32:14 + --> $DIR/pub-restricted.rs:22:14 | LL | pub (a) invalid: usize, //~ incorrect visibility restriction | ^ help: make this visible only to module `a` with `in`: `in a` @@ -32,7 +32,7 @@ LL | pub (a) invalid: usize, //~ incorrect visibility restriction `pub(in path::to::module)`: visible only on the specified path error[E0704]: incorrect visibility restriction - --> $DIR/pub-restricted.rs:41:6 + --> $DIR/pub-restricted.rs:31:6 | LL | pub (xyz) fn xyz() {} //~ incorrect visibility restriction | ^^^ help: make this visible only to module `xyz` with `in`: `in xyz` @@ -43,7 +43,7 @@ LL | pub (xyz) fn xyz() {} //~ incorrect visibility restriction `pub(in path::to::module)`: visible only on the specified path error: visibilities can only be restricted to ancestor modules - --> $DIR/pub-restricted.rs:33:17 + --> $DIR/pub-restricted.rs:23:17 | LL | pub (in x) non_parent_invalid: usize, //~ ERROR visibilities can only be restricted | ^ diff --git a/src/test/ui/qualified/qualified-path-params-2.rs b/src/test/ui/qualified/qualified-path-params-2.rs index b0dd1f2518c89..6ee55f54bdbb5 100644 --- a/src/test/ui/qualified/qualified-path-params-2.rs +++ b/src/test/ui/qualified/qualified-path-params-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that qualified paths with type parameters // fail during type checking and not during parsing diff --git a/src/test/ui/qualified/qualified-path-params-2.stderr b/src/test/ui/qualified/qualified-path-params-2.stderr index 8b618cbf7ba9e..c03aabd7c654a 100644 --- a/src/test/ui/qualified/qualified-path-params-2.stderr +++ b/src/test/ui/qualified/qualified-path-params-2.stderr @@ -1,11 +1,11 @@ error[E0109]: type parameters are not allowed on this type - --> $DIR/qualified-path-params-2.rs:28:26 + --> $DIR/qualified-path-params-2.rs:18:26 | LL | type A = ::A::f; | ^^ type parameter not allowed error[E0223]: ambiguous associated type - --> $DIR/qualified-path-params-2.rs:28:10 + --> $DIR/qualified-path-params-2.rs:18:10 | LL | type A = ::A::f; | ^^^^^^^^^^^^^^^^^^^ ambiguous associated type diff --git a/src/test/ui/qualified/qualified-path-params.rs b/src/test/ui/qualified/qualified-path-params.rs index 018a3b2ae3258..ea2ae0e86bf64 100644 --- a/src/test/ui/qualified/qualified-path-params.rs +++ b/src/test/ui/qualified/qualified-path-params.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that qualified paths with type parameters // fail during type checking and not during parsing diff --git a/src/test/ui/qualified/qualified-path-params.stderr b/src/test/ui/qualified/qualified-path-params.stderr index e76c373eec5a0..18fca2e304696 100644 --- a/src/test/ui/qualified/qualified-path-params.stderr +++ b/src/test/ui/qualified/qualified-path-params.stderr @@ -1,11 +1,11 @@ error[E0533]: expected unit struct/variant or constant, found method `<::A>::f` - --> $DIR/qualified-path-params.rs:30:9 + --> $DIR/qualified-path-params.rs:20:9 | LL | ::A::f:: => {} | ^^^^^^^^^^^^^^^^^^^^^ error[E0029]: only char and numeric types are allowed in range patterns - --> $DIR/qualified-path-params.rs:32:15 + --> $DIR/qualified-path-params.rs:22:15 | LL | 0 ..= ::A::f:: => {} //~ ERROR only char and numeric types are allowed in range | ^^^^^^^^^^^^^^^^^^^^^ ranges require char or numeric types diff --git a/src/test/ui/question-mark-type-infer.rs b/src/test/ui/question-mark-type-infer.rs index e15c9af41e082..2e7a342b95e17 100644 --- a/src/test/ui/question-mark-type-infer.rs +++ b/src/test/ui/question-mark-type-infer.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(question_mark, question_mark_carrier)] // Test that type inference fails where there are multiple possible return types diff --git a/src/test/ui/question-mark-type-infer.stderr b/src/test/ui/question-mark-type-infer.stderr index 53848ed072772..c998bdc086f10 100644 --- a/src/test/ui/question-mark-type-infer.stderr +++ b/src/test/ui/question-mark-type-infer.stderr @@ -1,5 +1,5 @@ error[E0284]: type annotations required: cannot resolve `<_ as std::ops::Try>::Ok == _` - --> $DIR/question-mark-type-infer.rs:22:5 + --> $DIR/question-mark-type-infer.rs:12:5 | LL | l.iter().map(f).collect()? //~ ERROR type annotations required: cannot resolve | ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/quote-with-interpolated.rs b/src/test/ui/quote-with-interpolated.rs index 1fafb1c7a1b94..dd79d2b3e4a6e 100644 --- a/src/test/ui/quote-with-interpolated.rs +++ b/src/test/ui/quote-with-interpolated.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(quote)] fn main() { macro_rules! foo { diff --git a/src/test/ui/quote-with-interpolated.stderr b/src/test/ui/quote-with-interpolated.stderr index 10b3fc0a9ae80..89f4db0ad3c15 100644 --- a/src/test/ui/quote-with-interpolated.stderr +++ b/src/test/ui/quote-with-interpolated.stderr @@ -1,5 +1,5 @@ error: quote! with interpolated token - --> $DIR/quote-with-interpolated.rs:15:29 + --> $DIR/quote-with-interpolated.rs:5:29 | LL | quote_expr!(cx, $bar) //~ ERROR quote! with interpolated token | ^^^^ diff --git a/src/test/ui/range/range-1.rs b/src/test/ui/range/range-1.rs index 59c78052e15d2..f13787b1d6e75 100644 --- a/src/test/ui/range/range-1.rs +++ b/src/test/ui/range/range-1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test range syntax - type errors. pub fn main() { diff --git a/src/test/ui/range/range-1.stderr b/src/test/ui/range/range-1.stderr index 2e83bab4e8d9b..8e0e405a8ad03 100644 --- a/src/test/ui/range/range-1.stderr +++ b/src/test/ui/range/range-1.stderr @@ -1,11 +1,11 @@ error[E0308]: mismatched types - --> $DIR/range-1.rs:15:19 + --> $DIR/range-1.rs:5:19 | LL | let _ = 0u32..10i32; | ^^^^^ expected u32, found i32 error[E0277]: the trait bound `bool: std::iter::Step` is not satisfied - --> $DIR/range-1.rs:19:14 + --> $DIR/range-1.rs:9:14 | LL | for i in false..true {} | ^^^^^^^^^^^ the trait `std::iter::Step` is not implemented for `bool` @@ -13,7 +13,7 @@ LL | for i in false..true {} = note: required because of the requirements on the impl of `std::iter::Iterator` for `std::ops::Range` error[E0277]: the size for values of type `[{integer}]` cannot be known at compilation time - --> $DIR/range-1.rs:24:17 + --> $DIR/range-1.rs:14:17 | LL | let range = *arr..; | ^^^^^^ doesn't have a size known at compile-time diff --git a/src/test/ui/range/range-inclusive-pattern-precedence.rs b/src/test/ui/range/range-inclusive-pattern-precedence.rs index ce0c9947a05f6..fbafe1fe6ee12 100644 --- a/src/test/ui/range/range-inclusive-pattern-precedence.rs +++ b/src/test/ui/range/range-inclusive-pattern-precedence.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // In expression, `&a..=b` is treated as `(&a)..=(b)` and `box a..=b` is // `(box a)..=(b)`. In a pattern, however, `&a..=b` means `&(a..=b)`. This may // lead to confusion. diff --git a/src/test/ui/range/range-inclusive-pattern-precedence.stderr b/src/test/ui/range/range-inclusive-pattern-precedence.stderr index cd5ce3035c683..20ec8076af898 100644 --- a/src/test/ui/range/range-inclusive-pattern-precedence.stderr +++ b/src/test/ui/range/range-inclusive-pattern-precedence.stderr @@ -1,29 +1,29 @@ error: the range pattern here has ambiguous interpretation - --> $DIR/range-inclusive-pattern-precedence.rs:27:10 + --> $DIR/range-inclusive-pattern-precedence.rs:17:10 | LL | &10..=15 => {} | ^^^^^^^ help: add parentheses to clarify the precedence: `(10 ..=15)` error: the range pattern here has ambiguous interpretation - --> $DIR/range-inclusive-pattern-precedence.rs:38:13 + --> $DIR/range-inclusive-pattern-precedence.rs:28:13 | LL | box 10..=15 => {} | ^^^^^^^ help: add parentheses to clarify the precedence: `(10 ..=15)` warning: `...` range patterns are deprecated - --> $DIR/range-inclusive-pattern-precedence.rs:24:11 + --> $DIR/range-inclusive-pattern-precedence.rs:14:11 | LL | &0...9 => {} | ^^^ help: use `..=` for an inclusive range | note: lint level defined here - --> $DIR/range-inclusive-pattern-precedence.rs:19:9 + --> $DIR/range-inclusive-pattern-precedence.rs:9:9 | LL | #![warn(ellipsis_inclusive_range_patterns)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: `...` range patterns are deprecated - --> $DIR/range-inclusive-pattern-precedence.rs:35:14 + --> $DIR/range-inclusive-pattern-precedence.rs:25:14 | LL | box 0...9 => {} | ^^^ help: use `..=` for an inclusive range diff --git a/src/test/ui/range/range_traits-1.rs b/src/test/ui/range/range_traits-1.rs index 78d3702b449ca..e28e47435c2c2 100644 --- a/src/test/ui/range/range_traits-1.rs +++ b/src/test/ui/range/range_traits-1.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::*; #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)] diff --git a/src/test/ui/range/range_traits-1.stderr b/src/test/ui/range/range_traits-1.stderr index ee72dfe13d44e..d085cab89a17c 100644 --- a/src/test/ui/range/range_traits-1.stderr +++ b/src/test/ui/range/range_traits-1.stderr @@ -1,5 +1,5 @@ error[E0277]: can't compare `std::ops::Range` with `std::ops::Range` - --> $DIR/range_traits-1.rs:15:5 + --> $DIR/range_traits-1.rs:5:5 | LL | a: Range, | ^^^^^^^^^^^^^^^ no implementation for `std::ops::Range < std::ops::Range` and `std::ops::Range > std::ops::Range` @@ -8,7 +8,7 @@ LL | a: Range, = note: required by `std::cmp::PartialOrd::partial_cmp` error[E0277]: can't compare `std::ops::RangeTo` with `std::ops::RangeTo` - --> $DIR/range_traits-1.rs:18:5 + --> $DIR/range_traits-1.rs:8:5 | LL | b: RangeTo, | ^^^^^^^^^^^^^^^^^ no implementation for `std::ops::RangeTo < std::ops::RangeTo` and `std::ops::RangeTo > std::ops::RangeTo` @@ -17,7 +17,7 @@ LL | b: RangeTo, = note: required by `std::cmp::PartialOrd::partial_cmp` error[E0277]: can't compare `std::ops::RangeFrom` with `std::ops::RangeFrom` - --> $DIR/range_traits-1.rs:21:5 + --> $DIR/range_traits-1.rs:11:5 | LL | c: RangeFrom, | ^^^^^^^^^^^^^^^^^^^ no implementation for `std::ops::RangeFrom < std::ops::RangeFrom` and `std::ops::RangeFrom > std::ops::RangeFrom` @@ -26,7 +26,7 @@ LL | c: RangeFrom, = note: required by `std::cmp::PartialOrd::partial_cmp` error[E0277]: can't compare `std::ops::RangeFull` with `std::ops::RangeFull` - --> $DIR/range_traits-1.rs:24:5 + --> $DIR/range_traits-1.rs:14:5 | LL | d: RangeFull, | ^^^^^^^^^^^^ no implementation for `std::ops::RangeFull < std::ops::RangeFull` and `std::ops::RangeFull > std::ops::RangeFull` @@ -35,7 +35,7 @@ LL | d: RangeFull, = note: required by `std::cmp::PartialOrd::partial_cmp` error[E0277]: can't compare `std::ops::RangeInclusive` with `std::ops::RangeInclusive` - --> $DIR/range_traits-1.rs:27:5 + --> $DIR/range_traits-1.rs:17:5 | LL | e: RangeInclusive, | ^^^^^^^^^^^^^^^^^^^^^^^^ no implementation for `std::ops::RangeInclusive < std::ops::RangeInclusive` and `std::ops::RangeInclusive > std::ops::RangeInclusive` @@ -44,7 +44,7 @@ LL | e: RangeInclusive, = note: required by `std::cmp::PartialOrd::partial_cmp` error[E0277]: can't compare `std::ops::RangeToInclusive` with `std::ops::RangeToInclusive` - --> $DIR/range_traits-1.rs:30:5 + --> $DIR/range_traits-1.rs:20:5 | LL | f: RangeToInclusive, | ^^^^^^^^^^^^^^^^^^^^^^^^^^ no implementation for `std::ops::RangeToInclusive < std::ops::RangeToInclusive` and `std::ops::RangeToInclusive > std::ops::RangeToInclusive` @@ -53,7 +53,7 @@ LL | f: RangeToInclusive, = note: required by `std::cmp::PartialOrd::partial_cmp` error[E0277]: the trait bound `std::ops::Range: std::cmp::Ord` is not satisfied - --> $DIR/range_traits-1.rs:15:5 + --> $DIR/range_traits-1.rs:5:5 | LL | a: Range, | ^^^^^^^^^^^^^^^ the trait `std::cmp::Ord` is not implemented for `std::ops::Range` @@ -61,7 +61,7 @@ LL | a: Range, = note: required by `std::cmp::Ord::cmp` error[E0277]: the trait bound `std::ops::RangeTo: std::cmp::Ord` is not satisfied - --> $DIR/range_traits-1.rs:18:5 + --> $DIR/range_traits-1.rs:8:5 | LL | b: RangeTo, | ^^^^^^^^^^^^^^^^^ the trait `std::cmp::Ord` is not implemented for `std::ops::RangeTo` @@ -69,7 +69,7 @@ LL | b: RangeTo, = note: required by `std::cmp::Ord::cmp` error[E0277]: the trait bound `std::ops::RangeFrom: std::cmp::Ord` is not satisfied - --> $DIR/range_traits-1.rs:21:5 + --> $DIR/range_traits-1.rs:11:5 | LL | c: RangeFrom, | ^^^^^^^^^^^^^^^^^^^ the trait `std::cmp::Ord` is not implemented for `std::ops::RangeFrom` @@ -77,7 +77,7 @@ LL | c: RangeFrom, = note: required by `std::cmp::Ord::cmp` error[E0277]: the trait bound `std::ops::RangeFull: std::cmp::Ord` is not satisfied - --> $DIR/range_traits-1.rs:24:5 + --> $DIR/range_traits-1.rs:14:5 | LL | d: RangeFull, | ^^^^^^^^^^^^ the trait `std::cmp::Ord` is not implemented for `std::ops::RangeFull` @@ -85,7 +85,7 @@ LL | d: RangeFull, = note: required by `std::cmp::Ord::cmp` error[E0277]: the trait bound `std::ops::RangeInclusive: std::cmp::Ord` is not satisfied - --> $DIR/range_traits-1.rs:27:5 + --> $DIR/range_traits-1.rs:17:5 | LL | e: RangeInclusive, | ^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::cmp::Ord` is not implemented for `std::ops::RangeInclusive` @@ -93,7 +93,7 @@ LL | e: RangeInclusive, = note: required by `std::cmp::Ord::cmp` error[E0277]: the trait bound `std::ops::RangeToInclusive: std::cmp::Ord` is not satisfied - --> $DIR/range_traits-1.rs:30:5 + --> $DIR/range_traits-1.rs:20:5 | LL | f: RangeToInclusive, | ^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::cmp::Ord` is not implemented for `std::ops::RangeToInclusive` diff --git a/src/test/ui/range/range_traits-2.rs b/src/test/ui/range/range_traits-2.rs index 64fcd25f538b2..c34ef781d8c78 100644 --- a/src/test/ui/range/range_traits-2.rs +++ b/src/test/ui/range/range_traits-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::*; #[derive(Copy, Clone)] //~ ERROR Copy diff --git a/src/test/ui/range/range_traits-2.stderr b/src/test/ui/range/range_traits-2.stderr index 0151ede2164f4..f7f887006ed5f 100644 --- a/src/test/ui/range/range_traits-2.stderr +++ b/src/test/ui/range/range_traits-2.stderr @@ -1,5 +1,5 @@ error[E0204]: the trait `Copy` may not be implemented for this type - --> $DIR/range_traits-2.rs:13:10 + --> $DIR/range_traits-2.rs:3:10 | LL | #[derive(Copy, Clone)] //~ ERROR Copy | ^^^^ diff --git a/src/test/ui/range/range_traits-3.rs b/src/test/ui/range/range_traits-3.rs index d26b7956ae83a..b0448afce04ea 100644 --- a/src/test/ui/range/range_traits-3.rs +++ b/src/test/ui/range/range_traits-3.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::*; #[derive(Copy, Clone)] //~ ERROR Copy diff --git a/src/test/ui/range/range_traits-3.stderr b/src/test/ui/range/range_traits-3.stderr index a625fda2bc204..910ba51727675 100644 --- a/src/test/ui/range/range_traits-3.stderr +++ b/src/test/ui/range/range_traits-3.stderr @@ -1,5 +1,5 @@ error[E0204]: the trait `Copy` may not be implemented for this type - --> $DIR/range_traits-3.rs:13:10 + --> $DIR/range_traits-3.rs:3:10 | LL | #[derive(Copy, Clone)] //~ ERROR Copy | ^^^^ diff --git a/src/test/ui/range/range_traits-4.rs b/src/test/ui/range/range_traits-4.rs index 630969bdbdf72..775a9c0c0544b 100644 --- a/src/test/ui/range/range_traits-4.rs +++ b/src/test/ui/range/range_traits-4.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] use std::ops::*; diff --git a/src/test/ui/range/range_traits-4.stderr b/src/test/ui/range/range_traits-4.stderr index cf8ae671ffc74..e1da8fe241adb 100644 --- a/src/test/ui/range/range_traits-4.stderr +++ b/src/test/ui/range/range_traits-4.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/range_traits-4.rs:19:1 + --> $DIR/range_traits-4.rs:9:1 | LL | fn main() {} //~ ERROR success | ^^^^^^^^^^^^ diff --git a/src/test/ui/range/range_traits-5.rs b/src/test/ui/range/range_traits-5.rs index 5963c4a9496cb..6939c0665e9c4 100644 --- a/src/test/ui/range/range_traits-5.rs +++ b/src/test/ui/range/range_traits-5.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] use std::ops::*; diff --git a/src/test/ui/range/range_traits-5.stderr b/src/test/ui/range/range_traits-5.stderr index eadb3a08ba02a..5888dbbabeefe 100644 --- a/src/test/ui/range/range_traits-5.stderr +++ b/src/test/ui/range/range_traits-5.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/range_traits-5.rs:19:1 + --> $DIR/range_traits-5.rs:9:1 | LL | fn main() {} //~ ERROR success | ^^^^^^^^^^^^ diff --git a/src/test/ui/range/range_traits-6.rs b/src/test/ui/range/range_traits-6.rs index f9510b5061cae..041f04a349876 100644 --- a/src/test/ui/range/range_traits-6.rs +++ b/src/test/ui/range/range_traits-6.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::*; #[derive(Copy, Clone)] //~ ERROR Copy diff --git a/src/test/ui/range/range_traits-6.stderr b/src/test/ui/range/range_traits-6.stderr index 9470540cc5fde..c1916e24bfeef 100644 --- a/src/test/ui/range/range_traits-6.stderr +++ b/src/test/ui/range/range_traits-6.stderr @@ -1,5 +1,5 @@ error[E0204]: the trait `Copy` may not be implemented for this type - --> $DIR/range_traits-6.rs:13:10 + --> $DIR/range_traits-6.rs:3:10 | LL | #[derive(Copy, Clone)] //~ ERROR Copy | ^^^^ diff --git a/src/test/ui/range/range_traits-7.rs b/src/test/ui/range/range_traits-7.rs index 871b55b85cf88..ab1a64c1f8965 100644 --- a/src/test/ui/range/range_traits-7.rs +++ b/src/test/ui/range/range_traits-7.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] use std::ops::*; diff --git a/src/test/ui/range/range_traits-7.stderr b/src/test/ui/range/range_traits-7.stderr index 516667a11cd34..1f6321d4af4e1 100644 --- a/src/test/ui/range/range_traits-7.stderr +++ b/src/test/ui/range/range_traits-7.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/range_traits-7.rs:19:1 + --> $DIR/range_traits-7.rs:9:1 | LL | fn main() {} //~ ERROR success | ^^^^^^^^^^^^ diff --git a/src/test/ui/raw/raw-literal-keywords.rs b/src/test/ui/raw/raw-literal-keywords.rs index f1bfbc95eb395..896cfa0cc007d 100644 --- a/src/test/ui/raw/raw-literal-keywords.rs +++ b/src/test/ui/raw/raw-literal-keywords.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn test_if() { diff --git a/src/test/ui/raw/raw-literal-keywords.stderr b/src/test/ui/raw/raw-literal-keywords.stderr index 8a6b91b4b4b6f..b73a7e4ddd97b 100644 --- a/src/test/ui/raw/raw-literal-keywords.stderr +++ b/src/test/ui/raw/raw-literal-keywords.stderr @@ -1,17 +1,17 @@ error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `true` - --> $DIR/raw-literal-keywords.rs:14:10 + --> $DIR/raw-literal-keywords.rs:4:10 | LL | r#if true { } //~ ERROR found `true` | ^^^^ expected one of 8 possible tokens here error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `Test` - --> $DIR/raw-literal-keywords.rs:18:14 + --> $DIR/raw-literal-keywords.rs:8:14 | LL | r#struct Test; //~ ERROR found `Test` | ^^^^ expected one of 8 possible tokens here error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `Test` - --> $DIR/raw-literal-keywords.rs:22:13 + --> $DIR/raw-literal-keywords.rs:12:13 | LL | r#union Test; //~ ERROR found `Test` | ^^^^ expected one of 8 possible tokens here diff --git a/src/test/ui/raw/raw-literal-self.rs b/src/test/ui/raw/raw-literal-self.rs index 17496d767b622..e033e4857ad85 100644 --- a/src/test/ui/raw/raw-literal-self.rs +++ b/src/test/ui/raw/raw-literal-self.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn self_test(r#self: u32) { diff --git a/src/test/ui/raw/raw-literal-self.stderr b/src/test/ui/raw/raw-literal-self.stderr index f4b759372471c..e5aee80142bee 100644 --- a/src/test/ui/raw/raw-literal-self.stderr +++ b/src/test/ui/raw/raw-literal-self.stderr @@ -1,5 +1,5 @@ error: `r#self` is not currently supported. - --> $DIR/raw-literal-self.rs:13:14 + --> $DIR/raw-literal-self.rs:3:14 | LL | fn self_test(r#self: u32) { | ^^^^^^ diff --git a/src/test/ui/raw/raw-literal-underscore.rs b/src/test/ui/raw/raw-literal-underscore.rs index ec33e4861958e..d4d6bc4a2d1f8 100644 --- a/src/test/ui/raw/raw-literal-underscore.rs +++ b/src/test/ui/raw/raw-literal-underscore.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn underscore_test(r#_: u32) { diff --git a/src/test/ui/raw/raw-literal-underscore.stderr b/src/test/ui/raw/raw-literal-underscore.stderr index 8072eee4f0604..067bfbc803362 100644 --- a/src/test/ui/raw/raw-literal-underscore.stderr +++ b/src/test/ui/raw/raw-literal-underscore.stderr @@ -1,5 +1,5 @@ error: `r#_` is not currently supported. - --> $DIR/raw-literal-underscore.rs:13:20 + --> $DIR/raw-literal-underscore.rs:3:20 | LL | fn underscore_test(r#_: u32) { | ^^^ diff --git a/src/test/ui/raw/raw_string.rs b/src/test/ui/raw/raw_string.rs index f1eb91d44fda0..84f07c4a941bc 100644 --- a/src/test/ui/raw/raw_string.rs +++ b/src/test/ui/raw/raw_string.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = r##"lol"#; //~^ ERROR unterminated raw string diff --git a/src/test/ui/raw/raw_string.stderr b/src/test/ui/raw/raw_string.stderr index ddf1cfe406f7c..5572511881d57 100644 --- a/src/test/ui/raw/raw_string.stderr +++ b/src/test/ui/raw/raw_string.stderr @@ -1,5 +1,5 @@ error: unterminated raw string - --> $DIR/raw_string.rs:12:13 + --> $DIR/raw_string.rs:2:13 | LL | let x = r##"lol"#; | ^ unterminated raw string diff --git a/src/test/ui/reachable/expr_add.rs b/src/test/ui/reachable/expr_add.rs index 26760cfea4478..b45e5daf42c8d 100644 --- a/src/test/ui/reachable/expr_add.rs +++ b/src/test/ui/reachable/expr_add.rs @@ -1,12 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![feature(never_type)] #![allow(unused_variables)] #![deny(unreachable_code)] diff --git a/src/test/ui/reachable/expr_add.stderr b/src/test/ui/reachable/expr_add.stderr index f49a781ce336a..548600f26ec8f 100644 --- a/src/test/ui/reachable/expr_add.stderr +++ b/src/test/ui/reachable/expr_add.stderr @@ -1,11 +1,11 @@ error: unreachable expression - --> $DIR/expr_add.rs:26:13 + --> $DIR/expr_add.rs:17:13 | LL | let x = Foo + return; //~ ERROR unreachable | ^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/expr_add.rs:12:9 + --> $DIR/expr_add.rs:3:9 | LL | #![deny(unreachable_code)] | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/reachable/expr_again.rs b/src/test/ui/reachable/expr_again.rs index cf6a1f7b3b4d7..243fed0c8ce52 100644 --- a/src/test/ui/reachable/expr_again.rs +++ b/src/test/ui/reachable/expr_again.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] #![allow(unused_variables)] #![deny(unreachable_code)] diff --git a/src/test/ui/reachable/expr_again.stderr b/src/test/ui/reachable/expr_again.stderr index 65c0c588329cc..bdc3d143ea57e 100644 --- a/src/test/ui/reachable/expr_again.stderr +++ b/src/test/ui/reachable/expr_again.stderr @@ -1,11 +1,11 @@ error: unreachable statement - --> $DIR/expr_again.rs:18:9 + --> $DIR/expr_again.rs:8:9 | LL | println!("hi"); | ^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/expr_again.rs:13:9 + --> $DIR/expr_again.rs:3:9 | LL | #![deny(unreachable_code)] | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/reachable/expr_andand.rs b/src/test/ui/reachable/expr_andand.rs index c5206eec67285..173116ae357c5 100644 --- a/src/test/ui/reachable/expr_andand.rs +++ b/src/test/ui/reachable/expr_andand.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![allow(unused_variables)] diff --git a/src/test/ui/reachable/expr_array.rs b/src/test/ui/reachable/expr_array.rs index 323a5752e220e..e6bdb970568a4 100644 --- a/src/test/ui/reachable/expr_array.rs +++ b/src/test/ui/reachable/expr_array.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_variables)] #![allow(unused_assignments)] #![allow(dead_code)] diff --git a/src/test/ui/reachable/expr_array.stderr b/src/test/ui/reachable/expr_array.stderr index 78ac76a6137f4..b6e79e551cd8e 100644 --- a/src/test/ui/reachable/expr_array.stderr +++ b/src/test/ui/reachable/expr_array.stderr @@ -1,17 +1,17 @@ error: unreachable expression - --> $DIR/expr_array.rs:19:34 + --> $DIR/expr_array.rs:9:34 | LL | let x: [usize; 2] = [return, 22]; //~ ERROR unreachable | ^^ | note: lint level defined here - --> $DIR/expr_array.rs:14:9 + --> $DIR/expr_array.rs:4:9 | LL | #![deny(unreachable_code)] | ^^^^^^^^^^^^^^^^ error: unreachable expression - --> $DIR/expr_array.rs:24:25 + --> $DIR/expr_array.rs:14:25 | LL | let x: [usize; 2] = [22, return]; //~ ERROR unreachable | ^^^^^^^^^^^^ diff --git a/src/test/ui/reachable/expr_assign.rs b/src/test/ui/reachable/expr_assign.rs index 308f2483be50a..e547f75e2697b 100644 --- a/src/test/ui/reachable/expr_assign.rs +++ b/src/test/ui/reachable/expr_assign.rs @@ -1,12 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![feature(never_type)] #![allow(unused_variables)] #![allow(unused_assignments)] diff --git a/src/test/ui/reachable/expr_assign.stderr b/src/test/ui/reachable/expr_assign.stderr index 628bfbf621716..949009b729969 100644 --- a/src/test/ui/reachable/expr_assign.stderr +++ b/src/test/ui/reachable/expr_assign.stderr @@ -1,23 +1,23 @@ error: unreachable expression - --> $DIR/expr_assign.rs:19:5 + --> $DIR/expr_assign.rs:10:5 | LL | x = return; //~ ERROR unreachable | ^^^^^^^^^^ | note: lint level defined here - --> $DIR/expr_assign.rs:14:9 + --> $DIR/expr_assign.rs:5:9 | LL | #![deny(unreachable_code)] | ^^^^^^^^^^^^^^^^ error: unreachable expression - --> $DIR/expr_assign.rs:29:14 + --> $DIR/expr_assign.rs:20:14 | LL | *p = return; //~ ERROR unreachable | ^^^^^^ error: unreachable expression - --> $DIR/expr_assign.rs:35:15 + --> $DIR/expr_assign.rs:26:15 | LL | *{return; &mut i} = 22; //~ ERROR unreachable | ^^^^^^ diff --git a/src/test/ui/reachable/expr_block.rs b/src/test/ui/reachable/expr_block.rs index 1f74f61ce2a2b..136bccce88104 100644 --- a/src/test/ui/reachable/expr_block.rs +++ b/src/test/ui/reachable/expr_block.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_variables)] #![allow(unused_assignments)] #![allow(dead_code)] diff --git a/src/test/ui/reachable/expr_block.stderr b/src/test/ui/reachable/expr_block.stderr index 5f5696aadb37c..d71d12b744a64 100644 --- a/src/test/ui/reachable/expr_block.stderr +++ b/src/test/ui/reachable/expr_block.stderr @@ -1,17 +1,17 @@ error: unreachable expression - --> $DIR/expr_block.rs:20:9 + --> $DIR/expr_block.rs:10:9 | LL | 22 //~ ERROR unreachable | ^^ | note: lint level defined here - --> $DIR/expr_block.rs:14:9 + --> $DIR/expr_block.rs:4:9 | LL | #![deny(unreachable_code)] | ^^^^^^^^^^^^^^^^ error: unreachable statement - --> $DIR/expr_block.rs:35:9 + --> $DIR/expr_block.rs:25:9 | LL | println!("foo"); | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/reachable/expr_box.rs b/src/test/ui/reachable/expr_box.rs index ab62cbdf83747..00328ea013139 100644 --- a/src/test/ui/reachable/expr_box.rs +++ b/src/test/ui/reachable/expr_box.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] #![allow(unused_variables)] #![deny(unreachable_code)] diff --git a/src/test/ui/reachable/expr_box.stderr b/src/test/ui/reachable/expr_box.stderr index 08b916030dd9f..289cef24bcecb 100644 --- a/src/test/ui/reachable/expr_box.stderr +++ b/src/test/ui/reachable/expr_box.stderr @@ -1,11 +1,11 @@ error: unreachable expression - --> $DIR/expr_box.rs:16:13 + --> $DIR/expr_box.rs:6:13 | LL | let x = box return; //~ ERROR unreachable | ^^^^^^^^^^ | note: lint level defined here - --> $DIR/expr_box.rs:13:9 + --> $DIR/expr_box.rs:3:9 | LL | #![deny(unreachable_code)] | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/reachable/expr_call.rs b/src/test/ui/reachable/expr_call.rs index 9696bdadf87e8..1eaa96c3ce773 100644 --- a/src/test/ui/reachable/expr_call.rs +++ b/src/test/ui/reachable/expr_call.rs @@ -1,12 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![feature(never_type)] #![allow(unused_variables)] #![allow(unused_assignments)] diff --git a/src/test/ui/reachable/expr_call.stderr b/src/test/ui/reachable/expr_call.stderr index 414d29ec2a734..aecaf24adc44b 100644 --- a/src/test/ui/reachable/expr_call.stderr +++ b/src/test/ui/reachable/expr_call.stderr @@ -1,17 +1,17 @@ error: unreachable expression - --> $DIR/expr_call.rs:22:17 + --> $DIR/expr_call.rs:13:17 | LL | foo(return, 22); //~ ERROR unreachable | ^^ | note: lint level defined here - --> $DIR/expr_call.rs:14:9 + --> $DIR/expr_call.rs:5:9 | LL | #![deny(unreachable_code)] | ^^^^^^^^^^^^^^^^ error: unreachable expression - --> $DIR/expr_call.rs:27:5 + --> $DIR/expr_call.rs:18:5 | LL | bar(return); //~ ERROR unreachable | ^^^^^^^^^^^ diff --git a/src/test/ui/reachable/expr_cast.rs b/src/test/ui/reachable/expr_cast.rs index fc0041daf7c7c..f53bcb97e6972 100644 --- a/src/test/ui/reachable/expr_cast.rs +++ b/src/test/ui/reachable/expr_cast.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_variables)] #![allow(unused_assignments)] #![allow(dead_code)] diff --git a/src/test/ui/reachable/expr_cast.stderr b/src/test/ui/reachable/expr_cast.stderr index 458334e2af967..21f8a0f418e5e 100644 --- a/src/test/ui/reachable/expr_cast.stderr +++ b/src/test/ui/reachable/expr_cast.stderr @@ -1,11 +1,11 @@ error: unreachable expression - --> $DIR/expr_cast.rs:19:13 + --> $DIR/expr_cast.rs:9:13 | LL | let x = {return} as !; //~ ERROR unreachable | ^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/expr_cast.rs:14:9 + --> $DIR/expr_cast.rs:4:9 | LL | #![deny(unreachable_code)] | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/reachable/expr_if.rs b/src/test/ui/reachable/expr_if.rs index 4b540ab5b7e67..ed43bd8c6895e 100644 --- a/src/test/ui/reachable/expr_if.rs +++ b/src/test/ui/reachable/expr_if.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_variables)] #![allow(unused_assignments)] #![allow(dead_code)] diff --git a/src/test/ui/reachable/expr_if.stderr b/src/test/ui/reachable/expr_if.stderr index 6e8afd1c5be82..d11471da1a6a3 100644 --- a/src/test/ui/reachable/expr_if.stderr +++ b/src/test/ui/reachable/expr_if.stderr @@ -1,11 +1,11 @@ error: unreachable statement - --> $DIR/expr_if.rs:37:5 + --> $DIR/expr_if.rs:27:5 | LL | println!("But I am."); | ^^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/expr_if.rs:14:9 + --> $DIR/expr_if.rs:4:9 | LL | #![deny(unreachable_code)] | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/reachable/expr_loop.rs b/src/test/ui/reachable/expr_loop.rs index 41394f2048429..7eab6f7bb44e1 100644 --- a/src/test/ui/reachable/expr_loop.rs +++ b/src/test/ui/reachable/expr_loop.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_variables)] #![allow(unused_assignments)] #![allow(dead_code)] diff --git a/src/test/ui/reachable/expr_loop.stderr b/src/test/ui/reachable/expr_loop.stderr index 0208972a3dfb2..4d3e06c93a376 100644 --- a/src/test/ui/reachable/expr_loop.stderr +++ b/src/test/ui/reachable/expr_loop.stderr @@ -1,18 +1,18 @@ error: unreachable statement - --> $DIR/expr_loop.rs:18:5 + --> $DIR/expr_loop.rs:8:5 | LL | println!("I am dead."); | ^^^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/expr_loop.rs:14:9 + --> $DIR/expr_loop.rs:4:9 | LL | #![deny(unreachable_code)] | ^^^^^^^^^^^^^^^^ = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) error: unreachable statement - --> $DIR/expr_loop.rs:31:5 + --> $DIR/expr_loop.rs:21:5 | LL | println!("I am dead."); | ^^^^^^^^^^^^^^^^^^^^^^^ @@ -20,7 +20,7 @@ LL | println!("I am dead."); = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) error: unreachable statement - --> $DIR/expr_loop.rs:42:5 + --> $DIR/expr_loop.rs:32:5 | LL | println!("I am dead."); | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/reachable/expr_match.rs b/src/test/ui/reachable/expr_match.rs index 2faa262d11036..2767564234885 100644 --- a/src/test/ui/reachable/expr_match.rs +++ b/src/test/ui/reachable/expr_match.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_variables)] #![allow(unused_assignments)] #![allow(dead_code)] diff --git a/src/test/ui/reachable/expr_match.stderr b/src/test/ui/reachable/expr_match.stderr index 240341232d8c0..594f52139768e 100644 --- a/src/test/ui/reachable/expr_match.stderr +++ b/src/test/ui/reachable/expr_match.stderr @@ -1,17 +1,17 @@ error: unreachable expression - --> $DIR/expr_match.rs:19:5 + --> $DIR/expr_match.rs:9:5 | LL | match {return} { } //~ ERROR unreachable | ^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/expr_match.rs:14:9 + --> $DIR/expr_match.rs:4:9 | LL | #![deny(unreachable_code)] | ^^^^^^^^^^^^^^^^ error: unreachable statement - --> $DIR/expr_match.rs:24:5 + --> $DIR/expr_match.rs:14:5 | LL | println!("I am dead"); | ^^^^^^^^^^^^^^^^^^^^^^ @@ -19,7 +19,7 @@ LL | println!("I am dead"); = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) error: unreachable statement - --> $DIR/expr_match.rs:35:5 + --> $DIR/expr_match.rs:25:5 | LL | println!("I am dead"); | ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/reachable/expr_method.rs b/src/test/ui/reachable/expr_method.rs index c91646cfa1ef1..d917df05b3c3d 100644 --- a/src/test/ui/reachable/expr_method.rs +++ b/src/test/ui/reachable/expr_method.rs @@ -1,12 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![feature(never_type)] #![allow(unused_variables)] #![allow(unused_assignments)] diff --git a/src/test/ui/reachable/expr_method.stderr b/src/test/ui/reachable/expr_method.stderr index 6d67bfcd54a7a..f1770df2f9ea8 100644 --- a/src/test/ui/reachable/expr_method.stderr +++ b/src/test/ui/reachable/expr_method.stderr @@ -1,17 +1,17 @@ error: unreachable expression - --> $DIR/expr_method.rs:25:21 + --> $DIR/expr_method.rs:16:21 | LL | Foo.foo(return, 22); //~ ERROR unreachable | ^^ | note: lint level defined here - --> $DIR/expr_method.rs:14:9 + --> $DIR/expr_method.rs:5:9 | LL | #![deny(unreachable_code)] | ^^^^^^^^^^^^^^^^ error: unreachable expression - --> $DIR/expr_method.rs:30:5 + --> $DIR/expr_method.rs:21:5 | LL | Foo.bar(return); //~ ERROR unreachable | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/reachable/expr_oror.rs b/src/test/ui/reachable/expr_oror.rs index 0adec9999dc9e..ecfa072aa817d 100644 --- a/src/test/ui/reachable/expr_oror.rs +++ b/src/test/ui/reachable/expr_oror.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![allow(unused_variables)] diff --git a/src/test/ui/reachable/expr_repeat.rs b/src/test/ui/reachable/expr_repeat.rs index fd9fca413a7f2..0fd13c6cb8e7c 100644 --- a/src/test/ui/reachable/expr_repeat.rs +++ b/src/test/ui/reachable/expr_repeat.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_variables)] #![allow(unused_assignments)] #![allow(dead_code)] diff --git a/src/test/ui/reachable/expr_repeat.stderr b/src/test/ui/reachable/expr_repeat.stderr index 36393de90b7cd..288c18d5d6593 100644 --- a/src/test/ui/reachable/expr_repeat.stderr +++ b/src/test/ui/reachable/expr_repeat.stderr @@ -1,11 +1,11 @@ error: unreachable expression - --> $DIR/expr_repeat.rs:19:25 + --> $DIR/expr_repeat.rs:9:25 | LL | let x: [usize; 2] = [return; 2]; //~ ERROR unreachable | ^^^^^^^^^^^ | note: lint level defined here - --> $DIR/expr_repeat.rs:14:9 + --> $DIR/expr_repeat.rs:4:9 | LL | #![deny(unreachable_code)] | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/reachable/expr_return.rs b/src/test/ui/reachable/expr_return.rs index 9bbbe6f909986..0fc43f45075da 100644 --- a/src/test/ui/reachable/expr_return.rs +++ b/src/test/ui/reachable/expr_return.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_variables)] #![allow(unused_assignments)] #![allow(dead_code)] diff --git a/src/test/ui/reachable/expr_return.stderr b/src/test/ui/reachable/expr_return.stderr index 2dcc50944c5d7..e5ce660d69596 100644 --- a/src/test/ui/reachable/expr_return.stderr +++ b/src/test/ui/reachable/expr_return.stderr @@ -1,11 +1,11 @@ error: unreachable expression - --> $DIR/expr_return.rs:20:22 + --> $DIR/expr_return.rs:10:22 | LL | let x = {return {return {return;}}}; //~ ERROR unreachable | ^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/expr_return.rs:14:9 + --> $DIR/expr_return.rs:4:9 | LL | #![deny(unreachable_code)] | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/reachable/expr_struct.rs b/src/test/ui/reachable/expr_struct.rs index 66414f6084b81..31ab40582ee80 100644 --- a/src/test/ui/reachable/expr_struct.rs +++ b/src/test/ui/reachable/expr_struct.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_variables)] #![allow(unused_assignments)] #![allow(dead_code)] diff --git a/src/test/ui/reachable/expr_struct.stderr b/src/test/ui/reachable/expr_struct.stderr index 3f0ecb204798b..5fbf603602baa 100644 --- a/src/test/ui/reachable/expr_struct.stderr +++ b/src/test/ui/reachable/expr_struct.stderr @@ -1,29 +1,29 @@ error: unreachable expression - --> $DIR/expr_struct.rs:24:13 + --> $DIR/expr_struct.rs:14:13 | LL | let x = Foo { a: 22, b: 33, ..return }; //~ ERROR unreachable | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/expr_struct.rs:14:9 + --> $DIR/expr_struct.rs:4:9 | LL | #![deny(unreachable_code)] | ^^^^^^^^^^^^^^^^ error: unreachable expression - --> $DIR/expr_struct.rs:29:33 + --> $DIR/expr_struct.rs:19:33 | LL | let x = Foo { a: return, b: 33, ..return }; //~ ERROR unreachable | ^^ error: unreachable expression - --> $DIR/expr_struct.rs:34:39 + --> $DIR/expr_struct.rs:24:39 | LL | let x = Foo { a: 22, b: return, ..return }; //~ ERROR unreachable | ^^^^^^ error: unreachable expression - --> $DIR/expr_struct.rs:39:13 + --> $DIR/expr_struct.rs:29:13 | LL | let x = Foo { a: 22, b: return }; //~ ERROR unreachable | ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/reachable/expr_tup.rs b/src/test/ui/reachable/expr_tup.rs index e2c1009024891..90d4382e2ccf7 100644 --- a/src/test/ui/reachable/expr_tup.rs +++ b/src/test/ui/reachable/expr_tup.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_variables)] #![allow(unused_assignments)] #![allow(dead_code)] diff --git a/src/test/ui/reachable/expr_tup.stderr b/src/test/ui/reachable/expr_tup.stderr index d372373ced0f2..def678ec93ea2 100644 --- a/src/test/ui/reachable/expr_tup.stderr +++ b/src/test/ui/reachable/expr_tup.stderr @@ -1,17 +1,17 @@ error: unreachable expression - --> $DIR/expr_tup.rs:19:38 + --> $DIR/expr_tup.rs:9:38 | LL | let x: (usize, usize) = (return, 2); //~ ERROR unreachable | ^ | note: lint level defined here - --> $DIR/expr_tup.rs:14:9 + --> $DIR/expr_tup.rs:4:9 | LL | #![deny(unreachable_code)] | ^^^^^^^^^^^^^^^^ error: unreachable expression - --> $DIR/expr_tup.rs:24:29 + --> $DIR/expr_tup.rs:14:29 | LL | let x: (usize, usize) = (2, return); //~ ERROR unreachable | ^^^^^^^^^^^ diff --git a/src/test/ui/reachable/expr_type.rs b/src/test/ui/reachable/expr_type.rs index ce12412ba7438..8d32397b54248 100644 --- a/src/test/ui/reachable/expr_type.rs +++ b/src/test/ui/reachable/expr_type.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_variables)] #![allow(unused_assignments)] #![allow(dead_code)] diff --git a/src/test/ui/reachable/expr_type.stderr b/src/test/ui/reachable/expr_type.stderr index 9b165d6b3ee19..b90cd79034172 100644 --- a/src/test/ui/reachable/expr_type.stderr +++ b/src/test/ui/reachable/expr_type.stderr @@ -1,11 +1,11 @@ error: unreachable expression - --> $DIR/expr_type.rs:19:13 + --> $DIR/expr_type.rs:9:13 | LL | let x = {return}: !; //~ ERROR unreachable | ^^^^^^^^^^^ | note: lint level defined here - --> $DIR/expr_type.rs:14:9 + --> $DIR/expr_type.rs:4:9 | LL | #![deny(unreachable_code)] | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/reachable/expr_unary.rs b/src/test/ui/reachable/expr_unary.rs index 5b7ea57b1661a..e229d22ebc798 100644 --- a/src/test/ui/reachable/expr_unary.rs +++ b/src/test/ui/reachable/expr_unary.rs @@ -1,12 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![feature(never_type)] #![allow(unused_variables)] #![allow(unused_assignments)] diff --git a/src/test/ui/reachable/expr_unary.stderr b/src/test/ui/reachable/expr_unary.stderr index b889c884fcbb2..44887f0ee523b 100644 --- a/src/test/ui/reachable/expr_unary.stderr +++ b/src/test/ui/reachable/expr_unary.stderr @@ -1,17 +1,17 @@ error[E0600]: cannot apply unary operator `!` to type `!` - --> $DIR/expr_unary.rs:17:16 + --> $DIR/expr_unary.rs:8:16 | LL | let x: ! = ! { return; }; //~ ERROR unreachable | ^^^^^^^^^^^^^ cannot apply unary operator `!` error: unreachable expression - --> $DIR/expr_unary.rs:17:16 + --> $DIR/expr_unary.rs:8:16 | LL | let x: ! = ! { return; }; //~ ERROR unreachable | ^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/expr_unary.rs:14:9 + --> $DIR/expr_unary.rs:5:9 | LL | #![deny(unreachable_code)] | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/reachable/expr_while.rs b/src/test/ui/reachable/expr_while.rs index 27e8d5d9b97f4..36a3e3dd961b2 100644 --- a/src/test/ui/reachable/expr_while.rs +++ b/src/test/ui/reachable/expr_while.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_variables)] #![allow(unused_assignments)] #![allow(dead_code)] diff --git a/src/test/ui/reachable/expr_while.stderr b/src/test/ui/reachable/expr_while.stderr index 3a27fe5e027f4..d2f5588568aab 100644 --- a/src/test/ui/reachable/expr_while.stderr +++ b/src/test/ui/reachable/expr_while.stderr @@ -1,18 +1,18 @@ error: unreachable statement - --> $DIR/expr_while.rs:18:9 + --> $DIR/expr_while.rs:8:9 | LL | println!("Hello, world!"); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/expr_while.rs:14:9 + --> $DIR/expr_while.rs:4:9 | LL | #![deny(unreachable_code)] | ^^^^^^^^^^^^^^^^ = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) error: unreachable statement - --> $DIR/expr_while.rs:33:9 + --> $DIR/expr_while.rs:23:9 | LL | println!("I am dead."); | ^^^^^^^^^^^^^^^^^^^^^^^ @@ -20,7 +20,7 @@ LL | println!("I am dead."); = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) error: unreachable statement - --> $DIR/expr_while.rs:36:5 + --> $DIR/expr_while.rs:26:5 | LL | println!("I am, too."); | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/reassign-ref-mut.rs b/src/test/ui/reassign-ref-mut.rs index c045720a84013..d6d41e959d9af 100644 --- a/src/test/ui/reassign-ref-mut.rs +++ b/src/test/ui/reassign-ref-mut.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests how we behave when the user attempts to mutate an immutable // binding that was introduced by either `ref` or `ref mut` // patterns. diff --git a/src/test/ui/reassign-ref-mut.stderr b/src/test/ui/reassign-ref-mut.stderr index bf627dde720b1..e623578e02522 100644 --- a/src/test/ui/reassign-ref-mut.stderr +++ b/src/test/ui/reassign-ref-mut.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `a` - --> $DIR/reassign-ref-mut.rs:22:5 + --> $DIR/reassign-ref-mut.rs:12:5 | LL | let &mut (ref a, ref mut b) = &mut one_two; | ----- first assignment to `a` @@ -7,7 +7,7 @@ LL | a = &three_four.0; | ^^^^^^^^^^^^^^^^^ cannot assign twice to immutable variable error[E0384]: cannot assign twice to immutable variable `b` - --> $DIR/reassign-ref-mut.rs:24:5 + --> $DIR/reassign-ref-mut.rs:14:5 | LL | let &mut (ref a, ref mut b) = &mut one_two; | --------- first assignment to `b` diff --git a/src/test/ui/recursion/auxiliary/recursive_reexports.rs b/src/test/ui/recursion/auxiliary/recursive_reexports.rs index 1186e3d62f73a..f98fa71009fed 100644 --- a/src/test/ui/recursion/auxiliary/recursive_reexports.rs +++ b/src/test/ui/recursion/auxiliary/recursive_reexports.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod foo { pub use foo; } diff --git a/src/test/ui/recursion/recursion.rs b/src/test/ui/recursion/recursion.rs index 3221ae4629643..ba3cc33dc30f9 100644 --- a/src/test/ui/recursion/recursion.rs +++ b/src/test/ui/recursion/recursion.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Nil {NilValue} struct Cons {head:isize, tail:T} trait Dot {fn dot(&self, other:Self) -> isize;} diff --git a/src/test/ui/recursion/recursion.stderr b/src/test/ui/recursion/recursion.stderr index 5953e5c408777..1bef37ad58883 100644 --- a/src/test/ui/recursion/recursion.stderr +++ b/src/test/ui/recursion/recursion.stderr @@ -1,5 +1,5 @@ error: reached the recursion limit while instantiating `test::>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>` - --> $DIR/recursion.rs:22:1 + --> $DIR/recursion.rs:12:1 | LL | / fn test (n:isize, i:isize, first:T, second:T) ->isize { //~ ERROR recursion limit LL | | match n { 0 => {first.dot(second)} diff --git a/src/test/ui/recursion/recursive-enum.rs b/src/test/ui/recursion/recursive-enum.rs index 555755cdb96ea..ec07a2beb542d 100644 --- a/src/test/ui/recursion/recursive-enum.rs +++ b/src/test/ui/recursion/recursive-enum.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum list { cons(T, list), nil } //~^ ERROR recursive type `list` has infinite size diff --git a/src/test/ui/recursion/recursive-enum.stderr b/src/test/ui/recursion/recursive-enum.stderr index c06058b2b595d..7a5e9ab7d82d5 100644 --- a/src/test/ui/recursion/recursive-enum.stderr +++ b/src/test/ui/recursion/recursive-enum.stderr @@ -1,5 +1,5 @@ error[E0072]: recursive type `list` has infinite size - --> $DIR/recursive-enum.rs:11:1 + --> $DIR/recursive-enum.rs:1:1 | LL | enum list { cons(T, list), nil } | ^^^^^^^^^^^^ ------- recursive without indirection diff --git a/src/test/ui/recursion/recursive-reexports.rs b/src/test/ui/recursion/recursive-reexports.rs index b57b73325c008..3d9fda35c68ac 100644 --- a/src/test/ui/recursion/recursive-reexports.rs +++ b/src/test/ui/recursion/recursive-reexports.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:recursive_reexports.rs extern crate recursive_reexports; diff --git a/src/test/ui/recursion/recursive-reexports.stderr b/src/test/ui/recursion/recursive-reexports.stderr index e6b8647a981ad..681931ef830f6 100644 --- a/src/test/ui/recursion/recursive-reexports.stderr +++ b/src/test/ui/recursion/recursive-reexports.stderr @@ -1,5 +1,5 @@ error[E0412]: cannot find type `S` in module `recursive_reexports` - --> $DIR/recursive-reexports.rs:15:32 + --> $DIR/recursive-reexports.rs:5:32 | LL | fn f() -> recursive_reexports::S {} //~ ERROR cannot find type `S` in module `recursive_reexports` | ^ not found in `recursive_reexports` diff --git a/src/test/ui/recursion/recursive-requirements.rs b/src/test/ui/recursion/recursive-requirements.rs index 2c0f0338b2d15..cd90c74b04211 100644 --- a/src/test/ui/recursion/recursive-requirements.rs +++ b/src/test/ui/recursion/recursive-requirements.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::marker::PhantomData; struct AssertSync(PhantomData); diff --git a/src/test/ui/recursion/recursive-requirements.stderr b/src/test/ui/recursion/recursive-requirements.stderr index d9e08102ab6a6..7e19cdd3de94d 100644 --- a/src/test/ui/recursion/recursive-requirements.stderr +++ b/src/test/ui/recursion/recursive-requirements.stderr @@ -1,5 +1,5 @@ error[E0275]: overflow evaluating the requirement `Foo: std::marker::Sync` - --> $DIR/recursive-requirements.rs:26:12 + --> $DIR/recursive-requirements.rs:16:12 | LL | let _: AssertSync = unimplemented!(); //~ ERROR E0275 | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/recursion/recursive-static-definition.rs b/src/test/ui/recursion/recursive-static-definition.rs index 62c1859e09d3a..e816ce4e0c452 100644 --- a/src/test/ui/recursion/recursive-static-definition.rs +++ b/src/test/ui/recursion/recursive-static-definition.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub static FOO: u32 = FOO; //~^ ERROR cycle detected when const-evaluating `FOO` diff --git a/src/test/ui/recursion/recursive-static-definition.stderr b/src/test/ui/recursion/recursive-static-definition.stderr index 2ab93bfd685c8..a24a4ee27ed1f 100644 --- a/src/test/ui/recursion/recursive-static-definition.stderr +++ b/src/test/ui/recursion/recursive-static-definition.stderr @@ -1,5 +1,5 @@ error[E0391]: cycle detected when const-evaluating `FOO` - --> $DIR/recursive-static-definition.rs:11:23 + --> $DIR/recursive-static-definition.rs:1:23 | LL | pub static FOO: u32 = FOO; | ^^^ diff --git a/src/test/ui/recursion/recursive-types-are-not-uninhabited.rs b/src/test/ui/recursion/recursive-types-are-not-uninhabited.rs index fa93669707224..b3e4efb99401f 100644 --- a/src/test/ui/recursion/recursive-types-are-not-uninhabited.rs +++ b/src/test/ui/recursion/recursive-types-are-not-uninhabited.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct R<'a> { r: &'a R<'a>, } diff --git a/src/test/ui/recursion/recursive-types-are-not-uninhabited.stderr b/src/test/ui/recursion/recursive-types-are-not-uninhabited.stderr index c4d404127601b..dad98cff452ce 100644 --- a/src/test/ui/recursion/recursive-types-are-not-uninhabited.stderr +++ b/src/test/ui/recursion/recursive-types-are-not-uninhabited.stderr @@ -1,5 +1,5 @@ error[E0005]: refutable pattern in local binding: `Err(_)` not covered - --> $DIR/recursive-types-are-not-uninhabited.rs:16:9 + --> $DIR/recursive-types-are-not-uninhabited.rs:6:9 | LL | let Ok(x) = res; | ^^^^^ pattern `Err(_)` not covered diff --git a/src/test/ui/ref-suggestion.nll.stderr b/src/test/ui/ref-suggestion.nll.stderr index 3fbd497c7aeec..7c00461c900a2 100644 --- a/src/test/ui/ref-suggestion.nll.stderr +++ b/src/test/ui/ref-suggestion.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `x` - --> $DIR/ref-suggestion.rs:14:5 + --> $DIR/ref-suggestion.rs:4:5 | LL | let y = x; | - value moved here @@ -9,7 +9,7 @@ LL | x; //~ ERROR use of moved value = note: move occurs because `x` has type `std::vec::Vec`, which does not implement the `Copy` trait error[E0382]: use of moved value: `x` - --> $DIR/ref-suggestion.rs:18:5 + --> $DIR/ref-suggestion.rs:8:5 | LL | let mut y = x; | - value moved here @@ -19,7 +19,7 @@ LL | x; //~ ERROR use of moved value = note: move occurs because `x` has type `std::vec::Vec`, which does not implement the `Copy` trait error[E0382]: use of moved value: `x` - --> $DIR/ref-suggestion.rs:26:5 + --> $DIR/ref-suggestion.rs:16:5 | LL | (Some(y), ()) => {}, | - value moved here diff --git a/src/test/ui/ref-suggestion.rs b/src/test/ui/ref-suggestion.rs index 0a0867195d976..346d118f0f9a9 100644 --- a/src/test/ui/ref-suggestion.rs +++ b/src/test/ui/ref-suggestion.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = vec![1]; let y = x; diff --git a/src/test/ui/ref-suggestion.stderr b/src/test/ui/ref-suggestion.stderr index 63ee203ed24fe..1f871bafeec99 100644 --- a/src/test/ui/ref-suggestion.stderr +++ b/src/test/ui/ref-suggestion.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `x` - --> $DIR/ref-suggestion.rs:14:5 + --> $DIR/ref-suggestion.rs:4:5 | LL | let y = x; | - value moved here @@ -9,7 +9,7 @@ LL | x; //~ ERROR use of moved value = note: move occurs because `x` has type `std::vec::Vec`, which does not implement the `Copy` trait error[E0382]: use of moved value: `x` - --> $DIR/ref-suggestion.rs:18:5 + --> $DIR/ref-suggestion.rs:8:5 | LL | let mut y = x; | ----- value moved here @@ -19,7 +19,7 @@ LL | x; //~ ERROR use of moved value = note: move occurs because `x` has type `std::vec::Vec`, which does not implement the `Copy` trait error[E0382]: use of partially moved value: `x` - --> $DIR/ref-suggestion.rs:26:5 + --> $DIR/ref-suggestion.rs:16:5 | LL | (Some(y), ()) => {}, | - value moved here diff --git a/src/test/ui/refutable-pattern-errors.rs b/src/test/ui/refutable-pattern-errors.rs index 7b4009481abd4..519025c3368ac 100644 --- a/src/test/ui/refutable-pattern-errors.rs +++ b/src/test/ui/refutable-pattern-errors.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn func((1, (Some(1), 2..=3)): (isize, (Option, isize))) { } //~^ ERROR refutable pattern in function argument: `(_, _)` not covered diff --git a/src/test/ui/refutable-pattern-errors.stderr b/src/test/ui/refutable-pattern-errors.stderr index c2d5fe001fc10..4b5ee826ba5cf 100644 --- a/src/test/ui/refutable-pattern-errors.stderr +++ b/src/test/ui/refutable-pattern-errors.stderr @@ -1,11 +1,11 @@ error[E0005]: refutable pattern in function argument: `(_, _)` not covered - --> $DIR/refutable-pattern-errors.rs:12:9 + --> $DIR/refutable-pattern-errors.rs:1:9 | LL | fn func((1, (Some(1), 2..=3)): (isize, (Option, isize))) { } | ^^^^^^^^^^^^^^^^^^^^^ pattern `(_, _)` not covered error[E0005]: refutable pattern in local binding: `(_, _)` not covered - --> $DIR/refutable-pattern-errors.rs:16:9 + --> $DIR/refutable-pattern-errors.rs:5:9 | LL | let (1, (Some(1), 2..=3)) = (1, (None, 2)); | ^^^^^^^^^^^^^^^^^^^^^ pattern `(_, _)` not covered diff --git a/src/test/ui/refutable-pattern-in-fn-arg.rs b/src/test/ui/refutable-pattern-in-fn-arg.rs index be42f0f0ed883..a2d9e1935de74 100644 --- a/src/test/ui/refutable-pattern-in-fn-arg.rs +++ b/src/test/ui/refutable-pattern-in-fn-arg.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let f = |3: isize| println!("hello"); //~^ ERROR refutable pattern in function argument: `_` not covered diff --git a/src/test/ui/refutable-pattern-in-fn-arg.stderr b/src/test/ui/refutable-pattern-in-fn-arg.stderr index e03532667f502..8666e6bb73ebf 100644 --- a/src/test/ui/refutable-pattern-in-fn-arg.stderr +++ b/src/test/ui/refutable-pattern-in-fn-arg.stderr @@ -1,5 +1,5 @@ error[E0005]: refutable pattern in function argument: `_` not covered - --> $DIR/refutable-pattern-in-fn-arg.rs:12:14 + --> $DIR/refutable-pattern-in-fn-arg.rs:2:14 | LL | let f = |3: isize| println!("hello"); | ^ pattern `_` not covered diff --git a/src/test/ui/regions-fn-subtyping-return-static-fail.rs b/src/test/ui/regions-fn-subtyping-return-static-fail.rs index 6be65a5e35905..a8fe562656ebb 100644 --- a/src/test/ui/regions-fn-subtyping-return-static-fail.rs +++ b/src/test/ui/regions-fn-subtyping-return-static-fail.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // In this fn, the type `F` is a function that takes a reference to a // struct and returns another reference with the same lifetime. // diff --git a/src/test/ui/regions-fn-subtyping-return-static-fail.stderr b/src/test/ui/regions-fn-subtyping-return-static-fail.stderr index ff4d00ae66b7c..0bf6e0514d21e 100644 --- a/src/test/ui/regions-fn-subtyping-return-static-fail.stderr +++ b/src/test/ui/regions-fn-subtyping-return-static-fail.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/regions-fn-subtyping-return-static-fail.rs:51:12 + --> $DIR/regions-fn-subtyping-return-static-fail.rs:41:12 | LL | want_F(bar); //~ ERROR E0308 | ^^^ expected concrete lifetime, found bound lifetime parameter 'cx @@ -8,7 +8,7 @@ LL | want_F(bar); //~ ERROR E0308 found type `for<'a> fn(&'a S) -> &S {bar::<'_>}` error[E0308]: mismatched types - --> $DIR/regions-fn-subtyping-return-static-fail.rs:59:12 + --> $DIR/regions-fn-subtyping-return-static-fail.rs:49:12 | LL | want_G(baz); | ^^^ expected concrete lifetime, found bound lifetime parameter 'cx diff --git a/src/test/ui/regions/auxiliary/rbmtp_cross_crate_lib.rs b/src/test/ui/regions/auxiliary/rbmtp_cross_crate_lib.rs index f49ac4fc8e401..ce2a3a7db29a3 100644 --- a/src/test/ui/regions/auxiliary/rbmtp_cross_crate_lib.rs +++ b/src/test/ui/regions/auxiliary/rbmtp_cross_crate_lib.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that method bounds declared on traits/impls in a cross-crate // scenario work. This is the library portion of the test. diff --git a/src/test/ui/regions/region-borrow-params-issue-29793-big.ast.nll.stderr b/src/test/ui/regions/region-borrow-params-issue-29793-big.ast.nll.stderr index 5f386e58fac7d..ee514608eea29 100644 --- a/src/test/ui/regions/region-borrow-params-issue-29793-big.ast.nll.stderr +++ b/src/test/ui/regions/region-borrow-params-issue-29793-big.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `x` does not live long enough - --> $DIR/region-borrow-params-issue-29793-big.rs:81:43 + --> $DIR/region-borrow-params-issue-29793-big.rs:71:43 | LL | WrapB::new().set(|t: bool| if t { x } else { y }) // (separate errors for `x` vs `y`) | --------- ^ borrowed value does not live long enough @@ -10,7 +10,7 @@ LL | }); | - `x` dropped here while still borrowed error[E0597]: `y` does not live long enough - --> $DIR/region-borrow-params-issue-29793-big.rs:81:54 + --> $DIR/region-borrow-params-issue-29793-big.rs:71:54 | LL | WrapB::new().set(|t: bool| if t { x } else { y }) // (separate errors for `x` vs `y`) | --------- ^ borrowed value does not live long enough diff --git a/src/test/ui/regions/region-borrow-params-issue-29793-big.ast.stderr b/src/test/ui/regions/region-borrow-params-issue-29793-big.ast.stderr index 23dc39db129ee..27d8ce4ab5092 100644 --- a/src/test/ui/regions/region-borrow-params-issue-29793-big.ast.stderr +++ b/src/test/ui/regions/region-borrow-params-issue-29793-big.ast.stderr @@ -1,5 +1,5 @@ error[E0597]: `x` does not live long enough - --> $DIR/region-borrow-params-issue-29793-big.rs:81:43 + --> $DIR/region-borrow-params-issue-29793-big.rs:71:43 | LL | WrapB::new().set(|t: bool| if t { x } else { y }) // (separate errors for `x` vs `y`) | --------- ^ borrowed value does not live long enough @@ -12,7 +12,7 @@ LL | }); = note: values in a scope are dropped in the opposite order they are created error[E0597]: `y` does not live long enough - --> $DIR/region-borrow-params-issue-29793-big.rs:81:54 + --> $DIR/region-borrow-params-issue-29793-big.rs:71:54 | LL | WrapB::new().set(|t: bool| if t { x } else { y }) // (separate errors for `x` vs `y`) | --------- ^ borrowed value does not live long enough diff --git a/src/test/ui/regions/region-borrow-params-issue-29793-big.mir.stderr b/src/test/ui/regions/region-borrow-params-issue-29793-big.mir.stderr index 5f386e58fac7d..ee514608eea29 100644 --- a/src/test/ui/regions/region-borrow-params-issue-29793-big.mir.stderr +++ b/src/test/ui/regions/region-borrow-params-issue-29793-big.mir.stderr @@ -1,5 +1,5 @@ error[E0597]: `x` does not live long enough - --> $DIR/region-borrow-params-issue-29793-big.rs:81:43 + --> $DIR/region-borrow-params-issue-29793-big.rs:71:43 | LL | WrapB::new().set(|t: bool| if t { x } else { y }) // (separate errors for `x` vs `y`) | --------- ^ borrowed value does not live long enough @@ -10,7 +10,7 @@ LL | }); | - `x` dropped here while still borrowed error[E0597]: `y` does not live long enough - --> $DIR/region-borrow-params-issue-29793-big.rs:81:54 + --> $DIR/region-borrow-params-issue-29793-big.rs:71:54 | LL | WrapB::new().set(|t: bool| if t { x } else { y }) // (separate errors for `x` vs `y`) | --------- ^ borrowed value does not live long enough diff --git a/src/test/ui/regions/region-borrow-params-issue-29793-big.rs b/src/test/ui/regions/region-borrow-params-issue-29793-big.rs index 642e90f6de8e6..8bceec26700b9 100644 --- a/src/test/ui/regions/region-borrow-params-issue-29793-big.rs +++ b/src/test/ui/regions/region-borrow-params-issue-29793-big.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #29793, big regression test: do not let borrows of // parameters to ever be returned (expanded with exploration of // variations). diff --git a/src/test/ui/regions/region-borrow-params-issue-29793-small.nll.stderr b/src/test/ui/regions/region-borrow-params-issue-29793-small.nll.stderr index d0d6bd4c78570..917df7c27e2d7 100644 --- a/src/test/ui/regions/region-borrow-params-issue-29793-small.nll.stderr +++ b/src/test/ui/regions/region-borrow-params-issue-29793-small.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `x` does not live long enough - --> $DIR/region-borrow-params-issue-29793-small.rs:19:34 + --> $DIR/region-borrow-params-issue-29793-small.rs:9:34 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | --------- ^ borrowed value does not live long enough @@ -10,7 +10,7 @@ LL | }; | - `x` dropped here while still borrowed error[E0597]: `y` does not live long enough - --> $DIR/region-borrow-params-issue-29793-small.rs:19:45 + --> $DIR/region-borrow-params-issue-29793-small.rs:9:45 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | --------- ^ borrowed value does not live long enough @@ -21,7 +21,7 @@ LL | }; | - `y` dropped here while still borrowed error[E0597]: `x` does not live long enough - --> $DIR/region-borrow-params-issue-29793-small.rs:34:34 + --> $DIR/region-borrow-params-issue-29793-small.rs:24:34 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | --------- ^ borrowed value does not live long enough @@ -32,7 +32,7 @@ LL | }; | - `x` dropped here while still borrowed error[E0597]: `y` does not live long enough - --> $DIR/region-borrow-params-issue-29793-small.rs:34:45 + --> $DIR/region-borrow-params-issue-29793-small.rs:24:45 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | --------- ^ borrowed value does not live long enough @@ -43,7 +43,7 @@ LL | }; | - `y` dropped here while still borrowed error[E0597]: `x` does not live long enough - --> $DIR/region-borrow-params-issue-29793-small.rs:65:34 + --> $DIR/region-borrow-params-issue-29793-small.rs:55:34 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | --------- ^ borrowed value does not live long enough @@ -53,14 +53,14 @@ LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x LL | }; | - `x` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 64:10... - --> $DIR/region-borrow-params-issue-29793-small.rs:64:10 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 54:10... + --> $DIR/region-borrow-params-issue-29793-small.rs:54:10 | LL | fn g<'a>(x: usize, y:usize) -> Box usize + 'a> { | ^^ error[E0597]: `y` does not live long enough - --> $DIR/region-borrow-params-issue-29793-small.rs:65:45 + --> $DIR/region-borrow-params-issue-29793-small.rs:55:45 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | --------- ^ borrowed value does not live long enough @@ -70,14 +70,14 @@ LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x LL | }; | - `y` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 64:10... - --> $DIR/region-borrow-params-issue-29793-small.rs:64:10 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 54:10... + --> $DIR/region-borrow-params-issue-29793-small.rs:54:10 | LL | fn g<'a>(x: usize, y:usize) -> Box usize + 'a> { | ^^ error[E0597]: `x` does not live long enough - --> $DIR/region-borrow-params-issue-29793-small.rs:76:34 + --> $DIR/region-borrow-params-issue-29793-small.rs:66:34 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | --------- ^ borrowed value does not live long enough @@ -87,14 +87,14 @@ LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x LL | }; | - `x` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 75:10... - --> $DIR/region-borrow-params-issue-29793-small.rs:75:10 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 65:10... + --> $DIR/region-borrow-params-issue-29793-small.rs:65:10 | LL | fn g<'a>(x: usize, y:usize) -> Box usize + 'a> { | ^^ error[E0597]: `y` does not live long enough - --> $DIR/region-borrow-params-issue-29793-small.rs:76:45 + --> $DIR/region-borrow-params-issue-29793-small.rs:66:45 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | --------- ^ borrowed value does not live long enough @@ -104,14 +104,14 @@ LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x LL | }; | - `y` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 75:10... - --> $DIR/region-borrow-params-issue-29793-small.rs:75:10 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 65:10... + --> $DIR/region-borrow-params-issue-29793-small.rs:65:10 | LL | fn g<'a>(x: usize, y:usize) -> Box usize + 'a> { | ^^ error[E0597]: `x` does not live long enough - --> $DIR/region-borrow-params-issue-29793-small.rs:100:38 + --> $DIR/region-borrow-params-issue-29793-small.rs:90:38 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | --------- ^ borrowed value does not live long enough @@ -121,14 +121,14 @@ LL | let f = |t: bool| if t { x } else { y }; // (separate errors fo LL | } | - `x` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the method body at 99:14... - --> $DIR/region-borrow-params-issue-29793-small.rs:99:14 +note: borrowed value must be valid for the lifetime 'a as defined on the method body at 89:14... + --> $DIR/region-borrow-params-issue-29793-small.rs:89:14 | LL | fn g<'a>(&self, x: usize, y:usize) -> Box usize + 'a> { | ^^ error[E0597]: `y` does not live long enough - --> $DIR/region-borrow-params-issue-29793-small.rs:100:49 + --> $DIR/region-borrow-params-issue-29793-small.rs:90:49 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | --------- ^ borrowed value does not live long enough @@ -138,14 +138,14 @@ LL | let f = |t: bool| if t { x } else { y }; // (separate errors fo LL | } | - `y` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the method body at 99:14... - --> $DIR/region-borrow-params-issue-29793-small.rs:99:14 +note: borrowed value must be valid for the lifetime 'a as defined on the method body at 89:14... + --> $DIR/region-borrow-params-issue-29793-small.rs:89:14 | LL | fn g<'a>(&self, x: usize, y:usize) -> Box usize + 'a> { | ^^ error[E0597]: `x` does not live long enough - --> $DIR/region-borrow-params-issue-29793-small.rs:114:38 + --> $DIR/region-borrow-params-issue-29793-small.rs:104:38 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | --------- ^ borrowed value does not live long enough @@ -155,14 +155,14 @@ LL | let f = |t: bool| if t { x } else { y }; // (separate errors fo LL | } | - `x` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the method body at 113:14... - --> $DIR/region-borrow-params-issue-29793-small.rs:113:14 +note: borrowed value must be valid for the lifetime 'a as defined on the method body at 103:14... + --> $DIR/region-borrow-params-issue-29793-small.rs:103:14 | LL | fn g<'a>(&self, x: usize, y:usize) -> Box usize + 'a> { | ^^ error[E0597]: `y` does not live long enough - --> $DIR/region-borrow-params-issue-29793-small.rs:114:49 + --> $DIR/region-borrow-params-issue-29793-small.rs:104:49 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | --------- ^ borrowed value does not live long enough @@ -172,14 +172,14 @@ LL | let f = |t: bool| if t { x } else { y }; // (separate errors fo LL | } | - `y` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the method body at 113:14... - --> $DIR/region-borrow-params-issue-29793-small.rs:113:14 +note: borrowed value must be valid for the lifetime 'a as defined on the method body at 103:14... + --> $DIR/region-borrow-params-issue-29793-small.rs:103:14 | LL | fn g<'a>(&self, x: usize, y:usize) -> Box usize + 'a> { | ^^ error[E0597]: `x` does not live long enough - --> $DIR/region-borrow-params-issue-29793-small.rs:142:38 + --> $DIR/region-borrow-params-issue-29793-small.rs:132:38 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | --------- ^ borrowed value does not live long enough @@ -189,14 +189,14 @@ LL | let f = |t: bool| if t { x } else { y }; // (separate errors fo LL | } | - `x` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the method body at 141:14... - --> $DIR/region-borrow-params-issue-29793-small.rs:141:14 +note: borrowed value must be valid for the lifetime 'a as defined on the method body at 131:14... + --> $DIR/region-borrow-params-issue-29793-small.rs:131:14 | LL | fn g<'a>(&self, x: usize, y:usize) -> Box usize + 'a> { | ^^ error[E0597]: `y` does not live long enough - --> $DIR/region-borrow-params-issue-29793-small.rs:142:49 + --> $DIR/region-borrow-params-issue-29793-small.rs:132:49 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | --------- ^ borrowed value does not live long enough @@ -206,14 +206,14 @@ LL | let f = |t: bool| if t { x } else { y }; // (separate errors fo LL | } | - `y` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the method body at 141:14... - --> $DIR/region-borrow-params-issue-29793-small.rs:141:14 +note: borrowed value must be valid for the lifetime 'a as defined on the method body at 131:14... + --> $DIR/region-borrow-params-issue-29793-small.rs:131:14 | LL | fn g<'a>(&self, x: usize, y:usize) -> Box usize + 'a> { | ^^ error[E0597]: `x` does not live long enough - --> $DIR/region-borrow-params-issue-29793-small.rs:157:38 + --> $DIR/region-borrow-params-issue-29793-small.rs:147:38 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | --------- ^ borrowed value does not live long enough @@ -223,14 +223,14 @@ LL | let f = |t: bool| if t { x } else { y }; // (separate errors fo LL | } | - `x` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the method body at 156:14... - --> $DIR/region-borrow-params-issue-29793-small.rs:156:14 +note: borrowed value must be valid for the lifetime 'a as defined on the method body at 146:14... + --> $DIR/region-borrow-params-issue-29793-small.rs:146:14 | LL | fn g<'a>(&self, x: usize, y:usize) -> Box usize + 'a> { | ^^ error[E0597]: `y` does not live long enough - --> $DIR/region-borrow-params-issue-29793-small.rs:157:49 + --> $DIR/region-borrow-params-issue-29793-small.rs:147:49 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | --------- ^ borrowed value does not live long enough @@ -240,14 +240,14 @@ LL | let f = |t: bool| if t { x } else { y }; // (separate errors fo LL | } | - `y` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the method body at 156:14... - --> $DIR/region-borrow-params-issue-29793-small.rs:156:14 +note: borrowed value must be valid for the lifetime 'a as defined on the method body at 146:14... + --> $DIR/region-borrow-params-issue-29793-small.rs:146:14 | LL | fn g<'a>(&self, x: usize, y:usize) -> Box usize + 'a> { | ^^ error[E0597]: `x` does not live long enough - --> $DIR/region-borrow-params-issue-29793-small.rs:185:38 + --> $DIR/region-borrow-params-issue-29793-small.rs:175:38 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | --------- ^ borrowed value does not live long enough @@ -257,14 +257,14 @@ LL | let f = |t: bool| if t { x } else { y }; // (separate errors fo LL | } | - `x` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the method body at 184:14... - --> $DIR/region-borrow-params-issue-29793-small.rs:184:14 +note: borrowed value must be valid for the lifetime 'a as defined on the method body at 174:14... + --> $DIR/region-borrow-params-issue-29793-small.rs:174:14 | LL | fn g<'a>(&self, x: usize, y:usize) -> Box usize + 'a> { | ^^ error[E0597]: `y` does not live long enough - --> $DIR/region-borrow-params-issue-29793-small.rs:185:49 + --> $DIR/region-borrow-params-issue-29793-small.rs:175:49 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | --------- ^ borrowed value does not live long enough @@ -274,14 +274,14 @@ LL | let f = |t: bool| if t { x } else { y }; // (separate errors fo LL | } | - `y` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the method body at 184:14... - --> $DIR/region-borrow-params-issue-29793-small.rs:184:14 +note: borrowed value must be valid for the lifetime 'a as defined on the method body at 174:14... + --> $DIR/region-borrow-params-issue-29793-small.rs:174:14 | LL | fn g<'a>(&self, x: usize, y:usize) -> Box usize + 'a> { | ^^ error[E0597]: `x` does not live long enough - --> $DIR/region-borrow-params-issue-29793-small.rs:199:38 + --> $DIR/region-borrow-params-issue-29793-small.rs:189:38 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | --------- ^ borrowed value does not live long enough @@ -291,14 +291,14 @@ LL | let f = |t: bool| if t { x } else { y }; // (separate errors fo LL | } | - `x` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the method body at 198:14... - --> $DIR/region-borrow-params-issue-29793-small.rs:198:14 +note: borrowed value must be valid for the lifetime 'a as defined on the method body at 188:14... + --> $DIR/region-borrow-params-issue-29793-small.rs:188:14 | LL | fn g<'a>(&self, x: usize, y:usize) -> Box usize + 'a> { | ^^ error[E0597]: `y` does not live long enough - --> $DIR/region-borrow-params-issue-29793-small.rs:199:49 + --> $DIR/region-borrow-params-issue-29793-small.rs:189:49 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | --------- ^ borrowed value does not live long enough @@ -308,8 +308,8 @@ LL | let f = |t: bool| if t { x } else { y }; // (separate errors fo LL | } | - `y` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the method body at 198:14... - --> $DIR/region-borrow-params-issue-29793-small.rs:198:14 +note: borrowed value must be valid for the lifetime 'a as defined on the method body at 188:14... + --> $DIR/region-borrow-params-issue-29793-small.rs:188:14 | LL | fn g<'a>(&self, x: usize, y:usize) -> Box usize + 'a> { | ^^ diff --git a/src/test/ui/regions/region-borrow-params-issue-29793-small.rs b/src/test/ui/regions/region-borrow-params-issue-29793-small.rs index 4fda8ec3f384e..08ed79cbdbf3c 100644 --- a/src/test/ui/regions/region-borrow-params-issue-29793-small.rs +++ b/src/test/ui/regions/region-borrow-params-issue-29793-small.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #29793, small regression tests: do not let borrows of // parameters to ever be returned (expanded with exploration of // variations). diff --git a/src/test/ui/regions/region-borrow-params-issue-29793-small.stderr b/src/test/ui/regions/region-borrow-params-issue-29793-small.stderr index cfe38fe20040c..d6ad68fe94e1e 100644 --- a/src/test/ui/regions/region-borrow-params-issue-29793-small.stderr +++ b/src/test/ui/regions/region-borrow-params-issue-29793-small.stderr @@ -1,5 +1,5 @@ error[E0597]: `x` does not live long enough - --> $DIR/region-borrow-params-issue-29793-small.rs:19:34 + --> $DIR/region-borrow-params-issue-29793-small.rs:9:34 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | --------- ^ borrowed value does not live long enough @@ -12,7 +12,7 @@ LL | }; = note: values in a scope are dropped in the opposite order they are created error[E0597]: `y` does not live long enough - --> $DIR/region-borrow-params-issue-29793-small.rs:19:45 + --> $DIR/region-borrow-params-issue-29793-small.rs:9:45 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | --------- ^ borrowed value does not live long enough @@ -25,7 +25,7 @@ LL | }; = note: values in a scope are dropped in the opposite order they are created error[E0597]: `x` does not live long enough - --> $DIR/region-borrow-params-issue-29793-small.rs:34:34 + --> $DIR/region-borrow-params-issue-29793-small.rs:24:34 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | --------- ^ borrowed value does not live long enough @@ -38,7 +38,7 @@ LL | }; = note: values in a scope are dropped in the opposite order they are created error[E0597]: `y` does not live long enough - --> $DIR/region-borrow-params-issue-29793-small.rs:34:45 + --> $DIR/region-borrow-params-issue-29793-small.rs:24:45 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | --------- ^ borrowed value does not live long enough @@ -51,7 +51,7 @@ LL | }; = note: values in a scope are dropped in the opposite order they are created error[E0373]: closure may outlive the current function, but it borrows `x`, which is owned by the current function - --> $DIR/region-borrow-params-issue-29793-small.rs:65:17 + --> $DIR/region-borrow-params-issue-29793-small.rs:55:17 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | ^^^^^^^^^ - `x` is borrowed here @@ -63,7 +63,7 @@ LL | let f = move |t: bool| if t { x } else { y }; // (separate errors f | ^^^^^^^^^^^^^^ error[E0373]: closure may outlive the current function, but it borrows `y`, which is owned by the current function - --> $DIR/region-borrow-params-issue-29793-small.rs:65:17 + --> $DIR/region-borrow-params-issue-29793-small.rs:55:17 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | ^^^^^^^^^ - `y` is borrowed here @@ -75,7 +75,7 @@ LL | let f = move |t: bool| if t { x } else { y }; // (separate errors f | ^^^^^^^^^^^^^^ error[E0373]: closure may outlive the current function, but it borrows `x`, which is owned by the current function - --> $DIR/region-borrow-params-issue-29793-small.rs:76:17 + --> $DIR/region-borrow-params-issue-29793-small.rs:66:17 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | ^^^^^^^^^ - `x` is borrowed here @@ -87,7 +87,7 @@ LL | let f = move |t: bool| if t { x } else { y }; // (separate errors f | ^^^^^^^^^^^^^^ error[E0373]: closure may outlive the current function, but it borrows `y`, which is owned by the current function - --> $DIR/region-borrow-params-issue-29793-small.rs:76:17 + --> $DIR/region-borrow-params-issue-29793-small.rs:66:17 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | ^^^^^^^^^ - `y` is borrowed here @@ -99,7 +99,7 @@ LL | let f = move |t: bool| if t { x } else { y }; // (separate errors f | ^^^^^^^^^^^^^^ error[E0373]: closure may outlive the current function, but it borrows `x`, which is owned by the current function - --> $DIR/region-borrow-params-issue-29793-small.rs:100:21 + --> $DIR/region-borrow-params-issue-29793-small.rs:90:21 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | ^^^^^^^^^ - `x` is borrowed here @@ -111,7 +111,7 @@ LL | let f = move |t: bool| if t { x } else { y }; // (separate erro | ^^^^^^^^^^^^^^ error[E0373]: closure may outlive the current function, but it borrows `y`, which is owned by the current function - --> $DIR/region-borrow-params-issue-29793-small.rs:100:21 + --> $DIR/region-borrow-params-issue-29793-small.rs:90:21 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | ^^^^^^^^^ - `y` is borrowed here @@ -123,7 +123,7 @@ LL | let f = move |t: bool| if t { x } else { y }; // (separate erro | ^^^^^^^^^^^^^^ error[E0373]: closure may outlive the current function, but it borrows `x`, which is owned by the current function - --> $DIR/region-borrow-params-issue-29793-small.rs:114:21 + --> $DIR/region-borrow-params-issue-29793-small.rs:104:21 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | ^^^^^^^^^ - `x` is borrowed here @@ -135,7 +135,7 @@ LL | let f = move |t: bool| if t { x } else { y }; // (separate erro | ^^^^^^^^^^^^^^ error[E0373]: closure may outlive the current function, but it borrows `y`, which is owned by the current function - --> $DIR/region-borrow-params-issue-29793-small.rs:114:21 + --> $DIR/region-borrow-params-issue-29793-small.rs:104:21 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | ^^^^^^^^^ - `y` is borrowed here @@ -147,7 +147,7 @@ LL | let f = move |t: bool| if t { x } else { y }; // (separate erro | ^^^^^^^^^^^^^^ error[E0373]: closure may outlive the current function, but it borrows `x`, which is owned by the current function - --> $DIR/region-borrow-params-issue-29793-small.rs:142:21 + --> $DIR/region-borrow-params-issue-29793-small.rs:132:21 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | ^^^^^^^^^ - `x` is borrowed here @@ -159,7 +159,7 @@ LL | let f = move |t: bool| if t { x } else { y }; // (separate erro | ^^^^^^^^^^^^^^ error[E0373]: closure may outlive the current function, but it borrows `y`, which is owned by the current function - --> $DIR/region-borrow-params-issue-29793-small.rs:142:21 + --> $DIR/region-borrow-params-issue-29793-small.rs:132:21 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | ^^^^^^^^^ - `y` is borrowed here @@ -171,7 +171,7 @@ LL | let f = move |t: bool| if t { x } else { y }; // (separate erro | ^^^^^^^^^^^^^^ error[E0373]: closure may outlive the current function, but it borrows `x`, which is owned by the current function - --> $DIR/region-borrow-params-issue-29793-small.rs:157:21 + --> $DIR/region-borrow-params-issue-29793-small.rs:147:21 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | ^^^^^^^^^ - `x` is borrowed here @@ -183,7 +183,7 @@ LL | let f = move |t: bool| if t { x } else { y }; // (separate erro | ^^^^^^^^^^^^^^ error[E0373]: closure may outlive the current function, but it borrows `y`, which is owned by the current function - --> $DIR/region-borrow-params-issue-29793-small.rs:157:21 + --> $DIR/region-borrow-params-issue-29793-small.rs:147:21 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | ^^^^^^^^^ - `y` is borrowed here @@ -195,7 +195,7 @@ LL | let f = move |t: bool| if t { x } else { y }; // (separate erro | ^^^^^^^^^^^^^^ error[E0373]: closure may outlive the current function, but it borrows `x`, which is owned by the current function - --> $DIR/region-borrow-params-issue-29793-small.rs:185:21 + --> $DIR/region-borrow-params-issue-29793-small.rs:175:21 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | ^^^^^^^^^ - `x` is borrowed here @@ -207,7 +207,7 @@ LL | let f = move |t: bool| if t { x } else { y }; // (separate erro | ^^^^^^^^^^^^^^ error[E0373]: closure may outlive the current function, but it borrows `y`, which is owned by the current function - --> $DIR/region-borrow-params-issue-29793-small.rs:185:21 + --> $DIR/region-borrow-params-issue-29793-small.rs:175:21 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | ^^^^^^^^^ - `y` is borrowed here @@ -219,7 +219,7 @@ LL | let f = move |t: bool| if t { x } else { y }; // (separate erro | ^^^^^^^^^^^^^^ error[E0373]: closure may outlive the current function, but it borrows `x`, which is owned by the current function - --> $DIR/region-borrow-params-issue-29793-small.rs:199:21 + --> $DIR/region-borrow-params-issue-29793-small.rs:189:21 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | ^^^^^^^^^ - `x` is borrowed here @@ -231,7 +231,7 @@ LL | let f = move |t: bool| if t { x } else { y }; // (separate erro | ^^^^^^^^^^^^^^ error[E0373]: closure may outlive the current function, but it borrows `y`, which is owned by the current function - --> $DIR/region-borrow-params-issue-29793-small.rs:199:21 + --> $DIR/region-borrow-params-issue-29793-small.rs:189:21 | LL | let f = |t: bool| if t { x } else { y }; // (separate errors for `x` vs `y`) | ^^^^^^^^^ - `y` is borrowed here diff --git a/src/test/ui/regions/region-bound-extra-bound-in-inherent-impl.rs b/src/test/ui/regions/region-bound-extra-bound-in-inherent-impl.rs index c1df057b39609..ac189eecbea69 100644 --- a/src/test/ui/regions/region-bound-extra-bound-in-inherent-impl.rs +++ b/src/test/ui/regions/region-bound-extra-bound-in-inherent-impl.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test related to #22779. In this case, the impl is an inherent impl, // so it doesn't have to match any trait, so no error results. diff --git a/src/test/ui/regions/region-bound-extra-bound-in-inherent-impl.stderr b/src/test/ui/regions/region-bound-extra-bound-in-inherent-impl.stderr index 585ccf465d8f4..65855dc9b287a 100644 --- a/src/test/ui/regions/region-bound-extra-bound-in-inherent-impl.stderr +++ b/src/test/ui/regions/region-bound-extra-bound-in-inherent-impl.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/region-bound-extra-bound-in-inherent-impl.rs:26:1 + --> $DIR/region-bound-extra-bound-in-inherent-impl.rs:16:1 | LL | fn main() { } //~ ERROR compilation successful | ^^^^^^^^^^^^^ diff --git a/src/test/ui/regions/region-bound-on-closure-outlives-call.nll.stderr b/src/test/ui/regions/region-bound-on-closure-outlives-call.nll.stderr index da6ebaaefadf1..5e249d4887fec 100644 --- a/src/test/ui/regions/region-bound-on-closure-outlives-call.nll.stderr +++ b/src/test/ui/regions/region-bound-on-closure-outlives-call.nll.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `f` because it is borrowed - --> $DIR/region-bound-on-closure-outlives-call.rs:12:25 + --> $DIR/region-bound-on-closure-outlives-call.rs:2:25 | LL | (|x| f(x))(call_rec(f)) //~ ERROR cannot move out of `f` | --------------------^-- diff --git a/src/test/ui/regions/region-bound-on-closure-outlives-call.rs b/src/test/ui/regions/region-bound-on-closure-outlives-call.rs index b73c283fa515e..0aaddcf1d04cd 100644 --- a/src/test/ui/regions/region-bound-on-closure-outlives-call.rs +++ b/src/test/ui/regions/region-bound-on-closure-outlives-call.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn call_rec(mut f: F) -> usize where F: FnMut(usize) -> usize { (|x| f(x))(call_rec(f)) //~ ERROR cannot move out of `f` } diff --git a/src/test/ui/regions/region-bound-on-closure-outlives-call.stderr b/src/test/ui/regions/region-bound-on-closure-outlives-call.stderr index 7adf68ee9b6d1..e2be994991308 100644 --- a/src/test/ui/regions/region-bound-on-closure-outlives-call.stderr +++ b/src/test/ui/regions/region-bound-on-closure-outlives-call.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `f` because it is borrowed - --> $DIR/region-bound-on-closure-outlives-call.rs:12:25 + --> $DIR/region-bound-on-closure-outlives-call.rs:2:25 | LL | (|x| f(x))(call_rec(f)) //~ ERROR cannot move out of `f` | --- ^ move out of `f` occurs here diff --git a/src/test/ui/regions/region-bound-same-bounds-in-trait-and-impl.rs b/src/test/ui/regions/region-bound-same-bounds-in-trait-and-impl.rs index 3115e5a9a4376..c45ec801630fa 100644 --- a/src/test/ui/regions/region-bound-same-bounds-in-trait-and-impl.rs +++ b/src/test/ui/regions/region-bound-same-bounds-in-trait-and-impl.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test related to #22779, but where the `'a:'b` relation // appears in the trait too. No error here. diff --git a/src/test/ui/regions/region-bound-same-bounds-in-trait-and-impl.stderr b/src/test/ui/regions/region-bound-same-bounds-in-trait-and-impl.stderr index ce9dd59bbf525..69908e069795d 100644 --- a/src/test/ui/regions/region-bound-same-bounds-in-trait-and-impl.stderr +++ b/src/test/ui/regions/region-bound-same-bounds-in-trait-and-impl.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/region-bound-same-bounds-in-trait-and-impl.rs:27:1 + --> $DIR/region-bound-same-bounds-in-trait-and-impl.rs:17:1 | LL | fn main() { } //~ ERROR compilation successful | ^^^^^^^^^^^^^ diff --git a/src/test/ui/regions/region-bounds-on-objects-and-type-parameters.rs b/src/test/ui/regions/region-bounds-on-objects-and-type-parameters.rs index fd8d5ff9e7ea8..3a211b0463605 100644 --- a/src/test/ui/regions/region-bounds-on-objects-and-type-parameters.rs +++ b/src/test/ui/regions/region-bounds-on-objects-and-type-parameters.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test related to when a region bound is required to be specified. trait IsStatic : 'static { } diff --git a/src/test/ui/regions/region-bounds-on-objects-and-type-parameters.stderr b/src/test/ui/regions/region-bounds-on-objects-and-type-parameters.stderr index 7d1a836c67455..16c31fbcac0ff 100644 --- a/src/test/ui/regions/region-bounds-on-objects-and-type-parameters.stderr +++ b/src/test/ui/regions/region-bounds-on-objects-and-type-parameters.stderr @@ -1,28 +1,28 @@ error[E0226]: only a single explicit lifetime bound is permitted - --> $DIR/region-bounds-on-objects-and-type-parameters.rs:31:22 + --> $DIR/region-bounds-on-objects-and-type-parameters.rs:21:22 | LL | z: Box+'b+'c>, | ^^ error[E0478]: lifetime bound not satisfied - --> $DIR/region-bounds-on-objects-and-type-parameters.rs:31:5 + --> $DIR/region-bounds-on-objects-and-type-parameters.rs:21:5 | LL | z: Box+'b+'c>, | ^^^^^^^^^^^^^^^^^^^^ | -note: lifetime parameter instantiated with the lifetime 'b as defined on the struct at 21:15 - --> $DIR/region-bounds-on-objects-and-type-parameters.rs:21:15 +note: lifetime parameter instantiated with the lifetime 'b as defined on the struct at 11:15 + --> $DIR/region-bounds-on-objects-and-type-parameters.rs:11:15 | LL | struct Foo<'a,'b,'c> { //~ ERROR parameter `'c` is never used | ^^ -note: but lifetime parameter must outlive the lifetime 'a as defined on the struct at 21:12 - --> $DIR/region-bounds-on-objects-and-type-parameters.rs:21:12 +note: but lifetime parameter must outlive the lifetime 'a as defined on the struct at 11:12 + --> $DIR/region-bounds-on-objects-and-type-parameters.rs:11:12 | LL | struct Foo<'a,'b,'c> { //~ ERROR parameter `'c` is never used | ^^ error[E0392]: parameter `'c` is never used - --> $DIR/region-bounds-on-objects-and-type-parameters.rs:21:18 + --> $DIR/region-bounds-on-objects-and-type-parameters.rs:11:18 | LL | struct Foo<'a,'b,'c> { //~ ERROR parameter `'c` is never used | ^^ unused type parameter diff --git a/src/test/ui/regions/region-invariant-static-error-reporting.nll.stderr b/src/test/ui/regions/region-invariant-static-error-reporting.nll.stderr index 9fc12ae05b44f..1cb7bbd78a6ed 100644 --- a/src/test/ui/regions/region-invariant-static-error-reporting.nll.stderr +++ b/src/test/ui/regions/region-invariant-static-error-reporting.nll.stderr @@ -1,5 +1,5 @@ warning: not reporting region error due to nll - --> $DIR/region-invariant-static-error-reporting.rs:24:15 + --> $DIR/region-invariant-static-error-reporting.rs:14:15 | LL | let bad = if x.is_some() { | _______________^ @@ -10,7 +10,7 @@ LL | | }; | |_____^ error: borrowed data escapes outside of function - --> $DIR/region-invariant-static-error-reporting.rs:25:9 + --> $DIR/region-invariant-static-error-reporting.rs:15:9 | LL | fn unify<'a>(x: Option>, f: fn(Invariant<'a>)) { | - `x` is a reference that is only valid in the function body diff --git a/src/test/ui/regions/region-invariant-static-error-reporting.rs b/src/test/ui/regions/region-invariant-static-error-reporting.rs index 646ae8183a20c..df92ed51e9a91 100644 --- a/src/test/ui/regions/region-invariant-static-error-reporting.rs +++ b/src/test/ui/regions/region-invariant-static-error-reporting.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test checks that the error messages you get for this example // at least mention `'a` and `'static`. The precise messages can drift // over time, but this test used to exhibit some pretty bogus messages diff --git a/src/test/ui/regions/region-invariant-static-error-reporting.stderr b/src/test/ui/regions/region-invariant-static-error-reporting.stderr index a1f65561d3e3c..40a3e7e96486b 100644 --- a/src/test/ui/regions/region-invariant-static-error-reporting.stderr +++ b/src/test/ui/regions/region-invariant-static-error-reporting.stderr @@ -1,5 +1,5 @@ error[E0308]: if and else have incompatible types - --> $DIR/region-invariant-static-error-reporting.rs:24:15 + --> $DIR/region-invariant-static-error-reporting.rs:14:15 | LL | let bad = if x.is_some() { | _______________^ @@ -11,8 +11,8 @@ LL | | }; | = note: expected type `Invariant<'a>` found type `Invariant<'static>` -note: the lifetime 'a as defined on the function body at 23:10... - --> $DIR/region-invariant-static-error-reporting.rs:23:10 +note: the lifetime 'a as defined on the function body at 13:10... + --> $DIR/region-invariant-static-error-reporting.rs:13:10 | LL | fn unify<'a>(x: Option>, f: fn(Invariant<'a>)) { | ^^ diff --git a/src/test/ui/regions/region-lifetime-bounds-on-fns-where-clause.nll.stderr b/src/test/ui/regions/region-lifetime-bounds-on-fns-where-clause.nll.stderr index 9124347831344..a76ed280a6bba 100644 --- a/src/test/ui/regions/region-lifetime-bounds-on-fns-where-clause.nll.stderr +++ b/src/test/ui/regions/region-lifetime-bounds-on-fns-where-clause.nll.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/region-lifetime-bounds-on-fns-where-clause.rs:18:10 + --> $DIR/region-lifetime-bounds-on-fns-where-clause.rs:8:10 | LL | *x = *y; //~ ERROR E0623 | ^^ warning: not reporting region error due to nll - --> $DIR/region-lifetime-bounds-on-fns-where-clause.rs:24:5 + --> $DIR/region-lifetime-bounds-on-fns-where-clause.rs:14:5 | LL | a(x, y); //~ ERROR 24:7: 24:8: lifetime mismatch [E0623] | ^ error[E0308]: mismatched types - --> $DIR/region-lifetime-bounds-on-fns-where-clause.rs:30:43 + --> $DIR/region-lifetime-bounds-on-fns-where-clause.rs:20:43 | LL | let _: fn(&mut &isize, &mut &isize) = a; //~ ERROR mismatched types | ^ expected concrete lifetime, found bound lifetime parameter diff --git a/src/test/ui/regions/region-lifetime-bounds-on-fns-where-clause.rs b/src/test/ui/regions/region-lifetime-bounds-on-fns-where-clause.rs index e3d96f52e817b..303e9dfee2622 100644 --- a/src/test/ui/regions/region-lifetime-bounds-on-fns-where-clause.rs +++ b/src/test/ui/regions/region-lifetime-bounds-on-fns-where-clause.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn a<'a, 'b>(x: &mut &'a isize, y: &mut &'b isize) where 'b: 'a { // Note: this is legal because of the `'b:'a` declaration. *x = *y; diff --git a/src/test/ui/regions/region-lifetime-bounds-on-fns-where-clause.stderr b/src/test/ui/regions/region-lifetime-bounds-on-fns-where-clause.stderr index 0ca7ee8d8a560..db43c277d02b9 100644 --- a/src/test/ui/regions/region-lifetime-bounds-on-fns-where-clause.stderr +++ b/src/test/ui/regions/region-lifetime-bounds-on-fns-where-clause.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/region-lifetime-bounds-on-fns-where-clause.rs:18:10 + --> $DIR/region-lifetime-bounds-on-fns-where-clause.rs:8:10 | LL | fn b<'a, 'b>(x: &mut &'a isize, y: &mut &'b isize) { | --------- --------- these two types are declared with different lifetimes... @@ -8,7 +8,7 @@ LL | *x = *y; //~ ERROR E0623 | ^^ ...but data from `y` flows into `x` here error[E0623]: lifetime mismatch - --> $DIR/region-lifetime-bounds-on-fns-where-clause.rs:24:7 + --> $DIR/region-lifetime-bounds-on-fns-where-clause.rs:14:7 | LL | fn c<'a,'b>(x: &mut &'a isize, y: &mut &'b isize) { | --------- --------- these two types are declared with different lifetimes... @@ -17,7 +17,7 @@ LL | a(x, y); //~ ERROR 24:7: 24:8: lifetime mismatch [E0623] | ^ ...but data from `y` flows into `x` here error[E0308]: mismatched types - --> $DIR/region-lifetime-bounds-on-fns-where-clause.rs:30:43 + --> $DIR/region-lifetime-bounds-on-fns-where-clause.rs:20:43 | LL | let _: fn(&mut &isize, &mut &isize) = a; //~ ERROR mismatched types | ^ expected concrete lifetime, found bound lifetime parameter diff --git a/src/test/ui/regions/region-multiple-lifetime-bounds-on-fns-where-clause.nll.stderr b/src/test/ui/regions/region-multiple-lifetime-bounds-on-fns-where-clause.nll.stderr index 655b199fc65a8..362e00f4c0db3 100644 --- a/src/test/ui/regions/region-multiple-lifetime-bounds-on-fns-where-clause.nll.stderr +++ b/src/test/ui/regions/region-multiple-lifetime-bounds-on-fns-where-clause.nll.stderr @@ -1,23 +1,23 @@ warning: not reporting region error due to nll - --> $DIR/region-multiple-lifetime-bounds-on-fns-where-clause.rs:19:10 + --> $DIR/region-multiple-lifetime-bounds-on-fns-where-clause.rs:9:10 | LL | *x = *y; //~ ERROR E0623 | ^^ warning: not reporting region error due to nll - --> $DIR/region-multiple-lifetime-bounds-on-fns-where-clause.rs:20:10 + --> $DIR/region-multiple-lifetime-bounds-on-fns-where-clause.rs:10:10 | LL | *z = *y; //~ ERROR E0623 | ^^ warning: not reporting region error due to nll - --> $DIR/region-multiple-lifetime-bounds-on-fns-where-clause.rs:26:5 + --> $DIR/region-multiple-lifetime-bounds-on-fns-where-clause.rs:16:5 | LL | a(x, y, z); //~ ERROR 26:7: 26:8: lifetime mismatch [E0623] | ^ error[E0308]: mismatched types - --> $DIR/region-multiple-lifetime-bounds-on-fns-where-clause.rs:32:56 + --> $DIR/region-multiple-lifetime-bounds-on-fns-where-clause.rs:22:56 | LL | let _: fn(&mut &isize, &mut &isize, &mut &isize) = a; //~ ERROR mismatched types | ^ expected concrete lifetime, found bound lifetime parameter diff --git a/src/test/ui/regions/region-multiple-lifetime-bounds-on-fns-where-clause.rs b/src/test/ui/regions/region-multiple-lifetime-bounds-on-fns-where-clause.rs index d8d12444dddb3..5bdf27749157a 100644 --- a/src/test/ui/regions/region-multiple-lifetime-bounds-on-fns-where-clause.rs +++ b/src/test/ui/regions/region-multiple-lifetime-bounds-on-fns-where-clause.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn a<'a, 'b, 'c>(x: &mut &'a isize, y: &mut &'b isize, z: &mut &'c isize) where 'b: 'a + 'c { // Note: this is legal because of the `'b:'a` declaration. *x = *y; diff --git a/src/test/ui/regions/region-multiple-lifetime-bounds-on-fns-where-clause.stderr b/src/test/ui/regions/region-multiple-lifetime-bounds-on-fns-where-clause.stderr index 26e24b2ed1626..c806c959a01ca 100644 --- a/src/test/ui/regions/region-multiple-lifetime-bounds-on-fns-where-clause.stderr +++ b/src/test/ui/regions/region-multiple-lifetime-bounds-on-fns-where-clause.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/region-multiple-lifetime-bounds-on-fns-where-clause.rs:19:10 + --> $DIR/region-multiple-lifetime-bounds-on-fns-where-clause.rs:9:10 | LL | fn b<'a, 'b, 'c>(x: &mut &'a isize, y: &mut &'b isize, z: &mut &'c isize) { | --------- --------- these two types are declared with different lifetimes... @@ -8,7 +8,7 @@ LL | *x = *y; //~ ERROR E0623 | ^^ ...but data from `y` flows into `x` here error[E0623]: lifetime mismatch - --> $DIR/region-multiple-lifetime-bounds-on-fns-where-clause.rs:20:10 + --> $DIR/region-multiple-lifetime-bounds-on-fns-where-clause.rs:10:10 | LL | fn b<'a, 'b, 'c>(x: &mut &'a isize, y: &mut &'b isize, z: &mut &'c isize) { | --------- --------- @@ -19,7 +19,7 @@ LL | *z = *y; //~ ERROR E0623 | ^^ ...but data from `y` flows into `z` here error[E0623]: lifetime mismatch - --> $DIR/region-multiple-lifetime-bounds-on-fns-where-clause.rs:26:7 + --> $DIR/region-multiple-lifetime-bounds-on-fns-where-clause.rs:16:7 | LL | fn c<'a,'b, 'c>(x: &mut &'a isize, y: &mut &'b isize, z: &mut &'c isize) { | --------- --------- these two types are declared with different lifetimes... @@ -28,7 +28,7 @@ LL | a(x, y, z); //~ ERROR 26:7: 26:8: lifetime mismatch [E0623] | ^ ...but data from `y` flows into `x` here error[E0308]: mismatched types - --> $DIR/region-multiple-lifetime-bounds-on-fns-where-clause.rs:32:56 + --> $DIR/region-multiple-lifetime-bounds-on-fns-where-clause.rs:22:56 | LL | let _: fn(&mut &isize, &mut &isize, &mut &isize) = a; //~ ERROR mismatched types | ^ expected concrete lifetime, found bound lifetime parameter diff --git a/src/test/ui/regions/region-object-lifetime-1.rs b/src/test/ui/regions/region-object-lifetime-1.rs index 1e615be9d6acc..a51ee88abb3b0 100644 --- a/src/test/ui/regions/region-object-lifetime-1.rs +++ b/src/test/ui/regions/region-object-lifetime-1.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Various tests related to testing how region inference works // with respect to the object receivers. diff --git a/src/test/ui/regions/region-object-lifetime-1.stderr b/src/test/ui/regions/region-object-lifetime-1.stderr index 39deed32c7659..000c67a928b91 100644 --- a/src/test/ui/regions/region-object-lifetime-1.stderr +++ b/src/test/ui/regions/region-object-lifetime-1.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/region-object-lifetime-1.rs:28:1 + --> $DIR/region-object-lifetime-1.rs:18:1 | LL | fn main() {} //~ ERROR compilation successful | ^^^^^^^^^^^^ diff --git a/src/test/ui/regions/region-object-lifetime-2.nll.stderr b/src/test/ui/regions/region-object-lifetime-2.nll.stderr index 135a115cecfa5..b7442946bffed 100644 --- a/src/test/ui/regions/region-object-lifetime-2.nll.stderr +++ b/src/test/ui/regions/region-object-lifetime-2.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/region-object-lifetime-2.rs:20:7 + --> $DIR/region-object-lifetime-2.rs:10:7 | LL | x.borrowed() //~ ERROR cannot infer | ^^^^^^^^ error: unsatisfied lifetime constraints - --> $DIR/region-object-lifetime-2.rs:20:5 + --> $DIR/region-object-lifetime-2.rs:10:5 | LL | fn borrowed_receiver_different_lifetimes<'a,'b>(x: &'a Foo) -> &'b () { | -- -- lifetime `'b` defined here diff --git a/src/test/ui/regions/region-object-lifetime-2.rs b/src/test/ui/regions/region-object-lifetime-2.rs index e011b8f56972b..92c85020e9a85 100644 --- a/src/test/ui/regions/region-object-lifetime-2.rs +++ b/src/test/ui/regions/region-object-lifetime-2.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Various tests related to testing how region inference works // with respect to the object receivers. diff --git a/src/test/ui/regions/region-object-lifetime-2.stderr b/src/test/ui/regions/region-object-lifetime-2.stderr index e396680f99b4b..cb3f7863c3bc5 100644 --- a/src/test/ui/regions/region-object-lifetime-2.stderr +++ b/src/test/ui/regions/region-object-lifetime-2.stderr @@ -1,26 +1,26 @@ error[E0495]: cannot infer an appropriate lifetime for autoref due to conflicting requirements - --> $DIR/region-object-lifetime-2.rs:20:7 + --> $DIR/region-object-lifetime-2.rs:10:7 | LL | x.borrowed() //~ ERROR cannot infer | ^^^^^^^^ | -note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 19:42... - --> $DIR/region-object-lifetime-2.rs:19:42 +note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 9:42... + --> $DIR/region-object-lifetime-2.rs:9:42 | LL | fn borrowed_receiver_different_lifetimes<'a,'b>(x: &'a Foo) -> &'b () { | ^^ note: ...so that the type `(dyn Foo + 'a)` is not borrowed for too long - --> $DIR/region-object-lifetime-2.rs:20:5 + --> $DIR/region-object-lifetime-2.rs:10:5 | LL | x.borrowed() //~ ERROR cannot infer | ^ -note: but, the lifetime must be valid for the lifetime 'b as defined on the function body at 19:45... - --> $DIR/region-object-lifetime-2.rs:19:45 +note: but, the lifetime must be valid for the lifetime 'b as defined on the function body at 9:45... + --> $DIR/region-object-lifetime-2.rs:9:45 | LL | fn borrowed_receiver_different_lifetimes<'a,'b>(x: &'a Foo) -> &'b () { | ^^ note: ...so that reference does not outlive borrowed content - --> $DIR/region-object-lifetime-2.rs:20:5 + --> $DIR/region-object-lifetime-2.rs:10:5 | LL | x.borrowed() //~ ERROR cannot infer | ^^^^^^^^^^^^ diff --git a/src/test/ui/regions/region-object-lifetime-3.rs b/src/test/ui/regions/region-object-lifetime-3.rs index 84dd97643a107..9f5be1cc67f40 100644 --- a/src/test/ui/regions/region-object-lifetime-3.rs +++ b/src/test/ui/regions/region-object-lifetime-3.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Various tests related to testing how region inference works // with respect to the object receivers. diff --git a/src/test/ui/regions/region-object-lifetime-3.stderr b/src/test/ui/regions/region-object-lifetime-3.stderr index 9431e8f529139..3332cd21a740a 100644 --- a/src/test/ui/regions/region-object-lifetime-3.stderr +++ b/src/test/ui/regions/region-object-lifetime-3.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/region-object-lifetime-3.rs:28:1 + --> $DIR/region-object-lifetime-3.rs:18:1 | LL | fn main() {} //~ ERROR compilation successful | ^^^^^^^^^^^^ diff --git a/src/test/ui/regions/region-object-lifetime-4.nll.stderr b/src/test/ui/regions/region-object-lifetime-4.nll.stderr index 7bae6ccb37c92..cf2b2de0ae4a3 100644 --- a/src/test/ui/regions/region-object-lifetime-4.nll.stderr +++ b/src/test/ui/regions/region-object-lifetime-4.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/region-object-lifetime-4.rs:22:7 + --> $DIR/region-object-lifetime-4.rs:12:7 | LL | x.borrowed() //~ ERROR cannot infer | ^^^^^^^^ error: unsatisfied lifetime constraints - --> $DIR/region-object-lifetime-4.rs:22:5 + --> $DIR/region-object-lifetime-4.rs:12:5 | LL | fn borrowed_receiver_related_lifetimes2<'a,'b>(x: &'a (Foo+'b)) -> &'b () { | -- -- lifetime `'b` defined here diff --git a/src/test/ui/regions/region-object-lifetime-4.rs b/src/test/ui/regions/region-object-lifetime-4.rs index 0a68e7f1076ca..d2ab617ebb764 100644 --- a/src/test/ui/regions/region-object-lifetime-4.rs +++ b/src/test/ui/regions/region-object-lifetime-4.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Various tests related to testing how region inference works // with respect to the object receivers. diff --git a/src/test/ui/regions/region-object-lifetime-4.stderr b/src/test/ui/regions/region-object-lifetime-4.stderr index ef62afbef3bd6..862a469ddb98c 100644 --- a/src/test/ui/regions/region-object-lifetime-4.stderr +++ b/src/test/ui/regions/region-object-lifetime-4.stderr @@ -1,26 +1,26 @@ error[E0495]: cannot infer an appropriate lifetime for autoref due to conflicting requirements - --> $DIR/region-object-lifetime-4.rs:22:7 + --> $DIR/region-object-lifetime-4.rs:12:7 | LL | x.borrowed() //~ ERROR cannot infer | ^^^^^^^^ | -note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 21:41... - --> $DIR/region-object-lifetime-4.rs:21:41 +note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 11:41... + --> $DIR/region-object-lifetime-4.rs:11:41 | LL | fn borrowed_receiver_related_lifetimes2<'a,'b>(x: &'a (Foo+'b)) -> &'b () { | ^^ note: ...so that reference does not outlive borrowed content - --> $DIR/region-object-lifetime-4.rs:22:5 + --> $DIR/region-object-lifetime-4.rs:12:5 | LL | x.borrowed() //~ ERROR cannot infer | ^ -note: but, the lifetime must be valid for the lifetime 'b as defined on the function body at 21:44... - --> $DIR/region-object-lifetime-4.rs:21:44 +note: but, the lifetime must be valid for the lifetime 'b as defined on the function body at 11:44... + --> $DIR/region-object-lifetime-4.rs:11:44 | LL | fn borrowed_receiver_related_lifetimes2<'a,'b>(x: &'a (Foo+'b)) -> &'b () { | ^^ note: ...so that reference does not outlive borrowed content - --> $DIR/region-object-lifetime-4.rs:22:5 + --> $DIR/region-object-lifetime-4.rs:12:5 | LL | x.borrowed() //~ ERROR cannot infer | ^^^^^^^^^^^^ diff --git a/src/test/ui/regions/region-object-lifetime-5.nll.stderr b/src/test/ui/regions/region-object-lifetime-5.nll.stderr index 3bfa5ec3941a2..0b2a27ee1fb1c 100644 --- a/src/test/ui/regions/region-object-lifetime-5.nll.stderr +++ b/src/test/ui/regions/region-object-lifetime-5.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `*x` does not live long enough - --> $DIR/region-object-lifetime-5.rs:21:5 + --> $DIR/region-object-lifetime-5.rs:11:5 | LL | x.borrowed() //~ ERROR `*x` does not live long enough | ^ borrowed value does not live long enough diff --git a/src/test/ui/regions/region-object-lifetime-5.rs b/src/test/ui/regions/region-object-lifetime-5.rs index 26aad0e33b1b4..5009b2bbf32f6 100644 --- a/src/test/ui/regions/region-object-lifetime-5.rs +++ b/src/test/ui/regions/region-object-lifetime-5.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Various tests related to testing how region inference works // with respect to the object receivers. diff --git a/src/test/ui/regions/region-object-lifetime-5.stderr b/src/test/ui/regions/region-object-lifetime-5.stderr index 2dbdacfacdcc0..002bae18b1c01 100644 --- a/src/test/ui/regions/region-object-lifetime-5.stderr +++ b/src/test/ui/regions/region-object-lifetime-5.stderr @@ -1,5 +1,5 @@ error[E0597]: `*x` does not live long enough - --> $DIR/region-object-lifetime-5.rs:21:5 + --> $DIR/region-object-lifetime-5.rs:11:5 | LL | x.borrowed() //~ ERROR `*x` does not live long enough | ^ borrowed value does not live long enough diff --git a/src/test/ui/regions/region-object-lifetime-in-coercion.nll.stderr b/src/test/ui/regions/region-object-lifetime-in-coercion.nll.stderr index 8338cf6a6069c..277e2ab3217ea 100644 --- a/src/test/ui/regions/region-object-lifetime-in-coercion.nll.stderr +++ b/src/test/ui/regions/region-object-lifetime-in-coercion.nll.stderr @@ -1,29 +1,29 @@ warning: not reporting region error due to nll - --> $DIR/region-object-lifetime-in-coercion.rs:18:42 + --> $DIR/region-object-lifetime-in-coercion.rs:8:42 | LL | let x: Box = Box::new(v); | ^ warning: not reporting region error due to nll - --> $DIR/region-object-lifetime-in-coercion.rs:24:14 + --> $DIR/region-object-lifetime-in-coercion.rs:14:14 | LL | Box::new(v) | ^ warning: not reporting region error due to nll - --> $DIR/region-object-lifetime-in-coercion.rs:31:14 + --> $DIR/region-object-lifetime-in-coercion.rs:21:14 | LL | Box::new(v) | ^ warning: not reporting region error due to nll - --> $DIR/region-object-lifetime-in-coercion.rs:36:14 + --> $DIR/region-object-lifetime-in-coercion.rs:26:14 | LL | Box::new(v) | ^ error[E0621]: explicit lifetime required in the type of `v` - --> $DIR/region-object-lifetime-in-coercion.rs:18:33 + --> $DIR/region-object-lifetime-in-coercion.rs:8:33 | LL | fn a(v: &[u8]) -> Box { | ----- help: add explicit lifetime `'static` to the type of `v`: `&'static [u8]` @@ -31,7 +31,7 @@ LL | let x: Box = Box::new(v); | ^^^^^^^^^^^ lifetime `'static` required error[E0621]: explicit lifetime required in the type of `v` - --> $DIR/region-object-lifetime-in-coercion.rs:23:38 + --> $DIR/region-object-lifetime-in-coercion.rs:13:38 | LL | fn b(v: &[u8]) -> Box { | _________-----________________________^ @@ -43,7 +43,7 @@ LL | | } | |_^ lifetime `'static` required error[E0621]: explicit lifetime required in the type of `v` - --> $DIR/region-object-lifetime-in-coercion.rs:28:28 + --> $DIR/region-object-lifetime-in-coercion.rs:18:28 | LL | fn c(v: &[u8]) -> Box { | _________-----______________^ @@ -57,7 +57,7 @@ LL | | } | |_^ lifetime `'static` required error: unsatisfied lifetime constraints - --> $DIR/region-object-lifetime-in-coercion.rs:35:41 + --> $DIR/region-object-lifetime-in-coercion.rs:25:41 | LL | fn d<'a,'b>(v: &'a [u8]) -> Box { | ______--_--______________________________^ diff --git a/src/test/ui/regions/region-object-lifetime-in-coercion.rs b/src/test/ui/regions/region-object-lifetime-in-coercion.rs index 5bf397ab3838c..dfba04b0d25fc 100644 --- a/src/test/ui/regions/region-object-lifetime-in-coercion.rs +++ b/src/test/ui/regions/region-object-lifetime-in-coercion.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that attempts to implicitly coerce a value into an // object respect the lifetime bound on the object type. diff --git a/src/test/ui/regions/region-object-lifetime-in-coercion.stderr b/src/test/ui/regions/region-object-lifetime-in-coercion.stderr index ac8c4d3a16af7..b8ea6d3476b51 100644 --- a/src/test/ui/regions/region-object-lifetime-in-coercion.stderr +++ b/src/test/ui/regions/region-object-lifetime-in-coercion.stderr @@ -1,5 +1,5 @@ error[E0621]: explicit lifetime required in the type of `v` - --> $DIR/region-object-lifetime-in-coercion.rs:18:33 + --> $DIR/region-object-lifetime-in-coercion.rs:8:33 | LL | fn a(v: &[u8]) -> Box { | ----- help: add explicit lifetime `'static` to the type of `v`: `&'static [u8]` @@ -7,7 +7,7 @@ LL | let x: Box = Box::new(v); | ^^^^^^^^^^^ lifetime `'static` required error[E0621]: explicit lifetime required in the type of `v` - --> $DIR/region-object-lifetime-in-coercion.rs:24:5 + --> $DIR/region-object-lifetime-in-coercion.rs:14:5 | LL | fn b(v: &[u8]) -> Box { | ----- help: add explicit lifetime `'static` to the type of `v`: `&'static [u8]` @@ -15,7 +15,7 @@ LL | Box::new(v) | ^^^^^^^^^^^ lifetime `'static` required error[E0621]: explicit lifetime required in the type of `v` - --> $DIR/region-object-lifetime-in-coercion.rs:31:5 + --> $DIR/region-object-lifetime-in-coercion.rs:21:5 | LL | fn c(v: &[u8]) -> Box { | ----- help: add explicit lifetime `'static` to the type of `v`: `&'static [u8]` @@ -24,21 +24,21 @@ LL | Box::new(v) | ^^^^^^^^^^^ lifetime `'static` required error[E0495]: cannot infer an appropriate lifetime due to conflicting requirements - --> $DIR/region-object-lifetime-in-coercion.rs:36:14 + --> $DIR/region-object-lifetime-in-coercion.rs:26:14 | LL | Box::new(v) | ^ | -note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 35:6... - --> $DIR/region-object-lifetime-in-coercion.rs:35:6 +note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 25:6... + --> $DIR/region-object-lifetime-in-coercion.rs:25:6 | LL | fn d<'a,'b>(v: &'a [u8]) -> Box { | ^^ = note: ...so that the expression is assignable: expected &[u8] found &'a [u8] -note: but, the lifetime must be valid for the lifetime 'b as defined on the function body at 35:9... - --> $DIR/region-object-lifetime-in-coercion.rs:35:9 +note: but, the lifetime must be valid for the lifetime 'b as defined on the function body at 25:9... + --> $DIR/region-object-lifetime-in-coercion.rs:25:9 | LL | fn d<'a,'b>(v: &'a [u8]) -> Box { | ^^ diff --git a/src/test/ui/regions/regions-addr-of-arg.nll.stderr b/src/test/ui/regions/regions-addr-of-arg.nll.stderr index 9bfc80c94595a..ab5dbaff4455e 100644 --- a/src/test/ui/regions/regions-addr-of-arg.nll.stderr +++ b/src/test/ui/regions/regions-addr-of-arg.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `a` does not live long enough - --> $DIR/regions-addr-of-arg.rs:15:30 + --> $DIR/regions-addr-of-arg.rs:5:30 | LL | let _p: &'static isize = &a; //~ ERROR `a` does not live long enough | ^^ borrowed value does not live long enough @@ -9,15 +9,15 @@ LL | } = note: borrowed value must be valid for the static lifetime... error[E0597]: `a` does not live long enough - --> $DIR/regions-addr-of-arg.rs:23:5 + --> $DIR/regions-addr-of-arg.rs:13:5 | LL | &a //~ ERROR `a` does not live long enough | ^^ borrowed value does not live long enough LL | } | - `a` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 22:8... - --> $DIR/regions-addr-of-arg.rs:22:8 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 12:8... + --> $DIR/regions-addr-of-arg.rs:12:8 | LL | fn zed<'a>(a: isize) -> &'a isize { | ^^ diff --git a/src/test/ui/regions/regions-addr-of-arg.rs b/src/test/ui/regions/regions-addr-of-arg.rs index c54b4aaace5fb..06f16be8217c0 100644 --- a/src/test/ui/regions/regions-addr-of-arg.rs +++ b/src/test/ui/regions/regions-addr-of-arg.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that taking the address of an argument yields a lifetime // bounded by the current function call. diff --git a/src/test/ui/regions/regions-addr-of-arg.stderr b/src/test/ui/regions/regions-addr-of-arg.stderr index 9158a4ac7a74c..61e28b8bbeadf 100644 --- a/src/test/ui/regions/regions-addr-of-arg.stderr +++ b/src/test/ui/regions/regions-addr-of-arg.stderr @@ -1,5 +1,5 @@ error[E0597]: `a` does not live long enough - --> $DIR/regions-addr-of-arg.rs:15:31 + --> $DIR/regions-addr-of-arg.rs:5:31 | LL | let _p: &'static isize = &a; //~ ERROR `a` does not live long enough | ^ borrowed value does not live long enough @@ -9,15 +9,15 @@ LL | } = note: borrowed value must be valid for the static lifetime... error[E0597]: `a` does not live long enough - --> $DIR/regions-addr-of-arg.rs:23:6 + --> $DIR/regions-addr-of-arg.rs:13:6 | LL | &a //~ ERROR `a` does not live long enough | ^ borrowed value does not live long enough LL | } | - borrowed value only lives until here | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 22:8... - --> $DIR/regions-addr-of-arg.rs:22:8 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 12:8... + --> $DIR/regions-addr-of-arg.rs:12:8 | LL | fn zed<'a>(a: isize) -> &'a isize { | ^^ diff --git a/src/test/ui/regions/regions-addr-of-self.nll.stderr b/src/test/ui/regions/regions-addr-of-self.nll.stderr index cad1384f198f7..d421cd2ab2eee 100644 --- a/src/test/ui/regions/regions-addr-of-self.nll.stderr +++ b/src/test/ui/regions/regions-addr-of-self.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/regions-addr-of-self.rs:17:37 + --> $DIR/regions-addr-of-self.rs:7:37 | LL | let p: &'static mut usize = &mut self.cats_chased; //~ ERROR cannot infer | ^^^^^^^^^^^^^^^^^^^^^ error: unsatisfied lifetime constraints - --> $DIR/regions-addr-of-self.rs:17:37 + --> $DIR/regions-addr-of-self.rs:7:37 | LL | pub fn chase_cat(&mut self) { | - let's call the lifetime of this reference `'1` diff --git a/src/test/ui/regions/regions-addr-of-self.rs b/src/test/ui/regions/regions-addr-of-self.rs index 04ee0526403fb..6370d40e24648 100644 --- a/src/test/ui/regions/regions-addr-of-self.rs +++ b/src/test/ui/regions/regions-addr-of-self.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct dog { cats_chased: usize, } diff --git a/src/test/ui/regions/regions-addr-of-self.stderr b/src/test/ui/regions/regions-addr-of-self.stderr index 387aeeb8a5bb5..2ea8aecacdae7 100644 --- a/src/test/ui/regions/regions-addr-of-self.stderr +++ b/src/test/ui/regions/regions-addr-of-self.stderr @@ -1,11 +1,11 @@ error[E0495]: cannot infer an appropriate lifetime for borrow expression due to conflicting requirements - --> $DIR/regions-addr-of-self.rs:17:37 + --> $DIR/regions-addr-of-self.rs:7:37 | LL | let p: &'static mut usize = &mut self.cats_chased; //~ ERROR cannot infer | ^^^^^^^^^^^^^^^^^^^^^ | -note: first, the lifetime cannot outlive the anonymous lifetime #1 defined on the method body at 16:5... - --> $DIR/regions-addr-of-self.rs:16:5 +note: first, the lifetime cannot outlive the anonymous lifetime #1 defined on the method body at 6:5... + --> $DIR/regions-addr-of-self.rs:6:5 | LL | / pub fn chase_cat(&mut self) { LL | | let p: &'static mut usize = &mut self.cats_chased; //~ ERROR cannot infer @@ -13,13 +13,13 @@ LL | | *p += 1; LL | | } | |_____^ note: ...so that reference does not outlive borrowed content - --> $DIR/regions-addr-of-self.rs:17:37 + --> $DIR/regions-addr-of-self.rs:7:37 | LL | let p: &'static mut usize = &mut self.cats_chased; //~ ERROR cannot infer | ^^^^^^^^^^^^^^^^^^^^^ = note: but, the lifetime must be valid for the static lifetime... note: ...so that reference does not outlive borrowed content - --> $DIR/regions-addr-of-self.rs:17:37 + --> $DIR/regions-addr-of-self.rs:7:37 | LL | let p: &'static mut usize = &mut self.cats_chased; //~ ERROR cannot infer | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/regions/regions-addr-of-upvar-self.nll.stderr b/src/test/ui/regions/regions-addr-of-upvar-self.nll.stderr index 0ee86172368cf..f413b42596beb 100644 --- a/src/test/ui/regions/regions-addr-of-upvar-self.nll.stderr +++ b/src/test/ui/regions/regions-addr-of-upvar-self.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/regions-addr-of-upvar-self.rs:20:41 + --> $DIR/regions-addr-of-upvar-self.rs:10:41 | LL | let p: &'static mut usize = &mut self.food; //~ ERROR cannot infer | ^^^^^^^^^^^^^^ error: unsatisfied lifetime constraints - --> $DIR/regions-addr-of-upvar-self.rs:20:41 + --> $DIR/regions-addr-of-upvar-self.rs:10:41 | LL | let _f = || { | -- lifetime `'1` represents this closure's body @@ -15,7 +15,7 @@ LL | let p: &'static mut usize = &mut self.food; //~ ERROR cannot in = note: closure implements `FnMut`, so references to captured variables can't escape the closure error: unsatisfied lifetime constraints - --> $DIR/regions-addr-of-upvar-self.rs:19:13 + --> $DIR/regions-addr-of-upvar-self.rs:9:13 | LL | pub fn chase_cat(&mut self) { | - let's call the lifetime of this reference `'1` @@ -23,7 +23,7 @@ LL | let _f = || { | ^^ requires that `'1` must outlive `'static` error[E0597]: `self` does not live long enough - --> $DIR/regions-addr-of-upvar-self.rs:20:46 + --> $DIR/regions-addr-of-upvar-self.rs:10:46 | LL | let _f = || { | -- value captured here diff --git a/src/test/ui/regions/regions-addr-of-upvar-self.rs b/src/test/ui/regions/regions-addr-of-upvar-self.rs index 28491f1155c36..743b259b9b0e5 100644 --- a/src/test/ui/regions/regions-addr-of-upvar-self.rs +++ b/src/test/ui/regions/regions-addr-of-upvar-self.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::usize; struct dog { diff --git a/src/test/ui/regions/regions-addr-of-upvar-self.stderr b/src/test/ui/regions/regions-addr-of-upvar-self.stderr index 35e721288cdda..97470aae54a0b 100644 --- a/src/test/ui/regions/regions-addr-of-upvar-self.stderr +++ b/src/test/ui/regions/regions-addr-of-upvar-self.stderr @@ -1,22 +1,22 @@ error[E0495]: cannot infer an appropriate lifetime for borrow expression due to conflicting requirements - --> $DIR/regions-addr-of-upvar-self.rs:20:41 + --> $DIR/regions-addr-of-upvar-self.rs:10:41 | LL | let p: &'static mut usize = &mut self.food; //~ ERROR cannot infer | ^^^^^^^^^^^^^^ | -note: first, the lifetime cannot outlive the lifetime as defined on the body at 19:18... - --> $DIR/regions-addr-of-upvar-self.rs:19:18 +note: first, the lifetime cannot outlive the lifetime as defined on the body at 9:18... + --> $DIR/regions-addr-of-upvar-self.rs:9:18 | LL | let _f = || { | ^^ note: ...so that reference does not outlive borrowed content - --> $DIR/regions-addr-of-upvar-self.rs:20:41 + --> $DIR/regions-addr-of-upvar-self.rs:10:41 | LL | let p: &'static mut usize = &mut self.food; //~ ERROR cannot infer | ^^^^^^^^^^^^^^ = note: but, the lifetime must be valid for the static lifetime... note: ...so that reference does not outlive borrowed content - --> $DIR/regions-addr-of-upvar-self.rs:20:41 + --> $DIR/regions-addr-of-upvar-self.rs:10:41 | LL | let p: &'static mut usize = &mut self.food; //~ ERROR cannot infer | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/regions/regions-adjusted-lvalue-op.nll.stderr b/src/test/ui/regions/regions-adjusted-lvalue-op.nll.stderr index f342155c8b141..eb6252bc431f9 100644 --- a/src/test/ui/regions/regions-adjusted-lvalue-op.nll.stderr +++ b/src/test/ui/regions/regions-adjusted-lvalue-op.nll.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `v` as immutable because it is also borrowed as mutable - --> $DIR/regions-adjusted-lvalue-op.rs:24:16 + --> $DIR/regions-adjusted-lvalue-op.rs:14:16 | LL | v[0].oh_no(&v); //~ ERROR cannot borrow `v` as immutable because | -----------^^- @@ -9,7 +9,7 @@ LL | v[0].oh_no(&v); //~ ERROR cannot borrow `v` as immutable because | borrow later used here error[E0502]: cannot borrow `v` as immutable because it is also borrowed as mutable - --> $DIR/regions-adjusted-lvalue-op.rs:25:16 + --> $DIR/regions-adjusted-lvalue-op.rs:15:16 | LL | (*v).oh_no(&v); //~ ERROR cannot borrow `v` as immutable because | -----------^^- diff --git a/src/test/ui/regions/regions-adjusted-lvalue-op.rs b/src/test/ui/regions/regions-adjusted-lvalue-op.rs index bb02d6d8bba8a..5aa5a3ecb244a 100644 --- a/src/test/ui/regions/regions-adjusted-lvalue-op.rs +++ b/src/test/ui/regions/regions-adjusted-lvalue-op.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // check that we link regions in mutable place ops correctly - issue #41774 struct Data(i32); diff --git a/src/test/ui/regions/regions-adjusted-lvalue-op.stderr b/src/test/ui/regions/regions-adjusted-lvalue-op.stderr index 95228d9ccbbae..9988289b91e6c 100644 --- a/src/test/ui/regions/regions-adjusted-lvalue-op.stderr +++ b/src/test/ui/regions/regions-adjusted-lvalue-op.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `v` as immutable because it is also borrowed as mutable - --> $DIR/regions-adjusted-lvalue-op.rs:24:17 + --> $DIR/regions-adjusted-lvalue-op.rs:14:17 | LL | v[0].oh_no(&v); //~ ERROR cannot borrow `v` as immutable because | - ^- mutable borrow ends here @@ -8,7 +8,7 @@ LL | v[0].oh_no(&v); //~ ERROR cannot borrow `v` as immutable because | mutable borrow occurs here error[E0502]: cannot borrow `v` as immutable because it is also borrowed as mutable - --> $DIR/regions-adjusted-lvalue-op.rs:25:17 + --> $DIR/regions-adjusted-lvalue-op.rs:15:17 | LL | (*v).oh_no(&v); //~ ERROR cannot borrow `v` as immutable because | - ^- mutable borrow ends here diff --git a/src/test/ui/regions/regions-assoc-type-in-supertrait-outlives-container.rs b/src/test/ui/regions/regions-assoc-type-in-supertrait-outlives-container.rs index 96eb65daaffef..aa8c66c04e7ad 100644 --- a/src/test/ui/regions/regions-assoc-type-in-supertrait-outlives-container.rs +++ b/src/test/ui/regions/regions-assoc-type-in-supertrait-outlives-container.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-compare-mode-nll // Test that we are imposing the requirement that every associated diff --git a/src/test/ui/regions/regions-assoc-type-in-supertrait-outlives-container.stderr b/src/test/ui/regions/regions-assoc-type-in-supertrait-outlives-container.stderr index 7b7881d6ea7ca..2827303a22cad 100644 --- a/src/test/ui/regions/regions-assoc-type-in-supertrait-outlives-container.stderr +++ b/src/test/ui/regions/regions-assoc-type-in-supertrait-outlives-container.stderr @@ -1,16 +1,16 @@ error[E0491]: in type `&'a WithAssoc>`, reference has a longer lifetime than the data it references - --> $DIR/regions-assoc-type-in-supertrait-outlives-container.rs:52:12 + --> $DIR/regions-assoc-type-in-supertrait-outlives-container.rs:42:12 | LL | let _: &'a WithAssoc> = loop { }; //~ ERROR reference has a longer lifetime | ^^^^^^^^^^^^^^^^^^^^^^^^^^ | -note: the pointer is valid for the lifetime 'a as defined on the function body at 46:15 - --> $DIR/regions-assoc-type-in-supertrait-outlives-container.rs:46:15 +note: the pointer is valid for the lifetime 'a as defined on the function body at 36:15 + --> $DIR/regions-assoc-type-in-supertrait-outlives-container.rs:36:15 | LL | fn with_assoc<'a,'b>() { | ^^ -note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 46:18 - --> $DIR/regions-assoc-type-in-supertrait-outlives-container.rs:46:18 +note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 36:18 + --> $DIR/regions-assoc-type-in-supertrait-outlives-container.rs:36:18 | LL | fn with_assoc<'a,'b>() { | ^^ diff --git a/src/test/ui/regions/regions-assoc-type-region-bound-in-trait-not-met.rs b/src/test/ui/regions/regions-assoc-type-region-bound-in-trait-not-met.rs index f921eccef1f8c..26cb40bb5c2b1 100644 --- a/src/test/ui/regions/regions-assoc-type-region-bound-in-trait-not-met.rs +++ b/src/test/ui/regions/regions-assoc-type-region-bound-in-trait-not-met.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the compiler checks that arbitrary region bounds declared // in the trait must be satisfied on the impl. Issue #20890. diff --git a/src/test/ui/regions/regions-assoc-type-region-bound-in-trait-not-met.stderr b/src/test/ui/regions/regions-assoc-type-region-bound-in-trait-not-met.stderr index 2261e92166e2b..d01e991103923 100644 --- a/src/test/ui/regions/regions-assoc-type-region-bound-in-trait-not-met.stderr +++ b/src/test/ui/regions/regions-assoc-type-region-bound-in-trait-not-met.stderr @@ -1,11 +1,11 @@ error[E0495]: cannot infer an appropriate lifetime for lifetime parameter `'a` due to conflicting requirements - --> $DIR/regions-assoc-type-region-bound-in-trait-not-met.rs:24:10 + --> $DIR/regions-assoc-type-region-bound-in-trait-not-met.rs:14:10 | LL | impl<'a> Foo<'static> for &'a i32 { | ^^^^^^^^^^^^ | -note: first, the lifetime cannot outlive the lifetime 'a as defined on the impl at 24:6... - --> $DIR/regions-assoc-type-region-bound-in-trait-not-met.rs:24:6 +note: first, the lifetime cannot outlive the lifetime 'a as defined on the impl at 14:6... + --> $DIR/regions-assoc-type-region-bound-in-trait-not-met.rs:14:6 | LL | impl<'a> Foo<'static> for &'a i32 { | ^^ @@ -14,32 +14,32 @@ LL | impl<'a> Foo<'static> for &'a i32 { found Foo<'static> = note: but, the lifetime must be valid for the static lifetime... note: ...so that the type `&i32` will meet its required lifetime bounds - --> $DIR/regions-assoc-type-region-bound-in-trait-not-met.rs:24:10 + --> $DIR/regions-assoc-type-region-bound-in-trait-not-met.rs:14:10 | LL | impl<'a> Foo<'static> for &'a i32 { | ^^^^^^^^^^^^ error[E0495]: cannot infer an appropriate lifetime for lifetime parameter `'a` due to conflicting requirements - --> $DIR/regions-assoc-type-region-bound-in-trait-not-met.rs:29:13 + --> $DIR/regions-assoc-type-region-bound-in-trait-not-met.rs:19:13 | LL | impl<'a,'b> Foo<'b> for &'a i64 { | ^^^^^^^ | -note: first, the lifetime cannot outlive the lifetime 'a as defined on the impl at 29:6... - --> $DIR/regions-assoc-type-region-bound-in-trait-not-met.rs:29:6 +note: first, the lifetime cannot outlive the lifetime 'a as defined on the impl at 19:6... + --> $DIR/regions-assoc-type-region-bound-in-trait-not-met.rs:19:6 | LL | impl<'a,'b> Foo<'b> for &'a i64 { | ^^ = note: ...so that the types are compatible: expected Foo<'b> found Foo<'_> -note: but, the lifetime must be valid for the lifetime 'b as defined on the impl at 29:9... - --> $DIR/regions-assoc-type-region-bound-in-trait-not-met.rs:29:9 +note: but, the lifetime must be valid for the lifetime 'b as defined on the impl at 19:9... + --> $DIR/regions-assoc-type-region-bound-in-trait-not-met.rs:19:9 | LL | impl<'a,'b> Foo<'b> for &'a i64 { | ^^ note: ...so that the type `&i32` will meet its required lifetime bounds - --> $DIR/regions-assoc-type-region-bound-in-trait-not-met.rs:29:13 + --> $DIR/regions-assoc-type-region-bound-in-trait-not-met.rs:19:13 | LL | impl<'a,'b> Foo<'b> for &'a i64 { | ^^^^^^^ diff --git a/src/test/ui/regions/regions-assoc-type-static-bound-in-trait-not-met.rs b/src/test/ui/regions/regions-assoc-type-static-bound-in-trait-not-met.rs index 1cf83b8ac585f..599cd0bb756ea 100644 --- a/src/test/ui/regions/regions-assoc-type-static-bound-in-trait-not-met.rs +++ b/src/test/ui/regions/regions-assoc-type-static-bound-in-trait-not-met.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the compiler checks that the 'static bound declared in // the trait must be satisfied on the impl. Issue #20890. diff --git a/src/test/ui/regions/regions-assoc-type-static-bound-in-trait-not-met.stderr b/src/test/ui/regions/regions-assoc-type-static-bound-in-trait-not-met.stderr index a7ae685c3a4f7..33a4ea01ce2e5 100644 --- a/src/test/ui/regions/regions-assoc-type-static-bound-in-trait-not-met.stderr +++ b/src/test/ui/regions/regions-assoc-type-static-bound-in-trait-not-met.stderr @@ -1,11 +1,11 @@ error[E0495]: cannot infer an appropriate lifetime for lifetime parameter `'a` due to conflicting requirements - --> $DIR/regions-assoc-type-static-bound-in-trait-not-met.rs:19:10 + --> $DIR/regions-assoc-type-static-bound-in-trait-not-met.rs:9:10 | LL | impl<'a> Foo for &'a i32 { | ^^^ | -note: first, the lifetime cannot outlive the lifetime 'a as defined on the impl at 19:6... - --> $DIR/regions-assoc-type-static-bound-in-trait-not-met.rs:19:6 +note: first, the lifetime cannot outlive the lifetime 'a as defined on the impl at 9:6... + --> $DIR/regions-assoc-type-static-bound-in-trait-not-met.rs:9:6 | LL | impl<'a> Foo for &'a i32 { | ^^ @@ -14,7 +14,7 @@ LL | impl<'a> Foo for &'a i32 { found Foo = note: but, the lifetime must be valid for the static lifetime... note: ...so that the type `&i32` will meet its required lifetime bounds - --> $DIR/regions-assoc-type-static-bound-in-trait-not-met.rs:19:10 + --> $DIR/regions-assoc-type-static-bound-in-trait-not-met.rs:9:10 | LL | impl<'a> Foo for &'a i32 { | ^^^ diff --git a/src/test/ui/regions/regions-bounded-by-trait-requiring-static.rs b/src/test/ui/regions/regions-bounded-by-trait-requiring-static.rs index 8a15656f8a721..8d3af92e77a6d 100644 --- a/src/test/ui/regions/regions-bounded-by-trait-requiring-static.rs +++ b/src/test/ui/regions/regions-bounded-by-trait-requiring-static.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-compare-mode-nll // Test which of the builtin types are considered sendable. The tests diff --git a/src/test/ui/regions/regions-bounded-by-trait-requiring-static.stderr b/src/test/ui/regions/regions-bounded-by-trait-requiring-static.stderr index 2cd82707a2af4..a7b735c059a90 100644 --- a/src/test/ui/regions/regions-bounded-by-trait-requiring-static.stderr +++ b/src/test/ui/regions/regions-bounded-by-trait-requiring-static.stderr @@ -1,5 +1,5 @@ error[E0477]: the type `&'a isize` does not fulfill the required lifetime - --> $DIR/regions-bounded-by-trait-requiring-static.rs:34:5 + --> $DIR/regions-bounded-by-trait-requiring-static.rs:24:5 | LL | assert_send::<&'a isize>(); //~ ERROR does not fulfill the required lifetime | ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | assert_send::<&'a isize>(); //~ ERROR does not fulfill the required lif = note: type must satisfy the static lifetime error[E0477]: the type `&'a str` does not fulfill the required lifetime - --> $DIR/regions-bounded-by-trait-requiring-static.rs:38:5 + --> $DIR/regions-bounded-by-trait-requiring-static.rs:28:5 | LL | assert_send::<&'a str>(); //~ ERROR does not fulfill the required lifetime | ^^^^^^^^^^^^^^^^^^^^^^ @@ -15,7 +15,7 @@ LL | assert_send::<&'a str>(); //~ ERROR does not fulfill the required lifet = note: type must satisfy the static lifetime error[E0477]: the type `&'a [isize]` does not fulfill the required lifetime - --> $DIR/regions-bounded-by-trait-requiring-static.rs:42:5 + --> $DIR/regions-bounded-by-trait-requiring-static.rs:32:5 | LL | assert_send::<&'a [isize]>(); //~ ERROR does not fulfill the required lifetime | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -23,7 +23,7 @@ LL | assert_send::<&'a [isize]>(); //~ ERROR does not fulfill the required l = note: type must satisfy the static lifetime error[E0477]: the type `std::boxed::Box<&'a isize>` does not fulfill the required lifetime - --> $DIR/regions-bounded-by-trait-requiring-static.rs:56:5 + --> $DIR/regions-bounded-by-trait-requiring-static.rs:46:5 | LL | assert_send::>(); //~ ERROR does not fulfill the required lifetime | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -31,7 +31,7 @@ LL | assert_send::>(); //~ ERROR does not fulfill the require = note: type must satisfy the static lifetime error[E0477]: the type `*const &'a isize` does not fulfill the required lifetime - --> $DIR/regions-bounded-by-trait-requiring-static.rs:67:5 + --> $DIR/regions-bounded-by-trait-requiring-static.rs:57:5 | LL | assert_send::<*const &'a isize>(); //~ ERROR does not fulfill the required lifetime | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -39,7 +39,7 @@ LL | assert_send::<*const &'a isize>(); //~ ERROR does not fulfill the requi = note: type must satisfy the static lifetime error[E0477]: the type `*mut &'a isize` does not fulfill the required lifetime - --> $DIR/regions-bounded-by-trait-requiring-static.rs:71:5 + --> $DIR/regions-bounded-by-trait-requiring-static.rs:61:5 | LL | assert_send::<*mut &'a isize>(); //~ ERROR does not fulfill the required lifetime | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/regions/regions-bounded-method-type-parameters-cross-crate.nll.stderr b/src/test/ui/regions/regions-bounded-method-type-parameters-cross-crate.nll.stderr index 553eedec398ce..257afc29e7805 100644 --- a/src/test/ui/regions/regions-bounded-method-type-parameters-cross-crate.nll.stderr +++ b/src/test/ui/regions/regions-bounded-method-type-parameters-cross-crate.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/regions-bounded-method-type-parameters-cross-crate.rs:30:7 + --> $DIR/regions-bounded-method-type-parameters-cross-crate.rs:20:7 | LL | a.bigger_region(b) //~ ERROR 30:7: 30:20: lifetime mismatch [E0623] | ^^^^^^^^^^^^^ error: unsatisfied lifetime constraints - --> $DIR/regions-bounded-method-type-parameters-cross-crate.rs:30:5 + --> $DIR/regions-bounded-method-type-parameters-cross-crate.rs:20:5 | LL | fn call_bigger_region<'x, 'y>(a: Inv<'x>, b: Inv<'y>) { | -- -- lifetime `'y` defined here diff --git a/src/test/ui/regions/regions-bounded-method-type-parameters-cross-crate.rs b/src/test/ui/regions/regions-bounded-method-type-parameters-cross-crate.rs index 24e4c5fbd91be..4370408a012bb 100644 --- a/src/test/ui/regions/regions-bounded-method-type-parameters-cross-crate.rs +++ b/src/test/ui/regions/regions-bounded-method-type-parameters-cross-crate.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:rbmtp_cross_crate_lib.rs // Check explicit region bounds on methods in the cross crate case. diff --git a/src/test/ui/regions/regions-bounded-method-type-parameters-cross-crate.stderr b/src/test/ui/regions/regions-bounded-method-type-parameters-cross-crate.stderr index 898629d8ab982..d28020936d511 100644 --- a/src/test/ui/regions/regions-bounded-method-type-parameters-cross-crate.stderr +++ b/src/test/ui/regions/regions-bounded-method-type-parameters-cross-crate.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/regions-bounded-method-type-parameters-cross-crate.rs:30:7 + --> $DIR/regions-bounded-method-type-parameters-cross-crate.rs:20:7 | LL | fn call_bigger_region<'x, 'y>(a: Inv<'x>, b: Inv<'y>) { | ------- ------- these two types are declared with different lifetimes... diff --git a/src/test/ui/regions/regions-bounded-method-type-parameters-trait-bound.nll.stderr b/src/test/ui/regions/regions-bounded-method-type-parameters-trait-bound.nll.stderr index adcf4921e539d..e3bb87fc71b63 100644 --- a/src/test/ui/regions/regions-bounded-method-type-parameters-trait-bound.nll.stderr +++ b/src/test/ui/regions/regions-bounded-method-type-parameters-trait-bound.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/regions-bounded-method-type-parameters-trait-bound.rs:30:7 + --> $DIR/regions-bounded-method-type-parameters-trait-bound.rs:20:7 | LL | f.method(b); //~ ERROR 30:7: 30:13: lifetime mismatch [E0623] | ^^^^^^ error: borrowed data escapes outside of function - --> $DIR/regions-bounded-method-type-parameters-trait-bound.rs:30:5 + --> $DIR/regions-bounded-method-type-parameters-trait-bound.rs:20:5 | LL | fn caller2<'a,'b,F:Foo<'a>>(a: Inv<'a>, b: Inv<'b>, f: F) { | - - `b` is a reference that is only valid in the function body diff --git a/src/test/ui/regions/regions-bounded-method-type-parameters-trait-bound.rs b/src/test/ui/regions/regions-bounded-method-type-parameters-trait-bound.rs index 3e9d2aa6c3bff..bf73230cbea4e 100644 --- a/src/test/ui/regions/regions-bounded-method-type-parameters-trait-bound.rs +++ b/src/test/ui/regions/regions-bounded-method-type-parameters-trait-bound.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that explicit region bounds are allowed on the various // nominal types (but not on other types) and that they are type // checked. diff --git a/src/test/ui/regions/regions-bounded-method-type-parameters-trait-bound.stderr b/src/test/ui/regions/regions-bounded-method-type-parameters-trait-bound.stderr index f9f9c38b1b617..8ca529c9619e1 100644 --- a/src/test/ui/regions/regions-bounded-method-type-parameters-trait-bound.stderr +++ b/src/test/ui/regions/regions-bounded-method-type-parameters-trait-bound.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/regions-bounded-method-type-parameters-trait-bound.rs:30:7 + --> $DIR/regions-bounded-method-type-parameters-trait-bound.rs:20:7 | LL | fn caller2<'a,'b,F:Foo<'a>>(a: Inv<'a>, b: Inv<'b>, f: F) { | ------- ------- these two types are declared with different lifetimes... diff --git a/src/test/ui/regions/regions-bounded-method-type-parameters.rs b/src/test/ui/regions/regions-bounded-method-type-parameters.rs index b53c80c39630a..b3b68f8fb7659 100644 --- a/src/test/ui/regions/regions-bounded-method-type-parameters.rs +++ b/src/test/ui/regions/regions-bounded-method-type-parameters.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-compare-mode-nll // Check that explicit region bounds are allowed on the various diff --git a/src/test/ui/regions/regions-bounded-method-type-parameters.stderr b/src/test/ui/regions/regions-bounded-method-type-parameters.stderr index b8953a1719c01..83564ee548d47 100644 --- a/src/test/ui/regions/regions-bounded-method-type-parameters.stderr +++ b/src/test/ui/regions/regions-bounded-method-type-parameters.stderr @@ -1,5 +1,5 @@ error[E0477]: the type `&'a isize` does not fulfill the required lifetime - --> $DIR/regions-bounded-method-type-parameters.rs:24:9 + --> $DIR/regions-bounded-method-type-parameters.rs:14:9 | LL | Foo.some_method::<&'a isize>(); | ^^^^^^^^^^^ diff --git a/src/test/ui/regions/regions-bounds.nll.stderr b/src/test/ui/regions/regions-bounds.nll.stderr index a59a485f444ca..748b714895fd2 100644 --- a/src/test/ui/regions/regions-bounds.nll.stderr +++ b/src/test/ui/regions/regions-bounds.nll.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/regions-bounds.rs:19:12 + --> $DIR/regions-bounds.rs:9:12 | LL | return e; //~ ERROR mismatched types | ^ warning: not reporting region error due to nll - --> $DIR/regions-bounds.rs:23:12 + --> $DIR/regions-bounds.rs:13:12 | LL | return e; //~ ERROR mismatched types | ^ error: unsatisfied lifetime constraints - --> $DIR/regions-bounds.rs:19:12 + --> $DIR/regions-bounds.rs:9:12 | LL | fn a_fn1<'a,'b>(e: an_enum<'a>) -> an_enum<'b> { | -- -- lifetime `'b` defined here @@ -21,7 +21,7 @@ LL | return e; //~ ERROR mismatched types | ^ returning this value requires that `'a` must outlive `'b` error: unsatisfied lifetime constraints - --> $DIR/regions-bounds.rs:23:12 + --> $DIR/regions-bounds.rs:13:12 | LL | fn a_fn3<'a,'b>(e: a_class<'a>) -> a_class<'b> { | -- -- lifetime `'b` defined here diff --git a/src/test/ui/regions/regions-bounds.rs b/src/test/ui/regions/regions-bounds.rs index 5ce80be98d974..36d096f027761 100644 --- a/src/test/ui/regions/regions-bounds.rs +++ b/src/test/ui/regions/regions-bounds.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that explicit region bounds are allowed on the various // nominal types (but not on other types) and that they are type // checked. diff --git a/src/test/ui/regions/regions-bounds.stderr b/src/test/ui/regions/regions-bounds.stderr index 7d5a47c0df39e..3366712d9acd0 100644 --- a/src/test/ui/regions/regions-bounds.stderr +++ b/src/test/ui/regions/regions-bounds.stderr @@ -1,37 +1,37 @@ error[E0308]: mismatched types - --> $DIR/regions-bounds.rs:19:12 + --> $DIR/regions-bounds.rs:9:12 | LL | return e; //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `an_enum<'b>` found type `an_enum<'a>` -note: the lifetime 'a as defined on the function body at 18:10... - --> $DIR/regions-bounds.rs:18:10 +note: the lifetime 'a as defined on the function body at 8:10... + --> $DIR/regions-bounds.rs:8:10 | LL | fn a_fn1<'a,'b>(e: an_enum<'a>) -> an_enum<'b> { | ^^ -note: ...does not necessarily outlive the lifetime 'b as defined on the function body at 18:13 - --> $DIR/regions-bounds.rs:18:13 +note: ...does not necessarily outlive the lifetime 'b as defined on the function body at 8:13 + --> $DIR/regions-bounds.rs:8:13 | LL | fn a_fn1<'a,'b>(e: an_enum<'a>) -> an_enum<'b> { | ^^ error[E0308]: mismatched types - --> $DIR/regions-bounds.rs:23:12 + --> $DIR/regions-bounds.rs:13:12 | LL | return e; //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `a_class<'b>` found type `a_class<'a>` -note: the lifetime 'a as defined on the function body at 22:10... - --> $DIR/regions-bounds.rs:22:10 +note: the lifetime 'a as defined on the function body at 12:10... + --> $DIR/regions-bounds.rs:12:10 | LL | fn a_fn3<'a,'b>(e: a_class<'a>) -> a_class<'b> { | ^^ -note: ...does not necessarily outlive the lifetime 'b as defined on the function body at 22:13 - --> $DIR/regions-bounds.rs:22:13 +note: ...does not necessarily outlive the lifetime 'b as defined on the function body at 12:13 + --> $DIR/regions-bounds.rs:12:13 | LL | fn a_fn3<'a,'b>(e: a_class<'a>) -> a_class<'b> { | ^^ diff --git a/src/test/ui/regions/regions-close-associated-type-into-object.nll.stderr b/src/test/ui/regions/regions-close-associated-type-into-object.nll.stderr index 5bec650a41d11..9eba43f614943 100644 --- a/src/test/ui/regions/regions-close-associated-type-into-object.nll.stderr +++ b/src/test/ui/regions/regions-close-associated-type-into-object.nll.stderr @@ -1,29 +1,29 @@ warning: not reporting region error due to nll - --> $DIR/regions-close-associated-type-into-object.rs:25:5 + --> $DIR/regions-close-associated-type-into-object.rs:15:5 | LL | Box::new(item) //~ ERROR associated type `::Item` may not live long enough | ^^^^^^^^^^^^^^ warning: not reporting region error due to nll - --> $DIR/regions-close-associated-type-into-object.rs:32:5 + --> $DIR/regions-close-associated-type-into-object.rs:22:5 | LL | Box::new(item) //~ ERROR associated type `::Item` may not live long enough | ^^^^^^^^^^^^^^ warning: not reporting region error due to nll - --> $DIR/regions-close-associated-type-into-object.rs:38:5 + --> $DIR/regions-close-associated-type-into-object.rs:28:5 | LL | Box::new(item) //~ ERROR associated type `::Item` may not live long enough | ^^^^^^^^^^^^^^ warning: not reporting region error due to nll - --> $DIR/regions-close-associated-type-into-object.rs:45:5 + --> $DIR/regions-close-associated-type-into-object.rs:35:5 | LL | Box::new(item) //~ ERROR associated type `::Item` may not live long enough | ^^^^^^^^^^^^^^ error[E0310]: the associated type `::Item` may not live long enough - --> $DIR/regions-close-associated-type-into-object.rs:25:5 + --> $DIR/regions-close-associated-type-into-object.rs:15:5 | LL | Box::new(item) //~ ERROR associated type `::Item` may not live long enough | ^^^^^^^^^^^^^^ @@ -31,7 +31,7 @@ LL | Box::new(item) //~ ERROR associated type `::Item` may not li = help: consider adding an explicit lifetime bound `::Item: 'static`... error[E0310]: the associated type `::Item` may not live long enough - --> $DIR/regions-close-associated-type-into-object.rs:32:5 + --> $DIR/regions-close-associated-type-into-object.rs:22:5 | LL | Box::new(item) //~ ERROR associated type `::Item` may not live long enough | ^^^^^^^^^^^^^^ @@ -39,7 +39,7 @@ LL | Box::new(item) //~ ERROR associated type `::Item` may not li = help: consider adding an explicit lifetime bound `::Item: 'static`... error[E0309]: the associated type `::Item` may not live long enough - --> $DIR/regions-close-associated-type-into-object.rs:38:5 + --> $DIR/regions-close-associated-type-into-object.rs:28:5 | LL | Box::new(item) //~ ERROR associated type `::Item` may not live long enough | ^^^^^^^^^^^^^^ @@ -47,7 +47,7 @@ LL | Box::new(item) //~ ERROR associated type `::Item` may not li = help: consider adding an explicit lifetime bound `::Item: 'a`... error[E0309]: the associated type `::Item` may not live long enough - --> $DIR/regions-close-associated-type-into-object.rs:45:5 + --> $DIR/regions-close-associated-type-into-object.rs:35:5 | LL | Box::new(item) //~ ERROR associated type `::Item` may not live long enough | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/regions/regions-close-associated-type-into-object.rs b/src/test/ui/regions/regions-close-associated-type-into-object.rs index 6b88abfca6c91..853d961138718 100644 --- a/src/test/ui/regions/regions-close-associated-type-into-object.rs +++ b/src/test/ui/regions/regions-close-associated-type-into-object.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] trait X {} diff --git a/src/test/ui/regions/regions-close-associated-type-into-object.stderr b/src/test/ui/regions/regions-close-associated-type-into-object.stderr index 9d56de4c152e7..182081ede0c6f 100644 --- a/src/test/ui/regions/regions-close-associated-type-into-object.stderr +++ b/src/test/ui/regions/regions-close-associated-type-into-object.stderr @@ -1,51 +1,51 @@ error[E0310]: the associated type `::Item` may not live long enough - --> $DIR/regions-close-associated-type-into-object.rs:25:5 + --> $DIR/regions-close-associated-type-into-object.rs:15:5 | LL | Box::new(item) //~ ERROR associated type `::Item` may not live long enough | ^^^^^^^^^^^^^^ | = help: consider adding an explicit lifetime bound `::Item: 'static`... note: ...so that the type `::Item` will meet its required lifetime bounds - --> $DIR/regions-close-associated-type-into-object.rs:25:5 + --> $DIR/regions-close-associated-type-into-object.rs:15:5 | LL | Box::new(item) //~ ERROR associated type `::Item` may not live long enough | ^^^^^^^^^^^^^^ error[E0310]: the associated type `::Item` may not live long enough - --> $DIR/regions-close-associated-type-into-object.rs:32:5 + --> $DIR/regions-close-associated-type-into-object.rs:22:5 | LL | Box::new(item) //~ ERROR associated type `::Item` may not live long enough | ^^^^^^^^^^^^^^ | = help: consider adding an explicit lifetime bound `::Item: 'static`... note: ...so that the type `std::boxed::Box<::Item>` will meet its required lifetime bounds - --> $DIR/regions-close-associated-type-into-object.rs:32:5 + --> $DIR/regions-close-associated-type-into-object.rs:22:5 | LL | Box::new(item) //~ ERROR associated type `::Item` may not live long enough | ^^^^^^^^^^^^^^ error[E0309]: the associated type `::Item` may not live long enough - --> $DIR/regions-close-associated-type-into-object.rs:38:5 + --> $DIR/regions-close-associated-type-into-object.rs:28:5 | LL | Box::new(item) //~ ERROR associated type `::Item` may not live long enough | ^^^^^^^^^^^^^^ | = help: consider adding an explicit lifetime bound `::Item: 'a`... note: ...so that the type `::Item` will meet its required lifetime bounds - --> $DIR/regions-close-associated-type-into-object.rs:38:5 + --> $DIR/regions-close-associated-type-into-object.rs:28:5 | LL | Box::new(item) //~ ERROR associated type `::Item` may not live long enough | ^^^^^^^^^^^^^^ error[E0309]: the associated type `::Item` may not live long enough - --> $DIR/regions-close-associated-type-into-object.rs:45:5 + --> $DIR/regions-close-associated-type-into-object.rs:35:5 | LL | Box::new(item) //~ ERROR associated type `::Item` may not live long enough | ^^^^^^^^^^^^^^ | = help: consider adding an explicit lifetime bound `::Item: 'a`... note: ...so that the type `std::boxed::Box<::Item>` will meet its required lifetime bounds - --> $DIR/regions-close-associated-type-into-object.rs:45:5 + --> $DIR/regions-close-associated-type-into-object.rs:35:5 | LL | Box::new(item) //~ ERROR associated type `::Item` may not live long enough | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/regions/regions-close-object-into-object-1.nll.stderr b/src/test/ui/regions/regions-close-object-into-object-1.nll.stderr index 84e486872a705..aa6f1366e7adc 100644 --- a/src/test/ui/regions/regions-close-object-into-object-1.nll.stderr +++ b/src/test/ui/regions/regions-close-object-into-object-1.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `*v` does not live long enough - --> $DIR/regions-close-object-into-object-1.rs:22:11 + --> $DIR/regions-close-object-into-object-1.rs:12:11 | LL | box B(&*v) as Box //~ ERROR `*v` does not live long enough | ^^^ borrowed value does not live long enough diff --git a/src/test/ui/regions/regions-close-object-into-object-1.rs b/src/test/ui/regions/regions-close-object-into-object-1.rs index 5d9818d624b7e..7a862f97a99d2 100644 --- a/src/test/ui/regions/regions-close-object-into-object-1.rs +++ b/src/test/ui/regions/regions-close-object-into-object-1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] #![allow(warnings)] diff --git a/src/test/ui/regions/regions-close-object-into-object-1.stderr b/src/test/ui/regions/regions-close-object-into-object-1.stderr index bd05a63c3984e..817f664db45d1 100644 --- a/src/test/ui/regions/regions-close-object-into-object-1.stderr +++ b/src/test/ui/regions/regions-close-object-into-object-1.stderr @@ -1,5 +1,5 @@ error[E0597]: `*v` does not live long enough - --> $DIR/regions-close-object-into-object-1.rs:22:12 + --> $DIR/regions-close-object-into-object-1.rs:12:12 | LL | box B(&*v) as Box //~ ERROR `*v` does not live long enough | ^^ borrowed value does not live long enough diff --git a/src/test/ui/regions/regions-close-object-into-object-2.nll.stderr b/src/test/ui/regions/regions-close-object-into-object-2.nll.stderr index 701becc24d718..1b4838a76e6e2 100644 --- a/src/test/ui/regions/regions-close-object-into-object-2.nll.stderr +++ b/src/test/ui/regions/regions-close-object-into-object-2.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/regions-close-object-into-object-2.rs:20:11 + --> $DIR/regions-close-object-into-object-2.rs:10:11 | LL | box B(&*v) as Box //~ ERROR cannot infer | ^^^ error: unsatisfied lifetime constraints - --> $DIR/regions-close-object-into-object-2.rs:19:57 + --> $DIR/regions-close-object-into-object-2.rs:9:57 | LL | fn g<'a, T: 'static>(v: Box+'a>) -> Box { | ______--_________________________________________________^ @@ -16,7 +16,7 @@ LL | | } | |_^ returning this value requires that `'a` must outlive `'static` error[E0597]: `*v` does not live long enough - --> $DIR/regions-close-object-into-object-2.rs:20:11 + --> $DIR/regions-close-object-into-object-2.rs:10:11 | LL | box B(&*v) as Box //~ ERROR cannot infer | ^^^ borrowed value does not live long enough diff --git a/src/test/ui/regions/regions-close-object-into-object-2.rs b/src/test/ui/regions/regions-close-object-into-object-2.rs index 6cef995665517..cebb4ac68cbc6 100644 --- a/src/test/ui/regions/regions-close-object-into-object-2.rs +++ b/src/test/ui/regions/regions-close-object-into-object-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] trait A { } diff --git a/src/test/ui/regions/regions-close-object-into-object-2.stderr b/src/test/ui/regions/regions-close-object-into-object-2.stderr index b2e44cd2c77e3..de9a250ced660 100644 --- a/src/test/ui/regions/regions-close-object-into-object-2.stderr +++ b/src/test/ui/regions/regions-close-object-into-object-2.stderr @@ -1,16 +1,16 @@ error[E0495]: cannot infer an appropriate lifetime for borrow expression due to conflicting requirements - --> $DIR/regions-close-object-into-object-2.rs:20:11 + --> $DIR/regions-close-object-into-object-2.rs:10:11 | LL | box B(&*v) as Box //~ ERROR cannot infer | ^^^ | -note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 19:6... - --> $DIR/regions-close-object-into-object-2.rs:19:6 +note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 9:6... + --> $DIR/regions-close-object-into-object-2.rs:9:6 | LL | fn g<'a, T: 'static>(v: Box+'a>) -> Box { | ^^ note: ...so that the type `(dyn A + 'a)` is not borrowed for too long - --> $DIR/regions-close-object-into-object-2.rs:20:11 + --> $DIR/regions-close-object-into-object-2.rs:10:11 | LL | box B(&*v) as Box //~ ERROR cannot infer | ^^^ diff --git a/src/test/ui/regions/regions-close-object-into-object-3.nll.stderr b/src/test/ui/regions/regions-close-object-into-object-3.nll.stderr index 62504ab8d8025..6c6e65aaca705 100644 --- a/src/test/ui/regions/regions-close-object-into-object-3.nll.stderr +++ b/src/test/ui/regions/regions-close-object-into-object-3.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `*v` does not live long enough - --> $DIR/regions-close-object-into-object-3.rs:21:11 + --> $DIR/regions-close-object-into-object-3.rs:11:11 | LL | box B(&*v) as Box //~ ERROR `*v` does not live long enough | ^^^ borrowed value does not live long enough diff --git a/src/test/ui/regions/regions-close-object-into-object-3.rs b/src/test/ui/regions/regions-close-object-into-object-3.rs index 3004245b15a24..cafbf0932249d 100644 --- a/src/test/ui/regions/regions-close-object-into-object-3.rs +++ b/src/test/ui/regions/regions-close-object-into-object-3.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] #![allow(warnings)] diff --git a/src/test/ui/regions/regions-close-object-into-object-3.stderr b/src/test/ui/regions/regions-close-object-into-object-3.stderr index 9e412e50da993..1736a5f215cd7 100644 --- a/src/test/ui/regions/regions-close-object-into-object-3.stderr +++ b/src/test/ui/regions/regions-close-object-into-object-3.stderr @@ -1,5 +1,5 @@ error[E0597]: `*v` does not live long enough - --> $DIR/regions-close-object-into-object-3.rs:21:12 + --> $DIR/regions-close-object-into-object-3.rs:11:12 | LL | box B(&*v) as Box //~ ERROR `*v` does not live long enough | ^^ borrowed value does not live long enough diff --git a/src/test/ui/regions/regions-close-object-into-object-4.nll.stderr b/src/test/ui/regions/regions-close-object-into-object-4.nll.stderr index e01ae145e90d9..d24e77032ae6c 100644 --- a/src/test/ui/regions/regions-close-object-into-object-4.nll.stderr +++ b/src/test/ui/regions/regions-close-object-into-object-4.nll.stderr @@ -1,35 +1,35 @@ warning: not reporting region error due to nll - --> $DIR/regions-close-object-into-object-4.rs:20:5 + --> $DIR/regions-close-object-into-object-4.rs:10:5 | LL | box B(&*v) as Box //~ ERROR cannot infer | ^^^^^^^^^^^^^^^^^^^^ warning: not reporting region error due to nll - --> $DIR/regions-close-object-into-object-4.rs:20:11 + --> $DIR/regions-close-object-into-object-4.rs:10:11 | LL | box B(&*v) as Box //~ ERROR cannot infer | ^^^ warning: not reporting region error due to nll - --> $DIR/regions-close-object-into-object-4.rs:20:9 + --> $DIR/regions-close-object-into-object-4.rs:10:9 | LL | box B(&*v) as Box //~ ERROR cannot infer | ^ warning: not reporting region error due to nll - --> $DIR/regions-close-object-into-object-4.rs:20:9 + --> $DIR/regions-close-object-into-object-4.rs:10:9 | LL | box B(&*v) as Box //~ ERROR cannot infer | ^^^^^^ warning: not reporting region error due to nll - --> $DIR/regions-close-object-into-object-4.rs:20:5 + --> $DIR/regions-close-object-into-object-4.rs:10:5 | LL | box B(&*v) as Box //~ ERROR cannot infer | ^^^^^^^^^^ error: unsatisfied lifetime constraints - --> $DIR/regions-close-object-into-object-4.rs:19:51 + --> $DIR/regions-close-object-into-object-4.rs:9:51 | LL | fn i<'a, T, U>(v: Box+'a>) -> Box { | ______--___________________________________________^ @@ -40,7 +40,7 @@ LL | | } | |_^ returning this value requires that `'a` must outlive `'static` error[E0310]: the parameter type `U` may not live long enough - --> $DIR/regions-close-object-into-object-4.rs:20:5 + --> $DIR/regions-close-object-into-object-4.rs:10:5 | LL | box B(&*v) as Box //~ ERROR cannot infer | ^^^^^^^^^^ @@ -48,7 +48,7 @@ LL | box B(&*v) as Box //~ ERROR cannot infer = help: consider adding an explicit lifetime bound `U: 'static`... error[E0310]: the parameter type `U` may not live long enough - --> $DIR/regions-close-object-into-object-4.rs:20:9 + --> $DIR/regions-close-object-into-object-4.rs:10:9 | LL | box B(&*v) as Box //~ ERROR cannot infer | ^^^^^^ @@ -56,7 +56,7 @@ LL | box B(&*v) as Box //~ ERROR cannot infer = help: consider adding an explicit lifetime bound `U: 'static`... error[E0597]: `*v` does not live long enough - --> $DIR/regions-close-object-into-object-4.rs:20:11 + --> $DIR/regions-close-object-into-object-4.rs:10:11 | LL | box B(&*v) as Box //~ ERROR cannot infer | ^^^ borrowed value does not live long enough diff --git a/src/test/ui/regions/regions-close-object-into-object-4.rs b/src/test/ui/regions/regions-close-object-into-object-4.rs index bc5b7b7cf7874..91aab057bb9a2 100644 --- a/src/test/ui/regions/regions-close-object-into-object-4.rs +++ b/src/test/ui/regions/regions-close-object-into-object-4.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] trait A { } diff --git a/src/test/ui/regions/regions-close-object-into-object-4.stderr b/src/test/ui/regions/regions-close-object-into-object-4.stderr index 15e53f1b54de5..87bf28d74d4d5 100644 --- a/src/test/ui/regions/regions-close-object-into-object-4.stderr +++ b/src/test/ui/regions/regions-close-object-into-object-4.stderr @@ -1,16 +1,16 @@ error[E0495]: cannot infer an appropriate lifetime for borrow expression due to conflicting requirements - --> $DIR/regions-close-object-into-object-4.rs:20:11 + --> $DIR/regions-close-object-into-object-4.rs:10:11 | LL | box B(&*v) as Box //~ ERROR cannot infer | ^^^ | -note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 19:6... - --> $DIR/regions-close-object-into-object-4.rs:19:6 +note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 9:6... + --> $DIR/regions-close-object-into-object-4.rs:9:6 | LL | fn i<'a, T, U>(v: Box+'a>) -> Box { | ^^ note: ...so that the type `(dyn A + 'a)` is not borrowed for too long - --> $DIR/regions-close-object-into-object-4.rs:20:11 + --> $DIR/regions-close-object-into-object-4.rs:10:11 | LL | box B(&*v) as Box //~ ERROR cannot infer | ^^^ diff --git a/src/test/ui/regions/regions-close-object-into-object-5.nll.stderr b/src/test/ui/regions/regions-close-object-into-object-5.nll.stderr index d7f9253d0b4d2..86b43f12bc220 100644 --- a/src/test/ui/regions/regions-close-object-into-object-5.nll.stderr +++ b/src/test/ui/regions/regions-close-object-into-object-5.nll.stderr @@ -1,35 +1,35 @@ warning: not reporting region error due to nll - --> $DIR/regions-close-object-into-object-5.rs:27:5 + --> $DIR/regions-close-object-into-object-5.rs:17:5 | LL | box B(&*v) as Box | ^^^^^^^^^^^^^^^^^^^^ warning: not reporting region error due to nll - --> $DIR/regions-close-object-into-object-5.rs:27:11 + --> $DIR/regions-close-object-into-object-5.rs:17:11 | LL | box B(&*v) as Box | ^^^ warning: not reporting region error due to nll - --> $DIR/regions-close-object-into-object-5.rs:27:9 + --> $DIR/regions-close-object-into-object-5.rs:17:9 | LL | box B(&*v) as Box | ^ warning: not reporting region error due to nll - --> $DIR/regions-close-object-into-object-5.rs:27:9 + --> $DIR/regions-close-object-into-object-5.rs:17:9 | LL | box B(&*v) as Box | ^^^^^^ warning: not reporting region error due to nll - --> $DIR/regions-close-object-into-object-5.rs:27:5 + --> $DIR/regions-close-object-into-object-5.rs:17:5 | LL | box B(&*v) as Box | ^^^^^^^^^^ error[E0310]: the parameter type `T` may not live long enough - --> $DIR/regions-close-object-into-object-5.rs:27:5 + --> $DIR/regions-close-object-into-object-5.rs:17:5 | LL | box B(&*v) as Box | ^^^^^^^^^^ @@ -37,7 +37,7 @@ LL | box B(&*v) as Box = help: consider adding an explicit lifetime bound `T: 'static`... error[E0310]: the parameter type `T` may not live long enough - --> $DIR/regions-close-object-into-object-5.rs:27:9 + --> $DIR/regions-close-object-into-object-5.rs:17:9 | LL | box B(&*v) as Box | ^^^^^^ @@ -45,7 +45,7 @@ LL | box B(&*v) as Box = help: consider adding an explicit lifetime bound `T: 'static`... error[E0597]: `*v` does not live long enough - --> $DIR/regions-close-object-into-object-5.rs:27:11 + --> $DIR/regions-close-object-into-object-5.rs:17:11 | LL | box B(&*v) as Box | ^^^ borrowed value does not live long enough diff --git a/src/test/ui/regions/regions-close-object-into-object-5.rs b/src/test/ui/regions/regions-close-object-into-object-5.rs index 6cbe5234ce0e8..609c8ce2792c5 100644 --- a/src/test/ui/regions/regions-close-object-into-object-5.rs +++ b/src/test/ui/regions/regions-close-object-into-object-5.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] #![allow(warnings)] diff --git a/src/test/ui/regions/regions-close-object-into-object-5.stderr b/src/test/ui/regions/regions-close-object-into-object-5.stderr index 2c3cc603e04c7..390f8e7baa34a 100644 --- a/src/test/ui/regions/regions-close-object-into-object-5.stderr +++ b/src/test/ui/regions/regions-close-object-into-object-5.stderr @@ -1,5 +1,5 @@ error[E0310]: the parameter type `T` may not live long enough - --> $DIR/regions-close-object-into-object-5.rs:27:5 + --> $DIR/regions-close-object-into-object-5.rs:17:5 | LL | fn f<'a, T, U>(v: Box+'static>) -> Box { | - help: consider adding an explicit lifetime bound `T: 'static`... @@ -8,13 +8,13 @@ LL | box B(&*v) as Box | ^^^^^^^^^^ | note: ...so that the type `B<'_, T>` will meet its required lifetime bounds - --> $DIR/regions-close-object-into-object-5.rs:27:5 + --> $DIR/regions-close-object-into-object-5.rs:17:5 | LL | box B(&*v) as Box | ^^^^^^^^^^ error[E0310]: the parameter type `T` may not live long enough - --> $DIR/regions-close-object-into-object-5.rs:27:5 + --> $DIR/regions-close-object-into-object-5.rs:17:5 | LL | fn f<'a, T, U>(v: Box+'static>) -> Box { | - help: consider adding an explicit lifetime bound `T: 'static`... @@ -23,13 +23,13 @@ LL | box B(&*v) as Box | ^^^^^^^^^^^^^^^^^^^^ | note: ...so that it can be closed over into an object - --> $DIR/regions-close-object-into-object-5.rs:27:5 + --> $DIR/regions-close-object-into-object-5.rs:17:5 | LL | box B(&*v) as Box | ^^^^^^^^^^^^^^^^^^^^ error[E0310]: the parameter type `T` may not live long enough - --> $DIR/regions-close-object-into-object-5.rs:27:9 + --> $DIR/regions-close-object-into-object-5.rs:17:9 | LL | fn f<'a, T, U>(v: Box+'static>) -> Box { | - help: consider adding an explicit lifetime bound `T: 'static`... @@ -38,13 +38,13 @@ LL | box B(&*v) as Box | ^ | note: ...so that the type `T` will meet its required lifetime bounds - --> $DIR/regions-close-object-into-object-5.rs:27:9 + --> $DIR/regions-close-object-into-object-5.rs:17:9 | LL | box B(&*v) as Box | ^ error[E0310]: the parameter type `T` may not live long enough - --> $DIR/regions-close-object-into-object-5.rs:27:9 + --> $DIR/regions-close-object-into-object-5.rs:17:9 | LL | fn f<'a, T, U>(v: Box+'static>) -> Box { | - help: consider adding an explicit lifetime bound `T: 'static`... @@ -53,13 +53,13 @@ LL | box B(&*v) as Box | ^^^^^^ | note: ...so that the reference type `&dyn A` does not outlive the data it points at - --> $DIR/regions-close-object-into-object-5.rs:27:9 + --> $DIR/regions-close-object-into-object-5.rs:17:9 | LL | box B(&*v) as Box | ^^^^^^ error[E0310]: the parameter type `T` may not live long enough - --> $DIR/regions-close-object-into-object-5.rs:27:9 + --> $DIR/regions-close-object-into-object-5.rs:17:9 | LL | fn f<'a, T, U>(v: Box+'static>) -> Box { | - help: consider adding an explicit lifetime bound `T: 'static`... @@ -68,13 +68,13 @@ LL | box B(&*v) as Box | ^^^^^^ | note: ...so that the type `T` will meet its required lifetime bounds - --> $DIR/regions-close-object-into-object-5.rs:27:9 + --> $DIR/regions-close-object-into-object-5.rs:17:9 | LL | box B(&*v) as Box | ^^^^^^ error[E0310]: the parameter type `T` may not live long enough - --> $DIR/regions-close-object-into-object-5.rs:27:11 + --> $DIR/regions-close-object-into-object-5.rs:17:11 | LL | fn f<'a, T, U>(v: Box+'static>) -> Box { | - help: consider adding an explicit lifetime bound `T: 'static`... @@ -83,7 +83,7 @@ LL | box B(&*v) as Box | ^^^ | note: ...so that the type `(dyn A + 'static)` is not borrowed for too long - --> $DIR/regions-close-object-into-object-5.rs:27:11 + --> $DIR/regions-close-object-into-object-5.rs:17:11 | LL | box B(&*v) as Box | ^^^ diff --git a/src/test/ui/regions/regions-close-over-type-parameter-1.nll.stderr b/src/test/ui/regions/regions-close-over-type-parameter-1.nll.stderr index ff74d46b011ff..0f0aec3fafd63 100644 --- a/src/test/ui/regions/regions-close-over-type-parameter-1.nll.stderr +++ b/src/test/ui/regions/regions-close-over-type-parameter-1.nll.stderr @@ -1,29 +1,29 @@ warning: not reporting region error due to nll - --> $DIR/regions-close-over-type-parameter-1.rs:20:5 + --> $DIR/regions-close-over-type-parameter-1.rs:10:5 | LL | box v as Box | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: not reporting region error due to nll - --> $DIR/regions-close-over-type-parameter-1.rs:20:5 + --> $DIR/regions-close-over-type-parameter-1.rs:10:5 | LL | box v as Box | ^^^^^ warning: not reporting region error due to nll - --> $DIR/regions-close-over-type-parameter-1.rs:30:5 + --> $DIR/regions-close-over-type-parameter-1.rs:20:5 | LL | box v as Box | ^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: not reporting region error due to nll - --> $DIR/regions-close-over-type-parameter-1.rs:30:5 + --> $DIR/regions-close-over-type-parameter-1.rs:20:5 | LL | box v as Box | ^^^^^ error[E0310]: the parameter type `A` may not live long enough - --> $DIR/regions-close-over-type-parameter-1.rs:20:5 + --> $DIR/regions-close-over-type-parameter-1.rs:10:5 | LL | box v as Box | ^^^^^ @@ -31,7 +31,7 @@ LL | box v as Box = help: consider adding an explicit lifetime bound `A: 'static`... error[E0309]: the parameter type `A` may not live long enough - --> $DIR/regions-close-over-type-parameter-1.rs:30:5 + --> $DIR/regions-close-over-type-parameter-1.rs:20:5 | LL | box v as Box | ^^^^^ diff --git a/src/test/ui/regions/regions-close-over-type-parameter-1.rs b/src/test/ui/regions/regions-close-over-type-parameter-1.rs index b70ec59420db1..9aee9663e8f46 100644 --- a/src/test/ui/regions/regions-close-over-type-parameter-1.rs +++ b/src/test/ui/regions/regions-close-over-type-parameter-1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] // Test for what happens when a type parameter `A` is closed over into diff --git a/src/test/ui/regions/regions-close-over-type-parameter-1.stderr b/src/test/ui/regions/regions-close-over-type-parameter-1.stderr index 9158cf2683808..6d33f147308c5 100644 --- a/src/test/ui/regions/regions-close-over-type-parameter-1.stderr +++ b/src/test/ui/regions/regions-close-over-type-parameter-1.stderr @@ -1,5 +1,5 @@ error[E0310]: the parameter type `A` may not live long enough - --> $DIR/regions-close-over-type-parameter-1.rs:20:5 + --> $DIR/regions-close-over-type-parameter-1.rs:10:5 | LL | fn make_object1(v: A) -> Box { | -- help: consider adding an explicit lifetime bound `A: 'static`... @@ -7,13 +7,13 @@ LL | box v as Box | ^^^^^ | note: ...so that the type `A` will meet its required lifetime bounds - --> $DIR/regions-close-over-type-parameter-1.rs:20:5 + --> $DIR/regions-close-over-type-parameter-1.rs:10:5 | LL | box v as Box | ^^^^^ error[E0310]: the parameter type `A` may not live long enough - --> $DIR/regions-close-over-type-parameter-1.rs:20:5 + --> $DIR/regions-close-over-type-parameter-1.rs:10:5 | LL | fn make_object1(v: A) -> Box { | -- help: consider adding an explicit lifetime bound `A: 'static`... @@ -21,13 +21,13 @@ LL | box v as Box | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | note: ...so that it can be closed over into an object - --> $DIR/regions-close-over-type-parameter-1.rs:20:5 + --> $DIR/regions-close-over-type-parameter-1.rs:10:5 | LL | box v as Box | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0309]: the parameter type `A` may not live long enough - --> $DIR/regions-close-over-type-parameter-1.rs:30:5 + --> $DIR/regions-close-over-type-parameter-1.rs:20:5 | LL | fn make_object3<'a,'b,A:SomeTrait+'a>(v: A) -> Box { | -- help: consider adding an explicit lifetime bound `A: 'b`... @@ -35,13 +35,13 @@ LL | box v as Box | ^^^^^ | note: ...so that the type `A` will meet its required lifetime bounds - --> $DIR/regions-close-over-type-parameter-1.rs:30:5 + --> $DIR/regions-close-over-type-parameter-1.rs:20:5 | LL | box v as Box | ^^^^^ error[E0309]: the parameter type `A` may not live long enough - --> $DIR/regions-close-over-type-parameter-1.rs:30:5 + --> $DIR/regions-close-over-type-parameter-1.rs:20:5 | LL | fn make_object3<'a,'b,A:SomeTrait+'a>(v: A) -> Box { | -- help: consider adding an explicit lifetime bound `A: 'b`... @@ -49,7 +49,7 @@ LL | box v as Box | ^^^^^^^^^^^^^^^^^^^^^^^^^^ | note: ...so that it can be closed over into an object - --> $DIR/regions-close-over-type-parameter-1.rs:30:5 + --> $DIR/regions-close-over-type-parameter-1.rs:20:5 | LL | box v as Box | ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/regions/regions-close-over-type-parameter-multiple.nll.stderr b/src/test/ui/regions/regions-close-over-type-parameter-multiple.nll.stderr index 9e0dd9da0e4bf..dd380926b4f92 100644 --- a/src/test/ui/regions/regions-close-over-type-parameter-multiple.nll.stderr +++ b/src/test/ui/regions/regions-close-over-type-parameter-multiple.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/regions-close-over-type-parameter-multiple.rs:30:5 + --> $DIR/regions-close-over-type-parameter-multiple.rs:20:5 | LL | box v as Box //~ ERROR cannot infer an appropriate lifetime | ^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0309]: the parameter type `A` may not live long enough - --> $DIR/regions-close-over-type-parameter-multiple.rs:30:5 + --> $DIR/regions-close-over-type-parameter-multiple.rs:20:5 | LL | box v as Box //~ ERROR cannot infer an appropriate lifetime | ^^^^^ diff --git a/src/test/ui/regions/regions-close-over-type-parameter-multiple.rs b/src/test/ui/regions/regions-close-over-type-parameter-multiple.rs index ad6c5a31bbbd3..defbc5d9f2395 100644 --- a/src/test/ui/regions/regions-close-over-type-parameter-multiple.rs +++ b/src/test/ui/regions/regions-close-over-type-parameter-multiple.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] // Various tests where we over type parameters with multiple lifetime diff --git a/src/test/ui/regions/regions-close-over-type-parameter-multiple.stderr b/src/test/ui/regions/regions-close-over-type-parameter-multiple.stderr index f85041e8cedea..4803ae8441518 100644 --- a/src/test/ui/regions/regions-close-over-type-parameter-multiple.stderr +++ b/src/test/ui/regions/regions-close-over-type-parameter-multiple.stderr @@ -1,21 +1,21 @@ error[E0495]: cannot infer an appropriate lifetime due to conflicting requirements - --> $DIR/regions-close-over-type-parameter-multiple.rs:30:5 + --> $DIR/regions-close-over-type-parameter-multiple.rs:20:5 | LL | box v as Box //~ ERROR cannot infer an appropriate lifetime | ^^^^^^^^^^^^^^^^^^^^^^^^^^ | -note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 28:20... - --> $DIR/regions-close-over-type-parameter-multiple.rs:28:20 +note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 18:20... + --> $DIR/regions-close-over-type-parameter-multiple.rs:18:20 | LL | fn make_object_bad<'a,'b,'c,A:SomeTrait+'a+'b>(v: A) -> Box { | ^^ note: ...so that the declared lifetime parameter bounds are satisfied - --> $DIR/regions-close-over-type-parameter-multiple.rs:30:5 + --> $DIR/regions-close-over-type-parameter-multiple.rs:20:5 | LL | box v as Box //~ ERROR cannot infer an appropriate lifetime | ^^^^^^^^^^^^^^^^^^^^^^^^^^ -note: but, the lifetime must be valid for the lifetime 'c as defined on the function body at 28:26... - --> $DIR/regions-close-over-type-parameter-multiple.rs:28:26 +note: but, the lifetime must be valid for the lifetime 'c as defined on the function body at 18:26... + --> $DIR/regions-close-over-type-parameter-multiple.rs:18:26 | LL | fn make_object_bad<'a,'b,'c,A:SomeTrait+'a+'b>(v: A) -> Box { | ^^ diff --git a/src/test/ui/regions/regions-close-param-into-object.nll.stderr b/src/test/ui/regions/regions-close-param-into-object.nll.stderr index 260a4067e100d..55f6c270752d8 100644 --- a/src/test/ui/regions/regions-close-param-into-object.nll.stderr +++ b/src/test/ui/regions/regions-close-param-into-object.nll.stderr @@ -1,29 +1,29 @@ warning: not reporting region error due to nll - --> $DIR/regions-close-param-into-object.rs:16:5 + --> $DIR/regions-close-param-into-object.rs:6:5 | LL | Box::new(v) //~ ERROR parameter type `T` may not live long enough | ^^^^^^^^^^^ warning: not reporting region error due to nll - --> $DIR/regions-close-param-into-object.rs:22:5 + --> $DIR/regions-close-param-into-object.rs:12:5 | LL | Box::new(v) //~ ERROR parameter type `T` may not live long enough | ^^^^^^^^^^^ warning: not reporting region error due to nll - --> $DIR/regions-close-param-into-object.rs:28:5 + --> $DIR/regions-close-param-into-object.rs:18:5 | LL | Box::new(v) //~ ERROR parameter type `T` may not live long enough | ^^^^^^^^^^^ warning: not reporting region error due to nll - --> $DIR/regions-close-param-into-object.rs:34:5 + --> $DIR/regions-close-param-into-object.rs:24:5 | LL | Box::new(v) //~ ERROR parameter type `T` may not live long enough | ^^^^^^^^^^^ error[E0310]: the parameter type `T` may not live long enough - --> $DIR/regions-close-param-into-object.rs:16:5 + --> $DIR/regions-close-param-into-object.rs:6:5 | LL | Box::new(v) //~ ERROR parameter type `T` may not live long enough | ^^^^^^^^^^^ @@ -31,7 +31,7 @@ LL | Box::new(v) //~ ERROR parameter type `T` may not live long enough = help: consider adding an explicit lifetime bound `T: 'static`... error[E0310]: the parameter type `T` may not live long enough - --> $DIR/regions-close-param-into-object.rs:22:5 + --> $DIR/regions-close-param-into-object.rs:12:5 | LL | Box::new(v) //~ ERROR parameter type `T` may not live long enough | ^^^^^^^^^^^ @@ -39,7 +39,7 @@ LL | Box::new(v) //~ ERROR parameter type `T` may not live long enough = help: consider adding an explicit lifetime bound `T: 'static`... error[E0309]: the parameter type `T` may not live long enough - --> $DIR/regions-close-param-into-object.rs:28:5 + --> $DIR/regions-close-param-into-object.rs:18:5 | LL | Box::new(v) //~ ERROR parameter type `T` may not live long enough | ^^^^^^^^^^^ @@ -47,7 +47,7 @@ LL | Box::new(v) //~ ERROR parameter type `T` may not live long enough = help: consider adding an explicit lifetime bound `T: 'a`... error[E0309]: the parameter type `T` may not live long enough - --> $DIR/regions-close-param-into-object.rs:34:5 + --> $DIR/regions-close-param-into-object.rs:24:5 | LL | Box::new(v) //~ ERROR parameter type `T` may not live long enough | ^^^^^^^^^^^ diff --git a/src/test/ui/regions/regions-close-param-into-object.rs b/src/test/ui/regions/regions-close-param-into-object.rs index c9063405bd7e2..86590748cb2d4 100644 --- a/src/test/ui/regions/regions-close-param-into-object.rs +++ b/src/test/ui/regions/regions-close-param-into-object.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait X { fn foo(&self) {} } fn p1(v: T) -> Box diff --git a/src/test/ui/regions/regions-close-param-into-object.stderr b/src/test/ui/regions/regions-close-param-into-object.stderr index 72ed7ac944803..58028fc7bd8cc 100644 --- a/src/test/ui/regions/regions-close-param-into-object.stderr +++ b/src/test/ui/regions/regions-close-param-into-object.stderr @@ -1,5 +1,5 @@ error[E0310]: the parameter type `T` may not live long enough - --> $DIR/regions-close-param-into-object.rs:16:5 + --> $DIR/regions-close-param-into-object.rs:6:5 | LL | fn p1(v: T) -> Box | - help: consider adding an explicit lifetime bound `T: 'static`... @@ -8,13 +8,13 @@ LL | Box::new(v) //~ ERROR parameter type `T` may not live long enough | ^^^^^^^^^^^ | note: ...so that the type `T` will meet its required lifetime bounds - --> $DIR/regions-close-param-into-object.rs:16:5 + --> $DIR/regions-close-param-into-object.rs:6:5 | LL | Box::new(v) //~ ERROR parameter type `T` may not live long enough | ^^^^^^^^^^^ error[E0310]: the parameter type `T` may not live long enough - --> $DIR/regions-close-param-into-object.rs:22:5 + --> $DIR/regions-close-param-into-object.rs:12:5 | LL | fn p2(v: Box) -> Box | - help: consider adding an explicit lifetime bound `T: 'static`... @@ -23,13 +23,13 @@ LL | Box::new(v) //~ ERROR parameter type `T` may not live long enough | ^^^^^^^^^^^ | note: ...so that the type `std::boxed::Box` will meet its required lifetime bounds - --> $DIR/regions-close-param-into-object.rs:22:5 + --> $DIR/regions-close-param-into-object.rs:12:5 | LL | Box::new(v) //~ ERROR parameter type `T` may not live long enough | ^^^^^^^^^^^ error[E0309]: the parameter type `T` may not live long enough - --> $DIR/regions-close-param-into-object.rs:28:5 + --> $DIR/regions-close-param-into-object.rs:18:5 | LL | fn p3<'a,T>(v: T) -> Box | - help: consider adding an explicit lifetime bound `T: 'a`... @@ -38,13 +38,13 @@ LL | Box::new(v) //~ ERROR parameter type `T` may not live long enough | ^^^^^^^^^^^ | note: ...so that the type `T` will meet its required lifetime bounds - --> $DIR/regions-close-param-into-object.rs:28:5 + --> $DIR/regions-close-param-into-object.rs:18:5 | LL | Box::new(v) //~ ERROR parameter type `T` may not live long enough | ^^^^^^^^^^^ error[E0309]: the parameter type `T` may not live long enough - --> $DIR/regions-close-param-into-object.rs:34:5 + --> $DIR/regions-close-param-into-object.rs:24:5 | LL | fn p4<'a,T>(v: Box) -> Box | - help: consider adding an explicit lifetime bound `T: 'a`... @@ -53,7 +53,7 @@ LL | Box::new(v) //~ ERROR parameter type `T` may not live long enough | ^^^^^^^^^^^ | note: ...so that the type `std::boxed::Box` will meet its required lifetime bounds - --> $DIR/regions-close-param-into-object.rs:34:5 + --> $DIR/regions-close-param-into-object.rs:24:5 | LL | Box::new(v) //~ ERROR parameter type `T` may not live long enough | ^^^^^^^^^^^ diff --git a/src/test/ui/regions/regions-creating-enums.nll.stderr b/src/test/ui/regions/regions-creating-enums.nll.stderr index 58dff9c6c37c7..1c896391dd685 100644 --- a/src/test/ui/regions/regions-creating-enums.nll.stderr +++ b/src/test/ui/regions/regions-creating-enums.nll.stderr @@ -1,27 +1,27 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/regions-creating-enums.rs:33:17 + --> $DIR/regions-creating-enums.rs:23:17 | LL | return &ast::num((*f)(x)); //~ ERROR borrowed value does not live long enough | ^^^^^^^^^^^^^^^^^- temporary value only lives until here | | | temporary value does not live long enough | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 30:13... - --> $DIR/regions-creating-enums.rs:30:13 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 20:13... + --> $DIR/regions-creating-enums.rs:20:13 | LL | fn map_nums<'a,'b, F>(x: &ast, f: &mut F) -> &'a ast<'b> where F: FnMut(usize) -> usize { | ^^ error[E0597]: borrowed value does not live long enough - --> $DIR/regions-creating-enums.rs:38:17 + --> $DIR/regions-creating-enums.rs:28:17 | LL | return &ast::add(m_x, m_y); //~ ERROR borrowed value does not live long enough | ^^^^^^^^^^^^^^^^^^- temporary value only lives until here | | | temporary value does not live long enough | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 30:13... - --> $DIR/regions-creating-enums.rs:30:13 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 20:13... + --> $DIR/regions-creating-enums.rs:20:13 | LL | fn map_nums<'a,'b, F>(x: &ast, f: &mut F) -> &'a ast<'b> where F: FnMut(usize) -> usize { | ^^ diff --git a/src/test/ui/regions/regions-creating-enums.rs b/src/test/ui/regions/regions-creating-enums.rs index ad2dc28afef02..1b9c3dd94c707 100644 --- a/src/test/ui/regions/regions-creating-enums.rs +++ b/src/test/ui/regions/regions-creating-enums.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum ast<'a> { num(usize), add(&'a ast<'a>, &'a ast<'a>) diff --git a/src/test/ui/regions/regions-creating-enums.stderr b/src/test/ui/regions/regions-creating-enums.stderr index 7b0847739d7f5..8d07b4be0fc2b 100644 --- a/src/test/ui/regions/regions-creating-enums.stderr +++ b/src/test/ui/regions/regions-creating-enums.stderr @@ -1,28 +1,28 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/regions-creating-enums.rs:33:17 + --> $DIR/regions-creating-enums.rs:23:17 | LL | return &ast::num((*f)(x)); //~ ERROR borrowed value does not live long enough | ^^^^^^^^^^^^^^^^^- temporary value only lives until here | | | temporary value does not live long enough | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 30:13... - --> $DIR/regions-creating-enums.rs:30:13 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 20:13... + --> $DIR/regions-creating-enums.rs:20:13 | LL | fn map_nums<'a,'b, F>(x: &ast, f: &mut F) -> &'a ast<'b> where F: FnMut(usize) -> usize { | ^^ = note: consider using a `let` binding to increase its lifetime error[E0597]: borrowed value does not live long enough - --> $DIR/regions-creating-enums.rs:38:17 + --> $DIR/regions-creating-enums.rs:28:17 | LL | return &ast::add(m_x, m_y); //~ ERROR borrowed value does not live long enough | ^^^^^^^^^^^^^^^^^^- temporary value only lives until here | | | temporary value does not live long enough | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 30:13... - --> $DIR/regions-creating-enums.rs:30:13 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 20:13... + --> $DIR/regions-creating-enums.rs:20:13 | LL | fn map_nums<'a,'b, F>(x: &ast, f: &mut F) -> &'a ast<'b> where F: FnMut(usize) -> usize { | ^^ diff --git a/src/test/ui/regions/regions-creating-enums3.nll.stderr b/src/test/ui/regions/regions-creating-enums3.nll.stderr index 462e4152ce3ba..db73306127597 100644 --- a/src/test/ui/regions/regions-creating-enums3.nll.stderr +++ b/src/test/ui/regions/regions-creating-enums3.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/regions-creating-enums3.rs:17:5 + --> $DIR/regions-creating-enums3.rs:7:5 | LL | ast::add(x, y) //~ ERROR 17:5: 17:19: lifetime mismatch [E0623] | ^^^^^^^^ error: unsatisfied lifetime constraints - --> $DIR/regions-creating-enums3.rs:17:5 + --> $DIR/regions-creating-enums3.rs:7:5 | LL | fn mk_add_bad1<'a,'b>(x: &'a ast<'a>, y: &'b ast<'b>) -> ast<'a> { | -- -- lifetime `'b` defined here diff --git a/src/test/ui/regions/regions-creating-enums3.rs b/src/test/ui/regions/regions-creating-enums3.rs index dcc579d26c18f..2a6669db4475d 100644 --- a/src/test/ui/regions/regions-creating-enums3.rs +++ b/src/test/ui/regions/regions-creating-enums3.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum ast<'a> { num(usize), add(&'a ast<'a>, &'a ast<'a>) diff --git a/src/test/ui/regions/regions-creating-enums3.stderr b/src/test/ui/regions/regions-creating-enums3.stderr index b2cca9a3c627d..54df7dc535769 100644 --- a/src/test/ui/regions/regions-creating-enums3.stderr +++ b/src/test/ui/regions/regions-creating-enums3.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/regions-creating-enums3.rs:17:5 + --> $DIR/regions-creating-enums3.rs:7:5 | LL | fn mk_add_bad1<'a,'b>(x: &'a ast<'a>, y: &'b ast<'b>) -> ast<'a> { | ----------- ------- diff --git a/src/test/ui/regions/regions-creating-enums4.nll.stderr b/src/test/ui/regions/regions-creating-enums4.nll.stderr index b82fdfd5c65c4..30be5abef9c28 100644 --- a/src/test/ui/regions/regions-creating-enums4.nll.stderr +++ b/src/test/ui/regions/regions-creating-enums4.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/regions-creating-enums4.rs:17:5 + --> $DIR/regions-creating-enums4.rs:7:5 | LL | ast::add(x, y) //~ ERROR cannot infer | ^^^^^^^^ error: unsatisfied lifetime constraints - --> $DIR/regions-creating-enums4.rs:17:5 + --> $DIR/regions-creating-enums4.rs:7:5 | LL | fn mk_add_bad2<'a,'b>(x: &'a ast<'a>, y: &'a ast<'a>, z: &ast) -> ast<'b> { | -- -- lifetime `'b` defined here diff --git a/src/test/ui/regions/regions-creating-enums4.rs b/src/test/ui/regions/regions-creating-enums4.rs index 5dc9b370f32b5..6f4e689972756 100644 --- a/src/test/ui/regions/regions-creating-enums4.rs +++ b/src/test/ui/regions/regions-creating-enums4.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum ast<'a> { num(usize), add(&'a ast<'a>, &'a ast<'a>) diff --git a/src/test/ui/regions/regions-creating-enums4.stderr b/src/test/ui/regions/regions-creating-enums4.stderr index 729dc2f107a4f..2cd132c84a54f 100644 --- a/src/test/ui/regions/regions-creating-enums4.stderr +++ b/src/test/ui/regions/regions-creating-enums4.stderr @@ -1,19 +1,19 @@ error[E0495]: cannot infer an appropriate lifetime for lifetime parameter `'a` due to conflicting requirements - --> $DIR/regions-creating-enums4.rs:17:5 + --> $DIR/regions-creating-enums4.rs:7:5 | LL | ast::add(x, y) //~ ERROR cannot infer | ^^^^^^^^ | -note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 16:16... - --> $DIR/regions-creating-enums4.rs:16:16 +note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 6:16... + --> $DIR/regions-creating-enums4.rs:6:16 | LL | fn mk_add_bad2<'a,'b>(x: &'a ast<'a>, y: &'a ast<'a>, z: &ast) -> ast<'b> { | ^^ = note: ...so that the expression is assignable: expected &ast<'_> found &ast<'a> -note: but, the lifetime must be valid for the lifetime 'b as defined on the function body at 16:19... - --> $DIR/regions-creating-enums4.rs:16:19 +note: but, the lifetime must be valid for the lifetime 'b as defined on the function body at 6:19... + --> $DIR/regions-creating-enums4.rs:6:19 | LL | fn mk_add_bad2<'a,'b>(x: &'a ast<'a>, y: &'a ast<'a>, z: &ast) -> ast<'b> { | ^^ diff --git a/src/test/ui/regions/regions-early-bound-error-method.nll.stderr b/src/test/ui/regions/regions-early-bound-error-method.nll.stderr index cd2da8f3c6e72..50e855e1e1b16 100644 --- a/src/test/ui/regions/regions-early-bound-error-method.nll.stderr +++ b/src/test/ui/regions/regions-early-bound-error-method.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/regions-early-bound-error-method.rs:30:9 + --> $DIR/regions-early-bound-error-method.rs:20:9 | LL | g2.get() | ^^^^^^^^ error: unsatisfied lifetime constraints - --> $DIR/regions-early-bound-error-method.rs:30:9 + --> $DIR/regions-early-bound-error-method.rs:20:9 | LL | impl<'a> Box<'a> { | -- lifetime `'a` defined here diff --git a/src/test/ui/regions/regions-early-bound-error-method.rs b/src/test/ui/regions/regions-early-bound-error-method.rs index eaf9a750570db..32428143ef9d9 100644 --- a/src/test/ui/regions/regions-early-bound-error-method.rs +++ b/src/test/ui/regions/regions-early-bound-error-method.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that you can use a fn lifetime parameter as part of // the value for a type parameter in a bound. diff --git a/src/test/ui/regions/regions-early-bound-error-method.stderr b/src/test/ui/regions/regions-early-bound-error-method.stderr index 6c542ef5ddfbf..7b9f2c9503b2f 100644 --- a/src/test/ui/regions/regions-early-bound-error-method.stderr +++ b/src/test/ui/regions/regions-early-bound-error-method.stderr @@ -1,16 +1,16 @@ error[E0312]: lifetime of reference outlives lifetime of borrowed content... - --> $DIR/regions-early-bound-error-method.rs:30:9 + --> $DIR/regions-early-bound-error-method.rs:20:9 | LL | g2.get() | ^^^^^^^^ | -note: ...the reference is valid for the lifetime 'a as defined on the impl at 28:6... - --> $DIR/regions-early-bound-error-method.rs:28:6 +note: ...the reference is valid for the lifetime 'a as defined on the impl at 18:6... + --> $DIR/regions-early-bound-error-method.rs:18:6 | LL | impl<'a> Box<'a> { | ^^ -note: ...but the borrowed content is only valid for the lifetime 'b as defined on the method body at 29:11 - --> $DIR/regions-early-bound-error-method.rs:29:11 +note: ...but the borrowed content is only valid for the lifetime 'b as defined on the method body at 19:11 + --> $DIR/regions-early-bound-error-method.rs:19:11 | LL | fn or<'b,G:GetRef<'b>>(&self, g2: G) -> &'a isize { | ^^ diff --git a/src/test/ui/regions/regions-early-bound-error.nll.stderr b/src/test/ui/regions/regions-early-bound-error.nll.stderr index 7ba6151173530..15b2da4f22266 100644 --- a/src/test/ui/regions/regions-early-bound-error.nll.stderr +++ b/src/test/ui/regions/regions-early-bound-error.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/regions-early-bound-error.rs:29:5 + --> $DIR/regions-early-bound-error.rs:19:5 | LL | g1.get() | ^^^^^^^^ error: unsatisfied lifetime constraints - --> $DIR/regions-early-bound-error.rs:29:5 + --> $DIR/regions-early-bound-error.rs:19:5 | LL | fn get<'a,'b,G:GetRef<'a, isize>>(g1: G, b: &'b isize) -> &'b isize { | -- -- lifetime `'b` defined here diff --git a/src/test/ui/regions/regions-early-bound-error.rs b/src/test/ui/regions/regions-early-bound-error.rs index 90a3395004776..78dad4f2649d1 100644 --- a/src/test/ui/regions/regions-early-bound-error.rs +++ b/src/test/ui/regions/regions-early-bound-error.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that you can use a fn lifetime parameter as part of // the value for a type parameter in a bound. diff --git a/src/test/ui/regions/regions-early-bound-error.stderr b/src/test/ui/regions/regions-early-bound-error.stderr index 579a7c91e437e..a68355b78f54c 100644 --- a/src/test/ui/regions/regions-early-bound-error.stderr +++ b/src/test/ui/regions/regions-early-bound-error.stderr @@ -1,16 +1,16 @@ error[E0312]: lifetime of reference outlives lifetime of borrowed content... - --> $DIR/regions-early-bound-error.rs:29:5 + --> $DIR/regions-early-bound-error.rs:19:5 | LL | g1.get() | ^^^^^^^^ | -note: ...the reference is valid for the lifetime 'b as defined on the function body at 28:11... - --> $DIR/regions-early-bound-error.rs:28:11 +note: ...the reference is valid for the lifetime 'b as defined on the function body at 18:11... + --> $DIR/regions-early-bound-error.rs:18:11 | LL | fn get<'a,'b,G:GetRef<'a, isize>>(g1: G, b: &'b isize) -> &'b isize { | ^^ -note: ...but the borrowed content is only valid for the lifetime 'a as defined on the function body at 28:8 - --> $DIR/regions-early-bound-error.rs:28:8 +note: ...but the borrowed content is only valid for the lifetime 'a as defined on the function body at 18:8 + --> $DIR/regions-early-bound-error.rs:18:8 | LL | fn get<'a,'b,G:GetRef<'a, isize>>(g1: G, b: &'b isize) -> &'b isize { | ^^ diff --git a/src/test/ui/regions/regions-enum-not-wf.rs b/src/test/ui/regions/regions-enum-not-wf.rs index e21f92bc9b885..73ab45e8462de 100644 --- a/src/test/ui/regions/regions-enum-not-wf.rs +++ b/src/test/ui/regions/regions-enum-not-wf.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Various examples of structs whose fields are not well-formed. #![allow(dead_code)] diff --git a/src/test/ui/regions/regions-enum-not-wf.stderr b/src/test/ui/regions/regions-enum-not-wf.stderr index 381a8aada5a3f..9d42a8f3a681b 100644 --- a/src/test/ui/regions/regions-enum-not-wf.stderr +++ b/src/test/ui/regions/regions-enum-not-wf.stderr @@ -1,5 +1,5 @@ error[E0309]: the parameter type `T` may not live long enough - --> $DIR/regions-enum-not-wf.rs:16:18 + --> $DIR/regions-enum-not-wf.rs:6:18 | LL | enum Ref1<'a, T> { | - help: consider adding an explicit lifetime bound `T: 'a`... @@ -7,13 +7,13 @@ LL | Ref1Variant1(&'a T) //~ ERROR the parameter type `T` may not live long | ^^^^^ | note: ...so that the reference type `&'a T` does not outlive the data it points at - --> $DIR/regions-enum-not-wf.rs:16:18 + --> $DIR/regions-enum-not-wf.rs:6:18 | LL | Ref1Variant1(&'a T) //~ ERROR the parameter type `T` may not live long enough | ^^^^^ error[E0309]: the parameter type `T` may not live long enough - --> $DIR/regions-enum-not-wf.rs:21:25 + --> $DIR/regions-enum-not-wf.rs:11:25 | LL | enum Ref2<'a, T> { | - help: consider adding an explicit lifetime bound `T: 'a`... @@ -22,13 +22,13 @@ LL | Ref2Variant2(isize, &'a T), //~ ERROR the parameter type `T` may not li | ^^^^^ | note: ...so that the reference type `&'a T` does not outlive the data it points at - --> $DIR/regions-enum-not-wf.rs:21:25 + --> $DIR/regions-enum-not-wf.rs:11:25 | LL | Ref2Variant2(isize, &'a T), //~ ERROR the parameter type `T` may not live long enough | ^^^^^ error[E0309]: the parameter type `T` may not live long enough - --> $DIR/regions-enum-not-wf.rs:29:32 + --> $DIR/regions-enum-not-wf.rs:19:32 | LL | enum RefIndirect<'a, T> { | - help: consider adding an explicit lifetime bound `T: 'a`... @@ -36,24 +36,24 @@ LL | RefIndirectVariant1(isize, RefOk<'a,T>) | ^^^^^^^^^^^ | note: ...so that the type `T` will meet its required lifetime bounds - --> $DIR/regions-enum-not-wf.rs:29:32 + --> $DIR/regions-enum-not-wf.rs:19:32 | LL | RefIndirectVariant1(isize, RefOk<'a,T>) | ^^^^^^^^^^^ error[E0491]: in type `&'a &'b T`, reference has a longer lifetime than the data it references - --> $DIR/regions-enum-not-wf.rs:34:23 + --> $DIR/regions-enum-not-wf.rs:24:23 | LL | RefDoubleVariant1(&'a &'b T) | ^^^^^^^^^ | -note: the pointer is valid for the lifetime 'a as defined on the enum at 33:16 - --> $DIR/regions-enum-not-wf.rs:33:16 +note: the pointer is valid for the lifetime 'a as defined on the enum at 23:16 + --> $DIR/regions-enum-not-wf.rs:23:16 | LL | enum RefDouble<'a, 'b, T> { | ^^ -note: but the referenced data is only valid for the lifetime 'b as defined on the enum at 33:20 - --> $DIR/regions-enum-not-wf.rs:33:20 +note: but the referenced data is only valid for the lifetime 'b as defined on the enum at 23:20 + --> $DIR/regions-enum-not-wf.rs:23:20 | LL | enum RefDouble<'a, 'b, T> { | ^^ diff --git a/src/test/ui/regions/regions-escape-method.nll.stderr b/src/test/ui/regions/regions-escape-method.nll.stderr index 4603d1516e0f7..122868cbb33d2 100644 --- a/src/test/ui/regions/regions-escape-method.nll.stderr +++ b/src/test/ui/regions/regions-escape-method.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/regions-escape-method.rs:25:13 + --> $DIR/regions-escape-method.rs:15:13 | LL | s.f(|p| p) //~ ERROR cannot infer | ^ error: unsatisfied lifetime constraints - --> $DIR/regions-escape-method.rs:25:13 + --> $DIR/regions-escape-method.rs:15:13 | LL | s.f(|p| p) //~ ERROR cannot infer | -- ^ returning this value requires that `'1` must outlive `'2` diff --git a/src/test/ui/regions/regions-escape-method.rs b/src/test/ui/regions/regions-escape-method.rs index e3771cfebba25..5127d4d1ceb0f 100644 --- a/src/test/ui/regions/regions-escape-method.rs +++ b/src/test/ui/regions/regions-escape-method.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test a method call where the parameter `B` would (illegally) be // inferred to a region bound in the method argument. If this program // were accepted, then the closure passed to `s.f` could escape its diff --git a/src/test/ui/regions/regions-escape-method.stderr b/src/test/ui/regions/regions-escape-method.stderr index fb0bf845f3bd8..8575a24281d05 100644 --- a/src/test/ui/regions/regions-escape-method.stderr +++ b/src/test/ui/regions/regions-escape-method.stderr @@ -1,24 +1,24 @@ error[E0495]: cannot infer an appropriate lifetime due to conflicting requirements - --> $DIR/regions-escape-method.rs:25:13 + --> $DIR/regions-escape-method.rs:15:13 | LL | s.f(|p| p) //~ ERROR cannot infer | ^ | -note: first, the lifetime cannot outlive the anonymous lifetime #2 defined on the body at 25:9... - --> $DIR/regions-escape-method.rs:25:9 +note: first, the lifetime cannot outlive the anonymous lifetime #2 defined on the body at 15:9... + --> $DIR/regions-escape-method.rs:15:9 | LL | s.f(|p| p) //~ ERROR cannot infer | ^^^^^ = note: ...so that the expression is assignable: expected &i32 found &i32 -note: but, the lifetime must be valid for the method call at 25:5... - --> $DIR/regions-escape-method.rs:25:5 +note: but, the lifetime must be valid for the method call at 15:5... + --> $DIR/regions-escape-method.rs:15:5 | LL | s.f(|p| p) //~ ERROR cannot infer | ^^^^^^^^^^ note: ...so that a type/lifetime parameter is in scope here - --> $DIR/regions-escape-method.rs:25:5 + --> $DIR/regions-escape-method.rs:15:5 | LL | s.f(|p| p) //~ ERROR cannot infer | ^^^^^^^^^^ diff --git a/src/test/ui/regions/regions-escape-via-trait-or-not.nll.stderr b/src/test/ui/regions/regions-escape-via-trait-or-not.nll.stderr index 381f462864780..49700d461d3a0 100644 --- a/src/test/ui/regions/regions-escape-via-trait-or-not.nll.stderr +++ b/src/test/ui/regions/regions-escape-via-trait-or-not.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/regions-escape-via-trait-or-not.rs:28:14 + --> $DIR/regions-escape-via-trait-or-not.rs:18:14 | LL | with(|o| o) //~ ERROR cannot infer | ^ error: unsatisfied lifetime constraints - --> $DIR/regions-escape-via-trait-or-not.rs:28:14 + --> $DIR/regions-escape-via-trait-or-not.rs:18:14 | LL | with(|o| o) //~ ERROR cannot infer | -- ^ returning this value requires that `'1` must outlive `'2` diff --git a/src/test/ui/regions/regions-escape-via-trait-or-not.rs b/src/test/ui/regions/regions-escape-via-trait-or-not.rs index a4363b00e1c93..1e089616f5997 100644 --- a/src/test/ui/regions/regions-escape-via-trait-or-not.rs +++ b/src/test/ui/regions/regions-escape-via-trait-or-not.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] trait Deref { diff --git a/src/test/ui/regions/regions-escape-via-trait-or-not.stderr b/src/test/ui/regions/regions-escape-via-trait-or-not.stderr index 60bd14ba4d79c..8f4bfd889a836 100644 --- a/src/test/ui/regions/regions-escape-via-trait-or-not.stderr +++ b/src/test/ui/regions/regions-escape-via-trait-or-not.stderr @@ -1,24 +1,24 @@ error[E0495]: cannot infer an appropriate lifetime due to conflicting requirements - --> $DIR/regions-escape-via-trait-or-not.rs:28:14 + --> $DIR/regions-escape-via-trait-or-not.rs:18:14 | LL | with(|o| o) //~ ERROR cannot infer | ^ | -note: first, the lifetime cannot outlive the anonymous lifetime #2 defined on the body at 28:10... - --> $DIR/regions-escape-via-trait-or-not.rs:28:10 +note: first, the lifetime cannot outlive the anonymous lifetime #2 defined on the body at 18:10... + --> $DIR/regions-escape-via-trait-or-not.rs:18:10 | LL | with(|o| o) //~ ERROR cannot infer | ^^^^^ = note: ...so that the expression is assignable: expected &isize found &isize -note: but, the lifetime must be valid for the expression at 28:5... - --> $DIR/regions-escape-via-trait-or-not.rs:28:5 +note: but, the lifetime must be valid for the expression at 18:5... + --> $DIR/regions-escape-via-trait-or-not.rs:18:5 | LL | with(|o| o) //~ ERROR cannot infer | ^^^^ -note: ...so type `fn([closure@$DIR/regions-escape-via-trait-or-not.rs:28:10: 28:15]) -> isize {with::<&isize, [closure@$DIR/regions-escape-via-trait-or-not.rs:28:10: 28:15]>}` of expression is valid during the expression - --> $DIR/regions-escape-via-trait-or-not.rs:28:5 +note: ...so type `fn([closure@$DIR/regions-escape-via-trait-or-not.rs:18:10: 18:15]) -> isize {with::<&isize, [closure@$DIR/regions-escape-via-trait-or-not.rs:18:10: 18:15]>}` of expression is valid during the expression + --> $DIR/regions-escape-via-trait-or-not.rs:18:5 | LL | with(|o| o) //~ ERROR cannot infer | ^^^^ diff --git a/src/test/ui/regions/regions-fn-subtyping-return-static.rs b/src/test/ui/regions/regions-fn-subtyping-return-static.rs index 9098511186724..fa5f6a334b0f0 100644 --- a/src/test/ui/regions/regions-fn-subtyping-return-static.rs +++ b/src/test/ui/regions/regions-fn-subtyping-return-static.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // In this fn, the type `F` is a function that takes a reference to a // struct and returns another reference with the same lifetime. // diff --git a/src/test/ui/regions/regions-fn-subtyping-return-static.stderr b/src/test/ui/regions/regions-fn-subtyping-return-static.stderr index bd10dc8a808d6..30646fe79659e 100644 --- a/src/test/ui/regions/regions-fn-subtyping-return-static.stderr +++ b/src/test/ui/regions/regions-fn-subtyping-return-static.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/regions-fn-subtyping-return-static.rs:51:12 + --> $DIR/regions-fn-subtyping-return-static.rs:41:12 | LL | want_F(bar); //~ ERROR E0308 | ^^^ expected concrete lifetime, found bound lifetime parameter 'cx diff --git a/src/test/ui/regions/regions-free-region-ordering-callee-4.rs b/src/test/ui/regions/regions-free-region-ordering-callee-4.rs index bd31d1a5a90dc..de58dd0b10f24 100644 --- a/src/test/ui/regions/regions-free-region-ordering-callee-4.rs +++ b/src/test/ui/regions/regions-free-region-ordering-callee-4.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that callees correctly infer an ordering between free regions // that appear in their parameter list. See also // regions-free-region-ordering-caller.rs diff --git a/src/test/ui/regions/regions-free-region-ordering-callee-4.stderr b/src/test/ui/regions/regions-free-region-ordering-callee-4.stderr index 70970a9cf3b7a..e3f42d592283a 100644 --- a/src/test/ui/regions/regions-free-region-ordering-callee-4.stderr +++ b/src/test/ui/regions/regions-free-region-ordering-callee-4.stderr @@ -1,5 +1,5 @@ error[E0491]: in type `&'a &'b usize`, reference has a longer lifetime than the data it references - --> $DIR/regions-free-region-ordering-callee-4.rs:15:1 + --> $DIR/regions-free-region-ordering-callee-4.rs:5:1 | LL | / fn ordering4<'a, 'b, F>(a: &'a usize, b: &'b usize, x: F) where F: FnOnce(&'a &'b usize) { LL | | //~^ ERROR reference has a longer lifetime than the data it references @@ -8,13 +8,13 @@ LL | | let z: Option<&'a &'b usize> = None; LL | | } | |_^ | -note: the pointer is valid for the lifetime 'a as defined on the function body at 15:14 - --> $DIR/regions-free-region-ordering-callee-4.rs:15:14 +note: the pointer is valid for the lifetime 'a as defined on the function body at 5:14 + --> $DIR/regions-free-region-ordering-callee-4.rs:5:14 | LL | fn ordering4<'a, 'b, F>(a: &'a usize, b: &'b usize, x: F) where F: FnOnce(&'a &'b usize) { | ^^ -note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 15:18 - --> $DIR/regions-free-region-ordering-callee-4.rs:15:18 +note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 5:18 + --> $DIR/regions-free-region-ordering-callee-4.rs:5:18 | LL | fn ordering4<'a, 'b, F>(a: &'a usize, b: &'b usize, x: F) where F: FnOnce(&'a &'b usize) { | ^^ diff --git a/src/test/ui/regions/regions-free-region-ordering-callee.nll.stderr b/src/test/ui/regions/regions-free-region-ordering-callee.nll.stderr index 3ef1be10f0fdc..097c34a3501ba 100644 --- a/src/test/ui/regions/regions-free-region-ordering-callee.nll.stderr +++ b/src/test/ui/regions/regions-free-region-ordering-callee.nll.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/regions-free-region-ordering-callee.rs:23:5 + --> $DIR/regions-free-region-ordering-callee.rs:13:5 | LL | &*y //~ ERROR 23:5: 23:8: lifetime mismatch [E0623] | ^^^ warning: not reporting region error due to nll - --> $DIR/regions-free-region-ordering-callee.rs:28:24 + --> $DIR/regions-free-region-ordering-callee.rs:18:24 | LL | let z: &'b usize = &*x; | ^^^ error: unsatisfied lifetime constraints - --> $DIR/regions-free-region-ordering-callee.rs:23:5 + --> $DIR/regions-free-region-ordering-callee.rs:13:5 | LL | fn ordering2<'a, 'b>(x: &'a &'b usize, y: &'a usize) -> &'b usize { | -- -- lifetime `'b` defined here @@ -22,7 +22,7 @@ LL | &*y //~ ERROR 23:5: 23:8: lifetime mismatch [E0623] | ^^^ function was supposed to return data with lifetime `'b` but it is returning data with lifetime `'a` error: unsatisfied lifetime constraints - --> $DIR/regions-free-region-ordering-callee.rs:28:24 + --> $DIR/regions-free-region-ordering-callee.rs:18:24 | LL | fn ordering3<'a, 'b>(x: &'a usize, y: &'b usize) -> &'a &'b usize { | -- -- lifetime `'b` defined here diff --git a/src/test/ui/regions/regions-free-region-ordering-callee.rs b/src/test/ui/regions/regions-free-region-ordering-callee.rs index 073a4f79b05f0..6a11db3179471 100644 --- a/src/test/ui/regions/regions-free-region-ordering-callee.rs +++ b/src/test/ui/regions/regions-free-region-ordering-callee.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that callees correctly infer an ordering between free regions // that appear in their parameter list. See also // regions-free-region-ordering-caller.rs diff --git a/src/test/ui/regions/regions-free-region-ordering-callee.stderr b/src/test/ui/regions/regions-free-region-ordering-callee.stderr index 13d94f91c6d84..5741dff1b0a0b 100644 --- a/src/test/ui/regions/regions-free-region-ordering-callee.stderr +++ b/src/test/ui/regions/regions-free-region-ordering-callee.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/regions-free-region-ordering-callee.rs:23:5 + --> $DIR/regions-free-region-ordering-callee.rs:13:5 | LL | fn ordering2<'a, 'b>(x: &'a &'b usize, y: &'a usize) -> &'b usize { | ------------- --------- @@ -10,7 +10,7 @@ LL | &*y //~ ERROR 23:5: 23:8: lifetime mismatch [E0623] | ^^^ ...but data from `x` is returned here error[E0623]: lifetime mismatch - --> $DIR/regions-free-region-ordering-callee.rs:28:24 + --> $DIR/regions-free-region-ordering-callee.rs:18:24 | LL | fn ordering3<'a, 'b>(x: &'a usize, y: &'b usize) -> &'a &'b usize { | --------- ------------- diff --git a/src/test/ui/regions/regions-free-region-ordering-caller.rs b/src/test/ui/regions/regions-free-region-ordering-caller.rs index ee6cd6c4b1523..04713b785175c 100644 --- a/src/test/ui/regions/regions-free-region-ordering-caller.rs +++ b/src/test/ui/regions/regions-free-region-ordering-caller.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-compare-mode-nll // Test various ways to construct a pointer with a longer lifetime diff --git a/src/test/ui/regions/regions-free-region-ordering-caller.stderr b/src/test/ui/regions/regions-free-region-ordering-caller.stderr index 96502b69c0819..00deb9e39b545 100644 --- a/src/test/ui/regions/regions-free-region-ordering-caller.stderr +++ b/src/test/ui/regions/regions-free-region-ordering-caller.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/regions-free-region-ordering-caller.rs:20:12 + --> $DIR/regions-free-region-ordering-caller.rs:10:12 | LL | fn call2<'a, 'b>(a: &'a usize, b: &'b usize) { | --------- --------- @@ -9,7 +9,7 @@ LL | let z: Option<&'b &'a usize> = None;//~ ERROR E0623 | ^^^^^^^^^^^^^^^^^^^^^ ...but data from `a` flows into `b` here error[E0623]: lifetime mismatch - --> $DIR/regions-free-region-ordering-caller.rs:25:12 + --> $DIR/regions-free-region-ordering-caller.rs:15:12 | LL | fn call3<'a, 'b>(a: &'a usize, b: &'b usize) { | --------- --------- @@ -20,7 +20,7 @@ LL | let z: Option<&'b Paramd<'a>> = None;//~ ERROR E0623 | ^^^^^^^^^^^^^^^^^^^^^^ ...but data from `a` flows into `b` here error[E0623]: lifetime mismatch - --> $DIR/regions-free-region-ordering-caller.rs:29:12 + --> $DIR/regions-free-region-ordering-caller.rs:19:12 | LL | fn call4<'a, 'b>(a: &'a usize, b: &'b usize) { | --------- --------- these two types are declared with different lifetimes... diff --git a/src/test/ui/regions/regions-free-region-ordering-caller1.nll.stderr b/src/test/ui/regions/regions-free-region-ordering-caller1.nll.stderr index acf7a033ade17..2078260b87151 100644 --- a/src/test/ui/regions/regions-free-region-ordering-caller1.nll.stderr +++ b/src/test/ui/regions/regions-free-region-ordering-caller1.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/regions-free-region-ordering-caller1.rs:19:27 + --> $DIR/regions-free-region-ordering-caller1.rs:9:27 | LL | let z: &'a & usize = &(&y); | ^^^^ temporary value does not live long enough @@ -7,8 +7,8 @@ LL | let z: &'a & usize = &(&y); LL | } | - temporary value only lives until here | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 15:10... - --> $DIR/regions-free-region-ordering-caller1.rs:15:10 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 5:10... + --> $DIR/regions-free-region-ordering-caller1.rs:5:10 | LL | fn call1<'a>(x: &'a usize) { | ^^ diff --git a/src/test/ui/regions/regions-free-region-ordering-caller1.rs b/src/test/ui/regions/regions-free-region-ordering-caller1.rs index b29518ccdabb5..d9251c085e1d2 100644 --- a/src/test/ui/regions/regions-free-region-ordering-caller1.rs +++ b/src/test/ui/regions/regions-free-region-ordering-caller1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test various ways to construct a pointer with a longer lifetime // than the thing it points at and ensure that they result in // errors. See also regions-free-region-ordering-callee.rs diff --git a/src/test/ui/regions/regions-free-region-ordering-caller1.stderr b/src/test/ui/regions/regions-free-region-ordering-caller1.stderr index c0dff6ec384e5..08aaa35e08c48 100644 --- a/src/test/ui/regions/regions-free-region-ordering-caller1.stderr +++ b/src/test/ui/regions/regions-free-region-ordering-caller1.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/regions-free-region-ordering-caller1.rs:19:27 + --> $DIR/regions-free-region-ordering-caller1.rs:9:27 | LL | let z: &'a & usize = &(&y); | ^^^^ temporary value does not live long enough @@ -7,14 +7,14 @@ LL | let z: &'a & usize = &(&y); LL | } | - temporary value only lives until here | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 15:10... - --> $DIR/regions-free-region-ordering-caller1.rs:15:10 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 5:10... + --> $DIR/regions-free-region-ordering-caller1.rs:5:10 | LL | fn call1<'a>(x: &'a usize) { | ^^ error[E0597]: `y` does not live long enough - --> $DIR/regions-free-region-ordering-caller1.rs:19:29 + --> $DIR/regions-free-region-ordering-caller1.rs:9:29 | LL | let z: &'a & usize = &(&y); | ^ borrowed value does not live long enough @@ -22,8 +22,8 @@ LL | let z: &'a & usize = &(&y); LL | } | - borrowed value only lives until here | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 15:10... - --> $DIR/regions-free-region-ordering-caller1.rs:15:10 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 5:10... + --> $DIR/regions-free-region-ordering-caller1.rs:5:10 | LL | fn call1<'a>(x: &'a usize) { | ^^ diff --git a/src/test/ui/regions/regions-free-region-ordering-incorrect.nll.stderr b/src/test/ui/regions/regions-free-region-ordering-incorrect.nll.stderr index 0bc4bf4a951e8..696bfcd05a2a9 100644 --- a/src/test/ui/regions/regions-free-region-ordering-incorrect.nll.stderr +++ b/src/test/ui/regions/regions-free-region-ordering-incorrect.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/regions-free-region-ordering-incorrect.rs:27:15 + --> $DIR/regions-free-region-ordering-incorrect.rs:17:15 | LL | None => &self.val //~ ERROR cannot infer | ^^^^^^^^^ error: unsatisfied lifetime constraints - --> $DIR/regions-free-region-ordering-incorrect.rs:25:5 + --> $DIR/regions-free-region-ordering-incorrect.rs:15:5 | LL | impl<'b, T> Node<'b, T> { | -- lifetime `'b` defined here diff --git a/src/test/ui/regions/regions-free-region-ordering-incorrect.rs b/src/test/ui/regions/regions-free-region-ordering-incorrect.rs index 9cb61c24922ee..36aea8f111cd4 100644 --- a/src/test/ui/regions/regions-free-region-ordering-incorrect.rs +++ b/src/test/ui/regions/regions-free-region-ordering-incorrect.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that free regions ordering only goes one way. That is, // we have `&'a Node<'b, T>`, which implies that `'a <= 'b`, // but not `'b <= 'a`. Hence returning `&self.val` (which has lifetime diff --git a/src/test/ui/regions/regions-free-region-ordering-incorrect.stderr b/src/test/ui/regions/regions-free-region-ordering-incorrect.stderr index 3dce04e2452ad..8d6c3926be6d8 100644 --- a/src/test/ui/regions/regions-free-region-ordering-incorrect.stderr +++ b/src/test/ui/regions/regions-free-region-ordering-incorrect.stderr @@ -1,26 +1,26 @@ error[E0495]: cannot infer an appropriate lifetime for borrow expression due to conflicting requirements - --> $DIR/regions-free-region-ordering-incorrect.rs:27:15 + --> $DIR/regions-free-region-ordering-incorrect.rs:17:15 | LL | None => &self.val //~ ERROR cannot infer | ^^^^^^^^^ | -note: first, the lifetime cannot outlive the lifetime 'a as defined on the method body at 24:10... - --> $DIR/regions-free-region-ordering-incorrect.rs:24:10 +note: first, the lifetime cannot outlive the lifetime 'a as defined on the method body at 14:10... + --> $DIR/regions-free-region-ordering-incorrect.rs:14:10 | LL | fn get<'a>(&'a self) -> &'b T { | ^^ note: ...so that reference does not outlive borrowed content - --> $DIR/regions-free-region-ordering-incorrect.rs:27:15 + --> $DIR/regions-free-region-ordering-incorrect.rs:17:15 | LL | None => &self.val //~ ERROR cannot infer | ^^^^^^^^^ -note: but, the lifetime must be valid for the lifetime 'b as defined on the impl at 23:6... - --> $DIR/regions-free-region-ordering-incorrect.rs:23:6 +note: but, the lifetime must be valid for the lifetime 'b as defined on the impl at 13:6... + --> $DIR/regions-free-region-ordering-incorrect.rs:13:6 | LL | impl<'b, T> Node<'b, T> { | ^^ note: ...so that reference does not outlive borrowed content - --> $DIR/regions-free-region-ordering-incorrect.rs:25:5 + --> $DIR/regions-free-region-ordering-incorrect.rs:15:5 | LL | / match self.next { LL | | Some(ref next) => next.get(), diff --git a/src/test/ui/regions/regions-glb-free-free.nll.stderr b/src/test/ui/regions/regions-glb-free-free.nll.stderr index a82ce96bfbfbf..d57c1c1f4312f 100644 --- a/src/test/ui/regions/regions-glb-free-free.nll.stderr +++ b/src/test/ui/regions/regions-glb-free-free.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/regions-glb-free-free.rs:25:13 + --> $DIR/regions-glb-free-free.rs:15:13 | LL | Flag { //~ ERROR 25:13: 30:14: explicit lifetime required in the type of `s` [E0621] | ^^^^ error[E0621]: explicit lifetime required in the type of `s` - --> $DIR/regions-glb-free-free.rs:25:13 + --> $DIR/regions-glb-free-free.rs:15:13 | LL | pub fn set_desc(self, s: &str) -> Flag<'a> { | ---- help: add explicit lifetime `'a` to the type of `s`: `&'a str` diff --git a/src/test/ui/regions/regions-glb-free-free.rs b/src/test/ui/regions/regions-glb-free-free.rs index 843c5f512f8f1..c4377a8de39e1 100644 --- a/src/test/ui/regions/regions-glb-free-free.rs +++ b/src/test/ui/regions/regions-glb-free-free.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod argparse { pub struct Flag<'a> { name: &'a str, diff --git a/src/test/ui/regions/regions-glb-free-free.stderr b/src/test/ui/regions/regions-glb-free-free.stderr index 48c95a88654e8..bb64b358c2543 100644 --- a/src/test/ui/regions/regions-glb-free-free.stderr +++ b/src/test/ui/regions/regions-glb-free-free.stderr @@ -1,5 +1,5 @@ error[E0621]: explicit lifetime required in the type of `s` - --> $DIR/regions-glb-free-free.rs:25:13 + --> $DIR/regions-glb-free-free.rs:15:13 | LL | pub fn set_desc(self, s: &str) -> Flag<'a> { | ---- help: add explicit lifetime `'a` to the type of `s`: `&'a str` diff --git a/src/test/ui/regions/regions-implied-bounds-projection-gap-1.rs b/src/test/ui/regions/regions-implied-bounds-projection-gap-1.rs index 01de3ddcdf8d9..f50a986175099 100644 --- a/src/test/ui/regions/regions-implied-bounds-projection-gap-1.rs +++ b/src/test/ui/regions/regions-implied-bounds-projection-gap-1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-compare-mode-nll // Illustrates the "projection gap": in this test, even though we know diff --git a/src/test/ui/regions/regions-implied-bounds-projection-gap-1.stderr b/src/test/ui/regions/regions-implied-bounds-projection-gap-1.stderr index e6efb4d5c6b5d..24773e8498ea7 100644 --- a/src/test/ui/regions/regions-implied-bounds-projection-gap-1.stderr +++ b/src/test/ui/regions/regions-implied-bounds-projection-gap-1.stderr @@ -1,5 +1,5 @@ error[E0309]: the parameter type `T` may not live long enough - --> $DIR/regions-implied-bounds-projection-gap-1.rs:28:10 + --> $DIR/regions-implied-bounds-projection-gap-1.rs:18:10 | LL | fn func<'x, T:Trait1<'x>>(t: &'x T::Foo) | -- help: consider adding an explicit lifetime bound `T: 'x`... @@ -8,7 +8,7 @@ LL | wf::<&'x T>(); | ^^^^^ | note: ...so that the reference type `&'x T` does not outlive the data it points at - --> $DIR/regions-implied-bounds-projection-gap-1.rs:28:10 + --> $DIR/regions-implied-bounds-projection-gap-1.rs:18:10 | LL | wf::<&'x T>(); | ^^^^^ diff --git a/src/test/ui/regions/regions-implied-bounds-projection-gap-2.rs b/src/test/ui/regions/regions-implied-bounds-projection-gap-2.rs index b3037a1e187f4..89f5d52b406d2 100644 --- a/src/test/ui/regions/regions-implied-bounds-projection-gap-2.rs +++ b/src/test/ui/regions/regions-implied-bounds-projection-gap-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Along with the other tests in this series, illustrates the // "projection gap": in this test, we know that `T: 'x`, and that is // enough to conclude that `T::Foo: 'x`. diff --git a/src/test/ui/regions/regions-implied-bounds-projection-gap-2.stderr b/src/test/ui/regions/regions-implied-bounds-projection-gap-2.stderr index 7a38797e469bc..f19efc4305edf 100644 --- a/src/test/ui/regions/regions-implied-bounds-projection-gap-2.stderr +++ b/src/test/ui/regions/regions-implied-bounds-projection-gap-2.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/regions-implied-bounds-projection-gap-2.rs:33:1 + --> $DIR/regions-implied-bounds-projection-gap-2.rs:23:1 | LL | fn main() { } //~ ERROR compilation successful | ^^^^^^^^^^^^^ diff --git a/src/test/ui/regions/regions-implied-bounds-projection-gap-3.rs b/src/test/ui/regions/regions-implied-bounds-projection-gap-3.rs index a2e6de2137696..3f38c328c9ab6 100644 --- a/src/test/ui/regions/regions-implied-bounds-projection-gap-3.rs +++ b/src/test/ui/regions/regions-implied-bounds-projection-gap-3.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Along with the other tests in this series, illustrates the // "projection gap": in this test, we know that `T::Foo: 'x`, and that // is (naturally) enough to conclude that `T::Foo: 'x`. diff --git a/src/test/ui/regions/regions-implied-bounds-projection-gap-3.stderr b/src/test/ui/regions/regions-implied-bounds-projection-gap-3.stderr index 1a12697a474ae..92cadda7aa648 100644 --- a/src/test/ui/regions/regions-implied-bounds-projection-gap-3.stderr +++ b/src/test/ui/regions/regions-implied-bounds-projection-gap-3.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/regions-implied-bounds-projection-gap-3.rs:33:1 + --> $DIR/regions-implied-bounds-projection-gap-3.rs:23:1 | LL | fn main() { } //~ ERROR compilation successful | ^^^^^^^^^^^^^ diff --git a/src/test/ui/regions/regions-implied-bounds-projection-gap-4.rs b/src/test/ui/regions/regions-implied-bounds-projection-gap-4.rs index b8582f8c26b31..df767bb506ace 100644 --- a/src/test/ui/regions/regions-implied-bounds-projection-gap-4.rs +++ b/src/test/ui/regions/regions-implied-bounds-projection-gap-4.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Along with the other tests in this series, illustrates the // "projection gap": in this test, we know that `T: 'x`, and that // is (naturally) enough to conclude that `T: 'x`. diff --git a/src/test/ui/regions/regions-implied-bounds-projection-gap-4.stderr b/src/test/ui/regions/regions-implied-bounds-projection-gap-4.stderr index 85b1702e2a096..00852db435359 100644 --- a/src/test/ui/regions/regions-implied-bounds-projection-gap-4.stderr +++ b/src/test/ui/regions/regions-implied-bounds-projection-gap-4.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/regions-implied-bounds-projection-gap-4.rs:33:1 + --> $DIR/regions-implied-bounds-projection-gap-4.rs:23:1 | LL | fn main() { } //~ ERROR compilation successful | ^^^^^^^^^^^^^ diff --git a/src/test/ui/regions/regions-implied-bounds-projection-gap-hr-1.rs b/src/test/ui/regions/regions-implied-bounds-projection-gap-hr-1.rs index fd186d1655916..7e04b6782eba1 100644 --- a/src/test/ui/regions/regions-implied-bounds-projection-gap-hr-1.rs +++ b/src/test/ui/regions/regions-implied-bounds-projection-gap-hr-1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // The "projection gap" is particularly "fun" around higher-ranked // projections. This is because the current code is hard-coded to say // that a projection that contains escaping regions, like ` Trait1<>::Foo> + 'x)`, reference has a longer lifetime than the data it references - --> $DIR/regions-implied-bounds-projection-gap-hr-1.rs:31:1 + --> $DIR/regions-implied-bounds-projection-gap-hr-1.rs:21:1 | LL | / fn callee<'x, 'y, T>(t: &'x for<'z> Trait1< >::Foo >) LL | | //~^ ERROR reference has a longer lifetime than the data it references @@ -7,13 +7,13 @@ LL | | { LL | | } | |_^ | -note: the pointer is valid for the lifetime 'x as defined on the function body at 31:11 - --> $DIR/regions-implied-bounds-projection-gap-hr-1.rs:31:11 +note: the pointer is valid for the lifetime 'x as defined on the function body at 21:11 + --> $DIR/regions-implied-bounds-projection-gap-hr-1.rs:21:11 | LL | fn callee<'x, 'y, T>(t: &'x for<'z> Trait1< >::Foo >) | ^^ -note: but the referenced data is only valid for the lifetime 'y as defined on the function body at 31:15 - --> $DIR/regions-implied-bounds-projection-gap-hr-1.rs:31:15 +note: but the referenced data is only valid for the lifetime 'y as defined on the function body at 21:15 + --> $DIR/regions-implied-bounds-projection-gap-hr-1.rs:21:15 | LL | fn callee<'x, 'y, T>(t: &'x for<'z> Trait1< >::Foo >) | ^^ diff --git a/src/test/ui/regions/regions-in-enums-anon.rs b/src/test/ui/regions/regions-in-enums-anon.rs index 305bf88c4d5d7..da65cb791ec27 100644 --- a/src/test/ui/regions/regions-in-enums-anon.rs +++ b/src/test/ui/regions/regions-in-enums-anon.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that anonymous lifetimes are not permitted in enum declarations enum Foo { diff --git a/src/test/ui/regions/regions-in-enums-anon.stderr b/src/test/ui/regions/regions-in-enums-anon.stderr index f5630f84aed0a..9cfdb67939f12 100644 --- a/src/test/ui/regions/regions-in-enums-anon.stderr +++ b/src/test/ui/regions/regions-in-enums-anon.stderr @@ -1,5 +1,5 @@ error[E0106]: missing lifetime specifier - --> $DIR/regions-in-enums-anon.rs:14:9 + --> $DIR/regions-in-enums-anon.rs:4:9 | LL | Bar(&isize) //~ ERROR missing lifetime specifier | ^ expected lifetime parameter diff --git a/src/test/ui/regions/regions-in-enums.rs b/src/test/ui/regions/regions-in-enums.rs index 613a90dda67c8..843189ddb9c7a 100644 --- a/src/test/ui/regions/regions-in-enums.rs +++ b/src/test/ui/regions/regions-in-enums.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that lifetimes must be declared for use on enums. // See also regions-undeclared.rs diff --git a/src/test/ui/regions/regions-in-enums.stderr b/src/test/ui/regions/regions-in-enums.stderr index cdc0b6ca122ad..d0137d1afefbe 100644 --- a/src/test/ui/regions/regions-in-enums.stderr +++ b/src/test/ui/regions/regions-in-enums.stderr @@ -1,11 +1,11 @@ error[E0261]: use of undeclared lifetime name `'foo` - --> $DIR/regions-in-enums.rs:23:9 + --> $DIR/regions-in-enums.rs:13:9 | LL | X5(&'foo usize) //~ ERROR use of undeclared lifetime name `'foo` | ^^^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'a` - --> $DIR/regions-in-enums.rs:27:9 + --> $DIR/regions-in-enums.rs:17:9 | LL | X6(&'a usize) //~ ERROR use of undeclared lifetime name `'a` | ^^ undeclared lifetime diff --git a/src/test/ui/regions/regions-in-structs-anon.rs b/src/test/ui/regions/regions-in-structs-anon.rs index b85928b1b9fa3..7cb2ce0dbf3f4 100644 --- a/src/test/ui/regions/regions-in-structs-anon.rs +++ b/src/test/ui/regions/regions-in-structs-anon.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that anonymous lifetimes are not permitted in struct declarations struct Foo { diff --git a/src/test/ui/regions/regions-in-structs-anon.stderr b/src/test/ui/regions/regions-in-structs-anon.stderr index ecfac87c6c0cf..9defd82aed596 100644 --- a/src/test/ui/regions/regions-in-structs-anon.stderr +++ b/src/test/ui/regions/regions-in-structs-anon.stderr @@ -1,5 +1,5 @@ error[E0106]: missing lifetime specifier - --> $DIR/regions-in-structs-anon.rs:14:8 + --> $DIR/regions-in-structs-anon.rs:4:8 | LL | x: &isize //~ ERROR missing lifetime specifier | ^ expected lifetime parameter diff --git a/src/test/ui/regions/regions-in-structs.rs b/src/test/ui/regions/regions-in-structs.rs index c231d3a913e0c..93f335f4217a1 100644 --- a/src/test/ui/regions/regions-in-structs.rs +++ b/src/test/ui/regions/regions-in-structs.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct yes1<'a> { x: &'a usize, } diff --git a/src/test/ui/regions/regions-in-structs.stderr b/src/test/ui/regions/regions-in-structs.stderr index 679a219fbb1c7..dea7f1054183e 100644 --- a/src/test/ui/regions/regions-in-structs.stderr +++ b/src/test/ui/regions/regions-in-structs.stderr @@ -1,11 +1,11 @@ error[E0261]: use of undeclared lifetime name `'a` - --> $DIR/regions-in-structs.rs:20:9 + --> $DIR/regions-in-structs.rs:10:9 | LL | a: &'a isize, //~ ERROR use of undeclared lifetime name `'a` | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'a` - --> $DIR/regions-in-structs.rs:21:9 + --> $DIR/regions-in-structs.rs:11:9 | LL | b: &'a isize, //~ ERROR use of undeclared lifetime name `'a` | ^^ undeclared lifetime diff --git a/src/test/ui/regions/regions-infer-at-fn-not-param.nll.stderr b/src/test/ui/regions/regions-infer-at-fn-not-param.nll.stderr index 6bc3dafea51f4..bab45574890ed 100644 --- a/src/test/ui/regions/regions-infer-at-fn-not-param.nll.stderr +++ b/src/test/ui/regions/regions-infer-at-fn-not-param.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/regions-infer-at-fn-not-param.rs:23:57 + --> $DIR/regions-infer-at-fn-not-param.rs:13:57 | LL | fn take1<'a>(p: parameterized1) -> parameterized1<'a> { p } | ^ error[E0621]: explicit lifetime required in the type of `p` - --> $DIR/regions-infer-at-fn-not-param.rs:23:57 + --> $DIR/regions-infer-at-fn-not-param.rs:13:57 | LL | fn take1<'a>(p: parameterized1) -> parameterized1<'a> { p } | -------------- ^ lifetime `'a` required diff --git a/src/test/ui/regions/regions-infer-at-fn-not-param.rs b/src/test/ui/regions/regions-infer-at-fn-not-param.rs index ec73bf90b6e52..1794c9ee0be4a 100644 --- a/src/test/ui/regions/regions-infer-at-fn-not-param.rs +++ b/src/test/ui/regions/regions-infer-at-fn-not-param.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct parameterized1<'a> { g: Box } diff --git a/src/test/ui/regions/regions-infer-at-fn-not-param.stderr b/src/test/ui/regions/regions-infer-at-fn-not-param.stderr index f129ffae23aaa..836f455efbc16 100644 --- a/src/test/ui/regions/regions-infer-at-fn-not-param.stderr +++ b/src/test/ui/regions/regions-infer-at-fn-not-param.stderr @@ -1,5 +1,5 @@ error[E0621]: explicit lifetime required in the type of `p` - --> $DIR/regions-infer-at-fn-not-param.rs:23:57 + --> $DIR/regions-infer-at-fn-not-param.rs:13:57 | LL | fn take1<'a>(p: parameterized1) -> parameterized1<'a> { p } | -------------- ^ lifetime `'a` required diff --git a/src/test/ui/regions/regions-infer-borrow-scope-too-big.nll.stderr b/src/test/ui/regions/regions-infer-borrow-scope-too-big.nll.stderr index 28bf252bc9570..281f506cd96df 100644 --- a/src/test/ui/regions/regions-infer-borrow-scope-too-big.nll.stderr +++ b/src/test/ui/regions/regions-infer-borrow-scope-too-big.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `*p` does not live long enough - --> $DIR/regions-infer-borrow-scope-too-big.rs:22:22 + --> $DIR/regions-infer-borrow-scope-too-big.rs:11:22 | LL | let xc = x_coord(&*p); //~ ERROR `*p` does not live long enough | ^^^ borrowed value does not live long enough @@ -7,8 +7,8 @@ LL | let xc = x_coord(&*p); //~ ERROR `*p` does not live long enough LL | } | - `*p` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 21:8... - --> $DIR/regions-infer-borrow-scope-too-big.rs:21:8 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 10:8... + --> $DIR/regions-infer-borrow-scope-too-big.rs:10:8 | LL | fn foo<'a>(p: Box) -> &'a isize { | ^^ diff --git a/src/test/ui/regions/regions-infer-borrow-scope-too-big.rs b/src/test/ui/regions/regions-infer-borrow-scope-too-big.rs index 2628e6a1ce279..921cc8ec51e49 100644 --- a/src/test/ui/regions/regions-infer-borrow-scope-too-big.rs +++ b/src/test/ui/regions/regions-infer-borrow-scope-too-big.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct point { x: isize, y: isize, diff --git a/src/test/ui/regions/regions-infer-borrow-scope-too-big.stderr b/src/test/ui/regions/regions-infer-borrow-scope-too-big.stderr index 4c4a9b9195872..1ad13f7635b02 100644 --- a/src/test/ui/regions/regions-infer-borrow-scope-too-big.stderr +++ b/src/test/ui/regions/regions-infer-borrow-scope-too-big.stderr @@ -1,5 +1,5 @@ error[E0597]: `*p` does not live long enough - --> $DIR/regions-infer-borrow-scope-too-big.rs:22:23 + --> $DIR/regions-infer-borrow-scope-too-big.rs:11:23 | LL | let xc = x_coord(&*p); //~ ERROR `*p` does not live long enough | ^^ borrowed value does not live long enough @@ -7,8 +7,8 @@ LL | let xc = x_coord(&*p); //~ ERROR `*p` does not live long enough LL | } | - borrowed value only lives until here | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 21:8... - --> $DIR/regions-infer-borrow-scope-too-big.rs:21:8 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 10:8... + --> $DIR/regions-infer-borrow-scope-too-big.rs:10:8 | LL | fn foo<'a>(p: Box) -> &'a isize { | ^^ diff --git a/src/test/ui/regions/regions-infer-bound-from-trait-self.nll.stderr b/src/test/ui/regions/regions-infer-bound-from-trait-self.nll.stderr index c71bd17ac7839..fec665941f6f2 100644 --- a/src/test/ui/regions/regions-infer-bound-from-trait-self.nll.stderr +++ b/src/test/ui/regions/regions-infer-bound-from-trait-self.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/regions-infer-bound-from-trait-self.rs:56:9 + --> $DIR/regions-infer-bound-from-trait-self.rs:46:9 | LL | check_bound(x, self) | ^^^^^^^^^^^ error[E0309]: the parameter type `Self` may not live long enough - --> $DIR/regions-infer-bound-from-trait-self.rs:56:9 + --> $DIR/regions-infer-bound-from-trait-self.rs:46:9 | LL | check_bound(x, self) | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/regions/regions-infer-bound-from-trait-self.rs b/src/test/ui/regions/regions-infer-bound-from-trait-self.rs index 23b8ebfe54b44..d15bfffe9d926 100644 --- a/src/test/ui/regions/regions-infer-bound-from-trait-self.rs +++ b/src/test/ui/regions/regions-infer-bound-from-trait-self.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we can derive lifetime bounds on `Self` from trait // inheritance. diff --git a/src/test/ui/regions/regions-infer-bound-from-trait-self.stderr b/src/test/ui/regions/regions-infer-bound-from-trait-self.stderr index 7b30f9a58f57d..bcdadd7a73d6c 100644 --- a/src/test/ui/regions/regions-infer-bound-from-trait-self.stderr +++ b/src/test/ui/regions/regions-infer-bound-from-trait-self.stderr @@ -1,12 +1,12 @@ error[E0309]: the parameter type `Self` may not live long enough - --> $DIR/regions-infer-bound-from-trait-self.rs:56:9 + --> $DIR/regions-infer-bound-from-trait-self.rs:46:9 | LL | check_bound(x, self) | ^^^^^^^^^^^ | = help: consider adding an explicit lifetime bound `Self: 'a`... note: ...so that the type `Self` will meet its required lifetime bounds - --> $DIR/regions-infer-bound-from-trait-self.rs:56:9 + --> $DIR/regions-infer-bound-from-trait-self.rs:46:9 | LL | check_bound(x, self) | ^^^^^^^^^^^ diff --git a/src/test/ui/regions/regions-infer-bound-from-trait.nll.stderr b/src/test/ui/regions/regions-infer-bound-from-trait.nll.stderr index 25f69031507ec..2092bb77074a5 100644 --- a/src/test/ui/regions/regions-infer-bound-from-trait.nll.stderr +++ b/src/test/ui/regions/regions-infer-bound-from-trait.nll.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/regions-infer-bound-from-trait.rs:43:5 + --> $DIR/regions-infer-bound-from-trait.rs:33:5 | LL | check_bound(x, a) //~ ERROR parameter type `A` may not live long enough | ^^^^^^^^^^^ warning: not reporting region error due to nll - --> $DIR/regions-infer-bound-from-trait.rs:47:5 + --> $DIR/regions-infer-bound-from-trait.rs:37:5 | LL | check_bound(x, a) //~ ERROR parameter type `A` may not live long enough | ^^^^^^^^^^^ error[E0309]: the parameter type `A` may not live long enough - --> $DIR/regions-infer-bound-from-trait.rs:43:5 + --> $DIR/regions-infer-bound-from-trait.rs:33:5 | LL | check_bound(x, a) //~ ERROR parameter type `A` may not live long enough | ^^^^^^^^^^^^^^^^^ @@ -19,7 +19,7 @@ LL | check_bound(x, a) //~ ERROR parameter type `A` may not live long enough = help: consider adding an explicit lifetime bound `A: 'a`... error[E0309]: the parameter type `A` may not live long enough - --> $DIR/regions-infer-bound-from-trait.rs:47:5 + --> $DIR/regions-infer-bound-from-trait.rs:37:5 | LL | check_bound(x, a) //~ ERROR parameter type `A` may not live long enough | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/regions/regions-infer-bound-from-trait.rs b/src/test/ui/regions/regions-infer-bound-from-trait.rs index f7a910547669b..610452182f885 100644 --- a/src/test/ui/regions/regions-infer-bound-from-trait.rs +++ b/src/test/ui/regions/regions-infer-bound-from-trait.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we can derive lifetime bounds on type parameters // from trait inheritance. diff --git a/src/test/ui/regions/regions-infer-bound-from-trait.stderr b/src/test/ui/regions/regions-infer-bound-from-trait.stderr index 4c89f4bd8a8f5..100ac7633584e 100644 --- a/src/test/ui/regions/regions-infer-bound-from-trait.stderr +++ b/src/test/ui/regions/regions-infer-bound-from-trait.stderr @@ -1,5 +1,5 @@ error[E0309]: the parameter type `A` may not live long enough - --> $DIR/regions-infer-bound-from-trait.rs:43:5 + --> $DIR/regions-infer-bound-from-trait.rs:33:5 | LL | fn bar1<'a,A>(x: Inv<'a>, a: A) { | - help: consider adding an explicit lifetime bound `A: 'a`... @@ -7,13 +7,13 @@ LL | check_bound(x, a) //~ ERROR parameter type `A` may not live long enough | ^^^^^^^^^^^ | note: ...so that the type `A` will meet its required lifetime bounds - --> $DIR/regions-infer-bound-from-trait.rs:43:5 + --> $DIR/regions-infer-bound-from-trait.rs:33:5 | LL | check_bound(x, a) //~ ERROR parameter type `A` may not live long enough | ^^^^^^^^^^^ error[E0309]: the parameter type `A` may not live long enough - --> $DIR/regions-infer-bound-from-trait.rs:47:5 + --> $DIR/regions-infer-bound-from-trait.rs:37:5 | LL | fn bar2<'a,'b,A:Is<'b>>(x: Inv<'a>, y: Inv<'b>, a: A) { | -- help: consider adding an explicit lifetime bound `A: 'a`... @@ -21,7 +21,7 @@ LL | check_bound(x, a) //~ ERROR parameter type `A` may not live long enough | ^^^^^^^^^^^ | note: ...so that the type `A` will meet its required lifetime bounds - --> $DIR/regions-infer-bound-from-trait.rs:47:5 + --> $DIR/regions-infer-bound-from-trait.rs:37:5 | LL | check_bound(x, a) //~ ERROR parameter type `A` may not live long enough | ^^^^^^^^^^^ diff --git a/src/test/ui/regions/regions-infer-call-3.nll.stderr b/src/test/ui/regions/regions-infer-call-3.nll.stderr index 6069aca62ec5e..54b6b2f2a98d6 100644 --- a/src/test/ui/regions/regions-infer-call-3.nll.stderr +++ b/src/test/ui/regions/regions-infer-call-3.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/regions-infer-call-3.rs:18:24 + --> $DIR/regions-infer-call-3.rs:8:24 | LL | let z = with(|y| { select(x, y) }); | ^^^^^^^^^^^^ error: unsatisfied lifetime constraints - --> $DIR/regions-infer-call-3.rs:18:24 + --> $DIR/regions-infer-call-3.rs:8:24 | LL | let z = with(|y| { select(x, y) }); | -- ^^^^^^^^^^^^ returning this value requires that `'1` must outlive `'2` diff --git a/src/test/ui/regions/regions-infer-call-3.rs b/src/test/ui/regions/regions-infer-call-3.rs index 95783a420b6dd..a76fccbdc5218 100644 --- a/src/test/ui/regions/regions-infer-call-3.rs +++ b/src/test/ui/regions/regions-infer-call-3.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn select<'r>(x: &'r isize, y: &'r isize) -> &'r isize { x } fn with(f: F) -> T where F: FnOnce(&isize) -> T { diff --git a/src/test/ui/regions/regions-infer-call-3.stderr b/src/test/ui/regions/regions-infer-call-3.stderr index d42e5bfc7dd75..1d6dbdb2c7b57 100644 --- a/src/test/ui/regions/regions-infer-call-3.stderr +++ b/src/test/ui/regions/regions-infer-call-3.stderr @@ -1,26 +1,26 @@ error[E0495]: cannot infer an appropriate lifetime for lifetime parameter 'r in function call due to conflicting requirements - --> $DIR/regions-infer-call-3.rs:18:24 + --> $DIR/regions-infer-call-3.rs:8:24 | LL | let z = with(|y| { select(x, y) }); | ^^^^^^^^^^^^ | -note: first, the lifetime cannot outlive the anonymous lifetime #2 defined on the body at 18:18... - --> $DIR/regions-infer-call-3.rs:18:18 +note: first, the lifetime cannot outlive the anonymous lifetime #2 defined on the body at 8:18... + --> $DIR/regions-infer-call-3.rs:8:18 | LL | let z = with(|y| { select(x, y) }); | ^^^^^^^^^^^^^^^^^^^^ note: ...so that reference does not outlive borrowed content - --> $DIR/regions-infer-call-3.rs:18:34 + --> $DIR/regions-infer-call-3.rs:8:34 | LL | let z = with(|y| { select(x, y) }); | ^ -note: but, the lifetime must be valid for the call at 18:13... - --> $DIR/regions-infer-call-3.rs:18:13 +note: but, the lifetime must be valid for the call at 8:13... + --> $DIR/regions-infer-call-3.rs:8:13 | LL | let z = with(|y| { select(x, y) }); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ note: ...so type `&isize` of expression is valid during the expression - --> $DIR/regions-infer-call-3.rs:18:13 + --> $DIR/regions-infer-call-3.rs:8:13 | LL | let z = with(|y| { select(x, y) }); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/regions/regions-infer-contravariance-due-to-decl.rs b/src/test/ui/regions/regions-infer-contravariance-due-to-decl.rs index a16001b5788b3..8aa0a5258b904 100644 --- a/src/test/ui/regions/regions-infer-contravariance-due-to-decl.rs +++ b/src/test/ui/regions/regions-infer-contravariance-due-to-decl.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-compare-mode-nll // Test that a type which is contravariant with respect to its region diff --git a/src/test/ui/regions/regions-infer-contravariance-due-to-decl.stderr b/src/test/ui/regions/regions-infer-contravariance-due-to-decl.stderr index 675cbc5858348..6fd129b122ab6 100644 --- a/src/test/ui/regions/regions-infer-contravariance-due-to-decl.stderr +++ b/src/test/ui/regions/regions-infer-contravariance-due-to-decl.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/regions-infer-contravariance-due-to-decl.rs:37:35 + --> $DIR/regions-infer-contravariance-due-to-decl.rs:27:35 | LL | fn use_<'short,'long>(c: Contravariant<'short>, | --------------------- these two types are declared with different lifetimes... diff --git a/src/test/ui/regions/regions-infer-covariance-due-to-decl.rs b/src/test/ui/regions/regions-infer-covariance-due-to-decl.rs index f794063610ae0..39508bc200415 100644 --- a/src/test/ui/regions/regions-infer-covariance-due-to-decl.rs +++ b/src/test/ui/regions/regions-infer-covariance-due-to-decl.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-compare-mode-nll // Test that a type which is covariant with respect to its region diff --git a/src/test/ui/regions/regions-infer-covariance-due-to-decl.stderr b/src/test/ui/regions/regions-infer-covariance-due-to-decl.stderr index 6b3673a800284..203cf437bb5c3 100644 --- a/src/test/ui/regions/regions-infer-covariance-due-to-decl.stderr +++ b/src/test/ui/regions/regions-infer-covariance-due-to-decl.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/regions-infer-covariance-due-to-decl.rs:34:32 + --> $DIR/regions-infer-covariance-due-to-decl.rs:24:32 | LL | fn use_<'short,'long>(c: Covariant<'long>, | ---------------- diff --git a/src/test/ui/regions/regions-infer-invariance-due-to-decl.nll.stderr b/src/test/ui/regions/regions-infer-invariance-due-to-decl.nll.stderr index cf754167b53ec..e448789f80c03 100644 --- a/src/test/ui/regions/regions-infer-invariance-due-to-decl.nll.stderr +++ b/src/test/ui/regions/regions-infer-invariance-due-to-decl.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/regions-infer-invariance-due-to-decl.rs:22:5 + --> $DIR/regions-infer-invariance-due-to-decl.rs:12:5 | LL | b_isize //~ ERROR mismatched types | ^^^^^^^ error: unsatisfied lifetime constraints - --> $DIR/regions-infer-invariance-due-to-decl.rs:22:5 + --> $DIR/regions-infer-invariance-due-to-decl.rs:12:5 | LL | fn to_longer_lifetime<'r>(b_isize: invariant<'r>) -> invariant<'static> { | -- lifetime `'r` defined here diff --git a/src/test/ui/regions/regions-infer-invariance-due-to-decl.rs b/src/test/ui/regions/regions-infer-invariance-due-to-decl.rs index 8c191fbd5bbe7..faba39c95a920 100644 --- a/src/test/ui/regions/regions-infer-invariance-due-to-decl.rs +++ b/src/test/ui/regions/regions-infer-invariance-due-to-decl.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::marker; struct invariant<'a> { diff --git a/src/test/ui/regions/regions-infer-invariance-due-to-decl.stderr b/src/test/ui/regions/regions-infer-invariance-due-to-decl.stderr index edd37b1622afd..d26923bddd1fc 100644 --- a/src/test/ui/regions/regions-infer-invariance-due-to-decl.stderr +++ b/src/test/ui/regions/regions-infer-invariance-due-to-decl.stderr @@ -1,13 +1,13 @@ error[E0308]: mismatched types - --> $DIR/regions-infer-invariance-due-to-decl.rs:22:5 + --> $DIR/regions-infer-invariance-due-to-decl.rs:12:5 | LL | b_isize //~ ERROR mismatched types | ^^^^^^^ lifetime mismatch | = note: expected type `invariant<'static>` found type `invariant<'r>` -note: the lifetime 'r as defined on the function body at 21:23... - --> $DIR/regions-infer-invariance-due-to-decl.rs:21:23 +note: the lifetime 'r as defined on the function body at 11:23... + --> $DIR/regions-infer-invariance-due-to-decl.rs:11:23 | LL | fn to_longer_lifetime<'r>(b_isize: invariant<'r>) -> invariant<'static> { | ^^ diff --git a/src/test/ui/regions/regions-infer-invariance-due-to-mutability-3.nll.stderr b/src/test/ui/regions/regions-infer-invariance-due-to-mutability-3.nll.stderr index 6cd76f26ebec7..8f88ba926a6db 100644 --- a/src/test/ui/regions/regions-infer-invariance-due-to-mutability-3.nll.stderr +++ b/src/test/ui/regions/regions-infer-invariance-due-to-mutability-3.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/regions-infer-invariance-due-to-mutability-3.rs:21:5 + --> $DIR/regions-infer-invariance-due-to-mutability-3.rs:10:5 | LL | b_isize //~ ERROR mismatched types | ^^^^^^^ error: unsatisfied lifetime constraints - --> $DIR/regions-infer-invariance-due-to-mutability-3.rs:21:5 + --> $DIR/regions-infer-invariance-due-to-mutability-3.rs:10:5 | LL | fn to_longer_lifetime<'r>(b_isize: invariant<'r>) -> invariant<'static> { | -- lifetime `'r` defined here diff --git a/src/test/ui/regions/regions-infer-invariance-due-to-mutability-3.rs b/src/test/ui/regions/regions-infer-invariance-due-to-mutability-3.rs index f280e4d978eed..40b526a992a2a 100644 --- a/src/test/ui/regions/regions-infer-invariance-due-to-mutability-3.rs +++ b/src/test/ui/regions/regions-infer-invariance-due-to-mutability-3.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct invariant<'a> { f: Box, } diff --git a/src/test/ui/regions/regions-infer-invariance-due-to-mutability-3.stderr b/src/test/ui/regions/regions-infer-invariance-due-to-mutability-3.stderr index 3a807b755afe3..d3413b15b200c 100644 --- a/src/test/ui/regions/regions-infer-invariance-due-to-mutability-3.stderr +++ b/src/test/ui/regions/regions-infer-invariance-due-to-mutability-3.stderr @@ -1,13 +1,13 @@ error[E0308]: mismatched types - --> $DIR/regions-infer-invariance-due-to-mutability-3.rs:21:5 + --> $DIR/regions-infer-invariance-due-to-mutability-3.rs:10:5 | LL | b_isize //~ ERROR mismatched types | ^^^^^^^ lifetime mismatch | = note: expected type `invariant<'static>` found type `invariant<'r>` -note: the lifetime 'r as defined on the function body at 20:23... - --> $DIR/regions-infer-invariance-due-to-mutability-3.rs:20:23 +note: the lifetime 'r as defined on the function body at 9:23... + --> $DIR/regions-infer-invariance-due-to-mutability-3.rs:9:23 | LL | fn to_longer_lifetime<'r>(b_isize: invariant<'r>) -> invariant<'static> { | ^^ diff --git a/src/test/ui/regions/regions-infer-invariance-due-to-mutability-4.nll.stderr b/src/test/ui/regions/regions-infer-invariance-due-to-mutability-4.nll.stderr index 1e1daa59019bd..b801c91e57589 100644 --- a/src/test/ui/regions/regions-infer-invariance-due-to-mutability-4.nll.stderr +++ b/src/test/ui/regions/regions-infer-invariance-due-to-mutability-4.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/regions-infer-invariance-due-to-mutability-4.rs:21:5 + --> $DIR/regions-infer-invariance-due-to-mutability-4.rs:10:5 | LL | b_isize //~ ERROR mismatched types | ^^^^^^^ error: unsatisfied lifetime constraints - --> $DIR/regions-infer-invariance-due-to-mutability-4.rs:21:5 + --> $DIR/regions-infer-invariance-due-to-mutability-4.rs:10:5 | LL | fn to_longer_lifetime<'r>(b_isize: Invariant<'r>) -> Invariant<'static> { | -- lifetime `'r` defined here diff --git a/src/test/ui/regions/regions-infer-invariance-due-to-mutability-4.rs b/src/test/ui/regions/regions-infer-invariance-due-to-mutability-4.rs index 87b5efbfadd86..90c86cebce38f 100644 --- a/src/test/ui/regions/regions-infer-invariance-due-to-mutability-4.rs +++ b/src/test/ui/regions/regions-infer-invariance-due-to-mutability-4.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct Invariant<'a> { f: Box *mut &'a isize + 'static>, } diff --git a/src/test/ui/regions/regions-infer-invariance-due-to-mutability-4.stderr b/src/test/ui/regions/regions-infer-invariance-due-to-mutability-4.stderr index fb47433ba1779..51b2330b658f4 100644 --- a/src/test/ui/regions/regions-infer-invariance-due-to-mutability-4.stderr +++ b/src/test/ui/regions/regions-infer-invariance-due-to-mutability-4.stderr @@ -1,13 +1,13 @@ error[E0308]: mismatched types - --> $DIR/regions-infer-invariance-due-to-mutability-4.rs:21:5 + --> $DIR/regions-infer-invariance-due-to-mutability-4.rs:10:5 | LL | b_isize //~ ERROR mismatched types | ^^^^^^^ lifetime mismatch | = note: expected type `Invariant<'static>` found type `Invariant<'r>` -note: the lifetime 'r as defined on the function body at 20:23... - --> $DIR/regions-infer-invariance-due-to-mutability-4.rs:20:23 +note: the lifetime 'r as defined on the function body at 9:23... + --> $DIR/regions-infer-invariance-due-to-mutability-4.rs:9:23 | LL | fn to_longer_lifetime<'r>(b_isize: Invariant<'r>) -> Invariant<'static> { | ^^ diff --git a/src/test/ui/regions/regions-infer-not-param.nll.stderr b/src/test/ui/regions/regions-infer-not-param.nll.stderr index 072be9b5a994e..262e3b853b4b6 100644 --- a/src/test/ui/regions/regions-infer-not-param.nll.stderr +++ b/src/test/ui/regions/regions-infer-not-param.nll.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/regions-infer-not-param.rs:25:54 + --> $DIR/regions-infer-not-param.rs:15:54 | LL | fn take_direct<'a,'b>(p: direct<'a>) -> direct<'b> { p } //~ ERROR mismatched types | ^ warning: not reporting region error due to nll - --> $DIR/regions-infer-not-param.rs:29:63 + --> $DIR/regions-infer-not-param.rs:19:63 | LL | fn take_indirect2<'a,'b>(p: indirect2<'a>) -> indirect2<'b> { p } //~ ERROR mismatched types | ^ error: unsatisfied lifetime constraints - --> $DIR/regions-infer-not-param.rs:25:54 + --> $DIR/regions-infer-not-param.rs:15:54 | LL | fn take_direct<'a,'b>(p: direct<'a>) -> direct<'b> { p } //~ ERROR mismatched types | -- -- lifetime `'b` defined here ^ returning this value requires that `'a` must outlive `'b` @@ -19,7 +19,7 @@ LL | fn take_direct<'a,'b>(p: direct<'a>) -> direct<'b> { p } //~ ERROR mismatch | lifetime `'a` defined here error: unsatisfied lifetime constraints - --> $DIR/regions-infer-not-param.rs:29:63 + --> $DIR/regions-infer-not-param.rs:19:63 | LL | fn take_indirect2<'a,'b>(p: indirect2<'a>) -> indirect2<'b> { p } //~ ERROR mismatched types | -- -- lifetime `'b` defined here ^ function was supposed to return data with lifetime `'a` but it is returning data with lifetime `'b` @@ -27,7 +27,7 @@ LL | fn take_indirect2<'a,'b>(p: indirect2<'a>) -> indirect2<'b> { p } //~ ERROR | lifetime `'a` defined here error: unsatisfied lifetime constraints - --> $DIR/regions-infer-not-param.rs:29:63 + --> $DIR/regions-infer-not-param.rs:19:63 | LL | fn take_indirect2<'a,'b>(p: indirect2<'a>) -> indirect2<'b> { p } //~ ERROR mismatched types | -- -- lifetime `'b` defined here ^ returning this value requires that `'a` must outlive `'b` diff --git a/src/test/ui/regions/regions-infer-not-param.rs b/src/test/ui/regions/regions-infer-not-param.rs index 131b7170951f6..708749a33fbe0 100644 --- a/src/test/ui/regions/regions-infer-not-param.rs +++ b/src/test/ui/regions/regions-infer-not-param.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct direct<'a> { f: &'a isize } diff --git a/src/test/ui/regions/regions-infer-not-param.stderr b/src/test/ui/regions/regions-infer-not-param.stderr index 2a029518953d3..ad0648b82f869 100644 --- a/src/test/ui/regions/regions-infer-not-param.stderr +++ b/src/test/ui/regions/regions-infer-not-param.stderr @@ -1,56 +1,56 @@ error[E0308]: mismatched types - --> $DIR/regions-infer-not-param.rs:25:54 + --> $DIR/regions-infer-not-param.rs:15:54 | LL | fn take_direct<'a,'b>(p: direct<'a>) -> direct<'b> { p } //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `direct<'b>` found type `direct<'a>` -note: the lifetime 'a as defined on the function body at 25:16... - --> $DIR/regions-infer-not-param.rs:25:16 +note: the lifetime 'a as defined on the function body at 15:16... + --> $DIR/regions-infer-not-param.rs:15:16 | LL | fn take_direct<'a,'b>(p: direct<'a>) -> direct<'b> { p } //~ ERROR mismatched types | ^^ -note: ...does not necessarily outlive the lifetime 'b as defined on the function body at 25:19 - --> $DIR/regions-infer-not-param.rs:25:19 +note: ...does not necessarily outlive the lifetime 'b as defined on the function body at 15:19 + --> $DIR/regions-infer-not-param.rs:15:19 | LL | fn take_direct<'a,'b>(p: direct<'a>) -> direct<'b> { p } //~ ERROR mismatched types | ^^ error[E0308]: mismatched types - --> $DIR/regions-infer-not-param.rs:29:63 + --> $DIR/regions-infer-not-param.rs:19:63 | LL | fn take_indirect2<'a,'b>(p: indirect2<'a>) -> indirect2<'b> { p } //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `indirect2<'b>` found type `indirect2<'a>` -note: the lifetime 'a as defined on the function body at 29:19... - --> $DIR/regions-infer-not-param.rs:29:19 +note: the lifetime 'a as defined on the function body at 19:19... + --> $DIR/regions-infer-not-param.rs:19:19 | LL | fn take_indirect2<'a,'b>(p: indirect2<'a>) -> indirect2<'b> { p } //~ ERROR mismatched types | ^^ -note: ...does not necessarily outlive the lifetime 'b as defined on the function body at 29:22 - --> $DIR/regions-infer-not-param.rs:29:22 +note: ...does not necessarily outlive the lifetime 'b as defined on the function body at 19:22 + --> $DIR/regions-infer-not-param.rs:19:22 | LL | fn take_indirect2<'a,'b>(p: indirect2<'a>) -> indirect2<'b> { p } //~ ERROR mismatched types | ^^ error[E0308]: mismatched types - --> $DIR/regions-infer-not-param.rs:29:63 + --> $DIR/regions-infer-not-param.rs:19:63 | LL | fn take_indirect2<'a,'b>(p: indirect2<'a>) -> indirect2<'b> { p } //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `indirect2<'b>` found type `indirect2<'a>` -note: the lifetime 'b as defined on the function body at 29:22... - --> $DIR/regions-infer-not-param.rs:29:22 +note: the lifetime 'b as defined on the function body at 19:22... + --> $DIR/regions-infer-not-param.rs:19:22 | LL | fn take_indirect2<'a,'b>(p: indirect2<'a>) -> indirect2<'b> { p } //~ ERROR mismatched types | ^^ -note: ...does not necessarily outlive the lifetime 'a as defined on the function body at 29:19 - --> $DIR/regions-infer-not-param.rs:29:19 +note: ...does not necessarily outlive the lifetime 'a as defined on the function body at 19:19 + --> $DIR/regions-infer-not-param.rs:19:19 | LL | fn take_indirect2<'a,'b>(p: indirect2<'a>) -> indirect2<'b> { p } //~ ERROR mismatched types | ^^ diff --git a/src/test/ui/regions/regions-infer-paramd-indirect.nll.stderr b/src/test/ui/regions/regions-infer-paramd-indirect.nll.stderr index 01ae2910bd591..ae1475ed00c3f 100644 --- a/src/test/ui/regions/regions-infer-paramd-indirect.nll.stderr +++ b/src/test/ui/regions/regions-infer-paramd-indirect.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/regions-infer-paramd-indirect.rs:33:18 + --> $DIR/regions-infer-paramd-indirect.rs:22:18 | LL | self.f = b; | ^ error: borrowed data escapes outside of function - --> $DIR/regions-infer-paramd-indirect.rs:33:9 + --> $DIR/regions-infer-paramd-indirect.rs:22:9 | LL | fn set_f_bad(&mut self, b: Box) { | --------- - `b` is a reference that is only valid in the function body diff --git a/src/test/ui/regions/regions-infer-paramd-indirect.rs b/src/test/ui/regions/regions-infer-paramd-indirect.rs index c559992c86531..0dfeb7fd1a0ac 100644 --- a/src/test/ui/regions/regions-infer-paramd-indirect.rs +++ b/src/test/ui/regions/regions-infer-paramd-indirect.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // Check that we correctly infer that b and c must be region // parameterized because they reference a which requires a region. diff --git a/src/test/ui/regions/regions-infer-paramd-indirect.stderr b/src/test/ui/regions/regions-infer-paramd-indirect.stderr index 602f30957f129..2d2d48f754327 100644 --- a/src/test/ui/regions/regions-infer-paramd-indirect.stderr +++ b/src/test/ui/regions/regions-infer-paramd-indirect.stderr @@ -1,13 +1,13 @@ error[E0308]: mismatched types - --> $DIR/regions-infer-paramd-indirect.rs:33:18 + --> $DIR/regions-infer-paramd-indirect.rs:22:18 | LL | self.f = b; | ^ lifetime mismatch | = note: expected type `std::boxed::Box>` found type `std::boxed::Box>` -note: the anonymous lifetime #2 defined on the method body at 32:5... - --> $DIR/regions-infer-paramd-indirect.rs:32:5 +note: the anonymous lifetime #2 defined on the method body at 21:5... + --> $DIR/regions-infer-paramd-indirect.rs:21:5 | LL | / fn set_f_bad(&mut self, b: Box) { LL | | self.f = b; @@ -17,8 +17,8 @@ LL | | //~| found type `std::boxed::Box>` LL | | //~| lifetime mismatch LL | | } | |_____^ -note: ...does not necessarily outlive the lifetime 'a as defined on the impl at 27:6 - --> $DIR/regions-infer-paramd-indirect.rs:27:6 +note: ...does not necessarily outlive the lifetime 'a as defined on the impl at 16:6 + --> $DIR/regions-infer-paramd-indirect.rs:16:6 | LL | impl<'a> set_f<'a> for c<'a> { | ^^ diff --git a/src/test/ui/regions/regions-infer-proc-static-upvar.nll.stderr b/src/test/ui/regions/regions-infer-proc-static-upvar.nll.stderr index fa358a9cc45c2..de49c6571c4a5 100644 --- a/src/test/ui/regions/regions-infer-proc-static-upvar.nll.stderr +++ b/src/test/ui/regions/regions-infer-proc-static-upvar.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `x` does not live long enough - --> $DIR/regions-infer-proc-static-upvar.rs:20:13 + --> $DIR/regions-infer-proc-static-upvar.rs:10:13 | LL | let y = &x; //~ ERROR `x` does not live long enough | ^^ borrowed value does not live long enough diff --git a/src/test/ui/regions/regions-infer-proc-static-upvar.rs b/src/test/ui/regions/regions-infer-proc-static-upvar.rs index ee5d5cad0a3fd..5a64aa7345047 100644 --- a/src/test/ui/regions/regions-infer-proc-static-upvar.rs +++ b/src/test/ui/regions/regions-infer-proc-static-upvar.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that, when a variable of type `&T` is captured inside a proc, // we correctly infer/require that its lifetime is 'static. diff --git a/src/test/ui/regions/regions-infer-proc-static-upvar.stderr b/src/test/ui/regions/regions-infer-proc-static-upvar.stderr index 93fe45ed300d2..f929a06bad75d 100644 --- a/src/test/ui/regions/regions-infer-proc-static-upvar.stderr +++ b/src/test/ui/regions/regions-infer-proc-static-upvar.stderr @@ -1,5 +1,5 @@ error[E0597]: `x` does not live long enough - --> $DIR/regions-infer-proc-static-upvar.rs:20:14 + --> $DIR/regions-infer-proc-static-upvar.rs:10:14 | LL | let y = &x; //~ ERROR `x` does not live long enough | ^ borrowed value does not live long enough diff --git a/src/test/ui/regions/regions-lifetime-bounds-on-fns.nll.stderr b/src/test/ui/regions/regions-lifetime-bounds-on-fns.nll.stderr index 01f0cfa4a7186..543c1466ce8e5 100644 --- a/src/test/ui/regions/regions-lifetime-bounds-on-fns.nll.stderr +++ b/src/test/ui/regions/regions-lifetime-bounds-on-fns.nll.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/regions-lifetime-bounds-on-fns.rs:18:10 + --> $DIR/regions-lifetime-bounds-on-fns.rs:8:10 | LL | *x = *y; //~ ERROR E0623 | ^^ warning: not reporting region error due to nll - --> $DIR/regions-lifetime-bounds-on-fns.rs:24:5 + --> $DIR/regions-lifetime-bounds-on-fns.rs:14:5 | LL | a(x, y); //~ ERROR 24:7: 24:8: lifetime mismatch [E0623] | ^ error[E0308]: mismatched types - --> $DIR/regions-lifetime-bounds-on-fns.rs:30:43 + --> $DIR/regions-lifetime-bounds-on-fns.rs:20:43 | LL | let _: fn(&mut &isize, &mut &isize) = a; //~ ERROR mismatched types | ^ expected concrete lifetime, found bound lifetime parameter diff --git a/src/test/ui/regions/regions-lifetime-bounds-on-fns.rs b/src/test/ui/regions/regions-lifetime-bounds-on-fns.rs index 5955619ea92ad..0dc6d5240e20f 100644 --- a/src/test/ui/regions/regions-lifetime-bounds-on-fns.rs +++ b/src/test/ui/regions/regions-lifetime-bounds-on-fns.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn a<'a, 'b:'a>(x: &mut &'a isize, y: &mut &'b isize) { // Note: this is legal because of the `'b:'a` declaration. *x = *y; diff --git a/src/test/ui/regions/regions-lifetime-bounds-on-fns.stderr b/src/test/ui/regions/regions-lifetime-bounds-on-fns.stderr index 1b600ef905f43..1daab5cefa992 100644 --- a/src/test/ui/regions/regions-lifetime-bounds-on-fns.stderr +++ b/src/test/ui/regions/regions-lifetime-bounds-on-fns.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/regions-lifetime-bounds-on-fns.rs:18:10 + --> $DIR/regions-lifetime-bounds-on-fns.rs:8:10 | LL | fn b<'a, 'b>(x: &mut &'a isize, y: &mut &'b isize) { | --------- --------- these two types are declared with different lifetimes... @@ -8,7 +8,7 @@ LL | *x = *y; //~ ERROR E0623 | ^^ ...but data from `y` flows into `x` here error[E0623]: lifetime mismatch - --> $DIR/regions-lifetime-bounds-on-fns.rs:24:7 + --> $DIR/regions-lifetime-bounds-on-fns.rs:14:7 | LL | fn c<'a,'b>(x: &mut &'a isize, y: &mut &'b isize) { | --------- --------- these two types are declared with different lifetimes... @@ -17,7 +17,7 @@ LL | a(x, y); //~ ERROR 24:7: 24:8: lifetime mismatch [E0623] | ^ ...but data from `y` flows into `x` here error[E0308]: mismatched types - --> $DIR/regions-lifetime-bounds-on-fns.rs:30:43 + --> $DIR/regions-lifetime-bounds-on-fns.rs:20:43 | LL | let _: fn(&mut &isize, &mut &isize) = a; //~ ERROR mismatched types | ^ expected concrete lifetime, found bound lifetime parameter diff --git a/src/test/ui/regions/regions-lifetime-of-struct-or-enum-variant.rs b/src/test/ui/regions/regions-lifetime-of-struct-or-enum-variant.rs index 46c486c63a35e..2d21a51108381 100644 --- a/src/test/ui/regions/regions-lifetime-of-struct-or-enum-variant.rs +++ b/src/test/ui/regions/regions-lifetime-of-struct-or-enum-variant.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This tests verifies that unary structs and enum variants // are treated as rvalues and their lifetime is not bounded to // the static scope. diff --git a/src/test/ui/regions/regions-lifetime-of-struct-or-enum-variant.stderr b/src/test/ui/regions/regions-lifetime-of-struct-or-enum-variant.stderr index 390173ed749a9..c0bfc475f1960 100644 --- a/src/test/ui/regions/regions-lifetime-of-struct-or-enum-variant.stderr +++ b/src/test/ui/regions/regions-lifetime-of-struct-or-enum-variant.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/regions-lifetime-of-struct-or-enum-variant.rs:24:20 + --> $DIR/regions-lifetime-of-struct-or-enum-variant.rs:14:20 | LL | let testValue = &id(Test); | ^^^^^^^^ temporary value does not live long enough @@ -7,14 +7,14 @@ LL | let testValue = &id(Test); LL | } | - temporary value only lives until here | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 23:19... - --> $DIR/regions-lifetime-of-struct-or-enum-variant.rs:23:19 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 13:19... + --> $DIR/regions-lifetime-of-struct-or-enum-variant.rs:13:19 | LL | fn structLifetime<'a>() -> &'a Test { | ^^ error[E0597]: borrowed value does not live long enough - --> $DIR/regions-lifetime-of-struct-or-enum-variant.rs:30:20 + --> $DIR/regions-lifetime-of-struct-or-enum-variant.rs:20:20 | LL | let testValue = &id(MyEnum::Variant1); | ^^^^^^^^^^^^^^^^^^^^ temporary value does not live long enough @@ -22,8 +22,8 @@ LL | let testValue = &id(MyEnum::Variant1); LL | } | - temporary value only lives until here | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 29:20... - --> $DIR/regions-lifetime-of-struct-or-enum-variant.rs:29:20 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 19:20... + --> $DIR/regions-lifetime-of-struct-or-enum-variant.rs:19:20 | LL | fn variantLifetime<'a>() -> &'a MyEnum { | ^^ diff --git a/src/test/ui/regions/regions-name-duplicated.rs b/src/test/ui/regions/regions-name-duplicated.rs index b4b9cfd75cbc9..f2adf01531569 100644 --- a/src/test/ui/regions/regions-name-duplicated.rs +++ b/src/test/ui/regions/regions-name-duplicated.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo<'a, 'a> { //~ ERROR lifetime name `'a` declared twice x: &'a isize } diff --git a/src/test/ui/regions/regions-name-duplicated.stderr b/src/test/ui/regions/regions-name-duplicated.stderr index ad945d54ad14d..1b552006a934d 100644 --- a/src/test/ui/regions/regions-name-duplicated.stderr +++ b/src/test/ui/regions/regions-name-duplicated.stderr @@ -1,5 +1,5 @@ error[E0263]: lifetime name `'a` declared twice in the same scope - --> $DIR/regions-name-duplicated.rs:11:16 + --> $DIR/regions-name-duplicated.rs:1:16 | LL | struct Foo<'a, 'a> { //~ ERROR lifetime name `'a` declared twice | -- ^^ declared twice diff --git a/src/test/ui/regions/regions-name-static.rs b/src/test/ui/regions/regions-name-static.rs index 69d63f3820c6c..730fd99aa68c2 100644 --- a/src/test/ui/regions/regions-name-static.rs +++ b/src/test/ui/regions/regions-name-static.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo<'static> { //~ ERROR invalid lifetime parameter name: `'static` x: &'static isize } diff --git a/src/test/ui/regions/regions-name-static.stderr b/src/test/ui/regions/regions-name-static.stderr index 48077d61c455c..bf7b021f9fe58 100644 --- a/src/test/ui/regions/regions-name-static.stderr +++ b/src/test/ui/regions/regions-name-static.stderr @@ -1,5 +1,5 @@ error[E0262]: invalid lifetime parameter name: `'static` - --> $DIR/regions-name-static.rs:11:12 + --> $DIR/regions-name-static.rs:1:12 | LL | struct Foo<'static> { //~ ERROR invalid lifetime parameter name: `'static` | ^^^^^^^ 'static is a reserved lifetime name diff --git a/src/test/ui/regions/regions-name-undeclared.rs b/src/test/ui/regions/regions-name-undeclared.rs index a61d30949334a..230a97a04b625 100644 --- a/src/test/ui/regions/regions-name-undeclared.rs +++ b/src/test/ui/regions/regions-name-undeclared.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that lifetime resolver enforces the lifetime name scoping // rules correctly in various scenarios. diff --git a/src/test/ui/regions/regions-name-undeclared.stderr b/src/test/ui/regions/regions-name-undeclared.stderr index 62fc5f5c7f785..7b041d5dad5eb 100644 --- a/src/test/ui/regions/regions-name-undeclared.stderr +++ b/src/test/ui/regions/regions-name-undeclared.stderr @@ -1,65 +1,65 @@ error[E0261]: use of undeclared lifetime name `'b` - --> $DIR/regions-name-undeclared.rs:25:24 + --> $DIR/regions-name-undeclared.rs:15:24 | LL | fn m4(&self, arg: &'b isize) { } //~ ERROR undeclared lifetime | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'b` - --> $DIR/regions-name-undeclared.rs:26:12 + --> $DIR/regions-name-undeclared.rs:16:12 | LL | fn m5(&'b self) { } //~ ERROR undeclared lifetime | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'b` - --> $DIR/regions-name-undeclared.rs:27:27 + --> $DIR/regions-name-undeclared.rs:17:27 | LL | fn m6(&self, arg: Foo<'b>) { } //~ ERROR undeclared lifetime | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'a` - --> $DIR/regions-name-undeclared.rs:35:22 + --> $DIR/regions-name-undeclared.rs:25:22 | LL | type X = Option<&'a isize>; //~ ERROR undeclared lifetime | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'a` - --> $DIR/regions-name-undeclared.rs:37:13 + --> $DIR/regions-name-undeclared.rs:27:13 | LL | E1(&'a isize) //~ ERROR undeclared lifetime | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'a` - --> $DIR/regions-name-undeclared.rs:40:13 + --> $DIR/regions-name-undeclared.rs:30:13 | LL | f: &'a isize //~ ERROR undeclared lifetime | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'a` - --> $DIR/regions-name-undeclared.rs:42:14 + --> $DIR/regions-name-undeclared.rs:32:14 | LL | fn f(a: &'a isize) { } //~ ERROR undeclared lifetime | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'a` - --> $DIR/regions-name-undeclared.rs:50:17 + --> $DIR/regions-name-undeclared.rs:40:17 | LL | fn fn_types(a: &'a isize, //~ ERROR undeclared lifetime | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'b` - --> $DIR/regions-name-undeclared.rs:52:36 + --> $DIR/regions-name-undeclared.rs:42:36 | LL | &'b isize, //~ ERROR undeclared lifetime | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'b` - --> $DIR/regions-name-undeclared.rs:55:36 + --> $DIR/regions-name-undeclared.rs:45:36 | LL | &'b isize)>, //~ ERROR undeclared lifetime | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'a` - --> $DIR/regions-name-undeclared.rs:56:17 + --> $DIR/regions-name-undeclared.rs:46:17 | LL | c: &'a isize) //~ ERROR undeclared lifetime | ^^ undeclared lifetime diff --git a/src/test/ui/regions/regions-nested-fns-2.nll.stderr b/src/test/ui/regions/regions-nested-fns-2.nll.stderr index 1b5bb7d500779..8ae44778b7d64 100644 --- a/src/test/ui/regions/regions-nested-fns-2.nll.stderr +++ b/src/test/ui/regions/regions-nested-fns-2.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `y` does not live long enough - --> $DIR/regions-nested-fns-2.rs:18:25 + --> $DIR/regions-nested-fns-2.rs:8:25 | LL | |z| { | --- value captured here diff --git a/src/test/ui/regions/regions-nested-fns-2.rs b/src/test/ui/regions/regions-nested-fns-2.rs index e66b62b6fb16e..1b51880f4159b 100644 --- a/src/test/ui/regions/regions-nested-fns-2.rs +++ b/src/test/ui/regions/regions-nested-fns-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn ignore(_f: F) where F: for<'z> FnOnce(&'z isize) -> &'z isize {} fn nested() { diff --git a/src/test/ui/regions/regions-nested-fns-2.stderr b/src/test/ui/regions/regions-nested-fns-2.stderr index c0aa6f9d5420c..924eac6fdd41e 100644 --- a/src/test/ui/regions/regions-nested-fns-2.stderr +++ b/src/test/ui/regions/regions-nested-fns-2.stderr @@ -1,5 +1,5 @@ error[E0373]: closure may outlive the current function, but it borrows `y`, which is owned by the current function - --> $DIR/regions-nested-fns-2.rs:16:9 + --> $DIR/regions-nested-fns-2.rs:6:9 | LL | |z| { | ^^^ may outlive borrowed value `y` diff --git a/src/test/ui/regions/regions-nested-fns.nll.stderr b/src/test/ui/regions/regions-nested-fns.nll.stderr index d90015b1b2157..ce0e93265b6d7 100644 --- a/src/test/ui/regions/regions-nested-fns.nll.stderr +++ b/src/test/ui/regions/regions-nested-fns.nll.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/regions-nested-fns.rs:24:27 + --> $DIR/regions-nested-fns.rs:14:27 | LL | if false { return x; } //~ ERROR E0312 | ^ warning: not reporting region error due to nll - --> $DIR/regions-nested-fns.rs:15:18 + --> $DIR/regions-nested-fns.rs:5:18 | LL | let mut ay = &y; //~ ERROR E0495 | ^^ error: unsatisfied lifetime constraints - --> $DIR/regions-nested-fns.rs:20:9 + --> $DIR/regions-nested-fns.rs:10:9 | LL | let mut ay = &y; //~ ERROR E0495 | ------ lifetime `'2` appears in the type of `ay` @@ -23,7 +23,7 @@ LL | ay = z; | ^^^^^^ requires that `'1` must outlive `'2` error: unsatisfied lifetime constraints - --> $DIR/regions-nested-fns.rs:14:9 + --> $DIR/regions-nested-fns.rs:4:9 | LL | fn nested<'x>(x: &'x isize) { | -- lifetime `'x` defined here @@ -31,7 +31,7 @@ LL | let y = 3; | ^ requires that `'x` must outlive `'static` error[E0597]: `y` does not live long enough - --> $DIR/regions-nested-fns.rs:15:18 + --> $DIR/regions-nested-fns.rs:5:18 | LL | let mut ay = &y; //~ ERROR E0495 | ^^ borrowed value does not live long enough @@ -42,7 +42,7 @@ LL | } = note: borrowed value must be valid for the static lifetime... error[E0597]: `y` does not live long enough - --> $DIR/regions-nested-fns.rs:19:15 + --> $DIR/regions-nested-fns.rs:9:15 | LL | ignore:: FnMut(&'z isize)>>(Box::new(|z| { | --- value captured here diff --git a/src/test/ui/regions/regions-nested-fns.rs b/src/test/ui/regions/regions-nested-fns.rs index 010b7d1768812..161d812f016a6 100644 --- a/src/test/ui/regions/regions-nested-fns.rs +++ b/src/test/ui/regions/regions-nested-fns.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn ignore(t: T) {} fn nested<'x>(x: &'x isize) { diff --git a/src/test/ui/regions/regions-nested-fns.stderr b/src/test/ui/regions/regions-nested-fns.stderr index 93004b4c3bf6b..d6d4c44de61dd 100644 --- a/src/test/ui/regions/regions-nested-fns.stderr +++ b/src/test/ui/regions/regions-nested-fns.stderr @@ -1,11 +1,11 @@ error[E0495]: cannot infer an appropriate lifetime due to conflicting requirements - --> $DIR/regions-nested-fns.rs:15:18 + --> $DIR/regions-nested-fns.rs:5:18 | LL | let mut ay = &y; //~ ERROR E0495 | ^^ | -note: first, the lifetime cannot outlive the anonymous lifetime #2 defined on the body at 17:54... - --> $DIR/regions-nested-fns.rs:17:54 +note: first, the lifetime cannot outlive the anonymous lifetime #2 defined on the body at 7:54... + --> $DIR/regions-nested-fns.rs:7:54 | LL | ignore:: FnMut(&'z isize)>>(Box::new(|z| { | ______________________________________________________^ @@ -15,12 +15,12 @@ LL | | ay = z; LL | | })); | |_____^ note: ...so that reference does not outlive borrowed content - --> $DIR/regions-nested-fns.rs:20:14 + --> $DIR/regions-nested-fns.rs:10:14 | LL | ay = z; | ^ -note: but, the lifetime must be valid for the anonymous lifetime #2 defined on the body at 23:68... - --> $DIR/regions-nested-fns.rs:23:68 +note: but, the lifetime must be valid for the anonymous lifetime #2 defined on the body at 13:68... + --> $DIR/regions-nested-fns.rs:13:68 | LL | ignore::< Box FnMut(&'z isize) -> &'z isize>>(Box::new(|z| { | ____________________________________________________________________^ @@ -34,13 +34,13 @@ LL | | })); found &isize error[E0312]: lifetime of reference outlives lifetime of borrowed content... - --> $DIR/regions-nested-fns.rs:24:27 + --> $DIR/regions-nested-fns.rs:14:27 | LL | if false { return x; } //~ ERROR E0312 | ^ | -note: ...the reference is valid for the anonymous lifetime #2 defined on the body at 23:68... - --> $DIR/regions-nested-fns.rs:23:68 +note: ...the reference is valid for the anonymous lifetime #2 defined on the body at 13:68... + --> $DIR/regions-nested-fns.rs:13:68 | LL | ignore::< Box FnMut(&'z isize) -> &'z isize>>(Box::new(|z| { | ____________________________________________________________________^ @@ -49,8 +49,8 @@ LL | | if false { return ay; } LL | | return z; LL | | })); | |_____^ -note: ...but the borrowed content is only valid for the lifetime 'x as defined on the function body at 13:11 - --> $DIR/regions-nested-fns.rs:13:11 +note: ...but the borrowed content is only valid for the lifetime 'x as defined on the function body at 3:11 + --> $DIR/regions-nested-fns.rs:3:11 | LL | fn nested<'x>(x: &'x isize) { | ^^ diff --git a/src/test/ui/regions/regions-normalize-in-where-clause-list.rs b/src/test/ui/regions/regions-normalize-in-where-clause-list.rs index 68642598ed2df..e94e8b25d6529 100644 --- a/src/test/ui/regions/regions-normalize-in-where-clause-list.rs +++ b/src/test/ui/regions/regions-normalize-in-where-clause-list.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are able to normalize in the list of where-clauses, // even if `'a: 'b` is required. diff --git a/src/test/ui/regions/regions-normalize-in-where-clause-list.stderr b/src/test/ui/regions/regions-normalize-in-where-clause-list.stderr index ec153f111d64b..a4197eed22524 100644 --- a/src/test/ui/regions/regions-normalize-in-where-clause-list.stderr +++ b/src/test/ui/regions/regions-normalize-in-where-clause-list.stderr @@ -1,5 +1,5 @@ error[E0495]: cannot infer an appropriate lifetime for lifetime parameter `'a` due to conflicting requirements - --> $DIR/regions-normalize-in-where-clause-list.rs:32:1 + --> $DIR/regions-normalize-in-where-clause-list.rs:22:1 | LL | / fn bar<'a, 'b>() //~ ERROR cannot infer LL | | where <() as Project<'a, 'b>>::Item : Eq @@ -7,13 +7,13 @@ LL | | { LL | | } | |_^ | -note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 32:8... - --> $DIR/regions-normalize-in-where-clause-list.rs:32:8 +note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 22:8... + --> $DIR/regions-normalize-in-where-clause-list.rs:22:8 | LL | fn bar<'a, 'b>() //~ ERROR cannot infer | ^^ -note: ...but the lifetime must also be valid for the lifetime 'b as defined on the function body at 32:12... - --> $DIR/regions-normalize-in-where-clause-list.rs:32:12 +note: ...but the lifetime must also be valid for the lifetime 'b as defined on the function body at 22:12... + --> $DIR/regions-normalize-in-where-clause-list.rs:22:12 | LL | fn bar<'a, 'b>() //~ ERROR cannot infer | ^^ diff --git a/src/test/ui/regions/regions-outlives-nominal-type-enum-region-rev.rs b/src/test/ui/regions/regions-outlives-nominal-type-enum-region-rev.rs index db25a0698fed4..fd5c3e920e049 100644 --- a/src/test/ui/regions/regions-outlives-nominal-type-enum-region-rev.rs +++ b/src/test/ui/regions/regions-outlives-nominal-type-enum-region-rev.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that a nominal type (like `Foo<'a>`) outlives `'b` if its // arguments (like `'a`) outlive `'b`. // diff --git a/src/test/ui/regions/regions-outlives-nominal-type-enum-region-rev.stderr b/src/test/ui/regions/regions-outlives-nominal-type-enum-region-rev.stderr index 5084097e30d11..5b8844263418a 100644 --- a/src/test/ui/regions/regions-outlives-nominal-type-enum-region-rev.stderr +++ b/src/test/ui/regions/regions-outlives-nominal-type-enum-region-rev.stderr @@ -1,16 +1,16 @@ error[E0491]: in type `&'a rev_variant_struct_region::Foo<'b>`, reference has a longer lifetime than the data it references - --> $DIR/regions-outlives-nominal-type-enum-region-rev.rs:24:11 + --> $DIR/regions-outlives-nominal-type-enum-region-rev.rs:14:11 | LL | V(&'a Foo<'b>) //~ ERROR reference has a longer lifetime | ^^^^^^^^^^^ | -note: the pointer is valid for the lifetime 'a as defined on the enum at 23:14 - --> $DIR/regions-outlives-nominal-type-enum-region-rev.rs:23:14 +note: the pointer is valid for the lifetime 'a as defined on the enum at 13:14 + --> $DIR/regions-outlives-nominal-type-enum-region-rev.rs:13:14 | LL | enum Bar<'a,'b> { | ^^ -note: but the referenced data is only valid for the lifetime 'b as defined on the enum at 23:17 - --> $DIR/regions-outlives-nominal-type-enum-region-rev.rs:23:17 +note: but the referenced data is only valid for the lifetime 'b as defined on the enum at 13:17 + --> $DIR/regions-outlives-nominal-type-enum-region-rev.rs:13:17 | LL | enum Bar<'a,'b> { | ^^ diff --git a/src/test/ui/regions/regions-outlives-nominal-type-enum-region.rs b/src/test/ui/regions/regions-outlives-nominal-type-enum-region.rs index 403757042d2f3..9fe14cec7e42a 100644 --- a/src/test/ui/regions/regions-outlives-nominal-type-enum-region.rs +++ b/src/test/ui/regions/regions-outlives-nominal-type-enum-region.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that a nominal type (like `Foo<'a>`) outlives `'b` if its // arguments (like `'a`) outlive `'b`. // diff --git a/src/test/ui/regions/regions-outlives-nominal-type-enum-region.stderr b/src/test/ui/regions/regions-outlives-nominal-type-enum-region.stderr index ce187eddfa9d6..579febf84701b 100644 --- a/src/test/ui/regions/regions-outlives-nominal-type-enum-region.stderr +++ b/src/test/ui/regions/regions-outlives-nominal-type-enum-region.stderr @@ -1,16 +1,16 @@ error[E0491]: in type `&'a variant_struct_region::Foo<'b>`, reference has a longer lifetime than the data it references - --> $DIR/regions-outlives-nominal-type-enum-region.rs:24:11 + --> $DIR/regions-outlives-nominal-type-enum-region.rs:14:11 | LL | V(&'a Foo<'b>) //~ ERROR reference has a longer lifetime | ^^^^^^^^^^^ | -note: the pointer is valid for the lifetime 'a as defined on the enum at 23:14 - --> $DIR/regions-outlives-nominal-type-enum-region.rs:23:14 +note: the pointer is valid for the lifetime 'a as defined on the enum at 13:14 + --> $DIR/regions-outlives-nominal-type-enum-region.rs:13:14 | LL | enum Bar<'a,'b> { | ^^ -note: but the referenced data is only valid for the lifetime 'b as defined on the enum at 23:17 - --> $DIR/regions-outlives-nominal-type-enum-region.rs:23:17 +note: but the referenced data is only valid for the lifetime 'b as defined on the enum at 13:17 + --> $DIR/regions-outlives-nominal-type-enum-region.rs:13:17 | LL | enum Bar<'a,'b> { | ^^ diff --git a/src/test/ui/regions/regions-outlives-nominal-type-enum-type-rev.rs b/src/test/ui/regions/regions-outlives-nominal-type-enum-type-rev.rs index cc294651db773..3fb8f7708eea5 100644 --- a/src/test/ui/regions/regions-outlives-nominal-type-enum-type-rev.rs +++ b/src/test/ui/regions/regions-outlives-nominal-type-enum-type-rev.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that a nominal type (like `Foo<'a>`) outlives `'b` if its // arguments (like `'a`) outlive `'b`. // diff --git a/src/test/ui/regions/regions-outlives-nominal-type-enum-type-rev.stderr b/src/test/ui/regions/regions-outlives-nominal-type-enum-type-rev.stderr index 8636b89b71abe..0a3986a61c829 100644 --- a/src/test/ui/regions/regions-outlives-nominal-type-enum-type-rev.stderr +++ b/src/test/ui/regions/regions-outlives-nominal-type-enum-type-rev.stderr @@ -1,16 +1,16 @@ error[E0491]: in type `&'a rev_variant_struct_type::Foo<&'b i32>`, reference has a longer lifetime than the data it references - --> $DIR/regions-outlives-nominal-type-enum-type-rev.rs:24:11 + --> $DIR/regions-outlives-nominal-type-enum-type-rev.rs:14:11 | LL | V(&'a Foo<&'b i32>) //~ ERROR reference has a longer lifetime | ^^^^^^^^^^^^^^^^ | -note: the pointer is valid for the lifetime 'a as defined on the enum at 23:14 - --> $DIR/regions-outlives-nominal-type-enum-type-rev.rs:23:14 +note: the pointer is valid for the lifetime 'a as defined on the enum at 13:14 + --> $DIR/regions-outlives-nominal-type-enum-type-rev.rs:13:14 | LL | enum Bar<'a,'b> { | ^^ -note: but the referenced data is only valid for the lifetime 'b as defined on the enum at 23:17 - --> $DIR/regions-outlives-nominal-type-enum-type-rev.rs:23:17 +note: but the referenced data is only valid for the lifetime 'b as defined on the enum at 13:17 + --> $DIR/regions-outlives-nominal-type-enum-type-rev.rs:13:17 | LL | enum Bar<'a,'b> { | ^^ diff --git a/src/test/ui/regions/regions-outlives-nominal-type-enum-type.rs b/src/test/ui/regions/regions-outlives-nominal-type-enum-type.rs index e269767cc1683..5dd23c4c855a7 100644 --- a/src/test/ui/regions/regions-outlives-nominal-type-enum-type.rs +++ b/src/test/ui/regions/regions-outlives-nominal-type-enum-type.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that a nominal type (like `Foo<'a>`) outlives `'b` if its // arguments (like `'a`) outlive `'b`. // diff --git a/src/test/ui/regions/regions-outlives-nominal-type-enum-type.stderr b/src/test/ui/regions/regions-outlives-nominal-type-enum-type.stderr index c209547e20c84..1da5e43bd89e3 100644 --- a/src/test/ui/regions/regions-outlives-nominal-type-enum-type.stderr +++ b/src/test/ui/regions/regions-outlives-nominal-type-enum-type.stderr @@ -1,16 +1,16 @@ error[E0491]: in type `&'a variant_struct_type::Foo<&'b i32>`, reference has a longer lifetime than the data it references - --> $DIR/regions-outlives-nominal-type-enum-type.rs:24:11 + --> $DIR/regions-outlives-nominal-type-enum-type.rs:14:11 | LL | F(&'a Foo<&'b i32>) //~ ERROR reference has a longer lifetime | ^^^^^^^^^^^^^^^^ | -note: the pointer is valid for the lifetime 'a as defined on the enum at 23:14 - --> $DIR/regions-outlives-nominal-type-enum-type.rs:23:14 +note: the pointer is valid for the lifetime 'a as defined on the enum at 13:14 + --> $DIR/regions-outlives-nominal-type-enum-type.rs:13:14 | LL | enum Bar<'a,'b> { | ^^ -note: but the referenced data is only valid for the lifetime 'b as defined on the enum at 23:17 - --> $DIR/regions-outlives-nominal-type-enum-type.rs:23:17 +note: but the referenced data is only valid for the lifetime 'b as defined on the enum at 13:17 + --> $DIR/regions-outlives-nominal-type-enum-type.rs:13:17 | LL | enum Bar<'a,'b> { | ^^ diff --git a/src/test/ui/regions/regions-outlives-nominal-type-struct-region-rev.rs b/src/test/ui/regions/regions-outlives-nominal-type-struct-region-rev.rs index c7e6ace8b9224..cba0991a97349 100644 --- a/src/test/ui/regions/regions-outlives-nominal-type-struct-region-rev.rs +++ b/src/test/ui/regions/regions-outlives-nominal-type-struct-region-rev.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that a nominal type (like `Foo<'a>`) outlives `'b` if its // arguments (like `'a`) outlive `'b`. // diff --git a/src/test/ui/regions/regions-outlives-nominal-type-struct-region-rev.stderr b/src/test/ui/regions/regions-outlives-nominal-type-struct-region-rev.stderr index 48980bdf8320e..c4c060de3f9a6 100644 --- a/src/test/ui/regions/regions-outlives-nominal-type-struct-region-rev.stderr +++ b/src/test/ui/regions/regions-outlives-nominal-type-struct-region-rev.stderr @@ -1,16 +1,16 @@ error[E0491]: in type `&'a rev_variant_struct_region::Foo<'b>`, reference has a longer lifetime than the data it references - --> $DIR/regions-outlives-nominal-type-struct-region-rev.rs:24:9 + --> $DIR/regions-outlives-nominal-type-struct-region-rev.rs:14:9 | LL | f: &'a Foo<'b> //~ ERROR reference has a longer lifetime | ^^^^^^^^^^^^^^ | -note: the pointer is valid for the lifetime 'a as defined on the struct at 23:16 - --> $DIR/regions-outlives-nominal-type-struct-region-rev.rs:23:16 +note: the pointer is valid for the lifetime 'a as defined on the struct at 13:16 + --> $DIR/regions-outlives-nominal-type-struct-region-rev.rs:13:16 | LL | struct Bar<'a,'b> { | ^^ -note: but the referenced data is only valid for the lifetime 'b as defined on the struct at 23:19 - --> $DIR/regions-outlives-nominal-type-struct-region-rev.rs:23:19 +note: but the referenced data is only valid for the lifetime 'b as defined on the struct at 13:19 + --> $DIR/regions-outlives-nominal-type-struct-region-rev.rs:13:19 | LL | struct Bar<'a,'b> { | ^^ diff --git a/src/test/ui/regions/regions-outlives-nominal-type-struct-region.rs b/src/test/ui/regions/regions-outlives-nominal-type-struct-region.rs index 2fe6444c33aec..308b0c3a5f593 100644 --- a/src/test/ui/regions/regions-outlives-nominal-type-struct-region.rs +++ b/src/test/ui/regions/regions-outlives-nominal-type-struct-region.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that a nominal type (like `Foo<'a>`) outlives `'b` if its // arguments (like `'a`) outlive `'b`. // diff --git a/src/test/ui/regions/regions-outlives-nominal-type-struct-region.stderr b/src/test/ui/regions/regions-outlives-nominal-type-struct-region.stderr index e2b328886b334..01d399aec6bf5 100644 --- a/src/test/ui/regions/regions-outlives-nominal-type-struct-region.stderr +++ b/src/test/ui/regions/regions-outlives-nominal-type-struct-region.stderr @@ -1,16 +1,16 @@ error[E0491]: in type `&'a variant_struct_region::Foo<'b>`, reference has a longer lifetime than the data it references - --> $DIR/regions-outlives-nominal-type-struct-region.rs:24:9 + --> $DIR/regions-outlives-nominal-type-struct-region.rs:14:9 | LL | f: &'a Foo<'b> //~ ERROR reference has a longer lifetime | ^^^^^^^^^^^^^^ | -note: the pointer is valid for the lifetime 'a as defined on the struct at 23:16 - --> $DIR/regions-outlives-nominal-type-struct-region.rs:23:16 +note: the pointer is valid for the lifetime 'a as defined on the struct at 13:16 + --> $DIR/regions-outlives-nominal-type-struct-region.rs:13:16 | LL | struct Bar<'a,'b> { | ^^ -note: but the referenced data is only valid for the lifetime 'b as defined on the struct at 23:19 - --> $DIR/regions-outlives-nominal-type-struct-region.rs:23:19 +note: but the referenced data is only valid for the lifetime 'b as defined on the struct at 13:19 + --> $DIR/regions-outlives-nominal-type-struct-region.rs:13:19 | LL | struct Bar<'a,'b> { | ^^ diff --git a/src/test/ui/regions/regions-outlives-nominal-type-struct-type-rev.rs b/src/test/ui/regions/regions-outlives-nominal-type-struct-type-rev.rs index c4b631bce9874..b7433a85c16fd 100644 --- a/src/test/ui/regions/regions-outlives-nominal-type-struct-type-rev.rs +++ b/src/test/ui/regions/regions-outlives-nominal-type-struct-type-rev.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that a nominal type (like `Foo<'a>`) outlives `'b` if its // arguments (like `'a`) outlive `'b`. // diff --git a/src/test/ui/regions/regions-outlives-nominal-type-struct-type-rev.stderr b/src/test/ui/regions/regions-outlives-nominal-type-struct-type-rev.stderr index 2bf04ffa64afb..86221a1c1affc 100644 --- a/src/test/ui/regions/regions-outlives-nominal-type-struct-type-rev.stderr +++ b/src/test/ui/regions/regions-outlives-nominal-type-struct-type-rev.stderr @@ -1,16 +1,16 @@ error[E0491]: in type `&'a rev_variant_struct_type::Foo<&'b i32>`, reference has a longer lifetime than the data it references - --> $DIR/regions-outlives-nominal-type-struct-type-rev.rs:24:9 + --> $DIR/regions-outlives-nominal-type-struct-type-rev.rs:14:9 | LL | f: &'a Foo<&'b i32> //~ ERROR reference has a longer lifetime | ^^^^^^^^^^^^^^^^^^^ | -note: the pointer is valid for the lifetime 'a as defined on the struct at 23:16 - --> $DIR/regions-outlives-nominal-type-struct-type-rev.rs:23:16 +note: the pointer is valid for the lifetime 'a as defined on the struct at 13:16 + --> $DIR/regions-outlives-nominal-type-struct-type-rev.rs:13:16 | LL | struct Bar<'a,'b> { | ^^ -note: but the referenced data is only valid for the lifetime 'b as defined on the struct at 23:19 - --> $DIR/regions-outlives-nominal-type-struct-type-rev.rs:23:19 +note: but the referenced data is only valid for the lifetime 'b as defined on the struct at 13:19 + --> $DIR/regions-outlives-nominal-type-struct-type-rev.rs:13:19 | LL | struct Bar<'a,'b> { | ^^ diff --git a/src/test/ui/regions/regions-outlives-nominal-type-struct-type.rs b/src/test/ui/regions/regions-outlives-nominal-type-struct-type.rs index 1c9489444a6a3..63700e3fb0c47 100644 --- a/src/test/ui/regions/regions-outlives-nominal-type-struct-type.rs +++ b/src/test/ui/regions/regions-outlives-nominal-type-struct-type.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that a nominal type (like `Foo<'a>`) outlives `'b` if its // arguments (like `'a`) outlive `'b`. // diff --git a/src/test/ui/regions/regions-outlives-nominal-type-struct-type.stderr b/src/test/ui/regions/regions-outlives-nominal-type-struct-type.stderr index af9f1d3722aeb..922d3c7393edd 100644 --- a/src/test/ui/regions/regions-outlives-nominal-type-struct-type.stderr +++ b/src/test/ui/regions/regions-outlives-nominal-type-struct-type.stderr @@ -1,16 +1,16 @@ error[E0491]: in type `&'a variant_struct_type::Foo<&'b i32>`, reference has a longer lifetime than the data it references - --> $DIR/regions-outlives-nominal-type-struct-type.rs:24:9 + --> $DIR/regions-outlives-nominal-type-struct-type.rs:14:9 | LL | f: &'a Foo<&'b i32> //~ ERROR reference has a longer lifetime | ^^^^^^^^^^^^^^^^^^^ | -note: the pointer is valid for the lifetime 'a as defined on the struct at 23:16 - --> $DIR/regions-outlives-nominal-type-struct-type.rs:23:16 +note: the pointer is valid for the lifetime 'a as defined on the struct at 13:16 + --> $DIR/regions-outlives-nominal-type-struct-type.rs:13:16 | LL | struct Bar<'a,'b> { | ^^ -note: but the referenced data is only valid for the lifetime 'b as defined on the struct at 23:19 - --> $DIR/regions-outlives-nominal-type-struct-type.rs:23:19 +note: but the referenced data is only valid for the lifetime 'b as defined on the struct at 13:19 + --> $DIR/regions-outlives-nominal-type-struct-type.rs:13:19 | LL | struct Bar<'a,'b> { | ^^ diff --git a/src/test/ui/regions/regions-outlives-projection-container-hrtb.nll.stderr b/src/test/ui/regions/regions-outlives-projection-container-hrtb.nll.stderr index db1508a8c8b14..22c9c8d943530 100644 --- a/src/test/ui/regions/regions-outlives-projection-container-hrtb.nll.stderr +++ b/src/test/ui/regions/regions-outlives-projection-container-hrtb.nll.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/regions-outlives-projection-container-hrtb.rs:42:12 + --> $DIR/regions-outlives-projection-container-hrtb.rs:32:12 | LL | let _: &'a WithHrAssoc> = loop { }; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: not reporting region error due to nll - --> $DIR/regions-outlives-projection-container-hrtb.rs:63:12 + --> $DIR/regions-outlives-projection-container-hrtb.rs:53:12 | LL | let _: &'a WithHrAssocSub> = loop { }; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: compilation successful - --> $DIR/regions-outlives-projection-container-hrtb.rs:68:1 + --> $DIR/regions-outlives-projection-container-hrtb.rs:58:1 | LL | / fn main() { LL | | } diff --git a/src/test/ui/regions/regions-outlives-projection-container-hrtb.rs b/src/test/ui/regions/regions-outlives-projection-container-hrtb.rs index ec0631a881a37..70f5520103e3b 100644 --- a/src/test/ui/regions/regions-outlives-projection-container-hrtb.rs +++ b/src/test/ui/regions/regions-outlives-projection-container-hrtb.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that structs with higher-ranked where clauses don't generate // "outlives" requirements. Issue #22246. diff --git a/src/test/ui/regions/regions-outlives-projection-container-hrtb.stderr b/src/test/ui/regions/regions-outlives-projection-container-hrtb.stderr index 32c9359b684e5..856e28f141f10 100644 --- a/src/test/ui/regions/regions-outlives-projection-container-hrtb.stderr +++ b/src/test/ui/regions/regions-outlives-projection-container-hrtb.stderr @@ -1,33 +1,33 @@ error[E0491]: in type `&'a WithHrAssoc>`, reference has a longer lifetime than the data it references - --> $DIR/regions-outlives-projection-container-hrtb.rs:42:12 + --> $DIR/regions-outlives-projection-container-hrtb.rs:32:12 | LL | let _: &'a WithHrAssoc> = loop { }; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | -note: the pointer is valid for the lifetime 'a as defined on the function body at 39:15 - --> $DIR/regions-outlives-projection-container-hrtb.rs:39:15 +note: the pointer is valid for the lifetime 'a as defined on the function body at 29:15 + --> $DIR/regions-outlives-projection-container-hrtb.rs:29:15 | LL | fn with_assoc<'a,'b>() { | ^^ -note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 39:18 - --> $DIR/regions-outlives-projection-container-hrtb.rs:39:18 +note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 29:18 + --> $DIR/regions-outlives-projection-container-hrtb.rs:29:18 | LL | fn with_assoc<'a,'b>() { | ^^ error[E0491]: in type `&'a WithHrAssocSub>`, reference has a longer lifetime than the data it references - --> $DIR/regions-outlives-projection-container-hrtb.rs:63:12 + --> $DIR/regions-outlives-projection-container-hrtb.rs:53:12 | LL | let _: &'a WithHrAssocSub> = loop { }; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | -note: the pointer is valid for the lifetime 'a as defined on the function body at 59:19 - --> $DIR/regions-outlives-projection-container-hrtb.rs:59:19 +note: the pointer is valid for the lifetime 'a as defined on the function body at 49:19 + --> $DIR/regions-outlives-projection-container-hrtb.rs:49:19 | LL | fn with_assoc_sub<'a,'b>() { | ^^ -note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 59:22 - --> $DIR/regions-outlives-projection-container-hrtb.rs:59:22 +note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 49:22 + --> $DIR/regions-outlives-projection-container-hrtb.rs:49:22 | LL | fn with_assoc_sub<'a,'b>() { | ^^ diff --git a/src/test/ui/regions/regions-outlives-projection-container-wc.rs b/src/test/ui/regions/regions-outlives-projection-container-wc.rs index 79300d5176ecc..0bf5dd5d96e75 100644 --- a/src/test/ui/regions/regions-outlives-projection-container-wc.rs +++ b/src/test/ui/regions/regions-outlives-projection-container-wc.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-compare-mode-nll // Test that we are imposing the requirement that every associated diff --git a/src/test/ui/regions/regions-outlives-projection-container-wc.stderr b/src/test/ui/regions/regions-outlives-projection-container-wc.stderr index d0680ecbb99a2..57015dd7b7cda 100644 --- a/src/test/ui/regions/regions-outlives-projection-container-wc.stderr +++ b/src/test/ui/regions/regions-outlives-projection-container-wc.stderr @@ -1,16 +1,16 @@ error[E0491]: in type `&'a WithAssoc>`, reference has a longer lifetime than the data it references - --> $DIR/regions-outlives-projection-container-wc.rs:46:12 + --> $DIR/regions-outlives-projection-container-wc.rs:36:12 | LL | let _: &'a WithAssoc> = loop { }; | ^^^^^^^^^^^^^^^^^^^^^^^^^^ | -note: the pointer is valid for the lifetime 'a as defined on the function body at 40:15 - --> $DIR/regions-outlives-projection-container-wc.rs:40:15 +note: the pointer is valid for the lifetime 'a as defined on the function body at 30:15 + --> $DIR/regions-outlives-projection-container-wc.rs:30:15 | LL | fn with_assoc<'a,'b>() { | ^^ -note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 40:18 - --> $DIR/regions-outlives-projection-container-wc.rs:40:18 +note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 30:18 + --> $DIR/regions-outlives-projection-container-wc.rs:30:18 | LL | fn with_assoc<'a,'b>() { | ^^ diff --git a/src/test/ui/regions/regions-outlives-projection-container.rs b/src/test/ui/regions/regions-outlives-projection-container.rs index 180a8b052442c..12026209f9e7d 100644 --- a/src/test/ui/regions/regions-outlives-projection-container.rs +++ b/src/test/ui/regions/regions-outlives-projection-container.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-compare-mode-nll // Test that we are imposing the requirement that every associated diff --git a/src/test/ui/regions/regions-outlives-projection-container.stderr b/src/test/ui/regions/regions-outlives-projection-container.stderr index 4b8d445ff4a9c..94cf8b1f46376 100644 --- a/src/test/ui/regions/regions-outlives-projection-container.stderr +++ b/src/test/ui/regions/regions-outlives-projection-container.stderr @@ -1,67 +1,67 @@ error[E0491]: in type `&'a WithAssoc>`, reference has a longer lifetime than the data it references - --> $DIR/regions-outlives-projection-container.rs:52:12 + --> $DIR/regions-outlives-projection-container.rs:42:12 | LL | let _: &'a WithAssoc> = loop { }; //~ ERROR reference has a longer lifetime | ^^^^^^^^^^^^^^^^^^^^^^^^^^ | -note: the pointer is valid for the lifetime 'a as defined on the function body at 46:15 - --> $DIR/regions-outlives-projection-container.rs:46:15 +note: the pointer is valid for the lifetime 'a as defined on the function body at 36:15 + --> $DIR/regions-outlives-projection-container.rs:36:15 | LL | fn with_assoc<'a,'b>() { | ^^ -note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 46:18 - --> $DIR/regions-outlives-projection-container.rs:46:18 +note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 36:18 + --> $DIR/regions-outlives-projection-container.rs:36:18 | LL | fn with_assoc<'a,'b>() { | ^^ error[E0491]: in type `&'a WithoutAssoc>`, reference has a longer lifetime than the data it references - --> $DIR/regions-outlives-projection-container.rs:69:12 + --> $DIR/regions-outlives-projection-container.rs:59:12 | LL | let _: &'a WithoutAssoc> = loop { }; //~ ERROR reference has a longer lifetime | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | -note: the pointer is valid for the lifetime 'a as defined on the function body at 65:18 - --> $DIR/regions-outlives-projection-container.rs:65:18 +note: the pointer is valid for the lifetime 'a as defined on the function body at 55:18 + --> $DIR/regions-outlives-projection-container.rs:55:18 | LL | fn without_assoc<'a,'b>() { | ^^ -note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 65:21 - --> $DIR/regions-outlives-projection-container.rs:65:21 +note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 55:21 + --> $DIR/regions-outlives-projection-container.rs:55:21 | LL | fn without_assoc<'a,'b>() { | ^^ error[E0491]: in type `&'a WithAssoc>`, reference has a longer lifetime than the data it references - --> $DIR/regions-outlives-projection-container.rs:77:12 + --> $DIR/regions-outlives-projection-container.rs:67:12 | LL | call::<&'a WithAssoc>>(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ | -note: the pointer is valid for the lifetime 'a as defined on the function body at 72:20 - --> $DIR/regions-outlives-projection-container.rs:72:20 +note: the pointer is valid for the lifetime 'a as defined on the function body at 62:20 + --> $DIR/regions-outlives-projection-container.rs:62:20 | LL | fn call_with_assoc<'a,'b>() { | ^^ -note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 72:23 - --> $DIR/regions-outlives-projection-container.rs:72:23 +note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 62:23 + --> $DIR/regions-outlives-projection-container.rs:62:23 | LL | fn call_with_assoc<'a,'b>() { | ^^ error[E0491]: in type `&'a WithoutAssoc>`, reference has a longer lifetime than the data it references - --> $DIR/regions-outlives-projection-container.rs:84:12 + --> $DIR/regions-outlives-projection-container.rs:74:12 | LL | call::<&'a WithoutAssoc>>(); //~ ERROR reference has a longer lifetime | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | -note: the pointer is valid for the lifetime 'a as defined on the function body at 81:23 - --> $DIR/regions-outlives-projection-container.rs:81:23 +note: the pointer is valid for the lifetime 'a as defined on the function body at 71:23 + --> $DIR/regions-outlives-projection-container.rs:71:23 | LL | fn call_without_assoc<'a,'b>() { | ^^ -note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 81:26 - --> $DIR/regions-outlives-projection-container.rs:81:26 +note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 71:26 + --> $DIR/regions-outlives-projection-container.rs:71:26 | LL | fn call_without_assoc<'a,'b>() { | ^^ diff --git a/src/test/ui/regions/regions-outlives-projection-hrtype.rs b/src/test/ui/regions/regions-outlives-projection-hrtype.rs index 2d271b7be73e0..a56147852be02 100644 --- a/src/test/ui/regions/regions-outlives-projection-hrtype.rs +++ b/src/test/ui/regions/regions-outlives-projection-hrtype.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test for the outlives relation when applied to a projection on a // type with bound regions. In this case, we are checking that // ` fn(&'r T) as TheTrait>::TheType: 'a` If we're not diff --git a/src/test/ui/regions/regions-outlives-projection-hrtype.stderr b/src/test/ui/regions/regions-outlives-projection-hrtype.stderr index ba4e318957e60..a7f64743884d8 100644 --- a/src/test/ui/regions/regions-outlives-projection-hrtype.stderr +++ b/src/test/ui/regions/regions-outlives-projection-hrtype.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/regions-outlives-projection-hrtype.rs:36:1 + --> $DIR/regions-outlives-projection-hrtype.rs:26:1 | LL | fn main() { } //~ ERROR compilation successful | ^^^^^^^^^^^^^ diff --git a/src/test/ui/regions/regions-outlives-projection-trait-def.rs b/src/test/ui/regions/regions-outlives-projection-trait-def.rs index 04682a7729735..9fe901301a720 100644 --- a/src/test/ui/regions/regions-outlives-projection-trait-def.rs +++ b/src/test/ui/regions/regions-outlives-projection-trait-def.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that `>::Type: 'b`, where `trait Foo<'a> { Type: // 'a; }`, does not require that `F: 'b`. diff --git a/src/test/ui/regions/regions-outlives-projection-trait-def.stderr b/src/test/ui/regions/regions-outlives-projection-trait-def.stderr index 0a4cbe64d4638..a2b90c499c17c 100644 --- a/src/test/ui/regions/regions-outlives-projection-trait-def.stderr +++ b/src/test/ui/regions/regions-outlives-projection-trait-def.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/regions-outlives-projection-trait-def.rs:31:1 + --> $DIR/regions-outlives-projection-trait-def.rs:21:1 | LL | fn main() { } //~ ERROR compilation successful | ^^^^^^^^^^^^^ diff --git a/src/test/ui/regions/regions-outlives-scalar.rs b/src/test/ui/regions/regions-outlives-scalar.rs index 94f7a350cf787..e76eb31610647 100644 --- a/src/test/ui/regions/regions-outlives-scalar.rs +++ b/src/test/ui/regions/regions-outlives-scalar.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that scalar values outlive all regions. // Rule OutlivesScalar from RFC 1214. diff --git a/src/test/ui/regions/regions-outlives-scalar.stderr b/src/test/ui/regions/regions-outlives-scalar.stderr index d754bdd60320e..cf00a399ed30a 100644 --- a/src/test/ui/regions/regions-outlives-scalar.stderr +++ b/src/test/ui/regions/regions-outlives-scalar.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/regions-outlives-scalar.rs:23:1 + --> $DIR/regions-outlives-scalar.rs:13:1 | LL | fn main() { } //~ ERROR compilation successful | ^^^^^^^^^^^^^ diff --git a/src/test/ui/regions/regions-pattern-typing-issue-19552.nll.stderr b/src/test/ui/regions/regions-pattern-typing-issue-19552.nll.stderr index c39d007312fef..bcf00afffb31f 100644 --- a/src/test/ui/regions/regions-pattern-typing-issue-19552.nll.stderr +++ b/src/test/ui/regions/regions-pattern-typing-issue-19552.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `line` does not live long enough - --> $DIR/regions-pattern-typing-issue-19552.rs:15:14 + --> $DIR/regions-pattern-typing-issue-19552.rs:5:14 | LL | match [&*line] { //~ ERROR `line` does not live long enough | ^^^^ borrowed value does not live long enough diff --git a/src/test/ui/regions/regions-pattern-typing-issue-19552.rs b/src/test/ui/regions/regions-pattern-typing-issue-19552.rs index 3401dd1becdd8..a64ab1c85e3fd 100644 --- a/src/test/ui/regions/regions-pattern-typing-issue-19552.rs +++ b/src/test/ui/regions/regions-pattern-typing-issue-19552.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn assert_static(_t: T) {} fn main() { diff --git a/src/test/ui/regions/regions-pattern-typing-issue-19552.stderr b/src/test/ui/regions/regions-pattern-typing-issue-19552.stderr index cefedefa2435d..ad80925cad7d2 100644 --- a/src/test/ui/regions/regions-pattern-typing-issue-19552.stderr +++ b/src/test/ui/regions/regions-pattern-typing-issue-19552.stderr @@ -1,5 +1,5 @@ error[E0597]: `line` does not live long enough - --> $DIR/regions-pattern-typing-issue-19552.rs:15:14 + --> $DIR/regions-pattern-typing-issue-19552.rs:5:14 | LL | match [&*line] { //~ ERROR `line` does not live long enough | ^^^^ borrowed value does not live long enough diff --git a/src/test/ui/regions/regions-pattern-typing-issue-19997.ast.nll.stderr b/src/test/ui/regions/regions-pattern-typing-issue-19997.ast.nll.stderr index 2acac5d5cf8a6..935620075f7c6 100644 --- a/src/test/ui/regions/regions-pattern-typing-issue-19997.ast.nll.stderr +++ b/src/test/ui/regions/regions-pattern-typing-issue-19997.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `a1` because it is borrowed - --> $DIR/regions-pattern-typing-issue-19997.rs:20:13 + --> $DIR/regions-pattern-typing-issue-19997.rs:10:13 | LL | match (&a1,) { | --- borrow of `a1` occurs here diff --git a/src/test/ui/regions/regions-pattern-typing-issue-19997.ast.stderr b/src/test/ui/regions/regions-pattern-typing-issue-19997.ast.stderr index c26a03697400a..e23c6ada2b565 100644 --- a/src/test/ui/regions/regions-pattern-typing-issue-19997.ast.stderr +++ b/src/test/ui/regions/regions-pattern-typing-issue-19997.ast.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `a1` because it is borrowed - --> $DIR/regions-pattern-typing-issue-19997.rs:20:13 + --> $DIR/regions-pattern-typing-issue-19997.rs:10:13 | LL | match (&a1,) { | -- borrow of `a1` occurs here diff --git a/src/test/ui/regions/regions-pattern-typing-issue-19997.mir.stderr b/src/test/ui/regions/regions-pattern-typing-issue-19997.mir.stderr index 2acac5d5cf8a6..935620075f7c6 100644 --- a/src/test/ui/regions/regions-pattern-typing-issue-19997.mir.stderr +++ b/src/test/ui/regions/regions-pattern-typing-issue-19997.mir.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `a1` because it is borrowed - --> $DIR/regions-pattern-typing-issue-19997.rs:20:13 + --> $DIR/regions-pattern-typing-issue-19997.rs:10:13 | LL | match (&a1,) { | --- borrow of `a1` occurs here diff --git a/src/test/ui/regions/regions-pattern-typing-issue-19997.rs b/src/test/ui/regions/regions-pattern-typing-issue-19997.rs index 1f23dcbb72523..35f38af0cfef1 100644 --- a/src/test/ui/regions/regions-pattern-typing-issue-19997.rs +++ b/src/test/ui/regions/regions-pattern-typing-issue-19997.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/regions/regions-proc-bound-capture.nll.stderr b/src/test/ui/regions/regions-proc-bound-capture.nll.stderr index 00728aa4783d4..9d335f3847af1 100644 --- a/src/test/ui/regions/regions-proc-bound-capture.nll.stderr +++ b/src/test/ui/regions/regions-proc-bound-capture.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/regions-proc-bound-capture.rs:19:14 + --> $DIR/regions-proc-bound-capture.rs:9:14 | LL | Box::new(move|| { *x }) //~ ERROR explicit lifetime required in the type of `x` [E0621] | ^^^^^^^^^^^^^ error[E0621]: explicit lifetime required in the type of `x` - --> $DIR/regions-proc-bound-capture.rs:17:62 + --> $DIR/regions-proc-bound-capture.rs:7:62 | LL | fn static_proc(x: &isize) -> Box(isize) + 'static> { | ___________________------_____________________________________^ diff --git a/src/test/ui/regions/regions-proc-bound-capture.rs b/src/test/ui/regions/regions-proc-bound-capture.rs index dd7b2bf963575..f2010dbe62d8d 100644 --- a/src/test/ui/regions/regions-proc-bound-capture.rs +++ b/src/test/ui/regions/regions-proc-bound-capture.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn borrowed_proc<'a>(x: &'a isize) -> Box(isize) + 'a> { // This is legal, because the region bound on `proc` // states that it captures `x`. diff --git a/src/test/ui/regions/regions-proc-bound-capture.stderr b/src/test/ui/regions/regions-proc-bound-capture.stderr index b38543bdc4340..31be3ab4d3d5b 100644 --- a/src/test/ui/regions/regions-proc-bound-capture.stderr +++ b/src/test/ui/regions/regions-proc-bound-capture.stderr @@ -1,5 +1,5 @@ error[E0621]: explicit lifetime required in the type of `x` - --> $DIR/regions-proc-bound-capture.rs:19:5 + --> $DIR/regions-proc-bound-capture.rs:9:5 | LL | fn static_proc(x: &isize) -> Box(isize) + 'static> { | ------ help: add explicit lifetime `'static` to the type of `x`: `&'static isize` diff --git a/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref-mut-ref.nll.stderr b/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref-mut-ref.nll.stderr index 37454ff78a126..864ad74e0f008 100644 --- a/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref-mut-ref.nll.stderr +++ b/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref-mut-ref.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/regions-reborrow-from-shorter-mut-ref-mut-ref.rs:14:5 + --> $DIR/regions-reborrow-from-shorter-mut-ref-mut-ref.rs:4:5 | LL | &mut ***p //~ ERROR 14:5: 14:14: lifetime mismatch [E0623] | ^^^^^^^^^ error: unsatisfied lifetime constraints - --> $DIR/regions-reborrow-from-shorter-mut-ref-mut-ref.rs:13:85 + --> $DIR/regions-reborrow-from-shorter-mut-ref-mut-ref.rs:3:85 | LL | fn copy_borrowed_ptr<'a, 'b, 'c>(p: &'a mut &'b mut &'c mut isize) -> &'b mut isize { | ______________________--__--_________________________________________________________^ diff --git a/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref-mut-ref.rs b/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref-mut-ref.rs index f6f1a189e5ee1..206bb094a69e3 100644 --- a/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref-mut-ref.rs +++ b/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref-mut-ref.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #8624. Test for reborrowing with 3 levels, not just two. fn copy_borrowed_ptr<'a, 'b, 'c>(p: &'a mut &'b mut &'c mut isize) -> &'b mut isize { diff --git a/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref-mut-ref.stderr b/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref-mut-ref.stderr index cddb60a433767..f9a0b899c292b 100644 --- a/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref-mut-ref.stderr +++ b/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref-mut-ref.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/regions-reborrow-from-shorter-mut-ref-mut-ref.rs:14:5 + --> $DIR/regions-reborrow-from-shorter-mut-ref-mut-ref.rs:4:5 | LL | fn copy_borrowed_ptr<'a, 'b, 'c>(p: &'a mut &'b mut &'c mut isize) -> &'b mut isize { | ----------------------------- ------------- diff --git a/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref.nll.stderr b/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref.nll.stderr index 455ee6f794936..cf4fa7df8abfb 100644 --- a/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref.nll.stderr +++ b/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/regions-reborrow-from-shorter-mut-ref.rs:16:5 + --> $DIR/regions-reborrow-from-shorter-mut-ref.rs:6:5 | LL | &mut **p //~ ERROR 16:5: 16:13: lifetime mismatch [E0623] | ^^^^^^^^ error: unsatisfied lifetime constraints - --> $DIR/regions-reborrow-from-shorter-mut-ref.rs:15:73 + --> $DIR/regions-reborrow-from-shorter-mut-ref.rs:5:73 | LL | fn copy_borrowed_ptr<'a, 'b>(p: &'a mut &'b mut isize) -> &'b mut isize { | ______________________--__--_____________________________________________^ diff --git a/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref.rs b/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref.rs index 7270b477d2d88..59a93f3990d00 100644 --- a/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref.rs +++ b/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #8624. Tests that reborrowing the contents of an `&'b mut` // pointer which is backed by another `&'a mut` can only be done // for `'a` (which must be a sublifetime of `'b`). diff --git a/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref.stderr b/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref.stderr index 9f8d0168edeee..b9954f9e2d6b5 100644 --- a/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref.stderr +++ b/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/regions-reborrow-from-shorter-mut-ref.rs:16:5 + --> $DIR/regions-reborrow-from-shorter-mut-ref.rs:6:5 | LL | fn copy_borrowed_ptr<'a, 'b>(p: &'a mut &'b mut isize) -> &'b mut isize { | --------------------- ------------- diff --git a/src/test/ui/regions/regions-ref-in-fn-arg.nll.stderr b/src/test/ui/regions/regions-ref-in-fn-arg.nll.stderr index 87fe858769d18..10c54a26a1475 100644 --- a/src/test/ui/regions/regions-ref-in-fn-arg.nll.stderr +++ b/src/test/ui/regions/regions-ref-in-fn-arg.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/regions-ref-in-fn-arg.rs:14:13 + --> $DIR/regions-ref-in-fn-arg.rs:4:13 | LL | fn arg_item(box ref x: Box) -> &'static isize { | ^^^^^^^^^ temporary value does not live long enough @@ -10,7 +10,7 @@ LL | } = note: borrowed value must be valid for the static lifetime... error[E0597]: borrowed value does not live long enough - --> $DIR/regions-ref-in-fn-arg.rs:21:11 + --> $DIR/regions-ref-in-fn-arg.rs:11:11 | LL | with(|box ref x| x) //~ ERROR borrowed value does not live long enough | ^^^^^^^^^ - temporary value only lives until here diff --git a/src/test/ui/regions/regions-ref-in-fn-arg.rs b/src/test/ui/regions/regions-ref-in-fn-arg.rs index bc8060e3915d3..cf9e7b27ed0af 100644 --- a/src/test/ui/regions/regions-ref-in-fn-arg.rs +++ b/src/test/ui/regions/regions-ref-in-fn-arg.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_patterns)] #![feature(box_syntax)] diff --git a/src/test/ui/regions/regions-ref-in-fn-arg.stderr b/src/test/ui/regions/regions-ref-in-fn-arg.stderr index 0250f6e26fea9..748508ecbcd39 100644 --- a/src/test/ui/regions/regions-ref-in-fn-arg.stderr +++ b/src/test/ui/regions/regions-ref-in-fn-arg.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/regions-ref-in-fn-arg.rs:14:17 + --> $DIR/regions-ref-in-fn-arg.rs:4:17 | LL | fn arg_item(box ref x: Box) -> &'static isize { | ^^^^^ borrowed value does not live long enough @@ -10,7 +10,7 @@ LL | } = note: borrowed value must be valid for the static lifetime... error[E0597]: borrowed value does not live long enough - --> $DIR/regions-ref-in-fn-arg.rs:21:15 + --> $DIR/regions-ref-in-fn-arg.rs:11:15 | LL | with(|box ref x| x) //~ ERROR borrowed value does not live long enough | ^^^^^ - borrowed value only lives until here diff --git a/src/test/ui/regions/regions-ret-borrowed-1.nll.stderr b/src/test/ui/regions/regions-ret-borrowed-1.nll.stderr index 29810f5128c9f..cdc0c24de7e50 100644 --- a/src/test/ui/regions/regions-ret-borrowed-1.nll.stderr +++ b/src/test/ui/regions/regions-ret-borrowed-1.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/regions-ret-borrowed-1.rs:20:14 + --> $DIR/regions-ret-borrowed-1.rs:10:14 | LL | with(|o| o) | ^ error: unsatisfied lifetime constraints - --> $DIR/regions-ret-borrowed-1.rs:20:14 + --> $DIR/regions-ret-borrowed-1.rs:10:14 | LL | with(|o| o) | -- ^ returning this value requires that `'1` must outlive `'2` diff --git a/src/test/ui/regions/regions-ret-borrowed-1.rs b/src/test/ui/regions/regions-ret-borrowed-1.rs index b8cebe665181c..1be5edee599c4 100644 --- a/src/test/ui/regions/regions-ret-borrowed-1.rs +++ b/src/test/ui/regions/regions-ret-borrowed-1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Similar to regions-ret-borrowed.rs, but using a named lifetime. At // some point regions-ret-borrowed reported an error but this file did // not, due to special hardcoding around the anonymous region. diff --git a/src/test/ui/regions/regions-ret-borrowed-1.stderr b/src/test/ui/regions/regions-ret-borrowed-1.stderr index ac886bcbc7cb9..72e47cea094c5 100644 --- a/src/test/ui/regions/regions-ret-borrowed-1.stderr +++ b/src/test/ui/regions/regions-ret-borrowed-1.stderr @@ -1,24 +1,24 @@ error[E0495]: cannot infer an appropriate lifetime due to conflicting requirements - --> $DIR/regions-ret-borrowed-1.rs:20:14 + --> $DIR/regions-ret-borrowed-1.rs:10:14 | LL | with(|o| o) | ^ | -note: first, the lifetime cannot outlive the anonymous lifetime #2 defined on the body at 20:10... - --> $DIR/regions-ret-borrowed-1.rs:20:10 +note: first, the lifetime cannot outlive the anonymous lifetime #2 defined on the body at 10:10... + --> $DIR/regions-ret-borrowed-1.rs:10:10 | LL | with(|o| o) | ^^^^^ = note: ...so that the expression is assignable: expected &isize found &isize -note: but, the lifetime must be valid for the lifetime 'a as defined on the function body at 19:14... - --> $DIR/regions-ret-borrowed-1.rs:19:14 +note: but, the lifetime must be valid for the lifetime 'a as defined on the function body at 9:14... + --> $DIR/regions-ret-borrowed-1.rs:9:14 | LL | fn return_it<'a>() -> &'a isize { | ^^ note: ...so that reference does not outlive borrowed content - --> $DIR/regions-ret-borrowed-1.rs:20:5 + --> $DIR/regions-ret-borrowed-1.rs:10:5 | LL | with(|o| o) | ^^^^^^^^^^^ diff --git a/src/test/ui/regions/regions-ret-borrowed.nll.stderr b/src/test/ui/regions/regions-ret-borrowed.nll.stderr index ab70e6a663039..6e028b945c6a2 100644 --- a/src/test/ui/regions/regions-ret-borrowed.nll.stderr +++ b/src/test/ui/regions/regions-ret-borrowed.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/regions-ret-borrowed.rs:23:14 + --> $DIR/regions-ret-borrowed.rs:13:14 | LL | with(|o| o) | ^ error: unsatisfied lifetime constraints - --> $DIR/regions-ret-borrowed.rs:23:14 + --> $DIR/regions-ret-borrowed.rs:13:14 | LL | with(|o| o) | -- ^ returning this value requires that `'1` must outlive `'2` diff --git a/src/test/ui/regions/regions-ret-borrowed.rs b/src/test/ui/regions/regions-ret-borrowed.rs index 40909ddd4adb5..5fca92d68b65c 100644 --- a/src/test/ui/regions/regions-ret-borrowed.rs +++ b/src/test/ui/regions/regions-ret-borrowed.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Ensure that you cannot use generic types to return a region outside // of its bound. Here, in the `return_it()` fn, we call with() but // with R bound to &isize from the return_it. Meanwhile, with() diff --git a/src/test/ui/regions/regions-ret-borrowed.stderr b/src/test/ui/regions/regions-ret-borrowed.stderr index 36c4ce7e1740d..ce0c429ccb247 100644 --- a/src/test/ui/regions/regions-ret-borrowed.stderr +++ b/src/test/ui/regions/regions-ret-borrowed.stderr @@ -1,24 +1,24 @@ error[E0495]: cannot infer an appropriate lifetime due to conflicting requirements - --> $DIR/regions-ret-borrowed.rs:23:14 + --> $DIR/regions-ret-borrowed.rs:13:14 | LL | with(|o| o) | ^ | -note: first, the lifetime cannot outlive the anonymous lifetime #2 defined on the body at 23:10... - --> $DIR/regions-ret-borrowed.rs:23:10 +note: first, the lifetime cannot outlive the anonymous lifetime #2 defined on the body at 13:10... + --> $DIR/regions-ret-borrowed.rs:13:10 | LL | with(|o| o) | ^^^^^ = note: ...so that the expression is assignable: expected &isize found &isize -note: but, the lifetime must be valid for the lifetime 'a as defined on the function body at 22:14... - --> $DIR/regions-ret-borrowed.rs:22:14 +note: but, the lifetime must be valid for the lifetime 'a as defined on the function body at 12:14... + --> $DIR/regions-ret-borrowed.rs:12:14 | LL | fn return_it<'a>() -> &'a isize { | ^^ note: ...so that reference does not outlive borrowed content - --> $DIR/regions-ret-borrowed.rs:23:5 + --> $DIR/regions-ret-borrowed.rs:13:5 | LL | with(|o| o) | ^^^^^^^^^^^ diff --git a/src/test/ui/regions/regions-ret.nll.stderr b/src/test/ui/regions/regions-ret.nll.stderr index cacc119d41013..8e32be157635f 100644 --- a/src/test/ui/regions/regions-ret.nll.stderr +++ b/src/test/ui/regions/regions-ret.nll.stderr @@ -1,13 +1,13 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/regions-ret.rs:14:13 + --> $DIR/regions-ret.rs:4:13 | LL | return &id(3); //~ ERROR borrowed value does not live long enough | ^^^^^- temporary value only lives until here | | | temporary value does not live long enough | -note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 13:1... - --> $DIR/regions-ret.rs:13:1 +note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 3:1... + --> $DIR/regions-ret.rs:3:1 | LL | / fn f(_x: &isize) -> &isize { LL | | return &id(3); //~ ERROR borrowed value does not live long enough diff --git a/src/test/ui/regions/regions-ret.rs b/src/test/ui/regions/regions-ret.rs index c7cd3ced98d23..a094d1af5b709 100644 --- a/src/test/ui/regions/regions-ret.rs +++ b/src/test/ui/regions/regions-ret.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn id(x: T) -> T { x } fn f(_x: &isize) -> &isize { diff --git a/src/test/ui/regions/regions-ret.stderr b/src/test/ui/regions/regions-ret.stderr index 84515a9b44cc1..001f62ab60cde 100644 --- a/src/test/ui/regions/regions-ret.stderr +++ b/src/test/ui/regions/regions-ret.stderr @@ -1,13 +1,13 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/regions-ret.rs:14:13 + --> $DIR/regions-ret.rs:4:13 | LL | return &id(3); //~ ERROR borrowed value does not live long enough | ^^^^^- temporary value only lives until here | | | temporary value does not live long enough | -note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 13:1... - --> $DIR/regions-ret.rs:13:1 +note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 3:1... + --> $DIR/regions-ret.rs:3:1 | LL | / fn f(_x: &isize) -> &isize { LL | | return &id(3); //~ ERROR borrowed value does not live long enough diff --git a/src/test/ui/regions/regions-return-ref-to-upvar-issue-17403.nll.stderr b/src/test/ui/regions/regions-return-ref-to-upvar-issue-17403.nll.stderr index 850226f60cf70..1f6cb6cfbcd88 100644 --- a/src/test/ui/regions/regions-return-ref-to-upvar-issue-17403.nll.stderr +++ b/src/test/ui/regions/regions-return-ref-to-upvar-issue-17403.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/regions-return-ref-to-upvar-issue-17403.rs:17:24 + --> $DIR/regions-return-ref-to-upvar-issue-17403.rs:7:24 | LL | let mut f = || &mut x; //~ ERROR cannot infer | ^^^^^^ error: unsatisfied lifetime constraints - --> $DIR/regions-return-ref-to-upvar-issue-17403.rs:17:24 + --> $DIR/regions-return-ref-to-upvar-issue-17403.rs:7:24 | LL | let mut f = || &mut x; //~ ERROR cannot infer | -- ^^^^^^ returning this value requires that `'1` must outlive `'2` diff --git a/src/test/ui/regions/regions-return-ref-to-upvar-issue-17403.rs b/src/test/ui/regions/regions-return-ref-to-upvar-issue-17403.rs index 99e5cc0315383..afe87f47eadbe 100644 --- a/src/test/ui/regions/regions-return-ref-to-upvar-issue-17403.rs +++ b/src/test/ui/regions/regions-return-ref-to-upvar-issue-17403.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that closures cannot subvert aliasing restrictions fn main() { diff --git a/src/test/ui/regions/regions-return-ref-to-upvar-issue-17403.stderr b/src/test/ui/regions/regions-return-ref-to-upvar-issue-17403.stderr index c841c9605bd5f..e4b14811d9075 100644 --- a/src/test/ui/regions/regions-return-ref-to-upvar-issue-17403.stderr +++ b/src/test/ui/regions/regions-return-ref-to-upvar-issue-17403.stderr @@ -1,26 +1,26 @@ error[E0495]: cannot infer an appropriate lifetime for borrow expression due to conflicting requirements - --> $DIR/regions-return-ref-to-upvar-issue-17403.rs:17:24 + --> $DIR/regions-return-ref-to-upvar-issue-17403.rs:7:24 | LL | let mut f = || &mut x; //~ ERROR cannot infer | ^^^^^^ | -note: first, the lifetime cannot outlive the lifetime as defined on the body at 17:21... - --> $DIR/regions-return-ref-to-upvar-issue-17403.rs:17:21 +note: first, the lifetime cannot outlive the lifetime as defined on the body at 7:21... + --> $DIR/regions-return-ref-to-upvar-issue-17403.rs:7:21 | LL | let mut f = || &mut x; //~ ERROR cannot infer | ^^^^^^^^^ note: ...so that closure can access `x` - --> $DIR/regions-return-ref-to-upvar-issue-17403.rs:17:24 + --> $DIR/regions-return-ref-to-upvar-issue-17403.rs:7:24 | LL | let mut f = || &mut x; //~ ERROR cannot infer | ^^^^^^ -note: but, the lifetime must be valid for the call at 19:17... - --> $DIR/regions-return-ref-to-upvar-issue-17403.rs:19:17 +note: but, the lifetime must be valid for the call at 9:17... + --> $DIR/regions-return-ref-to-upvar-issue-17403.rs:9:17 | LL | let y = f(); | ^^^ note: ...so type `&mut i32` of expression is valid during the expression - --> $DIR/regions-return-ref-to-upvar-issue-17403.rs:19:17 + --> $DIR/regions-return-ref-to-upvar-issue-17403.rs:9:17 | LL | let y = f(); | ^^^ diff --git a/src/test/ui/regions/regions-return-stack-allocated-vec.rs b/src/test/ui/regions/regions-return-stack-allocated-vec.rs index b5d4e07d04bb8..8d071dbc60695 100644 --- a/src/test/ui/regions/regions-return-stack-allocated-vec.rs +++ b/src/test/ui/regions/regions-return-stack-allocated-vec.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we cannot return a stack allocated slice fn function(x: isize) -> &'static [isize] { diff --git a/src/test/ui/regions/regions-return-stack-allocated-vec.stderr b/src/test/ui/regions/regions-return-stack-allocated-vec.stderr index 77c1d177acbc6..78eec7cc456e8 100644 --- a/src/test/ui/regions/regions-return-stack-allocated-vec.stderr +++ b/src/test/ui/regions/regions-return-stack-allocated-vec.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/regions-return-stack-allocated-vec.rs:14:6 + --> $DIR/regions-return-stack-allocated-vec.rs:4:6 | LL | &[x] //~ ERROR borrowed value does not live long enough | ^^^ temporary value does not live long enough diff --git a/src/test/ui/regions/regions-static-bound.ll.nll.stderr b/src/test/ui/regions/regions-static-bound.ll.nll.stderr index 326111aab7ef0..85bf9a820cdde 100644 --- a/src/test/ui/regions/regions-static-bound.ll.nll.stderr +++ b/src/test/ui/regions/regions-static-bound.ll.nll.stderr @@ -1,23 +1,23 @@ warning: not reporting region error due to nll - --> $DIR/regions-static-bound.rs:19:5 + --> $DIR/regions-static-bound.rs:9:5 | LL | t //[ll]~ ERROR E0312 | ^ warning: not reporting region error due to nll - --> $DIR/regions-static-bound.rs:25:5 + --> $DIR/regions-static-bound.rs:15:5 | LL | static_id(&u); //[ll]~ ERROR explicit lifetime required in the type of `u` [E0621] | ^^^^^^^^^ warning: not reporting region error due to nll - --> $DIR/regions-static-bound.rs:28:5 + --> $DIR/regions-static-bound.rs:18:5 | LL | static_id_indirect(&v); //[ll]~ ERROR explicit lifetime required in the type of `v` [E0621] | ^^^^^^^^^^^^^^^^^^ error: unsatisfied lifetime constraints - --> $DIR/regions-static-bound.rs:19:5 + --> $DIR/regions-static-bound.rs:9:5 | LL | fn static_id_wrong_way<'a>(t: &'a ()) -> &'static () where 'static: 'a { | -- lifetime `'a` defined here @@ -25,7 +25,7 @@ LL | t //[ll]~ ERROR E0312 | ^ returning this value requires that `'a` must outlive `'static` error[E0621]: explicit lifetime required in the type of `u` - --> $DIR/regions-static-bound.rs:25:5 + --> $DIR/regions-static-bound.rs:15:5 | LL | fn error(u: &(), v: &()) { | --- help: add explicit lifetime `'static` to the type of `u`: `&'static ()` @@ -33,7 +33,7 @@ LL | static_id(&u); //[ll]~ ERROR explicit lifetime required in the type of | ^^^^^^^^^^^^^ lifetime `'static` required error[E0621]: explicit lifetime required in the type of `v` - --> $DIR/regions-static-bound.rs:28:5 + --> $DIR/regions-static-bound.rs:18:5 | LL | fn error(u: &(), v: &()) { | --- help: add explicit lifetime `'static` to the type of `v`: `&'static ()` diff --git a/src/test/ui/regions/regions-static-bound.ll.stderr b/src/test/ui/regions/regions-static-bound.ll.stderr index 4a11677765d14..c7dc41a502eae 100644 --- a/src/test/ui/regions/regions-static-bound.ll.stderr +++ b/src/test/ui/regions/regions-static-bound.ll.stderr @@ -1,18 +1,18 @@ error[E0312]: lifetime of reference outlives lifetime of borrowed content... - --> $DIR/regions-static-bound.rs:19:5 + --> $DIR/regions-static-bound.rs:9:5 | LL | t //[ll]~ ERROR E0312 | ^ | = note: ...the reference is valid for the static lifetime... -note: ...but the borrowed content is only valid for the lifetime 'a as defined on the function body at 18:24 - --> $DIR/regions-static-bound.rs:18:24 +note: ...but the borrowed content is only valid for the lifetime 'a as defined on the function body at 8:24 + --> $DIR/regions-static-bound.rs:8:24 | LL | fn static_id_wrong_way<'a>(t: &'a ()) -> &'static () where 'static: 'a { | ^^ error[E0621]: explicit lifetime required in the type of `u` - --> $DIR/regions-static-bound.rs:25:5 + --> $DIR/regions-static-bound.rs:15:5 | LL | fn error(u: &(), v: &()) { | --- help: add explicit lifetime `'static` to the type of `u`: `&'static ()` @@ -20,7 +20,7 @@ LL | static_id(&u); //[ll]~ ERROR explicit lifetime required in the type of | ^^^^^^^^^ lifetime `'static` required error[E0621]: explicit lifetime required in the type of `v` - --> $DIR/regions-static-bound.rs:28:5 + --> $DIR/regions-static-bound.rs:18:5 | LL | fn error(u: &(), v: &()) { | --- help: add explicit lifetime `'static` to the type of `v`: `&'static ()` diff --git a/src/test/ui/regions/regions-static-bound.nll.stderr b/src/test/ui/regions/regions-static-bound.nll.stderr index 326111aab7ef0..85bf9a820cdde 100644 --- a/src/test/ui/regions/regions-static-bound.nll.stderr +++ b/src/test/ui/regions/regions-static-bound.nll.stderr @@ -1,23 +1,23 @@ warning: not reporting region error due to nll - --> $DIR/regions-static-bound.rs:19:5 + --> $DIR/regions-static-bound.rs:9:5 | LL | t //[ll]~ ERROR E0312 | ^ warning: not reporting region error due to nll - --> $DIR/regions-static-bound.rs:25:5 + --> $DIR/regions-static-bound.rs:15:5 | LL | static_id(&u); //[ll]~ ERROR explicit lifetime required in the type of `u` [E0621] | ^^^^^^^^^ warning: not reporting region error due to nll - --> $DIR/regions-static-bound.rs:28:5 + --> $DIR/regions-static-bound.rs:18:5 | LL | static_id_indirect(&v); //[ll]~ ERROR explicit lifetime required in the type of `v` [E0621] | ^^^^^^^^^^^^^^^^^^ error: unsatisfied lifetime constraints - --> $DIR/regions-static-bound.rs:19:5 + --> $DIR/regions-static-bound.rs:9:5 | LL | fn static_id_wrong_way<'a>(t: &'a ()) -> &'static () where 'static: 'a { | -- lifetime `'a` defined here @@ -25,7 +25,7 @@ LL | t //[ll]~ ERROR E0312 | ^ returning this value requires that `'a` must outlive `'static` error[E0621]: explicit lifetime required in the type of `u` - --> $DIR/regions-static-bound.rs:25:5 + --> $DIR/regions-static-bound.rs:15:5 | LL | fn error(u: &(), v: &()) { | --- help: add explicit lifetime `'static` to the type of `u`: `&'static ()` @@ -33,7 +33,7 @@ LL | static_id(&u); //[ll]~ ERROR explicit lifetime required in the type of | ^^^^^^^^^^^^^ lifetime `'static` required error[E0621]: explicit lifetime required in the type of `v` - --> $DIR/regions-static-bound.rs:28:5 + --> $DIR/regions-static-bound.rs:18:5 | LL | fn error(u: &(), v: &()) { | --- help: add explicit lifetime `'static` to the type of `v`: `&'static ()` diff --git a/src/test/ui/regions/regions-static-bound.rs b/src/test/ui/regions/regions-static-bound.rs index 0a37df4f0c788..60a7e5c741386 100644 --- a/src/test/ui/regions/regions-static-bound.rs +++ b/src/test/ui/regions/regions-static-bound.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ll nll //[nll] compile-flags:-Zborrowck=mir diff --git a/src/test/ui/regions/regions-steal-closure.nll.stderr b/src/test/ui/regions/regions-steal-closure.nll.stderr index ed70e38362dac..d231c0b75800d 100644 --- a/src/test/ui/regions/regions-steal-closure.nll.stderr +++ b/src/test/ui/regions/regions-steal-closure.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `i` does not live long enough - --> $DIR/regions-steal-closure.rs:24:28 + --> $DIR/regions-steal-closure.rs:14:28 | LL | box_it(Box::new(|| i += 1)) //~ ERROR `i` does not live long enough | -- ^ borrowed value does not live long enough diff --git a/src/test/ui/regions/regions-steal-closure.rs b/src/test/ui/regions/regions-steal-closure.rs index 7ca63b9896fe0..52b23f2f7ff91 100644 --- a/src/test/ui/regions/regions-steal-closure.rs +++ b/src/test/ui/regions/regions-steal-closure.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(fn_traits)] struct closure_box<'a> { diff --git a/src/test/ui/regions/regions-steal-closure.stderr b/src/test/ui/regions/regions-steal-closure.stderr index 44843d19e92a4..dc5c167153525 100644 --- a/src/test/ui/regions/regions-steal-closure.stderr +++ b/src/test/ui/regions/regions-steal-closure.stderr @@ -1,5 +1,5 @@ error[E0597]: `i` does not live long enough - --> $DIR/regions-steal-closure.rs:24:28 + --> $DIR/regions-steal-closure.rs:14:28 | LL | box_it(Box::new(|| i += 1)) //~ ERROR `i` does not live long enough | -- ^ borrowed value does not live long enough diff --git a/src/test/ui/regions/regions-struct-not-wf.lexical.stderr b/src/test/ui/regions/regions-struct-not-wf.lexical.stderr index 9433b8b1952f2..6bfba21f59de3 100644 --- a/src/test/ui/regions/regions-struct-not-wf.lexical.stderr +++ b/src/test/ui/regions/regions-struct-not-wf.lexical.stderr @@ -1,5 +1,5 @@ error[E0309]: the parameter type `T` may not live long enough - --> $DIR/regions-struct-not-wf.rs:19:5 + --> $DIR/regions-struct-not-wf.rs:9:5 | LL | struct Ref<'a, T> { | - help: consider adding an explicit lifetime bound `T: 'a`... @@ -7,13 +7,13 @@ LL | field: &'a T | ^^^^^^^^^^^^ | note: ...so that the reference type `&'a T` does not outlive the data it points at - --> $DIR/regions-struct-not-wf.rs:19:5 + --> $DIR/regions-struct-not-wf.rs:9:5 | LL | field: &'a T | ^^^^^^^^^^^^ error[E0309]: the parameter type `T` may not live long enough - --> $DIR/regions-struct-not-wf.rs:29:5 + --> $DIR/regions-struct-not-wf.rs:19:5 | LL | struct RefIndirect<'a, T> { | - help: consider adding an explicit lifetime bound `T: 'a`... @@ -21,24 +21,24 @@ LL | field: RefOk<'a, T> | ^^^^^^^^^^^^^^^^^^^ | note: ...so that the type `T` will meet its required lifetime bounds - --> $DIR/regions-struct-not-wf.rs:29:5 + --> $DIR/regions-struct-not-wf.rs:19:5 | LL | field: RefOk<'a, T> | ^^^^^^^^^^^^^^^^^^^ error[E0491]: in type `&'a &'b T`, reference has a longer lifetime than the data it references - --> $DIR/regions-struct-not-wf.rs:35:5 + --> $DIR/regions-struct-not-wf.rs:25:5 | LL | field: &'a &'b T | ^^^^^^^^^^^^^^^^ | -note: the pointer is valid for the lifetime 'a as defined on the struct at 34:18 - --> $DIR/regions-struct-not-wf.rs:34:18 +note: the pointer is valid for the lifetime 'a as defined on the struct at 24:18 + --> $DIR/regions-struct-not-wf.rs:24:18 | LL | struct DoubleRef<'a, 'b, T> { | ^^ -note: but the referenced data is only valid for the lifetime 'b as defined on the struct at 34:22 - --> $DIR/regions-struct-not-wf.rs:34:22 +note: but the referenced data is only valid for the lifetime 'b as defined on the struct at 24:22 + --> $DIR/regions-struct-not-wf.rs:24:22 | LL | struct DoubleRef<'a, 'b, T> { | ^^ diff --git a/src/test/ui/regions/regions-struct-not-wf.nll.stderr b/src/test/ui/regions/regions-struct-not-wf.nll.stderr index 9433b8b1952f2..6bfba21f59de3 100644 --- a/src/test/ui/regions/regions-struct-not-wf.nll.stderr +++ b/src/test/ui/regions/regions-struct-not-wf.nll.stderr @@ -1,5 +1,5 @@ error[E0309]: the parameter type `T` may not live long enough - --> $DIR/regions-struct-not-wf.rs:19:5 + --> $DIR/regions-struct-not-wf.rs:9:5 | LL | struct Ref<'a, T> { | - help: consider adding an explicit lifetime bound `T: 'a`... @@ -7,13 +7,13 @@ LL | field: &'a T | ^^^^^^^^^^^^ | note: ...so that the reference type `&'a T` does not outlive the data it points at - --> $DIR/regions-struct-not-wf.rs:19:5 + --> $DIR/regions-struct-not-wf.rs:9:5 | LL | field: &'a T | ^^^^^^^^^^^^ error[E0309]: the parameter type `T` may not live long enough - --> $DIR/regions-struct-not-wf.rs:29:5 + --> $DIR/regions-struct-not-wf.rs:19:5 | LL | struct RefIndirect<'a, T> { | - help: consider adding an explicit lifetime bound `T: 'a`... @@ -21,24 +21,24 @@ LL | field: RefOk<'a, T> | ^^^^^^^^^^^^^^^^^^^ | note: ...so that the type `T` will meet its required lifetime bounds - --> $DIR/regions-struct-not-wf.rs:29:5 + --> $DIR/regions-struct-not-wf.rs:19:5 | LL | field: RefOk<'a, T> | ^^^^^^^^^^^^^^^^^^^ error[E0491]: in type `&'a &'b T`, reference has a longer lifetime than the data it references - --> $DIR/regions-struct-not-wf.rs:35:5 + --> $DIR/regions-struct-not-wf.rs:25:5 | LL | field: &'a &'b T | ^^^^^^^^^^^^^^^^ | -note: the pointer is valid for the lifetime 'a as defined on the struct at 34:18 - --> $DIR/regions-struct-not-wf.rs:34:18 +note: the pointer is valid for the lifetime 'a as defined on the struct at 24:18 + --> $DIR/regions-struct-not-wf.rs:24:18 | LL | struct DoubleRef<'a, 'b, T> { | ^^ -note: but the referenced data is only valid for the lifetime 'b as defined on the struct at 34:22 - --> $DIR/regions-struct-not-wf.rs:34:22 +note: but the referenced data is only valid for the lifetime 'b as defined on the struct at 24:22 + --> $DIR/regions-struct-not-wf.rs:24:22 | LL | struct DoubleRef<'a, 'b, T> { | ^^ diff --git a/src/test/ui/regions/regions-struct-not-wf.rs b/src/test/ui/regions/regions-struct-not-wf.rs index 9106f1f0ba69c..760d1071b88b6 100644 --- a/src/test/ui/regions/regions-struct-not-wf.rs +++ b/src/test/ui/regions/regions-struct-not-wf.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Various examples of structs whose fields are not well-formed. // revisions:lexical nll diff --git a/src/test/ui/regions/regions-trait-1.rs b/src/test/ui/regions/regions-trait-1.rs index 9cd08656b62c5..8efc3f8751b18 100644 --- a/src/test/ui/regions/regions-trait-1.rs +++ b/src/test/ui/regions/regions-trait-1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] struct ctxt { v: usize } diff --git a/src/test/ui/regions/regions-trait-1.stderr b/src/test/ui/regions/regions-trait-1.stderr index dbc47a55950b7..653d29dd43716 100644 --- a/src/test/ui/regions/regions-trait-1.stderr +++ b/src/test/ui/regions/regions-trait-1.stderr @@ -1,18 +1,18 @@ error[E0308]: method not compatible with trait - --> $DIR/regions-trait-1.rs:26:5 + --> $DIR/regions-trait-1.rs:16:5 | LL | fn get_ctxt(&self) -> &'a ctxt { //~ ERROR method not compatible with trait | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lifetime mismatch | = note: expected type `fn(&has_ctxt<'a>) -> &ctxt` found type `fn(&has_ctxt<'a>) -> &'a ctxt` -note: the lifetime 'a as defined on the impl at 22:6... - --> $DIR/regions-trait-1.rs:22:6 +note: the lifetime 'a as defined on the impl at 12:6... + --> $DIR/regions-trait-1.rs:12:6 | LL | impl<'a> get_ctxt for has_ctxt<'a> { | ^^ -note: ...does not necessarily outlive the anonymous lifetime #1 defined on the method body at 26:5 - --> $DIR/regions-trait-1.rs:26:5 +note: ...does not necessarily outlive the anonymous lifetime #1 defined on the method body at 16:5 + --> $DIR/regions-trait-1.rs:16:5 | LL | / fn get_ctxt(&self) -> &'a ctxt { //~ ERROR method not compatible with trait LL | | self.c diff --git a/src/test/ui/regions/regions-trait-object-subtyping.nll.stderr b/src/test/ui/regions/regions-trait-object-subtyping.nll.stderr index 99bee4a36c1d1..bf9bfeee649cd 100644 --- a/src/test/ui/regions/regions-trait-object-subtyping.nll.stderr +++ b/src/test/ui/regions/regions-trait-object-subtyping.nll.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/regions-trait-object-subtyping.rs:25:5 + --> $DIR/regions-trait-object-subtyping.rs:15:5 | LL | x //~ ERROR lifetime bound not satisfied | ^ warning: not reporting region error due to nll - --> $DIR/regions-trait-object-subtyping.rs:32:5 + --> $DIR/regions-trait-object-subtyping.rs:22:5 | LL | x //~ ERROR mismatched types | ^ error: unsatisfied lifetime constraints - --> $DIR/regions-trait-object-subtyping.rs:23:51 + --> $DIR/regions-trait-object-subtyping.rs:13:51 | LL | fn foo3<'a,'b>(x: &'a mut Dummy) -> &'b mut Dummy { | _________--_--_____________________________________^ @@ -25,7 +25,7 @@ LL | | } | |_^ returning this value requires that `'a` must outlive `'b` error: unsatisfied lifetime constraints - --> $DIR/regions-trait-object-subtyping.rs:32:5 + --> $DIR/regions-trait-object-subtyping.rs:22:5 | LL | fn foo4<'a:'b,'b>(x: Wrapper<&'a mut Dummy>) -> Wrapper<&'b mut Dummy> { | -- -- lifetime `'b` defined here diff --git a/src/test/ui/regions/regions-trait-object-subtyping.rs b/src/test/ui/regions/regions-trait-object-subtyping.rs index 948fb7e1ef6c2..eb2623544563f 100644 --- a/src/test/ui/regions/regions-trait-object-subtyping.rs +++ b/src/test/ui/regions/regions-trait-object-subtyping.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Dummy { fn dummy(&self); } fn foo1<'a:'b,'b>(x: &'a mut (Dummy+'a)) -> &'b mut (Dummy+'b) { diff --git a/src/test/ui/regions/regions-trait-object-subtyping.stderr b/src/test/ui/regions/regions-trait-object-subtyping.stderr index 1b078855efdbb..5852aeff3f217 100644 --- a/src/test/ui/regions/regions-trait-object-subtyping.stderr +++ b/src/test/ui/regions/regions-trait-object-subtyping.stderr @@ -1,38 +1,38 @@ error[E0478]: lifetime bound not satisfied - --> $DIR/regions-trait-object-subtyping.rs:25:5 + --> $DIR/regions-trait-object-subtyping.rs:15:5 | LL | x //~ ERROR lifetime bound not satisfied | ^ | -note: lifetime parameter instantiated with the lifetime 'a as defined on the function body at 23:9 - --> $DIR/regions-trait-object-subtyping.rs:23:9 +note: lifetime parameter instantiated with the lifetime 'a as defined on the function body at 13:9 + --> $DIR/regions-trait-object-subtyping.rs:13:9 | LL | fn foo3<'a,'b>(x: &'a mut Dummy) -> &'b mut Dummy { | ^^ -note: but lifetime parameter must outlive the lifetime 'b as defined on the function body at 23:12 - --> $DIR/regions-trait-object-subtyping.rs:23:12 +note: but lifetime parameter must outlive the lifetime 'b as defined on the function body at 13:12 + --> $DIR/regions-trait-object-subtyping.rs:13:12 | LL | fn foo3<'a,'b>(x: &'a mut Dummy) -> &'b mut Dummy { | ^^ error[E0495]: cannot infer an appropriate lifetime for automatic coercion due to conflicting requirements - --> $DIR/regions-trait-object-subtyping.rs:25:5 + --> $DIR/regions-trait-object-subtyping.rs:15:5 | LL | x //~ ERROR lifetime bound not satisfied | ^ | -note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 23:9... - --> $DIR/regions-trait-object-subtyping.rs:23:9 +note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 13:9... + --> $DIR/regions-trait-object-subtyping.rs:13:9 | LL | fn foo3<'a,'b>(x: &'a mut Dummy) -> &'b mut Dummy { | ^^ note: ...so that the type `(dyn Dummy + 'a)` is not borrowed for too long - --> $DIR/regions-trait-object-subtyping.rs:25:5 + --> $DIR/regions-trait-object-subtyping.rs:15:5 | LL | x //~ ERROR lifetime bound not satisfied | ^ -note: but, the lifetime must be valid for the lifetime 'b as defined on the function body at 23:12... - --> $DIR/regions-trait-object-subtyping.rs:23:12 +note: but, the lifetime must be valid for the lifetime 'b as defined on the function body at 13:12... + --> $DIR/regions-trait-object-subtyping.rs:13:12 | LL | fn foo3<'a,'b>(x: &'a mut Dummy) -> &'b mut Dummy { | ^^ @@ -41,20 +41,20 @@ LL | fn foo3<'a,'b>(x: &'a mut Dummy) -> &'b mut Dummy { found &mut (dyn Dummy + 'b) error[E0308]: mismatched types - --> $DIR/regions-trait-object-subtyping.rs:32:5 + --> $DIR/regions-trait-object-subtyping.rs:22:5 | LL | x //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `Wrapper<&'b mut (dyn Dummy + 'b)>` found type `Wrapper<&'a mut (dyn Dummy + 'a)>` -note: the lifetime 'b as defined on the function body at 30:15... - --> $DIR/regions-trait-object-subtyping.rs:30:15 +note: the lifetime 'b as defined on the function body at 20:15... + --> $DIR/regions-trait-object-subtyping.rs:20:15 | LL | fn foo4<'a:'b,'b>(x: Wrapper<&'a mut Dummy>) -> Wrapper<&'b mut Dummy> { | ^^ -note: ...does not necessarily outlive the lifetime 'a as defined on the function body at 30:9 - --> $DIR/regions-trait-object-subtyping.rs:30:9 +note: ...does not necessarily outlive the lifetime 'a as defined on the function body at 20:9 + --> $DIR/regions-trait-object-subtyping.rs:20:9 | LL | fn foo4<'a:'b,'b>(x: Wrapper<&'a mut Dummy>) -> Wrapper<&'b mut Dummy> { | ^^ diff --git a/src/test/ui/regions/regions-trait-variance.nll.stderr b/src/test/ui/regions/regions-trait-variance.nll.stderr index c610394c51b7a..9a71b09630db4 100644 --- a/src/test/ui/regions/regions-trait-variance.nll.stderr +++ b/src/test/ui/regions/regions-trait-variance.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `*b` does not live long enough - --> $DIR/regions-trait-variance.rs:47:18 + --> $DIR/regions-trait-variance.rs:37:18 | LL | let bb: &B = &*b; //~ ERROR `*b` does not live long enough | ^^^ borrowed value does not live long enough @@ -7,8 +7,8 @@ LL | make_a(bb) LL | } | - `*b` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 43:16... - --> $DIR/regions-trait-variance.rs:43:16 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 33:16... + --> $DIR/regions-trait-variance.rs:33:16 | LL | fn make_make_a<'a>() -> A<'a> { | ^^ diff --git a/src/test/ui/regions/regions-trait-variance.rs b/src/test/ui/regions/regions-trait-variance.rs index 9ba4ef4e35837..d5462b21fa71c 100644 --- a/src/test/ui/regions/regions-trait-variance.rs +++ b/src/test/ui/regions/regions-trait-variance.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] // Issue #12470. diff --git a/src/test/ui/regions/regions-trait-variance.stderr b/src/test/ui/regions/regions-trait-variance.stderr index cd48d6bf8afe4..ddc8ce9796d60 100644 --- a/src/test/ui/regions/regions-trait-variance.stderr +++ b/src/test/ui/regions/regions-trait-variance.stderr @@ -1,5 +1,5 @@ error[E0597]: `*b` does not live long enough - --> $DIR/regions-trait-variance.rs:47:19 + --> $DIR/regions-trait-variance.rs:37:19 | LL | let bb: &B = &*b; //~ ERROR `*b` does not live long enough | ^^ borrowed value does not live long enough @@ -7,8 +7,8 @@ LL | make_a(bb) LL | } | - borrowed value only lives until here | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 43:16... - --> $DIR/regions-trait-variance.rs:43:16 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 33:16... + --> $DIR/regions-trait-variance.rs:33:16 | LL | fn make_make_a<'a>() -> A<'a> { | ^^ diff --git a/src/test/ui/regions/regions-undeclared.rs b/src/test/ui/regions/regions-undeclared.rs index 3190875158055..1edd998aa0e24 100644 --- a/src/test/ui/regions/regions-undeclared.rs +++ b/src/test/ui/regions/regions-undeclared.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - static c_x: &'blk isize = &22; //~ ERROR use of undeclared lifetime name `'blk` enum EnumDecl { diff --git a/src/test/ui/regions/regions-undeclared.stderr b/src/test/ui/regions/regions-undeclared.stderr index 9870f328abe58..7e35dc1c4741a 100644 --- a/src/test/ui/regions/regions-undeclared.stderr +++ b/src/test/ui/regions/regions-undeclared.stderr @@ -1,29 +1,29 @@ error[E0261]: use of undeclared lifetime name `'blk` - --> $DIR/regions-undeclared.rs:11:14 + --> $DIR/regions-undeclared.rs:1:14 | LL | static c_x: &'blk isize = &22; //~ ERROR use of undeclared lifetime name `'blk` | ^^^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'a` - --> $DIR/regions-undeclared.rs:14:10 + --> $DIR/regions-undeclared.rs:4:10 | LL | Foo(&'a isize), //~ ERROR use of undeclared lifetime name `'a` | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'a` - --> $DIR/regions-undeclared.rs:15:10 + --> $DIR/regions-undeclared.rs:5:10 | LL | Bar(&'a isize), //~ ERROR use of undeclared lifetime name `'a` | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'a` - --> $DIR/regions-undeclared.rs:18:15 + --> $DIR/regions-undeclared.rs:8:15 | LL | fn fnDecl(x: &'a isize, //~ ERROR use of undeclared lifetime name `'a` | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'a` - --> $DIR/regions-undeclared.rs:19:15 + --> $DIR/regions-undeclared.rs:9:15 | LL | y: &'a isize) //~ ERROR use of undeclared lifetime name `'a` | ^^ undeclared lifetime diff --git a/src/test/ui/regions/regions-var-type-out-of-scope.nll.stderr b/src/test/ui/regions/regions-var-type-out-of-scope.nll.stderr index 54b1a6fa970b7..01683dd04976c 100644 --- a/src/test/ui/regions/regions-var-type-out-of-scope.nll.stderr +++ b/src/test/ui/regions/regions-var-type-out-of-scope.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/regions-var-type-out-of-scope.rs:19:14 + --> $DIR/regions-var-type-out-of-scope.rs:9:14 | LL | x = &id(3); //~ ERROR borrowed value does not live long enough | ^^^^^- temporary value only lives until here diff --git a/src/test/ui/regions/regions-var-type-out-of-scope.rs b/src/test/ui/regions/regions-var-type-out-of-scope.rs index 031091c45234a..e972163097490 100644 --- a/src/test/ui/regions/regions-var-type-out-of-scope.rs +++ b/src/test/ui/regions/regions-var-type-out-of-scope.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn id(x: T) -> T { x } fn foo(cond: bool) { diff --git a/src/test/ui/regions/regions-var-type-out-of-scope.stderr b/src/test/ui/regions/regions-var-type-out-of-scope.stderr index 92a6451c3bd62..f474b9a2343cf 100644 --- a/src/test/ui/regions/regions-var-type-out-of-scope.stderr +++ b/src/test/ui/regions/regions-var-type-out-of-scope.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/regions-var-type-out-of-scope.rs:19:14 + --> $DIR/regions-var-type-out-of-scope.rs:9:14 | LL | x = &id(3); //~ ERROR borrowed value does not live long enough | ^^^^^- temporary value dropped here while still borrowed diff --git a/src/test/ui/regions/regions-variance-contravariant-use-covariant-in-second-position.rs b/src/test/ui/regions/regions-variance-contravariant-use-covariant-in-second-position.rs index a028bae40013d..fd30ffde872aa 100644 --- a/src/test/ui/regions/regions-variance-contravariant-use-covariant-in-second-position.rs +++ b/src/test/ui/regions/regions-variance-contravariant-use-covariant-in-second-position.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-compare-mode-nll // Test that a type which is covariant with respect to its region diff --git a/src/test/ui/regions/regions-variance-contravariant-use-covariant-in-second-position.stderr b/src/test/ui/regions/regions-variance-contravariant-use-covariant-in-second-position.stderr index fd1d3ab99f38a..87fe4ba658f5e 100644 --- a/src/test/ui/regions/regions-variance-contravariant-use-covariant-in-second-position.stderr +++ b/src/test/ui/regions/regions-variance-contravariant-use-covariant-in-second-position.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/regions-variance-contravariant-use-covariant-in-second-position.rs:37:30 + --> $DIR/regions-variance-contravariant-use-covariant-in-second-position.rs:27:30 | LL | fn use_<'short,'long>(c: S<'long, 'short>, | ---------------- diff --git a/src/test/ui/regions/regions-variance-contravariant-use-covariant.rs b/src/test/ui/regions/regions-variance-contravariant-use-covariant.rs index 84c4e52a9c07f..8d26320373190 100644 --- a/src/test/ui/regions/regions-variance-contravariant-use-covariant.rs +++ b/src/test/ui/regions/regions-variance-contravariant-use-covariant.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-compare-mode-nll // Test that a type which is covariant with respect to its region diff --git a/src/test/ui/regions/regions-variance-contravariant-use-covariant.stderr b/src/test/ui/regions/regions-variance-contravariant-use-covariant.stderr index a1e4913aa3a30..8975e1ce28c28 100644 --- a/src/test/ui/regions/regions-variance-contravariant-use-covariant.stderr +++ b/src/test/ui/regions/regions-variance-contravariant-use-covariant.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/regions-variance-contravariant-use-covariant.rs:35:35 + --> $DIR/regions-variance-contravariant-use-covariant.rs:25:35 | LL | fn use_<'short,'long>(c: Contravariant<'short>, | --------------------- these two types are declared with different lifetimes... diff --git a/src/test/ui/regions/regions-variance-covariant-use-contravariant.rs b/src/test/ui/regions/regions-variance-covariant-use-contravariant.rs index 824a442c87d54..17cd1335cb1f3 100644 --- a/src/test/ui/regions/regions-variance-covariant-use-contravariant.rs +++ b/src/test/ui/regions/regions-variance-covariant-use-contravariant.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-compare-mode-nll // Test that a type which is covariant with respect to its region diff --git a/src/test/ui/regions/regions-variance-covariant-use-contravariant.stderr b/src/test/ui/regions/regions-variance-covariant-use-contravariant.stderr index fc1c6c304f8ad..0cb7ae24f1655 100644 --- a/src/test/ui/regions/regions-variance-covariant-use-contravariant.stderr +++ b/src/test/ui/regions/regions-variance-covariant-use-contravariant.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/regions-variance-covariant-use-contravariant.rs:35:32 + --> $DIR/regions-variance-covariant-use-contravariant.rs:25:32 | LL | fn use_<'short,'long>(c: Covariant<'long>, | ---------------- diff --git a/src/test/ui/regions/regions-variance-invariant-use-contravariant.rs b/src/test/ui/regions/regions-variance-invariant-use-contravariant.rs index 9c6db331c0173..93c36e83c645f 100644 --- a/src/test/ui/regions/regions-variance-invariant-use-contravariant.rs +++ b/src/test/ui/regions/regions-variance-invariant-use-contravariant.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-compare-mode-nll // Test that an invariant region parameter used in a contravariant way diff --git a/src/test/ui/regions/regions-variance-invariant-use-contravariant.stderr b/src/test/ui/regions/regions-variance-invariant-use-contravariant.stderr index 6b67e6b192e9c..429fd8291d83a 100644 --- a/src/test/ui/regions/regions-variance-invariant-use-contravariant.stderr +++ b/src/test/ui/regions/regions-variance-invariant-use-contravariant.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/regions-variance-invariant-use-contravariant.rs:32:32 + --> $DIR/regions-variance-invariant-use-contravariant.rs:22:32 | LL | fn use_<'short,'long>(c: Invariant<'long>, | ---------------- diff --git a/src/test/ui/regions/regions-variance-invariant-use-covariant.rs b/src/test/ui/regions/regions-variance-invariant-use-covariant.rs index ed393de357a3f..d0a6d7120cca9 100644 --- a/src/test/ui/regions/regions-variance-invariant-use-covariant.rs +++ b/src/test/ui/regions/regions-variance-invariant-use-covariant.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-compare-mode-nll // Test that a type which is invariant with respect to its region diff --git a/src/test/ui/regions/regions-variance-invariant-use-covariant.stderr b/src/test/ui/regions/regions-variance-invariant-use-covariant.stderr index 5b50f4bd51373..d3b0a1cc1dfba 100644 --- a/src/test/ui/regions/regions-variance-invariant-use-covariant.stderr +++ b/src/test/ui/regions/regions-variance-invariant-use-covariant.stderr @@ -1,13 +1,13 @@ error[E0308]: mismatched types - --> $DIR/regions-variance-invariant-use-covariant.rs:29:33 + --> $DIR/regions-variance-invariant-use-covariant.rs:19:33 | LL | let _: Invariant<'static> = c; //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `Invariant<'static>` found type `Invariant<'b>` -note: the lifetime 'b as defined on the function body at 23:9... - --> $DIR/regions-variance-invariant-use-covariant.rs:23:9 +note: the lifetime 'b as defined on the function body at 13:9... + --> $DIR/regions-variance-invariant-use-covariant.rs:13:9 | LL | fn use_<'b>(c: Invariant<'b>) { | ^^ diff --git a/src/test/ui/regions/regions-wf-trait-object.rs b/src/test/ui/regions/regions-wf-trait-object.rs index 39b8482cfa30e..61bab359f9a08 100644 --- a/src/test/ui/regions/regions-wf-trait-object.rs +++ b/src/test/ui/regions/regions-wf-trait-object.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that the explicit lifetime bound (`'b`, in this example) must // outlive all the superbound from the trait (`'a`, in this example). diff --git a/src/test/ui/regions/regions-wf-trait-object.stderr b/src/test/ui/regions/regions-wf-trait-object.stderr index caaa902abbe4c..c26895773761e 100644 --- a/src/test/ui/regions/regions-wf-trait-object.stderr +++ b/src/test/ui/regions/regions-wf-trait-object.stderr @@ -1,16 +1,16 @@ error[E0478]: lifetime bound not satisfied - --> $DIR/regions-wf-trait-object.rs:17:5 + --> $DIR/regions-wf-trait-object.rs:7:5 | LL | x: Box+'b> //~ ERROR E0478 | ^^^^^^^^^^^^^^^^^^^^^^^ | -note: lifetime parameter instantiated with the lifetime 'b as defined on the struct at 16:15 - --> $DIR/regions-wf-trait-object.rs:16:15 +note: lifetime parameter instantiated with the lifetime 'b as defined on the struct at 6:15 + --> $DIR/regions-wf-trait-object.rs:6:15 | LL | struct Foo<'a,'b> { | ^^ -note: but lifetime parameter must outlive the lifetime 'a as defined on the struct at 16:12 - --> $DIR/regions-wf-trait-object.rs:16:12 +note: but lifetime parameter must outlive the lifetime 'a as defined on the struct at 6:12 + --> $DIR/regions-wf-trait-object.rs:6:12 | LL | struct Foo<'a,'b> { | ^^ diff --git a/src/test/ui/reject-specialized-drops-8142.rs b/src/test/ui/reject-specialized-drops-8142.rs index 1ea956bbd5489..7441a77bd8227 100644 --- a/src/test/ui/reject-specialized-drops-8142.rs +++ b/src/test/ui/reject-specialized-drops-8142.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue 8142: Test that Drop impls cannot be specialized beyond the // predicates attached to the struct/enum definition itself. diff --git a/src/test/ui/reject-specialized-drops-8142.stderr b/src/test/ui/reject-specialized-drops-8142.stderr index c0f1525a761bb..9c2f32eb62d7f 100644 --- a/src/test/ui/reject-specialized-drops-8142.stderr +++ b/src/test/ui/reject-specialized-drops-8142.stderr @@ -1,5 +1,5 @@ error[E0367]: The requirement `'adds_bnd : 'al` is added only by the Drop impl. - --> $DIR/reject-specialized-drops-8142.rs:29:1 + --> $DIR/reject-specialized-drops-8142.rs:19:1 | LL | / impl<'al,'adds_bnd:'al> Drop for K<'al,'adds_bnd> { // REJECT LL | | //~^ ERROR The requirement `'adds_bnd : 'al` is added only by the Drop impl. @@ -7,13 +7,13 @@ LL | | fn drop(&mut self) { } } | |____________________________^ | note: The same requirement must be part of the struct/enum definition - --> $DIR/reject-specialized-drops-8142.rs:15:1 + --> $DIR/reject-specialized-drops-8142.rs:5:1 | LL | struct K<'l1,'l2> { x: &'l1 i8, y: &'l2 u8 } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0367]: The requirement `'adds_bnd : 'al` is added only by the Drop impl. - --> $DIR/reject-specialized-drops-8142.rs:33:1 + --> $DIR/reject-specialized-drops-8142.rs:23:1 | LL | / impl<'al,'adds_bnd> Drop for L<'al,'adds_bnd> where 'adds_bnd:'al { // REJECT LL | | //~^ ERROR The requirement `'adds_bnd : 'al` is added only by the Drop impl. @@ -21,87 +21,87 @@ LL | | fn drop(&mut self) { } } | |____________________________^ | note: The same requirement must be part of the struct/enum definition - --> $DIR/reject-specialized-drops-8142.rs:16:1 + --> $DIR/reject-specialized-drops-8142.rs:6:1 | LL | struct L<'l1,'l2> { x: &'l1 i8, y: &'l2 u8 } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/reject-specialized-drops-8142.rs:39:1 + --> $DIR/reject-specialized-drops-8142.rs:29:1 | LL | impl Drop for N<'static> { fn drop(&mut self) { } } // REJECT | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lifetime mismatch | = note: expected type `N<'n>` found type `N<'static>` -note: the lifetime 'n as defined on the struct at 18:10... - --> $DIR/reject-specialized-drops-8142.rs:18:10 +note: the lifetime 'n as defined on the struct at 8:10... + --> $DIR/reject-specialized-drops-8142.rs:8:10 | LL | struct N<'n> { x: &'n i8 } | ^^ = note: ...does not necessarily outlive the static lifetime error[E0366]: Implementations of Drop cannot be specialized - --> $DIR/reject-specialized-drops-8142.rs:46:1 + --> $DIR/reject-specialized-drops-8142.rs:36:1 | LL | impl Drop for P { fn drop(&mut self) { } } // REJECT | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | note: Use same sequence of generic type and region parameters that is on the struct/enum definition - --> $DIR/reject-specialized-drops-8142.rs:20:1 + --> $DIR/reject-specialized-drops-8142.rs:10:1 | LL | struct P { x: *const Tp } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0367]: The requirement `Adds_bnd: Bound` is added only by the Drop impl. - --> $DIR/reject-specialized-drops-8142.rs:49:1 + --> $DIR/reject-specialized-drops-8142.rs:39:1 | LL | impl Drop for Q { fn drop(&mut self) { } } // REJECT | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | note: The same requirement must be part of the struct/enum definition - --> $DIR/reject-specialized-drops-8142.rs:21:1 + --> $DIR/reject-specialized-drops-8142.rs:11:1 | LL | struct Q { x: *const Tq } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0367]: The requirement `Adds_rbnd : 'rbnd` is added only by the Drop impl. - --> $DIR/reject-specialized-drops-8142.rs:52:1 + --> $DIR/reject-specialized-drops-8142.rs:42:1 | LL | impl<'rbnd,Adds_rbnd:'rbnd> Drop for R { fn drop(&mut self) { } } // REJECT | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | note: The same requirement must be part of the struct/enum definition - --> $DIR/reject-specialized-drops-8142.rs:22:1 + --> $DIR/reject-specialized-drops-8142.rs:12:1 | LL | struct R { x: *const Tr } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0366]: Implementations of Drop cannot be specialized - --> $DIR/reject-specialized-drops-8142.rs:61:1 + --> $DIR/reject-specialized-drops-8142.rs:51:1 | LL | impl Drop for V { fn drop(&mut self) { } } // REJECT | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | note: Use same sequence of generic type and region parameters that is on the struct/enum definition - --> $DIR/reject-specialized-drops-8142.rs:26:1 + --> $DIR/reject-specialized-drops-8142.rs:16:1 | LL | struct V { x: *const Tva, y: *const Tvb } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0495]: cannot infer an appropriate lifetime for lifetime parameter `'lw` due to conflicting requirements - --> $DIR/reject-specialized-drops-8142.rs:64:1 + --> $DIR/reject-specialized-drops-8142.rs:54:1 | LL | impl<'lw> Drop for W<'lw,'lw> { fn drop(&mut self) { } } // REJECT | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | -note: first, the lifetime cannot outlive the lifetime 'l1 as defined on the struct at 27:10... - --> $DIR/reject-specialized-drops-8142.rs:27:10 +note: first, the lifetime cannot outlive the lifetime 'l1 as defined on the struct at 17:10... + --> $DIR/reject-specialized-drops-8142.rs:17:10 | LL | struct W<'l1, 'l2> { x: &'l1 i8, y: &'l2 u8 } | ^^^ -note: ...but the lifetime must also be valid for the lifetime 'l2 as defined on the struct at 27:15... - --> $DIR/reject-specialized-drops-8142.rs:27:15 +note: ...but the lifetime must also be valid for the lifetime 'l2 as defined on the struct at 17:15... + --> $DIR/reject-specialized-drops-8142.rs:17:15 | LL | struct W<'l1, 'l2> { x: &'l1 i8, y: &'l2 u8 } | ^^^ diff --git a/src/test/ui/removing-extern-crate.fixed b/src/test/ui/removing-extern-crate.fixed index 90427b061b652..71728e8a7313d 100644 --- a/src/test/ui/removing-extern-crate.fixed +++ b/src/test/ui/removing-extern-crate.fixed @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 // aux-build:removing-extern-crate.rs // run-rustfix diff --git a/src/test/ui/removing-extern-crate.rs b/src/test/ui/removing-extern-crate.rs index 3905d285becb5..109a328efc68d 100644 --- a/src/test/ui/removing-extern-crate.rs +++ b/src/test/ui/removing-extern-crate.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 // aux-build:removing-extern-crate.rs // run-rustfix diff --git a/src/test/ui/removing-extern-crate.stderr b/src/test/ui/removing-extern-crate.stderr index f2eed27a26693..3e577c3e0b8b2 100644 --- a/src/test/ui/removing-extern-crate.stderr +++ b/src/test/ui/removing-extern-crate.stderr @@ -1,30 +1,30 @@ warning: unused extern crate - --> $DIR/removing-extern-crate.rs:19:1 + --> $DIR/removing-extern-crate.rs:9:1 | LL | extern crate std as foo; | ^^^^^^^^^^^^^^^^^^^^^^^^ help: remove it | note: lint level defined here - --> $DIR/removing-extern-crate.rs:16:9 + --> $DIR/removing-extern-crate.rs:6:9 | LL | #![warn(rust_2018_idioms)] | ^^^^^^^^^^^^^^^^ = note: #[warn(unused_extern_crates)] implied by #[warn(rust_2018_idioms)] warning: unused extern crate - --> $DIR/removing-extern-crate.rs:20:1 + --> $DIR/removing-extern-crate.rs:10:1 | LL | extern crate core; | ^^^^^^^^^^^^^^^^^^ help: remove it warning: unused extern crate - --> $DIR/removing-extern-crate.rs:23:5 + --> $DIR/removing-extern-crate.rs:13:5 | LL | extern crate std as foo; | ^^^^^^^^^^^^^^^^^^^^^^^^ help: remove it warning: unused extern crate - --> $DIR/removing-extern-crate.rs:24:5 + --> $DIR/removing-extern-crate.rs:14:5 | LL | extern crate std; | ^^^^^^^^^^^^^^^^^ help: remove it diff --git a/src/test/ui/repeat-to-run-dtor-twice.rs b/src/test/ui/repeat-to-run-dtor-twice.rs index 88441594a7e93..80eff2acdd27b 100644 --- a/src/test/ui/repeat-to-run-dtor-twice.rs +++ b/src/test/ui/repeat-to-run-dtor-twice.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that one can't run a destructor twice with the repeated vector // literal syntax. diff --git a/src/test/ui/repeat-to-run-dtor-twice.stderr b/src/test/ui/repeat-to-run-dtor-twice.stderr index 408c28af10e09..5434f6cef544f 100644 --- a/src/test/ui/repeat-to-run-dtor-twice.stderr +++ b/src/test/ui/repeat-to-run-dtor-twice.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `Foo: std::marker::Copy` is not satisfied - --> $DIR/repeat-to-run-dtor-twice.rs:27:13 + --> $DIR/repeat-to-run-dtor-twice.rs:17:13 | LL | let _ = [ a; 5 ]; | ^^^^^^^^ the trait `std::marker::Copy` is not implemented for `Foo` diff --git a/src/test/ui/repeat_count.rs b/src/test/ui/repeat_count.rs index a716f3e29d488..74385c7949790 100644 --- a/src/test/ui/repeat_count.rs +++ b/src/test/ui/repeat_count.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #3645 fn main() { diff --git a/src/test/ui/repeat_count.stderr b/src/test/ui/repeat_count.stderr index 4852023ec8b03..b481cd187c597 100644 --- a/src/test/ui/repeat_count.stderr +++ b/src/test/ui/repeat_count.stderr @@ -1,11 +1,11 @@ error[E0435]: attempt to use a non-constant value in a constant - --> $DIR/repeat_count.rs:15:17 + --> $DIR/repeat_count.rs:5:17 | LL | let a = [0; n]; | ^ non-constant value error[E0308]: mismatched types - --> $DIR/repeat_count.rs:17:17 + --> $DIR/repeat_count.rs:7:17 | LL | let b = [0; ()]; | ^^ expected usize, found () @@ -14,13 +14,13 @@ LL | let b = [0; ()]; found type `()` error[E0308]: mismatched types - --> $DIR/repeat_count.rs:22:17 + --> $DIR/repeat_count.rs:12:17 | LL | let c = [0; true]; | ^^^^ expected usize, found bool error[E0308]: mismatched types - --> $DIR/repeat_count.rs:25:17 + --> $DIR/repeat_count.rs:15:17 | LL | let d = [0; 0.5]; | ^^^ expected usize, found floating-point variable @@ -29,7 +29,7 @@ LL | let d = [0; 0.5]; found type `{float}` error[E0308]: mismatched types - --> $DIR/repeat_count.rs:30:17 + --> $DIR/repeat_count.rs:20:17 | LL | let e = [0; "foo"]; | ^^^^^ expected usize, found reference @@ -38,19 +38,19 @@ LL | let e = [0; "foo"]; found type `&'static str` error[E0308]: mismatched types - --> $DIR/repeat_count.rs:35:17 + --> $DIR/repeat_count.rs:25:17 | LL | let f = [0; -4_isize]; | ^^^^^^^^ expected usize, found isize error[E0308]: mismatched types - --> $DIR/repeat_count.rs:38:23 + --> $DIR/repeat_count.rs:28:23 | LL | let f = [0_usize; -1_isize]; | ^^^^^^^^ expected usize, found isize error[E0308]: mismatched types - --> $DIR/repeat_count.rs:44:17 + --> $DIR/repeat_count.rs:34:17 | LL | let g = [0; G { g: () }]; | ^^^^^^^^^^^ expected usize, found struct `main::G` diff --git a/src/test/ui/repr.rs b/src/test/ui/repr.rs index 312f60202c6c2..a35252c41b8d9 100644 --- a/src/test/ui/repr.rs +++ b/src/test/ui/repr.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #[repr] diff --git a/src/test/ui/repr.stderr b/src/test/ui/repr.stderr index 7a99d8c04488f..503d47c36c94a 100644 --- a/src/test/ui/repr.stderr +++ b/src/test/ui/repr.stderr @@ -1,5 +1,5 @@ warning: `repr` attribute must have a hint - --> $DIR/repr.rs:13:1 + --> $DIR/repr.rs:3:1 | LL | #[repr] | ^^^^^^^ needs a hint @@ -9,7 +9,7 @@ LL | #[repr] = note: for more information, visit warning: `repr` attribute isn't configurable with a literal - --> $DIR/repr.rs:17:1 + --> $DIR/repr.rs:7:1 | LL | #[repr = "B"] | ^^^^^^^^^^^^^ needs a hint @@ -18,7 +18,7 @@ LL | #[repr = "B"] = note: for more information, visit warning: `repr` attribute isn't configurable with a literal - --> $DIR/repr.rs:21:1 + --> $DIR/repr.rs:11:1 | LL | #[repr = "C"] | ^^^^^^^^^^^^^ help: give `repr` a hint: `#[repr(C)]` diff --git a/src/test/ui/repr/repr-align-assign.fixed b/src/test/ui/repr/repr-align-assign.fixed index 62147e7625eb2..2e1d9a2d32691 100644 --- a/src/test/ui/repr/repr-align-assign.fixed +++ b/src/test/ui/repr/repr-align-assign.fixed @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix #![allow(dead_code)] diff --git a/src/test/ui/repr/repr-align-assign.rs b/src/test/ui/repr/repr-align-assign.rs index 3bc3b5c64ce25..b8f7c15ded695 100644 --- a/src/test/ui/repr/repr-align-assign.rs +++ b/src/test/ui/repr/repr-align-assign.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix #![allow(dead_code)] diff --git a/src/test/ui/repr/repr-align-assign.stderr b/src/test/ui/repr/repr-align-assign.stderr index c325b6968fe43..884a99357cdbe 100644 --- a/src/test/ui/repr/repr-align-assign.stderr +++ b/src/test/ui/repr/repr-align-assign.stderr @@ -1,11 +1,11 @@ error[E0693]: incorrect `repr(align)` attribute format - --> $DIR/repr-align-assign.rs:15:8 + --> $DIR/repr-align-assign.rs:5:8 | LL | #[repr(align=8)] //~ ERROR incorrect `repr(align)` attribute format | ^^^^^^^ help: use parentheses instead: `align(8)` error[E0693]: incorrect `repr(align)` attribute format - --> $DIR/repr-align-assign.rs:18:8 + --> $DIR/repr-align-assign.rs:8:8 | LL | #[repr(align="8")] //~ ERROR incorrect `repr(align)` attribute format | ^^^^^^^^^ help: use parentheses instead: `align(8)` diff --git a/src/test/ui/repr/repr-align.rs b/src/test/ui/repr/repr-align.rs index 9b0408de2a4fc..78ed6c7e1c417 100644 --- a/src/test/ui/repr/repr-align.rs +++ b/src/test/ui/repr/repr-align.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![allow(dead_code)] #[repr(align(16.0))] //~ ERROR: invalid `repr(align)` attribute: not an unsuffixed integer diff --git a/src/test/ui/repr/repr-align.stderr b/src/test/ui/repr/repr-align.stderr index 2195789bd6915..e8dbf74232bfa 100644 --- a/src/test/ui/repr/repr-align.stderr +++ b/src/test/ui/repr/repr-align.stderr @@ -1,17 +1,17 @@ error[E0589]: invalid `repr(align)` attribute: not an unsuffixed integer - --> $DIR/repr-align.rs:12:8 + --> $DIR/repr-align.rs:3:8 | LL | #[repr(align(16.0))] //~ ERROR: invalid `repr(align)` attribute: not an unsuffixed integer | ^^^^^^^^^^^ error[E0589]: invalid `repr(align)` attribute: not a power of two - --> $DIR/repr-align.rs:15:8 + --> $DIR/repr-align.rs:6:8 | LL | #[repr(align(15))] //~ ERROR: invalid `repr(align)` attribute: not a power of two | ^^^^^^^^^ error[E0589]: invalid `repr(align)` attribute: larger than 2^29 - --> $DIR/repr-align.rs:18:8 + --> $DIR/repr-align.rs:9:8 | LL | #[repr(align(4294967296))] //~ ERROR: invalid `repr(align)` attribute: larger than 2^29 | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/repr/repr-packed-contains-align.rs b/src/test/ui/repr/repr-packed-contains-align.rs index 27890333a5165..a3610345173a7 100644 --- a/src/test/ui/repr/repr-packed-contains-align.rs +++ b/src/test/ui/repr/repr-packed-contains-align.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![feature(untagged_unions)] #![allow(dead_code)] diff --git a/src/test/ui/repr/repr-packed-contains-align.stderr b/src/test/ui/repr/repr-packed-contains-align.stderr index 4558cf2e10415..59f8b359d1f56 100644 --- a/src/test/ui/repr/repr-packed-contains-align.stderr +++ b/src/test/ui/repr/repr-packed-contains-align.stderr @@ -1,29 +1,29 @@ error[E0588]: packed type cannot transitively contain a `[repr(align)]` type - --> $DIR/repr-packed-contains-align.rs:28:1 + --> $DIR/repr-packed-contains-align.rs:19:1 | LL | struct SC(SA); //~ ERROR: packed type cannot transitively contain a `[repr(align)]` type | ^^^^^^^^^^^^^^ error[E0588]: packed type cannot transitively contain a `[repr(align)]` type - --> $DIR/repr-packed-contains-align.rs:31:1 + --> $DIR/repr-packed-contains-align.rs:22:1 | LL | struct SD(SB); //~ ERROR: packed type cannot transitively contain a `[repr(align)]` type | ^^^^^^^^^^^^^^ error[E0588]: packed type cannot transitively contain a `[repr(align)]` type - --> $DIR/repr-packed-contains-align.rs:34:1 + --> $DIR/repr-packed-contains-align.rs:25:1 | LL | struct SE(UA); //~ ERROR: packed type cannot transitively contain a `[repr(align)]` type | ^^^^^^^^^^^^^^ error[E0588]: packed type cannot transitively contain a `[repr(align)]` type - --> $DIR/repr-packed-contains-align.rs:37:1 + --> $DIR/repr-packed-contains-align.rs:28:1 | LL | struct SF(UB); //~ ERROR: packed type cannot transitively contain a `[repr(align)]` type | ^^^^^^^^^^^^^^ error[E0588]: packed type cannot transitively contain a `[repr(align)]` type - --> $DIR/repr-packed-contains-align.rs:40:1 + --> $DIR/repr-packed-contains-align.rs:31:1 | LL | / union UC { //~ ERROR: packed type cannot transitively contain a `[repr(align)]` type LL | | a: UA @@ -31,7 +31,7 @@ LL | | } | |_^ error[E0588]: packed type cannot transitively contain a `[repr(align)]` type - --> $DIR/repr-packed-contains-align.rs:45:1 + --> $DIR/repr-packed-contains-align.rs:36:1 | LL | / union UD { //~ ERROR: packed type cannot transitively contain a `[repr(align)]` type LL | | n: UB @@ -39,7 +39,7 @@ LL | | } | |_^ error[E0588]: packed type cannot transitively contain a `[repr(align)]` type - --> $DIR/repr-packed-contains-align.rs:50:1 + --> $DIR/repr-packed-contains-align.rs:41:1 | LL | / union UE { //~ ERROR: packed type cannot transitively contain a `[repr(align)]` type LL | | a: SA @@ -47,7 +47,7 @@ LL | | } | |_^ error[E0588]: packed type cannot transitively contain a `[repr(align)]` type - --> $DIR/repr-packed-contains-align.rs:55:1 + --> $DIR/repr-packed-contains-align.rs:46:1 | LL | / union UF { //~ ERROR: packed type cannot transitively contain a `[repr(align)]` type LL | | n: SB diff --git a/src/test/ui/repr/repr-transparent-other-items.rs b/src/test/ui/repr/repr-transparent-other-items.rs index 685d62dc3a9c8..50fefe51c40aa 100644 --- a/src/test/ui/repr/repr-transparent-other-items.rs +++ b/src/test/ui/repr/repr-transparent-other-items.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // See also repr-transparent.rs #[repr(transparent)] //~ ERROR unsupported representation for zero-variant enum diff --git a/src/test/ui/repr/repr-transparent-other-items.stderr b/src/test/ui/repr/repr-transparent-other-items.stderr index e5889cf53e58a..ffab1b0c90c89 100644 --- a/src/test/ui/repr/repr-transparent-other-items.stderr +++ b/src/test/ui/repr/repr-transparent-other-items.stderr @@ -3,7 +3,7 @@ error[E0601]: `main` function not found in crate `repr_transparent_other_items` = note: consider adding a `main` function to `$DIR/repr-transparent-other-items.rs` error[E0517]: attribute should be applied to struct - --> $DIR/repr-transparent-other-items.rs:13:8 + --> $DIR/repr-transparent-other-items.rs:3:8 | LL | #[repr(transparent)] //~ ERROR unsupported representation for zero-variant enum | ^^^^^^^^^^^ @@ -11,7 +11,7 @@ LL | enum Void {} //~| ERROR should be applied to struct | ------------ not a struct error[E0517]: attribute should be applied to struct - --> $DIR/repr-transparent-other-items.rs:16:8 + --> $DIR/repr-transparent-other-items.rs:6:8 | LL | #[repr(transparent)] //~ ERROR should be applied to struct | ^^^^^^^^^^^ @@ -22,7 +22,7 @@ LL | | } | |_- not a struct error[E0517]: attribute should be applied to struct - --> $DIR/repr-transparent-other-items.rs:22:8 + --> $DIR/repr-transparent-other-items.rs:12:8 | LL | #[repr(transparent)] //~ ERROR should be applied to struct | ^^^^^^^^^^^ @@ -33,7 +33,7 @@ LL | | } | |_- not a struct error[E0517]: attribute should be applied to struct - --> $DIR/repr-transparent-other-items.rs:28:8 + --> $DIR/repr-transparent-other-items.rs:18:8 | LL | #[repr(transparent)] //~ ERROR should be applied to struct | ^^^^^^^^^^^ @@ -44,7 +44,7 @@ LL | | } | |_- not a struct error[E0517]: attribute should be applied to struct - --> $DIR/repr-transparent-other-items.rs:34:8 + --> $DIR/repr-transparent-other-items.rs:24:8 | LL | #[repr(transparent)] //~ ERROR should be applied to struct | ^^^^^^^^^^^ @@ -52,7 +52,7 @@ LL | fn cant_repr_this() {} | ---------------------- not a struct error[E0517]: attribute should be applied to struct - --> $DIR/repr-transparent-other-items.rs:37:8 + --> $DIR/repr-transparent-other-items.rs:27:8 | LL | #[repr(transparent)] //~ ERROR should be applied to struct | ^^^^^^^^^^^ @@ -60,7 +60,7 @@ LL | static CANT_REPR_THIS: u32 = 0; | ------------------------------- not a struct error[E0084]: unsupported representation for zero-variant enum - --> $DIR/repr-transparent-other-items.rs:13:1 + --> $DIR/repr-transparent-other-items.rs:3:1 | LL | #[repr(transparent)] //~ ERROR unsupported representation for zero-variant enum | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/repr/repr-transparent-other-reprs.rs b/src/test/ui/repr/repr-transparent-other-reprs.rs index fa5f1a2f7fb80..5c67dc5499019 100644 --- a/src/test/ui/repr/repr-transparent-other-reprs.rs +++ b/src/test/ui/repr/repr-transparent-other-reprs.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(repr_align)] // See also repr-transparent.rs diff --git a/src/test/ui/repr/repr-transparent-other-reprs.stderr b/src/test/ui/repr/repr-transparent-other-reprs.stderr index 40f41c474dbda..3434984b0aa56 100644 --- a/src/test/ui/repr/repr-transparent-other-reprs.stderr +++ b/src/test/ui/repr/repr-transparent-other-reprs.stderr @@ -3,25 +3,25 @@ error[E0601]: `main` function not found in crate `repr_transparent_other_reprs` = note: consider adding a `main` function to `$DIR/repr-transparent-other-reprs.rs` error[E0692]: transparent struct cannot have other repr hints - --> $DIR/repr-transparent-other-reprs.rs:15:8 + --> $DIR/repr-transparent-other-reprs.rs:5:8 | LL | #[repr(transparent, C)] //~ ERROR cannot have other repr | ^^^^^^^^^^^ ^ error[E0692]: transparent struct cannot have other repr hints - --> $DIR/repr-transparent-other-reprs.rs:20:8 + --> $DIR/repr-transparent-other-reprs.rs:10:8 | LL | #[repr(transparent, packed)] //~ ERROR cannot have other repr | ^^^^^^^^^^^ ^^^^^^ error[E0692]: transparent struct cannot have other repr hints - --> $DIR/repr-transparent-other-reprs.rs:23:8 + --> $DIR/repr-transparent-other-reprs.rs:13:8 | LL | #[repr(transparent, align(2))] //~ ERROR cannot have other repr | ^^^^^^^^^^^ ^^^^^^^^ error[E0692]: transparent struct cannot have other repr hints - --> $DIR/repr-transparent-other-reprs.rs:26:8 + --> $DIR/repr-transparent-other-reprs.rs:16:8 | LL | #[repr(transparent)] //~ ERROR cannot have other repr | ^^^^^^^^^^^ diff --git a/src/test/ui/repr/repr-transparent.rs b/src/test/ui/repr/repr-transparent.rs index 230573247316e..0d857177157cc 100644 --- a/src/test/ui/repr/repr-transparent.rs +++ b/src/test/ui/repr/repr-transparent.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file tests repr(transparent)-related errors reported during typeck. Other errors // that are reported earlier and therefore preempt these are tested in: // - repr-transparent-other-reprs.rs diff --git a/src/test/ui/repr/repr-transparent.stderr b/src/test/ui/repr/repr-transparent.stderr index 0f620880fa9d3..9c5f950c8ca0c 100644 --- a/src/test/ui/repr/repr-transparent.stderr +++ b/src/test/ui/repr/repr-transparent.stderr @@ -3,7 +3,7 @@ error[E0601]: `main` function not found in crate `repr_transparent` = note: consider adding a `main` function to `$DIR/repr-transparent.rs` error[E0690]: transparent struct needs exactly one non-zero-sized field, but has 0 - --> $DIR/repr-transparent.rs:21:1 + --> $DIR/repr-transparent.rs:11:1 | LL | struct NoFields; //~ ERROR needs exactly one non-zero-sized field | ^^^^^^^^^^^^^^^^ @@ -11,7 +11,7 @@ LL | struct NoFields; //~ ERROR needs exactly one non-zero-sized field = note: non-zero-sized field error[E0690]: transparent struct needs exactly one non-zero-sized field, but has 0 - --> $DIR/repr-transparent.rs:24:1 + --> $DIR/repr-transparent.rs:14:1 | LL | struct ContainsOnlyZst(()); //~ ERROR needs exactly one non-zero-sized field | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -19,7 +19,7 @@ LL | struct ContainsOnlyZst(()); //~ ERROR needs exactly one non-zero-sized fiel = note: non-zero-sized field error[E0690]: transparent struct needs exactly one non-zero-sized field, but has 0 - --> $DIR/repr-transparent.rs:27:1 + --> $DIR/repr-transparent.rs:17:1 | LL | struct ContainsOnlyZstArray([bool; 0]); //~ ERROR needs exactly one non-zero-sized field | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -27,7 +27,7 @@ LL | struct ContainsOnlyZstArray([bool; 0]); //~ ERROR needs exactly one non-zer = note: non-zero-sized field error[E0690]: transparent struct needs exactly one non-zero-sized field, but has 0 - --> $DIR/repr-transparent.rs:30:1 + --> $DIR/repr-transparent.rs:20:1 | LL | struct ContainsMultipleZst(PhantomData<*const i32>, NoFields); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -35,37 +35,37 @@ LL | struct ContainsMultipleZst(PhantomData<*const i32>, NoFields); = note: non-zero-sized field error[E0690]: transparent struct needs exactly one non-zero-sized field, but has 2 - --> $DIR/repr-transparent.rs:34:1 + --> $DIR/repr-transparent.rs:24:1 | LL | struct MultipleNonZst(u8, u8); //~ ERROR needs exactly one non-zero-sized field | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | note: non-zero-sized field - --> $DIR/repr-transparent.rs:34:23 + --> $DIR/repr-transparent.rs:24:23 | LL | struct MultipleNonZst(u8, u8); //~ ERROR needs exactly one non-zero-sized field | ^^ ^^ error[E0690]: transparent struct needs exactly one non-zero-sized field, but has 2 - --> $DIR/repr-transparent.rs:40:1 + --> $DIR/repr-transparent.rs:30:1 | LL | pub struct StructWithProjection(f32, ::It); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | note: non-zero-sized field - --> $DIR/repr-transparent.rs:40:33 + --> $DIR/repr-transparent.rs:30:33 | LL | pub struct StructWithProjection(f32, ::It); | ^^^ ^^^^^^^^^^^^^^^^^^^ error[E0691]: zero-sized field in transparent struct has alignment larger than 1 - --> $DIR/repr-transparent.rs:44:32 + --> $DIR/repr-transparent.rs:34:32 | LL | struct NontrivialAlignZst(u32, [u16; 0]); //~ ERROR alignment larger than 1 | ^^^^^^^^ error[E0691]: zero-sized field in transparent struct has alignment larger than 1 - --> $DIR/repr-transparent.rs:50:24 + --> $DIR/repr-transparent.rs:40:24 | LL | struct GenericAlign(ZstAlign32, u32); //~ ERROR alignment larger than 1 | ^^^^^^^^^^^^^ diff --git a/src/test/ui/required-lang-item.rs b/src/test/ui/required-lang-item.rs index ce40702b3dc2a..ee3773675e0f1 100644 --- a/src/test/ui/required-lang-item.rs +++ b/src/test/ui/required-lang-item.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(lang_items, no_core)] #![no_core] diff --git a/src/test/ui/reserved/reserved-attr-on-macro.rs b/src/test/ui/reserved/reserved-attr-on-macro.rs index db8f82a70e103..0b00d711036ff 100644 --- a/src/test/ui/reserved/reserved-attr-on-macro.rs +++ b/src/test/ui/reserved/reserved-attr-on-macro.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[rustc_attribute_should_be_reserved] //~ ERROR attributes with the prefix `rustc_` are reserved macro_rules! foo { () => (()); diff --git a/src/test/ui/reserved/reserved-attr-on-macro.stderr b/src/test/ui/reserved/reserved-attr-on-macro.stderr index efcd1ec67d7e9..0d7fa70772282 100644 --- a/src/test/ui/reserved/reserved-attr-on-macro.stderr +++ b/src/test/ui/reserved/reserved-attr-on-macro.stderr @@ -1,5 +1,5 @@ error[E0658]: unless otherwise specified, attributes with the prefix `rustc_` are reserved for internal compiler diagnostics (see issue #29642) - --> $DIR/reserved-attr-on-macro.rs:11:3 + --> $DIR/reserved-attr-on-macro.rs:1:3 | LL | #[rustc_attribute_should_be_reserved] //~ ERROR attributes with the prefix `rustc_` are reserved | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/reserved/reserved-become.rs b/src/test/ui/reserved/reserved-become.rs index bcda61e363def..2279a05e6b2db 100644 --- a/src/test/ui/reserved/reserved-become.rs +++ b/src/test/ui/reserved/reserved-become.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let become = 0; //~^ ERROR expected pattern, found reserved keyword `become` diff --git a/src/test/ui/reserved/reserved-become.stderr b/src/test/ui/reserved/reserved-become.stderr index fa9a960120858..f9fe78e18b393 100644 --- a/src/test/ui/reserved/reserved-become.stderr +++ b/src/test/ui/reserved/reserved-become.stderr @@ -1,5 +1,5 @@ error: expected pattern, found reserved keyword `become` - --> $DIR/reserved-become.rs:12:9 + --> $DIR/reserved-become.rs:2:9 | LL | let become = 0; | ^^^^^^ expected pattern diff --git a/src/test/ui/resolve/auxiliary/issue-21221-3.rs b/src/test/ui/resolve/auxiliary/issue-21221-3.rs index fae0fe16a266c..176c23180d979 100644 --- a/src/test/ui/resolve/auxiliary/issue-21221-3.rs +++ b/src/test/ui/resolve/auxiliary/issue-21221-3.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // testing whether the lookup mechanism picks up types // defined in the outside crate diff --git a/src/test/ui/resolve/auxiliary/issue-21221-4.rs b/src/test/ui/resolve/auxiliary/issue-21221-4.rs index fffe060ee24a5..5e0d6cbdfef9e 100644 --- a/src/test/ui/resolve/auxiliary/issue-21221-4.rs +++ b/src/test/ui/resolve/auxiliary/issue-21221-4.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // testing whether the lookup mechanism picks up types // defined in the outside crate diff --git a/src/test/ui/resolve/auxiliary/issue_19452_aux.rs b/src/test/ui/resolve/auxiliary/issue_19452_aux.rs index 205566e4b1f54..9c7bcec51dfdf 100644 --- a/src/test/ui/resolve/auxiliary/issue_19452_aux.rs +++ b/src/test/ui/resolve/auxiliary/issue_19452_aux.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub enum Homura { Madoka { age: u32 } } diff --git a/src/test/ui/resolve/auxiliary/issue_3907.rs b/src/test/ui/resolve/auxiliary/issue_3907.rs index 6472c08c22296..5dc502930aee5 100644 --- a/src/test/ui/resolve/auxiliary/issue_3907.rs +++ b/src/test/ui/resolve/auxiliary/issue_3907.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Foo { fn bar(); } diff --git a/src/test/ui/resolve/auxiliary/namespaced_enums.rs b/src/test/ui/resolve/auxiliary/namespaced_enums.rs index 3bf39b788db6e..d3548c76cf2a6 100644 --- a/src/test/ui/resolve/auxiliary/namespaced_enums.rs +++ b/src/test/ui/resolve/auxiliary/namespaced_enums.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub enum Foo { A, B(isize), diff --git a/src/test/ui/resolve/auxiliary/privacy-struct-ctor.rs b/src/test/ui/resolve/auxiliary/privacy-struct-ctor.rs index 704b20c6e712e..6d0bc728524ba 100644 --- a/src/test/ui/resolve/auxiliary/privacy-struct-ctor.rs +++ b/src/test/ui/resolve/auxiliary/privacy-struct-ctor.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod m { pub struct S(u8); diff --git a/src/test/ui/resolve/enums-are-namespaced-xc.rs b/src/test/ui/resolve/enums-are-namespaced-xc.rs index 4059aa5527ed1..4c660c27e3b1a 100644 --- a/src/test/ui/resolve/enums-are-namespaced-xc.rs +++ b/src/test/ui/resolve/enums-are-namespaced-xc.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:namespaced_enums.rs extern crate namespaced_enums; diff --git a/src/test/ui/resolve/enums-are-namespaced-xc.stderr b/src/test/ui/resolve/enums-are-namespaced-xc.stderr index 4b1750a54dc96..a0771ed9dcad9 100644 --- a/src/test/ui/resolve/enums-are-namespaced-xc.stderr +++ b/src/test/ui/resolve/enums-are-namespaced-xc.stderr @@ -1,5 +1,5 @@ error[E0425]: cannot find value `A` in module `namespaced_enums` - --> $DIR/enums-are-namespaced-xc.rs:15:31 + --> $DIR/enums-are-namespaced-xc.rs:5:31 | LL | let _ = namespaced_enums::A; | ^ not found in `namespaced_enums` @@ -9,7 +9,7 @@ LL | use namespaced_enums::Foo::A; | error[E0425]: cannot find function `B` in module `namespaced_enums` - --> $DIR/enums-are-namespaced-xc.rs:17:31 + --> $DIR/enums-are-namespaced-xc.rs:7:31 | LL | let _ = namespaced_enums::B(10); | ^ not found in `namespaced_enums` @@ -19,7 +19,7 @@ LL | use namespaced_enums::Foo::B; | error[E0422]: cannot find struct, variant or union type `C` in module `namespaced_enums` - --> $DIR/enums-are-namespaced-xc.rs:19:31 + --> $DIR/enums-are-namespaced-xc.rs:9:31 | LL | let _ = namespaced_enums::C { a: 10 }; | ^ not found in `namespaced_enums` diff --git a/src/test/ui/resolve/issue-14254.rs b/src/test/ui/resolve/issue-14254.rs index eab500de25569..78add29ca0c5b 100644 --- a/src/test/ui/resolve/issue-14254.rs +++ b/src/test/ui/resolve/issue-14254.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn bar(&self); fn baz(&self) { } diff --git a/src/test/ui/resolve/issue-14254.stderr b/src/test/ui/resolve/issue-14254.stderr index 055cbb2d57916..783b3addfc2ec 100644 --- a/src/test/ui/resolve/issue-14254.stderr +++ b/src/test/ui/resolve/issue-14254.stderr @@ -1,143 +1,143 @@ error[E0425]: cannot find function `baz` in this scope - --> $DIR/issue-14254.rs:29:9 + --> $DIR/issue-14254.rs:19:9 | LL | baz(); | ^^^ help: try: `self.baz` error[E0425]: cannot find value `a` in this scope - --> $DIR/issue-14254.rs:31:9 + --> $DIR/issue-14254.rs:21:9 | LL | a; | ^ not found in this scope error[E0425]: cannot find function `baz` in this scope - --> $DIR/issue-14254.rs:38:9 + --> $DIR/issue-14254.rs:28:9 | LL | baz(); | ^^^ help: try: `self.baz` error[E0425]: cannot find value `x` in this scope - --> $DIR/issue-14254.rs:40:9 + --> $DIR/issue-14254.rs:30:9 | LL | x; | ^ help: try: `self.x` error[E0425]: cannot find value `y` in this scope - --> $DIR/issue-14254.rs:42:9 + --> $DIR/issue-14254.rs:32:9 | LL | y; | ^ help: try: `self.y` error[E0425]: cannot find value `a` in this scope - --> $DIR/issue-14254.rs:44:9 + --> $DIR/issue-14254.rs:34:9 | LL | a; | ^ not found in this scope error[E0425]: cannot find value `bah` in this scope - --> $DIR/issue-14254.rs:46:9 + --> $DIR/issue-14254.rs:36:9 | LL | bah; | ^^^ help: try: `Self::bah` error[E0425]: cannot find value `b` in this scope - --> $DIR/issue-14254.rs:48:9 + --> $DIR/issue-14254.rs:38:9 | LL | b; | ^ not found in this scope error[E0425]: cannot find function `baz` in this scope - --> $DIR/issue-14254.rs:55:9 + --> $DIR/issue-14254.rs:45:9 | LL | baz(); | ^^^ help: try: `self.baz` error[E0425]: cannot find value `x` in this scope - --> $DIR/issue-14254.rs:57:9 + --> $DIR/issue-14254.rs:47:9 | LL | x; | ^ help: try: `self.x` error[E0425]: cannot find value `y` in this scope - --> $DIR/issue-14254.rs:59:9 + --> $DIR/issue-14254.rs:49:9 | LL | y; | ^ help: try: `self.y` error[E0425]: cannot find value `a` in this scope - --> $DIR/issue-14254.rs:61:9 + --> $DIR/issue-14254.rs:51:9 | LL | a; | ^ not found in this scope error[E0425]: cannot find value `bah` in this scope - --> $DIR/issue-14254.rs:63:9 + --> $DIR/issue-14254.rs:53:9 | LL | bah; | ^^^ help: try: `Self::bah` error[E0425]: cannot find value `b` in this scope - --> $DIR/issue-14254.rs:65:9 + --> $DIR/issue-14254.rs:55:9 | LL | b; | ^ not found in this scope error[E0425]: cannot find function `baz` in this scope - --> $DIR/issue-14254.rs:72:9 + --> $DIR/issue-14254.rs:62:9 | LL | baz(); | ^^^ help: try: `self.baz` error[E0425]: cannot find value `bah` in this scope - --> $DIR/issue-14254.rs:74:9 + --> $DIR/issue-14254.rs:64:9 | LL | bah; | ^^^ help: try: `Self::bah` error[E0425]: cannot find function `baz` in this scope - --> $DIR/issue-14254.rs:81:9 + --> $DIR/issue-14254.rs:71:9 | LL | baz(); | ^^^ help: try: `self.baz` error[E0425]: cannot find value `bah` in this scope - --> $DIR/issue-14254.rs:83:9 + --> $DIR/issue-14254.rs:73:9 | LL | bah; | ^^^ help: try: `Self::bah` error[E0425]: cannot find function `baz` in this scope - --> $DIR/issue-14254.rs:90:9 + --> $DIR/issue-14254.rs:80:9 | LL | baz(); | ^^^ help: try: `self.baz` error[E0425]: cannot find value `bah` in this scope - --> $DIR/issue-14254.rs:92:9 + --> $DIR/issue-14254.rs:82:9 | LL | bah; | ^^^ help: try: `Self::bah` error[E0425]: cannot find function `baz` in this scope - --> $DIR/issue-14254.rs:99:9 + --> $DIR/issue-14254.rs:89:9 | LL | baz(); | ^^^ help: try: `self.baz` error[E0425]: cannot find value `bah` in this scope - --> $DIR/issue-14254.rs:101:9 + --> $DIR/issue-14254.rs:91:9 | LL | bah; | ^^^ help: try: `Self::bah` error[E0425]: cannot find function `baz` in this scope - --> $DIR/issue-14254.rs:108:9 + --> $DIR/issue-14254.rs:98:9 | LL | baz(); | ^^^ help: try: `self.baz` error[E0425]: cannot find value `bah` in this scope - --> $DIR/issue-14254.rs:110:9 + --> $DIR/issue-14254.rs:100:9 | LL | bah; | ^^^ help: try: `Self::bah` diff --git a/src/test/ui/resolve/issue-16058.rs b/src/test/ui/resolve/issue-16058.rs index 6d9df46eed416..d41023e82c00c 100644 --- a/src/test/ui/resolve/issue-16058.rs +++ b/src/test/ui/resolve/issue-16058.rs @@ -1,14 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub struct GslResult { pub val: f64, pub err: f64 diff --git a/src/test/ui/resolve/issue-16058.stderr b/src/test/ui/resolve/issue-16058.stderr index 0ea6da3b27d0a..9766f8f1412b6 100644 --- a/src/test/ui/resolve/issue-16058.stderr +++ b/src/test/ui/resolve/issue-16058.stderr @@ -1,5 +1,5 @@ error[E0574]: expected struct, variant or union type, found enum `Result` - --> $DIR/issue-16058.rs:19:9 + --> $DIR/issue-16058.rs:8:9 | LL | Result { | ^^^^^^ not a struct, variant or union type diff --git a/src/test/ui/resolve/issue-17518.rs b/src/test/ui/resolve/issue-17518.rs index 1efbd1a004fa6..edaebc8122c19 100644 --- a/src/test/ui/resolve/issue-17518.rs +++ b/src/test/ui/resolve/issue-17518.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum SomeEnum { E } diff --git a/src/test/ui/resolve/issue-17518.stderr b/src/test/ui/resolve/issue-17518.stderr index 177b38aae7bb0..5d080d989446f 100644 --- a/src/test/ui/resolve/issue-17518.stderr +++ b/src/test/ui/resolve/issue-17518.stderr @@ -1,5 +1,5 @@ error[E0422]: cannot find struct, variant or union type `E` in this scope - --> $DIR/issue-17518.rs:16:5 + --> $DIR/issue-17518.rs:6:5 | LL | E { name: "foobar" }; //~ ERROR cannot find struct, variant or union type `E` | ^ not found in this scope diff --git a/src/test/ui/resolve/issue-18252.rs b/src/test/ui/resolve/issue-18252.rs index 02c6643a920c7..894762115ab10 100644 --- a/src/test/ui/resolve/issue-18252.rs +++ b/src/test/ui/resolve/issue-18252.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Foo { Variant { x: usize } } diff --git a/src/test/ui/resolve/issue-18252.stderr b/src/test/ui/resolve/issue-18252.stderr index 8de552ea08982..293f290f82fd9 100644 --- a/src/test/ui/resolve/issue-18252.stderr +++ b/src/test/ui/resolve/issue-18252.stderr @@ -1,5 +1,5 @@ error[E0423]: expected function, found struct variant `Foo::Variant` - --> $DIR/issue-18252.rs:16:13 + --> $DIR/issue-18252.rs:6:13 | LL | let f = Foo::Variant(42); | ^^^^^^^^^^^^ did you mean `Foo::Variant { /* fields */ }`? diff --git a/src/test/ui/resolve/issue-19452.rs b/src/test/ui/resolve/issue-19452.rs index 080fb064c9fb5..5c58cabb3cdd8 100644 --- a/src/test/ui/resolve/issue-19452.rs +++ b/src/test/ui/resolve/issue-19452.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_19452_aux.rs extern crate issue_19452_aux; diff --git a/src/test/ui/resolve/issue-19452.stderr b/src/test/ui/resolve/issue-19452.stderr index 0dbd4c85a3767..ef96fffee926b 100644 --- a/src/test/ui/resolve/issue-19452.stderr +++ b/src/test/ui/resolve/issue-19452.stderr @@ -1,11 +1,11 @@ error[E0423]: expected value, found struct variant `Homura::Madoka` - --> $DIR/issue-19452.rs:19:18 + --> $DIR/issue-19452.rs:9:18 | LL | let homura = Homura::Madoka; | ^^^^^^^^^^^^^^ did you mean `Homura::Madoka { /* fields */ }`? error[E0423]: expected value, found struct variant `issue_19452_aux::Homura::Madoka` - --> $DIR/issue-19452.rs:22:18 + --> $DIR/issue-19452.rs:12:18 | LL | let homura = issue_19452_aux::Homura::Madoka; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ did you mean `issue_19452_aux::Homura::Madoka { /* fields */ }`? diff --git a/src/test/ui/resolve/issue-21221-1.rs b/src/test/ui/resolve/issue-21221-1.rs index d3c18d4c80a1c..b180624d2f491 100644 --- a/src/test/ui/resolve/issue-21221-1.rs +++ b/src/test/ui/resolve/issue-21221-1.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod mul1 { pub trait Mul {} } diff --git a/src/test/ui/resolve/issue-21221-1.stderr b/src/test/ui/resolve/issue-21221-1.stderr index 3edfa33d80a02..925923f92be4e 100644 --- a/src/test/ui/resolve/issue-21221-1.stderr +++ b/src/test/ui/resolve/issue-21221-1.stderr @@ -1,5 +1,5 @@ error[E0405]: cannot find trait `Mul` in this scope - --> $DIR/issue-21221-1.rs:53:6 + --> $DIR/issue-21221-1.rs:43:6 | LL | impl Mul for Foo { | ^^^ not found in this scope @@ -13,7 +13,7 @@ LL | use std::ops::Mul; | error[E0412]: cannot find type `Mul` in this scope - --> $DIR/issue-21221-1.rs:68:16 + --> $DIR/issue-21221-1.rs:58:16 | LL | fn getMul() -> Mul { | ^^^ not found in this scope @@ -30,13 +30,13 @@ LL | use mul4::Mul; and 2 other candidates error[E0405]: cannot find trait `ThisTraitReallyDoesntExistInAnyModuleReally` in this scope - --> $DIR/issue-21221-1.rs:73:6 + --> $DIR/issue-21221-1.rs:63:6 | LL | impl ThisTraitReallyDoesntExistInAnyModuleReally for Foo { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope error[E0405]: cannot find trait `Div` in this scope - --> $DIR/issue-21221-1.rs:78:6 + --> $DIR/issue-21221-1.rs:68:6 | LL | impl Div for Foo { | ^^^ not found in this scope diff --git a/src/test/ui/resolve/issue-21221-2.rs b/src/test/ui/resolve/issue-21221-2.rs index 361e8caf7442e..dc13e46cb489f 100644 --- a/src/test/ui/resolve/issue-21221-2.rs +++ b/src/test/ui/resolve/issue-21221-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod foo { pub mod bar { // note: trait T is not public, but being in the current diff --git a/src/test/ui/resolve/issue-21221-2.stderr b/src/test/ui/resolve/issue-21221-2.stderr index e11fe9ac4cf11..23d4015ca54af 100644 --- a/src/test/ui/resolve/issue-21221-2.stderr +++ b/src/test/ui/resolve/issue-21221-2.stderr @@ -1,5 +1,5 @@ error[E0405]: cannot find trait `T` in this scope - --> $DIR/issue-21221-2.rs:28:6 + --> $DIR/issue-21221-2.rs:18:6 | LL | impl T for Foo { } | ^ not found in this scope diff --git a/src/test/ui/resolve/issue-21221-3.rs b/src/test/ui/resolve/issue-21221-3.rs index a93330b286524..f0c0a9fd61a12 100644 --- a/src/test/ui/resolve/issue-21221-3.rs +++ b/src/test/ui/resolve/issue-21221-3.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // testing whether the lookup mechanism picks up types // defined in the outside crate diff --git a/src/test/ui/resolve/issue-21221-3.stderr b/src/test/ui/resolve/issue-21221-3.stderr index f406cd6e35fcf..09cfed96bed3d 100644 --- a/src/test/ui/resolve/issue-21221-3.stderr +++ b/src/test/ui/resolve/issue-21221-3.stderr @@ -1,5 +1,5 @@ error[E0405]: cannot find trait `OuterTrait` in this scope - --> $DIR/issue-21221-3.rs:25:6 + --> $DIR/issue-21221-3.rs:15:6 | LL | impl OuterTrait for Foo {} | ^^^^^^^^^^ not found in this scope diff --git a/src/test/ui/resolve/issue-21221-4.rs b/src/test/ui/resolve/issue-21221-4.rs index ec6ad2a4829cd..88d5bd06ca5cf 100644 --- a/src/test/ui/resolve/issue-21221-4.rs +++ b/src/test/ui/resolve/issue-21221-4.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // testing whether the lookup mechanism picks up types // defined in the outside crate diff --git a/src/test/ui/resolve/issue-21221-4.stderr b/src/test/ui/resolve/issue-21221-4.stderr index c0a7f1734f49c..68989a30e6715 100644 --- a/src/test/ui/resolve/issue-21221-4.stderr +++ b/src/test/ui/resolve/issue-21221-4.stderr @@ -1,5 +1,5 @@ error[E0405]: cannot find trait `T` in this scope - --> $DIR/issue-21221-4.rs:20:6 + --> $DIR/issue-21221-4.rs:10:6 | LL | impl T for Foo {} | ^ not found in this scope diff --git a/src/test/ui/resolve/issue-23305.rs b/src/test/ui/resolve/issue-23305.rs index 5ae4ce1f7ee30..af335acd41bc3 100644 --- a/src/test/ui/resolve/issue-23305.rs +++ b/src/test/ui/resolve/issue-23305.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait ToNbt { fn new(val: T) -> Self; } diff --git a/src/test/ui/resolve/issue-23305.stderr b/src/test/ui/resolve/issue-23305.stderr index d25a072fe0a88..17b2f9fa4fbbc 100644 --- a/src/test/ui/resolve/issue-23305.stderr +++ b/src/test/ui/resolve/issue-23305.stderr @@ -1,10 +1,10 @@ -error[E0391]: cycle detected when processing `` - --> $DIR/issue-23305.rs:15:12 +error[E0391]: cycle detected when processing `` + --> $DIR/issue-23305.rs:5:12 | LL | impl ToNbt {} | ^^^^ | - = note: ...which again requires processing ``, completing the cycle + = note: ...which again requires processing ``, completing the cycle error: aborting due to previous error diff --git a/src/test/ui/resolve/issue-2356.rs b/src/test/ui/resolve/issue-2356.rs index 9505e490197b0..5a5bee4b7456a 100644 --- a/src/test/ui/resolve/issue-2356.rs +++ b/src/test/ui/resolve/issue-2356.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Groom { fn shave(other: usize); } diff --git a/src/test/ui/resolve/issue-2356.stderr b/src/test/ui/resolve/issue-2356.stderr index 3e6c38bce51cd..0f6c740ee0f0f 100644 --- a/src/test/ui/resolve/issue-2356.stderr +++ b/src/test/ui/resolve/issue-2356.stderr @@ -1,23 +1,23 @@ error[E0425]: cannot find function `shave` in this scope - --> $DIR/issue-2356.rs:27:5 + --> $DIR/issue-2356.rs:17:5 | LL | shave(); | ^^^^^ not found in this scope error[E0425]: cannot find function `clone` in this scope - --> $DIR/issue-2356.rs:34:5 + --> $DIR/issue-2356.rs:24:5 | LL | clone(); | ^^^^^ help: try: `self.clone` error[E0425]: cannot find function `default` in this scope - --> $DIR/issue-2356.rs:41:5 + --> $DIR/issue-2356.rs:31:5 | LL | default(); | ^^^^^^^ help: try: `Self::default` error[E0425]: cannot find value `whiskers` in this scope - --> $DIR/issue-2356.rs:49:5 + --> $DIR/issue-2356.rs:39:5 | LL | whiskers -= other; | ^^^^^^^^ @@ -26,67 +26,67 @@ LL | whiskers -= other; | help: try: `self.whiskers` error[E0425]: cannot find function `shave` in this scope - --> $DIR/issue-2356.rs:51:5 + --> $DIR/issue-2356.rs:41:5 | LL | shave(4); | ^^^^^ help: try: `Self::shave` error[E0425]: cannot find function `purr` in this scope - --> $DIR/issue-2356.rs:53:5 + --> $DIR/issue-2356.rs:43:5 | LL | purr(); | ^^^^ not found in this scope error[E0425]: cannot find function `static_method` in this scope - --> $DIR/issue-2356.rs:62:9 + --> $DIR/issue-2356.rs:52:9 | LL | static_method(); | ^^^^^^^^^^^^^ not found in this scope error[E0425]: cannot find function `purr` in this scope - --> $DIR/issue-2356.rs:64:9 + --> $DIR/issue-2356.rs:54:9 | LL | purr(); | ^^^^ not found in this scope error[E0425]: cannot find function `purr` in this scope - --> $DIR/issue-2356.rs:66:9 + --> $DIR/issue-2356.rs:56:9 | LL | purr(); | ^^^^ not found in this scope error[E0425]: cannot find function `purr` in this scope - --> $DIR/issue-2356.rs:68:9 + --> $DIR/issue-2356.rs:58:9 | LL | purr(); | ^^^^ not found in this scope error[E0424]: expected value, found module `self` - --> $DIR/issue-2356.rs:75:8 + --> $DIR/issue-2356.rs:65:8 | LL | if self.whiskers > 3 { | ^^^^ `self` value is only available in methods with `self` parameter error[E0425]: cannot find function `grow_older` in this scope - --> $DIR/issue-2356.rs:82:5 + --> $DIR/issue-2356.rs:72:5 | LL | grow_older(); | ^^^^^^^^^^ not found in this scope error[E0425]: cannot find function `shave` in this scope - --> $DIR/issue-2356.rs:84:5 + --> $DIR/issue-2356.rs:74:5 | LL | shave(); | ^^^^^ not found in this scope error[E0425]: cannot find value `whiskers` in this scope - --> $DIR/issue-2356.rs:89:5 + --> $DIR/issue-2356.rs:79:5 | LL | whiskers = 0; | ^^^^^^^^ help: try: `self.whiskers` error[E0425]: cannot find value `whiskers` in this scope - --> $DIR/issue-2356.rs:94:5 + --> $DIR/issue-2356.rs:84:5 | LL | whiskers = 4; | ^^^^^^^^ @@ -95,13 +95,13 @@ LL | whiskers = 4; | help: try: `self.whiskers` error[E0425]: cannot find function `purr_louder` in this scope - --> $DIR/issue-2356.rs:96:5 + --> $DIR/issue-2356.rs:86:5 | LL | purr_louder(); | ^^^^^^^^^^^ not found in this scope error[E0424]: expected value, found module `self` - --> $DIR/issue-2356.rs:102:5 + --> $DIR/issue-2356.rs:92:5 | LL | self += 1; | ^^^^ `self` value is only available in methods with `self` parameter diff --git a/src/test/ui/resolve/issue-24968.rs b/src/test/ui/resolve/issue-24968.rs index 0bd08f8976483..916b48205dc82 100644 --- a/src/test/ui/resolve/issue-24968.rs +++ b/src/test/ui/resolve/issue-24968.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo(_: Self) { //~^ ERROR cannot find type `Self` } diff --git a/src/test/ui/resolve/issue-24968.stderr b/src/test/ui/resolve/issue-24968.stderr index 9a1d5ea170e65..e4dfd26f78b76 100644 --- a/src/test/ui/resolve/issue-24968.stderr +++ b/src/test/ui/resolve/issue-24968.stderr @@ -1,5 +1,5 @@ error[E0411]: cannot find type `Self` in this scope - --> $DIR/issue-24968.rs:11:11 + --> $DIR/issue-24968.rs:1:11 | LL | fn foo(_: Self) { | ^^^^ `Self` is only available in traits and impls diff --git a/src/test/ui/resolve/issue-33876.rs b/src/test/ui/resolve/issue-33876.rs index a97cc5e4101fc..dd31fc231cfb5 100644 --- a/src/test/ui/resolve/issue-33876.rs +++ b/src/test/ui/resolve/issue-33876.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::any::Any; struct Foo; diff --git a/src/test/ui/resolve/issue-33876.stderr b/src/test/ui/resolve/issue-33876.stderr index 631a9f6f72425..fb61abc950546 100644 --- a/src/test/ui/resolve/issue-33876.stderr +++ b/src/test/ui/resolve/issue-33876.stderr @@ -1,5 +1,5 @@ error[E0423]: expected value, found trait `Bar` - --> $DIR/issue-33876.rs:20:22 + --> $DIR/issue-33876.rs:10:22 | LL | let any: &Any = &Bar; //~ ERROR expected value, found trait `Bar` | ^^^ not a value diff --git a/src/test/ui/resolve/issue-3907-2.rs b/src/test/ui/resolve/issue-3907-2.rs index 130647966f2d1..89e10ca4f2c91 100644 --- a/src/test/ui/resolve/issue-3907-2.rs +++ b/src/test/ui/resolve/issue-3907-2.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_3907.rs extern crate issue_3907; diff --git a/src/test/ui/resolve/issue-3907-2.stderr b/src/test/ui/resolve/issue-3907-2.stderr index 567fd31b09ca3..4fce898dfa96c 100644 --- a/src/test/ui/resolve/issue-3907-2.stderr +++ b/src/test/ui/resolve/issue-3907-2.stderr @@ -1,5 +1,5 @@ error[E0038]: the trait `issue_3907::Foo` cannot be made into an object - --> $DIR/issue-3907-2.rs:20:1 + --> $DIR/issue-3907-2.rs:10:1 | LL | fn bar(_x: Foo) {} | ^^^^^^^^^^^^^^^ the trait `issue_3907::Foo` cannot be made into an object diff --git a/src/test/ui/resolve/issue-3907.rs b/src/test/ui/resolve/issue-3907.rs index 0e54e68df0dcd..a76c3134c0ca3 100644 --- a/src/test/ui/resolve/issue-3907.rs +++ b/src/test/ui/resolve/issue-3907.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_3907.rs extern crate issue_3907; diff --git a/src/test/ui/resolve/issue-3907.stderr b/src/test/ui/resolve/issue-3907.stderr index 3627c09b28fd9..0108fcbc85fc3 100644 --- a/src/test/ui/resolve/issue-3907.stderr +++ b/src/test/ui/resolve/issue-3907.stderr @@ -1,5 +1,5 @@ error[E0404]: expected trait, found type alias `Foo` - --> $DIR/issue-3907.rs:20:6 + --> $DIR/issue-3907.rs:10:6 | LL | impl Foo for S { //~ ERROR expected trait, found type alias `Foo` | ^^^ type aliases cannot be used for traits diff --git a/src/test/ui/resolve/issue-39226.rs b/src/test/ui/resolve/issue-39226.rs index 9d7291c4059d5..0f784f02b41b6 100644 --- a/src/test/ui/resolve/issue-39226.rs +++ b/src/test/ui/resolve/issue-39226.rs @@ -1,12 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. struct Handle {} struct Something { diff --git a/src/test/ui/resolve/issue-39226.stderr b/src/test/ui/resolve/issue-39226.stderr index 089fb9fa66098..3a93928aef95f 100644 --- a/src/test/ui/resolve/issue-39226.stderr +++ b/src/test/ui/resolve/issue-39226.stderr @@ -1,5 +1,5 @@ error[E0423]: expected value, found struct `Handle` - --> $DIR/issue-39226.rs:20:17 + --> $DIR/issue-39226.rs:11:17 | LL | handle: Handle | ^^^^^^ diff --git a/src/test/ui/resolve/issue-5035-2.rs b/src/test/ui/resolve/issue-5035-2.rs index 5e465ca18f4c0..f88a2375a4315 100644 --- a/src/test/ui/resolve/issue-5035-2.rs +++ b/src/test/ui/resolve/issue-5035-2.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait I {} type K = I+'static; diff --git a/src/test/ui/resolve/issue-5035-2.stderr b/src/test/ui/resolve/issue-5035-2.stderr index 9e7fca0508ef8..d3e559e0f9366 100644 --- a/src/test/ui/resolve/issue-5035-2.stderr +++ b/src/test/ui/resolve/issue-5035-2.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `(dyn I + 'static)` cannot be known at compilation time - --> $DIR/issue-5035-2.rs:14:8 + --> $DIR/issue-5035-2.rs:4:8 | LL | fn foo(_x: K) {} | ^^ doesn't have a size known at compile-time diff --git a/src/test/ui/resolve/issue-5035.rs b/src/test/ui/resolve/issue-5035.rs index e9b50dddd30d1..c1de36b066270 100644 --- a/src/test/ui/resolve/issue-5035.rs +++ b/src/test/ui/resolve/issue-5035.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait I {} type K = I; impl K for isize {} //~ ERROR expected trait, found type alias `K` diff --git a/src/test/ui/resolve/issue-5035.stderr b/src/test/ui/resolve/issue-5035.stderr index 353a0b1c3d9d0..bbc6cd8da40f1 100644 --- a/src/test/ui/resolve/issue-5035.stderr +++ b/src/test/ui/resolve/issue-5035.stderr @@ -1,11 +1,11 @@ error[E0432]: unresolved import `ImportError` - --> $DIR/issue-5035.rs:15:5 + --> $DIR/issue-5035.rs:5:5 | LL | use ImportError; //~ ERROR unresolved import `ImportError` [E0432] | ^^^^^^^^^^^ no `ImportError` in the root error[E0404]: expected trait, found type alias `K` - --> $DIR/issue-5035.rs:13:6 + --> $DIR/issue-5035.rs:3:6 | LL | impl K for isize {} //~ ERROR expected trait, found type alias `K` | ^ diff --git a/src/test/ui/resolve/issue-6702.rs b/src/test/ui/resolve/issue-6702.rs index 8c5897d1d59cb..6469c7ec29fa1 100644 --- a/src/test/ui/resolve/issue-6702.rs +++ b/src/test/ui/resolve/issue-6702.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Monster { damage: isize } diff --git a/src/test/ui/resolve/issue-6702.stderr b/src/test/ui/resolve/issue-6702.stderr index 6f2312afe4f78..906ac2808aa90 100644 --- a/src/test/ui/resolve/issue-6702.stderr +++ b/src/test/ui/resolve/issue-6702.stderr @@ -1,5 +1,5 @@ error[E0423]: expected function, found struct `Monster` - --> $DIR/issue-6702.rs:17:14 + --> $DIR/issue-6702.rs:7:14 | LL | let _m = Monster(); //~ ERROR expected function, found struct `Monster` | ^^^^^^^ did you mean `Monster { /* fields */ }`? diff --git a/src/test/ui/resolve/levenshtein.rs b/src/test/ui/resolve/levenshtein.rs index af27629385dcd..a6f4716256881 100644 --- a/src/test/ui/resolve/levenshtein.rs +++ b/src/test/ui/resolve/levenshtein.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const MAX_ITEM: usize = 10; fn foo_bar() {} diff --git a/src/test/ui/resolve/levenshtein.stderr b/src/test/ui/resolve/levenshtein.stderr index bb3caf342bfc3..df075d15d7fef 100644 --- a/src/test/ui/resolve/levenshtein.stderr +++ b/src/test/ui/resolve/levenshtein.stderr @@ -1,47 +1,47 @@ error[E0412]: cannot find type `esize` in this scope - --> $DIR/levenshtein.rs:15:11 + --> $DIR/levenshtein.rs:5:11 | LL | fn foo(c: esize) {} // Misspelled primitive type name. | ^^^^^ did you mean `isize`? error[E0412]: cannot find type `Baz` in this scope - --> $DIR/levenshtein.rs:20:10 + --> $DIR/levenshtein.rs:10:10 | LL | type A = Baz; // Misspelled type name. | ^^^ did you mean `Bar`? error[E0412]: cannot find type `Opiton` in this scope - --> $DIR/levenshtein.rs:22:10 + --> $DIR/levenshtein.rs:12:10 | LL | type B = Opiton; // Misspelled type name from the prelude. | ^^^^^^ did you mean `Option`? error[E0412]: cannot find type `Baz` in this scope - --> $DIR/levenshtein.rs:26:14 + --> $DIR/levenshtein.rs:16:14 | LL | type A = Baz; // No suggestion here, Bar is not visible | ^^^ not found in this scope error[E0425]: cannot find value `MAXITEM` in this scope - --> $DIR/levenshtein.rs:34:20 + --> $DIR/levenshtein.rs:24:20 | LL | let v = [0u32; MAXITEM]; // Misspelled constant name. | ^^^^^^^ did you mean `MAX_ITEM`? error[E0425]: cannot find function `foobar` in this scope - --> $DIR/levenshtein.rs:36:5 + --> $DIR/levenshtein.rs:26:5 | LL | foobar(); // Misspelled function name. | ^^^^^^ did you mean `foo_bar`? error[E0412]: cannot find type `first` in module `m` - --> $DIR/levenshtein.rs:38:15 + --> $DIR/levenshtein.rs:28:15 | LL | let b: m::first = m::second; // Misspelled item in module. | ^^^^^ did you mean `First`? error[E0425]: cannot find value `second` in module `m` - --> $DIR/levenshtein.rs:38:26 + --> $DIR/levenshtein.rs:28:26 | LL | let b: m::first = m::second; // Misspelled item in module. | ^^^^^^ did you mean `Second`? diff --git a/src/test/ui/resolve/name-clash-nullary.rs b/src/test/ui/resolve/name-clash-nullary.rs index adf52c6d8e64d..b5f5e121492d1 100644 --- a/src/test/ui/resolve/name-clash-nullary.rs +++ b/src/test/ui/resolve/name-clash-nullary.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let None: isize = 42; //~ ERROR mismatched types } diff --git a/src/test/ui/resolve/name-clash-nullary.stderr b/src/test/ui/resolve/name-clash-nullary.stderr index 862ad270502fd..5bb9371da6d2e 100644 --- a/src/test/ui/resolve/name-clash-nullary.stderr +++ b/src/test/ui/resolve/name-clash-nullary.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/name-clash-nullary.rs:12:7 + --> $DIR/name-clash-nullary.rs:2:7 | LL | let None: isize = 42; //~ ERROR mismatched types | ^^^^ expected isize, found enum `std::option::Option` diff --git a/src/test/ui/resolve/privacy-enum-ctor.rs b/src/test/ui/resolve/privacy-enum-ctor.rs index 08480a0e1faa8..f0d2cf8c04e90 100644 --- a/src/test/ui/resolve/privacy-enum-ctor.rs +++ b/src/test/ui/resolve/privacy-enum-ctor.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod m { pub enum E { Fn(u8), diff --git a/src/test/ui/resolve/privacy-enum-ctor.stderr b/src/test/ui/resolve/privacy-enum-ctor.stderr index d8ab21ddb5f39..be33043d63b72 100644 --- a/src/test/ui/resolve/privacy-enum-ctor.stderr +++ b/src/test/ui/resolve/privacy-enum-ctor.stderr @@ -1,5 +1,5 @@ error[E0423]: expected value, found enum `n::Z` - --> $DIR/privacy-enum-ctor.rs:33:9 + --> $DIR/privacy-enum-ctor.rs:23:9 | LL | n::Z; | ^^^^ @@ -10,7 +10,7 @@ LL | n::Z; - `m::Z::Unit` error[E0423]: expected value, found enum `Z` - --> $DIR/privacy-enum-ctor.rs:35:9 + --> $DIR/privacy-enum-ctor.rs:25:9 | LL | Z; | ^ did you mean `f`? @@ -21,13 +21,13 @@ LL | Z; - `m::Z::Unit` error[E0423]: expected value, found struct variant `Z::Struct` - --> $DIR/privacy-enum-ctor.rs:39:20 + --> $DIR/privacy-enum-ctor.rs:29:20 | LL | let _: Z = Z::Struct; | ^^^^^^^^^ did you mean `Z::Struct { /* fields */ }`? error[E0423]: expected value, found enum `m::E` - --> $DIR/privacy-enum-ctor.rs:51:16 + --> $DIR/privacy-enum-ctor.rs:41:16 | LL | let _: E = m::E; | ^^^- @@ -46,13 +46,13 @@ LL | use std::f64::consts::E; | error[E0423]: expected value, found struct variant `m::E::Struct` - --> $DIR/privacy-enum-ctor.rs:55:16 + --> $DIR/privacy-enum-ctor.rs:45:16 | LL | let _: E = m::E::Struct; | ^^^^^^^^^^^^ did you mean `m::E::Struct { /* fields */ }`? error[E0423]: expected value, found enum `E` - --> $DIR/privacy-enum-ctor.rs:59:16 + --> $DIR/privacy-enum-ctor.rs:49:16 | LL | let _: E = E; | ^ @@ -69,13 +69,13 @@ LL | use std::f64::consts::E; | error[E0423]: expected value, found struct variant `E::Struct` - --> $DIR/privacy-enum-ctor.rs:63:16 + --> $DIR/privacy-enum-ctor.rs:53:16 | LL | let _: E = E::Struct; | ^^^^^^^^^ did you mean `E::Struct { /* fields */ }`? error[E0412]: cannot find type `Z` in this scope - --> $DIR/privacy-enum-ctor.rs:67:12 + --> $DIR/privacy-enum-ctor.rs:57:12 | LL | let _: Z = m::n::Z; | ^ did you mean `E`? @@ -85,7 +85,7 @@ LL | use m::n::Z; | error[E0423]: expected value, found enum `m::n::Z` - --> $DIR/privacy-enum-ctor.rs:67:16 + --> $DIR/privacy-enum-ctor.rs:57:16 | LL | let _: Z = m::n::Z; | ^^^^^^^ @@ -96,7 +96,7 @@ LL | let _: Z = m::n::Z; - `m::Z::Unit` error[E0412]: cannot find type `Z` in this scope - --> $DIR/privacy-enum-ctor.rs:71:12 + --> $DIR/privacy-enum-ctor.rs:61:12 | LL | let _: Z = m::n::Z::Fn; | ^ did you mean `E`? @@ -106,7 +106,7 @@ LL | use m::n::Z; | error[E0412]: cannot find type `Z` in this scope - --> $DIR/privacy-enum-ctor.rs:74:12 + --> $DIR/privacy-enum-ctor.rs:64:12 | LL | let _: Z = m::n::Z::Struct; | ^ did you mean `E`? @@ -116,13 +116,13 @@ LL | use m::n::Z; | error[E0423]: expected value, found struct variant `m::n::Z::Struct` - --> $DIR/privacy-enum-ctor.rs:74:16 + --> $DIR/privacy-enum-ctor.rs:64:16 | LL | let _: Z = m::n::Z::Struct; | ^^^^^^^^^^^^^^^ did you mean `m::n::Z::Struct { /* fields */ }`? error[E0412]: cannot find type `Z` in this scope - --> $DIR/privacy-enum-ctor.rs:78:12 + --> $DIR/privacy-enum-ctor.rs:68:12 | LL | let _: Z = m::n::Z::Unit {}; | ^ did you mean `E`? @@ -132,31 +132,31 @@ LL | use m::n::Z; | error[E0603]: enum `Z` is private - --> $DIR/privacy-enum-ctor.rs:67:16 + --> $DIR/privacy-enum-ctor.rs:57:16 | LL | let _: Z = m::n::Z; | ^^^^^^^ error[E0603]: enum `Z` is private - --> $DIR/privacy-enum-ctor.rs:71:16 + --> $DIR/privacy-enum-ctor.rs:61:16 | LL | let _: Z = m::n::Z::Fn; | ^^^^^^^^^^^ error[E0603]: enum `Z` is private - --> $DIR/privacy-enum-ctor.rs:74:16 + --> $DIR/privacy-enum-ctor.rs:64:16 | LL | let _: Z = m::n::Z::Struct; | ^^^^^^^^^^^^^^^ error[E0603]: enum `Z` is private - --> $DIR/privacy-enum-ctor.rs:78:16 + --> $DIR/privacy-enum-ctor.rs:68:16 | LL | let _: Z = m::n::Z::Unit {}; | ^^^^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/privacy-enum-ctor.rs:37:20 + --> $DIR/privacy-enum-ctor.rs:27:20 | LL | let _: Z = Z::Fn; | ^^^^^ expected enum `m::n::Z`, found fn item @@ -165,7 +165,7 @@ LL | let _: Z = Z::Fn; found type `fn(u8) -> m::n::Z {m::n::Z::Fn}` error[E0618]: expected function, found enum variant `Z::Unit` - --> $DIR/privacy-enum-ctor.rs:41:17 + --> $DIR/privacy-enum-ctor.rs:31:17 | LL | Unit, | ---- `Z::Unit` defined here @@ -178,7 +178,7 @@ LL | let _ = Z::Unit; | ^^^^^^^ error[E0308]: mismatched types - --> $DIR/privacy-enum-ctor.rs:53:16 + --> $DIR/privacy-enum-ctor.rs:43:16 | LL | let _: E = m::E::Fn; | ^^^^^^^^ expected enum `m::E`, found fn item @@ -187,7 +187,7 @@ LL | let _: E = m::E::Fn; found type `fn(u8) -> m::E {m::E::Fn}` error[E0618]: expected function, found enum variant `m::E::Unit` - --> $DIR/privacy-enum-ctor.rs:57:16 + --> $DIR/privacy-enum-ctor.rs:47:16 | LL | Unit, | ---- `m::E::Unit` defined here @@ -200,7 +200,7 @@ LL | let _: E = m::E::Unit; | ^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/privacy-enum-ctor.rs:61:16 + --> $DIR/privacy-enum-ctor.rs:51:16 | LL | let _: E = E::Fn; | ^^^^^ expected enum `m::E`, found fn item @@ -209,7 +209,7 @@ LL | let _: E = E::Fn; found type `fn(u8) -> m::E {m::E::Fn}` error[E0618]: expected function, found enum variant `E::Unit` - --> $DIR/privacy-enum-ctor.rs:65:16 + --> $DIR/privacy-enum-ctor.rs:55:16 | LL | Unit, | ---- `E::Unit` defined here diff --git a/src/test/ui/resolve/privacy-struct-ctor.rs b/src/test/ui/resolve/privacy-struct-ctor.rs index 9029eeb22cd27..0b389acf75d8b 100644 --- a/src/test/ui/resolve/privacy-struct-ctor.rs +++ b/src/test/ui/resolve/privacy-struct-ctor.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:privacy-struct-ctor.rs extern crate privacy_struct_ctor as xcrate; diff --git a/src/test/ui/resolve/privacy-struct-ctor.stderr b/src/test/ui/resolve/privacy-struct-ctor.stderr index 6ea5241fff00c..f61d45a9eb648 100644 --- a/src/test/ui/resolve/privacy-struct-ctor.stderr +++ b/src/test/ui/resolve/privacy-struct-ctor.stderr @@ -1,5 +1,5 @@ error[E0423]: expected value, found struct `Z` - --> $DIR/privacy-struct-ctor.rs:30:9 + --> $DIR/privacy-struct-ctor.rs:20:9 | LL | Z; | ^ @@ -12,7 +12,7 @@ LL | use m::n::Z; | error[E0423]: expected value, found struct `S` - --> $DIR/privacy-struct-ctor.rs:43:5 + --> $DIR/privacy-struct-ctor.rs:33:5 | LL | S; | ^ constructor is not visible here due to private fields @@ -22,13 +22,13 @@ LL | use m::S; | error[E0423]: expected value, found struct `S2` - --> $DIR/privacy-struct-ctor.rs:48:5 + --> $DIR/privacy-struct-ctor.rs:38:5 | LL | S2; | ^^ did you mean `S2 { /* fields */ }`? error[E0423]: expected value, found struct `xcrate::S` - --> $DIR/privacy-struct-ctor.rs:53:5 + --> $DIR/privacy-struct-ctor.rs:43:5 | LL | xcrate::S; | ^^^^^^^^^ constructor is not visible here due to private fields @@ -38,37 +38,37 @@ LL | use m::S; | error[E0603]: tuple struct `Z` is private - --> $DIR/privacy-struct-ctor.rs:28:9 + --> $DIR/privacy-struct-ctor.rs:18:9 | LL | n::Z; | ^^^^ error[E0603]: tuple struct `S` is private - --> $DIR/privacy-struct-ctor.rs:39:5 + --> $DIR/privacy-struct-ctor.rs:29:5 | LL | m::S; | ^^^^ error[E0603]: tuple struct `S` is private - --> $DIR/privacy-struct-ctor.rs:41:16 + --> $DIR/privacy-struct-ctor.rs:31:16 | LL | let _: S = m::S(2); | ^^^^ error[E0603]: tuple struct `Z` is private - --> $DIR/privacy-struct-ctor.rs:45:5 + --> $DIR/privacy-struct-ctor.rs:35:5 | LL | m::n::Z; | ^^^^^^^ error[E0603]: tuple struct `S` is private - --> $DIR/privacy-struct-ctor.rs:51:5 + --> $DIR/privacy-struct-ctor.rs:41:5 | LL | xcrate::m::S; | ^^^^^^^^^^^^ error[E0603]: tuple struct `Z` is private - --> $DIR/privacy-struct-ctor.rs:55:5 + --> $DIR/privacy-struct-ctor.rs:45:5 | LL | xcrate::m::n::Z; | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/resolve/resolve-assoc-suggestions.rs b/src/test/ui/resolve/resolve-assoc-suggestions.rs index f3bc8107360d2..8cdbe64af0d83 100644 --- a/src/test/ui/resolve/resolve-assoc-suggestions.rs +++ b/src/test/ui/resolve/resolve-assoc-suggestions.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Make sure associated items are recommended only in appropriate contexts. struct S { diff --git a/src/test/ui/resolve/resolve-assoc-suggestions.stderr b/src/test/ui/resolve/resolve-assoc-suggestions.stderr index 916fa9793dc16..f2e1d72e7a351 100644 --- a/src/test/ui/resolve/resolve-assoc-suggestions.stderr +++ b/src/test/ui/resolve/resolve-assoc-suggestions.stderr @@ -1,53 +1,53 @@ error[E0412]: cannot find type `field` in this scope - --> $DIR/resolve-assoc-suggestions.rs:26:16 + --> $DIR/resolve-assoc-suggestions.rs:16:16 | LL | let _: field; | ^^^^^ not found in this scope error[E0531]: cannot find tuple struct/variant `field` in this scope - --> $DIR/resolve-assoc-suggestions.rs:28:13 + --> $DIR/resolve-assoc-suggestions.rs:18:13 | LL | let field(..); | ^^^^^ not found in this scope error[E0425]: cannot find value `field` in this scope - --> $DIR/resolve-assoc-suggestions.rs:30:9 + --> $DIR/resolve-assoc-suggestions.rs:20:9 | LL | field; | ^^^^^ help: try: `self.field` error[E0412]: cannot find type `Type` in this scope - --> $DIR/resolve-assoc-suggestions.rs:33:16 + --> $DIR/resolve-assoc-suggestions.rs:23:16 | LL | let _: Type; | ^^^^ help: try: `Self::Type` error[E0531]: cannot find tuple struct/variant `Type` in this scope - --> $DIR/resolve-assoc-suggestions.rs:35:13 + --> $DIR/resolve-assoc-suggestions.rs:25:13 | LL | let Type(..); | ^^^^ not found in this scope error[E0425]: cannot find value `Type` in this scope - --> $DIR/resolve-assoc-suggestions.rs:37:9 + --> $DIR/resolve-assoc-suggestions.rs:27:9 | LL | Type; | ^^^^ not found in this scope error[E0412]: cannot find type `method` in this scope - --> $DIR/resolve-assoc-suggestions.rs:40:16 + --> $DIR/resolve-assoc-suggestions.rs:30:16 | LL | let _: method; | ^^^^^^ not found in this scope error[E0531]: cannot find tuple struct/variant `method` in this scope - --> $DIR/resolve-assoc-suggestions.rs:42:13 + --> $DIR/resolve-assoc-suggestions.rs:32:13 | LL | let method(..); | ^^^^^^ not found in this scope error[E0425]: cannot find value `method` in this scope - --> $DIR/resolve-assoc-suggestions.rs:44:9 + --> $DIR/resolve-assoc-suggestions.rs:34:9 | LL | method; | ^^^^^^ help: try: `self.method` diff --git a/src/test/ui/resolve/resolve-bad-import-prefix.rs b/src/test/ui/resolve/resolve-bad-import-prefix.rs index 370782fc7d9e9..78d412d47c9ab 100644 --- a/src/test/ui/resolve/resolve-bad-import-prefix.rs +++ b/src/test/ui/resolve/resolve-bad-import-prefix.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod m {} enum E {} struct S; diff --git a/src/test/ui/resolve/resolve-bad-import-prefix.stderr b/src/test/ui/resolve/resolve-bad-import-prefix.stderr index 76d0c035335c5..0bccdf73bfdd6 100644 --- a/src/test/ui/resolve/resolve-bad-import-prefix.stderr +++ b/src/test/ui/resolve/resolve-bad-import-prefix.stderr @@ -1,5 +1,5 @@ error[E0577]: expected module or enum, found struct `S` - --> $DIR/resolve-bad-import-prefix.rs:20:5 + --> $DIR/resolve-bad-import-prefix.rs:10:5 | LL | use S::{}; //~ ERROR expected module or enum, found struct `S` | -^^^^ @@ -7,13 +7,13 @@ LL | use S::{}; //~ ERROR expected module or enum, found struct `S` | did you mean `E`? error[E0577]: expected module or enum, found trait `Tr` - --> $DIR/resolve-bad-import-prefix.rs:21:5 + --> $DIR/resolve-bad-import-prefix.rs:11:5 | LL | use Tr::{}; //~ ERROR expected module or enum, found trait `Tr` | ^^^^^^ not a module or enum error[E0578]: cannot find module or enum `Nonexistent` in the crate root - --> $DIR/resolve-bad-import-prefix.rs:22:5 + --> $DIR/resolve-bad-import-prefix.rs:12:5 | LL | use Nonexistent::{}; //~ ERROR cannot find module or enum `Nonexistent` in the crate root | ^^^^^^^^^^^ not found in the crate root diff --git a/src/test/ui/resolve/resolve-bad-visibility.rs b/src/test/ui/resolve/resolve-bad-visibility.rs index 420a45a2147e6..d86c300c93f61 100644 --- a/src/test/ui/resolve/resolve-bad-visibility.rs +++ b/src/test/ui/resolve/resolve-bad-visibility.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum E {} trait Tr {} diff --git a/src/test/ui/resolve/resolve-bad-visibility.stderr b/src/test/ui/resolve/resolve-bad-visibility.stderr index aa4817163e31e..519e7a946e14c 100644 --- a/src/test/ui/resolve/resolve-bad-visibility.stderr +++ b/src/test/ui/resolve/resolve-bad-visibility.stderr @@ -1,29 +1,29 @@ error: visibilities can only be restricted to ancestor modules - --> $DIR/resolve-bad-visibility.rs:16:8 + --> $DIR/resolve-bad-visibility.rs:6:8 | LL | pub(in std::vec) struct F; //~ ERROR visibilities can only be restricted to ancestor modules | ^^^^^^^^ error[E0577]: expected module, found enum `E` - --> $DIR/resolve-bad-visibility.rs:14:8 + --> $DIR/resolve-bad-visibility.rs:4:8 | LL | pub(in E) struct S; //~ ERROR expected module, found enum `E` | ^ not a module error[E0577]: expected module, found trait `Tr` - --> $DIR/resolve-bad-visibility.rs:15:8 + --> $DIR/resolve-bad-visibility.rs:5:8 | LL | pub(in Tr) struct Z; //~ ERROR expected module, found trait `Tr` | ^^ not a module error[E0578]: cannot find module `nonexistent` in the crate root - --> $DIR/resolve-bad-visibility.rs:17:8 + --> $DIR/resolve-bad-visibility.rs:7:8 | LL | pub(in nonexistent) struct G; //~ ERROR cannot find module `nonexistent` in the crate root | ^^^^^^^^^^^ not found in the crate root error[E0578]: cannot find module `too_soon` in the crate root - --> $DIR/resolve-bad-visibility.rs:18:8 + --> $DIR/resolve-bad-visibility.rs:8:8 | LL | pub(in too_soon) struct H; //~ ERROR cannot find module `too_soon` in the crate root | ^^^^^^^^ not found in the crate root diff --git a/src/test/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.rs b/src/test/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.rs index 6a04a2c370430..e4bb0d32942a4 100644 --- a/src/test/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.rs +++ b/src/test/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[allow(unused_extern_crates)] extern crate std; //~^ ERROR the name `std` is defined multiple times diff --git a/src/test/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.stderr b/src/test/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.stderr index 5f21b4413e71b..b5b3debceb5f4 100644 --- a/src/test/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.stderr +++ b/src/test/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.stderr @@ -1,5 +1,5 @@ error[E0259]: the name `std` is defined multiple times - --> $DIR/resolve-conflict-extern-crate-vs-extern-crate.rs:12:1 + --> $DIR/resolve-conflict-extern-crate-vs-extern-crate.rs:2:1 | LL | extern crate std; | ^^^^^^^^^^^^^^^^^ `std` reimported here diff --git a/src/test/ui/resolve/resolve-conflict-import-vs-extern-crate.rs b/src/test/ui/resolve/resolve-conflict-import-vs-extern-crate.rs index 91cf1d359542c..10772e7a43a76 100644 --- a/src/test/ui/resolve/resolve-conflict-import-vs-extern-crate.rs +++ b/src/test/ui/resolve/resolve-conflict-import-vs-extern-crate.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::slice as std; //~ ERROR the name `std` is defined multiple times fn main() { diff --git a/src/test/ui/resolve/resolve-conflict-import-vs-extern-crate.stderr b/src/test/ui/resolve/resolve-conflict-import-vs-extern-crate.stderr index 9978e75af30b7..ef3a55ad12dad 100644 --- a/src/test/ui/resolve/resolve-conflict-import-vs-extern-crate.stderr +++ b/src/test/ui/resolve/resolve-conflict-import-vs-extern-crate.stderr @@ -1,5 +1,5 @@ error[E0254]: the name `std` is defined multiple times - --> $DIR/resolve-conflict-import-vs-extern-crate.rs:11:5 + --> $DIR/resolve-conflict-import-vs-extern-crate.rs:1:5 | LL | use std::slice as std; //~ ERROR the name `std` is defined multiple times | ^^^^^^^^^^^^^^^^^ `std` reimported here diff --git a/src/test/ui/resolve/resolve-conflict-import-vs-import.rs b/src/test/ui/resolve/resolve-conflict-import-vs-import.rs index 8db9023310ec8..322f000040e17 100644 --- a/src/test/ui/resolve/resolve-conflict-import-vs-import.rs +++ b/src/test/ui/resolve/resolve-conflict-import-vs-import.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::mem::transmute; use std::mem::transmute; //~^ ERROR the name `transmute` is defined multiple times diff --git a/src/test/ui/resolve/resolve-conflict-import-vs-import.stderr b/src/test/ui/resolve/resolve-conflict-import-vs-import.stderr index 80ccb9aa2b3c3..f352bf0d5370d 100644 --- a/src/test/ui/resolve/resolve-conflict-import-vs-import.stderr +++ b/src/test/ui/resolve/resolve-conflict-import-vs-import.stderr @@ -1,5 +1,5 @@ error[E0252]: the name `transmute` is defined multiple times - --> $DIR/resolve-conflict-import-vs-import.rs:12:5 + --> $DIR/resolve-conflict-import-vs-import.rs:2:5 | LL | use std::mem::transmute; | ------------------- previous import of the value `transmute` here diff --git a/src/test/ui/resolve/resolve-conflict-item-vs-extern-crate.rs b/src/test/ui/resolve/resolve-conflict-item-vs-extern-crate.rs index b50a60d39c8b8..1226062493549 100644 --- a/src/test/ui/resolve/resolve-conflict-item-vs-extern-crate.rs +++ b/src/test/ui/resolve/resolve-conflict-item-vs-extern-crate.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn std() {} mod std {} //~ ERROR the name `std` is defined multiple times diff --git a/src/test/ui/resolve/resolve-conflict-item-vs-extern-crate.stderr b/src/test/ui/resolve/resolve-conflict-item-vs-extern-crate.stderr index d9ad248c01337..da46603f9964e 100644 --- a/src/test/ui/resolve/resolve-conflict-item-vs-extern-crate.stderr +++ b/src/test/ui/resolve/resolve-conflict-item-vs-extern-crate.stderr @@ -1,5 +1,5 @@ error[E0260]: the name `std` is defined multiple times - --> $DIR/resolve-conflict-item-vs-extern-crate.rs:12:1 + --> $DIR/resolve-conflict-item-vs-extern-crate.rs:2:1 | LL | mod std {} //~ ERROR the name `std` is defined multiple times | ^^^^^^^ `std` redefined here @@ -7,7 +7,7 @@ LL | mod std {} //~ ERROR the name `std` is defined multiple times = note: `std` must be defined only once in the type namespace of this module help: You can use `as` to change the binding name of the import | -LL | as other_std// Copyright 2014 The Rust Project Developers. See the COPYRIGHT +LL | as other_stdfn std() {} | ^^^^^^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/resolve/resolve-conflict-item-vs-import.rs b/src/test/ui/resolve/resolve-conflict-item-vs-import.rs index 4e74ab95d611c..4308c7a27501a 100644 --- a/src/test/ui/resolve/resolve-conflict-item-vs-import.rs +++ b/src/test/ui/resolve/resolve-conflict-item-vs-import.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::mem::transmute; fn transmute() {} diff --git a/src/test/ui/resolve/resolve-conflict-item-vs-import.stderr b/src/test/ui/resolve/resolve-conflict-item-vs-import.stderr index 5ef4bdf4aadd3..c78a0594721ca 100644 --- a/src/test/ui/resolve/resolve-conflict-item-vs-import.stderr +++ b/src/test/ui/resolve/resolve-conflict-item-vs-import.stderr @@ -1,5 +1,5 @@ error[E0255]: the name `transmute` is defined multiple times - --> $DIR/resolve-conflict-item-vs-import.rs:13:1 + --> $DIR/resolve-conflict-item-vs-import.rs:3:1 | LL | use std::mem::transmute; | ------------------- previous import of the value `transmute` here diff --git a/src/test/ui/resolve/resolve-conflict-type-vs-import.rs b/src/test/ui/resolve/resolve-conflict-type-vs-import.rs index bbb6ee622b164..3abce8396913f 100644 --- a/src/test/ui/resolve/resolve-conflict-type-vs-import.rs +++ b/src/test/ui/resolve/resolve-conflict-type-vs-import.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::slice::Iter; struct Iter; diff --git a/src/test/ui/resolve/resolve-conflict-type-vs-import.stderr b/src/test/ui/resolve/resolve-conflict-type-vs-import.stderr index 1e8df8f8ea78c..7b06054ce7a4a 100644 --- a/src/test/ui/resolve/resolve-conflict-type-vs-import.stderr +++ b/src/test/ui/resolve/resolve-conflict-type-vs-import.stderr @@ -1,5 +1,5 @@ error[E0255]: the name `Iter` is defined multiple times - --> $DIR/resolve-conflict-type-vs-import.rs:13:1 + --> $DIR/resolve-conflict-type-vs-import.rs:3:1 | LL | use std::slice::Iter; | ---------------- previous import of the type `Iter` here diff --git a/src/test/ui/resolve/resolve-hint-macro.rs b/src/test/ui/resolve/resolve-hint-macro.rs index cc9f73b871c71..6155ae7bcdfdf 100644 --- a/src/test/ui/resolve/resolve-hint-macro.rs +++ b/src/test/ui/resolve/resolve-hint-macro.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { assert(true); //~^ ERROR expected function, found macro `assert` diff --git a/src/test/ui/resolve/resolve-hint-macro.stderr b/src/test/ui/resolve/resolve-hint-macro.stderr index 9de6fd85de25b..4f6d0f695df44 100644 --- a/src/test/ui/resolve/resolve-hint-macro.stderr +++ b/src/test/ui/resolve/resolve-hint-macro.stderr @@ -1,5 +1,5 @@ error[E0423]: expected function, found macro `assert` - --> $DIR/resolve-hint-macro.rs:12:5 + --> $DIR/resolve-hint-macro.rs:2:5 | LL | assert(true); | ^^^^^^ did you mean `assert!(...)`? diff --git a/src/test/ui/resolve/resolve-inconsistent-binding-mode.rs b/src/test/ui/resolve/resolve-inconsistent-binding-mode.rs index 63d33a9e5fa6f..200f2cc2e4f06 100644 --- a/src/test/ui/resolve/resolve-inconsistent-binding-mode.rs +++ b/src/test/ui/resolve/resolve-inconsistent-binding-mode.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum opts { a(isize), b(isize), c(isize) } diff --git a/src/test/ui/resolve/resolve-inconsistent-binding-mode.stderr b/src/test/ui/resolve/resolve-inconsistent-binding-mode.stderr index e36eea26fcfd6..4e0e07cfbed65 100644 --- a/src/test/ui/resolve/resolve-inconsistent-binding-mode.stderr +++ b/src/test/ui/resolve/resolve-inconsistent-binding-mode.stderr @@ -1,5 +1,5 @@ error[E0409]: variable `i` is bound in inconsistent ways within the same match arm - --> $DIR/resolve-inconsistent-binding-mode.rs:17:32 + --> $DIR/resolve-inconsistent-binding-mode.rs:7:32 | LL | opts::a(ref i) | opts::b(i) => {} | - ^ bound in different ways @@ -7,7 +7,7 @@ LL | opts::a(ref i) | opts::b(i) => {} | first binding error[E0409]: variable `i` is bound in inconsistent ways within the same match arm - --> $DIR/resolve-inconsistent-binding-mode.rs:26:32 + --> $DIR/resolve-inconsistent-binding-mode.rs:16:32 | LL | opts::a(ref i) | opts::b(i) => {} | - ^ bound in different ways @@ -15,13 +15,13 @@ LL | opts::a(ref i) | opts::b(i) => {} | first binding error[E0409]: variable `i` is bound in inconsistent ways within the same match arm - --> $DIR/resolve-inconsistent-binding-mode.rs:35:40 + --> $DIR/resolve-inconsistent-binding-mode.rs:25:40 | LL | opts::a(ref mut i) | opts::b(ref i) => {} | - first binding ^ bound in different ways error[E0308]: mismatched types - --> $DIR/resolve-inconsistent-binding-mode.rs:17:32 + --> $DIR/resolve-inconsistent-binding-mode.rs:7:32 | LL | opts::a(ref i) | opts::b(i) => {} | ^ expected &isize, found isize @@ -30,7 +30,7 @@ LL | opts::a(ref i) | opts::b(i) => {} found type `isize` error[E0308]: mismatched types - --> $DIR/resolve-inconsistent-binding-mode.rs:26:32 + --> $DIR/resolve-inconsistent-binding-mode.rs:16:32 | LL | opts::a(ref i) | opts::b(i) => {} | ^ expected &isize, found isize @@ -39,7 +39,7 @@ LL | opts::a(ref i) | opts::b(i) => {} found type `isize` error[E0308]: mismatched types - --> $DIR/resolve-inconsistent-binding-mode.rs:35:36 + --> $DIR/resolve-inconsistent-binding-mode.rs:25:36 | LL | opts::a(ref mut i) | opts::b(ref i) => {} | ^^^^^ types differ in mutability diff --git a/src/test/ui/resolve/resolve-inconsistent-names.rs b/src/test/ui/resolve/resolve-inconsistent-names.rs index 79d78b4ca59b4..59baa57d91b3d 100644 --- a/src/test/ui/resolve/resolve-inconsistent-names.rs +++ b/src/test/ui/resolve/resolve-inconsistent-names.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let y = 1; match y { diff --git a/src/test/ui/resolve/resolve-inconsistent-names.stderr b/src/test/ui/resolve/resolve-inconsistent-names.stderr index 17caac210d451..20346d5aefe78 100644 --- a/src/test/ui/resolve/resolve-inconsistent-names.stderr +++ b/src/test/ui/resolve/resolve-inconsistent-names.stderr @@ -1,5 +1,5 @@ error[E0408]: variable `a` is not bound in all patterns - --> $DIR/resolve-inconsistent-names.rs:14:12 + --> $DIR/resolve-inconsistent-names.rs:4:12 | LL | a | b => {} //~ ERROR variable `a` is not bound in all patterns | - ^ pattern doesn't bind `a` @@ -7,7 +7,7 @@ LL | a | b => {} //~ ERROR variable `a` is not bound in all patterns | variable not in all patterns error[E0408]: variable `b` is not bound in all patterns - --> $DIR/resolve-inconsistent-names.rs:14:8 + --> $DIR/resolve-inconsistent-names.rs:4:8 | LL | a | b => {} //~ ERROR variable `a` is not bound in all patterns | ^ - variable not in all patterns diff --git a/src/test/ui/resolve/resolve-label.rs b/src/test/ui/resolve/resolve-label.rs index 6695e972f3337..965ee4501044b 100644 --- a/src/test/ui/resolve/resolve-label.rs +++ b/src/test/ui/resolve/resolve-label.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn f() { 'l: loop { fn g() { diff --git a/src/test/ui/resolve/resolve-label.stderr b/src/test/ui/resolve/resolve-label.stderr index a7b89752f5e04..fecfd922347b3 100644 --- a/src/test/ui/resolve/resolve-label.stderr +++ b/src/test/ui/resolve/resolve-label.stderr @@ -1,5 +1,5 @@ error[E0426]: use of undeclared label `'l` - --> $DIR/resolve-label.rs:15:23 + --> $DIR/resolve-label.rs:5:23 | LL | break 'l; //~ ERROR use of undeclared label | ^^ undeclared label `'l` diff --git a/src/test/ui/resolve/resolve-primitive-fallback.rs b/src/test/ui/resolve/resolve-primitive-fallback.rs index c1584b0bdcd52..e5a3d689d23d8 100644 --- a/src/test/ui/resolve/resolve-primitive-fallback.rs +++ b/src/test/ui/resolve/resolve-primitive-fallback.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { // Make sure primitive type fallback doesn't work in value namespace std::mem::size_of(u16); diff --git a/src/test/ui/resolve/resolve-primitive-fallback.stderr b/src/test/ui/resolve/resolve-primitive-fallback.stderr index 2d852369afc92..963bab43551c4 100644 --- a/src/test/ui/resolve/resolve-primitive-fallback.stderr +++ b/src/test/ui/resolve/resolve-primitive-fallback.stderr @@ -1,17 +1,17 @@ error[E0423]: expected value, found builtin type `u16` - --> $DIR/resolve-primitive-fallback.rs:13:23 + --> $DIR/resolve-primitive-fallback.rs:3:23 | LL | std::mem::size_of(u16); | ^^^ not a value error[E0412]: cannot find type `u8` in the crate root - --> $DIR/resolve-primitive-fallback.rs:18:14 + --> $DIR/resolve-primitive-fallback.rs:8:14 | LL | let _: ::u8; | ^^ not found in the crate root error[E0061]: this function takes 0 parameters but 1 parameter was supplied - --> $DIR/resolve-primitive-fallback.rs:13:5 + --> $DIR/resolve-primitive-fallback.rs:3:5 | LL | std::mem::size_of(u16); | ^^^^^^^^^^^^^^^^^^^^^^ expected 0 parameters diff --git a/src/test/ui/resolve/resolve-self-in-impl-2.rs b/src/test/ui/resolve/resolve-self-in-impl-2.rs index adc208a0202a2..f586760c8b096 100644 --- a/src/test/ui/resolve/resolve-self-in-impl-2.rs +++ b/src/test/ui/resolve/resolve-self-in-impl-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S(T); trait Tr {} diff --git a/src/test/ui/resolve/resolve-self-in-impl-2.stderr b/src/test/ui/resolve/resolve-self-in-impl-2.stderr index 183b9b66327b4..8463940478245 100644 --- a/src/test/ui/resolve/resolve-self-in-impl-2.stderr +++ b/src/test/ui/resolve/resolve-self-in-impl-2.stderr @@ -1,11 +1,11 @@ error[E0411]: expected trait, found self type `Self` - --> $DIR/resolve-self-in-impl-2.rs:14:6 + --> $DIR/resolve-self-in-impl-2.rs:4:6 | LL | impl Self for S {} //~ ERROR expected trait, found self type `Self` | ^^^^ `Self` is only available in traits and impls error[E0405]: cannot find trait `N` in `Self` - --> $DIR/resolve-self-in-impl-2.rs:15:12 + --> $DIR/resolve-self-in-impl-2.rs:5:12 | LL | impl Self::N for S {} //~ ERROR cannot find trait `N` in `Self` | ^ not found in `Self` diff --git a/src/test/ui/resolve/resolve-self-in-impl.rs b/src/test/ui/resolve/resolve-self-in-impl.rs index 2a894c57b8df1..024fdc51ea318 100644 --- a/src/test/ui/resolve/resolve-self-in-impl.rs +++ b/src/test/ui/resolve/resolve-self-in-impl.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(associated_type_defaults)] struct S(T); diff --git a/src/test/ui/resolve/resolve-self-in-impl.stderr b/src/test/ui/resolve/resolve-self-in-impl.stderr index 3fa384808dbd4..47704f114d16c 100644 --- a/src/test/ui/resolve/resolve-self-in-impl.stderr +++ b/src/test/ui/resolve/resolve-self-in-impl.stderr @@ -1,42 +1,42 @@ -error[E0391]: cycle detected when processing `` - --> $DIR/resolve-self-in-impl.rs:24:13 +error[E0391]: cycle detected when processing `` + --> $DIR/resolve-self-in-impl.rs:14:13 | LL | impl Tr for Self {} //~ ERROR cycle detected | ^^^^ | - = note: ...which again requires processing ``, completing the cycle + = note: ...which again requires processing ``, completing the cycle -error[E0391]: cycle detected when processing `` - --> $DIR/resolve-self-in-impl.rs:25:15 +error[E0391]: cycle detected when processing `` + --> $DIR/resolve-self-in-impl.rs:15:15 | LL | impl Tr for S {} //~ ERROR cycle detected | ^^^^ | - = note: ...which again requires processing ``, completing the cycle + = note: ...which again requires processing ``, completing the cycle -error[E0391]: cycle detected when processing `` - --> $DIR/resolve-self-in-impl.rs:26:6 +error[E0391]: cycle detected when processing `` + --> $DIR/resolve-self-in-impl.rs:16:6 | LL | impl Self {} //~ ERROR cycle detected | ^^^^ | - = note: ...which again requires processing ``, completing the cycle + = note: ...which again requires processing ``, completing the cycle -error[E0391]: cycle detected when processing `` - --> $DIR/resolve-self-in-impl.rs:27:8 +error[E0391]: cycle detected when processing `` + --> $DIR/resolve-self-in-impl.rs:17:8 | LL | impl S {} //~ ERROR cycle detected | ^^^^ | - = note: ...which again requires processing ``, completing the cycle + = note: ...which again requires processing ``, completing the cycle -error[E0391]: cycle detected when processing `` - --> $DIR/resolve-self-in-impl.rs:28:1 +error[E0391]: cycle detected when processing `` + --> $DIR/resolve-self-in-impl.rs:18:1 | LL | impl Tr for S {} //~ ERROR cycle detected | ^^^^^^^^^^^^^^^^^^^^^^ | - = note: ...which again requires processing ``, completing the cycle + = note: ...which again requires processing ``, completing the cycle error: aborting due to 5 previous errors diff --git a/src/test/ui/resolve/resolve-speculative-adjustment.rs b/src/test/ui/resolve/resolve-speculative-adjustment.rs index fb5ed150bf42a..81f7578291bb7 100644 --- a/src/test/ui/resolve/resolve-speculative-adjustment.rs +++ b/src/test/ui/resolve/resolve-speculative-adjustment.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Make sure speculative path resolution works properly when resolution // adjustment happens and no extra errors is reported. diff --git a/src/test/ui/resolve/resolve-speculative-adjustment.stderr b/src/test/ui/resolve/resolve-speculative-adjustment.stderr index 217bfb425664c..c4a6ced1ca4c0 100644 --- a/src/test/ui/resolve/resolve-speculative-adjustment.stderr +++ b/src/test/ui/resolve/resolve-speculative-adjustment.stderr @@ -1,23 +1,23 @@ error[E0425]: cannot find value `field` in this scope - --> $DIR/resolve-speculative-adjustment.rs:27:13 + --> $DIR/resolve-speculative-adjustment.rs:17:13 | LL | field; | ^^^^^ not found in this scope error[E0425]: cannot find function `method` in this scope - --> $DIR/resolve-speculative-adjustment.rs:29:13 + --> $DIR/resolve-speculative-adjustment.rs:19:13 | LL | method(); | ^^^^^^ not found in this scope error[E0425]: cannot find value `field` in this scope - --> $DIR/resolve-speculative-adjustment.rs:33:9 + --> $DIR/resolve-speculative-adjustment.rs:23:9 | LL | field; | ^^^^^ help: try: `self.field` error[E0425]: cannot find function `method` in this scope - --> $DIR/resolve-speculative-adjustment.rs:35:9 + --> $DIR/resolve-speculative-adjustment.rs:25:9 | LL | method(); | ^^^^^^ help: try: `self.method` diff --git a/src/test/ui/resolve/resolve-type-param-in-item-in-trait.rs b/src/test/ui/resolve/resolve-type-param-in-item-in-trait.rs index a1572b8566642..112427a3fceae 100644 --- a/src/test/ui/resolve/resolve-type-param-in-item-in-trait.rs +++ b/src/test/ui/resolve/resolve-type-param-in-item-in-trait.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #14603: Check for references to type parameters from the // outer scope (in this case, the trait) used on items in an inner // scope (in this case, the enum). diff --git a/src/test/ui/resolve/resolve-type-param-in-item-in-trait.stderr b/src/test/ui/resolve/resolve-type-param-in-item-in-trait.stderr index 73ee7102e6e2c..8eca720d88e8c 100644 --- a/src/test/ui/resolve/resolve-type-param-in-item-in-trait.stderr +++ b/src/test/ui/resolve/resolve-type-param-in-item-in-trait.stderr @@ -1,5 +1,5 @@ error[E0401]: can't use type parameters from outer function - --> $DIR/resolve-type-param-in-item-in-trait.rs:18:22 + --> $DIR/resolve-type-param-in-item-in-trait.rs:8:22 | LL | trait TraitA { | - type variable from outer function @@ -10,7 +10,7 @@ LL | Variance(A) | ^ use of type variable from outer function error[E0401]: can't use type parameters from outer function - --> $DIR/resolve-type-param-in-item-in-trait.rs:26:23 + --> $DIR/resolve-type-param-in-item-in-trait.rs:16:23 | LL | trait TraitB { | - type variable from outer function @@ -20,7 +20,7 @@ LL | struct Foo(A); | ^ use of type variable from outer function error[E0401]: can't use type parameters from outer function - --> $DIR/resolve-type-param-in-item-in-trait.rs:33:28 + --> $DIR/resolve-type-param-in-item-in-trait.rs:23:28 | LL | trait TraitC { | - type variable from outer function @@ -30,7 +30,7 @@ LL | struct Foo { a: A } | ^ use of type variable from outer function error[E0401]: can't use type parameters from outer function - --> $DIR/resolve-type-param-in-item-in-trait.rs:40:22 + --> $DIR/resolve-type-param-in-item-in-trait.rs:30:22 | LL | trait TraitD { | - type variable from outer function diff --git a/src/test/ui/resolve/resolve-unknown-trait.rs b/src/test/ui/resolve/resolve-unknown-trait.rs index 9432e727fa5b7..d09d149d96aa4 100644 --- a/src/test/ui/resolve/resolve-unknown-trait.rs +++ b/src/test/ui/resolve/resolve-unknown-trait.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait NewTrait : SomeNonExistentTrait {} //~^ ERROR cannot find trait `SomeNonExistentTrait` in this scope diff --git a/src/test/ui/resolve/resolve-unknown-trait.stderr b/src/test/ui/resolve/resolve-unknown-trait.stderr index 8a2d791654d2f..12b3ab5cb574e 100644 --- a/src/test/ui/resolve/resolve-unknown-trait.stderr +++ b/src/test/ui/resolve/resolve-unknown-trait.stderr @@ -1,17 +1,17 @@ error[E0405]: cannot find trait `SomeNonExistentTrait` in this scope - --> $DIR/resolve-unknown-trait.rs:12:18 + --> $DIR/resolve-unknown-trait.rs:1:18 | LL | trait NewTrait : SomeNonExistentTrait {} | ^^^^^^^^^^^^^^^^^^^^ not found in this scope error[E0405]: cannot find trait `SomeNonExistentTrait` in this scope - --> $DIR/resolve-unknown-trait.rs:15:6 + --> $DIR/resolve-unknown-trait.rs:4:6 | LL | impl SomeNonExistentTrait for isize {} | ^^^^^^^^^^^^^^^^^^^^ not found in this scope error[E0405]: cannot find trait `SomeNonExistentTrait` in this scope - --> $DIR/resolve-unknown-trait.rs:18:8 + --> $DIR/resolve-unknown-trait.rs:7:8 | LL | fn f() {} | ^^^^^^^^^^^^^^^^^^^^ not found in this scope diff --git a/src/test/ui/resolve/resolve-variant-assoc-item.rs b/src/test/ui/resolve/resolve-variant-assoc-item.rs index 869eed5a8d774..49d9308874c28 100644 --- a/src/test/ui/resolve/resolve-variant-assoc-item.rs +++ b/src/test/ui/resolve/resolve-variant-assoc-item.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum E { V } use E::V; diff --git a/src/test/ui/resolve/resolve-variant-assoc-item.stderr b/src/test/ui/resolve/resolve-variant-assoc-item.stderr index a80a7c392496b..2f0c444c27eea 100644 --- a/src/test/ui/resolve/resolve-variant-assoc-item.stderr +++ b/src/test/ui/resolve/resolve-variant-assoc-item.stderr @@ -1,11 +1,11 @@ error[E0433]: failed to resolve. Not a module `V` - --> $DIR/resolve-variant-assoc-item.rs:15:8 + --> $DIR/resolve-variant-assoc-item.rs:5:8 | LL | E::V::associated_item; //~ ERROR failed to resolve. Not a module `V` | ^ Not a module `V` error[E0433]: failed to resolve. Not a module `V` - --> $DIR/resolve-variant-assoc-item.rs:16:5 + --> $DIR/resolve-variant-assoc-item.rs:6:5 | LL | V::associated_item; //~ ERROR failed to resolve. Not a module `V` | ^ Not a module `V` diff --git a/src/test/ui/resolve/suggest-path-instead-of-mod-dot-item.rs b/src/test/ui/resolve/suggest-path-instead-of-mod-dot-item.rs index d24fced5d313f..204a272402dd7 100644 --- a/src/test/ui/resolve/suggest-path-instead-of-mod-dot-item.rs +++ b/src/test/ui/resolve/suggest-path-instead-of-mod-dot-item.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Beginners write `mod.item` when they should write `mod::item`. // This tests that we suggest the latter when we encounter the former. diff --git a/src/test/ui/resolve/suggest-path-instead-of-mod-dot-item.stderr b/src/test/ui/resolve/suggest-path-instead-of-mod-dot-item.stderr index 9216c0b321929..157b4cc79dfc1 100644 --- a/src/test/ui/resolve/suggest-path-instead-of-mod-dot-item.stderr +++ b/src/test/ui/resolve/suggest-path-instead-of-mod-dot-item.stderr @@ -1,5 +1,5 @@ error[E0423]: expected value, found module `a` - --> $DIR/suggest-path-instead-of-mod-dot-item.rs:27:5 + --> $DIR/suggest-path-instead-of-mod-dot-item.rs:17:5 | LL | a.I | ^-- @@ -7,7 +7,7 @@ LL | a.I | did you mean `a::I`? error[E0423]: expected value, found module `a` - --> $DIR/suggest-path-instead-of-mod-dot-item.rs:32:5 + --> $DIR/suggest-path-instead-of-mod-dot-item.rs:22:5 | LL | a.g() | ^---- @@ -15,7 +15,7 @@ LL | a.g() | did you mean `a::g(...)`? error[E0423]: expected value, found module `a` - --> $DIR/suggest-path-instead-of-mod-dot-item.rs:37:5 + --> $DIR/suggest-path-instead-of-mod-dot-item.rs:27:5 | LL | a.b.J | ^-- @@ -23,7 +23,7 @@ LL | a.b.J | did you mean `a::b`? error[E0423]: expected value, found module `a::b` - --> $DIR/suggest-path-instead-of-mod-dot-item.rs:42:5 + --> $DIR/suggest-path-instead-of-mod-dot-item.rs:32:5 | LL | a::b.J | ^^^--- @@ -32,7 +32,7 @@ LL | a::b.J | did you mean `a::b::J`? error[E0423]: expected value, found module `a` - --> $DIR/suggest-path-instead-of-mod-dot-item.rs:47:5 + --> $DIR/suggest-path-instead-of-mod-dot-item.rs:37:5 | LL | a.b.f(); | ^-- @@ -40,7 +40,7 @@ LL | a.b.f(); | did you mean `a::b`? error[E0423]: expected value, found module `a::b` - --> $DIR/suggest-path-instead-of-mod-dot-item.rs:50:12 + --> $DIR/suggest-path-instead-of-mod-dot-item.rs:40:12 | LL | v.push(a::b); | ^^^- @@ -48,7 +48,7 @@ LL | v.push(a::b); | did you mean `I`? error[E0423]: expected value, found module `a::b` - --> $DIR/suggest-path-instead-of-mod-dot-item.rs:55:5 + --> $DIR/suggest-path-instead-of-mod-dot-item.rs:45:5 | LL | a::b.f() | ^^^----- @@ -57,7 +57,7 @@ LL | a::b.f() | did you mean `a::b::f(...)`? error[E0423]: expected value, found module `a::b` - --> $DIR/suggest-path-instead-of-mod-dot-item.rs:60:5 + --> $DIR/suggest-path-instead-of-mod-dot-item.rs:50:5 | LL | a::b | ^^^- @@ -65,7 +65,7 @@ LL | a::b | did you mean `I`? error[E0423]: expected function, found module `a::b` - --> $DIR/suggest-path-instead-of-mod-dot-item.rs:65:5 + --> $DIR/suggest-path-instead-of-mod-dot-item.rs:55:5 | LL | a::b() | ^^^- diff --git a/src/test/ui/resolve/token-error-correct-2.rs b/src/test/ui/resolve/token-error-correct-2.rs index e49374f9ce649..c8551f1338ad7 100644 --- a/src/test/ui/resolve/token-error-correct-2.rs +++ b/src/test/ui/resolve/token-error-correct-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we do some basic error correcton in the tokeniser (and don't ICE). fn main() { diff --git a/src/test/ui/resolve/token-error-correct-2.stderr b/src/test/ui/resolve/token-error-correct-2.stderr index fcd4b4888b0ad..3c7ef1c794e65 100644 --- a/src/test/ui/resolve/token-error-correct-2.stderr +++ b/src/test/ui/resolve/token-error-correct-2.stderr @@ -1,5 +1,5 @@ error: incorrect close delimiter: `)` - --> $DIR/token-error-correct-2.rs:16:5 + --> $DIR/token-error-correct-2.rs:6:5 | LL | if foo { | - unclosed delimiter @@ -8,7 +8,7 @@ LL | ) //~ ERROR: incorrect close delimiter: `)` | ^ incorrect close delimiter error[E0425]: cannot find value `foo` in this scope - --> $DIR/token-error-correct-2.rs:14:8 + --> $DIR/token-error-correct-2.rs:4:8 | LL | if foo { | ^^^ not found in this scope diff --git a/src/test/ui/resolve/token-error-correct-3.rs b/src/test/ui/resolve/token-error-correct-3.rs index 8881b965f9480..066a5eebb3d1f 100644 --- a/src/test/ui/resolve/token-error-correct-3.rs +++ b/src/test/ui/resolve/token-error-correct-3.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no std::fs support // Test that we do some basic error correcton in the tokeniser (and don't spew diff --git a/src/test/ui/resolve/token-error-correct-3.stderr b/src/test/ui/resolve/token-error-correct-3.stderr index a546c2704d915..afe40ed8ad8e0 100644 --- a/src/test/ui/resolve/token-error-correct-3.stderr +++ b/src/test/ui/resolve/token-error-correct-3.stderr @@ -1,5 +1,5 @@ error: incorrect close delimiter: `}` - --> $DIR/token-error-correct-3.rs:30:9 + --> $DIR/token-error-correct-3.rs:20:9 | LL | callback(path.as_ref(); //~ ERROR expected one of | - unclosed delimiter @@ -8,13 +8,13 @@ LL | } else { //~ ERROR: incorrect close delimiter: `}` | ^ incorrect close delimiter error: expected one of `)`, `,`, `.`, `?`, or an operator, found `;` - --> $DIR/token-error-correct-3.rs:24:35 + --> $DIR/token-error-correct-3.rs:14:35 | LL | callback(path.as_ref(); //~ ERROR expected one of | ^ expected one of `)`, `,`, `.`, `?`, or an operator here error: expected one of `.`, `;`, `?`, `}`, or an operator, found `)` - --> $DIR/token-error-correct-3.rs:30:9 + --> $DIR/token-error-correct-3.rs:20:9 | LL | fs::create_dir_all(path.as_ref()).map(|()| true) //~ ERROR: mismatched types | - expected one of `.`, `;`, `?`, `}`, or an operator here @@ -23,13 +23,13 @@ LL | } else { //~ ERROR: incorrect close delimiter: `}` | ^ unexpected token error[E0425]: cannot find function `is_directory` in this scope - --> $DIR/token-error-correct-3.rs:23:13 + --> $DIR/token-error-correct-3.rs:13:13 | LL | if !is_directory(path.as_ref()) { //~ ERROR: cannot find function `is_directory` | ^^^^^^^^^^^^ not found in this scope error[E0308]: mismatched types - --> $DIR/token-error-correct-3.rs:25:13 + --> $DIR/token-error-correct-3.rs:15:13 | LL | fs::create_dir_all(path.as_ref()).map(|()| true) //~ ERROR: mismatched types | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^- help: try adding a semicolon: `;` diff --git a/src/test/ui/resolve/token-error-correct.rs b/src/test/ui/resolve/token-error-correct.rs index 39c664e270c45..c876ef7b148e9 100644 --- a/src/test/ui/resolve/token-error-correct.rs +++ b/src/test/ui/resolve/token-error-correct.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we do some basic error correcton in the tokeniser. fn main() { diff --git a/src/test/ui/resolve/token-error-correct.stderr b/src/test/ui/resolve/token-error-correct.stderr index 1e246b6f085bd..6612b5352a282 100644 --- a/src/test/ui/resolve/token-error-correct.stderr +++ b/src/test/ui/resolve/token-error-correct.stderr @@ -1,5 +1,5 @@ error: incorrect close delimiter: `}` - --> $DIR/token-error-correct.rs:16:1 + --> $DIR/token-error-correct.rs:6:1 | LL | foo(bar(; | - unclosed delimiter @@ -8,7 +8,7 @@ LL | } | ^ incorrect close delimiter error: expected expression, found `;` - --> $DIR/token-error-correct.rs:14:13 + --> $DIR/token-error-correct.rs:4:13 | LL | foo(bar(; | ^ expected expression diff --git a/src/test/ui/resolve/tuple-struct-alias.rs b/src/test/ui/resolve/tuple-struct-alias.rs index 0dbca07b771d7..7dcc1b3fa3b55 100644 --- a/src/test/ui/resolve/tuple-struct-alias.rs +++ b/src/test/ui/resolve/tuple-struct-alias.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S(u8, u16); type A = S; diff --git a/src/test/ui/resolve/tuple-struct-alias.stderr b/src/test/ui/resolve/tuple-struct-alias.stderr index cdac6277bcfa3..ff403a2e2954e 100644 --- a/src/test/ui/resolve/tuple-struct-alias.stderr +++ b/src/test/ui/resolve/tuple-struct-alias.stderr @@ -1,5 +1,5 @@ error[E0423]: expected function, found self type `Self` - --> $DIR/tuple-struct-alias.rs:16:17 + --> $DIR/tuple-struct-alias.rs:6:17 | LL | let s = Self(0, 1); //~ ERROR expected function | ^^^^ not a function @@ -7,7 +7,7 @@ LL | let s = Self(0, 1); //~ ERROR expected function = note: can't use `Self` as a constructor, you must use the implemented struct error[E0532]: expected tuple struct/variant, found self type `Self` - --> $DIR/tuple-struct-alias.rs:18:13 + --> $DIR/tuple-struct-alias.rs:8:13 | LL | Self(..) => {} //~ ERROR expected tuple struct/variant | ^^^^ not a tuple struct/variant @@ -15,7 +15,7 @@ LL | Self(..) => {} //~ ERROR expected tuple struct/variant = note: can't use `Self` as a constructor, you must use the implemented struct error[E0423]: expected function, found type alias `A` - --> $DIR/tuple-struct-alias.rs:24:13 + --> $DIR/tuple-struct-alias.rs:14:13 | LL | let s = A(0, 1); //~ ERROR expected function | ^ did you mean `S`? @@ -23,7 +23,7 @@ LL | let s = A(0, 1); //~ ERROR expected function = note: can't use a type alias as a constructor error[E0532]: expected tuple struct/variant, found type alias `A` - --> $DIR/tuple-struct-alias.rs:26:9 + --> $DIR/tuple-struct-alias.rs:16:9 | LL | A(..) => {} //~ ERROR expected tuple struct/variant | ^ did you mean `S`? diff --git a/src/test/ui/resolve/unboxed-closure-sugar-nonexistent-trait.rs b/src/test/ui/resolve/unboxed-closure-sugar-nonexistent-trait.rs index 9d5e2e89666a8..87f9ce097c589 100644 --- a/src/test/ui/resolve/unboxed-closure-sugar-nonexistent-trait.rs +++ b/src/test/ui/resolve/unboxed-closure-sugar-nonexistent-trait.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn f isize>(x: F) {} //~^ ERROR cannot find trait `Nonexist` diff --git a/src/test/ui/resolve/unboxed-closure-sugar-nonexistent-trait.stderr b/src/test/ui/resolve/unboxed-closure-sugar-nonexistent-trait.stderr index f32c5e9b2c6bd..a6a184760c7cf 100644 --- a/src/test/ui/resolve/unboxed-closure-sugar-nonexistent-trait.stderr +++ b/src/test/ui/resolve/unboxed-closure-sugar-nonexistent-trait.stderr @@ -1,11 +1,11 @@ error[E0405]: cannot find trait `Nonexist` in this scope - --> $DIR/unboxed-closure-sugar-nonexistent-trait.rs:11:8 + --> $DIR/unboxed-closure-sugar-nonexistent-trait.rs:1:8 | LL | fn f isize>(x: F) {} | ^^^^^^^^ not found in this scope error[E0404]: expected trait, found type alias `Typedef` - --> $DIR/unboxed-closure-sugar-nonexistent-trait.rs:16:8 + --> $DIR/unboxed-closure-sugar-nonexistent-trait.rs:6:8 | LL | fn g isize>(x: F) {} | ^^^^^^^^^^^^^^^^^^^^^^^ type aliases cannot be used for traits diff --git a/src/test/ui/resolve/unresolved_static_type_field.rs b/src/test/ui/resolve/unresolved_static_type_field.rs index 9ba39ce08c7e8..494ad083f1a87 100644 --- a/src/test/ui/resolve/unresolved_static_type_field.rs +++ b/src/test/ui/resolve/unresolved_static_type_field.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn f(_: bool) {} struct Foo { diff --git a/src/test/ui/resolve/unresolved_static_type_field.stderr b/src/test/ui/resolve/unresolved_static_type_field.stderr index 262a4983b81a3..2bf8efb34933f 100644 --- a/src/test/ui/resolve/unresolved_static_type_field.stderr +++ b/src/test/ui/resolve/unresolved_static_type_field.stderr @@ -1,5 +1,5 @@ error[E0425]: cannot find value `cx` in this scope - --> $DIR/unresolved_static_type_field.rs:19:11 + --> $DIR/unresolved_static_type_field.rs:9:11 | LL | f(cx); | ^^ diff --git a/src/test/ui/resolve/use_suggestion_placement.rs b/src/test/ui/resolve/use_suggestion_placement.rs index 835c42e45535a..9b8b9d88c7989 100644 --- a/src/test/ui/resolve/use_suggestion_placement.rs +++ b/src/test/ui/resolve/use_suggestion_placement.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no std::path support macro_rules! y { diff --git a/src/test/ui/resolve/use_suggestion_placement.stderr b/src/test/ui/resolve/use_suggestion_placement.stderr index caae70900dc0c..dcbb8dfe665ce 100644 --- a/src/test/ui/resolve/use_suggestion_placement.stderr +++ b/src/test/ui/resolve/use_suggestion_placement.stderr @@ -1,5 +1,5 @@ error[E0412]: cannot find type `Path` in this scope - --> $DIR/use_suggestion_placement.rs:27:16 + --> $DIR/use_suggestion_placement.rs:17:16 | LL | type Bar = Path; //~ ERROR cannot find | ^^^^ not found in this scope @@ -9,7 +9,7 @@ LL | use std::path::Path; | error[E0425]: cannot find value `A` in this scope - --> $DIR/use_suggestion_placement.rs:32:13 + --> $DIR/use_suggestion_placement.rs:22:13 | LL | let _ = A; //~ ERROR cannot find | ^ not found in this scope @@ -19,7 +19,7 @@ LL | use m::A; | error[E0412]: cannot find type `HashMap` in this scope - --> $DIR/use_suggestion_placement.rs:37:23 + --> $DIR/use_suggestion_placement.rs:27:23 | LL | type Dict = HashMap; //~ ERROR cannot find | ^^^^^^^ not found in this scope diff --git a/src/test/ui/resolve_self_super_hint.rs b/src/test/ui/resolve_self_super_hint.rs index a89fd802baf0c..6351e7ead52d0 100644 --- a/src/test/ui/resolve_self_super_hint.rs +++ b/src/test/ui/resolve_self_super_hint.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(alloc)] #![allow(unused_extern_crates)] diff --git a/src/test/ui/resolve_self_super_hint.stderr b/src/test/ui/resolve_self_super_hint.stderr index 8538da06baf64..15b860456f9e2 100644 --- a/src/test/ui/resolve_self_super_hint.stderr +++ b/src/test/ui/resolve_self_super_hint.stderr @@ -1,23 +1,23 @@ error[E0432]: unresolved import `alloc` - --> $DIR/resolve_self_super_hint.rs:16:9 + --> $DIR/resolve_self_super_hint.rs:6:9 | LL | use alloc::HashMap; | ^^^^^ Did you mean `self::alloc`? error[E0432]: unresolved import `alloc` - --> $DIR/resolve_self_super_hint.rs:20:13 + --> $DIR/resolve_self_super_hint.rs:10:13 | LL | use alloc::HashMap; | ^^^^^ Did you mean `a::alloc`? error[E0432]: unresolved import `alloc` - --> $DIR/resolve_self_super_hint.rs:24:17 + --> $DIR/resolve_self_super_hint.rs:14:17 | LL | use alloc::HashMap; | ^^^^^ Did you mean `a::alloc`? error[E0432]: unresolved import `alloc` - --> $DIR/resolve_self_super_hint.rs:28:21 + --> $DIR/resolve_self_super_hint.rs:18:21 | LL | use alloc::HashMap; | ^^^^^ Did you mean `a::alloc`? diff --git a/src/test/ui/ret-non-nil.rs b/src/test/ui/ret-non-nil.rs index 6be98fbd82773..86c02bf38e6f2 100644 --- a/src/test/ui/ret-non-nil.rs +++ b/src/test/ui/ret-non-nil.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: `return;` in a function whose return type is not `()` fn f() { return; } diff --git a/src/test/ui/ret-non-nil.stderr b/src/test/ui/ret-non-nil.stderr index 01f126bd11ea2..bf9b38563f6ad 100644 --- a/src/test/ui/ret-non-nil.stderr +++ b/src/test/ui/ret-non-nil.stderr @@ -1,5 +1,5 @@ error[E0069]: `return;` in a function whose return type is not `()` - --> $DIR/ret-non-nil.rs:15:19 + --> $DIR/ret-non-nil.rs:5:19 | LL | fn g() -> isize { return; } | ^^^^^^ return type is not () diff --git a/src/test/ui/retslot-cast.rs b/src/test/ui/retslot-cast.rs index c5e26a26744df..6a556adda3b5b 100644 --- a/src/test/ui/retslot-cast.rs +++ b/src/test/ui/retslot-cast.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![allow(warnings)] diff --git a/src/test/ui/retslot-cast.stderr b/src/test/ui/retslot-cast.stderr index 34f6e11f61419..9622f5f3ddf04 100644 --- a/src/test/ui/retslot-cast.stderr +++ b/src/test/ui/retslot-cast.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/retslot-cast.rs:24:5 + --> $DIR/retslot-cast.rs:14:5 | LL | inner(x) //~ ERROR mismatched types | ^^^^^^^^ expected trait `std::iter::Iterator`, found trait `std::iter::Iterator + std::marker::Send` diff --git a/src/test/ui/return/return-from-diverging.rs b/src/test/ui/return/return-from-diverging.rs index cec59faa918bc..faeccaace6987 100644 --- a/src/test/ui/return/return-from-diverging.rs +++ b/src/test/ui/return/return-from-diverging.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that return another type in place of ! raises a type mismatch. fn fail() -> ! { diff --git a/src/test/ui/return/return-from-diverging.stderr b/src/test/ui/return/return-from-diverging.stderr index d965d734327bc..c84dd1953a07b 100644 --- a/src/test/ui/return/return-from-diverging.stderr +++ b/src/test/ui/return/return-from-diverging.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/return-from-diverging.rs:14:12 + --> $DIR/return-from-diverging.rs:4:12 | LL | return "wow"; //~ ERROR mismatched types | ^^^^^ expected !, found reference diff --git a/src/test/ui/return/return-match-array-const.rs b/src/test/ui/return/return-match-array-const.rs index 45fc571d79d56..bbcd9600b2257 100644 --- a/src/test/ui/return/return-match-array-const.rs +++ b/src/test/ui/return/return-match-array-const.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { [(); return match 0 { n => n }]; //~ ERROR: return statement outside of function body diff --git a/src/test/ui/return/return-match-array-const.stderr b/src/test/ui/return/return-match-array-const.stderr index 044dc8f51455f..763b3d987d7cf 100644 --- a/src/test/ui/return/return-match-array-const.stderr +++ b/src/test/ui/return/return-match-array-const.stderr @@ -1,17 +1,17 @@ error[E0572]: return statement outside of function body - --> $DIR/return-match-array-const.rs:12:10 + --> $DIR/return-match-array-const.rs:2:10 | LL | [(); return match 0 { n => n }]; //~ ERROR: return statement outside of function body | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0572]: return statement outside of function body - --> $DIR/return-match-array-const.rs:14:10 + --> $DIR/return-match-array-const.rs:4:10 | LL | [(); return match 0 { 0 => 0 }]; //~ ERROR: return statement outside of function body | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0572]: return statement outside of function body - --> $DIR/return-match-array-const.rs:16:10 + --> $DIR/return-match-array-const.rs:6:10 | LL | [(); return match () { 'a' => 0, _ => 0 }]; //~ ERROR: return statement outside of function body | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/return/return-type.rs b/src/test/ui/return/return-type.rs index e63787949a41b..9f951ee0dd188 100644 --- a/src/test/ui/return/return-type.rs +++ b/src/test/ui/return/return-type.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S { t: T, } diff --git a/src/test/ui/return/return-type.stderr b/src/test/ui/return/return-type.stderr index 7d7653eee28fd..6eeec41b94c54 100644 --- a/src/test/ui/return/return-type.stderr +++ b/src/test/ui/return/return-type.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/return-type.rs:20:5 + --> $DIR/return-type.rs:10:5 | LL | foo(4 as usize) | ^^^^^^^^^^^^^^^ expected (), found struct `S` diff --git a/src/test/ui/return/return-unit-from-diverging.rs b/src/test/ui/return/return-unit-from-diverging.rs index ae2a325b24a92..31a13784b478d 100644 --- a/src/test/ui/return/return-unit-from-diverging.rs +++ b/src/test/ui/return/return-unit-from-diverging.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we get the usual error that we'd get for any other return type and not something about // diverging functions not being able to return. diff --git a/src/test/ui/return/return-unit-from-diverging.stderr b/src/test/ui/return/return-unit-from-diverging.stderr index 38d4ca37366ff..acaa86a8ec5af 100644 --- a/src/test/ui/return/return-unit-from-diverging.stderr +++ b/src/test/ui/return/return-unit-from-diverging.stderr @@ -1,5 +1,5 @@ error[E0069]: `return;` in a function whose return type is not `()` - --> $DIR/return-unit-from-diverging.rs:15:5 + --> $DIR/return-unit-from-diverging.rs:5:5 | LL | return; //~ ERROR in a function whose return type is not | ^^^^^^ return type is not () diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-impl-trait.rs b/src/test/ui/rfc-1937-termination-trait/termination-trait-impl-trait.rs index 92d21864c7483..8f65144b14059 100644 --- a/src/test/ui/rfc-1937-termination-trait/termination-trait-impl-trait.rs +++ b/src/test/ui/rfc-1937-termination-trait/termination-trait-impl-trait.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that an `impl Trait` that is not `impl Termination` will not work. fn main() -> impl Copy { } //~^ ERROR `main` has invalid return type `impl std::marker::Copy` diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-impl-trait.stderr b/src/test/ui/rfc-1937-termination-trait/termination-trait-impl-trait.stderr index 7485f3066bb27..8a718183a831e 100644 --- a/src/test/ui/rfc-1937-termination-trait/termination-trait-impl-trait.stderr +++ b/src/test/ui/rfc-1937-termination-trait/termination-trait-impl-trait.stderr @@ -1,5 +1,5 @@ error[E0277]: `main` has invalid return type `impl std::marker::Copy` - --> $DIR/termination-trait-impl-trait.rs:12:14 + --> $DIR/termination-trait-impl-trait.rs:2:14 | LL | fn main() -> impl Copy { } | ^^^^^^^^^ `main` can only return types that implement `std::process::Termination` diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.rs b/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.rs index a0b2784214ae9..96808a3ed914f 100644 --- a/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.rs +++ b/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --test #![feature(test)] diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.stderr b/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.stderr index bfdcf01c325f7..23a56bf8fec11 100644 --- a/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.stderr +++ b/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.stderr @@ -1,5 +1,5 @@ error: functions using `#[should_panic]` must return `()` - --> $DIR/termination-trait-in-test-should-panic.rs:21:1 + --> $DIR/termination-trait-in-test-should-panic.rs:11:1 | LL | / fn not_a_num() -> Result<(), ParseIntError> { LL | | //~^ ERROR functions using `#[should_panic]` must return `()` diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test.rs b/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test.rs index 0561b12221d1a..39825c4f9a938 100644 --- a/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test.rs +++ b/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --test // run-pass diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-main-i32.rs b/src/test/ui/rfc-1937-termination-trait/termination-trait-main-i32.rs index 49f5621de1b29..09bd1c8492f91 100644 --- a/src/test/ui/rfc-1937-termination-trait/termination-trait-main-i32.rs +++ b/src/test/ui/rfc-1937-termination-trait/termination-trait-main-i32.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() -> i32 { //~^ ERROR `main` has invalid return type `i32` //~| NOTE `main` can only return types that implement `std::process::Termination` diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-main-i32.stderr b/src/test/ui/rfc-1937-termination-trait/termination-trait-main-i32.stderr index 6f780d1cf1de8..e88e3d884ec0d 100644 --- a/src/test/ui/rfc-1937-termination-trait/termination-trait-main-i32.stderr +++ b/src/test/ui/rfc-1937-termination-trait/termination-trait-main-i32.stderr @@ -1,5 +1,5 @@ error[E0277]: `main` has invalid return type `i32` - --> $DIR/termination-trait-main-i32.rs:11:14 + --> $DIR/termination-trait-main-i32.rs:1:14 | LL | fn main() -> i32 { | ^^^ `main` can only return types that implement `std::process::Termination` diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.rs b/src/test/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.rs index 425f51ca2fb54..687d5f144f77c 100644 --- a/src/test/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.rs +++ b/src/test/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() -> char { //~ ERROR ' ' } diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr b/src/test/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr index e53872593843c..c1be04ca881e8 100644 --- a/src/test/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr +++ b/src/test/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr @@ -1,5 +1,5 @@ error[E0277]: `main` has invalid return type `char` - --> $DIR/termination-trait-main-wrong-type.rs:11:14 + --> $DIR/termination-trait-main-wrong-type.rs:1:14 | LL | fn main() -> char { //~ ERROR | ^^^^ `main` can only return types that implement `std::process::Termination` diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.rs b/src/test/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.rs index b5f5472b49290..4c6168abb4618 100644 --- a/src/test/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.rs +++ b/src/test/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct ReturnType {} fn main() -> ReturnType { //~ ERROR `main` has invalid return type `ReturnType` diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.stderr b/src/test/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.stderr index e1b173725d428..2f05f9b0f7a18 100644 --- a/src/test/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.stderr +++ b/src/test/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.stderr @@ -1,5 +1,5 @@ error[E0277]: `main` has invalid return type `ReturnType` - --> $DIR/termination-trait-not-satisfied.rs:13:14 + --> $DIR/termination-trait-not-satisfied.rs:3:14 | LL | fn main() -> ReturnType { //~ ERROR `main` has invalid return type `ReturnType` | ^^^^^^^^^^ `main` can only return types that implement `std::process::Termination` diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.rs b/src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.rs index 6153d840c8a7d..c648f5428571c 100644 --- a/src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.rs +++ b/src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --test use std::num::ParseIntError; diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr b/src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr index 0972a0994fc0d..03d469aed1979 100644 --- a/src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr +++ b/src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr @@ -1,5 +1,5 @@ error[E0277]: `main` has invalid return type `std::result::Result` - --> $DIR/termination-trait-test-wrong-type.rs:16:1 + --> $DIR/termination-trait-test-wrong-type.rs:6:1 | LL | / fn can_parse_zero_as_f32() -> Result { //~ ERROR LL | | "0".parse() diff --git a/src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.nll.stderr b/src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.nll.stderr index 606d678542269..2c78ce47c8bc0 100644 --- a/src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.nll.stderr +++ b/src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.nll.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `foo` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-issue-49631.rs:30:9 + --> $DIR/borrowck-issue-49631.rs:20:9 | LL | while let Some(Ok(string)) = foo.get() { | --- immutable borrow occurs here diff --git a/src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.rs b/src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.rs index 8dc1627dc8b5a..54ab9f0ad33c4 100644 --- a/src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.rs +++ b/src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Copy, Clone, Debug, Eq, PartialEq)] pub struct Foo { } diff --git a/src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.stderr b/src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.stderr index 2da5ac8d240bf..e946d41e23489 100644 --- a/src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.stderr +++ b/src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `foo` as mutable because it is also borrowed as immutable - --> $DIR/borrowck-issue-49631.rs:30:9 + --> $DIR/borrowck-issue-49631.rs:20:9 | LL | while let Some(Ok(string)) = foo.get() { | --- - immutable borrow ends here diff --git a/src/test/ui/rfc-2005-default-binding-mode/const.rs b/src/test/ui/rfc-2005-default-binding-mode/const.rs index f80e47507ff04..93df880408ded 100644 --- a/src/test/ui/rfc-2005-default-binding-mode/const.rs +++ b/src/test/ui/rfc-2005-default-binding-mode/const.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // FIXME(tschottdorf): this test should pass. #[derive(PartialEq, Eq)] diff --git a/src/test/ui/rfc-2005-default-binding-mode/const.stderr b/src/test/ui/rfc-2005-default-binding-mode/const.stderr index 4849c39a5d099..7ce8a3256327e 100644 --- a/src/test/ui/rfc-2005-default-binding-mode/const.stderr +++ b/src/test/ui/rfc-2005-default-binding-mode/const.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/const.rs:24:9 + --> $DIR/const.rs:14:9 | LL | FOO => {}, //~ ERROR mismatched types | ^^^ expected &Foo, found struct `Foo` diff --git a/src/test/ui/rfc-2005-default-binding-mode/enum.nll.stderr b/src/test/ui/rfc-2005-default-binding-mode/enum.nll.stderr index a9b2bca434cba..5920be4132a96 100644 --- a/src/test/ui/rfc-2005-default-binding-mode/enum.nll.stderr +++ b/src/test/ui/rfc-2005-default-binding-mode/enum.nll.stderr @@ -1,17 +1,17 @@ error[E0594]: cannot assign to `*x` which is behind a `&` reference - --> $DIR/enum.rs:19:5 + --> $DIR/enum.rs:9:5 | LL | *x += 1; //~ ERROR cannot assign to immutable | ^^^^^^^ `x` is a `&` reference, so the data it refers to cannot be written error[E0594]: cannot assign to `*x` which is behind a `&` reference - --> $DIR/enum.rs:23:9 + --> $DIR/enum.rs:13:9 | LL | *x += 1; //~ ERROR cannot assign to immutable | ^^^^^^^ `x` is a `&` reference, so the data it refers to cannot be written error[E0594]: cannot assign to `*x` which is behind a `&` reference - --> $DIR/enum.rs:29:9 + --> $DIR/enum.rs:19:9 | LL | *x += 1; //~ ERROR cannot assign to immutable | ^^^^^^^ `x` is a `&` reference, so the data it refers to cannot be written diff --git a/src/test/ui/rfc-2005-default-binding-mode/enum.rs b/src/test/ui/rfc-2005-default-binding-mode/enum.rs index a108653f85d20..7609345404feb 100644 --- a/src/test/ui/rfc-2005-default-binding-mode/enum.rs +++ b/src/test/ui/rfc-2005-default-binding-mode/enum.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Wrapper { Wrap(i32), } diff --git a/src/test/ui/rfc-2005-default-binding-mode/enum.stderr b/src/test/ui/rfc-2005-default-binding-mode/enum.stderr index ad05de9f3575f..d29b0111d8bb2 100644 --- a/src/test/ui/rfc-2005-default-binding-mode/enum.stderr +++ b/src/test/ui/rfc-2005-default-binding-mode/enum.stderr @@ -1,17 +1,17 @@ error[E0594]: cannot assign to immutable borrowed content `*x` - --> $DIR/enum.rs:19:5 + --> $DIR/enum.rs:9:5 | LL | *x += 1; //~ ERROR cannot assign to immutable | ^^^^^^^ cannot borrow as mutable error[E0594]: cannot assign to immutable borrowed content `*x` - --> $DIR/enum.rs:23:9 + --> $DIR/enum.rs:13:9 | LL | *x += 1; //~ ERROR cannot assign to immutable | ^^^^^^^ cannot borrow as mutable error[E0594]: cannot assign to immutable borrowed content `*x` - --> $DIR/enum.rs:29:9 + --> $DIR/enum.rs:19:9 | LL | *x += 1; //~ ERROR cannot assign to immutable | ^^^^^^^ cannot borrow as mutable diff --git a/src/test/ui/rfc-2005-default-binding-mode/explicit-mut.nll.stderr b/src/test/ui/rfc-2005-default-binding-mode/explicit-mut.nll.stderr index 4c6149a8b7b30..2206c2f340e14 100644 --- a/src/test/ui/rfc-2005-default-binding-mode/explicit-mut.nll.stderr +++ b/src/test/ui/rfc-2005-default-binding-mode/explicit-mut.nll.stderr @@ -1,17 +1,17 @@ error[E0594]: cannot assign to `*n` which is behind a `&` reference - --> $DIR/explicit-mut.rs:17:13 + --> $DIR/explicit-mut.rs:7:13 | LL | *n += 1; //~ ERROR cannot assign to immutable | ^^^^^^^ `n` is a `&` reference, so the data it refers to cannot be written error[E0594]: cannot assign to `*n` which is behind a `&` reference - --> $DIR/explicit-mut.rs:25:13 + --> $DIR/explicit-mut.rs:15:13 | LL | *n += 1; //~ ERROR cannot assign to immutable | ^^^^^^^ `n` is a `&` reference, so the data it refers to cannot be written error[E0594]: cannot assign to `*n` which is behind a `&` reference - --> $DIR/explicit-mut.rs:33:13 + --> $DIR/explicit-mut.rs:23:13 | LL | *n += 1; //~ ERROR cannot assign to immutable | ^^^^^^^ `n` is a `&` reference, so the data it refers to cannot be written diff --git a/src/test/ui/rfc-2005-default-binding-mode/explicit-mut.rs b/src/test/ui/rfc-2005-default-binding-mode/explicit-mut.rs index 8001d980174e0..73efddef6cd10 100644 --- a/src/test/ui/rfc-2005-default-binding-mode/explicit-mut.rs +++ b/src/test/ui/rfc-2005-default-binding-mode/explicit-mut.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Verify the binding mode shifts - only when no `&` are auto-dereferenced is the // final default binding mode mutable. diff --git a/src/test/ui/rfc-2005-default-binding-mode/explicit-mut.stderr b/src/test/ui/rfc-2005-default-binding-mode/explicit-mut.stderr index 8da67a6b5ee65..e03f67760d7e7 100644 --- a/src/test/ui/rfc-2005-default-binding-mode/explicit-mut.stderr +++ b/src/test/ui/rfc-2005-default-binding-mode/explicit-mut.stderr @@ -1,17 +1,17 @@ error[E0594]: cannot assign to immutable borrowed content `*n` - --> $DIR/explicit-mut.rs:17:13 + --> $DIR/explicit-mut.rs:7:13 | LL | *n += 1; //~ ERROR cannot assign to immutable | ^^^^^^^ cannot borrow as mutable error[E0594]: cannot assign to immutable borrowed content `*n` - --> $DIR/explicit-mut.rs:25:13 + --> $DIR/explicit-mut.rs:15:13 | LL | *n += 1; //~ ERROR cannot assign to immutable | ^^^^^^^ cannot borrow as mutable error[E0594]: cannot assign to immutable borrowed content `*n` - --> $DIR/explicit-mut.rs:33:13 + --> $DIR/explicit-mut.rs:23:13 | LL | *n += 1; //~ ERROR cannot assign to immutable | ^^^^^^^ cannot borrow as mutable diff --git a/src/test/ui/rfc-2005-default-binding-mode/for.rs b/src/test/ui/rfc-2005-default-binding-mode/for.rs index a354d2216a9c7..2fa7852635c30 100644 --- a/src/test/ui/rfc-2005-default-binding-mode/for.rs +++ b/src/test/ui/rfc-2005-default-binding-mode/for.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo {} pub fn main() { diff --git a/src/test/ui/rfc-2005-default-binding-mode/for.stderr b/src/test/ui/rfc-2005-default-binding-mode/for.stderr index dbd4bd5dbec43..37aaa9cfd70a0 100644 --- a/src/test/ui/rfc-2005-default-binding-mode/for.stderr +++ b/src/test/ui/rfc-2005-default-binding-mode/for.stderr @@ -1,5 +1,5 @@ error[E0009]: cannot bind by-move and by-ref in the same pattern - --> $DIR/for.rs:16:13 + --> $DIR/for.rs:6:13 | LL | for (n, mut m) in &tups { | - ^^^^^ by-move pattern here diff --git a/src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.rs b/src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.rs index 4f4c2a149a7d6..aa013d4bf3528 100644 --- a/src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.rs +++ b/src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // FIXME(tschottdorf): This should compile. See #44912. pub fn main() { diff --git a/src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.stderr b/src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.stderr index 04fa3708ffb75..ff8dce32b2ab3 100644 --- a/src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.stderr +++ b/src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.stderr @@ -1,5 +1,5 @@ error[E0409]: variable `x` is bound in inconsistent ways within the same match arm - --> $DIR/issue-44912-or.rs:16:35 + --> $DIR/issue-44912-or.rs:6:35 | LL | Some((x, 3)) | &Some((ref x, 5)) => x, | - first binding ^ bound in different ways diff --git a/src/test/ui/rfc-2005-default-binding-mode/lit.rs b/src/test/ui/rfc-2005-default-binding-mode/lit.rs index 209f584534615..ce79cfbdc1a30 100644 --- a/src/test/ui/rfc-2005-default-binding-mode/lit.rs +++ b/src/test/ui/rfc-2005-default-binding-mode/lit.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // FIXME(tschottdorf): we want these to compile, but they don't. fn with_str() { diff --git a/src/test/ui/rfc-2005-default-binding-mode/lit.stderr b/src/test/ui/rfc-2005-default-binding-mode/lit.stderr index d5c230bc8de54..b78b4432bbe31 100644 --- a/src/test/ui/rfc-2005-default-binding-mode/lit.stderr +++ b/src/test/ui/rfc-2005-default-binding-mode/lit.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/lit.rs:17:13 + --> $DIR/lit.rs:7:13 | LL | "abc" => true, //~ ERROR mismatched types | ^^^^^ expected &str, found str @@ -8,7 +8,7 @@ LL | "abc" => true, //~ ERROR mismatched types found type `&'static str` error[E0308]: mismatched types - --> $DIR/lit.rs:26:9 + --> $DIR/lit.rs:16:9 | LL | b"abc" => true, //~ ERROR mismatched types | ^^^^^^ expected &[u8], found array of 3 elements diff --git a/src/test/ui/rfc-2005-default-binding-mode/no-double-error.rs b/src/test/ui/rfc-2005-default-binding-mode/no-double-error.rs index 0b2318d7621d6..46fdfd678cc6d 100644 --- a/src/test/ui/rfc-2005-default-binding-mode/no-double-error.rs +++ b/src/test/ui/rfc-2005-default-binding-mode/no-double-error.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Without caching type lookups in FnCtxt.resolve_ty_and_def_ufcs // the error below would be reported twice (once when checking // for a non-ref pattern, once when processing the pattern). diff --git a/src/test/ui/rfc-2005-default-binding-mode/no-double-error.stderr b/src/test/ui/rfc-2005-default-binding-mode/no-double-error.stderr index e3a613f926110..dee32024e4702 100644 --- a/src/test/ui/rfc-2005-default-binding-mode/no-double-error.stderr +++ b/src/test/ui/rfc-2005-default-binding-mode/no-double-error.stderr @@ -1,5 +1,5 @@ error[E0599]: no associated item named `XXX` found for type `u32` in the current scope - --> $DIR/no-double-error.rs:18:9 + --> $DIR/no-double-error.rs:8:9 | LL | u32::XXX => { } //~ ERROR no associated item named | ^^^^^^^^ associated item not found in `u32` diff --git a/src/test/ui/rfc-2005-default-binding-mode/slice.rs b/src/test/ui/rfc-2005-default-binding-mode/slice.rs index fbe4dfe216196..fd85bf7f16007 100644 --- a/src/test/ui/rfc-2005-default-binding-mode/slice.rs +++ b/src/test/ui/rfc-2005-default-binding-mode/slice.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(slice_patterns)] pub fn main() { diff --git a/src/test/ui/rfc-2005-default-binding-mode/slice.stderr b/src/test/ui/rfc-2005-default-binding-mode/slice.stderr index 18dc6b2869ab9..1dfad0d31896c 100644 --- a/src/test/ui/rfc-2005-default-binding-mode/slice.stderr +++ b/src/test/ui/rfc-2005-default-binding-mode/slice.stderr @@ -1,5 +1,5 @@ error[E0004]: non-exhaustive patterns: `&[]` not covered - --> $DIR/slice.rs:16:11 + --> $DIR/slice.rs:6:11 | LL | match sl { //~ ERROR non-exhaustive patterns | ^^ pattern `&[]` not covered diff --git a/src/test/ui/rfc-2008-non-exhaustive/auxiliary/enums.rs b/src/test/ui/rfc-2008-non-exhaustive/auxiliary/enums.rs index 12d1bf9ea9104..e3820599c72d9 100644 --- a/src/test/ui/rfc-2008-non-exhaustive/auxiliary/enums.rs +++ b/src/test/ui/rfc-2008-non-exhaustive/auxiliary/enums.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] #![feature(non_exhaustive)] diff --git a/src/test/ui/rfc-2008-non-exhaustive/auxiliary/structs.rs b/src/test/ui/rfc-2008-non-exhaustive/auxiliary/structs.rs index 4d083cc5315aa..ddfb9ad003748 100644 --- a/src/test/ui/rfc-2008-non-exhaustive/auxiliary/structs.rs +++ b/src/test/ui/rfc-2008-non-exhaustive/auxiliary/structs.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(non_exhaustive)] #[non_exhaustive] diff --git a/src/test/ui/rfc-2008-non-exhaustive/auxiliary/variants.rs b/src/test/ui/rfc-2008-non-exhaustive/auxiliary/variants.rs index d04c1073ad9b3..f590d0a3268ff 100644 --- a/src/test/ui/rfc-2008-non-exhaustive/auxiliary/variants.rs +++ b/src/test/ui/rfc-2008-non-exhaustive/auxiliary/variants.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "rlib"] #![feature(non_exhaustive)] diff --git a/src/test/ui/rfc-2008-non-exhaustive/enum.rs b/src/test/ui/rfc-2008-non-exhaustive/enum.rs index 0c19210e4a0ed..d9b1a9895104c 100644 --- a/src/test/ui/rfc-2008-non-exhaustive/enum.rs +++ b/src/test/ui/rfc-2008-non-exhaustive/enum.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:enums.rs extern crate enums; diff --git a/src/test/ui/rfc-2008-non-exhaustive/enum.stderr b/src/test/ui/rfc-2008-non-exhaustive/enum.stderr index 5276746734df4..acce9779067a6 100644 --- a/src/test/ui/rfc-2008-non-exhaustive/enum.stderr +++ b/src/test/ui/rfc-2008-non-exhaustive/enum.stderr @@ -1,5 +1,5 @@ error[E0004]: non-exhaustive patterns: `_` not covered - --> $DIR/enum.rs:19:11 + --> $DIR/enum.rs:9:11 | LL | match enum_unit { | ^^^^^^^^^ pattern `_` not covered diff --git a/src/test/ui/rfc-2008-non-exhaustive/invalid-attribute.rs b/src/test/ui/rfc-2008-non-exhaustive/invalid-attribute.rs index df4fe1e77e96d..27db48998eb26 100644 --- a/src/test/ui/rfc-2008-non-exhaustive/invalid-attribute.rs +++ b/src/test/ui/rfc-2008-non-exhaustive/invalid-attribute.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(non_exhaustive)] #[non_exhaustive(anything)] diff --git a/src/test/ui/rfc-2008-non-exhaustive/invalid-attribute.stderr b/src/test/ui/rfc-2008-non-exhaustive/invalid-attribute.stderr index d75ad9ec2649f..c06999934e888 100644 --- a/src/test/ui/rfc-2008-non-exhaustive/invalid-attribute.stderr +++ b/src/test/ui/rfc-2008-non-exhaustive/invalid-attribute.stderr @@ -1,5 +1,5 @@ error[E0702]: attribute should be empty - --> $DIR/invalid-attribute.rs:13:1 + --> $DIR/invalid-attribute.rs:3:1 | LL | #[non_exhaustive(anything)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -8,7 +8,7 @@ LL | struct Foo; | ----------- not empty error[E0701]: attribute can only be applied to a struct or enum - --> $DIR/invalid-attribute.rs:17:1 + --> $DIR/invalid-attribute.rs:7:1 | LL | #[non_exhaustive] | ^^^^^^^^^^^^^^^^^ @@ -17,7 +17,7 @@ LL | trait Bar { } | ------------- not a struct or enum error[E0701]: attribute can only be applied to a struct or enum - --> $DIR/invalid-attribute.rs:21:1 + --> $DIR/invalid-attribute.rs:11:1 | LL | #[non_exhaustive] | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/rfc-2008-non-exhaustive/structs.rs b/src/test/ui/rfc-2008-non-exhaustive/structs.rs index 74c9c7c61ace8..303d71d12df33 100644 --- a/src/test/ui/rfc-2008-non-exhaustive/structs.rs +++ b/src/test/ui/rfc-2008-non-exhaustive/structs.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:structs.rs extern crate structs; diff --git a/src/test/ui/rfc-2008-non-exhaustive/structs.stderr b/src/test/ui/rfc-2008-non-exhaustive/structs.stderr index c0f7e2786716e..931110069b5c8 100644 --- a/src/test/ui/rfc-2008-non-exhaustive/structs.stderr +++ b/src/test/ui/rfc-2008-non-exhaustive/structs.stderr @@ -1,29 +1,29 @@ error[E0423]: expected function, found struct `TupleStruct` - --> $DIR/structs.rs:30:14 + --> $DIR/structs.rs:20:14 | LL | let ts = TupleStruct(640, 480); | ^^^^^^^^^^^ constructor is not visible here due to private fields error[E0423]: expected value, found struct `UnitStruct` - --> $DIR/structs.rs:39:14 + --> $DIR/structs.rs:29:14 | LL | let us = UnitStruct; | ^^^^^^^^^^ constructor is not visible here due to private fields error[E0603]: tuple struct `TupleStruct` is private - --> $DIR/structs.rs:33:23 + --> $DIR/structs.rs:23:23 | LL | let ts_explicit = structs::TupleStruct(640, 480); | ^^^^^^^^^^^^^^^^^^^^ error[E0603]: unit struct `UnitStruct` is private - --> $DIR/structs.rs:42:23 + --> $DIR/structs.rs:32:23 | LL | let us_explicit = structs::UnitStruct; | ^^^^^^^^^^^^^^^^^^^ error[E0639]: cannot create non-exhaustive struct using struct expression - --> $DIR/structs.rs:17:14 + --> $DIR/structs.rs:7:14 | LL | let fr = FunctionalRecord { | ______________^ @@ -35,25 +35,25 @@ LL | | }; | |_____^ error[E0639]: cannot create non-exhaustive struct using struct expression - --> $DIR/structs.rs:24:14 + --> $DIR/structs.rs:14:14 | LL | let ns = NormalStruct { first_field: 640, second_field: 480 }; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0638]: `..` required with struct marked as non-exhaustive - --> $DIR/structs.rs:27:9 + --> $DIR/structs.rs:17:9 | LL | let NormalStruct { first_field, second_field } = ns; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0638]: `..` required with struct marked as non-exhaustive - --> $DIR/structs.rs:36:9 + --> $DIR/structs.rs:26:9 | LL | let TupleStruct { 0: first_field, 1: second_field } = ts; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0638]: `..` required with struct marked as non-exhaustive - --> $DIR/structs.rs:45:9 + --> $DIR/structs.rs:35:9 | LL | let UnitStruct { } = us; | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/rfc-2008-non-exhaustive/variants.rs b/src/test/ui/rfc-2008-non-exhaustive/variants.rs index d1b65ac1f3e52..373bbc3547f38 100644 --- a/src/test/ui/rfc-2008-non-exhaustive/variants.rs +++ b/src/test/ui/rfc-2008-non-exhaustive/variants.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:variants.rs extern crate variants; diff --git a/src/test/ui/rfc-2008-non-exhaustive/variants_create.rs b/src/test/ui/rfc-2008-non-exhaustive/variants_create.rs index f4e4b1bb84b8b..9ed244144dff9 100644 --- a/src/test/ui/rfc-2008-non-exhaustive/variants_create.rs +++ b/src/test/ui/rfc-2008-non-exhaustive/variants_create.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(non_exhaustive)] /* diff --git a/src/test/ui/rfc-2008-non-exhaustive/variants_create.stderr b/src/test/ui/rfc-2008-non-exhaustive/variants_create.stderr index 1e4e0943a699d..5b099d58ec467 100644 --- a/src/test/ui/rfc-2008-non-exhaustive/variants_create.stderr +++ b/src/test/ui/rfc-2008-non-exhaustive/variants_create.stderr @@ -1,17 +1,17 @@ error: #[non_exhaustive] is not yet supported on variants - --> $DIR/variants_create.rs:19:23 + --> $DIR/variants_create.rs:9:23 | LL | #[non_exhaustive] Unit, | ^^^^ error: #[non_exhaustive] is not yet supported on variants - --> $DIR/variants_create.rs:21:23 + --> $DIR/variants_create.rs:11:23 | LL | #[non_exhaustive] Tuple(u32), | ^^^^^^^^^^ error: #[non_exhaustive] is not yet supported on variants - --> $DIR/variants_create.rs:23:23 + --> $DIR/variants_create.rs:13:23 | LL | #[non_exhaustive] Struct { field: u32 } | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/rfc-2093-infer-outlives/cross-crate.rs b/src/test/ui/rfc-2093-infer-outlives/cross-crate.rs index 016739978834b..d1eb186d2ada9 100644 --- a/src/test/ui/rfc-2093-infer-outlives/cross-crate.rs +++ b/src/test/ui/rfc-2093-infer-outlives/cross-crate.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![feature(infer_outlives_requirements)] diff --git a/src/test/ui/rfc-2093-infer-outlives/cross-crate.stderr b/src/test/ui/rfc-2093-infer-outlives/cross-crate.stderr index a90643ae8916b..074224acc6958 100644 --- a/src/test/ui/rfc-2093-infer-outlives/cross-crate.stderr +++ b/src/test/ui/rfc-2093-infer-outlives/cross-crate.stderr @@ -1,5 +1,5 @@ error: rustc_outlives - --> $DIR/cross-crate.rs:15:1 + --> $DIR/cross-crate.rs:5:1 | LL | / struct Foo<'a, T> { //~ ERROR 15:1: 17:2: rustc_outlives LL | | bar: std::slice::IterMut<'a, T> diff --git a/src/test/ui/rfc-2093-infer-outlives/dont-infer-static.rs b/src/test/ui/rfc-2093-infer-outlives/dont-infer-static.rs index 72d5127c294dc..df12007f9cd2c 100644 --- a/src/test/ui/rfc-2093-infer-outlives/dont-infer-static.rs +++ b/src/test/ui/rfc-2093-infer-outlives/dont-infer-static.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength #![feature(infer_outlives_requirements)] diff --git a/src/test/ui/rfc-2093-infer-outlives/dont-infer-static.stderr b/src/test/ui/rfc-2093-infer-outlives/dont-infer-static.stderr index 775ac215e190d..908bbff525250 100644 --- a/src/test/ui/rfc-2093-infer-outlives/dont-infer-static.stderr +++ b/src/test/ui/rfc-2093-infer-outlives/dont-infer-static.stderr @@ -1,5 +1,5 @@ error[E0310]: the parameter type `U` may not live long enough - --> $DIR/dont-infer-static.rs:22:5 + --> $DIR/dont-infer-static.rs:12:5 | LL | struct Foo { | - help: consider adding an explicit lifetime bound `U: 'static`... @@ -7,7 +7,7 @@ LL | bar: Bar //~ ERROR 22:5: 22:16: the parameter type `U` may not live | ^^^^^^^^^^^ | note: ...so that the type `U` will meet its required lifetime bounds - --> $DIR/dont-infer-static.rs:22:5 + --> $DIR/dont-infer-static.rs:12:5 | LL | bar: Bar //~ ERROR 22:5: 22:16: the parameter type `U` may not live long enough [E0310] | ^^^^^^^^^^^ diff --git a/src/test/ui/rfc-2093-infer-outlives/enum.rs b/src/test/ui/rfc-2093-infer-outlives/enum.rs index 5071465b5f647..fac06346e618f 100644 --- a/src/test/ui/rfc-2093-infer-outlives/enum.rs +++ b/src/test/ui/rfc-2093-infer-outlives/enum.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // Needs an explicit where clause stating outlives condition. (RFC 2093) diff --git a/src/test/ui/rfc-2093-infer-outlives/enum.stderr b/src/test/ui/rfc-2093-infer-outlives/enum.stderr index 604dd0b43c04a..cb8c2de6a75cc 100644 --- a/src/test/ui/rfc-2093-infer-outlives/enum.stderr +++ b/src/test/ui/rfc-2093-infer-outlives/enum.stderr @@ -1,5 +1,5 @@ error[E0309]: the parameter type `U` may not live long enough - --> $DIR/enum.rs:23:5 + --> $DIR/enum.rs:13:5 | LL | struct Bar<'b, U> { | - help: consider adding an explicit lifetime bound `U: 'b`... @@ -7,13 +7,13 @@ LL | field2: &'b U //~ ERROR the parameter type `U` may not live long enough | ^^^^^^^^^^^^^ | note: ...so that the reference type `&'b U` does not outlive the data it points at - --> $DIR/enum.rs:23:5 + --> $DIR/enum.rs:13:5 | LL | field2: &'b U //~ ERROR the parameter type `U` may not live long enough [E0309] | ^^^^^^^^^^^^^ error[E0309]: the parameter type `K` may not live long enough - --> $DIR/enum.rs:30:9 + --> $DIR/enum.rs:20:9 | LL | enum Ying<'c, K> { | - help: consider adding an explicit lifetime bound `K: 'c`... @@ -21,7 +21,7 @@ LL | One(&'c Yang) //~ ERROR the parameter type `K` may not live long eno | ^^^^^^^^^^^ | note: ...so that the reference type `&'c Yang` does not outlive the data it points at - --> $DIR/enum.rs:30:9 + --> $DIR/enum.rs:20:9 | LL | One(&'c Yang) //~ ERROR the parameter type `K` may not live long enough [E0309] | ^^^^^^^^^^^ diff --git a/src/test/ui/rfc-2093-infer-outlives/explicit-dyn.rs b/src/test/ui/rfc-2093-infer-outlives/explicit-dyn.rs index 445c246a12067..258a00de701b3 100644 --- a/src/test/ui/rfc-2093-infer-outlives/explicit-dyn.rs +++ b/src/test/ui/rfc-2093-infer-outlives/explicit-dyn.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(dyn_trait)] #![feature(rustc_attrs)] #![feature(infer_outlives_requirements)] diff --git a/src/test/ui/rfc-2093-infer-outlives/explicit-dyn.stderr b/src/test/ui/rfc-2093-infer-outlives/explicit-dyn.stderr index 4bb5d90e9644e..360f6310539dd 100644 --- a/src/test/ui/rfc-2093-infer-outlives/explicit-dyn.stderr +++ b/src/test/ui/rfc-2093-infer-outlives/explicit-dyn.stderr @@ -1,5 +1,5 @@ error: rustc_outlives - --> $DIR/explicit-dyn.rs:19:1 + --> $DIR/explicit-dyn.rs:9:1 | LL | / struct Foo<'a, A> //~ ERROR 19:1: 22:2: rustc_outlives LL | | { diff --git a/src/test/ui/rfc-2093-infer-outlives/explicit-enum.rs b/src/test/ui/rfc-2093-infer-outlives/explicit-enum.rs index e85b49bb0bf23..0121783698782 100644 --- a/src/test/ui/rfc-2093-infer-outlives/explicit-enum.rs +++ b/src/test/ui/rfc-2093-infer-outlives/explicit-enum.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![feature(infer_outlives_requirements)] diff --git a/src/test/ui/rfc-2093-infer-outlives/explicit-enum.stderr b/src/test/ui/rfc-2093-infer-outlives/explicit-enum.stderr index d7438758d77af..2d47f20712c60 100644 --- a/src/test/ui/rfc-2093-infer-outlives/explicit-enum.stderr +++ b/src/test/ui/rfc-2093-infer-outlives/explicit-enum.stderr @@ -1,5 +1,5 @@ error: rustc_outlives - --> $DIR/explicit-enum.rs:15:1 + --> $DIR/explicit-enum.rs:5:1 | LL | / enum Foo<'a, U> { //~ ERROR 15:1: 17:2: rustc_outlives LL | | One(Bar<'a, U>) diff --git a/src/test/ui/rfc-2093-infer-outlives/explicit-projection.rs b/src/test/ui/rfc-2093-infer-outlives/explicit-projection.rs index 2662043c36d59..afb9b29ecb140 100644 --- a/src/test/ui/rfc-2093-infer-outlives/explicit-projection.rs +++ b/src/test/ui/rfc-2093-infer-outlives/explicit-projection.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![feature(infer_outlives_requirements)] diff --git a/src/test/ui/rfc-2093-infer-outlives/explicit-projection.stderr b/src/test/ui/rfc-2093-infer-outlives/explicit-projection.stderr index 43ab02d01ed57..3b7ecc8e7fb37 100644 --- a/src/test/ui/rfc-2093-infer-outlives/explicit-projection.stderr +++ b/src/test/ui/rfc-2093-infer-outlives/explicit-projection.stderr @@ -1,5 +1,5 @@ error: rustc_outlives - --> $DIR/explicit-projection.rs:19:1 + --> $DIR/explicit-projection.rs:9:1 | LL | / struct Foo<'a, A, B> where A: Trait<'a, B> //~ ERROR rustc_outlives LL | | { diff --git a/src/test/ui/rfc-2093-infer-outlives/explicit-struct.rs b/src/test/ui/rfc-2093-infer-outlives/explicit-struct.rs index d42c9160e1e75..865526b899352 100644 --- a/src/test/ui/rfc-2093-infer-outlives/explicit-struct.rs +++ b/src/test/ui/rfc-2093-infer-outlives/explicit-struct.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![feature(infer_outlives_requirements)] diff --git a/src/test/ui/rfc-2093-infer-outlives/explicit-struct.stderr b/src/test/ui/rfc-2093-infer-outlives/explicit-struct.stderr index 0223f707e8d9b..79c75ca26698a 100644 --- a/src/test/ui/rfc-2093-infer-outlives/explicit-struct.stderr +++ b/src/test/ui/rfc-2093-infer-outlives/explicit-struct.stderr @@ -1,5 +1,5 @@ error: rustc_outlives - --> $DIR/explicit-struct.rs:15:1 + --> $DIR/explicit-struct.rs:5:1 | LL | / struct Foo<'b, U> { //~ ERROR 15:1: 17:2: rustc_outlives LL | | bar: Bar<'b, U> diff --git a/src/test/ui/rfc-2093-infer-outlives/explicit-union.rs b/src/test/ui/rfc-2093-infer-outlives/explicit-union.rs index e548b24719383..9bde17f99604a 100644 --- a/src/test/ui/rfc-2093-infer-outlives/explicit-union.rs +++ b/src/test/ui/rfc-2093-infer-outlives/explicit-union.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![feature(infer_outlives_requirements)] #![feature(untagged_unions)] diff --git a/src/test/ui/rfc-2093-infer-outlives/explicit-union.stderr b/src/test/ui/rfc-2093-infer-outlives/explicit-union.stderr index 8622ae12aa10c..a9137cdfc8f2c 100644 --- a/src/test/ui/rfc-2093-infer-outlives/explicit-union.stderr +++ b/src/test/ui/rfc-2093-infer-outlives/explicit-union.stderr @@ -1,5 +1,5 @@ error: rustc_outlives - --> $DIR/explicit-union.rs:18:1 + --> $DIR/explicit-union.rs:8:1 | LL | / union Foo<'b, U> { //~ ERROR 18:1: 20:2: rustc_outlives LL | | bar: Bar<'b, U> diff --git a/src/test/ui/rfc-2093-infer-outlives/infer-static.rs b/src/test/ui/rfc-2093-infer-outlives/infer-static.rs index aeca18c24b3db..56db8e76e47d9 100644 --- a/src/test/ui/rfc-2093-infer-outlives/infer-static.rs +++ b/src/test/ui/rfc-2093-infer-outlives/infer-static.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![feature(infer_outlives_requirements)] #![feature(infer_static_outlives_requirements)] diff --git a/src/test/ui/rfc-2093-infer-outlives/infer-static.stderr b/src/test/ui/rfc-2093-infer-outlives/infer-static.stderr index f167e522df650..7114af00f4b1d 100644 --- a/src/test/ui/rfc-2093-infer-outlives/infer-static.stderr +++ b/src/test/ui/rfc-2093-infer-outlives/infer-static.stderr @@ -1,5 +1,5 @@ error: rustc_outlives - --> $DIR/infer-static.rs:16:1 + --> $DIR/infer-static.rs:6:1 | LL | / struct Foo { //~ ERROR 16:1: 18:2: rustc_outlives LL | | bar: Bar diff --git a/src/test/ui/rfc-2093-infer-outlives/nested-enum.rs b/src/test/ui/rfc-2093-infer-outlives/nested-enum.rs index 85f381ea515c3..3c27e5e6bf5ec 100644 --- a/src/test/ui/rfc-2093-infer-outlives/nested-enum.rs +++ b/src/test/ui/rfc-2093-infer-outlives/nested-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![feature(infer_outlives_requirements)] diff --git a/src/test/ui/rfc-2093-infer-outlives/nested-enum.stderr b/src/test/ui/rfc-2093-infer-outlives/nested-enum.stderr index 54a886a92fd40..d0fb06c7a43e1 100644 --- a/src/test/ui/rfc-2093-infer-outlives/nested-enum.stderr +++ b/src/test/ui/rfc-2093-infer-outlives/nested-enum.stderr @@ -1,5 +1,5 @@ error: rustc_outlives - --> $DIR/nested-enum.rs:16:1 + --> $DIR/nested-enum.rs:6:1 | LL | / enum Foo<'a, T> { //~ ERROR 16:1: 19:2: rustc_outlives LL | | diff --git a/src/test/ui/rfc-2093-infer-outlives/nested-regions.rs b/src/test/ui/rfc-2093-infer-outlives/nested-regions.rs index 792d2a02962dc..4654ef0dfbc32 100644 --- a/src/test/ui/rfc-2093-infer-outlives/nested-regions.rs +++ b/src/test/ui/rfc-2093-infer-outlives/nested-regions.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![feature(infer_outlives_requirements)] diff --git a/src/test/ui/rfc-2093-infer-outlives/nested-regions.stderr b/src/test/ui/rfc-2093-infer-outlives/nested-regions.stderr index 04fe4814a0415..91b8feba07b7e 100644 --- a/src/test/ui/rfc-2093-infer-outlives/nested-regions.stderr +++ b/src/test/ui/rfc-2093-infer-outlives/nested-regions.stderr @@ -1,5 +1,5 @@ error: rustc_outlives - --> $DIR/nested-regions.rs:15:1 + --> $DIR/nested-regions.rs:5:1 | LL | / struct Foo<'a, 'b, T> { //~ ERROR 15:1: 17:2: rustc_outlives LL | | x: &'a &'b T diff --git a/src/test/ui/rfc-2093-infer-outlives/nested-structs.rs b/src/test/ui/rfc-2093-infer-outlives/nested-structs.rs index 71a36dfb34423..332b95e12768a 100644 --- a/src/test/ui/rfc-2093-infer-outlives/nested-structs.rs +++ b/src/test/ui/rfc-2093-infer-outlives/nested-structs.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![feature(infer_outlives_requirements)] diff --git a/src/test/ui/rfc-2093-infer-outlives/nested-structs.stderr b/src/test/ui/rfc-2093-infer-outlives/nested-structs.stderr index abea71f2d12fc..d147b615ca34e 100644 --- a/src/test/ui/rfc-2093-infer-outlives/nested-structs.stderr +++ b/src/test/ui/rfc-2093-infer-outlives/nested-structs.stderr @@ -1,5 +1,5 @@ error: rustc_outlives - --> $DIR/nested-structs.rs:15:1 + --> $DIR/nested-structs.rs:5:1 | LL | / struct Foo<'a, T> { //~ ERROR 15:1: 17:2: rustc_outlives LL | | field1: Bar<'a, T> diff --git a/src/test/ui/rfc-2093-infer-outlives/nested-union.rs b/src/test/ui/rfc-2093-infer-outlives/nested-union.rs index 0720e581e2c5b..8ffc3c7a57aa9 100644 --- a/src/test/ui/rfc-2093-infer-outlives/nested-union.rs +++ b/src/test/ui/rfc-2093-infer-outlives/nested-union.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![feature(infer_outlives_requirements)] #![feature(untagged_unions)] diff --git a/src/test/ui/rfc-2093-infer-outlives/nested-union.stderr b/src/test/ui/rfc-2093-infer-outlives/nested-union.stderr index b7b50c1506146..ad8a3f431f97b 100644 --- a/src/test/ui/rfc-2093-infer-outlives/nested-union.stderr +++ b/src/test/ui/rfc-2093-infer-outlives/nested-union.stderr @@ -1,5 +1,5 @@ error: rustc_outlives - --> $DIR/nested-union.rs:18:1 + --> $DIR/nested-union.rs:8:1 | LL | / union Foo<'a, T> { //~ ERROR 18:1: 20:2: rustc_outlives LL | | field1: Bar<'a, T> diff --git a/src/test/ui/rfc-2093-infer-outlives/projection.rs b/src/test/ui/rfc-2093-infer-outlives/projection.rs index 3abce873b28f9..ca58e5fa996ef 100644 --- a/src/test/ui/rfc-2093-infer-outlives/projection.rs +++ b/src/test/ui/rfc-2093-infer-outlives/projection.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![feature(infer_outlives_requirements)] diff --git a/src/test/ui/rfc-2093-infer-outlives/projection.stderr b/src/test/ui/rfc-2093-infer-outlives/projection.stderr index dfaf7793a51f2..4f88fa0d30594 100644 --- a/src/test/ui/rfc-2093-infer-outlives/projection.stderr +++ b/src/test/ui/rfc-2093-infer-outlives/projection.stderr @@ -1,5 +1,5 @@ error: rustc_outlives - --> $DIR/projection.rs:15:1 + --> $DIR/projection.rs:5:1 | LL | / struct Foo<'a, T: Iterator> { //~ ERROR rustc_outlives LL | | bar: &'a T::Item diff --git a/src/test/ui/rfc-2093-infer-outlives/reference.rs b/src/test/ui/rfc-2093-infer-outlives/reference.rs index 56b1bc3c7d11e..77a8a4aaf1da1 100644 --- a/src/test/ui/rfc-2093-infer-outlives/reference.rs +++ b/src/test/ui/rfc-2093-infer-outlives/reference.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![feature(infer_outlives_requirements)] diff --git a/src/test/ui/rfc-2093-infer-outlives/reference.stderr b/src/test/ui/rfc-2093-infer-outlives/reference.stderr index 785d76e8f2275..8df15e110883d 100644 --- a/src/test/ui/rfc-2093-infer-outlives/reference.stderr +++ b/src/test/ui/rfc-2093-infer-outlives/reference.stderr @@ -1,5 +1,5 @@ error: rustc_outlives - --> $DIR/reference.rs:15:1 + --> $DIR/reference.rs:5:1 | LL | / struct Foo<'a, T> { //~ ERROR rustc_outlives LL | | bar: &'a T, diff --git a/src/test/ui/rfc-2093-infer-outlives/self-dyn.rs b/src/test/ui/rfc-2093-infer-outlives/self-dyn.rs index a19bcf8afff9a..94573a39a397a 100644 --- a/src/test/ui/rfc-2093-infer-outlives/self-dyn.rs +++ b/src/test/ui/rfc-2093-infer-outlives/self-dyn.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(dyn_trait)] #![feature(rustc_attrs)] #![feature(infer_outlives_requirements)] diff --git a/src/test/ui/rfc-2093-infer-outlives/self-dyn.stderr b/src/test/ui/rfc-2093-infer-outlives/self-dyn.stderr index 546ba9db64460..a6f42f2fe6e84 100644 --- a/src/test/ui/rfc-2093-infer-outlives/self-dyn.stderr +++ b/src/test/ui/rfc-2093-infer-outlives/self-dyn.stderr @@ -1,5 +1,5 @@ error: rustc_outlives - --> $DIR/self-dyn.rs:20:1 + --> $DIR/self-dyn.rs:10:1 | LL | / struct Foo<'a, 'b, A> //~ ERROR 20:1: 23:2: rustc_outlives LL | | { diff --git a/src/test/ui/rfc-2093-infer-outlives/self-structs.rs b/src/test/ui/rfc-2093-infer-outlives/self-structs.rs index c4f8f83bdcefd..99cc5d521be9f 100644 --- a/src/test/ui/rfc-2093-infer-outlives/self-structs.rs +++ b/src/test/ui/rfc-2093-infer-outlives/self-structs.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![feature(infer_outlives_requirements)] diff --git a/src/test/ui/rfc-2093-infer-outlives/self-structs.stderr b/src/test/ui/rfc-2093-infer-outlives/self-structs.stderr index 04284577a0746..e6500ac26c36b 100644 --- a/src/test/ui/rfc-2093-infer-outlives/self-structs.stderr +++ b/src/test/ui/rfc-2093-infer-outlives/self-structs.stderr @@ -1,5 +1,5 @@ error: rustc_outlives - --> $DIR/self-structs.rs:15:1 + --> $DIR/self-structs.rs:5:1 | LL | / struct Foo<'a, 'b, T> { //~ ERROR 15:1: 17:2: rustc_outlives LL | | field1: Bar<'a, 'b, T> diff --git a/src/test/ui/rfc-2126-crate-paths/crate-path-non-absolute.rs b/src/test/ui/rfc-2126-crate-paths/crate-path-non-absolute.rs index a44ca9d2d25c9..8f73d0120a0b8 100644 --- a/src/test/ui/rfc-2126-crate-paths/crate-path-non-absolute.rs +++ b/src/test/ui/rfc-2126-crate-paths/crate-path-non-absolute.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(crate_in_paths)] struct S; diff --git a/src/test/ui/rfc-2126-crate-paths/crate-path-non-absolute.stderr b/src/test/ui/rfc-2126-crate-paths/crate-path-non-absolute.stderr index f16c849607766..84e02634aa583 100644 --- a/src/test/ui/rfc-2126-crate-paths/crate-path-non-absolute.stderr +++ b/src/test/ui/rfc-2126-crate-paths/crate-path-non-absolute.stderr @@ -1,11 +1,11 @@ error[E0433]: failed to resolve. `crate` in paths can only be used in start position - --> $DIR/crate-path-non-absolute.rs:17:22 + --> $DIR/crate-path-non-absolute.rs:7:22 | LL | let s = ::m::crate::S; //~ ERROR failed to resolve | ^^^^^ `crate` in paths can only be used in start position error[E0433]: failed to resolve. global paths cannot start with `crate` - --> $DIR/crate-path-non-absolute.rs:18:20 + --> $DIR/crate-path-non-absolute.rs:8:20 | LL | let s1 = ::crate::S; //~ ERROR failed to resolve | ^^^^^ global paths cannot start with `crate` diff --git a/src/test/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.rs b/src/test/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.rs index 3ebb3a25d8d35..ab87ecbde30e9 100644 --- a/src/test/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.rs +++ b/src/test/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(crate_in_paths)] fn main() { diff --git a/src/test/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.stderr b/src/test/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.stderr index ec44fb4db0090..e07b5d80fb806 100644 --- a/src/test/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.stderr +++ b/src/test/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.stderr @@ -1,5 +1,5 @@ error[E0532]: expected unit struct/variant or constant, found module `crate` - --> $DIR/keyword-crate-as-identifier.rs:14:9 + --> $DIR/keyword-crate-as-identifier.rs:4:9 | LL | let crate = 0; | ^^^^^ not a unit struct/variant or constant diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs b/src/test/ui/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs index c3da4a518720d..c4d4447644577 100644 --- a/src/test/ui/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs +++ b/src/test/ui/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug)] pub struct S; diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-1.rs b/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-1.rs index 826bf675bd699..b35d9a4ce66ac 100644 --- a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-1.rs +++ b/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-1.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 use xcrate::S; //~ ERROR can't find crate for `xcrate` diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-1.stderr b/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-1.stderr index 27a69ec1b1faf..3154d7e56233f 100644 --- a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-1.stderr +++ b/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-1.stderr @@ -1,5 +1,5 @@ error[E0463]: can't find crate for `xcrate` - --> $DIR/non-existent-1.rs:13:5 + --> $DIR/non-existent-1.rs:3:5 | LL | use xcrate::S; //~ ERROR can't find crate for `xcrate` | ^^^^^^ can't find crate diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.rs b/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.rs index 053bf92f4d196..35ed8aaa24cac 100644 --- a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.rs +++ b/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 fn main() { diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.stderr b/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.stderr index eb96d5f05d7a6..95e6472fae129 100644 --- a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.stderr +++ b/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.stderr @@ -1,5 +1,5 @@ error[E0463]: can't find crate for `xcrate` - --> $DIR/non-existent-2.rs:14:15 + --> $DIR/non-existent-2.rs:4:15 | LL | let s = ::xcrate::S; //~ ERROR can't find crate for `xcrate` | ^^^^^^ can't find crate diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-3.rs b/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-3.rs index 1b9e5a75e8307..9f2f13e2ae9d9 100644 --- a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-3.rs +++ b/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-3.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 use ycrate; //~ ERROR can't find crate for `ycrate` diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-3.stderr b/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-3.stderr index 434bde79a8322..653ec7569dda2 100644 --- a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-3.stderr +++ b/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-3.stderr @@ -1,5 +1,5 @@ error[E0463]: can't find crate for `ycrate` - --> $DIR/non-existent-3.rs:13:5 + --> $DIR/non-existent-3.rs:3:5 | LL | use ycrate; //~ ERROR can't find crate for `ycrate` | ^^^^^^ can't find crate diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/single-segment.rs b/src/test/ui/rfc-2126-extern-absolute-paths/single-segment.rs index 69fc4b4f7f8fc..fec3f1e71d470 100644 --- a/src/test/ui/rfc-2126-extern-absolute-paths/single-segment.rs +++ b/src/test/ui/rfc-2126-extern-absolute-paths/single-segment.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:xcrate.rs // edition:2018 diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/single-segment.stderr b/src/test/ui/rfc-2126-extern-absolute-paths/single-segment.stderr index cfb1a0ac39ac2..f4828ff7826e8 100644 --- a/src/test/ui/rfc-2126-extern-absolute-paths/single-segment.stderr +++ b/src/test/ui/rfc-2126-extern-absolute-paths/single-segment.stderr @@ -1,17 +1,17 @@ error: crate root imports need to be explicitly named: `use crate as name;` - --> $DIR/single-segment.rs:14:5 + --> $DIR/single-segment.rs:4:5 | LL | use crate; //~ ERROR crate root imports need to be explicitly named: `use crate as name;` | ^^^^^ error: cannot glob-import all possible crates - --> $DIR/single-segment.rs:15:5 + --> $DIR/single-segment.rs:5:5 | LL | use *; //~ ERROR cannot glob-import all possible crates | ^ error[E0423]: expected value, found module `xcrate` - --> $DIR/single-segment.rs:18:13 + --> $DIR/single-segment.rs:8:13 | LL | let s = ::xcrate; //~ ERROR expected value, found module `xcrate` | ^^^^^^^^ not a value diff --git a/src/test/ui/rfc-2126-extern-in-paths/auxiliary/xcrate.rs b/src/test/ui/rfc-2126-extern-in-paths/auxiliary/xcrate.rs index c3da4a518720d..c4d4447644577 100644 --- a/src/test/ui/rfc-2126-extern-in-paths/auxiliary/xcrate.rs +++ b/src/test/ui/rfc-2126-extern-in-paths/auxiliary/xcrate.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug)] pub struct S; diff --git a/src/test/ui/rfc-2126-extern-in-paths/non-existent-1.rs b/src/test/ui/rfc-2126-extern-in-paths/non-existent-1.rs index 7eba02ed444bb..75b41e3e30792 100644 --- a/src/test/ui/rfc-2126-extern-in-paths/non-existent-1.rs +++ b/src/test/ui/rfc-2126-extern-in-paths/non-existent-1.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(extern_in_paths)] use extern::xcrate::S; //~ ERROR can't find crate for `xcrate` diff --git a/src/test/ui/rfc-2126-extern-in-paths/non-existent-1.stderr b/src/test/ui/rfc-2126-extern-in-paths/non-existent-1.stderr index c25698c395e1c..04f8c37a2f230 100644 --- a/src/test/ui/rfc-2126-extern-in-paths/non-existent-1.stderr +++ b/src/test/ui/rfc-2126-extern-in-paths/non-existent-1.stderr @@ -1,5 +1,5 @@ error[E0463]: can't find crate for `xcrate` - --> $DIR/non-existent-1.rs:13:13 + --> $DIR/non-existent-1.rs:3:13 | LL | use extern::xcrate::S; //~ ERROR can't find crate for `xcrate` | ^^^^^^ can't find crate diff --git a/src/test/ui/rfc-2126-extern-in-paths/non-existent-2.rs b/src/test/ui/rfc-2126-extern-in-paths/non-existent-2.rs index 4d09a05253ec2..c41baf511ebf0 100644 --- a/src/test/ui/rfc-2126-extern-in-paths/non-existent-2.rs +++ b/src/test/ui/rfc-2126-extern-in-paths/non-existent-2.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(extern_in_paths)] fn main() { diff --git a/src/test/ui/rfc-2126-extern-in-paths/non-existent-2.stderr b/src/test/ui/rfc-2126-extern-in-paths/non-existent-2.stderr index b7ca8890c1942..75b11a9b7305c 100644 --- a/src/test/ui/rfc-2126-extern-in-paths/non-existent-2.stderr +++ b/src/test/ui/rfc-2126-extern-in-paths/non-existent-2.stderr @@ -1,5 +1,5 @@ error[E0463]: can't find crate for `xcrate` - --> $DIR/non-existent-2.rs:14:21 + --> $DIR/non-existent-2.rs:4:21 | LL | let s = extern::xcrate::S; //~ ERROR can't find crate for `xcrate` | ^^^^^^ can't find crate diff --git a/src/test/ui/rfc-2126-extern-in-paths/non-existent-3.rs b/src/test/ui/rfc-2126-extern-in-paths/non-existent-3.rs index 402d294b2e324..f51b0a1e6f865 100644 --- a/src/test/ui/rfc-2126-extern-in-paths/non-existent-3.rs +++ b/src/test/ui/rfc-2126-extern-in-paths/non-existent-3.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(extern_in_paths)] use extern::ycrate; //~ ERROR can't find crate for `ycrate` diff --git a/src/test/ui/rfc-2126-extern-in-paths/non-existent-3.stderr b/src/test/ui/rfc-2126-extern-in-paths/non-existent-3.stderr index fbea89ae93a97..2d6d5fb4d0a3c 100644 --- a/src/test/ui/rfc-2126-extern-in-paths/non-existent-3.stderr +++ b/src/test/ui/rfc-2126-extern-in-paths/non-existent-3.stderr @@ -1,5 +1,5 @@ error[E0463]: can't find crate for `ycrate` - --> $DIR/non-existent-3.rs:13:13 + --> $DIR/non-existent-3.rs:3:13 | LL | use extern::ycrate; //~ ERROR can't find crate for `ycrate` | ^^^^^^ can't find crate diff --git a/src/test/ui/rfc-2126-extern-in-paths/single-segment.rs b/src/test/ui/rfc-2126-extern-in-paths/single-segment.rs index 017844a0252e2..be2ab5eb88a7a 100644 --- a/src/test/ui/rfc-2126-extern-in-paths/single-segment.rs +++ b/src/test/ui/rfc-2126-extern-in-paths/single-segment.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:xcrate.rs #![feature(extern_in_paths)] diff --git a/src/test/ui/rfc-2126-extern-in-paths/single-segment.stderr b/src/test/ui/rfc-2126-extern-in-paths/single-segment.stderr index 8b1dd89fe3ca7..e54d56ae74e9f 100644 --- a/src/test/ui/rfc-2126-extern-in-paths/single-segment.stderr +++ b/src/test/ui/rfc-2126-extern-in-paths/single-segment.stderr @@ -1,17 +1,17 @@ error: cannot glob-import all possible crates - --> $DIR/single-segment.rs:17:5 + --> $DIR/single-segment.rs:7:5 | LL | use extern::*; //~ ERROR cannot glob-import all possible crates | ^^^^^^^^^ error[E0432]: unresolved import `extern` - --> $DIR/single-segment.rs:15:5 + --> $DIR/single-segment.rs:5:5 | LL | use extern; //~ ERROR unresolved import `extern` | ^^^^^^ no `extern` in the root error[E0423]: expected value, found module `extern::xcrate` - --> $DIR/single-segment.rs:20:13 + --> $DIR/single-segment.rs:10:13 | LL | let s = extern::xcrate; //~ ERROR expected value, found module `extern::xcrate` | ^^^^^^^^^^^^^^ not a value diff --git a/src/test/ui/rfc-2166-underscore-imports/basic.rs b/src/test/ui/rfc-2166-underscore-imports/basic.rs index 89771be7bc84f..ca92f407846f1 100644 --- a/src/test/ui/rfc-2166-underscore-imports/basic.rs +++ b/src/test/ui/rfc-2166-underscore-imports/basic.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![feature(underscore_imports)] diff --git a/src/test/ui/rfc-2166-underscore-imports/basic.stderr b/src/test/ui/rfc-2166-underscore-imports/basic.stderr index c12c74b50e264..02c4e175258b0 100644 --- a/src/test/ui/rfc-2166-underscore-imports/basic.stderr +++ b/src/test/ui/rfc-2166-underscore-imports/basic.stderr @@ -1,29 +1,29 @@ warning: unused import: `m::Tr1 as _` - --> $DIR/basic.rs:31:9 + --> $DIR/basic.rs:21:9 | LL | use m::Tr1 as _; //~ WARN unused import | ^^^^^^^^^^^ | note: lint level defined here - --> $DIR/basic.rs:14:9 + --> $DIR/basic.rs:4:9 | LL | #![warn(unused_imports, unused_extern_crates)] | ^^^^^^^^^^^^^^ warning: unused import: `S as _` - --> $DIR/basic.rs:32:9 + --> $DIR/basic.rs:22:9 | LL | use S as _; //~ WARN unused import | ^^^^^^ warning: unused extern crate - --> $DIR/basic.rs:33:5 + --> $DIR/basic.rs:23:5 | LL | extern crate core as _; //~ WARN unused extern crate | ^^^^^^^^^^^^^^^^^^^^^^^ help: remove it | note: lint level defined here - --> $DIR/basic.rs:14:25 + --> $DIR/basic.rs:4:25 | LL | #![warn(unused_imports, unused_extern_crates)] | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/rfc-2306/convert-id-const-no-gate.rs b/src/test/ui/rfc-2306/convert-id-const-no-gate.rs index 545c179dec9fc..150d68c3af1ef 100644 --- a/src/test/ui/rfc-2306/convert-id-const-no-gate.rs +++ b/src/test/ui/rfc-2306/convert-id-const-no-gate.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test should fail since identity is not stable as a const fn yet. #![feature(convert_id)] diff --git a/src/test/ui/rfc-2306/convert-id-const-no-gate.stderr b/src/test/ui/rfc-2306/convert-id-const-no-gate.stderr index dfd8619d87516..3a4d88cecece4 100644 --- a/src/test/ui/rfc-2306/convert-id-const-no-gate.stderr +++ b/src/test/ui/rfc-2306/convert-id-const-no-gate.stderr @@ -1,5 +1,5 @@ error: `std::convert::identity` is not yet stable as a const fn - --> $DIR/convert-id-const-no-gate.rs:16:22 + --> $DIR/convert-id-const-no-gate.rs:6:22 | LL | const _FOO: u8 = ::std::convert::identity(42u8); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/rfc-2306/convert-id-const-with-gate.rs b/src/test/ui/rfc-2306/convert-id-const-with-gate.rs index c546f11914f81..5a102ecf0c3b3 100644 --- a/src/test/ui/rfc-2306/convert-id-const-with-gate.rs +++ b/src/test/ui/rfc-2306/convert-id-const-with-gate.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test should pass since we've opted into 'identity' as an // unstable const fn. diff --git a/src/test/ui/rfc1445/feature-gate.no_gate.stderr b/src/test/ui/rfc1445/feature-gate.no_gate.stderr index 1141b79c7c69f..8c6a08d84a493 100644 --- a/src/test/ui/rfc1445/feature-gate.no_gate.stderr +++ b/src/test/ui/rfc1445/feature-gate.no_gate.stderr @@ -1,5 +1,5 @@ error[E0658]: the semantics of constant patterns is not yet settled (see issue #31434) - --> $DIR/feature-gate.rs:23:1 + --> $DIR/feature-gate.rs:13:1 | LL | #[structural_match] //[no_gate]~ ERROR semantics of constant patterns is not yet settled | ^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/rfc1445/feature-gate.rs b/src/test/ui/rfc1445/feature-gate.rs index f729220eabbc3..550610c5444e9 100644 --- a/src/test/ui/rfc1445/feature-gate.rs +++ b/src/test/ui/rfc1445/feature-gate.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that structural match is only permitted with a feature gate, // and that if a feature gate is supplied, it permits the type to be // used in a match. diff --git a/src/test/ui/rfc1445/feature-gate.with_gate.stderr b/src/test/ui/rfc1445/feature-gate.with_gate.stderr index 87835162c93f6..da681662c2fa8 100644 --- a/src/test/ui/rfc1445/feature-gate.with_gate.stderr +++ b/src/test/ui/rfc1445/feature-gate.with_gate.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/feature-gate.rs:31:1 + --> $DIR/feature-gate.rs:21:1 | LL | / fn main() { //[with_gate]~ ERROR compilation successful LL | | let y = Foo { x: 1 }; diff --git a/src/test/ui/rfc1445/match-forbidden-without-eq.rs b/src/test/ui/rfc1445/match-forbidden-without-eq.rs index ca9af78dd9936..78d799e2b01db 100644 --- a/src/test/ui/rfc1445/match-forbidden-without-eq.rs +++ b/src/test/ui/rfc1445/match-forbidden-without-eq.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::f32; #[derive(PartialEq)] diff --git a/src/test/ui/rfc1445/match-forbidden-without-eq.stderr b/src/test/ui/rfc1445/match-forbidden-without-eq.stderr index a2cb536b2127d..ebea2f364ec88 100644 --- a/src/test/ui/rfc1445/match-forbidden-without-eq.stderr +++ b/src/test/ui/rfc1445/match-forbidden-without-eq.stderr @@ -1,11 +1,11 @@ error: to use a constant of type `Foo` in a pattern, `Foo` must be annotated with `#[derive(PartialEq, Eq)]` - --> $DIR/match-forbidden-without-eq.rs:23:9 + --> $DIR/match-forbidden-without-eq.rs:13:9 | LL | FOO => { } | ^^^ warning: floating-point types cannot be used in patterns - --> $DIR/match-forbidden-without-eq.rs:30:9 + --> $DIR/match-forbidden-without-eq.rs:20:9 | LL | f32::INFINITY => { } | ^^^^^^^^^^^^^ diff --git a/src/test/ui/rfc1445/match-requires-both-partialeq-and-eq.rs b/src/test/ui/rfc1445/match-requires-both-partialeq-and-eq.rs index e02f9153e7ead..6b7d94603b567 100644 --- a/src/test/ui/rfc1445/match-requires-both-partialeq-and-eq.rs +++ b/src/test/ui/rfc1445/match-requires-both-partialeq-and-eq.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Eq)] struct Foo { x: u32 diff --git a/src/test/ui/rfc1445/match-requires-both-partialeq-and-eq.stderr b/src/test/ui/rfc1445/match-requires-both-partialeq-and-eq.stderr index 60f3191cd2767..4157cf65283e3 100644 --- a/src/test/ui/rfc1445/match-requires-both-partialeq-and-eq.stderr +++ b/src/test/ui/rfc1445/match-requires-both-partialeq-and-eq.stderr @@ -1,5 +1,5 @@ error: to use a constant of type `Foo` in a pattern, `Foo` must be annotated with `#[derive(PartialEq, Eq)]` - --> $DIR/match-requires-both-partialeq-and-eq.rs:27:9 + --> $DIR/match-requires-both-partialeq-and-eq.rs:17:9 | LL | FOO => { } | ^^^ diff --git a/src/test/ui/rfc1598-generic-associated-types/collections.rs b/src/test/ui/rfc1598-generic-associated-types/collections.rs index a6dbb03d379db..e1a65c28803e2 100644 --- a/src/test/ui/rfc1598-generic-associated-types/collections.rs +++ b/src/test/ui/rfc1598-generic-associated-types/collections.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generic_associated_types)] //~^ WARNING the feature `generic_associated_types` is incomplete #![feature(associated_type_defaults)] diff --git a/src/test/ui/rfc1598-generic-associated-types/collections.stderr b/src/test/ui/rfc1598-generic-associated-types/collections.stderr index 0e7d6ace1bb1d..e90a6b8ad138c 100644 --- a/src/test/ui/rfc1598-generic-associated-types/collections.stderr +++ b/src/test/ui/rfc1598-generic-associated-types/collections.stderr @@ -1,35 +1,35 @@ warning: the feature `generic_associated_types` is incomplete and may cause the compiler to crash - --> $DIR/collections.rs:11:12 + --> $DIR/collections.rs:1:12 | LL | #![feature(generic_associated_types)] | ^^^^^^^^^^^^^^^^^^^^^^^^ error[E0109]: type parameters are not allowed on this type - --> $DIR/collections.rs:66:90 + --> $DIR/collections.rs:56:90 | LL | fn floatify(ints: &C) -> <>::Family as CollectionFamily>::Member | ^^^ type parameter not allowed error[E0109]: type parameters are not allowed on this type - --> $DIR/collections.rs:78:69 + --> $DIR/collections.rs:68:69 | LL | fn floatify_sibling(ints: &C) -> >::Sibling | ^^^ type parameter not allowed error[E0109]: type parameters are not allowed on this type - --> $DIR/collections.rs:27:71 + --> $DIR/collections.rs:17:71 | LL | <>::Family as CollectionFamily>::Member; | ^ type parameter not allowed error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/collections.rs:34:50 + --> $DIR/collections.rs:24:50 | LL | fn iterate<'iter>(&'iter self) -> Self::Iter<'iter>; | ^^^^^ lifetime parameter not allowed error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/collections.rs:60:50 + --> $DIR/collections.rs:50:50 | LL | fn iterate<'iter>(&'iter self) -> Self::Iter<'iter> { | ^^^^^ lifetime parameter not allowed diff --git a/src/test/ui/rfc1598-generic-associated-types/construct_with_other_type.rs b/src/test/ui/rfc1598-generic-associated-types/construct_with_other_type.rs index 88a660b3a5afe..85935d1cca6bf 100644 --- a/src/test/ui/rfc1598-generic-associated-types/construct_with_other_type.rs +++ b/src/test/ui/rfc1598-generic-associated-types/construct_with_other_type.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generic_associated_types)] //~^ WARNING the feature `generic_associated_types` is incomplete diff --git a/src/test/ui/rfc1598-generic-associated-types/construct_with_other_type.stderr b/src/test/ui/rfc1598-generic-associated-types/construct_with_other_type.stderr index 5c85698fa55c7..100809f62a55c 100644 --- a/src/test/ui/rfc1598-generic-associated-types/construct_with_other_type.stderr +++ b/src/test/ui/rfc1598-generic-associated-types/construct_with_other_type.stderr @@ -1,23 +1,23 @@ warning: the feature `generic_associated_types` is incomplete and may cause the compiler to crash - --> $DIR/construct_with_other_type.rs:11:12 + --> $DIR/construct_with_other_type.rs:1:12 | LL | #![feature(generic_associated_types)] | ^^^^^^^^^^^^^^^^^^^^^^^^ error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/construct_with_other_type.rs:27:46 + --> $DIR/construct_with_other_type.rs:17:46 | LL | type Baa<'a>: Deref as Foo>::Bar<'a, 'static>>; | ^^ lifetime parameter not allowed error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/construct_with_other_type.rs:27:63 + --> $DIR/construct_with_other_type.rs:17:63 | LL | type Baa<'a>: Deref as Foo>::Bar<'a, 'static>>; | ^^ lifetime parameter not allowed error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/construct_with_other_type.rs:35:40 + --> $DIR/construct_with_other_type.rs:25:40 | LL | type Baa<'a> = &'a ::Bar<'a, 'static>; | ^^ lifetime parameter not allowed diff --git a/src/test/ui/rfc1598-generic-associated-types/empty_generics.rs b/src/test/ui/rfc1598-generic-associated-types/empty_generics.rs index d8a2a1b73f7ef..158ebc7d3888a 100644 --- a/src/test/ui/rfc1598-generic-associated-types/empty_generics.rs +++ b/src/test/ui/rfc1598-generic-associated-types/empty_generics.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generic_associated_types)] //~^ WARNING the feature `generic_associated_types` is incomplete diff --git a/src/test/ui/rfc1598-generic-associated-types/empty_generics.stderr b/src/test/ui/rfc1598-generic-associated-types/empty_generics.stderr index 2670c3aa142b2..2a01b2a3f0fa5 100644 --- a/src/test/ui/rfc1598-generic-associated-types/empty_generics.stderr +++ b/src/test/ui/rfc1598-generic-associated-types/empty_generics.stderr @@ -1,11 +1,11 @@ error: expected one of `>`, identifier, or lifetime, found `,` - --> $DIR/empty_generics.rs:15:14 + --> $DIR/empty_generics.rs:5:14 | LL | type Bar<,>; | ^ expected one of `>`, identifier, or lifetime here warning: the feature `generic_associated_types` is incomplete and may cause the compiler to crash - --> $DIR/empty_generics.rs:11:12 + --> $DIR/empty_generics.rs:1:12 | LL | #![feature(generic_associated_types)] | ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/rfc1598-generic-associated-types/gat-incomplete-warning.rs b/src/test/ui/rfc1598-generic-associated-types/gat-incomplete-warning.rs index 7f48408b369fd..33593884de31f 100644 --- a/src/test/ui/rfc1598-generic-associated-types/gat-incomplete-warning.rs +++ b/src/test/ui/rfc1598-generic-associated-types/gat-incomplete-warning.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass #![feature(generic_associated_types)] diff --git a/src/test/ui/rfc1598-generic-associated-types/gat-incomplete-warning.stderr b/src/test/ui/rfc1598-generic-associated-types/gat-incomplete-warning.stderr index 67682dcb8fb1b..6953a28a23b1c 100644 --- a/src/test/ui/rfc1598-generic-associated-types/gat-incomplete-warning.stderr +++ b/src/test/ui/rfc1598-generic-associated-types/gat-incomplete-warning.stderr @@ -1,5 +1,5 @@ warning: the feature `generic_associated_types` is incomplete and may cause the compiler to crash - --> $DIR/gat-incomplete-warning.rs:13:12 + --> $DIR/gat-incomplete-warning.rs:3:12 | LL | #![feature(generic_associated_types)] | ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/rfc1598-generic-associated-types/generic-associated-types-where.rs b/src/test/ui/rfc1598-generic-associated-types/generic-associated-types-where.rs index 9b59b24b105d2..1c46658d91da4 100644 --- a/src/test/ui/rfc1598-generic-associated-types/generic-associated-types-where.rs +++ b/src/test/ui/rfc1598-generic-associated-types/generic-associated-types-where.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generic_associated_types)] // Checking the interaction with this other feature diff --git a/src/test/ui/rfc1598-generic-associated-types/generic-associated-types-where.stderr b/src/test/ui/rfc1598-generic-associated-types/generic-associated-types-where.stderr index 97d5482735f86..b323104048f66 100644 --- a/src/test/ui/rfc1598-generic-associated-types/generic-associated-types-where.stderr +++ b/src/test/ui/rfc1598-generic-associated-types/generic-associated-types-where.stderr @@ -1,5 +1,5 @@ warning: the feature `generic_associated_types` is incomplete and may cause the compiler to crash - --> $DIR/generic-associated-types-where.rs:11:12 + --> $DIR/generic-associated-types-where.rs:1:12 | LL | #![feature(generic_associated_types)] | ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/rfc1598-generic-associated-types/generic_associated_type_undeclared_lifetimes.rs b/src/test/ui/rfc1598-generic-associated-types/generic_associated_type_undeclared_lifetimes.rs index 267272ded8c06..bfdd12003885a 100644 --- a/src/test/ui/rfc1598-generic-associated-types/generic_associated_type_undeclared_lifetimes.rs +++ b/src/test/ui/rfc1598-generic-associated-types/generic_associated_type_undeclared_lifetimes.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generic_associated_types)] //~^ WARNING the feature `generic_associated_types` is incomplete diff --git a/src/test/ui/rfc1598-generic-associated-types/generic_associated_type_undeclared_lifetimes.stderr b/src/test/ui/rfc1598-generic-associated-types/generic_associated_type_undeclared_lifetimes.stderr index 79b29902ccdf0..f5b42866dc6b4 100644 --- a/src/test/ui/rfc1598-generic-associated-types/generic_associated_type_undeclared_lifetimes.stderr +++ b/src/test/ui/rfc1598-generic-associated-types/generic_associated_type_undeclared_lifetimes.stderr @@ -1,35 +1,35 @@ warning: the feature `generic_associated_types` is incomplete and may cause the compiler to crash - --> $DIR/generic_associated_type_undeclared_lifetimes.rs:11:12 + --> $DIR/generic_associated_type_undeclared_lifetimes.rs:1:12 | LL | #![feature(generic_associated_types)] | ^^^^^^^^^^^^^^^^^^^^^^^^ error[E0261]: use of undeclared lifetime name `'b` - --> $DIR/generic_associated_type_undeclared_lifetimes.rs:23:37 + --> $DIR/generic_associated_type_undeclared_lifetimes.rs:13:37 | LL | + Deref>; | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'undeclared` - --> $DIR/generic_associated_type_undeclared_lifetimes.rs:27:41 + --> $DIR/generic_associated_type_undeclared_lifetimes.rs:17:41 | LL | fn iter<'a>(&'a self) -> Self::Iter<'undeclared>; | ^^^^^^^^^^^ undeclared lifetime error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/generic_associated_type_undeclared_lifetimes.rs:21:47 + --> $DIR/generic_associated_type_undeclared_lifetimes.rs:11:47 | LL | type Iter<'a>: Iterator> | ^^ lifetime parameter not allowed error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/generic_associated_type_undeclared_lifetimes.rs:23:37 + --> $DIR/generic_associated_type_undeclared_lifetimes.rs:13:37 | LL | + Deref>; | ^^ lifetime parameter not allowed error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/generic_associated_type_undeclared_lifetimes.rs:27:41 + --> $DIR/generic_associated_type_undeclared_lifetimes.rs:17:41 | LL | fn iter<'a>(&'a self) -> Self::Iter<'undeclared>; | ^^^^^^^^^^^ lifetime parameter not allowed diff --git a/src/test/ui/rfc1598-generic-associated-types/iterable.rs b/src/test/ui/rfc1598-generic-associated-types/iterable.rs index b52b6e024219a..16ed4a7546cc3 100644 --- a/src/test/ui/rfc1598-generic-associated-types/iterable.rs +++ b/src/test/ui/rfc1598-generic-associated-types/iterable.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generic_associated_types)] //~^ WARNING the feature `generic_associated_types` is incomplete diff --git a/src/test/ui/rfc1598-generic-associated-types/iterable.stderr b/src/test/ui/rfc1598-generic-associated-types/iterable.stderr index de3563c14eb7c..41943d7d325e9 100644 --- a/src/test/ui/rfc1598-generic-associated-types/iterable.stderr +++ b/src/test/ui/rfc1598-generic-associated-types/iterable.stderr @@ -1,41 +1,41 @@ warning: the feature `generic_associated_types` is incomplete and may cause the compiler to crash - --> $DIR/iterable.rs:11:12 + --> $DIR/iterable.rs:1:12 | LL | #![feature(generic_associated_types)] | ^^^^^^^^^^^^^^^^^^^^^^^^ error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/iterable.rs:21:47 + --> $DIR/iterable.rs:11:47 | LL | type Iter<'a>: Iterator>; | ^^ lifetime parameter not allowed error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/iterable.rs:50:53 + --> $DIR/iterable.rs:40:53 | LL | fn make_iter<'a, I: Iterable>(it: &'a I) -> I::Iter<'a> { | ^^ lifetime parameter not allowed error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/iterable.rs:55:60 + --> $DIR/iterable.rs:45:60 | LL | fn get_first<'a, I: Iterable>(it: &'a I) -> Option> { | ^^ lifetime parameter not allowed error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/iterable.rs:24:41 + --> $DIR/iterable.rs:14:41 | LL | fn iter<'a>(&'a self) -> Self::Iter<'a>; | ^^ lifetime parameter not allowed error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/iterable.rs:33:41 + --> $DIR/iterable.rs:23:41 | LL | fn iter<'a>(&'a self) -> Self::Iter<'a> { | ^^ lifetime parameter not allowed error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/iterable.rs:44:41 + --> $DIR/iterable.rs:34:41 | LL | fn iter<'a>(&'a self) -> Self::Iter<'a> { | ^^ lifetime parameter not allowed diff --git a/src/test/ui/rfc1598-generic-associated-types/parameter_number_and_kind.rs b/src/test/ui/rfc1598-generic-associated-types/parameter_number_and_kind.rs index 82e82e6dbccaf..098d52b20faae 100644 --- a/src/test/ui/rfc1598-generic-associated-types/parameter_number_and_kind.rs +++ b/src/test/ui/rfc1598-generic-associated-types/parameter_number_and_kind.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generic_associated_types)] //~^ WARNING the feature `generic_associated_types` is incomplete #![feature(associated_type_defaults)] diff --git a/src/test/ui/rfc1598-generic-associated-types/parameter_number_and_kind.stderr b/src/test/ui/rfc1598-generic-associated-types/parameter_number_and_kind.stderr index e47daf2ae1bba..dfd1648e5c0d6 100644 --- a/src/test/ui/rfc1598-generic-associated-types/parameter_number_and_kind.stderr +++ b/src/test/ui/rfc1598-generic-associated-types/parameter_number_and_kind.stderr @@ -1,35 +1,35 @@ warning: the feature `generic_associated_types` is incomplete and may cause the compiler to crash - --> $DIR/parameter_number_and_kind.rs:11:12 + --> $DIR/parameter_number_and_kind.rs:1:12 | LL | #![feature(generic_associated_types)] | ^^^^^^^^^^^^^^^^^^^^^^^^ error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/parameter_number_and_kind.rs:27:27 + --> $DIR/parameter_number_and_kind.rs:17:27 | LL | type FOk = Self::E<'static, T>; | ^^^^^^^ lifetime parameter not allowed error[E0109]: type parameters are not allowed on this type - --> $DIR/parameter_number_and_kind.rs:27:36 + --> $DIR/parameter_number_and_kind.rs:17:36 | LL | type FOk = Self::E<'static, T>; | ^ type parameter not allowed error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/parameter_number_and_kind.rs:30:26 + --> $DIR/parameter_number_and_kind.rs:20:26 | LL | type FErr1 = Self::E<'static, 'static>; // Error | ^^^^^^^ lifetime parameter not allowed error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/parameter_number_and_kind.rs:32:29 + --> $DIR/parameter_number_and_kind.rs:22:29 | LL | type FErr2 = Self::E<'static, T, u32>; // Error | ^^^^^^^ lifetime parameter not allowed error[E0109]: type parameters are not allowed on this type - --> $DIR/parameter_number_and_kind.rs:32:38 + --> $DIR/parameter_number_and_kind.rs:22:38 | LL | type FErr2 = Self::E<'static, T, u32>; // Error | ^ type parameter not allowed diff --git a/src/test/ui/rfc1598-generic-associated-types/parse/in-trait-impl.rs b/src/test/ui/rfc1598-generic-associated-types/parse/in-trait-impl.rs index 90aaddecfe79b..58353052b410b 100644 --- a/src/test/ui/rfc1598-generic-associated-types/parse/in-trait-impl.rs +++ b/src/test/ui/rfc1598-generic-associated-types/parse/in-trait-impl.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // compile-pass diff --git a/src/test/ui/rfc1598-generic-associated-types/parse/in-trait.rs b/src/test/ui/rfc1598-generic-associated-types/parse/in-trait.rs index 8179bf263ed02..e295463813915 100644 --- a/src/test/ui/rfc1598-generic-associated-types/parse/in-trait.rs +++ b/src/test/ui/rfc1598-generic-associated-types/parse/in-trait.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // compile-pass diff --git a/src/test/ui/rfc1598-generic-associated-types/pointer_family.rs b/src/test/ui/rfc1598-generic-associated-types/pointer_family.rs index 0300ad06194e7..e11670ce1b316 100644 --- a/src/test/ui/rfc1598-generic-associated-types/pointer_family.rs +++ b/src/test/ui/rfc1598-generic-associated-types/pointer_family.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generic_associated_types)] //~^ WARNING the feature `generic_associated_types` is incomplete diff --git a/src/test/ui/rfc1598-generic-associated-types/pointer_family.stderr b/src/test/ui/rfc1598-generic-associated-types/pointer_family.stderr index 3be0481dc67e8..29c442a79e628 100644 --- a/src/test/ui/rfc1598-generic-associated-types/pointer_family.stderr +++ b/src/test/ui/rfc1598-generic-associated-types/pointer_family.stderr @@ -1,29 +1,29 @@ warning: the feature `generic_associated_types` is incomplete and may cause the compiler to crash - --> $DIR/pointer_family.rs:11:12 + --> $DIR/pointer_family.rs:1:12 | LL | #![feature(generic_associated_types)] | ^^^^^^^^^^^^^^^^^^^^^^^^ error[E0109]: type parameters are not allowed on this type - --> $DIR/pointer_family.rs:47:21 + --> $DIR/pointer_family.rs:37:21 | LL | bar: P::Pointer, | ^^^^^^ type parameter not allowed error[E0109]: type parameters are not allowed on this type - --> $DIR/pointer_family.rs:22:42 + --> $DIR/pointer_family.rs:12:42 | LL | fn new(value: T) -> Self::Pointer; | ^ type parameter not allowed error[E0109]: type parameters are not allowed on this type - --> $DIR/pointer_family.rs:30:42 + --> $DIR/pointer_family.rs:20:42 | LL | fn new(value: T) -> Self::Pointer { | ^ type parameter not allowed error[E0109]: type parameters are not allowed on this type - --> $DIR/pointer_family.rs:40:42 + --> $DIR/pointer_family.rs:30:42 | LL | fn new(value: T) -> Self::Pointer { | ^ type parameter not allowed diff --git a/src/test/ui/rfc1598-generic-associated-types/shadowing.rs b/src/test/ui/rfc1598-generic-associated-types/shadowing.rs index ddc6a29a8f0bd..82a7c2510e5d7 100644 --- a/src/test/ui/rfc1598-generic-associated-types/shadowing.rs +++ b/src/test/ui/rfc1598-generic-associated-types/shadowing.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generic_associated_types)] //FIXME(#44265): The lifetime shadowing and type parameter shadowing diff --git a/src/test/ui/rfc1598-generic-associated-types/shadowing.stderr b/src/test/ui/rfc1598-generic-associated-types/shadowing.stderr index f2d626f921c89..cba6bbd8512bf 100644 --- a/src/test/ui/rfc1598-generic-associated-types/shadowing.stderr +++ b/src/test/ui/rfc1598-generic-associated-types/shadowing.stderr @@ -1,5 +1,5 @@ warning: the feature `generic_associated_types` is incomplete and may cause the compiler to crash - --> $DIR/shadowing.rs:11:12 + --> $DIR/shadowing.rs:1:12 | LL | #![feature(generic_associated_types)] | ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/rfc1598-generic-associated-types/streaming_iterator.rs b/src/test/ui/rfc1598-generic-associated-types/streaming_iterator.rs index aa90886fdfd65..cb6e576804937 100644 --- a/src/test/ui/rfc1598-generic-associated-types/streaming_iterator.rs +++ b/src/test/ui/rfc1598-generic-associated-types/streaming_iterator.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generic_associated_types)] //~^ WARNING the feature `generic_associated_types` is incomplete diff --git a/src/test/ui/rfc1598-generic-associated-types/streaming_iterator.stderr b/src/test/ui/rfc1598-generic-associated-types/streaming_iterator.stderr index 4aca8d476877b..af5d1b872cc6e 100644 --- a/src/test/ui/rfc1598-generic-associated-types/streaming_iterator.stderr +++ b/src/test/ui/rfc1598-generic-associated-types/streaming_iterator.stderr @@ -1,35 +1,35 @@ warning: the feature `generic_associated_types` is incomplete and may cause the compiler to crash - --> $DIR/streaming_iterator.rs:11:12 + --> $DIR/streaming_iterator.rs:1:12 | LL | #![feature(generic_associated_types)] | ^^^^^^^^^^^^^^^^^^^^^^^^ error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/streaming_iterator.rs:28:41 + --> $DIR/streaming_iterator.rs:18:41 | LL | bar: ::Item<'static>, | ^^^^^^^ lifetime parameter not allowed error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/streaming_iterator.rs:36:64 + --> $DIR/streaming_iterator.rs:26:64 | LL | fn foo(iter: T) where T: StreamingIterator, for<'a> T::Item<'a>: Display { /* ... */ } | ^^ lifetime parameter not allowed error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/streaming_iterator.rs:22:48 + --> $DIR/streaming_iterator.rs:12:48 | LL | fn next<'a>(&'a self) -> Option>; | ^^ lifetime parameter not allowed error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/streaming_iterator.rs:48:37 + --> $DIR/streaming_iterator.rs:38:37 | LL | type Item<'a> = (usize, I::Item<'a>); | ^^ lifetime parameter not allowed error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/streaming_iterator.rs:50:48 + --> $DIR/streaming_iterator.rs:40:48 | LL | fn next<'a>(&'a self) -> Option> { | ^^ lifetime parameter not allowed diff --git a/src/test/ui/rfc1623.rs b/src/test/ui/rfc1623.rs index 579fa378a1c24..5920446dbc2e2 100644 --- a/src/test/ui/rfc1623.rs +++ b/src/test/ui/rfc1623.rs @@ -1,12 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![allow(dead_code)] fn non_elidable<'a, 'b>(a: &'a u8, b: &'b u8) -> &'a u8 { diff --git a/src/test/ui/rfc1623.stderr b/src/test/ui/rfc1623.stderr index 3815558fb257b..171c00ba7b813 100644 --- a/src/test/ui/rfc1623.stderr +++ b/src/test/ui/rfc1623.stderr @@ -1,5 +1,5 @@ error[E0106]: missing lifetime specifier - --> $DIR/rfc1623.rs:17:42 + --> $DIR/rfc1623.rs:8:42 | LL | static NON_ELIDABLE_FN: &fn(&u8, &u8) -> &u8 = | ^ expected lifetime parameter @@ -7,7 +7,7 @@ LL | static NON_ELIDABLE_FN: &fn(&u8, &u8) -> &u8 = = help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from argument 1 or argument 2 error[E0106]: missing lifetime specifier - --> $DIR/rfc1623.rs:19:39 + --> $DIR/rfc1623.rs:10:39 | LL | &(non_elidable as fn(&u8, &u8) -> &u8); | ^ expected lifetime parameter diff --git a/src/test/ui/rfc1717/missing-link-attr.rs b/src/test/ui/rfc1717/missing-link-attr.rs index 810efdedfd6c6..b46d85160d1ee 100644 --- a/src/test/ui/rfc1717/missing-link-attr.rs +++ b/src/test/ui/rfc1717/missing-link-attr.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -l foo:bar // error-pattern: renaming of the library `foo` was specified diff --git a/src/test/ui/rfc1717/multiple-renames.rs b/src/test/ui/rfc1717/multiple-renames.rs index e75c1a14b24d3..106f196b45555 100644 --- a/src/test/ui/rfc1717/multiple-renames.rs +++ b/src/test/ui/rfc1717/multiple-renames.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -l foo:bar -l foo:baz // error-pattern: multiple renamings were specified for library diff --git a/src/test/ui/rfc1717/rename-to-empty.rs b/src/test/ui/rfc1717/rename-to-empty.rs index ab8c238bc27a3..9356c41299233 100644 --- a/src/test/ui/rfc1717/rename-to-empty.rs +++ b/src/test/ui/rfc1717/rename-to-empty.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -l foo: // error-pattern: an empty renaming target was specified for library diff --git a/src/test/ui/rmeta-lib-pass.rs b/src/test/ui/rmeta-lib-pass.rs index 2df6a659724c6..6149b1685f5c7 100644 --- a/src/test/ui/rmeta-lib-pass.rs +++ b/src/test/ui/rmeta-lib-pass.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --emit=metadata // aux-build:rmeta_rlib.rs // no-prefer-dynamic diff --git a/src/test/ui/rmeta-pass.rs b/src/test/ui/rmeta-pass.rs index 6ee914c5e5b18..bcd40144f7216 100644 --- a/src/test/ui/rmeta-pass.rs +++ b/src/test/ui/rmeta-pass.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --emit=metadata // aux-build:rmeta_meta.rs // no-prefer-dynamic diff --git a/src/test/ui/rmeta-priv-warn.rs b/src/test/ui/rmeta-priv-warn.rs index bcf869c9432cb..823ce80623b6c 100644 --- a/src/test/ui/rmeta-priv-warn.rs +++ b/src/test/ui/rmeta-priv-warn.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --emit=metadata // no-prefer-dynamic // compile-pass diff --git a/src/test/ui/rmeta.rs b/src/test/ui/rmeta.rs index 962fe9f66aa4d..63ed236505e2d 100644 --- a/src/test/ui/rmeta.rs +++ b/src/test/ui/rmeta.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // no-prefer-dynamic // compile-flags: --emit=metadata diff --git a/src/test/ui/rmeta.stderr b/src/test/ui/rmeta.stderr index fa154f81b2971..d36b3a746e6a7 100644 --- a/src/test/ui/rmeta.stderr +++ b/src/test/ui/rmeta.stderr @@ -1,5 +1,5 @@ error[E0425]: cannot find value `Foo` in this scope - --> $DIR/rmeta.rs:17:13 + --> $DIR/rmeta.rs:7:13 | LL | let _ = Foo; //~ ERROR cannot find value `Foo` in this scope | ^^^ not found in this scope diff --git a/src/test/ui/rmeta_lib.rs b/src/test/ui/rmeta_lib.rs index a61ff05e8c8b5..345b712e37e47 100644 --- a/src/test/ui/rmeta_lib.rs +++ b/src/test/ui/rmeta_lib.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:rmeta_meta.rs // no-prefer-dynamic // error-pattern: crate `rmeta_meta` required to be available in rlib format, but was not found diff --git a/src/test/ui/rmeta_meta_main.rs b/src/test/ui/rmeta_meta_main.rs index ffeb5bc3b858f..df550775ee465 100644 --- a/src/test/ui/rmeta_meta_main.rs +++ b/src/test/ui/rmeta_meta_main.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --emit=metadata // aux-build:rmeta_meta.rs // no-prefer-dynamic diff --git a/src/test/ui/rmeta_meta_main.stderr b/src/test/ui/rmeta_meta_main.stderr index f246a8b5f6383..b7d7f89cfbb4c 100644 --- a/src/test/ui/rmeta_meta_main.stderr +++ b/src/test/ui/rmeta_meta_main.stderr @@ -1,5 +1,5 @@ error[E0560]: struct `rmeta_meta::Foo` has no field named `field2` - --> $DIR/rmeta_meta_main.rs:23:19 + --> $DIR/rmeta_meta_main.rs:13:19 | LL | let _ = Foo { field2: 42 }; //~ ERROR struct `rmeta_meta::Foo` has no field named `field2` | ^^^^^^ field does not exist - did you mean `field`? diff --git a/src/test/ui/rust-2018/async-ident-allowed.rs b/src/test/ui/rust-2018/async-ident-allowed.rs index 9a046bc6952b3..9d961214afc07 100644 --- a/src/test/ui/rust-2018/async-ident-allowed.rs +++ b/src/test/ui/rust-2018/async-ident-allowed.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2015 #![deny(rust_2018_compatibility)] diff --git a/src/test/ui/rust-2018/async-ident-allowed.stderr b/src/test/ui/rust-2018/async-ident-allowed.stderr index 741c1c70209bc..4446bb6dab5b7 100644 --- a/src/test/ui/rust-2018/async-ident-allowed.stderr +++ b/src/test/ui/rust-2018/async-ident-allowed.stderr @@ -1,11 +1,11 @@ error: `async` is a keyword in the 2018 edition - --> $DIR/async-ident-allowed.rs:19:9 + --> $DIR/async-ident-allowed.rs:9:9 | LL | let async = 3; //~ ERROR: is a keyword | ^^^^^ help: you can use a raw identifier to stay compatible: `r#async` | note: lint level defined here - --> $DIR/async-ident-allowed.rs:13:9 + --> $DIR/async-ident-allowed.rs:3:9 | LL | #![deny(rust_2018_compatibility)] | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/rust-2018/async-ident.fixed b/src/test/ui/rust-2018/async-ident.fixed index 15b8eec3bea99..2269e420582a8 100644 --- a/src/test/ui/rust-2018/async-ident.fixed +++ b/src/test/ui/rust-2018/async-ident.fixed @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code, unused_variables, non_camel_case_types, non_upper_case_globals)] #![deny(async_idents)] diff --git a/src/test/ui/rust-2018/async-ident.rs b/src/test/ui/rust-2018/async-ident.rs index 6087d2c16423e..78ec4a3dcb619 100644 --- a/src/test/ui/rust-2018/async-ident.rs +++ b/src/test/ui/rust-2018/async-ident.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code, unused_variables, non_camel_case_types, non_upper_case_globals)] #![deny(async_idents)] diff --git a/src/test/ui/rust-2018/async-ident.stderr b/src/test/ui/rust-2018/async-ident.stderr index 06d68a38c5f38..18571fb66c118 100644 --- a/src/test/ui/rust-2018/async-ident.stderr +++ b/src/test/ui/rust-2018/async-ident.stderr @@ -1,11 +1,11 @@ error: `async` is a keyword in the 2018 edition - --> $DIR/async-ident.rs:17:4 + --> $DIR/async-ident.rs:7:4 | LL | fn async() {} //~ ERROR async | ^^^^^ help: you can use a raw identifier to stay compatible: `r#async` | note: lint level defined here - --> $DIR/async-ident.rs:12:9 + --> $DIR/async-ident.rs:2:9 | LL | #![deny(async_idents)] | ^^^^^^^^^^^^ @@ -13,7 +13,7 @@ LL | #![deny(async_idents)] = note: for more information, see issue #49716 error: `async` is a keyword in the 2018 edition - --> $DIR/async-ident.rs:22:7 + --> $DIR/async-ident.rs:12:7 | LL | ($async:expr, async) => {}; | ^^^^^ help: you can use a raw identifier to stay compatible: `r#async` @@ -22,7 +22,7 @@ LL | ($async:expr, async) => {}; = note: for more information, see issue #49716 error: `async` is a keyword in the 2018 edition - --> $DIR/async-ident.rs:22:19 + --> $DIR/async-ident.rs:12:19 | LL | ($async:expr, async) => {}; | ^^^^^ help: you can use a raw identifier to stay compatible: `r#async` @@ -31,7 +31,7 @@ LL | ($async:expr, async) => {}; = note: for more information, see issue #49716 error: `async` is a keyword in the 2018 edition - --> $DIR/async-ident.rs:36:11 + --> $DIR/async-ident.rs:26:11 | LL | trait async {} | ^^^^^ help: you can use a raw identifier to stay compatible: `r#async` @@ -40,7 +40,7 @@ LL | trait async {} = note: for more information, see issue #49716 error: `async` is a keyword in the 2018 edition - --> $DIR/async-ident.rs:40:10 + --> $DIR/async-ident.rs:30:10 | LL | impl async for MyStruct {} | ^^^^^ help: you can use a raw identifier to stay compatible: `r#async` @@ -49,7 +49,7 @@ LL | impl async for MyStruct {} = note: for more information, see issue #49716 error: `async` is a keyword in the 2018 edition - --> $DIR/async-ident.rs:46:12 + --> $DIR/async-ident.rs:36:12 | LL | static async: u32 = 0; | ^^^^^ help: you can use a raw identifier to stay compatible: `r#async` @@ -58,7 +58,7 @@ LL | static async: u32 = 0; = note: for more information, see issue #49716 error: `async` is a keyword in the 2018 edition - --> $DIR/async-ident.rs:52:11 + --> $DIR/async-ident.rs:42:11 | LL | const async: u32 = 0; | ^^^^^ help: you can use a raw identifier to stay compatible: `r#async` @@ -67,7 +67,7 @@ LL | const async: u32 = 0; = note: for more information, see issue #49716 error: `async` is a keyword in the 2018 edition - --> $DIR/async-ident.rs:58:15 + --> $DIR/async-ident.rs:48:15 | LL | impl Foo { fn async() {} } | ^^^^^ help: you can use a raw identifier to stay compatible: `r#async` @@ -76,7 +76,7 @@ LL | impl Foo { fn async() {} } = note: for more information, see issue #49716 error: `async` is a keyword in the 2018 edition - --> $DIR/async-ident.rs:63:12 + --> $DIR/async-ident.rs:53:12 | LL | struct async {} | ^^^^^ help: you can use a raw identifier to stay compatible: `r#async` @@ -85,7 +85,7 @@ LL | struct async {} = note: for more information, see issue #49716 error: `async` is a keyword in the 2018 edition - --> $DIR/async-ident.rs:66:9 + --> $DIR/async-ident.rs:56:9 | LL | let async: async = async {}; | ^^^^^ help: you can use a raw identifier to stay compatible: `r#async` @@ -94,7 +94,7 @@ LL | let async: async = async {}; = note: for more information, see issue #49716 error: `async` is a keyword in the 2018 edition - --> $DIR/async-ident.rs:66:16 + --> $DIR/async-ident.rs:56:16 | LL | let async: async = async {}; | ^^^^^ help: you can use a raw identifier to stay compatible: `r#async` @@ -103,7 +103,7 @@ LL | let async: async = async {}; = note: for more information, see issue #49716 error: `async` is a keyword in the 2018 edition - --> $DIR/async-ident.rs:66:24 + --> $DIR/async-ident.rs:56:24 | LL | let async: async = async {}; | ^^^^^ help: you can use a raw identifier to stay compatible: `r#async` @@ -112,7 +112,7 @@ LL | let async: async = async {}; = note: for more information, see issue #49716 error: `async` is a keyword in the 2018 edition - --> $DIR/async-ident.rs:77:19 + --> $DIR/async-ident.rs:67:19 | LL | () => (pub fn async() {}) | ^^^^^ help: you can use a raw identifier to stay compatible: `r#async` @@ -121,7 +121,7 @@ LL | () => (pub fn async() {}) = note: for more information, see issue #49716 error: `async` is a keyword in the 2018 edition - --> $DIR/async-ident.rs:84:6 + --> $DIR/async-ident.rs:74:6 | LL | (async) => (1) | ^^^^^ help: you can use a raw identifier to stay compatible: `r#async` diff --git a/src/test/ui/rust-2018/auxiliary/edition-lint-paths.rs b/src/test/ui/rust-2018/auxiliary/edition-lint-paths.rs index cc17a9bd6618b..b76b4321d62aa 100644 --- a/src/test/ui/rust-2018/auxiliary/edition-lint-paths.rs +++ b/src/test/ui/rust-2018/auxiliary/edition-lint-paths.rs @@ -1,11 +1 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn foo() {} diff --git a/src/test/ui/rust-2018/auxiliary/macro-use-warned-against.rs b/src/test/ui/rust-2018/auxiliary/macro-use-warned-against.rs index 9487fd808cdfd..b497c74e699ae 100644 --- a/src/test/ui/rust-2018/auxiliary/macro-use-warned-against.rs +++ b/src/test/ui/rust-2018/auxiliary/macro-use-warned-against.rs @@ -1,12 +1,2 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_export] macro_rules! foo { () => () } diff --git a/src/test/ui/rust-2018/auxiliary/macro-use-warned-against2.rs b/src/test/ui/rust-2018/auxiliary/macro-use-warned-against2.rs index 6391db85dc513..e69de29bb2d1d 100644 --- a/src/test/ui/rust-2018/auxiliary/macro-use-warned-against2.rs +++ b/src/test/ui/rust-2018/auxiliary/macro-use-warned-against2.rs @@ -1,10 +0,0 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - diff --git a/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.fixed b/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.fixed index 279d4e9a80622..ff63d3fc21faf 100644 --- a/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.fixed +++ b/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.fixed @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix #![feature(rust_2018_preview)] diff --git a/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.rs b/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.rs index ff290555a695c..1e3d665249468 100644 --- a/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.rs +++ b/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix #![feature(rust_2018_preview)] diff --git a/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.stderr b/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.stderr index 9b893f9f15cf5..15f881c6a9c44 100644 --- a/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.stderr +++ b/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.stderr @@ -1,11 +1,11 @@ error: absolute paths must start with `self`, `super`, `crate`, or an external crate name in the 2018 edition - --> $DIR/edition-lint-fully-qualified-paths.rs:30:25 + --> $DIR/edition-lint-fully-qualified-paths.rs:20:25 | LL | let _: ::Bar = (); | ^^^^^^^^^^ help: use `crate`: `crate::foo::Foo` | note: lint level defined here - --> $DIR/edition-lint-fully-qualified-paths.rs:14:9 + --> $DIR/edition-lint-fully-qualified-paths.rs:4:9 | LL | #![deny(absolute_paths_not_starting_with_crate)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -13,7 +13,7 @@ LL | #![deny(absolute_paths_not_starting_with_crate)] = note: for more information, see issue TBD error: absolute paths must start with `self`, `super`, `crate`, or an external crate name in the 2018 edition - --> $DIR/edition-lint-fully-qualified-paths.rs:34:13 + --> $DIR/edition-lint-fully-qualified-paths.rs:24:13 | LL | let _: <::foo::Baz as foo::Foo>::Bar = (); | ^^^^^^^^^^ help: use `crate`: `crate::foo::Baz` diff --git a/src/test/ui/rust-2018/edition-lint-nested-empty-paths.fixed b/src/test/ui/rust-2018/edition-lint-nested-empty-paths.fixed index 929b7cd061b3e..8f995191d41e6 100644 --- a/src/test/ui/rust-2018/edition-lint-nested-empty-paths.fixed +++ b/src/test/ui/rust-2018/edition-lint-nested-empty-paths.fixed @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix #![feature(rust_2018_preview)] diff --git a/src/test/ui/rust-2018/edition-lint-nested-empty-paths.rs b/src/test/ui/rust-2018/edition-lint-nested-empty-paths.rs index b5693c4bb93ad..155b9e2e51c35 100644 --- a/src/test/ui/rust-2018/edition-lint-nested-empty-paths.rs +++ b/src/test/ui/rust-2018/edition-lint-nested-empty-paths.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix #![feature(rust_2018_preview)] diff --git a/src/test/ui/rust-2018/edition-lint-nested-empty-paths.stderr b/src/test/ui/rust-2018/edition-lint-nested-empty-paths.stderr index 439db84045eb9..02e742e561dec 100644 --- a/src/test/ui/rust-2018/edition-lint-nested-empty-paths.stderr +++ b/src/test/ui/rust-2018/edition-lint-nested-empty-paths.stderr @@ -1,11 +1,11 @@ error: absolute paths must start with `self`, `super`, `crate`, or an external crate name in the 2018 edition - --> $DIR/edition-lint-nested-empty-paths.rs:27:5 + --> $DIR/edition-lint-nested-empty-paths.rs:17:5 | LL | use foo::{bar::{baz::{}}}; | ^^^^^^^^^^^^^^^^^^^^^ help: use `crate`: `crate::foo::{bar::{baz::{}}}` | note: lint level defined here - --> $DIR/edition-lint-nested-empty-paths.rs:14:9 + --> $DIR/edition-lint-nested-empty-paths.rs:4:9 | LL | #![deny(absolute_paths_not_starting_with_crate)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -13,7 +13,7 @@ LL | #![deny(absolute_paths_not_starting_with_crate)] = note: for more information, see issue TBD error: absolute paths must start with `self`, `super`, `crate`, or an external crate name in the 2018 edition - --> $DIR/edition-lint-nested-empty-paths.rs:31:5 + --> $DIR/edition-lint-nested-empty-paths.rs:21:5 | LL | use foo::{bar::{XX, baz::{}}}; | ^^^^^^^^^^^^^^^^^^^^^^^^^ help: use `crate`: `crate::foo::{bar::{XX, baz::{}}}` @@ -22,7 +22,7 @@ LL | use foo::{bar::{XX, baz::{}}}; = note: for more information, see issue TBD error: absolute paths must start with `self`, `super`, `crate`, or an external crate name in the 2018 edition - --> $DIR/edition-lint-nested-empty-paths.rs:35:5 + --> $DIR/edition-lint-nested-empty-paths.rs:25:5 | LL | use foo::{bar::{baz::{}, baz1::{}}}; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use `crate`: `crate::foo::{bar::{baz::{}, baz1::{}}}` diff --git a/src/test/ui/rust-2018/edition-lint-nested-paths.fixed b/src/test/ui/rust-2018/edition-lint-nested-paths.fixed index 06f6b6d75a700..8043ad4663fbf 100644 --- a/src/test/ui/rust-2018/edition-lint-nested-paths.fixed +++ b/src/test/ui/rust-2018/edition-lint-nested-paths.fixed @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix #![feature(rust_2018_preview)] diff --git a/src/test/ui/rust-2018/edition-lint-nested-paths.rs b/src/test/ui/rust-2018/edition-lint-nested-paths.rs index c2831ec04b797..125518c9866c1 100644 --- a/src/test/ui/rust-2018/edition-lint-nested-paths.rs +++ b/src/test/ui/rust-2018/edition-lint-nested-paths.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix #![feature(rust_2018_preview)] diff --git a/src/test/ui/rust-2018/edition-lint-nested-paths.stderr b/src/test/ui/rust-2018/edition-lint-nested-paths.stderr index 333d27c381927..4c9e18b07d3f8 100644 --- a/src/test/ui/rust-2018/edition-lint-nested-paths.stderr +++ b/src/test/ui/rust-2018/edition-lint-nested-paths.stderr @@ -1,11 +1,11 @@ error: absolute paths must start with `self`, `super`, `crate`, or an external crate name in the 2018 edition - --> $DIR/edition-lint-nested-paths.rs:16:5 + --> $DIR/edition-lint-nested-paths.rs:6:5 | LL | use foo::{a, b}; | ^^^^^^^^^^^ help: use `crate`: `crate::foo::{a, b}` | note: lint level defined here - --> $DIR/edition-lint-nested-paths.rs:14:9 + --> $DIR/edition-lint-nested-paths.rs:4:9 | LL | #![deny(absolute_paths_not_starting_with_crate)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -13,7 +13,7 @@ LL | #![deny(absolute_paths_not_starting_with_crate)] = note: for more information, see issue TBD error: absolute paths must start with `self`, `super`, `crate`, or an external crate name in the 2018 edition - --> $DIR/edition-lint-nested-paths.rs:31:13 + --> $DIR/edition-lint-nested-paths.rs:21:13 | LL | use foo::{self as x, c}; | ^^^^^^^^^^^^^^^^^^^ help: use `crate`: `crate::foo::{self as x, c}` diff --git a/src/test/ui/rust-2018/edition-lint-paths.fixed b/src/test/ui/rust-2018/edition-lint-paths.fixed index 8a2b9c1f27213..de16291fea6bd 100644 --- a/src/test/ui/rust-2018/edition-lint-paths.fixed +++ b/src/test/ui/rust-2018/edition-lint-paths.fixed @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:edition-lint-paths.rs // run-rustfix diff --git a/src/test/ui/rust-2018/edition-lint-paths.rs b/src/test/ui/rust-2018/edition-lint-paths.rs index b6e5d5a8afbf1..c5b4be5a3acf9 100644 --- a/src/test/ui/rust-2018/edition-lint-paths.rs +++ b/src/test/ui/rust-2018/edition-lint-paths.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:edition-lint-paths.rs // run-rustfix diff --git a/src/test/ui/rust-2018/edition-lint-paths.stderr b/src/test/ui/rust-2018/edition-lint-paths.stderr index 37c9041b724c7..bf386692e42ce 100644 --- a/src/test/ui/rust-2018/edition-lint-paths.stderr +++ b/src/test/ui/rust-2018/edition-lint-paths.stderr @@ -1,11 +1,11 @@ error: absolute paths must start with `self`, `super`, `crate`, or an external crate name in the 2018 edition - --> $DIR/edition-lint-paths.rs:22:9 + --> $DIR/edition-lint-paths.rs:12:9 | LL | use ::bar::Bar; | ^^^^^^^^^^ help: use `crate`: `crate::bar::Bar` | note: lint level defined here - --> $DIR/edition-lint-paths.rs:15:9 + --> $DIR/edition-lint-paths.rs:5:9 | LL | #![deny(absolute_paths_not_starting_with_crate)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -13,7 +13,7 @@ LL | #![deny(absolute_paths_not_starting_with_crate)] = note: for more information, see issue TBD error: absolute paths must start with `self`, `super`, `crate`, or an external crate name in the 2018 edition - --> $DIR/edition-lint-paths.rs:28:9 + --> $DIR/edition-lint-paths.rs:18:9 | LL | use bar; | ^^^ help: use `crate`: `crate::bar` @@ -22,7 +22,7 @@ LL | use bar; = note: for more information, see issue TBD error: absolute paths must start with `self`, `super`, `crate`, or an external crate name in the 2018 edition - --> $DIR/edition-lint-paths.rs:33:9 + --> $DIR/edition-lint-paths.rs:23:9 | LL | use {Bar as SomethingElse, main}; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use `crate`: `crate::{Bar as SomethingElse, main}` @@ -31,7 +31,7 @@ LL | use {Bar as SomethingElse, main}; = note: for more information, see issue TBD error: absolute paths must start with `self`, `super`, `crate`, or an external crate name in the 2018 edition - --> $DIR/edition-lint-paths.rs:45:5 + --> $DIR/edition-lint-paths.rs:35:5 | LL | use bar::Bar; | ^^^^^^^^ help: use `crate`: `crate::bar::Bar` @@ -40,7 +40,7 @@ LL | use bar::Bar; = note: for more information, see issue TBD error: absolute paths must start with `self`, `super`, `crate`, or an external crate name in the 2018 edition - --> $DIR/edition-lint-paths.rs:57:9 + --> $DIR/edition-lint-paths.rs:47:9 | LL | use *; | ^ help: use `crate`: `crate::*` @@ -49,7 +49,7 @@ LL | use *; = note: for more information, see issue TBD error: absolute paths must start with `self`, `super`, `crate`, or an external crate name in the 2018 edition - --> $DIR/edition-lint-paths.rs:62:6 + --> $DIR/edition-lint-paths.rs:52:6 | LL | impl ::foo::SomeTrait for u32 { } | ^^^^^^^^^^^^^^^^ help: use `crate`: `crate::foo::SomeTrait` @@ -58,7 +58,7 @@ LL | impl ::foo::SomeTrait for u32 { } = note: for more information, see issue TBD error: absolute paths must start with `self`, `super`, `crate`, or an external crate name in the 2018 edition - --> $DIR/edition-lint-paths.rs:67:13 + --> $DIR/edition-lint-paths.rs:57:13 | LL | let x = ::bar::Bar; | ^^^^^^^^^^ help: use `crate`: `crate::bar::Bar` diff --git a/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.fixed b/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.fixed index fc81ab08f624d..aadb1b7401bd3 100644 --- a/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.fixed +++ b/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.fixed @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:edition-lint-paths.rs // run-rustfix // edition:2018 diff --git a/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.rs b/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.rs index 72751f2080cc9..7e6a8737065b0 100644 --- a/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.rs +++ b/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:edition-lint-paths.rs // run-rustfix // edition:2018 diff --git a/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.stderr b/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.stderr index 0ecfd4e4a2ca3..1ae7a1dcfa4b2 100644 --- a/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.stderr +++ b/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.stderr @@ -1,18 +1,18 @@ error: unused extern crate - --> $DIR/extern-crate-idiomatic-in-2018.rs:21:1 + --> $DIR/extern-crate-idiomatic-in-2018.rs:11:1 | LL | extern crate edition_lint_paths; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove it | note: lint level defined here - --> $DIR/extern-crate-idiomatic-in-2018.rs:18:9 + --> $DIR/extern-crate-idiomatic-in-2018.rs:8:9 | LL | #![deny(rust_2018_idioms)] | ^^^^^^^^^^^^^^^^ = note: #[deny(unused_extern_crates)] implied by #[deny(rust_2018_idioms)] error: `extern crate` is not idiomatic in the new edition - --> $DIR/extern-crate-idiomatic-in-2018.rs:24:1 + --> $DIR/extern-crate-idiomatic-in-2018.rs:14:1 | LL | extern crate edition_lint_paths as bar; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: convert it to a `use` diff --git a/src/test/ui/rust-2018/extern-crate-idiomatic.fixed b/src/test/ui/rust-2018/extern-crate-idiomatic.fixed index a874a62220298..2caa03bbc65cd 100644 --- a/src/test/ui/rust-2018/extern-crate-idiomatic.fixed +++ b/src/test/ui/rust-2018/extern-crate-idiomatic.fixed @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass // aux-build:edition-lint-paths.rs // run-rustfix diff --git a/src/test/ui/rust-2018/extern-crate-idiomatic.rs b/src/test/ui/rust-2018/extern-crate-idiomatic.rs index a874a62220298..2caa03bbc65cd 100644 --- a/src/test/ui/rust-2018/extern-crate-idiomatic.rs +++ b/src/test/ui/rust-2018/extern-crate-idiomatic.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass // aux-build:edition-lint-paths.rs // run-rustfix diff --git a/src/test/ui/rust-2018/extern-crate-referenced-by-self-path.fixed b/src/test/ui/rust-2018/extern-crate-referenced-by-self-path.fixed index 6f38978ae8ac6..e249c8a026d96 100644 --- a/src/test/ui/rust-2018/extern-crate-referenced-by-self-path.fixed +++ b/src/test/ui/rust-2018/extern-crate-referenced-by-self-path.fixed @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass // aux-build:edition-lint-paths.rs // run-rustfix diff --git a/src/test/ui/rust-2018/extern-crate-referenced-by-self-path.rs b/src/test/ui/rust-2018/extern-crate-referenced-by-self-path.rs index 6f38978ae8ac6..e249c8a026d96 100644 --- a/src/test/ui/rust-2018/extern-crate-referenced-by-self-path.rs +++ b/src/test/ui/rust-2018/extern-crate-referenced-by-self-path.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass // aux-build:edition-lint-paths.rs // run-rustfix diff --git a/src/test/ui/rust-2018/extern-crate-rename.fixed b/src/test/ui/rust-2018/extern-crate-rename.fixed index e54fe1966e056..aa8b935289e44 100644 --- a/src/test/ui/rust-2018/extern-crate-rename.fixed +++ b/src/test/ui/rust-2018/extern-crate-rename.fixed @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:edition-lint-paths.rs // run-rustfix diff --git a/src/test/ui/rust-2018/extern-crate-rename.rs b/src/test/ui/rust-2018/extern-crate-rename.rs index 549f8efb7a472..98c7d341bff22 100644 --- a/src/test/ui/rust-2018/extern-crate-rename.rs +++ b/src/test/ui/rust-2018/extern-crate-rename.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:edition-lint-paths.rs // run-rustfix diff --git a/src/test/ui/rust-2018/extern-crate-rename.stderr b/src/test/ui/rust-2018/extern-crate-rename.stderr index d739ad360ed7b..3b0605afcbe96 100644 --- a/src/test/ui/rust-2018/extern-crate-rename.stderr +++ b/src/test/ui/rust-2018/extern-crate-rename.stderr @@ -1,11 +1,11 @@ error: absolute paths must start with `self`, `super`, `crate`, or an external crate name in the 2018 edition - --> $DIR/extern-crate-rename.rs:22:5 + --> $DIR/extern-crate-rename.rs:12:5 | LL | use my_crate::foo; | ^^^^^^^^^^^^^ help: use `crate`: `crate::my_crate::foo` | note: lint level defined here - --> $DIR/extern-crate-rename.rs:18:9 + --> $DIR/extern-crate-rename.rs:8:9 | LL | #![deny(absolute_paths_not_starting_with_crate)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/rust-2018/extern-crate-submod.fixed b/src/test/ui/rust-2018/extern-crate-submod.fixed index 5d36c12103ab1..0564e58f3c7dd 100644 --- a/src/test/ui/rust-2018/extern-crate-submod.fixed +++ b/src/test/ui/rust-2018/extern-crate-submod.fixed @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:edition-lint-paths.rs // run-rustfix diff --git a/src/test/ui/rust-2018/extern-crate-submod.rs b/src/test/ui/rust-2018/extern-crate-submod.rs index 5951e12d545f5..206f3903b4716 100644 --- a/src/test/ui/rust-2018/extern-crate-submod.rs +++ b/src/test/ui/rust-2018/extern-crate-submod.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:edition-lint-paths.rs // run-rustfix diff --git a/src/test/ui/rust-2018/extern-crate-submod.stderr b/src/test/ui/rust-2018/extern-crate-submod.stderr index 17da9feaeab7b..d46740cecffed 100644 --- a/src/test/ui/rust-2018/extern-crate-submod.stderr +++ b/src/test/ui/rust-2018/extern-crate-submod.stderr @@ -1,11 +1,11 @@ error: absolute paths must start with `self`, `super`, `crate`, or an external crate name in the 2018 edition - --> $DIR/extern-crate-submod.rs:29:5 + --> $DIR/extern-crate-submod.rs:19:5 | LL | use m::edition_lint_paths::foo; | ^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use `crate`: `crate::m::edition_lint_paths::foo` | note: lint level defined here - --> $DIR/extern-crate-submod.rs:19:9 + --> $DIR/extern-crate-submod.rs:9:9 | LL | #![deny(absolute_paths_not_starting_with_crate)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/rust-2018/issue-51008-1.rs b/src/test/ui/rust-2018/issue-51008-1.rs index 4a76d683d6e50..8ae5e82784625 100644 --- a/src/test/ui/rust-2018/issue-51008-1.rs +++ b/src/test/ui/rust-2018/issue-51008-1.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #51008 -- the anonymous lifetime in `&i32` was // being incorrectly considered part of the "elided lifetimes" from // the impl. diff --git a/src/test/ui/rust-2018/issue-51008.rs b/src/test/ui/rust-2018/issue-51008.rs index eb2673857e2f4..b62609e329dd3 100644 --- a/src/test/ui/rust-2018/issue-51008.rs +++ b/src/test/ui/rust-2018/issue-51008.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #51008 -- the anonymous lifetime in `&i32` was // being incorrectly considered part of the "elided lifetimes" from // the impl. diff --git a/src/test/ui/rust-2018/issue-52202-use-suggestions.rs b/src/test/ui/rust-2018/issue-52202-use-suggestions.rs index deb80411bbf64..1c0426808c705 100644 --- a/src/test/ui/rust-2018/issue-52202-use-suggestions.rs +++ b/src/test/ui/rust-2018/issue-52202-use-suggestions.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 // The local `use` suggestion should start with `crate::` (but the diff --git a/src/test/ui/rust-2018/issue-52202-use-suggestions.stderr b/src/test/ui/rust-2018/issue-52202-use-suggestions.stderr index 95158dbd85326..030fa56dcff2f 100644 --- a/src/test/ui/rust-2018/issue-52202-use-suggestions.stderr +++ b/src/test/ui/rust-2018/issue-52202-use-suggestions.stderr @@ -1,5 +1,5 @@ error[E0422]: cannot find struct, variant or union type `Drain` in this scope - --> $DIR/issue-52202-use-suggestions.rs:21:14 + --> $DIR/issue-52202-use-suggestions.rs:11:14 | LL | let _d = Drain {}; | ^^^^^ not found in this scope diff --git a/src/test/ui/rust-2018/macro-use-warned-against.rs b/src/test/ui/rust-2018/macro-use-warned-against.rs index ce4c696028180..368b8daf243ea 100644 --- a/src/test/ui/rust-2018/macro-use-warned-against.rs +++ b/src/test/ui/rust-2018/macro-use-warned-against.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:macro-use-warned-against.rs // aux-build:macro-use-warned-against2.rs // compile-pass diff --git a/src/test/ui/rust-2018/macro-use-warned-against.stderr b/src/test/ui/rust-2018/macro-use-warned-against.stderr index da69daf6ba8e7..55213a77a2c0e 100644 --- a/src/test/ui/rust-2018/macro-use-warned-against.stderr +++ b/src/test/ui/rust-2018/macro-use-warned-against.stderr @@ -1,23 +1,23 @@ warning: deprecated `#[macro_use]` directive used to import macros should be replaced at use sites with a `use` statement to import the macro instead - --> $DIR/macro-use-warned-against.rs:17:1 + --> $DIR/macro-use-warned-against.rs:7:1 | LL | #[macro_use] //~ WARN should be replaced at use sites with a `use` statement | ^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/macro-use-warned-against.rs:15:9 + --> $DIR/macro-use-warned-against.rs:5:9 | LL | #![warn(macro_use_extern_crate, unused)] | ^^^^^^^^^^^^^^^^^^^^^^ warning: unused `#[macro_use]` import - --> $DIR/macro-use-warned-against.rs:19:1 + --> $DIR/macro-use-warned-against.rs:9:1 | LL | #[macro_use] //~ WARN unused `#[macro_use]` | ^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/macro-use-warned-against.rs:15:33 + --> $DIR/macro-use-warned-against.rs:5:33 | LL | #![warn(macro_use_extern_crate, unused)] | ^^^^^^ diff --git a/src/test/ui/rust-2018/uniform-paths/ambiguity-macros-nested.rs b/src/test/ui/rust-2018/uniform-paths/ambiguity-macros-nested.rs index e0992c9066632..00cb6bb40cc58 100644 --- a/src/test/ui/rust-2018/uniform-paths/ambiguity-macros-nested.rs +++ b/src/test/ui/rust-2018/uniform-paths/ambiguity-macros-nested.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 #![feature(uniform_paths)] diff --git a/src/test/ui/rust-2018/uniform-paths/ambiguity-macros-nested.stderr b/src/test/ui/rust-2018/uniform-paths/ambiguity-macros-nested.stderr index 154ee412e7282..2ca0e0c5587fe 100644 --- a/src/test/ui/rust-2018/uniform-paths/ambiguity-macros-nested.stderr +++ b/src/test/ui/rust-2018/uniform-paths/ambiguity-macros-nested.stderr @@ -1,5 +1,5 @@ error: `std` import is ambiguous - --> $DIR/ambiguity-macros-nested.rs:18:13 + --> $DIR/ambiguity-macros-nested.rs:8:13 | LL | pub use std::io; | ^^^ can refer to external crate `::std` diff --git a/src/test/ui/rust-2018/uniform-paths/ambiguity-macros.rs b/src/test/ui/rust-2018/uniform-paths/ambiguity-macros.rs index 9439d92aa710b..62dd850e09916 100644 --- a/src/test/ui/rust-2018/uniform-paths/ambiguity-macros.rs +++ b/src/test/ui/rust-2018/uniform-paths/ambiguity-macros.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 #![feature(uniform_paths)] diff --git a/src/test/ui/rust-2018/uniform-paths/ambiguity-macros.stderr b/src/test/ui/rust-2018/uniform-paths/ambiguity-macros.stderr index 3c0d5601f9c8a..8c54bb3515896 100644 --- a/src/test/ui/rust-2018/uniform-paths/ambiguity-macros.stderr +++ b/src/test/ui/rust-2018/uniform-paths/ambiguity-macros.stderr @@ -1,5 +1,5 @@ error: `std` import is ambiguous - --> $DIR/ambiguity-macros.rs:17:5 + --> $DIR/ambiguity-macros.rs:7:5 | LL | use std::io; | ^^^ can refer to external crate `::std` diff --git a/src/test/ui/rust-2018/uniform-paths/ambiguity-nested.rs b/src/test/ui/rust-2018/uniform-paths/ambiguity-nested.rs index 1756acc6057f2..ecdd1ce2b3aa5 100644 --- a/src/test/ui/rust-2018/uniform-paths/ambiguity-nested.rs +++ b/src/test/ui/rust-2018/uniform-paths/ambiguity-nested.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 #![feature(uniform_paths)] diff --git a/src/test/ui/rust-2018/uniform-paths/ambiguity-nested.stderr b/src/test/ui/rust-2018/uniform-paths/ambiguity-nested.stderr index a607eeb0b43e0..625d118fa1c89 100644 --- a/src/test/ui/rust-2018/uniform-paths/ambiguity-nested.stderr +++ b/src/test/ui/rust-2018/uniform-paths/ambiguity-nested.stderr @@ -1,5 +1,5 @@ error: `std` import is ambiguous - --> $DIR/ambiguity-nested.rs:18:13 + --> $DIR/ambiguity-nested.rs:8:13 | LL | pub use std::io; | ^^^ can refer to external crate `::std` diff --git a/src/test/ui/rust-2018/uniform-paths/ambiguity.rs b/src/test/ui/rust-2018/uniform-paths/ambiguity.rs index 9ae3d79c22cf2..35a664f032927 100644 --- a/src/test/ui/rust-2018/uniform-paths/ambiguity.rs +++ b/src/test/ui/rust-2018/uniform-paths/ambiguity.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 #![feature(uniform_paths)] diff --git a/src/test/ui/rust-2018/uniform-paths/ambiguity.stderr b/src/test/ui/rust-2018/uniform-paths/ambiguity.stderr index c65db3072f440..3312001a0d827 100644 --- a/src/test/ui/rust-2018/uniform-paths/ambiguity.stderr +++ b/src/test/ui/rust-2018/uniform-paths/ambiguity.stderr @@ -1,5 +1,5 @@ error: `std` import is ambiguous - --> $DIR/ambiguity.rs:15:5 + --> $DIR/ambiguity.rs:5:5 | LL | use std::io; | ^^^ can refer to external crate `::std` diff --git a/src/test/ui/rust-2018/uniform-paths/block-scoped-shadow.rs b/src/test/ui/rust-2018/uniform-paths/block-scoped-shadow.rs index ee141d444b2cf..2860f16deaee8 100644 --- a/src/test/ui/rust-2018/uniform-paths/block-scoped-shadow.rs +++ b/src/test/ui/rust-2018/uniform-paths/block-scoped-shadow.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 #![feature(uniform_paths)] diff --git a/src/test/ui/rust-2018/uniform-paths/block-scoped-shadow.stderr b/src/test/ui/rust-2018/uniform-paths/block-scoped-shadow.stderr index 86d95f2ac4567..0f1308d4e015e 100644 --- a/src/test/ui/rust-2018/uniform-paths/block-scoped-shadow.stderr +++ b/src/test/ui/rust-2018/uniform-paths/block-scoped-shadow.stderr @@ -1,5 +1,5 @@ error: `Foo` import is ambiguous - --> $DIR/block-scoped-shadow.rs:21:9 + --> $DIR/block-scoped-shadow.rs:11:9 | LL | enum Foo { A, B } | ----------------- can refer to `self::Foo` @@ -13,7 +13,7 @@ LL | use Foo::*; = note: relative `use` paths enabled by `#![feature(uniform_paths)]` error: `std` import is ambiguous - --> $DIR/block-scoped-shadow.rs:28:9 + --> $DIR/block-scoped-shadow.rs:18:9 | LL | struct std; | ----------- can refer to `self::std` @@ -27,7 +27,7 @@ LL | use std as foo; = note: relative `use` paths enabled by `#![feature(uniform_paths)]` error: `std` import is ambiguous - --> $DIR/block-scoped-shadow.rs:28:9 + --> $DIR/block-scoped-shadow.rs:18:9 | LL | struct std; | ----------- can refer to `self::std` diff --git a/src/test/ui/rust-2018/uniform-paths/redundant.rs b/src/test/ui/rust-2018/uniform-paths/redundant.rs index 8f384b7e7af6a..b92278a15d57e 100644 --- a/src/test/ui/rust-2018/uniform-paths/redundant.rs +++ b/src/test/ui/rust-2018/uniform-paths/redundant.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 #![feature(uniform_paths)] diff --git a/src/test/ui/rust-2018/uniform-paths/redundant.stderr b/src/test/ui/rust-2018/uniform-paths/redundant.stderr index dd38407e1646b..f692d9cb78daf 100644 --- a/src/test/ui/rust-2018/uniform-paths/redundant.stderr +++ b/src/test/ui/rust-2018/uniform-paths/redundant.stderr @@ -1,5 +1,5 @@ error: `std` import is redundant - --> $DIR/redundant.rs:15:5 + --> $DIR/redundant.rs:5:5 | LL | use std; | ^^^ diff --git a/src/test/ui/rust-unstable-column-gated.rs b/src/test/ui/rust-unstable-column-gated.rs index abc92c86eec6a..ed5e6f2489cd9 100644 --- a/src/test/ui/rust-unstable-column-gated.rs +++ b/src/test/ui/rust-unstable-column-gated.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { println!("{}", __rust_unstable_column!()); //~^ERROR the __rust_unstable_column macro is unstable diff --git a/src/test/ui/rust-unstable-column-gated.stderr b/src/test/ui/rust-unstable-column-gated.stderr index 785fcd7af42ad..b9f1df2bcc992 100644 --- a/src/test/ui/rust-unstable-column-gated.stderr +++ b/src/test/ui/rust-unstable-column-gated.stderr @@ -1,5 +1,5 @@ error: the __rust_unstable_column macro is unstable - --> $DIR/rust-unstable-column-gated.rs:12:20 + --> $DIR/rust-unstable-column-gated.rs:2:20 | LL | println!("{}", __rust_unstable_column!()); | ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/rustc-args-required-const.rs b/src/test/ui/rustc-args-required-const.rs index 35b43b4c460a4..5c36afba44cb0 100644 --- a/src/test/ui/rustc-args-required-const.rs +++ b/src/test/ui/rustc-args-required-const.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs, const_fn)] #[rustc_args_required_const(0)] diff --git a/src/test/ui/rustc-args-required-const.stderr b/src/test/ui/rustc-args-required-const.stderr index 07f2d880c82b4..7b671c0a03dab 100644 --- a/src/test/ui/rustc-args-required-const.stderr +++ b/src/test/ui/rustc-args-required-const.stderr @@ -1,11 +1,11 @@ error: argument 1 is required to be a constant - --> $DIR/rustc-args-required-const.rs:33:5 + --> $DIR/rustc-args-required-const.rs:23:5 | LL | foo(a); //~ ERROR: argument 1 is required to be a constant | ^^^^^^ error: argument 2 is required to be a constant - --> $DIR/rustc-args-required-const.rs:35:5 + --> $DIR/rustc-args-required-const.rs:25:5 | LL | bar(a, a); //~ ERROR: argument 2 is required to be a constant | ^^^^^^^^^ diff --git a/src/test/ui/rustc-args-required-const2.rs b/src/test/ui/rustc-args-required-const2.rs index c4ca5a0ca5c5d..5feeca6f530e8 100644 --- a/src/test/ui/rustc-args-required-const2.rs +++ b/src/test/ui/rustc-args-required-const2.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs, const_fn)] #[rustc_args_required_const(0)] diff --git a/src/test/ui/rustc-args-required-const2.stderr b/src/test/ui/rustc-args-required-const2.stderr index 766f8adb0b44a..005f68fa2e64d 100644 --- a/src/test/ui/rustc-args-required-const2.stderr +++ b/src/test/ui/rustc-args-required-const2.stderr @@ -1,5 +1,5 @@ error: this function can only be invoked directly, not through a function pointer - --> $DIR/rustc-args-required-const2.rs:18:13 + --> $DIR/rustc-args-required-const2.rs:8:13 | LL | let a = foo; //~ ERROR: this function can only be invoked directly | ^^^ diff --git a/src/test/ui/rustc-error.rs b/src/test/ui/rustc-error.rs index 82f32cbcd14e4..0504198032cc3 100644 --- a/src/test/ui/rustc-error.rs +++ b/src/test/ui/rustc-error.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #[rustc_error] diff --git a/src/test/ui/rustc-error.stderr b/src/test/ui/rustc-error.stderr index 7456d2af51f82..c6b9cf77e5887 100644 --- a/src/test/ui/rustc-error.stderr +++ b/src/test/ui/rustc-error.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/rustc-error.rs:14:1 + --> $DIR/rustc-error.rs:4:1 | LL | / fn main() { LL | | //~^ ERROR compilation successful diff --git a/src/test/ui/safe-extern-statics-mut.rs b/src/test/ui/safe-extern-statics-mut.rs index 35ea6dd52c4f2..dbf0f523a9a86 100644 --- a/src/test/ui/safe-extern-statics-mut.rs +++ b/src/test/ui/safe-extern-statics-mut.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:extern-statics.rs extern crate extern_statics; diff --git a/src/test/ui/safe-extern-statics-mut.stderr b/src/test/ui/safe-extern-statics-mut.stderr index f48dce65afabe..4eecce6d3d31c 100644 --- a/src/test/ui/safe-extern-statics-mut.stderr +++ b/src/test/ui/safe-extern-statics-mut.stderr @@ -1,5 +1,5 @@ error[E0133]: use of mutable static is unsafe and requires unsafe function or block - --> $DIR/safe-extern-statics-mut.rs:21:13 + --> $DIR/safe-extern-statics-mut.rs:11:13 | LL | let b = B; //~ ERROR use of mutable static is unsafe | ^ use of mutable static @@ -7,7 +7,7 @@ LL | let b = B; //~ ERROR use of mutable static is unsafe = note: mutable statics can be mutated by multiple threads: aliasing violations or data races will cause undefined behavior error[E0133]: use of mutable static is unsafe and requires unsafe function or block - --> $DIR/safe-extern-statics-mut.rs:22:14 + --> $DIR/safe-extern-statics-mut.rs:12:14 | LL | let rb = &B; //~ ERROR use of mutable static is unsafe | ^^ use of mutable static @@ -15,7 +15,7 @@ LL | let rb = &B; //~ ERROR use of mutable static is unsafe = note: mutable statics can be mutated by multiple threads: aliasing violations or data races will cause undefined behavior error[E0133]: use of mutable static is unsafe and requires unsafe function or block - --> $DIR/safe-extern-statics-mut.rs:23:14 + --> $DIR/safe-extern-statics-mut.rs:13:14 | LL | let xb = XB; //~ ERROR use of mutable static is unsafe | ^^ use of mutable static @@ -23,7 +23,7 @@ LL | let xb = XB; //~ ERROR use of mutable static is unsafe = note: mutable statics can be mutated by multiple threads: aliasing violations or data races will cause undefined behavior error[E0133]: use of mutable static is unsafe and requires unsafe function or block - --> $DIR/safe-extern-statics-mut.rs:24:15 + --> $DIR/safe-extern-statics-mut.rs:14:15 | LL | let xrb = &XB; //~ ERROR use of mutable static is unsafe | ^^^ use of mutable static diff --git a/src/test/ui/safe-extern-statics.rs b/src/test/ui/safe-extern-statics.rs index 83aa4b3316da0..eda309444681b 100644 --- a/src/test/ui/safe-extern-statics.rs +++ b/src/test/ui/safe-extern-statics.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:extern-statics.rs #![allow(unused)] diff --git a/src/test/ui/safe-extern-statics.stderr b/src/test/ui/safe-extern-statics.stderr index 657d57967bbf1..11ade798ba478 100644 --- a/src/test/ui/safe-extern-statics.stderr +++ b/src/test/ui/safe-extern-statics.stderr @@ -1,5 +1,5 @@ error: use of extern static is unsafe and requires unsafe function or block (error E0133) - --> $DIR/safe-extern-statics.rs:23:13 + --> $DIR/safe-extern-statics.rs:13:13 | LL | let a = A; //~ ERROR use of extern static is unsafe | ^ @@ -10,7 +10,7 @@ LL | let a = A; //~ ERROR use of extern static is unsafe = note: extern statics are not controlled by the Rust type system: invalid data, aliasing violations or data races will cause undefined behavior error: use of extern static is unsafe and requires unsafe function or block (error E0133) - --> $DIR/safe-extern-statics.rs:25:14 + --> $DIR/safe-extern-statics.rs:15:14 | LL | let ra = &A; //~ ERROR use of extern static is unsafe | ^^ @@ -20,7 +20,7 @@ LL | let ra = &A; //~ ERROR use of extern static is unsafe = note: extern statics are not controlled by the Rust type system: invalid data, aliasing violations or data races will cause undefined behavior error: use of extern static is unsafe and requires unsafe function or block (error E0133) - --> $DIR/safe-extern-statics.rs:27:14 + --> $DIR/safe-extern-statics.rs:17:14 | LL | let xa = XA; //~ ERROR use of extern static is unsafe | ^^ @@ -30,7 +30,7 @@ LL | let xa = XA; //~ ERROR use of extern static is unsafe = note: extern statics are not controlled by the Rust type system: invalid data, aliasing violations or data races will cause undefined behavior error: use of extern static is unsafe and requires unsafe function or block (error E0133) - --> $DIR/safe-extern-statics.rs:29:15 + --> $DIR/safe-extern-statics.rs:19:15 | LL | let xra = &XA; //~ ERROR use of extern static is unsafe | ^^^ diff --git a/src/test/ui/self/self-impl.rs b/src/test/ui/self/self-impl.rs index 1494d9ca574ce..ed250ce522f40 100644 --- a/src/test/ui/self/self-impl.rs +++ b/src/test/ui/self/self-impl.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that unsupported uses of `Self` in impls don't crash struct Bar; diff --git a/src/test/ui/self/self-impl.stderr b/src/test/ui/self/self-impl.stderr index a5a5135faad72..e437dbd372020 100644 --- a/src/test/ui/self/self-impl.stderr +++ b/src/test/ui/self/self-impl.stderr @@ -1,5 +1,5 @@ error[E0223]: ambiguous associated type - --> $DIR/self-impl.rs:33:16 + --> $DIR/self-impl.rs:23:16 | LL | let _: ::Baz = true; | ^^^^^^^^^^^ ambiguous associated type @@ -7,7 +7,7 @@ LL | let _: ::Baz = true; = note: specify the type using the syntax `::Baz` error[E0223]: ambiguous associated type - --> $DIR/self-impl.rs:35:16 + --> $DIR/self-impl.rs:25:16 | LL | let _: Self::Baz = true; | ^^^^^^^^^ ambiguous associated type diff --git a/src/test/ui/self/self-infer.rs b/src/test/ui/self/self-infer.rs index fd011318a4800..0956f2a56918c 100644 --- a/src/test/ui/self/self-infer.rs +++ b/src/test/ui/self/self-infer.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S; impl S { diff --git a/src/test/ui/self/self-infer.stderr b/src/test/ui/self/self-infer.stderr index 642e0de52905f..4b8fd7037795a 100644 --- a/src/test/ui/self/self-infer.stderr +++ b/src/test/ui/self/self-infer.stderr @@ -1,11 +1,11 @@ error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/self-infer.rs:14:16 + --> $DIR/self-infer.rs:4:16 | LL | fn f(self: _) {} //~ERROR the type placeholder `_` is not allowed within types on item sig | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/self-infer.rs:15:17 + --> $DIR/self-infer.rs:5:17 | LL | fn g(self: &_) {} //~ERROR the type placeholder `_` is not allowed within types on item sig | ^ not allowed in type signatures diff --git a/src/test/ui/self/self-vs-path-ambiguity.rs b/src/test/ui/self/self-vs-path-ambiguity.rs index b2dba3bd61b36..5a06d56c83f24 100644 --- a/src/test/ui/self/self-vs-path-ambiguity.rs +++ b/src/test/ui/self/self-vs-path-ambiguity.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that `self::foo` is parsed as a general pattern and not a self argument. struct S; diff --git a/src/test/ui/self/self-vs-path-ambiguity.stderr b/src/test/ui/self/self-vs-path-ambiguity.stderr index 765174331706a..954d240e71b63 100644 --- a/src/test/ui/self/self-vs-path-ambiguity.stderr +++ b/src/test/ui/self/self-vs-path-ambiguity.stderr @@ -1,5 +1,5 @@ error: unexpected lifetime `'a` in pattern - --> $DIR/self-vs-path-ambiguity.rs:19:11 + --> $DIR/self-vs-path-ambiguity.rs:9:11 | LL | fn i(&'a self::S: &S) {} //~ ERROR unexpected lifetime `'a` in pattern | ^^ unexpected lifetime diff --git a/src/test/ui/self/self_type_keyword-2.rs b/src/test/ui/self/self_type_keyword-2.rs index 8331ae0b307d9..dde5762fd7804 100644 --- a/src/test/ui/self/self_type_keyword-2.rs +++ b/src/test/ui/self/self_type_keyword-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use self::Self as Foo; //~ ERROR unresolved import `self::Self` pub fn main() { diff --git a/src/test/ui/self/self_type_keyword-2.stderr b/src/test/ui/self/self_type_keyword-2.stderr index 972e5bdddc673..55c8796e158f0 100644 --- a/src/test/ui/self/self_type_keyword-2.stderr +++ b/src/test/ui/self/self_type_keyword-2.stderr @@ -1,23 +1,23 @@ error[E0432]: unresolved import `self::Self` - --> $DIR/self_type_keyword-2.rs:11:5 + --> $DIR/self_type_keyword-2.rs:1:5 | LL | use self::Self as Foo; //~ ERROR unresolved import `self::Self` | ^^^^^^^^^^^^^^^^^ no `Self` in the root error[E0531]: cannot find unit struct/variant or constant `Self` in this scope - --> $DIR/self_type_keyword-2.rs:14:9 + --> $DIR/self_type_keyword-2.rs:4:9 | LL | let Self = 5; | ^^^^ not found in this scope error[E0531]: cannot find unit struct/variant or constant `Self` in this scope - --> $DIR/self_type_keyword-2.rs:18:9 + --> $DIR/self_type_keyword-2.rs:8:9 | LL | Self => (), | ^^^^ not found in this scope error[E0531]: cannot find unit struct/variant or constant `Self` in this scope - --> $DIR/self_type_keyword-2.rs:20:18 + --> $DIR/self_type_keyword-2.rs:10:18 | LL | Foo { x: Self } => (), | ^^^^ not found in this scope diff --git a/src/test/ui/self/self_type_keyword.rs b/src/test/ui/self/self_type_keyword.rs index 20d2e2ca9cfa1..742318d1e959d 100644 --- a/src/test/ui/self/self_type_keyword.rs +++ b/src/test/ui/self/self_type_keyword.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z continue-parse-after-error mod foo { diff --git a/src/test/ui/self/self_type_keyword.stderr b/src/test/ui/self/self_type_keyword.stderr index 4a7b9a6ce2cee..3b095b7841839 100644 --- a/src/test/ui/self/self_type_keyword.stderr +++ b/src/test/ui/self/self_type_keyword.stderr @@ -1,59 +1,59 @@ error: expected identifier, found keyword `Self` - --> $DIR/self_type_keyword.rs:14:10 + --> $DIR/self_type_keyword.rs:4:10 | LL | struct Self; | ^^^^ expected identifier, found keyword error: expected identifier, found keyword `Self` - --> $DIR/self_type_keyword.rs:25:13 + --> $DIR/self_type_keyword.rs:15:13 | LL | ref Self => (), | ^^^^ expected identifier, found keyword error: expected identifier, found keyword `Self` - --> $DIR/self_type_keyword.rs:27:13 + --> $DIR/self_type_keyword.rs:17:13 | LL | mut Self => (), | ^^^^ expected identifier, found keyword error: expected identifier, found keyword `Self` - --> $DIR/self_type_keyword.rs:29:17 + --> $DIR/self_type_keyword.rs:19:17 | LL | ref mut Self => (), | ^^^^ expected identifier, found keyword error: expected identifier, found keyword `Self` - --> $DIR/self_type_keyword.rs:33:15 + --> $DIR/self_type_keyword.rs:23:15 | LL | Foo { Self } => (), | ^^^^ expected identifier, found keyword error: expected identifier, found keyword `Self` - --> $DIR/self_type_keyword.rs:39:26 + --> $DIR/self_type_keyword.rs:29:26 | LL | extern crate core as Self; | ^^^^ expected identifier, found keyword error: expected identifier, found keyword `Self` - --> $DIR/self_type_keyword.rs:44:32 + --> $DIR/self_type_keyword.rs:34:32 | LL | use std::option::Option as Self; | ^^^^ expected identifier, found keyword error: expected identifier, found keyword `Self` - --> $DIR/self_type_keyword.rs:49:11 + --> $DIR/self_type_keyword.rs:39:11 | LL | trait Self {} | ^^^^ expected identifier, found keyword error: lifetimes cannot use keyword names - --> $DIR/self_type_keyword.rs:18:12 + --> $DIR/self_type_keyword.rs:8:12 | LL | struct Bar<'Self>; | ^^^^^ error: cannot find macro `Self!` in this scope - --> $DIR/self_type_keyword.rs:31:9 + --> $DIR/self_type_keyword.rs:21:9 | LL | Self!() => (), | ^^^^ diff --git a/src/test/ui/seq-args.rs b/src/test/ui/seq-args.rs index 44b049d6561d5..361b17085418f 100644 --- a/src/test/ui/seq-args.rs +++ b/src/test/ui/seq-args.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { trait seq { } diff --git a/src/test/ui/seq-args.stderr b/src/test/ui/seq-args.stderr index 068f08eebe76c..e3fc76faae30e 100644 --- a/src/test/ui/seq-args.stderr +++ b/src/test/ui/seq-args.stderr @@ -1,11 +1,11 @@ error[E0244]: wrong number of type arguments: expected 0, found 1 - --> $DIR/seq-args.rs:14:13 + --> $DIR/seq-args.rs:4:13 | LL | impl seq for Vec { //~ ERROR wrong number of type arguments | ^ unexpected type argument error[E0244]: wrong number of type arguments: expected 0, found 1 - --> $DIR/seq-args.rs:17:10 + --> $DIR/seq-args.rs:7:10 | LL | impl seq for u32 { //~ ERROR wrong number of type arguments | ^^^^ unexpected type argument diff --git a/src/test/ui/shadowed/shadowed-lifetime.rs b/src/test/ui/shadowed/shadowed-lifetime.rs index 63e4038398d52..9487b4f4e32cd 100644 --- a/src/test/ui/shadowed/shadowed-lifetime.rs +++ b/src/test/ui/shadowed/shadowed-lifetime.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that shadowed lifetimes generate an error. struct Foo<'a>(&'a isize); diff --git a/src/test/ui/shadowed/shadowed-lifetime.stderr b/src/test/ui/shadowed/shadowed-lifetime.stderr index 8d7c00bb61e1c..5ea3d926430f8 100644 --- a/src/test/ui/shadowed/shadowed-lifetime.stderr +++ b/src/test/ui/shadowed/shadowed-lifetime.stderr @@ -1,5 +1,5 @@ error[E0496]: lifetime name `'a` shadows a lifetime name that is already in scope - --> $DIR/shadowed-lifetime.rs:16:25 + --> $DIR/shadowed-lifetime.rs:6:25 | LL | impl<'a> Foo<'a> { | -- first declared here @@ -7,7 +7,7 @@ LL | fn shadow_in_method<'a>(&'a self) -> &'a isize { | ^^ lifetime 'a already in scope error[E0496]: lifetime name `'b` shadows a lifetime name that is already in scope - --> $DIR/shadowed-lifetime.rs:22:20 + --> $DIR/shadowed-lifetime.rs:12:20 | LL | fn shadow_in_type<'b>(&'b self) -> &'b isize { | -- first declared here diff --git a/src/test/ui/shadowed/shadowed-trait-methods.rs b/src/test/ui/shadowed/shadowed-trait-methods.rs index 3146017a0b429..f9c25d9791314 100644 --- a/src/test/ui/shadowed/shadowed-trait-methods.rs +++ b/src/test/ui/shadowed/shadowed-trait-methods.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that methods from shadowed traits cannot be used mod foo { diff --git a/src/test/ui/shadowed/shadowed-trait-methods.stderr b/src/test/ui/shadowed/shadowed-trait-methods.stderr index 910f125a14838..38b604af29000 100644 --- a/src/test/ui/shadowed/shadowed-trait-methods.stderr +++ b/src/test/ui/shadowed/shadowed-trait-methods.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `f` found for type `()` in the current scope - --> $DIR/shadowed-trait-methods.rs:23:8 + --> $DIR/shadowed-trait-methods.rs:13:8 | LL | ().f() //~ ERROR no method | ^ diff --git a/src/test/ui/shadowed/shadowed-type-parameter.rs b/src/test/ui/shadowed/shadowed-type-parameter.rs index 1f72db1e894fa..ba9f3abcf7ade 100644 --- a/src/test/ui/shadowed/shadowed-type-parameter.rs +++ b/src/test/ui/shadowed/shadowed-type-parameter.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that shadowed lifetimes generate an error. #![feature(box_syntax)] diff --git a/src/test/ui/shadowed/shadowed-type-parameter.stderr b/src/test/ui/shadowed/shadowed-type-parameter.stderr index c40343e31b440..6b4d1fae3de18 100644 --- a/src/test/ui/shadowed/shadowed-type-parameter.stderr +++ b/src/test/ui/shadowed/shadowed-type-parameter.stderr @@ -1,5 +1,5 @@ error[E0194]: type parameter `T` shadows another type parameter of the same name - --> $DIR/shadowed-type-parameter.rs:30:27 + --> $DIR/shadowed-type-parameter.rs:20:27 | LL | trait Bar { | - first `T` declared here @@ -8,7 +8,7 @@ LL | fn shadow_in_required(&self); | ^ shadows another type parameter error[E0194]: type parameter `T` shadows another type parameter of the same name - --> $DIR/shadowed-type-parameter.rs:33:27 + --> $DIR/shadowed-type-parameter.rs:23:27 | LL | trait Bar { | - first `T` declared here @@ -17,7 +17,7 @@ LL | fn shadow_in_provided(&self) {} | ^ shadows another type parameter error[E0194]: type parameter `T` shadows another type parameter of the same name - --> $DIR/shadowed-type-parameter.rs:18:25 + --> $DIR/shadowed-type-parameter.rs:8:25 | LL | impl Foo { | - first `T` declared here diff --git a/src/test/ui/shadowed/shadowed-use-visibility.rs b/src/test/ui/shadowed/shadowed-use-visibility.rs index e7e57a73de02f..8185e82ee830e 100644 --- a/src/test/ui/shadowed/shadowed-use-visibility.rs +++ b/src/test/ui/shadowed/shadowed-use-visibility.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod foo { pub fn f() {} diff --git a/src/test/ui/shadowed/shadowed-use-visibility.stderr b/src/test/ui/shadowed/shadowed-use-visibility.stderr index 5764ed76ef418..4a0f8611a38de 100644 --- a/src/test/ui/shadowed/shadowed-use-visibility.stderr +++ b/src/test/ui/shadowed/shadowed-use-visibility.stderr @@ -1,11 +1,11 @@ error[E0603]: module `bar` is private - --> $DIR/shadowed-use-visibility.rs:19:9 + --> $DIR/shadowed-use-visibility.rs:9:9 | LL | use foo::bar::f as g; //~ ERROR module `bar` is private | ^^^^^^^^^^^^^^^^ error[E0603]: module `f` is private - --> $DIR/shadowed-use-visibility.rs:25:5 + --> $DIR/shadowed-use-visibility.rs:15:5 | LL | use bar::f::f; //~ ERROR module `f` is private | ^^^^^^^^^ diff --git a/src/test/ui/shadowed/shadowing-in-the-same-pattern.rs b/src/test/ui/shadowed/shadowing-in-the-same-pattern.rs index e847d3324169c..f5872f9fbcf27 100644 --- a/src/test/ui/shadowed/shadowing-in-the-same-pattern.rs +++ b/src/test/ui/shadowed/shadowing-in-the-same-pattern.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test for issue #14581. fn f((a, a): (isize, isize)) {} //~ ERROR identifier `a` is bound more than once diff --git a/src/test/ui/shadowed/shadowing-in-the-same-pattern.stderr b/src/test/ui/shadowed/shadowing-in-the-same-pattern.stderr index 4672289147605..5d0fc912d95c3 100644 --- a/src/test/ui/shadowed/shadowing-in-the-same-pattern.stderr +++ b/src/test/ui/shadowed/shadowing-in-the-same-pattern.stderr @@ -1,11 +1,11 @@ error[E0416]: identifier `a` is bound more than once in the same pattern - --> $DIR/shadowing-in-the-same-pattern.rs:13:10 + --> $DIR/shadowing-in-the-same-pattern.rs:3:10 | LL | fn f((a, a): (isize, isize)) {} //~ ERROR identifier `a` is bound more than once | ^ used in a pattern more than once error[E0416]: identifier `a` is bound more than once in the same pattern - --> $DIR/shadowing-in-the-same-pattern.rs:16:13 + --> $DIR/shadowing-in-the-same-pattern.rs:6:13 | LL | let (a, a) = (1, 1); //~ ERROR identifier `a` is bound more than once | ^ used in a pattern more than once diff --git a/src/test/ui/shift-various-bad-types.rs b/src/test/ui/shift-various-bad-types.rs index 2d06161111ef1..f3857461c9dce 100644 --- a/src/test/ui/shift-various-bad-types.rs +++ b/src/test/ui/shift-various-bad-types.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we can do shifts by any integral type. struct Panolpy { diff --git a/src/test/ui/shift-various-bad-types.stderr b/src/test/ui/shift-various-bad-types.stderr index 7798b619cd9f3..1bcff65ad754f 100644 --- a/src/test/ui/shift-various-bad-types.stderr +++ b/src/test/ui/shift-various-bad-types.stderr @@ -1,5 +1,5 @@ error[E0277]: no implementation for `{integer} >> char` - --> $DIR/shift-various-bad-types.rs:19:8 + --> $DIR/shift-various-bad-types.rs:9:8 | LL | 22 >> p.char; | ^^ no implementation for `{integer} >> char` @@ -7,7 +7,7 @@ LL | 22 >> p.char; = help: the trait `std::ops::Shr` is not implemented for `{integer}` error[E0277]: no implementation for `{integer} >> &str` - --> $DIR/shift-various-bad-types.rs:22:8 + --> $DIR/shift-various-bad-types.rs:12:8 | LL | 22 >> p.str; | ^^ no implementation for `{integer} >> &str` @@ -15,7 +15,7 @@ LL | 22 >> p.str; = help: the trait `std::ops::Shr<&str>` is not implemented for `{integer}` error[E0277]: no implementation for `{integer} >> &Panolpy` - --> $DIR/shift-various-bad-types.rs:25:8 + --> $DIR/shift-various-bad-types.rs:15:8 | LL | 22 >> p; | ^^ no implementation for `{integer} >> &Panolpy` @@ -23,7 +23,7 @@ LL | 22 >> p; = help: the trait `std::ops::Shr<&Panolpy>` is not implemented for `{integer}` error[E0308]: mismatched types - --> $DIR/shift-various-bad-types.rs:35:18 + --> $DIR/shift-various-bad-types.rs:25:18 | LL | let _: i32 = 22_i64 >> 1_i32; | ^^^^^^^^^^^^^^^ expected i32, found i64 diff --git a/src/test/ui/short-error-format.rs b/src/test/ui/short-error-format.rs index 3e6802c51c3a6..acba4674a4d6d 100644 --- a/src/test/ui/short-error-format.rs +++ b/src/test/ui/short-error-format.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --error-format=short fn foo(_: u32) {} diff --git a/src/test/ui/short-error-format.stderr b/src/test/ui/short-error-format.stderr index f7461b837bdc1..8a22d673b9821 100644 --- a/src/test/ui/short-error-format.stderr +++ b/src/test/ui/short-error-format.stderr @@ -1,3 +1,3 @@ -$DIR/short-error-format.rs:16:9: error[E0308]: mismatched types -$DIR/short-error-format.rs:18:7: error[E0599]: no method named `salut` found for type `u32` in the current scope +$DIR/short-error-format.rs:6:9: error[E0308]: mismatched types +$DIR/short-error-format.rs:8:7: error[E0599]: no method named `salut` found for type `u32` in the current scope error: aborting due to 2 previous errors diff --git a/src/test/ui/should-fail-no_gate_irrefutable_if_let_pattern.rs b/src/test/ui/should-fail-no_gate_irrefutable_if_let_pattern.rs index 8c9a24f4e7222..2899298a0cb1d 100644 --- a/src/test/ui/should-fail-no_gate_irrefutable_if_let_pattern.rs +++ b/src/test/ui/should-fail-no_gate_irrefutable_if_let_pattern.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // should-fail-irrefutable_let_patterns fn main() { if let _ = 5 {} diff --git a/src/test/ui/should-fail-no_gate_irrefutable_if_let_pattern.stderr b/src/test/ui/should-fail-no_gate_irrefutable_if_let_pattern.stderr index d8570ad4e83e4..9c9ebc6659b73 100644 --- a/src/test/ui/should-fail-no_gate_irrefutable_if_let_pattern.stderr +++ b/src/test/ui/should-fail-no_gate_irrefutable_if_let_pattern.stderr @@ -1,5 +1,5 @@ error[E0162]: irrefutable if-let pattern - --> $DIR/should-fail-no_gate_irrefutable_if_let_pattern.rs:13:12 + --> $DIR/should-fail-no_gate_irrefutable_if_let_pattern.rs:3:12 | LL | if let _ = 5 {} | ^ irrefutable pattern diff --git a/src/test/ui/should-fail-with_gate_irrefutable_pattern_deny.rs b/src/test/ui/should-fail-with_gate_irrefutable_pattern_deny.rs index 6f95f10c0d93f..1b9b3dc1a4cbe 100644 --- a/src/test/ui/should-fail-with_gate_irrefutable_pattern_deny.rs +++ b/src/test/ui/should-fail-with_gate_irrefutable_pattern_deny.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(irrefutable_let_patterns)] // should-fail-irrefutable_let_patterns_with_gate diff --git a/src/test/ui/should-fail-with_gate_irrefutable_pattern_deny.stderr b/src/test/ui/should-fail-with_gate_irrefutable_pattern_deny.stderr index 9dc0d1968e601..dc670f0e59081 100644 --- a/src/test/ui/should-fail-with_gate_irrefutable_pattern_deny.stderr +++ b/src/test/ui/should-fail-with_gate_irrefutable_pattern_deny.stderr @@ -1,5 +1,5 @@ error: irrefutable if-let pattern - --> $DIR/should-fail-with_gate_irrefutable_pattern_deny.rs:15:5 + --> $DIR/should-fail-with_gate_irrefutable_pattern_deny.rs:5:5 | LL | if let _ = 5 {} | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/simd-intrinsic/simd-intrinsic-declaration-type.rs b/src/test/ui/simd-intrinsic/simd-intrinsic-declaration-type.rs index ef1f4d6f230b3..66e6f6272472d 100644 --- a/src/test/ui/simd-intrinsic/simd-intrinsic-declaration-type.rs +++ b/src/test/ui/simd-intrinsic/simd-intrinsic-declaration-type.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(repr_simd, platform_intrinsics)] #[repr(simd)] diff --git a/src/test/ui/simd-intrinsic/simd-intrinsic-declaration-type.stderr b/src/test/ui/simd-intrinsic/simd-intrinsic-declaration-type.stderr index 4a8fd2d1befc2..7bb049d27df31 100644 --- a/src/test/ui/simd-intrinsic/simd-intrinsic-declaration-type.stderr +++ b/src/test/ui/simd-intrinsic/simd-intrinsic-declaration-type.stderr @@ -1,71 +1,71 @@ error[E0442]: intrinsic argument 1 has wrong type: found `u16`, expected `i16` - --> $DIR/simd-intrinsic-declaration-type.rs:42:9 + --> $DIR/simd-intrinsic-declaration-type.rs:32:9 | LL | fn x86_mm_adds_epi16(x: u16x8, y: u16x8) -> u16x8; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0442]: intrinsic argument 2 has wrong type: found `u16`, expected `i16` - --> $DIR/simd-intrinsic-declaration-type.rs:42:9 + --> $DIR/simd-intrinsic-declaration-type.rs:32:9 | LL | fn x86_mm_adds_epi16(x: u16x8, y: u16x8) -> u16x8; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0442]: intrinsic return value has wrong type: found `u16`, expected `i16` - --> $DIR/simd-intrinsic-declaration-type.rs:42:9 + --> $DIR/simd-intrinsic-declaration-type.rs:32:9 | LL | fn x86_mm_adds_epi16(x: u16x8, y: u16x8) -> u16x8; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0442]: intrinsic argument 1 has wrong type: found `i16`, expected `u16` - --> $DIR/simd-intrinsic-declaration-type.rs:46:9 + --> $DIR/simd-intrinsic-declaration-type.rs:36:9 | LL | fn x86_mm_adds_epu16(x: i16x8, y: i16x8) -> i16x8; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0442]: intrinsic argument 2 has wrong type: found `i16`, expected `u16` - --> $DIR/simd-intrinsic-declaration-type.rs:46:9 + --> $DIR/simd-intrinsic-declaration-type.rs:36:9 | LL | fn x86_mm_adds_epu16(x: i16x8, y: i16x8) -> i16x8; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0442]: intrinsic return value has wrong type: found `i16`, expected `u16` - --> $DIR/simd-intrinsic-declaration-type.rs:46:9 + --> $DIR/simd-intrinsic-declaration-type.rs:36:9 | LL | fn x86_mm_adds_epu16(x: i16x8, y: i16x8) -> i16x8; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0442]: intrinsic argument 1 has wrong type: found vector with length 16, expected length 8 - --> $DIR/simd-intrinsic-declaration-type.rs:54:5 + --> $DIR/simd-intrinsic-declaration-type.rs:44:5 | LL | fn x86_mm_adds_epi16(x: i8x16, y: i32x4) -> i64x2; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0442]: intrinsic argument 2 has wrong type: found vector with length 4, expected length 8 - --> $DIR/simd-intrinsic-declaration-type.rs:54:5 + --> $DIR/simd-intrinsic-declaration-type.rs:44:5 | LL | fn x86_mm_adds_epi16(x: i8x16, y: i32x4) -> i64x2; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0442]: intrinsic return value has wrong type: found vector with length 2, expected length 8 - --> $DIR/simd-intrinsic-declaration-type.rs:54:5 + --> $DIR/simd-intrinsic-declaration-type.rs:44:5 | LL | fn x86_mm_adds_epi16(x: i8x16, y: i32x4) -> i64x2; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0442]: intrinsic argument 1 has wrong type: found `i32`, expected `f32` - --> $DIR/simd-intrinsic-declaration-type.rs:61:5 + --> $DIR/simd-intrinsic-declaration-type.rs:51:5 | LL | fn x86_mm_max_ps(x: i32x4, y: i32x4) -> i32x4; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0442]: intrinsic argument 2 has wrong type: found `i32`, expected `f32` - --> $DIR/simd-intrinsic-declaration-type.rs:61:5 + --> $DIR/simd-intrinsic-declaration-type.rs:51:5 | LL | fn x86_mm_max_ps(x: i32x4, y: i32x4) -> i32x4; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0442]: intrinsic return value has wrong type: found `i32`, expected `f32` - --> $DIR/simd-intrinsic-declaration-type.rs:61:5 + --> $DIR/simd-intrinsic-declaration-type.rs:51:5 | LL | fn x86_mm_max_ps(x: i32x4, y: i32x4) -> i32x4; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/simd-intrinsic/simd-intrinsic-generic-arithmetic.rs b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-arithmetic.rs index ee08ca05e803f..7686b389a71c6 100644 --- a/src/test/ui/simd-intrinsic/simd-intrinsic-generic-arithmetic.rs +++ b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-arithmetic.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(repr_simd, platform_intrinsics)] #![allow(non_camel_case_types)] #[repr(simd)] diff --git a/src/test/ui/simd-intrinsic/simd-intrinsic-generic-arithmetic.stderr b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-arithmetic.stderr index f81fa75c56b3f..27493950af0c6 100644 --- a/src/test/ui/simd-intrinsic/simd-intrinsic-generic-arithmetic.stderr +++ b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-arithmetic.stderr @@ -1,83 +1,83 @@ error[E0511]: invalid monomorphization of `simd_add` intrinsic: expected SIMD input type, found non-SIMD `i32` - --> $DIR/simd-intrinsic-generic-arithmetic.rs:72:9 + --> $DIR/simd-intrinsic-generic-arithmetic.rs:62:9 | LL | simd_add(0, 0); | ^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_sub` intrinsic: expected SIMD input type, found non-SIMD `i32` - --> $DIR/simd-intrinsic-generic-arithmetic.rs:74:9 + --> $DIR/simd-intrinsic-generic-arithmetic.rs:64:9 | LL | simd_sub(0, 0); | ^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_mul` intrinsic: expected SIMD input type, found non-SIMD `i32` - --> $DIR/simd-intrinsic-generic-arithmetic.rs:76:9 + --> $DIR/simd-intrinsic-generic-arithmetic.rs:66:9 | LL | simd_mul(0, 0); | ^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_div` intrinsic: expected SIMD input type, found non-SIMD `i32` - --> $DIR/simd-intrinsic-generic-arithmetic.rs:78:9 + --> $DIR/simd-intrinsic-generic-arithmetic.rs:68:9 | LL | simd_div(0, 0); | ^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_shl` intrinsic: expected SIMD input type, found non-SIMD `i32` - --> $DIR/simd-intrinsic-generic-arithmetic.rs:80:9 + --> $DIR/simd-intrinsic-generic-arithmetic.rs:70:9 | LL | simd_shl(0, 0); | ^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_shr` intrinsic: expected SIMD input type, found non-SIMD `i32` - --> $DIR/simd-intrinsic-generic-arithmetic.rs:82:9 + --> $DIR/simd-intrinsic-generic-arithmetic.rs:72:9 | LL | simd_shr(0, 0); | ^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_and` intrinsic: expected SIMD input type, found non-SIMD `i32` - --> $DIR/simd-intrinsic-generic-arithmetic.rs:84:9 + --> $DIR/simd-intrinsic-generic-arithmetic.rs:74:9 | LL | simd_and(0, 0); | ^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_or` intrinsic: expected SIMD input type, found non-SIMD `i32` - --> $DIR/simd-intrinsic-generic-arithmetic.rs:86:9 + --> $DIR/simd-intrinsic-generic-arithmetic.rs:76:9 | LL | simd_or(0, 0); | ^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_xor` intrinsic: expected SIMD input type, found non-SIMD `i32` - --> $DIR/simd-intrinsic-generic-arithmetic.rs:88:9 + --> $DIR/simd-intrinsic-generic-arithmetic.rs:78:9 | LL | simd_xor(0, 0); | ^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_shl` intrinsic: unsupported operation on `f32x4` with element `f32` - --> $DIR/simd-intrinsic-generic-arithmetic.rs:92:9 + --> $DIR/simd-intrinsic-generic-arithmetic.rs:82:9 | LL | simd_shl(z, z); | ^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_shr` intrinsic: unsupported operation on `f32x4` with element `f32` - --> $DIR/simd-intrinsic-generic-arithmetic.rs:94:9 + --> $DIR/simd-intrinsic-generic-arithmetic.rs:84:9 | LL | simd_shr(z, z); | ^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_and` intrinsic: unsupported operation on `f32x4` with element `f32` - --> $DIR/simd-intrinsic-generic-arithmetic.rs:96:9 + --> $DIR/simd-intrinsic-generic-arithmetic.rs:86:9 | LL | simd_and(z, z); | ^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_or` intrinsic: unsupported operation on `f32x4` with element `f32` - --> $DIR/simd-intrinsic-generic-arithmetic.rs:98:9 + --> $DIR/simd-intrinsic-generic-arithmetic.rs:88:9 | LL | simd_or(z, z); | ^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_xor` intrinsic: unsupported operation on `f32x4` with element `f32` - --> $DIR/simd-intrinsic-generic-arithmetic.rs:100:9 + --> $DIR/simd-intrinsic-generic-arithmetic.rs:90:9 | LL | simd_xor(z, z); | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/simd-intrinsic/simd-intrinsic-generic-cast.rs b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-cast.rs index 4999b790b130a..c4016e75b14f6 100644 --- a/src/test/ui/simd-intrinsic/simd-intrinsic-generic-cast.rs +++ b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-cast.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(repr_simd, platform_intrinsics)] #[repr(simd)] diff --git a/src/test/ui/simd-intrinsic/simd-intrinsic-generic-cast.stderr b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-cast.stderr index 6ad5ac7dbfde4..6e33e3b30f505 100644 --- a/src/test/ui/simd-intrinsic/simd-intrinsic-generic-cast.stderr +++ b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-cast.stderr @@ -1,23 +1,23 @@ error[E0511]: invalid monomorphization of `simd_cast` intrinsic: expected SIMD input type, found non-SIMD `i32` - --> $DIR/simd-intrinsic-generic-cast.rs:42:9 + --> $DIR/simd-intrinsic-generic-cast.rs:32:9 | LL | simd_cast::(0); | ^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_cast` intrinsic: expected SIMD input type, found non-SIMD `i32` - --> $DIR/simd-intrinsic-generic-cast.rs:44:9 + --> $DIR/simd-intrinsic-generic-cast.rs:34:9 | LL | simd_cast::(0); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_cast` intrinsic: expected SIMD return type, found non-SIMD `i32` - --> $DIR/simd-intrinsic-generic-cast.rs:46:9 + --> $DIR/simd-intrinsic-generic-cast.rs:36:9 | LL | simd_cast::(x); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_cast` intrinsic: expected return type with length 4 (same as input type `i32x4`), found `i32x8` with length 8 - --> $DIR/simd-intrinsic-generic-cast.rs:48:9 + --> $DIR/simd-intrinsic-generic-cast.rs:38:9 | LL | simd_cast::<_, i32x8>(x); | ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/simd-intrinsic/simd-intrinsic-generic-comparison.rs b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-comparison.rs index 617b03a87117b..3ac47d17dad76 100644 --- a/src/test/ui/simd-intrinsic/simd-intrinsic-generic-comparison.rs +++ b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-comparison.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(repr_simd, platform_intrinsics)] #[repr(simd)] diff --git a/src/test/ui/simd-intrinsic/simd-intrinsic-generic-comparison.stderr b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-comparison.stderr index 06eb94a4f97c6..d8da2e5ee5788 100644 --- a/src/test/ui/simd-intrinsic/simd-intrinsic-generic-comparison.stderr +++ b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-comparison.stderr @@ -1,107 +1,107 @@ error[E0511]: invalid monomorphization of `simd_eq` intrinsic: expected SIMD input type, found non-SIMD `i32` - --> $DIR/simd-intrinsic-generic-comparison.rs:36:9 + --> $DIR/simd-intrinsic-generic-comparison.rs:26:9 | LL | simd_eq::(0, 0); | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_ne` intrinsic: expected SIMD input type, found non-SIMD `i32` - --> $DIR/simd-intrinsic-generic-comparison.rs:38:9 + --> $DIR/simd-intrinsic-generic-comparison.rs:28:9 | LL | simd_ne::(0, 0); | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_lt` intrinsic: expected SIMD input type, found non-SIMD `i32` - --> $DIR/simd-intrinsic-generic-comparison.rs:40:9 + --> $DIR/simd-intrinsic-generic-comparison.rs:30:9 | LL | simd_lt::(0, 0); | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_le` intrinsic: expected SIMD input type, found non-SIMD `i32` - --> $DIR/simd-intrinsic-generic-comparison.rs:42:9 + --> $DIR/simd-intrinsic-generic-comparison.rs:32:9 | LL | simd_le::(0, 0); | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_gt` intrinsic: expected SIMD input type, found non-SIMD `i32` - --> $DIR/simd-intrinsic-generic-comparison.rs:44:9 + --> $DIR/simd-intrinsic-generic-comparison.rs:34:9 | LL | simd_gt::(0, 0); | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_ge` intrinsic: expected SIMD input type, found non-SIMD `i32` - --> $DIR/simd-intrinsic-generic-comparison.rs:46:9 + --> $DIR/simd-intrinsic-generic-comparison.rs:36:9 | LL | simd_ge::(0, 0); | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_eq` intrinsic: expected SIMD return type, found non-SIMD `i32` - --> $DIR/simd-intrinsic-generic-comparison.rs:49:9 + --> $DIR/simd-intrinsic-generic-comparison.rs:39:9 | LL | simd_eq::<_, i32>(x, x); | ^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_ne` intrinsic: expected SIMD return type, found non-SIMD `i32` - --> $DIR/simd-intrinsic-generic-comparison.rs:51:9 + --> $DIR/simd-intrinsic-generic-comparison.rs:41:9 | LL | simd_ne::<_, i32>(x, x); | ^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_lt` intrinsic: expected SIMD return type, found non-SIMD `i32` - --> $DIR/simd-intrinsic-generic-comparison.rs:53:9 + --> $DIR/simd-intrinsic-generic-comparison.rs:43:9 | LL | simd_lt::<_, i32>(x, x); | ^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_le` intrinsic: expected SIMD return type, found non-SIMD `i32` - --> $DIR/simd-intrinsic-generic-comparison.rs:55:9 + --> $DIR/simd-intrinsic-generic-comparison.rs:45:9 | LL | simd_le::<_, i32>(x, x); | ^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_gt` intrinsic: expected SIMD return type, found non-SIMD `i32` - --> $DIR/simd-intrinsic-generic-comparison.rs:57:9 + --> $DIR/simd-intrinsic-generic-comparison.rs:47:9 | LL | simd_gt::<_, i32>(x, x); | ^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_ge` intrinsic: expected SIMD return type, found non-SIMD `i32` - --> $DIR/simd-intrinsic-generic-comparison.rs:59:9 + --> $DIR/simd-intrinsic-generic-comparison.rs:49:9 | LL | simd_ge::<_, i32>(x, x); | ^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_eq` intrinsic: expected return type with length 4 (same as input type `i32x4`), found `i16x8` with length 8 - --> $DIR/simd-intrinsic-generic-comparison.rs:62:9 + --> $DIR/simd-intrinsic-generic-comparison.rs:52:9 | LL | simd_eq::<_, i16x8>(x, x); | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_ne` intrinsic: expected return type with length 4 (same as input type `i32x4`), found `i16x8` with length 8 - --> $DIR/simd-intrinsic-generic-comparison.rs:64:9 + --> $DIR/simd-intrinsic-generic-comparison.rs:54:9 | LL | simd_ne::<_, i16x8>(x, x); | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_lt` intrinsic: expected return type with length 4 (same as input type `i32x4`), found `i16x8` with length 8 - --> $DIR/simd-intrinsic-generic-comparison.rs:66:9 + --> $DIR/simd-intrinsic-generic-comparison.rs:56:9 | LL | simd_lt::<_, i16x8>(x, x); | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_le` intrinsic: expected return type with length 4 (same as input type `i32x4`), found `i16x8` with length 8 - --> $DIR/simd-intrinsic-generic-comparison.rs:68:9 + --> $DIR/simd-intrinsic-generic-comparison.rs:58:9 | LL | simd_le::<_, i16x8>(x, x); | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_gt` intrinsic: expected return type with length 4 (same as input type `i32x4`), found `i16x8` with length 8 - --> $DIR/simd-intrinsic-generic-comparison.rs:70:9 + --> $DIR/simd-intrinsic-generic-comparison.rs:60:9 | LL | simd_gt::<_, i16x8>(x, x); | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_ge` intrinsic: expected return type with length 4 (same as input type `i32x4`), found `i16x8` with length 8 - --> $DIR/simd-intrinsic-generic-comparison.rs:72:9 + --> $DIR/simd-intrinsic-generic-comparison.rs:62:9 | LL | simd_ge::<_, i16x8>(x, x); | ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/simd-intrinsic/simd-intrinsic-generic-elements.rs b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-elements.rs index 78f7d42e25a1d..28fcb6c57ecf9 100644 --- a/src/test/ui/simd-intrinsic/simd-intrinsic-generic-elements.rs +++ b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-elements.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(repr_simd, platform_intrinsics, rustc_attrs)] #[repr(simd)] diff --git a/src/test/ui/simd-intrinsic/simd-intrinsic-generic-elements.stderr b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-elements.stderr index 5a2def2c8c7d2..2f8ffb6035e53 100644 --- a/src/test/ui/simd-intrinsic/simd-intrinsic-generic-elements.stderr +++ b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-elements.stderr @@ -1,89 +1,89 @@ error[E0511]: invalid monomorphization of `simd_insert` intrinsic: expected SIMD input type, found non-SIMD `i32` - --> $DIR/simd-intrinsic-generic-elements.rs:63:9 + --> $DIR/simd-intrinsic-generic-elements.rs:53:9 | LL | simd_insert(0, 0, 0); | ^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_insert` intrinsic: expected inserted type `i32` (element of input `i32x4`), found `f64` - --> $DIR/simd-intrinsic-generic-elements.rs:65:9 + --> $DIR/simd-intrinsic-generic-elements.rs:55:9 | LL | simd_insert(x, 0, 1.0); | ^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_extract` intrinsic: expected return type `i32` (element of input `i32x4`), found `f32` - --> $DIR/simd-intrinsic-generic-elements.rs:67:9 + --> $DIR/simd-intrinsic-generic-elements.rs:57:9 | LL | simd_extract::<_, f32>(x, 0); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_shuffle2` intrinsic: expected SIMD input type, found non-SIMD `i32` - --> $DIR/simd-intrinsic-generic-elements.rs:70:9 + --> $DIR/simd-intrinsic-generic-elements.rs:60:9 | LL | simd_shuffle2::(0, 0, [0; 2]); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_shuffle3` intrinsic: expected SIMD input type, found non-SIMD `i32` - --> $DIR/simd-intrinsic-generic-elements.rs:72:9 + --> $DIR/simd-intrinsic-generic-elements.rs:62:9 | LL | simd_shuffle3::(0, 0, [0; 3]); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_shuffle4` intrinsic: expected SIMD input type, found non-SIMD `i32` - --> $DIR/simd-intrinsic-generic-elements.rs:74:9 + --> $DIR/simd-intrinsic-generic-elements.rs:64:9 | LL | simd_shuffle4::(0, 0, [0; 4]); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_shuffle8` intrinsic: expected SIMD input type, found non-SIMD `i32` - --> $DIR/simd-intrinsic-generic-elements.rs:76:9 + --> $DIR/simd-intrinsic-generic-elements.rs:66:9 | LL | simd_shuffle8::(0, 0, [0; 8]); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_shuffle2` intrinsic: expected return element type `i32` (element of input `i32x4`), found `f32x2` with element type `f32` - --> $DIR/simd-intrinsic-generic-elements.rs:79:9 + --> $DIR/simd-intrinsic-generic-elements.rs:69:9 | LL | simd_shuffle2::<_, f32x2>(x, x, [0; 2]); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_shuffle3` intrinsic: expected return element type `i32` (element of input `i32x4`), found `f32x3` with element type `f32` - --> $DIR/simd-intrinsic-generic-elements.rs:81:9 + --> $DIR/simd-intrinsic-generic-elements.rs:71:9 | LL | simd_shuffle3::<_, f32x3>(x, x, [0; 3]); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_shuffle4` intrinsic: expected return element type `i32` (element of input `i32x4`), found `f32x4` with element type `f32` - --> $DIR/simd-intrinsic-generic-elements.rs:83:9 + --> $DIR/simd-intrinsic-generic-elements.rs:73:9 | LL | simd_shuffle4::<_, f32x4>(x, x, [0; 4]); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_shuffle8` intrinsic: expected return element type `i32` (element of input `i32x4`), found `f32x8` with element type `f32` - --> $DIR/simd-intrinsic-generic-elements.rs:85:9 + --> $DIR/simd-intrinsic-generic-elements.rs:75:9 | LL | simd_shuffle8::<_, f32x8>(x, x, [0; 8]); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_shuffle2` intrinsic: expected return type of length 2, found `i32x8` with length 8 - --> $DIR/simd-intrinsic-generic-elements.rs:88:9 + --> $DIR/simd-intrinsic-generic-elements.rs:78:9 | LL | simd_shuffle2::<_, i32x8>(x, x, [0; 2]); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_shuffle3` intrinsic: expected return type of length 3, found `i32x4` with length 4 - --> $DIR/simd-intrinsic-generic-elements.rs:90:9 + --> $DIR/simd-intrinsic-generic-elements.rs:80:9 | LL | simd_shuffle3::<_, i32x4>(x, x, [0; 3]); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_shuffle4` intrinsic: expected return type of length 4, found `i32x3` with length 3 - --> $DIR/simd-intrinsic-generic-elements.rs:92:9 + --> $DIR/simd-intrinsic-generic-elements.rs:82:9 | LL | simd_shuffle4::<_, i32x3>(x, x, [0; 4]); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_shuffle8` intrinsic: expected return type of length 8, found `i32x2` with length 2 - --> $DIR/simd-intrinsic-generic-elements.rs:94:9 + --> $DIR/simd-intrinsic-generic-elements.rs:84:9 | LL | simd_shuffle8::<_, i32x2>(x, x, [0; 8]); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/simd-intrinsic/simd-intrinsic-generic-reduction.rs b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-reduction.rs index 725960a866ba0..8e67c27ef2255 100644 --- a/src/test/ui/simd-intrinsic/simd-intrinsic-generic-reduction.rs +++ b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-reduction.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-emscripten // Test that the simd_reduce_{op} intrinsics produce ok-ish error diff --git a/src/test/ui/simd-intrinsic/simd-intrinsic-generic-reduction.stderr b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-reduction.stderr index 47b1e9dac7828..b56de9613ddb4 100644 --- a/src/test/ui/simd-intrinsic/simd-intrinsic-generic-reduction.stderr +++ b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-reduction.stderr @@ -1,71 +1,71 @@ error[E0511]: invalid monomorphization of `simd_reduce_add_ordered` intrinsic: accumulator of simd_reduce_add_ordered is not 0.0 - --> $DIR/simd-intrinsic-generic-reduction.rs:46:9 + --> $DIR/simd-intrinsic-generic-reduction.rs:36:9 | LL | simd_reduce_add_ordered(z, 2_f32); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_reduce_mul_ordered` intrinsic: accumulator of simd_reduce_mul_ordered is not 1.0 - --> $DIR/simd-intrinsic-generic-reduction.rs:48:9 + --> $DIR/simd-intrinsic-generic-reduction.rs:38:9 | LL | simd_reduce_mul_ordered(z, 3_f32); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_reduce_and` intrinsic: expected return type `u32` (element of input `u32x4`), found `f32` - --> $DIR/simd-intrinsic-generic-reduction.rs:51:22 + --> $DIR/simd-intrinsic-generic-reduction.rs:41:22 | LL | let _: f32 = simd_reduce_and(x); | ^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_reduce_or` intrinsic: expected return type `u32` (element of input `u32x4`), found `f32` - --> $DIR/simd-intrinsic-generic-reduction.rs:53:22 + --> $DIR/simd-intrinsic-generic-reduction.rs:43:22 | LL | let _: f32 = simd_reduce_or(x); | ^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_reduce_xor` intrinsic: expected return type `u32` (element of input `u32x4`), found `f32` - --> $DIR/simd-intrinsic-generic-reduction.rs:55:22 + --> $DIR/simd-intrinsic-generic-reduction.rs:45:22 | LL | let _: f32 = simd_reduce_xor(x); | ^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_reduce_and` intrinsic: unsupported simd_reduce_and from `f32x4` with element `f32` to `f32` - --> $DIR/simd-intrinsic-generic-reduction.rs:58:22 + --> $DIR/simd-intrinsic-generic-reduction.rs:48:22 | LL | let _: f32 = simd_reduce_and(z); | ^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_reduce_or` intrinsic: unsupported simd_reduce_or from `f32x4` with element `f32` to `f32` - --> $DIR/simd-intrinsic-generic-reduction.rs:60:22 + --> $DIR/simd-intrinsic-generic-reduction.rs:50:22 | LL | let _: f32 = simd_reduce_or(z); | ^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_reduce_xor` intrinsic: unsupported simd_reduce_xor from `f32x4` with element `f32` to `f32` - --> $DIR/simd-intrinsic-generic-reduction.rs:62:22 + --> $DIR/simd-intrinsic-generic-reduction.rs:52:22 | LL | let _: f32 = simd_reduce_xor(z); | ^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_reduce_all` intrinsic: unsupported simd_reduce_all from `f32x4` with element `f32` to `bool` - --> $DIR/simd-intrinsic-generic-reduction.rs:65:23 + --> $DIR/simd-intrinsic-generic-reduction.rs:55:23 | LL | let _: bool = simd_reduce_all(z); | ^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_reduce_any` intrinsic: unsupported simd_reduce_any from `f32x4` with element `f32` to `bool` - --> $DIR/simd-intrinsic-generic-reduction.rs:67:23 + --> $DIR/simd-intrinsic-generic-reduction.rs:57:23 | LL | let _: bool = simd_reduce_any(z); | ^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_reduce_add_ordered` intrinsic: accumulator of simd_reduce_add_ordered is not a constant - --> $DIR/simd-intrinsic-generic-reduction.rs:77:5 + --> $DIR/simd-intrinsic-generic-reduction.rs:67:5 | LL | simd_reduce_add_ordered(z, x); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_reduce_mul_ordered` intrinsic: accumulator of simd_reduce_mul_ordered is not a constant - --> $DIR/simd-intrinsic-generic-reduction.rs:79:5 + --> $DIR/simd-intrinsic-generic-reduction.rs:69:5 | LL | simd_reduce_mul_ordered(z, x); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/simd-intrinsic/simd-intrinsic-generic-select.rs b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-select.rs index d74d6815d5f5e..ffae2b9b6adaa 100644 --- a/src/test/ui/simd-intrinsic/simd-intrinsic-generic-select.rs +++ b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-select.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the simd_select intrinsic produces ok-ish error // messages when misused. diff --git a/src/test/ui/simd-intrinsic/simd-intrinsic-generic-select.stderr b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-select.stderr index 61e42027039dd..0c51dd62c3b3e 100644 --- a/src/test/ui/simd-intrinsic/simd-intrinsic-generic-select.stderr +++ b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-select.stderr @@ -1,17 +1,17 @@ error[E0511]: invalid monomorphization of `simd_select` intrinsic: mismatched lengths: mask length `8` != other vector length `4` - --> $DIR/simd-intrinsic-generic-select.rs:47:9 + --> $DIR/simd-intrinsic-generic-select.rs:37:9 | LL | simd_select(m8, x, x); | ^^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_select` intrinsic: mask element type is `u32`, expected `i_` - --> $DIR/simd-intrinsic-generic-select.rs:50:9 + --> $DIR/simd-intrinsic-generic-select.rs:40:9 | LL | simd_select(x, x, x); | ^^^^^^^^^^^^^^^^^^^^ error[E0511]: invalid monomorphization of `simd_select` intrinsic: mask element type is `f32`, expected `i_` - --> $DIR/simd-intrinsic-generic-select.rs:53:9 + --> $DIR/simd-intrinsic-generic-select.rs:43:9 | LL | simd_select(z, z, z); | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/simd-intrinsic/simd-intrinsic-single-nominal-type.rs b/src/test/ui/simd-intrinsic/simd-intrinsic-single-nominal-type.rs index 0d0bf240f720a..2396b65498bff 100644 --- a/src/test/ui/simd-intrinsic/simd-intrinsic-single-nominal-type.rs +++ b/src/test/ui/simd-intrinsic/simd-intrinsic-single-nominal-type.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(repr_simd, platform_intrinsics)] #[repr(simd)] diff --git a/src/test/ui/simd-intrinsic/simd-intrinsic-single-nominal-type.stderr b/src/test/ui/simd-intrinsic/simd-intrinsic-single-nominal-type.stderr index 0692aa7275b3f..2754dd17b9963 100644 --- a/src/test/ui/simd-intrinsic/simd-intrinsic-single-nominal-type.stderr +++ b/src/test/ui/simd-intrinsic/simd-intrinsic-single-nominal-type.stderr @@ -1,11 +1,11 @@ error[E0443]: intrinsic return value has wrong type: found `B`, expected `A` which was used for this vector type previously in this signature - --> $DIR/simd-intrinsic-single-nominal-type.rs:23:5 + --> $DIR/simd-intrinsic-single-nominal-type.rs:13:5 | LL | fn x86_mm_adds_epi16(x: A, y: A) -> B; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0443]: intrinsic argument 2 has wrong type: found `B`, expected `A` which was used for this vector type previously in this signature - --> $DIR/simd-intrinsic-single-nominal-type.rs:25:5 + --> $DIR/simd-intrinsic-single-nominal-type.rs:15:5 | LL | fn x86_mm_subs_epi16(x: A, y: B) -> A; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/simd-type-generic-monomorphisation.rs b/src/test/ui/simd-type-generic-monomorphisation.rs index 336855eb5e18b..68eb78759ebd7 100644 --- a/src/test/ui/simd-type-generic-monomorphisation.rs +++ b/src/test/ui/simd-type-generic-monomorphisation.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(repr_simd, platform_intrinsics)] // error-pattern:monomorphising SIMD type `Simd2` with a non-machine element type `X` diff --git a/src/test/ui/simd-type.rs b/src/test/ui/simd-type.rs index cde63aa0cd164..e2c31d29b2c24 100644 --- a/src/test/ui/simd-type.rs +++ b/src/test/ui/simd-type.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(repr_simd)] #[repr(simd)] diff --git a/src/test/ui/simd-type.stderr b/src/test/ui/simd-type.stderr index 5899f4aacc0ba..cc3a589387111 100644 --- a/src/test/ui/simd-type.stderr +++ b/src/test/ui/simd-type.stderr @@ -1,17 +1,17 @@ error[E0075]: SIMD vector cannot be empty - --> $DIR/simd-type.rs:14:1 + --> $DIR/simd-type.rs:4:1 | LL | struct empty; //~ ERROR SIMD vector cannot be empty | ^^^^^^^^^^^^^ error[E0076]: SIMD vector should be homogeneous - --> $DIR/simd-type.rs:17:1 + --> $DIR/simd-type.rs:7:1 | LL | struct i64f64(i64, f64); //~ ERROR SIMD vector should be homogeneous | ^^^^^^^^^^^^^^^^^^^^^^^^ SIMD elements must have the same type error[E0077]: SIMD vector element type should be machine type - --> $DIR/simd-type.rs:20:1 + --> $DIR/simd-type.rs:10:1 | LL | struct int4(isize, isize, isize, isize); //~ ERROR SIMD vector element type should be machine type | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/similar-tokens.rs b/src/test/ui/similar-tokens.rs index 350a2262391b5..b42f3a313e1e7 100644 --- a/src/test/ui/similar-tokens.rs +++ b/src/test/ui/similar-tokens.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod x { pub struct A; pub struct B; diff --git a/src/test/ui/similar-tokens.stderr b/src/test/ui/similar-tokens.stderr index 90acc56cbc999..898c3a0aa95c8 100644 --- a/src/test/ui/similar-tokens.stderr +++ b/src/test/ui/similar-tokens.stderr @@ -1,5 +1,5 @@ error: expected one of `,`, `::`, `as`, or `}`, found `.` - --> $DIR/similar-tokens.rs:17:10 + --> $DIR/similar-tokens.rs:7:10 | LL | use x::{A. B}; //~ ERROR expected one of `,`, `::`, `as`, or `}`, found `.` | ^ expected one of `,`, `::`, `as`, or `}` here diff --git a/src/test/ui/single-primitive-inherent-impl.rs b/src/test/ui/single-primitive-inherent-impl.rs index 0a0f9ce4bd10e..baa23396c1624 100644 --- a/src/test/ui/single-primitive-inherent-impl.rs +++ b/src/test/ui/single-primitive-inherent-impl.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength #![crate_type = "lib"] diff --git a/src/test/ui/single-primitive-inherent-impl.stderr b/src/test/ui/single-primitive-inherent-impl.stderr index b781ee866c0bd..21bbbe693466d 100644 --- a/src/test/ui/single-primitive-inherent-impl.stderr +++ b/src/test/ui/single-primitive-inherent-impl.stderr @@ -1,5 +1,5 @@ error[E0390]: only a single inherent implementation marked with `#[lang = "str"]` is allowed for the `str` primitive - --> $DIR/single-primitive-inherent-impl.rs:21:1 + --> $DIR/single-primitive-inherent-impl.rs:11:1 | LL | / impl str { LL | | //~^ error: only a single inherent implementation marked with `#[lang = "str"]` is allowed for the `str` primitive @@ -7,7 +7,7 @@ LL | | } | |_^ | help: consider using a trait to implement these methods - --> $DIR/single-primitive-inherent-impl.rs:21:1 + --> $DIR/single-primitive-inherent-impl.rs:11:1 | LL | / impl str { LL | | //~^ error: only a single inherent implementation marked with `#[lang = "str"]` is allowed for the `str` primitive diff --git a/src/test/ui/single-use-lifetime/fn-types.rs b/src/test/ui/single-use-lifetime/fn-types.rs index 53fb4cf21f5ec..018535f645d08 100644 --- a/src/test/ui/single-use-lifetime/fn-types.rs +++ b/src/test/ui/single-use-lifetime/fn-types.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(single_use_lifetimes)] #![allow(dead_code)] #![allow(unused_variables)] diff --git a/src/test/ui/single-use-lifetime/fn-types.stderr b/src/test/ui/single-use-lifetime/fn-types.stderr index 6fd2b320472f3..7e23d75c4e589 100644 --- a/src/test/ui/single-use-lifetime/fn-types.stderr +++ b/src/test/ui/single-use-lifetime/fn-types.stderr @@ -1,5 +1,5 @@ error: lifetime parameter `'a` only used once - --> $DIR/fn-types.rs:19:10 + --> $DIR/fn-types.rs:9:10 | LL | a: for<'a> fn(&'a u32), //~ ERROR `'a` only used once | ^^ -- ...is used only here @@ -7,13 +7,13 @@ LL | a: for<'a> fn(&'a u32), //~ ERROR `'a` only used once | this lifetime... | note: lint level defined here - --> $DIR/fn-types.rs:11:9 + --> $DIR/fn-types.rs:1:9 | LL | #![deny(single_use_lifetimes)] | ^^^^^^^^^^^^^^^^^^^^ error[E0581]: return type references lifetime `'a`, which is not constrained by the fn input types - --> $DIR/fn-types.rs:22:22 + --> $DIR/fn-types.rs:12:22 | LL | d: for<'a> fn() -> &'a u32, // OK, used only in return type. | ^^^^^^^ diff --git a/src/test/ui/single-use-lifetime/one-use-in-fn-argument-in-band.rs b/src/test/ui/single-use-lifetime/one-use-in-fn-argument-in-band.rs index 1aad3265cbe0a..c6419e4042623 100644 --- a/src/test/ui/single-use-lifetime/one-use-in-fn-argument-in-band.rs +++ b/src/test/ui/single-use-lifetime/one-use-in-fn-argument-in-band.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(in_band_lifetimes)] #![deny(single_use_lifetimes)] #![allow(dead_code)] diff --git a/src/test/ui/single-use-lifetime/one-use-in-fn-argument-in-band.stderr b/src/test/ui/single-use-lifetime/one-use-in-fn-argument-in-band.stderr index 6d18075ba37cf..8a306014540ef 100644 --- a/src/test/ui/single-use-lifetime/one-use-in-fn-argument-in-band.stderr +++ b/src/test/ui/single-use-lifetime/one-use-in-fn-argument-in-band.stderr @@ -1,5 +1,5 @@ error: lifetime parameter `'a` only used once - --> $DIR/one-use-in-fn-argument-in-band.rs:19:10 + --> $DIR/one-use-in-fn-argument-in-band.rs:9:10 | LL | fn a(x: &'a u32, y: &'b u32) { | ^^ @@ -8,13 +8,13 @@ LL | fn a(x: &'a u32, y: &'b u32) { | ...is used only here | note: lint level defined here - --> $DIR/one-use-in-fn-argument-in-band.rs:12:9 + --> $DIR/one-use-in-fn-argument-in-band.rs:2:9 | LL | #![deny(single_use_lifetimes)] | ^^^^^^^^^^^^^^^^^^^^ error: lifetime parameter `'b` only used once - --> $DIR/one-use-in-fn-argument-in-band.rs:19:22 + --> $DIR/one-use-in-fn-argument-in-band.rs:9:22 | LL | fn a(x: &'a u32, y: &'b u32) { | ^^ diff --git a/src/test/ui/single-use-lifetime/one-use-in-fn-argument.rs b/src/test/ui/single-use-lifetime/one-use-in-fn-argument.rs index 9ac813a24ded3..9cbae68f27b92 100644 --- a/src/test/ui/single-use-lifetime/one-use-in-fn-argument.rs +++ b/src/test/ui/single-use-lifetime/one-use-in-fn-argument.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(single_use_lifetimes)] #![allow(dead_code)] #![allow(unused_variables)] diff --git a/src/test/ui/single-use-lifetime/one-use-in-fn-argument.stderr b/src/test/ui/single-use-lifetime/one-use-in-fn-argument.stderr index 4c13133581bb4..44c512c8da89c 100644 --- a/src/test/ui/single-use-lifetime/one-use-in-fn-argument.stderr +++ b/src/test/ui/single-use-lifetime/one-use-in-fn-argument.stderr @@ -1,5 +1,5 @@ error: lifetime parameter `'a` only used once - --> $DIR/one-use-in-fn-argument.rs:18:6 + --> $DIR/one-use-in-fn-argument.rs:8:6 | LL | fn a<'a>(x: &'a u32) { //~ ERROR `'a` only used once | ^^ -- ...is used only here @@ -7,7 +7,7 @@ LL | fn a<'a>(x: &'a u32) { //~ ERROR `'a` only used once | this lifetime... | note: lint level defined here - --> $DIR/one-use-in-fn-argument.rs:11:9 + --> $DIR/one-use-in-fn-argument.rs:1:9 | LL | #![deny(single_use_lifetimes)] | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/single-use-lifetime/one-use-in-fn-return.rs b/src/test/ui/single-use-lifetime/one-use-in-fn-return.rs index 23275e47b5e28..876a0a564daf5 100644 --- a/src/test/ui/single-use-lifetime/one-use-in-fn-return.rs +++ b/src/test/ui/single-use-lifetime/one-use-in-fn-return.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![deny(single_use_lifetimes)] diff --git a/src/test/ui/single-use-lifetime/one-use-in-inherent-impl-header.rs b/src/test/ui/single-use-lifetime/one-use-in-inherent-impl-header.rs index a862bbbe30c09..56d12c795a9bf 100644 --- a/src/test/ui/single-use-lifetime/one-use-in-inherent-impl-header.rs +++ b/src/test/ui/single-use-lifetime/one-use-in-inherent-impl-header.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(single_use_lifetimes)] #![allow(dead_code)] #![allow(unused_variables)] diff --git a/src/test/ui/single-use-lifetime/one-use-in-inherent-impl-header.stderr b/src/test/ui/single-use-lifetime/one-use-in-inherent-impl-header.stderr index 2509366f9696f..82f488ed7e444 100644 --- a/src/test/ui/single-use-lifetime/one-use-in-inherent-impl-header.stderr +++ b/src/test/ui/single-use-lifetime/one-use-in-inherent-impl-header.stderr @@ -1,5 +1,5 @@ error: lifetime parameter `'f` only used once - --> $DIR/one-use-in-inherent-impl-header.rs:24:6 + --> $DIR/one-use-in-inherent-impl-header.rs:14:6 | LL | impl<'f> Foo<'f> { //~ ERROR `'f` only used once | ^^ -- ...is used only here @@ -7,7 +7,7 @@ LL | impl<'f> Foo<'f> { //~ ERROR `'f` only used once | this lifetime... | note: lint level defined here - --> $DIR/one-use-in-inherent-impl-header.rs:11:9 + --> $DIR/one-use-in-inherent-impl-header.rs:1:9 | LL | #![deny(single_use_lifetimes)] | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/single-use-lifetime/one-use-in-inherent-method-argument.rs b/src/test/ui/single-use-lifetime/one-use-in-inherent-method-argument.rs index 863d8faef6ea1..006f78e17952c 100644 --- a/src/test/ui/single-use-lifetime/one-use-in-inherent-method-argument.rs +++ b/src/test/ui/single-use-lifetime/one-use-in-inherent-method-argument.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(single_use_lifetimes)] #![allow(dead_code)] #![allow(unused_variables)] diff --git a/src/test/ui/single-use-lifetime/one-use-in-inherent-method-argument.stderr b/src/test/ui/single-use-lifetime/one-use-in-inherent-method-argument.stderr index cfc8dbf18dc01..6a7ebd2256b2e 100644 --- a/src/test/ui/single-use-lifetime/one-use-in-inherent-method-argument.stderr +++ b/src/test/ui/single-use-lifetime/one-use-in-inherent-method-argument.stderr @@ -1,5 +1,5 @@ error: lifetime parameter `'a` only used once - --> $DIR/one-use-in-inherent-method-argument.rs:22:19 + --> $DIR/one-use-in-inherent-method-argument.rs:12:19 | LL | fn inherent_a<'a>(&self, data: &'a u32) { //~ ERROR `'a` only used once | ^^ -- ...is used only here @@ -7,13 +7,13 @@ LL | fn inherent_a<'a>(&self, data: &'a u32) { //~ ERROR `'a` only used once | this lifetime... | note: lint level defined here - --> $DIR/one-use-in-inherent-method-argument.rs:11:9 + --> $DIR/one-use-in-inherent-method-argument.rs:1:9 | LL | #![deny(single_use_lifetimes)] | ^^^^^^^^^^^^^^^^^^^^ error: lifetime parameter `'f` only used once - --> $DIR/one-use-in-inherent-method-argument.rs:21:6 + --> $DIR/one-use-in-inherent-method-argument.rs:11:6 | LL | impl<'f> Foo<'f> { //~ ERROR `'f` only used once | ^^ -- ...is used only here diff --git a/src/test/ui/single-use-lifetime/one-use-in-inherent-method-return.rs b/src/test/ui/single-use-lifetime/one-use-in-inherent-method-return.rs index 92e4ff3436b04..c5938f4a10bbc 100644 --- a/src/test/ui/single-use-lifetime/one-use-in-inherent-method-return.rs +++ b/src/test/ui/single-use-lifetime/one-use-in-inherent-method-return.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(single_use_lifetimes)] #![allow(dead_code)] #![allow(unused_variables)] diff --git a/src/test/ui/single-use-lifetime/one-use-in-inherent-method-return.stderr b/src/test/ui/single-use-lifetime/one-use-in-inherent-method-return.stderr index 8aa19d4e3ee91..f0e4ac411c2ba 100644 --- a/src/test/ui/single-use-lifetime/one-use-in-inherent-method-return.stderr +++ b/src/test/ui/single-use-lifetime/one-use-in-inherent-method-return.stderr @@ -1,5 +1,5 @@ error: lifetime parameter `'f` only used once - --> $DIR/one-use-in-inherent-method-return.rs:22:6 + --> $DIR/one-use-in-inherent-method-return.rs:12:6 | LL | impl<'f> Foo<'f> { //~ ERROR `'f` only used once | ^^ -- ...is used only here @@ -7,7 +7,7 @@ LL | impl<'f> Foo<'f> { //~ ERROR `'f` only used once | this lifetime... | note: lint level defined here - --> $DIR/one-use-in-inherent-method-return.rs:11:9 + --> $DIR/one-use-in-inherent-method-return.rs:1:9 | LL | #![deny(single_use_lifetimes)] | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/single-use-lifetime/one-use-in-struct.rs b/src/test/ui/single-use-lifetime/one-use-in-struct.rs index 1e1426c145b11..e0328c9d94a14 100644 --- a/src/test/ui/single-use-lifetime/one-use-in-struct.rs +++ b/src/test/ui/single-use-lifetime/one-use-in-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we do not warn for named lifetimes in structs, // even when they are only used once (since to not use a named // lifetime is illegal!) diff --git a/src/test/ui/single-use-lifetime/one-use-in-trait-method-argument.rs b/src/test/ui/single-use-lifetime/one-use-in-trait-method-argument.rs index 389ba5c873ad8..cfd92668af5cf 100644 --- a/src/test/ui/single-use-lifetime/one-use-in-trait-method-argument.rs +++ b/src/test/ui/single-use-lifetime/one-use-in-trait-method-argument.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we DO warn for a lifetime on an impl used only in `&self` // in a trait method. diff --git a/src/test/ui/single-use-lifetime/one-use-in-trait-method-argument.stderr b/src/test/ui/single-use-lifetime/one-use-in-trait-method-argument.stderr index 4a796d83242fd..1010d91f7e3b0 100644 --- a/src/test/ui/single-use-lifetime/one-use-in-trait-method-argument.stderr +++ b/src/test/ui/single-use-lifetime/one-use-in-trait-method-argument.stderr @@ -1,5 +1,5 @@ error: lifetime parameter `'g` only used once - --> $DIR/one-use-in-trait-method-argument.rs:25:13 + --> $DIR/one-use-in-trait-method-argument.rs:15:13 | LL | fn next<'g>(&'g mut self) -> Option { //~ ERROR `'g` only used once | ^^ -- ...is used only here @@ -7,7 +7,7 @@ LL | fn next<'g>(&'g mut self) -> Option { //~ ERROR `'g` only u | this lifetime... | note: lint level defined here - --> $DIR/one-use-in-trait-method-argument.rs:14:9 + --> $DIR/one-use-in-trait-method-argument.rs:4:9 | LL | #![deny(single_use_lifetimes)] | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/single-use-lifetime/two-uses-in-fn-argument-and-return.rs b/src/test/ui/single-use-lifetime/two-uses-in-fn-argument-and-return.rs index a6183e3d5c8e1..4cdf1530a927b 100644 --- a/src/test/ui/single-use-lifetime/two-uses-in-fn-argument-and-return.rs +++ b/src/test/ui/single-use-lifetime/two-uses-in-fn-argument-and-return.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we DO NOT warn when lifetime name is used in // both the argument and return. // diff --git a/src/test/ui/single-use-lifetime/two-uses-in-fn-arguments.rs b/src/test/ui/single-use-lifetime/two-uses-in-fn-arguments.rs index 81adf89fd4330..375366e41c639 100644 --- a/src/test/ui/single-use-lifetime/two-uses-in-fn-arguments.rs +++ b/src/test/ui/single-use-lifetime/two-uses-in-fn-arguments.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we DO NOT warn when lifetime name is used multiple // arguments, or more than once in a single argument. // diff --git a/src/test/ui/single-use-lifetime/two-uses-in-inherent-impl-header.rs b/src/test/ui/single-use-lifetime/two-uses-in-inherent-impl-header.rs index ca5c519e05a16..63d03a2cf0a85 100644 --- a/src/test/ui/single-use-lifetime/two-uses-in-inherent-impl-header.rs +++ b/src/test/ui/single-use-lifetime/two-uses-in-inherent-impl-header.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we DO NOT warn for a lifetime used twice in an impl. // // compile-pass diff --git a/src/test/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.rs b/src/test/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.rs index 9345fe59d9449..06ab6cdbfaebd 100644 --- a/src/test/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.rs +++ b/src/test/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we DO NOT warn for a lifetime used twice in an impl method and // header. diff --git a/src/test/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.stderr b/src/test/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.stderr index b4b370d6e976b..7a1af1323d8dd 100644 --- a/src/test/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.stderr +++ b/src/test/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.stderr @@ -1,5 +1,5 @@ error: lifetime parameter `'f` only used once - --> $DIR/two-uses-in-inherent-method-argument-and-return.rs:22:6 + --> $DIR/two-uses-in-inherent-method-argument-and-return.rs:12:6 | LL | impl<'f> Foo<'f> { //~ ERROR `'f` only used once | ^^ -- ...is used only here @@ -7,7 +7,7 @@ LL | impl<'f> Foo<'f> { //~ ERROR `'f` only used once | this lifetime... | note: lint level defined here - --> $DIR/two-uses-in-inherent-method-argument-and-return.rs:14:9 + --> $DIR/two-uses-in-inherent-method-argument-and-return.rs:4:9 | LL | #![deny(single_use_lifetimes)] | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/single-use-lifetime/two-uses-in-trait-impl.rs b/src/test/ui/single-use-lifetime/two-uses-in-trait-impl.rs index c298c958ef0f9..d4a0d71713ccd 100644 --- a/src/test/ui/single-use-lifetime/two-uses-in-trait-impl.rs +++ b/src/test/ui/single-use-lifetime/two-uses-in-trait-impl.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we DO NOT warn for a lifetime on an impl used in both // header and in an associated type. // diff --git a/src/test/ui/single-use-lifetime/zero-uses-in-fn.rs b/src/test/ui/single-use-lifetime/zero-uses-in-fn.rs index 7152d122f79a3..25fd21a46c960 100644 --- a/src/test/ui/single-use-lifetime/zero-uses-in-fn.rs +++ b/src/test/ui/single-use-lifetime/zero-uses-in-fn.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we DO warn when lifetime name is not used at all. #![deny(unused_lifetimes)] diff --git a/src/test/ui/single-use-lifetime/zero-uses-in-fn.stderr b/src/test/ui/single-use-lifetime/zero-uses-in-fn.stderr index 322351a0a8e5b..5946f7f36138b 100644 --- a/src/test/ui/single-use-lifetime/zero-uses-in-fn.stderr +++ b/src/test/ui/single-use-lifetime/zero-uses-in-fn.stderr @@ -1,11 +1,11 @@ error: lifetime parameter `'a` never used - --> $DIR/zero-uses-in-fn.rs:17:6 + --> $DIR/zero-uses-in-fn.rs:7:6 | LL | fn d<'a>() { } //~ ERROR `'a` never used | ^^ | note: lint level defined here - --> $DIR/zero-uses-in-fn.rs:13:9 + --> $DIR/zero-uses-in-fn.rs:3:9 | LL | #![deny(unused_lifetimes)] | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/single-use-lifetime/zero-uses-in-impl.rs b/src/test/ui/single-use-lifetime/zero-uses-in-impl.rs index a231c0bf00331..d91fc7042b8e8 100644 --- a/src/test/ui/single-use-lifetime/zero-uses-in-impl.rs +++ b/src/test/ui/single-use-lifetime/zero-uses-in-impl.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we DO warn when lifetime name is not used at all. #![deny(unused_lifetimes)] diff --git a/src/test/ui/single-use-lifetime/zero-uses-in-impl.stderr b/src/test/ui/single-use-lifetime/zero-uses-in-impl.stderr index 34cb15c1339d8..eb183b89566c4 100644 --- a/src/test/ui/single-use-lifetime/zero-uses-in-impl.stderr +++ b/src/test/ui/single-use-lifetime/zero-uses-in-impl.stderr @@ -1,11 +1,11 @@ error: lifetime parameter `'a` never used - --> $DIR/zero-uses-in-impl.rs:19:6 + --> $DIR/zero-uses-in-impl.rs:9:6 | LL | impl<'a> Foo { } //~ ERROR `'a` never used | ^^ | note: lint level defined here - --> $DIR/zero-uses-in-impl.rs:13:9 + --> $DIR/zero-uses-in-impl.rs:3:9 | LL | #![deny(unused_lifetimes)] | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/sized-cycle-note.rs b/src/test/ui/sized-cycle-note.rs index 712b4ac22f068..ca8be5692ba97 100644 --- a/src/test/ui/sized-cycle-note.rs +++ b/src/test/ui/sized-cycle-note.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test the error message resulting from a cycle in solving `Foo: // Sized`. The specifics of the message will of course but the main // thing we want to preserve is that: diff --git a/src/test/ui/sized-cycle-note.stderr b/src/test/ui/sized-cycle-note.stderr index 9665715203860..95bdc34942645 100644 --- a/src/test/ui/sized-cycle-note.stderr +++ b/src/test/ui/sized-cycle-note.stderr @@ -1,5 +1,5 @@ error[E0072]: recursive type `Baz` has infinite size - --> $DIR/sized-cycle-note.rs:19:1 + --> $DIR/sized-cycle-note.rs:9:1 | LL | struct Baz { q: Option } | ^^^^^^^^^^ -------------- recursive without indirection @@ -9,7 +9,7 @@ LL | struct Baz { q: Option } = help: insert indirection (e.g., a `Box`, `Rc`, or `&`) at some point to make `Baz` representable error[E0072]: recursive type `Foo` has infinite size - --> $DIR/sized-cycle-note.rs:21:1 + --> $DIR/sized-cycle-note.rs:11:1 | LL | struct Foo { q: Option } | ^^^^^^^^^^ -------------- recursive without indirection diff --git a/src/test/ui/slice-2.rs b/src/test/ui/slice-2.rs index 44b9d94c5665c..5423e295a8773 100644 --- a/src/test/ui/slice-2.rs +++ b/src/test/ui/slice-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that slicing syntax gives errors if we have not implemented the trait. struct Foo; diff --git a/src/test/ui/slice-2.stderr b/src/test/ui/slice-2.stderr index e0f34daf51333..ef0eeb7a8da3f 100644 --- a/src/test/ui/slice-2.stderr +++ b/src/test/ui/slice-2.stderr @@ -1,23 +1,23 @@ error[E0608]: cannot index into a value of type `Foo` - --> $DIR/slice-2.rs:17:6 + --> $DIR/slice-2.rs:7:6 | LL | &x[..]; //~ ERROR cannot index into a value of type `Foo` | ^^^^^ error[E0608]: cannot index into a value of type `Foo` - --> $DIR/slice-2.rs:18:6 + --> $DIR/slice-2.rs:8:6 | LL | &x[Foo..]; //~ ERROR cannot index into a value of type `Foo` | ^^^^^^^^ error[E0608]: cannot index into a value of type `Foo` - --> $DIR/slice-2.rs:19:6 + --> $DIR/slice-2.rs:9:6 | LL | &x[..Foo]; //~ ERROR cannot index into a value of type `Foo` | ^^^^^^^^ error[E0608]: cannot index into a value of type `Foo` - --> $DIR/slice-2.rs:20:6 + --> $DIR/slice-2.rs:10:6 | LL | &x[Foo..Foo]; //~ ERROR cannot index into a value of type `Foo` | ^^^^^^^^^^^ diff --git a/src/test/ui/slice-mut-2.nll.stderr b/src/test/ui/slice-mut-2.nll.stderr index 98d9297e112a4..eeef23e694b7a 100644 --- a/src/test/ui/slice-mut-2.nll.stderr +++ b/src/test/ui/slice-mut-2.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference - --> $DIR/slice-mut-2.rs:17:18 + --> $DIR/slice-mut-2.rs:7:18 | LL | let x: &[isize] = &[1, 2, 3, 4, 5]; | ---------------- help: consider changing this to be a mutable reference: `&mut [1, 2, 3, 4, 5]` diff --git a/src/test/ui/slice-mut-2.rs b/src/test/ui/slice-mut-2.rs index e20e968a0126e..9586103f5f18c 100644 --- a/src/test/ui/slice-mut-2.rs +++ b/src/test/ui/slice-mut-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test mutability and slicing syntax. fn main() { diff --git a/src/test/ui/slice-mut-2.stderr b/src/test/ui/slice-mut-2.stderr index 4483c6f1a8a2e..07a8bd7699ec2 100644 --- a/src/test/ui/slice-mut-2.stderr +++ b/src/test/ui/slice-mut-2.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow immutable borrowed content `*x` as mutable - --> $DIR/slice-mut-2.rs:17:18 + --> $DIR/slice-mut-2.rs:7:18 | LL | let _ = &mut x[2..4]; //~ERROR cannot borrow immutable borrowed content `*x` as mutable | ^ cannot borrow as mutable diff --git a/src/test/ui/slice-mut.rs b/src/test/ui/slice-mut.rs index bee3704a353d3..dc5ef58eb33c8 100644 --- a/src/test/ui/slice-mut.rs +++ b/src/test/ui/slice-mut.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test mutability and slicing syntax. fn main() { diff --git a/src/test/ui/slice-mut.stderr b/src/test/ui/slice-mut.stderr index 59b70959d86e9..e99d83d0fed38 100644 --- a/src/test/ui/slice-mut.stderr +++ b/src/test/ui/slice-mut.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/slice-mut.rs:17:22 + --> $DIR/slice-mut.rs:7:22 | LL | let y: &mut[_] = &x[2..4]; | ^^^^^^^^ types differ in mutability diff --git a/src/test/ui/slightly-nice-generic-literal-messages.rs b/src/test/ui/slightly-nice-generic-literal-messages.rs index 2eba7c2e534e1..fcbc2a169a53c 100644 --- 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::marker; struct Foo(T, marker::PhantomData); diff --git a/src/test/ui/slightly-nice-generic-literal-messages.stderr b/src/test/ui/slightly-nice-generic-literal-messages.stderr index 463eb98b4eeb7..767faf5291488 100644 --- a/src/test/ui/slightly-nice-generic-literal-messages.stderr +++ b/src/test/ui/slightly-nice-generic-literal-messages.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/slightly-nice-generic-literal-messages.rs:17:9 + --> $DIR/slightly-nice-generic-literal-messages.rs:7:9 | LL | 1 => {} | ^ expected struct `Foo`, found integral variable diff --git a/src/test/ui/span/E0046.rs b/src/test/ui/span/E0046.rs index 53813a4f5864c..9611098926880 100644 --- a/src/test/ui/span/E0046.rs +++ b/src/test/ui/span/E0046.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn foo(); } diff --git a/src/test/ui/span/E0046.stderr b/src/test/ui/span/E0046.stderr index 035e2e08720c9..1323524f20850 100644 --- a/src/test/ui/span/E0046.stderr +++ b/src/test/ui/span/E0046.stderr @@ -1,5 +1,5 @@ error[E0046]: not all trait items implemented, missing: `foo` - --> $DIR/E0046.rs:17:1 + --> $DIR/E0046.rs:7:1 | LL | fn foo(); | --------- `foo` from trait diff --git a/src/test/ui/span/E0057.rs b/src/test/ui/span/E0057.rs index 1fb5498b099c9..83f941f65b988 100644 --- a/src/test/ui/span/E0057.rs +++ b/src/test/ui/span/E0057.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let f = |x| x * 3; let a = f(); //~ ERROR E0057 diff --git a/src/test/ui/span/E0057.stderr b/src/test/ui/span/E0057.stderr index fb3e710b8cf9d..5906a05c32c97 100644 --- a/src/test/ui/span/E0057.stderr +++ b/src/test/ui/span/E0057.stderr @@ -1,11 +1,11 @@ error[E0057]: this function takes 1 parameter but 0 parameters were supplied - --> $DIR/E0057.rs:13:13 + --> $DIR/E0057.rs:3:13 | LL | let a = f(); //~ ERROR E0057 | ^^^ expected 1 parameter error[E0057]: this function takes 1 parameter but 2 parameters were supplied - --> $DIR/E0057.rs:15:13 + --> $DIR/E0057.rs:5:13 | LL | let c = f(2, 3); //~ ERROR E0057 | ^^^^^^^ expected 1 parameter diff --git a/src/test/ui/span/E0072.rs b/src/test/ui/span/E0072.rs index 554dfc619d7b7..bc284cdcb4708 100644 --- a/src/test/ui/span/E0072.rs +++ b/src/test/ui/span/E0072.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct ListNode { //~ ERROR has infinite size head: u8, tail: Option, diff --git a/src/test/ui/span/E0072.stderr b/src/test/ui/span/E0072.stderr index f8bf41fefa8f3..4cb9eb308022e 100644 --- a/src/test/ui/span/E0072.stderr +++ b/src/test/ui/span/E0072.stderr @@ -1,5 +1,5 @@ error[E0072]: recursive type `ListNode` has infinite size - --> $DIR/E0072.rs:11:1 + --> $DIR/E0072.rs:1:1 | LL | struct ListNode { //~ ERROR has infinite size | ^^^^^^^^^^^^^^^ recursive type has infinite size diff --git a/src/test/ui/span/E0204.rs b/src/test/ui/span/E0204.rs index 0ad6b67330d1a..174de8cdd63fa 100644 --- a/src/test/ui/span/E0204.rs +++ b/src/test/ui/span/E0204.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { foo: Vec, } diff --git a/src/test/ui/span/E0204.stderr b/src/test/ui/span/E0204.stderr index 2949a22747b87..acb7cd2a557dc 100644 --- a/src/test/ui/span/E0204.stderr +++ b/src/test/ui/span/E0204.stderr @@ -1,5 +1,5 @@ error[E0204]: the trait `Copy` may not be implemented for this type - --> $DIR/E0204.rs:15:6 + --> $DIR/E0204.rs:5:6 | LL | foo: Vec, | ------------- this field does not implement `Copy` @@ -8,7 +8,7 @@ LL | impl Copy for Foo { } //~ ERROR may not be implemented for this type | ^^^^ error[E0204]: the trait `Copy` may not be implemented for this type - --> $DIR/E0204.rs:17:10 + --> $DIR/E0204.rs:7:10 | LL | #[derive(Copy)] //~ ERROR may not be implemented for this type | ^^^^ @@ -17,7 +17,7 @@ LL | ty: &'a mut bool, | ---------------- this field does not implement `Copy` error[E0204]: the trait `Copy` may not be implemented for this type - --> $DIR/E0204.rs:27:6 + --> $DIR/E0204.rs:17:6 | LL | Bar { x: Vec }, | ----------- this field does not implement `Copy` @@ -26,7 +26,7 @@ LL | impl Copy for EFoo { } //~ ERROR may not be implemented for this type | ^^^^ error[E0204]: the trait `Copy` may not be implemented for this type - --> $DIR/E0204.rs:29:10 + --> $DIR/E0204.rs:19:10 | LL | #[derive(Copy)] //~ ERROR may not be implemented for this type | ^^^^ diff --git a/src/test/ui/span/E0493.rs b/src/test/ui/span/E0493.rs index de81068e2683d..ad4100205f273 100644 --- a/src/test/ui/span/E0493.rs +++ b/src/test/ui/span/E0493.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { a: u32 } diff --git a/src/test/ui/span/E0493.stderr b/src/test/ui/span/E0493.stderr index 85d83de9d80ee..d05e89e257f45 100644 --- a/src/test/ui/span/E0493.stderr +++ b/src/test/ui/span/E0493.stderr @@ -1,5 +1,5 @@ error[E0493]: destructors cannot be evaluated at compile-time - --> $DIR/E0493.rs:27:17 + --> $DIR/E0493.rs:17:17 | LL | const F : Foo = (Foo { a : 0 }, Foo { a : 1 }).1; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constants cannot evaluate destructors diff --git a/src/test/ui/span/E0535.rs b/src/test/ui/span/E0535.rs index f9219436c780a..e26334e9bbdc6 100644 --- a/src/test/ui/span/E0535.rs +++ b/src/test/ui/span/E0535.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[inline(unknown)] //~ ERROR E0535 pub fn something() {} diff --git a/src/test/ui/span/E0535.stderr b/src/test/ui/span/E0535.stderr index 2191aebbeb213..8502776eb1687 100644 --- a/src/test/ui/span/E0535.stderr +++ b/src/test/ui/span/E0535.stderr @@ -1,5 +1,5 @@ error[E0535]: invalid argument - --> $DIR/E0535.rs:11:10 + --> $DIR/E0535.rs:1:10 | LL | #[inline(unknown)] //~ ERROR E0535 | ^^^^^^^ diff --git a/src/test/ui/span/E0536.rs b/src/test/ui/span/E0536.rs index 127bdc258d947..72de7b6f4530f 100644 --- a/src/test/ui/span/E0536.rs +++ b/src/test/ui/span/E0536.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[cfg(not())] //~ ERROR E0536 pub fn something() {} diff --git a/src/test/ui/span/E0536.stderr b/src/test/ui/span/E0536.stderr index 2b998356c20ba..18e2104f7ad85 100644 --- a/src/test/ui/span/E0536.stderr +++ b/src/test/ui/span/E0536.stderr @@ -1,5 +1,5 @@ error[E0536]: expected 1 cfg-pattern - --> $DIR/E0536.rs:11:7 + --> $DIR/E0536.rs:1:7 | LL | #[cfg(not())] //~ ERROR E0536 | ^^^^^ diff --git a/src/test/ui/span/E0537.rs b/src/test/ui/span/E0537.rs index 497936fbcd28e..4088a9ae53a27 100644 --- a/src/test/ui/span/E0537.rs +++ b/src/test/ui/span/E0537.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[cfg(unknown())] //~ ERROR E0537 pub fn something() {} diff --git a/src/test/ui/span/E0537.stderr b/src/test/ui/span/E0537.stderr index 7257c73acb523..53e8637ea3025 100644 --- a/src/test/ui/span/E0537.stderr +++ b/src/test/ui/span/E0537.stderr @@ -1,5 +1,5 @@ error[E0537]: invalid predicate `unknown` - --> $DIR/E0537.rs:11:7 + --> $DIR/E0537.rs:1:7 | LL | #[cfg(unknown())] //~ ERROR E0537 | ^^^^^^^^^ diff --git a/src/test/ui/span/borrowck-borrow-overloaded-auto-deref-mut.nll.stderr b/src/test/ui/span/borrowck-borrow-overloaded-auto-deref-mut.nll.stderr index 4a693a3b05d4e..1dc805b6d2db2 100644 --- a/src/test/ui/span/borrowck-borrow-overloaded-auto-deref-mut.nll.stderr +++ b/src/test/ui/span/borrowck-borrow-overloaded-auto-deref-mut.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:63:24 + --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:53:24 | LL | fn deref_mut_field1(x: Own) { | - help: consider changing this to be mutable: `mut x` @@ -7,7 +7,7 @@ LL | let __isize = &mut x.y; //~ ERROR cannot borrow | ^ cannot borrow as mutable error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference - --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:75:10 + --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:65:10 | LL | fn deref_extend_mut_field1(x: &Own) -> &mut isize { | ----------- help: consider changing this to be a mutable reference: `&mut Own` @@ -15,7 +15,7 @@ LL | &mut x.y //~ ERROR cannot borrow | ^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:98:5 + --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:88:5 | LL | fn assign_field1<'a>(x: Own) { | - help: consider changing this to be mutable: `mut x` @@ -23,7 +23,7 @@ LL | x.y = 3; //~ ERROR cannot borrow | ^ cannot borrow as mutable error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference - --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:102:5 + --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:92:5 | LL | fn assign_field2<'a>(x: &'a Own) { | -------------- help: consider changing this to be a mutable reference: `&'a mut Own` @@ -31,7 +31,7 @@ LL | x.y = 3; //~ ERROR cannot borrow | ^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:119:5 + --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:109:5 | LL | fn deref_mut_method1(x: Own) { | - help: consider changing this to be mutable: `mut x` @@ -39,7 +39,7 @@ LL | x.set(0, 0); //~ ERROR cannot borrow | ^ cannot borrow as mutable error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference - --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:131:5 + --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:121:5 | LL | fn deref_extend_mut_method1(x: &Own) -> &mut isize { | ----------- help: consider changing this to be a mutable reference: `&mut Own` @@ -47,7 +47,7 @@ LL | x.y_mut() //~ ERROR cannot borrow | ^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:139:6 + --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:129:6 | LL | fn assign_method1<'a>(x: Own) { | - help: consider changing this to be mutable: `mut x` @@ -55,7 +55,7 @@ LL | *x.y_mut() = 3; //~ ERROR cannot borrow | ^ cannot borrow as mutable error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference - --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:143:6 + --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:133:6 | LL | fn assign_method2<'a>(x: &'a Own) { | -------------- help: consider changing this to be a mutable reference: `&'a mut Own` diff --git a/src/test/ui/span/borrowck-borrow-overloaded-auto-deref-mut.rs b/src/test/ui/span/borrowck-borrow-overloaded-auto-deref-mut.rs index 764d05be879b8..e5f2805cc19ed 100644 --- a/src/test/ui/span/borrowck-borrow-overloaded-auto-deref-mut.rs +++ b/src/test/ui/span/borrowck-borrow-overloaded-auto-deref-mut.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test how overloaded deref interacts with borrows when DerefMut // is implemented. diff --git a/src/test/ui/span/borrowck-borrow-overloaded-auto-deref-mut.stderr b/src/test/ui/span/borrowck-borrow-overloaded-auto-deref-mut.stderr index 01c0603256c15..09a43c2237361 100644 --- a/src/test/ui/span/borrowck-borrow-overloaded-auto-deref-mut.stderr +++ b/src/test/ui/span/borrowck-borrow-overloaded-auto-deref-mut.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow immutable argument `x` as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:63:24 + --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:53:24 | LL | fn deref_mut_field1(x: Own) { | - consider changing this to `mut x` @@ -7,7 +7,7 @@ LL | let __isize = &mut x.y; //~ ERROR cannot borrow | ^ cannot borrow mutably error[E0596]: cannot borrow immutable borrowed content `*x` as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:75:10 + --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:65:10 | LL | fn deref_extend_mut_field1(x: &Own) -> &mut isize { | ----------- use `&mut Own` here to make mutable @@ -15,7 +15,7 @@ LL | &mut x.y //~ ERROR cannot borrow | ^ cannot borrow as mutable error[E0499]: cannot borrow `*x` as mutable more than once at a time - --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:88:19 + --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:78:19 | LL | let _x = &mut x.x; | - first mutable borrow occurs here @@ -25,7 +25,7 @@ LL | } | - first borrow ends here error[E0596]: cannot borrow immutable argument `x` as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:98:5 + --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:88:5 | LL | fn assign_field1<'a>(x: Own) { | - consider changing this to `mut x` @@ -33,7 +33,7 @@ LL | x.y = 3; //~ ERROR cannot borrow | ^ cannot borrow mutably error[E0596]: cannot borrow immutable borrowed content `*x` as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:102:5 + --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:92:5 | LL | fn assign_field2<'a>(x: &'a Own) { | -------------- use `&'a mut Own` here to make mutable @@ -41,7 +41,7 @@ LL | x.y = 3; //~ ERROR cannot borrow | ^ cannot borrow as mutable error[E0499]: cannot borrow `*x` as mutable more than once at a time - --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:111:5 + --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:101:5 | LL | let _p: &mut Point = &mut **x; | -- first mutable borrow occurs here @@ -51,7 +51,7 @@ LL | } | - first borrow ends here error[E0596]: cannot borrow immutable argument `x` as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:119:5 + --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:109:5 | LL | fn deref_mut_method1(x: Own) { | - consider changing this to `mut x` @@ -59,7 +59,7 @@ LL | x.set(0, 0); //~ ERROR cannot borrow | ^ cannot borrow mutably error[E0596]: cannot borrow immutable borrowed content `*x` as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:131:5 + --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:121:5 | LL | fn deref_extend_mut_method1(x: &Own) -> &mut isize { | ----------- use `&mut Own` here to make mutable @@ -67,7 +67,7 @@ LL | x.y_mut() //~ ERROR cannot borrow | ^ cannot borrow as mutable error[E0596]: cannot borrow immutable argument `x` as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:139:6 + --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:129:6 | LL | fn assign_method1<'a>(x: Own) { | - consider changing this to `mut x` @@ -75,7 +75,7 @@ LL | *x.y_mut() = 3; //~ ERROR cannot borrow | ^ cannot borrow mutably error[E0596]: cannot borrow immutable borrowed content `*x` as mutable - --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:143:6 + --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:133:6 | LL | fn assign_method2<'a>(x: &'a Own) { | -------------- use `&'a mut Own` here to make mutable diff --git a/src/test/ui/span/borrowck-borrow-overloaded-deref-mut.nll.stderr b/src/test/ui/span/borrowck-borrow-overloaded-deref-mut.nll.stderr index 44a5062cb4d43..ef80e4bc3d645 100644 --- a/src/test/ui/span/borrowck-borrow-overloaded-deref-mut.nll.stderr +++ b/src/test/ui/span/borrowck-borrow-overloaded-deref-mut.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable - --> $DIR/borrowck-borrow-overloaded-deref-mut.rs:39:25 + --> $DIR/borrowck-borrow-overloaded-deref-mut.rs:29:25 | LL | fn deref_mut1(x: Own) { | - help: consider changing this to be mutable: `mut x` @@ -7,7 +7,7 @@ LL | let __isize = &mut *x; //~ ERROR cannot borrow | ^ cannot borrow as mutable error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference - --> $DIR/borrowck-borrow-overloaded-deref-mut.rs:51:11 + --> $DIR/borrowck-borrow-overloaded-deref-mut.rs:41:11 | LL | fn deref_extend_mut1<'a>(x: &'a Own) -> &'a mut isize { | -------------- help: consider changing this to be a mutable reference: `&'a mut Own` @@ -15,7 +15,7 @@ LL | &mut **x //~ ERROR cannot borrow | ^^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable - --> $DIR/borrowck-borrow-overloaded-deref-mut.rs:59:6 + --> $DIR/borrowck-borrow-overloaded-deref-mut.rs:49:6 | LL | fn assign1<'a>(x: Own) { | - help: consider changing this to be mutable: `mut x` @@ -23,7 +23,7 @@ LL | *x = 3; //~ ERROR cannot borrow | ^ cannot borrow as mutable error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference - --> $DIR/borrowck-borrow-overloaded-deref-mut.rs:63:6 + --> $DIR/borrowck-borrow-overloaded-deref-mut.rs:53:6 | LL | fn assign2<'a>(x: &'a Own) { | -------------- help: consider changing this to be a mutable reference: `&'a mut Own` diff --git a/src/test/ui/span/borrowck-borrow-overloaded-deref-mut.rs b/src/test/ui/span/borrowck-borrow-overloaded-deref-mut.rs index 34b926aab1fa0..8d43d5da430f5 100644 --- a/src/test/ui/span/borrowck-borrow-overloaded-deref-mut.rs +++ b/src/test/ui/span/borrowck-borrow-overloaded-deref-mut.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test how overloaded deref interacts with borrows when DerefMut // is implemented. diff --git a/src/test/ui/span/borrowck-borrow-overloaded-deref-mut.stderr b/src/test/ui/span/borrowck-borrow-overloaded-deref-mut.stderr index 3a28ef36d0593..145887b9d9614 100644 --- a/src/test/ui/span/borrowck-borrow-overloaded-deref-mut.stderr +++ b/src/test/ui/span/borrowck-borrow-overloaded-deref-mut.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow immutable argument `x` as mutable - --> $DIR/borrowck-borrow-overloaded-deref-mut.rs:39:25 + --> $DIR/borrowck-borrow-overloaded-deref-mut.rs:29:25 | LL | fn deref_mut1(x: Own) { | - consider changing this to `mut x` @@ -7,7 +7,7 @@ LL | let __isize = &mut *x; //~ ERROR cannot borrow | ^ cannot borrow mutably error[E0596]: cannot borrow immutable borrowed content `*x` as mutable - --> $DIR/borrowck-borrow-overloaded-deref-mut.rs:51:11 + --> $DIR/borrowck-borrow-overloaded-deref-mut.rs:41:11 | LL | fn deref_extend_mut1<'a>(x: &'a Own) -> &'a mut isize { | -------------- use `&'a mut Own` here to make mutable @@ -15,7 +15,7 @@ LL | &mut **x //~ ERROR cannot borrow | ^^ cannot borrow as mutable error[E0596]: cannot borrow immutable argument `x` as mutable - --> $DIR/borrowck-borrow-overloaded-deref-mut.rs:59:6 + --> $DIR/borrowck-borrow-overloaded-deref-mut.rs:49:6 | LL | fn assign1<'a>(x: Own) { | - consider changing this to `mut x` @@ -23,7 +23,7 @@ LL | *x = 3; //~ ERROR cannot borrow | ^ cannot borrow mutably error[E0596]: cannot borrow immutable borrowed content `*x` as mutable - --> $DIR/borrowck-borrow-overloaded-deref-mut.rs:63:6 + --> $DIR/borrowck-borrow-overloaded-deref-mut.rs:53:6 | LL | fn assign2<'a>(x: &'a Own) { | -------------- use `&'a mut Own` here to make mutable diff --git a/src/test/ui/span/borrowck-call-is-borrow-issue-12224.nll.stderr b/src/test/ui/span/borrowck-call-is-borrow-issue-12224.nll.stderr index a05a3911aa771..9cc19b98e1389 100644 --- a/src/test/ui/span/borrowck-call-is-borrow-issue-12224.nll.stderr +++ b/src/test/ui/span/borrowck-call-is-borrow-issue-12224.nll.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `f` as mutable more than once at a time - --> $DIR/borrowck-call-is-borrow-issue-12224.rs:22:16 + --> $DIR/borrowck-call-is-borrow-issue-12224.rs:12:16 | LL | f(Box::new(|| { | - ^^ second mutable borrow occurs here @@ -13,7 +13,7 @@ LL | | })); | |_______- borrow later used here error[E0596]: cannot borrow `*f` as mutable, as it is behind a `&` reference - --> $DIR/borrowck-call-is-borrow-issue-12224.rs:35:5 + --> $DIR/borrowck-call-is-borrow-issue-12224.rs:25:5 | LL | fn test2(f: &F) where F: FnMut() { | -- help: consider changing this to be a mutable reference: `&mut F` @@ -21,7 +21,7 @@ LL | (*f)(); | ^^^^ `f` is a `&` reference, so the data it refers to cannot be borrowed as mutable error[E0596]: cannot borrow `*f.f` as mutable, as it is behind a `&` reference - --> $DIR/borrowck-call-is-borrow-issue-12224.rs:44:5 + --> $DIR/borrowck-call-is-borrow-issue-12224.rs:34:5 | LL | fn test4(f: &Test) { | ----- help: consider changing this to be a mutable reference: `&mut Test<'_>` @@ -29,7 +29,7 @@ LL | f.f.call_mut(()) | ^^^ `f` is a `&` reference, so the data it refers to cannot be borrowed as mutable error[E0507]: cannot move out of captured variable in an `FnMut` closure - --> $DIR/borrowck-call-is-borrow-issue-12224.rs:66:13 + --> $DIR/borrowck-call-is-borrow-issue-12224.rs:56:13 | LL | let mut f = move |g: Box, b: isize| { | ----- captured outer variable @@ -38,7 +38,7 @@ LL | foo(f); | ^ cannot move out of captured variable in an `FnMut` closure error[E0505]: cannot move out of `f` because it is borrowed - --> $DIR/borrowck-call-is-borrow-issue-12224.rs:65:16 + --> $DIR/borrowck-call-is-borrow-issue-12224.rs:55:16 | LL | f(Box::new(|a| { | - ^^^ move out of `f` occurs here diff --git a/src/test/ui/span/borrowck-call-is-borrow-issue-12224.rs b/src/test/ui/span/borrowck-call-is-borrow-issue-12224.rs index e8227971691e9..cfebd6f700359 100644 --- a/src/test/ui/span/borrowck-call-is-borrow-issue-12224.rs +++ b/src/test/ui/span/borrowck-call-is-borrow-issue-12224.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(fn_traits)] // Ensure that invoking a closure counts as a unique immutable borrow diff --git a/src/test/ui/span/borrowck-call-is-borrow-issue-12224.stderr b/src/test/ui/span/borrowck-call-is-borrow-issue-12224.stderr index 2e7e1e0744141..d81d402fce733 100644 --- a/src/test/ui/span/borrowck-call-is-borrow-issue-12224.stderr +++ b/src/test/ui/span/borrowck-call-is-borrow-issue-12224.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `f` as mutable more than once at a time - --> $DIR/borrowck-call-is-borrow-issue-12224.rs:22:16 + --> $DIR/borrowck-call-is-borrow-issue-12224.rs:12:16 | LL | f(Box::new(|| { | - ^^ second mutable borrow occurs here @@ -12,7 +12,7 @@ LL | })); | - first borrow ends here error[E0596]: cannot borrow immutable borrowed content `*f` as mutable - --> $DIR/borrowck-call-is-borrow-issue-12224.rs:35:5 + --> $DIR/borrowck-call-is-borrow-issue-12224.rs:25:5 | LL | fn test2(f: &F) where F: FnMut() { | -- use `&mut F` here to make mutable @@ -20,7 +20,7 @@ LL | (*f)(); | ^^^^ cannot borrow as mutable error[E0596]: cannot borrow `Box` content `*f.f` of immutable binding as mutable - --> $DIR/borrowck-call-is-borrow-issue-12224.rs:44:5 + --> $DIR/borrowck-call-is-borrow-issue-12224.rs:34:5 | LL | fn test4(f: &Test) { | ----- use `&mut Test` here to make mutable @@ -28,7 +28,7 @@ LL | f.f.call_mut(()) | ^^^ cannot borrow as mutable error[E0504]: cannot move `f` into closure because it is borrowed - --> $DIR/borrowck-call-is-borrow-issue-12224.rs:66:13 + --> $DIR/borrowck-call-is-borrow-issue-12224.rs:56:13 | LL | f(Box::new(|a| { | - borrow of `f` occurs here @@ -36,7 +36,7 @@ LL | foo(f); | ^ move into closure occurs here error[E0507]: cannot move out of captured outer variable in an `FnMut` closure - --> $DIR/borrowck-call-is-borrow-issue-12224.rs:66:13 + --> $DIR/borrowck-call-is-borrow-issue-12224.rs:56:13 | LL | let mut f = move |g: Box, b: isize| { | ----- captured outer variable diff --git a/src/test/ui/span/borrowck-call-method-from-mut-aliasable.nll.stderr b/src/test/ui/span/borrowck-call-method-from-mut-aliasable.nll.stderr index e9c0505af68b2..16c482b575aae 100644 --- a/src/test/ui/span/borrowck-call-method-from-mut-aliasable.nll.stderr +++ b/src/test/ui/span/borrowck-call-method-from-mut-aliasable.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference - --> $DIR/borrowck-call-method-from-mut-aliasable.rs:27:5 + --> $DIR/borrowck-call-method-from-mut-aliasable.rs:17:5 | LL | fn b(x: &Foo) { | ---- help: consider changing this to be a mutable reference: `&mut Foo` diff --git a/src/test/ui/span/borrowck-call-method-from-mut-aliasable.rs b/src/test/ui/span/borrowck-call-method-from-mut-aliasable.rs index bc0b667e895d0..caf2d2a55fc91 100644 --- a/src/test/ui/span/borrowck-call-method-from-mut-aliasable.rs +++ b/src/test/ui/span/borrowck-call-method-from-mut-aliasable.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { x: isize, } diff --git a/src/test/ui/span/borrowck-call-method-from-mut-aliasable.stderr b/src/test/ui/span/borrowck-call-method-from-mut-aliasable.stderr index a18d3c55394df..4875e27ef4552 100644 --- a/src/test/ui/span/borrowck-call-method-from-mut-aliasable.stderr +++ b/src/test/ui/span/borrowck-call-method-from-mut-aliasable.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow immutable borrowed content `*x` as mutable - --> $DIR/borrowck-call-method-from-mut-aliasable.rs:27:5 + --> $DIR/borrowck-call-method-from-mut-aliasable.rs:17:5 | LL | fn b(x: &Foo) { | ---- use `&mut Foo` here to make mutable diff --git a/src/test/ui/span/borrowck-fn-in-const-b.nll.stderr b/src/test/ui/span/borrowck-fn-in-const-b.nll.stderr index 5e47d3271d49f..9133d482c29c6 100644 --- a/src/test/ui/span/borrowck-fn-in-const-b.nll.stderr +++ b/src/test/ui/span/borrowck-fn-in-const-b.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference - --> $DIR/borrowck-fn-in-const-b.rs:17:9 + --> $DIR/borrowck-fn-in-const-b.rs:7:9 | LL | fn broken(x: &Vec) { | ------------ help: consider changing this to be a mutable reference: `&mut std::vec::Vec` diff --git a/src/test/ui/span/borrowck-fn-in-const-b.rs b/src/test/ui/span/borrowck-fn-in-const-b.rs index 7e29b2ee0fd4e..822083efee068 100644 --- a/src/test/ui/span/borrowck-fn-in-const-b.rs +++ b/src/test/ui/span/borrowck-fn-in-const-b.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we check fns appearing in constant declarations. // Issue #22382. diff --git a/src/test/ui/span/borrowck-fn-in-const-b.stderr b/src/test/ui/span/borrowck-fn-in-const-b.stderr index 4b6c62e6ec83a..4a30bdf3b08cb 100644 --- a/src/test/ui/span/borrowck-fn-in-const-b.stderr +++ b/src/test/ui/span/borrowck-fn-in-const-b.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow immutable borrowed content `*x` as mutable - --> $DIR/borrowck-fn-in-const-b.rs:17:9 + --> $DIR/borrowck-fn-in-const-b.rs:7:9 | LL | fn broken(x: &Vec) { | ------------ use `&mut Vec` here to make mutable diff --git a/src/test/ui/span/borrowck-let-suggestion-suffixes.nll.stderr b/src/test/ui/span/borrowck-let-suggestion-suffixes.nll.stderr index 79cfee2d01fd5..cec51b4186b90 100644 --- a/src/test/ui/span/borrowck-let-suggestion-suffixes.nll.stderr +++ b/src/test/ui/span/borrowck-let-suggestion-suffixes.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/borrowck-let-suggestion-suffixes.rs:28:14 + --> $DIR/borrowck-let-suggestion-suffixes.rs:19:14 | LL | v3.push(&id('x')); // statement 6 | ^^^^^^^ - temporary value only lives until here @@ -10,7 +10,7 @@ LL | (v1, v2, v3, /* v4 is above. */ v5).use_ref(); | -- borrow later used here error[E0597]: borrowed value does not live long enough - --> $DIR/borrowck-let-suggestion-suffixes.rs:38:18 + --> $DIR/borrowck-let-suggestion-suffixes.rs:29:18 | LL | v4.push(&id('y')); | ^^^^^^^ - temporary value only lives until here @@ -21,7 +21,7 @@ LL | v4.use_ref(); | -- borrow later used here error[E0597]: borrowed value does not live long enough - --> $DIR/borrowck-let-suggestion-suffixes.rs:49:14 + --> $DIR/borrowck-let-suggestion-suffixes.rs:40:14 | LL | v5.push(&id('z')); | ^^^^^^^ - temporary value only lives until here diff --git a/src/test/ui/span/borrowck-let-suggestion-suffixes.rs b/src/test/ui/span/borrowck-let-suggestion-suffixes.rs index b19a0b4c2c233..4b14907cec04f 100644 --- a/src/test/ui/span/borrowck-let-suggestion-suffixes.rs +++ b/src/test/ui/span/borrowck-let-suggestion-suffixes.rs @@ -1,12 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![feature(rustc_attrs)] fn id(x: T) -> T { x } diff --git a/src/test/ui/span/borrowck-let-suggestion-suffixes.stderr b/src/test/ui/span/borrowck-let-suggestion-suffixes.stderr index dfcd082c0c2ce..8bf542e37ff19 100644 --- a/src/test/ui/span/borrowck-let-suggestion-suffixes.stderr +++ b/src/test/ui/span/borrowck-let-suggestion-suffixes.stderr @@ -1,5 +1,5 @@ error[E0597]: `young[..]` does not live long enough - --> $DIR/borrowck-let-suggestion-suffixes.rs:21:14 + --> $DIR/borrowck-let-suggestion-suffixes.rs:12:14 | LL | v2.push(&young[0]); // statement 4 | ^^^^^^^^ borrowed value does not live long enough @@ -10,7 +10,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: borrowed value does not live long enough - --> $DIR/borrowck-let-suggestion-suffixes.rs:28:14 + --> $DIR/borrowck-let-suggestion-suffixes.rs:19:14 | LL | v3.push(&id('x')); // statement 6 | ^^^^^^^ - temporary value dropped here while still borrowed @@ -23,7 +23,7 @@ LL | } = note: consider using a `let` binding to increase its lifetime error[E0597]: borrowed value does not live long enough - --> $DIR/borrowck-let-suggestion-suffixes.rs:38:18 + --> $DIR/borrowck-let-suggestion-suffixes.rs:29:18 | LL | v4.push(&id('y')); | ^^^^^^^ - temporary value dropped here while still borrowed @@ -36,7 +36,7 @@ LL | } // (statement 7) = note: consider using a `let` binding to increase its lifetime error[E0597]: borrowed value does not live long enough - --> $DIR/borrowck-let-suggestion-suffixes.rs:49:14 + --> $DIR/borrowck-let-suggestion-suffixes.rs:40:14 | LL | v5.push(&id('z')); | ^^^^^^^ - temporary value dropped here while still borrowed diff --git a/src/test/ui/span/borrowck-object-mutability.nll.stderr b/src/test/ui/span/borrowck-object-mutability.nll.stderr index 3f0eb97c7af29..1a5802e98114d 100644 --- a/src/test/ui/span/borrowck-object-mutability.nll.stderr +++ b/src/test/ui/span/borrowck-object-mutability.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference - --> $DIR/borrowck-object-mutability.rs:19:5 + --> $DIR/borrowck-object-mutability.rs:8:5 | LL | fn borrowed_receiver(x: &Foo) { | ---- help: consider changing this to be a mutable reference: `&mut dyn Foo` @@ -8,7 +8,7 @@ LL | x.borrowed_mut(); //~ ERROR cannot borrow | ^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable error[E0596]: cannot borrow `*x` as mutable, as `x` is not declared as mutable - --> $DIR/borrowck-object-mutability.rs:29:5 + --> $DIR/borrowck-object-mutability.rs:18:5 | LL | fn owned_receiver(x: Box) { | - help: consider changing this to be mutable: `mut x` diff --git a/src/test/ui/span/borrowck-object-mutability.rs b/src/test/ui/span/borrowck-object-mutability.rs index 1bdc32b09750b..e672c46453582 100644 --- a/src/test/ui/span/borrowck-object-mutability.rs +++ b/src/test/ui/span/borrowck-object-mutability.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Foo { fn borrowed(&self); fn borrowed_mut(&mut self); diff --git a/src/test/ui/span/borrowck-object-mutability.stderr b/src/test/ui/span/borrowck-object-mutability.stderr index 5bc07949a951c..5bfd128170909 100644 --- a/src/test/ui/span/borrowck-object-mutability.stderr +++ b/src/test/ui/span/borrowck-object-mutability.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow immutable borrowed content `*x` as mutable - --> $DIR/borrowck-object-mutability.rs:19:5 + --> $DIR/borrowck-object-mutability.rs:8:5 | LL | fn borrowed_receiver(x: &Foo) { | ---- use `&mut Foo` here to make mutable @@ -8,7 +8,7 @@ LL | x.borrowed_mut(); //~ ERROR cannot borrow | ^ cannot borrow as mutable error[E0596]: cannot borrow immutable `Box` content `*x` as mutable - --> $DIR/borrowck-object-mutability.rs:29:5 + --> $DIR/borrowck-object-mutability.rs:18:5 | LL | fn owned_receiver(x: Box) { | - consider changing this to `mut x` diff --git a/src/test/ui/span/borrowck-ref-into-rvalue.nll.stderr b/src/test/ui/span/borrowck-ref-into-rvalue.nll.stderr index 171bb3dda6664..4a5248811524d 100644 --- a/src/test/ui/span/borrowck-ref-into-rvalue.nll.stderr +++ b/src/test/ui/span/borrowck-ref-into-rvalue.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/borrowck-ref-into-rvalue.rs:13:11 + --> $DIR/borrowck-ref-into-rvalue.rs:3:11 | LL | match Some("Hello".to_string()) { | ^^^^^^^^^^^^^^^^^^^^^^^^^ temporary value does not live long enough diff --git a/src/test/ui/span/borrowck-ref-into-rvalue.rs b/src/test/ui/span/borrowck-ref-into-rvalue.rs index 7f07a09358ab6..aeaebf073a708 100644 --- a/src/test/ui/span/borrowck-ref-into-rvalue.rs +++ b/src/test/ui/span/borrowck-ref-into-rvalue.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let msg; match Some("Hello".to_string()) { diff --git a/src/test/ui/span/borrowck-ref-into-rvalue.stderr b/src/test/ui/span/borrowck-ref-into-rvalue.stderr index 5de3fc4ab0acd..b8e79be8b61b8 100644 --- a/src/test/ui/span/borrowck-ref-into-rvalue.stderr +++ b/src/test/ui/span/borrowck-ref-into-rvalue.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/borrowck-ref-into-rvalue.rs:14:14 + --> $DIR/borrowck-ref-into-rvalue.rs:4:14 | LL | Some(ref m) => { | ^^^^^ borrowed value does not live long enough diff --git a/src/test/ui/span/coerce-suggestions.rs b/src/test/ui/span/coerce-suggestions.rs index 48653ba0562fc..c461f825d99a4 100644 --- a/src/test/ui/span/coerce-suggestions.rs +++ b/src/test/ui/span/coerce-suggestions.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn test(_x: &mut String) {} diff --git a/src/test/ui/span/coerce-suggestions.stderr b/src/test/ui/span/coerce-suggestions.stderr index 5153d80978822..cda500c3f5dbe 100644 --- a/src/test/ui/span/coerce-suggestions.stderr +++ b/src/test/ui/span/coerce-suggestions.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/coerce-suggestions.rs:17:20 + --> $DIR/coerce-suggestions.rs:7:20 | LL | let x: usize = String::new(); | ^^^^^^^^^^^^^ expected usize, found struct `std::string::String` @@ -8,7 +8,7 @@ LL | let x: usize = String::new(); found type `std::string::String` error[E0308]: mismatched types - --> $DIR/coerce-suggestions.rs:19:19 + --> $DIR/coerce-suggestions.rs:9:19 | LL | let x: &str = String::new(); | ^^^^^^^^^^^^^ @@ -20,7 +20,7 @@ LL | let x: &str = String::new(); found type `std::string::String` error[E0308]: mismatched types - --> $DIR/coerce-suggestions.rs:22:10 + --> $DIR/coerce-suggestions.rs:12:10 | LL | test(&y); | ^^ types differ in mutability @@ -29,7 +29,7 @@ LL | test(&y); found type `&std::string::String` error[E0308]: mismatched types - --> $DIR/coerce-suggestions.rs:24:11 + --> $DIR/coerce-suggestions.rs:14:11 | LL | test2(&y); | ^^ types differ in mutability @@ -38,7 +38,7 @@ LL | test2(&y); found type `&std::string::String` error[E0308]: mismatched types - --> $DIR/coerce-suggestions.rs:27:9 + --> $DIR/coerce-suggestions.rs:17:9 | LL | f = box f; | ^^^^^ @@ -47,7 +47,7 @@ LL | f = box f; | help: try using a conversion method: `box f.to_string()` error[E0308]: mismatched types - --> $DIR/coerce-suggestions.rs:31:9 + --> $DIR/coerce-suggestions.rs:21:9 | LL | s = format!("foo"); | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/span/destructor-restrictions.nll.stderr b/src/test/ui/span/destructor-restrictions.nll.stderr index 22f2f13f1f7cf..47594e426bcf0 100644 --- a/src/test/ui/span/destructor-restrictions.nll.stderr +++ b/src/test/ui/span/destructor-restrictions.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `*a` does not live long enough - --> $DIR/destructor-restrictions.rs:18:10 + --> $DIR/destructor-restrictions.rs:8:10 | LL | *a.borrow() + 1 | ^ borrowed value does not live long enough diff --git a/src/test/ui/span/destructor-restrictions.rs b/src/test/ui/span/destructor-restrictions.rs index d20194422f737..7fb348a14bf55 100644 --- a/src/test/ui/span/destructor-restrictions.rs +++ b/src/test/ui/span/destructor-restrictions.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests the new destructor semantics. use std::cell::RefCell; diff --git a/src/test/ui/span/destructor-restrictions.stderr b/src/test/ui/span/destructor-restrictions.stderr index 0ca77a91f2d7c..8fec877467813 100644 --- a/src/test/ui/span/destructor-restrictions.stderr +++ b/src/test/ui/span/destructor-restrictions.stderr @@ -1,5 +1,5 @@ error[E0597]: `*a` does not live long enough - --> $DIR/destructor-restrictions.rs:18:10 + --> $DIR/destructor-restrictions.rs:8:10 | LL | *a.borrow() + 1 | ^ borrowed value does not live long enough diff --git a/src/test/ui/span/dropck-object-cycle.nll.stderr b/src/test/ui/span/dropck-object-cycle.nll.stderr index 08e4b9ec9faa2..011da32c6de30 100644 --- a/src/test/ui/span/dropck-object-cycle.nll.stderr +++ b/src/test/ui/span/dropck-object-cycle.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `*m` does not live long enough - --> $DIR/dropck-object-cycle.rs:37:31 + --> $DIR/dropck-object-cycle.rs:27:31 | LL | assert_eq!(object_invoke1(&*m), (4,5)); | ^^^ borrowed value does not live long enough diff --git a/src/test/ui/span/dropck-object-cycle.rs b/src/test/ui/span/dropck-object-cycle.rs index b2871342e887c..7b7f37d53f110 100644 --- a/src/test/ui/span/dropck-object-cycle.rs +++ b/src/test/ui/span/dropck-object-cycle.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test used to be part of a run-pass test, but revised outlives // rule means that it no longer compiles. diff --git a/src/test/ui/span/dropck-object-cycle.stderr b/src/test/ui/span/dropck-object-cycle.stderr index 7b3855917c9de..3fc52853d0220 100644 --- a/src/test/ui/span/dropck-object-cycle.stderr +++ b/src/test/ui/span/dropck-object-cycle.stderr @@ -1,5 +1,5 @@ error[E0597]: `*m` does not live long enough - --> $DIR/dropck-object-cycle.rs:37:32 + --> $DIR/dropck-object-cycle.rs:27:32 | LL | assert_eq!(object_invoke1(&*m), (4,5)); | ^^ borrowed value does not live long enough diff --git a/src/test/ui/span/dropck_arr_cycle_checked.nll.stderr b/src/test/ui/span/dropck_arr_cycle_checked.nll.stderr index 76a25fa661ece..e876f4cd9672f 100644 --- a/src/test/ui/span/dropck_arr_cycle_checked.nll.stderr +++ b/src/test/ui/span/dropck_arr_cycle_checked.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `b2` does not live long enough - --> $DIR/dropck_arr_cycle_checked.rs:103:24 + --> $DIR/dropck_arr_cycle_checked.rs:93:24 | LL | b1.a[0].v.set(Some(&b2)); | ^^^ borrowed value does not live long enough @@ -11,7 +11,7 @@ LL | } | borrow later used here, when `b1` is dropped error[E0597]: `b3` does not live long enough - --> $DIR/dropck_arr_cycle_checked.rs:105:24 + --> $DIR/dropck_arr_cycle_checked.rs:95:24 | LL | b1.a[1].v.set(Some(&b3)); | ^^^ borrowed value does not live long enough @@ -23,7 +23,7 @@ LL | } | borrow later used here, when `b1` is dropped error[E0597]: `b1` does not live long enough - --> $DIR/dropck_arr_cycle_checked.rs:111:24 + --> $DIR/dropck_arr_cycle_checked.rs:101:24 | LL | b3.a[0].v.set(Some(&b1)); | ^^^ borrowed value does not live long enough diff --git a/src/test/ui/span/dropck_arr_cycle_checked.rs b/src/test/ui/span/dropck_arr_cycle_checked.rs index 6bf2ae978a0dc..35145014a5a40 100644 --- a/src/test/ui/span/dropck_arr_cycle_checked.rs +++ b/src/test/ui/span/dropck_arr_cycle_checked.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Reject mixing cyclic structure and Drop when using fixed length // arrays. // diff --git a/src/test/ui/span/dropck_arr_cycle_checked.stderr b/src/test/ui/span/dropck_arr_cycle_checked.stderr index 44803b281541c..aae71799e30f2 100644 --- a/src/test/ui/span/dropck_arr_cycle_checked.stderr +++ b/src/test/ui/span/dropck_arr_cycle_checked.stderr @@ -1,5 +1,5 @@ error[E0597]: `b2` does not live long enough - --> $DIR/dropck_arr_cycle_checked.rs:103:25 + --> $DIR/dropck_arr_cycle_checked.rs:93:25 | LL | b1.a[0].v.set(Some(&b2)); | ^^ borrowed value does not live long enough @@ -10,7 +10,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `b3` does not live long enough - --> $DIR/dropck_arr_cycle_checked.rs:105:25 + --> $DIR/dropck_arr_cycle_checked.rs:95:25 | LL | b1.a[1].v.set(Some(&b3)); | ^^ borrowed value does not live long enough @@ -21,7 +21,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `b2` does not live long enough - --> $DIR/dropck_arr_cycle_checked.rs:107:25 + --> $DIR/dropck_arr_cycle_checked.rs:97:25 | LL | b2.a[0].v.set(Some(&b2)); | ^^ borrowed value does not live long enough @@ -32,7 +32,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `b3` does not live long enough - --> $DIR/dropck_arr_cycle_checked.rs:109:25 + --> $DIR/dropck_arr_cycle_checked.rs:99:25 | LL | b2.a[1].v.set(Some(&b3)); | ^^ borrowed value does not live long enough @@ -43,7 +43,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `b1` does not live long enough - --> $DIR/dropck_arr_cycle_checked.rs:111:25 + --> $DIR/dropck_arr_cycle_checked.rs:101:25 | LL | b3.a[0].v.set(Some(&b1)); | ^^ borrowed value does not live long enough @@ -54,7 +54,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `b2` does not live long enough - --> $DIR/dropck_arr_cycle_checked.rs:113:25 + --> $DIR/dropck_arr_cycle_checked.rs:103:25 | LL | b3.a[1].v.set(Some(&b2)); | ^^ borrowed value does not live long enough diff --git a/src/test/ui/span/dropck_direct_cycle_with_drop.nll.stderr b/src/test/ui/span/dropck_direct_cycle_with_drop.nll.stderr index 2884b1818baa9..4272d626bd0d4 100644 --- a/src/test/ui/span/dropck_direct_cycle_with_drop.nll.stderr +++ b/src/test/ui/span/dropck_direct_cycle_with_drop.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `d2` does not live long enough - --> $DIR/dropck_direct_cycle_with_drop.rs:46:19 + --> $DIR/dropck_direct_cycle_with_drop.rs:36:19 | LL | d1.p.set(Some(&d2)); | ^^^ borrowed value does not live long enough @@ -13,7 +13,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are defined error[E0597]: `d1` does not live long enough - --> $DIR/dropck_direct_cycle_with_drop.rs:48:19 + --> $DIR/dropck_direct_cycle_with_drop.rs:38:19 | LL | d2.p.set(Some(&d1)); | ^^^ borrowed value does not live long enough diff --git a/src/test/ui/span/dropck_direct_cycle_with_drop.rs b/src/test/ui/span/dropck_direct_cycle_with_drop.rs index 0c6ebd5c8d814..14d6e6654746f 100644 --- a/src/test/ui/span/dropck_direct_cycle_with_drop.rs +++ b/src/test/ui/span/dropck_direct_cycle_with_drop.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // A simple example of an unsound mixing of cyclic structure and Drop. // // Each `D` has a name and an optional reference to another `D` diff --git a/src/test/ui/span/dropck_direct_cycle_with_drop.stderr b/src/test/ui/span/dropck_direct_cycle_with_drop.stderr index d20421c327fc0..bc4b517c51d6e 100644 --- a/src/test/ui/span/dropck_direct_cycle_with_drop.stderr +++ b/src/test/ui/span/dropck_direct_cycle_with_drop.stderr @@ -1,5 +1,5 @@ error[E0597]: `d2` does not live long enough - --> $DIR/dropck_direct_cycle_with_drop.rs:46:20 + --> $DIR/dropck_direct_cycle_with_drop.rs:36:20 | LL | d1.p.set(Some(&d2)); | ^^ borrowed value does not live long enough @@ -10,7 +10,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `d1` does not live long enough - --> $DIR/dropck_direct_cycle_with_drop.rs:48:20 + --> $DIR/dropck_direct_cycle_with_drop.rs:38:20 | LL | d2.p.set(Some(&d1)); | ^^ borrowed value does not live long enough diff --git a/src/test/ui/span/dropck_misc_variants.nll.stderr b/src/test/ui/span/dropck_misc_variants.nll.stderr index 27a52360bb701..b3bd860f7c0a4 100644 --- a/src/test/ui/span/dropck_misc_variants.nll.stderr +++ b/src/test/ui/span/dropck_misc_variants.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `bomb` does not live long enough - --> $DIR/dropck_misc_variants.rs:33:36 + --> $DIR/dropck_misc_variants.rs:23:36 | LL | _w = Wrap::<&[&str]>(NoisyDrop(&bomb)); | ^^^^^ borrowed value does not live long enough @@ -12,7 +12,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are defined error[E0597]: `v` does not live long enough - --> $DIR/dropck_misc_variants.rs:41:27 + --> $DIR/dropck_misc_variants.rs:31:27 | LL | let u = NoisyDrop(&v); | ^^ borrowed value does not live long enough diff --git a/src/test/ui/span/dropck_misc_variants.rs b/src/test/ui/span/dropck_misc_variants.rs index a98cce32e9d7a..5818a94bcb1e3 100644 --- a/src/test/ui/span/dropck_misc_variants.rs +++ b/src/test/ui/span/dropck_misc_variants.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // check that dropck does the right thing with misc. Ty variants use std::fmt; diff --git a/src/test/ui/span/dropck_misc_variants.stderr b/src/test/ui/span/dropck_misc_variants.stderr index af56448d4061c..b2de455cdc819 100644 --- a/src/test/ui/span/dropck_misc_variants.stderr +++ b/src/test/ui/span/dropck_misc_variants.stderr @@ -1,5 +1,5 @@ error[E0597]: `bomb` does not live long enough - --> $DIR/dropck_misc_variants.rs:33:37 + --> $DIR/dropck_misc_variants.rs:23:37 | LL | _w = Wrap::<&[&str]>(NoisyDrop(&bomb)); | ^^^^ borrowed value does not live long enough @@ -9,7 +9,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `v` does not live long enough - --> $DIR/dropck_misc_variants.rs:41:28 + --> $DIR/dropck_misc_variants.rs:31:28 | LL | let u = NoisyDrop(&v); | ^ borrowed value does not live long enough diff --git a/src/test/ui/span/dropck_vec_cycle_checked.nll.stderr b/src/test/ui/span/dropck_vec_cycle_checked.nll.stderr index e6f43e0a71b56..2feb908b97b03 100644 --- a/src/test/ui/span/dropck_vec_cycle_checked.nll.stderr +++ b/src/test/ui/span/dropck_vec_cycle_checked.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `c2` does not live long enough - --> $DIR/dropck_vec_cycle_checked.rs:113:24 + --> $DIR/dropck_vec_cycle_checked.rs:103:24 | LL | c1.v[0].v.set(Some(&c2)); | ^^^ borrowed value does not live long enough @@ -11,7 +11,7 @@ LL | } | borrow later used here, when `c1` is dropped error[E0597]: `c3` does not live long enough - --> $DIR/dropck_vec_cycle_checked.rs:115:24 + --> $DIR/dropck_vec_cycle_checked.rs:105:24 | LL | c1.v[1].v.set(Some(&c3)); | ^^^ borrowed value does not live long enough @@ -23,7 +23,7 @@ LL | } | borrow later used here, when `c1` is dropped error[E0597]: `c1` does not live long enough - --> $DIR/dropck_vec_cycle_checked.rs:121:24 + --> $DIR/dropck_vec_cycle_checked.rs:111:24 | LL | c3.v[0].v.set(Some(&c1)); | ^^^ borrowed value does not live long enough diff --git a/src/test/ui/span/dropck_vec_cycle_checked.rs b/src/test/ui/span/dropck_vec_cycle_checked.rs index ece58d21ba932..4f627c4270ca5 100644 --- a/src/test/ui/span/dropck_vec_cycle_checked.rs +++ b/src/test/ui/span/dropck_vec_cycle_checked.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z nll-subminimal-causes // (Work around rust-lang/rust#49998 by opting into nll-subminimal-causes.) diff --git a/src/test/ui/span/dropck_vec_cycle_checked.stderr b/src/test/ui/span/dropck_vec_cycle_checked.stderr index a6bc8da6f7c0c..3a5214446119a 100644 --- a/src/test/ui/span/dropck_vec_cycle_checked.stderr +++ b/src/test/ui/span/dropck_vec_cycle_checked.stderr @@ -1,5 +1,5 @@ error[E0597]: `c2` does not live long enough - --> $DIR/dropck_vec_cycle_checked.rs:113:25 + --> $DIR/dropck_vec_cycle_checked.rs:103:25 | LL | c1.v[0].v.set(Some(&c2)); | ^^ borrowed value does not live long enough @@ -10,7 +10,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `c3` does not live long enough - --> $DIR/dropck_vec_cycle_checked.rs:115:25 + --> $DIR/dropck_vec_cycle_checked.rs:105:25 | LL | c1.v[1].v.set(Some(&c3)); | ^^ borrowed value does not live long enough @@ -21,7 +21,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `c2` does not live long enough - --> $DIR/dropck_vec_cycle_checked.rs:117:25 + --> $DIR/dropck_vec_cycle_checked.rs:107:25 | LL | c2.v[0].v.set(Some(&c2)); | ^^ borrowed value does not live long enough @@ -32,7 +32,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `c3` does not live long enough - --> $DIR/dropck_vec_cycle_checked.rs:119:25 + --> $DIR/dropck_vec_cycle_checked.rs:109:25 | LL | c2.v[1].v.set(Some(&c3)); | ^^ borrowed value does not live long enough @@ -43,7 +43,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `c1` does not live long enough - --> $DIR/dropck_vec_cycle_checked.rs:121:25 + --> $DIR/dropck_vec_cycle_checked.rs:111:25 | LL | c3.v[0].v.set(Some(&c1)); | ^^ borrowed value does not live long enough @@ -54,7 +54,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `c2` does not live long enough - --> $DIR/dropck_vec_cycle_checked.rs:123:25 + --> $DIR/dropck_vec_cycle_checked.rs:113:25 | LL | c3.v[1].v.set(Some(&c2)); | ^^ borrowed value does not live long enough diff --git a/src/test/ui/span/gated-features-attr-spans.rs b/src/test/ui/span/gated-features-attr-spans.rs index eff1f98eb714e..ff722a5352079 100644 --- a/src/test/ui/span/gated-features-attr-spans.rs +++ b/src/test/ui/span/gated-features-attr-spans.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[repr(simd)] //~ ERROR are experimental struct Weapon { name: String, diff --git a/src/test/ui/span/gated-features-attr-spans.stderr b/src/test/ui/span/gated-features-attr-spans.stderr index a99530529fcf1..9c4c12ba07687 100644 --- a/src/test/ui/span/gated-features-attr-spans.stderr +++ b/src/test/ui/span/gated-features-attr-spans.stderr @@ -1,5 +1,5 @@ error[E0658]: SIMD types are experimental and possibly buggy (see issue #27731) - --> $DIR/gated-features-attr-spans.rs:11:1 + --> $DIR/gated-features-attr-spans.rs:1:1 | LL | #[repr(simd)] //~ ERROR are experimental | ^^^^^^^^^^^^^ diff --git a/src/test/ui/span/impl-parsing.rs b/src/test/ui/span/impl-parsing.rs index 064e3c3ac482d..4bfdb241dfd83 100644 --- a/src/test/ui/span/impl-parsing.rs +++ b/src/test/ui/span/impl-parsing.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error impl ! {} // OK diff --git a/src/test/ui/span/impl-parsing.stderr b/src/test/ui/span/impl-parsing.stderr index 3cfcf7b768314..308f14c60c765 100644 --- a/src/test/ui/span/impl-parsing.stderr +++ b/src/test/ui/span/impl-parsing.stderr @@ -1,29 +1,29 @@ error: missing `for` in a trait impl - --> $DIR/impl-parsing.rs:16:11 + --> $DIR/impl-parsing.rs:6:11 | LL | impl Trait Type {} //~ ERROR missing `for` in a trait impl | ^ error: missing `for` in a trait impl - --> $DIR/impl-parsing.rs:17:11 + --> $DIR/impl-parsing.rs:7:11 | LL | impl Trait .. {} //~ ERROR missing `for` in a trait impl | ^ error: expected a trait, found type - --> $DIR/impl-parsing.rs:18:6 + --> $DIR/impl-parsing.rs:8:6 | LL | impl ?Sized for Type {} //~ ERROR expected a trait, found type | ^^^^^^ error: expected a trait, found type - --> $DIR/impl-parsing.rs:19:6 + --> $DIR/impl-parsing.rs:9:6 | LL | impl ?Sized for .. {} //~ ERROR expected a trait, found type | ^^^^^^ error: expected `impl`, found `FAIL` - --> $DIR/impl-parsing.rs:21:16 + --> $DIR/impl-parsing.rs:11:16 | LL | default unsafe FAIL //~ ERROR expected `impl`, found `FAIL` | ^^^^ expected `impl` here diff --git a/src/test/ui/span/impl-wrong-item-for-trait.rs b/src/test/ui/span/impl-wrong-item-for-trait.rs index f86ee2b1377a3..672fe8dccf773 100644 --- a/src/test/ui/span/impl-wrong-item-for-trait.rs +++ b/src/test/ui/span/impl-wrong-item-for-trait.rs @@ -1,14 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use std::fmt::Debug; trait Foo { diff --git a/src/test/ui/span/impl-wrong-item-for-trait.stderr b/src/test/ui/span/impl-wrong-item-for-trait.stderr index 4f1ac3b945949..8e08d3690e660 100644 --- a/src/test/ui/span/impl-wrong-item-for-trait.stderr +++ b/src/test/ui/span/impl-wrong-item-for-trait.stderr @@ -1,11 +1,11 @@ error[E0437]: type `bar` is not a member of trait `Foo` - --> $DIR/impl-wrong-item-for-trait.rs:41:5 + --> $DIR/impl-wrong-item-for-trait.rs:30:5 | LL | type bar = u64; | ^^^^^^^^^^^^^^^ not a member of trait `Foo` error[E0323]: item `bar` is an associated const, which doesn't match its trait `Foo` - --> $DIR/impl-wrong-item-for-trait.rs:23:5 + --> $DIR/impl-wrong-item-for-trait.rs:12:5 | LL | fn bar(&self); | -------------- item in trait @@ -14,7 +14,7 @@ LL | const bar: u64 = 1; | ^^^^^^^^^^^^^^^^^^^ does not match trait error[E0046]: not all trait items implemented, missing: `bar` - --> $DIR/impl-wrong-item-for-trait.rs:21:1 + --> $DIR/impl-wrong-item-for-trait.rs:10:1 | LL | fn bar(&self); | -------------- `bar` from trait @@ -23,7 +23,7 @@ LL | impl Foo for FooConstForMethod { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `bar` in implementation error[E0324]: item `MY_CONST` is an associated method, which doesn't match its trait `Foo` - --> $DIR/impl-wrong-item-for-trait.rs:33:5 + --> $DIR/impl-wrong-item-for-trait.rs:22:5 | LL | const MY_CONST: u32; | -------------------- item in trait @@ -32,7 +32,7 @@ LL | fn MY_CONST() {} | ^^^^^^^^^^^^^^^^ does not match trait error[E0046]: not all trait items implemented, missing: `MY_CONST` - --> $DIR/impl-wrong-item-for-trait.rs:30:1 + --> $DIR/impl-wrong-item-for-trait.rs:19:1 | LL | const MY_CONST: u32; | -------------------- `MY_CONST` from trait @@ -41,7 +41,7 @@ LL | impl Foo for FooMethodForConst { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `MY_CONST` in implementation error[E0325]: item `bar` is an associated type, which doesn't match its trait `Foo` - --> $DIR/impl-wrong-item-for-trait.rs:41:5 + --> $DIR/impl-wrong-item-for-trait.rs:30:5 | LL | fn bar(&self); | -------------- item in trait @@ -50,7 +50,7 @@ LL | type bar = u64; | ^^^^^^^^^^^^^^^ does not match trait error[E0046]: not all trait items implemented, missing: `bar` - --> $DIR/impl-wrong-item-for-trait.rs:39:1 + --> $DIR/impl-wrong-item-for-trait.rs:28:1 | LL | fn bar(&self); | -------------- `bar` from trait @@ -59,7 +59,7 @@ LL | impl Foo for FooTypeForMethod { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `bar` in implementation error[E0046]: not all trait items implemented, missing: `fmt` - --> $DIR/impl-wrong-item-for-trait.rs:47:1 + --> $DIR/impl-wrong-item-for-trait.rs:36:1 | LL | impl Debug for FooTypeForMethod { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `fmt` in implementation diff --git a/src/test/ui/span/import-ty-params.rs b/src/test/ui/span/import-ty-params.rs index 793ea68beba13..850bbd857ffec 100644 --- a/src/test/ui/span/import-ty-params.rs +++ b/src/test/ui/span/import-ty-params.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod a { pub mod b { pub mod c { diff --git a/src/test/ui/span/import-ty-params.stderr b/src/test/ui/span/import-ty-params.stderr index 7e2c2d382fd69..cff71bf2e62de 100644 --- a/src/test/ui/span/import-ty-params.stderr +++ b/src/test/ui/span/import-ty-params.stderr @@ -1,11 +1,11 @@ error: unexpected generic arguments in path - --> $DIR/import-ty-params.rs:24:15 + --> $DIR/import-ty-params.rs:14:15 | LL | import! { a::b::c::S } //~ ERROR unexpected generic arguments in path | ^^^^^^^^^^^^^^ error: unexpected generic arguments in path - --> $DIR/import-ty-params.rs:27:15 + --> $DIR/import-ty-params.rs:17:15 | LL | import! { a::b::c::S<> } //~ ERROR unexpected generic arguments in path | ^^^^^^^^^^^^ diff --git a/src/test/ui/span/issue-11925.nll.stderr b/src/test/ui/span/issue-11925.nll.stderr index e841e6c635bc3..98a82f47401d8 100644 --- a/src/test/ui/span/issue-11925.nll.stderr +++ b/src/test/ui/span/issue-11925.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `x` does not live long enough - --> $DIR/issue-11925.rs:18:35 + --> $DIR/issue-11925.rs:8:35 | LL | let f = to_fn_once(move|| &x); //~ ERROR does not live long enough | ^- diff --git a/src/test/ui/span/issue-11925.rs b/src/test/ui/span/issue-11925.rs index fd5625f68923a..276aaa1c2931d 100644 --- a/src/test/ui/span/issue-11925.rs +++ b/src/test/ui/span/issue-11925.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax, unboxed_closures)] fn to_fn_once>(f: F) -> F { f } diff --git a/src/test/ui/span/issue-11925.stderr b/src/test/ui/span/issue-11925.stderr index bd66a5bc3929b..46e2a41b3c34d 100644 --- a/src/test/ui/span/issue-11925.stderr +++ b/src/test/ui/span/issue-11925.stderr @@ -1,5 +1,5 @@ error[E0597]: `x` does not live long enough - --> $DIR/issue-11925.rs:18:36 + --> $DIR/issue-11925.rs:8:36 | LL | let f = to_fn_once(move|| &x); //~ ERROR does not live long enough | ^ diff --git a/src/test/ui/span/issue-15480.nll.stderr b/src/test/ui/span/issue-15480.nll.stderr index 2f3f6c5efa2dd..cd074da6631b3 100644 --- a/src/test/ui/span/issue-15480.nll.stderr +++ b/src/test/ui/span/issue-15480.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/issue-15480.rs:15:10 + --> $DIR/issue-15480.rs:5:10 | LL | &id(3) | ^^^^^ temporary value does not live long enough diff --git a/src/test/ui/span/issue-15480.rs b/src/test/ui/span/issue-15480.rs index 2fbc63eb80537..c1024234094b6 100644 --- a/src/test/ui/span/issue-15480.rs +++ b/src/test/ui/span/issue-15480.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn id(x: T) -> T { x } fn main() { diff --git a/src/test/ui/span/issue-15480.stderr b/src/test/ui/span/issue-15480.stderr index 1d239c712fe96..c5e3899faca49 100644 --- a/src/test/ui/span/issue-15480.stderr +++ b/src/test/ui/span/issue-15480.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/issue-15480.rs:15:10 + --> $DIR/issue-15480.rs:5:10 | LL | &id(3) | ^^^^^ temporary value does not live long enough diff --git a/src/test/ui/span/issue-23338-locals-die-before-temps-of-body.nll.stderr b/src/test/ui/span/issue-23338-locals-die-before-temps-of-body.nll.stderr index fe0187f386378..10ebb37702d04 100644 --- a/src/test/ui/span/issue-23338-locals-die-before-temps-of-body.nll.stderr +++ b/src/test/ui/span/issue-23338-locals-die-before-temps-of-body.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `y` does not live long enough - --> $DIR/issue-23338-locals-die-before-temps-of-body.rs:20:5 + --> $DIR/issue-23338-locals-die-before-temps-of-body.rs:10:5 | LL | y.borrow().clone() | ^ borrowed value does not live long enough @@ -7,7 +7,7 @@ LL | } | - `y` dropped here while still borrowed error[E0597]: `y` does not live long enough - --> $DIR/issue-23338-locals-die-before-temps-of-body.rs:27:9 + --> $DIR/issue-23338-locals-die-before-temps-of-body.rs:17:9 | LL | y.borrow().clone() | ^ borrowed value does not live long enough diff --git a/src/test/ui/span/issue-23338-locals-die-before-temps-of-body.rs b/src/test/ui/span/issue-23338-locals-die-before-temps-of-body.rs index 8f556d288198a..a92ea4ddc96a6 100644 --- a/src/test/ui/span/issue-23338-locals-die-before-temps-of-body.rs +++ b/src/test/ui/span/issue-23338-locals-die-before-temps-of-body.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This is just checking that we still reject code where temp values // are borrowing values for longer than they will be around. // diff --git a/src/test/ui/span/issue-23338-locals-die-before-temps-of-body.stderr b/src/test/ui/span/issue-23338-locals-die-before-temps-of-body.stderr index 6932134f4cdc2..f18f0da3199f0 100644 --- a/src/test/ui/span/issue-23338-locals-die-before-temps-of-body.stderr +++ b/src/test/ui/span/issue-23338-locals-die-before-temps-of-body.stderr @@ -1,5 +1,5 @@ error[E0597]: `y` does not live long enough - --> $DIR/issue-23338-locals-die-before-temps-of-body.rs:20:5 + --> $DIR/issue-23338-locals-die-before-temps-of-body.rs:10:5 | LL | y.borrow().clone() | ^ borrowed value does not live long enough @@ -9,7 +9,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `y` does not live long enough - --> $DIR/issue-23338-locals-die-before-temps-of-body.rs:27:9 + --> $DIR/issue-23338-locals-die-before-temps-of-body.rs:17:9 | LL | y.borrow().clone() | ^ borrowed value does not live long enough diff --git a/src/test/ui/span/issue-23729.rs b/src/test/ui/span/issue-23729.rs index e872fabfc2631..ca33f9c77308b 100644 --- a/src/test/ui/span/issue-23729.rs +++ b/src/test/ui/span/issue-23729.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #23729 fn main() { diff --git a/src/test/ui/span/issue-23729.stderr b/src/test/ui/span/issue-23729.stderr index 83a7671b8f934..865fae917c5db 100644 --- a/src/test/ui/span/issue-23729.stderr +++ b/src/test/ui/span/issue-23729.stderr @@ -1,5 +1,5 @@ error[E0046]: not all trait items implemented, missing: `Item` - --> $DIR/issue-23729.rs:20:9 + --> $DIR/issue-23729.rs:10:9 | LL | impl Iterator for Recurrence { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `Item` in implementation diff --git a/src/test/ui/span/issue-23827.rs b/src/test/ui/span/issue-23827.rs index 890f2623ebc1f..22b9dde8cbe5c 100644 --- a/src/test/ui/span/issue-23827.rs +++ b/src/test/ui/span/issue-23827.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #23827 #![feature(core, fn_traits, unboxed_closures)] diff --git a/src/test/ui/span/issue-23827.stderr b/src/test/ui/span/issue-23827.stderr index c8b55290aa096..a8e3e9b6b9ae9 100644 --- a/src/test/ui/span/issue-23827.stderr +++ b/src/test/ui/span/issue-23827.stderr @@ -1,5 +1,5 @@ error[E0046]: not all trait items implemented, missing: `Output` - --> $DIR/issue-23827.rs:36:1 + --> $DIR/issue-23827.rs:26:1 | LL | impl FnOnce<(C,)> for Prototype { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `Output` in implementation diff --git a/src/test/ui/span/issue-24356.rs b/src/test/ui/span/issue-24356.rs index 0580370033a96..7696bd54226da 100644 --- a/src/test/ui/span/issue-24356.rs +++ b/src/test/ui/span/issue-24356.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #24356 // ignore-tidy-linelength diff --git a/src/test/ui/span/issue-24356.stderr b/src/test/ui/span/issue-24356.stderr index 7c599138ef3c4..102cc4201e2ec 100644 --- a/src/test/ui/span/issue-24356.stderr +++ b/src/test/ui/span/issue-24356.stderr @@ -1,5 +1,5 @@ error[E0046]: not all trait items implemented, missing: `Target` - --> $DIR/issue-24356.rs:30:9 + --> $DIR/issue-24356.rs:20:9 | LL | impl Deref for Thing { | ^^^^^^^^^^^^^^^^^^^^ missing `Target` in implementation diff --git a/src/test/ui/span/issue-24690.rs b/src/test/ui/span/issue-24690.rs index 041ca6c426c1f..fd9c4574a8207 100644 --- a/src/test/ui/span/issue-24690.rs +++ b/src/test/ui/span/issue-24690.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A test to ensure that helpful `note` messages aren't emitted more often //! than necessary. diff --git a/src/test/ui/span/issue-24690.stderr b/src/test/ui/span/issue-24690.stderr index b496a1a76c017..77faf5a033fee 100644 --- a/src/test/ui/span/issue-24690.stderr +++ b/src/test/ui/span/issue-24690.stderr @@ -1,18 +1,18 @@ warning: unused variable: `theOtherTwo` - --> $DIR/issue-24690.rs:23:9 + --> $DIR/issue-24690.rs:13:9 | LL | let theOtherTwo = 2; //~ WARN should have a snake case name | ^^^^^^^^^^^ help: consider using `_theOtherTwo` instead | note: lint level defined here - --> $DIR/issue-24690.rs:18:9 + --> $DIR/issue-24690.rs:8:9 | LL | #![warn(unused)] | ^^^^^^ = note: #[warn(unused_variables)] implied by #[warn(unused)] warning: variable `theTwo` should have a snake case name such as `the_two` - --> $DIR/issue-24690.rs:22:9 + --> $DIR/issue-24690.rs:12:9 | LL | let theTwo = 2; //~ WARN should have a snake case name | ^^^^^^ @@ -20,13 +20,13 @@ LL | let theTwo = 2; //~ WARN should have a snake case name = note: #[warn(non_snake_case)] on by default warning: variable `theOtherTwo` should have a snake case name such as `the_other_two` - --> $DIR/issue-24690.rs:23:9 + --> $DIR/issue-24690.rs:13:9 | LL | let theOtherTwo = 2; //~ WARN should have a snake case name | ^^^^^^^^^^^ error: compilation successful - --> $DIR/issue-24690.rs:21:1 + --> $DIR/issue-24690.rs:11:1 | LL | / fn main() { //~ ERROR compilation successful LL | | let theTwo = 2; //~ WARN should have a snake case name diff --git a/src/test/ui/span/issue-24805-dropck-child-has-items-via-parent.nll.stderr b/src/test/ui/span/issue-24805-dropck-child-has-items-via-parent.nll.stderr index b9834a3d4379e..19d2ec5f07c92 100644 --- a/src/test/ui/span/issue-24805-dropck-child-has-items-via-parent.nll.stderr +++ b/src/test/ui/span/issue-24805-dropck-child-has-items-via-parent.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `d1` does not live long enough - --> $DIR/issue-24805-dropck-child-has-items-via-parent.rs:38:18 + --> $DIR/issue-24805-dropck-child-has-items-via-parent.rs:28:18 | LL | _d = D_Child(&d1); | ^^^ borrowed value does not live long enough diff --git a/src/test/ui/span/issue-24805-dropck-child-has-items-via-parent.rs b/src/test/ui/span/issue-24805-dropck-child-has-items-via-parent.rs index 7b3c09659e151..9c772052fb41a 100644 --- a/src/test/ui/span/issue-24805-dropck-child-has-items-via-parent.rs +++ b/src/test/ui/span/issue-24805-dropck-child-has-items-via-parent.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that child trait who only has items via its *parent* trait // does cause dropck to inject extra region constraints. diff --git a/src/test/ui/span/issue-24805-dropck-child-has-items-via-parent.stderr b/src/test/ui/span/issue-24805-dropck-child-has-items-via-parent.stderr index 13a79035003cd..ad90fcd54d44b 100644 --- a/src/test/ui/span/issue-24805-dropck-child-has-items-via-parent.stderr +++ b/src/test/ui/span/issue-24805-dropck-child-has-items-via-parent.stderr @@ -1,5 +1,5 @@ error[E0597]: `d1` does not live long enough - --> $DIR/issue-24805-dropck-child-has-items-via-parent.rs:38:19 + --> $DIR/issue-24805-dropck-child-has-items-via-parent.rs:28:19 | LL | _d = D_Child(&d1); | ^^ borrowed value does not live long enough diff --git a/src/test/ui/span/issue-24805-dropck-trait-has-items.nll.stderr b/src/test/ui/span/issue-24805-dropck-trait-has-items.nll.stderr index cd3d658aa8726..06998b190fce1 100644 --- a/src/test/ui/span/issue-24805-dropck-trait-has-items.nll.stderr +++ b/src/test/ui/span/issue-24805-dropck-trait-has-items.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `d1` does not live long enough - --> $DIR/issue-24805-dropck-trait-has-items.rs:47:26 + --> $DIR/issue-24805-dropck-trait-has-items.rs:37:26 | LL | _d = D_HasSelfMethod(&d1); | ^^^ borrowed value does not live long enough @@ -12,7 +12,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are defined error[E0597]: `d1` does not live long enough - --> $DIR/issue-24805-dropck-trait-has-items.rs:53:33 + --> $DIR/issue-24805-dropck-trait-has-items.rs:43:33 | LL | _d = D_HasMethodWithSelfArg(&d1); | ^^^ borrowed value does not live long enough @@ -25,7 +25,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are defined error[E0597]: `d1` does not live long enough - --> $DIR/issue-24805-dropck-trait-has-items.rs:59:20 + --> $DIR/issue-24805-dropck-trait-has-items.rs:49:20 | LL | _d = D_HasType(&d1); | ^^^ borrowed value does not live long enough diff --git a/src/test/ui/span/issue-24805-dropck-trait-has-items.rs b/src/test/ui/span/issue-24805-dropck-trait-has-items.rs index 75523386931c0..b328cd89e80f8 100644 --- a/src/test/ui/span/issue-24805-dropck-trait-has-items.rs +++ b/src/test/ui/span/issue-24805-dropck-trait-has-items.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that traits with various kinds of associated items cause // dropck to inject extra region constraints. diff --git a/src/test/ui/span/issue-24805-dropck-trait-has-items.stderr b/src/test/ui/span/issue-24805-dropck-trait-has-items.stderr index a2e25492c1940..3de40149287e0 100644 --- a/src/test/ui/span/issue-24805-dropck-trait-has-items.stderr +++ b/src/test/ui/span/issue-24805-dropck-trait-has-items.stderr @@ -1,5 +1,5 @@ error[E0597]: `d1` does not live long enough - --> $DIR/issue-24805-dropck-trait-has-items.rs:47:27 + --> $DIR/issue-24805-dropck-trait-has-items.rs:37:27 | LL | _d = D_HasSelfMethod(&d1); | ^^ borrowed value does not live long enough @@ -9,7 +9,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `d1` does not live long enough - --> $DIR/issue-24805-dropck-trait-has-items.rs:53:34 + --> $DIR/issue-24805-dropck-trait-has-items.rs:43:34 | LL | _d = D_HasMethodWithSelfArg(&d1); | ^^ borrowed value does not live long enough @@ -19,7 +19,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `d1` does not live long enough - --> $DIR/issue-24805-dropck-trait-has-items.rs:59:21 + --> $DIR/issue-24805-dropck-trait-has-items.rs:49:21 | LL | _d = D_HasType(&d1); | ^^ borrowed value does not live long enough diff --git a/src/test/ui/span/issue-24895-copy-clone-dropck.nll.stderr b/src/test/ui/span/issue-24895-copy-clone-dropck.nll.stderr index 54c6ac43f347c..497ec6c47b21e 100644 --- a/src/test/ui/span/issue-24895-copy-clone-dropck.nll.stderr +++ b/src/test/ui/span/issue-24895-copy-clone-dropck.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `d1` does not live long enough - --> $DIR/issue-24895-copy-clone-dropck.rs:37:14 + --> $DIR/issue-24895-copy-clone-dropck.rs:27:14 | LL | d2 = D(S(&d1, "inner"), "d2"); | ^^^ borrowed value does not live long enough diff --git a/src/test/ui/span/issue-24895-copy-clone-dropck.rs b/src/test/ui/span/issue-24895-copy-clone-dropck.rs index 326e6b43e25b4..904cd8f678faf 100644 --- a/src/test/ui/span/issue-24895-copy-clone-dropck.rs +++ b/src/test/ui/span/issue-24895-copy-clone-dropck.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that one cannot subvert Drop Check rule via a user-defined // Clone implementation. diff --git a/src/test/ui/span/issue-24895-copy-clone-dropck.stderr b/src/test/ui/span/issue-24895-copy-clone-dropck.stderr index 1f6c96d4a0c54..91859194318bd 100644 --- a/src/test/ui/span/issue-24895-copy-clone-dropck.stderr +++ b/src/test/ui/span/issue-24895-copy-clone-dropck.stderr @@ -1,5 +1,5 @@ error[E0597]: `d1` does not live long enough - --> $DIR/issue-24895-copy-clone-dropck.rs:37:15 + --> $DIR/issue-24895-copy-clone-dropck.rs:27:15 | LL | d2 = D(S(&d1, "inner"), "d2"); | ^^ borrowed value does not live long enough diff --git a/src/test/ui/span/issue-25199.nll.stderr b/src/test/ui/span/issue-25199.nll.stderr index a81b591d288eb..c498c2647965f 100644 --- a/src/test/ui/span/issue-25199.nll.stderr +++ b/src/test/ui/span/issue-25199.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `container` does not live long enough - --> $DIR/issue-25199.rs:80:27 + --> $DIR/issue-25199.rs:70:27 | LL | let test = Test{test: &container}; | ^^^^^^^^^^ borrowed value does not live long enough diff --git a/src/test/ui/span/issue-25199.rs b/src/test/ui/span/issue-25199.rs index 7b1f4005e6333..4ef57457ca340 100644 --- a/src/test/ui/span/issue-25199.rs +++ b/src/test/ui/span/issue-25199.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for Issue 25199: Check that one cannot hide a // destructor's access to borrowed data behind a boxed trait object. // diff --git a/src/test/ui/span/issue-25199.stderr b/src/test/ui/span/issue-25199.stderr index bee83b532baa6..135d8150c34ed 100644 --- a/src/test/ui/span/issue-25199.stderr +++ b/src/test/ui/span/issue-25199.stderr @@ -1,5 +1,5 @@ error[E0597]: `container` does not live long enough - --> $DIR/issue-25199.rs:80:28 + --> $DIR/issue-25199.rs:70:28 | LL | let test = Test{test: &container}; | ^^^^^^^^^ borrowed value does not live long enough @@ -10,7 +10,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `container` does not live long enough - --> $DIR/issue-25199.rs:83:5 + --> $DIR/issue-25199.rs:73:5 | LL | container.store(test); | ^^^^^^^^^ borrowed value does not live long enough diff --git a/src/test/ui/span/issue-26656.nll.stderr b/src/test/ui/span/issue-26656.nll.stderr index b6c2882812088..479e0c7e2e3a2 100644 --- a/src/test/ui/span/issue-26656.nll.stderr +++ b/src/test/ui/span/issue-26656.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `ticking` does not live long enough - --> $DIR/issue-26656.rs:50:35 + --> $DIR/issue-26656.rs:40:35 | LL | zook.button = B::BigRedButton(&ticking); | ^^^^^^^^ borrowed value does not live long enough diff --git a/src/test/ui/span/issue-26656.rs b/src/test/ui/span/issue-26656.rs index 05f0ea5474f1e..c5a70c87ed873 100644 --- a/src/test/ui/span/issue-26656.rs +++ b/src/test/ui/span/issue-26656.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #26656: Verify that trait objects cannot bypass dropck. // Using this instead of Fn etc. to take HRTB out of the equation. diff --git a/src/test/ui/span/issue-26656.stderr b/src/test/ui/span/issue-26656.stderr index 98f0c90ed7817..ba2befb90a9c1 100644 --- a/src/test/ui/span/issue-26656.stderr +++ b/src/test/ui/span/issue-26656.stderr @@ -1,5 +1,5 @@ error[E0597]: `ticking` does not live long enough - --> $DIR/issue-26656.rs:50:36 + --> $DIR/issue-26656.rs:40:36 | LL | zook.button = B::BigRedButton(&ticking); | ^^^^^^^ borrowed value does not live long enough diff --git a/src/test/ui/span/issue-27522.rs b/src/test/ui/span/issue-27522.rs index 1e3eba4bf3631..1602ece49a81f 100644 --- a/src/test/ui/span/issue-27522.rs +++ b/src/test/ui/span/issue-27522.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Point at correct span for self type struct SomeType {} diff --git a/src/test/ui/span/issue-27522.stderr b/src/test/ui/span/issue-27522.stderr index 9b61ecae6512e..8b1c25a8ec53e 100644 --- a/src/test/ui/span/issue-27522.stderr +++ b/src/test/ui/span/issue-27522.stderr @@ -1,5 +1,5 @@ error[E0307]: invalid `self` type: &SomeType - --> $DIR/issue-27522.rs:16:22 + --> $DIR/issue-27522.rs:6:22 | LL | fn handler(self: &SomeType); //~ ERROR invalid `self` type | ^^^^^^^^^ diff --git a/src/test/ui/span/issue-29106.nll.stderr b/src/test/ui/span/issue-29106.nll.stderr index 2cf408d097b83..2af661ad59c8c 100644 --- a/src/test/ui/span/issue-29106.nll.stderr +++ b/src/test/ui/span/issue-29106.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `x` does not live long enough - --> $DIR/issue-29106.rs:26:26 + --> $DIR/issue-29106.rs:16:26 | LL | y = Arc::new(Foo(&x)); | ^^ borrowed value does not live long enough @@ -10,7 +10,7 @@ LL | } | borrow later used here, when `y` is dropped error[E0597]: `x` does not live long enough - --> $DIR/issue-29106.rs:33:25 + --> $DIR/issue-29106.rs:23:25 | LL | y = Rc::new(Foo(&x)); | ^^ borrowed value does not live long enough diff --git a/src/test/ui/span/issue-29106.rs b/src/test/ui/span/issue-29106.rs index 03a9a629c9135..1be8d4cba6960 100644 --- a/src/test/ui/span/issue-29106.rs +++ b/src/test/ui/span/issue-29106.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::rc::Rc; use std::sync::Arc; diff --git a/src/test/ui/span/issue-29106.stderr b/src/test/ui/span/issue-29106.stderr index 23e53c9852d5e..bb2f8462246b1 100644 --- a/src/test/ui/span/issue-29106.stderr +++ b/src/test/ui/span/issue-29106.stderr @@ -1,5 +1,5 @@ error[E0597]: `x` does not live long enough - --> $DIR/issue-29106.rs:26:27 + --> $DIR/issue-29106.rs:16:27 | LL | y = Arc::new(Foo(&x)); | ^ borrowed value does not live long enough @@ -9,7 +9,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `x` does not live long enough - --> $DIR/issue-29106.rs:33:26 + --> $DIR/issue-29106.rs:23:26 | LL | y = Rc::new(Foo(&x)); | ^ borrowed value does not live long enough diff --git a/src/test/ui/span/issue-29595.rs b/src/test/ui/span/issue-29595.rs index ed7f2d1a92e75..87d7c4cfdf93f 100644 --- a/src/test/ui/span/issue-29595.rs +++ b/src/test/ui/span/issue-29595.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Tr { const C: Self; } diff --git a/src/test/ui/span/issue-29595.stderr b/src/test/ui/span/issue-29595.stderr index 15d56abca5086..dbb1743ec0ef8 100644 --- a/src/test/ui/span/issue-29595.stderr +++ b/src/test/ui/span/issue-29595.stderr @@ -1,11 +1,11 @@ error[E0277]: the trait bound `u8: Tr` is not satisfied - --> $DIR/issue-29595.rs:17:17 + --> $DIR/issue-29595.rs:6:17 | LL | let a: u8 = Tr::C; //~ ERROR the trait bound `u8: Tr` is not satisfied | ^^^^^ the trait `Tr` is not implemented for `u8` | note: required by `Tr::C` - --> $DIR/issue-29595.rs:13:5 + --> $DIR/issue-29595.rs:2:5 | LL | const C: Self; | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/span/issue-33884.rs b/src/test/ui/span/issue-33884.rs index f7836a6790fe2..cef123d697bcd 100644 --- a/src/test/ui/span/issue-33884.rs +++ b/src/test/ui/span/issue-33884.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no std::net support use std::net::TcpListener; diff --git a/src/test/ui/span/issue-33884.stderr b/src/test/ui/span/issue-33884.stderr index c47d28b45625d..e59440b363f51 100644 --- a/src/test/ui/span/issue-33884.stderr +++ b/src/test/ui/span/issue-33884.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-33884.rs:18:22 + --> $DIR/issue-33884.rs:8:22 | LL | stream.write_fmt(format!("message received")) | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected struct `std::fmt::Arguments`, found struct `std::string::String` diff --git a/src/test/ui/span/issue-34264.rs b/src/test/ui/span/issue-34264.rs index 8baa381fb2d73..5b8fc71384efe 100644 --- a/src/test/ui/span/issue-34264.rs +++ b/src/test/ui/span/issue-34264.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo(Option, String) {} //~ ERROR expected one of //~^ ERROR expected one of fn bar(x, y: usize) {} //~ ERROR expected one of diff --git a/src/test/ui/span/issue-34264.stderr b/src/test/ui/span/issue-34264.stderr index bfa81a398a4ab..9b3b68f6ff46a 100644 --- a/src/test/ui/span/issue-34264.stderr +++ b/src/test/ui/span/issue-34264.stderr @@ -1,23 +1,23 @@ error: expected one of `:` or `@`, found `<` - --> $DIR/issue-34264.rs:11:14 + --> $DIR/issue-34264.rs:1:14 | LL | fn foo(Option, String) {} //~ ERROR expected one of | ^ expected one of `:` or `@` here error: expected one of `:` or `@`, found `)` - --> $DIR/issue-34264.rs:11:27 + --> $DIR/issue-34264.rs:1:27 | LL | fn foo(Option, String) {} //~ ERROR expected one of | ^ expected one of `:` or `@` here error: expected one of `:` or `@`, found `,` - --> $DIR/issue-34264.rs:13:9 + --> $DIR/issue-34264.rs:3:9 | LL | fn bar(x, y: usize) {} //~ ERROR expected one of | ^ expected one of `:` or `@` here error[E0061]: this function takes 2 parameters but 3 parameters were supplied - --> $DIR/issue-34264.rs:17:5 + --> $DIR/issue-34264.rs:7:5 | LL | fn foo(Option, String) {} //~ ERROR expected one of | --------------------------- defined here @@ -26,7 +26,7 @@ LL | foo(Some(42), 2, ""); //~ ERROR this function takes | ^^^^^^^^^^^^^^^^^^^^ expected 2 parameters error[E0308]: mismatched types - --> $DIR/issue-34264.rs:18:13 + --> $DIR/issue-34264.rs:8:13 | LL | bar("", ""); //~ ERROR mismatched types | ^^ expected usize, found reference @@ -35,7 +35,7 @@ LL | bar("", ""); //~ ERROR mismatched types found type `&'static str` error[E0061]: this function takes 2 parameters but 3 parameters were supplied - --> $DIR/issue-34264.rs:20:5 + --> $DIR/issue-34264.rs:10:5 | LL | fn bar(x, y: usize) {} //~ ERROR expected one of | ------------------- defined here diff --git a/src/test/ui/span/issue-35987.rs b/src/test/ui/span/issue-35987.rs index 19e05f33825f7..3a6e6ffe24910 100644 --- a/src/test/ui/span/issue-35987.rs +++ b/src/test/ui/span/issue-35987.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo(T); use std::ops::Add; diff --git a/src/test/ui/span/issue-35987.stderr b/src/test/ui/span/issue-35987.stderr index 1dd45bb1e5efe..f73bf27110b5c 100644 --- a/src/test/ui/span/issue-35987.stderr +++ b/src/test/ui/span/issue-35987.stderr @@ -1,5 +1,5 @@ error[E0404]: expected trait, found type parameter `Add` - --> $DIR/issue-35987.rs:15:21 + --> $DIR/issue-35987.rs:5:21 | LL | impl Add for Foo { | ^^^ not a trait diff --git a/src/test/ui/span/issue-36530.rs b/src/test/ui/span/issue-36530.rs index c6cdb8b6db7cf..1a0adf7399c35 100644 --- a/src/test/ui/span/issue-36530.rs +++ b/src/test/ui/span/issue-36530.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[foo] //~ ERROR is currently unknown to the compiler mod foo { #![foo] //~ ERROR is currently unknown to the compiler diff --git a/src/test/ui/span/issue-36530.stderr b/src/test/ui/span/issue-36530.stderr index e7dd8e7aa8fa0..30443c2ff46a9 100644 --- a/src/test/ui/span/issue-36530.stderr +++ b/src/test/ui/span/issue-36530.stderr @@ -1,5 +1,5 @@ error[E0658]: The attribute `foo` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/issue-36530.rs:11:3 + --> $DIR/issue-36530.rs:1:3 | LL | #[foo] //~ ERROR is currently unknown to the compiler | ^^^ @@ -7,7 +7,7 @@ LL | #[foo] //~ ERROR is currently unknown to the compiler = help: add #![feature(custom_attribute)] to the crate attributes to enable error[E0658]: The attribute `foo` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/issue-36530.rs:13:8 + --> $DIR/issue-36530.rs:3:8 | LL | #![foo] //~ ERROR is currently unknown to the compiler | ^^^ diff --git a/src/test/ui/span/issue-36537.nll.stderr b/src/test/ui/span/issue-36537.nll.stderr index 0d13c9844b331..edb804e850e2c 100644 --- a/src/test/ui/span/issue-36537.nll.stderr +++ b/src/test/ui/span/issue-36537.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `a` does not live long enough - --> $DIR/issue-36537.rs:15:9 + --> $DIR/issue-36537.rs:5:9 | LL | p = &a; | ^^^^^^ borrowed value does not live long enough diff --git a/src/test/ui/span/issue-36537.rs b/src/test/ui/span/issue-36537.rs index 6f1647c9ebb26..a5546ccbb602e 100644 --- a/src/test/ui/span/issue-36537.rs +++ b/src/test/ui/span/issue-36537.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let p; { diff --git a/src/test/ui/span/issue-36537.stderr b/src/test/ui/span/issue-36537.stderr index c090ae6318d3e..d3bcbb25add3c 100644 --- a/src/test/ui/span/issue-36537.stderr +++ b/src/test/ui/span/issue-36537.stderr @@ -1,5 +1,5 @@ error[E0597]: `a` does not live long enough - --> $DIR/issue-36537.rs:15:14 + --> $DIR/issue-36537.rs:5:14 | LL | p = &a; | ^ borrowed value does not live long enough diff --git a/src/test/ui/span/issue-37767.rs b/src/test/ui/span/issue-37767.rs index 2b0250d332df7..9e34c2c1fac74 100644 --- a/src/test/ui/span/issue-37767.rs +++ b/src/test/ui/span/issue-37767.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait A { fn foo(&mut self) {} } diff --git a/src/test/ui/span/issue-37767.stderr b/src/test/ui/span/issue-37767.stderr index 5477146a55185..f91f2a50e8595 100644 --- a/src/test/ui/span/issue-37767.stderr +++ b/src/test/ui/span/issue-37767.stderr @@ -1,55 +1,55 @@ error[E0034]: multiple applicable items in scope - --> $DIR/issue-37767.rs:20:7 + --> $DIR/issue-37767.rs:10:7 | LL | a.foo() //~ ERROR multiple applicable items | ^^^ multiple `foo` found | note: candidate #1 is defined in the trait `A` - --> $DIR/issue-37767.rs:12:5 + --> $DIR/issue-37767.rs:2:5 | LL | fn foo(&mut self) {} | ^^^^^^^^^^^^^^^^^ = help: to disambiguate the method call, write `A::foo(&a)` instead note: candidate #2 is defined in the trait `B` - --> $DIR/issue-37767.rs:16:5 + --> $DIR/issue-37767.rs:6:5 | LL | fn foo(&mut self) {} | ^^^^^^^^^^^^^^^^^ = help: to disambiguate the method call, write `B::foo(&a)` instead error[E0034]: multiple applicable items in scope - --> $DIR/issue-37767.rs:32:7 + --> $DIR/issue-37767.rs:22:7 | LL | a.foo() //~ ERROR multiple applicable items | ^^^ multiple `foo` found | note: candidate #1 is defined in the trait `C` - --> $DIR/issue-37767.rs:24:5 + --> $DIR/issue-37767.rs:14:5 | LL | fn foo(&self) {} | ^^^^^^^^^^^^^ = help: to disambiguate the method call, write `C::foo(&a)` instead note: candidate #2 is defined in the trait `D` - --> $DIR/issue-37767.rs:28:5 + --> $DIR/issue-37767.rs:18:5 | LL | fn foo(&self) {} | ^^^^^^^^^^^^^ = help: to disambiguate the method call, write `D::foo(&a)` instead error[E0034]: multiple applicable items in scope - --> $DIR/issue-37767.rs:44:7 + --> $DIR/issue-37767.rs:34:7 | LL | a.foo() //~ ERROR multiple applicable items | ^^^ multiple `foo` found | note: candidate #1 is defined in the trait `E` - --> $DIR/issue-37767.rs:36:5 + --> $DIR/issue-37767.rs:26:5 | LL | fn foo(self) {} | ^^^^^^^^^^^^ = help: to disambiguate the method call, write `E::foo(a)` instead note: candidate #2 is defined in the trait `F` - --> $DIR/issue-37767.rs:40:5 + --> $DIR/issue-37767.rs:30:5 | LL | fn foo(self) {} | ^^^^^^^^^^^^ diff --git a/src/test/ui/span/issue-39018.rs b/src/test/ui/span/issue-39018.rs index 7b3288fd29cc1..6dbc8d39976ad 100644 --- a/src/test/ui/span/issue-39018.rs +++ b/src/test/ui/span/issue-39018.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { let x = "Hello " + "World!"; //~^ ERROR cannot be applied to type diff --git a/src/test/ui/span/issue-39018.stderr b/src/test/ui/span/issue-39018.stderr index bd4e7cf574f62..00f1b11df19e2 100644 --- a/src/test/ui/span/issue-39018.stderr +++ b/src/test/ui/span/issue-39018.stderr @@ -1,5 +1,5 @@ error[E0369]: binary operation `+` cannot be applied to type `&str` - --> $DIR/issue-39018.rs:12:13 + --> $DIR/issue-39018.rs:2:13 | LL | let x = "Hello " + "World!"; | ^^^^^^^^^^^^^^^^^^^ `+` can't be used to concatenate two `&str` strings @@ -9,7 +9,7 @@ LL | let x = "Hello ".to_owned() + "World!"; | ^^^^^^^^^^^^^^^^^^^ error[E0369]: binary operation `+` cannot be applied to type `World` - --> $DIR/issue-39018.rs:18:13 + --> $DIR/issue-39018.rs:8:13 | LL | let y = World::Hello + World::Goodbye; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -17,7 +17,7 @@ LL | let y = World::Hello + World::Goodbye; = note: an implementation of `std::ops::Add` might be missing for `World` error[E0369]: binary operation `+` cannot be applied to type `&str` - --> $DIR/issue-39018.rs:21:13 + --> $DIR/issue-39018.rs:11:13 | LL | let x = "Hello " + "World!".to_owned(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `+` can't be used to concatenate a `&str` with a `String` diff --git a/src/test/ui/span/issue-39698.rs b/src/test/ui/span/issue-39698.rs index 33071c468b872..1079bae2c06ae 100644 --- a/src/test/ui/span/issue-39698.rs +++ b/src/test/ui/span/issue-39698.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum T { T1(i32, i32), T2(i32, i32), diff --git a/src/test/ui/span/issue-39698.stderr b/src/test/ui/span/issue-39698.stderr index e8dab8dc46503..7fa5d24c41b6d 100644 --- a/src/test/ui/span/issue-39698.stderr +++ b/src/test/ui/span/issue-39698.stderr @@ -1,5 +1,5 @@ error[E0408]: variable `a` is not bound in all patterns - --> $DIR/issue-39698.rs:20:23 + --> $DIR/issue-39698.rs:10:23 | LL | T::T1(a, d) | T::T2(d, b) | T::T3(c) | T::T4(a) => { println!("{:?}", a); } | - ^^^^^^^^^^^ ^^^^^^^^ - variable not in all patterns @@ -9,7 +9,7 @@ LL | T::T1(a, d) | T::T2(d, b) | T::T3(c) | T::T4(a) => { println!("{:?} | variable not in all patterns error[E0408]: variable `d` is not bound in all patterns - --> $DIR/issue-39698.rs:20:37 + --> $DIR/issue-39698.rs:10:37 | LL | T::T1(a, d) | T::T2(d, b) | T::T3(c) | T::T4(a) => { println!("{:?}", a); } | - - ^^^^^^^^ ^^^^^^^^ pattern doesn't bind `d` @@ -19,7 +19,7 @@ LL | T::T1(a, d) | T::T2(d, b) | T::T3(c) | T::T4(a) => { println!("{:?} | variable not in all patterns error[E0408]: variable `b` is not bound in all patterns - --> $DIR/issue-39698.rs:20:9 + --> $DIR/issue-39698.rs:10:9 | LL | T::T1(a, d) | T::T2(d, b) | T::T3(c) | T::T4(a) => { println!("{:?}", a); } | ^^^^^^^^^^^ - ^^^^^^^^ ^^^^^^^^ pattern doesn't bind `b` @@ -29,7 +29,7 @@ LL | T::T1(a, d) | T::T2(d, b) | T::T3(c) | T::T4(a) => { println!("{:?} | pattern doesn't bind `b` error[E0408]: variable `c` is not bound in all patterns - --> $DIR/issue-39698.rs:20:9 + --> $DIR/issue-39698.rs:10:9 | LL | T::T1(a, d) | T::T2(d, b) | T::T3(c) | T::T4(a) => { println!("{:?}", a); } | ^^^^^^^^^^^ ^^^^^^^^^^^ - ^^^^^^^^ pattern doesn't bind `c` diff --git a/src/test/ui/span/issue-40157.nll.stderr b/src/test/ui/span/issue-40157.nll.stderr index 09e634ba725f4..0b365c3f7b6b3 100644 --- a/src/test/ui/span/issue-40157.nll.stderr +++ b/src/test/ui/span/issue-40157.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `foo` does not live long enough - --> $DIR/issue-40157.rs:12:53 + --> $DIR/issue-40157.rs:2:53 | LL | {println!("{:?}", match { let foo = vec![1, 2]; foo.get(1) } { x => x });} | ------------------------^^^--------- diff --git a/src/test/ui/span/issue-40157.rs b/src/test/ui/span/issue-40157.rs index 9e33ecde91ced..03ad21ae773af 100644 --- a/src/test/ui/span/issue-40157.rs +++ b/src/test/ui/span/issue-40157.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main () { {println!("{:?}", match { let foo = vec![1, 2]; foo.get(1) } { x => x });} //~^ ERROR does not live long enough diff --git a/src/test/ui/span/issue-40157.stderr b/src/test/ui/span/issue-40157.stderr index 8c6d3339e983f..55fc8d8ee5f56 100644 --- a/src/test/ui/span/issue-40157.stderr +++ b/src/test/ui/span/issue-40157.stderr @@ -1,5 +1,5 @@ error[E0597]: `foo` does not live long enough - --> $DIR/issue-40157.rs:12:53 + --> $DIR/issue-40157.rs:2:53 | LL | {println!("{:?}", match { let foo = vec![1, 2]; foo.get(1) } { x => x });} | -----------------------------------------------^^^---------------------- diff --git a/src/test/ui/span/issue-42234-unknown-receiver-type.rs b/src/test/ui/span/issue-42234-unknown-receiver-type.rs index 975c81955e0b3..eceb43ff62cdc 100644 --- a/src/test/ui/span/issue-42234-unknown-receiver-type.rs +++ b/src/test/ui/span/issue-42234-unknown-receiver-type.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // When the type of a method call's receiver is unknown, the span should point // to the receiver (and not the entire call, as was previously the case before // the fix of which this tests). diff --git a/src/test/ui/span/issue-42234-unknown-receiver-type.stderr b/src/test/ui/span/issue-42234-unknown-receiver-type.stderr index d2d5a4a4b1265..a922b82742151 100644 --- a/src/test/ui/span/issue-42234-unknown-receiver-type.stderr +++ b/src/test/ui/span/issue-42234-unknown-receiver-type.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/issue-42234-unknown-receiver-type.rs:17:5 + --> $DIR/issue-42234-unknown-receiver-type.rs:7:5 | LL | let x: Option<_> = None; | - consider giving `x` a type @@ -9,7 +9,7 @@ LL | x.unwrap().method_that_could_exist_on_some_type(); = note: type must be known at this point error[E0282]: type annotations needed - --> $DIR/issue-42234-unknown-receiver-type.rs:22:5 + --> $DIR/issue-42234-unknown-receiver-type.rs:12:5 | LL | / data.iter() //~ ERROR 22:5: 23:20: type annotations needed LL | | .sum::<_>() diff --git a/src/test/ui/span/issue-43927-non-ADT-derive.rs b/src/test/ui/span/issue-43927-non-ADT-derive.rs index 782cce26a9578..add1758dddfb6 100644 --- a/src/test/ui/span/issue-43927-non-ADT-derive.rs +++ b/src/test/ui/span/issue-43927-non-ADT-derive.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] #![derive(Debug, PartialEq, Eq)] // should be an outer attribute! diff --git a/src/test/ui/span/issue-43927-non-ADT-derive.stderr b/src/test/ui/span/issue-43927-non-ADT-derive.stderr index e3575c03ff250..e09a8a0e8fb93 100644 --- a/src/test/ui/span/issue-43927-non-ADT-derive.stderr +++ b/src/test/ui/span/issue-43927-non-ADT-derive.stderr @@ -1,5 +1,5 @@ error: `derive` may only be applied to structs, enums and unions - --> $DIR/issue-43927-non-ADT-derive.rs:13:1 + --> $DIR/issue-43927-non-ADT-derive.rs:3:1 | LL | #![derive(Debug, PartialEq, Eq)] // should be an outer attribute! | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try an outer attribute: `#[derive(Debug, PartialEq, Eq)]` diff --git a/src/test/ui/span/issue-7575.rs b/src/test/ui/span/issue-7575.rs index b1dbd5b86e77b..c33398cd39cab 100644 --- a/src/test/ui/span/issue-7575.rs +++ b/src/test/ui/span/issue-7575.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test the mechanism for warning about possible missing `self` declarations. // ignore-tidy-linelength diff --git a/src/test/ui/span/issue-7575.stderr b/src/test/ui/span/issue-7575.stderr index e31134f843b72..b2c9e505f07b6 100644 --- a/src/test/ui/span/issue-7575.stderr +++ b/src/test/ui/span/issue-7575.stderr @@ -1,24 +1,24 @@ error[E0599]: no method named `f9` found for type `usize` in the current scope - --> $DIR/issue-7575.rs:74:18 + --> $DIR/issue-7575.rs:64:18 | LL | u.f8(42) + u.f9(342) + m.fff(42) | ^^ this is an associated function, not a method | = note: found the following associated functions; to be used as methods, functions must have a `self` parameter note: candidate #1 is defined in the trait `CtxtFn` - --> $DIR/issue-7575.rs:16:5 + --> $DIR/issue-7575.rs:6:5 | LL | fn f9(_: usize) -> usize; | ^^^^^^^^^^^^^^^^^^^^^^^^^ = help: to disambiguate the method call, write `CtxtFn::f9(u, 342)` instead note: candidate #2 is defined in the trait `OtherTrait` - --> $DIR/issue-7575.rs:20:5 + --> $DIR/issue-7575.rs:10:5 | LL | fn f9(_: usize) -> usize; | ^^^^^^^^^^^^^^^^^^^^^^^^^ = help: to disambiguate the method call, write `OtherTrait::f9(u, 342)` instead note: candidate #3 is defined in the trait `UnusedTrait` - --> $DIR/issue-7575.rs:29:5 + --> $DIR/issue-7575.rs:19:5 | LL | fn f9(_: usize) -> usize; | ^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -30,7 +30,7 @@ LL | fn f9(_: usize) -> usize; candidate #3: `UnusedTrait` error[E0599]: no method named `fff` found for type `Myisize` in the current scope - --> $DIR/issue-7575.rs:74:30 + --> $DIR/issue-7575.rs:64:30 | LL | struct Myisize(isize); | ---------------------- method `fff` not found for this @@ -43,20 +43,20 @@ LL | u.f8(42) + u.f9(342) + m.fff(42) | = note: found the following associated functions; to be used as methods, functions must have a `self` parameter note: the candidate is defined in an impl for the type `Myisize` - --> $DIR/issue-7575.rs:51:5 + --> $DIR/issue-7575.rs:41:5 | LL | fn fff(i: isize) -> isize { | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0599]: no method named `is_str` found for type `T` in the current scope - --> $DIR/issue-7575.rs:82:7 + --> $DIR/issue-7575.rs:72:7 | LL | t.is_str() | ^^^^^^ this is an associated function, not a method | = note: found the following associated functions; to be used as methods, functions must have a `self` parameter note: the candidate is defined in the trait `ManyImplTrait` - --> $DIR/issue-7575.rs:57:5 + --> $DIR/issue-7575.rs:47:5 | LL | fn is_str() -> bool { | ^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/span/issue28498-reject-ex1.nll.stderr b/src/test/ui/span/issue28498-reject-ex1.nll.stderr index 27eb4a3afed6d..b24cae6078b3b 100644 --- a/src/test/ui/span/issue28498-reject-ex1.nll.stderr +++ b/src/test/ui/span/issue28498-reject-ex1.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `foo.data` does not live long enough - --> $DIR/issue28498-reject-ex1.rs:44:29 + --> $DIR/issue28498-reject-ex1.rs:34:29 | LL | foo.data[0].1.set(Some(&foo.data[1])); | ^^^^^^^^ borrowed value does not live long enough diff --git a/src/test/ui/span/issue28498-reject-ex1.rs b/src/test/ui/span/issue28498-reject-ex1.rs index cee7c57c2019f..05104d1cdc020 100644 --- a/src/test/ui/span/issue28498-reject-ex1.rs +++ b/src/test/ui/span/issue28498-reject-ex1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Example taken from RFC 1238 text // https://github.com/rust-lang/rfcs/blob/master/text/1238-nonparametric-dropck.md diff --git a/src/test/ui/span/issue28498-reject-ex1.stderr b/src/test/ui/span/issue28498-reject-ex1.stderr index fb6eeb4de5dd8..8daef82f8bbd8 100644 --- a/src/test/ui/span/issue28498-reject-ex1.stderr +++ b/src/test/ui/span/issue28498-reject-ex1.stderr @@ -1,5 +1,5 @@ error[E0597]: `foo.data` does not live long enough - --> $DIR/issue28498-reject-ex1.rs:44:29 + --> $DIR/issue28498-reject-ex1.rs:34:29 | LL | foo.data[0].1.set(Some(&foo.data[1])); | ^^^^^^^^ borrowed value does not live long enough @@ -10,7 +10,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `foo.data` does not live long enough - --> $DIR/issue28498-reject-ex1.rs:46:29 + --> $DIR/issue28498-reject-ex1.rs:36:29 | LL | foo.data[1].1.set(Some(&foo.data[0])); | ^^^^^^^^ borrowed value does not live long enough diff --git a/src/test/ui/span/issue28498-reject-lifetime-param.nll.stderr b/src/test/ui/span/issue28498-reject-lifetime-param.nll.stderr index 72acc54bffb32..52703184b7d8e 100644 --- a/src/test/ui/span/issue28498-reject-lifetime-param.nll.stderr +++ b/src/test/ui/span/issue28498-reject-lifetime-param.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `first_dropped` does not live long enough - --> $DIR/issue28498-reject-lifetime-param.rs:44:19 + --> $DIR/issue28498-reject-lifetime-param.rs:34:19 | LL | foo1 = Foo(1, &first_dropped); | ^^^^^^^^^^^^^^ borrowed value does not live long enough diff --git a/src/test/ui/span/issue28498-reject-lifetime-param.rs b/src/test/ui/span/issue28498-reject-lifetime-param.rs index 92028c7a818c2..062636af3f1e3 100644 --- a/src/test/ui/span/issue28498-reject-lifetime-param.rs +++ b/src/test/ui/span/issue28498-reject-lifetime-param.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Demonstrate that having a lifetime param causes dropck to reject code // that might indirectly access previously dropped value. // diff --git a/src/test/ui/span/issue28498-reject-lifetime-param.stderr b/src/test/ui/span/issue28498-reject-lifetime-param.stderr index 841ea5b25c840..0e51729f8d6ba 100644 --- a/src/test/ui/span/issue28498-reject-lifetime-param.stderr +++ b/src/test/ui/span/issue28498-reject-lifetime-param.stderr @@ -1,5 +1,5 @@ error[E0597]: `last_dropped` does not live long enough - --> $DIR/issue28498-reject-lifetime-param.rs:42:20 + --> $DIR/issue28498-reject-lifetime-param.rs:32:20 | LL | foo0 = Foo(0, &last_dropped); | ^^^^^^^^^^^^ borrowed value does not live long enough @@ -10,7 +10,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `first_dropped` does not live long enough - --> $DIR/issue28498-reject-lifetime-param.rs:44:20 + --> $DIR/issue28498-reject-lifetime-param.rs:34:20 | LL | foo1 = Foo(1, &first_dropped); | ^^^^^^^^^^^^^ borrowed value does not live long enough diff --git a/src/test/ui/span/issue28498-reject-passed-to-fn.nll.stderr b/src/test/ui/span/issue28498-reject-passed-to-fn.nll.stderr index a39050a519911..6064a21189d6a 100644 --- a/src/test/ui/span/issue28498-reject-passed-to-fn.nll.stderr +++ b/src/test/ui/span/issue28498-reject-passed-to-fn.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `first_dropped` does not live long enough - --> $DIR/issue28498-reject-passed-to-fn.rs:46:19 + --> $DIR/issue28498-reject-passed-to-fn.rs:36:19 | LL | foo1 = Foo(1, &first_dropped, Box::new(callback)); | ^^^^^^^^^^^^^^ borrowed value does not live long enough diff --git a/src/test/ui/span/issue28498-reject-passed-to-fn.rs b/src/test/ui/span/issue28498-reject-passed-to-fn.rs index 27378b1e0bec0..27a757e850bdc 100644 --- a/src/test/ui/span/issue28498-reject-passed-to-fn.rs +++ b/src/test/ui/span/issue28498-reject-passed-to-fn.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Demonstrate that a type param in negative position causes dropck to reject code // that might indirectly access previously dropped value. // diff --git a/src/test/ui/span/issue28498-reject-passed-to-fn.stderr b/src/test/ui/span/issue28498-reject-passed-to-fn.stderr index 2a5e34290ec92..80533c79f10fd 100644 --- a/src/test/ui/span/issue28498-reject-passed-to-fn.stderr +++ b/src/test/ui/span/issue28498-reject-passed-to-fn.stderr @@ -1,5 +1,5 @@ error[E0597]: `last_dropped` does not live long enough - --> $DIR/issue28498-reject-passed-to-fn.rs:44:20 + --> $DIR/issue28498-reject-passed-to-fn.rs:34:20 | LL | foo0 = Foo(0, &last_dropped, Box::new(callback)); | ^^^^^^^^^^^^ borrowed value does not live long enough @@ -10,7 +10,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `first_dropped` does not live long enough - --> $DIR/issue28498-reject-passed-to-fn.rs:46:20 + --> $DIR/issue28498-reject-passed-to-fn.rs:36:20 | LL | foo1 = Foo(1, &first_dropped, Box::new(callback)); | ^^^^^^^^^^^^^ borrowed value does not live long enough diff --git a/src/test/ui/span/issue28498-reject-trait-bound.nll.stderr b/src/test/ui/span/issue28498-reject-trait-bound.nll.stderr index fcffea25702b9..503c98b9d4804 100644 --- a/src/test/ui/span/issue28498-reject-trait-bound.nll.stderr +++ b/src/test/ui/span/issue28498-reject-trait-bound.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `first_dropped` does not live long enough - --> $DIR/issue28498-reject-trait-bound.rs:46:19 + --> $DIR/issue28498-reject-trait-bound.rs:36:19 | LL | foo1 = Foo(1, &first_dropped); | ^^^^^^^^^^^^^^ borrowed value does not live long enough diff --git a/src/test/ui/span/issue28498-reject-trait-bound.rs b/src/test/ui/span/issue28498-reject-trait-bound.rs index 3904d68ba19db..3ea67d1662d56 100644 --- a/src/test/ui/span/issue28498-reject-trait-bound.rs +++ b/src/test/ui/span/issue28498-reject-trait-bound.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Demonstrate that having a trait bound causes dropck to reject code // that might indirectly access previously dropped value. // diff --git a/src/test/ui/span/issue28498-reject-trait-bound.stderr b/src/test/ui/span/issue28498-reject-trait-bound.stderr index 6e46f67a1d51c..3ce4dd9fdd684 100644 --- a/src/test/ui/span/issue28498-reject-trait-bound.stderr +++ b/src/test/ui/span/issue28498-reject-trait-bound.stderr @@ -1,5 +1,5 @@ error[E0597]: `last_dropped` does not live long enough - --> $DIR/issue28498-reject-trait-bound.rs:44:20 + --> $DIR/issue28498-reject-trait-bound.rs:34:20 | LL | foo0 = Foo(0, &last_dropped); | ^^^^^^^^^^^^ borrowed value does not live long enough @@ -10,7 +10,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `first_dropped` does not live long enough - --> $DIR/issue28498-reject-trait-bound.rs:46:20 + --> $DIR/issue28498-reject-trait-bound.rs:36:20 | LL | foo1 = Foo(1, &first_dropped); | ^^^^^^^^^^^^^ borrowed value does not live long enough diff --git a/src/test/ui/span/lint-unused-unsafe.rs b/src/test/ui/span/lint-unused-unsafe.rs index 5c8e73e674751..338fbb994c5c5 100644 --- a/src/test/ui/span/lint-unused-unsafe.rs +++ b/src/test/ui/span/lint-unused-unsafe.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Exercise the unused_unsafe attribute in some positive and negative cases #![allow(dead_code)] diff --git a/src/test/ui/span/lint-unused-unsafe.stderr b/src/test/ui/span/lint-unused-unsafe.stderr index f85ca4ef00f8d..7f16cfae859ed 100644 --- a/src/test/ui/span/lint-unused-unsafe.stderr +++ b/src/test/ui/span/lint-unused-unsafe.stderr @@ -1,23 +1,23 @@ error: unnecessary `unsafe` block - --> $DIR/lint-unused-unsafe.rs:26:13 + --> $DIR/lint-unused-unsafe.rs:16:13 | LL | fn bad1() { unsafe {} } //~ ERROR: unnecessary `unsafe` block | ^^^^^^ unnecessary `unsafe` block | note: lint level defined here - --> $DIR/lint-unused-unsafe.rs:14:9 + --> $DIR/lint-unused-unsafe.rs:4:9 | LL | #![deny(unused_unsafe)] | ^^^^^^^^^^^^^ error: unnecessary `unsafe` block - --> $DIR/lint-unused-unsafe.rs:27:13 + --> $DIR/lint-unused-unsafe.rs:17:13 | LL | fn bad2() { unsafe { bad1() } } //~ ERROR: unnecessary `unsafe` block | ^^^^^^ unnecessary `unsafe` block error: unnecessary `unsafe` block - --> $DIR/lint-unused-unsafe.rs:28:20 + --> $DIR/lint-unused-unsafe.rs:18:20 | LL | unsafe fn bad3() { unsafe {} } //~ ERROR: unnecessary `unsafe` block | ---------------- ^^^^^^ unnecessary `unsafe` block @@ -25,13 +25,13 @@ LL | unsafe fn bad3() { unsafe {} } //~ ERROR: unnecessary `unsafe` bl | because it's nested under this `unsafe` fn error: unnecessary `unsafe` block - --> $DIR/lint-unused-unsafe.rs:29:13 + --> $DIR/lint-unused-unsafe.rs:19:13 | LL | fn bad4() { unsafe { callback(||{}) } } //~ ERROR: unnecessary `unsafe` block | ^^^^^^ unnecessary `unsafe` block error: unnecessary `unsafe` block - --> $DIR/lint-unused-unsafe.rs:30:20 + --> $DIR/lint-unused-unsafe.rs:20:20 | LL | unsafe fn bad5() { unsafe { unsf() } } //~ ERROR: unnecessary `unsafe` block | ---------------- ^^^^^^ unnecessary `unsafe` block @@ -39,7 +39,7 @@ LL | unsafe fn bad5() { unsafe { unsf() } } //~ ERROR: unnecessary `unsafe` bl | because it's nested under this `unsafe` fn error: unnecessary `unsafe` block - --> $DIR/lint-unused-unsafe.rs:33:9 + --> $DIR/lint-unused-unsafe.rs:23:9 | LL | unsafe { // don't put the warning here | ------ because it's nested under this `unsafe` block @@ -47,7 +47,7 @@ LL | unsafe { //~ ERROR: unnecessary `unsafe` bl | ^^^^^^ unnecessary `unsafe` block error: unnecessary `unsafe` block - --> $DIR/lint-unused-unsafe.rs:39:5 + --> $DIR/lint-unused-unsafe.rs:29:5 | LL | unsafe fn bad7() { | ---------------- because it's nested under this `unsafe` fn @@ -55,7 +55,7 @@ LL | unsafe { //~ ERROR: unnecessary `unsafe` bl | ^^^^^^ unnecessary `unsafe` block error: unnecessary `unsafe` block - --> $DIR/lint-unused-unsafe.rs:40:9 + --> $DIR/lint-unused-unsafe.rs:30:9 | LL | unsafe fn bad7() { | ---------------- because it's nested under this `unsafe` fn diff --git a/src/test/ui/span/macro-span-replacement.rs b/src/test/ui/span/macro-span-replacement.rs index 7374f15746851..c5998c1b40310 100644 --- a/src/test/ui/span/macro-span-replacement.rs +++ b/src/test/ui/span/macro-span-replacement.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![warn(unused)] diff --git a/src/test/ui/span/macro-span-replacement.stderr b/src/test/ui/span/macro-span-replacement.stderr index b12ca86d3c929..f6c303164bfd1 100644 --- a/src/test/ui/span/macro-span-replacement.stderr +++ b/src/test/ui/span/macro-span-replacement.stderr @@ -1,5 +1,5 @@ warning: struct is never constructed: `S` - --> $DIR/macro-span-replacement.rs:17:14 + --> $DIR/macro-span-replacement.rs:7:14 | LL | $b $a; //~ WARN struct is never constructed | ^ @@ -8,7 +8,7 @@ LL | m!(S struct); | ------------- in this macro invocation | note: lint level defined here - --> $DIR/macro-span-replacement.rs:13:9 + --> $DIR/macro-span-replacement.rs:3:9 | LL | #![warn(unused)] | ^^^^^^ diff --git a/src/test/ui/span/macro-ty-params.rs b/src/test/ui/span/macro-ty-params.rs index 5d93b1266a4ae..f36574e2b3d3d 100644 --- a/src/test/ui/span/macro-ty-params.rs +++ b/src/test/ui/span/macro-ty-params.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! m { ($p1: path) => { #[derive($p1)] struct U; diff --git a/src/test/ui/span/macro-ty-params.stderr b/src/test/ui/span/macro-ty-params.stderr index 3988dec88d5a8..9c92d7fb9272f 100644 --- a/src/test/ui/span/macro-ty-params.stderr +++ b/src/test/ui/span/macro-ty-params.stderr @@ -1,23 +1,23 @@ error: unexpected generic arguments in path - --> $DIR/macro-ty-params.rs:20:8 + --> $DIR/macro-ty-params.rs:10:8 | LL | m!(MyTrait<>); //~ ERROR generic arguments in macro path | ^^^^^^^^^ error: generic arguments in macro path - --> $DIR/macro-ty-params.rs:18:8 + --> $DIR/macro-ty-params.rs:8:8 | LL | foo::!(); //~ ERROR generic arguments in macro path | ^^^^^ error: generic arguments in macro path - --> $DIR/macro-ty-params.rs:19:8 + --> $DIR/macro-ty-params.rs:9:8 | LL | foo::<>!(); //~ ERROR generic arguments in macro path | ^^^^ error: generic arguments in macro path - --> $DIR/macro-ty-params.rs:20:15 + --> $DIR/macro-ty-params.rs:10:15 | LL | m!(MyTrait<>); //~ ERROR generic arguments in macro path | ^^ diff --git a/src/test/ui/span/method-and-field-eager-resolution.rs b/src/test/ui/span/method-and-field-eager-resolution.rs index 29011abb46016..a38f07d58e474 100644 --- a/src/test/ui/span/method-and-field-eager-resolution.rs +++ b/src/test/ui/span/method-and-field-eager-resolution.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that spans get only base in eager type resolution (structurally_resolve_type). fn main() { diff --git a/src/test/ui/span/method-and-field-eager-resolution.stderr b/src/test/ui/span/method-and-field-eager-resolution.stderr index 8a8c1e467b9fa..0ecbe4c136e00 100644 --- a/src/test/ui/span/method-and-field-eager-resolution.stderr +++ b/src/test/ui/span/method-and-field-eager-resolution.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/method-and-field-eager-resolution.rs:15:5 + --> $DIR/method-and-field-eager-resolution.rs:5:5 | LL | let mut x = Default::default(); | ----- consider giving `x` a type @@ -9,7 +9,7 @@ LL | x.0; = note: type must be known at this point error[E0282]: type annotations needed - --> $DIR/method-and-field-eager-resolution.rs:22:5 + --> $DIR/method-and-field-eager-resolution.rs:12:5 | LL | let mut x = Default::default(); | ----- consider giving `x` a type diff --git a/src/test/ui/span/missing-unit-argument.rs b/src/test/ui/span/missing-unit-argument.rs index a586d33eaa738..b8fb332120a4e 100644 --- a/src/test/ui/span/missing-unit-argument.rs +++ b/src/test/ui/span/missing-unit-argument.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo(():(), ():()) {} fn bar(():()) {} diff --git a/src/test/ui/span/missing-unit-argument.stderr b/src/test/ui/span/missing-unit-argument.stderr index be514fdd81ced..bf19eb6946189 100644 --- a/src/test/ui/span/missing-unit-argument.stderr +++ b/src/test/ui/span/missing-unit-argument.stderr @@ -1,5 +1,5 @@ error[E0061]: this function takes 1 parameter but 0 parameters were supplied - --> $DIR/missing-unit-argument.rs:21:33 + --> $DIR/missing-unit-argument.rs:11:33 | LL | let _: Result<(), String> = Ok(); //~ ERROR this function takes | ^^^^ @@ -9,7 +9,7 @@ LL | let _: Result<(), String> = Ok(()); //~ ERROR this function takes | ^^ error[E0061]: this function takes 2 parameters but 0 parameters were supplied - --> $DIR/missing-unit-argument.rs:22:5 + --> $DIR/missing-unit-argument.rs:12:5 | LL | fn foo(():(), ():()) {} | -------------------- defined here @@ -18,7 +18,7 @@ LL | foo(); //~ ERROR this function takes | ^^^^^ expected 2 parameters error[E0061]: this function takes 2 parameters but 1 parameter was supplied - --> $DIR/missing-unit-argument.rs:23:5 + --> $DIR/missing-unit-argument.rs:13:5 | LL | fn foo(():(), ():()) {} | -------------------- defined here @@ -27,7 +27,7 @@ LL | foo(()); //~ ERROR this function takes | ^^^^^^^ expected 2 parameters error[E0061]: this function takes 1 parameter but 0 parameters were supplied - --> $DIR/missing-unit-argument.rs:24:5 + --> $DIR/missing-unit-argument.rs:14:5 | LL | fn bar(():()) {} | ------------- defined here @@ -40,7 +40,7 @@ LL | bar(()); //~ ERROR this function takes | ^^ error[E0061]: this function takes 1 parameter but 0 parameters were supplied - --> $DIR/missing-unit-argument.rs:25:7 + --> $DIR/missing-unit-argument.rs:15:7 | LL | fn baz(self, (): ()) { } | -------------------- defined here @@ -53,7 +53,7 @@ LL | S.baz(()); //~ ERROR this function takes | ^^ error[E0061]: this function takes 1 parameter but 0 parameters were supplied - --> $DIR/missing-unit-argument.rs:26:7 + --> $DIR/missing-unit-argument.rs:16:7 | LL | fn generic(self, _: T) { } | ------------------------- defined here diff --git a/src/test/ui/span/move-closure.rs b/src/test/ui/span/move-closure.rs index 87ce15292979a..bdd7951b303ca 100644 --- a/src/test/ui/span/move-closure.rs +++ b/src/test/ui/span/move-closure.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #24986 // Make sure that the span of a closure marked `move` begins at the `move` keyword. diff --git a/src/test/ui/span/move-closure.stderr b/src/test/ui/span/move-closure.stderr index 1c629ee9841ca..f09e052f6530f 100644 --- a/src/test/ui/span/move-closure.stderr +++ b/src/test/ui/span/move-closure.stderr @@ -1,11 +1,11 @@ error[E0308]: mismatched types - --> $DIR/move-closure.rs:15:17 + --> $DIR/move-closure.rs:5:17 | LL | let x: () = move || (); //~ ERROR mismatched types | ^^^^^^^^^^ expected (), found closure | = note: expected type `()` - found type `[closure@$DIR/move-closure.rs:15:17: 15:27]` + found type `[closure@$DIR/move-closure.rs:5:17: 5:27]` error: aborting due to previous error diff --git a/src/test/ui/span/multiline-span-E0072.rs b/src/test/ui/span/multiline-span-E0072.rs index 2344d72f45c79..728b47d6539e9 100644 --- a/src/test/ui/span/multiline-span-E0072.rs +++ b/src/test/ui/span/multiline-span-E0072.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // It should just use the entire body instead of pointing at the next two lines struct //~ ERROR has infinite size ListNode diff --git a/src/test/ui/span/multiline-span-E0072.stderr b/src/test/ui/span/multiline-span-E0072.stderr index d087a3aaabffe..ee392f5994c84 100644 --- a/src/test/ui/span/multiline-span-E0072.stderr +++ b/src/test/ui/span/multiline-span-E0072.stderr @@ -1,5 +1,5 @@ error[E0072]: recursive type `ListNode` has infinite size - --> $DIR/multiline-span-E0072.rs:12:1 + --> $DIR/multiline-span-E0072.rs:2:1 | LL | / struct //~ ERROR has infinite size LL | | ListNode diff --git a/src/test/ui/span/multiline-span-simple.rs b/src/test/ui/span/multiline-span-simple.rs index dd09534480e10..204a7f6b1b2d1 100644 --- a/src/test/ui/span/multiline-span-simple.rs +++ b/src/test/ui/span/multiline-span-simple.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo(a: u32, b: u32) { a + b; } diff --git a/src/test/ui/span/multiline-span-simple.stderr b/src/test/ui/span/multiline-span-simple.stderr index 463d5baae64ea..18b6cd06afbbb 100644 --- a/src/test/ui/span/multiline-span-simple.stderr +++ b/src/test/ui/span/multiline-span-simple.stderr @@ -1,5 +1,5 @@ error[E0277]: cannot add `()` to `u32` - --> $DIR/multiline-span-simple.rs:23:18 + --> $DIR/multiline-span-simple.rs:13:18 | LL | foo(1 as u32 + //~ ERROR cannot add `()` to `u32` | ^ no implementation for `u32 + ()` diff --git a/src/test/ui/span/multispan-import-lint.rs b/src/test/ui/span/multispan-import-lint.rs index a94fa1c895359..753c3599975fd 100644 --- a/src/test/ui/span/multispan-import-lint.rs +++ b/src/test/ui/span/multispan-import-lint.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![warn(unused)] diff --git a/src/test/ui/span/multispan-import-lint.stderr b/src/test/ui/span/multispan-import-lint.stderr index da22b217b82c5..a730d081b7c03 100644 --- a/src/test/ui/span/multispan-import-lint.stderr +++ b/src/test/ui/span/multispan-import-lint.stderr @@ -1,11 +1,11 @@ warning: unused imports: `Eq`, `Ord`, `PartialEq`, `PartialOrd` - --> $DIR/multispan-import-lint.rs:15:16 + --> $DIR/multispan-import-lint.rs:5:16 | LL | use std::cmp::{Eq, Ord, min, PartialEq, PartialOrd}; | ^^ ^^^ ^^^^^^^^^ ^^^^^^^^^^ | note: lint level defined here - --> $DIR/multispan-import-lint.rs:13:9 + --> $DIR/multispan-import-lint.rs:3:9 | LL | #![warn(unused)] | ^^^^^^ diff --git a/src/test/ui/span/mut-arg-hint.nll.stderr b/src/test/ui/span/mut-arg-hint.nll.stderr index f42cf6500e2ea..e0fa3c3a1e6f5 100644 --- a/src/test/ui/span/mut-arg-hint.nll.stderr +++ b/src/test/ui/span/mut-arg-hint.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `*a` as mutable, as it is behind a `&` reference - --> $DIR/mut-arg-hint.rs:13:9 + --> $DIR/mut-arg-hint.rs:3:9 | LL | fn foo(mut a: &String) { | ------- help: consider changing this to be a mutable reference: `&mut std::string::String` @@ -7,7 +7,7 @@ LL | a.push_str("bar"); //~ ERROR cannot borrow immutable borrowed conte | ^ `a` is a `&` reference, so the data it refers to cannot be borrowed as mutable error[E0596]: cannot borrow `*a` as mutable, as it is behind a `&` reference - --> $DIR/mut-arg-hint.rs:18:5 + --> $DIR/mut-arg-hint.rs:8:5 | LL | pub fn foo<'a>(mut a: &'a String) { | ---------- help: consider changing this to be a mutable reference: `&'a mut String` @@ -15,7 +15,7 @@ LL | a.push_str("foo"); //~ ERROR cannot borrow immutable borrowed content | ^ `a` is a `&` reference, so the data it refers to cannot be borrowed as mutable error[E0596]: cannot borrow `*a` as mutable, as it is behind a `&` reference - --> $DIR/mut-arg-hint.rs:25:9 + --> $DIR/mut-arg-hint.rs:15:9 | LL | pub fn foo(mut a: &String) { | ------- help: consider changing this to be a mutable reference: `&mut std::string::String` diff --git a/src/test/ui/span/mut-arg-hint.rs b/src/test/ui/span/mut-arg-hint.rs index b22cadf3ef2b0..3d46613aa7ac9 100644 --- a/src/test/ui/span/mut-arg-hint.rs +++ b/src/test/ui/span/mut-arg-hint.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait B { fn foo(mut a: &String) { a.push_str("bar"); //~ ERROR cannot borrow immutable borrowed content diff --git a/src/test/ui/span/mut-arg-hint.stderr b/src/test/ui/span/mut-arg-hint.stderr index 730592b31002e..ea6fc8bee637b 100644 --- a/src/test/ui/span/mut-arg-hint.stderr +++ b/src/test/ui/span/mut-arg-hint.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow immutable borrowed content `*a` as mutable - --> $DIR/mut-arg-hint.rs:13:9 + --> $DIR/mut-arg-hint.rs:3:9 | LL | fn foo(mut a: &String) { | ------- use `&mut String` here to make mutable @@ -7,7 +7,7 @@ LL | a.push_str("bar"); //~ ERROR cannot borrow immutable borrowed conte | ^ cannot borrow as mutable error[E0596]: cannot borrow immutable borrowed content `*a` as mutable - --> $DIR/mut-arg-hint.rs:18:5 + --> $DIR/mut-arg-hint.rs:8:5 | LL | pub fn foo<'a>(mut a: &'a String) { | ---------- use `&'a mut String` here to make mutable @@ -15,7 +15,7 @@ LL | a.push_str("foo"); //~ ERROR cannot borrow immutable borrowed content | ^ cannot borrow as mutable error[E0596]: cannot borrow immutable borrowed content `*a` as mutable - --> $DIR/mut-arg-hint.rs:25:9 + --> $DIR/mut-arg-hint.rs:15:9 | LL | pub fn foo(mut a: &String) { | ------- use `&mut String` here to make mutable diff --git a/src/test/ui/span/mut-ptr-cant-outlive-ref.nll.stderr b/src/test/ui/span/mut-ptr-cant-outlive-ref.nll.stderr index e5139dca351a6..d3ba848fe6bb7 100644 --- a/src/test/ui/span/mut-ptr-cant-outlive-ref.nll.stderr +++ b/src/test/ui/span/mut-ptr-cant-outlive-ref.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `b` does not live long enough - --> $DIR/mut-ptr-cant-outlive-ref.rs:18:15 + --> $DIR/mut-ptr-cant-outlive-ref.rs:8:15 | LL | p = &*b; | ^ borrowed value does not live long enough diff --git a/src/test/ui/span/mut-ptr-cant-outlive-ref.rs b/src/test/ui/span/mut-ptr-cant-outlive-ref.rs index 6cd2cf1e6734d..b8c752d73ed18 100644 --- a/src/test/ui/span/mut-ptr-cant-outlive-ref.rs +++ b/src/test/ui/span/mut-ptr-cant-outlive-ref.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cell::RefCell; fn main() { diff --git a/src/test/ui/span/mut-ptr-cant-outlive-ref.stderr b/src/test/ui/span/mut-ptr-cant-outlive-ref.stderr index 34fcc9ef96292..f6cf568a8d2bf 100644 --- a/src/test/ui/span/mut-ptr-cant-outlive-ref.stderr +++ b/src/test/ui/span/mut-ptr-cant-outlive-ref.stderr @@ -1,5 +1,5 @@ error[E0597]: `b` does not live long enough - --> $DIR/mut-ptr-cant-outlive-ref.rs:18:15 + --> $DIR/mut-ptr-cant-outlive-ref.rs:8:15 | LL | p = &*b; | ^ borrowed value does not live long enough diff --git a/src/test/ui/span/non-existing-module-import.rs b/src/test/ui/span/non-existing-module-import.rs index ad6409f014ad1..d2ce7ec4f8eeb 100644 --- a/src/test/ui/span/non-existing-module-import.rs +++ b/src/test/ui/span/non-existing-module-import.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::bar::{foo1, foo2}; //~ ERROR unresolved import fn main() {} diff --git a/src/test/ui/span/non-existing-module-import.stderr b/src/test/ui/span/non-existing-module-import.stderr index 5518b42ac652e..0bccc2f1ca53d 100644 --- a/src/test/ui/span/non-existing-module-import.stderr +++ b/src/test/ui/span/non-existing-module-import.stderr @@ -1,5 +1,5 @@ error[E0432]: unresolved import `std::bar` - --> $DIR/non-existing-module-import.rs:11:10 + --> $DIR/non-existing-module-import.rs:1:10 | LL | use std::bar::{foo1, foo2}; //~ ERROR unresolved import | ^^^ Could not find `bar` in `std` diff --git a/src/test/ui/span/pub-struct-field.rs b/src/test/ui/span/pub-struct-field.rs index 11af361e8a846..e149b9dbf5a63 100644 --- a/src/test/ui/span/pub-struct-field.rs +++ b/src/test/ui/span/pub-struct-field.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #26083 and #35435 // Test that span for public struct fields start at `pub` diff --git a/src/test/ui/span/pub-struct-field.stderr b/src/test/ui/span/pub-struct-field.stderr index 4d2a48aef00a4..66afbf253c9b9 100644 --- a/src/test/ui/span/pub-struct-field.stderr +++ b/src/test/ui/span/pub-struct-field.stderr @@ -1,5 +1,5 @@ error[E0124]: field `bar` is already declared - --> $DIR/pub-struct-field.rs:16:5 + --> $DIR/pub-struct-field.rs:6:5 | LL | bar: u8, | ------- `bar` first declared here @@ -7,7 +7,7 @@ LL | pub bar: u8, //~ ERROR is already declared | ^^^^^^^^^^^ field already declared error[E0124]: field `bar` is already declared - --> $DIR/pub-struct-field.rs:17:5 + --> $DIR/pub-struct-field.rs:7:5 | LL | bar: u8, | ------- `bar` first declared here diff --git a/src/test/ui/span/range-2.nll.stderr b/src/test/ui/span/range-2.nll.stderr index 2a82e1b8ada8c..cb8da651d2268 100644 --- a/src/test/ui/span/range-2.nll.stderr +++ b/src/test/ui/span/range-2.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `a` does not live long enough - --> $DIR/range-2.rs:17:9 + --> $DIR/range-2.rs:7:9 | LL | &a..&b | ^^ borrowed value does not live long enough @@ -10,7 +10,7 @@ LL | r.use_ref(); | - borrow later used here error[E0597]: `b` does not live long enough - --> $DIR/range-2.rs:17:13 + --> $DIR/range-2.rs:7:13 | LL | &a..&b | ^^ borrowed value does not live long enough diff --git a/src/test/ui/span/range-2.rs b/src/test/ui/span/range-2.rs index 6d2cd85fb666c..c4bb16f44bd1b 100644 --- a/src/test/ui/span/range-2.rs +++ b/src/test/ui/span/range-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test range syntax - borrow errors. #![feature(rustc_attrs)] pub fn main() { #![rustc_error] // rust-lang/rust#49855 diff --git a/src/test/ui/span/range-2.stderr b/src/test/ui/span/range-2.stderr index e2ee86ae1f593..7d0edd6971ceb 100644 --- a/src/test/ui/span/range-2.stderr +++ b/src/test/ui/span/range-2.stderr @@ -1,5 +1,5 @@ error[E0597]: `a` does not live long enough - --> $DIR/range-2.rs:17:10 + --> $DIR/range-2.rs:7:10 | LL | &a..&b | ^ borrowed value does not live long enough @@ -10,7 +10,7 @@ LL | } | - borrowed value needs to live until here error[E0597]: `b` does not live long enough - --> $DIR/range-2.rs:17:14 + --> $DIR/range-2.rs:7:14 | LL | &a..&b | ^ borrowed value does not live long enough diff --git a/src/test/ui/span/recursive-type-field.rs b/src/test/ui/span/recursive-type-field.rs index 764b5392578b8..58ea81b8395ee 100644 --- a/src/test/ui/span/recursive-type-field.rs +++ b/src/test/ui/span/recursive-type-field.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::rc::Rc; struct Foo<'a> { //~ ERROR recursive type diff --git a/src/test/ui/span/recursive-type-field.stderr b/src/test/ui/span/recursive-type-field.stderr index 74ccb74ac2b58..3a8f0e60038e5 100644 --- a/src/test/ui/span/recursive-type-field.stderr +++ b/src/test/ui/span/recursive-type-field.stderr @@ -1,5 +1,5 @@ error[E0072]: recursive type `Foo` has infinite size - --> $DIR/recursive-type-field.rs:13:1 + --> $DIR/recursive-type-field.rs:3:1 | LL | struct Foo<'a> { //~ ERROR recursive type | ^^^^^^^^^^^^^^ recursive type has infinite size @@ -9,7 +9,7 @@ LL | bar: Bar<'a>, = help: insert indirection (e.g., a `Box`, `Rc`, or `&`) at some point to make `Foo` representable error[E0072]: recursive type `Bar` has infinite size - --> $DIR/recursive-type-field.rs:18:1 + --> $DIR/recursive-type-field.rs:8:1 | LL | struct Bar<'a> { //~ ERROR recursive type | ^^^^^^^^^^^^^^ recursive type has infinite size diff --git a/src/test/ui/span/regionck-unboxed-closure-lifetimes.nll.stderr b/src/test/ui/span/regionck-unboxed-closure-lifetimes.nll.stderr index 4881259ff23ab..8e9cd59515443 100644 --- a/src/test/ui/span/regionck-unboxed-closure-lifetimes.nll.stderr +++ b/src/test/ui/span/regionck-unboxed-closure-lifetimes.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `c` does not live long enough - --> $DIR/regionck-unboxed-closure-lifetimes.rs:17:21 + --> $DIR/regionck-unboxed-closure-lifetimes.rs:8:21 | LL | let c_ref = &c; | ^^ borrowed value does not live long enough diff --git a/src/test/ui/span/regionck-unboxed-closure-lifetimes.rs b/src/test/ui/span/regionck-unboxed-closure-lifetimes.rs index 7595f03fd31d9..60ccaa872e731 100644 --- a/src/test/ui/span/regionck-unboxed-closure-lifetimes.rs +++ b/src/test/ui/span/regionck-unboxed-closure-lifetimes.rs @@ -1,12 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![feature(rustc_attrs)] use std::ops::FnMut; diff --git a/src/test/ui/span/regionck-unboxed-closure-lifetimes.stderr b/src/test/ui/span/regionck-unboxed-closure-lifetimes.stderr index 8a1bb4a45e1b6..b3f09669f5fc7 100644 --- a/src/test/ui/span/regionck-unboxed-closure-lifetimes.stderr +++ b/src/test/ui/span/regionck-unboxed-closure-lifetimes.stderr @@ -1,5 +1,5 @@ error[E0597]: `c` does not live long enough - --> $DIR/regionck-unboxed-closure-lifetimes.rs:17:22 + --> $DIR/regionck-unboxed-closure-lifetimes.rs:8:22 | LL | let c_ref = &c; | ^ borrowed value does not live long enough diff --git a/src/test/ui/span/regions-close-over-borrowed-ref-in-obj.nll.stderr b/src/test/ui/span/regions-close-over-borrowed-ref-in-obj.nll.stderr index 651296dbeaf6a..55e2dbae1e4b7 100644 --- a/src/test/ui/span/regions-close-over-borrowed-ref-in-obj.nll.stderr +++ b/src/test/ui/span/regions-close-over-borrowed-ref-in-obj.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/regions-close-over-borrowed-ref-in-obj.rs:22:27 + --> $DIR/regions-close-over-borrowed-ref-in-obj.rs:12:27 | LL | let ss: &isize = &id(1); | ^^^^^ temporary value does not live long enough diff --git a/src/test/ui/span/regions-close-over-borrowed-ref-in-obj.rs b/src/test/ui/span/regions-close-over-borrowed-ref-in-obj.rs index cf94969742efe..9ca352a07fcec 100644 --- a/src/test/ui/span/regions-close-over-borrowed-ref-in-obj.rs +++ b/src/test/ui/span/regions-close-over-borrowed-ref-in-obj.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn id(x: T) -> T { x } diff --git a/src/test/ui/span/regions-close-over-borrowed-ref-in-obj.stderr b/src/test/ui/span/regions-close-over-borrowed-ref-in-obj.stderr index 2b63d5bd6c754..8a853e7ce59de 100644 --- a/src/test/ui/span/regions-close-over-borrowed-ref-in-obj.stderr +++ b/src/test/ui/span/regions-close-over-borrowed-ref-in-obj.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/regions-close-over-borrowed-ref-in-obj.rs:22:27 + --> $DIR/regions-close-over-borrowed-ref-in-obj.rs:12:27 | LL | let ss: &isize = &id(1); | ^^^^^ temporary value does not live long enough diff --git a/src/test/ui/span/regions-close-over-type-parameter-2.nll.stderr b/src/test/ui/span/regions-close-over-type-parameter-2.nll.stderr index f522521b400e4..3461daab70060 100644 --- a/src/test/ui/span/regions-close-over-type-parameter-2.nll.stderr +++ b/src/test/ui/span/regions-close-over-type-parameter-2.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `tmp0` does not live long enough - --> $DIR/regions-close-over-type-parameter-2.rs:33:20 + --> $DIR/regions-close-over-type-parameter-2.rs:23:20 | LL | let _ = { | _____________- diff --git a/src/test/ui/span/regions-close-over-type-parameter-2.rs b/src/test/ui/span/regions-close-over-type-parameter-2.rs index e7eff6f25591a..11187b74c4299 100644 --- a/src/test/ui/span/regions-close-over-type-parameter-2.rs +++ b/src/test/ui/span/regions-close-over-type-parameter-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] // Test for what happens when a type parameter `A` is closed over into diff --git a/src/test/ui/span/regions-close-over-type-parameter-2.stderr b/src/test/ui/span/regions-close-over-type-parameter-2.stderr index 79c6a0be17902..5ee155c1d1818 100644 --- a/src/test/ui/span/regions-close-over-type-parameter-2.stderr +++ b/src/test/ui/span/regions-close-over-type-parameter-2.stderr @@ -1,5 +1,5 @@ error[E0597]: `tmp0` does not live long enough - --> $DIR/regions-close-over-type-parameter-2.rs:33:21 + --> $DIR/regions-close-over-type-parameter-2.rs:23:21 | LL | let tmp1 = &tmp0; | ^^^^ borrowed value does not live long enough diff --git a/src/test/ui/span/regions-escape-loop-via-variable.nll.stderr b/src/test/ui/span/regions-escape-loop-via-variable.nll.stderr index 7aaec700d8985..c5fbf72886a0c 100644 --- a/src/test/ui/span/regions-escape-loop-via-variable.nll.stderr +++ b/src/test/ui/span/regions-escape-loop-via-variable.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `x` does not live long enough - --> $DIR/regions-escape-loop-via-variable.rs:21:13 + --> $DIR/regions-escape-loop-via-variable.rs:11:13 | LL | let x = 1 + *p; | -- borrow used here in later iteration of loop diff --git a/src/test/ui/span/regions-escape-loop-via-variable.rs b/src/test/ui/span/regions-escape-loop-via-variable.rs index 96c1ccd5326ea..ad468896b1302 100644 --- a/src/test/ui/span/regions-escape-loop-via-variable.rs +++ b/src/test/ui/span/regions-escape-loop-via-variable.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = 3; diff --git a/src/test/ui/span/regions-escape-loop-via-variable.stderr b/src/test/ui/span/regions-escape-loop-via-variable.stderr index 0ff0d76a5e464..e3870db0c668e 100644 --- a/src/test/ui/span/regions-escape-loop-via-variable.stderr +++ b/src/test/ui/span/regions-escape-loop-via-variable.stderr @@ -1,5 +1,5 @@ error[E0597]: `x` does not live long enough - --> $DIR/regions-escape-loop-via-variable.rs:21:14 + --> $DIR/regions-escape-loop-via-variable.rs:11:14 | LL | p = &x; | ^ borrowed value does not live long enough diff --git a/src/test/ui/span/regions-escape-loop-via-vec.nll.stderr b/src/test/ui/span/regions-escape-loop-via-vec.nll.stderr index 2dc758428ef3a..d2548c82e9890 100644 --- a/src/test/ui/span/regions-escape-loop-via-vec.nll.stderr +++ b/src/test/ui/span/regions-escape-loop-via-vec.nll.stderr @@ -1,5 +1,5 @@ error[E0503]: cannot use `x` because it was mutably borrowed - --> $DIR/regions-escape-loop-via-vec.rs:15:11 + --> $DIR/regions-escape-loop-via-vec.rs:5:11 | LL | let mut _y = vec![&mut x]; | ------ borrow of `x` occurs here @@ -10,7 +10,7 @@ LL | _y.push(&mut z); | -- borrow used here in later iteration of loop error[E0503]: cannot use `x` because it was mutably borrowed - --> $DIR/regions-escape-loop-via-vec.rs:16:21 + --> $DIR/regions-escape-loop-via-vec.rs:6:21 | LL | let mut _y = vec![&mut x]; | ------ borrow of `x` occurs here @@ -21,7 +21,7 @@ LL | _y.push(&mut z); | -- borrow used here in later iteration of loop error[E0597]: `z` does not live long enough - --> $DIR/regions-escape-loop-via-vec.rs:17:17 + --> $DIR/regions-escape-loop-via-vec.rs:7:17 | LL | _y.push(&mut z); | -- ^^^^^^ borrowed value does not live long enough @@ -32,7 +32,7 @@ LL | } | - `z` dropped here while still borrowed error[E0503]: cannot use `x` because it was mutably borrowed - --> $DIR/regions-escape-loop-via-vec.rs:19:9 + --> $DIR/regions-escape-loop-via-vec.rs:9:9 | LL | let mut _y = vec![&mut x]; | ------ borrow of `x` occurs here diff --git a/src/test/ui/span/regions-escape-loop-via-vec.rs b/src/test/ui/span/regions-escape-loop-via-vec.rs index 8e85ca5bceaaa..52f3dc37c9019 100644 --- a/src/test/ui/span/regions-escape-loop-via-vec.rs +++ b/src/test/ui/span/regions-escape-loop-via-vec.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // The type of `y` ends up getting inferred to the type of the block. fn broken() { let mut x = 3; diff --git a/src/test/ui/span/regions-escape-loop-via-vec.stderr b/src/test/ui/span/regions-escape-loop-via-vec.stderr index 1d4911bd5af73..09a7123d8f04e 100644 --- a/src/test/ui/span/regions-escape-loop-via-vec.stderr +++ b/src/test/ui/span/regions-escape-loop-via-vec.stderr @@ -1,5 +1,5 @@ error[E0597]: `z` does not live long enough - --> $DIR/regions-escape-loop-via-vec.rs:17:22 + --> $DIR/regions-escape-loop-via-vec.rs:7:22 | LL | _y.push(&mut z); | ^ borrowed value does not live long enough @@ -10,7 +10,7 @@ LL | } | - borrowed value needs to live until here error[E0503]: cannot use `x` because it was mutably borrowed - --> $DIR/regions-escape-loop-via-vec.rs:15:11 + --> $DIR/regions-escape-loop-via-vec.rs:5:11 | LL | let mut _y = vec![&mut x]; | - borrow of `x` occurs here @@ -18,7 +18,7 @@ LL | while x < 10 { //~ ERROR cannot use `x` because it was mutably borrowed | ^ use of borrowed `x` error[E0503]: cannot use `x` because it was mutably borrowed - --> $DIR/regions-escape-loop-via-vec.rs:16:13 + --> $DIR/regions-escape-loop-via-vec.rs:6:13 | LL | let mut _y = vec![&mut x]; | - borrow of `x` occurs here @@ -27,7 +27,7 @@ LL | let mut z = x; //~ ERROR cannot use `x` because it was mutably borr | ^^^^^ use of borrowed `x` error[E0506]: cannot assign to `x` because it is borrowed - --> $DIR/regions-escape-loop-via-vec.rs:19:9 + --> $DIR/regions-escape-loop-via-vec.rs:9:9 | LL | let mut _y = vec![&mut x]; | - borrow of `x` occurs here diff --git a/src/test/ui/span/regions-infer-borrow-scope-within-loop.nll.stderr b/src/test/ui/span/regions-infer-borrow-scope-within-loop.nll.stderr index 5fa25ae8506e6..fd67c65c4e917 100644 --- a/src/test/ui/span/regions-infer-borrow-scope-within-loop.nll.stderr +++ b/src/test/ui/span/regions-infer-borrow-scope-within-loop.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `*x` does not live long enough - --> $DIR/regions-infer-borrow-scope-within-loop.rs:24:20 + --> $DIR/regions-infer-borrow-scope-within-loop.rs:13:20 | LL | y = borrow(&*x); | ^^^ borrowed value does not live long enough diff --git a/src/test/ui/span/regions-infer-borrow-scope-within-loop.rs b/src/test/ui/span/regions-infer-borrow-scope-within-loop.rs index b6adc2206e9ce..3b20285b1bf6e 100644 --- a/src/test/ui/span/regions-infer-borrow-scope-within-loop.rs +++ b/src/test/ui/span/regions-infer-borrow-scope-within-loop.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn borrow(x: &T) -> &T {x} fn foo(mut cond: C, mut make_box: M) where diff --git a/src/test/ui/span/regions-infer-borrow-scope-within-loop.stderr b/src/test/ui/span/regions-infer-borrow-scope-within-loop.stderr index 87dc0682199be..94abbcef035a5 100644 --- a/src/test/ui/span/regions-infer-borrow-scope-within-loop.stderr +++ b/src/test/ui/span/regions-infer-borrow-scope-within-loop.stderr @@ -1,5 +1,5 @@ error[E0597]: `*x` does not live long enough - --> $DIR/regions-infer-borrow-scope-within-loop.rs:24:21 + --> $DIR/regions-infer-borrow-scope-within-loop.rs:13:21 | LL | y = borrow(&*x); | ^^ borrowed value does not live long enough diff --git a/src/test/ui/span/send-is-not-static-ensures-scoping.nll.stderr b/src/test/ui/span/send-is-not-static-ensures-scoping.nll.stderr index c14cb7098933f..ae7d5e9ee0624 100644 --- a/src/test/ui/span/send-is-not-static-ensures-scoping.nll.stderr +++ b/src/test/ui/span/send-is-not-static-ensures-scoping.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `x` does not live long enough - --> $DIR/send-is-not-static-ensures-scoping.rs:26:17 + --> $DIR/send-is-not-static-ensures-scoping.rs:16:17 | LL | let y = &x; | ^^ borrowed value does not live long enough @@ -11,7 +11,7 @@ LL | bad.join(); | --- borrow later used here error[E0597]: `y` does not live long enough - --> $DIR/send-is-not-static-ensures-scoping.rs:30:22 + --> $DIR/send-is-not-static-ensures-scoping.rs:20:22 | LL | scoped(|| { | -- value captured here diff --git a/src/test/ui/span/send-is-not-static-ensures-scoping.rs b/src/test/ui/span/send-is-not-static-ensures-scoping.rs index 20f8d473ac369..ac07420ee362d 100644 --- a/src/test/ui/span/send-is-not-static-ensures-scoping.rs +++ b/src/test/ui/span/send-is-not-static-ensures-scoping.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Guard<'a> { f: Box, } diff --git a/src/test/ui/span/send-is-not-static-ensures-scoping.stderr b/src/test/ui/span/send-is-not-static-ensures-scoping.stderr index 0447b578d44cb..47026284fb150 100644 --- a/src/test/ui/span/send-is-not-static-ensures-scoping.stderr +++ b/src/test/ui/span/send-is-not-static-ensures-scoping.stderr @@ -1,5 +1,5 @@ error[E0597]: `x` does not live long enough - --> $DIR/send-is-not-static-ensures-scoping.rs:26:18 + --> $DIR/send-is-not-static-ensures-scoping.rs:16:18 | LL | let y = &x; | ^ borrowed value does not live long enough @@ -11,7 +11,7 @@ LL | } | - borrowed value needs to live until here error[E0597]: `y` does not live long enough - --> $DIR/send-is-not-static-ensures-scoping.rs:30:22 + --> $DIR/send-is-not-static-ensures-scoping.rs:20:22 | LL | scoped(|| { | -- capture occurs here diff --git a/src/test/ui/span/send-is-not-static-std-sync-2.nll.stderr b/src/test/ui/span/send-is-not-static-std-sync-2.nll.stderr index 58dad753ac4a1..fc87e0bc30ab3 100644 --- a/src/test/ui/span/send-is-not-static-std-sync-2.nll.stderr +++ b/src/test/ui/span/send-is-not-static-std-sync-2.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `x` does not live long enough - --> $DIR/send-is-not-static-std-sync-2.rs:21:20 + --> $DIR/send-is-not-static-std-sync-2.rs:11:20 | LL | Mutex::new(&x) | ^^ borrowed value does not live long enough @@ -10,7 +10,7 @@ LL | let _dangling = *lock.lock().unwrap(); | ---- borrow later used here error[E0597]: `x` does not live long enough - --> $DIR/send-is-not-static-std-sync-2.rs:31:21 + --> $DIR/send-is-not-static-std-sync-2.rs:21:21 | LL | RwLock::new(&x) | ^^ borrowed value does not live long enough @@ -21,7 +21,7 @@ LL | let _dangling = *lock.read().unwrap(); | ---- borrow later used here error[E0597]: `x` does not live long enough - --> $DIR/send-is-not-static-std-sync-2.rs:41:25 + --> $DIR/send-is-not-static-std-sync-2.rs:31:25 | LL | let (_tx, rx) = { | --- borrow later used here diff --git a/src/test/ui/span/send-is-not-static-std-sync-2.rs b/src/test/ui/span/send-is-not-static-std-sync-2.rs index a10f700fb541b..38746d4cbbc08 100644 --- a/src/test/ui/span/send-is-not-static-std-sync-2.rs +++ b/src/test/ui/span/send-is-not-static-std-sync-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // basic tests to see that certain "obvious" errors are caught by // these types no longer requiring `'static` (RFC 458) diff --git a/src/test/ui/span/send-is-not-static-std-sync-2.stderr b/src/test/ui/span/send-is-not-static-std-sync-2.stderr index 53f4d685d0c2d..4172731745ec3 100644 --- a/src/test/ui/span/send-is-not-static-std-sync-2.stderr +++ b/src/test/ui/span/send-is-not-static-std-sync-2.stderr @@ -1,5 +1,5 @@ error[E0597]: `x` does not live long enough - --> $DIR/send-is-not-static-std-sync-2.rs:21:21 + --> $DIR/send-is-not-static-std-sync-2.rs:11:21 | LL | Mutex::new(&x) | ^ borrowed value does not live long enough @@ -10,7 +10,7 @@ LL | } | - borrowed value needs to live until here error[E0597]: `x` does not live long enough - --> $DIR/send-is-not-static-std-sync-2.rs:31:22 + --> $DIR/send-is-not-static-std-sync-2.rs:21:22 | LL | RwLock::new(&x) | ^ borrowed value does not live long enough @@ -21,7 +21,7 @@ LL | } | - borrowed value needs to live until here error[E0597]: `x` does not live long enough - --> $DIR/send-is-not-static-std-sync-2.rs:41:26 + --> $DIR/send-is-not-static-std-sync-2.rs:31:26 | LL | let _ = tx.send(&x); | ^ borrowed value does not live long enough diff --git a/src/test/ui/span/send-is-not-static-std-sync.nll.stderr b/src/test/ui/span/send-is-not-static-std-sync.nll.stderr index 878ae36386371..8213edc5a81da 100644 --- a/src/test/ui/span/send-is-not-static-std-sync.nll.stderr +++ b/src/test/ui/span/send-is-not-static-std-sync.nll.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `y` because it is borrowed - --> $DIR/send-is-not-static-std-sync.rs:23:10 + --> $DIR/send-is-not-static-std-sync.rs:13:10 | LL | *lock.lock().unwrap() = &*y; | --- borrow of `*y` occurs here @@ -10,7 +10,7 @@ LL | *lock.lock().unwrap() = &z; | ---- borrow later used here error[E0597]: `z` does not live long enough - --> $DIR/send-is-not-static-std-sync.rs:26:33 + --> $DIR/send-is-not-static-std-sync.rs:16:33 | LL | *lock.lock().unwrap() = &z; | ^^ borrowed value does not live long enough @@ -21,7 +21,7 @@ LL | lock.use_ref(); // (Mutex is #[may_dangle] so its dtor does not use `z` | ---- borrow later used here error[E0505]: cannot move out of `y` because it is borrowed - --> $DIR/send-is-not-static-std-sync.rs:37:10 + --> $DIR/send-is-not-static-std-sync.rs:27:10 | LL | *lock.write().unwrap() = &*y; | --- borrow of `*y` occurs here @@ -32,7 +32,7 @@ LL | *lock.write().unwrap() = &z; | ---- borrow later used here error[E0597]: `z` does not live long enough - --> $DIR/send-is-not-static-std-sync.rs:40:34 + --> $DIR/send-is-not-static-std-sync.rs:30:34 | LL | *lock.write().unwrap() = &z; | ^^ borrowed value does not live long enough @@ -43,7 +43,7 @@ LL | lock.use_ref(); // (RwLock is #[may_dangle] so its dtor does not use `z | ---- borrow later used here error[E0505]: cannot move out of `y` because it is borrowed - --> $DIR/send-is-not-static-std-sync.rs:53:10 + --> $DIR/send-is-not-static-std-sync.rs:43:10 | LL | tx.send(&*y); | --- borrow of `*y` occurs here @@ -54,7 +54,7 @@ LL | tx.send(&z).unwrap(); | -- borrow later used here error[E0597]: `z` does not live long enough - --> $DIR/send-is-not-static-std-sync.rs:56:17 + --> $DIR/send-is-not-static-std-sync.rs:46:17 | LL | tx.send(&z).unwrap(); | ^^ borrowed value does not live long enough diff --git a/src/test/ui/span/send-is-not-static-std-sync.rs b/src/test/ui/span/send-is-not-static-std-sync.rs index 08718ffc864b8..f8ab5243c22af 100644 --- a/src/test/ui/span/send-is-not-static-std-sync.rs +++ b/src/test/ui/span/send-is-not-static-std-sync.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // basic tests to see that certain "obvious" errors are caught by // these types no longer requiring `'static` (RFC 458) diff --git a/src/test/ui/span/send-is-not-static-std-sync.stderr b/src/test/ui/span/send-is-not-static-std-sync.stderr index efcd1312da8e9..74c2bad24dea2 100644 --- a/src/test/ui/span/send-is-not-static-std-sync.stderr +++ b/src/test/ui/span/send-is-not-static-std-sync.stderr @@ -1,5 +1,5 @@ error[E0597]: `z` does not live long enough - --> $DIR/send-is-not-static-std-sync.rs:26:34 + --> $DIR/send-is-not-static-std-sync.rs:16:34 | LL | *lock.lock().unwrap() = &z; | ^ borrowed value does not live long enough @@ -10,7 +10,7 @@ LL | } | - borrowed value needs to live until here error[E0505]: cannot move out of `y` because it is borrowed - --> $DIR/send-is-not-static-std-sync.rs:23:10 + --> $DIR/send-is-not-static-std-sync.rs:13:10 | LL | *lock.lock().unwrap() = &*y; | -- borrow of `*y` occurs here @@ -18,7 +18,7 @@ LL | drop(y); //~ ERROR cannot move out | ^ move out of `y` occurs here error[E0597]: `z` does not live long enough - --> $DIR/send-is-not-static-std-sync.rs:40:35 + --> $DIR/send-is-not-static-std-sync.rs:30:35 | LL | *lock.write().unwrap() = &z; | ^ borrowed value does not live long enough @@ -29,7 +29,7 @@ LL | } | - borrowed value needs to live until here error[E0505]: cannot move out of `y` because it is borrowed - --> $DIR/send-is-not-static-std-sync.rs:37:10 + --> $DIR/send-is-not-static-std-sync.rs:27:10 | LL | *lock.write().unwrap() = &*y; | -- borrow of `*y` occurs here @@ -37,7 +37,7 @@ LL | drop(y); //~ ERROR cannot move out | ^ move out of `y` occurs here error[E0597]: `z` does not live long enough - --> $DIR/send-is-not-static-std-sync.rs:56:18 + --> $DIR/send-is-not-static-std-sync.rs:46:18 | LL | tx.send(&z).unwrap(); | ^ borrowed value does not live long enough @@ -48,7 +48,7 @@ LL | } | - borrowed value needs to live until here error[E0505]: cannot move out of `y` because it is borrowed - --> $DIR/send-is-not-static-std-sync.rs:53:10 + --> $DIR/send-is-not-static-std-sync.rs:43:10 | LL | tx.send(&*y); | -- borrow of `*y` occurs here diff --git a/src/test/ui/span/slice-borrow.nll.stderr b/src/test/ui/span/slice-borrow.nll.stderr index aefba8324cf9c..8a451e13d619d 100644 --- a/src/test/ui/span/slice-borrow.nll.stderr +++ b/src/test/ui/span/slice-borrow.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/slice-borrow.rs:16:28 + --> $DIR/slice-borrow.rs:6:28 | LL | let x: &[isize] = &vec![1, 2, 3, 4, 5]; | ^^^^^^^^^^^^^^^^^^^ temporary value does not live long enough diff --git a/src/test/ui/span/slice-borrow.rs b/src/test/ui/span/slice-borrow.rs index 27765fe56fd9d..23e53039e9453 100644 --- a/src/test/ui/span/slice-borrow.rs +++ b/src/test/ui/span/slice-borrow.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test slicing expressions doesn't defeat the borrow checker. fn main() { diff --git a/src/test/ui/span/slice-borrow.stderr b/src/test/ui/span/slice-borrow.stderr index cdcb65bf9f11d..a03cac58e2ea8 100644 --- a/src/test/ui/span/slice-borrow.stderr +++ b/src/test/ui/span/slice-borrow.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/slice-borrow.rs:16:28 + --> $DIR/slice-borrow.rs:6:28 | LL | let x: &[isize] = &vec![1, 2, 3, 4, 5]; | ^^^^^^^^^^^^^^^^^^^ temporary value does not live long enough diff --git a/src/test/ui/span/suggestion-non-ascii.rs b/src/test/ui/span/suggestion-non-ascii.rs index 2d82bba33c5bd..74032cf0266f8 100644 --- a/src/test/ui/span/suggestion-non-ascii.rs +++ b/src/test/ui/span/suggestion-non-ascii.rs @@ -1,14 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn main() { let tup = (1,); println!("☃{}", tup[0]); //~ ERROR cannot index into a value of type diff --git a/src/test/ui/span/suggestion-non-ascii.stderr b/src/test/ui/span/suggestion-non-ascii.stderr index f74d4a5caefc3..40b11695d7528 100644 --- a/src/test/ui/span/suggestion-non-ascii.stderr +++ b/src/test/ui/span/suggestion-non-ascii.stderr @@ -1,5 +1,5 @@ error[E0608]: cannot index into a value of type `({integer},)` - --> $DIR/suggestion-non-ascii.rs:14:21 + --> $DIR/suggestion-non-ascii.rs:3:21 | LL | println!("☃{}", tup[0]); //~ ERROR cannot index into a value of type | ^^^^^^ help: to access tuple elements, use: `tup.0` diff --git a/src/test/ui/span/type-binding.rs b/src/test/ui/span/type-binding.rs index d8a2e332a030f..32016e1278f6d 100644 --- a/src/test/ui/span/type-binding.rs +++ b/src/test/ui/span/type-binding.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #28158 // Test the type binding span doesn't include >> diff --git a/src/test/ui/span/type-binding.stderr b/src/test/ui/span/type-binding.stderr index d8bfdff142b5a..421af67d19cc1 100644 --- a/src/test/ui/span/type-binding.stderr +++ b/src/test/ui/span/type-binding.stderr @@ -1,5 +1,5 @@ error[E0220]: associated type `Trget` not found for `std::ops::Deref` - --> $DIR/type-binding.rs:16:20 + --> $DIR/type-binding.rs:6:20 | LL | fn homura>(_: T) {} | ^^^^^^^^^^^ associated type `Trget` not found diff --git a/src/test/ui/span/typo-suggestion.rs b/src/test/ui/span/typo-suggestion.rs index 7aeaa44bec282..e9d7bc65ef5b5 100644 --- a/src/test/ui/span/typo-suggestion.rs +++ b/src/test/ui/span/typo-suggestion.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let foo = 1; diff --git a/src/test/ui/span/typo-suggestion.stderr b/src/test/ui/span/typo-suggestion.stderr index 0ac3a94e7128f..5c564f7dd740d 100644 --- a/src/test/ui/span/typo-suggestion.stderr +++ b/src/test/ui/span/typo-suggestion.stderr @@ -1,11 +1,11 @@ error[E0425]: cannot find value `bar` in this scope - --> $DIR/typo-suggestion.rs:15:26 + --> $DIR/typo-suggestion.rs:5:26 | LL | println!("Hello {}", bar); //~ ERROR cannot find value | ^^^ not found in this scope error[E0425]: cannot find value `fob` in this scope - --> $DIR/typo-suggestion.rs:18:26 + --> $DIR/typo-suggestion.rs:8:26 | LL | println!("Hello {}", fob); //~ ERROR cannot find value | ^^^ did you mean `foo`? diff --git a/src/test/ui/span/unused-warning-point-at-signature.rs b/src/test/ui/span/unused-warning-point-at-signature.rs index c074f03db469c..3af272a012eb2 100644 --- a/src/test/ui/span/unused-warning-point-at-signature.rs +++ b/src/test/ui/span/unused-warning-point-at-signature.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass #![warn(unused)] diff --git a/src/test/ui/span/unused-warning-point-at-signature.stderr b/src/test/ui/span/unused-warning-point-at-signature.stderr index 8344853d6def5..e07548121b52b 100644 --- a/src/test/ui/span/unused-warning-point-at-signature.stderr +++ b/src/test/ui/span/unused-warning-point-at-signature.stderr @@ -1,30 +1,30 @@ warning: enum is never used: `Enum` - --> $DIR/unused-warning-point-at-signature.rs:15:1 + --> $DIR/unused-warning-point-at-signature.rs:5:1 | LL | enum Enum { //~ WARN enum is never used | ^^^^^^^^^ | note: lint level defined here - --> $DIR/unused-warning-point-at-signature.rs:13:9 + --> $DIR/unused-warning-point-at-signature.rs:3:9 | LL | #![warn(unused)] | ^^^^^^ = note: #[warn(dead_code)] implied by #[warn(unused)] warning: struct is never constructed: `Struct` - --> $DIR/unused-warning-point-at-signature.rs:22:1 + --> $DIR/unused-warning-point-at-signature.rs:12:1 | LL | struct Struct { //~ WARN struct is never constructed | ^^^^^^^^^^^^^ warning: function is never used: `func` - --> $DIR/unused-warning-point-at-signature.rs:29:1 + --> $DIR/unused-warning-point-at-signature.rs:19:1 | LL | fn func() -> usize { //~ WARN function is never used | ^^^^^^^^^^^^^^^^^^ warning: function is never used: `func_complete_span` - --> $DIR/unused-warning-point-at-signature.rs:33:1 + --> $DIR/unused-warning-point-at-signature.rs:23:1 | LL | / fn //~ WARN function is never used LL | | func_complete_span() diff --git a/src/test/ui/span/vec-must-not-hide-type-from-dropck.nll.stderr b/src/test/ui/span/vec-must-not-hide-type-from-dropck.nll.stderr index ee51304800d32..0c0eba5734d41 100644 --- a/src/test/ui/span/vec-must-not-hide-type-from-dropck.nll.stderr +++ b/src/test/ui/span/vec-must-not-hide-type-from-dropck.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `c2` does not live long enough - --> $DIR/vec-must-not-hide-type-from-dropck.rs:127:24 + --> $DIR/vec-must-not-hide-type-from-dropck.rs:117:24 | LL | c1.v[0].v.set(Some(&c2)); | ^^^ borrowed value does not live long enough @@ -11,7 +11,7 @@ LL | } | borrow later used here, when `c1` is dropped error[E0597]: `c1` does not live long enough - --> $DIR/vec-must-not-hide-type-from-dropck.rs:129:24 + --> $DIR/vec-must-not-hide-type-from-dropck.rs:119:24 | LL | c2.v[0].v.set(Some(&c1)); | ^^^ borrowed value does not live long enough diff --git a/src/test/ui/span/vec-must-not-hide-type-from-dropck.rs b/src/test/ui/span/vec-must-not-hide-type-from-dropck.rs index 3cf07b8b098c4..9bfbfab06a0ac 100644 --- a/src/test/ui/span/vec-must-not-hide-type-from-dropck.rs +++ b/src/test/ui/span/vec-must-not-hide-type-from-dropck.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Checking that `Vec` cannot hide lifetimes within `T` when `T` // implements `Drop` and might access methods of values that have // since been deallocated. diff --git a/src/test/ui/span/vec-must-not-hide-type-from-dropck.stderr b/src/test/ui/span/vec-must-not-hide-type-from-dropck.stderr index b461f74c75990..1eee88ad21af5 100644 --- a/src/test/ui/span/vec-must-not-hide-type-from-dropck.stderr +++ b/src/test/ui/span/vec-must-not-hide-type-from-dropck.stderr @@ -1,5 +1,5 @@ error[E0597]: `c2` does not live long enough - --> $DIR/vec-must-not-hide-type-from-dropck.rs:127:25 + --> $DIR/vec-must-not-hide-type-from-dropck.rs:117:25 | LL | c1.v[0].v.set(Some(&c2)); | ^^ borrowed value does not live long enough @@ -10,7 +10,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `c1` does not live long enough - --> $DIR/vec-must-not-hide-type-from-dropck.rs:129:25 + --> $DIR/vec-must-not-hide-type-from-dropck.rs:119:25 | LL | c2.v[0].v.set(Some(&c1)); | ^^ borrowed value does not live long enough diff --git a/src/test/ui/span/vec_refs_data_with_early_death.nll.stderr b/src/test/ui/span/vec_refs_data_with_early_death.nll.stderr index 60905367063a4..05a42f7fcdab2 100644 --- a/src/test/ui/span/vec_refs_data_with_early_death.nll.stderr +++ b/src/test/ui/span/vec_refs_data_with_early_death.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `x` does not live long enough - --> $DIR/vec_refs_data_with_early_death.rs:27:12 + --> $DIR/vec_refs_data_with_early_death.rs:17:12 | LL | v.push(&x); | ^^ borrowed value does not live long enough @@ -13,7 +13,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are defined error[E0597]: `y` does not live long enough - --> $DIR/vec_refs_data_with_early_death.rs:29:12 + --> $DIR/vec_refs_data_with_early_death.rs:19:12 | LL | v.push(&y); | ^^ borrowed value does not live long enough diff --git a/src/test/ui/span/vec_refs_data_with_early_death.rs b/src/test/ui/span/vec_refs_data_with_early_death.rs index 9febeaaee4675..c23c52115499a 100644 --- a/src/test/ui/span/vec_refs_data_with_early_death.rs +++ b/src/test/ui/span/vec_refs_data_with_early_death.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test is a simple example of code that violates the dropck // rules: it pushes `&x` and `&y` into a bag (with dtor), but the // referenced data will be dropped before the bag is. diff --git a/src/test/ui/span/vec_refs_data_with_early_death.stderr b/src/test/ui/span/vec_refs_data_with_early_death.stderr index 0dd7288ce64a1..65fd6b50643ad 100644 --- a/src/test/ui/span/vec_refs_data_with_early_death.stderr +++ b/src/test/ui/span/vec_refs_data_with_early_death.stderr @@ -1,5 +1,5 @@ error[E0597]: `x` does not live long enough - --> $DIR/vec_refs_data_with_early_death.rs:27:13 + --> $DIR/vec_refs_data_with_early_death.rs:17:13 | LL | v.push(&x); | ^ borrowed value does not live long enough @@ -10,7 +10,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `y` does not live long enough - --> $DIR/vec_refs_data_with_early_death.rs:29:13 + --> $DIR/vec_refs_data_with_early_death.rs:19:13 | LL | v.push(&y); | ^ borrowed value does not live long enough diff --git a/src/test/ui/span/visibility-ty-params.rs b/src/test/ui/span/visibility-ty-params.rs index 5df28971e9942..a9aaabad95cee 100644 --- a/src/test/ui/span/visibility-ty-params.rs +++ b/src/test/ui/span/visibility-ty-params.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! m { ($p: path) => (pub(in $p) struct Z;) } diff --git a/src/test/ui/span/visibility-ty-params.stderr b/src/test/ui/span/visibility-ty-params.stderr index 7719bd48c85bb..52b8042ba454f 100644 --- a/src/test/ui/span/visibility-ty-params.stderr +++ b/src/test/ui/span/visibility-ty-params.stderr @@ -1,11 +1,11 @@ error: unexpected generic arguments in path - --> $DIR/visibility-ty-params.rs:16:5 + --> $DIR/visibility-ty-params.rs:6:5 | LL | m!{ S } //~ ERROR unexpected generic arguments in path | ^^^^^ error: unexpected generic arguments in path - --> $DIR/visibility-ty-params.rs:19:9 + --> $DIR/visibility-ty-params.rs:9:9 | LL | m!{ m<> } //~ ERROR unexpected generic arguments in path | ^^^ diff --git a/src/test/ui/span/wf-method-late-bound-regions.nll.stderr b/src/test/ui/span/wf-method-late-bound-regions.nll.stderr index cc32eaaa97991..49ca566979345 100644 --- a/src/test/ui/span/wf-method-late-bound-regions.nll.stderr +++ b/src/test/ui/span/wf-method-late-bound-regions.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `pointer` does not live long enough - --> $DIR/wf-method-late-bound-regions.rs:30:18 + --> $DIR/wf-method-late-bound-regions.rs:20:18 | LL | f2.xmute(&pointer) | ^^^^^^^^ borrowed value does not live long enough diff --git a/src/test/ui/span/wf-method-late-bound-regions.rs b/src/test/ui/span/wf-method-late-bound-regions.rs index d58c29d4a32d3..ca9f73d0accb6 100644 --- a/src/test/ui/span/wf-method-late-bound-regions.rs +++ b/src/test/ui/span/wf-method-late-bound-regions.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // A method's receiver must be well-formed, even if it has late-bound regions. // Because of this, a method's substs being well-formed does not imply that // the method's implied bounds are met. diff --git a/src/test/ui/span/wf-method-late-bound-regions.stderr b/src/test/ui/span/wf-method-late-bound-regions.stderr index f455707366a58..a30e0f4d7e0ed 100644 --- a/src/test/ui/span/wf-method-late-bound-regions.stderr +++ b/src/test/ui/span/wf-method-late-bound-regions.stderr @@ -1,5 +1,5 @@ error[E0597]: `pointer` does not live long enough - --> $DIR/wf-method-late-bound-regions.rs:30:19 + --> $DIR/wf-method-late-bound-regions.rs:20:19 | LL | f2.xmute(&pointer) | ^^^^^^^ borrowed value does not live long enough diff --git a/src/test/ui/specialization/defaultimpl/specialization-feature-gate-default.rs b/src/test/ui/specialization/defaultimpl/specialization-feature-gate-default.rs index 5bab4c5438e51..89158b65a6e29 100644 --- a/src/test/ui/specialization/defaultimpl/specialization-feature-gate-default.rs +++ b/src/test/ui/specialization/defaultimpl/specialization-feature-gate-default.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that specialization must be ungated to use the `default` keyword trait Foo { diff --git a/src/test/ui/specialization/defaultimpl/specialization-feature-gate-default.stderr b/src/test/ui/specialization/defaultimpl/specialization-feature-gate-default.stderr index d92466967e11a..3b3076cc67230 100644 --- a/src/test/ui/specialization/defaultimpl/specialization-feature-gate-default.stderr +++ b/src/test/ui/specialization/defaultimpl/specialization-feature-gate-default.stderr @@ -1,5 +1,5 @@ error[E0658]: specialization is unstable (see issue #31844) - --> $DIR/specialization-feature-gate-default.rs:17:1 + --> $DIR/specialization-feature-gate-default.rs:7:1 | LL | / default impl Foo for T { //~ ERROR specialization is unstable LL | | fn foo(&self) {} diff --git a/src/test/ui/specialization/defaultimpl/specialization-no-default.rs b/src/test/ui/specialization/defaultimpl/specialization-no-default.rs index 2874108157d83..7ea79a9a7bf82 100644 --- a/src/test/ui/specialization/defaultimpl/specialization-no-default.rs +++ b/src/test/ui/specialization/defaultimpl/specialization-no-default.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(specialization)] // Check a number of scenarios in which one impl tries to override another, diff --git a/src/test/ui/specialization/defaultimpl/specialization-no-default.stderr b/src/test/ui/specialization/defaultimpl/specialization-no-default.stderr index 98f5e6d619e9c..7ca9df9f5d93f 100644 --- a/src/test/ui/specialization/defaultimpl/specialization-no-default.stderr +++ b/src/test/ui/specialization/defaultimpl/specialization-no-default.stderr @@ -1,5 +1,5 @@ error[E0520]: `foo` specializes an item from a parent `impl`, but that item is not marked `default` - --> $DIR/specialization-no-default.rs:32:5 + --> $DIR/specialization-no-default.rs:22:5 | LL | / impl Foo for T { LL | | fn foo(&self) {} @@ -13,7 +13,7 @@ LL | fn foo(&self) {} //~ ERROR E0520 = note: to specialize, `foo` in the parent `impl` must be marked `default` error[E0520]: `bar` specializes an item from a parent `impl`, but that item is not marked `default` - --> $DIR/specialization-no-default.rs:35:5 + --> $DIR/specialization-no-default.rs:25:5 | LL | / impl Foo for T { LL | | fn foo(&self) {} @@ -27,7 +27,7 @@ LL | fn bar(&self) {} //~ ERROR E0520 = note: to specialize, `bar` in the parent `impl` must be marked `default` error[E0520]: `T` specializes an item from a parent `impl`, but that item is not marked `default` - --> $DIR/specialization-no-default.rs:51:5 + --> $DIR/specialization-no-default.rs:41:5 | LL | / impl Bar for T { LL | | type T = u8; @@ -40,7 +40,7 @@ LL | type T = (); //~ ERROR E0520 = note: to specialize, `T` in the parent `impl` must be marked `default` error[E0520]: `baz` specializes an item from a parent `impl`, but that item is not marked `default` - --> $DIR/specialization-no-default.rs:71:5 + --> $DIR/specialization-no-default.rs:61:5 | LL | / impl Baz for T { LL | | fn baz(&self) {} @@ -53,7 +53,7 @@ LL | fn baz(&self) {} //~ ERROR E0520 = note: to specialize, `baz` in the parent `impl` must be marked `default` error[E0520]: `redundant` specializes an item from a parent `impl`, but that item is not marked `default` - --> $DIR/specialization-no-default.rs:92:5 + --> $DIR/specialization-no-default.rs:82:5 | LL | / impl Redundant for T { LL | | fn redundant(&self) {} diff --git a/src/test/ui/specialization/defaultimpl/specialization-trait-item-not-implemented.rs b/src/test/ui/specialization/defaultimpl/specialization-trait-item-not-implemented.rs index eacec2e40f073..2a121e61aaa97 100644 --- a/src/test/ui/specialization/defaultimpl/specialization-trait-item-not-implemented.rs +++ b/src/test/ui/specialization/defaultimpl/specialization-trait-item-not-implemented.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that default impls do not have to supply all items but regular impls do. #![feature(specialization)] diff --git a/src/test/ui/specialization/defaultimpl/specialization-trait-item-not-implemented.stderr b/src/test/ui/specialization/defaultimpl/specialization-trait-item-not-implemented.stderr index c3c2a9840ad5c..b862a937066d4 100644 --- a/src/test/ui/specialization/defaultimpl/specialization-trait-item-not-implemented.stderr +++ b/src/test/ui/specialization/defaultimpl/specialization-trait-item-not-implemented.stderr @@ -1,5 +1,5 @@ error[E0046]: not all trait items implemented, missing: `foo_two` - --> $DIR/specialization-trait-item-not-implemented.rs:28:1 + --> $DIR/specialization-trait-item-not-implemented.rs:18:1 | LL | fn foo_two(&self) -> &'static str; | ---------------------------------- `foo_two` from trait diff --git a/src/test/ui/specialization/defaultimpl/specialization-trait-not-implemented.rs b/src/test/ui/specialization/defaultimpl/specialization-trait-not-implemented.rs index 04ddf9ebb1771..34a141685739c 100644 --- a/src/test/ui/specialization/defaultimpl/specialization-trait-not-implemented.rs +++ b/src/test/ui/specialization/defaultimpl/specialization-trait-not-implemented.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that: // - default impls do not have to supply all items and // - a default impl does not count as an impl (in this case, an incomplete default impl). diff --git a/src/test/ui/specialization/defaultimpl/specialization-trait-not-implemented.stderr b/src/test/ui/specialization/defaultimpl/specialization-trait-not-implemented.stderr index bc597e9f30c00..c14fc04f631fc 100644 --- a/src/test/ui/specialization/defaultimpl/specialization-trait-not-implemented.stderr +++ b/src/test/ui/specialization/defaultimpl/specialization-trait-not-implemented.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `foo_one` found for type `MyStruct` in the current scope - --> $DIR/specialization-trait-not-implemented.rs:32:29 + --> $DIR/specialization-trait-not-implemented.rs:22:29 | LL | struct MyStruct; | ---------------- method `foo_one` not found for this diff --git a/src/test/ui/specialization/defaultimpl/specialization-wfcheck.rs b/src/test/ui/specialization/defaultimpl/specialization-wfcheck.rs index 445a59a373e56..232338d9d4d99 100644 --- a/src/test/ui/specialization/defaultimpl/specialization-wfcheck.rs +++ b/src/test/ui/specialization/defaultimpl/specialization-wfcheck.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that a default impl still has to have a WF trait ref. #![feature(specialization)] diff --git a/src/test/ui/specialization/defaultimpl/specialization-wfcheck.stderr b/src/test/ui/specialization/defaultimpl/specialization-wfcheck.stderr index a623e9708cde7..45951561e7264 100644 --- a/src/test/ui/specialization/defaultimpl/specialization-wfcheck.stderr +++ b/src/test/ui/specialization/defaultimpl/specialization-wfcheck.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `U: std::cmp::Eq` is not satisfied - --> $DIR/specialization-wfcheck.rs:17:17 + --> $DIR/specialization-wfcheck.rs:7:17 | LL | default impl Foo<'static, U> for () {} | ^^^^^^^^^^^^^^^ the trait `std::cmp::Eq` is not implemented for `U` diff --git a/src/test/ui/specialization/defaultimpl/validation.rs b/src/test/ui/specialization/defaultimpl/validation.rs index 26b8b737f340d..850b9e3f46a0a 100644 --- a/src/test/ui/specialization/defaultimpl/validation.rs +++ b/src/test/ui/specialization/defaultimpl/validation.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] #![feature(specialization)] diff --git a/src/test/ui/specialization/defaultimpl/validation.stderr b/src/test/ui/specialization/defaultimpl/validation.stderr index 54b92da7b2192..d079f8c722408 100644 --- a/src/test/ui/specialization/defaultimpl/validation.stderr +++ b/src/test/ui/specialization/defaultimpl/validation.stderr @@ -1,5 +1,5 @@ error: inherent impls cannot be default - --> $DIR/validation.rs:17:1 + --> $DIR/validation.rs:7:1 | LL | default impl S {} //~ ERROR inherent impls cannot be default | ^^^^^^^^^^^^^^^^^ @@ -11,19 +11,19 @@ error[E0601]: `main` function not found in crate `validation` = note: consider adding a `main` function to `$DIR/validation.rs` error: impls of auto traits cannot be default - --> $DIR/validation.rs:19:1 + --> $DIR/validation.rs:9:1 | LL | default unsafe impl Send for S {} //~ ERROR impls of auto traits cannot be default | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: impls of auto traits cannot be default - --> $DIR/validation.rs:20:1 + --> $DIR/validation.rs:10:1 | LL | default impl !Send for Z {} //~ ERROR impls of auto traits cannot be default | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0192]: negative impls are only allowed for auto traits (e.g., `Send` and `Sync`) - --> $DIR/validation.rs:23:1 + --> $DIR/validation.rs:13:1 | LL | default impl !Tr for S {} //~ ERROR negative impls are only allowed for auto traits | ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/specialization/issue-52050.rs b/src/test/ui/specialization/issue-52050.rs index 70cdb4899c421..8d7be377e5796 100644 --- a/src/test/ui/specialization/issue-52050.rs +++ b/src/test/ui/specialization/issue-52050.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(specialization)] // Regression test for #52050: when inserting the blanket impl `I` diff --git a/src/test/ui/specialization/issue-52050.stderr b/src/test/ui/specialization/issue-52050.stderr index eee571f8f46cf..9187d04cfce6a 100644 --- a/src/test/ui/specialization/issue-52050.stderr +++ b/src/test/ui/specialization/issue-52050.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `IntoPyDictPointer` for type `()`: - --> $DIR/issue-52050.rs:38:1 + --> $DIR/issue-52050.rs:28:1 | LL | / impl IntoPyDictPointer for I LL | | where diff --git a/src/test/ui/specialization/specialization-default-projection.rs b/src/test/ui/specialization/specialization-default-projection.rs index 96cbd7a485251..e9343f2360170 100644 --- a/src/test/ui/specialization/specialization-default-projection.rs +++ b/src/test/ui/specialization/specialization-default-projection.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(specialization)] // Make sure we can't project defaulted associated types diff --git a/src/test/ui/specialization/specialization-default-projection.stderr b/src/test/ui/specialization/specialization-default-projection.stderr index 38b51394711a3..b781c35ea391a 100644 --- a/src/test/ui/specialization/specialization-default-projection.stderr +++ b/src/test/ui/specialization/specialization-default-projection.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/specialization-default-projection.rs:31:5 + --> $DIR/specialization-default-projection.rs:21:5 | LL | fn generic() -> ::Assoc { | ----------------- expected `::Assoc` because of return type @@ -11,7 +11,7 @@ LL | () //~ ERROR mismatched types found type `()` error[E0308]: mismatched types - --> $DIR/specialization-default-projection.rs:38:5 + --> $DIR/specialization-default-projection.rs:28:5 | LL | fn monomorphic() -> () { | -- expected `()` because of return type diff --git a/src/test/ui/specialization/specialization-default-types.rs b/src/test/ui/specialization/specialization-default-types.rs index 18acecb42296a..acb86d889d43c 100644 --- a/src/test/ui/specialization/specialization-default-types.rs +++ b/src/test/ui/specialization/specialization-default-types.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // It should not be possible to use the concrete value of a defaulted // associated type in the impl defining it -- otherwise, what happens // if it's overridden? diff --git a/src/test/ui/specialization/specialization-default-types.stderr b/src/test/ui/specialization/specialization-default-types.stderr index a9abc1f6ab57b..3b4ae2d821775 100644 --- a/src/test/ui/specialization/specialization-default-types.stderr +++ b/src/test/ui/specialization/specialization-default-types.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/specialization-default-types.rs:25:9 + --> $DIR/specialization-default-types.rs:15:9 | LL | default fn generate(self) -> Self::Output { | ------------ expected `::Output` because of return type @@ -10,7 +10,7 @@ LL | Box::new(self) //~ ERROR mismatched types found type `std::boxed::Box` error[E0308]: mismatched types - --> $DIR/specialization-default-types.rs:35:5 + --> $DIR/specialization-default-types.rs:25:5 | LL | fn trouble(t: T) -> Box { | ------ expected `std::boxed::Box` because of return type diff --git a/src/test/ui/specialization/specialization-feature-gate-default.rs b/src/test/ui/specialization/specialization-feature-gate-default.rs index 3a01ecdf9db6f..8bad3ac0a1fb3 100644 --- a/src/test/ui/specialization/specialization-feature-gate-default.rs +++ b/src/test/ui/specialization/specialization-feature-gate-default.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that specialization must be ungated to use the `default` keyword // gate-test-specialization diff --git a/src/test/ui/specialization/specialization-feature-gate-default.stderr b/src/test/ui/specialization/specialization-feature-gate-default.stderr index 30548bb24504d..13d656bd060e5 100644 --- a/src/test/ui/specialization/specialization-feature-gate-default.stderr +++ b/src/test/ui/specialization/specialization-feature-gate-default.stderr @@ -1,5 +1,5 @@ error[E0658]: specialization is unstable (see issue #31844) - --> $DIR/specialization-feature-gate-default.rs:20:5 + --> $DIR/specialization-feature-gate-default.rs:10:5 | LL | default fn foo(&self) {} //~ ERROR specialization is unstable | ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/specialization/specialization-feature-gate-overlap.rs b/src/test/ui/specialization/specialization-feature-gate-overlap.rs index 5eb48eab15e52..b83c84ab82c01 100644 --- a/src/test/ui/specialization/specialization-feature-gate-overlap.rs +++ b/src/test/ui/specialization/specialization-feature-gate-overlap.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that writing an overlapping impl is not allow unless specialization is ungated. // gate-test-specialization diff --git a/src/test/ui/specialization/specialization-feature-gate-overlap.stderr b/src/test/ui/specialization/specialization-feature-gate-overlap.stderr index bb2d071c93df5..d6714375d16e6 100644 --- a/src/test/ui/specialization/specialization-feature-gate-overlap.stderr +++ b/src/test/ui/specialization/specialization-feature-gate-overlap.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `Foo` for type `u8`: - --> $DIR/specialization-feature-gate-overlap.rs:23:1 + --> $DIR/specialization-feature-gate-overlap.rs:13:1 | LL | impl Foo for T { | ----------------- first implementation here diff --git a/src/test/ui/specialization/specialization-no-default.rs b/src/test/ui/specialization/specialization-no-default.rs index 961561685437a..29afbbd9bf267 100644 --- a/src/test/ui/specialization/specialization-no-default.rs +++ b/src/test/ui/specialization/specialization-no-default.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(specialization)] // Check a number of scenarios in which one impl tries to override another, diff --git a/src/test/ui/specialization/specialization-no-default.stderr b/src/test/ui/specialization/specialization-no-default.stderr index 880c2e5d6f456..c57f98ac74de2 100644 --- a/src/test/ui/specialization/specialization-no-default.stderr +++ b/src/test/ui/specialization/specialization-no-default.stderr @@ -1,5 +1,5 @@ error[E0520]: `foo` specializes an item from a parent `impl`, but that item is not marked `default` - --> $DIR/specialization-no-default.rs:32:5 + --> $DIR/specialization-no-default.rs:22:5 | LL | / impl Foo for T { LL | | fn foo(&self) {} @@ -13,7 +13,7 @@ LL | fn foo(&self) {} //~ ERROR E0520 = note: to specialize, `foo` in the parent `impl` must be marked `default` error[E0520]: `bar` specializes an item from a parent `impl`, but that item is not marked `default` - --> $DIR/specialization-no-default.rs:35:5 + --> $DIR/specialization-no-default.rs:25:5 | LL | / impl Foo for T { LL | | fn foo(&self) {} @@ -27,7 +27,7 @@ LL | fn bar(&self) {} //~ ERROR E0520 = note: to specialize, `bar` in the parent `impl` must be marked `default` error[E0520]: `T` specializes an item from a parent `impl`, but that item is not marked `default` - --> $DIR/specialization-no-default.rs:51:5 + --> $DIR/specialization-no-default.rs:41:5 | LL | / impl Bar for T { LL | | type T = u8; @@ -40,7 +40,7 @@ LL | type T = (); //~ ERROR E0520 = note: to specialize, `T` in the parent `impl` must be marked `default` error[E0520]: `baz` specializes an item from a parent `impl`, but that item is not marked `default` - --> $DIR/specialization-no-default.rs:71:5 + --> $DIR/specialization-no-default.rs:61:5 | LL | / impl Baz for T { LL | | fn baz(&self) {} @@ -53,7 +53,7 @@ LL | fn baz(&self) {} //~ ERROR E0520 = note: to specialize, `baz` in the parent `impl` must be marked `default` error[E0520]: `redundant` specializes an item from a parent `impl`, but that item is not marked `default` - --> $DIR/specialization-no-default.rs:92:5 + --> $DIR/specialization-no-default.rs:82:5 | LL | / impl Redundant for T { LL | | fn redundant(&self) {} diff --git a/src/test/ui/specialization/specialization-overlap-negative.rs b/src/test/ui/specialization/specialization-overlap-negative.rs index 62a6d8d9b5031..af80d6686e3a1 100644 --- a/src/test/ui/specialization/specialization-overlap-negative.rs +++ b/src/test/ui/specialization/specialization-overlap-negative.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] #![feature(specialization)] diff --git a/src/test/ui/specialization/specialization-overlap-negative.stderr b/src/test/ui/specialization/specialization-overlap-negative.stderr index 2b85ba54e90df..b9ab1bd637cc5 100644 --- a/src/test/ui/specialization/specialization-overlap-negative.stderr +++ b/src/test/ui/specialization/specialization-overlap-negative.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `std::marker::Send` for type `TestType<_>`: - --> $DIR/specialization-overlap-negative.rs:19:1 + --> $DIR/specialization-overlap-negative.rs:9:1 | LL | unsafe impl Send for TestType {} | ------------------------------------------ first implementation here diff --git a/src/test/ui/specialization/specialization-overlap.rs b/src/test/ui/specialization/specialization-overlap.rs index ff12a82db5b7d..c8ef8d61c1e8f 100644 --- a/src/test/ui/specialization/specialization-overlap.rs +++ b/src/test/ui/specialization/specialization-overlap.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(specialization)] trait Foo { fn foo() {} } diff --git a/src/test/ui/specialization/specialization-overlap.stderr b/src/test/ui/specialization/specialization-overlap.stderr index 6830b7de473fe..eef8cb44b8882 100644 --- a/src/test/ui/specialization/specialization-overlap.stderr +++ b/src/test/ui/specialization/specialization-overlap.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `Foo` for type `std::vec::Vec<_>`: - --> $DIR/specialization-overlap.rs:15:1 + --> $DIR/specialization-overlap.rs:5:1 | LL | impl Foo for T {} | ------------------------ first implementation here @@ -7,7 +7,7 @@ LL | impl Foo for Vec {} //~ ERROR E0119 | ^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `std::vec::Vec<_>` error[E0119]: conflicting implementations of trait `Bar` for type `(u8, u8)`: - --> $DIR/specialization-overlap.rs:19:1 + --> $DIR/specialization-overlap.rs:9:1 | LL | impl Bar for (T, u8) {} | ----------------------- first implementation here @@ -15,7 +15,7 @@ LL | impl Bar for (u8, T) {} //~ ERROR E0119 | ^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `(u8, u8)` error[E0119]: conflicting implementations of trait `Baz` for type `u8`: - --> $DIR/specialization-overlap.rs:23:1 + --> $DIR/specialization-overlap.rs:13:1 | LL | impl Baz for u8 {} | --------------------- first implementation here @@ -23,7 +23,7 @@ LL | impl Baz for T {} //~ ERROR E0119 | ^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `u8` error[E0119]: conflicting implementations of trait `Qux`: - --> $DIR/specialization-overlap.rs:27:1 + --> $DIR/specialization-overlap.rs:17:1 | LL | impl Qux for T {} | ------------------------ first implementation here diff --git a/src/test/ui/specialization/specialization-polarity.rs b/src/test/ui/specialization/specialization-polarity.rs index b28a63c8293ae..d574480674571 100644 --- a/src/test/ui/specialization/specialization-polarity.rs +++ b/src/test/ui/specialization/specialization-polarity.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Make sure specialization cannot change impl polarity #![feature(optin_builtin_traits)] diff --git a/src/test/ui/specialization/specialization-polarity.stderr b/src/test/ui/specialization/specialization-polarity.stderr index a4627305885bf..d1f48b78864cb 100644 --- a/src/test/ui/specialization/specialization-polarity.stderr +++ b/src/test/ui/specialization/specialization-polarity.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `Foo` for type `u8`: - --> $DIR/specialization-polarity.rs:19:1 + --> $DIR/specialization-polarity.rs:9:1 | LL | impl Foo for T {} | ----------------- first implementation here @@ -7,7 +7,7 @@ LL | impl !Foo for u8 {} //~ ERROR E0119 | ^^^^^^^^^^^^^^^^ conflicting implementation for `u8` error[E0119]: conflicting implementations of trait `Bar` for type `u8`: - --> $DIR/specialization-polarity.rs:24:1 + --> $DIR/specialization-polarity.rs:14:1 | LL | impl !Bar for T {} | ------------------ first implementation here diff --git a/src/test/ui/stability-attribute/auxiliary/stability_attribute_issue.rs b/src/test/ui/stability-attribute/auxiliary/stability_attribute_issue.rs index 1ee623c34fb48..4e5333289c43c 100644 --- a/src/test/ui/stability-attribute/auxiliary/stability_attribute_issue.rs +++ b/src/test/ui/stability-attribute/auxiliary/stability_attribute_issue.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(staged_api)] #![stable(feature = "stable_test_feature", since = "1.2.0")] diff --git a/src/test/ui/stability-attribute/stability-attribute-issue-43027.rs b/src/test/ui/stability-attribute/stability-attribute-issue-43027.rs index dac50db3fd9b2..596a6eb6ed366 100644 --- a/src/test/ui/stability-attribute/stability-attribute-issue-43027.rs +++ b/src/test/ui/stability-attribute/stability-attribute-issue-43027.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(staged_api)] #![stable(feature = "test", since = "0")] diff --git a/src/test/ui/stability-attribute/stability-attribute-issue-43027.stderr b/src/test/ui/stability-attribute/stability-attribute-issue-43027.stderr index bdfdd9ccc8780..e123f42023324 100644 --- a/src/test/ui/stability-attribute/stability-attribute-issue-43027.stderr +++ b/src/test/ui/stability-attribute/stability-attribute-issue-43027.stderr @@ -1,5 +1,5 @@ error: This node does not have a stability attribute - --> $DIR/stability-attribute-issue-43027.rs:15:23 + --> $DIR/stability-attribute-issue-43027.rs:5:23 | LL | pub struct Reverse(pub T); //~ ERROR This node does not have a stability attribute | ^^^^^ diff --git a/src/test/ui/stability-attribute/stability-attribute-issue.rs b/src/test/ui/stability-attribute/stability-attribute-issue.rs index 754c6f792f95d..fc4a7dab1af0a 100644 --- a/src/test/ui/stability-attribute/stability-attribute-issue.rs +++ b/src/test/ui/stability-attribute/stability-attribute-issue.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:stability_attribute_issue.rs // ignore-tidy-linelength diff --git a/src/test/ui/stability-attribute/stability-attribute-issue.stderr b/src/test/ui/stability-attribute/stability-attribute-issue.stderr index 15e91926a7373..94fdc0db3d9b6 100644 --- a/src/test/ui/stability-attribute/stability-attribute-issue.stderr +++ b/src/test/ui/stability-attribute/stability-attribute-issue.stderr @@ -1,5 +1,5 @@ error[E0658]: use of unstable library feature 'unstable_test_feature' (see issue #1) - --> $DIR/stability-attribute-issue.rs:20:5 + --> $DIR/stability-attribute-issue.rs:10:5 | LL | unstable(); | ^^^^^^^^ @@ -7,7 +7,7 @@ LL | unstable(); = help: add #![feature(unstable_test_feature)] to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_test_feature': message (see issue #2) - --> $DIR/stability-attribute-issue.rs:22:5 + --> $DIR/stability-attribute-issue.rs:12:5 | LL | unstable_msg(); | ^^^^^^^^^^^^ diff --git a/src/test/ui/stability-attribute/stability-attribute-non-staged-force-unstable.rs b/src/test/ui/stability-attribute/stability-attribute-non-staged-force-unstable.rs index 512fb24a0c226..3c4d629f77fc7 100644 --- a/src/test/ui/stability-attribute/stability-attribute-non-staged-force-unstable.rs +++ b/src/test/ui/stability-attribute/stability-attribute-non-staged-force-unstable.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-Zforce-unstable-if-unmarked #[unstable] //~ ERROR: stability attributes may not be used diff --git a/src/test/ui/stability-attribute/stability-attribute-non-staged-force-unstable.stderr b/src/test/ui/stability-attribute/stability-attribute-non-staged-force-unstable.stderr index 479f2ff509521..2b8fb865fbe99 100644 --- a/src/test/ui/stability-attribute/stability-attribute-non-staged-force-unstable.stderr +++ b/src/test/ui/stability-attribute/stability-attribute-non-staged-force-unstable.stderr @@ -1,17 +1,17 @@ error: stability attributes may not be used outside of the standard library - --> $DIR/stability-attribute-non-staged-force-unstable.rs:13:1 + --> $DIR/stability-attribute-non-staged-force-unstable.rs:3:1 | LL | #[unstable] //~ ERROR: stability attributes may not be used | ^^^^^^^^^^^ error: stability attributes may not be used outside of the standard library - --> $DIR/stability-attribute-non-staged-force-unstable.rs:14:1 + --> $DIR/stability-attribute-non-staged-force-unstable.rs:4:1 | LL | #[stable] //~ ERROR: stability attributes may not be used | ^^^^^^^^^ error: stability attributes may not be used outside of the standard library - --> $DIR/stability-attribute-non-staged-force-unstable.rs:15:1 + --> $DIR/stability-attribute-non-staged-force-unstable.rs:5:1 | LL | #[rustc_deprecated] //~ ERROR: stability attributes may not be used | ^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/stability-attribute/stability-attribute-non-staged.rs b/src/test/ui/stability-attribute/stability-attribute-non-staged.rs index 35256f21f9253..3b223851ce0fa 100644 --- a/src/test/ui/stability-attribute/stability-attribute-non-staged.rs +++ b/src/test/ui/stability-attribute/stability-attribute-non-staged.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[unstable] //~ ERROR: stability attributes may not be used #[stable] //~ ERROR: stability attributes may not be used #[rustc_deprecated] //~ ERROR: stability attributes may not be used diff --git a/src/test/ui/stability-attribute/stability-attribute-non-staged.stderr b/src/test/ui/stability-attribute/stability-attribute-non-staged.stderr index f2a9879bd1031..ad437dd2ebecc 100644 --- a/src/test/ui/stability-attribute/stability-attribute-non-staged.stderr +++ b/src/test/ui/stability-attribute/stability-attribute-non-staged.stderr @@ -1,17 +1,17 @@ error: stability attributes may not be used outside of the standard library - --> $DIR/stability-attribute-non-staged.rs:11:1 + --> $DIR/stability-attribute-non-staged.rs:1:1 | LL | #[unstable] //~ ERROR: stability attributes may not be used | ^^^^^^^^^^^ error: stability attributes may not be used outside of the standard library - --> $DIR/stability-attribute-non-staged.rs:12:1 + --> $DIR/stability-attribute-non-staged.rs:2:1 | LL | #[stable] //~ ERROR: stability attributes may not be used | ^^^^^^^^^ error: stability attributes may not be used outside of the standard library - --> $DIR/stability-attribute-non-staged.rs:13:1 + --> $DIR/stability-attribute-non-staged.rs:3:1 | LL | #[rustc_deprecated] //~ ERROR: stability attributes may not be used | ^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/stability-attribute/stability-attribute-sanity-2.rs b/src/test/ui/stability-attribute/stability-attribute-sanity-2.rs index 9c54315bfd004..5a67ca0b0c88a 100644 --- a/src/test/ui/stability-attribute/stability-attribute-sanity-2.rs +++ b/src/test/ui/stability-attribute/stability-attribute-sanity-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // More checks that stability attributes are used correctly #![feature(staged_api)] diff --git a/src/test/ui/stability-attribute/stability-attribute-sanity-2.stderr b/src/test/ui/stability-attribute/stability-attribute-sanity-2.stderr index a9d70e2530270..6f5c844a65713 100644 --- a/src/test/ui/stability-attribute/stability-attribute-sanity-2.stderr +++ b/src/test/ui/stability-attribute/stability-attribute-sanity-2.stderr @@ -1,17 +1,17 @@ error[E0538]: multiple 'feature' items - --> $DIR/stability-attribute-sanity-2.rs:17:25 + --> $DIR/stability-attribute-sanity-2.rs:7:25 | LL | #[stable(feature = "a", feature = "b", since = "1.0.0")] //~ ERROR multiple 'feature' items | ^^^^^^^^^^^^^ error[E0541]: unknown meta item 'sinse' - --> $DIR/stability-attribute-sanity-2.rs:20:25 + --> $DIR/stability-attribute-sanity-2.rs:10:25 | LL | #[stable(feature = "a", sinse = "1.0.0")] //~ ERROR unknown meta item 'sinse' | ^^^^^^^^^^^^^^^ expected one of `since`, `note` error[E0545]: incorrect 'issue' - --> $DIR/stability-attribute-sanity-2.rs:23:1 + --> $DIR/stability-attribute-sanity-2.rs:13:1 | LL | #[unstable(feature = "a", issue = "no")] //~ ERROR incorrect 'issue' | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/stability-attribute/stability-attribute-sanity-3.rs b/src/test/ui/stability-attribute/stability-attribute-sanity-3.rs index d4821e009f223..0c132e8857550 100644 --- a/src/test/ui/stability-attribute/stability-attribute-sanity-3.rs +++ b/src/test/ui/stability-attribute/stability-attribute-sanity-3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // More checks that stability attributes are used correctly #![feature(staged_api)] diff --git a/src/test/ui/stability-attribute/stability-attribute-sanity-3.stderr b/src/test/ui/stability-attribute/stability-attribute-sanity-3.stderr index b5b5847e8e1ef..d42dcc0c778a7 100644 --- a/src/test/ui/stability-attribute/stability-attribute-sanity-3.stderr +++ b/src/test/ui/stability-attribute/stability-attribute-sanity-3.stderr @@ -1,5 +1,5 @@ error: This node does not have a stability attribute - --> $DIR/stability-attribute-sanity-3.rs:18:1 + --> $DIR/stability-attribute-sanity-3.rs:8:1 | LL | / macro_rules! mac { //~ ERROR This node does not have a stability attribute LL | | () => () diff --git a/src/test/ui/stability-attribute/stability-attribute-sanity.rs b/src/test/ui/stability-attribute/stability-attribute-sanity.rs index 794ae1ca08707..cb10df93708d5 100644 --- a/src/test/ui/stability-attribute/stability-attribute-sanity.rs +++ b/src/test/ui/stability-attribute/stability-attribute-sanity.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Various checks that stability attributes are used correctly, per RFC 507 #![feature(const_fn, staged_api, rustc_const_unstable)] diff --git a/src/test/ui/stability-attribute/stability-attribute-sanity.stderr b/src/test/ui/stability-attribute/stability-attribute-sanity.stderr index f9d301f643d88..14c0728c5c73a 100644 --- a/src/test/ui/stability-attribute/stability-attribute-sanity.stderr +++ b/src/test/ui/stability-attribute/stability-attribute-sanity.stderr @@ -1,137 +1,137 @@ error[E0541]: unknown meta item 'reason' - --> $DIR/stability-attribute-sanity.rs:18:42 + --> $DIR/stability-attribute-sanity.rs:8:42 | LL | #[stable(feature = "a", since = "b", reason)] //~ ERROR unknown meta item 'reason' [E0541] | ^^^^^^ expected one of `since`, `note` error[E0539]: incorrect meta item - --> $DIR/stability-attribute-sanity.rs:21:29 + --> $DIR/stability-attribute-sanity.rs:11:29 | LL | #[stable(feature = "a", since)] //~ ERROR incorrect meta item [E0539] | ^^^^^ error[E0539]: incorrect meta item - --> $DIR/stability-attribute-sanity.rs:24:14 + --> $DIR/stability-attribute-sanity.rs:14:14 | LL | #[stable(feature, since = "a")] //~ ERROR incorrect meta item [E0539] | ^^^^^^^ error[E0539]: incorrect meta item - --> $DIR/stability-attribute-sanity.rs:27:29 + --> $DIR/stability-attribute-sanity.rs:17:29 | LL | #[stable(feature = "a", since(b))] //~ ERROR incorrect meta item [E0539] | ^^^^^^^^ error[E0539]: incorrect meta item - --> $DIR/stability-attribute-sanity.rs:30:14 + --> $DIR/stability-attribute-sanity.rs:20:14 | LL | #[stable(feature(b), since = "a")] //~ ERROR incorrect meta item [E0539] | ^^^^^^^^^^ error[E0548]: incorrect stability attribute type - --> $DIR/stability-attribute-sanity.rs:35:5 + --> $DIR/stability-attribute-sanity.rs:25:5 | LL | #[unstable] //~ ERROR incorrect stability attribute type [E0548] | ^^^^^^^^^^^ error[E0548]: incorrect stability attribute type - --> $DIR/stability-attribute-sanity.rs:38:5 + --> $DIR/stability-attribute-sanity.rs:28:5 | LL | #[unstable = "b"] //~ ERROR incorrect stability attribute type [E0548] | ^^^^^^^^^^^^^^^^^ error[E0548]: incorrect stability attribute type - --> $DIR/stability-attribute-sanity.rs:41:5 + --> $DIR/stability-attribute-sanity.rs:31:5 | LL | #[stable] //~ ERROR incorrect stability attribute type [E0548] | ^^^^^^^^^ error[E0548]: incorrect stability attribute type - --> $DIR/stability-attribute-sanity.rs:44:5 + --> $DIR/stability-attribute-sanity.rs:34:5 | LL | #[stable = "a"] //~ ERROR incorrect stability attribute type [E0548] | ^^^^^^^^^^^^^^^ error[E0548]: incorrect stability attribute type - --> $DIR/stability-attribute-sanity.rs:48:5 + --> $DIR/stability-attribute-sanity.rs:38:5 | LL | #[rustc_deprecated] //~ ERROR incorrect stability attribute type [E0548] | ^^^^^^^^^^^^^^^^^^^ error[E0548]: incorrect stability attribute type - --> $DIR/stability-attribute-sanity.rs:52:5 + --> $DIR/stability-attribute-sanity.rs:42:5 | LL | #[rustc_deprecated = "a"] //~ ERROR incorrect stability attribute type [E0548] | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0546]: missing 'feature' - --> $DIR/stability-attribute-sanity.rs:57:5 + --> $DIR/stability-attribute-sanity.rs:47:5 | LL | #[unstable(issue = "0")] //~ ERROR missing 'feature' [E0546] | ^^^^^^^^^^^^^^^^^^^^^^^^ error[E0547]: missing 'issue' - --> $DIR/stability-attribute-sanity.rs:60:5 + --> $DIR/stability-attribute-sanity.rs:50:5 | LL | #[unstable(feature = "b")] //~ ERROR missing 'issue' [E0547] | ^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0546]: missing 'feature' - --> $DIR/stability-attribute-sanity.rs:63:5 + --> $DIR/stability-attribute-sanity.rs:53:5 | LL | #[stable(since = "a")] //~ ERROR missing 'feature' [E0546] | ^^^^^^^^^^^^^^^^^^^^^^ error[E0542]: missing 'since' - --> $DIR/stability-attribute-sanity.rs:68:5 + --> $DIR/stability-attribute-sanity.rs:58:5 | LL | #[stable(feature = "a")] //~ ERROR missing 'since' [E0542] | ^^^^^^^^^^^^^^^^^^^^^^^^ error[E0542]: missing 'since' - --> $DIR/stability-attribute-sanity.rs:72:5 + --> $DIR/stability-attribute-sanity.rs:62:5 | LL | #[rustc_deprecated(reason = "a")] //~ ERROR missing 'since' [E0542] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0544]: multiple stability levels - --> $DIR/stability-attribute-sanity.rs:77:1 + --> $DIR/stability-attribute-sanity.rs:67:1 | LL | #[stable(feature = "a", since = "b")] //~ ERROR multiple stability levels [E0544] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0544]: multiple stability levels - --> $DIR/stability-attribute-sanity.rs:81:1 + --> $DIR/stability-attribute-sanity.rs:71:1 | LL | #[unstable(feature = "b", issue = "0")] //~ ERROR multiple stability levels [E0544] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0544]: multiple stability levels - --> $DIR/stability-attribute-sanity.rs:85:1 + --> $DIR/stability-attribute-sanity.rs:75:1 | LL | #[stable(feature = "a", since = "b")] //~ ERROR multiple stability levels [E0544] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0540]: multiple rustc_deprecated attributes - --> $DIR/stability-attribute-sanity.rs:93:1 + --> $DIR/stability-attribute-sanity.rs:83:1 | LL | pub const fn multiple4() { } //~ ERROR multiple rustc_deprecated attributes [E0540] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0553]: multiple rustc_const_unstable attributes - --> $DIR/stability-attribute-sanity.rs:93:1 + --> $DIR/stability-attribute-sanity.rs:83:1 | LL | pub const fn multiple4() { } //~ ERROR multiple rustc_deprecated attributes [E0540] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: Invalid stability or deprecation version found - --> $DIR/stability-attribute-sanity.rs:93:1 + --> $DIR/stability-attribute-sanity.rs:83:1 | LL | pub const fn multiple4() { } //~ ERROR multiple rustc_deprecated attributes [E0540] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0549]: rustc_deprecated attribute must be paired with either stable or unstable attribute - --> $DIR/stability-attribute-sanity.rs:98:1 + --> $DIR/stability-attribute-sanity.rs:88:1 | LL | fn deprecated_without_unstable_or_stable() { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/stable-features.rs b/src/test/ui/stable-features.rs index 32991dd6499b5..ed7f0899d1c67 100644 --- a/src/test/ui/stable-features.rs +++ b/src/test/ui/stable-features.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Testing that the stable_features lint catches use of stable // language and lib features. diff --git a/src/test/ui/stable-features.stderr b/src/test/ui/stable-features.stderr index 53d642c07e6be..537c3f082eff6 100644 --- a/src/test/ui/stable-features.stderr +++ b/src/test/ui/stable-features.stderr @@ -1,17 +1,17 @@ error: the feature `test_accepted_feature` has been stable since 1.0.0 and no longer requires an attribute to enable - --> $DIR/stable-features.rs:16:12 + --> $DIR/stable-features.rs:6:12 | LL | #![feature(test_accepted_feature)] | ^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/stable-features.rs:14:9 + --> $DIR/stable-features.rs:4:9 | LL | #![deny(stable_features)] | ^^^^^^^^^^^^^^^ error: the feature `rust1` has been stable since 1.0.0 and no longer requires an attribute to enable - --> $DIR/stable-features.rs:19:12 + --> $DIR/stable-features.rs:9:12 | LL | #![feature(rust1)] | ^^^^^ diff --git a/src/test/ui/static/auxiliary/static-priv-by-default.rs b/src/test/ui/static/auxiliary/static-priv-by-default.rs index 14299a9b639c1..41f368f46d661 100644 --- a/src/test/ui/static/auxiliary/static-priv-by-default.rs +++ b/src/test/ui/static/auxiliary/static-priv-by-default.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:static_priv_by_default.rs extern crate static_priv_by_default; diff --git a/src/test/ui/static/auxiliary/static_priv_by_default.rs b/src/test/ui/static/auxiliary/static_priv_by_default.rs index 73597e51f0802..39f912066ece9 100644 --- a/src/test/ui/static/auxiliary/static_priv_by_default.rs +++ b/src/test/ui/static/auxiliary/static_priv_by_default.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] static private: isize = 0; diff --git a/src/test/ui/static/static-closures.rs b/src/test/ui/static/static-closures.rs index 8593eb5333e39..1bd518d6ffece 100644 --- a/src/test/ui/static/static-closures.rs +++ b/src/test/ui/static/static-closures.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { static || {}; //~^ ERROR closures cannot be static diff --git a/src/test/ui/static/static-closures.stderr b/src/test/ui/static/static-closures.stderr index 761d8374bcce3..99235e26e15e7 100644 --- a/src/test/ui/static/static-closures.stderr +++ b/src/test/ui/static/static-closures.stderr @@ -1,5 +1,5 @@ error[E0697]: closures cannot be static - --> $DIR/static-closures.rs:12:5 + --> $DIR/static-closures.rs:2:5 | LL | static || {}; | ^^^^^^^^^ diff --git a/src/test/ui/static/static-drop-scope.rs b/src/test/ui/static/static-drop-scope.rs index e22eb7e4484d6..a11a9f020e0dc 100644 --- a/src/test/ui/static/static-drop-scope.rs +++ b/src/test/ui/static/static-drop-scope.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_fn)] struct WithDtor; diff --git a/src/test/ui/static/static-drop-scope.stderr b/src/test/ui/static/static-drop-scope.stderr index ce1582393703a..89b31d95a2a4e 100644 --- a/src/test/ui/static/static-drop-scope.stderr +++ b/src/test/ui/static/static-drop-scope.stderr @@ -1,11 +1,11 @@ error[E0493]: destructors cannot be evaluated at compile-time - --> $DIR/static-drop-scope.rs:19:60 + --> $DIR/static-drop-scope.rs:9:60 | LL | static PROMOTION_FAIL_S: Option<&'static WithDtor> = Some(&WithDtor); | ^^^^^^^^ statics cannot evaluate destructors error[E0597]: borrowed value does not live long enough - --> $DIR/static-drop-scope.rs:19:60 + --> $DIR/static-drop-scope.rs:9:60 | LL | static PROMOTION_FAIL_S: Option<&'static WithDtor> = Some(&WithDtor); | ^^^^^^^^- temporary value only lives until here @@ -15,13 +15,13 @@ LL | static PROMOTION_FAIL_S: Option<&'static WithDtor> = Some(&WithDtor); = note: borrowed value must be valid for the static lifetime... error[E0493]: destructors cannot be evaluated at compile-time - --> $DIR/static-drop-scope.rs:23:59 + --> $DIR/static-drop-scope.rs:13:59 | LL | const PROMOTION_FAIL_C: Option<&'static WithDtor> = Some(&WithDtor); | ^^^^^^^^ constants cannot evaluate destructors error[E0597]: borrowed value does not live long enough - --> $DIR/static-drop-scope.rs:23:59 + --> $DIR/static-drop-scope.rs:13:59 | LL | const PROMOTION_FAIL_C: Option<&'static WithDtor> = Some(&WithDtor); | ^^^^^^^^- temporary value only lives until here @@ -31,25 +31,25 @@ LL | const PROMOTION_FAIL_C: Option<&'static WithDtor> = Some(&WithDtor); = note: borrowed value must be valid for the static lifetime... error[E0493]: destructors cannot be evaluated at compile-time - --> $DIR/static-drop-scope.rs:27:28 + --> $DIR/static-drop-scope.rs:17:28 | LL | static EARLY_DROP_S: i32 = (WithDtor, 0).1; | ^^^^^^^^^^^^^ statics cannot evaluate destructors error[E0493]: destructors cannot be evaluated at compile-time - --> $DIR/static-drop-scope.rs:30:27 + --> $DIR/static-drop-scope.rs:20:27 | LL | const EARLY_DROP_C: i32 = (WithDtor, 0).1; | ^^^^^^^^^^^^^ constants cannot evaluate destructors error[E0493]: destructors cannot be evaluated at compile-time - --> $DIR/static-drop-scope.rs:33:24 + --> $DIR/static-drop-scope.rs:23:24 | LL | const fn const_drop(_: T) {} | ^ constant functions cannot evaluate destructors error[E0493]: destructors cannot be evaluated at compile-time - --> $DIR/static-drop-scope.rs:37:5 + --> $DIR/static-drop-scope.rs:27:5 | LL | (x, ()).1 | ^^^^^^^ constant functions cannot evaluate destructors diff --git a/src/test/ui/static/static-items-cant-move.rs b/src/test/ui/static/static-items-cant-move.rs index c8fddeb12141d..3e7aaa0b0eef4 100644 --- a/src/test/ui/static/static-items-cant-move.rs +++ b/src/test/ui/static/static-items-cant-move.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Verifies that static items can't be moved struct B; diff --git a/src/test/ui/static/static-items-cant-move.stderr b/src/test/ui/static/static-items-cant-move.stderr index 254710b6b2e2f..1ac772a460189 100644 --- a/src/test/ui/static/static-items-cant-move.stderr +++ b/src/test/ui/static/static-items-cant-move.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of static item - --> $DIR/static-items-cant-move.rs:28:10 + --> $DIR/static-items-cant-move.rs:18:10 | LL | test(BAR); //~ ERROR cannot move out of static item | ^^^ cannot move out of static item diff --git a/src/test/ui/static/static-lifetime-bound.nll.stderr b/src/test/ui/static/static-lifetime-bound.nll.stderr index ad4d04343fefb..15f10c2cded3e 100644 --- a/src/test/ui/static/static-lifetime-bound.nll.stderr +++ b/src/test/ui/static/static-lifetime-bound.nll.stderr @@ -1,5 +1,5 @@ warning: unnecessary lifetime parameter `'a` - --> $DIR/static-lifetime-bound.rs:11:6 + --> $DIR/static-lifetime-bound.rs:1:6 | LL | fn f<'a: 'static>(_: &'a i32) {} //~WARN unnecessary lifetime parameter `'a` | ^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | fn f<'a: 'static>(_: &'a i32) {} //~WARN unnecessary lifetime parameter `'a = help: you can use the `'static` lifetime directly, in place of `'a` error[E0597]: `x` does not live long enough - --> $DIR/static-lifetime-bound.rs:15:7 + --> $DIR/static-lifetime-bound.rs:5:7 | LL | f(&x); //~ERROR does not live long enough | ^^ borrowed value does not live long enough diff --git a/src/test/ui/static/static-lifetime-bound.rs b/src/test/ui/static/static-lifetime-bound.rs index 38534ab0a3687..b5da91ec3b6b0 100644 --- a/src/test/ui/static/static-lifetime-bound.rs +++ b/src/test/ui/static/static-lifetime-bound.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn f<'a: 'static>(_: &'a i32) {} //~WARN unnecessary lifetime parameter `'a` fn main() { diff --git a/src/test/ui/static/static-lifetime-bound.stderr b/src/test/ui/static/static-lifetime-bound.stderr index 0ee2b665cf137..dc8e83610d4b6 100644 --- a/src/test/ui/static/static-lifetime-bound.stderr +++ b/src/test/ui/static/static-lifetime-bound.stderr @@ -1,5 +1,5 @@ warning: unnecessary lifetime parameter `'a` - --> $DIR/static-lifetime-bound.rs:11:6 + --> $DIR/static-lifetime-bound.rs:1:6 | LL | fn f<'a: 'static>(_: &'a i32) {} //~WARN unnecessary lifetime parameter `'a` | ^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | fn f<'a: 'static>(_: &'a i32) {} //~WARN unnecessary lifetime parameter `'a = help: you can use the `'static` lifetime directly, in place of `'a` error[E0597]: `x` does not live long enough - --> $DIR/static-lifetime-bound.rs:15:8 + --> $DIR/static-lifetime-bound.rs:5:8 | LL | f(&x); //~ERROR does not live long enough | ^ borrowed value does not live long enough diff --git a/src/test/ui/static/static-lifetime.rs b/src/test/ui/static/static-lifetime.rs index 62abf11654edf..ce1eeb6105f09 100644 --- a/src/test/ui/static/static-lifetime.rs +++ b/src/test/ui/static/static-lifetime.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Arbitrary: Sized + 'static {} impl<'a, A: Clone> Arbitrary for ::std::borrow::Cow<'a, A> {} //~ ERROR lifetime bound diff --git a/src/test/ui/static/static-lifetime.stderr b/src/test/ui/static/static-lifetime.stderr index c38b8a96f9fc2..65c60ceb2e374 100644 --- a/src/test/ui/static/static-lifetime.stderr +++ b/src/test/ui/static/static-lifetime.stderr @@ -1,11 +1,11 @@ error[E0478]: lifetime bound not satisfied - --> $DIR/static-lifetime.rs:13:20 + --> $DIR/static-lifetime.rs:3:20 | LL | impl<'a, A: Clone> Arbitrary for ::std::borrow::Cow<'a, A> {} //~ ERROR lifetime bound | ^^^^^^^^^ | -note: lifetime parameter instantiated with the lifetime 'a as defined on the impl at 13:6 - --> $DIR/static-lifetime.rs:13:6 +note: lifetime parameter instantiated with the lifetime 'a as defined on the impl at 3:6 + --> $DIR/static-lifetime.rs:3:6 | LL | impl<'a, A: Clone> Arbitrary for ::std::borrow::Cow<'a, A> {} //~ ERROR lifetime bound | ^^ diff --git a/src/test/ui/static/static-method-privacy.rs b/src/test/ui/static/static-method-privacy.rs index 5e175aa0feef4..b637037f60e8f 100644 --- a/src/test/ui/static/static-method-privacy.rs +++ b/src/test/ui/static/static-method-privacy.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod a { pub struct S; impl S { diff --git a/src/test/ui/static/static-method-privacy.stderr b/src/test/ui/static/static-method-privacy.stderr index 783b72c8ed27e..c72295f97ca1c 100644 --- a/src/test/ui/static/static-method-privacy.stderr +++ b/src/test/ui/static/static-method-privacy.stderr @@ -1,5 +1,5 @@ error[E0624]: method `new` is private - --> $DIR/static-method-privacy.rs:19:13 + --> $DIR/static-method-privacy.rs:9:13 | LL | let _ = a::S::new(); //~ ERROR method `new` is private | ^^^^^^^^^ diff --git a/src/test/ui/static/static-mut-bad-types.rs b/src/test/ui/static/static-mut-bad-types.rs index 088c8ef3ab8c2..8a98b1b7f769e 100644 --- a/src/test/ui/static/static-mut-bad-types.rs +++ b/src/test/ui/static/static-mut-bad-types.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - static mut a: isize = 3; fn main() { diff --git a/src/test/ui/static/static-mut-bad-types.stderr b/src/test/ui/static/static-mut-bad-types.stderr index f8bee22b1810b..e97165705ca70 100644 --- a/src/test/ui/static/static-mut-bad-types.stderr +++ b/src/test/ui/static/static-mut-bad-types.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/static-mut-bad-types.rs:15:13 + --> $DIR/static-mut-bad-types.rs:5:13 | LL | a = true; //~ ERROR: mismatched types | ^^^^ expected isize, found bool diff --git a/src/test/ui/static/static-mut-foreign-requires-unsafe.rs b/src/test/ui/static/static-mut-foreign-requires-unsafe.rs index c6d744fa64d36..535f6bc322653 100644 --- a/src/test/ui/static/static-mut-foreign-requires-unsafe.rs +++ b/src/test/ui/static/static-mut-foreign-requires-unsafe.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern { static mut a: i32; } diff --git a/src/test/ui/static/static-mut-foreign-requires-unsafe.stderr b/src/test/ui/static/static-mut-foreign-requires-unsafe.stderr index 01cbe784b45be..9964e1d98b11f 100644 --- a/src/test/ui/static/static-mut-foreign-requires-unsafe.stderr +++ b/src/test/ui/static/static-mut-foreign-requires-unsafe.stderr @@ -1,5 +1,5 @@ error[E0133]: use of mutable static is unsafe and requires unsafe function or block - --> $DIR/static-mut-foreign-requires-unsafe.rs:16:5 + --> $DIR/static-mut-foreign-requires-unsafe.rs:6:5 | LL | a += 3; //~ ERROR: requires unsafe | ^^^^^^ use of mutable static @@ -7,7 +7,7 @@ LL | a += 3; //~ ERROR: requires unsafe = note: mutable statics can be mutated by multiple threads: aliasing violations or data races will cause undefined behavior error[E0133]: use of mutable static is unsafe and requires unsafe function or block - --> $DIR/static-mut-foreign-requires-unsafe.rs:17:5 + --> $DIR/static-mut-foreign-requires-unsafe.rs:7:5 | LL | a = 4; //~ ERROR: requires unsafe | ^^^^^ use of mutable static @@ -15,7 +15,7 @@ LL | a = 4; //~ ERROR: requires unsafe = note: mutable statics can be mutated by multiple threads: aliasing violations or data races will cause undefined behavior error[E0133]: use of mutable static is unsafe and requires unsafe function or block - --> $DIR/static-mut-foreign-requires-unsafe.rs:18:14 + --> $DIR/static-mut-foreign-requires-unsafe.rs:8:14 | LL | let _b = a; //~ ERROR: requires unsafe | ^ use of mutable static diff --git a/src/test/ui/static/static-mut-not-constant.rs b/src/test/ui/static/static-mut-not-constant.rs index 7e6ced12fe69a..2091fffd418ee 100644 --- a/src/test/ui/static/static-mut-not-constant.rs +++ b/src/test/ui/static/static-mut-not-constant.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] static mut a: Box = box 3; diff --git a/src/test/ui/static/static-mut-not-constant.stderr b/src/test/ui/static/static-mut-not-constant.stderr index ad44121e76316..a0fa245156f87 100644 --- a/src/test/ui/static/static-mut-not-constant.stderr +++ b/src/test/ui/static/static-mut-not-constant.stderr @@ -1,5 +1,5 @@ error[E0010]: allocations are not allowed in statics - --> $DIR/static-mut-not-constant.rs:13:28 + --> $DIR/static-mut-not-constant.rs:3:28 | LL | static mut a: Box = box 3; | ^^^^^ allocation not allowed in statics diff --git a/src/test/ui/static/static-mut-not-pat.rs b/src/test/ui/static/static-mut-not-pat.rs index 351a47fdf3923..ce5ae164c0e95 100644 --- a/src/test/ui/static/static-mut-not-pat.rs +++ b/src/test/ui/static/static-mut-not-pat.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Constants (static variables) can be used to match in patterns, but mutable // statics cannot. This ensures that there's some form of error if this is // attempted. diff --git a/src/test/ui/static/static-mut-not-pat.stderr b/src/test/ui/static/static-mut-not-pat.stderr index 123cf7b3ac6bd..3cdf1140ba057 100644 --- a/src/test/ui/static/static-mut-not-pat.stderr +++ b/src/test/ui/static/static-mut-not-pat.stderr @@ -1,5 +1,5 @@ error[E0530]: match bindings cannot shadow statics - --> $DIR/static-mut-not-pat.rs:23:9 + --> $DIR/static-mut-not-pat.rs:13:9 | LL | static mut a: isize = 3; | ------------------------ a static `a` is defined here @@ -8,7 +8,7 @@ LL | a => {} //~ ERROR match bindings cannot shadow statics | ^ cannot be named the same as a static error[E0530]: match bindings cannot shadow statics - --> $DIR/static-mut-not-pat.rs:46:9 + --> $DIR/static-mut-not-pat.rs:36:9 | LL | static mut STATIC_MUT_FOO: Foo = Foo { bar: Some(Direction::West), baz: NEW_FALSE }; | ------------------------------------------------------------------------------------ a static `STATIC_MUT_FOO` is defined here diff --git a/src/test/ui/static/static-mut-requires-unsafe.rs b/src/test/ui/static/static-mut-requires-unsafe.rs index f6ad46a0527b3..413b97e431d30 100644 --- a/src/test/ui/static/static-mut-requires-unsafe.rs +++ b/src/test/ui/static/static-mut-requires-unsafe.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - static mut a: isize = 3; fn main() { diff --git a/src/test/ui/static/static-mut-requires-unsafe.stderr b/src/test/ui/static/static-mut-requires-unsafe.stderr index 310da8f67f371..66ee6989b01ef 100644 --- a/src/test/ui/static/static-mut-requires-unsafe.stderr +++ b/src/test/ui/static/static-mut-requires-unsafe.stderr @@ -1,5 +1,5 @@ error[E0133]: use of mutable static is unsafe and requires unsafe function or block - --> $DIR/static-mut-requires-unsafe.rs:14:5 + --> $DIR/static-mut-requires-unsafe.rs:4:5 | LL | a += 3; //~ ERROR: requires unsafe | ^^^^^^ use of mutable static @@ -7,7 +7,7 @@ LL | a += 3; //~ ERROR: requires unsafe = note: mutable statics can be mutated by multiple threads: aliasing violations or data races will cause undefined behavior error[E0133]: use of mutable static is unsafe and requires unsafe function or block - --> $DIR/static-mut-requires-unsafe.rs:15:5 + --> $DIR/static-mut-requires-unsafe.rs:5:5 | LL | a = 4; //~ ERROR: requires unsafe | ^^^^^ use of mutable static @@ -15,7 +15,7 @@ LL | a = 4; //~ ERROR: requires unsafe = note: mutable statics can be mutated by multiple threads: aliasing violations or data races will cause undefined behavior error[E0133]: use of mutable static is unsafe and requires unsafe function or block - --> $DIR/static-mut-requires-unsafe.rs:16:14 + --> $DIR/static-mut-requires-unsafe.rs:6:14 | LL | let _b = a; //~ ERROR: requires unsafe | ^ use of mutable static diff --git a/src/test/ui/static/static-priv-by-default2.rs b/src/test/ui/static/static-priv-by-default2.rs index 577e4f7542d26..bbbdb253b1e1c 100644 --- a/src/test/ui/static/static-priv-by-default2.rs +++ b/src/test/ui/static/static-priv-by-default2.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:static_priv_by_default.rs extern crate static_priv_by_default; diff --git a/src/test/ui/static/static-priv-by-default2.stderr b/src/test/ui/static/static-priv-by-default2.stderr index 0f749b0e4f37a..90a821e5fd734 100644 --- a/src/test/ui/static/static-priv-by-default2.stderr +++ b/src/test/ui/static/static-priv-by-default2.stderr @@ -1,11 +1,11 @@ error[E0603]: static `private` is private - --> $DIR/static-priv-by-default2.rs:25:9 + --> $DIR/static-priv-by-default2.rs:15:9 | LL | use child::childs_child::private; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0603]: static `private` is private - --> $DIR/static-priv-by-default2.rs:33:9 + --> $DIR/static-priv-by-default2.rs:23:9 | LL | use static_priv_by_default::private; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/static/static-reference-to-fn-1.rs b/src/test/ui/static/static-reference-to-fn-1.rs index cf8ee1ecb4183..c15634dbf6200 100644 --- a/src/test/ui/static/static-reference-to-fn-1.rs +++ b/src/test/ui/static/static-reference-to-fn-1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct A<'a> { func: &'a fn() -> Option } diff --git a/src/test/ui/static/static-reference-to-fn-1.stderr b/src/test/ui/static/static-reference-to-fn-1.stderr index 609319f3b7881..84cd6db4c4a94 100644 --- a/src/test/ui/static/static-reference-to-fn-1.stderr +++ b/src/test/ui/static/static-reference-to-fn-1.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/static-reference-to-fn-1.rs:27:15 + --> $DIR/static-reference-to-fn-1.rs:17:15 | LL | func: &foo, //~ ERROR mismatched types | ^^^^ expected fn pointer, found fn item diff --git a/src/test/ui/static/static-reference-to-fn-2.nll.stderr b/src/test/ui/static/static-reference-to-fn-2.nll.stderr index 9ef94189e90ca..44f233d20bdeb 100644 --- a/src/test/ui/static/static-reference-to-fn-2.nll.stderr +++ b/src/test/ui/static/static-reference-to-fn-2.nll.stderr @@ -1,13 +1,13 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/static-reference-to-fn-2.rs:28:22 + --> $DIR/static-reference-to-fn-2.rs:18:22 | LL | self_.statefn = &id(state2 as StateMachineFunc); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^- temporary value only lives until here | | | temporary value does not live long enough | -note: borrowed value must be valid for the anonymous lifetime #2 defined on the function body at 27:1... - --> $DIR/static-reference-to-fn-2.rs:27:1 +note: borrowed value must be valid for the anonymous lifetime #2 defined on the function body at 17:1... + --> $DIR/static-reference-to-fn-2.rs:17:1 | LL | / fn state1(self_: &mut StateMachineIter) -> Option<&'static str> { LL | | self_.statefn = &id(state2 as StateMachineFunc); @@ -17,15 +17,15 @@ LL | | } | |_^ error[E0597]: borrowed value does not live long enough - --> $DIR/static-reference-to-fn-2.rs:34:22 + --> $DIR/static-reference-to-fn-2.rs:24:22 | LL | self_.statefn = &id(state3 as StateMachineFunc); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^- temporary value only lives until here | | | temporary value does not live long enough | -note: borrowed value must be valid for the anonymous lifetime #2 defined on the function body at 33:1... - --> $DIR/static-reference-to-fn-2.rs:33:1 +note: borrowed value must be valid for the anonymous lifetime #2 defined on the function body at 23:1... + --> $DIR/static-reference-to-fn-2.rs:23:1 | LL | / fn state2(self_: &mut StateMachineIter) -> Option<(&'static str)> { LL | | self_.statefn = &id(state3 as StateMachineFunc); @@ -35,15 +35,15 @@ LL | | } | |_^ error[E0597]: borrowed value does not live long enough - --> $DIR/static-reference-to-fn-2.rs:40:22 + --> $DIR/static-reference-to-fn-2.rs:30:22 | LL | self_.statefn = &id(finished as StateMachineFunc); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^- temporary value only lives until here | | | temporary value does not live long enough | -note: borrowed value must be valid for the anonymous lifetime #2 defined on the function body at 39:1... - --> $DIR/static-reference-to-fn-2.rs:39:1 +note: borrowed value must be valid for the anonymous lifetime #2 defined on the function body at 29:1... + --> $DIR/static-reference-to-fn-2.rs:29:1 | LL | / fn state3(self_: &mut StateMachineIter) -> Option<(&'static str)> { LL | | self_.statefn = &id(finished as StateMachineFunc); @@ -53,7 +53,7 @@ LL | | } | |_^ error[E0597]: borrowed value does not live long enough - --> $DIR/static-reference-to-fn-2.rs:51:19 + --> $DIR/static-reference-to-fn-2.rs:41:19 | LL | statefn: &id(state1 as StateMachineFunc) | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ temporary value does not live long enough diff --git a/src/test/ui/static/static-reference-to-fn-2.rs b/src/test/ui/static/static-reference-to-fn-2.rs index 8d9f442b81d94..8e66532cad917 100644 --- a/src/test/ui/static/static-reference-to-fn-2.rs +++ b/src/test/ui/static/static-reference-to-fn-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn id(x: T) -> T { x } struct StateMachineIter<'a> { diff --git a/src/test/ui/static/static-reference-to-fn-2.stderr b/src/test/ui/static/static-reference-to-fn-2.stderr index a01ab4cef8185..d94913c7e2224 100644 --- a/src/test/ui/static/static-reference-to-fn-2.stderr +++ b/src/test/ui/static/static-reference-to-fn-2.stderr @@ -1,13 +1,13 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/static-reference-to-fn-2.rs:28:22 + --> $DIR/static-reference-to-fn-2.rs:18:22 | LL | self_.statefn = &id(state2 as StateMachineFunc); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^- temporary value only lives until here | | | temporary value does not live long enough | -note: borrowed value must be valid for the anonymous lifetime #2 defined on the function body at 27:1... - --> $DIR/static-reference-to-fn-2.rs:27:1 +note: borrowed value must be valid for the anonymous lifetime #2 defined on the function body at 17:1... + --> $DIR/static-reference-to-fn-2.rs:17:1 | LL | / fn state1(self_: &mut StateMachineIter) -> Option<&'static str> { LL | | self_.statefn = &id(state2 as StateMachineFunc); @@ -18,15 +18,15 @@ LL | | } = note: consider using a `let` binding to increase its lifetime error[E0597]: borrowed value does not live long enough - --> $DIR/static-reference-to-fn-2.rs:34:22 + --> $DIR/static-reference-to-fn-2.rs:24:22 | LL | self_.statefn = &id(state3 as StateMachineFunc); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^- temporary value only lives until here | | | temporary value does not live long enough | -note: borrowed value must be valid for the anonymous lifetime #2 defined on the function body at 33:1... - --> $DIR/static-reference-to-fn-2.rs:33:1 +note: borrowed value must be valid for the anonymous lifetime #2 defined on the function body at 23:1... + --> $DIR/static-reference-to-fn-2.rs:23:1 | LL | / fn state2(self_: &mut StateMachineIter) -> Option<(&'static str)> { LL | | self_.statefn = &id(state3 as StateMachineFunc); @@ -37,15 +37,15 @@ LL | | } = note: consider using a `let` binding to increase its lifetime error[E0597]: borrowed value does not live long enough - --> $DIR/static-reference-to-fn-2.rs:40:22 + --> $DIR/static-reference-to-fn-2.rs:30:22 | LL | self_.statefn = &id(finished as StateMachineFunc); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^- temporary value only lives until here | | | temporary value does not live long enough | -note: borrowed value must be valid for the anonymous lifetime #2 defined on the function body at 39:1... - --> $DIR/static-reference-to-fn-2.rs:39:1 +note: borrowed value must be valid for the anonymous lifetime #2 defined on the function body at 29:1... + --> $DIR/static-reference-to-fn-2.rs:29:1 | LL | / fn state3(self_: &mut StateMachineIter) -> Option<(&'static str)> { LL | | self_.statefn = &id(finished as StateMachineFunc); @@ -56,7 +56,7 @@ LL | | } = note: consider using a `let` binding to increase its lifetime error[E0597]: borrowed value does not live long enough - --> $DIR/static-reference-to-fn-2.rs:51:19 + --> $DIR/static-reference-to-fn-2.rs:41:19 | LL | statefn: &id(state1 as StateMachineFunc) | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ temporary value does not live long enough diff --git a/src/test/ui/static/static-region-bound.rs b/src/test/ui/static/static-region-bound.rs index 90ed401659c87..ee411370d15fa 100644 --- a/src/test/ui/static/static-region-bound.rs +++ b/src/test/ui/static/static-region-bound.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn id(x: T) -> T { x } diff --git a/src/test/ui/static/static-region-bound.stderr b/src/test/ui/static/static-region-bound.stderr index ee3398b96d916..611f47ddfde75 100644 --- a/src/test/ui/static/static-region-bound.stderr +++ b/src/test/ui/static/static-region-bound.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/static-region-bound.rs:20:14 + --> $DIR/static-region-bound.rs:10:14 | LL | let x = &id(3); //~ ERROR borrowed value does not live long enough | ^^^^^ temporary value does not live long enough diff --git a/src/test/ui/static/static-vec-repeat-not-constant.rs b/src/test/ui/static/static-vec-repeat-not-constant.rs index a533a5bd54dcc..61c87b144d9e4 100644 --- a/src/test/ui/static/static-vec-repeat-not-constant.rs +++ b/src/test/ui/static/static-vec-repeat-not-constant.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo() -> isize { 23 } static a: [isize; 2] = [foo(); 2]; diff --git a/src/test/ui/static/static-vec-repeat-not-constant.stderr b/src/test/ui/static/static-vec-repeat-not-constant.stderr index 27d1b41ed0b72..ef98aa546ebdd 100644 --- a/src/test/ui/static/static-vec-repeat-not-constant.stderr +++ b/src/test/ui/static/static-vec-repeat-not-constant.stderr @@ -1,5 +1,5 @@ error[E0015]: calls in statics are limited to constant functions, tuple structs and tuple variants - --> $DIR/static-vec-repeat-not-constant.rs:13:25 + --> $DIR/static-vec-repeat-not-constant.rs:3:25 | LL | static a: [isize; 2] = [foo(); 2]; | ^^^^^ diff --git a/src/test/ui/staticness-mismatch.rs b/src/test/ui/staticness-mismatch.rs index 2dfc9b79ee20a..69caea75334e8 100644 --- a/src/test/ui/staticness-mismatch.rs +++ b/src/test/ui/staticness-mismatch.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait foo { fn dummy(&self) { } fn bar(); diff --git a/src/test/ui/staticness-mismatch.stderr b/src/test/ui/staticness-mismatch.stderr index 31c06ae8a8892..b67ac5adbe14b 100644 --- a/src/test/ui/staticness-mismatch.stderr +++ b/src/test/ui/staticness-mismatch.stderr @@ -1,5 +1,5 @@ error[E0185]: method `bar` has a `&self` declaration in the impl, but not in the trait - --> $DIR/staticness-mismatch.rs:17:5 + --> $DIR/staticness-mismatch.rs:7:5 | LL | fn bar(); | --------- trait method declared without `&self` diff --git a/src/test/ui/std-uncopyable-atomics.nll.stderr b/src/test/ui/std-uncopyable-atomics.nll.stderr index e6b612fed8588..0a5e7c64b1a83 100644 --- a/src/test/ui/std-uncopyable-atomics.nll.stderr +++ b/src/test/ui/std-uncopyable-atomics.nll.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/std-uncopyable-atomics.rs:19:13 + --> $DIR/std-uncopyable-atomics.rs:9:13 | LL | let x = *&x; //~ ERROR: cannot move out of borrowed content | ^^^ @@ -8,7 +8,7 @@ LL | let x = *&x; //~ ERROR: cannot move out of borrowed content | help: consider removing the `*`: `&x` error[E0507]: cannot move out of borrowed content - --> $DIR/std-uncopyable-atomics.rs:21:13 + --> $DIR/std-uncopyable-atomics.rs:11:13 | LL | let x = *&x; //~ ERROR: cannot move out of borrowed content | ^^^ @@ -17,7 +17,7 @@ LL | let x = *&x; //~ ERROR: cannot move out of borrowed content | help: consider removing the `*`: `&x` error[E0507]: cannot move out of borrowed content - --> $DIR/std-uncopyable-atomics.rs:23:13 + --> $DIR/std-uncopyable-atomics.rs:13:13 | LL | let x = *&x; //~ ERROR: cannot move out of borrowed content | ^^^ @@ -26,7 +26,7 @@ LL | let x = *&x; //~ ERROR: cannot move out of borrowed content | help: consider removing the `*`: `&x` error[E0507]: cannot move out of borrowed content - --> $DIR/std-uncopyable-atomics.rs:25:13 + --> $DIR/std-uncopyable-atomics.rs:15:13 | LL | let x = *&x; //~ ERROR: cannot move out of borrowed content | ^^^ diff --git a/src/test/ui/std-uncopyable-atomics.rs b/src/test/ui/std-uncopyable-atomics.rs index 35877db610e34..2c79a9c440e65 100644 --- a/src/test/ui/std-uncopyable-atomics.rs +++ b/src/test/ui/std-uncopyable-atomics.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #8380 diff --git a/src/test/ui/std-uncopyable-atomics.stderr b/src/test/ui/std-uncopyable-atomics.stderr index 4452bfa95d87e..ecf9963c145f2 100644 --- a/src/test/ui/std-uncopyable-atomics.stderr +++ b/src/test/ui/std-uncopyable-atomics.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/std-uncopyable-atomics.rs:19:13 + --> $DIR/std-uncopyable-atomics.rs:9:13 | LL | let x = *&x; //~ ERROR: cannot move out of borrowed content | ^^^ @@ -8,7 +8,7 @@ LL | let x = *&x; //~ ERROR: cannot move out of borrowed content | help: consider using a reference instead: `&*&x` error[E0507]: cannot move out of borrowed content - --> $DIR/std-uncopyable-atomics.rs:21:13 + --> $DIR/std-uncopyable-atomics.rs:11:13 | LL | let x = *&x; //~ ERROR: cannot move out of borrowed content | ^^^ @@ -17,7 +17,7 @@ LL | let x = *&x; //~ ERROR: cannot move out of borrowed content | help: consider using a reference instead: `&*&x` error[E0507]: cannot move out of borrowed content - --> $DIR/std-uncopyable-atomics.rs:23:13 + --> $DIR/std-uncopyable-atomics.rs:13:13 | LL | let x = *&x; //~ ERROR: cannot move out of borrowed content | ^^^ @@ -26,7 +26,7 @@ LL | let x = *&x; //~ ERROR: cannot move out of borrowed content | help: consider using a reference instead: `&*&x` error[E0507]: cannot move out of borrowed content - --> $DIR/std-uncopyable-atomics.rs:25:13 + --> $DIR/std-uncopyable-atomics.rs:15:13 | LL | let x = *&x; //~ ERROR: cannot move out of borrowed content | ^^^ diff --git a/src/test/ui/stmt_expr_attrs_no_feature.rs b/src/test/ui/stmt_expr_attrs_no_feature.rs index 896817bb85832..0a71d8d133374 100644 --- a/src/test/ui/stmt_expr_attrs_no_feature.rs +++ b/src/test/ui/stmt_expr_attrs_no_feature.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(custom_attribute)] macro_rules! stmt_mac { diff --git a/src/test/ui/stmt_expr_attrs_no_feature.stderr b/src/test/ui/stmt_expr_attrs_no_feature.stderr index dc114cef2e52e..c4d735915a16c 100644 --- a/src/test/ui/stmt_expr_attrs_no_feature.stderr +++ b/src/test/ui/stmt_expr_attrs_no_feature.stderr @@ -1,5 +1,5 @@ error[E0658]: attributes on expressions are experimental. (see issue #15701) - --> $DIR/stmt_expr_attrs_no_feature.rs:23:5 + --> $DIR/stmt_expr_attrs_no_feature.rs:13:5 | LL | #[attr] //~ ERROR attributes on expressions are experimental | ^^^^^^^ @@ -7,7 +7,7 @@ LL | #[attr] //~ ERROR attributes on expressions are experimental = help: add #![feature(stmt_expr_attributes)] to the crate attributes to enable error[E0658]: attributes on expressions are experimental. (see issue #15701) - --> $DIR/stmt_expr_attrs_no_feature.rs:104:18 + --> $DIR/stmt_expr_attrs_no_feature.rs:94:18 | LL | fn y(a: [u8; #[attr] 5]); //~ ERROR 15701 | ^^^^^^^ @@ -15,7 +15,7 @@ LL | fn y(a: [u8; #[attr] 5]); //~ ERROR 15701 = help: add #![feature(stmt_expr_attributes)] to the crate attributes to enable error[E0658]: attributes on expressions are experimental. (see issue #15701) - --> $DIR/stmt_expr_attrs_no_feature.rs:111:19 + --> $DIR/stmt_expr_attrs_no_feature.rs:101:19 | LL | const Y: u8 = #[attr] 5; //~ ERROR 15701 | ^^^^^^^ @@ -23,7 +23,7 @@ LL | const Y: u8 = #[attr] 5; //~ ERROR 15701 = help: add #![feature(stmt_expr_attributes)] to the crate attributes to enable error[E0658]: attributes on expressions are experimental. (see issue #15701) - --> $DIR/stmt_expr_attrs_no_feature.rs:117:19 + --> $DIR/stmt_expr_attrs_no_feature.rs:107:19 | LL | const Y: [u8; #[attr] 5]; //~ ERROR 15701 | ^^^^^^^ @@ -31,7 +31,7 @@ LL | const Y: [u8; #[attr] 5]; //~ ERROR 15701 = help: add #![feature(stmt_expr_attributes)] to the crate attributes to enable error[E0658]: attributes on expressions are experimental. (see issue #15701) - --> $DIR/stmt_expr_attrs_no_feature.rs:123:18 + --> $DIR/stmt_expr_attrs_no_feature.rs:113:18 | LL | field2: [u8; #[attr] 5] //~ ERROR 15701 | ^^^^^^^ @@ -39,7 +39,7 @@ LL | field2: [u8; #[attr] 5] //~ ERROR 15701 = help: add #![feature(stmt_expr_attributes)] to the crate attributes to enable error[E0658]: attributes on expressions are experimental. (see issue #15701) - --> $DIR/stmt_expr_attrs_no_feature.rs:128:10 + --> $DIR/stmt_expr_attrs_no_feature.rs:118:10 | LL | [u8; #[attr] 5] //~ ERROR 15701 | ^^^^^^^ @@ -47,7 +47,7 @@ LL | [u8; #[attr] 5] //~ ERROR 15701 = help: add #![feature(stmt_expr_attributes)] to the crate attributes to enable error[E0658]: attributes on expressions are experimental. (see issue #15701) - --> $DIR/stmt_expr_attrs_no_feature.rs:134:14 + --> $DIR/stmt_expr_attrs_no_feature.rs:124:14 | LL | [u8; #[attr] 5] //~ ERROR 15701 | ^^^^^^^ @@ -55,7 +55,7 @@ LL | [u8; #[attr] 5] //~ ERROR 15701 = help: add #![feature(stmt_expr_attributes)] to the crate attributes to enable error[E0658]: attributes on expressions are experimental. (see issue #15701) - --> $DIR/stmt_expr_attrs_no_feature.rs:139:22 + --> $DIR/stmt_expr_attrs_no_feature.rs:129:22 | LL | field2: [u8; #[attr] 5] //~ ERROR 15701 | ^^^^^^^ @@ -63,7 +63,7 @@ LL | field2: [u8; #[attr] 5] //~ ERROR 15701 = help: add #![feature(stmt_expr_attributes)] to the crate attributes to enable error[E0658]: attributes on expressions are experimental. (see issue #15701) - --> $DIR/stmt_expr_attrs_no_feature.rs:147:14 + --> $DIR/stmt_expr_attrs_no_feature.rs:137:14 | LL | 6 => #[attr] (), //~ ERROR 15701 | ^^^^^^^ diff --git a/src/test/ui/str/str-array-assignment.rs b/src/test/ui/str/str-array-assignment.rs index 9d6cf5fe598c5..4a78ed53ae1a9 100644 --- a/src/test/ui/str/str-array-assignment.rs +++ b/src/test/ui/str/str-array-assignment.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let s = "abc"; let t = if true { s[..2] } else { s }; diff --git a/src/test/ui/str/str-array-assignment.stderr b/src/test/ui/str/str-array-assignment.stderr index 57eff3fb13708..d3bff00872288 100644 --- a/src/test/ui/str/str-array-assignment.stderr +++ b/src/test/ui/str/str-array-assignment.stderr @@ -1,5 +1,5 @@ error[E0308]: if and else have incompatible types - --> $DIR/str-array-assignment.rs:13:11 + --> $DIR/str-array-assignment.rs:3:11 | LL | let t = if true { s[..2] } else { s }; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected str, found &str @@ -8,7 +8,7 @@ LL | let t = if true { s[..2] } else { s }; found type `&str` error[E0308]: mismatched types - --> $DIR/str-array-assignment.rs:15:27 + --> $DIR/str-array-assignment.rs:5:27 | LL | let u: &str = if true { s[..2] } else { s }; | ^^^^^^ @@ -20,7 +20,7 @@ LL | let u: &str = if true { s[..2] } else { s }; found type `str` error[E0277]: the size for values of type `str` cannot be known at compilation time - --> $DIR/str-array-assignment.rs:17:7 + --> $DIR/str-array-assignment.rs:7:7 | LL | let v = s[..2]; | ^ ------ help: consider borrowing here: `&s[..2]` @@ -33,7 +33,7 @@ LL | let v = s[..2]; = help: unsized locals are gated as an unstable feature error[E0308]: mismatched types - --> $DIR/str-array-assignment.rs:19:17 + --> $DIR/str-array-assignment.rs:9:17 | LL | let w: &str = s[..2]; | ^^^^^^ diff --git a/src/test/ui/str/str-as-char.fixed b/src/test/ui/str/str-as-char.fixed index c0dad38e43687..9d4297b55c816 100644 --- a/src/test/ui/str/str-as-char.fixed +++ b/src/test/ui/str/str-as-char.fixed @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix fn main() { diff --git a/src/test/ui/str/str-as-char.rs b/src/test/ui/str/str-as-char.rs index b5a5df0af7f94..710fa74a32a1c 100644 --- a/src/test/ui/str/str-as-char.rs +++ b/src/test/ui/str/str-as-char.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix fn main() { diff --git a/src/test/ui/str/str-as-char.stderr b/src/test/ui/str/str-as-char.stderr index 60eb182adf145..540a1b55376ff 100644 --- a/src/test/ui/str/str-as-char.stderr +++ b/src/test/ui/str/str-as-char.stderr @@ -1,5 +1,5 @@ error: character literal may only contain one codepoint - --> $DIR/str-as-char.rs:14:14 + --> $DIR/str-as-char.rs:4:14 | LL | println!('●●'); | ^^^^ diff --git a/src/test/ui/str/str-concat-on-double-ref.rs b/src/test/ui/str/str-concat-on-double-ref.rs index 292dcbf8ef777..a671b6e191eeb 100644 --- a/src/test/ui/str/str-concat-on-double-ref.rs +++ b/src/test/ui/str/str-concat-on-double-ref.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let a: &String = &"1".to_owned(); let b: &str = &"2"; diff --git a/src/test/ui/str/str-concat-on-double-ref.stderr b/src/test/ui/str/str-concat-on-double-ref.stderr index d42c859598fdd..a67db1936f07e 100644 --- a/src/test/ui/str/str-concat-on-double-ref.stderr +++ b/src/test/ui/str/str-concat-on-double-ref.stderr @@ -1,5 +1,5 @@ error[E0369]: binary operation `+` cannot be applied to type `&std::string::String` - --> $DIR/str-concat-on-double-ref.rs:14:13 + --> $DIR/str-concat-on-double-ref.rs:4:13 | LL | let c = a + b; | ^^^^^ diff --git a/src/test/ui/str/str-idx.rs b/src/test/ui/str/str-idx.rs index b5f1ffb977ed6..2ea80494e03cb 100644 --- a/src/test/ui/str/str-idx.rs +++ b/src/test/ui/str/str-idx.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { let s: &str = "hello"; let c: u8 = s[4]; //~ ERROR the type `str` cannot be indexed by `{integer}` diff --git a/src/test/ui/str/str-idx.stderr b/src/test/ui/str/str-idx.stderr index 496187c92f187..108096df9c41c 100644 --- a/src/test/ui/str/str-idx.stderr +++ b/src/test/ui/str/str-idx.stderr @@ -1,5 +1,5 @@ error[E0277]: the type `str` cannot be indexed by `{integer}` - --> $DIR/str-idx.rs:13:17 + --> $DIR/str-idx.rs:3:17 | LL | let c: u8 = s[4]; //~ ERROR the type `str` cannot be indexed by `{integer}` | ^^^^ `str` cannot be indexed by `{integer}` diff --git a/src/test/ui/str/str-lit-type-mismatch.rs b/src/test/ui/str/str-lit-type-mismatch.rs index 4a062f78a327d..12637c7b994bd 100644 --- a/src/test/ui/str/str-lit-type-mismatch.rs +++ b/src/test/ui/str/str-lit-type-mismatch.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn main() { let x: &[u8] = "foo"; //~ ERROR mismatched types let y: &[u8; 4] = "baaa"; //~ ERROR mismatched types diff --git a/src/test/ui/str/str-lit-type-mismatch.stderr b/src/test/ui/str/str-lit-type-mismatch.stderr index de18851636dfd..c14e9090fef98 100644 --- a/src/test/ui/str/str-lit-type-mismatch.stderr +++ b/src/test/ui/str/str-lit-type-mismatch.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/str-lit-type-mismatch.rs:13:20 + --> $DIR/str-lit-type-mismatch.rs:2:20 | LL | let x: &[u8] = "foo"; //~ ERROR mismatched types | ^^^^^ @@ -11,7 +11,7 @@ LL | let x: &[u8] = "foo"; //~ ERROR mismatched types found type `&'static str` error[E0308]: mismatched types - --> $DIR/str-lit-type-mismatch.rs:14:23 + --> $DIR/str-lit-type-mismatch.rs:3:23 | LL | let y: &[u8; 4] = "baaa"; //~ ERROR mismatched types | ^^^^^^ @@ -23,7 +23,7 @@ LL | let y: &[u8; 4] = "baaa"; //~ ERROR mismatched types found type `&'static str` error[E0308]: mismatched types - --> $DIR/str-lit-type-mismatch.rs:15:19 + --> $DIR/str-lit-type-mismatch.rs:4:19 | LL | let z: &str = b"foo"; //~ ERROR mismatched types | ^^^^^^ diff --git a/src/test/ui/str/str-mut-idx.rs b/src/test/ui/str/str-mut-idx.rs index 136bfaefa71c6..cebbbc3ccbf7d 100644 --- a/src/test/ui/str/str-mut-idx.rs +++ b/src/test/ui/str/str-mut-idx.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn bot() -> T { loop {} } fn mutate(s: &mut str) { diff --git a/src/test/ui/str/str-mut-idx.stderr b/src/test/ui/str/str-mut-idx.stderr index df21ea2b274b6..a8ab38e5ab6a5 100644 --- a/src/test/ui/str/str-mut-idx.stderr +++ b/src/test/ui/str/str-mut-idx.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `str` cannot be known at compilation time - --> $DIR/str-mut-idx.rs:14:15 + --> $DIR/str-mut-idx.rs:4:15 | LL | s[1..2] = bot(); | ^^^ doesn't have a size known at compile-time @@ -7,13 +7,13 @@ LL | s[1..2] = bot(); = help: the trait `std::marker::Sized` is not implemented for `str` = note: to learn more, visit note: required by `bot` - --> $DIR/str-mut-idx.rs:11:1 + --> $DIR/str-mut-idx.rs:1:1 | LL | fn bot() -> T { loop {} } | ^^^^^^^^^^^^^^^^ error[E0277]: the size for values of type `str` cannot be known at compilation time - --> $DIR/str-mut-idx.rs:14:5 + --> $DIR/str-mut-idx.rs:4:5 | LL | s[1..2] = bot(); | ^^^^^^^ doesn't have a size known at compile-time @@ -23,7 +23,7 @@ LL | s[1..2] = bot(); = note: the left-hand-side of an assignment must have a statically known size error[E0277]: the type `str` cannot be mutably indexed by `usize` - --> $DIR/str-mut-idx.rs:17:5 + --> $DIR/str-mut-idx.rs:7:5 | LL | s[1usize] = bot(); | ^^^^^^^^^ `str` cannot be mutably indexed by `usize` diff --git a/src/test/ui/structs/auxiliary/struct_field_privacy.rs b/src/test/ui/structs/auxiliary/struct_field_privacy.rs index 5fea97da03ee3..9765af1a7f652 100644 --- a/src/test/ui/structs/auxiliary/struct_field_privacy.rs +++ b/src/test/ui/structs/auxiliary/struct_field_privacy.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct A { a: isize, pub b: isize, diff --git a/src/test/ui/structs/auxiliary/struct_variant_privacy.rs b/src/test/ui/structs/auxiliary/struct_variant_privacy.rs index 40868fa3f706e..425ec0e96d338 100644 --- a/src/test/ui/structs/auxiliary/struct_variant_privacy.rs +++ b/src/test/ui/structs/auxiliary/struct_variant_privacy.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Bar { Baz { a: isize } } diff --git a/src/test/ui/structs/struct-base-wrong-type-2.rs b/src/test/ui/structs/struct-base-wrong-type-2.rs index 7e5510edb2c33..a88c5d1c13b48 100644 --- a/src/test/ui/structs/struct-base-wrong-type-2.rs +++ b/src/test/ui/structs/struct-base-wrong-type-2.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that `base` in `Fru { field: expr, ..base }` must have right type. // // See also struct-base-wrong-type.rs, which tests same condition diff --git a/src/test/ui/structs/struct-base-wrong-type-2.stderr b/src/test/ui/structs/struct-base-wrong-type-2.stderr index aab5ed0a74ad6..44ac3483ad6d1 100644 --- a/src/test/ui/structs/struct-base-wrong-type-2.stderr +++ b/src/test/ui/structs/struct-base-wrong-type-2.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/struct-base-wrong-type-2.rs:21:27 + --> $DIR/struct-base-wrong-type-2.rs:11:27 | LL | let f = Foo { a: 2, ..b }; //~ ERROR mismatched types | ^ expected struct `Foo`, found struct `Bar` @@ -8,7 +8,7 @@ LL | let f = Foo { a: 2, ..b }; //~ ERROR mismatched types found type `Bar` error[E0308]: mismatched types - --> $DIR/struct-base-wrong-type-2.rs:25:34 + --> $DIR/struct-base-wrong-type-2.rs:15:34 | LL | let f__isize = Foo { a: 2, ..4 }; //~ ERROR mismatched types | ^ expected struct `Foo`, found integral variable diff --git a/src/test/ui/structs/struct-base-wrong-type.rs b/src/test/ui/structs/struct-base-wrong-type.rs index 3703b15d4db83..83b5444815159 100644 --- a/src/test/ui/structs/struct-base-wrong-type.rs +++ b/src/test/ui/structs/struct-base-wrong-type.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that `base` in `Fru { field: expr, ..base }` must have right type. // // See also struct-base-wrong-type-2.rs, which tests same condition diff --git a/src/test/ui/structs/struct-base-wrong-type.stderr b/src/test/ui/structs/struct-base-wrong-type.stderr index 2c87f52ee04ea..8519a9510a9fa 100644 --- a/src/test/ui/structs/struct-base-wrong-type.stderr +++ b/src/test/ui/structs/struct-base-wrong-type.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/struct-base-wrong-type.rs:20:33 + --> $DIR/struct-base-wrong-type.rs:10:33 | LL | static foo: Foo = Foo { a: 2, ..bar }; //~ ERROR mismatched types | ^^^ expected struct `Foo`, found struct `Bar` @@ -8,7 +8,7 @@ LL | static foo: Foo = Foo { a: 2, ..bar }; //~ ERROR mismatched types found type `Bar` error[E0308]: mismatched types - --> $DIR/struct-base-wrong-type.rs:24:35 + --> $DIR/struct-base-wrong-type.rs:14:35 | LL | static foo_i: Foo = Foo { a: 2, ..4 }; //~ ERROR mismatched types | ^ expected struct `Foo`, found integral variable diff --git a/src/test/ui/structs/struct-duplicate-comma.rs b/src/test/ui/structs/struct-duplicate-comma.rs index d7ee2f220d470..2d4551c55ed46 100644 --- a/src/test/ui/structs/struct-duplicate-comma.rs +++ b/src/test/ui/structs/struct-duplicate-comma.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // Issue #50974 diff --git a/src/test/ui/structs/struct-duplicate-comma.stderr b/src/test/ui/structs/struct-duplicate-comma.stderr index 06e3b95c24830..112ea905025ef 100644 --- a/src/test/ui/structs/struct-duplicate-comma.stderr +++ b/src/test/ui/structs/struct-duplicate-comma.stderr @@ -1,5 +1,5 @@ error: expected identifier, found `,` - --> $DIR/struct-duplicate-comma.rs:22:14 + --> $DIR/struct-duplicate-comma.rs:12:14 | LL | let bar = Foo { | --- while parsing this struct diff --git a/src/test/ui/structs/struct-field-cfg.rs b/src/test/ui/structs/struct-field-cfg.rs index 974d500d9cbdb..42cab8ab916bb 100644 --- a/src/test/ui/structs/struct-field-cfg.rs +++ b/src/test/ui/structs/struct-field-cfg.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { present: (), } diff --git a/src/test/ui/structs/struct-field-cfg.stderr b/src/test/ui/structs/struct-field-cfg.stderr index db4790659c37b..c8c624d548b67 100644 --- a/src/test/ui/structs/struct-field-cfg.stderr +++ b/src/test/ui/structs/struct-field-cfg.stderr @@ -1,11 +1,11 @@ error[E0063]: missing field `present` in initializer of `Foo` - --> $DIR/struct-field-cfg.rs:17:13 + --> $DIR/struct-field-cfg.rs:7:13 | LL | let _ = Foo { #[cfg(any())] present: () }; | ^^^ missing `present` error[E0560]: struct `Foo` has no field named `absent` - --> $DIR/struct-field-cfg.rs:20:46 + --> $DIR/struct-field-cfg.rs:10:46 | LL | let _ = Foo { present: (), #[cfg(all())] absent: () }; | ^^^^^^ `Foo` does not have this field @@ -13,13 +13,13 @@ LL | let _ = Foo { present: (), #[cfg(all())] absent: () }; = note: available fields are: `present` error[E0027]: pattern does not mention field `present` - --> $DIR/struct-field-cfg.rs:23:9 + --> $DIR/struct-field-cfg.rs:13:9 | LL | let Foo { #[cfg(any())] present: () } = foo; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing field `present` error[E0026]: struct `Foo` does not have a field named `absent` - --> $DIR/struct-field-cfg.rs:26:42 + --> $DIR/struct-field-cfg.rs:16:42 | LL | let Foo { present: (), #[cfg(all())] absent: () } = foo; | ^^^^^^^^^^ struct `Foo` does not have this field diff --git a/src/test/ui/structs/struct-field-init-syntax.rs b/src/test/ui/structs/struct-field-init-syntax.rs index f1e24495f844f..31463992aca04 100644 --- a/src/test/ui/structs/struct-field-init-syntax.rs +++ b/src/test/ui/structs/struct-field-init-syntax.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // issue #41834 diff --git a/src/test/ui/structs/struct-field-init-syntax.stderr b/src/test/ui/structs/struct-field-init-syntax.stderr index 2c4ae0e472bd5..cd8f6b975b68f 100644 --- a/src/test/ui/structs/struct-field-init-syntax.stderr +++ b/src/test/ui/structs/struct-field-init-syntax.stderr @@ -1,5 +1,5 @@ error: cannot use a comma after the base struct - --> $DIR/struct-field-init-syntax.rs:18:9 + --> $DIR/struct-field-init-syntax.rs:8:9 | LL | ..Foo::default(), | ^^^^^^^^^^^^^^^^- help: remove this comma @@ -7,7 +7,7 @@ LL | ..Foo::default(), = note: the base struct must always be the last field error: cannot use a comma after the base struct - --> $DIR/struct-field-init-syntax.rs:23:9 + --> $DIR/struct-field-init-syntax.rs:13:9 | LL | ..Foo::default(), | ^^^^^^^^^^^^^^^^- help: remove this comma diff --git a/src/test/ui/structs/struct-field-privacy.rs b/src/test/ui/structs/struct-field-privacy.rs index f487ef62aa435..5c35c04a69f9b 100644 --- a/src/test/ui/structs/struct-field-privacy.rs +++ b/src/test/ui/structs/struct-field-privacy.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:struct_field_privacy.rs extern crate struct_field_privacy as xc; diff --git a/src/test/ui/structs/struct-field-privacy.stderr b/src/test/ui/structs/struct-field-privacy.stderr index ad3ee12637a35..5e30a4e403de1 100644 --- a/src/test/ui/structs/struct-field-privacy.stderr +++ b/src/test/ui/structs/struct-field-privacy.stderr @@ -1,29 +1,29 @@ error[E0616]: field `a` of struct `inner::A` is private - --> $DIR/struct-field-privacy.rs:33:5 + --> $DIR/struct-field-privacy.rs:23:5 | LL | b.a; //~ ERROR: field `a` of struct `inner::A` is private | ^^^ error[E0616]: field `b` of struct `inner::B` is private - --> $DIR/struct-field-privacy.rs:36:5 + --> $DIR/struct-field-privacy.rs:26:5 | LL | c.b; //~ ERROR: field `b` of struct `inner::B` is private | ^^^ error[E0616]: field `a` of struct `xc::A` is private - --> $DIR/struct-field-privacy.rs:38:5 + --> $DIR/struct-field-privacy.rs:28:5 | LL | d.a; //~ ERROR: field `a` of struct `xc::A` is private | ^^^ error[E0616]: field `b` of struct `xc::B` is private - --> $DIR/struct-field-privacy.rs:42:5 + --> $DIR/struct-field-privacy.rs:32:5 | LL | e.b; //~ ERROR: field `b` of struct `xc::B` is private | ^^^ error[E0616]: field `1` of struct `inner::Z` is private - --> $DIR/struct-field-privacy.rs:45:5 + --> $DIR/struct-field-privacy.rs:35:5 | LL | z.1; //~ ERROR: field `1` of struct `inner::Z` is private | ^^^ diff --git a/src/test/ui/structs/struct-fields-decl-dupe.rs b/src/test/ui/structs/struct-fields-decl-dupe.rs index 1f6b070d83723..6ddf3d976b79a 100644 --- a/src/test/ui/structs/struct-fields-decl-dupe.rs +++ b/src/test/ui/structs/struct-fields-decl-dupe.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct BuildData { foo: isize, foo: isize, diff --git a/src/test/ui/structs/struct-fields-decl-dupe.stderr b/src/test/ui/structs/struct-fields-decl-dupe.stderr index b5068b4abda53..d7ce9bb892260 100644 --- a/src/test/ui/structs/struct-fields-decl-dupe.stderr +++ b/src/test/ui/structs/struct-fields-decl-dupe.stderr @@ -1,5 +1,5 @@ error[E0124]: field `foo` is already declared - --> $DIR/struct-fields-decl-dupe.rs:13:5 + --> $DIR/struct-fields-decl-dupe.rs:3:5 | LL | foo: isize, | ---------- `foo` first declared here diff --git a/src/test/ui/structs/struct-fields-dupe.rs b/src/test/ui/structs/struct-fields-dupe.rs index 578091f5e9a28..2fa25a33545df 100644 --- a/src/test/ui/structs/struct-fields-dupe.rs +++ b/src/test/ui/structs/struct-fields-dupe.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct BuildData { foo: isize, } diff --git a/src/test/ui/structs/struct-fields-dupe.stderr b/src/test/ui/structs/struct-fields-dupe.stderr index fa2079317e094..7739ef80fc873 100644 --- a/src/test/ui/structs/struct-fields-dupe.stderr +++ b/src/test/ui/structs/struct-fields-dupe.stderr @@ -1,5 +1,5 @@ error[E0062]: field `foo` specified more than once - --> $DIR/struct-fields-dupe.rs:18:9 + --> $DIR/struct-fields-dupe.rs:8:9 | LL | foo: 0, | ------ first use of `foo` diff --git a/src/test/ui/structs/struct-fields-hints-no-dupe.rs b/src/test/ui/structs/struct-fields-hints-no-dupe.rs index e4366cf79b1cf..987cf726fec29 100644 --- a/src/test/ui/structs/struct-fields-hints-no-dupe.rs +++ b/src/test/ui/structs/struct-fields-hints-no-dupe.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct A { foo : i32, car : i32, diff --git a/src/test/ui/structs/struct-fields-hints-no-dupe.stderr b/src/test/ui/structs/struct-fields-hints-no-dupe.stderr index d04d193c66550..105f330463a94 100644 --- a/src/test/ui/structs/struct-fields-hints-no-dupe.stderr +++ b/src/test/ui/structs/struct-fields-hints-no-dupe.stderr @@ -1,5 +1,5 @@ error[E0560]: struct `A` has no field named `bar` - --> $DIR/struct-fields-hints-no-dupe.rs:20:9 + --> $DIR/struct-fields-hints-no-dupe.rs:10:9 | LL | bar : 42, | ^^^ field does not exist - did you mean `barr`? diff --git a/src/test/ui/structs/struct-fields-hints.rs b/src/test/ui/structs/struct-fields-hints.rs index 85dc1aedb445f..08df0930e4d13 100644 --- a/src/test/ui/structs/struct-fields-hints.rs +++ b/src/test/ui/structs/struct-fields-hints.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct A { foo : i32, car : i32, diff --git a/src/test/ui/structs/struct-fields-hints.stderr b/src/test/ui/structs/struct-fields-hints.stderr index 6d0ec8bdf92c9..d713030563102 100644 --- a/src/test/ui/structs/struct-fields-hints.stderr +++ b/src/test/ui/structs/struct-fields-hints.stderr @@ -1,5 +1,5 @@ error[E0560]: struct `A` has no field named `bar` - --> $DIR/struct-fields-hints.rs:20:9 + --> $DIR/struct-fields-hints.rs:10:9 | LL | bar : 42, | ^^^ field does not exist - did you mean `car`? diff --git a/src/test/ui/structs/struct-fields-missing.rs b/src/test/ui/structs/struct-fields-missing.rs index d5ab13affafb1..0c7919d0249e9 100644 --- a/src/test/ui/structs/struct-fields-missing.rs +++ b/src/test/ui/structs/struct-fields-missing.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct BuildData { foo: isize, bar: Box, diff --git a/src/test/ui/structs/struct-fields-missing.stderr b/src/test/ui/structs/struct-fields-missing.stderr index 606288ef27738..edbac000dea01 100644 --- a/src/test/ui/structs/struct-fields-missing.stderr +++ b/src/test/ui/structs/struct-fields-missing.stderr @@ -1,5 +1,5 @@ error[E0063]: missing field `bar` in initializer of `BuildData` - --> $DIR/struct-fields-missing.rs:18:15 + --> $DIR/struct-fields-missing.rs:7:15 | LL | let foo = BuildData { //~ ERROR missing field `bar` in initializer of `BuildData` | ^^^^^^^^^ missing `bar` diff --git a/src/test/ui/structs/struct-fields-shorthand-unresolved.rs b/src/test/ui/structs/struct-fields-shorthand-unresolved.rs index 984f337fb3d14..caad149160c89 100644 --- a/src/test/ui/structs/struct-fields-shorthand-unresolved.rs +++ b/src/test/ui/structs/struct-fields-shorthand-unresolved.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { x: i32, y: i32 diff --git a/src/test/ui/structs/struct-fields-shorthand-unresolved.stderr b/src/test/ui/structs/struct-fields-shorthand-unresolved.stderr index f66ac96e0b756..0fcaac55fd617 100644 --- a/src/test/ui/structs/struct-fields-shorthand-unresolved.stderr +++ b/src/test/ui/structs/struct-fields-shorthand-unresolved.stderr @@ -1,5 +1,5 @@ error[E0425]: cannot find value `y` in this scope - --> $DIR/struct-fields-shorthand-unresolved.rs:20:9 + --> $DIR/struct-fields-shorthand-unresolved.rs:10:9 | LL | y //~ ERROR cannot find value `y` in this scope | ^ did you mean `x`? diff --git a/src/test/ui/structs/struct-fields-shorthand.rs b/src/test/ui/structs/struct-fields-shorthand.rs index e46ae73f1a1d4..45e3014f22e20 100644 --- a/src/test/ui/structs/struct-fields-shorthand.rs +++ b/src/test/ui/structs/struct-fields-shorthand.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { x: i32, y: i32 diff --git a/src/test/ui/structs/struct-fields-shorthand.stderr b/src/test/ui/structs/struct-fields-shorthand.stderr index a65a9c8658177..0d3d633f61cf3 100644 --- a/src/test/ui/structs/struct-fields-shorthand.stderr +++ b/src/test/ui/structs/struct-fields-shorthand.stderr @@ -1,5 +1,5 @@ error[E0560]: struct `Foo` has no field named `z` - --> $DIR/struct-fields-shorthand.rs:19:15 + --> $DIR/struct-fields-shorthand.rs:9:15 | LL | x, y, z //~ ERROR struct `Foo` has no field named `z` | ^ `Foo` does not have this field diff --git a/src/test/ui/structs/struct-fields-too-many.rs b/src/test/ui/structs/struct-fields-too-many.rs index 1e0b8efc96fea..8be8dcbf13cbc 100644 --- a/src/test/ui/structs/struct-fields-too-many.rs +++ b/src/test/ui/structs/struct-fields-too-many.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct BuildData { foo: isize, } diff --git a/src/test/ui/structs/struct-fields-too-many.stderr b/src/test/ui/structs/struct-fields-too-many.stderr index 01b3fe16fbb62..a1b7a7a311080 100644 --- a/src/test/ui/structs/struct-fields-too-many.stderr +++ b/src/test/ui/structs/struct-fields-too-many.stderr @@ -1,5 +1,5 @@ error[E0560]: struct `BuildData` has no field named `bar` - --> $DIR/struct-fields-too-many.rs:18:9 + --> $DIR/struct-fields-too-many.rs:8:9 | LL | bar: 0 | ^^^ `BuildData` does not have this field diff --git a/src/test/ui/structs/struct-fields-typo.rs b/src/test/ui/structs/struct-fields-typo.rs index 0e30c1e86e4f2..b435a0a47773d 100644 --- a/src/test/ui/structs/struct-fields-typo.rs +++ b/src/test/ui/structs/struct-fields-typo.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct BuildData { foo: isize, bar: f32 diff --git a/src/test/ui/structs/struct-fields-typo.stderr b/src/test/ui/structs/struct-fields-typo.stderr index 9f2f97a6c09c0..93127ab5beb6e 100644 --- a/src/test/ui/structs/struct-fields-typo.stderr +++ b/src/test/ui/structs/struct-fields-typo.stderr @@ -1,5 +1,5 @@ error[E0609]: no field `baa` on type `BuildData` - --> $DIR/struct-fields-typo.rs:21:17 + --> $DIR/struct-fields-typo.rs:11:17 | LL | let x = foo.baa;//~ no field `baa` on type `BuildData` | ^^^ did you mean `bar`? diff --git a/src/test/ui/structs/struct-like-enum-nonexhaustive.rs b/src/test/ui/structs/struct-like-enum-nonexhaustive.rs index a14e43f4c9435..b1fc0f5ad3e14 100644 --- a/src/test/ui/structs/struct-like-enum-nonexhaustive.rs +++ b/src/test/ui/structs/struct-like-enum-nonexhaustive.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum A { B { x: Option }, C diff --git a/src/test/ui/structs/struct-like-enum-nonexhaustive.stderr b/src/test/ui/structs/struct-like-enum-nonexhaustive.stderr index 56dbf0c93baf0..d651ea0b4e2d7 100644 --- a/src/test/ui/structs/struct-like-enum-nonexhaustive.stderr +++ b/src/test/ui/structs/struct-like-enum-nonexhaustive.stderr @@ -1,5 +1,5 @@ error[E0004]: non-exhaustive patterns: `B { x: Some(_) }` not covered - --> $DIR/struct-like-enum-nonexhaustive.rs:18:11 + --> $DIR/struct-like-enum-nonexhaustive.rs:8:11 | LL | match x { //~ ERROR non-exhaustive patterns | ^ pattern `B { x: Some(_) }` not covered diff --git a/src/test/ui/structs/struct-missing-comma.rs b/src/test/ui/structs/struct-missing-comma.rs index 87ae8ab26051a..e07080f609f92 100644 --- a/src/test/ui/structs/struct-missing-comma.rs +++ b/src/test/ui/structs/struct-missing-comma.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only // Issue #50636 diff --git a/src/test/ui/structs/struct-missing-comma.stderr b/src/test/ui/structs/struct-missing-comma.stderr index 28283bfb71364..a941c5bf1ab19 100644 --- a/src/test/ui/structs/struct-missing-comma.stderr +++ b/src/test/ui/structs/struct-missing-comma.stderr @@ -1,5 +1,5 @@ error: expected `,`, or `}`, found `bar` - --> $DIR/struct-missing-comma.rs:16:13 + --> $DIR/struct-missing-comma.rs:6:13 | LL | foo: u32 //~ expected `,`, or `}`, found `bar` | ^ help: try adding a comma: `,` diff --git a/src/test/ui/structs/struct-pat-derived-error.rs b/src/test/ui/structs/struct-pat-derived-error.rs index d3130c4e831f6..4ca8137c3ce7c 100644 --- a/src/test/ui/structs/struct-pat-derived-error.rs +++ b/src/test/ui/structs/struct-pat-derived-error.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct a { b: usize, c: usize diff --git a/src/test/ui/structs/struct-pat-derived-error.stderr b/src/test/ui/structs/struct-pat-derived-error.stderr index 68b71efc106c2..f2115a9ccf750 100644 --- a/src/test/ui/structs/struct-pat-derived-error.stderr +++ b/src/test/ui/structs/struct-pat-derived-error.stderr @@ -1,17 +1,17 @@ error[E0609]: no field `d` on type `&a` - --> $DIR/struct-pat-derived-error.rs:18:31 + --> $DIR/struct-pat-derived-error.rs:8:31 | LL | let a { x, y } = self.d; //~ ERROR no field `d` on type `&a` | ^ error[E0026]: struct `a` does not have fields named `x`, `y` - --> $DIR/struct-pat-derived-error.rs:18:17 + --> $DIR/struct-pat-derived-error.rs:8:17 | LL | let a { x, y } = self.d; //~ ERROR no field `d` on type `&a` | ^ ^ struct `a` does not have these fields error[E0027]: pattern does not mention fields `b`, `c` - --> $DIR/struct-pat-derived-error.rs:18:13 + --> $DIR/struct-pat-derived-error.rs:8:13 | LL | let a { x, y } = self.d; //~ ERROR no field `d` on type `&a` | ^^^^^^^^^^ missing fields `b`, `c` diff --git a/src/test/ui/structs/struct-path-alias-bounds.rs b/src/test/ui/structs/struct-path-alias-bounds.rs index 1b6e51e37034e..ae6ca8082692b 100644 --- a/src/test/ui/structs/struct-path-alias-bounds.rs +++ b/src/test/ui/structs/struct-path-alias-bounds.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // issue #36286 struct S { a: T } diff --git a/src/test/ui/structs/struct-path-alias-bounds.stderr b/src/test/ui/structs/struct-path-alias-bounds.stderr index f8e2fe1410f6c..70eb2610ea5d2 100644 --- a/src/test/ui/structs/struct-path-alias-bounds.stderr +++ b/src/test/ui/structs/struct-path-alias-bounds.stderr @@ -1,11 +1,11 @@ error[E0277]: the trait bound `NoClone: std::clone::Clone` is not satisfied - --> $DIR/struct-path-alias-bounds.rs:19:13 + --> $DIR/struct-path-alias-bounds.rs:9:13 | LL | let s = A { a: NoClone }; | ^ the trait `std::clone::Clone` is not implemented for `NoClone` | note: required by `S` - --> $DIR/struct-path-alias-bounds.rs:13:1 + --> $DIR/struct-path-alias-bounds.rs:3:1 | LL | struct S { a: T } | ^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/structs/struct-path-associated-type.rs b/src/test/ui/structs/struct-path-associated-type.rs index 660ac44ce0b53..1cafe265b2e0e 100644 --- a/src/test/ui/structs/struct-path-associated-type.rs +++ b/src/test/ui/structs/struct-path-associated-type.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S; trait Tr { diff --git a/src/test/ui/structs/struct-path-associated-type.stderr b/src/test/ui/structs/struct-path-associated-type.stderr index 1364b2a6b0c86..999be2b386696 100644 --- a/src/test/ui/structs/struct-path-associated-type.stderr +++ b/src/test/ui/structs/struct-path-associated-type.stderr @@ -1,35 +1,35 @@ error[E0071]: expected struct, variant or union type, found associated type - --> $DIR/struct-path-associated-type.rs:22:13 + --> $DIR/struct-path-associated-type.rs:12:13 | LL | let s = T::A {}; | ^^^^ not a struct error[E0109]: type parameters are not allowed on this type - --> $DIR/struct-path-associated-type.rs:24:20 + --> $DIR/struct-path-associated-type.rs:14:20 | LL | let z = T::A:: {}; | ^^ type parameter not allowed error[E0071]: expected struct, variant or union type, found associated type - --> $DIR/struct-path-associated-type.rs:24:13 + --> $DIR/struct-path-associated-type.rs:14:13 | LL | let z = T::A:: {}; | ^^^^^^^^^^ not a struct error[E0071]: expected struct, variant or union type, found associated type - --> $DIR/struct-path-associated-type.rs:28:9 + --> $DIR/struct-path-associated-type.rs:18:9 | LL | T::A {} => {} | ^^^^ not a struct error[E0109]: type parameters are not allowed on this type - --> $DIR/struct-path-associated-type.rs:35:20 + --> $DIR/struct-path-associated-type.rs:25:20 | LL | let z = T::A:: {}; //~ ERROR type parameters are not allowed on this type | ^^ type parameter not allowed error[E0223]: ambiguous associated type - --> $DIR/struct-path-associated-type.rs:42:13 + --> $DIR/struct-path-associated-type.rs:32:13 | LL | let s = S::A {}; //~ ERROR ambiguous associated type | ^^^^ ambiguous associated type @@ -37,13 +37,13 @@ LL | let s = S::A {}; //~ ERROR ambiguous associated type = note: specify the type using the syntax `::A` error[E0109]: type parameters are not allowed on this type - --> $DIR/struct-path-associated-type.rs:43:20 + --> $DIR/struct-path-associated-type.rs:33:20 | LL | let z = S::A:: {}; //~ ERROR ambiguous associated type | ^^ type parameter not allowed error[E0223]: ambiguous associated type - --> $DIR/struct-path-associated-type.rs:43:13 + --> $DIR/struct-path-associated-type.rs:33:13 | LL | let z = S::A:: {}; //~ ERROR ambiguous associated type | ^^^^^^^^^^ ambiguous associated type @@ -51,7 +51,7 @@ LL | let z = S::A:: {}; //~ ERROR ambiguous associated type = note: specify the type using the syntax `::A` error[E0223]: ambiguous associated type - --> $DIR/struct-path-associated-type.rs:46:9 + --> $DIR/struct-path-associated-type.rs:36:9 | LL | S::A {} => {} //~ ERROR ambiguous associated type | ^^^^ ambiguous associated type diff --git a/src/test/ui/structs/struct-path-self-type-mismatch.rs b/src/test/ui/structs/struct-path-self-type-mismatch.rs index e966ea6590254..c0c557ecace87 100644 --- a/src/test/ui/structs/struct-path-self-type-mismatch.rs +++ b/src/test/ui/structs/struct-path-self-type-mismatch.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { inner: A } trait Bar { fn bar(); } diff --git a/src/test/ui/structs/struct-path-self-type-mismatch.stderr b/src/test/ui/structs/struct-path-self-type-mismatch.stderr index cfba3be613060..0b1b1e83400a5 100644 --- a/src/test/ui/structs/struct-path-self-type-mismatch.stderr +++ b/src/test/ui/structs/struct-path-self-type-mismatch.stderr @@ -1,11 +1,11 @@ error[E0308]: mismatched types - --> $DIR/struct-path-self-type-mismatch.rs:17:23 + --> $DIR/struct-path-self-type-mismatch.rs:7:23 | LL | Self { inner: 1.5f32 }; //~ ERROR mismatched types | ^^^^^^ expected i32, found f32 error[E0308]: mismatched types - --> $DIR/struct-path-self-type-mismatch.rs:25:20 + --> $DIR/struct-path-self-type-mismatch.rs:15:20 | LL | inner: u | ^ expected type parameter, found a different type parameter @@ -14,7 +14,7 @@ LL | inner: u found type `U` error[E0308]: mismatched types - --> $DIR/struct-path-self-type-mismatch.rs:23:9 + --> $DIR/struct-path-self-type-mismatch.rs:13:9 | LL | fn new(u: U) -> Foo { | ------ expected `Foo` because of return type diff --git a/src/test/ui/structs/struct-path-self.rs b/src/test/ui/structs/struct-path-self.rs index 067d6ac22dc6f..ccbf3db29b1d9 100644 --- a/src/test/ui/structs/struct-path-self.rs +++ b/src/test/ui/structs/struct-path-self.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S; trait Tr { diff --git a/src/test/ui/structs/struct-path-self.stderr b/src/test/ui/structs/struct-path-self.stderr index 1b5506072e81c..a1df1a0764ccb 100644 --- a/src/test/ui/structs/struct-path-self.stderr +++ b/src/test/ui/structs/struct-path-self.stderr @@ -1,35 +1,35 @@ error[E0071]: expected struct, variant or union type, found Self - --> $DIR/struct-path-self.rs:15:17 + --> $DIR/struct-path-self.rs:5:17 | LL | let s = Self {}; | ^^^^ not a struct error[E0109]: type parameters are not allowed on this type - --> $DIR/struct-path-self.rs:17:24 + --> $DIR/struct-path-self.rs:7:24 | LL | let z = Self:: {}; | ^^ type parameter not allowed error[E0071]: expected struct, variant or union type, found Self - --> $DIR/struct-path-self.rs:17:17 + --> $DIR/struct-path-self.rs:7:17 | LL | let z = Self:: {}; | ^^^^^^^^^^ not a struct error[E0071]: expected struct, variant or union type, found Self - --> $DIR/struct-path-self.rs:21:13 + --> $DIR/struct-path-self.rs:11:13 | LL | Self { .. } => {} | ^^^^ not a struct error[E0109]: type parameters are not allowed on this type - --> $DIR/struct-path-self.rs:30:24 + --> $DIR/struct-path-self.rs:20:24 | LL | let z = Self:: {}; //~ ERROR type parameters are not allowed on this type | ^^ type parameter not allowed error[E0109]: type parameters are not allowed on this type - --> $DIR/struct-path-self.rs:40:24 + --> $DIR/struct-path-self.rs:30:24 | LL | let z = Self:: {}; //~ ERROR type parameters are not allowed on this type | ^^ type parameter not allowed diff --git a/src/test/ui/structs/struct-pattern-match-useless.rs b/src/test/ui/structs/struct-pattern-match-useless.rs index dda30141b4a06..93f0a93176169 100644 --- a/src/test/ui/structs/struct-pattern-match-useless.rs +++ b/src/test/ui/structs/struct-pattern-match-useless.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(unreachable_patterns)] struct Foo { diff --git a/src/test/ui/structs/struct-pattern-match-useless.stderr b/src/test/ui/structs/struct-pattern-match-useless.stderr index 60f17d1d906d2..561964bcb24b6 100644 --- a/src/test/ui/structs/struct-pattern-match-useless.stderr +++ b/src/test/ui/structs/struct-pattern-match-useless.stderr @@ -1,11 +1,11 @@ error: unreachable pattern - --> $DIR/struct-pattern-match-useless.rs:22:9 + --> $DIR/struct-pattern-match-useless.rs:12:9 | LL | Foo { .. } => () //~ ERROR unreachable pattern | ^^^^^^^^^^ | note: lint level defined here - --> $DIR/struct-pattern-match-useless.rs:11:9 + --> $DIR/struct-pattern-match-useless.rs:1:9 | LL | #![deny(unreachable_patterns)] | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/structs/struct-variant-privacy-xc.rs b/src/test/ui/structs/struct-variant-privacy-xc.rs index 8507acd26cebe..10e9639096f0f 100644 --- a/src/test/ui/structs/struct-variant-privacy-xc.rs +++ b/src/test/ui/structs/struct-variant-privacy-xc.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:struct_variant_privacy.rs extern crate struct_variant_privacy; diff --git a/src/test/ui/structs/struct-variant-privacy-xc.stderr b/src/test/ui/structs/struct-variant-privacy-xc.stderr index 731d23e6a978d..58c3a604f4f8c 100644 --- a/src/test/ui/structs/struct-variant-privacy-xc.stderr +++ b/src/test/ui/structs/struct-variant-privacy-xc.stderr @@ -1,11 +1,11 @@ error[E0603]: enum `Bar` is private - --> $DIR/struct-variant-privacy-xc.rs:14:9 + --> $DIR/struct-variant-privacy-xc.rs:4:9 | LL | fn f(b: struct_variant_privacy::Bar) { //~ ERROR enum `Bar` is private | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0603]: enum `Bar` is private - --> $DIR/struct-variant-privacy-xc.rs:16:9 + --> $DIR/struct-variant-privacy-xc.rs:6:9 | LL | struct_variant_privacy::Bar::Baz { a: _a } => {} //~ ERROR enum `Bar` is private | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/structs/struct-variant-privacy.rs b/src/test/ui/structs/struct-variant-privacy.rs index 7de4ca62555a2..8355879e7d94d 100644 --- a/src/test/ui/structs/struct-variant-privacy.rs +++ b/src/test/ui/structs/struct-variant-privacy.rs @@ -1,12 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. mod foo { enum Bar { Baz { a: isize } diff --git a/src/test/ui/structs/struct-variant-privacy.stderr b/src/test/ui/structs/struct-variant-privacy.stderr index a82ac8ab31867..12a5a03cb7199 100644 --- a/src/test/ui/structs/struct-variant-privacy.stderr +++ b/src/test/ui/structs/struct-variant-privacy.stderr @@ -1,11 +1,11 @@ error[E0603]: enum `Bar` is private - --> $DIR/struct-variant-privacy.rs:16:9 + --> $DIR/struct-variant-privacy.rs:7:9 | LL | fn f(b: foo::Bar) { //~ ERROR enum `Bar` is private | ^^^^^^^^ error[E0603]: enum `Bar` is private - --> $DIR/struct-variant-privacy.rs:18:9 + --> $DIR/struct-variant-privacy.rs:9:9 | LL | foo::Bar::Baz { a: _a } => {} //~ ERROR enum `Bar` is private | ^^^^^^^^^^^^^ diff --git a/src/test/ui/structs/structure-constructor-type-mismatch.rs b/src/test/ui/structs/structure-constructor-type-mismatch.rs index 87fc5ba93aeb3..54319e1ea4fc4 100644 --- a/src/test/ui/structs/structure-constructor-type-mismatch.rs +++ b/src/test/ui/structs/structure-constructor-type-mismatch.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Point { x: T, y: T, diff --git a/src/test/ui/structs/structure-constructor-type-mismatch.stderr b/src/test/ui/structs/structure-constructor-type-mismatch.stderr index dfa219e0872ce..7d337e2a43581 100644 --- a/src/test/ui/structs/structure-constructor-type-mismatch.stderr +++ b/src/test/ui/structs/structure-constructor-type-mismatch.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/structure-constructor-type-mismatch.rs:27:12 + --> $DIR/structure-constructor-type-mismatch.rs:17:12 | LL | x: 1, | ^ @@ -11,7 +11,7 @@ LL | x: 1, found type `{integer}` error[E0308]: mismatched types - --> $DIR/structure-constructor-type-mismatch.rs:30:12 + --> $DIR/structure-constructor-type-mismatch.rs:20:12 | LL | y: 2, | ^ @@ -23,7 +23,7 @@ LL | y: 2, found type `{integer}` error[E0308]: mismatched types - --> $DIR/structure-constructor-type-mismatch.rs:36:12 + --> $DIR/structure-constructor-type-mismatch.rs:26:12 | LL | x: 3, | ^ @@ -35,7 +35,7 @@ LL | x: 3, found type `{integer}` error[E0308]: mismatched types - --> $DIR/structure-constructor-type-mismatch.rs:39:12 + --> $DIR/structure-constructor-type-mismatch.rs:29:12 | LL | y: 4, | ^ @@ -47,7 +47,7 @@ LL | y: 4, found type `{integer}` error[E0308]: mismatched types - --> $DIR/structure-constructor-type-mismatch.rs:45:12 + --> $DIR/structure-constructor-type-mismatch.rs:35:12 | LL | x: 5, | ^ @@ -59,7 +59,7 @@ LL | x: 5, found type `{integer}` error[E0308]: mismatched types - --> $DIR/structure-constructor-type-mismatch.rs:52:12 + --> $DIR/structure-constructor-type-mismatch.rs:42:12 | LL | x: 7, | ^ @@ -71,13 +71,13 @@ LL | x: 7, found type `{integer}` error[E0244]: wrong number of type arguments: expected 0, found 1 - --> $DIR/structure-constructor-type-mismatch.rs:58:24 + --> $DIR/structure-constructor-type-mismatch.rs:48:24 | LL | let pt3 = PointF:: { //~ ERROR wrong number of type arguments | ^^^ unexpected type argument error[E0308]: mismatched types - --> $DIR/structure-constructor-type-mismatch.rs:59:12 + --> $DIR/structure-constructor-type-mismatch.rs:49:12 | LL | x: 9, //~ ERROR mismatched types | ^ @@ -89,7 +89,7 @@ LL | x: 9, //~ ERROR mismatched types found type `{integer}` error[E0308]: mismatched types - --> $DIR/structure-constructor-type-mismatch.rs:60:12 + --> $DIR/structure-constructor-type-mismatch.rs:50:12 | LL | y: 10, //~ ERROR mismatched types | ^^ @@ -101,13 +101,13 @@ LL | y: 10, //~ ERROR mismatched types found type `{integer}` error[E0244]: wrong number of type arguments: expected 0, found 1 - --> $DIR/structure-constructor-type-mismatch.rs:64:18 + --> $DIR/structure-constructor-type-mismatch.rs:54:18 | LL | PointF:: { .. } => {} //~ ERROR wrong number of type arguments | ^^^ unexpected type argument error[E0308]: mismatched types - --> $DIR/structure-constructor-type-mismatch.rs:64:9 + --> $DIR/structure-constructor-type-mismatch.rs:54:9 | LL | PointF:: { .. } => {} //~ ERROR wrong number of type arguments | ^^^^^^^^^^^^^^^^^^^^ expected integral variable, found f32 @@ -116,7 +116,7 @@ LL | PointF:: { .. } => {} //~ ERROR wrong number of type arguments found type `Point` error[E0308]: mismatched types - --> $DIR/structure-constructor-type-mismatch.rs:69:9 + --> $DIR/structure-constructor-type-mismatch.rs:59:9 | LL | PointF { .. } => {} //~ ERROR mismatched types | ^^^^^^^^^^^^^ expected integral variable, found f32 @@ -125,7 +125,7 @@ LL | PointF { .. } => {} //~ ERROR mismatched types found type `Point` error[E0308]: mismatched types - --> $DIR/structure-constructor-type-mismatch.rs:77:9 + --> $DIR/structure-constructor-type-mismatch.rs:67:9 | LL | PairF:: { .. } => {} //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^^^ expected integral variable, found f32 diff --git a/src/test/ui/substs-ppaux.normal.stderr b/src/test/ui/substs-ppaux.normal.stderr index 9f87329fb34ed..fb9e49eb10f87 100644 --- a/src/test/ui/substs-ppaux.normal.stderr +++ b/src/test/ui/substs-ppaux.normal.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/substs-ppaux.rs:25:17 + --> $DIR/substs-ppaux.rs:16:17 | LL | let x: () = >::bar::<'static, char>; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected (), found fn item @@ -8,7 +8,7 @@ LL | let x: () = >::bar::<'static, char>; found type `fn() {>::bar::<'static, char>}` error[E0308]: mismatched types - --> $DIR/substs-ppaux.rs:34:17 + --> $DIR/substs-ppaux.rs:25:17 | LL | let x: () = >::bar::<'static, char>; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected (), found fn item @@ -17,7 +17,7 @@ LL | let x: () = >::bar::<'static, char>; found type `fn() {>::bar::<'static, char>}` error[E0308]: mismatched types - --> $DIR/substs-ppaux.rs:42:17 + --> $DIR/substs-ppaux.rs:33:17 | LL | let x: () = >::baz; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected (), found fn item @@ -26,7 +26,7 @@ LL | let x: () = >::baz; found type `fn() {>::baz}` error[E0308]: mismatched types - --> $DIR/substs-ppaux.rs:50:17 + --> $DIR/substs-ppaux.rs:41:17 | LL | let x: () = foo::<'static>; | ^^^^^^^^^^^^^^ expected (), found fn item @@ -35,7 +35,7 @@ LL | let x: () = foo::<'static>; found type `fn() {foo::<'static>}` error[E0277]: the size for values of type `str` cannot be known at compilation time - --> $DIR/substs-ppaux.rs:58:5 + --> $DIR/substs-ppaux.rs:49:5 | LL | >::bar; | ^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time @@ -44,7 +44,7 @@ LL | >::bar; = note: to learn more, visit = note: required because of the requirements on the impl of `Foo<'_, '_, u8>` for `str` note: required by `Foo::bar` - --> $DIR/substs-ppaux.rs:16:5 + --> $DIR/substs-ppaux.rs:7:5 | LL | fn bar<'a, T>() where T: 'a {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/substs-ppaux.rs b/src/test/ui/substs-ppaux.rs index d0e9a7f4a400d..7ad7ccb54448f 100644 --- a/src/test/ui/substs-ppaux.rs +++ b/src/test/ui/substs-ppaux.rs @@ -1,12 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // revisions: verbose normal // diff --git a/src/test/ui/substs-ppaux.verbose.stderr b/src/test/ui/substs-ppaux.verbose.stderr index 2daa960be3af8..77683c1d91678 100644 --- a/src/test/ui/substs-ppaux.verbose.stderr +++ b/src/test/ui/substs-ppaux.verbose.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/substs-ppaux.rs:25:17 + --> $DIR/substs-ppaux.rs:16:17 | LL | let x: () = >::bar::<'static, char>; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected (), found fn item @@ -8,7 +8,7 @@ LL | let x: () = >::bar::<'static, char>; found type `fn() {>::bar::}` error[E0308]: mismatched types - --> $DIR/substs-ppaux.rs:34:17 + --> $DIR/substs-ppaux.rs:25:17 | LL | let x: () = >::bar::<'static, char>; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected (), found fn item @@ -17,7 +17,7 @@ LL | let x: () = >::bar::<'static, char>; found type `fn() {>::bar::}` error[E0308]: mismatched types - --> $DIR/substs-ppaux.rs:42:17 + --> $DIR/substs-ppaux.rs:33:17 | LL | let x: () = >::baz; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected (), found fn item @@ -26,7 +26,7 @@ LL | let x: () = >::baz; found type `fn() {>::baz}` error[E0308]: mismatched types - --> $DIR/substs-ppaux.rs:50:17 + --> $DIR/substs-ppaux.rs:41:17 | LL | let x: () = foo::<'static>; | ^^^^^^^^^^^^^^ expected (), found fn item @@ -35,7 +35,7 @@ LL | let x: () = foo::<'static>; found type `fn() {foo::}` error[E0277]: the size for values of type `str` cannot be known at compilation time - --> $DIR/substs-ppaux.rs:58:5 + --> $DIR/substs-ppaux.rs:49:5 | LL | >::bar; | ^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time @@ -44,7 +44,7 @@ LL | >::bar; = note: to learn more, visit = note: required because of the requirements on the impl of `Foo<'_#0r, '_#1r, u8>` for `str` note: required by `Foo::bar` - --> $DIR/substs-ppaux.rs:16:5 + --> $DIR/substs-ppaux.rs:7:5 | LL | fn bar<'a, T>() where T: 'a {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/suffixed-literal-meta.rs b/src/test/ui/suffixed-literal-meta.rs index 2e6c3994159cf..d2c51ebf8f76c 100644 --- a/src/test/ui/suffixed-literal-meta.rs +++ b/src/test/ui/suffixed-literal-meta.rs @@ -1,12 +1,4 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. +#![feature(attr_literals)] #[path = 1usize] //~ ERROR: suffixed literals are not allowed in attributes #[path = 1u8] //~ ERROR: suffixed literals are not allowed in attributes diff --git a/src/test/ui/suffixed-literal-meta.stderr b/src/test/ui/suffixed-literal-meta.stderr index 53ff60b0705e1..a0374c732b17b 100644 --- a/src/test/ui/suffixed-literal-meta.stderr +++ b/src/test/ui/suffixed-literal-meta.stderr @@ -1,5 +1,5 @@ error: suffixed literals are not allowed in attributes - --> $DIR/suffixed-literal-meta.rs:11:10 + --> $DIR/suffixed-literal-meta.rs:3:10 | LL | #[path = 1usize] //~ ERROR: suffixed literals are not allowed in attributes | ^^^^^^ @@ -7,7 +7,7 @@ LL | #[path = 1usize] //~ ERROR: suffixed literals are not allowed in attributes = help: instead of using a suffixed literal (1u8, 1.0f32, etc.), use an unsuffixed version (1, 1.0, etc.). error: suffixed literals are not allowed in attributes - --> $DIR/suffixed-literal-meta.rs:12:10 + --> $DIR/suffixed-literal-meta.rs:4:10 | LL | #[path = 1u8] //~ ERROR: suffixed literals are not allowed in attributes | ^^^ @@ -15,7 +15,7 @@ LL | #[path = 1u8] //~ ERROR: suffixed literals are not allowed in attributes = help: instead of using a suffixed literal (1u8, 1.0f32, etc.), use an unsuffixed version (1, 1.0, etc.). error: suffixed literals are not allowed in attributes - --> $DIR/suffixed-literal-meta.rs:13:10 + --> $DIR/suffixed-literal-meta.rs:5:10 | LL | #[path = 1u16] //~ ERROR: suffixed literals are not allowed in attributes | ^^^^ @@ -23,7 +23,7 @@ LL | #[path = 1u16] //~ ERROR: suffixed literals are not allowed in attributes = help: instead of using a suffixed literal (1u8, 1.0f32, etc.), use an unsuffixed version (1, 1.0, etc.). error: suffixed literals are not allowed in attributes - --> $DIR/suffixed-literal-meta.rs:14:10 + --> $DIR/suffixed-literal-meta.rs:6:10 | LL | #[path = 1u32] //~ ERROR: suffixed literals are not allowed in attributes | ^^^^ @@ -31,7 +31,7 @@ LL | #[path = 1u32] //~ ERROR: suffixed literals are not allowed in attributes = help: instead of using a suffixed literal (1u8, 1.0f32, etc.), use an unsuffixed version (1, 1.0, etc.). error: suffixed literals are not allowed in attributes - --> $DIR/suffixed-literal-meta.rs:15:10 + --> $DIR/suffixed-literal-meta.rs:7:10 | LL | #[path = 1u64] //~ ERROR: suffixed literals are not allowed in attributes | ^^^^ @@ -39,7 +39,7 @@ LL | #[path = 1u64] //~ ERROR: suffixed literals are not allowed in attributes = help: instead of using a suffixed literal (1u8, 1.0f32, etc.), use an unsuffixed version (1, 1.0, etc.). error: suffixed literals are not allowed in attributes - --> $DIR/suffixed-literal-meta.rs:16:10 + --> $DIR/suffixed-literal-meta.rs:8:10 | LL | #[path = 1isize] //~ ERROR: suffixed literals are not allowed in attributes | ^^^^^^ @@ -47,7 +47,7 @@ LL | #[path = 1isize] //~ ERROR: suffixed literals are not allowed in attributes = help: instead of using a suffixed literal (1u8, 1.0f32, etc.), use an unsuffixed version (1, 1.0, etc.). error: suffixed literals are not allowed in attributes - --> $DIR/suffixed-literal-meta.rs:17:10 + --> $DIR/suffixed-literal-meta.rs:9:10 | LL | #[path = 1i8] //~ ERROR: suffixed literals are not allowed in attributes | ^^^ @@ -55,7 +55,7 @@ LL | #[path = 1i8] //~ ERROR: suffixed literals are not allowed in attributes = help: instead of using a suffixed literal (1u8, 1.0f32, etc.), use an unsuffixed version (1, 1.0, etc.). error: suffixed literals are not allowed in attributes - --> $DIR/suffixed-literal-meta.rs:18:10 + --> $DIR/suffixed-literal-meta.rs:10:10 | LL | #[path = 1i16] //~ ERROR: suffixed literals are not allowed in attributes | ^^^^ @@ -63,7 +63,7 @@ LL | #[path = 1i16] //~ ERROR: suffixed literals are not allowed in attributes = help: instead of using a suffixed literal (1u8, 1.0f32, etc.), use an unsuffixed version (1, 1.0, etc.). error: suffixed literals are not allowed in attributes - --> $DIR/suffixed-literal-meta.rs:19:10 + --> $DIR/suffixed-literal-meta.rs:11:10 | LL | #[path = 1i32] //~ ERROR: suffixed literals are not allowed in attributes | ^^^^ @@ -71,7 +71,7 @@ LL | #[path = 1i32] //~ ERROR: suffixed literals are not allowed in attributes = help: instead of using a suffixed literal (1u8, 1.0f32, etc.), use an unsuffixed version (1, 1.0, etc.). error: suffixed literals are not allowed in attributes - --> $DIR/suffixed-literal-meta.rs:20:10 + --> $DIR/suffixed-literal-meta.rs:12:10 | LL | #[path = 1i64] //~ ERROR: suffixed literals are not allowed in attributes | ^^^^ @@ -79,7 +79,7 @@ LL | #[path = 1i64] //~ ERROR: suffixed literals are not allowed in attributes = help: instead of using a suffixed literal (1u8, 1.0f32, etc.), use an unsuffixed version (1, 1.0, etc.). error: suffixed literals are not allowed in attributes - --> $DIR/suffixed-literal-meta.rs:21:10 + --> $DIR/suffixed-literal-meta.rs:13:10 | LL | #[path = 1.0f32] //~ ERROR: suffixed literals are not allowed in attributes | ^^^^^^ @@ -87,7 +87,7 @@ LL | #[path = 1.0f32] //~ ERROR: suffixed literals are not allowed in attributes = help: instead of using a suffixed literal (1u8, 1.0f32, etc.), use an unsuffixed version (1, 1.0, etc.). error: suffixed literals are not allowed in attributes - --> $DIR/suffixed-literal-meta.rs:22:10 + --> $DIR/suffixed-literal-meta.rs:14:10 | LL | #[path = 1.0f64] //~ ERROR: suffixed literals are not allowed in attributes | ^^^^^^ diff --git a/src/test/ui/suggestions/auxiliary/struct_field_privacy.rs b/src/test/ui/suggestions/auxiliary/struct_field_privacy.rs index 5fea97da03ee3..9765af1a7f652 100644 --- a/src/test/ui/suggestions/auxiliary/struct_field_privacy.rs +++ b/src/test/ui/suggestions/auxiliary/struct_field_privacy.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct A { a: isize, pub b: isize, diff --git a/src/test/ui/suggestions/dont-suggest-ref/duplicate-suggestions.rs b/src/test/ui/suggestions/dont-suggest-ref/duplicate-suggestions.rs index dc0186e3f26bf..4faede353059a 100644 --- a/src/test/ui/suggestions/dont-suggest-ref/duplicate-suggestions.rs +++ b/src/test/ui/suggestions/dont-suggest-ref/duplicate-suggestions.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] #[derive(Clone)] diff --git a/src/test/ui/suggestions/dont-suggest-ref/duplicate-suggestions.stderr b/src/test/ui/suggestions/dont-suggest-ref/duplicate-suggestions.stderr index bb3688411f718..4b51294f86a0f 100644 --- a/src/test/ui/suggestions/dont-suggest-ref/duplicate-suggestions.stderr +++ b/src/test/ui/suggestions/dont-suggest-ref/duplicate-suggestions.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/duplicate-suggestions.rs:51:27 + --> $DIR/duplicate-suggestions.rs:41:27 | LL | let &(X(_t), X(_u)) = &(x.clone(), x.clone()); | --------------- ^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of borrowed content @@ -9,13 +9,13 @@ LL | let &(X(_t), X(_u)) = &(x.clone(), x.clone()); | help: consider removing the `&`: `(X(_t), X(_u))` | note: move occurs because these variables have types that don't implement the `Copy` trait - --> $DIR/duplicate-suggestions.rs:51:13 + --> $DIR/duplicate-suggestions.rs:41:13 | LL | let &(X(_t), X(_u)) = &(x.clone(), x.clone()); | ^^ ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/duplicate-suggestions.rs:55:50 + --> $DIR/duplicate-suggestions.rs:45:50 | LL | if let &(Either::One(_t), Either::Two(_u)) = &(e.clone(), e.clone()) { } | ----------------------------------- ^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of borrowed content @@ -25,13 +25,13 @@ LL | if let &(Either::One(_t), Either::Two(_u)) = &(e.clone(), e.clone()) { | help: consider removing the `&`: `(Either::One(_t), Either::Two(_u))` | note: move occurs because these variables have types that don't implement the `Copy` trait - --> $DIR/duplicate-suggestions.rs:55:26 + --> $DIR/duplicate-suggestions.rs:45:26 | LL | if let &(Either::One(_t), Either::Two(_u)) = &(e.clone(), e.clone()) { } | ^^ ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/duplicate-suggestions.rs:59:53 + --> $DIR/duplicate-suggestions.rs:49:53 | LL | while let &(Either::One(_t), Either::Two(_u)) = &(e.clone(), e.clone()) { } | ----------------------------------- ^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of borrowed content @@ -41,13 +41,13 @@ LL | while let &(Either::One(_t), Either::Two(_u)) = &(e.clone(), e.clone()) | help: consider removing the `&`: `(Either::One(_t), Either::Two(_u))` | note: move occurs because these variables have types that don't implement the `Copy` trait - --> $DIR/duplicate-suggestions.rs:59:29 + --> $DIR/duplicate-suggestions.rs:49:29 | LL | while let &(Either::One(_t), Either::Two(_u)) = &(e.clone(), e.clone()) { } | ^^ ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/duplicate-suggestions.rs:63:11 + --> $DIR/duplicate-suggestions.rs:53:11 | LL | match &(e.clone(), e.clone()) { | ^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of borrowed content @@ -61,7 +61,7 @@ LL | &(Either::Two(_t), Either::One(_u)) => (), | -- ...and here -- ...and here | note: move occurs because these variables have types that don't implement the `Copy` trait - --> $DIR/duplicate-suggestions.rs:65:23 + --> $DIR/duplicate-suggestions.rs:55:23 | LL | &(Either::One(_t), Either::Two(_u)) => (), | ^^ ^^ @@ -78,7 +78,7 @@ LL | (Either::Two(_t), Either::One(_u)) => (), | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0507]: cannot move out of borrowed content - --> $DIR/duplicate-suggestions.rs:73:11 + --> $DIR/duplicate-suggestions.rs:63:11 | LL | match &(e.clone(), e.clone()) { | ^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of borrowed content @@ -91,13 +91,13 @@ LL | &(Either::One(_t), Either::Two(_u)) | help: consider removing the `&`: `(Either::One(_t), Either::Two(_u))` | note: move occurs because these variables have types that don't implement the `Copy` trait - --> $DIR/duplicate-suggestions.rs:75:23 + --> $DIR/duplicate-suggestions.rs:65:23 | LL | &(Either::One(_t), Either::Two(_u)) | ^^ ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/duplicate-suggestions.rs:82:11 + --> $DIR/duplicate-suggestions.rs:72:11 | LL | match &(e.clone(), e.clone()) { | ^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of borrowed content @@ -110,13 +110,13 @@ LL | &(Either::One(_t), Either::Two(_u)) => (), | help: consider removing the `&`: `(Either::One(_t), Either::Two(_u))` | note: move occurs because these variables have types that don't implement the `Copy` trait - --> $DIR/duplicate-suggestions.rs:84:23 + --> $DIR/duplicate-suggestions.rs:74:23 | LL | &(Either::One(_t), Either::Two(_u)) => (), | ^^ ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/duplicate-suggestions.rs:90:11 + --> $DIR/duplicate-suggestions.rs:80:11 | LL | match &(e.clone(), e.clone()) { | ^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of borrowed content @@ -129,13 +129,13 @@ LL | &(Either::One(_t), Either::Two(_u)) => (), | help: consider removing the `&`: `(Either::One(_t), Either::Two(_u))` | note: move occurs because these variables have types that don't implement the `Copy` trait - --> $DIR/duplicate-suggestions.rs:92:23 + --> $DIR/duplicate-suggestions.rs:82:23 | LL | &(Either::One(_t), Either::Two(_u)) => (), | ^^ ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/duplicate-suggestions.rs:103:31 + --> $DIR/duplicate-suggestions.rs:93:31 | LL | let &mut (X(_t), X(_u)) = &mut (xm.clone(), xm.clone()); | ------------------- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of borrowed content @@ -145,13 +145,13 @@ LL | let &mut (X(_t), X(_u)) = &mut (xm.clone(), xm.clone()); | help: consider removing the `&mut`: `(X(_t), X(_u))` | note: move occurs because these variables have types that don't implement the `Copy` trait - --> $DIR/duplicate-suggestions.rs:103:17 + --> $DIR/duplicate-suggestions.rs:93:17 | LL | let &mut (X(_t), X(_u)) = &mut (xm.clone(), xm.clone()); | ^^ ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/duplicate-suggestions.rs:107:54 + --> $DIR/duplicate-suggestions.rs:97:54 | LL | if let &mut (Either::One(_t), Either::Two(_u)) = &mut (em.clone(), em.clone()) { } | --------------------------------------- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of borrowed content @@ -161,13 +161,13 @@ LL | if let &mut (Either::One(_t), Either::Two(_u)) = &mut (em.clone(), em.c | help: consider removing the `&mut`: `(Either::One(_t), Either::Two(_u))` | note: move occurs because these variables have types that don't implement the `Copy` trait - --> $DIR/duplicate-suggestions.rs:107:30 + --> $DIR/duplicate-suggestions.rs:97:30 | LL | if let &mut (Either::One(_t), Either::Two(_u)) = &mut (em.clone(), em.clone()) { } | ^^ ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/duplicate-suggestions.rs:111:57 + --> $DIR/duplicate-suggestions.rs:101:57 | LL | while let &mut (Either::One(_t), Either::Two(_u)) = &mut (em.clone(), em.clone()) { } | --------------------------------------- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of borrowed content @@ -177,13 +177,13 @@ LL | while let &mut (Either::One(_t), Either::Two(_u)) = &mut (em.clone(), e | help: consider removing the `&mut`: `(Either::One(_t), Either::Two(_u))` | note: move occurs because these variables have types that don't implement the `Copy` trait - --> $DIR/duplicate-suggestions.rs:111:33 + --> $DIR/duplicate-suggestions.rs:101:33 | LL | while let &mut (Either::One(_t), Either::Two(_u)) = &mut (em.clone(), em.clone()) { } | ^^ ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/duplicate-suggestions.rs:115:11 + --> $DIR/duplicate-suggestions.rs:105:11 | LL | match &mut (em.clone(), em.clone()) { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of borrowed content @@ -197,7 +197,7 @@ LL | &mut (Either::Two(_t), Either::One(_u)) => (), | -- ...and here -- ...and here | note: move occurs because these variables have types that don't implement the `Copy` trait - --> $DIR/duplicate-suggestions.rs:117:27 + --> $DIR/duplicate-suggestions.rs:107:27 | LL | &mut (Either::One(_t), Either::Two(_u)) => (), | ^^ ^^ @@ -214,7 +214,7 @@ LL | (Either::Two(_t), Either::One(_u)) => (), | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0507]: cannot move out of borrowed content - --> $DIR/duplicate-suggestions.rs:125:11 + --> $DIR/duplicate-suggestions.rs:115:11 | LL | match &mut (em.clone(), em.clone()) { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of borrowed content @@ -227,13 +227,13 @@ LL | &mut (Either::One(_t), Either::Two(_u)) | help: consider removing the `&mut`: `(Either::One(_t), Either::Two(_u))` | note: move occurs because these variables have types that don't implement the `Copy` trait - --> $DIR/duplicate-suggestions.rs:127:27 + --> $DIR/duplicate-suggestions.rs:117:27 | LL | &mut (Either::One(_t), Either::Two(_u)) | ^^ ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/duplicate-suggestions.rs:134:11 + --> $DIR/duplicate-suggestions.rs:124:11 | LL | match &mut (em.clone(), em.clone()) { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of borrowed content @@ -246,13 +246,13 @@ LL | &mut (Either::One(_t), Either::Two(_u)) => (), | help: consider removing the `&mut`: `(Either::One(_t), Either::Two(_u))` | note: move occurs because these variables have types that don't implement the `Copy` trait - --> $DIR/duplicate-suggestions.rs:136:27 + --> $DIR/duplicate-suggestions.rs:126:27 | LL | &mut (Either::One(_t), Either::Two(_u)) => (), | ^^ ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/duplicate-suggestions.rs:142:11 + --> $DIR/duplicate-suggestions.rs:132:11 | LL | match &mut (em.clone(), em.clone()) { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of borrowed content @@ -265,13 +265,13 @@ LL | &mut (Either::One(_t), Either::Two(_u)) => (), | help: consider removing the `&mut`: `(Either::One(_t), Either::Two(_u))` | note: move occurs because these variables have types that don't implement the `Copy` trait - --> $DIR/duplicate-suggestions.rs:144:27 + --> $DIR/duplicate-suggestions.rs:134:27 | LL | &mut (Either::One(_t), Either::Two(_u)) => (), | ^^ ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/duplicate-suggestions.rs:150:11 + --> $DIR/duplicate-suggestions.rs:140:11 | LL | match &mut (em.clone(), em.clone()) { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of borrowed content @@ -284,13 +284,13 @@ LL | &mut (Either::One(_t), Either::Two(_u)) => (), | help: consider removing the `&mut`: `(Either::One(_t), Either::Two(_u))` | note: move occurs because these variables have types that don't implement the `Copy` trait - --> $DIR/duplicate-suggestions.rs:152:27 + --> $DIR/duplicate-suggestions.rs:142:27 | LL | &mut (Either::One(_t), Either::Two(_u)) => (), | ^^ ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/duplicate-suggestions.rs:98:11 + --> $DIR/duplicate-suggestions.rs:88:11 | LL | fn f5(&(X(_t), X(_u)): &(X, X)) { } | ^^^^--^^^^^--^^ @@ -301,13 +301,13 @@ LL | fn f5(&(X(_t), X(_u)): &(X, X)) { } | help: consider removing the `&`: `(X(_t), X(_u))` | note: move occurs because these variables have types that don't implement the `Copy` trait - --> $DIR/duplicate-suggestions.rs:98:15 + --> $DIR/duplicate-suggestions.rs:88:15 | LL | fn f5(&(X(_t), X(_u)): &(X, X)) { } | ^^ ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/duplicate-suggestions.rs:158:11 + --> $DIR/duplicate-suggestions.rs:148:11 | LL | fn f6(&mut (X(_t), X(_u)): &mut (X, X)) { } | ^^^^^^^^--^^^^^--^^ @@ -318,7 +318,7 @@ LL | fn f6(&mut (X(_t), X(_u)): &mut (X, X)) { } | help: consider removing the `&mut`: `(X(_t), X(_u))` | note: move occurs because these variables have types that don't implement the `Copy` trait - --> $DIR/duplicate-suggestions.rs:158:19 + --> $DIR/duplicate-suggestions.rs:148:19 | LL | fn f6(&mut (X(_t), X(_u)): &mut (X, X)) { } | ^^ ^^ diff --git a/src/test/ui/suggestions/dont-suggest-ref/move-into-closure.rs b/src/test/ui/suggestions/dont-suggest-ref/move-into-closure.rs index 8cc847e693fa7..90a9fe4e7d06c 100644 --- a/src/test/ui/suggestions/dont-suggest-ref/move-into-closure.rs +++ b/src/test/ui/suggestions/dont-suggest-ref/move-into-closure.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] #[derive(Clone)] diff --git a/src/test/ui/suggestions/dont-suggest-ref/move-into-closure.stderr b/src/test/ui/suggestions/dont-suggest-ref/move-into-closure.stderr index 228ec5afce635..f1d515e932c60 100644 --- a/src/test/ui/suggestions/dont-suggest-ref/move-into-closure.stderr +++ b/src/test/ui/suggestions/dont-suggest-ref/move-into-closure.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of captured variable in an `Fn` closure - --> $DIR/move-into-closure.rs:40:21 + --> $DIR/move-into-closure.rs:30:21 | LL | let x = X(Y); | - captured outer variable @@ -12,13 +12,13 @@ LL | let X(_t) = x; | data moved here | note: move occurs because `_t` has type `Y`, which does not implement the `Copy` trait - --> $DIR/move-into-closure.rs:40:15 + --> $DIR/move-into-closure.rs:30:15 | LL | let X(_t) = x; | ^^ error[E0507]: cannot move out of captured variable in an `Fn` closure - --> $DIR/move-into-closure.rs:44:34 + --> $DIR/move-into-closure.rs:34:34 | LL | let e = Either::One(X(Y)); | - captured outer variable @@ -31,13 +31,13 @@ LL | if let Either::One(_t) = e { } | data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/move-into-closure.rs:44:28 + --> $DIR/move-into-closure.rs:34:28 | LL | if let Either::One(_t) = e { } | ^^ error[E0507]: cannot move out of captured variable in an `Fn` closure - --> $DIR/move-into-closure.rs:48:37 + --> $DIR/move-into-closure.rs:38:37 | LL | let e = Either::One(X(Y)); | - captured outer variable @@ -50,13 +50,13 @@ LL | while let Either::One(_t) = e { } | data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/move-into-closure.rs:48:31 + --> $DIR/move-into-closure.rs:38:31 | LL | while let Either::One(_t) = e { } | ^^ error[E0507]: cannot move out of captured variable in an `Fn` closure - --> $DIR/move-into-closure.rs:52:15 + --> $DIR/move-into-closure.rs:42:15 | LL | let e = Either::One(X(Y)); | - captured outer variable @@ -71,13 +71,13 @@ LL | Either::One(_t) | -- data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/move-into-closure.rs:56:25 + --> $DIR/move-into-closure.rs:46:25 | LL | Either::One(_t) | ^^ error[E0507]: cannot move out of captured variable in an `Fn` closure - --> $DIR/move-into-closure.rs:59:15 + --> $DIR/move-into-closure.rs:49:15 | LL | let e = Either::One(X(Y)); | - captured outer variable @@ -92,13 +92,13 @@ LL | Either::One(_t) => (), | -- data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/move-into-closure.rs:63:25 + --> $DIR/move-into-closure.rs:53:25 | LL | Either::One(_t) => (), | ^^ error[E0507]: cannot move out of captured variable in an `Fn` closure - --> $DIR/move-into-closure.rs:68:25 + --> $DIR/move-into-closure.rs:58:25 | LL | let x = X(Y); | - captured outer variable @@ -111,13 +111,13 @@ LL | let X(mut _t) = x; | data moved here | note: move occurs because `_t` has type `Y`, which does not implement the `Copy` trait - --> $DIR/move-into-closure.rs:68:15 + --> $DIR/move-into-closure.rs:58:15 | LL | let X(mut _t) = x; | ^^^^^^ error[E0507]: cannot move out of captured variable in an `Fn` closure - --> $DIR/move-into-closure.rs:72:38 + --> $DIR/move-into-closure.rs:62:38 | LL | let mut em = Either::One(X(Y)); | ------ captured outer variable @@ -130,13 +130,13 @@ LL | if let Either::One(mut _t) = em { } | data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/move-into-closure.rs:72:28 + --> $DIR/move-into-closure.rs:62:28 | LL | if let Either::One(mut _t) = em { } | ^^^^^^ error[E0507]: cannot move out of captured variable in an `Fn` closure - --> $DIR/move-into-closure.rs:76:41 + --> $DIR/move-into-closure.rs:66:41 | LL | let mut em = Either::One(X(Y)); | ------ captured outer variable @@ -149,13 +149,13 @@ LL | while let Either::One(mut _t) = em { } | data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/move-into-closure.rs:76:31 + --> $DIR/move-into-closure.rs:66:31 | LL | while let Either::One(mut _t) = em { } | ^^^^^^ error[E0507]: cannot move out of captured variable in an `Fn` closure - --> $DIR/move-into-closure.rs:80:15 + --> $DIR/move-into-closure.rs:70:15 | LL | let mut em = Either::One(X(Y)); | ------ captured outer variable @@ -170,13 +170,13 @@ LL | Either::One(mut _t) | ------ data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/move-into-closure.rs:84:25 + --> $DIR/move-into-closure.rs:74:25 | LL | Either::One(mut _t) | ^^^^^^ error[E0507]: cannot move out of captured variable in an `Fn` closure - --> $DIR/move-into-closure.rs:87:15 + --> $DIR/move-into-closure.rs:77:15 | LL | let mut em = Either::One(X(Y)); | ------ captured outer variable @@ -191,13 +191,13 @@ LL | Either::One(mut _t) => (), | ------ data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/move-into-closure.rs:91:25 + --> $DIR/move-into-closure.rs:81:25 | LL | Either::One(mut _t) => (), | ^^^^^^ error[E0507]: cannot move out of captured variable in an `FnMut` closure - --> $DIR/move-into-closure.rs:107:21 + --> $DIR/move-into-closure.rs:97:21 | LL | let x = X(Y); | - captured outer variable @@ -210,13 +210,13 @@ LL | let X(_t) = x; | data moved here | note: move occurs because `_t` has type `Y`, which does not implement the `Copy` trait - --> $DIR/move-into-closure.rs:107:15 + --> $DIR/move-into-closure.rs:97:15 | LL | let X(_t) = x; | ^^ error[E0507]: cannot move out of captured variable in an `FnMut` closure - --> $DIR/move-into-closure.rs:111:34 + --> $DIR/move-into-closure.rs:101:34 | LL | let e = Either::One(X(Y)); | - captured outer variable @@ -229,13 +229,13 @@ LL | if let Either::One(_t) = e { } | data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/move-into-closure.rs:111:28 + --> $DIR/move-into-closure.rs:101:28 | LL | if let Either::One(_t) = e { } | ^^ error[E0507]: cannot move out of captured variable in an `FnMut` closure - --> $DIR/move-into-closure.rs:115:37 + --> $DIR/move-into-closure.rs:105:37 | LL | let e = Either::One(X(Y)); | - captured outer variable @@ -248,13 +248,13 @@ LL | while let Either::One(_t) = e { } | data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/move-into-closure.rs:115:31 + --> $DIR/move-into-closure.rs:105:31 | LL | while let Either::One(_t) = e { } | ^^ error[E0507]: cannot move out of captured variable in an `FnMut` closure - --> $DIR/move-into-closure.rs:119:15 + --> $DIR/move-into-closure.rs:109:15 | LL | let e = Either::One(X(Y)); | - captured outer variable @@ -269,13 +269,13 @@ LL | Either::One(_t) | -- data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/move-into-closure.rs:123:25 + --> $DIR/move-into-closure.rs:113:25 | LL | Either::One(_t) | ^^ error[E0507]: cannot move out of captured variable in an `FnMut` closure - --> $DIR/move-into-closure.rs:126:15 + --> $DIR/move-into-closure.rs:116:15 | LL | let e = Either::One(X(Y)); | - captured outer variable @@ -290,13 +290,13 @@ LL | Either::One(_t) => (), | -- data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/move-into-closure.rs:130:25 + --> $DIR/move-into-closure.rs:120:25 | LL | Either::One(_t) => (), | ^^ error[E0507]: cannot move out of captured variable in an `FnMut` closure - --> $DIR/move-into-closure.rs:135:25 + --> $DIR/move-into-closure.rs:125:25 | LL | let x = X(Y); | - captured outer variable @@ -309,13 +309,13 @@ LL | let X(mut _t) = x; | data moved here | note: move occurs because `_t` has type `Y`, which does not implement the `Copy` trait - --> $DIR/move-into-closure.rs:135:15 + --> $DIR/move-into-closure.rs:125:15 | LL | let X(mut _t) = x; | ^^^^^^ error[E0507]: cannot move out of captured variable in an `FnMut` closure - --> $DIR/move-into-closure.rs:139:38 + --> $DIR/move-into-closure.rs:129:38 | LL | let mut em = Either::One(X(Y)); | ------ captured outer variable @@ -328,13 +328,13 @@ LL | if let Either::One(mut _t) = em { } | data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/move-into-closure.rs:139:28 + --> $DIR/move-into-closure.rs:129:28 | LL | if let Either::One(mut _t) = em { } | ^^^^^^ error[E0507]: cannot move out of captured variable in an `FnMut` closure - --> $DIR/move-into-closure.rs:143:41 + --> $DIR/move-into-closure.rs:133:41 | LL | let mut em = Either::One(X(Y)); | ------ captured outer variable @@ -347,13 +347,13 @@ LL | while let Either::One(mut _t) = em { } | data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/move-into-closure.rs:143:31 + --> $DIR/move-into-closure.rs:133:31 | LL | while let Either::One(mut _t) = em { } | ^^^^^^ error[E0507]: cannot move out of captured variable in an `FnMut` closure - --> $DIR/move-into-closure.rs:147:15 + --> $DIR/move-into-closure.rs:137:15 | LL | let mut em = Either::One(X(Y)); | ------ captured outer variable @@ -368,13 +368,13 @@ LL | Either::One(mut _t) | ------ data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/move-into-closure.rs:151:25 + --> $DIR/move-into-closure.rs:141:25 | LL | Either::One(mut _t) | ^^^^^^ error[E0507]: cannot move out of captured variable in an `FnMut` closure - --> $DIR/move-into-closure.rs:154:15 + --> $DIR/move-into-closure.rs:144:15 | LL | let mut em = Either::One(X(Y)); | ------ captured outer variable @@ -389,13 +389,13 @@ LL | Either::One(mut _t) => (), | ------ data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/move-into-closure.rs:158:25 + --> $DIR/move-into-closure.rs:148:25 | LL | Either::One(mut _t) => (), | ^^^^^^ error[E0507]: cannot move out of captured variable in an `FnMut` closure - --> $DIR/move-into-closure.rs:162:15 + --> $DIR/move-into-closure.rs:152:15 | LL | let mut em = Either::One(X(Y)); | ------ captured outer variable @@ -410,7 +410,7 @@ LL | Either::One(mut _t) => (), | ------ data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/move-into-closure.rs:166:25 + --> $DIR/move-into-closure.rs:156:25 | LL | Either::One(mut _t) => (), | ^^^^^^ diff --git a/src/test/ui/suggestions/dont-suggest-ref/simple.rs b/src/test/ui/suggestions/dont-suggest-ref/simple.rs index 474e88c4d5395..58aab85ac2673 100644 --- a/src/test/ui/suggestions/dont-suggest-ref/simple.rs +++ b/src/test/ui/suggestions/dont-suggest-ref/simple.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] #[derive(Clone)] diff --git a/src/test/ui/suggestions/dont-suggest-ref/simple.stderr b/src/test/ui/suggestions/dont-suggest-ref/simple.stderr index d7a32dbfcc643..296fcef0c4a30 100644 --- a/src/test/ui/suggestions/dont-suggest-ref/simple.stderr +++ b/src/test/ui/suggestions/dont-suggest-ref/simple.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:50:17 + --> $DIR/simple.rs:40:17 | LL | let X(_t) = *s; | -- ^^ @@ -9,13 +9,13 @@ LL | let X(_t) = *s; | data moved here | note: move occurs because `_t` has type `Y`, which does not implement the `Copy` trait - --> $DIR/simple.rs:50:11 + --> $DIR/simple.rs:40:11 | LL | let X(_t) = *s; | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:54:30 + --> $DIR/simple.rs:44:30 | LL | if let Either::One(_t) = *r { } | -- ^^ @@ -25,13 +25,13 @@ LL | if let Either::One(_t) = *r { } | data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:54:24 + --> $DIR/simple.rs:44:24 | LL | if let Either::One(_t) = *r { } | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:58:33 + --> $DIR/simple.rs:48:33 | LL | while let Either::One(_t) = *r { } | -- ^^ @@ -41,13 +41,13 @@ LL | while let Either::One(_t) = *r { } | data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:58:27 + --> $DIR/simple.rs:48:27 | LL | while let Either::One(_t) = *r { } | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:62:11 + --> $DIR/simple.rs:52:11 | LL | match *r { | ^^ @@ -59,13 +59,13 @@ LL | Either::One(_t) | -- data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:66:21 + --> $DIR/simple.rs:56:21 | LL | Either::One(_t) | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:69:11 + --> $DIR/simple.rs:59:11 | LL | match *r { | ^^ @@ -77,13 +77,13 @@ LL | Either::One(_t) => (), | -- data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:73:21 + --> $DIR/simple.rs:63:21 | LL | Either::One(_t) => (), | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:78:17 + --> $DIR/simple.rs:68:17 | LL | let X(_t) = *sm; | -- ^^^ @@ -93,13 +93,13 @@ LL | let X(_t) = *sm; | data moved here | note: move occurs because `_t` has type `Y`, which does not implement the `Copy` trait - --> $DIR/simple.rs:78:11 + --> $DIR/simple.rs:68:11 | LL | let X(_t) = *sm; | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:82:30 + --> $DIR/simple.rs:72:30 | LL | if let Either::One(_t) = *rm { } | -- ^^^ @@ -109,13 +109,13 @@ LL | if let Either::One(_t) = *rm { } | data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:82:24 + --> $DIR/simple.rs:72:24 | LL | if let Either::One(_t) = *rm { } | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:86:33 + --> $DIR/simple.rs:76:33 | LL | while let Either::One(_t) = *rm { } | -- ^^^ @@ -125,13 +125,13 @@ LL | while let Either::One(_t) = *rm { } | data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:86:27 + --> $DIR/simple.rs:76:27 | LL | while let Either::One(_t) = *rm { } | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:90:11 + --> $DIR/simple.rs:80:11 | LL | match *rm { | ^^^ @@ -143,13 +143,13 @@ LL | Either::One(_t) | -- data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:94:21 + --> $DIR/simple.rs:84:21 | LL | Either::One(_t) | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:97:11 + --> $DIR/simple.rs:87:11 | LL | match *rm { | ^^^ @@ -161,13 +161,13 @@ LL | Either::One(_t) => (), | -- data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:101:21 + --> $DIR/simple.rs:91:21 | LL | Either::One(_t) => (), | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:105:11 + --> $DIR/simple.rs:95:11 | LL | match *rm { | ^^^ @@ -179,13 +179,13 @@ LL | Either::One(_t) => (), | -- data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:109:21 + --> $DIR/simple.rs:99:21 | LL | Either::One(_t) => (), | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:114:17 + --> $DIR/simple.rs:104:17 | LL | let X(_t) = vs[0]; | -- ^^^^^ @@ -195,13 +195,13 @@ LL | let X(_t) = vs[0]; | data moved here | note: move occurs because `_t` has type `Y`, which does not implement the `Copy` trait - --> $DIR/simple.rs:114:11 + --> $DIR/simple.rs:104:11 | LL | let X(_t) = vs[0]; | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:118:30 + --> $DIR/simple.rs:108:30 | LL | if let Either::One(_t) = vr[0] { } | -- ^^^^^ @@ -211,13 +211,13 @@ LL | if let Either::One(_t) = vr[0] { } | data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:118:24 + --> $DIR/simple.rs:108:24 | LL | if let Either::One(_t) = vr[0] { } | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:122:33 + --> $DIR/simple.rs:112:33 | LL | while let Either::One(_t) = vr[0] { } | -- ^^^^^ @@ -227,13 +227,13 @@ LL | while let Either::One(_t) = vr[0] { } | data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:122:27 + --> $DIR/simple.rs:112:27 | LL | while let Either::One(_t) = vr[0] { } | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:126:11 + --> $DIR/simple.rs:116:11 | LL | match vr[0] { | ^^^^^ @@ -245,13 +245,13 @@ LL | Either::One(_t) | -- data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:130:21 + --> $DIR/simple.rs:120:21 | LL | Either::One(_t) | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:133:11 + --> $DIR/simple.rs:123:11 | LL | match vr[0] { | ^^^^^ @@ -263,13 +263,13 @@ LL | Either::One(_t) => (), | -- data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:137:21 + --> $DIR/simple.rs:127:21 | LL | Either::One(_t) => (), | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:142:17 + --> $DIR/simple.rs:132:17 | LL | let X(_t) = vsm[0]; | -- ^^^^^^ @@ -279,13 +279,13 @@ LL | let X(_t) = vsm[0]; | data moved here | note: move occurs because `_t` has type `Y`, which does not implement the `Copy` trait - --> $DIR/simple.rs:142:11 + --> $DIR/simple.rs:132:11 | LL | let X(_t) = vsm[0]; | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:146:30 + --> $DIR/simple.rs:136:30 | LL | if let Either::One(_t) = vrm[0] { } | -- ^^^^^^ @@ -295,13 +295,13 @@ LL | if let Either::One(_t) = vrm[0] { } | data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:146:24 + --> $DIR/simple.rs:136:24 | LL | if let Either::One(_t) = vrm[0] { } | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:150:33 + --> $DIR/simple.rs:140:33 | LL | while let Either::One(_t) = vrm[0] { } | -- ^^^^^^ @@ -311,13 +311,13 @@ LL | while let Either::One(_t) = vrm[0] { } | data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:150:27 + --> $DIR/simple.rs:140:27 | LL | while let Either::One(_t) = vrm[0] { } | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:154:11 + --> $DIR/simple.rs:144:11 | LL | match vrm[0] { | ^^^^^^ @@ -329,13 +329,13 @@ LL | Either::One(_t) | -- data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:158:21 + --> $DIR/simple.rs:148:21 | LL | Either::One(_t) | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:161:11 + --> $DIR/simple.rs:151:11 | LL | match vrm[0] { | ^^^^^^ @@ -347,13 +347,13 @@ LL | Either::One(_t) => (), | -- data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:165:21 + --> $DIR/simple.rs:155:21 | LL | Either::One(_t) => (), | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:169:11 + --> $DIR/simple.rs:159:11 | LL | match vrm[0] { | ^^^^^^ @@ -365,13 +365,13 @@ LL | Either::One(_t) => (), | -- data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:173:21 + --> $DIR/simple.rs:163:21 | LL | Either::One(_t) => (), | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:180:18 + --> $DIR/simple.rs:170:18 | LL | let &X(_t) = s; | ------ ^ cannot move out of borrowed content @@ -380,13 +380,13 @@ LL | let &X(_t) = s; | help: consider removing the `&`: `X(_t)` | note: move occurs because `_t` has type `Y`, which does not implement the `Copy` trait - --> $DIR/simple.rs:180:12 + --> $DIR/simple.rs:170:12 | LL | let &X(_t) = s; | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:184:31 + --> $DIR/simple.rs:174:31 | LL | if let &Either::One(_t) = r { } | ---------------- ^ cannot move out of borrowed content @@ -395,13 +395,13 @@ LL | if let &Either::One(_t) = r { } | help: consider removing the `&`: `Either::One(_t)` | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:184:25 + --> $DIR/simple.rs:174:25 | LL | if let &Either::One(_t) = r { } | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:188:34 + --> $DIR/simple.rs:178:34 | LL | while let &Either::One(_t) = r { } | ---------------- ^ cannot move out of borrowed content @@ -410,13 +410,13 @@ LL | while let &Either::One(_t) = r { } | help: consider removing the `&`: `Either::One(_t)` | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:188:28 + --> $DIR/simple.rs:178:28 | LL | while let &Either::One(_t) = r { } | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:192:11 + --> $DIR/simple.rs:182:11 | LL | match r { | ^ cannot move out of borrowed content @@ -428,13 +428,13 @@ LL | &Either::One(_t) | help: consider removing the `&`: `Either::One(_t)` | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:194:22 + --> $DIR/simple.rs:184:22 | LL | &Either::One(_t) | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:200:11 + --> $DIR/simple.rs:190:11 | LL | match r { | ^ cannot move out of borrowed content @@ -446,13 +446,13 @@ LL | &Either::One(_t) => (), | help: consider removing the `&`: `Either::One(_t)` | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:202:22 + --> $DIR/simple.rs:192:22 | LL | &Either::One(_t) => (), | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:207:11 + --> $DIR/simple.rs:197:11 | LL | match r { | ^ cannot move out of borrowed content @@ -464,13 +464,13 @@ LL | &Either::One(_t) => (), | help: consider removing the `&`: `Either::One(_t)` | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:209:22 + --> $DIR/simple.rs:199:22 | LL | &Either::One(_t) => (), | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:219:22 + --> $DIR/simple.rs:209:22 | LL | let &mut X(_t) = sm; | ---------- ^^ cannot move out of borrowed content @@ -479,13 +479,13 @@ LL | let &mut X(_t) = sm; | help: consider removing the `&mut`: `X(_t)` | note: move occurs because `_t` has type `Y`, which does not implement the `Copy` trait - --> $DIR/simple.rs:219:16 + --> $DIR/simple.rs:209:16 | LL | let &mut X(_t) = sm; | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:223:35 + --> $DIR/simple.rs:213:35 | LL | if let &mut Either::One(_t) = rm { } | -------------------- ^^ cannot move out of borrowed content @@ -494,13 +494,13 @@ LL | if let &mut Either::One(_t) = rm { } | help: consider removing the `&mut`: `Either::One(_t)` | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:223:29 + --> $DIR/simple.rs:213:29 | LL | if let &mut Either::One(_t) = rm { } | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:227:38 + --> $DIR/simple.rs:217:38 | LL | while let &mut Either::One(_t) = rm { } | -------------------- ^^ cannot move out of borrowed content @@ -509,13 +509,13 @@ LL | while let &mut Either::One(_t) = rm { } | help: consider removing the `&mut`: `Either::One(_t)` | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:227:32 + --> $DIR/simple.rs:217:32 | LL | while let &mut Either::One(_t) = rm { } | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:231:11 + --> $DIR/simple.rs:221:11 | LL | match rm { | ^^ cannot move out of borrowed content @@ -527,7 +527,7 @@ LL | &mut Either::Two(_t) => (), | -- ...and here | note: move occurs because these variables have types that don't implement the `Copy` trait - --> $DIR/simple.rs:233:26 + --> $DIR/simple.rs:223:26 | LL | &mut Either::One(_t) => (), | ^^ @@ -544,7 +544,7 @@ LL | Either::Two(_t) => (), | ^^^^^^^^^^^^^^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:240:11 + --> $DIR/simple.rs:230:11 | LL | match rm { | ^^ cannot move out of borrowed content @@ -556,13 +556,13 @@ LL | &mut Either::One(_t) => (), | help: consider removing the `&mut`: `Either::One(_t)` | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:242:26 + --> $DIR/simple.rs:232:26 | LL | &mut Either::One(_t) => (), | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:247:11 + --> $DIR/simple.rs:237:11 | LL | match rm { | ^^ cannot move out of borrowed content @@ -574,13 +574,13 @@ LL | &mut Either::One(_t) => (), | help: consider removing the `&mut`: `Either::One(_t)` | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:249:26 + --> $DIR/simple.rs:239:26 | LL | &mut Either::One(_t) => (), | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:254:11 + --> $DIR/simple.rs:244:11 | LL | match rm { | ^^ cannot move out of borrowed content @@ -592,13 +592,13 @@ LL | &mut Either::One(_t) => (), | help: consider removing the `&mut`: `Either::One(_t)` | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:256:26 + --> $DIR/simple.rs:246:26 | LL | &mut Either::One(_t) => (), | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:270:21 + --> $DIR/simple.rs:260:21 | LL | let (&X(_t),) = (&x.clone(),); | -- ^^^^^^^^^^^^^ cannot move out of borrowed content @@ -606,13 +606,13 @@ LL | let (&X(_t),) = (&x.clone(),); | data moved here | note: move occurs because `_t` has type `Y`, which does not implement the `Copy` trait - --> $DIR/simple.rs:270:13 + --> $DIR/simple.rs:260:13 | LL | let (&X(_t),) = (&x.clone(),); | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:272:34 + --> $DIR/simple.rs:262:34 | LL | if let (&Either::One(_t),) = (&e.clone(),) { } | -- ^^^^^^^^^^^^^ cannot move out of borrowed content @@ -620,13 +620,13 @@ LL | if let (&Either::One(_t),) = (&e.clone(),) { } | data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:272:26 + --> $DIR/simple.rs:262:26 | LL | if let (&Either::One(_t),) = (&e.clone(),) { } | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:274:37 + --> $DIR/simple.rs:264:37 | LL | while let (&Either::One(_t),) = (&e.clone(),) { } | -- ^^^^^^^^^^^^^ cannot move out of borrowed content @@ -634,13 +634,13 @@ LL | while let (&Either::One(_t),) = (&e.clone(),) { } | data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:274:29 + --> $DIR/simple.rs:264:29 | LL | while let (&Either::One(_t),) = (&e.clone(),) { } | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:276:11 + --> $DIR/simple.rs:266:11 | LL | match (&e.clone(),) { | ^^^^^^^^^^^^^ cannot move out of borrowed content @@ -649,13 +649,13 @@ LL | (&Either::One(_t),) | -- data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:278:23 + --> $DIR/simple.rs:268:23 | LL | (&Either::One(_t),) | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:284:25 + --> $DIR/simple.rs:274:25 | LL | let (&mut X(_t),) = (&mut xm.clone(),); | -- ^^^^^^^^^^^^^^^^^^ cannot move out of borrowed content @@ -663,13 +663,13 @@ LL | let (&mut X(_t),) = (&mut xm.clone(),); | data moved here | note: move occurs because `_t` has type `Y`, which does not implement the `Copy` trait - --> $DIR/simple.rs:284:17 + --> $DIR/simple.rs:274:17 | LL | let (&mut X(_t),) = (&mut xm.clone(),); | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:286:38 + --> $DIR/simple.rs:276:38 | LL | if let (&mut Either::One(_t),) = (&mut em.clone(),) { } | -- ^^^^^^^^^^^^^^^^^^ cannot move out of borrowed content @@ -677,13 +677,13 @@ LL | if let (&mut Either::One(_t),) = (&mut em.clone(),) { } | data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:286:30 + --> $DIR/simple.rs:276:30 | LL | if let (&mut Either::One(_t),) = (&mut em.clone(),) { } | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:288:41 + --> $DIR/simple.rs:278:41 | LL | while let (&mut Either::One(_t),) = (&mut em.clone(),) { } | -- ^^^^^^^^^^^^^^^^^^ cannot move out of borrowed content @@ -691,13 +691,13 @@ LL | while let (&mut Either::One(_t),) = (&mut em.clone(),) { } | data moved here | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:288:33 + --> $DIR/simple.rs:278:33 | LL | while let (&mut Either::One(_t),) = (&mut em.clone(),) { } | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:290:11 + --> $DIR/simple.rs:280:11 | LL | match (&mut em.clone(),) { | ^^^^^^^^^^^^^^^^^^ cannot move out of borrowed content @@ -708,7 +708,7 @@ LL | (&mut Either::Two(_t),) => (), | -- ...and here | note: move occurs because these variables have types that don't implement the `Copy` trait - --> $DIR/simple.rs:292:27 + --> $DIR/simple.rs:282:27 | LL | (&mut Either::One(_t),) => (), | ^^ @@ -716,7 +716,7 @@ LL | (&mut Either::Two(_t),) => (), | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:300:18 + --> $DIR/simple.rs:290:18 | LL | let &X(_t) = &x; | ------ ^^ cannot move out of borrowed content @@ -725,13 +725,13 @@ LL | let &X(_t) = &x; | help: consider removing the `&`: `X(_t)` | note: move occurs because `_t` has type `Y`, which does not implement the `Copy` trait - --> $DIR/simple.rs:300:12 + --> $DIR/simple.rs:290:12 | LL | let &X(_t) = &x; | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:304:31 + --> $DIR/simple.rs:294:31 | LL | if let &Either::One(_t) = &e { } | ---------------- ^^ cannot move out of borrowed content @@ -740,13 +740,13 @@ LL | if let &Either::One(_t) = &e { } | help: consider removing the `&`: `Either::One(_t)` | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:304:25 + --> $DIR/simple.rs:294:25 | LL | if let &Either::One(_t) = &e { } | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:308:34 + --> $DIR/simple.rs:298:34 | LL | while let &Either::One(_t) = &e { } | ---------------- ^^ cannot move out of borrowed content @@ -755,13 +755,13 @@ LL | while let &Either::One(_t) = &e { } | help: consider removing the `&`: `Either::One(_t)` | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:308:28 + --> $DIR/simple.rs:298:28 | LL | while let &Either::One(_t) = &e { } | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:312:11 + --> $DIR/simple.rs:302:11 | LL | match &e { | ^^ cannot move out of borrowed content @@ -773,13 +773,13 @@ LL | &Either::One(_t) | help: consider removing the `&`: `Either::One(_t)` | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:314:22 + --> $DIR/simple.rs:304:22 | LL | &Either::One(_t) | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:320:11 + --> $DIR/simple.rs:310:11 | LL | match &e { | ^^ cannot move out of borrowed content @@ -791,13 +791,13 @@ LL | &Either::One(_t) => (), | help: consider removing the `&`: `Either::One(_t)` | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:322:22 + --> $DIR/simple.rs:312:22 | LL | &Either::One(_t) => (), | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:327:11 + --> $DIR/simple.rs:317:11 | LL | match &e { | ^^ cannot move out of borrowed content @@ -809,13 +809,13 @@ LL | &Either::One(_t) => (), | help: consider removing the `&`: `Either::One(_t)` | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:329:22 + --> $DIR/simple.rs:319:22 | LL | &Either::One(_t) => (), | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:335:22 + --> $DIR/simple.rs:325:22 | LL | let &mut X(_t) = &mut xm; | ---------- ^^^^^^^ cannot move out of borrowed content @@ -824,13 +824,13 @@ LL | let &mut X(_t) = &mut xm; | help: consider removing the `&mut`: `X(_t)` | note: move occurs because `_t` has type `Y`, which does not implement the `Copy` trait - --> $DIR/simple.rs:335:16 + --> $DIR/simple.rs:325:16 | LL | let &mut X(_t) = &mut xm; | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:339:35 + --> $DIR/simple.rs:329:35 | LL | if let &mut Either::One(_t) = &mut em { } | -------------------- ^^^^^^^ cannot move out of borrowed content @@ -839,13 +839,13 @@ LL | if let &mut Either::One(_t) = &mut em { } | help: consider removing the `&mut`: `Either::One(_t)` | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:339:29 + --> $DIR/simple.rs:329:29 | LL | if let &mut Either::One(_t) = &mut em { } | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:343:38 + --> $DIR/simple.rs:333:38 | LL | while let &mut Either::One(_t) = &mut em { } | -------------------- ^^^^^^^ cannot move out of borrowed content @@ -854,13 +854,13 @@ LL | while let &mut Either::One(_t) = &mut em { } | help: consider removing the `&mut`: `Either::One(_t)` | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:343:32 + --> $DIR/simple.rs:333:32 | LL | while let &mut Either::One(_t) = &mut em { } | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:347:11 + --> $DIR/simple.rs:337:11 | LL | match &mut em { | ^^^^^^^ cannot move out of borrowed content @@ -872,13 +872,13 @@ LL | &mut Either::One(_t) | help: consider removing the `&mut`: `Either::One(_t)` | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:349:26 + --> $DIR/simple.rs:339:26 | LL | &mut Either::One(_t) | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:355:11 + --> $DIR/simple.rs:345:11 | LL | match &mut em { | ^^^^^^^ cannot move out of borrowed content @@ -890,13 +890,13 @@ LL | &mut Either::One(_t) => (), | help: consider removing the `&mut`: `Either::One(_t)` | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:357:26 + --> $DIR/simple.rs:347:26 | LL | &mut Either::One(_t) => (), | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:362:11 + --> $DIR/simple.rs:352:11 | LL | match &mut em { | ^^^^^^^ cannot move out of borrowed content @@ -908,13 +908,13 @@ LL | &mut Either::One(_t) => (), | help: consider removing the `&mut`: `Either::One(_t)` | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:364:26 + --> $DIR/simple.rs:354:26 | LL | &mut Either::One(_t) => (), | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:369:11 + --> $DIR/simple.rs:359:11 | LL | match &mut em { | ^^^^^^^ cannot move out of borrowed content @@ -926,13 +926,13 @@ LL | &mut Either::One(_t) => (), | help: consider removing the `&mut`: `Either::One(_t)` | note: move occurs because `_t` has type `X`, which does not implement the `Copy` trait - --> $DIR/simple.rs:371:26 + --> $DIR/simple.rs:361:26 | LL | &mut Either::One(_t) => (), | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:214:11 + --> $DIR/simple.rs:204:11 | LL | fn f1(&X(_t): &X) { } | ^^^--^ @@ -942,13 +942,13 @@ LL | fn f1(&X(_t): &X) { } | help: consider removing the `&`: `X(_t)` | note: move occurs because `_t` has type `Y`, which does not implement the `Copy` trait - --> $DIR/simple.rs:214:14 + --> $DIR/simple.rs:204:14 | LL | fn f1(&X(_t): &X) { } | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:261:11 + --> $DIR/simple.rs:251:11 | LL | fn f2(&mut X(_t): &mut X) { } | ^^^^^^^--^ @@ -958,13 +958,13 @@ LL | fn f2(&mut X(_t): &mut X) { } | help: consider removing the `&mut`: `X(_t)` | note: move occurs because `_t` has type `Y`, which does not implement the `Copy` trait - --> $DIR/simple.rs:261:18 + --> $DIR/simple.rs:251:18 | LL | fn f2(&mut X(_t): &mut X) { } | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:281:11 + --> $DIR/simple.rs:271:11 | LL | fn f3((&X(_t),): (&X,)) { } | ^^^^--^^^ @@ -973,13 +973,13 @@ LL | fn f3((&X(_t),): (&X,)) { } | cannot move out of borrowed content | note: move occurs because `_t` has type `Y`, which does not implement the `Copy` trait - --> $DIR/simple.rs:281:15 + --> $DIR/simple.rs:271:15 | LL | fn f3((&X(_t),): (&X,)) { } | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/simple.rs:295:11 + --> $DIR/simple.rs:285:11 | LL | fn f4((&mut X(_t),): (&mut X,)) { } | ^^^^^^^^--^^^ @@ -988,7 +988,7 @@ LL | fn f4((&mut X(_t),): (&mut X,)) { } | cannot move out of borrowed content | note: move occurs because `_t` has type `Y`, which does not implement the `Copy` trait - --> $DIR/simple.rs:295:19 + --> $DIR/simple.rs:285:19 | LL | fn f4((&mut X(_t),): (&mut X,)) { } | ^^ diff --git a/src/test/ui/suggestions/suggest-labels.rs b/src/test/ui/suggestions/suggest-labels.rs index 9fb519c57edf3..159f45855ce77 100644 --- a/src/test/ui/suggestions/suggest-labels.rs +++ b/src/test/ui/suggestions/suggest-labels.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[allow(unreachable_code, unused_labels)] fn main() { 'foo: loop { diff --git a/src/test/ui/suggestions/suggest-labels.stderr b/src/test/ui/suggestions/suggest-labels.stderr index 671ff1a56db6c..88a0f9698877f 100644 --- a/src/test/ui/suggestions/suggest-labels.stderr +++ b/src/test/ui/suggestions/suggest-labels.stderr @@ -1,17 +1,17 @@ error[E0426]: use of undeclared label `'fo` - --> $DIR/suggest-labels.rs:14:15 + --> $DIR/suggest-labels.rs:4:15 | LL | break 'fo; //~ ERROR use of undeclared label | ^^^ did you mean `'foo`? error[E0426]: use of undeclared label `'bor` - --> $DIR/suggest-labels.rs:18:18 + --> $DIR/suggest-labels.rs:8:18 | LL | continue 'bor; //~ ERROR use of undeclared label | ^^^^ did you mean `'bar`? error[E0426]: use of undeclared label `'longlable` - --> $DIR/suggest-labels.rs:23:19 + --> $DIR/suggest-labels.rs:13:19 | LL | break 'longlable; //~ ERROR use of undeclared label | ^^^^^^^^^^ did you mean `'longlabel1`? diff --git a/src/test/ui/suggestions/suggest-methods.rs b/src/test/ui/suggestions/suggest-methods.rs index 49027deecc198..f40b9ed99b827 100644 --- a/src/test/ui/suggestions/suggest-methods.rs +++ b/src/test/ui/suggestions/suggest-methods.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo; impl Foo { diff --git a/src/test/ui/suggestions/suggest-methods.stderr b/src/test/ui/suggestions/suggest-methods.stderr index cb352361f33ef..39d96a943a18a 100644 --- a/src/test/ui/suggestions/suggest-methods.stderr +++ b/src/test/ui/suggestions/suggest-methods.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `bat` found for type `Foo` in the current scope - --> $DIR/suggest-methods.rs:28:7 + --> $DIR/suggest-methods.rs:18:7 | LL | struct Foo; | ----------- method `bat` not found for this @@ -10,7 +10,7 @@ LL | f.bat(1.0); //~ ERROR no method named = help: did you mean `bar`? error[E0599]: no method named `is_emtpy` found for type `std::string::String` in the current scope - --> $DIR/suggest-methods.rs:31:15 + --> $DIR/suggest-methods.rs:21:15 | LL | let _ = s.is_emtpy(); //~ ERROR no method named | ^^^^^^^^ @@ -18,7 +18,7 @@ LL | let _ = s.is_emtpy(); //~ ERROR no method named = help: did you mean `is_empty`? error[E0599]: no method named `count_eos` found for type `u32` in the current scope - --> $DIR/suggest-methods.rs:35:19 + --> $DIR/suggest-methods.rs:25:19 | LL | let _ = 63u32.count_eos(); //~ ERROR no method named | ^^^^^^^^^ @@ -26,7 +26,7 @@ LL | let _ = 63u32.count_eos(); //~ ERROR no method named = help: did you mean `count_zeros`? error[E0599]: no method named `count_o` found for type `u32` in the current scope - --> $DIR/suggest-methods.rs:38:19 + --> $DIR/suggest-methods.rs:28:19 | LL | let _ = 63u32.count_o(); //~ ERROR no method named | ^^^^^^^ diff --git a/src/test/ui/suggestions/suggest-private-fields.rs b/src/test/ui/suggestions/suggest-private-fields.rs index 77b38abad848a..347c8aeed697e 100644 --- a/src/test/ui/suggestions/suggest-private-fields.rs +++ b/src/test/ui/suggestions/suggest-private-fields.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:struct_field_privacy.rs extern crate struct_field_privacy as xc; diff --git a/src/test/ui/suggestions/suggest-private-fields.stderr b/src/test/ui/suggestions/suggest-private-fields.stderr index 51a96df951aec..5f0176473ea74 100644 --- a/src/test/ui/suggestions/suggest-private-fields.stderr +++ b/src/test/ui/suggestions/suggest-private-fields.stderr @@ -1,11 +1,11 @@ error[E0560]: struct `xc::B` has no field named `aa` - --> $DIR/suggest-private-fields.rs:25:9 + --> $DIR/suggest-private-fields.rs:15:9 | LL | aa: 20, | ^^ field does not exist - did you mean `a`? error[E0560]: struct `xc::B` has no field named `bb` - --> $DIR/suggest-private-fields.rs:27:9 + --> $DIR/suggest-private-fields.rs:17:9 | LL | bb: 20, | ^^ `xc::B` does not have this field @@ -13,13 +13,13 @@ LL | bb: 20, = note: available fields are: `a` error[E0560]: struct `A` has no field named `aa` - --> $DIR/suggest-private-fields.rs:32:9 + --> $DIR/suggest-private-fields.rs:22:9 | LL | aa: 20, | ^^ field does not exist - did you mean `a`? error[E0560]: struct `A` has no field named `bb` - --> $DIR/suggest-private-fields.rs:34:9 + --> $DIR/suggest-private-fields.rs:24:9 | LL | bb: 20, | ^^ field does not exist - did you mean `b`? diff --git a/src/test/ui/suggestions/suggest-ref-mut.rs b/src/test/ui/suggestions/suggest-ref-mut.rs index 30b5371af1ac5..b4a6fa39f9052 100644 --- a/src/test/ui/suggestions/suggest-ref-mut.rs +++ b/src/test/ui/suggestions/suggest-ref-mut.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] struct X(usize); diff --git a/src/test/ui/suggestions/suggest-ref-mut.stderr b/src/test/ui/suggestions/suggest-ref-mut.stderr index 0b2b240ef53a8..9f00967d84089 100644 --- a/src/test/ui/suggestions/suggest-ref-mut.stderr +++ b/src/test/ui/suggestions/suggest-ref-mut.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to `self.0` which is behind a `&` reference - --> $DIR/suggest-ref-mut.rs:19:9 + --> $DIR/suggest-ref-mut.rs:9:9 | LL | fn zap(&self) { | ----- help: consider changing this to be a mutable reference: `&mut self` @@ -8,7 +8,7 @@ LL | self.0 = 32; | ^^^^^^^^^^^ `self` is a `&` reference, so the data it refers to cannot be written error[E0594]: cannot assign to `*foo` which is behind a `&` reference - --> $DIR/suggest-ref-mut.rs:28:5 + --> $DIR/suggest-ref-mut.rs:18:5 | LL | let ref foo = 16; | ------- help: consider changing this to be a mutable reference: `ref mut foo` @@ -17,7 +17,7 @@ LL | *foo = 32; | ^^^^^^^^^ `foo` is a `&` reference, so the data it refers to cannot be written error[E0594]: cannot assign to `*bar` which is behind a `&` reference - --> $DIR/suggest-ref-mut.rs:33:9 + --> $DIR/suggest-ref-mut.rs:23:9 | LL | if let Some(ref bar) = Some(16) { | ------- help: consider changing this to be a mutable reference: `ref mut bar` @@ -26,7 +26,7 @@ LL | *bar = 32; | ^^^^^^^^^ `bar` is a `&` reference, so the data it refers to cannot be written error[E0594]: cannot assign to `*quo` which is behind a `&` reference - --> $DIR/suggest-ref-mut.rs:37:22 + --> $DIR/suggest-ref-mut.rs:27:22 | LL | ref quo => { *quo = 32; }, | ------- ^^^^^^^^^ `quo` is a `&` reference, so the data it refers to cannot be written diff --git a/src/test/ui/suggestions/suggest-remove-refs-1.rs b/src/test/ui/suggestions/suggest-remove-refs-1.rs index 0f19c48337b1e..a49f5e81a09f7 100644 --- a/src/test/ui/suggestions/suggest-remove-refs-1.rs +++ b/src/test/ui/suggestions/suggest-remove-refs-1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let v = vec![0, 1, 2, 3]; diff --git a/src/test/ui/suggestions/suggest-remove-refs-1.stderr b/src/test/ui/suggestions/suggest-remove-refs-1.stderr index c47b4d283d7cd..6f46f0989689c 100644 --- a/src/test/ui/suggestions/suggest-remove-refs-1.stderr +++ b/src/test/ui/suggestions/suggest-remove-refs-1.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `&std::iter::Enumerate>: std::iter::Iterator` is not satisfied - --> $DIR/suggest-remove-refs-1.rs:14:19 + --> $DIR/suggest-remove-refs-1.rs:4:19 | LL | for (i, n) in &v.iter().enumerate() { | -^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/suggestions/suggest-remove-refs-2.rs b/src/test/ui/suggestions/suggest-remove-refs-2.rs index c427f697ae1ef..2e8673222670d 100644 --- a/src/test/ui/suggestions/suggest-remove-refs-2.rs +++ b/src/test/ui/suggestions/suggest-remove-refs-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let v = vec![0, 1, 2, 3]; diff --git a/src/test/ui/suggestions/suggest-remove-refs-2.stderr b/src/test/ui/suggestions/suggest-remove-refs-2.stderr index fdd654ea3923f..7d402dae36141 100644 --- a/src/test/ui/suggestions/suggest-remove-refs-2.stderr +++ b/src/test/ui/suggestions/suggest-remove-refs-2.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `&&&&&std::iter::Enumerate>: std::iter::Iterator` is not satisfied - --> $DIR/suggest-remove-refs-2.rs:14:19 + --> $DIR/suggest-remove-refs-2.rs:4:19 | LL | for (i, n) in & & & & &v.iter().enumerate() { | ---------^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/suggestions/suggest-remove-refs-3.rs b/src/test/ui/suggestions/suggest-remove-refs-3.rs index f54ae30caebca..fc1c7eb5ae3f0 100644 --- a/src/test/ui/suggestions/suggest-remove-refs-3.rs +++ b/src/test/ui/suggestions/suggest-remove-refs-3.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let v = vec![0, 1, 2, 3]; diff --git a/src/test/ui/suggestions/suggest-remove-refs-3.stderr b/src/test/ui/suggestions/suggest-remove-refs-3.stderr index b0920a0fa523e..8be4452c87509 100644 --- a/src/test/ui/suggestions/suggest-remove-refs-3.stderr +++ b/src/test/ui/suggestions/suggest-remove-refs-3.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `&&&&&std::iter::Enumerate>: std::iter::Iterator` is not satisfied - --> $DIR/suggest-remove-refs-3.rs:14:19 + --> $DIR/suggest-remove-refs-3.rs:4:19 | LL | for (i, n) in & & & | ___________________^ diff --git a/src/test/ui/super-at-top-level.rs b/src/test/ui/super-at-top-level.rs index c607711c44f37..2cb869a69ced3 100644 --- a/src/test/ui/super-at-top-level.rs +++ b/src/test/ui/super-at-top-level.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use super::f; //~ ERROR There are too many initial `super`s fn main() { diff --git a/src/test/ui/super-at-top-level.stderr b/src/test/ui/super-at-top-level.stderr index b4af73055a01d..415e0e1978c9c 100644 --- a/src/test/ui/super-at-top-level.stderr +++ b/src/test/ui/super-at-top-level.stderr @@ -1,5 +1,5 @@ error[E0433]: failed to resolve. There are too many initial `super`s. - --> $DIR/super-at-top-level.rs:11:5 + --> $DIR/super-at-top-level.rs:1:5 | LL | use super::f; //~ ERROR There are too many initial `super`s | ^^^^^ There are too many initial `super`s. diff --git a/src/test/ui/suppressed-error.rs b/src/test/ui/suppressed-error.rs index 9a4a52ced2008..cf3dce8e224c3 100644 --- a/src/test/ui/suppressed-error.rs +++ b/src/test/ui/suppressed-error.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let (x, y) = (); //~^ ERROR mismatched types diff --git a/src/test/ui/suppressed-error.stderr b/src/test/ui/suppressed-error.stderr index d17e7cb689117..85e1deb3cde0c 100644 --- a/src/test/ui/suppressed-error.stderr +++ b/src/test/ui/suppressed-error.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/suppressed-error.rs:12:9 + --> $DIR/suppressed-error.rs:2:9 | LL | let (x, y) = (); | ^^^^^^ expected (), found tuple diff --git a/src/test/ui/svh/auxiliary/svh-a-base.rs b/src/test/ui/svh/auxiliary/svh-a-base.rs index 31a97f695f06c..36b41fc818ff8 100644 --- a/src/test/ui/svh/auxiliary/svh-a-base.rs +++ b/src/test/ui/svh/auxiliary/svh-a-base.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The `svh-a-*.rs` files are all deviations from the base file //! svh-a-base.rs with some difference (usually in `fn foo`) that //! should not affect the strict version hash (SVH) computation diff --git a/src/test/ui/svh/auxiliary/svh-a-change-lit.rs b/src/test/ui/svh/auxiliary/svh-a-change-lit.rs index 5339fc8295c6f..c76f2c99236d6 100644 --- a/src/test/ui/svh/auxiliary/svh-a-change-lit.rs +++ b/src/test/ui/svh/auxiliary/svh-a-change-lit.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The `svh-a-*.rs` files are all deviations from the base file //! svh-a-base.rs with some difference (usually in `fn foo`) that //! should not affect the strict version hash (SVH) computation diff --git a/src/test/ui/svh/auxiliary/svh-a-change-significant-cfg.rs b/src/test/ui/svh/auxiliary/svh-a-change-significant-cfg.rs index 2a5d9446f879a..37f59c97e0f53 100644 --- a/src/test/ui/svh/auxiliary/svh-a-change-significant-cfg.rs +++ b/src/test/ui/svh/auxiliary/svh-a-change-significant-cfg.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The `svh-a-*.rs` files are all deviations from the base file //! svh-a-base.rs with some difference (usually in `fn foo`) that //! should not affect the strict version hash (SVH) computation diff --git a/src/test/ui/svh/auxiliary/svh-a-change-trait-bound.rs b/src/test/ui/svh/auxiliary/svh-a-change-trait-bound.rs index 61f2f2803ab18..be24b1e222109 100644 --- a/src/test/ui/svh/auxiliary/svh-a-change-trait-bound.rs +++ b/src/test/ui/svh/auxiliary/svh-a-change-trait-bound.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The `svh-a-*.rs` files are all deviations from the base file //! svh-a-base.rs with some difference (usually in `fn foo`) that //! should not affect the strict version hash (SVH) computation diff --git a/src/test/ui/svh/auxiliary/svh-a-change-type-arg.rs b/src/test/ui/svh/auxiliary/svh-a-change-type-arg.rs index 270ce95be2bb6..3fe102245f74c 100644 --- a/src/test/ui/svh/auxiliary/svh-a-change-type-arg.rs +++ b/src/test/ui/svh/auxiliary/svh-a-change-type-arg.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The `svh-a-*.rs` files are all deviations from the base file //! svh-a-base.rs with some difference (usually in `fn foo`) that //! should not affect the strict version hash (SVH) computation diff --git a/src/test/ui/svh/auxiliary/svh-a-change-type-ret.rs b/src/test/ui/svh/auxiliary/svh-a-change-type-ret.rs index de4cc85a7dc47..06e4fad064914 100644 --- a/src/test/ui/svh/auxiliary/svh-a-change-type-ret.rs +++ b/src/test/ui/svh/auxiliary/svh-a-change-type-ret.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The `svh-a-*.rs` files are all deviations from the base file //! svh-a-base.rs with some difference (usually in `fn foo`) that //! should not affect the strict version hash (SVH) computation diff --git a/src/test/ui/svh/auxiliary/svh-a-change-type-static.rs b/src/test/ui/svh/auxiliary/svh-a-change-type-static.rs index 0d4c76abb10e7..440cb3213ed46 100644 --- a/src/test/ui/svh/auxiliary/svh-a-change-type-static.rs +++ b/src/test/ui/svh/auxiliary/svh-a-change-type-static.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! The `svh-a-*.rs` files are all deviations from the base file //! svh-a-base.rs with some difference (usually in `fn foo`) that //! should not affect the strict version hash (SVH) computation diff --git a/src/test/ui/svh/auxiliary/svh-b.rs b/src/test/ui/svh/auxiliary/svh-b.rs index b8946fdc99553..03869aeb37194 100644 --- a/src/test/ui/svh/auxiliary/svh-b.rs +++ b/src/test/ui/svh/auxiliary/svh-b.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! This is a client of the `a` crate defined in "svn-a-base.rs". The //! rpass and cfail tests (such as "run-pass/svh-add-comment.rs") use //! it by swapping in a different object code library crate built from diff --git a/src/test/ui/svh/auxiliary/svh-uta-base.rs b/src/test/ui/svh/auxiliary/svh-uta-base.rs index 6bd3ddab06c72..c138f1a5ba84c 100644 --- a/src/test/ui/svh/auxiliary/svh-uta-base.rs +++ b/src/test/ui/svh/auxiliary/svh-uta-base.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! "compile-fail/svh-uta-trait.rs" is checking that we detect a //! change from `use foo::TraitB` to use `foo::TraitB` in the hash //! (SVH) computation (#14132), since that will affect method diff --git a/src/test/ui/svh/auxiliary/svh-uta-change-use-trait.rs b/src/test/ui/svh/auxiliary/svh-uta-change-use-trait.rs index e863416817735..76a472b5b26b1 100644 --- a/src/test/ui/svh/auxiliary/svh-uta-change-use-trait.rs +++ b/src/test/ui/svh/auxiliary/svh-uta-change-use-trait.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! "compile-fail/svh-uta-trait.rs" is checking that we detect a //! change from `use foo::TraitB` to use `foo::TraitB` in the hash //! (SVH) computation (#14132), since that will affect method diff --git a/src/test/ui/svh/auxiliary/svh-utb.rs b/src/test/ui/svh/auxiliary/svh-utb.rs index eb3da985242be..2f27e99a961ae 100644 --- a/src/test/ui/svh/auxiliary/svh-utb.rs +++ b/src/test/ui/svh/auxiliary/svh-utb.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! "compile-fail/svh-uta-trait.rs" is checking that we detect a //! change from `use foo::TraitB` to use `foo::TraitB` in the hash //! (SVH) computation (#14132), since that will affect method diff --git a/src/test/ui/svh/svh-change-lit.rs b/src/test/ui/svh/svh-change-lit.rs index c529873e73284..7d991cc99716e 100644 --- a/src/test/ui/svh/svh-change-lit.rs +++ b/src/test/ui/svh/svh-change-lit.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-msvc FIXME #31306 // note that these aux-build directives must be in this order diff --git a/src/test/ui/svh/svh-change-lit.stderr b/src/test/ui/svh/svh-change-lit.stderr index bf018cdf8297a..ebb39224caa58 100644 --- a/src/test/ui/svh/svh-change-lit.stderr +++ b/src/test/ui/svh/svh-change-lit.stderr @@ -1,5 +1,5 @@ error[E0460]: found possibly newer version of crate `a` which `b` depends on - --> $DIR/svh-change-lit.rs:20:1 + --> $DIR/svh-change-lit.rs:10:1 | LL | extern crate b; //~ ERROR: found possibly newer version of crate `a` which `b` depends on | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/svh/svh-change-significant-cfg.rs b/src/test/ui/svh/svh-change-significant-cfg.rs index ad51cbc5ec831..8cf0d9ccaf1e8 100644 --- a/src/test/ui/svh/svh-change-significant-cfg.rs +++ b/src/test/ui/svh/svh-change-significant-cfg.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-msvc FIXME #31306 // note that these aux-build directives must be in this order diff --git a/src/test/ui/svh/svh-change-significant-cfg.stderr b/src/test/ui/svh/svh-change-significant-cfg.stderr index e8926cda9e9f3..d7196fc21f84e 100644 --- a/src/test/ui/svh/svh-change-significant-cfg.stderr +++ b/src/test/ui/svh/svh-change-significant-cfg.stderr @@ -1,5 +1,5 @@ error[E0460]: found possibly newer version of crate `a` which `b` depends on - --> $DIR/svh-change-significant-cfg.rs:20:1 + --> $DIR/svh-change-significant-cfg.rs:10:1 | LL | extern crate b; //~ ERROR: found possibly newer version of crate `a` which `b` depends on | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/svh/svh-change-trait-bound.rs b/src/test/ui/svh/svh-change-trait-bound.rs index ae17ff3feb79d..ddd10ac068df3 100644 --- a/src/test/ui/svh/svh-change-trait-bound.rs +++ b/src/test/ui/svh/svh-change-trait-bound.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-msvc FIXME #31306 // note that these aux-build directives must be in this order diff --git a/src/test/ui/svh/svh-change-trait-bound.stderr b/src/test/ui/svh/svh-change-trait-bound.stderr index d9824876a95a1..38678d7ec2ce4 100644 --- a/src/test/ui/svh/svh-change-trait-bound.stderr +++ b/src/test/ui/svh/svh-change-trait-bound.stderr @@ -1,5 +1,5 @@ error[E0460]: found possibly newer version of crate `a` which `b` depends on - --> $DIR/svh-change-trait-bound.rs:20:1 + --> $DIR/svh-change-trait-bound.rs:10:1 | LL | extern crate b; //~ ERROR: found possibly newer version of crate `a` which `b` depends on | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/svh/svh-change-type-arg.rs b/src/test/ui/svh/svh-change-type-arg.rs index 5b796a3f5c0bf..f845ab5bc6a91 100644 --- a/src/test/ui/svh/svh-change-type-arg.rs +++ b/src/test/ui/svh/svh-change-type-arg.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-msvc FIXME #31306 // note that these aux-build directives must be in this order diff --git a/src/test/ui/svh/svh-change-type-arg.stderr b/src/test/ui/svh/svh-change-type-arg.stderr index 1f942cc19891a..037d7867b0dca 100644 --- a/src/test/ui/svh/svh-change-type-arg.stderr +++ b/src/test/ui/svh/svh-change-type-arg.stderr @@ -1,5 +1,5 @@ error[E0460]: found possibly newer version of crate `a` which `b` depends on - --> $DIR/svh-change-type-arg.rs:20:1 + --> $DIR/svh-change-type-arg.rs:10:1 | LL | extern crate b; //~ ERROR: found possibly newer version of crate `a` which `b` depends on | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/svh/svh-change-type-ret.rs b/src/test/ui/svh/svh-change-type-ret.rs index 88bf146760f9b..fb3e996c5fd8c 100644 --- a/src/test/ui/svh/svh-change-type-ret.rs +++ b/src/test/ui/svh/svh-change-type-ret.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-msvc FIXME #31306 // note that these aux-build directives must be in this order diff --git a/src/test/ui/svh/svh-change-type-ret.stderr b/src/test/ui/svh/svh-change-type-ret.stderr index 0d59f31ccb667..184ac9e0e7c78 100644 --- a/src/test/ui/svh/svh-change-type-ret.stderr +++ b/src/test/ui/svh/svh-change-type-ret.stderr @@ -1,5 +1,5 @@ error[E0460]: found possibly newer version of crate `a` which `b` depends on - --> $DIR/svh-change-type-ret.rs:20:1 + --> $DIR/svh-change-type-ret.rs:10:1 | LL | extern crate b; //~ ERROR: found possibly newer version of crate `a` which `b` depends on | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/svh/svh-change-type-static.rs b/src/test/ui/svh/svh-change-type-static.rs index c9a167c5a02cf..0dfcaa0003b66 100644 --- a/src/test/ui/svh/svh-change-type-static.rs +++ b/src/test/ui/svh/svh-change-type-static.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-msvc FIXME #31306 // note that these aux-build directives must be in this order diff --git a/src/test/ui/svh/svh-change-type-static.stderr b/src/test/ui/svh/svh-change-type-static.stderr index cbfb74f59ed69..d3aeb073cd7a1 100644 --- a/src/test/ui/svh/svh-change-type-static.stderr +++ b/src/test/ui/svh/svh-change-type-static.stderr @@ -1,5 +1,5 @@ error[E0460]: found possibly newer version of crate `a` which `b` depends on - --> $DIR/svh-change-type-static.rs:20:1 + --> $DIR/svh-change-type-static.rs:10:1 | LL | extern crate b; //~ ERROR: found possibly newer version of crate `a` which `b` depends on | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/svh/svh-use-trait.rs b/src/test/ui/svh/svh-use-trait.rs index 3a87f6bfc77e4..93daca034c067 100644 --- a/src/test/ui/svh/svh-use-trait.rs +++ b/src/test/ui/svh/svh-use-trait.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-msvc FIXME #31306 // note that these aux-build directives must be in this order diff --git a/src/test/ui/svh/svh-use-trait.stderr b/src/test/ui/svh/svh-use-trait.stderr index 612f52ba95927..0af44502375f2 100644 --- a/src/test/ui/svh/svh-use-trait.stderr +++ b/src/test/ui/svh/svh-use-trait.stderr @@ -1,5 +1,5 @@ error[E0460]: found possibly newer version of crate `uta` which `utb` depends on - --> $DIR/svh-use-trait.rs:25:1 + --> $DIR/svh-use-trait.rs:15:1 | LL | extern crate utb; //~ ERROR: found possibly newer version of crate `uta` which `utb` depends | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/switched-expectations.rs b/src/test/ui/switched-expectations.rs index 2a43679bdb87f..c5bc84de54c48 100644 --- a/src/test/ui/switched-expectations.rs +++ b/src/test/ui/switched-expectations.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let var = 10i32; let ref string: String = var; //~ ERROR mismatched types [E0308] diff --git a/src/test/ui/switched-expectations.stderr b/src/test/ui/switched-expectations.stderr index 9db318735bdc0..bbb9b51650e02 100644 --- a/src/test/ui/switched-expectations.stderr +++ b/src/test/ui/switched-expectations.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/switched-expectations.rs:13:30 + --> $DIR/switched-expectations.rs:3:30 | LL | let ref string: String = var; //~ ERROR mismatched types [E0308] | ^^^ expected struct `std::string::String`, found i32 diff --git a/src/test/ui/symbol-names/basic.rs b/src/test/ui/symbol-names/basic.rs index 0095774fcb8d2..2a051a5e144da 100644 --- a/src/test/ui/symbol-names/basic.rs +++ b/src/test/ui/symbol-names/basic.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #[rustc_symbol_name] //~ ERROR _ZN5basic4main diff --git a/src/test/ui/symbol-names/basic.stderr b/src/test/ui/symbol-names/basic.stderr index eeeb1b5e34d8b..1c07b2e7d6a71 100644 --- a/src/test/ui/symbol-names/basic.stderr +++ b/src/test/ui/symbol-names/basic.stderr @@ -1,11 +1,11 @@ error: symbol-name(_ZN5basic4main17h2138d548fb9814b6E) - --> $DIR/basic.rs:13:1 + --> $DIR/basic.rs:3:1 | LL | #[rustc_symbol_name] //~ ERROR _ZN5basic4main | ^^^^^^^^^^^^^^^^^^^^ error: item-path(main) - --> $DIR/basic.rs:14:1 + --> $DIR/basic.rs:4:1 | LL | #[rustc_item_path] //~ ERROR item-path(main) | ^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/symbol-names/impl1.rs b/src/test/ui/symbol-names/impl1.rs index 93fa48b880fdf..97169c33b8cbf 100644 --- a/src/test/ui/symbol-names/impl1.rs +++ b/src/test/ui/symbol-names/impl1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![allow(dead_code)] diff --git a/src/test/ui/symbol-names/impl1.stderr b/src/test/ui/symbol-names/impl1.stderr index edce692969556..dcca50d2934de 100644 --- a/src/test/ui/symbol-names/impl1.stderr +++ b/src/test/ui/symbol-names/impl1.stderr @@ -1,23 +1,23 @@ error: symbol-name(_ZN5impl13foo3Foo3bar17h8da62e6147ff602fE) - --> $DIR/impl1.rs:18:9 + --> $DIR/impl1.rs:8:9 | LL | #[rustc_symbol_name] //~ ERROR _ZN5impl13foo3Foo3bar | ^^^^^^^^^^^^^^^^^^^^ error: item-path(foo::Foo::bar) - --> $DIR/impl1.rs:19:9 + --> $DIR/impl1.rs:9:9 | LL | #[rustc_item_path] //~ ERROR item-path(foo::Foo::bar) | ^^^^^^^^^^^^^^^^^^ error: symbol-name(_ZN5impl13bar33_$LT$impl$u20$impl1..foo..Foo$GT$3baz17h374cb8f6185db9b4E) - --> $DIR/impl1.rs:28:9 + --> $DIR/impl1.rs:18:9 | LL | #[rustc_symbol_name] //~ ERROR _ZN5impl13bar33_$LT$impl$u20$impl1..foo..Foo$GT$3baz | ^^^^^^^^^^^^^^^^^^^^ error: item-path(bar::::baz) - --> $DIR/impl1.rs:29:9 + --> $DIR/impl1.rs:19:9 | LL | #[rustc_item_path] //~ ERROR item-path(bar::::baz) | ^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/syntax-extension-minor.rs b/src/test/ui/syntax-extension-minor.rs index 96adfea43f39d..0206a769937e4 100644 --- a/src/test/ui/syntax-extension-minor.rs +++ b/src/test/ui/syntax-extension-minor.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(concat_idents)] pub fn main() { diff --git a/src/test/ui/syntax-extension-minor.stderr b/src/test/ui/syntax-extension-minor.stderr index 7df1f30314678..2d8056da527c6 100644 --- a/src/test/ui/syntax-extension-minor.stderr +++ b/src/test/ui/syntax-extension-minor.stderr @@ -1,5 +1,5 @@ error[E0425]: cannot find value `asdf_fdsa` in this scope - --> $DIR/syntax-extension-minor.rs:20:13 + --> $DIR/syntax-extension-minor.rs:10:13 | LL | assert!(concat_idents!(asd, f_f, dsa) == "<.<".to_string()); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope diff --git a/src/test/ui/syntax-trait-polarity-feature-gate.rs b/src/test/ui/syntax-trait-polarity-feature-gate.rs index 8d5e89cc66f75..4a3b24383abc4 100644 --- a/src/test/ui/syntax-trait-polarity-feature-gate.rs +++ b/src/test/ui/syntax-trait-polarity-feature-gate.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::marker::Send; struct TestType; diff --git a/src/test/ui/syntax-trait-polarity-feature-gate.stderr b/src/test/ui/syntax-trait-polarity-feature-gate.stderr index eebd018b8873c..7b9c3da3712f9 100644 --- a/src/test/ui/syntax-trait-polarity-feature-gate.stderr +++ b/src/test/ui/syntax-trait-polarity-feature-gate.stderr @@ -1,5 +1,5 @@ error[E0658]: negative trait bounds are not yet fully implemented; use marker types for now (see issue #13231) - --> $DIR/syntax-trait-polarity-feature-gate.rs:17:1 + --> $DIR/syntax-trait-polarity-feature-gate.rs:7:1 | LL | impl !Send for TestType {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/syntax-trait-polarity.rs b/src/test/ui/syntax-trait-polarity.rs index 1a5d058cb9aa8..1b7fc1587e6d2 100644 --- a/src/test/ui/syntax-trait-polarity.rs +++ b/src/test/ui/syntax-trait-polarity.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] use std::marker::Send; diff --git a/src/test/ui/syntax-trait-polarity.stderr b/src/test/ui/syntax-trait-polarity.stderr index 724ac60ed91a2..689e24bb8346e 100644 --- a/src/test/ui/syntax-trait-polarity.stderr +++ b/src/test/ui/syntax-trait-polarity.stderr @@ -1,35 +1,35 @@ error: inherent impls cannot be negative - --> $DIR/syntax-trait-polarity.rs:17:1 + --> $DIR/syntax-trait-polarity.rs:7:1 | LL | impl !TestType {} | ^^^^^^^^^^^^^^^^^ error[E0198]: negative impls cannot be unsafe - --> $DIR/syntax-trait-polarity.rs:22:1 + --> $DIR/syntax-trait-polarity.rs:12:1 | LL | unsafe impl !Send for TestType {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: inherent impls cannot be negative - --> $DIR/syntax-trait-polarity.rs:29:1 + --> $DIR/syntax-trait-polarity.rs:19:1 | LL | impl !TestType2 {} | ^^^^^^^^^^^^^^^^^^^^^^^^ error[E0198]: negative impls cannot be unsafe - --> $DIR/syntax-trait-polarity.rs:32:1 + --> $DIR/syntax-trait-polarity.rs:22:1 | LL | unsafe impl !Send for TestType2 {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0192]: negative impls are only allowed for auto traits (e.g., `Send` and `Sync`) - --> $DIR/syntax-trait-polarity.rs:24:1 + --> $DIR/syntax-trait-polarity.rs:14:1 | LL | impl !TestTrait for TestType {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0192]: negative impls are only allowed for auto traits (e.g., `Send` and `Sync`) - --> $DIR/syntax-trait-polarity.rs:34:1 + --> $DIR/syntax-trait-polarity.rs:24:1 | LL | impl !TestTrait for TestType2 {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/synthetic-param.rs b/src/test/ui/synthetic-param.rs index 337cae1369ee2..e53e3ba06e0d1 100644 --- a/src/test/ui/synthetic-param.rs +++ b/src/test/ui/synthetic-param.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] fn func<#[rustc_synthetic] T>(_: T) {} diff --git a/src/test/ui/synthetic-param.stderr b/src/test/ui/synthetic-param.stderr index 2711f6f8bdc49..7bdab439572b5 100644 --- a/src/test/ui/synthetic-param.stderr +++ b/src/test/ui/synthetic-param.stderr @@ -1,17 +1,17 @@ error[E0632]: cannot provide explicit type parameters when `impl Trait` is used in argument position. - --> $DIR/synthetic-param.rs:30:5 + --> $DIR/synthetic-param.rs:20:5 | LL | func::(42); //~ ERROR cannot provide explicit type parameters | ^^^^^^^^^^ error[E0632]: cannot provide explicit type parameters when `impl Trait` is used in argument position. - --> $DIR/synthetic-param.rs:33:5 + --> $DIR/synthetic-param.rs:23:5 | LL | Foo::func::(42); //~ ERROR cannot provide explicit type parameters | ^^^^^^^^^^^^^^^ error[E0632]: cannot provide explicit type parameters when `impl Trait` is used in argument position. - --> $DIR/synthetic-param.rs:36:5 + --> $DIR/synthetic-param.rs:26:5 | LL | Bar::::func::(42); //~ ERROR cannot provide explicit type parameters | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/tag-that-dare-not-speak-its-name.rs b/src/test/ui/tag-that-dare-not-speak-its-name.rs index 8f420f1ce4b0d..0a7f405746c88 100644 --- a/src/test/ui/tag-that-dare-not-speak-its-name.rs +++ b/src/test/ui/tag-that-dare-not-speak-its-name.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #876 #![no_implicit_prelude] diff --git a/src/test/ui/tag-that-dare-not-speak-its-name.stderr b/src/test/ui/tag-that-dare-not-speak-its-name.stderr index b9580eafc33c9..a0d6b0007d7d9 100644 --- a/src/test/ui/tag-that-dare-not-speak-its-name.stderr +++ b/src/test/ui/tag-that-dare-not-speak-its-name.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/tag-that-dare-not-speak-its-name.rs:22:20 + --> $DIR/tag-that-dare-not-speak-its-name.rs:12:20 | LL | let x : char = last(y); | ^^^^^^^ expected char, found enum `std::option::Option` diff --git a/src/test/ui/tag-type-args.rs b/src/test/ui/tag-type-args.rs index 5785a13b00682..fa7efc148ec81 100644 --- a/src/test/ui/tag-type-args.rs +++ b/src/test/ui/tag-type-args.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:wrong number of type arguments enum quux { bar } diff --git a/src/test/ui/tag-type-args.stderr b/src/test/ui/tag-type-args.stderr index 1431ee9cc8647..f3ac1700fe4e7 100644 --- a/src/test/ui/tag-type-args.stderr +++ b/src/test/ui/tag-type-args.stderr @@ -1,5 +1,5 @@ error[E0243]: wrong number of type arguments: expected 1, found 0 - --> $DIR/tag-type-args.rs:15:11 + --> $DIR/tag-type-args.rs:5:11 | LL | fn foo(c: quux) { assert!((false)); } | ^^^^ expected 1 type argument diff --git a/src/test/ui/tag-variant-cast-non-nullary.rs b/src/test/ui/tag-variant-cast-non-nullary.rs index 220537633eaf1..e2a55b2040bbb 100644 --- a/src/test/ui/tag-variant-cast-non-nullary.rs +++ b/src/test/ui/tag-variant-cast-non-nullary.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum non_nullary { nullary, other(isize), diff --git a/src/test/ui/tag-variant-cast-non-nullary.stderr b/src/test/ui/tag-variant-cast-non-nullary.stderr index 1e64c74d1212f..8c3dc286d17fc 100644 --- a/src/test/ui/tag-variant-cast-non-nullary.stderr +++ b/src/test/ui/tag-variant-cast-non-nullary.stderr @@ -1,5 +1,5 @@ error[E0605]: non-primitive cast: `non_nullary` as `isize` - --> $DIR/tag-variant-cast-non-nullary.rs:18:15 + --> $DIR/tag-variant-cast-non-nullary.rs:8:15 | LL | let val = v as isize; //~ ERROR non-primitive cast: `non_nullary` as `isize` [E0605] | ^^^^^^^^^^ diff --git a/src/test/ui/tag-variant-disr-dup.rs b/src/test/ui/tag-variant-disr-dup.rs index 5da5bb854097d..170a41088ef66 100644 --- a/src/test/ui/tag-variant-disr-dup.rs +++ b/src/test/ui/tag-variant-disr-dup.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //error-pattern:discriminant value // black and white have the same discriminator value ... diff --git a/src/test/ui/tag-variant-disr-dup.stderr b/src/test/ui/tag-variant-disr-dup.stderr index de5a0fac54fee..8cb217953bd1e 100644 --- a/src/test/ui/tag-variant-disr-dup.stderr +++ b/src/test/ui/tag-variant-disr-dup.stderr @@ -1,5 +1,5 @@ error[E0081]: discriminant value `0` already exists - --> $DIR/tag-variant-disr-dup.rs:20:13 + --> $DIR/tag-variant-disr-dup.rs:10:13 | LL | black = 0x000000, | -------- first use of `0` diff --git a/src/test/ui/tail-typeck.rs b/src/test/ui/tail-typeck.rs index 5c1270aa0e43d..37a7694c8fa71 100644 --- a/src/test/ui/tail-typeck.rs +++ b/src/test/ui/tail-typeck.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: mismatched types fn f() -> isize { return g(); } diff --git a/src/test/ui/tail-typeck.stderr b/src/test/ui/tail-typeck.stderr index 302bd6aa2d84d..eadf3d6d3350e 100644 --- a/src/test/ui/tail-typeck.stderr +++ b/src/test/ui/tail-typeck.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/tail-typeck.rs:13:26 + --> $DIR/tail-typeck.rs:3:26 | LL | fn f() -> isize { return g(); } | ^^^ expected isize, found usize diff --git a/src/test/ui/target-feature-gate.rs b/src/test/ui/target-feature-gate.rs index 8a045884cae31..e6513351a115d 100644 --- a/src/test/ui/target-feature-gate.rs +++ b/src/test/ui/target-feature-gate.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-arm // ignore-aarch64 // ignore-wasm diff --git a/src/test/ui/target-feature-gate.stderr b/src/test/ui/target-feature-gate.stderr index f18bebc0c290d..710b590b8048d 100644 --- a/src/test/ui/target-feature-gate.stderr +++ b/src/test/ui/target-feature-gate.stderr @@ -1,5 +1,5 @@ error[E0658]: the target feature `avx512bw` is currently unstable (see issue #44839) - --> $DIR/target-feature-gate.rs:29:18 + --> $DIR/target-feature-gate.rs:19:18 | LL | #[target_feature(enable = "avx512bw")] | ^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/target-feature-wrong.rs b/src/test/ui/target-feature-wrong.rs index fe611141379c4..ddae8870905ad 100644 --- a/src/test/ui/target-feature-wrong.rs +++ b/src/test/ui/target-feature-wrong.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-arm // ignore-aarch64 // ignore-wasm diff --git a/src/test/ui/target-feature-wrong.stderr b/src/test/ui/target-feature-wrong.stderr index 21c73b7ddbff0..2eeaa10748c76 100644 --- a/src/test/ui/target-feature-wrong.stderr +++ b/src/test/ui/target-feature-wrong.stderr @@ -1,35 +1,35 @@ error: #[target_feature] attribute must be of the form #[target_feature(..)] - --> $DIR/target-feature-wrong.rs:26:1 + --> $DIR/target-feature-wrong.rs:16:1 | LL | #[target_feature = "+sse2"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: the feature named `foo` is not valid for this target - --> $DIR/target-feature-wrong.rs:28:18 + --> $DIR/target-feature-wrong.rs:18:18 | LL | #[target_feature(enable = "foo")] | ^^^^^^^^^^^^^^ error: #[target_feature(..)] only accepts sub-keys of `enable` currently - --> $DIR/target-feature-wrong.rs:30:18 + --> $DIR/target-feature-wrong.rs:20:18 | LL | #[target_feature(bar)] | ^^^ error: #[target_feature(..)] only accepts sub-keys of `enable` currently - --> $DIR/target-feature-wrong.rs:32:18 + --> $DIR/target-feature-wrong.rs:22:18 | LL | #[target_feature(disable = "baz")] | ^^^^^^^^^^^^^^^ error: #[target_feature(..)] can only be applied to `unsafe` function - --> $DIR/target-feature-wrong.rs:36:1 + --> $DIR/target-feature-wrong.rs:26:1 | LL | #[target_feature(enable = "sse2")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: attribute should be applied to a function - --> $DIR/target-feature-wrong.rs:40:1 + --> $DIR/target-feature-wrong.rs:30:1 | LL | #[target_feature(enable = "sse2")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -38,7 +38,7 @@ LL | mod another {} | -------------- not a function error: cannot use #[inline(always)] with #[target_feature] - --> $DIR/target-feature-wrong.rs:44:1 + --> $DIR/target-feature-wrong.rs:34:1 | LL | #[inline(always)] | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/terr-in-field.rs b/src/test/ui/terr-in-field.rs index 4a21e1339811e..e94102cbaf75d 100644 --- a/src/test/ui/terr-in-field.rs +++ b/src/test/ui/terr-in-field.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct foo { a: isize, b: isize, diff --git a/src/test/ui/terr-in-field.stderr b/src/test/ui/terr-in-field.stderr index 5d06eef90be40..5d3cbc982e3d4 100644 --- a/src/test/ui/terr-in-field.stderr +++ b/src/test/ui/terr-in-field.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/terr-in-field.rs:23:14 + --> $DIR/terr-in-field.rs:13:14 | LL | want_foo(b); //~ ERROR mismatched types | ^ expected struct `foo`, found struct `bar` diff --git a/src/test/ui/terr-sorts.rs b/src/test/ui/terr-sorts.rs index fd92a26d0fcec..132c875e25b9c 100644 --- a/src/test/ui/terr-sorts.rs +++ b/src/test/ui/terr-sorts.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct foo { a: isize, b: isize, diff --git a/src/test/ui/terr-sorts.stderr b/src/test/ui/terr-sorts.stderr index a16216c842e49..49c831393a084 100644 --- a/src/test/ui/terr-sorts.stderr +++ b/src/test/ui/terr-sorts.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/terr-sorts.rs:21:14 + --> $DIR/terr-sorts.rs:10:14 | LL | want_foo(b); //~ ERROR mismatched types | ^ expected struct `foo`, found struct `std::boxed::Box` diff --git a/src/test/ui/test-cfg.rs b/src/test/ui/test-cfg.rs index 71cae0b6df9d8..8750bae002873 100644 --- a/src/test/ui/test-cfg.rs +++ b/src/test/ui/test-cfg.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --cfg foo #[cfg(all(foo, bar))] // foo AND bar diff --git a/src/test/ui/test-cfg.stderr b/src/test/ui/test-cfg.stderr index 1db6d5eccbeb5..93ca9a27de23b 100644 --- a/src/test/ui/test-cfg.stderr +++ b/src/test/ui/test-cfg.stderr @@ -1,5 +1,5 @@ error[E0425]: cannot find function `foo` in this scope - --> $DIR/test-cfg.rs:17:5 + --> $DIR/test-cfg.rs:7:5 | LL | foo(); //~ ERROR cannot find function `foo` in this scope | ^^^ not found in this scope diff --git a/src/test/ui/test-should-panic-attr.rs b/src/test/ui/test-should-panic-attr.rs index 8986732a2694d..1b5afdaa89b6c 100644 --- a/src/test/ui/test-should-panic-attr.rs +++ b/src/test/ui/test-should-panic-attr.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass // compile-flags: --test diff --git a/src/test/ui/test-should-panic-attr.stderr b/src/test/ui/test-should-panic-attr.stderr index 09bd54698083b..0f25477e53f1a 100644 --- a/src/test/ui/test-should-panic-attr.stderr +++ b/src/test/ui/test-should-panic-attr.stderr @@ -1,5 +1,5 @@ warning: attribute must be of the form: `#[should_panic]` or `#[should_panic(expected = "error message")]` - --> $DIR/test-should-panic-attr.rs:15:1 + --> $DIR/test-should-panic-attr.rs:5:1 | LL | #[should_panic = "foo"] | ^^^^^^^^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | #[should_panic = "foo"] = note: Errors in this attribute were erroneously allowed and will become a hard error in a future release. warning: argument must be of the form: `expected = "error message"` - --> $DIR/test-should-panic-attr.rs:22:1 + --> $DIR/test-should-panic-attr.rs:12:1 | LL | #[should_panic(expected)] | ^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -15,7 +15,7 @@ LL | #[should_panic(expected)] = note: Errors in this attribute were erroneously allowed and will become a hard error in a future release. warning: argument must be of the form: `expected = "error message"` - --> $DIR/test-should-panic-attr.rs:29:1 + --> $DIR/test-should-panic-attr.rs:19:1 | LL | #[should_panic(expect)] | ^^^^^^^^^^^^^^^^^^^^^^^ @@ -23,7 +23,7 @@ LL | #[should_panic(expect)] = note: Errors in this attribute were erroneously allowed and will become a hard error in a future release. warning: argument must be of the form: `expected = "error message"` - --> $DIR/test-should-panic-attr.rs:36:1 + --> $DIR/test-should-panic-attr.rs:26:1 | LL | #[should_panic(expected(foo, bar))] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -31,7 +31,7 @@ LL | #[should_panic(expected(foo, bar))] = note: Errors in this attribute were erroneously allowed and will become a hard error in a future release. warning: argument must be of the form: `expected = "error message"` - --> $DIR/test-should-panic-attr.rs:43:1 + --> $DIR/test-should-panic-attr.rs:33:1 | LL | #[should_panic(expected = "foo", bar)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/test-warns-dead-code.rs b/src/test/ui/test-warns-dead-code.rs index 0e25f1e965ab9..936461f162d68 100644 --- a/src/test/ui/test-warns-dead-code.rs +++ b/src/test/ui/test-warns-dead-code.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --test #![deny(dead_code)] diff --git a/src/test/ui/test-warns-dead-code.stderr b/src/test/ui/test-warns-dead-code.stderr index 46ff31c65d6d0..fe74ad133405a 100644 --- a/src/test/ui/test-warns-dead-code.stderr +++ b/src/test/ui/test-warns-dead-code.stderr @@ -1,11 +1,11 @@ error: function is never used: `dead` - --> $DIR/test-warns-dead-code.rs:15:1 + --> $DIR/test-warns-dead-code.rs:5:1 | LL | fn dead() {} //~ error: function is never used: `dead` | ^^^^^^^^^ | note: lint level defined here - --> $DIR/test-warns-dead-code.rs:13:9 + --> $DIR/test-warns-dead-code.rs:3:9 | LL | #![deny(dead_code)] | ^^^^^^^^^ diff --git a/src/test/ui/thread-local-in-ctfe.nll.stderr b/src/test/ui/thread-local-in-ctfe.nll.stderr index c9c0ac2b2d94b..5f839438d2f62 100644 --- a/src/test/ui/thread-local-in-ctfe.nll.stderr +++ b/src/test/ui/thread-local-in-ctfe.nll.stderr @@ -1,17 +1,17 @@ error[E0625]: thread-local statics cannot be accessed at compile-time - --> $DIR/thread-local-in-ctfe.rs:16:17 + --> $DIR/thread-local-in-ctfe.rs:6:17 | LL | static B: u32 = A; | ^ error[E0625]: thread-local statics cannot be accessed at compile-time - --> $DIR/thread-local-in-ctfe.rs:19:18 + --> $DIR/thread-local-in-ctfe.rs:9:18 | LL | static C: &u32 = &A; | ^^ error[E0712]: thread-local variable borrowed past end of function - --> $DIR/thread-local-in-ctfe.rs:19:18 + --> $DIR/thread-local-in-ctfe.rs:9:18 | LL | static C: &u32 = &A; | ^^- end of enclosing function is here @@ -19,19 +19,19 @@ LL | static C: &u32 = &A; | thread-local variables cannot be borrowed beyond the end of the function error[E0625]: thread-local statics cannot be accessed at compile-time - --> $DIR/thread-local-in-ctfe.rs:22:16 + --> $DIR/thread-local-in-ctfe.rs:12:16 | LL | const D: u32 = A; | ^ error[E0625]: thread-local statics cannot be accessed at compile-time - --> $DIR/thread-local-in-ctfe.rs:25:17 + --> $DIR/thread-local-in-ctfe.rs:15:17 | LL | const E: &u32 = &A; | ^^ error[E0712]: thread-local variable borrowed past end of function - --> $DIR/thread-local-in-ctfe.rs:25:17 + --> $DIR/thread-local-in-ctfe.rs:15:17 | LL | const E: &u32 = &A; | ^^- end of enclosing function is here @@ -39,7 +39,7 @@ LL | const E: &u32 = &A; | thread-local variables cannot be borrowed beyond the end of the function error[E0625]: thread-local statics cannot be accessed at compile-time - --> $DIR/thread-local-in-ctfe.rs:29:5 + --> $DIR/thread-local-in-ctfe.rs:19:5 | LL | A | ^ diff --git a/src/test/ui/thread-local-in-ctfe.rs b/src/test/ui/thread-local-in-ctfe.rs index 62e26f28b0667..313d39de36b6a 100644 --- a/src/test/ui/thread-local-in-ctfe.rs +++ b/src/test/ui/thread-local-in-ctfe.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_fn, thread_local)] #[thread_local] diff --git a/src/test/ui/thread-local-in-ctfe.stderr b/src/test/ui/thread-local-in-ctfe.stderr index 76079d9a9ee88..abeb2a3e0dee5 100644 --- a/src/test/ui/thread-local-in-ctfe.stderr +++ b/src/test/ui/thread-local-in-ctfe.stderr @@ -1,29 +1,29 @@ error[E0625]: thread-local statics cannot be accessed at compile-time - --> $DIR/thread-local-in-ctfe.rs:16:17 + --> $DIR/thread-local-in-ctfe.rs:6:17 | LL | static B: u32 = A; | ^ error[E0625]: thread-local statics cannot be accessed at compile-time - --> $DIR/thread-local-in-ctfe.rs:19:18 + --> $DIR/thread-local-in-ctfe.rs:9:18 | LL | static C: &u32 = &A; | ^^ error[E0625]: thread-local statics cannot be accessed at compile-time - --> $DIR/thread-local-in-ctfe.rs:22:16 + --> $DIR/thread-local-in-ctfe.rs:12:16 | LL | const D: u32 = A; | ^ error[E0625]: thread-local statics cannot be accessed at compile-time - --> $DIR/thread-local-in-ctfe.rs:25:17 + --> $DIR/thread-local-in-ctfe.rs:15:17 | LL | const E: &u32 = &A; | ^^ error[E0625]: thread-local statics cannot be accessed at compile-time - --> $DIR/thread-local-in-ctfe.rs:29:5 + --> $DIR/thread-local-in-ctfe.rs:19:5 | LL | A | ^ diff --git a/src/test/ui/token/bounds-obj-parens.rs b/src/test/ui/token/bounds-obj-parens.rs index 9617df8fa21a9..be26f6f153a89 100644 --- a/src/test/ui/token/bounds-obj-parens.rs +++ b/src/test/ui/token/bounds-obj-parens.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only type A = Box<(Fn(D::Error) -> E) + 'static + Send + Sync>; // OK (but see #39318) diff --git a/src/test/ui/token/bounds-obj-parens.stderr b/src/test/ui/token/bounds-obj-parens.stderr index 67dcbc4541941..7f6604d544625 100644 --- a/src/test/ui/token/bounds-obj-parens.stderr +++ b/src/test/ui/token/bounds-obj-parens.stderr @@ -1,5 +1,5 @@ error: expected one of `!` or `::`, found `` - --> $DIR/bounds-obj-parens.rs:15:1 + --> $DIR/bounds-obj-parens.rs:5:1 | LL | FAIL | ^^^^ expected one of `!` or `::` here diff --git a/src/test/ui/token/issue-10636-2.rs b/src/test/ui/token/issue-10636-2.rs index 711803754408f..a02fd41b349c2 100644 --- a/src/test/ui/token/issue-10636-2.rs +++ b/src/test/ui/token/issue-10636-2.rs @@ -1,13 +1,3 @@ -// Copyright 2013-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // FIXME(31528) we emit a bunch of silly errors here due to continuing past the // first one. This would be easy-ish to address by better recovery in tokenisation. diff --git a/src/test/ui/token/issue-10636-2.stderr b/src/test/ui/token/issue-10636-2.stderr index 634191bb5ef4e..3a7f9606e540a 100644 --- a/src/test/ui/token/issue-10636-2.stderr +++ b/src/test/ui/token/issue-10636-2.stderr @@ -1,5 +1,5 @@ error: incorrect close delimiter: `}` - --> $DIR/issue-10636-2.rs:18:1 + --> $DIR/issue-10636-2.rs:8:1 | LL | option.map(|some| 42; | - unclosed delimiter @@ -8,13 +8,13 @@ LL | } //~ ERROR: incorrect close delimiter | ^ incorrect close delimiter error: expected one of `)`, `,`, `.`, `?`, or an operator, found `;` - --> $DIR/issue-10636-2.rs:15:25 + --> $DIR/issue-10636-2.rs:5:25 | LL | option.map(|some| 42; | ^ expected one of `)`, `,`, `.`, `?`, or an operator here error: expected expression, found `)` - --> $DIR/issue-10636-2.rs:18:1 + --> $DIR/issue-10636-2.rs:8:1 | LL | } //~ ERROR: incorrect close delimiter | ^ expected expression diff --git a/src/test/ui/token/issue-15980.rs b/src/test/ui/token/issue-15980.rs index e1b134c820318..5fddd38fc6e6e 100644 --- a/src/test/ui/token/issue-15980.rs +++ b/src/test/ui/token/issue-15980.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::io; fn main(){ diff --git a/src/test/ui/token/issue-15980.stderr b/src/test/ui/token/issue-15980.stderr index d52368bf96a75..d9fd32846c7c0 100644 --- a/src/test/ui/token/issue-15980.stderr +++ b/src/test/ui/token/issue-15980.stderr @@ -1,5 +1,5 @@ error: expected identifier, found keyword `return` - --> $DIR/issue-15980.rs:20:13 + --> $DIR/issue-15980.rs:10:13 | LL | Err(ref e) if e.kind == io::EndOfFile { | ------------- while parsing this struct @@ -8,7 +8,7 @@ LL | return | ^^^^^^ expected identifier, found keyword error: expected one of `.`, `=>`, `?`, or an operator, found `_` - --> $DIR/issue-15980.rs:25:9 + --> $DIR/issue-15980.rs:15:9 | LL | } | - expected one of `.`, `=>`, `?`, or an operator here @@ -17,7 +17,7 @@ LL | _ => {} | ^ unexpected token error[E0412]: cannot find type `IoResult` in module `io` - --> $DIR/issue-15980.rs:14:16 + --> $DIR/issue-15980.rs:4:16 | LL | let x: io::IoResult<()> = Ok(()); | ^^^^^^^^ did you mean `Result`? diff --git a/src/test/ui/token/issue-41155.rs b/src/test/ui/token/issue-41155.rs index 7bd8506af90b9..0a6a8fd2303a6 100644 --- a/src/test/ui/token/issue-41155.rs +++ b/src/test/ui/token/issue-41155.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - impl S { //~ ERROR cannot find type pub } //~ ERROR expected one of diff --git a/src/test/ui/token/issue-41155.stderr b/src/test/ui/token/issue-41155.stderr index 5c1aae29c2fdf..b167448554727 100644 --- a/src/test/ui/token/issue-41155.stderr +++ b/src/test/ui/token/issue-41155.stderr @@ -1,5 +1,5 @@ error: expected one of `(`, `async`, `const`, `default`, `existential`, `extern`, `fn`, `type`, or `unsafe`, found `}` - --> $DIR/issue-41155.rs:13:1 + --> $DIR/issue-41155.rs:3:1 | LL | pub | - expected one of 9 possible tokens here @@ -7,7 +7,7 @@ LL | } //~ ERROR expected one of | ^ unexpected token error[E0412]: cannot find type `S` in this scope - --> $DIR/issue-41155.rs:11:6 + --> $DIR/issue-41155.rs:1:6 | LL | impl S { //~ ERROR cannot find type | ^ not found in this scope diff --git a/src/test/ui/token/macro-incomplete-parse.rs b/src/test/ui/token/macro-incomplete-parse.rs index 9b8fdaf9a257e..9294bebc5148c 100644 --- a/src/test/ui/token/macro-incomplete-parse.rs +++ b/src/test/ui/token/macro-incomplete-parse.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z continue-parse-after-error macro_rules! ignored_item { diff --git a/src/test/ui/token/macro-incomplete-parse.stderr b/src/test/ui/token/macro-incomplete-parse.stderr index 198730dc07a99..07061a1751592 100644 --- a/src/test/ui/token/macro-incomplete-parse.stderr +++ b/src/test/ui/token/macro-incomplete-parse.stderr @@ -1,17 +1,17 @@ error: macro expansion ignores token `,` and any following - --> $DIR/macro-incomplete-parse.rs:17:9 + --> $DIR/macro-incomplete-parse.rs:7:9 | LL | , //~ ERROR macro expansion ignores token `,` | ^ | note: caused by the macro expansion here; the usage of `ignored_item!` is likely invalid in item context - --> $DIR/macro-incomplete-parse.rs:31:1 + --> $DIR/macro-incomplete-parse.rs:21:1 | LL | ignored_item!(); | ^^^^^^^^^^^^^^^^ error: expected one of `.`, `;`, `?`, `}`, or an operator, found `,` - --> $DIR/macro-incomplete-parse.rs:22:14 + --> $DIR/macro-incomplete-parse.rs:12:14 | LL | () => ( 1, //~ ERROR expected one of `.`, `;`, `?`, `}`, or an operator, found `,` | ^ expected one of `.`, `;`, `?`, `}`, or an operator here @@ -20,13 +20,13 @@ LL | ignored_expr!(); | ---------------- in this macro invocation error: macro expansion ignores token `,` and any following - --> $DIR/macro-incomplete-parse.rs:28:14 + --> $DIR/macro-incomplete-parse.rs:18:14 | LL | () => ( 1, 2 ) //~ ERROR macro expansion ignores token `,` | ^ | note: caused by the macro expansion here; the usage of `ignored_pat!` is likely invalid in pattern context - --> $DIR/macro-incomplete-parse.rs:36:9 + --> $DIR/macro-incomplete-parse.rs:26:9 | LL | ignored_pat!() => (), | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/token/trailing-plus-in-bounds.rs b/src/test/ui/token/trailing-plus-in-bounds.rs index 72cae6abc2dbe..a9b947ae7209f 100644 --- a/src/test/ui/token/trailing-plus-in-bounds.rs +++ b/src/test/ui/token/trailing-plus-in-bounds.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error use std::fmt::Debug; diff --git a/src/test/ui/token/trailing-plus-in-bounds.stderr b/src/test/ui/token/trailing-plus-in-bounds.stderr index 1719b1d5e08a3..38659b662bcfd 100644 --- a/src/test/ui/token/trailing-plus-in-bounds.stderr +++ b/src/test/ui/token/trailing-plus-in-bounds.stderr @@ -1,5 +1,5 @@ error: expected one of `!` or `::`, found `` - --> $DIR/trailing-plus-in-bounds.rs:19:1 + --> $DIR/trailing-plus-in-bounds.rs:9:1 | LL | FAIL | ^^^^ expected one of `!` or `::` here diff --git a/src/test/ui/tool-attributes/tool-attributes-misplaced-1.rs b/src/test/ui/tool-attributes/tool-attributes-misplaced-1.rs index 8d3cfb5a16706..33cffcefd898a 100644 --- a/src/test/ui/tool-attributes/tool-attributes-misplaced-1.rs +++ b/src/test/ui/tool-attributes/tool-attributes-misplaced-1.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(custom_attribute)] type A = rustfmt; //~ ERROR expected type, found tool module `rustfmt` diff --git a/src/test/ui/tool-attributes/tool-attributes-misplaced-1.stderr b/src/test/ui/tool-attributes/tool-attributes-misplaced-1.stderr index 60188aebce77c..dd1de22f3da00 100644 --- a/src/test/ui/tool-attributes/tool-attributes-misplaced-1.stderr +++ b/src/test/ui/tool-attributes/tool-attributes-misplaced-1.stderr @@ -1,35 +1,35 @@ error: cannot find derive macro `rustfmt` in this scope - --> $DIR/tool-attributes-misplaced-1.rs:16:10 + --> $DIR/tool-attributes-misplaced-1.rs:6:10 | LL | #[derive(rustfmt)] //~ ERROR cannot find derive macro `rustfmt` in this scope | ^^^^^^^ error: cannot find macro `rustfmt!` in this scope - --> $DIR/tool-attributes-misplaced-1.rs:25:5 + --> $DIR/tool-attributes-misplaced-1.rs:15:5 | LL | rustfmt!(); //~ ERROR cannot find macro `rustfmt!` in this scope | ^^^^^^^ error[E0573]: expected type, found tool module `rustfmt` - --> $DIR/tool-attributes-misplaced-1.rs:13:10 + --> $DIR/tool-attributes-misplaced-1.rs:3:10 | LL | type A = rustfmt; //~ ERROR expected type, found tool module `rustfmt` | ^^^^^^^ not a type error[E0573]: expected type, found tool attribute `rustfmt::skip` - --> $DIR/tool-attributes-misplaced-1.rs:14:10 + --> $DIR/tool-attributes-misplaced-1.rs:4:10 | LL | type B = rustfmt::skip; //~ ERROR expected type, found tool attribute `rustfmt::skip` | ^^^^^^^^^^^^^ not a type error[E0423]: expected value, found tool module `rustfmt` - --> $DIR/tool-attributes-misplaced-1.rs:24:5 + --> $DIR/tool-attributes-misplaced-1.rs:14:5 | LL | rustfmt; //~ ERROR expected value, found tool module `rustfmt` | ^^^^^^^ not a value error[E0423]: expected value, found tool attribute `rustfmt::skip` - --> $DIR/tool-attributes-misplaced-1.rs:27:5 + --> $DIR/tool-attributes-misplaced-1.rs:17:5 | LL | rustfmt::skip; //~ ERROR expected value, found tool attribute `rustfmt::skip` | ^^^^^^^^^^^^^ not a value diff --git a/src/test/ui/tool-attributes/tool-attributes-misplaced-2.rs b/src/test/ui/tool-attributes/tool-attributes-misplaced-2.rs index e61ea9d5b443f..56b908d94cc88 100644 --- a/src/test/ui/tool-attributes/tool-attributes-misplaced-2.rs +++ b/src/test/ui/tool-attributes/tool-attributes-misplaced-2.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(rustfmt::skip)] //~ ERROR expected a macro, found tool attribute struct S; diff --git a/src/test/ui/tool-attributes/tool-attributes-misplaced-2.stderr b/src/test/ui/tool-attributes/tool-attributes-misplaced-2.stderr index ae47203a97580..50a7b5973283c 100644 --- a/src/test/ui/tool-attributes/tool-attributes-misplaced-2.stderr +++ b/src/test/ui/tool-attributes/tool-attributes-misplaced-2.stderr @@ -1,11 +1,11 @@ error: expected a macro, found tool attribute - --> $DIR/tool-attributes-misplaced-2.rs:11:10 + --> $DIR/tool-attributes-misplaced-2.rs:1:10 | LL | #[derive(rustfmt::skip)] //~ ERROR expected a macro, found tool attribute | ^^^^^^^^^^^^^ error: expected a macro, found tool attribute - --> $DIR/tool-attributes-misplaced-2.rs:15:5 + --> $DIR/tool-attributes-misplaced-2.rs:5:5 | LL | rustfmt::skip!(); //~ ERROR expected a macro, found tool attribute | ^^^^^^^^^^^^^ diff --git a/src/test/ui/tool-attributes/tool-attributes-shadowing.rs b/src/test/ui/tool-attributes/tool-attributes-shadowing.rs index b6a24ccf748e1..74d1f3586aa3e 100644 --- a/src/test/ui/tool-attributes/tool-attributes-shadowing.rs +++ b/src/test/ui/tool-attributes/tool-attributes-shadowing.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod rustfmt {} #[rustfmt::skip] //~ ERROR failed to resolve. Could not find `skip` in `rustfmt` diff --git a/src/test/ui/tool-attributes/tool-attributes-shadowing.stderr b/src/test/ui/tool-attributes/tool-attributes-shadowing.stderr index d593350f123c6..37093944aed07 100644 --- a/src/test/ui/tool-attributes/tool-attributes-shadowing.stderr +++ b/src/test/ui/tool-attributes/tool-attributes-shadowing.stderr @@ -1,5 +1,5 @@ error[E0433]: failed to resolve. Could not find `skip` in `rustfmt` - --> $DIR/tool-attributes-shadowing.rs:13:12 + --> $DIR/tool-attributes-shadowing.rs:3:12 | LL | #[rustfmt::skip] //~ ERROR failed to resolve. Could not find `skip` in `rustfmt` | ^^^^ Could not find `skip` in `rustfmt` diff --git a/src/test/ui/tool_lints-fail.rs b/src/test/ui/tool_lints-fail.rs index ea1efab4cb6f8..4f32e387b3a08 100644 --- a/src/test/ui/tool_lints-fail.rs +++ b/src/test/ui/tool_lints-fail.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Don't allow tool_lints, which aren't scoped #![feature(tool_lints)] diff --git a/src/test/ui/tool_lints-fail.stderr b/src/test/ui/tool_lints-fail.stderr index 735673b5785e8..6b027eecf2682 100644 --- a/src/test/ui/tool_lints-fail.stderr +++ b/src/test/ui/tool_lints-fail.stderr @@ -1,11 +1,11 @@ error: unknown lint: `clippy` - --> $DIR/tool_lints-fail.rs:16:9 + --> $DIR/tool_lints-fail.rs:6:9 | LL | #![deny(clippy)] //~ ERROR: unknown lint: `clippy` | ^^^^^^ | note: lint level defined here - --> $DIR/tool_lints-fail.rs:14:9 + --> $DIR/tool_lints-fail.rs:4:9 | LL | #![deny(unknown_lints)] | ^^^^^^^^^^^^^ diff --git a/src/test/ui/tool_lints.rs b/src/test/ui/tool_lints.rs index 71f90b17c18fc..e0e6f0e1faf53 100644 --- a/src/test/ui/tool_lints.rs +++ b/src/test/ui/tool_lints.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(tool_lints)] #[warn(foo::bar)] diff --git a/src/test/ui/tool_lints.stderr b/src/test/ui/tool_lints.stderr index 16468df737014..4589d2b672535 100644 --- a/src/test/ui/tool_lints.stderr +++ b/src/test/ui/tool_lints.stderr @@ -1,5 +1,5 @@ error[E0710]: an unknown tool name found in scoped lint: `foo::bar` - --> $DIR/tool_lints.rs:13:8 + --> $DIR/tool_lints.rs:3:8 | LL | #[warn(foo::bar)] | ^^^ diff --git a/src/test/ui/trace_macros-format.rs b/src/test/ui/trace_macros-format.rs index 95cb17c215b7b..afca45ca0f293 100644 --- a/src/test/ui/trace_macros-format.rs +++ b/src/test/ui/trace_macros-format.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(trace_macros)] fn main() { diff --git a/src/test/ui/trace_macros-format.stderr b/src/test/ui/trace_macros-format.stderr index 8dad041e9fe4a..a180c360b4a74 100644 --- a/src/test/ui/trace_macros-format.stderr +++ b/src/test/ui/trace_macros-format.stderr @@ -1,35 +1,35 @@ error: trace_macros! accepts only `true` or `false` - --> $DIR/trace_macros-format.rs:14:5 + --> $DIR/trace_macros-format.rs:4:5 | LL | trace_macros!(); //~ ERROR trace_macros! accepts only `true` or `false` | ^^^^^^^^^^^^^^^^ error: trace_macros! accepts only `true` or `false` - --> $DIR/trace_macros-format.rs:15:5 + --> $DIR/trace_macros-format.rs:5:5 | LL | trace_macros!(1); //~ ERROR trace_macros! accepts only `true` or `false` | ^^^^^^^^^^^^^^^^^ error: trace_macros! accepts only `true` or `false` - --> $DIR/trace_macros-format.rs:16:5 + --> $DIR/trace_macros-format.rs:6:5 | LL | trace_macros!(ident); //~ ERROR trace_macros! accepts only `true` or `false` | ^^^^^^^^^^^^^^^^^^^^^ error: trace_macros! accepts only `true` or `false` - --> $DIR/trace_macros-format.rs:17:5 + --> $DIR/trace_macros-format.rs:7:5 | LL | trace_macros!(for); //~ ERROR trace_macros! accepts only `true` or `false` | ^^^^^^^^^^^^^^^^^^^ error: trace_macros! accepts only `true` or `false` - --> $DIR/trace_macros-format.rs:18:5 + --> $DIR/trace_macros-format.rs:8:5 | LL | trace_macros!(true,); //~ ERROR trace_macros! accepts only `true` or `false` | ^^^^^^^^^^^^^^^^^^^^^ error: trace_macros! accepts only `true` or `false` - --> $DIR/trace_macros-format.rs:19:5 + --> $DIR/trace_macros-format.rs:9:5 | LL | trace_macros!(false 1); //~ ERROR trace_macros! accepts only `true` or `false` | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/trace_macros-gate.rs b/src/test/ui/trace_macros-gate.rs index d4a7c4ed0e0f9..d32ada5abc9db 100644 --- a/src/test/ui/trace_macros-gate.rs +++ b/src/test/ui/trace_macros-gate.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the trace_macros feature gate is on. fn main() { diff --git a/src/test/ui/trace_macros-gate.stderr b/src/test/ui/trace_macros-gate.stderr index ed92e1227baf5..1f7d8e898b60f 100644 --- a/src/test/ui/trace_macros-gate.stderr +++ b/src/test/ui/trace_macros-gate.stderr @@ -1,5 +1,5 @@ error[E0658]: `trace_macros` is not stable enough for use and is subject to change (see issue #29598) - --> $DIR/trace_macros-gate.rs:14:5 + --> $DIR/trace_macros-gate.rs:4:5 | LL | trace_macros!(); //~ ERROR `trace_macros` is not stable | ^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | trace_macros!(); //~ ERROR `trace_macros` is not stable = help: add #![feature(trace_macros)] to the crate attributes to enable error[E0658]: `trace_macros` is not stable enough for use and is subject to change (see issue #29598) - --> $DIR/trace_macros-gate.rs:15:5 + --> $DIR/trace_macros-gate.rs:5:5 | LL | trace_macros!(1); //~ ERROR `trace_macros` is not stable | ^^^^^^^^^^^^^^^^^ @@ -15,7 +15,7 @@ LL | trace_macros!(1); //~ ERROR `trace_macros` is not stable = help: add #![feature(trace_macros)] to the crate attributes to enable error[E0658]: `trace_macros` is not stable enough for use and is subject to change (see issue #29598) - --> $DIR/trace_macros-gate.rs:16:5 + --> $DIR/trace_macros-gate.rs:6:5 | LL | trace_macros!(ident); //~ ERROR `trace_macros` is not stable | ^^^^^^^^^^^^^^^^^^^^^ @@ -23,7 +23,7 @@ LL | trace_macros!(ident); //~ ERROR `trace_macros` is not stable = help: add #![feature(trace_macros)] to the crate attributes to enable error[E0658]: `trace_macros` is not stable enough for use and is subject to change (see issue #29598) - --> $DIR/trace_macros-gate.rs:17:5 + --> $DIR/trace_macros-gate.rs:7:5 | LL | trace_macros!(for); //~ ERROR `trace_macros` is not stable | ^^^^^^^^^^^^^^^^^^^ @@ -31,7 +31,7 @@ LL | trace_macros!(for); //~ ERROR `trace_macros` is not stable = help: add #![feature(trace_macros)] to the crate attributes to enable error[E0658]: `trace_macros` is not stable enough for use and is subject to change (see issue #29598) - --> $DIR/trace_macros-gate.rs:18:5 + --> $DIR/trace_macros-gate.rs:8:5 | LL | trace_macros!(true,); //~ ERROR `trace_macros` is not stable | ^^^^^^^^^^^^^^^^^^^^^ @@ -39,7 +39,7 @@ LL | trace_macros!(true,); //~ ERROR `trace_macros` is not stable = help: add #![feature(trace_macros)] to the crate attributes to enable error[E0658]: `trace_macros` is not stable enough for use and is subject to change (see issue #29598) - --> $DIR/trace_macros-gate.rs:19:5 + --> $DIR/trace_macros-gate.rs:9:5 | LL | trace_macros!(false 1); //~ ERROR `trace_macros` is not stable | ^^^^^^^^^^^^^^^^^^^^^^^ @@ -47,7 +47,7 @@ LL | trace_macros!(false 1); //~ ERROR `trace_macros` is not stable = help: add #![feature(trace_macros)] to the crate attributes to enable error[E0658]: `trace_macros` is not stable enough for use and is subject to change (see issue #29598) - --> $DIR/trace_macros-gate.rs:26:26 + --> $DIR/trace_macros-gate.rs:16:26 | LL | ($x: ident) => { trace_macros!($x) } //~ ERROR `trace_macros` is not stable | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/trait-alias-fail.rs b/src/test/ui/trait-alias-fail.rs index 7aca227a76c48..3f06537542f9d 100644 --- a/src/test/ui/trait-alias-fail.rs +++ b/src/test/ui/trait-alias-fail.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // gate-test-trait_alias trait Alias1 = Default where T: Clone; // ok diff --git a/src/test/ui/trait-alias-fail.stderr b/src/test/ui/trait-alias-fail.stderr index f7b144c06f80a..f238a18b34d55 100644 --- a/src/test/ui/trait-alias-fail.stderr +++ b/src/test/ui/trait-alias-fail.stderr @@ -1,29 +1,29 @@ error: type parameters on the left side of a trait alias cannot be bounded - --> $DIR/trait-alias-fail.rs:15:14 + --> $DIR/trait-alias-fail.rs:5:14 | LL | trait Alias2 = Default; | ^ error: type parameters on the left side of a trait alias cannot have defaults - --> $DIR/trait-alias-fail.rs:15:14 + --> $DIR/trait-alias-fail.rs:5:14 | LL | trait Alias2 = Default; | ^ error[E0573]: expected type, found trait alias `Alias1` - --> $DIR/trait-alias-fail.rs:20:6 + --> $DIR/trait-alias-fail.rs:10:6 | LL | impl Alias1 { //~ERROR expected type, found trait alias | ^^^^^^ not a type error[E0404]: expected trait, found trait alias `Alias1` - --> $DIR/trait-alias-fail.rs:23:6 + --> $DIR/trait-alias-fail.rs:13:6 | LL | impl Alias1 for () { //~ERROR expected trait, found trait alias | ^^^^^^ not a trait error[E0658]: trait aliases are not yet fully implemented (see issue #41517) - --> $DIR/trait-alias-fail.rs:13:1 + --> $DIR/trait-alias-fail.rs:3:1 | LL | trait Alias1 = Default where T: Clone; // ok | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -31,7 +31,7 @@ LL | trait Alias1 = Default where T: Clone; // ok = help: add #![feature(trait_alias)] to the crate attributes to enable error[E0658]: trait aliases are not yet fully implemented (see issue #41517) - --> $DIR/trait-alias-fail.rs:15:1 + --> $DIR/trait-alias-fail.rs:5:1 | LL | trait Alias2 = Default; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/traits/auxiliary/crate_a1.rs b/src/test/ui/traits/auxiliary/crate_a1.rs index 70f7cac94de6c..e2e18500541ef 100644 --- a/src/test/ui/traits/auxiliary/crate_a1.rs +++ b/src/test/ui/traits/auxiliary/crate_a1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Foo; pub trait Bar{} diff --git a/src/test/ui/traits/auxiliary/trait_bounds_on_structs_and_enums_xc.rs b/src/test/ui/traits/auxiliary/trait_bounds_on_structs_and_enums_xc.rs index 29cb0bc176a25..7e9592eee2c0d 100644 --- a/src/test/ui/traits/auxiliary/trait_bounds_on_structs_and_enums_xc.rs +++ b/src/test/ui/traits/auxiliary/trait_bounds_on_structs_and_enums_xc.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Trait { fn dummy(&self) { } } diff --git a/src/test/ui/traits/auxiliary/trait_safety_lib.rs b/src/test/ui/traits/auxiliary/trait_safety_lib.rs index 585a756fd0767..6fc432ed45504 100644 --- a/src/test/ui/traits/auxiliary/trait_safety_lib.rs +++ b/src/test/ui/traits/auxiliary/trait_safety_lib.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Simple smoke test that unsafe traits can be compiled etc. pub unsafe trait Foo { diff --git a/src/test/ui/traits/trait-alias.rs b/src/test/ui/traits/trait-alias.rs index 9ea211b4d7d69..856d2e417900f 100644 --- a/src/test/ui/traits/trait-alias.rs +++ b/src/test/ui/traits/trait-alias.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(trait_alias)] trait SimpleAlias = Default; //~ERROR E0645 diff --git a/src/test/ui/traits/trait-alias.stderr b/src/test/ui/traits/trait-alias.stderr index 5d290e5c7fba1..01695658e692d 100644 --- a/src/test/ui/traits/trait-alias.stderr +++ b/src/test/ui/traits/trait-alias.stderr @@ -1,35 +1,35 @@ error[E0645]: trait aliases are not yet implemented (see issue #41517) - --> $DIR/trait-alias.rs:13:1 + --> $DIR/trait-alias.rs:3:1 | LL | trait SimpleAlias = Default; //~ERROR E0645 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0645]: trait aliases are not yet implemented (see issue #41517) - --> $DIR/trait-alias.rs:14:1 + --> $DIR/trait-alias.rs:4:1 | LL | trait GenericAlias = Iterator; //~ERROR E0645 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0645]: trait aliases are not yet implemented (see issue #41517) - --> $DIR/trait-alias.rs:15:1 + --> $DIR/trait-alias.rs:5:1 | LL | trait Partial = IntoIterator; //~ERROR E0645 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0645]: trait aliases are not yet implemented (see issue #41517) - --> $DIR/trait-alias.rs:24:1 + --> $DIR/trait-alias.rs:14:1 | LL | trait WithWhere = Romeo + Romeo where Fore<(Art, Thou)>: Romeo; //~ERROR E0645 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0645]: trait aliases are not yet implemented (see issue #41517) - --> $DIR/trait-alias.rs:25:1 + --> $DIR/trait-alias.rs:15:1 | LL | trait BareWhere = where The: Things; //~ERROR E0645 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0645]: trait aliases are not yet implemented (see issue #41517) - --> $DIR/trait-alias.rs:27:1 + --> $DIR/trait-alias.rs:17:1 | LL | trait CD = Clone + Default; //~ERROR E0645 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/traits/trait-as-struct-constructor.rs b/src/test/ui/traits/trait-as-struct-constructor.rs index 49d58580da52d..13ebf9d8d6680 100644 --- a/src/test/ui/traits/trait-as-struct-constructor.rs +++ b/src/test/ui/traits/trait-as-struct-constructor.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait TraitNotAStruct {} fn main() { diff --git a/src/test/ui/traits/trait-as-struct-constructor.stderr b/src/test/ui/traits/trait-as-struct-constructor.stderr index ecb4e5d44c9f3..e1d54fbf8aa7b 100644 --- a/src/test/ui/traits/trait-as-struct-constructor.stderr +++ b/src/test/ui/traits/trait-as-struct-constructor.stderr @@ -1,5 +1,5 @@ error[E0574]: expected struct, variant or union type, found trait `TraitNotAStruct` - --> $DIR/trait-as-struct-constructor.rs:14:5 + --> $DIR/trait-as-struct-constructor.rs:4:5 | LL | TraitNotAStruct{ value: 0 }; | ^^^^^^^^^^^^^^^ not a struct, variant or union type diff --git a/src/test/ui/traits/trait-bounds-not-on-bare-trait.rs b/src/test/ui/traits/trait-bounds-not-on-bare-trait.rs index 9c38d8a9e2a36..fd3af6f3a9aaa 100644 --- a/src/test/ui/traits/trait-bounds-not-on-bare-trait.rs +++ b/src/test/ui/traits/trait-bounds-not-on-bare-trait.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn dummy(&self) { } } diff --git a/src/test/ui/traits/trait-bounds-not-on-bare-trait.stderr b/src/test/ui/traits/trait-bounds-not-on-bare-trait.stderr index ecabf9af27b38..43d1e1a9d3e45 100644 --- a/src/test/ui/traits/trait-bounds-not-on-bare-trait.stderr +++ b/src/test/ui/traits/trait-bounds-not-on-bare-trait.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `(dyn Foo + std::marker::Send + 'static)` cannot be known at compilation time - --> $DIR/trait-bounds-not-on-bare-trait.rs:17:8 + --> $DIR/trait-bounds-not-on-bare-trait.rs:7:8 | LL | fn foo(_x: Foo + Send) { | ^^ doesn't have a size known at compile-time diff --git a/src/test/ui/traits/trait-bounds-not-on-struct.rs b/src/test/ui/traits/trait-bounds-not-on-struct.rs index 76bbca606580d..c6e93e7552502 100644 --- a/src/test/ui/traits/trait-bounds-not-on-struct.rs +++ b/src/test/ui/traits/trait-bounds-not-on-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(bare_trait_objects)] struct Foo; diff --git a/src/test/ui/traits/trait-bounds-not-on-struct.stderr b/src/test/ui/traits/trait-bounds-not-on-struct.stderr index 929a1bfaa15c3..1595fff618f05 100644 --- a/src/test/ui/traits/trait-bounds-not-on-struct.stderr +++ b/src/test/ui/traits/trait-bounds-not-on-struct.stderr @@ -1,11 +1,11 @@ error[E0404]: expected trait, found struct `Foo` - --> $DIR/trait-bounds-not-on-struct.rs:15:16 + --> $DIR/trait-bounds-not-on-struct.rs:5:16 | LL | fn foo(_x: Box) { } //~ ERROR expected trait, found struct `Foo` | ^^^ not a trait error[E0404]: expected trait, found struct `Vec` - --> $DIR/trait-bounds-not-on-struct.rs:17:21 + --> $DIR/trait-bounds-not-on-struct.rs:7:21 | LL | type A = Box>; //~ ERROR expected trait, found struct `Vec` | ^^^^^^ not a trait diff --git a/src/test/ui/traits/trait-bounds-on-structs-and-enums-in-fns.rs b/src/test/ui/traits/trait-bounds-on-structs-and-enums-in-fns.rs index 6a271a7b7497f..6a6fcf5301d20 100644 --- a/src/test/ui/traits/trait-bounds-on-structs-and-enums-in-fns.rs +++ b/src/test/ui/traits/trait-bounds-on-structs-and-enums-in-fns.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Trait {} struct Foo { diff --git a/src/test/ui/traits/trait-bounds-on-structs-and-enums-in-fns.stderr b/src/test/ui/traits/trait-bounds-on-structs-and-enums-in-fns.stderr index 6dd4d1fca86e3..6fdd2ceaaac9c 100644 --- a/src/test/ui/traits/trait-bounds-on-structs-and-enums-in-fns.stderr +++ b/src/test/ui/traits/trait-bounds-on-structs-and-enums-in-fns.stderr @@ -1,23 +1,23 @@ error[E0277]: the trait bound `u32: Trait` is not satisfied - --> $DIR/trait-bounds-on-structs-and-enums-in-fns.rs:23:1 + --> $DIR/trait-bounds-on-structs-and-enums-in-fns.rs:13:1 | LL | fn explode(x: Foo) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Trait` is not implemented for `u32` | note: required by `Foo` - --> $DIR/trait-bounds-on-structs-and-enums-in-fns.rs:13:1 + --> $DIR/trait-bounds-on-structs-and-enums-in-fns.rs:3:1 | LL | struct Foo { | ^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `f32: Trait` is not satisfied - --> $DIR/trait-bounds-on-structs-and-enums-in-fns.rs:26:1 + --> $DIR/trait-bounds-on-structs-and-enums-in-fns.rs:16:1 | LL | fn kaboom(y: Bar) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Trait` is not implemented for `f32` | note: required by `Bar` - --> $DIR/trait-bounds-on-structs-and-enums-in-fns.rs:17:1 + --> $DIR/trait-bounds-on-structs-and-enums-in-fns.rs:7:1 | LL | enum Bar { | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/traits/trait-bounds-on-structs-and-enums-in-impls.rs b/src/test/ui/traits/trait-bounds-on-structs-and-enums-in-impls.rs index 77abe6f7f7473..d379499521c7c 100644 --- a/src/test/ui/traits/trait-bounds-on-structs-and-enums-in-impls.rs +++ b/src/test/ui/traits/trait-bounds-on-structs-and-enums-in-impls.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Trait {} struct Foo { diff --git a/src/test/ui/traits/trait-bounds-on-structs-and-enums-in-impls.stderr b/src/test/ui/traits/trait-bounds-on-structs-and-enums-in-impls.stderr index 6f91770687352..15441b583cef2 100644 --- a/src/test/ui/traits/trait-bounds-on-structs-and-enums-in-impls.stderr +++ b/src/test/ui/traits/trait-bounds-on-structs-and-enums-in-impls.stderr @@ -1,11 +1,11 @@ error[E0277]: the trait bound `u16: Trait` is not satisfied - --> $DIR/trait-bounds-on-structs-and-enums-in-impls.rs:30:6 + --> $DIR/trait-bounds-on-structs-and-enums-in-impls.rs:20:6 | LL | impl PolyTrait> for Struct { | ^^^^^^^^^^^^^^^^^^^ the trait `Trait` is not implemented for `u16` | note: required by `Foo` - --> $DIR/trait-bounds-on-structs-and-enums-in-impls.rs:13:1 + --> $DIR/trait-bounds-on-structs-and-enums-in-impls.rs:3:1 | LL | struct Foo { | ^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/traits/trait-bounds-on-structs-and-enums-locals.rs b/src/test/ui/traits/trait-bounds-on-structs-and-enums-locals.rs index 9e680d17fb9ef..21c0ce80f8a8d 100644 --- a/src/test/ui/traits/trait-bounds-on-structs-and-enums-locals.rs +++ b/src/test/ui/traits/trait-bounds-on-structs-and-enums-locals.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Trait { fn dummy(&self) { } } diff --git a/src/test/ui/traits/trait-bounds-on-structs-and-enums-locals.stderr b/src/test/ui/traits/trait-bounds-on-structs-and-enums-locals.stderr index cdaa12428ae32..cdcfff97bd020 100644 --- a/src/test/ui/traits/trait-bounds-on-structs-and-enums-locals.stderr +++ b/src/test/ui/traits/trait-bounds-on-structs-and-enums-locals.stderr @@ -1,23 +1,23 @@ error[E0277]: the trait bound `usize: Trait` is not satisfied - --> $DIR/trait-bounds-on-structs-and-enums-locals.rs:25:14 + --> $DIR/trait-bounds-on-structs-and-enums-locals.rs:15:14 | LL | let baz: Foo = loop { }; | ^^^^^^^^^^ the trait `Trait` is not implemented for `usize` | note: required by `Foo` - --> $DIR/trait-bounds-on-structs-and-enums-locals.rs:15:1 + --> $DIR/trait-bounds-on-structs-and-enums-locals.rs:5:1 | LL | struct Foo { | ^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `{integer}: Trait` is not satisfied - --> $DIR/trait-bounds-on-structs-and-enums-locals.rs:20:15 + --> $DIR/trait-bounds-on-structs-and-enums-locals.rs:10:15 | LL | let foo = Foo { | ^^^ the trait `Trait` is not implemented for `{integer}` | note: required by `Foo` - --> $DIR/trait-bounds-on-structs-and-enums-locals.rs:15:1 + --> $DIR/trait-bounds-on-structs-and-enums-locals.rs:5:1 | LL | struct Foo { | ^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/traits/trait-bounds-on-structs-and-enums-static.rs b/src/test/ui/traits/trait-bounds-on-structs-and-enums-static.rs index 2b59fdcae3534..df3f8b8a59961 100644 --- a/src/test/ui/traits/trait-bounds-on-structs-and-enums-static.rs +++ b/src/test/ui/traits/trait-bounds-on-structs-and-enums-static.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Trait { fn dummy(&self) { } } diff --git a/src/test/ui/traits/trait-bounds-on-structs-and-enums-static.stderr b/src/test/ui/traits/trait-bounds-on-structs-and-enums-static.stderr index 28d4257a9fba9..b6745dc9ba295 100644 --- a/src/test/ui/traits/trait-bounds-on-structs-and-enums-static.stderr +++ b/src/test/ui/traits/trait-bounds-on-structs-and-enums-static.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `usize: Trait` is not satisfied - --> $DIR/trait-bounds-on-structs-and-enums-static.rs:19:1 + --> $DIR/trait-bounds-on-structs-and-enums-static.rs:9:1 | LL | / static X: Foo = Foo { LL | | //~^ ERROR E0277 @@ -8,7 +8,7 @@ LL | | }; | |__^ the trait `Trait` is not implemented for `usize` | note: required by `Foo` - --> $DIR/trait-bounds-on-structs-and-enums-static.rs:15:1 + --> $DIR/trait-bounds-on-structs-and-enums-static.rs:5:1 | LL | struct Foo { | ^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/traits/trait-bounds-on-structs-and-enums-xc.rs b/src/test/ui/traits/trait-bounds-on-structs-and-enums-xc.rs index 975de00d02a33..901a2c4391f6d 100644 --- a/src/test/ui/traits/trait-bounds-on-structs-and-enums-xc.rs +++ b/src/test/ui/traits/trait-bounds-on-structs-and-enums-xc.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:trait_bounds_on_structs_and_enums_xc.rs extern crate trait_bounds_on_structs_and_enums_xc; diff --git a/src/test/ui/traits/trait-bounds-on-structs-and-enums-xc.stderr b/src/test/ui/traits/trait-bounds-on-structs-and-enums-xc.stderr index b798ccfc7a40a..2f2c903a45c19 100644 --- a/src/test/ui/traits/trait-bounds-on-structs-and-enums-xc.stderr +++ b/src/test/ui/traits/trait-bounds-on-structs-and-enums-xc.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `usize: trait_bounds_on_structs_and_enums_xc::Trait` is not satisfied - --> $DIR/trait-bounds-on-structs-and-enums-xc.rs:17:1 + --> $DIR/trait-bounds-on-structs-and-enums-xc.rs:7:1 | LL | fn explode(x: Foo) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `trait_bounds_on_structs_and_enums_xc::Trait` is not implemented for `usize` @@ -7,7 +7,7 @@ LL | fn explode(x: Foo) {} = note: required by `trait_bounds_on_structs_and_enums_xc::Foo` error[E0277]: the trait bound `f32: trait_bounds_on_structs_and_enums_xc::Trait` is not satisfied - --> $DIR/trait-bounds-on-structs-and-enums-xc.rs:20:1 + --> $DIR/trait-bounds-on-structs-and-enums-xc.rs:10:1 | LL | fn kaboom(y: Bar) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `trait_bounds_on_structs_and_enums_xc::Trait` is not implemented for `f32` diff --git a/src/test/ui/traits/trait-bounds-on-structs-and-enums-xc1.rs b/src/test/ui/traits/trait-bounds-on-structs-and-enums-xc1.rs index 515684bcf42d2..2a4ba9677efb0 100644 --- a/src/test/ui/traits/trait-bounds-on-structs-and-enums-xc1.rs +++ b/src/test/ui/traits/trait-bounds-on-structs-and-enums-xc1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:trait_bounds_on_structs_and_enums_xc.rs extern crate trait_bounds_on_structs_and_enums_xc; diff --git a/src/test/ui/traits/trait-bounds-on-structs-and-enums-xc1.stderr b/src/test/ui/traits/trait-bounds-on-structs-and-enums-xc1.stderr index 0b0bd4f6ab15b..57db65df5f331 100644 --- a/src/test/ui/traits/trait-bounds-on-structs-and-enums-xc1.stderr +++ b/src/test/ui/traits/trait-bounds-on-structs-and-enums-xc1.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `f64: trait_bounds_on_structs_and_enums_xc::Trait` is not satisfied - --> $DIR/trait-bounds-on-structs-and-enums-xc1.rs:22:14 + --> $DIR/trait-bounds-on-structs-and-enums-xc1.rs:12:14 | LL | let bar: Bar = return; | ^^^^^^^^ the trait `trait_bounds_on_structs_and_enums_xc::Trait` is not implemented for `f64` @@ -7,7 +7,7 @@ LL | let bar: Bar = return; = note: required by `trait_bounds_on_structs_and_enums_xc::Bar` error[E0277]: the trait bound `{integer}: trait_bounds_on_structs_and_enums_xc::Trait` is not satisfied - --> $DIR/trait-bounds-on-structs-and-enums-xc1.rs:18:15 + --> $DIR/trait-bounds-on-structs-and-enums-xc1.rs:8:15 | LL | let foo = Foo { | ^^^ the trait `trait_bounds_on_structs_and_enums_xc::Trait` is not implemented for `{integer}` diff --git a/src/test/ui/traits/trait-bounds-on-structs-and-enums.rs b/src/test/ui/traits/trait-bounds-on-structs-and-enums.rs index 24e2418e8d45e..024084fa724f1 100644 --- a/src/test/ui/traits/trait-bounds-on-structs-and-enums.rs +++ b/src/test/ui/traits/trait-bounds-on-structs-and-enums.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Trait {} struct Foo { diff --git a/src/test/ui/traits/trait-bounds-on-structs-and-enums.stderr b/src/test/ui/traits/trait-bounds-on-structs-and-enums.stderr index 5686e62c8b924..5429029c1ec91 100644 --- a/src/test/ui/traits/trait-bounds-on-structs-and-enums.stderr +++ b/src/test/ui/traits/trait-bounds-on-structs-and-enums.stderr @@ -1,86 +1,86 @@ error[E0277]: the trait bound `T: Trait` is not satisfied - --> $DIR/trait-bounds-on-structs-and-enums.rs:23:9 + --> $DIR/trait-bounds-on-structs-and-enums.rs:13:9 | LL | impl Foo { | ^^^^^^ the trait `Trait` is not implemented for `T` | = help: consider adding a `where T: Trait` bound note: required by `Foo` - --> $DIR/trait-bounds-on-structs-and-enums.rs:13:1 + --> $DIR/trait-bounds-on-structs-and-enums.rs:3:1 | LL | struct Foo { | ^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `isize: Trait` is not satisfied - --> $DIR/trait-bounds-on-structs-and-enums.rs:29:5 + --> $DIR/trait-bounds-on-structs-and-enums.rs:19:5 | LL | a: Foo, //~ ERROR E0277 | ^^^^^^^^^^^^^ the trait `Trait` is not implemented for `isize` | note: required by `Foo` - --> $DIR/trait-bounds-on-structs-and-enums.rs:13:1 + --> $DIR/trait-bounds-on-structs-and-enums.rs:3:1 | LL | struct Foo { | ^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `usize: Trait` is not satisfied - --> $DIR/trait-bounds-on-structs-and-enums.rs:33:10 + --> $DIR/trait-bounds-on-structs-and-enums.rs:23:10 | LL | Quux(Bar), //~ ERROR E0277 | ^^^^^^^^^^ the trait `Trait` is not implemented for `usize` | note: required by `Bar` - --> $DIR/trait-bounds-on-structs-and-enums.rs:17:1 + --> $DIR/trait-bounds-on-structs-and-enums.rs:7:1 | LL | enum Bar { | ^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `U: Trait` is not satisfied - --> $DIR/trait-bounds-on-structs-and-enums.rs:37:5 + --> $DIR/trait-bounds-on-structs-and-enums.rs:27:5 | LL | b: Foo, //~ ERROR E0277 | ^^^^^^^^^ the trait `Trait` is not implemented for `U` | = help: consider adding a `where U: Trait` bound note: required by `Foo` - --> $DIR/trait-bounds-on-structs-and-enums.rs:13:1 + --> $DIR/trait-bounds-on-structs-and-enums.rs:3:1 | LL | struct Foo { | ^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `V: Trait` is not satisfied - --> $DIR/trait-bounds-on-structs-and-enums.rs:41:21 + --> $DIR/trait-bounds-on-structs-and-enums.rs:31:21 | LL | EvenMoreBadness(Bar), //~ ERROR E0277 | ^^^^^^ the trait `Trait` is not implemented for `V` | = help: consider adding a `where V: Trait` bound note: required by `Bar` - --> $DIR/trait-bounds-on-structs-and-enums.rs:17:1 + --> $DIR/trait-bounds-on-structs-and-enums.rs:7:1 | LL | enum Bar { | ^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `i32: Trait` is not satisfied - --> $DIR/trait-bounds-on-structs-and-enums.rs:45:5 + --> $DIR/trait-bounds-on-structs-and-enums.rs:35:5 | LL | Foo, //~ ERROR E0277 | ^^^^^^^^ the trait `Trait` is not implemented for `i32` | note: required by `Foo` - --> $DIR/trait-bounds-on-structs-and-enums.rs:13:1 + --> $DIR/trait-bounds-on-structs-and-enums.rs:3:1 | LL | struct Foo { | ^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `u8: Trait` is not satisfied - --> $DIR/trait-bounds-on-structs-and-enums.rs:49:22 + --> $DIR/trait-bounds-on-structs-and-enums.rs:39:22 | LL | DictionaryLike { field: Bar }, //~ ERROR E0277 | ^^^^^^^^^^^^^^ the trait `Trait` is not implemented for `u8` | note: required by `Bar` - --> $DIR/trait-bounds-on-structs-and-enums.rs:17:1 + --> $DIR/trait-bounds-on-structs-and-enums.rs:7:1 | LL | enum Bar { | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/traits/trait-bounds-sugar.rs b/src/test/ui/traits/trait-bounds-sugar.rs index 0a36fcbed6905..0892153c0cf86 100644 --- a/src/test/ui/traits/trait-bounds-sugar.rs +++ b/src/test/ui/traits/trait-bounds-sugar.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests for "default" bounds inferred for traits with no bounds list. trait Foo {} diff --git a/src/test/ui/traits/trait-bounds-sugar.stderr b/src/test/ui/traits/trait-bounds-sugar.stderr index bd899e065452e..eb45a16afb1c8 100644 --- a/src/test/ui/traits/trait-bounds-sugar.stderr +++ b/src/test/ui/traits/trait-bounds-sugar.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/trait-bounds-sugar.rs:22:7 + --> $DIR/trait-bounds-sugar.rs:12:7 | LL | a(x); //~ ERROR mismatched types | ^ expected trait `Foo + std::marker::Send`, found trait `Foo + std::marker::Sync` diff --git a/src/test/ui/traits/trait-coercion-generic-bad.rs b/src/test/ui/traits/trait-coercion-generic-bad.rs index 3839e90ed9fe7..5aa2183414820 100644 --- a/src/test/ui/traits/trait-coercion-generic-bad.rs +++ b/src/test/ui/traits/trait-coercion-generic-bad.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Struct { person: &'static str } diff --git a/src/test/ui/traits/trait-coercion-generic-bad.stderr b/src/test/ui/traits/trait-coercion-generic-bad.stderr index a186877e57bc3..7f3b46b8ae52d 100644 --- a/src/test/ui/traits/trait-coercion-generic-bad.stderr +++ b/src/test/ui/traits/trait-coercion-generic-bad.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `Struct: Trait` is not satisfied - --> $DIR/trait-coercion-generic-bad.rs:26:32 + --> $DIR/trait-coercion-generic-bad.rs:16:32 | LL | let s: Box> = Box::new(Struct { person: "Fred" }); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Trait` is not implemented for `Struct` diff --git a/src/test/ui/traits/trait-coercion-generic-regions.nll.stderr b/src/test/ui/traits/trait-coercion-generic-regions.nll.stderr index c6a7482c29f6d..42b5e42853e0b 100644 --- a/src/test/ui/traits/trait-coercion-generic-regions.nll.stderr +++ b/src/test/ui/traits/trait-coercion-generic-regions.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `person` does not live long enough - --> $DIR/trait-coercion-generic-regions.rs:27:24 + --> $DIR/trait-coercion-generic-regions.rs:17:24 | LL | let person: &str = &person; //~ ERROR `person` does not live long enough | ^^^^^^^ borrowed value does not live long enough diff --git a/src/test/ui/traits/trait-coercion-generic-regions.rs b/src/test/ui/traits/trait-coercion-generic-regions.rs index 18d3ded77f8f3..148b7dd5c43da 100644 --- a/src/test/ui/traits/trait-coercion-generic-regions.rs +++ b/src/test/ui/traits/trait-coercion-generic-regions.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Struct { person: &'static str } diff --git a/src/test/ui/traits/trait-coercion-generic-regions.stderr b/src/test/ui/traits/trait-coercion-generic-regions.stderr index 8eaf7e9c1ef4d..23c2a72743eea 100644 --- a/src/test/ui/traits/trait-coercion-generic-regions.stderr +++ b/src/test/ui/traits/trait-coercion-generic-regions.stderr @@ -1,5 +1,5 @@ error[E0597]: `person` does not live long enough - --> $DIR/trait-coercion-generic-regions.rs:27:25 + --> $DIR/trait-coercion-generic-regions.rs:17:25 | LL | let person: &str = &person; //~ ERROR `person` does not live long enough | ^^^^^^ borrowed value does not live long enough diff --git a/src/test/ui/traits/trait-duplicate-methods.rs b/src/test/ui/traits/trait-duplicate-methods.rs index d35caa40a2d77..1f9bdf56f1007 100644 --- a/src/test/ui/traits/trait-duplicate-methods.rs +++ b/src/test/ui/traits/trait-duplicate-methods.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn orange(&self); fn orange(&self); //~ ERROR the name `orange` is defined multiple times diff --git a/src/test/ui/traits/trait-duplicate-methods.stderr b/src/test/ui/traits/trait-duplicate-methods.stderr index 1dfddd937ca25..bb6d0b6d7f148 100644 --- a/src/test/ui/traits/trait-duplicate-methods.stderr +++ b/src/test/ui/traits/trait-duplicate-methods.stderr @@ -1,5 +1,5 @@ error[E0428]: the name `orange` is defined multiple times - --> $DIR/trait-duplicate-methods.rs:13:5 + --> $DIR/trait-duplicate-methods.rs:3:5 | LL | fn orange(&self); | ----------------- previous definition of the value `orange` here diff --git a/src/test/ui/traits/trait-impl-1.rs b/src/test/ui/traits/trait-impl-1.rs index e682d3c81e793..29f58a6a9cbc1 100644 --- a/src/test/ui/traits/trait-impl-1.rs +++ b/src/test/ui/traits/trait-impl-1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test calling methods on an impl for a bare trait. This test checks that the // trait impl is only applied to a trait object, not concrete types which implement // the trait. diff --git a/src/test/ui/traits/trait-impl-1.stderr b/src/test/ui/traits/trait-impl-1.stderr index b80339005055c..8ee642974b724 100644 --- a/src/test/ui/traits/trait-impl-1.stderr +++ b/src/test/ui/traits/trait-impl-1.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `foo` found for type `&i32` in the current scope - --> $DIR/trait-impl-1.rs:25:7 + --> $DIR/trait-impl-1.rs:15:7 | LL | x.foo(); //~ERROR: no method named `foo` found for type `&i32` in the current scope | ^^^ diff --git a/src/test/ui/traits/trait-impl-can-not-have-untraitful-items.rs b/src/test/ui/traits/trait-impl-can-not-have-untraitful-items.rs index cc143a6209d41..0c885447bb0ee 100644 --- a/src/test/ui/traits/trait-impl-can-not-have-untraitful-items.rs +++ b/src/test/ui/traits/trait-impl-can-not-have-untraitful-items.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait A { } impl A for isize { diff --git a/src/test/ui/traits/trait-impl-can-not-have-untraitful-items.stderr b/src/test/ui/traits/trait-impl-can-not-have-untraitful-items.stderr index e23225bc12416..5a50a11086326 100644 --- a/src/test/ui/traits/trait-impl-can-not-have-untraitful-items.stderr +++ b/src/test/ui/traits/trait-impl-can-not-have-untraitful-items.stderr @@ -1,17 +1,17 @@ error[E0438]: const `BAR` is not a member of trait `A` - --> $DIR/trait-impl-can-not-have-untraitful-items.rs:15:5 + --> $DIR/trait-impl-can-not-have-untraitful-items.rs:4:5 | LL | const BAR: () = (); //~ ERROR const `BAR` is not a member of trait `A` | ^^^^^^^^^^^^^^^^^^^ not a member of trait `A` error[E0437]: type `Baz` is not a member of trait `A` - --> $DIR/trait-impl-can-not-have-untraitful-items.rs:16:5 + --> $DIR/trait-impl-can-not-have-untraitful-items.rs:5:5 | LL | type Baz = (); //~ ERROR type `Baz` is not a member of trait `A` | ^^^^^^^^^^^^^^ not a member of trait `A` error[E0407]: method `foo` is not a member of trait `A` - --> $DIR/trait-impl-can-not-have-untraitful-items.rs:17:5 + --> $DIR/trait-impl-can-not-have-untraitful-items.rs:6:5 | LL | fn foo(&self) { } //~ ERROR method `foo` is not a member of trait `A` | ^^^^^^^^^^^^^^^^^ not a member of trait `A` diff --git a/src/test/ui/traits/trait-impl-different-num-params.rs b/src/test/ui/traits/trait-impl-different-num-params.rs index 647dd4e05faf5..20ffeee114233 100644 --- a/src/test/ui/traits/trait-impl-different-num-params.rs +++ b/src/test/ui/traits/trait-impl-different-num-params.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait foo { fn bar(&self, x: usize) -> Self; } diff --git a/src/test/ui/traits/trait-impl-different-num-params.stderr b/src/test/ui/traits/trait-impl-different-num-params.stderr index c3bbf99b06a7e..0605c6ad85867 100644 --- a/src/test/ui/traits/trait-impl-different-num-params.stderr +++ b/src/test/ui/traits/trait-impl-different-num-params.stderr @@ -1,5 +1,5 @@ error[E0050]: method `bar` has 1 parameter but the declaration in trait `foo::bar` has 2 - --> $DIR/trait-impl-different-num-params.rs:15:12 + --> $DIR/trait-impl-different-num-params.rs:5:12 | LL | fn bar(&self, x: usize) -> Self; | ----- trait requires 2 parameters diff --git a/src/test/ui/traits/trait-impl-for-module.rs b/src/test/ui/traits/trait-impl-for-module.rs index 1fe8f6294da21..9004627c52374 100644 --- a/src/test/ui/traits/trait-impl-for-module.rs +++ b/src/test/ui/traits/trait-impl-for-module.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod a { } diff --git a/src/test/ui/traits/trait-impl-for-module.stderr b/src/test/ui/traits/trait-impl-for-module.stderr index 62ae84da99ec8..3f9407e683516 100644 --- a/src/test/ui/traits/trait-impl-for-module.stderr +++ b/src/test/ui/traits/trait-impl-for-module.stderr @@ -1,5 +1,5 @@ error[E0573]: expected type, found module `a` - --> $DIR/trait-impl-for-module.rs:17:12 + --> $DIR/trait-impl-for-module.rs:7:12 | LL | impl A for a { //~ ERROR expected type, found module | ^ did you mean `A`? diff --git a/src/test/ui/traits/trait-impl-method-mismatch.rs b/src/test/ui/traits/trait-impl-method-mismatch.rs index a05e007d6b739..886e92604a0be 100644 --- a/src/test/ui/traits/trait-impl-method-mismatch.rs +++ b/src/test/ui/traits/trait-impl-method-mismatch.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Mumbo { fn jumbo(&self, x: &usize) -> usize; } diff --git a/src/test/ui/traits/trait-impl-method-mismatch.stderr b/src/test/ui/traits/trait-impl-method-mismatch.stderr index 526a37f765128..3e86c97f5c123 100644 --- a/src/test/ui/traits/trait-impl-method-mismatch.stderr +++ b/src/test/ui/traits/trait-impl-method-mismatch.stderr @@ -1,5 +1,5 @@ error[E0053]: method `jumbo` has an incompatible type for trait - --> $DIR/trait-impl-method-mismatch.rs:18:5 + --> $DIR/trait-impl-method-mismatch.rs:7:5 | LL | fn jumbo(&self, x: &usize) -> usize; | ------------------------------------ type in trait diff --git a/src/test/ui/traits/trait-impl-of-supertrait-has-wrong-lifetime-parameters.rs b/src/test/ui/traits/trait-impl-of-supertrait-has-wrong-lifetime-parameters.rs index 44c53e70f8653..05b9db9724bdf 100644 --- a/src/test/ui/traits/trait-impl-of-supertrait-has-wrong-lifetime-parameters.rs +++ b/src/test/ui/traits/trait-impl-of-supertrait-has-wrong-lifetime-parameters.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that when we test the supertrait we ensure consistent use of // lifetime parameters. In this case, implementing T2<'a,'b> requires // an impl of T1<'a>, but we have an impl of T1<'b>. diff --git a/src/test/ui/traits/trait-impl-of-supertrait-has-wrong-lifetime-parameters.stderr b/src/test/ui/traits/trait-impl-of-supertrait-has-wrong-lifetime-parameters.stderr index 6a97a4eccbb76..95dc6364e13c5 100644 --- a/src/test/ui/traits/trait-impl-of-supertrait-has-wrong-lifetime-parameters.stderr +++ b/src/test/ui/traits/trait-impl-of-supertrait-has-wrong-lifetime-parameters.stderr @@ -1,16 +1,16 @@ error[E0495]: cannot infer an appropriate lifetime for lifetime parameter `'b` due to conflicting requirements - --> $DIR/trait-impl-of-supertrait-has-wrong-lifetime-parameters.rs:34:13 + --> $DIR/trait-impl-of-supertrait-has-wrong-lifetime-parameters.rs:24:13 | LL | impl<'a,'b> T2<'a, 'b> for S<'a, 'b> { //~ ERROR cannot infer an appropriate lifetime | ^^^^^^^^^^ | -note: first, the lifetime cannot outlive the lifetime 'a as defined on the impl at 34:6... - --> $DIR/trait-impl-of-supertrait-has-wrong-lifetime-parameters.rs:34:6 +note: first, the lifetime cannot outlive the lifetime 'a as defined on the impl at 24:6... + --> $DIR/trait-impl-of-supertrait-has-wrong-lifetime-parameters.rs:24:6 | LL | impl<'a,'b> T2<'a, 'b> for S<'a, 'b> { //~ ERROR cannot infer an appropriate lifetime | ^^ -note: ...but the lifetime must also be valid for the lifetime 'b as defined on the impl at 34:9... - --> $DIR/trait-impl-of-supertrait-has-wrong-lifetime-parameters.rs:34:9 +note: ...but the lifetime must also be valid for the lifetime 'b as defined on the impl at 24:9... + --> $DIR/trait-impl-of-supertrait-has-wrong-lifetime-parameters.rs:24:9 | LL | impl<'a,'b> T2<'a, 'b> for S<'a, 'b> { //~ ERROR cannot infer an appropriate lifetime | ^^ diff --git a/src/test/ui/traits/trait-item-privacy.rs b/src/test/ui/traits/trait-item-privacy.rs index f8e4f0d596e20..9e9071e32a341 100644 --- a/src/test/ui/traits/trait-item-privacy.rs +++ b/src/test/ui/traits/trait-item-privacy.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(associated_type_defaults)] struct S; diff --git a/src/test/ui/traits/trait-item-privacy.stderr b/src/test/ui/traits/trait-item-privacy.stderr index a3747bcee5d5c..544ea034d1628 100644 --- a/src/test/ui/traits/trait-item-privacy.stderr +++ b/src/test/ui/traits/trait-item-privacy.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `a` found for type `S` in the current scope - --> $DIR/trait-item-privacy.rs:77:7 + --> $DIR/trait-item-privacy.rs:67:7 | LL | struct S; | --------- method `a` not found for this @@ -12,7 +12,7 @@ LL | S.a(); //~ ERROR no method named `a` found for type `S` in the current candidate #1: `method::A` error[E0599]: no method named `b` found for type `S` in the current scope - --> $DIR/trait-item-privacy.rs:78:7 + --> $DIR/trait-item-privacy.rs:68:7 | LL | struct S; | --------- method `b` not found for this @@ -27,13 +27,13 @@ LL | use method::B; | error[E0624]: method `a` is private - --> $DIR/trait-item-privacy.rs:82:7 + --> $DIR/trait-item-privacy.rs:72:7 | LL | c.a(); //~ ERROR method `a` is private | ^ error[E0599]: no function or associated item named `a` found for type `S` in the current scope - --> $DIR/trait-item-privacy.rs:88:5 + --> $DIR/trait-item-privacy.rs:78:5 | LL | struct S; | --------- function or associated item `a` not found for this @@ -46,7 +46,7 @@ LL | S::a(&S); candidate #1: `method::A` error[E0599]: no function or associated item named `b` found for type `S` in the current scope - --> $DIR/trait-item-privacy.rs:90:5 + --> $DIR/trait-item-privacy.rs:80:5 | LL | struct S; | --------- function or associated item `b` not found for this @@ -61,13 +61,13 @@ LL | use method::B; | error[E0624]: method `a` is private - --> $DIR/trait-item-privacy.rs:94:5 + --> $DIR/trait-item-privacy.rs:84:5 | LL | C::a(&S); //~ ERROR method `a` is private | ^^^^ error[E0599]: no associated item named `A` found for type `S` in the current scope - --> $DIR/trait-item-privacy.rs:107:5 + --> $DIR/trait-item-privacy.rs:97:5 | LL | struct S; | --------- associated item `A` not found for this @@ -80,7 +80,7 @@ LL | S::A; //~ ERROR no associated item named `A` found for type `S` in the candidate #1: `assoc_const::A` error[E0599]: no associated item named `B` found for type `S` in the current scope - --> $DIR/trait-item-privacy.rs:108:5 + --> $DIR/trait-item-privacy.rs:98:5 | LL | struct S; | --------- associated item `B` not found for this @@ -95,37 +95,37 @@ LL | use assoc_const::B; | error[E0624]: associated constant `A` is private - --> $DIR/trait-item-privacy.rs:111:5 + --> $DIR/trait-item-privacy.rs:101:5 | LL | C::A; //~ ERROR associated constant `A` is private | ^^^^ error[E0277]: the trait bound `dyn assoc_const::C: assoc_const::A` is not satisfied - --> $DIR/trait-item-privacy.rs:111:5 + --> $DIR/trait-item-privacy.rs:101:5 | LL | C::A; //~ ERROR associated constant `A` is private | ^^^^ the trait `assoc_const::A` is not implemented for `dyn assoc_const::C` | note: required by `assoc_const::A::A` - --> $DIR/trait-item-privacy.rs:35:9 + --> $DIR/trait-item-privacy.rs:25:9 | LL | const A: u8 = 0; | ^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `dyn assoc_const::C: assoc_const::B` is not satisfied - --> $DIR/trait-item-privacy.rs:114:5 + --> $DIR/trait-item-privacy.rs:104:5 | LL | C::B; // ERROR the trait `assoc_const::C` cannot be made into an object | ^^^^ the trait `assoc_const::B` is not implemented for `dyn assoc_const::C` | note: required by `assoc_const::B::B` - --> $DIR/trait-item-privacy.rs:39:9 + --> $DIR/trait-item-privacy.rs:29:9 | LL | const B: u8 = 0; | ^^^^^^^^^^^^^^^^ error[E0038]: the trait `assoc_const::C` cannot be made into an object - --> $DIR/trait-item-privacy.rs:111:5 + --> $DIR/trait-item-privacy.rs:101:5 | LL | C::A; //~ ERROR associated constant `A` is private | ^^^^ the trait `assoc_const::C` cannot be made into an object @@ -135,7 +135,7 @@ LL | C::A; //~ ERROR associated constant `A` is private = note: the trait cannot contain associated consts like `A` error[E0223]: ambiguous associated type - --> $DIR/trait-item-privacy.rs:127:12 + --> $DIR/trait-item-privacy.rs:117:12 | LL | let _: S::A; //~ ERROR ambiguous associated type | ^^^^ ambiguous associated type @@ -143,7 +143,7 @@ LL | let _: S::A; //~ ERROR ambiguous associated type = note: specify the type using the syntax `::A` error[E0223]: ambiguous associated type - --> $DIR/trait-item-privacy.rs:128:12 + --> $DIR/trait-item-privacy.rs:118:12 | LL | let _: S::B; //~ ERROR ambiguous associated type | ^^^^ ambiguous associated type @@ -151,7 +151,7 @@ LL | let _: S::B; //~ ERROR ambiguous associated type = note: specify the type using the syntax `::B` error[E0223]: ambiguous associated type - --> $DIR/trait-item-privacy.rs:129:12 + --> $DIR/trait-item-privacy.rs:119:12 | LL | let _: S::C; //~ ERROR ambiguous associated type | ^^^^ ambiguous associated type @@ -159,13 +159,13 @@ LL | let _: S::C; //~ ERROR ambiguous associated type = note: specify the type using the syntax `::C` error: associated type `A` is private - --> $DIR/trait-item-privacy.rs:131:12 + --> $DIR/trait-item-privacy.rs:121:12 | LL | let _: T::A; //~ ERROR associated type `A` is private | ^^^^ error: associated type `A` is private - --> $DIR/trait-item-privacy.rs:140:9 + --> $DIR/trait-item-privacy.rs:130:9 | LL | A = u8, //~ ERROR associated type `A` is private | ^^^^^^ diff --git a/src/test/ui/traits/trait-matching-lifetimes.rs b/src/test/ui/traits/trait-matching-lifetimes.rs index 5ab80065572c0..1430dc6559143 100644 --- a/src/test/ui/traits/trait-matching-lifetimes.rs +++ b/src/test/ui/traits/trait-matching-lifetimes.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that the trait matching code takes lifetime parameters into account. // (Issue #15517.) diff --git a/src/test/ui/traits/trait-matching-lifetimes.stderr b/src/test/ui/traits/trait-matching-lifetimes.stderr index 8f27947ff2a8a..80c577674d166 100644 --- a/src/test/ui/traits/trait-matching-lifetimes.stderr +++ b/src/test/ui/traits/trait-matching-lifetimes.stderr @@ -1,37 +1,37 @@ error[E0308]: method not compatible with trait - --> $DIR/trait-matching-lifetimes.rs:24:5 + --> $DIR/trait-matching-lifetimes.rs:14:5 | LL | fn foo(x: Foo<'b,'a>) { | ^^^^^^^^^^^^^^^^^^^^^ lifetime mismatch | = note: expected type `fn(Foo<'a, 'b>)` found type `fn(Foo<'b, 'a>)` -note: the lifetime 'b as defined on the impl at 23:9... - --> $DIR/trait-matching-lifetimes.rs:23:9 +note: the lifetime 'b as defined on the impl at 13:9... + --> $DIR/trait-matching-lifetimes.rs:13:9 | LL | impl<'a,'b> Tr for Foo<'a,'b> { | ^^ -note: ...does not necessarily outlive the lifetime 'a as defined on the impl at 23:6 - --> $DIR/trait-matching-lifetimes.rs:23:6 +note: ...does not necessarily outlive the lifetime 'a as defined on the impl at 13:6 + --> $DIR/trait-matching-lifetimes.rs:13:6 | LL | impl<'a,'b> Tr for Foo<'a,'b> { | ^^ error[E0308]: method not compatible with trait - --> $DIR/trait-matching-lifetimes.rs:24:5 + --> $DIR/trait-matching-lifetimes.rs:14:5 | LL | fn foo(x: Foo<'b,'a>) { | ^^^^^^^^^^^^^^^^^^^^^ lifetime mismatch | = note: expected type `fn(Foo<'a, 'b>)` found type `fn(Foo<'b, 'a>)` -note: the lifetime 'a as defined on the impl at 23:6... - --> $DIR/trait-matching-lifetimes.rs:23:6 +note: the lifetime 'a as defined on the impl at 13:6... + --> $DIR/trait-matching-lifetimes.rs:13:6 | LL | impl<'a,'b> Tr for Foo<'a,'b> { | ^^ -note: ...does not necessarily outlive the lifetime 'b as defined on the impl at 23:9 - --> $DIR/trait-matching-lifetimes.rs:23:9 +note: ...does not necessarily outlive the lifetime 'b as defined on the impl at 13:9 + --> $DIR/trait-matching-lifetimes.rs:13:9 | LL | impl<'a,'b> Tr for Foo<'a,'b> { | ^^ diff --git a/src/test/ui/traits/trait-method-private.rs b/src/test/ui/traits/trait-method-private.rs index 54cf6e6783eb7..4cd184854eccc 100644 --- a/src/test/ui/traits/trait-method-private.rs +++ b/src/test/ui/traits/trait-method-private.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod inner { pub trait Bar { fn method(&self); diff --git a/src/test/ui/traits/trait-method-private.stderr b/src/test/ui/traits/trait-method-private.stderr index 3a625ae25a460..ed6aeeb9c898e 100644 --- a/src/test/ui/traits/trait-method-private.stderr +++ b/src/test/ui/traits/trait-method-private.stderr @@ -1,5 +1,5 @@ error[E0624]: method `method` is private - --> $DIR/trait-method-private.rs:29:9 + --> $DIR/trait-method-private.rs:19:9 | LL | foo.method(); //~ ERROR is private | ^^^^^^ diff --git a/src/test/ui/traits/trait-object-auto-dedup-in-impl.rs b/src/test/ui/traits/trait-object-auto-dedup-in-impl.rs index d3e4627a4c9b8..6ba5d28a6c4c2 100644 --- a/src/test/ui/traits/trait-object-auto-dedup-in-impl.rs +++ b/src/test/ui/traits/trait-object-auto-dedup-in-impl.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Checks to make sure that `dyn Trait + Send` and `dyn Trait + Send + Send` are the same type. // Issue: #47010 diff --git a/src/test/ui/traits/trait-object-auto-dedup-in-impl.stderr b/src/test/ui/traits/trait-object-auto-dedup-in-impl.stderr index 9abd81cdcfa23..2d2c3843548e9 100644 --- a/src/test/ui/traits/trait-object-auto-dedup-in-impl.stderr +++ b/src/test/ui/traits/trait-object-auto-dedup-in-impl.stderr @@ -1,5 +1,5 @@ error[E0592]: duplicate definitions with name `test` - --> $DIR/trait-object-auto-dedup-in-impl.rs:24:5 + --> $DIR/trait-object-auto-dedup-in-impl.rs:14:5 | LL | fn test(&self) { println!("one"); } //~ ERROR duplicate definitions with name `test` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ duplicate definitions for `test` diff --git a/src/test/ui/traits/trait-object-macro-matcher.rs b/src/test/ui/traits/trait-object-macro-matcher.rs index 8497a699e974c..0f55e2dc4f21e 100644 --- a/src/test/ui/traits/trait-object-macro-matcher.rs +++ b/src/test/ui/traits/trait-object-macro-matcher.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // `ty` matcher accepts trait object types macro_rules! m { diff --git a/src/test/ui/traits/trait-object-macro-matcher.stderr b/src/test/ui/traits/trait-object-macro-matcher.stderr index 05511b554cc4c..678f4fb595573 100644 --- a/src/test/ui/traits/trait-object-macro-matcher.stderr +++ b/src/test/ui/traits/trait-object-macro-matcher.stderr @@ -1,11 +1,11 @@ error[E0224]: at least one non-builtin trait is required for an object type - --> $DIR/trait-object-macro-matcher.rs:20:8 + --> $DIR/trait-object-macro-matcher.rs:10:8 | LL | m!('static +); //~ ERROR at least one non-builtin trait is required for an object type | ^^^^^^^^^ error[E0038]: the trait `std::marker::Copy` cannot be made into an object - --> $DIR/trait-object-macro-matcher.rs:18:8 + --> $DIR/trait-object-macro-matcher.rs:8:8 | LL | m!(Copy + Send + 'static); //~ ERROR the trait `std::marker::Copy` cannot be made into an object | ^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` cannot be made into an object diff --git a/src/test/ui/traits/trait-object-safety.rs b/src/test/ui/traits/trait-object-safety.rs index baf239f5956d6..e333bf6bfe53b 100644 --- a/src/test/ui/traits/trait-object-safety.rs +++ b/src/test/ui/traits/trait-object-safety.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that static methods are not object-safe. trait Tr { diff --git a/src/test/ui/traits/trait-object-safety.stderr b/src/test/ui/traits/trait-object-safety.stderr index be0440db4daa3..0a0c5ff086b56 100644 --- a/src/test/ui/traits/trait-object-safety.stderr +++ b/src/test/ui/traits/trait-object-safety.stderr @@ -1,5 +1,5 @@ error[E0038]: the trait `Tr` cannot be made into an object - --> $DIR/trait-object-safety.rs:25:18 + --> $DIR/trait-object-safety.rs:15:18 | LL | let _: &Tr = &St; //~ ERROR E0038 | ^^^ the trait `Tr` cannot be made into an object @@ -8,7 +8,7 @@ LL | let _: &Tr = &St; //~ ERROR E0038 = note: required because of the requirements on the impl of `std::ops::CoerceUnsized<&dyn Tr>` for `&St` error[E0038]: the trait `Tr` cannot be made into an object - --> $DIR/trait-object-safety.rs:25:12 + --> $DIR/trait-object-safety.rs:15:12 | LL | let _: &Tr = &St; //~ ERROR E0038 | ^^^ the trait `Tr` cannot be made into an object diff --git a/src/test/ui/traits/trait-object-vs-lifetime-2.rs b/src/test/ui/traits/trait-object-vs-lifetime-2.rs index 9801cac471443..2579a0056f142 100644 --- a/src/test/ui/traits/trait-object-vs-lifetime-2.rs +++ b/src/test/ui/traits/trait-object-vs-lifetime-2.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // A few contrived examples where lifetime should (or should not) be parsed as an object type. // Lifetimes parsed as types are still rejected later by semantic checks. diff --git a/src/test/ui/traits/trait-object-vs-lifetime-2.stderr b/src/test/ui/traits/trait-object-vs-lifetime-2.stderr index db38aca2383fe..70ad839b9af6c 100644 --- a/src/test/ui/traits/trait-object-vs-lifetime-2.stderr +++ b/src/test/ui/traits/trait-object-vs-lifetime-2.stderr @@ -1,5 +1,5 @@ error[E0224]: at least one non-builtin trait is required for an object type - --> $DIR/trait-object-vs-lifetime-2.rs:19:5 + --> $DIR/trait-object-vs-lifetime-2.rs:9:5 | LL | 'static +: 'static + Copy, | ^^^^^^^^^ diff --git a/src/test/ui/traits/trait-object-vs-lifetime.rs b/src/test/ui/traits/trait-object-vs-lifetime.rs index 954e20e334566..57d9b2df9f5d7 100644 --- a/src/test/ui/traits/trait-object-vs-lifetime.rs +++ b/src/test/ui/traits/trait-object-vs-lifetime.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // A few contrived examples where lifetime should (or should not) be parsed as an object type. // Lifetimes parsed as types are still rejected later by semantic checks. diff --git a/src/test/ui/traits/trait-object-vs-lifetime.stderr b/src/test/ui/traits/trait-object-vs-lifetime.stderr index c0b65a7aa5c38..d0075e346c47a 100644 --- a/src/test/ui/traits/trait-object-vs-lifetime.stderr +++ b/src/test/ui/traits/trait-object-vs-lifetime.stderr @@ -1,29 +1,29 @@ error: lifetime parameters must be declared prior to type parameters - --> $DIR/trait-object-vs-lifetime.rs:26:25 + --> $DIR/trait-object-vs-lifetime.rs:16:25 | LL | let _: S<'static +, 'static>; | ^^^^^^^ error[E0224]: at least one non-builtin trait is required for an object type - --> $DIR/trait-object-vs-lifetime.rs:21:23 + --> $DIR/trait-object-vs-lifetime.rs:11:23 | LL | let _: S<'static, 'static +>; | ^^^^^^^^^ error[E0107]: wrong number of lifetime arguments: expected 1, found 2 - --> $DIR/trait-object-vs-lifetime.rs:23:23 + --> $DIR/trait-object-vs-lifetime.rs:13:23 | LL | let _: S<'static, 'static>; | ^^^^^^^ unexpected lifetime argument error[E0243]: wrong number of type arguments: expected 1, found 0 - --> $DIR/trait-object-vs-lifetime.rs:23:12 + --> $DIR/trait-object-vs-lifetime.rs:13:12 | LL | let _: S<'static, 'static>; | ^^^^^^^^^^^^^^^^^^^ expected 1 type argument error[E0224]: at least one non-builtin trait is required for an object type - --> $DIR/trait-object-vs-lifetime.rs:26:14 + --> $DIR/trait-object-vs-lifetime.rs:16:14 | LL | let _: S<'static +, 'static>; | ^^^^^^^^^ diff --git a/src/test/ui/traits/trait-or-new-type-instead.rs b/src/test/ui/traits/trait-or-new-type-instead.rs index b1e4d06affe7d..572b03efce768 100644 --- a/src/test/ui/traits/trait-or-new-type-instead.rs +++ b/src/test/ui/traits/trait-or-new-type-instead.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - impl Option { //~^ ERROR cannot define inherent `impl` for a type outside of the crate where the type is defined pub fn foo(&self) { } diff --git a/src/test/ui/traits/trait-or-new-type-instead.stderr b/src/test/ui/traits/trait-or-new-type-instead.stderr index 1b4d173c312e6..e8bd20019a890 100644 --- a/src/test/ui/traits/trait-or-new-type-instead.stderr +++ b/src/test/ui/traits/trait-or-new-type-instead.stderr @@ -1,5 +1,5 @@ error[E0116]: cannot define inherent `impl` for a type outside of the crate where the type is defined - --> $DIR/trait-or-new-type-instead.rs:11:1 + --> $DIR/trait-or-new-type-instead.rs:1:1 | LL | / impl Option { LL | | //~^ ERROR cannot define inherent `impl` for a type outside of the crate where the type is defined diff --git a/src/test/ui/traits/trait-privacy.rs b/src/test/ui/traits/trait-privacy.rs index 5f9e8ba6c0a4a..9fcdda3abc96f 100644 --- a/src/test/ui/traits/trait-privacy.rs +++ b/src/test/ui/traits/trait-privacy.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs, get_type_id)] #![allow(dead_code)] diff --git a/src/test/ui/traits/trait-privacy.stderr b/src/test/ui/traits/trait-privacy.stderr index d38e869df8f51..6413ee7be732c 100644 --- a/src/test/ui/traits/trait-privacy.stderr +++ b/src/test/ui/traits/trait-privacy.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/trait-privacy.rs:35:1 + --> $DIR/trait-privacy.rs:25:1 | LL | fn main() {} //~ ERROR compilation successful | ^^^^^^^^^^^^ diff --git a/src/test/ui/traits/trait-resolution-in-overloaded-op.rs b/src/test/ui/traits/trait-resolution-in-overloaded-op.rs index 1f57c4cf93a28..96f81a21a3bc1 100644 --- a/src/test/ui/traits/trait-resolution-in-overloaded-op.rs +++ b/src/test/ui/traits/trait-resolution-in-overloaded-op.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // #12402 Operator overloading only considers the method name, not which trait is implemented trait MyMul { diff --git a/src/test/ui/traits/trait-resolution-in-overloaded-op.stderr b/src/test/ui/traits/trait-resolution-in-overloaded-op.stderr index ba20eae56c743..2c644480f0a54 100644 --- a/src/test/ui/traits/trait-resolution-in-overloaded-op.stderr +++ b/src/test/ui/traits/trait-resolution-in-overloaded-op.stderr @@ -1,5 +1,5 @@ error[E0369]: binary operation `*` cannot be applied to type `&T` - --> $DIR/trait-resolution-in-overloaded-op.rs:18:5 + --> $DIR/trait-resolution-in-overloaded-op.rs:8:5 | LL | a * b //~ ERROR binary operation `*` cannot be applied to type `&T` | ^^^^^ diff --git a/src/test/ui/traits/trait-safety-fn-body.rs b/src/test/ui/traits/trait-safety-fn-body.rs index 1a2bcc471b43a..df5277473056b 100644 --- a/src/test/ui/traits/trait-safety-fn-body.rs +++ b/src/test/ui/traits/trait-safety-fn-body.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that an unsafe impl does not imply that unsafe actions are // legal in the methods. diff --git a/src/test/ui/traits/trait-safety-fn-body.stderr b/src/test/ui/traits/trait-safety-fn-body.stderr index 0b7b6e6167867..a27cd869da565 100644 --- a/src/test/ui/traits/trait-safety-fn-body.stderr +++ b/src/test/ui/traits/trait-safety-fn-body.stderr @@ -1,5 +1,5 @@ error[E0133]: dereference of raw pointer is unsafe and requires unsafe function or block - --> $DIR/trait-safety-fn-body.rs:21:9 + --> $DIR/trait-safety-fn-body.rs:11:9 | LL | *self += 1; | ^^^^^^^^^^ dereference of raw pointer diff --git a/src/test/ui/traits/trait-safety-inherent-impl.rs b/src/test/ui/traits/trait-safety-inherent-impl.rs index 059fdc100c944..50e15f0d25f3b 100644 --- a/src/test/ui/traits/trait-safety-inherent-impl.rs +++ b/src/test/ui/traits/trait-safety-inherent-impl.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that inherent impls cannot be unsafe. struct SomeStruct; diff --git a/src/test/ui/traits/trait-safety-inherent-impl.stderr b/src/test/ui/traits/trait-safety-inherent-impl.stderr index 5154a591c4c16..969b16633ce34 100644 --- a/src/test/ui/traits/trait-safety-inherent-impl.stderr +++ b/src/test/ui/traits/trait-safety-inherent-impl.stderr @@ -1,5 +1,5 @@ error[E0197]: inherent impls cannot be unsafe - --> $DIR/trait-safety-inherent-impl.rs:15:1 + --> $DIR/trait-safety-inherent-impl.rs:5:1 | LL | / unsafe impl SomeStruct { //~ ERROR inherent impls cannot be unsafe LL | | fn foo(self) { } diff --git a/src/test/ui/traits/trait-safety-trait-impl-cc.rs b/src/test/ui/traits/trait-safety-trait-impl-cc.rs index f30c8f521bdc7..6f125e5f95021 100644 --- a/src/test/ui/traits/trait-safety-trait-impl-cc.rs +++ b/src/test/ui/traits/trait-safety-trait-impl-cc.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:trait_safety_lib.rs // Check that unsafe traits require unsafe impls and that inherent diff --git a/src/test/ui/traits/trait-safety-trait-impl-cc.stderr b/src/test/ui/traits/trait-safety-trait-impl-cc.stderr index 0611d2da02aeb..3be72fbfdd722 100644 --- a/src/test/ui/traits/trait-safety-trait-impl-cc.stderr +++ b/src/test/ui/traits/trait-safety-trait-impl-cc.stderr @@ -1,5 +1,5 @@ error[E0200]: the trait `lib::Foo` requires an `unsafe impl` declaration - --> $DIR/trait-safety-trait-impl-cc.rs:19:1 + --> $DIR/trait-safety-trait-impl-cc.rs:9:1 | LL | / impl lib::Foo for Bar { //~ ERROR requires an `unsafe impl` declaration LL | | fn foo(&self) -> isize { diff --git a/src/test/ui/traits/trait-safety-trait-impl.rs b/src/test/ui/traits/trait-safety-trait-impl.rs index e846b660c2a17..45258b78d01d5 100644 --- a/src/test/ui/traits/trait-safety-trait-impl.rs +++ b/src/test/ui/traits/trait-safety-trait-impl.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that unsafe traits require unsafe impls and that inherent // impls cannot be unsafe. diff --git a/src/test/ui/traits/trait-safety-trait-impl.stderr b/src/test/ui/traits/trait-safety-trait-impl.stderr index 137e9f7c04339..22e9b4d4035ee 100644 --- a/src/test/ui/traits/trait-safety-trait-impl.stderr +++ b/src/test/ui/traits/trait-safety-trait-impl.stderr @@ -1,11 +1,11 @@ error[E0200]: the trait `UnsafeTrait` requires an `unsafe impl` declaration - --> $DIR/trait-safety-trait-impl.rs:24:1 + --> $DIR/trait-safety-trait-impl.rs:14:1 | LL | impl UnsafeTrait for u16 { } //~ ERROR requires an `unsafe impl` declaration | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0199]: implementing the trait `SafeTrait` is not unsafe - --> $DIR/trait-safety-trait-impl.rs:26:1 + --> $DIR/trait-safety-trait-impl.rs:16:1 | LL | unsafe impl SafeTrait for u32 { } //~ ERROR the trait `SafeTrait` is not unsafe | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/traits/trait-static-method-generic-inference.rs b/src/test/ui/traits/trait-static-method-generic-inference.rs index 0e357d9d4d531..c08bd5cb13566 100644 --- a/src/test/ui/traits/trait-static-method-generic-inference.rs +++ b/src/test/ui/traits/trait-static-method-generic-inference.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #3902. We are (at least currently) unable to infer `Self` // based on `T`, even though there is only a single impl, because of // the possibility of associated types and other things (basically: no diff --git a/src/test/ui/traits/trait-static-method-generic-inference.stderr b/src/test/ui/traits/trait-static-method-generic-inference.stderr index a903bd998f23d..390d21c4a699e 100644 --- a/src/test/ui/traits/trait-static-method-generic-inference.stderr +++ b/src/test/ui/traits/trait-static-method-generic-inference.stderr @@ -1,11 +1,11 @@ error[E0283]: type annotations required: cannot resolve `_: base::HasNew` - --> $DIR/trait-static-method-generic-inference.rs:34:25 + --> $DIR/trait-static-method-generic-inference.rs:24:25 | LL | let _f: base::Foo = base::HasNew::new(); | ^^^^^^^^^^^^^^^^^ | note: required by `base::HasNew::new` - --> $DIR/trait-static-method-generic-inference.rs:18:9 + --> $DIR/trait-static-method-generic-inference.rs:8:9 | LL | fn new() -> T; | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/traits/trait-suggest-where-clause.rs b/src/test/ui/traits/trait-suggest-where-clause.rs index a43b75d2fe8bd..8405e5ff62e8e 100644 --- a/src/test/ui/traits/trait-suggest-where-clause.rs +++ b/src/test/ui/traits/trait-suggest-where-clause.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::mem; struct Misc(T); diff --git a/src/test/ui/traits/trait-suggest-where-clause.stderr b/src/test/ui/traits/trait-suggest-where-clause.stderr index 3b33596086711..161cf85d258e2 100644 --- a/src/test/ui/traits/trait-suggest-where-clause.stderr +++ b/src/test/ui/traits/trait-suggest-where-clause.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `U` cannot be known at compilation time - --> $DIR/trait-suggest-where-clause.rs:17:5 + --> $DIR/trait-suggest-where-clause.rs:7:5 | LL | mem::size_of::(); | ^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time @@ -10,7 +10,7 @@ LL | mem::size_of::(); = note: required by `std::mem::size_of` error[E0277]: the size for values of type `U` cannot be known at compilation time - --> $DIR/trait-suggest-where-clause.rs:20:5 + --> $DIR/trait-suggest-where-clause.rs:10:5 | LL | mem::size_of::>(); | ^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time @@ -22,7 +22,7 @@ LL | mem::size_of::>(); = note: required by `std::mem::size_of` error[E0277]: the trait bound `u64: std::convert::From` is not satisfied - --> $DIR/trait-suggest-where-clause.rs:25:5 + --> $DIR/trait-suggest-where-clause.rs:15:5 | LL | >::from; | ^^^^^^^^^^^^^^^^^^^^^^ the trait `std::convert::From` is not implemented for `u64` @@ -31,7 +31,7 @@ LL | >::from; = note: required by `std::convert::From::from` error[E0277]: the trait bound `u64: std::convert::From<::Item>` is not satisfied - --> $DIR/trait-suggest-where-clause.rs:28:5 + --> $DIR/trait-suggest-where-clause.rs:18:5 | LL | ::Item>>::from; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::convert::From<::Item>` is not implemented for `u64` @@ -40,7 +40,7 @@ LL | ::Item>>::from; = note: required by `std::convert::From::from` error[E0277]: the trait bound `Misc<_>: std::convert::From` is not satisfied - --> $DIR/trait-suggest-where-clause.rs:33:5 + --> $DIR/trait-suggest-where-clause.rs:23:5 | LL | as From>::from; | ^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::convert::From` is not implemented for `Misc<_>` @@ -48,7 +48,7 @@ LL | as From>::from; = note: required by `std::convert::From::from` error[E0277]: the size for values of type `[T]` cannot be known at compilation time - --> $DIR/trait-suggest-where-clause.rs:38:5 + --> $DIR/trait-suggest-where-clause.rs:28:5 | LL | mem::size_of::<[T]>(); | ^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time @@ -58,7 +58,7 @@ LL | mem::size_of::<[T]>(); = note: required by `std::mem::size_of` error[E0277]: the size for values of type `[&U]` cannot be known at compilation time - --> $DIR/trait-suggest-where-clause.rs:41:5 + --> $DIR/trait-suggest-where-clause.rs:31:5 | LL | mem::size_of::<[&U]>(); | ^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time diff --git a/src/test/ui/traits/trait-test-2.rs b/src/test/ui/traits/trait-test-2.rs index dac76fb57fd7c..3832a816580be 100644 --- a/src/test/ui/traits/trait-test-2.rs +++ b/src/test/ui/traits/trait-test-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] trait bar { fn dup(&self) -> Self; fn blah(&self); } diff --git a/src/test/ui/traits/trait-test-2.stderr b/src/test/ui/traits/trait-test-2.stderr index fb9cd7019224d..06679aeb89f0d 100644 --- a/src/test/ui/traits/trait-test-2.stderr +++ b/src/test/ui/traits/trait-test-2.stderr @@ -1,23 +1,23 @@ error[E0087]: wrong number of type arguments: expected 0, found 1 - --> $DIR/trait-test-2.rs:18:14 + --> $DIR/trait-test-2.rs:8:14 | LL | 10.dup::(); //~ ERROR wrong number of type arguments: expected 0, found 1 | ^^^ unexpected type argument error[E0087]: wrong number of type arguments: expected 1, found 2 - --> $DIR/trait-test-2.rs:19:20 + --> $DIR/trait-test-2.rs:9:20 | LL | 10.blah::(); //~ ERROR wrong number of type arguments: expected 1, found 2 | ^^^ unexpected type argument error[E0277]: the trait bound `dyn bar: bar` is not satisfied - --> $DIR/trait-test-2.rs:20:26 + --> $DIR/trait-test-2.rs:10:26 | LL | (box 10 as Box).dup(); | ^^^ the trait `bar` is not implemented for `dyn bar` error[E0038]: the trait `bar` cannot be made into an object - --> $DIR/trait-test-2.rs:20:16 + --> $DIR/trait-test-2.rs:10:16 | LL | (box 10 as Box).dup(); | ^^^^^^^^ the trait `bar` cannot be made into an object @@ -26,7 +26,7 @@ LL | (box 10 as Box).dup(); = note: method `blah` has generic type parameters error[E0038]: the trait `bar` cannot be made into an object - --> $DIR/trait-test-2.rs:20:6 + --> $DIR/trait-test-2.rs:10:6 | LL | (box 10 as Box).dup(); | ^^^^^^ the trait `bar` cannot be made into an object diff --git a/src/test/ui/traits/trait-test.rs b/src/test/ui/traits/trait-test.rs index d53e353d9d928..de5189764d9a0 100644 --- a/src/test/ui/traits/trait-test.rs +++ b/src/test/ui/traits/trait-test.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait foo { fn foo(&self); } impl isize for usize { fn foo(&self) {} } //~ ERROR trait diff --git a/src/test/ui/traits/trait-test.stderr b/src/test/ui/traits/trait-test.stderr index 89dbb3dee8744..3ee3001af0b0d 100644 --- a/src/test/ui/traits/trait-test.stderr +++ b/src/test/ui/traits/trait-test.stderr @@ -1,5 +1,5 @@ error[E0404]: expected trait, found builtin type `isize` - --> $DIR/trait-test.rs:13:6 + --> $DIR/trait-test.rs:3:6 | LL | impl isize for usize { fn foo(&self) {} } //~ ERROR trait | ^^^^^ not a trait diff --git a/src/test/ui/traits/traits-assoc-type-in-supertrait-bad.rs b/src/test/ui/traits/traits-assoc-type-in-supertrait-bad.rs index 971869ba85bb0..47d7075ac3576 100644 --- a/src/test/ui/traits/traits-assoc-type-in-supertrait-bad.rs +++ b/src/test/ui/traits/traits-assoc-type-in-supertrait-bad.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test case where an associated type is referenced from within the // supertrait definition, and the impl makes the wrong // associations. Issue #20220. diff --git a/src/test/ui/traits/traits-assoc-type-in-supertrait-bad.stderr b/src/test/ui/traits/traits-assoc-type-in-supertrait-bad.stderr index bf5e8a77f838f..ce1aadca597c5 100644 --- a/src/test/ui/traits/traits-assoc-type-in-supertrait-bad.stderr +++ b/src/test/ui/traits/traits-assoc-type-in-supertrait-bad.stderr @@ -1,5 +1,5 @@ error[E0271]: type mismatch resolving ` as std::iter::Iterator>::Item == u32` - --> $DIR/traits-assoc-type-in-supertrait-bad.rs:21:6 + --> $DIR/traits-assoc-type-in-supertrait-bad.rs:11:6 | LL | impl Foo for IntoIter { //~ ERROR type mismatch | ^^^ expected i32, found u32 diff --git a/src/test/ui/traits/traits-inductive-overflow-simultaneous.rs b/src/test/ui/traits/traits-inductive-overflow-simultaneous.rs index 777746a189c5f..40ac9214674e2 100644 --- a/src/test/ui/traits/traits-inductive-overflow-simultaneous.rs +++ b/src/test/ui/traits/traits-inductive-overflow-simultaneous.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #33344, initial version. This example allowed // arbitrary trait bounds to be synthesized. diff --git a/src/test/ui/traits/traits-inductive-overflow-simultaneous.stderr b/src/test/ui/traits/traits-inductive-overflow-simultaneous.stderr index 7eabb00935cf9..cd8501e4df421 100644 --- a/src/test/ui/traits/traits-inductive-overflow-simultaneous.stderr +++ b/src/test/ui/traits/traits-inductive-overflow-simultaneous.stderr @@ -1,12 +1,12 @@ error[E0275]: overflow evaluating the requirement `{integer}: Tweedledum` - --> $DIR/traits-inductive-overflow-simultaneous.rs:28:5 + --> $DIR/traits-inductive-overflow-simultaneous.rs:18:5 | LL | is_ee(4); | ^^^^^ | = note: required because of the requirements on the impl of `Combo` for `{integer}` note: required by `is_ee` - --> $DIR/traits-inductive-overflow-simultaneous.rs:23:1 + --> $DIR/traits-inductive-overflow-simultaneous.rs:13:1 | LL | fn is_ee(t: T) { | ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/traits/traits-inductive-overflow-supertrait-oibit.rs b/src/test/ui/traits/traits-inductive-overflow-supertrait-oibit.rs index 59d5dc6c58b47..c65242b1bb1c3 100644 --- a/src/test/ui/traits/traits-inductive-overflow-supertrait-oibit.rs +++ b/src/test/ui/traits/traits-inductive-overflow-supertrait-oibit.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // OIBIT-based version of #29859, supertrait version. Test that using // a simple OIBIT `..` impl alone still doesn't allow arbitrary bounds // to be synthesized. diff --git a/src/test/ui/traits/traits-inductive-overflow-supertrait-oibit.stderr b/src/test/ui/traits/traits-inductive-overflow-supertrait-oibit.stderr index 5438cc54dc62c..7aa9809c07455 100644 --- a/src/test/ui/traits/traits-inductive-overflow-supertrait-oibit.stderr +++ b/src/test/ui/traits/traits-inductive-overflow-supertrait-oibit.stderr @@ -1,18 +1,18 @@ error[E0568]: auto traits cannot have super traits - --> $DIR/traits-inductive-overflow-supertrait-oibit.rs:17:1 + --> $DIR/traits-inductive-overflow-supertrait-oibit.rs:7:1 | LL | auto trait Magic: Copy {} //~ ERROR E0568 | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `NoClone: std::marker::Copy` is not satisfied - --> $DIR/traits-inductive-overflow-supertrait-oibit.rs:25:18 + --> $DIR/traits-inductive-overflow-supertrait-oibit.rs:15:18 | LL | let (a, b) = copy(NoClone); //~ ERROR | ^^^^ the trait `std::marker::Copy` is not implemented for `NoClone` | = note: required because of the requirements on the impl of `Magic` for `NoClone` note: required by `copy` - --> $DIR/traits-inductive-overflow-supertrait-oibit.rs:19:1 + --> $DIR/traits-inductive-overflow-supertrait-oibit.rs:9:1 | LL | fn copy(x: T) -> (T, T) { (x, x) } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/traits/traits-inductive-overflow-supertrait.rs b/src/test/ui/traits/traits-inductive-overflow-supertrait.rs index c717ae9639fa9..c7aa4d90f5835 100644 --- a/src/test/ui/traits/traits-inductive-overflow-supertrait.rs +++ b/src/test/ui/traits/traits-inductive-overflow-supertrait.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #29859, supertrait version. This example // allowed arbitrary trait bounds to be synthesized. diff --git a/src/test/ui/traits/traits-inductive-overflow-supertrait.stderr b/src/test/ui/traits/traits-inductive-overflow-supertrait.stderr index 6f0929d696ff5..d4b3b6b7d716a 100644 --- a/src/test/ui/traits/traits-inductive-overflow-supertrait.stderr +++ b/src/test/ui/traits/traits-inductive-overflow-supertrait.stderr @@ -1,12 +1,12 @@ error[E0275]: overflow evaluating the requirement `NoClone: Magic` - --> $DIR/traits-inductive-overflow-supertrait.rs:23:18 + --> $DIR/traits-inductive-overflow-supertrait.rs:13:18 | LL | let (a, b) = copy(NoClone); //~ ERROR E0275 | ^^^^ | = note: required because of the requirements on the impl of `Magic` for `NoClone` note: required by `copy` - --> $DIR/traits-inductive-overflow-supertrait.rs:17:1 + --> $DIR/traits-inductive-overflow-supertrait.rs:7:1 | LL | fn copy(x: T) -> (T, T) { (x, x) } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/traits/traits-inductive-overflow-two-traits.rs b/src/test/ui/traits/traits-inductive-overflow-two-traits.rs index c622dca2b4df6..63dd141920025 100644 --- a/src/test/ui/traits/traits-inductive-overflow-two-traits.rs +++ b/src/test/ui/traits/traits-inductive-overflow-two-traits.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #29859, initial version. This example allowed // arbitrary trait bounds to be synthesized. diff --git a/src/test/ui/traits/traits-inductive-overflow-two-traits.stderr b/src/test/ui/traits/traits-inductive-overflow-two-traits.stderr index 900ed1b2e8bc1..cee9aa348c38e 100644 --- a/src/test/ui/traits/traits-inductive-overflow-two-traits.stderr +++ b/src/test/ui/traits/traits-inductive-overflow-two-traits.stderr @@ -1,11 +1,11 @@ error[E0275]: overflow evaluating the requirement `*mut (): Magic` - --> $DIR/traits-inductive-overflow-two-traits.rs:29:5 + --> $DIR/traits-inductive-overflow-two-traits.rs:19:5 | LL | wizard::<*mut ()>(); //~ ERROR E0275 | ^^^^^^^^^^^^^^^^^ | note: required by `wizard` - --> $DIR/traits-inductive-overflow-two-traits.rs:26:1 + --> $DIR/traits-inductive-overflow-two-traits.rs:16:1 | LL | fn wizard() { check::<::X>(); } | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/traits/traits-issue-23003-overflow.rs b/src/test/ui/traits/traits-issue-23003-overflow.rs index 80d2884ee60aa..eac64389a18df 100644 --- a/src/test/ui/traits/traits-issue-23003-overflow.rs +++ b/src/test/ui/traits/traits-issue-23003-overflow.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // A variant of traits-issue-23003 in which an infinite series of // types are required. This test now just compiles fine, since the // relevant rules that triggered the overflow were removed. diff --git a/src/test/ui/traits/traits-issue-23003-overflow.stderr b/src/test/ui/traits/traits-issue-23003-overflow.stderr index 3c26e426a4e52..dd2cbf06e8633 100644 --- a/src/test/ui/traits/traits-issue-23003-overflow.stderr +++ b/src/test/ui/traits/traits-issue-23003-overflow.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/traits-issue-23003-overflow.rs:39:1 + --> $DIR/traits-issue-23003-overflow.rs:29:1 | LL | fn main() { } //~ ERROR compilation successful | ^^^^^^^^^^^^^ diff --git a/src/test/ui/traits/traits-multidispatch-bad.rs b/src/test/ui/traits/traits-multidispatch-bad.rs index 392eccf0f31a3..b625b96159025 100644 --- a/src/test/ui/traits/traits-multidispatch-bad.rs +++ b/src/test/ui/traits/traits-multidispatch-bad.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we detect an illegal combination of types. trait Convert { diff --git a/src/test/ui/traits/traits-multidispatch-bad.stderr b/src/test/ui/traits/traits-multidispatch-bad.stderr index 6068edea5859d..d6c6697c3c0e5 100644 --- a/src/test/ui/traits/traits-multidispatch-bad.stderr +++ b/src/test/ui/traits/traits-multidispatch-bad.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/traits-multidispatch-bad.rs:29:17 + --> $DIR/traits-multidispatch-bad.rs:19:17 | LL | test(22i32, 44i32); //~ ERROR mismatched types | ^^^^^ expected u32, found i32 diff --git a/src/test/ui/traits/traits-multidispatch-convert-ambig-dest.rs b/src/test/ui/traits/traits-multidispatch-convert-ambig-dest.rs index 0d4855c544f88..58cb69a05b704 100644 --- a/src/test/ui/traits/traits-multidispatch-convert-ambig-dest.rs +++ b/src/test/ui/traits/traits-multidispatch-convert-ambig-dest.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we get an error in a multidisptach scenario where the // set of impls is ambiguous. diff --git a/src/test/ui/traits/traits-multidispatch-convert-ambig-dest.stderr b/src/test/ui/traits/traits-multidispatch-convert-ambig-dest.stderr index 46c86cd767a07..d7d27049f431b 100644 --- a/src/test/ui/traits/traits-multidispatch-convert-ambig-dest.stderr +++ b/src/test/ui/traits/traits-multidispatch-convert-ambig-dest.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/traits-multidispatch-convert-ambig-dest.rs:36:5 + --> $DIR/traits-multidispatch-convert-ambig-dest.rs:26:5 | LL | test(22, std::default::Default::default()); | ^^^^ cannot infer type for `U` diff --git a/src/test/ui/traits/traits-negative-impls.rs b/src/test/ui/traits/traits-negative-impls.rs index a272686c53573..fb9a3a99748d0 100644 --- a/src/test/ui/traits/traits-negative-impls.rs +++ b/src/test/ui/traits/traits-negative-impls.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // The dummy functions are used to avoid adding new cfail files. // What happens is that the compiler attempts to squash duplicates and some // errors are not reported. This way, we make sure that, for each function, different diff --git a/src/test/ui/traits/traits-negative-impls.stderr b/src/test/ui/traits/traits-negative-impls.stderr index 0d10f4863d395..1bdd73eb6f9b1 100644 --- a/src/test/ui/traits/traits-negative-impls.stderr +++ b/src/test/ui/traits/traits-negative-impls.stderr @@ -1,44 +1,44 @@ error[E0277]: `dummy::TestType` cannot be sent between threads safely - --> $DIR/traits-negative-impls.rs:33:5 + --> $DIR/traits-negative-impls.rs:23:5 | LL | Outer(TestType); | ^^^^^ `dummy::TestType` cannot be sent between threads safely | = help: the trait `std::marker::Send` is not implemented for `dummy::TestType` note: required by `Outer` - --> $DIR/traits-negative-impls.rs:20:1 + --> $DIR/traits-negative-impls.rs:10:1 | LL | struct Outer(T); | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: `dummy::TestType` cannot be sent between threads safely - --> $DIR/traits-negative-impls.rs:33:5 + --> $DIR/traits-negative-impls.rs:23:5 | LL | Outer(TestType); | ^^^^^^^^^^^^^^^ `dummy::TestType` cannot be sent between threads safely | = help: the trait `std::marker::Send` is not implemented for `dummy::TestType` note: required by `Outer` - --> $DIR/traits-negative-impls.rs:20:1 + --> $DIR/traits-negative-impls.rs:10:1 | LL | struct Outer(T); | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: `dummy1b::TestType` cannot be sent between threads safely - --> $DIR/traits-negative-impls.rs:42:5 + --> $DIR/traits-negative-impls.rs:32:5 | LL | is_send(TestType); | ^^^^^^^ `dummy1b::TestType` cannot be sent between threads safely | = help: the trait `std::marker::Send` is not implemented for `dummy1b::TestType` note: required by `is_send` - --> $DIR/traits-negative-impls.rs:26:1 + --> $DIR/traits-negative-impls.rs:16:1 | LL | fn is_send(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: `dummy1c::TestType` cannot be sent between threads safely - --> $DIR/traits-negative-impls.rs:50:5 + --> $DIR/traits-negative-impls.rs:40:5 | LL | is_send((8, TestType)); | ^^^^^^^ `dummy1c::TestType` cannot be sent between threads safely @@ -46,13 +46,13 @@ LL | is_send((8, TestType)); = help: within `({integer}, dummy1c::TestType)`, the trait `std::marker::Send` is not implemented for `dummy1c::TestType` = note: required because it appears within the type `({integer}, dummy1c::TestType)` note: required by `is_send` - --> $DIR/traits-negative-impls.rs:26:1 + --> $DIR/traits-negative-impls.rs:16:1 | LL | fn is_send(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: `dummy2::TestType` cannot be sent between threads safely - --> $DIR/traits-negative-impls.rs:58:5 + --> $DIR/traits-negative-impls.rs:48:5 | LL | is_send(Box::new(TestType)); | ^^^^^^^ `dummy2::TestType` cannot be sent between threads safely @@ -61,13 +61,13 @@ LL | is_send(Box::new(TestType)); = note: required because of the requirements on the impl of `std::marker::Send` for `std::ptr::Unique` = note: required because it appears within the type `std::boxed::Box` note: required by `is_send` - --> $DIR/traits-negative-impls.rs:26:1 + --> $DIR/traits-negative-impls.rs:16:1 | LL | fn is_send(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: `dummy3::TestType` cannot be sent between threads safely - --> $DIR/traits-negative-impls.rs:66:5 + --> $DIR/traits-negative-impls.rs:56:5 | LL | is_send(Box::new(Outer2(TestType))); | ^^^^^^^ `dummy3::TestType` cannot be sent between threads safely @@ -77,13 +77,13 @@ LL | is_send(Box::new(Outer2(TestType))); = note: required because of the requirements on the impl of `std::marker::Send` for `std::ptr::Unique>` = note: required because it appears within the type `std::boxed::Box>` note: required by `is_send` - --> $DIR/traits-negative-impls.rs:26:1 + --> $DIR/traits-negative-impls.rs:16:1 | LL | fn is_send(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: `main::TestType` cannot be sent between threads safely - --> $DIR/traits-negative-impls.rs:76:5 + --> $DIR/traits-negative-impls.rs:66:5 | LL | is_sync(Outer2(TestType)); | ^^^^^^^ `main::TestType` cannot be sent between threads safely @@ -91,7 +91,7 @@ LL | is_sync(Outer2(TestType)); = help: the trait `std::marker::Send` is not implemented for `main::TestType` = note: required because of the requirements on the impl of `std::marker::Sync` for `Outer2` note: required by `is_sync` - --> $DIR/traits-negative-impls.rs:27:1 + --> $DIR/traits-negative-impls.rs:17:1 | LL | fn is_sync(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/traits/traits-repeated-supertrait-ambig.rs b/src/test/ui/traits/traits-repeated-supertrait-ambig.rs index 559871af72ed6..5fa7e87aa4b97 100644 --- a/src/test/ui/traits/traits-repeated-supertrait-ambig.rs +++ b/src/test/ui/traits/traits-repeated-supertrait-ambig.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test a case of a trait which extends the same supertrait twice, but // with difference type parameters. Test then that when we don't give // enough information to pick between these, no selection is made. In diff --git a/src/test/ui/traits/traits-repeated-supertrait-ambig.stderr b/src/test/ui/traits/traits-repeated-supertrait-ambig.stderr index 87d3c8117d3dd..f906378eb3cbd 100644 --- a/src/test/ui/traits/traits-repeated-supertrait-ambig.stderr +++ b/src/test/ui/traits/traits-repeated-supertrait-ambig.stderr @@ -1,11 +1,11 @@ error[E0277]: the trait bound `dyn CompareToInts: CompareTo` is not satisfied - --> $DIR/traits-repeated-supertrait-ambig.rs:36:7 + --> $DIR/traits-repeated-supertrait-ambig.rs:26:7 | LL | c.same_as(22) //~ ERROR `dyn CompareToInts: CompareTo` is not satisfied | ^^^^^^^ the trait `CompareTo` is not implemented for `dyn CompareToInts` error[E0277]: the trait bound `C: CompareTo` is not satisfied - --> $DIR/traits-repeated-supertrait-ambig.rs:40:7 + --> $DIR/traits-repeated-supertrait-ambig.rs:30:7 | LL | c.same_as(22) //~ ERROR `C: CompareTo` is not satisfied | ^^^^^^^ the trait `CompareTo` is not implemented for `C` @@ -13,32 +13,32 @@ LL | c.same_as(22) //~ ERROR `C: CompareTo` is not satisfied = help: consider adding a `where C: CompareTo` bound error[E0277]: the trait bound `dyn CompareToInts: CompareTo` is not satisfied - --> $DIR/traits-repeated-supertrait-ambig.rs:44:5 + --> $DIR/traits-repeated-supertrait-ambig.rs:34:5 | LL | CompareToInts::same_as(c, 22) //~ ERROR `dyn CompareToInts: CompareTo` is not satisfied | ^^^^^^^^^^^^^^^^^^^^^^ the trait `CompareTo` is not implemented for `dyn CompareToInts` | note: required by `CompareTo::same_as` - --> $DIR/traits-repeated-supertrait-ambig.rs:19:5 + --> $DIR/traits-repeated-supertrait-ambig.rs:9:5 | LL | fn same_as(&self, t: T) -> bool; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `C: CompareTo` is not satisfied - --> $DIR/traits-repeated-supertrait-ambig.rs:48:5 + --> $DIR/traits-repeated-supertrait-ambig.rs:38:5 | LL | CompareTo::same_as(c, 22) //~ ERROR `C: CompareTo` is not satisfied | ^^^^^^^^^^^^^^^^^^ the trait `CompareTo` is not implemented for `C` | = help: consider adding a `where C: CompareTo` bound note: required by `CompareTo::same_as` - --> $DIR/traits-repeated-supertrait-ambig.rs:19:5 + --> $DIR/traits-repeated-supertrait-ambig.rs:9:5 | LL | fn same_as(&self, t: T) -> bool; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `i64: CompareTo` is not satisfied - --> $DIR/traits-repeated-supertrait-ambig.rs:52:23 + --> $DIR/traits-repeated-supertrait-ambig.rs:42:23 | LL | assert_eq!(22_i64.same_as(22), true); //~ ERROR `i64: CompareTo` is not satisfied | ^^^^^^^ the trait `CompareTo` is not implemented for `i64` diff --git a/src/test/ui/transmute/main.rs b/src/test/ui/transmute/main.rs index 285b079cf96c8..6c6fa47a50d6a 100644 --- a/src/test/ui/transmute/main.rs +++ b/src/test/ui/transmute/main.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // normalize-stderr-32bit: "&str \(64 bits\)" -> "&str ($$STR bits)" // normalize-stderr-64bit: "&str \(128 bits\)" -> "&str ($$STR bits)" diff --git a/src/test/ui/transmute/main.stderr b/src/test/ui/transmute/main.stderr index 7f6ee749c4fd5..9a344747e8fce 100644 --- a/src/test/ui/transmute/main.stderr +++ b/src/test/ui/transmute/main.stderr @@ -1,5 +1,5 @@ error[E0512]: transmute called with types of different sizes - --> $DIR/main.rs:26:5 + --> $DIR/main.rs:16:5 | LL | transmute(x) //~ ERROR transmute called with types of different sizes | ^^^^^^^^^ @@ -8,7 +8,7 @@ LL | transmute(x) //~ ERROR transmute called with types of different sizes = note: target type: >::T (size can vary because of ::T) error[E0512]: transmute called with types of different sizes - --> $DIR/main.rs:30:17 + --> $DIR/main.rs:20:17 | LL | let x: u8 = transmute(10u16); //~ ERROR transmute called with types of different sizes | ^^^^^^^^^ @@ -17,7 +17,7 @@ LL | let x: u8 = transmute(10u16); //~ ERROR transmute called with types of = note: target type: u8 (8 bits) error[E0512]: transmute called with types of different sizes - --> $DIR/main.rs:34:17 + --> $DIR/main.rs:24:17 | LL | let x: u8 = transmute("test"); //~ ERROR transmute called with types of different sizes | ^^^^^^^^^ @@ -26,7 +26,7 @@ LL | let x: u8 = transmute("test"); //~ ERROR transmute called with types of = note: target type: u8 (8 bits) error[E0512]: transmute called with types of different sizes - --> $DIR/main.rs:39:18 + --> $DIR/main.rs:29:18 | LL | let x: Foo = transmute(10); //~ ERROR transmute called with types of different sizes | ^^^^^^^^^ diff --git a/src/test/ui/transmute/transmute-different-sizes.rs b/src/test/ui/transmute/transmute-different-sizes.rs index 62e9ceb2b2f46..00bdd8c0230ac 100644 --- a/src/test/ui/transmute/transmute-different-sizes.rs +++ b/src/test/ui/transmute/transmute-different-sizes.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // normalize-stderr-test "\d+ bits" -> "N bits" // Tests that `transmute` cannot be called on types of different size. diff --git a/src/test/ui/transmute/transmute-different-sizes.stderr b/src/test/ui/transmute/transmute-different-sizes.stderr index a07b75e29d5bd..3fb9300c1348a 100644 --- a/src/test/ui/transmute/transmute-different-sizes.stderr +++ b/src/test/ui/transmute/transmute-different-sizes.stderr @@ -1,5 +1,5 @@ error[E0512]: transmute called with types of different sizes - --> $DIR/transmute-different-sizes.rs:21:17 + --> $DIR/transmute-different-sizes.rs:11:17 | LL | let _: i8 = transmute(16i16); | ^^^^^^^^^ @@ -8,7 +8,7 @@ LL | let _: i8 = transmute(16i16); = note: target type: i8 (N bits) error[E0512]: transmute called with types of different sizes - --> $DIR/transmute-different-sizes.rs:26:17 + --> $DIR/transmute-different-sizes.rs:16:17 | LL | let _: i8 = transmute(x); | ^^^^^^^^^ @@ -17,7 +17,7 @@ LL | let _: i8 = transmute(x); = note: target type: i8 (N bits) error[E0512]: transmute called with types of different sizes - --> $DIR/transmute-different-sizes.rs:37:5 + --> $DIR/transmute-different-sizes.rs:27:5 | LL | transmute(x) | ^^^^^^^^^ diff --git a/src/test/ui/transmute/transmute-fat-pointers.rs b/src/test/ui/transmute/transmute-fat-pointers.rs index c1e6ee3ddcc3b..f9385ef8994b2 100644 --- a/src/test/ui/transmute/transmute-fat-pointers.rs +++ b/src/test/ui/transmute/transmute-fat-pointers.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // normalize-stderr-test "\d+ bits" -> "N bits" // Tests that are conservative around thin/fat pointer mismatches. diff --git a/src/test/ui/transmute/transmute-fat-pointers.stderr b/src/test/ui/transmute/transmute-fat-pointers.stderr index 8ea71e101c031..aed89ab84ca72 100644 --- a/src/test/ui/transmute/transmute-fat-pointers.stderr +++ b/src/test/ui/transmute/transmute-fat-pointers.stderr @@ -1,5 +1,5 @@ error[E0512]: transmute called with types of different sizes - --> $DIR/transmute-fat-pointers.rs:20:14 + --> $DIR/transmute-fat-pointers.rs:10:14 | LL | unsafe { transmute(x) } //~ ERROR transmute called with types of different sizes | ^^^^^^^^^ @@ -8,7 +8,7 @@ LL | unsafe { transmute(x) } //~ ERROR transmute called with types of differ = note: target type: &U (pointer to U) error[E0512]: transmute called with types of different sizes - --> $DIR/transmute-fat-pointers.rs:24:14 + --> $DIR/transmute-fat-pointers.rs:14:14 | LL | unsafe { transmute(x) } //~ ERROR transmute called with types of different sizes | ^^^^^^^^^ @@ -17,7 +17,7 @@ LL | unsafe { transmute(x) } //~ ERROR transmute called with types of differ = note: target type: &U (pointer to U) error[E0512]: transmute called with types of different sizes - --> $DIR/transmute-fat-pointers.rs:36:14 + --> $DIR/transmute-fat-pointers.rs:26:14 | LL | unsafe { transmute(x) } //~ ERROR transmute called with types of different sizes | ^^^^^^^^^ @@ -26,7 +26,7 @@ LL | unsafe { transmute(x) } //~ ERROR transmute called with types of differ = note: target type: &U (N bits) error[E0512]: transmute called with types of different sizes - --> $DIR/transmute-fat-pointers.rs:40:14 + --> $DIR/transmute-fat-pointers.rs:30:14 | LL | unsafe { transmute(x) } //~ ERROR transmute called with types of different sizes | ^^^^^^^^^ diff --git a/src/test/ui/transmute/transmute-from-fn-item-types-error.rs b/src/test/ui/transmute/transmute-from-fn-item-types-error.rs index 0a0214a24ff2d..b06751f376e90 100644 --- a/src/test/ui/transmute/transmute-from-fn-item-types-error.rs +++ b/src/test/ui/transmute/transmute-from-fn-item-types-error.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::mem; unsafe fn foo() -> (i8, *const (), Option) { diff --git a/src/test/ui/transmute/transmute-from-fn-item-types-error.stderr b/src/test/ui/transmute/transmute-from-fn-item-types-error.stderr index 1591b06f3ac5b..07e8c60e91e16 100644 --- a/src/test/ui/transmute/transmute-from-fn-item-types-error.stderr +++ b/src/test/ui/transmute/transmute-from-fn-item-types-error.stderr @@ -1,5 +1,5 @@ error[E0512]: transmute called with types of different sizes - --> $DIR/transmute-from-fn-item-types-error.rs:14:13 + --> $DIR/transmute-from-fn-item-types-error.rs:4:13 | LL | let i = mem::transmute(bar); | ^^^^^^^^^^^^^^ @@ -8,7 +8,7 @@ LL | let i = mem::transmute(bar); = note: target type: i8 (8 bits) error[E0591]: can't transmute zero-sized type - --> $DIR/transmute-from-fn-item-types-error.rs:18:13 + --> $DIR/transmute-from-fn-item-types-error.rs:8:13 | LL | let p = mem::transmute(foo); | ^^^^^^^^^^^^^^ @@ -18,7 +18,7 @@ LL | let p = mem::transmute(foo); = help: cast with `as` to a pointer instead error[E0591]: can't transmute zero-sized type - --> $DIR/transmute-from-fn-item-types-error.rs:22:14 + --> $DIR/transmute-from-fn-item-types-error.rs:12:14 | LL | let of = mem::transmute(main); | ^^^^^^^^^^^^^^ @@ -28,7 +28,7 @@ LL | let of = mem::transmute(main); = help: cast with `as` to a pointer instead error[E0512]: transmute called with types of different sizes - --> $DIR/transmute-from-fn-item-types-error.rs:31:5 + --> $DIR/transmute-from-fn-item-types-error.rs:21:5 | LL | mem::transmute::<_, u8>(main); | ^^^^^^^^^^^^^^^^^^^^^^^ @@ -37,7 +37,7 @@ LL | mem::transmute::<_, u8>(main); = note: target type: u8 (8 bits) error[E0591]: can't transmute zero-sized type - --> $DIR/transmute-from-fn-item-types-error.rs:35:5 + --> $DIR/transmute-from-fn-item-types-error.rs:25:5 | LL | mem::transmute::<_, *mut ()>(foo); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -47,7 +47,7 @@ LL | mem::transmute::<_, *mut ()>(foo); = help: cast with `as` to a pointer instead error[E0591]: can't transmute zero-sized type - --> $DIR/transmute-from-fn-item-types-error.rs:39:5 + --> $DIR/transmute-from-fn-item-types-error.rs:29:5 | LL | mem::transmute::<_, fn()>(bar); | ^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -57,7 +57,7 @@ LL | mem::transmute::<_, fn()>(bar); = help: cast with `as` to a pointer instead error[E0591]: can't transmute zero-sized type - --> $DIR/transmute-from-fn-item-types-error.rs:48:5 + --> $DIR/transmute-from-fn-item-types-error.rs:38:5 | LL | mem::transmute::<_, *mut ()>(Some(foo)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -67,7 +67,7 @@ LL | mem::transmute::<_, *mut ()>(Some(foo)); = help: cast with `as` to a pointer instead error[E0591]: can't transmute zero-sized type - --> $DIR/transmute-from-fn-item-types-error.rs:52:5 + --> $DIR/transmute-from-fn-item-types-error.rs:42:5 | LL | mem::transmute::<_, fn()>(Some(bar)); | ^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -77,7 +77,7 @@ LL | mem::transmute::<_, fn()>(Some(bar)); = help: cast with `as` to a pointer instead error[E0591]: can't transmute zero-sized type - --> $DIR/transmute-from-fn-item-types-error.rs:56:5 + --> $DIR/transmute-from-fn-item-types-error.rs:46:5 | LL | mem::transmute::<_, Option>(Some(baz)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/transmute/transmute-impl.rs b/src/test/ui/transmute/transmute-impl.rs index 3bf4ca5b9e039..23fddfe038e29 100644 --- a/src/test/ui/transmute/transmute-impl.rs +++ b/src/test/ui/transmute/transmute-impl.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // normalize-stderr-test "\d+ bits" -> "N bits" // Tests that are conservative around thin/fat pointer mismatches. diff --git a/src/test/ui/transmute/transmute-impl.stderr b/src/test/ui/transmute/transmute-impl.stderr index 21f272b0cc181..ad46c24e9c6c1 100644 --- a/src/test/ui/transmute/transmute-impl.stderr +++ b/src/test/ui/transmute/transmute-impl.stderr @@ -1,5 +1,5 @@ error[E0512]: transmute called with types of different sizes - --> $DIR/transmute-impl.rs:31:18 + --> $DIR/transmute-impl.rs:21:18 | LL | unsafe { transmute(x) } //~ ERROR transmute called with types of different sizes | ^^^^^^^^^ diff --git a/src/test/ui/transmute/transmute-imut-to-mut.rs b/src/test/ui/transmute/transmute-imut-to-mut.rs index 62db4c5d366d6..94361a29087ea 100644 --- a/src/test/ui/transmute/transmute-imut-to-mut.rs +++ b/src/test/ui/transmute/transmute-imut-to-mut.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that transmuting from &T to &mut T is Undefined Behavior. use std::mem::transmute; diff --git a/src/test/ui/transmute/transmute-imut-to-mut.stderr b/src/test/ui/transmute/transmute-imut-to-mut.stderr index 4434e35af7ff1..d2445f0c7f3ff 100644 --- a/src/test/ui/transmute/transmute-imut-to-mut.stderr +++ b/src/test/ui/transmute/transmute-imut-to-mut.stderr @@ -1,5 +1,5 @@ error: mutating transmuted &mut T from &T may cause undefined behavior, consider instead using an UnsafeCell - --> $DIR/transmute-imut-to-mut.rs:16:32 + --> $DIR/transmute-imut-to-mut.rs:6:32 | LL | let _a: &mut u8 = unsafe { transmute(&1u8) }; | ^^^^^^^^^ diff --git a/src/test/ui/transmute/transmute-type-parameters.rs b/src/test/ui/transmute/transmute-type-parameters.rs index fe340295f74c7..812386cf1653a 100644 --- a/src/test/ui/transmute/transmute-type-parameters.rs +++ b/src/test/ui/transmute/transmute-type-parameters.rs @@ -1,18 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - - - - // Tests that `transmute` cannot be called on type parameters. use std::mem::transmute; diff --git a/src/test/ui/transmute/transmute-type-parameters.stderr b/src/test/ui/transmute/transmute-type-parameters.stderr index ab0bd8fe2d81f..c7cdf31dcd56c 100644 --- a/src/test/ui/transmute/transmute-type-parameters.stderr +++ b/src/test/ui/transmute/transmute-type-parameters.stderr @@ -1,5 +1,5 @@ error[E0512]: transmute called with types of different sizes - --> $DIR/transmute-type-parameters.rs:21:18 + --> $DIR/transmute-type-parameters.rs:6:18 | LL | let _: i32 = transmute(x); | ^^^^^^^^^ @@ -8,7 +8,7 @@ LL | let _: i32 = transmute(x); = note: target type: i32 (32 bits) error[E0512]: transmute called with types of different sizes - --> $DIR/transmute-type-parameters.rs:26:18 + --> $DIR/transmute-type-parameters.rs:11:18 | LL | let _: i32 = transmute(x); | ^^^^^^^^^ @@ -17,7 +17,7 @@ LL | let _: i32 = transmute(x); = note: target type: i32 (32 bits) error[E0512]: transmute called with types of different sizes - --> $DIR/transmute-type-parameters.rs:31:18 + --> $DIR/transmute-type-parameters.rs:16:18 | LL | let _: i32 = transmute(x); | ^^^^^^^^^ @@ -26,7 +26,7 @@ LL | let _: i32 = transmute(x); = note: target type: i32 (32 bits) error[E0512]: transmute called with types of different sizes - --> $DIR/transmute-type-parameters.rs:40:18 + --> $DIR/transmute-type-parameters.rs:25:18 | LL | let _: i32 = transmute(x); | ^^^^^^^^^ @@ -35,7 +35,7 @@ LL | let _: i32 = transmute(x); = note: target type: i32 (32 bits) error[E0512]: transmute called with types of different sizes - --> $DIR/transmute-type-parameters.rs:50:18 + --> $DIR/transmute-type-parameters.rs:35:18 | LL | let _: i32 = transmute(x); | ^^^^^^^^^ @@ -44,7 +44,7 @@ LL | let _: i32 = transmute(x); = note: target type: i32 (32 bits) error[E0512]: transmute called with types of different sizes - --> $DIR/transmute-type-parameters.rs:55:18 + --> $DIR/transmute-type-parameters.rs:40:18 | LL | let _: i32 = transmute(x); | ^^^^^^^^^ diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-associated-functions.rs b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-associated-functions.rs index 49c9df95bc772..6450ddd1b67fc 100644 --- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-associated-functions.rs +++ b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-associated-functions.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass // Inconsistent bounds with trait implementations diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy-reborrow.nll.stderr b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy-reborrow.nll.stderr index 56897baeb4eff..8b86dd9a4c92a 100644 --- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy-reborrow.nll.stderr +++ b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy-reborrow.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `**t` as mutable, as it is behind a `&` reference - --> $DIR/trivial-bounds-inconsistent-copy-reborrow.rs:16:5 + --> $DIR/trivial-bounds-inconsistent-copy-reborrow.rs:6:5 | LL | fn reborrow_mut<'a>(t: &'a &'a mut i32) -> &'a mut i32 where &'a mut i32: Copy { | --------------- help: consider changing this to be a mutable reference: `&'a mut &'a mut i32` @@ -7,7 +7,7 @@ LL | *t //~ ERROR | ^^ `t` is a `&` reference, so the data it refers to cannot be borrowed as mutable error[E0596]: cannot borrow `**t` as mutable, as it is behind a `&` reference - --> $DIR/trivial-bounds-inconsistent-copy-reborrow.rs:20:6 + --> $DIR/trivial-bounds-inconsistent-copy-reborrow.rs:10:6 | LL | fn copy_reborrow_mut<'a>(t: &'a &'a mut i32) -> &'a mut i32 where &'a mut i32: Copy { | --------------- help: consider changing this to be a mutable reference: `&'a mut &'a mut i32` diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy-reborrow.rs b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy-reborrow.rs index 2c4d9d813856c..b1ff23fd09700 100644 --- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy-reborrow.rs +++ b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy-reborrow.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that reborrows are still illegal with Copy mutable references #![feature(trivial_bounds)] #![allow(unused)] diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy-reborrow.stderr b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy-reborrow.stderr index bea2bb66857f2..a3995b7edefae 100644 --- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy-reborrow.stderr +++ b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy-reborrow.stderr @@ -1,5 +1,5 @@ error[E0389]: cannot borrow data mutably in a `&` reference - --> $DIR/trivial-bounds-inconsistent-copy-reborrow.rs:16:5 + --> $DIR/trivial-bounds-inconsistent-copy-reborrow.rs:6:5 | LL | fn reborrow_mut<'a>(t: &'a &'a mut i32) -> &'a mut i32 where &'a mut i32: Copy { | --------------- use `&'a mut &'a mut i32` here to make mutable @@ -7,7 +7,7 @@ LL | *t //~ ERROR | ^^ assignment into an immutable reference error[E0389]: cannot borrow data mutably in a `&` reference - --> $DIR/trivial-bounds-inconsistent-copy-reborrow.rs:20:6 + --> $DIR/trivial-bounds-inconsistent-copy-reborrow.rs:10:6 | LL | fn copy_reborrow_mut<'a>(t: &'a &'a mut i32) -> &'a mut i32 where &'a mut i32: Copy { | --------------- use `&'a mut &'a mut i32` here to make mutable diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy.rs b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy.rs index 375885a02c75a..bdbd64140f0cb 100644 --- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy.rs +++ b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass // Check tautalogically false `Copy` bounds #![feature(trivial_bounds)] diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy.stderr b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy.stderr index ae63900575611..ff4b64bf11e0a 100644 --- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy.stderr +++ b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy.stderr @@ -1,5 +1,5 @@ warning: Trait bound std::string::String: std::marker::Copy does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-inconsistent-copy.rs:16:1 + --> $DIR/trivial-bounds-inconsistent-copy.rs:6:1 | LL | / fn copy_string(t: String) -> String where String: Copy { LL | | is_copy(&t); @@ -12,7 +12,7 @@ LL | | } = note: #[warn(trivial_bounds)] on by default warning: Trait bound std::string::String: std::marker::Copy does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-inconsistent-copy.rs:23:1 + --> $DIR/trivial-bounds-inconsistent-copy.rs:13:1 | LL | / fn copy_out_string(t: &String) -> String where String: Copy { LL | | *t @@ -20,7 +20,7 @@ LL | | } | |_^ warning: Trait bound std::string::String: std::marker::Copy does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-inconsistent-copy.rs:27:1 + --> $DIR/trivial-bounds-inconsistent-copy.rs:17:1 | LL | / fn copy_string_with_param(x: String) where String: Copy { LL | | let y = x; @@ -29,7 +29,7 @@ LL | | } | |_^ warning: Trait bound for<'b> &'b mut i32: std::marker::Copy does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-inconsistent-copy.rs:33:1 + --> $DIR/trivial-bounds-inconsistent-copy.rs:23:1 | LL | / fn copy_mut<'a>(t: &&'a mut i32) -> &'a mut i32 where for<'b> &'b mut i32: Copy { LL | | is_copy(t); diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection-error.rs b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection-error.rs index 1a3bd3a8cd7cc..e0f2996307bf4 100644 --- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection-error.rs +++ b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection-error.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(trivial_bounds)] #![allow(unused)] diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection-error.stderr b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection-error.stderr index 0f720bee2b4e6..f769f23f115fd 100644 --- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection-error.stderr +++ b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection-error.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/trivial-bounds-inconsistent-projection-error.rs:30:5 + --> $DIR/trivial-bounds-inconsistent-projection-error.rs:20:5 | LL | fn global_bound_is_hidden() -> u8 | -- expected `u8` because of return type diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection.rs b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection.rs index 8de6f06bf5f5d..fa2daeb11e916 100644 --- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection.rs +++ b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass // Check that global bounds result in the expected choice of associated type diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection.stderr b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection.stderr index 201a041830f84..058e4c4ef4abc 100644 --- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection.stderr +++ b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection.stderr @@ -1,5 +1,5 @@ warning: Trait bound B: A does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-inconsistent-projection.rs:29:1 + --> $DIR/trivial-bounds-inconsistent-projection.rs:19:1 | LL | / fn underspecified_bound() -> u8 LL | | where @@ -12,7 +12,7 @@ LL | | } = note: #[warn(trivial_bounds)] on by default warning: Trait bound B: A does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-inconsistent-projection.rs:36:1 + --> $DIR/trivial-bounds-inconsistent-projection.rs:26:1 | LL | / fn inconsistent_bound() -> i32 LL | | where @@ -23,7 +23,7 @@ LL | | } | |_^ warning: Trait bound B: A does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-inconsistent-projection.rs:43:1 + --> $DIR/trivial-bounds-inconsistent-projection.rs:33:1 | LL | / fn redundant_bound() -> u8 LL | | where @@ -34,7 +34,7 @@ LL | | } | |_^ warning: Trait bound B: A does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-inconsistent-projection.rs:50:1 + --> $DIR/trivial-bounds-inconsistent-projection.rs:40:1 | LL | / fn inconsistent_dup_bound() -> i32 LL | | where @@ -45,7 +45,7 @@ LL | | } | |_^ warning: Trait bound B: A does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-inconsistent-projection.rs:57:1 + --> $DIR/trivial-bounds-inconsistent-projection.rs:47:1 | LL | / fn redundant_dup_bound() -> u8 LL | | where diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-sized.rs b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-sized.rs index 14ba11c44de13..a5d5b93772651 100644 --- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-sized.rs +++ b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-sized.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass // Check tautalogically false `Sized` bounds #![feature(trivial_bounds)] diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-sized.stderr b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-sized.stderr index e18018c6f0c01..286eaec0d7b78 100644 --- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-sized.stderr +++ b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-sized.stderr @@ -1,5 +1,5 @@ warning: Trait bound str: std::marker::Sized does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-inconsistent-sized.rs:24:1 + --> $DIR/trivial-bounds-inconsistent-sized.rs:14:1 | LL | struct S(str, str) where str: Sized; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | struct S(str, str) where str: Sized; = note: #[warn(trivial_bounds)] on by default warning: Trait bound for<'a> T<(dyn A + 'a)>: std::marker::Sized does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-inconsistent-sized.rs:26:1 + --> $DIR/trivial-bounds-inconsistent-sized.rs:16:1 | LL | / fn unsized_local() where for<'a> T: Sized { LL | | let x: T = *(Box::new(T { x: 1 }) as Box>); @@ -15,7 +15,7 @@ LL | | } | |_^ warning: Trait bound str: std::marker::Sized does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-inconsistent-sized.rs:30:1 + --> $DIR/trivial-bounds-inconsistent-sized.rs:20:1 | LL | / fn return_str() -> str where str: Sized { LL | | *"Sized".to_string().into_boxed_str() diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-well-formed.rs b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-well-formed.rs index 5fcdbfc437a81..cab2423d25de2 100644 --- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-well-formed.rs +++ b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-well-formed.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass // Test that inconsistent bounds are used in well-formedness checks #![feature(trivial_bounds)] diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-well-formed.stderr b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-well-formed.stderr index b51ecd4990071..64f81e1311a15 100644 --- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-well-formed.stderr +++ b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-well-formed.stderr @@ -1,5 +1,5 @@ warning: Trait bound std::vec::Vec: std::fmt::Debug does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-inconsistent-well-formed.rs:17:1 + --> $DIR/trivial-bounds-inconsistent-well-formed.rs:7:1 | LL | / pub fn foo() where Vec: Debug, str: Copy { LL | | let x = vec![*"1"]; @@ -10,7 +10,7 @@ LL | | } = note: #[warn(trivial_bounds)] on by default warning: Trait bound str: std::marker::Copy does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-inconsistent-well-formed.rs:17:1 + --> $DIR/trivial-bounds-inconsistent-well-formed.rs:7:1 | LL | / pub fn foo() where Vec: Debug, str: Copy { LL | | let x = vec![*"1"]; diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent.rs b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent.rs index 2c8b873b8c946..fdbaec9a5c7ff 100644 --- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent.rs +++ b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass // Check that tautalogically false bounds are accepted, and are used diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent.stderr b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent.stderr index 85b16b17042f6..dd3b5cc61fa85 100644 --- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent.stderr +++ b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent.stderr @@ -1,5 +1,5 @@ warning: Trait bound i32: Foo does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-inconsistent.rs:24:1 + --> $DIR/trivial-bounds-inconsistent.rs:14:1 | LL | enum E where i32: Foo { V } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -7,25 +7,25 @@ LL | enum E where i32: Foo { V } = note: #[warn(trivial_bounds)] on by default warning: Trait bound i32: Foo does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-inconsistent.rs:26:1 + --> $DIR/trivial-bounds-inconsistent.rs:16:1 | LL | struct S where i32: Foo; | ^^^^^^^^^^^^^^^^^^^^^^^^ warning: Trait bound i32: Foo does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-inconsistent.rs:28:1 + --> $DIR/trivial-bounds-inconsistent.rs:18:1 | LL | trait T where i32: Foo {} | ^^^^^^^^^^^^^^^^^^^^^^^^^ warning: Trait bound i32: Foo does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-inconsistent.rs:30:1 + --> $DIR/trivial-bounds-inconsistent.rs:20:1 | LL | union U where i32: Foo { f: i32 } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: where clauses are not enforced in type aliases - --> $DIR/trivial-bounds-inconsistent.rs:32:14 + --> $DIR/trivial-bounds-inconsistent.rs:22:14 | LL | type Y where i32: Foo = (); | ^^^^^^^^ @@ -34,13 +34,13 @@ LL | type Y where i32: Foo = (); = help: the clause will not be checked when the type alias is used, and should be removed warning: Trait bound i32: Foo does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-inconsistent.rs:32:1 + --> $DIR/trivial-bounds-inconsistent.rs:22:1 | LL | type Y where i32: Foo = (); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: Trait bound i32: Foo does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-inconsistent.rs:34:1 + --> $DIR/trivial-bounds-inconsistent.rs:24:1 | LL | / impl Foo for () where i32: Foo { LL | | fn test(&self) { @@ -52,7 +52,7 @@ LL | | } | |_^ warning: Trait bound i32: Foo does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-inconsistent.rs:42:1 + --> $DIR/trivial-bounds-inconsistent.rs:32:1 | LL | / fn f() where i32: Foo { LL | | let s = S; @@ -63,7 +63,7 @@ LL | | } | |_^ warning: Trait bound &'static str: Foo does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-inconsistent.rs:49:1 + --> $DIR/trivial-bounds-inconsistent.rs:39:1 | LL | / fn g() where &'static str: Foo { LL | | "Foo".test(); @@ -73,13 +73,13 @@ LL | | } | |_^ warning: Trait bound str: std::marker::Sized does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-inconsistent.rs:63:1 + --> $DIR/trivial-bounds-inconsistent.rs:53:1 | LL | struct TwoStrs(str, str) where str: Sized; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: Trait bound for<'a> Dst<(dyn A + 'a)>: std::marker::Sized does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-inconsistent.rs:65:1 + --> $DIR/trivial-bounds-inconsistent.rs:55:1 | LL | / fn unsized_local() where for<'a> Dst: Sized { LL | | let x: Dst = *(Box::new(Dst { x: 1 }) as Box>); @@ -87,7 +87,7 @@ LL | | } | |_^ warning: Trait bound str: std::marker::Sized does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-inconsistent.rs:69:1 + --> $DIR/trivial-bounds-inconsistent.rs:59:1 | LL | / fn return_str() -> str where str: Sized { LL | | *"Sized".to_string().into_boxed_str() @@ -95,7 +95,7 @@ LL | | } | |_^ warning: Trait bound std::string::String: std::ops::Neg does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-inconsistent.rs:73:1 + --> $DIR/trivial-bounds-inconsistent.rs:63:1 | LL | / fn use_op(s: String) -> String where String: ::std::ops::Neg { LL | | -s @@ -103,7 +103,7 @@ LL | | } | |_^ warning: Trait bound i32: std::iter::Iterator does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-inconsistent.rs:77:1 + --> $DIR/trivial-bounds-inconsistent.rs:67:1 | LL | / fn use_for() where i32: Iterator { LL | | for _ in 2i32 {} diff --git a/src/test/ui/trivial-bounds/trivial-bounds-leak-copy.rs b/src/test/ui/trivial-bounds/trivial-bounds-leak-copy.rs index 9850ec2bd1fc0..cecc0b2da0eb5 100644 --- a/src/test/ui/trivial-bounds/trivial-bounds-leak-copy.rs +++ b/src/test/ui/trivial-bounds/trivial-bounds-leak-copy.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that false Copy bounds don't leak #![feature(trivial_bounds)] diff --git a/src/test/ui/trivial-bounds/trivial-bounds-leak-copy.stderr b/src/test/ui/trivial-bounds/trivial-bounds-leak-copy.stderr index 3c3fcbf9b803c..b8e669d4a7c34 100644 --- a/src/test/ui/trivial-bounds/trivial-bounds-leak-copy.stderr +++ b/src/test/ui/trivial-bounds/trivial-bounds-leak-copy.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/trivial-bounds-leak-copy.rs:19:5 + --> $DIR/trivial-bounds-leak-copy.rs:9:5 | LL | *t //~ ERROR | ^^ cannot move out of borrowed content diff --git a/src/test/ui/trivial-bounds/trivial-bounds-leak.rs b/src/test/ui/trivial-bounds/trivial-bounds-leak.rs index 98cb5b2b50332..dc4f1c7f9fc16 100644 --- a/src/test/ui/trivial-bounds/trivial-bounds-leak.rs +++ b/src/test/ui/trivial-bounds/trivial-bounds-leak.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that false bounds don't leak #![feature(trivial_bounds)] diff --git a/src/test/ui/trivial-bounds/trivial-bounds-leak.stderr b/src/test/ui/trivial-bounds/trivial-bounds-leak.stderr index 984e492281fc5..bc94aba667c38 100644 --- a/src/test/ui/trivial-bounds/trivial-bounds-leak.stderr +++ b/src/test/ui/trivial-bounds/trivial-bounds-leak.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `str` cannot be known at compilation time - --> $DIR/trivial-bounds-leak.rs:22:25 + --> $DIR/trivial-bounds-leak.rs:12:25 | LL | fn cant_return_str() -> str { //~ ERROR | ^^^ doesn't have a size known at compile-time @@ -9,7 +9,7 @@ LL | fn cant_return_str() -> str { //~ ERROR = note: the return type of a function must have a statically known size error[E0599]: no method named `test` found for type `i32` in the current scope - --> $DIR/trivial-bounds-leak.rs:34:10 + --> $DIR/trivial-bounds-leak.rs:24:10 | LL | 3i32.test(); //~ ERROR | ^^^^ @@ -19,25 +19,25 @@ LL | 3i32.test(); //~ ERROR candidate #1: `Foo` error[E0277]: the trait bound `i32: Foo` is not satisfied - --> $DIR/trivial-bounds-leak.rs:35:5 + --> $DIR/trivial-bounds-leak.rs:25:5 | LL | Foo::test(&4i32); //~ ERROR | ^^^^^^^^^ the trait `Foo` is not implemented for `i32` | note: required by `Foo::test` - --> $DIR/trivial-bounds-leak.rs:15:5 + --> $DIR/trivial-bounds-leak.rs:5:5 | LL | fn test(&self); | ^^^^^^^^^^^^^^^ error[E0277]: the trait bound `i32: Foo` is not satisfied - --> $DIR/trivial-bounds-leak.rs:36:5 + --> $DIR/trivial-bounds-leak.rs:26:5 | LL | generic_function(5i32); //~ ERROR | ^^^^^^^^^^^^^^^^ the trait `Foo` is not implemented for `i32` | note: required by `generic_function` - --> $DIR/trivial-bounds-leak.rs:39:1 + --> $DIR/trivial-bounds-leak.rs:29:1 | LL | fn generic_function(t: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/trivial-bounds/trivial-bounds-lint.rs b/src/test/ui/trivial-bounds/trivial-bounds-lint.rs index e6988cb9f8bfe..078578372d0f8 100644 --- a/src/test/ui/trivial-bounds/trivial-bounds-lint.rs +++ b/src/test/ui/trivial-bounds/trivial-bounds-lint.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(trivial_bounds)] #![allow(unused)] #![deny(trivial_bounds)] diff --git a/src/test/ui/trivial-bounds/trivial-bounds-lint.stderr b/src/test/ui/trivial-bounds/trivial-bounds-lint.stderr index 6a3e1981025cf..bae31c2ae2b4e 100644 --- a/src/test/ui/trivial-bounds/trivial-bounds-lint.stderr +++ b/src/test/ui/trivial-bounds/trivial-bounds-lint.stderr @@ -1,47 +1,47 @@ error: Trait bound i32: std::marker::Copy does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-lint.rs:15:1 + --> $DIR/trivial-bounds-lint.rs:5:1 | LL | struct A where i32: Copy; //~ ERROR | ^^^^^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/trivial-bounds-lint.rs:13:9 + --> $DIR/trivial-bounds-lint.rs:3:9 | LL | #![deny(trivial_bounds)] | ^^^^^^^^^^^^^^ error: Trait bound i32: X<()> does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-lint.rs:28:1 + --> $DIR/trivial-bounds-lint.rs:18:1 | LL | fn global_param() where i32: X<()> {} //~ ERROR | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: Trait bound i32: Z does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-lint.rs:32:1 + --> $DIR/trivial-bounds-lint.rs:22:1 | LL | fn global_projection() where i32: Z {} //~ ERROR | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: Lifetime bound i32 : 'static does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-lint.rs:39:1 + --> $DIR/trivial-bounds-lint.rs:29:1 | LL | fn global_lifetimes() where i32: 'static, &'static str: 'static {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: Lifetime bound &'static str : 'static does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-lint.rs:39:1 + --> $DIR/trivial-bounds-lint.rs:29:1 | LL | fn global_lifetimes() where i32: 'static, &'static str: 'static {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: Lifetime bound 'static : 'static does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-lint.rs:45:1 + --> $DIR/trivial-bounds-lint.rs:35:1 | LL | fn global_outlives() where 'static: 'static {} //~ ERROR | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: Trait bound i32: std::marker::Copy does not depend on any type or lifetime parameters - --> $DIR/trivial-bounds-lint.rs:48:1 + --> $DIR/trivial-bounds-lint.rs:38:1 | LL | fn mixed_bounds() where i32: X + Copy {} //~ ERROR | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/trivial-bounds/trivial-bounds-object.rs b/src/test/ui/trivial-bounds/trivial-bounds-object.rs index 00986eefbda7d..f5feeea7cd41c 100644 --- a/src/test/ui/trivial-bounds/trivial-bounds-object.rs +++ b/src/test/ui/trivial-bounds/trivial-bounds-object.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass // Check that the object bound dyn A + 'a: A is preferred over the // where clause bound dyn A + 'static: A. diff --git a/src/test/ui/trivial_casts.rs b/src/test/ui/trivial_casts.rs index 3f2bd2ffabf4b..c1f5441a36b08 100644 --- a/src/test/ui/trivial_casts.rs +++ b/src/test/ui/trivial_casts.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test the trivial_casts and trivial_numeric_casts lints. For each error we also // check that the cast can be done using just coercion. diff --git a/src/test/ui/trivial_casts.stderr b/src/test/ui/trivial_casts.stderr index dc2a6a058bd7e..fb1db76b13890 100644 --- a/src/test/ui/trivial_casts.stderr +++ b/src/test/ui/trivial_casts.stderr @@ -1,18 +1,18 @@ error: trivial numeric cast: `i32` as `i32` - --> $DIR/trivial_casts.rs:26:13 + --> $DIR/trivial_casts.rs:16:13 | LL | let _ = 42_i32 as i32; //~ ERROR trivial numeric cast: `i32` as `i32` | ^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/trivial_casts.rs:14:24 + --> $DIR/trivial_casts.rs:4:24 | LL | #![deny(trivial_casts, trivial_numeric_casts)] | ^^^^^^^^^^^^^^^^^^^^^ = help: cast can be replaced by coercion; this might require a temporary variable error: trivial numeric cast: `u8` as `u8` - --> $DIR/trivial_casts.rs:29:13 + --> $DIR/trivial_casts.rs:19:13 | LL | let _ = 42_u8 as u8; //~ ERROR trivial numeric cast: `u8` as `u8` | ^^^^^^^^^^^ @@ -20,20 +20,20 @@ LL | let _ = 42_u8 as u8; //~ ERROR trivial numeric cast: `u8` as `u8` = help: cast can be replaced by coercion; this might require a temporary variable error: trivial cast: `&u32` as `*const u32` - --> $DIR/trivial_casts.rs:34:13 + --> $DIR/trivial_casts.rs:24:13 | LL | let _ = x as *const u32; //~ERROR trivial cast: `&u32` as `*const u32` | ^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/trivial_casts.rs:14:9 + --> $DIR/trivial_casts.rs:4:9 | LL | #![deny(trivial_casts, trivial_numeric_casts)] | ^^^^^^^^^^^^^ = help: cast can be replaced by coercion; this might require a temporary variable error: trivial cast: `&mut u32` as `*mut u32` - --> $DIR/trivial_casts.rs:38:13 + --> $DIR/trivial_casts.rs:28:13 | LL | let _ = x as *mut u32; //~ERROR trivial cast: `&mut u32` as `*mut u32` | ^^^^^^^^^^^^^ @@ -41,7 +41,7 @@ LL | let _ = x as *mut u32; //~ERROR trivial cast: `&mut u32` as `*mut u32` = help: cast can be replaced by coercion; this might require a temporary variable error: trivial cast: `&[u32; 3]` as `&[u32]` - --> $DIR/trivial_casts.rs:43:13 + --> $DIR/trivial_casts.rs:33:13 | LL | let _ = x as &[u32]; //~ERROR trivial cast: `&[u32; 3]` as `&[u32]` | ^^^^^^^^^^^ @@ -49,7 +49,7 @@ LL | let _ = x as &[u32]; //~ERROR trivial cast: `&[u32; 3]` as `&[u32]` = help: cast can be replaced by coercion; this might require a temporary variable error: trivial cast: `&[u32; 3]` as `*const [u32]` - --> $DIR/trivial_casts.rs:44:13 + --> $DIR/trivial_casts.rs:34:13 | LL | let _ = x as *const [u32]; //~ERROR trivial cast: `&[u32; 3]` as `*const [u32]` | ^^^^^^^^^^^^^^^^^ @@ -57,7 +57,7 @@ LL | let _ = x as *const [u32]; //~ERROR trivial cast: `&[u32; 3]` as `*cons = help: cast can be replaced by coercion; this might require a temporary variable error: trivial cast: `&mut [u32; 3]` as `&mut [u32]` - --> $DIR/trivial_casts.rs:49:13 + --> $DIR/trivial_casts.rs:39:13 | LL | let _ = x as &mut [u32]; //~ERROR trivial cast: `&mut [u32; 3]` as `&mut [u32]` | ^^^^^^^^^^^^^^^ @@ -65,7 +65,7 @@ LL | let _ = x as &mut [u32]; //~ERROR trivial cast: `&mut [u32; 3]` as `&mu = help: cast can be replaced by coercion; this might require a temporary variable error: trivial cast: `&mut [u32; 3]` as `*mut [u32]` - --> $DIR/trivial_casts.rs:50:13 + --> $DIR/trivial_casts.rs:40:13 | LL | let _ = x as *mut [u32]; //~ERROR trivial cast: `&mut [u32; 3]` as `*mut [u32]` | ^^^^^^^^^^^^^^^ @@ -73,7 +73,7 @@ LL | let _ = x as *mut [u32]; //~ERROR trivial cast: `&mut [u32; 3]` as `*mu = help: cast can be replaced by coercion; this might require a temporary variable error: trivial cast: `std::boxed::Box<[u32; 3]>` as `std::boxed::Box<[u32]>` - --> $DIR/trivial_casts.rs:55:13 + --> $DIR/trivial_casts.rs:45:13 | LL | let _ = x as Box<[u32]>; | ^^^^^^^^^^^^^^^ @@ -81,7 +81,7 @@ LL | let _ = x as Box<[u32]>; = help: cast can be replaced by coercion; this might require a temporary variable error: trivial cast: `&Bar` as `&dyn Foo` - --> $DIR/trivial_casts.rs:62:13 + --> $DIR/trivial_casts.rs:52:13 | LL | let _ = x as &Foo; //~ERROR trivial cast: `&Bar` as `&dyn Foo` | ^^^^^^^^^ @@ -89,7 +89,7 @@ LL | let _ = x as &Foo; //~ERROR trivial cast: `&Bar` as `&dyn Foo` = help: cast can be replaced by coercion; this might require a temporary variable error: trivial cast: `&Bar` as `*const dyn Foo` - --> $DIR/trivial_casts.rs:63:13 + --> $DIR/trivial_casts.rs:53:13 | LL | let _ = x as *const Foo; //~ERROR trivial cast: `&Bar` as `*const dyn Foo` | ^^^^^^^^^^^^^^^ @@ -97,7 +97,7 @@ LL | let _ = x as *const Foo; //~ERROR trivial cast: `&Bar` as `*const dyn F = help: cast can be replaced by coercion; this might require a temporary variable error: trivial cast: `&mut Bar` as `&mut dyn Foo` - --> $DIR/trivial_casts.rs:68:13 + --> $DIR/trivial_casts.rs:58:13 | LL | let _ = x as &mut Foo; //~ERROR trivial cast: `&mut Bar` as `&mut dyn Foo` | ^^^^^^^^^^^^^ @@ -105,7 +105,7 @@ LL | let _ = x as &mut Foo; //~ERROR trivial cast: `&mut Bar` as `&mut dyn F = help: cast can be replaced by coercion; this might require a temporary variable error: trivial cast: `&mut Bar` as `*mut dyn Foo` - --> $DIR/trivial_casts.rs:69:13 + --> $DIR/trivial_casts.rs:59:13 | LL | let _ = x as *mut Foo; //~ERROR trivial cast: `&mut Bar` as `*mut dyn Foo` | ^^^^^^^^^^^^^ @@ -113,7 +113,7 @@ LL | let _ = x as *mut Foo; //~ERROR trivial cast: `&mut Bar` as `*mut dyn F = help: cast can be replaced by coercion; this might require a temporary variable error: trivial cast: `std::boxed::Box` as `std::boxed::Box` - --> $DIR/trivial_casts.rs:74:13 + --> $DIR/trivial_casts.rs:64:13 | LL | let _ = x as Box; //~ERROR `std::boxed::Box` as `std::boxed::Box` | ^^^^^^^^^^^^^ @@ -121,15 +121,15 @@ LL | let _ = x as Box; //~ERROR `std::boxed::Box` as `std::boxed:: = help: cast can be replaced by coercion; this might require a temporary variable error: trivial cast: `&fn(i32) {main::baz}` as `&dyn std::ops::Fn(i32)` - --> $DIR/trivial_casts.rs:80:13 + --> $DIR/trivial_casts.rs:70:13 | LL | let _ = &baz as &Fn(i32); //~ERROR `&fn(i32) {main::baz}` as `&dyn std::ops::Fn(i32)` | ^^^^^^^^^^^^^^^^ | = help: cast can be replaced by coercion; this might require a temporary variable -error: trivial cast: `&[closure@$DIR/trivial_casts.rs:82:13: 82:25]` as `&dyn std::ops::Fn(i32)` - --> $DIR/trivial_casts.rs:83:13 +error: trivial cast: `&[closure@$DIR/trivial_casts.rs:72:13: 72:25]` as `&dyn std::ops::Fn(i32)` + --> $DIR/trivial_casts.rs:73:13 | LL | let _ = &x as &Fn(i32); //~ERROR trivial cast | ^^^^^^^^^^^^^^ @@ -137,7 +137,7 @@ LL | let _ = &x as &Fn(i32); //~ERROR trivial cast = help: cast can be replaced by coercion; this might require a temporary variable error: trivial cast: `&'a Bar` as `&'a Bar` - --> $DIR/trivial_casts.rs:89:13 + --> $DIR/trivial_casts.rs:79:13 | LL | let _ = a as &'a Bar; //~ERROR trivial cast | ^^^^^^^^^^^^ @@ -145,7 +145,7 @@ LL | let _ = a as &'a Bar; //~ERROR trivial cast = help: cast can be replaced by coercion; this might require a temporary variable error: trivial cast: `&'b Bar` as `&'a Bar` - --> $DIR/trivial_casts.rs:91:13 + --> $DIR/trivial_casts.rs:81:13 | LL | let _ = b as &'a Bar; //~ERROR trivial cast | ^^^^^^^^^^^^ @@ -153,7 +153,7 @@ LL | let _ = b as &'a Bar; //~ERROR trivial cast = help: cast can be replaced by coercion; this might require a temporary variable error: trivial cast: `&'b Bar` as `&'b Bar` - --> $DIR/trivial_casts.rs:93:13 + --> $DIR/trivial_casts.rs:83:13 | LL | let _ = b as &'b Bar; //~ERROR trivial cast | ^^^^^^^^^^^^ diff --git a/src/test/ui/try-block/try-block-bad-lifetime.rs b/src/test/ui/try-block/try-block-bad-lifetime.rs index 576a0202018b6..872604f4eee84 100644 --- a/src/test/ui/try-block/try-block-bad-lifetime.rs +++ b/src/test/ui/try-block/try-block-bad-lifetime.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --edition 2018 #![feature(try_blocks)] diff --git a/src/test/ui/try-block/try-block-bad-lifetime.stderr b/src/test/ui/try-block/try-block-bad-lifetime.stderr index 36c89faf5a2ca..d4aa81f036a6f 100644 --- a/src/test/ui/try-block/try-block-bad-lifetime.stderr +++ b/src/test/ui/try-block/try-block-bad-lifetime.stderr @@ -1,5 +1,5 @@ error[E0597]: `my_string` does not live long enough - --> $DIR/try-block-bad-lifetime.rs:25:33 + --> $DIR/try-block-bad-lifetime.rs:15:33 | LL | let my_str: & str = & my_string; | ^^^^^^^^^^^ borrowed value does not live long enough @@ -10,7 +10,7 @@ LL | do_something_with(result); | ------ borrow later used here error[E0506]: cannot assign to `i` because it is borrowed - --> $DIR/try-block-bad-lifetime.rs:39:13 + --> $DIR/try-block-bad-lifetime.rs:29:13 | LL | let k = &mut i; | ------ borrow of `i` occurs here @@ -22,7 +22,7 @@ LL | ::std::mem::drop(k); //~ ERROR use of moved value: `k` | - borrow later used here error[E0382]: use of moved value: `k` - --> $DIR/try-block-bad-lifetime.rs:41:26 + --> $DIR/try-block-bad-lifetime.rs:31:26 | LL | Err(k) ?; | - value moved here @@ -33,7 +33,7 @@ LL | ::std::mem::drop(k); //~ ERROR use of moved value: `k` = note: move occurs because `k` has type `&mut i32`, which does not implement the `Copy` trait error[E0506]: cannot assign to `i` because it is borrowed - --> $DIR/try-block-bad-lifetime.rs:42:9 + --> $DIR/try-block-bad-lifetime.rs:32:9 | LL | let k = &mut i; | ------ borrow of `i` occurs here diff --git a/src/test/ui/try-block/try-block-bad-type.rs b/src/test/ui/try-block/try-block-bad-type.rs index a984b63af4575..0e297dd8ff16b 100644 --- a/src/test/ui/try-block/try-block-bad-type.rs +++ b/src/test/ui/try-block/try-block-bad-type.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --edition 2018 #![feature(try_blocks)] diff --git a/src/test/ui/try-block/try-block-bad-type.stderr b/src/test/ui/try-block/try-block-bad-type.stderr index 159e43e13e405..202885e383ece 100644 --- a/src/test/ui/try-block/try-block-bad-type.stderr +++ b/src/test/ui/try-block/try-block-bad-type.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `i32: std::convert::From<&str>` is not satisfied - --> $DIR/try-block-bad-type.rs:17:9 + --> $DIR/try-block-bad-type.rs:7:9 | LL | Err("")?; //~ ERROR the trait bound `i32: std::convert::From<&str>` is not satisfied | ^^^^^^^^ the trait `std::convert::From<&str>` is not implemented for `i32` @@ -13,7 +13,7 @@ LL | Err("")?; //~ ERROR the trait bound `i32: std::convert::From<&str>` = note: required by `std::convert::From::from` error[E0271]: type mismatch resolving ` as std::ops::Try>::Ok == &str` - --> $DIR/try-block-bad-type.rs:22:9 + --> $DIR/try-block-bad-type.rs:12:9 | LL | "" //~ ERROR type mismatch | ^^ expected i32, found &str @@ -22,7 +22,7 @@ LL | "" //~ ERROR type mismatch found type `&str` error[E0271]: type mismatch resolving ` as std::ops::Try>::Ok == ()` - --> $DIR/try-block-bad-type.rs:25:39 + --> $DIR/try-block-bad-type.rs:15:39 | LL | let res: Result = try { }; //~ ERROR type mismatch | ^ expected i32, found () @@ -31,7 +31,7 @@ LL | let res: Result = try { }; //~ ERROR type mismatch found type `()` error[E0277]: the trait bound `(): std::ops::Try` is not satisfied - --> $DIR/try-block-bad-type.rs:27:23 + --> $DIR/try-block-bad-type.rs:17:23 | LL | let res: () = try { }; //~ the trait bound `(): std::ops::Try` is not satisfied | ^^^ the trait `std::ops::Try` is not implemented for `()` @@ -39,7 +39,7 @@ LL | let res: () = try { }; //~ the trait bound `(): std::ops::Try` is not s = note: required by `std::ops::Try::from_ok` error[E0277]: the trait bound `i32: std::ops::Try` is not satisfied - --> $DIR/try-block-bad-type.rs:29:24 + --> $DIR/try-block-bad-type.rs:19:24 | LL | let res: i32 = try { 5 }; //~ ERROR the trait bound `i32: std::ops::Try` is not satisfied | ^^^^^ the trait `std::ops::Try` is not implemented for `i32` diff --git a/src/test/ui/try-block/try-block-in-edition2015.rs b/src/test/ui/try-block/try-block-in-edition2015.rs index 64485bb8318f1..0096429730809 100644 --- a/src/test/ui/try-block/try-block-in-edition2015.rs +++ b/src/test/ui/try-block/try-block-in-edition2015.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --edition 2015 pub fn main() { diff --git a/src/test/ui/try-block/try-block-in-edition2015.stderr b/src/test/ui/try-block/try-block-in-edition2015.stderr index 7e6d515e111d0..b16aa59090d04 100644 --- a/src/test/ui/try-block/try-block-in-edition2015.stderr +++ b/src/test/ui/try-block/try-block-in-edition2015.stderr @@ -1,5 +1,5 @@ error: expected identifier, found keyword `let` - --> $DIR/try-block-in-edition2015.rs:16:9 + --> $DIR/try-block-in-edition2015.rs:6:9 | LL | let try_result: Option<_> = try { | --- while parsing this struct @@ -8,7 +8,7 @@ LL | let x = 5; //~ ERROR expected identifier, found keyword | ^^^ expected identifier, found keyword error[E0574]: expected struct, variant or union type, found macro `try` - --> $DIR/try-block-in-edition2015.rs:14:33 + --> $DIR/try-block-in-edition2015.rs:4:33 | LL | let try_result: Option<_> = try { | ^^^ did you mean `try!(...)`? diff --git a/src/test/ui/try-block/try-block-in-match.rs b/src/test/ui/try-block/try-block-in-match.rs index d10149126ee89..bce0d0340b658 100644 --- a/src/test/ui/try-block/try-block-in-match.rs +++ b/src/test/ui/try-block/try-block-in-match.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --edition 2018 #![feature(try_blocks)] diff --git a/src/test/ui/try-block/try-block-in-match.stderr b/src/test/ui/try-block/try-block-in-match.stderr index f07d23885aca1..bfef153429f2c 100644 --- a/src/test/ui/try-block/try-block-in-match.stderr +++ b/src/test/ui/try-block/try-block-in-match.stderr @@ -1,5 +1,5 @@ error: expected expression, found reserved keyword `try` - --> $DIR/try-block-in-match.rs:16:11 + --> $DIR/try-block-in-match.rs:6:11 | LL | match try { false } { _ => {} } //~ ERROR expected expression, found reserved keyword `try` | ^^^ expected expression diff --git a/src/test/ui/try-block/try-block-in-while.rs b/src/test/ui/try-block/try-block-in-while.rs index b531267a55bba..98af796dd3780 100644 --- a/src/test/ui/try-block/try-block-in-while.rs +++ b/src/test/ui/try-block/try-block-in-while.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --edition 2018 #![feature(try_blocks)] diff --git a/src/test/ui/try-block/try-block-in-while.stderr b/src/test/ui/try-block/try-block-in-while.stderr index 36577d784b83f..b4f17778b2983 100644 --- a/src/test/ui/try-block/try-block-in-while.stderr +++ b/src/test/ui/try-block/try-block-in-while.stderr @@ -1,5 +1,5 @@ error: expected expression, found reserved keyword `try` - --> $DIR/try-block-in-while.rs:16:11 + --> $DIR/try-block-in-while.rs:6:11 | LL | while try { false } {} //~ ERROR expected expression, found reserved keyword `try` | ^^^ expected expression diff --git a/src/test/ui/try-block/try-block-maybe-bad-lifetime.rs b/src/test/ui/try-block/try-block-maybe-bad-lifetime.rs index b5e0ebdbc222e..113d089c757c0 100644 --- a/src/test/ui/try-block/try-block-maybe-bad-lifetime.rs +++ b/src/test/ui/try-block/try-block-maybe-bad-lifetime.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --edition 2018 #![feature(try_blocks)] diff --git a/src/test/ui/try-block/try-block-maybe-bad-lifetime.stderr b/src/test/ui/try-block/try-block-maybe-bad-lifetime.stderr index 366a8da4b6e83..f96c7146d18d0 100644 --- a/src/test/ui/try-block/try-block-maybe-bad-lifetime.stderr +++ b/src/test/ui/try-block/try-block-maybe-bad-lifetime.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `i` because it is borrowed - --> $DIR/try-block-maybe-bad-lifetime.rs:27:9 + --> $DIR/try-block-maybe-bad-lifetime.rs:17:9 | LL | &i | -- borrow of `i` occurs here @@ -11,7 +11,7 @@ LL | do_something_with(x); | - borrow later used here error[E0382]: borrow of moved value: `x` - --> $DIR/try-block-maybe-bad-lifetime.rs:38:24 + --> $DIR/try-block-maybe-bad-lifetime.rs:28:24 | LL | ::std::mem::drop(x); | - value moved here @@ -22,7 +22,7 @@ LL | println!("{}", x); //~ ERROR borrow of moved value: `x` = note: move occurs because `x` has type `std::string::String`, which does not implement the `Copy` trait error[E0506]: cannot assign to `i` because it is borrowed - --> $DIR/try-block-maybe-bad-lifetime.rs:50:9 + --> $DIR/try-block-maybe-bad-lifetime.rs:40:9 | LL | j = &i; | -- borrow of `i` occurs here diff --git a/src/test/ui/try-block/try-block-opt-init.rs b/src/test/ui/try-block/try-block-opt-init.rs index ca81a9c311037..ef559226e67df 100644 --- a/src/test/ui/try-block/try-block-opt-init.rs +++ b/src/test/ui/try-block/try-block-opt-init.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --edition 2018 #![feature(try_blocks)] diff --git a/src/test/ui/try-block/try-block-opt-init.stderr b/src/test/ui/try-block/try-block-opt-init.stderr index 3ebcb7dc37af1..a0bc45d4fcd5c 100644 --- a/src/test/ui/try-block/try-block-opt-init.stderr +++ b/src/test/ui/try-block/try-block-opt-init.stderr @@ -1,5 +1,5 @@ error[E0381]: borrow of possibly uninitialized variable: `cfg_res` - --> $DIR/try-block-opt-init.rs:25:5 + --> $DIR/try-block-opt-init.rs:15:5 | LL | assert_eq!(cfg_res, 5); //~ ERROR borrow of possibly uninitialized variable: `cfg_res` | ^^^^^^^^^^^^^^^^^^^^^^^ use of possibly uninitialized `cfg_res` diff --git a/src/test/ui/try-block/try-block-type-error.rs b/src/test/ui/try-block/try-block-type-error.rs index 6a69cff48836f..fe1993a37f64a 100644 --- a/src/test/ui/try-block/try-block-type-error.rs +++ b/src/test/ui/try-block/try-block-type-error.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --edition 2018 #![feature(try_blocks)] diff --git a/src/test/ui/try-block/try-block-type-error.stderr b/src/test/ui/try-block/try-block-type-error.stderr index 3b67e92ec61bf..cf52c4ce15266 100644 --- a/src/test/ui/try-block/try-block-type-error.stderr +++ b/src/test/ui/try-block/try-block-type-error.stderr @@ -1,5 +1,5 @@ error[E0271]: type mismatch resolving ` as std::ops::Try>::Ok == {integer}` - --> $DIR/try-block-type-error.rs:20:9 + --> $DIR/try-block-type-error.rs:10:9 | LL | 42 | ^^ @@ -11,7 +11,7 @@ LL | 42 found type `{integer}` error[E0271]: type mismatch resolving ` as std::ops::Try>::Ok == ()` - --> $DIR/try-block-type-error.rs:26:5 + --> $DIR/try-block-type-error.rs:16:5 | LL | }; | ^ expected i32, found () diff --git a/src/test/ui/try-on-option.rs b/src/test/ui/try-on-option.rs index 65ca23402d27e..9c8e8b33ad68a 100644 --- a/src/test/ui/try-on-option.rs +++ b/src/test/ui/try-on-option.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(try_trait)] fn main() {} diff --git a/src/test/ui/try-on-option.stderr b/src/test/ui/try-on-option.stderr index 265ee593bb709..438b3c2e343ff 100644 --- a/src/test/ui/try-on-option.stderr +++ b/src/test/ui/try-on-option.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `(): std::convert::From` is not satisfied - --> $DIR/try-on-option.rs:17:5 + --> $DIR/try-on-option.rs:7:5 | LL | x?; //~ the trait bound | ^^ the trait `std::convert::From` is not implemented for `()` @@ -7,7 +7,7 @@ LL | x?; //~ the trait bound = note: required by `std::convert::From::from` error[E0277]: the `?` operator can only be used in a function that returns `Result` or `Option` (or another type that implements `std::ops::Try`) - --> $DIR/try-on-option.rs:23:5 + --> $DIR/try-on-option.rs:13:5 | LL | x?; //~ the `?` operator | ^^ cannot use the `?` operator in a function that returns `u32` diff --git a/src/test/ui/try-operator-on-main.rs b/src/test/ui/try-operator-on-main.rs index e52ef45c2ecf9..3b48194eb44fd 100644 --- a/src/test/ui/try-operator-on-main.rs +++ b/src/test/ui/try-operator-on-main.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no std::fs support #![feature(try_trait)] diff --git a/src/test/ui/try-operator-on-main.stderr b/src/test/ui/try-operator-on-main.stderr index 121ae14f999c1..9a2052f72835d 100644 --- a/src/test/ui/try-operator-on-main.stderr +++ b/src/test/ui/try-operator-on-main.stderr @@ -1,5 +1,5 @@ error[E0277]: the `?` operator can only be used in a function that returns `Result` or `Option` (or another type that implements `std::ops::Try`) - --> $DIR/try-operator-on-main.rs:19:5 + --> $DIR/try-operator-on-main.rs:9:5 | LL | std::fs::File::open("foo")?; //~ ERROR the `?` operator can only | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot use the `?` operator in a function that returns `()` @@ -8,7 +8,7 @@ LL | std::fs::File::open("foo")?; //~ ERROR the `?` operator can only = note: required by `std::ops::Try::from_error` error[E0277]: the `?` operator can only be applied to values that implement `std::ops::Try` - --> $DIR/try-operator-on-main.rs:22:5 + --> $DIR/try-operator-on-main.rs:12:5 | LL | ()?; //~ ERROR the `?` operator can only | ^^^ the `?` operator cannot be applied to type `()` @@ -17,19 +17,19 @@ LL | ()?; //~ ERROR the `?` operator can only = note: required by `std::ops::Try::into_result` error[E0277]: the trait bound `(): std::ops::Try` is not satisfied - --> $DIR/try-operator-on-main.rs:25:5 + --> $DIR/try-operator-on-main.rs:15:5 | LL | try_trait_generic::<()>(); //~ ERROR the trait bound | ^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::ops::Try` is not implemented for `()` | note: required by `try_trait_generic` - --> $DIR/try-operator-on-main.rs:30:1 + --> $DIR/try-operator-on-main.rs:20:1 | LL | fn try_trait_generic() -> T { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the `?` operator can only be applied to values that implement `std::ops::Try` - --> $DIR/try-operator-on-main.rs:32:5 + --> $DIR/try-operator-on-main.rs:22:5 | LL | ()?; //~ ERROR the `?` operator can only | ^^^ the `?` operator cannot be applied to type `()` diff --git a/src/test/ui/try-poll.rs b/src/test/ui/try-poll.rs index 0cb058c2b0b6e..3d7115c522346 100644 --- a/src/test/ui/try-poll.rs +++ b/src/test/ui/try-poll.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![allow(dead_code, unused)] diff --git a/src/test/ui/tuple/tuple-arity-mismatch.rs b/src/test/ui/tuple/tuple-arity-mismatch.rs index a71f441029472..1c8b881d2469e 100644 --- a/src/test/ui/tuple/tuple-arity-mismatch.rs +++ b/src/test/ui/tuple/tuple-arity-mismatch.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #6155 fn first((value, _): (isize, f64)) -> isize { value } diff --git a/src/test/ui/tuple/tuple-arity-mismatch.stderr b/src/test/ui/tuple/tuple-arity-mismatch.stderr index 574a1f0a5c948..650f4c58c776c 100644 --- a/src/test/ui/tuple/tuple-arity-mismatch.stderr +++ b/src/test/ui/tuple/tuple-arity-mismatch.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/tuple-arity-mismatch.rs:16:20 + --> $DIR/tuple-arity-mismatch.rs:6:20 | LL | let y = first ((1,2.0,3)); | ^^^^^^^^^ expected a tuple with 2 elements, found one with 3 elements @@ -8,7 +8,7 @@ LL | let y = first ((1,2.0,3)); found type `(isize, f64, {integer})` error[E0308]: mismatched types - --> $DIR/tuple-arity-mismatch.rs:22:20 + --> $DIR/tuple-arity-mismatch.rs:12:20 | LL | let y = first ((1,)); | ^^^^ expected a tuple with 2 elements, found one with 1 elements diff --git a/src/test/ui/tuple/tuple-float-index.fixed b/src/test/ui/tuple/tuple-float-index.fixed index 55bc2f77dada9..c93b545afb994 100644 --- a/src/test/ui/tuple/tuple-float-index.fixed +++ b/src/test/ui/tuple/tuple-float-index.fixed @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix // compile-flags: -Z parse-only diff --git a/src/test/ui/tuple/tuple-float-index.rs b/src/test/ui/tuple/tuple-float-index.rs index d569ca4cb861e..9b669bc4bb8e8 100644 --- a/src/test/ui/tuple/tuple-float-index.rs +++ b/src/test/ui/tuple/tuple-float-index.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix // compile-flags: -Z parse-only diff --git a/src/test/ui/tuple/tuple-float-index.stderr b/src/test/ui/tuple/tuple-float-index.stderr index 15af0834f0372..5bbccba39d8a2 100644 --- a/src/test/ui/tuple/tuple-float-index.stderr +++ b/src/test/ui/tuple/tuple-float-index.stderr @@ -1,5 +1,5 @@ error: unexpected token: `1.1` - --> $DIR/tuple-float-index.rs:15:17 + --> $DIR/tuple-float-index.rs:5:17 | LL | (1, (2, 3)).1.1; //~ ERROR unexpected token: `1.1` | ------------^^^ diff --git a/src/test/ui/tuple/tuple-index-not-tuple.rs b/src/test/ui/tuple/tuple-index-not-tuple.rs index 471104d687201..c478e1c67695d 100644 --- a/src/test/ui/tuple/tuple-index-not-tuple.rs +++ b/src/test/ui/tuple/tuple-index-not-tuple.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Point { x: isize, y: isize } struct Empty; diff --git a/src/test/ui/tuple/tuple-index-not-tuple.stderr b/src/test/ui/tuple/tuple-index-not-tuple.stderr index fa0d0b4172be0..ab9ac4c4142fe 100644 --- a/src/test/ui/tuple/tuple-index-not-tuple.stderr +++ b/src/test/ui/tuple/tuple-index-not-tuple.stderr @@ -1,11 +1,11 @@ error[E0609]: no field `0` on type `Point` - --> $DIR/tuple-index-not-tuple.rs:16:12 + --> $DIR/tuple-index-not-tuple.rs:6:12 | LL | origin.0; | ^ did you mean `x`? error[E0609]: no field `0` on type `Empty` - --> $DIR/tuple-index-not-tuple.rs:18:11 + --> $DIR/tuple-index-not-tuple.rs:8:11 | LL | Empty.0; | ^ unknown field diff --git a/src/test/ui/tuple/tuple-index-out-of-bounds.rs b/src/test/ui/tuple/tuple-index-out-of-bounds.rs index 35b843676b4f1..c772c0daa18eb 100644 --- a/src/test/ui/tuple/tuple-index-out-of-bounds.rs +++ b/src/test/ui/tuple/tuple-index-out-of-bounds.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Point(i32, i32); fn main() { diff --git a/src/test/ui/tuple/tuple-index-out-of-bounds.stderr b/src/test/ui/tuple/tuple-index-out-of-bounds.stderr index 068e83ab0918c..86e977a01b76d 100644 --- a/src/test/ui/tuple/tuple-index-out-of-bounds.stderr +++ b/src/test/ui/tuple/tuple-index-out-of-bounds.stderr @@ -1,11 +1,11 @@ error[E0609]: no field `2` on type `Point` - --> $DIR/tuple-index-out-of-bounds.rs:17:12 + --> $DIR/tuple-index-out-of-bounds.rs:7:12 | LL | origin.2; | ^ did you mean `0`? error[E0609]: no field `2` on type `({integer}, {integer})` - --> $DIR/tuple-index-out-of-bounds.rs:22:11 + --> $DIR/tuple-index-out-of-bounds.rs:12:11 | LL | tuple.2; | ^ diff --git a/src/test/ui/tuple/tuple-struct-fields/test.rs b/src/test/ui/tuple/tuple-struct-fields/test.rs index 22d54a3834073..b900615da2c14 100644 --- a/src/test/ui/tuple/tuple-struct-fields/test.rs +++ b/src/test/ui/tuple/tuple-struct-fields/test.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod foo { type T = (); struct S1(pub(in foo) (), pub(T), pub(crate) (), pub(((), T))); diff --git a/src/test/ui/tuple/tuple-struct-fields/test.stderr b/src/test/ui/tuple/tuple-struct-fields/test.stderr index 59228ea8c14d2..db9c508e1f13c 100644 --- a/src/test/ui/tuple/tuple-struct-fields/test.stderr +++ b/src/test/ui/tuple/tuple-struct-fields/test.stderr @@ -1,11 +1,11 @@ error: expected one of `)` or `,`, found `(` - --> $DIR/test.rs:14:26 + --> $DIR/test.rs:4:26 | LL | struct S2(pub((foo)) ()); | ^ expected one of `)` or `,` here error[E0412]: cannot find type `foo` in this scope - --> $DIR/test.rs:14:20 + --> $DIR/test.rs:4:20 | LL | struct S2(pub((foo)) ()); | ^^^ not found in this scope diff --git a/src/test/ui/tuple/tuple-struct-fields/test2.rs b/src/test/ui/tuple/tuple-struct-fields/test2.rs index eead027cb1351..7c8e9bbb23c28 100644 --- a/src/test/ui/tuple/tuple-struct-fields/test2.rs +++ b/src/test/ui/tuple/tuple-struct-fields/test2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! define_struct { ($t:ty) => { struct S1(pub $t); diff --git a/src/test/ui/tuple/tuple-struct-fields/test2.stderr b/src/test/ui/tuple/tuple-struct-fields/test2.stderr index 983e74772ac69..9aba84046a1a7 100644 --- a/src/test/ui/tuple/tuple-struct-fields/test2.stderr +++ b/src/test/ui/tuple/tuple-struct-fields/test2.stderr @@ -1,5 +1,5 @@ error: expected one of `)` or `,`, found `(` - --> $DIR/test2.rs:15:26 + --> $DIR/test2.rs:5:26 | LL | struct S3(pub $t ()); | ^ expected one of `)` or `,` here diff --git a/src/test/ui/tuple/tuple-struct-fields/test3.rs b/src/test/ui/tuple/tuple-struct-fields/test3.rs index d666c8abd3c95..8d7c7c35caff9 100644 --- a/src/test/ui/tuple/tuple-struct-fields/test3.rs +++ b/src/test/ui/tuple/tuple-struct-fields/test3.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! define_struct { ($t:ty) => { struct S1(pub($t)); diff --git a/src/test/ui/tuple/tuple-struct-fields/test3.stderr b/src/test/ui/tuple/tuple-struct-fields/test3.stderr index 6738595b99798..fc71354a9d640 100644 --- a/src/test/ui/tuple/tuple-struct-fields/test3.stderr +++ b/src/test/ui/tuple/tuple-struct-fields/test3.stderr @@ -1,5 +1,5 @@ error: expected one of `)` or `,`, found `(` - --> $DIR/test3.rs:15:27 + --> $DIR/test3.rs:5:27 | LL | struct S3(pub($t) ()); | ^ expected one of `)` or `,` here diff --git a/src/test/ui/tuple/tuple-struct-nonexhaustive.rs b/src/test/ui/tuple/tuple-struct-nonexhaustive.rs index e4fda6dd53417..76bcf3fbd4d10 100644 --- a/src/test/ui/tuple/tuple-struct-nonexhaustive.rs +++ b/src/test/ui/tuple/tuple-struct-nonexhaustive.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo(isize, isize); fn main() { diff --git a/src/test/ui/tuple/tuple-struct-nonexhaustive.stderr b/src/test/ui/tuple/tuple-struct-nonexhaustive.stderr index ee274bedbb84c..8d627fc2a8d72 100644 --- a/src/test/ui/tuple/tuple-struct-nonexhaustive.stderr +++ b/src/test/ui/tuple/tuple-struct-nonexhaustive.stderr @@ -1,5 +1,5 @@ error[E0004]: non-exhaustive patterns: `Foo(_, _)` not covered - --> $DIR/tuple-struct-nonexhaustive.rs:15:11 + --> $DIR/tuple-struct-nonexhaustive.rs:5:11 | LL | match x { //~ ERROR non-exhaustive | ^ pattern `Foo(_, _)` not covered diff --git a/src/test/ui/tutorial-suffix-inference-test.rs b/src/test/ui/tutorial-suffix-inference-test.rs index dadf7eb91d8f4..2477c6365301b 100644 --- a/src/test/ui/tutorial-suffix-inference-test.rs +++ b/src/test/ui/tutorial-suffix-inference-test.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = 3; let y: i32 = 3; diff --git a/src/test/ui/tutorial-suffix-inference-test.stderr b/src/test/ui/tutorial-suffix-inference-test.stderr index d315f9b87f924..6ba1b098d19b7 100644 --- a/src/test/ui/tutorial-suffix-inference-test.stderr +++ b/src/test/ui/tutorial-suffix-inference-test.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/tutorial-suffix-inference-test.rs:19:18 + --> $DIR/tutorial-suffix-inference-test.rs:9:18 | LL | identity_u16(x); | ^ expected u16, found u8 @@ -9,13 +9,13 @@ LL | identity_u16(x.into()); | ^^^^^^^^ error[E0308]: mismatched types - --> $DIR/tutorial-suffix-inference-test.rs:22:18 + --> $DIR/tutorial-suffix-inference-test.rs:12:18 | LL | identity_u16(y); | ^ expected u16, found i32 error[E0308]: mismatched types - --> $DIR/tutorial-suffix-inference-test.rs:31:18 + --> $DIR/tutorial-suffix-inference-test.rs:21:18 | LL | identity_u16(a); | ^ expected u16, found isize diff --git a/src/test/ui/type/auxiliary/crate_a1.rs b/src/test/ui/type/auxiliary/crate_a1.rs index 70f7cac94de6c..e2e18500541ef 100644 --- a/src/test/ui/type/auxiliary/crate_a1.rs +++ b/src/test/ui/type/auxiliary/crate_a1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Foo; pub trait Bar{} diff --git a/src/test/ui/type/auxiliary/crate_a2.rs b/src/test/ui/type/auxiliary/crate_a2.rs index d801f25ba2ee0..d16a4ac10e0c4 100644 --- a/src/test/ui/type/auxiliary/crate_a2.rs +++ b/src/test/ui/type/auxiliary/crate_a2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Foo; pub trait Bar{} diff --git a/src/test/ui/type/type-alias-bounds.rs b/src/test/ui/type/type-alias-bounds.rs index a17bb9e952d3c..adfac95f80654 100644 --- a/src/test/ui/type/type-alias-bounds.rs +++ b/src/test/ui/type/type-alias-bounds.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test ignored_generic_bounds lint warning about bounds in type aliases // compile-pass diff --git a/src/test/ui/type/type-alias-bounds.stderr b/src/test/ui/type/type-alias-bounds.stderr index 2a2b0b0f26e34..b13e400105210 100644 --- a/src/test/ui/type/type-alias-bounds.stderr +++ b/src/test/ui/type/type-alias-bounds.stderr @@ -1,5 +1,5 @@ warning: bounds on generic parameters are not enforced in type aliases - --> $DIR/type-alias-bounds.rs:18:14 + --> $DIR/type-alias-bounds.rs:8:14 | LL | type SVec = Vec; | ^^^^ ^^^^ @@ -8,7 +8,7 @@ LL | type SVec = Vec; = help: the bound will not be checked when the type alias is used, and should be removed warning: where clauses are not enforced in type aliases - --> $DIR/type-alias-bounds.rs:20:21 + --> $DIR/type-alias-bounds.rs:10:21 | LL | type S2Vec where T: Send = Vec; | ^^^^^^^ @@ -16,7 +16,7 @@ LL | type S2Vec where T: Send = Vec; = help: the clause will not be checked when the type alias is used, and should be removed warning: bounds on generic parameters are not enforced in type aliases - --> $DIR/type-alias-bounds.rs:22:19 + --> $DIR/type-alias-bounds.rs:12:19 | LL | type VVec<'b, 'a: 'b+'b> = (&'b u32, Vec<&'a i32>); | ^^ ^^ @@ -24,7 +24,7 @@ LL | type VVec<'b, 'a: 'b+'b> = (&'b u32, Vec<&'a i32>); = help: the bound will not be checked when the type alias is used, and should be removed warning: bounds on generic parameters are not enforced in type aliases - --> $DIR/type-alias-bounds.rs:24:18 + --> $DIR/type-alias-bounds.rs:14:18 | LL | type WVec<'b, T: 'b+'b> = (&'b u32, Vec); | ^^ ^^ @@ -32,7 +32,7 @@ LL | type WVec<'b, T: 'b+'b> = (&'b u32, Vec); = help: the bound will not be checked when the type alias is used, and should be removed warning: where clauses are not enforced in type aliases - --> $DIR/type-alias-bounds.rs:26:25 + --> $DIR/type-alias-bounds.rs:16:25 | LL | type W2Vec<'b, T> where T: 'b, T: 'b = (&'b u32, Vec); | ^^^^^ ^^^^^ @@ -40,33 +40,33 @@ LL | type W2Vec<'b, T> where T: 'b, T: 'b = (&'b u32, Vec); = help: the clause will not be checked when the type alias is used, and should be removed warning: bounds on generic parameters are not enforced in type aliases - --> $DIR/type-alias-bounds.rs:57:12 + --> $DIR/type-alias-bounds.rs:47:12 | LL | type T1 = U::Assoc; //~ WARN not enforced in type aliases | ^^^^^ | = help: the bound will not be checked when the type alias is used, and should be removed help: use fully disambiguated paths (i.e., `::Assoc`) to refer to associated types in type aliases - --> $DIR/type-alias-bounds.rs:57:21 + --> $DIR/type-alias-bounds.rs:47:21 | LL | type T1 = U::Assoc; //~ WARN not enforced in type aliases | ^^^^^^^^ warning: where clauses are not enforced in type aliases - --> $DIR/type-alias-bounds.rs:58:18 + --> $DIR/type-alias-bounds.rs:48:18 | LL | type T2 where U: Bound = U::Assoc; //~ WARN not enforced in type aliases | ^^^^^^^^ | = help: the clause will not be checked when the type alias is used, and should be removed help: use fully disambiguated paths (i.e., `::Assoc`) to refer to associated types in type aliases - --> $DIR/type-alias-bounds.rs:58:29 + --> $DIR/type-alias-bounds.rs:48:29 | LL | type T2 where U: Bound = U::Assoc; //~ WARN not enforced in type aliases | ^^^^^^^^ warning: bounds on generic parameters are not enforced in type aliases - --> $DIR/type-alias-bounds.rs:66:12 + --> $DIR/type-alias-bounds.rs:56:12 | LL | type T5 = ::Assoc; //~ WARN not enforced in type aliases | ^^^^^ @@ -74,7 +74,7 @@ LL | type T5 = ::Assoc; //~ WARN not enforced in type ali = help: the bound will not be checked when the type alias is used, and should be removed warning: bounds on generic parameters are not enforced in type aliases - --> $DIR/type-alias-bounds.rs:67:12 + --> $DIR/type-alias-bounds.rs:57:12 | LL | type T6 = ::std::vec::Vec; //~ WARN not enforced in type aliases | ^^^^^ diff --git a/src/test/ui/type/type-annotation-needed.rs b/src/test/ui/type/type-annotation-needed.rs index 3ed6e5daf0061..ff2342c4455c5 100644 --- a/src/test/ui/type/type-annotation-needed.rs +++ b/src/test/ui/type/type-annotation-needed.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo>(x: i32) {} //~^ NOTE required by diff --git a/src/test/ui/type/type-annotation-needed.stderr b/src/test/ui/type/type-annotation-needed.stderr index d48891596df2e..92ae9746b150b 100644 --- a/src/test/ui/type/type-annotation-needed.stderr +++ b/src/test/ui/type/type-annotation-needed.stderr @@ -1,11 +1,11 @@ error[E0283]: type annotations required: cannot resolve `_: std::convert::Into` - --> $DIR/type-annotation-needed.rs:15:5 + --> $DIR/type-annotation-needed.rs:5:5 | LL | foo(42); | ^^^ | note: required by `foo` - --> $DIR/type-annotation-needed.rs:11:1 + --> $DIR/type-annotation-needed.rs:1:1 | LL | fn foo>(x: i32) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/type/type-arg-out-of-scope.rs b/src/test/ui/type/type-arg-out-of-scope.rs index 04cd961e97ff7..b96c9bf6a0e41 100644 --- a/src/test/ui/type/type-arg-out-of-scope.rs +++ b/src/test/ui/type/type-arg-out-of-scope.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:can't use type parameters from outer function fn foo(x: T) { fn bar(f: Box T>) { } diff --git a/src/test/ui/type/type-arg-out-of-scope.stderr b/src/test/ui/type/type-arg-out-of-scope.stderr index 20bf303129f75..62b6a86662d04 100644 --- a/src/test/ui/type/type-arg-out-of-scope.stderr +++ b/src/test/ui/type/type-arg-out-of-scope.stderr @@ -1,5 +1,5 @@ error[E0401]: can't use type parameters from outer function - --> $DIR/type-arg-out-of-scope.rs:13:25 + --> $DIR/type-arg-out-of-scope.rs:3:25 | LL | fn foo(x: T) { | - type variable from outer function @@ -9,7 +9,7 @@ LL | fn bar(f: Box T>) { } | help: try using a local type parameter instead: `bar` error[E0401]: can't use type parameters from outer function - --> $DIR/type-arg-out-of-scope.rs:13:31 + --> $DIR/type-arg-out-of-scope.rs:3:31 | LL | fn foo(x: T) { | - type variable from outer function diff --git a/src/test/ui/type/type-ascription-instead-of-initializer.rs b/src/test/ui/type/type-ascription-instead-of-initializer.rs index d80dad8fbd4c2..aef25250b159f 100644 --- a/src/test/ui/type/type-ascription-instead-of-initializer.rs +++ b/src/test/ui/type/type-ascription-instead-of-initializer.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x: Vec::with_capacity(10, 20); //~ ERROR expected type, found `10` //~^ ERROR this function takes 1 parameter diff --git a/src/test/ui/type/type-ascription-instead-of-initializer.stderr b/src/test/ui/type/type-ascription-instead-of-initializer.stderr index 3722d2a0e3ff8..8ce367d70f014 100644 --- a/src/test/ui/type/type-ascription-instead-of-initializer.stderr +++ b/src/test/ui/type/type-ascription-instead-of-initializer.stderr @@ -1,5 +1,5 @@ error: expected type, found `10` - --> $DIR/type-ascription-instead-of-initializer.rs:12:31 + --> $DIR/type-ascription-instead-of-initializer.rs:2:31 | LL | let x: Vec::with_capacity(10, 20); //~ ERROR expected type, found `10` | -- ^^ @@ -8,7 +8,7 @@ LL | let x: Vec::with_capacity(10, 20); //~ ERROR expected type, found `10` | while parsing the type for `x` error[E0061]: this function takes 1 parameter but 2 parameters were supplied - --> $DIR/type-ascription-instead-of-initializer.rs:12:12 + --> $DIR/type-ascription-instead-of-initializer.rs:2:12 | LL | let x: Vec::with_capacity(10, 20); //~ ERROR expected type, found `10` | ^^^^^^^^^^^^^^^^^^^^^^^^^^ expected 1 parameter diff --git a/src/test/ui/type/type-ascription-instead-of-statement-end.rs b/src/test/ui/type/type-ascription-instead-of-statement-end.rs index 01d773dd5e103..1d5565ab58384 100644 --- a/src/test/ui/type/type-ascription-instead-of-statement-end.rs +++ b/src/test/ui/type/type-ascription-instead-of-statement-end.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(type_ascription)] fn main() { diff --git a/src/test/ui/type/type-ascription-instead-of-statement-end.stderr b/src/test/ui/type/type-ascription-instead-of-statement-end.stderr index 314c9060d4f7d..db99d1ec07be3 100644 --- a/src/test/ui/type/type-ascription-instead-of-statement-end.stderr +++ b/src/test/ui/type/type-ascription-instead-of-statement-end.stderr @@ -1,5 +1,5 @@ error: expected type, found `0` - --> $DIR/type-ascription-instead-of-statement-end.rs:15:5 + --> $DIR/type-ascription-instead-of-statement-end.rs:5:5 | LL | println!("test"): | - help: try using a semicolon: `;` @@ -7,7 +7,7 @@ LL | 0; //~ ERROR expected type, found `0` | ^ expecting a type here because of type ascription error: expected type, found `0` - --> $DIR/type-ascription-instead-of-statement-end.rs:19:23 + --> $DIR/type-ascription-instead-of-statement-end.rs:9:23 | LL | println!("test"): 0; //~ ERROR expected type, found `0` | ^ expecting a type here because of type ascription diff --git a/src/test/ui/type/type-ascription-precedence.rs b/src/test/ui/type/type-ascription-precedence.rs index bb7a8bc3ddf98..d3aef929b9fa2 100644 --- a/src/test/ui/type/type-ascription-precedence.rs +++ b/src/test/ui/type/type-ascription-precedence.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Operator precedence of type ascription // Type ascription has very high precedence, the same as operator `as` diff --git a/src/test/ui/type/type-ascription-precedence.stderr b/src/test/ui/type/type-ascription-precedence.stderr index 252b5231220df..e52e2bc5e9a78 100644 --- a/src/test/ui/type/type-ascription-precedence.stderr +++ b/src/test/ui/type/type-ascription-precedence.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/type-ascription-precedence.rs:41:7 + --> $DIR/type-ascription-precedence.rs:31:7 | LL | &(S: &S); //~ ERROR mismatched types | ^ expected &S, found struct `S` @@ -8,7 +8,7 @@ LL | &(S: &S); //~ ERROR mismatched types found type `S` error[E0308]: mismatched types - --> $DIR/type-ascription-precedence.rs:45:7 + --> $DIR/type-ascription-precedence.rs:35:7 | LL | *(S: Z); //~ ERROR mismatched types | ^ expected struct `Z`, found struct `S` @@ -17,13 +17,13 @@ LL | *(S: Z); //~ ERROR mismatched types found type `S` error[E0614]: type `Z` cannot be dereferenced - --> $DIR/type-ascription-precedence.rs:45:5 + --> $DIR/type-ascription-precedence.rs:35:5 | LL | *(S: Z); //~ ERROR mismatched types | ^^^^^^^ error[E0308]: mismatched types - --> $DIR/type-ascription-precedence.rs:50:7 + --> $DIR/type-ascription-precedence.rs:40:7 | LL | -(S: Z); //~ ERROR mismatched types | ^ expected struct `Z`, found struct `S` @@ -32,7 +32,7 @@ LL | -(S: Z); //~ ERROR mismatched types found type `S` error[E0600]: cannot apply unary operator `-` to type `Z` - --> $DIR/type-ascription-precedence.rs:50:5 + --> $DIR/type-ascription-precedence.rs:40:5 | LL | -(S: Z); //~ ERROR mismatched types | ^^^^^^^ cannot apply unary operator `-` @@ -40,7 +40,7 @@ LL | -(S: Z); //~ ERROR mismatched types = note: an implementation of `std::ops::Neg` might be missing for `Z` error[E0308]: mismatched types - --> $DIR/type-ascription-precedence.rs:55:5 + --> $DIR/type-ascription-precedence.rs:45:5 | LL | (S + Z): Z; //~ ERROR mismatched types | ^^^^^^^ expected struct `Z`, found struct `S` @@ -49,7 +49,7 @@ LL | (S + Z): Z; //~ ERROR mismatched types found type `S` error[E0308]: mismatched types - --> $DIR/type-ascription-precedence.rs:59:5 + --> $DIR/type-ascription-precedence.rs:49:5 | LL | (S * Z): Z; //~ ERROR mismatched types | ^^^^^^^ expected struct `Z`, found struct `S` @@ -58,7 +58,7 @@ LL | (S * Z): Z; //~ ERROR mismatched types found type `S` error[E0308]: mismatched types - --> $DIR/type-ascription-precedence.rs:63:5 + --> $DIR/type-ascription-precedence.rs:53:5 | LL | (S .. S): S; //~ ERROR mismatched types | ^^^^^^^^ expected struct `S`, found struct `std::ops::Range` diff --git a/src/test/ui/type/type-ascription-soundness.rs b/src/test/ui/type/type-ascription-soundness.rs index 2d882e87ab8ea..d583fc2131a74 100644 --- a/src/test/ui/type/type-ascription-soundness.rs +++ b/src/test/ui/type/type-ascription-soundness.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Type ascription doesn't lead to unsoundness #![feature(type_ascription)] diff --git a/src/test/ui/type/type-ascription-soundness.stderr b/src/test/ui/type/type-ascription-soundness.stderr index 3dcd6ff49b3ac..f681a0423024d 100644 --- a/src/test/ui/type/type-ascription-soundness.stderr +++ b/src/test/ui/type/type-ascription-soundness.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/type-ascription-soundness.rs:17:17 + --> $DIR/type-ascription-soundness.rs:7:17 | LL | let ref x = arr: &[u8]; //~ ERROR mismatched types | ^^^ expected slice, found array of 3 elements @@ -8,7 +8,7 @@ LL | let ref x = arr: &[u8]; //~ ERROR mismatched types found type `&[u8; 3]` error[E0308]: mismatched types - --> $DIR/type-ascription-soundness.rs:18:21 + --> $DIR/type-ascription-soundness.rs:8:21 | LL | let ref mut x = arr: &[u8]; //~ ERROR mismatched types | ^^^ expected slice, found array of 3 elements @@ -17,7 +17,7 @@ LL | let ref mut x = arr: &[u8]; //~ ERROR mismatched types found type `&[u8; 3]` error[E0308]: mismatched types - --> $DIR/type-ascription-soundness.rs:19:11 + --> $DIR/type-ascription-soundness.rs:9:11 | LL | match arr: &[u8] { //~ ERROR mismatched types | ^^^ expected slice, found array of 3 elements @@ -26,7 +26,7 @@ LL | match arr: &[u8] { //~ ERROR mismatched types found type `&[u8; 3]` error[E0308]: mismatched types - --> $DIR/type-ascription-soundness.rs:22:17 + --> $DIR/type-ascription-soundness.rs:12:17 | LL | let _len = (arr: &[u8]).len(); //~ ERROR mismatched types | ^^^ expected slice, found array of 3 elements diff --git a/src/test/ui/type/type-ascription-with-fn-call.rs b/src/test/ui/type/type-ascription-with-fn-call.rs index b2c25c37e8e32..2bd2efa4d3832 100644 --- a/src/test/ui/type/type-ascription-with-fn-call.rs +++ b/src/test/ui/type/type-ascription-with-fn-call.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(type_ascription)] fn main() { diff --git a/src/test/ui/type/type-ascription-with-fn-call.stderr b/src/test/ui/type/type-ascription-with-fn-call.stderr index 78df97139b6af..a290e69e0cb6f 100644 --- a/src/test/ui/type/type-ascription-with-fn-call.stderr +++ b/src/test/ui/type/type-ascription-with-fn-call.stderr @@ -1,5 +1,5 @@ error[E0573]: expected type, found function `f` - --> $DIR/type-ascription-with-fn-call.rs:15:5 + --> $DIR/type-ascription-with-fn-call.rs:5:5 | LL | f() : | - help: did you mean to use `;` here instead? diff --git a/src/test/ui/type/type-check-defaults.rs b/src/test/ui/type/type-check-defaults.rs index 92a45db068968..5748c9bcff8cb 100644 --- a/src/test/ui/type/type-check-defaults.rs +++ b/src/test/ui/type/type-check-defaults.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::iter::FromIterator; use std::vec::IntoIter; use std::ops::Add; diff --git a/src/test/ui/type/type-check-defaults.stderr b/src/test/ui/type/type-check-defaults.stderr index f6d7086679a52..a46d79ec3183e 100644 --- a/src/test/ui/type/type-check-defaults.stderr +++ b/src/test/ui/type/type-check-defaults.stderr @@ -1,87 +1,87 @@ error[E0277]: a collection of type `i32` cannot be built from an iterator over elements of type `i32` - --> $DIR/type-check-defaults.rs:16:19 + --> $DIR/type-check-defaults.rs:6:19 | LL | struct WellFormed>(Z); | ^ a collection of type `i32` cannot be built from `std::iter::Iterator` | = help: the trait `std::iter::FromIterator` is not implemented for `i32` note: required by `Foo` - --> $DIR/type-check-defaults.rs:15:1 + --> $DIR/type-check-defaults.rs:5:1 | LL | struct Foo>(T, U); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: a collection of type `i32` cannot be built from an iterator over elements of type `i32` - --> $DIR/type-check-defaults.rs:18:27 + --> $DIR/type-check-defaults.rs:8:27 | LL | struct WellFormedNoBounds>(Z); | ^ a collection of type `i32` cannot be built from `std::iter::Iterator` | = help: the trait `std::iter::FromIterator` is not implemented for `i32` note: required by `Foo` - --> $DIR/type-check-defaults.rs:15:1 + --> $DIR/type-check-defaults.rs:5:1 | LL | struct Foo>(T, U); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `std::string::String: std::marker::Copy` is not satisfied - --> $DIR/type-check-defaults.rs:21:1 + --> $DIR/type-check-defaults.rs:11:1 | LL | struct Bounds(T); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `std::string::String` | note: required by `Bounds` - --> $DIR/type-check-defaults.rs:21:1 + --> $DIR/type-check-defaults.rs:11:1 | LL | struct Bounds(T); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `std::string::String: std::marker::Copy` is not satisfied - --> $DIR/type-check-defaults.rs:24:1 + --> $DIR/type-check-defaults.rs:14:1 | LL | struct WhereClause(T) where T: Copy; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `std::string::String` | note: required by `WhereClause` - --> $DIR/type-check-defaults.rs:24:1 + --> $DIR/type-check-defaults.rs:14:1 | LL | struct WhereClause(T) where T: Copy; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `std::string::String: std::marker::Copy` is not satisfied - --> $DIR/type-check-defaults.rs:27:1 + --> $DIR/type-check-defaults.rs:17:1 | LL | trait TraitBound {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `std::string::String` | note: required by `TraitBound` - --> $DIR/type-check-defaults.rs:27:1 + --> $DIR/type-check-defaults.rs:17:1 | LL | trait TraitBound {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied - --> $DIR/type-check-defaults.rs:31:1 + --> $DIR/type-check-defaults.rs:21:1 | LL | trait Base: Super { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `T` | = help: consider adding a `where T: std::marker::Copy` bound note: required by `Super` - --> $DIR/type-check-defaults.rs:30:1 + --> $DIR/type-check-defaults.rs:20:1 | LL | trait Super { } | ^^^^^^^^^^^^^^^^^^^^ error[E0277]: cannot add `u8` to `i32` - --> $DIR/type-check-defaults.rs:34:1 + --> $DIR/type-check-defaults.rs:24:1 | LL | trait ProjectionPred> where T::Item : Add {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no implementation for `i32 + u8` | = help: the trait `std::ops::Add` is not implemented for `i32` note: required by `ProjectionPred` - --> $DIR/type-check-defaults.rs:34:1 + --> $DIR/type-check-defaults.rs:24:1 | LL | trait ProjectionPred> where T::Item : Add {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/type/type-check/assignment-in-if.rs b/src/test/ui/type/type-check/assignment-in-if.rs index d4d070ecaefb9..232b0a00b307d 100644 --- a/src/test/ui/type/type-check/assignment-in-if.rs +++ b/src/test/ui/type/type-check/assignment-in-if.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the parser does not attempt to parse struct literals // within assignments in if expressions. diff --git a/src/test/ui/type/type-check/assignment-in-if.stderr b/src/test/ui/type/type-check/assignment-in-if.stderr index 7f3ce0d2a5fea..403f7b4f7ae89 100644 --- a/src/test/ui/type/type-check/assignment-in-if.stderr +++ b/src/test/ui/type/type-check/assignment-in-if.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/assignment-in-if.rs:25:8 + --> $DIR/assignment-in-if.rs:15:8 | LL | if x = x { | ^^^^^ @@ -11,7 +11,7 @@ LL | if x = x { found type `()` error[E0308]: mismatched types - --> $DIR/assignment-in-if.rs:30:8 + --> $DIR/assignment-in-if.rs:20:8 | LL | if (x = x) { | ^^^^^^^ @@ -23,7 +23,7 @@ LL | if (x = x) { found type `()` error[E0308]: mismatched types - --> $DIR/assignment-in-if.rs:35:8 + --> $DIR/assignment-in-if.rs:25:8 | LL | if y = (Foo { foo: x }) { | ^^^^^^^^^^^^^^^^^^^^ @@ -35,7 +35,7 @@ LL | if y = (Foo { foo: x }) { found type `()` error[E0308]: mismatched types - --> $DIR/assignment-in-if.rs:40:8 + --> $DIR/assignment-in-if.rs:30:8 | LL | if 3 = x { | ^^^^^ @@ -47,7 +47,7 @@ LL | if 3 = x { found type `()` error[E0308]: mismatched types - --> $DIR/assignment-in-if.rs:44:8 + --> $DIR/assignment-in-if.rs:34:8 | LL | if (if true { x = 4 } else { x = 5 }) { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected bool, found () diff --git a/src/test/ui/type/type-check/cannot_infer_local_or_array.rs b/src/test/ui/type/type-check/cannot_infer_local_or_array.rs index 3ec96144da544..af7552523d6fc 100644 --- a/src/test/ui/type/type-check/cannot_infer_local_or_array.rs +++ b/src/test/ui/type/type-check/cannot_infer_local_or_array.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = []; //~ ERROR type annotations needed } diff --git a/src/test/ui/type/type-check/cannot_infer_local_or_array.stderr b/src/test/ui/type/type-check/cannot_infer_local_or_array.stderr index bfdd614e50d31..a2df3dcd8e708 100644 --- a/src/test/ui/type/type-check/cannot_infer_local_or_array.stderr +++ b/src/test/ui/type/type-check/cannot_infer_local_or_array.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/cannot_infer_local_or_array.rs:12:13 + --> $DIR/cannot_infer_local_or_array.rs:2:13 | LL | let x = []; //~ ERROR type annotations needed | - ^^ cannot infer type diff --git a/src/test/ui/type/type-check/cannot_infer_local_or_vec.rs b/src/test/ui/type/type-check/cannot_infer_local_or_vec.rs index a4626799691a2..e72ddabf3da09 100644 --- a/src/test/ui/type/type-check/cannot_infer_local_or_vec.rs +++ b/src/test/ui/type/type-check/cannot_infer_local_or_vec.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = vec![]; //~^ ERROR type annotations needed diff --git a/src/test/ui/type/type-check/cannot_infer_local_or_vec.stderr b/src/test/ui/type/type-check/cannot_infer_local_or_vec.stderr index e58a5b67c196e..8215947d49cdd 100644 --- a/src/test/ui/type/type-check/cannot_infer_local_or_vec.stderr +++ b/src/test/ui/type/type-check/cannot_infer_local_or_vec.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/cannot_infer_local_or_vec.rs:12:13 + --> $DIR/cannot_infer_local_or_vec.rs:2:13 | LL | let x = vec![]; | - ^^^^^^ cannot infer type for `T` diff --git a/src/test/ui/type/type-check/cannot_infer_local_or_vec_in_tuples.rs b/src/test/ui/type/type-check/cannot_infer_local_or_vec_in_tuples.rs index 930c51f52d9af..d21456439f033 100644 --- a/src/test/ui/type/type-check/cannot_infer_local_or_vec_in_tuples.rs +++ b/src/test/ui/type/type-check/cannot_infer_local_or_vec_in_tuples.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let (x, ) = (vec![], ); //~^ ERROR type annotations needed diff --git a/src/test/ui/type/type-check/cannot_infer_local_or_vec_in_tuples.stderr b/src/test/ui/type/type-check/cannot_infer_local_or_vec_in_tuples.stderr index d7887216bc910..1065d49c26b2d 100644 --- a/src/test/ui/type/type-check/cannot_infer_local_or_vec_in_tuples.stderr +++ b/src/test/ui/type/type-check/cannot_infer_local_or_vec_in_tuples.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/cannot_infer_local_or_vec_in_tuples.rs:12:18 + --> $DIR/cannot_infer_local_or_vec_in_tuples.rs:2:18 | LL | let (x, ) = (vec![], ); | ----- ^^^^^^ cannot infer type for `T` diff --git a/src/test/ui/type/type-check/issue-22897.rs b/src/test/ui/type/type-check/issue-22897.rs index 62eaa616d3199..8171a0ef154fd 100644 --- a/src/test/ui/type/type-check/issue-22897.rs +++ b/src/test/ui/type/type-check/issue-22897.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { } fn unconstrained_type() { diff --git a/src/test/ui/type/type-check/issue-22897.stderr b/src/test/ui/type/type-check/issue-22897.stderr index e2374809dd6b0..a4f1c4d5d4df2 100644 --- a/src/test/ui/type/type-check/issue-22897.stderr +++ b/src/test/ui/type/type-check/issue-22897.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/issue-22897.rs:14:5 + --> $DIR/issue-22897.rs:4:5 | LL | []; //~ ERROR type annotations needed | ^^ cannot infer type for `[_; 0]` diff --git a/src/test/ui/type/type-check/issue-40294.rs b/src/test/ui/type/type-check/issue-40294.rs index d2817062b27ff..c73acdc467ee2 100644 --- a/src/test/ui/type/type-check/issue-40294.rs +++ b/src/test/ui/type/type-check/issue-40294.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo: Sized { fn foo(self); } diff --git a/src/test/ui/type/type-check/issue-40294.stderr b/src/test/ui/type/type-check/issue-40294.stderr index fbb7427ae3e8f..d63abdbeb5d4c 100644 --- a/src/test/ui/type/type-check/issue-40294.stderr +++ b/src/test/ui/type/type-check/issue-40294.stderr @@ -1,5 +1,5 @@ error[E0283]: type annotations required: cannot resolve `&'a T: Foo` - --> $DIR/issue-40294.rs:15:1 + --> $DIR/issue-40294.rs:5:1 | LL | / fn foo<'a,'b,T>(x: &'a T, y: &'b T) //~ ERROR type annotations required LL | | where &'a T : Foo, @@ -11,7 +11,7 @@ LL | | } | |_^ | note: required by `Foo` - --> $DIR/issue-40294.rs:11:1 + --> $DIR/issue-40294.rs:1:1 | LL | trait Foo: Sized { | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/type/type-check/issue-41314.rs b/src/test/ui/type/type-check/issue-41314.rs index 7b4d2f05f5fd0..856d4ff6334bc 100644 --- a/src/test/ui/type/type-check/issue-41314.rs +++ b/src/test/ui/type/type-check/issue-41314.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum X { Y(u32) } diff --git a/src/test/ui/type/type-check/issue-41314.stderr b/src/test/ui/type/type-check/issue-41314.stderr index f7d4bb9a02f45..a4ae2a97134e7 100644 --- a/src/test/ui/type/type-check/issue-41314.stderr +++ b/src/test/ui/type/type-check/issue-41314.stderr @@ -1,11 +1,11 @@ error[E0026]: variant `X::Y` does not have a field named `number` - --> $DIR/issue-41314.rs:17:16 + --> $DIR/issue-41314.rs:7:16 | LL | X::Y { number } => {} //~ ERROR does not have a field named `number` | ^^^^^^ variant `X::Y` does not have this field error[E0027]: pattern does not mention field `0` - --> $DIR/issue-41314.rs:17:9 + --> $DIR/issue-41314.rs:7:9 | LL | X::Y { number } => {} //~ ERROR does not have a field named `number` | ^^^^^^^^^^^^^^^ missing field `0` diff --git a/src/test/ui/type/type-check/missing_trait_impl.rs b/src/test/ui/type/type-check/missing_trait_impl.rs index b3e79ce2447fb..dcca96b509b16 100644 --- a/src/test/ui/type/type-check/missing_trait_impl.rs +++ b/src/test/ui/type/type-check/missing_trait_impl.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { } diff --git a/src/test/ui/type/type-check/missing_trait_impl.stderr b/src/test/ui/type/type-check/missing_trait_impl.stderr index 4b01a626814e5..9f59e7162e072 100644 --- a/src/test/ui/type/type-check/missing_trait_impl.stderr +++ b/src/test/ui/type/type-check/missing_trait_impl.stderr @@ -1,5 +1,5 @@ error[E0369]: binary operation `+` cannot be applied to type `T` - --> $DIR/missing_trait_impl.rs:15:13 + --> $DIR/missing_trait_impl.rs:5:13 | LL | let z = x + y; //~ ERROR binary operation `+` cannot be applied to type `T` | ^^^^^ @@ -7,7 +7,7 @@ LL | let z = x + y; //~ ERROR binary operation `+` cannot be applied to type = note: `T` might need a bound for `std::ops::Add` error[E0368]: binary assignment operation `+=` cannot be applied to type `T` - --> $DIR/missing_trait_impl.rs:19:5 + --> $DIR/missing_trait_impl.rs:9:5 | LL | x += x; //~ ERROR binary assignment operation `+=` cannot be applied to type `T` | -^^^^^ diff --git a/src/test/ui/type/type-check/unknown_type_for_closure.rs b/src/test/ui/type/type-check/unknown_type_for_closure.rs index 0c355976330fd..0dbf82453a2c7 100644 --- a/src/test/ui/type/type-check/unknown_type_for_closure.rs +++ b/src/test/ui/type/type-check/unknown_type_for_closure.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = |_| { }; //~ ERROR type annotations needed } diff --git a/src/test/ui/type/type-check/unknown_type_for_closure.stderr b/src/test/ui/type/type-check/unknown_type_for_closure.stderr index 25283f5e76b1b..45142b556ecd9 100644 --- a/src/test/ui/type/type-check/unknown_type_for_closure.stderr +++ b/src/test/ui/type/type-check/unknown_type_for_closure.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/unknown_type_for_closure.rs:12:14 + --> $DIR/unknown_type_for_closure.rs:2:14 | LL | let x = |_| { }; //~ ERROR type annotations needed | ^ consider giving this closure parameter a type diff --git a/src/test/ui/type/type-dependent-def-issue-49241.rs b/src/test/ui/type/type-dependent-def-issue-49241.rs index db27ae89e69fd..0e0455c1eec51 100644 --- a/src/test/ui/type/type-dependent-def-issue-49241.rs +++ b/src/test/ui/type/type-dependent-def-issue-49241.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let v = vec![0]; const l: usize = v.count(); //~ ERROR can't capture dynamic environment in a fn item diff --git a/src/test/ui/type/type-dependent-def-issue-49241.stderr b/src/test/ui/type/type-dependent-def-issue-49241.stderr index 361d28f274fa3..aaacee4495773 100644 --- a/src/test/ui/type/type-dependent-def-issue-49241.stderr +++ b/src/test/ui/type/type-dependent-def-issue-49241.stderr @@ -1,5 +1,5 @@ error[E0434]: can't capture dynamic environment in a fn item - --> $DIR/type-dependent-def-issue-49241.rs:13:22 + --> $DIR/type-dependent-def-issue-49241.rs:3:22 | LL | const l: usize = v.count(); //~ ERROR can't capture dynamic environment in a fn item | ^ diff --git a/src/test/ui/type/type-mismatch-multiple.rs b/src/test/ui/type/type-mismatch-multiple.rs index 9359c03595669..f2e289a11b75e 100644 --- a/src/test/ui/type/type-mismatch-multiple.rs +++ b/src/test/ui/type/type-mismatch-multiple.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Checking that the compiler reports multiple type errors at once fn main() { let a: bool = 1; let b: i32 = true; } diff --git a/src/test/ui/type/type-mismatch-multiple.stderr b/src/test/ui/type/type-mismatch-multiple.stderr index b9721a5edfa4d..b38579046b585 100644 --- a/src/test/ui/type/type-mismatch-multiple.stderr +++ b/src/test/ui/type/type-mismatch-multiple.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/type-mismatch-multiple.rs:13:27 + --> $DIR/type-mismatch-multiple.rs:3:27 | LL | fn main() { let a: bool = 1; let b: i32 = true; } | ^ expected bool, found integral variable @@ -8,7 +8,7 @@ LL | fn main() { let a: bool = 1; let b: i32 = true; } found type `{integer}` error[E0308]: mismatched types - --> $DIR/type-mismatch-multiple.rs:13:43 + --> $DIR/type-mismatch-multiple.rs:3:43 | LL | fn main() { let a: bool = 1; let b: i32 = true; } | ^^^^ expected i32, found bool diff --git a/src/test/ui/type/type-mismatch-same-crate-name.rs b/src/test/ui/type/type-mismatch-same-crate-name.rs index 7e93f626cfcfb..61e6bd219209f 100644 --- a/src/test/ui/type/type-mismatch-same-crate-name.rs +++ b/src/test/ui/type/type-mismatch-same-crate-name.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:crate_a1.rs // aux-build:crate_a2.rs diff --git a/src/test/ui/type/type-mismatch-same-crate-name.stderr b/src/test/ui/type/type-mismatch-same-crate-name.stderr index c686092605662..ed07b602e3e3e 100644 --- a/src/test/ui/type/type-mismatch-same-crate-name.stderr +++ b/src/test/ui/type/type-mismatch-same-crate-name.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/type-mismatch-same-crate-name.rs:26:20 + --> $DIR/type-mismatch-same-crate-name.rs:16:20 | LL | a::try_foo(foo2); | ^^^^ expected struct `main::a::Foo`, found a different struct `main::a::Foo` @@ -7,13 +7,13 @@ LL | a::try_foo(foo2); = note: expected type `main::a::Foo` (struct `main::a::Foo`) found type `main::a::Foo` (struct `main::a::Foo`) note: Perhaps two different versions of crate `crate_a1` are being used? - --> $DIR/type-mismatch-same-crate-name.rs:26:20 + --> $DIR/type-mismatch-same-crate-name.rs:16:20 | LL | a::try_foo(foo2); | ^^^^ error[E0308]: mismatched types - --> $DIR/type-mismatch-same-crate-name.rs:32:20 + --> $DIR/type-mismatch-same-crate-name.rs:22:20 | LL | a::try_bar(bar2); | ^^^^ expected trait `main::a::Bar`, found a different trait `main::a::Bar` @@ -21,7 +21,7 @@ LL | a::try_bar(bar2); = note: expected type `std::boxed::Box<(dyn main::a::Bar + 'static)>` found type `std::boxed::Box` note: Perhaps two different versions of crate `crate_a1` are being used? - --> $DIR/type-mismatch-same-crate-name.rs:32:20 + --> $DIR/type-mismatch-same-crate-name.rs:22:20 | LL | a::try_bar(bar2); | ^^^^ diff --git a/src/test/ui/type/type-mismatch.rs b/src/test/ui/type/type-mismatch.rs index 2592b07eda781..5a5d1dda1b3f4 100644 --- a/src/test/ui/type/type-mismatch.rs +++ b/src/test/ui/type/type-mismatch.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Qux {} struct A; struct B; diff --git a/src/test/ui/type/type-mismatch.stderr b/src/test/ui/type/type-mismatch.stderr index 4ba1a7f37c4a1..f4c18efac5571 100644 --- a/src/test/ui/type/type-mismatch.stderr +++ b/src/test/ui/type/type-mismatch.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:25:17 + --> $DIR/type-mismatch.rs:15:17 | LL | want::(f); //~ ERROR mismatched types | ^ expected struct `foo`, found usize @@ -8,7 +8,7 @@ LL | want::(f); //~ ERROR mismatched types found type `usize` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:26:17 + --> $DIR/type-mismatch.rs:16:17 | LL | want::(f); //~ ERROR mismatched types | ^ expected struct `bar`, found usize @@ -17,7 +17,7 @@ LL | want::(f); //~ ERROR mismatched types found type `usize` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:27:24 + --> $DIR/type-mismatch.rs:17:24 | LL | want::>(f); //~ ERROR mismatched types | ^ expected struct `Foo`, found usize @@ -26,7 +26,7 @@ LL | want::>(f); //~ ERROR mismatched types found type `usize` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:28:27 + --> $DIR/type-mismatch.rs:18:27 | LL | want::>(f); //~ ERROR mismatched types | ^ expected struct `Foo`, found usize @@ -35,7 +35,7 @@ LL | want::>(f); //~ ERROR mismatched types found type `usize` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:29:22 + --> $DIR/type-mismatch.rs:19:22 | LL | want::>(f); //~ ERROR mismatched types | ^ expected struct `Foo`, found usize @@ -44,7 +44,7 @@ LL | want::>(f); //~ ERROR mismatched types found type `usize` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:30:25 + --> $DIR/type-mismatch.rs:20:25 | LL | want::>(f); //~ ERROR mismatched types | ^ expected struct `Foo`, found usize @@ -53,7 +53,7 @@ LL | want::>(f); //~ ERROR mismatched types found type `usize` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:31:22 + --> $DIR/type-mismatch.rs:21:22 | LL | want::>(f); //~ ERROR mismatched types | ^ expected struct `Foo`, found usize @@ -62,7 +62,7 @@ LL | want::>(f); //~ ERROR mismatched types found type `usize` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:32:25 + --> $DIR/type-mismatch.rs:22:25 | LL | want::>(f); //~ ERROR mismatched types | ^ expected struct `Foo`, found usize @@ -71,7 +71,7 @@ LL | want::>(f); //~ ERROR mismatched types found type `usize` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:36:19 + --> $DIR/type-mismatch.rs:26:19 | LL | want::(f); //~ ERROR mismatched types | ^ expected usize, found struct `foo` @@ -80,7 +80,7 @@ LL | want::(f); //~ ERROR mismatched types found type `foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:37:17 + --> $DIR/type-mismatch.rs:27:17 | LL | want::(f); //~ ERROR mismatched types | ^ expected struct `bar`, found struct `foo` @@ -89,7 +89,7 @@ LL | want::(f); //~ ERROR mismatched types found type `foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:38:24 + --> $DIR/type-mismatch.rs:28:24 | LL | want::>(f); //~ ERROR mismatched types | ^ expected struct `Foo`, found struct `foo` @@ -98,7 +98,7 @@ LL | want::>(f); //~ ERROR mismatched types found type `foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:39:27 + --> $DIR/type-mismatch.rs:29:27 | LL | want::>(f); //~ ERROR mismatched types | ^ expected struct `Foo`, found struct `foo` @@ -107,7 +107,7 @@ LL | want::>(f); //~ ERROR mismatched types found type `foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:40:22 + --> $DIR/type-mismatch.rs:30:22 | LL | want::>(f); //~ ERROR mismatched types | ^ expected struct `Foo`, found struct `foo` @@ -116,7 +116,7 @@ LL | want::>(f); //~ ERROR mismatched types found type `foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:41:25 + --> $DIR/type-mismatch.rs:31:25 | LL | want::>(f); //~ ERROR mismatched types | ^ expected struct `Foo`, found struct `foo` @@ -125,7 +125,7 @@ LL | want::>(f); //~ ERROR mismatched types found type `foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:42:22 + --> $DIR/type-mismatch.rs:32:22 | LL | want::>(f); //~ ERROR mismatched types | ^ expected struct `Foo`, found struct `foo` @@ -134,7 +134,7 @@ LL | want::>(f); //~ ERROR mismatched types found type `foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:43:25 + --> $DIR/type-mismatch.rs:33:25 | LL | want::>(f); //~ ERROR mismatched types | ^ expected struct `Foo`, found struct `foo` @@ -143,7 +143,7 @@ LL | want::>(f); //~ ERROR mismatched types found type `foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:47:19 + --> $DIR/type-mismatch.rs:37:19 | LL | want::(f); //~ ERROR mismatched types | ^ expected usize, found struct `Foo` @@ -152,7 +152,7 @@ LL | want::(f); //~ ERROR mismatched types found type `Foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:48:17 + --> $DIR/type-mismatch.rs:38:17 | LL | want::(f); //~ ERROR mismatched types | ^ expected struct `foo`, found struct `Foo` @@ -161,7 +161,7 @@ LL | want::(f); //~ ERROR mismatched types found type `Foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:49:17 + --> $DIR/type-mismatch.rs:39:17 | LL | want::(f); //~ ERROR mismatched types | ^ expected struct `bar`, found struct `Foo` @@ -170,7 +170,7 @@ LL | want::(f); //~ ERROR mismatched types found type `Foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:50:24 + --> $DIR/type-mismatch.rs:40:24 | LL | want::>(f); //~ ERROR mismatched types | ^ expected usize, found struct `foo` @@ -179,7 +179,7 @@ LL | want::>(f); //~ ERROR mismatched types found type `Foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:51:27 + --> $DIR/type-mismatch.rs:41:27 | LL | want::>(f); //~ ERROR mismatched types | ^ expected usize, found struct `foo` @@ -188,7 +188,7 @@ LL | want::>(f); //~ ERROR mismatched types found type `Foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:52:25 + --> $DIR/type-mismatch.rs:42:25 | LL | want::>(f); //~ ERROR mismatched types | ^ expected struct `B`, found struct `A` @@ -197,7 +197,7 @@ LL | want::>(f); //~ ERROR mismatched types found type `Foo<_, A>` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:53:22 + --> $DIR/type-mismatch.rs:43:22 | LL | want::>(f); //~ ERROR mismatched types | ^ expected struct `bar`, found struct `foo` @@ -206,7 +206,7 @@ LL | want::>(f); //~ ERROR mismatched types found type `Foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:54:25 + --> $DIR/type-mismatch.rs:44:25 | LL | want::>(f); //~ ERROR mismatched types | ^ expected struct `bar`, found struct `foo` @@ -215,7 +215,7 @@ LL | want::>(f); //~ ERROR mismatched types found type `Foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:55:23 + --> $DIR/type-mismatch.rs:45:23 | LL | want::<&Foo>(f); //~ ERROR mismatched types | ^ @@ -227,7 +227,7 @@ LL | want::<&Foo>(f); //~ ERROR mismatched types found type `Foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:56:26 + --> $DIR/type-mismatch.rs:46:26 | LL | want::<&Foo>(f); //~ ERROR mismatched types | ^ expected reference, found struct `Foo` @@ -236,7 +236,7 @@ LL | want::<&Foo>(f); //~ ERROR mismatched types found type `Foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:60:19 + --> $DIR/type-mismatch.rs:50:19 | LL | want::(f); //~ ERROR mismatched types | ^ expected usize, found struct `Foo` @@ -245,7 +245,7 @@ LL | want::(f); //~ ERROR mismatched types found type `Foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:61:17 + --> $DIR/type-mismatch.rs:51:17 | LL | want::(f); //~ ERROR mismatched types | ^ expected struct `foo`, found struct `Foo` @@ -254,7 +254,7 @@ LL | want::(f); //~ ERROR mismatched types found type `Foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:62:17 + --> $DIR/type-mismatch.rs:52:17 | LL | want::(f); //~ ERROR mismatched types | ^ expected struct `bar`, found struct `Foo` @@ -263,7 +263,7 @@ LL | want::(f); //~ ERROR mismatched types found type `Foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:63:24 + --> $DIR/type-mismatch.rs:53:24 | LL | want::>(f); //~ ERROR mismatched types | ^ expected usize, found struct `foo` @@ -272,7 +272,7 @@ LL | want::>(f); //~ ERROR mismatched types found type `Foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:64:27 + --> $DIR/type-mismatch.rs:54:27 | LL | want::>(f); //~ ERROR mismatched types | ^ expected usize, found struct `foo` @@ -281,7 +281,7 @@ LL | want::>(f); //~ ERROR mismatched types found type `Foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:65:22 + --> $DIR/type-mismatch.rs:55:22 | LL | want::>(f); //~ ERROR mismatched types | ^ expected struct `A`, found struct `B` @@ -290,7 +290,7 @@ LL | want::>(f); //~ ERROR mismatched types found type `Foo<_, B>` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:66:22 + --> $DIR/type-mismatch.rs:56:22 | LL | want::>(f); //~ ERROR mismatched types | ^ expected struct `bar`, found struct `foo` @@ -299,7 +299,7 @@ LL | want::>(f); //~ ERROR mismatched types found type `Foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:67:25 + --> $DIR/type-mismatch.rs:57:25 | LL | want::>(f); //~ ERROR mismatched types | ^ expected struct `bar`, found struct `foo` @@ -308,7 +308,7 @@ LL | want::>(f); //~ ERROR mismatched types found type `Foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:68:23 + --> $DIR/type-mismatch.rs:58:23 | LL | want::<&Foo>(f); //~ ERROR mismatched types | ^ expected &Foo, found struct `Foo` @@ -317,7 +317,7 @@ LL | want::<&Foo>(f); //~ ERROR mismatched types found type `Foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:69:26 + --> $DIR/type-mismatch.rs:59:26 | LL | want::<&Foo>(f); //~ ERROR mismatched types | ^ @@ -329,7 +329,7 @@ LL | want::<&Foo>(f); //~ ERROR mismatched types found type `Foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:73:19 + --> $DIR/type-mismatch.rs:63:19 | LL | want::(f); //~ ERROR mismatched types | ^ expected usize, found struct `Foo` @@ -338,7 +338,7 @@ LL | want::(f); //~ ERROR mismatched types found type `Foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:74:17 + --> $DIR/type-mismatch.rs:64:17 | LL | want::(f); //~ ERROR mismatched types | ^ expected struct `foo`, found struct `Foo` @@ -347,7 +347,7 @@ LL | want::(f); //~ ERROR mismatched types found type `Foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:75:17 + --> $DIR/type-mismatch.rs:65:17 | LL | want::(f); //~ ERROR mismatched types | ^ expected struct `bar`, found struct `Foo` @@ -356,7 +356,7 @@ LL | want::(f); //~ ERROR mismatched types found type `Foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:76:24 + --> $DIR/type-mismatch.rs:66:24 | LL | want::>(f); //~ ERROR mismatched types | ^ expected usize, found struct `foo` @@ -365,7 +365,7 @@ LL | want::>(f); //~ ERROR mismatched types found type `Foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:77:27 + --> $DIR/type-mismatch.rs:67:27 | LL | want::>(f); //~ ERROR mismatched types | ^ expected usize, found struct `foo` @@ -374,7 +374,7 @@ LL | want::>(f); //~ ERROR mismatched types found type `Foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:78:22 + --> $DIR/type-mismatch.rs:68:22 | LL | want::>(f); //~ ERROR mismatched types | ^ expected struct `A`, found struct `B` @@ -383,7 +383,7 @@ LL | want::>(f); //~ ERROR mismatched types found type `Foo<_, B, A>` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:79:25 + --> $DIR/type-mismatch.rs:69:25 | LL | want::>(f); //~ ERROR mismatched types | ^ expected struct `B`, found struct `A` @@ -392,7 +392,7 @@ LL | want::>(f); //~ ERROR mismatched types found type `Foo<_, _, A>` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:80:22 + --> $DIR/type-mismatch.rs:70:22 | LL | want::>(f); //~ ERROR mismatched types | ^ expected struct `bar`, found struct `foo` @@ -401,7 +401,7 @@ LL | want::>(f); //~ ERROR mismatched types found type `Foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:81:25 + --> $DIR/type-mismatch.rs:71:25 | LL | want::>(f); //~ ERROR mismatched types | ^ expected struct `bar`, found struct `foo` @@ -410,7 +410,7 @@ LL | want::>(f); //~ ERROR mismatched types found type `Foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:82:23 + --> $DIR/type-mismatch.rs:72:23 | LL | want::<&Foo>(f); //~ ERROR mismatched types | ^ expected &Foo, found struct `Foo` @@ -419,7 +419,7 @@ LL | want::<&Foo>(f); //~ ERROR mismatched types found type `Foo` error[E0308]: mismatched types - --> $DIR/type-mismatch.rs:83:26 + --> $DIR/type-mismatch.rs:73:26 | LL | want::<&Foo>(f); //~ ERROR mismatched types | ^ expected reference, found struct `Foo` diff --git a/src/test/ui/type/type-parameter-defaults-referencing-Self-ppaux.rs b/src/test/ui/type/type-parameter-defaults-referencing-Self-ppaux.rs index 0898835388645..3e1c876c76ba8 100644 --- a/src/test/ui/type/type-parameter-defaults-referencing-Self-ppaux.rs +++ b/src/test/ui/type/type-parameter-defaults-referencing-Self-ppaux.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test a default that references `Self` which is then used in an // object type. Issue #18956. In this case, the value is supplied by // the user, but pretty-printing the type during the error message diff --git a/src/test/ui/type/type-parameter-defaults-referencing-Self-ppaux.stderr b/src/test/ui/type/type-parameter-defaults-referencing-Self-ppaux.stderr index f02bf0533a394..7306929d712ab 100644 --- a/src/test/ui/type/type-parameter-defaults-referencing-Self-ppaux.stderr +++ b/src/test/ui/type/type-parameter-defaults-referencing-Self-ppaux.stderr @@ -1,17 +1,17 @@ error[E0620]: cast to unsized type: `i32` as `dyn MyAdd` - --> $DIR/type-parameter-defaults-referencing-Self-ppaux.rs:24:13 + --> $DIR/type-parameter-defaults-referencing-Self-ppaux.rs:14:13 | LL | let y = x as MyAdd; | ^^^^^^^^^^^^^^^ | help: consider using a box or reference as appropriate - --> $DIR/type-parameter-defaults-referencing-Self-ppaux.rs:24:13 + --> $DIR/type-parameter-defaults-referencing-Self-ppaux.rs:14:13 | LL | let y = x as MyAdd; | ^ error[E0038]: the trait `MyAdd` cannot be made into an object - --> $DIR/type-parameter-defaults-referencing-Self-ppaux.rs:24:18 + --> $DIR/type-parameter-defaults-referencing-Self-ppaux.rs:14:18 | LL | let y = x as MyAdd; | ^^^^^^^^^^ the trait `MyAdd` cannot be made into an object diff --git a/src/test/ui/type/type-parameter-defaults-referencing-Self.rs b/src/test/ui/type/type-parameter-defaults-referencing-Self.rs index 9982d4850248b..721bf960a55c2 100644 --- a/src/test/ui/type/type-parameter-defaults-referencing-Self.rs +++ b/src/test/ui/type/type-parameter-defaults-referencing-Self.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test a default that references `Self` which is then used in an object type. // Issue #18956. diff --git a/src/test/ui/type/type-parameter-defaults-referencing-Self.stderr b/src/test/ui/type/type-parameter-defaults-referencing-Self.stderr index e163253bdf925..70093b61f251b 100644 --- a/src/test/ui/type/type-parameter-defaults-referencing-Self.stderr +++ b/src/test/ui/type/type-parameter-defaults-referencing-Self.stderr @@ -1,5 +1,5 @@ error[E0393]: the type parameter `T` must be explicitly specified - --> $DIR/type-parameter-defaults-referencing-Self.rs:20:12 + --> $DIR/type-parameter-defaults-referencing-Self.rs:10:12 | LL | fn foo(x: &Foo) { } | ^^^ missing reference to `T` diff --git a/src/test/ui/type/type-parameter-names.rs b/src/test/ui/type/type-parameter-names.rs index 11a2fc2665ca4..b6b3795d09bfb 100644 --- a/src/test/ui/type/type-parameter-names.rs +++ b/src/test/ui/type/type-parameter-names.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we print out the names of type parameters correctly in // our error messages. diff --git a/src/test/ui/type/type-parameter-names.stderr b/src/test/ui/type/type-parameter-names.stderr index 8e3d39357ed0f..9acae5c376d5b 100644 --- a/src/test/ui/type/type-parameter-names.stderr +++ b/src/test/ui/type/type-parameter-names.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/type-parameter-names.rs:15:5 + --> $DIR/type-parameter-names.rs:5:5 | LL | fn foo(x: Foo) -> Bar { | --- expected `Bar` because of return type diff --git a/src/test/ui/type/type-params-in-different-spaces-1.rs b/src/test/ui/type/type-params-in-different-spaces-1.rs index 26eac6adde221..449a26e901d42 100644 --- a/src/test/ui/type/type-params-in-different-spaces-1.rs +++ b/src/test/ui/type/type-params-in-different-spaces-1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::Add; trait BrokenAdd: Copy + Add { diff --git a/src/test/ui/type/type-params-in-different-spaces-1.stderr b/src/test/ui/type/type-params-in-different-spaces-1.stderr index 31f332f609596..e1b8ff70a6315 100644 --- a/src/test/ui/type/type-params-in-different-spaces-1.stderr +++ b/src/test/ui/type/type-params-in-different-spaces-1.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/type-params-in-different-spaces-1.rs:15:17 + --> $DIR/type-params-in-different-spaces-1.rs:5:17 | LL | *self + rhs //~ ERROR mismatched types | ^^^ expected Self, found type parameter diff --git a/src/test/ui/type/type-params-in-different-spaces-2.rs b/src/test/ui/type/type-params-in-different-spaces-2.rs index 7de061eaf077d..1211e465b0a54 100644 --- a/src/test/ui/type/type-params-in-different-spaces-2.rs +++ b/src/test/ui/type/type-params-in-different-spaces-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test static calls to make sure that we align the Self and input // type parameters on a trait correctly. diff --git a/src/test/ui/type/type-params-in-different-spaces-2.stderr b/src/test/ui/type/type-params-in-different-spaces-2.stderr index af18185dd2446..3d50c2c8baf8d 100644 --- a/src/test/ui/type/type-params-in-different-spaces-2.stderr +++ b/src/test/ui/type/type-params-in-different-spaces-2.stderr @@ -1,25 +1,25 @@ error[E0277]: the trait bound `Self: Tr` is not satisfied - --> $DIR/type-params-in-different-spaces-2.rs:20:9 + --> $DIR/type-params-in-different-spaces-2.rs:10:9 | LL | Tr::op(u) //~ ERROR E0277 | ^^^^^^ the trait `Tr` is not implemented for `Self` | = help: consider adding a `where Self: Tr` bound note: required by `Tr::op` - --> $DIR/type-params-in-different-spaces-2.rs:15:5 + --> $DIR/type-params-in-different-spaces-2.rs:5:5 | LL | fn op(_: T) -> Self; | ^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `Self: Tr` is not satisfied - --> $DIR/type-params-in-different-spaces-2.rs:26:9 + --> $DIR/type-params-in-different-spaces-2.rs:16:9 | LL | Tr::op(u) //~ ERROR E0277 | ^^^^^^ the trait `Tr` is not implemented for `Self` | = help: consider adding a `where Self: Tr` bound note: required by `Tr::op` - --> $DIR/type-params-in-different-spaces-2.rs:15:5 + --> $DIR/type-params-in-different-spaces-2.rs:5:5 | LL | fn op(_: T) -> Self; | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/type/type-params-in-different-spaces-3.rs b/src/test/ui/type/type-params-in-different-spaces-3.rs index 3ad1e9ab538db..ac7b0c11fe9fc 100644 --- a/src/test/ui/type/type-params-in-different-spaces-3.rs +++ b/src/test/ui/type/type-params-in-different-spaces-3.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Tr : Sized { fn test(u: X) -> Self { u //~ ERROR mismatched types diff --git a/src/test/ui/type/type-params-in-different-spaces-3.stderr b/src/test/ui/type/type-params-in-different-spaces-3.stderr index e1b4cbb2ab3f4..69288ea491da1 100644 --- a/src/test/ui/type/type-params-in-different-spaces-3.stderr +++ b/src/test/ui/type/type-params-in-different-spaces-3.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/type-params-in-different-spaces-3.rs:13:9 + --> $DIR/type-params-in-different-spaces-3.rs:3:9 | LL | fn test(u: X) -> Self { | ---- expected `Self` because of return type diff --git a/src/test/ui/type/type-path-err-node-types.rs b/src/test/ui/type/type-path-err-node-types.rs index 7ef099d0410a6..a2cc5070db482 100644 --- a/src/test/ui/type/type-path-err-node-types.rs +++ b/src/test/ui/type/type-path-err-node-types.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Type arguments in unresolved entities (reporting errors before type checking) // should have their types recorded. diff --git a/src/test/ui/type/type-path-err-node-types.stderr b/src/test/ui/type/type-path-err-node-types.stderr index c28b30b5456d0..9cea7beb465ee 100644 --- a/src/test/ui/type/type-path-err-node-types.stderr +++ b/src/test/ui/type/type-path-err-node-types.stderr @@ -1,23 +1,23 @@ error[E0433]: failed to resolve. Use of undeclared type or module `NonExistent` - --> $DIR/type-path-err-node-types.rs:25:5 + --> $DIR/type-path-err-node-types.rs:15:5 | LL | NonExistent::Assoc::; //~ ERROR undeclared type or module `NonExistent` | ^^^^^^^^^^^ Use of undeclared type or module `NonExistent` error[E0412]: cannot find type `Nonexistent` in this scope - --> $DIR/type-path-err-node-types.rs:17:12 + --> $DIR/type-path-err-node-types.rs:7:12 | LL | let _: Nonexistent; //~ ERROR cannot find type `Nonexistent` in this scope | ^^^^^^^^^^^ not found in this scope error[E0576]: cannot find method or associated constant `nonexistent` in trait `Tr` - --> $DIR/type-path-err-node-types.rs:21:21 + --> $DIR/type-path-err-node-types.rs:11:21 | LL | >::nonexistent(); //~ ERROR cannot find method or associated constant `nonexistent` | ^^^^^^^^^^^ not found in `Tr` error[E0425]: cannot find value `nonexistent` in this scope - --> $DIR/type-path-err-node-types.rs:29:5 + --> $DIR/type-path-err-node-types.rs:19:5 | LL | nonexistent.nonexistent::(); //~ ERROR cannot find value `nonexistent` | ^^^^^^^^^^^ not found in this scope diff --git a/src/test/ui/type/type-recursive.rs b/src/test/ui/type/type-recursive.rs index 4bb739800df36..18fbc363e29da 100644 --- a/src/test/ui/type/type-recursive.rs +++ b/src/test/ui/type/type-recursive.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct t1 { //~ ERROR E0072 foo: isize, foolish: t1 diff --git a/src/test/ui/type/type-recursive.stderr b/src/test/ui/type/type-recursive.stderr index c0c2cbc857a83..3f42272bdf555 100644 --- a/src/test/ui/type/type-recursive.stderr +++ b/src/test/ui/type/type-recursive.stderr @@ -1,5 +1,5 @@ error[E0072]: recursive type `t1` has infinite size - --> $DIR/type-recursive.rs:11:1 + --> $DIR/type-recursive.rs:1:1 | LL | struct t1 { //~ ERROR E0072 | ^^^^^^^^^ recursive type has infinite size diff --git a/src/test/ui/type/type-shadow.rs b/src/test/ui/type/type-shadow.rs index 6d8c0fe22bdb7..48a68a3907a9a 100644 --- a/src/test/ui/type/type-shadow.rs +++ b/src/test/ui/type/type-shadow.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { type X = isize; type Y = X; diff --git a/src/test/ui/type/type-shadow.stderr b/src/test/ui/type/type-shadow.stderr index 29e6e4352e207..4c7aa00565adf 100644 --- a/src/test/ui/type/type-shadow.stderr +++ b/src/test/ui/type/type-shadow.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/type-shadow.rs:16:20 + --> $DIR/type-shadow.rs:6:20 | LL | let y: Y = "hello"; //~ ERROR mismatched types | ^^^^^^^ expected isize, found reference diff --git a/src/test/ui/type_length_limit.rs b/src/test/ui/type_length_limit.rs index d283f392d7628..bb54669d37df2 100644 --- a/src/test/ui/type_length_limit.rs +++ b/src/test/ui/type_length_limit.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: reached the type-length limit while instantiating // Test that the type length limit can be changed. diff --git a/src/test/ui/typeck/auxiliary/tdticc_coherence_lib.rs b/src/test/ui/typeck/auxiliary/tdticc_coherence_lib.rs index f6f7a250174ba..d00025b770861 100644 --- a/src/test/ui/typeck/auxiliary/tdticc_coherence_lib.rs +++ b/src/test/ui/typeck/auxiliary/tdticc_coherence_lib.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits, core)] #![crate_type = "rlib"] diff --git a/src/test/ui/typeck/typeck-auto-trait-no-supertraits-2.rs b/src/test/ui/typeck/typeck-auto-trait-no-supertraits-2.rs index fa63088d00088..92d8ba887270e 100644 --- a/src/test/ui/typeck/typeck-auto-trait-no-supertraits-2.rs +++ b/src/test/ui/typeck/typeck-auto-trait-no-supertraits-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] auto trait Magic : Sized where Option : Magic {} //~ ERROR E0568 diff --git a/src/test/ui/typeck/typeck-auto-trait-no-supertraits-2.stderr b/src/test/ui/typeck/typeck-auto-trait-no-supertraits-2.stderr index 8fff0e2bb1ce9..41bf3fd1c4460 100644 --- a/src/test/ui/typeck/typeck-auto-trait-no-supertraits-2.stderr +++ b/src/test/ui/typeck/typeck-auto-trait-no-supertraits-2.stderr @@ -1,5 +1,5 @@ error[E0568]: auto traits cannot have super traits - --> $DIR/typeck-auto-trait-no-supertraits-2.rs:13:1 + --> $DIR/typeck-auto-trait-no-supertraits-2.rs:3:1 | LL | auto trait Magic : Sized where Option : Magic {} //~ ERROR E0568 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/typeck/typeck-auto-trait-no-supertraits.rs b/src/test/ui/typeck/typeck-auto-trait-no-supertraits.rs index c8cf96f52fcf1..e48017acfc718 100644 --- a/src/test/ui/typeck/typeck-auto-trait-no-supertraits.rs +++ b/src/test/ui/typeck/typeck-auto-trait-no-supertraits.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test is for #29859, we need to ensure auto traits, // (also known previously as default traits), do not have // supertraits. Since the compiler synthesizes these diff --git a/src/test/ui/typeck/typeck-auto-trait-no-supertraits.stderr b/src/test/ui/typeck/typeck-auto-trait-no-supertraits.stderr index 26542286807f9..bf40eaad65390 100644 --- a/src/test/ui/typeck/typeck-auto-trait-no-supertraits.stderr +++ b/src/test/ui/typeck/typeck-auto-trait-no-supertraits.stderr @@ -1,5 +1,5 @@ error[E0568]: auto traits cannot have super traits - --> $DIR/typeck-auto-trait-no-supertraits.rs:37:1 + --> $DIR/typeck-auto-trait-no-supertraits.rs:27:1 | LL | auto trait Magic: Copy {} //~ ERROR E0568 | ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/typeck/typeck-builtin-bound-type-parameters.rs b/src/test/ui/typeck/typeck-builtin-bound-type-parameters.rs index 9285b8ca6bcf0..840e3d7e38a63 100644 --- a/src/test/ui/typeck/typeck-builtin-bound-type-parameters.rs +++ b/src/test/ui/typeck/typeck-builtin-bound-type-parameters.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo1, U>(x: T) {} //~^ ERROR wrong number of type arguments: expected 0, found 1 [E0244] diff --git a/src/test/ui/typeck/typeck-builtin-bound-type-parameters.stderr b/src/test/ui/typeck/typeck-builtin-bound-type-parameters.stderr index b6444181dd8bd..0df64cf9494d6 100644 --- a/src/test/ui/typeck/typeck-builtin-bound-type-parameters.stderr +++ b/src/test/ui/typeck/typeck-builtin-bound-type-parameters.stderr @@ -1,35 +1,35 @@ error[E0244]: wrong number of type arguments: expected 0, found 1 - --> $DIR/typeck-builtin-bound-type-parameters.rs:11:16 + --> $DIR/typeck-builtin-bound-type-parameters.rs:1:16 | LL | fn foo1, U>(x: T) {} | ^ unexpected type argument error[E0244]: wrong number of type arguments: expected 0, found 1 - --> $DIR/typeck-builtin-bound-type-parameters.rs:14:19 + --> $DIR/typeck-builtin-bound-type-parameters.rs:4:19 | LL | trait Trait: Copy {} | ^^^^ unexpected type argument error[E0244]: wrong number of type arguments: expected 0, found 1 - --> $DIR/typeck-builtin-bound-type-parameters.rs:17:26 + --> $DIR/typeck-builtin-bound-type-parameters.rs:7:26 | LL | struct MyStruct1>; | ^ unexpected type argument error[E0107]: wrong number of lifetime arguments: expected 0, found 1 - --> $DIR/typeck-builtin-bound-type-parameters.rs:20:30 + --> $DIR/typeck-builtin-bound-type-parameters.rs:10:30 | LL | struct MyStruct2<'a, T: Copy<'a>>; | ^^ unexpected lifetime argument error[E0107]: wrong number of lifetime arguments: expected 0, found 1 - --> $DIR/typeck-builtin-bound-type-parameters.rs:24:20 + --> $DIR/typeck-builtin-bound-type-parameters.rs:14:20 | LL | fn foo2<'a, T:Copy<'a, U>, U>(x: T) {} | ^^ unexpected lifetime argument error[E0244]: wrong number of type arguments: expected 0, found 1 - --> $DIR/typeck-builtin-bound-type-parameters.rs:24:24 + --> $DIR/typeck-builtin-bound-type-parameters.rs:14:24 | LL | fn foo2<'a, T:Copy<'a, U>, U>(x: T) {} | ^ unexpected type argument diff --git a/src/test/ui/typeck/typeck-cast-pointer-to-float.rs b/src/test/ui/typeck/typeck-cast-pointer-to-float.rs index 3f8b8f49cb306..2af7a3cf24519 100644 --- a/src/test/ui/typeck/typeck-cast-pointer-to-float.rs +++ b/src/test/ui/typeck/typeck-cast-pointer-to-float.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x : i16 = 22; ((&x) as *const i16) as f32; diff --git a/src/test/ui/typeck/typeck-cast-pointer-to-float.stderr b/src/test/ui/typeck/typeck-cast-pointer-to-float.stderr index 437675ccb060e..81d968454be7b 100644 --- a/src/test/ui/typeck/typeck-cast-pointer-to-float.stderr +++ b/src/test/ui/typeck/typeck-cast-pointer-to-float.stderr @@ -1,5 +1,5 @@ error[E0606]: casting `*const i16` as `f32` is invalid - --> $DIR/typeck-cast-pointer-to-float.rs:13:5 + --> $DIR/typeck-cast-pointer-to-float.rs:3:5 | LL | ((&x) as *const i16) as f32; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/typeck/typeck-default-trait-impl-assoc-type.rs b/src/test/ui/typeck/typeck-default-trait-impl-assoc-type.rs index f8342c333a363..d648353938674 100644 --- a/src/test/ui/typeck/typeck-default-trait-impl-assoc-type.rs +++ b/src/test/ui/typeck/typeck-default-trait-impl-assoc-type.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we do not consider associated types to be sendable without // some applicable trait bound (and we don't ICE). diff --git a/src/test/ui/typeck/typeck-default-trait-impl-assoc-type.stderr b/src/test/ui/typeck/typeck-default-trait-impl-assoc-type.stderr index ad47fcdb042ca..3f7e4a674e65a 100644 --- a/src/test/ui/typeck/typeck-default-trait-impl-assoc-type.stderr +++ b/src/test/ui/typeck/typeck-default-trait-impl-assoc-type.stderr @@ -1,5 +1,5 @@ error[E0277]: `::AssocType` cannot be sent between threads safely - --> $DIR/typeck-default-trait-impl-assoc-type.rs:19:5 + --> $DIR/typeck-default-trait-impl-assoc-type.rs:9:5 | LL | is_send::(); //~ ERROR E0277 | ^^^^^^^^^^^^^^^^^^^^^^^ `::AssocType` cannot be sent between threads safely @@ -7,7 +7,7 @@ LL | is_send::(); //~ ERROR E0277 = help: the trait `std::marker::Send` is not implemented for `::AssocType` = help: consider adding a `where ::AssocType: std::marker::Send` bound note: required by `is_send` - --> $DIR/typeck-default-trait-impl-assoc-type.rs:22:1 + --> $DIR/typeck-default-trait-impl-assoc-type.rs:12:1 | LL | fn is_send() { | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/typeck/typeck-default-trait-impl-constituent-types-2.rs b/src/test/ui/typeck/typeck-default-trait-impl-constituent-types-2.rs index 6e7c9afb6749a..6c170fb5bae7d 100644 --- a/src/test/ui/typeck/typeck-default-trait-impl-constituent-types-2.rs +++ b/src/test/ui/typeck/typeck-default-trait-impl-constituent-types-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] auto trait MyTrait {} diff --git a/src/test/ui/typeck/typeck-default-trait-impl-constituent-types-2.stderr b/src/test/ui/typeck/typeck-default-trait-impl-constituent-types-2.stderr index a52628e233cba..db1d7d8c0b74b 100644 --- a/src/test/ui/typeck/typeck-default-trait-impl-constituent-types-2.stderr +++ b/src/test/ui/typeck/typeck-default-trait-impl-constituent-types-2.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `MyS2: MyTrait` is not satisfied in `(MyS2, MyS)` - --> $DIR/typeck-default-trait-impl-constituent-types-2.rs:26:5 + --> $DIR/typeck-default-trait-impl-constituent-types-2.rs:16:5 | LL | is_mytrait::<(MyS2, MyS)>(); | ^^^^^^^^^^^^^^^^^^^^^^^^^ within `(MyS2, MyS)`, the trait `MyTrait` is not implemented for `MyS2` @@ -8,7 +8,7 @@ LL | is_mytrait::<(MyS2, MyS)>(); = note: required because it appears within the type `(MyS2, MyS)` note: required by `is_mytrait` - --> $DIR/typeck-default-trait-impl-constituent-types-2.rs:21:1 + --> $DIR/typeck-default-trait-impl-constituent-types-2.rs:11:1 | LL | fn is_mytrait() {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/typeck/typeck-default-trait-impl-constituent-types.rs b/src/test/ui/typeck/typeck-default-trait-impl-constituent-types.rs index 4660ecf4fb4b4..d72f676121875 100644 --- a/src/test/ui/typeck/typeck-default-trait-impl-constituent-types.rs +++ b/src/test/ui/typeck/typeck-default-trait-impl-constituent-types.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] auto trait MyTrait {} diff --git a/src/test/ui/typeck/typeck-default-trait-impl-constituent-types.stderr b/src/test/ui/typeck/typeck-default-trait-impl-constituent-types.stderr index 2e382dd05cbc3..0f90518964340 100644 --- a/src/test/ui/typeck/typeck-default-trait-impl-constituent-types.stderr +++ b/src/test/ui/typeck/typeck-default-trait-impl-constituent-types.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `MyS2: MyTrait` is not satisfied - --> $DIR/typeck-default-trait-impl-constituent-types.rs:30:5 + --> $DIR/typeck-default-trait-impl-constituent-types.rs:20:5 | LL | is_mytrait::(); | ^^^^^^^^^^^^^^^^^^ the trait `MyTrait` is not implemented for `MyS2` @@ -7,7 +7,7 @@ LL | is_mytrait::(); = help: the following implementations were found: note: required by `is_mytrait` - --> $DIR/typeck-default-trait-impl-constituent-types.rs:25:1 + --> $DIR/typeck-default-trait-impl-constituent-types.rs:15:1 | LL | fn is_mytrait() {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/typeck/typeck-default-trait-impl-cross-crate-coherence.rs b/src/test/ui/typeck/typeck-default-trait-impl-cross-crate-coherence.rs index b918b0dde47f4..212e165151d81 100644 --- a/src/test/ui/typeck/typeck-default-trait-impl-cross-crate-coherence.rs +++ b/src/test/ui/typeck/typeck-default-trait-impl-cross-crate-coherence.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:tdticc_coherence_lib.rs // Test that we do not consider associated types to be sendable without diff --git a/src/test/ui/typeck/typeck-default-trait-impl-cross-crate-coherence.stderr b/src/test/ui/typeck/typeck-default-trait-impl-cross-crate-coherence.stderr index 6efb7f39f3b2f..b8b743d3f4072 100644 --- a/src/test/ui/typeck/typeck-default-trait-impl-cross-crate-coherence.stderr +++ b/src/test/ui/typeck/typeck-default-trait-impl-cross-crate-coherence.stderr @@ -1,5 +1,5 @@ error[E0117]: only traits defined in the current crate can be implemented for arbitrary types - --> $DIR/typeck-default-trait-impl-cross-crate-coherence.rs:23:1 + --> $DIR/typeck-default-trait-impl-cross-crate-coherence.rs:13:1 | LL | impl DefaultedTrait for (A,) { } //~ ERROR E0117 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate @@ -8,7 +8,7 @@ LL | impl DefaultedTrait for (A,) { } //~ ERROR E0117 = note: define and implement a trait or new type instead error[E0117]: only traits defined in the current crate can be implemented for arbitrary types - --> $DIR/typeck-default-trait-impl-cross-crate-coherence.rs:26:1 + --> $DIR/typeck-default-trait-impl-cross-crate-coherence.rs:16:1 | LL | impl !DefaultedTrait for (B,) { } //~ ERROR E0117 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate @@ -17,13 +17,13 @@ LL | impl !DefaultedTrait for (B,) { } //~ ERROR E0117 = note: define and implement a trait or new type instead error[E0321]: cross-crate traits with a default impl, like `lib::DefaultedTrait`, can only be implemented for a struct/enum type defined in the current crate - --> $DIR/typeck-default-trait-impl-cross-crate-coherence.rs:30:1 + --> $DIR/typeck-default-trait-impl-cross-crate-coherence.rs:20:1 | LL | impl DefaultedTrait for Box { } //~ ERROR E0321 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't implement cross-crate trait for type in another crate error[E0117]: only traits defined in the current crate can be implemented for arbitrary types - --> $DIR/typeck-default-trait-impl-cross-crate-coherence.rs:31:1 + --> $DIR/typeck-default-trait-impl-cross-crate-coherence.rs:21:1 | LL | impl DefaultedTrait for lib::Something { } //~ ERROR E0117 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate diff --git a/src/test/ui/typeck/typeck-default-trait-impl-negation-send.rs b/src/test/ui/typeck/typeck-default-trait-impl-negation-send.rs index 65438e5df8e08..617d0f3b565a8 100644 --- a/src/test/ui/typeck/typeck-default-trait-impl-negation-send.rs +++ b/src/test/ui/typeck/typeck-default-trait-impl-negation-send.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] struct MySendable { diff --git a/src/test/ui/typeck/typeck-default-trait-impl-negation-send.stderr b/src/test/ui/typeck/typeck-default-trait-impl-negation-send.stderr index 8dc7df90355f6..8442f47e82c48 100644 --- a/src/test/ui/typeck/typeck-default-trait-impl-negation-send.stderr +++ b/src/test/ui/typeck/typeck-default-trait-impl-negation-send.stderr @@ -1,12 +1,12 @@ error[E0277]: `MyNotSendable` cannot be sent between threads safely - --> $DIR/typeck-default-trait-impl-negation-send.rs:29:5 + --> $DIR/typeck-default-trait-impl-negation-send.rs:19:5 | LL | is_send::(); | ^^^^^^^^^^^^^^^^^^^^^^^^ `MyNotSendable` cannot be sent between threads safely | = help: the trait `std::marker::Send` is not implemented for `MyNotSendable` note: required by `is_send` - --> $DIR/typeck-default-trait-impl-negation-send.rs:25:1 + --> $DIR/typeck-default-trait-impl-negation-send.rs:15:1 | LL | fn is_send() {} | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/typeck/typeck-default-trait-impl-negation-sync.rs b/src/test/ui/typeck/typeck-default-trait-impl-negation-sync.rs index c829ba3dcc357..f31dac27caec4 100644 --- a/src/test/ui/typeck/typeck-default-trait-impl-negation-sync.rs +++ b/src/test/ui/typeck/typeck-default-trait-impl-negation-sync.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength #![feature(optin_builtin_traits)] diff --git a/src/test/ui/typeck/typeck-default-trait-impl-negation-sync.stderr b/src/test/ui/typeck/typeck-default-trait-impl-negation-sync.stderr index b0fe2c599be41..5330c04074b2f 100644 --- a/src/test/ui/typeck/typeck-default-trait-impl-negation-sync.stderr +++ b/src/test/ui/typeck/typeck-default-trait-impl-negation-sync.stderr @@ -1,18 +1,18 @@ error[E0277]: `MyNotSync` cannot be shared between threads safely - --> $DIR/typeck-default-trait-impl-negation-sync.rs:45:5 + --> $DIR/typeck-default-trait-impl-negation-sync.rs:35:5 | LL | is_sync::(); | ^^^^^^^^^^^^^^^^^^^^ `MyNotSync` cannot be shared between threads safely | = help: the trait `std::marker::Sync` is not implemented for `MyNotSync` note: required by `is_sync` - --> $DIR/typeck-default-trait-impl-negation-sync.rs:41:1 + --> $DIR/typeck-default-trait-impl-negation-sync.rs:31:1 | LL | fn is_sync() {} | ^^^^^^^^^^^^^^^^^^^^^ error[E0277]: `std::cell::UnsafeCell` cannot be shared between threads safely - --> $DIR/typeck-default-trait-impl-negation-sync.rs:48:5 + --> $DIR/typeck-default-trait-impl-negation-sync.rs:38:5 | LL | is_sync::(); | ^^^^^^^^^^^^^^^^^^^^^^^^ `std::cell::UnsafeCell` cannot be shared between threads safely @@ -20,13 +20,13 @@ LL | is_sync::(); = help: within `MyTypeWUnsafe`, the trait `std::marker::Sync` is not implemented for `std::cell::UnsafeCell` = note: required because it appears within the type `MyTypeWUnsafe` note: required by `is_sync` - --> $DIR/typeck-default-trait-impl-negation-sync.rs:41:1 + --> $DIR/typeck-default-trait-impl-negation-sync.rs:31:1 | LL | fn is_sync() {} | ^^^^^^^^^^^^^^^^^^^^^ error[E0277]: `Managed` cannot be shared between threads safely - --> $DIR/typeck-default-trait-impl-negation-sync.rs:51:5 + --> $DIR/typeck-default-trait-impl-negation-sync.rs:41:5 | LL | is_sync::(); | ^^^^^^^^^^^^^^^^^^^^^^^^ `Managed` cannot be shared between threads safely @@ -34,7 +34,7 @@ LL | is_sync::(); = help: within `MyTypeManaged`, the trait `std::marker::Sync` is not implemented for `Managed` = note: required because it appears within the type `MyTypeManaged` note: required by `is_sync` - --> $DIR/typeck-default-trait-impl-negation-sync.rs:41:1 + --> $DIR/typeck-default-trait-impl-negation-sync.rs:31:1 | LL | fn is_sync() {} | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/typeck/typeck-default-trait-impl-negation.rs b/src/test/ui/typeck/typeck-default-trait-impl-negation.rs index b28cdd8aa2450..0b6e13be6e108 100644 --- a/src/test/ui/typeck/typeck-default-trait-impl-negation.rs +++ b/src/test/ui/typeck/typeck-default-trait-impl-negation.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] auto trait MyTrait {} diff --git a/src/test/ui/typeck/typeck-default-trait-impl-negation.stderr b/src/test/ui/typeck/typeck-default-trait-impl-negation.stderr index 4427955c4b2c8..751083d0358b6 100644 --- a/src/test/ui/typeck/typeck-default-trait-impl-negation.stderr +++ b/src/test/ui/typeck/typeck-default-trait-impl-negation.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `ThisImplsUnsafeTrait: MyTrait` is not satisfied - --> $DIR/typeck-default-trait-impl-negation.rs:31:5 + --> $DIR/typeck-default-trait-impl-negation.rs:21:5 | LL | is_my_trait::(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `MyTrait` is not implemented for `ThisImplsUnsafeTrait` @@ -7,13 +7,13 @@ LL | is_my_trait::(); = help: the following implementations were found: note: required by `is_my_trait` - --> $DIR/typeck-default-trait-impl-negation.rs:26:1 + --> $DIR/typeck-default-trait-impl-negation.rs:16:1 | LL | fn is_my_trait() {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `ThisImplsTrait: MyUnsafeTrait` is not satisfied - --> $DIR/typeck-default-trait-impl-negation.rs:34:5 + --> $DIR/typeck-default-trait-impl-negation.rs:24:5 | LL | is_my_unsafe_trait::(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `MyUnsafeTrait` is not implemented for `ThisImplsTrait` @@ -21,7 +21,7 @@ LL | is_my_unsafe_trait::(); = help: the following implementations were found: note: required by `is_my_unsafe_trait` - --> $DIR/typeck-default-trait-impl-negation.rs:27:1 + --> $DIR/typeck-default-trait-impl-negation.rs:17:1 | LL | fn is_my_unsafe_trait() {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/typeck/typeck-default-trait-impl-precedence.rs b/src/test/ui/typeck/typeck-default-trait-impl-precedence.rs index d63d70bad2204..9b228f706465b 100644 --- a/src/test/ui/typeck/typeck-default-trait-impl-precedence.rs +++ b/src/test/ui/typeck/typeck-default-trait-impl-precedence.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that declaring that `&T` is `Defaulted` if `T:Signed` implies // that other `&T` is NOT `Defaulted` if `T:Signed` does not hold. In // other words, the auto impl only applies if there are no existing diff --git a/src/test/ui/typeck/typeck-default-trait-impl-precedence.stderr b/src/test/ui/typeck/typeck-default-trait-impl-precedence.stderr index 0ab5eaaa34f78..d45cbb27a5f16 100644 --- a/src/test/ui/typeck/typeck-default-trait-impl-precedence.stderr +++ b/src/test/ui/typeck/typeck-default-trait-impl-precedence.stderr @@ -1,12 +1,12 @@ error[E0277]: the trait bound `u32: Signed` is not satisfied - --> $DIR/typeck-default-trait-impl-precedence.rs:28:5 + --> $DIR/typeck-default-trait-impl-precedence.rs:18:5 | LL | is_defaulted::<&'static u32>(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Signed` is not implemented for `u32` | = note: required because of the requirements on the impl of `Defaulted` for `&'static u32` note: required by `is_defaulted` - --> $DIR/typeck-default-trait-impl-precedence.rs:21:1 + --> $DIR/typeck-default-trait-impl-precedence.rs:11:1 | LL | fn is_defaulted() { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/typeck/typeck-default-trait-impl-send-param.rs b/src/test/ui/typeck/typeck-default-trait-impl-send-param.rs index 0c548b3bd9909..7948cd101ffa9 100644 --- a/src/test/ui/typeck/typeck-default-trait-impl-send-param.rs +++ b/src/test/ui/typeck/typeck-default-trait-impl-send-param.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we do not consider parameter types to be sendable without // an explicit trait bound. diff --git a/src/test/ui/typeck/typeck-default-trait-impl-send-param.stderr b/src/test/ui/typeck/typeck-default-trait-impl-send-param.stderr index 82f31176f3e50..736e1b8da7f3c 100644 --- a/src/test/ui/typeck/typeck-default-trait-impl-send-param.stderr +++ b/src/test/ui/typeck/typeck-default-trait-impl-send-param.stderr @@ -1,5 +1,5 @@ error[E0277]: `T` cannot be sent between threads safely - --> $DIR/typeck-default-trait-impl-send-param.rs:15:5 + --> $DIR/typeck-default-trait-impl-send-param.rs:5:5 | LL | is_send::() //~ ERROR E0277 | ^^^^^^^^^^^^ `T` cannot be sent between threads safely @@ -7,7 +7,7 @@ LL | is_send::() //~ ERROR E0277 = help: the trait `std::marker::Send` is not implemented for `T` = help: consider adding a `where T: std::marker::Send` bound note: required by `is_send` - --> $DIR/typeck-default-trait-impl-send-param.rs:18:1 + --> $DIR/typeck-default-trait-impl-send-param.rs:8:1 | LL | fn is_send() { | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/typeck/typeck-negative-impls-builtin.rs b/src/test/ui/typeck/typeck-negative-impls-builtin.rs index d6d8fb6235d38..7bdd1035a1bf2 100644 --- a/src/test/ui/typeck/typeck-negative-impls-builtin.rs +++ b/src/test/ui/typeck/typeck-negative-impls-builtin.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] struct TestType; diff --git a/src/test/ui/typeck/typeck-negative-impls-builtin.stderr b/src/test/ui/typeck/typeck-negative-impls-builtin.stderr index 6ae323aedfeb2..4e3d054ff6fad 100644 --- a/src/test/ui/typeck/typeck-negative-impls-builtin.stderr +++ b/src/test/ui/typeck/typeck-negative-impls-builtin.stderr @@ -1,5 +1,5 @@ error[E0192]: negative impls are only allowed for auto traits (e.g., `Send` and `Sync`) - --> $DIR/typeck-negative-impls-builtin.rs:19:1 + --> $DIR/typeck-negative-impls-builtin.rs:9:1 | LL | impl !TestTrait for TestType {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/typeck/typeck-unsafe-always-share.rs b/src/test/ui/typeck/typeck-unsafe-always-share.rs index fcfc8574b2135..7d1ff732983fe 100644 --- a/src/test/ui/typeck/typeck-unsafe-always-share.rs +++ b/src/test/ui/typeck/typeck-unsafe-always-share.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Verify that UnsafeCell is *always* !Sync regardless if `T` is sync. #![feature(optin_builtin_traits)] diff --git a/src/test/ui/typeck/typeck-unsafe-always-share.stderr b/src/test/ui/typeck/typeck-unsafe-always-share.stderr index 57c4bdf0ad2dc..ff351afdcaedf 100644 --- a/src/test/ui/typeck/typeck-unsafe-always-share.stderr +++ b/src/test/ui/typeck/typeck-unsafe-always-share.stderr @@ -1,31 +1,31 @@ error[E0277]: `std::cell::UnsafeCell>` cannot be shared between threads safely - --> $DIR/typeck-unsafe-always-share.rs:29:5 + --> $DIR/typeck-unsafe-always-share.rs:19:5 | LL | test(us); | ^^^^ `std::cell::UnsafeCell>` cannot be shared between threads safely | = help: the trait `std::marker::Sync` is not implemented for `std::cell::UnsafeCell>` note: required by `test` - --> $DIR/typeck-unsafe-always-share.rs:25:1 + --> $DIR/typeck-unsafe-always-share.rs:15:1 | LL | fn test(s: T) {} | ^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: `std::cell::UnsafeCell` cannot be shared between threads safely - --> $DIR/typeck-unsafe-always-share.rs:33:5 + --> $DIR/typeck-unsafe-always-share.rs:23:5 | LL | test(uns); | ^^^^ `std::cell::UnsafeCell` cannot be shared between threads safely | = help: the trait `std::marker::Sync` is not implemented for `std::cell::UnsafeCell` note: required by `test` - --> $DIR/typeck-unsafe-always-share.rs:25:1 + --> $DIR/typeck-unsafe-always-share.rs:15:1 | LL | fn test(s: T) {} | ^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: `std::cell::UnsafeCell` cannot be shared between threads safely - --> $DIR/typeck-unsafe-always-share.rs:37:5 + --> $DIR/typeck-unsafe-always-share.rs:27:5 | LL | test(ms); | ^^^^ `std::cell::UnsafeCell` cannot be shared between threads safely @@ -33,20 +33,20 @@ LL | test(ms); = help: within `MySync`, the trait `std::marker::Sync` is not implemented for `std::cell::UnsafeCell` = note: required because it appears within the type `MySync` note: required by `test` - --> $DIR/typeck-unsafe-always-share.rs:25:1 + --> $DIR/typeck-unsafe-always-share.rs:15:1 | LL | fn test(s: T) {} | ^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: `NoSync` cannot be shared between threads safely - --> $DIR/typeck-unsafe-always-share.rs:40:5 + --> $DIR/typeck-unsafe-always-share.rs:30:5 | LL | test(NoSync); | ^^^^ `NoSync` cannot be shared between threads safely | = help: the trait `std::marker::Sync` is not implemented for `NoSync` note: required by `test` - --> $DIR/typeck-unsafe-always-share.rs:25:1 + --> $DIR/typeck-unsafe-always-share.rs:15:1 | LL | fn test(s: T) {} | ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/typeck/typeck_type_placeholder_item.rs b/src/test/ui/typeck/typeck_type_placeholder_item.rs index d4f3cdfd8b7e2..46a5b8580dc5b 100644 --- a/src/test/ui/typeck/typeck_type_placeholder_item.rs +++ b/src/test/ui/typeck/typeck_type_placeholder_item.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test checks that it is not possible to enable global type // inference by using the `_` type placeholder. diff --git a/src/test/ui/typeck/typeck_type_placeholder_item.stderr b/src/test/ui/typeck/typeck_type_placeholder_item.stderr index 3f814085955f7..b486d842213f8 100644 --- a/src/test/ui/typeck/typeck_type_placeholder_item.stderr +++ b/src/test/ui/typeck/typeck_type_placeholder_item.stderr @@ -1,203 +1,203 @@ error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:14:14 + --> $DIR/typeck_type_placeholder_item.rs:4:14 | LL | fn test() -> _ { 5 } | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:17:16 + --> $DIR/typeck_type_placeholder_item.rs:7:16 | LL | fn test2() -> (_, _) { (5, 5) } | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:17:19 + --> $DIR/typeck_type_placeholder_item.rs:7:19 | LL | fn test2() -> (_, _) { (5, 5) } | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:21:15 + --> $DIR/typeck_type_placeholder_item.rs:11:15 | LL | static TEST3: _ = "test"; | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:24:15 + --> $DIR/typeck_type_placeholder_item.rs:14:15 | LL | static TEST4: _ = 145; | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:27:16 + --> $DIR/typeck_type_placeholder_item.rs:17:16 | LL | static TEST5: (_, _) = (1, 2); | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:27:19 + --> $DIR/typeck_type_placeholder_item.rs:17:19 | LL | static TEST5: (_, _) = (1, 2); | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:31:13 + --> $DIR/typeck_type_placeholder_item.rs:21:13 | LL | fn test6(_: _) { } | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:34:13 + --> $DIR/typeck_type_placeholder_item.rs:24:13 | LL | fn test7(x: _) { let _x: usize = x; } | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:37:22 + --> $DIR/typeck_type_placeholder_item.rs:27:22 | LL | fn test8(_f: fn() -> _) { } | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:59:8 + --> $DIR/typeck_type_placeholder_item.rs:49:8 | LL | a: _, | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:61:9 + --> $DIR/typeck_type_placeholder_item.rs:51:9 | LL | b: (_, _), | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:61:12 + --> $DIR/typeck_type_placeholder_item.rs:51:12 | LL | b: (_, _), | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:67:21 + --> $DIR/typeck_type_placeholder_item.rs:57:21 | LL | fn fn_test() -> _ { 5 } | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:70:23 + --> $DIR/typeck_type_placeholder_item.rs:60:23 | LL | fn fn_test2() -> (_, _) { (5, 5) } | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:70:26 + --> $DIR/typeck_type_placeholder_item.rs:60:26 | LL | fn fn_test2() -> (_, _) { (5, 5) } | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:74:22 + --> $DIR/typeck_type_placeholder_item.rs:64:22 | LL | static FN_TEST3: _ = "test"; | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:77:22 + --> $DIR/typeck_type_placeholder_item.rs:67:22 | LL | static FN_TEST4: _ = 145; | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:80:23 + --> $DIR/typeck_type_placeholder_item.rs:70:23 | LL | static FN_TEST5: (_, _) = (1, 2); | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:80:26 + --> $DIR/typeck_type_placeholder_item.rs:70:26 | LL | static FN_TEST5: (_, _) = (1, 2); | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:84:20 + --> $DIR/typeck_type_placeholder_item.rs:74:20 | LL | fn fn_test6(_: _) { } | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:87:20 + --> $DIR/typeck_type_placeholder_item.rs:77:20 | LL | fn fn_test7(x: _) { let _x: usize = x; } | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:90:29 + --> $DIR/typeck_type_placeholder_item.rs:80:29 | LL | fn fn_test8(_f: fn() -> _) { } | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:112:12 + --> $DIR/typeck_type_placeholder_item.rs:102:12 | LL | a: _, | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:114:13 + --> $DIR/typeck_type_placeholder_item.rs:104:13 | LL | b: (_, _), | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:114:16 + --> $DIR/typeck_type_placeholder_item.rs:104:16 | LL | b: (_, _), | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:43:24 + --> $DIR/typeck_type_placeholder_item.rs:33:24 | LL | fn test9(&self) -> _ { () } | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:46:27 + --> $DIR/typeck_type_placeholder_item.rs:36:27 | LL | fn test10(&self, _x : _) { } | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:51:24 + --> $DIR/typeck_type_placeholder_item.rs:41:24 | LL | fn clone(&self) -> _ { Test9 } | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:54:37 + --> $DIR/typeck_type_placeholder_item.rs:44:37 | LL | fn clone_from(&mut self, other: _) { *self = Test9; } | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:96:31 + --> $DIR/typeck_type_placeholder_item.rs:86:31 | LL | fn fn_test9(&self) -> _ { () } | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:99:34 + --> $DIR/typeck_type_placeholder_item.rs:89:34 | LL | fn fn_test10(&self, _x : _) { } | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:104:28 + --> $DIR/typeck_type_placeholder_item.rs:94:28 | LL | fn clone(&self) -> _ { FnTest9 } | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/typeck_type_placeholder_item.rs:107:41 + --> $DIR/typeck_type_placeholder_item.rs:97:41 | LL | fn clone_from(&mut self, other: _) { *self = FnTest9; } | ^ not allowed in type signatures diff --git a/src/test/ui/typeck/typeck_type_placeholder_lifetime_1.rs b/src/test/ui/typeck/typeck_type_placeholder_lifetime_1.rs index 49774ab173a8a..a4538766c1ab6 100644 --- a/src/test/ui/typeck/typeck_type_placeholder_lifetime_1.rs +++ b/src/test/ui/typeck/typeck_type_placeholder_lifetime_1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test checks that the `_` type placeholder does not react // badly if put as a lifetime parameter. diff --git a/src/test/ui/typeck/typeck_type_placeholder_lifetime_1.stderr b/src/test/ui/typeck/typeck_type_placeholder_lifetime_1.stderr index a49839b731070..dbb9afa9118bb 100644 --- a/src/test/ui/typeck/typeck_type_placeholder_lifetime_1.stderr +++ b/src/test/ui/typeck/typeck_type_placeholder_lifetime_1.stderr @@ -1,5 +1,5 @@ error[E0244]: wrong number of type arguments: expected 1, found 2 - --> $DIR/typeck_type_placeholder_lifetime_1.rs:19:19 + --> $DIR/typeck_type_placeholder_lifetime_1.rs:9:19 | LL | let c: Foo<_, _> = Foo { r: &5 }; | ^ unexpected type argument diff --git a/src/test/ui/typeck/typeck_type_placeholder_lifetime_2.rs b/src/test/ui/typeck/typeck_type_placeholder_lifetime_2.rs index 40617613ed7c6..0d65b095c540a 100644 --- a/src/test/ui/typeck/typeck_type_placeholder_lifetime_2.rs +++ b/src/test/ui/typeck/typeck_type_placeholder_lifetime_2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test checks that the `_` type placeholder does not react // badly if put as a lifetime parameter. diff --git a/src/test/ui/typeck/typeck_type_placeholder_lifetime_2.stderr b/src/test/ui/typeck/typeck_type_placeholder_lifetime_2.stderr index cafb6f507a0e9..cb54d599aad80 100644 --- a/src/test/ui/typeck/typeck_type_placeholder_lifetime_2.stderr +++ b/src/test/ui/typeck/typeck_type_placeholder_lifetime_2.stderr @@ -1,5 +1,5 @@ error[E0244]: wrong number of type arguments: expected 1, found 2 - --> $DIR/typeck_type_placeholder_lifetime_2.rs:19:19 + --> $DIR/typeck_type_placeholder_lifetime_2.rs:9:19 | LL | let c: Foo<_, usize> = Foo { r: &5 }; | ^^^^^ unexpected type argument diff --git a/src/test/ui/typeck/typeck_type_placeholder_mismatch.rs b/src/test/ui/typeck/typeck_type_placeholder_mismatch.rs index 91e3c38322e47..ec978e45b8251 100644 --- a/src/test/ui/typeck/typeck_type_placeholder_mismatch.rs +++ b/src/test/ui/typeck/typeck_type_placeholder_mismatch.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test checks that genuine type errors with partial // type hints are understandable. diff --git a/src/test/ui/typeck/typeck_type_placeholder_mismatch.stderr b/src/test/ui/typeck/typeck_type_placeholder_mismatch.stderr index 6a7623538194c..89114874824d6 100644 --- a/src/test/ui/typeck/typeck_type_placeholder_mismatch.stderr +++ b/src/test/ui/typeck/typeck_type_placeholder_mismatch.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/typeck_type_placeholder_mismatch.rs:23:21 + --> $DIR/typeck_type_placeholder_mismatch.rs:13:21 | LL | let x: Foo<_> = Bar::(PhantomData); | ^^^^^^^^^^^^^^^^^^^^^^^^^ expected struct `Foo`, found struct `Bar` @@ -8,7 +8,7 @@ LL | let x: Foo<_> = Bar::(PhantomData); found type `Bar` error[E0308]: mismatched types - --> $DIR/typeck_type_placeholder_mismatch.rs:32:21 + --> $DIR/typeck_type_placeholder_mismatch.rs:22:21 | LL | let x: Foo<_> = Bar::(PhantomData); | ^^^^^^^^^^^^^^^^^^^^^^^^^ expected struct `Foo`, found struct `Bar` diff --git a/src/test/ui/ufcs/ufcs-explicit-self-bad.rs b/src/test/ui/ufcs/ufcs-explicit-self-bad.rs index a0d1f2dc3312e..c13f07c47dce7 100644 --- a/src/test/ui/ufcs/ufcs-explicit-self-bad.rs +++ b/src/test/ui/ufcs/ufcs-explicit-self-bad.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] struct Foo { diff --git a/src/test/ui/ufcs/ufcs-explicit-self-bad.stderr b/src/test/ui/ufcs/ufcs-explicit-self-bad.stderr index fce74605cad38..2b33ca493d82f 100644 --- a/src/test/ui/ufcs/ufcs-explicit-self-bad.stderr +++ b/src/test/ui/ufcs/ufcs-explicit-self-bad.stderr @@ -1,5 +1,5 @@ error[E0307]: invalid `self` type: isize - --> $DIR/ufcs-explicit-self-bad.rs:18:18 + --> $DIR/ufcs-explicit-self-bad.rs:8:18 | LL | fn foo(self: isize, x: isize) -> isize { | ^^^^^ @@ -8,7 +8,7 @@ LL | fn foo(self: isize, x: isize) -> isize { = help: consider changing to `self`, `&self`, `&mut self`, or `self: Box` error[E0307]: invalid `self` type: Bar - --> $DIR/ufcs-explicit-self-bad.rs:29:18 + --> $DIR/ufcs-explicit-self-bad.rs:19:18 | LL | fn foo(self: Bar, x: isize) -> isize { | ^^^^^^^^^^ @@ -17,7 +17,7 @@ LL | fn foo(self: Bar, x: isize) -> isize { = help: consider changing to `self`, `&self`, `&mut self`, or `self: Box` error[E0307]: invalid `self` type: &Bar - --> $DIR/ufcs-explicit-self-bad.rs:33:18 + --> $DIR/ufcs-explicit-self-bad.rs:23:18 | LL | fn bar(self: &Bar, x: isize) -> isize { | ^^^^^^^^^^^ @@ -26,77 +26,77 @@ LL | fn bar(self: &Bar, x: isize) -> isize { = help: consider changing to `self`, `&self`, `&mut self`, or `self: Box` error[E0308]: mismatched method receiver - --> $DIR/ufcs-explicit-self-bad.rs:47:21 + --> $DIR/ufcs-explicit-self-bad.rs:37:21 | LL | fn dummy2(self: &Bar) {} //~ ERROR mismatched method receiver | ^^^^^^^ lifetime mismatch | = note: expected type `&'a Bar` found type `&Bar` -note: the anonymous lifetime #1 defined on the method body at 47:5... - --> $DIR/ufcs-explicit-self-bad.rs:47:5 +note: the anonymous lifetime #1 defined on the method body at 37:5... + --> $DIR/ufcs-explicit-self-bad.rs:37:5 | LL | fn dummy2(self: &Bar) {} //~ ERROR mismatched method receiver | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ -note: ...does not necessarily outlive the lifetime 'a as defined on the impl at 45:6 - --> $DIR/ufcs-explicit-self-bad.rs:45:6 +note: ...does not necessarily outlive the lifetime 'a as defined on the impl at 35:6 + --> $DIR/ufcs-explicit-self-bad.rs:35:6 | LL | impl<'a, T> SomeTrait for &'a Bar { | ^^ error[E0308]: mismatched method receiver - --> $DIR/ufcs-explicit-self-bad.rs:47:21 + --> $DIR/ufcs-explicit-self-bad.rs:37:21 | LL | fn dummy2(self: &Bar) {} //~ ERROR mismatched method receiver | ^^^^^^^ lifetime mismatch | = note: expected type `&'a Bar` found type `&Bar` -note: the lifetime 'a as defined on the impl at 45:6... - --> $DIR/ufcs-explicit-self-bad.rs:45:6 +note: the lifetime 'a as defined on the impl at 35:6... + --> $DIR/ufcs-explicit-self-bad.rs:35:6 | LL | impl<'a, T> SomeTrait for &'a Bar { | ^^ -note: ...does not necessarily outlive the anonymous lifetime #1 defined on the method body at 47:5 - --> $DIR/ufcs-explicit-self-bad.rs:47:5 +note: ...does not necessarily outlive the anonymous lifetime #1 defined on the method body at 37:5 + --> $DIR/ufcs-explicit-self-bad.rs:37:5 | LL | fn dummy2(self: &Bar) {} //~ ERROR mismatched method receiver | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0308]: mismatched method receiver - --> $DIR/ufcs-explicit-self-bad.rs:49:21 + --> $DIR/ufcs-explicit-self-bad.rs:39:21 | LL | fn dummy3(self: &&Bar) {} | ^^^^^^^^ lifetime mismatch | = note: expected type `&'a Bar` found type `&Bar` -note: the anonymous lifetime #2 defined on the method body at 49:5... - --> $DIR/ufcs-explicit-self-bad.rs:49:5 +note: the anonymous lifetime #2 defined on the method body at 39:5... + --> $DIR/ufcs-explicit-self-bad.rs:39:5 | LL | fn dummy3(self: &&Bar) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -note: ...does not necessarily outlive the lifetime 'a as defined on the impl at 45:6 - --> $DIR/ufcs-explicit-self-bad.rs:45:6 +note: ...does not necessarily outlive the lifetime 'a as defined on the impl at 35:6 + --> $DIR/ufcs-explicit-self-bad.rs:35:6 | LL | impl<'a, T> SomeTrait for &'a Bar { | ^^ error[E0308]: mismatched method receiver - --> $DIR/ufcs-explicit-self-bad.rs:49:21 + --> $DIR/ufcs-explicit-self-bad.rs:39:21 | LL | fn dummy3(self: &&Bar) {} | ^^^^^^^^ lifetime mismatch | = note: expected type `&'a Bar` found type `&Bar` -note: the lifetime 'a as defined on the impl at 45:6... - --> $DIR/ufcs-explicit-self-bad.rs:45:6 +note: the lifetime 'a as defined on the impl at 35:6... + --> $DIR/ufcs-explicit-self-bad.rs:35:6 | LL | impl<'a, T> SomeTrait for &'a Bar { | ^^ -note: ...does not necessarily outlive the anonymous lifetime #2 defined on the method body at 49:5 - --> $DIR/ufcs-explicit-self-bad.rs:49:5 +note: ...does not necessarily outlive the anonymous lifetime #2 defined on the method body at 39:5 + --> $DIR/ufcs-explicit-self-bad.rs:39:5 | LL | fn dummy3(self: &&Bar) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/ufcs/ufcs-partially-resolved.rs b/src/test/ui/ufcs/ufcs-partially-resolved.rs index f7120ddb11402..ba2e0c30a065b 100644 --- a/src/test/ui/ufcs/ufcs-partially-resolved.rs +++ b/src/test/ui/ufcs/ufcs-partially-resolved.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(associated_type_defaults)] trait Tr { diff --git a/src/test/ui/ufcs/ufcs-partially-resolved.stderr b/src/test/ui/ufcs/ufcs-partially-resolved.stderr index 5de8fb158b770..582a03ab58707 100644 --- a/src/test/ui/ufcs/ufcs-partially-resolved.stderr +++ b/src/test/ui/ufcs/ufcs-partially-resolved.stderr @@ -1,161 +1,161 @@ error[E0433]: failed to resolve. Not a module `Y` - --> $DIR/ufcs-partially-resolved.rs:58:22 + --> $DIR/ufcs-partially-resolved.rs:48:22 | LL | let _: ::NN; //~ ERROR failed to resolve. Not a module `Y` | ^ Not a module `Y` error[E0433]: failed to resolve. Not a module `Y` - --> $DIR/ufcs-partially-resolved.rs:60:15 + --> $DIR/ufcs-partially-resolved.rs:50:15 | LL | ::NN; //~ ERROR failed to resolve. Not a module `Y` | ^ Not a module `Y` error[E0576]: cannot find associated type `N` in trait `Tr` - --> $DIR/ufcs-partially-resolved.rs:29:24 + --> $DIR/ufcs-partially-resolved.rs:19:24 | LL | let _: ::N; //~ ERROR cannot find associated type `N` in trait `Tr` | ^ did you mean `Y`? error[E0576]: cannot find associated type `N` in enum `E` - --> $DIR/ufcs-partially-resolved.rs:30:23 + --> $DIR/ufcs-partially-resolved.rs:20:23 | LL | let _: ::N; //~ ERROR cannot find associated type `N` in enum `E` | ^ not found in `E` error[E0576]: cannot find associated type `N` in `A` - --> $DIR/ufcs-partially-resolved.rs:31:23 + --> $DIR/ufcs-partially-resolved.rs:21:23 | LL | let _: ::N; //~ ERROR cannot find associated type `N` in `A` | ^ not found in `A` error[E0576]: cannot find method or associated constant `N` in trait `Tr` - --> $DIR/ufcs-partially-resolved.rs:32:17 + --> $DIR/ufcs-partially-resolved.rs:22:17 | LL | ::N; //~ ERROR cannot find method or associated constant `N` in trait `Tr` | ^ did you mean `Y`? error[E0576]: cannot find method or associated constant `N` in enum `E` - --> $DIR/ufcs-partially-resolved.rs:33:16 + --> $DIR/ufcs-partially-resolved.rs:23:16 | LL | ::N; //~ ERROR cannot find method or associated constant `N` in enum `E` | ^ not found in `E` error[E0576]: cannot find method or associated constant `N` in `A` - --> $DIR/ufcs-partially-resolved.rs:34:16 + --> $DIR/ufcs-partially-resolved.rs:24:16 | LL | ::N; //~ ERROR cannot find method or associated constant `N` in `A` | ^ not found in `A` error[E0575]: expected associated type, found variant `E::Y` - --> $DIR/ufcs-partially-resolved.rs:36:12 + --> $DIR/ufcs-partially-resolved.rs:26:12 | LL | let _: ::Y; //~ ERROR expected associated type, found variant `E::Y` | ^^^^^^^^^^^^ not a associated type error[E0575]: expected method or associated constant, found unit variant `E::Y` - --> $DIR/ufcs-partially-resolved.rs:38:5 + --> $DIR/ufcs-partially-resolved.rs:28:5 | LL | ::Y; //~ ERROR expected method or associated constant, found unit variant `E::Y` | ^^^^^^^^^^^^ not a method or associated constant error[E0576]: cannot find associated type `N` in trait `Tr` - --> $DIR/ufcs-partially-resolved.rs:40:24 + --> $DIR/ufcs-partially-resolved.rs:30:24 | LL | let _: ::N::NN; //~ ERROR cannot find associated type `N` in trait `Tr` | ^ did you mean `Y`? error[E0576]: cannot find associated type `N` in enum `E` - --> $DIR/ufcs-partially-resolved.rs:41:23 + --> $DIR/ufcs-partially-resolved.rs:31:23 | LL | let _: ::N::NN; //~ ERROR cannot find associated type `N` in enum `E` | ^ not found in `E` error[E0576]: cannot find associated type `N` in `A` - --> $DIR/ufcs-partially-resolved.rs:42:23 + --> $DIR/ufcs-partially-resolved.rs:32:23 | LL | let _: ::N::NN; //~ ERROR cannot find associated type `N` in `A` | ^ not found in `A` error[E0576]: cannot find associated type `N` in trait `Tr` - --> $DIR/ufcs-partially-resolved.rs:43:17 + --> $DIR/ufcs-partially-resolved.rs:33:17 | LL | ::N::NN; //~ ERROR cannot find associated type `N` in trait `Tr` | ^ did you mean `Y`? error[E0576]: cannot find associated type `N` in enum `E` - --> $DIR/ufcs-partially-resolved.rs:44:16 + --> $DIR/ufcs-partially-resolved.rs:34:16 | LL | ::N::NN; //~ ERROR cannot find associated type `N` in enum `E` | ^ not found in `E` error[E0576]: cannot find associated type `N` in `A` - --> $DIR/ufcs-partially-resolved.rs:45:16 + --> $DIR/ufcs-partially-resolved.rs:35:16 | LL | ::N::NN; //~ ERROR cannot find associated type `N` in `A` | ^ not found in `A` error[E0575]: expected associated type, found variant `E::Y` - --> $DIR/ufcs-partially-resolved.rs:47:12 + --> $DIR/ufcs-partially-resolved.rs:37:12 | LL | let _: ::Y::NN; //~ ERROR expected associated type, found variant `E::Y` | ^^^^^^^^^^^^^^^^ not a associated type error[E0575]: expected associated type, found variant `E::Y` - --> $DIR/ufcs-partially-resolved.rs:49:5 + --> $DIR/ufcs-partially-resolved.rs:39:5 | LL | ::Y::NN; //~ ERROR expected associated type, found variant `E::Y` | ^^^^^^^^^^^^^^^^ not a associated type error[E0576]: cannot find associated type `NN` in `Tr::N` - --> $DIR/ufcs-partially-resolved.rs:51:27 + --> $DIR/ufcs-partially-resolved.rs:41:27 | LL | let _: ::NN; //~ ERROR cannot find associated type `NN` in `Tr::N` | ^^ not found in `Tr::N` error[E0576]: cannot find associated type `NN` in `E::N` - --> $DIR/ufcs-partially-resolved.rs:52:26 + --> $DIR/ufcs-partially-resolved.rs:42:26 | LL | let _: ::NN; //~ ERROR cannot find associated type `NN` in `E::N` | ^^ not found in `E::N` error[E0576]: cannot find associated type `NN` in `A::N` - --> $DIR/ufcs-partially-resolved.rs:53:26 + --> $DIR/ufcs-partially-resolved.rs:43:26 | LL | let _: ::NN; //~ ERROR cannot find associated type `NN` in `A::N` | ^^ not found in `A::N` error[E0576]: cannot find method or associated constant `NN` in `Tr::N` - --> $DIR/ufcs-partially-resolved.rs:54:20 + --> $DIR/ufcs-partially-resolved.rs:44:20 | LL | ::NN; //~ ERROR cannot find method or associated constant `NN` in `Tr::N` | ^^ not found in `Tr::N` error[E0576]: cannot find method or associated constant `NN` in `E::N` - --> $DIR/ufcs-partially-resolved.rs:55:19 + --> $DIR/ufcs-partially-resolved.rs:45:19 | LL | ::NN; //~ ERROR cannot find method or associated constant `NN` in `E::N` | ^^ not found in `E::N` error[E0576]: cannot find method or associated constant `NN` in `A::N` - --> $DIR/ufcs-partially-resolved.rs:56:19 + --> $DIR/ufcs-partially-resolved.rs:46:19 | LL | ::NN; //~ ERROR cannot find method or associated constant `NN` in `A::N` | ^^ not found in `A::N` error[E0576]: cannot find associated type `NN` in `Tr::Y` - --> $DIR/ufcs-partially-resolved.rs:57:27 + --> $DIR/ufcs-partially-resolved.rs:47:27 | LL | let _: ::NN; //~ ERROR cannot find associated type `NN` in `Tr::Y` | ^^ not found in `Tr::Y` error[E0576]: cannot find method or associated constant `NN` in `Tr::Y` - --> $DIR/ufcs-partially-resolved.rs:59:20 + --> $DIR/ufcs-partially-resolved.rs:49:20 | LL | ::NN; //~ ERROR cannot find method or associated constant `NN` in `Tr::Y` | ^^ not found in `Tr::Y` error[E0575]: expected associated type, found method `Dr::Z` - --> $DIR/ufcs-partially-resolved.rs:62:12 + --> $DIR/ufcs-partially-resolved.rs:52:12 | LL | let _: ::Z; //~ ERROR expected associated type, found method `Dr::Z` | ^^^^^^^^^^^^- @@ -163,7 +163,7 @@ LL | let _: ::Z; //~ ERROR expected associated type, found method | did you mean `X`? error[E0575]: expected method or associated constant, found associated type `Dr::X` - --> $DIR/ufcs-partially-resolved.rs:63:5 + --> $DIR/ufcs-partially-resolved.rs:53:5 | LL | ::X; //~ ERROR expected method or associated constant, found associated type `Dr::X` | ^^^^^^^^^^^^- @@ -173,7 +173,7 @@ LL | ::X; //~ ERROR expected method or associated constant, found = note: can't use a type alias as a constructor error[E0575]: expected associated type, found method `Dr::Z` - --> $DIR/ufcs-partially-resolved.rs:64:12 + --> $DIR/ufcs-partially-resolved.rs:54:12 | LL | let _: ::Z::N; //~ ERROR expected associated type, found method `Dr::Z` | ^^^^^^^^^^^^-^^^ @@ -181,7 +181,7 @@ LL | let _: ::Z::N; //~ ERROR expected associated type, found meth | did you mean `X`? error[E0223]: ambiguous associated type - --> $DIR/ufcs-partially-resolved.rs:46:12 + --> $DIR/ufcs-partially-resolved.rs:36:12 | LL | let _: ::Y::NN; //~ ERROR ambiguous associated type | ^^^^^^^^^^^^^^^^^ ambiguous associated type @@ -189,13 +189,13 @@ LL | let _: ::Y::NN; //~ ERROR ambiguous associated type = note: specify the type using the syntax `<::Y as Trait>::NN` error[E0599]: no associated item named `NN` found for type `::Y` in the current scope - --> $DIR/ufcs-partially-resolved.rs:48:5 + --> $DIR/ufcs-partially-resolved.rs:38:5 | LL | ::Y::NN; //~ ERROR no associated item named `NN` found for type `::Y` | ^^^^^^^^^^^^^^^^^ associated item not found in `::Y` error[E0599]: no associated item named `N` found for type `::X` in the current scope - --> $DIR/ufcs-partially-resolved.rs:65:5 + --> $DIR/ufcs-partially-resolved.rs:55:5 | LL | ::X::N; //~ ERROR no associated item named `N` found for type `::X` | ^^^^^^^^^^^^^^^^ associated item not found in `::X` diff --git a/src/test/ui/ufcs/ufcs-qpath-missing-params.rs b/src/test/ui/ufcs/ufcs-qpath-missing-params.rs index 294a0fa0340cc..8b66a8fa90a06 100644 --- a/src/test/ui/ufcs/ufcs-qpath-missing-params.rs +++ b/src/test/ui/ufcs/ufcs-qpath-missing-params.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::borrow::Cow; pub trait IntoCow<'a, B: ?Sized> where B: ToOwned { diff --git a/src/test/ui/ufcs/ufcs-qpath-missing-params.stderr b/src/test/ui/ufcs/ufcs-qpath-missing-params.stderr index 2653b7bf4ac7b..591fdb3835201 100644 --- a/src/test/ui/ufcs/ufcs-qpath-missing-params.stderr +++ b/src/test/ui/ufcs/ufcs-qpath-missing-params.stderr @@ -1,5 +1,5 @@ error[E0089]: wrong number of type arguments: expected 1, found 0 - --> $DIR/ufcs-qpath-missing-params.rs:24:5 + --> $DIR/ufcs-qpath-missing-params.rs:14:5 | LL | ::into_cow("foo".to_string()); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected 1 type argument diff --git a/src/test/ui/ufcs/ufcs-qpath-self-mismatch.rs b/src/test/ui/ufcs/ufcs-qpath-self-mismatch.rs index caf510071bd68..939b3c5223c48 100644 --- a/src/test/ui/ufcs/ufcs-qpath-self-mismatch.rs +++ b/src/test/ui/ufcs/ufcs-qpath-self-mismatch.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::Add; fn main() { diff --git a/src/test/ui/ufcs/ufcs-qpath-self-mismatch.stderr b/src/test/ui/ufcs/ufcs-qpath-self-mismatch.stderr index f4222631872cd..e3027eedbf909 100644 --- a/src/test/ui/ufcs/ufcs-qpath-self-mismatch.stderr +++ b/src/test/ui/ufcs/ufcs-qpath-self-mismatch.stderr @@ -1,5 +1,5 @@ error[E0277]: cannot add `u32` to `i32` - --> $DIR/ufcs-qpath-self-mismatch.rs:14:5 + --> $DIR/ufcs-qpath-self-mismatch.rs:4:5 | LL | >::add(1, 2); | ^^^^^^^^^^^^^^^^^^^^^^ no implementation for `i32 + u32` @@ -7,13 +7,13 @@ LL | >::add(1, 2); = help: the trait `std::ops::Add` is not implemented for `i32` error[E0308]: mismatched types - --> $DIR/ufcs-qpath-self-mismatch.rs:16:28 + --> $DIR/ufcs-qpath-self-mismatch.rs:6:28 | LL | >::add(1u32, 2); | ^^^^ expected i32, found u32 error[E0308]: mismatched types - --> $DIR/ufcs-qpath-self-mismatch.rs:18:31 + --> $DIR/ufcs-qpath-self-mismatch.rs:8:31 | LL | >::add(1, 2u32); | ^^^^ expected i32, found u32 diff --git a/src/test/ui/ui-testing-optout.rs b/src/test/ui/ui-testing-optout.rs index 3072bd64a2c7e..041c0b0a85af7 100644 --- a/src/test/ui/ui-testing-optout.rs +++ b/src/test/ui/ui-testing-optout.rs @@ -3,15 +3,8 @@ // Line number < 10 type A = B; //~ ERROR -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // Line number >=10, <100 type C = D; //~ ERROR diff --git a/src/test/ui/ui-testing-optout.stderr b/src/test/ui/ui-testing-optout.stderr index aab3399a6fcc0..3233715d32572 100644 --- a/src/test/ui/ui-testing-optout.stderr +++ b/src/test/ui/ui-testing-optout.stderr @@ -5,16 +5,16 @@ error[E0412]: cannot find type `B` in this scope | ^ did you mean `A`? error[E0412]: cannot find type `D` in this scope - --> $DIR/ui-testing-optout.rs:17:10 + --> $DIR/ui-testing-optout.rs:10:10 | -17 | type C = D; //~ ERROR +10 | type C = D; //~ ERROR | ^ did you mean `A`? error[E0412]: cannot find type `F` in this scope - --> $DIR/ui-testing-optout.rs:102:10 - | -102 | type E = F; //~ ERROR - | ^ did you mean `A`? + --> $DIR/ui-testing-optout.rs:95:10 + | +95 | type E = F; //~ ERROR + | ^ did you mean `A`? error: aborting due to 3 previous errors diff --git a/src/test/ui/unboxed-closures/unboxed-closure-feature-gate.rs b/src/test/ui/unboxed-closures/unboxed-closure-feature-gate.rs index 3a3ea058b4e4d..1eb9de778e82d 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-feature-gate.rs +++ b/src/test/ui/unboxed-closures/unboxed-closure-feature-gate.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that parenthetical notation is feature-gated except with the // `Fn` traits. diff --git a/src/test/ui/unboxed-closures/unboxed-closure-feature-gate.stderr b/src/test/ui/unboxed-closures/unboxed-closure-feature-gate.stderr index aea57d9cb4ee7..038167ae9d733 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-feature-gate.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closure-feature-gate.stderr @@ -1,5 +1,5 @@ error[E0658]: parenthetical notation is only stable when used with `Fn`-family traits (see issue #29625) - --> $DIR/unboxed-closure-feature-gate.rs:23:16 + --> $DIR/unboxed-closure-feature-gate.rs:13:16 | LL | let x: Box; | ^^^^^^^^^^ diff --git a/src/test/ui/unboxed-closures/unboxed-closure-illegal-move.nll.stderr b/src/test/ui/unboxed-closures/unboxed-closure-illegal-move.nll.stderr index 4baa54e34c755..0e996902d621d 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-illegal-move.nll.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closure-illegal-move.nll.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of captured variable in an `Fn` closure - --> $DIR/unboxed-closure-illegal-move.rs:25:31 + --> $DIR/unboxed-closure-illegal-move.rs:15:31 | LL | let x = Box::new(0); | - captured outer variable @@ -7,7 +7,7 @@ LL | let f = to_fn(|| drop(x)); //~ ERROR cannot move | ^ cannot move out of captured variable in an `Fn` closure error[E0507]: cannot move out of captured variable in an `FnMut` closure - --> $DIR/unboxed-closure-illegal-move.rs:29:35 + --> $DIR/unboxed-closure-illegal-move.rs:19:35 | LL | let x = Box::new(0); | - captured outer variable @@ -15,7 +15,7 @@ LL | let f = to_fn_mut(|| drop(x)); //~ ERROR cannot move | ^ cannot move out of captured variable in an `FnMut` closure error[E0507]: cannot move out of captured variable in an `Fn` closure - --> $DIR/unboxed-closure-illegal-move.rs:38:36 + --> $DIR/unboxed-closure-illegal-move.rs:28:36 | LL | let x = Box::new(0); | - captured outer variable @@ -23,7 +23,7 @@ LL | let f = to_fn(move || drop(x)); //~ ERROR cannot move | ^ cannot move out of captured variable in an `Fn` closure error[E0507]: cannot move out of captured variable in an `FnMut` closure - --> $DIR/unboxed-closure-illegal-move.rs:42:40 + --> $DIR/unboxed-closure-illegal-move.rs:32:40 | LL | let x = Box::new(0); | - captured outer variable diff --git a/src/test/ui/unboxed-closures/unboxed-closure-illegal-move.rs b/src/test/ui/unboxed-closures/unboxed-closure-illegal-move.rs index 427be5607600d..ed8d721146133 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-illegal-move.rs +++ b/src/test/ui/unboxed-closures/unboxed-closure-illegal-move.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unboxed_closures)] // Tests that we can't move out of an unboxed closure environment diff --git a/src/test/ui/unboxed-closures/unboxed-closure-illegal-move.stderr b/src/test/ui/unboxed-closures/unboxed-closure-illegal-move.stderr index 7ff4c1c03ba0b..ae83242d5349a 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-illegal-move.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closure-illegal-move.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of captured outer variable in an `Fn` closure - --> $DIR/unboxed-closure-illegal-move.rs:25:31 + --> $DIR/unboxed-closure-illegal-move.rs:15:31 | LL | let x = Box::new(0); | - captured outer variable @@ -7,7 +7,7 @@ LL | let f = to_fn(|| drop(x)); //~ ERROR cannot move | ^ cannot move out of captured outer variable in an `Fn` closure error[E0507]: cannot move out of captured outer variable in an `FnMut` closure - --> $DIR/unboxed-closure-illegal-move.rs:29:35 + --> $DIR/unboxed-closure-illegal-move.rs:19:35 | LL | let x = Box::new(0); | - captured outer variable @@ -15,7 +15,7 @@ LL | let f = to_fn_mut(|| drop(x)); //~ ERROR cannot move | ^ cannot move out of captured outer variable in an `FnMut` closure error[E0507]: cannot move out of captured outer variable in an `Fn` closure - --> $DIR/unboxed-closure-illegal-move.rs:38:36 + --> $DIR/unboxed-closure-illegal-move.rs:28:36 | LL | let x = Box::new(0); | - captured outer variable @@ -23,7 +23,7 @@ LL | let f = to_fn(move || drop(x)); //~ ERROR cannot move | ^ cannot move out of captured outer variable in an `Fn` closure error[E0507]: cannot move out of captured outer variable in an `FnMut` closure - --> $DIR/unboxed-closure-illegal-move.rs:42:40 + --> $DIR/unboxed-closure-illegal-move.rs:32:40 | LL | let x = Box::new(0); | - captured outer variable diff --git a/src/test/ui/unboxed-closures/unboxed-closure-immutable-capture.nll.stderr b/src/test/ui/unboxed-closures/unboxed-closure-immutable-capture.nll.stderr index 084d7ff3bcd61..51a0a6e575646 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-immutable-capture.nll.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closure-immutable-capture.nll.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to `x`, as it is not declared as mutable - --> $DIR/unboxed-closure-immutable-capture.rs:19:13 + --> $DIR/unboxed-closure-immutable-capture.rs:9:13 | LL | let x = 0; | - help: consider changing this to be mutable: `mut x` @@ -7,7 +7,7 @@ LL | move || x = 1; //~ ERROR cannot assign | ^^^^^ cannot assign error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable - --> $DIR/unboxed-closure-immutable-capture.rs:20:17 + --> $DIR/unboxed-closure-immutable-capture.rs:10:17 | LL | let x = 0; | - help: consider changing this to be mutable: `mut x` @@ -16,7 +16,7 @@ LL | move || set(&mut x); //~ ERROR cannot borrow | ^^^^^^ cannot borrow as mutable error[E0594]: cannot assign to `x`, as it is not declared as mutable - --> $DIR/unboxed-closure-immutable-capture.rs:21:13 + --> $DIR/unboxed-closure-immutable-capture.rs:11:13 | LL | let x = 0; | - help: consider changing this to be mutable: `mut x` @@ -25,7 +25,7 @@ LL | move || x = 1; //~ ERROR cannot assign | ^^^^^ cannot assign error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable - --> $DIR/unboxed-closure-immutable-capture.rs:22:17 + --> $DIR/unboxed-closure-immutable-capture.rs:12:17 | LL | let x = 0; | - help: consider changing this to be mutable: `mut x` @@ -34,7 +34,7 @@ LL | move || set(&mut x); //~ ERROR cannot borrow | ^^^^^^ cannot borrow as mutable error[E0594]: cannot assign to `x`, as it is not declared as mutable - --> $DIR/unboxed-closure-immutable-capture.rs:23:8 + --> $DIR/unboxed-closure-immutable-capture.rs:13:8 | LL | let x = 0; | - help: consider changing this to be mutable: `mut x` @@ -43,7 +43,7 @@ LL | || x = 1; //~ ERROR cannot assign | ^^^^^ cannot assign error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable - --> $DIR/unboxed-closure-immutable-capture.rs:25:12 + --> $DIR/unboxed-closure-immutable-capture.rs:15:12 | LL | let x = 0; | - help: consider changing this to be mutable: `mut x` @@ -52,7 +52,7 @@ LL | || set(&mut x); //~ ERROR cannot assign | ^^^^^^ cannot borrow as mutable error[E0594]: cannot assign to `x`, as it is not declared as mutable - --> $DIR/unboxed-closure-immutable-capture.rs:26:8 + --> $DIR/unboxed-closure-immutable-capture.rs:16:8 | LL | let x = 0; | - help: consider changing this to be mutable: `mut x` @@ -61,7 +61,7 @@ LL | || x = 1; //~ ERROR cannot assign | ^^^^^ cannot assign error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable - --> $DIR/unboxed-closure-immutable-capture.rs:28:12 + --> $DIR/unboxed-closure-immutable-capture.rs:18:12 | LL | let x = 0; | - help: consider changing this to be mutable: `mut x` diff --git a/src/test/ui/unboxed-closures/unboxed-closure-immutable-capture.rs b/src/test/ui/unboxed-closures/unboxed-closure-immutable-capture.rs index 2d99837422955..5d59cecf99ae6 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-immutable-capture.rs +++ b/src/test/ui/unboxed-closures/unboxed-closure-immutable-capture.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that even unboxed closures that are capable of mutating their // environment cannot mutate captured variables that have not been // declared mutable (#18335) diff --git a/src/test/ui/unboxed-closures/unboxed-closure-immutable-capture.stderr b/src/test/ui/unboxed-closures/unboxed-closure-immutable-capture.stderr index 02fbb5f17eeed..935b34c60bc70 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-immutable-capture.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closure-immutable-capture.stderr @@ -1,5 +1,5 @@ error[E0595]: closure cannot assign to immutable local variable `x` - --> $DIR/unboxed-closure-immutable-capture.rs:23:5 + --> $DIR/unboxed-closure-immutable-capture.rs:13:5 | LL | let x = 0; | - consider changing this to `mut x` @@ -8,7 +8,7 @@ LL | || x = 1; //~ ERROR cannot assign | ^^ cannot borrow mutably error[E0595]: closure cannot assign to immutable local variable `x` - --> $DIR/unboxed-closure-immutable-capture.rs:25:5 + --> $DIR/unboxed-closure-immutable-capture.rs:15:5 | LL | let x = 0; | - consider changing this to `mut x` @@ -17,7 +17,7 @@ LL | || set(&mut x); //~ ERROR cannot assign | ^^ cannot borrow mutably error[E0595]: closure cannot assign to immutable local variable `x` - --> $DIR/unboxed-closure-immutable-capture.rs:26:5 + --> $DIR/unboxed-closure-immutable-capture.rs:16:5 | LL | let x = 0; | - consider changing this to `mut x` @@ -26,7 +26,7 @@ LL | || x = 1; //~ ERROR cannot assign | ^^ cannot borrow mutably error[E0595]: closure cannot assign to immutable local variable `x` - --> $DIR/unboxed-closure-immutable-capture.rs:28:5 + --> $DIR/unboxed-closure-immutable-capture.rs:18:5 | LL | let x = 0; | - consider changing this to `mut x` @@ -35,7 +35,7 @@ LL | || set(&mut x); //~ ERROR cannot assign | ^^ cannot borrow mutably error[E0594]: cannot assign to captured outer variable in an `FnMut` closure - --> $DIR/unboxed-closure-immutable-capture.rs:19:13 + --> $DIR/unboxed-closure-immutable-capture.rs:9:13 | LL | let x = 0; | - help: consider making `x` mutable: `mut x` @@ -43,13 +43,13 @@ LL | move || x = 1; //~ ERROR cannot assign | ^^^^^ error[E0596]: cannot borrow captured outer variable in an `FnMut` closure as mutable - --> $DIR/unboxed-closure-immutable-capture.rs:20:22 + --> $DIR/unboxed-closure-immutable-capture.rs:10:22 | LL | move || set(&mut x); //~ ERROR cannot borrow | ^ error[E0594]: cannot assign to captured outer variable in an `FnMut` closure - --> $DIR/unboxed-closure-immutable-capture.rs:21:13 + --> $DIR/unboxed-closure-immutable-capture.rs:11:13 | LL | let x = 0; | - help: consider making `x` mutable: `mut x` @@ -58,7 +58,7 @@ LL | move || x = 1; //~ ERROR cannot assign | ^^^^^ error[E0596]: cannot borrow captured outer variable in an `FnMut` closure as mutable - --> $DIR/unboxed-closure-immutable-capture.rs:22:22 + --> $DIR/unboxed-closure-immutable-capture.rs:12:22 | LL | move || set(&mut x); //~ ERROR cannot borrow | ^ diff --git a/src/test/ui/unboxed-closures/unboxed-closure-no-cyclic-sig.rs b/src/test/ui/unboxed-closures/unboxed-closure-no-cyclic-sig.rs index 506bce0dbec21..9d0aa413207ab 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-no-cyclic-sig.rs +++ b/src/test/ui/unboxed-closures/unboxed-closure-no-cyclic-sig.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that unboxed closures cannot capture their own type. // // Also regression test for issue #21410. diff --git a/src/test/ui/unboxed-closures/unboxed-closure-no-cyclic-sig.stderr b/src/test/ui/unboxed-closures/unboxed-closure-no-cyclic-sig.stderr index 0c0c339286ec1..fc45520851889 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-no-cyclic-sig.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closure-no-cyclic-sig.stderr @@ -1,5 +1,5 @@ error[E0644]: closure/generator type that references itself - --> $DIR/unboxed-closure-no-cyclic-sig.rs:18:7 + --> $DIR/unboxed-closure-no-cyclic-sig.rs:8:7 | LL | g(|_| { }); //~ ERROR closure/generator type that references itself | ^^^^^^^^ cyclic type of infinite size diff --git a/src/test/ui/unboxed-closures/unboxed-closure-region.nll.stderr b/src/test/ui/unboxed-closures/unboxed-closure-region.nll.stderr index 6ad57a15465d3..db985a5b484e7 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-region.nll.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closure-region.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `x` does not live long enough - --> $DIR/unboxed-closure-region.rs:18:12 + --> $DIR/unboxed-closure-region.rs:8:12 | LL | || x //~ ERROR `x` does not live long enough | -- ^ borrowed value does not live long enough diff --git a/src/test/ui/unboxed-closures/unboxed-closure-region.rs b/src/test/ui/unboxed-closures/unboxed-closure-region.rs index da6dbc6e74f86..f202492eda553 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-region.rs +++ b/src/test/ui/unboxed-closures/unboxed-closure-region.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that an unboxed closure that captures a free variable by // reference cannot escape the region of that variable. diff --git a/src/test/ui/unboxed-closures/unboxed-closure-region.stderr b/src/test/ui/unboxed-closures/unboxed-closure-region.stderr index f85f3afff70e8..a0f009c0689c9 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-region.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closure-region.stderr @@ -1,5 +1,5 @@ error[E0597]: `x` does not live long enough - --> $DIR/unboxed-closure-region.rs:18:12 + --> $DIR/unboxed-closure-region.rs:8:12 | LL | || x //~ ERROR `x` does not live long enough | -- ^ borrowed value does not live long enough diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-default.rs b/src/test/ui/unboxed-closures/unboxed-closure-sugar-default.rs index 849f7e0573cff..044859de6a4a5 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-default.rs +++ b/src/test/ui/unboxed-closures/unboxed-closure-sugar-default.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test interaction between unboxed closure sugar and default type // parameters (should be exactly as if angle brackets were used). diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-default.stderr b/src/test/ui/unboxed-closures/unboxed-closure-sugar-default.stderr index fccf295b72c61..508c2f780b9fb 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-default.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closure-sugar-default.stderr @@ -1,11 +1,11 @@ error[E0277]: the trait bound `dyn Foo<(isize,), isize, Output=()>: Eq>` is not satisfied - --> $DIR/unboxed-closure-sugar-default.rs:31:5 + --> $DIR/unboxed-closure-sugar-default.rs:21:5 | LL | eq::< Foo<(isize,),isize,Output=()>, Foo(isize) >(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Eq>` is not implemented for `dyn Foo<(isize,), isize, Output=()>` | note: required by `eq` - --> $DIR/unboxed-closure-sugar-default.rs:24:1 + --> $DIR/unboxed-closure-sugar-default.rs:14:1 | LL | fn eq() where A : Eq { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-equiv.rs b/src/test/ui/unboxed-closures/unboxed-closure-sugar-equiv.rs index 0cf44a2ca61c2..95bd391f251b8 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-equiv.rs +++ b/src/test/ui/unboxed-closures/unboxed-closure-sugar-equiv.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the unboxed closure sugar can be used with an arbitrary // struct type and that it is equivalent to the same syntax using // angle brackets. This test covers only simple types and in diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-equiv.stderr b/src/test/ui/unboxed-closures/unboxed-closure-sugar-equiv.stderr index 7d687a55df95d..071ba2792b0ac 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-equiv.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closure-sugar-equiv.stderr @@ -1,12 +1,12 @@ error[E0277]: the trait bound `dyn Foo<(char,), Output=()>: Eq>` is not satisfied - --> $DIR/unboxed-closure-sugar-equiv.rs:53:5 + --> $DIR/unboxed-closure-sugar-equiv.rs:43:5 | LL | / eq::< Foo<(),Output=()>, LL | | Foo(char) >(); | |___________________________________________________________________^ the trait `Eq>` is not implemented for `dyn Foo<(char,), Output=()>` | note: required by `eq` - --> $DIR/unboxed-closure-sugar-equiv.rs:26:1 + --> $DIR/unboxed-closure-sugar-equiv.rs:16:1 | LL | fn eq>() { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-lifetime-elision.rs b/src/test/ui/unboxed-closures/unboxed-closure-sugar-lifetime-elision.rs index a6f59b7882344..b61d8b8c8c790 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-lifetime-elision.rs +++ b/src/test/ui/unboxed-closures/unboxed-closure-sugar-lifetime-elision.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the unboxed closure sugar can be used with an arbitrary // struct type and that it is equivalent to the same syntax using // angle brackets. This test covers only simple types and in diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-lifetime-elision.stderr b/src/test/ui/unboxed-closures/unboxed-closure-sugar-lifetime-elision.stderr index fa74e6e660745..e631c33678863 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-lifetime-elision.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closure-sugar-lifetime-elision.stderr @@ -1,5 +1,5 @@ error[E0106]: missing lifetime specifier - --> $DIR/unboxed-closure-sugar-lifetime-elision.rs:36:35 + --> $DIR/unboxed-closure-sugar-lifetime-elision.rs:26:35 | LL | let _: Foo(&isize, &usize) -> &usize; //~ ERROR missing lifetime specifier | ^ expected lifetime parameter diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-not-used-on-fn.rs b/src/test/ui/unboxed-closures/unboxed-closure-sugar-not-used-on-fn.rs index ed27a4d0b2a2f..09927a940192a 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-not-used-on-fn.rs +++ b/src/test/ui/unboxed-closures/unboxed-closure-sugar-not-used-on-fn.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // Test that the `Fn` traits require `()` form without a feature gate. fn bar1(x: &Fn<(), Output=()>) { diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-not-used-on-fn.stderr b/src/test/ui/unboxed-closures/unboxed-closure-sugar-not-used-on-fn.stderr index bda88f4e4d7fb..90f04a52d370a 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-not-used-on-fn.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closure-sugar-not-used-on-fn.stderr @@ -1,5 +1,5 @@ error[E0658]: the precise format of `Fn`-family traits' type parameters is subject to change. Use parenthetical notation (Fn(Foo, Bar) -> Baz) instead (see issue #29625) - --> $DIR/unboxed-closure-sugar-not-used-on-fn.rs:14:13 + --> $DIR/unboxed-closure-sugar-not-used-on-fn.rs:3:13 | LL | fn bar1(x: &Fn<(), Output=()>) { | ^^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | fn bar1(x: &Fn<(), Output=()>) { = help: add #![feature(unboxed_closures)] to the crate attributes to enable error[E0658]: the precise format of `Fn`-family traits' type parameters is subject to change. Use parenthetical notation (Fn(Foo, Bar) -> Baz) instead (see issue #29625) - --> $DIR/unboxed-closure-sugar-not-used-on-fn.rs:18:28 + --> $DIR/unboxed-closure-sugar-not-used-on-fn.rs:7:28 | LL | fn bar2(x: &T) where T: Fn<()> { | ^^^^^^ diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-region.rs b/src/test/ui/unboxed-closures/unboxed-closure-sugar-region.rs index 331ad620c27c0..799d9f33e2e9d 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-region.rs +++ b/src/test/ui/unboxed-closures/unboxed-closure-sugar-region.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test interaction between unboxed closure sugar and region // parameters (should be exactly as if angle brackets were used // and regions omitted). diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-region.stderr b/src/test/ui/unboxed-closures/unboxed-closure-sugar-region.stderr index 2245c5e66481e..8eed7d58c4666 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-region.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closure-sugar-region.stderr @@ -1,5 +1,5 @@ error[E0107]: wrong number of lifetime arguments: expected 1, found 0 - --> $DIR/unboxed-closure-sugar-region.rs:40:43 + --> $DIR/unboxed-closure-sugar-region.rs:30:43 | LL | fn test2(x: &Foo<(isize,),Output=()>, y: &Foo(isize)) { | ^^^^^^^^^^ expected 1 lifetime argument diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-1.rs b/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-1.rs index 3f88f16d2c3ad..5387dcb218cb9 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-1.rs +++ b/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-1.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // Test that parentheses form doesn't work with struct types appearing in local variables. struct Bar { diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-1.stderr b/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-1.stderr index 1ca99680b5390..3f1b37c282b7c 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-1.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-1.stderr @@ -1,5 +1,5 @@ error[E0214]: parenthesized parameters may only be used with a trait - --> $DIR/unboxed-closure-sugar-used-on-struct-1.rs:19:19 + --> $DIR/unboxed-closure-sugar-used-on-struct-1.rs:8:19 | LL | let x: Box = panic!(); | ^^ only traits may use parentheses diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-3.rs b/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-3.rs index 42fffe546c20c..3cada322b1ef2 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-3.rs +++ b/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-3.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that parentheses form parses in expression paths. struct Bar { diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-3.stderr b/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-3.stderr index d6c08a7056551..395f6596cfd83 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-3.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-3.stderr @@ -1,5 +1,5 @@ error[E0214]: parenthesized parameters may only be used with a trait - --> $DIR/unboxed-closure-sugar-used-on-struct-3.rs:24:16 + --> $DIR/unboxed-closure-sugar-used-on-struct-3.rs:14:16 | LL | let b = Bar::(isize, usize)::new(); // OK too (for the parser) | ^^^^^^^^^^^^^^^^ only traits may use parentheses diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct.rs b/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct.rs index 5fcde4facbe8d..e795650447cc4 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct.rs +++ b/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that parentheses form doesn't work with struct types appearing in argument types. struct Bar { diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct.stderr b/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct.stderr index 954ec4d63a60b..d0267092030d8 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct.stderr @@ -1,11 +1,11 @@ error[E0214]: parenthesized parameters may only be used with a trait - --> $DIR/unboxed-closure-sugar-used-on-struct.rs:17:18 + --> $DIR/unboxed-closure-sugar-used-on-struct.rs:7:18 | LL | fn foo(b: Box) { | ^^ only traits may use parentheses error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/unboxed-closure-sugar-used-on-struct.rs:17:15 + --> $DIR/unboxed-closure-sugar-used-on-struct.rs:7:15 | LL | fn foo(b: Box) { | ^^^^^ not allowed in type signatures diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-1.rs b/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-1.rs index bb7e02d0d8b9b..df0c495a11cc6 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-1.rs +++ b/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unboxed_closures)] trait One { fn foo(&self) -> A; } diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-1.stderr b/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-1.stderr index e7476f0fa6d48..84ed797450c24 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-1.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-1.stderr @@ -1,5 +1,5 @@ error[E0220]: associated type `Output` not found for `One<()>` - --> $DIR/unboxed-closure-sugar-wrong-number-number-type-parameters-1.rs:15:15 + --> $DIR/unboxed-closure-sugar-wrong-number-number-type-parameters-1.rs:5:15 | LL | fn foo(_: &One()) //~ ERROR associated type `Output` not found for `One<()>` | ^^ associated type `Output` not found diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-3.rs b/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-3.rs index 20fdd52b82a3e..5f5ad7902aa3e 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-3.rs +++ b/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-3.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unboxed_closures)] trait Three { fn dummy(&self) -> (A,B,C); } diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-3.stderr b/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-3.stderr index feac4274357b5..aefcecbbf7c0b 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-3.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-3.stderr @@ -1,11 +1,11 @@ error[E0243]: wrong number of type arguments: expected 3, found 1 - --> $DIR/unboxed-closure-sugar-wrong-number-number-type-parameters-3.rs:15:12 + --> $DIR/unboxed-closure-sugar-wrong-number-number-type-parameters-3.rs:5:12 | LL | fn foo(_: &Three()) | ^^^^^^^ expected 3 type arguments error[E0220]: associated type `Output` not found for `Three<(), [type error], [type error]>` - --> $DIR/unboxed-closure-sugar-wrong-number-number-type-parameters-3.rs:15:17 + --> $DIR/unboxed-closure-sugar-wrong-number-number-type-parameters-3.rs:5:17 | LL | fn foo(_: &Three()) | ^^ associated type `Output` not found diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters.rs b/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters.rs index 027fa6b0fe3b0..2e87d91f8bdc0 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters.rs +++ b/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unboxed_closures)] trait Zero { fn dummy(&self); } diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters.stderr b/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters.stderr index 89587c47cf67d..3bd787e31c3f6 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters.stderr @@ -1,11 +1,11 @@ error[E0244]: wrong number of type arguments: expected 0, found 1 - --> $DIR/unboxed-closure-sugar-wrong-number-number-type-parameters.rs:15:15 + --> $DIR/unboxed-closure-sugar-wrong-number-number-type-parameters.rs:5:15 | LL | fn foo(_: Zero()) | ^^ unexpected type argument error[E0220]: associated type `Output` not found for `Zero` - --> $DIR/unboxed-closure-sugar-wrong-number-number-type-parameters.rs:15:15 + --> $DIR/unboxed-closure-sugar-wrong-number-number-type-parameters.rs:5:15 | LL | fn foo(_: Zero()) | ^^ associated type `Output` not found diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-trait.rs b/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-trait.rs index 1519ceb898851..bc5192c8c8637 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-trait.rs +++ b/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-trait.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unboxed_closures)] trait Trait {} diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-trait.stderr b/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-trait.stderr index 91f57cbd468a8..7db3248ee3582 100644 --- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-trait.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-trait.stderr @@ -1,11 +1,11 @@ error[E0244]: wrong number of type arguments: expected 0, found 1 - --> $DIR/unboxed-closure-sugar-wrong-trait.rs:15:13 + --> $DIR/unboxed-closure-sugar-wrong-trait.rs:5:13 | LL | fn f isize>(x: F) {} | ^^^^^^^ unexpected type argument error[E0220]: associated type `Output` not found for `Trait` - --> $DIR/unboxed-closure-sugar-wrong-trait.rs:15:24 + --> $DIR/unboxed-closure-sugar-wrong-trait.rs:5:24 | LL | fn f isize>(x: F) {} | ^^^^^ associated type `Output` not found diff --git a/src/test/ui/unboxed-closures/unboxed-closures-borrow-conflict.nll.stderr b/src/test/ui/unboxed-closures/unboxed-closures-borrow-conflict.nll.stderr index cadda398c6f33..a47d33d29e158 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-borrow-conflict.nll.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-borrow-conflict.nll.stderr @@ -1,5 +1,5 @@ error[E0503]: cannot use `x` because it was mutably borrowed - --> $DIR/unboxed-closures-borrow-conflict.rs:19:14 + --> $DIR/unboxed-closures-borrow-conflict.rs:9:14 | LL | let f = || x += 1; | -- - borrow occurs due to use of `x` in closure diff --git a/src/test/ui/unboxed-closures/unboxed-closures-borrow-conflict.rs b/src/test/ui/unboxed-closures/unboxed-closures-borrow-conflict.rs index aa50fb837733c..835a1f598601c 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-borrow-conflict.rs +++ b/src/test/ui/unboxed-closures/unboxed-closures-borrow-conflict.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that an unboxed closure that mutates a free variable will // cause borrow conflicts. diff --git a/src/test/ui/unboxed-closures/unboxed-closures-borrow-conflict.stderr b/src/test/ui/unboxed-closures/unboxed-closures-borrow-conflict.stderr index 9bdd1022fd179..461eebc59c029 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-borrow-conflict.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-borrow-conflict.stderr @@ -1,5 +1,5 @@ error[E0503]: cannot use `x` because it was mutably borrowed - --> $DIR/unboxed-closures-borrow-conflict.rs:19:9 + --> $DIR/unboxed-closures-borrow-conflict.rs:9:9 | LL | let f = || x += 1; | -- borrow of `x` occurs here diff --git a/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-1.nll.stderr b/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-1.nll.stderr index 8cda1e60ba988..89ab6d24e9e76 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-1.nll.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-1.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `factorial` does not live long enough - --> $DIR/unboxed-closures-failed-recursive-fn-1.rs:25:17 + --> $DIR/unboxed-closures-failed-recursive-fn-1.rs:15:17 | LL | let f = |x: u32| -> u32 { | --------------- value captured here @@ -15,7 +15,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are defined error[E0506]: cannot assign to `factorial` because it is borrowed - --> $DIR/unboxed-closures-failed-recursive-fn-1.rs:30:5 + --> $DIR/unboxed-closures-failed-recursive-fn-1.rs:20:5 | LL | let f = |x: u32| -> u32 { | --------------- borrow of `factorial` occurs here @@ -29,7 +29,7 @@ LL | factorial = Some(Box::new(f)); | borrow later used here error[E0597]: `factorial` does not live long enough - --> $DIR/unboxed-closures-failed-recursive-fn-1.rs:38:17 + --> $DIR/unboxed-closures-failed-recursive-fn-1.rs:28:17 | LL | let f = |x: u32| -> u32 { | --------------- value captured here @@ -43,7 +43,7 @@ LL | } = note: borrowed value must be valid for the static lifetime... error[E0506]: cannot assign to `factorial` because it is borrowed - --> $DIR/unboxed-closures-failed-recursive-fn-1.rs:42:5 + --> $DIR/unboxed-closures-failed-recursive-fn-1.rs:32:5 | LL | let f = |x: u32| -> u32 { | --------------- borrow of `factorial` occurs here diff --git a/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-1.rs b/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-1.rs index ce60521034ee7..b72482a712118 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-1.rs +++ b/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Various unsuccessful attempts to put the unboxed closure kind // inference into an awkward position that might require fixed point // iteration (basically where inferring the kind of a closure `c` diff --git a/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-1.stderr b/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-1.stderr index 8390e9f0f956c..85d98c18d7ffd 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-1.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-1.stderr @@ -1,5 +1,5 @@ error[E0597]: `factorial` does not live long enough - --> $DIR/unboxed-closures-failed-recursive-fn-1.rs:25:17 + --> $DIR/unboxed-closures-failed-recursive-fn-1.rs:15:17 | LL | let f = |x: u32| -> u32 { | --------------- capture occurs here @@ -12,7 +12,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0373]: closure may outlive the current function, but it borrows `factorial`, which is owned by the current function - --> $DIR/unboxed-closures-failed-recursive-fn-1.rs:36:13 + --> $DIR/unboxed-closures-failed-recursive-fn-1.rs:26:13 | LL | let f = |x: u32| -> u32 { | ^^^^^^^^^^^^^^^ may outlive borrowed value `factorial` diff --git a/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-2.rs b/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-2.rs index 8f5bf827fcf1a..d03001f523757 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-2.rs +++ b/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Various unsuccessful attempts to put the unboxed closure kind // inference into an awkward position that might require fixed point // iteration (basically where inferring the kind of a closure `c` diff --git a/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-2.stderr b/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-2.stderr index fd6858cf7bfe3..bd58e241f0cb0 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-2.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-2.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/unboxed-closures-failed-recursive-fn-2.rs:26:32 + --> $DIR/unboxed-closures-failed-recursive-fn-2.rs:16:32 | LL | let mut closure0 = None; | ------------ consider giving `closure0` a type diff --git a/src/test/ui/unboxed-closures/unboxed-closures-fnmut-as-fn.rs b/src/test/ui/unboxed-closures/unboxed-closures-fnmut-as-fn.rs index 2e865b2aac8fc..9f1c4c1a9e76c 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-fnmut-as-fn.rs +++ b/src/test/ui/unboxed-closures/unboxed-closures-fnmut-as-fn.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Checks that the Fn trait hierarchy rules do not permit // Fn to be used where FnMut is implemented. diff --git a/src/test/ui/unboxed-closures/unboxed-closures-fnmut-as-fn.stderr b/src/test/ui/unboxed-closures/unboxed-closures-fnmut-as-fn.stderr index e5e66efcaa2ce..fcf11290c81d9 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-fnmut-as-fn.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-fnmut-as-fn.stderr @@ -1,12 +1,12 @@ error[E0277]: expected a `std::ops::Fn<(isize,)>` closure, found `S` - --> $DIR/unboxed-closures-fnmut-as-fn.rs:38:13 + --> $DIR/unboxed-closures-fnmut-as-fn.rs:28:13 | LL | let x = call_it(&S, 22); | ^^^^^^^ expected an `Fn<(isize,)>` closure, found `S` | = help: the trait `std::ops::Fn<(isize,)>` is not implemented for `S` note: required by `call_it` - --> $DIR/unboxed-closures-fnmut-as-fn.rs:33:1 + --> $DIR/unboxed-closures-fnmut-as-fn.rs:23:1 | LL | fn call_itisize>(f: &F, x: isize) -> isize { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-argument-types-two-region-pointers.nll.stderr b/src/test/ui/unboxed-closures/unboxed-closures-infer-argument-types-two-region-pointers.nll.stderr index a113c1ae27fb4..774ee268ea4aa 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-infer-argument-types-two-region-pointers.nll.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-infer-argument-types-two-region-pointers.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/unboxed-closures-infer-argument-types-two-region-pointers.rs:27:15 + --> $DIR/unboxed-closures-infer-argument-types-two-region-pointers.rs:17:15 | LL | x.set(y); //~ ERROR E0312 | ^ error: unsatisfied lifetime constraints - --> $DIR/unboxed-closures-infer-argument-types-two-region-pointers.rs:27:9 + --> $DIR/unboxed-closures-infer-argument-types-two-region-pointers.rs:17:9 | LL | doit(0, &|x, y| { | - - has type `&'1 i32` diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-argument-types-two-region-pointers.rs b/src/test/ui/unboxed-closures/unboxed-closures-infer-argument-types-two-region-pointers.rs index bfb24c5872295..a1364b93fa4cd 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-infer-argument-types-two-region-pointers.rs +++ b/src/test/ui/unboxed-closures/unboxed-closures-infer-argument-types-two-region-pointers.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(fn_traits)] // That a closure whose expected argument types include two distinct diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-argument-types-two-region-pointers.stderr b/src/test/ui/unboxed-closures/unboxed-closures-infer-argument-types-two-region-pointers.stderr index 7e59347155b47..bf43dc62744f3 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-infer-argument-types-two-region-pointers.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-infer-argument-types-two-region-pointers.stderr @@ -1,19 +1,19 @@ error[E0312]: lifetime of reference outlives lifetime of borrowed content... - --> $DIR/unboxed-closures-infer-argument-types-two-region-pointers.rs:27:15 + --> $DIR/unboxed-closures-infer-argument-types-two-region-pointers.rs:17:15 | LL | x.set(y); //~ ERROR E0312 | ^ | -note: ...the reference is valid for the anonymous lifetime #3 defined on the body at 26:14... - --> $DIR/unboxed-closures-infer-argument-types-two-region-pointers.rs:26:14 +note: ...the reference is valid for the anonymous lifetime #3 defined on the body at 16:14... + --> $DIR/unboxed-closures-infer-argument-types-two-region-pointers.rs:16:14 | LL | doit(0, &|x, y| { | ______________^ LL | | x.set(y); //~ ERROR E0312 LL | | }); | |_____^ -note: ...but the borrowed content is only valid for the anonymous lifetime #4 defined on the body at 26:14 - --> $DIR/unboxed-closures-infer-argument-types-two-region-pointers.rs:26:14 +note: ...but the borrowed content is only valid for the anonymous lifetime #4 defined on the body at 16:14 + --> $DIR/unboxed-closures-infer-argument-types-two-region-pointers.rs:16:14 | LL | doit(0, &|x, y| { | ______________^ diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-fn-once-move-from-projection.rs b/src/test/ui/unboxed-closures/unboxed-closures-infer-fn-once-move-from-projection.rs index 481346ad4b6eb..6e404c6160a74 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-infer-fn-once-move-from-projection.rs +++ b/src/test/ui/unboxed-closures/unboxed-closures-infer-fn-once-move-from-projection.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused)] fn foo(f: F) diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-fn-once-move-from-projection.stderr b/src/test/ui/unboxed-closures/unboxed-closures-infer-fn-once-move-from-projection.stderr index 0062ea77c0b54..384cd090cb3c7 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-infer-fn-once-move-from-projection.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-infer-fn-once-move-from-projection.stderr @@ -1,5 +1,5 @@ error[E0525]: expected a closure that implements the `Fn` trait, but this closure only implements `FnOnce` - --> $DIR/unboxed-closures-infer-fn-once-move-from-projection.rs:24:13 + --> $DIR/unboxed-closures-infer-fn-once-move-from-projection.rs:14:13 | LL | let c = || drop(y.0); //~ ERROR expected a closure that implements the `Fn` trait | ^^^^^^^^-^^^ diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.nll.stderr b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.nll.stderr index 718c3a19938c4..89ac402b5e02b 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.nll.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `tick1` as mutable, as it is not declared as mutable - --> $DIR/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.rs:27:9 + --> $DIR/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.rs:17:9 | LL | let tick1 = || { | ----- help: consider changing this to be mutable: `mut tick1` @@ -8,7 +8,7 @@ LL | tick1(); | ^^^^^ cannot borrow as mutable error[E0596]: cannot borrow `tick2` as mutable, as it is not declared as mutable - --> $DIR/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.rs:30:5 + --> $DIR/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.rs:20:5 | LL | let tick2 = || { //~ ERROR closure cannot assign to immutable local variable `tick1` | ----- help: consider changing this to be mutable: `mut tick2` diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.rs b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.rs index 7c5ea03159656..aaa692c109f69 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.rs +++ b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are able to infer a suitable kind for this closure // that is just called (`FnMut`). diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.stderr b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.stderr index bb2ffcd21b096..9ebd5f80e342f 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.stderr @@ -1,5 +1,5 @@ error[E0595]: closure cannot assign to immutable local variable `tick1` - --> $DIR/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.rs:26:17 + --> $DIR/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.rs:16:17 | LL | let tick1 = || { | ----- consider changing this to `mut tick1` @@ -8,7 +8,7 @@ LL | let tick2 = || { //~ ERROR closure cannot assign to immutable local var | ^^ cannot borrow mutably error[E0596]: cannot borrow immutable local variable `tick2` as mutable - --> $DIR/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.rs:30:5 + --> $DIR/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.rs:20:5 | LL | let tick2 = || { //~ ERROR closure cannot assign to immutable local variable `tick1` | ----- consider changing this to `mut tick2` diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-missing-mut.nll.stderr b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-missing-mut.nll.stderr index c57f97652b342..9c0a71e73f522 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-missing-mut.nll.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-missing-mut.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `tick` as mutable, as it is not declared as mutable - --> $DIR/unboxed-closures-infer-fnmut-missing-mut.rs:17:5 + --> $DIR/unboxed-closures-infer-fnmut-missing-mut.rs:7:5 | LL | let tick = || counter += 1; | ---- help: consider changing this to be mutable: `mut tick` diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-missing-mut.rs b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-missing-mut.rs index 9e4ed30799686..de3f9839d2664 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-missing-mut.rs +++ b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-missing-mut.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are able to infer a suitable kind for this closure // that is just called (`FnMut`). diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-missing-mut.stderr b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-missing-mut.stderr index 22e11b6977c03..8161c372ccf63 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-missing-mut.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-missing-mut.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow immutable local variable `tick` as mutable - --> $DIR/unboxed-closures-infer-fnmut-missing-mut.rs:17:5 + --> $DIR/unboxed-closures-infer-fnmut-missing-mut.rs:7:5 | LL | let tick = || counter += 1; | ---- consider changing this to `mut tick` diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-move-missing-mut.nll.stderr b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-move-missing-mut.nll.stderr index a26dc08e54a34..fa3426a1f7096 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-move-missing-mut.nll.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-move-missing-mut.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `tick` as mutable, as it is not declared as mutable - --> $DIR/unboxed-closures-infer-fnmut-move-missing-mut.rs:17:5 + --> $DIR/unboxed-closures-infer-fnmut-move-missing-mut.rs:7:5 | LL | let tick = move || counter += 1; | ---- help: consider changing this to be mutable: `mut tick` diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-move-missing-mut.rs b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-move-missing-mut.rs index de17d25b4c360..b011c5a58bc3e 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-move-missing-mut.rs +++ b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-move-missing-mut.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are able to infer a suitable kind for this closure // that is just called (`FnMut`). diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-move-missing-mut.stderr b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-move-missing-mut.stderr index f9fd6c21b706c..16fae80acfbaf 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-move-missing-mut.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-move-missing-mut.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow immutable local variable `tick` as mutable - --> $DIR/unboxed-closures-infer-fnmut-move-missing-mut.rs:17:5 + --> $DIR/unboxed-closures-infer-fnmut-move-missing-mut.rs:7:5 | LL | let tick = move || counter += 1; | ---- consider changing this to `mut tick` diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-call-twice.nll.stderr b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-call-twice.nll.stderr index f4756696b6b06..c3d0eb5a30106 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-call-twice.nll.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-call-twice.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `tick` - --> $DIR/unboxed-closures-infer-fnonce-call-twice.rs:20:5 + --> $DIR/unboxed-closures-infer-fnonce-call-twice.rs:10:5 | LL | tick(); | ---- value moved here diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-call-twice.rs b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-call-twice.rs index 0050fbdde2639..a98a01ca598a9 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-call-twice.rs +++ b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-call-twice.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are able to infer a suitable kind for this closure // that is just called (`FnMut`). diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-call-twice.stderr b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-call-twice.stderr index c713b3dd8febc..52650903ba3f2 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-call-twice.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-call-twice.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `tick` - --> $DIR/unboxed-closures-infer-fnonce-call-twice.rs:20:5 + --> $DIR/unboxed-closures-infer-fnonce-call-twice.rs:10:5 | LL | tick(); | ---- value moved here @@ -7,7 +7,7 @@ LL | tick(); //~ ERROR use of moved value: `tick` | ^^^^ value used here after move | note: closure cannot be invoked more than once because it moves the variable `counter` out of its environment - --> $DIR/unboxed-closures-infer-fnonce-call-twice.rs:18:29 + --> $DIR/unboxed-closures-infer-fnonce-call-twice.rs:8:29 | LL | let tick = || mem::drop(counter); | ^^^^^^^ diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-move-call-twice.nll.stderr b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-move-call-twice.nll.stderr index 95ed673627877..84d11cb2310f4 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-move-call-twice.nll.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-move-call-twice.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `tick` - --> $DIR/unboxed-closures-infer-fnonce-move-call-twice.rs:20:5 + --> $DIR/unboxed-closures-infer-fnonce-move-call-twice.rs:10:5 | LL | tick(); | ---- value moved here diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-move-call-twice.rs b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-move-call-twice.rs index f9709b8c59697..f87be4a06f75f 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-move-call-twice.rs +++ b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-move-call-twice.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are able to infer a suitable kind for this closure // that is just called (`FnMut`). diff --git a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-move-call-twice.stderr b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-move-call-twice.stderr index a9006318cd8b2..23d61c33ffe06 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-move-call-twice.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-move-call-twice.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `tick` - --> $DIR/unboxed-closures-infer-fnonce-move-call-twice.rs:20:5 + --> $DIR/unboxed-closures-infer-fnonce-move-call-twice.rs:10:5 | LL | tick(); | ---- value moved here @@ -7,7 +7,7 @@ LL | tick(); //~ ERROR use of moved value: `tick` | ^^^^ value used here after move | note: closure cannot be invoked more than once because it moves the variable `counter` out of its environment - --> $DIR/unboxed-closures-infer-fnonce-move-call-twice.rs:18:34 + --> $DIR/unboxed-closures-infer-fnonce-move-call-twice.rs:8:34 | LL | let tick = move || mem::drop(counter); | ^^^^^^^ diff --git a/src/test/ui/unboxed-closures/unboxed-closures-mutate-upvar.nll.stderr b/src/test/ui/unboxed-closures/unboxed-closures-mutate-upvar.nll.stderr index f765f207303d2..9b2f1cd4ae339 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-mutate-upvar.nll.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-mutate-upvar.nll.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to `n`, as it is not declared as mutable - --> $DIR/unboxed-closures-mutate-upvar.rs:25:9 + --> $DIR/unboxed-closures-mutate-upvar.rs:15:9 | LL | let n = 0; | - help: consider changing this to be mutable: `mut n` @@ -8,7 +8,7 @@ LL | n += 1; | ^^^^^^ cannot assign error[E0594]: cannot assign to `n`, as it is not declared as mutable - --> $DIR/unboxed-closures-mutate-upvar.rs:42:9 + --> $DIR/unboxed-closures-mutate-upvar.rs:32:9 | LL | let n = 0; | - help: consider changing this to be mutable: `mut n` @@ -17,7 +17,7 @@ LL | n += 1; //~ ERROR cannot assign | ^^^^^^ cannot assign error[E0594]: cannot assign to `n`, as it is not declared as mutable - --> $DIR/unboxed-closures-mutate-upvar.rs:56:9 + --> $DIR/unboxed-closures-mutate-upvar.rs:46:9 | LL | let n = 0; | - help: consider changing this to be mutable: `mut n` @@ -26,13 +26,13 @@ LL | n += 1; //~ ERROR cannot assign | ^^^^^^ cannot assign error[E0594]: cannot assign to `n`, as it is a captured variable in a `Fn` closure - --> $DIR/unboxed-closures-mutate-upvar.rs:63:9 + --> $DIR/unboxed-closures-mutate-upvar.rs:53:9 | LL | n += 1; //~ ERROR cannot assign | ^^^^^^ cannot assign | help: consider changing this to accept closures that implement `FnMut` - --> $DIR/unboxed-closures-mutate-upvar.rs:62:23 + --> $DIR/unboxed-closures-mutate-upvar.rs:52:23 | LL | let mut f = to_fn(move || { | _______________________^ diff --git a/src/test/ui/unboxed-closures/unboxed-closures-mutate-upvar.rs b/src/test/ui/unboxed-closures/unboxed-closures-mutate-upvar.rs index 35052ec0bd507..3bea9226f2115 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-mutate-upvar.rs +++ b/src/test/ui/unboxed-closures/unboxed-closures-mutate-upvar.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we cannot mutate an outer variable that is not declared // as `mut` through a closure. Also test that we CAN mutate a moved copy, // unless this is a `Fn` closure. Issue #16749. diff --git a/src/test/ui/unboxed-closures/unboxed-closures-mutate-upvar.stderr b/src/test/ui/unboxed-closures/unboxed-closures-mutate-upvar.stderr index 1164a864b6b46..6323c8cd3f7aa 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-mutate-upvar.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-mutate-upvar.stderr @@ -1,5 +1,5 @@ error[E0595]: closure cannot assign to immutable local variable `n` - --> $DIR/unboxed-closures-mutate-upvar.rs:24:27 + --> $DIR/unboxed-closures-mutate-upvar.rs:14:27 | LL | let n = 0; | - consider changing this to `mut n` @@ -7,7 +7,7 @@ LL | let mut f = to_fn_mut(|| { //~ ERROR closure cannot assign | ^^ cannot borrow mutably error[E0594]: cannot assign to captured outer variable in an `FnMut` closure - --> $DIR/unboxed-closures-mutate-upvar.rs:42:9 + --> $DIR/unboxed-closures-mutate-upvar.rs:32:9 | LL | let n = 0; | - help: consider making `n` mutable: `mut n` @@ -16,14 +16,14 @@ LL | n += 1; //~ ERROR cannot assign | ^^^^^^ error[E0594]: cannot assign to captured outer variable in an `Fn` closure - --> $DIR/unboxed-closures-mutate-upvar.rs:56:9 + --> $DIR/unboxed-closures-mutate-upvar.rs:46:9 | LL | n += 1; //~ ERROR cannot assign | ^^^^^^ | = note: `Fn` closures cannot capture their enclosing environment for modifications help: consider changing this closure to take self by mutable reference - --> $DIR/unboxed-closures-mutate-upvar.rs:55:23 + --> $DIR/unboxed-closures-mutate-upvar.rs:45:23 | LL | let mut f = to_fn(move || { | _______________________^ @@ -32,14 +32,14 @@ LL | | }); | |_____^ error[E0594]: cannot assign to captured outer variable in an `Fn` closure - --> $DIR/unboxed-closures-mutate-upvar.rs:63:9 + --> $DIR/unboxed-closures-mutate-upvar.rs:53:9 | LL | n += 1; //~ ERROR cannot assign | ^^^^^^ | = note: `Fn` closures cannot capture their enclosing environment for modifications help: consider changing this closure to take self by mutable reference - --> $DIR/unboxed-closures-mutate-upvar.rs:62:23 + --> $DIR/unboxed-closures-mutate-upvar.rs:52:23 | LL | let mut f = to_fn(move || { | _______________________^ diff --git a/src/test/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.ast.nll.stderr b/src/test/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.ast.nll.stderr index be18e7cee9110..2f83a6485cdd7 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.ast.nll.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.ast.nll.stderr @@ -1,11 +1,11 @@ error[E0594]: cannot assign to `counter`, as it is a captured variable in a `Fn` closure - --> $DIR/unboxed-closures-mutated-upvar-from-fn-closure.rs:24:9 + --> $DIR/unboxed-closures-mutated-upvar-from-fn-closure.rs:14:9 | LL | counter += 1; | ^^^^^^^^^^^^ cannot assign | help: consider changing this to accept closures that implement `FnMut` - --> $DIR/unboxed-closures-mutated-upvar-from-fn-closure.rs:23:10 + --> $DIR/unboxed-closures-mutated-upvar-from-fn-closure.rs:13:10 | LL | call(|| { | __________^ diff --git a/src/test/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.ast.stderr b/src/test/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.ast.stderr index 756bf06440c32..293f59ff4b27a 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.ast.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.ast.stderr @@ -1,11 +1,11 @@ error[E0387]: cannot assign to data in a captured outer variable in an `Fn` closure - --> $DIR/unboxed-closures-mutated-upvar-from-fn-closure.rs:24:9 + --> $DIR/unboxed-closures-mutated-upvar-from-fn-closure.rs:14:9 | LL | counter += 1; | ^^^^^^^^^^^^ | help: consider changing this closure to take self by mutable reference - --> $DIR/unboxed-closures-mutated-upvar-from-fn-closure.rs:23:10 + --> $DIR/unboxed-closures-mutated-upvar-from-fn-closure.rs:13:10 | LL | call(|| { | __________^ diff --git a/src/test/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.mir.stderr b/src/test/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.mir.stderr index be18e7cee9110..2f83a6485cdd7 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.mir.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.mir.stderr @@ -1,11 +1,11 @@ error[E0594]: cannot assign to `counter`, as it is a captured variable in a `Fn` closure - --> $DIR/unboxed-closures-mutated-upvar-from-fn-closure.rs:24:9 + --> $DIR/unboxed-closures-mutated-upvar-from-fn-closure.rs:14:9 | LL | counter += 1; | ^^^^^^^^^^^^ cannot assign | help: consider changing this to accept closures that implement `FnMut` - --> $DIR/unboxed-closures-mutated-upvar-from-fn-closure.rs:23:10 + --> $DIR/unboxed-closures-mutated-upvar-from-fn-closure.rs:13:10 | LL | call(|| { | __________^ diff --git a/src/test/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.rs b/src/test/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.rs index f20719ec7fab7..a5dcb57d33a61 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.rs +++ b/src/test/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/unboxed-closures/unboxed-closures-recursive-fn-using-fn-mut.nll.stderr b/src/test/ui/unboxed-closures/unboxed-closures-recursive-fn-using-fn-mut.nll.stderr index e2747e1bb62c4..b30247e1f29c6 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-recursive-fn-using-fn-mut.nll.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-recursive-fn-using-fn-mut.nll.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `*self` as mutable more than once at a time - --> $DIR/unboxed-closures-recursive-fn-using-fn-mut.rs:32:21 + --> $DIR/unboxed-closures-recursive-fn-using-fn-mut.rs:22:21 | LL | (self.func)(self, arg) | ------------^^^^------ diff --git a/src/test/ui/unboxed-closures/unboxed-closures-recursive-fn-using-fn-mut.rs b/src/test/ui/unboxed-closures/unboxed-closures-recursive-fn-using-fn-mut.rs index 433c0c839c580..0beead1ad92c3 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-recursive-fn-using-fn-mut.rs +++ b/src/test/ui/unboxed-closures/unboxed-closures-recursive-fn-using-fn-mut.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(core, fn_traits, unboxed_closures)] use std::marker::PhantomData; diff --git a/src/test/ui/unboxed-closures/unboxed-closures-recursive-fn-using-fn-mut.stderr b/src/test/ui/unboxed-closures/unboxed-closures-recursive-fn-using-fn-mut.stderr index eec48dd78b01c..f881d1982a5f5 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-recursive-fn-using-fn-mut.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-recursive-fn-using-fn-mut.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `*self` as mutable more than once at a time - --> $DIR/unboxed-closures-recursive-fn-using-fn-mut.rs:32:21 + --> $DIR/unboxed-closures-recursive-fn-using-fn-mut.rs:22:21 | LL | (self.func)(self, arg) | ----------- ^^^^ - first borrow ends here diff --git a/src/test/ui/unboxed-closures/unboxed-closures-static-call-wrong-trait.rs b/src/test/ui/unboxed-closures/unboxed-closures-static-call-wrong-trait.rs index 1c133fbfcdbbf..0e727b11cd21e 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-static-call-wrong-trait.rs +++ b/src/test/ui/unboxed-closures/unboxed-closures-static-call-wrong-trait.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unboxed_closures)] fn to_fn_mut>(f: F) -> F { f } diff --git a/src/test/ui/unboxed-closures/unboxed-closures-static-call-wrong-trait.stderr b/src/test/ui/unboxed-closures/unboxed-closures-static-call-wrong-trait.stderr index 53386f0e68ef5..1fccbb9c85727 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-static-call-wrong-trait.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-static-call-wrong-trait.stderr @@ -1,5 +1,5 @@ -error[E0599]: no method named `call` found for type `[closure@$DIR/unboxed-closures-static-call-wrong-trait.rs:16:26: 16:31]` in the current scope - --> $DIR/unboxed-closures-static-call-wrong-trait.rs:17:10 +error[E0599]: no method named `call` found for type `[closure@$DIR/unboxed-closures-static-call-wrong-trait.rs:6:26: 6:31]` in the current scope + --> $DIR/unboxed-closures-static-call-wrong-trait.rs:7:10 | LL | mut_.call((0, )); //~ ERROR no method named `call` found | ^^^^ diff --git a/src/test/ui/unboxed-closures/unboxed-closures-type-mismatch.rs b/src/test/ui/unboxed-closures/unboxed-closures-type-mismatch.rs index dba4c8cc2e9e7..9f76849e5fbff 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-type-mismatch.rs +++ b/src/test/ui/unboxed-closures/unboxed-closures-type-mismatch.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::FnMut; pub fn main() { diff --git a/src/test/ui/unboxed-closures/unboxed-closures-type-mismatch.stderr b/src/test/ui/unboxed-closures/unboxed-closures-type-mismatch.stderr index 7e11130573b17..82e8c63ce27e4 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-type-mismatch.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-type-mismatch.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/unboxed-closures-type-mismatch.rs:15:15 + --> $DIR/unboxed-closures-type-mismatch.rs:5:15 | LL | let z = f(1_usize, 2); //~ ERROR mismatched types | ^^^^^^^ expected isize, found usize diff --git a/src/test/ui/unboxed-closures/unboxed-closures-unsafe-extern-fn.rs b/src/test/ui/unboxed-closures/unboxed-closures-unsafe-extern-fn.rs index 5ba93bf483f2d..12626fe69cb14 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-unsafe-extern-fn.rs +++ b/src/test/ui/unboxed-closures/unboxed-closures-unsafe-extern-fn.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that unsafe extern fn pointers do not implement any Fn traits. use std::ops::{Fn,FnMut,FnOnce}; diff --git a/src/test/ui/unboxed-closures/unboxed-closures-unsafe-extern-fn.stderr b/src/test/ui/unboxed-closures/unboxed-closures-unsafe-extern-fn.stderr index 7c76c10443af9..29f276711c745 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-unsafe-extern-fn.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-unsafe-extern-fn.stderr @@ -1,38 +1,38 @@ error[E0277]: expected a `std::ops::Fn<(&isize,)>` closure, found `for<'r> unsafe fn(&'r isize) -> isize {square}` - --> $DIR/unboxed-closures-unsafe-extern-fn.rs:22:13 + --> $DIR/unboxed-closures-unsafe-extern-fn.rs:12:13 | LL | let x = call_it(&square, 22); | ^^^^^^^ expected an `Fn<(&isize,)>` closure, found `for<'r> unsafe fn(&'r isize) -> isize {square}` | = help: the trait `for<'r> std::ops::Fn<(&'r isize,)>` is not implemented for `for<'r> unsafe fn(&'r isize) -> isize {square}` note: required by `call_it` - --> $DIR/unboxed-closures-unsafe-extern-fn.rs:17:1 + --> $DIR/unboxed-closures-unsafe-extern-fn.rs:7:1 | LL | fn call_itisize>(_: &F, _: isize) -> isize { 0 } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: expected a `std::ops::FnMut<(&isize,)>` closure, found `for<'r> unsafe fn(&'r isize) -> isize {square}` - --> $DIR/unboxed-closures-unsafe-extern-fn.rs:27:13 + --> $DIR/unboxed-closures-unsafe-extern-fn.rs:17:13 | LL | let y = call_it_mut(&mut square, 22); | ^^^^^^^^^^^ expected an `FnMut<(&isize,)>` closure, found `for<'r> unsafe fn(&'r isize) -> isize {square}` | = help: the trait `for<'r> std::ops::FnMut<(&'r isize,)>` is not implemented for `for<'r> unsafe fn(&'r isize) -> isize {square}` note: required by `call_it_mut` - --> $DIR/unboxed-closures-unsafe-extern-fn.rs:18:1 + --> $DIR/unboxed-closures-unsafe-extern-fn.rs:8:1 | LL | fn call_it_mutisize>(_: &mut F, _: isize) -> isize { 0 } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: expected a `std::ops::FnOnce<(&isize,)>` closure, found `for<'r> unsafe fn(&'r isize) -> isize {square}` - --> $DIR/unboxed-closures-unsafe-extern-fn.rs:32:13 + --> $DIR/unboxed-closures-unsafe-extern-fn.rs:22:13 | LL | let z = call_it_once(square, 22); | ^^^^^^^^^^^^ expected an `FnOnce<(&isize,)>` closure, found `for<'r> unsafe fn(&'r isize) -> isize {square}` | = help: the trait `for<'r> std::ops::FnOnce<(&'r isize,)>` is not implemented for `for<'r> unsafe fn(&'r isize) -> isize {square}` note: required by `call_it_once` - --> $DIR/unboxed-closures-unsafe-extern-fn.rs:19:1 + --> $DIR/unboxed-closures-unsafe-extern-fn.rs:9:1 | LL | fn call_it_onceisize>(_: F, _: isize) -> isize { 0 } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/unboxed-closures/unboxed-closures-wrong-abi.rs b/src/test/ui/unboxed-closures/unboxed-closures-wrong-abi.rs index ff06f7c559b2a..7c3152c87c461 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-wrong-abi.rs +++ b/src/test/ui/unboxed-closures/unboxed-closures-wrong-abi.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that unsafe extern fn pointers do not implement any Fn traits. use std::ops::{Fn,FnMut,FnOnce}; diff --git a/src/test/ui/unboxed-closures/unboxed-closures-wrong-abi.stderr b/src/test/ui/unboxed-closures/unboxed-closures-wrong-abi.stderr index 18ade48de6640..e382457860579 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-wrong-abi.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-wrong-abi.stderr @@ -1,38 +1,38 @@ error[E0277]: expected a `std::ops::Fn<(&isize,)>` closure, found `for<'r> extern "C" fn(&'r isize) -> isize {square}` - --> $DIR/unboxed-closures-wrong-abi.rs:22:13 + --> $DIR/unboxed-closures-wrong-abi.rs:12:13 | LL | let x = call_it(&square, 22); | ^^^^^^^ expected an `Fn<(&isize,)>` closure, found `for<'r> extern "C" fn(&'r isize) -> isize {square}` | = help: the trait `for<'r> std::ops::Fn<(&'r isize,)>` is not implemented for `for<'r> extern "C" fn(&'r isize) -> isize {square}` note: required by `call_it` - --> $DIR/unboxed-closures-wrong-abi.rs:17:1 + --> $DIR/unboxed-closures-wrong-abi.rs:7:1 | LL | fn call_itisize>(_: &F, _: isize) -> isize { 0 } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: expected a `std::ops::FnMut<(&isize,)>` closure, found `for<'r> extern "C" fn(&'r isize) -> isize {square}` - --> $DIR/unboxed-closures-wrong-abi.rs:27:13 + --> $DIR/unboxed-closures-wrong-abi.rs:17:13 | LL | let y = call_it_mut(&mut square, 22); | ^^^^^^^^^^^ expected an `FnMut<(&isize,)>` closure, found `for<'r> extern "C" fn(&'r isize) -> isize {square}` | = help: the trait `for<'r> std::ops::FnMut<(&'r isize,)>` is not implemented for `for<'r> extern "C" fn(&'r isize) -> isize {square}` note: required by `call_it_mut` - --> $DIR/unboxed-closures-wrong-abi.rs:18:1 + --> $DIR/unboxed-closures-wrong-abi.rs:8:1 | LL | fn call_it_mutisize>(_: &mut F, _: isize) -> isize { 0 } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: expected a `std::ops::FnOnce<(&isize,)>` closure, found `for<'r> extern "C" fn(&'r isize) -> isize {square}` - --> $DIR/unboxed-closures-wrong-abi.rs:32:13 + --> $DIR/unboxed-closures-wrong-abi.rs:22:13 | LL | let z = call_it_once(square, 22); | ^^^^^^^^^^^^ expected an `FnOnce<(&isize,)>` closure, found `for<'r> extern "C" fn(&'r isize) -> isize {square}` | = help: the trait `for<'r> std::ops::FnOnce<(&'r isize,)>` is not implemented for `for<'r> extern "C" fn(&'r isize) -> isize {square}` note: required by `call_it_once` - --> $DIR/unboxed-closures-wrong-abi.rs:19:1 + --> $DIR/unboxed-closures-wrong-abi.rs:9:1 | LL | fn call_it_onceisize>(_: F, _: isize) -> isize { 0 } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/unboxed-closures/unboxed-closures-wrong-arg-type-extern-fn.rs b/src/test/ui/unboxed-closures/unboxed-closures-wrong-arg-type-extern-fn.rs index d77750d2a0409..61d46869cbbf2 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-wrong-arg-type-extern-fn.rs +++ b/src/test/ui/unboxed-closures/unboxed-closures-wrong-arg-type-extern-fn.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that unsafe extern fn pointers do not implement any Fn traits. use std::ops::{Fn,FnMut,FnOnce}; diff --git a/src/test/ui/unboxed-closures/unboxed-closures-wrong-arg-type-extern-fn.stderr b/src/test/ui/unboxed-closures/unboxed-closures-wrong-arg-type-extern-fn.stderr index f27b73017a28f..da511f091bf6a 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-wrong-arg-type-extern-fn.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-wrong-arg-type-extern-fn.stderr @@ -1,38 +1,38 @@ error[E0277]: expected a `std::ops::Fn<(&isize,)>` closure, found `unsafe fn(isize) -> isize {square}` - --> $DIR/unboxed-closures-wrong-arg-type-extern-fn.rs:23:13 + --> $DIR/unboxed-closures-wrong-arg-type-extern-fn.rs:13:13 | LL | let x = call_it(&square, 22); | ^^^^^^^ expected an `Fn<(&isize,)>` closure, found `unsafe fn(isize) -> isize {square}` | = help: the trait `for<'r> std::ops::Fn<(&'r isize,)>` is not implemented for `unsafe fn(isize) -> isize {square}` note: required by `call_it` - --> $DIR/unboxed-closures-wrong-arg-type-extern-fn.rs:18:1 + --> $DIR/unboxed-closures-wrong-arg-type-extern-fn.rs:8:1 | LL | fn call_itisize>(_: &F, _: isize) -> isize { 0 } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: expected a `std::ops::FnMut<(&isize,)>` closure, found `unsafe fn(isize) -> isize {square}` - --> $DIR/unboxed-closures-wrong-arg-type-extern-fn.rs:28:13 + --> $DIR/unboxed-closures-wrong-arg-type-extern-fn.rs:18:13 | LL | let y = call_it_mut(&mut square, 22); | ^^^^^^^^^^^ expected an `FnMut<(&isize,)>` closure, found `unsafe fn(isize) -> isize {square}` | = help: the trait `for<'r> std::ops::FnMut<(&'r isize,)>` is not implemented for `unsafe fn(isize) -> isize {square}` note: required by `call_it_mut` - --> $DIR/unboxed-closures-wrong-arg-type-extern-fn.rs:19:1 + --> $DIR/unboxed-closures-wrong-arg-type-extern-fn.rs:9:1 | LL | fn call_it_mutisize>(_: &mut F, _: isize) -> isize { 0 } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: expected a `std::ops::FnOnce<(&isize,)>` closure, found `unsafe fn(isize) -> isize {square}` - --> $DIR/unboxed-closures-wrong-arg-type-extern-fn.rs:33:13 + --> $DIR/unboxed-closures-wrong-arg-type-extern-fn.rs:23:13 | LL | let z = call_it_once(square, 22); | ^^^^^^^^^^^^ expected an `FnOnce<(&isize,)>` closure, found `unsafe fn(isize) -> isize {square}` | = help: the trait `for<'r> std::ops::FnOnce<(&'r isize,)>` is not implemented for `unsafe fn(isize) -> isize {square}` note: required by `call_it_once` - --> $DIR/unboxed-closures-wrong-arg-type-extern-fn.rs:20:1 + --> $DIR/unboxed-closures-wrong-arg-type-extern-fn.rs:10:1 | LL | fn call_it_onceisize>(_: F, _: isize) -> isize { 0 } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/unconstrained-none.rs b/src/test/ui/unconstrained-none.rs index 8124773497917..e180b3163d412 100644 --- a/src/test/ui/unconstrained-none.rs +++ b/src/test/ui/unconstrained-none.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #5062 fn main() { diff --git a/src/test/ui/unconstrained-none.stderr b/src/test/ui/unconstrained-none.stderr index 34d524abed9ed..e0ddae4cc8994 100644 --- a/src/test/ui/unconstrained-none.stderr +++ b/src/test/ui/unconstrained-none.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/unconstrained-none.rs:14:5 + --> $DIR/unconstrained-none.rs:4:5 | LL | None; //~ ERROR type annotations needed [E0282] | ^^^^ cannot infer type for `T` diff --git a/src/test/ui/unconstrained-ref.rs b/src/test/ui/unconstrained-ref.rs index 05c0d23b7e72d..473ca954b232d 100644 --- a/src/test/ui/unconstrained-ref.rs +++ b/src/test/ui/unconstrained-ref.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , 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 } diff --git a/src/test/ui/unconstrained-ref.stderr b/src/test/ui/unconstrained-ref.stderr index 1fddf4531199e..7722963293f30 100644 --- a/src/test/ui/unconstrained-ref.stderr +++ b/src/test/ui/unconstrained-ref.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/unconstrained-ref.rs:16:5 + --> $DIR/unconstrained-ref.rs:6:5 | LL | S { o: &None }; //~ ERROR type annotations needed [E0282] | ^ cannot infer type for `T` diff --git a/src/test/ui/underscore-ident-matcher.rs b/src/test/ui/underscore-ident-matcher.rs index eee99296c7941..bddc8c80a7b96 100644 --- a/src/test/ui/underscore-ident-matcher.rs +++ b/src/test/ui/underscore-ident-matcher.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! identity { ($i: ident) => ( $i diff --git a/src/test/ui/underscore-ident-matcher.stderr b/src/test/ui/underscore-ident-matcher.stderr index 7f2b6ac30b0da..35ea35410ba7f 100644 --- a/src/test/ui/underscore-ident-matcher.stderr +++ b/src/test/ui/underscore-ident-matcher.stderr @@ -1,5 +1,5 @@ error: no rules expected the token `_` - --> $DIR/underscore-ident-matcher.rs:18:19 + --> $DIR/underscore-ident-matcher.rs:8:19 | LL | let identity!(_) = 10; //~ ERROR no rules expected the token `_` | ^ diff --git a/src/test/ui/underscore-lifetime/dyn-trait-underscore-in-struct.rs b/src/test/ui/underscore-lifetime/dyn-trait-underscore-in-struct.rs index 6c83205d0504c..37c87dbeaa9e5 100644 --- a/src/test/ui/underscore-lifetime/dyn-trait-underscore-in-struct.rs +++ b/src/test/ui/underscore-lifetime/dyn-trait-underscore-in-struct.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that the `'_` in `dyn Trait + '_` acts like ordinary elision, // and not like an object lifetime default. // diff --git a/src/test/ui/underscore-lifetime/dyn-trait-underscore-in-struct.stderr b/src/test/ui/underscore-lifetime/dyn-trait-underscore-in-struct.stderr index 1017217828a7b..904c6c23def16 100644 --- a/src/test/ui/underscore-lifetime/dyn-trait-underscore-in-struct.stderr +++ b/src/test/ui/underscore-lifetime/dyn-trait-underscore-in-struct.stderr @@ -1,11 +1,11 @@ error[E0106]: missing lifetime specifier - --> $DIR/dyn-trait-underscore-in-struct.rs:19:24 + --> $DIR/dyn-trait-underscore-in-struct.rs:9:24 | LL | x: Box, //~ ERROR missing lifetime specifier | ^^ expected lifetime parameter error[E0228]: the lifetime bound for this object type cannot be deduced from context; please supply an explicit bound - --> $DIR/dyn-trait-underscore-in-struct.rs:19:12 + --> $DIR/dyn-trait-underscore-in-struct.rs:9:12 | LL | x: Box, //~ ERROR missing lifetime specifier | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/underscore-lifetime/dyn-trait-underscore.nll.stderr b/src/test/ui/underscore-lifetime/dyn-trait-underscore.nll.stderr index 799b0982b940f..ab7e9df9f17c1 100644 --- a/src/test/ui/underscore-lifetime/dyn-trait-underscore.nll.stderr +++ b/src/test/ui/underscore-lifetime/dyn-trait-underscore.nll.stderr @@ -1,29 +1,29 @@ warning: not reporting region error due to nll - --> $DIR/dyn-trait-underscore.rs:18:14 + --> $DIR/dyn-trait-underscore.rs:8:14 | LL | Box::new(items.iter()) //~ ERROR cannot infer an appropriate lifetime | ^^^^^ warning: not reporting region error due to nll - --> $DIR/dyn-trait-underscore.rs:18:20 + --> $DIR/dyn-trait-underscore.rs:8:20 | LL | Box::new(items.iter()) //~ ERROR cannot infer an appropriate lifetime | ^^^^ warning: not reporting region error due to nll - --> $DIR/dyn-trait-underscore.rs:18:5 + --> $DIR/dyn-trait-underscore.rs:8:5 | LL | Box::new(items.iter()) //~ ERROR cannot infer an appropriate lifetime | ^^^^^^^^ warning: not reporting region error due to nll - --> $DIR/dyn-trait-underscore.rs:18:5 + --> $DIR/dyn-trait-underscore.rs:8:5 | LL | Box::new(items.iter()) //~ ERROR cannot infer an appropriate lifetime | ^^^^^^^^^^^^^^^^^^^^^^ error: unsatisfied lifetime constraints - --> $DIR/dyn-trait-underscore.rs:16:52 + --> $DIR/dyn-trait-underscore.rs:6:52 | LL | fn a(items: &[T]) -> Box> { | ________________-___________________________________^ diff --git a/src/test/ui/underscore-lifetime/dyn-trait-underscore.rs b/src/test/ui/underscore-lifetime/dyn-trait-underscore.rs index 247492fb7b77b..d5aa18eb0f4e7 100644 --- a/src/test/ui/underscore-lifetime/dyn-trait-underscore.rs +++ b/src/test/ui/underscore-lifetime/dyn-trait-underscore.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that the `'_` in `dyn Trait + '_` acts like ordinary elision, // and not like an object lifetime default. // diff --git a/src/test/ui/underscore-lifetime/dyn-trait-underscore.stderr b/src/test/ui/underscore-lifetime/dyn-trait-underscore.stderr index cb545ca008d65..4eb959311ca48 100644 --- a/src/test/ui/underscore-lifetime/dyn-trait-underscore.stderr +++ b/src/test/ui/underscore-lifetime/dyn-trait-underscore.stderr @@ -1,11 +1,11 @@ error[E0495]: cannot infer an appropriate lifetime for autoref due to conflicting requirements - --> $DIR/dyn-trait-underscore.rs:18:20 + --> $DIR/dyn-trait-underscore.rs:8:20 | LL | Box::new(items.iter()) //~ ERROR cannot infer an appropriate lifetime | ^^^^ | -note: first, the lifetime cannot outlive the anonymous lifetime #1 defined on the function body at 16:1... - --> $DIR/dyn-trait-underscore.rs:16:1 +note: first, the lifetime cannot outlive the anonymous lifetime #1 defined on the function body at 6:1... + --> $DIR/dyn-trait-underscore.rs:6:1 | LL | / fn a(items: &[T]) -> Box> { LL | | // ^^^^^^^^^^^^^^^^^^^^^ bound *here* defaults to `'static` @@ -13,7 +13,7 @@ LL | | Box::new(items.iter()) //~ ERROR cannot infer an appropriate lifetime LL | | } | |_^ note: ...so that reference does not outlive borrowed content - --> $DIR/dyn-trait-underscore.rs:18:14 + --> $DIR/dyn-trait-underscore.rs:8:14 | LL | Box::new(items.iter()) //~ ERROR cannot infer an appropriate lifetime | ^^^^^ diff --git a/src/test/ui/underscore-lifetime/underscore-lifetime-binders.rs b/src/test/ui/underscore-lifetime/underscore-lifetime-binders.rs index 6a6698957d9d1..2b3a33888106e 100644 --- a/src/test/ui/underscore-lifetime/underscore-lifetime-binders.rs +++ b/src/test/ui/underscore-lifetime/underscore-lifetime-binders.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo<'a>(&'a u8); struct Baz<'a>(&'_ &'a u8); //~ ERROR missing lifetime specifier diff --git a/src/test/ui/underscore-lifetime/underscore-lifetime-binders.stderr b/src/test/ui/underscore-lifetime/underscore-lifetime-binders.stderr index 4917c2795e39d..5af17d4b5eb61 100644 --- a/src/test/ui/underscore-lifetime/underscore-lifetime-binders.stderr +++ b/src/test/ui/underscore-lifetime/underscore-lifetime-binders.stderr @@ -1,29 +1,29 @@ error[E0106]: missing lifetime specifier - --> $DIR/underscore-lifetime-binders.rs:12:17 + --> $DIR/underscore-lifetime-binders.rs:2:17 | LL | struct Baz<'a>(&'_ &'a u8); //~ ERROR missing lifetime specifier | ^^ expected lifetime parameter error[E0106]: missing lifetime specifier - --> $DIR/underscore-lifetime-binders.rs:14:10 + --> $DIR/underscore-lifetime-binders.rs:4:10 | LL | impl Foo<'_> { //~ ERROR missing lifetime specifier | ^^ expected lifetime parameter error[E0262]: invalid lifetime parameter name: `'_` - --> $DIR/underscore-lifetime-binders.rs:18:8 + --> $DIR/underscore-lifetime-binders.rs:8:8 | LL | fn foo<'_> //~ ERROR invalid lifetime parameter name: `'_` | ^^ '_ is a reserved lifetime name error[E0262]: invalid lifetime parameter name: `'_` - --> $DIR/underscore-lifetime-binders.rs:24:21 + --> $DIR/underscore-lifetime-binders.rs:14:21 | LL | fn meh() -> Box Meh<'_>> //~ ERROR invalid lifetime parameter name: `'_` | ^^ '_ is a reserved lifetime name error[E0106]: missing lifetime specifier - --> $DIR/underscore-lifetime-binders.rs:24:29 + --> $DIR/underscore-lifetime-binders.rs:14:29 | LL | fn meh() -> Box Meh<'_>> //~ ERROR invalid lifetime parameter name: `'_` | ^^ expected lifetime parameter @@ -32,7 +32,7 @@ LL | fn meh() -> Box Meh<'_>> //~ ERROR invalid lifetime parameter name: = help: consider giving it a 'static lifetime error[E0106]: missing lifetime specifier - --> $DIR/underscore-lifetime-binders.rs:30:35 + --> $DIR/underscore-lifetime-binders.rs:20:35 | LL | fn foo2(_: &'_ u8, y: &'_ u8) -> &'_ u8 { y } //~ ERROR missing lifetime specifier | ^^ expected lifetime parameter diff --git a/src/test/ui/underscore-lifetime/underscore-lifetime-elison-mismatch.nll.stderr b/src/test/ui/underscore-lifetime/underscore-lifetime-elison-mismatch.nll.stderr index eef04cbf35177..22775f50f0f87 100644 --- a/src/test/ui/underscore-lifetime/underscore-lifetime-elison-mismatch.nll.stderr +++ b/src/test/ui/underscore-lifetime/underscore-lifetime-elison-mismatch.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/underscore-lifetime-elison-mismatch.rs:11:49 + --> $DIR/underscore-lifetime-elison-mismatch.rs:1:49 | LL | fn foo(x: &mut Vec<&'_ u8>, y: &'_ u8) { x.push(y); } //~ ERROR lifetime mismatch | ^ error: unsatisfied lifetime constraints - --> $DIR/underscore-lifetime-elison-mismatch.rs:11:42 + --> $DIR/underscore-lifetime-elison-mismatch.rs:1:42 | LL | fn foo(x: &mut Vec<&'_ u8>, y: &'_ u8) { x.push(y); } //~ ERROR lifetime mismatch | - - ^^^^^^^^^ argument requires that `'1` must outlive `'2` diff --git a/src/test/ui/underscore-lifetime/underscore-lifetime-elison-mismatch.rs b/src/test/ui/underscore-lifetime/underscore-lifetime-elison-mismatch.rs index b36c8eb324e10..f465a804283a7 100644 --- a/src/test/ui/underscore-lifetime/underscore-lifetime-elison-mismatch.rs +++ b/src/test/ui/underscore-lifetime/underscore-lifetime-elison-mismatch.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo(x: &mut Vec<&'_ u8>, y: &'_ u8) { x.push(y); } //~ ERROR lifetime mismatch fn main() {} diff --git a/src/test/ui/underscore-lifetime/underscore-lifetime-elison-mismatch.stderr b/src/test/ui/underscore-lifetime/underscore-lifetime-elison-mismatch.stderr index 0847ea362c9e4..b653b30bf6b76 100644 --- a/src/test/ui/underscore-lifetime/underscore-lifetime-elison-mismatch.stderr +++ b/src/test/ui/underscore-lifetime/underscore-lifetime-elison-mismatch.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/underscore-lifetime-elison-mismatch.rs:11:49 + --> $DIR/underscore-lifetime-elison-mismatch.rs:1:49 | LL | fn foo(x: &mut Vec<&'_ u8>, y: &'_ u8) { x.push(y); } //~ ERROR lifetime mismatch | ------ ------ ^ ...but data from `y` flows into `x` here diff --git a/src/test/ui/unevaluated_fixed_size_array_len.rs b/src/test/ui/unevaluated_fixed_size_array_len.rs index a6ed9f32106fb..6c545913dd9dc 100644 --- a/src/test/ui/unevaluated_fixed_size_array_len.rs +++ b/src/test/ui/unevaluated_fixed_size_array_len.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // https://github.com/rust-lang/rust/issues/49208 trait Foo { diff --git a/src/test/ui/unevaluated_fixed_size_array_len.stderr b/src/test/ui/unevaluated_fixed_size_array_len.stderr index 6e959da99397b..200cf2a994d82 100644 --- a/src/test/ui/unevaluated_fixed_size_array_len.stderr +++ b/src/test/ui/unevaluated_fixed_size_array_len.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `[(); 0]: Foo` is not satisfied - --> $DIR/unevaluated_fixed_size_array_len.rs:22:5 + --> $DIR/unevaluated_fixed_size_array_len.rs:12:5 | LL | <[(); 0] as Foo>::foo() //~ ERROR E0277 | ^^^^^^^^^^^^^^^^^^^^^ the trait `Foo` is not implemented for `[(); 0]` @@ -7,7 +7,7 @@ LL | <[(); 0] as Foo>::foo() //~ ERROR E0277 = help: the following implementations were found: <[(); 1] as Foo> note: required by `Foo::foo` - --> $DIR/unevaluated_fixed_size_array_len.rs:14:5 + --> $DIR/unevaluated_fixed_size_array_len.rs:4:5 | LL | fn foo(); | ^^^^^^^^^ diff --git a/src/test/ui/uninhabited/uninhabited-enum-cast.rs b/src/test/ui/uninhabited/uninhabited-enum-cast.rs index 2a5d25e6b98dd..7e178e054cc4e 100644 --- a/src/test/ui/uninhabited/uninhabited-enum-cast.rs +++ b/src/test/ui/uninhabited/uninhabited-enum-cast.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum E {} fn f(e: E) { diff --git a/src/test/ui/uninhabited/uninhabited-enum-cast.stderr b/src/test/ui/uninhabited/uninhabited-enum-cast.stderr index 058f8fba77cc3..36dab0c43eb76 100644 --- a/src/test/ui/uninhabited/uninhabited-enum-cast.stderr +++ b/src/test/ui/uninhabited/uninhabited-enum-cast.stderr @@ -1,5 +1,5 @@ error[E0605]: non-primitive cast: `E` as `isize` - --> $DIR/uninhabited-enum-cast.rs:14:20 + --> $DIR/uninhabited-enum-cast.rs:4:20 | LL | println!("{}", (e as isize).to_string()); //~ ERROR non-primitive cast | ^^^^^^^^^^^^ diff --git a/src/test/ui/uninhabited/uninhabited-irrefutable.rs b/src/test/ui/uninhabited/uninhabited-irrefutable.rs index 05a97b855e703..c32d3a4a0a291 100644 --- a/src/test/ui/uninhabited/uninhabited-irrefutable.rs +++ b/src/test/ui/uninhabited/uninhabited-irrefutable.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(never_type)] #![feature(exhaustive_patterns)] diff --git a/src/test/ui/uninhabited/uninhabited-irrefutable.stderr b/src/test/ui/uninhabited/uninhabited-irrefutable.stderr index e14ca6262228e..63819bf949bd3 100644 --- a/src/test/ui/uninhabited/uninhabited-irrefutable.stderr +++ b/src/test/ui/uninhabited/uninhabited-irrefutable.stderr @@ -1,5 +1,5 @@ error[E0005]: refutable pattern in local binding: `A(_)` not covered - --> $DIR/uninhabited-irrefutable.rs:37:9 + --> $DIR/uninhabited-irrefutable.rs:27:9 | LL | let Foo::D(_y) = x; //~ ERROR refutable pattern in local binding: `A(_)` not covered | ^^^^^^^^^^ pattern `A(_)` not covered diff --git a/src/test/ui/uninhabited/uninhabited-matches-feature-gated.rs b/src/test/ui/uninhabited/uninhabited-matches-feature-gated.rs index 1d3f8ff12d865..38a52d5860d4b 100644 --- a/src/test/ui/uninhabited/uninhabited-matches-feature-gated.rs +++ b/src/test/ui/uninhabited/uninhabited-matches-feature-gated.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Void {} fn main() { diff --git a/src/test/ui/uninhabited/uninhabited-matches-feature-gated.stderr b/src/test/ui/uninhabited/uninhabited-matches-feature-gated.stderr index d86ebda027efb..d2869f1787c58 100644 --- a/src/test/ui/uninhabited/uninhabited-matches-feature-gated.stderr +++ b/src/test/ui/uninhabited/uninhabited-matches-feature-gated.stderr @@ -1,59 +1,59 @@ error[E0004]: non-exhaustive patterns: `Err(_)` not covered - --> $DIR/uninhabited-matches-feature-gated.rs:15:19 + --> $DIR/uninhabited-matches-feature-gated.rs:5:19 | LL | let _ = match x { //~ ERROR non-exhaustive | ^ pattern `Err(_)` not covered error[E0004]: non-exhaustive patterns: type &Void is non-empty - --> $DIR/uninhabited-matches-feature-gated.rs:20:19 + --> $DIR/uninhabited-matches-feature-gated.rs:10:19 | LL | let _ = match x {}; //~ ERROR non-exhaustive | ^ | help: Please ensure that all possible cases are being handled; possibly adding wildcards or more match arms. - --> $DIR/uninhabited-matches-feature-gated.rs:20:19 + --> $DIR/uninhabited-matches-feature-gated.rs:10:19 | LL | let _ = match x {}; //~ ERROR non-exhaustive | ^ error[E0004]: non-exhaustive patterns: type (Void,) is non-empty - --> $DIR/uninhabited-matches-feature-gated.rs:23:19 + --> $DIR/uninhabited-matches-feature-gated.rs:13:19 | LL | let _ = match x {}; //~ ERROR non-exhaustive | ^ | help: Please ensure that all possible cases are being handled; possibly adding wildcards or more match arms. - --> $DIR/uninhabited-matches-feature-gated.rs:23:19 + --> $DIR/uninhabited-matches-feature-gated.rs:13:19 | LL | let _ = match x {}; //~ ERROR non-exhaustive | ^ error[E0004]: non-exhaustive patterns: type [Void; 1] is non-empty - --> $DIR/uninhabited-matches-feature-gated.rs:26:19 + --> $DIR/uninhabited-matches-feature-gated.rs:16:19 | LL | let _ = match x {}; //~ ERROR non-exhaustive | ^ | help: Please ensure that all possible cases are being handled; possibly adding wildcards or more match arms. - --> $DIR/uninhabited-matches-feature-gated.rs:26:19 + --> $DIR/uninhabited-matches-feature-gated.rs:16:19 | LL | let _ = match x {}; //~ ERROR non-exhaustive | ^ error[E0004]: non-exhaustive patterns: `&[_]` not covered - --> $DIR/uninhabited-matches-feature-gated.rs:29:19 + --> $DIR/uninhabited-matches-feature-gated.rs:19:19 | LL | let _ = match x { //~ ERROR non-exhaustive | ^ pattern `&[_]` not covered error[E0004]: non-exhaustive patterns: `Err(_)` not covered - --> $DIR/uninhabited-matches-feature-gated.rs:37:19 + --> $DIR/uninhabited-matches-feature-gated.rs:27:19 | LL | let _ = match x { //~ ERROR non-exhaustive | ^ pattern `Err(_)` not covered error[E0005]: refutable pattern in local binding: `Err(_)` not covered - --> $DIR/uninhabited-matches-feature-gated.rs:42:9 + --> $DIR/uninhabited-matches-feature-gated.rs:32:9 | LL | let Ok(x) = x; | ^^^^^ pattern `Err(_)` not covered diff --git a/src/test/ui/uninhabited/uninhabited-patterns.rs b/src/test/ui/uninhabited/uninhabited-patterns.rs index 2cf4b78bdffe4..609ed3d75bafa 100644 --- a/src/test/ui/uninhabited/uninhabited-patterns.rs +++ b/src/test/ui/uninhabited/uninhabited-patterns.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_patterns)] #![feature(box_syntax)] #![feature(never_type)] diff --git a/src/test/ui/uninhabited/uninhabited-patterns.stderr b/src/test/ui/uninhabited/uninhabited-patterns.stderr index f11ff7c13b5e9..eaae024cbf915 100644 --- a/src/test/ui/uninhabited/uninhabited-patterns.stderr +++ b/src/test/ui/uninhabited/uninhabited-patterns.stderr @@ -1,35 +1,35 @@ error: unreachable pattern - --> $DIR/uninhabited-patterns.rs:37:9 + --> $DIR/uninhabited-patterns.rs:27:9 | LL | &[..] => (), //~ ERROR unreachable pattern | ^^^^^ | note: lint level defined here - --> $DIR/uninhabited-patterns.rs:16:9 + --> $DIR/uninhabited-patterns.rs:6:9 | LL | #![deny(unreachable_patterns)] | ^^^^^^^^^^^^^^^^^^^^ error: unreachable pattern - --> $DIR/uninhabited-patterns.rs:42:9 + --> $DIR/uninhabited-patterns.rs:32:9 | LL | Ok(box _) => (), //~ ERROR unreachable pattern | ^^^^^^^^^ error: unreachable pattern - --> $DIR/uninhabited-patterns.rs:44:9 + --> $DIR/uninhabited-patterns.rs:34:9 | LL | Err(&[..]) => (), //~ ERROR unreachable pattern | ^^^^^^^^^^ error: unreachable pattern - --> $DIR/uninhabited-patterns.rs:51:9 + --> $DIR/uninhabited-patterns.rs:41:9 | LL | Err(Ok(_y)) => (), //~ ERROR unreachable pattern | ^^^^^^^^^^^ error: unreachable pattern - --> $DIR/uninhabited-patterns.rs:54:15 + --> $DIR/uninhabited-patterns.rs:44:15 | LL | while let Some(_y) = foo() { | ^^^^^^^^ diff --git a/src/test/ui/union-ub-fat-ptr.rs b/src/test/ui/union-ub-fat-ptr.rs index ffa824fc6af47..b6505fd94c7c4 100644 --- a/src/test/ui/union-ub-fat-ptr.rs +++ b/src/test/ui/union-ub-fat-ptr.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // normalize-stderr-test "alignment \d+" -> "alignment N" // normalize-stderr-test "offset \d+" -> "offset N" // normalize-stderr-test "allocation \d+" -> "allocation N" diff --git a/src/test/ui/union-ub-fat-ptr.stderr b/src/test/ui/union-ub-fat-ptr.stderr index cc22422304d68..e35f085456353 100644 --- a/src/test/ui/union-ub-fat-ptr.stderr +++ b/src/test/ui/union-ub-fat-ptr.stderr @@ -1,5 +1,5 @@ error[E0080]: this constant likely exhibits undefined behavior - --> $DIR/union-ub-fat-ptr.rs:79:1 + --> $DIR/union-ub-fat-ptr.rs:69:1 | LL | const B: &str = unsafe { SliceTransmute { repr: SliceRepr { ptr: &42, len: 999 } }.str}; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ memory access at offset N, outside bounds of allocation N which has size N @@ -7,7 +7,7 @@ LL | const B: &str = unsafe { SliceTransmute { repr: SliceRepr { ptr: &42, len: = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rust compiler repository if you believe it should not be considered undefined behavior error[E0080]: this constant likely exhibits undefined behavior - --> $DIR/union-ub-fat-ptr.rs:82:1 + --> $DIR/union-ub-fat-ptr.rs:72:1 | LL | const C: &str = unsafe { SliceTransmute { bad: BadSliceRepr { ptr: &42, len: &3 } }.str}; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered fat pointer length is not a valid integer @@ -15,7 +15,7 @@ LL | const C: &str = unsafe { SliceTransmute { bad: BadSliceRepr { ptr: &42, len = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rust compiler repository if you believe it should not be considered undefined behavior error[E0080]: this constant likely exhibits undefined behavior - --> $DIR/union-ub-fat-ptr.rs:85:1 + --> $DIR/union-ub-fat-ptr.rs:75:1 | LL | const C2: &Str = unsafe { SliceTransmute { bad: BadSliceRepr { ptr: &42, len: &3 } }.my_str}; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered fat pointer length is not a valid integer @@ -23,7 +23,7 @@ LL | const C2: &Str = unsafe { SliceTransmute { bad: BadSliceRepr { ptr: &42, le = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rust compiler repository if you believe it should not be considered undefined behavior error[E0080]: this constant likely exhibits undefined behavior - --> $DIR/union-ub-fat-ptr.rs:91:1 + --> $DIR/union-ub-fat-ptr.rs:81:1 | LL | const B2: &[u8] = unsafe { SliceTransmute { repr: SliceRepr { ptr: &42, len: 999 } }.slice}; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ memory access at offset N, outside bounds of allocation N which has size N @@ -31,7 +31,7 @@ LL | const B2: &[u8] = unsafe { SliceTransmute { repr: SliceRepr { ptr: &42, len = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rust compiler repository if you believe it should not be considered undefined behavior error[E0080]: this constant likely exhibits undefined behavior - --> $DIR/union-ub-fat-ptr.rs:94:1 + --> $DIR/union-ub-fat-ptr.rs:84:1 | LL | const C3: &[u8] = unsafe { SliceTransmute { bad: BadSliceRepr { ptr: &42, len: &3 } }.slice}; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered fat pointer length is not a valid integer @@ -39,7 +39,7 @@ LL | const C3: &[u8] = unsafe { SliceTransmute { bad: BadSliceRepr { ptr: &42, l = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rust compiler repository if you believe it should not be considered undefined behavior error[E0080]: this constant likely exhibits undefined behavior - --> $DIR/union-ub-fat-ptr.rs:98:1 + --> $DIR/union-ub-fat-ptr.rs:88:1 | LL | const D: &Trait = unsafe { DynTransmute { repr: DynRepr { ptr: &92, vtable: &3 } }.rust}; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ tried to access memory with alignment N, but alignment N is required @@ -47,7 +47,7 @@ LL | const D: &Trait = unsafe { DynTransmute { repr: DynRepr { ptr: &92, vtable: = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rust compiler repository if you believe it should not be considered undefined behavior error[E0080]: this constant likely exhibits undefined behavior - --> $DIR/union-ub-fat-ptr.rs:101:1 + --> $DIR/union-ub-fat-ptr.rs:91:1 | LL | const E: &Trait = unsafe { DynTransmute { repr2: DynRepr2 { ptr: &92, vtable: &3 } }.rust}; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ a memory access tried to interpret some bytes as a pointer @@ -55,7 +55,7 @@ LL | const E: &Trait = unsafe { DynTransmute { repr2: DynRepr2 { ptr: &92, vtabl = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rust compiler repository if you believe it should not be considered undefined behavior error[E0080]: this constant likely exhibits undefined behavior - --> $DIR/union-ub-fat-ptr.rs:104:1 + --> $DIR/union-ub-fat-ptr.rs:94:1 | LL | const F: &Trait = unsafe { DynTransmute { bad: BadDynRepr { ptr: &92, vtable: 3 } }.rust}; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered fat pointer vtable is not a valid pointer @@ -63,7 +63,7 @@ LL | const F: &Trait = unsafe { DynTransmute { bad: BadDynRepr { ptr: &92, vtabl = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rust compiler repository if you believe it should not be considered undefined behavior error[E0080]: this constant likely exhibits undefined behavior - --> $DIR/union-ub-fat-ptr.rs:108:1 + --> $DIR/union-ub-fat-ptr.rs:98:1 | LL | const G: &Trait = &unsafe { BoolTransmute { val: 3 }.bl }; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered 3 at ., but expected something in the range 0..=1 @@ -71,7 +71,7 @@ LL | const G: &Trait = &unsafe { BoolTransmute { val: 3 }.bl }; = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rust compiler repository if you believe it should not be considered undefined behavior error[E0080]: this constant likely exhibits undefined behavior - --> $DIR/union-ub-fat-ptr.rs:112:1 + --> $DIR/union-ub-fat-ptr.rs:102:1 | LL | const H: &[bool] = &[unsafe { BoolTransmute { val: 3 }.bl }]; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered 3 at .[0], but expected something in the range 0..=1 diff --git a/src/test/ui/union/union-borrow-move-parent-sibling.nll.stderr b/src/test/ui/union/union-borrow-move-parent-sibling.nll.stderr index 1ca2a56e757fb..9ec831a646a49 100644 --- a/src/test/ui/union/union-borrow-move-parent-sibling.nll.stderr +++ b/src/test/ui/union/union-borrow-move-parent-sibling.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `u.y` - --> $DIR/union-borrow-move-parent-sibling.rs:29:13 + --> $DIR/union-borrow-move-parent-sibling.rs:19:13 | LL | let a = u.x.0; | ----- value moved here @@ -9,7 +9,7 @@ LL | let a = u.y; //~ ERROR use of moved value: `u.y` = note: move occurs because `u` has type `U`, which does not implement the `Copy` trait error[E0382]: use of moved value: `u.y` - --> $DIR/union-borrow-move-parent-sibling.rs:41:13 + --> $DIR/union-borrow-move-parent-sibling.rs:31:13 | LL | let a = (u.x.0).0; | --------- value moved here @@ -19,7 +19,7 @@ LL | let a = u.y; //~ ERROR use of moved value: `u.y` = note: move occurs because `u` has type `U`, which does not implement the `Copy` trait error[E0382]: use of moved value: `u.x` - --> $DIR/union-borrow-move-parent-sibling.rs:53:13 + --> $DIR/union-borrow-move-parent-sibling.rs:43:13 | LL | let a = *u.y; | ---- value moved here diff --git a/src/test/ui/union/union-borrow-move-parent-sibling.rs b/src/test/ui/union/union-borrow-move-parent-sibling.rs index 5f504feabb266..9adc94a6d1b91 100644 --- a/src/test/ui/union/union-borrow-move-parent-sibling.rs +++ b/src/test/ui/union/union-borrow-move-parent-sibling.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(untagged_unions)] #![allow(unused)] diff --git a/src/test/ui/union/union-borrow-move-parent-sibling.stderr b/src/test/ui/union/union-borrow-move-parent-sibling.stderr index d855435416e5d..c91c91ce09f67 100644 --- a/src/test/ui/union/union-borrow-move-parent-sibling.stderr +++ b/src/test/ui/union/union-borrow-move-parent-sibling.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `u.y` as immutable because `u.x.0` is also borrowed as mutable - --> $DIR/union-borrow-move-parent-sibling.rs:23:14 + --> $DIR/union-borrow-move-parent-sibling.rs:13:14 | LL | let a = &mut u.x.0; | ----- mutable borrow occurs here @@ -9,7 +9,7 @@ LL | } | - mutable borrow ends here error[E0382]: use of moved value: `u.y` - --> $DIR/union-borrow-move-parent-sibling.rs:29:9 + --> $DIR/union-borrow-move-parent-sibling.rs:19:9 | LL | let a = u.x.0; | - value moved here @@ -19,7 +19,7 @@ LL | let a = u.y; //~ ERROR use of moved value: `u.y` = note: move occurs because `u.y` has type `[type error]`, which does not implement the `Copy` trait error[E0502]: cannot borrow `u.y` as immutable because `u.x.0.0` is also borrowed as mutable - --> $DIR/union-borrow-move-parent-sibling.rs:35:14 + --> $DIR/union-borrow-move-parent-sibling.rs:25:14 | LL | let a = &mut (u.x.0).0; | --------- mutable borrow occurs here @@ -29,7 +29,7 @@ LL | } | - mutable borrow ends here error[E0382]: use of moved value: `u.y` - --> $DIR/union-borrow-move-parent-sibling.rs:41:9 + --> $DIR/union-borrow-move-parent-sibling.rs:31:9 | LL | let a = (u.x.0).0; | - value moved here @@ -39,7 +39,7 @@ LL | let a = u.y; //~ ERROR use of moved value: `u.y` = note: move occurs because `u.y` has type `[type error]`, which does not implement the `Copy` trait error[E0502]: cannot borrow `u` (via `u.x`) as immutable because `u` is also borrowed as mutable (via `*u.y`) - --> $DIR/union-borrow-move-parent-sibling.rs:47:14 + --> $DIR/union-borrow-move-parent-sibling.rs:37:14 | LL | let a = &mut *u.y; | ---- mutable borrow occurs here (via `*u.y`) @@ -49,7 +49,7 @@ LL | } | - mutable borrow ends here error[E0382]: use of moved value: `u.x` - --> $DIR/union-borrow-move-parent-sibling.rs:53:9 + --> $DIR/union-borrow-move-parent-sibling.rs:43:9 | LL | let a = *u.y; | - value moved here diff --git a/src/test/ui/union/union-const-eval.rs b/src/test/ui/union/union-const-eval.rs index c640acec05e80..05e849a3bb617 100644 --- a/src/test/ui/union/union-const-eval.rs +++ b/src/test/ui/union/union-const-eval.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![feature(const_fn_union)] diff --git a/src/test/ui/union/union-const-pat.rs b/src/test/ui/union/union-const-pat.rs index 5f75e3cc4a2d6..e7cb248a201ac 100644 --- a/src/test/ui/union/union-const-pat.rs +++ b/src/test/ui/union/union-const-pat.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - union U { a: usize, b: usize, diff --git a/src/test/ui/union/union-const-pat.stderr b/src/test/ui/union/union-const-pat.stderr index 2d9c9a5e52049..5106721f310ec 100644 --- a/src/test/ui/union/union-const-pat.stderr +++ b/src/test/ui/union/union-const-pat.stderr @@ -1,5 +1,5 @@ error: cannot use unions in constant patterns - --> $DIR/union-const-pat.rs:20:9 + --> $DIR/union-const-pat.rs:10:9 | LL | C => {} //~ ERROR cannot use unions in constant patterns | ^ diff --git a/src/test/ui/union/union-copy.rs b/src/test/ui/union/union-copy.rs index 9014b3f2956b7..8318f96940e93 100644 --- a/src/test/ui/union/union-copy.rs +++ b/src/test/ui/union/union-copy.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(untagged_unions)] #[derive(Clone)] diff --git a/src/test/ui/union/union-copy.stderr b/src/test/ui/union/union-copy.stderr index 05da9e90af76b..b3991b5ba6a59 100644 --- a/src/test/ui/union/union-copy.stderr +++ b/src/test/ui/union/union-copy.stderr @@ -1,5 +1,5 @@ error[E0204]: the trait `Copy` may not be implemented for this type - --> $DIR/union-copy.rs:24:6 + --> $DIR/union-copy.rs:14:6 | LL | a: String | --------- this field does not implement `Copy` diff --git a/src/test/ui/union/union-derive-clone.rs b/src/test/ui/union/union-derive-clone.rs index 6e226d7d79f9f..64c3caef44906 100644 --- a/src/test/ui/union/union-derive-clone.rs +++ b/src/test/ui/union/union-derive-clone.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(untagged_unions)] #[derive(Clone)] //~ ERROR the trait bound `U1: std::marker::Copy` is not satisfied diff --git a/src/test/ui/union/union-derive-clone.stderr b/src/test/ui/union/union-derive-clone.stderr index e9a92b4452afb..9580a9710e1f9 100644 --- a/src/test/ui/union/union-derive-clone.stderr +++ b/src/test/ui/union/union-derive-clone.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `U1: std::marker::Copy` is not satisfied - --> $DIR/union-derive-clone.rs:13:10 + --> $DIR/union-derive-clone.rs:3:10 | LL | #[derive(Clone)] //~ ERROR the trait bound `U1: std::marker::Copy` is not satisfied | ^^^^^ the trait `std::marker::Copy` is not implemented for `U1` @@ -7,7 +7,7 @@ LL | #[derive(Clone)] //~ ERROR the trait bound `U1: std::marker::Copy` is not s = note: required by `std::clone::AssertParamIsCopy` error[E0599]: no method named `clone` found for type `U4` in the current scope - --> $DIR/union-derive-clone.rs:40:15 + --> $DIR/union-derive-clone.rs:30:15 | LL | union U4 { | ----------- method `clone` not found for this diff --git a/src/test/ui/union/union-derive-eq.rs b/src/test/ui/union/union-derive-eq.rs index 9dfec288c1572..698c38fac72bc 100644 --- a/src/test/ui/union/union-derive-eq.rs +++ b/src/test/ui/union/union-derive-eq.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(untagged_unions)] #[derive(Eq)] // OK diff --git a/src/test/ui/union/union-derive-eq.stderr b/src/test/ui/union/union-derive-eq.stderr index 02fa0ca6f8310..d93dcd64efc02 100644 --- a/src/test/ui/union/union-derive-eq.stderr +++ b/src/test/ui/union/union-derive-eq.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `PartialEqNotEq: std::cmp::Eq` is not satisfied - --> $DIR/union-derive-eq.rs:25:5 + --> $DIR/union-derive-eq.rs:15:5 | LL | a: PartialEqNotEq, //~ ERROR the trait bound `PartialEqNotEq: std::cmp::Eq` is not satisfied | ^^^^^^^^^^^^^^^^^ the trait `std::cmp::Eq` is not implemented for `PartialEqNotEq` diff --git a/src/test/ui/union/union-derive.rs b/src/test/ui/union/union-derive.rs index ffd290fb073db..652a6b24cff26 100644 --- a/src/test/ui/union/union-derive.rs +++ b/src/test/ui/union/union-derive.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Most traits cannot be derived for unions. #[derive( diff --git a/src/test/ui/union/union-derive.stderr b/src/test/ui/union/union-derive.stderr index e8e11e832d901..0ec873553f307 100644 --- a/src/test/ui/union/union-derive.stderr +++ b/src/test/ui/union/union-derive.stderr @@ -1,35 +1,35 @@ error: this trait cannot be derived for unions - --> $DIR/union-derive.rs:19:5 + --> $DIR/union-derive.rs:9:5 | LL | Debug, //~ ERROR this trait cannot be derived for unions | ^^^^^ error: this trait cannot be derived for unions - --> $DIR/union-derive.rs:18:5 + --> $DIR/union-derive.rs:8:5 | LL | Default, //~ ERROR this trait cannot be derived for unions | ^^^^^^^ error: this trait cannot be derived for unions - --> $DIR/union-derive.rs:17:5 + --> $DIR/union-derive.rs:7:5 | LL | Hash, //~ ERROR this trait cannot be derived for unions | ^^^^ error: this trait cannot be derived for unions - --> $DIR/union-derive.rs:16:5 + --> $DIR/union-derive.rs:6:5 | LL | Ord, //~ ERROR this trait cannot be derived for unions | ^^^ error: this trait cannot be derived for unions - --> $DIR/union-derive.rs:15:5 + --> $DIR/union-derive.rs:5:5 | LL | PartialOrd, //~ ERROR this trait cannot be derived for unions | ^^^^^^^^^^ error: this trait cannot be derived for unions - --> $DIR/union-derive.rs:14:5 + --> $DIR/union-derive.rs:4:5 | LL | PartialEq, //~ ERROR this trait cannot be derived for unions | ^^^^^^^^^ diff --git a/src/test/ui/union/union-empty.rs b/src/test/ui/union/union-empty.rs index 1f499c49a6870..79b7e68ee6beb 100644 --- a/src/test/ui/union/union-empty.rs +++ b/src/test/ui/union/union-empty.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - union U {} //~ ERROR unions cannot have zero fields fn main() {} diff --git a/src/test/ui/union/union-empty.stderr b/src/test/ui/union/union-empty.stderr index 5abe45814acce..71bba8fda2eb1 100644 --- a/src/test/ui/union/union-empty.stderr +++ b/src/test/ui/union/union-empty.stderr @@ -1,5 +1,5 @@ error: unions cannot have zero fields - --> $DIR/union-empty.rs:11:1 + --> $DIR/union-empty.rs:1:1 | LL | union U {} //~ ERROR unions cannot have zero fields | ^^^^^^^^^^ diff --git a/src/test/ui/union/union-fields-1.rs b/src/test/ui/union/union-fields-1.rs index dc551bb899861..6d76e18cc7e06 100644 --- a/src/test/ui/union/union-fields-1.rs +++ b/src/test/ui/union/union-fields-1.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(dead_code)] union U1 { diff --git a/src/test/ui/union/union-fields-1.stderr b/src/test/ui/union/union-fields-1.stderr index e337ea9d7eeac..3f165db4763e6 100644 --- a/src/test/ui/union/union-fields-1.stderr +++ b/src/test/ui/union/union-fields-1.stderr @@ -1,29 +1,29 @@ error: field is never used: `c` - --> $DIR/union-fields-1.rs:16:5 + --> $DIR/union-fields-1.rs:6:5 | LL | c: u8, //~ ERROR field is never used | ^^^^^ | note: lint level defined here - --> $DIR/union-fields-1.rs:11:9 + --> $DIR/union-fields-1.rs:1:9 | LL | #![deny(dead_code)] | ^^^^^^^^^ error: field is never used: `a` - --> $DIR/union-fields-1.rs:19:5 + --> $DIR/union-fields-1.rs:9:5 | LL | a: u8, //~ ERROR field is never used | ^^^^^ error: field is never used: `a` - --> $DIR/union-fields-1.rs:23:20 + --> $DIR/union-fields-1.rs:13:20 | LL | union NoDropLike { a: u8 } //~ ERROR field is never used | ^^^^^ error: field is never used: `c` - --> $DIR/union-fields-1.rs:28:5 + --> $DIR/union-fields-1.rs:18:5 | LL | c: u8, //~ ERROR field is never used | ^^^^^ diff --git a/src/test/ui/union/union-fields-2.rs b/src/test/ui/union/union-fields-2.rs index 7b9ff866a4351..71b204fcdc5b8 100644 --- a/src/test/ui/union/union-fields-2.rs +++ b/src/test/ui/union/union-fields-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - union U { a: u8, b: u16, diff --git a/src/test/ui/union/union-fields-2.stderr b/src/test/ui/union/union-fields-2.stderr index cfb5bc7520b59..959554f6d220c 100644 --- a/src/test/ui/union/union-fields-2.stderr +++ b/src/test/ui/union/union-fields-2.stderr @@ -1,17 +1,17 @@ error: union expressions should have exactly one field - --> $DIR/union-fields-2.rs:17:13 + --> $DIR/union-fields-2.rs:7:13 | LL | let u = U {}; //~ ERROR union expressions should have exactly one field | ^ error: union expressions should have exactly one field - --> $DIR/union-fields-2.rs:19:13 + --> $DIR/union-fields-2.rs:9:13 | LL | let u = U { a: 0, b: 1 }; //~ ERROR union expressions should have exactly one field | ^ error[E0560]: union `U` has no field named `c` - --> $DIR/union-fields-2.rs:20:29 + --> $DIR/union-fields-2.rs:10:29 | LL | let u = U { a: 0, b: 1, c: 2 }; //~ ERROR union expressions should have exactly one field | ^ `U` does not have this field @@ -19,61 +19,61 @@ LL | let u = U { a: 0, b: 1, c: 2 }; //~ ERROR union expressions should have = note: available fields are: `a`, `b` error: union expressions should have exactly one field - --> $DIR/union-fields-2.rs:20:13 + --> $DIR/union-fields-2.rs:10:13 | LL | let u = U { a: 0, b: 1, c: 2 }; //~ ERROR union expressions should have exactly one field | ^ error: union expressions should have exactly one field - --> $DIR/union-fields-2.rs:22:13 + --> $DIR/union-fields-2.rs:12:13 | LL | let u = U { ..u }; //~ ERROR union expressions should have exactly one field | ^ error[E0436]: functional record update syntax requires a struct - --> $DIR/union-fields-2.rs:22:19 + --> $DIR/union-fields-2.rs:12:19 | LL | let u = U { ..u }; //~ ERROR union expressions should have exactly one field | ^ error: union patterns should have exactly one field - --> $DIR/union-fields-2.rs:25:9 + --> $DIR/union-fields-2.rs:15:9 | LL | let U {} = u; //~ ERROR union patterns should have exactly one field | ^^^^ error: union patterns should have exactly one field - --> $DIR/union-fields-2.rs:27:9 + --> $DIR/union-fields-2.rs:17:9 | LL | let U { a, b } = u; //~ ERROR union patterns should have exactly one field | ^^^^^^^^^^ error[E0026]: union `U` does not have a field named `c` - --> $DIR/union-fields-2.rs:28:19 + --> $DIR/union-fields-2.rs:18:19 | LL | let U { a, b, c } = u; //~ ERROR union patterns should have exactly one field | ^ union `U` does not have this field error: union patterns should have exactly one field - --> $DIR/union-fields-2.rs:28:9 + --> $DIR/union-fields-2.rs:18:9 | LL | let U { a, b, c } = u; //~ ERROR union patterns should have exactly one field | ^^^^^^^^^^^^^ error: union patterns should have exactly one field - --> $DIR/union-fields-2.rs:30:9 + --> $DIR/union-fields-2.rs:20:9 | LL | let U { .. } = u; //~ ERROR union patterns should have exactly one field | ^^^^^^^^ error: `..` cannot be used in union patterns - --> $DIR/union-fields-2.rs:30:9 + --> $DIR/union-fields-2.rs:20:9 | LL | let U { .. } = u; //~ ERROR union patterns should have exactly one field | ^^^^^^^^ error: `..` cannot be used in union patterns - --> $DIR/union-fields-2.rs:32:9 + --> $DIR/union-fields-2.rs:22:9 | LL | let U { a, .. } = u; //~ ERROR `..` cannot be used in union patterns | ^^^^^^^^^^^ diff --git a/src/test/ui/union/union-generic.rs b/src/test/ui/union/union-generic.rs index 8bd422b42d879..4b2ccbdb7b402 100644 --- a/src/test/ui/union/union-generic.rs +++ b/src/test/ui/union/union-generic.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::rc::Rc; union U { diff --git a/src/test/ui/union/union-generic.stderr b/src/test/ui/union/union-generic.stderr index dbfffa005fb80..6a3216db64301 100644 --- a/src/test/ui/union/union-generic.stderr +++ b/src/test/ui/union/union-generic.stderr @@ -1,23 +1,23 @@ error[E0277]: the trait bound `std::rc::Rc: std::marker::Copy` is not satisfied - --> $DIR/union-generic.rs:18:13 + --> $DIR/union-generic.rs:8:13 | LL | let u = U { a: Rc::new(0u32) }; | ^ the trait `std::marker::Copy` is not implemented for `std::rc::Rc` | note: required by `U` - --> $DIR/union-generic.rs:13:1 + --> $DIR/union-generic.rs:3:1 | LL | union U { | ^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `std::rc::Rc: std::marker::Copy` is not satisfied - --> $DIR/union-generic.rs:20:13 + --> $DIR/union-generic.rs:10:13 | LL | let u = U::> { a: Default::default() }; | ^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `std::rc::Rc` | note: required by `U` - --> $DIR/union-generic.rs:13:1 + --> $DIR/union-generic.rs:3:1 | LL | union U { | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/union/union-lint-dead-code.rs b/src/test/ui/union/union-lint-dead-code.rs index a64187c5f2344..cb6415c18a83b 100644 --- a/src/test/ui/union/union-lint-dead-code.rs +++ b/src/test/ui/union/union-lint-dead-code.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(dead_code)] union Foo { diff --git a/src/test/ui/union/union-lint-dead-code.stderr b/src/test/ui/union/union-lint-dead-code.stderr index 2cd3aab8c29cb..6551523c54df5 100644 --- a/src/test/ui/union/union-lint-dead-code.stderr +++ b/src/test/ui/union/union-lint-dead-code.stderr @@ -1,11 +1,11 @@ error: field is never used: `b` - --> $DIR/union-lint-dead-code.rs:15:5 + --> $DIR/union-lint-dead-code.rs:5:5 | LL | b: bool, //~ ERROR: field is never used | ^^^^^^^ | note: lint level defined here - --> $DIR/union-lint-dead-code.rs:11:9 + --> $DIR/union-lint-dead-code.rs:1:9 | LL | #![deny(dead_code)] | ^^^^^^^^^ diff --git a/src/test/ui/union/union-nonrepresentable.rs b/src/test/ui/union/union-nonrepresentable.rs index cb4683c2a0e12..4dbd97ea957ba 100644 --- a/src/test/ui/union/union-nonrepresentable.rs +++ b/src/test/ui/union/union-nonrepresentable.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(untagged_unions)] union U { //~ ERROR recursive type `U` has infinite size diff --git a/src/test/ui/union/union-nonrepresentable.stderr b/src/test/ui/union/union-nonrepresentable.stderr index 17d78ea4c2b04..1a7603a46374b 100644 --- a/src/test/ui/union/union-nonrepresentable.stderr +++ b/src/test/ui/union/union-nonrepresentable.stderr @@ -1,5 +1,5 @@ error[E0072]: recursive type `U` has infinite size - --> $DIR/union-nonrepresentable.rs:13:1 + --> $DIR/union-nonrepresentable.rs:3:1 | LL | union U { //~ ERROR recursive type `U` has infinite size | ^^^^^^^ recursive type has infinite size diff --git a/src/test/ui/union/union-repr-c.rs b/src/test/ui/union/union-repr-c.rs index 36c42ce1104e0..658452d57f748 100644 --- a/src/test/ui/union/union-repr-c.rs +++ b/src/test/ui/union/union-repr-c.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused)] #![deny(improper_ctypes)] diff --git a/src/test/ui/union/union-repr-c.stderr b/src/test/ui/union/union-repr-c.stderr index ddf500491927d..bac09c34b8b13 100644 --- a/src/test/ui/union/union-repr-c.stderr +++ b/src/test/ui/union/union-repr-c.stderr @@ -1,17 +1,17 @@ error: `extern` block uses type `W` which is not FFI-safe: this union has unspecified layout - --> $DIR/union-repr-c.rs:25:22 + --> $DIR/union-repr-c.rs:15:22 | LL | static FOREIGN2: W; //~ ERROR union has unspecified layout | ^ | note: lint level defined here - --> $DIR/union-repr-c.rs:12:9 + --> $DIR/union-repr-c.rs:2:9 | LL | #![deny(improper_ctypes)] | ^^^^^^^^^^^^^^^ = help: consider adding a #[repr(C)] attribute to this union note: type defined here - --> $DIR/union-repr-c.rs:19:1 + --> $DIR/union-repr-c.rs:9:1 | LL | / union W { LL | | a: u8, diff --git a/src/test/ui/union/union-sized-field.rs b/src/test/ui/union/union-sized-field.rs index 66d6632ff5aa0..b84cb3eff56f6 100644 --- a/src/test/ui/union/union-sized-field.rs +++ b/src/test/ui/union/union-sized-field.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(untagged_unions)] union Foo { diff --git a/src/test/ui/union/union-sized-field.stderr b/src/test/ui/union/union-sized-field.stderr index 85e9702a40ebf..b490be28ebfd0 100644 --- a/src/test/ui/union/union-sized-field.stderr +++ b/src/test/ui/union/union-sized-field.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `T` cannot be known at compilation time - --> $DIR/union-sized-field.rs:14:5 + --> $DIR/union-sized-field.rs:4:5 | LL | value: T, | ^^^^^^^^ doesn't have a size known at compile-time @@ -10,7 +10,7 @@ LL | value: T, = note: no field of a union may have a dynamically sized type error[E0277]: the size for values of type `T` cannot be known at compilation time - --> $DIR/union-sized-field.rs:19:5 + --> $DIR/union-sized-field.rs:9:5 | LL | value: T, | ^^^^^^^^ doesn't have a size known at compile-time @@ -21,7 +21,7 @@ LL | value: T, = note: only the last field of a struct may have a dynamically sized type error[E0277]: the size for values of type `T` cannot be known at compilation time - --> $DIR/union-sized-field.rs:25:11 + --> $DIR/union-sized-field.rs:15:11 | LL | Value(T), | ^ doesn't have a size known at compile-time diff --git a/src/test/ui/union/union-suggest-field.rs b/src/test/ui/union/union-suggest-field.rs index 96fca78ef220c..ad527a9791802 100644 --- a/src/test/ui/union/union-suggest-field.rs +++ b/src/test/ui/union/union-suggest-field.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - union U { principal: u8, } diff --git a/src/test/ui/union/union-suggest-field.stderr b/src/test/ui/union/union-suggest-field.stderr index 631aacb0289f0..15464eea4c2f3 100644 --- a/src/test/ui/union/union-suggest-field.stderr +++ b/src/test/ui/union/union-suggest-field.stderr @@ -1,17 +1,17 @@ error[E0560]: union `U` has no field named `principle` - --> $DIR/union-suggest-field.rs:20:17 + --> $DIR/union-suggest-field.rs:10:17 | LL | let u = U { principle: 0 }; | ^^^^^^^^^ field does not exist - did you mean `principal`? error[E0609]: no field `principial` on type `U` - --> $DIR/union-suggest-field.rs:22:15 + --> $DIR/union-suggest-field.rs:12:15 | LL | let w = u.principial; //~ ERROR no field `principial` on type `U` | ^^^^^^^^^^ did you mean `principal`? error[E0615]: attempted to take value of method `calculate` on type `U` - --> $DIR/union-suggest-field.rs:25:15 + --> $DIR/union-suggest-field.rs:15:15 | LL | let y = u.calculate; //~ ERROR attempted to take value of method `calculate` on type `U` | ^^^^^^^^^ diff --git a/src/test/ui/union/union-unsafe.rs b/src/test/ui/union/union-unsafe.rs index d993816e6f476..6cfde35fe4c34 100644 --- a/src/test/ui/union/union-unsafe.rs +++ b/src/test/ui/union/union-unsafe.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(untagged_unions)] union U1 { diff --git a/src/test/ui/union/union-unsafe.stderr b/src/test/ui/union/union-unsafe.stderr index a0b3d98f7a003..35051485f6ad0 100644 --- a/src/test/ui/union/union-unsafe.stderr +++ b/src/test/ui/union/union-unsafe.stderr @@ -1,5 +1,5 @@ error[E0133]: assignment to non-`Copy` union field is unsafe and requires unsafe function or block - --> $DIR/union-unsafe.rs:31:5 + --> $DIR/union-unsafe.rs:21:5 | LL | u3.a = T::default(); //~ ERROR assignment to non-`Copy` union field is unsafe | ^^^^ assignment to non-`Copy` union field @@ -7,7 +7,7 @@ LL | u3.a = T::default(); //~ ERROR assignment to non-`Copy` union field is = note: the previous content of the field will be dropped, which causes undefined behavior if the field was not properly initialized error[E0133]: access to union field is unsafe and requires unsafe function or block - --> $DIR/union-unsafe.rs:43:13 + --> $DIR/union-unsafe.rs:33:13 | LL | let a = u1.a; //~ ERROR access to union field is unsafe | ^^^^ access to union field @@ -15,7 +15,7 @@ LL | let a = u1.a; //~ ERROR access to union field is unsafe = note: the field may not be properly initialized: using uninitialized data will cause undefined behavior error[E0133]: access to union field is unsafe and requires unsafe function or block - --> $DIR/union-unsafe.rs:45:14 + --> $DIR/union-unsafe.rs:35:14 | LL | let U1 { a } = u1; //~ ERROR access to union field is unsafe | ^ access to union field @@ -23,7 +23,7 @@ LL | let U1 { a } = u1; //~ ERROR access to union field is unsafe = note: the field may not be properly initialized: using uninitialized data will cause undefined behavior error[E0133]: access to union field is unsafe and requires unsafe function or block - --> $DIR/union-unsafe.rs:46:20 + --> $DIR/union-unsafe.rs:36:20 | LL | if let U1 { a: 12 } = u1 {} //~ ERROR access to union field is unsafe | ^^ access to union field @@ -31,7 +31,7 @@ LL | if let U1 { a: 12 } = u1 {} //~ ERROR access to union field is unsafe = note: the field may not be properly initialized: using uninitialized data will cause undefined behavior error[E0133]: assignment to non-`Copy` union field is unsafe and requires unsafe function or block - --> $DIR/union-unsafe.rs:50:5 + --> $DIR/union-unsafe.rs:40:5 | LL | u2.a = String::from("new"); //~ ERROR assignment to non-`Copy` union field is unsafe | ^^^^ assignment to non-`Copy` union field @@ -39,7 +39,7 @@ LL | u2.a = String::from("new"); //~ ERROR assignment to non-`Copy` union fi = note: the previous content of the field will be dropped, which causes undefined behavior if the field was not properly initialized error[E0133]: assignment to non-`Copy` union field is unsafe and requires unsafe function or block - --> $DIR/union-unsafe.rs:54:5 + --> $DIR/union-unsafe.rs:44:5 | LL | u3.a = String::from("new"); //~ ERROR assignment to non-`Copy` union field is unsafe | ^^^^ assignment to non-`Copy` union field diff --git a/src/test/ui/union/union-unsized.rs b/src/test/ui/union/union-unsized.rs index d79c2ed710e35..16f2a73d42570 100644 --- a/src/test/ui/union/union-unsized.rs +++ b/src/test/ui/union/union-unsized.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(untagged_unions)] union U { diff --git a/src/test/ui/union/union-unsized.stderr b/src/test/ui/union/union-unsized.stderr index e2da60358817a..cd65172c23f80 100644 --- a/src/test/ui/union/union-unsized.stderr +++ b/src/test/ui/union/union-unsized.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `str` cannot be known at compilation time - --> $DIR/union-unsized.rs:14:5 + --> $DIR/union-unsized.rs:4:5 | LL | a: str, | ^^^^^^ doesn't have a size known at compile-time @@ -9,7 +9,7 @@ LL | a: str, = note: no field of a union may have a dynamically sized type error[E0277]: the size for values of type `str` cannot be known at compilation time - --> $DIR/union-unsized.rs:22:5 + --> $DIR/union-unsized.rs:12:5 | LL | b: str, | ^^^^^^ doesn't have a size known at compile-time diff --git a/src/test/ui/union/union-with-drop-fields-lint.rs b/src/test/ui/union/union-with-drop-fields-lint.rs index 87a72efbe08e5..8e502aa55f952 100644 --- a/src/test/ui/union/union-with-drop-fields-lint.rs +++ b/src/test/ui/union/union-with-drop-fields-lint.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(untagged_unions)] #![allow(dead_code)] #![deny(unions_with_drop_fields)] diff --git a/src/test/ui/union/union-with-drop-fields-lint.stderr b/src/test/ui/union/union-with-drop-fields-lint.stderr index 2d3d539cda575..d8f456f2aefbc 100644 --- a/src/test/ui/union/union-with-drop-fields-lint.stderr +++ b/src/test/ui/union/union-with-drop-fields-lint.stderr @@ -1,23 +1,23 @@ error: union contains a field with possibly non-trivial drop code, drop code of union fields is ignored when dropping the union - --> $DIR/union-with-drop-fields-lint.rs:20:5 + --> $DIR/union-with-drop-fields-lint.rs:10:5 | LL | a: String, //~ ERROR union contains a field with possibly non-trivial drop code | ^^^^^^^^^ | note: lint level defined here - --> $DIR/union-with-drop-fields-lint.rs:13:9 + --> $DIR/union-with-drop-fields-lint.rs:3:9 | LL | #![deny(unions_with_drop_fields)] | ^^^^^^^^^^^^^^^^^^^^^^^ error: union contains a field with possibly non-trivial drop code, drop code of union fields is ignored when dropping the union - --> $DIR/union-with-drop-fields-lint.rs:28:5 + --> $DIR/union-with-drop-fields-lint.rs:18:5 | LL | a: S, //~ ERROR union contains a field with possibly non-trivial drop code | ^^^^ error: union contains a field with possibly non-trivial drop code, drop code of union fields is ignored when dropping the union - --> $DIR/union-with-drop-fields-lint.rs:33:5 + --> $DIR/union-with-drop-fields-lint.rs:23:5 | LL | a: T, //~ ERROR union contains a field with possibly non-trivial drop code | ^^^^ diff --git a/src/test/ui/unique-object-noncopyable.rs b/src/test/ui/unique-object-noncopyable.rs index c44718c4fc9c2..1c467a2421a2a 100644 --- a/src/test/ui/unique-object-noncopyable.rs +++ b/src/test/ui/unique-object-noncopyable.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] trait Foo { diff --git a/src/test/ui/unique-object-noncopyable.stderr b/src/test/ui/unique-object-noncopyable.stderr index 777b9f19badb5..78b46027c95ee 100644 --- a/src/test/ui/unique-object-noncopyable.stderr +++ b/src/test/ui/unique-object-noncopyable.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `clone` found for type `std::boxed::Box` in the current scope - --> $DIR/unique-object-noncopyable.rs:34:16 + --> $DIR/unique-object-noncopyable.rs:24:16 | LL | let _z = y.clone(); //~ ERROR no method named `clone` found | ^^^^^ diff --git a/src/test/ui/unique-pinned-nocopy.rs b/src/test/ui/unique-pinned-nocopy.rs index c09feec1d4af2..a4f537c8a9fbf 100644 --- a/src/test/ui/unique-pinned-nocopy.rs +++ b/src/test/ui/unique-pinned-nocopy.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug)] struct r { b: bool, diff --git a/src/test/ui/unique-pinned-nocopy.stderr b/src/test/ui/unique-pinned-nocopy.stderr index ddc676601fa2e..83c53b4835b35 100644 --- a/src/test/ui/unique-pinned-nocopy.stderr +++ b/src/test/ui/unique-pinned-nocopy.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `clone` found for type `std::boxed::Box` in the current scope - --> $DIR/unique-pinned-nocopy.rs:22:16 + --> $DIR/unique-pinned-nocopy.rs:12:16 | LL | let _j = i.clone(); //~ ERROR no method named `clone` found | ^^^^^ diff --git a/src/test/ui/unknown-language-item.rs b/src/test/ui/unknown-language-item.rs index 3c2105997127d..20ffef71497c0 100644 --- a/src/test/ui/unknown-language-item.rs +++ b/src/test/ui/unknown-language-item.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused)] #![feature(lang_items)] diff --git a/src/test/ui/unknown-language-item.stderr b/src/test/ui/unknown-language-item.stderr index 95ce5db33ae50..c5fe9b8ad0e8b 100644 --- a/src/test/ui/unknown-language-item.stderr +++ b/src/test/ui/unknown-language-item.stderr @@ -1,5 +1,5 @@ error[E0522]: definition of an unknown language item: `foo` - --> $DIR/unknown-language-item.rs:14:1 + --> $DIR/unknown-language-item.rs:4:1 | LL | #[lang = "foo"] | ^^^^^^^^^^^^^^^ definition of unknown language item `foo` diff --git a/src/test/ui/unknown-lint-tool-name.rs b/src/test/ui/unknown-lint-tool-name.rs index 78b736edcebe6..43abd51c48f36 100644 --- a/src/test/ui/unknown-lint-tool-name.rs +++ b/src/test/ui/unknown-lint-tool-name.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(tool_lints)] #![deny(foo::bar)] //~ ERROR an unknown tool name found in scoped lint: `foo::bar` diff --git a/src/test/ui/unknown-lint-tool-name.stderr b/src/test/ui/unknown-lint-tool-name.stderr index 29c3a642d875b..4fef70bf40f5d 100644 --- a/src/test/ui/unknown-lint-tool-name.stderr +++ b/src/test/ui/unknown-lint-tool-name.stderr @@ -1,11 +1,11 @@ error[E0710]: an unknown tool name found in scoped lint: `foo::bar` - --> $DIR/unknown-lint-tool-name.rs:13:9 + --> $DIR/unknown-lint-tool-name.rs:3:9 | LL | #![deny(foo::bar)] //~ ERROR an unknown tool name found in scoped lint: `foo::bar` | ^^^ error[E0710]: an unknown tool name found in scoped lint: `foo::bar` - --> $DIR/unknown-lint-tool-name.rs:15:9 + --> $DIR/unknown-lint-tool-name.rs:5:9 | LL | #[allow(foo::bar)] //~ ERROR an unknown tool name found in scoped lint: `foo::bar` | ^^^ diff --git a/src/test/ui/unknown-tool-name.rs b/src/test/ui/unknown-tool-name.rs index cd2aeb7494a5a..8170b46bb0556 100644 --- a/src/test/ui/unknown-tool-name.rs +++ b/src/test/ui/unknown-tool-name.rs @@ -1,12 +1,2 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[foo::bar] //~ ERROR failed to resolve. Use of undeclared type or module `foo` fn main() {} diff --git a/src/test/ui/unknown-tool-name.stderr b/src/test/ui/unknown-tool-name.stderr index 8381c6de83a67..3c6ba97ba26e4 100644 --- a/src/test/ui/unknown-tool-name.stderr +++ b/src/test/ui/unknown-tool-name.stderr @@ -1,5 +1,5 @@ error[E0433]: failed to resolve. Use of undeclared type or module `foo` - --> $DIR/unknown-tool-name.rs:11:3 + --> $DIR/unknown-tool-name.rs:1:3 | LL | #[foo::bar] //~ ERROR failed to resolve. Use of undeclared type or module `foo` | ^^^ Use of undeclared type or module `foo` diff --git a/src/test/ui/unop-move-semantics.nll.stderr b/src/test/ui/unop-move-semantics.nll.stderr index 111940aab2c32..d445f5787407f 100644 --- a/src/test/ui/unop-move-semantics.nll.stderr +++ b/src/test/ui/unop-move-semantics.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: borrow of moved value: `x` - --> $DIR/unop-move-semantics.rs:18:5 + --> $DIR/unop-move-semantics.rs:8:5 | LL | !x; | - value moved here @@ -10,13 +10,13 @@ LL | x.clone(); //~ ERROR: use of moved value = note: move occurs because `x` has type `T`, which does not implement the `Copy` trait error[E0507]: cannot move out of borrowed content - --> $DIR/unop-move-semantics.rs:34:6 + --> $DIR/unop-move-semantics.rs:24:6 | LL | !*m; //~ ERROR: cannot move out of borrowed content | ^^ cannot move out of borrowed content error[E0507]: cannot move out of borrowed content - --> $DIR/unop-move-semantics.rs:36:6 + --> $DIR/unop-move-semantics.rs:26:6 | LL | !*n; //~ ERROR: cannot move out of borrowed content | ^^ cannot move out of borrowed content diff --git a/src/test/ui/unop-move-semantics.rs b/src/test/ui/unop-move-semantics.rs index 946566675981e..ed3a092210ab2 100644 --- a/src/test/ui/unop-move-semantics.rs +++ b/src/test/ui/unop-move-semantics.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that move restrictions are enforced on overloaded unary operations use std::ops::Not; diff --git a/src/test/ui/unop-move-semantics.stderr b/src/test/ui/unop-move-semantics.stderr index 42d17e54aa230..65d2967c61ee8 100644 --- a/src/test/ui/unop-move-semantics.stderr +++ b/src/test/ui/unop-move-semantics.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `x` - --> $DIR/unop-move-semantics.rs:18:5 + --> $DIR/unop-move-semantics.rs:8:5 | LL | !x; | - value moved here @@ -10,7 +10,7 @@ LL | x.clone(); //~ ERROR: use of moved value = note: move occurs because `x` has type `T`, which does not implement the `Copy` trait error[E0505]: cannot move out of `x` because it is borrowed - --> $DIR/unop-move-semantics.rs:25:6 + --> $DIR/unop-move-semantics.rs:15:6 | LL | let m = &x; | - borrow of `x` occurs here @@ -19,7 +19,7 @@ LL | !x; //~ ERROR: cannot move out of `x` because it is borrowed | ^ move out of `x` occurs here error[E0505]: cannot move out of `y` because it is borrowed - --> $DIR/unop-move-semantics.rs:27:6 + --> $DIR/unop-move-semantics.rs:17:6 | LL | let n = &mut y; | - borrow of `y` occurs here @@ -28,13 +28,13 @@ LL | !y; //~ ERROR: cannot move out of `y` because it is borrowed | ^ move out of `y` occurs here error[E0507]: cannot move out of borrowed content - --> $DIR/unop-move-semantics.rs:34:6 + --> $DIR/unop-move-semantics.rs:24:6 | LL | !*m; //~ ERROR: cannot move out of borrowed content | ^^ cannot move out of borrowed content error[E0507]: cannot move out of borrowed content - --> $DIR/unop-move-semantics.rs:36:6 + --> $DIR/unop-move-semantics.rs:26:6 | LL | !*n; //~ ERROR: cannot move out of borrowed content | ^^ cannot move out of borrowed content diff --git a/src/test/ui/unop-neg-bool.rs b/src/test/ui/unop-neg-bool.rs index 316e17c54adca..6f1f1aba45930 100644 --- a/src/test/ui/unop-neg-bool.rs +++ b/src/test/ui/unop-neg-bool.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { -true; //~ ERROR cannot apply unary operator `-` to type `bool` } diff --git a/src/test/ui/unop-neg-bool.stderr b/src/test/ui/unop-neg-bool.stderr index 8ffb71ec4ce52..c13c1a15a7cde 100644 --- a/src/test/ui/unop-neg-bool.stderr +++ b/src/test/ui/unop-neg-bool.stderr @@ -1,5 +1,5 @@ error[E0600]: cannot apply unary operator `-` to type `bool` - --> $DIR/unop-neg-bool.rs:12:5 + --> $DIR/unop-neg-bool.rs:2:5 | LL | -true; //~ ERROR cannot apply unary operator `-` to type `bool` | ^^^^^ cannot apply unary operator `-` diff --git a/src/test/ui/unreachable/auxiliary/unreachable_variant.rs b/src/test/ui/unreachable/auxiliary/unreachable_variant.rs index 8ca85f20ab2f6..4e94a4b5ed871 100644 --- a/src/test/ui/unreachable/auxiliary/unreachable_variant.rs +++ b/src/test/ui/unreachable/auxiliary/unreachable_variant.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod super_sekrit { pub enum sooper_sekrit { quux, baz diff --git a/src/test/ui/unreachable/unreachable-arm.rs b/src/test/ui/unreachable/unreachable-arm.rs index df827d2c78421..9f1a5a39587b3 100644 --- a/src/test/ui/unreachable/unreachable-arm.rs +++ b/src/test/ui/unreachable/unreachable-arm.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_patterns)] #![feature(box_syntax)] #![allow(dead_code)] diff --git a/src/test/ui/unreachable/unreachable-arm.stderr b/src/test/ui/unreachable/unreachable-arm.stderr index 6bd3f281ea996..5b34482b59bb0 100644 --- a/src/test/ui/unreachable/unreachable-arm.stderr +++ b/src/test/ui/unreachable/unreachable-arm.stderr @@ -1,11 +1,11 @@ error: unreachable pattern - --> $DIR/unreachable-arm.rs:21:9 + --> $DIR/unreachable-arm.rs:11:9 | LL | Foo::A(_, 1) => { } //~ ERROR unreachable pattern | ^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/unreachable-arm.rs:14:9 + --> $DIR/unreachable-arm.rs:4:9 | LL | #![deny(unreachable_patterns)] | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/unreachable/unreachable-code.rs b/src/test/ui/unreachable/unreachable-code.rs index dd08eed5df91a..ad0dc8a8b9ccd 100644 --- a/src/test/ui/unreachable/unreachable-code.rs +++ b/src/test/ui/unreachable/unreachable-code.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(unreachable_code)] #![allow(unused_variables)] diff --git a/src/test/ui/unreachable/unreachable-code.stderr b/src/test/ui/unreachable/unreachable-code.stderr index 0c5d94c6502ff..afb3629d5fda1 100644 --- a/src/test/ui/unreachable/unreachable-code.stderr +++ b/src/test/ui/unreachable/unreachable-code.stderr @@ -1,11 +1,11 @@ error: unreachable statement - --> $DIR/unreachable-code.rs:17:3 + --> $DIR/unreachable-code.rs:7:3 | LL | let a = 3; //~ ERROR: unreachable statement | ^^^^^^^^^^ | note: lint level defined here - --> $DIR/unreachable-code.rs:11:9 + --> $DIR/unreachable-code.rs:1:9 | LL | #![deny(unreachable_code)] | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/unreachable/unreachable-in-call.rs b/src/test/ui/unreachable/unreachable-in-call.rs index 72462468432d9..25f849d7a0a91 100644 --- a/src/test/ui/unreachable/unreachable-in-call.rs +++ b/src/test/ui/unreachable/unreachable-in-call.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] #![deny(unreachable_code)] diff --git a/src/test/ui/unreachable/unreachable-in-call.stderr b/src/test/ui/unreachable/unreachable-in-call.stderr index 215829af44338..b78070d3fb129 100644 --- a/src/test/ui/unreachable/unreachable-in-call.stderr +++ b/src/test/ui/unreachable/unreachable-in-call.stderr @@ -1,17 +1,17 @@ error: unreachable expression - --> $DIR/unreachable-in-call.rs:24:10 + --> $DIR/unreachable-in-call.rs:14:10 | LL | get_u8()); //~ ERROR unreachable expression | ^^^^^^^^ | note: lint level defined here - --> $DIR/unreachable-in-call.rs:12:9 + --> $DIR/unreachable-in-call.rs:2:9 | LL | #![deny(unreachable_code)] | ^^^^^^^^^^^^^^^^ error: unreachable expression - --> $DIR/unreachable-in-call.rs:27:5 + --> $DIR/unreachable-in-call.rs:17:5 | LL | / call( //~ ERROR unreachable expression LL | | get_u8(), diff --git a/src/test/ui/unreachable/unreachable-loop-patterns.rs b/src/test/ui/unreachable/unreachable-loop-patterns.rs index cfd829e416e5b..2a0f342c56a0b 100644 --- a/src/test/ui/unreachable/unreachable-loop-patterns.rs +++ b/src/test/ui/unreachable/unreachable-loop-patterns.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(never_type)] #![feature(exhaustive_patterns)] #![deny(unreachable_patterns)] diff --git a/src/test/ui/unreachable/unreachable-loop-patterns.stderr b/src/test/ui/unreachable/unreachable-loop-patterns.stderr index 724a92b094790..f2d0dfe1b2bbf 100644 --- a/src/test/ui/unreachable/unreachable-loop-patterns.stderr +++ b/src/test/ui/unreachable/unreachable-loop-patterns.stderr @@ -1,11 +1,11 @@ error: unreachable pattern - --> $DIR/unreachable-loop-patterns.rs:18:9 + --> $DIR/unreachable-loop-patterns.rs:8:9 | LL | for _ in x {} | ^ | note: lint level defined here - --> $DIR/unreachable-loop-patterns.rs:13:9 + --> $DIR/unreachable-loop-patterns.rs:3:9 | LL | #![deny(unreachable_patterns)] | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/unreachable/unreachable-try-pattern.rs b/src/test/ui/unreachable/unreachable-try-pattern.rs index df340095bb433..ea8affdbfe1c2 100644 --- a/src/test/ui/unreachable/unreachable-try-pattern.rs +++ b/src/test/ui/unreachable/unreachable-try-pattern.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(never_type)] #![feature(exhaustive_patterns, rustc_attrs)] #![warn(unreachable_code)] diff --git a/src/test/ui/unreachable/unreachable-try-pattern.stderr b/src/test/ui/unreachable/unreachable-try-pattern.stderr index a8a0ed3d03b84..291f8f8ddec52 100644 --- a/src/test/ui/unreachable/unreachable-try-pattern.stderr +++ b/src/test/ui/unreachable/unreachable-try-pattern.stderr @@ -1,35 +1,35 @@ warning: unreachable expression - --> $DIR/unreachable-try-pattern.rs:29:36 + --> $DIR/unreachable-try-pattern.rs:19:36 | LL | let y = (match x { Ok(n) => Ok(n as u32), Err(e) => Err(e) })?; | ^^^^^^^^ | note: lint level defined here - --> $DIR/unreachable-try-pattern.rs:13:9 + --> $DIR/unreachable-try-pattern.rs:3:9 | LL | #![warn(unreachable_code)] | ^^^^^^^^^^^^^^^^ warning: unreachable pattern - --> $DIR/unreachable-try-pattern.rs:29:24 + --> $DIR/unreachable-try-pattern.rs:19:24 | LL | let y = (match x { Ok(n) => Ok(n as u32), Err(e) => Err(e) })?; | ^^^^^ | note: lint level defined here - --> $DIR/unreachable-try-pattern.rs:14:9 + --> $DIR/unreachable-try-pattern.rs:4:9 | LL | #![warn(unreachable_patterns)] | ^^^^^^^^^^^^^^^^^^^^ warning: unreachable pattern - --> $DIR/unreachable-try-pattern.rs:40:40 + --> $DIR/unreachable-try-pattern.rs:30:40 | LL | let y = (match x { Ok(n) => Ok(n), Err(e) => Err(e) })?; | ^^^^^^ error: compilation successful - --> $DIR/unreachable-try-pattern.rs:46:1 + --> $DIR/unreachable-try-pattern.rs:36:1 | LL | / fn main() { //~ ERROR: compilation successful LL | | let _ = bar(Err(123)); diff --git a/src/test/ui/unreachable/unreachable-variant.rs b/src/test/ui/unreachable/unreachable-variant.rs index 5983c83f8b401..008c2d476d750 100644 --- a/src/test/ui/unreachable/unreachable-variant.rs +++ b/src/test/ui/unreachable/unreachable-variant.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:unreachable_variant.rs extern crate unreachable_variant as other; diff --git a/src/test/ui/unreachable/unreachable-variant.stderr b/src/test/ui/unreachable/unreachable-variant.stderr index fff77586549d3..ed8e37c027825 100644 --- a/src/test/ui/unreachable/unreachable-variant.stderr +++ b/src/test/ui/unreachable/unreachable-variant.stderr @@ -1,5 +1,5 @@ error[E0603]: module `super_sekrit` is private - --> $DIR/unreachable-variant.rs:16:14 + --> $DIR/unreachable-variant.rs:6:14 | LL | let _x = other::super_sekrit::sooper_sekrit::baz; //~ ERROR is private | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/unresolved/unresolved-extern-mod-suggestion.rs b/src/test/ui/unresolved/unresolved-extern-mod-suggestion.rs index 714b73ec73916..a1bf0f210b2fe 100644 --- a/src/test/ui/unresolved/unresolved-extern-mod-suggestion.rs +++ b/src/test/ui/unresolved/unresolved-extern-mod-suggestion.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate core; use core; //~^ ERROR the name `core` is defined multiple times diff --git a/src/test/ui/unresolved/unresolved-extern-mod-suggestion.stderr b/src/test/ui/unresolved/unresolved-extern-mod-suggestion.stderr index 4e3ea573d2795..55faa0f5afdc9 100644 --- a/src/test/ui/unresolved/unresolved-extern-mod-suggestion.stderr +++ b/src/test/ui/unresolved/unresolved-extern-mod-suggestion.stderr @@ -1,5 +1,5 @@ error[E0254]: the name `core` is defined multiple times - --> $DIR/unresolved-extern-mod-suggestion.rs:12:5 + --> $DIR/unresolved-extern-mod-suggestion.rs:2:5 | LL | extern crate core; | ------------------ previous import of the extern crate `core` here diff --git a/src/test/ui/unresolved/unresolved-import-recovery.rs b/src/test/ui/unresolved/unresolved-import-recovery.rs index 8173f69191da8..0b0653378cbbd 100644 --- a/src/test/ui/unresolved/unresolved-import-recovery.rs +++ b/src/test/ui/unresolved/unresolved-import-recovery.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that unresolved imports do not create additional errors and ICEs mod m { diff --git a/src/test/ui/unresolved/unresolved-import-recovery.stderr b/src/test/ui/unresolved/unresolved-import-recovery.stderr index d4304195eb12c..0154d002efeec 100644 --- a/src/test/ui/unresolved/unresolved-import-recovery.stderr +++ b/src/test/ui/unresolved/unresolved-import-recovery.stderr @@ -1,5 +1,5 @@ error[E0432]: unresolved import `unresolved` - --> $DIR/unresolved-import-recovery.rs:14:13 + --> $DIR/unresolved-import-recovery.rs:4:13 | LL | pub use unresolved; //~ ERROR unresolved import `unresolved` | ^^^^^^^^^^ no `unresolved` in the root diff --git a/src/test/ui/unresolved/unresolved-import.rs b/src/test/ui/unresolved/unresolved-import.rs index a3eeb6de96bda..026eec32102f5 100644 --- a/src/test/ui/unresolved/unresolved-import.rs +++ b/src/test/ui/unresolved/unresolved-import.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength use foo::bar; //~ ERROR unresolved import `foo` [E0432] diff --git a/src/test/ui/unresolved/unresolved-import.stderr b/src/test/ui/unresolved/unresolved-import.stderr index 1e663cde48a65..022ea3f8ad2fc 100644 --- a/src/test/ui/unresolved/unresolved-import.stderr +++ b/src/test/ui/unresolved/unresolved-import.stderr @@ -1,35 +1,35 @@ error[E0432]: unresolved import `foo` - --> $DIR/unresolved-import.rs:13:5 + --> $DIR/unresolved-import.rs:3:5 | LL | use foo::bar; //~ ERROR unresolved import `foo` [E0432] | ^^^ Maybe a missing `extern crate foo;`? error[E0432]: unresolved import `bar::Baz` - --> $DIR/unresolved-import.rs:16:5 + --> $DIR/unresolved-import.rs:6:5 | LL | use bar::Baz as x; //~ ERROR unresolved import `bar::Baz` [E0432] | ^^^^^^^^^^^^^ no `Baz` in `bar`. Did you mean to use `Bar`? error[E0432]: unresolved import `food::baz` - --> $DIR/unresolved-import.rs:19:5 + --> $DIR/unresolved-import.rs:9:5 | LL | use food::baz; //~ ERROR unresolved import `food::baz` | ^^^^^^^^^ no `baz` in `food`. Did you mean to use `bag`? error[E0432]: unresolved import `food::beens` - --> $DIR/unresolved-import.rs:22:12 + --> $DIR/unresolved-import.rs:12:12 | LL | use food::{beens as Foo}; //~ ERROR unresolved import `food::beens` [E0432] | ^^^^^^^^^^^^ no `beens` in `food`. Did you mean to use `beans`? error[E0432]: unresolved import `MyEnum` - --> $DIR/unresolved-import.rs:44:9 + --> $DIR/unresolved-import.rs:34:9 | LL | use MyEnum::*; //~ ERROR unresolved import `MyEnum` [E0432] | ^^^^^^ Did you mean `self::MyEnum`? error[E0432]: unresolved import `Enum` - --> $DIR/unresolved-import.rs:53:9 + --> $DIR/unresolved-import.rs:43:9 | LL | use Enum::*; //~ ERROR unresolved import `Enum` [E0432] | ^^^^ Did you mean `self::Enum`? diff --git a/src/test/ui/unrestricted-attribute-tokens.rs b/src/test/ui/unrestricted-attribute-tokens.rs index 2971b504369b3..9d8ba03eca567 100644 --- a/src/test/ui/unrestricted-attribute-tokens.rs +++ b/src/test/ui/unrestricted-attribute-tokens.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![feature(custom_attribute, unrestricted_attribute_tokens)] diff --git a/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.rs b/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.rs index 484a8979d718b..817939e0757b3 100644 --- a/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.rs +++ b/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // issue #12418 #![deny(unused_unsafe)] diff --git a/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.stderr b/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.stderr index 849630ac34e95..7751fe017b8e2 100644 --- a/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.stderr +++ b/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.stderr @@ -1,11 +1,11 @@ error: unnecessary `unsafe` block - --> $DIR/unsafe-around-compiler-generated-unsafe.rs:16:5 + --> $DIR/unsafe-around-compiler-generated-unsafe.rs:6:5 | LL | unsafe { println!("foo"); } //~ ERROR unnecessary `unsafe` | ^^^^^^ unnecessary `unsafe` block | note: lint level defined here - --> $DIR/unsafe-around-compiler-generated-unsafe.rs:13:9 + --> $DIR/unsafe-around-compiler-generated-unsafe.rs:3:9 | LL | #![deny(unused_unsafe)] | ^^^^^^^^^^^^^ diff --git a/src/test/ui/unsafe/unsafe-block-without-braces.rs b/src/test/ui/unsafe/unsafe-block-without-braces.rs index b6fb3ec5c44cf..a291eb2eed764 100644 --- a/src/test/ui/unsafe/unsafe-block-without-braces.rs +++ b/src/test/ui/unsafe/unsafe-block-without-braces.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { unsafe //{ std::mem::transmute::(1.0); diff --git a/src/test/ui/unsafe/unsafe-block-without-braces.stderr b/src/test/ui/unsafe/unsafe-block-without-braces.stderr index e6d2403ac4cec..34a90352e9235 100644 --- a/src/test/ui/unsafe/unsafe-block-without-braces.stderr +++ b/src/test/ui/unsafe/unsafe-block-without-braces.stderr @@ -1,5 +1,5 @@ error: expected one of `extern`, `fn`, or `{`, found `std` - --> $DIR/unsafe-block-without-braces.rs:13:9 + --> $DIR/unsafe-block-without-braces.rs:3:9 | LL | unsafe //{ | - expected one of `extern`, `fn`, or `{` here diff --git a/src/test/ui/unsafe/unsafe-const-fn.rs b/src/test/ui/unsafe/unsafe-const-fn.rs index 765e2059a4b5e..17a5f14098ffe 100644 --- a/src/test/ui/unsafe/unsafe-const-fn.rs +++ b/src/test/ui/unsafe/unsafe-const-fn.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // A quick test of 'unsafe const fn' functionality #![feature(const_fn)] diff --git a/src/test/ui/unsafe/unsafe-const-fn.stderr b/src/test/ui/unsafe/unsafe-const-fn.stderr index d4b3ed687e5e4..938f6a05d51ff 100644 --- a/src/test/ui/unsafe/unsafe-const-fn.stderr +++ b/src/test/ui/unsafe/unsafe-const-fn.stderr @@ -1,5 +1,5 @@ error[E0133]: call to unsafe function is unsafe and requires unsafe function or block - --> $DIR/unsafe-const-fn.rs:19:18 + --> $DIR/unsafe-const-fn.rs:9:18 | LL | const VAL: u32 = dummy(0xFFFF); | ^^^^^^^^^^^^^ call to unsafe function diff --git a/src/test/ui/unsafe/unsafe-fn-assign-deref-ptr.rs b/src/test/ui/unsafe/unsafe-fn-assign-deref-ptr.rs index baf2002a94fc9..64bdca5245719 100644 --- a/src/test/ui/unsafe/unsafe-fn-assign-deref-ptr.rs +++ b/src/test/ui/unsafe/unsafe-fn-assign-deref-ptr.rs @@ -1,13 +1,5 @@ - -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. fn f(p: *mut u8) { diff --git a/src/test/ui/unsafe/unsafe-fn-assign-deref-ptr.stderr b/src/test/ui/unsafe/unsafe-fn-assign-deref-ptr.stderr index e98600a8f2f97..1e000062cc3e8 100644 --- a/src/test/ui/unsafe/unsafe-fn-assign-deref-ptr.stderr +++ b/src/test/ui/unsafe/unsafe-fn-assign-deref-ptr.stderr @@ -1,5 +1,5 @@ error[E0133]: dereference of raw pointer is unsafe and requires unsafe function or block - --> $DIR/unsafe-fn-assign-deref-ptr.rs:14:5 + --> $DIR/unsafe-fn-assign-deref-ptr.rs:6:5 | LL | *p = 0; //~ ERROR dereference of raw pointer is unsafe | ^^^^^^ dereference of raw pointer diff --git a/src/test/ui/unsafe/unsafe-fn-autoderef.rs b/src/test/ui/unsafe/unsafe-fn-autoderef.rs index 15b304c69baf5..60460fc6e49de 100644 --- a/src/test/ui/unsafe/unsafe-fn-autoderef.rs +++ b/src/test/ui/unsafe/unsafe-fn-autoderef.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Rec { f: isize } diff --git a/src/test/ui/unsafe/unsafe-fn-autoderef.stderr b/src/test/ui/unsafe/unsafe-fn-autoderef.stderr index 13fcbb347c94b..b08c6873eb8fe 100644 --- a/src/test/ui/unsafe/unsafe-fn-autoderef.stderr +++ b/src/test/ui/unsafe/unsafe-fn-autoderef.stderr @@ -1,5 +1,5 @@ error[E0609]: no field `f` on type `*const Rec` - --> $DIR/unsafe-fn-autoderef.rs:29:14 + --> $DIR/unsafe-fn-autoderef.rs:19:14 | LL | return p.f; //~ ERROR no field `f` on type `*const Rec` | ^ help: `p` is a native pointer; try dereferencing it: `(*p).f` diff --git a/src/test/ui/unsafe/unsafe-fn-called-from-safe.rs b/src/test/ui/unsafe/unsafe-fn-called-from-safe.rs index 46f28da43d03b..5487a8ecc37f9 100644 --- a/src/test/ui/unsafe/unsafe-fn-called-from-safe.rs +++ b/src/test/ui/unsafe/unsafe-fn-called-from-safe.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - unsafe fn f() { return; } fn main() { diff --git a/src/test/ui/unsafe/unsafe-fn-called-from-safe.stderr b/src/test/ui/unsafe/unsafe-fn-called-from-safe.stderr index a781347040e83..4ad7c6e5c75d1 100644 --- a/src/test/ui/unsafe/unsafe-fn-called-from-safe.stderr +++ b/src/test/ui/unsafe/unsafe-fn-called-from-safe.stderr @@ -1,5 +1,5 @@ error[E0133]: call to unsafe function is unsafe and requires unsafe function or block - --> $DIR/unsafe-fn-called-from-safe.rs:15:5 + --> $DIR/unsafe-fn-called-from-safe.rs:4:5 | LL | f(); //~ ERROR call to unsafe function is unsafe | ^^^ call to unsafe function diff --git a/src/test/ui/unsafe/unsafe-fn-deref-ptr.rs b/src/test/ui/unsafe/unsafe-fn-deref-ptr.rs index 8e3ce8ff9b57d..46445aa261dc1 100644 --- a/src/test/ui/unsafe/unsafe-fn-deref-ptr.rs +++ b/src/test/ui/unsafe/unsafe-fn-deref-ptr.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn f(p: *const u8) -> u8 { return *p; //~ ERROR dereference of raw pointer is unsafe } diff --git a/src/test/ui/unsafe/unsafe-fn-deref-ptr.stderr b/src/test/ui/unsafe/unsafe-fn-deref-ptr.stderr index 885f6e446fe70..d48a7681cadc5 100644 --- a/src/test/ui/unsafe/unsafe-fn-deref-ptr.stderr +++ b/src/test/ui/unsafe/unsafe-fn-deref-ptr.stderr @@ -1,5 +1,5 @@ error[E0133]: dereference of raw pointer is unsafe and requires unsafe function or block - --> $DIR/unsafe-fn-deref-ptr.rs:13:12 + --> $DIR/unsafe-fn-deref-ptr.rs:2:12 | LL | return *p; //~ ERROR dereference of raw pointer is unsafe | ^^ dereference of raw pointer diff --git a/src/test/ui/unsafe/unsafe-fn-used-as-value.rs b/src/test/ui/unsafe/unsafe-fn-used-as-value.rs index f09a0c7107a8a..59b814779305b 100644 --- a/src/test/ui/unsafe/unsafe-fn-used-as-value.rs +++ b/src/test/ui/unsafe/unsafe-fn-used-as-value.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - unsafe fn f() { return; } fn main() { diff --git a/src/test/ui/unsafe/unsafe-fn-used-as-value.stderr b/src/test/ui/unsafe/unsafe-fn-used-as-value.stderr index 7f8af300be572..f68e849341b9b 100644 --- a/src/test/ui/unsafe/unsafe-fn-used-as-value.stderr +++ b/src/test/ui/unsafe/unsafe-fn-used-as-value.stderr @@ -1,5 +1,5 @@ error[E0133]: call to unsafe function is unsafe and requires unsafe function or block - --> $DIR/unsafe-fn-used-as-value.rs:16:5 + --> $DIR/unsafe-fn-used-as-value.rs:5:5 | LL | x(); //~ ERROR call to unsafe function is unsafe | ^^^ call to unsafe function diff --git a/src/test/ui/unsafe/unsafe-move-val-init.rs b/src/test/ui/unsafe/unsafe-move-val-init.rs index b4e425e7bbff1..24249a7a813ec 100644 --- a/src/test/ui/unsafe/unsafe-move-val-init.rs +++ b/src/test/ui/unsafe/unsafe-move-val-init.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(core_intrinsics)] use std::intrinsics; diff --git a/src/test/ui/unsafe/unsafe-move-val-init.stderr b/src/test/ui/unsafe/unsafe-move-val-init.stderr index be92623b5d018..44c2aae7cf4f4 100644 --- a/src/test/ui/unsafe/unsafe-move-val-init.stderr +++ b/src/test/ui/unsafe/unsafe-move-val-init.stderr @@ -1,5 +1,5 @@ error[E0133]: dereference of raw pointer is unsafe and requires unsafe function or block - --> $DIR/unsafe-move-val-init.rs:18:5 + --> $DIR/unsafe-move-val-init.rs:8:5 | LL | intrinsics::move_val_init(1 as *mut u32, 1); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ dereference of raw pointer diff --git a/src/test/ui/unsafe/unsafe-subtyping.rs b/src/test/ui/unsafe/unsafe-subtyping.rs index f486763681967..a4b748a50f2f0 100644 --- a/src/test/ui/unsafe/unsafe-subtyping.rs +++ b/src/test/ui/unsafe/unsafe-subtyping.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that safe fns are not a subtype of unsafe fns. fn foo(x: Option) -> Option { diff --git a/src/test/ui/unsafe/unsafe-subtyping.stderr b/src/test/ui/unsafe/unsafe-subtyping.stderr index 645f2a7939e6f..3db0bcba81bf3 100644 --- a/src/test/ui/unsafe/unsafe-subtyping.stderr +++ b/src/test/ui/unsafe/unsafe-subtyping.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/unsafe-subtyping.rs:14:5 + --> $DIR/unsafe-subtyping.rs:4:5 | LL | fn foo(x: Option) -> Option { | ---------------------- expected `std::option::Option` because of return type diff --git a/src/test/ui/unsafe/unsafe-trait-impl.rs b/src/test/ui/unsafe/unsafe-trait-impl.rs index fb4652affd0d8..7b76e006907ae 100644 --- a/src/test/ui/unsafe/unsafe-trait-impl.rs +++ b/src/test/ui/unsafe/unsafe-trait-impl.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that safe fns are not a subtype of unsafe fns. trait Foo { diff --git a/src/test/ui/unsafe/unsafe-trait-impl.stderr b/src/test/ui/unsafe/unsafe-trait-impl.stderr index ae47d6c1627f3..4e93d235757e2 100644 --- a/src/test/ui/unsafe/unsafe-trait-impl.stderr +++ b/src/test/ui/unsafe/unsafe-trait-impl.stderr @@ -1,5 +1,5 @@ error[E0053]: method `len` has an incompatible type for trait - --> $DIR/unsafe-trait-impl.rs:18:5 + --> $DIR/unsafe-trait-impl.rs:8:5 | LL | unsafe fn len(&self) -> u32; | ---------------------------- type in trait diff --git a/src/test/ui/unsized/unsized-bare-typaram.rs b/src/test/ui/unsized/unsized-bare-typaram.rs index 498bdded350f2..e611da91515f3 100644 --- a/src/test/ui/unsized/unsized-bare-typaram.rs +++ b/src/test/ui/unsized/unsized-bare-typaram.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn bar() { } fn foo() { bar::() } //~^ ERROR the size for values of type diff --git a/src/test/ui/unsized/unsized-bare-typaram.stderr b/src/test/ui/unsized/unsized-bare-typaram.stderr index 314e47baaad8b..6f54ac579a374 100644 --- a/src/test/ui/unsized/unsized-bare-typaram.stderr +++ b/src/test/ui/unsized/unsized-bare-typaram.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `T` cannot be known at compilation time - --> $DIR/unsized-bare-typaram.rs:12:23 + --> $DIR/unsized-bare-typaram.rs:2:23 | LL | fn foo() { bar::() } | ^^^^^^^^ doesn't have a size known at compile-time @@ -8,7 +8,7 @@ LL | fn foo() { bar::() } = note: to learn more, visit = help: consider adding a `where T: std::marker::Sized` bound note: required by `bar` - --> $DIR/unsized-bare-typaram.rs:11:1 + --> $DIR/unsized-bare-typaram.rs:1:1 | LL | fn bar() { } | ^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/unsized/unsized-enum.rs b/src/test/ui/unsized/unsized-enum.rs index 4a6a5557c9560..02ad1c878a40e 100644 --- a/src/test/ui/unsized/unsized-enum.rs +++ b/src/test/ui/unsized/unsized-enum.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn is_sized() { } fn not_sized() { } diff --git a/src/test/ui/unsized/unsized-enum.stderr b/src/test/ui/unsized/unsized-enum.stderr index f518859c37cb1..7d8c09ebf4050 100644 --- a/src/test/ui/unsized/unsized-enum.stderr +++ b/src/test/ui/unsized/unsized-enum.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `T` cannot be known at compilation time - --> $DIR/unsized-enum.rs:17:36 + --> $DIR/unsized-enum.rs:6:36 | LL | fn foo2() { not_sized::>() } | ^^^^^^ doesn't have a size known at compile-time @@ -8,7 +8,7 @@ LL | fn foo2() { not_sized::>() } = note: to learn more, visit = help: consider adding a `where T: std::marker::Sized` bound note: required by `Foo` - --> $DIR/unsized-enum.rs:15:1 + --> $DIR/unsized-enum.rs:4:1 | LL | enum Foo { FooSome(U), FooNone } | ^^^^^^^^^^^ diff --git a/src/test/ui/unsized/unsized-enum2.rs b/src/test/ui/unsized/unsized-enum2.rs index dadcc4206c304..0fe4a3acfbe20 100644 --- a/src/test/ui/unsized/unsized-enum2.rs +++ b/src/test/ui/unsized/unsized-enum2.rs @@ -1,13 +1,3 @@ -// Copyright 206 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::Deref; // Due to aggressive error message deduplication, we require 20 *different* diff --git a/src/test/ui/unsized/unsized-enum2.stderr b/src/test/ui/unsized/unsized-enum2.stderr index ecaa01464690c..81135c33d1d19 100644 --- a/src/test/ui/unsized/unsized-enum2.stderr +++ b/src/test/ui/unsized/unsized-enum2.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `W` cannot be known at compilation time - --> $DIR/unsized-enum2.rs:33:8 + --> $DIR/unsized-enum2.rs:23:8 | LL | VA(W), | ^ doesn't have a size known at compile-time @@ -10,7 +10,7 @@ LL | VA(W), = note: no field of an enum variant may have a dynamically sized type error[E0277]: the size for values of type `X` cannot be known at compilation time - --> $DIR/unsized-enum2.rs:35:8 + --> $DIR/unsized-enum2.rs:25:8 | LL | VB{x: X}, | ^^^^ doesn't have a size known at compile-time @@ -21,7 +21,7 @@ LL | VB{x: X}, = note: no field of an enum variant may have a dynamically sized type error[E0277]: the size for values of type `Y` cannot be known at compilation time - --> $DIR/unsized-enum2.rs:37:15 + --> $DIR/unsized-enum2.rs:27:15 | LL | VC(isize, Y), | ^ doesn't have a size known at compile-time @@ -32,7 +32,7 @@ LL | VC(isize, Y), = note: no field of an enum variant may have a dynamically sized type error[E0277]: the size for values of type `Z` cannot be known at compilation time - --> $DIR/unsized-enum2.rs:39:18 + --> $DIR/unsized-enum2.rs:29:18 | LL | VD{u: isize, x: Z}, | ^^^^ doesn't have a size known at compile-time @@ -43,7 +43,7 @@ LL | VD{u: isize, x: Z}, = note: no field of an enum variant may have a dynamically sized type error[E0277]: the size for values of type `[u8]` cannot be known at compilation time - --> $DIR/unsized-enum2.rs:43:8 + --> $DIR/unsized-enum2.rs:33:8 | LL | VE([u8]), | ^^^^ doesn't have a size known at compile-time @@ -53,7 +53,7 @@ LL | VE([u8]), = note: no field of an enum variant may have a dynamically sized type error[E0277]: the size for values of type `str` cannot be known at compilation time - --> $DIR/unsized-enum2.rs:45:8 + --> $DIR/unsized-enum2.rs:35:8 | LL | VF{x: str}, | ^^^^^^ doesn't have a size known at compile-time @@ -63,7 +63,7 @@ LL | VF{x: str}, = note: no field of an enum variant may have a dynamically sized type error[E0277]: the size for values of type `[f32]` cannot be known at compilation time - --> $DIR/unsized-enum2.rs:47:15 + --> $DIR/unsized-enum2.rs:37:15 | LL | VG(isize, [f32]), | ^^^^^ doesn't have a size known at compile-time @@ -73,7 +73,7 @@ LL | VG(isize, [f32]), = note: no field of an enum variant may have a dynamically sized type error[E0277]: the size for values of type `[u32]` cannot be known at compilation time - --> $DIR/unsized-enum2.rs:49:18 + --> $DIR/unsized-enum2.rs:39:18 | LL | VH{u: isize, x: [u32]}, | ^^^^^^^^ doesn't have a size known at compile-time @@ -83,7 +83,7 @@ LL | VH{u: isize, x: [u32]}, = note: no field of an enum variant may have a dynamically sized type error[E0277]: the size for values of type `(dyn Foo + 'static)` cannot be known at compilation time - --> $DIR/unsized-enum2.rs:63:8 + --> $DIR/unsized-enum2.rs:53:8 | LL | VM(Foo), | ^^^ doesn't have a size known at compile-time @@ -93,7 +93,7 @@ LL | VM(Foo), = note: no field of an enum variant may have a dynamically sized type error[E0277]: the size for values of type `(dyn Bar + 'static)` cannot be known at compilation time - --> $DIR/unsized-enum2.rs:65:8 + --> $DIR/unsized-enum2.rs:55:8 | LL | VN{x: Bar}, | ^^^^^^ doesn't have a size known at compile-time @@ -103,7 +103,7 @@ LL | VN{x: Bar}, = note: no field of an enum variant may have a dynamically sized type error[E0277]: the size for values of type `(dyn FooBar + 'static)` cannot be known at compilation time - --> $DIR/unsized-enum2.rs:67:15 + --> $DIR/unsized-enum2.rs:57:15 | LL | VO(isize, FooBar), | ^^^^^^ doesn't have a size known at compile-time @@ -113,7 +113,7 @@ LL | VO(isize, FooBar), = note: no field of an enum variant may have a dynamically sized type error[E0277]: the size for values of type `(dyn BarFoo + 'static)` cannot be known at compilation time - --> $DIR/unsized-enum2.rs:69:18 + --> $DIR/unsized-enum2.rs:59:18 | LL | VP{u: isize, x: BarFoo}, | ^^^^^^^^^ doesn't have a size known at compile-time @@ -123,7 +123,7 @@ LL | VP{u: isize, x: BarFoo}, = note: no field of an enum variant may have a dynamically sized type error[E0277]: the size for values of type `[i8]` cannot be known at compilation time - --> $DIR/unsized-enum2.rs:73:8 + --> $DIR/unsized-enum2.rs:63:8 | LL | VQ(<&'static [i8] as Deref>::Target), | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time @@ -133,7 +133,7 @@ LL | VQ(<&'static [i8] as Deref>::Target), = note: no field of an enum variant may have a dynamically sized type error[E0277]: the size for values of type `[char]` cannot be known at compilation time - --> $DIR/unsized-enum2.rs:75:8 + --> $DIR/unsized-enum2.rs:65:8 | LL | VR{x: <&'static [char] as Deref>::Target}, | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time @@ -143,7 +143,7 @@ LL | VR{x: <&'static [char] as Deref>::Target}, = note: no field of an enum variant may have a dynamically sized type error[E0277]: the size for values of type `[f64]` cannot be known at compilation time - --> $DIR/unsized-enum2.rs:77:15 + --> $DIR/unsized-enum2.rs:67:15 | LL | VS(isize, <&'static [f64] as Deref>::Target), | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time @@ -153,7 +153,7 @@ LL | VS(isize, <&'static [f64] as Deref>::Target), = note: no field of an enum variant may have a dynamically sized type error[E0277]: the size for values of type `[i32]` cannot be known at compilation time - --> $DIR/unsized-enum2.rs:79:18 + --> $DIR/unsized-enum2.rs:69:18 | LL | VT{u: isize, x: <&'static [i32] as Deref>::Target}, | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time @@ -163,7 +163,7 @@ LL | VT{u: isize, x: <&'static [i32] as Deref>::Target}, = note: no field of an enum variant may have a dynamically sized type error[E0277]: the size for values of type `(dyn PathHelper1 + 'static)` cannot be known at compilation time - --> $DIR/unsized-enum2.rs:53:8 + --> $DIR/unsized-enum2.rs:43:8 | LL | VI(Path1), | ^^^^^ doesn't have a size known at compile-time @@ -174,7 +174,7 @@ LL | VI(Path1), = note: no field of an enum variant may have a dynamically sized type error[E0277]: the size for values of type `(dyn PathHelper2 + 'static)` cannot be known at compilation time - --> $DIR/unsized-enum2.rs:55:8 + --> $DIR/unsized-enum2.rs:45:8 | LL | VJ{x: Path2}, | ^^^^^^^^ doesn't have a size known at compile-time @@ -185,7 +185,7 @@ LL | VJ{x: Path2}, = note: no field of an enum variant may have a dynamically sized type error[E0277]: the size for values of type `(dyn PathHelper3 + 'static)` cannot be known at compilation time - --> $DIR/unsized-enum2.rs:57:15 + --> $DIR/unsized-enum2.rs:47:15 | LL | VK(isize, Path3), | ^^^^^ doesn't have a size known at compile-time @@ -196,7 +196,7 @@ LL | VK(isize, Path3), = note: no field of an enum variant may have a dynamically sized type error[E0277]: the size for values of type `(dyn PathHelper4 + 'static)` cannot be known at compilation time - --> $DIR/unsized-enum2.rs:59:18 + --> $DIR/unsized-enum2.rs:49:18 | LL | VL{u: isize, x: Path4}, | ^^^^^^^^ doesn't have a size known at compile-time diff --git a/src/test/ui/unsized/unsized-inherent-impl-self-type.rs b/src/test/ui/unsized/unsized-inherent-impl-self-type.rs index a679bf770153c..8bdf80c94da22 100644 --- a/src/test/ui/unsized/unsized-inherent-impl-self-type.rs +++ b/src/test/ui/unsized/unsized-inherent-impl-self-type.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test sized-ness checking in substitution in impls. // impl - struct diff --git a/src/test/ui/unsized/unsized-inherent-impl-self-type.stderr b/src/test/ui/unsized/unsized-inherent-impl-self-type.stderr index 8b6d9c610d171..1d157bf5b3654 100644 --- a/src/test/ui/unsized/unsized-inherent-impl-self-type.stderr +++ b/src/test/ui/unsized/unsized-inherent-impl-self-type.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `X` cannot be known at compilation time - --> $DIR/unsized-inherent-impl-self-type.rs:17:17 + --> $DIR/unsized-inherent-impl-self-type.rs:7:17 | LL | impl S5 { | ^^^^^ doesn't have a size known at compile-time @@ -8,7 +8,7 @@ LL | impl S5 { = note: to learn more, visit = help: consider adding a `where X: std::marker::Sized` bound note: required by `S5` - --> $DIR/unsized-inherent-impl-self-type.rs:15:1 + --> $DIR/unsized-inherent-impl-self-type.rs:5:1 | LL | struct S5(Y); | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/unsized/unsized-struct.rs b/src/test/ui/unsized/unsized-struct.rs index f2c63455c517d..bfa5aa0a5066a 100644 --- a/src/test/ui/unsized/unsized-struct.rs +++ b/src/test/ui/unsized/unsized-struct.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn is_sized() { } fn not_sized() { } diff --git a/src/test/ui/unsized/unsized-struct.stderr b/src/test/ui/unsized/unsized-struct.stderr index 0e2d000d5f058..a72b3cf1783c7 100644 --- a/src/test/ui/unsized/unsized-struct.stderr +++ b/src/test/ui/unsized/unsized-struct.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `T` cannot be known at compilation time - --> $DIR/unsized-struct.rs:17:36 + --> $DIR/unsized-struct.rs:6:36 | LL | fn foo2() { not_sized::>() } | ^^^^^^ doesn't have a size known at compile-time @@ -8,13 +8,13 @@ LL | fn foo2() { not_sized::>() } = note: to learn more, visit = help: consider adding a `where T: std::marker::Sized` bound note: required by `Foo` - --> $DIR/unsized-struct.rs:15:1 + --> $DIR/unsized-struct.rs:4:1 | LL | struct Foo { data: T } | ^^^^^^^^^^^^^ error[E0277]: the size for values of type `T` cannot be known at compilation time - --> $DIR/unsized-struct.rs:24:24 + --> $DIR/unsized-struct.rs:13:24 | LL | fn bar2() { is_sized::>() } | ^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time @@ -24,7 +24,7 @@ LL | fn bar2() { is_sized::>() } = help: consider adding a `where T: std::marker::Sized` bound = note: required because it appears within the type `Bar` note: required by `is_sized` - --> $DIR/unsized-struct.rs:12:1 + --> $DIR/unsized-struct.rs:1:1 | LL | fn is_sized() { } | ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/unsized/unsized-trait-impl-self-type.rs b/src/test/ui/unsized/unsized-trait-impl-self-type.rs index 5c0b8f1240257..df571a83382c0 100644 --- a/src/test/ui/unsized/unsized-trait-impl-self-type.rs +++ b/src/test/ui/unsized/unsized-trait-impl-self-type.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test sized-ness checking in substitution in impls. // impl - struct diff --git a/src/test/ui/unsized/unsized-trait-impl-self-type.stderr b/src/test/ui/unsized/unsized-trait-impl-self-type.stderr index b51787ef10502..53ddad9356240 100644 --- a/src/test/ui/unsized/unsized-trait-impl-self-type.stderr +++ b/src/test/ui/unsized/unsized-trait-impl-self-type.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `X` cannot be known at compilation time - --> $DIR/unsized-trait-impl-self-type.rs:20:17 + --> $DIR/unsized-trait-impl-self-type.rs:10:17 | LL | impl T3 for S5 { | ^^^^^ doesn't have a size known at compile-time @@ -8,7 +8,7 @@ LL | impl T3 for S5 { = note: to learn more, visit = help: consider adding a `where X: std::marker::Sized` bound note: required by `S5` - --> $DIR/unsized-trait-impl-self-type.rs:18:1 + --> $DIR/unsized-trait-impl-self-type.rs:8:1 | LL | struct S5(Y); | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/unsized/unsized-trait-impl-trait-arg.rs b/src/test/ui/unsized/unsized-trait-impl-trait-arg.rs index 875a52e11c0de..96e7e371f2aa4 100644 --- a/src/test/ui/unsized/unsized-trait-impl-trait-arg.rs +++ b/src/test/ui/unsized/unsized-trait-impl-trait-arg.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test sized-ness checking in substitution in impls. // impl - unbounded diff --git a/src/test/ui/unsized/unsized-trait-impl-trait-arg.stderr b/src/test/ui/unsized/unsized-trait-impl-trait-arg.stderr index 187fac9626d31..e664c1d258128 100644 --- a/src/test/ui/unsized/unsized-trait-impl-trait-arg.stderr +++ b/src/test/ui/unsized/unsized-trait-impl-trait-arg.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `X` cannot be known at compilation time - --> $DIR/unsized-trait-impl-trait-arg.rs:18:17 + --> $DIR/unsized-trait-impl-trait-arg.rs:8:17 | LL | impl T2 for S4 { | ^^^^^ doesn't have a size known at compile-time diff --git a/src/test/ui/unsized3.rs b/src/test/ui/unsized3.rs index 2e346e473ca12..f5b5d02593155 100644 --- a/src/test/ui/unsized3.rs +++ b/src/test/ui/unsized3.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test sized-ness checking in substitution within fn bodies.. use std::marker; diff --git a/src/test/ui/unsized3.stderr b/src/test/ui/unsized3.stderr index 1d7b146b13159..8c2d713d4e3bf 100644 --- a/src/test/ui/unsized3.stderr +++ b/src/test/ui/unsized3.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `X` cannot be known at compilation time - --> $DIR/unsized3.rs:17:5 + --> $DIR/unsized3.rs:7:5 | LL | f2::(x); | ^^^^^^^ doesn't have a size known at compile-time @@ -8,13 +8,13 @@ LL | f2::(x); = note: to learn more, visit = help: consider adding a `where X: std::marker::Sized` bound note: required by `f2` - --> $DIR/unsized3.rs:20:1 + --> $DIR/unsized3.rs:10:1 | LL | fn f2(x: &X) { | ^^^^^^^^^^^^^^^ error[E0277]: the size for values of type `X` cannot be known at compilation time - --> $DIR/unsized3.rs:28:5 + --> $DIR/unsized3.rs:18:5 | LL | f4::(x); | ^^^^^^^ doesn't have a size known at compile-time @@ -23,13 +23,13 @@ LL | f4::(x); = note: to learn more, visit = help: consider adding a `where X: std::marker::Sized` bound note: required by `f4` - --> $DIR/unsized3.rs:31:1 + --> $DIR/unsized3.rs:21:1 | LL | fn f4(x: &X) { | ^^^^^^^^^^^^^^^^^^ error[E0277]: the size for values of type `X` cannot be known at compilation time - --> $DIR/unsized3.rs:43:5 + --> $DIR/unsized3.rs:33:5 | LL | f5(x1); | ^^ doesn't have a size known at compile-time @@ -39,13 +39,13 @@ LL | f5(x1); = help: consider adding a `where X: std::marker::Sized` bound = note: required because it appears within the type `S` note: required by `f5` - --> $DIR/unsized3.rs:34:1 + --> $DIR/unsized3.rs:24:1 | LL | fn f5(x: &Y) {} | ^^^^^^^^^^^^^^^ error[E0277]: the size for values of type `X` cannot be known at compilation time - --> $DIR/unsized3.rs:50:5 + --> $DIR/unsized3.rs:40:5 | LL | f5(&(*x1, 34)); | ^^ doesn't have a size known at compile-time @@ -57,7 +57,7 @@ LL | f5(&(*x1, 34)); = note: only the last element of a tuple may have a dynamically sized type error[E0277]: the size for values of type `X` cannot be known at compilation time - --> $DIR/unsized3.rs:55:9 + --> $DIR/unsized3.rs:45:9 | LL | f5(&(32, *x1)); | ^^^^^^^^^ doesn't have a size known at compile-time @@ -70,7 +70,7 @@ LL | f5(&(32, *x1)); = note: tuples must have a statically known size to be initialized error[E0277]: the size for values of type `X` cannot be known at compilation time - --> $DIR/unsized3.rs:55:5 + --> $DIR/unsized3.rs:45:5 | LL | f5(&(32, *x1)); | ^^ doesn't have a size known at compile-time @@ -81,7 +81,7 @@ LL | f5(&(32, *x1)); = note: required because it appears within the type `S` = note: required because it appears within the type `({integer}, S)` note: required by `f5` - --> $DIR/unsized3.rs:34:1 + --> $DIR/unsized3.rs:24:1 | LL | fn f5(x: &Y) {} | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/unsized5.rs b/src/test/ui/unsized5.rs index a50786e306a57..befd2244d975b 100644 --- a/src/test/ui/unsized5.rs +++ b/src/test/ui/unsized5.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test `?Sized` types not allowed in fields (except the last one). struct S1 { diff --git a/src/test/ui/unsized5.stderr b/src/test/ui/unsized5.stderr index 73553f8498124..9dc8c8f6ee14e 100644 --- a/src/test/ui/unsized5.stderr +++ b/src/test/ui/unsized5.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `X` cannot be known at compilation time - --> $DIR/unsized5.rs:14:5 + --> $DIR/unsized5.rs:4:5 | LL | f1: X, | ^^^^^ doesn't have a size known at compile-time @@ -10,7 +10,7 @@ LL | f1: X, = note: only the last field of a struct may have a dynamically sized type error[E0277]: the size for values of type `X` cannot be known at compilation time - --> $DIR/unsized5.rs:20:5 + --> $DIR/unsized5.rs:10:5 | LL | g: X, | ^^^^ doesn't have a size known at compile-time @@ -21,7 +21,7 @@ LL | g: X, = note: only the last field of a struct may have a dynamically sized type error[E0277]: the size for values of type `str` cannot be known at compilation time - --> $DIR/unsized5.rs:25:5 + --> $DIR/unsized5.rs:15:5 | LL | f: str, | ^^^^^^ doesn't have a size known at compile-time @@ -31,7 +31,7 @@ LL | f: str, = note: only the last field of a struct may have a dynamically sized type error[E0277]: the size for values of type `[u8]` cannot be known at compilation time - --> $DIR/unsized5.rs:30:5 + --> $DIR/unsized5.rs:20:5 | LL | f: [u8], | ^^^^^^^ doesn't have a size known at compile-time @@ -41,7 +41,7 @@ LL | f: [u8], = note: only the last field of a struct may have a dynamically sized type error[E0277]: the size for values of type `X` cannot be known at compilation time - --> $DIR/unsized5.rs:35:8 + --> $DIR/unsized5.rs:25:8 | LL | V1(X, isize), | ^ doesn't have a size known at compile-time @@ -52,7 +52,7 @@ LL | V1(X, isize), = note: no field of an enum variant may have a dynamically sized type error[E0277]: the size for values of type `X` cannot be known at compilation time - --> $DIR/unsized5.rs:39:8 + --> $DIR/unsized5.rs:29:8 | LL | V2{f1: X, f: isize}, | ^^^^^ doesn't have a size known at compile-time diff --git a/src/test/ui/unsized6.rs b/src/test/ui/unsized6.rs index 1a57f2caf8dd2..79133554d5472 100644 --- a/src/test/ui/unsized6.rs +++ b/src/test/ui/unsized6.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test `?Sized` local variables. trait T {} diff --git a/src/test/ui/unsized6.stderr b/src/test/ui/unsized6.stderr index 5a09533269288..058c22e2145e4 100644 --- a/src/test/ui/unsized6.stderr +++ b/src/test/ui/unsized6.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `Y` cannot be known at compilation time - --> $DIR/unsized6.rs:19:9 + --> $DIR/unsized6.rs:9:9 | LL | let y: Y; | ^ doesn't have a size known at compile-time @@ -11,7 +11,7 @@ LL | let y: Y; = help: unsized locals are gated as an unstable feature error[E0277]: the size for values of type `X` cannot be known at compilation time - --> $DIR/unsized6.rs:17:12 + --> $DIR/unsized6.rs:7:12 | LL | let _: (isize, (X, isize)); | ^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time @@ -22,7 +22,7 @@ LL | let _: (isize, (X, isize)); = note: only the last element of a tuple may have a dynamically sized type error[E0277]: the size for values of type `Z` cannot be known at compilation time - --> $DIR/unsized6.rs:21:12 + --> $DIR/unsized6.rs:11:12 | LL | let y: (isize, (Z, usize)); | ^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time @@ -33,7 +33,7 @@ LL | let y: (isize, (Z, usize)); = note: only the last element of a tuple may have a dynamically sized type error[E0277]: the size for values of type `X` cannot be known at compilation time - --> $DIR/unsized6.rs:25:9 + --> $DIR/unsized6.rs:15:9 | LL | let y: X; | ^ doesn't have a size known at compile-time @@ -45,7 +45,7 @@ LL | let y: X; = help: unsized locals are gated as an unstable feature error[E0277]: the size for values of type `Y` cannot be known at compilation time - --> $DIR/unsized6.rs:27:12 + --> $DIR/unsized6.rs:17:12 | LL | let y: (isize, (Y, isize)); | ^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time @@ -56,7 +56,7 @@ LL | let y: (isize, (Y, isize)); = note: only the last element of a tuple may have a dynamically sized type error[E0277]: the size for values of type `X` cannot be known at compilation time - --> $DIR/unsized6.rs:32:9 + --> $DIR/unsized6.rs:22:9 | LL | let y: X = *x1; | ^ doesn't have a size known at compile-time @@ -68,7 +68,7 @@ LL | let y: X = *x1; = help: unsized locals are gated as an unstable feature error[E0277]: the size for values of type `X` cannot be known at compilation time - --> $DIR/unsized6.rs:34:9 + --> $DIR/unsized6.rs:24:9 | LL | let y = *x2; | ^ doesn't have a size known at compile-time @@ -80,7 +80,7 @@ LL | let y = *x2; = help: unsized locals are gated as an unstable feature error[E0277]: the size for values of type `X` cannot be known at compilation time - --> $DIR/unsized6.rs:36:10 + --> $DIR/unsized6.rs:26:10 | LL | let (y, z) = (*x3, 4); | ^ doesn't have a size known at compile-time @@ -92,7 +92,7 @@ LL | let (y, z) = (*x3, 4); = help: unsized locals are gated as an unstable feature error[E0277]: the size for values of type `X` cannot be known at compilation time - --> $DIR/unsized6.rs:40:9 + --> $DIR/unsized6.rs:30:9 | LL | let y: X = *x1; | ^ doesn't have a size known at compile-time @@ -104,7 +104,7 @@ LL | let y: X = *x1; = help: unsized locals are gated as an unstable feature error[E0277]: the size for values of type `X` cannot be known at compilation time - --> $DIR/unsized6.rs:42:9 + --> $DIR/unsized6.rs:32:9 | LL | let y = *x2; | ^ doesn't have a size known at compile-time @@ -116,7 +116,7 @@ LL | let y = *x2; = help: unsized locals are gated as an unstable feature error[E0277]: the size for values of type `X` cannot be known at compilation time - --> $DIR/unsized6.rs:44:10 + --> $DIR/unsized6.rs:34:10 | LL | let (y, z) = (*x3, 4); | ^ doesn't have a size known at compile-time @@ -128,7 +128,7 @@ LL | let (y, z) = (*x3, 4); = help: unsized locals are gated as an unstable feature error[E0277]: the size for values of type `X` cannot be known at compilation time - --> $DIR/unsized6.rs:48:18 + --> $DIR/unsized6.rs:38:18 | LL | fn g1(x: X) {} | ^ doesn't have a size known at compile-time @@ -140,7 +140,7 @@ LL | fn g1(x: X) {} = help: unsized locals are gated as an unstable feature error[E0277]: the size for values of type `X` cannot be known at compilation time - --> $DIR/unsized6.rs:50:22 + --> $DIR/unsized6.rs:40:22 | LL | fn g2(x: X) {} | ^ doesn't have a size known at compile-time diff --git a/src/test/ui/unsized7.rs b/src/test/ui/unsized7.rs index 07b4ae4c3941c..422a784814e91 100644 --- a/src/test/ui/unsized7.rs +++ b/src/test/ui/unsized7.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test sized-ness checking in substitution in impls. trait T {} diff --git a/src/test/ui/unsized7.stderr b/src/test/ui/unsized7.stderr index 67217659fbc2f..90f5a1f02d6c1 100644 --- a/src/test/ui/unsized7.stderr +++ b/src/test/ui/unsized7.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `X` cannot be known at compilation time - --> $DIR/unsized7.rs:22:21 + --> $DIR/unsized7.rs:12:21 | LL | impl T1 for S3 { | ^^^^^ doesn't have a size known at compile-time diff --git a/src/test/ui/unspecified-self-in-trait-ref.rs b/src/test/ui/unspecified-self-in-trait-ref.rs index cf8f3e916022c..74a9af84cae85 100644 --- a/src/test/ui/unspecified-self-in-trait-ref.rs +++ b/src/test/ui/unspecified-self-in-trait-ref.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Foo { fn foo(&self); } diff --git a/src/test/ui/unspecified-self-in-trait-ref.stderr b/src/test/ui/unspecified-self-in-trait-ref.stderr index c036540068b0b..cb7ee93338f68 100644 --- a/src/test/ui/unspecified-self-in-trait-ref.stderr +++ b/src/test/ui/unspecified-self-in-trait-ref.stderr @@ -1,29 +1,29 @@ error[E0599]: no function or associated item named `lol` found for type `dyn Foo<_>` in the current scope - --> $DIR/unspecified-self-in-trait-ref.rs:20:13 + --> $DIR/unspecified-self-in-trait-ref.rs:10:13 | LL | let a = Foo::lol(); | ^^^^^^^^ function or associated item not found in `dyn Foo<_>` error[E0599]: no function or associated item named `lol` found for type `dyn Foo<_>` in the current scope - --> $DIR/unspecified-self-in-trait-ref.rs:22:13 + --> $DIR/unspecified-self-in-trait-ref.rs:12:13 | LL | let b = Foo::<_>::lol(); | ^^^^^^^^^^^^^ function or associated item not found in `dyn Foo<_>` error[E0599]: no function or associated item named `lol` found for type `dyn Bar<_, _>` in the current scope - --> $DIR/unspecified-self-in-trait-ref.rs:24:13 + --> $DIR/unspecified-self-in-trait-ref.rs:14:13 | LL | let c = Bar::lol(); | ^^^^^^^^ function or associated item not found in `dyn Bar<_, _>` error[E0599]: no function or associated item named `lol` found for type `dyn Bar` in the current scope - --> $DIR/unspecified-self-in-trait-ref.rs:26:13 + --> $DIR/unspecified-self-in-trait-ref.rs:16:13 | LL | let d = Bar::::lol(); | ^^^^^^^^^^^^^^^^^^^^ function or associated item not found in `dyn Bar` error[E0393]: the type parameter `A` must be explicitly specified - --> $DIR/unspecified-self-in-trait-ref.rs:28:13 + --> $DIR/unspecified-self-in-trait-ref.rs:18:13 | LL | let e = Bar::::lol(); | ^^^^^^^^^^^^^^^^^ missing reference to `A` diff --git a/src/test/ui/unsupported-cast.rs b/src/test/ui/unsupported-cast.rs index 5137663a269f4..cb6a57a4d39d5 100644 --- a/src/test/ui/unsupported-cast.rs +++ b/src/test/ui/unsupported-cast.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:casting struct A; diff --git a/src/test/ui/unsupported-cast.stderr b/src/test/ui/unsupported-cast.stderr index 4babc01ad7f74..63e7713d2f4e7 100644 --- a/src/test/ui/unsupported-cast.stderr +++ b/src/test/ui/unsupported-cast.stderr @@ -1,5 +1,5 @@ error[E0606]: casting `f64` as `*const A` is invalid - --> $DIR/unsupported-cast.rs:16:20 + --> $DIR/unsupported-cast.rs:6:20 | LL | println!("{:?}", 1.0 as *const A); // Can't cast float to foreign. | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/unused/unused-attr.rs b/src/test/ui/unused/unused-attr.rs index e20d03478ec18..810732a977578 100644 --- a/src/test/ui/unused/unused-attr.rs +++ b/src/test/ui/unused/unused-attr.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(unused_attributes)] #![allow(dead_code, unused_imports, unused_extern_crates)] #![feature(custom_attribute)] diff --git a/src/test/ui/unused/unused-attr.stderr b/src/test/ui/unused/unused-attr.stderr index 7265dd3c63f9e..6d8a4dd84e65b 100644 --- a/src/test/ui/unused/unused-attr.stderr +++ b/src/test/ui/unused/unused-attr.stderr @@ -1,95 +1,95 @@ error: unused attribute - --> $DIR/unused-attr.rs:17:1 + --> $DIR/unused-attr.rs:7:1 | LL | #[foo] //~ ERROR unused attribute | ^^^^^^ | note: lint level defined here - --> $DIR/unused-attr.rs:11:9 + --> $DIR/unused-attr.rs:1:9 | LL | #![deny(unused_attributes)] | ^^^^^^^^^^^^^^^^^ error: unused attribute - --> $DIR/unused-attr.rs:20:1 + --> $DIR/unused-attr.rs:10:1 | LL | #[foo] //~ ERROR unused attribute | ^^^^^^ error: unused attribute - --> $DIR/unused-attr.rs:25:5 + --> $DIR/unused-attr.rs:15:5 | LL | #[foo] //~ ERROR unused attribute | ^^^^^^ error: unused attribute - --> $DIR/unused-attr.rs:23:1 + --> $DIR/unused-attr.rs:13:1 | LL | #[foo] //~ ERROR unused attribute | ^^^^^^ error: unused attribute - --> $DIR/unused-attr.rs:33:9 + --> $DIR/unused-attr.rs:23:9 | LL | #[foo] //~ ERROR unused attribute | ^^^^^^ error: unused attribute - --> $DIR/unused-attr.rs:31:5 + --> $DIR/unused-attr.rs:21:5 | LL | #[foo] //~ ERROR unused attribute | ^^^^^^ error: unused attribute - --> $DIR/unused-attr.rs:29:1 + --> $DIR/unused-attr.rs:19:1 | LL | #[foo] //~ ERROR unused attribute | ^^^^^^ error: unused attribute - --> $DIR/unused-attr.rs:41:9 + --> $DIR/unused-attr.rs:31:9 | LL | #[foo] //~ ERROR unused attribute | ^^^^^^ error: unused attribute - --> $DIR/unused-attr.rs:38:1 + --> $DIR/unused-attr.rs:28:1 | LL | #[foo] //~ ERROR unused attribute | ^^^^^^ error: unused attribute - --> $DIR/unused-attr.rs:48:5 + --> $DIR/unused-attr.rs:38:5 | LL | #[foo] //~ ERROR unused attribute | ^^^^^^ error: unused attribute - --> $DIR/unused-attr.rs:46:1 + --> $DIR/unused-attr.rs:36:1 | LL | #[foo] //~ ERROR unused attribute | ^^^^^^ error: unused attribute - --> $DIR/unused-attr.rs:54:5 + --> $DIR/unused-attr.rs:44:5 | LL | #[foo] //~ ERROR unused attribute | ^^^^^^ error: unused attribute - --> $DIR/unused-attr.rs:56:5 + --> $DIR/unused-attr.rs:46:5 | LL | #[foo] //~ ERROR unused attribute | ^^^^^^ error: unused attribute - --> $DIR/unused-attr.rs:52:1 + --> $DIR/unused-attr.rs:42:1 | LL | #[foo] //~ ERROR unused attribute | ^^^^^^ error: unused attribute - --> $DIR/unused-attr.rs:15:1 + --> $DIR/unused-attr.rs:5:1 | LL | #![foo] //~ ERROR unused attribute | ^^^^^^^ diff --git a/src/test/ui/unused/unused-macro-rules.rs b/src/test/ui/unused/unused-macro-rules.rs index 5e401c09bda59..1a714b8f0a0d0 100644 --- a/src/test/ui/unused/unused-macro-rules.rs +++ b/src/test/ui/unused/unused-macro-rules.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(unused_macros)] // Most simple case diff --git a/src/test/ui/unused/unused-macro-rules.stderr b/src/test/ui/unused/unused-macro-rules.stderr index 8ced41022f829..c6ec064096b15 100644 --- a/src/test/ui/unused/unused-macro-rules.stderr +++ b/src/test/ui/unused/unused-macro-rules.stderr @@ -1,5 +1,5 @@ error: unused macro definition - --> $DIR/unused-macro-rules.rs:14:1 + --> $DIR/unused-macro-rules.rs:4:1 | LL | / macro_rules! unused { //~ ERROR: unused macro definition LL | | () => {}; @@ -7,13 +7,13 @@ LL | | } | |_^ | note: lint level defined here - --> $DIR/unused-macro-rules.rs:11:9 + --> $DIR/unused-macro-rules.rs:1:9 | LL | #![deny(unused_macros)] | ^^^^^^^^^^^^^ error: unused macro definition - --> $DIR/unused-macro-rules.rs:21:9 + --> $DIR/unused-macro-rules.rs:11:9 | LL | / macro_rules! m { //~ ERROR: unused macro definition LL | | () => {}; @@ -24,7 +24,7 @@ LL | create_macro!(); | ---------------- in this macro invocation error: unused macro definition - --> $DIR/unused-macro-rules.rs:34:5 + --> $DIR/unused-macro-rules.rs:24:5 | LL | / macro_rules! unused { //~ ERROR: unused macro definition LL | | () => {}; @@ -32,7 +32,7 @@ LL | | } | |_____^ | note: lint level defined here - --> $DIR/unused-macro-rules.rs:33:12 + --> $DIR/unused-macro-rules.rs:23:12 | LL | #[deny(unused_macros)] | ^^^^^^^^^^^^^ diff --git a/src/test/ui/unused/unused-macro-with-bad-frag-spec.rs b/src/test/ui/unused/unused-macro-with-bad-frag-spec.rs index 28a69e6f9e29b..ce187047bb734 100644 --- a/src/test/ui/unused/unused-macro-with-bad-frag-spec.rs +++ b/src/test/ui/unused/unused-macro-with-bad-frag-spec.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_macros)] // Issue #21370 diff --git a/src/test/ui/unused/unused-macro-with-bad-frag-spec.stderr b/src/test/ui/unused/unused-macro-with-bad-frag-spec.stderr index 8843587890549..c6751efd11853 100644 --- a/src/test/ui/unused/unused-macro-with-bad-frag-spec.stderr +++ b/src/test/ui/unused/unused-macro-with-bad-frag-spec.stderr @@ -1,5 +1,5 @@ error: invalid fragment specifier `t_ty` - --> $DIR/unused-macro-with-bad-frag-spec.rs:16:6 + --> $DIR/unused-macro-with-bad-frag-spec.rs:6:6 | LL | ($wrong:t_ty) => () //~ ERROR invalid fragment specifier `t_ty` | ^^^^^^^^^^^ diff --git a/src/test/ui/unused/unused-macro-with-follow-violation.rs b/src/test/ui/unused/unused-macro-with-follow-violation.rs index dda0d3fc9557d..1666dae69b951 100644 --- a/src/test/ui/unused/unused-macro-with-follow-violation.rs +++ b/src/test/ui/unused/unused-macro-with-follow-violation.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_macros)] macro_rules! test { diff --git a/src/test/ui/unused/unused-macro-with-follow-violation.stderr b/src/test/ui/unused/unused-macro-with-follow-violation.stderr index 8efb191c7c645..20d5838950a5b 100644 --- a/src/test/ui/unused/unused-macro-with-follow-violation.stderr +++ b/src/test/ui/unused/unused-macro-with-follow-violation.stderr @@ -1,5 +1,5 @@ error: `$e:expr` is followed by `+`, which is not allowed for `expr` fragments - --> $DIR/unused-macro-with-follow-violation.rs:14:14 + --> $DIR/unused-macro-with-follow-violation.rs:4:14 | LL | ($e:expr +) => () //~ ERROR not allowed for `expr` fragments | ^ diff --git a/src/test/ui/unused/unused-macro.rs b/src/test/ui/unused/unused-macro.rs index 9e32f01724d02..302b0727d77b0 100644 --- a/src/test/ui/unused/unused-macro.rs +++ b/src/test/ui/unused/unused-macro.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(decl_macro)] #![deny(unused_macros)] diff --git a/src/test/ui/unused/unused-macro.stderr b/src/test/ui/unused/unused-macro.stderr index 3e1c1164d5b26..a83b5be5fbf73 100644 --- a/src/test/ui/unused/unused-macro.stderr +++ b/src/test/ui/unused/unused-macro.stderr @@ -1,5 +1,5 @@ error: unused macro definition - --> $DIR/unused-macro.rs:15:1 + --> $DIR/unused-macro.rs:5:1 | LL | / macro unused { //~ ERROR: unused macro definition LL | | () => {} @@ -7,13 +7,13 @@ LL | | } | |_^ | note: lint level defined here - --> $DIR/unused-macro.rs:12:9 + --> $DIR/unused-macro.rs:2:9 | LL | #![deny(unused_macros)] | ^^^^^^^^^^^^^ error: unused macro definition - --> $DIR/unused-macro.rs:25:5 + --> $DIR/unused-macro.rs:15:5 | LL | / macro unused { //~ ERROR: unused macro definition LL | | () => {} @@ -21,13 +21,13 @@ LL | | } | |_____^ | note: lint level defined here - --> $DIR/unused-macro.rs:24:12 + --> $DIR/unused-macro.rs:14:12 | LL | #[deny(unused_macros)] | ^^^^^^^^^^^^^ error: unused macro definition - --> $DIR/unused-macro.rs:31:5 + --> $DIR/unused-macro.rs:21:5 | LL | / pub(crate) macro unused { //~ ERROR: unused macro definition LL | | () => {} diff --git a/src/test/ui/unused/unused-mut-warning-captured-var.rs b/src/test/ui/unused/unused-mut-warning-captured-var.rs index d4dc58864ad82..c945969cf6325 100644 --- a/src/test/ui/unused/unused-mut-warning-captured-var.rs +++ b/src/test/ui/unused/unused-mut-warning-captured-var.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![forbid(unused_mut)] fn main() { diff --git a/src/test/ui/unused/unused-mut-warning-captured-var.stderr b/src/test/ui/unused/unused-mut-warning-captured-var.stderr index ae976d85bde35..d5b731406d6fc 100644 --- a/src/test/ui/unused/unused-mut-warning-captured-var.stderr +++ b/src/test/ui/unused/unused-mut-warning-captured-var.stderr @@ -1,5 +1,5 @@ error: variable does not need to be mutable - --> $DIR/unused-mut-warning-captured-var.rs:14:9 + --> $DIR/unused-mut-warning-captured-var.rs:4:9 | LL | let mut x = 1; | ----^ @@ -7,7 +7,7 @@ LL | let mut x = 1; | help: remove this `mut` | note: lint level defined here - --> $DIR/unused-mut-warning-captured-var.rs:11:11 + --> $DIR/unused-mut-warning-captured-var.rs:1:11 | LL | #![forbid(unused_mut)] | ^^^^^^^^^^ diff --git a/src/test/ui/unused/unused-result.rs b/src/test/ui/unused/unused-result.rs index 363ab6220bd6e..0fe07619779dc 100644 --- a/src/test/ui/unused/unused-result.rs +++ b/src/test/ui/unused/unused-result.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] #![deny(unused_results, unused_must_use)] //~^ NOTE: lint level defined here diff --git a/src/test/ui/unused/unused-result.stderr b/src/test/ui/unused/unused-result.stderr index e6ca7b8fab8fd..57fb5658c1412 100644 --- a/src/test/ui/unused/unused-result.stderr +++ b/src/test/ui/unused/unused-result.stderr @@ -1,17 +1,17 @@ error: unused `MustUse` which must be used - --> $DIR/unused-result.rs:31:5 + --> $DIR/unused-result.rs:21:5 | LL | foo::(); //~ ERROR: unused `MustUse` which must be used | ^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/unused-result.rs:12:25 + --> $DIR/unused-result.rs:2:25 | LL | #![deny(unused_results, unused_must_use)] | ^^^^^^^^^^^^^^^ error: unused `MustUseMsg` which must be used - --> $DIR/unused-result.rs:32:5 + --> $DIR/unused-result.rs:22:5 | LL | foo::(); //~ ERROR: unused `MustUseMsg` which must be used | ^^^^^^^^^^^^^^^^^^^^ @@ -19,25 +19,25 @@ LL | foo::(); //~ ERROR: unused `MustUseMsg` which must be used = note: some message error: unused result - --> $DIR/unused-result.rs:44:5 + --> $DIR/unused-result.rs:34:5 | LL | foo::(); //~ ERROR: unused result | ^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/unused-result.rs:12:9 + --> $DIR/unused-result.rs:2:9 | LL | #![deny(unused_results, unused_must_use)] | ^^^^^^^^^^^^^^ error: unused `MustUse` which must be used - --> $DIR/unused-result.rs:45:5 + --> $DIR/unused-result.rs:35:5 | LL | foo::(); //~ ERROR: unused `MustUse` which must be used | ^^^^^^^^^^^^^^^^^ error: unused `MustUseMsg` which must be used - --> $DIR/unused-result.rs:46:5 + --> $DIR/unused-result.rs:36:5 | LL | foo::(); //~ ERROR: unused `MustUseMsg` which must be used | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/use/auxiliary/use_from_trait_xc.rs b/src/test/ui/use/auxiliary/use_from_trait_xc.rs index 9a6d176d0887b..4abe11941b11f 100644 --- a/src/test/ui/use/auxiliary/use_from_trait_xc.rs +++ b/src/test/ui/use/auxiliary/use_from_trait_xc.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub use self::sub::{Bar, Baz}; pub trait Trait { diff --git a/src/test/ui/use/use-after-move-based-on-type.nll.stderr b/src/test/ui/use/use-after-move-based-on-type.nll.stderr index a18c25cbb55d8..6f5b23b201333 100644 --- a/src/test/ui/use/use-after-move-based-on-type.nll.stderr +++ b/src/test/ui/use/use-after-move-based-on-type.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: borrow of moved value: `x` - --> $DIR/use-after-move-based-on-type.rs:14:20 + --> $DIR/use-after-move-based-on-type.rs:4:20 | LL | let _y = x; | - value moved here diff --git a/src/test/ui/use/use-after-move-based-on-type.rs b/src/test/ui/use/use-after-move-based-on-type.rs index e2167ca446f2c..fc8ea6f79eb87 100644 --- a/src/test/ui/use/use-after-move-based-on-type.rs +++ b/src/test/ui/use/use-after-move-based-on-type.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = "Hello!".to_string(); let _y = x; diff --git a/src/test/ui/use/use-after-move-based-on-type.stderr b/src/test/ui/use/use-after-move-based-on-type.stderr index 510cc708bed85..2282cdfad14dd 100644 --- a/src/test/ui/use/use-after-move-based-on-type.stderr +++ b/src/test/ui/use/use-after-move-based-on-type.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `x` - --> $DIR/use-after-move-based-on-type.rs:14:20 + --> $DIR/use-after-move-based-on-type.rs:4:20 | LL | let _y = x; | -- value moved here diff --git a/src/test/ui/use/use-after-move-implicity-coerced-object.nll.stderr b/src/test/ui/use/use-after-move-implicity-coerced-object.nll.stderr index 23753506368f0..308134774efb3 100644 --- a/src/test/ui/use/use-after-move-implicity-coerced-object.nll.stderr +++ b/src/test/ui/use/use-after-move-implicity-coerced-object.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: borrow of moved value: `n` - --> $DIR/use-after-move-implicity-coerced-object.rs:38:13 + --> $DIR/use-after-move-implicity-coerced-object.rs:28:13 | LL | l.push(n); | - value moved here diff --git a/src/test/ui/use/use-after-move-implicity-coerced-object.rs b/src/test/ui/use/use-after-move-implicity-coerced-object.rs index addc572175231..e43506916644a 100644 --- a/src/test/ui/use/use-after-move-implicity-coerced-object.rs +++ b/src/test/ui/use/use-after-move-implicity-coerced-object.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] use std::fmt; diff --git a/src/test/ui/use/use-after-move-implicity-coerced-object.stderr b/src/test/ui/use/use-after-move-implicity-coerced-object.stderr index ab7494702d73c..babff9be25241 100644 --- a/src/test/ui/use/use-after-move-implicity-coerced-object.stderr +++ b/src/test/ui/use/use-after-move-implicity-coerced-object.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `n` - --> $DIR/use-after-move-implicity-coerced-object.rs:38:13 + --> $DIR/use-after-move-implicity-coerced-object.rs:28:13 | LL | l.push(n); | - value moved here diff --git a/src/test/ui/use/use-after-move-self-based-on-type.rs b/src/test/ui/use/use-after-move-self-based-on-type.rs index 810fc68a0f4da..4d84ae9b27173 100644 --- a/src/test/ui/use/use-after-move-self-based-on-type.rs +++ b/src/test/ui/use/use-after-move-self-based-on-type.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S { x: isize, } diff --git a/src/test/ui/use/use-after-move-self-based-on-type.stderr b/src/test/ui/use/use-after-move-self-based-on-type.stderr index 60cd142799ebc..a3acc1aad0f00 100644 --- a/src/test/ui/use/use-after-move-self-based-on-type.stderr +++ b/src/test/ui/use/use-after-move-self-based-on-type.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `self.x` - --> $DIR/use-after-move-self-based-on-type.rs:22:16 + --> $DIR/use-after-move-self-based-on-type.rs:12:16 | LL | self.bar(); | ---- value moved here diff --git a/src/test/ui/use/use-after-move-self.nll.stderr b/src/test/ui/use/use-after-move-self.nll.stderr index 3b19e96d12cce..e61c60882b21d 100644 --- a/src/test/ui/use/use-after-move-self.nll.stderr +++ b/src/test/ui/use/use-after-move-self.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `*self.x` - --> $DIR/use-after-move-self.rs:20:16 + --> $DIR/use-after-move-self.rs:10:16 | LL | self.bar(); | ---- value moved here diff --git a/src/test/ui/use/use-after-move-self.rs b/src/test/ui/use/use-after-move-self.rs index e9ffb26aba5b7..1337d61a6d8e8 100644 --- a/src/test/ui/use/use-after-move-self.rs +++ b/src/test/ui/use/use-after-move-self.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] struct S { diff --git a/src/test/ui/use/use-after-move-self.stderr b/src/test/ui/use/use-after-move-self.stderr index 7273602aadc4b..3cb77acaf3dd4 100644 --- a/src/test/ui/use/use-after-move-self.stderr +++ b/src/test/ui/use/use-after-move-self.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `*self.x` - --> $DIR/use-after-move-self.rs:20:16 + --> $DIR/use-after-move-self.rs:10:16 | LL | self.bar(); | ---- value moved here diff --git a/src/test/ui/use/use-from-trait-xc.rs b/src/test/ui/use/use-from-trait-xc.rs index 3848b6814d9a5..e6f102f6269a7 100644 --- a/src/test/ui/use/use-from-trait-xc.rs +++ b/src/test/ui/use/use-from-trait-xc.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:use_from_trait_xc.rs extern crate use_from_trait_xc; diff --git a/src/test/ui/use/use-from-trait-xc.stderr b/src/test/ui/use/use-from-trait-xc.stderr index 130aca8162a43..f3b40110918bb 100644 --- a/src/test/ui/use/use-from-trait-xc.stderr +++ b/src/test/ui/use/use-from-trait-xc.stderr @@ -1,53 +1,53 @@ error[E0253]: `foo` is not directly importable - --> $DIR/use-from-trait-xc.rs:15:5 + --> $DIR/use-from-trait-xc.rs:5:5 | LL | use use_from_trait_xc::Trait::foo; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot be imported directly error[E0253]: `Assoc` is not directly importable - --> $DIR/use-from-trait-xc.rs:18:5 + --> $DIR/use-from-trait-xc.rs:8:5 | LL | use use_from_trait_xc::Trait::Assoc; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot be imported directly error[E0253]: `CONST` is not directly importable - --> $DIR/use-from-trait-xc.rs:21:5 + --> $DIR/use-from-trait-xc.rs:11:5 | LL | use use_from_trait_xc::Trait::CONST; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot be imported directly error[E0432]: unresolved import `use_from_trait_xc::Foo` - --> $DIR/use-from-trait-xc.rs:24:24 + --> $DIR/use-from-trait-xc.rs:14:24 | LL | use use_from_trait_xc::Foo::new; //~ ERROR struct `Foo` is private | ^^^ Not a module `Foo` error[E0432]: unresolved import `use_from_trait_xc::Foo` - --> $DIR/use-from-trait-xc.rs:27:24 + --> $DIR/use-from-trait-xc.rs:17:24 | LL | use use_from_trait_xc::Foo::C; //~ ERROR struct `Foo` is private | ^^^ Not a module `Foo` error[E0432]: unresolved import `use_from_trait_xc::Bar` - --> $DIR/use-from-trait-xc.rs:30:24 + --> $DIR/use-from-trait-xc.rs:20:24 | LL | use use_from_trait_xc::Bar::new as bnew; | ^^^ Not a module `Bar` error[E0432]: unresolved import `use_from_trait_xc::Baz::new` - --> $DIR/use-from-trait-xc.rs:33:5 + --> $DIR/use-from-trait-xc.rs:23:5 | LL | use use_from_trait_xc::Baz::new as baznew; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `new` in `Baz` error[E0603]: struct `Foo` is private - --> $DIR/use-from-trait-xc.rs:24:5 + --> $DIR/use-from-trait-xc.rs:14:5 | LL | use use_from_trait_xc::Foo::new; //~ ERROR struct `Foo` is private | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0603]: struct `Foo` is private - --> $DIR/use-from-trait-xc.rs:27:5 + --> $DIR/use-from-trait-xc.rs:17:5 | LL | use use_from_trait_xc::Foo::C; //~ ERROR struct `Foo` is private | ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/use/use-from-trait.rs b/src/test/ui/use/use-from-trait.rs index 29db949acd04a..84aed750d50f0 100644 --- a/src/test/ui/use/use-from-trait.rs +++ b/src/test/ui/use/use-from-trait.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - use Trait::foo; //~^ ERROR `foo` is not directly importable use Trait::Assoc; diff --git a/src/test/ui/use/use-from-trait.stderr b/src/test/ui/use/use-from-trait.stderr index b43a32988cafd..ffab3edfb903d 100644 --- a/src/test/ui/use/use-from-trait.stderr +++ b/src/test/ui/use/use-from-trait.stderr @@ -1,29 +1,29 @@ error[E0253]: `foo` is not directly importable - --> $DIR/use-from-trait.rs:12:5 + --> $DIR/use-from-trait.rs:1:5 | LL | use Trait::foo; | ^^^^^^^^^^ cannot be imported directly error[E0253]: `Assoc` is not directly importable - --> $DIR/use-from-trait.rs:14:5 + --> $DIR/use-from-trait.rs:3:5 | LL | use Trait::Assoc; | ^^^^^^^^^^^^ cannot be imported directly error[E0253]: `C` is not directly importable - --> $DIR/use-from-trait.rs:16:5 + --> $DIR/use-from-trait.rs:5:5 | LL | use Trait::C; | ^^^^^^^^ cannot be imported directly error[E0432]: unresolved import `Foo` - --> $DIR/use-from-trait.rs:19:5 + --> $DIR/use-from-trait.rs:8:5 | LL | use Foo::new; | ^^^ Not a module `Foo` error[E0432]: unresolved import `Foo` - --> $DIR/use-from-trait.rs:23:5 + --> $DIR/use-from-trait.rs:12:5 | LL | use Foo::C2; | ^^^ Not a module `Foo` diff --git a/src/test/ui/use/use-keyword.rs b/src/test/ui/use/use-keyword.rs index aff54f18c19a3..c30c2e06c4557 100644 --- a/src/test/ui/use/use-keyword.rs +++ b/src/test/ui/use/use-keyword.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that imports with nakes super and self don't fail during parsing // FIXME: this shouldn't fail during name resolution either diff --git a/src/test/ui/use/use-keyword.stderr b/src/test/ui/use/use-keyword.stderr index 11893bce5c41f..1cb30fa487e09 100644 --- a/src/test/ui/use/use-keyword.stderr +++ b/src/test/ui/use/use-keyword.stderr @@ -1,17 +1,17 @@ error[E0429]: `self` imports are only allowed within a { } list - --> $DIR/use-keyword.rs:16:13 + --> $DIR/use-keyword.rs:6:13 | LL | use self as A; | ^^^^^^^^^ error[E0432]: unresolved import `super` - --> $DIR/use-keyword.rs:18:13 + --> $DIR/use-keyword.rs:8:13 | LL | use super as B; | ^^^^^^^^^^ no `super` in the root error[E0432]: unresolved import `super` - --> $DIR/use-keyword.rs:21:21 + --> $DIR/use-keyword.rs:11:21 | LL | use super::{self as C}; | ^^^^^^^^^ no `super` in the root diff --git a/src/test/ui/use/use-meta-mismatch.rs b/src/test/ui/use/use-meta-mismatch.rs index 6b7b9c8914955..459216a17e4f3 100644 --- a/src/test/ui/use/use-meta-mismatch.rs +++ b/src/test/ui/use/use-meta-mismatch.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:can't find crate for `extra` extern crate fake_crate as extra; diff --git a/src/test/ui/use/use-meta-mismatch.stderr b/src/test/ui/use/use-meta-mismatch.stderr index 063de29510ed6..877ac464de782 100644 --- a/src/test/ui/use/use-meta-mismatch.stderr +++ b/src/test/ui/use/use-meta-mismatch.stderr @@ -1,5 +1,5 @@ error[E0463]: can't find crate for `extra` - --> $DIR/use-meta-mismatch.rs:13:1 + --> $DIR/use-meta-mismatch.rs:3:1 | LL | extern crate fake_crate as extra; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't find crate diff --git a/src/test/ui/use/use-mod.rs b/src/test/ui/use/use-mod.rs index 37495cd1724ee..87064c6a42b11 100644 --- a/src/test/ui/use/use-mod.rs +++ b/src/test/ui/use/use-mod.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use foo::bar::{ self, //~^ ERROR `self` import can only appear once in an import list diff --git a/src/test/ui/use/use-mod.stderr b/src/test/ui/use/use-mod.stderr index dcdba6fce9ad9..489f4e6d07780 100644 --- a/src/test/ui/use/use-mod.stderr +++ b/src/test/ui/use/use-mod.stderr @@ -1,5 +1,5 @@ error[E0430]: `self` import can only appear once in an import list - --> $DIR/use-mod.rs:12:5 + --> $DIR/use-mod.rs:2:5 | LL | self, | ^^^^ can only appear once in an import list @@ -8,13 +8,13 @@ LL | self | ---- another `self` import appears here error[E0431]: `self` import can only appear in an import list with a non-empty prefix - --> $DIR/use-mod.rs:19:6 + --> $DIR/use-mod.rs:9:6 | LL | use {self}; | ^^^^ can only appear in an import list with a non-empty prefix error[E0252]: the name `bar` is defined multiple times - --> $DIR/use-mod.rs:15:5 + --> $DIR/use-mod.rs:5:5 | LL | self, | ---- previous import of the module `bar` here diff --git a/src/test/ui/use/use-mod/use-mod-2.rs b/src/test/ui/use/use-mod/use-mod-2.rs index 5f8842a521abd..9373a62ba36ec 100644 --- a/src/test/ui/use/use-mod/use-mod-2.rs +++ b/src/test/ui/use/use-mod/use-mod-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod foo { use self::{self}; //~^ ERROR unresolved import `self` [E0432] diff --git a/src/test/ui/use/use-mod/use-mod-2.stderr b/src/test/ui/use/use-mod/use-mod-2.stderr index f343dc2b31d42..8437678497724 100644 --- a/src/test/ui/use/use-mod/use-mod-2.stderr +++ b/src/test/ui/use/use-mod/use-mod-2.stderr @@ -1,11 +1,11 @@ error[E0432]: unresolved import `self` - --> $DIR/use-mod-2.rs:12:16 + --> $DIR/use-mod-2.rs:2:16 | LL | use self::{self}; | ^^^^ no `self` in the root error[E0432]: unresolved import `super` - --> $DIR/use-mod-2.rs:16:17 + --> $DIR/use-mod-2.rs:6:17 | LL | use super::{self}; | ^^^^ no `super` in the root diff --git a/src/test/ui/use/use-mod/use-mod-3.rs b/src/test/ui/use/use-mod/use-mod-3.rs index cce500800caca..9be15bf84d901 100644 --- a/src/test/ui/use/use-mod/use-mod-3.rs +++ b/src/test/ui/use/use-mod/use-mod-3.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use foo::bar::{ self //~ ERROR module `bar` is private }; diff --git a/src/test/ui/use/use-mod/use-mod-3.stderr b/src/test/ui/use/use-mod/use-mod-3.stderr index 619239846419a..b04c482d4516d 100644 --- a/src/test/ui/use/use-mod/use-mod-3.stderr +++ b/src/test/ui/use/use-mod/use-mod-3.stderr @@ -1,11 +1,11 @@ error[E0603]: module `bar` is private - --> $DIR/use-mod-3.rs:12:5 + --> $DIR/use-mod-3.rs:2:5 | LL | self //~ ERROR module `bar` is private | ^^^^ error[E0603]: module `bar` is private - --> $DIR/use-mod-3.rs:15:5 + --> $DIR/use-mod-3.rs:5:5 | LL | Bar //~ ERROR module `bar` is private | ^^^ diff --git a/src/test/ui/use/use-mod/use-mod-4.rs b/src/test/ui/use/use-mod/use-mod-4.rs index 275e5ff1da6ff..46ae8ddadc094 100644 --- a/src/test/ui/use/use-mod/use-mod-4.rs +++ b/src/test/ui/use/use-mod/use-mod-4.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use foo::self; //~ ERROR unresolved import `foo` //~^ ERROR `self` imports are only allowed within a { } list diff --git a/src/test/ui/use/use-mod/use-mod-4.stderr b/src/test/ui/use/use-mod/use-mod-4.stderr index 9a6d608faacca..33ca7c62000d0 100644 --- a/src/test/ui/use/use-mod/use-mod-4.stderr +++ b/src/test/ui/use/use-mod/use-mod-4.stderr @@ -1,17 +1,17 @@ error[E0429]: `self` imports are only allowed within a { } list - --> $DIR/use-mod-4.rs:11:5 + --> $DIR/use-mod-4.rs:1:5 | LL | use foo::self; //~ ERROR unresolved import `foo` | ^^^^^^^^^ error[E0429]: `self` imports are only allowed within a { } list - --> $DIR/use-mod-4.rs:14:5 + --> $DIR/use-mod-4.rs:4:5 | LL | use std::mem::self; | ^^^^^^^^^^^^^^ error[E0432]: unresolved import `foo` - --> $DIR/use-mod-4.rs:11:5 + --> $DIR/use-mod-4.rs:1:5 | LL | use foo::self; //~ ERROR unresolved import `foo` | ^^^ Maybe a missing `extern crate foo;`? diff --git a/src/test/ui/use/use-nested-groups-error.rs b/src/test/ui/use/use-nested-groups-error.rs index 0a68d34ade9fa..d8b189d19611a 100644 --- a/src/test/ui/use/use-nested-groups-error.rs +++ b/src/test/ui/use/use-nested-groups-error.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod a { pub mod b1 { pub enum C2 {} diff --git a/src/test/ui/use/use-nested-groups-error.stderr b/src/test/ui/use/use-nested-groups-error.stderr index 5e0fd503bc274..9d6fd9df6cbe6 100644 --- a/src/test/ui/use/use-nested-groups-error.stderr +++ b/src/test/ui/use/use-nested-groups-error.stderr @@ -1,5 +1,5 @@ error[E0432]: unresolved import `a::b1::C1` - --> $DIR/use-nested-groups-error.rs:19:14 + --> $DIR/use-nested-groups-error.rs:9:14 | LL | use a::{b1::{C1, C2}, B2}; | ^^ no `C1` in `a::b1`. Did you mean to use `C2`? diff --git a/src/test/ui/use/use-nested-groups-unused-imports.rs b/src/test/ui/use/use-nested-groups-unused-imports.rs index ddbf54fdd48b1..5bdc7b2c03f0f 100644 --- a/src/test/ui/use/use-nested-groups-unused-imports.rs +++ b/src/test/ui/use/use-nested-groups-unused-imports.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(use_nested_groups)] #![allow(dead_code)] #![deny(unused_imports)] diff --git a/src/test/ui/use/use-nested-groups-unused-imports.stderr b/src/test/ui/use/use-nested-groups-unused-imports.stderr index e339664f3747c..f60c7f5023798 100644 --- a/src/test/ui/use/use-nested-groups-unused-imports.stderr +++ b/src/test/ui/use/use-nested-groups-unused-imports.stderr @@ -1,23 +1,23 @@ error: unused imports: `*`, `Foo`, `baz::{}`, `foobar::*` - --> $DIR/use-nested-groups-unused-imports.rs:26:11 + --> $DIR/use-nested-groups-unused-imports.rs:16:11 | LL | use foo::{Foo, bar::{baz::{}, foobar::*}, *}; | ^^^ ^^^^^^^ ^^^^^^^^^ ^ | note: lint level defined here - --> $DIR/use-nested-groups-unused-imports.rs:13:9 + --> $DIR/use-nested-groups-unused-imports.rs:3:9 | LL | #![deny(unused_imports)] | ^^^^^^^^^^^^^^ error: unused import: `*` - --> $DIR/use-nested-groups-unused-imports.rs:28:24 + --> $DIR/use-nested-groups-unused-imports.rs:18:24 | LL | use foo::bar::baz::{*, *}; | ^ error: unused import: `use foo::{};` - --> $DIR/use-nested-groups-unused-imports.rs:30:1 + --> $DIR/use-nested-groups-unused-imports.rs:20:1 | LL | use foo::{}; | ^^^^^^^^^^^^ diff --git a/src/test/ui/use/use-paths-as-items.rs b/src/test/ui/use/use-paths-as-items.rs index db69bb33ae253..7b5eb56b18fd8 100644 --- a/src/test/ui/use/use-paths-as-items.rs +++ b/src/test/ui/use/use-paths-as-items.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Each path node in a `use` declaration must be treated as an item. If not, the following code // will trigger an ICE. // diff --git a/src/test/ui/use/use-paths-as-items.stderr b/src/test/ui/use/use-paths-as-items.stderr index 200cefc23aff0..b6fb6b26aa9f3 100644 --- a/src/test/ui/use/use-paths-as-items.stderr +++ b/src/test/ui/use/use-paths-as-items.stderr @@ -1,5 +1,5 @@ error[E0252]: the name `mem` is defined multiple times - --> $DIR/use-paths-as-items.rs:17:5 + --> $DIR/use-paths-as-items.rs:7:5 | LL | use std::{mem, ptr}; | --- previous import of the module `mem` here diff --git a/src/test/ui/use/use-self-type.rs b/src/test/ui/use/use-self-type.rs index 6b5286bf0a7da..3c215aacc601b 100644 --- a/src/test/ui/use/use-self-type.rs +++ b/src/test/ui/use/use-self-type.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S; impl S { diff --git a/src/test/ui/use/use-self-type.stderr b/src/test/ui/use/use-self-type.stderr index 5a1e5ea259552..f25991ee8603d 100644 --- a/src/test/ui/use/use-self-type.stderr +++ b/src/test/ui/use/use-self-type.stderr @@ -1,11 +1,11 @@ error[E0433]: failed to resolve. Use of undeclared type or module `Self` - --> $DIR/use-self-type.rs:17:16 + --> $DIR/use-self-type.rs:7:16 | LL | pub(in Self::f) struct Z; //~ ERROR Use of undeclared type or module `Self` | ^^^^ Use of undeclared type or module `Self` error[E0432]: unresolved import `Self` - --> $DIR/use-self-type.rs:16:13 + --> $DIR/use-self-type.rs:6:13 | LL | use Self::f; //~ ERROR unresolved import | ^^^^ Use of undeclared type or module `Self` diff --git a/src/test/ui/use/use-super-global-path.rs b/src/test/ui/use/use-super-global-path.rs index fc1a72f6f2b90..3e0ebccc0a0d6 100644 --- a/src/test/ui/use/use-super-global-path.rs +++ b/src/test/ui/use/use-super-global-path.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused)] struct S; diff --git a/src/test/ui/use/use-super-global-path.stderr b/src/test/ui/use/use-super-global-path.stderr index 4730653dbf906..bd10b3b927ee2 100644 --- a/src/test/ui/use/use-super-global-path.stderr +++ b/src/test/ui/use/use-super-global-path.stderr @@ -1,17 +1,17 @@ error[E0433]: failed to resolve. global paths cannot start with `super` - --> $DIR/use-super-global-path.rs:17:11 + --> $DIR/use-super-global-path.rs:7:11 | LL | use ::super::{S, Z}; //~ ERROR global paths cannot start with `super` | ^^^^^ global paths cannot start with `super` error[E0433]: failed to resolve. global paths cannot start with `super` - --> $DIR/use-super-global-path.rs:20:15 + --> $DIR/use-super-global-path.rs:10:15 | LL | use ::super::main; //~ ERROR global paths cannot start with `super` | ^^^^^ global paths cannot start with `super` error[E0425]: cannot find function `main` in this scope - --> $DIR/use-super-global-path.rs:21:9 + --> $DIR/use-super-global-path.rs:11:9 | LL | main(); //~ ERROR cannot find function `main` in this scope | ^^^^ not found in this scope diff --git a/src/test/ui/used.rs b/src/test/ui/used.rs index f170d9c25f56d..2408517d2dcd2 100644 --- a/src/test/ui/used.rs +++ b/src/test/ui/used.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(used)] #[used] diff --git a/src/test/ui/used.stderr b/src/test/ui/used.stderr index b8d0f42c3a3d3..088cd77cc0050 100644 --- a/src/test/ui/used.stderr +++ b/src/test/ui/used.stderr @@ -1,23 +1,23 @@ error: attribute must be applied to a `static` variable - --> $DIR/used.rs:16:1 + --> $DIR/used.rs:6:1 | LL | #[used] //~ ERROR attribute must be applied to a `static` variable | ^^^^^^^ error: attribute must be applied to a `static` variable - --> $DIR/used.rs:19:1 + --> $DIR/used.rs:9:1 | LL | #[used] //~ ERROR attribute must be applied to a `static` variable | ^^^^^^^ error: attribute must be applied to a `static` variable - --> $DIR/used.rs:22:1 + --> $DIR/used.rs:12:1 | LL | #[used] //~ ERROR attribute must be applied to a `static` variable | ^^^^^^^ error: attribute must be applied to a `static` variable - --> $DIR/used.rs:25:1 + --> $DIR/used.rs:15:1 | LL | #[used] //~ ERROR attribute must be applied to a `static` variable | ^^^^^^^ diff --git a/src/test/ui/useless-pub.rs b/src/test/ui/useless-pub.rs index 064062df753b6..fde7cd5d89d9a 100644 --- a/src/test/ui/useless-pub.rs +++ b/src/test/ui/useless-pub.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct A { pub i: isize } pub trait E { diff --git a/src/test/ui/useless-pub.stderr b/src/test/ui/useless-pub.stderr index 7e36bf2667ecd..5bca980f21e15 100644 --- a/src/test/ui/useless-pub.stderr +++ b/src/test/ui/useless-pub.stderr @@ -1,17 +1,17 @@ error[E0449]: unnecessary visibility qualifier - --> $DIR/useless-pub.rs:18:5 + --> $DIR/useless-pub.rs:8:5 | LL | pub fn foo(&self) {} //~ ERROR: unnecessary visibility qualifier | ^^^ `pub` not permitted here because it's implied error[E0449]: unnecessary visibility qualifier - --> $DIR/useless-pub.rs:22:10 + --> $DIR/useless-pub.rs:12:10 | LL | V1 { pub f: i32 }, //~ ERROR unnecessary visibility qualifier | ^^^ `pub` not permitted here because it's implied error[E0449]: unnecessary visibility qualifier - --> $DIR/useless-pub.rs:23:8 + --> $DIR/useless-pub.rs:13:8 | LL | V2(pub i32), //~ ERROR unnecessary visibility qualifier | ^^^ `pub` not permitted here because it's implied diff --git a/src/test/ui/useless_comment.rs b/src/test/ui/useless_comment.rs index 645514971dacd..531eec007fc48 100644 --- a/src/test/ui/useless_comment.rs +++ b/src/test/ui/useless_comment.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(unused_doc_comments)] fn foo() { diff --git a/src/test/ui/useless_comment.stderr b/src/test/ui/useless_comment.stderr index 78c6787c88e62..cc818f6ce7c39 100644 --- a/src/test/ui/useless_comment.stderr +++ b/src/test/ui/useless_comment.stderr @@ -1,29 +1,29 @@ error: doc comment not used by rustdoc - --> $DIR/useless_comment.rs:14:5 + --> $DIR/useless_comment.rs:4:5 | LL | /// a //~ ERROR doc comment not used by rustdoc | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/useless_comment.rs:11:9 + --> $DIR/useless_comment.rs:1:9 | LL | #![deny(unused_doc_comments)] | ^^^^^^^^^^^^^^^^^^^ error: doc comment not used by rustdoc - --> $DIR/useless_comment.rs:17:5 + --> $DIR/useless_comment.rs:7:5 | LL | /// b //~ doc comment not used by rustdoc | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: doc comment not used by rustdoc - --> $DIR/useless_comment.rs:19:9 + --> $DIR/useless_comment.rs:9:9 | LL | /// c //~ ERROR doc comment not used by rustdoc | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: doc comment not used by rustdoc - --> $DIR/useless_comment.rs:24:5 + --> $DIR/useless_comment.rs:14:5 | LL | /// foo //~ ERROR doc comment not used by rustdoc | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/user-defined-macro-rules.rs b/src/test/ui/user-defined-macro-rules.rs index 02e1a585fa89d..cd23f6b404b08 100644 --- a/src/test/ui/user-defined-macro-rules.rs +++ b/src/test/ui/user-defined-macro-rules.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_macros)] macro_rules! macro_rules { () => {} } //~ ERROR user-defined macros may not be named `macro_rules` diff --git a/src/test/ui/user-defined-macro-rules.stderr b/src/test/ui/user-defined-macro-rules.stderr index 3359aa4bcd720..553a37c1f613c 100644 --- a/src/test/ui/user-defined-macro-rules.stderr +++ b/src/test/ui/user-defined-macro-rules.stderr @@ -1,5 +1,5 @@ error: user-defined macros may not be named `macro_rules` - --> $DIR/user-defined-macro-rules.rs:13:1 + --> $DIR/user-defined-macro-rules.rs:3:1 | LL | macro_rules! macro_rules { () => {} } //~ ERROR user-defined macros may not be named `macro_rules` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/utf8_idents.rs b/src/test/ui/utf8_idents.rs index 8594c35f8dd1b..c9f433c3c3b3d 100644 --- a/src/test/ui/utf8_idents.rs +++ b/src/test/ui/utf8_idents.rs @@ -1,12 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // fn foo< diff --git a/src/test/ui/utf8_idents.stderr b/src/test/ui/utf8_idents.stderr index 42ee13e05117b..4279ed78d39f9 100644 --- a/src/test/ui/utf8_idents.stderr +++ b/src/test/ui/utf8_idents.stderr @@ -1,5 +1,5 @@ error[E0658]: non-ascii idents are not fully supported. (see issue #28979) - --> $DIR/utf8_idents.rs:13:5 + --> $DIR/utf8_idents.rs:4:5 | LL | 'β, //~ ERROR non-ascii idents are not fully supported | ^^ @@ -7,7 +7,7 @@ LL | 'β, //~ ERROR non-ascii idents are not fully supported = help: add #![feature(non_ascii_idents)] to the crate attributes to enable error[E0658]: non-ascii idents are not fully supported. (see issue #28979) - --> $DIR/utf8_idents.rs:14:5 + --> $DIR/utf8_idents.rs:5:5 | LL | γ //~ ERROR non-ascii idents are not fully supported | ^ @@ -15,7 +15,7 @@ LL | γ //~ ERROR non-ascii idents are not fully supported = help: add #![feature(non_ascii_idents)] to the crate attributes to enable error[E0658]: non-ascii idents are not fully supported. (see issue #28979) - --> $DIR/utf8_idents.rs:18:5 + --> $DIR/utf8_idents.rs:9:5 | LL | δ: usize //~ ERROR non-ascii idents are not fully supported | ^ @@ -23,7 +23,7 @@ LL | δ: usize //~ ERROR non-ascii idents are not fully supported = help: add #![feature(non_ascii_idents)] to the crate attributes to enable error[E0658]: non-ascii idents are not fully supported. (see issue #28979) - --> $DIR/utf8_idents.rs:22:9 + --> $DIR/utf8_idents.rs:13:9 | LL | let α = 0.00001f64; //~ ERROR non-ascii idents are not fully supported | ^ diff --git a/src/test/ui/variadic/variadic-ffi-2.rs b/src/test/ui/variadic/variadic-ffi-2.rs index a5011c3abe7a7..224ac16f4586a 100644 --- a/src/test/ui/variadic/variadic-ffi-2.rs +++ b/src/test/ui/variadic/variadic-ffi-2.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-arm stdcall isn't supported fn baz(f: extern "stdcall" fn(usize, ...)) { diff --git a/src/test/ui/variadic/variadic-ffi-2.stderr b/src/test/ui/variadic/variadic-ffi-2.stderr index 9af7b5bf753dd..cb2a9f874b7b3 100644 --- a/src/test/ui/variadic/variadic-ffi-2.stderr +++ b/src/test/ui/variadic/variadic-ffi-2.stderr @@ -1,5 +1,5 @@ error[E0045]: variadic function must have C or cdecl calling convention - --> $DIR/variadic-ffi-2.rs:13:11 + --> $DIR/variadic-ffi-2.rs:3:11 | LL | fn baz(f: extern "stdcall" fn(usize, ...)) { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ variadics require C or cdecl calling convention diff --git a/src/test/ui/variadic/variadic-ffi-3.rs b/src/test/ui/variadic/variadic-ffi-3.rs index 9807952c636e1..12b3426d9da18 100644 --- a/src/test/ui/variadic/variadic-ffi-3.rs +++ b/src/test/ui/variadic/variadic-ffi-3.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern { fn foo(f: isize, x: u8, ...); //~^ defined here diff --git a/src/test/ui/variadic/variadic-ffi-3.stderr b/src/test/ui/variadic/variadic-ffi-3.stderr index c7355405b2acb..0fecbbf36b803 100644 --- a/src/test/ui/variadic/variadic-ffi-3.stderr +++ b/src/test/ui/variadic/variadic-ffi-3.stderr @@ -1,5 +1,5 @@ error[E0060]: this function takes at least 2 parameters but 0 parameters were supplied - --> $DIR/variadic-ffi-3.rs:21:9 + --> $DIR/variadic-ffi-3.rs:11:9 | LL | fn foo(f: isize, x: u8, ...); | ----------------------------- defined here @@ -8,7 +8,7 @@ LL | foo(); //~ ERROR: this function takes at least 2 parameters but 0 p | ^^^^^ expected at least 2 parameters error[E0060]: this function takes at least 2 parameters but 1 parameter was supplied - --> $DIR/variadic-ffi-3.rs:22:9 + --> $DIR/variadic-ffi-3.rs:12:9 | LL | fn foo(f: isize, x: u8, ...); | ----------------------------- defined here @@ -17,7 +17,7 @@ LL | foo(1); //~ ERROR: this function takes at least 2 parameters but 1 | ^^^^^^ expected at least 2 parameters error[E0308]: mismatched types - --> $DIR/variadic-ffi-3.rs:24:56 + --> $DIR/variadic-ffi-3.rs:14:56 | LL | let x: unsafe extern "C" fn(f: isize, x: u8) = foo; | ^^^ expected non-variadic fn, found variadic function @@ -26,7 +26,7 @@ LL | let x: unsafe extern "C" fn(f: isize, x: u8) = foo; found type `unsafe extern "C" fn(isize, u8, ...) {foo}` error[E0308]: mismatched types - --> $DIR/variadic-ffi-3.rs:29:54 + --> $DIR/variadic-ffi-3.rs:19:54 | LL | let y: extern "C" fn(f: isize, x: u8, ...) = bar; | ^^^ expected variadic fn, found non-variadic function @@ -35,37 +35,37 @@ LL | let y: extern "C" fn(f: isize, x: u8, ...) = bar; found type `extern "C" fn(isize, u8) {bar}` error[E0617]: can't pass `f32` to variadic function - --> $DIR/variadic-ffi-3.rs:34:19 + --> $DIR/variadic-ffi-3.rs:24:19 | LL | foo(1, 2, 3f32); //~ ERROR can't pass `f32` to variadic function | ^^^^ help: cast the value to `c_double`: `3f32 as c_double` error[E0617]: can't pass `bool` to variadic function - --> $DIR/variadic-ffi-3.rs:35:19 + --> $DIR/variadic-ffi-3.rs:25:19 | LL | foo(1, 2, true); //~ ERROR can't pass `bool` to variadic function | ^^^^ help: cast the value to `c_int`: `true as c_int` error[E0617]: can't pass `i8` to variadic function - --> $DIR/variadic-ffi-3.rs:36:19 + --> $DIR/variadic-ffi-3.rs:26:19 | LL | foo(1, 2, 1i8); //~ ERROR can't pass `i8` to variadic function | ^^^ help: cast the value to `c_int`: `1i8 as c_int` error[E0617]: can't pass `u8` to variadic function - --> $DIR/variadic-ffi-3.rs:37:19 + --> $DIR/variadic-ffi-3.rs:27:19 | LL | foo(1, 2, 1u8); //~ ERROR can't pass `u8` to variadic function | ^^^ help: cast the value to `c_uint`: `1u8 as c_uint` error[E0617]: can't pass `i16` to variadic function - --> $DIR/variadic-ffi-3.rs:38:19 + --> $DIR/variadic-ffi-3.rs:28:19 | LL | foo(1, 2, 1i16); //~ ERROR can't pass `i16` to variadic function | ^^^^ help: cast the value to `c_int`: `1i16 as c_int` error[E0617]: can't pass `u16` to variadic function - --> $DIR/variadic-ffi-3.rs:39:19 + --> $DIR/variadic-ffi-3.rs:29:19 | LL | foo(1, 2, 1u16); //~ ERROR can't pass `u16` to variadic function | ^^^^ help: cast the value to `c_uint`: `1u16 as c_uint` diff --git a/src/test/ui/variadic/variadic-ffi.rs b/src/test/ui/variadic/variadic-ffi.rs index d81e61cac566d..61b2ad4bed576 100644 --- a/src/test/ui/variadic/variadic-ffi.rs +++ b/src/test/ui/variadic/variadic-ffi.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-arm stdcall isn't supported // ignore-aarch64 stdcall isn't supported diff --git a/src/test/ui/variadic/variadic-ffi.stderr b/src/test/ui/variadic/variadic-ffi.stderr index 0d0462b709d08..617b1f46ea3fc 100644 --- a/src/test/ui/variadic/variadic-ffi.stderr +++ b/src/test/ui/variadic/variadic-ffi.stderr @@ -1,5 +1,5 @@ error[E0045]: variadic function must have C or cdecl calling convention - --> $DIR/variadic-ffi.rs:15:5 + --> $DIR/variadic-ffi.rs:5:5 | LL | fn printf(_: *const u8, ...); //~ ERROR: variadic function must have C or cdecl calling | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ variadics require C or cdecl calling convention diff --git a/src/test/ui/variance/variance-associated-types.rs b/src/test/ui/variance/variance-associated-types.rs index 7dbfc6ac1257d..1165fb53c7342 100644 --- a/src/test/ui/variance/variance-associated-types.rs +++ b/src/test/ui/variance/variance-associated-types.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the variance computation considers types/regions that // appear in projections to be invariant. diff --git a/src/test/ui/variance/variance-associated-types.stderr b/src/test/ui/variance/variance-associated-types.stderr index 03ea1e625f8ca..75ebc86689819 100644 --- a/src/test/ui/variance/variance-associated-types.stderr +++ b/src/test/ui/variance/variance-associated-types.stderr @@ -1,5 +1,5 @@ error[E0208]: [-, +] - --> $DIR/variance-associated-types.rs:23:1 + --> $DIR/variance-associated-types.rs:13:1 | LL | / struct Foo<'a, T : Trait<'a>> { //~ ERROR [-, +] LL | | field: (T, &'a ()) @@ -7,7 +7,7 @@ LL | | } | |_^ error[E0208]: [o, o] - --> $DIR/variance-associated-types.rs:28:1 + --> $DIR/variance-associated-types.rs:18:1 | LL | / struct Bar<'a, T : Trait<'a>> { //~ ERROR [o, o] LL | | field: >::Type diff --git a/src/test/ui/variance/variance-btree-invariant-types.nll.stderr b/src/test/ui/variance/variance-btree-invariant-types.nll.stderr index 877036530ed19..dafa2f3bacd62 100644 --- a/src/test/ui/variance/variance-btree-invariant-types.nll.stderr +++ b/src/test/ui/variance/variance-btree-invariant-types.nll.stderr @@ -1,77 +1,77 @@ warning: not reporting region error due to nll - --> $DIR/variance-btree-invariant-types.rs:16:5 + --> $DIR/variance-btree-invariant-types.rs:6:5 | LL | v //~ ERROR mismatched types | ^ warning: not reporting region error due to nll - --> $DIR/variance-btree-invariant-types.rs:19:5 + --> $DIR/variance-btree-invariant-types.rs:9:5 | LL | v //~ ERROR mismatched types | ^ warning: not reporting region error due to nll - --> $DIR/variance-btree-invariant-types.rs:22:5 + --> $DIR/variance-btree-invariant-types.rs:12:5 | LL | v //~ ERROR mismatched types | ^ warning: not reporting region error due to nll - --> $DIR/variance-btree-invariant-types.rs:25:5 + --> $DIR/variance-btree-invariant-types.rs:15:5 | LL | v //~ ERROR mismatched types | ^ warning: not reporting region error due to nll - --> $DIR/variance-btree-invariant-types.rs:30:5 + --> $DIR/variance-btree-invariant-types.rs:20:5 | LL | v //~ ERROR mismatched types | ^ warning: not reporting region error due to nll - --> $DIR/variance-btree-invariant-types.rs:34:5 + --> $DIR/variance-btree-invariant-types.rs:24:5 | LL | v //~ ERROR mismatched types | ^ warning: not reporting region error due to nll - --> $DIR/variance-btree-invariant-types.rs:38:5 + --> $DIR/variance-btree-invariant-types.rs:28:5 | LL | v //~ ERROR mismatched types | ^ warning: not reporting region error due to nll - --> $DIR/variance-btree-invariant-types.rs:42:5 + --> $DIR/variance-btree-invariant-types.rs:32:5 | LL | v //~ ERROR mismatched types | ^ warning: not reporting region error due to nll - --> $DIR/variance-btree-invariant-types.rs:47:5 + --> $DIR/variance-btree-invariant-types.rs:37:5 | LL | v //~ ERROR mismatched types | ^ warning: not reporting region error due to nll - --> $DIR/variance-btree-invariant-types.rs:51:5 + --> $DIR/variance-btree-invariant-types.rs:41:5 | LL | v //~ ERROR mismatched types | ^ warning: not reporting region error due to nll - --> $DIR/variance-btree-invariant-types.rs:55:5 + --> $DIR/variance-btree-invariant-types.rs:45:5 | LL | v //~ ERROR mismatched types | ^ warning: not reporting region error due to nll - --> $DIR/variance-btree-invariant-types.rs:59:5 + --> $DIR/variance-btree-invariant-types.rs:49:5 | LL | v //~ ERROR mismatched types | ^ error: unsatisfied lifetime constraints - --> $DIR/variance-btree-invariant-types.rs:16:5 + --> $DIR/variance-btree-invariant-types.rs:6:5 | LL | fn iter_cov_key<'a, 'new>(v: IterMut<'a, &'static (), ()>) -> IterMut<'a, &'new (), ()> { | ---- lifetime `'new` defined here @@ -79,7 +79,7 @@ LL | v //~ ERROR mismatched types | ^ returning this value requires that `'new` must outlive `'static` error: unsatisfied lifetime constraints - --> $DIR/variance-btree-invariant-types.rs:19:5 + --> $DIR/variance-btree-invariant-types.rs:9:5 | LL | fn iter_cov_val<'a, 'new>(v: IterMut<'a, (), &'static ()>) -> IterMut<'a, (), &'new ()> { | ---- lifetime `'new` defined here @@ -87,7 +87,7 @@ LL | v //~ ERROR mismatched types | ^ returning this value requires that `'new` must outlive `'static` error: unsatisfied lifetime constraints - --> $DIR/variance-btree-invariant-types.rs:22:5 + --> $DIR/variance-btree-invariant-types.rs:12:5 | LL | fn iter_contra_key<'a, 'new>(v: IterMut<'a, &'new (), ()>) -> IterMut<'a, &'static (), ()> { | ---- lifetime `'new` defined here @@ -95,7 +95,7 @@ LL | v //~ ERROR mismatched types | ^ returning this value requires that `'new` must outlive `'static` error: unsatisfied lifetime constraints - --> $DIR/variance-btree-invariant-types.rs:25:5 + --> $DIR/variance-btree-invariant-types.rs:15:5 | LL | fn iter_contra_val<'a, 'new>(v: IterMut<'a, (), &'new ()>) -> IterMut<'a, (), &'static ()> { | ---- lifetime `'new` defined here @@ -103,7 +103,7 @@ LL | v //~ ERROR mismatched types | ^ returning this value requires that `'new` must outlive `'static` error: unsatisfied lifetime constraints - --> $DIR/variance-btree-invariant-types.rs:30:5 + --> $DIR/variance-btree-invariant-types.rs:20:5 | LL | fn occ_cov_key<'a, 'new>(v: OccupiedEntry<'a, &'static (), ()>) | ---- lifetime `'new` defined here @@ -112,7 +112,7 @@ LL | v //~ ERROR mismatched types | ^ returning this value requires that `'new` must outlive `'static` error: unsatisfied lifetime constraints - --> $DIR/variance-btree-invariant-types.rs:34:5 + --> $DIR/variance-btree-invariant-types.rs:24:5 | LL | fn occ_cov_val<'a, 'new>(v: OccupiedEntry<'a, (), &'static ()>) | ---- lifetime `'new` defined here @@ -121,7 +121,7 @@ LL | v //~ ERROR mismatched types | ^ returning this value requires that `'new` must outlive `'static` error: unsatisfied lifetime constraints - --> $DIR/variance-btree-invariant-types.rs:38:5 + --> $DIR/variance-btree-invariant-types.rs:28:5 | LL | fn occ_contra_key<'a, 'new>(v: OccupiedEntry<'a, &'new (), ()>) | ---- lifetime `'new` defined here @@ -130,7 +130,7 @@ LL | v //~ ERROR mismatched types | ^ returning this value requires that `'new` must outlive `'static` error: unsatisfied lifetime constraints - --> $DIR/variance-btree-invariant-types.rs:42:5 + --> $DIR/variance-btree-invariant-types.rs:32:5 | LL | fn occ_contra_val<'a, 'new>(v: OccupiedEntry<'a, (), &'new ()>) | ---- lifetime `'new` defined here @@ -139,7 +139,7 @@ LL | v //~ ERROR mismatched types | ^ returning this value requires that `'new` must outlive `'static` error: unsatisfied lifetime constraints - --> $DIR/variance-btree-invariant-types.rs:47:5 + --> $DIR/variance-btree-invariant-types.rs:37:5 | LL | fn vac_cov_key<'a, 'new>(v: VacantEntry<'a, &'static (), ()>) | ---- lifetime `'new` defined here @@ -148,7 +148,7 @@ LL | v //~ ERROR mismatched types | ^ returning this value requires that `'new` must outlive `'static` error: unsatisfied lifetime constraints - --> $DIR/variance-btree-invariant-types.rs:51:5 + --> $DIR/variance-btree-invariant-types.rs:41:5 | LL | fn vac_cov_val<'a, 'new>(v: VacantEntry<'a, (), &'static ()>) | ---- lifetime `'new` defined here @@ -157,7 +157,7 @@ LL | v //~ ERROR mismatched types | ^ returning this value requires that `'new` must outlive `'static` error: unsatisfied lifetime constraints - --> $DIR/variance-btree-invariant-types.rs:55:5 + --> $DIR/variance-btree-invariant-types.rs:45:5 | LL | fn vac_contra_key<'a, 'new>(v: VacantEntry<'a, &'new (), ()>) | ---- lifetime `'new` defined here @@ -166,7 +166,7 @@ LL | v //~ ERROR mismatched types | ^ returning this value requires that `'new` must outlive `'static` error: unsatisfied lifetime constraints - --> $DIR/variance-btree-invariant-types.rs:59:5 + --> $DIR/variance-btree-invariant-types.rs:49:5 | LL | fn vac_contra_val<'a, 'new>(v: VacantEntry<'a, (), &'new ()>) | ---- lifetime `'new` defined here diff --git a/src/test/ui/variance/variance-btree-invariant-types.rs b/src/test/ui/variance/variance-btree-invariant-types.rs index e9607de00a34f..e96516ec4c0ee 100644 --- a/src/test/ui/variance/variance-btree-invariant-types.rs +++ b/src/test/ui/variance/variance-btree-invariant-types.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] use std::collections::btree_map::{IterMut, OccupiedEntry, VacantEntry}; diff --git a/src/test/ui/variance/variance-btree-invariant-types.stderr b/src/test/ui/variance/variance-btree-invariant-types.stderr index 96f76fa5c2d0f..e0f3e922ebd99 100644 --- a/src/test/ui/variance/variance-btree-invariant-types.stderr +++ b/src/test/ui/variance/variance-btree-invariant-types.stderr @@ -1,178 +1,178 @@ error[E0308]: mismatched types - --> $DIR/variance-btree-invariant-types.rs:16:5 + --> $DIR/variance-btree-invariant-types.rs:6:5 | LL | v //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `std::collections::btree_map::IterMut<'_, &'new (), _>` found type `std::collections::btree_map::IterMut<'_, &'static (), _>` -note: the lifetime 'new as defined on the function body at 15:21... - --> $DIR/variance-btree-invariant-types.rs:15:21 +note: the lifetime 'new as defined on the function body at 5:21... + --> $DIR/variance-btree-invariant-types.rs:5:21 | LL | fn iter_cov_key<'a, 'new>(v: IterMut<'a, &'static (), ()>) -> IterMut<'a, &'new (), ()> { | ^^^^ = note: ...does not necessarily outlive the static lifetime error[E0308]: mismatched types - --> $DIR/variance-btree-invariant-types.rs:19:5 + --> $DIR/variance-btree-invariant-types.rs:9:5 | LL | v //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `std::collections::btree_map::IterMut<'_, _, &'new ()>` found type `std::collections::btree_map::IterMut<'_, _, &'static ()>` -note: the lifetime 'new as defined on the function body at 18:21... - --> $DIR/variance-btree-invariant-types.rs:18:21 +note: the lifetime 'new as defined on the function body at 8:21... + --> $DIR/variance-btree-invariant-types.rs:8:21 | LL | fn iter_cov_val<'a, 'new>(v: IterMut<'a, (), &'static ()>) -> IterMut<'a, (), &'new ()> { | ^^^^ = note: ...does not necessarily outlive the static lifetime error[E0308]: mismatched types - --> $DIR/variance-btree-invariant-types.rs:22:5 + --> $DIR/variance-btree-invariant-types.rs:12:5 | LL | v //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `std::collections::btree_map::IterMut<'_, &'static (), _>` found type `std::collections::btree_map::IterMut<'_, &'new (), _>` -note: the lifetime 'new as defined on the function body at 21:24... - --> $DIR/variance-btree-invariant-types.rs:21:24 +note: the lifetime 'new as defined on the function body at 11:24... + --> $DIR/variance-btree-invariant-types.rs:11:24 | LL | fn iter_contra_key<'a, 'new>(v: IterMut<'a, &'new (), ()>) -> IterMut<'a, &'static (), ()> { | ^^^^ = note: ...does not necessarily outlive the static lifetime error[E0308]: mismatched types - --> $DIR/variance-btree-invariant-types.rs:25:5 + --> $DIR/variance-btree-invariant-types.rs:15:5 | LL | v //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `std::collections::btree_map::IterMut<'_, _, &'static ()>` found type `std::collections::btree_map::IterMut<'_, _, &'new ()>` -note: the lifetime 'new as defined on the function body at 24:24... - --> $DIR/variance-btree-invariant-types.rs:24:24 +note: the lifetime 'new as defined on the function body at 14:24... + --> $DIR/variance-btree-invariant-types.rs:14:24 | LL | fn iter_contra_val<'a, 'new>(v: IterMut<'a, (), &'new ()>) -> IterMut<'a, (), &'static ()> { | ^^^^ = note: ...does not necessarily outlive the static lifetime error[E0308]: mismatched types - --> $DIR/variance-btree-invariant-types.rs:30:5 + --> $DIR/variance-btree-invariant-types.rs:20:5 | LL | v //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `std::collections::btree_map::OccupiedEntry<'_, &'new (), _>` found type `std::collections::btree_map::OccupiedEntry<'_, &'static (), _>` -note: the lifetime 'new as defined on the function body at 28:20... - --> $DIR/variance-btree-invariant-types.rs:28:20 +note: the lifetime 'new as defined on the function body at 18:20... + --> $DIR/variance-btree-invariant-types.rs:18:20 | LL | fn occ_cov_key<'a, 'new>(v: OccupiedEntry<'a, &'static (), ()>) | ^^^^ = note: ...does not necessarily outlive the static lifetime error[E0308]: mismatched types - --> $DIR/variance-btree-invariant-types.rs:34:5 + --> $DIR/variance-btree-invariant-types.rs:24:5 | LL | v //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `std::collections::btree_map::OccupiedEntry<'_, _, &'new ()>` found type `std::collections::btree_map::OccupiedEntry<'_, _, &'static ()>` -note: the lifetime 'new as defined on the function body at 32:20... - --> $DIR/variance-btree-invariant-types.rs:32:20 +note: the lifetime 'new as defined on the function body at 22:20... + --> $DIR/variance-btree-invariant-types.rs:22:20 | LL | fn occ_cov_val<'a, 'new>(v: OccupiedEntry<'a, (), &'static ()>) | ^^^^ = note: ...does not necessarily outlive the static lifetime error[E0308]: mismatched types - --> $DIR/variance-btree-invariant-types.rs:38:5 + --> $DIR/variance-btree-invariant-types.rs:28:5 | LL | v //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `std::collections::btree_map::OccupiedEntry<'_, &'static (), _>` found type `std::collections::btree_map::OccupiedEntry<'_, &'new (), _>` -note: the lifetime 'new as defined on the function body at 36:23... - --> $DIR/variance-btree-invariant-types.rs:36:23 +note: the lifetime 'new as defined on the function body at 26:23... + --> $DIR/variance-btree-invariant-types.rs:26:23 | LL | fn occ_contra_key<'a, 'new>(v: OccupiedEntry<'a, &'new (), ()>) | ^^^^ = note: ...does not necessarily outlive the static lifetime error[E0308]: mismatched types - --> $DIR/variance-btree-invariant-types.rs:42:5 + --> $DIR/variance-btree-invariant-types.rs:32:5 | LL | v //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `std::collections::btree_map::OccupiedEntry<'_, _, &'static ()>` found type `std::collections::btree_map::OccupiedEntry<'_, _, &'new ()>` -note: the lifetime 'new as defined on the function body at 40:23... - --> $DIR/variance-btree-invariant-types.rs:40:23 +note: the lifetime 'new as defined on the function body at 30:23... + --> $DIR/variance-btree-invariant-types.rs:30:23 | LL | fn occ_contra_val<'a, 'new>(v: OccupiedEntry<'a, (), &'new ()>) | ^^^^ = note: ...does not necessarily outlive the static lifetime error[E0308]: mismatched types - --> $DIR/variance-btree-invariant-types.rs:47:5 + --> $DIR/variance-btree-invariant-types.rs:37:5 | LL | v //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `std::collections::btree_map::VacantEntry<'_, &'new (), _>` found type `std::collections::btree_map::VacantEntry<'_, &'static (), _>` -note: the lifetime 'new as defined on the function body at 45:20... - --> $DIR/variance-btree-invariant-types.rs:45:20 +note: the lifetime 'new as defined on the function body at 35:20... + --> $DIR/variance-btree-invariant-types.rs:35:20 | LL | fn vac_cov_key<'a, 'new>(v: VacantEntry<'a, &'static (), ()>) | ^^^^ = note: ...does not necessarily outlive the static lifetime error[E0308]: mismatched types - --> $DIR/variance-btree-invariant-types.rs:51:5 + --> $DIR/variance-btree-invariant-types.rs:41:5 | LL | v //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `std::collections::btree_map::VacantEntry<'_, _, &'new ()>` found type `std::collections::btree_map::VacantEntry<'_, _, &'static ()>` -note: the lifetime 'new as defined on the function body at 49:20... - --> $DIR/variance-btree-invariant-types.rs:49:20 +note: the lifetime 'new as defined on the function body at 39:20... + --> $DIR/variance-btree-invariant-types.rs:39:20 | LL | fn vac_cov_val<'a, 'new>(v: VacantEntry<'a, (), &'static ()>) | ^^^^ = note: ...does not necessarily outlive the static lifetime error[E0308]: mismatched types - --> $DIR/variance-btree-invariant-types.rs:55:5 + --> $DIR/variance-btree-invariant-types.rs:45:5 | LL | v //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `std::collections::btree_map::VacantEntry<'_, &'static (), _>` found type `std::collections::btree_map::VacantEntry<'_, &'new (), _>` -note: the lifetime 'new as defined on the function body at 53:23... - --> $DIR/variance-btree-invariant-types.rs:53:23 +note: the lifetime 'new as defined on the function body at 43:23... + --> $DIR/variance-btree-invariant-types.rs:43:23 | LL | fn vac_contra_key<'a, 'new>(v: VacantEntry<'a, &'new (), ()>) | ^^^^ = note: ...does not necessarily outlive the static lifetime error[E0308]: mismatched types - --> $DIR/variance-btree-invariant-types.rs:59:5 + --> $DIR/variance-btree-invariant-types.rs:49:5 | LL | v //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `std::collections::btree_map::VacantEntry<'_, _, &'static ()>` found type `std::collections::btree_map::VacantEntry<'_, _, &'new ()>` -note: the lifetime 'new as defined on the function body at 57:23... - --> $DIR/variance-btree-invariant-types.rs:57:23 +note: the lifetime 'new as defined on the function body at 47:23... + --> $DIR/variance-btree-invariant-types.rs:47:23 | LL | fn vac_contra_val<'a, 'new>(v: VacantEntry<'a, (), &'new ()>) | ^^^^ diff --git a/src/test/ui/variance/variance-cell-is-invariant.rs b/src/test/ui/variance/variance-cell-is-invariant.rs index 39d87a563e516..986cc4ad93f32 100644 --- a/src/test/ui/variance/variance-cell-is-invariant.rs +++ b/src/test/ui/variance/variance-cell-is-invariant.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-compare-mode-nll // Test that Cell is considered invariant with respect to its diff --git a/src/test/ui/variance/variance-cell-is-invariant.stderr b/src/test/ui/variance/variance-cell-is-invariant.stderr index 8fb5d9bf38b3c..731cb6ab087bc 100644 --- a/src/test/ui/variance/variance-cell-is-invariant.stderr +++ b/src/test/ui/variance/variance-cell-is-invariant.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/variance-cell-is-invariant.rs:26:25 + --> $DIR/variance-cell-is-invariant.rs:16:25 | LL | fn use_<'short,'long>(c: Foo<'short>, | ----------- these two types are declared with different lifetimes... diff --git a/src/test/ui/variance/variance-contravariant-arg-object.nll.stderr b/src/test/ui/variance/variance-contravariant-arg-object.nll.stderr index 67d43dd507005..76f737e8891c2 100644 --- a/src/test/ui/variance/variance-contravariant-arg-object.nll.stderr +++ b/src/test/ui/variance/variance-contravariant-arg-object.nll.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/variance-contravariant-arg-object.rs:24:5 + --> $DIR/variance-contravariant-arg-object.rs:14:5 | LL | v //~ ERROR mismatched types | ^ warning: not reporting region error due to nll - --> $DIR/variance-contravariant-arg-object.rs:32:5 + --> $DIR/variance-contravariant-arg-object.rs:22:5 | LL | v //~ ERROR mismatched types | ^ error: unsatisfied lifetime constraints - --> $DIR/variance-contravariant-arg-object.rs:24:5 + --> $DIR/variance-contravariant-arg-object.rs:14:5 | LL | fn get_min_from_max<'min, 'max>(v: Box>) | ---- ---- lifetime `'max` defined here @@ -22,7 +22,7 @@ LL | v //~ ERROR mismatched types | ^ cast requires that `'min` must outlive `'max` error: unsatisfied lifetime constraints - --> $DIR/variance-contravariant-arg-object.rs:32:5 + --> $DIR/variance-contravariant-arg-object.rs:22:5 | LL | fn get_max_from_min<'min, 'max, G>(v: Box>) | ---- ---- lifetime `'max` defined here diff --git a/src/test/ui/variance/variance-contravariant-arg-object.rs b/src/test/ui/variance/variance-contravariant-arg-object.rs index 1795ac95358d7..27e5675dcde87 100644 --- a/src/test/ui/variance/variance-contravariant-arg-object.rs +++ b/src/test/ui/variance/variance-contravariant-arg-object.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] // Test that even when `T` is only used in contravariant position, it diff --git a/src/test/ui/variance/variance-contravariant-arg-object.stderr b/src/test/ui/variance/variance-contravariant-arg-object.stderr index aeed03733f38a..79681c776736d 100644 --- a/src/test/ui/variance/variance-contravariant-arg-object.stderr +++ b/src/test/ui/variance/variance-contravariant-arg-object.stderr @@ -1,37 +1,37 @@ error[E0308]: mismatched types - --> $DIR/variance-contravariant-arg-object.rs:24:5 + --> $DIR/variance-contravariant-arg-object.rs:14:5 | LL | v //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `dyn Get<&'min i32>` found type `dyn Get<&'max i32>` -note: the lifetime 'min as defined on the function body at 20:21... - --> $DIR/variance-contravariant-arg-object.rs:20:21 +note: the lifetime 'min as defined on the function body at 10:21... + --> $DIR/variance-contravariant-arg-object.rs:10:21 | LL | fn get_min_from_max<'min, 'max>(v: Box>) | ^^^^ -note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 20:27 - --> $DIR/variance-contravariant-arg-object.rs:20:27 +note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 10:27 + --> $DIR/variance-contravariant-arg-object.rs:10:27 | LL | fn get_min_from_max<'min, 'max>(v: Box>) | ^^^^ error[E0308]: mismatched types - --> $DIR/variance-contravariant-arg-object.rs:32:5 + --> $DIR/variance-contravariant-arg-object.rs:22:5 | LL | v //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `dyn Get<&'max i32>` found type `dyn Get<&'min i32>` -note: the lifetime 'min as defined on the function body at 27:21... - --> $DIR/variance-contravariant-arg-object.rs:27:21 +note: the lifetime 'min as defined on the function body at 17:21... + --> $DIR/variance-contravariant-arg-object.rs:17:21 | LL | fn get_max_from_min<'min, 'max, G>(v: Box>) | ^^^^ -note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 27:27 - --> $DIR/variance-contravariant-arg-object.rs:27:27 +note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 17:27 + --> $DIR/variance-contravariant-arg-object.rs:17:27 | LL | fn get_max_from_min<'min, 'max, G>(v: Box>) | ^^^^ diff --git a/src/test/ui/variance/variance-contravariant-arg-trait-match.rs b/src/test/ui/variance/variance-contravariant-arg-trait-match.rs index 96791304d93d3..c38124a62bddb 100644 --- a/src/test/ui/variance/variance-contravariant-arg-trait-match.rs +++ b/src/test/ui/variance/variance-contravariant-arg-trait-match.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-compare-mode-nll #![allow(dead_code)] diff --git a/src/test/ui/variance/variance-contravariant-arg-trait-match.stderr b/src/test/ui/variance/variance-contravariant-arg-trait-match.stderr index 282220d1037f5..8569c1c482e3f 100644 --- a/src/test/ui/variance/variance-contravariant-arg-trait-match.stderr +++ b/src/test/ui/variance/variance-contravariant-arg-trait-match.stderr @@ -1,37 +1,37 @@ error[E0308]: mismatched types - --> $DIR/variance-contravariant-arg-trait-match.rs:25:5 + --> $DIR/variance-contravariant-arg-trait-match.rs:15:5 | LL | impls_get::() //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^^^^^^^^ lifetime mismatch | = note: expected type `Get<&'min i32>` found type `Get<&'max i32>` -note: the lifetime 'min as defined on the function body at 22:21... - --> $DIR/variance-contravariant-arg-trait-match.rs:22:21 +note: the lifetime 'min as defined on the function body at 12:21... + --> $DIR/variance-contravariant-arg-trait-match.rs:12:21 | LL | fn get_min_from_max<'min, 'max, G>() | ^^^^ -note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 22:27 - --> $DIR/variance-contravariant-arg-trait-match.rs:22:27 +note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 12:27 + --> $DIR/variance-contravariant-arg-trait-match.rs:12:27 | LL | fn get_min_from_max<'min, 'max, G>() | ^^^^ error[E0308]: mismatched types - --> $DIR/variance-contravariant-arg-trait-match.rs:33:5 + --> $DIR/variance-contravariant-arg-trait-match.rs:23:5 | LL | impls_get::() //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^^^^^^^^ lifetime mismatch | = note: expected type `Get<&'max i32>` found type `Get<&'min i32>` -note: the lifetime 'min as defined on the function body at 28:21... - --> $DIR/variance-contravariant-arg-trait-match.rs:28:21 +note: the lifetime 'min as defined on the function body at 18:21... + --> $DIR/variance-contravariant-arg-trait-match.rs:18:21 | LL | fn get_max_from_min<'min, 'max, G>() | ^^^^ -note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 28:27 - --> $DIR/variance-contravariant-arg-trait-match.rs:28:27 +note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 18:27 + --> $DIR/variance-contravariant-arg-trait-match.rs:18:27 | LL | fn get_max_from_min<'min, 'max, G>() | ^^^^ diff --git a/src/test/ui/variance/variance-contravariant-self-trait-match.rs b/src/test/ui/variance/variance-contravariant-self-trait-match.rs index c04ba8862c317..1a40e3d74ed14 100644 --- a/src/test/ui/variance/variance-contravariant-self-trait-match.rs +++ b/src/test/ui/variance/variance-contravariant-self-trait-match.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-compare-mode-nll #![allow(dead_code)] diff --git a/src/test/ui/variance/variance-contravariant-self-trait-match.stderr b/src/test/ui/variance/variance-contravariant-self-trait-match.stderr index 9e60a70bc16b2..0b5739e0319ac 100644 --- a/src/test/ui/variance/variance-contravariant-self-trait-match.stderr +++ b/src/test/ui/variance/variance-contravariant-self-trait-match.stderr @@ -1,37 +1,37 @@ error[E0308]: mismatched types - --> $DIR/variance-contravariant-self-trait-match.rs:25:5 + --> $DIR/variance-contravariant-self-trait-match.rs:15:5 | LL | impls_get::<&'min G>(); //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^^^^ lifetime mismatch | = note: expected type `Get` found type `Get` -note: the lifetime 'min as defined on the function body at 22:21... - --> $DIR/variance-contravariant-self-trait-match.rs:22:21 +note: the lifetime 'min as defined on the function body at 12:21... + --> $DIR/variance-contravariant-self-trait-match.rs:12:21 | LL | fn get_min_from_max<'min, 'max, G>() | ^^^^ -note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 22:27 - --> $DIR/variance-contravariant-self-trait-match.rs:22:27 +note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 12:27 + --> $DIR/variance-contravariant-self-trait-match.rs:12:27 | LL | fn get_min_from_max<'min, 'max, G>() | ^^^^ error[E0308]: mismatched types - --> $DIR/variance-contravariant-self-trait-match.rs:34:5 + --> $DIR/variance-contravariant-self-trait-match.rs:24:5 | LL | impls_get::<&'max G>(); //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^^^^ lifetime mismatch | = note: expected type `Get` found type `Get` -note: the lifetime 'min as defined on the function body at 28:21... - --> $DIR/variance-contravariant-self-trait-match.rs:28:21 +note: the lifetime 'min as defined on the function body at 18:21... + --> $DIR/variance-contravariant-self-trait-match.rs:18:21 | LL | fn get_max_from_min<'min, 'max, G>() | ^^^^ -note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 28:27 - --> $DIR/variance-contravariant-self-trait-match.rs:28:27 +note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 18:27 + --> $DIR/variance-contravariant-self-trait-match.rs:18:27 | LL | fn get_max_from_min<'min, 'max, G>() | ^^^^ diff --git a/src/test/ui/variance/variance-covariant-arg-object.nll.stderr b/src/test/ui/variance/variance-covariant-arg-object.nll.stderr index 55413e57a9493..d74ed0060cbb5 100644 --- a/src/test/ui/variance/variance-covariant-arg-object.nll.stderr +++ b/src/test/ui/variance/variance-covariant-arg-object.nll.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/variance-covariant-arg-object.rs:25:5 + --> $DIR/variance-covariant-arg-object.rs:15:5 | LL | v //~ ERROR mismatched types | ^ warning: not reporting region error due to nll - --> $DIR/variance-covariant-arg-object.rs:32:5 + --> $DIR/variance-covariant-arg-object.rs:22:5 | LL | v //~ ERROR mismatched types | ^ error: unsatisfied lifetime constraints - --> $DIR/variance-covariant-arg-object.rs:25:5 + --> $DIR/variance-covariant-arg-object.rs:15:5 | LL | fn get_min_from_max<'min, 'max>(v: Box>) | ---- ---- lifetime `'max` defined here @@ -22,7 +22,7 @@ LL | v //~ ERROR mismatched types | ^ cast requires that `'min` must outlive `'max` error: unsatisfied lifetime constraints - --> $DIR/variance-covariant-arg-object.rs:32:5 + --> $DIR/variance-covariant-arg-object.rs:22:5 | LL | fn get_max_from_min<'min, 'max, G>(v: Box>) | ---- ---- lifetime `'max` defined here diff --git a/src/test/ui/variance/variance-covariant-arg-object.rs b/src/test/ui/variance/variance-covariant-arg-object.rs index ad059a467f570..4b371841654f2 100644 --- a/src/test/ui/variance/variance-covariant-arg-object.rs +++ b/src/test/ui/variance/variance-covariant-arg-object.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] // Test that even when `T` is only used in covariant position, it diff --git a/src/test/ui/variance/variance-covariant-arg-object.stderr b/src/test/ui/variance/variance-covariant-arg-object.stderr index 074ef6584190a..afdcccd21192c 100644 --- a/src/test/ui/variance/variance-covariant-arg-object.stderr +++ b/src/test/ui/variance/variance-covariant-arg-object.stderr @@ -1,37 +1,37 @@ error[E0308]: mismatched types - --> $DIR/variance-covariant-arg-object.rs:25:5 + --> $DIR/variance-covariant-arg-object.rs:15:5 | LL | v //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `dyn Get<&'min i32>` found type `dyn Get<&'max i32>` -note: the lifetime 'min as defined on the function body at 20:21... - --> $DIR/variance-covariant-arg-object.rs:20:21 +note: the lifetime 'min as defined on the function body at 10:21... + --> $DIR/variance-covariant-arg-object.rs:10:21 | LL | fn get_min_from_max<'min, 'max>(v: Box>) | ^^^^ -note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 20:27 - --> $DIR/variance-covariant-arg-object.rs:20:27 +note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 10:27 + --> $DIR/variance-covariant-arg-object.rs:10:27 | LL | fn get_min_from_max<'min, 'max>(v: Box>) | ^^^^ error[E0308]: mismatched types - --> $DIR/variance-covariant-arg-object.rs:32:5 + --> $DIR/variance-covariant-arg-object.rs:22:5 | LL | v //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `dyn Get<&'max i32>` found type `dyn Get<&'min i32>` -note: the lifetime 'min as defined on the function body at 28:21... - --> $DIR/variance-covariant-arg-object.rs:28:21 +note: the lifetime 'min as defined on the function body at 18:21... + --> $DIR/variance-covariant-arg-object.rs:18:21 | LL | fn get_max_from_min<'min, 'max, G>(v: Box>) | ^^^^ -note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 28:27 - --> $DIR/variance-covariant-arg-object.rs:28:27 +note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 18:27 + --> $DIR/variance-covariant-arg-object.rs:18:27 | LL | fn get_max_from_min<'min, 'max, G>(v: Box>) | ^^^^ diff --git a/src/test/ui/variance/variance-covariant-arg-trait-match.rs b/src/test/ui/variance/variance-covariant-arg-trait-match.rs index fbda62f34fa16..23de44068285f 100644 --- a/src/test/ui/variance/variance-covariant-arg-trait-match.rs +++ b/src/test/ui/variance/variance-covariant-arg-trait-match.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-compare-mode-nll #![allow(dead_code)] diff --git a/src/test/ui/variance/variance-covariant-arg-trait-match.stderr b/src/test/ui/variance/variance-covariant-arg-trait-match.stderr index 648acc2119f1b..614189d0aa051 100644 --- a/src/test/ui/variance/variance-covariant-arg-trait-match.stderr +++ b/src/test/ui/variance/variance-covariant-arg-trait-match.stderr @@ -1,37 +1,37 @@ error[E0308]: mismatched types - --> $DIR/variance-covariant-arg-trait-match.rs:26:5 + --> $DIR/variance-covariant-arg-trait-match.rs:16:5 | LL | impls_get::() //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^^^^^^^^ lifetime mismatch | = note: expected type `Get<&'min i32>` found type `Get<&'max i32>` -note: the lifetime 'min as defined on the function body at 22:21... - --> $DIR/variance-covariant-arg-trait-match.rs:22:21 +note: the lifetime 'min as defined on the function body at 12:21... + --> $DIR/variance-covariant-arg-trait-match.rs:12:21 | LL | fn get_min_from_max<'min, 'max, G>() | ^^^^ -note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 22:27 - --> $DIR/variance-covariant-arg-trait-match.rs:22:27 +note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 12:27 + --> $DIR/variance-covariant-arg-trait-match.rs:12:27 | LL | fn get_min_from_max<'min, 'max, G>() | ^^^^ error[E0308]: mismatched types - --> $DIR/variance-covariant-arg-trait-match.rs:32:5 + --> $DIR/variance-covariant-arg-trait-match.rs:22:5 | LL | impls_get::() //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^^^^^^^^ lifetime mismatch | = note: expected type `Get<&'max i32>` found type `Get<&'min i32>` -note: the lifetime 'min as defined on the function body at 29:21... - --> $DIR/variance-covariant-arg-trait-match.rs:29:21 +note: the lifetime 'min as defined on the function body at 19:21... + --> $DIR/variance-covariant-arg-trait-match.rs:19:21 | LL | fn get_max_from_min<'min, 'max, G>() | ^^^^ -note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 29:27 - --> $DIR/variance-covariant-arg-trait-match.rs:29:27 +note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 19:27 + --> $DIR/variance-covariant-arg-trait-match.rs:19:27 | LL | fn get_max_from_min<'min, 'max, G>() | ^^^^ diff --git a/src/test/ui/variance/variance-covariant-self-trait-match.rs b/src/test/ui/variance/variance-covariant-self-trait-match.rs index 3e0c1da3bca7c..abac70ea2bb7f 100644 --- a/src/test/ui/variance/variance-covariant-self-trait-match.rs +++ b/src/test/ui/variance/variance-covariant-self-trait-match.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-compare-mode-nll #![allow(dead_code)] diff --git a/src/test/ui/variance/variance-covariant-self-trait-match.stderr b/src/test/ui/variance/variance-covariant-self-trait-match.stderr index cb8fe0b7890e4..65be381452096 100644 --- a/src/test/ui/variance/variance-covariant-self-trait-match.stderr +++ b/src/test/ui/variance/variance-covariant-self-trait-match.stderr @@ -1,37 +1,37 @@ error[E0308]: mismatched types - --> $DIR/variance-covariant-self-trait-match.rs:26:5 + --> $DIR/variance-covariant-self-trait-match.rs:16:5 | LL | impls_get::<&'min G>(); //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^^^^ lifetime mismatch | = note: expected type `Get` found type `Get` -note: the lifetime 'min as defined on the function body at 22:21... - --> $DIR/variance-covariant-self-trait-match.rs:22:21 +note: the lifetime 'min as defined on the function body at 12:21... + --> $DIR/variance-covariant-self-trait-match.rs:12:21 | LL | fn get_min_from_max<'min, 'max, G>() | ^^^^ -note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 22:27 - --> $DIR/variance-covariant-self-trait-match.rs:22:27 +note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 12:27 + --> $DIR/variance-covariant-self-trait-match.rs:12:27 | LL | fn get_min_from_max<'min, 'max, G>() | ^^^^ error[E0308]: mismatched types - --> $DIR/variance-covariant-self-trait-match.rs:32:5 + --> $DIR/variance-covariant-self-trait-match.rs:22:5 | LL | impls_get::<&'max G>(); //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^^^^ lifetime mismatch | = note: expected type `Get` found type `Get` -note: the lifetime 'min as defined on the function body at 29:21... - --> $DIR/variance-covariant-self-trait-match.rs:29:21 +note: the lifetime 'min as defined on the function body at 19:21... + --> $DIR/variance-covariant-self-trait-match.rs:19:21 | LL | fn get_max_from_min<'min, 'max, G>() | ^^^^ -note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 29:27 - --> $DIR/variance-covariant-self-trait-match.rs:29:27 +note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 19:27 + --> $DIR/variance-covariant-self-trait-match.rs:19:27 | LL | fn get_max_from_min<'min, 'max, G>() | ^^^^ diff --git a/src/test/ui/variance/variance-invariant-arg-object.nll.stderr b/src/test/ui/variance/variance-invariant-arg-object.nll.stderr index f90975192460b..c87acbb297ab0 100644 --- a/src/test/ui/variance/variance-invariant-arg-object.nll.stderr +++ b/src/test/ui/variance/variance-invariant-arg-object.nll.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/variance-invariant-arg-object.rs:21:5 + --> $DIR/variance-invariant-arg-object.rs:11:5 | LL | v //~ ERROR mismatched types | ^ warning: not reporting region error due to nll - --> $DIR/variance-invariant-arg-object.rs:28:5 + --> $DIR/variance-invariant-arg-object.rs:18:5 | LL | v //~ ERROR mismatched types | ^ error: unsatisfied lifetime constraints - --> $DIR/variance-invariant-arg-object.rs:21:5 + --> $DIR/variance-invariant-arg-object.rs:11:5 | LL | fn get_min_from_max<'min, 'max>(v: Box>) | ---- ---- lifetime `'max` defined here @@ -22,7 +22,7 @@ LL | v //~ ERROR mismatched types | ^ cast requires that `'min` must outlive `'max` error: unsatisfied lifetime constraints - --> $DIR/variance-invariant-arg-object.rs:28:5 + --> $DIR/variance-invariant-arg-object.rs:18:5 | LL | fn get_max_from_min<'min, 'max, G>(v: Box>) | ---- ---- lifetime `'max` defined here diff --git a/src/test/ui/variance/variance-invariant-arg-object.rs b/src/test/ui/variance/variance-invariant-arg-object.rs index 9edb510b826a1..91f5982e5339f 100644 --- a/src/test/ui/variance/variance-invariant-arg-object.rs +++ b/src/test/ui/variance/variance-invariant-arg-object.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] trait Get : 'static { diff --git a/src/test/ui/variance/variance-invariant-arg-object.stderr b/src/test/ui/variance/variance-invariant-arg-object.stderr index 3283ae67e5143..b0dddd6ed4978 100644 --- a/src/test/ui/variance/variance-invariant-arg-object.stderr +++ b/src/test/ui/variance/variance-invariant-arg-object.stderr @@ -1,37 +1,37 @@ error[E0308]: mismatched types - --> $DIR/variance-invariant-arg-object.rs:21:5 + --> $DIR/variance-invariant-arg-object.rs:11:5 | LL | v //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `dyn Get<&'min i32>` found type `dyn Get<&'max i32>` -note: the lifetime 'min as defined on the function body at 17:21... - --> $DIR/variance-invariant-arg-object.rs:17:21 +note: the lifetime 'min as defined on the function body at 7:21... + --> $DIR/variance-invariant-arg-object.rs:7:21 | LL | fn get_min_from_max<'min, 'max>(v: Box>) | ^^^^ -note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 17:27 - --> $DIR/variance-invariant-arg-object.rs:17:27 +note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 7:27 + --> $DIR/variance-invariant-arg-object.rs:7:27 | LL | fn get_min_from_max<'min, 'max>(v: Box>) | ^^^^ error[E0308]: mismatched types - --> $DIR/variance-invariant-arg-object.rs:28:5 + --> $DIR/variance-invariant-arg-object.rs:18:5 | LL | v //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `dyn Get<&'max i32>` found type `dyn Get<&'min i32>` -note: the lifetime 'min as defined on the function body at 24:21... - --> $DIR/variance-invariant-arg-object.rs:24:21 +note: the lifetime 'min as defined on the function body at 14:21... + --> $DIR/variance-invariant-arg-object.rs:14:21 | LL | fn get_max_from_min<'min, 'max, G>(v: Box>) | ^^^^ -note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 24:27 - --> $DIR/variance-invariant-arg-object.rs:24:27 +note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 14:27 + --> $DIR/variance-invariant-arg-object.rs:14:27 | LL | fn get_max_from_min<'min, 'max, G>(v: Box>) | ^^^^ diff --git a/src/test/ui/variance/variance-invariant-arg-trait-match.rs b/src/test/ui/variance/variance-invariant-arg-trait-match.rs index 771fcdeb62f6d..9fbfc4f192350 100644 --- a/src/test/ui/variance/variance-invariant-arg-trait-match.rs +++ b/src/test/ui/variance/variance-invariant-arg-trait-match.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-compare-mode-nll #![allow(dead_code)] diff --git a/src/test/ui/variance/variance-invariant-arg-trait-match.stderr b/src/test/ui/variance/variance-invariant-arg-trait-match.stderr index 3f63549506962..0fe8f3152c44c 100644 --- a/src/test/ui/variance/variance-invariant-arg-trait-match.stderr +++ b/src/test/ui/variance/variance-invariant-arg-trait-match.stderr @@ -1,37 +1,37 @@ error[E0308]: mismatched types - --> $DIR/variance-invariant-arg-trait-match.rs:22:5 + --> $DIR/variance-invariant-arg-trait-match.rs:12:5 | LL | impls_get::() //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^^^^^^^^ lifetime mismatch | = note: expected type `Get<&'min i32>` found type `Get<&'max i32>` -note: the lifetime 'min as defined on the function body at 19:21... - --> $DIR/variance-invariant-arg-trait-match.rs:19:21 +note: the lifetime 'min as defined on the function body at 9:21... + --> $DIR/variance-invariant-arg-trait-match.rs:9:21 | LL | fn get_min_from_max<'min, 'max, G>() | ^^^^ -note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 19:27 - --> $DIR/variance-invariant-arg-trait-match.rs:19:27 +note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 9:27 + --> $DIR/variance-invariant-arg-trait-match.rs:9:27 | LL | fn get_min_from_max<'min, 'max, G>() | ^^^^ error[E0308]: mismatched types - --> $DIR/variance-invariant-arg-trait-match.rs:28:5 + --> $DIR/variance-invariant-arg-trait-match.rs:18:5 | LL | impls_get::() //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^^^^^^^^ lifetime mismatch | = note: expected type `Get<&'max i32>` found type `Get<&'min i32>` -note: the lifetime 'min as defined on the function body at 25:21... - --> $DIR/variance-invariant-arg-trait-match.rs:25:21 +note: the lifetime 'min as defined on the function body at 15:21... + --> $DIR/variance-invariant-arg-trait-match.rs:15:21 | LL | fn get_max_from_min<'min, 'max, G>() | ^^^^ -note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 25:27 - --> $DIR/variance-invariant-arg-trait-match.rs:25:27 +note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 15:27 + --> $DIR/variance-invariant-arg-trait-match.rs:15:27 | LL | fn get_max_from_min<'min, 'max, G>() | ^^^^ diff --git a/src/test/ui/variance/variance-invariant-self-trait-match.rs b/src/test/ui/variance/variance-invariant-self-trait-match.rs index 57abf6f897931..3c6786a3efa2d 100644 --- a/src/test/ui/variance/variance-invariant-self-trait-match.rs +++ b/src/test/ui/variance/variance-invariant-self-trait-match.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-compare-mode-nll #![allow(dead_code)] diff --git a/src/test/ui/variance/variance-invariant-self-trait-match.stderr b/src/test/ui/variance/variance-invariant-self-trait-match.stderr index 1b864abc4f02f..5fe41ca34cbff 100644 --- a/src/test/ui/variance/variance-invariant-self-trait-match.stderr +++ b/src/test/ui/variance/variance-invariant-self-trait-match.stderr @@ -1,37 +1,37 @@ error[E0308]: mismatched types - --> $DIR/variance-invariant-self-trait-match.rs:22:5 + --> $DIR/variance-invariant-self-trait-match.rs:12:5 | LL | impls_get::<&'min G>(); //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^^^^ lifetime mismatch | = note: expected type `Get` found type `Get` -note: the lifetime 'min as defined on the function body at 19:21... - --> $DIR/variance-invariant-self-trait-match.rs:19:21 +note: the lifetime 'min as defined on the function body at 9:21... + --> $DIR/variance-invariant-self-trait-match.rs:9:21 | LL | fn get_min_from_max<'min, 'max, G>() | ^^^^ -note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 19:27 - --> $DIR/variance-invariant-self-trait-match.rs:19:27 +note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 9:27 + --> $DIR/variance-invariant-self-trait-match.rs:9:27 | LL | fn get_min_from_max<'min, 'max, G>() | ^^^^ error[E0308]: mismatched types - --> $DIR/variance-invariant-self-trait-match.rs:28:5 + --> $DIR/variance-invariant-self-trait-match.rs:18:5 | LL | impls_get::<&'max G>(); //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^^^^ lifetime mismatch | = note: expected type `Get` found type `Get` -note: the lifetime 'min as defined on the function body at 25:21... - --> $DIR/variance-invariant-self-trait-match.rs:25:21 +note: the lifetime 'min as defined on the function body at 15:21... + --> $DIR/variance-invariant-self-trait-match.rs:15:21 | LL | fn get_max_from_min<'min, 'max, G>() | ^^^^ -note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 25:27 - --> $DIR/variance-invariant-self-trait-match.rs:25:27 +note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 15:27 + --> $DIR/variance-invariant-self-trait-match.rs:15:27 | LL | fn get_max_from_min<'min, 'max, G>() | ^^^^ diff --git a/src/test/ui/variance/variance-issue-20533.nll.stderr b/src/test/ui/variance/variance-issue-20533.nll.stderr index f9e2ae89a9daf..469adaf6f0eed 100644 --- a/src/test/ui/variance/variance-issue-20533.nll.stderr +++ b/src/test/ui/variance/variance-issue-20533.nll.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `a` because it is borrowed - --> $DIR/variance-issue-20533.rs:38:14 + --> $DIR/variance-issue-20533.rs:28:14 | LL | let x = foo(&a); | -- borrow of `a` occurs here @@ -9,7 +9,7 @@ LL | drop(x); | - borrow later used here error[E0505]: cannot move out of `a` because it is borrowed - --> $DIR/variance-issue-20533.rs:44:14 + --> $DIR/variance-issue-20533.rs:34:14 | LL | let x = bar(&a); | -- borrow of `a` occurs here @@ -19,7 +19,7 @@ LL | drop(x); | - borrow later used here error[E0505]: cannot move out of `a` because it is borrowed - --> $DIR/variance-issue-20533.rs:50:14 + --> $DIR/variance-issue-20533.rs:40:14 | LL | let x = baz(&a); | -- borrow of `a` occurs here diff --git a/src/test/ui/variance/variance-issue-20533.rs b/src/test/ui/variance/variance-issue-20533.rs index 60690012485e2..a2459f8730c52 100644 --- a/src/test/ui/variance/variance-issue-20533.rs +++ b/src/test/ui/variance/variance-issue-20533.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #20533. At some point, only 1 out of the // 3 errors below were being reported. diff --git a/src/test/ui/variance/variance-issue-20533.stderr b/src/test/ui/variance/variance-issue-20533.stderr index 680dea2447f74..27aca3401f92e 100644 --- a/src/test/ui/variance/variance-issue-20533.stderr +++ b/src/test/ui/variance/variance-issue-20533.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `a` because it is borrowed - --> $DIR/variance-issue-20533.rs:38:14 + --> $DIR/variance-issue-20533.rs:28:14 | LL | let x = foo(&a); | - borrow of `a` occurs here @@ -7,7 +7,7 @@ LL | drop(a); //~ ERROR cannot move out of `a` | ^ move out of `a` occurs here error[E0505]: cannot move out of `a` because it is borrowed - --> $DIR/variance-issue-20533.rs:44:14 + --> $DIR/variance-issue-20533.rs:34:14 | LL | let x = bar(&a); | - borrow of `a` occurs here @@ -15,7 +15,7 @@ LL | drop(a); //~ ERROR cannot move out of `a` | ^ move out of `a` occurs here error[E0505]: cannot move out of `a` because it is borrowed - --> $DIR/variance-issue-20533.rs:50:14 + --> $DIR/variance-issue-20533.rs:40:14 | LL | let x = baz(&a); | - borrow of `a` occurs here diff --git a/src/test/ui/variance/variance-object-types.rs b/src/test/ui/variance/variance-object-types.rs index 1f54771e3676a..12af7ae8c5b8a 100644 --- a/src/test/ui/variance/variance-object-types.rs +++ b/src/test/ui/variance/variance-object-types.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that Cell is considered invariant with respect to its // type. diff --git a/src/test/ui/variance/variance-object-types.stderr b/src/test/ui/variance/variance-object-types.stderr index 9a1c9965de3cf..3ba86c2620e02 100644 --- a/src/test/ui/variance/variance-object-types.stderr +++ b/src/test/ui/variance/variance-object-types.stderr @@ -1,5 +1,5 @@ error[E0208]: [o] - --> $DIR/variance-object-types.rs:21:1 + --> $DIR/variance-object-types.rs:11:1 | LL | / struct Foo<'a> { //~ ERROR [o] LL | | x: Box &'a i32 + 'static> diff --git a/src/test/ui/variance/variance-regions-direct.rs b/src/test/ui/variance/variance-regions-direct.rs index cd047cc580f87..3f34e7655f3a5 100644 --- a/src/test/ui/variance/variance-regions-direct.rs +++ b/src/test/ui/variance/variance-regions-direct.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we correctly infer variance for region parameters in // various self-contained types. diff --git a/src/test/ui/variance/variance-regions-direct.stderr b/src/test/ui/variance/variance-regions-direct.stderr index 81cb929c63b02..82dc8df372689 100644 --- a/src/test/ui/variance/variance-regions-direct.stderr +++ b/src/test/ui/variance/variance-regions-direct.stderr @@ -1,5 +1,5 @@ error[E0208]: [-, -, -] - --> $DIR/variance-regions-direct.rs:19:1 + --> $DIR/variance-regions-direct.rs:9:1 | LL | / struct Test2<'a, 'b, 'c> { //~ ERROR [-, -, -] LL | | x: &'a isize, @@ -9,7 +9,7 @@ LL | | } | |_^ error[E0208]: [+, +, +] - --> $DIR/variance-regions-direct.rs:28:1 + --> $DIR/variance-regions-direct.rs:18:1 | LL | / struct Test3<'a, 'b, 'c> { //~ ERROR [+, +, +] LL | | x: extern "Rust" fn(&'a isize), @@ -19,7 +19,7 @@ LL | | } | |_^ error[E0208]: [-, o] - --> $DIR/variance-regions-direct.rs:37:1 + --> $DIR/variance-regions-direct.rs:27:1 | LL | / struct Test4<'a, 'b:'a> { //~ ERROR [-, o] LL | | x: &'a mut &'b isize, @@ -27,7 +27,7 @@ LL | | } | |_^ error[E0208]: [+, o] - --> $DIR/variance-regions-direct.rs:45:1 + --> $DIR/variance-regions-direct.rs:35:1 | LL | / struct Test5<'a, 'b:'a> { //~ ERROR [+, o] LL | | x: extern "Rust" fn(&'a mut &'b isize), @@ -35,7 +35,7 @@ LL | | } | |_^ error[E0208]: [-, o] - --> $DIR/variance-regions-direct.rs:55:1 + --> $DIR/variance-regions-direct.rs:45:1 | LL | / struct Test6<'a, 'b:'a> { //~ ERROR [-, o] LL | | x: &'a mut extern "Rust" fn(&'b isize), @@ -43,7 +43,7 @@ LL | | } | |_^ error[E0208]: [*] - --> $DIR/variance-regions-direct.rs:62:1 + --> $DIR/variance-regions-direct.rs:52:1 | LL | / struct Test7<'a> { //~ ERROR [*] LL | | x: isize @@ -51,7 +51,7 @@ LL | | } | |_^ error[E0208]: [+, -, o] - --> $DIR/variance-regions-direct.rs:69:1 + --> $DIR/variance-regions-direct.rs:59:1 | LL | / enum Test8<'a, 'b, 'c:'b> { //~ ERROR [+, -, o] LL | | Test8A(extern "Rust" fn(&'a isize)), diff --git a/src/test/ui/variance/variance-regions-indirect.rs b/src/test/ui/variance/variance-regions-indirect.rs index 60d4d73fe88b8..f84f25ada14de 100644 --- a/src/test/ui/variance/variance-regions-indirect.rs +++ b/src/test/ui/variance/variance-regions-indirect.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we correctly infer variance for region parameters in // case that involve multiple intricate types. // Try enums too. diff --git a/src/test/ui/variance/variance-regions-indirect.stderr b/src/test/ui/variance/variance-regions-indirect.stderr index edf39537ff6e0..401fa2f3baa3a 100644 --- a/src/test/ui/variance/variance-regions-indirect.stderr +++ b/src/test/ui/variance/variance-regions-indirect.stderr @@ -1,5 +1,5 @@ error[E0208]: [+, -, o, *] - --> $DIR/variance-regions-indirect.rs:18:1 + --> $DIR/variance-regions-indirect.rs:8:1 | LL | / enum Base<'a, 'b, 'c:'b, 'd> { //~ ERROR [+, -, o, *] LL | | Test8A(extern "Rust" fn(&'a isize)), @@ -9,7 +9,7 @@ LL | | } | |_^ error[E0208]: [*, o, -, +] - --> $DIR/variance-regions-indirect.rs:25:1 + --> $DIR/variance-regions-indirect.rs:15:1 | LL | / struct Derived1<'w, 'x:'y, 'y, 'z> { //~ ERROR [*, o, -, +] LL | | f: Base<'z, 'y, 'x, 'w> @@ -17,7 +17,7 @@ LL | | } | |_^ error[E0208]: [o, o, *] - --> $DIR/variance-regions-indirect.rs:30:1 + --> $DIR/variance-regions-indirect.rs:20:1 | LL | / struct Derived2<'a, 'b:'a, 'c> { //~ ERROR [o, o, *] LL | | f: Base<'a, 'a, 'b, 'c> @@ -25,7 +25,7 @@ LL | | } | |_^ error[E0208]: [o, -, *] - --> $DIR/variance-regions-indirect.rs:35:1 + --> $DIR/variance-regions-indirect.rs:25:1 | LL | / struct Derived3<'a:'b, 'b, 'c> { //~ ERROR [o, -, *] LL | | f: Base<'a, 'b, 'a, 'c> @@ -33,7 +33,7 @@ LL | | } | |_^ error[E0208]: [+, -, o] - --> $DIR/variance-regions-indirect.rs:40:1 + --> $DIR/variance-regions-indirect.rs:30:1 | LL | / struct Derived4<'a, 'b, 'c:'b> { //~ ERROR [+, -, o] LL | | f: Base<'a, 'b, 'c, 'a> diff --git a/src/test/ui/variance/variance-regions-unused-direct.rs b/src/test/ui/variance/variance-regions-unused-direct.rs index 037fff72c8022..2afe012bdf22b 100644 --- a/src/test/ui/variance/variance-regions-unused-direct.rs +++ b/src/test/ui/variance/variance-regions-unused-direct.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that disallow lifetime parameters that are unused. use std::marker; diff --git a/src/test/ui/variance/variance-regions-unused-direct.stderr b/src/test/ui/variance/variance-regions-unused-direct.stderr index e3d02c649dc7f..207cc9147f1c3 100644 --- a/src/test/ui/variance/variance-regions-unused-direct.stderr +++ b/src/test/ui/variance/variance-regions-unused-direct.stderr @@ -1,5 +1,5 @@ error[E0392]: parameter `'a` is never used - --> $DIR/variance-regions-unused-direct.rs:15:18 + --> $DIR/variance-regions-unused-direct.rs:5:18 | LL | struct Bivariant<'a>; //~ ERROR parameter `'a` is never used | ^^ unused type parameter @@ -7,7 +7,7 @@ LL | struct Bivariant<'a>; //~ ERROR parameter `'a` is never used = help: consider removing `'a` or using a marker such as `std::marker::PhantomData` error[E0392]: parameter `'d` is never used - --> $DIR/variance-regions-unused-direct.rs:17:19 + --> $DIR/variance-regions-unused-direct.rs:7:19 | LL | struct Struct<'a, 'd> { //~ ERROR parameter `'d` is never used | ^^ unused type parameter diff --git a/src/test/ui/variance/variance-regions-unused-indirect.rs b/src/test/ui/variance/variance-regions-unused-indirect.rs index 2d234ed7b5781..1514e39563e1f 100644 --- a/src/test/ui/variance/variance-regions-unused-indirect.rs +++ b/src/test/ui/variance/variance-regions-unused-indirect.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that disallow lifetime parameters that are unused. enum Foo<'a> { //~ ERROR parameter `'a` is never used diff --git a/src/test/ui/variance/variance-regions-unused-indirect.stderr b/src/test/ui/variance/variance-regions-unused-indirect.stderr index f3eee86d5ab8d..08d1189ea2c9d 100644 --- a/src/test/ui/variance/variance-regions-unused-indirect.stderr +++ b/src/test/ui/variance/variance-regions-unused-indirect.stderr @@ -1,5 +1,5 @@ error[E0392]: parameter `'a` is never used - --> $DIR/variance-regions-unused-indirect.rs:13:10 + --> $DIR/variance-regions-unused-indirect.rs:3:10 | LL | enum Foo<'a> { //~ ERROR parameter `'a` is never used | ^^ unused type parameter @@ -7,7 +7,7 @@ LL | enum Foo<'a> { //~ ERROR parameter `'a` is never used = help: consider removing `'a` or using a marker such as `std::marker::PhantomData` error[E0392]: parameter `'a` is never used - --> $DIR/variance-regions-unused-indirect.rs:17:10 + --> $DIR/variance-regions-unused-indirect.rs:7:10 | LL | enum Bar<'a> { //~ ERROR parameter `'a` is never used | ^^ unused type parameter diff --git a/src/test/ui/variance/variance-trait-bounds.rs b/src/test/ui/variance/variance-trait-bounds.rs index ff446f175b756..ad5334602a2de 100644 --- a/src/test/ui/variance/variance-trait-bounds.rs +++ b/src/test/ui/variance/variance-trait-bounds.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] #![feature(rustc_attrs)] diff --git a/src/test/ui/variance/variance-trait-bounds.stderr b/src/test/ui/variance/variance-trait-bounds.stderr index 1c82ed772e23b..1fabadabbcbbf 100644 --- a/src/test/ui/variance/variance-trait-bounds.stderr +++ b/src/test/ui/variance/variance-trait-bounds.stderr @@ -1,5 +1,5 @@ error[E0208]: [+, +] - --> $DIR/variance-trait-bounds.rs:26:1 + --> $DIR/variance-trait-bounds.rs:16:1 | LL | / struct TestStruct> { //~ ERROR [+, +] LL | | t: T, u: U @@ -7,7 +7,7 @@ LL | | } | |_^ error[E0208]: [*, +] - --> $DIR/variance-trait-bounds.rs:31:1 + --> $DIR/variance-trait-bounds.rs:21:1 | LL | / enum TestEnum> { //~ ERROR [*, +] LL | | Foo(T) @@ -15,7 +15,7 @@ LL | | } | |_^ error[E0208]: [*, +] - --> $DIR/variance-trait-bounds.rs:36:1 + --> $DIR/variance-trait-bounds.rs:26:1 | LL | / struct TestContraStruct> { //~ ERROR [*, +] LL | | t: T @@ -23,7 +23,7 @@ LL | | } | |_^ error[E0208]: [*, +] - --> $DIR/variance-trait-bounds.rs:41:1 + --> $DIR/variance-trait-bounds.rs:31:1 | LL | / struct TestBox+Setter> { //~ ERROR [*, +] LL | | t: T diff --git a/src/test/ui/variance/variance-trait-matching.nll.stderr b/src/test/ui/variance/variance-trait-matching.nll.stderr index baf75b73463a5..2e78ffb1270e9 100644 --- a/src/test/ui/variance/variance-trait-matching.nll.stderr +++ b/src/test/ui/variance/variance-trait-matching.nll.stderr @@ -1,23 +1,23 @@ warning: not reporting region error due to nll - --> $DIR/variance-trait-matching.rs:34:10 + --> $DIR/variance-trait-matching.rs:24:10 | LL | pick(get, &22) //~ ERROR 34:5: 34:9: explicit lifetime required in the type of `get` [E0621] | ^^^ warning: not reporting region error due to nll - --> $DIR/variance-trait-matching.rs:34:5 + --> $DIR/variance-trait-matching.rs:24:5 | LL | pick(get, &22) //~ ERROR 34:5: 34:9: explicit lifetime required in the type of `get` [E0621] | ^^^^^^^^^^^^^^ warning: not reporting region error due to nll - --> $DIR/variance-trait-matching.rs:34:5 + --> $DIR/variance-trait-matching.rs:24:5 | LL | pick(get, &22) //~ ERROR 34:5: 34:9: explicit lifetime required in the type of `get` [E0621] | ^^^^ error[E0621]: explicit lifetime required in the type of `get` - --> $DIR/variance-trait-matching.rs:34:5 + --> $DIR/variance-trait-matching.rs:24:5 | LL | fn get<'a, G>(get: &G) -> i32 | -- help: add explicit lifetime `'a` to the type of `get`: `&'a G` diff --git a/src/test/ui/variance/variance-trait-matching.rs b/src/test/ui/variance/variance-trait-matching.rs index bc9eab2be821b..8c79427101645 100644 --- a/src/test/ui/variance/variance-trait-matching.rs +++ b/src/test/ui/variance/variance-trait-matching.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] // Get is covariant in T diff --git a/src/test/ui/variance/variance-trait-matching.stderr b/src/test/ui/variance/variance-trait-matching.stderr index 645d0ffd3118b..d9a3e3b012b2c 100644 --- a/src/test/ui/variance/variance-trait-matching.stderr +++ b/src/test/ui/variance/variance-trait-matching.stderr @@ -1,5 +1,5 @@ error[E0621]: explicit lifetime required in the type of `get` - --> $DIR/variance-trait-matching.rs:34:5 + --> $DIR/variance-trait-matching.rs:24:5 | LL | fn get<'a, G>(get: &G) -> i32 | -- help: add explicit lifetime `'a` to the type of `get`: `&'a G` diff --git a/src/test/ui/variance/variance-trait-object-bound.rs b/src/test/ui/variance/variance-trait-object-bound.rs index b120588ecab52..ada93b7f6efc7 100644 --- a/src/test/ui/variance/variance-trait-object-bound.rs +++ b/src/test/ui/variance/variance-trait-object-bound.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Checks that regions which appear in a trait object type are // observed by the variance inference algorithm (and hence // `TOption` is contavariant w/r/t `'a` and not bivariant). diff --git a/src/test/ui/variance/variance-trait-object-bound.stderr b/src/test/ui/variance/variance-trait-object-bound.stderr index b44fa940ed3e6..c824f5a6db731 100644 --- a/src/test/ui/variance/variance-trait-object-bound.stderr +++ b/src/test/ui/variance/variance-trait-object-bound.stderr @@ -1,5 +1,5 @@ error[E0208]: [-] - --> $DIR/variance-trait-object-bound.rs:24:1 + --> $DIR/variance-trait-object-bound.rs:14:1 | LL | / struct TOption<'a> { //~ ERROR [-] LL | | v: Option>, diff --git a/src/test/ui/variance/variance-types-bounds.rs b/src/test/ui/variance/variance-types-bounds.rs index 5075dd2ceedc0..5cbda10fbdeda 100644 --- a/src/test/ui/variance/variance-types-bounds.rs +++ b/src/test/ui/variance/variance-types-bounds.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we correctly infer variance for type parameters in // various types and traits. diff --git a/src/test/ui/variance/variance-types-bounds.stderr b/src/test/ui/variance/variance-types-bounds.stderr index e4b0887912b0f..31271952f776f 100644 --- a/src/test/ui/variance/variance-types-bounds.stderr +++ b/src/test/ui/variance/variance-types-bounds.stderr @@ -1,5 +1,5 @@ error[E0208]: [+, +] - --> $DIR/variance-types-bounds.rs:17:1 + --> $DIR/variance-types-bounds.rs:7:1 | LL | / struct TestImm { //~ ERROR [+, +] LL | | x: A, @@ -8,7 +8,7 @@ LL | | } | |_^ error[E0208]: [+, o] - --> $DIR/variance-types-bounds.rs:23:1 + --> $DIR/variance-types-bounds.rs:13:1 | LL | / struct TestMut { //~ ERROR [+, o] LL | | x: A, @@ -17,7 +17,7 @@ LL | | } | |_^ error[E0208]: [+, o] - --> $DIR/variance-types-bounds.rs:29:1 + --> $DIR/variance-types-bounds.rs:19:1 | LL | / struct TestIndirect { //~ ERROR [+, o] LL | | m: TestMut @@ -25,7 +25,7 @@ LL | | } | |_^ error[E0208]: [o, o] - --> $DIR/variance-types-bounds.rs:34:1 + --> $DIR/variance-types-bounds.rs:24:1 | LL | / struct TestIndirect2 { //~ ERROR [o, o] LL | | n: TestMut, @@ -34,7 +34,7 @@ LL | | } | |_^ error[E0208]: [o, o] - --> $DIR/variance-types-bounds.rs:48:1 + --> $DIR/variance-types-bounds.rs:38:1 | LL | / struct TestObject { //~ ERROR [o, o] LL | | n: Box+Send>, diff --git a/src/test/ui/variance/variance-types.rs b/src/test/ui/variance/variance-types.rs index 7667972c9d251..b9b6d9c9bb5e4 100644 --- a/src/test/ui/variance/variance-types.rs +++ b/src/test/ui/variance/variance-types.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] #![feature(rustc_attrs)] diff --git a/src/test/ui/variance/variance-types.stderr b/src/test/ui/variance/variance-types.stderr index 59975fa7a7ed4..4362f69420261 100644 --- a/src/test/ui/variance/variance-types.stderr +++ b/src/test/ui/variance/variance-types.stderr @@ -1,5 +1,5 @@ error[E0208]: [-, o, o] - --> $DIR/variance-types.rs:20:1 + --> $DIR/variance-types.rs:10:1 | LL | / struct InvariantMut<'a,A:'a,B:'a> { //~ ERROR [-, o, o] LL | | t: &'a mut (A,B) @@ -7,7 +7,7 @@ LL | | } | |_^ error[E0208]: [o] - --> $DIR/variance-types.rs:25:1 + --> $DIR/variance-types.rs:15:1 | LL | / struct InvariantCell { //~ ERROR [o] LL | | t: Cell @@ -15,7 +15,7 @@ LL | | } | |_^ error[E0208]: [o] - --> $DIR/variance-types.rs:30:1 + --> $DIR/variance-types.rs:20:1 | LL | / struct InvariantIndirect { //~ ERROR [o] LL | | t: InvariantCell @@ -23,7 +23,7 @@ LL | | } | |_^ error[E0208]: [+] - --> $DIR/variance-types.rs:35:1 + --> $DIR/variance-types.rs:25:1 | LL | / struct Covariant { //~ ERROR [+] LL | | t: A, u: fn() -> A @@ -31,7 +31,7 @@ LL | | } | |_^ error[E0208]: [-] - --> $DIR/variance-types.rs:40:1 + --> $DIR/variance-types.rs:30:1 | LL | / struct Contravariant { //~ ERROR [-] LL | | t: fn(A) @@ -39,7 +39,7 @@ LL | | } | |_^ error[E0208]: [+, -, o] - --> $DIR/variance-types.rs:45:1 + --> $DIR/variance-types.rs:35:1 | LL | / enum Enum { //~ ERROR [+, -, o] LL | | Foo(Covariant), diff --git a/src/test/ui/variance/variance-unused-region-param.rs b/src/test/ui/variance/variance-unused-region-param.rs index 407282e5ce0d4..f0e4e03c9db8d 100644 --- a/src/test/ui/variance/variance-unused-region-param.rs +++ b/src/test/ui/variance/variance-unused-region-param.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we report an error for unused type parameters in types. struct SomeStruct<'a> { x: u32 } //~ ERROR parameter `'a` is never used diff --git a/src/test/ui/variance/variance-unused-region-param.stderr b/src/test/ui/variance/variance-unused-region-param.stderr index 354fcf373a6c2..9cd133bbc937b 100644 --- a/src/test/ui/variance/variance-unused-region-param.stderr +++ b/src/test/ui/variance/variance-unused-region-param.stderr @@ -1,5 +1,5 @@ error[E0392]: parameter `'a` is never used - --> $DIR/variance-unused-region-param.rs:13:19 + --> $DIR/variance-unused-region-param.rs:3:19 | LL | struct SomeStruct<'a> { x: u32 } //~ ERROR parameter `'a` is never used | ^^ unused type parameter @@ -7,7 +7,7 @@ LL | struct SomeStruct<'a> { x: u32 } //~ ERROR parameter `'a` is never used = help: consider removing `'a` or using a marker such as `std::marker::PhantomData` error[E0392]: parameter `'a` is never used - --> $DIR/variance-unused-region-param.rs:14:15 + --> $DIR/variance-unused-region-param.rs:4:15 | LL | enum SomeEnum<'a> { Nothing } //~ ERROR parameter `'a` is never used | ^^ unused type parameter diff --git a/src/test/ui/variance/variance-unused-type-param.rs b/src/test/ui/variance/variance-unused-type-param.rs index a5f6fd2fda14f..1e0e403ebcee2 100644 --- a/src/test/ui/variance/variance-unused-type-param.rs +++ b/src/test/ui/variance/variance-unused-type-param.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] // Test that we report an error for unused type parameters in types and traits, diff --git a/src/test/ui/variance/variance-unused-type-param.stderr b/src/test/ui/variance/variance-unused-type-param.stderr index b3ae91a6fa580..34c430f5498da 100644 --- a/src/test/ui/variance/variance-unused-type-param.stderr +++ b/src/test/ui/variance/variance-unused-type-param.stderr @@ -1,5 +1,5 @@ error[E0392]: parameter `A` is never used - --> $DIR/variance-unused-type-param.rs:16:19 + --> $DIR/variance-unused-type-param.rs:6:19 | LL | struct SomeStruct { x: u32 } | ^ unused type parameter @@ -7,7 +7,7 @@ LL | struct SomeStruct { x: u32 } = help: consider removing `A` or using a marker such as `std::marker::PhantomData` error[E0392]: parameter `A` is never used - --> $DIR/variance-unused-type-param.rs:19:15 + --> $DIR/variance-unused-type-param.rs:9:15 | LL | enum SomeEnum { Nothing } | ^ unused type parameter @@ -15,7 +15,7 @@ LL | enum SomeEnum { Nothing } = help: consider removing `A` or using a marker such as `std::marker::PhantomData` error[E0392]: parameter `T` is never used - --> $DIR/variance-unused-type-param.rs:23:15 + --> $DIR/variance-unused-type-param.rs:13:15 | LL | enum ListCell { | ^ unused type parameter diff --git a/src/test/ui/variance/variance-use-contravariant-struct-1.nll.stderr b/src/test/ui/variance/variance-use-contravariant-struct-1.nll.stderr index 643b8587bea94..aa56337d6ccc1 100644 --- a/src/test/ui/variance/variance-use-contravariant-struct-1.nll.stderr +++ b/src/test/ui/variance/variance-use-contravariant-struct-1.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/variance-use-contravariant-struct-1.rs:22:5 + --> $DIR/variance-use-contravariant-struct-1.rs:12:5 | LL | v //~ ERROR mismatched types | ^ error: unsatisfied lifetime constraints - --> $DIR/variance-use-contravariant-struct-1.rs:22:5 + --> $DIR/variance-use-contravariant-struct-1.rs:12:5 | LL | fn foo<'min,'max>(v: SomeStruct<&'max ()>) | ---- ---- lifetime `'max` defined here diff --git a/src/test/ui/variance/variance-use-contravariant-struct-1.rs b/src/test/ui/variance/variance-use-contravariant-struct-1.rs index d2fd2978750e7..1fc6057042031 100644 --- a/src/test/ui/variance/variance-use-contravariant-struct-1.rs +++ b/src/test/ui/variance/variance-use-contravariant-struct-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test various uses of structs with distint variances to make sure // they permit lifetimes to be approximated as expected. diff --git a/src/test/ui/variance/variance-use-contravariant-struct-1.stderr b/src/test/ui/variance/variance-use-contravariant-struct-1.stderr index 48e0d380c66d7..89a49a00b34e6 100644 --- a/src/test/ui/variance/variance-use-contravariant-struct-1.stderr +++ b/src/test/ui/variance/variance-use-contravariant-struct-1.stderr @@ -1,18 +1,18 @@ error[E0308]: mismatched types - --> $DIR/variance-use-contravariant-struct-1.rs:22:5 + --> $DIR/variance-use-contravariant-struct-1.rs:12:5 | LL | v //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `SomeStruct<&'min ()>` found type `SomeStruct<&'max ()>` -note: the lifetime 'min as defined on the function body at 18:8... - --> $DIR/variance-use-contravariant-struct-1.rs:18:8 +note: the lifetime 'min as defined on the function body at 8:8... + --> $DIR/variance-use-contravariant-struct-1.rs:8:8 | LL | fn foo<'min,'max>(v: SomeStruct<&'max ()>) | ^^^^ -note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 18:13 - --> $DIR/variance-use-contravariant-struct-1.rs:18:13 +note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 8:13 + --> $DIR/variance-use-contravariant-struct-1.rs:8:13 | LL | fn foo<'min,'max>(v: SomeStruct<&'max ()>) | ^^^^ diff --git a/src/test/ui/variance/variance-use-contravariant-struct-2.rs b/src/test/ui/variance/variance-use-contravariant-struct-2.rs index b38fd0e9ffcc6..941465c12957a 100644 --- a/src/test/ui/variance/variance-use-contravariant-struct-2.rs +++ b/src/test/ui/variance/variance-use-contravariant-struct-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test various uses of structs with distint variances to make sure // they permit lifetimes to be approximated as expected. diff --git a/src/test/ui/variance/variance-use-contravariant-struct-2.stderr b/src/test/ui/variance/variance-use-contravariant-struct-2.stderr index e3663eb03450d..5313187fcd1d7 100644 --- a/src/test/ui/variance/variance-use-contravariant-struct-2.stderr +++ b/src/test/ui/variance/variance-use-contravariant-struct-2.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/variance-use-contravariant-struct-2.rs:27:1 + --> $DIR/variance-use-contravariant-struct-2.rs:17:1 | LL | fn main() { } //~ ERROR compilation successful | ^^^^^^^^^^^^^ diff --git a/src/test/ui/variance/variance-use-covariant-struct-1.nll.stderr b/src/test/ui/variance/variance-use-covariant-struct-1.nll.stderr index f0c9c44794df2..67748b5b16727 100644 --- a/src/test/ui/variance/variance-use-covariant-struct-1.nll.stderr +++ b/src/test/ui/variance/variance-use-covariant-struct-1.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/variance-use-covariant-struct-1.rs:20:5 + --> $DIR/variance-use-covariant-struct-1.rs:10:5 | LL | v //~ ERROR mismatched types | ^ error: unsatisfied lifetime constraints - --> $DIR/variance-use-covariant-struct-1.rs:20:5 + --> $DIR/variance-use-covariant-struct-1.rs:10:5 | LL | fn foo<'min,'max>(v: SomeStruct<&'min ()>) | ---- ---- lifetime `'max` defined here diff --git a/src/test/ui/variance/variance-use-covariant-struct-1.rs b/src/test/ui/variance/variance-use-covariant-struct-1.rs index 2631cfc05e81d..e19a35bdfacfe 100644 --- a/src/test/ui/variance/variance-use-covariant-struct-1.rs +++ b/src/test/ui/variance/variance-use-covariant-struct-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that a covariant struct does not permit the lifetime of a // reference to be enlarged. diff --git a/src/test/ui/variance/variance-use-covariant-struct-1.stderr b/src/test/ui/variance/variance-use-covariant-struct-1.stderr index 947abe24b5569..a6f298c9bfbe0 100644 --- a/src/test/ui/variance/variance-use-covariant-struct-1.stderr +++ b/src/test/ui/variance/variance-use-covariant-struct-1.stderr @@ -1,18 +1,18 @@ error[E0308]: mismatched types - --> $DIR/variance-use-covariant-struct-1.rs:20:5 + --> $DIR/variance-use-covariant-struct-1.rs:10:5 | LL | v //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `SomeStruct<&'max ()>` found type `SomeStruct<&'min ()>` -note: the lifetime 'min as defined on the function body at 16:8... - --> $DIR/variance-use-covariant-struct-1.rs:16:8 +note: the lifetime 'min as defined on the function body at 6:8... + --> $DIR/variance-use-covariant-struct-1.rs:6:8 | LL | fn foo<'min,'max>(v: SomeStruct<&'min ()>) | ^^^^ -note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 16:13 - --> $DIR/variance-use-covariant-struct-1.rs:16:13 +note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 6:13 + --> $DIR/variance-use-covariant-struct-1.rs:6:13 | LL | fn foo<'min,'max>(v: SomeStruct<&'min ()>) | ^^^^ diff --git a/src/test/ui/variance/variance-use-covariant-struct-2.rs b/src/test/ui/variance/variance-use-covariant-struct-2.rs index d8e1a5f5f1c54..1add3f31101d2 100644 --- a/src/test/ui/variance/variance-use-covariant-struct-2.rs +++ b/src/test/ui/variance/variance-use-covariant-struct-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that a covariant struct permits the lifetime of a reference to // be shortened. diff --git a/src/test/ui/variance/variance-use-covariant-struct-2.stderr b/src/test/ui/variance/variance-use-covariant-struct-2.stderr index 9c3a1cf1cc2c2..892c5cd11928a 100644 --- a/src/test/ui/variance/variance-use-covariant-struct-2.stderr +++ b/src/test/ui/variance/variance-use-covariant-struct-2.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/variance-use-covariant-struct-2.rs:26:16 + --> $DIR/variance-use-covariant-struct-2.rs:16:16 | LL | #[rustc_error] fn main() { } //~ ERROR compilation successful | ^^^^^^^^^^^^^ diff --git a/src/test/ui/variance/variance-use-invariant-struct-1.nll.stderr b/src/test/ui/variance/variance-use-invariant-struct-1.nll.stderr index 8b6d6100af48e..82f447b3cc2c4 100644 --- a/src/test/ui/variance/variance-use-invariant-struct-1.nll.stderr +++ b/src/test/ui/variance/variance-use-invariant-struct-1.nll.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/variance-use-invariant-struct-1.rs:22:5 + --> $DIR/variance-use-invariant-struct-1.rs:12:5 | LL | v //~ ERROR mismatched types | ^ warning: not reporting region error due to nll - --> $DIR/variance-use-invariant-struct-1.rs:29:5 + --> $DIR/variance-use-invariant-struct-1.rs:19:5 | LL | v //~ ERROR mismatched types | ^ error: unsatisfied lifetime constraints - --> $DIR/variance-use-invariant-struct-1.rs:22:5 + --> $DIR/variance-use-invariant-struct-1.rs:12:5 | LL | fn foo<'min,'max>(v: SomeStruct<&'max ()>) | ---- ---- lifetime `'max` defined here @@ -22,7 +22,7 @@ LL | v //~ ERROR mismatched types | ^ returning this value requires that `'min` must outlive `'max` error: unsatisfied lifetime constraints - --> $DIR/variance-use-invariant-struct-1.rs:29:5 + --> $DIR/variance-use-invariant-struct-1.rs:19:5 | LL | fn bar<'min,'max>(v: SomeStruct<&'min ()>) | ---- ---- lifetime `'max` defined here diff --git a/src/test/ui/variance/variance-use-invariant-struct-1.rs b/src/test/ui/variance/variance-use-invariant-struct-1.rs index c89436b20949c..9df977424ce7b 100644 --- a/src/test/ui/variance/variance-use-invariant-struct-1.rs +++ b/src/test/ui/variance/variance-use-invariant-struct-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test various uses of structs with distint variances to make sure // they permit lifetimes to be approximated as expected. diff --git a/src/test/ui/variance/variance-use-invariant-struct-1.stderr b/src/test/ui/variance/variance-use-invariant-struct-1.stderr index 30da7e38c57ba..2bd39d5a831f2 100644 --- a/src/test/ui/variance/variance-use-invariant-struct-1.stderr +++ b/src/test/ui/variance/variance-use-invariant-struct-1.stderr @@ -1,37 +1,37 @@ error[E0308]: mismatched types - --> $DIR/variance-use-invariant-struct-1.rs:22:5 + --> $DIR/variance-use-invariant-struct-1.rs:12:5 | LL | v //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `SomeStruct<&'min ()>` found type `SomeStruct<&'max ()>` -note: the lifetime 'min as defined on the function body at 18:8... - --> $DIR/variance-use-invariant-struct-1.rs:18:8 +note: the lifetime 'min as defined on the function body at 8:8... + --> $DIR/variance-use-invariant-struct-1.rs:8:8 | LL | fn foo<'min,'max>(v: SomeStruct<&'max ()>) | ^^^^ -note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 18:13 - --> $DIR/variance-use-invariant-struct-1.rs:18:13 +note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 8:13 + --> $DIR/variance-use-invariant-struct-1.rs:8:13 | LL | fn foo<'min,'max>(v: SomeStruct<&'max ()>) | ^^^^ error[E0308]: mismatched types - --> $DIR/variance-use-invariant-struct-1.rs:29:5 + --> $DIR/variance-use-invariant-struct-1.rs:19:5 | LL | v //~ ERROR mismatched types | ^ lifetime mismatch | = note: expected type `SomeStruct<&'max ()>` found type `SomeStruct<&'min ()>` -note: the lifetime 'min as defined on the function body at 25:8... - --> $DIR/variance-use-invariant-struct-1.rs:25:8 +note: the lifetime 'min as defined on the function body at 15:8... + --> $DIR/variance-use-invariant-struct-1.rs:15:8 | LL | fn bar<'min,'max>(v: SomeStruct<&'min ()>) | ^^^^ -note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 25:13 - --> $DIR/variance-use-invariant-struct-1.rs:25:13 +note: ...does not necessarily outlive the lifetime 'max as defined on the function body at 15:13 + --> $DIR/variance-use-invariant-struct-1.rs:15:13 | LL | fn bar<'min,'max>(v: SomeStruct<&'min ()>) | ^^^^ diff --git a/src/test/ui/variants/auxiliary/variant-namespacing.rs b/src/test/ui/variants/auxiliary/variant-namespacing.rs index d7fd296849524..7ba601a884006 100644 --- a/src/test/ui/variants/auxiliary/variant-namespacing.rs +++ b/src/test/ui/variants/auxiliary/variant-namespacing.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub enum XE { XStruct { a: u8 }, XTuple(u8), diff --git a/src/test/ui/variants/variant-namespacing.rs b/src/test/ui/variants/variant-namespacing.rs index 58bfd91550e0b..ceb7d27451452 100644 --- a/src/test/ui/variants/variant-namespacing.rs +++ b/src/test/ui/variants/variant-namespacing.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:variant-namespacing.rs enum E { diff --git a/src/test/ui/variants/variant-namespacing.stderr b/src/test/ui/variants/variant-namespacing.stderr index 322ea617f3439..61ffa6745484e 100644 --- a/src/test/ui/variants/variant-namespacing.stderr +++ b/src/test/ui/variants/variant-namespacing.stderr @@ -1,5 +1,5 @@ error[E0255]: the name `XStruct` is defined multiple times - --> $DIR/variant-namespacing.rs:34:35 + --> $DIR/variant-namespacing.rs:24:35 | LL | type XStruct = u8; | ------------------ previous definition of the type `XStruct` here @@ -14,7 +14,7 @@ LL | pub use variant_namespacing::XE::{XStruct as OtherXStruct, XTuple, XUnit}; | ^^^^^^^^^^^^^^^^^^^^^^^ error[E0255]: the name `XTuple` is defined multiple times - --> $DIR/variant-namespacing.rs:34:44 + --> $DIR/variant-namespacing.rs:24:44 | LL | type XTuple = u8; | ----------------- previous definition of the type `XTuple` here @@ -29,7 +29,7 @@ LL | pub use variant_namespacing::XE::{XStruct, XTuple as OtherXTuple, XUnit}; | ^^^^^^^^^^^^^^^^^^^^^ error[E0255]: the name `XUnit` is defined multiple times - --> $DIR/variant-namespacing.rs:34:52 + --> $DIR/variant-namespacing.rs:24:52 | LL | type XUnit = u8; | ---------------- previous definition of the type `XUnit` here @@ -44,7 +44,7 @@ LL | pub use variant_namespacing::XE::{XStruct, XTuple, XUnit as OtherXUnit}; | ^^^^^^^^^^^^^^^^^^^ error[E0255]: the name `Struct` is defined multiple times - --> $DIR/variant-namespacing.rs:38:13 + --> $DIR/variant-namespacing.rs:28:13 | LL | type Struct = u8; | ----------------- previous definition of the type `Struct` here @@ -59,7 +59,7 @@ LL | pub use E::{Struct as OtherStruct, Tuple, Unit}; | ^^^^^^^^^^^^^^^^^^^^^ error[E0255]: the name `Tuple` is defined multiple times - --> $DIR/variant-namespacing.rs:38:21 + --> $DIR/variant-namespacing.rs:28:21 | LL | type Tuple = u8; | ---------------- previous definition of the type `Tuple` here @@ -74,7 +74,7 @@ LL | pub use E::{Struct, Tuple as OtherTuple, Unit}; | ^^^^^^^^^^^^^^^^^^^ error[E0255]: the name `Unit` is defined multiple times - --> $DIR/variant-namespacing.rs:38:28 + --> $DIR/variant-namespacing.rs:28:28 | LL | type Unit = u8; | --------------- previous definition of the type `Unit` here diff --git a/src/test/ui/variants/variant-size-differences.rs b/src/test/ui/variants/variant-size-differences.rs index f2cffeefe9080..2198199511b20 100644 --- a/src/test/ui/variants/variant-size-differences.rs +++ b/src/test/ui/variants/variant-size-differences.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(variant_size_differences)] enum _En { diff --git a/src/test/ui/variants/variant-size-differences.stderr b/src/test/ui/variants/variant-size-differences.stderr index a41a5c17ea3ed..5cd168df53824 100644 --- a/src/test/ui/variants/variant-size-differences.stderr +++ b/src/test/ui/variants/variant-size-differences.stderr @@ -1,11 +1,11 @@ error: enum variant is more than three times larger (1024 bytes) than the next largest - --> $DIR/variant-size-differences.rs:15:5 + --> $DIR/variant-size-differences.rs:5:5 | LL | VBig([u8; 1024]), //~ ERROR variant is more than three times larger | ^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/variant-size-differences.rs:11:9 + --> $DIR/variant-size-differences.rs:1:9 | LL | #![deny(variant_size_differences)] | ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/variants/variant-used-as-type.rs b/src/test/ui/variants/variant-used-as-type.rs index c889b7d28f8c2..f27db1024760a 100644 --- a/src/test/ui/variants/variant-used-as-type.rs +++ b/src/test/ui/variants/variant-used-as-type.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test error message when enum variants are used as types diff --git a/src/test/ui/variants/variant-used-as-type.stderr b/src/test/ui/variants/variant-used-as-type.stderr index 972fe8a8a616b..f0d8b4e94dd23 100644 --- a/src/test/ui/variants/variant-used-as-type.stderr +++ b/src/test/ui/variants/variant-used-as-type.stderr @@ -1,5 +1,5 @@ error[E0573]: expected type, found variant `Ty::A` - --> $DIR/variant-used-as-type.rs:17:7 + --> $DIR/variant-used-as-type.rs:7:7 | LL | B(Ty::A), | ^^^^^ not a type @@ -13,7 +13,7 @@ LL | B(E), | ^ error[E0573]: expected type, found variant `E::A` - --> $DIR/variant-used-as-type.rs:27:6 + --> $DIR/variant-used-as-type.rs:17:6 | LL | impl E::A {} | ^^^^ not a type diff --git a/src/test/ui/vec/vec-macro-with-comma-only.rs b/src/test/ui/vec/vec-macro-with-comma-only.rs index c79e67a376895..574a53c58feac 100644 --- a/src/test/ui/vec/vec-macro-with-comma-only.rs +++ b/src/test/ui/vec/vec-macro-with-comma-only.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { vec![,]; //~ ERROR no rules expected the token `,` } diff --git a/src/test/ui/vec/vec-macro-with-comma-only.stderr b/src/test/ui/vec/vec-macro-with-comma-only.stderr index f5341ccc31286..316d6ec3599ef 100644 --- a/src/test/ui/vec/vec-macro-with-comma-only.stderr +++ b/src/test/ui/vec/vec-macro-with-comma-only.stderr @@ -1,5 +1,5 @@ error: no rules expected the token `,` - --> $DIR/vec-macro-with-comma-only.rs:12:10 + --> $DIR/vec-macro-with-comma-only.rs:2:10 | LL | vec![,]; //~ ERROR no rules expected the token `,` | ^ diff --git a/src/test/ui/vec/vec-mut-iter-borrow.nll.stderr b/src/test/ui/vec/vec-mut-iter-borrow.nll.stderr index fd7843f39bc1e..89f14046b4463 100644 --- a/src/test/ui/vec/vec-mut-iter-borrow.nll.stderr +++ b/src/test/ui/vec/vec-mut-iter-borrow.nll.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `xs` as mutable more than once at a time - --> $DIR/vec-mut-iter-borrow.rs:15:9 + --> $DIR/vec-mut-iter-borrow.rs:5:9 | LL | for x in &mut xs { | ------- diff --git a/src/test/ui/vec/vec-mut-iter-borrow.rs b/src/test/ui/vec/vec-mut-iter-borrow.rs index 571634e399261..4aa737446b56b 100644 --- a/src/test/ui/vec/vec-mut-iter-borrow.rs +++ b/src/test/ui/vec/vec-mut-iter-borrow.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let mut xs: Vec = vec![]; diff --git a/src/test/ui/vec/vec-mut-iter-borrow.stderr b/src/test/ui/vec/vec-mut-iter-borrow.stderr index 18fdf2c686705..9b4b56737915a 100644 --- a/src/test/ui/vec/vec-mut-iter-borrow.stderr +++ b/src/test/ui/vec/vec-mut-iter-borrow.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `xs` as mutable more than once at a time - --> $DIR/vec-mut-iter-borrow.rs:15:9 + --> $DIR/vec-mut-iter-borrow.rs:5:9 | LL | for x in &mut xs { | -- diff --git a/src/test/ui/vec/vec-res-add.rs b/src/test/ui/vec/vec-res-add.rs index 27f6fc51164ad..86751edfa71c2 100644 --- a/src/test/ui/vec/vec-res-add.rs +++ b/src/test/ui/vec/vec-res-add.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug)] struct r { i:isize diff --git a/src/test/ui/vec/vec-res-add.stderr b/src/test/ui/vec/vec-res-add.stderr index 62d3f046c967e..1a8d0896b1a2b 100644 --- a/src/test/ui/vec/vec-res-add.stderr +++ b/src/test/ui/vec/vec-res-add.stderr @@ -1,5 +1,5 @@ error[E0369]: binary operation `+` cannot be applied to type `std::vec::Vec` - --> $DIR/vec-res-add.rs:26:13 + --> $DIR/vec-res-add.rs:16:13 | LL | let k = i + j; | ^^^^^ diff --git a/src/test/ui/vector-cast-weirdness.rs b/src/test/ui/vector-cast-weirdness.rs index 26c59c440d47b..79b9243765b95 100644 --- a/src/test/ui/vector-cast-weirdness.rs +++ b/src/test/ui/vector-cast-weirdness.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #14893. Tests that casts from vectors don't behave strangely in the // presence of the `_` type shorthand notation. // Update: after a change to the way casts are done, we have more type information diff --git a/src/test/ui/vector-cast-weirdness.stderr b/src/test/ui/vector-cast-weirdness.stderr index a096fee16b9ce..330b87801ebb0 100644 --- a/src/test/ui/vector-cast-weirdness.stderr +++ b/src/test/ui/vector-cast-weirdness.stderr @@ -1,5 +1,5 @@ error[E0606]: casting `&mut [u8; 2]` as `*mut u8` is invalid - --> $DIR/vector-cast-weirdness.rs:31:23 + --> $DIR/vector-cast-weirdness.rs:21:23 | LL | let p1: *mut u8 = &mut x1.y as *mut _; //~ ERROR casting | ^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/vector-no-ann.rs b/src/test/ui/vector-no-ann.rs index 2143d2b64c6c3..200364a5d937e 100644 --- a/src/test/ui/vector-no-ann.rs +++ b/src/test/ui/vector-no-ann.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn main() { let _foo = Vec::new(); //~^ ERROR type annotations needed [E0282] diff --git a/src/test/ui/vector-no-ann.stderr b/src/test/ui/vector-no-ann.stderr index 90acc2f86d74c..01b569f97f910 100644 --- a/src/test/ui/vector-no-ann.stderr +++ b/src/test/ui/vector-no-ann.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/vector-no-ann.rs:13:16 + --> $DIR/vector-no-ann.rs:2:16 | LL | let _foo = Vec::new(); | ---- ^^^^^^^^ cannot infer type for `T` diff --git a/src/test/ui/vtable-res-trait-param.rs b/src/test/ui/vtable-res-trait-param.rs index 8b3e9369ece46..3d7c2eb084c5b 100644 --- a/src/test/ui/vtable-res-trait-param.rs +++ b/src/test/ui/vtable-res-trait-param.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait TraitA { fn method_a(&self) -> isize; } diff --git a/src/test/ui/vtable-res-trait-param.stderr b/src/test/ui/vtable-res-trait-param.stderr index 0d0e820262318..6dac9fe335f69 100644 --- a/src/test/ui/vtable-res-trait-param.stderr +++ b/src/test/ui/vtable-res-trait-param.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `{integer}: TraitA` is not satisfied - --> $DIR/vtable-res-trait-param.rs:27:7 + --> $DIR/vtable-res-trait-param.rs:17:7 | LL | b.gimme_an_a(y) //~ ERROR `{integer}: TraitA` is not satisfied | ^^^^^^^^^^ the trait `TraitA` is not implemented for `{integer}` diff --git a/src/test/ui/walk-struct-literal-with.nll.stderr b/src/test/ui/walk-struct-literal-with.nll.stderr index 668473882ab6e..788df6fc1b269 100644 --- a/src/test/ui/walk-struct-literal-with.nll.stderr +++ b/src/test/ui/walk-struct-literal-with.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: borrow of moved value: `start.test` - --> $DIR/walk-struct-literal-with.rs:26:20 + --> $DIR/walk-struct-literal-with.rs:16:20 | LL | let end = Mine{other_val:1, ..start.make_string_bar()}; | ----- value moved here diff --git a/src/test/ui/walk-struct-literal-with.rs b/src/test/ui/walk-struct-literal-with.rs index 10503084b9d9f..31dfd58fa98d2 100644 --- a/src/test/ui/walk-struct-literal-with.rs +++ b/src/test/ui/walk-struct-literal-with.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Mine{ test: String, other_val: isize diff --git a/src/test/ui/walk-struct-literal-with.stderr b/src/test/ui/walk-struct-literal-with.stderr index 751e41f5ce9c9..9362301b4081d 100644 --- a/src/test/ui/walk-struct-literal-with.stderr +++ b/src/test/ui/walk-struct-literal-with.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `start.test` - --> $DIR/walk-struct-literal-with.rs:26:20 + --> $DIR/walk-struct-literal-with.rs:16:20 | LL | let end = Mine{other_val:1, ..start.make_string_bar()}; | ----- value moved here diff --git a/src/test/ui/warn-path-statement.rs b/src/test/ui/warn-path-statement.rs index 892d82d09345e..e8525f8b892d6 100644 --- a/src/test/ui/warn-path-statement.rs +++ b/src/test/ui/warn-path-statement.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -D path-statements fn main() { diff --git a/src/test/ui/warn-path-statement.stderr b/src/test/ui/warn-path-statement.stderr index 44b194bc62d99..55d33058c17fa 100644 --- a/src/test/ui/warn-path-statement.stderr +++ b/src/test/ui/warn-path-statement.stderr @@ -1,5 +1,5 @@ error: path statement with no effect - --> $DIR/warn-path-statement.rs:15:5 + --> $DIR/warn-path-statement.rs:5:5 | LL | x; //~ ERROR path statement with no effect | ^^ diff --git a/src/test/ui/wasm-custom-section-relocations.rs b/src/test/ui/wasm-custom-section-relocations.rs index 5631a70192afd..74d9c41fc05ad 100644 --- a/src/test/ui/wasm-custom-section-relocations.rs +++ b/src/test/ui/wasm-custom-section-relocations.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // only-wasm32 #[link_section = "test"] diff --git a/src/test/ui/wasm-import-module.rs b/src/test/ui/wasm-import-module.rs index 62b2d587c7eaf..618bf1952aa5d 100644 --- a/src/test/ui/wasm-import-module.rs +++ b/src/test/ui/wasm-import-module.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[link(name = "...", wasm_import_module)] //~ ERROR: must be of the form extern {} diff --git a/src/test/ui/wasm-import-module.stderr b/src/test/ui/wasm-import-module.stderr index 14b3055fea804..a3955bb676e93 100644 --- a/src/test/ui/wasm-import-module.stderr +++ b/src/test/ui/wasm-import-module.stderr @@ -1,17 +1,17 @@ error: must be of the form #[link(wasm_import_module = "...")] - --> $DIR/wasm-import-module.rs:11:22 + --> $DIR/wasm-import-module.rs:1:22 | LL | #[link(name = "...", wasm_import_module)] //~ ERROR: must be of the form | ^^^^^^^^^^^^^^^^^^ error: must be of the form #[link(wasm_import_module = "...")] - --> $DIR/wasm-import-module.rs:14:22 + --> $DIR/wasm-import-module.rs:4:22 | LL | #[link(name = "...", wasm_import_module(x))] //~ ERROR: must be of the form | ^^^^^^^^^^^^^^^^^^^^^ error: must be of the form #[link(wasm_import_module = "...")] - --> $DIR/wasm-import-module.rs:17:22 + --> $DIR/wasm-import-module.rs:7:22 | LL | #[link(name = "...", wasm_import_module())] //~ ERROR: must be of the form | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-array-elem-sized.rs b/src/test/ui/wf/wf-array-elem-sized.rs index 946341a1a75bb..520407d38e530 100644 --- a/src/test/ui/wf/wf-array-elem-sized.rs +++ b/src/test/ui/wf/wf-array-elem-sized.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that array elemen types must be Sized. Issue #25692. #![feature(rustc_attrs)] diff --git a/src/test/ui/wf/wf-array-elem-sized.stderr b/src/test/ui/wf/wf-array-elem-sized.stderr index 362b286142469..249a2d0930598 100644 --- a/src/test/ui/wf/wf-array-elem-sized.stderr +++ b/src/test/ui/wf/wf-array-elem-sized.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `[u8]` cannot be known at compilation time - --> $DIR/wf-array-elem-sized.rs:17:5 + --> $DIR/wf-array-elem-sized.rs:7:5 | LL | foo: [[u8]], //~ ERROR E0277 | ^^^^^^^^^^^ doesn't have a size known at compile-time diff --git a/src/test/ui/wf/wf-const-type.rs b/src/test/ui/wf/wf-const-type.rs index c3015afd8dd0d..53e89f2461e20 100644 --- a/src/test/ui/wf/wf-const-type.rs +++ b/src/test/ui/wf/wf-const-type.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we check the types of constants are well-formed. #![feature(associated_type_defaults)] diff --git a/src/test/ui/wf/wf-const-type.stderr b/src/test/ui/wf/wf-const-type.stderr index 1c07824ef77a2..61abe9ca8abda 100644 --- a/src/test/ui/wf/wf-const-type.stderr +++ b/src/test/ui/wf/wf-const-type.stderr @@ -1,12 +1,12 @@ error[E0277]: the trait bound `NotCopy: std::marker::Copy` is not satisfied - --> $DIR/wf-const-type.rs:20:1 + --> $DIR/wf-const-type.rs:10:1 | LL | const FOO: IsCopy> = IsCopy { t: None }; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `NotCopy` | = note: required because of the requirements on the impl of `std::marker::Copy` for `std::option::Option` note: required by `IsCopy` - --> $DIR/wf-const-type.rs:17:1 + --> $DIR/wf-const-type.rs:7:1 | LL | struct IsCopy { t: T } | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-enum-bound.rs b/src/test/ui/wf/wf-enum-bound.rs index e3e79fdd940af..2e40975955e9a 100644 --- a/src/test/ui/wf/wf-enum-bound.rs +++ b/src/test/ui/wf/wf-enum-bound.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we check enum bounds for WFedness. #![feature(associated_type_defaults)] diff --git a/src/test/ui/wf/wf-enum-bound.stderr b/src/test/ui/wf/wf-enum-bound.stderr index 3313eb2050878..487592dcaca62 100644 --- a/src/test/ui/wf/wf-enum-bound.stderr +++ b/src/test/ui/wf/wf-enum-bound.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `U: std::marker::Copy` is not satisfied - --> $DIR/wf-enum-bound.rs:19:1 + --> $DIR/wf-enum-bound.rs:9:1 | LL | / enum SomeEnum //~ ERROR E0277 LL | | where T: ExtraCopy @@ -10,7 +10,7 @@ LL | | } | = help: consider adding a `where U: std::marker::Copy` bound note: required by `ExtraCopy` - --> $DIR/wf-enum-bound.rs:17:1 + --> $DIR/wf-enum-bound.rs:7:1 | LL | trait ExtraCopy { } | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-enum-fields-struct-variant.rs b/src/test/ui/wf/wf-enum-fields-struct-variant.rs index 5eb53e7edde6b..b3de05f797b9e 100644 --- a/src/test/ui/wf/wf-enum-fields-struct-variant.rs +++ b/src/test/ui/wf/wf-enum-fields-struct-variant.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we check struct fields for WFedness. #![feature(associated_type_defaults)] diff --git a/src/test/ui/wf/wf-enum-fields-struct-variant.stderr b/src/test/ui/wf/wf-enum-fields-struct-variant.stderr index 86a605f073c1f..f4b8ec0c66874 100644 --- a/src/test/ui/wf/wf-enum-fields-struct-variant.stderr +++ b/src/test/ui/wf/wf-enum-fields-struct-variant.stderr @@ -1,12 +1,12 @@ error[E0277]: the trait bound `A: std::marker::Copy` is not satisfied - --> $DIR/wf-enum-fields-struct-variant.rs:23:9 + --> $DIR/wf-enum-fields-struct-variant.rs:13:9 | LL | f: IsCopy //~ ERROR E0277 | ^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `A` | = help: consider adding a `where A: std::marker::Copy` bound note: required by `IsCopy` - --> $DIR/wf-enum-fields-struct-variant.rs:17:1 + --> $DIR/wf-enum-fields-struct-variant.rs:7:1 | LL | struct IsCopy { | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-enum-fields.rs b/src/test/ui/wf/wf-enum-fields.rs index 76ad40f845768..b8b53b5290b57 100644 --- a/src/test/ui/wf/wf-enum-fields.rs +++ b/src/test/ui/wf/wf-enum-fields.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we check struct fields for WFedness. #![feature(associated_type_defaults)] diff --git a/src/test/ui/wf/wf-enum-fields.stderr b/src/test/ui/wf/wf-enum-fields.stderr index 5aa263f389a79..600dd3dc03def 100644 --- a/src/test/ui/wf/wf-enum-fields.stderr +++ b/src/test/ui/wf/wf-enum-fields.stderr @@ -1,12 +1,12 @@ error[E0277]: the trait bound `A: std::marker::Copy` is not satisfied - --> $DIR/wf-enum-fields.rs:22:17 + --> $DIR/wf-enum-fields.rs:12:17 | LL | SomeVariant(IsCopy) //~ ERROR E0277 | ^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `A` | = help: consider adding a `where A: std::marker::Copy` bound note: required by `IsCopy` - --> $DIR/wf-enum-fields.rs:17:1 + --> $DIR/wf-enum-fields.rs:7:1 | LL | struct IsCopy { | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-fn-where-clause.rs b/src/test/ui/wf/wf-fn-where-clause.rs index 3ed9e5d9f1eb5..1c01745d998fc 100644 --- a/src/test/ui/wf/wf-fn-where-clause.rs +++ b/src/test/ui/wf/wf-fn-where-clause.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we check where-clauses on fn items. #![feature(associated_type_defaults)] diff --git a/src/test/ui/wf/wf-fn-where-clause.stderr b/src/test/ui/wf/wf-fn-where-clause.stderr index 5f0f982577ee5..ddc749ce0eacd 100644 --- a/src/test/ui/wf/wf-fn-where-clause.stderr +++ b/src/test/ui/wf/wf-fn-where-clause.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `U: std::marker::Copy` is not satisfied - --> $DIR/wf-fn-where-clause.rs:19:1 + --> $DIR/wf-fn-where-clause.rs:9:1 | LL | / fn foo() where T: ExtraCopy //~ ERROR E0277 LL | | { @@ -8,7 +8,7 @@ LL | | } | = help: consider adding a `where U: std::marker::Copy` bound note: required by `ExtraCopy` - --> $DIR/wf-fn-where-clause.rs:17:1 + --> $DIR/wf-fn-where-clause.rs:7:1 | LL | trait ExtraCopy { } | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-impl-associated-type-region.rs b/src/test/ui/wf/wf-impl-associated-type-region.rs index a319b676eeb88..9f7b834d039ad 100644 --- a/src/test/ui/wf/wf-impl-associated-type-region.rs +++ b/src/test/ui/wf/wf-impl-associated-type-region.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we require that associated types in an impl are well-formed. #![feature(rustc_attrs)] diff --git a/src/test/ui/wf/wf-impl-associated-type-region.stderr b/src/test/ui/wf/wf-impl-associated-type-region.stderr index f238b3c0d135d..de7e8fa9a28af 100644 --- a/src/test/ui/wf/wf-impl-associated-type-region.stderr +++ b/src/test/ui/wf/wf-impl-associated-type-region.stderr @@ -1,5 +1,5 @@ error[E0309]: the parameter type `T` may not live long enough - --> $DIR/wf-impl-associated-type-region.rs:20:5 + --> $DIR/wf-impl-associated-type-region.rs:10:5 | LL | impl<'a, T> Foo<'a> for T { | - help: consider adding an explicit lifetime bound `T: 'a`... @@ -7,7 +7,7 @@ LL | type Bar = &'a T; //~ ERROR E0309 | ^^^^^^^^^^^^^^^^^ | note: ...so that the reference type `&'a T` does not outlive the data it points at - --> $DIR/wf-impl-associated-type-region.rs:20:5 + --> $DIR/wf-impl-associated-type-region.rs:10:5 | LL | type Bar = &'a T; //~ ERROR E0309 | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-impl-associated-type-trait.rs b/src/test/ui/wf/wf-impl-associated-type-trait.rs index 1e82f609d2a7f..3e66c7d223b98 100644 --- a/src/test/ui/wf/wf-impl-associated-type-trait.rs +++ b/src/test/ui/wf/wf-impl-associated-type-trait.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we require that associated types in an impl are well-formed. #![feature(rustc_attrs)] diff --git a/src/test/ui/wf/wf-impl-associated-type-trait.stderr b/src/test/ui/wf/wf-impl-associated-type-trait.stderr index 595c5b4d8fd73..158b55a3f4165 100644 --- a/src/test/ui/wf/wf-impl-associated-type-trait.stderr +++ b/src/test/ui/wf/wf-impl-associated-type-trait.stderr @@ -1,12 +1,12 @@ error[E0277]: the trait bound `T: MyHash` is not satisfied - --> $DIR/wf-impl-associated-type-trait.rs:27:5 + --> $DIR/wf-impl-associated-type-trait.rs:17:5 | LL | type Bar = MySet; | ^^^^^^^^^^^^^^^^^^^^ the trait `MyHash` is not implemented for `T` | = help: consider adding a `where T: MyHash` bound note: required by `MySet` - --> $DIR/wf-impl-associated-type-trait.rs:18:1 + --> $DIR/wf-impl-associated-type-trait.rs:8:1 | LL | pub struct MySet { | ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-in-fn-arg.rs b/src/test/ui/wf/wf-in-fn-arg.rs index e302cac0006b1..18df723360bf8 100644 --- a/src/test/ui/wf/wf-in-fn-arg.rs +++ b/src/test/ui/wf/wf-in-fn-arg.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we enforce WF conditions also for argument types in fn items. #![feature(rustc_attrs)] diff --git a/src/test/ui/wf/wf-in-fn-arg.stderr b/src/test/ui/wf/wf-in-fn-arg.stderr index f82bc1674dfb2..987984060e698 100644 --- a/src/test/ui/wf/wf-in-fn-arg.stderr +++ b/src/test/ui/wf/wf-in-fn-arg.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied - --> $DIR/wf-in-fn-arg.rs:20:1 + --> $DIR/wf-in-fn-arg.rs:10:1 | LL | / fn bar(_: &MustBeCopy) //~ ERROR E0277 LL | | { @@ -8,7 +8,7 @@ LL | | } | = help: consider adding a `where T: std::marker::Copy` bound note: required by `MustBeCopy` - --> $DIR/wf-in-fn-arg.rs:16:1 + --> $DIR/wf-in-fn-arg.rs:6:1 | LL | struct MustBeCopy { | ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-in-fn-ret.rs b/src/test/ui/wf/wf-in-fn-ret.rs index 719bc9282ad7d..4c9535184ff9a 100644 --- a/src/test/ui/wf/wf-in-fn-ret.rs +++ b/src/test/ui/wf/wf-in-fn-ret.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we enforce WF conditions also for return types in fn items. #![feature(rustc_attrs)] diff --git a/src/test/ui/wf/wf-in-fn-ret.stderr b/src/test/ui/wf/wf-in-fn-ret.stderr index 357199c4e31ef..81aae855b8439 100644 --- a/src/test/ui/wf/wf-in-fn-ret.stderr +++ b/src/test/ui/wf/wf-in-fn-ret.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied - --> $DIR/wf-in-fn-ret.rs:20:1 + --> $DIR/wf-in-fn-ret.rs:10:1 | LL | / fn bar() -> MustBeCopy //~ ERROR E0277 LL | | { @@ -8,7 +8,7 @@ LL | | } | = help: consider adding a `where T: std::marker::Copy` bound note: required by `MustBeCopy` - --> $DIR/wf-in-fn-ret.rs:16:1 + --> $DIR/wf-in-fn-ret.rs:6:1 | LL | struct MustBeCopy { | ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-in-fn-type-arg.rs b/src/test/ui/wf/wf-in-fn-type-arg.rs index 08ee0e954ac2d..2917a8aa98c54 100644 --- a/src/test/ui/wf/wf-in-fn-type-arg.rs +++ b/src/test/ui/wf/wf-in-fn-type-arg.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we enforce WF conditions also for types in fns. struct MustBeCopy { diff --git a/src/test/ui/wf/wf-in-fn-type-arg.stderr b/src/test/ui/wf/wf-in-fn-type-arg.stderr index 7e3d22b262c4b..e60529dba1ed2 100644 --- a/src/test/ui/wf/wf-in-fn-type-arg.stderr +++ b/src/test/ui/wf/wf-in-fn-type-arg.stderr @@ -1,12 +1,12 @@ error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied - --> $DIR/wf-in-fn-type-arg.rs:19:5 + --> $DIR/wf-in-fn-type-arg.rs:9:5 | LL | x: fn(MustBeCopy) //~ ERROR E0277 | ^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `T` | = help: consider adding a `where T: std::marker::Copy` bound note: required by `MustBeCopy` - --> $DIR/wf-in-fn-type-arg.rs:13:1 + --> $DIR/wf-in-fn-type-arg.rs:3:1 | LL | struct MustBeCopy { | ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-in-fn-type-ret.rs b/src/test/ui/wf/wf-in-fn-type-ret.rs index 6942f78606060..ab8e697e3b966 100644 --- a/src/test/ui/wf/wf-in-fn-type-ret.rs +++ b/src/test/ui/wf/wf-in-fn-type-ret.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we enforce WF conditions also for types in fns. struct MustBeCopy { diff --git a/src/test/ui/wf/wf-in-fn-type-ret.stderr b/src/test/ui/wf/wf-in-fn-type-ret.stderr index 5d592532d2830..9f18a00926d7b 100644 --- a/src/test/ui/wf/wf-in-fn-type-ret.stderr +++ b/src/test/ui/wf/wf-in-fn-type-ret.stderr @@ -1,12 +1,12 @@ error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied - --> $DIR/wf-in-fn-type-ret.rs:19:5 + --> $DIR/wf-in-fn-type-ret.rs:9:5 | LL | x: fn() -> MustBeCopy //~ ERROR E0277 | ^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `T` | = help: consider adding a `where T: std::marker::Copy` bound note: required by `MustBeCopy` - --> $DIR/wf-in-fn-type-ret.rs:13:1 + --> $DIR/wf-in-fn-type-ret.rs:3:1 | LL | struct MustBeCopy { | ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-in-fn-type-static.rs b/src/test/ui/wf/wf-in-fn-type-static.rs index 8e3bca0975813..cb4a5d8771670 100644 --- a/src/test/ui/wf/wf-in-fn-type-static.rs +++ b/src/test/ui/wf/wf-in-fn-type-static.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we enforce WF conditions related to regions also for // types in fns. diff --git a/src/test/ui/wf/wf-in-fn-type-static.stderr b/src/test/ui/wf/wf-in-fn-type-static.stderr index 0013331f0100b..1fabfb04adde3 100644 --- a/src/test/ui/wf/wf-in-fn-type-static.stderr +++ b/src/test/ui/wf/wf-in-fn-type-static.stderr @@ -1,5 +1,5 @@ error[E0310]: the parameter type `T` may not live long enough - --> $DIR/wf-in-fn-type-static.rs:23:5 + --> $DIR/wf-in-fn-type-static.rs:13:5 | LL | struct Foo { | - help: consider adding an explicit lifetime bound `T: 'static`... @@ -8,13 +8,13 @@ LL | x: fn() -> &'static T //~ ERROR E0310 | ^^^^^^^^^^^^^^^^^^^^^ | note: ...so that the reference type `&'static T` does not outlive the data it points at - --> $DIR/wf-in-fn-type-static.rs:23:5 + --> $DIR/wf-in-fn-type-static.rs:13:5 | LL | x: fn() -> &'static T //~ ERROR E0310 | ^^^^^^^^^^^^^^^^^^^^^ error[E0310]: the parameter type `T` may not live long enough - --> $DIR/wf-in-fn-type-static.rs:28:5 + --> $DIR/wf-in-fn-type-static.rs:18:5 | LL | struct Bar { | - help: consider adding an explicit lifetime bound `T: 'static`... @@ -23,7 +23,7 @@ LL | x: fn(&'static T) //~ ERROR E0310 | ^^^^^^^^^^^^^^^^^ | note: ...so that the reference type `&'static T` does not outlive the data it points at - --> $DIR/wf-in-fn-type-static.rs:28:5 + --> $DIR/wf-in-fn-type-static.rs:18:5 | LL | x: fn(&'static T) //~ ERROR E0310 | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-in-fn-where-clause.rs b/src/test/ui/wf/wf-in-fn-where-clause.rs index c2f66a2a460c5..4e68e8c11d157 100644 --- a/src/test/ui/wf/wf-in-fn-where-clause.rs +++ b/src/test/ui/wf/wf-in-fn-where-clause.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we enforce WF conditions also for where clauses in fn items. #![feature(rustc_attrs)] diff --git a/src/test/ui/wf/wf-in-fn-where-clause.stderr b/src/test/ui/wf/wf-in-fn-where-clause.stderr index 76693eace2f84..8d6700e357145 100644 --- a/src/test/ui/wf/wf-in-fn-where-clause.stderr +++ b/src/test/ui/wf/wf-in-fn-where-clause.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `U: std::marker::Copy` is not satisfied - --> $DIR/wf-in-fn-where-clause.rs:19:1 + --> $DIR/wf-in-fn-where-clause.rs:9:1 | LL | / fn bar() //~ ERROR E0277 LL | | where T: MustBeCopy @@ -9,7 +9,7 @@ LL | | } | = help: consider adding a `where U: std::marker::Copy` bound note: required by `MustBeCopy` - --> $DIR/wf-in-fn-where-clause.rs:16:1 + --> $DIR/wf-in-fn-where-clause.rs:6:1 | LL | trait MustBeCopy { | ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-in-obj-type-static.rs b/src/test/ui/wf/wf-in-obj-type-static.rs index 11535fb9f9e45..b534b70ad31da 100644 --- a/src/test/ui/wf/wf-in-obj-type-static.rs +++ b/src/test/ui/wf/wf-in-obj-type-static.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we enforce WF conditions also for types in fns. #![feature(rustc_attrs)] diff --git a/src/test/ui/wf/wf-in-obj-type-static.stderr b/src/test/ui/wf/wf-in-obj-type-static.stderr index 5cbb4be7e92d6..9e0628e3ec610 100644 --- a/src/test/ui/wf/wf-in-obj-type-static.stderr +++ b/src/test/ui/wf/wf-in-obj-type-static.stderr @@ -1,5 +1,5 @@ error[E0310]: the parameter type `T` may not live long enough - --> $DIR/wf-in-obj-type-static.rs:24:5 + --> $DIR/wf-in-obj-type-static.rs:14:5 | LL | struct Foo { | - help: consider adding an explicit lifetime bound `T: 'static`... @@ -8,7 +8,7 @@ LL | x: Object<&'static T> //~ ERROR E0310 | ^^^^^^^^^^^^^^^^^^^^^ | note: ...so that the reference type `&'static T` does not outlive the data it points at - --> $DIR/wf-in-obj-type-static.rs:24:5 + --> $DIR/wf-in-obj-type-static.rs:14:5 | LL | x: Object<&'static T> //~ ERROR E0310 | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-in-obj-type-trait.rs b/src/test/ui/wf/wf-in-obj-type-trait.rs index add48219c1d7e..fad1da199ea91 100644 --- a/src/test/ui/wf/wf-in-obj-type-trait.rs +++ b/src/test/ui/wf/wf-in-obj-type-trait.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we enforce WF conditions also for types in fns. trait Object { } diff --git a/src/test/ui/wf/wf-in-obj-type-trait.stderr b/src/test/ui/wf/wf-in-obj-type-trait.stderr index 93af991cc93e0..a4a14817d3f76 100644 --- a/src/test/ui/wf/wf-in-obj-type-trait.stderr +++ b/src/test/ui/wf/wf-in-obj-type-trait.stderr @@ -1,12 +1,12 @@ error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied - --> $DIR/wf-in-obj-type-trait.rs:21:5 + --> $DIR/wf-in-obj-type-trait.rs:11:5 | LL | x: Object> //~ ERROR E0277 | ^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `T` | = help: consider adding a `where T: std::marker::Copy` bound note: required by `MustBeCopy` - --> $DIR/wf-in-obj-type-trait.rs:15:1 + --> $DIR/wf-in-obj-type-trait.rs:5:1 | LL | struct MustBeCopy { | ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-inherent-impl-method-where-clause.rs b/src/test/ui/wf/wf-inherent-impl-method-where-clause.rs index 78e12c47e24de..bed9e7c6ae1c5 100644 --- a/src/test/ui/wf/wf-inherent-impl-method-where-clause.rs +++ b/src/test/ui/wf/wf-inherent-impl-method-where-clause.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we check where-clauses on inherent impl methods. #![feature(associated_type_defaults)] diff --git a/src/test/ui/wf/wf-inherent-impl-method-where-clause.stderr b/src/test/ui/wf/wf-inherent-impl-method-where-clause.stderr index 25ec4195ab191..ba9d3d7877dda 100644 --- a/src/test/ui/wf/wf-inherent-impl-method-where-clause.stderr +++ b/src/test/ui/wf/wf-inherent-impl-method-where-clause.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `U: std::marker::Copy` is not satisfied - --> $DIR/wf-inherent-impl-method-where-clause.rs:22:5 + --> $DIR/wf-inherent-impl-method-where-clause.rs:12:5 | LL | / fn foo(self) where T: ExtraCopy //~ ERROR E0277 LL | | {} @@ -7,7 +7,7 @@ LL | | {} | = help: consider adding a `where U: std::marker::Copy` bound note: required by `ExtraCopy` - --> $DIR/wf-inherent-impl-method-where-clause.rs:17:1 + --> $DIR/wf-inherent-impl-method-where-clause.rs:7:1 | LL | trait ExtraCopy { } | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-inherent-impl-where-clause.rs b/src/test/ui/wf/wf-inherent-impl-where-clause.rs index 7edbb11e24520..8971c3cd95495 100644 --- a/src/test/ui/wf/wf-inherent-impl-where-clause.rs +++ b/src/test/ui/wf/wf-inherent-impl-where-clause.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we check where-clauses on inherent impls. #![feature(associated_type_defaults)] diff --git a/src/test/ui/wf/wf-inherent-impl-where-clause.stderr b/src/test/ui/wf/wf-inherent-impl-where-clause.stderr index 3c5c557db429e..2ed9cc56f94ab 100644 --- a/src/test/ui/wf/wf-inherent-impl-where-clause.stderr +++ b/src/test/ui/wf/wf-inherent-impl-where-clause.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `U: std::marker::Copy` is not satisfied - --> $DIR/wf-inherent-impl-where-clause.rs:21:1 + --> $DIR/wf-inherent-impl-where-clause.rs:11:1 | LL | / impl Foo where T: ExtraCopy //~ ERROR E0277 LL | | { @@ -8,7 +8,7 @@ LL | | } | = help: consider adding a `where U: std::marker::Copy` bound note: required by `ExtraCopy` - --> $DIR/wf-inherent-impl-where-clause.rs:17:1 + --> $DIR/wf-inherent-impl-where-clause.rs:7:1 | LL | trait ExtraCopy { } | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-misc-methods-issue-28609.nll.stderr b/src/test/ui/wf/wf-misc-methods-issue-28609.nll.stderr index 48a68bf5749f9..ee55f718d018a 100644 --- a/src/test/ui/wf/wf-misc-methods-issue-28609.nll.stderr +++ b/src/test/ui/wf/wf-misc-methods-issue-28609.nll.stderr @@ -1,13 +1,13 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/wf-misc-methods-issue-28609.rs:32:31 + --> $DIR/wf-misc-methods-issue-28609.rs:22:31 | LL | s.transmute_inherent(&mut 42) //~ ERROR does not live long enough | ^^ temporary value does not live long enough LL | } | - temporary value only lives until here | -note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 30:1... - --> $DIR/wf-misc-methods-issue-28609.rs:30:1 +note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 20:1... + --> $DIR/wf-misc-methods-issue-28609.rs:20:1 | LL | / fn return_dangling_pointer_inherent(s: S2) -> &u32 { LL | | let s = s; @@ -16,7 +16,7 @@ LL | | } | |_^ error[E0597]: `four` does not live long enough - --> $DIR/wf-misc-methods-issue-28609.rs:45:19 + --> $DIR/wf-misc-methods-issue-28609.rs:35:19 | LL | s.bomb = Some(&four); //~ ERROR does not live long enough | ^^^^^ borrowed value does not live long enough @@ -24,8 +24,8 @@ LL | &s LL | } | - `four` dropped here while still borrowed | -note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 42:1... - --> $DIR/wf-misc-methods-issue-28609.rs:42:1 +note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 32:1... + --> $DIR/wf-misc-methods-issue-28609.rs:32:1 | LL | / fn return_dangling_pointer_coerce(s: S2) -> &u32 { LL | | let four = 4; @@ -36,7 +36,7 @@ LL | | } | |_^ error[E0597]: `four` does not live long enough - --> $DIR/wf-misc-methods-issue-28609.rs:52:19 + --> $DIR/wf-misc-methods-issue-28609.rs:42:19 | LL | s.bomb = Some(&four); //~ ERROR does not live long enough | ^^^^^ borrowed value does not live long enough @@ -44,8 +44,8 @@ LL | &*s LL | } | - `four` dropped here while still borrowed | -note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 49:1... - --> $DIR/wf-misc-methods-issue-28609.rs:49:1 +note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 39:1... + --> $DIR/wf-misc-methods-issue-28609.rs:39:1 | LL | / fn return_dangling_pointer_unary_op(s: S2) -> &u32 { LL | | let four = 4; @@ -56,15 +56,15 @@ LL | | } | |_^ error[E0597]: borrowed value does not live long enough - --> $DIR/wf-misc-methods-issue-28609.rs:63:15 + --> $DIR/wf-misc-methods-issue-28609.rs:53:15 | LL | s << &mut 3 //~ ERROR does not live long enough | ^ temporary value does not live long enough LL | } | - temporary value only lives until here | -note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 61:1... - --> $DIR/wf-misc-methods-issue-28609.rs:61:1 +note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 51:1... + --> $DIR/wf-misc-methods-issue-28609.rs:51:1 | LL | / fn return_dangling_pointer_binary_op(s: S2) -> &u32 { LL | | let s = s; @@ -73,15 +73,15 @@ LL | | } | |_^ error[E0597]: borrowed value does not live long enough - --> $DIR/wf-misc-methods-issue-28609.rs:68:16 + --> $DIR/wf-misc-methods-issue-28609.rs:58:16 | LL | s.shl(&mut 3) //~ ERROR does not live long enough | ^ temporary value does not live long enough LL | } | - temporary value only lives until here | -note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 66:1... - --> $DIR/wf-misc-methods-issue-28609.rs:66:1 +note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 56:1... + --> $DIR/wf-misc-methods-issue-28609.rs:56:1 | LL | / fn return_dangling_pointer_method(s: S2) -> &u32 { LL | | let s = s; @@ -90,15 +90,15 @@ LL | | } | |_^ error[E0597]: borrowed value does not live long enough - --> $DIR/wf-misc-methods-issue-28609.rs:73:21 + --> $DIR/wf-misc-methods-issue-28609.rs:63:21 | LL | S2::shl(s, &mut 3) //~ ERROR does not live long enough | ^ temporary value does not live long enough LL | } | - temporary value only lives until here | -note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 71:1... - --> $DIR/wf-misc-methods-issue-28609.rs:71:1 +note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 61:1... + --> $DIR/wf-misc-methods-issue-28609.rs:61:1 | LL | / fn return_dangling_pointer_ufcs(s: S2) -> &u32 { LL | | let s = s; diff --git a/src/test/ui/wf/wf-misc-methods-issue-28609.rs b/src/test/ui/wf/wf-misc-methods-issue-28609.rs index 055c86a03a7e6..505d7d75d5398 100644 --- a/src/test/ui/wf/wf-misc-methods-issue-28609.rs +++ b/src/test/ui/wf/wf-misc-methods-issue-28609.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // check that misc. method calls are well-formed use std::marker::PhantomData; diff --git a/src/test/ui/wf/wf-misc-methods-issue-28609.stderr b/src/test/ui/wf/wf-misc-methods-issue-28609.stderr index 352697e6f9490..46dc4dc8870da 100644 --- a/src/test/ui/wf/wf-misc-methods-issue-28609.stderr +++ b/src/test/ui/wf/wf-misc-methods-issue-28609.stderr @@ -1,13 +1,13 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/wf-misc-methods-issue-28609.rs:32:31 + --> $DIR/wf-misc-methods-issue-28609.rs:22:31 | LL | s.transmute_inherent(&mut 42) //~ ERROR does not live long enough | ^^ temporary value does not live long enough LL | } | - temporary value only lives until here | -note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 30:1... - --> $DIR/wf-misc-methods-issue-28609.rs:30:1 +note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 20:1... + --> $DIR/wf-misc-methods-issue-28609.rs:20:1 | LL | / fn return_dangling_pointer_inherent(s: S2) -> &u32 { LL | | let s = s; @@ -16,7 +16,7 @@ LL | | } | |_^ error[E0597]: `four` does not live long enough - --> $DIR/wf-misc-methods-issue-28609.rs:45:20 + --> $DIR/wf-misc-methods-issue-28609.rs:35:20 | LL | s.bomb = Some(&four); //~ ERROR does not live long enough | ^^^^ borrowed value does not live long enough @@ -24,8 +24,8 @@ LL | &s LL | } | - borrowed value only lives until here | -note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 42:1... - --> $DIR/wf-misc-methods-issue-28609.rs:42:1 +note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 32:1... + --> $DIR/wf-misc-methods-issue-28609.rs:32:1 | LL | / fn return_dangling_pointer_coerce(s: S2) -> &u32 { LL | | let four = 4; @@ -36,7 +36,7 @@ LL | | } | |_^ error[E0597]: `four` does not live long enough - --> $DIR/wf-misc-methods-issue-28609.rs:52:20 + --> $DIR/wf-misc-methods-issue-28609.rs:42:20 | LL | s.bomb = Some(&four); //~ ERROR does not live long enough | ^^^^ borrowed value does not live long enough @@ -44,8 +44,8 @@ LL | &*s LL | } | - borrowed value only lives until here | -note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 49:1... - --> $DIR/wf-misc-methods-issue-28609.rs:49:1 +note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 39:1... + --> $DIR/wf-misc-methods-issue-28609.rs:39:1 | LL | / fn return_dangling_pointer_unary_op(s: S2) -> &u32 { LL | | let four = 4; @@ -56,15 +56,15 @@ LL | | } | |_^ error[E0597]: borrowed value does not live long enough - --> $DIR/wf-misc-methods-issue-28609.rs:63:15 + --> $DIR/wf-misc-methods-issue-28609.rs:53:15 | LL | s << &mut 3 //~ ERROR does not live long enough | ^ temporary value does not live long enough LL | } | - temporary value only lives until here | -note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 61:1... - --> $DIR/wf-misc-methods-issue-28609.rs:61:1 +note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 51:1... + --> $DIR/wf-misc-methods-issue-28609.rs:51:1 | LL | / fn return_dangling_pointer_binary_op(s: S2) -> &u32 { LL | | let s = s; @@ -73,15 +73,15 @@ LL | | } | |_^ error[E0597]: borrowed value does not live long enough - --> $DIR/wf-misc-methods-issue-28609.rs:68:16 + --> $DIR/wf-misc-methods-issue-28609.rs:58:16 | LL | s.shl(&mut 3) //~ ERROR does not live long enough | ^ temporary value does not live long enough LL | } | - temporary value only lives until here | -note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 66:1... - --> $DIR/wf-misc-methods-issue-28609.rs:66:1 +note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 56:1... + --> $DIR/wf-misc-methods-issue-28609.rs:56:1 | LL | / fn return_dangling_pointer_method(s: S2) -> &u32 { LL | | let s = s; @@ -90,15 +90,15 @@ LL | | } | |_^ error[E0597]: borrowed value does not live long enough - --> $DIR/wf-misc-methods-issue-28609.rs:73:21 + --> $DIR/wf-misc-methods-issue-28609.rs:63:21 | LL | S2::shl(s, &mut 3) //~ ERROR does not live long enough | ^ temporary value does not live long enough LL | } | - temporary value only lives until here | -note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 71:1... - --> $DIR/wf-misc-methods-issue-28609.rs:71:1 +note: borrowed value must be valid for the anonymous lifetime #1 defined on the function body at 61:1... + --> $DIR/wf-misc-methods-issue-28609.rs:61:1 | LL | / fn return_dangling_pointer_ufcs(s: S2) -> &u32 { LL | | let s = s; diff --git a/src/test/ui/wf/wf-object-safe.rs b/src/test/ui/wf/wf-object-safe.rs index 92c0a8c5be8af..08f68f6c004fa 100644 --- a/src/test/ui/wf/wf-object-safe.rs +++ b/src/test/ui/wf/wf-object-safe.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that object-safe traits are not WF when used as object types. // Issue #21953. diff --git a/src/test/ui/wf/wf-object-safe.stderr b/src/test/ui/wf/wf-object-safe.stderr index 3d42c52136bae..2a514d9d2c2b9 100644 --- a/src/test/ui/wf/wf-object-safe.stderr +++ b/src/test/ui/wf/wf-object-safe.stderr @@ -1,5 +1,5 @@ error[E0038]: the trait `A` cannot be made into an object - --> $DIR/wf-object-safe.rs:19:13 + --> $DIR/wf-object-safe.rs:9:13 | LL | let _x: &A; //~ ERROR E0038 | ^^ the trait `A` cannot be made into an object diff --git a/src/test/ui/wf/wf-outlives-ty-in-fn-or-trait.rs b/src/test/ui/wf/wf-outlives-ty-in-fn-or-trait.rs index c11b2e4c544e1..9118149952753 100644 --- a/src/test/ui/wf/wf-outlives-ty-in-fn-or-trait.rs +++ b/src/test/ui/wf/wf-outlives-ty-in-fn-or-trait.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that an appearance of `T` in fn args or in a trait object must // still meet the outlives bounds. Since this is a new requirement, // this is currently only a warning, not a hard error. diff --git a/src/test/ui/wf/wf-outlives-ty-in-fn-or-trait.stderr b/src/test/ui/wf/wf-outlives-ty-in-fn-or-trait.stderr index 9a8c63126f28e..8a8187369a735 100644 --- a/src/test/ui/wf/wf-outlives-ty-in-fn-or-trait.stderr +++ b/src/test/ui/wf/wf-outlives-ty-in-fn-or-trait.stderr @@ -1,5 +1,5 @@ error[E0309]: the parameter type `T` may not live long enough - --> $DIR/wf-outlives-ty-in-fn-or-trait.rs:21:5 + --> $DIR/wf-outlives-ty-in-fn-or-trait.rs:11:5 | LL | struct Foo<'a,T> { | - help: consider adding an explicit lifetime bound `T: 'a`... @@ -7,13 +7,13 @@ LL | f: &'a fn(T), | ^^^^^^^^^^^^ | note: ...so that the reference type `&'a fn(T)` does not outlive the data it points at - --> $DIR/wf-outlives-ty-in-fn-or-trait.rs:21:5 + --> $DIR/wf-outlives-ty-in-fn-or-trait.rs:11:5 | LL | f: &'a fn(T), | ^^^^^^^^^^^^ error[E0309]: the parameter type `T` may not live long enough - --> $DIR/wf-outlives-ty-in-fn-or-trait.rs:26:5 + --> $DIR/wf-outlives-ty-in-fn-or-trait.rs:16:5 | LL | struct Bar<'a,T> { | - help: consider adding an explicit lifetime bound `T: 'a`... @@ -21,7 +21,7 @@ LL | f: &'a Trait, | ^^^^^^^^^^^^^^^ | note: ...so that the reference type `&'a (dyn Trait + 'a)` does not outlive the data it points at - --> $DIR/wf-outlives-ty-in-fn-or-trait.rs:26:5 + --> $DIR/wf-outlives-ty-in-fn-or-trait.rs:16:5 | LL | f: &'a Trait, | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-static-method.nll.stderr b/src/test/ui/wf/wf-static-method.nll.stderr index e563a4ffc5689..8428f11e1f0c2 100644 --- a/src/test/ui/wf/wf-static-method.nll.stderr +++ b/src/test/ui/wf/wf-static-method.nll.stderr @@ -1,35 +1,35 @@ warning: not reporting region error due to nll - --> $DIR/wf-static-method.rs:27:9 + --> $DIR/wf-static-method.rs:17:9 | LL | u //~ ERROR E0312 | ^ warning: not reporting region error due to nll - --> $DIR/wf-static-method.rs:36:18 + --> $DIR/wf-static-method.rs:26:18 | LL | let me = Self::make_me(); //~ ERROR lifetime bound not satisfied | ^^^^^^^^^^^^^ warning: not reporting region error due to nll - --> $DIR/wf-static-method.rs:43:9 + --> $DIR/wf-static-method.rs:33:9 | LL | u //~ ERROR E0312 | ^ warning: not reporting region error due to nll - --> $DIR/wf-static-method.rs:51:5 + --> $DIR/wf-static-method.rs:41:5 | LL | <()>::static_evil(b) //~ ERROR cannot infer an appropriate lifetime | ^^^^^^^^^^^^^^^^^ warning: not reporting region error due to nll - --> $DIR/wf-static-method.rs:55:5 + --> $DIR/wf-static-method.rs:45:5 | LL | ::static_evil(b) | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: unsatisfied lifetime constraints - --> $DIR/wf-static-method.rs:27:9 + --> $DIR/wf-static-method.rs:17:9 | LL | impl<'a, 'b> Foo<'a, 'b, Evil<'a, 'b>> for () { | -- -- lifetime `'b` defined here @@ -40,7 +40,7 @@ LL | u //~ ERROR E0312 | ^ returning this value requires that `'b` must outlive `'a` error: unsatisfied lifetime constraints - --> $DIR/wf-static-method.rs:43:9 + --> $DIR/wf-static-method.rs:33:9 | LL | impl<'a, 'b> Evil<'a, 'b> { | -- -- lifetime `'b` defined here diff --git a/src/test/ui/wf/wf-static-method.rs b/src/test/ui/wf/wf-static-method.rs index e99957c791427..e5a1092175d0d 100644 --- a/src/test/ui/wf/wf-static-method.rs +++ b/src/test/ui/wf/wf-static-method.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // check that static methods don't get to assume their trait-ref // is well-formed. // FIXME(#27579): this is just a bug. However, our checking with diff --git a/src/test/ui/wf/wf-static-method.stderr b/src/test/ui/wf/wf-static-method.stderr index 0de2d8e6ca056..78ea903e699c3 100644 --- a/src/test/ui/wf/wf-static-method.stderr +++ b/src/test/ui/wf/wf-static-method.stderr @@ -1,104 +1,104 @@ error[E0312]: lifetime of reference outlives lifetime of borrowed content... - --> $DIR/wf-static-method.rs:27:9 + --> $DIR/wf-static-method.rs:17:9 | LL | u //~ ERROR E0312 | ^ | -note: ...the reference is valid for the lifetime 'a as defined on the impl at 24:6... - --> $DIR/wf-static-method.rs:24:6 +note: ...the reference is valid for the lifetime 'a as defined on the impl at 14:6... + --> $DIR/wf-static-method.rs:14:6 | LL | impl<'a, 'b> Foo<'a, 'b, Evil<'a, 'b>> for () { | ^^ -note: ...but the borrowed content is only valid for the lifetime 'b as defined on the impl at 24:10 - --> $DIR/wf-static-method.rs:24:10 +note: ...but the borrowed content is only valid for the lifetime 'b as defined on the impl at 14:10 + --> $DIR/wf-static-method.rs:14:10 | LL | impl<'a, 'b> Foo<'a, 'b, Evil<'a, 'b>> for () { | ^^ error[E0478]: lifetime bound not satisfied - --> $DIR/wf-static-method.rs:36:18 + --> $DIR/wf-static-method.rs:26:18 | LL | let me = Self::make_me(); //~ ERROR lifetime bound not satisfied | ^^^^^^^^^^^^^ | -note: lifetime parameter instantiated with the lifetime 'b as defined on the impl at 33:10 - --> $DIR/wf-static-method.rs:33:10 +note: lifetime parameter instantiated with the lifetime 'b as defined on the impl at 23:10 + --> $DIR/wf-static-method.rs:23:10 | LL | impl<'a, 'b> Foo<'a, 'b, ()> for IndirectEvil<'a, 'b> { | ^^ -note: but lifetime parameter must outlive the lifetime 'a as defined on the impl at 33:6 - --> $DIR/wf-static-method.rs:33:6 +note: but lifetime parameter must outlive the lifetime 'a as defined on the impl at 23:6 + --> $DIR/wf-static-method.rs:23:6 | LL | impl<'a, 'b> Foo<'a, 'b, ()> for IndirectEvil<'a, 'b> { | ^^ error[E0312]: lifetime of reference outlives lifetime of borrowed content... - --> $DIR/wf-static-method.rs:43:9 + --> $DIR/wf-static-method.rs:33:9 | LL | u //~ ERROR E0312 | ^ | -note: ...the reference is valid for the lifetime 'a as defined on the impl at 41:6... - --> $DIR/wf-static-method.rs:41:6 +note: ...the reference is valid for the lifetime 'a as defined on the impl at 31:6... + --> $DIR/wf-static-method.rs:31:6 | LL | impl<'a, 'b> Evil<'a, 'b> { | ^^ -note: ...but the borrowed content is only valid for the lifetime 'b as defined on the impl at 41:10 - --> $DIR/wf-static-method.rs:41:10 +note: ...but the borrowed content is only valid for the lifetime 'b as defined on the impl at 31:10 + --> $DIR/wf-static-method.rs:31:10 | LL | impl<'a, 'b> Evil<'a, 'b> { | ^^ error[E0495]: cannot infer an appropriate lifetime for lifetime parameter `'b` due to conflicting requirements - --> $DIR/wf-static-method.rs:51:5 + --> $DIR/wf-static-method.rs:41:5 | LL | <()>::static_evil(b) //~ ERROR cannot infer an appropriate lifetime | ^^^^^^^^^^^^^^^^^ | -note: first, the lifetime cannot outlive the lifetime 'b as defined on the function body at 50:13... - --> $DIR/wf-static-method.rs:50:13 +note: first, the lifetime cannot outlive the lifetime 'b as defined on the function body at 40:13... + --> $DIR/wf-static-method.rs:40:13 | LL | fn evil<'a, 'b>(b: &'b u32) -> &'a u32 { | ^^ note: ...so that reference does not outlive borrowed content - --> $DIR/wf-static-method.rs:51:23 + --> $DIR/wf-static-method.rs:41:23 | LL | <()>::static_evil(b) //~ ERROR cannot infer an appropriate lifetime | ^ -note: but, the lifetime must be valid for the lifetime 'a as defined on the function body at 50:9... - --> $DIR/wf-static-method.rs:50:9 +note: but, the lifetime must be valid for the lifetime 'a as defined on the function body at 40:9... + --> $DIR/wf-static-method.rs:40:9 | LL | fn evil<'a, 'b>(b: &'b u32) -> &'a u32 { | ^^ note: ...so that reference does not outlive borrowed content - --> $DIR/wf-static-method.rs:51:5 + --> $DIR/wf-static-method.rs:41:5 | LL | <()>::static_evil(b) //~ ERROR cannot infer an appropriate lifetime | ^^^^^^^^^^^^^^^^^^^^ error[E0495]: cannot infer an appropriate lifetime for lifetime parameter `'b` due to conflicting requirements - --> $DIR/wf-static-method.rs:55:5 + --> $DIR/wf-static-method.rs:45:5 | LL | ::static_evil(b) | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ | -note: first, the lifetime cannot outlive the lifetime 'b as defined on the function body at 54:22... - --> $DIR/wf-static-method.rs:54:22 +note: first, the lifetime cannot outlive the lifetime 'b as defined on the function body at 44:22... + --> $DIR/wf-static-method.rs:44:22 | LL | fn indirect_evil<'a, 'b>(b: &'b u32) -> &'a u32 { | ^^ note: ...so that reference does not outlive borrowed content - --> $DIR/wf-static-method.rs:55:33 + --> $DIR/wf-static-method.rs:45:33 | LL | ::static_evil(b) | ^ -note: but, the lifetime must be valid for the lifetime 'a as defined on the function body at 54:18... - --> $DIR/wf-static-method.rs:54:18 +note: but, the lifetime must be valid for the lifetime 'a as defined on the function body at 44:18... + --> $DIR/wf-static-method.rs:44:18 | LL | fn indirect_evil<'a, 'b>(b: &'b u32) -> &'a u32 { | ^^ note: ...so that reference does not outlive borrowed content - --> $DIR/wf-static-method.rs:55:5 + --> $DIR/wf-static-method.rs:45:5 | LL | ::static_evil(b) | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-static-type.rs b/src/test/ui/wf/wf-static-type.rs index ba02c5dca3e6d..11851c5e75ed1 100644 --- a/src/test/ui/wf/wf-static-type.rs +++ b/src/test/ui/wf/wf-static-type.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we check the types of statics are well-formed. #![feature(associated_type_defaults)] diff --git a/src/test/ui/wf/wf-static-type.stderr b/src/test/ui/wf/wf-static-type.stderr index f76444cfe1fef..532ccad45eacb 100644 --- a/src/test/ui/wf/wf-static-type.stderr +++ b/src/test/ui/wf/wf-static-type.stderr @@ -1,12 +1,12 @@ error[E0277]: the trait bound `NotCopy: std::marker::Copy` is not satisfied - --> $DIR/wf-static-type.rs:20:1 + --> $DIR/wf-static-type.rs:10:1 | LL | static FOO: IsCopy> = IsCopy { t: None }; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `NotCopy` | = note: required because of the requirements on the impl of `std::marker::Copy` for `std::option::Option` note: required by `IsCopy` - --> $DIR/wf-static-type.rs:17:1 + --> $DIR/wf-static-type.rs:7:1 | LL | struct IsCopy { t: T } | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-struct-bound.rs b/src/test/ui/wf/wf-struct-bound.rs index e263b251aa379..88d437ce3745b 100644 --- a/src/test/ui/wf/wf-struct-bound.rs +++ b/src/test/ui/wf/wf-struct-bound.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we check struct bounds for WFedness. #![feature(associated_type_defaults)] diff --git a/src/test/ui/wf/wf-struct-bound.stderr b/src/test/ui/wf/wf-struct-bound.stderr index 397d8609ceb05..37defb87ee524 100644 --- a/src/test/ui/wf/wf-struct-bound.stderr +++ b/src/test/ui/wf/wf-struct-bound.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `U: std::marker::Copy` is not satisfied - --> $DIR/wf-struct-bound.rs:19:1 + --> $DIR/wf-struct-bound.rs:9:1 | LL | / struct SomeStruct //~ ERROR E0277 LL | | where T: ExtraCopy @@ -10,7 +10,7 @@ LL | | } | = help: consider adding a `where U: std::marker::Copy` bound note: required by `ExtraCopy` - --> $DIR/wf-struct-bound.rs:17:1 + --> $DIR/wf-struct-bound.rs:7:1 | LL | trait ExtraCopy { } | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-struct-field.rs b/src/test/ui/wf/wf-struct-field.rs index 8a631a6c335a0..51ab3ac7b8f5d 100644 --- a/src/test/ui/wf/wf-struct-field.rs +++ b/src/test/ui/wf/wf-struct-field.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we check struct fields for WFedness. #![feature(associated_type_defaults)] diff --git a/src/test/ui/wf/wf-struct-field.stderr b/src/test/ui/wf/wf-struct-field.stderr index 48a03c71d7dbb..e31552b408954 100644 --- a/src/test/ui/wf/wf-struct-field.stderr +++ b/src/test/ui/wf/wf-struct-field.stderr @@ -1,12 +1,12 @@ error[E0277]: the trait bound `A: std::marker::Copy` is not satisfied - --> $DIR/wf-struct-field.rs:22:5 + --> $DIR/wf-struct-field.rs:12:5 | LL | data: IsCopy //~ ERROR E0277 | ^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `A` | = help: consider adding a `where A: std::marker::Copy` bound note: required by `IsCopy` - --> $DIR/wf-struct-field.rs:17:1 + --> $DIR/wf-struct-field.rs:7:1 | LL | struct IsCopy { | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-trait-associated-type-bound.rs b/src/test/ui/wf/wf-trait-associated-type-bound.rs index 8420edd66a180..c8674c7c99f4b 100644 --- a/src/test/ui/wf/wf-trait-associated-type-bound.rs +++ b/src/test/ui/wf/wf-trait-associated-type-bound.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we check associated type bounds for WFedness. #![feature(associated_type_defaults)] diff --git a/src/test/ui/wf/wf-trait-associated-type-bound.stderr b/src/test/ui/wf/wf-trait-associated-type-bound.stderr index f09ba381db14a..f8ba74a2fdc3e 100644 --- a/src/test/ui/wf/wf-trait-associated-type-bound.stderr +++ b/src/test/ui/wf/wf-trait-associated-type-bound.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied - --> $DIR/wf-trait-associated-type-bound.rs:19:1 + --> $DIR/wf-trait-associated-type-bound.rs:9:1 | LL | / trait SomeTrait { //~ ERROR E0277 LL | | type Type1: ExtraCopy; @@ -8,7 +8,7 @@ LL | | } | = help: consider adding a `where T: std::marker::Copy` bound note: required by `ExtraCopy` - --> $DIR/wf-trait-associated-type-bound.rs:17:1 + --> $DIR/wf-trait-associated-type-bound.rs:7:1 | LL | trait ExtraCopy { } | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-trait-associated-type-region.rs b/src/test/ui/wf/wf-trait-associated-type-region.rs index 95d9ffdf9d359..cd97a32896c98 100644 --- a/src/test/ui/wf/wf-trait-associated-type-region.rs +++ b/src/test/ui/wf/wf-trait-associated-type-region.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we check associated type default values for WFedness. #![feature(associated_type_defaults)] diff --git a/src/test/ui/wf/wf-trait-associated-type-region.stderr b/src/test/ui/wf/wf-trait-associated-type-region.stderr index 26d56f7e9645b..9bbfad90cdb85 100644 --- a/src/test/ui/wf/wf-trait-associated-type-region.stderr +++ b/src/test/ui/wf/wf-trait-associated-type-region.stderr @@ -1,12 +1,12 @@ error[E0309]: the associated type `>::Type1` may not live long enough - --> $DIR/wf-trait-associated-type-region.rs:19:5 + --> $DIR/wf-trait-associated-type-region.rs:9:5 | LL | type Type2 = &'a Self::Type1; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = help: consider adding an explicit lifetime bound `>::Type1: 'a`... note: ...so that the reference type `&'a >::Type1` does not outlive the data it points at - --> $DIR/wf-trait-associated-type-region.rs:19:5 + --> $DIR/wf-trait-associated-type-region.rs:9:5 | LL | type Type2 = &'a Self::Type1; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-trait-associated-type-trait.rs b/src/test/ui/wf/wf-trait-associated-type-trait.rs index 902cbe2676b06..260e6d69062a4 100644 --- a/src/test/ui/wf/wf-trait-associated-type-trait.rs +++ b/src/test/ui/wf/wf-trait-associated-type-trait.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we check associated type default values for WFedness. #![feature(associated_type_defaults)] diff --git a/src/test/ui/wf/wf-trait-associated-type-trait.stderr b/src/test/ui/wf/wf-trait-associated-type-trait.stderr index 6bfca64c4439f..70fabcd4b3074 100644 --- a/src/test/ui/wf/wf-trait-associated-type-trait.stderr +++ b/src/test/ui/wf/wf-trait-associated-type-trait.stderr @@ -1,12 +1,12 @@ error[E0277]: the trait bound `::Type1: std::marker::Copy` is not satisfied - --> $DIR/wf-trait-associated-type-trait.rs:21:5 + --> $DIR/wf-trait-associated-type-trait.rs:11:5 | LL | type Type2 = IsCopy; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `::Type1` | = help: consider adding a `where ::Type1: std::marker::Copy` bound note: required by `IsCopy` - --> $DIR/wf-trait-associated-type-trait.rs:17:1 + --> $DIR/wf-trait-associated-type-trait.rs:7:1 | LL | struct IsCopy { x: T } | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-trait-bound.rs b/src/test/ui/wf/wf-trait-bound.rs index ca15a6ab64863..bcdae60c8ea4d 100644 --- a/src/test/ui/wf/wf-trait-bound.rs +++ b/src/test/ui/wf/wf-trait-bound.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we check supertrait bounds for WFedness. #![feature(associated_type_defaults)] diff --git a/src/test/ui/wf/wf-trait-bound.stderr b/src/test/ui/wf/wf-trait-bound.stderr index 4c21959d9f70c..585571a6a3cb2 100644 --- a/src/test/ui/wf/wf-trait-bound.stderr +++ b/src/test/ui/wf/wf-trait-bound.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `U: std::marker::Copy` is not satisfied - --> $DIR/wf-trait-bound.rs:19:1 + --> $DIR/wf-trait-bound.rs:9:1 | LL | / trait SomeTrait //~ ERROR E0277 LL | | where T: ExtraCopy @@ -9,7 +9,7 @@ LL | | } | = help: consider adding a `where U: std::marker::Copy` bound note: required by `ExtraCopy` - --> $DIR/wf-trait-bound.rs:17:1 + --> $DIR/wf-trait-bound.rs:7:1 | LL | trait ExtraCopy { } | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-trait-default-fn-arg.rs b/src/test/ui/wf/wf-trait-default-fn-arg.rs index 453aa2428ce5d..b169383b6742a 100644 --- a/src/test/ui/wf/wf-trait-default-fn-arg.rs +++ b/src/test/ui/wf/wf-trait-default-fn-arg.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we test WF conditions for fn arguments. Because the // current code is so goofy, this is only a warning for now. diff --git a/src/test/ui/wf/wf-trait-default-fn-arg.stderr b/src/test/ui/wf/wf-trait-default-fn-arg.stderr index 5754fd77b724a..eeafc06db3472 100644 --- a/src/test/ui/wf/wf-trait-default-fn-arg.stderr +++ b/src/test/ui/wf/wf-trait-default-fn-arg.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `Self: std::cmp::Eq` is not satisfied - --> $DIR/wf-trait-default-fn-arg.rs:21:5 + --> $DIR/wf-trait-default-fn-arg.rs:11:5 | LL | / fn bar(&self, x: &Bar) { LL | | //~^ ERROR E0277 @@ -10,7 +10,7 @@ LL | | } | = help: consider adding a `where Self: std::cmp::Eq` bound note: required by `Bar` - --> $DIR/wf-trait-default-fn-arg.rs:18:1 + --> $DIR/wf-trait-default-fn-arg.rs:8:1 | LL | struct Bar { value: Box } | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-trait-default-fn-ret.rs b/src/test/ui/wf/wf-trait-default-fn-ret.rs index d94708d3e06a5..2103dae8d233a 100644 --- a/src/test/ui/wf/wf-trait-default-fn-ret.rs +++ b/src/test/ui/wf/wf-trait-default-fn-ret.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we test WF conditions for fn arguments. Because the // current code is so goofy, this is only a warning for now. diff --git a/src/test/ui/wf/wf-trait-default-fn-ret.stderr b/src/test/ui/wf/wf-trait-default-fn-ret.stderr index 28d690b1b057b..7fabd6b471364 100644 --- a/src/test/ui/wf/wf-trait-default-fn-ret.stderr +++ b/src/test/ui/wf/wf-trait-default-fn-ret.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `Self: std::cmp::Eq` is not satisfied - --> $DIR/wf-trait-default-fn-ret.rs:21:5 + --> $DIR/wf-trait-default-fn-ret.rs:11:5 | LL | / fn bar(&self) -> Bar { LL | | //~^ ERROR E0277 @@ -11,7 +11,7 @@ LL | | } | = help: consider adding a `where Self: std::cmp::Eq` bound note: required by `Bar` - --> $DIR/wf-trait-default-fn-ret.rs:18:1 + --> $DIR/wf-trait-default-fn-ret.rs:8:1 | LL | struct Bar { value: Box } | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-trait-default-fn-where-clause.rs b/src/test/ui/wf/wf-trait-default-fn-where-clause.rs index 29c85250583c7..d7f6a53a7671d 100644 --- a/src/test/ui/wf/wf-trait-default-fn-where-clause.rs +++ b/src/test/ui/wf/wf-trait-default-fn-where-clause.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we test WF conditions for fn arguments. Because the // current code is so goofy, this is only a warning for now. diff --git a/src/test/ui/wf/wf-trait-default-fn-where-clause.stderr b/src/test/ui/wf/wf-trait-default-fn-where-clause.stderr index c135f199a2662..669dd08b21f98 100644 --- a/src/test/ui/wf/wf-trait-default-fn-where-clause.stderr +++ b/src/test/ui/wf/wf-trait-default-fn-where-clause.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `Self: std::cmp::Eq` is not satisfied - --> $DIR/wf-trait-default-fn-where-clause.rs:21:5 + --> $DIR/wf-trait-default-fn-where-clause.rs:11:5 | LL | / fn bar(&self) where A: Bar { LL | | //~^ ERROR E0277 @@ -10,7 +10,7 @@ LL | | } | = help: consider adding a `where Self: std::cmp::Eq` bound note: required by `Bar` - --> $DIR/wf-trait-default-fn-where-clause.rs:18:1 + --> $DIR/wf-trait-default-fn-where-clause.rs:8:1 | LL | trait Bar { } | ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-trait-fn-arg.rs b/src/test/ui/wf/wf-trait-fn-arg.rs index d88e36faeec60..0445699427e2a 100644 --- a/src/test/ui/wf/wf-trait-fn-arg.rs +++ b/src/test/ui/wf/wf-trait-fn-arg.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we test WF conditions for fn arguments in a trait definition. #![feature(rustc_attrs)] diff --git a/src/test/ui/wf/wf-trait-fn-arg.stderr b/src/test/ui/wf/wf-trait-fn-arg.stderr index 6d624fc62ffd3..2b26eac9c06b6 100644 --- a/src/test/ui/wf/wf-trait-fn-arg.stderr +++ b/src/test/ui/wf/wf-trait-fn-arg.stderr @@ -1,12 +1,12 @@ error[E0277]: the trait bound `Self: std::cmp::Eq` is not satisfied - --> $DIR/wf-trait-fn-arg.rs:20:5 + --> $DIR/wf-trait-fn-arg.rs:10:5 | LL | fn bar(&self, x: &Bar); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::cmp::Eq` is not implemented for `Self` | = help: consider adding a `where Self: std::cmp::Eq` bound note: required by `Bar` - --> $DIR/wf-trait-fn-arg.rs:17:1 + --> $DIR/wf-trait-fn-arg.rs:7:1 | LL | struct Bar { value: Box } | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-trait-fn-ret.rs b/src/test/ui/wf/wf-trait-fn-ret.rs index c368ff9a4a82d..f49e43087701b 100644 --- a/src/test/ui/wf/wf-trait-fn-ret.rs +++ b/src/test/ui/wf/wf-trait-fn-ret.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we test WF conditions for fn return types in a trait definition. #![feature(rustc_attrs)] diff --git a/src/test/ui/wf/wf-trait-fn-ret.stderr b/src/test/ui/wf/wf-trait-fn-ret.stderr index dca26a6307941..70f07f02e93ea 100644 --- a/src/test/ui/wf/wf-trait-fn-ret.stderr +++ b/src/test/ui/wf/wf-trait-fn-ret.stderr @@ -1,12 +1,12 @@ error[E0277]: the trait bound `Self: std::cmp::Eq` is not satisfied - --> $DIR/wf-trait-fn-ret.rs:20:5 + --> $DIR/wf-trait-fn-ret.rs:10:5 | LL | fn bar(&self) -> &Bar; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::cmp::Eq` is not implemented for `Self` | = help: consider adding a `where Self: std::cmp::Eq` bound note: required by `Bar` - --> $DIR/wf-trait-fn-ret.rs:17:1 + --> $DIR/wf-trait-fn-ret.rs:7:1 | LL | struct Bar { value: Box } | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-trait-fn-where-clause.rs b/src/test/ui/wf/wf-trait-fn-where-clause.rs index f46a54504a0b5..302eb7b165a1e 100644 --- a/src/test/ui/wf/wf-trait-fn-where-clause.rs +++ b/src/test/ui/wf/wf-trait-fn-where-clause.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that we test WF conditions for fn where clauses in a trait definition. #![feature(rustc_attrs)] diff --git a/src/test/ui/wf/wf-trait-fn-where-clause.stderr b/src/test/ui/wf/wf-trait-fn-where-clause.stderr index 887f60935b076..2d6223e6d9332 100644 --- a/src/test/ui/wf/wf-trait-fn-where-clause.stderr +++ b/src/test/ui/wf/wf-trait-fn-where-clause.stderr @@ -1,12 +1,12 @@ error[E0277]: the trait bound `Self: std::cmp::Eq` is not satisfied - --> $DIR/wf-trait-fn-where-clause.rs:20:5 + --> $DIR/wf-trait-fn-where-clause.rs:10:5 | LL | fn bar(&self) where Self: Sized, Bar: Copy; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::cmp::Eq` is not implemented for `Self` | = help: consider adding a `where Self: std::cmp::Eq` bound note: required by `Bar` - --> $DIR/wf-trait-fn-where-clause.rs:17:1 + --> $DIR/wf-trait-fn-where-clause.rs:7:1 | LL | struct Bar { value: Box } | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/wf/wf-trait-superbound.rs b/src/test/ui/wf/wf-trait-superbound.rs index ea8b2fdf3a147..8905a882014f0 100644 --- a/src/test/ui/wf/wf-trait-superbound.rs +++ b/src/test/ui/wf/wf-trait-superbound.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we check supertrait bounds for WFedness. #![feature(associated_type_defaults)] diff --git a/src/test/ui/wf/wf-trait-superbound.stderr b/src/test/ui/wf/wf-trait-superbound.stderr index ac58dc7496eea..0bcda407d9cd0 100644 --- a/src/test/ui/wf/wf-trait-superbound.stderr +++ b/src/test/ui/wf/wf-trait-superbound.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied - --> $DIR/wf-trait-superbound.rs:19:1 + --> $DIR/wf-trait-superbound.rs:9:1 | LL | / trait SomeTrait: ExtraCopy { //~ ERROR E0277 LL | | } @@ -7,7 +7,7 @@ LL | | } | = help: consider adding a `where T: std::marker::Copy` bound note: required by `ExtraCopy` - --> $DIR/wf-trait-superbound.rs:17:1 + --> $DIR/wf-trait-superbound.rs:7:1 | LL | trait ExtraCopy { } | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/where-clauses/where-clause-constraints-are-local-for-inherent-impl.rs b/src/test/ui/where-clauses/where-clause-constraints-are-local-for-inherent-impl.rs index 458ee6694247e..e55316bb92ee9 100644 --- a/src/test/ui/where-clauses/where-clause-constraints-are-local-for-inherent-impl.rs +++ b/src/test/ui/where-clauses/where-clause-constraints-are-local-for-inherent-impl.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn require_copy(x: T) {} struct Foo { x: T } diff --git a/src/test/ui/where-clauses/where-clause-constraints-are-local-for-inherent-impl.stderr b/src/test/ui/where-clauses/where-clause-constraints-are-local-for-inherent-impl.stderr index 0d6906a85d5cc..125b65b1872e5 100644 --- a/src/test/ui/where-clauses/where-clause-constraints-are-local-for-inherent-impl.stderr +++ b/src/test/ui/where-clauses/where-clause-constraints-are-local-for-inherent-impl.stderr @@ -1,12 +1,12 @@ error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied - --> $DIR/where-clause-constraints-are-local-for-inherent-impl.rs:23:9 + --> $DIR/where-clause-constraints-are-local-for-inherent-impl.rs:13:9 | LL | require_copy(self.x); | ^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `T` | = help: consider adding a `where T: std::marker::Copy` bound note: required by `require_copy` - --> $DIR/where-clause-constraints-are-local-for-inherent-impl.rs:11:1 + --> $DIR/where-clause-constraints-are-local-for-inherent-impl.rs:1:1 | LL | fn require_copy(x: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/where-clauses/where-clause-constraints-are-local-for-trait-impl.rs b/src/test/ui/where-clauses/where-clause-constraints-are-local-for-trait-impl.rs index b3f99f2ae253d..b628a2ae14229 100644 --- a/src/test/ui/where-clauses/where-clause-constraints-are-local-for-trait-impl.rs +++ b/src/test/ui/where-clauses/where-clause-constraints-are-local-for-trait-impl.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn require_copy(x: T) {} struct Bar { x: T } diff --git a/src/test/ui/where-clauses/where-clause-constraints-are-local-for-trait-impl.stderr b/src/test/ui/where-clauses/where-clause-constraints-are-local-for-trait-impl.stderr index 976cca7b895b1..eb555b181f48a 100644 --- a/src/test/ui/where-clauses/where-clause-constraints-are-local-for-trait-impl.stderr +++ b/src/test/ui/where-clauses/where-clause-constraints-are-local-for-trait-impl.stderr @@ -1,12 +1,12 @@ error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied - --> $DIR/where-clause-constraints-are-local-for-trait-impl.rs:28:9 + --> $DIR/where-clause-constraints-are-local-for-trait-impl.rs:18:9 | LL | require_copy(self.x); | ^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `T` | = help: consider adding a `where T: std::marker::Copy` bound note: required by `require_copy` - --> $DIR/where-clause-constraints-are-local-for-trait-impl.rs:11:1 + --> $DIR/where-clause-constraints-are-local-for-trait-impl.rs:1:1 | LL | fn require_copy(x: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/where-clauses/where-clause-method-substituion.rs b/src/test/ui/where-clauses/where-clause-method-substituion.rs index 05a58daf90688..4607783c09826 100644 --- a/src/test/ui/where-clauses/where-clause-method-substituion.rs +++ b/src/test/ui/where-clauses/where-clause-method-substituion.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn dummy(&self, t: T) { } } diff --git a/src/test/ui/where-clauses/where-clause-method-substituion.stderr b/src/test/ui/where-clauses/where-clause-method-substituion.stderr index 5cd4c395869dc..cb381d2d9fe71 100644 --- a/src/test/ui/where-clauses/where-clause-method-substituion.stderr +++ b/src/test/ui/where-clauses/where-clause-method-substituion.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `X: Foo` is not satisfied - --> $DIR/where-clause-method-substituion.rs:30:7 + --> $DIR/where-clause-method-substituion.rs:20:7 | LL | 1.method::(); | ^^^^^^ the trait `Foo` is not implemented for `X` diff --git a/src/test/ui/where-clauses/where-clauses-method-unsatisfied.rs b/src/test/ui/where-clauses/where-clauses-method-unsatisfied.rs index 1ac03330afd19..d63f37a72215d 100644 --- a/src/test/ui/where-clauses/where-clauses-method-unsatisfied.rs +++ b/src/test/ui/where-clauses/where-clauses-method-unsatisfied.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that a where clause attached to a method allows us to add // additional constraints to a parameter out of scope. diff --git a/src/test/ui/where-clauses/where-clauses-method-unsatisfied.stderr b/src/test/ui/where-clauses/where-clauses-method-unsatisfied.stderr index eeb0b51b80a87..60bcba09e976c 100644 --- a/src/test/ui/where-clauses/where-clauses-method-unsatisfied.stderr +++ b/src/test/ui/where-clauses/where-clauses-method-unsatisfied.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `Bar: std::cmp::Eq` is not satisfied - --> $DIR/where-clauses-method-unsatisfied.rs:28:7 + --> $DIR/where-clauses-method-unsatisfied.rs:18:7 | LL | x.equals(&x); | ^^^^^^ the trait `std::cmp::Eq` is not implemented for `Bar` diff --git a/src/test/ui/where-clauses/where-clauses-unsatisfied.rs b/src/test/ui/where-clauses/where-clauses-unsatisfied.rs index ffc39008c4e5a..83620e5cf3a37 100644 --- a/src/test/ui/where-clauses/where-clauses-unsatisfied.rs +++ b/src/test/ui/where-clauses/where-clauses-unsatisfied.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn equal(a: &T, b: &T) -> bool where T : Eq { a == b } struct Struct; diff --git a/src/test/ui/where-clauses/where-clauses-unsatisfied.stderr b/src/test/ui/where-clauses/where-clauses-unsatisfied.stderr index dd042599382a8..fb69e2d141129 100644 --- a/src/test/ui/where-clauses/where-clauses-unsatisfied.stderr +++ b/src/test/ui/where-clauses/where-clauses-unsatisfied.stderr @@ -1,11 +1,11 @@ error[E0277]: the trait bound `Struct: std::cmp::Eq` is not satisfied - --> $DIR/where-clauses-unsatisfied.rs:16:10 + --> $DIR/where-clauses-unsatisfied.rs:6:10 | LL | drop(equal(&Struct, &Struct)) | ^^^^^ the trait `std::cmp::Eq` is not implemented for `Struct` | note: required by `equal` - --> $DIR/where-clauses-unsatisfied.rs:11:1 + --> $DIR/where-clauses-unsatisfied.rs:1:1 | LL | fn equal(a: &T, b: &T) -> bool where T : Eq { a == b } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/where-clauses/where-equality-constraints.rs b/src/test/ui/where-clauses/where-equality-constraints.rs index e449a736c753a..f2349144b88ae 100644 --- a/src/test/ui/where-clauses/where-equality-constraints.rs +++ b/src/test/ui/where-clauses/where-equality-constraints.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn f() where u8 = u16 {} //~^ ERROR equality constraints are not yet supported in where clauses fn g() where for<'a> &'static (u8,) == u16, {} diff --git a/src/test/ui/where-clauses/where-equality-constraints.stderr b/src/test/ui/where-clauses/where-equality-constraints.stderr index f2bcfacc45268..56caaaeee401e 100644 --- a/src/test/ui/where-clauses/where-equality-constraints.stderr +++ b/src/test/ui/where-clauses/where-equality-constraints.stderr @@ -1,11 +1,11 @@ error: equality constraints are not yet supported in where clauses (#20041) - --> $DIR/where-equality-constraints.rs:11:14 + --> $DIR/where-equality-constraints.rs:1:14 | LL | fn f() where u8 = u16 {} | ^^^^^^^^ error: equality constraints are not yet supported in where clauses (#20041) - --> $DIR/where-equality-constraints.rs:13:14 + --> $DIR/where-equality-constraints.rs:3:14 | LL | fn g() where for<'a> &'static (u8,) == u16, {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/where-clauses/where-for-self-2.rs b/src/test/ui/where-clauses/where-for-self-2.rs index 6179bdb34a381..10b25c734037a 100644 --- a/src/test/ui/where-clauses/where-for-self-2.rs +++ b/src/test/ui/where-clauses/where-for-self-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we can quantify lifetimes outside a constraint (i.e., including // the self type) in a where clause. Specifically, test that implementing for a // specific lifetime is not enough to satisfy the `for<'a> ...` constraint, which diff --git a/src/test/ui/where-clauses/where-for-self-2.stderr b/src/test/ui/where-clauses/where-for-self-2.stderr index d234c71821512..dbe68b82c24cb 100644 --- a/src/test/ui/where-clauses/where-for-self-2.stderr +++ b/src/test/ui/where-clauses/where-for-self-2.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `for<'a> &'a _: Bar` is not satisfied - --> $DIR/where-for-self-2.rs:31:5 + --> $DIR/where-for-self-2.rs:21:5 | LL | foo(&X); | ^^^ the trait `for<'a> Bar` is not implemented for `&'a _` @@ -7,7 +7,7 @@ LL | foo(&X); = help: the following implementations were found: <&'static u32 as Bar> note: required by `foo` - --> $DIR/where-for-self-2.rs:26:1 + --> $DIR/where-for-self-2.rs:16:1 | LL | / fn foo(x: &T) LL | | where for<'a> &'a T: Bar diff --git a/src/test/ui/where-clauses/where-for-self.rs b/src/test/ui/where-clauses/where-for-self.rs index 8f447face4e51..9380e72cd7c8b 100644 --- a/src/test/ui/where-clauses/where-for-self.rs +++ b/src/test/ui/where-clauses/where-for-self.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we can quantify lifetimes outside a constraint (i.e., including // the self type) in a where clause. Specifically, test that we cannot nest // quantification in constraints (to be clear, there is no reason this should not diff --git a/src/test/ui/where-clauses/where-for-self.stderr b/src/test/ui/where-clauses/where-for-self.stderr index 89c0bd023c30c..d06afc1e42376 100644 --- a/src/test/ui/where-clauses/where-for-self.stderr +++ b/src/test/ui/where-clauses/where-for-self.stderr @@ -1,5 +1,5 @@ error[E0316]: nested quantification of lifetimes - --> $DIR/where-for-self.rs:25:26 + --> $DIR/where-for-self.rs:15:26 | LL | where for<'a> &'a T: for<'b> Bar<'b> | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/where-clauses/where-lifetime-resolution.rs b/src/test/ui/where-clauses/where-lifetime-resolution.rs index 1204cc0df47b1..4c46a77ae2916 100644 --- a/src/test/ui/where-clauses/where-lifetime-resolution.rs +++ b/src/test/ui/where-clauses/where-lifetime-resolution.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Trait1<'a> {} trait Trait2<'a, 'b> {} diff --git a/src/test/ui/where-clauses/where-lifetime-resolution.stderr b/src/test/ui/where-clauses/where-lifetime-resolution.stderr index a6fc1b2596274..ce6354b0ae72f 100644 --- a/src/test/ui/where-clauses/where-lifetime-resolution.stderr +++ b/src/test/ui/where-clauses/where-lifetime-resolution.stderr @@ -1,17 +1,17 @@ error[E0261]: use of undeclared lifetime name `'a` - --> $DIR/where-lifetime-resolution.rs:16:34 + --> $DIR/where-lifetime-resolution.rs:6:34 | LL | (for<'a> Trait1<'a>): Trait1<'a>, | ^^ undeclared lifetime error[E0316]: nested quantification of lifetimes - --> $DIR/where-lifetime-resolution.rs:18:13 + --> $DIR/where-lifetime-resolution.rs:8:13 | LL | for<'a> for<'b> Trait2<'a, 'b>: Trait2<'a, 'b>, | ^^^^^^^^^^^^^^^^^^^^^^ error[E0261]: use of undeclared lifetime name `'b` - --> $DIR/where-lifetime-resolution.rs:18:48 + --> $DIR/where-lifetime-resolution.rs:8:48 | LL | for<'a> for<'b> Trait2<'a, 'b>: Trait2<'a, 'b>, | ^^ undeclared lifetime diff --git a/src/test/ui/while-let.rs b/src/test/ui/while-let.rs index a70dcccd4e85e..348edc15aca4c 100644 --- a/src/test/ui/while-let.rs +++ b/src/test/ui/while-let.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn macros() { macro_rules! foo{ ($p:pat, $e:expr, $b:block) => {{ diff --git a/src/test/ui/while-let.stderr b/src/test/ui/while-let.stderr index de4d8be212e43..838dd8c14d7b5 100644 --- a/src/test/ui/while-let.stderr +++ b/src/test/ui/while-let.stderr @@ -1,17 +1,17 @@ error[E0165]: irrefutable while-let pattern - --> $DIR/while-let.rs:23:10 + --> $DIR/while-let.rs:13:10 | LL | foo!(a, 1, { //~ ERROR irrefutable while-let | ^ irrefutable pattern error[E0165]: irrefutable while-let pattern - --> $DIR/while-let.rs:26:10 + --> $DIR/while-let.rs:16:10 | LL | bar!(a, 1, { //~ ERROR irrefutable while-let | ^ irrefutable pattern error[E0165]: irrefutable while-let pattern - --> $DIR/while-let.rs:32:15 + --> $DIR/while-let.rs:22:15 | LL | while let a = 1 { //~ ERROR irrefutable while-let | ^ irrefutable pattern diff --git a/src/test/ui/while-type-error.rs b/src/test/ui/while-type-error.rs index ecab746373a98..8098bfcd8d9dd 100644 --- a/src/test/ui/while-type-error.rs +++ b/src/test/ui/while-type-error.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: mismatched types fn main() { while main { } } diff --git a/src/test/ui/while-type-error.stderr b/src/test/ui/while-type-error.stderr index cfc3f3e257e3b..15169673fe925 100644 --- a/src/test/ui/while-type-error.stderr +++ b/src/test/ui/while-type-error.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/while-type-error.rs:13:19 + --> $DIR/while-type-error.rs:3:19 | LL | fn main() { while main { } } | ^^^^ expected bool, found fn item diff --git a/src/test/ui/windows-subsystem-invalid.rs b/src/test/ui/windows-subsystem-invalid.rs index 7772cfd6a2c93..0336678b712eb 100644 --- a/src/test/ui/windows-subsystem-invalid.rs +++ b/src/test/ui/windows-subsystem-invalid.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: invalid windows subsystem `wrong`, only `windows` and `console` are allowed #![windows_subsystem = "wrong"] diff --git a/src/test/ui/write-to-static-mut-in-static.rs b/src/test/ui/write-to-static-mut-in-static.rs index 1ea74f73723b7..7af1217c3e2da 100644 --- a/src/test/ui/write-to-static-mut-in-static.rs +++ b/src/test/ui/write-to-static-mut-in-static.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_let)] pub static mut A: u32 = 0; diff --git a/src/test/ui/write-to-static-mut-in-static.stderr b/src/test/ui/write-to-static-mut-in-static.stderr index f07d240746fdf..d44257ea33197 100644 --- a/src/test/ui/write-to-static-mut-in-static.stderr +++ b/src/test/ui/write-to-static-mut-in-static.stderr @@ -1,5 +1,5 @@ error[E0658]: statements in statics are unstable (see issue #48821) - --> $DIR/write-to-static-mut-in-static.rs:14:33 + --> $DIR/write-to-static-mut-in-static.rs:4:33 | LL | pub static mut B: () = unsafe { A = 1; }; | ^^^^^ @@ -7,7 +7,7 @@ LL | pub static mut B: () = unsafe { A = 1; }; = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: statements in statics are unstable (see issue #48821) - --> $DIR/write-to-static-mut-in-static.rs:17:34 + --> $DIR/write-to-static-mut-in-static.rs:7:34 | LL | pub static mut C: u32 = unsafe { C = 1; 0 }; | ^^^^^ diff --git a/src/test/ui/writing-to-immutable-vec.nll.stderr b/src/test/ui/writing-to-immutable-vec.nll.stderr index 96899276b97a5..6ec56f90ca47a 100644 --- a/src/test/ui/writing-to-immutable-vec.nll.stderr +++ b/src/test/ui/writing-to-immutable-vec.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `v` as mutable, as it is not declared as mutable - --> $DIR/writing-to-immutable-vec.rs:14:5 + --> $DIR/writing-to-immutable-vec.rs:3:5 | LL | let v: Vec = vec![1, 2, 3]; | - help: consider changing this to be mutable: `mut v` diff --git a/src/test/ui/writing-to-immutable-vec.rs b/src/test/ui/writing-to-immutable-vec.rs index f289b85992ee8..ad2bf33fc20ba 100644 --- a/src/test/ui/writing-to-immutable-vec.rs +++ b/src/test/ui/writing-to-immutable-vec.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn main() { let v: Vec = vec![1, 2, 3]; v[1] = 4; //~ ERROR cannot borrow immutable local variable `v` as mutable diff --git a/src/test/ui/writing-to-immutable-vec.stderr b/src/test/ui/writing-to-immutable-vec.stderr index 07e1779713909..28eb41f074d8f 100644 --- a/src/test/ui/writing-to-immutable-vec.stderr +++ b/src/test/ui/writing-to-immutable-vec.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow immutable local variable `v` as mutable - --> $DIR/writing-to-immutable-vec.rs:14:5 + --> $DIR/writing-to-immutable-vec.rs:3:5 | LL | let v: Vec = vec![1, 2, 3]; | - consider changing this to `mut v` diff --git a/src/test/ui/wrong-mul-method-signature.rs b/src/test/ui/wrong-mul-method-signature.rs index 069fd2dec990f..54e2af5525920 100644 --- a/src/test/ui/wrong-mul-method-signature.rs +++ b/src/test/ui/wrong-mul-method-signature.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test is to make sure we don't just ICE if the trait // method for an operator is not implemented properly. // (In this case the mul method should take &f64 and not f64) diff --git a/src/test/ui/wrong-mul-method-signature.stderr b/src/test/ui/wrong-mul-method-signature.stderr index 7c4d22c7cca05..8630ebcb58042 100644 --- a/src/test/ui/wrong-mul-method-signature.stderr +++ b/src/test/ui/wrong-mul-method-signature.stderr @@ -1,5 +1,5 @@ error[E0053]: method `mul` has an incompatible type for trait - --> $DIR/wrong-mul-method-signature.rs:26:5 + --> $DIR/wrong-mul-method-signature.rs:16:5 | LL | fn mul(self, s: &f64) -> Vec1 { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected f64, found &f64 @@ -8,7 +8,7 @@ LL | fn mul(self, s: &f64) -> Vec1 { found type `fn(Vec1, &f64) -> Vec1` error[E0053]: method `mul` has an incompatible type for trait - --> $DIR/wrong-mul-method-signature.rs:43:5 + --> $DIR/wrong-mul-method-signature.rs:33:5 | LL | fn mul(self, s: f64) -> Vec2 { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected struct `Vec2`, found f64 @@ -17,7 +17,7 @@ LL | fn mul(self, s: f64) -> Vec2 { found type `fn(Vec2, f64) -> Vec2` error[E0053]: method `mul` has an incompatible type for trait - --> $DIR/wrong-mul-method-signature.rs:62:5 + --> $DIR/wrong-mul-method-signature.rs:52:5 | LL | fn mul(self, s: f64) -> f64 { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected i32, found f64 diff --git a/src/test/ui/wrong-ret-type.rs b/src/test/ui/wrong-ret-type.rs index 6db11fcffd227..cbff8dbae21d1 100644 --- a/src/test/ui/wrong-ret-type.rs +++ b/src/test/ui/wrong-ret-type.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: mismatched types fn mk_int() -> usize { let i: isize = 3; return i; } fn main() { } diff --git a/src/test/ui/wrong-ret-type.stderr b/src/test/ui/wrong-ret-type.stderr index 4ff6f7076038f..221806f731f60 100644 --- a/src/test/ui/wrong-ret-type.stderr +++ b/src/test/ui/wrong-ret-type.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/wrong-ret-type.rs:12:49 + --> $DIR/wrong-ret-type.rs:2:49 | LL | fn mk_int() -> usize { let i: isize = 3; return i; } | ^ expected usize, found isize diff --git a/src/test/ui/xc-private-method.rs b/src/test/ui/xc-private-method.rs index edc0e31040d39..157249194a345 100644 --- a/src/test/ui/xc-private-method.rs +++ b/src/test/ui/xc-private-method.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:xc_private_method_lib.rs extern crate xc_private_method_lib; diff --git a/src/test/ui/xc-private-method.stderr b/src/test/ui/xc-private-method.stderr index 35078e73d4670..91bec2551c1e0 100644 --- a/src/test/ui/xc-private-method.stderr +++ b/src/test/ui/xc-private-method.stderr @@ -1,11 +1,11 @@ error[E0624]: method `static_meth_struct` is private - --> $DIR/xc-private-method.rs:16:13 + --> $DIR/xc-private-method.rs:6:13 | LL | let _ = xc_private_method_lib::Struct::static_meth_struct(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0624]: method `static_meth_enum` is private - --> $DIR/xc-private-method.rs:19:13 + --> $DIR/xc-private-method.rs:9:13 | LL | let _ = xc_private_method_lib::Enum::static_meth_enum(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/xc-private-method2.rs b/src/test/ui/xc-private-method2.rs index 26e055d7cbb9d..6d73570318ae8 100644 --- a/src/test/ui/xc-private-method2.rs +++ b/src/test/ui/xc-private-method2.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:xc_private_method_lib.rs extern crate xc_private_method_lib; diff --git a/src/test/ui/xc-private-method2.stderr b/src/test/ui/xc-private-method2.stderr index d671aa35817fa..36ad850fb1919 100644 --- a/src/test/ui/xc-private-method2.stderr +++ b/src/test/ui/xc-private-method2.stderr @@ -1,11 +1,11 @@ error[E0624]: method `meth_struct` is private - --> $DIR/xc-private-method2.rs:16:52 + --> $DIR/xc-private-method2.rs:6:52 | LL | let _ = xc_private_method_lib::Struct{ x: 10 }.meth_struct(); | ^^^^^^^^^^^ error[E0624]: method `meth_enum` is private - --> $DIR/xc-private-method2.rs:19:55 + --> $DIR/xc-private-method2.rs:9:55 | LL | let _ = xc_private_method_lib::Enum::Variant1(20).meth_enum(); | ^^^^^^^^^ diff --git a/src/test/ui/xcrate/auxiliary/static_priv_by_default.rs b/src/test/ui/xcrate/auxiliary/static_priv_by_default.rs index 73597e51f0802..39f912066ece9 100644 --- a/src/test/ui/xcrate/auxiliary/static_priv_by_default.rs +++ b/src/test/ui/xcrate/auxiliary/static_priv_by_default.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] static private: isize = 0; diff --git a/src/test/ui/xcrate/auxiliary/xcrate_unit_struct.rs b/src/test/ui/xcrate/auxiliary/xcrate_unit_struct.rs index 7a69be2b06c7c..69ed498e7e1cd 100644 --- a/src/test/ui/xcrate/auxiliary/xcrate_unit_struct.rs +++ b/src/test/ui/xcrate/auxiliary/xcrate_unit_struct.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] // used by the rpass test diff --git a/src/test/ui/xcrate/xcrate-private-by-default.rs b/src/test/ui/xcrate/xcrate-private-by-default.rs index 7dd4d970945e0..299cff54f3469 100644 --- a/src/test/ui/xcrate/xcrate-private-by-default.rs +++ b/src/test/ui/xcrate/xcrate-private-by-default.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:static_priv_by_default.rs extern crate static_priv_by_default; diff --git a/src/test/ui/xcrate/xcrate-private-by-default.stderr b/src/test/ui/xcrate/xcrate-private-by-default.stderr index c4560b9ca7752..055cce721987c 100644 --- a/src/test/ui/xcrate/xcrate-private-by-default.stderr +++ b/src/test/ui/xcrate/xcrate-private-by-default.stderr @@ -1,59 +1,59 @@ error[E0603]: static `j` is private - --> $DIR/xcrate-private-by-default.rs:33:5 + --> $DIR/xcrate-private-by-default.rs:23:5 | LL | static_priv_by_default::j; | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0603]: function `k` is private - --> $DIR/xcrate-private-by-default.rs:35:5 + --> $DIR/xcrate-private-by-default.rs:25:5 | LL | static_priv_by_default::k; | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0603]: unit struct `l` is private - --> $DIR/xcrate-private-by-default.rs:37:5 + --> $DIR/xcrate-private-by-default.rs:27:5 | LL | static_priv_by_default::l; | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0603]: enum `m` is private - --> $DIR/xcrate-private-by-default.rs:39:11 + --> $DIR/xcrate-private-by-default.rs:29:11 | LL | foo::(); | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0603]: type alias `n` is private - --> $DIR/xcrate-private-by-default.rs:41:11 + --> $DIR/xcrate-private-by-default.rs:31:11 | LL | foo::(); | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0603]: module `foo` is private - --> $DIR/xcrate-private-by-default.rs:45:5 + --> $DIR/xcrate-private-by-default.rs:35:5 | LL | static_priv_by_default::foo::a; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0603]: module `foo` is private - --> $DIR/xcrate-private-by-default.rs:47:5 + --> $DIR/xcrate-private-by-default.rs:37:5 | LL | static_priv_by_default::foo::b; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0603]: module `foo` is private - --> $DIR/xcrate-private-by-default.rs:49:5 + --> $DIR/xcrate-private-by-default.rs:39:5 | LL | static_priv_by_default::foo::c; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0603]: module `foo` is private - --> $DIR/xcrate-private-by-default.rs:51:11 + --> $DIR/xcrate-private-by-default.rs:41:11 | LL | foo::(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0603]: module `foo` is private - --> $DIR/xcrate-private-by-default.rs:53:11 + --> $DIR/xcrate-private-by-default.rs:43:11 | LL | foo::(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/xcrate/xcrate-unit-struct.rs b/src/test/ui/xcrate/xcrate-unit-struct.rs index 04af713300075..c99cf77ce7a4a 100644 --- a/src/test/ui/xcrate/xcrate-unit-struct.rs +++ b/src/test/ui/xcrate/xcrate-unit-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:xcrate_unit_struct.rs // Make sure that when we have cross-crate unit structs we don't accidentally diff --git a/src/test/ui/xcrate/xcrate-unit-struct.stderr b/src/test/ui/xcrate/xcrate-unit-struct.stderr index 9ee4cb3ba177f..e4a4b9c580602 100644 --- a/src/test/ui/xcrate/xcrate-unit-struct.stderr +++ b/src/test/ui/xcrate/xcrate-unit-struct.stderr @@ -1,5 +1,5 @@ error[E0423]: expected value, found struct `xcrate_unit_struct::StructWithFields` - --> $DIR/xcrate-unit-struct.rs:19:13 + --> $DIR/xcrate-unit-struct.rs:9:13 | LL | let _ = xcrate_unit_struct::StructWithFields; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ did you mean `xcrate_unit_struct::StructWithFields { /* fields */ }`? diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index 76c15f6601a4a..881151743874c 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate toml; #[macro_use] extern crate serde_derive; diff --git a/src/tools/cargotest/main.rs b/src/tools/cargotest/main.rs index 352480543c7e3..6cd8a922b2d98 100644 --- a/src/tools/cargotest/main.rs +++ b/src/tools/cargotest/main.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::env; use std::process::Command; use std::path::{Path, PathBuf}; diff --git a/src/tools/compiletest/src/common.rs b/src/tools/compiletest/src/common.rs index 6679ec79c1dd6..38b70298ca536 100644 --- a/src/tools/compiletest/src/common.rs +++ b/src/tools/compiletest/src/common.rs @@ -1,12 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. pub use self::Mode::*; use std::fmt; diff --git a/src/tools/compiletest/src/errors.rs b/src/tools/compiletest/src/errors.rs index dd2e5557c16d4..c9aa41d91a985 100644 --- a/src/tools/compiletest/src/errors.rs +++ b/src/tools/compiletest/src/errors.rs @@ -1,12 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. use self::WhichLine::*; use std::fmt; diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs index 3fd67366a8ca4..dbd3854dc2152 100644 --- a/src/tools/compiletest/src/header.rs +++ b/src/tools/compiletest/src/header.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::env; use std::fs::File; use std::io::prelude::*; diff --git a/src/tools/compiletest/src/json.rs b/src/tools/compiletest/src/json.rs index 58220ba992c7a..106aa67157a42 100644 --- a/src/tools/compiletest/src/json.rs +++ b/src/tools/compiletest/src/json.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use errors::{Error, ErrorKind}; use runtest::ProcRes; use serde_json; diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs index c1d3df79222c5..a2b66cb279d2b 100644 --- a/src/tools/compiletest/src/main.rs +++ b/src/tools/compiletest/src/main.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name = "compiletest"] #![feature(test)] #![deny(warnings)] diff --git a/src/tools/compiletest/src/raise_fd_limit.rs b/src/tools/compiletest/src/raise_fd_limit.rs index d1071231530d6..7f1d7e0d3cdd4 100644 --- a/src/tools/compiletest/src/raise_fd_limit.rs +++ b/src/tools/compiletest/src/raise_fd_limit.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// darwin_fd_limit exists to work around an issue where launchctl on macOS /// defaults the rlimit maxfiles to 256/unlimited. The default soft limit of 256 /// ends up being far too low for our multithreaded scheduler testing, depending diff --git a/src/tools/compiletest/src/read2.rs b/src/tools/compiletest/src/read2.rs index f056a041c1344..5a4caddcdd319 100644 --- a/src/tools/compiletest/src/read2.rs +++ b/src/tools/compiletest/src/read2.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // FIXME: This is a complete copy of `cargo/src/cargo/util/read2.rs` // Consider unify the read2() in libstd, cargo and this to prevent further code duplication. diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 24b575aae12f9..787e00aea9243 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use common::CompareMode; use common::{expected_output_path, UI_EXTENSIONS, UI_FIXED, UI_STDERR, UI_STDOUT}; use common::{output_base_dir, output_base_name, output_testname_unique}; diff --git a/src/tools/compiletest/src/util.rs b/src/tools/compiletest/src/util.rs index 2a716970ca7b9..47411e8fcd35a 100644 --- a/src/tools/compiletest/src/util.rs +++ b/src/tools/compiletest/src/util.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ffi::OsStr; use std::env; use std::path::PathBuf; diff --git a/src/tools/error_index_generator/main.rs b/src/tools/error_index_generator/main.rs index 40917cc5db0d5..852fd5129d64e 100644 --- a/src/tools/error_index_generator/main.rs +++ b/src/tools/error_index_generator/main.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_private)] extern crate syntax; diff --git a/src/tools/linkchecker/main.rs b/src/tools/linkchecker/main.rs index 41ad4e7180e60..d6a181502a974 100644 --- a/src/tools/linkchecker/main.rs +++ b/src/tools/linkchecker/main.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Script to check the validity of `href` links in our HTML documentation. //! //! In the past we've been quite error prone to writing in broken links as most diff --git a/src/tools/remote-test-client/src/main.rs b/src/tools/remote-test-client/src/main.rs index 011bf551140a0..cb9dac27ce491 100644 --- a/src/tools/remote-test-client/src/main.rs +++ b/src/tools/remote-test-client/src/main.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// This is a small client program intended to pair with `remote-test-server` in /// this repository. This client connects to the server over TCP and is used to /// push artifacts and run tests on the server instead of locally. diff --git a/src/tools/remote-test-server/src/main.rs b/src/tools/remote-test-server/src/main.rs index 9501adb938616..74dde8bf0e2c9 100644 --- a/src/tools/remote-test-server/src/main.rs +++ b/src/tools/remote-test-server/src/main.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - /// This is a small server which is intended to run inside of an emulator or /// on a remote test device. This server pairs with the `remote-test-client` /// program in this repository. The `remote-test-client` connects to this diff --git a/src/tools/rustbook/src/main.rs b/src/tools/rustbook/src/main.rs index 87a63a34cb642..80a85dc2ac0e3 100644 --- a/src/tools/rustbook/src/main.rs +++ b/src/tools/rustbook/src/main.rs @@ -1,12 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // extern crate mdbook; #[macro_use] diff --git a/src/tools/rustc-workspace-hack/lib.rs b/src/tools/rustc-workspace-hack/lib.rs index ab262975a092a..44425d9c15fcf 100644 --- a/src/tools/rustc-workspace-hack/lib.rs +++ b/src/tools/rustc-workspace-hack/lib.rs @@ -1,11 +1 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // intentionally left blank diff --git a/src/tools/rustdoc-themes/main.rs b/src/tools/rustdoc-themes/main.rs index c8fb65e9a2aec..616b5444832c1 100644 --- a/src/tools/rustdoc-themes/main.rs +++ b/src/tools/rustdoc-themes/main.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::env::args; use std::fs::read_dir; use std::path::Path; diff --git a/src/tools/rustdoc/main.rs b/src/tools/rustdoc/main.rs index 7aca765cead8c..df9d2c6ba96db 100644 --- a/src/tools/rustdoc/main.rs +++ b/src/tools/rustdoc/main.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(link_args)] #[allow(unused_attributes)] diff --git a/src/tools/tidy/src/bins.rs b/src/tools/tidy/src/bins.rs index f6e42c8dc17b1..20e39b7736af5 100644 --- a/src/tools/tidy/src/bins.rs +++ b/src/tools/tidy/src/bins.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Tidy check to ensure that there are no binaries checked into the source tree //! by accident. //! diff --git a/src/tools/tidy/src/cargo.rs b/src/tools/tidy/src/cargo.rs index f40fea60f40a8..94e61009f7efd 100644 --- a/src/tools/tidy/src/cargo.rs +++ b/src/tools/tidy/src/cargo.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Tidy check to ensure that `[dependencies]` and `extern crate` are in sync. //! //! This tidy check ensures that all crates listed in the `[dependencies]` diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index 03bcda513fd84..b8eb48b88bfc1 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Check license of third-party deps by inspecting src/vendor use std::collections::{BTreeSet, HashSet, HashMap}; diff --git a/src/tools/tidy/src/errors.rs b/src/tools/tidy/src/errors.rs index 3dccffddf9388..9ae48bfa21305 100644 --- a/src/tools/tidy/src/errors.rs +++ b/src/tools/tidy/src/errors.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Tidy check to verify the validity of long error diagnostic codes. //! //! This ensures that error codes are used at most once and also prints out some diff --git a/src/tools/tidy/src/extdeps.rs b/src/tools/tidy/src/extdeps.rs index 761803a45b8b3..e0a50c8209c61 100644 --- a/src/tools/tidy/src/extdeps.rs +++ b/src/tools/tidy/src/extdeps.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ! Check for external package sources. Allow only vendorable packages. use std::fs::File; diff --git a/src/tools/tidy/src/features.rs b/src/tools/tidy/src/features.rs index 1dc36221bd289..d581d33743e5c 100644 --- a/src/tools/tidy/src/features.rs +++ b/src/tools/tidy/src/features.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Tidy check to ensure that unstable features are all in order //! //! This check will ensure properties like: diff --git a/src/tools/tidy/src/lib.rs b/src/tools/tidy/src/lib.rs index f2107f92debd2..8ea7b4e9406c9 100644 --- a/src/tools/tidy/src/lib.rs +++ b/src/tools/tidy/src/lib.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Library used by tidy and other tools //! //! This library contains the tidy lints and exposes it diff --git a/src/tools/tidy/src/libcoretest.rs b/src/tools/tidy/src/libcoretest.rs index 363d01d964eb5..b15b9c3462f79 100644 --- a/src/tools/tidy/src/libcoretest.rs +++ b/src/tools/tidy/src/libcoretest.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Tidy check to ensure `#[test]` is not used directly inside `libcore`. //! //! `#![no_core]` libraries cannot be tested directly due to duplicating lang diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs index 4fe77f8b58feb..4413184bc84ba 100644 --- a/src/tools/tidy/src/main.rs +++ b/src/tools/tidy/src/main.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Tidy checks source code in this repository //! //! This program runs all of the various tidy checks for style, cleanliness, diff --git a/src/tools/tidy/src/pal.rs b/src/tools/tidy/src/pal.rs index 8071f07d81195..f8c56e6bc8fdf 100644 --- a/src/tools/tidy/src/pal.rs +++ b/src/tools/tidy/src/pal.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Tidy check to enforce rules about platform-specific code in std //! //! This is intended to maintain existing standards of code diff --git a/src/tools/tidy/src/style.rs b/src/tools/tidy/src/style.rs index f2f35f0f58602..f1dcb76a29bb7 100644 --- a/src/tools/tidy/src/style.rs +++ b/src/tools/tidy/src/style.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Tidy check to enforce various stylistic guidelines on the Rust codebase. //! //! Example checks are: diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs index c15744078077e..fa7198063d139 100644 --- a/src/tools/tidy/src/ui_tests.rs +++ b/src/tools/tidy/src/ui_tests.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Tidy check to ensure that there are no stray `.stderr` files in UI test directories. use std::fs; diff --git a/src/tools/tidy/src/unstable_book.rs b/src/tools/tidy/src/unstable_book.rs index 62296f73f016b..a5b38d32ed0b9 100644 --- a/src/tools/tidy/src/unstable_book.rs +++ b/src/tools/tidy/src/unstable_book.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::BTreeSet; use std::fs; use std::path; diff --git a/src/tools/unstable-book-gen/src/main.rs b/src/tools/unstable-book-gen/src/main.rs index b97137d7d6498..df12eaf0cb028 100644 --- a/src/tools/unstable-book-gen/src/main.rs +++ b/src/tools/unstable-book-gen/src/main.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Auto-generate stub docs for the unstable book #![deny(warnings)] diff --git a/x.py b/x.py index e277ab98be10f..7973730ef177c 100755 --- a/x.py +++ b/x.py @@ -1,13 +1,4 @@ #!/usr/bin/env python -# Copyright 2016 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 or the MIT license -# , at your -# option. This file may not be copied, modified, or distributed -# except according to those terms. # This file is only a "symlink" to bootstrap.py, all logic should go there.

{} diff --git a/src/test/ui/coherence/coherence-projection-ok.stderr b/src/test/ui/coherence/coherence-projection-ok.stderr index 945f3b396b7b2..9f278f94ec1c2 100644 --- a/src/test/ui/coherence/coherence-projection-ok.stderr +++ b/src/test/ui/coherence/coherence-projection-ok.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/coherence-projection-ok.rs:28:1 + --> $DIR/coherence-projection-ok.rs:18:1 | LL | fn main() {} //~ ERROR compilation successful | ^^^^^^^^^^^^ diff --git a/src/test/ui/coherence/coherence-tuple-conflict.rs b/src/test/ui/coherence/coherence-tuple-conflict.rs index 7807f93df1a67..bece87a9dd95f 100644 --- a/src/test/ui/coherence/coherence-tuple-conflict.rs +++ b/src/test/ui/coherence/coherence-tuple-conflict.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt::Debug; use std::default::Default; diff --git a/src/test/ui/coherence/coherence-tuple-conflict.stderr b/src/test/ui/coherence/coherence-tuple-conflict.stderr index 4ceafea0a70fd..4baf71ebf0998 100644 --- a/src/test/ui/coherence/coherence-tuple-conflict.stderr +++ b/src/test/ui/coherence/coherence-tuple-conflict.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `MyTrait` for type `(_, _)`: - --> $DIR/coherence-tuple-conflict.rs:25:1 + --> $DIR/coherence-tuple-conflict.rs:15:1 | LL | impl MyTrait for (T,T) { | ------------------------- first implementation here diff --git a/src/test/ui/coherence/coherence-vec-local-2.rs b/src/test/ui/coherence/coherence-vec-local-2.rs index 196c2f4ee3cd3..b77b1f2e05443 100644 --- a/src/test/ui/coherence/coherence-vec-local-2.rs +++ b/src/test/ui/coherence/coherence-vec-local-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that a local, generic type appearing within a // *non-fundamental* remote type like `Vec` is not considered local. diff --git a/src/test/ui/coherence/coherence-vec-local-2.stderr b/src/test/ui/coherence/coherence-vec-local-2.stderr index 2980d4a3392c5..9ba52e420d4d3 100644 --- a/src/test/ui/coherence/coherence-vec-local-2.stderr +++ b/src/test/ui/coherence/coherence-vec-local-2.stderr @@ -1,5 +1,5 @@ error[E0210]: type parameter `T` must be used as the type parameter for some local type (e.g. `MyStruct`) - --> $DIR/coherence-vec-local-2.rs:21:1 + --> $DIR/coherence-vec-local-2.rs:11:1 | LL | impl Remote for Vec> { } //~ ERROR E0210 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type parameter `T` must be used as the type parameter for some local type diff --git a/src/test/ui/coherence/coherence-vec-local.rs b/src/test/ui/coherence/coherence-vec-local.rs index 49822dcfcb3f0..de12b43d485df 100644 --- a/src/test/ui/coherence/coherence-vec-local.rs +++ b/src/test/ui/coherence/coherence-vec-local.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that a local type (with no type parameters) appearing within a // *non-fundamental* remote type like `Vec` is not considered local. diff --git a/src/test/ui/coherence/coherence-vec-local.stderr b/src/test/ui/coherence/coherence-vec-local.stderr index b3c26160fe5b1..319d2ebabd7e8 100644 --- a/src/test/ui/coherence/coherence-vec-local.stderr +++ b/src/test/ui/coherence/coherence-vec-local.stderr @@ -1,5 +1,5 @@ error[E0117]: only traits defined in the current crate can be implemented for arbitrary types - --> $DIR/coherence-vec-local.rs:21:1 + --> $DIR/coherence-vec-local.rs:11:1 | LL | impl Remote for Vec { } //~ ERROR E0117 | ^^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate diff --git a/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct.rs b/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct.rs index 9fbb7aa4cb1a7..d46e78eb48c31 100644 --- a/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct.rs +++ b/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are able to introduce a negative constraint that // `MyType: !MyTrait` along with other "fundamental" wrappers. diff --git a/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct.stderr b/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct.stderr index 675dc1b7004d8..4426260eb0485 100644 --- a/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct.stderr +++ b/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/coherence_copy_like_err_fundamental_struct.rs:34:1 + --> $DIR/coherence_copy_like_err_fundamental_struct.rs:24:1 | LL | fn main() { } //~ ERROR compilation successful | ^^^^^^^^^^^^^ diff --git a/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_ref.rs b/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_ref.rs index 2f6dca4f3c271..5c74b7431f187 100644 --- a/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_ref.rs +++ b/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_ref.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are able to introduce a negative constraint that // `MyType: !MyTrait` along with other "fundamental" wrappers. diff --git a/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_ref.stderr b/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_ref.stderr index 5143d4e874b09..b3cd22dd30235 100644 --- a/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_ref.stderr +++ b/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_ref.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/coherence_copy_like_err_fundamental_struct_ref.rs:34:1 + --> $DIR/coherence_copy_like_err_fundamental_struct_ref.rs:24:1 | LL | fn main() { } //~ ERROR compilation successful | ^^^^^^^^^^^^^ diff --git a/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.rs b/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.rs index f424e8872010f..337cf9446787b 100644 --- a/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.rs +++ b/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are able to introduce a negative constraint that // `MyType: !MyTrait` along with other "fundamental" wrappers. diff --git a/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.stderr b/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.stderr index c7c49fe14622b..0aa7320bc3343 100644 --- a/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.stderr +++ b/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `MyTrait` for type `lib::MyFundamentalStruct<(MyType,)>`: - --> $DIR/coherence_copy_like_err_fundamental_struct_tuple.rs:27:1 + --> $DIR/coherence_copy_like_err_fundamental_struct_tuple.rs:17:1 | LL | impl MyTrait for T { } | ---------------------------------- first implementation here diff --git a/src/test/ui/coherence/coherence_copy_like_err_struct.rs b/src/test/ui/coherence/coherence_copy_like_err_struct.rs index 04262e65c5a2a..f8c01b4e89eee 100644 --- a/src/test/ui/coherence/coherence_copy_like_err_struct.rs +++ b/src/test/ui/coherence/coherence_copy_like_err_struct.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:coherence_copy_like_lib.rs // Test that we are able to introduce a negative constraint that diff --git a/src/test/ui/coherence/coherence_copy_like_err_struct.stderr b/src/test/ui/coherence/coherence_copy_like_err_struct.stderr index 786a3df050375..03b4b7d807236 100644 --- a/src/test/ui/coherence/coherence_copy_like_err_struct.stderr +++ b/src/test/ui/coherence/coherence_copy_like_err_struct.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `MyTrait` for type `lib::MyStruct`: - --> $DIR/coherence_copy_like_err_struct.rs:29:1 + --> $DIR/coherence_copy_like_err_struct.rs:19:1 | LL | impl MyTrait for T { } | ---------------------------------- first implementation here diff --git a/src/test/ui/coherence/coherence_copy_like_err_tuple.rs b/src/test/ui/coherence/coherence_copy_like_err_tuple.rs index 378a70864f0ee..791ea1640f9e7 100644 --- a/src/test/ui/coherence/coherence_copy_like_err_tuple.rs +++ b/src/test/ui/coherence/coherence_copy_like_err_tuple.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are able to introduce a negative constraint that // `MyType: !MyTrait` along with other "fundamental" wrappers. diff --git a/src/test/ui/coherence/coherence_copy_like_err_tuple.stderr b/src/test/ui/coherence/coherence_copy_like_err_tuple.stderr index 3708a38443c3c..71c1a9173af31 100644 --- a/src/test/ui/coherence/coherence_copy_like_err_tuple.stderr +++ b/src/test/ui/coherence/coherence_copy_like_err_tuple.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `MyTrait` for type `(MyType,)`: - --> $DIR/coherence_copy_like_err_tuple.rs:28:1 + --> $DIR/coherence_copy_like_err_tuple.rs:18:1 | LL | impl MyTrait for T { } | ---------------------------------- first implementation here diff --git a/src/test/ui/coherence/coherence_inherent.rs b/src/test/ui/coherence/coherence_inherent.rs index 087b8c14e3575..f77f84bbb0c50 100644 --- a/src/test/ui/coherence/coherence_inherent.rs +++ b/src/test/ui/coherence/coherence_inherent.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that methods that implement a trait cannot be invoked // unless the trait is imported. diff --git a/src/test/ui/coherence/coherence_inherent.stderr b/src/test/ui/coherence/coherence_inherent.stderr index 1708979ab11d6..3974cfe94adbe 100644 --- a/src/test/ui/coherence/coherence_inherent.stderr +++ b/src/test/ui/coherence/coherence_inherent.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `the_fn` found for type `&Lib::TheStruct` in the current scope - --> $DIR/coherence_inherent.rs:41:11 + --> $DIR/coherence_inherent.rs:31:11 | LL | s.the_fn(); //~ ERROR no method named `the_fn` found | ^^^^^^ diff --git a/src/test/ui/coherence/coherence_inherent_cc.rs b/src/test/ui/coherence/coherence_inherent_cc.rs index 442c4c89de4e1..7ab10b2aa66b8 100644 --- a/src/test/ui/coherence/coherence_inherent_cc.rs +++ b/src/test/ui/coherence/coherence_inherent_cc.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:coherence_inherent_cc_lib.rs // Tests that methods that implement a trait cannot be invoked diff --git a/src/test/ui/coherence/coherence_inherent_cc.stderr b/src/test/ui/coherence/coherence_inherent_cc.stderr index a3c1b60d09a61..fcb3db711a0e1 100644 --- a/src/test/ui/coherence/coherence_inherent_cc.stderr +++ b/src/test/ui/coherence/coherence_inherent_cc.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `the_fn` found for type `&coherence_inherent_cc_lib::TheStruct` in the current scope - --> $DIR/coherence_inherent_cc.rs:33:11 + --> $DIR/coherence_inherent_cc.rs:23:11 | LL | s.the_fn(); //~ ERROR no method named `the_fn` found | ^^^^^^ diff --git a/src/test/ui/coherence/coherence_local.rs b/src/test/ui/coherence/coherence_local.rs index 551577b6b4e08..5eed8bb86e840 100644 --- a/src/test/ui/coherence/coherence_local.rs +++ b/src/test/ui/coherence/coherence_local.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are able to introduce a negative constraint that // `MyType: !MyTrait` along with other "fundamental" wrappers. diff --git a/src/test/ui/coherence/coherence_local.stderr b/src/test/ui/coherence/coherence_local.stderr index c4340e8d87686..aa5f39789251e 100644 --- a/src/test/ui/coherence/coherence_local.stderr +++ b/src/test/ui/coherence/coherence_local.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/coherence_local.rs:33:1 + --> $DIR/coherence_local.rs:23:1 | LL | fn main() { } //~ ERROR compilation successful | ^^^^^^^^^^^^^ diff --git a/src/test/ui/coherence/coherence_local_err_struct.rs b/src/test/ui/coherence/coherence_local_err_struct.rs index 01f4c1cd8a5c9..9a67fa569f53a 100644 --- a/src/test/ui/coherence/coherence_local_err_struct.rs +++ b/src/test/ui/coherence/coherence_local_err_struct.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are able to introduce a negative constraint that // `MyType: !MyTrait` along with other "fundamental" wrappers. diff --git a/src/test/ui/coherence/coherence_local_err_struct.stderr b/src/test/ui/coherence/coherence_local_err_struct.stderr index c35e95040de15..7ff88c55b062c 100644 --- a/src/test/ui/coherence/coherence_local_err_struct.stderr +++ b/src/test/ui/coherence/coherence_local_err_struct.stderr @@ -1,5 +1,5 @@ error[E0117]: only traits defined in the current crate can be implemented for arbitrary types - --> $DIR/coherence_local_err_struct.rs:26:1 + --> $DIR/coherence_local_err_struct.rs:16:1 | LL | impl lib::MyCopy for lib::MyStruct { } //~ ERROR E0117 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate diff --git a/src/test/ui/coherence/coherence_local_err_tuple.rs b/src/test/ui/coherence/coherence_local_err_tuple.rs index 590f68cee59ef..72b085ce2dc6a 100644 --- a/src/test/ui/coherence/coherence_local_err_tuple.rs +++ b/src/test/ui/coherence/coherence_local_err_tuple.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are able to introduce a negative constraint that // `MyType: !MyTrait` along with other "fundamental" wrappers. diff --git a/src/test/ui/coherence/coherence_local_err_tuple.stderr b/src/test/ui/coherence/coherence_local_err_tuple.stderr index a3f9f2d32b8f9..eab59579cb638 100644 --- a/src/test/ui/coherence/coherence_local_err_tuple.stderr +++ b/src/test/ui/coherence/coherence_local_err_tuple.stderr @@ -1,5 +1,5 @@ error[E0117]: only traits defined in the current crate can be implemented for arbitrary types - --> $DIR/coherence_local_err_tuple.rs:26:1 + --> $DIR/coherence_local_err_tuple.rs:16:1 | LL | impl lib::MyCopy for (MyType,) { } //~ ERROR E0117 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate diff --git a/src/test/ui/coherence/coherence_local_ref.rs b/src/test/ui/coherence/coherence_local_ref.rs index f6e1aab59766a..43398d1039b82 100644 --- a/src/test/ui/coherence/coherence_local_ref.rs +++ b/src/test/ui/coherence/coherence_local_ref.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we are able to introduce a negative constraint that // `MyType: !MyTrait` along with other "fundamental" wrappers. diff --git a/src/test/ui/coherence/coherence_local_ref.stderr b/src/test/ui/coherence/coherence_local_ref.stderr index 13d6fdd80f8a1..f600c21b80c50 100644 --- a/src/test/ui/coherence/coherence_local_ref.stderr +++ b/src/test/ui/coherence/coherence_local_ref.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/coherence_local_ref.rs:27:1 + --> $DIR/coherence_local_ref.rs:17:1 | LL | fn main() { } //~ ERROR compilation successful | ^^^^^^^^^^^^^ diff --git a/src/test/ui/command-line-diagnostics.nll.stderr b/src/test/ui/command-line-diagnostics.nll.stderr index 46bb7c5af5744..fc0aa11c4ff9b 100644 --- a/src/test/ui/command-line-diagnostics.nll.stderr +++ b/src/test/ui/command-line-diagnostics.nll.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `x` - --> $DIR/command-line-diagnostics.rs:16:5 + --> $DIR/command-line-diagnostics.rs:6:5 | LL | let x = 42; | - diff --git a/src/test/ui/command-line-diagnostics.rs b/src/test/ui/command-line-diagnostics.rs index ac631c2e45e59..248fb83a3abc7 100644 --- a/src/test/ui/command-line-diagnostics.rs +++ b/src/test/ui/command-line-diagnostics.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test checks the output format without the intermediate json representation // compile-flags: --error-format=human diff --git a/src/test/ui/command-line-diagnostics.stderr b/src/test/ui/command-line-diagnostics.stderr index 2a45edae32565..6f1156e0d36d7 100644 --- a/src/test/ui/command-line-diagnostics.stderr +++ b/src/test/ui/command-line-diagnostics.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `x` - --> $DIR/command-line-diagnostics.rs:16:5 + --> $DIR/command-line-diagnostics.rs:6:5 | LL | let x = 42; | - first assignment to `x` diff --git a/src/test/ui/compare-method/proj-outlives-region.rs b/src/test/ui/compare-method/proj-outlives-region.rs index eab01e9e98268..969bc566d3837 100644 --- a/src/test/ui/compare-method/proj-outlives-region.rs +++ b/src/test/ui/compare-method/proj-outlives-region.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we elaborate `Type: 'region` constraints and infer various important things. trait Master<'a, T: ?Sized, U> { diff --git a/src/test/ui/compare-method/proj-outlives-region.stderr b/src/test/ui/compare-method/proj-outlives-region.stderr index 5d734a25fe888..ba0b04dca9d24 100644 --- a/src/test/ui/compare-method/proj-outlives-region.stderr +++ b/src/test/ui/compare-method/proj-outlives-region.stderr @@ -1,5 +1,5 @@ error[E0276]: impl has stricter requirements than trait - --> $DIR/proj-outlives-region.rs:19:5 + --> $DIR/proj-outlives-region.rs:9:5 | LL | fn foo() where T: 'a; | --------------------- definition of `foo` from trait diff --git a/src/test/ui/compare-method/region-extra-2.rs b/src/test/ui/compare-method/region-extra-2.rs index b0cd3b8fdd29d..3d57b544e16af 100644 --- a/src/test/ui/compare-method/region-extra-2.rs +++ b/src/test/ui/compare-method/region-extra-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #22779. An extra where clause was // permitted on the impl that is not present on the trait. diff --git a/src/test/ui/compare-method/region-extra-2.stderr b/src/test/ui/compare-method/region-extra-2.stderr index 4e4f0d7c7bcee..420d99c15ec99 100644 --- a/src/test/ui/compare-method/region-extra-2.stderr +++ b/src/test/ui/compare-method/region-extra-2.stderr @@ -1,5 +1,5 @@ error[E0276]: impl has stricter requirements than trait - --> $DIR/region-extra-2.rs:19:5 + --> $DIR/region-extra-2.rs:9:5 | LL | fn renew<'b: 'a>(self) -> &'b mut [T]; | -------------------------------------- definition of `renew` from trait diff --git a/src/test/ui/compare-method/region-extra.rs b/src/test/ui/compare-method/region-extra.rs index 9befa1ba60eed..1070cb84512ec 100644 --- a/src/test/ui/compare-method/region-extra.rs +++ b/src/test/ui/compare-method/region-extra.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that you cannot add an extra where clause in the impl relating // two regions. diff --git a/src/test/ui/compare-method/region-extra.stderr b/src/test/ui/compare-method/region-extra.stderr index a366fe7467668..48ca690f425eb 100644 --- a/src/test/ui/compare-method/region-extra.stderr +++ b/src/test/ui/compare-method/region-extra.stderr @@ -1,5 +1,5 @@ error[E0276]: impl has stricter requirements than trait - --> $DIR/region-extra.rs:19:5 + --> $DIR/region-extra.rs:9:5 | LL | fn foo(); | --------- definition of `foo` from trait diff --git a/src/test/ui/compare-method/region-unrelated.rs b/src/test/ui/compare-method/region-unrelated.rs index 31ab6cb7fc42c..9730c9dfe6c98 100644 --- a/src/test/ui/compare-method/region-unrelated.rs +++ b/src/test/ui/compare-method/region-unrelated.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we elaborate `Type: 'region` constraints and infer various important things. trait Master<'a, T: ?Sized, U> { diff --git a/src/test/ui/compare-method/region-unrelated.stderr b/src/test/ui/compare-method/region-unrelated.stderr index 6448e0fb25abc..fd3576ddcf1b5 100644 --- a/src/test/ui/compare-method/region-unrelated.stderr +++ b/src/test/ui/compare-method/region-unrelated.stderr @@ -1,5 +1,5 @@ error[E0276]: impl has stricter requirements than trait - --> $DIR/region-unrelated.rs:19:5 + --> $DIR/region-unrelated.rs:9:5 | LL | fn foo() where T: 'a; | --------------------- definition of `foo` from trait diff --git a/src/test/ui/compare-method/reordered-type-param.rs b/src/test/ui/compare-method/reordered-type-param.rs index 0b844d4521d78..a858b66d760ea 100644 --- a/src/test/ui/compare-method/reordered-type-param.rs +++ b/src/test/ui/compare-method/reordered-type-param.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that ty params get matched correctly when comparing // an impl against a trait // diff --git a/src/test/ui/compare-method/reordered-type-param.stderr b/src/test/ui/compare-method/reordered-type-param.stderr index 1efd5f2fb258d..c162c720a48b2 100644 --- a/src/test/ui/compare-method/reordered-type-param.stderr +++ b/src/test/ui/compare-method/reordered-type-param.stderr @@ -1,5 +1,5 @@ error[E0053]: method `b` has an incompatible type for trait - --> $DIR/reordered-type-param.rs:26:30 + --> $DIR/reordered-type-param.rs:16:30 | LL | fn b(&self, x: C) -> C; | - type in trait diff --git a/src/test/ui/compare-method/trait-bound-on-type-parameter.rs b/src/test/ui/compare-method/trait-bound-on-type-parameter.rs index 09e9fb4ca2b62..5359001ea436f 100644 --- a/src/test/ui/compare-method/trait-bound-on-type-parameter.rs +++ b/src/test/ui/compare-method/trait-bound-on-type-parameter.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that impl can't add extra `F: Sync` bound aren't *more* restrictive // than the trait method it's implementing. // diff --git a/src/test/ui/compare-method/trait-bound-on-type-parameter.stderr b/src/test/ui/compare-method/trait-bound-on-type-parameter.stderr index 4530cb187183e..07f5a0a6cec46 100644 --- a/src/test/ui/compare-method/trait-bound-on-type-parameter.stderr +++ b/src/test/ui/compare-method/trait-bound-on-type-parameter.stderr @@ -1,5 +1,5 @@ error[E0276]: impl has stricter requirements than trait - --> $DIR/trait-bound-on-type-parameter.rs:25:5 + --> $DIR/trait-bound-on-type-parameter.rs:15:5 | LL | fn b(&self, x: C) -> C; | ---------------------------- definition of `b` from trait diff --git a/src/test/ui/compare-method/traits-misc-mismatch-1.rs b/src/test/ui/compare-method/traits-misc-mismatch-1.rs index cca282a1d195b..0da4aba303c10 100644 --- a/src/test/ui/compare-method/traits-misc-mismatch-1.rs +++ b/src/test/ui/compare-method/traits-misc-mismatch-1.rs @@ -1,12 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // Make sure rustc checks the type parameter bounds in implementations of traits, // see #2687 diff --git a/src/test/ui/compare-method/traits-misc-mismatch-1.stderr b/src/test/ui/compare-method/traits-misc-mismatch-1.stderr index e99ce95b371cc..717c0d2315ebc 100644 --- a/src/test/ui/compare-method/traits-misc-mismatch-1.stderr +++ b/src/test/ui/compare-method/traits-misc-mismatch-1.stderr @@ -1,5 +1,5 @@ error[E0276]: impl has stricter requirements than trait - --> $DIR/traits-misc-mismatch-1.rs:36:5 + --> $DIR/traits-misc-mismatch-1.rs:27:5 | LL | fn test_error1_fn(&self); | -------------------------------- definition of `test_error1_fn` from trait @@ -8,7 +8,7 @@ LL | fn test_error1_fn(&self) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl has extra requirement `T: std::cmp::Ord` error[E0276]: impl has stricter requirements than trait - --> $DIR/traits-misc-mismatch-1.rs:40:5 + --> $DIR/traits-misc-mismatch-1.rs:31:5 | LL | fn test_error2_fn(&self); | -------------------------------------- definition of `test_error2_fn` from trait @@ -17,7 +17,7 @@ LL | fn test_error2_fn(&self) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl has extra requirement `T: B` error[E0276]: impl has stricter requirements than trait - --> $DIR/traits-misc-mismatch-1.rs:44:5 + --> $DIR/traits-misc-mismatch-1.rs:35:5 | LL | fn test_error3_fn(&self); | -------------------------------------- definition of `test_error3_fn` from trait @@ -26,7 +26,7 @@ LL | fn test_error3_fn(&self) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl has extra requirement `T: B` error[E0276]: impl has stricter requirements than trait - --> $DIR/traits-misc-mismatch-1.rs:54:5 + --> $DIR/traits-misc-mismatch-1.rs:45:5 | LL | fn test_error5_fn(&self); | ------------------------------- definition of `test_error5_fn` from trait @@ -35,7 +35,7 @@ LL | fn test_error5_fn(&self) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl has extra requirement `T: B` error[E0276]: impl has stricter requirements than trait - --> $DIR/traits-misc-mismatch-1.rs:60:5 + --> $DIR/traits-misc-mismatch-1.rs:51:5 | LL | fn test_error7_fn(&self); | ------------------------------- definition of `test_error7_fn` from trait @@ -44,7 +44,7 @@ LL | fn test_error7_fn(&self) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl has extra requirement `T: std::cmp::Eq` error[E0276]: impl has stricter requirements than trait - --> $DIR/traits-misc-mismatch-1.rs:63:5 + --> $DIR/traits-misc-mismatch-1.rs:54:5 | LL | fn test_error8_fn(&self); | ------------------------------- definition of `test_error8_fn` from trait @@ -53,7 +53,7 @@ LL | fn test_error8_fn(&self) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl has extra requirement `T: C` error[E0276]: impl has stricter requirements than trait - --> $DIR/traits-misc-mismatch-1.rs:76:5 + --> $DIR/traits-misc-mismatch-1.rs:67:5 | LL | fn method>(&self); | ---------------------------------- definition of `method` from trait diff --git a/src/test/ui/compare-method/traits-misc-mismatch-2.rs b/src/test/ui/compare-method/traits-misc-mismatch-2.rs index e82cf256df131..d7f31c1d971b6 100644 --- a/src/test/ui/compare-method/traits-misc-mismatch-2.rs +++ b/src/test/ui/compare-method/traits-misc-mismatch-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue #5886: a complex instance of issue #2687. trait Iterator { diff --git a/src/test/ui/compare-method/traits-misc-mismatch-2.stderr b/src/test/ui/compare-method/traits-misc-mismatch-2.stderr index 1de5b1a8a1a97..acf94ad32b1df 100644 --- a/src/test/ui/compare-method/traits-misc-mismatch-2.stderr +++ b/src/test/ui/compare-method/traits-misc-mismatch-2.stderr @@ -1,5 +1,5 @@ error[E0276]: impl has stricter requirements than trait - --> $DIR/traits-misc-mismatch-2.rs:23:5 + --> $DIR/traits-misc-mismatch-2.rs:13:5 | LL | fn zip>(self, other: U) -> ZipIterator; | ------------------------------------------------------------------ definition of `zip` from trait diff --git a/src/test/ui/compile_error_macro.rs b/src/test/ui/compile_error_macro.rs index e9c5993098c3e..3f7b57cd07847 100644 --- a/src/test/ui/compile_error_macro.rs +++ b/src/test/ui/compile_error_macro.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { compile_error!("a very descriptive error message"); //~ ERROR: a very descriptive error message } diff --git a/src/test/ui/compile_error_macro.stderr b/src/test/ui/compile_error_macro.stderr index 1abf5accc1747..9e11db68315e9 100644 --- a/src/test/ui/compile_error_macro.stderr +++ b/src/test/ui/compile_error_macro.stderr @@ -1,5 +1,5 @@ error: a very descriptive error message - --> $DIR/compile_error_macro.rs:12:5 + --> $DIR/compile_error_macro.rs:2:5 | LL | compile_error!("a very descriptive error message"); //~ ERROR: a very descriptive error message | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/concat.rs b/src/test/ui/concat.rs index e29c6ac5d5e94..d7ab7d62625d7 100644 --- a/src/test/ui/concat.rs +++ b/src/test/ui/concat.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { concat!(b'f'); //~ ERROR: cannot concatenate a byte string literal concat!(b"foo"); //~ ERROR: cannot concatenate a byte string literal diff --git a/src/test/ui/concat.stderr b/src/test/ui/concat.stderr index 0128811353f16..b6024972c7448 100644 --- a/src/test/ui/concat.stderr +++ b/src/test/ui/concat.stderr @@ -1,17 +1,17 @@ error: cannot concatenate a byte string literal - --> $DIR/concat.rs:12:13 + --> $DIR/concat.rs:2:13 | LL | concat!(b'f'); //~ ERROR: cannot concatenate a byte string literal | ^^^^ error: cannot concatenate a byte string literal - --> $DIR/concat.rs:13:13 + --> $DIR/concat.rs:3:13 | LL | concat!(b"foo"); //~ ERROR: cannot concatenate a byte string literal | ^^^^^^ error: expected a literal - --> $DIR/concat.rs:14:13 + --> $DIR/concat.rs:4:13 | LL | concat!(foo); //~ ERROR: expected a literal | ^^^ @@ -19,7 +19,7 @@ LL | concat!(foo); //~ ERROR: expected a literal = note: only literals (like `"foo"`, `42` and `3.14`) can be passed to `concat!()` error: expected a literal - --> $DIR/concat.rs:15:13 + --> $DIR/concat.rs:5:13 | LL | concat!(foo()); //~ ERROR: expected a literal | ^^^^^ diff --git a/src/test/ui/conflicting-repr-hints.rs b/src/test/ui/conflicting-repr-hints.rs index 426f60c6b098c..bf618a6afccb0 100644 --- a/src/test/ui/conflicting-repr-hints.rs +++ b/src/test/ui/conflicting-repr-hints.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] #![feature(repr_packed)] diff --git a/src/test/ui/conflicting-repr-hints.stderr b/src/test/ui/conflicting-repr-hints.stderr index 7a4e5a5488ad3..792331ac0808d 100644 --- a/src/test/ui/conflicting-repr-hints.stderr +++ b/src/test/ui/conflicting-repr-hints.stderr @@ -1,47 +1,47 @@ warning[E0566]: conflicting representation hints - --> $DIR/conflicting-repr-hints.rs:20:8 + --> $DIR/conflicting-repr-hints.rs:10:8 | LL | #[repr(C, u64)] //~ WARNING conflicting representation hints | ^ ^^^ warning[E0566]: conflicting representation hints - --> $DIR/conflicting-repr-hints.rs:23:8 + --> $DIR/conflicting-repr-hints.rs:13:8 | LL | #[repr(u32, u64)] //~ WARNING conflicting representation hints | ^^^ ^^^ error[E0587]: type has conflicting packed and align representation hints - --> $DIR/conflicting-repr-hints.rs:30:1 + --> $DIR/conflicting-repr-hints.rs:20:1 | LL | struct F(i32); //~ ERROR type has conflicting packed and align representation hints | ^^^^^^^^^^^^^^ error[E0587]: type has conflicting packed and align representation hints - --> $DIR/conflicting-repr-hints.rs:34:1 + --> $DIR/conflicting-repr-hints.rs:24:1 | LL | struct G(i32); //~ ERROR type has conflicting packed and align representation hints | ^^^^^^^^^^^^^^ error[E0587]: type has conflicting packed and align representation hints - --> $DIR/conflicting-repr-hints.rs:38:1 + --> $DIR/conflicting-repr-hints.rs:28:1 | LL | struct H(i32); //~ ERROR type has conflicting packed and align representation hints | ^^^^^^^^^^^^^^ error[E0634]: type has conflicting packed representation hints - --> $DIR/conflicting-repr-hints.rs:41:1 + --> $DIR/conflicting-repr-hints.rs:31:1 | LL | struct I(i32); //~ ERROR type has conflicting packed representation hints | ^^^^^^^^^^^^^^ error[E0634]: type has conflicting packed representation hints - --> $DIR/conflicting-repr-hints.rs:45:1 + --> $DIR/conflicting-repr-hints.rs:35:1 | LL | struct J(i32); //~ ERROR type has conflicting packed representation hints | ^^^^^^^^^^^^^^ error[E0587]: type has conflicting packed and align representation hints - --> $DIR/conflicting-repr-hints.rs:51:1 + --> $DIR/conflicting-repr-hints.rs:41:1 | LL | / union X { //~ ERROR type has conflicting packed and align representation hints LL | | i: i32 @@ -49,7 +49,7 @@ LL | | } | |_^ error[E0587]: type has conflicting packed and align representation hints - --> $DIR/conflicting-repr-hints.rs:57:1 + --> $DIR/conflicting-repr-hints.rs:47:1 | LL | / union Y { //~ ERROR type has conflicting packed and align representation hints LL | | i: i32 @@ -57,7 +57,7 @@ LL | | } | |_^ error[E0587]: type has conflicting packed and align representation hints - --> $DIR/conflicting-repr-hints.rs:63:1 + --> $DIR/conflicting-repr-hints.rs:53:1 | LL | / union Z { //~ ERROR type has conflicting packed and align representation hints LL | | i: i32 diff --git a/src/test/ui/confuse-field-and-method/issue-18343.rs b/src/test/ui/confuse-field-and-method/issue-18343.rs index ef1566ab56ae8..bc2d73fae11b6 100644 --- a/src/test/ui/confuse-field-and-method/issue-18343.rs +++ b/src/test/ui/confuse-field-and-method/issue-18343.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Obj where F: FnMut() -> u32 { closure: F, } diff --git a/src/test/ui/confuse-field-and-method/issue-18343.stderr b/src/test/ui/confuse-field-and-method/issue-18343.stderr index b1e3105a5f920..36112cd0e10c9 100644 --- a/src/test/ui/confuse-field-and-method/issue-18343.stderr +++ b/src/test/ui/confuse-field-and-method/issue-18343.stderr @@ -1,5 +1,5 @@ -error[E0599]: no method named `closure` found for type `Obj<[closure@$DIR/issue-18343.rs:16:28: 16:33]>` in the current scope - --> $DIR/issue-18343.rs:17:7 +error[E0599]: no method named `closure` found for type `Obj<[closure@$DIR/issue-18343.rs:6:28: 6:33]>` in the current scope + --> $DIR/issue-18343.rs:7:7 | LL | struct Obj where F: FnMut() -> u32 { | ------------------------------------- method `closure` not found for this diff --git a/src/test/ui/confuse-field-and-method/issue-2392.rs b/src/test/ui/confuse-field-and-method/issue-2392.rs index f0c5a2a913f8e..41287c2591497 100644 --- a/src/test/ui/confuse-field-and-method/issue-2392.rs +++ b/src/test/ui/confuse-field-and-method/issue-2392.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(core, fnbox)] use std::boxed::FnBox; diff --git a/src/test/ui/confuse-field-and-method/issue-2392.stderr b/src/test/ui/confuse-field-and-method/issue-2392.stderr index 9049ffd409090..0c09bd2284be4 100644 --- a/src/test/ui/confuse-field-and-method/issue-2392.stderr +++ b/src/test/ui/confuse-field-and-method/issue-2392.stderr @@ -1,5 +1,5 @@ -error[E0599]: no method named `closure` found for type `Obj<[closure@$DIR/issue-2392.rs:49:36: 49:41]>` in the current scope - --> $DIR/issue-2392.rs:50:15 +error[E0599]: no method named `closure` found for type `Obj<[closure@$DIR/issue-2392.rs:39:36: 39:41]>` in the current scope + --> $DIR/issue-2392.rs:40:15 | LL | struct Obj where F: FnOnce() -> u32 { | -------------------------------------- method `closure` not found for this @@ -9,8 +9,8 @@ LL | o_closure.closure(); //~ ERROR no method named `closure` found | = help: use `(o_closure.closure)(...)` if you meant to call the function stored in the `closure` field -error[E0599]: no method named `not_closure` found for type `Obj<[closure@$DIR/issue-2392.rs:49:36: 49:41]>` in the current scope - --> $DIR/issue-2392.rs:52:15 +error[E0599]: no method named `not_closure` found for type `Obj<[closure@$DIR/issue-2392.rs:39:36: 39:41]>` in the current scope + --> $DIR/issue-2392.rs:42:15 | LL | struct Obj where F: FnOnce() -> u32 { | -------------------------------------- method `not_closure` not found for this @@ -21,7 +21,7 @@ LL | o_closure.not_closure(); = help: did you mean to write `o_closure.not_closure` instead of `o_closure.not_closure(...)`? error[E0599]: no method named `closure` found for type `Obj u32 {func}>` in the current scope - --> $DIR/issue-2392.rs:56:12 + --> $DIR/issue-2392.rs:46:12 | LL | struct Obj where F: FnOnce() -> u32 { | -------------------------------------- method `closure` not found for this @@ -32,7 +32,7 @@ LL | o_func.closure(); //~ ERROR no method named `closure` found = help: use `(o_func.closure)(...)` if you meant to call the function stored in the `closure` field error[E0599]: no method named `boxed_closure` found for type `BoxedObj` in the current scope - --> $DIR/issue-2392.rs:59:14 + --> $DIR/issue-2392.rs:49:14 | LL | struct BoxedObj { | --------------- method `boxed_closure` not found for this @@ -43,7 +43,7 @@ LL | boxed_fn.boxed_closure();//~ ERROR no method named `boxed_closure` foun = help: use `(boxed_fn.boxed_closure)(...)` if you meant to call the function stored in the `boxed_closure` field error[E0599]: no method named `boxed_closure` found for type `BoxedObj` in the current scope - --> $DIR/issue-2392.rs:62:19 + --> $DIR/issue-2392.rs:52:19 | LL | struct BoxedObj { | --------------- method `boxed_closure` not found for this @@ -54,7 +54,7 @@ LL | boxed_closure.boxed_closure();//~ ERROR no method named `boxed_closure` = help: use `(boxed_closure.boxed_closure)(...)` if you meant to call the function stored in the `boxed_closure` field error[E0599]: no method named `closure` found for type `Obj u32 {func}>` in the current scope - --> $DIR/issue-2392.rs:67:12 + --> $DIR/issue-2392.rs:57:12 | LL | struct Obj where F: FnOnce() -> u32 { | -------------------------------------- method `closure` not found for this @@ -65,7 +65,7 @@ LL | w.wrap.closure();//~ ERROR no method named `closure` found = help: use `(w.wrap.closure)(...)` if you meant to call the function stored in the `closure` field error[E0599]: no method named `not_closure` found for type `Obj u32 {func}>` in the current scope - --> $DIR/issue-2392.rs:69:12 + --> $DIR/issue-2392.rs:59:12 | LL | struct Obj where F: FnOnce() -> u32 { | -------------------------------------- method `not_closure` not found for this @@ -76,7 +76,7 @@ LL | w.wrap.not_closure(); = help: did you mean to write `w.wrap.not_closure` instead of `w.wrap.not_closure(...)`? error[E0599]: no method named `closure` found for type `Obj + 'static)>>` in the current scope - --> $DIR/issue-2392.rs:72:24 + --> $DIR/issue-2392.rs:62:24 | LL | struct Obj where F: FnOnce() -> u32 { | -------------------------------------- method `closure` not found for this @@ -87,7 +87,7 @@ LL | check_expression().closure();//~ ERROR no method named `closure` found = help: use `(check_expression().closure)(...)` if you meant to call the function stored in the `closure` field error[E0599]: no method named `f1` found for type `FuncContainer` in the current scope - --> $DIR/issue-2392.rs:78:31 + --> $DIR/issue-2392.rs:68:31 | LL | struct FuncContainer { | -------------------- method `f1` not found for this @@ -98,7 +98,7 @@ LL | (*self.container).f1(1); //~ ERROR no method named `f1` found = help: use `((*self.container).f1)(...)` if you meant to call the function stored in the `f1` field error[E0599]: no method named `f2` found for type `FuncContainer` in the current scope - --> $DIR/issue-2392.rs:79:31 + --> $DIR/issue-2392.rs:69:31 | LL | struct FuncContainer { | -------------------- method `f2` not found for this @@ -109,7 +109,7 @@ LL | (*self.container).f2(1); //~ ERROR no method named `f2` found = help: use `((*self.container).f2)(...)` if you meant to call the function stored in the `f2` field error[E0599]: no method named `f3` found for type `FuncContainer` in the current scope - --> $DIR/issue-2392.rs:80:31 + --> $DIR/issue-2392.rs:70:31 | LL | struct FuncContainer { | -------------------- method `f3` not found for this diff --git a/src/test/ui/confuse-field-and-method/issue-32128.rs b/src/test/ui/confuse-field-and-method/issue-32128.rs index d306b38e00e3f..02c6838d41941 100644 --- a/src/test/ui/confuse-field-and-method/issue-32128.rs +++ b/src/test/ui/confuse-field-and-method/issue-32128.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Example { example: Box i32> } diff --git a/src/test/ui/confuse-field-and-method/issue-32128.stderr b/src/test/ui/confuse-field-and-method/issue-32128.stderr index 95b764b43ede5..902f60668f2ed 100644 --- a/src/test/ui/confuse-field-and-method/issue-32128.stderr +++ b/src/test/ui/confuse-field-and-method/issue-32128.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `example` found for type `Example` in the current scope - --> $DIR/issue-32128.rs:22:10 + --> $DIR/issue-32128.rs:12:10 | LL | struct Example { | -------------- method `example` not found for this diff --git a/src/test/ui/confuse-field-and-method/issue-33784.rs b/src/test/ui/confuse-field-and-method/issue-33784.rs index 4cd50be50d4a5..e9bb1f9fb463e 100644 --- a/src/test/ui/confuse-field-and-method/issue-33784.rs +++ b/src/test/ui/confuse-field-and-method/issue-33784.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::Deref; struct Obj where F: FnMut() -> u32 { diff --git a/src/test/ui/confuse-field-and-method/issue-33784.stderr b/src/test/ui/confuse-field-and-method/issue-33784.stderr index b7f13320eec6e..73bcf0fd9c07e 100644 --- a/src/test/ui/confuse-field-and-method/issue-33784.stderr +++ b/src/test/ui/confuse-field-and-method/issue-33784.stderr @@ -1,13 +1,13 @@ -error[E0599]: no method named `closure` found for type `&Obj<[closure@$DIR/issue-33784.rs:35:43: 35:48]>` in the current scope - --> $DIR/issue-33784.rs:37:7 +error[E0599]: no method named `closure` found for type `&Obj<[closure@$DIR/issue-33784.rs:25:43: 25:48]>` in the current scope + --> $DIR/issue-33784.rs:27:7 | LL | p.closure(); //~ ERROR no method named `closure` found | ^^^^^^^ field, not a method | = help: use `(p.closure)(...)` if you meant to call the function stored in the `closure` field -error[E0599]: no method named `fn_ptr` found for type `&&Obj<[closure@$DIR/issue-33784.rs:35:43: 35:48]>` in the current scope - --> $DIR/issue-33784.rs:39:7 +error[E0599]: no method named `fn_ptr` found for type `&&Obj<[closure@$DIR/issue-33784.rs:25:43: 25:48]>` in the current scope + --> $DIR/issue-33784.rs:29:7 | LL | q.fn_ptr(); //~ ERROR no method named `fn_ptr` found | ^^^^^^ field, not a method @@ -15,7 +15,7 @@ LL | q.fn_ptr(); //~ ERROR no method named `fn_ptr` found = help: use `(q.fn_ptr)(...)` if you meant to call the function stored in the `fn_ptr` field error[E0599]: no method named `c_fn_ptr` found for type `&D` in the current scope - --> $DIR/issue-33784.rs:42:7 + --> $DIR/issue-33784.rs:32:7 | LL | s.c_fn_ptr(); //~ ERROR no method named `c_fn_ptr` found | ^^^^^^^^ field, not a method diff --git a/src/test/ui/confuse-field-and-method/private-field.rs b/src/test/ui/confuse-field-and-method/private-field.rs index 4cf939bbed6f5..28b8935ac0daa 100644 --- a/src/test/ui/confuse-field-and-method/private-field.rs +++ b/src/test/ui/confuse-field-and-method/private-field.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod animal { pub struct Dog { pub age: usize, diff --git a/src/test/ui/confuse-field-and-method/private-field.stderr b/src/test/ui/confuse-field-and-method/private-field.stderr index 145df8b156bfb..e3058ad0a9ea5 100644 --- a/src/test/ui/confuse-field-and-method/private-field.stderr +++ b/src/test/ui/confuse-field-and-method/private-field.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `dog_age` found for type `animal::Dog` in the current scope - --> $DIR/private-field.rs:26:23 + --> $DIR/private-field.rs:16:23 | LL | pub struct Dog { | -------------- method `dog_age` not found for this diff --git a/src/test/ui/conservative_impl_trait.rs b/src/test/ui/conservative_impl_trait.rs index 30895bce357bb..3e095a147683c 100644 --- a/src/test/ui/conservative_impl_trait.rs +++ b/src/test/ui/conservative_impl_trait.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // #39872, #39553 fn will_ice(something: &u32) -> impl Iterator { diff --git a/src/test/ui/conservative_impl_trait.stderr b/src/test/ui/conservative_impl_trait.stderr index 6fcd384566cf8..a3867670b8db4 100644 --- a/src/test/ui/conservative_impl_trait.stderr +++ b/src/test/ui/conservative_impl_trait.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `(): std::iter::Iterator` is not satisfied - --> $DIR/conservative_impl_trait.rs:13:33 + --> $DIR/conservative_impl_trait.rs:3:33 | LL | fn will_ice(something: &u32) -> impl Iterator { | ^^^^^^^^^^^^^^^^^^^^^^^^^^ `()` is not an iterator; maybe try calling `.iter()` or a similar method diff --git a/src/test/ui/constructor-lifetime-args.rs b/src/test/ui/constructor-lifetime-args.rs index 1fe50cfebbac3..0a4f1f675c264 100644 --- a/src/test/ui/constructor-lifetime-args.rs +++ b/src/test/ui/constructor-lifetime-args.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // All lifetime parameters in struct constructors are currently considered early bound, // i.e. `S::` is interpreted kinda like an associated item `S::::ctor`. // This behavior is a bit weird, because if equivalent constructor were written manually diff --git a/src/test/ui/constructor-lifetime-args.stderr b/src/test/ui/constructor-lifetime-args.stderr index cf3ad9ae8ecd7..45988e850ab32 100644 --- a/src/test/ui/constructor-lifetime-args.stderr +++ b/src/test/ui/constructor-lifetime-args.stderr @@ -1,23 +1,23 @@ error[E0090]: wrong number of lifetime arguments: expected 2, found 1 - --> $DIR/constructor-lifetime-args.rs:27:5 + --> $DIR/constructor-lifetime-args.rs:17:5 | LL | S::<'static>(&0, &0); | ^^^^^^^^^^^^ expected 2 lifetime arguments error[E0088]: wrong number of lifetime arguments: expected 2, found 3 - --> $DIR/constructor-lifetime-args.rs:29:27 + --> $DIR/constructor-lifetime-args.rs:19:27 | LL | S::<'static, 'static, 'static>(&0, &0); | ^^^^^^^ unexpected lifetime argument error[E0090]: wrong number of lifetime arguments: expected 2, found 1 - --> $DIR/constructor-lifetime-args.rs:32:5 + --> $DIR/constructor-lifetime-args.rs:22:5 | LL | E::V::<'static>(&0); | ^^^^^^^^^^^^^^^ expected 2 lifetime arguments error[E0088]: wrong number of lifetime arguments: expected 2, found 3 - --> $DIR/constructor-lifetime-args.rs:34:30 + --> $DIR/constructor-lifetime-args.rs:24:30 | LL | E::V::<'static, 'static, 'static>(&0); | ^^^^^^^ unexpected lifetime argument diff --git a/src/test/ui/consts/auxiliary/const_fn_lib.rs b/src/test/ui/consts/auxiliary/const_fn_lib.rs index b0d5a6b12727b..a608d5b34aba9 100644 --- a/src/test/ui/consts/auxiliary/const_fn_lib.rs +++ b/src/test/ui/consts/auxiliary/const_fn_lib.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Crate that exports a const fn. Used for testing cross-crate. #![crate_type="rlib"] diff --git a/src/test/ui/consts/const-array-oob-arith.rs b/src/test/ui/consts/const-array-oob-arith.rs index 9c07abdc36df7..2f9b30b51d10a 100644 --- a/src/test/ui/consts/const-array-oob-arith.rs +++ b/src/test/ui/consts/const-array-oob-arith.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_indexing)] const ARR: [i32; 6] = [42, 43, 44, 45, 46, 47]; diff --git a/src/test/ui/consts/const-array-oob-arith.stderr b/src/test/ui/consts/const-array-oob-arith.stderr index 5b5f9425e73b8..edd3095b0fc7d 100644 --- a/src/test/ui/consts/const-array-oob-arith.stderr +++ b/src/test/ui/consts/const-array-oob-arith.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/const-array-oob-arith.rs:17:45 + --> $DIR/const-array-oob-arith.rs:7:45 | LL | const BLUB: [i32; (ARR[0] - 40) as usize] = [5]; //~ ERROR: mismatched types | ^^^ expected an array with a fixed size of 2 elements, found one with 1 elements @@ -8,7 +8,7 @@ LL | const BLUB: [i32; (ARR[0] - 40) as usize] = [5]; //~ ERROR: mismatched type found type `[i32; 1]` error[E0308]: mismatched types - --> $DIR/const-array-oob-arith.rs:18:44 + --> $DIR/const-array-oob-arith.rs:8:44 | LL | const BOO: [i32; (ARR[0] - 41) as usize] = [5, 99]; //~ ERROR: mismatched types | ^^^^^^^ expected an array with a fixed size of 1 elements, found one with 2 elements diff --git a/src/test/ui/consts/const-array-oob.rs b/src/test/ui/consts/const-array-oob.rs index 22a3c5ceeb714..d36b23014df89 100644 --- a/src/test/ui/consts/const-array-oob.rs +++ b/src/test/ui/consts/const-array-oob.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength #![feature(const_indexing)] diff --git a/src/test/ui/consts/const-array-oob.stderr b/src/test/ui/consts/const-array-oob.stderr index 09e4918bf6eed..6fc2b1e8174a6 100644 --- a/src/test/ui/consts/const-array-oob.stderr +++ b/src/test/ui/consts/const-array-oob.stderr @@ -1,5 +1,5 @@ error: index out of bounds: the len is 3 but the index is 4 - --> $DIR/const-array-oob.rs:18:19 + --> $DIR/const-array-oob.rs:8:19 | LL | const BLUB: [u32; FOO[4]] = [5, 6]; | ^^^^^^ @@ -7,7 +7,7 @@ LL | const BLUB: [u32; FOO[4]] = [5, 6]; = note: #[deny(const_err)] on by default error[E0080]: could not evaluate constant expression - --> $DIR/const-array-oob.rs:18:1 + --> $DIR/const-array-oob.rs:8:1 | LL | const BLUB: [u32; FOO[4]] = [5, 6]; | ^^^^^^^^^^^^^^^^^^------^^^^^^^^^^^ diff --git a/src/test/ui/consts/const-block-non-item-statement-2.rs b/src/test/ui/consts/const-block-non-item-statement-2.rs index f80d55cb34267..58a6cf6dcfdeb 100644 --- a/src/test/ui/consts/const-block-non-item-statement-2.rs +++ b/src/test/ui/consts/const-block-non-item-statement-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const A: usize = { 1; 2 }; //~^ ERROR statements in constants are unstable diff --git a/src/test/ui/consts/const-block-non-item-statement-2.stderr b/src/test/ui/consts/const-block-non-item-statement-2.stderr index 580f7e039d1c3..e0c61a953f50b 100644 --- a/src/test/ui/consts/const-block-non-item-statement-2.stderr +++ b/src/test/ui/consts/const-block-non-item-statement-2.stderr @@ -1,5 +1,5 @@ error[E0658]: statements in constants are unstable (see issue #48821) - --> $DIR/const-block-non-item-statement-2.rs:11:20 + --> $DIR/const-block-non-item-statement-2.rs:1:20 | LL | const A: usize = { 1; 2 }; | ^ @@ -7,7 +7,7 @@ LL | const A: usize = { 1; 2 }; = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: statements in constants are unstable (see issue #48821) - --> $DIR/const-block-non-item-statement-2.rs:14:20 + --> $DIR/const-block-non-item-statement-2.rs:4:20 | LL | const B: usize = { { } 2 }; | ^^^ @@ -15,7 +15,7 @@ LL | const B: usize = { { } 2 }; = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: statements in constants are unstable (see issue #48821) - --> $DIR/const-block-non-item-statement-2.rs:18:12 + --> $DIR/const-block-non-item-statement-2.rs:8:12 | LL | () => (()) //~ ERROR statements in constants are unstable | ^^ @@ -26,7 +26,7 @@ LL | const C: usize = { foo!(); 2 }; = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: let bindings in constants are unstable (see issue #48821) - --> $DIR/const-block-non-item-statement-2.rs:22:28 + --> $DIR/const-block-non-item-statement-2.rs:12:28 | LL | const D: usize = { let x = 4; 2 }; | ^ @@ -34,7 +34,7 @@ LL | const D: usize = { let x = 4; 2 }; = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: statements in constants are unstable (see issue #48821) - --> $DIR/const-block-non-item-statement-2.rs:22:28 + --> $DIR/const-block-non-item-statement-2.rs:12:28 | LL | const D: usize = { let x = 4; 2 }; | ^ @@ -42,7 +42,7 @@ LL | const D: usize = { let x = 4; 2 }; = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: let bindings in constants are unstable (see issue #48821) - --> $DIR/const-block-non-item-statement-2.rs:22:1 + --> $DIR/const-block-non-item-statement-2.rs:12:1 | LL | const D: usize = { let x = 4; 2 }; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -50,7 +50,7 @@ LL | const D: usize = { let x = 4; 2 }; = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: statements in constants are unstable (see issue #48821) - --> $DIR/const-block-non-item-statement-2.rs:22:1 + --> $DIR/const-block-non-item-statement-2.rs:12:1 | LL | const D: usize = { let x = 4; 2 }; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/consts/const-block-non-item-statement-3.rs b/src/test/ui/consts/const-block-non-item-statement-3.rs index cfa4b778dde80..867840925b2d5 100644 --- a/src/test/ui/consts/const-block-non-item-statement-3.rs +++ b/src/test/ui/consts/const-block-non-item-statement-3.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - type Array = [u32; { let x = 2; 5 }]; //~^ ERROR let bindings in constants are unstable //~| ERROR statements in constants are unstable diff --git a/src/test/ui/consts/const-block-non-item-statement-3.stderr b/src/test/ui/consts/const-block-non-item-statement-3.stderr index 0124288d43d57..0a549bc0c8ded 100644 --- a/src/test/ui/consts/const-block-non-item-statement-3.stderr +++ b/src/test/ui/consts/const-block-non-item-statement-3.stderr @@ -1,5 +1,5 @@ error[E0658]: let bindings in constants are unstable (see issue #48821) - --> $DIR/const-block-non-item-statement-3.rs:11:31 + --> $DIR/const-block-non-item-statement-3.rs:1:31 | LL | type Array = [u32; { let x = 2; 5 }]; | ^ @@ -7,7 +7,7 @@ LL | type Array = [u32; { let x = 2; 5 }]; = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: statements in constants are unstable (see issue #48821) - --> $DIR/const-block-non-item-statement-3.rs:11:31 + --> $DIR/const-block-non-item-statement-3.rs:1:31 | LL | type Array = [u32; { let x = 2; 5 }]; | ^ @@ -15,7 +15,7 @@ LL | type Array = [u32; { let x = 2; 5 }]; = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: let bindings in constants are unstable (see issue #48821) - --> $DIR/const-block-non-item-statement-3.rs:11:20 + --> $DIR/const-block-non-item-statement-3.rs:1:20 | LL | type Array = [u32; { let x = 2; 5 }]; | ^^^^^^^^^^^^^^^^^ @@ -23,7 +23,7 @@ LL | type Array = [u32; { let x = 2; 5 }]; = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: statements in constants are unstable (see issue #48821) - --> $DIR/const-block-non-item-statement-3.rs:11:20 + --> $DIR/const-block-non-item-statement-3.rs:1:20 | LL | type Array = [u32; { let x = 2; 5 }]; | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/consts/const-block-non-item-statement.rs b/src/test/ui/consts/const-block-non-item-statement.rs index f974a24c26f72..2db9e2413e5b5 100644 --- a/src/test/ui/consts/const-block-non-item-statement.rs +++ b/src/test/ui/consts/const-block-non-item-statement.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Foo { Bar = { let x = 1; 3 } //~^ ERROR let bindings in constants are unstable diff --git a/src/test/ui/consts/const-block-non-item-statement.stderr b/src/test/ui/consts/const-block-non-item-statement.stderr index b367a9d99374e..f0d751e07561c 100644 --- a/src/test/ui/consts/const-block-non-item-statement.stderr +++ b/src/test/ui/consts/const-block-non-item-statement.stderr @@ -1,5 +1,5 @@ error[E0658]: let bindings in constants are unstable (see issue #48821) - --> $DIR/const-block-non-item-statement.rs:12:21 + --> $DIR/const-block-non-item-statement.rs:2:21 | LL | Bar = { let x = 1; 3 } | ^ @@ -7,7 +7,7 @@ LL | Bar = { let x = 1; 3 } = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: statements in constants are unstable (see issue #48821) - --> $DIR/const-block-non-item-statement.rs:12:21 + --> $DIR/const-block-non-item-statement.rs:2:21 | LL | Bar = { let x = 1; 3 } | ^ @@ -15,7 +15,7 @@ LL | Bar = { let x = 1; 3 } = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: let bindings in constants are unstable (see issue #48821) - --> $DIR/const-block-non-item-statement.rs:12:11 + --> $DIR/const-block-non-item-statement.rs:2:11 | LL | Bar = { let x = 1; 3 } | ^^^^^^^^^^^^^^^^ @@ -23,7 +23,7 @@ LL | Bar = { let x = 1; 3 } = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: statements in constants are unstable (see issue #48821) - --> $DIR/const-block-non-item-statement.rs:12:11 + --> $DIR/const-block-non-item-statement.rs:2:11 | LL | Bar = { let x = 1; 3 } | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/consts/const-call.rs b/src/test/ui/consts/const-call.rs index 02264228a6bf6..3a11db7603c1b 100644 --- a/src/test/ui/consts/const-call.rs +++ b/src/test/ui/consts/const-call.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn f(x: usize) -> usize { x } diff --git a/src/test/ui/consts/const-call.stderr b/src/test/ui/consts/const-call.stderr index efc3c58c6813b..7cca7dc028f4a 100644 --- a/src/test/ui/consts/const-call.stderr +++ b/src/test/ui/consts/const-call.stderr @@ -1,11 +1,11 @@ error[E0015]: calls in constants are limited to constant functions, tuple structs and tuple variants - --> $DIR/const-call.rs:16:17 + --> $DIR/const-call.rs:6:17 | LL | let _ = [0; f(2)]; | ^^^^ error[E0080]: could not evaluate repeat length - --> $DIR/const-call.rs:16:17 + --> $DIR/const-call.rs:6:17 | LL | let _ = [0; f(2)]; | ^^^^ calling non-const fn `f` diff --git a/src/test/ui/consts/const-cast-different-types.rs b/src/test/ui/consts/const-cast-different-types.rs index 397804566b4ae..3bd5ed8f8c924 100644 --- a/src/test/ui/consts/const-cast-different-types.rs +++ b/src/test/ui/consts/const-cast-different-types.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - static a: &'static str = "foo"; static b: *const u8 = a as *const u8; //~ ERROR casting static c: *const u8 = &a as *const u8; //~ ERROR casting diff --git a/src/test/ui/consts/const-cast-different-types.stderr b/src/test/ui/consts/const-cast-different-types.stderr index bc4d135869744..ced9b9fb3c7c9 100644 --- a/src/test/ui/consts/const-cast-different-types.stderr +++ b/src/test/ui/consts/const-cast-different-types.stderr @@ -1,11 +1,11 @@ error[E0606]: casting `&'static str` as `*const u8` is invalid - --> $DIR/const-cast-different-types.rs:12:23 + --> $DIR/const-cast-different-types.rs:2:23 | LL | static b: *const u8 = a as *const u8; //~ ERROR casting | ^^^^^^^^^^^^^^ error[E0606]: casting `&&'static str` as `*const u8` is invalid - --> $DIR/const-cast-different-types.rs:13:23 + --> $DIR/const-cast-different-types.rs:3:23 | LL | static c: *const u8 = &a as *const u8; //~ ERROR casting | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/consts/const-cast-wrong-type.rs b/src/test/ui/consts/const-cast-wrong-type.rs index b359744183418..c250cc53dbc2b 100644 --- a/src/test/ui/consts/const-cast-wrong-type.rs +++ b/src/test/ui/consts/const-cast-wrong-type.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - static a: [u8; 3] = ['h' as u8, 'i' as u8, 0 as u8]; static b: *const i8 = &a as *const i8; //~ ERROR mismatched types diff --git a/src/test/ui/consts/const-cast-wrong-type.stderr b/src/test/ui/consts/const-cast-wrong-type.stderr index d7ac89cc6a04e..7684822d9393b 100644 --- a/src/test/ui/consts/const-cast-wrong-type.stderr +++ b/src/test/ui/consts/const-cast-wrong-type.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/const-cast-wrong-type.rs:12:23 + --> $DIR/const-cast-wrong-type.rs:2:23 | LL | static b: *const i8 = &a as *const i8; //~ ERROR mismatched types | ^^^^^^^^^^^^^^^ expected u8, found i8 diff --git a/src/test/ui/consts/const-deref-ptr.rs b/src/test/ui/consts/const-deref-ptr.rs index 3d0477feb2060..b5f603bb47ac4 100644 --- a/src/test/ui/consts/const-deref-ptr.rs +++ b/src/test/ui/consts/const-deref-ptr.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that you can't dereference raw pointers in constants. fn main() { diff --git a/src/test/ui/consts/const-deref-ptr.stderr b/src/test/ui/consts/const-deref-ptr.stderr index 94a383bcf1620..8de0f6c151450 100644 --- a/src/test/ui/consts/const-deref-ptr.stderr +++ b/src/test/ui/consts/const-deref-ptr.stderr @@ -1,5 +1,5 @@ error[E0658]: dereferencing raw pointers in statics is unstable (see issue #51911) - --> $DIR/const-deref-ptr.rs:14:29 + --> $DIR/const-deref-ptr.rs:4:29 | LL | static C: u64 = unsafe {*(0xdeadbeef as *const u64)}; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/consts/const-err-early.rs b/src/test/ui/consts/const-err-early.rs index 39b1b342eac31..bae2cd286e1c9 100644 --- a/src/test/ui/consts/const-err-early.rs +++ b/src/test/ui/consts/const-err-early.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(const_err)] pub const A: i8 = -std::i8::MIN; //~ ERROR const_err diff --git a/src/test/ui/consts/const-err-early.stderr b/src/test/ui/consts/const-err-early.stderr index 36f3ac1a9bca2..b01504a136c8f 100644 --- a/src/test/ui/consts/const-err-early.stderr +++ b/src/test/ui/consts/const-err-early.stderr @@ -1,5 +1,5 @@ error: this constant cannot be used - --> $DIR/const-err-early.rs:13:1 + --> $DIR/const-err-early.rs:3:1 | LL | pub const A: i8 = -std::i8::MIN; //~ ERROR const_err | ^^^^^^^^^^^^^^^^^^-------------^ @@ -7,13 +7,13 @@ LL | pub const A: i8 = -std::i8::MIN; //~ ERROR const_err | attempt to negate with overflow | note: lint level defined here - --> $DIR/const-err-early.rs:11:9 + --> $DIR/const-err-early.rs:1:9 | LL | #![deny(const_err)] | ^^^^^^^^^ error: this constant cannot be used - --> $DIR/const-err-early.rs:14:1 + --> $DIR/const-err-early.rs:4:1 | LL | pub const B: u8 = 200u8 + 200u8; //~ ERROR const_err | ^^^^^^^^^^^^^^^^^^-------------^ @@ -21,7 +21,7 @@ LL | pub const B: u8 = 200u8 + 200u8; //~ ERROR const_err | attempt to add with overflow error: this constant cannot be used - --> $DIR/const-err-early.rs:15:1 + --> $DIR/const-err-early.rs:5:1 | LL | pub const C: u8 = 200u8 * 4; //~ ERROR const_err | ^^^^^^^^^^^^^^^^^^---------^ @@ -29,7 +29,7 @@ LL | pub const C: u8 = 200u8 * 4; //~ ERROR const_err | attempt to multiply with overflow error: this constant cannot be used - --> $DIR/const-err-early.rs:16:1 + --> $DIR/const-err-early.rs:6:1 | LL | pub const D: u8 = 42u8 - (42u8 + 1); //~ ERROR const_err | ^^^^^^^^^^^^^^^^^^-----------------^ @@ -37,7 +37,7 @@ LL | pub const D: u8 = 42u8 - (42u8 + 1); //~ ERROR const_err | attempt to subtract with overflow error: this constant cannot be used - --> $DIR/const-err-early.rs:17:1 + --> $DIR/const-err-early.rs:7:1 | LL | pub const E: u8 = [5u8][1]; //~ ERROR const_err | ^^^^^^^^^^^^^^^^^^--------^ diff --git a/src/test/ui/consts/const-err-multi.rs b/src/test/ui/consts/const-err-multi.rs index f2ee8a7078c7c..ea7b23a7bdd3a 100644 --- a/src/test/ui/consts/const-err-multi.rs +++ b/src/test/ui/consts/const-err-multi.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(const_err)] pub const A: i8 = -std::i8::MIN; diff --git a/src/test/ui/consts/const-err-multi.stderr b/src/test/ui/consts/const-err-multi.stderr index dd3eaa4c47b9d..946940f6bb7f4 100644 --- a/src/test/ui/consts/const-err-multi.stderr +++ b/src/test/ui/consts/const-err-multi.stderr @@ -1,5 +1,5 @@ error: this constant cannot be used - --> $DIR/const-err-multi.rs:13:1 + --> $DIR/const-err-multi.rs:3:1 | LL | pub const A: i8 = -std::i8::MIN; | ^^^^^^^^^^^^^^^^^^-------------^ @@ -7,13 +7,13 @@ LL | pub const A: i8 = -std::i8::MIN; | attempt to negate with overflow | note: lint level defined here - --> $DIR/const-err-multi.rs:11:9 + --> $DIR/const-err-multi.rs:1:9 | LL | #![deny(const_err)] | ^^^^^^^^^ error: referenced constant has errors - --> $DIR/const-err-multi.rs:15:1 + --> $DIR/const-err-multi.rs:5:1 | LL | pub const A: i8 = -std::i8::MIN; | ------------- attempt to negate with overflow @@ -22,7 +22,7 @@ LL | pub const B: i8 = A; | ^^^^^^^^^^^^^^^^^^^^ error: this constant cannot be used - --> $DIR/const-err-multi.rs:15:1 + --> $DIR/const-err-multi.rs:5:1 | LL | pub const B: i8 = A; | ^^^^^^^^^^^^^^^^^^-^ @@ -30,7 +30,7 @@ LL | pub const B: i8 = A; | referenced constant has errors error: referenced constant has errors - --> $DIR/const-err-multi.rs:18:1 + --> $DIR/const-err-multi.rs:8:1 | LL | pub const A: i8 = -std::i8::MIN; | ------------- attempt to negate with overflow @@ -39,7 +39,7 @@ LL | pub const C: u8 = A as u8; | ^^^^^^^^^^^^^^^^^^^^^^^^^^ error: this constant cannot be used - --> $DIR/const-err-multi.rs:18:1 + --> $DIR/const-err-multi.rs:8:1 | LL | pub const C: u8 = A as u8; | ^^^^^^^^^^^^^^^^^^-------^ @@ -47,7 +47,7 @@ LL | pub const C: u8 = A as u8; | referenced constant has errors error: referenced constant has errors - --> $DIR/const-err-multi.rs:21:1 + --> $DIR/const-err-multi.rs:11:1 | LL | pub const A: i8 = -std::i8::MIN; | ------------- attempt to negate with overflow @@ -56,7 +56,7 @@ LL | pub const D: i8 = 50 - A; | ^^^^^^^^^^^^^^^^^^^^^^^^^ error: this constant cannot be used - --> $DIR/const-err-multi.rs:21:1 + --> $DIR/const-err-multi.rs:11:1 | LL | pub const D: i8 = 50 - A; | ^^^^^^^^^^^^^^^^^^------^ diff --git a/src/test/ui/consts/const-err.rs b/src/test/ui/consts/const-err.rs index 8683f6a023192..1269cc6a0bede 100644 --- a/src/test/ui/consts/const-err.rs +++ b/src/test/ui/consts/const-err.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Zforce-overflow-checks=on // these errors are not actually "const_err", they occur in codegen/consts diff --git a/src/test/ui/consts/const-err.stderr b/src/test/ui/consts/const-err.stderr index 1674f99b6823d..2b09087d0084f 100644 --- a/src/test/ui/consts/const-err.stderr +++ b/src/test/ui/consts/const-err.stderr @@ -1,5 +1,5 @@ error[E0080]: referenced constant has errors - --> $DIR/const-err.rs:29:15 + --> $DIR/const-err.rs:19:15 | LL | const FOO: u8 = [5u8][1]; | -------- index out of bounds: the len is 1 but the index is 1 @@ -8,13 +8,13 @@ LL | black_box((FOO, FOO)); | ^^^^^^^^^^ error[E0080]: could not evaluate constant - --> $DIR/const-err.rs:29:15 + --> $DIR/const-err.rs:19:15 | LL | black_box((FOO, FOO)); | ^^^^^^^^^^ referenced constant has errors error[E0080]: constant evaluation error - --> $DIR/const-err.rs:24:1 + --> $DIR/const-err.rs:14:1 | LL | const FOO: u8 = [5u8][1]; | ^^^^^^^^^^^^^^^^--------^ diff --git a/src/test/ui/consts/const-err2.rs b/src/test/ui/consts/const-err2.rs index 9a5cb5a4a83fa..a5f685a159b39 100644 --- a/src/test/ui/consts/const-err2.rs +++ b/src/test/ui/consts/const-err2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // needed because negating int::MIN will behave differently between // optimized compilation and unoptimized compilation and thus would // lead to different lints being emitted diff --git a/src/test/ui/consts/const-err2.stderr b/src/test/ui/consts/const-err2.stderr index 7201ecbc55d5e..659c3afc618a9 100644 --- a/src/test/ui/consts/const-err2.stderr +++ b/src/test/ui/consts/const-err2.stderr @@ -1,35 +1,35 @@ error: this expression will panic at runtime - --> $DIR/const-err2.rs:25:13 + --> $DIR/const-err2.rs:15:13 | LL | let a = -std::i8::MIN; | ^^^^^^^^^^^^^ attempt to negate with overflow | note: lint level defined here - --> $DIR/const-err2.rs:18:9 + --> $DIR/const-err2.rs:8:9 | LL | #![deny(const_err)] | ^^^^^^^^^ error: this expression will panic at runtime - --> $DIR/const-err2.rs:27:13 + --> $DIR/const-err2.rs:17:13 | LL | let b = 200u8 + 200u8 + 200u8; | ^^^^^^^^^^^^^ attempt to add with overflow error: this expression will panic at runtime - --> $DIR/const-err2.rs:29:13 + --> $DIR/const-err2.rs:19:13 | LL | let c = 200u8 * 4; | ^^^^^^^^^ attempt to multiply with overflow error: this expression will panic at runtime - --> $DIR/const-err2.rs:31:13 + --> $DIR/const-err2.rs:21:13 | LL | let d = 42u8 - (42u8 + 1); | ^^^^^^^^^^^^^^^^^ attempt to subtract with overflow error: index out of bounds: the len is 1 but the index is 1 - --> $DIR/const-err2.rs:33:14 + --> $DIR/const-err2.rs:23:14 | LL | let _e = [5u8][1]; | ^^^^^^^^ diff --git a/src/test/ui/consts/const-err4.rs b/src/test/ui/consts/const-err4.rs index 10376d5780908..c29c9a342c68c 100644 --- a/src/test/ui/consts/const-err4.rs +++ b/src/test/ui/consts/const-err4.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Copy, Clone)] union Foo { a: isize, diff --git a/src/test/ui/consts/const-err4.stderr b/src/test/ui/consts/const-err4.stderr index dc64737b22f5e..c6064a06f6d93 100644 --- a/src/test/ui/consts/const-err4.stderr +++ b/src/test/ui/consts/const-err4.stderr @@ -1,5 +1,5 @@ error[E0080]: could not evaluate enum discriminant - --> $DIR/const-err4.rs:18:11 + --> $DIR/const-err4.rs:8:11 | LL | Boo = [unsafe { Foo { b: () }.a }; 4][3], | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempted to read undefined bytes diff --git a/src/test/ui/consts/const-eval/conditional_array_execution.nll.stderr b/src/test/ui/consts/const-eval/conditional_array_execution.nll.stderr index 86287e1299729..e9f744e700f93 100644 --- a/src/test/ui/consts/const-eval/conditional_array_execution.nll.stderr +++ b/src/test/ui/consts/const-eval/conditional_array_execution.nll.stderr @@ -1,5 +1,5 @@ warning: this constant cannot be used - --> $DIR/conditional_array_execution.rs:15:1 + --> $DIR/conditional_array_execution.rs:5:1 | LL | const FOO: u32 = [X - Y, Y - X][(X < Y) as usize]; | ^^^^^^^^^^^^^^^^^^-----^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -7,13 +7,13 @@ LL | const FOO: u32 = [X - Y, Y - X][(X < Y) as usize]; | attempt to subtract with overflow | note: lint level defined here - --> $DIR/conditional_array_execution.rs:11:9 + --> $DIR/conditional_array_execution.rs:1:9 | LL | #![warn(const_err)] | ^^^^^^^^^ error[E0080]: referenced constant has errors - --> $DIR/conditional_array_execution.rs:19:14 + --> $DIR/conditional_array_execution.rs:9:14 | LL | const FOO: u32 = [X - Y, Y - X][(X < Y) as usize]; | ----- attempt to subtract with overflow @@ -22,13 +22,13 @@ LL | println!("{}", FOO); | ^^^^ error[E0080]: erroneous constant used - --> $DIR/conditional_array_execution.rs:19:14 + --> $DIR/conditional_array_execution.rs:9:14 | LL | println!("{}", FOO); | ^^^^ --- referenced constant has errors error[E0080]: referenced constant has errors - --> $DIR/conditional_array_execution.rs:19:20 + --> $DIR/conditional_array_execution.rs:9:20 | LL | const FOO: u32 = [X - Y, Y - X][(X < Y) as usize]; | ----- attempt to subtract with overflow @@ -37,7 +37,7 @@ LL | println!("{}", FOO); | ^^^ error[E0080]: erroneous constant used - --> $DIR/conditional_array_execution.rs:19:20 + --> $DIR/conditional_array_execution.rs:9:20 | LL | println!("{}", FOO); | ^^^ referenced constant has errors diff --git a/src/test/ui/consts/const-eval/conditional_array_execution.rs b/src/test/ui/consts/const-eval/conditional_array_execution.rs index b3f56f27f6352..9d633e09f13b8 100644 --- a/src/test/ui/consts/const-eval/conditional_array_execution.rs +++ b/src/test/ui/consts/const-eval/conditional_array_execution.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![warn(const_err)] const X: u32 = 5; diff --git a/src/test/ui/consts/const-eval/conditional_array_execution.stderr b/src/test/ui/consts/const-eval/conditional_array_execution.stderr index 29f5f8e2ade59..3ae0540af1b5e 100644 --- a/src/test/ui/consts/const-eval/conditional_array_execution.stderr +++ b/src/test/ui/consts/const-eval/conditional_array_execution.stderr @@ -1,5 +1,5 @@ warning: this constant cannot be used - --> $DIR/conditional_array_execution.rs:15:1 + --> $DIR/conditional_array_execution.rs:5:1 | LL | const FOO: u32 = [X - Y, Y - X][(X < Y) as usize]; | ^^^^^^^^^^^^^^^^^^-----^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -7,13 +7,13 @@ LL | const FOO: u32 = [X - Y, Y - X][(X < Y) as usize]; | attempt to subtract with overflow | note: lint level defined here - --> $DIR/conditional_array_execution.rs:11:9 + --> $DIR/conditional_array_execution.rs:1:9 | LL | #![warn(const_err)] | ^^^^^^^^^ error[E0080]: referenced constant has errors - --> $DIR/conditional_array_execution.rs:19:20 + --> $DIR/conditional_array_execution.rs:9:20 | LL | const FOO: u32 = [X - Y, Y - X][(X < Y) as usize]; | ----- attempt to subtract with overflow @@ -22,7 +22,7 @@ LL | println!("{}", FOO); | ^^^ error[E0080]: erroneous constant used - --> $DIR/conditional_array_execution.rs:19:20 + --> $DIR/conditional_array_execution.rs:9:20 | LL | println!("{}", FOO); | ^^^ referenced constant has errors diff --git a/src/test/ui/consts/const-eval/const-eval-overflow-2.rs b/src/test/ui/consts/const-eval/const-eval-overflow-2.rs index ce3d54ee46d93..9369702f1721c 100644 --- a/src/test/ui/consts/const-eval/const-eval-overflow-2.rs +++ b/src/test/ui/consts/const-eval/const-eval-overflow-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Evaluation of constants in refutable patterns goes through // different compiler control-flow paths. diff --git a/src/test/ui/consts/const-eval/const-eval-overflow-2.stderr b/src/test/ui/consts/const-eval/const-eval-overflow-2.stderr index e99d409880e07..967008f5d7aa1 100644 --- a/src/test/ui/consts/const-eval/const-eval-overflow-2.stderr +++ b/src/test/ui/consts/const-eval/const-eval-overflow-2.stderr @@ -1,5 +1,5 @@ error[E0080]: could not evaluate constant pattern - --> $DIR/const-eval-overflow-2.rs:25:9 + --> $DIR/const-eval-overflow-2.rs:15:9 | LL | const NEG_NEG_128: i8 = -NEG_128; | -------- attempt to negate with overflow diff --git a/src/test/ui/consts/const-eval/const-eval-overflow-3.rs b/src/test/ui/consts/const-eval/const-eval-overflow-3.rs index d930cb770472f..95deb04fb01d5 100644 --- a/src/test/ui/consts/const-eval/const-eval-overflow-3.rs +++ b/src/test/ui/consts/const-eval/const-eval-overflow-3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Evaluation of constants in array-elem count goes through different // compiler control-flow paths. // diff --git a/src/test/ui/consts/const-eval/const-eval-overflow-3.stderr b/src/test/ui/consts/const-eval/const-eval-overflow-3.stderr index f2b4e6b3b567b..f91f5593f1cab 100644 --- a/src/test/ui/consts/const-eval/const-eval-overflow-3.stderr +++ b/src/test/ui/consts/const-eval/const-eval-overflow-3.stderr @@ -1,5 +1,5 @@ error: attempt to add with overflow - --> $DIR/const-eval-overflow-3.rs:30:11 + --> $DIR/const-eval-overflow-3.rs:20:11 | LL | = [0; (i8::MAX + 1) as usize]; | ^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | = [0; (i8::MAX + 1) as usize]; = note: #[deny(const_err)] on by default error[E0080]: could not evaluate repeat length - --> $DIR/const-eval-overflow-3.rs:30:11 + --> $DIR/const-eval-overflow-3.rs:20:11 | LL | = [0; (i8::MAX + 1) as usize]; | -------------^^^^^^^^^ diff --git a/src/test/ui/consts/const-eval/const-eval-overflow-3b.rs b/src/test/ui/consts/const-eval/const-eval-overflow-3b.rs index 719b21000f7a6..5a6be0c9bd38b 100644 --- a/src/test/ui/consts/const-eval/const-eval-overflow-3b.rs +++ b/src/test/ui/consts/const-eval/const-eval-overflow-3b.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Evaluation of constants in array-elem count goes through different // compiler control-flow paths. // diff --git a/src/test/ui/consts/const-eval/const-eval-overflow-3b.stderr b/src/test/ui/consts/const-eval/const-eval-overflow-3b.stderr index 4f1163bf9a197..59a9d25c71907 100644 --- a/src/test/ui/consts/const-eval/const-eval-overflow-3b.stderr +++ b/src/test/ui/consts/const-eval/const-eval-overflow-3b.stderr @@ -1,11 +1,11 @@ error[E0308]: mismatched types - --> $DIR/const-eval-overflow-3b.rs:34:22 + --> $DIR/const-eval-overflow-3b.rs:24:22 | LL | = [0; (i8::MAX + 1u8) as usize]; | ^^^ expected i8, found u8 error[E0277]: cannot add `u8` to `i8` - --> $DIR/const-eval-overflow-3b.rs:34:20 + --> $DIR/const-eval-overflow-3b.rs:24:20 | LL | = [0; (i8::MAX + 1u8) as usize]; | ^ no implementation for `i8 + u8` diff --git a/src/test/ui/consts/const-eval/const-eval-overflow-4.rs b/src/test/ui/consts/const-eval/const-eval-overflow-4.rs index 9fc31b7c72781..61427d0ec0944 100644 --- a/src/test/ui/consts/const-eval/const-eval-overflow-4.rs +++ b/src/test/ui/consts/const-eval/const-eval-overflow-4.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Evaluation of constants in array-elem count goes through different // compiler control-flow paths. // diff --git a/src/test/ui/consts/const-eval/const-eval-overflow-4.stderr b/src/test/ui/consts/const-eval/const-eval-overflow-4.stderr index 058c8730d7c9e..1121dd06d14fa 100644 --- a/src/test/ui/consts/const-eval/const-eval-overflow-4.stderr +++ b/src/test/ui/consts/const-eval/const-eval-overflow-4.stderr @@ -1,5 +1,5 @@ error: attempt to add with overflow - --> $DIR/const-eval-overflow-4.rs:24:13 + --> $DIR/const-eval-overflow-4.rs:14:13 | LL | : [u32; (i8::MAX as i8 + 1i8) as usize] | ^^^^^^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | : [u32; (i8::MAX as i8 + 1i8) as usize] = note: #[deny(const_err)] on by default error[E0080]: could not evaluate constant expression - --> $DIR/const-eval-overflow-4.rs:22:1 + --> $DIR/const-eval-overflow-4.rs:12:1 | LL | / const A_I8_T LL | | //~^ ERROR could not evaluate constant expression diff --git a/src/test/ui/consts/const-eval/const-eval-overflow-4b.rs b/src/test/ui/consts/const-eval/const-eval-overflow-4b.rs index 6028df1883967..75c396f235130 100644 --- a/src/test/ui/consts/const-eval/const-eval-overflow-4b.rs +++ b/src/test/ui/consts/const-eval/const-eval-overflow-4b.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Evaluation of constants in array-elem count goes through different // compiler control-flow paths. // diff --git a/src/test/ui/consts/const-eval/const-eval-overflow-4b.stderr b/src/test/ui/consts/const-eval/const-eval-overflow-4b.stderr index d171e7f09d1e8..0c2f76a5582e9 100644 --- a/src/test/ui/consts/const-eval/const-eval-overflow-4b.stderr +++ b/src/test/ui/consts/const-eval/const-eval-overflow-4b.stderr @@ -1,11 +1,11 @@ error[E0308]: mismatched types - --> $DIR/const-eval-overflow-4b.rs:22:30 + --> $DIR/const-eval-overflow-4b.rs:12:30 | LL | : [u32; (i8::MAX as i8 + 1u8) as usize] | ^^^ expected i8, found u8 error[E0277]: cannot add `u8` to `i8` - --> $DIR/const-eval-overflow-4b.rs:22:28 + --> $DIR/const-eval-overflow-4b.rs:12:28 | LL | : [u32; (i8::MAX as i8 + 1u8) as usize] | ^ no implementation for `i8 + u8` @@ -13,7 +13,7 @@ LL | : [u32; (i8::MAX as i8 + 1u8) as usize] = help: the trait `std::ops::Add` is not implemented for `i8` error[E0604]: only `u8` can be cast as `char`, not `i8` - --> $DIR/const-eval-overflow-4b.rs:35:13 + --> $DIR/const-eval-overflow-4b.rs:25:13 | LL | : [u32; 5i8 as char as usize] | ^^^^^^^^^^^ diff --git a/src/test/ui/consts/const-eval/const-eval-overflow2.rs b/src/test/ui/consts/const-eval/const-eval-overflow2.rs index 88fc518277535..ebbe86515c7b8 100644 --- a/src/test/ui/consts/const-eval/const-eval-overflow2.rs +++ b/src/test/ui/consts/const-eval/const-eval-overflow2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_imports)] // Note: the relevant lint pass here runs before some of the constant diff --git a/src/test/ui/consts/const-eval/const-eval-overflow2.stderr b/src/test/ui/consts/const-eval/const-eval-overflow2.stderr index 5cf5ce367e253..db925c407315a 100644 --- a/src/test/ui/consts/const-eval/const-eval-overflow2.stderr +++ b/src/test/ui/consts/const-eval/const-eval-overflow2.stderr @@ -1,5 +1,5 @@ error: this constant cannot be used - --> $DIR/const-eval-overflow2.rs:24:1 + --> $DIR/const-eval-overflow2.rs:14:1 | LL | / const VALS_I8: (i8,) = LL | | //~^ ERROR this constant cannot be used @@ -10,13 +10,13 @@ LL | | ); | |_______^ | note: lint level defined here - --> $DIR/const-eval-overflow2.rs:18:9 + --> $DIR/const-eval-overflow2.rs:8:9 | LL | #![deny(const_err)] | ^^^^^^^^^ error: this constant cannot be used - --> $DIR/const-eval-overflow2.rs:30:1 + --> $DIR/const-eval-overflow2.rs:20:1 | LL | / const VALS_I16: (i16,) = LL | | //~^ ERROR this constant cannot be used @@ -27,7 +27,7 @@ LL | | ); | |_______^ error: this constant cannot be used - --> $DIR/const-eval-overflow2.rs:36:1 + --> $DIR/const-eval-overflow2.rs:26:1 | LL | / const VALS_I32: (i32,) = LL | | //~^ ERROR this constant cannot be used @@ -38,7 +38,7 @@ LL | | ); | |_______^ error: this constant cannot be used - --> $DIR/const-eval-overflow2.rs:42:1 + --> $DIR/const-eval-overflow2.rs:32:1 | LL | / const VALS_I64: (i64,) = LL | | //~^ ERROR this constant cannot be used @@ -49,7 +49,7 @@ LL | | ); | |_______^ error: this constant cannot be used - --> $DIR/const-eval-overflow2.rs:48:1 + --> $DIR/const-eval-overflow2.rs:38:1 | LL | / const VALS_U8: (u8,) = LL | | //~^ ERROR this constant cannot be used @@ -60,7 +60,7 @@ LL | | ); | |_______^ error: this constant cannot be used - --> $DIR/const-eval-overflow2.rs:54:1 + --> $DIR/const-eval-overflow2.rs:44:1 | LL | / const VALS_U16: (u16,) = ( LL | | //~^ ERROR this constant cannot be used @@ -70,7 +70,7 @@ LL | | ); | |_______^ error: this constant cannot be used - --> $DIR/const-eval-overflow2.rs:59:1 + --> $DIR/const-eval-overflow2.rs:49:1 | LL | / const VALS_U32: (u32,) = ( LL | | //~^ ERROR this constant cannot be used @@ -80,7 +80,7 @@ LL | | ); | |_______^ error: this constant cannot be used - --> $DIR/const-eval-overflow2.rs:64:1 + --> $DIR/const-eval-overflow2.rs:54:1 | LL | / const VALS_U64: (u64,) = LL | | //~^ ERROR this constant cannot be used diff --git a/src/test/ui/consts/const-eval/const-eval-overflow2b.rs b/src/test/ui/consts/const-eval/const-eval-overflow2b.rs index 1878daea93198..3980fc1923577 100644 --- a/src/test/ui/consts/const-eval/const-eval-overflow2b.rs +++ b/src/test/ui/consts/const-eval/const-eval-overflow2b.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_imports)] // Note: the relevant lint pass here runs before some of the constant diff --git a/src/test/ui/consts/const-eval/const-eval-overflow2b.stderr b/src/test/ui/consts/const-eval/const-eval-overflow2b.stderr index 458a9e11e7573..f3ad51e138dda 100644 --- a/src/test/ui/consts/const-eval/const-eval-overflow2b.stderr +++ b/src/test/ui/consts/const-eval/const-eval-overflow2b.stderr @@ -1,5 +1,5 @@ error: this constant cannot be used - --> $DIR/const-eval-overflow2b.rs:24:1 + --> $DIR/const-eval-overflow2b.rs:14:1 | LL | / const VALS_I8: (i8,) = LL | | //~^ ERROR this constant cannot be used @@ -10,13 +10,13 @@ LL | | ); | |_______^ | note: lint level defined here - --> $DIR/const-eval-overflow2b.rs:18:9 + --> $DIR/const-eval-overflow2b.rs:8:9 | LL | #![deny(const_err)] | ^^^^^^^^^ error: this constant cannot be used - --> $DIR/const-eval-overflow2b.rs:30:1 + --> $DIR/const-eval-overflow2b.rs:20:1 | LL | / const VALS_I16: (i16,) = LL | | //~^ ERROR this constant cannot be used @@ -27,7 +27,7 @@ LL | | ); | |_______^ error: this constant cannot be used - --> $DIR/const-eval-overflow2b.rs:36:1 + --> $DIR/const-eval-overflow2b.rs:26:1 | LL | / const VALS_I32: (i32,) = LL | | //~^ ERROR this constant cannot be used @@ -38,7 +38,7 @@ LL | | ); | |_______^ error: this constant cannot be used - --> $DIR/const-eval-overflow2b.rs:42:1 + --> $DIR/const-eval-overflow2b.rs:32:1 | LL | / const VALS_I64: (i64,) = LL | | //~^ ERROR this constant cannot be used @@ -49,7 +49,7 @@ LL | | ); | |_______^ error: this constant cannot be used - --> $DIR/const-eval-overflow2b.rs:48:1 + --> $DIR/const-eval-overflow2b.rs:38:1 | LL | / const VALS_U8: (u8,) = LL | | //~^ ERROR this constant cannot be used @@ -60,7 +60,7 @@ LL | | ); | |_______^ error: this constant cannot be used - --> $DIR/const-eval-overflow2b.rs:54:1 + --> $DIR/const-eval-overflow2b.rs:44:1 | LL | / const VALS_U16: (u16,) = ( LL | | //~^ ERROR this constant cannot be used @@ -70,7 +70,7 @@ LL | | ); | |_______^ error: this constant cannot be used - --> $DIR/const-eval-overflow2b.rs:59:1 + --> $DIR/const-eval-overflow2b.rs:49:1 | LL | / const VALS_U32: (u32,) = ( LL | | //~^ ERROR this constant cannot be used @@ -80,7 +80,7 @@ LL | | ); | |_______^ error: this constant cannot be used - --> $DIR/const-eval-overflow2b.rs:64:1 + --> $DIR/const-eval-overflow2b.rs:54:1 | LL | / const VALS_U64: (u64,) = LL | | //~^ ERROR this constant cannot be used diff --git a/src/test/ui/consts/const-eval/const-eval-overflow2c.rs b/src/test/ui/consts/const-eval/const-eval-overflow2c.rs index f3d28295bf81c..157af26f84544 100644 --- a/src/test/ui/consts/const-eval/const-eval-overflow2c.rs +++ b/src/test/ui/consts/const-eval/const-eval-overflow2c.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_imports)] // Note: the relevant lint pass here runs before some of the constant diff --git a/src/test/ui/consts/const-eval/const-eval-overflow2c.stderr b/src/test/ui/consts/const-eval/const-eval-overflow2c.stderr index 866860281cf66..960ee105e3e7b 100644 --- a/src/test/ui/consts/const-eval/const-eval-overflow2c.stderr +++ b/src/test/ui/consts/const-eval/const-eval-overflow2c.stderr @@ -1,5 +1,5 @@ error: this constant cannot be used - --> $DIR/const-eval-overflow2c.rs:24:1 + --> $DIR/const-eval-overflow2c.rs:14:1 | LL | / const VALS_I8: (i8,) = LL | | //~^ ERROR this constant cannot be used @@ -10,13 +10,13 @@ LL | | ); | |_______^ | note: lint level defined here - --> $DIR/const-eval-overflow2c.rs:18:9 + --> $DIR/const-eval-overflow2c.rs:8:9 | LL | #![deny(const_err)] | ^^^^^^^^^ error: this constant cannot be used - --> $DIR/const-eval-overflow2c.rs:30:1 + --> $DIR/const-eval-overflow2c.rs:20:1 | LL | / const VALS_I16: (i16,) = LL | | //~^ ERROR this constant cannot be used @@ -27,7 +27,7 @@ LL | | ); | |_______^ error: this constant cannot be used - --> $DIR/const-eval-overflow2c.rs:36:1 + --> $DIR/const-eval-overflow2c.rs:26:1 | LL | / const VALS_I32: (i32,) = LL | | //~^ ERROR this constant cannot be used @@ -38,7 +38,7 @@ LL | | ); | |_______^ error: this constant cannot be used - --> $DIR/const-eval-overflow2c.rs:42:1 + --> $DIR/const-eval-overflow2c.rs:32:1 | LL | / const VALS_I64: (i64,) = LL | | //~^ ERROR this constant cannot be used @@ -49,7 +49,7 @@ LL | | ); | |_______^ error: this constant cannot be used - --> $DIR/const-eval-overflow2c.rs:48:1 + --> $DIR/const-eval-overflow2c.rs:38:1 | LL | / const VALS_U8: (u8,) = LL | | //~^ ERROR this constant cannot be used @@ -60,7 +60,7 @@ LL | | ); | |_______^ error: this constant cannot be used - --> $DIR/const-eval-overflow2c.rs:54:1 + --> $DIR/const-eval-overflow2c.rs:44:1 | LL | / const VALS_U16: (u16,) = ( LL | | //~^ ERROR this constant cannot be used @@ -70,7 +70,7 @@ LL | | ); | |_______^ error: this constant cannot be used - --> $DIR/const-eval-overflow2c.rs:59:1 + --> $DIR/const-eval-overflow2c.rs:49:1 | LL | / const VALS_U32: (u32,) = ( LL | | //~^ ERROR this constant cannot be used @@ -80,7 +80,7 @@ LL | | ); | |_______^ error: this constant cannot be used - --> $DIR/const-eval-overflow2c.rs:64:1 + --> $DIR/const-eval-overflow2c.rs:54:1 | LL | / const VALS_U64: (u64,) = LL | | //~^ ERROR this constant cannot be used diff --git a/src/test/ui/consts/const-eval/const-eval-span.rs b/src/test/ui/consts/const-eval/const-eval-span.rs index f0fa1c0b9b47d..59f4b138249b2 100644 --- a/src/test/ui/consts/const-eval/const-eval-span.rs +++ b/src/test/ui/consts/const-eval/const-eval-span.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that error in constant evaluation of enum discriminant // provides the context for what caused the evaluation. diff --git a/src/test/ui/consts/const-eval/const-eval-span.stderr b/src/test/ui/consts/const-eval/const-eval-span.stderr index afe8d1bc0b5b7..8ff9bfe54c7be 100644 --- a/src/test/ui/consts/const-eval/const-eval-span.stderr +++ b/src/test/ui/consts/const-eval/const-eval-span.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/const-eval-span.rs:19:9 + --> $DIR/const-eval-span.rs:9:9 | LL | V = CONSTANT, | ^^^^^^^^ expected isize, found struct `S` diff --git a/src/test/ui/consts/const-eval/const_let.rs b/src/test/ui/consts/const-eval/const_let.rs index 602d4da24f383..9e6952733bb0b 100644 --- a/src/test/ui/consts/const-eval/const_let.rs +++ b/src/test/ui/consts/const-eval/const_let.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_let)] fn main() {} diff --git a/src/test/ui/consts/const-eval/const_let.stderr b/src/test/ui/consts/const-eval/const_let.stderr index 86e3482fda6b9..e128ca07d8659 100644 --- a/src/test/ui/consts/const-eval/const_let.stderr +++ b/src/test/ui/consts/const-eval/const_let.stderr @@ -1,11 +1,11 @@ error[E0019]: constant contains unimplemented expression type - --> $DIR/const_let.rs:25:55 + --> $DIR/const_let.rs:15:55 | LL | const Y: FakeNeedsDrop = { let mut x = FakeNeedsDrop; x = FakeNeedsDrop; x }; | ^ error[E0019]: constant contains unimplemented expression type - --> $DIR/const_let.rs:29:35 + --> $DIR/const_let.rs:19:35 | LL | const Z: () = { let mut x = None; x = Some(FakeNeedsDrop); }; | ^ diff --git a/src/test/ui/consts/const-eval/const_panic.rs b/src/test/ui/consts/const-eval/const_panic.rs index f2170f509eb30..3e5137df24009 100644 --- a/src/test/ui/consts/const-eval/const_panic.rs +++ b/src/test/ui/consts/const-eval/const_panic.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_panic)] fn main() {} diff --git a/src/test/ui/consts/const-eval/const_panic.stderr b/src/test/ui/consts/const-eval/const_panic.stderr index c11146f4882c2..47305d72f6c89 100644 --- a/src/test/ui/consts/const-eval/const_panic.stderr +++ b/src/test/ui/consts/const-eval/const_panic.stderr @@ -1,31 +1,31 @@ error: this constant cannot be used - --> $DIR/const_panic.rs:15:1 + --> $DIR/const_panic.rs:5:1 | LL | const Z: () = panic!("cheese"); | ^^^^^^^^^^^^^^----------------^ | | - | the evaluated program panicked at 'cheese', $DIR/const_panic.rs:15:15 + | the evaluated program panicked at 'cheese', $DIR/const_panic.rs:5:15 | = note: #[deny(const_err)] on by default = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) error: this constant cannot be used - --> $DIR/const_panic.rs:18:1 + --> $DIR/const_panic.rs:8:1 | LL | const Y: () = unreachable!(); | ^^^^^^^^^^^^^^--------------^ | | - | the evaluated program panicked at 'internal error: entered unreachable code', $DIR/const_panic.rs:18:15 + | the evaluated program panicked at 'internal error: entered unreachable code', $DIR/const_panic.rs:8:15 | = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) error: this constant cannot be used - --> $DIR/const_panic.rs:21:1 + --> $DIR/const_panic.rs:11:1 | LL | const X: () = unimplemented!(); | ^^^^^^^^^^^^^^----------------^ | | - | the evaluated program panicked at 'not yet implemented', $DIR/const_panic.rs:21:15 + | the evaluated program panicked at 'not yet implemented', $DIR/const_panic.rs:11:15 | = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) diff --git a/src/test/ui/consts/const-eval/const_panic_libcore.rs b/src/test/ui/consts/const-eval/const_panic_libcore.rs index 59aeca18129a8..0c21b48fdc3ab 100644 --- a/src/test/ui/consts/const-eval/const_panic_libcore.rs +++ b/src/test/ui/consts/const-eval/const_panic_libcore.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![no_std] #![crate_type = "lib"] #![feature(const_panic)] diff --git a/src/test/ui/consts/const-eval/const_panic_libcore.stderr b/src/test/ui/consts/const-eval/const_panic_libcore.stderr index 45f2ee7744e82..32a66a022f486 100644 --- a/src/test/ui/consts/const-eval/const_panic_libcore.stderr +++ b/src/test/ui/consts/const-eval/const_panic_libcore.stderr @@ -1,31 +1,31 @@ error: this constant cannot be used - --> $DIR/const_panic_libcore.rs:15:1 + --> $DIR/const_panic_libcore.rs:5:1 | LL | const Z: () = panic!("cheese"); | ^^^^^^^^^^^^^^----------------^ | | - | the evaluated program panicked at 'cheese', $DIR/const_panic_libcore.rs:15:15 + | the evaluated program panicked at 'cheese', $DIR/const_panic_libcore.rs:5:15 | = note: #[deny(const_err)] on by default = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) error: this constant cannot be used - --> $DIR/const_panic_libcore.rs:18:1 + --> $DIR/const_panic_libcore.rs:8:1 | LL | const Y: () = unreachable!(); | ^^^^^^^^^^^^^^--------------^ | | - | the evaluated program panicked at 'internal error: entered unreachable code', $DIR/const_panic_libcore.rs:18:15 + | the evaluated program panicked at 'internal error: entered unreachable code', $DIR/const_panic_libcore.rs:8:15 | = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) error: this constant cannot be used - --> $DIR/const_panic_libcore.rs:21:1 + --> $DIR/const_panic_libcore.rs:11:1 | LL | const X: () = unimplemented!(); | ^^^^^^^^^^^^^^----------------^ | | - | the evaluated program panicked at 'not yet implemented', $DIR/const_panic_libcore.rs:21:15 + | the evaluated program panicked at 'not yet implemented', $DIR/const_panic_libcore.rs:11:15 | = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) diff --git a/src/test/ui/consts/const-eval/const_panic_libcore_main.rs b/src/test/ui/consts/const-eval/const_panic_libcore_main.rs index c66e1fe4bf5a9..099c311a0b893 100644 --- a/src/test/ui/consts/const-eval/const_panic_libcore_main.rs +++ b/src/test/ui/consts/const-eval/const_panic_libcore_main.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "bin"] #![feature(lang_items)] #![feature(panic_implementation)] diff --git a/src/test/ui/consts/const-eval/const_panic_libcore_main.stderr b/src/test/ui/consts/const-eval/const_panic_libcore_main.stderr index 7cb9f51c427a7..f9be608eec862 100644 --- a/src/test/ui/consts/const-eval/const_panic_libcore_main.stderr +++ b/src/test/ui/consts/const-eval/const_panic_libcore_main.stderr @@ -1,31 +1,31 @@ error: this constant cannot be used - --> $DIR/const_panic_libcore_main.rs:20:1 + --> $DIR/const_panic_libcore_main.rs:10:1 | LL | const Z: () = panic!("cheese"); | ^^^^^^^^^^^^^^----------------^ | | - | the evaluated program panicked at 'cheese', $DIR/const_panic_libcore_main.rs:20:15 + | the evaluated program panicked at 'cheese', $DIR/const_panic_libcore_main.rs:10:15 | = note: #[deny(const_err)] on by default = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) error: this constant cannot be used - --> $DIR/const_panic_libcore_main.rs:23:1 + --> $DIR/const_panic_libcore_main.rs:13:1 | LL | const Y: () = unreachable!(); | ^^^^^^^^^^^^^^--------------^ | | - | the evaluated program panicked at 'internal error: entered unreachable code', $DIR/const_panic_libcore_main.rs:23:15 + | the evaluated program panicked at 'internal error: entered unreachable code', $DIR/const_panic_libcore_main.rs:13:15 | = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) error: this constant cannot be used - --> $DIR/const_panic_libcore_main.rs:26:1 + --> $DIR/const_panic_libcore_main.rs:16:1 | LL | const X: () = unimplemented!(); | ^^^^^^^^^^^^^^----------------^ | | - | the evaluated program panicked at 'not yet implemented', $DIR/const_panic_libcore_main.rs:26:15 + | the evaluated program panicked at 'not yet implemented', $DIR/const_panic_libcore_main.rs:16:15 | = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) diff --git a/src/test/ui/consts/const-eval/const_prop_errors.rs b/src/test/ui/consts/const-eval/const_prop_errors.rs index bea4fb76ed166..51b50b2e75f4f 100644 --- a/src/test/ui/consts/const-eval/const_prop_errors.rs +++ b/src/test/ui/consts/const-eval/const_prop_errors.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass pub trait Foo { diff --git a/src/test/ui/consts/const-eval/const_raw_ptr_ops.rs b/src/test/ui/consts/const-eval/const_raw_ptr_ops.rs index 2aff6a7c55c20..08115b71d4319 100644 --- a/src/test/ui/consts/const-eval/const_raw_ptr_ops.rs +++ b/src/test/ui/consts/const-eval/const_raw_ptr_ops.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_raw_ptr_to_usize_cast, const_compare_raw_pointers, const_raw_ptr_deref)] fn main() {} diff --git a/src/test/ui/consts/const-eval/const_raw_ptr_ops.stderr b/src/test/ui/consts/const-eval/const_raw_ptr_ops.stderr index df1e6f8e4c4f0..694572d633fea 100644 --- a/src/test/ui/consts/const-eval/const_raw_ptr_ops.stderr +++ b/src/test/ui/consts/const-eval/const_raw_ptr_ops.stderr @@ -1,5 +1,5 @@ error: this constant cannot be used - --> $DIR/const_raw_ptr_ops.rs:16:1 + --> $DIR/const_raw_ptr_ops.rs:6:1 | LL | const X: bool = &1 as *const i32 == &2 as *const i32; //~ ERROR cannot be used | ^^^^^^^^^^^^^^^^------------------------------------^ @@ -9,7 +9,7 @@ LL | const X: bool = &1 as *const i32 == &2 as *const i32; //~ ERROR cannot be u = note: #[deny(const_err)] on by default error: this constant cannot be used - --> $DIR/const_raw_ptr_ops.rs:22:1 + --> $DIR/const_raw_ptr_ops.rs:12:1 | LL | const Y2: usize = &1 as *const i32 as usize + 1; //~ ERROR cannot be used | ^^^^^^^^^^^^^^^^^^-----------------------------^ @@ -17,7 +17,7 @@ LL | const Y2: usize = &1 as *const i32 as usize + 1; //~ ERROR cannot be used | "pointer arithmetic or comparison" needs an rfc before being allowed inside constants error: this constant cannot be used - --> $DIR/const_raw_ptr_ops.rs:26:1 + --> $DIR/const_raw_ptr_ops.rs:16:1 | LL | const Z2: i32 = unsafe { *(42 as *const i32) }; //~ ERROR cannot be used | ^^^^^^^^^^^^^^^^^^^^^^^^^-------------------^^^ @@ -25,7 +25,7 @@ LL | const Z2: i32 = unsafe { *(42 as *const i32) }; //~ ERROR cannot be used | a memory access tried to interpret some bytes as a pointer error: this constant cannot be used - --> $DIR/const_raw_ptr_ops.rs:27:1 + --> $DIR/const_raw_ptr_ops.rs:17:1 | LL | const Z3: i32 = unsafe { *(44 as *const i32) }; //~ ERROR cannot be used | ^^^^^^^^^^^^^^^^^^^^^^^^^-------------------^^^ diff --git a/src/test/ui/consts/const-eval/const_signed_pat.rs b/src/test/ui/consts/const-eval/const_signed_pat.rs index 008ebf13c6354..cb4fb46bd055c 100644 --- a/src/test/ui/consts/const-eval/const_signed_pat.rs +++ b/src/test/ui/consts/const-eval/const_signed_pat.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass fn main() { diff --git a/src/test/ui/consts/const-eval/const_transmute.rs b/src/test/ui/consts/const-eval/const_transmute.rs index 8dd1476d25a77..e4f7fb155ab90 100644 --- a/src/test/ui/consts/const-eval/const_transmute.rs +++ b/src/test/ui/consts/const-eval/const_transmute.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass // run-pass diff --git a/src/test/ui/consts/const-eval/dont_promote_unstable_const_fn.nll.stderr b/src/test/ui/consts/const-eval/dont_promote_unstable_const_fn.nll.stderr index 684fa1c997bf1..6a4237c304e48 100644 --- a/src/test/ui/consts/const-eval/dont_promote_unstable_const_fn.nll.stderr +++ b/src/test/ui/consts/const-eval/dont_promote_unstable_const_fn.nll.stderr @@ -1,5 +1,5 @@ error: `foo` is not yet stable as a const fn - --> $DIR/dont_promote_unstable_const_fn.rs:25:25 + --> $DIR/dont_promote_unstable_const_fn.rs:15:25 | LL | const fn bar() -> u32 { foo() } //~ ERROR `foo` is not yet stable as a const fn | ^^^^^ @@ -7,7 +7,7 @@ LL | const fn bar() -> u32 { foo() } //~ ERROR `foo` is not yet stable as a cons = help: in Nightly builds, add `#![feature(foo)]` to the crate attributes to enable error[E0597]: borrowed value does not live long enough - --> $DIR/dont_promote_unstable_const_fn.rs:33:26 + --> $DIR/dont_promote_unstable_const_fn.rs:23:26 | LL | let x: &'static _ = &std::time::Duration::from_millis(42).subsec_millis(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ temporary value does not live long enough diff --git a/src/test/ui/consts/const-eval/dont_promote_unstable_const_fn.rs b/src/test/ui/consts/const-eval/dont_promote_unstable_const_fn.rs index a590e569947f8..4be260559bacc 100644 --- a/src/test/ui/consts/const-eval/dont_promote_unstable_const_fn.rs +++ b/src/test/ui/consts/const-eval/dont_promote_unstable_const_fn.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![unstable(feature = "humans", reason = "who ever let humans program computers, we're apparently really bad at it", diff --git a/src/test/ui/consts/const-eval/dont_promote_unstable_const_fn.stderr b/src/test/ui/consts/const-eval/dont_promote_unstable_const_fn.stderr index 7963cbb4e4569..0e7d86d435ad1 100644 --- a/src/test/ui/consts/const-eval/dont_promote_unstable_const_fn.stderr +++ b/src/test/ui/consts/const-eval/dont_promote_unstable_const_fn.stderr @@ -1,5 +1,5 @@ error: `foo` is not yet stable as a const fn - --> $DIR/dont_promote_unstable_const_fn.rs:25:25 + --> $DIR/dont_promote_unstable_const_fn.rs:15:25 | LL | const fn bar() -> u32 { foo() } //~ ERROR `foo` is not yet stable as a const fn | ^^^^^ @@ -7,7 +7,7 @@ LL | const fn bar() -> u32 { foo() } //~ ERROR `foo` is not yet stable as a cons = help: in Nightly builds, add `#![feature(foo)]` to the crate attributes to enable error[E0597]: borrowed value does not live long enough - --> $DIR/dont_promote_unstable_const_fn.rs:28:28 + --> $DIR/dont_promote_unstable_const_fn.rs:18:28 | LL | let _: &'static u32 = &foo(); //~ ERROR does not live long enough | ^^^^^ temporary value does not live long enough @@ -17,7 +17,7 @@ LL | } = note: borrowed value must be valid for the static lifetime... error[E0597]: borrowed value does not live long enough - --> $DIR/dont_promote_unstable_const_fn.rs:32:28 + --> $DIR/dont_promote_unstable_const_fn.rs:22:28 | LL | let _: &'static u32 = &meh(); //~ ERROR does not live long enough | ^^^^^ temporary value does not live long enough diff --git a/src/test/ui/consts/const-eval/double_check.rs b/src/test/ui/consts/const-eval/double_check.rs index 81f6e7ddd2de2..b07fd237c62dd 100644 --- a/src/test/ui/consts/const-eval/double_check.rs +++ b/src/test/ui/consts/const-eval/double_check.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass enum Foo { diff --git a/src/test/ui/consts/const-eval/double_check2.rs b/src/test/ui/consts/const-eval/double_check2.rs index b661ee92475e6..668a90f5334b2 100644 --- a/src/test/ui/consts/const-eval/double_check2.rs +++ b/src/test/ui/consts/const-eval/double_check2.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Foo { A = 5, B = 42, diff --git a/src/test/ui/consts/const-eval/double_check2.stderr b/src/test/ui/consts/const-eval/double_check2.stderr index 739af12d09c69..10acb5cd13f2a 100644 --- a/src/test/ui/consts/const-eval/double_check2.stderr +++ b/src/test/ui/consts/const-eval/double_check2.stderr @@ -1,5 +1,5 @@ error[E0080]: this static likely exhibits undefined behavior - --> $DIR/double_check2.rs:25:1 + --> $DIR/double_check2.rs:15:1 | LL | / static FOO: (&Foo, &Bar) = unsafe {( //~ undefined behavior LL | | Union { usize: &BAR }.foo, diff --git a/src/test/ui/consts/const-eval/duration_conversion.rs b/src/test/ui/consts/const-eval/duration_conversion.rs index 4481b75840487..ffdcc7e84ddd3 100644 --- a/src/test/ui/consts/const-eval/duration_conversion.rs +++ b/src/test/ui/consts/const-eval/duration_conversion.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![feature(duration_getters)] diff --git a/src/test/ui/consts/const-eval/enum_discr.rs b/src/test/ui/consts/const-eval/enum_discr.rs index ba38a42092e00..4851e7520948d 100644 --- a/src/test/ui/consts/const-eval/enum_discr.rs +++ b/src/test/ui/consts/const-eval/enum_discr.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass // run-pass diff --git a/src/test/ui/consts/const-eval/extern_fat_pointer.rs b/src/test/ui/consts/const-eval/extern_fat_pointer.rs index 071311430a878..f8e6fd09c7e0a 100644 --- a/src/test/ui/consts/const-eval/extern_fat_pointer.rs +++ b/src/test/ui/consts/const-eval/extern_fat_pointer.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![feature(extern_types)] diff --git a/src/test/ui/consts/const-eval/feature-gate-const_fn_union.rs b/src/test/ui/consts/const-eval/feature-gate-const_fn_union.rs index 113046b0689b2..b0ae746ace58d 100644 --- a/src/test/ui/consts/const-eval/feature-gate-const_fn_union.rs +++ b/src/test/ui/consts/const-eval/feature-gate-const_fn_union.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_fn)] fn main() {} diff --git a/src/test/ui/consts/const-eval/feature-gate-const_fn_union.stderr b/src/test/ui/consts/const-eval/feature-gate-const_fn_union.stderr index 1e28f14165fe9..c562c66389f97 100644 --- a/src/test/ui/consts/const-eval/feature-gate-const_fn_union.stderr +++ b/src/test/ui/consts/const-eval/feature-gate-const_fn_union.stderr @@ -1,5 +1,5 @@ error[E0658]: unions in const fn are unstable (see issue #51909) - --> $DIR/feature-gate-const_fn_union.rs:21:5 + --> $DIR/feature-gate-const_fn_union.rs:11:5 | LL | Foo { u }.i //~ ERROR unions in const fn are unstable | ^^^^^^^^^^^ diff --git a/src/test/ui/consts/const-eval/feature-gate-const_panic.rs b/src/test/ui/consts/const-eval/feature-gate-const_panic.rs index 26eb95d9c662c..ba5b07239a200 100644 --- a/src/test/ui/consts/const-eval/feature-gate-const_panic.rs +++ b/src/test/ui/consts/const-eval/feature-gate-const_panic.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() {} const Z: () = panic!("cheese"); diff --git a/src/test/ui/consts/const-eval/feature-gate-const_panic.stderr b/src/test/ui/consts/const-eval/feature-gate-const_panic.stderr index f4d05edd04a48..0810341355669 100644 --- a/src/test/ui/consts/const-eval/feature-gate-const_panic.stderr +++ b/src/test/ui/consts/const-eval/feature-gate-const_panic.stderr @@ -1,5 +1,5 @@ error[E0658]: panicking in constants is unstable (see issue #51999) - --> $DIR/feature-gate-const_panic.rs:13:15 + --> $DIR/feature-gate-const_panic.rs:3:15 | LL | const Z: () = panic!("cheese"); | ^^^^^^^^^^^^^^^^ @@ -8,7 +8,7 @@ LL | const Z: () = panic!("cheese"); = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) error[E0658]: panicking in constants is unstable (see issue #51999) - --> $DIR/feature-gate-const_panic.rs:19:15 + --> $DIR/feature-gate-const_panic.rs:9:15 | LL | const X: () = unimplemented!(); | ^^^^^^^^^^^^^^^^ @@ -17,7 +17,7 @@ LL | const X: () = unimplemented!(); = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) error[E0658]: panicking in constants is unstable (see issue #51999) - --> $DIR/feature-gate-const_panic.rs:16:15 + --> $DIR/feature-gate-const_panic.rs:6:15 | LL | const Y: () = unreachable!(); | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/consts/const-eval/ice-generic-assoc-const.rs b/src/test/ui/consts/const-eval/ice-generic-assoc-const.rs index 31e056b66bce9..e92de84c27984 100644 --- a/src/test/ui/consts/const-eval/ice-generic-assoc-const.rs +++ b/src/test/ui/consts/const-eval/ice-generic-assoc-const.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass pub trait Nullable { diff --git a/src/test/ui/consts/const-eval/ice-packed.rs b/src/test/ui/consts/const-eval/ice-packed.rs index 1db12a06b03c4..b9fe4eadd4132 100644 --- a/src/test/ui/consts/const-eval/ice-packed.rs +++ b/src/test/ui/consts/const-eval/ice-packed.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #[derive(Copy, Clone, PartialEq, Eq)] #[repr(packed)] diff --git a/src/test/ui/consts/const-eval/index_out_of_bounds.rs b/src/test/ui/consts/const-eval/index_out_of_bounds.rs index e7ffbe81b9ae7..80e0d28fec212 100644 --- a/src/test/ui/consts/const-eval/index_out_of_bounds.rs +++ b/src/test/ui/consts/const-eval/index_out_of_bounds.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - static FOO: i32 = [][0]; //~^ ERROR E0080 diff --git a/src/test/ui/consts/const-eval/index_out_of_bounds.stderr b/src/test/ui/consts/const-eval/index_out_of_bounds.stderr index a08d405d4494d..1b2974e4e3da4 100644 --- a/src/test/ui/consts/const-eval/index_out_of_bounds.stderr +++ b/src/test/ui/consts/const-eval/index_out_of_bounds.stderr @@ -1,5 +1,5 @@ error[E0080]: could not evaluate static initializer - --> $DIR/index_out_of_bounds.rs:11:19 + --> $DIR/index_out_of_bounds.rs:1:19 | LL | static FOO: i32 = [][0]; | ^^^^^ index out of bounds: the len is 0 but the index is 0 diff --git a/src/test/ui/consts/const-eval/index_out_of_bounds_propagated.rs b/src/test/ui/consts/const-eval/index_out_of_bounds_propagated.rs index 7a7e2ef0b6b55..4b487c09a11f7 100644 --- a/src/test/ui/consts/const-eval/index_out_of_bounds_propagated.rs +++ b/src/test/ui/consts/const-eval/index_out_of_bounds_propagated.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let array = [std::env::args().len()]; array[1]; //~ ERROR index out of bounds diff --git a/src/test/ui/consts/const-eval/index_out_of_bounds_propagated.stderr b/src/test/ui/consts/const-eval/index_out_of_bounds_propagated.stderr index 97badc19c9498..1a9e1b0ae8508 100644 --- a/src/test/ui/consts/const-eval/index_out_of_bounds_propagated.stderr +++ b/src/test/ui/consts/const-eval/index_out_of_bounds_propagated.stderr @@ -1,5 +1,5 @@ error: index out of bounds: the len is 1 but the index is 1 - --> $DIR/index_out_of_bounds_propagated.rs:13:5 + --> $DIR/index_out_of_bounds_propagated.rs:3:5 | LL | array[1]; //~ ERROR index out of bounds | ^^^^^^^^ diff --git a/src/test/ui/consts/const-eval/infinite_loop.rs b/src/test/ui/consts/const-eval/infinite_loop.rs index a1f8ab7f87882..31061c8e6da01 100644 --- a/src/test/ui/consts/const-eval/infinite_loop.rs +++ b/src/test/ui/consts/const-eval/infinite_loop.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_let)] fn main() { diff --git a/src/test/ui/consts/const-eval/infinite_loop.stderr b/src/test/ui/consts/const-eval/infinite_loop.stderr index f69aae2920360..8383aae49f13c 100644 --- a/src/test/ui/consts/const-eval/infinite_loop.stderr +++ b/src/test/ui/consts/const-eval/infinite_loop.stderr @@ -1,5 +1,5 @@ error[E0019]: constant contains unimplemented expression type - --> $DIR/infinite_loop.rs:20:9 + --> $DIR/infinite_loop.rs:10:9 | LL | / while n != 0 { //~ ERROR constant contains unimplemented expression type LL | | n = if n % 2 == 0 { n/2 } else { 3*n + 1 }; @@ -7,7 +7,7 @@ LL | | } | |_________^ warning: Constant evaluating a complex constant, this might take some time - --> $DIR/infinite_loop.rs:16:18 + --> $DIR/infinite_loop.rs:6:18 | LL | let _ = [(); { | __________________^ @@ -20,7 +20,7 @@ LL | | }]; | |_____^ error[E0080]: could not evaluate repeat length - --> $DIR/infinite_loop.rs:16:18 + --> $DIR/infinite_loop.rs:6:18 | LL | let _ = [(); { | __________________^ diff --git a/src/test/ui/consts/const-eval/issue-43197.nll.stderr b/src/test/ui/consts/const-eval/issue-43197.nll.stderr index 732fe45983460..3c4b8fd1152dd 100644 --- a/src/test/ui/consts/const-eval/issue-43197.nll.stderr +++ b/src/test/ui/consts/const-eval/issue-43197.nll.stderr @@ -1,5 +1,5 @@ warning: this constant cannot be used - --> $DIR/issue-43197.rs:20:5 + --> $DIR/issue-43197.rs:10:5 | LL | const X: u32 = 0-1; | ^^^^^^^^^^^^^^^---^ @@ -7,13 +7,13 @@ LL | const X: u32 = 0-1; | attempt to subtract with overflow | note: lint level defined here - --> $DIR/issue-43197.rs:11:9 + --> $DIR/issue-43197.rs:1:9 | LL | #![warn(const_err)] | ^^^^^^^^^ warning: this constant cannot be used - --> $DIR/issue-43197.rs:22:5 + --> $DIR/issue-43197.rs:12:5 | LL | const Y: u32 = foo(0-1); | ^^^^^^^^^^^^^^^^^^^---^^ @@ -21,7 +21,7 @@ LL | const Y: u32 = foo(0-1); | attempt to subtract with overflow error[E0080]: referenced constant has errors - --> $DIR/issue-43197.rs:24:14 + --> $DIR/issue-43197.rs:14:14 | LL | const X: u32 = 0-1; | --- attempt to subtract with overflow @@ -30,13 +30,13 @@ LL | println!("{} {}", X, Y); | ^^^^^^^ error[E0080]: erroneous constant used - --> $DIR/issue-43197.rs:24:14 + --> $DIR/issue-43197.rs:14:14 | LL | println!("{} {}", X, Y); | ^^^^^^^ - referenced constant has errors error[E0080]: referenced constant has errors - --> $DIR/issue-43197.rs:24:26 + --> $DIR/issue-43197.rs:14:26 | LL | const Y: u32 = foo(0-1); | --- attempt to subtract with overflow @@ -45,13 +45,13 @@ LL | println!("{} {}", X, Y); | ^ error[E0080]: erroneous constant used - --> $DIR/issue-43197.rs:24:26 + --> $DIR/issue-43197.rs:14:26 | LL | println!("{} {}", X, Y); | ^ referenced constant has errors error[E0080]: referenced constant has errors - --> $DIR/issue-43197.rs:24:23 + --> $DIR/issue-43197.rs:14:23 | LL | const X: u32 = 0-1; | --- attempt to subtract with overflow @@ -60,7 +60,7 @@ LL | println!("{} {}", X, Y); | ^ error[E0080]: erroneous constant used - --> $DIR/issue-43197.rs:24:23 + --> $DIR/issue-43197.rs:14:23 | LL | println!("{} {}", X, Y); | ^ referenced constant has errors diff --git a/src/test/ui/consts/const-eval/issue-43197.rs b/src/test/ui/consts/const-eval/issue-43197.rs index c0b45f0ba3041..489bcc6da13bb 100644 --- a/src/test/ui/consts/const-eval/issue-43197.rs +++ b/src/test/ui/consts/const-eval/issue-43197.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![warn(const_err)] #![feature(const_fn)] diff --git a/src/test/ui/consts/const-eval/issue-43197.stderr b/src/test/ui/consts/const-eval/issue-43197.stderr index 66921dcd7c508..ca7b10625f542 100644 --- a/src/test/ui/consts/const-eval/issue-43197.stderr +++ b/src/test/ui/consts/const-eval/issue-43197.stderr @@ -1,5 +1,5 @@ warning: this constant cannot be used - --> $DIR/issue-43197.rs:20:5 + --> $DIR/issue-43197.rs:10:5 | LL | const X: u32 = 0-1; | ^^^^^^^^^^^^^^^---^ @@ -7,13 +7,13 @@ LL | const X: u32 = 0-1; | attempt to subtract with overflow | note: lint level defined here - --> $DIR/issue-43197.rs:11:9 + --> $DIR/issue-43197.rs:1:9 | LL | #![warn(const_err)] | ^^^^^^^^^ warning: this constant cannot be used - --> $DIR/issue-43197.rs:22:5 + --> $DIR/issue-43197.rs:12:5 | LL | const Y: u32 = foo(0-1); | ^^^^^^^^^^^^^^^^^^^---^^ @@ -21,7 +21,7 @@ LL | const Y: u32 = foo(0-1); | attempt to subtract with overflow error[E0080]: referenced constant has errors - --> $DIR/issue-43197.rs:24:26 + --> $DIR/issue-43197.rs:14:26 | LL | const Y: u32 = foo(0-1); | --- attempt to subtract with overflow @@ -30,13 +30,13 @@ LL | println!("{} {}", X, Y); | ^ error[E0080]: erroneous constant used - --> $DIR/issue-43197.rs:24:26 + --> $DIR/issue-43197.rs:14:26 | LL | println!("{} {}", X, Y); | ^ referenced constant has errors error[E0080]: referenced constant has errors - --> $DIR/issue-43197.rs:24:23 + --> $DIR/issue-43197.rs:14:23 | LL | const X: u32 = 0-1; | --- attempt to subtract with overflow @@ -45,7 +45,7 @@ LL | println!("{} {}", X, Y); | ^ error[E0080]: erroneous constant used - --> $DIR/issue-43197.rs:24:23 + --> $DIR/issue-43197.rs:14:23 | LL | println!("{} {}", X, Y); | ^ referenced constant has errors diff --git a/src/test/ui/consts/const-eval/issue-44578.nll.stderr b/src/test/ui/consts/const-eval/issue-44578.nll.stderr index da040747991a4..7b8e12be41e6b 100644 --- a/src/test/ui/consts/const-eval/issue-44578.nll.stderr +++ b/src/test/ui/consts/const-eval/issue-44578.nll.stderr @@ -1,5 +1,5 @@ error[E0080]: referenced constant has errors - --> $DIR/issue-44578.rs:35:14 + --> $DIR/issue-44578.rs:25:14 | LL | const AMT: usize = [A::AMT][(A::AMT > B::AMT) as usize]; | ------------------------------------ index out of bounds: the len is 1 but the index is 1 @@ -8,13 +8,13 @@ LL | println!("{}", as Foo>::AMT); | ^^^^ error[E0080]: erroneous constant used - --> $DIR/issue-44578.rs:35:14 + --> $DIR/issue-44578.rs:25:14 | LL | println!("{}", as Foo>::AMT); | ^^^^ -------------------------- referenced constant has errors error[E0080]: referenced constant has errors - --> $DIR/issue-44578.rs:35:20 + --> $DIR/issue-44578.rs:25:20 | LL | const AMT: usize = [A::AMT][(A::AMT > B::AMT) as usize]; | ------------------------------------ index out of bounds: the len is 1 but the index is 1 @@ -23,7 +23,7 @@ LL | println!("{}", as Foo>::AMT); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0080]: erroneous constant used - --> $DIR/issue-44578.rs:35:20 + --> $DIR/issue-44578.rs:25:20 | LL | println!("{}", as Foo>::AMT); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ referenced constant has errors diff --git a/src/test/ui/consts/const-eval/issue-44578.rs b/src/test/ui/consts/const-eval/issue-44578.rs index 59ac4ab311c6c..37ea43d48d17e 100644 --- a/src/test/ui/consts/const-eval/issue-44578.rs +++ b/src/test/ui/consts/const-eval/issue-44578.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(const_err)] trait Foo { diff --git a/src/test/ui/consts/const-eval/issue-44578.stderr b/src/test/ui/consts/const-eval/issue-44578.stderr index 06174f37dcad1..3b225aab83730 100644 --- a/src/test/ui/consts/const-eval/issue-44578.stderr +++ b/src/test/ui/consts/const-eval/issue-44578.stderr @@ -1,5 +1,5 @@ error[E0080]: referenced constant has errors - --> $DIR/issue-44578.rs:35:20 + --> $DIR/issue-44578.rs:25:20 | LL | const AMT: usize = [A::AMT][(A::AMT > B::AMT) as usize]; | ------------------------------------ index out of bounds: the len is 1 but the index is 1 @@ -8,7 +8,7 @@ LL | println!("{}", as Foo>::AMT); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0080]: erroneous constant used - --> $DIR/issue-44578.rs:35:20 + --> $DIR/issue-44578.rs:25:20 | LL | println!("{}", as Foo>::AMT); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ referenced constant has errors diff --git a/src/test/ui/consts/const-eval/issue-47971.rs b/src/test/ui/consts/const-eval/issue-47971.rs index f6a2db31d371a..53ced7ef9e10e 100644 --- a/src/test/ui/consts/const-eval/issue-47971.rs +++ b/src/test/ui/consts/const-eval/issue-47971.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![feature(const_fn)] diff --git a/src/test/ui/consts/const-eval/issue-50706.rs b/src/test/ui/consts/const-eval/issue-50706.rs index 2b0082d95b306..cb45b86cd7ba3 100644 --- a/src/test/ui/consts/const-eval/issue-50706.rs +++ b/src/test/ui/consts/const-eval/issue-50706.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass pub struct Stats; diff --git a/src/test/ui/consts/const-eval/issue-50814-2.rs b/src/test/ui/consts/const-eval/issue-50814-2.rs index af627ee5fbe70..b3ad03f4dca2b 100644 --- a/src/test/ui/consts/const-eval/issue-50814-2.rs +++ b/src/test/ui/consts/const-eval/issue-50814-2.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait C { const BOO: usize; } diff --git a/src/test/ui/consts/const-eval/issue-50814-2.stderr b/src/test/ui/consts/const-eval/issue-50814-2.stderr index 1e37e9498120f..75ef56e69c67d 100644 --- a/src/test/ui/consts/const-eval/issue-50814-2.stderr +++ b/src/test/ui/consts/const-eval/issue-50814-2.stderr @@ -1,5 +1,5 @@ error[E0080]: referenced constant has errors - --> $DIR/issue-50814-2.rs:26:5 + --> $DIR/issue-50814-2.rs:16:5 | LL | const BAR: usize = [5, 6, 7][T::BOO]; | ----------------- index out of bounds: the len is 3 but the index is 42 @@ -8,7 +8,7 @@ LL | & as Foo>::BAR //~ ERROR erroneous constant used | ^^^^^^^^^^^^^^^^^^^^^^ error[E0080]: erroneous constant used - --> $DIR/issue-50814-2.rs:26:5 + --> $DIR/issue-50814-2.rs:16:5 | LL | & as Foo>::BAR //~ ERROR erroneous constant used | ^--------------------- diff --git a/src/test/ui/consts/const-eval/issue-50814.rs b/src/test/ui/consts/const-eval/issue-50814.rs index 8f2752453b52e..29bb9a3010964 100644 --- a/src/test/ui/consts/const-eval/issue-50814.rs +++ b/src/test/ui/consts/const-eval/issue-50814.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Unsigned { const MAX: u8; } diff --git a/src/test/ui/consts/const-eval/issue-50814.stderr b/src/test/ui/consts/const-eval/issue-50814.stderr index 16160207c573b..c4608e30d05cc 100644 --- a/src/test/ui/consts/const-eval/issue-50814.stderr +++ b/src/test/ui/consts/const-eval/issue-50814.stderr @@ -1,5 +1,5 @@ error[E0080]: referenced constant has errors - --> $DIR/issue-50814.rs:27:5 + --> $DIR/issue-50814.rs:17:5 | LL | const MAX: u8 = A::MAX + B::MAX; | --------------- attempt to add with overflow @@ -8,7 +8,7 @@ LL | &Sum::::MAX //~ ERROR erroneous constant used | ^^^^^^^^^^^^^^^^^^ error[E0080]: erroneous constant used - --> $DIR/issue-50814.rs:27:5 + --> $DIR/issue-50814.rs:17:5 | LL | &Sum::::MAX //~ ERROR erroneous constant used | ^----------------- diff --git a/src/test/ui/consts/const-eval/issue-51300.rs b/src/test/ui/consts/const-eval/issue-51300.rs index f91711c3c0f24..72a6072e4b7b4 100644 --- a/src/test/ui/consts/const-eval/issue-51300.rs +++ b/src/test/ui/consts/const-eval/issue-51300.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass // https://github.com/rust-lang/rust/issues/51300 diff --git a/src/test/ui/consts/const-eval/issue-52442.rs b/src/test/ui/consts/const-eval/issue-52442.rs index 755dc153d4052..a09f945bbc8b8 100644 --- a/src/test/ui/consts/const-eval/issue-52442.rs +++ b/src/test/ui/consts/const-eval/issue-52442.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { [(); { &loop { break } as *const _ as usize } ]; //~ ERROR unimplemented expression type } diff --git a/src/test/ui/consts/const-eval/issue-52442.stderr b/src/test/ui/consts/const-eval/issue-52442.stderr index 586c9fa22cecd..6b58fd57c54b6 100644 --- a/src/test/ui/consts/const-eval/issue-52442.stderr +++ b/src/test/ui/consts/const-eval/issue-52442.stderr @@ -1,5 +1,5 @@ error[E0019]: constant contains unimplemented expression type - --> $DIR/issue-52442.rs:12:14 + --> $DIR/issue-52442.rs:2:14 | LL | [(); { &loop { break } as *const _ as usize } ]; //~ ERROR unimplemented expression type | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/consts/const-eval/issue-52443.rs b/src/test/ui/consts/const-eval/issue-52443.rs index 2ae94f6d6420a..bf1c938097712 100644 --- a/src/test/ui/consts/const-eval/issue-52443.rs +++ b/src/test/ui/consts/const-eval/issue-52443.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { [(); & { loop { continue } } ]; //~ ERROR mismatched types [(); loop { break }]; //~ ERROR mismatched types diff --git a/src/test/ui/consts/const-eval/issue-52443.stderr b/src/test/ui/consts/const-eval/issue-52443.stderr index 3a145ba78d9b1..a6133bc45648b 100644 --- a/src/test/ui/consts/const-eval/issue-52443.stderr +++ b/src/test/ui/consts/const-eval/issue-52443.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-52443.rs:12:10 + --> $DIR/issue-52443.rs:2:10 | LL | [(); & { loop { continue } } ]; //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^^^^^^^ @@ -11,7 +11,7 @@ LL | [(); & { loop { continue } } ]; //~ ERROR mismatched types found type `&_` error[E0308]: mismatched types - --> $DIR/issue-52443.rs:13:17 + --> $DIR/issue-52443.rs:3:17 | LL | [(); loop { break }]; //~ ERROR mismatched types | ^^^^^ expected (), found usize @@ -20,25 +20,25 @@ LL | [(); loop { break }]; //~ ERROR mismatched types found type `usize` error[E0019]: constant contains unimplemented expression type - --> $DIR/issue-52443.rs:14:11 + --> $DIR/issue-52443.rs:4:11 | LL | [(); {while true {break}; 0}]; //~ ERROR constant contains unimplemented expression type | ^^^^^^^^^^^^^^^^^^ error[E0015]: calls in constants are limited to constant functions, tuple structs and tuple variants - --> $DIR/issue-52443.rs:15:21 + --> $DIR/issue-52443.rs:5:21 | LL | [(); { for _ in 0usize.. {}; 0}]; //~ ERROR calls in constants are limited to constant functions | ^^^^^^^^ error[E0019]: constant contains unimplemented expression type - --> $DIR/issue-52443.rs:15:21 + --> $DIR/issue-52443.rs:5:21 | LL | [(); { for _ in 0usize.. {}; 0}]; //~ ERROR calls in constants are limited to constant functions | ^^^^^^^^ error[E0080]: could not evaluate repeat length - --> $DIR/issue-52443.rs:15:10 + --> $DIR/issue-52443.rs:5:10 | LL | [(); { for _ in 0usize.. {}; 0}]; //~ ERROR calls in constants are limited to constant functions | ^^^^^^^^^^^--------^^^^^^^ diff --git a/src/test/ui/consts/const-eval/issue-53157.rs b/src/test/ui/consts/const-eval/issue-53157.rs index 900847767e1ba..b9958609971a7 100644 --- a/src/test/ui/consts/const-eval/issue-53157.rs +++ b/src/test/ui/consts/const-eval/issue-53157.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass macro_rules! m { diff --git a/src/test/ui/consts/const-eval/match-test-ptr-null.rs b/src/test/ui/consts/const-eval/match-test-ptr-null.rs index 81fcd23fb786d..b126cad3595cf 100644 --- a/src/test/ui/consts/const-eval/match-test-ptr-null.rs +++ b/src/test/ui/consts/const-eval/match-test-ptr-null.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { // Make sure match uses the usual pointer comparison code path -- i.e., it should complain // that pointer comparison is disallowed, not that parts of a pointer are accessed as raw diff --git a/src/test/ui/consts/const-eval/match-test-ptr-null.stderr b/src/test/ui/consts/const-eval/match-test-ptr-null.stderr index 26577948faefa..cc5431464e002 100644 --- a/src/test/ui/consts/const-eval/match-test-ptr-null.stderr +++ b/src/test/ui/consts/const-eval/match-test-ptr-null.stderr @@ -1,5 +1,5 @@ error[E0658]: casting pointers to integers in constants is unstable (see issue #51910) - --> $DIR/match-test-ptr-null.rs:16:15 + --> $DIR/match-test-ptr-null.rs:6:15 | LL | match &1 as *const i32 as usize { //~ ERROR casting pointers to integers in constants | ^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -7,13 +7,13 @@ LL | match &1 as *const i32 as usize { //~ ERROR casting pointers to int = help: add #![feature(const_raw_ptr_to_usize_cast)] to the crate attributes to enable error[E0019]: constant contains unimplemented expression type - --> $DIR/match-test-ptr-null.rs:17:13 + --> $DIR/match-test-ptr-null.rs:7:13 | LL | 0 => 42, //~ ERROR constant contains unimplemented expression type | ^ error[E0080]: could not evaluate repeat length - --> $DIR/match-test-ptr-null.rs:15:26 + --> $DIR/match-test-ptr-null.rs:5:26 | LL | let _: [u8; 0] = [4; { //~ ERROR could not evaluate repeat length | __________________________^ diff --git a/src/test/ui/consts/const-eval/no_lint_for_statically_known_error.rs b/src/test/ui/consts/const-eval/no_lint_for_statically_known_error.rs index 41d5192d33db4..0d14cf0f6d951 100644 --- a/src/test/ui/consts/const-eval/no_lint_for_statically_known_error.rs +++ b/src/test/ui/consts/const-eval/no_lint_for_statically_known_error.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass // if `X` were used instead of `x`, `X - 10` would result in a lint. diff --git a/src/test/ui/consts/const-eval/promote_mutable_zst_mir_borrowck.rs b/src/test/ui/consts/const-eval/promote_mutable_zst_mir_borrowck.rs index 922d7d3ab9606..06b1727258dc2 100644 --- a/src/test/ui/consts/const-eval/promote_mutable_zst_mir_borrowck.rs +++ b/src/test/ui/consts/const-eval/promote_mutable_zst_mir_borrowck.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![feature(nll)] diff --git a/src/test/ui/consts/const-eval/promoted_const_fn_fail.rs b/src/test/ui/consts/const-eval/promoted_const_fn_fail.rs index 19db07dd330ae..231ddf9ca4fb0 100644 --- a/src/test/ui/consts/const-eval/promoted_const_fn_fail.rs +++ b/src/test/ui/consts/const-eval/promoted_const_fn_fail.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![feature(const_fn, const_fn_union)] diff --git a/src/test/ui/consts/const-eval/promoted_errors.rs b/src/test/ui/consts/const-eval/promoted_errors.rs index a58c4be66c424..ebf80e7d2e670 100644 --- a/src/test/ui/consts/const-eval/promoted_errors.rs +++ b/src/test/ui/consts/const-eval/promoted_errors.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![warn(const_err)] // compile-pass diff --git a/src/test/ui/consts/const-eval/promoted_errors.stderr b/src/test/ui/consts/const-eval/promoted_errors.stderr index 85b5696be947c..7ec08bea815d3 100644 --- a/src/test/ui/consts/const-eval/promoted_errors.stderr +++ b/src/test/ui/consts/const-eval/promoted_errors.stderr @@ -1,47 +1,47 @@ warning: this expression will panic at runtime - --> $DIR/promoted_errors.rs:17:14 + --> $DIR/promoted_errors.rs:7:14 | LL | let _x = 0u32 - 1; | ^^^^^^^^ attempt to subtract with overflow | note: lint level defined here - --> $DIR/promoted_errors.rs:11:9 + --> $DIR/promoted_errors.rs:1:9 | LL | #![warn(const_err)] | ^^^^^^^^^ warning: attempt to divide by zero - --> $DIR/promoted_errors.rs:19:20 + --> $DIR/promoted_errors.rs:9:20 | LL | println!("{}", 1/(1-1)); | ^^^^^^^ warning: attempt to divide by zero - --> $DIR/promoted_errors.rs:21:14 + --> $DIR/promoted_errors.rs:11:14 | LL | let _x = 1/(1-1); | ^^^^^^^ warning: this expression will panic at runtime - --> $DIR/promoted_errors.rs:21:14 + --> $DIR/promoted_errors.rs:11:14 | LL | let _x = 1/(1-1); | ^^^^^^^ attempt to divide by zero warning: attempt to divide by zero - --> $DIR/promoted_errors.rs:24:20 + --> $DIR/promoted_errors.rs:14:20 | LL | println!("{}", 1/(false as u32)); | ^^^^^^^^^^^^^^^^ warning: attempt to divide by zero - --> $DIR/promoted_errors.rs:26:14 + --> $DIR/promoted_errors.rs:16:14 | LL | let _x = 1/(false as u32); | ^^^^^^^^^^^^^^^^ warning: this expression will panic at runtime - --> $DIR/promoted_errors.rs:26:14 + --> $DIR/promoted_errors.rs:16:14 | LL | let _x = 1/(false as u32); | ^^^^^^^^^^^^^^^^ attempt to divide by zero diff --git a/src/test/ui/consts/const-eval/promoted_raw_ptr_ops.rs b/src/test/ui/consts/const-eval/promoted_raw_ptr_ops.rs index 3b437f69d8d63..b189f2491b57b 100644 --- a/src/test/ui/consts/const-eval/promoted_raw_ptr_ops.rs +++ b/src/test/ui/consts/const-eval/promoted_raw_ptr_ops.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_raw_ptr_to_usize_cast, const_compare_raw_pointers, const_raw_ptr_deref)] fn main() { diff --git a/src/test/ui/consts/const-eval/promoted_raw_ptr_ops.stderr b/src/test/ui/consts/const-eval/promoted_raw_ptr_ops.stderr index 90c73c095fba1..2a509aaab2a86 100644 --- a/src/test/ui/consts/const-eval/promoted_raw_ptr_ops.stderr +++ b/src/test/ui/consts/const-eval/promoted_raw_ptr_ops.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/promoted_raw_ptr_ops.rs:14:29 + --> $DIR/promoted_raw_ptr_ops.rs:4:29 | LL | let x: &'static bool = &(42 as *const i32 == 43 as *const i32); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ temporary value does not live long enough @@ -10,7 +10,7 @@ LL | } = note: borrowed value must be valid for the static lifetime... error[E0597]: borrowed value does not live long enough - --> $DIR/promoted_raw_ptr_ops.rs:16:30 + --> $DIR/promoted_raw_ptr_ops.rs:6:30 | LL | let y: &'static usize = &(&1 as *const i32 as usize + 1); //~ ERROR does not live long enough | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ temporary value does not live long enough @@ -21,7 +21,7 @@ LL | } = note: borrowed value must be valid for the static lifetime... error[E0597]: borrowed value does not live long enough - --> $DIR/promoted_raw_ptr_ops.rs:17:28 + --> $DIR/promoted_raw_ptr_ops.rs:7:28 | LL | let z: &'static i32 = &(unsafe { *(42 as *const i32) }); //~ ERROR does not live long enough | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ temporary value does not live long enough diff --git a/src/test/ui/consts/const-eval/pub_const_err.rs b/src/test/ui/consts/const-eval/pub_const_err.rs index b7cfa949bac95..77729e9da3bb3 100644 --- a/src/test/ui/consts/const-eval/pub_const_err.rs +++ b/src/test/ui/consts/const-eval/pub_const_err.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![warn(const_err)] diff --git a/src/test/ui/consts/const-eval/pub_const_err.stderr b/src/test/ui/consts/const-eval/pub_const_err.stderr index fa3a79a5f1790..a5a8da5a71150 100644 --- a/src/test/ui/consts/const-eval/pub_const_err.stderr +++ b/src/test/ui/consts/const-eval/pub_const_err.stderr @@ -1,5 +1,5 @@ warning: this constant cannot be used - --> $DIR/pub_const_err.rs:16:1 + --> $DIR/pub_const_err.rs:6:1 | LL | pub const Z: u32 = 0 - 1; | ^^^^^^^^^^^^^^^^^^^-----^ @@ -7,19 +7,19 @@ LL | pub const Z: u32 = 0 - 1; | attempt to subtract with overflow | note: lint level defined here - --> $DIR/pub_const_err.rs:12:9 + --> $DIR/pub_const_err.rs:2:9 | LL | #![warn(const_err)] | ^^^^^^^^^ warning: attempt to subtract with overflow - --> $DIR/pub_const_err.rs:19:22 + --> $DIR/pub_const_err.rs:9:22 | LL | pub type Foo = [i32; 0 - 1]; | ^^^^^ warning: this array length cannot be used - --> $DIR/pub_const_err.rs:19:22 + --> $DIR/pub_const_err.rs:9:22 | LL | pub type Foo = [i32; 0 - 1]; | ^^^^^ attempt to subtract with overflow diff --git a/src/test/ui/consts/const-eval/pub_const_err_bin.rs b/src/test/ui/consts/const-eval/pub_const_err_bin.rs index bafa5b2f4da12..551c38c46db78 100644 --- a/src/test/ui/consts/const-eval/pub_const_err_bin.rs +++ b/src/test/ui/consts/const-eval/pub_const_err_bin.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![warn(const_err)] diff --git a/src/test/ui/consts/const-eval/pub_const_err_bin.stderr b/src/test/ui/consts/const-eval/pub_const_err_bin.stderr index 73229c60d14db..46c22b96a9524 100644 --- a/src/test/ui/consts/const-eval/pub_const_err_bin.stderr +++ b/src/test/ui/consts/const-eval/pub_const_err_bin.stderr @@ -1,5 +1,5 @@ warning: this constant cannot be used - --> $DIR/pub_const_err_bin.rs:14:1 + --> $DIR/pub_const_err_bin.rs:4:1 | LL | pub const Z: u32 = 0 - 1; | ^^^^^^^^^^^^^^^^^^^-----^ @@ -7,19 +7,19 @@ LL | pub const Z: u32 = 0 - 1; | attempt to subtract with overflow | note: lint level defined here - --> $DIR/pub_const_err_bin.rs:12:9 + --> $DIR/pub_const_err_bin.rs:2:9 | LL | #![warn(const_err)] | ^^^^^^^^^ warning: attempt to subtract with overflow - --> $DIR/pub_const_err_bin.rs:17:22 + --> $DIR/pub_const_err_bin.rs:7:22 | LL | pub type Foo = [i32; 0 - 1]; | ^^^^^ warning: this array length cannot be used - --> $DIR/pub_const_err_bin.rs:17:22 + --> $DIR/pub_const_err_bin.rs:7:22 | LL | pub type Foo = [i32; 0 - 1]; | ^^^^^ attempt to subtract with overflow diff --git a/src/test/ui/consts/const-eval/ref_to_float_transmute.rs b/src/test/ui/consts/const-eval/ref_to_float_transmute.rs index 1758ac72b633b..815f65e21c537 100644 --- a/src/test/ui/consts/const-eval/ref_to_float_transmute.rs +++ b/src/test/ui/consts/const-eval/ref_to_float_transmute.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //compile-pass #![feature(const_fn_union)] diff --git a/src/test/ui/consts/const-eval/ref_to_int_match.rs b/src/test/ui/consts/const-eval/ref_to_int_match.rs index cb942f465e40f..b080543755f6f 100644 --- a/src/test/ui/consts/const-eval/ref_to_int_match.rs +++ b/src/test/ui/consts/const-eval/ref_to_int_match.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_fn_union)] fn main() { diff --git a/src/test/ui/consts/const-eval/ref_to_int_match.stderr b/src/test/ui/consts/const-eval/ref_to_int_match.stderr index e82a16c066fdb..e060c91c12a3f 100644 --- a/src/test/ui/consts/const-eval/ref_to_int_match.stderr +++ b/src/test/ui/consts/const-eval/ref_to_int_match.stderr @@ -1,5 +1,5 @@ error[E0030]: lower range bound must be less than or equal to upper - --> $DIR/ref_to_int_match.rs:17:9 + --> $DIR/ref_to_int_match.rs:7:9 | LL | 10..=BAR => {}, //~ ERROR lower range bound must be less than or equal to upper | ^^ lower bound larger than upper bound diff --git a/src/test/ui/consts/const-eval/shift_overflow.rs b/src/test/ui/consts/const-eval/shift_overflow.rs index a2c6ed36d30c2..f7d0f6bd96144 100644 --- a/src/test/ui/consts/const-eval/shift_overflow.rs +++ b/src/test/ui/consts/const-eval/shift_overflow.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Foo { // test that we detect overflows for non-u32 discriminants X = 1 << ((u32::max_value() as u64) + 1), //~ ERROR E0080 diff --git a/src/test/ui/consts/const-eval/shift_overflow.stderr b/src/test/ui/consts/const-eval/shift_overflow.stderr index 00a748249ea0a..3399ed91386c6 100644 --- a/src/test/ui/consts/const-eval/shift_overflow.stderr +++ b/src/test/ui/consts/const-eval/shift_overflow.stderr @@ -1,5 +1,5 @@ error[E0080]: could not evaluate enum discriminant - --> $DIR/shift_overflow.rs:13:9 + --> $DIR/shift_overflow.rs:3:9 | LL | X = 1 << ((u32::max_value() as u64) + 1), //~ ERROR E0080 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempt to shift left with overflow diff --git a/src/test/ui/consts/const-eval/simple_with_undef.rs b/src/test/ui/consts/const-eval/simple_with_undef.rs index d18059fafd5ff..61398f3a375c2 100644 --- a/src/test/ui/consts/const-eval/simple_with_undef.rs +++ b/src/test/ui/consts/const-eval/simple_with_undef.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass const PARSE_BOOL: Option<&'static str> = None; diff --git a/src/test/ui/consts/const-eval/strlen.rs b/src/test/ui/consts/const-eval/strlen.rs index dfa41c491fa89..6a5cad82c3aa3 100644 --- a/src/test/ui/consts/const-eval/strlen.rs +++ b/src/test/ui/consts/const-eval/strlen.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass #![feature(const_str_len, const_str_as_bytes)] diff --git a/src/test/ui/consts/const-eval/ub-enum.rs b/src/test/ui/consts/const-eval/ub-enum.rs index bcb71af54afdb..e69ba9347d027 100644 --- a/src/test/ui/consts/const-eval/ub-enum.rs +++ b/src/test/ui/consts/const-eval/ub-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[repr(usize)] #[derive(Copy, Clone)] enum Enum { diff --git a/src/test/ui/consts/const-eval/ub-enum.stderr b/src/test/ui/consts/const-eval/ub-enum.stderr index 98e9b598b543f..a08465c53431d 100644 --- a/src/test/ui/consts/const-eval/ub-enum.stderr +++ b/src/test/ui/consts/const-eval/ub-enum.stderr @@ -1,5 +1,5 @@ error[E0080]: this constant likely exhibits undefined behavior - --> $DIR/ub-enum.rs:22:1 + --> $DIR/ub-enum.rs:12:1 | LL | const BAD_ENUM: Enum = unsafe { TransmuteEnum { a: &1 }.b }; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered pointer at ., but expected something in the range 0..=0 @@ -7,7 +7,7 @@ LL | const BAD_ENUM: Enum = unsafe { TransmuteEnum { a: &1 }.b }; = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rust compiler repository if you believe it should not be considered undefined behavior error[E0080]: this constant likely exhibits undefined behavior - --> $DIR/ub-enum.rs:35:1 + --> $DIR/ub-enum.rs:25:1 | LL | const BAD_ENUM2 : Enum2 = unsafe { TransmuteEnum2 { a: 0 }.b }; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered 0 at ., but expected something in the range 2..=2 @@ -15,7 +15,7 @@ LL | const BAD_ENUM2 : Enum2 = unsafe { TransmuteEnum2 { a: 0 }.b }; = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rust compiler repository if you believe it should not be considered undefined behavior error[E0080]: this constant likely exhibits undefined behavior - --> $DIR/ub-enum.rs:45:1 + --> $DIR/ub-enum.rs:35:1 | LL | const BAD_ENUM_CHAR : Option<(char, char)> = Some(('x', unsafe { TransmuteChar { a: !0 }.b })); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered character at .Some.0.1, but expected a valid unicode codepoint diff --git a/src/test/ui/consts/const-eval/ub-ptr-in-usize.rs b/src/test/ui/consts/const-eval/ub-ptr-in-usize.rs index b405f766f9132..cc3d28e3cf5d2 100644 --- a/src/test/ui/consts/const-eval/ub-ptr-in-usize.rs +++ b/src/test/ui/consts/const-eval/ub-ptr-in-usize.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass union Foo { diff --git a/src/test/ui/consts/const-eval/ub-uninhabit.rs b/src/test/ui/consts/const-eval/ub-uninhabit.rs index a5e341524bc73..1caf061dff605 100644 --- a/src/test/ui/consts/const-eval/ub-uninhabit.rs +++ b/src/test/ui/consts/const-eval/ub-uninhabit.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - union Foo { a: u8, b: Bar, diff --git a/src/test/ui/consts/const-eval/ub-uninhabit.stderr b/src/test/ui/consts/const-eval/ub-uninhabit.stderr index 623b98dc4531b..bb991b3e9913f 100644 --- a/src/test/ui/consts/const-eval/ub-uninhabit.stderr +++ b/src/test/ui/consts/const-eval/ub-uninhabit.stderr @@ -1,5 +1,5 @@ error[E0080]: this constant likely exhibits undefined behavior - --> $DIR/ub-uninhabit.rs:19:1 + --> $DIR/ub-uninhabit.rs:9:1 | LL | const BAD_BAD_BAD: Bar = unsafe { Foo { a: 1 }.b}; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a value of an uninhabited type diff --git a/src/test/ui/consts/const-eval/ub-usize-in-ref.rs b/src/test/ui/consts/const-eval/ub-usize-in-ref.rs index aaff2f233815b..49f112a1b2974 100644 --- a/src/test/ui/consts/const-eval/ub-usize-in-ref.rs +++ b/src/test/ui/consts/const-eval/ub-usize-in-ref.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass union Foo { diff --git a/src/test/ui/consts/const-eval/union-const-eval-field.rs b/src/test/ui/consts/const-eval/union-const-eval-field.rs index 5723f4a4159aa..15ad06eae37bf 100644 --- a/src/test/ui/consts/const-eval/union-const-eval-field.rs +++ b/src/test/ui/consts/const-eval/union-const-eval-field.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_fn)] type Field1 = i32; diff --git a/src/test/ui/consts/const-eval/union-const-eval-field.stderr b/src/test/ui/consts/const-eval/union-const-eval-field.stderr index 811450c8cba47..d3182c0722e8b 100644 --- a/src/test/ui/consts/const-eval/union-const-eval-field.stderr +++ b/src/test/ui/consts/const-eval/union-const-eval-field.stderr @@ -1,5 +1,5 @@ error: this constant cannot be used - --> $DIR/union-const-eval-field.rs:37:5 + --> $DIR/union-const-eval-field.rs:27:5 | LL | const FIELD3: Field3 = unsafe { UNION.field3 }; //~ ERROR cannot be used | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempted to read undefined bytes diff --git a/src/test/ui/consts/const-eval/union-ice.rs b/src/test/ui/consts/const-eval/union-ice.rs index 0cdb78c97803c..454f87216ecc3 100644 --- a/src/test/ui/consts/const-eval/union-ice.rs +++ b/src/test/ui/consts/const-eval/union-ice.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_fn)] type Field1 = i32; diff --git a/src/test/ui/consts/const-eval/union-ice.stderr b/src/test/ui/consts/const-eval/union-ice.stderr index e8a7b2f500561..4e4ab50d24af0 100644 --- a/src/test/ui/consts/const-eval/union-ice.stderr +++ b/src/test/ui/consts/const-eval/union-ice.stderr @@ -1,5 +1,5 @@ error: this constant cannot be used - --> $DIR/union-ice.rs:23:1 + --> $DIR/union-ice.rs:13:1 | LL | const FIELD3: Field3 = unsafe { UNION.field3 }; //~ ERROR this constant cannot be used | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempted to read undefined bytes @@ -7,7 +7,7 @@ LL | const FIELD3: Field3 = unsafe { UNION.field3 }; //~ ERROR this constant can = note: #[deny(const_err)] on by default error: this constant cannot be used - --> $DIR/union-ice.rs:25:1 + --> $DIR/union-ice.rs:15:1 | LL | / const FIELD_PATH: Struct = Struct { //~ ERROR this constant cannot be used LL | | a: 42, @@ -16,7 +16,7 @@ LL | | }; | |__^ attempted to read undefined bytes error[E0080]: this constant likely exhibits undefined behavior - --> $DIR/union-ice.rs:35:1 + --> $DIR/union-ice.rs:25:1 | LL | / const FIELD_PATH2: Struct2 = Struct2 { //~ ERROR this constant likely exhibits undefined behavior LL | | b: [ diff --git a/src/test/ui/consts/const-eval/union-ub.rs b/src/test/ui/consts/const-eval/union-ub.rs index db36764c4a306..efa30fa047349 100644 --- a/src/test/ui/consts/const-eval/union-ub.rs +++ b/src/test/ui/consts/const-eval/union-ub.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - union DummyUnion { u8: u8, bool: bool, diff --git a/src/test/ui/consts/const-eval/union-ub.stderr b/src/test/ui/consts/const-eval/union-ub.stderr index 2a04dae337b27..796aedae3db90 100644 --- a/src/test/ui/consts/const-eval/union-ub.stderr +++ b/src/test/ui/consts/const-eval/union-ub.stderr @@ -1,5 +1,5 @@ error[E0080]: this constant likely exhibits undefined behavior - --> $DIR/union-ub.rs:36:1 + --> $DIR/union-ub.rs:26:1 | LL | const BAD_BOOL: bool = unsafe { DummyUnion { u8: 42 }.bool}; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered 42, but expected something in the range 0..=1 diff --git a/src/test/ui/consts/const-eval/union_promotion.rs b/src/test/ui/consts/const-eval/union_promotion.rs index 714d7a4fc8b27..c308c81cf64b8 100644 --- a/src/test/ui/consts/const-eval/union_promotion.rs +++ b/src/test/ui/consts/const-eval/union_promotion.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(const_err)] union Foo { diff --git a/src/test/ui/consts/const-eval/union_promotion.stderr b/src/test/ui/consts/const-eval/union_promotion.stderr index b4aa91f2de723..643c784ca08fc 100644 --- a/src/test/ui/consts/const-eval/union_promotion.stderr +++ b/src/test/ui/consts/const-eval/union_promotion.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/union_promotion.rs:19:29 + --> $DIR/union_promotion.rs:9:29 | LL | let x: &'static bool = &unsafe { //~ borrowed value does not live long enough | _____________________________^ diff --git a/src/test/ui/consts/const-expr-addr-operator.rs b/src/test/ui/consts/const-expr-addr-operator.rs index f51cce5d4e053..dc9f292c2b8ad 100644 --- a/src/test/ui/consts/const-expr-addr-operator.rs +++ b/src/test/ui/consts/const-expr-addr-operator.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Encountered while testing #44614. // compile-pass diff --git a/src/test/ui/consts/const-fn-destructuring-arg.rs b/src/test/ui/consts/const-fn-destructuring-arg.rs index fce1688716d30..7f818079a19d1 100644 --- a/src/test/ui/consts/const-fn-destructuring-arg.rs +++ b/src/test/ui/consts/const-fn-destructuring-arg.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // test that certain things are disallowed in constant functions #![feature(const_fn)] diff --git a/src/test/ui/consts/const-fn-destructuring-arg.stderr b/src/test/ui/consts/const-fn-destructuring-arg.stderr index 029d63a7720a8..db63e8308045a 100644 --- a/src/test/ui/consts/const-fn-destructuring-arg.stderr +++ b/src/test/ui/consts/const-fn-destructuring-arg.stderr @@ -1,5 +1,5 @@ error[E0658]: arguments of constant functions can only be immutable by-value bindings (see issue #48821) - --> $DIR/const-fn-destructuring-arg.rs:17:13 + --> $DIR/const-fn-destructuring-arg.rs:7:13 | LL | a, | ^ @@ -7,7 +7,7 @@ LL | a, = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: arguments of constant functions can only be immutable by-value bindings (see issue #48821) - --> $DIR/const-fn-destructuring-arg.rs:19:13 + --> $DIR/const-fn-destructuring-arg.rs:9:13 | LL | b | ^ @@ -15,7 +15,7 @@ LL | b = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: let bindings in constant functions are unstable (see issue #48821) - --> $DIR/const-fn-destructuring-arg.rs:22:5 + --> $DIR/const-fn-destructuring-arg.rs:12:5 | LL | a + b | ^ @@ -23,7 +23,7 @@ LL | a + b = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: let bindings in constant functions are unstable (see issue #48821) - --> $DIR/const-fn-destructuring-arg.rs:22:9 + --> $DIR/const-fn-destructuring-arg.rs:12:9 | LL | a + b | ^ diff --git a/src/test/ui/consts/const-fn-error.rs b/src/test/ui/consts/const-fn-error.rs index 6eda41730b307..0776d6401bb6a 100644 --- a/src/test/ui/consts/const-fn-error.rs +++ b/src/test/ui/consts/const-fn-error.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_fn)] const X : usize = 2; diff --git a/src/test/ui/consts/const-fn-error.stderr b/src/test/ui/consts/const-fn-error.stderr index cdbf86f42ecc0..2bddbc803c90a 100644 --- a/src/test/ui/consts/const-fn-error.stderr +++ b/src/test/ui/consts/const-fn-error.stderr @@ -1,5 +1,5 @@ error[E0658]: let bindings in constant functions are unstable (see issue #48821) - --> $DIR/const-fn-error.rs:16:19 + --> $DIR/const-fn-error.rs:6:19 | LL | let mut sum = 0; | ^ @@ -7,7 +7,7 @@ LL | let mut sum = 0; = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: statements in constant functions are unstable (see issue #48821) - --> $DIR/const-fn-error.rs:16:19 + --> $DIR/const-fn-error.rs:6:19 | LL | let mut sum = 0; | ^ @@ -15,19 +15,19 @@ LL | let mut sum = 0; = help: add #![feature(const_let)] to the crate attributes to enable error[E0015]: calls in constant functions are limited to constant functions, tuple structs and tuple variants - --> $DIR/const-fn-error.rs:19:14 + --> $DIR/const-fn-error.rs:9:14 | LL | for i in 0..x { | ^^^^ error[E0019]: constant function contains unimplemented expression type - --> $DIR/const-fn-error.rs:19:14 + --> $DIR/const-fn-error.rs:9:14 | LL | for i in 0..x { | ^^^^ error[E0080]: could not evaluate constant expression - --> $DIR/const-fn-error.rs:29:13 + --> $DIR/const-fn-error.rs:19:13 | LL | for i in 0..x { | ---- calling non-const fn `>::into_iter` diff --git a/src/test/ui/consts/const-fn-mismatch.rs b/src/test/ui/consts/const-fn-mismatch.rs index 4e1fa6bd186ec..5bd274fe66b64 100644 --- a/src/test/ui/consts/const-fn-mismatch.rs +++ b/src/test/ui/consts/const-fn-mismatch.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we can't declare a const fn in an impl -- right now it's // just not allowed at all, though eventually it'd make sense to allow // it if the trait fn is const (but right now no trait fns can be diff --git a/src/test/ui/consts/const-fn-mismatch.stderr b/src/test/ui/consts/const-fn-mismatch.stderr index 1c9728fec9ecc..03bb7c6e8d6d8 100644 --- a/src/test/ui/consts/const-fn-mismatch.stderr +++ b/src/test/ui/consts/const-fn-mismatch.stderr @@ -1,5 +1,5 @@ error[E0379]: trait fns cannot be declared const - --> $DIR/const-fn-mismatch.rs:23:5 + --> $DIR/const-fn-mismatch.rs:13:5 | LL | const fn f() -> u32 { 22 } | ^^^^^ trait fns cannot be const diff --git a/src/test/ui/consts/const-fn-not-in-trait.rs b/src/test/ui/consts/const-fn-not-in-trait.rs index 1877929173d46..3975c22c56e91 100644 --- a/src/test/ui/consts/const-fn-not-in-trait.rs +++ b/src/test/ui/consts/const-fn-not-in-trait.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that const fn is illegal in a trait declaration, whether or // not a default is provided. diff --git a/src/test/ui/consts/const-fn-not-in-trait.stderr b/src/test/ui/consts/const-fn-not-in-trait.stderr index 5801f701ff8f0..6821a6c2bc690 100644 --- a/src/test/ui/consts/const-fn-not-in-trait.stderr +++ b/src/test/ui/consts/const-fn-not-in-trait.stderr @@ -1,11 +1,11 @@ error[E0379]: trait fns cannot be declared const - --> $DIR/const-fn-not-in-trait.rs:17:5 + --> $DIR/const-fn-not-in-trait.rs:7:5 | LL | const fn f() -> u32; | ^^^^^ trait fns cannot be const error[E0379]: trait fns cannot be declared const - --> $DIR/const-fn-not-in-trait.rs:19:5 + --> $DIR/const-fn-not-in-trait.rs:9:5 | LL | const fn g() -> u32 { 0 } | ^^^^^ trait fns cannot be const diff --git a/src/test/ui/consts/const-fn-not-safe-for-const.rs b/src/test/ui/consts/const-fn-not-safe-for-const.rs index 341cc7bb49116..825b92f7e975d 100644 --- a/src/test/ui/consts/const-fn-not-safe-for-const.rs +++ b/src/test/ui/consts/const-fn-not-safe-for-const.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we can't call random fns in a const fn or do other bad things. #![feature(const_fn)] diff --git a/src/test/ui/consts/const-fn-not-safe-for-const.stderr b/src/test/ui/consts/const-fn-not-safe-for-const.stderr index 1e99a4378faf3..9c0cc87b8db7f 100644 --- a/src/test/ui/consts/const-fn-not-safe-for-const.stderr +++ b/src/test/ui/consts/const-fn-not-safe-for-const.stderr @@ -1,29 +1,29 @@ error[E0015]: calls in constant functions are limited to constant functions, tuple structs and tuple variants - --> $DIR/const-fn-not-safe-for-const.rs:20:14 + --> $DIR/const-fn-not-safe-for-const.rs:10:14 | LL | unsafe { transmute(x) } //~ ERROR E0015 | ^^^^^^^^^^^^ error[E0015]: calls in constant functions are limited to constant functions, tuple structs and tuple variants - --> $DIR/const-fn-not-safe-for-const.rs:24:5 + --> $DIR/const-fn-not-safe-for-const.rs:14:5 | LL | random() //~ ERROR E0015 | ^^^^^^^^ error[E0013]: constant functions cannot refer to statics, use a constant instead - --> $DIR/const-fn-not-safe-for-const.rs:30:5 + --> $DIR/const-fn-not-safe-for-const.rs:20:5 | LL | Y | ^ error[E0013]: constant functions cannot refer to statics, use a constant instead - --> $DIR/const-fn-not-safe-for-const.rs:35:5 + --> $DIR/const-fn-not-safe-for-const.rs:25:5 | LL | &Y | ^^ error[E0658]: let bindings in constant functions are unstable (see issue #48821) - --> $DIR/const-fn-not-safe-for-const.rs:40:13 + --> $DIR/const-fn-not-safe-for-const.rs:30:13 | LL | let x = 22; | ^^ @@ -31,7 +31,7 @@ LL | let x = 22; = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: statements in constant functions are unstable (see issue #48821) - --> $DIR/const-fn-not-safe-for-const.rs:40:13 + --> $DIR/const-fn-not-safe-for-const.rs:30:13 | LL | let x = 22; | ^^ @@ -39,7 +39,7 @@ LL | let x = 22; = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: let bindings in constant functions are unstable (see issue #48821) - --> $DIR/const-fn-not-safe-for-const.rs:43:13 + --> $DIR/const-fn-not-safe-for-const.rs:33:13 | LL | let y = 44; | ^^ @@ -47,7 +47,7 @@ LL | let y = 44; = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: statements in constant functions are unstable (see issue #48821) - --> $DIR/const-fn-not-safe-for-const.rs:43:13 + --> $DIR/const-fn-not-safe-for-const.rs:33:13 | LL | let y = 44; | ^^ @@ -55,7 +55,7 @@ LL | let y = 44; = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: let bindings in constant functions are unstable (see issue #48821) - --> $DIR/const-fn-not-safe-for-const.rs:46:5 + --> $DIR/const-fn-not-safe-for-const.rs:36:5 | LL | x + y | ^ @@ -63,7 +63,7 @@ LL | x + y = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: let bindings in constant functions are unstable (see issue #48821) - --> $DIR/const-fn-not-safe-for-const.rs:46:9 + --> $DIR/const-fn-not-safe-for-const.rs:36:9 | LL | x + y | ^ diff --git a/src/test/ui/consts/const-fn-stability-calls-3.rs b/src/test/ui/consts/const-fn-stability-calls-3.rs index 0f413b0bbc112..9861ca9daac36 100644 --- a/src/test/ui/consts/const-fn-stability-calls-3.rs +++ b/src/test/ui/consts/const-fn-stability-calls-3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test use of const fn from another crate without a feature gate. #![feature(rustc_attrs)] diff --git a/src/test/ui/consts/const-fn-stability-calls-3.stderr b/src/test/ui/consts/const-fn-stability-calls-3.stderr index 50c959d68053c..28f4d101cb7b2 100644 --- a/src/test/ui/consts/const-fn-stability-calls-3.stderr +++ b/src/test/ui/consts/const-fn-stability-calls-3.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/const-fn-stability-calls-3.rs:23:1 + --> $DIR/const-fn-stability-calls-3.rs:13:1 | LL | / fn main() { //~ ERROR compilation successful LL | | let x = foo(); // use outside a constant is ok diff --git a/src/test/ui/consts/const-integer-bool-ops.rs b/src/test/ui/consts/const-integer-bool-ops.rs index 29bc665a22e7b..b2f1c78938c35 100644 --- a/src/test/ui/consts/const-integer-bool-ops.rs +++ b/src/test/ui/consts/const-integer-bool-ops.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const X: usize = 42 && 39; //~^ ERROR mismatched types //~| expected bool, found integral variable diff --git a/src/test/ui/consts/const-integer-bool-ops.stderr b/src/test/ui/consts/const-integer-bool-ops.stderr index 8075a3f0863b6..035e7ac7b02d6 100644 --- a/src/test/ui/consts/const-integer-bool-ops.stderr +++ b/src/test/ui/consts/const-integer-bool-ops.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/const-integer-bool-ops.rs:11:18 + --> $DIR/const-integer-bool-ops.rs:1:18 | LL | const X: usize = 42 && 39; | ^^ expected bool, found integral variable @@ -8,7 +8,7 @@ LL | const X: usize = 42 && 39; found type `{integer}` error[E0308]: mismatched types - --> $DIR/const-integer-bool-ops.rs:11:24 + --> $DIR/const-integer-bool-ops.rs:1:24 | LL | const X: usize = 42 && 39; | ^^ expected bool, found integral variable @@ -17,13 +17,13 @@ LL | const X: usize = 42 && 39; found type `{integer}` error[E0308]: mismatched types - --> $DIR/const-integer-bool-ops.rs:11:18 + --> $DIR/const-integer-bool-ops.rs:1:18 | LL | const X: usize = 42 && 39; | ^^^^^^^^ expected usize, found bool error[E0308]: mismatched types - --> $DIR/const-integer-bool-ops.rs:20:19 + --> $DIR/const-integer-bool-ops.rs:10:19 | LL | const X1: usize = 42 || 39; | ^^ expected bool, found integral variable @@ -32,7 +32,7 @@ LL | const X1: usize = 42 || 39; found type `{integer}` error[E0308]: mismatched types - --> $DIR/const-integer-bool-ops.rs:20:25 + --> $DIR/const-integer-bool-ops.rs:10:25 | LL | const X1: usize = 42 || 39; | ^^ expected bool, found integral variable @@ -41,13 +41,13 @@ LL | const X1: usize = 42 || 39; found type `{integer}` error[E0308]: mismatched types - --> $DIR/const-integer-bool-ops.rs:20:19 + --> $DIR/const-integer-bool-ops.rs:10:19 | LL | const X1: usize = 42 || 39; | ^^^^^^^^ expected usize, found bool error[E0308]: mismatched types - --> $DIR/const-integer-bool-ops.rs:29:19 + --> $DIR/const-integer-bool-ops.rs:19:19 | LL | const X2: usize = -42 || -39; | ^^^ expected bool, found integral variable @@ -56,7 +56,7 @@ LL | const X2: usize = -42 || -39; found type `{integer}` error[E0308]: mismatched types - --> $DIR/const-integer-bool-ops.rs:29:26 + --> $DIR/const-integer-bool-ops.rs:19:26 | LL | const X2: usize = -42 || -39; | ^^^ expected bool, found integral variable @@ -65,13 +65,13 @@ LL | const X2: usize = -42 || -39; found type `{integer}` error[E0308]: mismatched types - --> $DIR/const-integer-bool-ops.rs:29:19 + --> $DIR/const-integer-bool-ops.rs:19:19 | LL | const X2: usize = -42 || -39; | ^^^^^^^^^^ expected usize, found bool error[E0308]: mismatched types - --> $DIR/const-integer-bool-ops.rs:38:19 + --> $DIR/const-integer-bool-ops.rs:28:19 | LL | const X3: usize = -42 && -39; | ^^^ expected bool, found integral variable @@ -80,7 +80,7 @@ LL | const X3: usize = -42 && -39; found type `{integer}` error[E0308]: mismatched types - --> $DIR/const-integer-bool-ops.rs:38:26 + --> $DIR/const-integer-bool-ops.rs:28:26 | LL | const X3: usize = -42 && -39; | ^^^ expected bool, found integral variable @@ -89,43 +89,43 @@ LL | const X3: usize = -42 && -39; found type `{integer}` error[E0308]: mismatched types - --> $DIR/const-integer-bool-ops.rs:38:19 + --> $DIR/const-integer-bool-ops.rs:28:19 | LL | const X3: usize = -42 && -39; | ^^^^^^^^^^ expected usize, found bool error[E0308]: mismatched types - --> $DIR/const-integer-bool-ops.rs:47:18 + --> $DIR/const-integer-bool-ops.rs:37:18 | LL | const Y: usize = 42.0 == 42.0; | ^^^^^^^^^^^^ expected usize, found bool error[E0308]: mismatched types - --> $DIR/const-integer-bool-ops.rs:52:19 + --> $DIR/const-integer-bool-ops.rs:42:19 | LL | const Y1: usize = 42.0 >= 42.0; | ^^^^^^^^^^^^ expected usize, found bool error[E0308]: mismatched types - --> $DIR/const-integer-bool-ops.rs:57:19 + --> $DIR/const-integer-bool-ops.rs:47:19 | LL | const Y2: usize = 42.0 <= 42.0; | ^^^^^^^^^^^^ expected usize, found bool error[E0308]: mismatched types - --> $DIR/const-integer-bool-ops.rs:62:19 + --> $DIR/const-integer-bool-ops.rs:52:19 | LL | const Y3: usize = 42.0 > 42.0; | ^^^^^^^^^^^ expected usize, found bool error[E0308]: mismatched types - --> $DIR/const-integer-bool-ops.rs:67:19 + --> $DIR/const-integer-bool-ops.rs:57:19 | LL | const Y4: usize = 42.0 < 42.0; | ^^^^^^^^^^^ expected usize, found bool error[E0308]: mismatched types - --> $DIR/const-integer-bool-ops.rs:72:19 + --> $DIR/const-integer-bool-ops.rs:62:19 | LL | const Y5: usize = 42.0 != 42.0; | ^^^^^^^^^^^^ expected usize, found bool diff --git a/src/test/ui/consts/const-len-underflow-separate-spans.rs b/src/test/ui/consts/const-len-underflow-separate-spans.rs index 8db1411005e57..f916d8f94c99c 100644 --- a/src/test/ui/consts/const-len-underflow-separate-spans.rs +++ b/src/test/ui/consts/const-len-underflow-separate-spans.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that a constant-evaluation underflow highlights the correct // spot (where the underflow occurred), while also providing the // overall context for what caused the evaluation. diff --git a/src/test/ui/consts/const-len-underflow-separate-spans.stderr b/src/test/ui/consts/const-len-underflow-separate-spans.stderr index cf97a0dc55578..f4f802c97769c 100644 --- a/src/test/ui/consts/const-len-underflow-separate-spans.stderr +++ b/src/test/ui/consts/const-len-underflow-separate-spans.stderr @@ -1,5 +1,5 @@ error[E0080]: referenced constant has errors - --> $DIR/const-len-underflow-separate-spans.rs:20:17 + --> $DIR/const-len-underflow-separate-spans.rs:10:17 | LL | const LEN: usize = ONE - TWO; | --------- attempt to subtract with overflow @@ -8,13 +8,13 @@ LL | let a: [i8; LEN] = unimplemented!(); | ^^^ error[E0080]: could not evaluate constant - --> $DIR/const-len-underflow-separate-spans.rs:20:17 + --> $DIR/const-len-underflow-separate-spans.rs:10:17 | LL | let a: [i8; LEN] = unimplemented!(); | ^^^ referenced constant has errors error[E0080]: referenced constant has errors - --> $DIR/const-len-underflow-separate-spans.rs:20:12 + --> $DIR/const-len-underflow-separate-spans.rs:10:12 | LL | const LEN: usize = ONE - TWO; | --------- attempt to subtract with overflow @@ -23,7 +23,7 @@ LL | let a: [i8; LEN] = unimplemented!(); | ^^^^^^^^^ error[E0080]: could not evaluate constant expression - --> $DIR/const-len-underflow-separate-spans.rs:20:12 + --> $DIR/const-len-underflow-separate-spans.rs:10:12 | LL | let a: [i8; LEN] = unimplemented!(); | ^^^^^---^ diff --git a/src/test/ui/consts/const-len-underflow-subspans.rs b/src/test/ui/consts/const-len-underflow-subspans.rs index 054c272a3d321..038bd7ba225ec 100644 --- a/src/test/ui/consts/const-len-underflow-subspans.rs +++ b/src/test/ui/consts/const-len-underflow-subspans.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that a constant-evaluation underflow highlights the correct // spot (where the underflow occurred). diff --git a/src/test/ui/consts/const-len-underflow-subspans.stderr b/src/test/ui/consts/const-len-underflow-subspans.stderr index 860716c1f3855..ecc2fd16f570b 100644 --- a/src/test/ui/consts/const-len-underflow-subspans.stderr +++ b/src/test/ui/consts/const-len-underflow-subspans.stderr @@ -1,5 +1,5 @@ error: attempt to subtract with overflow - --> $DIR/const-len-underflow-subspans.rs:18:17 + --> $DIR/const-len-underflow-subspans.rs:8:17 | LL | let a: [i8; ONE - TWO] = unimplemented!(); | ^^^^^^^^^ @@ -7,7 +7,7 @@ LL | let a: [i8; ONE - TWO] = unimplemented!(); = note: #[deny(const_err)] on by default error[E0080]: could not evaluate constant expression - --> $DIR/const-len-underflow-subspans.rs:18:12 + --> $DIR/const-len-underflow-subspans.rs:8:12 | LL | let a: [i8; ONE - TWO] = unimplemented!(); | ^^^^^---------^ diff --git a/src/test/ui/consts/const-match-check.eval1.stderr b/src/test/ui/consts/const-match-check.eval1.stderr index 3caf1491aba68..49380abe37123 100644 --- a/src/test/ui/consts/const-match-check.eval1.stderr +++ b/src/test/ui/consts/const-match-check.eval1.stderr @@ -1,5 +1,5 @@ error[E0005]: refutable pattern in local binding: `_` not covered - --> $DIR/const-match-check.rs:35:15 + --> $DIR/const-match-check.rs:25:15 | LL | A = { let 0 = 0; 0 }, | ^ pattern `_` not covered diff --git a/src/test/ui/consts/const-match-check.eval2.stderr b/src/test/ui/consts/const-match-check.eval2.stderr index de85d4d73db0c..24579f4310482 100644 --- a/src/test/ui/consts/const-match-check.eval2.stderr +++ b/src/test/ui/consts/const-match-check.eval2.stderr @@ -1,5 +1,5 @@ error[E0005]: refutable pattern in local binding: `_` not covered - --> $DIR/const-match-check.rs:41:24 + --> $DIR/const-match-check.rs:31:24 | LL | let x: [i32; { let 0 = 0; 0 }] = []; | ^ pattern `_` not covered diff --git a/src/test/ui/consts/const-match-check.matchck.stderr b/src/test/ui/consts/const-match-check.matchck.stderr index bbf1169c577cf..2b39fc1441224 100644 --- a/src/test/ui/consts/const-match-check.matchck.stderr +++ b/src/test/ui/consts/const-match-check.matchck.stderr @@ -1,23 +1,23 @@ error[E0005]: refutable pattern in local binding: `_` not covered - --> $DIR/const-match-check.rs:14:22 + --> $DIR/const-match-check.rs:4:22 | LL | const X: i32 = { let 0 = 0; 0 }; | ^ pattern `_` not covered error[E0005]: refutable pattern in local binding: `_` not covered - --> $DIR/const-match-check.rs:18:23 + --> $DIR/const-match-check.rs:8:23 | LL | static Y: i32 = { let 0 = 0; 0 }; | ^ pattern `_` not covered error[E0005]: refutable pattern in local binding: `_` not covered - --> $DIR/const-match-check.rs:23:26 + --> $DIR/const-match-check.rs:13:26 | LL | const X: i32 = { let 0 = 0; 0 }; | ^ pattern `_` not covered error[E0005]: refutable pattern in local binding: `_` not covered - --> $DIR/const-match-check.rs:29:26 + --> $DIR/const-match-check.rs:19:26 | LL | const X: i32 = { let 0 = 0; 0 }; | ^ pattern `_` not covered diff --git a/src/test/ui/consts/const-match-check.rs b/src/test/ui/consts/const-match-check.rs index 304eef7847c91..60f60fa40e349 100644 --- a/src/test/ui/consts/const-match-check.rs +++ b/src/test/ui/consts/const-match-check.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: matchck eval1 eval2 #[cfg(matchck)] diff --git a/src/test/ui/consts/const-match-pattern-arm.rs b/src/test/ui/consts/const-match-pattern-arm.rs index bc944948f3d8b..3b985269a56c9 100644 --- a/src/test/ui/consts/const-match-pattern-arm.rs +++ b/src/test/ui/consts/const-match-pattern-arm.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(warnings)] const x: bool = match Some(true) { diff --git a/src/test/ui/consts/const-match-pattern-arm.stderr b/src/test/ui/consts/const-match-pattern-arm.stderr index 201aa7cd5b790..c793cc0cd780a 100644 --- a/src/test/ui/consts/const-match-pattern-arm.stderr +++ b/src/test/ui/consts/const-match-pattern-arm.stderr @@ -1,11 +1,11 @@ error[E0019]: constant contains unimplemented expression type - --> $DIR/const-match-pattern-arm.rs:14:5 + --> $DIR/const-match-pattern-arm.rs:4:5 | LL | Some(value) => true, | ^^^^^^^^^^^ error[E0019]: constant contains unimplemented expression type - --> $DIR/const-match-pattern-arm.rs:21:9 + --> $DIR/const-match-pattern-arm.rs:11:9 | LL | Some(value) => true, | ^^^^^^^^^^^ diff --git a/src/test/ui/consts/const-pattern-irrefutable.rs b/src/test/ui/consts/const-pattern-irrefutable.rs index af0b95e002d84..7157355ac0398 100644 --- a/src/test/ui/consts/const-pattern-irrefutable.rs +++ b/src/test/ui/consts/const-pattern-irrefutable.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod foo { pub const b: u8 = 2; pub const d: u8 = 2; diff --git a/src/test/ui/consts/const-pattern-irrefutable.stderr b/src/test/ui/consts/const-pattern-irrefutable.stderr index 6d5738f332877..1431affe416cd 100644 --- a/src/test/ui/consts/const-pattern-irrefutable.stderr +++ b/src/test/ui/consts/const-pattern-irrefutable.stderr @@ -1,17 +1,17 @@ error[E0005]: refutable pattern in local binding: `_` not covered - --> $DIR/const-pattern-irrefutable.rs:22:9 + --> $DIR/const-pattern-irrefutable.rs:12:9 | LL | let a = 4; //~ ERROR refutable pattern in local binding: `_` not covered | ^ interpreted as a constant pattern, not new variable error[E0005]: refutable pattern in local binding: `_` not covered - --> $DIR/const-pattern-irrefutable.rs:23:9 + --> $DIR/const-pattern-irrefutable.rs:13:9 | LL | let c = 4; //~ ERROR refutable pattern in local binding: `_` not covered | ^ interpreted as a constant pattern, not new variable error[E0005]: refutable pattern in local binding: `_` not covered - --> $DIR/const-pattern-irrefutable.rs:24:9 + --> $DIR/const-pattern-irrefutable.rs:14:9 | LL | let d = 4; //~ ERROR refutable pattern in local binding: `_` not covered | ^ interpreted as a constant pattern, not new variable diff --git a/src/test/ui/consts/const-pattern-not-const-evaluable.rs b/src/test/ui/consts/const-pattern-not-const-evaluable.rs index 87d5e13df6eb3..2b4448e4fbf63 100644 --- a/src/test/ui/consts/const-pattern-not-const-evaluable.rs +++ b/src/test/ui/consts/const-pattern-not-const-evaluable.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![feature(const_fn)] diff --git a/src/test/ui/consts/const-size_of-cycle.rs b/src/test/ui/consts/const-size_of-cycle.rs index fed8e1885de8a..2fff69015386e 100644 --- a/src/test/ui/consts/const-size_of-cycle.rs +++ b/src/test/ui/consts/const-size_of-cycle.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: cycle detected #![feature(const_fn)] diff --git a/src/test/ui/consts/const-slice-oob.rs b/src/test/ui/consts/const-slice-oob.rs index 6d51ff3099809..ecca655350a3d 100644 --- a/src/test/ui/consts/const-slice-oob.rs +++ b/src/test/ui/consts/const-slice-oob.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[deny(const_err)] const FOO: &'static[u32] = &[1, 2, 3]; diff --git a/src/test/ui/consts/const-slice-oob.stderr b/src/test/ui/consts/const-slice-oob.stderr index 30260c36ffd35..0b880bf0baa9d 100644 --- a/src/test/ui/consts/const-slice-oob.stderr +++ b/src/test/ui/consts/const-slice-oob.stderr @@ -1,5 +1,5 @@ error: this constant cannot be used - --> $DIR/const-slice-oob.rs:14:1 + --> $DIR/const-slice-oob.rs:4:1 | LL | const BAR: u32 = FOO[5]; | ^^^^^^^^^^^^^^^^^------^ diff --git a/src/test/ui/consts/const-tup-index-span.rs b/src/test/ui/consts/const-tup-index-span.rs index b42c440f87d74..75acc18bba459 100644 --- a/src/test/ui/consts/const-tup-index-span.rs +++ b/src/test/ui/consts/const-tup-index-span.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test spans of errors const TUP: (usize,) = 5usize << 64; diff --git a/src/test/ui/consts/const-tup-index-span.stderr b/src/test/ui/consts/const-tup-index-span.stderr index e924862965611..9a585458eb9de 100644 --- a/src/test/ui/consts/const-tup-index-span.stderr +++ b/src/test/ui/consts/const-tup-index-span.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/const-tup-index-span.rs:13:23 + --> $DIR/const-tup-index-span.rs:3:23 | LL | const TUP: (usize,) = 5usize << 64; | ^^^^^^^^^^^^ expected tuple, found usize diff --git a/src/test/ui/consts/const-type-mismatch.rs b/src/test/ui/consts/const-type-mismatch.rs index ddad4e79cfdaa..6e56c046f7ae2 100644 --- a/src/test/ui/consts/const-type-mismatch.rs +++ b/src/test/ui/consts/const-type-mismatch.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // `const`s shouldn't suggest `.into()` const TEN: u8 = 10; diff --git a/src/test/ui/consts/const-type-mismatch.stderr b/src/test/ui/consts/const-type-mismatch.stderr index 965995f82c53a..dbc533c6c60ad 100644 --- a/src/test/ui/consts/const-type-mismatch.stderr +++ b/src/test/ui/consts/const-type-mismatch.stderr @@ -1,11 +1,11 @@ error[E0308]: mismatched types - --> $DIR/const-type-mismatch.rs:14:21 + --> $DIR/const-type-mismatch.rs:4:21 | LL | const TWELVE: u16 = TEN + 2; | ^^^^^^^ expected u16, found u8 error[E0308]: mismatched types - --> $DIR/const-type-mismatch.rs:19:27 + --> $DIR/const-type-mismatch.rs:9:27 | LL | const ALSO_TEN: u16 = TEN; | ^^^ expected u16, found u8 diff --git a/src/test/ui/consts/const-typeid-of.rs b/src/test/ui/consts/const-typeid-of.rs index 401125cef09d8..3829c481da837 100644 --- a/src/test/ui/consts/const-typeid-of.rs +++ b/src/test/ui/consts/const-typeid-of.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::any::TypeId; struct A; diff --git a/src/test/ui/consts/const-typeid-of.stderr b/src/test/ui/consts/const-typeid-of.stderr index d13ced9a10a0a..c83ebe540d5a2 100644 --- a/src/test/ui/consts/const-typeid-of.stderr +++ b/src/test/ui/consts/const-typeid-of.stderr @@ -1,5 +1,5 @@ error: `std::any::TypeId::of` is not yet stable as a const fn - --> $DIR/const-typeid-of.rs:16:26 + --> $DIR/const-typeid-of.rs:6:26 | LL | const A_ID: TypeId = TypeId::of::(); | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/consts/const-unsized.rs b/src/test/ui/consts/const-unsized.rs index 39ac969b80e98..e20ded68ceb96 100644 --- a/src/test/ui/consts/const-unsized.rs +++ b/src/test/ui/consts/const-unsized.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt::Debug; const CONST_0: Debug+Sync = *(&0 as &(Debug+Sync)); diff --git a/src/test/ui/consts/const-unsized.stderr b/src/test/ui/consts/const-unsized.stderr index 83d23bcba0493..67cb8b897a70d 100644 --- a/src/test/ui/consts/const-unsized.stderr +++ b/src/test/ui/consts/const-unsized.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `(dyn std::fmt::Debug + std::marker::Sync + 'static)` cannot be known at compilation time - --> $DIR/const-unsized.rs:13:29 + --> $DIR/const-unsized.rs:3:29 | LL | const CONST_0: Debug+Sync = *(&0 as &(Debug+Sync)); | ^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time @@ -9,7 +9,7 @@ LL | const CONST_0: Debug+Sync = *(&0 as &(Debug+Sync)); = note: constant expressions must have a statically known size error[E0277]: the size for values of type `str` cannot be known at compilation time - --> $DIR/const-unsized.rs:16:24 + --> $DIR/const-unsized.rs:6:24 | LL | const CONST_FOO: str = *"foo"; | ^^^^^^ doesn't have a size known at compile-time @@ -19,7 +19,7 @@ LL | const CONST_FOO: str = *"foo"; = note: constant expressions must have a statically known size error[E0277]: the size for values of type `(dyn std::fmt::Debug + std::marker::Sync + 'static)` cannot be known at compilation time - --> $DIR/const-unsized.rs:19:31 + --> $DIR/const-unsized.rs:9:31 | LL | static STATIC_1: Debug+Sync = *(&1 as &(Debug+Sync)); | ^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time @@ -29,7 +29,7 @@ LL | static STATIC_1: Debug+Sync = *(&1 as &(Debug+Sync)); = note: constant expressions must have a statically known size error[E0277]: the size for values of type `str` cannot be known at compilation time - --> $DIR/const-unsized.rs:22:26 + --> $DIR/const-unsized.rs:12:26 | LL | static STATIC_BAR: str = *"bar"; | ^^^^^^ doesn't have a size known at compile-time diff --git a/src/test/ui/conversion-methods.rs b/src/test/ui/conversion-methods.rs index 8a53bc3ca9385..46c2e511f3381 100644 --- a/src/test/ui/conversion-methods.rs +++ b/src/test/ui/conversion-methods.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::path::{Path, PathBuf}; diff --git a/src/test/ui/conversion-methods.stderr b/src/test/ui/conversion-methods.stderr index 970ccad231696..78099ea9e7cca 100644 --- a/src/test/ui/conversion-methods.stderr +++ b/src/test/ui/conversion-methods.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/conversion-methods.rs:15:41 + --> $DIR/conversion-methods.rs:5:41 | LL | let _tis_an_instants_play: String = "'Tis a fond Ambush—"; //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^^^^^ @@ -11,7 +11,7 @@ LL | let _tis_an_instants_play: String = "'Tis a fond Ambush—"; //~ ERROR found type `&'static str` error[E0308]: mismatched types - --> $DIR/conversion-methods.rs:16:40 + --> $DIR/conversion-methods.rs:6:40 | LL | let _just_to_make_bliss: PathBuf = Path::new("/ern/her/own/surprise"); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -23,7 +23,7 @@ LL | let _just_to_make_bliss: PathBuf = Path::new("/ern/her/own/surprise"); found type `&std::path::Path` error[E0308]: mismatched types - --> $DIR/conversion-methods.rs:19:40 + --> $DIR/conversion-methods.rs:9:40 | LL | let _but_should_the_play: String = 2; // Perhaps surprisingly, we suggest .to_string() here | ^ @@ -35,7 +35,7 @@ LL | let _but_should_the_play: String = 2; // Perhaps surprisingly, we sugge found type `{integer}` error[E0308]: mismatched types - --> $DIR/conversion-methods.rs:22:47 + --> $DIR/conversion-methods.rs:12:47 | LL | let _prove_piercing_earnest: Vec = &[1, 2, 3]; //~ ERROR mismatched types | ^^^^^^^^^^ diff --git a/src/test/ui/copy-a-resource.rs b/src/test/ui/copy-a-resource.rs index 70633c92e6433..8a86d26a1e379 100644 --- a/src/test/ui/copy-a-resource.rs +++ b/src/test/ui/copy-a-resource.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug)] struct foo { i: isize, diff --git a/src/test/ui/copy-a-resource.stderr b/src/test/ui/copy-a-resource.stderr index 6d8d4884d73fa..3bd2ae2e994b2 100644 --- a/src/test/ui/copy-a-resource.stderr +++ b/src/test/ui/copy-a-resource.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `clone` found for type `foo` in the current scope - --> $DIR/copy-a-resource.rs:28:16 + --> $DIR/copy-a-resource.rs:18:16 | LL | struct foo { | ---------- method `clone` not found for this diff --git a/src/test/ui/crate-name-mismatch.rs b/src/test/ui/crate-name-mismatch.rs index 589c0beb76059..49a257f7b87d7 100644 --- a/src/test/ui/crate-name-mismatch.rs +++ b/src/test/ui/crate-name-mismatch.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --crate-name foo #![crate_name = "bar"] diff --git a/src/test/ui/crate-name-mismatch.stderr b/src/test/ui/crate-name-mismatch.stderr index 26ef91ba8e7cf..4784db86deaad 100644 --- a/src/test/ui/crate-name-mismatch.stderr +++ b/src/test/ui/crate-name-mismatch.stderr @@ -1,5 +1,5 @@ error: --crate-name and #[crate_name] are required to match, but `foo` != `bar` - --> $DIR/crate-name-mismatch.rs:13:1 + --> $DIR/crate-name-mismatch.rs:3:1 | LL | #![crate_name = "bar"] | ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/cross/cross-borrow-trait.rs b/src/test/ui/cross/cross-borrow-trait.rs index 7c76cf475d29a..d8d7537f24a61 100644 --- a/src/test/ui/cross/cross-borrow-trait.rs +++ b/src/test/ui/cross/cross-borrow-trait.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that cross-borrowing (implicitly converting from `Box` to `&T`) is // forbidden when `T` is a trait. diff --git a/src/test/ui/cross/cross-borrow-trait.stderr b/src/test/ui/cross/cross-borrow-trait.stderr index d25316d542aea..949b63ffbde6f 100644 --- a/src/test/ui/cross/cross-borrow-trait.stderr +++ b/src/test/ui/cross/cross-borrow-trait.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/cross-borrow-trait.rs:20:22 + --> $DIR/cross-borrow-trait.rs:10:22 | LL | let _y: &Trait = x; //~ ERROR E0308 | ^ diff --git a/src/test/ui/cross/cross-crate-macro-backtrace/auxiliary/extern_macro_crate.rs b/src/test/ui/cross/cross-crate-macro-backtrace/auxiliary/extern_macro_crate.rs index 598e9f0f53aee..7c9ecb5d6214e 100644 --- a/src/test/ui/cross/cross-crate-macro-backtrace/auxiliary/extern_macro_crate.rs +++ b/src/test/ui/cross/cross-crate-macro-backtrace/auxiliary/extern_macro_crate.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "dylib"] pub fn print(_args: std::fmt::Arguments) {} diff --git a/src/test/ui/cross/cross-crate-macro-backtrace/main.rs b/src/test/ui/cross/cross-crate-macro-backtrace/main.rs index 9a6fa3e69206f..f7d4330ab19a1 100644 --- a/src/test/ui/cross/cross-crate-macro-backtrace/main.rs +++ b/src/test/ui/cross/cross-crate-macro-backtrace/main.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:extern_macro_crate.rs #[macro_use(myprintln, myprint)] extern crate extern_macro_crate; diff --git a/src/test/ui/cross/cross-crate-macro-backtrace/main.stderr b/src/test/ui/cross/cross-crate-macro-backtrace/main.stderr index bffd76ca587a0..b6ebe0ff1fc04 100644 --- a/src/test/ui/cross/cross-crate-macro-backtrace/main.stderr +++ b/src/test/ui/cross/cross-crate-macro-backtrace/main.stderr @@ -1,5 +1,5 @@ error: 1 positional argument in format string, but no arguments were given - --> $DIR/main.rs:16:5 + --> $DIR/main.rs:6:5 | LL | myprintln!("{}"); | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/cross/cross-file-errors/main.rs b/src/test/ui/cross/cross-file-errors/main.rs index 659075acd8802..74e9461803c52 100644 --- a/src/test/ui/cross/cross-file-errors/main.rs +++ b/src/test/ui/cross/cross-file-errors/main.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] mod underscore; diff --git a/src/test/ui/cross/cross-file-errors/main.stderr b/src/test/ui/cross/cross-file-errors/main.stderr index a64595fbb4020..7fd91eb1d6637 100644 --- a/src/test/ui/cross/cross-file-errors/main.stderr +++ b/src/test/ui/cross/cross-file-errors/main.stderr @@ -1,10 +1,10 @@ error: expected expression, found reserved identifier `_` - --> $DIR/underscore.rs:18:9 + --> $DIR/underscore.rs:8:9 | LL | _ | ^ expected expression | - ::: $DIR/main.rs:15:5 + ::: $DIR/main.rs:5:5 | LL | underscore!(); | -------------- in this macro invocation diff --git a/src/test/ui/cross/cross-file-errors/underscore.rs b/src/test/ui/cross/cross-file-errors/underscore.rs index 312b3b8f4ddd5..76e72a93fccec 100644 --- a/src/test/ui/cross/cross-file-errors/underscore.rs +++ b/src/test/ui/cross/cross-file-errors/underscore.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // We want this file only so we can test cross-file error // messages, but we don't want it in an external crate. // ignore-test diff --git a/src/test/ui/cross/cross-fn-cache-hole.rs b/src/test/ui/cross/cross-fn-cache-hole.rs index d437fc019fda0..249c6474c9420 100644 --- a/src/test/ui/cross/cross-fn-cache-hole.rs +++ b/src/test/ui/cross/cross-fn-cache-hole.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that when there are vacuous predicates in the environment // (which make a fn uncallable) we don't erroneously cache those and // then consider them satisfied elsewhere. The current technique for diff --git a/src/test/ui/cross/cross-fn-cache-hole.stderr b/src/test/ui/cross/cross-fn-cache-hole.stderr index bfcb83204bba1..2cd57e363d0de 100644 --- a/src/test/ui/cross/cross-fn-cache-hole.stderr +++ b/src/test/ui/cross/cross-fn-cache-hole.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `i32: Bar` is not satisfied - --> $DIR/cross-fn-cache-hole.rs:25:1 + --> $DIR/cross-fn-cache-hole.rs:15:1 | LL | / fn vacuous() //~ ERROR the trait bound `i32: Bar` is not satisfied LL | | where i32: Foo diff --git a/src/test/ui/custom-attribute-multisegment.rs b/src/test/ui/custom-attribute-multisegment.rs index a8d82a3594649..cf04adec2a399 100644 --- a/src/test/ui/custom-attribute-multisegment.rs +++ b/src/test/ui/custom-attribute-multisegment.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Unresolved multi-segment attributes are not treated as custom. #![feature(custom_attribute)] diff --git a/src/test/ui/custom-attribute-multisegment.stderr b/src/test/ui/custom-attribute-multisegment.stderr index ff72d1c36d852..cfd9d936ccbe2 100644 --- a/src/test/ui/custom-attribute-multisegment.stderr +++ b/src/test/ui/custom-attribute-multisegment.stderr @@ -1,5 +1,5 @@ error[E0433]: failed to resolve. Could not find `nonexistent` in `existent` - --> $DIR/custom-attribute-multisegment.rs:17:13 + --> $DIR/custom-attribute-multisegment.rs:7:13 | LL | #[existent::nonexistent] //~ ERROR failed to resolve. Could not find `nonexistent` in `existent` | ^^^^^^^^^^^ Could not find `nonexistent` in `existent` diff --git a/src/test/ui/custom_attribute.rs b/src/test/ui/custom_attribute.rs index eff734230ee23..9cb43ab07ad6d 100644 --- a/src/test/ui/custom_attribute.rs +++ b/src/test/ui/custom_attribute.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(stmt_expr_attributes)] #[foo] //~ ERROR The attribute `foo` diff --git a/src/test/ui/custom_attribute.stderr b/src/test/ui/custom_attribute.stderr index 6ecad7d79b867..1100d82f8406d 100644 --- a/src/test/ui/custom_attribute.stderr +++ b/src/test/ui/custom_attribute.stderr @@ -1,5 +1,5 @@ error[E0658]: The attribute `foo` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/custom_attribute.rs:13:3 + --> $DIR/custom_attribute.rs:3:3 | LL | #[foo] //~ ERROR The attribute `foo` | ^^^ @@ -7,7 +7,7 @@ LL | #[foo] //~ ERROR The attribute `foo` = help: add #![feature(custom_attribute)] to the crate attributes to enable error[E0658]: The attribute `foo` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/custom_attribute.rs:15:7 + --> $DIR/custom_attribute.rs:5:7 | LL | #[foo] //~ ERROR The attribute `foo` | ^^^ @@ -15,7 +15,7 @@ LL | #[foo] //~ ERROR The attribute `foo` = help: add #![feature(custom_attribute)] to the crate attributes to enable error[E0658]: The attribute `foo` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/custom_attribute.rs:17:7 + --> $DIR/custom_attribute.rs:7:7 | LL | #[foo] //~ ERROR The attribute `foo` | ^^^ diff --git a/src/test/ui/cycle-projection-based-on-where-clause.rs b/src/test/ui/cycle-projection-based-on-where-clause.rs index 56ad1771e00bd..336b67852cd01 100644 --- a/src/test/ui/cycle-projection-based-on-where-clause.rs +++ b/src/test/ui/cycle-projection-based-on-where-clause.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Example cycle where a bound on `T` uses a shorthand for `T`. This // creates a cycle because we have to know the bounds on `T` to figure // out what trait defines `Item`, but we can't know the bounds on `T` diff --git a/src/test/ui/cycle-projection-based-on-where-clause.stderr b/src/test/ui/cycle-projection-based-on-where-clause.stderr index c7147bcddc46d..b11a8bda9b4f4 100644 --- a/src/test/ui/cycle-projection-based-on-where-clause.stderr +++ b/src/test/ui/cycle-projection-based-on-where-clause.stderr @@ -1,18 +1,18 @@ error[E0391]: cycle detected when computing the bounds for type parameter `T` - --> $DIR/cycle-projection-based-on-where-clause.rs:27:19 + --> $DIR/cycle-projection-based-on-where-clause.rs:17:19 | LL | T : Add | ^^^^^^^ | = note: ...which again requires computing the bounds for type parameter `T`, completing the cycle note: cycle used when processing `A` - --> $DIR/cycle-projection-based-on-where-clause.rs:27:19 + --> $DIR/cycle-projection-based-on-where-clause.rs:17:19 | LL | T : Add | ^^^^^^^ error[E0220]: associated type `Item` not found for `T` - --> $DIR/cycle-projection-based-on-where-clause.rs:27:19 + --> $DIR/cycle-projection-based-on-where-clause.rs:17:19 | LL | T : Add | ^^^^^^^ associated type `Item` not found diff --git a/src/test/ui/cycle-trait/cycle-trait-default-type-trait.rs b/src/test/ui/cycle-trait/cycle-trait-default-type-trait.rs index b8bae2154566e..d658753eb242b 100644 --- a/src/test/ui/cycle-trait/cycle-trait-default-type-trait.rs +++ b/src/test/ui/cycle-trait/cycle-trait-default-type-trait.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test a cycle where a type parameter on a trait has a default that // again references the trait. diff --git a/src/test/ui/cycle-trait/cycle-trait-default-type-trait.stderr b/src/test/ui/cycle-trait/cycle-trait-default-type-trait.stderr index 767a99a326517..1a75eb5e31450 100644 --- a/src/test/ui/cycle-trait/cycle-trait-default-type-trait.stderr +++ b/src/test/ui/cycle-trait/cycle-trait-default-type-trait.stderr @@ -1,5 +1,5 @@ error[E0391]: cycle detected when processing `Foo::X` - --> $DIR/cycle-trait-default-type-trait.rs:14:19 + --> $DIR/cycle-trait-default-type-trait.rs:4:19 | LL | trait Foo> { | ^^^ diff --git a/src/test/ui/cycle-trait/cycle-trait-supertrait-direct.rs b/src/test/ui/cycle-trait/cycle-trait-supertrait-direct.rs index b802463fcb036..e6ab2c790d656 100644 --- a/src/test/ui/cycle-trait/cycle-trait-supertrait-direct.rs +++ b/src/test/ui/cycle-trait/cycle-trait-supertrait-direct.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test a supertrait cycle where a trait extends itself. trait Chromosome: Chromosome { diff --git a/src/test/ui/cycle-trait/cycle-trait-supertrait-direct.stderr b/src/test/ui/cycle-trait/cycle-trait-supertrait-direct.stderr index 724d4b1ec67a8..5b3d7f114eec9 100644 --- a/src/test/ui/cycle-trait/cycle-trait-supertrait-direct.stderr +++ b/src/test/ui/cycle-trait/cycle-trait-supertrait-direct.stderr @@ -1,5 +1,5 @@ error[E0391]: cycle detected when computing the supertraits of `Chromosome` - --> $DIR/cycle-trait-supertrait-direct.rs:13:1 + --> $DIR/cycle-trait-supertrait-direct.rs:3:1 | LL | trait Chromosome: Chromosome { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/cycle-trait/cycle-trait-supertrait-indirect.rs b/src/test/ui/cycle-trait/cycle-trait-supertrait-indirect.rs index f240a34817db5..9a72b65da883e 100644 --- a/src/test/ui/cycle-trait/cycle-trait-supertrait-indirect.rs +++ b/src/test/ui/cycle-trait/cycle-trait-supertrait-indirect.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test a supertrait cycle where the first trait we find (`A`) is not // a direct participant in the cycle. diff --git a/src/test/ui/cycle-trait/cycle-trait-supertrait-indirect.stderr b/src/test/ui/cycle-trait/cycle-trait-supertrait-indirect.stderr index 85681b478e21d..e96c735d2763e 100644 --- a/src/test/ui/cycle-trait/cycle-trait-supertrait-indirect.stderr +++ b/src/test/ui/cycle-trait/cycle-trait-supertrait-indirect.stderr @@ -1,17 +1,17 @@ error[E0391]: cycle detected when computing the supertraits of `B` - --> $DIR/cycle-trait-supertrait-indirect.rs:17:1 + --> $DIR/cycle-trait-supertrait-indirect.rs:7:1 | LL | trait B: C { | ^^^^^^^^^^ | note: ...which requires computing the supertraits of `C`... - --> $DIR/cycle-trait-supertrait-indirect.rs:21:1 + --> $DIR/cycle-trait-supertrait-indirect.rs:11:1 | LL | trait C: B { } | ^^^^^^^^^^ = note: ...which again requires computing the supertraits of `B`, completing the cycle note: cycle used when computing the supertraits of `A` - --> $DIR/cycle-trait-supertrait-indirect.rs:14:1 + --> $DIR/cycle-trait-supertrait-indirect.rs:4:1 | LL | trait A: B { | ^^^^^^^^^^ diff --git a/src/test/ui/dead-code-closure-bang.rs b/src/test/ui/dead-code-closure-bang.rs index d808d7972721f..8e8636b1180ef 100644 --- a/src/test/ui/dead-code-closure-bang.rs +++ b/src/test/ui/dead-code-closure-bang.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-test FIXME(#20574) #![deny(unreachable_code)] diff --git a/src/test/ui/dead-code-ret.rs b/src/test/ui/dead-code-ret.rs index 250d22db374a6..fad35794fae78 100644 --- a/src/test/ui/dead-code-ret.rs +++ b/src/test/ui/dead-code-ret.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: unreachable statement #![deny(unreachable_code)] diff --git a/src/test/ui/dead-code-ret.stderr b/src/test/ui/dead-code-ret.stderr index 9f94016696627..092a176f443b2 100644 --- a/src/test/ui/dead-code-ret.stderr +++ b/src/test/ui/dead-code-ret.stderr @@ -1,11 +1,11 @@ error: unreachable statement - --> $DIR/dead-code-ret.rs:17:5 + --> $DIR/dead-code-ret.rs:7:5 | LL | println!("Paul is dead"); | ^^^^^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/dead-code-ret.rs:13:9 + --> $DIR/dead-code-ret.rs:3:9 | LL | #![deny(unreachable_code)] | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/defaulted-never-note.rs b/src/test/ui/defaulted-never-note.rs index b53ef0f5ba823..acda4b42f15ee 100644 --- a/src/test/ui/defaulted-never-note.rs +++ b/src/test/ui/defaulted-never-note.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // We need to opt into the `!` feature in order to trigger the // requirement that this is testing. #![feature(never_type)] diff --git a/src/test/ui/defaulted-never-note.stderr b/src/test/ui/defaulted-never-note.stderr index 32922354fe67b..45174c322947d 100644 --- a/src/test/ui/defaulted-never-note.stderr +++ b/src/test/ui/defaulted-never-note.stderr @@ -1,12 +1,12 @@ error[E0277]: the trait bound `!: ImplementedForUnitButNotNever` is not satisfied - --> $DIR/defaulted-never-note.rs:36:5 + --> $DIR/defaulted-never-note.rs:26:5 | LL | foo(_x); | ^^^ the trait `ImplementedForUnitButNotNever` is not implemented for `!` | = note: the trait is implemented for `()`. Possibly this error has been caused by changes to Rust's type-inference algorithm (see: https://github.com/rust-lang/rust/issues/48950 for more info). Consider whether you meant to use the type `()` here instead. note: required by `foo` - --> $DIR/defaulted-never-note.rs:31:1 + --> $DIR/defaulted-never-note.rs:21:1 | LL | fn foo(_t: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/dep-graph/dep-graph-assoc-type-codegen.rs b/src/test/ui/dep-graph/dep-graph-assoc-type-codegen.rs index c20cfbc7e232c..f3df57e6ff911 100644 --- a/src/test/ui/dep-graph/dep-graph-assoc-type-codegen.rs +++ b/src/test/ui/dep-graph/dep-graph-assoc-type-codegen.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that when a trait impl changes, fns whose body uses that trait // must also be recompiled. diff --git a/src/test/ui/dep-graph/dep-graph-assoc-type-codegen.stderr b/src/test/ui/dep-graph/dep-graph-assoc-type-codegen.stderr index e00b3ccf2818c..a25a1786e813b 100644 --- a/src/test/ui/dep-graph/dep-graph-assoc-type-codegen.stderr +++ b/src/test/ui/dep-graph/dep-graph-assoc-type-codegen.stderr @@ -1,5 +1,5 @@ error: OK - --> $DIR/dep-graph-assoc-type-codegen.rs:38:5 + --> $DIR/dep-graph-assoc-type-codegen.rs:28:5 | LL | #[rustc_then_this_would_need(TypeckTables)] //~ ERROR OK | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/dep-graph/dep-graph-caller-callee.rs b/src/test/ui/dep-graph/dep-graph-caller-callee.rs index 222c197200556..f8276ea3ad638 100644 --- a/src/test/ui/dep-graph/dep-graph-caller-callee.rs +++ b/src/test/ui/dep-graph/dep-graph-caller-callee.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that immediate callers have to change when callee changes, but // not callers' callers. diff --git a/src/test/ui/dep-graph/dep-graph-caller-callee.stderr b/src/test/ui/dep-graph/dep-graph-caller-callee.stderr index 8943b051c1277..d7bf63822579f 100644 --- a/src/test/ui/dep-graph/dep-graph-caller-callee.stderr +++ b/src/test/ui/dep-graph/dep-graph-caller-callee.stderr @@ -1,11 +1,11 @@ error: OK - --> $DIR/dep-graph-caller-callee.rs:30:5 + --> $DIR/dep-graph-caller-callee.rs:20:5 | LL | #[rustc_then_this_would_need(TypeckTables)] //~ ERROR OK | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: no path from `x::x` to `TypeckTables` - --> $DIR/dep-graph-caller-callee.rs:41:5 + --> $DIR/dep-graph-caller-callee.rs:31:5 | LL | #[rustc_then_this_would_need(TypeckTables)] //~ ERROR no path | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/dep-graph/dep-graph-struct-signature.rs b/src/test/ui/dep-graph/dep-graph-struct-signature.rs index 647605ae4383e..015864aafe451 100644 --- a/src/test/ui/dep-graph/dep-graph-struct-signature.rs +++ b/src/test/ui/dep-graph/dep-graph-struct-signature.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test cases where a changing struct appears in the signature of fns // and methods. diff --git a/src/test/ui/dep-graph/dep-graph-struct-signature.stderr b/src/test/ui/dep-graph/dep-graph-struct-signature.stderr index cbb695d0cf2b9..f4e2e3d6d7040 100644 --- a/src/test/ui/dep-graph/dep-graph-struct-signature.stderr +++ b/src/test/ui/dep-graph/dep-graph-struct-signature.stderr @@ -1,137 +1,137 @@ error: no path from `WillChange` to `TypeOfItem` - --> $DIR/dep-graph-struct-signature.rs:37:5 + --> $DIR/dep-graph-struct-signature.rs:27:5 | LL | #[rustc_then_this_would_need(TypeOfItem)] //~ ERROR no path | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: no path from `WillChange` to `AssociatedItems` - --> $DIR/dep-graph-struct-signature.rs:38:5 + --> $DIR/dep-graph-struct-signature.rs:28:5 | LL | #[rustc_then_this_would_need(AssociatedItems)] //~ ERROR no path | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: no path from `WillChange` to `TraitDefOfItem` - --> $DIR/dep-graph-struct-signature.rs:39:5 + --> $DIR/dep-graph-struct-signature.rs:29:5 | LL | #[rustc_then_this_would_need(TraitDefOfItem)] //~ ERROR no path | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: OK - --> $DIR/dep-graph-struct-signature.rs:45:5 + --> $DIR/dep-graph-struct-signature.rs:35:5 | LL | #[rustc_then_this_would_need(FnSignature)] //~ ERROR OK | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: OK - --> $DIR/dep-graph-struct-signature.rs:46:5 + --> $DIR/dep-graph-struct-signature.rs:36:5 | LL | #[rustc_then_this_would_need(TypeckTables)] //~ ERROR OK | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: OK - --> $DIR/dep-graph-struct-signature.rs:49:5 + --> $DIR/dep-graph-struct-signature.rs:39:5 | LL | #[rustc_then_this_would_need(FnSignature)] //~ ERROR OK | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: OK - --> $DIR/dep-graph-struct-signature.rs:50:5 + --> $DIR/dep-graph-struct-signature.rs:40:5 | LL | #[rustc_then_this_would_need(TypeckTables)] //~ ERROR OK | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: OK - --> $DIR/dep-graph-struct-signature.rs:55:5 + --> $DIR/dep-graph-struct-signature.rs:45:5 | LL | #[rustc_then_this_would_need(TypeOfItem)] //~ ERROR OK | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: OK - --> $DIR/dep-graph-struct-signature.rs:62:5 + --> $DIR/dep-graph-struct-signature.rs:52:5 | LL | #[rustc_then_this_would_need(TypeOfItem)] //~ ERROR OK | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: OK - --> $DIR/dep-graph-struct-signature.rs:70:9 + --> $DIR/dep-graph-struct-signature.rs:60:9 | LL | #[rustc_then_this_would_need(TypeOfItem)] //~ ERROR OK | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: OK - --> $DIR/dep-graph-struct-signature.rs:72:9 + --> $DIR/dep-graph-struct-signature.rs:62:9 | LL | #[rustc_then_this_would_need(TypeOfItem)] //~ ERROR OK | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: no path from `WillChange` to `TypeOfItem` - --> $DIR/dep-graph-struct-signature.rs:77:5 + --> $DIR/dep-graph-struct-signature.rs:67:5 | LL | #[rustc_then_this_would_need(TypeOfItem)] //~ ERROR no path | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: no path from `WillChange` to `TypeOfItem` - --> $DIR/dep-graph-struct-signature.rs:84:5 + --> $DIR/dep-graph-struct-signature.rs:74:5 | LL | #[rustc_then_this_would_need(TypeOfItem)] //~ ERROR no path | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: no path from `WillChange` to `FnSignature` - --> $DIR/dep-graph-struct-signature.rs:90:5 + --> $DIR/dep-graph-struct-signature.rs:80:5 | LL | #[rustc_then_this_would_need(FnSignature)] //~ ERROR no path | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: no path from `WillChange` to `TypeckTables` - --> $DIR/dep-graph-struct-signature.rs:91:5 + --> $DIR/dep-graph-struct-signature.rs:81:5 | LL | #[rustc_then_this_would_need(TypeckTables)] //~ ERROR no path | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: no path from `WillChange` to `FnSignature` - --> $DIR/dep-graph-struct-signature.rs:94:5 + --> $DIR/dep-graph-struct-signature.rs:84:5 | LL | #[rustc_then_this_would_need(FnSignature)] //~ ERROR no path from `WillChange` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: no path from `WillChange` to `TypeckTables` - --> $DIR/dep-graph-struct-signature.rs:95:5 + --> $DIR/dep-graph-struct-signature.rs:85:5 | LL | #[rustc_then_this_would_need(TypeckTables)] //~ ERROR no path from `WillChange` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: OK - --> $DIR/dep-graph-struct-signature.rs:41:9 + --> $DIR/dep-graph-struct-signature.rs:31:9 | LL | #[rustc_then_this_would_need(FnSignature)] //~ ERROR OK | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: no path from `WillChange` to `FnSignature` - --> $DIR/dep-graph-struct-signature.rs:86:9 + --> $DIR/dep-graph-struct-signature.rs:76:9 | LL | #[rustc_then_this_would_need(FnSignature)] //~ ERROR no path | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: OK - --> $DIR/dep-graph-struct-signature.rs:57:9 + --> $DIR/dep-graph-struct-signature.rs:47:9 | LL | #[rustc_then_this_would_need(FnSignature)] //~ ERROR OK | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: OK - --> $DIR/dep-graph-struct-signature.rs:58:9 + --> $DIR/dep-graph-struct-signature.rs:48:9 | LL | #[rustc_then_this_would_need(TypeckTables)] //~ ERROR OK | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: OK - --> $DIR/dep-graph-struct-signature.rs:64:9 + --> $DIR/dep-graph-struct-signature.rs:54:9 | LL | #[rustc_then_this_would_need(FnSignature)] //~ ERROR OK | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: OK - --> $DIR/dep-graph-struct-signature.rs:65:9 + --> $DIR/dep-graph-struct-signature.rs:55:9 | LL | #[rustc_then_this_would_need(TypeckTables)] //~ ERROR OK | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/dep-graph/dep-graph-trait-impl-two-traits-same-method.rs b/src/test/ui/dep-graph/dep-graph-trait-impl-two-traits-same-method.rs index 7dd02f57b366e..16e5a705d25e3 100644 --- a/src/test/ui/dep-graph/dep-graph-trait-impl-two-traits-same-method.rs +++ b/src/test/ui/dep-graph/dep-graph-trait-impl-two-traits-same-method.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that adding an impl to a trait `Foo` DOES affect functions // that only use `Bar` if they have methods in common. diff --git a/src/test/ui/dep-graph/dep-graph-trait-impl-two-traits-same-method.stderr b/src/test/ui/dep-graph/dep-graph-trait-impl-two-traits-same-method.stderr index 877a056019f67..2fa1e1edc8722 100644 --- a/src/test/ui/dep-graph/dep-graph-trait-impl-two-traits-same-method.stderr +++ b/src/test/ui/dep-graph/dep-graph-trait-impl-two-traits-same-method.stderr @@ -1,11 +1,11 @@ error: OK - --> $DIR/dep-graph-trait-impl-two-traits-same-method.rs:42:5 + --> $DIR/dep-graph-trait-impl-two-traits-same-method.rs:32:5 | LL | #[rustc_then_this_would_need(TypeckTables)] //~ ERROR OK | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: no path from `x::` to `TypeckTables` - --> $DIR/dep-graph-trait-impl-two-traits-same-method.rs:51:5 + --> $DIR/dep-graph-trait-impl-two-traits-same-method.rs:41:5 | LL | #[rustc_then_this_would_need(TypeckTables)] //~ ERROR no path | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/dep-graph/dep-graph-trait-impl-two-traits.rs b/src/test/ui/dep-graph/dep-graph-trait-impl-two-traits.rs index 6b3525333bcbc..064302c9c805f 100644 --- a/src/test/ui/dep-graph/dep-graph-trait-impl-two-traits.rs +++ b/src/test/ui/dep-graph/dep-graph-trait-impl-two-traits.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that adding an impl to a trait `Foo` does not affect functions // that only use `Bar`, so long as they do not have methods in common. diff --git a/src/test/ui/dep-graph/dep-graph-trait-impl-two-traits.stderr b/src/test/ui/dep-graph/dep-graph-trait-impl-two-traits.stderr index f939fac3146d0..8670e7deb4cda 100644 --- a/src/test/ui/dep-graph/dep-graph-trait-impl-two-traits.stderr +++ b/src/test/ui/dep-graph/dep-graph-trait-impl-two-traits.stderr @@ -1,11 +1,11 @@ error: no path from `x::` to `TypeckTables` - --> $DIR/dep-graph-trait-impl-two-traits.rs:41:5 + --> $DIR/dep-graph-trait-impl-two-traits.rs:31:5 | LL | #[rustc_then_this_would_need(TypeckTables)] //~ ERROR no path | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: no path from `x::` to `TypeckTables` - --> $DIR/dep-graph-trait-impl-two-traits.rs:50:5 + --> $DIR/dep-graph-trait-impl-two-traits.rs:40:5 | LL | #[rustc_then_this_would_need(TypeckTables)] //~ ERROR no path | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/dep-graph/dep-graph-trait-impl.rs b/src/test/ui/dep-graph/dep-graph-trait-impl.rs index 85b3e69065d9b..7d088082c7a4c 100644 --- a/src/test/ui/dep-graph/dep-graph-trait-impl.rs +++ b/src/test/ui/dep-graph/dep-graph-trait-impl.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that when a trait impl changes, fns whose body uses that trait // must also be recompiled. diff --git a/src/test/ui/dep-graph/dep-graph-trait-impl.stderr b/src/test/ui/dep-graph/dep-graph-trait-impl.stderr index c569e8584e71e..fe97846d6cc26 100644 --- a/src/test/ui/dep-graph/dep-graph-trait-impl.stderr +++ b/src/test/ui/dep-graph/dep-graph-trait-impl.stderr @@ -1,29 +1,29 @@ error: OK - --> $DIR/dep-graph-trait-impl.rs:37:5 + --> $DIR/dep-graph-trait-impl.rs:27:5 | LL | #[rustc_then_this_would_need(TypeckTables)] //~ ERROR OK | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: OK - --> $DIR/dep-graph-trait-impl.rs:42:5 + --> $DIR/dep-graph-trait-impl.rs:32:5 | LL | #[rustc_then_this_would_need(TypeckTables)] //~ ERROR OK | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: OK - --> $DIR/dep-graph-trait-impl.rs:47:5 + --> $DIR/dep-graph-trait-impl.rs:37:5 | LL | #[rustc_then_this_would_need(TypeckTables)] //~ ERROR OK | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: OK - --> $DIR/dep-graph-trait-impl.rs:52:5 + --> $DIR/dep-graph-trait-impl.rs:42:5 | LL | #[rustc_then_this_would_need(TypeckTables)] //~ ERROR OK | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: no path from `x::` to `TypeckTables` - --> $DIR/dep-graph-trait-impl.rs:65:5 + --> $DIR/dep-graph-trait-impl.rs:55:5 | LL | #[rustc_then_this_would_need(TypeckTables)] //~ ERROR no path | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/dep-graph/dep-graph-type-alias.rs b/src/test/ui/dep-graph/dep-graph-type-alias.rs index dca1fa4d98f95..0f703aeb0f7a3 100644 --- a/src/test/ui/dep-graph/dep-graph-type-alias.rs +++ b/src/test/ui/dep-graph/dep-graph-type-alias.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // Test that changing what a `type` points to does not go unnoticed. // compile-flags: -Z query-dep-graph diff --git a/src/test/ui/dep-graph/dep-graph-type-alias.stderr b/src/test/ui/dep-graph/dep-graph-type-alias.stderr index b018c250667f5..72def33cbcf99 100644 --- a/src/test/ui/dep-graph/dep-graph-type-alias.stderr +++ b/src/test/ui/dep-graph/dep-graph-type-alias.stderr @@ -1,71 +1,71 @@ error: no path from `TypeAlias` to `TypeOfItem` - --> $DIR/dep-graph-type-alias.rs:28:1 + --> $DIR/dep-graph-type-alias.rs:17:1 | LL | #[rustc_then_this_would_need(TypeOfItem)] //~ ERROR no path | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: OK - --> $DIR/dep-graph-type-alias.rs:30:5 + --> $DIR/dep-graph-type-alias.rs:19:5 | LL | #[rustc_then_this_would_need(TypeOfItem)] //~ ERROR OK | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: no path from `TypeAlias` to `TypeOfItem` - --> $DIR/dep-graph-type-alias.rs:35:1 + --> $DIR/dep-graph-type-alias.rs:24:1 | LL | #[rustc_then_this_would_need(TypeOfItem)] //~ ERROR no path | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: OK - --> $DIR/dep-graph-type-alias.rs:38:9 + --> $DIR/dep-graph-type-alias.rs:27:9 | LL | #[rustc_then_this_would_need(TypeOfItem)] //~ ERROR OK | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: no path from `TypeAlias` to `TypeOfItem` - --> $DIR/dep-graph-type-alias.rs:44:1 + --> $DIR/dep-graph-type-alias.rs:33:1 | LL | #[rustc_then_this_would_need(TypeOfItem)] //~ ERROR no path | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: no path from `TypeAlias` to `TypeOfItem` - --> $DIR/dep-graph-type-alias.rs:52:1 + --> $DIR/dep-graph-type-alias.rs:41:1 | LL | #[rustc_then_this_would_need(TypeOfItem)] //~ ERROR no path | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: OK - --> $DIR/dep-graph-type-alias.rs:59:1 + --> $DIR/dep-graph-type-alias.rs:48:1 | LL | #[rustc_then_this_would_need(TypeOfItem)] //~ ERROR OK | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: OK - --> $DIR/dep-graph-type-alias.rs:62:1 + --> $DIR/dep-graph-type-alias.rs:51:1 | LL | #[rustc_then_this_would_need(FnSignature)] //~ ERROR OK | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: OK - --> $DIR/dep-graph-type-alias.rs:63:1 + --> $DIR/dep-graph-type-alias.rs:52:1 | LL | #[rustc_then_this_would_need(TypeckTables)] //~ ERROR OK | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: OK - --> $DIR/dep-graph-type-alias.rs:46:5 + --> $DIR/dep-graph-type-alias.rs:35:5 | LL | #[rustc_then_this_would_need(FnSignature)] //~ ERROR OK | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: OK - --> $DIR/dep-graph-type-alias.rs:54:5 + --> $DIR/dep-graph-type-alias.rs:43:5 | LL | #[rustc_then_this_would_need(FnSignature)] //~ ERROR OK | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: OK - --> $DIR/dep-graph-type-alias.rs:55:5 + --> $DIR/dep-graph-type-alias.rs:44:5 | LL | #[rustc_then_this_would_need(TypeckTables)] //~ ERROR OK | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/dep-graph/dep-graph-variance-alias.rs b/src/test/ui/dep-graph/dep-graph-variance-alias.rs index 18cfd00180428..0a70bfd08bf27 100644 --- a/src/test/ui/dep-graph/dep-graph-variance-alias.rs +++ b/src/test/ui/dep-graph/dep-graph-variance-alias.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that changing what a `type` points to does not go unnoticed // by the variance analysis. diff --git a/src/test/ui/dep-graph/dep-graph-variance-alias.stderr b/src/test/ui/dep-graph/dep-graph-variance-alias.stderr index a3b1201390631..f7c7f01020d26 100644 --- a/src/test/ui/dep-graph/dep-graph-variance-alias.stderr +++ b/src/test/ui/dep-graph/dep-graph-variance-alias.stderr @@ -1,5 +1,5 @@ error: OK - --> $DIR/dep-graph-variance-alias.rs:29:1 + --> $DIR/dep-graph-variance-alias.rs:19:1 | LL | #[rustc_then_this_would_need(ItemVariances)] //~ ERROR OK | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/deprecation/auxiliary/deprecation-lint.rs b/src/test/ui/deprecation/auxiliary/deprecation-lint.rs index 175102898759b..948bf1cb71b27 100644 --- a/src/test/ui/deprecation/auxiliary/deprecation-lint.rs +++ b/src/test/ui/deprecation/auxiliary/deprecation-lint.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(deprecated)] #[deprecated(since = "1.0.0", note = "text")] diff --git a/src/test/ui/deprecation/deprecated-macro_escape-inner.rs b/src/test/ui/deprecation/deprecated-macro_escape-inner.rs index dce80698dea39..957e839013ec7 100644 --- a/src/test/ui/deprecation/deprecated-macro_escape-inner.rs +++ b/src/test/ui/deprecation/deprecated-macro_escape-inner.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass mod foo { diff --git a/src/test/ui/deprecation/deprecated-macro_escape-inner.stderr b/src/test/ui/deprecation/deprecated-macro_escape-inner.stderr index 56c083837979d..94229386e5f59 100644 --- a/src/test/ui/deprecation/deprecated-macro_escape-inner.stderr +++ b/src/test/ui/deprecation/deprecated-macro_escape-inner.stderr @@ -1,5 +1,5 @@ warning: macro_escape is a deprecated synonym for macro_use - --> $DIR/deprecated-macro_escape-inner.rs:14:5 + --> $DIR/deprecated-macro_escape-inner.rs:4:5 | LL | #![macro_escape] //~ WARNING macro_escape is a deprecated synonym for macro_use | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/deprecation/deprecated-macro_escape.rs b/src/test/ui/deprecation/deprecated-macro_escape.rs index a234572343c15..1b82a99f42eab 100644 --- a/src/test/ui/deprecation/deprecated-macro_escape.rs +++ b/src/test/ui/deprecation/deprecated-macro_escape.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass #[macro_escape] //~ WARNING macro_escape is a deprecated synonym for macro_use diff --git a/src/test/ui/deprecation/deprecated-macro_escape.stderr b/src/test/ui/deprecation/deprecated-macro_escape.stderr index 09ff32857403a..f0edd838874e9 100644 --- a/src/test/ui/deprecation/deprecated-macro_escape.stderr +++ b/src/test/ui/deprecation/deprecated-macro_escape.stderr @@ -1,5 +1,5 @@ warning: macro_escape is a deprecated synonym for macro_use - --> $DIR/deprecated-macro_escape.rs:13:1 + --> $DIR/deprecated-macro_escape.rs:3:1 | LL | #[macro_escape] //~ WARNING macro_escape is a deprecated synonym for macro_use | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/deprecation/deprecated_no_stack_check.rs b/src/test/ui/deprecation/deprecated_no_stack_check.rs index 38aaefd52b342..0c4e2f41c7b83 100644 --- a/src/test/ui/deprecation/deprecated_no_stack_check.rs +++ b/src/test/ui/deprecation/deprecated_no_stack_check.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(warnings)] #![feature(no_stack_check)] //~^ ERROR: 12:12: 12:26: feature has been removed [E0557] diff --git a/src/test/ui/deprecation/deprecated_no_stack_check.stderr b/src/test/ui/deprecation/deprecated_no_stack_check.stderr index 2f847a253e429..c936a550b3aca 100644 --- a/src/test/ui/deprecation/deprecated_no_stack_check.stderr +++ b/src/test/ui/deprecation/deprecated_no_stack_check.stderr @@ -1,5 +1,5 @@ error[E0557]: feature has been removed - --> $DIR/deprecated_no_stack_check.rs:12:12 + --> $DIR/deprecated_no_stack_check.rs:2:12 | LL | #![feature(no_stack_check)] | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/deprecation/deprecation-in-staged-api.rs b/src/test/ui/deprecation/deprecation-in-staged-api.rs index 5c6facbf01436..bcc17c789f551 100644 --- a/src/test/ui/deprecation/deprecation-in-staged-api.rs +++ b/src/test/ui/deprecation/deprecation-in-staged-api.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // #[deprecated] can't be used in staged api #![feature(staged_api)] diff --git a/src/test/ui/deprecation/deprecation-in-staged-api.stderr b/src/test/ui/deprecation/deprecation-in-staged-api.stderr index 9ad5658501575..3e64d756e7e69 100644 --- a/src/test/ui/deprecation/deprecation-in-staged-api.stderr +++ b/src/test/ui/deprecation/deprecation-in-staged-api.stderr @@ -1,5 +1,5 @@ error: `#[deprecated]` cannot be used in staged api, use `#[rustc_deprecated]` instead - --> $DIR/deprecation-in-staged-api.rs:18:1 + --> $DIR/deprecation-in-staged-api.rs:8:1 | LL | fn main() { } //~ERROR `#[deprecated]` cannot be used in staged api | ^^^^^^^^^^^^^ diff --git a/src/test/ui/deprecation/deprecation-lint-2.rs b/src/test/ui/deprecation/deprecation-lint-2.rs index 2817e06652afb..2aa0d0c64d212 100644 --- a/src/test/ui/deprecation/deprecation-lint-2.rs +++ b/src/test/ui/deprecation/deprecation-lint-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:deprecation-lint.rs // error-pattern: use of deprecated item diff --git a/src/test/ui/deprecation/deprecation-lint-2.stderr b/src/test/ui/deprecation/deprecation-lint-2.stderr index fedc6b22f32f0..f90ca7986015e 100644 --- a/src/test/ui/deprecation/deprecation-lint-2.stderr +++ b/src/test/ui/deprecation/deprecation-lint-2.stderr @@ -1,11 +1,11 @@ error: use of deprecated item 'deprecation_lint::deprecated': text - --> $DIR/deprecation-lint-2.rs:22:5 + --> $DIR/deprecation-lint-2.rs:12:5 | LL | macro_test!(); | ^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/deprecation-lint-2.rs:14:9 + --> $DIR/deprecation-lint-2.rs:4:9 | LL | #![deny(deprecated)] | ^^^^^^^^^^ diff --git a/src/test/ui/deprecation/deprecation-lint-3.rs b/src/test/ui/deprecation/deprecation-lint-3.rs index 7faaa181d3922..ae2dd7aac8155 100644 --- a/src/test/ui/deprecation/deprecation-lint-3.rs +++ b/src/test/ui/deprecation/deprecation-lint-3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:deprecation-lint.rs // error-pattern: use of deprecated item diff --git a/src/test/ui/deprecation/deprecation-lint-3.stderr b/src/test/ui/deprecation/deprecation-lint-3.stderr index 9dfc44ebc61e0..fb90a63b0fb5c 100644 --- a/src/test/ui/deprecation/deprecation-lint-3.stderr +++ b/src/test/ui/deprecation/deprecation-lint-3.stderr @@ -1,11 +1,11 @@ error: use of deprecated item 'deprecation_lint::deprecated_text': text - --> $DIR/deprecation-lint-3.rs:23:5 + --> $DIR/deprecation-lint-3.rs:13:5 | LL | macro_test_arg_nested!(deprecated_text); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/deprecation-lint-3.rs:14:9 + --> $DIR/deprecation-lint-3.rs:4:9 | LL | #![deny(deprecated)] | ^^^^^^^^^^ diff --git a/src/test/ui/deprecation/deprecation-lint-nested.rs b/src/test/ui/deprecation/deprecation-lint-nested.rs index eedbba59c6f48..ee6f0a22363f9 100644 --- a/src/test/ui/deprecation/deprecation-lint-nested.rs +++ b/src/test/ui/deprecation/deprecation-lint-nested.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(deprecated)] #![allow(warnings)] diff --git a/src/test/ui/deprecation/deprecation-lint-nested.stderr b/src/test/ui/deprecation/deprecation-lint-nested.stderr index 4e2b462fd1b57..b30da3493350f 100644 --- a/src/test/ui/deprecation/deprecation-lint-nested.stderr +++ b/src/test/ui/deprecation/deprecation-lint-nested.stderr @@ -1,41 +1,41 @@ error: use of deprecated item 'loud::DeprecatedType' - --> $DIR/deprecation-lint-nested.rs:65:16 + --> $DIR/deprecation-lint-nested.rs:55:16 | LL | struct Foo(DeprecatedType); //~ ERROR use of deprecated item | ^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/deprecation-lint-nested.rs:11:9 + --> $DIR/deprecation-lint-nested.rs:1:9 | LL | #![deny(deprecated)] | ^^^^^^^^^^ error: use of deprecated item 'loud::DeprecatedTrait' - --> $DIR/deprecation-lint-nested.rs:67:10 + --> $DIR/deprecation-lint-nested.rs:57:10 | LL | impl DeprecatedTrait for Foo {} //~ ERROR use of deprecated item | ^^^^^^^^^^^^^^^ error: use of deprecated item 'loud::DEPRECATED_STATIC' - --> $DIR/deprecation-lint-nested.rs:76:9 + --> $DIR/deprecation-lint-nested.rs:66:9 | LL | DEPRECATED_STATIC + //~ ERROR use of deprecated item | ^^^^^^^^^^^^^^^^^ error: use of deprecated item 'loud::DEPRECATED_CONST' - --> $DIR/deprecation-lint-nested.rs:77:9 + --> $DIR/deprecation-lint-nested.rs:67:9 | LL | DEPRECATED_CONST //~ ERROR use of deprecated item | ^^^^^^^^^^^^^^^^ error: use of deprecated item 'loud::DeprecatedTrait' - --> $DIR/deprecation-lint-nested.rs:70:19 + --> $DIR/deprecation-lint-nested.rs:60:19 | LL | fn bar() { //~ ERROR use of deprecated item | ^^^^^^^^^^^^^^^ error: use of deprecated item 'loud::deprecated_fn' - --> $DIR/deprecation-lint-nested.rs:71:13 + --> $DIR/deprecation-lint-nested.rs:61:13 | LL | deprecated_fn(); //~ ERROR use of deprecated item | ^^^^^^^^^^^^^ diff --git a/src/test/ui/deprecation/deprecation-lint.rs b/src/test/ui/deprecation/deprecation-lint.rs index 93eb6b6b11544..6b3e9a8ad8116 100644 --- a/src/test/ui/deprecation/deprecation-lint.rs +++ b/src/test/ui/deprecation/deprecation-lint.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:deprecation-lint.rs // ignore-tidy-linelength diff --git a/src/test/ui/deprecation/deprecation-lint.stderr b/src/test/ui/deprecation/deprecation-lint.stderr index addca6699177f..46875d0bf13ba 100644 --- a/src/test/ui/deprecation/deprecation-lint.stderr +++ b/src/test/ui/deprecation/deprecation-lint.stderr @@ -1,725 +1,725 @@ error: use of deprecated item 'deprecation_lint::deprecated': text - --> $DIR/deprecation-lint.rs:27:9 + --> $DIR/deprecation-lint.rs:17:9 | LL | deprecated(); //~ ERROR use of deprecated item 'deprecation_lint::deprecated' | ^^^^^^^^^^ | note: lint level defined here - --> $DIR/deprecation-lint.rs:14:9 + --> $DIR/deprecation-lint.rs:4:9 | LL | #![deny(deprecated)] | ^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated': text - --> $DIR/deprecation-lint.rs:32:9 + --> $DIR/deprecation-lint.rs:22:9 | LL | Trait::trait_deprecated(&foo); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated': text - --> $DIR/deprecation-lint.rs:34:9 + --> $DIR/deprecation-lint.rs:24:9 | LL | ::trait_deprecated(&foo); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::deprecated_text': text - --> $DIR/deprecation-lint.rs:36:9 + --> $DIR/deprecation-lint.rs:26:9 | LL | deprecated_text(); //~ ERROR use of deprecated item 'deprecation_lint::deprecated_text': text | ^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text - --> $DIR/deprecation-lint.rs:41:9 + --> $DIR/deprecation-lint.rs:31:9 | LL | Trait::trait_deprecated_text(&foo); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text - --> $DIR/deprecation-lint.rs:43:9 + --> $DIR/deprecation-lint.rs:33:9 | LL | ::trait_deprecated_text(&foo); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::DeprecatedStruct': text - --> $DIR/deprecation-lint.rs:45:17 + --> $DIR/deprecation-lint.rs:35:17 | LL | let _ = DeprecatedStruct { //~ ERROR use of deprecated item 'deprecation_lint::DeprecatedStruct': text | ^^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::DeprecatedUnitStruct': text - --> $DIR/deprecation-lint.rs:49:17 + --> $DIR/deprecation-lint.rs:39:17 | LL | let _ = DeprecatedUnitStruct; //~ ERROR use of deprecated item 'deprecation_lint::DeprecatedUnitStruct': text | ^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::Enum::DeprecatedVariant': text - --> $DIR/deprecation-lint.rs:51:17 + --> $DIR/deprecation-lint.rs:41:17 | LL | let _ = Enum::DeprecatedVariant; //~ ERROR use of deprecated item 'deprecation_lint::Enum::DeprecatedVariant': text | ^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::DeprecatedTupleStruct': text - --> $DIR/deprecation-lint.rs:53:17 + --> $DIR/deprecation-lint.rs:43:17 | LL | let _ = DeprecatedTupleStruct (1); //~ ERROR use of deprecated item 'deprecation_lint::DeprecatedTupleStruct': text | ^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::nested::DeprecatedStruct': text - --> $DIR/deprecation-lint.rs:55:17 + --> $DIR/deprecation-lint.rs:45:17 | LL | let _ = nested::DeprecatedStruct { //~ ERROR use of deprecated item 'deprecation_lint::nested::DeprecatedStruct': text | ^^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::nested::DeprecatedUnitStruct': text - --> $DIR/deprecation-lint.rs:59:17 + --> $DIR/deprecation-lint.rs:49:17 | LL | let _ = nested::DeprecatedUnitStruct; //~ ERROR use of deprecated item 'deprecation_lint::nested::DeprecatedUnitStruct': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::nested::Enum::DeprecatedVariant': text - --> $DIR/deprecation-lint.rs:61:17 + --> $DIR/deprecation-lint.rs:51:17 | LL | let _ = nested::Enum::DeprecatedVariant; //~ ERROR use of deprecated item 'deprecation_lint::nested::Enum::DeprecatedVariant': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::nested::DeprecatedTupleStruct': text - --> $DIR/deprecation-lint.rs:63:17 + --> $DIR/deprecation-lint.rs:53:17 | LL | let _ = nested::DeprecatedTupleStruct (1); //~ ERROR use of deprecated item 'deprecation_lint::nested::DeprecatedTupleStruct': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::deprecated_text': text - --> $DIR/deprecation-lint.rs:70:25 + --> $DIR/deprecation-lint.rs:60:25 | LL | macro_test_arg!(deprecated_text()); //~ ERROR use of deprecated item 'deprecation_lint::deprecated_text': text | ^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::deprecated_text': text - --> $DIR/deprecation-lint.rs:71:41 + --> $DIR/deprecation-lint.rs:61:41 | LL | macro_test_arg!(macro_test_arg!(deprecated_text())); //~ ERROR use of deprecated item 'deprecation_lint::deprecated_text': text | ^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated': text - --> $DIR/deprecation-lint.rs:76:9 + --> $DIR/deprecation-lint.rs:66:9 | LL | Trait::trait_deprecated(&foo); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated': text - --> $DIR/deprecation-lint.rs:78:9 + --> $DIR/deprecation-lint.rs:68:9 | LL | ::trait_deprecated(&foo); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text - --> $DIR/deprecation-lint.rs:80:9 + --> $DIR/deprecation-lint.rs:70:9 | LL | Trait::trait_deprecated_text(&foo); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text - --> $DIR/deprecation-lint.rs:82:9 + --> $DIR/deprecation-lint.rs:72:9 | LL | ::trait_deprecated_text(&foo); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::DeprecatedTrait': text - --> $DIR/deprecation-lint.rs:92:10 + --> $DIR/deprecation-lint.rs:82:10 | LL | impl DeprecatedTrait for S {} //~ ERROR use of deprecated item 'deprecation_lint::DeprecatedTrait': text | ^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::DeprecatedTrait': text - --> $DIR/deprecation-lint.rs:93:24 + --> $DIR/deprecation-lint.rs:83:24 | LL | trait LocalTrait : DeprecatedTrait { } //~ ERROR use of deprecated item 'deprecation_lint::DeprecatedTrait': text | ^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::Deprecated': text - --> $DIR/deprecation-lint.rs:124:17 + --> $DIR/deprecation-lint.rs:114:17 | LL | let x = Deprecated { | ^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::Deprecated': text - --> $DIR/deprecation-lint.rs:133:13 + --> $DIR/deprecation-lint.rs:123:13 | LL | let Deprecated { | ^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::Deprecated': text - --> $DIR/deprecation-lint.rs:139:13 + --> $DIR/deprecation-lint.rs:129:13 | LL | let Deprecated | ^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::Deprecated2': text - --> $DIR/deprecation-lint.rs:143:17 + --> $DIR/deprecation-lint.rs:133:17 | LL | let x = Deprecated2(1, 2, 3); | ^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::Deprecated2': text - --> $DIR/deprecation-lint.rs:153:13 + --> $DIR/deprecation-lint.rs:143:13 | LL | let Deprecated2 | ^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::Deprecated2': text - --> $DIR/deprecation-lint.rs:162:13 + --> $DIR/deprecation-lint.rs:152:13 | LL | let Deprecated2 | ^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::deprecated_mod::deprecated': text - --> $DIR/deprecation-lint.rs:173:9 + --> $DIR/deprecation-lint.rs:163:9 | LL | deprecated_mod::deprecated(); //~ ERROR use of deprecated item 'deprecation_lint::deprecated_mod::deprecated': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::deprecated': text - --> $DIR/deprecation-lint.rs:256:9 + --> $DIR/deprecation-lint.rs:246:9 | LL | deprecated(); //~ ERROR use of deprecated item 'this_crate::deprecated' | ^^^^^^^^^^ error: use of deprecated item 'this_crate::Trait::trait_deprecated': text - --> $DIR/deprecation-lint.rs:261:9 + --> $DIR/deprecation-lint.rs:251:9 | LL | Trait::trait_deprecated(&foo); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::Trait::trait_deprecated': text - --> $DIR/deprecation-lint.rs:263:9 + --> $DIR/deprecation-lint.rs:253:9 | LL | ::trait_deprecated(&foo); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::deprecated_text': text - --> $DIR/deprecation-lint.rs:265:9 + --> $DIR/deprecation-lint.rs:255:9 | LL | deprecated_text(); //~ ERROR use of deprecated item 'this_crate::deprecated_text': text | ^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text - --> $DIR/deprecation-lint.rs:270:9 + --> $DIR/deprecation-lint.rs:260:9 | LL | Trait::trait_deprecated_text(&foo); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text - --> $DIR/deprecation-lint.rs:272:9 + --> $DIR/deprecation-lint.rs:262:9 | LL | ::trait_deprecated_text(&foo); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::DeprecatedStruct': text - --> $DIR/deprecation-lint.rs:277:17 + --> $DIR/deprecation-lint.rs:267:17 | LL | let _ = DeprecatedStruct { | ^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::DeprecatedUnitStruct': text - --> $DIR/deprecation-lint.rs:282:17 + --> $DIR/deprecation-lint.rs:272:17 | LL | let _ = DeprecatedUnitStruct; //~ ERROR use of deprecated item 'this_crate::DeprecatedUnitStruct': text | ^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::Enum::DeprecatedVariant': text - --> $DIR/deprecation-lint.rs:284:17 + --> $DIR/deprecation-lint.rs:274:17 | LL | let _ = Enum::DeprecatedVariant; //~ ERROR use of deprecated item 'this_crate::Enum::DeprecatedVariant': text | ^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::DeprecatedTupleStruct': text - --> $DIR/deprecation-lint.rs:286:17 + --> $DIR/deprecation-lint.rs:276:17 | LL | let _ = DeprecatedTupleStruct (1); //~ ERROR use of deprecated item 'this_crate::DeprecatedTupleStruct': text | ^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::nested::DeprecatedStruct': text - --> $DIR/deprecation-lint.rs:288:17 + --> $DIR/deprecation-lint.rs:278:17 | LL | let _ = nested::DeprecatedStruct { | ^^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::nested::DeprecatedUnitStruct': text - --> $DIR/deprecation-lint.rs:293:17 + --> $DIR/deprecation-lint.rs:283:17 | LL | let _ = nested::DeprecatedUnitStruct; //~ ERROR use of deprecated item 'this_crate::nested::DeprecatedUnitStruct': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::nested::Enum::DeprecatedVariant': text - --> $DIR/deprecation-lint.rs:295:17 + --> $DIR/deprecation-lint.rs:285:17 | LL | let _ = nested::Enum::DeprecatedVariant; //~ ERROR use of deprecated item 'this_crate::nested::Enum::DeprecatedVariant': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::nested::DeprecatedTupleStruct': text - --> $DIR/deprecation-lint.rs:297:17 + --> $DIR/deprecation-lint.rs:287:17 | LL | let _ = nested::DeprecatedTupleStruct (1); //~ ERROR use of deprecated item 'this_crate::nested::DeprecatedTupleStruct': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::Trait::trait_deprecated': text - --> $DIR/deprecation-lint.rs:302:9 + --> $DIR/deprecation-lint.rs:292:9 | LL | Trait::trait_deprecated(&foo); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::Trait::trait_deprecated': text - --> $DIR/deprecation-lint.rs:304:9 + --> $DIR/deprecation-lint.rs:294:9 | LL | ::trait_deprecated(&foo); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text - --> $DIR/deprecation-lint.rs:306:9 + --> $DIR/deprecation-lint.rs:296:9 | LL | Trait::trait_deprecated_text(&foo); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text - --> $DIR/deprecation-lint.rs:308:9 + --> $DIR/deprecation-lint.rs:298:9 | LL | ::trait_deprecated_text(&foo); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::test_fn_closure_body::{{closure}}::bar' - --> $DIR/deprecation-lint.rs:326:13 + --> $DIR/deprecation-lint.rs:316:13 | LL | bar(); //~ ERROR use of deprecated item 'this_crate::test_fn_closure_body::{{closure}}::bar' | ^^^ error: use of deprecated item 'this_crate::DeprecatedTrait': text - --> $DIR/deprecation-lint.rs:345:10 + --> $DIR/deprecation-lint.rs:335:10 | LL | impl DeprecatedTrait for S { } //~ ERROR use of deprecated item 'this_crate::DeprecatedTrait': text | ^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::DeprecatedTrait': text - --> $DIR/deprecation-lint.rs:347:24 + --> $DIR/deprecation-lint.rs:337:24 | LL | trait LocalTrait : DeprecatedTrait { } //~ ERROR use of deprecated item 'this_crate::DeprecatedTrait': text | ^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate2::Deprecated': text - --> $DIR/deprecation-lint.rs:399:17 + --> $DIR/deprecation-lint.rs:389:17 | LL | let x = Deprecated { | ^^^^^^^^^^ error: use of deprecated item 'this_crate2::Deprecated': text - --> $DIR/deprecation-lint.rs:408:13 + --> $DIR/deprecation-lint.rs:398:13 | LL | let Deprecated { | ^^^^^^^^^^ error: use of deprecated item 'this_crate2::Deprecated': text - --> $DIR/deprecation-lint.rs:414:13 + --> $DIR/deprecation-lint.rs:404:13 | LL | let Deprecated | ^^^^^^^^^^ error: use of deprecated item 'this_crate2::Deprecated2': text - --> $DIR/deprecation-lint.rs:419:17 + --> $DIR/deprecation-lint.rs:409:17 | LL | let x = Deprecated2(1, 2, 3); | ^^^^^^^^^^^ error: use of deprecated item 'this_crate2::Deprecated2': text - --> $DIR/deprecation-lint.rs:429:13 + --> $DIR/deprecation-lint.rs:419:13 | LL | let Deprecated2 | ^^^^^^^^^^^ error: use of deprecated item 'this_crate2::Deprecated2': text - --> $DIR/deprecation-lint.rs:438:13 + --> $DIR/deprecation-lint.rs:428:13 | LL | let Deprecated2 | ^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::MethodTester::method_deprecated': text - --> $DIR/deprecation-lint.rs:28:13 + --> $DIR/deprecation-lint.rs:18:13 | LL | foo.method_deprecated(); //~ ERROR use of deprecated item 'deprecation_lint::MethodTester::method_deprecated' | ^^^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::MethodTester::method_deprecated': text - --> $DIR/deprecation-lint.rs:29:9 + --> $DIR/deprecation-lint.rs:19:9 | LL | Foo::method_deprecated(&foo); //~ ERROR use of deprecated item 'deprecation_lint::MethodTester::method_deprecated' | ^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::MethodTester::method_deprecated': text - --> $DIR/deprecation-lint.rs:30:9 + --> $DIR/deprecation-lint.rs:20:9 | LL | ::method_deprecated(&foo); //~ ERROR use of deprecated item 'deprecation_lint::MethodTester::method_deprecated' | ^^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated': text - --> $DIR/deprecation-lint.rs:31:13 + --> $DIR/deprecation-lint.rs:21:13 | LL | foo.trait_deprecated(); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated': text - --> $DIR/deprecation-lint.rs:33:9 + --> $DIR/deprecation-lint.rs:23:9 | LL | ::trait_deprecated(&foo); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::MethodTester::method_deprecated_text': text - --> $DIR/deprecation-lint.rs:37:13 + --> $DIR/deprecation-lint.rs:27:13 | LL | foo.method_deprecated_text(); //~ ERROR use of deprecated item 'deprecation_lint::MethodTester::method_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::MethodTester::method_deprecated_text': text - --> $DIR/deprecation-lint.rs:38:9 + --> $DIR/deprecation-lint.rs:28:9 | LL | Foo::method_deprecated_text(&foo); //~ ERROR use of deprecated item 'deprecation_lint::MethodTester::method_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::MethodTester::method_deprecated_text': text - --> $DIR/deprecation-lint.rs:39:9 + --> $DIR/deprecation-lint.rs:29:9 | LL | ::method_deprecated_text(&foo); //~ ERROR use of deprecated item 'deprecation_lint::MethodTester::method_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text - --> $DIR/deprecation-lint.rs:40:13 + --> $DIR/deprecation-lint.rs:30:13 | LL | foo.trait_deprecated_text(); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text - --> $DIR/deprecation-lint.rs:42:9 + --> $DIR/deprecation-lint.rs:32:9 | LL | ::trait_deprecated_text(&foo); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::DeprecatedStruct::i': text - --> $DIR/deprecation-lint.rs:46:13 + --> $DIR/deprecation-lint.rs:36:13 | LL | i: 0 //~ ERROR use of deprecated item 'deprecation_lint::DeprecatedStruct::i': text | ^^^^ error: use of deprecated item 'deprecation_lint::nested::DeprecatedStruct::i': text - --> $DIR/deprecation-lint.rs:56:13 + --> $DIR/deprecation-lint.rs:46:13 | LL | i: 0 //~ ERROR use of deprecated item 'deprecation_lint::nested::DeprecatedStruct::i': text | ^^^^ error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated': text - --> $DIR/deprecation-lint.rs:75:13 + --> $DIR/deprecation-lint.rs:65:13 | LL | foo.trait_deprecated(); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated': text - --> $DIR/deprecation-lint.rs:77:9 + --> $DIR/deprecation-lint.rs:67:9 | LL | ::trait_deprecated(&foo); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text - --> $DIR/deprecation-lint.rs:79:13 + --> $DIR/deprecation-lint.rs:69:13 | LL | foo.trait_deprecated_text(); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text - --> $DIR/deprecation-lint.rs:81:9 + --> $DIR/deprecation-lint.rs:71:9 | LL | ::trait_deprecated_text(&foo); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated': text - --> $DIR/deprecation-lint.rs:86:13 + --> $DIR/deprecation-lint.rs:76:13 | LL | foo.trait_deprecated(); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text - --> $DIR/deprecation-lint.rs:87:13 + --> $DIR/deprecation-lint.rs:77:13 | LL | foo.trait_deprecated_text(); //~ ERROR use of deprecated item 'deprecation_lint::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::Stable::override2': text - --> $DIR/deprecation-lint.rs:97:13 + --> $DIR/deprecation-lint.rs:87:13 | LL | override2: 3, | ^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::Stable::override2': text - --> $DIR/deprecation-lint.rs:101:17 + --> $DIR/deprecation-lint.rs:91:17 | LL | let _ = x.override2; | ^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::Stable::override2': text - --> $DIR/deprecation-lint.rs:105:13 + --> $DIR/deprecation-lint.rs:95:13 | LL | override2: _ | ^^^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::Stable2::2': text - --> $DIR/deprecation-lint.rs:113:17 + --> $DIR/deprecation-lint.rs:103:17 | LL | let _ = x.2; | ^^^ error: use of deprecated item 'deprecation_lint::Stable2::2': text - --> $DIR/deprecation-lint.rs:118:20 + --> $DIR/deprecation-lint.rs:108:20 | LL | _) | ^ error: use of deprecated item 'deprecation_lint::Deprecated::inherit': text - --> $DIR/deprecation-lint.rs:126:13 + --> $DIR/deprecation-lint.rs:116:13 | LL | inherit: 1, | ^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::Deprecated::inherit': text - --> $DIR/deprecation-lint.rs:130:17 + --> $DIR/deprecation-lint.rs:120:17 | LL | let _ = x.inherit; | ^^^^^^^^^ error: use of deprecated item 'deprecation_lint::Deprecated::inherit': text - --> $DIR/deprecation-lint.rs:135:13 + --> $DIR/deprecation-lint.rs:125:13 | LL | inherit: _, | ^^^^^^^^^^ error: use of deprecated item 'deprecation_lint::Deprecated2::0': text - --> $DIR/deprecation-lint.rs:146:17 + --> $DIR/deprecation-lint.rs:136:17 | LL | let _ = x.0; | ^^^ error: use of deprecated item 'deprecation_lint::Deprecated2::1': text - --> $DIR/deprecation-lint.rs:148:17 + --> $DIR/deprecation-lint.rs:138:17 | LL | let _ = x.1; | ^^^ error: use of deprecated item 'deprecation_lint::Deprecated2::2': text - --> $DIR/deprecation-lint.rs:150:17 + --> $DIR/deprecation-lint.rs:140:17 | LL | let _ = x.2; | ^^^ error: use of deprecated item 'deprecation_lint::Deprecated2::0': text - --> $DIR/deprecation-lint.rs:155:14 + --> $DIR/deprecation-lint.rs:145:14 | LL | (_, | ^ error: use of deprecated item 'deprecation_lint::Deprecated2::1': text - --> $DIR/deprecation-lint.rs:157:14 + --> $DIR/deprecation-lint.rs:147:14 | LL | _, | ^ error: use of deprecated item 'deprecation_lint::Deprecated2::2': text - --> $DIR/deprecation-lint.rs:159:14 + --> $DIR/deprecation-lint.rs:149:14 | LL | _) | ^ error: use of deprecated item 'this_crate::MethodTester::method_deprecated': text - --> $DIR/deprecation-lint.rs:257:13 + --> $DIR/deprecation-lint.rs:247:13 | LL | foo.method_deprecated(); //~ ERROR use of deprecated item 'this_crate::MethodTester::method_deprecated' | ^^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::MethodTester::method_deprecated': text - --> $DIR/deprecation-lint.rs:258:9 + --> $DIR/deprecation-lint.rs:248:9 | LL | Foo::method_deprecated(&foo); //~ ERROR use of deprecated item 'this_crate::MethodTester::method_deprecated' | ^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::MethodTester::method_deprecated': text - --> $DIR/deprecation-lint.rs:259:9 + --> $DIR/deprecation-lint.rs:249:9 | LL | ::method_deprecated(&foo); //~ ERROR use of deprecated item 'this_crate::MethodTester::method_deprecated' | ^^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::Trait::trait_deprecated': text - --> $DIR/deprecation-lint.rs:260:13 + --> $DIR/deprecation-lint.rs:250:13 | LL | foo.trait_deprecated(); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::Trait::trait_deprecated': text - --> $DIR/deprecation-lint.rs:262:9 + --> $DIR/deprecation-lint.rs:252:9 | LL | ::trait_deprecated(&foo); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::MethodTester::method_deprecated_text': text - --> $DIR/deprecation-lint.rs:266:13 + --> $DIR/deprecation-lint.rs:256:13 | LL | foo.method_deprecated_text(); //~ ERROR use of deprecated item 'this_crate::MethodTester::method_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::MethodTester::method_deprecated_text': text - --> $DIR/deprecation-lint.rs:267:9 + --> $DIR/deprecation-lint.rs:257:9 | LL | Foo::method_deprecated_text(&foo); //~ ERROR use of deprecated item 'this_crate::MethodTester::method_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::MethodTester::method_deprecated_text': text - --> $DIR/deprecation-lint.rs:268:9 + --> $DIR/deprecation-lint.rs:258:9 | LL | ::method_deprecated_text(&foo); //~ ERROR use of deprecated item 'this_crate::MethodTester::method_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text - --> $DIR/deprecation-lint.rs:269:13 + --> $DIR/deprecation-lint.rs:259:13 | LL | foo.trait_deprecated_text(); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text - --> $DIR/deprecation-lint.rs:271:9 + --> $DIR/deprecation-lint.rs:261:9 | LL | ::trait_deprecated_text(&foo); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::DeprecatedStruct::i': text - --> $DIR/deprecation-lint.rs:279:13 + --> $DIR/deprecation-lint.rs:269:13 | LL | i: 0 //~ ERROR use of deprecated item 'this_crate::DeprecatedStruct::i': text | ^^^^ error: use of deprecated item 'this_crate::nested::DeprecatedStruct::i': text - --> $DIR/deprecation-lint.rs:290:13 + --> $DIR/deprecation-lint.rs:280:13 | LL | i: 0 //~ ERROR use of deprecated item 'this_crate::nested::DeprecatedStruct::i': text | ^^^^ error: use of deprecated item 'this_crate::Trait::trait_deprecated': text - --> $DIR/deprecation-lint.rs:301:13 + --> $DIR/deprecation-lint.rs:291:13 | LL | foo.trait_deprecated(); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::Trait::trait_deprecated': text - --> $DIR/deprecation-lint.rs:303:9 + --> $DIR/deprecation-lint.rs:293:9 | LL | ::trait_deprecated(&foo); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text - --> $DIR/deprecation-lint.rs:305:13 + --> $DIR/deprecation-lint.rs:295:13 | LL | foo.trait_deprecated_text(); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text - --> $DIR/deprecation-lint.rs:307:9 + --> $DIR/deprecation-lint.rs:297:9 | LL | ::trait_deprecated_text(&foo); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::Trait::trait_deprecated': text - --> $DIR/deprecation-lint.rs:312:13 + --> $DIR/deprecation-lint.rs:302:13 | LL | foo.trait_deprecated(); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated' | ^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate::Trait::trait_deprecated_text': text - --> $DIR/deprecation-lint.rs:313:13 + --> $DIR/deprecation-lint.rs:303:13 | LL | foo.trait_deprecated_text(); //~ ERROR use of deprecated item 'this_crate::Trait::trait_deprecated_text': text | ^^^^^^^^^^^^^^^^^^^^^ error: use of deprecated item 'this_crate2::Stable::override2': text - --> $DIR/deprecation-lint.rs:372:13 + --> $DIR/deprecation-lint.rs:362:13 | LL | override2: 3, | ^^^^^^^^^^^^ error: use of deprecated item 'this_crate2::Stable::override2': text - --> $DIR/deprecation-lint.rs:376:17 + --> $DIR/deprecation-lint.rs:366:17 | LL | let _ = x.override2; | ^^^^^^^^^^^ error: use of deprecated item 'this_crate2::Stable::override2': text - --> $DIR/deprecation-lint.rs:380:13 + --> $DIR/deprecation-lint.rs:370:13 | LL | override2: _ | ^^^^^^^^^^^^ error: use of deprecated item 'this_crate2::Stable2::2': text - --> $DIR/deprecation-lint.rs:388:17 + --> $DIR/deprecation-lint.rs:378:17 | LL | let _ = x.2; | ^^^ error: use of deprecated item 'this_crate2::Stable2::2': text - --> $DIR/deprecation-lint.rs:393:20 + --> $DIR/deprecation-lint.rs:383:20 | LL | _) | ^ error: use of deprecated item 'this_crate2::Deprecated::inherit': text - --> $DIR/deprecation-lint.rs:401:13 + --> $DIR/deprecation-lint.rs:391:13 | LL | inherit: 1, | ^^^^^^^^^^ error: use of deprecated item 'this_crate2::Deprecated::inherit': text - --> $DIR/deprecation-lint.rs:405:17 + --> $DIR/deprecation-lint.rs:395:17 | LL | let _ = x.inherit; | ^^^^^^^^^ error: use of deprecated item 'this_crate2::Deprecated::inherit': text - --> $DIR/deprecation-lint.rs:410:13 + --> $DIR/deprecation-lint.rs:400:13 | LL | inherit: _, | ^^^^^^^^^^ error: use of deprecated item 'this_crate2::Deprecated2::0': text - --> $DIR/deprecation-lint.rs:422:17 + --> $DIR/deprecation-lint.rs:412:17 | LL | let _ = x.0; | ^^^ error: use of deprecated item 'this_crate2::Deprecated2::1': text - --> $DIR/deprecation-lint.rs:424:17 + --> $DIR/deprecation-lint.rs:414:17 | LL | let _ = x.1; | ^^^ error: use of deprecated item 'this_crate2::Deprecated2::2': text - --> $DIR/deprecation-lint.rs:426:17 + --> $DIR/deprecation-lint.rs:416:17 | LL | let _ = x.2; | ^^^ error: use of deprecated item 'this_crate2::Deprecated2::0': text - --> $DIR/deprecation-lint.rs:431:14 + --> $DIR/deprecation-lint.rs:421:14 | LL | (_, | ^ error: use of deprecated item 'this_crate2::Deprecated2::1': text - --> $DIR/deprecation-lint.rs:433:14 + --> $DIR/deprecation-lint.rs:423:14 | LL | _, | ^ error: use of deprecated item 'this_crate2::Deprecated2::2': text - --> $DIR/deprecation-lint.rs:435:14 + --> $DIR/deprecation-lint.rs:425:14 | LL | _) | ^ diff --git a/src/test/ui/deprecation/deprecation-sanity.rs b/src/test/ui/deprecation/deprecation-sanity.rs index af2ac79ea8072..09bae0bdfb13e 100644 --- a/src/test/ui/deprecation/deprecation-sanity.rs +++ b/src/test/ui/deprecation/deprecation-sanity.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Various checks that deprecation attributes are used correctly mod bogus_attribute_types_1 { diff --git a/src/test/ui/deprecation/deprecation-sanity.stderr b/src/test/ui/deprecation/deprecation-sanity.stderr index 967eb6e23a379..a8bfcc23cc8cc 100644 --- a/src/test/ui/deprecation/deprecation-sanity.stderr +++ b/src/test/ui/deprecation/deprecation-sanity.stderr @@ -1,41 +1,41 @@ error[E0541]: unknown meta item 'reason' - --> $DIR/deprecation-sanity.rs:14:43 + --> $DIR/deprecation-sanity.rs:4:43 | LL | #[deprecated(since = "a", note = "a", reason)] //~ ERROR unknown meta item 'reason' | ^^^^^^ expected one of `since`, `note` error[E0551]: incorrect meta item - --> $DIR/deprecation-sanity.rs:17:31 + --> $DIR/deprecation-sanity.rs:7:31 | LL | #[deprecated(since = "a", note)] //~ ERROR incorrect meta item | ^^^^ error[E0551]: incorrect meta item - --> $DIR/deprecation-sanity.rs:20:18 + --> $DIR/deprecation-sanity.rs:10:18 | LL | #[deprecated(since, note = "a")] //~ ERROR incorrect meta item | ^^^^^ error[E0551]: incorrect meta item - --> $DIR/deprecation-sanity.rs:23:31 + --> $DIR/deprecation-sanity.rs:13:31 | LL | #[deprecated(since = "a", note(b))] //~ ERROR incorrect meta item | ^^^^^^^ error[E0551]: incorrect meta item - --> $DIR/deprecation-sanity.rs:26:18 + --> $DIR/deprecation-sanity.rs:16:18 | LL | #[deprecated(since(b), note = "a")] //~ ERROR incorrect meta item | ^^^^^^^^ error[E0550]: multiple deprecated attributes - --> $DIR/deprecation-sanity.rs:32:1 + --> $DIR/deprecation-sanity.rs:22:1 | LL | fn multiple1() { } //~ ERROR multiple deprecated attributes | ^^^^^^^^^^^^^^^^^^ error[E0538]: multiple 'since' items - --> $DIR/deprecation-sanity.rs:34:27 + --> $DIR/deprecation-sanity.rs:24:27 | LL | #[deprecated(since = "a", since = "b", note = "c")] //~ ERROR multiple 'since' items | ^^^^^^^^^^^ diff --git a/src/test/ui/deref-non-pointer.rs b/src/test/ui/deref-non-pointer.rs index 1c711c0145d90..82ab355e697b2 100644 --- a/src/test/ui/deref-non-pointer.rs +++ b/src/test/ui/deref-non-pointer.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { match *1 { //~ ERROR: cannot be dereferenced _ => { panic!(); } diff --git a/src/test/ui/deref-non-pointer.stderr b/src/test/ui/deref-non-pointer.stderr index 3e0ea06123df9..0852311b7b160 100644 --- a/src/test/ui/deref-non-pointer.stderr +++ b/src/test/ui/deref-non-pointer.stderr @@ -1,5 +1,5 @@ error[E0614]: type `{integer}` cannot be dereferenced - --> $DIR/deref-non-pointer.rs:12:9 + --> $DIR/deref-non-pointer.rs:2:9 | LL | match *1 { //~ ERROR: cannot be dereferenced | ^^ diff --git a/src/test/ui/deref-suggestion.rs b/src/test/ui/deref-suggestion.rs index 04ba4ab905eb1..2b4f338aa0871 100644 --- a/src/test/ui/deref-suggestion.rs +++ b/src/test/ui/deref-suggestion.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! borrow { ($x:expr) => { &$x } //~ ERROR mismatched types } diff --git a/src/test/ui/deref-suggestion.stderr b/src/test/ui/deref-suggestion.stderr index a5f87928924ca..2e2957d86edd2 100644 --- a/src/test/ui/deref-suggestion.stderr +++ b/src/test/ui/deref-suggestion.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/deref-suggestion.rs:18:9 + --> $DIR/deref-suggestion.rs:8:9 | LL | foo(s); //~ ERROR mismatched types | ^ @@ -11,7 +11,7 @@ LL | foo(s); //~ ERROR mismatched types found type `&std::string::String` error[E0308]: mismatched types - --> $DIR/deref-suggestion.rs:23:10 + --> $DIR/deref-suggestion.rs:13:10 | LL | foo3(u); //~ ERROR mismatched types | ^ @@ -23,7 +23,7 @@ LL | foo3(u); //~ ERROR mismatched types found type `&u32` error[E0308]: mismatched types - --> $DIR/deref-suggestion.rs:30:9 + --> $DIR/deref-suggestion.rs:20:9 | LL | foo(&"aaa".to_owned()); //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^ @@ -35,7 +35,7 @@ LL | foo(&"aaa".to_owned()); //~ ERROR mismatched types found type `&std::string::String` error[E0308]: mismatched types - --> $DIR/deref-suggestion.rs:31:9 + --> $DIR/deref-suggestion.rs:21:9 | LL | foo(&mut "aaa".to_owned()); //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^^^^^ @@ -47,7 +47,7 @@ LL | foo(&mut "aaa".to_owned()); //~ ERROR mismatched types found type `&mut std::string::String` error[E0308]: mismatched types - --> $DIR/deref-suggestion.rs:12:20 + --> $DIR/deref-suggestion.rs:2:20 | LL | ($x:expr) => { &$x } //~ ERROR mismatched types | ^^^ expected u32, found &{integer} diff --git a/src/test/ui/derived-errors/issue-30580.rs b/src/test/ui/derived-errors/issue-30580.rs index 553ad0a33410b..6940fcf7c3a93 100644 --- a/src/test/ui/derived-errors/issue-30580.rs +++ b/src/test/ui/derived-errors/issue-30580.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we do not see uninformative region-related errors // when we get some basic type-checking failure. See #30580. diff --git a/src/test/ui/derived-errors/issue-30580.stderr b/src/test/ui/derived-errors/issue-30580.stderr index bf9a5a299e307..d4829ad2a1af9 100644 --- a/src/test/ui/derived-errors/issue-30580.stderr +++ b/src/test/ui/derived-errors/issue-30580.stderr @@ -1,5 +1,5 @@ error[E0609]: no field `c` on type `&Foo` - --> $DIR/issue-30580.rs:22:11 + --> $DIR/issue-30580.rs:12:11 | LL | b.c; //~ ERROR no field `c` on type `&Foo` | ^ diff --git a/src/test/ui/derived-errors/issue-31997-1.rs b/src/test/ui/derived-errors/issue-31997-1.rs index 7d79c48c06ae2..90c1b498cea73 100644 --- a/src/test/ui/derived-errors/issue-31997-1.rs +++ b/src/test/ui/derived-errors/issue-31997-1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for this example from #31997 -- main goal is to // emit as minimal and precise an error set as possible. Ideally, we'd // only emit the E0433 error below, but right now we emit two. diff --git a/src/test/ui/derived-errors/issue-31997-1.stderr b/src/test/ui/derived-errors/issue-31997-1.stderr index 7cdcac3891fc9..cb23f3f2915a8 100644 --- a/src/test/ui/derived-errors/issue-31997-1.stderr +++ b/src/test/ui/derived-errors/issue-31997-1.stderr @@ -1,5 +1,5 @@ error[E0433]: failed to resolve. Use of undeclared type or module `HashMap` - --> $DIR/issue-31997-1.rs:30:19 + --> $DIR/issue-31997-1.rs:20:19 | LL | let mut map = HashMap::new(); | ^^^^^^^ Use of undeclared type or module `HashMap` diff --git a/src/test/ui/derived-errors/issue-31997.rs b/src/test/ui/derived-errors/issue-31997.rs index 2e1d3c55a8f4d..025e9100e2360 100644 --- a/src/test/ui/derived-errors/issue-31997.rs +++ b/src/test/ui/derived-errors/issue-31997.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the resolve failure does not lead to downstream type errors. // See issue #31997. diff --git a/src/test/ui/derived-errors/issue-31997.stderr b/src/test/ui/derived-errors/issue-31997.stderr index 25088e8654bca..246e6f6465cde 100644 --- a/src/test/ui/derived-errors/issue-31997.stderr +++ b/src/test/ui/derived-errors/issue-31997.stderr @@ -1,5 +1,5 @@ error[E0425]: cannot find function `bar` in this scope - --> $DIR/issue-31997.rs:23:21 + --> $DIR/issue-31997.rs:13:21 | LL | try!(closure(|| bar(0 as *mut _))); //~ ERROR cannot find function `bar` in this scope | ^^^ not found in this scope diff --git a/src/test/ui/derives/derive-assoc-type-not-impl.rs b/src/test/ui/derives/derive-assoc-type-not-impl.rs index 3799f2ffba440..0f642d63a1dcb 100644 --- a/src/test/ui/derives/derive-assoc-type-not-impl.rs +++ b/src/test/ui/derives/derive-assoc-type-not-impl.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { type X; fn method(&self) {} diff --git a/src/test/ui/derives/derive-assoc-type-not-impl.stderr b/src/test/ui/derives/derive-assoc-type-not-impl.stderr index c49e338766161..1b25231677c7d 100644 --- a/src/test/ui/derives/derive-assoc-type-not-impl.stderr +++ b/src/test/ui/derives/derive-assoc-type-not-impl.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `clone` found for type `Bar` in the current scope - --> $DIR/derive-assoc-type-not-impl.rs:28:30 + --> $DIR/derive-assoc-type-not-impl.rs:18:30 | LL | struct Bar { | ------------------ method `clone` not found for this diff --git a/src/test/ui/derives/derive-on-trait-item-or-impl-item.rs b/src/test/ui/derives/derive-on-trait-item-or-impl-item.rs index 9ff1c14f54c6e..2530e75111bfb 100644 --- a/src/test/ui/derives/derive-on-trait-item-or-impl-item.rs +++ b/src/test/ui/derives/derive-on-trait-item-or-impl-item.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { #[derive(Clone)] //~^ ERROR `derive` may only be applied to structs, enums and unions diff --git a/src/test/ui/derives/derive-on-trait-item-or-impl-item.stderr b/src/test/ui/derives/derive-on-trait-item-or-impl-item.stderr index 8246889b620be..dd7af8304147e 100644 --- a/src/test/ui/derives/derive-on-trait-item-or-impl-item.stderr +++ b/src/test/ui/derives/derive-on-trait-item-or-impl-item.stderr @@ -1,11 +1,11 @@ error: `derive` may only be applied to structs, enums and unions - --> $DIR/derive-on-trait-item-or-impl-item.rs:12:5 + --> $DIR/derive-on-trait-item-or-impl-item.rs:2:5 | LL | #[derive(Clone)] | ^^^^^^^^^^^^^^^^ error: `derive` may only be applied to structs, enums and unions - --> $DIR/derive-on-trait-item-or-impl-item.rs:18:5 + --> $DIR/derive-on-trait-item-or-impl-item.rs:8:5 | LL | #[derive(Clone)] | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/derives/derives-span-Clone-enum-struct-variant.rs b/src/test/ui/derives/derives-span-Clone-enum-struct-variant.rs index 244acbf660533..b556d442420e0 100644 --- a/src/test/ui/derives/derives-span-Clone-enum-struct-variant.rs +++ b/src/test/ui/derives/derives-span-Clone-enum-struct-variant.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file was auto-generated using 'src/etc/generate-deriving-span-tests.py' diff --git a/src/test/ui/derives/derives-span-Clone-enum-struct-variant.stderr b/src/test/ui/derives/derives-span-Clone-enum-struct-variant.stderr index fbe9d3f7d690b..deb1cbd89b87b 100644 --- a/src/test/ui/derives/derives-span-Clone-enum-struct-variant.stderr +++ b/src/test/ui/derives/derives-span-Clone-enum-struct-variant.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `Error: std::clone::Clone` is not satisfied - --> $DIR/derives-span-Clone-enum-struct-variant.rs:19:6 + --> $DIR/derives-span-Clone-enum-struct-variant.rs:9:6 | LL | x: Error //~ ERROR | ^^^^^^^^ the trait `std::clone::Clone` is not implemented for `Error` diff --git a/src/test/ui/derives/derives-span-Clone-enum.rs b/src/test/ui/derives/derives-span-Clone-enum.rs index 785a3d3543088..9bb4f486c3ef0 100644 --- a/src/test/ui/derives/derives-span-Clone-enum.rs +++ b/src/test/ui/derives/derives-span-Clone-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file was auto-generated using 'src/etc/generate-deriving-span-tests.py' diff --git a/src/test/ui/derives/derives-span-Clone-enum.stderr b/src/test/ui/derives/derives-span-Clone-enum.stderr index b5b3c8bfc8562..de043cd28aa68 100644 --- a/src/test/ui/derives/derives-span-Clone-enum.stderr +++ b/src/test/ui/derives/derives-span-Clone-enum.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `Error: std::clone::Clone` is not satisfied - --> $DIR/derives-span-Clone-enum.rs:19:6 + --> $DIR/derives-span-Clone-enum.rs:9:6 | LL | Error //~ ERROR | ^^^^^ the trait `std::clone::Clone` is not implemented for `Error` diff --git a/src/test/ui/derives/derives-span-Clone-struct.rs b/src/test/ui/derives/derives-span-Clone-struct.rs index b1b1dc7bed162..f151636f848a0 100644 --- a/src/test/ui/derives/derives-span-Clone-struct.rs +++ b/src/test/ui/derives/derives-span-Clone-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file was auto-generated using 'src/etc/generate-deriving-span-tests.py' diff --git a/src/test/ui/derives/derives-span-Clone-struct.stderr b/src/test/ui/derives/derives-span-Clone-struct.stderr index ebd1e666b38f9..dd6fa9706c2cf 100644 --- a/src/test/ui/derives/derives-span-Clone-struct.stderr +++ b/src/test/ui/derives/derives-span-Clone-struct.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `Error: std::clone::Clone` is not satisfied - --> $DIR/derives-span-Clone-struct.rs:18:5 + --> $DIR/derives-span-Clone-struct.rs:8:5 | LL | x: Error //~ ERROR | ^^^^^^^^ the trait `std::clone::Clone` is not implemented for `Error` diff --git a/src/test/ui/derives/derives-span-Clone-tuple-struct.rs b/src/test/ui/derives/derives-span-Clone-tuple-struct.rs index d56e21b9a8af2..7a62885324ebd 100644 --- a/src/test/ui/derives/derives-span-Clone-tuple-struct.rs +++ b/src/test/ui/derives/derives-span-Clone-tuple-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file was auto-generated using 'src/etc/generate-deriving-span-tests.py' diff --git a/src/test/ui/derives/derives-span-Clone-tuple-struct.stderr b/src/test/ui/derives/derives-span-Clone-tuple-struct.stderr index 6867baad2c1da..5258240fc1f38 100644 --- a/src/test/ui/derives/derives-span-Clone-tuple-struct.stderr +++ b/src/test/ui/derives/derives-span-Clone-tuple-struct.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `Error: std::clone::Clone` is not satisfied - --> $DIR/derives-span-Clone-tuple-struct.rs:18:5 + --> $DIR/derives-span-Clone-tuple-struct.rs:8:5 | LL | Error //~ ERROR | ^^^^^ the trait `std::clone::Clone` is not implemented for `Error` diff --git a/src/test/ui/derives/derives-span-Debug-enum-struct-variant.rs b/src/test/ui/derives/derives-span-Debug-enum-struct-variant.rs index 4c25e482c2a68..949597bc8f6ee 100644 --- a/src/test/ui/derives/derives-span-Debug-enum-struct-variant.rs +++ b/src/test/ui/derives/derives-span-Debug-enum-struct-variant.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file was auto-generated using 'src/etc/generate-deriving-span-tests.py' diff --git a/src/test/ui/derives/derives-span-Debug-enum-struct-variant.stderr b/src/test/ui/derives/derives-span-Debug-enum-struct-variant.stderr index f5939a2e937d9..c981c20b762e1 100644 --- a/src/test/ui/derives/derives-span-Debug-enum-struct-variant.stderr +++ b/src/test/ui/derives/derives-span-Debug-enum-struct-variant.stderr @@ -1,5 +1,5 @@ error[E0277]: `Error` doesn't implement `std::fmt::Debug` - --> $DIR/derives-span-Debug-enum-struct-variant.rs:19:6 + --> $DIR/derives-span-Debug-enum-struct-variant.rs:9:6 | LL | x: Error //~ ERROR | ^^^^^^^^ `Error` cannot be formatted using `{:?}` diff --git a/src/test/ui/derives/derives-span-Debug-enum.rs b/src/test/ui/derives/derives-span-Debug-enum.rs index 0cb02aa54e69d..b2a39708ceb9a 100644 --- a/src/test/ui/derives/derives-span-Debug-enum.rs +++ b/src/test/ui/derives/derives-span-Debug-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file was auto-generated using 'src/etc/generate-deriving-span-tests.py' diff --git a/src/test/ui/derives/derives-span-Debug-enum.stderr b/src/test/ui/derives/derives-span-Debug-enum.stderr index 566a5786de7a5..02cfe20616cd6 100644 --- a/src/test/ui/derives/derives-span-Debug-enum.stderr +++ b/src/test/ui/derives/derives-span-Debug-enum.stderr @@ -1,5 +1,5 @@ error[E0277]: `Error` doesn't implement `std::fmt::Debug` - --> $DIR/derives-span-Debug-enum.rs:19:6 + --> $DIR/derives-span-Debug-enum.rs:9:6 | LL | Error //~ ERROR | ^^^^^ `Error` cannot be formatted using `{:?}` diff --git a/src/test/ui/derives/derives-span-Debug-struct.rs b/src/test/ui/derives/derives-span-Debug-struct.rs index 33fa82355ec67..cf91c9436a623 100644 --- a/src/test/ui/derives/derives-span-Debug-struct.rs +++ b/src/test/ui/derives/derives-span-Debug-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file was auto-generated using 'src/etc/generate-deriving-span-tests.py' diff --git a/src/test/ui/derives/derives-span-Debug-struct.stderr b/src/test/ui/derives/derives-span-Debug-struct.stderr index 30145a78a26a4..5fe7d846b4c2f 100644 --- a/src/test/ui/derives/derives-span-Debug-struct.stderr +++ b/src/test/ui/derives/derives-span-Debug-struct.stderr @@ -1,5 +1,5 @@ error[E0277]: `Error` doesn't implement `std::fmt::Debug` - --> $DIR/derives-span-Debug-struct.rs:18:5 + --> $DIR/derives-span-Debug-struct.rs:8:5 | LL | x: Error //~ ERROR | ^^^^^^^^ `Error` cannot be formatted using `{:?}` diff --git a/src/test/ui/derives/derives-span-Debug-tuple-struct.rs b/src/test/ui/derives/derives-span-Debug-tuple-struct.rs index 760ed199f6abd..cea973c91a783 100644 --- a/src/test/ui/derives/derives-span-Debug-tuple-struct.rs +++ b/src/test/ui/derives/derives-span-Debug-tuple-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file was auto-generated using 'src/etc/generate-deriving-span-tests.py' diff --git a/src/test/ui/derives/derives-span-Debug-tuple-struct.stderr b/src/test/ui/derives/derives-span-Debug-tuple-struct.stderr index 963fc8a38f072..9088b9e83b0cb 100644 --- a/src/test/ui/derives/derives-span-Debug-tuple-struct.stderr +++ b/src/test/ui/derives/derives-span-Debug-tuple-struct.stderr @@ -1,5 +1,5 @@ error[E0277]: `Error` doesn't implement `std::fmt::Debug` - --> $DIR/derives-span-Debug-tuple-struct.rs:18:5 + --> $DIR/derives-span-Debug-tuple-struct.rs:8:5 | LL | Error //~ ERROR | ^^^^^ `Error` cannot be formatted using `{:?}` diff --git a/src/test/ui/derives/derives-span-Default-struct.rs b/src/test/ui/derives/derives-span-Default-struct.rs index 4adfe75adaf91..71fd5829e7585 100644 --- a/src/test/ui/derives/derives-span-Default-struct.rs +++ b/src/test/ui/derives/derives-span-Default-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file was auto-generated using 'src/etc/generate-deriving-span-tests.py' diff --git a/src/test/ui/derives/derives-span-Default-struct.stderr b/src/test/ui/derives/derives-span-Default-struct.stderr index a9634e64fa991..1ad7cd4547731 100644 --- a/src/test/ui/derives/derives-span-Default-struct.stderr +++ b/src/test/ui/derives/derives-span-Default-struct.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `Error: std::default::Default` is not satisfied - --> $DIR/derives-span-Default-struct.rs:18:5 + --> $DIR/derives-span-Default-struct.rs:8:5 | LL | x: Error //~ ERROR | ^^^^^^^^ the trait `std::default::Default` is not implemented for `Error` diff --git a/src/test/ui/derives/derives-span-Default-tuple-struct.rs b/src/test/ui/derives/derives-span-Default-tuple-struct.rs index a5e3a7cd49f81..463f7d230ca41 100644 --- a/src/test/ui/derives/derives-span-Default-tuple-struct.rs +++ b/src/test/ui/derives/derives-span-Default-tuple-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file was auto-generated using 'src/etc/generate-deriving-span-tests.py' diff --git a/src/test/ui/derives/derives-span-Default-tuple-struct.stderr b/src/test/ui/derives/derives-span-Default-tuple-struct.stderr index eb0ef61a57d33..447bc73ceb403 100644 --- a/src/test/ui/derives/derives-span-Default-tuple-struct.stderr +++ b/src/test/ui/derives/derives-span-Default-tuple-struct.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `Error: std::default::Default` is not satisfied - --> $DIR/derives-span-Default-tuple-struct.rs:18:5 + --> $DIR/derives-span-Default-tuple-struct.rs:8:5 | LL | Error //~ ERROR | ^^^^^ the trait `std::default::Default` is not implemented for `Error` diff --git a/src/test/ui/derives/derives-span-Eq-enum-struct-variant.rs b/src/test/ui/derives/derives-span-Eq-enum-struct-variant.rs index 6abd1d31e6615..d2dab8687f774 100644 --- a/src/test/ui/derives/derives-span-Eq-enum-struct-variant.rs +++ b/src/test/ui/derives/derives-span-Eq-enum-struct-variant.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file was auto-generated using 'src/etc/generate-deriving-span-tests.py' #[derive(PartialEq)] diff --git a/src/test/ui/derives/derives-span-Eq-enum-struct-variant.stderr b/src/test/ui/derives/derives-span-Eq-enum-struct-variant.stderr index b230c0140929f..e8bcec4665500 100644 --- a/src/test/ui/derives/derives-span-Eq-enum-struct-variant.stderr +++ b/src/test/ui/derives/derives-span-Eq-enum-struct-variant.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `Error: std::cmp::Eq` is not satisfied - --> $DIR/derives-span-Eq-enum-struct-variant.rs:19:6 + --> $DIR/derives-span-Eq-enum-struct-variant.rs:9:6 | LL | x: Error //~ ERROR | ^^^^^^^^ the trait `std::cmp::Eq` is not implemented for `Error` diff --git a/src/test/ui/derives/derives-span-Eq-enum.rs b/src/test/ui/derives/derives-span-Eq-enum.rs index f361278a620f4..c6c0d4321083b 100644 --- a/src/test/ui/derives/derives-span-Eq-enum.rs +++ b/src/test/ui/derives/derives-span-Eq-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file was auto-generated using 'src/etc/generate-deriving-span-tests.py' #[derive(PartialEq)] diff --git a/src/test/ui/derives/derives-span-Eq-enum.stderr b/src/test/ui/derives/derives-span-Eq-enum.stderr index 7f6d27a311d16..95ff08a4332c5 100644 --- a/src/test/ui/derives/derives-span-Eq-enum.stderr +++ b/src/test/ui/derives/derives-span-Eq-enum.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `Error: std::cmp::Eq` is not satisfied - --> $DIR/derives-span-Eq-enum.rs:19:6 + --> $DIR/derives-span-Eq-enum.rs:9:6 | LL | Error //~ ERROR | ^^^^^ the trait `std::cmp::Eq` is not implemented for `Error` diff --git a/src/test/ui/derives/derives-span-Eq-struct.rs b/src/test/ui/derives/derives-span-Eq-struct.rs index 7067caa6d5cca..df310039847d4 100644 --- a/src/test/ui/derives/derives-span-Eq-struct.rs +++ b/src/test/ui/derives/derives-span-Eq-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file was auto-generated using 'src/etc/generate-deriving-span-tests.py' #[derive(PartialEq)] diff --git a/src/test/ui/derives/derives-span-Eq-struct.stderr b/src/test/ui/derives/derives-span-Eq-struct.stderr index a9db04019592f..44bbcf73dd778 100644 --- a/src/test/ui/derives/derives-span-Eq-struct.stderr +++ b/src/test/ui/derives/derives-span-Eq-struct.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `Error: std::cmp::Eq` is not satisfied - --> $DIR/derives-span-Eq-struct.rs:18:5 + --> $DIR/derives-span-Eq-struct.rs:8:5 | LL | x: Error //~ ERROR | ^^^^^^^^ the trait `std::cmp::Eq` is not implemented for `Error` diff --git a/src/test/ui/derives/derives-span-Eq-tuple-struct.rs b/src/test/ui/derives/derives-span-Eq-tuple-struct.rs index 1a09628b77091..abf6526b90078 100644 --- a/src/test/ui/derives/derives-span-Eq-tuple-struct.rs +++ b/src/test/ui/derives/derives-span-Eq-tuple-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file was auto-generated using 'src/etc/generate-deriving-span-tests.py' #[derive(PartialEq)] diff --git a/src/test/ui/derives/derives-span-Eq-tuple-struct.stderr b/src/test/ui/derives/derives-span-Eq-tuple-struct.stderr index 70f39f30eedad..26228b3891312 100644 --- a/src/test/ui/derives/derives-span-Eq-tuple-struct.stderr +++ b/src/test/ui/derives/derives-span-Eq-tuple-struct.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `Error: std::cmp::Eq` is not satisfied - --> $DIR/derives-span-Eq-tuple-struct.rs:18:5 + --> $DIR/derives-span-Eq-tuple-struct.rs:8:5 | LL | Error //~ ERROR | ^^^^^ the trait `std::cmp::Eq` is not implemented for `Error` diff --git a/src/test/ui/derives/derives-span-Hash-enum-struct-variant.rs b/src/test/ui/derives/derives-span-Hash-enum-struct-variant.rs index 907045cce47d5..3018a7b6d03ee 100644 --- a/src/test/ui/derives/derives-span-Hash-enum-struct-variant.rs +++ b/src/test/ui/derives/derives-span-Hash-enum-struct-variant.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file was auto-generated using 'src/etc/generate-deriving-span-tests.py' diff --git a/src/test/ui/derives/derives-span-Hash-enum-struct-variant.stderr b/src/test/ui/derives/derives-span-Hash-enum-struct-variant.stderr index bde7556f7ce25..324f2f1fd6d1c 100644 --- a/src/test/ui/derives/derives-span-Hash-enum-struct-variant.stderr +++ b/src/test/ui/derives/derives-span-Hash-enum-struct-variant.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `Error: std::hash::Hash` is not satisfied - --> $DIR/derives-span-Hash-enum-struct-variant.rs:19:6 + --> $DIR/derives-span-Hash-enum-struct-variant.rs:9:6 | LL | x: Error //~ ERROR | ^^^^^^^^ the trait `std::hash::Hash` is not implemented for `Error` diff --git a/src/test/ui/derives/derives-span-Hash-enum.rs b/src/test/ui/derives/derives-span-Hash-enum.rs index 321b9e71a0f29..bb656e5c2fe3c 100644 --- a/src/test/ui/derives/derives-span-Hash-enum.rs +++ b/src/test/ui/derives/derives-span-Hash-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file was auto-generated using 'src/etc/generate-deriving-span-tests.py' diff --git a/src/test/ui/derives/derives-span-Hash-enum.stderr b/src/test/ui/derives/derives-span-Hash-enum.stderr index 72b8f3ada0228..da44a8f498ea4 100644 --- a/src/test/ui/derives/derives-span-Hash-enum.stderr +++ b/src/test/ui/derives/derives-span-Hash-enum.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `Error: std::hash::Hash` is not satisfied - --> $DIR/derives-span-Hash-enum.rs:19:6 + --> $DIR/derives-span-Hash-enum.rs:9:6 | LL | Error //~ ERROR | ^^^^^ the trait `std::hash::Hash` is not implemented for `Error` diff --git a/src/test/ui/derives/derives-span-Hash-struct.rs b/src/test/ui/derives/derives-span-Hash-struct.rs index 7f69c3a8e2565..fa5e2af6be870 100644 --- a/src/test/ui/derives/derives-span-Hash-struct.rs +++ b/src/test/ui/derives/derives-span-Hash-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file was auto-generated using 'src/etc/generate-deriving-span-tests.py' diff --git a/src/test/ui/derives/derives-span-Hash-struct.stderr b/src/test/ui/derives/derives-span-Hash-struct.stderr index 3068bcfe0a0bf..17d45e4b0dd21 100644 --- a/src/test/ui/derives/derives-span-Hash-struct.stderr +++ b/src/test/ui/derives/derives-span-Hash-struct.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `Error: std::hash::Hash` is not satisfied - --> $DIR/derives-span-Hash-struct.rs:18:5 + --> $DIR/derives-span-Hash-struct.rs:8:5 | LL | x: Error //~ ERROR | ^^^^^^^^ the trait `std::hash::Hash` is not implemented for `Error` diff --git a/src/test/ui/derives/derives-span-Hash-tuple-struct.rs b/src/test/ui/derives/derives-span-Hash-tuple-struct.rs index 2dee63c4298d0..3822bce1466ea 100644 --- a/src/test/ui/derives/derives-span-Hash-tuple-struct.rs +++ b/src/test/ui/derives/derives-span-Hash-tuple-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file was auto-generated using 'src/etc/generate-deriving-span-tests.py' diff --git a/src/test/ui/derives/derives-span-Hash-tuple-struct.stderr b/src/test/ui/derives/derives-span-Hash-tuple-struct.stderr index a65fbd8b6e6d9..e0e5cce107f92 100644 --- a/src/test/ui/derives/derives-span-Hash-tuple-struct.stderr +++ b/src/test/ui/derives/derives-span-Hash-tuple-struct.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `Error: std::hash::Hash` is not satisfied - --> $DIR/derives-span-Hash-tuple-struct.rs:18:5 + --> $DIR/derives-span-Hash-tuple-struct.rs:8:5 | LL | Error //~ ERROR | ^^^^^ the trait `std::hash::Hash` is not implemented for `Error` diff --git a/src/test/ui/derives/derives-span-Ord-enum-struct-variant.rs b/src/test/ui/derives/derives-span-Ord-enum-struct-variant.rs index 8f4e393c96a41..62355cc2d9619 100644 --- a/src/test/ui/derives/derives-span-Ord-enum-struct-variant.rs +++ b/src/test/ui/derives/derives-span-Ord-enum-struct-variant.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file was auto-generated using 'src/etc/generate-deriving-span-tests.py' #[derive(Eq,PartialOrd,PartialEq)] diff --git a/src/test/ui/derives/derives-span-Ord-enum-struct-variant.stderr b/src/test/ui/derives/derives-span-Ord-enum-struct-variant.stderr index 5968efd5ca1ea..149a9475f103d 100644 --- a/src/test/ui/derives/derives-span-Ord-enum-struct-variant.stderr +++ b/src/test/ui/derives/derives-span-Ord-enum-struct-variant.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `Error: std::cmp::Ord` is not satisfied - --> $DIR/derives-span-Ord-enum-struct-variant.rs:19:6 + --> $DIR/derives-span-Ord-enum-struct-variant.rs:9:6 | LL | x: Error //~ ERROR | ^^^^^^^^ the trait `std::cmp::Ord` is not implemented for `Error` diff --git a/src/test/ui/derives/derives-span-Ord-enum.rs b/src/test/ui/derives/derives-span-Ord-enum.rs index b8ceacf3753ef..72738931d10f2 100644 --- a/src/test/ui/derives/derives-span-Ord-enum.rs +++ b/src/test/ui/derives/derives-span-Ord-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file was auto-generated using 'src/etc/generate-deriving-span-tests.py' #[derive(Eq,PartialOrd,PartialEq)] diff --git a/src/test/ui/derives/derives-span-Ord-enum.stderr b/src/test/ui/derives/derives-span-Ord-enum.stderr index 074a8f84cec24..17ab75549e466 100644 --- a/src/test/ui/derives/derives-span-Ord-enum.stderr +++ b/src/test/ui/derives/derives-span-Ord-enum.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `Error: std::cmp::Ord` is not satisfied - --> $DIR/derives-span-Ord-enum.rs:19:6 + --> $DIR/derives-span-Ord-enum.rs:9:6 | LL | Error //~ ERROR | ^^^^^ the trait `std::cmp::Ord` is not implemented for `Error` diff --git a/src/test/ui/derives/derives-span-Ord-struct.rs b/src/test/ui/derives/derives-span-Ord-struct.rs index 2ff62bac2bce1..53d4c2c22b55f 100644 --- a/src/test/ui/derives/derives-span-Ord-struct.rs +++ b/src/test/ui/derives/derives-span-Ord-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file was auto-generated using 'src/etc/generate-deriving-span-tests.py' #[derive(Eq,PartialOrd,PartialEq)] diff --git a/src/test/ui/derives/derives-span-Ord-struct.stderr b/src/test/ui/derives/derives-span-Ord-struct.stderr index 2e584e6ca8752..7088f8fc89018 100644 --- a/src/test/ui/derives/derives-span-Ord-struct.stderr +++ b/src/test/ui/derives/derives-span-Ord-struct.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `Error: std::cmp::Ord` is not satisfied - --> $DIR/derives-span-Ord-struct.rs:18:5 + --> $DIR/derives-span-Ord-struct.rs:8:5 | LL | x: Error //~ ERROR | ^^^^^^^^ the trait `std::cmp::Ord` is not implemented for `Error` diff --git a/src/test/ui/derives/derives-span-Ord-tuple-struct.rs b/src/test/ui/derives/derives-span-Ord-tuple-struct.rs index 24eacb71d7b4a..4e09c27098641 100644 --- a/src/test/ui/derives/derives-span-Ord-tuple-struct.rs +++ b/src/test/ui/derives/derives-span-Ord-tuple-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file was auto-generated using 'src/etc/generate-deriving-span-tests.py' #[derive(Eq,PartialOrd,PartialEq)] diff --git a/src/test/ui/derives/derives-span-Ord-tuple-struct.stderr b/src/test/ui/derives/derives-span-Ord-tuple-struct.stderr index 0da452f0a6a57..5c046366993fc 100644 --- a/src/test/ui/derives/derives-span-Ord-tuple-struct.stderr +++ b/src/test/ui/derives/derives-span-Ord-tuple-struct.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `Error: std::cmp::Ord` is not satisfied - --> $DIR/derives-span-Ord-tuple-struct.rs:18:5 + --> $DIR/derives-span-Ord-tuple-struct.rs:8:5 | LL | Error //~ ERROR | ^^^^^ the trait `std::cmp::Ord` is not implemented for `Error` diff --git a/src/test/ui/derives/derives-span-PartialEq-enum-struct-variant.rs b/src/test/ui/derives/derives-span-PartialEq-enum-struct-variant.rs index 14d94f1599e5f..d66faa086dec7 100644 --- a/src/test/ui/derives/derives-span-PartialEq-enum-struct-variant.rs +++ b/src/test/ui/derives/derives-span-PartialEq-enum-struct-variant.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file was auto-generated using 'src/etc/generate-deriving-span-tests.py' diff --git a/src/test/ui/derives/derives-span-PartialEq-enum-struct-variant.stderr b/src/test/ui/derives/derives-span-PartialEq-enum-struct-variant.stderr index cad446f832614..7683402d8aaa1 100644 --- a/src/test/ui/derives/derives-span-PartialEq-enum-struct-variant.stderr +++ b/src/test/ui/derives/derives-span-PartialEq-enum-struct-variant.stderr @@ -1,5 +1,5 @@ error[E0369]: binary operation `==` cannot be applied to type `Error` - --> $DIR/derives-span-PartialEq-enum-struct-variant.rs:19:6 + --> $DIR/derives-span-PartialEq-enum-struct-variant.rs:9:6 | LL | x: Error //~ ERROR | ^^^^^^^^ @@ -7,7 +7,7 @@ LL | x: Error //~ ERROR = note: an implementation of `std::cmp::PartialEq` might be missing for `Error` error[E0369]: binary operation `!=` cannot be applied to type `Error` - --> $DIR/derives-span-PartialEq-enum-struct-variant.rs:19:6 + --> $DIR/derives-span-PartialEq-enum-struct-variant.rs:9:6 | LL | x: Error //~ ERROR | ^^^^^^^^ diff --git a/src/test/ui/derives/derives-span-PartialEq-enum.rs b/src/test/ui/derives/derives-span-PartialEq-enum.rs index ab58bb938b9dd..66edf460b312a 100644 --- a/src/test/ui/derives/derives-span-PartialEq-enum.rs +++ b/src/test/ui/derives/derives-span-PartialEq-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file was auto-generated using 'src/etc/generate-deriving-span-tests.py' diff --git a/src/test/ui/derives/derives-span-PartialEq-enum.stderr b/src/test/ui/derives/derives-span-PartialEq-enum.stderr index e75d0693db526..9fa1a2bf17a69 100644 --- a/src/test/ui/derives/derives-span-PartialEq-enum.stderr +++ b/src/test/ui/derives/derives-span-PartialEq-enum.stderr @@ -1,5 +1,5 @@ error[E0369]: binary operation `==` cannot be applied to type `Error` - --> $DIR/derives-span-PartialEq-enum.rs:19:6 + --> $DIR/derives-span-PartialEq-enum.rs:9:6 | LL | Error //~ ERROR | ^^^^^ @@ -7,7 +7,7 @@ LL | Error //~ ERROR = note: an implementation of `std::cmp::PartialEq` might be missing for `Error` error[E0369]: binary operation `!=` cannot be applied to type `Error` - --> $DIR/derives-span-PartialEq-enum.rs:19:6 + --> $DIR/derives-span-PartialEq-enum.rs:9:6 | LL | Error //~ ERROR | ^^^^^ diff --git a/src/test/ui/derives/derives-span-PartialEq-struct.rs b/src/test/ui/derives/derives-span-PartialEq-struct.rs index 05a0990ff035a..ce5c67af77f05 100644 --- a/src/test/ui/derives/derives-span-PartialEq-struct.rs +++ b/src/test/ui/derives/derives-span-PartialEq-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file was auto-generated using 'src/etc/generate-deriving-span-tests.py' diff --git a/src/test/ui/derives/derives-span-PartialEq-struct.stderr b/src/test/ui/derives/derives-span-PartialEq-struct.stderr index c8cd509a824e1..4a08c985b4a06 100644 --- a/src/test/ui/derives/derives-span-PartialEq-struct.stderr +++ b/src/test/ui/derives/derives-span-PartialEq-struct.stderr @@ -1,5 +1,5 @@ error[E0369]: binary operation `==` cannot be applied to type `Error` - --> $DIR/derives-span-PartialEq-struct.rs:18:5 + --> $DIR/derives-span-PartialEq-struct.rs:8:5 | LL | x: Error //~ ERROR | ^^^^^^^^ @@ -7,7 +7,7 @@ LL | x: Error //~ ERROR = note: an implementation of `std::cmp::PartialEq` might be missing for `Error` error[E0369]: binary operation `!=` cannot be applied to type `Error` - --> $DIR/derives-span-PartialEq-struct.rs:18:5 + --> $DIR/derives-span-PartialEq-struct.rs:8:5 | LL | x: Error //~ ERROR | ^^^^^^^^ diff --git a/src/test/ui/derives/derives-span-PartialEq-tuple-struct.rs b/src/test/ui/derives/derives-span-PartialEq-tuple-struct.rs index cdeb7ce45bc4c..eaa628311361c 100644 --- a/src/test/ui/derives/derives-span-PartialEq-tuple-struct.rs +++ b/src/test/ui/derives/derives-span-PartialEq-tuple-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file was auto-generated using 'src/etc/generate-deriving-span-tests.py' diff --git a/src/test/ui/derives/derives-span-PartialEq-tuple-struct.stderr b/src/test/ui/derives/derives-span-PartialEq-tuple-struct.stderr index b66189fb567e6..850eab4f0880e 100644 --- a/src/test/ui/derives/derives-span-PartialEq-tuple-struct.stderr +++ b/src/test/ui/derives/derives-span-PartialEq-tuple-struct.stderr @@ -1,5 +1,5 @@ error[E0369]: binary operation `==` cannot be applied to type `Error` - --> $DIR/derives-span-PartialEq-tuple-struct.rs:18:5 + --> $DIR/derives-span-PartialEq-tuple-struct.rs:8:5 | LL | Error //~ ERROR | ^^^^^ @@ -7,7 +7,7 @@ LL | Error //~ ERROR = note: an implementation of `std::cmp::PartialEq` might be missing for `Error` error[E0369]: binary operation `!=` cannot be applied to type `Error` - --> $DIR/derives-span-PartialEq-tuple-struct.rs:18:5 + --> $DIR/derives-span-PartialEq-tuple-struct.rs:8:5 | LL | Error //~ ERROR | ^^^^^ diff --git a/src/test/ui/derives/derives-span-PartialOrd-enum-struct-variant.rs b/src/test/ui/derives/derives-span-PartialOrd-enum-struct-variant.rs index a5df717e06ba9..0bc6f98d9825b 100644 --- a/src/test/ui/derives/derives-span-PartialOrd-enum-struct-variant.rs +++ b/src/test/ui/derives/derives-span-PartialOrd-enum-struct-variant.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file was auto-generated using 'src/etc/generate-deriving-span-tests.py' #[derive(PartialEq)] diff --git a/src/test/ui/derives/derives-span-PartialOrd-enum-struct-variant.stderr b/src/test/ui/derives/derives-span-PartialOrd-enum-struct-variant.stderr index 7e55ba70c13ad..0c359629d7892 100644 --- a/src/test/ui/derives/derives-span-PartialOrd-enum-struct-variant.stderr +++ b/src/test/ui/derives/derives-span-PartialOrd-enum-struct-variant.stderr @@ -1,5 +1,5 @@ error[E0277]: can't compare `Error` with `Error` - --> $DIR/derives-span-PartialOrd-enum-struct-variant.rs:19:6 + --> $DIR/derives-span-PartialOrd-enum-struct-variant.rs:9:6 | LL | x: Error //~ ERROR | ^^^^^^^^ no implementation for `Error < Error` and `Error > Error` diff --git a/src/test/ui/derives/derives-span-PartialOrd-enum.rs b/src/test/ui/derives/derives-span-PartialOrd-enum.rs index 3411d2f3119ec..ee4423f3bee7a 100644 --- a/src/test/ui/derives/derives-span-PartialOrd-enum.rs +++ b/src/test/ui/derives/derives-span-PartialOrd-enum.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file was auto-generated using 'src/etc/generate-deriving-span-tests.py' #[derive(PartialEq)] diff --git a/src/test/ui/derives/derives-span-PartialOrd-enum.stderr b/src/test/ui/derives/derives-span-PartialOrd-enum.stderr index d8b3bd9f1bc3d..e4036a540db2a 100644 --- a/src/test/ui/derives/derives-span-PartialOrd-enum.stderr +++ b/src/test/ui/derives/derives-span-PartialOrd-enum.stderr @@ -1,5 +1,5 @@ error[E0277]: can't compare `Error` with `Error` - --> $DIR/derives-span-PartialOrd-enum.rs:19:6 + --> $DIR/derives-span-PartialOrd-enum.rs:9:6 | LL | Error //~ ERROR | ^^^^^ no implementation for `Error < Error` and `Error > Error` diff --git a/src/test/ui/derives/derives-span-PartialOrd-struct.rs b/src/test/ui/derives/derives-span-PartialOrd-struct.rs index 1feadc2fd83b5..48435e0cd45a5 100644 --- a/src/test/ui/derives/derives-span-PartialOrd-struct.rs +++ b/src/test/ui/derives/derives-span-PartialOrd-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file was auto-generated using 'src/etc/generate-deriving-span-tests.py' #[derive(PartialEq)] diff --git a/src/test/ui/derives/derives-span-PartialOrd-struct.stderr b/src/test/ui/derives/derives-span-PartialOrd-struct.stderr index afd93dce62537..5c77a05e9d047 100644 --- a/src/test/ui/derives/derives-span-PartialOrd-struct.stderr +++ b/src/test/ui/derives/derives-span-PartialOrd-struct.stderr @@ -1,5 +1,5 @@ error[E0277]: can't compare `Error` with `Error` - --> $DIR/derives-span-PartialOrd-struct.rs:18:5 + --> $DIR/derives-span-PartialOrd-struct.rs:8:5 | LL | x: Error //~ ERROR | ^^^^^^^^ no implementation for `Error < Error` and `Error > Error` diff --git a/src/test/ui/derives/derives-span-PartialOrd-tuple-struct.rs b/src/test/ui/derives/derives-span-PartialOrd-tuple-struct.rs index 9db0fed2d9e9d..2aa412e6d1d8f 100644 --- a/src/test/ui/derives/derives-span-PartialOrd-tuple-struct.rs +++ b/src/test/ui/derives/derives-span-PartialOrd-tuple-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file was auto-generated using 'src/etc/generate-deriving-span-tests.py' #[derive(PartialEq)] diff --git a/src/test/ui/derives/derives-span-PartialOrd-tuple-struct.stderr b/src/test/ui/derives/derives-span-PartialOrd-tuple-struct.stderr index a65ee40f2201b..e38a0424b3d74 100644 --- a/src/test/ui/derives/derives-span-PartialOrd-tuple-struct.stderr +++ b/src/test/ui/derives/derives-span-PartialOrd-tuple-struct.stderr @@ -1,5 +1,5 @@ error[E0277]: can't compare `Error` with `Error` - --> $DIR/derives-span-PartialOrd-tuple-struct.rs:18:5 + --> $DIR/derives-span-PartialOrd-tuple-struct.rs:8:5 | LL | Error //~ ERROR | ^^^^^ no implementation for `Error < Error` and `Error > Error` diff --git a/src/test/ui/derives/deriving-bounds.rs b/src/test/ui/derives/deriving-bounds.rs index 72d06274de471..607cfa1bb2cd7 100644 --- a/src/test/ui/derives/deriving-bounds.rs +++ b/src/test/ui/derives/deriving-bounds.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Send)] //~^ ERROR this unsafe trait should be implemented explicitly struct Test; diff --git a/src/test/ui/derives/deriving-bounds.stderr b/src/test/ui/derives/deriving-bounds.stderr index 2c42fd1b672c9..deb84fd99bd2a 100644 --- a/src/test/ui/derives/deriving-bounds.stderr +++ b/src/test/ui/derives/deriving-bounds.stderr @@ -1,11 +1,11 @@ error: this unsafe trait should be implemented explicitly - --> $DIR/deriving-bounds.rs:11:10 + --> $DIR/deriving-bounds.rs:1:10 | LL | #[derive(Send)] | ^^^^ error: this unsafe trait should be implemented explicitly - --> $DIR/deriving-bounds.rs:15:10 + --> $DIR/deriving-bounds.rs:5:10 | LL | #[derive(Sync)] | ^^^^ diff --git a/src/test/ui/derives/deriving-copyclone.rs b/src/test/ui/derives/deriving-copyclone.rs index 92fb7c5737a92..afe619690711f 100644 --- a/src/test/ui/derives/deriving-copyclone.rs +++ b/src/test/ui/derives/deriving-copyclone.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // this will get a no-op Clone impl #[derive(Copy, Clone)] struct A { diff --git a/src/test/ui/derives/deriving-copyclone.stderr b/src/test/ui/derives/deriving-copyclone.stderr index 2d0dc6649e733..0a9fdd34fe2e0 100644 --- a/src/test/ui/derives/deriving-copyclone.stderr +++ b/src/test/ui/derives/deriving-copyclone.stderr @@ -1,38 +1,38 @@ error[E0277]: the trait bound `C: std::marker::Copy` is not satisfied - --> $DIR/deriving-copyclone.rs:41:5 + --> $DIR/deriving-copyclone.rs:31:5 | LL | is_copy(B { a: 1, b: C }); //~ERROR Copy | ^^^^^^^ the trait `std::marker::Copy` is not implemented for `C` | = note: required because of the requirements on the impl of `std::marker::Copy` for `B` note: required by `is_copy` - --> $DIR/deriving-copyclone.rs:28:1 + --> $DIR/deriving-copyclone.rs:18:1 | LL | fn is_copy(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `C: std::clone::Clone` is not satisfied - --> $DIR/deriving-copyclone.rs:42:5 + --> $DIR/deriving-copyclone.rs:32:5 | LL | is_clone(B { a: 1, b: C }); //~ERROR Clone | ^^^^^^^^ the trait `std::clone::Clone` is not implemented for `C` | = note: required because of the requirements on the impl of `std::clone::Clone` for `B` note: required by `is_clone` - --> $DIR/deriving-copyclone.rs:29:1 + --> $DIR/deriving-copyclone.rs:19:1 | LL | fn is_clone(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: the trait bound `D: std::marker::Copy` is not satisfied - --> $DIR/deriving-copyclone.rs:45:5 + --> $DIR/deriving-copyclone.rs:35:5 | LL | is_copy(B { a: 1, b: D }); //~ERROR Copy | ^^^^^^^ the trait `std::marker::Copy` is not implemented for `D` | = note: required because of the requirements on the impl of `std::marker::Copy` for `B` note: required by `is_copy` - --> $DIR/deriving-copyclone.rs:28:1 + --> $DIR/deriving-copyclone.rs:18:1 | LL | fn is_copy(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/derives/deriving-meta-empty-trait-list.rs b/src/test/ui/derives/deriving-meta-empty-trait-list.rs index cf4dfb947f419..98da6d23245c7 100644 --- a/src/test/ui/derives/deriving-meta-empty-trait-list.rs +++ b/src/test/ui/derives/deriving-meta-empty-trait-list.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass #![allow(dead_code)] diff --git a/src/test/ui/derives/deriving-meta-empty-trait-list.stderr b/src/test/ui/derives/deriving-meta-empty-trait-list.stderr index f5532f7c56119..dbc2387960fdc 100644 --- a/src/test/ui/derives/deriving-meta-empty-trait-list.stderr +++ b/src/test/ui/derives/deriving-meta-empty-trait-list.stderr @@ -1,11 +1,11 @@ warning: empty trait list in `derive` - --> $DIR/deriving-meta-empty-trait-list.rs:15:1 + --> $DIR/deriving-meta-empty-trait-list.rs:5:1 | LL | #[derive] //~ WARNING empty trait list in `derive` | ^^^^^^^^^ warning: empty trait list in `derive` - --> $DIR/deriving-meta-empty-trait-list.rs:18:1 + --> $DIR/deriving-meta-empty-trait-list.rs:8:1 | LL | #[derive()] //~ WARNING empty trait list in `derive` | ^^^^^^^^^^^ diff --git a/src/test/ui/derives/deriving-meta-unknown-trait.rs b/src/test/ui/derives/deriving-meta-unknown-trait.rs index d388ece084417..2b29f10150b96 100644 --- a/src/test/ui/derives/deriving-meta-unknown-trait.rs +++ b/src/test/ui/derives/deriving-meta-unknown-trait.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength #[derive(Eqr)] diff --git a/src/test/ui/derives/deriving-meta-unknown-trait.stderr b/src/test/ui/derives/deriving-meta-unknown-trait.stderr index aa0f1e21213c6..2b121ac679ae0 100644 --- a/src/test/ui/derives/deriving-meta-unknown-trait.stderr +++ b/src/test/ui/derives/deriving-meta-unknown-trait.stderr @@ -1,5 +1,5 @@ error: cannot find derive macro `Eqr` in this scope - --> $DIR/deriving-meta-unknown-trait.rs:13:10 + --> $DIR/deriving-meta-unknown-trait.rs:3:10 | LL | #[derive(Eqr)] | ^^^ help: try: `Eq` diff --git a/src/test/ui/derives/deriving-no-inner-impl-error-message.rs b/src/test/ui/derives/deriving-no-inner-impl-error-message.rs index 129c859b91954..d3ac5d2fe2f05 100644 --- a/src/test/ui/derives/deriving-no-inner-impl-error-message.rs +++ b/src/test/ui/derives/deriving-no-inner-impl-error-message.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct NoCloneOrEq; #[derive(PartialEq)] diff --git a/src/test/ui/derives/deriving-no-inner-impl-error-message.stderr b/src/test/ui/derives/deriving-no-inner-impl-error-message.stderr index 48d27ae147464..02ea6321eb8fc 100644 --- a/src/test/ui/derives/deriving-no-inner-impl-error-message.stderr +++ b/src/test/ui/derives/deriving-no-inner-impl-error-message.stderr @@ -1,5 +1,5 @@ error[E0369]: binary operation `==` cannot be applied to type `NoCloneOrEq` - --> $DIR/deriving-no-inner-impl-error-message.rs:15:5 + --> $DIR/deriving-no-inner-impl-error-message.rs:5:5 | LL | x: NoCloneOrEq //~ ERROR binary operation `==` cannot be applied to type `NoCloneOrEq` | ^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | x: NoCloneOrEq //~ ERROR binary operation `==` cannot be applied to typ = note: an implementation of `std::cmp::PartialEq` might be missing for `NoCloneOrEq` error[E0369]: binary operation `!=` cannot be applied to type `NoCloneOrEq` - --> $DIR/deriving-no-inner-impl-error-message.rs:15:5 + --> $DIR/deriving-no-inner-impl-error-message.rs:5:5 | LL | x: NoCloneOrEq //~ ERROR binary operation `==` cannot be applied to type `NoCloneOrEq` | ^^^^^^^^^^^^^^ @@ -15,7 +15,7 @@ LL | x: NoCloneOrEq //~ ERROR binary operation `==` cannot be applied to typ = note: an implementation of `std::cmp::PartialEq` might be missing for `NoCloneOrEq` error[E0277]: the trait bound `NoCloneOrEq: std::clone::Clone` is not satisfied - --> $DIR/deriving-no-inner-impl-error-message.rs:20:5 + --> $DIR/deriving-no-inner-impl-error-message.rs:10:5 | LL | x: NoCloneOrEq | ^^^^^^^^^^^^^^ the trait `std::clone::Clone` is not implemented for `NoCloneOrEq` diff --git a/src/test/ui/derives/deriving-non-type.rs b/src/test/ui/derives/deriving-non-type.rs index 84dd22435b888..7e14c12c0a992 100644 --- a/src/test/ui/derives/deriving-non-type.rs +++ b/src/test/ui/derives/deriving-non-type.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] struct S; diff --git a/src/test/ui/derives/deriving-non-type.stderr b/src/test/ui/derives/deriving-non-type.stderr index d9da03afb0353..98594542653c7 100644 --- a/src/test/ui/derives/deriving-non-type.stderr +++ b/src/test/ui/derives/deriving-non-type.stderr @@ -1,53 +1,53 @@ error: `derive` may only be applied to structs, enums and unions - --> $DIR/deriving-non-type.rs:15:1 + --> $DIR/deriving-non-type.rs:5:1 | LL | #[derive(PartialEq)] //~ ERROR: `derive` may only be applied to structs, enums and unions | ^^^^^^^^^^^^^^^^^^^^ error: `derive` may only be applied to structs, enums and unions - --> $DIR/deriving-non-type.rs:18:1 + --> $DIR/deriving-non-type.rs:8:1 | LL | #[derive(PartialEq)] //~ ERROR: `derive` may only be applied to structs, enums and unions | ^^^^^^^^^^^^^^^^^^^^ error: `derive` may only be applied to structs, enums and unions - --> $DIR/deriving-non-type.rs:21:1 + --> $DIR/deriving-non-type.rs:11:1 | LL | #[derive(PartialEq)] //~ ERROR: `derive` may only be applied to structs, enums and unions | ^^^^^^^^^^^^^^^^^^^^ error: `derive` may only be applied to structs, enums and unions - --> $DIR/deriving-non-type.rs:24:1 + --> $DIR/deriving-non-type.rs:14:1 | LL | #[derive(PartialEq)] //~ ERROR: `derive` may only be applied to structs, enums and unions | ^^^^^^^^^^^^^^^^^^^^ error: `derive` may only be applied to structs, enums and unions - --> $DIR/deriving-non-type.rs:27:1 + --> $DIR/deriving-non-type.rs:17:1 | LL | #[derive(PartialEq)] //~ ERROR: `derive` may only be applied to structs, enums and unions | ^^^^^^^^^^^^^^^^^^^^ error: `derive` may only be applied to structs, enums and unions - --> $DIR/deriving-non-type.rs:30:1 + --> $DIR/deriving-non-type.rs:20:1 | LL | #[derive(PartialEq)] //~ ERROR: `derive` may only be applied to structs, enums and unions | ^^^^^^^^^^^^^^^^^^^^ error: `derive` may only be applied to structs, enums and unions - --> $DIR/deriving-non-type.rs:33:1 + --> $DIR/deriving-non-type.rs:23:1 | LL | #[derive(PartialEq)] //~ ERROR: `derive` may only be applied to structs, enums and unions | ^^^^^^^^^^^^^^^^^^^^ error: `derive` may only be applied to structs, enums and unions - --> $DIR/deriving-non-type.rs:36:1 + --> $DIR/deriving-non-type.rs:26:1 | LL | #[derive(PartialEq)] //~ ERROR: `derive` may only be applied to structs, enums and unions | ^^^^^^^^^^^^^^^^^^^^ error: `derive` may only be applied to structs, enums and unions - --> $DIR/deriving-non-type.rs:39:1 + --> $DIR/deriving-non-type.rs:29:1 | LL | #[derive(PartialEq)] //~ ERROR: `derive` may only be applied to structs, enums and unions | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/derives/deriving-primitive.rs b/src/test/ui/derives/deriving-primitive.rs index 04fdee5e3edf6..53acf6164d9fe 100644 --- a/src/test/ui/derives/deriving-primitive.rs +++ b/src/test/ui/derives/deriving-primitive.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(FromPrimitive)] //~ ERROR cannot find derive macro `FromPrimitive` in this scope enum Foo {} diff --git a/src/test/ui/derives/deriving-primitive.stderr b/src/test/ui/derives/deriving-primitive.stderr index bc2d339329086..377f4e870822d 100644 --- a/src/test/ui/derives/deriving-primitive.stderr +++ b/src/test/ui/derives/deriving-primitive.stderr @@ -1,5 +1,5 @@ error: cannot find derive macro `FromPrimitive` in this scope - --> $DIR/deriving-primitive.rs:11:10 + --> $DIR/deriving-primitive.rs:1:10 | LL | #[derive(FromPrimitive)] //~ ERROR cannot find derive macro `FromPrimitive` in this scope | ^^^^^^^^^^^^^ diff --git a/src/test/ui/derives/deriving-with-repr-packed.rs b/src/test/ui/derives/deriving-with-repr-packed.rs index 43375098cb5b4..66b0f85c85dd1 100644 --- a/src/test/ui/derives/deriving-with-repr-packed.rs +++ b/src/test/ui/derives/deriving-with-repr-packed.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(safe_packed_borrows)] // check that derive on a packed struct with non-Copy fields diff --git a/src/test/ui/derives/deriving-with-repr-packed.stderr b/src/test/ui/derives/deriving-with-repr-packed.stderr index a7599c1e7db34..4ab14a1df84db 100644 --- a/src/test/ui/derives/deriving-with-repr-packed.stderr +++ b/src/test/ui/derives/deriving-with-repr-packed.stderr @@ -1,11 +1,11 @@ error: #[derive] can't be used on a #[repr(packed)] struct with type parameters (error E0133) - --> $DIR/deriving-with-repr-packed.rs:18:16 + --> $DIR/deriving-with-repr-packed.rs:8:16 | LL | #[derive(Copy, Clone, PartialEq, Eq)] | ^^^^^ | note: lint level defined here - --> $DIR/deriving-with-repr-packed.rs:11:9 + --> $DIR/deriving-with-repr-packed.rs:1:9 | LL | #![deny(safe_packed_borrows)] | ^^^^^^^^^^^^^^^^^^^ @@ -13,7 +13,7 @@ LL | #![deny(safe_packed_borrows)] = note: for more information, see issue #46043 error: #[derive] can't be used on a #[repr(packed)] struct with type parameters (error E0133) - --> $DIR/deriving-with-repr-packed.rs:18:23 + --> $DIR/deriving-with-repr-packed.rs:8:23 | LL | #[derive(Copy, Clone, PartialEq, Eq)] | ^^^^^^^^^ @@ -22,7 +22,7 @@ LL | #[derive(Copy, Clone, PartialEq, Eq)] = note: for more information, see issue #46043 error: #[derive] can't be used on a #[repr(packed)] struct that does not derive Copy (error E0133) - --> $DIR/deriving-with-repr-packed.rs:26:10 + --> $DIR/deriving-with-repr-packed.rs:16:10 | LL | #[derive(PartialEq, Eq)] | ^^^^^^^^^ @@ -31,7 +31,7 @@ LL | #[derive(PartialEq, Eq)] = note: for more information, see issue #46043 error: #[derive] can't be used on a #[repr(packed)] struct that does not derive Copy (error E0133) - --> $DIR/deriving-with-repr-packed.rs:35:10 + --> $DIR/deriving-with-repr-packed.rs:25:10 | LL | #[derive(PartialEq)] | ^^^^^^^^^ diff --git a/src/test/ui/destructure-trait-ref.rs b/src/test/ui/destructure-trait-ref.rs index b5acdc12ca048..66be493cb1f97 100644 --- a/src/test/ui/destructure-trait-ref.rs +++ b/src/test/ui/destructure-trait-ref.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // The regression test for #15031 to make sure destructuring trait // reference work properly. diff --git a/src/test/ui/destructure-trait-ref.stderr b/src/test/ui/destructure-trait-ref.stderr index 0335fff7bce85..4c93a6781eab1 100644 --- a/src/test/ui/destructure-trait-ref.stderr +++ b/src/test/ui/destructure-trait-ref.stderr @@ -1,23 +1,23 @@ error[E0033]: type `&dyn T` cannot be dereferenced - --> $DIR/destructure-trait-ref.rs:36:9 + --> $DIR/destructure-trait-ref.rs:26:9 | LL | let &x = &1isize as &T; //~ ERROR type `&dyn T` cannot be dereferenced | ^^ type `&dyn T` cannot be dereferenced error[E0033]: type `&dyn T` cannot be dereferenced - --> $DIR/destructure-trait-ref.rs:37:10 + --> $DIR/destructure-trait-ref.rs:27:10 | LL | let &&x = &(&1isize as &T); //~ ERROR type `&dyn T` cannot be dereferenced | ^^ type `&dyn T` cannot be dereferenced error[E0033]: type `std::boxed::Box` cannot be dereferenced - --> $DIR/destructure-trait-ref.rs:38:9 + --> $DIR/destructure-trait-ref.rs:28:9 | LL | let box x = box 1isize as Box; //~ ERROR type `std::boxed::Box` cannot be dereferenced | ^^^^^ type `std::boxed::Box` cannot be dereferenced error[E0308]: mismatched types - --> $DIR/destructure-trait-ref.rs:41:10 + --> $DIR/destructure-trait-ref.rs:31:10 | LL | let &&x = &1isize as &T; | ^^ expected trait T, found reference @@ -27,7 +27,7 @@ LL | let &&x = &1isize as &T; = help: did you mean `x: &dyn T`? error[E0308]: mismatched types - --> $DIR/destructure-trait-ref.rs:46:11 + --> $DIR/destructure-trait-ref.rs:36:11 | LL | let &&&x = &(&1isize as &T); | ^^ expected trait T, found reference @@ -37,7 +37,7 @@ LL | let &&&x = &(&1isize as &T); = help: did you mean `x: &dyn T`? error[E0308]: mismatched types - --> $DIR/destructure-trait-ref.rs:51:13 + --> $DIR/destructure-trait-ref.rs:41:13 | LL | let box box x = box 1isize as Box; | ^^^^^ expected trait T, found struct `std::boxed::Box` diff --git a/src/test/ui/did_you_mean/E0178.rs b/src/test/ui/did_you_mean/E0178.rs index 21cdb38fdb118..aad95dc2c20e0 100644 --- a/src/test/ui/did_you_mean/E0178.rs +++ b/src/test/ui/did_you_mean/E0178.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo {} struct Bar<'a> { diff --git a/src/test/ui/did_you_mean/E0178.stderr b/src/test/ui/did_you_mean/E0178.stderr index 29e7aeb45ca72..ad9bb57c922a3 100644 --- a/src/test/ui/did_you_mean/E0178.stderr +++ b/src/test/ui/did_you_mean/E0178.stderr @@ -1,23 +1,23 @@ error[E0178]: expected a path on the left-hand side of `+`, not `&'a Foo` - --> $DIR/E0178.rs:14:8 + --> $DIR/E0178.rs:4:8 | LL | w: &'a Foo + Copy, //~ ERROR expected a path | ^^^^^^^^^^^^^^ help: try adding parentheses: `&'a (Foo + Copy)` error[E0178]: expected a path on the left-hand side of `+`, not `&'a Foo` - --> $DIR/E0178.rs:15:8 + --> $DIR/E0178.rs:5:8 | LL | x: &'a Foo + 'a, //~ ERROR expected a path | ^^^^^^^^^^^^ help: try adding parentheses: `&'a (Foo + 'a)` error[E0178]: expected a path on the left-hand side of `+`, not `&'a mut Foo` - --> $DIR/E0178.rs:16:8 + --> $DIR/E0178.rs:6:8 | LL | y: &'a mut Foo + 'a, //~ ERROR expected a path | ^^^^^^^^^^^^^^^^ help: try adding parentheses: `&'a mut (Foo + 'a)` error[E0178]: expected a path on the left-hand side of `+`, not `fn() -> Foo` - --> $DIR/E0178.rs:17:8 + --> $DIR/E0178.rs:7:8 | LL | z: fn() -> Foo + 'a, //~ ERROR expected a path | ^^^^^^^^^^^^^^^^ perhaps you forgot parentheses? diff --git a/src/test/ui/did_you_mean/bad-assoc-expr.rs b/src/test/ui/did_you_mean/bad-assoc-expr.rs index 779aa952c81b9..2e13db17d8271 100644 --- a/src/test/ui/did_you_mean/bad-assoc-expr.rs +++ b/src/test/ui/did_you_mean/bad-assoc-expr.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let a = [1, 2, 3, 4]; [i32; 4]::clone(&a); diff --git a/src/test/ui/did_you_mean/bad-assoc-expr.stderr b/src/test/ui/did_you_mean/bad-assoc-expr.stderr index c4f7e47c61b26..e1eceabcc30af 100644 --- a/src/test/ui/did_you_mean/bad-assoc-expr.stderr +++ b/src/test/ui/did_you_mean/bad-assoc-expr.stderr @@ -1,35 +1,35 @@ error: missing angle brackets in associated item path - --> $DIR/bad-assoc-expr.rs:13:5 + --> $DIR/bad-assoc-expr.rs:3:5 | LL | [i32; 4]::clone(&a); | ^^^^^^^^^^^^^^^ help: try: `<[i32; 4]>::clone` error: missing angle brackets in associated item path - --> $DIR/bad-assoc-expr.rs:16:5 + --> $DIR/bad-assoc-expr.rs:6:5 | LL | [i32]::as_ref(&a); | ^^^^^^^^^^^^^ help: try: `<[i32]>::as_ref` error: missing angle brackets in associated item path - --> $DIR/bad-assoc-expr.rs:19:5 + --> $DIR/bad-assoc-expr.rs:9:5 | LL | (u8)::clone(&0); | ^^^^^^^^^^^ help: try: `<(u8)>::clone` error: missing angle brackets in associated item path - --> $DIR/bad-assoc-expr.rs:22:5 + --> $DIR/bad-assoc-expr.rs:12:5 | LL | (u8, u8)::clone(&(0, 0)); | ^^^^^^^^^^^^^^^ help: try: `<(u8, u8)>::clone` error: missing angle brackets in associated item path - --> $DIR/bad-assoc-expr.rs:25:6 + --> $DIR/bad-assoc-expr.rs:15:6 | LL | &(u8)::clone(&0); | ^^^^^^^^^^^ help: try: `<(u8)>::clone` error: missing angle brackets in associated item path - --> $DIR/bad-assoc-expr.rs:28:10 + --> $DIR/bad-assoc-expr.rs:18:10 | LL | 10 + (u8)::clone(&0); | ^^^^^^^^^^^ help: try: `<(u8)>::clone` diff --git a/src/test/ui/did_you_mean/bad-assoc-pat.rs b/src/test/ui/did_you_mean/bad-assoc-pat.rs index bf6be0ee98545..5bd2f1a894e82 100644 --- a/src/test/ui/did_you_mean/bad-assoc-pat.rs +++ b/src/test/ui/did_you_mean/bad-assoc-pat.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { match 0u8 { [u8]::AssocItem => {} diff --git a/src/test/ui/did_you_mean/bad-assoc-pat.stderr b/src/test/ui/did_you_mean/bad-assoc-pat.stderr index 10ee175a97e16..86beb0f33f64a 100644 --- a/src/test/ui/did_you_mean/bad-assoc-pat.stderr +++ b/src/test/ui/did_you_mean/bad-assoc-pat.stderr @@ -1,47 +1,47 @@ error: missing angle brackets in associated item path - --> $DIR/bad-assoc-pat.rs:13:9 + --> $DIR/bad-assoc-pat.rs:3:9 | LL | [u8]::AssocItem => {} | ^^^^^^^^^^^^^^^ help: try: `<[u8]>::AssocItem` error: missing angle brackets in associated item path - --> $DIR/bad-assoc-pat.rs:16:9 + --> $DIR/bad-assoc-pat.rs:6:9 | LL | (u8, u8)::AssocItem => {} | ^^^^^^^^^^^^^^^^^^^ help: try: `<(u8, u8)>::AssocItem` error: missing angle brackets in associated item path - --> $DIR/bad-assoc-pat.rs:19:9 + --> $DIR/bad-assoc-pat.rs:9:9 | LL | _::AssocItem => {} | ^^^^^^^^^^^^ help: try: `<_>::AssocItem` error: missing angle brackets in associated item path - --> $DIR/bad-assoc-pat.rs:24:10 + --> $DIR/bad-assoc-pat.rs:14:10 | LL | &(u8,)::AssocItem => {} | ^^^^^^^^^^^^^^^^ help: try: `<(u8,)>::AssocItem` error[E0599]: no associated item named `AssocItem` found for type `[u8]` in the current scope - --> $DIR/bad-assoc-pat.rs:13:9 + --> $DIR/bad-assoc-pat.rs:3:9 | LL | [u8]::AssocItem => {} | ^^^^^^^^^^^^^^^ associated item not found in `[u8]` error[E0599]: no associated item named `AssocItem` found for type `(u8, u8)` in the current scope - --> $DIR/bad-assoc-pat.rs:16:9 + --> $DIR/bad-assoc-pat.rs:6:9 | LL | (u8, u8)::AssocItem => {} | ^^^^^^^^^^^^^^^^^^^ associated item not found in `(u8, u8)` error[E0599]: no associated item named `AssocItem` found for type `_` in the current scope - --> $DIR/bad-assoc-pat.rs:19:9 + --> $DIR/bad-assoc-pat.rs:9:9 | LL | _::AssocItem => {} | ^^^^^^^^^^^^ associated item not found in `_` error[E0599]: no associated item named `AssocItem` found for type `(u8,)` in the current scope - --> $DIR/bad-assoc-pat.rs:24:10 + --> $DIR/bad-assoc-pat.rs:14:10 | LL | &(u8,)::AssocItem => {} | ^^^^^^^^^^^^^^^^ associated item not found in `(u8,)` diff --git a/src/test/ui/did_you_mean/bad-assoc-ty.rs b/src/test/ui/did_you_mean/bad-assoc-ty.rs index b4a59904ee4b5..436bda1547be9 100644 --- a/src/test/ui/did_you_mean/bad-assoc-ty.rs +++ b/src/test/ui/did_you_mean/bad-assoc-ty.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - type A = [u8; 4]::AssocTy; //~^ ERROR missing angle brackets in associated item path //~| ERROR ambiguous associated type diff --git a/src/test/ui/did_you_mean/bad-assoc-ty.stderr b/src/test/ui/did_you_mean/bad-assoc-ty.stderr index 33792d4f5b3fa..bcae5072b9a5b 100644 --- a/src/test/ui/did_you_mean/bad-assoc-ty.stderr +++ b/src/test/ui/did_you_mean/bad-assoc-ty.stderr @@ -1,47 +1,47 @@ error: missing angle brackets in associated item path - --> $DIR/bad-assoc-ty.rs:11:10 + --> $DIR/bad-assoc-ty.rs:1:10 | LL | type A = [u8; 4]::AssocTy; | ^^^^^^^^^^^^^^^^ help: try: `<[u8; 4]>::AssocTy` error: missing angle brackets in associated item path - --> $DIR/bad-assoc-ty.rs:15:10 + --> $DIR/bad-assoc-ty.rs:5:10 | LL | type B = [u8]::AssocTy; | ^^^^^^^^^^^^^ help: try: `<[u8]>::AssocTy` error: missing angle brackets in associated item path - --> $DIR/bad-assoc-ty.rs:19:10 + --> $DIR/bad-assoc-ty.rs:9:10 | LL | type C = (u8)::AssocTy; | ^^^^^^^^^^^^^ help: try: `<(u8)>::AssocTy` error: missing angle brackets in associated item path - --> $DIR/bad-assoc-ty.rs:23:10 + --> $DIR/bad-assoc-ty.rs:13:10 | LL | type D = (u8, u8)::AssocTy; | ^^^^^^^^^^^^^^^^^ help: try: `<(u8, u8)>::AssocTy` error: missing angle brackets in associated item path - --> $DIR/bad-assoc-ty.rs:27:10 + --> $DIR/bad-assoc-ty.rs:17:10 | LL | type E = _::AssocTy; | ^^^^^^^^^^ help: try: `<_>::AssocTy` error: missing angle brackets in associated item path - --> $DIR/bad-assoc-ty.rs:31:19 + --> $DIR/bad-assoc-ty.rs:21:19 | LL | type F = &'static (u8)::AssocTy; | ^^^^^^^^^^^^^ help: try: `<(u8)>::AssocTy` error: missing angle brackets in associated item path - --> $DIR/bad-assoc-ty.rs:37:10 + --> $DIR/bad-assoc-ty.rs:27:10 | LL | type G = 'static + (Send)::AssocTy; | ^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `<'static + Send>::AssocTy` error[E0223]: ambiguous associated type - --> $DIR/bad-assoc-ty.rs:11:10 + --> $DIR/bad-assoc-ty.rs:1:10 | LL | type A = [u8; 4]::AssocTy; | ^^^^^^^^^^^^^^^^ ambiguous associated type @@ -49,7 +49,7 @@ LL | type A = [u8; 4]::AssocTy; = note: specify the type using the syntax `<[u8; _] as Trait>::AssocTy` error[E0223]: ambiguous associated type - --> $DIR/bad-assoc-ty.rs:15:10 + --> $DIR/bad-assoc-ty.rs:5:10 | LL | type B = [u8]::AssocTy; | ^^^^^^^^^^^^^ ambiguous associated type @@ -57,7 +57,7 @@ LL | type B = [u8]::AssocTy; = note: specify the type using the syntax `<[u8] as Trait>::AssocTy` error[E0223]: ambiguous associated type - --> $DIR/bad-assoc-ty.rs:19:10 + --> $DIR/bad-assoc-ty.rs:9:10 | LL | type C = (u8)::AssocTy; | ^^^^^^^^^^^^^ ambiguous associated type @@ -65,7 +65,7 @@ LL | type C = (u8)::AssocTy; = note: specify the type using the syntax `::AssocTy` error[E0223]: ambiguous associated type - --> $DIR/bad-assoc-ty.rs:23:10 + --> $DIR/bad-assoc-ty.rs:13:10 | LL | type D = (u8, u8)::AssocTy; | ^^^^^^^^^^^^^^^^^ ambiguous associated type @@ -73,13 +73,13 @@ LL | type D = (u8, u8)::AssocTy; = note: specify the type using the syntax `<(u8, u8) as Trait>::AssocTy` error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/bad-assoc-ty.rs:27:10 + --> $DIR/bad-assoc-ty.rs:17:10 | LL | type E = _::AssocTy; | ^ not allowed in type signatures error[E0223]: ambiguous associated type - --> $DIR/bad-assoc-ty.rs:31:19 + --> $DIR/bad-assoc-ty.rs:21:19 | LL | type F = &'static (u8)::AssocTy; | ^^^^^^^^^^^^^ ambiguous associated type @@ -87,7 +87,7 @@ LL | type F = &'static (u8)::AssocTy; = note: specify the type using the syntax `::AssocTy` error[E0223]: ambiguous associated type - --> $DIR/bad-assoc-ty.rs:37:10 + --> $DIR/bad-assoc-ty.rs:27:10 | LL | type G = 'static + (Send)::AssocTy; | ^^^^^^^^^^^^^^^^^^^^^^^^^ ambiguous associated type @@ -95,7 +95,7 @@ LL | type G = 'static + (Send)::AssocTy; = note: specify the type using the syntax `<(dyn std::marker::Send + 'static) as Trait>::AssocTy` error[E0223]: ambiguous associated type - --> $DIR/bad-assoc-ty.rs:43:10 + --> $DIR/bad-assoc-ty.rs:33:10 | LL | type H = Fn(u8) -> (u8)::Output; | ^^^^^^^^^^^^^^^^^^^^^^ ambiguous associated type diff --git a/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-1.rs b/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-1.rs index 076b61b179061..1749137d4384e 100644 --- a/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-1.rs +++ b/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn foo(&self, a: A) -> A { a diff --git a/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-1.stderr b/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-1.stderr index 1e55b0c024fb7..8aedb4229e6d3 100644 --- a/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-1.stderr +++ b/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-1.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `Bar: Foo` is not satisfied - --> $DIR/issue-21659-show-relevant-trait-impls-1.rs:34:8 + --> $DIR/issue-21659-show-relevant-trait-impls-1.rs:24:8 | LL | f1.foo(1usize); | ^^^ the trait `Foo` is not implemented for `Bar` diff --git a/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-2.rs b/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-2.rs index 6beff6ba2a100..e898b224ed14b 100644 --- a/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-2.rs +++ b/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn foo(&self, a: A) -> A { a diff --git a/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-2.stderr b/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-2.stderr index 33804553a2981..140f98b40382a 100644 --- a/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-2.stderr +++ b/src/test/ui/did_you_mean/issue-21659-show-relevant-trait-impls-2.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `Bar: Foo` is not satisfied - --> $DIR/issue-21659-show-relevant-trait-impls-2.rs:38:8 + --> $DIR/issue-21659-show-relevant-trait-impls-2.rs:28:8 | LL | f1.foo(1usize); | ^^^ the trait `Foo` is not implemented for `Bar` diff --git a/src/test/ui/did_you_mean/issue-31424.nll.stderr b/src/test/ui/did_you_mean/issue-31424.nll.stderr index eae834e2b1aa8..d84c22adb9088 100644 --- a/src/test/ui/did_you_mean/issue-31424.nll.stderr +++ b/src/test/ui/did_you_mean/issue-31424.nll.stderr @@ -1,11 +1,11 @@ error[E0596]: cannot borrow `self` as mutable, as it is not declared as mutable - --> $DIR/issue-31424.rs:17:9 + --> $DIR/issue-31424.rs:7:9 | LL | (&mut self).bar(); //~ ERROR cannot borrow | ^^^^^^^^^^^ cannot borrow as mutable error[E0596]: cannot borrow `self` as mutable, as it is not declared as mutable - --> $DIR/issue-31424.rs:23:9 + --> $DIR/issue-31424.rs:13:9 | LL | fn bar(self: &mut Self) { | ---- help: consider changing this to be mutable: `mut self` diff --git a/src/test/ui/did_you_mean/issue-31424.rs b/src/test/ui/did_you_mean/issue-31424.rs index 1b31e064337e2..4b39be335bf51 100644 --- a/src/test/ui/did_you_mean/issue-31424.rs +++ b/src/test/ui/did_you_mean/issue-31424.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // forbid-output: &mut mut self struct Struct; diff --git a/src/test/ui/did_you_mean/issue-31424.stderr b/src/test/ui/did_you_mean/issue-31424.stderr index 9d0ab21ffaf0e..b7ca8a91e81c2 100644 --- a/src/test/ui/did_you_mean/issue-31424.stderr +++ b/src/test/ui/did_you_mean/issue-31424.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow immutable argument `self` as mutable - --> $DIR/issue-31424.rs:17:15 + --> $DIR/issue-31424.rs:7:15 | LL | (&mut self).bar(); //~ ERROR cannot borrow | ^^^^ @@ -8,7 +8,7 @@ LL | (&mut self).bar(); //~ ERROR cannot borrow | try removing `&mut` here error[E0596]: cannot borrow immutable argument `self` as mutable - --> $DIR/issue-31424.rs:23:15 + --> $DIR/issue-31424.rs:13:15 | LL | (&mut self).bar(); //~ ERROR cannot borrow | ^^^^ cannot borrow mutably diff --git a/src/test/ui/did_you_mean/issue-34126.nll.stderr b/src/test/ui/did_you_mean/issue-34126.nll.stderr index 004c43a7343f8..e41843ccef25d 100644 --- a/src/test/ui/did_you_mean/issue-34126.nll.stderr +++ b/src/test/ui/did_you_mean/issue-34126.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `self` as mutable, as it is not declared as mutable - --> $DIR/issue-34126.rs:16:18 + --> $DIR/issue-34126.rs:6:18 | LL | self.run(&mut self); //~ ERROR cannot borrow | ^^^^^^^^^ @@ -8,7 +8,7 @@ LL | self.run(&mut self); //~ ERROR cannot borrow | try removing `&mut` here error[E0502]: cannot borrow `self` as mutable because it is also borrowed as immutable - --> $DIR/issue-34126.rs:16:18 + --> $DIR/issue-34126.rs:6:18 | LL | self.run(&mut self); //~ ERROR cannot borrow | ---------^^^^^^^^^- diff --git a/src/test/ui/did_you_mean/issue-34126.rs b/src/test/ui/did_you_mean/issue-34126.rs index 9dfb38abd049f..15bef1ef815d6 100644 --- a/src/test/ui/did_you_mean/issue-34126.rs +++ b/src/test/ui/did_you_mean/issue-34126.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Z { } impl Z { diff --git a/src/test/ui/did_you_mean/issue-34126.stderr b/src/test/ui/did_you_mean/issue-34126.stderr index 08ece78b78885..05ea4ef91ce49 100644 --- a/src/test/ui/did_you_mean/issue-34126.stderr +++ b/src/test/ui/did_you_mean/issue-34126.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow immutable argument `self` as mutable - --> $DIR/issue-34126.rs:16:23 + --> $DIR/issue-34126.rs:6:23 | LL | self.run(&mut self); //~ ERROR cannot borrow | ^^^^ diff --git a/src/test/ui/did_you_mean/issue-34337.nll.stderr b/src/test/ui/did_you_mean/issue-34337.nll.stderr index 38315a067c07f..5e46889866d4d 100644 --- a/src/test/ui/did_you_mean/issue-34337.nll.stderr +++ b/src/test/ui/did_you_mean/issue-34337.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `key` as mutable, as it is not declared as mutable - --> $DIR/issue-34337.rs:16:9 + --> $DIR/issue-34337.rs:6:9 | LL | get(&mut key); //~ ERROR cannot borrow | ^^^^^^^^ diff --git a/src/test/ui/did_you_mean/issue-34337.rs b/src/test/ui/did_you_mean/issue-34337.rs index a426c0f48ccec..bb699609b3d39 100644 --- a/src/test/ui/did_you_mean/issue-34337.rs +++ b/src/test/ui/did_you_mean/issue-34337.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn get(key: &mut String) { } fn main() { diff --git a/src/test/ui/did_you_mean/issue-34337.stderr b/src/test/ui/did_you_mean/issue-34337.stderr index 7a4a03ce5d7e7..4bf988b72cd00 100644 --- a/src/test/ui/did_you_mean/issue-34337.stderr +++ b/src/test/ui/did_you_mean/issue-34337.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow immutable local variable `key` as mutable - --> $DIR/issue-34337.rs:16:14 + --> $DIR/issue-34337.rs:6:14 | LL | get(&mut key); //~ ERROR cannot borrow | ^^^ diff --git a/src/test/ui/did_you_mean/issue-35937.nll.stderr b/src/test/ui/did_you_mean/issue-35937.nll.stderr index 34bdf48e2a65f..76fb1e229536d 100644 --- a/src/test/ui/did_you_mean/issue-35937.nll.stderr +++ b/src/test/ui/did_you_mean/issue-35937.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `f.v` as mutable, as `f` is not declared as mutable - --> $DIR/issue-35937.rs:17:5 + --> $DIR/issue-35937.rs:7:5 | LL | let f = Foo { v: Vec::new() }; | - help: consider changing this to be mutable: `mut f` @@ -7,7 +7,7 @@ LL | f.v.push("cat".to_string()); //~ ERROR cannot borrow | ^^^ cannot borrow as mutable error[E0594]: cannot assign to `s.x`, as `s` is not declared as mutable - --> $DIR/issue-35937.rs:26:5 + --> $DIR/issue-35937.rs:16:5 | LL | let s = S { x: 42 }; | - help: consider changing this to be mutable: `mut s` @@ -15,7 +15,7 @@ LL | s.x += 1; //~ ERROR cannot assign | ^^^^^^^^ cannot assign error[E0594]: cannot assign to `s.x`, as `s` is not declared as mutable - --> $DIR/issue-35937.rs:30:5 + --> $DIR/issue-35937.rs:20:5 | LL | fn bar(s: S) { | - help: consider changing this to be mutable: `mut s` diff --git a/src/test/ui/did_you_mean/issue-35937.rs b/src/test/ui/did_you_mean/issue-35937.rs index 867b47cf99e1e..ebeba74f17616 100644 --- a/src/test/ui/did_you_mean/issue-35937.rs +++ b/src/test/ui/did_you_mean/issue-35937.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { pub v: Vec } diff --git a/src/test/ui/did_you_mean/issue-35937.stderr b/src/test/ui/did_you_mean/issue-35937.stderr index 4a29cd81425c4..b296f6871c2ce 100644 --- a/src/test/ui/did_you_mean/issue-35937.stderr +++ b/src/test/ui/did_you_mean/issue-35937.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow field `f.v` of immutable binding as mutable - --> $DIR/issue-35937.rs:17:5 + --> $DIR/issue-35937.rs:7:5 | LL | let f = Foo { v: Vec::new() }; | - consider changing this to `mut f` @@ -7,7 +7,7 @@ LL | f.v.push("cat".to_string()); //~ ERROR cannot borrow | ^^^ cannot mutably borrow field of immutable binding error[E0594]: cannot assign to field `s.x` of immutable binding - --> $DIR/issue-35937.rs:26:5 + --> $DIR/issue-35937.rs:16:5 | LL | let s = S { x: 42 }; | - consider changing this to `mut s` @@ -15,7 +15,7 @@ LL | s.x += 1; //~ ERROR cannot assign | ^^^^^^^^ cannot mutably borrow field of immutable binding error[E0594]: cannot assign to field `s.x` of immutable binding - --> $DIR/issue-35937.rs:30:5 + --> $DIR/issue-35937.rs:20:5 | LL | fn bar(s: S) { | - consider changing this to `mut s` diff --git a/src/test/ui/did_you_mean/issue-36798.rs b/src/test/ui/did_you_mean/issue-36798.rs index 6e641ff025ce3..89d71d83151db 100644 --- a/src/test/ui/did_you_mean/issue-36798.rs +++ b/src/test/ui/did_you_mean/issue-36798.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { bar: u8 } diff --git a/src/test/ui/did_you_mean/issue-36798.stderr b/src/test/ui/did_you_mean/issue-36798.stderr index c0a73abdf725d..41dc15c1b81e7 100644 --- a/src/test/ui/did_you_mean/issue-36798.stderr +++ b/src/test/ui/did_you_mean/issue-36798.stderr @@ -1,5 +1,5 @@ error[E0609]: no field `baz` on type `Foo` - --> $DIR/issue-36798.rs:17:7 + --> $DIR/issue-36798.rs:7:7 | LL | f.baz; //~ ERROR no field | ^^^ did you mean `bar`? diff --git a/src/test/ui/did_you_mean/issue-36798_unknown_field.rs b/src/test/ui/did_you_mean/issue-36798_unknown_field.rs index ec54a8d2b4390..ef9744b4af879 100644 --- a/src/test/ui/did_you_mean/issue-36798_unknown_field.rs +++ b/src/test/ui/did_you_mean/issue-36798_unknown_field.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { bar: u8 } diff --git a/src/test/ui/did_you_mean/issue-36798_unknown_field.stderr b/src/test/ui/did_you_mean/issue-36798_unknown_field.stderr index 4cf0df4435126..b884d8a53d358 100644 --- a/src/test/ui/did_you_mean/issue-36798_unknown_field.stderr +++ b/src/test/ui/did_you_mean/issue-36798_unknown_field.stderr @@ -1,5 +1,5 @@ error[E0609]: no field `zz` on type `Foo` - --> $DIR/issue-36798_unknown_field.rs:17:7 + --> $DIR/issue-36798_unknown_field.rs:7:7 | LL | f.zz; //~ ERROR no field | ^^ unknown field diff --git a/src/test/ui/did_you_mean/issue-37139.nll.stderr b/src/test/ui/did_you_mean/issue-37139.nll.stderr index 7cc7ca1463814..4d1c8a6b0eb18 100644 --- a/src/test/ui/did_you_mean/issue-37139.nll.stderr +++ b/src/test/ui/did_you_mean/issue-37139.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable - --> $DIR/issue-37139.rs:22:18 + --> $DIR/issue-37139.rs:12:18 | LL | test(&mut x); //~ ERROR cannot borrow immutable | ^^^^^^ diff --git a/src/test/ui/did_you_mean/issue-37139.rs b/src/test/ui/did_you_mean/issue-37139.rs index 8a1a7ce0c320b..b7f419ae4a644 100644 --- a/src/test/ui/did_you_mean/issue-37139.rs +++ b/src/test/ui/did_you_mean/issue-37139.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum TestEnum { Item(i32), } diff --git a/src/test/ui/did_you_mean/issue-37139.stderr b/src/test/ui/did_you_mean/issue-37139.stderr index 7cf3326f9d613..38617fda2afac 100644 --- a/src/test/ui/did_you_mean/issue-37139.stderr +++ b/src/test/ui/did_you_mean/issue-37139.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow immutable local variable `x` as mutable - --> $DIR/issue-37139.rs:22:23 + --> $DIR/issue-37139.rs:12:23 | LL | test(&mut x); //~ ERROR cannot borrow immutable | ^ diff --git a/src/test/ui/did_you_mean/issue-38054-do-not-show-unresolved-names.rs b/src/test/ui/did_you_mean/issue-38054-do-not-show-unresolved-names.rs index c9c1c5d141d6a..a1ef68ecfe213 100644 --- a/src/test/ui/did_you_mean/issue-38054-do-not-show-unresolved-names.rs +++ b/src/test/ui/did_you_mean/issue-38054-do-not-show-unresolved-names.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use Foo; //~ ERROR unresolved use Foo1; //~ ERROR unresolved diff --git a/src/test/ui/did_you_mean/issue-38054-do-not-show-unresolved-names.stderr b/src/test/ui/did_you_mean/issue-38054-do-not-show-unresolved-names.stderr index e3c75599a415e..1f3f7c475707a 100644 --- a/src/test/ui/did_you_mean/issue-38054-do-not-show-unresolved-names.stderr +++ b/src/test/ui/did_you_mean/issue-38054-do-not-show-unresolved-names.stderr @@ -1,11 +1,11 @@ error[E0432]: unresolved import `Foo` - --> $DIR/issue-38054-do-not-show-unresolved-names.rs:11:5 + --> $DIR/issue-38054-do-not-show-unresolved-names.rs:1:5 | LL | use Foo; //~ ERROR unresolved | ^^^ no `Foo` in the root error[E0432]: unresolved import `Foo1` - --> $DIR/issue-38054-do-not-show-unresolved-names.rs:13:5 + --> $DIR/issue-38054-do-not-show-unresolved-names.rs:3:5 | LL | use Foo1; //~ ERROR unresolved | ^^^^ no `Foo1` in the root diff --git a/src/test/ui/did_you_mean/issue-38147-1.nll.stderr b/src/test/ui/did_you_mean/issue-38147-1.nll.stderr index 25613561bbaf8..838673b21d1ec 100644 --- a/src/test/ui/did_you_mean/issue-38147-1.nll.stderr +++ b/src/test/ui/did_you_mean/issue-38147-1.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `*self.s` as mutable, as it is behind a `&` reference - --> $DIR/issue-38147-1.rs:27:9 + --> $DIR/issue-38147-1.rs:17:9 | LL | fn f(&self) { | ----- help: consider changing this to be a mutable reference: `&mut self` diff --git a/src/test/ui/did_you_mean/issue-38147-1.rs b/src/test/ui/did_you_mean/issue-38147-1.rs index a7ce7406566b3..b67239619d979 100644 --- a/src/test/ui/did_you_mean/issue-38147-1.rs +++ b/src/test/ui/did_you_mean/issue-38147-1.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Pass<'a> { s: &'a mut String } diff --git a/src/test/ui/did_you_mean/issue-38147-1.stderr b/src/test/ui/did_you_mean/issue-38147-1.stderr index 4ebb5683405d4..74c72edd028b0 100644 --- a/src/test/ui/did_you_mean/issue-38147-1.stderr +++ b/src/test/ui/did_you_mean/issue-38147-1.stderr @@ -1,5 +1,5 @@ error[E0389]: cannot borrow data mutably in a `&` reference - --> $DIR/issue-38147-1.rs:27:9 + --> $DIR/issue-38147-1.rs:17:9 | LL | fn f(&self) { | ----- use `&mut self` here to make mutable diff --git a/src/test/ui/did_you_mean/issue-38147-2.nll.stderr b/src/test/ui/did_you_mean/issue-38147-2.nll.stderr index 21fc4079d5b59..73f3a2c41663e 100644 --- a/src/test/ui/did_you_mean/issue-38147-2.nll.stderr +++ b/src/test/ui/did_you_mean/issue-38147-2.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `*self.s` as mutable, as it is behind a `&` reference - --> $DIR/issue-38147-2.rs:17:9 + --> $DIR/issue-38147-2.rs:7:9 | LL | self.s.push('x'); | ^^^^^^ cannot borrow as mutable diff --git a/src/test/ui/did_you_mean/issue-38147-2.rs b/src/test/ui/did_you_mean/issue-38147-2.rs index 1a24f471f0855..e43ebf9d26142 100644 --- a/src/test/ui/did_you_mean/issue-38147-2.rs +++ b/src/test/ui/did_you_mean/issue-38147-2.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Bar<'a> { s: &'a String } diff --git a/src/test/ui/did_you_mean/issue-38147-2.stderr b/src/test/ui/did_you_mean/issue-38147-2.stderr index 31433cf83c3bf..fa4fccb8d2775 100644 --- a/src/test/ui/did_you_mean/issue-38147-2.stderr +++ b/src/test/ui/did_you_mean/issue-38147-2.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow borrowed content `*self.s` of immutable binding as mutable - --> $DIR/issue-38147-2.rs:17:9 + --> $DIR/issue-38147-2.rs:7:9 | LL | s: &'a String | ---------- use `&'a mut String` here to make mutable diff --git a/src/test/ui/did_you_mean/issue-38147-3.nll.stderr b/src/test/ui/did_you_mean/issue-38147-3.nll.stderr index d426c1f37fc1c..e0b999fbe0e13 100644 --- a/src/test/ui/did_you_mean/issue-38147-3.nll.stderr +++ b/src/test/ui/did_you_mean/issue-38147-3.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `*self.s` as mutable, as it is behind a `&` reference - --> $DIR/issue-38147-3.rs:17:9 + --> $DIR/issue-38147-3.rs:7:9 | LL | self.s.push('x'); | ^^^^^^ cannot borrow as mutable diff --git a/src/test/ui/did_you_mean/issue-38147-3.rs b/src/test/ui/did_you_mean/issue-38147-3.rs index 5e2bf06e5d902..4cd703f2f61f0 100644 --- a/src/test/ui/did_you_mean/issue-38147-3.rs +++ b/src/test/ui/did_you_mean/issue-38147-3.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Qux<'a> { s: &'a String } diff --git a/src/test/ui/did_you_mean/issue-38147-3.stderr b/src/test/ui/did_you_mean/issue-38147-3.stderr index 8bb23acdc4076..2cb9835278db1 100644 --- a/src/test/ui/did_you_mean/issue-38147-3.stderr +++ b/src/test/ui/did_you_mean/issue-38147-3.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow borrowed content `*self.s` of immutable binding as mutable - --> $DIR/issue-38147-3.rs:17:9 + --> $DIR/issue-38147-3.rs:7:9 | LL | s: &'a String | ---------- use `&'a mut String` here to make mutable diff --git a/src/test/ui/did_you_mean/issue-38147-4.nll.stderr b/src/test/ui/did_you_mean/issue-38147-4.nll.stderr index eccbe19ac943e..458e41f6aae7c 100644 --- a/src/test/ui/did_you_mean/issue-38147-4.nll.stderr +++ b/src/test/ui/did_you_mean/issue-38147-4.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `*f.s` as mutable, as it is behind a `&` reference - --> $DIR/issue-38147-4.rs:16:5 + --> $DIR/issue-38147-4.rs:6:5 | LL | fn f(x: usize, f: &Foo) { | ---- help: consider changing this to be a mutable reference: `&mut Foo<'_>` diff --git a/src/test/ui/did_you_mean/issue-38147-4.rs b/src/test/ui/did_you_mean/issue-38147-4.rs index 49a8f2b6ff691..26573d4fddeb6 100644 --- a/src/test/ui/did_you_mean/issue-38147-4.rs +++ b/src/test/ui/did_you_mean/issue-38147-4.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo<'a> { s: &'a mut String } diff --git a/src/test/ui/did_you_mean/issue-38147-4.stderr b/src/test/ui/did_you_mean/issue-38147-4.stderr index e78cea14a7b53..6dc4f101084b5 100644 --- a/src/test/ui/did_you_mean/issue-38147-4.stderr +++ b/src/test/ui/did_you_mean/issue-38147-4.stderr @@ -1,5 +1,5 @@ error[E0389]: cannot borrow data mutably in a `&` reference - --> $DIR/issue-38147-4.rs:16:5 + --> $DIR/issue-38147-4.rs:6:5 | LL | fn f(x: usize, f: &Foo) { | ---- use `&mut Foo` here to make mutable diff --git a/src/test/ui/did_you_mean/issue-39544.nll.stderr b/src/test/ui/did_you_mean/issue-39544.nll.stderr index 8c848b33241ca..2fb8e3db68cbe 100644 --- a/src/test/ui/did_you_mean/issue-39544.nll.stderr +++ b/src/test/ui/did_you_mean/issue-39544.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `z.x` as mutable, as `z` is not declared as mutable - --> $DIR/issue-39544.rs:21:13 + --> $DIR/issue-39544.rs:11:13 | LL | let z = Z { x: X::Y }; | - help: consider changing this to be mutable: `mut z` @@ -7,7 +7,7 @@ LL | let _ = &mut z.x; //~ ERROR cannot borrow | ^^^^^^^^ cannot borrow as mutable error[E0596]: cannot borrow `self.x` as mutable, as it is behind a `&` reference - --> $DIR/issue-39544.rs:26:17 + --> $DIR/issue-39544.rs:16:17 | LL | fn foo<'z>(&'z self) { | -------- help: consider changing this to be a mutable reference: `&'z mut self` @@ -15,7 +15,7 @@ LL | let _ = &mut self.x; //~ ERROR cannot borrow | ^^^^^^^^^^^ `self` is a `&` reference, so the data it refers to cannot be borrowed as mutable error[E0596]: cannot borrow `self.x` as mutable, as it is behind a `&` reference - --> $DIR/issue-39544.rs:30:17 + --> $DIR/issue-39544.rs:20:17 | LL | fn foo1(&self, other: &Z) { | ----- help: consider changing this to be a mutable reference: `&mut self` @@ -23,7 +23,7 @@ LL | let _ = &mut self.x; //~ ERROR cannot borrow | ^^^^^^^^^^^ `self` is a `&` reference, so the data it refers to cannot be borrowed as mutable error[E0596]: cannot borrow `other.x` as mutable, as it is behind a `&` reference - --> $DIR/issue-39544.rs:31:17 + --> $DIR/issue-39544.rs:21:17 | LL | fn foo1(&self, other: &Z) { | -- help: consider changing this to be a mutable reference: `&mut Z` @@ -32,7 +32,7 @@ LL | let _ = &mut other.x; //~ ERROR cannot borrow | ^^^^^^^^^^^^ `other` is a `&` reference, so the data it refers to cannot be borrowed as mutable error[E0596]: cannot borrow `self.x` as mutable, as it is behind a `&` reference - --> $DIR/issue-39544.rs:35:17 + --> $DIR/issue-39544.rs:25:17 | LL | fn foo2<'a>(&'a self, other: &Z) { | -------- help: consider changing this to be a mutable reference: `&'a mut self` @@ -40,7 +40,7 @@ LL | let _ = &mut self.x; //~ ERROR cannot borrow | ^^^^^^^^^^^ `self` is a `&` reference, so the data it refers to cannot be borrowed as mutable error[E0596]: cannot borrow `other.x` as mutable, as it is behind a `&` reference - --> $DIR/issue-39544.rs:36:17 + --> $DIR/issue-39544.rs:26:17 | LL | fn foo2<'a>(&'a self, other: &Z) { | -- help: consider changing this to be a mutable reference: `&mut Z` @@ -49,7 +49,7 @@ LL | let _ = &mut other.x; //~ ERROR cannot borrow | ^^^^^^^^^^^^ `other` is a `&` reference, so the data it refers to cannot be borrowed as mutable error[E0596]: cannot borrow `self.x` as mutable, as it is behind a `&` reference - --> $DIR/issue-39544.rs:40:17 + --> $DIR/issue-39544.rs:30:17 | LL | fn foo3<'a>(self: &'a Self, other: &Z) { | -------- help: consider changing this to be a mutable reference: `&'a mut Self` @@ -57,7 +57,7 @@ LL | let _ = &mut self.x; //~ ERROR cannot borrow | ^^^^^^^^^^^ `self` is a `&` reference, so the data it refers to cannot be borrowed as mutable error[E0596]: cannot borrow `other.x` as mutable, as it is behind a `&` reference - --> $DIR/issue-39544.rs:41:17 + --> $DIR/issue-39544.rs:31:17 | LL | fn foo3<'a>(self: &'a Self, other: &Z) { | -- help: consider changing this to be a mutable reference: `&mut Z` @@ -66,7 +66,7 @@ LL | let _ = &mut other.x; //~ ERROR cannot borrow | ^^^^^^^^^^^^ `other` is a `&` reference, so the data it refers to cannot be borrowed as mutable error[E0596]: cannot borrow `other.x` as mutable, as it is behind a `&` reference - --> $DIR/issue-39544.rs:45:17 + --> $DIR/issue-39544.rs:35:17 | LL | fn foo4(other: &Z) { | -- help: consider changing this to be a mutable reference: `&mut Z` @@ -74,7 +74,7 @@ LL | let _ = &mut other.x; //~ ERROR cannot borrow | ^^^^^^^^^^^^ `other` is a `&` reference, so the data it refers to cannot be borrowed as mutable error[E0596]: cannot borrow `z.x` as mutable, as `z` is not declared as mutable - --> $DIR/issue-39544.rs:51:13 + --> $DIR/issue-39544.rs:41:13 | LL | pub fn with_arg(z: Z, w: &Z) { | - help: consider changing this to be mutable: `mut z` @@ -82,7 +82,7 @@ LL | let _ = &mut z.x; //~ ERROR cannot borrow | ^^^^^^^^ cannot borrow as mutable error[E0596]: cannot borrow `w.x` as mutable, as it is behind a `&` reference - --> $DIR/issue-39544.rs:52:13 + --> $DIR/issue-39544.rs:42:13 | LL | pub fn with_arg(z: Z, w: &Z) { | -- help: consider changing this to be a mutable reference: `&mut Z` @@ -91,7 +91,7 @@ LL | let _ = &mut w.x; //~ ERROR cannot borrow | ^^^^^^^^ `w` is a `&` reference, so the data it refers to cannot be borrowed as mutable error[E0594]: cannot assign to `*x.0` which is behind a `&` reference - --> $DIR/issue-39544.rs:58:5 + --> $DIR/issue-39544.rs:48:5 | LL | *x.0 = 1; | ^^^^^^^^ cannot assign diff --git a/src/test/ui/did_you_mean/issue-39544.rs b/src/test/ui/did_you_mean/issue-39544.rs index 205cbce709491..89696a06aaae8 100644 --- a/src/test/ui/did_you_mean/issue-39544.rs +++ b/src/test/ui/did_you_mean/issue-39544.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub enum X { Y } diff --git a/src/test/ui/did_you_mean/issue-39544.stderr b/src/test/ui/did_you_mean/issue-39544.stderr index dfa9cb880e568..9a8172f66128b 100644 --- a/src/test/ui/did_you_mean/issue-39544.stderr +++ b/src/test/ui/did_you_mean/issue-39544.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow field `z.x` of immutable binding as mutable - --> $DIR/issue-39544.rs:21:18 + --> $DIR/issue-39544.rs:11:18 | LL | let z = Z { x: X::Y }; | - consider changing this to `mut z` @@ -7,7 +7,7 @@ LL | let _ = &mut z.x; //~ ERROR cannot borrow | ^^^ cannot mutably borrow field of immutable binding error[E0596]: cannot borrow field `self.x` of immutable binding as mutable - --> $DIR/issue-39544.rs:26:22 + --> $DIR/issue-39544.rs:16:22 | LL | fn foo<'z>(&'z self) { | -------- use `&'z mut self` here to make mutable @@ -15,7 +15,7 @@ LL | let _ = &mut self.x; //~ ERROR cannot borrow | ^^^^^^ cannot mutably borrow field of immutable binding error[E0596]: cannot borrow field `self.x` of immutable binding as mutable - --> $DIR/issue-39544.rs:30:22 + --> $DIR/issue-39544.rs:20:22 | LL | fn foo1(&self, other: &Z) { | ----- use `&mut self` here to make mutable @@ -23,7 +23,7 @@ LL | let _ = &mut self.x; //~ ERROR cannot borrow | ^^^^^^ cannot mutably borrow field of immutable binding error[E0596]: cannot borrow field `other.x` of immutable binding as mutable - --> $DIR/issue-39544.rs:31:22 + --> $DIR/issue-39544.rs:21:22 | LL | fn foo1(&self, other: &Z) { | -- use `&mut Z` here to make mutable @@ -32,7 +32,7 @@ LL | let _ = &mut other.x; //~ ERROR cannot borrow | ^^^^^^^ cannot mutably borrow field of immutable binding error[E0596]: cannot borrow field `self.x` of immutable binding as mutable - --> $DIR/issue-39544.rs:35:22 + --> $DIR/issue-39544.rs:25:22 | LL | fn foo2<'a>(&'a self, other: &Z) { | -------- use `&'a mut self` here to make mutable @@ -40,7 +40,7 @@ LL | let _ = &mut self.x; //~ ERROR cannot borrow | ^^^^^^ cannot mutably borrow field of immutable binding error[E0596]: cannot borrow field `other.x` of immutable binding as mutable - --> $DIR/issue-39544.rs:36:22 + --> $DIR/issue-39544.rs:26:22 | LL | fn foo2<'a>(&'a self, other: &Z) { | -- use `&mut Z` here to make mutable @@ -49,7 +49,7 @@ LL | let _ = &mut other.x; //~ ERROR cannot borrow | ^^^^^^^ cannot mutably borrow field of immutable binding error[E0596]: cannot borrow field `self.x` of immutable binding as mutable - --> $DIR/issue-39544.rs:40:22 + --> $DIR/issue-39544.rs:30:22 | LL | fn foo3<'a>(self: &'a Self, other: &Z) { | -------- use `&'a mut Self` here to make mutable @@ -57,7 +57,7 @@ LL | let _ = &mut self.x; //~ ERROR cannot borrow | ^^^^^^ cannot mutably borrow field of immutable binding error[E0596]: cannot borrow field `other.x` of immutable binding as mutable - --> $DIR/issue-39544.rs:41:22 + --> $DIR/issue-39544.rs:31:22 | LL | fn foo3<'a>(self: &'a Self, other: &Z) { | -- use `&mut Z` here to make mutable @@ -66,7 +66,7 @@ LL | let _ = &mut other.x; //~ ERROR cannot borrow | ^^^^^^^ cannot mutably borrow field of immutable binding error[E0596]: cannot borrow field `other.x` of immutable binding as mutable - --> $DIR/issue-39544.rs:45:22 + --> $DIR/issue-39544.rs:35:22 | LL | fn foo4(other: &Z) { | -- use `&mut Z` here to make mutable @@ -74,7 +74,7 @@ LL | let _ = &mut other.x; //~ ERROR cannot borrow | ^^^^^^^ cannot mutably borrow field of immutable binding error[E0596]: cannot borrow field `z.x` of immutable binding as mutable - --> $DIR/issue-39544.rs:51:18 + --> $DIR/issue-39544.rs:41:18 | LL | pub fn with_arg(z: Z, w: &Z) { | - consider changing this to `mut z` @@ -82,7 +82,7 @@ LL | let _ = &mut z.x; //~ ERROR cannot borrow | ^^^ cannot mutably borrow field of immutable binding error[E0596]: cannot borrow field `w.x` of immutable binding as mutable - --> $DIR/issue-39544.rs:52:18 + --> $DIR/issue-39544.rs:42:18 | LL | pub fn with_arg(z: Z, w: &Z) { | -- use `&mut Z` here to make mutable @@ -91,7 +91,7 @@ LL | let _ = &mut w.x; //~ ERROR cannot borrow | ^^^ cannot mutably borrow field of immutable binding error[E0594]: cannot assign to borrowed content `*x.0` of immutable binding - --> $DIR/issue-39544.rs:58:5 + --> $DIR/issue-39544.rs:48:5 | LL | *x.0 = 1; | ^^^^^^^^ cannot borrow as mutable diff --git a/src/test/ui/did_you_mean/issue-39802-show-5-trait-impls.rs b/src/test/ui/did_you_mean/issue-39802-show-5-trait-impls.rs index 660aedc3596ed..63a8c547c6f01 100644 --- a/src/test/ui/did_you_mean/issue-39802-show-5-trait-impls.rs +++ b/src/test/ui/did_you_mean/issue-39802-show-5-trait-impls.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn bar(&self){} } diff --git a/src/test/ui/did_you_mean/issue-39802-show-5-trait-impls.stderr b/src/test/ui/did_you_mean/issue-39802-show-5-trait-impls.stderr index 3b08fcf0df106..23466980f9252 100644 --- a/src/test/ui/did_you_mean/issue-39802-show-5-trait-impls.stderr +++ b/src/test/ui/did_you_mean/issue-39802-show-5-trait-impls.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `i8: Foo` is not satisfied - --> $DIR/issue-39802-show-5-trait-impls.rs:34:5 + --> $DIR/issue-39802-show-5-trait-impls.rs:24:5 | LL | Foo::::bar(&1i8); //~ ERROR is not satisfied | ^^^^^^^^^^^^^^^ the trait `Foo` is not implemented for `i8` @@ -11,13 +11,13 @@ LL | Foo::::bar(&1i8); //~ ERROR is not satisfied > > note: required by `Foo::bar` - --> $DIR/issue-39802-show-5-trait-impls.rs:12:5 + --> $DIR/issue-39802-show-5-trait-impls.rs:2:5 | LL | fn bar(&self){} | ^^^^^^^^^^^^^ error[E0277]: the trait bound `u8: Foo` is not satisfied - --> $DIR/issue-39802-show-5-trait-impls.rs:35:5 + --> $DIR/issue-39802-show-5-trait-impls.rs:25:5 | LL | Foo::::bar(&1u8); //~ ERROR is not satisfied | ^^^^^^^^^^^^^^^ the trait `Foo` is not implemented for `u8` @@ -28,13 +28,13 @@ LL | Foo::::bar(&1u8); //~ ERROR is not satisfied > > note: required by `Foo::bar` - --> $DIR/issue-39802-show-5-trait-impls.rs:12:5 + --> $DIR/issue-39802-show-5-trait-impls.rs:2:5 | LL | fn bar(&self){} | ^^^^^^^^^^^^^ error[E0277]: the trait bound `bool: Foo` is not satisfied - --> $DIR/issue-39802-show-5-trait-impls.rs:36:5 + --> $DIR/issue-39802-show-5-trait-impls.rs:26:5 | LL | Foo::::bar(&true); //~ ERROR is not satisfied | ^^^^^^^^^^^^^^^ the trait `Foo` is not implemented for `bool` @@ -46,7 +46,7 @@ LL | Foo::::bar(&true); //~ ERROR is not satisfied > and 2 others note: required by `Foo::bar` - --> $DIR/issue-39802-show-5-trait-impls.rs:12:5 + --> $DIR/issue-39802-show-5-trait-impls.rs:2:5 | LL | fn bar(&self){} | ^^^^^^^^^^^^^ diff --git a/src/test/ui/did_you_mean/issue-40006.rs b/src/test/ui/did_you_mean/issue-40006.rs index 62316b96db03f..75ea02b6a9d4a 100644 --- a/src/test/ui/did_you_mean/issue-40006.rs +++ b/src/test/ui/did_you_mean/issue-40006.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - impl X { //~ ERROR cannot be made into an object //~^ ERROR missing Y diff --git a/src/test/ui/did_you_mean/issue-40006.stderr b/src/test/ui/did_you_mean/issue-40006.stderr index d3ce2cf12f296..1b9eecb7769b3 100644 --- a/src/test/ui/did_you_mean/issue-40006.stderr +++ b/src/test/ui/did_you_mean/issue-40006.stderr @@ -1,5 +1,5 @@ error: missing `fn`, `type`, or `const` for impl-item declaration - --> $DIR/issue-40006.rs:11:9 + --> $DIR/issue-40006.rs:1:9 | LL | impl X { //~ ERROR cannot be made into an object | _________^ @@ -8,7 +8,7 @@ LL | | Y | |____^ missing `fn`, `type`, or `const` error: missing `fn`, `type`, or `const` for trait-item declaration - --> $DIR/issue-40006.rs:18:10 + --> $DIR/issue-40006.rs:8:10 | LL | trait X { //~ ERROR missing | __________^ @@ -16,13 +16,13 @@ LL | | X() {} | |____^ missing `fn`, `type`, or `const` error: expected `[`, found `#` - --> $DIR/issue-40006.rs:20:17 + --> $DIR/issue-40006.rs:10:17 | LL | fn xxx() { ### } //~ ERROR missing | ^ expected `[` error: missing `fn`, `type`, or `const` for trait-item declaration - --> $DIR/issue-40006.rs:20:21 + --> $DIR/issue-40006.rs:10:21 | LL | fn xxx() { ### } //~ ERROR missing | _____________________^ @@ -31,7 +31,7 @@ LL | | L = M; //~ ERROR missing | |____^ missing `fn`, `type`, or `const` error: missing `fn`, `type`, or `const` for trait-item declaration - --> $DIR/issue-40006.rs:22:11 + --> $DIR/issue-40006.rs:12:11 | LL | L = M; //~ ERROR missing | ___________^ @@ -39,25 +39,25 @@ LL | | Z = { 2 + 3 }; //~ ERROR expected one of | |____^ missing `fn`, `type`, or `const` error: expected one of `async`, `const`, `extern`, `fn`, `type`, `unsafe`, or `}`, found `;` - --> $DIR/issue-40006.rs:23:18 + --> $DIR/issue-40006.rs:13:18 | LL | Z = { 2 + 3 }; //~ ERROR expected one of | ^ expected one of 7 possible tokens here error: expected one of `!` or `::`, found `(` - --> $DIR/issue-40006.rs:24:9 + --> $DIR/issue-40006.rs:14:9 | LL | ::Y (); //~ ERROR expected one of | ^ expected one of `!` or `::` here error: missing `fn`, `type`, or `const` for impl-item declaration - --> $DIR/issue-40006.rs:28:8 + --> $DIR/issue-40006.rs:18:8 | LL | pub hello_method(&self) { //~ ERROR missing | ^ missing `fn`, `type`, or `const` error[E0038]: the trait `X` cannot be made into an object - --> $DIR/issue-40006.rs:11:6 + --> $DIR/issue-40006.rs:1:6 | LL | impl X { //~ ERROR cannot be made into an object | ^ the trait `X` cannot be made into an object diff --git a/src/test/ui/did_you_mean/issue-40396.rs b/src/test/ui/did_you_mean/issue-40396.rs index eb62dc5408494..978b5d144833e 100644 --- a/src/test/ui/did_you_mean/issue-40396.rs +++ b/src/test/ui/did_you_mean/issue-40396.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo() { println!("{:?}", (0..13).collect>()); //~ ERROR chained comparison } diff --git a/src/test/ui/did_you_mean/issue-40396.stderr b/src/test/ui/did_you_mean/issue-40396.stderr index 219fd45665a94..3b086d8d4d088 100644 --- a/src/test/ui/did_you_mean/issue-40396.stderr +++ b/src/test/ui/did_you_mean/issue-40396.stderr @@ -1,5 +1,5 @@ error: chained comparison operators require parentheses - --> $DIR/issue-40396.rs:12:37 + --> $DIR/issue-40396.rs:2:37 | LL | println!("{:?}", (0..13).collect>()); //~ ERROR chained comparison | ^^^^^^^^ @@ -8,7 +8,7 @@ LL | println!("{:?}", (0..13).collect>()); //~ ERROR chained compar = help: or use `(...)` if you meant to specify fn arguments error: chained comparison operators require parentheses - --> $DIR/issue-40396.rs:16:25 + --> $DIR/issue-40396.rs:6:25 | LL | println!("{:?}", Vec::new()); //~ ERROR chained comparison | ^^^^^^^ @@ -17,7 +17,7 @@ LL | println!("{:?}", Vec::new()); //~ ERROR chained comparison = help: or use `(...)` if you meant to specify fn arguments error: chained comparison operators require parentheses - --> $DIR/issue-40396.rs:20:37 + --> $DIR/issue-40396.rs:10:37 | LL | println!("{:?}", (0..13).collect()); //~ ERROR chained comparison | ^^^^^^^^ @@ -26,7 +26,7 @@ LL | println!("{:?}", (0..13).collect()); //~ ERROR chained compari = help: or use `(...)` if you meant to specify fn arguments error: chained comparison operators require parentheses - --> $DIR/issue-40396.rs:20:41 + --> $DIR/issue-40396.rs:10:41 | LL | println!("{:?}", (0..13).collect()); //~ ERROR chained comparison | ^^^^^^ diff --git a/src/test/ui/did_you_mean/issue-40823.nll.stderr b/src/test/ui/did_you_mean/issue-40823.nll.stderr index 44ae058cc2803..0389cf5499d9b 100644 --- a/src/test/ui/did_you_mean/issue-40823.nll.stderr +++ b/src/test/ui/did_you_mean/issue-40823.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `*buf` as mutable, as it is behind a `&` reference - --> $DIR/issue-40823.rs:13:5 + --> $DIR/issue-40823.rs:3:5 | LL | let mut buf = &[1, 2, 3, 4]; | ------------- help: consider changing this to be a mutable reference: `&mut [1, 2, 3, 4]` diff --git a/src/test/ui/did_you_mean/issue-40823.rs b/src/test/ui/did_you_mean/issue-40823.rs index 3b48cef19021b..7e456a354b390 100644 --- a/src/test/ui/did_you_mean/issue-40823.rs +++ b/src/test/ui/did_you_mean/issue-40823.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let mut buf = &[1, 2, 3, 4]; buf.iter_mut(); //~ ERROR cannot borrow immutable borrowed content diff --git a/src/test/ui/did_you_mean/issue-40823.stderr b/src/test/ui/did_you_mean/issue-40823.stderr index 20e95513ec2f3..ee64e79ead931 100644 --- a/src/test/ui/did_you_mean/issue-40823.stderr +++ b/src/test/ui/did_you_mean/issue-40823.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow immutable borrowed content `*buf` as mutable - --> $DIR/issue-40823.rs:13:5 + --> $DIR/issue-40823.rs:3:5 | LL | buf.iter_mut(); //~ ERROR cannot borrow immutable borrowed content | ^^^ cannot borrow as mutable diff --git a/src/test/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.rs b/src/test/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.rs index e8fd248011cb8..b59fe423025e6 100644 --- a/src/test/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.rs +++ b/src/test/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = ~1; //~ ERROR cannot be used as a unary operator } diff --git a/src/test/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.stderr b/src/test/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.stderr index f13f15f63771d..d2d9abee22cdc 100644 --- a/src/test/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.stderr +++ b/src/test/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.stderr @@ -1,5 +1,5 @@ error: `~` cannot be used as a unary operator - --> $DIR/issue-41679-tilde-bitwise-negation-attempt.rs:12:13 + --> $DIR/issue-41679-tilde-bitwise-negation-attempt.rs:2:13 | LL | let x = ~1; //~ ERROR cannot be used as a unary operator | ^ help: use `!` to perform bitwise negation diff --git a/src/test/ui/did_you_mean/issue-42599_available_fields_note.rs b/src/test/ui/did_you_mean/issue-42599_available_fields_note.rs index ad5bedcefc2dd..c377dfc126ac9 100644 --- a/src/test/ui/did_you_mean/issue-42599_available_fields_note.rs +++ b/src/test/ui/did_you_mean/issue-42599_available_fields_note.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod submodule { #[derive(Default)] diff --git a/src/test/ui/did_you_mean/issue-42599_available_fields_note.stderr b/src/test/ui/did_you_mean/issue-42599_available_fields_note.stderr index c4b282bde5283..808ff1670da09 100644 --- a/src/test/ui/did_you_mean/issue-42599_available_fields_note.stderr +++ b/src/test/ui/did_you_mean/issue-42599_available_fields_note.stderr @@ -1,11 +1,11 @@ error[E0560]: struct `submodule::Demo` has no field named `inocently_mispellable` - --> $DIR/issue-42599_available_fields_note.rs:26:39 + --> $DIR/issue-42599_available_fields_note.rs:16:39 | LL | Self { secret_integer: 2, inocently_mispellable: () } | ^^^^^^^^^^^^^^^^^^^^^ field does not exist - did you mean `innocently_misspellable`? error[E0560]: struct `submodule::Demo` has no field named `egregiously_nonexistent_field` - --> $DIR/issue-42599_available_fields_note.rs:31:39 + --> $DIR/issue-42599_available_fields_note.rs:21:39 | LL | Self { secret_integer: 3, egregiously_nonexistent_field: () } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `submodule::Demo` does not have this field @@ -13,13 +13,13 @@ LL | Self { secret_integer: 3, egregiously_nonexistent_field: () } = note: available fields are: `favorite_integer`, `secret_integer`, `innocently_misspellable`, `another_field`, `yet_another_field` ... and 2 others error[E0609]: no field `inocently_mispellable` on type `submodule::Demo` - --> $DIR/issue-42599_available_fields_note.rs:42:41 + --> $DIR/issue-42599_available_fields_note.rs:32:41 | LL | let innocent_field_misaccess = demo.inocently_mispellable; | ^^^^^^^^^^^^^^^^^^^^^ did you mean `innocently_misspellable`? error[E0609]: no field `egregiously_nonexistent_field` on type `submodule::Demo` - --> $DIR/issue-42599_available_fields_note.rs:45:42 + --> $DIR/issue-42599_available_fields_note.rs:35:42 | LL | let egregious_field_misaccess = demo.egregiously_nonexistent_field; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unknown field diff --git a/src/test/ui/did_you_mean/issue-42764.rs b/src/test/ui/did_you_mean/issue-42764.rs index ff4bb428d5f5f..5e8086d5e84c6 100644 --- a/src/test/ui/did_you_mean/issue-42764.rs +++ b/src/test/ui/did_you_mean/issue-42764.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum DoubleOption { FirstSome(T), AlternativeSome(T), diff --git a/src/test/ui/did_you_mean/issue-42764.stderr b/src/test/ui/did_you_mean/issue-42764.stderr index f1da920872d7c..8d2911b1dadb8 100644 --- a/src/test/ui/did_you_mean/issue-42764.stderr +++ b/src/test/ui/did_you_mean/issue-42764.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-42764.rs:21:43 + --> $DIR/issue-42764.rs:11:43 | LL | this_function_expects_a_double_option(n); | ^ expected enum `DoubleOption`, found usize diff --git a/src/test/ui/did_you_mean/issue-43871-enum-instead-of-variant.rs b/src/test/ui/did_you_mean/issue-43871-enum-instead-of-variant.rs index 7b877523e35cc..f5dbab1ef3586 100644 --- a/src/test/ui/did_you_mean/issue-43871-enum-instead-of-variant.rs +++ b/src/test/ui/did_you_mean/issue-43871-enum-instead-of-variant.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Example { Ex(String), NotEx } fn result_test() { diff --git a/src/test/ui/did_you_mean/issue-43871-enum-instead-of-variant.stderr b/src/test/ui/did_you_mean/issue-43871-enum-instead-of-variant.stderr index 779ae31ca3001..e6d10ffaae935 100644 --- a/src/test/ui/did_you_mean/issue-43871-enum-instead-of-variant.stderr +++ b/src/test/ui/did_you_mean/issue-43871-enum-instead-of-variant.stderr @@ -1,5 +1,5 @@ error[E0423]: expected function, found enum `Option` - --> $DIR/issue-43871-enum-instead-of-variant.rs:14:13 + --> $DIR/issue-43871-enum-instead-of-variant.rs:4:13 | LL | let x = Option(1); //~ ERROR expected function, found enum | ^^^^^^ @@ -9,7 +9,7 @@ LL | let x = Option(1); //~ ERROR expected function, found enum - `std::prelude::v1::Option::Some` error[E0532]: expected tuple struct/variant, found enum `Option` - --> $DIR/issue-43871-enum-instead-of-variant.rs:16:12 + --> $DIR/issue-43871-enum-instead-of-variant.rs:6:12 | LL | if let Option(_) = x { //~ ERROR expected tuple struct/variant, found enum | ^^^^^^ @@ -19,7 +19,7 @@ LL | if let Option(_) = x { //~ ERROR expected tuple struct/variant, found e - `std::prelude::v1::Option::Some` error[E0532]: expected tuple struct/variant, found enum `Example` - --> $DIR/issue-43871-enum-instead-of-variant.rs:22:12 + --> $DIR/issue-43871-enum-instead-of-variant.rs:12:12 | LL | if let Example(_) = y { //~ ERROR expected tuple struct/variant, found enum | ^^^^^^^ diff --git a/src/test/ui/did_you_mean/issue-46718-struct-pattern-dotdotdot.rs b/src/test/ui/did_you_mean/issue-46718-struct-pattern-dotdotdot.rs index 0d3ac8740e287..63e8b2ba002a6 100644 --- a/src/test/ui/did_you_mean/issue-46718-struct-pattern-dotdotdot.rs +++ b/src/test/ui/did_you_mean/issue-46718-struct-pattern-dotdotdot.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused)] struct PersonalityInventory { diff --git a/src/test/ui/did_you_mean/issue-46718-struct-pattern-dotdotdot.stderr b/src/test/ui/did_you_mean/issue-46718-struct-pattern-dotdotdot.stderr index d73e6287f12c9..bfe1ed32859b9 100644 --- a/src/test/ui/did_you_mean/issue-46718-struct-pattern-dotdotdot.stderr +++ b/src/test/ui/did_you_mean/issue-46718-struct-pattern-dotdotdot.stderr @@ -1,5 +1,5 @@ error: expected field pattern, found `...` - --> $DIR/issue-46718-struct-pattern-dotdotdot.rs:21:55 + --> $DIR/issue-46718-struct-pattern-dotdotdot.rs:11:55 | LL | PersonalityInventory { expressivity: exp, ... } => exp | ^^^ help: to omit remaining fields, use one fewer `.`: `..` diff --git a/src/test/ui/did_you_mean/issue-46836-identifier-not-instead-of-negation.rs b/src/test/ui/did_you_mean/issue-46836-identifier-not-instead-of-negation.rs index 45265173419b7..df697ccb616ce 100644 --- a/src/test/ui/did_you_mean/issue-46836-identifier-not-instead-of-negation.rs +++ b/src/test/ui/did_you_mean/issue-46836-identifier-not-instead-of-negation.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn gratitude() { let for_you = false; if not for_you { diff --git a/src/test/ui/did_you_mean/issue-46836-identifier-not-instead-of-negation.stderr b/src/test/ui/did_you_mean/issue-46836-identifier-not-instead-of-negation.stderr index db3478116cbfd..8602fcd667234 100644 --- a/src/test/ui/did_you_mean/issue-46836-identifier-not-instead-of-negation.stderr +++ b/src/test/ui/did_you_mean/issue-46836-identifier-not-instead-of-negation.stderr @@ -1,5 +1,5 @@ error: unexpected `for_you` after identifier - --> $DIR/issue-46836-identifier-not-instead-of-negation.rs:13:12 + --> $DIR/issue-46836-identifier-not-instead-of-negation.rs:3:12 | LL | if not for_you { | ----^^^^^^^ @@ -7,7 +7,7 @@ LL | if not for_you { | help: use `!` to perform logical negation error: unexpected `the_worst` after identifier - --> $DIR/issue-46836-identifier-not-instead-of-negation.rs:21:15 + --> $DIR/issue-46836-identifier-not-instead-of-negation.rs:11:15 | LL | while not the_worst { | ----^^^^^^^^^ @@ -15,7 +15,7 @@ LL | while not the_worst { | help: use `!` to perform logical negation error: unexpected `println` after identifier - --> $DIR/issue-46836-identifier-not-instead-of-negation.rs:30:9 + --> $DIR/issue-46836-identifier-not-instead-of-negation.rs:20:9 | LL | if not // lack of braces is [sic] | ----- help: use `!` to perform logical negation @@ -23,7 +23,7 @@ LL | println!("Then when?"); | ^^^^^^^ error: expected `{`, found `;` - --> $DIR/issue-46836-identifier-not-instead-of-negation.rs:30:31 + --> $DIR/issue-46836-identifier-not-instead-of-negation.rs:20:31 | LL | if not // lack of braces is [sic] | -- this `if` statement has a condition, but no block @@ -31,7 +31,7 @@ LL | println!("Then when?"); | ^ error: unexpected `2` after identifier - --> $DIR/issue-46836-identifier-not-instead-of-negation.rs:36:24 + --> $DIR/issue-46836-identifier-not-instead-of-negation.rs:26:24 | LL | let resource = not 2; | ----^ @@ -39,7 +39,7 @@ LL | let resource = not 2; | help: use `!` to perform logical negation error: unexpected `be_smothered_out_before` after identifier - --> $DIR/issue-46836-identifier-not-instead-of-negation.rs:42:27 + --> $DIR/issue-46836-identifier-not-instead-of-negation.rs:32:27 | LL | let young_souls = not be_smothered_out_before; | ----^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/did_you_mean/issue-48492-tuple-destructure-missing-parens.rs b/src/test/ui/did_you_mean/issue-48492-tuple-destructure-missing-parens.rs index 7bdaaddad8432..43b5f6d5431d6 100644 --- a/src/test/ui/did_you_mean/issue-48492-tuple-destructure-missing-parens.rs +++ b/src/test/ui/did_you_mean/issue-48492-tuple-destructure-missing-parens.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused)] #[derive(Copy, Clone)] diff --git a/src/test/ui/did_you_mean/issue-48492-tuple-destructure-missing-parens.stderr b/src/test/ui/did_you_mean/issue-48492-tuple-destructure-missing-parens.stderr index db3f93af44448..9df881e8e26d9 100644 --- a/src/test/ui/did_you_mean/issue-48492-tuple-destructure-missing-parens.stderr +++ b/src/test/ui/did_you_mean/issue-48492-tuple-destructure-missing-parens.stderr @@ -1,35 +1,35 @@ error: unexpected `,` in pattern - --> $DIR/issue-48492-tuple-destructure-missing-parens.rs:48:17 + --> $DIR/issue-48492-tuple-destructure-missing-parens.rs:38:17 | LL | while let b1, b2, b3 = reading_frame.next().expect("there should be a start codon") { | --^------- help: try adding parentheses: `(b1, b2, b3)` error: unexpected `,` in pattern - --> $DIR/issue-48492-tuple-destructure-missing-parens.rs:59:14 + --> $DIR/issue-48492-tuple-destructure-missing-parens.rs:49:14 | LL | if let b1, b2, b3 = reading_frame.next().unwrap() { | --^------- help: try adding parentheses: `(b1, b2, b3)` error: unexpected `,` in pattern - --> $DIR/issue-48492-tuple-destructure-missing-parens.rs:69:28 + --> $DIR/issue-48492-tuple-destructure-missing-parens.rs:59:28 | LL | Nucleotide::Adenine, Nucleotide::Cytosine, _ => true | -------------------^------------------------ help: try adding parentheses: `(Nucleotide::Adenine, Nucleotide::Cytosine, _)` error: unexpected `,` in pattern - --> $DIR/issue-48492-tuple-destructure-missing-parens.rs:77:10 + --> $DIR/issue-48492-tuple-destructure-missing-parens.rs:67:10 | LL | for x, _barr_body in women.iter().map(|woman| woman.allosomes.clone()) { | -^----------- help: try adding parentheses: `(x, _barr_body)` error: unexpected `,` in pattern - --> $DIR/issue-48492-tuple-destructure-missing-parens.rs:85:10 + --> $DIR/issue-48492-tuple-destructure-missing-parens.rs:75:10 | LL | for x, y @ Allosome::Y(_) in men.iter().map(|man| man.allosomes.clone()) { | -^------------------- help: try adding parentheses: `(x, y @ Allosome::Y(_))` error: unexpected `,` in pattern - --> $DIR/issue-48492-tuple-destructure-missing-parens.rs:94:14 + --> $DIR/issue-48492-tuple-destructure-missing-parens.rs:84:14 | LL | let women, men: (Vec, Vec) = genomes.iter().cloned() | -----^---- help: try adding parentheses: `(women, men)` diff --git a/src/test/ui/did_you_mean/issue-49746-unicode-confusable-in-float-literal-expt.rs b/src/test/ui/did_you_mean/issue-49746-unicode-confusable-in-float-literal-expt.rs index 9daf9df695548..b4795e76c985f 100644 --- a/src/test/ui/did_you_mean/issue-49746-unicode-confusable-in-float-literal-expt.rs +++ b/src/test/ui/did_you_mean/issue-49746-unicode-confusable-in-float-literal-expt.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const UNIVERSAL_GRAVITATIONAL_CONSTANT: f64 = 6.674e−11; // m³⋅kg⁻¹⋅s⁻² //~^ ERROR expected at least one digit in exponent diff --git a/src/test/ui/did_you_mean/issue-49746-unicode-confusable-in-float-literal-expt.stderr b/src/test/ui/did_you_mean/issue-49746-unicode-confusable-in-float-literal-expt.stderr index b387472e0e749..253deb2be6e0d 100644 --- a/src/test/ui/did_you_mean/issue-49746-unicode-confusable-in-float-literal-expt.stderr +++ b/src/test/ui/did_you_mean/issue-49746-unicode-confusable-in-float-literal-expt.stderr @@ -1,5 +1,5 @@ error: expected at least one digit in exponent - --> $DIR/issue-49746-unicode-confusable-in-float-literal-expt.rs:11:53 + --> $DIR/issue-49746-unicode-confusable-in-float-literal-expt.rs:1:53 | LL | const UNIVERSAL_GRAVITATIONAL_CONSTANT: f64 = 6.674e−11; // m³⋅kg⁻¹⋅s⁻² | ^ diff --git a/src/test/ui/did_you_mean/issue-53280-expected-float-found-integer-literal.rs b/src/test/ui/did_you_mean/issue-53280-expected-float-found-integer-literal.rs index 243e3a65f391a..73f1856ca1d32 100644 --- a/src/test/ui/did_you_mean/issue-53280-expected-float-found-integer-literal.rs +++ b/src/test/ui/did_you_mean/issue-53280-expected-float-found-integer-literal.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let sixteen: f32 = 16; //~^ ERROR mismatched types diff --git a/src/test/ui/did_you_mean/issue-53280-expected-float-found-integer-literal.stderr b/src/test/ui/did_you_mean/issue-53280-expected-float-found-integer-literal.stderr index caaa9541417fb..9f09c9b53ccea 100644 --- a/src/test/ui/did_you_mean/issue-53280-expected-float-found-integer-literal.stderr +++ b/src/test/ui/did_you_mean/issue-53280-expected-float-found-integer-literal.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-53280-expected-float-found-integer-literal.rs:12:24 + --> $DIR/issue-53280-expected-float-found-integer-literal.rs:2:24 | LL | let sixteen: f32 = 16; | ^^ @@ -11,7 +11,7 @@ LL | let sixteen: f32 = 16; found type `{integer}` error[E0308]: mismatched types - --> $DIR/issue-53280-expected-float-found-integer-literal.rs:15:38 + --> $DIR/issue-53280-expected-float-found-integer-literal.rs:5:38 | LL | let a_million_and_seventy: f64 = 1_000_070; | ^^^^^^^^^ @@ -23,7 +23,7 @@ LL | let a_million_and_seventy: f64 = 1_000_070; found type `{integer}` error[E0308]: mismatched types - --> $DIR/issue-53280-expected-float-found-integer-literal.rs:18:30 + --> $DIR/issue-53280-expected-float-found-integer-literal.rs:8:30 | LL | let negative_nine: f32 = -9; | ^^ @@ -35,7 +35,7 @@ LL | let negative_nine: f32 = -9; found type `{integer}` error[E0308]: mismatched types - --> $DIR/issue-53280-expected-float-found-integer-literal.rs:25:30 + --> $DIR/issue-53280-expected-float-found-integer-literal.rs:15:30 | LL | let sixteen_again: f64 = 0x10; | ^^^^ expected f64, found integral variable @@ -44,7 +44,7 @@ LL | let sixteen_again: f64 = 0x10; found type `{integer}` error[E0308]: mismatched types - --> $DIR/issue-53280-expected-float-found-integer-literal.rs:27:30 + --> $DIR/issue-53280-expected-float-found-integer-literal.rs:17:30 | LL | let and_once_more: f32 = 0o20; | ^^^^ expected f32, found integral variable diff --git a/src/test/ui/did_you_mean/match-refactor-to-expr.rs b/src/test/ui/did_you_mean/match-refactor-to-expr.rs index 3c88608697aad..7523177650553 100644 --- a/src/test/ui/did_you_mean/match-refactor-to-expr.rs +++ b/src/test/ui/did_you_mean/match-refactor-to-expr.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only fn main() { diff --git a/src/test/ui/did_you_mean/match-refactor-to-expr.stderr b/src/test/ui/did_you_mean/match-refactor-to-expr.stderr index ecca781684cec..e685b10c4f47e 100644 --- a/src/test/ui/did_you_mean/match-refactor-to-expr.stderr +++ b/src/test/ui/did_you_mean/match-refactor-to-expr.stderr @@ -1,5 +1,5 @@ error: expected one of `.`, `?`, `{`, or an operator, found `;` - --> $DIR/match-refactor-to-expr.rs:18:9 + --> $DIR/match-refactor-to-expr.rs:8:9 | LL | match | ----- help: try removing this `match` diff --git a/src/test/ui/did_you_mean/multiple-pattern-typo.rs b/src/test/ui/did_you_mean/multiple-pattern-typo.rs index a8994fd6c96aa..14ad33d53b08c 100644 --- a/src/test/ui/did_you_mean/multiple-pattern-typo.rs +++ b/src/test/ui/did_you_mean/multiple-pattern-typo.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = 3; match x { diff --git a/src/test/ui/did_you_mean/multiple-pattern-typo.stderr b/src/test/ui/did_you_mean/multiple-pattern-typo.stderr index c3a706d5901fb..2825ff46825a2 100644 --- a/src/test/ui/did_you_mean/multiple-pattern-typo.stderr +++ b/src/test/ui/did_you_mean/multiple-pattern-typo.stderr @@ -1,5 +1,5 @@ error: unexpected token `||` after pattern - --> $DIR/multiple-pattern-typo.rs:14:15 + --> $DIR/multiple-pattern-typo.rs:4:15 | LL | 1 | 2 || 3 => (), //~ ERROR unexpected token `||` after pattern | ^^ help: use a single `|` to specify multiple patterns: `|` diff --git a/src/test/ui/did_you_mean/pub-macro-rules.rs b/src/test/ui/did_you_mean/pub-macro-rules.rs index 65a0d642cd7d1..c5393703f7091 100644 --- a/src/test/ui/did_you_mean/pub-macro-rules.rs +++ b/src/test/ui/did_you_mean/pub-macro-rules.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_use] mod bleh { pub macro_rules! foo { //~ ERROR can't qualify macro_rules invocation ($n:ident) => ( diff --git a/src/test/ui/did_you_mean/pub-macro-rules.stderr b/src/test/ui/did_you_mean/pub-macro-rules.stderr index dfeab75525ba3..7e62fc7c4fc0d 100644 --- a/src/test/ui/did_you_mean/pub-macro-rules.stderr +++ b/src/test/ui/did_you_mean/pub-macro-rules.stderr @@ -1,5 +1,5 @@ error: can't qualify macro_rules invocation with `pub` - --> $DIR/pub-macro-rules.rs:12:5 + --> $DIR/pub-macro-rules.rs:2:5 | LL | pub macro_rules! foo { //~ ERROR can't qualify macro_rules invocation | ^^^ help: try exporting the macro: `#[macro_export]` diff --git a/src/test/ui/did_you_mean/recursion_limit.rs b/src/test/ui/did_you_mean/recursion_limit.rs index 2d27f167a03a4..38db12960e788 100644 --- a/src/test/ui/did_you_mean/recursion_limit.rs +++ b/src/test/ui/did_you_mean/recursion_limit.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the recursion limit can be changed and that the compiler // suggests a fix. In this case, we have deeply nested types that will // fail the `Send` check by overflow when the recursion limit is set diff --git a/src/test/ui/did_you_mean/recursion_limit.stderr b/src/test/ui/did_you_mean/recursion_limit.stderr index 691c7ccd9fdf2..08947fd7fdcba 100644 --- a/src/test/ui/did_you_mean/recursion_limit.stderr +++ b/src/test/ui/did_you_mean/recursion_limit.stderr @@ -1,5 +1,5 @@ error[E0275]: overflow evaluating the requirement `K: std::marker::Send` - --> $DIR/recursion_limit.rs:44:5 + --> $DIR/recursion_limit.rs:34:5 | LL | is_send::(); //~ ERROR overflow evaluating the requirement | ^^^^^^^^^^^^ @@ -16,7 +16,7 @@ LL | is_send::(); //~ ERROR overflow evaluating the requirement = note: required because it appears within the type `B` = note: required because it appears within the type `A` note: required by `is_send` - --> $DIR/recursion_limit.rs:41:1 + --> $DIR/recursion_limit.rs:31:1 | LL | fn is_send() { } | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/did_you_mean/recursion_limit_deref.rs b/src/test/ui/did_you_mean/recursion_limit_deref.rs index f5e75f40fca08..76e555e5aa6e6 100644 --- a/src/test/ui/did_you_mean/recursion_limit_deref.rs +++ b/src/test/ui/did_you_mean/recursion_limit_deref.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the recursion limit can be changed and that the compiler // suggests a fix. In this case, we have a long chain of Deref impls // which will cause an overflow during the autoderef loop. diff --git a/src/test/ui/did_you_mean/recursion_limit_deref.stderr b/src/test/ui/did_you_mean/recursion_limit_deref.stderr index 20a94f7aac196..7855bb0de4126 100644 --- a/src/test/ui/did_you_mean/recursion_limit_deref.stderr +++ b/src/test/ui/did_you_mean/recursion_limit_deref.stderr @@ -1,5 +1,5 @@ error[E0055]: reached the recursion limit while auto-dereferencing I - --> $DIR/recursion_limit_deref.rs:60:22 + --> $DIR/recursion_limit_deref.rs:50:22 | LL | let x: &Bottom = &t; //~ ERROR mismatched types | ^^ deref recursion limit reached @@ -7,7 +7,7 @@ LL | let x: &Bottom = &t; //~ ERROR mismatched types = help: consider adding a `#![recursion_limit="20"]` attribute to your crate error[E0308]: mismatched types - --> $DIR/recursion_limit_deref.rs:60:22 + --> $DIR/recursion_limit_deref.rs:50:22 | LL | let x: &Bottom = &t; //~ ERROR mismatched types | ^^ expected struct `Bottom`, found struct `Top` diff --git a/src/test/ui/did_you_mean/recursion_limit_macro.rs b/src/test/ui/did_you_mean/recursion_limit_macro.rs index 16d07f369907b..c9415361cf826 100644 --- a/src/test/ui/did_you_mean/recursion_limit_macro.rs +++ b/src/test/ui/did_you_mean/recursion_limit_macro.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the recursion limit can be changed and that the compiler // suggests a fix. In this case, we have a recursing macro that will // overflow if the number of arguments surpasses the recursion limit. diff --git a/src/test/ui/did_you_mean/recursion_limit_macro.stderr b/src/test/ui/did_you_mean/recursion_limit_macro.stderr index 265a688df9910..5941d088f3aad 100644 --- a/src/test/ui/did_you_mean/recursion_limit_macro.stderr +++ b/src/test/ui/did_you_mean/recursion_limit_macro.stderr @@ -1,5 +1,5 @@ error: recursion limit reached while expanding the macro `recurse` - --> $DIR/recursion_limit_macro.rs:20:31 + --> $DIR/recursion_limit_macro.rs:10:31 | LL | ($t:tt $($tail:tt)*) => { recurse!($($tail)*) }; //~ ERROR recursion limit | ^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/did_you_mean/trait-object-reference-without-parens-suggestion.rs b/src/test/ui/did_you_mean/trait-object-reference-without-parens-suggestion.rs index 76bc971e115f7..a05227416cfd7 100644 --- a/src/test/ui/did_you_mean/trait-object-reference-without-parens-suggestion.rs +++ b/src/test/ui/did_you_mean/trait-object-reference-without-parens-suggestion.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let _: &Copy + 'static; //~ ERROR expected a path //~^ ERROR cannot be made into an object diff --git a/src/test/ui/did_you_mean/trait-object-reference-without-parens-suggestion.stderr b/src/test/ui/did_you_mean/trait-object-reference-without-parens-suggestion.stderr index 6dd216489313c..85c0527477350 100644 --- a/src/test/ui/did_you_mean/trait-object-reference-without-parens-suggestion.stderr +++ b/src/test/ui/did_you_mean/trait-object-reference-without-parens-suggestion.stderr @@ -1,17 +1,17 @@ error[E0178]: expected a path on the left-hand side of `+`, not `&Copy` - --> $DIR/trait-object-reference-without-parens-suggestion.rs:12:12 + --> $DIR/trait-object-reference-without-parens-suggestion.rs:2:12 | LL | let _: &Copy + 'static; //~ ERROR expected a path | ^^^^^^^^^^^^^^^ help: try adding parentheses: `&(Copy + 'static)` error[E0178]: expected a path on the left-hand side of `+`, not `&'static Copy` - --> $DIR/trait-object-reference-without-parens-suggestion.rs:14:12 + --> $DIR/trait-object-reference-without-parens-suggestion.rs:4:12 | LL | let _: &'static Copy + 'static; //~ ERROR expected a path | ^^^^^^^^^^^^^^^^^^^^^^^ help: try adding parentheses: `&'static (Copy + 'static)` error[E0038]: the trait `std::marker::Copy` cannot be made into an object - --> $DIR/trait-object-reference-without-parens-suggestion.rs:12:12 + --> $DIR/trait-object-reference-without-parens-suggestion.rs:2:12 | LL | let _: &Copy + 'static; //~ ERROR expected a path | ^^^^^ the trait `std::marker::Copy` cannot be made into an object diff --git a/src/test/ui/directory_ownership/foo/mod_file_not_owning/aux2.rs b/src/test/ui/directory_ownership/foo/mod_file_not_owning/aux2.rs index fc4bca865c932..e69de29bb2d1d 100644 --- a/src/test/ui/directory_ownership/foo/mod_file_not_owning/aux2.rs +++ b/src/test/ui/directory_ownership/foo/mod_file_not_owning/aux2.rs @@ -1,9 +0,0 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. diff --git a/src/test/ui/directory_ownership/foo/mod_file_not_owning_aux2.rs b/src/test/ui/directory_ownership/foo/mod_file_not_owning_aux2.rs index fc4bca865c932..e69de29bb2d1d 100644 --- a/src/test/ui/directory_ownership/foo/mod_file_not_owning_aux2.rs +++ b/src/test/ui/directory_ownership/foo/mod_file_not_owning_aux2.rs @@ -1,9 +0,0 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. diff --git a/src/test/ui/directory_ownership/macro-expanded-mod.rs b/src/test/ui/directory_ownership/macro-expanded-mod.rs index 8e631a64f7a27..ca139755ac04a 100644 --- a/src/test/ui/directory_ownership/macro-expanded-mod.rs +++ b/src/test/ui/directory_ownership/macro-expanded-mod.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that macro-expanded non-inline modules behave correctly macro_rules! mod_decl { diff --git a/src/test/ui/directory_ownership/macro-expanded-mod.stderr b/src/test/ui/directory_ownership/macro-expanded-mod.stderr index a9efcd883c15b..62891f61bf774 100644 --- a/src/test/ui/directory_ownership/macro-expanded-mod.stderr +++ b/src/test/ui/directory_ownership/macro-expanded-mod.stderr @@ -1,5 +1,5 @@ error: Cannot declare a non-inline module inside a block unless it has a path attribute - --> $DIR/macro-expanded-mod.rs:22:15 + --> $DIR/macro-expanded-mod.rs:12:15 | LL | mod_decl!(foo); //~ ERROR Cannot declare a non-inline module inside a block | ^^^ diff --git a/src/test/ui/directory_ownership/macro_expanded_mod_helper/foo/bar.rs b/src/test/ui/directory_ownership/macro_expanded_mod_helper/foo/bar.rs index 4ef92981314fd..01c087dbc9e77 100644 --- a/src/test/ui/directory_ownership/macro_expanded_mod_helper/foo/bar.rs +++ b/src/test/ui/directory_ownership/macro_expanded_mod_helper/foo/bar.rs @@ -1,11 +1 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-test not a test, auxiliary diff --git a/src/test/ui/directory_ownership/macro_expanded_mod_helper/foo/mod.rs b/src/test/ui/directory_ownership/macro_expanded_mod_helper/foo/mod.rs index 41a8c288e7cdb..2ec1c8bcc9ce2 100644 --- a/src/test/ui/directory_ownership/macro_expanded_mod_helper/foo/mod.rs +++ b/src/test/ui/directory_ownership/macro_expanded_mod_helper/foo/mod.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-test not a test, auxiliary mod_decl!(bar); diff --git a/src/test/ui/directory_ownership/mod_file_not_owning.rs b/src/test/ui/directory_ownership/mod_file_not_owning.rs index ff93fddf9b366..6a0b753ecd9a2 100644 --- a/src/test/ui/directory_ownership/mod_file_not_owning.rs +++ b/src/test/ui/directory_ownership/mod_file_not_owning.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: mod statements in non-mod.rs files are unstable mod mod_file_not_owning_aux1; diff --git a/src/test/ui/directory_ownership/mod_file_not_owning.stderr b/src/test/ui/directory_ownership/mod_file_not_owning.stderr index e2937573997fc..5f116615d32c5 100644 --- a/src/test/ui/directory_ownership/mod_file_not_owning.stderr +++ b/src/test/ui/directory_ownership/mod_file_not_owning.stderr @@ -1,5 +1,5 @@ error[E0658]: mod statements in non-mod.rs files are unstable (see issue #44660) - --> $DIR/mod_file_not_owning_aux1.rs:14:17 + --> $DIR/mod_file_not_owning_aux1.rs:4:17 | LL | () => { mod mod_file_not_owning_aux2; } | ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/directory_ownership/mod_file_not_owning_aux1.rs b/src/test/ui/directory_ownership/mod_file_not_owning_aux1.rs index 4ac94a92e376c..eb5e8e3e1ab71 100644 --- a/src/test/ui/directory_ownership/mod_file_not_owning_aux1.rs +++ b/src/test/ui/directory_ownership/mod_file_not_owning_aux1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-test this is not a test macro_rules! m { diff --git a/src/test/ui/directory_ownership/mod_file_not_owning_aux1/mod_file_not_owning_aux2.rs b/src/test/ui/directory_ownership/mod_file_not_owning_aux1/mod_file_not_owning_aux2.rs index fc4bca865c932..e69de29bb2d1d 100644 --- a/src/test/ui/directory_ownership/mod_file_not_owning_aux1/mod_file_not_owning_aux2.rs +++ b/src/test/ui/directory_ownership/mod_file_not_owning_aux1/mod_file_not_owning_aux2.rs @@ -1,9 +0,0 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. diff --git a/src/test/ui/directory_ownership/mod_file_not_owning_aux2.rs b/src/test/ui/directory_ownership/mod_file_not_owning_aux2.rs index 41401d640f624..920938c4ad42a 100644 --- a/src/test/ui/directory_ownership/mod_file_not_owning_aux2.rs +++ b/src/test/ui/directory_ownership/mod_file_not_owning_aux2.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-test this is not a test diff --git a/src/test/ui/directory_ownership/mod_file_not_owning_aux3.rs b/src/test/ui/directory_ownership/mod_file_not_owning_aux3.rs index 3a164fd55d927..6e4a392895655 100644 --- a/src/test/ui/directory_ownership/mod_file_not_owning_aux3.rs +++ b/src/test/ui/directory_ownership/mod_file_not_owning_aux3.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-test this is not a test mod mod_file_not_owning_aux2; diff --git a/src/test/ui/directory_ownership/non-inline-mod-restriction.rs b/src/test/ui/directory_ownership/non-inline-mod-restriction.rs index c4ede12e82082..af31b8a49281f 100644 --- a/src/test/ui/directory_ownership/non-inline-mod-restriction.rs +++ b/src/test/ui/directory_ownership/non-inline-mod-restriction.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that non-inline modules are not allowed inside blocks. fn main() { diff --git a/src/test/ui/directory_ownership/non-inline-mod-restriction.stderr b/src/test/ui/directory_ownership/non-inline-mod-restriction.stderr index 93debdd675aad..6ceaa2e346a07 100644 --- a/src/test/ui/directory_ownership/non-inline-mod-restriction.stderr +++ b/src/test/ui/directory_ownership/non-inline-mod-restriction.stderr @@ -1,5 +1,5 @@ error: Cannot declare a non-inline module inside a block unless it has a path attribute - --> $DIR/non-inline-mod-restriction.rs:14:9 + --> $DIR/non-inline-mod-restriction.rs:4:9 | LL | mod foo; //~ ERROR Cannot declare a non-inline module inside a block | ^^^ diff --git a/src/test/ui/directory_ownership/unowned_mod_with_path.rs b/src/test/ui/directory_ownership/unowned_mod_with_path.rs index 0cffb7cc9e517..066e0d9596cfb 100644 --- a/src/test/ui/directory_ownership/unowned_mod_with_path.rs +++ b/src/test/ui/directory_ownership/unowned_mod_with_path.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: mod statements in non-mod.rs files are unstable // This is not a directory owner since the file name is not "mod.rs". diff --git a/src/test/ui/directory_ownership/unowned_mod_with_path.stderr b/src/test/ui/directory_ownership/unowned_mod_with_path.stderr index 0c0b428143416..1a425d8741b83 100644 --- a/src/test/ui/directory_ownership/unowned_mod_with_path.stderr +++ b/src/test/ui/directory_ownership/unowned_mod_with_path.stderr @@ -1,5 +1,5 @@ error[E0658]: mod statements in non-mod.rs files are unstable (see issue #44660) - --> $DIR/mod_file_not_owning_aux1.rs:14:17 + --> $DIR/mod_file_not_owning_aux1.rs:4:17 | LL | () => { mod mod_file_not_owning_aux2; } | ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-let.nll.stderr b/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-let.nll.stderr index 8e0599370287f..59cb804a801fd 100644 --- a/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-let.nll.stderr +++ b/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-let.nll.stderr @@ -1,5 +1,5 @@ error[E0509]: cannot move out of type `X`, which implements the `Drop` trait - --> $DIR/disallowed-deconstructing-destructing-struct-let.rs:22:22 + --> $DIR/disallowed-deconstructing-destructing-struct-let.rs:12:22 | LL | let X { x: y } = x; //~ ERROR cannot move out of type | - ^ cannot move out of here @@ -7,7 +7,7 @@ LL | let X { x: y } = x; //~ ERROR cannot move out of type | data moved here | note: move occurs because `y` has type `std::string::String`, which does not implement the `Copy` trait - --> $DIR/disallowed-deconstructing-destructing-struct-let.rs:22:16 + --> $DIR/disallowed-deconstructing-destructing-struct-let.rs:12:16 | LL | let X { x: y } = x; //~ ERROR cannot move out of type | ^ diff --git a/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-let.rs b/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-let.rs index 2621820c2229f..8e394498a2349 100644 --- a/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-let.rs +++ b/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-let.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct X { x: String, } diff --git a/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-let.stderr b/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-let.stderr index cbf5fc61f9304..cb32616d6e6fb 100644 --- a/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-let.stderr +++ b/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-let.stderr @@ -1,5 +1,5 @@ error[E0509]: cannot move out of type `X`, which implements the `Drop` trait - --> $DIR/disallowed-deconstructing-destructing-struct-let.rs:22:9 + --> $DIR/disallowed-deconstructing-destructing-struct-let.rs:12:9 | LL | let X { x: y } = x; //~ ERROR cannot move out of type | ^^^^^^^-^^ diff --git a/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-match.nll.stderr b/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-match.nll.stderr index dd1a3ef2a2b98..2143c2f9b2244 100644 --- a/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-match.nll.stderr +++ b/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-match.nll.stderr @@ -1,5 +1,5 @@ error[E0509]: cannot move out of type `X`, which implements the `Drop` trait - --> $DIR/disallowed-deconstructing-destructing-struct-match.rs:24:11 + --> $DIR/disallowed-deconstructing-destructing-struct-match.rs:14:11 | LL | match x { | ^ cannot move out of here @@ -7,7 +7,7 @@ LL | X { x: y } => println!("contents: {}", y) | - data moved here | note: move occurs because `y` has type `std::string::String`, which does not implement the `Copy` trait - --> $DIR/disallowed-deconstructing-destructing-struct-match.rs:25:16 + --> $DIR/disallowed-deconstructing-destructing-struct-match.rs:15:16 | LL | X { x: y } => println!("contents: {}", y) | ^ diff --git a/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-match.rs b/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-match.rs index 38049209903d1..3a5ed6e3b3e53 100644 --- a/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-match.rs +++ b/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-match.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct X { x: String, } diff --git a/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-match.stderr b/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-match.stderr index af2a1a06b56aa..8be1b385afe6c 100644 --- a/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-match.stderr +++ b/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-match.stderr @@ -1,5 +1,5 @@ error[E0509]: cannot move out of type `X`, which implements the `Drop` trait - --> $DIR/disallowed-deconstructing-destructing-struct-match.rs:25:9 + --> $DIR/disallowed-deconstructing-destructing-struct-match.rs:15:9 | LL | X { x: y } => println!("contents: {}", y) | ^^^^^^^-^^ diff --git a/src/test/ui/discrim/discrim-ill-typed.rs b/src/test/ui/discrim/discrim-ill-typed.rs index 62e54c3f23773..3844d21094eea 100644 --- a/src/test/ui/discrim/discrim-ill-typed.rs +++ b/src/test/ui/discrim/discrim-ill-typed.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // When explicit discriminant value has // a type that does not match the representation // type, rustc should fail gracefully. diff --git a/src/test/ui/discrim/discrim-ill-typed.stderr b/src/test/ui/discrim/discrim-ill-typed.stderr index 50911037794a9..14cdb9e07f902 100644 --- a/src/test/ui/discrim/discrim-ill-typed.stderr +++ b/src/test/ui/discrim/discrim-ill-typed.stderr @@ -1,47 +1,47 @@ error[E0308]: mismatched types - --> $DIR/discrim-ill-typed.rs:27:16 + --> $DIR/discrim-ill-typed.rs:17:16 | LL | OhNo = 0_u8, | ^^^^ expected i8, found u8 error[E0308]: mismatched types - --> $DIR/discrim-ill-typed.rs:40:16 + --> $DIR/discrim-ill-typed.rs:30:16 | LL | OhNo = 0_i8, | ^^^^ expected u8, found i8 error[E0308]: mismatched types - --> $DIR/discrim-ill-typed.rs:53:16 + --> $DIR/discrim-ill-typed.rs:43:16 | LL | OhNo = 0_u16, | ^^^^^ expected i16, found u16 error[E0308]: mismatched types - --> $DIR/discrim-ill-typed.rs:66:16 + --> $DIR/discrim-ill-typed.rs:56:16 | LL | OhNo = 0_i16, | ^^^^^ expected u16, found i16 error[E0308]: mismatched types - --> $DIR/discrim-ill-typed.rs:79:16 + --> $DIR/discrim-ill-typed.rs:69:16 | LL | OhNo = 0_u32, | ^^^^^ expected i32, found u32 error[E0308]: mismatched types - --> $DIR/discrim-ill-typed.rs:92:16 + --> $DIR/discrim-ill-typed.rs:82:16 | LL | OhNo = 0_i32, | ^^^^^ expected u32, found i32 error[E0308]: mismatched types - --> $DIR/discrim-ill-typed.rs:105:16 + --> $DIR/discrim-ill-typed.rs:95:16 | LL | OhNo = 0_u64, | ^^^^^ expected i64, found u64 error[E0308]: mismatched types - --> $DIR/discrim-ill-typed.rs:118:16 + --> $DIR/discrim-ill-typed.rs:108:16 | LL | OhNo = 0_i64, | ^^^^^ expected u64, found i64 diff --git a/src/test/ui/discrim/discrim-overflow-2.rs b/src/test/ui/discrim/discrim-overflow-2.rs index 9f77e77d158cd..9ff39cd048454 100644 --- a/src/test/ui/discrim/discrim-overflow-2.rs +++ b/src/test/ui/discrim/discrim-overflow-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // Issue 23030: Detect overflowing discriminant diff --git a/src/test/ui/discrim/discrim-overflow-2.stderr b/src/test/ui/discrim/discrim-overflow-2.stderr index bd610bc7163d7..c490509142ac6 100644 --- a/src/test/ui/discrim/discrim-overflow-2.stderr +++ b/src/test/ui/discrim/discrim-overflow-2.stderr @@ -1,5 +1,5 @@ error[E0370]: enum discriminant overflowed - --> $DIR/discrim-overflow-2.rs:27:9 + --> $DIR/discrim-overflow-2.rs:17:9 | LL | OhNo, //~ ERROR enum discriminant overflowed [E0370] | ^^^^ overflowed on value after 127 @@ -7,7 +7,7 @@ LL | OhNo, //~ ERROR enum discriminant overflowed [E0370] = note: explicitly set `OhNo = -128` if that is desired outcome error[E0370]: enum discriminant overflowed - --> $DIR/discrim-overflow-2.rs:36:9 + --> $DIR/discrim-overflow-2.rs:26:9 | LL | OhNo, //~ ERROR enum discriminant overflowed [E0370] | ^^^^ overflowed on value after 255 @@ -15,7 +15,7 @@ LL | OhNo, //~ ERROR enum discriminant overflowed [E0370] = note: explicitly set `OhNo = 0` if that is desired outcome error[E0370]: enum discriminant overflowed - --> $DIR/discrim-overflow-2.rs:45:9 + --> $DIR/discrim-overflow-2.rs:35:9 | LL | OhNo, //~ ERROR enum discriminant overflowed [E0370] | ^^^^ overflowed on value after 32767 @@ -23,7 +23,7 @@ LL | OhNo, //~ ERROR enum discriminant overflowed [E0370] = note: explicitly set `OhNo = -32768` if that is desired outcome error[E0370]: enum discriminant overflowed - --> $DIR/discrim-overflow-2.rs:54:9 + --> $DIR/discrim-overflow-2.rs:44:9 | LL | OhNo, //~ ERROR enum discriminant overflowed [E0370] | ^^^^ overflowed on value after 65535 @@ -31,7 +31,7 @@ LL | OhNo, //~ ERROR enum discriminant overflowed [E0370] = note: explicitly set `OhNo = 0` if that is desired outcome error[E0370]: enum discriminant overflowed - --> $DIR/discrim-overflow-2.rs:63:9 + --> $DIR/discrim-overflow-2.rs:53:9 | LL | OhNo, //~ ERROR enum discriminant overflowed [E0370] | ^^^^ overflowed on value after 2147483647 @@ -39,7 +39,7 @@ LL | OhNo, //~ ERROR enum discriminant overflowed [E0370] = note: explicitly set `OhNo = -2147483648` if that is desired outcome error[E0370]: enum discriminant overflowed - --> $DIR/discrim-overflow-2.rs:72:9 + --> $DIR/discrim-overflow-2.rs:62:9 | LL | OhNo, //~ ERROR enum discriminant overflowed [E0370] | ^^^^ overflowed on value after 4294967295 @@ -47,7 +47,7 @@ LL | OhNo, //~ ERROR enum discriminant overflowed [E0370] = note: explicitly set `OhNo = 0` if that is desired outcome error[E0370]: enum discriminant overflowed - --> $DIR/discrim-overflow-2.rs:81:9 + --> $DIR/discrim-overflow-2.rs:71:9 | LL | OhNo, //~ ERROR enum discriminant overflowed [E0370] | ^^^^ overflowed on value after 9223372036854775807 @@ -55,7 +55,7 @@ LL | OhNo, //~ ERROR enum discriminant overflowed [E0370] = note: explicitly set `OhNo = -9223372036854775808` if that is desired outcome error[E0370]: enum discriminant overflowed - --> $DIR/discrim-overflow-2.rs:90:9 + --> $DIR/discrim-overflow-2.rs:80:9 | LL | OhNo, //~ ERROR enum discriminant overflowed [E0370] | ^^^^ overflowed on value after 18446744073709551615 diff --git a/src/test/ui/discrim/discrim-overflow.rs b/src/test/ui/discrim/discrim-overflow.rs index 16b417c61a517..c612661178cf6 100644 --- a/src/test/ui/discrim/discrim-overflow.rs +++ b/src/test/ui/discrim/discrim-overflow.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // Issue 23030: Detect overflowing discriminant diff --git a/src/test/ui/discrim/discrim-overflow.stderr b/src/test/ui/discrim/discrim-overflow.stderr index ef784679ce02a..e71df51e36d00 100644 --- a/src/test/ui/discrim/discrim-overflow.stderr +++ b/src/test/ui/discrim/discrim-overflow.stderr @@ -1,5 +1,5 @@ error[E0370]: enum discriminant overflowed - --> $DIR/discrim-overflow.rs:25:9 + --> $DIR/discrim-overflow.rs:15:9 | LL | OhNo, //~ ERROR enum discriminant overflowed [E0370] | ^^^^ overflowed on value after 127 @@ -7,7 +7,7 @@ LL | OhNo, //~ ERROR enum discriminant overflowed [E0370] = note: explicitly set `OhNo = -128` if that is desired outcome error[E0370]: enum discriminant overflowed - --> $DIR/discrim-overflow.rs:36:9 + --> $DIR/discrim-overflow.rs:26:9 | LL | OhNo, //~ ERROR enum discriminant overflowed [E0370] | ^^^^ overflowed on value after 255 @@ -15,7 +15,7 @@ LL | OhNo, //~ ERROR enum discriminant overflowed [E0370] = note: explicitly set `OhNo = 0` if that is desired outcome error[E0370]: enum discriminant overflowed - --> $DIR/discrim-overflow.rs:47:9 + --> $DIR/discrim-overflow.rs:37:9 | LL | OhNo, //~ ERROR enum discriminant overflowed [E0370] | ^^^^ overflowed on value after 32767 @@ -23,7 +23,7 @@ LL | OhNo, //~ ERROR enum discriminant overflowed [E0370] = note: explicitly set `OhNo = -32768` if that is desired outcome error[E0370]: enum discriminant overflowed - --> $DIR/discrim-overflow.rs:58:9 + --> $DIR/discrim-overflow.rs:48:9 | LL | OhNo, //~ ERROR enum discriminant overflowed [E0370] | ^^^^ overflowed on value after 65535 @@ -31,7 +31,7 @@ LL | OhNo, //~ ERROR enum discriminant overflowed [E0370] = note: explicitly set `OhNo = 0` if that is desired outcome error[E0370]: enum discriminant overflowed - --> $DIR/discrim-overflow.rs:70:9 + --> $DIR/discrim-overflow.rs:60:9 | LL | OhNo, //~ ERROR enum discriminant overflowed [E0370] | ^^^^ overflowed on value after 2147483647 @@ -39,7 +39,7 @@ LL | OhNo, //~ ERROR enum discriminant overflowed [E0370] = note: explicitly set `OhNo = -2147483648` if that is desired outcome error[E0370]: enum discriminant overflowed - --> $DIR/discrim-overflow.rs:82:9 + --> $DIR/discrim-overflow.rs:72:9 | LL | OhNo, //~ ERROR enum discriminant overflowed [E0370] | ^^^^ overflowed on value after 4294967295 @@ -47,7 +47,7 @@ LL | OhNo, //~ ERROR enum discriminant overflowed [E0370] = note: explicitly set `OhNo = 0` if that is desired outcome error[E0370]: enum discriminant overflowed - --> $DIR/discrim-overflow.rs:94:9 + --> $DIR/discrim-overflow.rs:84:9 | LL | OhNo, //~ ERROR enum discriminant overflowed [E0370] | ^^^^ overflowed on value after 9223372036854775807 @@ -55,7 +55,7 @@ LL | OhNo, //~ ERROR enum discriminant overflowed [E0370] = note: explicitly set `OhNo = -9223372036854775808` if that is desired outcome error[E0370]: enum discriminant overflowed - --> $DIR/discrim-overflow.rs:106:9 + --> $DIR/discrim-overflow.rs:96:9 | LL | OhNo, //~ ERROR enum discriminant overflowed [E0370] | ^^^^ overflowed on value after 18446744073709551615 diff --git a/src/test/ui/diverging-fn-tail-35849.rs b/src/test/ui/diverging-fn-tail-35849.rs index 9ef5159cb771c..f21ce2973e95a 100644 --- a/src/test/ui/diverging-fn-tail-35849.rs +++ b/src/test/ui/diverging-fn-tail-35849.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn assert_sizeof() -> ! { unsafe { ::std::mem::transmute::(panic!()) diff --git a/src/test/ui/diverging-fn-tail-35849.stderr b/src/test/ui/diverging-fn-tail-35849.stderr index 8f8ab79b25b6c..383a7009e8599 100644 --- a/src/test/ui/diverging-fn-tail-35849.stderr +++ b/src/test/ui/diverging-fn-tail-35849.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/diverging-fn-tail-35849.rs:13:9 + --> $DIR/diverging-fn-tail-35849.rs:3:9 | LL | fn assert_sizeof() -> ! { | - expected `!` because of return type diff --git a/src/test/ui/diverging-tuple-parts-39485.rs b/src/test/ui/diverging-tuple-parts-39485.rs index eedad08ab5536..0cde6119308e5 100644 --- a/src/test/ui/diverging-tuple-parts-39485.rs +++ b/src/test/ui/diverging-tuple-parts-39485.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // After #39485, this test used to pass, but that change was reverted // due to numerous inference failures like #39808, so it now fails // again. #39485 made it so that diverging types never propagate diff --git a/src/test/ui/diverging-tuple-parts-39485.stderr b/src/test/ui/diverging-tuple-parts-39485.stderr index 603f8709c14c5..c399650d3258b 100644 --- a/src/test/ui/diverging-tuple-parts-39485.stderr +++ b/src/test/ui/diverging-tuple-parts-39485.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/diverging-tuple-parts-39485.rs:18:5 + --> $DIR/diverging-tuple-parts-39485.rs:8:5 | LL | fn g() { | - help: try adding a return type: `-> &_` @@ -10,7 +10,7 @@ LL | &panic!() //~ ERROR mismatched types found type `&_` error[E0308]: mismatched types - --> $DIR/diverging-tuple-parts-39485.rs:22:5 + --> $DIR/diverging-tuple-parts-39485.rs:12:5 | LL | fn f() -> isize { | ----- expected `isize` because of return type diff --git a/src/test/ui/does-nothing.rs b/src/test/ui/does-nothing.rs index 01de94bddbd96..e4992e2cfd3c9 100644 --- a/src/test/ui/does-nothing.rs +++ b/src/test/ui/does-nothing.rs @@ -1,12 +1,2 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { println!("doing"); this_does_nothing_what_the; println!("boing"); } //~^ ERROR cannot find value `this_does_nothing_what_the` in this scope diff --git a/src/test/ui/does-nothing.stderr b/src/test/ui/does-nothing.stderr index fa4b1f2f1c8f5..dca7923151767 100644 --- a/src/test/ui/does-nothing.stderr +++ b/src/test/ui/does-nothing.stderr @@ -1,5 +1,5 @@ error[E0425]: cannot find value `this_does_nothing_what_the` in this scope - --> $DIR/does-nothing.rs:11:32 + --> $DIR/does-nothing.rs:1:32 | LL | fn main() { println!("doing"); this_does_nothing_what_the; println!("boing"); } | ^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope diff --git a/src/test/ui/dollar-crate/dollar-crate-is-keyword-2.rs b/src/test/ui/dollar-crate/dollar-crate-is-keyword-2.rs index 87a2903803581..bbab6f8774876 100644 --- a/src/test/ui/dollar-crate/dollar-crate-is-keyword-2.rs +++ b/src/test/ui/dollar-crate/dollar-crate-is-keyword-2.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod a {} macro_rules! m { diff --git a/src/test/ui/dollar-crate/dollar-crate-is-keyword-2.stderr b/src/test/ui/dollar-crate/dollar-crate-is-keyword-2.stderr index c9b4f894ff678..5d20867c4fb20 100644 --- a/src/test/ui/dollar-crate/dollar-crate-is-keyword-2.stderr +++ b/src/test/ui/dollar-crate/dollar-crate-is-keyword-2.stderr @@ -1,5 +1,5 @@ error[E0432]: unresolved import `a::$crate` - --> $DIR/dollar-crate-is-keyword-2.rs:15:13 + --> $DIR/dollar-crate-is-keyword-2.rs:5:13 | LL | use a::$crate; //~ ERROR unresolved import `a::$crate` | ^^^^^^^^^ no `$crate` in `a` @@ -8,7 +8,7 @@ LL | m!(); | ----- in this macro invocation error[E0433]: failed to resolve. `$crate` in paths can only be used in start position - --> $DIR/dollar-crate-is-keyword-2.rs:16:16 + --> $DIR/dollar-crate-is-keyword-2.rs:6:16 | LL | use a::$crate::b; //~ ERROR `$crate` in paths can only be used in start position | ^^^^^^ `$crate` in paths can only be used in start position @@ -17,7 +17,7 @@ LL | m!(); | ----- in this macro invocation error[E0433]: failed to resolve. `$crate` in paths can only be used in start position - --> $DIR/dollar-crate-is-keyword-2.rs:17:21 + --> $DIR/dollar-crate-is-keyword-2.rs:7:21 | LL | type A = a::$crate; //~ ERROR `$crate` in paths can only be used in start position | ^^^^^^ `$crate` in paths can only be used in start position diff --git a/src/test/ui/dollar-crate/dollar-crate-is-keyword.rs b/src/test/ui/dollar-crate/dollar-crate-is-keyword.rs index 4a667f020ad34..6deaeb8117956 100644 --- a/src/test/ui/dollar-crate/dollar-crate-is-keyword.rs +++ b/src/test/ui/dollar-crate/dollar-crate-is-keyword.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! m { () => { // Avoid having more than one `$crate`-named item in the same module, diff --git a/src/test/ui/dollar-crate/dollar-crate-is-keyword.stderr b/src/test/ui/dollar-crate/dollar-crate-is-keyword.stderr index 77f4ef339499b..e94a5fe96ffcd 100644 --- a/src/test/ui/dollar-crate/dollar-crate-is-keyword.stderr +++ b/src/test/ui/dollar-crate/dollar-crate-is-keyword.stderr @@ -1,5 +1,5 @@ error: expected identifier, found reserved identifier `$crate` - --> $DIR/dollar-crate-is-keyword.rs:16:20 + --> $DIR/dollar-crate-is-keyword.rs:6:20 | LL | struct $crate {} //~ ERROR expected identifier, found reserved identifier `$crate` | ^^^^^^ expected identifier, found reserved identifier @@ -8,7 +8,7 @@ LL | m!(); | ----- in this macro invocation error: expected identifier, found reserved identifier `$crate` - --> $DIR/dollar-crate-is-keyword.rs:21:23 + --> $DIR/dollar-crate-is-keyword.rs:11:23 | LL | use $crate as $crate; //~ ERROR expected identifier, found reserved identifier `$crate` | ^^^^^^ expected identifier, found reserved identifier @@ -17,7 +17,7 @@ LL | m!(); | ----- in this macro invocation warning: `$crate` may not be imported - --> $DIR/dollar-crate-is-keyword.rs:19:9 + --> $DIR/dollar-crate-is-keyword.rs:9:9 | LL | use $crate; // OK | ^^^^^^^^^^^ @@ -28,7 +28,7 @@ LL | m!(); = note: `use $crate;` was erroneously allowed and will become a hard error in a future release warning: `$crate` may not be imported - --> $DIR/dollar-crate-is-keyword.rs:21:9 + --> $DIR/dollar-crate-is-keyword.rs:11:9 | LL | use $crate as $crate; //~ ERROR expected identifier, found reserved identifier `$crate` | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/dont-suggest-private-trait-method.rs b/src/test/ui/dont-suggest-private-trait-method.rs index 99bee0d3c59e2..ef0904c1a2dbf 100644 --- a/src/test/ui/dont-suggest-private-trait-method.rs +++ b/src/test/ui/dont-suggest-private-trait-method.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct T; fn main() { diff --git a/src/test/ui/dont-suggest-private-trait-method.stderr b/src/test/ui/dont-suggest-private-trait-method.stderr index 81ecc546a6dee..483192149b850 100644 --- a/src/test/ui/dont-suggest-private-trait-method.stderr +++ b/src/test/ui/dont-suggest-private-trait-method.stderr @@ -1,5 +1,5 @@ error[E0599]: no function or associated item named `new` found for type `T` in the current scope - --> $DIR/dont-suggest-private-trait-method.rs:14:5 + --> $DIR/dont-suggest-private-trait-method.rs:4:5 | LL | struct T; | --------- function or associated item `new` not found for this diff --git a/src/test/ui/dotdotdot-expr.rs b/src/test/ui/dotdotdot-expr.rs index afb73a526a8fe..d842fb6e03001 100644 --- a/src/test/ui/dotdotdot-expr.rs +++ b/src/test/ui/dotdotdot-expr.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let _redemptive = 1...21; //~^ ERROR unexpected token diff --git a/src/test/ui/dotdotdot-expr.stderr b/src/test/ui/dotdotdot-expr.stderr index 3315538f2f759..a5ef7b6504897 100644 --- a/src/test/ui/dotdotdot-expr.stderr +++ b/src/test/ui/dotdotdot-expr.stderr @@ -1,5 +1,5 @@ error: unexpected token: `...` - --> $DIR/dotdotdot-expr.rs:12:24 + --> $DIR/dotdotdot-expr.rs:2:24 | LL | let _redemptive = 1...21; | ^^^ diff --git a/src/test/ui/double-import.rs b/src/test/ui/double-import.rs index 154c9bebb0fea..e7325368b4d31 100644 --- a/src/test/ui/double-import.rs +++ b/src/test/ui/double-import.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This tests that conflicting imports shows both `use` lines // when reporting the error. diff --git a/src/test/ui/double-import.stderr b/src/test/ui/double-import.stderr index df6463a7e2880..bf32c7c10dc5d 100644 --- a/src/test/ui/double-import.stderr +++ b/src/test/ui/double-import.stderr @@ -1,5 +1,5 @@ error[E0252]: the name `foo` is defined multiple times - --> $DIR/double-import.rs:23:5 + --> $DIR/double-import.rs:13:5 | LL | use sub1::foo; | --------- previous import of the value `foo` here diff --git a/src/test/ui/double-type-import.rs b/src/test/ui/double-type-import.rs index 9629da735b0e8..6b1eb65d5ae5b 100644 --- a/src/test/ui/double-type-import.rs +++ b/src/test/ui/double-type-import.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod foo { pub use self::bar::X; use self::bar::X; diff --git a/src/test/ui/double-type-import.stderr b/src/test/ui/double-type-import.stderr index d5d977da4aa4c..e4c8c8d881946 100644 --- a/src/test/ui/double-type-import.stderr +++ b/src/test/ui/double-type-import.stderr @@ -1,5 +1,5 @@ error[E0252]: the name `X` is defined multiple times - --> $DIR/double-type-import.rs:13:9 + --> $DIR/double-type-import.rs:3:9 | LL | pub use self::bar::X; | ------------ previous import of the type `X` here diff --git a/src/test/ui/dropck/auxiliary/dropck_eyepatch_extern_crate.rs b/src/test/ui/dropck/auxiliary/dropck_eyepatch_extern_crate.rs index 08722ca62ac41..e070829574e7a 100644 --- a/src/test/ui/dropck/auxiliary/dropck_eyepatch_extern_crate.rs +++ b/src/test/ui/dropck/auxiliary/dropck_eyepatch_extern_crate.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(dropck_eyepatch)] // This is a support file for ../dropck-eyepatch-extern-crate.rs diff --git a/src/test/ui/dropck/drop-on-non-struct.rs b/src/test/ui/dropck/drop-on-non-struct.rs index 26b247d0d0f2e..259cdf40ae5f8 100644 --- a/src/test/ui/dropck/drop-on-non-struct.rs +++ b/src/test/ui/dropck/drop-on-non-struct.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - impl<'a> Drop for &'a mut isize { //~^ ERROR the Drop trait may only be implemented on structures //~^^ ERROR E0117 diff --git a/src/test/ui/dropck/drop-on-non-struct.stderr b/src/test/ui/dropck/drop-on-non-struct.stderr index 6582df6bddccf..c458635040a21 100644 --- a/src/test/ui/dropck/drop-on-non-struct.stderr +++ b/src/test/ui/dropck/drop-on-non-struct.stderr @@ -1,11 +1,11 @@ error[E0120]: the Drop trait may only be implemented on structures - --> $DIR/drop-on-non-struct.rs:11:19 + --> $DIR/drop-on-non-struct.rs:1:19 | LL | impl<'a> Drop for &'a mut isize { | ^^^^^^^^^^^^^ implementing Drop requires a struct error[E0117]: only traits defined in the current crate can be implemented for arbitrary types - --> $DIR/drop-on-non-struct.rs:11:1 + --> $DIR/drop-on-non-struct.rs:1:1 | LL | impl<'a> Drop for &'a mut isize { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate diff --git a/src/test/ui/dropck/drop-with-active-borrows-1.nll.stderr b/src/test/ui/dropck/drop-with-active-borrows-1.nll.stderr index 30f9907401c18..9c6c9341be77a 100644 --- a/src/test/ui/dropck/drop-with-active-borrows-1.nll.stderr +++ b/src/test/ui/dropck/drop-with-active-borrows-1.nll.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `a` because it is borrowed - --> $DIR/drop-with-active-borrows-1.rs:14:10 + --> $DIR/drop-with-active-borrows-1.rs:4:10 | LL | let b: Vec<&str> = a.lines().collect(); | - borrow of `a` occurs here diff --git a/src/test/ui/dropck/drop-with-active-borrows-1.rs b/src/test/ui/dropck/drop-with-active-borrows-1.rs index 903365fb909f5..1e924af296a5d 100644 --- a/src/test/ui/dropck/drop-with-active-borrows-1.rs +++ b/src/test/ui/dropck/drop-with-active-borrows-1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let a = "".to_string(); let b: Vec<&str> = a.lines().collect(); diff --git a/src/test/ui/dropck/drop-with-active-borrows-1.stderr b/src/test/ui/dropck/drop-with-active-borrows-1.stderr index 60107427ea5c5..a4295f96205ac 100644 --- a/src/test/ui/dropck/drop-with-active-borrows-1.stderr +++ b/src/test/ui/dropck/drop-with-active-borrows-1.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `a` because it is borrowed - --> $DIR/drop-with-active-borrows-1.rs:14:10 + --> $DIR/drop-with-active-borrows-1.rs:4:10 | LL | let b: Vec<&str> = a.lines().collect(); | - borrow of `a` occurs here diff --git a/src/test/ui/dropck/drop-with-active-borrows-2.nll.stderr b/src/test/ui/dropck/drop-with-active-borrows-2.nll.stderr index 4f792a9c9d28f..db7fae69e6030 100644 --- a/src/test/ui/dropck/drop-with-active-borrows-2.nll.stderr +++ b/src/test/ui/dropck/drop-with-active-borrows-2.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `raw_lines` does not live long enough - --> $DIR/drop-with-active-borrows-2.rs:13:5 + --> $DIR/drop-with-active-borrows-2.rs:3:5 | LL | raw_lines.iter().map(|l| l.trim()).collect() | ^^^^^^^^^ borrowed value does not live long enough @@ -7,8 +7,8 @@ LL | //~^ ERROR `raw_lines` does not live long enough LL | } | - `raw_lines` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 11:24... - --> $DIR/drop-with-active-borrows-2.rs:11:24 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 1:24... + --> $DIR/drop-with-active-borrows-2.rs:1:24 | LL | fn read_lines_borrowed<'a>() -> Vec<&'a str> { | ^^ diff --git a/src/test/ui/dropck/drop-with-active-borrows-2.rs b/src/test/ui/dropck/drop-with-active-borrows-2.rs index 33e4d3e62c418..4e45633a281cb 100644 --- a/src/test/ui/dropck/drop-with-active-borrows-2.rs +++ b/src/test/ui/dropck/drop-with-active-borrows-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn read_lines_borrowed<'a>() -> Vec<&'a str> { let raw_lines: Vec = vec!["foo ".to_string(), " bar".to_string()]; raw_lines.iter().map(|l| l.trim()).collect() diff --git a/src/test/ui/dropck/drop-with-active-borrows-2.stderr b/src/test/ui/dropck/drop-with-active-borrows-2.stderr index 0fd4bf81039ca..347389cb59d70 100644 --- a/src/test/ui/dropck/drop-with-active-borrows-2.stderr +++ b/src/test/ui/dropck/drop-with-active-borrows-2.stderr @@ -1,5 +1,5 @@ error[E0597]: `raw_lines` does not live long enough - --> $DIR/drop-with-active-borrows-2.rs:13:5 + --> $DIR/drop-with-active-borrows-2.rs:3:5 | LL | raw_lines.iter().map(|l| l.trim()).collect() | ^^^^^^^^^ borrowed value does not live long enough @@ -7,8 +7,8 @@ LL | //~^ ERROR `raw_lines` does not live long enough LL | } | - borrowed value only lives until here | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 11:24... - --> $DIR/drop-with-active-borrows-2.rs:11:24 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 1:24... + --> $DIR/drop-with-active-borrows-2.rs:1:24 | LL | fn read_lines_borrowed<'a>() -> Vec<&'a str> { | ^^ diff --git a/src/test/ui/dropck/dropck-eyepatch-extern-crate.nll.stderr b/src/test/ui/dropck/dropck-eyepatch-extern-crate.nll.stderr index b59f628c746bb..3d7e795a825b0 100644 --- a/src/test/ui/dropck/dropck-eyepatch-extern-crate.nll.stderr +++ b/src/test/ui/dropck/dropck-eyepatch-extern-crate.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `c_shortest` does not live long enough - --> $DIR/dropck-eyepatch-extern-crate.rs:47:19 + --> $DIR/dropck-eyepatch-extern-crate.rs:37:19 | LL | dt = Dt("dt", &c_shortest); | ^^^^^^^^^^^ borrowed value does not live long enough diff --git a/src/test/ui/dropck/dropck-eyepatch-extern-crate.rs b/src/test/ui/dropck/dropck-eyepatch-extern-crate.rs index 3e531d9fd6011..148894fe4070f 100644 --- a/src/test/ui/dropck/dropck-eyepatch-extern-crate.rs +++ b/src/test/ui/dropck/dropck-eyepatch-extern-crate.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:dropck_eyepatch_extern_crate.rs // The point of this test is to illustrate that the `#[may_dangle]` diff --git a/src/test/ui/dropck/dropck-eyepatch-extern-crate.stderr b/src/test/ui/dropck/dropck-eyepatch-extern-crate.stderr index 35db46f4faeb1..0ad6a0087b74f 100644 --- a/src/test/ui/dropck/dropck-eyepatch-extern-crate.stderr +++ b/src/test/ui/dropck/dropck-eyepatch-extern-crate.stderr @@ -1,5 +1,5 @@ error[E0597]: `c` does not live long enough - --> $DIR/dropck-eyepatch-extern-crate.rs:41:20 + --> $DIR/dropck-eyepatch-extern-crate.rs:31:20 | LL | dt = Dt("dt", &c); | ^ borrowed value does not live long enough @@ -10,7 +10,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `c` does not live long enough - --> $DIR/dropck-eyepatch-extern-crate.rs:43:20 + --> $DIR/dropck-eyepatch-extern-crate.rs:33:20 | LL | dr = Dr("dr", &c); | ^ borrowed value does not live long enough @@ -21,7 +21,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `c_shortest` does not live long enough - --> $DIR/dropck-eyepatch-extern-crate.rs:47:20 + --> $DIR/dropck-eyepatch-extern-crate.rs:37:20 | LL | dt = Dt("dt", &c_shortest); | ^^^^^^^^^^ borrowed value does not live long enough @@ -32,7 +32,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `c_shortest` does not live long enough - --> $DIR/dropck-eyepatch-extern-crate.rs:49:20 + --> $DIR/dropck-eyepatch-extern-crate.rs:39:20 | LL | dr = Dr("dr", &c_shortest); | ^^^^^^^^^^ borrowed value does not live long enough @@ -43,7 +43,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `c_shortest` does not live long enough - --> $DIR/dropck-eyepatch-extern-crate.rs:57:29 + --> $DIR/dropck-eyepatch-extern-crate.rs:47:29 | LL | pt = Pt("pt", &c_long, &c_shortest); | ^^^^^^^^^^ borrowed value does not live long enough @@ -54,7 +54,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `c_shortest` does not live long enough - --> $DIR/dropck-eyepatch-extern-crate.rs:59:29 + --> $DIR/dropck-eyepatch-extern-crate.rs:49:29 | LL | pr = Pr("pr", &c_long, &c_shortest); | ^^^^^^^^^^ borrowed value does not live long enough diff --git a/src/test/ui/dropck/dropck-eyepatch-implies-unsafe-impl.rs b/src/test/ui/dropck/dropck-eyepatch-implies-unsafe-impl.rs index cba438b02a922..6869ab1c45843 100644 --- a/src/test/ui/dropck/dropck-eyepatch-implies-unsafe-impl.rs +++ b/src/test/ui/dropck/dropck-eyepatch-implies-unsafe-impl.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(dropck_eyepatch)] // This test ensures that a use of `#[may_dangle]` is rejected if diff --git a/src/test/ui/dropck/dropck-eyepatch-implies-unsafe-impl.stderr b/src/test/ui/dropck/dropck-eyepatch-implies-unsafe-impl.stderr index 9d68ff13ef343..c3139948a07d4 100644 --- a/src/test/ui/dropck/dropck-eyepatch-implies-unsafe-impl.stderr +++ b/src/test/ui/dropck/dropck-eyepatch-implies-unsafe-impl.stderr @@ -1,5 +1,5 @@ error[E0569]: requires an `unsafe impl` declaration due to `#[may_dangle]` attribute - --> $DIR/dropck-eyepatch-implies-unsafe-impl.rs:31:1 + --> $DIR/dropck-eyepatch-implies-unsafe-impl.rs:21:1 | LL | / impl<#[may_dangle] A, B: fmt::Debug> Drop for Pt { LL | | //~^ ERROR requires an `unsafe impl` declaration due to `#[may_dangle]` attribute @@ -10,7 +10,7 @@ LL | | } | |_^ error[E0569]: requires an `unsafe impl` declaration due to `#[may_dangle]` attribute - --> $DIR/dropck-eyepatch-implies-unsafe-impl.rs:37:1 + --> $DIR/dropck-eyepatch-implies-unsafe-impl.rs:27:1 | LL | / impl<#[may_dangle] 'a, 'b, B: fmt::Debug> Drop for Pr<'a, 'b, B> { LL | | //~^ ERROR requires an `unsafe impl` declaration due to `#[may_dangle]` attribute diff --git a/src/test/ui/dropck/dropck-eyepatch-reorder.nll.stderr b/src/test/ui/dropck/dropck-eyepatch-reorder.nll.stderr index ad460fcf55e57..de58cb1ca21a0 100644 --- a/src/test/ui/dropck/dropck-eyepatch-reorder.nll.stderr +++ b/src/test/ui/dropck/dropck-eyepatch-reorder.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `c_shortest` does not live long enough - --> $DIR/dropck-eyepatch-reorder.rs:64:19 + --> $DIR/dropck-eyepatch-reorder.rs:54:19 | LL | dt = Dt("dt", &c_shortest); | ^^^^^^^^^^^ borrowed value does not live long enough diff --git a/src/test/ui/dropck/dropck-eyepatch-reorder.rs b/src/test/ui/dropck/dropck-eyepatch-reorder.rs index 1806dc7142452..f97fdafd7cf07 100644 --- a/src/test/ui/dropck/dropck-eyepatch-reorder.rs +++ b/src/test/ui/dropck/dropck-eyepatch-reorder.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(dropck_eyepatch, rustc_attrs)] // The point of this test is to test uses of `#[may_dangle]` attribute diff --git a/src/test/ui/dropck/dropck-eyepatch-reorder.stderr b/src/test/ui/dropck/dropck-eyepatch-reorder.stderr index 9984a7b9409c4..b19e3a8dfb94f 100644 --- a/src/test/ui/dropck/dropck-eyepatch-reorder.stderr +++ b/src/test/ui/dropck/dropck-eyepatch-reorder.stderr @@ -1,5 +1,5 @@ error[E0597]: `c` does not live long enough - --> $DIR/dropck-eyepatch-reorder.rs:58:20 + --> $DIR/dropck-eyepatch-reorder.rs:48:20 | LL | dt = Dt("dt", &c); | ^ borrowed value does not live long enough @@ -10,7 +10,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `c` does not live long enough - --> $DIR/dropck-eyepatch-reorder.rs:60:20 + --> $DIR/dropck-eyepatch-reorder.rs:50:20 | LL | dr = Dr("dr", &c); | ^ borrowed value does not live long enough @@ -21,7 +21,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `c_shortest` does not live long enough - --> $DIR/dropck-eyepatch-reorder.rs:64:20 + --> $DIR/dropck-eyepatch-reorder.rs:54:20 | LL | dt = Dt("dt", &c_shortest); | ^^^^^^^^^^ borrowed value does not live long enough @@ -32,7 +32,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `c_shortest` does not live long enough - --> $DIR/dropck-eyepatch-reorder.rs:66:20 + --> $DIR/dropck-eyepatch-reorder.rs:56:20 | LL | dr = Dr("dr", &c_shortest); | ^^^^^^^^^^ borrowed value does not live long enough @@ -43,7 +43,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `c_shortest` does not live long enough - --> $DIR/dropck-eyepatch-reorder.rs:74:29 + --> $DIR/dropck-eyepatch-reorder.rs:64:29 | LL | pt = Pt("pt", &c_long, &c_shortest); | ^^^^^^^^^^ borrowed value does not live long enough @@ -54,7 +54,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `c_shortest` does not live long enough - --> $DIR/dropck-eyepatch-reorder.rs:76:29 + --> $DIR/dropck-eyepatch-reorder.rs:66:29 | LL | pr = Pr("pr", &c_long, &c_shortest); | ^^^^^^^^^^ borrowed value does not live long enough diff --git a/src/test/ui/dropck/dropck-eyepatch.nll.stderr b/src/test/ui/dropck/dropck-eyepatch.nll.stderr index 864fb2f2ea6f4..cd6974abe2276 100644 --- a/src/test/ui/dropck/dropck-eyepatch.nll.stderr +++ b/src/test/ui/dropck/dropck-eyepatch.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `c_shortest` does not live long enough - --> $DIR/dropck-eyepatch.rs:87:19 + --> $DIR/dropck-eyepatch.rs:77:19 | LL | dt = Dt("dt", &c_shortest); | ^^^^^^^^^^^ borrowed value does not live long enough diff --git a/src/test/ui/dropck/dropck-eyepatch.rs b/src/test/ui/dropck/dropck-eyepatch.rs index 40d3ff050e2aa..f7dd78aeec7b8 100644 --- a/src/test/ui/dropck/dropck-eyepatch.rs +++ b/src/test/ui/dropck/dropck-eyepatch.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(dropck_eyepatch, rustc_attrs)] // The point of this test is to illustrate that the `#[may_dangle]` diff --git a/src/test/ui/dropck/dropck-eyepatch.stderr b/src/test/ui/dropck/dropck-eyepatch.stderr index 7cdf645941d09..7b032d6cf2eb8 100644 --- a/src/test/ui/dropck/dropck-eyepatch.stderr +++ b/src/test/ui/dropck/dropck-eyepatch.stderr @@ -1,5 +1,5 @@ error[E0597]: `c` does not live long enough - --> $DIR/dropck-eyepatch.rs:81:20 + --> $DIR/dropck-eyepatch.rs:71:20 | LL | dt = Dt("dt", &c); | ^ borrowed value does not live long enough @@ -10,7 +10,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `c` does not live long enough - --> $DIR/dropck-eyepatch.rs:83:20 + --> $DIR/dropck-eyepatch.rs:73:20 | LL | dr = Dr("dr", &c); | ^ borrowed value does not live long enough @@ -21,7 +21,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `c_shortest` does not live long enough - --> $DIR/dropck-eyepatch.rs:87:20 + --> $DIR/dropck-eyepatch.rs:77:20 | LL | dt = Dt("dt", &c_shortest); | ^^^^^^^^^^ borrowed value does not live long enough @@ -32,7 +32,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `c_shortest` does not live long enough - --> $DIR/dropck-eyepatch.rs:89:20 + --> $DIR/dropck-eyepatch.rs:79:20 | LL | dr = Dr("dr", &c_shortest); | ^^^^^^^^^^ borrowed value does not live long enough @@ -43,7 +43,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `c_shortest` does not live long enough - --> $DIR/dropck-eyepatch.rs:98:29 + --> $DIR/dropck-eyepatch.rs:88:29 | LL | pt = Pt("pt", &c_long, &c_shortest); | ^^^^^^^^^^ borrowed value does not live long enough @@ -54,7 +54,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `c_shortest` does not live long enough - --> $DIR/dropck-eyepatch.rs:100:29 + --> $DIR/dropck-eyepatch.rs:90:29 | LL | pr = Pr("pr", &c_long, &c_shortest); | ^^^^^^^^^^ borrowed value does not live long enough diff --git a/src/test/ui/dropck/dropck-union.nll.stderr b/src/test/ui/dropck/dropck-union.nll.stderr index 35d7ffc7879ed..375ae35af609a 100644 --- a/src/test/ui/dropck/dropck-union.nll.stderr +++ b/src/test/ui/dropck/dropck-union.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `v` does not live long enough - --> $DIR/dropck-union.rs:49:18 + --> $DIR/dropck-union.rs:39:18 | LL | v.0.set(Some(&v)); //~ ERROR: `v` does not live long enough | ^^ borrowed value does not live long enough diff --git a/src/test/ui/dropck/dropck-union.rs b/src/test/ui/dropck/dropck-union.rs index f16d761fdab6a..ef4d1b360b83c 100644 --- a/src/test/ui/dropck/dropck-union.rs +++ b/src/test/ui/dropck/dropck-union.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(untagged_unions)] use std::cell::Cell; diff --git a/src/test/ui/dropck/dropck-union.stderr b/src/test/ui/dropck/dropck-union.stderr index a383ca5d39047..6cb3c139132f3 100644 --- a/src/test/ui/dropck/dropck-union.stderr +++ b/src/test/ui/dropck/dropck-union.stderr @@ -1,5 +1,5 @@ error[E0597]: `v` does not live long enough - --> $DIR/dropck-union.rs:49:19 + --> $DIR/dropck-union.rs:39:19 | LL | v.0.set(Some(&v)); //~ ERROR: `v` does not live long enough | ^ borrowed value does not live long enough diff --git a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_1.rs b/src/test/ui/dropck/dropck_no_diverge_on_nonregular_1.rs index f096885381989..6ca5f5e3c5fcf 100644 --- a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_1.rs +++ b/src/test/ui/dropck/dropck_no_diverge_on_nonregular_1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue 22443: Reject code using non-regular types that would // otherwise cause dropck to loop infinitely. diff --git a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_1.stderr b/src/test/ui/dropck/dropck_no_diverge_on_nonregular_1.stderr index f4dd867ec689c..317ac7674311a 100644 --- a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_1.stderr +++ b/src/test/ui/dropck/dropck_no_diverge_on_nonregular_1.stderr @@ -1,5 +1,5 @@ error[E0320]: overflow while adding drop-check rules for FingerTree - --> $DIR/dropck_no_diverge_on_nonregular_1.rs:34:9 + --> $DIR/dropck_no_diverge_on_nonregular_1.rs:24:9 | LL | let ft = //~ ERROR overflow while adding drop-check rules for FingerTree | ^^ @@ -7,7 +7,7 @@ LL | let ft = //~ ERROR overflow while adding drop-check rules for FingerTre = note: overflowed on FingerTree>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> error[E0320]: overflow while adding drop-check rules for FingerTree - --> $DIR/dropck_no_diverge_on_nonregular_1.rs:35:9 + --> $DIR/dropck_no_diverge_on_nonregular_1.rs:25:9 | LL | FingerTree::Single(1); | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_2.rs b/src/test/ui/dropck/dropck_no_diverge_on_nonregular_2.rs index 886bd6bea20d7..d34f7e326d15f 100644 --- a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_2.rs +++ b/src/test/ui/dropck/dropck_no_diverge_on_nonregular_2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue 22443: Reject code using non-regular types that would // otherwise cause dropck to loop infinitely. diff --git a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_2.stderr b/src/test/ui/dropck/dropck_no_diverge_on_nonregular_2.stderr index ae9c50a66a0ef..b87e7a111493e 100644 --- a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_2.stderr +++ b/src/test/ui/dropck/dropck_no_diverge_on_nonregular_2.stderr @@ -1,5 +1,5 @@ error[E0320]: overflow while adding drop-check rules for FingerTree - --> $DIR/dropck_no_diverge_on_nonregular_2.rs:33:9 + --> $DIR/dropck_no_diverge_on_nonregular_2.rs:23:9 | LL | let ft = //~ ERROR overflow while adding drop-check rules for FingerTree | ^^ @@ -7,7 +7,7 @@ LL | let ft = //~ ERROR overflow while adding drop-check rules for FingerTre = note: overflowed on FingerTree>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> error[E0320]: overflow while adding drop-check rules for FingerTree - --> $DIR/dropck_no_diverge_on_nonregular_2.rs:34:9 + --> $DIR/dropck_no_diverge_on_nonregular_2.rs:24:9 | LL | FingerTree::Single(1); | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_3.rs b/src/test/ui/dropck/dropck_no_diverge_on_nonregular_3.rs index 45531666ecf5d..e2e600b17f21e 100644 --- a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_3.rs +++ b/src/test/ui/dropck/dropck_no_diverge_on_nonregular_3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue 22443: Reject code using non-regular types that would // otherwise cause dropck to loop infinitely. // diff --git a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_3.stderr b/src/test/ui/dropck/dropck_no_diverge_on_nonregular_3.stderr index e0089f8b2981a..799ee45a2022d 100644 --- a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_3.stderr +++ b/src/test/ui/dropck/dropck_no_diverge_on_nonregular_3.stderr @@ -1,5 +1,5 @@ error[E0320]: overflow while adding drop-check rules for std::option::Option> - --> $DIR/dropck_no_diverge_on_nonregular_3.rs:42:9 + --> $DIR/dropck_no_diverge_on_nonregular_3.rs:32:9 | LL | let w = //~ ERROR overflow while adding drop-check rules for std::option | ^ @@ -7,7 +7,7 @@ LL | let w = //~ ERROR overflow while adding drop-check rules for std::optio = note: overflowed on FingerTree>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> error[E0320]: overflow while adding drop-check rules for std::option::Option> - --> $DIR/dropck_no_diverge_on_nonregular_3.rs:43:9 + --> $DIR/dropck_no_diverge_on_nonregular_3.rs:33:9 | LL | Some(Wrapper::Simple::); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -15,7 +15,7 @@ LL | Some(Wrapper::Simple::); = note: overflowed on FingerTree>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> error[E0320]: overflow while adding drop-check rules for Wrapper - --> $DIR/dropck_no_diverge_on_nonregular_3.rs:43:14 + --> $DIR/dropck_no_diverge_on_nonregular_3.rs:33:14 | LL | Some(Wrapper::Simple::); | ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/dropck/dropck_trait_cycle_checked.nll.stderr b/src/test/ui/dropck/dropck_trait_cycle_checked.nll.stderr index a47229cdca0bb..9e8c3cc76b842 100644 --- a/src/test/ui/dropck/dropck_trait_cycle_checked.nll.stderr +++ b/src/test/ui/dropck/dropck_trait_cycle_checked.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `o2` does not live long enough - --> $DIR/dropck_trait_cycle_checked.rs:121:13 + --> $DIR/dropck_trait_cycle_checked.rs:111:13 | LL | o1.set0(&o2); //~ ERROR `o2` does not live long enough | ^^^ borrowed value does not live long enough @@ -10,7 +10,7 @@ LL | } = note: borrowed value must be valid for the static lifetime... error[E0597]: `o3` does not live long enough - --> $DIR/dropck_trait_cycle_checked.rs:122:13 + --> $DIR/dropck_trait_cycle_checked.rs:112:13 | LL | o1.set1(&o3); //~ ERROR `o3` does not live long enough | ^^^ borrowed value does not live long enough @@ -21,7 +21,7 @@ LL | } = note: borrowed value must be valid for the static lifetime... error[E0597]: `o2` does not live long enough - --> $DIR/dropck_trait_cycle_checked.rs:123:13 + --> $DIR/dropck_trait_cycle_checked.rs:113:13 | LL | o2.set0(&o2); //~ ERROR `o2` does not live long enough | ^^^ borrowed value does not live long enough @@ -32,7 +32,7 @@ LL | } = note: borrowed value must be valid for the static lifetime... error[E0597]: `o3` does not live long enough - --> $DIR/dropck_trait_cycle_checked.rs:124:13 + --> $DIR/dropck_trait_cycle_checked.rs:114:13 | LL | o2.set1(&o3); //~ ERROR `o3` does not live long enough | ^^^ borrowed value does not live long enough @@ -43,7 +43,7 @@ LL | } = note: borrowed value must be valid for the static lifetime... error[E0597]: `o1` does not live long enough - --> $DIR/dropck_trait_cycle_checked.rs:125:13 + --> $DIR/dropck_trait_cycle_checked.rs:115:13 | LL | o3.set0(&o1); //~ ERROR `o1` does not live long enough | ^^^ borrowed value does not live long enough @@ -54,7 +54,7 @@ LL | } = note: borrowed value must be valid for the static lifetime... error[E0597]: `o2` does not live long enough - --> $DIR/dropck_trait_cycle_checked.rs:126:13 + --> $DIR/dropck_trait_cycle_checked.rs:116:13 | LL | o3.set1(&o2); //~ ERROR `o2` does not live long enough | ^^^ borrowed value does not live long enough diff --git a/src/test/ui/dropck/dropck_trait_cycle_checked.rs b/src/test/ui/dropck/dropck_trait_cycle_checked.rs index b6b7fa1a233d7..128bbb04ee0ea 100644 --- a/src/test/ui/dropck/dropck_trait_cycle_checked.rs +++ b/src/test/ui/dropck/dropck_trait_cycle_checked.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Reject mixing cyclic structure and Drop when using trait // objects to hide the cross-references. // diff --git a/src/test/ui/dropck/dropck_trait_cycle_checked.stderr b/src/test/ui/dropck/dropck_trait_cycle_checked.stderr index ab255cf0c9893..0e4bd829a949d 100644 --- a/src/test/ui/dropck/dropck_trait_cycle_checked.stderr +++ b/src/test/ui/dropck/dropck_trait_cycle_checked.stderr @@ -1,5 +1,5 @@ error[E0597]: `o2` does not live long enough - --> $DIR/dropck_trait_cycle_checked.rs:121:14 + --> $DIR/dropck_trait_cycle_checked.rs:111:14 | LL | o1.set0(&o2); //~ ERROR `o2` does not live long enough | ^^ borrowed value does not live long enough @@ -10,7 +10,7 @@ LL | } = note: borrowed value must be valid for the static lifetime... error[E0597]: `o3` does not live long enough - --> $DIR/dropck_trait_cycle_checked.rs:122:14 + --> $DIR/dropck_trait_cycle_checked.rs:112:14 | LL | o1.set1(&o3); //~ ERROR `o3` does not live long enough | ^^ borrowed value does not live long enough @@ -21,7 +21,7 @@ LL | } = note: borrowed value must be valid for the static lifetime... error[E0597]: `o2` does not live long enough - --> $DIR/dropck_trait_cycle_checked.rs:123:14 + --> $DIR/dropck_trait_cycle_checked.rs:113:14 | LL | o2.set0(&o2); //~ ERROR `o2` does not live long enough | ^^ borrowed value does not live long enough @@ -32,7 +32,7 @@ LL | } = note: borrowed value must be valid for the static lifetime... error[E0597]: `o3` does not live long enough - --> $DIR/dropck_trait_cycle_checked.rs:124:14 + --> $DIR/dropck_trait_cycle_checked.rs:114:14 | LL | o2.set1(&o3); //~ ERROR `o3` does not live long enough | ^^ borrowed value does not live long enough @@ -43,7 +43,7 @@ LL | } = note: borrowed value must be valid for the static lifetime... error[E0597]: `o1` does not live long enough - --> $DIR/dropck_trait_cycle_checked.rs:125:14 + --> $DIR/dropck_trait_cycle_checked.rs:115:14 | LL | o3.set0(&o1); //~ ERROR `o1` does not live long enough | ^^ borrowed value does not live long enough @@ -54,7 +54,7 @@ LL | } = note: borrowed value must be valid for the static lifetime... error[E0597]: `o2` does not live long enough - --> $DIR/dropck_trait_cycle_checked.rs:126:14 + --> $DIR/dropck_trait_cycle_checked.rs:116:14 | LL | o3.set1(&o2); //~ ERROR `o2` does not live long enough | ^^ borrowed value does not live long enough diff --git a/src/test/ui/dst/dst-bad-assign-2.rs b/src/test/ui/dst/dst-bad-assign-2.rs index 372f318780508..b4f72d034f5c5 100644 --- a/src/test/ui/dst/dst-bad-assign-2.rs +++ b/src/test/ui/dst/dst-bad-assign-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Forbid assignment into a dynamically sized type. struct Fat { diff --git a/src/test/ui/dst/dst-bad-assign-2.stderr b/src/test/ui/dst/dst-bad-assign-2.stderr index ead973d25a027..63c95c3154066 100644 --- a/src/test/ui/dst/dst-bad-assign-2.stderr +++ b/src/test/ui/dst/dst-bad-assign-2.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `dyn ToBar` cannot be known at compilation time - --> $DIR/dst-bad-assign-2.rs:45:5 + --> $DIR/dst-bad-assign-2.rs:35:5 | LL | f5.ptr = *z; | ^^^^^^ doesn't have a size known at compile-time diff --git a/src/test/ui/dst/dst-bad-assign-3.rs b/src/test/ui/dst/dst-bad-assign-3.rs index 339cfb5443de3..5124abc7d8222 100644 --- a/src/test/ui/dst/dst-bad-assign-3.rs +++ b/src/test/ui/dst/dst-bad-assign-3.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Forbid assignment into a dynamically sized type. #![feature(unsized_tuple_coercion)] diff --git a/src/test/ui/dst/dst-bad-assign-3.stderr b/src/test/ui/dst/dst-bad-assign-3.stderr index ec172fae7a6b0..d0fe27e7bc2d6 100644 --- a/src/test/ui/dst/dst-bad-assign-3.stderr +++ b/src/test/ui/dst/dst-bad-assign-3.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/dst-bad-assign-3.rs:43:12 + --> $DIR/dst-bad-assign-3.rs:33:12 | LL | f5.2 = Bar1 {f: 36}; | ^^^^^^^^^^^^ expected trait ToBar, found struct `Bar1` @@ -8,7 +8,7 @@ LL | f5.2 = Bar1 {f: 36}; found type `Bar1` error[E0277]: the size for values of type `dyn ToBar` cannot be known at compilation time - --> $DIR/dst-bad-assign-3.rs:43:5 + --> $DIR/dst-bad-assign-3.rs:33:5 | LL | f5.2 = Bar1 {f: 36}; | ^^^^ doesn't have a size known at compile-time diff --git a/src/test/ui/dst/dst-bad-assign.rs b/src/test/ui/dst/dst-bad-assign.rs index 9a329c636ae46..003c80b4dc423 100644 --- a/src/test/ui/dst/dst-bad-assign.rs +++ b/src/test/ui/dst/dst-bad-assign.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Forbid assignment into a dynamically sized type. struct Fat { diff --git a/src/test/ui/dst/dst-bad-assign.stderr b/src/test/ui/dst/dst-bad-assign.stderr index 72f28af517542..2ae732edd6893 100644 --- a/src/test/ui/dst/dst-bad-assign.stderr +++ b/src/test/ui/dst/dst-bad-assign.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/dst-bad-assign.rs:45:14 + --> $DIR/dst-bad-assign.rs:35:14 | LL | f5.ptr = Bar1 {f: 36}; | ^^^^^^^^^^^^ expected trait ToBar, found struct `Bar1` @@ -8,7 +8,7 @@ LL | f5.ptr = Bar1 {f: 36}; found type `Bar1` error[E0277]: the size for values of type `dyn ToBar` cannot be known at compilation time - --> $DIR/dst-bad-assign.rs:45:5 + --> $DIR/dst-bad-assign.rs:35:5 | LL | f5.ptr = Bar1 {f: 36}; | ^^^^^^ doesn't have a size known at compile-time diff --git a/src/test/ui/dst/dst-bad-coerce1.rs b/src/test/ui/dst/dst-bad-coerce1.rs index b0de84a530072..8ca34234c0317 100644 --- a/src/test/ui/dst/dst-bad-coerce1.rs +++ b/src/test/ui/dst/dst-bad-coerce1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Attempt to change the type as well as unsizing. #![feature(unsized_tuple_coercion)] diff --git a/src/test/ui/dst/dst-bad-coerce1.stderr b/src/test/ui/dst/dst-bad-coerce1.stderr index bb59c4d561727..34b2d6d3d8beb 100644 --- a/src/test/ui/dst/dst-bad-coerce1.stderr +++ b/src/test/ui/dst/dst-bad-coerce1.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/dst-bad-coerce1.rs:26:29 + --> $DIR/dst-bad-coerce1.rs:16:29 | LL | let f3: &Fat<[usize]> = f2; | ^^ expected slice, found array of 3 elements @@ -8,7 +8,7 @@ LL | let f3: &Fat<[usize]> = f2; found type `&Fat<[isize; 3]>` error[E0277]: the trait bound `Foo: Bar` is not satisfied - --> $DIR/dst-bad-coerce1.rs:32:25 + --> $DIR/dst-bad-coerce1.rs:22:25 | LL | let f3: &Fat = f2; | ^^ the trait `Bar` is not implemented for `Foo` @@ -16,7 +16,7 @@ LL | let f3: &Fat = f2; = note: required for the cast to the object type `dyn Bar` error[E0308]: mismatched types - --> $DIR/dst-bad-coerce1.rs:38:27 + --> $DIR/dst-bad-coerce1.rs:28:27 | LL | let f3: &([usize],) = f2; | ^^ expected slice, found array of 3 elements @@ -25,7 +25,7 @@ LL | let f3: &([usize],) = f2; found type `&([isize; 3],)` error[E0277]: the trait bound `Foo: Bar` is not satisfied - --> $DIR/dst-bad-coerce1.rs:44:23 + --> $DIR/dst-bad-coerce1.rs:34:23 | LL | let f3: &(Bar,) = f2; | ^^ the trait `Bar` is not implemented for `Foo` diff --git a/src/test/ui/dst/dst-bad-coerce2.rs b/src/test/ui/dst/dst-bad-coerce2.rs index 9e92f649b2d56..2bc7ecced0aab 100644 --- a/src/test/ui/dst/dst-bad-coerce2.rs +++ b/src/test/ui/dst/dst-bad-coerce2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Attempt to change the mutability as well as unsizing. struct Fat { diff --git a/src/test/ui/dst/dst-bad-coerce2.stderr b/src/test/ui/dst/dst-bad-coerce2.stderr index 51991544a2e24..6fb5c4b32ef12 100644 --- a/src/test/ui/dst/dst-bad-coerce2.stderr +++ b/src/test/ui/dst/dst-bad-coerce2.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/dst-bad-coerce2.rs:25:33 + --> $DIR/dst-bad-coerce2.rs:15:33 | LL | let f3: &mut Fat<[isize]> = f2; //~ ERROR mismatched types | ^^ types differ in mutability @@ -8,7 +8,7 @@ LL | let f3: &mut Fat<[isize]> = f2; //~ ERROR mismatched types found type `&Fat<[isize; 3]>` error[E0308]: mismatched types - --> $DIR/dst-bad-coerce2.rs:30:29 + --> $DIR/dst-bad-coerce2.rs:20:29 | LL | let f3: &mut Fat = f2; //~ ERROR mismatched types | ^^ types differ in mutability @@ -17,7 +17,7 @@ LL | let f3: &mut Fat = f2; //~ ERROR mismatched types found type `&Fat` error[E0308]: mismatched types - --> $DIR/dst-bad-coerce2.rs:35:31 + --> $DIR/dst-bad-coerce2.rs:25:31 | LL | let f3: &mut ([isize],) = f2; //~ ERROR mismatched types | ^^ types differ in mutability @@ -26,7 +26,7 @@ LL | let f3: &mut ([isize],) = f2; //~ ERROR mismatched types found type `&([isize; 3],)` error[E0308]: mismatched types - --> $DIR/dst-bad-coerce2.rs:40:27 + --> $DIR/dst-bad-coerce2.rs:30:27 | LL | let f3: &mut (Bar,) = f2; //~ ERROR mismatched types | ^^ types differ in mutability diff --git a/src/test/ui/dst/dst-bad-coerce3.nll.stderr b/src/test/ui/dst/dst-bad-coerce3.nll.stderr index bc5b4ca71cfd4..e0fff3a657746 100644 --- a/src/test/ui/dst/dst-bad-coerce3.nll.stderr +++ b/src/test/ui/dst/dst-bad-coerce3.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `f1` does not live long enough - --> $DIR/dst-bad-coerce3.rs:26:32 + --> $DIR/dst-bad-coerce3.rs:16:32 | LL | let f2: &Fat<[isize; 3]> = &f1; //~ ERROR `f1` does not live long enough | ^^^ borrowed value does not live long enough @@ -7,14 +7,14 @@ LL | let f2: &Fat<[isize; 3]> = &f1; //~ ERROR `f1` does not live long enoug LL | } | - `f1` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 23:8... - --> $DIR/dst-bad-coerce3.rs:23:8 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 13:8... + --> $DIR/dst-bad-coerce3.rs:13:8 | LL | fn baz<'a>() { | ^^ error[E0597]: `f1` does not live long enough - --> $DIR/dst-bad-coerce3.rs:31:25 + --> $DIR/dst-bad-coerce3.rs:21:25 | LL | let f2: &Fat = &f1; //~ ERROR `f1` does not live long enough | ^^^ borrowed value does not live long enough @@ -22,14 +22,14 @@ LL | let f2: &Fat = &f1; //~ ERROR `f1` does not live long enough LL | } | - `f1` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 23:8... - --> $DIR/dst-bad-coerce3.rs:23:8 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 13:8... + --> $DIR/dst-bad-coerce3.rs:13:8 | LL | fn baz<'a>() { | ^^ error[E0597]: `f1` does not live long enough - --> $DIR/dst-bad-coerce3.rs:36:30 + --> $DIR/dst-bad-coerce3.rs:26:30 | LL | let f2: &([isize; 3],) = &f1; //~ ERROR `f1` does not live long enough | ^^^ borrowed value does not live long enough @@ -37,14 +37,14 @@ LL | let f2: &([isize; 3],) = &f1; //~ ERROR `f1` does not live long enough LL | } | - `f1` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 23:8... - --> $DIR/dst-bad-coerce3.rs:23:8 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 13:8... + --> $DIR/dst-bad-coerce3.rs:13:8 | LL | fn baz<'a>() { | ^^ error[E0597]: `f1` does not live long enough - --> $DIR/dst-bad-coerce3.rs:41:23 + --> $DIR/dst-bad-coerce3.rs:31:23 | LL | let f2: &(Foo,) = &f1; //~ ERROR `f1` does not live long enough | ^^^ borrowed value does not live long enough @@ -52,8 +52,8 @@ LL | let f3: &'a (Bar,) = f2; LL | } | - `f1` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 23:8... - --> $DIR/dst-bad-coerce3.rs:23:8 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 13:8... + --> $DIR/dst-bad-coerce3.rs:13:8 | LL | fn baz<'a>() { | ^^ diff --git a/src/test/ui/dst/dst-bad-coerce3.rs b/src/test/ui/dst/dst-bad-coerce3.rs index 35a147c15bb43..58c988520eb0d 100644 --- a/src/test/ui/dst/dst-bad-coerce3.rs +++ b/src/test/ui/dst/dst-bad-coerce3.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Attempt to extend the lifetime as well as unsizing. #![feature(unsized_tuple_coercion)] diff --git a/src/test/ui/dst/dst-bad-coerce3.stderr b/src/test/ui/dst/dst-bad-coerce3.stderr index 3c4eb2720827d..701a869ee91e7 100644 --- a/src/test/ui/dst/dst-bad-coerce3.stderr +++ b/src/test/ui/dst/dst-bad-coerce3.stderr @@ -1,5 +1,5 @@ error[E0597]: `f1` does not live long enough - --> $DIR/dst-bad-coerce3.rs:26:33 + --> $DIR/dst-bad-coerce3.rs:16:33 | LL | let f2: &Fat<[isize; 3]> = &f1; //~ ERROR `f1` does not live long enough | ^^ borrowed value does not live long enough @@ -7,14 +7,14 @@ LL | let f2: &Fat<[isize; 3]> = &f1; //~ ERROR `f1` does not live long enoug LL | } | - borrowed value only lives until here | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 23:8... - --> $DIR/dst-bad-coerce3.rs:23:8 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 13:8... + --> $DIR/dst-bad-coerce3.rs:13:8 | LL | fn baz<'a>() { | ^^ error[E0597]: `f1` does not live long enough - --> $DIR/dst-bad-coerce3.rs:31:26 + --> $DIR/dst-bad-coerce3.rs:21:26 | LL | let f2: &Fat = &f1; //~ ERROR `f1` does not live long enough | ^^ borrowed value does not live long enough @@ -22,14 +22,14 @@ LL | let f2: &Fat = &f1; //~ ERROR `f1` does not live long enough LL | } | - borrowed value only lives until here | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 23:8... - --> $DIR/dst-bad-coerce3.rs:23:8 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 13:8... + --> $DIR/dst-bad-coerce3.rs:13:8 | LL | fn baz<'a>() { | ^^ error[E0597]: `f1` does not live long enough - --> $DIR/dst-bad-coerce3.rs:36:31 + --> $DIR/dst-bad-coerce3.rs:26:31 | LL | let f2: &([isize; 3],) = &f1; //~ ERROR `f1` does not live long enough | ^^ borrowed value does not live long enough @@ -37,14 +37,14 @@ LL | let f2: &([isize; 3],) = &f1; //~ ERROR `f1` does not live long enough LL | } | - borrowed value only lives until here | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 23:8... - --> $DIR/dst-bad-coerce3.rs:23:8 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 13:8... + --> $DIR/dst-bad-coerce3.rs:13:8 | LL | fn baz<'a>() { | ^^ error[E0597]: `f1` does not live long enough - --> $DIR/dst-bad-coerce3.rs:41:24 + --> $DIR/dst-bad-coerce3.rs:31:24 | LL | let f2: &(Foo,) = &f1; //~ ERROR `f1` does not live long enough | ^^ borrowed value does not live long enough @@ -52,8 +52,8 @@ LL | let f3: &'a (Bar,) = f2; LL | } | - borrowed value only lives until here | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 23:8... - --> $DIR/dst-bad-coerce3.rs:23:8 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 13:8... + --> $DIR/dst-bad-coerce3.rs:13:8 | LL | fn baz<'a>() { | ^^ diff --git a/src/test/ui/dst/dst-bad-coerce4.rs b/src/test/ui/dst/dst-bad-coerce4.rs index 874b7588ff9bb..9635e1e3380d4 100644 --- a/src/test/ui/dst/dst-bad-coerce4.rs +++ b/src/test/ui/dst/dst-bad-coerce4.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Attempt to coerce from unsized to sized. #![feature(unsized_tuple_coercion)] diff --git a/src/test/ui/dst/dst-bad-coerce4.stderr b/src/test/ui/dst/dst-bad-coerce4.stderr index 279de13cf37f1..fbf59ae5c6600 100644 --- a/src/test/ui/dst/dst-bad-coerce4.stderr +++ b/src/test/ui/dst/dst-bad-coerce4.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/dst-bad-coerce4.rs:22:32 + --> $DIR/dst-bad-coerce4.rs:12:32 | LL | let f2: &Fat<[isize; 3]> = f1; | ^^ expected array of 3 elements, found slice @@ -8,7 +8,7 @@ LL | let f2: &Fat<[isize; 3]> = f1; found type `&Fat<[isize]>` error[E0308]: mismatched types - --> $DIR/dst-bad-coerce4.rs:30:30 + --> $DIR/dst-bad-coerce4.rs:20:30 | LL | let f2: &([isize; 3],) = f1; | ^^ expected array of 3 elements, found slice diff --git a/src/test/ui/dst/dst-bad-coercions.rs b/src/test/ui/dst/dst-bad-coercions.rs index 883c16b089581..9aa697225d5b6 100644 --- a/src/test/ui/dst/dst-bad-coercions.rs +++ b/src/test/ui/dst/dst-bad-coercions.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test implicit coercions involving DSTs and raw pointers. struct S; diff --git a/src/test/ui/dst/dst-bad-coercions.stderr b/src/test/ui/dst/dst-bad-coercions.stderr index 8901ef1caaa97..df223b7cb96b2 100644 --- a/src/test/ui/dst/dst-bad-coercions.stderr +++ b/src/test/ui/dst/dst-bad-coercions.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/dst-bad-coercions.rs:24:17 + --> $DIR/dst-bad-coercions.rs:14:17 | LL | let y: &S = x; //~ ERROR mismatched types | ^ expected &S, found *-ptr @@ -8,7 +8,7 @@ LL | let y: &S = x; //~ ERROR mismatched types found type `*const S` error[E0308]: mismatched types - --> $DIR/dst-bad-coercions.rs:25:17 + --> $DIR/dst-bad-coercions.rs:15:17 | LL | let y: &T = x; //~ ERROR mismatched types | ^ @@ -20,7 +20,7 @@ LL | let y: &T = x; //~ ERROR mismatched types found type `*const S` error[E0308]: mismatched types - --> $DIR/dst-bad-coercions.rs:29:17 + --> $DIR/dst-bad-coercions.rs:19:17 | LL | let y: &S = x; //~ ERROR mismatched types | ^ expected &S, found *-ptr @@ -29,7 +29,7 @@ LL | let y: &S = x; //~ ERROR mismatched types found type `*mut S` error[E0308]: mismatched types - --> $DIR/dst-bad-coercions.rs:30:17 + --> $DIR/dst-bad-coercions.rs:20:17 | LL | let y: &T = x; //~ ERROR mismatched types | ^ @@ -41,7 +41,7 @@ LL | let y: &T = x; //~ ERROR mismatched types found type `*mut S` error[E0308]: mismatched types - --> $DIR/dst-bad-coercions.rs:33:21 + --> $DIR/dst-bad-coercions.rs:23:21 | LL | let x: &mut T = &S; //~ ERROR mismatched types | ^^ types differ in mutability @@ -50,7 +50,7 @@ LL | let x: &mut T = &S; //~ ERROR mismatched types found type `&S` error[E0308]: mismatched types - --> $DIR/dst-bad-coercions.rs:34:21 + --> $DIR/dst-bad-coercions.rs:24:21 | LL | let x: *mut T = &S; //~ ERROR mismatched types | ^^ types differ in mutability @@ -59,7 +59,7 @@ LL | let x: *mut T = &S; //~ ERROR mismatched types found type `&S` error[E0308]: mismatched types - --> $DIR/dst-bad-coercions.rs:35:21 + --> $DIR/dst-bad-coercions.rs:25:21 | LL | let x: *mut S = &S; //~ ERROR mismatched types | ^^ types differ in mutability diff --git a/src/test/ui/dst/dst-bad-deep-2.rs b/src/test/ui/dst/dst-bad-deep-2.rs index a54301071ba0e..e587399135d32 100644 --- a/src/test/ui/dst/dst-bad-deep-2.rs +++ b/src/test/ui/dst/dst-bad-deep-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Try to initialise a DST struct where the lost information is deeply nested. // This is an error because it requires an unsized rvalue. This is a problem // because it would require stack allocation of an unsized temporary (*g in the diff --git a/src/test/ui/dst/dst-bad-deep-2.stderr b/src/test/ui/dst/dst-bad-deep-2.stderr index 2c0a540f25a6b..6198c7eba57c0 100644 --- a/src/test/ui/dst/dst-bad-deep-2.stderr +++ b/src/test/ui/dst/dst-bad-deep-2.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `[isize]` cannot be known at compilation time - --> $DIR/dst-bad-deep-2.rs:21:30 + --> $DIR/dst-bad-deep-2.rs:11:30 | LL | let h: &(([isize],),) = &(*g,); | ^^^^^ doesn't have a size known at compile-time diff --git a/src/test/ui/dst/dst-bad-deep.rs b/src/test/ui/dst/dst-bad-deep.rs index 3d7e2b8f6711d..a426729608282 100644 --- a/src/test/ui/dst/dst-bad-deep.rs +++ b/src/test/ui/dst/dst-bad-deep.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Try to initialise a DST struct where the lost information is deeply nested. // This is an error because it requires an unsized rvalue. This is a problem // because it would require stack allocation of an unsized temporary (*g in the diff --git a/src/test/ui/dst/dst-bad-deep.stderr b/src/test/ui/dst/dst-bad-deep.stderr index 2ac8cb325a149..509dbfe8f1882 100644 --- a/src/test/ui/dst/dst-bad-deep.stderr +++ b/src/test/ui/dst/dst-bad-deep.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `[isize]` cannot be known at compilation time - --> $DIR/dst-bad-deep.rs:23:34 + --> $DIR/dst-bad-deep.rs:13:34 | LL | let h: &Fat> = &Fat { ptr: *g }; | ^^^^^^^^^^^^^^^ doesn't have a size known at compile-time diff --git a/src/test/ui/dst/dst-index.nll.stderr b/src/test/ui/dst/dst-index.nll.stderr index 767d8a84c041d..cfb50ad0e5d93 100644 --- a/src/test/ui/dst/dst-index.nll.stderr +++ b/src/test/ui/dst/dst-index.nll.stderr @@ -1,23 +1,23 @@ error[E0161]: cannot move a value of type str: the size of str cannot be statically determined - --> $DIR/dst-index.rs:41:5 + --> $DIR/dst-index.rs:31:5 | LL | S[0]; | ^^^^ error[E0507]: cannot move out of borrowed content - --> $DIR/dst-index.rs:41:5 + --> $DIR/dst-index.rs:31:5 | LL | S[0]; | ^^^^ cannot move out of borrowed content error[E0161]: cannot move a value of type dyn std::fmt::Debug: the size of dyn std::fmt::Debug cannot be statically determined - --> $DIR/dst-index.rs:44:5 + --> $DIR/dst-index.rs:34:5 | LL | T[0]; | ^^^^ error[E0507]: cannot move out of borrowed content - --> $DIR/dst-index.rs:44:5 + --> $DIR/dst-index.rs:34:5 | LL | T[0]; | ^^^^ cannot move out of borrowed content diff --git a/src/test/ui/dst/dst-index.rs b/src/test/ui/dst/dst-index.rs index c52458934bd1c..663c704ff39ac 100644 --- a/src/test/ui/dst/dst-index.rs +++ b/src/test/ui/dst/dst-index.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that overloaded index expressions with DST result types // can't be used as rvalues diff --git a/src/test/ui/dst/dst-index.stderr b/src/test/ui/dst/dst-index.stderr index 7c5e79dab992d..05993f50fa1a5 100644 --- a/src/test/ui/dst/dst-index.stderr +++ b/src/test/ui/dst/dst-index.stderr @@ -1,23 +1,23 @@ error[E0161]: cannot move a value of type str: the size of str cannot be statically determined - --> $DIR/dst-index.rs:41:5 + --> $DIR/dst-index.rs:31:5 | LL | S[0]; | ^^^^ error[E0161]: cannot move a value of type (dyn std::fmt::Debug + 'static): the size of (dyn std::fmt::Debug + 'static) cannot be statically determined - --> $DIR/dst-index.rs:44:5 + --> $DIR/dst-index.rs:34:5 | LL | T[0]; | ^^^^ error[E0507]: cannot move out of indexed content - --> $DIR/dst-index.rs:41:5 + --> $DIR/dst-index.rs:31:5 | LL | S[0]; | ^^^^ cannot move out of indexed content error[E0507]: cannot move out of indexed content - --> $DIR/dst-index.rs:44:5 + --> $DIR/dst-index.rs:34:5 | LL | T[0]; | ^^^^ cannot move out of indexed content diff --git a/src/test/ui/dst/dst-object-from-unsized-type.rs b/src/test/ui/dst/dst-object-from-unsized-type.rs index 70b46b1bd79fd..f4ee1783a2e34 100644 --- a/src/test/ui/dst/dst-object-from-unsized-type.rs +++ b/src/test/ui/dst/dst-object-from-unsized-type.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we cannot create objects from unsized types. trait Foo { fn foo(&self) {} } diff --git a/src/test/ui/dst/dst-object-from-unsized-type.stderr b/src/test/ui/dst/dst-object-from-unsized-type.stderr index 862c52e43c06a..3b333ce5d28f1 100644 --- a/src/test/ui/dst/dst-object-from-unsized-type.stderr +++ b/src/test/ui/dst/dst-object-from-unsized-type.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `T` cannot be known at compilation time - --> $DIR/dst-object-from-unsized-type.rs:18:19 + --> $DIR/dst-object-from-unsized-type.rs:8:19 | LL | let u: &Foo = t; | ^ doesn't have a size known at compile-time @@ -10,7 +10,7 @@ LL | let u: &Foo = t; = note: required for the cast to the object type `dyn Foo` error[E0277]: the size for values of type `T` cannot be known at compilation time - --> $DIR/dst-object-from-unsized-type.rs:23:19 + --> $DIR/dst-object-from-unsized-type.rs:13:19 | LL | let v: &Foo = t as &Foo; | ^ doesn't have a size known at compile-time @@ -21,7 +21,7 @@ LL | let v: &Foo = t as &Foo; = note: required for the cast to the object type `dyn Foo` error[E0277]: the size for values of type `str` cannot be known at compilation time - --> $DIR/dst-object-from-unsized-type.rs:28:24 + --> $DIR/dst-object-from-unsized-type.rs:18:24 | LL | let _: &[&Foo] = &["hi"]; | ^^^^ doesn't have a size known at compile-time @@ -31,7 +31,7 @@ LL | let _: &[&Foo] = &["hi"]; = note: required for the cast to the object type `dyn Foo` error[E0277]: the size for values of type `[u8]` cannot be known at compilation time - --> $DIR/dst-object-from-unsized-type.rs:33:19 + --> $DIR/dst-object-from-unsized-type.rs:23:19 | LL | let _: &Foo = x as &Foo; | ^ doesn't have a size known at compile-time diff --git a/src/test/ui/dst/dst-rvalue.nll.stderr b/src/test/ui/dst/dst-rvalue.nll.stderr index 5eadcc3def5ff..da554ca28b615 100644 --- a/src/test/ui/dst/dst-rvalue.nll.stderr +++ b/src/test/ui/dst/dst-rvalue.nll.stderr @@ -1,23 +1,23 @@ error[E0161]: cannot move a value of type str: the size of str cannot be statically determined - --> $DIR/dst-rvalue.rs:16:28 + --> $DIR/dst-rvalue.rs:6:28 | LL | let _x: Box = box *"hello world"; | ^^^^^^^^^^^^^^ error[E0507]: cannot move out of borrowed content - --> $DIR/dst-rvalue.rs:16:28 + --> $DIR/dst-rvalue.rs:6:28 | LL | let _x: Box = box *"hello world"; | ^^^^^^^^^^^^^^ cannot move out of borrowed content error[E0161]: cannot move a value of type [isize]: the size of [isize] cannot be statically determined - --> $DIR/dst-rvalue.rs:21:32 + --> $DIR/dst-rvalue.rs:11:32 | LL | let _x: Box<[isize]> = box *array; | ^^^^^^ error[E0508]: cannot move out of type `[isize]`, a non-copy slice - --> $DIR/dst-rvalue.rs:21:32 + --> $DIR/dst-rvalue.rs:11:32 | LL | let _x: Box<[isize]> = box *array; | ^^^^^^ cannot move out of here diff --git a/src/test/ui/dst/dst-rvalue.rs b/src/test/ui/dst/dst-rvalue.rs index 69bda8c1671e7..86747dad00ddb 100644 --- a/src/test/ui/dst/dst-rvalue.rs +++ b/src/test/ui/dst/dst-rvalue.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that dynamically sized rvalues are forbidden #![feature(box_syntax)] diff --git a/src/test/ui/dst/dst-rvalue.stderr b/src/test/ui/dst/dst-rvalue.stderr index 0957105c8a797..2c92f5dcbf547 100644 --- a/src/test/ui/dst/dst-rvalue.stderr +++ b/src/test/ui/dst/dst-rvalue.stderr @@ -1,23 +1,23 @@ error[E0161]: cannot move a value of type str: the size of str cannot be statically determined - --> $DIR/dst-rvalue.rs:16:28 + --> $DIR/dst-rvalue.rs:6:28 | LL | let _x: Box = box *"hello world"; | ^^^^^^^^^^^^^^ error[E0161]: cannot move a value of type [isize]: the size of [isize] cannot be statically determined - --> $DIR/dst-rvalue.rs:21:32 + --> $DIR/dst-rvalue.rs:11:32 | LL | let _x: Box<[isize]> = box *array; | ^^^^^^ error[E0507]: cannot move out of borrowed content - --> $DIR/dst-rvalue.rs:16:28 + --> $DIR/dst-rvalue.rs:6:28 | LL | let _x: Box = box *"hello world"; | ^^^^^^^^^^^^^^ cannot move out of borrowed content error[E0507]: cannot move out of borrowed content - --> $DIR/dst-rvalue.rs:21:32 + --> $DIR/dst-rvalue.rs:11:32 | LL | let _x: Box<[isize]> = box *array; | ^^^^^^ cannot move out of borrowed content diff --git a/src/test/ui/dst/dst-sized-trait-param.rs b/src/test/ui/dst/dst-sized-trait-param.rs index 7316a48970f67..cfd59197becf0 100644 --- a/src/test/ui/dst/dst-sized-trait-param.rs +++ b/src/test/ui/dst/dst-sized-trait-param.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that when you implement a trait that has a sized type // parameter, the corresponding value must be sized. Also that the // self type must be sized if appropriate. diff --git a/src/test/ui/dst/dst-sized-trait-param.stderr b/src/test/ui/dst/dst-sized-trait-param.stderr index 47f8215d52620..e01bf2499da7e 100644 --- a/src/test/ui/dst/dst-sized-trait-param.stderr +++ b/src/test/ui/dst/dst-sized-trait-param.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `[isize]` cannot be known at compilation time - --> $DIR/dst-sized-trait-param.rs:17:6 + --> $DIR/dst-sized-trait-param.rs:7:6 | LL | impl Foo<[isize]> for usize { } | ^^^^^^^^^^^^ doesn't have a size known at compile-time @@ -8,7 +8,7 @@ LL | impl Foo<[isize]> for usize { } = note: to learn more, visit error[E0277]: the size for values of type `[usize]` cannot be known at compilation time - --> $DIR/dst-sized-trait-param.rs:20:6 + --> $DIR/dst-sized-trait-param.rs:10:6 | LL | impl Foo for [usize] { } | ^^^^^^^^^^ doesn't have a size known at compile-time diff --git a/src/test/ui/duplicate/dupe-symbols-1.rs b/src/test/ui/duplicate/dupe-symbols-1.rs index 9fa4eafcad0ed..f943c7b1110cc 100644 --- a/src/test/ui/duplicate/dupe-symbols-1.rs +++ b/src/test/ui/duplicate/dupe-symbols-1.rs @@ -1,12 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // #![crate_type="rlib"] #![allow(warnings)] diff --git a/src/test/ui/duplicate/dupe-symbols-1.stderr b/src/test/ui/duplicate/dupe-symbols-1.stderr index c702a0f3a1be6..58aa1e433d164 100644 --- a/src/test/ui/duplicate/dupe-symbols-1.stderr +++ b/src/test/ui/duplicate/dupe-symbols-1.stderr @@ -1,5 +1,5 @@ error: symbol `fail` is already defined - --> $DIR/dupe-symbols-1.rs:19:1 + --> $DIR/dupe-symbols-1.rs:10:1 | LL | / pub fn b() { LL | | //~^ symbol `fail` is already defined diff --git a/src/test/ui/duplicate/dupe-symbols-2.rs b/src/test/ui/duplicate/dupe-symbols-2.rs index 1f19bd2f249b3..9257f97fb93bd 100644 --- a/src/test/ui/duplicate/dupe-symbols-2.rs +++ b/src/test/ui/duplicate/dupe-symbols-2.rs @@ -1,12 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // #![crate_type="rlib"] #![allow(warnings)] diff --git a/src/test/ui/duplicate/dupe-symbols-2.stderr b/src/test/ui/duplicate/dupe-symbols-2.stderr index 5d5e9d73d7b43..65185cd54290c 100644 --- a/src/test/ui/duplicate/dupe-symbols-2.stderr +++ b/src/test/ui/duplicate/dupe-symbols-2.stderr @@ -1,5 +1,5 @@ error: symbol `fail` is already defined - --> $DIR/dupe-symbols-2.rs:22:5 + --> $DIR/dupe-symbols-2.rs:13:5 | LL | / pub extern fn fail() { LL | | //~^ symbol `fail` is already defined diff --git a/src/test/ui/duplicate/dupe-symbols-3.rs b/src/test/ui/duplicate/dupe-symbols-3.rs index 98a61c33c584a..03b3a0ab2070f 100644 --- a/src/test/ui/duplicate/dupe-symbols-3.rs +++ b/src/test/ui/duplicate/dupe-symbols-3.rs @@ -1,12 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // #![crate_type="rlib"] #![allow(warnings)] diff --git a/src/test/ui/duplicate/dupe-symbols-3.stderr b/src/test/ui/duplicate/dupe-symbols-3.stderr index 6801016373d19..5cd618bc9f653 100644 --- a/src/test/ui/duplicate/dupe-symbols-3.stderr +++ b/src/test/ui/duplicate/dupe-symbols-3.stderr @@ -1,5 +1,5 @@ error: symbol `fail` is already defined - --> $DIR/dupe-symbols-3.rs:19:1 + --> $DIR/dupe-symbols-3.rs:10:1 | LL | / pub fn fail() { LL | | //~^ symbol `fail` is already defined diff --git a/src/test/ui/duplicate/dupe-symbols-4.rs b/src/test/ui/duplicate/dupe-symbols-4.rs index 9e730699d2514..8fbf1151f7cc4 100644 --- a/src/test/ui/duplicate/dupe-symbols-4.rs +++ b/src/test/ui/duplicate/dupe-symbols-4.rs @@ -1,12 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // error-pattern: symbol `fail` is already defined #![crate_type="rlib"] diff --git a/src/test/ui/duplicate/dupe-symbols-4.stderr b/src/test/ui/duplicate/dupe-symbols-4.stderr index fdbb5ce90c1e7..84d57766c35a4 100644 --- a/src/test/ui/duplicate/dupe-symbols-4.stderr +++ b/src/test/ui/duplicate/dupe-symbols-4.stderr @@ -1,5 +1,5 @@ error: symbol `fail` is already defined - --> $DIR/dupe-symbols-4.rs:30:5 + --> $DIR/dupe-symbols-4.rs:21:5 | LL | fn fail(self) {} | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/duplicate/dupe-symbols-5.rs b/src/test/ui/duplicate/dupe-symbols-5.rs index eb4b50d03ca65..4a96a68582116 100644 --- a/src/test/ui/duplicate/dupe-symbols-5.rs +++ b/src/test/ui/duplicate/dupe-symbols-5.rs @@ -1,12 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // #![crate_type="rlib"] #![allow(warnings)] diff --git a/src/test/ui/duplicate/dupe-symbols-5.stderr b/src/test/ui/duplicate/dupe-symbols-5.stderr index 8ded374127b6c..3acfdd22a9a3b 100644 --- a/src/test/ui/duplicate/dupe-symbols-5.stderr +++ b/src/test/ui/duplicate/dupe-symbols-5.stderr @@ -1,5 +1,5 @@ error: symbol `fail` is already defined - --> $DIR/dupe-symbols-5.rs:18:1 + --> $DIR/dupe-symbols-5.rs:9:1 | LL | / pub fn b() { LL | | //~^ symbol `fail` is already defined diff --git a/src/test/ui/duplicate/dupe-symbols-6.rs b/src/test/ui/duplicate/dupe-symbols-6.rs index 6f412d9a0de15..5a1b917f179a0 100644 --- a/src/test/ui/duplicate/dupe-symbols-6.rs +++ b/src/test/ui/duplicate/dupe-symbols-6.rs @@ -1,12 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![crate_type="rlib"] #![allow(warnings)] diff --git a/src/test/ui/duplicate/dupe-symbols-6.stderr b/src/test/ui/duplicate/dupe-symbols-6.stderr index 6dbb831832a23..69781ee3e0dfd 100644 --- a/src/test/ui/duplicate/dupe-symbols-6.stderr +++ b/src/test/ui/duplicate/dupe-symbols-6.stderr @@ -1,5 +1,5 @@ error: symbol `fail` is already defined - --> $DIR/dupe-symbols-6.rs:17:1 + --> $DIR/dupe-symbols-6.rs:8:1 | LL | static HELLO_TWICE: u16 = 0; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/duplicate/dupe-symbols-7.rs b/src/test/ui/duplicate/dupe-symbols-7.rs index c2880ba6f51e9..b28f1a40fe93b 100644 --- a/src/test/ui/duplicate/dupe-symbols-7.rs +++ b/src/test/ui/duplicate/dupe-symbols-7.rs @@ -1,12 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // error-pattern: entry symbol `main` defined multiple times #![allow(warnings)] diff --git a/src/test/ui/duplicate/dupe-symbols-7.stderr b/src/test/ui/duplicate/dupe-symbols-7.stderr index 5fadbd5bd1007..a1dbbb0c685fb 100644 --- a/src/test/ui/duplicate/dupe-symbols-7.stderr +++ b/src/test/ui/duplicate/dupe-symbols-7.stderr @@ -1,5 +1,5 @@ error: entry symbol `main` defined multiple times - --> $DIR/dupe-symbols-7.rs:15:1 + --> $DIR/dupe-symbols-7.rs:6:1 | LL | fn main(){} | ^^^^^^^^^^^ diff --git a/src/test/ui/duplicate/duplicate-check-macro-exports.rs b/src/test/ui/duplicate/duplicate-check-macro-exports.rs index 42b2b1d650f76..9ba28acfdeef1 100644 --- a/src/test/ui/duplicate/duplicate-check-macro-exports.rs +++ b/src/test/ui/duplicate/duplicate-check-macro-exports.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub use std::panic; #[macro_export] diff --git a/src/test/ui/duplicate/duplicate-check-macro-exports.stderr b/src/test/ui/duplicate/duplicate-check-macro-exports.stderr index e2119efbd3db5..117a6a65147f1 100644 --- a/src/test/ui/duplicate/duplicate-check-macro-exports.stderr +++ b/src/test/ui/duplicate/duplicate-check-macro-exports.stderr @@ -1,5 +1,5 @@ error[E0255]: the name `panic` is defined multiple times - --> $DIR/duplicate-check-macro-exports.rs:14:1 + --> $DIR/duplicate-check-macro-exports.rs:4:1 | LL | pub use std::panic; | ---------- previous import of the macro `panic` here diff --git a/src/test/ui/duplicate/duplicate-parameter.rs b/src/test/ui/duplicate/duplicate-parameter.rs index 7586bc61cd6d4..e5b21bbcd9fbb 100644 --- a/src/test/ui/duplicate/duplicate-parameter.rs +++ b/src/test/ui/duplicate/duplicate-parameter.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn f(a: isize, a: isize) {} //~^ ERROR identifier `a` is bound more than once in this parameter list diff --git a/src/test/ui/duplicate/duplicate-parameter.stderr b/src/test/ui/duplicate/duplicate-parameter.stderr index 6cc7244ea79df..f3ef0bcf3a056 100644 --- a/src/test/ui/duplicate/duplicate-parameter.stderr +++ b/src/test/ui/duplicate/duplicate-parameter.stderr @@ -1,5 +1,5 @@ error[E0415]: identifier `a` is bound more than once in this parameter list - --> $DIR/duplicate-parameter.rs:11:16 + --> $DIR/duplicate-parameter.rs:1:16 | LL | fn f(a: isize, a: isize) {} | ^ used as parameter more than once diff --git a/src/test/ui/duplicate/duplicate-type-parameter.rs b/src/test/ui/duplicate/duplicate-type-parameter.rs index 3b0f8ee5bda7a..2751b3c8dc0ac 100644 --- a/src/test/ui/duplicate/duplicate-type-parameter.rs +++ b/src/test/ui/duplicate/duplicate-type-parameter.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - type Foo = Option; //~^ ERROR the name `T` is already used diff --git a/src/test/ui/duplicate/duplicate-type-parameter.stderr b/src/test/ui/duplicate/duplicate-type-parameter.stderr index 186a1e52bb8b1..41750d4bb3625 100644 --- a/src/test/ui/duplicate/duplicate-type-parameter.stderr +++ b/src/test/ui/duplicate/duplicate-type-parameter.stderr @@ -1,5 +1,5 @@ error[E0403]: the name `T` is already used for a type parameter in this type parameter list - --> $DIR/duplicate-type-parameter.rs:11:12 + --> $DIR/duplicate-type-parameter.rs:1:12 | LL | type Foo = Option; | - ^ already used @@ -7,7 +7,7 @@ LL | type Foo = Option; | first use of `T` error[E0403]: the name `T` is already used for a type parameter in this type parameter list - --> $DIR/duplicate-type-parameter.rs:14:14 + --> $DIR/duplicate-type-parameter.rs:4:14 | LL | struct Bar(T); | - ^ already used @@ -15,7 +15,7 @@ LL | struct Bar(T); | first use of `T` error[E0403]: the name `T` is already used for a type parameter in this type parameter list - --> $DIR/duplicate-type-parameter.rs:17:14 + --> $DIR/duplicate-type-parameter.rs:7:14 | LL | struct Baz { | - ^ already used @@ -23,7 +23,7 @@ LL | struct Baz { | first use of `T` error[E0403]: the name `T` is already used for a type parameter in this type parameter list - --> $DIR/duplicate-type-parameter.rs:22:12 + --> $DIR/duplicate-type-parameter.rs:12:12 | LL | enum Boo { | - ^ already used @@ -31,7 +31,7 @@ LL | enum Boo { | first use of `T` error[E0403]: the name `T` is already used for a type parameter in this type parameter list - --> $DIR/duplicate-type-parameter.rs:28:11 + --> $DIR/duplicate-type-parameter.rs:18:11 | LL | fn quux(x: T) {} | - ^ already used @@ -39,7 +39,7 @@ LL | fn quux(x: T) {} | first use of `T` error[E0403]: the name `T` is already used for a type parameter in this type parameter list - --> $DIR/duplicate-type-parameter.rs:31:13 + --> $DIR/duplicate-type-parameter.rs:21:13 | LL | trait Qux {} | - ^ already used @@ -47,7 +47,7 @@ LL | trait Qux {} | first use of `T` error[E0403]: the name `T` is already used for a type parameter in this type parameter list - --> $DIR/duplicate-type-parameter.rs:34:8 + --> $DIR/duplicate-type-parameter.rs:24:8 | LL | impl Qux for Option {} | - ^ already used @@ -55,7 +55,7 @@ LL | impl Qux for Option {} | first use of `T` error[E0207]: the type parameter `T` is not constrained by the impl trait, self type, or predicates - --> $DIR/duplicate-type-parameter.rs:34:6 + --> $DIR/duplicate-type-parameter.rs:24:6 | LL | impl Qux for Option {} | ^ unconstrained type parameter diff --git a/src/test/ui/duplicate_entry_error.rs b/src/test/ui/duplicate_entry_error.rs index 176aa7cca5357..62df42b1a6890 100644 --- a/src/test/ui/duplicate_entry_error.rs +++ b/src/test/ui/duplicate_entry_error.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // note-pattern: first defined in crate `std`. // Test for issue #31788 and E0152 diff --git a/src/test/ui/duplicate_entry_error.stderr b/src/test/ui/duplicate_entry_error.stderr index b330d2f30f863..ddb11e19c03de 100644 --- a/src/test/ui/duplicate_entry_error.stderr +++ b/src/test/ui/duplicate_entry_error.stderr @@ -1,5 +1,5 @@ error[E0152]: duplicate lang item found: `panic_impl`. - --> $DIR/duplicate_entry_error.rs:20:1 + --> $DIR/duplicate_entry_error.rs:10:1 | LL | / fn panic_impl(info: &PanicInfo) -> ! { LL | | //~^ ERROR: duplicate lang item found: `panic_impl`. diff --git a/src/test/ui/dyn-trait-compatibility.rs b/src/test/ui/dyn-trait-compatibility.rs index 454b6d2f566eb..90ebe4af092a4 100644 --- a/src/test/ui/dyn-trait-compatibility.rs +++ b/src/test/ui/dyn-trait-compatibility.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - type A0 = dyn; //~^ ERROR cannot find type `dyn` in this scope type A1 = dyn::dyn; diff --git a/src/test/ui/dyn-trait-compatibility.stderr b/src/test/ui/dyn-trait-compatibility.stderr index 1ff3249371b9d..47c63ae1cd793 100644 --- a/src/test/ui/dyn-trait-compatibility.stderr +++ b/src/test/ui/dyn-trait-compatibility.stderr @@ -1,47 +1,47 @@ error[E0433]: failed to resolve. Use of undeclared type or module `dyn` - --> $DIR/dyn-trait-compatibility.rs:13:11 + --> $DIR/dyn-trait-compatibility.rs:3:11 | LL | type A1 = dyn::dyn; | ^^^ Use of undeclared type or module `dyn` error[E0433]: failed to resolve. Use of undeclared type or module `dyn` - --> $DIR/dyn-trait-compatibility.rs:19:23 + --> $DIR/dyn-trait-compatibility.rs:9:23 | LL | type A3 = dyn<::dyn>; | ^^^ Use of undeclared type or module `dyn` error[E0412]: cannot find type `dyn` in this scope - --> $DIR/dyn-trait-compatibility.rs:11:11 + --> $DIR/dyn-trait-compatibility.rs:1:11 | LL | type A0 = dyn; | ^^^ not found in this scope error[E0412]: cannot find type `dyn` in this scope - --> $DIR/dyn-trait-compatibility.rs:15:11 + --> $DIR/dyn-trait-compatibility.rs:5:11 | LL | type A2 = dyn; | ^^^ not found in this scope error[E0412]: cannot find type `dyn` in this scope - --> $DIR/dyn-trait-compatibility.rs:15:15 + --> $DIR/dyn-trait-compatibility.rs:5:15 | LL | type A2 = dyn; | ^^^ not found in this scope error[E0412]: cannot find type `dyn` in this scope - --> $DIR/dyn-trait-compatibility.rs:15:20 + --> $DIR/dyn-trait-compatibility.rs:5:20 | LL | type A2 = dyn; | ^^^ not found in this scope error[E0412]: cannot find type `dyn` in this scope - --> $DIR/dyn-trait-compatibility.rs:19:11 + --> $DIR/dyn-trait-compatibility.rs:9:11 | LL | type A3 = dyn<::dyn>; | ^^^ not found in this scope error[E0412]: cannot find type `dyn` in this scope - --> $DIR/dyn-trait-compatibility.rs:19:16 + --> $DIR/dyn-trait-compatibility.rs:9:16 | LL | type A3 = dyn<::dyn>; | ^^^ not found in this scope diff --git a/src/test/ui/e0119/auxiliary/complex_impl_support.rs b/src/test/ui/e0119/auxiliary/complex_impl_support.rs index b30db9660992c..ad5bb107fc6e7 100644 --- a/src/test/ui/e0119/auxiliary/complex_impl_support.rs +++ b/src/test/ui/e0119/auxiliary/complex_impl_support.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::marker::PhantomData; pub trait External {} diff --git a/src/test/ui/e0119/auxiliary/issue_23563_a.rs b/src/test/ui/e0119/auxiliary/issue_23563_a.rs index 57a0da0248d5c..4e85bcc4ba623 100644 --- a/src/test/ui/e0119/auxiliary/issue_23563_a.rs +++ b/src/test/ui/e0119/auxiliary/issue_23563_a.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Ref: https://github.com/rust-lang/rust/issues/23563#issuecomment-260751672 pub trait LolTo { diff --git a/src/test/ui/e0119/complex-impl.rs b/src/test/ui/e0119/complex-impl.rs index b8b30a2841421..3cba39ecbf938 100644 --- a/src/test/ui/e0119/complex-impl.rs +++ b/src/test/ui/e0119/complex-impl.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:complex_impl_support.rs extern crate complex_impl_support; diff --git a/src/test/ui/e0119/complex-impl.stderr b/src/test/ui/e0119/complex-impl.stderr index 1fc4c28d67c5d..7a64d6d95425f 100644 --- a/src/test/ui/e0119/complex-impl.stderr +++ b/src/test/ui/e0119/complex-impl.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `complex_impl_support::External` for type `(Q, complex_impl_support::M<'_, '_, '_, std::boxed::Box<_>, _, _>)`: - --> $DIR/complex-impl.rs:19:1 + --> $DIR/complex-impl.rs:9:1 | LL | impl External for (Q, R) {} //~ ERROR must be used | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -9,7 +9,7 @@ LL | impl External for (Q, R) {} //~ ERROR must be used where >::Output == V, ::Item == T, 'b : 'a, T : 'a, U: std::ops::FnOnce<(T,)>, U : 'static, V: std::iter::Iterator, V: std::clone::Clone, W: std::ops::Add, ::Output: std::marker::Copy; error[E0210]: type parameter `R` must be used as the type parameter for some local type (e.g. `MyStruct`) - --> $DIR/complex-impl.rs:19:1 + --> $DIR/complex-impl.rs:9:1 | LL | impl External for (Q, R) {} //~ ERROR must be used | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ type parameter `R` must be used as the type parameter for some local type diff --git a/src/test/ui/e0119/conflict-with-std.rs b/src/test/ui/e0119/conflict-with-std.rs index ed9033ad53d56..e639bc5db5e0f 100644 --- a/src/test/ui/e0119/conflict-with-std.rs +++ b/src/test/ui/e0119/conflict-with-std.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(try_from)] use std::marker::PhantomData; diff --git a/src/test/ui/e0119/conflict-with-std.stderr b/src/test/ui/e0119/conflict-with-std.stderr index e8b2c84c0df0b..d94e4dc5b6e79 100644 --- a/src/test/ui/e0119/conflict-with-std.stderr +++ b/src/test/ui/e0119/conflict-with-std.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `std::convert::AsRef` for type `std::boxed::Box`: - --> $DIR/conflict-with-std.rs:17:1 + --> $DIR/conflict-with-std.rs:7:1 | LL | impl AsRef for Box { //~ ERROR conflicting implementations | ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -9,7 +9,7 @@ LL | impl AsRef for Box { //~ ERROR conflicting implementations where T: ?Sized; error[E0119]: conflicting implementations of trait `std::convert::From` for type `S`: - --> $DIR/conflict-with-std.rs:24:1 + --> $DIR/conflict-with-std.rs:14:1 | LL | impl From for S { //~ ERROR conflicting implementations | ^^^^^^^^^^^^^^^^^^ @@ -18,7 +18,7 @@ LL | impl From for S { //~ ERROR conflicting implementations - impl std::convert::From for T; error[E0119]: conflicting implementations of trait `std::convert::TryFrom` for type `X`: - --> $DIR/conflict-with-std.rs:31:1 + --> $DIR/conflict-with-std.rs:21:1 | LL | impl TryFrom for X { //~ ERROR conflicting implementations | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/e0119/issue-23563.rs b/src/test/ui/e0119/issue-23563.rs index c6d03a4cfc0a7..a2804fcf1cc55 100644 --- a/src/test/ui/e0119/issue-23563.rs +++ b/src/test/ui/e0119/issue-23563.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_23563_a.rs // Ref: https://github.com/rust-lang/rust/issues/23563#issuecomment-260751672 diff --git a/src/test/ui/e0119/issue-23563.stderr b/src/test/ui/e0119/issue-23563.stderr index 0630b76882e7e..53f9a5e706444 100644 --- a/src/test/ui/e0119/issue-23563.stderr +++ b/src/test/ui/e0119/issue-23563.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `a::LolFrom<&[_]>` for type `LocalType<_>`: - --> $DIR/issue-23563.rs:23:1 + --> $DIR/issue-23563.rs:13:1 | LL | impl<'a, T> LolFrom<&'a [T]> for LocalType { //~ ERROR conflicting implementations of trait | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/e0119/issue-27403.rs b/src/test/ui/e0119/issue-27403.rs index 98953153faf96..b03a564ffd4ee 100644 --- a/src/test/ui/e0119/issue-27403.rs +++ b/src/test/ui/e0119/issue-27403.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct GenX { inner: S, } diff --git a/src/test/ui/e0119/issue-27403.stderr b/src/test/ui/e0119/issue-27403.stderr index 9dea60a72b50f..76c326fb20541 100644 --- a/src/test/ui/e0119/issue-27403.stderr +++ b/src/test/ui/e0119/issue-27403.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `std::convert::Into<_>` for type `GenX<_>`: - --> $DIR/issue-27403.rs:15:1 + --> $DIR/issue-27403.rs:5:1 | LL | impl Into for GenX { //~ ERROR conflicting implementations | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/e0119/issue-28981.rs b/src/test/ui/e0119/issue-28981.rs index 8a52464ff50a4..c31b212b25a0d 100644 --- a/src/test/ui/e0119/issue-28981.rs +++ b/src/test/ui/e0119/issue-28981.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::Deref; struct Foo; diff --git a/src/test/ui/e0119/issue-28981.stderr b/src/test/ui/e0119/issue-28981.stderr index afcbab4a5c6c0..3330d5b1ad744 100644 --- a/src/test/ui/e0119/issue-28981.stderr +++ b/src/test/ui/e0119/issue-28981.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `std::ops::Deref` for type `&_`: - --> $DIR/issue-28981.rs:15:1 + --> $DIR/issue-28981.rs:5:1 | LL | impl Deref for Foo { } //~ ERROR must be used | ^^^^^^^^^^^^^^^^^^^^^^^ @@ -9,7 +9,7 @@ LL | impl Deref for Foo { } //~ ERROR must be used where T: ?Sized; error[E0210]: type parameter `Foo` must be used as the type parameter for some local type (e.g. `MyStruct`) - --> $DIR/issue-28981.rs:15:1 + --> $DIR/issue-28981.rs:5:1 | LL | impl Deref for Foo { } //~ ERROR must be used | ^^^^^^^^^^^^^^^^^^^^^^^ type parameter `Foo` must be used as the type parameter for some local type diff --git a/src/test/ui/e0119/so-37347311.rs b/src/test/ui/e0119/so-37347311.rs index 933cdb3cd533d..d5f624bc4d972 100644 --- a/src/test/ui/e0119/so-37347311.rs +++ b/src/test/ui/e0119/so-37347311.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Ref: https://stackoverflow.com/q/37347311 trait Storage { diff --git a/src/test/ui/e0119/so-37347311.stderr b/src/test/ui/e0119/so-37347311.stderr index 6c14b200ee5bb..eb321668d13f8 100644 --- a/src/test/ui/e0119/so-37347311.stderr +++ b/src/test/ui/e0119/so-37347311.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `std::convert::From>` for type `MyError<_>`: - --> $DIR/so-37347311.rs:21:1 + --> $DIR/so-37347311.rs:11:1 | LL | impl From for MyError { //~ ERROR conflicting implementations | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/editions/auxiliary/edition-extern-crate-allowed.rs b/src/test/ui/editions/auxiliary/edition-extern-crate-allowed.rs index d26ab6d351830..d11c69f812a8d 100644 --- a/src/test/ui/editions/auxiliary/edition-extern-crate-allowed.rs +++ b/src/test/ui/editions/auxiliary/edition-extern-crate-allowed.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // intentionally empty diff --git a/src/test/ui/editions/auxiliary/edition-kw-macro-2015.rs b/src/test/ui/editions/auxiliary/edition-kw-macro-2015.rs index 5b8832ddaf27c..1c2bb740548ca 100644 --- a/src/test/ui/editions/auxiliary/edition-kw-macro-2015.rs +++ b/src/test/ui/editions/auxiliary/edition-kw-macro-2015.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2015 #![allow(async_idents)] diff --git a/src/test/ui/editions/auxiliary/edition-kw-macro-2018.rs b/src/test/ui/editions/auxiliary/edition-kw-macro-2018.rs index 85ef15858fe91..a356bd9de806f 100644 --- a/src/test/ui/editions/auxiliary/edition-kw-macro-2018.rs +++ b/src/test/ui/editions/auxiliary/edition-kw-macro-2018.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 #![allow(async_idents)] diff --git a/src/test/ui/editions/edition-extern-crate-allowed.rs b/src/test/ui/editions/edition-extern-crate-allowed.rs index 75761a0b5b971..6361fff6ff43c 100644 --- a/src/test/ui/editions/edition-extern-crate-allowed.rs +++ b/src/test/ui/editions/edition-extern-crate-allowed.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:edition-extern-crate-allowed.rs // edition:2015 // compile-pass diff --git a/src/test/ui/editions/edition-extern-crate-allowed.stderr b/src/test/ui/editions/edition-extern-crate-allowed.stderr index 7c1ccc540c552..b675c13f75d66 100644 --- a/src/test/ui/editions/edition-extern-crate-allowed.stderr +++ b/src/test/ui/editions/edition-extern-crate-allowed.stderr @@ -1,11 +1,11 @@ warning: unused extern crate - --> $DIR/edition-extern-crate-allowed.rs:17:1 + --> $DIR/edition-extern-crate-allowed.rs:7:1 | LL | extern crate edition_extern_crate_allowed; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove it | note: lint level defined here - --> $DIR/edition-extern-crate-allowed.rs:15:9 + --> $DIR/edition-extern-crate-allowed.rs:5:9 | LL | #![warn(rust_2018_idioms)] | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/editions/edition-feature-ok.rs b/src/test/ui/editions/edition-feature-ok.rs index 5896e9a071591..c2468df49398a 100644 --- a/src/test/ui/editions/edition-feature-ok.rs +++ b/src/test/ui/editions/edition-feature-ok.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![feature(rust_2018_preview)] diff --git a/src/test/ui/editions/edition-feature-redundant.rs b/src/test/ui/editions/edition-feature-redundant.rs index d20873f5e1163..87a2a22105f4e 100644 --- a/src/test/ui/editions/edition-feature-redundant.rs +++ b/src/test/ui/editions/edition-feature-redundant.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 // compile-pass diff --git a/src/test/ui/editions/edition-feature-redundant.stderr b/src/test/ui/editions/edition-feature-redundant.stderr index ccf7b21fbc5c0..36e90f3a246e6 100644 --- a/src/test/ui/editions/edition-feature-redundant.stderr +++ b/src/test/ui/editions/edition-feature-redundant.stderr @@ -1,5 +1,5 @@ warning[E0705]: the feature `rust_2018_preview` is included in the Rust 2018 edition - --> $DIR/edition-feature-redundant.rs:14:12 + --> $DIR/edition-feature-redundant.rs:4:12 | LL | #![feature(rust_2018_preview)] | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/editions/edition-keywords-2015-2015-expansion.rs b/src/test/ui/editions/edition-keywords-2015-2015-expansion.rs index a9037a50ecb6b..11c1f1a5d6bb3 100644 --- a/src/test/ui/editions/edition-keywords-2015-2015-expansion.rs +++ b/src/test/ui/editions/edition-keywords-2015-2015-expansion.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2015 // aux-build:edition-kw-macro-2015.rs // compile-pass diff --git a/src/test/ui/editions/edition-keywords-2015-2015-parsing.rs b/src/test/ui/editions/edition-keywords-2015-2015-parsing.rs index bdb190c748ace..e65eed0a0e6d0 100644 --- a/src/test/ui/editions/edition-keywords-2015-2015-parsing.rs +++ b/src/test/ui/editions/edition-keywords-2015-2015-parsing.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2015 // aux-build:edition-kw-macro-2015.rs diff --git a/src/test/ui/editions/edition-keywords-2015-2015-parsing.stderr b/src/test/ui/editions/edition-keywords-2015-2015-parsing.stderr index a629d13e6c31b..cc363b7c4ae87 100644 --- a/src/test/ui/editions/edition-keywords-2015-2015-parsing.stderr +++ b/src/test/ui/editions/edition-keywords-2015-2015-parsing.stderr @@ -1,11 +1,11 @@ error: no rules expected the token `r#async` - --> $DIR/edition-keywords-2015-2015-parsing.rs:22:31 + --> $DIR/edition-keywords-2015-2015-parsing.rs:12:31 | LL | r#async = consumes_async!(r#async); //~ ERROR no rules expected the token `r#async` | ^^^^^^^ error: no rules expected the token `async` - --> $DIR/edition-keywords-2015-2015-parsing.rs:23:35 + --> $DIR/edition-keywords-2015-2015-parsing.rs:13:35 | LL | r#async = consumes_async_raw!(async); //~ ERROR no rules expected the token `async` | ^^^^^ diff --git a/src/test/ui/editions/edition-keywords-2015-2018-expansion.rs b/src/test/ui/editions/edition-keywords-2015-2018-expansion.rs index 291fd0285e57c..8aafeefa56ce1 100644 --- a/src/test/ui/editions/edition-keywords-2015-2018-expansion.rs +++ b/src/test/ui/editions/edition-keywords-2015-2018-expansion.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2015 // aux-build:edition-kw-macro-2018.rs diff --git a/src/test/ui/editions/edition-keywords-2015-2018-expansion.stderr b/src/test/ui/editions/edition-keywords-2015-2018-expansion.stderr index d087146d7a14a..5dd7030c77ec6 100644 --- a/src/test/ui/editions/edition-keywords-2015-2018-expansion.stderr +++ b/src/test/ui/editions/edition-keywords-2015-2018-expansion.stderr @@ -1,5 +1,5 @@ error: expected identifier, found reserved keyword `async` - --> $DIR/edition-keywords-2015-2018-expansion.rs:18:5 + --> $DIR/edition-keywords-2015-2018-expansion.rs:8:5 | LL | produces_async! {} //~ ERROR expected identifier, found reserved keyword | ^^^^^^^^^^^^^^^^^^ expected identifier, found reserved keyword diff --git a/src/test/ui/editions/edition-keywords-2015-2018-parsing.rs b/src/test/ui/editions/edition-keywords-2015-2018-parsing.rs index 1b7bfb530596a..767396031297e 100644 --- a/src/test/ui/editions/edition-keywords-2015-2018-parsing.rs +++ b/src/test/ui/editions/edition-keywords-2015-2018-parsing.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2015 // aux-build:edition-kw-macro-2018.rs diff --git a/src/test/ui/editions/edition-keywords-2015-2018-parsing.stderr b/src/test/ui/editions/edition-keywords-2015-2018-parsing.stderr index ab8a34a4a9e3d..788a17e72e08e 100644 --- a/src/test/ui/editions/edition-keywords-2015-2018-parsing.stderr +++ b/src/test/ui/editions/edition-keywords-2015-2018-parsing.stderr @@ -1,11 +1,11 @@ error: no rules expected the token `r#async` - --> $DIR/edition-keywords-2015-2018-parsing.rs:22:31 + --> $DIR/edition-keywords-2015-2018-parsing.rs:12:31 | LL | r#async = consumes_async!(r#async); //~ ERROR no rules expected the token `r#async` | ^^^^^^^ error: no rules expected the token `async` - --> $DIR/edition-keywords-2015-2018-parsing.rs:23:35 + --> $DIR/edition-keywords-2015-2018-parsing.rs:13:35 | LL | r#async = consumes_async_raw!(async); //~ ERROR no rules expected the token `async` | ^^^^^ diff --git a/src/test/ui/editions/edition-keywords-2018-2015-expansion.rs b/src/test/ui/editions/edition-keywords-2018-2015-expansion.rs index 911dcd855aad6..3e736a4222482 100644 --- a/src/test/ui/editions/edition-keywords-2018-2015-expansion.rs +++ b/src/test/ui/editions/edition-keywords-2018-2015-expansion.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 // aux-build:edition-kw-macro-2015.rs // compile-pass diff --git a/src/test/ui/editions/edition-keywords-2018-2015-parsing.rs b/src/test/ui/editions/edition-keywords-2018-2015-parsing.rs index 02b061f8cbcdb..fb8e0cdb4c30f 100644 --- a/src/test/ui/editions/edition-keywords-2018-2015-parsing.rs +++ b/src/test/ui/editions/edition-keywords-2018-2015-parsing.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 // aux-build:edition-kw-macro-2015.rs diff --git a/src/test/ui/editions/edition-keywords-2018-2015-parsing.stderr b/src/test/ui/editions/edition-keywords-2018-2015-parsing.stderr index 02e7d5b7cd01c..434e466a03ed4 100644 --- a/src/test/ui/editions/edition-keywords-2018-2015-parsing.stderr +++ b/src/test/ui/editions/edition-keywords-2018-2015-parsing.stderr @@ -1,23 +1,23 @@ error: expected identifier, found reserved keyword `async` - --> $DIR/edition-keywords-2018-2015-parsing.rs:18:13 + --> $DIR/edition-keywords-2018-2015-parsing.rs:8:13 | LL | let mut async = 1; //~ ERROR expected identifier, found reserved keyword `async` | ^^^^^ expected identifier, found reserved keyword error: expected identifier, found reserved keyword `async` - --> $DIR/edition-keywords-2018-2015-parsing.rs:28:13 + --> $DIR/edition-keywords-2018-2015-parsing.rs:18:13 | LL | module::async(); //~ ERROR expected identifier, found reserved keyword `async` | ^^^^^ expected identifier, found reserved keyword error: no rules expected the token `r#async` - --> $DIR/edition-keywords-2018-2015-parsing.rs:22:31 + --> $DIR/edition-keywords-2018-2015-parsing.rs:12:31 | LL | r#async = consumes_async!(r#async); //~ ERROR no rules expected the token `r#async` | ^^^^^^^ error: no rules expected the token `async` - --> $DIR/edition-keywords-2018-2015-parsing.rs:23:35 + --> $DIR/edition-keywords-2018-2015-parsing.rs:13:35 | LL | r#async = consumes_async_raw!(async); //~ ERROR no rules expected the token `async` | ^^^^^ diff --git a/src/test/ui/editions/edition-keywords-2018-2018-expansion.rs b/src/test/ui/editions/edition-keywords-2018-2018-expansion.rs index 81bef913ac6ca..2db0a2dde2ed0 100644 --- a/src/test/ui/editions/edition-keywords-2018-2018-expansion.rs +++ b/src/test/ui/editions/edition-keywords-2018-2018-expansion.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 // aux-build:edition-kw-macro-2018.rs diff --git a/src/test/ui/editions/edition-keywords-2018-2018-expansion.stderr b/src/test/ui/editions/edition-keywords-2018-2018-expansion.stderr index c6e0927a3a435..44d0e78d06a46 100644 --- a/src/test/ui/editions/edition-keywords-2018-2018-expansion.stderr +++ b/src/test/ui/editions/edition-keywords-2018-2018-expansion.stderr @@ -1,5 +1,5 @@ error: expected identifier, found reserved keyword `async` - --> $DIR/edition-keywords-2018-2018-expansion.rs:18:5 + --> $DIR/edition-keywords-2018-2018-expansion.rs:8:5 | LL | produces_async! {} //~ ERROR expected identifier, found reserved keyword `async` | ^^^^^^^^^^^^^^^^^^ expected identifier, found reserved keyword diff --git a/src/test/ui/editions/edition-keywords-2018-2018-parsing.rs b/src/test/ui/editions/edition-keywords-2018-2018-parsing.rs index 565c2f2dc742b..88cebf45ad8ba 100644 --- a/src/test/ui/editions/edition-keywords-2018-2018-parsing.rs +++ b/src/test/ui/editions/edition-keywords-2018-2018-parsing.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 // aux-build:edition-kw-macro-2018.rs diff --git a/src/test/ui/editions/edition-keywords-2018-2018-parsing.stderr b/src/test/ui/editions/edition-keywords-2018-2018-parsing.stderr index 435e395c2910e..99090de3078b2 100644 --- a/src/test/ui/editions/edition-keywords-2018-2018-parsing.stderr +++ b/src/test/ui/editions/edition-keywords-2018-2018-parsing.stderr @@ -1,23 +1,23 @@ error: expected identifier, found reserved keyword `async` - --> $DIR/edition-keywords-2018-2018-parsing.rs:18:13 + --> $DIR/edition-keywords-2018-2018-parsing.rs:8:13 | LL | let mut async = 1; //~ ERROR expected identifier, found reserved keyword `async` | ^^^^^ expected identifier, found reserved keyword error: expected identifier, found reserved keyword `async` - --> $DIR/edition-keywords-2018-2018-parsing.rs:28:13 + --> $DIR/edition-keywords-2018-2018-parsing.rs:18:13 | LL | module::async(); //~ ERROR expected identifier, found reserved keyword `async` | ^^^^^ expected identifier, found reserved keyword error: no rules expected the token `r#async` - --> $DIR/edition-keywords-2018-2018-parsing.rs:22:31 + --> $DIR/edition-keywords-2018-2018-parsing.rs:12:31 | LL | r#async = consumes_async!(r#async); //~ ERROR no rules expected the token `r#async` | ^^^^^^^ error: no rules expected the token `async` - --> $DIR/edition-keywords-2018-2018-parsing.rs:23:35 + --> $DIR/edition-keywords-2018-2018-parsing.rs:13:35 | LL | r#async = consumes_async_raw!(async); //~ ERROR no rules expected the token `async` | ^^^^^ diff --git a/src/test/ui/editions/edition-raw-pointer-method-2015.rs b/src/test/ui/editions/edition-raw-pointer-method-2015.rs index 4ba44fa54d8cd..a538bca75f67d 100644 --- a/src/test/ui/editions/edition-raw-pointer-method-2015.rs +++ b/src/test/ui/editions/edition-raw-pointer-method-2015.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // edition:2015 diff --git a/src/test/ui/editions/edition-raw-pointer-method-2015.stderr b/src/test/ui/editions/edition-raw-pointer-method-2015.stderr index 7fd098c98e380..deea6a71b24f3 100644 --- a/src/test/ui/editions/edition-raw-pointer-method-2015.stderr +++ b/src/test/ui/editions/edition-raw-pointer-method-2015.stderr @@ -1,11 +1,11 @@ error: type annotations needed - --> $DIR/edition-raw-pointer-method-2015.rs:20:15 + --> $DIR/edition-raw-pointer-method-2015.rs:10:15 | LL | let _ = y.is_null(); | ^^^^^^^ | note: lint level defined here - --> $DIR/edition-raw-pointer-method-2015.rs:16:8 + --> $DIR/edition-raw-pointer-method-2015.rs:6:8 | LL | #[deny(warnings)] | ^^^^^^^^ diff --git a/src/test/ui/editions/edition-raw-pointer-method-2018.rs b/src/test/ui/editions/edition-raw-pointer-method-2018.rs index c8548ed35b972..eabab5e4739ab 100644 --- a/src/test/ui/editions/edition-raw-pointer-method-2018.rs +++ b/src/test/ui/editions/edition-raw-pointer-method-2018.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // edition:2018 diff --git a/src/test/ui/editions/edition-raw-pointer-method-2018.stderr b/src/test/ui/editions/edition-raw-pointer-method-2018.stderr index 0708b4bbd469d..03e7f3a9449d6 100644 --- a/src/test/ui/editions/edition-raw-pointer-method-2018.stderr +++ b/src/test/ui/editions/edition-raw-pointer-method-2018.stderr @@ -1,5 +1,5 @@ error[E0699]: the type of this value must be known to call a method on a raw pointer on it - --> $DIR/edition-raw-pointer-method-2018.rs:20:15 + --> $DIR/edition-raw-pointer-method-2018.rs:10:15 | LL | let _ = y.is_null(); | ^^^^^^^ diff --git a/src/test/ui/elided-test.rs b/src/test/ui/elided-test.rs index 0cdd0010a745d..b3f4446f189da 100644 --- a/src/test/ui/elided-test.rs +++ b/src/test/ui/elided-test.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: `main` function not found // Since we're not compiling a test runner this function should be elided diff --git a/src/test/ui/empty/auxiliary/empty-struct.rs b/src/test/ui/empty/auxiliary/empty-struct.rs index 4a30286563422..3fb40f6bfa960 100644 --- a/src/test/ui/empty/auxiliary/empty-struct.rs +++ b/src/test/ui/empty/auxiliary/empty-struct.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct XEmpty1 {} pub struct XEmpty2; pub struct XEmpty6(); diff --git a/src/test/ui/empty/auxiliary/two_macros.rs b/src/test/ui/empty/auxiliary/two_macros.rs index 060960f0dbc88..2330c75c8e0cb 100644 --- a/src/test/ui/empty/auxiliary/two_macros.rs +++ b/src/test/ui/empty/auxiliary/two_macros.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_export] macro_rules! macro_one { () => ("one") } diff --git a/src/test/ui/empty/empty-comment.rs b/src/test/ui/empty/empty-comment.rs index a5568ff826be1..174274d28b085 100644 --- a/src/test/ui/empty/empty-comment.rs +++ b/src/test/ui/empty/empty-comment.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // `/**/` was previously regarded as a doc comment because it starts with `/**` and ends with `*/`. // This could break some internal logic that assumes the length of a doc comment is at least 5, // leading to an ICE. diff --git a/src/test/ui/empty/empty-comment.stderr b/src/test/ui/empty/empty-comment.stderr index d6990c4eaeb8f..adfa714a03290 100644 --- a/src/test/ui/empty/empty-comment.stderr +++ b/src/test/ui/empty/empty-comment.stderr @@ -1,5 +1,5 @@ error: unexpected end of macro invocation - --> $DIR/empty-comment.rs:20:5 + --> $DIR/empty-comment.rs:10:5 | LL | one_arg_macro!(/**/); //~ ERROR unexpected end | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/empty/empty-linkname.rs b/src/test/ui/empty/empty-linkname.rs index 20e0f9cd0b251..79895ab583407 100644 --- a/src/test/ui/empty/empty-linkname.rs +++ b/src/test/ui/empty/empty-linkname.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[link(name = "")] //~ ERROR: given with empty name extern { } diff --git a/src/test/ui/empty/empty-linkname.stderr b/src/test/ui/empty/empty-linkname.stderr index 9a637aa7833a1..a07a4f1c56746 100644 --- a/src/test/ui/empty/empty-linkname.stderr +++ b/src/test/ui/empty/empty-linkname.stderr @@ -1,5 +1,5 @@ error[E0454]: #[link(name = "")] given with empty name - --> $DIR/empty-linkname.rs:11:1 + --> $DIR/empty-linkname.rs:1:1 | LL | #[link(name = "")] //~ ERROR: given with empty name | ^^^^^^^^^^^^^^^^^^ empty name given diff --git a/src/test/ui/empty/empty-macro-use.rs b/src/test/ui/empty/empty-macro-use.rs index 823a7426079aa..846004e661ddf 100644 --- a/src/test/ui/empty/empty-macro-use.rs +++ b/src/test/ui/empty/empty-macro-use.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:two_macros.rs #[macro_use()] diff --git a/src/test/ui/empty/empty-macro-use.stderr b/src/test/ui/empty/empty-macro-use.stderr index 8feb0930718a1..16300411c8cef 100644 --- a/src/test/ui/empty/empty-macro-use.stderr +++ b/src/test/ui/empty/empty-macro-use.stderr @@ -1,5 +1,5 @@ error: cannot find macro `macro_two!` in this scope - --> $DIR/empty-macro-use.rs:17:5 + --> $DIR/empty-macro-use.rs:7:5 | LL | macro_two!(); | ^^^^^^^^^ diff --git a/src/test/ui/empty/empty-never-array.rs b/src/test/ui/empty/empty-never-array.rs index 53b24e1731932..01b99134a445f 100644 --- a/src/test/ui/empty/empty-never-array.rs +++ b/src/test/ui/empty/empty-never-array.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(never_type)] enum Helper { diff --git a/src/test/ui/empty/empty-never-array.stderr b/src/test/ui/empty/empty-never-array.stderr index d9ef2f30aabe2..e409f14d6ce97 100644 --- a/src/test/ui/empty/empty-never-array.stderr +++ b/src/test/ui/empty/empty-never-array.stderr @@ -1,5 +1,5 @@ error[E0005]: refutable pattern in local binding: `T(_, _)` not covered - --> $DIR/empty-never-array.rs:20:9 + --> $DIR/empty-never-array.rs:10:9 | LL | let Helper::U(u) = Helper::T(t, []); | ^^^^^^^^^^^^ pattern `T(_, _)` not covered diff --git a/src/test/ui/empty/empty-struct-braces-expr.rs b/src/test/ui/empty/empty-struct-braces-expr.rs index 3096e8f831368..2f2f41ae8c1f0 100644 --- a/src/test/ui/empty/empty-struct-braces-expr.rs +++ b/src/test/ui/empty/empty-struct-braces-expr.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Can't use empty braced struct as constant or constructor function // aux-build:empty-struct.rs diff --git a/src/test/ui/empty/empty-struct-braces-expr.stderr b/src/test/ui/empty/empty-struct-braces-expr.stderr index 9b6114875e2e5..be613121fe88e 100644 --- a/src/test/ui/empty/empty-struct-braces-expr.stderr +++ b/src/test/ui/empty/empty-struct-braces-expr.stderr @@ -1,5 +1,5 @@ error[E0423]: expected value, found struct `Empty1` - --> $DIR/empty-struct-braces-expr.rs:25:14 + --> $DIR/empty-struct-braces-expr.rs:15:14 | LL | let e1 = Empty1; //~ ERROR expected value, found struct `Empty1` | ^^^^^^ @@ -8,7 +8,7 @@ LL | let e1 = Empty1; //~ ERROR expected value, found struct `Empty1` | did you mean `Empty1 { /* fields */ }`? error[E0423]: expected function, found struct `Empty1` - --> $DIR/empty-struct-braces-expr.rs:26:14 + --> $DIR/empty-struct-braces-expr.rs:16:14 | LL | let e1 = Empty1(); //~ ERROR expected function, found struct `Empty1` | ^^^^^^ @@ -17,19 +17,19 @@ LL | let e1 = Empty1(); //~ ERROR expected function, found struct `Empty1` | did you mean `Empty1 { /* fields */ }`? error[E0423]: expected value, found struct variant `E::Empty3` - --> $DIR/empty-struct-braces-expr.rs:27:14 + --> $DIR/empty-struct-braces-expr.rs:17:14 | LL | let e3 = E::Empty3; //~ ERROR expected value, found struct variant `E::Empty3` | ^^^^^^^^^ did you mean `E::Empty3 { /* fields */ }`? error[E0423]: expected function, found struct variant `E::Empty3` - --> $DIR/empty-struct-braces-expr.rs:28:14 + --> $DIR/empty-struct-braces-expr.rs:18:14 | LL | let e3 = E::Empty3(); //~ ERROR expected function, found struct variant `E::Empty3` | ^^^^^^^^^ did you mean `E::Empty3 { /* fields */ }`? error[E0423]: expected value, found struct `XEmpty1` - --> $DIR/empty-struct-braces-expr.rs:30:15 + --> $DIR/empty-struct-braces-expr.rs:20:15 | LL | let xe1 = XEmpty1; //~ ERROR expected value, found struct `XEmpty1` | ^^^^^^^ @@ -38,7 +38,7 @@ LL | let xe1 = XEmpty1; //~ ERROR expected value, found struct `XEmpty1` | did you mean `XEmpty1 { /* fields */ }`? error[E0423]: expected function, found struct `XEmpty1` - --> $DIR/empty-struct-braces-expr.rs:31:15 + --> $DIR/empty-struct-braces-expr.rs:21:15 | LL | let xe1 = XEmpty1(); //~ ERROR expected function, found struct `XEmpty1` | ^^^^^^^ @@ -47,7 +47,7 @@ LL | let xe1 = XEmpty1(); //~ ERROR expected function, found struct `XEmpty1 | did you mean `XEmpty1 { /* fields */ }`? error[E0599]: no variant named `Empty3` found for type `empty_struct::XE` in the current scope - --> $DIR/empty-struct-braces-expr.rs:32:15 + --> $DIR/empty-struct-braces-expr.rs:22:15 | LL | let xe3 = XE::Empty3; //~ ERROR no variant named `Empty3` found for type | ^^^^^^^^^^ variant not found in `empty_struct::XE` @@ -55,7 +55,7 @@ LL | let xe3 = XE::Empty3; //~ ERROR no variant named `Empty3` found for typ = note: did you mean `empty_struct::XE::XEmpty3`? error[E0599]: no variant named `Empty3` found for type `empty_struct::XE` in the current scope - --> $DIR/empty-struct-braces-expr.rs:33:15 + --> $DIR/empty-struct-braces-expr.rs:23:15 | LL | let xe3 = XE::Empty3(); //~ ERROR no variant named `Empty3` found for type | ^^^^^^^^^^ variant not found in `empty_struct::XE` diff --git a/src/test/ui/empty/empty-struct-braces-pat-1.rs b/src/test/ui/empty/empty-struct-braces-pat-1.rs index e527170e9f957..81062320fe47c 100644 --- a/src/test/ui/empty/empty-struct-braces-pat-1.rs +++ b/src/test/ui/empty/empty-struct-braces-pat-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Can't use empty braced struct as constant pattern // aux-build:empty-struct.rs diff --git a/src/test/ui/empty/empty-struct-braces-pat-1.stderr b/src/test/ui/empty/empty-struct-braces-pat-1.stderr index aad47f4d954b1..f43262574fbf0 100644 --- a/src/test/ui/empty/empty-struct-braces-pat-1.stderr +++ b/src/test/ui/empty/empty-struct-braces-pat-1.stderr @@ -1,11 +1,11 @@ error[E0532]: expected unit struct/variant or constant, found struct variant `E::Empty3` - --> $DIR/empty-struct-braces-pat-1.rs:34:9 + --> $DIR/empty-struct-braces-pat-1.rs:24:9 | LL | E::Empty3 => () | ^^^^^^^^^ did you mean `E::Empty3 { /* fields */ }`? error[E0532]: expected unit struct/variant or constant, found struct variant `XE::XEmpty3` - --> $DIR/empty-struct-braces-pat-1.rs:41:9 + --> $DIR/empty-struct-braces-pat-1.rs:31:9 | LL | XE::XEmpty3 => () | ^^^^------- diff --git a/src/test/ui/empty/empty-struct-braces-pat-2.rs b/src/test/ui/empty/empty-struct-braces-pat-2.rs index d3b13457dc62b..187d953d805e1 100644 --- a/src/test/ui/empty/empty-struct-braces-pat-2.rs +++ b/src/test/ui/empty/empty-struct-braces-pat-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Can't use empty braced struct as enum pattern // aux-build:empty-struct.rs diff --git a/src/test/ui/empty/empty-struct-braces-pat-2.stderr b/src/test/ui/empty/empty-struct-braces-pat-2.stderr index 26fb42c4e94d6..8c55b2119f196 100644 --- a/src/test/ui/empty/empty-struct-braces-pat-2.stderr +++ b/src/test/ui/empty/empty-struct-braces-pat-2.stderr @@ -1,5 +1,5 @@ error[E0532]: expected tuple struct/variant, found struct `Empty1` - --> $DIR/empty-struct-braces-pat-2.rs:25:9 + --> $DIR/empty-struct-braces-pat-2.rs:15:9 | LL | Empty1() => () //~ ERROR expected tuple struct/variant, found struct `Empty1` | ^^^^^^ @@ -8,7 +8,7 @@ LL | Empty1() => () //~ ERROR expected tuple struct/variant, found struc | did you mean `Empty1 { /* fields */ }`? error[E0532]: expected tuple struct/variant, found struct `XEmpty1` - --> $DIR/empty-struct-braces-pat-2.rs:28:9 + --> $DIR/empty-struct-braces-pat-2.rs:18:9 | LL | XEmpty1() => () //~ ERROR expected tuple struct/variant, found struct `XEmpty1` | ^^^^^^^ @@ -17,7 +17,7 @@ LL | XEmpty1() => () //~ ERROR expected tuple struct/variant, found stru | did you mean `XEmpty1 { /* fields */ }`? error[E0532]: expected tuple struct/variant, found struct `Empty1` - --> $DIR/empty-struct-braces-pat-2.rs:31:9 + --> $DIR/empty-struct-braces-pat-2.rs:21:9 | LL | Empty1(..) => () //~ ERROR expected tuple struct/variant, found struct `Empty1` | ^^^^^^ @@ -26,7 +26,7 @@ LL | Empty1(..) => () //~ ERROR expected tuple struct/variant, found str | did you mean `Empty1 { /* fields */ }`? error[E0532]: expected tuple struct/variant, found struct `XEmpty1` - --> $DIR/empty-struct-braces-pat-2.rs:34:9 + --> $DIR/empty-struct-braces-pat-2.rs:24:9 | LL | XEmpty1(..) => () //~ ERROR expected tuple struct/variant, found struct `XEmpty1` | ^^^^^^^ diff --git a/src/test/ui/empty/empty-struct-braces-pat-3.rs b/src/test/ui/empty/empty-struct-braces-pat-3.rs index d6c5b95349211..fad28d78fe557 100644 --- a/src/test/ui/empty/empty-struct-braces-pat-3.rs +++ b/src/test/ui/empty/empty-struct-braces-pat-3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Can't use empty braced struct as enum pattern // aux-build:empty-struct.rs diff --git a/src/test/ui/empty/empty-struct-braces-pat-3.stderr b/src/test/ui/empty/empty-struct-braces-pat-3.stderr index 389bf0a65c633..17670cb0bd6d1 100644 --- a/src/test/ui/empty/empty-struct-braces-pat-3.stderr +++ b/src/test/ui/empty/empty-struct-braces-pat-3.stderr @@ -1,11 +1,11 @@ error[E0532]: expected tuple struct/variant, found struct variant `E::Empty3` - --> $DIR/empty-struct-braces-pat-3.rs:27:9 + --> $DIR/empty-struct-braces-pat-3.rs:17:9 | LL | E::Empty3() => () | ^^^^^^^^^ did you mean `E::Empty3 { /* fields */ }`? error[E0532]: expected tuple struct/variant, found struct variant `XE::XEmpty3` - --> $DIR/empty-struct-braces-pat-3.rs:31:9 + --> $DIR/empty-struct-braces-pat-3.rs:21:9 | LL | XE::XEmpty3() => () | ^^^^------- @@ -14,13 +14,13 @@ LL | XE::XEmpty3() => () | did you mean `XE::XEmpty3 { /* fields */ }`? error[E0532]: expected tuple struct/variant, found struct variant `E::Empty3` - --> $DIR/empty-struct-braces-pat-3.rs:35:9 + --> $DIR/empty-struct-braces-pat-3.rs:25:9 | LL | E::Empty3(..) => () | ^^^^^^^^^ did you mean `E::Empty3 { /* fields */ }`? error[E0532]: expected tuple struct/variant, found struct variant `XE::XEmpty3` - --> $DIR/empty-struct-braces-pat-3.rs:39:9 + --> $DIR/empty-struct-braces-pat-3.rs:29:9 | LL | XE::XEmpty3(..) => () | ^^^^------- diff --git a/src/test/ui/empty/empty-struct-tuple-pat.rs b/src/test/ui/empty/empty-struct-tuple-pat.rs index 5e683eafade8a..00a48594e93af 100644 --- a/src/test/ui/empty/empty-struct-tuple-pat.rs +++ b/src/test/ui/empty/empty-struct-tuple-pat.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Can't use unit struct as enum pattern // aux-build:empty-struct.rs diff --git a/src/test/ui/empty/empty-struct-tuple-pat.stderr b/src/test/ui/empty/empty-struct-tuple-pat.stderr index 3d219b1752f67..4186a018c1f71 100644 --- a/src/test/ui/empty/empty-struct-tuple-pat.stderr +++ b/src/test/ui/empty/empty-struct-tuple-pat.stderr @@ -1,5 +1,5 @@ error[E0530]: match bindings cannot shadow tuple structs - --> $DIR/empty-struct-tuple-pat.rs:32:9 + --> $DIR/empty-struct-tuple-pat.rs:22:9 | LL | struct Empty2(); | ---------------- a tuple struct `Empty2` is defined here @@ -8,7 +8,7 @@ LL | Empty2 => () //~ ERROR match bindings cannot shadow tuple structs | ^^^^^^ cannot be named the same as a tuple struct error[E0530]: match bindings cannot shadow tuple structs - --> $DIR/empty-struct-tuple-pat.rs:35:9 + --> $DIR/empty-struct-tuple-pat.rs:25:9 | LL | use empty_struct::*; | --------------- a tuple struct `XEmpty6` is imported here @@ -17,13 +17,13 @@ LL | XEmpty6 => () //~ ERROR match bindings cannot shadow tuple structs | ^^^^^^^ cannot be named the same as a tuple struct error[E0532]: expected unit struct/variant or constant, found tuple variant `E::Empty4` - --> $DIR/empty-struct-tuple-pat.rs:39:9 + --> $DIR/empty-struct-tuple-pat.rs:29:9 | LL | E::Empty4 => () | ^^^^^^^^^ not a unit struct/variant or constant error[E0532]: expected unit struct/variant or constant, found tuple variant `XE::XEmpty5` - --> $DIR/empty-struct-tuple-pat.rs:43:9 + --> $DIR/empty-struct-tuple-pat.rs:33:9 | LL | XE::XEmpty5 => (), | ^^^^------- diff --git a/src/test/ui/empty/empty-struct-unit-expr.rs b/src/test/ui/empty/empty-struct-unit-expr.rs index 941292a7ec27d..b192e3a92c38e 100644 --- a/src/test/ui/empty/empty-struct-unit-expr.rs +++ b/src/test/ui/empty/empty-struct-unit-expr.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Can't use unit struct as constructor function // aux-build:empty-struct.rs diff --git a/src/test/ui/empty/empty-struct-unit-expr.stderr b/src/test/ui/empty/empty-struct-unit-expr.stderr index fff696fc80f05..79dbf215cb0d8 100644 --- a/src/test/ui/empty/empty-struct-unit-expr.stderr +++ b/src/test/ui/empty/empty-struct-unit-expr.stderr @@ -1,5 +1,5 @@ error[E0618]: expected function, found `Empty2` - --> $DIR/empty-struct-unit-expr.rs:25:14 + --> $DIR/empty-struct-unit-expr.rs:15:14 | LL | struct Empty2; | -------------- `Empty2` defined here @@ -8,7 +8,7 @@ LL | let e2 = Empty2(); //~ ERROR expected function, found `Empty2` | ^^^^^^^^ not a function error[E0618]: expected function, found enum variant `E::Empty4` - --> $DIR/empty-struct-unit-expr.rs:26:14 + --> $DIR/empty-struct-unit-expr.rs:16:14 | LL | Empty4 | ------ `E::Empty4` defined here @@ -21,13 +21,13 @@ LL | let e4 = E::Empty4; | ^^^^^^^^^ error[E0618]: expected function, found `empty_struct::XEmpty2` - --> $DIR/empty-struct-unit-expr.rs:28:15 + --> $DIR/empty-struct-unit-expr.rs:18:15 | LL | let xe2 = XEmpty2(); //~ ERROR expected function, found `empty_struct::XEmpty2` | ^^^^^^^^^ not a function error[E0618]: expected function, found enum variant `XE::XEmpty4` - --> $DIR/empty-struct-unit-expr.rs:29:15 + --> $DIR/empty-struct-unit-expr.rs:19:15 | LL | let xe4 = XE::XEmpty4(); | ^^^^^^^^^^^^^ not a function diff --git a/src/test/ui/empty/empty-struct-unit-pat.rs b/src/test/ui/empty/empty-struct-unit-pat.rs index 532c2d85053f6..8a0e2f505e443 100644 --- a/src/test/ui/empty/empty-struct-unit-pat.rs +++ b/src/test/ui/empty/empty-struct-unit-pat.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Can't use unit struct as tuple struct pattern // aux-build:empty-struct.rs diff --git a/src/test/ui/empty/empty-struct-unit-pat.stderr b/src/test/ui/empty/empty-struct-unit-pat.stderr index 042b53521c293..3711bd6dcb74d 100644 --- a/src/test/ui/empty/empty-struct-unit-pat.stderr +++ b/src/test/ui/empty/empty-struct-unit-pat.stderr @@ -1,35 +1,35 @@ error[E0532]: expected tuple struct/variant, found unit struct `Empty2` - --> $DIR/empty-struct-unit-pat.rs:31:9 + --> $DIR/empty-struct-unit-pat.rs:21:9 | LL | Empty2() => () //~ ERROR expected tuple struct/variant, found unit struct `Empty2` | ^^^^^^ did you mean `XEmpty6`? error[E0532]: expected tuple struct/variant, found unit struct `XEmpty2` - --> $DIR/empty-struct-unit-pat.rs:34:9 + --> $DIR/empty-struct-unit-pat.rs:24:9 | LL | XEmpty2() => () //~ ERROR expected tuple struct/variant, found unit struct `XEmpty2` | ^^^^^^^ did you mean `XEmpty6`? error[E0532]: expected tuple struct/variant, found unit struct `Empty2` - --> $DIR/empty-struct-unit-pat.rs:37:9 + --> $DIR/empty-struct-unit-pat.rs:27:9 | LL | Empty2(..) => () //~ ERROR expected tuple struct/variant, found unit struct `Empty2` | ^^^^^^ did you mean `XEmpty6`? error[E0532]: expected tuple struct/variant, found unit struct `XEmpty2` - --> $DIR/empty-struct-unit-pat.rs:40:9 + --> $DIR/empty-struct-unit-pat.rs:30:9 | LL | XEmpty2(..) => () //~ ERROR expected tuple struct/variant, found unit struct `XEmpty2` | ^^^^^^^ did you mean `XEmpty6`? error[E0532]: expected tuple struct/variant, found unit variant `E::Empty4` - --> $DIR/empty-struct-unit-pat.rs:44:9 + --> $DIR/empty-struct-unit-pat.rs:34:9 | LL | E::Empty4() => () //~ ERROR expected tuple struct/variant, found unit variant `E::Empty4` | ^^^^^^^^^ not a tuple struct/variant error[E0532]: expected tuple struct/variant, found unit variant `XE::XEmpty4` - --> $DIR/empty-struct-unit-pat.rs:47:9 + --> $DIR/empty-struct-unit-pat.rs:37:9 | LL | XE::XEmpty4() => (), | ^^^^------- @@ -37,13 +37,13 @@ LL | XE::XEmpty4() => (), | did you mean `XEmpty5`? error[E0532]: expected tuple struct/variant, found unit variant `E::Empty4` - --> $DIR/empty-struct-unit-pat.rs:52:9 + --> $DIR/empty-struct-unit-pat.rs:42:9 | LL | E::Empty4(..) => () //~ ERROR expected tuple struct/variant, found unit variant `E::Empty4` | ^^^^^^^^^ not a tuple struct/variant error[E0532]: expected tuple struct/variant, found unit variant `XE::XEmpty4` - --> $DIR/empty-struct-unit-pat.rs:55:9 + --> $DIR/empty-struct-unit-pat.rs:45:9 | LL | XE::XEmpty4(..) => (), | ^^^^------- diff --git a/src/test/ui/enable-unstable-lib-feature.rs b/src/test/ui/enable-unstable-lib-feature.rs index b10a0a60f1471..2f248bf14c151 100644 --- a/src/test/ui/enable-unstable-lib-feature.rs +++ b/src/test/ui/enable-unstable-lib-feature.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that enabling an unstable feature disables warnings // aux-build:stability_cfg2.rs diff --git a/src/test/ui/enable-unstable-lib-feature.stderr b/src/test/ui/enable-unstable-lib-feature.stderr index 20b2eb51fcb7c..d905ccc8ac070 100644 --- a/src/test/ui/enable-unstable-lib-feature.stderr +++ b/src/test/ui/enable-unstable-lib-feature.stderr @@ -1,11 +1,11 @@ error: function `BOGUS` should have a snake case name such as `bogus` - --> $DIR/enable-unstable-lib-feature.rs:22:1 + --> $DIR/enable-unstable-lib-feature.rs:12:1 | LL | pub fn BOGUS() { } //~ ERROR | ^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/enable-unstable-lib-feature.rs:16:9 + --> $DIR/enable-unstable-lib-feature.rs:6:9 | LL | #![deny(non_snake_case)] // To trigger a hard error | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/enum/enum-and-module-in-same-scope.rs b/src/test/ui/enum/enum-and-module-in-same-scope.rs index 9b6c8712f69b2..cc6e199bd7ca0 100644 --- a/src/test/ui/enum/enum-and-module-in-same-scope.rs +++ b/src/test/ui/enum/enum-and-module-in-same-scope.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Foo { X } diff --git a/src/test/ui/enum/enum-and-module-in-same-scope.stderr b/src/test/ui/enum/enum-and-module-in-same-scope.stderr index 230872abe0b3f..5f42af8f260d3 100644 --- a/src/test/ui/enum/enum-and-module-in-same-scope.stderr +++ b/src/test/ui/enum/enum-and-module-in-same-scope.stderr @@ -1,5 +1,5 @@ error[E0428]: the name `Foo` is defined multiple times - --> $DIR/enum-and-module-in-same-scope.rs:15:1 + --> $DIR/enum-and-module-in-same-scope.rs:5:1 | LL | enum Foo { | -------- previous definition of the type `Foo` here diff --git a/src/test/ui/enum/enum-discrim-autosizing.rs b/src/test/ui/enum/enum-discrim-autosizing.rs index 3a243330ad9b0..5473264aa5c23 100644 --- a/src/test/ui/enum/enum-discrim-autosizing.rs +++ b/src/test/ui/enum/enum-discrim-autosizing.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // With no repr attribute the discriminant will default to isize. // On 32-bit architectures this is equivalent to i32 so the variants // collide. On other architectures we need compilation to fail anyway, diff --git a/src/test/ui/enum/enum-discrim-autosizing.stderr b/src/test/ui/enum/enum-discrim-autosizing.stderr index 3b4ac436898e6..82f32b4ec9761 100644 --- a/src/test/ui/enum/enum-discrim-autosizing.stderr +++ b/src/test/ui/enum/enum-discrim-autosizing.stderr @@ -3,7 +3,7 @@ error[E0601]: `main` function not found in crate `enum_discrim_autosizing` = note: consider adding a `main` function to `$DIR/enum-discrim-autosizing.rs` error[E0081]: discriminant value `0` already exists - --> $DIR/enum-discrim-autosizing.rs:18:12 + --> $DIR/enum-discrim-autosizing.rs:8:12 | LL | Au64 = 0, | - first use of `0` diff --git a/src/test/ui/enum/enum-discrim-too-small.rs b/src/test/ui/enum/enum-discrim-too-small.rs index 393a67be57fe6..e498414020b41 100644 --- a/src/test/ui/enum/enum-discrim-too-small.rs +++ b/src/test/ui/enum/enum-discrim-too-small.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #[repr(u8)] enum Eu8 { Au8 = 23, diff --git a/src/test/ui/enum/enum-discrim-too-small.stderr b/src/test/ui/enum/enum-discrim-too-small.stderr index 4c8ff52c12b96..40205d95b1f89 100644 --- a/src/test/ui/enum/enum-discrim-too-small.stderr +++ b/src/test/ui/enum/enum-discrim-too-small.stderr @@ -1,5 +1,5 @@ error[E0600]: cannot apply unary operator `-` to type `u8` - --> $DIR/enum-discrim-too-small.rs:16:11 + --> $DIR/enum-discrim-too-small.rs:5:11 | LL | Cu8 = -23, | ^^^ cannot apply unary operator `-` @@ -7,7 +7,7 @@ LL | Cu8 = -23, = note: unsigned values cannot be negated error[E0600]: cannot apply unary operator `-` to type `u16` - --> $DIR/enum-discrim-too-small.rs:24:12 + --> $DIR/enum-discrim-too-small.rs:13:12 | LL | Cu16 = -22333, | ^^^^^^ cannot apply unary operator `-` @@ -15,7 +15,7 @@ LL | Cu16 = -22333, = note: unsigned values cannot be negated error[E0600]: cannot apply unary operator `-` to type `u32` - --> $DIR/enum-discrim-too-small.rs:32:12 + --> $DIR/enum-discrim-too-small.rs:21:12 | LL | Cu32 = -2_000_000_000, | ^^^^^^^^^^^^^^ cannot apply unary operator `-` @@ -23,7 +23,7 @@ LL | Cu32 = -2_000_000_000, = note: unsigned values cannot be negated error[E0600]: cannot apply unary operator `-` to type `u64` - --> $DIR/enum-discrim-too-small.rs:40:12 + --> $DIR/enum-discrim-too-small.rs:29:12 | LL | Cu32 = -2_000_000_000, | ^^^^^^^^^^^^^^ cannot apply unary operator `-` diff --git a/src/test/ui/enum/enum-discrim-too-small2.rs b/src/test/ui/enum/enum-discrim-too-small2.rs index d66716c14c3d5..af60564302599 100644 --- a/src/test/ui/enum/enum-discrim-too-small2.rs +++ b/src/test/ui/enum/enum-discrim-too-small2.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(overflowing_literals)] #![allow(dead_code)] diff --git a/src/test/ui/enum/enum-discrim-too-small2.stderr b/src/test/ui/enum/enum-discrim-too-small2.stderr index 536dbf64a9da8..31ca01b86bdb2 100644 --- a/src/test/ui/enum/enum-discrim-too-small2.stderr +++ b/src/test/ui/enum/enum-discrim-too-small2.stderr @@ -1,29 +1,29 @@ error: literal out of range for i8 - --> $DIR/enum-discrim-too-small2.rs:18:11 + --> $DIR/enum-discrim-too-small2.rs:8:11 | LL | Ci8 = 223, //~ ERROR literal out of range for i8 | ^^^ | note: lint level defined here - --> $DIR/enum-discrim-too-small2.rs:11:9 + --> $DIR/enum-discrim-too-small2.rs:1:9 | LL | #![deny(overflowing_literals)] | ^^^^^^^^^^^^^^^^^^^^ error: literal out of range for i16 - --> $DIR/enum-discrim-too-small2.rs:25:12 + --> $DIR/enum-discrim-too-small2.rs:15:12 | LL | Ci16 = 55555, //~ ERROR literal out of range for i16 | ^^^^^ error: literal out of range for i32 - --> $DIR/enum-discrim-too-small2.rs:32:12 + --> $DIR/enum-discrim-too-small2.rs:22:12 | LL | Ci32 = 3_000_000_000, //~ ERROR literal out of range for i32 | ^^^^^^^^^^^^^ error: literal out of range for i64 - --> $DIR/enum-discrim-too-small2.rs:39:12 + --> $DIR/enum-discrim-too-small2.rs:29:12 | LL | Ci64 = 9223372036854775809, //~ ERROR literal out of range for i64 | ^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/enum/enum-in-scope.rs b/src/test/ui/enum/enum-in-scope.rs index bc1bd03f2d652..61a627a6cc3fb 100644 --- a/src/test/ui/enum/enum-in-scope.rs +++ b/src/test/ui/enum/enum-in-scope.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct hello(isize); fn main() { diff --git a/src/test/ui/enum/enum-in-scope.stderr b/src/test/ui/enum/enum-in-scope.stderr index 1e8d594049542..efaf5a0539eeb 100644 --- a/src/test/ui/enum/enum-in-scope.stderr +++ b/src/test/ui/enum/enum-in-scope.stderr @@ -1,5 +1,5 @@ error[E0530]: let bindings cannot shadow tuple structs - --> $DIR/enum-in-scope.rs:14:9 + --> $DIR/enum-in-scope.rs:4:9 | LL | struct hello(isize); | -------------------- a tuple struct `hello` is defined here diff --git a/src/test/ui/enum/enum-size-variance.rs b/src/test/ui/enum/enum-size-variance.rs index 582998a986d00..082bd0dcfb22c 100644 --- a/src/test/ui/enum/enum-size-variance.rs +++ b/src/test/ui/enum/enum-size-variance.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass #![warn(variant_size_differences)] diff --git a/src/test/ui/enum/enum-size-variance.stderr b/src/test/ui/enum/enum-size-variance.stderr index f6df65b1d9da7..5cc0a0d7a8f88 100644 --- a/src/test/ui/enum/enum-size-variance.stderr +++ b/src/test/ui/enum/enum-size-variance.stderr @@ -1,11 +1,11 @@ warning: enum variant is more than three times larger (32 bytes) than the next largest - --> $DIR/enum-size-variance.rs:28:5 + --> $DIR/enum-size-variance.rs:18:5 | LL | L(i64, i64, i64, i64), //~ WARNING three times larger | ^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/enum-size-variance.rs:13:9 + --> $DIR/enum-size-variance.rs:3:9 | LL | #![warn(variant_size_differences)] | ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/enum/enum-to-float-cast-2.rs b/src/test/ui/enum/enum-to-float-cast-2.rs index e6f473c8aacbb..c861b5ed9ffeb 100644 --- a/src/test/ui/enum/enum-to-float-cast-2.rs +++ b/src/test/ui/enum/enum-to-float-cast-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that enum-to-float casts are disallowed. enum E { diff --git a/src/test/ui/enum/enum-to-float-cast-2.stderr b/src/test/ui/enum/enum-to-float-cast-2.stderr index e8e6d8fbcfbcc..42d08a11ed1b6 100644 --- a/src/test/ui/enum/enum-to-float-cast-2.stderr +++ b/src/test/ui/enum/enum-to-float-cast-2.stderr @@ -1,5 +1,5 @@ error[E0606]: casting `E` as `f32` is invalid - --> $DIR/enum-to-float-cast-2.rs:24:13 + --> $DIR/enum-to-float-cast-2.rs:14:13 | LL | let a = E::L0 as f32; //~ ERROR casting | ^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | let a = E::L0 as f32; //~ ERROR casting = help: cast through an integer first error[E0606]: casting `F` as `f32` is invalid - --> $DIR/enum-to-float-cast-2.rs:25:13 + --> $DIR/enum-to-float-cast-2.rs:15:13 | LL | let c = F::H1 as f32; //~ ERROR casting | ^^^^^^^^^^^^ diff --git a/src/test/ui/enum/enum-to-float-cast.rs b/src/test/ui/enum/enum-to-float-cast.rs index b562ba0e41afd..05acdfd34e29f 100644 --- a/src/test/ui/enum/enum-to-float-cast.rs +++ b/src/test/ui/enum/enum-to-float-cast.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that enum-to-float casts are disallowed. enum E { diff --git a/src/test/ui/enum/enum-to-float-cast.stderr b/src/test/ui/enum/enum-to-float-cast.stderr index adc2015909cd3..e6cd2ed4d0da4 100644 --- a/src/test/ui/enum/enum-to-float-cast.stderr +++ b/src/test/ui/enum/enum-to-float-cast.stderr @@ -1,5 +1,5 @@ error[E0606]: casting `E` as `f32` is invalid - --> $DIR/enum-to-float-cast.rs:23:18 + --> $DIR/enum-to-float-cast.rs:13:18 | LL | static C0: f32 = E::L0 as f32; //~ ERROR casting | ^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | static C0: f32 = E::L0 as f32; //~ ERROR casting = help: cast through an integer first error[E0606]: casting `F` as `f32` is invalid - --> $DIR/enum-to-float-cast.rs:24:18 + --> $DIR/enum-to-float-cast.rs:14:18 | LL | static C1: f32 = F::H1 as f32; //~ ERROR casting | ^^^^^^^^^^^^ diff --git a/src/test/ui/enum/enum-variant-type-2.rs b/src/test/ui/enum/enum-variant-type-2.rs index 258bfd1e3ba92..27286a0a3ddda 100644 --- a/src/test/ui/enum/enum-variant-type-2.rs +++ b/src/test/ui/enum/enum-variant-type-2.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that enum variants are not actually types. enum Foo { diff --git a/src/test/ui/enum/enum-variant-type-2.stderr b/src/test/ui/enum/enum-variant-type-2.stderr index 7a786af71bb3f..fd623d4f5dde0 100644 --- a/src/test/ui/enum/enum-variant-type-2.stderr +++ b/src/test/ui/enum/enum-variant-type-2.stderr @@ -1,5 +1,5 @@ error[E0573]: expected type, found variant `Foo::Bar` - --> $DIR/enum-variant-type-2.rs:17:11 + --> $DIR/enum-variant-type-2.rs:7:11 | LL | fn foo(x: Foo::Bar) {} //~ ERROR expected type, found variant `Foo::Bar` | ^^^^^^^^ diff --git a/src/test/ui/enums-pats-not-idents.rs b/src/test/ui/enums-pats-not-idents.rs index 36bd54f599b51..1593f1e1b16ef 100644 --- a/src/test/ui/enums-pats-not-idents.rs +++ b/src/test/ui/enums-pats-not-idents.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let a(1) = 13; //~ ERROR cannot find tuple struct/variant `a` in this scope } diff --git a/src/test/ui/enums-pats-not-idents.stderr b/src/test/ui/enums-pats-not-idents.stderr index 5bd119622e595..5e12f3b5eadf1 100644 --- a/src/test/ui/enums-pats-not-idents.stderr +++ b/src/test/ui/enums-pats-not-idents.stderr @@ -1,5 +1,5 @@ error[E0531]: cannot find tuple struct/variant `a` in this scope - --> $DIR/enums-pats-not-idents.rs:12:9 + --> $DIR/enums-pats-not-idents.rs:2:9 | LL | let a(1) = 13; //~ ERROR cannot find tuple struct/variant `a` in this scope | ^ not found in this scope diff --git a/src/test/ui/error-codes/E0001.rs b/src/test/ui/error-codes/E0001.rs index b72b0d661901f..2c95f02bf3417 100644 --- a/src/test/ui/error-codes/E0001.rs +++ b/src/test/ui/error-codes/E0001.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(unreachable_patterns)] fn main() { diff --git a/src/test/ui/error-codes/E0001.stderr b/src/test/ui/error-codes/E0001.stderr index af67a438f52fa..0b884c54a82f7 100644 --- a/src/test/ui/error-codes/E0001.stderr +++ b/src/test/ui/error-codes/E0001.stderr @@ -1,11 +1,11 @@ error: unreachable pattern - --> $DIR/E0001.rs:18:9 + --> $DIR/E0001.rs:8:9 | LL | _ => {/* ... */} //~ ERROR unreachable pattern | ^ | note: lint level defined here - --> $DIR/E0001.rs:11:9 + --> $DIR/E0001.rs:1:9 | LL | #![deny(unreachable_patterns)] | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0004-2.rs b/src/test/ui/error-codes/E0004-2.rs index 824b86cfa8312..c7612fd50a74e 100644 --- a/src/test/ui/error-codes/E0004-2.rs +++ b/src/test/ui/error-codes/E0004-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = Some(1); diff --git a/src/test/ui/error-codes/E0004-2.stderr b/src/test/ui/error-codes/E0004-2.stderr index 6a4392df35d8b..6cd6d3525e046 100644 --- a/src/test/ui/error-codes/E0004-2.stderr +++ b/src/test/ui/error-codes/E0004-2.stderr @@ -1,11 +1,11 @@ error[E0004]: non-exhaustive patterns: type std::option::Option is non-empty - --> $DIR/E0004-2.rs:14:11 + --> $DIR/E0004-2.rs:4:11 | LL | match x { } //~ ERROR E0004 | ^ | help: Please ensure that all possible cases are being handled; possibly adding wildcards or more match arms. - --> $DIR/E0004-2.rs:14:11 + --> $DIR/E0004-2.rs:4:11 | LL | match x { } //~ ERROR E0004 | ^ diff --git a/src/test/ui/error-codes/E0004.rs b/src/test/ui/error-codes/E0004.rs index 8df07a0c1c5b2..1ee9d2bad14ff 100644 --- a/src/test/ui/error-codes/E0004.rs +++ b/src/test/ui/error-codes/E0004.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Terminator { HastaLaVistaBaby, TalkToMyHand, diff --git a/src/test/ui/error-codes/E0004.stderr b/src/test/ui/error-codes/E0004.stderr index cf364a886891e..a66dd92903200 100644 --- a/src/test/ui/error-codes/E0004.stderr +++ b/src/test/ui/error-codes/E0004.stderr @@ -1,5 +1,5 @@ error[E0004]: non-exhaustive patterns: `HastaLaVistaBaby` not covered - --> $DIR/E0004.rs:19:11 + --> $DIR/E0004.rs:9:11 | LL | match x { //~ ERROR E0004 | ^ pattern `HastaLaVistaBaby` not covered diff --git a/src/test/ui/error-codes/E0005.rs b/src/test/ui/error-codes/E0005.rs index 0405bba81b585..f4730697e1843 100644 --- a/src/test/ui/error-codes/E0005.rs +++ b/src/test/ui/error-codes/E0005.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = Some(1); let Some(y) = x; //~ ERROR E0005 diff --git a/src/test/ui/error-codes/E0005.stderr b/src/test/ui/error-codes/E0005.stderr index b321a69805eb9..2a38aae0873ad 100644 --- a/src/test/ui/error-codes/E0005.stderr +++ b/src/test/ui/error-codes/E0005.stderr @@ -1,5 +1,5 @@ error[E0005]: refutable pattern in local binding: `None` not covered - --> $DIR/E0005.rs:13:9 + --> $DIR/E0005.rs:3:9 | LL | let Some(y) = x; //~ ERROR E0005 | ^^^^^^^ pattern `None` not covered diff --git a/src/test/ui/error-codes/E0007.rs b/src/test/ui/error-codes/E0007.rs index d5acbdebbe9b9..8fc6342002bb2 100644 --- a/src/test/ui/error-codes/E0007.rs +++ b/src/test/ui/error-codes/E0007.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = Some("s".to_string()); match x { diff --git a/src/test/ui/error-codes/E0007.stderr b/src/test/ui/error-codes/E0007.stderr index f662365b8f185..a5d694976cfbd 100644 --- a/src/test/ui/error-codes/E0007.stderr +++ b/src/test/ui/error-codes/E0007.stderr @@ -1,11 +1,11 @@ error[E0007]: cannot bind by-move with sub-bindings - --> $DIR/E0007.rs:14:9 + --> $DIR/E0007.rs:4:9 | LL | op_string @ Some(s) => {}, | ^^^^^^^^^^^^^^^^^^^ binds an already bound by-move value by moving it error[E0303]: pattern bindings are not allowed after an `@` - --> $DIR/E0007.rs:14:26 + --> $DIR/E0007.rs:4:26 | LL | op_string @ Some(s) => {}, | ^ not allowed after `@` diff --git a/src/test/ui/error-codes/E0008.rs b/src/test/ui/error-codes/E0008.rs index ba5720e6f0abd..c87ef4cb8541f 100644 --- a/src/test/ui/error-codes/E0008.rs +++ b/src/test/ui/error-codes/E0008.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { match Some("hi".to_string()) { Some(s) if s.len() == 0 => {}, diff --git a/src/test/ui/error-codes/E0008.stderr b/src/test/ui/error-codes/E0008.stderr index e9af3166ed5ea..d5c44efd667ee 100644 --- a/src/test/ui/error-codes/E0008.stderr +++ b/src/test/ui/error-codes/E0008.stderr @@ -1,5 +1,5 @@ error[E0008]: cannot bind by-move into a pattern guard - --> $DIR/E0008.rs:13:14 + --> $DIR/E0008.rs:3:14 | LL | Some(s) if s.len() == 0 => {}, | ^ moves value into pattern guard diff --git a/src/test/ui/error-codes/E0009.rs b/src/test/ui/error-codes/E0009.rs index 02e2e80e7eab1..0610d03cfe96d 100644 --- a/src/test/ui/error-codes/E0009.rs +++ b/src/test/ui/error-codes/E0009.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { struct X { x: (), } let x = Some((X { x: () }, X { x: () })); diff --git a/src/test/ui/error-codes/E0009.stderr b/src/test/ui/error-codes/E0009.stderr index 8b3071420dd89..f8acb9a09d978 100644 --- a/src/test/ui/error-codes/E0009.stderr +++ b/src/test/ui/error-codes/E0009.stderr @@ -1,5 +1,5 @@ error[E0009]: cannot bind by-move and by-ref in the same pattern - --> $DIR/E0009.rs:15:15 + --> $DIR/E0009.rs:5:15 | LL | Some((y, ref z)) => {}, | ^ ----- both by-ref and by-move used diff --git a/src/test/ui/error-codes/E0010-teach.rs b/src/test/ui/error-codes/E0010-teach.rs index e5ccf32af1473..fc5dffb37cfe7 100644 --- a/src/test/ui/error-codes/E0010-teach.rs +++ b/src/test/ui/error-codes/E0010-teach.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z teach #![feature(box_syntax)] diff --git a/src/test/ui/error-codes/E0010-teach.stderr b/src/test/ui/error-codes/E0010-teach.stderr index fa5c767caf24d..da0aadfded5f8 100644 --- a/src/test/ui/error-codes/E0010-teach.stderr +++ b/src/test/ui/error-codes/E0010-teach.stderr @@ -1,5 +1,5 @@ error[E0010]: allocations are not allowed in constants - --> $DIR/E0010-teach.rs:16:24 + --> $DIR/E0010-teach.rs:6:24 | LL | const CON : Box = box 0; //~ ERROR E0010 | ^^^^^ allocation not allowed in constants diff --git a/src/test/ui/error-codes/E0010.rs b/src/test/ui/error-codes/E0010.rs index 66a9319a7df43..e62997640f473 100644 --- a/src/test/ui/error-codes/E0010.rs +++ b/src/test/ui/error-codes/E0010.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] #![allow(warnings)] diff --git a/src/test/ui/error-codes/E0010.stderr b/src/test/ui/error-codes/E0010.stderr index 83c1b409a5174..b4b490922c45f 100644 --- a/src/test/ui/error-codes/E0010.stderr +++ b/src/test/ui/error-codes/E0010.stderr @@ -1,5 +1,5 @@ error[E0010]: allocations are not allowed in constants - --> $DIR/E0010.rs:14:24 + --> $DIR/E0010.rs:4:24 | LL | const CON : Box = box 0; //~ ERROR E0010 | ^^^^^ allocation not allowed in constants diff --git a/src/test/ui/error-codes/E0017.nll.stderr b/src/test/ui/error-codes/E0017.nll.stderr index 08708d213d3f6..e16cb970c6597 100644 --- a/src/test/ui/error-codes/E0017.nll.stderr +++ b/src/test/ui/error-codes/E0017.nll.stderr @@ -1,23 +1,23 @@ error[E0017]: references in constants may only refer to immutable values - --> $DIR/E0017.rs:14:30 + --> $DIR/E0017.rs:4:30 | LL | const CR: &'static mut i32 = &mut C; //~ ERROR E0017 | ^^^^^^ constants require immutable values error[E0017]: references in statics may only refer to immutable values - --> $DIR/E0017.rs:15:39 + --> $DIR/E0017.rs:5:39 | LL | static STATIC_REF: &'static mut i32 = &mut X; //~ ERROR E0017 | ^^^^^^ statics require immutable values error[E0596]: cannot borrow immutable static item `X` as mutable - --> $DIR/E0017.rs:15:39 + --> $DIR/E0017.rs:5:39 | LL | static STATIC_REF: &'static mut i32 = &mut X; //~ ERROR E0017 | ^^^^^^ cannot borrow as mutable error[E0017]: references in statics may only refer to immutable values - --> $DIR/E0017.rs:17:38 + --> $DIR/E0017.rs:7:38 | LL | static CONST_REF: &'static mut i32 = &mut C; //~ ERROR E0017 | ^^^^^^ statics require immutable values diff --git a/src/test/ui/error-codes/E0017.rs b/src/test/ui/error-codes/E0017.rs index c98c35a1442ad..94b6587eb815a 100644 --- a/src/test/ui/error-codes/E0017.rs +++ b/src/test/ui/error-codes/E0017.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - static X: i32 = 1; const C: i32 = 2; diff --git a/src/test/ui/error-codes/E0017.stderr b/src/test/ui/error-codes/E0017.stderr index 411b9f3139782..7804cce966b30 100644 --- a/src/test/ui/error-codes/E0017.stderr +++ b/src/test/ui/error-codes/E0017.stderr @@ -1,23 +1,23 @@ error[E0017]: references in constants may only refer to immutable values - --> $DIR/E0017.rs:14:30 + --> $DIR/E0017.rs:4:30 | LL | const CR: &'static mut i32 = &mut C; //~ ERROR E0017 | ^^^^^^ constants require immutable values error[E0017]: references in statics may only refer to immutable values - --> $DIR/E0017.rs:15:39 + --> $DIR/E0017.rs:5:39 | LL | static STATIC_REF: &'static mut i32 = &mut X; //~ ERROR E0017 | ^^^^^^ statics require immutable values error[E0596]: cannot borrow immutable static item as mutable - --> $DIR/E0017.rs:15:44 + --> $DIR/E0017.rs:5:44 | LL | static STATIC_REF: &'static mut i32 = &mut X; //~ ERROR E0017 | ^ error[E0017]: references in statics may only refer to immutable values - --> $DIR/E0017.rs:17:38 + --> $DIR/E0017.rs:7:38 | LL | static CONST_REF: &'static mut i32 = &mut C; //~ ERROR E0017 | ^^^^^^ statics require immutable values diff --git a/src/test/ui/error-codes/E0023.rs b/src/test/ui/error-codes/E0023.rs index 24032c59844dc..2a97e9048a490 100644 --- a/src/test/ui/error-codes/E0023.rs +++ b/src/test/ui/error-codes/E0023.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Fruit { Apple(String, String), Pear(u32), diff --git a/src/test/ui/error-codes/E0023.stderr b/src/test/ui/error-codes/E0023.stderr index 26f7baeb1a46b..37704fc3233ca 100644 --- a/src/test/ui/error-codes/E0023.stderr +++ b/src/test/ui/error-codes/E0023.stderr @@ -1,17 +1,17 @@ error[E0023]: this pattern has 1 field, but the corresponding tuple variant has 2 fields - --> $DIR/E0023.rs:20:9 + --> $DIR/E0023.rs:10:9 | LL | Fruit::Apple(a) => {}, //~ ERROR E0023 | ^^^^^^^^^^^^^^^ expected 2 fields, found 1 error[E0023]: this pattern has 3 fields, but the corresponding tuple variant has 2 fields - --> $DIR/E0023.rs:21:9 + --> $DIR/E0023.rs:11:9 | LL | Fruit::Apple(a, b, c) => {}, //~ ERROR E0023 | ^^^^^^^^^^^^^^^^^^^^^ expected 2 fields, found 3 error[E0023]: this pattern has 2 fields, but the corresponding tuple variant has 1 field - --> $DIR/E0023.rs:22:9 + --> $DIR/E0023.rs:12:9 | LL | Fruit::Pear(1, 2) => {}, //~ ERROR E0023 | ^^^^^^^^^^^^^^^^^ expected 1 field, found 2 diff --git a/src/test/ui/error-codes/E0025.rs b/src/test/ui/error-codes/E0025.rs index 81d0ea8a5e21d..549269a7542d2 100644 --- a/src/test/ui/error-codes/E0025.rs +++ b/src/test/ui/error-codes/E0025.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { a: u8, b: u8, diff --git a/src/test/ui/error-codes/E0025.stderr b/src/test/ui/error-codes/E0025.stderr index f60372559a331..dfec6d0276a59 100644 --- a/src/test/ui/error-codes/E0025.stderr +++ b/src/test/ui/error-codes/E0025.stderr @@ -1,5 +1,5 @@ error[E0025]: field `a` bound multiple times in the pattern - --> $DIR/E0025.rs:18:21 + --> $DIR/E0025.rs:8:21 | LL | let Foo { a: x, a: y, b: 0 } = x; | ---- ^^^^ multiple uses of `a` in pattern diff --git a/src/test/ui/error-codes/E0026-teach.rs b/src/test/ui/error-codes/E0026-teach.rs index e0ce44a8b6f5f..7c51004ffe46e 100644 --- a/src/test/ui/error-codes/E0026-teach.rs +++ b/src/test/ui/error-codes/E0026-teach.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z teach struct Thing { diff --git a/src/test/ui/error-codes/E0026-teach.stderr b/src/test/ui/error-codes/E0026-teach.stderr index 67ea32fba86d6..1a80edcbbe269 100644 --- a/src/test/ui/error-codes/E0026-teach.stderr +++ b/src/test/ui/error-codes/E0026-teach.stderr @@ -1,5 +1,5 @@ error[E0026]: struct `Thing` does not have a field named `z` - --> $DIR/E0026-teach.rs:21:23 + --> $DIR/E0026-teach.rs:11:23 | LL | Thing { x, y, z } => {} | ^ struct `Thing` does not have this field diff --git a/src/test/ui/error-codes/E0026.rs b/src/test/ui/error-codes/E0026.rs index f8ad7b5a30e1c..0b1ea1c7bcdb3 100644 --- a/src/test/ui/error-codes/E0026.rs +++ b/src/test/ui/error-codes/E0026.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Thing { x: u32, y: u32 diff --git a/src/test/ui/error-codes/E0026.stderr b/src/test/ui/error-codes/E0026.stderr index 9dabbc8a775fb..031481812d0bb 100644 --- a/src/test/ui/error-codes/E0026.stderr +++ b/src/test/ui/error-codes/E0026.stderr @@ -1,5 +1,5 @@ error[E0026]: struct `Thing` does not have a field named `z` - --> $DIR/E0026.rs:19:23 + --> $DIR/E0026.rs:9:23 | LL | Thing { x, y, z } => {} | ^ struct `Thing` does not have this field diff --git a/src/test/ui/error-codes/E0027-teach.rs b/src/test/ui/error-codes/E0027-teach.rs index 17e045bb8b086..11402f014842d 100644 --- a/src/test/ui/error-codes/E0027-teach.rs +++ b/src/test/ui/error-codes/E0027-teach.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z teach struct Dog { diff --git a/src/test/ui/error-codes/E0027-teach.stderr b/src/test/ui/error-codes/E0027-teach.stderr index 1c5333d76a85e..aa4cb9d4d18d9 100644 --- a/src/test/ui/error-codes/E0027-teach.stderr +++ b/src/test/ui/error-codes/E0027-teach.stderr @@ -1,5 +1,5 @@ error[E0027]: pattern does not mention field `name` - --> $DIR/E0027-teach.rs:22:9 + --> $DIR/E0027-teach.rs:12:9 | LL | Dog { age: x } => {} | ^^^^^^^^^^^^^^ missing field `name` diff --git a/src/test/ui/error-codes/E0027.rs b/src/test/ui/error-codes/E0027.rs index b63b0ab5dfdef..b8c6a2b7fcd70 100644 --- a/src/test/ui/error-codes/E0027.rs +++ b/src/test/ui/error-codes/E0027.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Dog { name: String, age: u32, diff --git a/src/test/ui/error-codes/E0027.stderr b/src/test/ui/error-codes/E0027.stderr index 208b263e0f894..4f17bba6477a9 100644 --- a/src/test/ui/error-codes/E0027.stderr +++ b/src/test/ui/error-codes/E0027.stderr @@ -1,5 +1,5 @@ error[E0027]: pattern does not mention field `name` - --> $DIR/E0027.rs:20:9 + --> $DIR/E0027.rs:10:9 | LL | Dog { age: x } => {} | ^^^^^^^^^^^^^^ missing field `name` diff --git a/src/test/ui/error-codes/E0029-teach.rs b/src/test/ui/error-codes/E0029-teach.rs index 328c46311af56..83058d397cf28 100644 --- a/src/test/ui/error-codes/E0029-teach.rs +++ b/src/test/ui/error-codes/E0029-teach.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z teach fn main() { diff --git a/src/test/ui/error-codes/E0029-teach.stderr b/src/test/ui/error-codes/E0029-teach.stderr index bb4fac9a4cb4c..998ef4bc1d75c 100644 --- a/src/test/ui/error-codes/E0029-teach.stderr +++ b/src/test/ui/error-codes/E0029-teach.stderr @@ -1,5 +1,5 @@ error[E0029]: only char and numeric types are allowed in range patterns - --> $DIR/E0029-teach.rs:17:9 + --> $DIR/E0029-teach.rs:7:9 | LL | "hello" ..= "world" => {} | ^^^^^^^^^^^^^^^^^^^ ranges require char or numeric types diff --git a/src/test/ui/error-codes/E0029.rs b/src/test/ui/error-codes/E0029.rs index c89b4f5b3771f..fe0d851832b3d 100644 --- a/src/test/ui/error-codes/E0029.rs +++ b/src/test/ui/error-codes/E0029.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let s = "hoho"; diff --git a/src/test/ui/error-codes/E0029.stderr b/src/test/ui/error-codes/E0029.stderr index d25666f9cf84a..209d219191ca5 100644 --- a/src/test/ui/error-codes/E0029.stderr +++ b/src/test/ui/error-codes/E0029.stderr @@ -1,5 +1,5 @@ error[E0029]: only char and numeric types are allowed in range patterns - --> $DIR/E0029.rs:15:9 + --> $DIR/E0029.rs:5:9 | LL | "hello" ..= "world" => {} | ^^^^^^^^^^^^^^^^^^^ ranges require char or numeric types diff --git a/src/test/ui/error-codes/E0030-teach.rs b/src/test/ui/error-codes/E0030-teach.rs index cf860cea24c86..388064fb0fae5 100644 --- a/src/test/ui/error-codes/E0030-teach.rs +++ b/src/test/ui/error-codes/E0030-teach.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z teach fn main() { diff --git a/src/test/ui/error-codes/E0030-teach.stderr b/src/test/ui/error-codes/E0030-teach.stderr index 2a7243a95690e..3f1ad4af3a94e 100644 --- a/src/test/ui/error-codes/E0030-teach.stderr +++ b/src/test/ui/error-codes/E0030-teach.stderr @@ -1,5 +1,5 @@ error[E0030]: lower range bound must be less than or equal to upper - --> $DIR/E0030-teach.rs:15:9 + --> $DIR/E0030-teach.rs:5:9 | LL | 1000 ..= 5 => {} | ^^^^ lower bound larger than upper bound diff --git a/src/test/ui/error-codes/E0030.rs b/src/test/ui/error-codes/E0030.rs index e147dd932b0dd..58d856b7c9d23 100644 --- a/src/test/ui/error-codes/E0030.rs +++ b/src/test/ui/error-codes/E0030.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn main() { match 5u32 { 1000 ..= 5 => {} diff --git a/src/test/ui/error-codes/E0030.stderr b/src/test/ui/error-codes/E0030.stderr index 020655ee45b54..db8161d8fd5d8 100644 --- a/src/test/ui/error-codes/E0030.stderr +++ b/src/test/ui/error-codes/E0030.stderr @@ -1,5 +1,5 @@ error[E0030]: lower range bound must be less than or equal to upper - --> $DIR/E0030.rs:14:9 + --> $DIR/E0030.rs:3:9 | LL | 1000 ..= 5 => {} | ^^^^ lower bound larger than upper bound diff --git a/src/test/ui/error-codes/E0033-teach.rs b/src/test/ui/error-codes/E0033-teach.rs index 51a1390bf79d1..0f0b8d864dc43 100644 --- a/src/test/ui/error-codes/E0033-teach.rs +++ b/src/test/ui/error-codes/E0033-teach.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z teach trait SomeTrait { diff --git a/src/test/ui/error-codes/E0033-teach.stderr b/src/test/ui/error-codes/E0033-teach.stderr index 2fac6080f496a..81a8f164b943c 100644 --- a/src/test/ui/error-codes/E0033-teach.stderr +++ b/src/test/ui/error-codes/E0033-teach.stderr @@ -1,11 +1,11 @@ error[E0423]: expected value, found trait `SomeTrait` - --> $DIR/E0033-teach.rs:18:33 + --> $DIR/E0033-teach.rs:8:33 | LL | let trait_obj: &SomeTrait = SomeTrait; | ^^^^^^^^^ not a value error[E0038]: the trait `SomeTrait` cannot be made into an object - --> $DIR/E0033-teach.rs:18:20 + --> $DIR/E0033-teach.rs:8:20 | LL | let trait_obj: &SomeTrait = SomeTrait; | ^^^^^^^^^^ the trait `SomeTrait` cannot be made into an object @@ -13,7 +13,7 @@ LL | let trait_obj: &SomeTrait = SomeTrait; = note: method `foo` has no receiver error[E0033]: type `&dyn SomeTrait` cannot be dereferenced - --> $DIR/E0033-teach.rs:23:9 + --> $DIR/E0033-teach.rs:13:9 | LL | let &invalid = trait_obj; | ^^^^^^^^ type `&dyn SomeTrait` cannot be dereferenced diff --git a/src/test/ui/error-codes/E0033.rs b/src/test/ui/error-codes/E0033.rs index 3cdbb55f6deaf..5a4f3cbce60e4 100644 --- a/src/test/ui/error-codes/E0033.rs +++ b/src/test/ui/error-codes/E0033.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait SomeTrait { fn foo(); } diff --git a/src/test/ui/error-codes/E0033.stderr b/src/test/ui/error-codes/E0033.stderr index 5d789566beb06..e250df81c14a0 100644 --- a/src/test/ui/error-codes/E0033.stderr +++ b/src/test/ui/error-codes/E0033.stderr @@ -1,11 +1,11 @@ error[E0423]: expected value, found trait `SomeTrait` - --> $DIR/E0033.rs:16:33 + --> $DIR/E0033.rs:6:33 | LL | let trait_obj: &SomeTrait = SomeTrait; | ^^^^^^^^^ not a value error[E0038]: the trait `SomeTrait` cannot be made into an object - --> $DIR/E0033.rs:16:20 + --> $DIR/E0033.rs:6:20 | LL | let trait_obj: &SomeTrait = SomeTrait; | ^^^^^^^^^^ the trait `SomeTrait` cannot be made into an object @@ -13,7 +13,7 @@ LL | let trait_obj: &SomeTrait = SomeTrait; = note: method `foo` has no receiver error[E0033]: type `&dyn SomeTrait` cannot be dereferenced - --> $DIR/E0033.rs:21:9 + --> $DIR/E0033.rs:11:9 | LL | let &invalid = trait_obj; | ^^^^^^^^ type `&dyn SomeTrait` cannot be dereferenced diff --git a/src/test/ui/error-codes/E0034.rs b/src/test/ui/error-codes/E0034.rs index 6eebd4d4d5360..f962da115e0e8 100644 --- a/src/test/ui/error-codes/E0034.rs +++ b/src/test/ui/error-codes/E0034.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Test; trait Trait1 { diff --git a/src/test/ui/error-codes/E0034.stderr b/src/test/ui/error-codes/E0034.stderr index cec0f2d2a80b0..3c5569eb79f3f 100644 --- a/src/test/ui/error-codes/E0034.stderr +++ b/src/test/ui/error-codes/E0034.stderr @@ -1,16 +1,16 @@ error[E0034]: multiple applicable items in scope - --> $DIR/E0034.rs:30:5 + --> $DIR/E0034.rs:20:5 | LL | Test::foo() //~ ERROR multiple applicable items in scope | ^^^^^^^^^ multiple `foo` found | note: candidate #1 is defined in an impl of the trait `Trait1` for the type `Test` - --> $DIR/E0034.rs:22:5 + --> $DIR/E0034.rs:12:5 | LL | fn foo() {} | ^^^^^^^^ note: candidate #2 is defined in an impl of the trait `Trait2` for the type `Test` - --> $DIR/E0034.rs:26:5 + --> $DIR/E0034.rs:16:5 | LL | fn foo() {} | ^^^^^^^^ diff --git a/src/test/ui/error-codes/E0038.rs b/src/test/ui/error-codes/E0038.rs index 8087928c051bb..b2226803da7fa 100644 --- a/src/test/ui/error-codes/E0038.rs +++ b/src/test/ui/error-codes/E0038.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Trait { fn foo(&self) -> Self; } diff --git a/src/test/ui/error-codes/E0038.stderr b/src/test/ui/error-codes/E0038.stderr index bc76323f18397..74b77338c85c0 100644 --- a/src/test/ui/error-codes/E0038.stderr +++ b/src/test/ui/error-codes/E0038.stderr @@ -1,5 +1,5 @@ error[E0038]: the trait `Trait` cannot be made into an object - --> $DIR/E0038.rs:15:1 + --> $DIR/E0038.rs:5:1 | LL | fn call_foo(x: Box) { | ^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Trait` cannot be made into an object diff --git a/src/test/ui/error-codes/E0040.rs b/src/test/ui/error-codes/E0040.rs index 8385d68c540dd..113efae82c510 100644 --- a/src/test/ui/error-codes/E0040.rs +++ b/src/test/ui/error-codes/E0040.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { x: i32, } diff --git a/src/test/ui/error-codes/E0040.stderr b/src/test/ui/error-codes/E0040.stderr index 01636ae98b815..966455902817d 100644 --- a/src/test/ui/error-codes/E0040.stderr +++ b/src/test/ui/error-codes/E0040.stderr @@ -1,5 +1,5 @@ error[E0040]: explicit use of destructor method - --> $DIR/E0040.rs:23:7 + --> $DIR/E0040.rs:13:7 | LL | x.drop(); | ^^^^ explicit destructor calls not allowed diff --git a/src/test/ui/error-codes/E0044.rs b/src/test/ui/error-codes/E0044.rs index 35e3c76855890..a5265e7dc1708 100644 --- a/src/test/ui/error-codes/E0044.rs +++ b/src/test/ui/error-codes/E0044.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern { fn sqrt(f: T) -> T; //~^ ERROR foreign items may not have type parameters [E0044] diff --git a/src/test/ui/error-codes/E0044.stderr b/src/test/ui/error-codes/E0044.stderr index ce966251bf456..57c21116b2856 100644 --- a/src/test/ui/error-codes/E0044.stderr +++ b/src/test/ui/error-codes/E0044.stderr @@ -1,5 +1,5 @@ error[E0044]: foreign items may not have type parameters - --> $DIR/E0044.rs:12:5 + --> $DIR/E0044.rs:2:5 | LL | fn sqrt(f: T) -> T; | ^^^^^^^^^^^^^^^^^^^^^^ can't have type parameters diff --git a/src/test/ui/error-codes/E0045.rs b/src/test/ui/error-codes/E0045.rs index 57c639dd143a2..fb3df56f706b6 100644 --- a/src/test/ui/error-codes/E0045.rs +++ b/src/test/ui/error-codes/E0045.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern "Rust" { fn foo(x: u8, ...); } //~ ERROR E0045 fn main() { diff --git a/src/test/ui/error-codes/E0045.stderr b/src/test/ui/error-codes/E0045.stderr index 35a592a69860e..b38bbc169bd60 100644 --- a/src/test/ui/error-codes/E0045.stderr +++ b/src/test/ui/error-codes/E0045.stderr @@ -1,5 +1,5 @@ error[E0045]: variadic function must have C or cdecl calling convention - --> $DIR/E0045.rs:11:17 + --> $DIR/E0045.rs:1:17 | LL | extern "Rust" { fn foo(x: u8, ...); } //~ ERROR E0045 | ^^^^^^^^^^^^^^^^^^^ variadics require C or cdecl calling convention diff --git a/src/test/ui/error-codes/E0049.rs b/src/test/ui/error-codes/E0049.rs index 5867e11e9acc6..c141f8a882820 100644 --- a/src/test/ui/error-codes/E0049.rs +++ b/src/test/ui/error-codes/E0049.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn foo(x: T) -> Self; } diff --git a/src/test/ui/error-codes/E0049.stderr b/src/test/ui/error-codes/E0049.stderr index b7eaad5704383..0d132bdbbddaa 100644 --- a/src/test/ui/error-codes/E0049.stderr +++ b/src/test/ui/error-codes/E0049.stderr @@ -1,5 +1,5 @@ error[E0049]: method `foo` has 0 type parameters but its trait declaration has 1 type parameter - --> $DIR/E0049.rs:18:5 + --> $DIR/E0049.rs:8:5 | LL | fn foo(x: T) -> Self; | --------------------------------- expected 1 type parameter diff --git a/src/test/ui/error-codes/E0050.rs b/src/test/ui/error-codes/E0050.rs index 2ccc380c540d2..98fb62785ee76 100644 --- a/src/test/ui/error-codes/E0050.rs +++ b/src/test/ui/error-codes/E0050.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn foo(&self, x: u8) -> bool; fn bar(&self, x: u8, y: u8, z: u8); diff --git a/src/test/ui/error-codes/E0050.stderr b/src/test/ui/error-codes/E0050.stderr index bff3b7b16b911..515db8e01b7f9 100644 --- a/src/test/ui/error-codes/E0050.stderr +++ b/src/test/ui/error-codes/E0050.stderr @@ -1,5 +1,5 @@ error[E0050]: method `foo` has 1 parameter but the declaration in trait `Foo::foo` has 2 - --> $DIR/E0050.rs:20:12 + --> $DIR/E0050.rs:10:12 | LL | fn foo(&self, x: u8) -> bool; | -- trait requires 2 parameters @@ -8,7 +8,7 @@ LL | fn foo(&self) -> bool { true } //~ ERROR E0050 | ^^^^^ expected 2 parameters, found 1 error[E0050]: method `bar` has 1 parameter but the declaration in trait `Foo::bar` has 4 - --> $DIR/E0050.rs:21:12 + --> $DIR/E0050.rs:11:12 | LL | fn bar(&self, x: u8, y: u8, z: u8); | -- trait requires 4 parameters @@ -17,7 +17,7 @@ LL | fn bar(&self) { } //~ ERROR E0050 | ^^^^^ expected 4 parameters, found 1 error[E0050]: method `less` has 4 parameters but the declaration in trait `Foo::less` has 1 - --> $DIR/E0050.rs:22:37 + --> $DIR/E0050.rs:12:37 | LL | fn less(&self); | ----- trait requires 1 parameter diff --git a/src/test/ui/error-codes/E0054.rs b/src/test/ui/error-codes/E0054.rs index 158cd6ff9bbc4..55bda4ead96a8 100644 --- a/src/test/ui/error-codes/E0054.rs +++ b/src/test/ui/error-codes/E0054.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = 5; let x_is_nonzero = x as bool; //~ ERROR E0054 diff --git a/src/test/ui/error-codes/E0054.stderr b/src/test/ui/error-codes/E0054.stderr index d5cf18460fd88..416029c5f868b 100644 --- a/src/test/ui/error-codes/E0054.stderr +++ b/src/test/ui/error-codes/E0054.stderr @@ -1,5 +1,5 @@ error[E0054]: cannot cast as `bool` - --> $DIR/E0054.rs:13:24 + --> $DIR/E0054.rs:3:24 | LL | let x_is_nonzero = x as bool; //~ ERROR E0054 | ^^^^^^^^^ unsupported cast diff --git a/src/test/ui/error-codes/E0055.rs b/src/test/ui/error-codes/E0055.rs index 6e186b81cad8d..a3ade92d24f4c 100644 --- a/src/test/ui/error-codes/E0055.rs +++ b/src/test/ui/error-codes/E0055.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![recursion_limit="2"] struct Foo; diff --git a/src/test/ui/error-codes/E0055.stderr b/src/test/ui/error-codes/E0055.stderr index 9653f4eaeefd0..cee45c7af209e 100644 --- a/src/test/ui/error-codes/E0055.stderr +++ b/src/test/ui/error-codes/E0055.stderr @@ -1,5 +1,5 @@ error[E0055]: reached the recursion limit while auto-dereferencing Foo - --> $DIR/E0055.rs:21:13 + --> $DIR/E0055.rs:11:13 | LL | ref_foo.foo(); | ^^^ deref recursion limit reached diff --git a/src/test/ui/error-codes/E0057.rs b/src/test/ui/error-codes/E0057.rs index 1fb5498b099c9..83f941f65b988 100644 --- a/src/test/ui/error-codes/E0057.rs +++ b/src/test/ui/error-codes/E0057.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let f = |x| x * 3; let a = f(); //~ ERROR E0057 diff --git a/src/test/ui/error-codes/E0057.stderr b/src/test/ui/error-codes/E0057.stderr index fb3e710b8cf9d..5906a05c32c97 100644 --- a/src/test/ui/error-codes/E0057.stderr +++ b/src/test/ui/error-codes/E0057.stderr @@ -1,11 +1,11 @@ error[E0057]: this function takes 1 parameter but 0 parameters were supplied - --> $DIR/E0057.rs:13:13 + --> $DIR/E0057.rs:3:13 | LL | let a = f(); //~ ERROR E0057 | ^^^ expected 1 parameter error[E0057]: this function takes 1 parameter but 2 parameters were supplied - --> $DIR/E0057.rs:15:13 + --> $DIR/E0057.rs:5:13 | LL | let c = f(2, 3); //~ ERROR E0057 | ^^^^^^^ expected 1 parameter diff --git a/src/test/ui/error-codes/E0059.rs b/src/test/ui/error-codes/E0059.rs index 4ae9b2f91d25f..f775089bfb944 100644 --- a/src/test/ui/error-codes/E0059.rs +++ b/src/test/ui/error-codes/E0059.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unboxed_closures)] fn foo>(f: F) -> F::Output { f(3) } //~ ERROR E0059 diff --git a/src/test/ui/error-codes/E0059.stderr b/src/test/ui/error-codes/E0059.stderr index abe8b729c93bf..a96e1a0beab32 100644 --- a/src/test/ui/error-codes/E0059.stderr +++ b/src/test/ui/error-codes/E0059.stderr @@ -1,5 +1,5 @@ error[E0059]: cannot use call notation; the first type parameter for the function trait is neither a tuple nor unit - --> $DIR/E0059.rs:13:41 + --> $DIR/E0059.rs:3:41 | LL | fn foo>(f: F) -> F::Output { f(3) } //~ ERROR E0059 | ^^^^ diff --git a/src/test/ui/error-codes/E0060.rs b/src/test/ui/error-codes/E0060.rs index f4505209b6689..2bb490fb3eabf 100644 --- a/src/test/ui/error-codes/E0060.rs +++ b/src/test/ui/error-codes/E0060.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern "C" { fn printf(_: *const u8, ...) -> u32; } diff --git a/src/test/ui/error-codes/E0060.stderr b/src/test/ui/error-codes/E0060.stderr index c6aac6e41c62a..8a2e7d1a72cd7 100644 --- a/src/test/ui/error-codes/E0060.stderr +++ b/src/test/ui/error-codes/E0060.stderr @@ -1,5 +1,5 @@ error[E0060]: this function takes at least 1 parameter but 0 parameters were supplied - --> $DIR/E0060.rs:16:14 + --> $DIR/E0060.rs:6:14 | LL | fn printf(_: *const u8, ...) -> u32; | ------------------------------------ defined here diff --git a/src/test/ui/error-codes/E0061.rs b/src/test/ui/error-codes/E0061.rs index 221e18cf89dd5..e64ea36ac9255 100644 --- a/src/test/ui/error-codes/E0061.rs +++ b/src/test/ui/error-codes/E0061.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn f(a: u16, b: &str) {} fn f2(a: u16) {} diff --git a/src/test/ui/error-codes/E0061.stderr b/src/test/ui/error-codes/E0061.stderr index d5842a18bc8b7..73103241f7a7d 100644 --- a/src/test/ui/error-codes/E0061.stderr +++ b/src/test/ui/error-codes/E0061.stderr @@ -1,5 +1,5 @@ error[E0061]: this function takes 2 parameters but 1 parameter was supplied - --> $DIR/E0061.rs:16:5 + --> $DIR/E0061.rs:6:5 | LL | fn f(a: u16, b: &str) {} | --------------------- defined here @@ -8,7 +8,7 @@ LL | f(0); | ^^^^ expected 2 parameters error[E0061]: this function takes 1 parameter but 0 parameters were supplied - --> $DIR/E0061.rs:20:5 + --> $DIR/E0061.rs:10:5 | LL | fn f2(a: u16) {} | ------------- defined here diff --git a/src/test/ui/error-codes/E0062.rs b/src/test/ui/error-codes/E0062.rs index 684c9464ff824..3b7f887508690 100644 --- a/src/test/ui/error-codes/E0062.rs +++ b/src/test/ui/error-codes/E0062.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { x: i32 } diff --git a/src/test/ui/error-codes/E0062.stderr b/src/test/ui/error-codes/E0062.stderr index c5c38c6f5ffed..a3e14099507ce 100644 --- a/src/test/ui/error-codes/E0062.stderr +++ b/src/test/ui/error-codes/E0062.stderr @@ -1,5 +1,5 @@ error[E0062]: field `x` specified more than once - --> $DIR/E0062.rs:18:9 + --> $DIR/E0062.rs:8:9 | LL | x: 0, | ---- first use of `x` diff --git a/src/test/ui/error-codes/E0063.rs b/src/test/ui/error-codes/E0063.rs index 0208aff066b4d..37fc0a2987d3f 100644 --- a/src/test/ui/error-codes/E0063.rs +++ b/src/test/ui/error-codes/E0063.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength struct SingleFoo { diff --git a/src/test/ui/error-codes/E0063.stderr b/src/test/ui/error-codes/E0063.stderr index 1ed54b4e7ba63..5d366e0c1c47d 100644 --- a/src/test/ui/error-codes/E0063.stderr +++ b/src/test/ui/error-codes/E0063.stderr @@ -1,23 +1,23 @@ error[E0063]: missing field `x` in initializer of `SingleFoo` - --> $DIR/E0063.rs:42:13 + --> $DIR/E0063.rs:32:13 | LL | let w = SingleFoo { }; | ^^^^^^^^^ missing `x` error[E0063]: missing fields `y`, `z` in initializer of `PluralFoo` - --> $DIR/E0063.rs:44:13 + --> $DIR/E0063.rs:34:13 | LL | let x = PluralFoo {x: 1}; | ^^^^^^^^^ missing `y`, `z` error[E0063]: missing fields `a`, `b`, `y` and 1 other field in initializer of `TruncatedFoo` - --> $DIR/E0063.rs:46:13 + --> $DIR/E0063.rs:36:13 | LL | let y = TruncatedFoo{x:1}; | ^^^^^^^^^^^^ missing `a`, `b`, `y` and 1 other field error[E0063]: missing fields `a`, `b`, `c` and 2 other fields in initializer of `TruncatedPluralFoo` - --> $DIR/E0063.rs:48:13 + --> $DIR/E0063.rs:38:13 | LL | let z = TruncatedPluralFoo{x:1}; | ^^^^^^^^^^^^^^^^^^ missing `a`, `b`, `c` and 2 other fields diff --git a/src/test/ui/error-codes/E0067.rs b/src/test/ui/error-codes/E0067.rs index a3fc30ee1c71a..5925443ddc4a7 100644 --- a/src/test/ui/error-codes/E0067.rs +++ b/src/test/ui/error-codes/E0067.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::LinkedList; fn main() { diff --git a/src/test/ui/error-codes/E0067.stderr b/src/test/ui/error-codes/E0067.stderr index 43e1ca4096cf6..fd4ca7c9f7075 100644 --- a/src/test/ui/error-codes/E0067.stderr +++ b/src/test/ui/error-codes/E0067.stderr @@ -1,5 +1,5 @@ error[E0368]: binary assignment operation `+=` cannot be applied to type `std::collections::LinkedList<_>` - --> $DIR/E0067.rs:14:5 + --> $DIR/E0067.rs:4:5 | LL | LinkedList::new() += 1; //~ ERROR E0368 | -----------------^^^^^ @@ -9,7 +9,7 @@ LL | LinkedList::new() += 1; //~ ERROR E0368 = note: an implementation of `std::ops::AddAssign` might be missing for `std::collections::LinkedList<_>` error[E0067]: invalid left-hand side expression - --> $DIR/E0067.rs:14:5 + --> $DIR/E0067.rs:4:5 | LL | LinkedList::new() += 1; //~ ERROR E0368 | ^^^^^^^^^^^^^^^^^ invalid expression for left-hand side diff --git a/src/test/ui/error-codes/E0069.rs b/src/test/ui/error-codes/E0069.rs index a6a7898ed4e89..a4ba9fd8debc9 100644 --- a/src/test/ui/error-codes/E0069.rs +++ b/src/test/ui/error-codes/E0069.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo() -> u8 { return; //~^ ERROR `return;` in a function whose return type is not `()` diff --git a/src/test/ui/error-codes/E0069.stderr b/src/test/ui/error-codes/E0069.stderr index 0ba1ed456635f..c219333800ea4 100644 --- a/src/test/ui/error-codes/E0069.stderr +++ b/src/test/ui/error-codes/E0069.stderr @@ -1,5 +1,5 @@ error[E0069]: `return;` in a function whose return type is not `()` - --> $DIR/E0069.rs:12:5 + --> $DIR/E0069.rs:2:5 | LL | return; | ^^^^^^ return type is not () diff --git a/src/test/ui/error-codes/E0070.rs b/src/test/ui/error-codes/E0070.rs index ba66bd03aef9d..ab956d8109838 100644 --- a/src/test/ui/error-codes/E0070.rs +++ b/src/test/ui/error-codes/E0070.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const SOME_CONST : i32 = 12; fn some_other_func() {} diff --git a/src/test/ui/error-codes/E0070.stderr b/src/test/ui/error-codes/E0070.stderr index 892e6943112f0..a6a8925d99142 100644 --- a/src/test/ui/error-codes/E0070.stderr +++ b/src/test/ui/error-codes/E0070.stderr @@ -1,17 +1,17 @@ error[E0070]: invalid left-hand side expression - --> $DIR/E0070.rs:16:5 + --> $DIR/E0070.rs:6:5 | LL | SOME_CONST = 14; //~ ERROR E0070 | ^^^^^^^^^^^^^^^ left-hand of expression not valid error[E0070]: invalid left-hand side expression - --> $DIR/E0070.rs:17:5 + --> $DIR/E0070.rs:7:5 | LL | 1 = 3; //~ ERROR E0070 | ^^^^^ left-hand of expression not valid error[E0308]: mismatched types - --> $DIR/E0070.rs:18:25 + --> $DIR/E0070.rs:8:25 | LL | some_other_func() = 4; //~ ERROR E0070 | ^ expected (), found integral variable @@ -20,7 +20,7 @@ LL | some_other_func() = 4; //~ ERROR E0070 found type `{integer}` error[E0070]: invalid left-hand side expression - --> $DIR/E0070.rs:18:5 + --> $DIR/E0070.rs:8:5 | LL | some_other_func() = 4; //~ ERROR E0070 | ^^^^^^^^^^^^^^^^^^^^^ left-hand of expression not valid diff --git a/src/test/ui/error-codes/E0071.rs b/src/test/ui/error-codes/E0071.rs index d71dc7966fa91..bd8469de75da0 100644 --- a/src/test/ui/error-codes/E0071.rs +++ b/src/test/ui/error-codes/E0071.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Foo {} type FooAlias = Foo; diff --git a/src/test/ui/error-codes/E0071.stderr b/src/test/ui/error-codes/E0071.stderr index 637338672e0ba..ae312fc400aff 100644 --- a/src/test/ui/error-codes/E0071.stderr +++ b/src/test/ui/error-codes/E0071.stderr @@ -1,5 +1,5 @@ error[E0071]: expected struct, variant or union type, found enum `Foo` - --> $DIR/E0071.rs:15:13 + --> $DIR/E0071.rs:5:13 | LL | let u = FooAlias { value: 0 }; | ^^^^^^^^ not a struct diff --git a/src/test/ui/error-codes/E0075.rs b/src/test/ui/error-codes/E0075.rs index d7783904e2e98..7feab0a8bd7a2 100644 --- a/src/test/ui/error-codes/E0075.rs +++ b/src/test/ui/error-codes/E0075.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(repr_simd)] #[repr(simd)] diff --git a/src/test/ui/error-codes/E0075.stderr b/src/test/ui/error-codes/E0075.stderr index d29d5d788036e..abf6889709694 100644 --- a/src/test/ui/error-codes/E0075.stderr +++ b/src/test/ui/error-codes/E0075.stderr @@ -1,5 +1,5 @@ error[E0075]: SIMD vector cannot be empty - --> $DIR/E0075.rs:14:1 + --> $DIR/E0075.rs:4:1 | LL | struct Bad; //~ ERROR E0075 | ^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0076.rs b/src/test/ui/error-codes/E0076.rs index b159cf107cefb..a27072eb71e68 100644 --- a/src/test/ui/error-codes/E0076.rs +++ b/src/test/ui/error-codes/E0076.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(repr_simd)] #[repr(simd)] diff --git a/src/test/ui/error-codes/E0076.stderr b/src/test/ui/error-codes/E0076.stderr index ae3494038109a..2c2842d152b5e 100644 --- a/src/test/ui/error-codes/E0076.stderr +++ b/src/test/ui/error-codes/E0076.stderr @@ -1,5 +1,5 @@ error[E0076]: SIMD vector should be homogeneous - --> $DIR/E0076.rs:14:1 + --> $DIR/E0076.rs:4:1 | LL | struct Bad(u16, u32, u32); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ SIMD elements must have the same type diff --git a/src/test/ui/error-codes/E0077.rs b/src/test/ui/error-codes/E0077.rs index b074e90b2c01f..fa2d5e24fa3ca 100644 --- a/src/test/ui/error-codes/E0077.rs +++ b/src/test/ui/error-codes/E0077.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(repr_simd)] #[repr(simd)] diff --git a/src/test/ui/error-codes/E0077.stderr b/src/test/ui/error-codes/E0077.stderr index 42a169f5a20ad..9f3e1fa5c3581 100644 --- a/src/test/ui/error-codes/E0077.stderr +++ b/src/test/ui/error-codes/E0077.stderr @@ -1,5 +1,5 @@ error[E0077]: SIMD vector element type should be machine type - --> $DIR/E0077.rs:14:1 + --> $DIR/E0077.rs:4:1 | LL | struct Bad(String); //~ ERROR E0077 | ^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0080.rs b/src/test/ui/error-codes/E0080.rs index 7f3e6eaad9b17..849aed5d19f75 100644 --- a/src/test/ui/error-codes/E0080.rs +++ b/src/test/ui/error-codes/E0080.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Enum { X = (1 << 500), //~ ERROR E0080 //~| shift left with overflow diff --git a/src/test/ui/error-codes/E0080.stderr b/src/test/ui/error-codes/E0080.stderr index a213c2b1b208e..3eccf6d6e5bfc 100644 --- a/src/test/ui/error-codes/E0080.stderr +++ b/src/test/ui/error-codes/E0080.stderr @@ -1,5 +1,5 @@ error: attempt to shift left with overflow - --> $DIR/E0080.rs:12:9 + --> $DIR/E0080.rs:2:9 | LL | X = (1 << 500), //~ ERROR E0080 | ^^^^^^^^^^ @@ -7,13 +7,13 @@ LL | X = (1 << 500), //~ ERROR E0080 = note: #[deny(exceeding_bitshifts)] on by default error[E0080]: could not evaluate enum discriminant - --> $DIR/E0080.rs:12:9 + --> $DIR/E0080.rs:2:9 | LL | X = (1 << 500), //~ ERROR E0080 | ^^^^^^^^^^ attempt to shift left with overflow error: attempt to divide by zero - --> $DIR/E0080.rs:14:9 + --> $DIR/E0080.rs:4:9 | LL | Y = (1 / 0) //~ ERROR E0080 | ^^^^^^^ @@ -21,13 +21,13 @@ LL | Y = (1 / 0) //~ ERROR E0080 = note: #[deny(const_err)] on by default error: this expression will panic at runtime - --> $DIR/E0080.rs:14:9 + --> $DIR/E0080.rs:4:9 | LL | Y = (1 / 0) //~ ERROR E0080 | ^^^^^^^ attempt to divide by zero error[E0080]: could not evaluate enum discriminant - --> $DIR/E0080.rs:14:9 + --> $DIR/E0080.rs:4:9 | LL | Y = (1 / 0) //~ ERROR E0080 | ^^^^^^^ attempt to divide by zero diff --git a/src/test/ui/error-codes/E0081.rs b/src/test/ui/error-codes/E0081.rs index c0cdad258687d..33c8c14306bd1 100644 --- a/src/test/ui/error-codes/E0081.rs +++ b/src/test/ui/error-codes/E0081.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Enum { P = 3, X = 3, diff --git a/src/test/ui/error-codes/E0081.stderr b/src/test/ui/error-codes/E0081.stderr index 36150d7c52636..0b3d351e1ac9a 100644 --- a/src/test/ui/error-codes/E0081.stderr +++ b/src/test/ui/error-codes/E0081.stderr @@ -1,5 +1,5 @@ error[E0081]: discriminant value `3` already exists - --> $DIR/E0081.rs:13:9 + --> $DIR/E0081.rs:3:9 | LL | P = 3, | - first use of `3` diff --git a/src/test/ui/error-codes/E0084.rs b/src/test/ui/error-codes/E0084.rs index 2be206c9702bf..a550e04129a33 100644 --- a/src/test/ui/error-codes/E0084.rs +++ b/src/test/ui/error-codes/E0084.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[repr(i32)] //~ ERROR: E0084 enum Foo {} diff --git a/src/test/ui/error-codes/E0084.stderr b/src/test/ui/error-codes/E0084.stderr index d0bc519c9969b..353c825f5280e 100644 --- a/src/test/ui/error-codes/E0084.stderr +++ b/src/test/ui/error-codes/E0084.stderr @@ -1,5 +1,5 @@ error[E0084]: unsupported representation for zero-variant enum - --> $DIR/E0084.rs:11:1 + --> $DIR/E0084.rs:1:1 | LL | #[repr(i32)] //~ ERROR: E0084 | ^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0087.rs b/src/test/ui/error-codes/E0087.rs index bea76f34220ef..fc9ef1186f0fd 100644 --- a/src/test/ui/error-codes/E0087.rs +++ b/src/test/ui/error-codes/E0087.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo() {} fn bar() {} diff --git a/src/test/ui/error-codes/E0087.stderr b/src/test/ui/error-codes/E0087.stderr index a07f1bbf39a3e..1433438ef70e6 100644 --- a/src/test/ui/error-codes/E0087.stderr +++ b/src/test/ui/error-codes/E0087.stderr @@ -1,11 +1,11 @@ error[E0087]: wrong number of type arguments: expected 0, found 1 - --> $DIR/E0087.rs:15:11 + --> $DIR/E0087.rs:5:11 | LL | foo::(); //~ ERROR wrong number of type arguments: expected 0, found 1 [E0087] | ^^^ unexpected type argument error[E0087]: wrong number of type arguments: expected 1, found 2 - --> $DIR/E0087.rs:17:16 + --> $DIR/E0087.rs:7:16 | LL | bar::(); //~ ERROR wrong number of type arguments: expected 1, found 2 [E0087] | ^^^ unexpected type argument diff --git a/src/test/ui/error-codes/E0088.rs b/src/test/ui/error-codes/E0088.rs index db84a4edc487c..76657836de00d 100644 --- a/src/test/ui/error-codes/E0088.rs +++ b/src/test/ui/error-codes/E0088.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn f() {} fn g<'a>() -> &'a u8 { loop {} } diff --git a/src/test/ui/error-codes/E0088.stderr b/src/test/ui/error-codes/E0088.stderr index 6b956023e05a4..f0daa6ea96190 100644 --- a/src/test/ui/error-codes/E0088.stderr +++ b/src/test/ui/error-codes/E0088.stderr @@ -1,11 +1,11 @@ error[E0088]: wrong number of lifetime arguments: expected 0, found 1 - --> $DIR/E0088.rs:15:9 + --> $DIR/E0088.rs:5:9 | LL | f::<'static>(); //~ ERROR E0088 | ^^^^^^^ unexpected lifetime argument error[E0088]: wrong number of lifetime arguments: expected 1, found 2 - --> $DIR/E0088.rs:16:18 + --> $DIR/E0088.rs:6:18 | LL | g::<'static, 'static>(); //~ ERROR E0088 | ^^^^^^^ unexpected lifetime argument diff --git a/src/test/ui/error-codes/E0089.rs b/src/test/ui/error-codes/E0089.rs index 4e6196a7b89db..971b9d26362e6 100644 --- a/src/test/ui/error-codes/E0089.rs +++ b/src/test/ui/error-codes/E0089.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo() {} fn main() { diff --git a/src/test/ui/error-codes/E0089.stderr b/src/test/ui/error-codes/E0089.stderr index f79c478b733f6..780e2368184ae 100644 --- a/src/test/ui/error-codes/E0089.stderr +++ b/src/test/ui/error-codes/E0089.stderr @@ -1,5 +1,5 @@ error[E0089]: wrong number of type arguments: expected 2, found 1 - --> $DIR/E0089.rs:14:5 + --> $DIR/E0089.rs:4:5 | LL | foo::(); //~ ERROR wrong number of type arguments: expected 2, found 1 [E0089] | ^^^^^^^^^^ expected 2 type arguments diff --git a/src/test/ui/error-codes/E0090.rs b/src/test/ui/error-codes/E0090.rs index 26be4c12f075e..2d799f3064508 100644 --- a/src/test/ui/error-codes/E0090.rs +++ b/src/test/ui/error-codes/E0090.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo<'a: 'b, 'b: 'a>() {} fn main() { diff --git a/src/test/ui/error-codes/E0090.stderr b/src/test/ui/error-codes/E0090.stderr index 9029b6c2708bd..580d33a4799c9 100644 --- a/src/test/ui/error-codes/E0090.stderr +++ b/src/test/ui/error-codes/E0090.stderr @@ -1,5 +1,5 @@ error[E0090]: wrong number of lifetime arguments: expected 2, found 1 - --> $DIR/E0090.rs:14:5 + --> $DIR/E0090.rs:4:5 | LL | foo::<'static>(); //~ ERROR wrong number of lifetime arguments: expected 2, found 1 [E0090] | ^^^^^^^^^^^^^^ expected 2 lifetime arguments diff --git a/src/test/ui/error-codes/E0091.rs b/src/test/ui/error-codes/E0091.rs index da988dbf819ac..2427f5cfe13d0 100644 --- a/src/test/ui/error-codes/E0091.rs +++ b/src/test/ui/error-codes/E0091.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - type Foo = u32; //~ ERROR E0091 type Foo2 = Box; //~ ERROR E0091 diff --git a/src/test/ui/error-codes/E0091.stderr b/src/test/ui/error-codes/E0091.stderr index 2116f8f64760a..d32960f82cbc1 100644 --- a/src/test/ui/error-codes/E0091.stderr +++ b/src/test/ui/error-codes/E0091.stderr @@ -1,11 +1,11 @@ error[E0091]: type parameter `T` is unused - --> $DIR/E0091.rs:11:10 + --> $DIR/E0091.rs:1:10 | LL | type Foo = u32; //~ ERROR E0091 | ^ unused type parameter error[E0091]: type parameter `B` is unused - --> $DIR/E0091.rs:12:14 + --> $DIR/E0091.rs:2:14 | LL | type Foo2 = Box; //~ ERROR E0091 | ^ unused type parameter diff --git a/src/test/ui/error-codes/E0092.rs b/src/test/ui/error-codes/E0092.rs index b08164ac06d42..ddaace98bd4af 100644 --- a/src/test/ui/error-codes/E0092.rs +++ b/src/test/ui/error-codes/E0092.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(intrinsics)] extern "rust-intrinsic" { fn atomic_foo(); //~ ERROR E0092 diff --git a/src/test/ui/error-codes/E0092.stderr b/src/test/ui/error-codes/E0092.stderr index 50d6d63b99c27..a453517752691 100644 --- a/src/test/ui/error-codes/E0092.stderr +++ b/src/test/ui/error-codes/E0092.stderr @@ -1,5 +1,5 @@ error[E0092]: unrecognized atomic operation function: `foo` - --> $DIR/E0092.rs:13:5 + --> $DIR/E0092.rs:3:5 | LL | fn atomic_foo(); //~ ERROR E0092 | ^^^^^^^^^^^^^^^^ unrecognized atomic operation diff --git a/src/test/ui/error-codes/E0093.rs b/src/test/ui/error-codes/E0093.rs index d84f9f649113c..a2f0b1ae44379 100644 --- a/src/test/ui/error-codes/E0093.rs +++ b/src/test/ui/error-codes/E0093.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(intrinsics)] extern "rust-intrinsic" { fn foo(); diff --git a/src/test/ui/error-codes/E0093.stderr b/src/test/ui/error-codes/E0093.stderr index f261b83a0b888..cb0305593a7b4 100644 --- a/src/test/ui/error-codes/E0093.stderr +++ b/src/test/ui/error-codes/E0093.stderr @@ -1,5 +1,5 @@ error[E0093]: unrecognized intrinsic function: `foo` - --> $DIR/E0093.rs:13:5 + --> $DIR/E0093.rs:3:5 | LL | fn foo(); | ^^^^^^^^^ unrecognized intrinsic diff --git a/src/test/ui/error-codes/E0094.rs b/src/test/ui/error-codes/E0094.rs index 3a31874b24422..0d58e5a2862c4 100644 --- a/src/test/ui/error-codes/E0094.rs +++ b/src/test/ui/error-codes/E0094.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(intrinsics)] extern "rust-intrinsic" { fn size_of() -> usize; //~ ERROR E0094 diff --git a/src/test/ui/error-codes/E0094.stderr b/src/test/ui/error-codes/E0094.stderr index 322802fc44f06..97bdbfbe5ab5a 100644 --- a/src/test/ui/error-codes/E0094.stderr +++ b/src/test/ui/error-codes/E0094.stderr @@ -1,5 +1,5 @@ error[E0094]: intrinsic has wrong number of type parameters: found 2, expected 1 - --> $DIR/E0094.rs:13:15 + --> $DIR/E0094.rs:3:15 | LL | fn size_of() -> usize; //~ ERROR E0094 | ^^^^^^ expected 1 type parameter diff --git a/src/test/ui/error-codes/E0106.rs b/src/test/ui/error-codes/E0106.rs index 0674930a11cca..d6537d123637c 100644 --- a/src/test/ui/error-codes/E0106.rs +++ b/src/test/ui/error-codes/E0106.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { x: &bool, //~^ ERROR E0106 diff --git a/src/test/ui/error-codes/E0106.stderr b/src/test/ui/error-codes/E0106.stderr index 9862dca3fdefb..cea9581e70138 100644 --- a/src/test/ui/error-codes/E0106.stderr +++ b/src/test/ui/error-codes/E0106.stderr @@ -1,29 +1,29 @@ error[E0106]: missing lifetime specifier - --> $DIR/E0106.rs:12:8 + --> $DIR/E0106.rs:2:8 | LL | x: &bool, | ^ expected lifetime parameter error[E0106]: missing lifetime specifier - --> $DIR/E0106.rs:17:7 + --> $DIR/E0106.rs:7:7 | LL | B(&bool), | ^ expected lifetime parameter error[E0106]: missing lifetime specifier - --> $DIR/E0106.rs:20:14 + --> $DIR/E0106.rs:10:14 | LL | type MyStr = &str; | ^ expected lifetime parameter error[E0106]: missing lifetime specifier - --> $DIR/E0106.rs:27:10 + --> $DIR/E0106.rs:17:10 | LL | baz: Baz, | ^^^ expected lifetime parameter error[E0106]: missing lifetime specifiers - --> $DIR/E0106.rs:30:11 + --> $DIR/E0106.rs:20:11 | LL | buzz: Buzz, | ^^^^ expected 2 lifetime parameters diff --git a/src/test/ui/error-codes/E0107.rs b/src/test/ui/error-codes/E0107.rs index 815c7fefd2a96..9e68bb2492448 100644 --- a/src/test/ui/error-codes/E0107.rs +++ b/src/test/ui/error-codes/E0107.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo<'a>(&'a str); struct Buzz<'a, 'b>(&'a str, &'b str); diff --git a/src/test/ui/error-codes/E0107.stderr b/src/test/ui/error-codes/E0107.stderr index 497fa91bd4f39..17c5a694ec70b 100644 --- a/src/test/ui/error-codes/E0107.stderr +++ b/src/test/ui/error-codes/E0107.stderr @@ -1,17 +1,17 @@ error[E0107]: wrong number of lifetime arguments: expected 2, found 1 - --> $DIR/E0107.rs:21:11 + --> $DIR/E0107.rs:11:11 | LL | buzz: Buzz<'a>, | ^^^^^^^^ expected 2 lifetime arguments error[E0107]: wrong number of lifetime arguments: expected 0, found 1 - --> $DIR/E0107.rs:24:14 + --> $DIR/E0107.rs:14:14 | LL | bar: Bar<'a>, | ^^ unexpected lifetime argument error[E0107]: wrong number of lifetime arguments: expected 1, found 3 - --> $DIR/E0107.rs:27:11 + --> $DIR/E0107.rs:17:11 | LL | foo2: Foo<'a, 'b, 'c>, | ^^^^^^^^^^^^^^^ 2 unexpected lifetime arguments diff --git a/src/test/ui/error-codes/E0109.rs b/src/test/ui/error-codes/E0109.rs index 9fc478422504b..2e38256496291 100644 --- a/src/test/ui/error-codes/E0109.rs +++ b/src/test/ui/error-codes/E0109.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - type X = u32; //~ ERROR E0109 fn main() { diff --git a/src/test/ui/error-codes/E0109.stderr b/src/test/ui/error-codes/E0109.stderr index 6473517bfadac..447b106c6296b 100644 --- a/src/test/ui/error-codes/E0109.stderr +++ b/src/test/ui/error-codes/E0109.stderr @@ -1,5 +1,5 @@ error[E0109]: type parameters are not allowed on this type - --> $DIR/E0109.rs:11:14 + --> $DIR/E0109.rs:1:14 | LL | type X = u32; //~ ERROR E0109 | ^^^ type parameter not allowed diff --git a/src/test/ui/error-codes/E0110.rs b/src/test/ui/error-codes/E0110.rs index fd169f4acc5eb..2de5da16ad76a 100644 --- a/src/test/ui/error-codes/E0110.rs +++ b/src/test/ui/error-codes/E0110.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - type X = u32<'static>; //~ ERROR E0110 fn main() { diff --git a/src/test/ui/error-codes/E0110.stderr b/src/test/ui/error-codes/E0110.stderr index 7f5b78684fbc1..609b8b58276ff 100644 --- a/src/test/ui/error-codes/E0110.stderr +++ b/src/test/ui/error-codes/E0110.stderr @@ -1,5 +1,5 @@ error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/E0110.rs:11:14 + --> $DIR/E0110.rs:1:14 | LL | type X = u32<'static>; //~ ERROR E0110 | ^^^^^^^ lifetime parameter not allowed diff --git a/src/test/ui/error-codes/E0116.rs b/src/test/ui/error-codes/E0116.rs index cd7d8dc3efb98..898beb10b6c6e 100644 --- a/src/test/ui/error-codes/E0116.rs +++ b/src/test/ui/error-codes/E0116.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - impl Vec {} //~^ ERROR E0116 diff --git a/src/test/ui/error-codes/E0116.stderr b/src/test/ui/error-codes/E0116.stderr index 7c2f35a3305e3..a5ceeb4a55d81 100644 --- a/src/test/ui/error-codes/E0116.stderr +++ b/src/test/ui/error-codes/E0116.stderr @@ -1,5 +1,5 @@ error[E0116]: cannot define inherent `impl` for a type outside of the crate where the type is defined - --> $DIR/E0116.rs:11:1 + --> $DIR/E0116.rs:1:1 | LL | impl Vec {} | ^^^^^^^^^^^^^^^ impl for type defined outside of crate. diff --git a/src/test/ui/error-codes/E0117.rs b/src/test/ui/error-codes/E0117.rs index 982f875c7b0a8..18dd809f3ff3e 100644 --- a/src/test/ui/error-codes/E0117.rs +++ b/src/test/ui/error-codes/E0117.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - impl Drop for u32 {} //~ ERROR E0117 //~| ERROR the Drop trait may only be implemented on structures //~| implementing Drop requires a struct diff --git a/src/test/ui/error-codes/E0117.stderr b/src/test/ui/error-codes/E0117.stderr index 045ae700955d4..8e32db49cedee 100644 --- a/src/test/ui/error-codes/E0117.stderr +++ b/src/test/ui/error-codes/E0117.stderr @@ -1,11 +1,11 @@ error[E0120]: the Drop trait may only be implemented on structures - --> $DIR/E0117.rs:11:15 + --> $DIR/E0117.rs:1:15 | LL | impl Drop for u32 {} //~ ERROR E0117 | ^^^ implementing Drop requires a struct error[E0117]: only traits defined in the current crate can be implemented for arbitrary types - --> $DIR/E0117.rs:11:1 + --> $DIR/E0117.rs:1:1 | LL | impl Drop for u32 {} //~ ERROR E0117 | ^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate diff --git a/src/test/ui/error-codes/E0118.rs b/src/test/ui/error-codes/E0118.rs index d37ff34b861f4..7bf36210f3a38 100644 --- a/src/test/ui/error-codes/E0118.rs +++ b/src/test/ui/error-codes/E0118.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - impl (u8, u8) { //~ ERROR E0118 fn get_state(&self) -> String { String::new() diff --git a/src/test/ui/error-codes/E0118.stderr b/src/test/ui/error-codes/E0118.stderr index 896213e348745..787f8caec7f49 100644 --- a/src/test/ui/error-codes/E0118.stderr +++ b/src/test/ui/error-codes/E0118.stderr @@ -1,5 +1,5 @@ error[E0118]: no base type found for inherent implementation - --> $DIR/E0118.rs:11:6 + --> $DIR/E0118.rs:1:6 | LL | impl (u8, u8) { //~ ERROR E0118 | ^^^^^^^^ impl requires a base type diff --git a/src/test/ui/error-codes/E0119.rs b/src/test/ui/error-codes/E0119.rs index 9528631b3047b..7f89e5a1a52df 100644 --- a/src/test/ui/error-codes/E0119.rs +++ b/src/test/ui/error-codes/E0119.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait MyTrait { fn get(&self) -> usize; } diff --git a/src/test/ui/error-codes/E0119.stderr b/src/test/ui/error-codes/E0119.stderr index f1e942d4cf532..af9acb294bcde 100644 --- a/src/test/ui/error-codes/E0119.stderr +++ b/src/test/ui/error-codes/E0119.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `MyTrait` for type `Foo`: - --> $DIR/E0119.rs:23:1 + --> $DIR/E0119.rs:13:1 | LL | impl MyTrait for T { | --------------------- first implementation here diff --git a/src/test/ui/error-codes/E0120.rs b/src/test/ui/error-codes/E0120.rs index 8d09b877f002b..049707415e505 100644 --- a/src/test/ui/error-codes/E0120.rs +++ b/src/test/ui/error-codes/E0120.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait MyTrait { fn foo() {} } impl Drop for MyTrait { diff --git a/src/test/ui/error-codes/E0120.stderr b/src/test/ui/error-codes/E0120.stderr index 6237500c7ae31..9b6603dbaca9c 100644 --- a/src/test/ui/error-codes/E0120.stderr +++ b/src/test/ui/error-codes/E0120.stderr @@ -1,5 +1,5 @@ error[E0120]: the Drop trait may only be implemented on structures - --> $DIR/E0120.rs:13:15 + --> $DIR/E0120.rs:3:15 | LL | impl Drop for MyTrait { | ^^^^^^^ implementing Drop requires a struct diff --git a/src/test/ui/error-codes/E0121.rs b/src/test/ui/error-codes/E0121.rs index b26b5f41bfe47..f8b4d61b32301 100644 --- a/src/test/ui/error-codes/E0121.rs +++ b/src/test/ui/error-codes/E0121.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo() -> _ { 5 } //~ ERROR E0121 static BAR: _ = "test"; //~ ERROR E0121 diff --git a/src/test/ui/error-codes/E0121.stderr b/src/test/ui/error-codes/E0121.stderr index 019e637aa8c55..75e03c659b77b 100644 --- a/src/test/ui/error-codes/E0121.stderr +++ b/src/test/ui/error-codes/E0121.stderr @@ -1,11 +1,11 @@ error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/E0121.rs:11:13 + --> $DIR/E0121.rs:1:13 | LL | fn foo() -> _ { 5 } //~ ERROR E0121 | ^ not allowed in type signatures error[E0121]: the type placeholder `_` is not allowed within types on item signatures - --> $DIR/E0121.rs:13:13 + --> $DIR/E0121.rs:3:13 | LL | static BAR: _ = "test"; //~ ERROR E0121 | ^ not allowed in type signatures diff --git a/src/test/ui/error-codes/E0124.rs b/src/test/ui/error-codes/E0124.rs index 3ef20c6dd4084..9d6a716a6da1b 100644 --- a/src/test/ui/error-codes/E0124.rs +++ b/src/test/ui/error-codes/E0124.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { field1: i32, field1: i32, diff --git a/src/test/ui/error-codes/E0124.stderr b/src/test/ui/error-codes/E0124.stderr index c95162c9d2142..73819a89d7533 100644 --- a/src/test/ui/error-codes/E0124.stderr +++ b/src/test/ui/error-codes/E0124.stderr @@ -1,5 +1,5 @@ error[E0124]: field `field1` is already declared - --> $DIR/E0124.rs:13:5 + --> $DIR/E0124.rs:3:5 | LL | field1: i32, | ----------- `field1` first declared here diff --git a/src/test/ui/error-codes/E0128.rs b/src/test/ui/error-codes/E0128.rs index 37071012825ec..f42c32b91cc06 100644 --- a/src/test/ui/error-codes/E0128.rs +++ b/src/test/ui/error-codes/E0128.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { //~ ERROR E0128 field1: T, field2: U, diff --git a/src/test/ui/error-codes/E0128.stderr b/src/test/ui/error-codes/E0128.stderr index 81da580f0d51e..9ea3c09e63f53 100644 --- a/src/test/ui/error-codes/E0128.stderr +++ b/src/test/ui/error-codes/E0128.stderr @@ -1,5 +1,5 @@ error[E0128]: type parameters with a default cannot use forward declared identifiers - --> $DIR/E0128.rs:11:14 + --> $DIR/E0128.rs:1:14 | LL | struct Foo { //~ ERROR E0128 | ^ defaulted type parameters cannot be forward declared diff --git a/src/test/ui/error-codes/E0130.rs b/src/test/ui/error-codes/E0130.rs index d11b59cdf334d..1ac546b9dbe4d 100644 --- a/src/test/ui/error-codes/E0130.rs +++ b/src/test/ui/error-codes/E0130.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern { fn foo((a, b): (u32, u32)); //~^ ERROR E0130 diff --git a/src/test/ui/error-codes/E0130.stderr b/src/test/ui/error-codes/E0130.stderr index 3b54b1b866984..a45571f40a146 100644 --- a/src/test/ui/error-codes/E0130.stderr +++ b/src/test/ui/error-codes/E0130.stderr @@ -1,5 +1,5 @@ error[E0130]: patterns aren't allowed in foreign function declarations - --> $DIR/E0130.rs:12:12 + --> $DIR/E0130.rs:2:12 | LL | fn foo((a, b): (u32, u32)); | ^^^^^^ pattern not allowed in foreign function diff --git a/src/test/ui/error-codes/E0131.rs b/src/test/ui/error-codes/E0131.rs index c7e31edd301d4..3ed739949a0ee 100644 --- a/src/test/ui/error-codes/E0131.rs +++ b/src/test/ui/error-codes/E0131.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { //~^ ERROR E0131 } diff --git a/src/test/ui/error-codes/E0131.stderr b/src/test/ui/error-codes/E0131.stderr index 46bc872746cc3..4467e19e95d29 100644 --- a/src/test/ui/error-codes/E0131.stderr +++ b/src/test/ui/error-codes/E0131.stderr @@ -1,5 +1,5 @@ error[E0131]: `main` function is not allowed to have generic parameters - --> $DIR/E0131.rs:11:8 + --> $DIR/E0131.rs:1:8 | LL | fn main() { | ^^^ `main` cannot have generic parameters diff --git a/src/test/ui/error-codes/E0132.rs b/src/test/ui/error-codes/E0132.rs index 25ccb344aba34..fb5e5d7b95a3c 100644 --- a/src/test/ui/error-codes/E0132.rs +++ b/src/test/ui/error-codes/E0132.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(start)] #[start] diff --git a/src/test/ui/error-codes/E0132.stderr b/src/test/ui/error-codes/E0132.stderr index 80d1c29d50f99..e19b421bfdb9f 100644 --- a/src/test/ui/error-codes/E0132.stderr +++ b/src/test/ui/error-codes/E0132.stderr @@ -1,5 +1,5 @@ error[E0132]: start function is not allowed to have type parameters - --> $DIR/E0132.rs:14:5 + --> $DIR/E0132.rs:4:5 | LL | fn f< T >() {} //~ ERROR E0132 | ^^^^^ start function cannot have type parameters diff --git a/src/test/ui/error-codes/E0133.rs b/src/test/ui/error-codes/E0133.rs index 2e54f65e7bff4..52494ce6078c4 100644 --- a/src/test/ui/error-codes/E0133.rs +++ b/src/test/ui/error-codes/E0133.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - unsafe fn f() { return; } fn main() { diff --git a/src/test/ui/error-codes/E0133.stderr b/src/test/ui/error-codes/E0133.stderr index 9be80f8f21baa..1eb696506f345 100644 --- a/src/test/ui/error-codes/E0133.stderr +++ b/src/test/ui/error-codes/E0133.stderr @@ -1,5 +1,5 @@ error[E0133]: call to unsafe function is unsafe and requires unsafe function or block - --> $DIR/E0133.rs:14:5 + --> $DIR/E0133.rs:4:5 | LL | f(); | ^^^ call to unsafe function diff --git a/src/test/ui/error-codes/E0137.rs b/src/test/ui/error-codes/E0137.rs index 067ebcc727cea..b8299c71bdf6d 100644 --- a/src/test/ui/error-codes/E0137.rs +++ b/src/test/ui/error-codes/E0137.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(main)] #[main] diff --git a/src/test/ui/error-codes/E0137.stderr b/src/test/ui/error-codes/E0137.stderr index ab2f9ba5bea9f..a5f05d33a0815 100644 --- a/src/test/ui/error-codes/E0137.stderr +++ b/src/test/ui/error-codes/E0137.stderr @@ -1,5 +1,5 @@ error[E0137]: multiple functions with a #[main] attribute - --> $DIR/E0137.rs:17:1 + --> $DIR/E0137.rs:7:1 | LL | fn foo() {} | ----------- first #[main] function diff --git a/src/test/ui/error-codes/E0138.rs b/src/test/ui/error-codes/E0138.rs index 856616c857085..6f3c36282e884 100644 --- a/src/test/ui/error-codes/E0138.rs +++ b/src/test/ui/error-codes/E0138.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(start)] #[start] diff --git a/src/test/ui/error-codes/E0138.stderr b/src/test/ui/error-codes/E0138.stderr index e713b11b37fea..745dccfb17571 100644 --- a/src/test/ui/error-codes/E0138.stderr +++ b/src/test/ui/error-codes/E0138.stderr @@ -1,5 +1,5 @@ error[E0138]: multiple 'start' functions - --> $DIR/E0138.rs:17:1 + --> $DIR/E0138.rs:7:1 | LL | fn foo(argc: isize, argv: *const *const u8) -> isize { 0 } | ---------------------------------------------------------- previous `start` function here diff --git a/src/test/ui/error-codes/E0152.rs b/src/test/ui/error-codes/E0152.rs index 8fbad7b3ff301..7980970852e4d 100644 --- a/src/test/ui/error-codes/E0152.rs +++ b/src/test/ui/error-codes/E0152.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(lang_items)] #[lang = "panic_impl"] diff --git a/src/test/ui/error-codes/E0152.stderr b/src/test/ui/error-codes/E0152.stderr index c7f5f362efb28..c6e465480f6dc 100644 --- a/src/test/ui/error-codes/E0152.stderr +++ b/src/test/ui/error-codes/E0152.stderr @@ -1,5 +1,5 @@ error[E0152]: duplicate lang item found: `panic_impl`. - --> $DIR/E0152.rs:14:1 + --> $DIR/E0152.rs:4:1 | LL | struct Foo; //~ ERROR E0152 | ^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0161.rs b/src/test/ui/error-codes/E0161.rs index 81adf9083024d..51fc074dd9043 100644 --- a/src/test/ui/error-codes/E0161.rs +++ b/src/test/ui/error-codes/E0161.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn main() { diff --git a/src/test/ui/error-codes/E0161.stderr b/src/test/ui/error-codes/E0161.stderr index 0135e495c16b5..f041d1056818e 100644 --- a/src/test/ui/error-codes/E0161.stderr +++ b/src/test/ui/error-codes/E0161.stderr @@ -1,11 +1,11 @@ error[E0161]: cannot move a value of type str: the size of str cannot be statically determined - --> $DIR/E0161.rs:14:28 + --> $DIR/E0161.rs:4:28 | LL | let _x: Box = box *"hello"; //~ ERROR E0161 | ^^^^^^^^ error[E0507]: cannot move out of borrowed content - --> $DIR/E0161.rs:14:28 + --> $DIR/E0161.rs:4:28 | LL | let _x: Box = box *"hello"; //~ ERROR E0161 | ^^^^^^^^ cannot move out of borrowed content diff --git a/src/test/ui/error-codes/E0162.rs b/src/test/ui/error-codes/E0162.rs index e13b0af6f7977..d3221f8e1769a 100644 --- a/src/test/ui/error-codes/E0162.rs +++ b/src/test/ui/error-codes/E0162.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Irrefutable(i32); fn main() { diff --git a/src/test/ui/error-codes/E0162.stderr b/src/test/ui/error-codes/E0162.stderr index 91f402dad59b5..ca5c56cd59d31 100644 --- a/src/test/ui/error-codes/E0162.stderr +++ b/src/test/ui/error-codes/E0162.stderr @@ -1,5 +1,5 @@ error[E0162]: irrefutable if-let pattern - --> $DIR/E0162.rs:15:12 + --> $DIR/E0162.rs:5:12 | LL | if let Irrefutable(x) = irr { //~ ERROR E0162 | ^^^^^^^^^^^^^^ irrefutable pattern diff --git a/src/test/ui/error-codes/E0164.rs b/src/test/ui/error-codes/E0164.rs index a7f10ddb5a7f8..2d412f754ed42 100644 --- a/src/test/ui/error-codes/E0164.rs +++ b/src/test/ui/error-codes/E0164.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum Foo {} impl Foo { diff --git a/src/test/ui/error-codes/E0164.stderr b/src/test/ui/error-codes/E0164.stderr index 6eabace9b141d..0debc8092e86d 100644 --- a/src/test/ui/error-codes/E0164.stderr +++ b/src/test/ui/error-codes/E0164.stderr @@ -1,5 +1,5 @@ error[E0164]: expected tuple struct/variant, found associated constant `::B` - --> $DIR/E0164.rs:20:9 + --> $DIR/E0164.rs:9:9 | LL | Foo::B(i) => i, //~ ERROR E0164 | ^^^^^^^^^ not a tuple variant or struct diff --git a/src/test/ui/error-codes/E0165.rs b/src/test/ui/error-codes/E0165.rs index 142635fc6ee45..952071c8b9e77 100644 --- a/src/test/ui/error-codes/E0165.rs +++ b/src/test/ui/error-codes/E0165.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Irrefutable(i32); fn main() { diff --git a/src/test/ui/error-codes/E0165.stderr b/src/test/ui/error-codes/E0165.stderr index 66be95e38d2aa..e0d192ea15290 100644 --- a/src/test/ui/error-codes/E0165.stderr +++ b/src/test/ui/error-codes/E0165.stderr @@ -1,5 +1,5 @@ error[E0165]: irrefutable while-let pattern - --> $DIR/E0165.rs:15:15 + --> $DIR/E0165.rs:5:15 | LL | while let Irrefutable(x) = irr { //~ ERROR E0165 | ^^^^^^^^^^^^^^ irrefutable pattern diff --git a/src/test/ui/error-codes/E0184.rs b/src/test/ui/error-codes/E0184.rs index 5d72d00ffe876..0c448e4ad8bcf 100644 --- a/src/test/ui/error-codes/E0184.rs +++ b/src/test/ui/error-codes/E0184.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Copy)] //~ ERROR E0184 struct Foo; diff --git a/src/test/ui/error-codes/E0184.stderr b/src/test/ui/error-codes/E0184.stderr index eb6160bc00596..471ba3870e21d 100644 --- a/src/test/ui/error-codes/E0184.stderr +++ b/src/test/ui/error-codes/E0184.stderr @@ -1,5 +1,5 @@ error[E0184]: the trait `Copy` may not be implemented for this type; the type has a destructor - --> $DIR/E0184.rs:11:10 + --> $DIR/E0184.rs:1:10 | LL | #[derive(Copy)] //~ ERROR E0184 | ^^^^ Copy not allowed on types with destructors diff --git a/src/test/ui/error-codes/E0185.rs b/src/test/ui/error-codes/E0185.rs index 0cd3d00a73576..45eb8b0f239bd 100644 --- a/src/test/ui/error-codes/E0185.rs +++ b/src/test/ui/error-codes/E0185.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn foo(); //~^ NOTE trait method declared without `&self` diff --git a/src/test/ui/error-codes/E0185.stderr b/src/test/ui/error-codes/E0185.stderr index e5c92abc521b8..8a99c0688e302 100644 --- a/src/test/ui/error-codes/E0185.stderr +++ b/src/test/ui/error-codes/E0185.stderr @@ -1,5 +1,5 @@ error[E0185]: method `foo` has a `&self` declaration in the impl, but not in the trait - --> $DIR/E0185.rs:19:5 + --> $DIR/E0185.rs:9:5 | LL | fn foo(); | --------- trait method declared without `&self` diff --git a/src/test/ui/error-codes/E0186.rs b/src/test/ui/error-codes/E0186.rs index 55a3490cac4a6..83ef78ef2c033 100644 --- a/src/test/ui/error-codes/E0186.rs +++ b/src/test/ui/error-codes/E0186.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn foo(&self); //~ `&self` used in trait } diff --git a/src/test/ui/error-codes/E0186.stderr b/src/test/ui/error-codes/E0186.stderr index 0556ef700ac14..7fed0426ee874 100644 --- a/src/test/ui/error-codes/E0186.stderr +++ b/src/test/ui/error-codes/E0186.stderr @@ -1,5 +1,5 @@ error[E0186]: method `foo` has a `&self` declaration in the trait, but not in the impl - --> $DIR/E0186.rs:18:5 + --> $DIR/E0186.rs:8:5 | LL | fn foo(&self); //~ `&self` used in trait | -------------- `&self` used in trait diff --git a/src/test/ui/error-codes/E0191.rs b/src/test/ui/error-codes/E0191.rs index 489ebb033f84e..89b430e2684da 100644 --- a/src/test/ui/error-codes/E0191.rs +++ b/src/test/ui/error-codes/E0191.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Trait { type Bar; } diff --git a/src/test/ui/error-codes/E0191.stderr b/src/test/ui/error-codes/E0191.stderr index 08b0a845814d9..97549333c0841 100644 --- a/src/test/ui/error-codes/E0191.stderr +++ b/src/test/ui/error-codes/E0191.stderr @@ -1,5 +1,5 @@ error[E0191]: the value of the associated type `Bar` (from the trait `Trait`) must be specified - --> $DIR/E0191.rs:15:12 + --> $DIR/E0191.rs:5:12 | LL | type Foo = Trait; //~ ERROR E0191 | ^^^^^ missing associated type `Bar` value diff --git a/src/test/ui/error-codes/E0192.rs b/src/test/ui/error-codes/E0192.rs index 92f5876ee04d5..c52977e49b457 100644 --- a/src/test/ui/error-codes/E0192.rs +++ b/src/test/ui/error-codes/E0192.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] trait Trait { diff --git a/src/test/ui/error-codes/E0192.stderr b/src/test/ui/error-codes/E0192.stderr index fd8976271a510..bdfe717afe279 100644 --- a/src/test/ui/error-codes/E0192.stderr +++ b/src/test/ui/error-codes/E0192.stderr @@ -1,5 +1,5 @@ error[E0192]: negative impls are only allowed for auto traits (e.g., `Send` and `Sync`) - --> $DIR/E0192.rs:19:1 + --> $DIR/E0192.rs:9:1 | LL | impl !Trait for Foo { } //~ ERROR E0192 | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0194.rs b/src/test/ui/error-codes/E0194.rs index 17e0751859d9f..71eff0e7465a5 100644 --- a/src/test/ui/error-codes/E0194.rs +++ b/src/test/ui/error-codes/E0194.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn do_something(&self) -> T; fn do_something_else(&self, bar: T); diff --git a/src/test/ui/error-codes/E0194.stderr b/src/test/ui/error-codes/E0194.stderr index 6869f3c96f779..ab4918a4e27d5 100644 --- a/src/test/ui/error-codes/E0194.stderr +++ b/src/test/ui/error-codes/E0194.stderr @@ -1,5 +1,5 @@ error[E0194]: type parameter `T` shadows another type parameter of the same name - --> $DIR/E0194.rs:13:26 + --> $DIR/E0194.rs:3:26 | LL | trait Foo { | - first `T` declared here diff --git a/src/test/ui/error-codes/E0195.rs b/src/test/ui/error-codes/E0195.rs index 4f4d7ce0dba83..f712ee42b8c5b 100644 --- a/src/test/ui/error-codes/E0195.rs +++ b/src/test/ui/error-codes/E0195.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Trait { fn bar<'a,'b:'a>(x: &'a str, y: &'b str); //~^ NOTE lifetimes in impl do not match this method in trait diff --git a/src/test/ui/error-codes/E0195.stderr b/src/test/ui/error-codes/E0195.stderr index 3860c93a45f49..57032c6b0c843 100644 --- a/src/test/ui/error-codes/E0195.stderr +++ b/src/test/ui/error-codes/E0195.stderr @@ -1,5 +1,5 @@ error[E0195]: lifetime parameters or bounds on method `bar` do not match the trait declaration - --> $DIR/E0195.rs:19:11 + --> $DIR/E0195.rs:9:11 | LL | fn bar<'a,'b:'a>(x: &'a str, y: &'b str); | ---------- lifetimes in impl do not match this method in trait diff --git a/src/test/ui/error-codes/E0197.rs b/src/test/ui/error-codes/E0197.rs index f25fa9b92b9a0..4025a1f6c337f 100644 --- a/src/test/ui/error-codes/E0197.rs +++ b/src/test/ui/error-codes/E0197.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo; unsafe impl Foo { } //~ ERROR E0197 diff --git a/src/test/ui/error-codes/E0197.stderr b/src/test/ui/error-codes/E0197.stderr index a18599e4f4702..f58dcd791da1d 100644 --- a/src/test/ui/error-codes/E0197.stderr +++ b/src/test/ui/error-codes/E0197.stderr @@ -1,5 +1,5 @@ error[E0197]: inherent impls cannot be unsafe - --> $DIR/E0197.rs:13:1 + --> $DIR/E0197.rs:3:1 | LL | unsafe impl Foo { } //~ ERROR E0197 | ^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0198.rs b/src/test/ui/error-codes/E0198.rs index 1a779a41e6660..00ab0c3562378 100644 --- a/src/test/ui/error-codes/E0198.rs +++ b/src/test/ui/error-codes/E0198.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] struct Foo; diff --git a/src/test/ui/error-codes/E0198.stderr b/src/test/ui/error-codes/E0198.stderr index 41ea0565cccba..e182cbd2ec155 100644 --- a/src/test/ui/error-codes/E0198.stderr +++ b/src/test/ui/error-codes/E0198.stderr @@ -1,5 +1,5 @@ error[E0198]: negative impls cannot be unsafe - --> $DIR/E0198.rs:15:1 + --> $DIR/E0198.rs:5:1 | LL | unsafe impl !Send for Foo { } //~ ERROR E0198 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0199.rs b/src/test/ui/error-codes/E0199.rs index 1a5cd1941a9d1..c95afa3f97d4a 100644 --- a/src/test/ui/error-codes/E0199.rs +++ b/src/test/ui/error-codes/E0199.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] struct Foo; diff --git a/src/test/ui/error-codes/E0199.stderr b/src/test/ui/error-codes/E0199.stderr index b3cfd0d21ddba..ba55c4a58e476 100644 --- a/src/test/ui/error-codes/E0199.stderr +++ b/src/test/ui/error-codes/E0199.stderr @@ -1,5 +1,5 @@ error[E0199]: implementing the trait `Bar` is not unsafe - --> $DIR/E0199.rs:16:1 + --> $DIR/E0199.rs:6:1 | LL | unsafe impl Bar for Foo { } //~ ERROR implementing the trait `Bar` is not unsafe [E0199] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0200.rs b/src/test/ui/error-codes/E0200.rs index 6bfea0e59d76e..24806a6cbb09d 100644 --- a/src/test/ui/error-codes/E0200.rs +++ b/src/test/ui/error-codes/E0200.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo; unsafe trait Bar { } diff --git a/src/test/ui/error-codes/E0200.stderr b/src/test/ui/error-codes/E0200.stderr index 07f848b501e89..f6a8f32d2384d 100644 --- a/src/test/ui/error-codes/E0200.stderr +++ b/src/test/ui/error-codes/E0200.stderr @@ -1,5 +1,5 @@ error[E0200]: the trait `Bar` requires an `unsafe impl` declaration - --> $DIR/E0200.rs:15:1 + --> $DIR/E0200.rs:5:1 | LL | impl Bar for Foo { } //~ ERROR E0200 | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0201.rs b/src/test/ui/error-codes/E0201.rs index ff6cb55f388c3..adefd4bcd4600 100644 --- a/src/test/ui/error-codes/E0201.rs +++ b/src/test/ui/error-codes/E0201.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo(u8); impl Foo { diff --git a/src/test/ui/error-codes/E0201.stderr b/src/test/ui/error-codes/E0201.stderr index 2b9e51f76fddc..5d2f9f3e362e4 100644 --- a/src/test/ui/error-codes/E0201.stderr +++ b/src/test/ui/error-codes/E0201.stderr @@ -1,5 +1,5 @@ error[E0201]: duplicate definitions with name `bar`: - --> $DIR/E0201.rs:15:5 + --> $DIR/E0201.rs:5:5 | LL | fn bar(&self) -> bool { self.0 > 5 } | ------------------------------------ previous definition of `bar` here @@ -7,7 +7,7 @@ LL | fn bar() {} //~ ERROR E0201 | ^^^^^^^^^^^ duplicate definition error[E0201]: duplicate definitions with name `baz`: - --> $DIR/E0201.rs:27:5 + --> $DIR/E0201.rs:17:5 | LL | fn baz(&self) -> bool { true } | ------------------------------ previous definition of `baz` here @@ -15,7 +15,7 @@ LL | fn baz(&self) -> bool { self.0 > 5 } //~ ERROR E0201 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ duplicate definition error[E0201]: duplicate definitions with name `Quux`: - --> $DIR/E0201.rs:28:5 + --> $DIR/E0201.rs:18:5 | LL | type Quux = u32; | ---------------- previous definition of `Quux` here diff --git a/src/test/ui/error-codes/E0206.rs b/src/test/ui/error-codes/E0206.rs index 9b3d1b351ddd9..bace046758112 100644 --- a/src/test/ui/error-codes/E0206.rs +++ b/src/test/ui/error-codes/E0206.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - type Foo = [u8; 256]; impl Copy for Foo { } diff --git a/src/test/ui/error-codes/E0206.stderr b/src/test/ui/error-codes/E0206.stderr index f2c23b0767af8..499c6ae3f8852 100644 --- a/src/test/ui/error-codes/E0206.stderr +++ b/src/test/ui/error-codes/E0206.stderr @@ -1,17 +1,17 @@ error[E0206]: the trait `Copy` may not be implemented for this type - --> $DIR/E0206.rs:13:15 + --> $DIR/E0206.rs:3:15 | LL | impl Copy for Foo { } | ^^^ type is not a structure or enumeration error[E0206]: the trait `Copy` may not be implemented for this type - --> $DIR/E0206.rs:20:15 + --> $DIR/E0206.rs:10:15 | LL | impl Copy for &'static mut Bar { } | ^^^^^^^^^^^^^^^^ type is not a structure or enumeration error[E0117]: only traits defined in the current crate can be implemented for arbitrary types - --> $DIR/E0206.rs:13:1 + --> $DIR/E0206.rs:3:1 | LL | impl Copy for Foo { } | ^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate diff --git a/src/test/ui/error-codes/E0207.rs b/src/test/ui/error-codes/E0207.rs index bd87dbaf786a5..7f5d4ab51331a 100644 --- a/src/test/ui/error-codes/E0207.rs +++ b/src/test/ui/error-codes/E0207.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo; impl Foo { //~ ERROR E0207 diff --git a/src/test/ui/error-codes/E0207.stderr b/src/test/ui/error-codes/E0207.stderr index 6ecab44878d98..c82859a9867e6 100644 --- a/src/test/ui/error-codes/E0207.stderr +++ b/src/test/ui/error-codes/E0207.stderr @@ -1,5 +1,5 @@ error[E0207]: the type parameter `T` is not constrained by the impl trait, self type, or predicates - --> $DIR/E0207.rs:13:6 + --> $DIR/E0207.rs:3:6 | LL | impl Foo { //~ ERROR E0207 | ^ unconstrained type parameter diff --git a/src/test/ui/error-codes/E0214.rs b/src/test/ui/error-codes/E0214.rs index 2b090391c743b..fd73189f97077 100644 --- a/src/test/ui/error-codes/E0214.rs +++ b/src/test/ui/error-codes/E0214.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let v: Vec(&str) = vec!["foo"]; //~^ ERROR E0214 diff --git a/src/test/ui/error-codes/E0214.stderr b/src/test/ui/error-codes/E0214.stderr index c88e2d2077af9..08a98b1c3bf3d 100644 --- a/src/test/ui/error-codes/E0214.stderr +++ b/src/test/ui/error-codes/E0214.stderr @@ -1,5 +1,5 @@ error[E0214]: parenthesized parameters may only be used with a trait - --> $DIR/E0214.rs:12:15 + --> $DIR/E0214.rs:2:15 | LL | let v: Vec(&str) = vec!["foo"]; | ^^^^^^ only traits may use parentheses diff --git a/src/test/ui/error-codes/E0220.rs b/src/test/ui/error-codes/E0220.rs index 2866ffcd63792..f4798042538dd 100644 --- a/src/test/ui/error-codes/E0220.rs +++ b/src/test/ui/error-codes/E0220.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Trait { type Bar; } diff --git a/src/test/ui/error-codes/E0220.stderr b/src/test/ui/error-codes/E0220.stderr index c8a587f2b5351..0a126eed31ad2 100644 --- a/src/test/ui/error-codes/E0220.stderr +++ b/src/test/ui/error-codes/E0220.stderr @@ -1,11 +1,11 @@ error[E0220]: associated type `F` not found for `Trait` - --> $DIR/E0220.rs:15:18 + --> $DIR/E0220.rs:5:18 | LL | type Foo = Trait; //~ ERROR E0220 | ^^^^^ associated type `F` not found error[E0191]: the value of the associated type `Bar` (from the trait `Trait`) must be specified - --> $DIR/E0220.rs:15:12 + --> $DIR/E0220.rs:5:12 | LL | type Foo = Trait; //~ ERROR E0220 | ^^^^^^^^^^^^ missing associated type `Bar` value diff --git a/src/test/ui/error-codes/E0221.rs b/src/test/ui/error-codes/E0221.rs index 99092465b0ae7..7c7e139a0989d 100644 --- a/src/test/ui/error-codes/E0221.rs +++ b/src/test/ui/error-codes/E0221.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait T1 {} trait T2 {} diff --git a/src/test/ui/error-codes/E0221.stderr b/src/test/ui/error-codes/E0221.stderr index fc9232e85ab46..043f0c68bbc22 100644 --- a/src/test/ui/error-codes/E0221.stderr +++ b/src/test/ui/error-codes/E0221.stderr @@ -1,5 +1,5 @@ error[E0221]: ambiguous associated type `A` in bounds of `Self` - --> $DIR/E0221.rs:21:16 + --> $DIR/E0221.rs:11:16 | LL | type A: T1; | ----------- ambiguous `A` from `Foo` @@ -11,7 +11,7 @@ LL | let _: Self::A; | ^^^^^^^ ambiguous associated type `A` error[E0221]: ambiguous associated type `Err` in bounds of `Self` - --> $DIR/E0221.rs:31:16 + --> $DIR/E0221.rs:21:16 | LL | type Err: T3; | ------------- ambiguous `Err` from `My` @@ -20,7 +20,7 @@ LL | let _: Self::Err; | ^^^^^^^^^ ambiguous associated type `Err` | note: associated type `Self` could derive from `std::str::FromStr` - --> $DIR/E0221.rs:31:16 + --> $DIR/E0221.rs:21:16 | LL | let _: Self::Err; | ^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0223.rs b/src/test/ui/error-codes/E0223.rs index 0683197b2b670..6031b682d72a0 100644 --- a/src/test/ui/error-codes/E0223.rs +++ b/src/test/ui/error-codes/E0223.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait MyTrait { type X; } fn main() { diff --git a/src/test/ui/error-codes/E0223.stderr b/src/test/ui/error-codes/E0223.stderr index f65e744c62594..366b85f9938ed 100644 --- a/src/test/ui/error-codes/E0223.stderr +++ b/src/test/ui/error-codes/E0223.stderr @@ -1,5 +1,5 @@ error[E0223]: ambiguous associated type - --> $DIR/E0223.rs:14:14 + --> $DIR/E0223.rs:4:14 | LL | let foo: MyTrait::X; | ^^^^^^^^^^ ambiguous associated type diff --git a/src/test/ui/error-codes/E0225.rs b/src/test/ui/error-codes/E0225.rs index 6c77443c5ede9..1789be1559d82 100644 --- a/src/test/ui/error-codes/E0225.rs +++ b/src/test/ui/error-codes/E0225.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let _: Box; //~^ ERROR only auto traits can be used as additional traits in a trait object [E0225] diff --git a/src/test/ui/error-codes/E0225.stderr b/src/test/ui/error-codes/E0225.stderr index 6b9489c74c8af..85a04708cb255 100644 --- a/src/test/ui/error-codes/E0225.stderr +++ b/src/test/ui/error-codes/E0225.stderr @@ -1,5 +1,5 @@ error[E0225]: only auto traits can be used as additional traits in a trait object - --> $DIR/E0225.rs:12:32 + --> $DIR/E0225.rs:2:32 | LL | let _: Box; | ^^^^^^^^^^^^^^ non-auto additional trait diff --git a/src/test/ui/error-codes/E0229.rs b/src/test/ui/error-codes/E0229.rs index b70fb092a5410..4c1934107a6d6 100644 --- a/src/test/ui/error-codes/E0229.rs +++ b/src/test/ui/error-codes/E0229.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Foo { type A; fn boo(&self) -> ::A; diff --git a/src/test/ui/error-codes/E0229.stderr b/src/test/ui/error-codes/E0229.stderr index 218faf2dfdd63..46793314bf9f9 100644 --- a/src/test/ui/error-codes/E0229.stderr +++ b/src/test/ui/error-codes/E0229.stderr @@ -1,5 +1,5 @@ error[E0229]: associated type bindings are not allowed here - --> $DIR/E0229.rs:23:25 + --> $DIR/E0229.rs:13:25 | LL | fn baz(x: &>::A) {} | ^^^^^ associated type not allowed here diff --git a/src/test/ui/error-codes/E0232.rs b/src/test/ui/error-codes/E0232.rs index 04657c65c8e45..8e8062436d6e5 100644 --- a/src/test/ui/error-codes/E0232.rs +++ b/src/test/ui/error-codes/E0232.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(on_unimplemented)] #[rustc_on_unimplemented] diff --git a/src/test/ui/error-codes/E0232.stderr b/src/test/ui/error-codes/E0232.stderr index 613b359c299b8..9e9155b1d323c 100644 --- a/src/test/ui/error-codes/E0232.stderr +++ b/src/test/ui/error-codes/E0232.stderr @@ -1,5 +1,5 @@ error[E0232]: `#[rustc_on_unimplemented]` requires a value - --> $DIR/E0232.rs:13:1 + --> $DIR/E0232.rs:3:1 | LL | #[rustc_on_unimplemented] | ^^^^^^^^^^^^^^^^^^^^^^^^^ value required here diff --git a/src/test/ui/error-codes/E0243.rs b/src/test/ui/error-codes/E0243.rs index 615ce0b5d4265..304071bf1e823 100644 --- a/src/test/ui/error-codes/E0243.rs +++ b/src/test/ui/error-codes/E0243.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { x: T } struct Bar { x: Foo } //~^ ERROR wrong number of type arguments: expected 1, found 0 [E0243] diff --git a/src/test/ui/error-codes/E0243.stderr b/src/test/ui/error-codes/E0243.stderr index 0477d1b844a10..b3ced8b856b63 100644 --- a/src/test/ui/error-codes/E0243.stderr +++ b/src/test/ui/error-codes/E0243.stderr @@ -1,5 +1,5 @@ error[E0243]: wrong number of type arguments: expected 1, found 0 - --> $DIR/E0243.rs:12:17 + --> $DIR/E0243.rs:2:17 | LL | struct Bar { x: Foo } | ^^^ expected 1 type argument diff --git a/src/test/ui/error-codes/E0244.rs b/src/test/ui/error-codes/E0244.rs index 9a78b3139d064..72603d9a76b01 100644 --- a/src/test/ui/error-codes/E0244.rs +++ b/src/test/ui/error-codes/E0244.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { x: bool } struct Bar { x: Foo } //~^ ERROR wrong number of type arguments: expected 0, found 2 [E0244] diff --git a/src/test/ui/error-codes/E0244.stderr b/src/test/ui/error-codes/E0244.stderr index 87f063c604fe4..d7e668ac440c9 100644 --- a/src/test/ui/error-codes/E0244.stderr +++ b/src/test/ui/error-codes/E0244.stderr @@ -1,5 +1,5 @@ error[E0244]: wrong number of type arguments: expected 0, found 2 - --> $DIR/E0244.rs:12:23 + --> $DIR/E0244.rs:2:23 | LL | struct Bar { x: Foo } | ^^^^^^^^^ 2 unexpected type arguments diff --git a/src/test/ui/error-codes/E0252.rs b/src/test/ui/error-codes/E0252.rs index 6b353c8cd1a62..1c52b8e6e0b27 100644 --- a/src/test/ui/error-codes/E0252.rs +++ b/src/test/ui/error-codes/E0252.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use foo::baz; use bar::baz; //~ ERROR E0252 diff --git a/src/test/ui/error-codes/E0252.stderr b/src/test/ui/error-codes/E0252.stderr index a4271bf3a4dff..2fbf57918b6df 100644 --- a/src/test/ui/error-codes/E0252.stderr +++ b/src/test/ui/error-codes/E0252.stderr @@ -1,5 +1,5 @@ error[E0252]: the name `baz` is defined multiple times - --> $DIR/E0252.rs:12:5 + --> $DIR/E0252.rs:2:5 | LL | use foo::baz; | -------- previous import of the type `baz` here diff --git a/src/test/ui/error-codes/E0253.rs b/src/test/ui/error-codes/E0253.rs index 186d9019aaeba..284b16da8f22e 100644 --- a/src/test/ui/error-codes/E0253.rs +++ b/src/test/ui/error-codes/E0253.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod foo { pub trait MyTrait { fn do_something(); diff --git a/src/test/ui/error-codes/E0253.stderr b/src/test/ui/error-codes/E0253.stderr index 9ab6c30eaa012..8f21a0aaba565 100644 --- a/src/test/ui/error-codes/E0253.stderr +++ b/src/test/ui/error-codes/E0253.stderr @@ -1,5 +1,5 @@ error[E0253]: `do_something` is not directly importable - --> $DIR/E0253.rs:17:5 + --> $DIR/E0253.rs:7:5 | LL | use foo::MyTrait::do_something; | ^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot be imported directly diff --git a/src/test/ui/error-codes/E0254.rs b/src/test/ui/error-codes/E0254.rs index 46c74fe3735a3..5996068fbc7c6 100644 --- a/src/test/ui/error-codes/E0254.rs +++ b/src/test/ui/error-codes/E0254.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(alloc)] #![allow(unused_extern_crates)] diff --git a/src/test/ui/error-codes/E0254.stderr b/src/test/ui/error-codes/E0254.stderr index a52215df0bbca..ffdd0b2a4ba71 100644 --- a/src/test/ui/error-codes/E0254.stderr +++ b/src/test/ui/error-codes/E0254.stderr @@ -1,5 +1,5 @@ error[E0254]: the name `alloc` is defined multiple times - --> $DIR/E0254.rs:22:5 + --> $DIR/E0254.rs:12:5 | LL | extern crate alloc; | ------------------- previous import of the extern crate `alloc` here diff --git a/src/test/ui/error-codes/E0255.rs b/src/test/ui/error-codes/E0255.rs index e05c6bede7e04..d1c21eb79deb5 100644 --- a/src/test/ui/error-codes/E0255.rs +++ b/src/test/ui/error-codes/E0255.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use bar::foo; fn foo() {} //~ ERROR E0255 diff --git a/src/test/ui/error-codes/E0255.stderr b/src/test/ui/error-codes/E0255.stderr index a077a43c152f0..2c35fcdccfd01 100644 --- a/src/test/ui/error-codes/E0255.stderr +++ b/src/test/ui/error-codes/E0255.stderr @@ -1,5 +1,5 @@ error[E0255]: the name `foo` is defined multiple times - --> $DIR/E0255.rs:13:1 + --> $DIR/E0255.rs:3:1 | LL | use bar::foo; | -------- previous import of the value `foo` here diff --git a/src/test/ui/error-codes/E0259.rs b/src/test/ui/error-codes/E0259.rs index 5a47541c708be..d25e51653c46b 100644 --- a/src/test/ui/error-codes/E0259.rs +++ b/src/test/ui/error-codes/E0259.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(alloc, libc)] #![allow(unused_extern_crates)] diff --git a/src/test/ui/error-codes/E0259.stderr b/src/test/ui/error-codes/E0259.stderr index 24a73544a35f0..33b5bb62f9a8d 100644 --- a/src/test/ui/error-codes/E0259.stderr +++ b/src/test/ui/error-codes/E0259.stderr @@ -1,5 +1,5 @@ error[E0259]: the name `alloc` is defined multiple times - --> $DIR/E0259.rs:16:1 + --> $DIR/E0259.rs:6:1 | LL | extern crate alloc; | ------------------- previous import of the extern crate `alloc` here diff --git a/src/test/ui/error-codes/E0260.rs b/src/test/ui/error-codes/E0260.rs index 1b01bb12203d3..80382c0d2fcb5 100644 --- a/src/test/ui/error-codes/E0260.rs +++ b/src/test/ui/error-codes/E0260.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(alloc)] #![allow(unused_extern_crates)] diff --git a/src/test/ui/error-codes/E0260.stderr b/src/test/ui/error-codes/E0260.stderr index 437794432b082..2acd3627e9d07 100644 --- a/src/test/ui/error-codes/E0260.stderr +++ b/src/test/ui/error-codes/E0260.stderr @@ -1,5 +1,5 @@ error[E0260]: the name `alloc` is defined multiple times - --> $DIR/E0260.rs:16:1 + --> $DIR/E0260.rs:6:1 | LL | extern crate alloc; | ------------------- previous import of the extern crate `alloc` here diff --git a/src/test/ui/error-codes/E0261.rs b/src/test/ui/error-codes/E0261.rs index 558c1c381447e..f05e09aa0da66 100644 --- a/src/test/ui/error-codes/E0261.rs +++ b/src/test/ui/error-codes/E0261.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo(x: &'a str) { } //~ ERROR E0261 //~| undeclared lifetime diff --git a/src/test/ui/error-codes/E0261.stderr b/src/test/ui/error-codes/E0261.stderr index e9140ec2c7486..9e64f6c3f1495 100644 --- a/src/test/ui/error-codes/E0261.stderr +++ b/src/test/ui/error-codes/E0261.stderr @@ -1,11 +1,11 @@ error[E0261]: use of undeclared lifetime name `'a` - --> $DIR/E0261.rs:11:12 + --> $DIR/E0261.rs:1:12 | LL | fn foo(x: &'a str) { } //~ ERROR E0261 | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'a` - --> $DIR/E0261.rs:15:9 + --> $DIR/E0261.rs:5:9 | LL | x: &'a str, //~ ERROR E0261 | ^^ undeclared lifetime diff --git a/src/test/ui/error-codes/E0262.rs b/src/test/ui/error-codes/E0262.rs index 41b6acaee4a1e..55264f1387f80 100644 --- a/src/test/ui/error-codes/E0262.rs +++ b/src/test/ui/error-codes/E0262.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo<'static>(x: &'static str) { } //~ ERROR E0262 //~| 'static is a reserved lifetime name diff --git a/src/test/ui/error-codes/E0262.stderr b/src/test/ui/error-codes/E0262.stderr index 1e5b5db692d8f..8f01889a470b3 100644 --- a/src/test/ui/error-codes/E0262.stderr +++ b/src/test/ui/error-codes/E0262.stderr @@ -1,5 +1,5 @@ error[E0262]: invalid lifetime parameter name: `'static` - --> $DIR/E0262.rs:11:8 + --> $DIR/E0262.rs:1:8 | LL | fn foo<'static>(x: &'static str) { } //~ ERROR E0262 | ^^^^^^^ 'static is a reserved lifetime name diff --git a/src/test/ui/error-codes/E0263.rs b/src/test/ui/error-codes/E0263.rs index 722f1c25e07d1..4376437823cf6 100644 --- a/src/test/ui/error-codes/E0263.rs +++ b/src/test/ui/error-codes/E0263.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo<'a, 'b, 'a>(x: &'a str, y: &'b str) { //~^ ERROR E0263 } diff --git a/src/test/ui/error-codes/E0263.stderr b/src/test/ui/error-codes/E0263.stderr index 1b52deea88d4b..4dae02b85c36c 100644 --- a/src/test/ui/error-codes/E0263.stderr +++ b/src/test/ui/error-codes/E0263.stderr @@ -1,5 +1,5 @@ error[E0263]: lifetime name `'a` declared twice in the same scope - --> $DIR/E0263.rs:11:16 + --> $DIR/E0263.rs:1:16 | LL | fn foo<'a, 'b, 'a>(x: &'a str, y: &'b str) { | -- ^^ declared twice diff --git a/src/test/ui/error-codes/E0264.rs b/src/test/ui/error-codes/E0264.rs index 92332977e7676..6adaf01fb5244 100644 --- a/src/test/ui/error-codes/E0264.rs +++ b/src/test/ui/error-codes/E0264.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(lang_items)] extern "C" { diff --git a/src/test/ui/error-codes/E0264.stderr b/src/test/ui/error-codes/E0264.stderr index 69863d7bb83ec..bc6a0d9f96c3c 100644 --- a/src/test/ui/error-codes/E0264.stderr +++ b/src/test/ui/error-codes/E0264.stderr @@ -1,5 +1,5 @@ error[E0264]: unknown external lang item: `cake` - --> $DIR/E0264.rs:15:5 + --> $DIR/E0264.rs:5:5 | LL | fn cake(); //~ ERROR E0264 | ^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0267.rs b/src/test/ui/error-codes/E0267.rs index 6287256e866c9..45e875a0a3c09 100644 --- a/src/test/ui/error-codes/E0267.rs +++ b/src/test/ui/error-codes/E0267.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let w = || { break; }; //~ ERROR E0267 } diff --git a/src/test/ui/error-codes/E0267.stderr b/src/test/ui/error-codes/E0267.stderr index b72109f0644ee..3506c1c0f165a 100644 --- a/src/test/ui/error-codes/E0267.stderr +++ b/src/test/ui/error-codes/E0267.stderr @@ -1,5 +1,5 @@ error[E0267]: `break` inside of a closure - --> $DIR/E0267.rs:12:18 + --> $DIR/E0267.rs:2:18 | LL | let w = || { break; }; //~ ERROR E0267 | ^^^^^ cannot break inside of a closure diff --git a/src/test/ui/error-codes/E0268.rs b/src/test/ui/error-codes/E0268.rs index 41e88e2f492a9..742ba5441d60f 100644 --- a/src/test/ui/error-codes/E0268.rs +++ b/src/test/ui/error-codes/E0268.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { break; //~ ERROR E0268 } diff --git a/src/test/ui/error-codes/E0268.stderr b/src/test/ui/error-codes/E0268.stderr index e1b5b52085bc2..3e276bd1acb00 100644 --- a/src/test/ui/error-codes/E0268.stderr +++ b/src/test/ui/error-codes/E0268.stderr @@ -1,5 +1,5 @@ error[E0268]: `break` outside of loop - --> $DIR/E0268.rs:12:5 + --> $DIR/E0268.rs:2:5 | LL | break; //~ ERROR E0268 | ^^^^^ cannot break outside of a loop diff --git a/src/test/ui/error-codes/E0271.rs b/src/test/ui/error-codes/E0271.rs index d322c8b1caf56..f27190754348a 100644 --- a/src/test/ui/error-codes/E0271.rs +++ b/src/test/ui/error-codes/E0271.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Trait { type AssociatedType; } fn foo(t: T) where T: Trait { diff --git a/src/test/ui/error-codes/E0271.stderr b/src/test/ui/error-codes/E0271.stderr index 04c7d244376e5..8fcb68e434f80 100644 --- a/src/test/ui/error-codes/E0271.stderr +++ b/src/test/ui/error-codes/E0271.stderr @@ -1,5 +1,5 @@ error[E0271]: type mismatch resolving `::AssociatedType == u32` - --> $DIR/E0271.rs:20:5 + --> $DIR/E0271.rs:10:5 | LL | foo(3_i8); //~ ERROR E0271 | ^^^ expected reference, found u32 @@ -7,7 +7,7 @@ LL | foo(3_i8); //~ ERROR E0271 = note: expected type `&'static str` found type `u32` note: required by `foo` - --> $DIR/E0271.rs:13:1 + --> $DIR/E0271.rs:3:1 | LL | fn foo(t: T) where T: Trait { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0275.rs b/src/test/ui/error-codes/E0275.rs index 8dfd1d9b4afc9..28a9676f03e39 100644 --- a/src/test/ui/error-codes/E0275.rs +++ b/src/test/ui/error-codes/E0275.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo {} struct Bar(T); diff --git a/src/test/ui/error-codes/E0275.stderr b/src/test/ui/error-codes/E0275.stderr index d5bcc94fb653c..817b4828cc4ab 100644 --- a/src/test/ui/error-codes/E0275.stderr +++ b/src/test/ui/error-codes/E0275.stderr @@ -1,5 +1,5 @@ error[E0275]: overflow evaluating the requirement `Bar>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>: std::marker::Sized` - --> $DIR/E0275.rs:15:1 + --> $DIR/E0275.rs:5:1 | LL | impl Foo for T where Bar: Foo {} //~ ERROR E0275 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -70,7 +70,7 @@ LL | impl Foo for T where Bar: Foo {} //~ ERROR E0275 = note: required because of the requirements on the impl of `Foo` for `Bar>` = note: required because of the requirements on the impl of `Foo` for `Bar` note: required by `Foo` - --> $DIR/E0275.rs:11:1 + --> $DIR/E0275.rs:1:1 | LL | trait Foo {} | ^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0276.rs b/src/test/ui/error-codes/E0276.rs index 62e43b02ca85f..5e3d9f602ad0b 100644 --- a/src/test/ui/error-codes/E0276.rs +++ b/src/test/ui/error-codes/E0276.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn foo(x: T); } diff --git a/src/test/ui/error-codes/E0276.stderr b/src/test/ui/error-codes/E0276.stderr index 4823adc250aea..393ad8c81a071 100644 --- a/src/test/ui/error-codes/E0276.stderr +++ b/src/test/ui/error-codes/E0276.stderr @@ -1,5 +1,5 @@ error[E0276]: impl has stricter requirements than trait - --> $DIR/E0276.rs:16:5 + --> $DIR/E0276.rs:6:5 | LL | fn foo(x: T); | ---------------- definition of `foo` from trait diff --git a/src/test/ui/error-codes/E0277-2.rs b/src/test/ui/error-codes/E0277-2.rs index 313aa1f706e93..428518705b839 100644 --- a/src/test/ui/error-codes/E0277-2.rs +++ b/src/test/ui/error-codes/E0277-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { bar: Bar } diff --git a/src/test/ui/error-codes/E0277-2.stderr b/src/test/ui/error-codes/E0277-2.stderr index 32776f028b4ce..a4db1c8b09523 100644 --- a/src/test/ui/error-codes/E0277-2.stderr +++ b/src/test/ui/error-codes/E0277-2.stderr @@ -1,5 +1,5 @@ error[E0277]: `*const u8` cannot be sent between threads safely - --> $DIR/E0277-2.rs:26:5 + --> $DIR/E0277-2.rs:16:5 | LL | is_send::(); | ^^^^^^^^^^^^^^ `*const u8` cannot be sent between threads safely @@ -9,7 +9,7 @@ LL | is_send::(); = note: required because it appears within the type `Bar` = note: required because it appears within the type `Foo` note: required by `is_send` - --> $DIR/E0277-2.rs:23:1 + --> $DIR/E0277-2.rs:13:1 | LL | fn is_send() { } | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0277.rs b/src/test/ui/error-codes/E0277.rs index 80cb5eb7a4bbc..e60d83098b9d5 100644 --- a/src/test/ui/error-codes/E0277.rs +++ b/src/test/ui/error-codes/E0277.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no std::path use std::path::Path; diff --git a/src/test/ui/error-codes/E0277.stderr b/src/test/ui/error-codes/E0277.stderr index ab9020222ea2b..58c78045e3d53 100644 --- a/src/test/ui/error-codes/E0277.stderr +++ b/src/test/ui/error-codes/E0277.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `[u8]` cannot be known at compilation time - --> $DIR/E0277.rs:23:6 + --> $DIR/E0277.rs:13:6 | LL | fn f(p: Path) { } | ^ doesn't have a size known at compile-time @@ -11,13 +11,13 @@ LL | fn f(p: Path) { } = help: unsized locals are gated as an unstable feature error[E0277]: the trait bound `i32: Foo` is not satisfied - --> $DIR/E0277.rs:27:5 + --> $DIR/E0277.rs:17:5 | LL | some_func(5i32); | ^^^^^^^^^ the trait `Foo` is not implemented for `i32` | note: required by `some_func` - --> $DIR/E0277.rs:19:1 + --> $DIR/E0277.rs:9:1 | LL | fn some_func(foo: T) { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0282.rs b/src/test/ui/error-codes/E0282.rs index dfc702670ce46..9bd16abb7bb83 100644 --- a/src/test/ui/error-codes/E0282.rs +++ b/src/test/ui/error-codes/E0282.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = "hello".chars().rev().collect(); //~ ERROR E0282 } diff --git a/src/test/ui/error-codes/E0282.stderr b/src/test/ui/error-codes/E0282.stderr index 6862e2d8688fd..49165d1e42bbb 100644 --- a/src/test/ui/error-codes/E0282.stderr +++ b/src/test/ui/error-codes/E0282.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/E0282.rs:12:9 + --> $DIR/E0282.rs:2:9 | LL | let x = "hello".chars().rev().collect(); //~ ERROR E0282 | ^ diff --git a/src/test/ui/error-codes/E0283.rs b/src/test/ui/error-codes/E0283.rs index 844c47f41b81a..9bdcc9ac42a7a 100644 --- a/src/test/ui/error-codes/E0283.rs +++ b/src/test/ui/error-codes/E0283.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Generator { fn create() -> u32; } diff --git a/src/test/ui/error-codes/E0283.stderr b/src/test/ui/error-codes/E0283.stderr index 3f63881b61e4d..598ec672ce635 100644 --- a/src/test/ui/error-codes/E0283.stderr +++ b/src/test/ui/error-codes/E0283.stderr @@ -1,11 +1,11 @@ error[E0283]: type annotations required: cannot resolve `_: Generator` - --> $DIR/E0283.rs:28:21 + --> $DIR/E0283.rs:18:21 | LL | let cont: u32 = Generator::create(); //~ ERROR E0283 | ^^^^^^^^^^^^^^^^^ | note: required by `Generator::create` - --> $DIR/E0283.rs:12:5 + --> $DIR/E0283.rs:2:5 | LL | fn create() -> u32; | ^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0296.rs b/src/test/ui/error-codes/E0296.rs index 562fd00a18aa6..a1a86574465fb 100644 --- a/src/test/ui/error-codes/E0296.rs +++ b/src/test/ui/error-codes/E0296.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![recursion_limit] //~ ERROR E0296 fn main() {} diff --git a/src/test/ui/error-codes/E0296.stderr b/src/test/ui/error-codes/E0296.stderr index 71db4b614a7c0..41e9f7ea7f9fb 100644 --- a/src/test/ui/error-codes/E0296.stderr +++ b/src/test/ui/error-codes/E0296.stderr @@ -1,5 +1,5 @@ error[E0296]: malformed recursion limit attribute, expected #![recursion_limit="N"] - --> $DIR/E0296.rs:11:1 + --> $DIR/E0296.rs:1:1 | LL | #![recursion_limit] //~ ERROR E0296 | ^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0297.rs b/src/test/ui/error-codes/E0297.rs index afe4444c7afdf..27c7960d97731 100644 --- a/src/test/ui/error-codes/E0297.rs +++ b/src/test/ui/error-codes/E0297.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let xs : Vec> = vec![Some(1), None]; diff --git a/src/test/ui/error-codes/E0297.stderr b/src/test/ui/error-codes/E0297.stderr index d510fa99caecd..f356a5b954d6d 100644 --- a/src/test/ui/error-codes/E0297.stderr +++ b/src/test/ui/error-codes/E0297.stderr @@ -1,5 +1,5 @@ error[E0005]: refutable pattern in `for` loop binding: `None` not covered - --> $DIR/E0297.rs:14:9 + --> $DIR/E0297.rs:4:9 | LL | for Some(x) in xs {} | ^^^^^^^ pattern `None` not covered diff --git a/src/test/ui/error-codes/E0301.rs b/src/test/ui/error-codes/E0301.rs index 06e98289b0d57..54372f8b6b4c5 100644 --- a/src/test/ui/error-codes/E0301.rs +++ b/src/test/ui/error-codes/E0301.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { match Some(()) { None => { }, diff --git a/src/test/ui/error-codes/E0301.stderr b/src/test/ui/error-codes/E0301.stderr index 7d5100c516e54..3cfacd5983f0d 100644 --- a/src/test/ui/error-codes/E0301.stderr +++ b/src/test/ui/error-codes/E0301.stderr @@ -1,5 +1,5 @@ error[E0301]: cannot mutably borrow in a pattern guard - --> $DIR/E0301.rs:14:19 + --> $DIR/E0301.rs:4:19 | LL | option if option.take().is_none() => {}, //~ ERROR E0301 | ^^^^^^ borrowed mutably in pattern guard diff --git a/src/test/ui/error-codes/E0302.rs b/src/test/ui/error-codes/E0302.rs index 6a5ad40b10907..7c76eb30c1d29 100644 --- a/src/test/ui/error-codes/E0302.rs +++ b/src/test/ui/error-codes/E0302.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { match Some(()) { None => { }, diff --git a/src/test/ui/error-codes/E0302.stderr b/src/test/ui/error-codes/E0302.stderr index f55dd523f130f..66b31361762d2 100644 --- a/src/test/ui/error-codes/E0302.stderr +++ b/src/test/ui/error-codes/E0302.stderr @@ -1,5 +1,5 @@ error[E0302]: cannot assign in a pattern guard - --> $DIR/E0302.rs:14:21 + --> $DIR/E0302.rs:4:21 | LL | option if { option = None; false } => { }, //~ ERROR E0302 | ^^^^^^^^^^^^^ assignment in pattern guard diff --git a/src/test/ui/error-codes/E0303.rs b/src/test/ui/error-codes/E0303.rs index 6027414fdbd4b..0530d43b653f5 100644 --- a/src/test/ui/error-codes/E0303.rs +++ b/src/test/ui/error-codes/E0303.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { match Some("hi".to_string()) { ref op_string_ref @ Some(s) => {}, diff --git a/src/test/ui/error-codes/E0303.stderr b/src/test/ui/error-codes/E0303.stderr index b9da037df0e67..d701b07de6b5e 100644 --- a/src/test/ui/error-codes/E0303.stderr +++ b/src/test/ui/error-codes/E0303.stderr @@ -1,5 +1,5 @@ error[E0009]: cannot bind by-move and by-ref in the same pattern - --> $DIR/E0303.rs:13:34 + --> $DIR/E0303.rs:3:34 | LL | ref op_string_ref @ Some(s) => {}, | -------------------------^- @@ -8,7 +8,7 @@ LL | ref op_string_ref @ Some(s) => {}, | both by-ref and by-move used error[E0303]: pattern bindings are not allowed after an `@` - --> $DIR/E0303.rs:13:34 + --> $DIR/E0303.rs:3:34 | LL | ref op_string_ref @ Some(s) => {}, | ^ not allowed after `@` diff --git a/src/test/ui/error-codes/E0308-4.rs b/src/test/ui/error-codes/E0308-4.rs index 106c55817c11a..aaf7ef5bd7929 100644 --- a/src/test/ui/error-codes/E0308-4.rs +++ b/src/test/ui/error-codes/E0308-4.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = 1u8; match x { diff --git a/src/test/ui/error-codes/E0308-4.stderr b/src/test/ui/error-codes/E0308-4.stderr index 8943c7332e94d..8117bc754b6b9 100644 --- a/src/test/ui/error-codes/E0308-4.stderr +++ b/src/test/ui/error-codes/E0308-4.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/E0308-4.rs:14:9 + --> $DIR/E0308-4.rs:4:9 | LL | 0u8..=3i8 => (), //~ ERROR E0308 | ^^^^^^^^^ expected u8, found i8 diff --git a/src/test/ui/error-codes/E0308.rs b/src/test/ui/error-codes/E0308.rs index 078f1d3a9a1ab..fa79bee570e18 100644 --- a/src/test/ui/error-codes/E0308.rs +++ b/src/test/ui/error-codes/E0308.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(intrinsics)] extern "rust-intrinsic" { diff --git a/src/test/ui/error-codes/E0308.stderr b/src/test/ui/error-codes/E0308.stderr index 490a8e0ff0f1d..7cee2debe1bdf 100644 --- a/src/test/ui/error-codes/E0308.stderr +++ b/src/test/ui/error-codes/E0308.stderr @@ -1,5 +1,5 @@ error[E0308]: intrinsic has wrong type - --> $DIR/E0308.rs:14:5 + --> $DIR/E0308.rs:4:5 | LL | fn size_of(); //~ ERROR E0308 | ^^^^^^^^^^^^^^^^ expected (), found usize diff --git a/src/test/ui/error-codes/E0328.rs b/src/test/ui/error-codes/E0328.rs index e08532b02491f..ef55f44dd6be1 100644 --- a/src/test/ui/error-codes/E0328.rs +++ b/src/test/ui/error-codes/E0328.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unsize)] use std::marker::Unsize; diff --git a/src/test/ui/error-codes/E0328.stderr b/src/test/ui/error-codes/E0328.stderr index ad3a224279ce5..70e6baf69d3f5 100644 --- a/src/test/ui/error-codes/E0328.stderr +++ b/src/test/ui/error-codes/E0328.stderr @@ -1,5 +1,5 @@ error[E0328]: explicit impls for the `Unsize` trait are not permitted - --> $DIR/E0328.rs:17:1 + --> $DIR/E0328.rs:7:1 | LL | impl Unsize for MyType {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl of `Unsize` not allowed diff --git a/src/test/ui/error-codes/E0365.rs b/src/test/ui/error-codes/E0365.rs index 18a72b0ff9a55..f12ff96bb8aee 100644 --- a/src/test/ui/error-codes/E0365.rs +++ b/src/test/ui/error-codes/E0365.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod foo { pub const X: u32 = 1; } diff --git a/src/test/ui/error-codes/E0365.stderr b/src/test/ui/error-codes/E0365.stderr index efa21aa2e22c9..c8fc59f8ba958 100644 --- a/src/test/ui/error-codes/E0365.stderr +++ b/src/test/ui/error-codes/E0365.stderr @@ -1,5 +1,5 @@ error[E0365]: `foo` is private, and cannot be re-exported - --> $DIR/E0365.rs:15:9 + --> $DIR/E0365.rs:5:9 | LL | pub use foo as foo2; | ^^^^^^^^^^^ re-export of private `foo` diff --git a/src/test/ui/error-codes/E0370.rs b/src/test/ui/error-codes/E0370.rs index cafe26c65adab..32a66b63bed21 100644 --- a/src/test/ui/error-codes/E0370.rs +++ b/src/test/ui/error-codes/E0370.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] #[deny(overflowing_literals)] diff --git a/src/test/ui/error-codes/E0370.stderr b/src/test/ui/error-codes/E0370.stderr index f85d2cf5d0b0c..cd1903bd7e26f 100644 --- a/src/test/ui/error-codes/E0370.stderr +++ b/src/test/ui/error-codes/E0370.stderr @@ -1,5 +1,5 @@ error[E0370]: enum discriminant overflowed - --> $DIR/E0370.rs:17:5 + --> $DIR/E0370.rs:7:5 | LL | Y, //~ ERROR E0370 | ^ overflowed on value after 9223372036854775807 diff --git a/src/test/ui/error-codes/E0374.rs b/src/test/ui/error-codes/E0374.rs index 6c4782d230ddc..41fcedc328df1 100644 --- a/src/test/ui/error-codes/E0374.rs +++ b/src/test/ui/error-codes/E0374.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(coerce_unsized)] use std::ops::CoerceUnsized; diff --git a/src/test/ui/error-codes/E0374.stderr b/src/test/ui/error-codes/E0374.stderr index 002e2b003af81..9226ca0e478d7 100644 --- a/src/test/ui/error-codes/E0374.stderr +++ b/src/test/ui/error-codes/E0374.stderr @@ -1,5 +1,5 @@ error[E0374]: the trait `CoerceUnsized` may only be implemented for a coercion between structures with one field being coerced, none found - --> $DIR/E0374.rs:18:1 + --> $DIR/E0374.rs:8:1 | LL | / impl CoerceUnsized> for Foo //~ ERROR E0374 LL | | where T: CoerceUnsized {} diff --git a/src/test/ui/error-codes/E0375.rs b/src/test/ui/error-codes/E0375.rs index 094ed35cc2d6d..362854a53aa63 100644 --- a/src/test/ui/error-codes/E0375.rs +++ b/src/test/ui/error-codes/E0375.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength #![feature(coerce_unsized)] diff --git a/src/test/ui/error-codes/E0375.stderr b/src/test/ui/error-codes/E0375.stderr index 3ffd25084b829..36714e4516c7c 100644 --- a/src/test/ui/error-codes/E0375.stderr +++ b/src/test/ui/error-codes/E0375.stderr @@ -1,5 +1,5 @@ error[E0375]: implementing the trait `CoerceUnsized` requires multiple coercions - --> $DIR/E0375.rs:22:12 + --> $DIR/E0375.rs:12:12 | LL | impl CoerceUnsized> for Foo {} | ^^^^^^^^^^^^^^^^^^^^^^^^ requires multiple coercions diff --git a/src/test/ui/error-codes/E0376.rs b/src/test/ui/error-codes/E0376.rs index 65be358cc5fe3..f092eb02c2bcc 100644 --- a/src/test/ui/error-codes/E0376.rs +++ b/src/test/ui/error-codes/E0376.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(coerce_unsized)] use std::ops::CoerceUnsized; diff --git a/src/test/ui/error-codes/E0376.stderr b/src/test/ui/error-codes/E0376.stderr index c850d13e63376..2894a91963200 100644 --- a/src/test/ui/error-codes/E0376.stderr +++ b/src/test/ui/error-codes/E0376.stderr @@ -1,5 +1,5 @@ error[E0376]: the trait `CoerceUnsized` may only be implemented for a coercion between structures - --> $DIR/E0376.rs:18:1 + --> $DIR/E0376.rs:8:1 | LL | impl CoerceUnsized for Foo {} //~ ERROR E0376 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0388.nll.stderr b/src/test/ui/error-codes/E0388.nll.stderr index a048374a49725..a79af31eb11ea 100644 --- a/src/test/ui/error-codes/E0388.nll.stderr +++ b/src/test/ui/error-codes/E0388.nll.stderr @@ -1,23 +1,23 @@ error[E0017]: references in constants may only refer to immutable values - --> $DIR/E0388.rs:14:30 + --> $DIR/E0388.rs:4:30 | LL | const CR: &'static mut i32 = &mut C; //~ ERROR E0017 | ^^^^^^ constants require immutable values error[E0017]: references in statics may only refer to immutable values - --> $DIR/E0388.rs:15:39 + --> $DIR/E0388.rs:5:39 | LL | static STATIC_REF: &'static mut i32 = &mut X; //~ ERROR E0017 | ^^^^^^ statics require immutable values error[E0596]: cannot borrow immutable static item `X` as mutable - --> $DIR/E0388.rs:15:39 + --> $DIR/E0388.rs:5:39 | LL | static STATIC_REF: &'static mut i32 = &mut X; //~ ERROR E0017 | ^^^^^^ cannot borrow as mutable error[E0017]: references in statics may only refer to immutable values - --> $DIR/E0388.rs:17:38 + --> $DIR/E0388.rs:7:38 | LL | static CONST_REF: &'static mut i32 = &mut C; //~ ERROR E0017 | ^^^^^^ statics require immutable values diff --git a/src/test/ui/error-codes/E0388.rs b/src/test/ui/error-codes/E0388.rs index c002badfef64c..3aa4ac9655cc9 100644 --- a/src/test/ui/error-codes/E0388.rs +++ b/src/test/ui/error-codes/E0388.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - static X: i32 = 1; const C: i32 = 2; diff --git a/src/test/ui/error-codes/E0388.stderr b/src/test/ui/error-codes/E0388.stderr index d2263cd4034b8..91f1e6dac395c 100644 --- a/src/test/ui/error-codes/E0388.stderr +++ b/src/test/ui/error-codes/E0388.stderr @@ -1,23 +1,23 @@ error[E0017]: references in constants may only refer to immutable values - --> $DIR/E0388.rs:14:30 + --> $DIR/E0388.rs:4:30 | LL | const CR: &'static mut i32 = &mut C; //~ ERROR E0017 | ^^^^^^ constants require immutable values error[E0017]: references in statics may only refer to immutable values - --> $DIR/E0388.rs:15:39 + --> $DIR/E0388.rs:5:39 | LL | static STATIC_REF: &'static mut i32 = &mut X; //~ ERROR E0017 | ^^^^^^ statics require immutable values error[E0596]: cannot borrow immutable static item as mutable - --> $DIR/E0388.rs:15:44 + --> $DIR/E0388.rs:5:44 | LL | static STATIC_REF: &'static mut i32 = &mut X; //~ ERROR E0017 | ^ error[E0017]: references in statics may only refer to immutable values - --> $DIR/E0388.rs:17:38 + --> $DIR/E0388.rs:7:38 | LL | static CONST_REF: &'static mut i32 = &mut C; //~ ERROR E0017 | ^^^^^^ statics require immutable values diff --git a/src/test/ui/error-codes/E0389.nll.stderr b/src/test/ui/error-codes/E0389.nll.stderr index 66e46dfe29d70..13d2f8cfaa59c 100644 --- a/src/test/ui/error-codes/E0389.nll.stderr +++ b/src/test/ui/error-codes/E0389.nll.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to `fancy_ref.num` which is behind a `&` reference - --> $DIR/E0389.rs:18:5 + --> $DIR/E0389.rs:8:5 | LL | let fancy_ref = &(&mut fancy); | ------------- help: consider changing this to be a mutable reference: `&mut (&mut fancy)` diff --git a/src/test/ui/error-codes/E0389.rs b/src/test/ui/error-codes/E0389.rs index 445831bf8d7f7..8b821330ebec2 100644 --- a/src/test/ui/error-codes/E0389.rs +++ b/src/test/ui/error-codes/E0389.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct FancyNum { num: u8, } diff --git a/src/test/ui/error-codes/E0389.stderr b/src/test/ui/error-codes/E0389.stderr index 29e1ea9dd169c..cc8914ef3a6f7 100644 --- a/src/test/ui/error-codes/E0389.stderr +++ b/src/test/ui/error-codes/E0389.stderr @@ -1,5 +1,5 @@ error[E0389]: cannot assign to data in a `&` reference - --> $DIR/E0389.rs:18:5 + --> $DIR/E0389.rs:8:5 | LL | fancy_ref.num = 6; //~ ERROR E0389 | ^^^^^^^^^^^^^^^^^ assignment into an immutable reference diff --git a/src/test/ui/error-codes/E0390.rs b/src/test/ui/error-codes/E0390.rs index cd530dbd6b46a..4eb59a053b45b 100644 --- a/src/test/ui/error-codes/E0390.rs +++ b/src/test/ui/error-codes/E0390.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { x: i32 } diff --git a/src/test/ui/error-codes/E0390.stderr b/src/test/ui/error-codes/E0390.stderr index fda2c2e2fe01b..7632229360ee8 100644 --- a/src/test/ui/error-codes/E0390.stderr +++ b/src/test/ui/error-codes/E0390.stderr @@ -1,11 +1,11 @@ error[E0390]: only a single inherent implementation marked with `#[lang = "mut_ptr"]` is allowed for the `*mut T` primitive - --> $DIR/E0390.rs:15:1 + --> $DIR/E0390.rs:5:1 | LL | impl *mut Foo {} //~ ERROR E0390 | ^^^^^^^^^^^^^^^^ | help: consider using a trait to implement these methods - --> $DIR/E0390.rs:15:1 + --> $DIR/E0390.rs:5:1 | LL | impl *mut Foo {} //~ ERROR E0390 | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0392.rs b/src/test/ui/error-codes/E0392.rs index 4c3efcf4e8d75..c98d900b62a58 100644 --- a/src/test/ui/error-codes/E0392.rs +++ b/src/test/ui/error-codes/E0392.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Foo { Bar } //~ ERROR E0392 fn main() { diff --git a/src/test/ui/error-codes/E0392.stderr b/src/test/ui/error-codes/E0392.stderr index cfa9c49b2eeb4..4bb3b87bb4a27 100644 --- a/src/test/ui/error-codes/E0392.stderr +++ b/src/test/ui/error-codes/E0392.stderr @@ -1,5 +1,5 @@ error[E0392]: parameter `T` is never used - --> $DIR/E0392.rs:11:10 + --> $DIR/E0392.rs:1:10 | LL | enum Foo { Bar } //~ ERROR E0392 | ^ unused type parameter diff --git a/src/test/ui/error-codes/E0393.rs b/src/test/ui/error-codes/E0393.rs index 9165bc2837b51..bdd4deafc838e 100644 --- a/src/test/ui/error-codes/E0393.rs +++ b/src/test/ui/error-codes/E0393.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait A {} fn together_we_will_rule_the_galaxy(son: &A) {} diff --git a/src/test/ui/error-codes/E0393.stderr b/src/test/ui/error-codes/E0393.stderr index c0e282308c154..bf564ef10210a 100644 --- a/src/test/ui/error-codes/E0393.stderr +++ b/src/test/ui/error-codes/E0393.stderr @@ -1,5 +1,5 @@ error[E0393]: the type parameter `T` must be explicitly specified - --> $DIR/E0393.rs:13:43 + --> $DIR/E0393.rs:3:43 | LL | fn together_we_will_rule_the_galaxy(son: &A) {} | ^ missing reference to `T` diff --git a/src/test/ui/error-codes/E0395.rs b/src/test/ui/error-codes/E0395.rs index 617050732b7de..c2de56c413f05 100644 --- a/src/test/ui/error-codes/E0395.rs +++ b/src/test/ui/error-codes/E0395.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // gate-test-const_compare_raw_pointers static FOO: i32 = 42; diff --git a/src/test/ui/error-codes/E0395.stderr b/src/test/ui/error-codes/E0395.stderr index 0fb9a9e854ddb..45e1ba05ff996 100644 --- a/src/test/ui/error-codes/E0395.stderr +++ b/src/test/ui/error-codes/E0395.stderr @@ -1,5 +1,5 @@ error[E0658]: comparing raw pointers inside static (see issue #53020) - --> $DIR/E0395.rs:16:22 + --> $DIR/E0395.rs:6:22 | LL | static BAZ: bool = { (&FOO as *const i32) == (&BAR as *const i32) }; //~ ERROR issue #53020 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0396-fixed.rs b/src/test/ui/error-codes/E0396-fixed.rs index 08d20e7850d94..990c46df9bb15 100644 --- a/src/test/ui/error-codes/E0396-fixed.rs +++ b/src/test/ui/error-codes/E0396-fixed.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(const_raw_ptr_deref)] const REG_ADDR: *const u8 = 0x5f3759df as *const u8; diff --git a/src/test/ui/error-codes/E0396-fixed.stderr b/src/test/ui/error-codes/E0396-fixed.stderr index 7d3c98c8ea808..69c3f223374aa 100644 --- a/src/test/ui/error-codes/E0396-fixed.stderr +++ b/src/test/ui/error-codes/E0396-fixed.stderr @@ -1,5 +1,5 @@ error: this constant cannot be used - --> $DIR/E0396-fixed.rs:15:1 + --> $DIR/E0396-fixed.rs:5:1 | LL | const VALUE: u8 = unsafe { *REG_ADDR }; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^---------^^^ diff --git a/src/test/ui/error-codes/E0396.rs b/src/test/ui/error-codes/E0396.rs index 1ee8a74a46547..b32853e483d6c 100644 --- a/src/test/ui/error-codes/E0396.rs +++ b/src/test/ui/error-codes/E0396.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // gate-test-const_raw_ptr_deref const REG_ADDR: *const u8 = 0x5f3759df as *const u8; diff --git a/src/test/ui/error-codes/E0396.stderr b/src/test/ui/error-codes/E0396.stderr index a2a2e7243588f..1006ff6dc5424 100644 --- a/src/test/ui/error-codes/E0396.stderr +++ b/src/test/ui/error-codes/E0396.stderr @@ -1,5 +1,5 @@ error[E0658]: dereferencing raw pointers in constants is unstable (see issue #51911) - --> $DIR/E0396.rs:15:28 + --> $DIR/E0396.rs:5:28 | LL | const VALUE: u8 = unsafe { *REG_ADDR }; | ^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0401.rs b/src/test/ui/error-codes/E0401.rs index 4fc74f5ef2219..a120198b7284d 100644 --- a/src/test/ui/error-codes/E0401.rs +++ b/src/test/ui/error-codes/E0401.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Baz {} fn foo(x: T) { diff --git a/src/test/ui/error-codes/E0401.stderr b/src/test/ui/error-codes/E0401.stderr index b088e8330e998..7f96480800f29 100644 --- a/src/test/ui/error-codes/E0401.stderr +++ b/src/test/ui/error-codes/E0401.stderr @@ -1,5 +1,5 @@ error[E0401]: can't use type parameters from outer function - --> $DIR/E0401.rs:14:39 + --> $DIR/E0401.rs:4:39 | LL | fn foo(x: T) { | - type variable from outer function @@ -9,7 +9,7 @@ LL | fn bfnr, W: Fn()>(y: T) { //~ ERROR E0401 | help: try using a local type parameter instead: `bfnr, W: Fn(), T>` error[E0401]: can't use type parameters from outer function - --> $DIR/E0401.rs:19:16 + --> $DIR/E0401.rs:9:16 | LL | fn foo(x: T) { | - type variable from outer function @@ -21,7 +21,7 @@ LL | (y: T) { //~ ERROR E0401 | ^ use of type variable from outer function error[E0401]: can't use type parameters from outer function - --> $DIR/E0401.rs:32:25 + --> $DIR/E0401.rs:22:25 | LL | impl Iterator for A { | ---- `Self` type implicitly declared here, on the `impl` diff --git a/src/test/ui/error-codes/E0403.rs b/src/test/ui/error-codes/E0403.rs index 6a68013dc6ffe..8bccb631af4bb 100644 --- a/src/test/ui/error-codes/E0403.rs +++ b/src/test/ui/error-codes/E0403.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo(s: T, u: T) {} //~ ERROR E0403 fn main() { diff --git a/src/test/ui/error-codes/E0403.stderr b/src/test/ui/error-codes/E0403.stderr index f9ccc31654aad..919a82dbe1a72 100644 --- a/src/test/ui/error-codes/E0403.stderr +++ b/src/test/ui/error-codes/E0403.stderr @@ -1,5 +1,5 @@ error[E0403]: the name `T` is already used for a type parameter in this type parameter list - --> $DIR/E0403.rs:11:11 + --> $DIR/E0403.rs:1:11 | LL | fn foo(s: T, u: T) {} //~ ERROR E0403 | - ^ already used diff --git a/src/test/ui/error-codes/E0404.rs b/src/test/ui/error-codes/E0404.rs index 1c6ff5ae8413d..b17333724363b 100644 --- a/src/test/ui/error-codes/E0404.rs +++ b/src/test/ui/error-codes/E0404.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo; struct Bar; diff --git a/src/test/ui/error-codes/E0404.stderr b/src/test/ui/error-codes/E0404.stderr index afb748bedbe0f..f84fd52c851a8 100644 --- a/src/test/ui/error-codes/E0404.stderr +++ b/src/test/ui/error-codes/E0404.stderr @@ -1,11 +1,11 @@ error[E0404]: expected trait, found struct `Foo` - --> $DIR/E0404.rs:14:6 + --> $DIR/E0404.rs:4:6 | LL | impl Foo for Bar {} //~ ERROR E0404 | ^^^ not a trait error[E0404]: expected trait, found struct `Foo` - --> $DIR/E0404.rs:18:11 + --> $DIR/E0404.rs:8:11 | LL | fn baz(_: T) {} //~ ERROR E0404 | ^^^ not a trait diff --git a/src/test/ui/error-codes/E0405.rs b/src/test/ui/error-codes/E0405.rs index 45d4b219ba818..f03c4e19b09fa 100644 --- a/src/test/ui/error-codes/E0405.rs +++ b/src/test/ui/error-codes/E0405.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo; impl SomeTrait for Foo {} //~ ERROR E0405 diff --git a/src/test/ui/error-codes/E0405.stderr b/src/test/ui/error-codes/E0405.stderr index 27190af1c6c11..2f09a525e450b 100644 --- a/src/test/ui/error-codes/E0405.stderr +++ b/src/test/ui/error-codes/E0405.stderr @@ -1,5 +1,5 @@ error[E0405]: cannot find trait `SomeTrait` in this scope - --> $DIR/E0405.rs:13:6 + --> $DIR/E0405.rs:3:6 | LL | impl SomeTrait for Foo {} //~ ERROR E0405 | ^^^^^^^^^ not found in this scope diff --git a/src/test/ui/error-codes/E0407.rs b/src/test/ui/error-codes/E0407.rs index 41d8b4513ce53..962bd5741e7d2 100644 --- a/src/test/ui/error-codes/E0407.rs +++ b/src/test/ui/error-codes/E0407.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn a(); } diff --git a/src/test/ui/error-codes/E0407.stderr b/src/test/ui/error-codes/E0407.stderr index 1be04a992c240..567fc879040d3 100644 --- a/src/test/ui/error-codes/E0407.stderr +++ b/src/test/ui/error-codes/E0407.stderr @@ -1,5 +1,5 @@ error[E0407]: method `b` is not a member of trait `Foo` - --> $DIR/E0407.rs:19:5 + --> $DIR/E0407.rs:9:5 | LL | fn b() {} | ^^^^^^^^^ not a member of trait `Foo` diff --git a/src/test/ui/error-codes/E0408.rs b/src/test/ui/error-codes/E0408.rs index 8ddeb20afdc1e..e91a98f385701 100644 --- a/src/test/ui/error-codes/E0408.rs +++ b/src/test/ui/error-codes/E0408.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = Some(0); diff --git a/src/test/ui/error-codes/E0408.stderr b/src/test/ui/error-codes/E0408.stderr index 46845de1aadd1..dc0a41e6eb0f8 100644 --- a/src/test/ui/error-codes/E0408.stderr +++ b/src/test/ui/error-codes/E0408.stderr @@ -1,5 +1,5 @@ error[E0408]: variable `y` is not bound in all patterns - --> $DIR/E0408.rs:15:19 + --> $DIR/E0408.rs:5:19 | LL | Some(y) | None => {} //~ ERROR variable `y` is not bound in all patterns | - ^^^^ pattern doesn't bind `y` diff --git a/src/test/ui/error-codes/E0411.rs b/src/test/ui/error-codes/E0411.rs index 187986fbadbe0..872370f2a53fb 100644 --- a/src/test/ui/error-codes/E0411.rs +++ b/src/test/ui/error-codes/E0411.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { ::foo; //~ ERROR E0411 } diff --git a/src/test/ui/error-codes/E0411.stderr b/src/test/ui/error-codes/E0411.stderr index a5f2e3a7b93de..65eea179d3b34 100644 --- a/src/test/ui/error-codes/E0411.stderr +++ b/src/test/ui/error-codes/E0411.stderr @@ -1,5 +1,5 @@ error[E0411]: cannot find type `Self` in this scope - --> $DIR/E0411.rs:12:6 + --> $DIR/E0411.rs:2:6 | LL | ::foo; //~ ERROR E0411 | ^^^^ `Self` is only available in traits and impls diff --git a/src/test/ui/error-codes/E0412.rs b/src/test/ui/error-codes/E0412.rs index f62901cac31c1..5f922a50a68ed 100644 --- a/src/test/ui/error-codes/E0412.rs +++ b/src/test/ui/error-codes/E0412.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - impl Something {} //~ ERROR E0412 fn main() { diff --git a/src/test/ui/error-codes/E0412.stderr b/src/test/ui/error-codes/E0412.stderr index 61115c8b2920f..68d636ffae0b2 100644 --- a/src/test/ui/error-codes/E0412.stderr +++ b/src/test/ui/error-codes/E0412.stderr @@ -1,5 +1,5 @@ error[E0412]: cannot find type `Something` in this scope - --> $DIR/E0412.rs:11:6 + --> $DIR/E0412.rs:1:6 | LL | impl Something {} //~ ERROR E0412 | ^^^^^^^^^ not found in this scope diff --git a/src/test/ui/error-codes/E0415.rs b/src/test/ui/error-codes/E0415.rs index 2a5f0d3c229b1..6177ac35be8c1 100644 --- a/src/test/ui/error-codes/E0415.rs +++ b/src/test/ui/error-codes/E0415.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo(f: i32, f: i32) {} //~ ERROR E0415 fn main() { diff --git a/src/test/ui/error-codes/E0415.stderr b/src/test/ui/error-codes/E0415.stderr index 3f036f3a534b7..6e848f9bfd39c 100644 --- a/src/test/ui/error-codes/E0415.stderr +++ b/src/test/ui/error-codes/E0415.stderr @@ -1,5 +1,5 @@ error[E0415]: identifier `f` is bound more than once in this parameter list - --> $DIR/E0415.rs:11:16 + --> $DIR/E0415.rs:1:16 | LL | fn foo(f: i32, f: i32) {} //~ ERROR E0415 | ^ used as parameter more than once diff --git a/src/test/ui/error-codes/E0416.rs b/src/test/ui/error-codes/E0416.rs index 91077ab37f322..88eece07acddc 100644 --- a/src/test/ui/error-codes/E0416.rs +++ b/src/test/ui/error-codes/E0416.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { match (1, 2) { (x, x) => {} //~ ERROR E0416 diff --git a/src/test/ui/error-codes/E0416.stderr b/src/test/ui/error-codes/E0416.stderr index 8815bb2ad8400..4baf5006cf40a 100644 --- a/src/test/ui/error-codes/E0416.stderr +++ b/src/test/ui/error-codes/E0416.stderr @@ -1,5 +1,5 @@ error[E0416]: identifier `x` is bound more than once in the same pattern - --> $DIR/E0416.rs:13:13 + --> $DIR/E0416.rs:3:13 | LL | (x, x) => {} //~ ERROR E0416 | ^ used in a pattern more than once diff --git a/src/test/ui/error-codes/E0423.rs b/src/test/ui/error-codes/E0423.rs index 7d71499d3186b..2b26808d4bde5 100644 --- a/src/test/ui/error-codes/E0423.rs +++ b/src/test/ui/error-codes/E0423.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main () { struct Foo { a: bool }; diff --git a/src/test/ui/error-codes/E0423.stderr b/src/test/ui/error-codes/E0423.stderr index 477c698ac9af1..df9ed631a1c2e 100644 --- a/src/test/ui/error-codes/E0423.stderr +++ b/src/test/ui/error-codes/E0423.stderr @@ -1,23 +1,23 @@ error: expected type, found `1` - --> $DIR/E0423.rs:22:39 + --> $DIR/E0423.rs:12:39 | LL | if let S { x: _x, y: 2 } = S { x: 1, y: 2 } { println!("Ok"); } | ^ expecting a type here because of type ascription error: expected expression, found `==` - --> $DIR/E0423.rs:25:13 + --> $DIR/E0423.rs:15:13 | LL | if T {} == T {} { println!("Ok"); } | ^^ expected expression error: expected type, found `0` - --> $DIR/E0423.rs:31:39 + --> $DIR/E0423.rs:21:39 | LL | for _ in std::ops::Range { start: 0, end: 10 } {} | ^ expecting a type here because of type ascription error[E0423]: expected function, found struct `Foo` - --> $DIR/E0423.rs:14:13 + --> $DIR/E0423.rs:4:13 | LL | let f = Foo(); //~ ERROR E0423 | ^^^ @@ -26,19 +26,19 @@ LL | let f = Foo(); //~ ERROR E0423 | did you mean `Foo { /* fields */ }`? error[E0423]: expected value, found struct `S` - --> $DIR/E0423.rs:22:32 + --> $DIR/E0423.rs:12:32 | LL | if let S { x: _x, y: 2 } = S { x: 1, y: 2 } { println!("Ok"); } | ^ did you mean `(S { /* fields */ })`? error[E0423]: expected value, found struct `T` - --> $DIR/E0423.rs:25:8 + --> $DIR/E0423.rs:15:8 | LL | if T {} == T {} { println!("Ok"); } | ^ did you mean `(T { /* fields */ })`? error[E0423]: expected value, found struct `std::ops::Range` - --> $DIR/E0423.rs:31:14 + --> $DIR/E0423.rs:21:14 | LL | for _ in std::ops::Range { start: 0, end: 10 } {} | ^^^^^^^^^^^^^^^ did you mean `(std::ops::Range { /* fields */ })`? diff --git a/src/test/ui/error-codes/E0424.rs b/src/test/ui/error-codes/E0424.rs index 445d0c5f3edc0..8eecd2e2a441c 100644 --- a/src/test/ui/error-codes/E0424.rs +++ b/src/test/ui/error-codes/E0424.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo; impl Foo { diff --git a/src/test/ui/error-codes/E0424.stderr b/src/test/ui/error-codes/E0424.stderr index 2c4f7f7c62b31..ab13217718e7e 100644 --- a/src/test/ui/error-codes/E0424.stderr +++ b/src/test/ui/error-codes/E0424.stderr @@ -1,5 +1,5 @@ error[E0424]: expected value, found module `self` - --> $DIR/E0424.rs:17:9 + --> $DIR/E0424.rs:7:9 | LL | self.bar(); //~ ERROR E0424 | ^^^^ `self` value is only available in methods with `self` parameter diff --git a/src/test/ui/error-codes/E0425.rs b/src/test/ui/error-codes/E0425.rs index 3786282031f25..ec234ae990660 100644 --- a/src/test/ui/error-codes/E0425.rs +++ b/src/test/ui/error-codes/E0425.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn bar() { elf; //~ ERROR E0425 diff --git a/src/test/ui/error-codes/E0425.stderr b/src/test/ui/error-codes/E0425.stderr index 72756baf8efc1..391027a518409 100644 --- a/src/test/ui/error-codes/E0425.stderr +++ b/src/test/ui/error-codes/E0425.stderr @@ -1,5 +1,5 @@ error[E0425]: cannot find value `elf` in this scope - --> $DIR/E0425.rs:13:9 + --> $DIR/E0425.rs:3:9 | LL | elf; //~ ERROR E0425 | ^^^ not found in this scope diff --git a/src/test/ui/error-codes/E0426.rs b/src/test/ui/error-codes/E0426.rs index d6261d3a74e15..7a1dcde49b6a6 100644 --- a/src/test/ui/error-codes/E0426.rs +++ b/src/test/ui/error-codes/E0426.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main () { loop { break 'a; diff --git a/src/test/ui/error-codes/E0426.stderr b/src/test/ui/error-codes/E0426.stderr index 29249ab3919e2..035f2eb86b90c 100644 --- a/src/test/ui/error-codes/E0426.stderr +++ b/src/test/ui/error-codes/E0426.stderr @@ -1,5 +1,5 @@ error[E0426]: use of undeclared label `'a` - --> $DIR/E0426.rs:13:15 + --> $DIR/E0426.rs:3:15 | LL | break 'a; | ^^ undeclared label `'a` diff --git a/src/test/ui/error-codes/E0428.rs b/src/test/ui/error-codes/E0428.rs index 3c709f3a39922..eb9594fb8b6e3 100644 --- a/src/test/ui/error-codes/E0428.rs +++ b/src/test/ui/error-codes/E0428.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Bar; //~ previous definition of the type `Bar` here struct Bar; //~ ERROR E0428 diff --git a/src/test/ui/error-codes/E0428.stderr b/src/test/ui/error-codes/E0428.stderr index ebfe866625d80..2154cb0ead286 100644 --- a/src/test/ui/error-codes/E0428.stderr +++ b/src/test/ui/error-codes/E0428.stderr @@ -1,5 +1,5 @@ error[E0428]: the name `Bar` is defined multiple times - --> $DIR/E0428.rs:12:1 + --> $DIR/E0428.rs:2:1 | LL | struct Bar; //~ previous definition of the type `Bar` here | ----------- previous definition of the type `Bar` here diff --git a/src/test/ui/error-codes/E0429.rs b/src/test/ui/error-codes/E0429.rs index f1cad200be61a..e74b27a78b67d 100644 --- a/src/test/ui/error-codes/E0429.rs +++ b/src/test/ui/error-codes/E0429.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt::self; //~ ERROR E0429 fn main () { diff --git a/src/test/ui/error-codes/E0429.stderr b/src/test/ui/error-codes/E0429.stderr index d36155fb466e4..13cdb0d8861fa 100644 --- a/src/test/ui/error-codes/E0429.stderr +++ b/src/test/ui/error-codes/E0429.stderr @@ -1,5 +1,5 @@ error[E0429]: `self` imports are only allowed within a { } list - --> $DIR/E0429.rs:11:5 + --> $DIR/E0429.rs:1:5 | LL | use std::fmt::self; //~ ERROR E0429 | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0430.rs b/src/test/ui/error-codes/E0430.rs index 992876dd29443..ba2f671d66cf1 100644 --- a/src/test/ui/error-codes/E0430.rs +++ b/src/test/ui/error-codes/E0430.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt::{self, self}; //~ ERROR E0430 //~^ ERROR E0252 diff --git a/src/test/ui/error-codes/E0430.stderr b/src/test/ui/error-codes/E0430.stderr index c50ed4ea5de8b..e97a1cedc3612 100644 --- a/src/test/ui/error-codes/E0430.stderr +++ b/src/test/ui/error-codes/E0430.stderr @@ -1,5 +1,5 @@ error[E0430]: `self` import can only appear once in an import list - --> $DIR/E0430.rs:11:16 + --> $DIR/E0430.rs:1:16 | LL | use std::fmt::{self, self}; //~ ERROR E0430 | ^^^^ ---- another `self` import appears here @@ -7,7 +7,7 @@ LL | use std::fmt::{self, self}; //~ ERROR E0430 | can only appear once in an import list error[E0252]: the name `fmt` is defined multiple times - --> $DIR/E0430.rs:11:22 + --> $DIR/E0430.rs:1:22 | LL | use std::fmt::{self, self}; //~ ERROR E0430 | ---- ^^^^ `fmt` reimported here diff --git a/src/test/ui/error-codes/E0431.rs b/src/test/ui/error-codes/E0431.rs index 09ddc1efaf47c..2e2ccba171518 100644 --- a/src/test/ui/error-codes/E0431.rs +++ b/src/test/ui/error-codes/E0431.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use {self}; //~ ERROR E0431 fn main () { diff --git a/src/test/ui/error-codes/E0431.stderr b/src/test/ui/error-codes/E0431.stderr index 75b8486aa5cc4..240e6bd4a829f 100644 --- a/src/test/ui/error-codes/E0431.stderr +++ b/src/test/ui/error-codes/E0431.stderr @@ -1,5 +1,5 @@ error[E0431]: `self` import can only appear in an import list with a non-empty prefix - --> $DIR/E0431.rs:11:6 + --> $DIR/E0431.rs:1:6 | LL | use {self}; //~ ERROR E0431 | ^^^^ can only appear in an import list with a non-empty prefix diff --git a/src/test/ui/error-codes/E0432.rs b/src/test/ui/error-codes/E0432.rs index 08d699ee4ca59..1fc95f945665c 100644 --- a/src/test/ui/error-codes/E0432.rs +++ b/src/test/ui/error-codes/E0432.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use something::Foo; //~ ERROR E0432 fn main () { diff --git a/src/test/ui/error-codes/E0432.stderr b/src/test/ui/error-codes/E0432.stderr index 291bb45075593..24ddf65a07a92 100644 --- a/src/test/ui/error-codes/E0432.stderr +++ b/src/test/ui/error-codes/E0432.stderr @@ -1,5 +1,5 @@ error[E0432]: unresolved import `something` - --> $DIR/E0432.rs:11:5 + --> $DIR/E0432.rs:1:5 | LL | use something::Foo; //~ ERROR E0432 | ^^^^^^^^^ Maybe a missing `extern crate something;`? diff --git a/src/test/ui/error-codes/E0433.rs b/src/test/ui/error-codes/E0433.rs index 916d6220eb919..9b54ec8c5cfde 100644 --- a/src/test/ui/error-codes/E0433.rs +++ b/src/test/ui/error-codes/E0433.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main () { let map = HashMap::new(); //~ ERROR E0433 } diff --git a/src/test/ui/error-codes/E0433.stderr b/src/test/ui/error-codes/E0433.stderr index f8cf5f6f92f66..4bfbba3663217 100644 --- a/src/test/ui/error-codes/E0433.stderr +++ b/src/test/ui/error-codes/E0433.stderr @@ -1,5 +1,5 @@ error[E0433]: failed to resolve. Use of undeclared type or module `HashMap` - --> $DIR/E0433.rs:12:15 + --> $DIR/E0433.rs:2:15 | LL | let map = HashMap::new(); //~ ERROR E0433 | ^^^^^^^ Use of undeclared type or module `HashMap` diff --git a/src/test/ui/error-codes/E0434.rs b/src/test/ui/error-codes/E0434.rs index 747d9f72c421b..db7037ee115e0 100644 --- a/src/test/ui/error-codes/E0434.rs +++ b/src/test/ui/error-codes/E0434.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo() { let y = 5; fn bar() -> u32 { diff --git a/src/test/ui/error-codes/E0434.stderr b/src/test/ui/error-codes/E0434.stderr index bbbc7d16e3baa..0e2bc701b7fbf 100644 --- a/src/test/ui/error-codes/E0434.stderr +++ b/src/test/ui/error-codes/E0434.stderr @@ -1,5 +1,5 @@ error[E0434]: can't capture dynamic environment in a fn item - --> $DIR/E0434.rs:14:9 + --> $DIR/E0434.rs:4:9 | LL | y //~ ERROR E0434 | ^ diff --git a/src/test/ui/error-codes/E0435.rs b/src/test/ui/error-codes/E0435.rs index 5246fda6aaf6f..620dd30a23bc9 100644 --- a/src/test/ui/error-codes/E0435.rs +++ b/src/test/ui/error-codes/E0435.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main () { let foo = 42u32; let _: [u8; foo]; //~ ERROR E0435 diff --git a/src/test/ui/error-codes/E0435.stderr b/src/test/ui/error-codes/E0435.stderr index 517fddfa1ac17..09c9d19e11402 100644 --- a/src/test/ui/error-codes/E0435.stderr +++ b/src/test/ui/error-codes/E0435.stderr @@ -1,5 +1,5 @@ error[E0435]: attempt to use a non-constant value in a constant - --> $DIR/E0435.rs:13:17 + --> $DIR/E0435.rs:3:17 | LL | let _: [u8; foo]; //~ ERROR E0435 | ^^^ non-constant value diff --git a/src/test/ui/error-codes/E0437.rs b/src/test/ui/error-codes/E0437.rs index 7440a82773e7a..f8c15007d4ee5 100644 --- a/src/test/ui/error-codes/E0437.rs +++ b/src/test/ui/error-codes/E0437.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo {} impl Foo for i32 { diff --git a/src/test/ui/error-codes/E0437.stderr b/src/test/ui/error-codes/E0437.stderr index 790e306f121b4..9470cbf176aeb 100644 --- a/src/test/ui/error-codes/E0437.stderr +++ b/src/test/ui/error-codes/E0437.stderr @@ -1,5 +1,5 @@ error[E0437]: type `Bar` is not a member of trait `Foo` - --> $DIR/E0437.rs:14:5 + --> $DIR/E0437.rs:4:5 | LL | type Bar = bool; //~ ERROR E0437 | ^^^^^^^^^^^^^^^^ not a member of trait `Foo` diff --git a/src/test/ui/error-codes/E0438.rs b/src/test/ui/error-codes/E0438.rs index 61d25134993f0..02898b886c876 100644 --- a/src/test/ui/error-codes/E0438.rs +++ b/src/test/ui/error-codes/E0438.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - trait Bar {} impl Bar for i32 { diff --git a/src/test/ui/error-codes/E0438.stderr b/src/test/ui/error-codes/E0438.stderr index 5f311e9bca98e..6a11577bb0f33 100644 --- a/src/test/ui/error-codes/E0438.stderr +++ b/src/test/ui/error-codes/E0438.stderr @@ -1,5 +1,5 @@ error[E0438]: const `BAR` is not a member of trait `Bar` - --> $DIR/E0438.rs:15:5 + --> $DIR/E0438.rs:4:5 | LL | const BAR: bool = true; //~ ERROR E0438 | ^^^^^^^^^^^^^^^^^^^^^^^ not a member of trait `Bar` diff --git a/src/test/ui/error-codes/E0439.rs b/src/test/ui/error-codes/E0439.rs index 52443432021b2..86e9cb55a9c86 100644 --- a/src/test/ui/error-codes/E0439.rs +++ b/src/test/ui/error-codes/E0439.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(platform_intrinsics)] extern "platform-intrinsic" { diff --git a/src/test/ui/error-codes/E0439.stderr b/src/test/ui/error-codes/E0439.stderr index 1400633001ac5..e3b8fbfb25362 100644 --- a/src/test/ui/error-codes/E0439.stderr +++ b/src/test/ui/error-codes/E0439.stderr @@ -1,5 +1,5 @@ error[E0439]: invalid `simd_shuffle`, needs length: `simd_shuffle` - --> $DIR/E0439.rs:14:5 + --> $DIR/E0439.rs:4:5 | LL | fn simd_shuffle(a: A, b: A, c: [u32; 8]) -> B; //~ ERROR E0439 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0440.rs b/src/test/ui/error-codes/E0440.rs index 04e7584008df9..a761b57b7d4b1 100644 --- a/src/test/ui/error-codes/E0440.rs +++ b/src/test/ui/error-codes/E0440.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(repr_simd)] #![feature(platform_intrinsics)] diff --git a/src/test/ui/error-codes/E0440.stderr b/src/test/ui/error-codes/E0440.stderr index acaa948a33152..2fa1f8776ed17 100644 --- a/src/test/ui/error-codes/E0440.stderr +++ b/src/test/ui/error-codes/E0440.stderr @@ -1,5 +1,5 @@ error[E0440]: platform-specific intrinsic has wrong number of type parameters: found 1, expected 0 - --> $DIR/E0440.rs:18:5 + --> $DIR/E0440.rs:8:5 | LL | fn x86_mm_movemask_pd(x: f64x2) -> i32; //~ ERROR E0440 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0441.rs b/src/test/ui/error-codes/E0441.rs index 967ff64327235..0627faae379eb 100644 --- a/src/test/ui/error-codes/E0441.rs +++ b/src/test/ui/error-codes/E0441.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(repr_simd)] #![feature(platform_intrinsics)] diff --git a/src/test/ui/error-codes/E0441.stderr b/src/test/ui/error-codes/E0441.stderr index 8a01176dbbeee..38f3541e49270 100644 --- a/src/test/ui/error-codes/E0441.stderr +++ b/src/test/ui/error-codes/E0441.stderr @@ -1,5 +1,5 @@ error[E0441]: unrecognized platform-specific intrinsic function: `x86_mm_adds_ep16` - --> $DIR/E0441.rs:18:5 + --> $DIR/E0441.rs:8:5 | LL | fn x86_mm_adds_ep16(x: i16x8, y: i16x8) -> i16x8; //~ ERROR E0441 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0442.rs b/src/test/ui/error-codes/E0442.rs index ddd927054be1d..3d1b77bbf0a35 100644 --- a/src/test/ui/error-codes/E0442.rs +++ b/src/test/ui/error-codes/E0442.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(repr_simd)] #![feature(platform_intrinsics)] diff --git a/src/test/ui/error-codes/E0442.stderr b/src/test/ui/error-codes/E0442.stderr index 01881e1b5c38b..5348ec0b5001b 100644 --- a/src/test/ui/error-codes/E0442.stderr +++ b/src/test/ui/error-codes/E0442.stderr @@ -1,17 +1,17 @@ error[E0442]: intrinsic argument 1 has wrong type: found vector with length 16, expected length 8 - --> $DIR/E0442.rs:23:5 + --> $DIR/E0442.rs:13:5 | LL | fn x86_mm_adds_epi16(x: i8x16, y: i32x4) -> i64x2; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0442]: intrinsic argument 2 has wrong type: found vector with length 4, expected length 8 - --> $DIR/E0442.rs:23:5 + --> $DIR/E0442.rs:13:5 | LL | fn x86_mm_adds_epi16(x: i8x16, y: i32x4) -> i64x2; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0442]: intrinsic return value has wrong type: found vector with length 2, expected length 8 - --> $DIR/E0442.rs:23:5 + --> $DIR/E0442.rs:13:5 | LL | fn x86_mm_adds_epi16(x: i8x16, y: i32x4) -> i64x2; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0443.rs b/src/test/ui/error-codes/E0443.rs index 24d1ee01dd46e..a0d4ff244d42f 100644 --- a/src/test/ui/error-codes/E0443.rs +++ b/src/test/ui/error-codes/E0443.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(repr_simd)] #![feature(platform_intrinsics)] diff --git a/src/test/ui/error-codes/E0443.stderr b/src/test/ui/error-codes/E0443.stderr index b57c9423fce72..bbf1914766067 100644 --- a/src/test/ui/error-codes/E0443.stderr +++ b/src/test/ui/error-codes/E0443.stderr @@ -1,5 +1,5 @@ error[E0443]: intrinsic return value has wrong type: found `i64x8`, expected `i16x8` which was used for this vector type previously in this signature - --> $DIR/E0443.rs:20:5 + --> $DIR/E0443.rs:10:5 | LL | fn x86_mm_adds_epi16(x: i16x8, y: i16x8) -> i64x8; //~ ERROR E0443 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0444.rs b/src/test/ui/error-codes/E0444.rs index a424a3ca20ec0..349cc3b3ecc14 100644 --- a/src/test/ui/error-codes/E0444.rs +++ b/src/test/ui/error-codes/E0444.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(repr_simd)] #![feature(platform_intrinsics)] diff --git a/src/test/ui/error-codes/E0444.stderr b/src/test/ui/error-codes/E0444.stderr index 338c9dac75e32..f2cf76e142d08 100644 --- a/src/test/ui/error-codes/E0444.stderr +++ b/src/test/ui/error-codes/E0444.stderr @@ -1,5 +1,5 @@ error[E0444]: platform-specific intrinsic has invalid number of arguments: found 3, expected 1 - --> $DIR/E0444.rs:18:5 + --> $DIR/E0444.rs:8:5 | LL | fn x86_mm_movemask_pd(x: f64x2, y: f64x2, z: f64x2) -> i32; //~ ERROR E0444 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0445.rs b/src/test/ui/error-codes/E0445.rs index bca1b52d17a92..570c37ef2ccbe 100644 --- a/src/test/ui/error-codes/E0445.rs +++ b/src/test/ui/error-codes/E0445.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn dummy(&self) { } } diff --git a/src/test/ui/error-codes/E0445.stderr b/src/test/ui/error-codes/E0445.stderr index 552de83a65e08..747e4daf74ec2 100644 --- a/src/test/ui/error-codes/E0445.stderr +++ b/src/test/ui/error-codes/E0445.stderr @@ -1,17 +1,17 @@ error[E0445]: private trait `Foo` in public interface - --> $DIR/E0445.rs:15:1 + --> $DIR/E0445.rs:5:1 | LL | pub trait Bar : Foo {} | ^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait error[E0445]: private trait `Foo` in public interface - --> $DIR/E0445.rs:18:1 + --> $DIR/E0445.rs:8:1 | LL | pub struct Bar2(pub T); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait error[E0445]: private trait `Foo` in public interface - --> $DIR/E0445.rs:21:1 + --> $DIR/E0445.rs:11:1 | LL | pub fn foo (t: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait diff --git a/src/test/ui/error-codes/E0446.rs b/src/test/ui/error-codes/E0446.rs index c576661828471..33bd6144716c8 100644 --- a/src/test/ui/error-codes/E0446.rs +++ b/src/test/ui/error-codes/E0446.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod Foo { struct Bar(u32); diff --git a/src/test/ui/error-codes/E0446.stderr b/src/test/ui/error-codes/E0446.stderr index 6c7f3785464f9..8f381320cf99e 100644 --- a/src/test/ui/error-codes/E0446.stderr +++ b/src/test/ui/error-codes/E0446.stderr @@ -1,5 +1,5 @@ error[E0446]: private type `Foo::Bar` in public interface - --> $DIR/E0446.rs:14:5 + --> $DIR/E0446.rs:4:5 | LL | struct Bar(u32); | - `Foo::Bar` declared as private diff --git a/src/test/ui/error-codes/E0449.rs b/src/test/ui/error-codes/E0449.rs index ac365db33e5cd..eba0d479e9712 100644 --- a/src/test/ui/error-codes/E0449.rs +++ b/src/test/ui/error-codes/E0449.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Bar; trait Foo { diff --git a/src/test/ui/error-codes/E0449.stderr b/src/test/ui/error-codes/E0449.stderr index df3b09ba7c9f3..d623c8abbd923 100644 --- a/src/test/ui/error-codes/E0449.stderr +++ b/src/test/ui/error-codes/E0449.stderr @@ -1,5 +1,5 @@ error[E0449]: unnecessary visibility qualifier - --> $DIR/E0449.rs:17:1 + --> $DIR/E0449.rs:7:1 | LL | pub impl Bar {} //~ ERROR E0449 | ^^^ `pub` not permitted here because it's implied @@ -7,13 +7,13 @@ LL | pub impl Bar {} //~ ERROR E0449 = note: place qualifiers on individual impl items instead error[E0449]: unnecessary visibility qualifier - --> $DIR/E0449.rs:19:1 + --> $DIR/E0449.rs:9:1 | LL | pub impl Foo for Bar { //~ ERROR E0449 | ^^^ `pub` not permitted here because it's implied error[E0449]: unnecessary visibility qualifier - --> $DIR/E0449.rs:20:5 + --> $DIR/E0449.rs:10:5 | LL | pub fn foo() {} //~ ERROR E0449 | ^^^ `pub` not permitted here because it's implied diff --git a/src/test/ui/error-codes/E0451.rs b/src/test/ui/error-codes/E0451.rs index af4e7d628bb25..7c1c326fb5bec 100644 --- a/src/test/ui/error-codes/E0451.rs +++ b/src/test/ui/error-codes/E0451.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod Bar { pub struct Foo { pub a: isize, diff --git a/src/test/ui/error-codes/E0451.stderr b/src/test/ui/error-codes/E0451.stderr index 4d54e17d5070d..11bc7e31803a7 100644 --- a/src/test/ui/error-codes/E0451.stderr +++ b/src/test/ui/error-codes/E0451.stderr @@ -1,11 +1,11 @@ error[E0451]: field `b` of struct `Bar::Foo` is private - --> $DIR/E0451.rs:24:23 + --> $DIR/E0451.rs:14:23 | LL | let Bar::Foo{a:a, b:b} = foo; //~ ERROR E0451 | ^^^ field `b` is private error[E0451]: field `b` of struct `Bar::Foo` is private - --> $DIR/E0451.rs:28:29 + --> $DIR/E0451.rs:18:29 | LL | let f = Bar::Foo{ a: 0, b: 0 }; //~ ERROR E0451 | ^^^^ field `b` is private diff --git a/src/test/ui/error-codes/E0452.rs b/src/test/ui/error-codes/E0452.rs index 1665bbdd4c2c1..940b9f693cade 100644 --- a/src/test/ui/error-codes/E0452.rs +++ b/src/test/ui/error-codes/E0452.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(foo = "")] //~ ERROR E0452 fn main() { diff --git a/src/test/ui/error-codes/E0452.stderr b/src/test/ui/error-codes/E0452.stderr index a915ca1d6746d..62f268cd432b6 100644 --- a/src/test/ui/error-codes/E0452.stderr +++ b/src/test/ui/error-codes/E0452.stderr @@ -1,5 +1,5 @@ error[E0452]: malformed lint attribute - --> $DIR/E0452.rs:11:10 + --> $DIR/E0452.rs:1:10 | LL | #![allow(foo = "")] //~ ERROR E0452 | ^^^^^^^^ diff --git a/src/test/ui/error-codes/E0453.rs b/src/test/ui/error-codes/E0453.rs index 8e51b84bab8e6..46fa04843ea03 100644 --- a/src/test/ui/error-codes/E0453.rs +++ b/src/test/ui/error-codes/E0453.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![forbid(non_snake_case)] #[allow(non_snake_case)] diff --git a/src/test/ui/error-codes/E0453.stderr b/src/test/ui/error-codes/E0453.stderr index 59e1a1cfdfc47..03cc756d6ac00 100644 --- a/src/test/ui/error-codes/E0453.stderr +++ b/src/test/ui/error-codes/E0453.stderr @@ -1,5 +1,5 @@ error[E0453]: allow(non_snake_case) overruled by outer forbid(non_snake_case) - --> $DIR/E0453.rs:13:9 + --> $DIR/E0453.rs:3:9 | LL | #![forbid(non_snake_case)] | -------------- `forbid` level set here diff --git a/src/test/ui/error-codes/E0454.rs b/src/test/ui/error-codes/E0454.rs index afd0f5f5e461e..d62210c3f94a7 100644 --- a/src/test/ui/error-codes/E0454.rs +++ b/src/test/ui/error-codes/E0454.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[link(name = "")] extern {} //~^ ERROR E0454 diff --git a/src/test/ui/error-codes/E0454.stderr b/src/test/ui/error-codes/E0454.stderr index 44dde5386660f..352c3baa83aa2 100644 --- a/src/test/ui/error-codes/E0454.stderr +++ b/src/test/ui/error-codes/E0454.stderr @@ -1,5 +1,5 @@ error[E0454]: #[link(name = "")] given with empty name - --> $DIR/E0454.rs:11:1 + --> $DIR/E0454.rs:1:1 | LL | #[link(name = "")] extern {} | ^^^^^^^^^^^^^^^^^^ empty name given diff --git a/src/test/ui/error-codes/E0458.rs b/src/test/ui/error-codes/E0458.rs index fea27ef811586..3d2303587219c 100644 --- a/src/test/ui/error-codes/E0458.rs +++ b/src/test/ui/error-codes/E0458.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[link(kind = "wonderful_unicorn")] extern {} //~ ERROR E0458 //~| ERROR E0459 diff --git a/src/test/ui/error-codes/E0458.stderr b/src/test/ui/error-codes/E0458.stderr index fa99ba6a417e3..8b071e0b315ed 100644 --- a/src/test/ui/error-codes/E0458.stderr +++ b/src/test/ui/error-codes/E0458.stderr @@ -1,5 +1,5 @@ error[E0458]: unknown kind: `wonderful_unicorn` - --> $DIR/E0458.rs:11:1 + --> $DIR/E0458.rs:1:1 | LL | #[link(kind = "wonderful_unicorn")] extern {} //~ ERROR E0458 | ^^^^^^^--------------------------^^ @@ -7,7 +7,7 @@ LL | #[link(kind = "wonderful_unicorn")] extern {} //~ ERROR E0458 | unknown kind error[E0459]: #[link(...)] specified without `name = "foo"` - --> $DIR/E0458.rs:11:1 + --> $DIR/E0458.rs:1:1 | LL | #[link(kind = "wonderful_unicorn")] extern {} //~ ERROR E0458 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `name` argument diff --git a/src/test/ui/error-codes/E0459.rs b/src/test/ui/error-codes/E0459.rs index dc7ac714f2239..80a2fd3515136 100644 --- a/src/test/ui/error-codes/E0459.rs +++ b/src/test/ui/error-codes/E0459.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[link(kind = "dylib")] extern {} //~ ERROR E0459 fn main() { diff --git a/src/test/ui/error-codes/E0459.stderr b/src/test/ui/error-codes/E0459.stderr index 8f31e7b4b13cd..d3591cd5f6062 100644 --- a/src/test/ui/error-codes/E0459.stderr +++ b/src/test/ui/error-codes/E0459.stderr @@ -1,5 +1,5 @@ error[E0459]: #[link(...)] specified without `name = "foo"` - --> $DIR/E0459.rs:11:1 + --> $DIR/E0459.rs:1:1 | LL | #[link(kind = "dylib")] extern {} //~ ERROR E0459 | ^^^^^^^^^^^^^^^^^^^^^^^ missing `name` argument diff --git a/src/test/ui/error-codes/E0463.rs b/src/test/ui/error-codes/E0463.rs index aae83975b22f8..683565281cfca 100644 --- a/src/test/ui/error-codes/E0463.rs +++ b/src/test/ui/error-codes/E0463.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(plugin)] #![plugin(cookie_monster)] //~^ ERROR E0463 diff --git a/src/test/ui/error-codes/E0463.stderr b/src/test/ui/error-codes/E0463.stderr index 26403827e4a80..1aa66e1ec8895 100644 --- a/src/test/ui/error-codes/E0463.stderr +++ b/src/test/ui/error-codes/E0463.stderr @@ -1,5 +1,5 @@ error[E0463]: can't find crate for `cookie_monster` - --> $DIR/E0463.rs:12:11 + --> $DIR/E0463.rs:2:11 | LL | #![plugin(cookie_monster)] | ^^^^^^^^^^^^^^ can't find crate diff --git a/src/test/ui/error-codes/E0478.rs b/src/test/ui/error-codes/E0478.rs index 8eb4003fc9734..1b5ca09d5a6c4 100644 --- a/src/test/ui/error-codes/E0478.rs +++ b/src/test/ui/error-codes/E0478.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Wedding<'t>: 't { } struct Prince<'kiss, 'SnowWhite> { diff --git a/src/test/ui/error-codes/E0478.stderr b/src/test/ui/error-codes/E0478.stderr index 0e778908058e0..5147bf2455996 100644 --- a/src/test/ui/error-codes/E0478.stderr +++ b/src/test/ui/error-codes/E0478.stderr @@ -1,16 +1,16 @@ error[E0478]: lifetime bound not satisfied - --> $DIR/E0478.rs:14:5 + --> $DIR/E0478.rs:4:5 | LL | child: Box + 'SnowWhite>, //~ ERROR E0478 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | -note: lifetime parameter instantiated with the lifetime 'SnowWhite as defined on the struct at 13:22 - --> $DIR/E0478.rs:13:22 +note: lifetime parameter instantiated with the lifetime 'SnowWhite as defined on the struct at 3:22 + --> $DIR/E0478.rs:3:22 | LL | struct Prince<'kiss, 'SnowWhite> { | ^^^^^^^^^^ -note: but lifetime parameter must outlive the lifetime 'kiss as defined on the struct at 13:15 - --> $DIR/E0478.rs:13:15 +note: but lifetime parameter must outlive the lifetime 'kiss as defined on the struct at 3:15 + --> $DIR/E0478.rs:3:15 | LL | struct Prince<'kiss, 'SnowWhite> { | ^^^^^ diff --git a/src/test/ui/error-codes/E0492.rs b/src/test/ui/error-codes/E0492.rs index 8e4964c97c593..b1824941adf00 100644 --- a/src/test/ui/error-codes/E0492.rs +++ b/src/test/ui/error-codes/E0492.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::sync::atomic::{AtomicUsize, ATOMIC_USIZE_INIT}; const A: AtomicUsize = ATOMIC_USIZE_INIT; diff --git a/src/test/ui/error-codes/E0492.stderr b/src/test/ui/error-codes/E0492.stderr index 157a192969021..b73db6c975ead 100644 --- a/src/test/ui/error-codes/E0492.stderr +++ b/src/test/ui/error-codes/E0492.stderr @@ -1,5 +1,5 @@ error[E0492]: cannot borrow a constant which may contain interior mutability, create a static instead - --> $DIR/E0492.rs:14:34 + --> $DIR/E0492.rs:4:34 | LL | static B: &'static AtomicUsize = &A; //~ ERROR E0492 | ^^ diff --git a/src/test/ui/error-codes/E0496.rs b/src/test/ui/error-codes/E0496.rs index 4ca3cd9c13da6..b57c9c79eaadc 100644 --- a/src/test/ui/error-codes/E0496.rs +++ b/src/test/ui/error-codes/E0496.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo<'a> { a: &'a i32, } diff --git a/src/test/ui/error-codes/E0496.stderr b/src/test/ui/error-codes/E0496.stderr index 198daa512bdaa..515d71ba05ec5 100644 --- a/src/test/ui/error-codes/E0496.stderr +++ b/src/test/ui/error-codes/E0496.stderr @@ -1,5 +1,5 @@ error[E0496]: lifetime name `'a` shadows a lifetime name that is already in scope - --> $DIR/E0496.rs:16:10 + --> $DIR/E0496.rs:6:10 | LL | impl<'a> Foo<'a> { | -- first declared here diff --git a/src/test/ui/error-codes/E0499.nll.stderr b/src/test/ui/error-codes/E0499.nll.stderr index 89801693b763c..ac487e92462f8 100644 --- a/src/test/ui/error-codes/E0499.nll.stderr +++ b/src/test/ui/error-codes/E0499.nll.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `i` as mutable more than once at a time - --> $DIR/E0499.rs:14:17 + --> $DIR/E0499.rs:4:17 | LL | let mut x = &mut i; | ------ first mutable borrow occurs here diff --git a/src/test/ui/error-codes/E0499.rs b/src/test/ui/error-codes/E0499.rs index 9fb235eccdd31..919f97c8a5c3d 100644 --- a/src/test/ui/error-codes/E0499.rs +++ b/src/test/ui/error-codes/E0499.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let mut i = 0; let mut x = &mut i; diff --git a/src/test/ui/error-codes/E0499.stderr b/src/test/ui/error-codes/E0499.stderr index 8f4fd445fc2a5..92157e4eba6c4 100644 --- a/src/test/ui/error-codes/E0499.stderr +++ b/src/test/ui/error-codes/E0499.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `i` as mutable more than once at a time - --> $DIR/E0499.rs:14:22 + --> $DIR/E0499.rs:4:22 | LL | let mut x = &mut i; | - first mutable borrow occurs here diff --git a/src/test/ui/error-codes/E0502.nll.stderr b/src/test/ui/error-codes/E0502.nll.stderr index 565f73616b9fe..777bf2e844ace 100644 --- a/src/test/ui/error-codes/E0502.nll.stderr +++ b/src/test/ui/error-codes/E0502.nll.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `*a` as mutable because it is also borrowed as immutable - --> $DIR/E0502.rs:14:5 + --> $DIR/E0502.rs:4:5 | LL | let ref y = a; | ----- immutable borrow occurs here diff --git a/src/test/ui/error-codes/E0502.rs b/src/test/ui/error-codes/E0502.rs index 86d9c130d873d..958380ece4565 100644 --- a/src/test/ui/error-codes/E0502.rs +++ b/src/test/ui/error-codes/E0502.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn bar(x: &mut i32) {} fn foo(a: &mut i32) { let ref y = a; diff --git a/src/test/ui/error-codes/E0502.stderr b/src/test/ui/error-codes/E0502.stderr index 8f0335c066268..9193886b00969 100644 --- a/src/test/ui/error-codes/E0502.stderr +++ b/src/test/ui/error-codes/E0502.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `*a` as mutable because `a` is also borrowed as immutable - --> $DIR/E0502.rs:14:9 + --> $DIR/E0502.rs:4:9 | LL | let ref y = a; | ----- immutable borrow occurs here diff --git a/src/test/ui/error-codes/E0503.nll.stderr b/src/test/ui/error-codes/E0503.nll.stderr index 54e2bdacfa9b3..7b483a5eaa585 100644 --- a/src/test/ui/error-codes/E0503.nll.stderr +++ b/src/test/ui/error-codes/E0503.nll.stderr @@ -1,5 +1,5 @@ error[E0503]: cannot use `value` because it was mutably borrowed - --> $DIR/E0503.rs:14:16 + --> $DIR/E0503.rs:4:16 | LL | let _borrow = &mut value; | ---------- borrow of `value` occurs here diff --git a/src/test/ui/error-codes/E0503.rs b/src/test/ui/error-codes/E0503.rs index eacf510414575..88f5fc1bbcbf5 100644 --- a/src/test/ui/error-codes/E0503.rs +++ b/src/test/ui/error-codes/E0503.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let mut value = 3; let _borrow = &mut value; diff --git a/src/test/ui/error-codes/E0503.stderr b/src/test/ui/error-codes/E0503.stderr index 0342ebc419361..83391146b602d 100644 --- a/src/test/ui/error-codes/E0503.stderr +++ b/src/test/ui/error-codes/E0503.stderr @@ -1,5 +1,5 @@ error[E0503]: cannot use `value` because it was mutably borrowed - --> $DIR/E0503.rs:14:16 + --> $DIR/E0503.rs:4:16 | LL | let _borrow = &mut value; | ----- borrow of `value` occurs here diff --git a/src/test/ui/error-codes/E0504.nll.stderr b/src/test/ui/error-codes/E0504.nll.stderr index 6f4823326ffa6..8d7387e86e524 100644 --- a/src/test/ui/error-codes/E0504.nll.stderr +++ b/src/test/ui/error-codes/E0504.nll.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `fancy_num` because it is borrowed - --> $DIR/E0504.rs:19:13 + --> $DIR/E0504.rs:9:13 | LL | let fancy_ref = &fancy_num; | ---------- borrow of `fancy_num` occurs here diff --git a/src/test/ui/error-codes/E0504.rs b/src/test/ui/error-codes/E0504.rs index c594f2415209d..06ae0848b7c88 100644 --- a/src/test/ui/error-codes/E0504.rs +++ b/src/test/ui/error-codes/E0504.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct FancyNum { num: u8, } diff --git a/src/test/ui/error-codes/E0504.stderr b/src/test/ui/error-codes/E0504.stderr index cd1d3ec5ba471..7f4a611c5d53f 100644 --- a/src/test/ui/error-codes/E0504.stderr +++ b/src/test/ui/error-codes/E0504.stderr @@ -1,5 +1,5 @@ error[E0504]: cannot move `fancy_num` into closure because it is borrowed - --> $DIR/E0504.rs:20:40 + --> $DIR/E0504.rs:10:40 | LL | let fancy_ref = &fancy_num; | --------- borrow of `fancy_num` occurs here diff --git a/src/test/ui/error-codes/E0505.nll.stderr b/src/test/ui/error-codes/E0505.nll.stderr index 94624cb96992b..181e5e33d29d7 100644 --- a/src/test/ui/error-codes/E0505.nll.stderr +++ b/src/test/ui/error-codes/E0505.nll.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `x` because it is borrowed - --> $DIR/E0505.rs:19:13 + --> $DIR/E0505.rs:9:13 | LL | let _ref_to_val: &Value = &x; | -- borrow of `x` occurs here diff --git a/src/test/ui/error-codes/E0505.rs b/src/test/ui/error-codes/E0505.rs index 2ec4ac44b6ef6..941f5f2199d24 100644 --- a/src/test/ui/error-codes/E0505.rs +++ b/src/test/ui/error-codes/E0505.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Value {} fn eat(val: Value) {} diff --git a/src/test/ui/error-codes/E0505.stderr b/src/test/ui/error-codes/E0505.stderr index 64558ba8c7c08..268eb88019220 100644 --- a/src/test/ui/error-codes/E0505.stderr +++ b/src/test/ui/error-codes/E0505.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `x` because it is borrowed - --> $DIR/E0505.rs:19:13 + --> $DIR/E0505.rs:9:13 | LL | let _ref_to_val: &Value = &x; | - borrow of `x` occurs here diff --git a/src/test/ui/error-codes/E0507.rs b/src/test/ui/error-codes/E0507.rs index 87b1bf51bdbbf..bae90a44ce023 100644 --- a/src/test/ui/error-codes/E0507.rs +++ b/src/test/ui/error-codes/E0507.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cell::RefCell; struct TheDarkKnight; diff --git a/src/test/ui/error-codes/E0507.stderr b/src/test/ui/error-codes/E0507.stderr index 3d9d8a5145d0b..c24b8ecf61ac6 100644 --- a/src/test/ui/error-codes/E0507.stderr +++ b/src/test/ui/error-codes/E0507.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/E0507.rs:22:5 + --> $DIR/E0507.rs:12:5 | LL | x.borrow().nothing_is_true(); //~ ERROR E0507 | ^^^^^^^^^^ cannot move out of borrowed content diff --git a/src/test/ui/error-codes/E0509.nll.stderr b/src/test/ui/error-codes/E0509.nll.stderr index 723b083b90442..0233c7d6d1651 100644 --- a/src/test/ui/error-codes/E0509.nll.stderr +++ b/src/test/ui/error-codes/E0509.nll.stderr @@ -1,5 +1,5 @@ error[E0509]: cannot move out of type `DropStruct`, which implements the `Drop` trait - --> $DIR/E0509.rs:26:23 + --> $DIR/E0509.rs:16:23 | LL | let fancy_field = drop_struct.fancy; //~ ERROR E0509 | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0509.rs b/src/test/ui/error-codes/E0509.rs index b92024cd6e20b..b2665c4cc92ed 100644 --- a/src/test/ui/error-codes/E0509.rs +++ b/src/test/ui/error-codes/E0509.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct FancyNum { num: usize } diff --git a/src/test/ui/error-codes/E0509.stderr b/src/test/ui/error-codes/E0509.stderr index 3952081a2655b..b1f256d2d9e33 100644 --- a/src/test/ui/error-codes/E0509.stderr +++ b/src/test/ui/error-codes/E0509.stderr @@ -1,5 +1,5 @@ error[E0509]: cannot move out of type `DropStruct`, which implements the `Drop` trait - --> $DIR/E0509.rs:26:23 + --> $DIR/E0509.rs:16:23 | LL | let fancy_field = drop_struct.fancy; //~ ERROR E0509 | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0511.rs b/src/test/ui/error-codes/E0511.rs index c5c03f818253e..3590f12e5f94a 100644 --- a/src/test/ui/error-codes/E0511.rs +++ b/src/test/ui/error-codes/E0511.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(platform_intrinsics)] extern "platform-intrinsic" { diff --git a/src/test/ui/error-codes/E0511.stderr b/src/test/ui/error-codes/E0511.stderr index 1b8d125cf1a09..f1e3c0135bfb2 100644 --- a/src/test/ui/error-codes/E0511.stderr +++ b/src/test/ui/error-codes/E0511.stderr @@ -1,5 +1,5 @@ error[E0511]: invalid monomorphization of `simd_add` intrinsic: expected SIMD input type, found non-SIMD `i32` - --> $DIR/E0511.rs:18:14 + --> $DIR/E0511.rs:8:14 | LL | unsafe { simd_add(0, 1); } //~ ERROR E0511 | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0512.rs b/src/test/ui/error-codes/E0512.rs index 25f9627164131..e70992aee23a4 100644 --- a/src/test/ui/error-codes/E0512.rs +++ b/src/test/ui/error-codes/E0512.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn takes_u8(_: u8) {} fn main() { diff --git a/src/test/ui/error-codes/E0512.stderr b/src/test/ui/error-codes/E0512.stderr index c91f6ad8f0afd..5b07afc29190c 100644 --- a/src/test/ui/error-codes/E0512.stderr +++ b/src/test/ui/error-codes/E0512.stderr @@ -1,5 +1,5 @@ error[E0512]: transmute called with types of different sizes - --> $DIR/E0512.rs:14:23 + --> $DIR/E0512.rs:4:23 | LL | unsafe { takes_u8(::std::mem::transmute(0u16)); } //~ ERROR E0512 | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0516.rs b/src/test/ui/error-codes/E0516.rs index be2b89c5f396e..834bb630989ff 100644 --- a/src/test/ui/error-codes/E0516.rs +++ b/src/test/ui/error-codes/E0516.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x: typeof(92) = 92; //~ ERROR E0516 //~| reserved keyword diff --git a/src/test/ui/error-codes/E0516.stderr b/src/test/ui/error-codes/E0516.stderr index d298e288859dd..034c17933645c 100644 --- a/src/test/ui/error-codes/E0516.stderr +++ b/src/test/ui/error-codes/E0516.stderr @@ -1,5 +1,5 @@ error[E0516]: `typeof` is a reserved keyword but unimplemented - --> $DIR/E0516.rs:12:12 + --> $DIR/E0516.rs:2:12 | LL | let x: typeof(92) = 92; //~ ERROR E0516 | ^^^^^^^^^^ reserved keyword diff --git a/src/test/ui/error-codes/E0517.rs b/src/test/ui/error-codes/E0517.rs index 561223ccdf11e..1dcaa2d741f6f 100644 --- a/src/test/ui/error-codes/E0517.rs +++ b/src/test/ui/error-codes/E0517.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[repr(C)] //~ ERROR: E0517 type Foo = u8; diff --git a/src/test/ui/error-codes/E0517.stderr b/src/test/ui/error-codes/E0517.stderr index 4779fd08c684c..366ab1bca63fa 100644 --- a/src/test/ui/error-codes/E0517.stderr +++ b/src/test/ui/error-codes/E0517.stderr @@ -1,5 +1,5 @@ error[E0517]: attribute should be applied to struct, enum or union - --> $DIR/E0517.rs:11:8 + --> $DIR/E0517.rs:1:8 | LL | #[repr(C)] //~ ERROR: E0517 | ^ @@ -7,7 +7,7 @@ LL | type Foo = u8; | -------------- not a struct, enum or union error[E0517]: attribute should be applied to struct or union - --> $DIR/E0517.rs:14:8 + --> $DIR/E0517.rs:4:8 | LL | #[repr(packed)] //~ ERROR: E0517 | ^^^^^^ @@ -15,7 +15,7 @@ LL | enum Foo2 {Bar, Baz} | -------------------- not a struct or union error[E0517]: attribute should be applied to enum - --> $DIR/E0517.rs:17:8 + --> $DIR/E0517.rs:7:8 | LL | #[repr(u8)] //~ ERROR: E0517 | ^^ @@ -23,7 +23,7 @@ LL | struct Foo3 {bar: bool, baz: bool} | ---------------------------------- not an enum error[E0517]: attribute should be applied to struct, enum or union - --> $DIR/E0517.rs:20:8 + --> $DIR/E0517.rs:10:8 | LL | #[repr(C)] //~ ERROR: E0517 | ^ diff --git a/src/test/ui/error-codes/E0518.rs b/src/test/ui/error-codes/E0518.rs index 6d5b6e48e0dab..9c99702ada81f 100644 --- a/src/test/ui/error-codes/E0518.rs +++ b/src/test/ui/error-codes/E0518.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[inline(always)] //~ ERROR: E0518 struct Foo; diff --git a/src/test/ui/error-codes/E0518.stderr b/src/test/ui/error-codes/E0518.stderr index 27d5d3645fdfc..6391a69c24e8f 100644 --- a/src/test/ui/error-codes/E0518.stderr +++ b/src/test/ui/error-codes/E0518.stderr @@ -1,5 +1,5 @@ error[E0518]: attribute should be applied to function or closure - --> $DIR/E0518.rs:11:1 + --> $DIR/E0518.rs:1:1 | LL | #[inline(always)] //~ ERROR: E0518 | ^^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | struct Foo; | ----------- not a function or closure error[E0518]: attribute should be applied to function or closure - --> $DIR/E0518.rs:14:1 + --> $DIR/E0518.rs:4:1 | LL | #[inline(never)] //~ ERROR: E0518 | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0520.rs b/src/test/ui/error-codes/E0520.rs index eae5b11a81904..b746ca63590ec 100644 --- a/src/test/ui/error-codes/E0520.rs +++ b/src/test/ui/error-codes/E0520.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(specialization)] trait SpaceLlama { diff --git a/src/test/ui/error-codes/E0520.stderr b/src/test/ui/error-codes/E0520.stderr index 67ec1d427157e..72fc85ab1e74b 100644 --- a/src/test/ui/error-codes/E0520.stderr +++ b/src/test/ui/error-codes/E0520.stderr @@ -1,5 +1,5 @@ error[E0520]: `fly` specializes an item from a parent `impl`, but that item is not marked `default` - --> $DIR/E0520.rs:26:5 + --> $DIR/E0520.rs:16:5 | LL | / impl SpaceLlama for T { LL | | fn fly(&self) {} diff --git a/src/test/ui/error-codes/E0522.rs b/src/test/ui/error-codes/E0522.rs index c50cb759e05c2..1414e82408cef 100644 --- a/src/test/ui/error-codes/E0522.rs +++ b/src/test/ui/error-codes/E0522.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(lang_items)] #[lang = "cookie"] diff --git a/src/test/ui/error-codes/E0522.stderr b/src/test/ui/error-codes/E0522.stderr index 9f3f8968d734e..0a8a41598da92 100644 --- a/src/test/ui/error-codes/E0522.stderr +++ b/src/test/ui/error-codes/E0522.stderr @@ -1,5 +1,5 @@ error[E0522]: definition of an unknown language item: `cookie` - --> $DIR/E0522.rs:13:1 + --> $DIR/E0522.rs:3:1 | LL | #[lang = "cookie"] | ^^^^^^^^^^^^^^^^^^ definition of unknown language item `cookie` diff --git a/src/test/ui/error-codes/E0527.rs b/src/test/ui/error-codes/E0527.rs index a90ccec9cf5e9..af055ff269e3c 100644 --- a/src/test/ui/error-codes/E0527.rs +++ b/src/test/ui/error-codes/E0527.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let r = &[1, 2, 3, 4]; match r { diff --git a/src/test/ui/error-codes/E0527.stderr b/src/test/ui/error-codes/E0527.stderr index 1e764c185877b..a2e6288b21be2 100644 --- a/src/test/ui/error-codes/E0527.stderr +++ b/src/test/ui/error-codes/E0527.stderr @@ -1,5 +1,5 @@ error[E0527]: pattern requires 2 elements but array has 4 - --> $DIR/E0527.rs:14:10 + --> $DIR/E0527.rs:4:10 | LL | &[a, b] => { | ^^^^^^ expected 4 elements diff --git a/src/test/ui/error-codes/E0528.rs b/src/test/ui/error-codes/E0528.rs index e2aa2c067cbcd..f2681fa043dab 100644 --- a/src/test/ui/error-codes/E0528.rs +++ b/src/test/ui/error-codes/E0528.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(slice_patterns)] fn main() { diff --git a/src/test/ui/error-codes/E0528.stderr b/src/test/ui/error-codes/E0528.stderr index ca9f8f4545759..a7205af50542a 100644 --- a/src/test/ui/error-codes/E0528.stderr +++ b/src/test/ui/error-codes/E0528.stderr @@ -1,5 +1,5 @@ error[E0528]: pattern requires at least 3 elements but array has 2 - --> $DIR/E0528.rs:16:10 + --> $DIR/E0528.rs:6:10 | LL | &[a, b, c, rest..] => { | ^^^^^^^^^^^^^^^^^ pattern cannot match array of 2 elements diff --git a/src/test/ui/error-codes/E0529.rs b/src/test/ui/error-codes/E0529.rs index 2459054da89af..a82bc9ebcf451 100644 --- a/src/test/ui/error-codes/E0529.rs +++ b/src/test/ui/error-codes/E0529.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let r: f32 = 1.0; match r { diff --git a/src/test/ui/error-codes/E0529.stderr b/src/test/ui/error-codes/E0529.stderr index b2e7ae23fb0eb..96b22bb226381 100644 --- a/src/test/ui/error-codes/E0529.stderr +++ b/src/test/ui/error-codes/E0529.stderr @@ -1,5 +1,5 @@ error[E0529]: expected an array or slice, found `f32` - --> $DIR/E0529.rs:14:9 + --> $DIR/E0529.rs:4:9 | LL | [a, b] => { | ^^^^^^ pattern cannot match with input type `f32` diff --git a/src/test/ui/error-codes/E0530.rs b/src/test/ui/error-codes/E0530.rs index 4f674d0e67106..5bc40964f647b 100644 --- a/src/test/ui/error-codes/E0530.rs +++ b/src/test/ui/error-codes/E0530.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { static TEST: i32 = 0; diff --git a/src/test/ui/error-codes/E0530.stderr b/src/test/ui/error-codes/E0530.stderr index e157ca9042cd9..04f0a93ae438c 100644 --- a/src/test/ui/error-codes/E0530.stderr +++ b/src/test/ui/error-codes/E0530.stderr @@ -1,5 +1,5 @@ error[E0530]: match bindings cannot shadow statics - --> $DIR/E0530.rs:16:9 + --> $DIR/E0530.rs:6:9 | LL | static TEST: i32 = 0; | --------------------- a static `TEST` is defined here diff --git a/src/test/ui/error-codes/E0532.rs b/src/test/ui/error-codes/E0532.rs index 5dc3b5f94f386..931ca4628fe1d 100644 --- a/src/test/ui/error-codes/E0532.rs +++ b/src/test/ui/error-codes/E0532.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let value = 1; diff --git a/src/test/ui/error-codes/E0532.stderr b/src/test/ui/error-codes/E0532.stderr index faccd10ec6d07..887ede0a4124b 100644 --- a/src/test/ui/error-codes/E0532.stderr +++ b/src/test/ui/error-codes/E0532.stderr @@ -1,5 +1,5 @@ error[E0532]: expected tuple struct/variant, found constant `StructConst1` - --> $DIR/E0532.rs:15:9 + --> $DIR/E0532.rs:5:9 | LL | StructConst1(_) => { }, | ^^^^^^^^^^^^ not a tuple struct/variant diff --git a/src/test/ui/error-codes/E0534.rs b/src/test/ui/error-codes/E0534.rs index fc465b268691e..a424249941979 100644 --- a/src/test/ui/error-codes/E0534.rs +++ b/src/test/ui/error-codes/E0534.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[inline()] //~ ERROR E0534 pub fn something() {} diff --git a/src/test/ui/error-codes/E0534.stderr b/src/test/ui/error-codes/E0534.stderr index 30890882cc3e2..d2829e1643bbd 100644 --- a/src/test/ui/error-codes/E0534.stderr +++ b/src/test/ui/error-codes/E0534.stderr @@ -1,5 +1,5 @@ error[E0534]: expected one argument - --> $DIR/E0534.rs:11:1 + --> $DIR/E0534.rs:1:1 | LL | #[inline()] //~ ERROR E0534 | ^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0558.rs b/src/test/ui/error-codes/E0558.rs index 64a6ee4cf5872..26d16f685a047 100644 --- a/src/test/ui/error-codes/E0558.rs +++ b/src/test/ui/error-codes/E0558.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[export_name] //~^ ERROR E0558 diff --git a/src/test/ui/error-codes/E0558.stderr b/src/test/ui/error-codes/E0558.stderr index 0777c44058fe8..95bd9a1a828f2 100644 --- a/src/test/ui/error-codes/E0558.stderr +++ b/src/test/ui/error-codes/E0558.stderr @@ -1,5 +1,5 @@ error[E0558]: `export_name` attribute has invalid format - --> $DIR/E0558.rs:11:1 + --> $DIR/E0558.rs:1:1 | LL | #[export_name] | ^^^^^^^^^^^^^^ did you mean #[export_name="*"]? diff --git a/src/test/ui/error-codes/E0559.rs b/src/test/ui/error-codes/E0559.rs index da0f692cc2839..c6d04ff148a0c 100644 --- a/src/test/ui/error-codes/E0559.rs +++ b/src/test/ui/error-codes/E0559.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Field { Fool { x: u32 }, } diff --git a/src/test/ui/error-codes/E0559.stderr b/src/test/ui/error-codes/E0559.stderr index cb9059ee53803..63ee1cd78201a 100644 --- a/src/test/ui/error-codes/E0559.stderr +++ b/src/test/ui/error-codes/E0559.stderr @@ -1,5 +1,5 @@ error[E0559]: variant `Field::Fool` has no field named `joke` - --> $DIR/E0559.rs:16:27 + --> $DIR/E0559.rs:6:27 | LL | let s = Field::Fool { joke: 0 }; | ^^^^ `Field::Fool` does not have this field diff --git a/src/test/ui/error-codes/E0560.rs b/src/test/ui/error-codes/E0560.rs index bbb7f08d62e35..1d60f8948ab15 100644 --- a/src/test/ui/error-codes/E0560.rs +++ b/src/test/ui/error-codes/E0560.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Simba { mother: u32, } diff --git a/src/test/ui/error-codes/E0560.stderr b/src/test/ui/error-codes/E0560.stderr index 66fb04111dbdf..6b634f1855dc1 100644 --- a/src/test/ui/error-codes/E0560.stderr +++ b/src/test/ui/error-codes/E0560.stderr @@ -1,5 +1,5 @@ error[E0560]: struct `Simba` has no field named `father` - --> $DIR/E0560.rs:16:32 + --> $DIR/E0560.rs:6:32 | LL | let s = Simba { mother: 1, father: 0 }; | ^^^^^^ `Simba` does not have this field diff --git a/src/test/ui/error-codes/E0565-1.rs b/src/test/ui/error-codes/E0565-1.rs index d7cbb82301324..30fba019199e3 100644 --- a/src/test/ui/error-codes/E0565-1.rs +++ b/src/test/ui/error-codes/E0565-1.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // deprecated doesn't currently support literals #[deprecated("since")] //~ ERROR E0565 fn f() { } diff --git a/src/test/ui/error-codes/E0565-1.stderr b/src/test/ui/error-codes/E0565-1.stderr index 2a9bf92e9dd48..0ff6a084736fe 100644 --- a/src/test/ui/error-codes/E0565-1.stderr +++ b/src/test/ui/error-codes/E0565-1.stderr @@ -1,5 +1,5 @@ error[E0565]: unsupported literal - --> $DIR/E0565-1.rs:12:14 + --> $DIR/E0565-1.rs:2:14 | LL | #[deprecated("since")] //~ ERROR E0565 | ^^^^^^^ diff --git a/src/test/ui/error-codes/E0565.rs b/src/test/ui/error-codes/E0565.rs index af8b10edab8a5..b09f5df5201b1 100644 --- a/src/test/ui/error-codes/E0565.rs +++ b/src/test/ui/error-codes/E0565.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // repr currently doesn't support literals #[repr("C")] //~ ERROR E0565 struct A { } diff --git a/src/test/ui/error-codes/E0565.stderr b/src/test/ui/error-codes/E0565.stderr index abea4290f0a68..642ee91282dbf 100644 --- a/src/test/ui/error-codes/E0565.stderr +++ b/src/test/ui/error-codes/E0565.stderr @@ -1,5 +1,5 @@ error[E0565]: unsupported literal - --> $DIR/E0565.rs:12:8 + --> $DIR/E0565.rs:2:8 | LL | #[repr("C")] //~ ERROR E0565 | ^^^ diff --git a/src/test/ui/error-codes/E0572.rs b/src/test/ui/error-codes/E0572.rs index bbaab102de7db..cb842c9334dc4 100644 --- a/src/test/ui/error-codes/E0572.rs +++ b/src/test/ui/error-codes/E0572.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const FOO: u32 = return 0; //~ ERROR E0572 fn main() {} diff --git a/src/test/ui/error-codes/E0572.stderr b/src/test/ui/error-codes/E0572.stderr index b2896c3892d3a..295a518c336dc 100644 --- a/src/test/ui/error-codes/E0572.stderr +++ b/src/test/ui/error-codes/E0572.stderr @@ -1,5 +1,5 @@ error[E0572]: return statement outside of function body - --> $DIR/E0572.rs:11:18 + --> $DIR/E0572.rs:1:18 | LL | const FOO: u32 = return 0; //~ ERROR E0572 | ^^^^^^^^ diff --git a/src/test/ui/error-codes/E0582.rs b/src/test/ui/error-codes/E0582.rs index 5e6f65a18f46a..ff25012d0f925 100644 --- a/src/test/ui/error-codes/E0582.rs +++ b/src/test/ui/error-codes/E0582.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test was derived from the wasm and parsell crates. They // stopped compiling when #32330 is fixed. diff --git a/src/test/ui/error-codes/E0582.stderr b/src/test/ui/error-codes/E0582.stderr index c92e0b9f13708..81a2f004653d2 100644 --- a/src/test/ui/error-codes/E0582.stderr +++ b/src/test/ui/error-codes/E0582.stderr @@ -1,11 +1,11 @@ error[E0582]: binding for associated type `Output` references lifetime `'a`, which does not appear in the trait input types - --> $DIR/E0582.rs:38:30 + --> $DIR/E0582.rs:28:30 | LL | where F: for<'a> Fn() -> Option<&'a i32> | ^^^^^^^^^^^^^^^ error[E0582]: binding for associated type `Item` references lifetime `'a`, which does not appear in the trait input types - --> $DIR/E0582.rs:46:31 + --> $DIR/E0582.rs:36:31 | LL | where F: for<'a> Iterator | ^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0585.rs b/src/test/ui/error-codes/E0585.rs index 1acaf8c0b78b6..890b77b533afb 100644 --- a/src/test/ui/error-codes/E0585.rs +++ b/src/test/ui/error-codes/E0585.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { /// Hello! I'm useless... //~^ ERROR E0585 diff --git a/src/test/ui/error-codes/E0585.stderr b/src/test/ui/error-codes/E0585.stderr index ef0825939c360..7a31c4896ee8e 100644 --- a/src/test/ui/error-codes/E0585.stderr +++ b/src/test/ui/error-codes/E0585.stderr @@ -1,5 +1,5 @@ error[E0585]: found a documentation comment that doesn't document anything - --> $DIR/E0585.rs:12:5 + --> $DIR/E0585.rs:2:5 | LL | /// Hello! I'm useless... | ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0586.rs b/src/test/ui/error-codes/E0586.rs index c1bfc5c73a1b3..2ab8a2959e33d 100644 --- a/src/test/ui/error-codes/E0586.rs +++ b/src/test/ui/error-codes/E0586.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let tmp = vec![0, 1, 2, 3, 4, 4, 3, 3, 2, 1]; let x = &tmp[1..=]; //~ ERROR E0586 diff --git a/src/test/ui/error-codes/E0586.stderr b/src/test/ui/error-codes/E0586.stderr index bd72fbee16047..394b4be3340f5 100644 --- a/src/test/ui/error-codes/E0586.stderr +++ b/src/test/ui/error-codes/E0586.stderr @@ -1,5 +1,5 @@ error[E0586]: inclusive range with no end - --> $DIR/E0586.rs:13:22 + --> $DIR/E0586.rs:3:22 | LL | let x = &tmp[1..=]; //~ ERROR E0586 | ^ diff --git a/src/test/ui/error-codes/E0597.nll.stderr b/src/test/ui/error-codes/E0597.nll.stderr index 31ba24b0004fb..a8173ce69d37e 100644 --- a/src/test/ui/error-codes/E0597.nll.stderr +++ b/src/test/ui/error-codes/E0597.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `y` does not live long enough - --> $DIR/E0597.rs:18:16 + --> $DIR/E0597.rs:8:16 | LL | x.x = Some(&y); | ^^ borrowed value does not live long enough diff --git a/src/test/ui/error-codes/E0597.rs b/src/test/ui/error-codes/E0597.rs index e70213e19c34c..7217e351281da 100644 --- a/src/test/ui/error-codes/E0597.rs +++ b/src/test/ui/error-codes/E0597.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo<'a> { x: Option<&'a u32>, } diff --git a/src/test/ui/error-codes/E0597.stderr b/src/test/ui/error-codes/E0597.stderr index 5897cc13c94eb..a5b0cc49d0c83 100644 --- a/src/test/ui/error-codes/E0597.stderr +++ b/src/test/ui/error-codes/E0597.stderr @@ -1,5 +1,5 @@ error[E0597]: `y` does not live long enough - --> $DIR/E0597.rs:18:17 + --> $DIR/E0597.rs:8:17 | LL | x.x = Some(&y); | ^ borrowed value does not live long enough diff --git a/src/test/ui/error-codes/E0599.rs b/src/test/ui/error-codes/E0599.rs index 30fca2bac03cc..a2d7bb2dcbe0e 100644 --- a/src/test/ui/error-codes/E0599.rs +++ b/src/test/ui/error-codes/E0599.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo; fn main() { diff --git a/src/test/ui/error-codes/E0599.stderr b/src/test/ui/error-codes/E0599.stderr index d118939d17a15..5a7cddbf38210 100644 --- a/src/test/ui/error-codes/E0599.stderr +++ b/src/test/ui/error-codes/E0599.stderr @@ -1,5 +1,5 @@ error[E0599]: no associated item named `NotEvenReal` found for type `Foo` in the current scope - --> $DIR/E0599.rs:14:15 + --> $DIR/E0599.rs:4:15 | LL | struct Foo; | ----------- associated item `NotEvenReal` not found for this diff --git a/src/test/ui/error-codes/E0600.rs b/src/test/ui/error-codes/E0600.rs index 5457ff266086f..7731d86193540 100644 --- a/src/test/ui/error-codes/E0600.rs +++ b/src/test/ui/error-codes/E0600.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { !"a"; //~ ERROR E0600 } diff --git a/src/test/ui/error-codes/E0600.stderr b/src/test/ui/error-codes/E0600.stderr index c29ec4fe6ae76..6c6d922290fc6 100644 --- a/src/test/ui/error-codes/E0600.stderr +++ b/src/test/ui/error-codes/E0600.stderr @@ -1,5 +1,5 @@ error[E0600]: cannot apply unary operator `!` to type `&'static str` - --> $DIR/E0600.rs:12:5 + --> $DIR/E0600.rs:2:5 | LL | !"a"; //~ ERROR E0600 | ^^^^ cannot apply unary operator `!` diff --git a/src/test/ui/error-codes/E0601.rs b/src/test/ui/error-codes/E0601.rs index 37b3f523475fc..47feb7f836722 100644 --- a/src/test/ui/error-codes/E0601.rs +++ b/src/test/ui/error-codes/E0601.rs @@ -1,11 +1 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test for main function not found. diff --git a/src/test/ui/error-codes/E0602.rs b/src/test/ui/error-codes/E0602.rs index cc3e436d43349..8fadce526d9aa 100644 --- a/src/test/ui/error-codes/E0602.rs +++ b/src/test/ui/error-codes/E0602.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-D bogus // error-pattern:E0602 diff --git a/src/test/ui/error-codes/E0603.rs b/src/test/ui/error-codes/E0603.rs index 1cc9f6bfa7dbe..24a9ba8876369 100644 --- a/src/test/ui/error-codes/E0603.rs +++ b/src/test/ui/error-codes/E0603.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod SomeModule { const PRIVATE: u32 = 0x_a_bad_1dea_u32; } diff --git a/src/test/ui/error-codes/E0603.stderr b/src/test/ui/error-codes/E0603.stderr index 3447f3378294e..07a05acf20ef1 100644 --- a/src/test/ui/error-codes/E0603.stderr +++ b/src/test/ui/error-codes/E0603.stderr @@ -1,5 +1,5 @@ error[E0603]: constant `PRIVATE` is private - --> $DIR/E0603.rs:16:5 + --> $DIR/E0603.rs:6:5 | LL | SomeModule::PRIVATE; //~ ERROR E0603 | ^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0604.rs b/src/test/ui/error-codes/E0604.rs index c5bf3a77b6c8f..b9c0d1f924d85 100644 --- a/src/test/ui/error-codes/E0604.rs +++ b/src/test/ui/error-codes/E0604.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { 1u32 as char; //~ ERROR E0604 } diff --git a/src/test/ui/error-codes/E0604.stderr b/src/test/ui/error-codes/E0604.stderr index 6aa176d1313bd..2bd92db86e363 100644 --- a/src/test/ui/error-codes/E0604.stderr +++ b/src/test/ui/error-codes/E0604.stderr @@ -1,5 +1,5 @@ error[E0604]: only `u8` can be cast as `char`, not `u32` - --> $DIR/E0604.rs:12:5 + --> $DIR/E0604.rs:2:5 | LL | 1u32 as char; //~ ERROR E0604 | ^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0605.rs b/src/test/ui/error-codes/E0605.rs index 4b5b8beb36865..0e86e367e8328 100644 --- a/src/test/ui/error-codes/E0605.rs +++ b/src/test/ui/error-codes/E0605.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = 0u8; x as Vec; //~ ERROR E0605 diff --git a/src/test/ui/error-codes/E0605.stderr b/src/test/ui/error-codes/E0605.stderr index e66e1c12d8f74..4dc074b222ac8 100644 --- a/src/test/ui/error-codes/E0605.stderr +++ b/src/test/ui/error-codes/E0605.stderr @@ -1,5 +1,5 @@ error[E0605]: non-primitive cast: `u8` as `std::vec::Vec` - --> $DIR/E0605.rs:13:5 + --> $DIR/E0605.rs:3:5 | LL | x as Vec; //~ ERROR E0605 | ^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | x as Vec; //~ ERROR E0605 = note: an `as` expression can only be used to convert between primitive types. Consider using the `From` trait error[E0605]: non-primitive cast: `*const u8` as `&u8` - --> $DIR/E0605.rs:16:5 + --> $DIR/E0605.rs:6:5 | LL | v as &u8; //~ ERROR E0605 | ^^^^^^^^ diff --git a/src/test/ui/error-codes/E0606.rs b/src/test/ui/error-codes/E0606.rs index 55071736bfe51..cb0d8cfc31e23 100644 --- a/src/test/ui/error-codes/E0606.rs +++ b/src/test/ui/error-codes/E0606.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { &0u8 as u8; //~ ERROR E0606 } diff --git a/src/test/ui/error-codes/E0606.stderr b/src/test/ui/error-codes/E0606.stderr index bd5bc908f7294..bc872b3b79cce 100644 --- a/src/test/ui/error-codes/E0606.stderr +++ b/src/test/ui/error-codes/E0606.stderr @@ -1,11 +1,11 @@ error[E0606]: casting `&u8` as `u8` is invalid - --> $DIR/E0606.rs:12:5 + --> $DIR/E0606.rs:2:5 | LL | &0u8 as u8; //~ ERROR E0606 | ^^^^^^^^^^ cannot cast `&u8` as `u8` | help: did you mean `*&0u8`? - --> $DIR/E0606.rs:12:5 + --> $DIR/E0606.rs:2:5 | LL | &0u8 as u8; //~ ERROR E0606 | ^^^^ diff --git a/src/test/ui/error-codes/E0607.rs b/src/test/ui/error-codes/E0607.rs index fa761f2c17896..ad9f8709b07f2 100644 --- a/src/test/ui/error-codes/E0607.rs +++ b/src/test/ui/error-codes/E0607.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let v = 0 as *const u8; v as *const [u8]; //~ ERROR E0607 diff --git a/src/test/ui/error-codes/E0607.stderr b/src/test/ui/error-codes/E0607.stderr index d109908bc746f..1fbe4b9c5bccb 100644 --- a/src/test/ui/error-codes/E0607.stderr +++ b/src/test/ui/error-codes/E0607.stderr @@ -1,5 +1,5 @@ error[E0607]: cannot cast thin pointer `*const u8` to fat pointer `*const [u8]` - --> $DIR/E0607.rs:13:5 + --> $DIR/E0607.rs:3:5 | LL | v as *const [u8]; //~ ERROR E0607 | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0608.rs b/src/test/ui/error-codes/E0608.rs index d47356a97eeda..1e342d6685f97 100644 --- a/src/test/ui/error-codes/E0608.rs +++ b/src/test/ui/error-codes/E0608.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { 0u8[2]; //~ ERROR E0608 } diff --git a/src/test/ui/error-codes/E0608.stderr b/src/test/ui/error-codes/E0608.stderr index d5955d1b07077..b228b2eddfd9e 100644 --- a/src/test/ui/error-codes/E0608.stderr +++ b/src/test/ui/error-codes/E0608.stderr @@ -1,5 +1,5 @@ error[E0608]: cannot index into a value of type `u8` - --> $DIR/E0608.rs:12:5 + --> $DIR/E0608.rs:2:5 | LL | 0u8[2]; //~ ERROR E0608 | ^^^^^^ diff --git a/src/test/ui/error-codes/E0609.rs b/src/test/ui/error-codes/E0609.rs index ddfd9d5f21ab2..e3a97f2fb265d 100644 --- a/src/test/ui/error-codes/E0609.rs +++ b/src/test/ui/error-codes/E0609.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { x: u32, } diff --git a/src/test/ui/error-codes/E0609.stderr b/src/test/ui/error-codes/E0609.stderr index dd793b29febef..b5cf09b2201d0 100644 --- a/src/test/ui/error-codes/E0609.stderr +++ b/src/test/ui/error-codes/E0609.stderr @@ -1,5 +1,5 @@ error[E0609]: no field `foo` on type `Foo` - --> $DIR/E0609.rs:18:15 + --> $DIR/E0609.rs:8:15 | LL | let _ = x.foo; //~ ERROR E0609 | ^^^ unknown field @@ -7,7 +7,7 @@ LL | let _ = x.foo; //~ ERROR E0609 = note: available fields are: `x` error[E0609]: no field `1` on type `Bar` - --> $DIR/E0609.rs:21:7 + --> $DIR/E0609.rs:11:7 | LL | y.1; //~ ERROR E0609 | ^ unknown field diff --git a/src/test/ui/error-codes/E0610.rs b/src/test/ui/error-codes/E0610.rs index 522d8b0b9438f..de246f3712e40 100644 --- a/src/test/ui/error-codes/E0610.rs +++ b/src/test/ui/error-codes/E0610.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = 0; let _ = x.foo; //~ ERROR E0610 diff --git a/src/test/ui/error-codes/E0610.stderr b/src/test/ui/error-codes/E0610.stderr index 3f1cda3b447d7..c46b1f2b2d562 100644 --- a/src/test/ui/error-codes/E0610.stderr +++ b/src/test/ui/error-codes/E0610.stderr @@ -1,5 +1,5 @@ error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields - --> $DIR/E0610.rs:13:15 + --> $DIR/E0610.rs:3:15 | LL | let _ = x.foo; //~ ERROR E0610 | ^^^ diff --git a/src/test/ui/error-codes/E0614.rs b/src/test/ui/error-codes/E0614.rs index 909f0eb828558..6b4817b692e1d 100644 --- a/src/test/ui/error-codes/E0614.rs +++ b/src/test/ui/error-codes/E0614.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let y = 0u32; *y; //~ ERROR E0614 diff --git a/src/test/ui/error-codes/E0614.stderr b/src/test/ui/error-codes/E0614.stderr index 571d6e76776a1..5b1a4a93c4c0d 100644 --- a/src/test/ui/error-codes/E0614.stderr +++ b/src/test/ui/error-codes/E0614.stderr @@ -1,5 +1,5 @@ error[E0614]: type `u32` cannot be dereferenced - --> $DIR/E0614.rs:13:5 + --> $DIR/E0614.rs:3:5 | LL | *y; //~ ERROR E0614 | ^^ diff --git a/src/test/ui/error-codes/E0615.rs b/src/test/ui/error-codes/E0615.rs index abfa93d2fd0c1..d04e4d5f7e184 100644 --- a/src/test/ui/error-codes/E0615.rs +++ b/src/test/ui/error-codes/E0615.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { x: u32, } diff --git a/src/test/ui/error-codes/E0615.stderr b/src/test/ui/error-codes/E0615.stderr index 88317a34ee3f3..423948666db68 100644 --- a/src/test/ui/error-codes/E0615.stderr +++ b/src/test/ui/error-codes/E0615.stderr @@ -1,5 +1,5 @@ error[E0615]: attempted to take value of method `method` on type `Foo` - --> $DIR/E0615.rs:21:7 + --> $DIR/E0615.rs:11:7 | LL | f.method; //~ ERROR E0615 | ^^^^^^ diff --git a/src/test/ui/error-codes/E0616.rs b/src/test/ui/error-codes/E0616.rs index 2fd9f94763d8d..98f87a83bc544 100644 --- a/src/test/ui/error-codes/E0616.rs +++ b/src/test/ui/error-codes/E0616.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod a { pub struct Foo { x: u32, diff --git a/src/test/ui/error-codes/E0616.stderr b/src/test/ui/error-codes/E0616.stderr index 26525863c0d8c..f600bfa8cd31f 100644 --- a/src/test/ui/error-codes/E0616.stderr +++ b/src/test/ui/error-codes/E0616.stderr @@ -1,5 +1,5 @@ error[E0616]: field `x` of struct `a::Foo` is private - --> $DIR/E0616.rs:23:5 + --> $DIR/E0616.rs:13:5 | LL | f.x; //~ ERROR E0616 | ^^^ diff --git a/src/test/ui/error-codes/E0617.rs b/src/test/ui/error-codes/E0617.rs index 9375fd9cade35..9eed1225ab82d 100644 --- a/src/test/ui/error-codes/E0617.rs +++ b/src/test/ui/error-codes/E0617.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength extern { diff --git a/src/test/ui/error-codes/E0617.stderr b/src/test/ui/error-codes/E0617.stderr index 114220532c3f0..486ca1fa92f15 100644 --- a/src/test/ui/error-codes/E0617.stderr +++ b/src/test/ui/error-codes/E0617.stderr @@ -1,35 +1,35 @@ error[E0617]: can't pass `f32` to variadic function - --> $DIR/E0617.rs:19:36 + --> $DIR/E0617.rs:9:36 | LL | printf(::std::ptr::null(), 0f32); | ^^^^ help: cast the value to `c_double`: `0f32 as c_double` error[E0617]: can't pass `i8` to variadic function - --> $DIR/E0617.rs:22:36 + --> $DIR/E0617.rs:12:36 | LL | printf(::std::ptr::null(), 0i8); | ^^^ help: cast the value to `c_int`: `0i8 as c_int` error[E0617]: can't pass `i16` to variadic function - --> $DIR/E0617.rs:25:36 + --> $DIR/E0617.rs:15:36 | LL | printf(::std::ptr::null(), 0i16); | ^^^^ help: cast the value to `c_int`: `0i16 as c_int` error[E0617]: can't pass `u8` to variadic function - --> $DIR/E0617.rs:28:36 + --> $DIR/E0617.rs:18:36 | LL | printf(::std::ptr::null(), 0u8); | ^^^ help: cast the value to `c_uint`: `0u8 as c_uint` error[E0617]: can't pass `u16` to variadic function - --> $DIR/E0617.rs:31:36 + --> $DIR/E0617.rs:21:36 | LL | printf(::std::ptr::null(), 0u16); | ^^^^ help: cast the value to `c_uint`: `0u16 as c_uint` error[E0617]: can't pass `unsafe extern "C" fn(*const i8, ...) {printf}` to variadic function - --> $DIR/E0617.rs:34:36 + --> $DIR/E0617.rs:24:36 | LL | printf(::std::ptr::null(), printf); | ^^^^^^ diff --git a/src/test/ui/error-codes/E0618.rs b/src/test/ui/error-codes/E0618.rs index f46bdb9980142..2616e7134c5d3 100644 --- a/src/test/ui/error-codes/E0618.rs +++ b/src/test/ui/error-codes/E0618.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum X { Entry, } diff --git a/src/test/ui/error-codes/E0618.stderr b/src/test/ui/error-codes/E0618.stderr index ef7ace44d59a6..d0dd06b05f82b 100644 --- a/src/test/ui/error-codes/E0618.stderr +++ b/src/test/ui/error-codes/E0618.stderr @@ -1,5 +1,5 @@ error[E0618]: expected function, found enum variant `X::Entry` - --> $DIR/E0618.rs:16:5 + --> $DIR/E0618.rs:6:5 | LL | Entry, | ----- `X::Entry` defined here @@ -12,7 +12,7 @@ LL | X::Entry; | ^^^^^^^^ error[E0618]: expected function, found `i32` - --> $DIR/E0618.rs:19:5 + --> $DIR/E0618.rs:9:5 | LL | let x = 0i32; | - `i32` defined here diff --git a/src/test/ui/error-codes/E0620.rs b/src/test/ui/error-codes/E0620.rs index 5e945dfa5c820..2831413eab0fa 100644 --- a/src/test/ui/error-codes/E0620.rs +++ b/src/test/ui/error-codes/E0620.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let _foo = &[1_usize, 2] as [usize]; //~ ERROR E0620 } diff --git a/src/test/ui/error-codes/E0620.stderr b/src/test/ui/error-codes/E0620.stderr index f7450a3313866..f7319a878c27a 100644 --- a/src/test/ui/error-codes/E0620.stderr +++ b/src/test/ui/error-codes/E0620.stderr @@ -1,11 +1,11 @@ error[E0620]: cast to unsized type: `&[usize; 2]` as `[usize]` - --> $DIR/E0620.rs:12:16 + --> $DIR/E0620.rs:2:16 | LL | let _foo = &[1_usize, 2] as [usize]; //~ ERROR E0620 | ^^^^^^^^^^^^^^^^^^^^^^^^ | help: consider using an implicit coercion to `&[usize]` instead - --> $DIR/E0620.rs:12:16 + --> $DIR/E0620.rs:2:16 | LL | let _foo = &[1_usize, 2] as [usize]; //~ ERROR E0620 | ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.nll.stderr b/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.nll.stderr index caedc79d80732..3803a5140b9e6 100644 --- a/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.nll.stderr +++ b/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/E0621-does-not-trigger-for-closures.rs:25:5 + --> $DIR/E0621-does-not-trigger-for-closures.rs:15:5 | LL | invoke(&x, |a, b| if a > b { a } else { b }); //~ ERROR E0495 | ^^^^^^ error: unsatisfied lifetime constraints - --> $DIR/E0621-does-not-trigger-for-closures.rs:25:45 + --> $DIR/E0621-does-not-trigger-for-closures.rs:15:45 | LL | invoke(&x, |a, b| if a > b { a } else { b }); //~ ERROR E0495 | -- ^ returning this value requires that `'1` must outlive `'2` diff --git a/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.rs b/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.rs index 980461bedae55..c58744d386ca5 100644 --- a/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.rs +++ b/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we give the generic E0495 when one of the free regions is // bound in a closure (rather than suggesting a change to the signature // of the closure, which is not specified in `foo` but rather in `invoke`). diff --git a/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.stderr b/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.stderr index 58f0ede630806..f763c82eff80a 100644 --- a/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.stderr +++ b/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.stderr @@ -1,26 +1,26 @@ error[E0495]: cannot infer an appropriate lifetime for lifetime parameter `'a` due to conflicting requirements - --> $DIR/E0621-does-not-trigger-for-closures.rs:25:5 + --> $DIR/E0621-does-not-trigger-for-closures.rs:15:5 | LL | invoke(&x, |a, b| if a > b { a } else { b }); //~ ERROR E0495 | ^^^^^^ | -note: first, the lifetime cannot outlive the anonymous lifetime #2 defined on the body at 25:16... - --> $DIR/E0621-does-not-trigger-for-closures.rs:25:16 +note: first, the lifetime cannot outlive the anonymous lifetime #2 defined on the body at 15:16... + --> $DIR/E0621-does-not-trigger-for-closures.rs:15:16 | LL | invoke(&x, |a, b| if a > b { a } else { b }); //~ ERROR E0495 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ note: ...so that reference does not outlive borrowed content - --> $DIR/E0621-does-not-trigger-for-closures.rs:25:45 + --> $DIR/E0621-does-not-trigger-for-closures.rs:15:45 | LL | invoke(&x, |a, b| if a > b { a } else { b }); //~ ERROR E0495 | ^ -note: but, the lifetime must be valid for the call at 25:5... - --> $DIR/E0621-does-not-trigger-for-closures.rs:25:5 +note: but, the lifetime must be valid for the call at 15:5... + --> $DIR/E0621-does-not-trigger-for-closures.rs:15:5 | LL | invoke(&x, |a, b| if a > b { a } else { b }); //~ ERROR E0495 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ note: ...so type `&i32` of expression is valid during the expression - --> $DIR/E0621-does-not-trigger-for-closures.rs:25:5 + --> $DIR/E0621-does-not-trigger-for-closures.rs:15:5 | LL | invoke(&x, |a, b| if a > b { a } else { b }); //~ ERROR E0495 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0622.rs b/src/test/ui/error-codes/E0622.rs index f2bde5b03648b..ae7378a707e5c 100644 --- a/src/test/ui/error-codes/E0622.rs +++ b/src/test/ui/error-codes/E0622.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(intrinsics)] extern "rust-intrinsic" { pub static breakpoint : unsafe extern "rust-intrinsic" fn(); diff --git a/src/test/ui/error-codes/E0622.stderr b/src/test/ui/error-codes/E0622.stderr index ef13084dea04b..8466dfe3848c2 100644 --- a/src/test/ui/error-codes/E0622.stderr +++ b/src/test/ui/error-codes/E0622.stderr @@ -1,5 +1,5 @@ error[E0622]: intrinsic must be a function - --> $DIR/E0622.rs:13:5 + --> $DIR/E0622.rs:3:5 | LL | pub static breakpoint : unsafe extern "rust-intrinsic" fn(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected a function diff --git a/src/test/ui/error-codes/E0624.rs b/src/test/ui/error-codes/E0624.rs index 952e0b31c4ca1..45f72a565ca1b 100644 --- a/src/test/ui/error-codes/E0624.rs +++ b/src/test/ui/error-codes/E0624.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod inner { pub struct Foo; diff --git a/src/test/ui/error-codes/E0624.stderr b/src/test/ui/error-codes/E0624.stderr index ac911b9b7c0b7..31a2f607e582f 100644 --- a/src/test/ui/error-codes/E0624.stderr +++ b/src/test/ui/error-codes/E0624.stderr @@ -1,5 +1,5 @@ error[E0624]: method `method` is private - --> $DIR/E0624.rs:21:9 + --> $DIR/E0624.rs:11:9 | LL | foo.method(); //~ ERROR method `method` is private [E0624] | ^^^^^^ diff --git a/src/test/ui/error-codes/E0637.rs b/src/test/ui/error-codes/E0637.rs index ee6a978d169a3..4862029ea1936 100644 --- a/src/test/ui/error-codes/E0637.rs +++ b/src/test/ui/error-codes/E0637.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo<'a: '_>(&'a u8); //~ ERROR invalid lifetime bound name: `'_` fn foo<'a: '_>(_: &'a u8) {} //~ ERROR invalid lifetime bound name: `'_` diff --git a/src/test/ui/error-codes/E0637.stderr b/src/test/ui/error-codes/E0637.stderr index 245729376df36..4cf0fe9ff5c74 100644 --- a/src/test/ui/error-codes/E0637.stderr +++ b/src/test/ui/error-codes/E0637.stderr @@ -1,17 +1,17 @@ error[E0637]: invalid lifetime bound name: `'_` - --> $DIR/E0637.rs:11:16 + --> $DIR/E0637.rs:1:16 | LL | struct Foo<'a: '_>(&'a u8); //~ ERROR invalid lifetime bound name: `'_` | ^^ `'_` is a reserved lifetime name error[E0637]: invalid lifetime bound name: `'_` - --> $DIR/E0637.rs:12:12 + --> $DIR/E0637.rs:2:12 | LL | fn foo<'a: '_>(_: &'a u8) {} //~ ERROR invalid lifetime bound name: `'_` | ^^ `'_` is a reserved lifetime name error[E0637]: invalid lifetime bound name: `'_` - --> $DIR/E0637.rs:15:10 + --> $DIR/E0637.rs:5:10 | LL | impl<'a: '_> Bar<'a> { //~ ERROR invalid lifetime bound name: `'_` | ^^ `'_` is a reserved lifetime name diff --git a/src/test/ui/error-codes/E0646.rs b/src/test/ui/error-codes/E0646.rs index 5fc711d94086b..bb62428f53fda 100644 --- a/src/test/ui/error-codes/E0646.rs +++ b/src/test/ui/error-codes/E0646.rs @@ -1,11 +1 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() where (): Copy {} //~ ERROR [E0646] diff --git a/src/test/ui/error-codes/E0646.stderr b/src/test/ui/error-codes/E0646.stderr index 7b2de775a10cd..502200c1d008e 100644 --- a/src/test/ui/error-codes/E0646.stderr +++ b/src/test/ui/error-codes/E0646.stderr @@ -1,5 +1,5 @@ error[E0646]: `main` function is not allowed to have a `where` clause - --> $DIR/E0646.rs:11:17 + --> $DIR/E0646.rs:1:17 | LL | fn main() where (): Copy {} //~ ERROR [E0646] | ^^^^^^^^ `main` cannot have a `where` clause diff --git a/src/test/ui/error-codes/E0647.rs b/src/test/ui/error-codes/E0647.rs index 0a0ffefdf952a..fc085511cbcb0 100644 --- a/src/test/ui/error-codes/E0647.rs +++ b/src/test/ui/error-codes/E0647.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![no_std] #![feature(start)] diff --git a/src/test/ui/error-codes/E0647.stderr b/src/test/ui/error-codes/E0647.stderr index afd37a7edf467..da9ba5bf34bcf 100644 --- a/src/test/ui/error-codes/E0647.stderr +++ b/src/test/ui/error-codes/E0647.stderr @@ -1,5 +1,5 @@ error[E0647]: start function is not allowed to have a `where` clause - --> $DIR/E0647.rs:17:56 + --> $DIR/E0647.rs:7:56 | LL | fn start(_: isize, _: *const *const u8) -> isize where (): Copy { //~ ERROR [E0647] | ^^^^^^^^ start function cannot have a `where` clause diff --git a/src/test/ui/error-codes/E0648.rs b/src/test/ui/error-codes/E0648.rs index d3eac60de9979..8408a78c7a634 100644 --- a/src/test/ui/error-codes/E0648.rs +++ b/src/test/ui/error-codes/E0648.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[export_name="\0foo"] //~ ERROR E0648 pub fn bar() {} diff --git a/src/test/ui/error-codes/E0648.stderr b/src/test/ui/error-codes/E0648.stderr index 1e11705e9b980..090157fb0d778 100644 --- a/src/test/ui/error-codes/E0648.stderr +++ b/src/test/ui/error-codes/E0648.stderr @@ -1,5 +1,5 @@ error[E0648]: `export_name` may not contain null characters - --> $DIR/E0648.rs:11:1 + --> $DIR/E0648.rs:1:1 | LL | #[export_name="/0foo"] //~ ERROR E0648 | ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0657.rs b/src/test/ui/error-codes/E0657.rs index af91c9e264911..cb11de13f73c6 100644 --- a/src/test/ui/error-codes/E0657.rs +++ b/src/test/ui/error-codes/E0657.rs @@ -1,12 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![allow(warnings)] trait Id {} diff --git a/src/test/ui/error-codes/E0657.stderr b/src/test/ui/error-codes/E0657.stderr index 737ae3a163ac2..df76b45a5891f 100644 --- a/src/test/ui/error-codes/E0657.stderr +++ b/src/test/ui/error-codes/E0657.stderr @@ -1,11 +1,11 @@ error[E0657]: `impl Trait` can only capture lifetimes bound at the fn or impl level - --> $DIR/E0657.rs:19:31 + --> $DIR/E0657.rs:10:31 | LL | -> Box Id>> | ^^ error[E0657]: `impl Trait` can only capture lifetimes bound at the fn or impl level - --> $DIR/E0657.rs:28:35 + --> $DIR/E0657.rs:19:35 | LL | -> Box Id>> | ^^ diff --git a/src/test/ui/error-codes/E0658.rs b/src/test/ui/error-codes/E0658.rs index dcfa25e528ac3..9c9b95d70a7cf 100644 --- a/src/test/ui/error-codes/E0658.rs +++ b/src/test/ui/error-codes/E0658.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[repr(u128)] enum Foo { //~ ERROR E0658 Bar(u64), diff --git a/src/test/ui/error-codes/E0658.stderr b/src/test/ui/error-codes/E0658.stderr index b338b384a117e..58802b23db382 100644 --- a/src/test/ui/error-codes/E0658.stderr +++ b/src/test/ui/error-codes/E0658.stderr @@ -1,5 +1,5 @@ error[E0658]: repr with 128-bit type is unstable (see issue #35118) - --> $DIR/E0658.rs:12:1 + --> $DIR/E0658.rs:2:1 | LL | / enum Foo { //~ ERROR E0658 LL | | Bar(u64), diff --git a/src/test/ui/error-codes/E0659.rs b/src/test/ui/error-codes/E0659.rs index 4bd452b0aac3d..c00026bb7a710 100644 --- a/src/test/ui/error-codes/E0659.rs +++ b/src/test/ui/error-codes/E0659.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod moon { pub fn foo() {} } diff --git a/src/test/ui/error-codes/E0659.stderr b/src/test/ui/error-codes/E0659.stderr index 06176085b3813..f5dc45259d30c 100644 --- a/src/test/ui/error-codes/E0659.stderr +++ b/src/test/ui/error-codes/E0659.stderr @@ -1,16 +1,16 @@ error[E0659]: `foo` is ambiguous - --> $DIR/E0659.rs:25:5 + --> $DIR/E0659.rs:15:5 | LL | collider::foo(); //~ ERROR E0659 | ^^^^^^^^^^^^^ | note: `foo` could refer to the name imported here - --> $DIR/E0659.rs:20:13 + --> $DIR/E0659.rs:10:13 | LL | pub use moon::*; | ^^^^^^^ note: `foo` could also refer to the name imported here - --> $DIR/E0659.rs:21:13 + --> $DIR/E0659.rs:11:13 | LL | pub use earth::*; | ^^^^^^^^ diff --git a/src/test/ui/error-codes/ex-E0611.rs b/src/test/ui/error-codes/ex-E0611.rs index 4e580242e641e..8460341c44e51 100644 --- a/src/test/ui/error-codes/ex-E0611.rs +++ b/src/test/ui/error-codes/ex-E0611.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod a { pub struct Foo(u32); diff --git a/src/test/ui/error-codes/ex-E0611.stderr b/src/test/ui/error-codes/ex-E0611.stderr index 2f5066542db76..f8c7cd8c1464e 100644 --- a/src/test/ui/error-codes/ex-E0611.stderr +++ b/src/test/ui/error-codes/ex-E0611.stderr @@ -1,5 +1,5 @@ error[E0616]: field `0` of struct `a::Foo` is private - --> $DIR/ex-E0611.rs:21:4 + --> $DIR/ex-E0611.rs:11:4 | LL | y.0; //~ ERROR field `0` of struct `a::Foo` is private | ^^^ diff --git a/src/test/ui/error-codes/ex-E0612.rs b/src/test/ui/error-codes/ex-E0612.rs index 46e26c87e5f34..c8ea53ae9d830 100644 --- a/src/test/ui/error-codes/ex-E0612.rs +++ b/src/test/ui/error-codes/ex-E0612.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo(u32); fn main() { diff --git a/src/test/ui/error-codes/ex-E0612.stderr b/src/test/ui/error-codes/ex-E0612.stderr index a07efc939ab47..e65e8bd814266 100644 --- a/src/test/ui/error-codes/ex-E0612.stderr +++ b/src/test/ui/error-codes/ex-E0612.stderr @@ -1,5 +1,5 @@ error[E0609]: no field `1` on type `Foo` - --> $DIR/ex-E0612.rs:15:6 + --> $DIR/ex-E0612.rs:5:6 | LL | y.1; //~ ERROR no field `1` on type `Foo` | ^ did you mean `0`? diff --git a/src/test/ui/error-festival.rs b/src/test/ui/error-festival.rs index c17e3c878b852..e462824cded49 100644 --- a/src/test/ui/error-festival.rs +++ b/src/test/ui/error-festival.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Question { Yes, No, diff --git a/src/test/ui/error-festival.stderr b/src/test/ui/error-festival.stderr index 69f11b4b7c08c..0fec9c85119cd 100644 --- a/src/test/ui/error-festival.stderr +++ b/src/test/ui/error-festival.stderr @@ -1,17 +1,17 @@ error[E0425]: cannot find value `y` in this scope - --> $DIR/error-festival.rs:24:5 + --> $DIR/error-festival.rs:14:5 | LL | y = 2; | ^ did you mean `x`? error[E0603]: constant `FOO` is private - --> $DIR/error-festival.rs:32:5 + --> $DIR/error-festival.rs:22:5 | LL | foo::FOO; | ^^^^^^^^ error[E0368]: binary assignment operation `+=` cannot be applied to type `&str` - --> $DIR/error-festival.rs:22:5 + --> $DIR/error-festival.rs:12:5 | LL | x += 2; | -^^^^^ @@ -21,13 +21,13 @@ LL | x += 2; = note: an implementation of `std::ops::AddAssign` might be missing for `&str` error[E0599]: no method named `z` found for type `&str` in the current scope - --> $DIR/error-festival.rs:26:7 + --> $DIR/error-festival.rs:16:7 | LL | x.z(); | ^ error[E0600]: cannot apply unary operator `!` to type `Question` - --> $DIR/error-festival.rs:29:5 + --> $DIR/error-festival.rs:19:5 | LL | !Question::Yes; | ^^^^^^^^^^^^^^ cannot apply unary operator `!` @@ -35,13 +35,13 @@ LL | !Question::Yes; = note: an implementation of `std::ops::Not` might be missing for `Question` error[E0604]: only `u8` can be cast as `char`, not `u32` - --> $DIR/error-festival.rs:35:5 + --> $DIR/error-festival.rs:25:5 | LL | 0u32 as char; | ^^^^^^^^^^^^ error[E0605]: non-primitive cast: `u8` as `std::vec::Vec` - --> $DIR/error-festival.rs:39:5 + --> $DIR/error-festival.rs:29:5 | LL | x as Vec; | ^^^^^^^^^^^^ @@ -49,7 +49,7 @@ LL | x as Vec; = note: an `as` expression can only be used to convert between primitive types. Consider using the `From` trait error[E0054]: cannot cast as `bool` - --> $DIR/error-festival.rs:43:24 + --> $DIR/error-festival.rs:33:24 | LL | let x_is_nonzero = x as bool; | ^^^^^^^^^ unsupported cast @@ -57,19 +57,19 @@ LL | let x_is_nonzero = x as bool; = help: compare with zero instead error[E0606]: casting `&u8` as `u32` is invalid - --> $DIR/error-festival.rs:47:18 + --> $DIR/error-festival.rs:37:18 | LL | let y: u32 = x as u32; | ^^^^^^^^ cannot cast `&u8` as `u32` | help: did you mean `*x`? - --> $DIR/error-festival.rs:47:18 + --> $DIR/error-festival.rs:37:18 | LL | let y: u32 = x as u32; | ^ error[E0607]: cannot cast thin pointer `*const u8` to fat pointer `*const [u8]` - --> $DIR/error-festival.rs:51:5 + --> $DIR/error-festival.rs:41:5 | LL | v as *const [u8]; | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-should-say-copy-not-pod.rs b/src/test/ui/error-should-say-copy-not-pod.rs index 8b1e2fc19663d..be4e451ceb12f 100644 --- a/src/test/ui/error-should-say-copy-not-pod.rs +++ b/src/test/ui/error-should-say-copy-not-pod.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that the error message uses the word Copy, not Pod. fn check_bound(_: T) {} diff --git a/src/test/ui/error-should-say-copy-not-pod.stderr b/src/test/ui/error-should-say-copy-not-pod.stderr index 704cd4f4838f2..d42fea7081280 100644 --- a/src/test/ui/error-should-say-copy-not-pod.stderr +++ b/src/test/ui/error-should-say-copy-not-pod.stderr @@ -1,11 +1,11 @@ error[E0277]: the trait bound `std::string::String: std::marker::Copy` is not satisfied - --> $DIR/error-should-say-copy-not-pod.rs:16:5 + --> $DIR/error-should-say-copy-not-pod.rs:6:5 | LL | check_bound("nocopy".to_string()); //~ ERROR : std::marker::Copy` is not satisfied | ^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `std::string::String` | note: required by `check_bound` - --> $DIR/error-should-say-copy-not-pod.rs:13:1 + --> $DIR/error-should-say-copy-not-pod.rs:3:1 | LL | fn check_bound(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/estr-subtyping.rs b/src/test/ui/estr-subtyping.rs index b5c6db0cea9e3..9c5825fff8552 100644 --- a/src/test/ui/estr-subtyping.rs +++ b/src/test/ui/estr-subtyping.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn wants_uniq(x: String) { } fn wants_slice(x: &str) { } diff --git a/src/test/ui/estr-subtyping.stderr b/src/test/ui/estr-subtyping.stderr index fcff9d0380e89..7a7dce98f2d18 100644 --- a/src/test/ui/estr-subtyping.stderr +++ b/src/test/ui/estr-subtyping.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/estr-subtyping.rs:20:15 + --> $DIR/estr-subtyping.rs:10:15 | LL | wants_uniq(x); //~ ERROR mismatched types | ^ diff --git a/src/test/ui/eval-enum.rs b/src/test/ui/eval-enum.rs index ada038114d8d0..4931439bb5c99 100644 --- a/src/test/ui/eval-enum.rs +++ b/src/test/ui/eval-enum.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Test { DivZero = 1/0, //~^ attempt to divide by zero diff --git a/src/test/ui/eval-enum.stderr b/src/test/ui/eval-enum.stderr index f26c48f1a72ae..6bdfa05513426 100644 --- a/src/test/ui/eval-enum.stderr +++ b/src/test/ui/eval-enum.stderr @@ -1,5 +1,5 @@ error: attempt to divide by zero - --> $DIR/eval-enum.rs:12:15 + --> $DIR/eval-enum.rs:2:15 | LL | DivZero = 1/0, | ^^^ @@ -7,31 +7,31 @@ LL | DivZero = 1/0, = note: #[deny(const_err)] on by default error: this expression will panic at runtime - --> $DIR/eval-enum.rs:12:15 + --> $DIR/eval-enum.rs:2:15 | LL | DivZero = 1/0, | ^^^ attempt to divide by zero error[E0080]: could not evaluate enum discriminant - --> $DIR/eval-enum.rs:12:15 + --> $DIR/eval-enum.rs:2:15 | LL | DivZero = 1/0, | ^^^ attempt to divide by zero error: attempt to calculate the remainder with a divisor of zero - --> $DIR/eval-enum.rs:16:15 + --> $DIR/eval-enum.rs:6:15 | LL | RemZero = 1%0, | ^^^ error: this expression will panic at runtime - --> $DIR/eval-enum.rs:16:15 + --> $DIR/eval-enum.rs:6:15 | LL | RemZero = 1%0, | ^^^ attempt to calculate the remainder with a divisor of zero error[E0080]: could not evaluate enum discriminant - --> $DIR/eval-enum.rs:16:15 + --> $DIR/eval-enum.rs:6:15 | LL | RemZero = 1%0, | ^^^ attempt to calculate the remainder with a divisor of zero diff --git a/src/test/ui/exclusive-drop-and-copy.rs b/src/test/ui/exclusive-drop-and-copy.rs index b4cb246965978..7a251671ee996 100644 --- a/src/test/ui/exclusive-drop-and-copy.rs +++ b/src/test/ui/exclusive-drop-and-copy.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // issue #20126 #[derive(Copy, Clone)] //~ ERROR the trait `Copy` may not be implemented diff --git a/src/test/ui/exclusive-drop-and-copy.stderr b/src/test/ui/exclusive-drop-and-copy.stderr index 1c5e62e21a891..2fbeaec23a798 100644 --- a/src/test/ui/exclusive-drop-and-copy.stderr +++ b/src/test/ui/exclusive-drop-and-copy.stderr @@ -1,11 +1,11 @@ error[E0184]: the trait `Copy` may not be implemented for this type; the type has a destructor - --> $DIR/exclusive-drop-and-copy.rs:13:10 + --> $DIR/exclusive-drop-and-copy.rs:3:10 | LL | #[derive(Copy, Clone)] //~ ERROR the trait `Copy` may not be implemented | ^^^^ Copy not allowed on types with destructors error[E0184]: the trait `Copy` may not be implemented for this type; the type has a destructor - --> $DIR/exclusive-drop-and-copy.rs:20:10 + --> $DIR/exclusive-drop-and-copy.rs:10:10 | LL | #[derive(Copy, Clone)] //~ ERROR the trait `Copy` may not be implemented | ^^^^ Copy not allowed on types with destructors diff --git a/src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision.rs b/src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision.rs index 69e5898ed4d16..d95c4b0999405 100644 --- a/src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision.rs +++ b/src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(exclusive_range_pattern)] fn main() { diff --git a/src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision.stderr b/src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision.stderr index 6ccf7efbb8872..01c7e88175683 100644 --- a/src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision.stderr +++ b/src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision.stderr @@ -1,5 +1,5 @@ error: unexpected token: `,` - --> $DIR/exclusive_range_pattern_syntax_collision.rs:15:15 + --> $DIR/exclusive_range_pattern_syntax_collision.rs:5:15 | LL | [_, 99.., _] => {}, //~ ERROR unexpected token: `,` | ^^ diff --git a/src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision2.rs b/src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision2.rs index 9212ea8611862..95677e34dd798 100644 --- a/src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision2.rs +++ b/src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision2.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(exclusive_range_pattern)] fn main() { diff --git a/src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision2.stderr b/src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision2.stderr index d1863cbfb6fd2..91109a6456643 100644 --- a/src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision2.stderr +++ b/src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision2.stderr @@ -1,5 +1,5 @@ error: unexpected token: `]` - --> $DIR/exclusive_range_pattern_syntax_collision2.rs:15:15 + --> $DIR/exclusive_range_pattern_syntax_collision2.rs:5:15 | LL | [_, 99..] => {}, //~ ERROR unexpected token: `]` | ^^ diff --git a/src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision3.rs b/src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision3.rs index d83305857aca6..3bf5da710ef9f 100644 --- a/src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision3.rs +++ b/src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision3.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(exclusive_range_pattern)] fn main() { diff --git a/src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision3.stderr b/src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision3.stderr index 21b2d0c5c5713..9c76a66c265bb 100644 --- a/src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision3.stderr +++ b/src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision3.stderr @@ -1,5 +1,5 @@ error: expected one of `,` or `]`, found `9` - --> $DIR/exclusive_range_pattern_syntax_collision3.rs:15:12 + --> $DIR/exclusive_range_pattern_syntax_collision3.rs:5:12 | LL | [..9, 99..100, _] => {}, //~ ERROR expected one of `,` or `]`, found `9` | ^ expected one of `,` or `]` here diff --git a/src/test/ui/exhaustive_integer_patterns.rs b/src/test/ui/exhaustive_integer_patterns.rs index 7825aaa291286..20997f1f9d8c6 100644 --- a/src/test/ui/exhaustive_integer_patterns.rs +++ b/src/test/ui/exhaustive_integer_patterns.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(exhaustive_integer_patterns)] #![feature(exclusive_range_pattern)] #![deny(unreachable_patterns)] diff --git a/src/test/ui/exhaustive_integer_patterns.stderr b/src/test/ui/exhaustive_integer_patterns.stderr index 44b05a12aebd2..01888ac11a5f0 100644 --- a/src/test/ui/exhaustive_integer_patterns.stderr +++ b/src/test/ui/exhaustive_integer_patterns.stderr @@ -1,83 +1,83 @@ error: unreachable pattern - --> $DIR/exhaustive_integer_patterns.rs:32:9 + --> $DIR/exhaustive_integer_patterns.rs:22:9 | LL | 200 => {} //~ ERROR unreachable pattern | ^^^ | note: lint level defined here - --> $DIR/exhaustive_integer_patterns.rs:13:9 + --> $DIR/exhaustive_integer_patterns.rs:3:9 | LL | #![deny(unreachable_patterns)] | ^^^^^^^^^^^^^^^^^^^^ error[E0004]: non-exhaustive patterns: `128u8..=255u8` not covered - --> $DIR/exhaustive_integer_patterns.rs:37:11 + --> $DIR/exhaustive_integer_patterns.rs:27:11 | LL | match x { //~ ERROR non-exhaustive patterns | ^ pattern `128u8..=255u8` not covered error[E0004]: non-exhaustive patterns: `11u8..=19u8`, `31u8..=34u8`, `36u8..=69u8` and 1 more not covered - --> $DIR/exhaustive_integer_patterns.rs:42:11 + --> $DIR/exhaustive_integer_patterns.rs:32:11 | LL | match x { //~ ERROR non-exhaustive patterns | ^ patterns `11u8..=19u8`, `31u8..=34u8`, `36u8..=69u8` and 1 more not covered error: unreachable pattern - --> $DIR/exhaustive_integer_patterns.rs:53:9 + --> $DIR/exhaustive_integer_patterns.rs:43:9 | LL | -2..=20 => {} //~ ERROR unreachable pattern | ^^^^^^^ error[E0004]: non-exhaustive patterns: `-128i8..=-8i8`, `-6i8`, `121i8..=124i8` and 1 more not covered - --> $DIR/exhaustive_integer_patterns.rs:50:11 + --> $DIR/exhaustive_integer_patterns.rs:40:11 | LL | match x { //~ ERROR non-exhaustive patterns | ^ patterns `-128i8..=-8i8`, `-6i8`, `121i8..=124i8` and 1 more not covered error[E0004]: non-exhaustive patterns: `-128i8` not covered - --> $DIR/exhaustive_integer_patterns.rs:99:11 + --> $DIR/exhaustive_integer_patterns.rs:89:11 | LL | match 0i8 { //~ ERROR non-exhaustive patterns | ^^^ pattern `-128i8` not covered error[E0004]: non-exhaustive patterns: `0i16` not covered - --> $DIR/exhaustive_integer_patterns.rs:107:11 + --> $DIR/exhaustive_integer_patterns.rs:97:11 | LL | match 0i16 { //~ ERROR non-exhaustive patterns | ^^^^ pattern `0i16` not covered error[E0004]: non-exhaustive patterns: `128u8..=255u8` not covered - --> $DIR/exhaustive_integer_patterns.rs:125:11 + --> $DIR/exhaustive_integer_patterns.rs:115:11 | LL | match 0u8 { //~ ERROR non-exhaustive patterns | ^^^ pattern `128u8..=255u8` not covered error[E0004]: non-exhaustive patterns: `(0u8, Some(_))` and `(2u8..=255u8, Some(_))` not covered - --> $DIR/exhaustive_integer_patterns.rs:137:11 + --> $DIR/exhaustive_integer_patterns.rs:127:11 | LL | match (0u8, Some(())) { //~ ERROR non-exhaustive patterns | ^^^^^^^^^^^^^^^ patterns `(0u8, Some(_))` and `(2u8..=255u8, Some(_))` not covered error[E0004]: non-exhaustive patterns: `(126u8..=127u8, false)` not covered - --> $DIR/exhaustive_integer_patterns.rs:142:11 + --> $DIR/exhaustive_integer_patterns.rs:132:11 | LL | match (0u8, true) { //~ ERROR non-exhaustive patterns | ^^^^^^^^^^^ pattern `(126u8..=127u8, false)` not covered error[E0004]: non-exhaustive patterns: `340282366920938463463374607431768211455u128` not covered - --> $DIR/exhaustive_integer_patterns.rs:162:11 + --> $DIR/exhaustive_integer_patterns.rs:152:11 | LL | match 0u128 { //~ ERROR non-exhaustive patterns | ^^^^^ pattern `340282366920938463463374607431768211455u128` not covered error[E0004]: non-exhaustive patterns: `5u128..=340282366920938463463374607431768211455u128` not covered - --> $DIR/exhaustive_integer_patterns.rs:166:11 + --> $DIR/exhaustive_integer_patterns.rs:156:11 | LL | match 0u128 { //~ ERROR non-exhaustive patterns | ^^^^^ pattern `5u128..=340282366920938463463374607431768211455u128` not covered error[E0004]: non-exhaustive patterns: `0u128..=3u128` not covered - --> $DIR/exhaustive_integer_patterns.rs:170:11 + --> $DIR/exhaustive_integer_patterns.rs:160:11 | LL | match 0u128 { //~ ERROR non-exhaustive patterns | ^^^^^ pattern `0u128..=3u128` not covered diff --git a/src/test/ui/existential_types/bound_reduction.rs b/src/test/ui/existential_types/bound_reduction.rs index 2e42c92ab30a3..c1c0c60d59ee0 100644 --- a/src/test/ui/existential_types/bound_reduction.rs +++ b/src/test/ui/existential_types/bound_reduction.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![allow(warnings)] diff --git a/src/test/ui/existential_types/bound_reduction2.rs b/src/test/ui/existential_types/bound_reduction2.rs index d098a4ef4c8e7..d8ade50c79c82 100644 --- a/src/test/ui/existential_types/bound_reduction2.rs +++ b/src/test/ui/existential_types/bound_reduction2.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(existential_type)] fn main() { diff --git a/src/test/ui/existential_types/bound_reduction2.stderr b/src/test/ui/existential_types/bound_reduction2.stderr index 33b8b71bffb13..8e822ca6d8bc7 100644 --- a/src/test/ui/existential_types/bound_reduction2.stderr +++ b/src/test/ui/existential_types/bound_reduction2.stderr @@ -1,5 +1,5 @@ error: non-defining existential type use in defining scope - --> $DIR/bound_reduction2.rs:26:1 + --> $DIR/bound_reduction2.rs:16:1 | LL | / fn foo_desugared(_: T) -> Foo { //~ ERROR non-defining LL | | () @@ -7,7 +7,7 @@ LL | | } | |_^ | note: used non-generic type ::Assoc for generic parameter - --> $DIR/bound_reduction2.rs:20:22 + --> $DIR/bound_reduction2.rs:10:22 | LL | existential type Foo: Trait; | ^ diff --git a/src/test/ui/existential_types/declared_but_never_defined.rs b/src/test/ui/existential_types/declared_but_never_defined.rs index c0f08fe057f55..ff253391f2aaa 100644 --- a/src/test/ui/existential_types/declared_but_never_defined.rs +++ b/src/test/ui/existential_types/declared_but_never_defined.rs @@ -1,14 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![feature(existential_type)] fn main() {} diff --git a/src/test/ui/existential_types/declared_but_never_defined.stderr b/src/test/ui/existential_types/declared_but_never_defined.stderr index 29ae10c1c48fb..681b1cf0fa7cf 100644 --- a/src/test/ui/existential_types/declared_but_never_defined.stderr +++ b/src/test/ui/existential_types/declared_but_never_defined.stderr @@ -1,5 +1,5 @@ error: could not find defining uses - --> $DIR/declared_but_never_defined.rs:17:1 + --> $DIR/declared_but_never_defined.rs:6:1 | LL | existential type Bar: std::fmt::Debug; //~ ERROR could not find defining uses | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/existential_types/declared_but_not_defined_in_scope.rs b/src/test/ui/existential_types/declared_but_not_defined_in_scope.rs index 6d0a9b80a3fc0..a6311ee964df3 100644 --- a/src/test/ui/existential_types/declared_but_not_defined_in_scope.rs +++ b/src/test/ui/existential_types/declared_but_not_defined_in_scope.rs @@ -1,14 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![feature(existential_type)] fn main() {} diff --git a/src/test/ui/existential_types/declared_but_not_defined_in_scope.stderr b/src/test/ui/existential_types/declared_but_not_defined_in_scope.stderr index fcd8e2a7f845a..e9cc92d78ea76 100644 --- a/src/test/ui/existential_types/declared_but_not_defined_in_scope.stderr +++ b/src/test/ui/existential_types/declared_but_not_defined_in_scope.stderr @@ -1,5 +1,5 @@ error: could not find defining uses - --> $DIR/declared_but_not_defined_in_scope.rs:18:5 + --> $DIR/declared_but_not_defined_in_scope.rs:7:5 | LL | pub existential type Boo: ::std::fmt::Debug; //~ ERROR could not find defining uses | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/existential_types/different_defining_uses.rs b/src/test/ui/existential_types/different_defining_uses.rs index c58ca3f621001..c51fca75a24e9 100644 --- a/src/test/ui/existential_types/different_defining_uses.rs +++ b/src/test/ui/existential_types/different_defining_uses.rs @@ -1,14 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![feature(existential_type)] fn main() {} diff --git a/src/test/ui/existential_types/different_defining_uses.stderr b/src/test/ui/existential_types/different_defining_uses.stderr index 63177e8a12374..f782a00229732 100644 --- a/src/test/ui/existential_types/different_defining_uses.stderr +++ b/src/test/ui/existential_types/different_defining_uses.stderr @@ -1,5 +1,5 @@ error: defining existential type use differs from previous - --> $DIR/different_defining_uses.rs:23:1 + --> $DIR/different_defining_uses.rs:12:1 | LL | / fn bar() -> Foo { //~ ERROR defining existential type use differs from previous LL | | 42i32 @@ -7,7 +7,7 @@ LL | | } | |_^ | note: previous use here - --> $DIR/different_defining_uses.rs:19:1 + --> $DIR/different_defining_uses.rs:8:1 | LL | / fn foo() -> Foo { LL | | "" diff --git a/src/test/ui/existential_types/different_defining_uses_never_type.rs b/src/test/ui/existential_types/different_defining_uses_never_type.rs index 5bf46ef91bf7c..c6c6ae8d2dccf 100644 --- a/src/test/ui/existential_types/different_defining_uses_never_type.rs +++ b/src/test/ui/existential_types/different_defining_uses_never_type.rs @@ -1,14 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![feature(existential_type)] fn main() {} diff --git a/src/test/ui/existential_types/different_defining_uses_never_type.stderr b/src/test/ui/existential_types/different_defining_uses_never_type.stderr index f0e9f505f6ec5..04b0cf2778455 100644 --- a/src/test/ui/existential_types/different_defining_uses_never_type.stderr +++ b/src/test/ui/existential_types/different_defining_uses_never_type.stderr @@ -1,5 +1,5 @@ error: defining existential type use differs from previous - --> $DIR/different_defining_uses_never_type.rs:23:1 + --> $DIR/different_defining_uses_never_type.rs:12:1 | LL | / fn bar() -> Foo { //~ ERROR defining existential type use differs from previous LL | | panic!() @@ -7,7 +7,7 @@ LL | | } | |_^ | note: previous use here - --> $DIR/different_defining_uses_never_type.rs:19:1 + --> $DIR/different_defining_uses_never_type.rs:8:1 | LL | / fn foo() -> Foo { LL | | "" @@ -15,7 +15,7 @@ LL | | } | |_^ error: defining existential type use differs from previous - --> $DIR/different_defining_uses_never_type.rs:27:1 + --> $DIR/different_defining_uses_never_type.rs:16:1 | LL | / fn boo() -> Foo { //~ ERROR defining existential type use differs from previous LL | | loop {} @@ -23,7 +23,7 @@ LL | | } | |_^ | note: previous use here - --> $DIR/different_defining_uses_never_type.rs:19:1 + --> $DIR/different_defining_uses_never_type.rs:8:1 | LL | / fn foo() -> Foo { LL | | "" diff --git a/src/test/ui/existential_types/different_defining_uses_never_type2.rs b/src/test/ui/existential_types/different_defining_uses_never_type2.rs index 0e40221d82936..2953f1745ee5b 100644 --- a/src/test/ui/existential_types/different_defining_uses_never_type2.rs +++ b/src/test/ui/existential_types/different_defining_uses_never_type2.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![feature(existential_type)] diff --git a/src/test/ui/existential_types/existential-associated-type.rs b/src/test/ui/existential_types/existential-associated-type.rs index af393febfbca6..299ae91b84386 100644 --- a/src/test/ui/existential_types/existential-associated-type.rs +++ b/src/test/ui/existential_types/existential-associated-type.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(existential_type)] // compile-pass diff --git a/src/test/ui/existential_types/generic_different_defining_uses.rs b/src/test/ui/existential_types/generic_different_defining_uses.rs index 109f1cd913214..3bd104251fb70 100644 --- a/src/test/ui/existential_types/generic_different_defining_uses.rs +++ b/src/test/ui/existential_types/generic_different_defining_uses.rs @@ -1,14 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![feature(existential_type)] fn main() {} diff --git a/src/test/ui/existential_types/generic_different_defining_uses.stderr b/src/test/ui/existential_types/generic_different_defining_uses.stderr index bc71af4c9af4b..234bcf232ae79 100644 --- a/src/test/ui/existential_types/generic_different_defining_uses.stderr +++ b/src/test/ui/existential_types/generic_different_defining_uses.stderr @@ -1,5 +1,5 @@ error: defining existential type use differs from previous - --> $DIR/generic_different_defining_uses.rs:22:1 + --> $DIR/generic_different_defining_uses.rs:11:1 | LL | / fn my_iter2(t: T) -> MyIter { //~ ERROR defining existential type use differs from previous LL | | Some(t).into_iter() @@ -7,7 +7,7 @@ LL | | } | |_^ | note: previous use here - --> $DIR/generic_different_defining_uses.rs:18:1 + --> $DIR/generic_different_defining_uses.rs:7:1 | LL | / fn my_iter(t: T) -> MyIter { LL | | std::iter::once(t) diff --git a/src/test/ui/existential_types/generic_duplicate_lifetime_param.rs b/src/test/ui/existential_types/generic_duplicate_lifetime_param.rs index 92b234aa6dc63..e9943beddbf37 100644 --- a/src/test/ui/existential_types/generic_duplicate_lifetime_param.rs +++ b/src/test/ui/existential_types/generic_duplicate_lifetime_param.rs @@ -1,14 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![feature(existential_type)] fn main() {} diff --git a/src/test/ui/existential_types/generic_duplicate_lifetime_param.stderr b/src/test/ui/existential_types/generic_duplicate_lifetime_param.stderr index 0316832a1af90..7b09d3ceab0b9 100644 --- a/src/test/ui/existential_types/generic_duplicate_lifetime_param.stderr +++ b/src/test/ui/existential_types/generic_duplicate_lifetime_param.stderr @@ -1,5 +1,5 @@ error: non-defining existential type use in defining scope - --> $DIR/generic_duplicate_lifetime_param.rs:18:1 + --> $DIR/generic_duplicate_lifetime_param.rs:7:1 | LL | / fn one<'a>(t: &'a ()) -> Two<'a, 'a> { //~ ERROR non-defining existential type use LL | | t @@ -7,7 +7,7 @@ LL | | } | |_^ | note: lifetime used multiple times - --> $DIR/generic_duplicate_lifetime_param.rs:16:22 + --> $DIR/generic_duplicate_lifetime_param.rs:5:22 | LL | existential type Two<'a, 'b>: std::fmt::Debug; | ^^ ^^ diff --git a/src/test/ui/existential_types/generic_duplicate_param_use.rs b/src/test/ui/existential_types/generic_duplicate_param_use.rs index 52e36fa9b6153..380fbdeb8c27c 100644 --- a/src/test/ui/existential_types/generic_duplicate_param_use.rs +++ b/src/test/ui/existential_types/generic_duplicate_param_use.rs @@ -1,14 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![feature(existential_type)] fn main() {} diff --git a/src/test/ui/existential_types/generic_duplicate_param_use.stderr b/src/test/ui/existential_types/generic_duplicate_param_use.stderr index e4a92dba58f3e..66706c210541c 100644 --- a/src/test/ui/existential_types/generic_duplicate_param_use.stderr +++ b/src/test/ui/existential_types/generic_duplicate_param_use.stderr @@ -1,5 +1,5 @@ error[E0091]: type parameter `U` is unused - --> $DIR/generic_duplicate_param_use.rs:16:25 + --> $DIR/generic_duplicate_param_use.rs:5:25 | LL | existential type Two: 'static; //~ ERROR type parameter `U` is unused | ^ unused type parameter diff --git a/src/test/ui/existential_types/generic_lifetime_param.rs b/src/test/ui/existential_types/generic_lifetime_param.rs index 3bdb69eec7f3e..a8bb0229f0e8d 100644 --- a/src/test/ui/existential_types/generic_lifetime_param.rs +++ b/src/test/ui/existential_types/generic_lifetime_param.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![feature(existential_type)] diff --git a/src/test/ui/existential_types/generic_nondefining_use.rs b/src/test/ui/existential_types/generic_nondefining_use.rs index a4b74d6751bd6..caa8f0f2ee1bc 100644 --- a/src/test/ui/existential_types/generic_nondefining_use.rs +++ b/src/test/ui/existential_types/generic_nondefining_use.rs @@ -1,14 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![feature(existential_type)] fn main() {} diff --git a/src/test/ui/existential_types/generic_nondefining_use.stderr b/src/test/ui/existential_types/generic_nondefining_use.stderr index 3c826708649d4..41877791e9ae9 100644 --- a/src/test/ui/existential_types/generic_nondefining_use.stderr +++ b/src/test/ui/existential_types/generic_nondefining_use.stderr @@ -1,5 +1,5 @@ error: non-defining existential type use in defining scope - --> $DIR/generic_nondefining_use.rs:19:1 + --> $DIR/generic_nondefining_use.rs:8:1 | LL | / fn cmp() -> Cmp { //~ ERROR non-defining existential type use in defining scope LL | | 5u32 @@ -7,7 +7,7 @@ LL | | } | |_^ | note: used non-generic type u32 for generic parameter - --> $DIR/generic_nondefining_use.rs:16:22 + --> $DIR/generic_nondefining_use.rs:5:22 | LL | existential type Cmp: 'static; | ^ diff --git a/src/test/ui/existential_types/generic_not_used.rs b/src/test/ui/existential_types/generic_not_used.rs index b090cf26b8796..bfe7b8c4a1d53 100644 --- a/src/test/ui/existential_types/generic_not_used.rs +++ b/src/test/ui/existential_types/generic_not_used.rs @@ -1,14 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![feature(existential_type)] fn main() {} diff --git a/src/test/ui/existential_types/generic_not_used.stderr b/src/test/ui/existential_types/generic_not_used.stderr index 34d82c0ddb0c9..b22cffeea2898 100644 --- a/src/test/ui/existential_types/generic_not_used.stderr +++ b/src/test/ui/existential_types/generic_not_used.stderr @@ -1,5 +1,5 @@ error: type parameter `V` is part of concrete type but not used in parameter list for existential type - --> $DIR/generic_not_used.rs:18:73 + --> $DIR/generic_not_used.rs:7:73 | LL | fn wrong_generic(_: U, v: V) -> WrongGeneric { | _________________________________________________________________________^ diff --git a/src/test/ui/existential_types/generic_type_does_not_live_long_enough.nll.stderr b/src/test/ui/existential_types/generic_type_does_not_live_long_enough.nll.stderr index 84af8e1dca2b1..f303b68d04419 100644 --- a/src/test/ui/existential_types/generic_type_does_not_live_long_enough.nll.stderr +++ b/src/test/ui/existential_types/generic_type_does_not_live_long_enough.nll.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/generic_type_does_not_live_long_enough.rs:16:18 + --> $DIR/generic_type_does_not_live_long_enough.rs:6:18 | LL | let z: i32 = x; //~ ERROR mismatched types | ^ expected i32, found anonymized type @@ -8,7 +8,7 @@ LL | let z: i32 = x; //~ ERROR mismatched types found type `WrongGeneric::<&{integer}>` warning: not reporting region error due to nll - --> $DIR/generic_type_does_not_live_long_enough.rs:19:1 + --> $DIR/generic_type_does_not_live_long_enough.rs:9:1 | LL | existential type WrongGeneric: 'static; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/existential_types/generic_type_does_not_live_long_enough.rs b/src/test/ui/existential_types/generic_type_does_not_live_long_enough.rs index 440fc2d128404..02bb151ccb618 100644 --- a/src/test/ui/existential_types/generic_type_does_not_live_long_enough.rs +++ b/src/test/ui/existential_types/generic_type_does_not_live_long_enough.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(existential_type)] fn main() { diff --git a/src/test/ui/existential_types/generic_type_does_not_live_long_enough.stderr b/src/test/ui/existential_types/generic_type_does_not_live_long_enough.stderr index 189ad7d49a485..22087cf1d76be 100644 --- a/src/test/ui/existential_types/generic_type_does_not_live_long_enough.stderr +++ b/src/test/ui/existential_types/generic_type_does_not_live_long_enough.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/generic_type_does_not_live_long_enough.rs:16:18 + --> $DIR/generic_type_does_not_live_long_enough.rs:6:18 | LL | let z: i32 = x; //~ ERROR mismatched types | ^ expected i32, found anonymized type @@ -8,7 +8,7 @@ LL | let z: i32 = x; //~ ERROR mismatched types found type `WrongGeneric::<&{integer}>` error[E0310]: the parameter type `T` may not live long enough - --> $DIR/generic_type_does_not_live_long_enough.rs:19:1 + --> $DIR/generic_type_does_not_live_long_enough.rs:9:1 | LL | existential type WrongGeneric: 'static; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -17,7 +17,7 @@ LL | fn wrong_generic(t: T) -> WrongGeneric { | - help: consider adding an explicit lifetime bound `T: 'static`... | note: ...so that the type `T` will meet its required lifetime bounds - --> $DIR/generic_type_does_not_live_long_enough.rs:19:1 + --> $DIR/generic_type_does_not_live_long_enough.rs:9:1 | LL | existential type WrongGeneric: 'static; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/existential_types/generic_underconstrained.rs b/src/test/ui/existential_types/generic_underconstrained.rs index fdc7a7935a2e8..967faca067c1e 100644 --- a/src/test/ui/existential_types/generic_underconstrained.rs +++ b/src/test/ui/existential_types/generic_underconstrained.rs @@ -1,14 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![feature(existential_type)] fn main() {} diff --git a/src/test/ui/existential_types/generic_underconstrained.stderr b/src/test/ui/existential_types/generic_underconstrained.stderr index 1454ba575b1f1..57924e0ce2131 100644 --- a/src/test/ui/existential_types/generic_underconstrained.stderr +++ b/src/test/ui/existential_types/generic_underconstrained.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `T: Trait` is not satisfied - --> $DIR/generic_underconstrained.rs:17:1 + --> $DIR/generic_underconstrained.rs:6:1 | LL | existential type Underconstrained: 'static; //~ ERROR the trait bound `T: Trait` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Trait` is not implemented for `T` diff --git a/src/test/ui/existential_types/generic_underconstrained2.rs b/src/test/ui/existential_types/generic_underconstrained2.rs index bffb6b5ee109c..98d9da832cfd3 100644 --- a/src/test/ui/existential_types/generic_underconstrained2.rs +++ b/src/test/ui/existential_types/generic_underconstrained2.rs @@ -1,14 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![feature(existential_type)] fn main() {} diff --git a/src/test/ui/existential_types/generic_underconstrained2.stderr b/src/test/ui/existential_types/generic_underconstrained2.stderr index 78e79e7fc861d..c7b6d6ade557c 100644 --- a/src/test/ui/existential_types/generic_underconstrained2.stderr +++ b/src/test/ui/existential_types/generic_underconstrained2.stderr @@ -1,5 +1,5 @@ error[E0277]: `U` doesn't implement `std::fmt::Debug` - --> $DIR/generic_underconstrained2.rs:16:1 + --> $DIR/generic_underconstrained2.rs:5:1 | LL | existential type Underconstrained: 'static; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `U` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug` @@ -9,7 +9,7 @@ LL | existential type Underconstrained: 'static; = note: the return type of a function must have a statically known size error[E0277]: `V` doesn't implement `std::fmt::Debug` - --> $DIR/generic_underconstrained2.rs:24:1 + --> $DIR/generic_underconstrained2.rs:13:1 | LL | existential type Underconstrained2: 'static; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `V` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug` diff --git a/src/test/ui/existential_types/nested_existential_types.rs b/src/test/ui/existential_types/nested_existential_types.rs index aac72c71d0308..62a4779991411 100644 --- a/src/test/ui/existential_types/nested_existential_types.rs +++ b/src/test/ui/existential_types/nested_existential_types.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(existential_type)] // compile-pass mod my_mod { diff --git a/src/test/ui/existential_types/never_reveal_concrete_type.rs b/src/test/ui/existential_types/never_reveal_concrete_type.rs index 4517eca60ed72..04da394848e21 100644 --- a/src/test/ui/existential_types/never_reveal_concrete_type.rs +++ b/src/test/ui/existential_types/never_reveal_concrete_type.rs @@ -1,14 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![feature(existential_type)] fn main() {} diff --git a/src/test/ui/existential_types/never_reveal_concrete_type.stderr b/src/test/ui/existential_types/never_reveal_concrete_type.stderr index 449799c91b79a..9c0b875227159 100644 --- a/src/test/ui/existential_types/never_reveal_concrete_type.stderr +++ b/src/test/ui/existential_types/never_reveal_concrete_type.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/never_reveal_concrete_type.rs:24:27 + --> $DIR/never_reveal_concrete_type.rs:13:27 | LL | let _: &'static str = x; //~ mismatched types | ^ expected reference, found anonymized type @@ -8,7 +8,7 @@ LL | let _: &'static str = x; //~ mismatched types found type `NoReveal` error[E0605]: non-primitive cast: `NoReveal` as `&'static str` - --> $DIR/never_reveal_concrete_type.rs:25:13 + --> $DIR/never_reveal_concrete_type.rs:14:13 | LL | let _ = x as &'static str; //~ non-primitive cast | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/existential_types/no_inferrable_concrete_type.rs b/src/test/ui/existential_types/no_inferrable_concrete_type.rs index d236503561903..6bbe8bdc0cd6d 100644 --- a/src/test/ui/existential_types/no_inferrable_concrete_type.rs +++ b/src/test/ui/existential_types/no_inferrable_concrete_type.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue 52985: Cause cycle error if user code provides no use case that allows an existential type // to be inferred to a concrete type. This results in an infinite cycle during type normalization. diff --git a/src/test/ui/existential_types/no_inferrable_concrete_type.stderr b/src/test/ui/existential_types/no_inferrable_concrete_type.stderr index 06e40fd6ab554..9d2609e546db5 100644 --- a/src/test/ui/existential_types/no_inferrable_concrete_type.stderr +++ b/src/test/ui/existential_types/no_inferrable_concrete_type.stderr @@ -1,11 +1,11 @@ error[E0391]: cycle detected when processing `Foo` - --> $DIR/no_inferrable_concrete_type.rs:16:1 + --> $DIR/no_inferrable_concrete_type.rs:6:1 | LL | existential type Foo: Copy; //~ cycle detected | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ | note: ...which requires processing `bar`... - --> $DIR/no_inferrable_concrete_type.rs:19:23 + --> $DIR/no_inferrable_concrete_type.rs:9:23 | LL | fn bar(x: Foo) -> Foo { x } | ^^^^^ diff --git a/src/test/ui/existential_types/no_revealing_outside_defining_module.rs b/src/test/ui/existential_types/no_revealing_outside_defining_module.rs index f646891b3b4fa..142f2f6d75169 100644 --- a/src/test/ui/existential_types/no_revealing_outside_defining_module.rs +++ b/src/test/ui/existential_types/no_revealing_outside_defining_module.rs @@ -1,14 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![feature(existential_type)] fn main() {} diff --git a/src/test/ui/existential_types/no_revealing_outside_defining_module.stderr b/src/test/ui/existential_types/no_revealing_outside_defining_module.stderr index a1c98c6d4b89e..81d4dc04bab31 100644 --- a/src/test/ui/existential_types/no_revealing_outside_defining_module.stderr +++ b/src/test/ui/existential_types/no_revealing_outside_defining_module.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/no_revealing_outside_defining_module.rs:26:19 + --> $DIR/no_revealing_outside_defining_module.rs:15:19 | LL | let _: &str = bomp(); //~ ERROR mismatched types | ^^^^^^ expected &str, found anonymized type @@ -8,7 +8,7 @@ LL | let _: &str = bomp(); //~ ERROR mismatched types found type `Boo` error[E0308]: mismatched types - --> $DIR/no_revealing_outside_defining_module.rs:30:5 + --> $DIR/no_revealing_outside_defining_module.rs:19:5 | LL | fn bomp() -> boo::Boo { | -------- expected `Boo` because of return type diff --git a/src/test/ui/existential_types/not_well_formed.rs b/src/test/ui/existential_types/not_well_formed.rs index b3d38aee8c533..073fa90cb35f6 100644 --- a/src/test/ui/existential_types/not_well_formed.rs +++ b/src/test/ui/existential_types/not_well_formed.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(existential_type)] fn main() { diff --git a/src/test/ui/existential_types/not_well_formed.stderr b/src/test/ui/existential_types/not_well_formed.stderr index 6b7d1be98a772..17ea57805d2b9 100644 --- a/src/test/ui/existential_types/not_well_formed.stderr +++ b/src/test/ui/existential_types/not_well_formed.stderr @@ -1,5 +1,5 @@ error[E0220]: associated type `Assoc` not found for `V` - --> $DIR/not_well_formed.rs:20:32 + --> $DIR/not_well_formed.rs:10:32 | LL | existential type Foo: Trait; //~ associated type `Assoc` not found for `V` | ^^^^^^^^ associated type `Assoc` not found diff --git a/src/test/ui/existential_types/unused_generic_param.rs b/src/test/ui/existential_types/unused_generic_param.rs index 420ce89cc37c1..bd7b343b402f5 100644 --- a/src/test/ui/existential_types/unused_generic_param.rs +++ b/src/test/ui/existential_types/unused_generic_param.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(existential_type)] fn main() { diff --git a/src/test/ui/existential_types/unused_generic_param.stderr b/src/test/ui/existential_types/unused_generic_param.stderr index 7ad5eab0b0a67..348aed3c43914 100644 --- a/src/test/ui/existential_types/unused_generic_param.stderr +++ b/src/test/ui/existential_types/unused_generic_param.stderr @@ -1,11 +1,11 @@ error[E0091]: type parameter `T` is unused - --> $DIR/unused_generic_param.rs:16:35 + --> $DIR/unused_generic_param.rs:6:35 | LL | existential type PartiallyDefined: 'static; //~ `T` is unused | ^ unused type parameter error[E0091]: type parameter `T` is unused - --> $DIR/unused_generic_param.rs:22:36 + --> $DIR/unused_generic_param.rs:12:36 | LL | existential type PartiallyDefined2: 'static; //~ `T` is unused | ^ unused type parameter diff --git a/src/test/ui/expanded-cfg.rs b/src/test/ui/expanded-cfg.rs index 77351f6e4f171..e97377fe9b4e1 100644 --- a/src/test/ui/expanded-cfg.rs +++ b/src/test/ui/expanded-cfg.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(custom_attribute, rustc_attrs)] macro_rules! mac { diff --git a/src/test/ui/expanded-cfg.stderr b/src/test/ui/expanded-cfg.stderr index d7bc47fad276f..156226ae46afd 100644 --- a/src/test/ui/expanded-cfg.stderr +++ b/src/test/ui/expanded-cfg.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/expanded-cfg.rs:32:1 + --> $DIR/expanded-cfg.rs:22:1 | LL | fn main() {} //~ ERROR compilation successful | ^^^^^^^^^^^^ diff --git a/src/test/ui/explain.rs b/src/test/ui/explain.rs index 88fc3f7f01756..3622ba7764530 100644 --- a/src/test/ui/explain.rs +++ b/src/test/ui/explain.rs @@ -1,12 +1,2 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --explain E0591 // compile-pass diff --git a/src/test/ui/explicit/explicit-call-to-dtor.rs b/src/test/ui/explicit/explicit-call-to-dtor.rs index 90030488dd60b..a6f9acc37a16d 100644 --- a/src/test/ui/explicit/explicit-call-to-dtor.rs +++ b/src/test/ui/explicit/explicit-call-to-dtor.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { x: isize } diff --git a/src/test/ui/explicit/explicit-call-to-dtor.stderr b/src/test/ui/explicit/explicit-call-to-dtor.stderr index 264d820042ba7..db09b23bf26e5 100644 --- a/src/test/ui/explicit/explicit-call-to-dtor.stderr +++ b/src/test/ui/explicit/explicit-call-to-dtor.stderr @@ -1,5 +1,5 @@ error[E0040]: explicit use of destructor method - --> $DIR/explicit-call-to-dtor.rs:23:7 + --> $DIR/explicit-call-to-dtor.rs:13:7 | LL | x.drop(); //~ ERROR explicit use of destructor method | ^^^^ explicit destructor calls not allowed diff --git a/src/test/ui/explicit/explicit-call-to-supertrait-dtor.rs b/src/test/ui/explicit/explicit-call-to-supertrait-dtor.rs index 63ed74dfa490e..ff56b9a8ae424 100644 --- a/src/test/ui/explicit/explicit-call-to-supertrait-dtor.rs +++ b/src/test/ui/explicit/explicit-call-to-supertrait-dtor.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { x: isize } diff --git a/src/test/ui/explicit/explicit-call-to-supertrait-dtor.stderr b/src/test/ui/explicit/explicit-call-to-supertrait-dtor.stderr index 0d0ae629defeb..dfd122b3ea405 100644 --- a/src/test/ui/explicit/explicit-call-to-supertrait-dtor.stderr +++ b/src/test/ui/explicit/explicit-call-to-supertrait-dtor.stderr @@ -1,5 +1,5 @@ error[E0040]: explicit use of destructor method - --> $DIR/explicit-call-to-supertrait-dtor.rs:27:14 + --> $DIR/explicit-call-to-supertrait-dtor.rs:17:14 | LL | self.drop(); //~ ERROR explicit use of destructor method | ^^^^ explicit destructor calls not allowed diff --git a/src/test/ui/explicit/explicit-self-lifetime-mismatch.rs b/src/test/ui/explicit/explicit-self-lifetime-mismatch.rs index eac134ff3cc7d..82c64bcf6a767 100644 --- a/src/test/ui/explicit/explicit-self-lifetime-mismatch.rs +++ b/src/test/ui/explicit/explicit-self-lifetime-mismatch.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo<'a,'b> { x: &'a isize, y: &'b isize, diff --git a/src/test/ui/explicit/explicit-self-lifetime-mismatch.stderr b/src/test/ui/explicit/explicit-self-lifetime-mismatch.stderr index 6a22d20467bad..e6f9eded9a4f3 100644 --- a/src/test/ui/explicit/explicit-self-lifetime-mismatch.stderr +++ b/src/test/ui/explicit/explicit-self-lifetime-mismatch.stderr @@ -1,37 +1,37 @@ error[E0308]: mismatched method receiver - --> $DIR/explicit-self-lifetime-mismatch.rs:18:12 + --> $DIR/explicit-self-lifetime-mismatch.rs:8:12 | LL | Foo<'b,'a> | ^^^^^^^^^^ lifetime mismatch | = note: expected type `Foo<'a, 'b>` found type `Foo<'b, 'a>` -note: the lifetime 'b as defined on the impl at 16:9... - --> $DIR/explicit-self-lifetime-mismatch.rs:16:9 +note: the lifetime 'b as defined on the impl at 6:9... + --> $DIR/explicit-self-lifetime-mismatch.rs:6:9 | LL | impl<'a,'b> Foo<'a,'b> { | ^^ -note: ...does not necessarily outlive the lifetime 'a as defined on the impl at 16:6 - --> $DIR/explicit-self-lifetime-mismatch.rs:16:6 +note: ...does not necessarily outlive the lifetime 'a as defined on the impl at 6:6 + --> $DIR/explicit-self-lifetime-mismatch.rs:6:6 | LL | impl<'a,'b> Foo<'a,'b> { | ^^ error[E0308]: mismatched method receiver - --> $DIR/explicit-self-lifetime-mismatch.rs:18:12 + --> $DIR/explicit-self-lifetime-mismatch.rs:8:12 | LL | Foo<'b,'a> | ^^^^^^^^^^ lifetime mismatch | = note: expected type `Foo<'a, 'b>` found type `Foo<'b, 'a>` -note: the lifetime 'a as defined on the impl at 16:6... - --> $DIR/explicit-self-lifetime-mismatch.rs:16:6 +note: the lifetime 'a as defined on the impl at 6:6... + --> $DIR/explicit-self-lifetime-mismatch.rs:6:6 | LL | impl<'a,'b> Foo<'a,'b> { | ^^ -note: ...does not necessarily outlive the lifetime 'b as defined on the impl at 16:9 - --> $DIR/explicit-self-lifetime-mismatch.rs:16:9 +note: ...does not necessarily outlive the lifetime 'b as defined on the impl at 6:9 + --> $DIR/explicit-self-lifetime-mismatch.rs:6:9 | LL | impl<'a,'b> Foo<'a,'b> { | ^^ diff --git a/src/test/ui/export-fully-qualified.rs b/src/test/ui/export-fully-qualified.rs index 19fa13f8377db..2a31d513bc5ea 100644 --- a/src/test/ui/export-fully-qualified.rs +++ b/src/test/ui/export-fully-qualified.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // In this test baz isn't resolved when called as foo.baz even though // it's called from inside foo. This is somewhat surprising and may // want to change eventually. diff --git a/src/test/ui/export-fully-qualified.stderr b/src/test/ui/export-fully-qualified.stderr index b8409929763b6..cd36e61c8cc41 100644 --- a/src/test/ui/export-fully-qualified.stderr +++ b/src/test/ui/export-fully-qualified.stderr @@ -1,5 +1,5 @@ error[E0433]: failed to resolve. Use of undeclared type or module `foo` - --> $DIR/export-fully-qualified.rs:16:20 + --> $DIR/export-fully-qualified.rs:6:20 | LL | pub fn bar() { foo::baz(); } //~ ERROR failed to resolve. Use of undeclared type or module `foo` | ^^^ Use of undeclared type or module `foo` diff --git a/src/test/ui/export-import.rs b/src/test/ui/export-import.rs index 3877250126d34..3f543636064e4 100644 --- a/src/test/ui/export-import.rs +++ b/src/test/ui/export-import.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use m::unexported; //~^ ERROR: is private diff --git a/src/test/ui/export-import.stderr b/src/test/ui/export-import.stderr index 2f12485f123b6..ddc4770f19b5d 100644 --- a/src/test/ui/export-import.stderr +++ b/src/test/ui/export-import.stderr @@ -1,5 +1,5 @@ error[E0603]: function `unexported` is private - --> $DIR/export-import.rs:11:5 + --> $DIR/export-import.rs:1:5 | LL | use m::unexported; | ^^^^^^^^^^^^^ diff --git a/src/test/ui/export-tag-variant.rs b/src/test/ui/export-tag-variant.rs index b6e8cf71ddd6c..66369faa80a26 100644 --- a/src/test/ui/export-tag-variant.rs +++ b/src/test/ui/export-tag-variant.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod foo { pub fn x() { } diff --git a/src/test/ui/export-tag-variant.stderr b/src/test/ui/export-tag-variant.stderr index da67e2c41990b..e35c5838f50d0 100644 --- a/src/test/ui/export-tag-variant.stderr +++ b/src/test/ui/export-tag-variant.stderr @@ -1,5 +1,5 @@ error[E0603]: enum `y` is private - --> $DIR/export-tag-variant.rs:17:21 + --> $DIR/export-tag-variant.rs:7:21 | LL | fn main() { let z = foo::y::y1; } //~ ERROR: enum `y` is private | ^^^^^^^^^^ diff --git a/src/test/ui/export.rs b/src/test/ui/export.rs index c28ea70c752c1..73ceec6803a90 100644 --- a/src/test/ui/export.rs +++ b/src/test/ui/export.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod foo { pub fn x(y: isize) { log(debug, y); } //~^ ERROR cannot find function `log` in this scope diff --git a/src/test/ui/export.stderr b/src/test/ui/export.stderr index dd19e83750b5f..1eb630675dd8c 100644 --- a/src/test/ui/export.stderr +++ b/src/test/ui/export.stderr @@ -1,29 +1,29 @@ error[E0425]: cannot find function `log` in this scope - --> $DIR/export.rs:12:26 + --> $DIR/export.rs:2:26 | LL | pub fn x(y: isize) { log(debug, y); } | ^^^ not found in this scope error[E0425]: cannot find value `debug` in this scope - --> $DIR/export.rs:12:30 + --> $DIR/export.rs:2:30 | LL | pub fn x(y: isize) { log(debug, y); } | ^^^^^ not found in this scope error[E0425]: cannot find function `log` in this scope - --> $DIR/export.rs:15:22 + --> $DIR/export.rs:5:22 | LL | fn z(y: isize) { log(debug, y); } | ^^^ not found in this scope error[E0425]: cannot find value `debug` in this scope - --> $DIR/export.rs:15:26 + --> $DIR/export.rs:5:26 | LL | fn z(y: isize) { log(debug, y); } | ^^^^^ not found in this scope error[E0603]: function `z` is private - --> $DIR/export.rs:20:13 + --> $DIR/export.rs:10:13 | LL | fn main() { foo::z(10); } //~ ERROR function `z` is private | ^^^^^^ diff --git a/src/test/ui/export2.rs b/src/test/ui/export2.rs index dc96ce7f50496..ab47d5af775fb 100644 --- a/src/test/ui/export2.rs +++ b/src/test/ui/export2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod foo { pub fn x() { bar::x(); } //~ ERROR failed to resolve. Use of undeclared type or module `bar` } diff --git a/src/test/ui/export2.stderr b/src/test/ui/export2.stderr index c76afb8a1e2c6..edb8508d5d3ce 100644 --- a/src/test/ui/export2.stderr +++ b/src/test/ui/export2.stderr @@ -1,5 +1,5 @@ error[E0433]: failed to resolve. Use of undeclared type or module `bar` - --> $DIR/export2.rs:12:18 + --> $DIR/export2.rs:2:18 | LL | pub fn x() { bar::x(); } //~ ERROR failed to resolve. Use of undeclared type or module `bar` | ^^^ Use of undeclared type or module `bar` diff --git a/src/test/ui/expr_attr_paren_order.rs b/src/test/ui/expr_attr_paren_order.rs index 49b2fa0e35022..65f2b67d22bf2 100644 --- a/src/test/ui/expr_attr_paren_order.rs +++ b/src/test/ui/expr_attr_paren_order.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(stmt_expr_attributes)] fn main() { diff --git a/src/test/ui/expr_attr_paren_order.stderr b/src/test/ui/expr_attr_paren_order.stderr index 938ff51b37dda..f3aa39f89cc3d 100644 --- a/src/test/ui/expr_attr_paren_order.stderr +++ b/src/test/ui/expr_attr_paren_order.stderr @@ -1,11 +1,11 @@ error: variable `X` should have a snake case name such as `x` - --> $DIR/expr_attr_paren_order.rs:29:17 + --> $DIR/expr_attr_paren_order.rs:19:17 | LL | let X = 0; //~ ERROR snake case name | ^ | note: lint level defined here - --> $DIR/expr_attr_paren_order.rs:27:17 + --> $DIR/expr_attr_paren_order.rs:17:17 | LL | #![deny(non_snake_case)] | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/ext-nonexistent.rs b/src/test/ui/ext-nonexistent.rs index a5bf796062487..e65b165430262 100644 --- a/src/test/ui/ext-nonexistent.rs +++ b/src/test/ui/ext-nonexistent.rs @@ -1,12 +1,2 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:cannot find macro fn main() { iamnotanextensionthatexists!(""); } diff --git a/src/test/ui/ext-nonexistent.stderr b/src/test/ui/ext-nonexistent.stderr index ff027f1847642..3fbbb4952649f 100644 --- a/src/test/ui/ext-nonexistent.stderr +++ b/src/test/ui/ext-nonexistent.stderr @@ -1,5 +1,5 @@ error: cannot find macro `iamnotanextensionthatexists!` in this scope - --> $DIR/ext-nonexistent.rs:12:13 + --> $DIR/ext-nonexistent.rs:2:13 | LL | fn main() { iamnotanextensionthatexists!(""); } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/extenv/extenv-arg-2-not-string-literal.rs b/src/test/ui/extenv/extenv-arg-2-not-string-literal.rs index c2362689721ac..66dced478f9fb 100644 --- a/src/test/ui/extenv/extenv-arg-2-not-string-literal.rs +++ b/src/test/ui/extenv/extenv-arg-2-not-string-literal.rs @@ -1,11 +1 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { env!("one", 10); } //~ ERROR: expected string literal diff --git a/src/test/ui/extenv/extenv-arg-2-not-string-literal.stderr b/src/test/ui/extenv/extenv-arg-2-not-string-literal.stderr index 4a10deb4bddda..92c04f9fe8a51 100644 --- a/src/test/ui/extenv/extenv-arg-2-not-string-literal.stderr +++ b/src/test/ui/extenv/extenv-arg-2-not-string-literal.stderr @@ -1,5 +1,5 @@ error: expected string literal - --> $DIR/extenv-arg-2-not-string-literal.rs:11:25 + --> $DIR/extenv-arg-2-not-string-literal.rs:1:25 | LL | fn main() { env!("one", 10); } //~ ERROR: expected string literal | ^^ diff --git a/src/test/ui/extenv/extenv-no-args.rs b/src/test/ui/extenv/extenv-no-args.rs index afa47dbe74466..9f221ed10d74d 100644 --- a/src/test/ui/extenv/extenv-no-args.rs +++ b/src/test/ui/extenv/extenv-no-args.rs @@ -1,11 +1 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { env!(); } //~ ERROR: env! takes 1 or 2 arguments diff --git a/src/test/ui/extenv/extenv-no-args.stderr b/src/test/ui/extenv/extenv-no-args.stderr index ebd97c014f1f8..7ae8a6f1858a9 100644 --- a/src/test/ui/extenv/extenv-no-args.stderr +++ b/src/test/ui/extenv/extenv-no-args.stderr @@ -1,5 +1,5 @@ error: env! takes 1 or 2 arguments - --> $DIR/extenv-no-args.rs:11:13 + --> $DIR/extenv-no-args.rs:1:13 | LL | fn main() { env!(); } //~ ERROR: env! takes 1 or 2 arguments | ^^^^^^^ diff --git a/src/test/ui/extenv/extenv-not-defined-custom.rs b/src/test/ui/extenv/extenv-not-defined-custom.rs index 485b6c09f0a49..30b72783f5ccc 100644 --- a/src/test/ui/extenv/extenv-not-defined-custom.rs +++ b/src/test/ui/extenv/extenv-not-defined-custom.rs @@ -1,11 +1 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { env!("__HOPEFULLY_NOT_DEFINED__", "my error message"); } //~ ERROR: my error message diff --git a/src/test/ui/extenv/extenv-not-defined-custom.stderr b/src/test/ui/extenv/extenv-not-defined-custom.stderr index 845f87df91696..34e5b7f9f2364 100644 --- a/src/test/ui/extenv/extenv-not-defined-custom.stderr +++ b/src/test/ui/extenv/extenv-not-defined-custom.stderr @@ -1,5 +1,5 @@ error: my error message - --> $DIR/extenv-not-defined-custom.rs:11:13 + --> $DIR/extenv-not-defined-custom.rs:1:13 | LL | fn main() { env!("__HOPEFULLY_NOT_DEFINED__", "my error message"); } //~ ERROR: my error message | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/extenv/extenv-not-defined-default.rs b/src/test/ui/extenv/extenv-not-defined-default.rs index d99d4dc33a27a..30a06a25465f4 100644 --- a/src/test/ui/extenv/extenv-not-defined-default.rs +++ b/src/test/ui/extenv/extenv-not-defined-default.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { env!("__HOPEFULLY_NOT_DEFINED__"); //~^ ERROR: environment variable `__HOPEFULLY_NOT_DEFINED__` not defined diff --git a/src/test/ui/extenv/extenv-not-defined-default.stderr b/src/test/ui/extenv/extenv-not-defined-default.stderr index 0db6f536edbd1..4bfe330f59235 100644 --- a/src/test/ui/extenv/extenv-not-defined-default.stderr +++ b/src/test/ui/extenv/extenv-not-defined-default.stderr @@ -1,5 +1,5 @@ error: environment variable `__HOPEFULLY_NOT_DEFINED__` not defined - --> $DIR/extenv-not-defined-default.rs:12:5 + --> $DIR/extenv-not-defined-default.rs:2:5 | LL | env!("__HOPEFULLY_NOT_DEFINED__"); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/extenv/extenv-not-string-literal.rs b/src/test/ui/extenv/extenv-not-string-literal.rs index 07ce47a14d83d..3eaa0b5daaf6f 100644 --- a/src/test/ui/extenv/extenv-not-string-literal.rs +++ b/src/test/ui/extenv/extenv-not-string-literal.rs @@ -1,11 +1 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { env!(10, "two"); } //~ ERROR: expected string literal diff --git a/src/test/ui/extenv/extenv-not-string-literal.stderr b/src/test/ui/extenv/extenv-not-string-literal.stderr index 1660d8665dc39..66645b24a49ad 100644 --- a/src/test/ui/extenv/extenv-not-string-literal.stderr +++ b/src/test/ui/extenv/extenv-not-string-literal.stderr @@ -1,5 +1,5 @@ error: expected string literal - --> $DIR/extenv-not-string-literal.rs:11:18 + --> $DIR/extenv-not-string-literal.rs:1:18 | LL | fn main() { env!(10, "two"); } //~ ERROR: expected string literal | ^^ diff --git a/src/test/ui/extenv/extenv-too-many-args.rs b/src/test/ui/extenv/extenv-too-many-args.rs index c6c4f0ec6b807..1adbee583dbe3 100644 --- a/src/test/ui/extenv/extenv-too-many-args.rs +++ b/src/test/ui/extenv/extenv-too-many-args.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { env!("one", "two", "three"); } //~ ERROR: env! takes 1 or 2 arguments diff --git a/src/test/ui/extenv/extenv-too-many-args.stderr b/src/test/ui/extenv/extenv-too-many-args.stderr index e4eda9e9e9ab3..43695d88eaf68 100644 --- a/src/test/ui/extenv/extenv-too-many-args.stderr +++ b/src/test/ui/extenv/extenv-too-many-args.stderr @@ -1,5 +1,5 @@ error: env! takes 1 or 2 arguments - --> $DIR/extenv-too-many-args.rs:11:13 + --> $DIR/extenv-too-many-args.rs:1:13 | LL | fn main() { env!("one", "two", "three"); } //~ ERROR: env! takes 1 or 2 arguments | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/extern/auxiliary/m1.rs b/src/test/ui/extern/auxiliary/m1.rs index b61667cfd882c..b76b4321d62aa 100644 --- a/src/test/ui/extern/auxiliary/m1.rs +++ b/src/test/ui/extern/auxiliary/m1.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn foo() {} diff --git a/src/test/ui/extern/auxiliary/m2.rs b/src/test/ui/extern/auxiliary/m2.rs index 94ff5e4497fe9..c5c0bc606cd69 100644 --- a/src/test/ui/extern/auxiliary/m2.rs +++ b/src/test/ui/extern/auxiliary/m2.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn bar() {} diff --git a/src/test/ui/extern/extern-const.fixed b/src/test/ui/extern/extern-const.fixed index 6e131ca41aa97..7e2d705c38f77 100644 --- a/src/test/ui/extern/extern-const.fixed +++ b/src/test/ui/extern/extern-const.fixed @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix // compile-flags: -Z continue-parse-after-error diff --git a/src/test/ui/extern/extern-const.rs b/src/test/ui/extern/extern-const.rs index 4a766b9724dc2..03800f7a43ed7 100644 --- a/src/test/ui/extern/extern-const.rs +++ b/src/test/ui/extern/extern-const.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix // compile-flags: -Z continue-parse-after-error diff --git a/src/test/ui/extern/extern-const.stderr b/src/test/ui/extern/extern-const.stderr index cbed5e56c76c4..fff9d3bb019c5 100644 --- a/src/test/ui/extern/extern-const.stderr +++ b/src/test/ui/extern/extern-const.stderr @@ -1,5 +1,5 @@ error: extern items cannot be `const` - --> $DIR/extern-const.rs:15:5 + --> $DIR/extern-const.rs:5:5 | LL | const C: u8; //~ ERROR extern items cannot be `const` | ^^^^^ help: try using a static value: `static` diff --git a/src/test/ui/extern/extern-crate-rename.rs b/src/test/ui/extern/extern-crate-rename.rs index b58149fb0b8dc..fc8afc3e13461 100644 --- a/src/test/ui/extern/extern-crate-rename.rs +++ b/src/test/ui/extern/extern-crate-rename.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:m1.rs // aux-build:m2.rs diff --git a/src/test/ui/extern/extern-crate-rename.stderr b/src/test/ui/extern/extern-crate-rename.stderr index 2c2723fe4c5c8..7e836ae03ba7c 100644 --- a/src/test/ui/extern/extern-crate-rename.stderr +++ b/src/test/ui/extern/extern-crate-rename.stderr @@ -1,5 +1,5 @@ error[E0259]: the name `m1` is defined multiple times - --> $DIR/extern-crate-rename.rs:16:1 + --> $DIR/extern-crate-rename.rs:6:1 | LL | extern crate m1; | ---------------- previous import of the extern crate `m1` here diff --git a/src/test/ui/extern/extern-crate-visibility.rs b/src/test/ui/extern/extern-crate-visibility.rs index 6bb88e409105a..b51e44390313b 100644 --- a/src/test/ui/extern/extern-crate-visibility.rs +++ b/src/test/ui/extern/extern-crate-visibility.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod foo { extern crate core; } diff --git a/src/test/ui/extern/extern-crate-visibility.stderr b/src/test/ui/extern/extern-crate-visibility.stderr index cadb636bf0d97..1e66075768d3c 100644 --- a/src/test/ui/extern/extern-crate-visibility.stderr +++ b/src/test/ui/extern/extern-crate-visibility.stderr @@ -1,11 +1,11 @@ error[E0603]: extern crate `core` is private - --> $DIR/extern-crate-visibility.rs:16:5 + --> $DIR/extern-crate-visibility.rs:6:5 | LL | use foo::core::cell; //~ ERROR extern crate `core` is private | ^^^^^^^^^^^^^^^ error[E0603]: extern crate `core` is private - --> $DIR/extern-crate-visibility.rs:19:5 + --> $DIR/extern-crate-visibility.rs:9:5 | LL | foo::core::cell::Cell::new(0); //~ ERROR extern crate `core` is private | ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/extern/extern-macro.rs b/src/test/ui/extern/extern-macro.rs index 4b1bf7d8f7923..03030d483e4d7 100644 --- a/src/test/ui/extern/extern-macro.rs +++ b/src/test/ui/extern/extern-macro.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // #41719 fn main() { diff --git a/src/test/ui/extern/extern-macro.stderr b/src/test/ui/extern/extern-macro.stderr index b5515bfcc6423..cb899a37aa825 100644 --- a/src/test/ui/extern/extern-macro.stderr +++ b/src/test/ui/extern/extern-macro.stderr @@ -1,5 +1,5 @@ error: fail to resolve non-ident macro path - --> $DIR/extern-macro.rs:15:13 + --> $DIR/extern-macro.rs:5:13 | LL | let _ = Foo::bar!(); //~ ERROR fail to resolve non-ident macro path | ^^^^^^^^ diff --git a/src/test/ui/extern/extern-main-fn.rs b/src/test/ui/extern/extern-main-fn.rs index d9bdb4ecd0477..dacebfbecf5d6 100644 --- a/src/test/ui/extern/extern-main-fn.rs +++ b/src/test/ui/extern/extern-main-fn.rs @@ -1,11 +1 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern fn main() {} //~ ERROR: main function has wrong type [E0580] diff --git a/src/test/ui/extern/extern-main-fn.stderr b/src/test/ui/extern/extern-main-fn.stderr index 24e9d138693e4..f2134701deeeb 100644 --- a/src/test/ui/extern/extern-main-fn.stderr +++ b/src/test/ui/extern/extern-main-fn.stderr @@ -1,5 +1,5 @@ error[E0580]: main function has wrong type - --> $DIR/extern-main-fn.rs:11:1 + --> $DIR/extern-main-fn.rs:1:1 | LL | extern fn main() {} //~ ERROR: main function has wrong type [E0580] | ^^^^^^^^^^^^^^^^ expected "Rust" fn, found "C" fn diff --git a/src/test/ui/extern/extern-types-distinct-types.rs b/src/test/ui/extern/extern-types-distinct-types.rs index 8b434bbfc6d33..000ba5432e492 100644 --- a/src/test/ui/extern/extern-types-distinct-types.rs +++ b/src/test/ui/extern/extern-types-distinct-types.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(extern_types)] extern { diff --git a/src/test/ui/extern/extern-types-distinct-types.stderr b/src/test/ui/extern/extern-types-distinct-types.stderr index 6c74f63744ff9..b7b6f2cf04aeb 100644 --- a/src/test/ui/extern/extern-types-distinct-types.stderr +++ b/src/test/ui/extern/extern-types-distinct-types.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/extern-types-distinct-types.rs:19:5 + --> $DIR/extern-types-distinct-types.rs:9:5 | LL | r //~ ERROR mismatched types | ^ expected extern type `B`, found extern type `A` diff --git a/src/test/ui/extern/extern-types-not-sync-send.rs b/src/test/ui/extern/extern-types-not-sync-send.rs index 10abb80a2f71b..3af8b9bf4aa92 100644 --- a/src/test/ui/extern/extern-types-not-sync-send.rs +++ b/src/test/ui/extern/extern-types-not-sync-send.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Make sure extern types are !Sync and !Send. #![feature(extern_types)] diff --git a/src/test/ui/extern/extern-types-not-sync-send.stderr b/src/test/ui/extern/extern-types-not-sync-send.stderr index f076aa0fd6817..bc9d96df776ed 100644 --- a/src/test/ui/extern/extern-types-not-sync-send.stderr +++ b/src/test/ui/extern/extern-types-not-sync-send.stderr @@ -1,25 +1,25 @@ error[E0277]: `A` cannot be shared between threads safely - --> $DIR/extern-types-not-sync-send.rs:23:5 + --> $DIR/extern-types-not-sync-send.rs:13:5 | LL | assert_sync::(); | ^^^^^^^^^^^^^^^^ `A` cannot be shared between threads safely | = help: the trait `std::marker::Sync` is not implemented for `A` note: required by `assert_sync` - --> $DIR/extern-types-not-sync-send.rs:19:1 + --> $DIR/extern-types-not-sync-send.rs:9:1 | LL | fn assert_sync() { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: `A` cannot be sent between threads safely - --> $DIR/extern-types-not-sync-send.rs:26:5 + --> $DIR/extern-types-not-sync-send.rs:16:5 | LL | assert_send::(); | ^^^^^^^^^^^^^^^^ `A` cannot be sent between threads safely | = help: the trait `std::marker::Send` is not implemented for `A` note: required by `assert_send` - --> $DIR/extern-types-not-sync-send.rs:20:1 + --> $DIR/extern-types-not-sync-send.rs:10:1 | LL | fn assert_send() { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/extern/extern-types-unsized.rs b/src/test/ui/extern/extern-types-unsized.rs index f2db455386810..a296ae0739fe7 100644 --- a/src/test/ui/extern/extern-types-unsized.rs +++ b/src/test/ui/extern/extern-types-unsized.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Make sure extern types are !Sized. #![feature(extern_types)] diff --git a/src/test/ui/extern/extern-types-unsized.stderr b/src/test/ui/extern/extern-types-unsized.stderr index 19df7bdd347aa..48d0aa8c601d6 100644 --- a/src/test/ui/extern/extern-types-unsized.stderr +++ b/src/test/ui/extern/extern-types-unsized.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `A` cannot be known at compilation time - --> $DIR/extern-types-unsized.rs:32:5 + --> $DIR/extern-types-unsized.rs:22:5 | LL | assert_sized::(); | ^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time @@ -7,13 +7,13 @@ LL | assert_sized::(); = help: the trait `std::marker::Sized` is not implemented for `A` = note: to learn more, visit note: required by `assert_sized` - --> $DIR/extern-types-unsized.rs:29:1 + --> $DIR/extern-types-unsized.rs:19:1 | LL | fn assert_sized() { } | ^^^^^^^^^^^^^^^^^^^^ error[E0277]: the size for values of type `A` cannot be known at compilation time - --> $DIR/extern-types-unsized.rs:35:5 + --> $DIR/extern-types-unsized.rs:25:5 | LL | assert_sized::(); | ^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time @@ -22,13 +22,13 @@ LL | assert_sized::(); = note: to learn more, visit = note: required because it appears within the type `Foo` note: required by `assert_sized` - --> $DIR/extern-types-unsized.rs:29:1 + --> $DIR/extern-types-unsized.rs:19:1 | LL | fn assert_sized() { } | ^^^^^^^^^^^^^^^^^^^^ error[E0277]: the size for values of type `A` cannot be known at compilation time - --> $DIR/extern-types-unsized.rs:38:5 + --> $DIR/extern-types-unsized.rs:28:5 | LL | assert_sized::>(); | ^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time @@ -37,13 +37,13 @@ LL | assert_sized::>(); = note: to learn more, visit = note: required because it appears within the type `Bar` note: required by `assert_sized` - --> $DIR/extern-types-unsized.rs:29:1 + --> $DIR/extern-types-unsized.rs:19:1 | LL | fn assert_sized() { } | ^^^^^^^^^^^^^^^^^^^^ error[E0277]: the size for values of type `A` cannot be known at compilation time - --> $DIR/extern-types-unsized.rs:41:5 + --> $DIR/extern-types-unsized.rs:31:5 | LL | assert_sized::>>(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time @@ -53,7 +53,7 @@ LL | assert_sized::>>(); = note: required because it appears within the type `Bar` = note: required because it appears within the type `Bar>` note: required by `assert_sized` - --> $DIR/extern-types-unsized.rs:29:1 + --> $DIR/extern-types-unsized.rs:19:1 | LL | fn assert_sized() { } | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/extern/extern-with-type-bounds.rs b/src/test/ui/extern/extern-with-type-bounds.rs index 9493a1ae89260..8f9683e4a7485 100644 --- a/src/test/ui/extern/extern-with-type-bounds.rs +++ b/src/test/ui/extern/extern-with-type-bounds.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(intrinsics)] extern "rust-intrinsic" { diff --git a/src/test/ui/extern/extern-with-type-bounds.stderr b/src/test/ui/extern/extern-with-type-bounds.stderr index 4b62a12d36b97..acd0596422f8a 100644 --- a/src/test/ui/extern/extern-with-type-bounds.stderr +++ b/src/test/ui/extern/extern-with-type-bounds.stderr @@ -1,5 +1,5 @@ error[E0405]: cannot find trait `NoSuchTrait` in this scope - --> $DIR/extern-with-type-bounds.rs:26:20 + --> $DIR/extern-with-type-bounds.rs:16:20 | LL | fn align_of() -> usize; | ^^^^^^^^^^^ not found in this scope diff --git a/src/test/ui/extern/extern-wrong-value-type.rs b/src/test/ui/extern/extern-wrong-value-type.rs index ea313385c1018..aba52427eb01b 100644 --- a/src/test/ui/extern/extern-wrong-value-type.rs +++ b/src/test/ui/extern/extern-wrong-value-type.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern fn f() { } diff --git a/src/test/ui/extern/extern-wrong-value-type.stderr b/src/test/ui/extern/extern-wrong-value-type.stderr index 0d8185839ccb4..dce33f3d6323d 100644 --- a/src/test/ui/extern/extern-wrong-value-type.stderr +++ b/src/test/ui/extern/extern-wrong-value-type.stderr @@ -1,5 +1,5 @@ error[E0277]: expected a `std::ops::Fn<()>` closure, found `extern "C" fn() {f}` - --> $DIR/extern-wrong-value-type.rs:19:5 + --> $DIR/extern-wrong-value-type.rs:9:5 | LL | is_fn(f); | ^^^^^ expected an `Fn<()>` closure, found `extern "C" fn() {f}` @@ -7,7 +7,7 @@ LL | is_fn(f); = help: the trait `std::ops::Fn<()>` is not implemented for `extern "C" fn() {f}` = note: wrap the `extern "C" fn() {f}` in a closure with no arguments: `|| { /* code */ } note: required by `is_fn` - --> $DIR/extern-wrong-value-type.rs:14:1 + --> $DIR/extern-wrong-value-type.rs:4:1 | LL | fn is_fn(_: F) where F: Fn() {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/extern/external-doc-error.rs b/src/test/ui/extern/external-doc-error.rs index 2cd17804e06ca..f4e9380983829 100644 --- a/src/test/ui/extern/external-doc-error.rs +++ b/src/test/ui/extern/external-doc-error.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // normalize-stderr-test: "The system cannot find the file specified\." -> "No such file or directory" // ignore-tidy-linelength diff --git a/src/test/ui/extern/external-doc-error.stderr b/src/test/ui/extern/external-doc-error.stderr index 98ade5de7f3a7..6d12e9b721aac 100644 --- a/src/test/ui/extern/external-doc-error.stderr +++ b/src/test/ui/extern/external-doc-error.stderr @@ -1,5 +1,5 @@ error: couldn't read $DIR/not-a-file.md: No such file or directory (os error 2) - --> $DIR/external-doc-error.rs:16:1 + --> $DIR/external-doc-error.rs:6:1 | LL | #[doc(include = "not-a-file.md")] //~ ERROR: couldn't read | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/extoption_env-no-args.rs b/src/test/ui/extoption_env-no-args.rs index fd56756584ae3..bc5f77bc62e5b 100644 --- a/src/test/ui/extoption_env-no-args.rs +++ b/src/test/ui/extoption_env-no-args.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { option_env!(); } //~ ERROR: option_env! takes 1 argument diff --git a/src/test/ui/extoption_env-no-args.stderr b/src/test/ui/extoption_env-no-args.stderr index d01aefe46b10e..34fe289cd98a0 100644 --- a/src/test/ui/extoption_env-no-args.stderr +++ b/src/test/ui/extoption_env-no-args.stderr @@ -1,5 +1,5 @@ error: option_env! takes 1 argument - --> $DIR/extoption_env-no-args.rs:11:13 + --> $DIR/extoption_env-no-args.rs:1:13 | LL | fn main() { option_env!(); } //~ ERROR: option_env! takes 1 argument | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/extoption_env-not-string-literal.rs b/src/test/ui/extoption_env-not-string-literal.rs index 6371a5c711d6b..27c3a8e83db56 100644 --- a/src/test/ui/extoption_env-not-string-literal.rs +++ b/src/test/ui/extoption_env-not-string-literal.rs @@ -1,11 +1 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { option_env!(10); } //~ ERROR: argument must be a string literal diff --git a/src/test/ui/extoption_env-not-string-literal.stderr b/src/test/ui/extoption_env-not-string-literal.stderr index af4163259ea85..8c97b57e0ab99 100644 --- a/src/test/ui/extoption_env-not-string-literal.stderr +++ b/src/test/ui/extoption_env-not-string-literal.stderr @@ -1,5 +1,5 @@ error: argument must be a string literal - --> $DIR/extoption_env-not-string-literal.rs:11:25 + --> $DIR/extoption_env-not-string-literal.rs:1:25 | LL | fn main() { option_env!(10); } //~ ERROR: argument must be a string literal | ^^ diff --git a/src/test/ui/extoption_env-too-many-args.rs b/src/test/ui/extoption_env-too-many-args.rs index b31e857c14e13..ecc8b61ac8589 100644 --- a/src/test/ui/extoption_env-too-many-args.rs +++ b/src/test/ui/extoption_env-too-many-args.rs @@ -1,11 +1 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { option_env!("one", "two"); } //~ ERROR: option_env! takes 1 argument diff --git a/src/test/ui/extoption_env-too-many-args.stderr b/src/test/ui/extoption_env-too-many-args.stderr index 0e4569d7a0199..6b5ade6daef2c 100644 --- a/src/test/ui/extoption_env-too-many-args.stderr +++ b/src/test/ui/extoption_env-too-many-args.stderr @@ -1,5 +1,5 @@ error: option_env! takes 1 argument - --> $DIR/extoption_env-too-many-args.rs:11:13 + --> $DIR/extoption_env-too-many-args.rs:1:13 | LL | fn main() { option_env!("one", "two"); } //~ ERROR: option_env! takes 1 argument | ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/fail-no-dead-code-core.rs b/src/test/ui/fail-no-dead-code-core.rs index aed76e36fca14..bc74e807783e1 100644 --- a/src/test/ui/fail-no-dead-code-core.rs +++ b/src/test/ui/fail-no-dead-code-core.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(dead_code)] #![allow(unreachable_code)] diff --git a/src/test/ui/fail-no-dead-code-core.stderr b/src/test/ui/fail-no-dead-code-core.stderr index d2af77a28d348..b78aed4568306 100644 --- a/src/test/ui/fail-no-dead-code-core.stderr +++ b/src/test/ui/fail-no-dead-code-core.stderr @@ -1,11 +1,11 @@ error: function is never used: `foo` - --> $DIR/fail-no-dead-code-core.rs:17:1 + --> $DIR/fail-no-dead-code-core.rs:7:1 | LL | fn foo() { //~ ERROR function is never used | ^^^^^^^^ | note: lint level defined here - --> $DIR/fail-no-dead-code-core.rs:11:9 + --> $DIR/fail-no-dead-code-core.rs:1:9 | LL | #![deny(dead_code)] | ^^^^^^^^^ diff --git a/src/test/ui/fail-no-dead-code.rs b/src/test/ui/fail-no-dead-code.rs index 6e5d3a313556e..2b69985d33d46 100644 --- a/src/test/ui/fail-no-dead-code.rs +++ b/src/test/ui/fail-no-dead-code.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(dead_code)] #![allow(unreachable_code)] diff --git a/src/test/ui/fail-no-dead-code.stderr b/src/test/ui/fail-no-dead-code.stderr index f355c7dd731db..a435829593110 100644 --- a/src/test/ui/fail-no-dead-code.stderr +++ b/src/test/ui/fail-no-dead-code.stderr @@ -1,11 +1,11 @@ error: function is never used: `foo` - --> $DIR/fail-no-dead-code.rs:14:1 + --> $DIR/fail-no-dead-code.rs:4:1 | LL | fn foo() { //~ ERROR function is never used | ^^^^^^^^ | note: lint level defined here - --> $DIR/fail-no-dead-code.rs:11:9 + --> $DIR/fail-no-dead-code.rs:1:9 | LL | #![deny(dead_code)] | ^^^^^^^^^ diff --git a/src/test/ui/fail-simple.rs b/src/test/ui/fail-simple.rs index a20ff864705a1..cd81a5d0a0fc6 100644 --- a/src/test/ui/fail-simple.rs +++ b/src/test/ui/fail-simple.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { panic!(@); //~ ERROR no rules expected the token `@` } diff --git a/src/test/ui/fail-simple.stderr b/src/test/ui/fail-simple.stderr index 764f2c464bcb8..2096714762e12 100644 --- a/src/test/ui/fail-simple.stderr +++ b/src/test/ui/fail-simple.stderr @@ -1,5 +1,5 @@ error: no rules expected the token `@` - --> $DIR/fail-simple.rs:12:12 + --> $DIR/fail-simple.rs:2:12 | LL | panic!(@); //~ ERROR no rules expected the token `@` | ^ diff --git a/src/test/ui/fat-ptr-cast.rs b/src/test/ui/fat-ptr-cast.rs index 0802963ad228f..eb419ba2036a4 100644 --- a/src/test/ui/fat-ptr-cast.rs +++ b/src/test/ui/fat-ptr-cast.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Trait {} // Make sure casts between thin-pointer <-> fat pointer obey RFC401 diff --git a/src/test/ui/fat-ptr-cast.stderr b/src/test/ui/fat-ptr-cast.stderr index 778a4cf1fa01f..936cdc559bd14 100644 --- a/src/test/ui/fat-ptr-cast.stderr +++ b/src/test/ui/fat-ptr-cast.stderr @@ -1,5 +1,5 @@ error[E0606]: casting `&[i32]` as `usize` is invalid - --> $DIR/fat-ptr-cast.rs:20:5 + --> $DIR/fat-ptr-cast.rs:10:5 | LL | a as usize; //~ ERROR casting | ^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | a as usize; //~ ERROR casting = help: cast through a raw pointer first error[E0606]: casting `&[i32]` as `isize` is invalid - --> $DIR/fat-ptr-cast.rs:21:5 + --> $DIR/fat-ptr-cast.rs:11:5 | LL | a as isize; //~ ERROR casting | ^^^^^^^^^^ @@ -15,7 +15,7 @@ LL | a as isize; //~ ERROR casting = help: cast through a raw pointer first error[E0606]: casting `&[i32]` as `i16` is invalid - --> $DIR/fat-ptr-cast.rs:22:5 + --> $DIR/fat-ptr-cast.rs:12:5 | LL | a as i16; //~ ERROR casting `&[i32]` as `i16` is invalid | ^^^^^^^^ @@ -23,7 +23,7 @@ LL | a as i16; //~ ERROR casting `&[i32]` as `i16` is invalid = help: cast through a raw pointer first error[E0606]: casting `&[i32]` as `u32` is invalid - --> $DIR/fat-ptr-cast.rs:23:5 + --> $DIR/fat-ptr-cast.rs:13:5 | LL | a as u32; //~ ERROR casting `&[i32]` as `u32` is invalid | ^^^^^^^^ @@ -31,7 +31,7 @@ LL | a as u32; //~ ERROR casting `&[i32]` as `u32` is invalid = help: cast through a raw pointer first error[E0605]: non-primitive cast: `std::boxed::Box<[i32]>` as `usize` - --> $DIR/fat-ptr-cast.rs:24:5 + --> $DIR/fat-ptr-cast.rs:14:5 | LL | b as usize; //~ ERROR non-primitive cast | ^^^^^^^^^^ @@ -39,7 +39,7 @@ LL | b as usize; //~ ERROR non-primitive cast = note: an `as` expression can only be used to convert between primitive types. Consider using the `From` trait error[E0606]: casting `*const [i32]` as `usize` is invalid - --> $DIR/fat-ptr-cast.rs:25:5 + --> $DIR/fat-ptr-cast.rs:15:5 | LL | p as usize; | ^^^^^^^^^^ @@ -47,19 +47,19 @@ LL | p as usize; = help: cast through a thin pointer first error[E0607]: cannot cast thin pointer `*const i32` to fat pointer `*const [i32]` - --> $DIR/fat-ptr-cast.rs:29:5 + --> $DIR/fat-ptr-cast.rs:19:5 | LL | q as *const [i32]; //~ ERROR cannot cast | ^^^^^^^^^^^^^^^^^ error[E0606]: casting `usize` as `*mut (dyn Trait + 'static)` is invalid - --> $DIR/fat-ptr-cast.rs:32:37 + --> $DIR/fat-ptr-cast.rs:22:37 | LL | let t: *mut (Trait + 'static) = 0 as *mut _; //~ ERROR casting | ^^^^^^^^^^^ error[E0606]: casting `usize` as `*const str` is invalid - --> $DIR/fat-ptr-cast.rs:33:32 + --> $DIR/fat-ptr-cast.rs:23:32 | LL | let mut fail: *const str = 0 as *const str; //~ ERROR casting | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gate-exhaustive_integer_patterns.rs b/src/test/ui/feature-gate-exhaustive_integer_patterns.rs index 3aa1522945548..c54f0c49e9a50 100644 --- a/src/test/ui/feature-gate-exhaustive_integer_patterns.rs +++ b/src/test/ui/feature-gate-exhaustive_integer_patterns.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x: u8 = 0; match x { //~ ERROR non-exhaustive patterns: `_` not covered diff --git a/src/test/ui/feature-gate-exhaustive_integer_patterns.stderr b/src/test/ui/feature-gate-exhaustive_integer_patterns.stderr index 63d98f6b5eb64..9d4e476b9480c 100644 --- a/src/test/ui/feature-gate-exhaustive_integer_patterns.stderr +++ b/src/test/ui/feature-gate-exhaustive_integer_patterns.stderr @@ -1,5 +1,5 @@ error[E0004]: non-exhaustive patterns: `_` not covered - --> $DIR/feature-gate-exhaustive_integer_patterns.rs:13:11 + --> $DIR/feature-gate-exhaustive_integer_patterns.rs:3:11 | LL | match x { //~ ERROR non-exhaustive patterns: `_` not covered | ^ pattern `_` not covered diff --git a/src/test/ui/feature-gate-unsized_locals.rs b/src/test/ui/feature-gate-unsized_locals.rs index 7f1f22fa38fb1..a8f81f3f113c9 100644 --- a/src/test/ui/feature-gate-unsized_locals.rs +++ b/src/test/ui/feature-gate-unsized_locals.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn f(f: FnOnce()) {} //~^ ERROR E0277 diff --git a/src/test/ui/feature-gate-unsized_locals.stderr b/src/test/ui/feature-gate-unsized_locals.stderr index a0440a373d2fc..77313ed02151f 100644 --- a/src/test/ui/feature-gate-unsized_locals.stderr +++ b/src/test/ui/feature-gate-unsized_locals.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `(dyn std::ops::FnOnce() + 'static)` cannot be known at compilation time - --> $DIR/feature-gate-unsized_locals.rs:11:6 + --> $DIR/feature-gate-unsized_locals.rs:1:6 | LL | fn f(f: FnOnce()) {} | ^ doesn't have a size known at compile-time diff --git a/src/test/ui/feature-gate/duplicate-features.rs b/src/test/ui/feature-gate/duplicate-features.rs index 163a28772a59e..d8f7818054a12 100644 --- a/src/test/ui/feature-gate/duplicate-features.rs +++ b/src/test/ui/feature-gate/duplicate-features.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(stable_features)] #![feature(rust1)] diff --git a/src/test/ui/feature-gate/duplicate-features.stderr b/src/test/ui/feature-gate/duplicate-features.stderr index d55297bdd0e7b..18adf3a880ace 100644 --- a/src/test/ui/feature-gate/duplicate-features.stderr +++ b/src/test/ui/feature-gate/duplicate-features.stderr @@ -1,11 +1,11 @@ error[E0636]: the feature `if_let` has already been declared - --> $DIR/duplicate-features.rs:17:12 + --> $DIR/duplicate-features.rs:7:12 | LL | #![feature(if_let)] //~ ERROR the feature `if_let` has already been declared | ^^^^^^ error[E0636]: the feature `rust1` has already been declared - --> $DIR/duplicate-features.rs:14:12 + --> $DIR/duplicate-features.rs:4:12 | LL | #![feature(rust1)] //~ ERROR the feature `rust1` has already been declared | ^^^^^ diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-bench.rs b/src/test/ui/feature-gate/issue-43106-gating-of-bench.rs index 6c22679933874..b70fb1f7a0e49 100644 --- a/src/test/ui/feature-gate/issue-43106-gating-of-bench.rs +++ b/src/test/ui/feature-gate/issue-43106-gating-of-bench.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: `main` function not found // At time of authorship, a crate-level #![bench] with no `--test` diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs.rs b/src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs.rs index dd235cb9c3aa9..25c52fe237a77 100644 --- a/src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs.rs +++ b/src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test enumerates as many compiler-builtin ungated attributes as // possible (that is, all the mutually compatible ones), and checks // that we get "expected" (*) warnings for each in the various weird diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs.stderr b/src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs.stderr index fd38fb6f97641..d48f6940af498 100644 --- a/src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs.stderr +++ b/src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs.stderr @@ -1,185 +1,185 @@ warning: unknown lint: `x5400` - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:50:33 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:40:33 | LL | #![warn (x5400)] //~ WARN unknown lint: `x5400` | ^^^^^ | note: lint level defined here - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:44:28 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:34:28 | LL | #![warn(unused_attributes, unknown_lints)] | ^^^^^^^^^^^^^ warning: unknown lint: `x5300` - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:51:33 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:41:33 | LL | #![allow (x5300)] //~ WARN unknown lint: `x5300` | ^^^^^ warning: unknown lint: `x5200` - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:52:33 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:42:33 | LL | #![forbid (x5200)] //~ WARN unknown lint: `x5200` | ^^^^^ warning: unknown lint: `x5100` - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:53:33 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:43:33 | LL | #![deny (x5100)] //~ WARN unknown lint: `x5100` | ^^^^^ warning: unknown lint: `x5400` - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:115:8 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:105:8 | LL | #[warn(x5400)] | ^^^^^ warning: unknown lint: `x5400` - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:118:25 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:108:25 | LL | mod inner { #![warn(x5400)] } | ^^^^^ warning: unknown lint: `x5400` - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:121:12 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:111:12 | LL | #[warn(x5400)] fn f() { } | ^^^^^ warning: unknown lint: `x5400` - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:124:12 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:114:12 | LL | #[warn(x5400)] struct S; | ^^^^^ warning: unknown lint: `x5400` - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:127:12 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:117:12 | LL | #[warn(x5400)] type T = S; | ^^^^^ warning: unknown lint: `x5400` - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:130:12 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:120:12 | LL | #[warn(x5400)] impl S { } | ^^^^^ warning: unknown lint: `x5300` - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:134:9 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:124:9 | LL | #[allow(x5300)] | ^^^^^ warning: unknown lint: `x5300` - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:137:26 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:127:26 | LL | mod inner { #![allow(x5300)] } | ^^^^^ warning: unknown lint: `x5300` - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:140:13 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:130:13 | LL | #[allow(x5300)] fn f() { } | ^^^^^ warning: unknown lint: `x5300` - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:143:13 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:133:13 | LL | #[allow(x5300)] struct S; | ^^^^^ warning: unknown lint: `x5300` - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:146:13 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:136:13 | LL | #[allow(x5300)] type T = S; | ^^^^^ warning: unknown lint: `x5300` - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:149:13 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:139:13 | LL | #[allow(x5300)] impl S { } | ^^^^^ warning: unknown lint: `x5200` - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:153:10 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:143:10 | LL | #[forbid(x5200)] | ^^^^^ warning: unknown lint: `x5200` - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:156:27 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:146:27 | LL | mod inner { #![forbid(x5200)] } | ^^^^^ warning: unknown lint: `x5200` - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:159:14 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:149:14 | LL | #[forbid(x5200)] fn f() { } | ^^^^^ warning: unknown lint: `x5200` - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:162:14 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:152:14 | LL | #[forbid(x5200)] struct S; | ^^^^^ warning: unknown lint: `x5200` - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:165:14 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:155:14 | LL | #[forbid(x5200)] type T = S; | ^^^^^ warning: unknown lint: `x5200` - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:168:14 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:158:14 | LL | #[forbid(x5200)] impl S { } | ^^^^^ warning: unknown lint: `x5100` - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:172:8 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:162:8 | LL | #[deny(x5100)] | ^^^^^ warning: unknown lint: `x5100` - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:175:25 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:165:25 | LL | mod inner { #![deny(x5100)] } | ^^^^^ warning: unknown lint: `x5100` - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:178:12 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:168:12 | LL | #[deny(x5100)] fn f() { } | ^^^^^ warning: unknown lint: `x5100` - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:181:12 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:171:12 | LL | #[deny(x5100)] struct S; | ^^^^^ warning: unknown lint: `x5100` - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:184:12 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:174:12 | LL | #[deny(x5100)] type T = S; | ^^^^^ warning: unknown lint: `x5100` - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:187:12 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:177:12 | LL | #[deny(x5100)] impl S { } | ^^^^^ warning: macro_escape is a deprecated synonym for macro_use - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:501:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:491:1 | LL | #[macro_escape] | ^^^^^^^^^^^^^^^ warning: macro_escape is a deprecated synonym for macro_use - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:504:17 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:494:17 | LL | mod inner { #![macro_escape] } | ^^^^^^^^^^^^^^^^ @@ -187,7 +187,7 @@ LL | mod inner { #![macro_escape] } = help: consider an outer attribute, #[macro_use] mod ... warning: `repr` attribute isn't configurable with a literal - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:317:17 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:307:17 | LL | mod inner { #![repr="3900"] } | ^^^^^^^^^^^^^^^ needs a hint @@ -197,7 +197,7 @@ LL | mod inner { #![repr="3900"] } = note: for more information, visit warning: `repr` attribute isn't configurable with a literal - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:321:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:311:5 | LL | #[repr = "3900"] fn f() { } | ^^^^^^^^^^^^^^^^ needs a hint @@ -206,7 +206,7 @@ LL | #[repr = "3900"] fn f() { } = note: for more information, visit warning: `repr` attribute isn't configurable with a literal - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:327:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:317:5 | LL | #[repr = "3900"] type T = S; | ^^^^^^^^^^^^^^^^ needs a hint @@ -215,7 +215,7 @@ LL | #[repr = "3900"] type T = S; = note: for more information, visit warning: `repr` attribute isn't configurable with a literal - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:331:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:321:5 | LL | #[repr = "3900"] impl S { } | ^^^^^^^^^^^^^^^^ needs a hint @@ -224,7 +224,7 @@ LL | #[repr = "3900"] impl S { } = note: for more information, visit warning: `repr` attribute isn't configurable with a literal - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:313:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:303:1 | LL | #[repr = "3900"] | ^^^^^^^^^^^^^^^^ needs a hint @@ -233,7 +233,7 @@ LL | #[repr = "3900"] = note: for more information, visit warning: `repr` attribute isn't configurable with a literal - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:63:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:53:1 | LL | #![repr = "3900"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ needs a hint @@ -242,289 +242,289 @@ LL | #![repr = "3900"] = note: for more information, visit warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:195:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:185:5 | LL | #[macro_use] fn f() { } | ^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:44:9 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:34:9 | LL | #![warn(unused_attributes, unknown_lints)] | ^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:198:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:188:5 | LL | #[macro_use] struct S; | ^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:201:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:191:5 | LL | #[macro_use] type T = S; | ^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:204:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:194:5 | LL | #[macro_use] impl S { } | ^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:211:17 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:201:17 | LL | mod inner { #![macro_export="4800"] } | ^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:214:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:204:5 | LL | #[macro_export = "4800"] fn f() { } | ^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:217:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:207:5 | LL | #[macro_export = "4800"] struct S; | ^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:220:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:210:5 | LL | #[macro_export = "4800"] type T = S; | ^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:223:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:213:5 | LL | #[macro_export = "4800"] impl S { } | ^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:208:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:198:1 | LL | #[macro_export = "4800"] | ^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:230:17 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:220:17 | LL | mod inner { #![plugin_registrar="4700"] } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:235:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:225:5 | LL | #[plugin_registrar = "4700"] struct S; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:238:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:228:5 | LL | #[plugin_registrar = "4700"] type T = S; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:241:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:231:5 | LL | #[plugin_registrar = "4700"] impl S { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:227:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:217:1 | LL | #[plugin_registrar = "4700"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:248:17 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:238:17 | LL | mod inner { #![main="4300"] } | ^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:253:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:243:5 | LL | #[main = "4400"] struct S; | ^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:256:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:246:5 | LL | #[main = "4400"] type T = S; | ^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:259:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:249:5 | LL | #[main = "4400"] impl S { } | ^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:245:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:235:1 | LL | #[main = "4400"] | ^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:266:17 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:256:17 | LL | mod inner { #![start="4300"] } | ^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:271:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:261:5 | LL | #[start = "4300"] struct S; | ^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:274:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:264:5 | LL | #[start = "4300"] type T = S; | ^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:277:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:267:5 | LL | #[start = "4300"] impl S { } | ^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:263:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:253:1 | LL | #[start = "4300"] | ^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:317:17 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:307:17 | LL | mod inner { #![repr="3900"] } | ^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:321:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:311:5 | LL | #[repr = "3900"] fn f() { } | ^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:327:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:317:5 | LL | #[repr = "3900"] type T = S; | ^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:331:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:321:5 | LL | #[repr = "3900"] impl S { } | ^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:313:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:303:1 | LL | #[repr = "3900"] | ^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:340:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:330:5 | LL | #[path = "3800"] fn f() { } | ^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:343:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:333:5 | LL | #[path = "3800"] struct S; | ^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:346:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:336:5 | LL | #[path = "3800"] type T = S; | ^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:349:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:339:5 | LL | #[path = "3800"] impl S { } | ^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:356:17 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:346:17 | LL | mod inner { #![abi="3700"] } | ^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:359:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:349:5 | LL | #[abi = "3700"] fn f() { } | ^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:362:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:352:5 | LL | #[abi = "3700"] struct S; | ^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:365:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:355:5 | LL | #[abi = "3700"] type T = S; | ^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:368:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:358:5 | LL | #[abi = "3700"] impl S { } | ^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:353:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:343:1 | LL | #[abi = "3700"] | ^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:375:17 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:365:17 | LL | mod inner { #![automatically_derived="3600"] } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:378:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:368:5 | LL | #[automatically_derived = "3600"] fn f() { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:381:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:371:5 | LL | #[automatically_derived = "3600"] struct S; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:384:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:374:5 | LL | #[automatically_derived = "3600"] type T = S; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:387:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:377:5 | LL | #[automatically_derived = "3600"] impl S { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:372:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:362:1 | LL | #[automatically_derived = "3600"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: function is marked #[no_mangle], but not exported - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:395:27 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:385:27 | LL | #[no_mangle = "3500"] fn f() { } | -^^^^^^^^^ @@ -534,787 +534,787 @@ LL | #[no_mangle = "3500"] fn f() { } = note: #[warn(private_no_mangle_fns)] on by default warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:408:17 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:398:17 | LL | mod inner { #![no_link="3400"] } | ^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:411:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:401:5 | LL | #[no_link = "3400"] fn f() { } | ^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:414:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:404:5 | LL | #[no_link = "3400"] struct S; | ^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:417:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:407:5 | LL | #[no_link = "3400"]type T = S; | ^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:420:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:410:5 | LL | #[no_link = "3400"] impl S { } | ^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:405:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:395:1 | LL | #[no_link = "3400"] | ^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:427:17 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:417:17 | LL | mod inner { #![should_panic="3200"] } | ^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:430:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:420:5 | LL | #[should_panic = "3200"] fn f() { } | ^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:433:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:423:5 | LL | #[should_panic = "3200"] struct S; | ^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:436:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:426:5 | LL | #[should_panic = "3200"] type T = S; | ^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:439:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:429:5 | LL | #[should_panic = "3200"] impl S { } | ^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:424:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:414:1 | LL | #[should_panic = "3200"] | ^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:446:17 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:436:17 | LL | mod inner { #![ignore="3100"] } | ^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:449:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:439:5 | LL | #[ignore = "3100"] fn f() { } | ^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:452:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:442:5 | LL | #[ignore = "3100"] struct S; | ^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:455:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:445:5 | LL | #[ignore = "3100"] type T = S; | ^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:458:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:448:5 | LL | #[ignore = "3100"] impl S { } | ^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:443:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:433:1 | LL | #[ignore = "3100"] | ^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:465:17 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:455:17 | LL | mod inner { #![no_implicit_prelude="3000"] } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:468:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:458:5 | LL | #[no_implicit_prelude = "3000"] fn f() { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:471:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:461:5 | LL | #[no_implicit_prelude = "3000"] struct S; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:474:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:464:5 | LL | #[no_implicit_prelude = "3000"] type T = S; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:477:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:467:5 | LL | #[no_implicit_prelude = "3000"] impl S { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:462:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:452:1 | LL | #[no_implicit_prelude = "3000"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:484:17 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:474:17 | LL | mod inner { #![reexport_test_harness_main="2900"] } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:487:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:477:5 | LL | #[reexport_test_harness_main = "2900"] fn f() { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:490:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:480:5 | LL | #[reexport_test_harness_main = "2900"] struct S; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:493:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:483:5 | LL | #[reexport_test_harness_main = "2900"] type T = S; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:496:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:486:5 | LL | #[reexport_test_harness_main = "2900"] impl S { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:481:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:471:1 | LL | #[reexport_test_harness_main = "2900"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:507:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:497:5 | LL | #[macro_escape] fn f() { } | ^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:510:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:500:5 | LL | #[macro_escape] struct S; | ^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:513:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:503:5 | LL | #[macro_escape] type T = S; | ^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:516:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:506:5 | LL | #[macro_escape] impl S { } | ^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:524:17 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:514:17 | LL | mod inner { #![no_std="2600"] } | ^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be in the root module - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:524:17 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:514:17 | LL | mod inner { #![no_std="2600"] } | ^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:528:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:518:5 | LL | #[no_std = "2600"] fn f() { } | ^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:528:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:518:5 | LL | #[no_std = "2600"] fn f() { } | ^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:532:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:522:5 | LL | #[no_std = "2600"] struct S; | ^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:532:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:522:5 | LL | #[no_std = "2600"] struct S; | ^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:536:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:526:5 | LL | #[no_std = "2600"] type T = S; | ^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:536:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:526:5 | LL | #[no_std = "2600"] type T = S; | ^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:540:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:530:5 | LL | #[no_std = "2600"] impl S { } | ^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:540:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:530:5 | LL | #[no_std = "2600"] impl S { } | ^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:520:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:510:1 | LL | #[no_std = "2600"] | ^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:520:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:510:1 | LL | #[no_std = "2600"] | ^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:679:17 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:669:17 | LL | mod inner { #![crate_name="0900"] } | ^^^^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be in the root module - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:679:17 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:669:17 | LL | mod inner { #![crate_name="0900"] } | ^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:683:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:673:5 | LL | #[crate_name = "0900"] fn f() { } | ^^^^^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:683:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:673:5 | LL | #[crate_name = "0900"] fn f() { } | ^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:687:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:677:5 | LL | #[crate_name = "0900"] struct S; | ^^^^^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:687:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:677:5 | LL | #[crate_name = "0900"] struct S; | ^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:691:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:681:5 | LL | #[crate_name = "0900"] type T = S; | ^^^^^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:691:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:681:5 | LL | #[crate_name = "0900"] type T = S; | ^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:695:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:685:5 | LL | #[crate_name = "0900"] impl S { } | ^^^^^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:695:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:685:5 | LL | #[crate_name = "0900"] impl S { } | ^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:675:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:665:1 | LL | #[crate_name = "0900"] | ^^^^^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:675:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:665:1 | LL | #[crate_name = "0900"] | ^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:704:17 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:694:17 | LL | mod inner { #![crate_type="0800"] } | ^^^^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be in the root module - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:704:17 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:694:17 | LL | mod inner { #![crate_type="0800"] } | ^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:708:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:698:5 | LL | #[crate_type = "0800"] fn f() { } | ^^^^^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:708:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:698:5 | LL | #[crate_type = "0800"] fn f() { } | ^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:712:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:702:5 | LL | #[crate_type = "0800"] struct S; | ^^^^^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:712:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:702:5 | LL | #[crate_type = "0800"] struct S; | ^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:716:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:706:5 | LL | #[crate_type = "0800"] type T = S; | ^^^^^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:716:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:706:5 | LL | #[crate_type = "0800"] type T = S; | ^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:720:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:710:5 | LL | #[crate_type = "0800"] impl S { } | ^^^^^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:720:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:710:5 | LL | #[crate_type = "0800"] impl S { } | ^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:700:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:690:1 | LL | #[crate_type = "0800"] | ^^^^^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:700:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:690:1 | LL | #[crate_type = "0800"] | ^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:729:17 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:719:17 | LL | mod inner { #![feature(x0600)] } | ^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be in the root module - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:729:17 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:719:17 | LL | mod inner { #![feature(x0600)] } | ^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:733:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:723:5 | LL | #[feature(x0600)] fn f() { } | ^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:733:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:723:5 | LL | #[feature(x0600)] fn f() { } | ^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:737:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:727:5 | LL | #[feature(x0600)] struct S; | ^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:737:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:727:5 | LL | #[feature(x0600)] struct S; | ^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:741:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:731:5 | LL | #[feature(x0600)] type T = S; | ^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:741:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:731:5 | LL | #[feature(x0600)] type T = S; | ^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:745:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:735:5 | LL | #[feature(x0600)] impl S { } | ^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:745:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:735:5 | LL | #[feature(x0600)] impl S { } | ^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:725:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:715:1 | LL | #[feature(x0600)] | ^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:725:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:715:1 | LL | #[feature(x0600)] | ^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:755:17 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:745:17 | LL | mod inner { #![no_main="0400"] } | ^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be in the root module - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:755:17 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:745:17 | LL | mod inner { #![no_main="0400"] } | ^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:759:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:749:5 | LL | #[no_main = "0400"] fn f() { } | ^^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:759:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:749:5 | LL | #[no_main = "0400"] fn f() { } | ^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:763:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:753:5 | LL | #[no_main = "0400"] struct S; | ^^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:763:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:753:5 | LL | #[no_main = "0400"] struct S; | ^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:767:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:757:5 | LL | #[no_main = "0400"] type T = S; | ^^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:767:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:757:5 | LL | #[no_main = "0400"] type T = S; | ^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:771:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:761:5 | LL | #[no_main = "0400"] impl S { } | ^^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:771:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:761:5 | LL | #[no_main = "0400"] impl S { } | ^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:751:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:741:1 | LL | #[no_main = "0400"] | ^^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:751:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:741:1 | LL | #[no_main = "0400"] | ^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:793:17 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:783:17 | LL | mod inner { #![recursion_limit="0200"] } | ^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be in the root module - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:793:17 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:783:17 | LL | mod inner { #![recursion_limit="0200"] } | ^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:797:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:787:5 | LL | #[recursion_limit="0200"] fn f() { } | ^^^^^^^^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:797:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:787:5 | LL | #[recursion_limit="0200"] fn f() { } | ^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:801:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:791:5 | LL | #[recursion_limit="0200"] struct S; | ^^^^^^^^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:801:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:791:5 | LL | #[recursion_limit="0200"] struct S; | ^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:805:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:795:5 | LL | #[recursion_limit="0200"] type T = S; | ^^^^^^^^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:805:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:795:5 | LL | #[recursion_limit="0200"] type T = S; | ^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:809:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:799:5 | LL | #[recursion_limit="0200"] impl S { } | ^^^^^^^^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:809:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:799:5 | LL | #[recursion_limit="0200"] impl S { } | ^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:789:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:779:1 | LL | #[recursion_limit="0200"] | ^^^^^^^^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:789:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:779:1 | LL | #[recursion_limit="0200"] | ^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:818:17 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:808:17 | LL | mod inner { #![type_length_limit="0100"] } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be in the root module - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:818:17 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:808:17 | LL | mod inner { #![type_length_limit="0100"] } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:822:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:812:5 | LL | #[type_length_limit="0100"] fn f() { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:822:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:812:5 | LL | #[type_length_limit="0100"] fn f() { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:826:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:816:5 | LL | #[type_length_limit="0100"] struct S; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:826:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:816:5 | LL | #[type_length_limit="0100"] struct S; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:830:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:820:5 | LL | #[type_length_limit="0100"] type T = S; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:830:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:820:5 | LL | #[type_length_limit="0100"] type T = S; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:834:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:824:5 | LL | #[type_length_limit="0100"] impl S { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:834:5 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:824:5 | LL | #[type_length_limit="0100"] impl S { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:814:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:804:1 | LL | #[type_length_limit="0100"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:814:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:804:1 | LL | #[type_length_limit="0100"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:55:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:45:1 | LL | #![macro_export = "4800"] //~ WARN unused attribute | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:56:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:46:1 | LL | #![plugin_registrar = "4700"] //~ WARN unused attribute | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:59:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:49:1 | LL | #![main = "x4400"] //~ WARN unused attribute | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:60:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:50:1 | LL | #![start = "x4300"] //~ WARN unused attribute | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:63:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:53:1 | LL | #![repr = "3900"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:66:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:56:1 | LL | #![path = "3800"] //~ WARN unused attribute | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:67:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:57:1 | LL | #![abi = "3700"] //~ WARN unused attribute | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:68:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:58:1 | LL | #![automatically_derived = "3600"] //~ WARN unused attribute | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:70:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:60:1 | LL | #![no_link = "3400"] //~ WARN unused attribute | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:72:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:62:1 | LL | #![should_panic = "3200"] //~ WARN unused attribute | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:73:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:63:1 | LL | #![ignore = "3100"] //~ WARN unused attribute | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused attribute - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:79:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:69:1 | LL | #![proc_macro_derive = "2500"] //~ WARN unused attribute | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: compilation successful - --> $DIR/issue-43106-gating-of-builtin-attrs.rs:845:1 + --> $DIR/issue-43106-gating-of-builtin-attrs.rs:835:1 | LL | / fn main() { //~ ERROR compilation successful LL | | println!("Hello World"); diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-deprecated.rs b/src/test/ui/feature-gate/issue-43106-gating-of-deprecated.rs index 98da43c3a2252..74e52efadd644 100644 --- a/src/test/ui/feature-gate/issue-43106-gating-of-deprecated.rs +++ b/src/test/ui/feature-gate/issue-43106-gating-of-deprecated.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test just shows that a crate-level `#![deprecated]` does not // signal a warning or error. (This file sits on its own because a // crate-level `#![deprecated]` causes all that crate's item diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-deprecated.stderr b/src/test/ui/feature-gate/issue-43106-gating-of-deprecated.stderr index 802c5d9384d75..a64975a414edd 100644 --- a/src/test/ui/feature-gate/issue-43106-gating-of-deprecated.stderr +++ b/src/test/ui/feature-gate/issue-43106-gating-of-deprecated.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-43106-gating-of-deprecated.rs:29:1 + --> $DIR/issue-43106-gating-of-deprecated.rs:19:1 | LL | / fn main() { //~ ERROR compilation successful LL | | println!("Hello World"); diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-derive-2.rs b/src/test/ui/feature-gate/issue-43106-gating-of-derive-2.rs index 2dbc6cb140db3..352f56f7aca99 100644 --- a/src/test/ui/feature-gate/issue-43106-gating-of-derive-2.rs +++ b/src/test/ui/feature-gate/issue-43106-gating-of-derive-2.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test checks cases where the derive-macro does not exist. mod derive { diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-derive-2.stderr b/src/test/ui/feature-gate/issue-43106-gating-of-derive-2.stderr index 8f63b16b0cf02..be3536aa789c1 100644 --- a/src/test/ui/feature-gate/issue-43106-gating-of-derive-2.stderr +++ b/src/test/ui/feature-gate/issue-43106-gating-of-derive-2.stderr @@ -1,17 +1,17 @@ error: cannot find derive macro `x3300` in this scope - --> $DIR/issue-43106-gating-of-derive-2.rs:14:14 + --> $DIR/issue-43106-gating-of-derive-2.rs:4:14 | LL | #[derive(x3300)] | ^^^^^ error: cannot find derive macro `x3300` in this scope - --> $DIR/issue-43106-gating-of-derive-2.rs:18:14 + --> $DIR/issue-43106-gating-of-derive-2.rs:8:14 | LL | #[derive(x3300)] | ^^^^^ error: cannot find derive macro `x3300` in this scope - --> $DIR/issue-43106-gating-of-derive-2.rs:22:14 + --> $DIR/issue-43106-gating-of-derive-2.rs:12:14 | LL | #[derive(x3300)] | ^^^^^ diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-derive.rs b/src/test/ui/feature-gate/issue-43106-gating-of-derive.rs index e5293ebb94ddc..8bac49816ad9f 100644 --- a/src/test/ui/feature-gate/issue-43106-gating-of-derive.rs +++ b/src/test/ui/feature-gate/issue-43106-gating-of-derive.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // `#![derive]` raises errors when it occurs at contexts other than ADT // definitions. diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-derive.stderr b/src/test/ui/feature-gate/issue-43106-gating-of-derive.stderr index 6f5df6beba383..25f160983d3df 100644 --- a/src/test/ui/feature-gate/issue-43106-gating-of-derive.stderr +++ b/src/test/ui/feature-gate/issue-43106-gating-of-derive.stderr @@ -1,35 +1,35 @@ error: `derive` may only be applied to structs, enums and unions - --> $DIR/issue-43106-gating-of-derive.rs:14:1 + --> $DIR/issue-43106-gating-of-derive.rs:4:1 | LL | #![derive(Debug)] | ^^^^^^^^^^^^^^^^^ help: try an outer attribute: `#[derive(Debug)]` error: `derive` may only be applied to structs, enums and unions - --> $DIR/issue-43106-gating-of-derive.rs:17:1 + --> $DIR/issue-43106-gating-of-derive.rs:7:1 | LL | #[derive(Debug)] | ^^^^^^^^^^^^^^^^ error: `derive` may only be applied to structs, enums and unions - --> $DIR/issue-43106-gating-of-derive.rs:20:17 + --> $DIR/issue-43106-gating-of-derive.rs:10:17 | LL | mod inner { #![derive(Debug)] } | ^^^^^^^^^^^^^^^^^ help: try an outer attribute: `#[derive(Debug)]` error: `derive` may only be applied to structs, enums and unions - --> $DIR/issue-43106-gating-of-derive.rs:23:5 + --> $DIR/issue-43106-gating-of-derive.rs:13:5 | LL | #[derive(Debug)] | ^^^^^^^^^^^^^^^^ error: `derive` may only be applied to structs, enums and unions - --> $DIR/issue-43106-gating-of-derive.rs:36:5 + --> $DIR/issue-43106-gating-of-derive.rs:26:5 | LL | #[derive(Debug)] | ^^^^^^^^^^^^^^^^ error: `derive` may only be applied to structs, enums and unions - --> $DIR/issue-43106-gating-of-derive.rs:40:5 + --> $DIR/issue-43106-gating-of-derive.rs:30:5 | LL | #[derive(Debug)] | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-inline.rs b/src/test/ui/feature-gate/issue-43106-gating-of-inline.rs index b03faad988ebc..7c17cd1af153c 100644 --- a/src/test/ui/feature-gate/issue-43106-gating-of-inline.rs +++ b/src/test/ui/feature-gate/issue-43106-gating-of-inline.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This is testing whether `#[inline]` signals an error or warning // when put in "weird" places. // diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-inline.stderr b/src/test/ui/feature-gate/issue-43106-gating-of-inline.stderr index 4d63c3f50125d..7eb0b5c197acf 100644 --- a/src/test/ui/feature-gate/issue-43106-gating-of-inline.stderr +++ b/src/test/ui/feature-gate/issue-43106-gating-of-inline.stderr @@ -1,5 +1,5 @@ error[E0518]: attribute should be applied to function or closure - --> $DIR/issue-43106-gating-of-inline.rs:21:1 + --> $DIR/issue-43106-gating-of-inline.rs:11:1 | LL | #[inline = "2100"] | ^^^^^^^^^^^^^^^^^^ @@ -14,25 +14,25 @@ LL | | } | |_- not a function or closure error[E0518]: attribute should be applied to function or closure - --> $DIR/issue-43106-gating-of-inline.rs:24:17 + --> $DIR/issue-43106-gating-of-inline.rs:14:17 | LL | mod inner { #![inline="2100"] } | ------------^^^^^^^^^^^^^^^^^-- not a function or closure error[E0518]: attribute should be applied to function or closure - --> $DIR/issue-43106-gating-of-inline.rs:29:5 + --> $DIR/issue-43106-gating-of-inline.rs:19:5 | LL | #[inline = "2100"] struct S; | ^^^^^^^^^^^^^^^^^^ --------- not a function or closure error[E0518]: attribute should be applied to function or closure - --> $DIR/issue-43106-gating-of-inline.rs:32:5 + --> $DIR/issue-43106-gating-of-inline.rs:22:5 | LL | #[inline = "2100"] type T = S; | ^^^^^^^^^^^^^^^^^^ ----------- not a function or closure error[E0518]: attribute should be applied to function or closure - --> $DIR/issue-43106-gating-of-inline.rs:35:5 + --> $DIR/issue-43106-gating-of-inline.rs:25:5 | LL | #[inline = "2100"] impl S { } | ^^^^^^^^^^^^^^^^^^ ---------- not a function or closure diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-macro_escape.rs b/src/test/ui/feature-gate/issue-43106-gating-of-macro_escape.rs index 620874e5c2d85..98ca3444c91bd 100644 --- a/src/test/ui/feature-gate/issue-43106-gating-of-macro_escape.rs +++ b/src/test/ui/feature-gate/issue-43106-gating-of-macro_escape.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Testing that crate-level `#![macro_escape]` is not gated beyond a // depecation warning. This file sits on its own, because crate-level // `#![macro_escape]` is incompatible with crate-level `#![macro_use]` diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-macro_escape.stderr b/src/test/ui/feature-gate/issue-43106-gating-of-macro_escape.stderr index d19720397e66d..9fb9633d9a86a 100644 --- a/src/test/ui/feature-gate/issue-43106-gating-of-macro_escape.stderr +++ b/src/test/ui/feature-gate/issue-43106-gating-of-macro_escape.stderr @@ -1,5 +1,5 @@ warning: macro_escape is a deprecated synonym for macro_use - --> $DIR/issue-43106-gating-of-macro_escape.rs:18:1 + --> $DIR/issue-43106-gating-of-macro_escape.rs:8:1 | LL | #![macro_escape] | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-macro_use.rs b/src/test/ui/feature-gate/issue-43106-gating-of-macro_use.rs index cf5619da3c7c8..bb54c0013d24e 100644 --- a/src/test/ui/feature-gate/issue-43106-gating-of-macro_use.rs +++ b/src/test/ui/feature-gate/issue-43106-gating-of-macro_use.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This is just a check-list of the cases where feeding arguments to // `#[macro_use]` is rejected. (The cases where no error is emitted // corresponds to cases where the attribute is currently unused, so we diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-macro_use.stderr b/src/test/ui/feature-gate/issue-43106-gating-of-macro_use.stderr index 0a491cd3b56c2..fb0e3b4caea35 100644 --- a/src/test/ui/feature-gate/issue-43106-gating-of-macro_use.stderr +++ b/src/test/ui/feature-gate/issue-43106-gating-of-macro_use.stderr @@ -1,17 +1,17 @@ error: arguments to macro_use are not allowed here - --> $DIR/issue-43106-gating-of-macro_use.rs:16:1 + --> $DIR/issue-43106-gating-of-macro_use.rs:6:1 | LL | #![macro_use = "4900"] //~ ERROR arguments to macro_use are not allowed here | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: arguments to macro_use are not allowed here - --> $DIR/issue-43106-gating-of-macro_use.rs:18:1 + --> $DIR/issue-43106-gating-of-macro_use.rs:8:1 | LL | #[macro_use = "2700"] | ^^^^^^^^^^^^^^^^^^^^^ error: arguments to macro_use are not allowed here - --> $DIR/issue-43106-gating-of-macro_use.rs:21:17 + --> $DIR/issue-43106-gating-of-macro_use.rs:11:17 | LL | mod inner { #![macro_use="2700"] } | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-proc_macro_derive.rs b/src/test/ui/feature-gate/issue-43106-gating-of-proc_macro_derive.rs index 5bb8bb024ed51..b7929d2292dc7 100644 --- a/src/test/ui/feature-gate/issue-43106-gating-of-proc_macro_derive.rs +++ b/src/test/ui/feature-gate/issue-43106-gating-of-proc_macro_derive.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // At time of authorship, #[proc_macro_derive = "2500"] will emit an // error when it occurs on a mod (apart from crate-level), but will // not descend further into the mod for other occurrences of the same diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-proc_macro_derive.stderr b/src/test/ui/feature-gate/issue-43106-gating-of-proc_macro_derive.stderr index 419efb6825a97..aa841c3263c91 100644 --- a/src/test/ui/feature-gate/issue-43106-gating-of-proc_macro_derive.stderr +++ b/src/test/ui/feature-gate/issue-43106-gating-of-proc_macro_derive.stderr @@ -1,35 +1,35 @@ error: the `#[proc_macro_derive]` attribute may only be used on bare functions - --> $DIR/issue-43106-gating-of-proc_macro_derive.rs:20:1 + --> $DIR/issue-43106-gating-of-proc_macro_derive.rs:10:1 | LL | #[proc_macro_derive = "2500"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: the `#[proc_macro_derive]` attribute may only be used on bare functions - --> $DIR/issue-43106-gating-of-proc_macro_derive.rs:28:17 + --> $DIR/issue-43106-gating-of-proc_macro_derive.rs:18:17 | LL | mod inner { #![proc_macro_derive="2500"] } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: the `#[proc_macro_derive]` attribute is only usable with crates of the `proc-macro` crate type - --> $DIR/issue-43106-gating-of-proc_macro_derive.rs:31:5 + --> $DIR/issue-43106-gating-of-proc_macro_derive.rs:21:5 | LL | #[proc_macro_derive = "2500"] fn f() { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: the `#[proc_macro_derive]` attribute may only be used on bare functions - --> $DIR/issue-43106-gating-of-proc_macro_derive.rs:34:5 + --> $DIR/issue-43106-gating-of-proc_macro_derive.rs:24:5 | LL | #[proc_macro_derive = "2500"] struct S; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: the `#[proc_macro_derive]` attribute may only be used on bare functions - --> $DIR/issue-43106-gating-of-proc_macro_derive.rs:37:5 + --> $DIR/issue-43106-gating-of-proc_macro_derive.rs:27:5 | LL | #[proc_macro_derive = "2500"] type T = S; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: the `#[proc_macro_derive]` attribute may only be used on bare functions - --> $DIR/issue-43106-gating-of-proc_macro_derive.rs:40:5 + --> $DIR/issue-43106-gating-of-proc_macro_derive.rs:30:5 | LL | #[proc_macro_derive = "2500"] impl S { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-rustc_deprecated.rs b/src/test/ui/feature-gate/issue-43106-gating-of-rustc_deprecated.rs index 0c6cfb5da565c..b2fd6a7358fd5 100644 --- a/src/test/ui/feature-gate/issue-43106-gating-of-rustc_deprecated.rs +++ b/src/test/ui/feature-gate/issue-43106-gating-of-rustc_deprecated.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Testing gating of `#[rustc_deprecated]` in "weird" places. // // This file sits on its own because these signal errors, making diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-rustc_deprecated.stderr b/src/test/ui/feature-gate/issue-43106-gating-of-rustc_deprecated.stderr index 35c15cb6b1ea8..af056bc12e92c 100644 --- a/src/test/ui/feature-gate/issue-43106-gating-of-rustc_deprecated.stderr +++ b/src/test/ui/feature-gate/issue-43106-gating-of-rustc_deprecated.stderr @@ -1,41 +1,41 @@ error: stability attributes may not be used outside of the standard library - --> $DIR/issue-43106-gating-of-rustc_deprecated.rs:17:1 + --> $DIR/issue-43106-gating-of-rustc_deprecated.rs:7:1 | LL | #![rustc_deprecated = "1500"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: stability attributes may not be used outside of the standard library - --> $DIR/issue-43106-gating-of-rustc_deprecated.rs:20:1 + --> $DIR/issue-43106-gating-of-rustc_deprecated.rs:10:1 | LL | #[rustc_deprecated = "1500"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: stability attributes may not be used outside of the standard library - --> $DIR/issue-43106-gating-of-rustc_deprecated.rs:23:17 + --> $DIR/issue-43106-gating-of-rustc_deprecated.rs:13:17 | LL | mod inner { #![rustc_deprecated="1500"] } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: stability attributes may not be used outside of the standard library - --> $DIR/issue-43106-gating-of-rustc_deprecated.rs:26:5 + --> $DIR/issue-43106-gating-of-rustc_deprecated.rs:16:5 | LL | #[rustc_deprecated = "1500"] fn f() { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: stability attributes may not be used outside of the standard library - --> $DIR/issue-43106-gating-of-rustc_deprecated.rs:29:5 + --> $DIR/issue-43106-gating-of-rustc_deprecated.rs:19:5 | LL | #[rustc_deprecated = "1500"] struct S; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: stability attributes may not be used outside of the standard library - --> $DIR/issue-43106-gating-of-rustc_deprecated.rs:32:5 + --> $DIR/issue-43106-gating-of-rustc_deprecated.rs:22:5 | LL | #[rustc_deprecated = "1500"] type T = S; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: stability attributes may not be used outside of the standard library - --> $DIR/issue-43106-gating-of-rustc_deprecated.rs:35:5 + --> $DIR/issue-43106-gating-of-rustc_deprecated.rs:25:5 | LL | #[rustc_deprecated = "1500"] impl S { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-stable.rs b/src/test/ui/feature-gate/issue-43106-gating-of-stable.rs index 6415243d0873e..7d9501a799646 100644 --- a/src/test/ui/feature-gate/issue-43106-gating-of-stable.rs +++ b/src/test/ui/feature-gate/issue-43106-gating-of-stable.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Testing gating of `#[stable]` in "weird" places. // // This file sits on its own because these signal errors, making diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-stable.stderr b/src/test/ui/feature-gate/issue-43106-gating-of-stable.stderr index 21543d1b20afc..56066e85ba26b 100644 --- a/src/test/ui/feature-gate/issue-43106-gating-of-stable.stderr +++ b/src/test/ui/feature-gate/issue-43106-gating-of-stable.stderr @@ -1,41 +1,41 @@ error: stability attributes may not be used outside of the standard library - --> $DIR/issue-43106-gating-of-stable.rs:17:1 + --> $DIR/issue-43106-gating-of-stable.rs:7:1 | LL | #![stable = "1300"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: stability attributes may not be used outside of the standard library - --> $DIR/issue-43106-gating-of-stable.rs:20:1 + --> $DIR/issue-43106-gating-of-stable.rs:10:1 | LL | #[stable = "1300"] | ^^^^^^^^^^^^^^^^^^ error: stability attributes may not be used outside of the standard library - --> $DIR/issue-43106-gating-of-stable.rs:23:17 + --> $DIR/issue-43106-gating-of-stable.rs:13:17 | LL | mod inner { #![stable="1300"] } | ^^^^^^^^^^^^^^^^^ error: stability attributes may not be used outside of the standard library - --> $DIR/issue-43106-gating-of-stable.rs:26:5 + --> $DIR/issue-43106-gating-of-stable.rs:16:5 | LL | #[stable = "1300"] fn f() { } | ^^^^^^^^^^^^^^^^^^ error: stability attributes may not be used outside of the standard library - --> $DIR/issue-43106-gating-of-stable.rs:29:5 + --> $DIR/issue-43106-gating-of-stable.rs:19:5 | LL | #[stable = "1300"] struct S; | ^^^^^^^^^^^^^^^^^^ error: stability attributes may not be used outside of the standard library - --> $DIR/issue-43106-gating-of-stable.rs:32:5 + --> $DIR/issue-43106-gating-of-stable.rs:22:5 | LL | #[stable = "1300"] type T = S; | ^^^^^^^^^^^^^^^^^^ error: stability attributes may not be used outside of the standard library - --> $DIR/issue-43106-gating-of-stable.rs:35:5 + --> $DIR/issue-43106-gating-of-stable.rs:25:5 | LL | #[stable = "1300"] impl S { } | ^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-test.rs b/src/test/ui/feature-gate/issue-43106-gating-of-test.rs index 06632396249a5..c0c49d353007c 100644 --- a/src/test/ui/feature-gate/issue-43106-gating-of-test.rs +++ b/src/test/ui/feature-gate/issue-43106-gating-of-test.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: `main` function not found // At time of authorship, crate-level #[test] attribute with no diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-unstable.rs b/src/test/ui/feature-gate/issue-43106-gating-of-unstable.rs index 140474d82c88d..8be55f0baf623 100644 --- a/src/test/ui/feature-gate/issue-43106-gating-of-unstable.rs +++ b/src/test/ui/feature-gate/issue-43106-gating-of-unstable.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Testing gating of `#[unstable]` in "weird" places. // // This file sits on its own because these signal errors, making diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-unstable.stderr b/src/test/ui/feature-gate/issue-43106-gating-of-unstable.stderr index 6124e16f41804..ee8b9d43d41e7 100644 --- a/src/test/ui/feature-gate/issue-43106-gating-of-unstable.stderr +++ b/src/test/ui/feature-gate/issue-43106-gating-of-unstable.stderr @@ -1,41 +1,41 @@ error: stability attributes may not be used outside of the standard library - --> $DIR/issue-43106-gating-of-unstable.rs:17:1 + --> $DIR/issue-43106-gating-of-unstable.rs:7:1 | LL | #![unstable = "1200"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: stability attributes may not be used outside of the standard library - --> $DIR/issue-43106-gating-of-unstable.rs:20:1 + --> $DIR/issue-43106-gating-of-unstable.rs:10:1 | LL | #[unstable = "1200"] | ^^^^^^^^^^^^^^^^^^^^ error: stability attributes may not be used outside of the standard library - --> $DIR/issue-43106-gating-of-unstable.rs:23:17 + --> $DIR/issue-43106-gating-of-unstable.rs:13:17 | LL | mod inner { #![unstable="1200"] } | ^^^^^^^^^^^^^^^^^^^ error: stability attributes may not be used outside of the standard library - --> $DIR/issue-43106-gating-of-unstable.rs:26:5 + --> $DIR/issue-43106-gating-of-unstable.rs:16:5 | LL | #[unstable = "1200"] fn f() { } | ^^^^^^^^^^^^^^^^^^^^ error: stability attributes may not be used outside of the standard library - --> $DIR/issue-43106-gating-of-unstable.rs:29:5 + --> $DIR/issue-43106-gating-of-unstable.rs:19:5 | LL | #[unstable = "1200"] struct S; | ^^^^^^^^^^^^^^^^^^^^ error: stability attributes may not be used outside of the standard library - --> $DIR/issue-43106-gating-of-unstable.rs:32:5 + --> $DIR/issue-43106-gating-of-unstable.rs:22:5 | LL | #[unstable = "1200"] type T = S; | ^^^^^^^^^^^^^^^^^^^^ error: stability attributes may not be used outside of the standard library - --> $DIR/issue-43106-gating-of-unstable.rs:35:5 + --> $DIR/issue-43106-gating-of-unstable.rs:25:5 | LL | #[unstable = "1200"] impl S { } | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gate/issue-49983-see-issue-0.rs b/src/test/ui/feature-gate/issue-49983-see-issue-0.rs index 1e0039aba04bb..eeb80d014b2d5 100644 --- a/src/test/ui/feature-gate/issue-49983-see-issue-0.rs +++ b/src/test/ui/feature-gate/issue-49983-see-issue-0.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate core; // error should not say "(see issue #0)" diff --git a/src/test/ui/feature-gate/issue-49983-see-issue-0.stderr b/src/test/ui/feature-gate/issue-49983-see-issue-0.stderr index 986a2d88e00a2..22ad8c8b77e90 100644 --- a/src/test/ui/feature-gate/issue-49983-see-issue-0.stderr +++ b/src/test/ui/feature-gate/issue-49983-see-issue-0.stderr @@ -1,5 +1,5 @@ error[E0658]: use of unstable library feature 'ptr_internals': use NonNull instead and consider PhantomData (if you also use #[may_dangle]), Send, and/or Sync - --> $DIR/issue-49983-see-issue-0.rs:14:30 + --> $DIR/issue-49983-see-issue-0.rs:4:30 | LL | #[allow(unused_imports)] use core::ptr::Unique; //~ ERROR use of unstable library feature | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gate/stability-attribute-consistency.rs b/src/test/ui/feature-gate/stability-attribute-consistency.rs index 94bc57d10e5c1..caafd8b885475 100644 --- a/src/test/ui/feature-gate/stability-attribute-consistency.rs +++ b/src/test/ui/feature-gate/stability-attribute-consistency.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![stable(feature = "stable_test_feature", since = "1.0.0")] #![feature(staged_api)] diff --git a/src/test/ui/feature-gate/stability-attribute-consistency.stderr b/src/test/ui/feature-gate/stability-attribute-consistency.stderr index 1b2fdd6014e2b..191b25db3e0fe 100644 --- a/src/test/ui/feature-gate/stability-attribute-consistency.stderr +++ b/src/test/ui/feature-gate/stability-attribute-consistency.stderr @@ -1,11 +1,11 @@ error[E0711]: feature `foo` is declared stable since 1.29.0, but was previously declared stable since 1.0.0 - --> $DIR/stability-attribute-consistency.rs:18:1 + --> $DIR/stability-attribute-consistency.rs:8:1 | LL | #[stable(feature = "foo", since = "1.29.0")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0711]: feature `foo` is declared unstable, but was previously declared stable - --> $DIR/stability-attribute-consistency.rs:22:1 + --> $DIR/stability-attribute-consistency.rs:12:1 | LL | #[unstable(feature = "foo", issue = "0")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gate/unknown-feature.rs b/src/test/ui/feature-gate/unknown-feature.rs index da1b257f6341b..20fd932d4c2f6 100644 --- a/src/test/ui/feature-gate/unknown-feature.rs +++ b/src/test/ui/feature-gate/unknown-feature.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unknown_rust_feature)] //~ ERROR unknown feature fn main() {} diff --git a/src/test/ui/feature-gate/unknown-feature.stderr b/src/test/ui/feature-gate/unknown-feature.stderr index f44aaeec032b3..2f8bf20ce4670 100644 --- a/src/test/ui/feature-gate/unknown-feature.stderr +++ b/src/test/ui/feature-gate/unknown-feature.stderr @@ -1,5 +1,5 @@ error[E0635]: unknown feature `unknown_rust_feature` - --> $DIR/unknown-feature.rs:11:12 + --> $DIR/unknown-feature.rs:1:12 | LL | #![feature(unknown_rust_feature)] //~ ERROR unknown feature | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gated-feature-in-macro-arg.rs b/src/test/ui/feature-gated-feature-in-macro-arg.rs index ae342af4a52af..1285cca6b8b7c 100644 --- a/src/test/ui/feature-gated-feature-in-macro-arg.rs +++ b/src/test/ui/feature-gated-feature-in-macro-arg.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // tests that input to a macro is checked for use of gated features. If this // test succeeds due to the acceptance of a feature, pick a new feature to // test. Not ideal, but oh well :( diff --git a/src/test/ui/feature-gated-feature-in-macro-arg.stderr b/src/test/ui/feature-gated-feature-in-macro-arg.stderr index 41b3e3eaf10dc..b262a6f7005ec 100644 --- a/src/test/ui/feature-gated-feature-in-macro-arg.stderr +++ b/src/test/ui/feature-gated-feature-in-macro-arg.stderr @@ -1,5 +1,5 @@ error[E0658]: intrinsics are subject to change - --> $DIR/feature-gated-feature-in-macro-arg.rs:18:9 + --> $DIR/feature-gated-feature-in-macro-arg.rs:8:9 | LL | / extern "rust-intrinsic" { //~ ERROR intrinsics are subject to change LL | | fn atomic_fence(); diff --git a/src/test/ui/feature-gates/auxiliary/cfg-target-thread-local.rs b/src/test/ui/feature-gates/auxiliary/cfg-target-thread-local.rs index d1971a5e1aea4..bd5c8f81c005b 100644 --- a/src/test/ui/feature-gates/auxiliary/cfg-target-thread-local.rs +++ b/src/test/ui/feature-gates/auxiliary/cfg-target-thread-local.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(thread_local)] #![feature(cfg_target_thread_local)] #![crate_type = "lib"] diff --git a/src/test/ui/feature-gates/feature-gate-abi-msp430-interrupt.rs b/src/test/ui/feature-gates/feature-gate-abi-msp430-interrupt.rs index 030e37475c0a8..37c39b6384dff 100644 --- a/src/test/ui/feature-gates/feature-gate-abi-msp430-interrupt.rs +++ b/src/test/ui/feature-gates/feature-gate-abi-msp430-interrupt.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the MSP430 interrupt ABI cannot be used when msp430_interrupt // feature gate is not used. diff --git a/src/test/ui/feature-gates/feature-gate-abi-msp430-interrupt.stderr b/src/test/ui/feature-gates/feature-gate-abi-msp430-interrupt.stderr index 26babb8c3ff44..6b3c169c99de9 100644 --- a/src/test/ui/feature-gates/feature-gate-abi-msp430-interrupt.stderr +++ b/src/test/ui/feature-gates/feature-gate-abi-msp430-interrupt.stderr @@ -1,5 +1,5 @@ error[E0658]: msp430-interrupt ABI is experimental and subject to change (see issue #38487) - --> $DIR/feature-gate-abi-msp430-interrupt.rs:14:1 + --> $DIR/feature-gate-abi-msp430-interrupt.rs:4:1 | LL | extern "msp430-interrupt" fn foo() {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-abi.rs b/src/test/ui/feature-gates/feature-gate-abi.rs index db008b8379764..2229e6ed507a6 100644 --- a/src/test/ui/feature-gates/feature-gate-abi.rs +++ b/src/test/ui/feature-gates/feature-gate-abi.rs @@ -1,12 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // ignore-tidy-linelength // gate-test-intrinsics // gate-test-platform_intrinsics diff --git a/src/test/ui/feature-gates/feature-gate-abi.stderr b/src/test/ui/feature-gates/feature-gate-abi.stderr index eb68391ba3546..efcd2ef95c315 100644 --- a/src/test/ui/feature-gates/feature-gate-abi.stderr +++ b/src/test/ui/feature-gates/feature-gate-abi.stderr @@ -1,5 +1,5 @@ error[E0658]: intrinsics are subject to change - --> $DIR/feature-gate-abi.rs:20:1 + --> $DIR/feature-gate-abi.rs:11:1 | LL | extern "rust-intrinsic" fn f1() {} //~ ERROR intrinsics are subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | extern "rust-intrinsic" fn f1() {} //~ ERROR intrinsics are subject to chan = help: add #![feature(intrinsics)] to the crate attributes to enable error[E0658]: platform intrinsics are experimental and possibly buggy (see issue #27731) - --> $DIR/feature-gate-abi.rs:21:1 + --> $DIR/feature-gate-abi.rs:12:1 | LL | extern "platform-intrinsic" fn f2() {} //~ ERROR platform intrinsics are experimental | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -15,7 +15,7 @@ LL | extern "platform-intrinsic" fn f2() {} //~ ERROR platform intrinsics are ex = help: add #![feature(platform_intrinsics)] to the crate attributes to enable error[E0658]: vectorcall is experimental and subject to change - --> $DIR/feature-gate-abi.rs:22:1 + --> $DIR/feature-gate-abi.rs:13:1 | LL | extern "vectorcall" fn f3() {} //~ ERROR vectorcall is experimental and subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -23,7 +23,7 @@ LL | extern "vectorcall" fn f3() {} //~ ERROR vectorcall is experimental and sub = help: add #![feature(abi_vectorcall)] to the crate attributes to enable error[E0658]: rust-call ABI is subject to change (see issue #29625) - --> $DIR/feature-gate-abi.rs:23:1 + --> $DIR/feature-gate-abi.rs:14:1 | LL | extern "rust-call" fn f4() {} //~ ERROR rust-call ABI is subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -31,7 +31,7 @@ LL | extern "rust-call" fn f4() {} //~ ERROR rust-call ABI is subject to change = help: add #![feature(unboxed_closures)] to the crate attributes to enable error[E0658]: msp430-interrupt ABI is experimental and subject to change (see issue #38487) - --> $DIR/feature-gate-abi.rs:24:1 + --> $DIR/feature-gate-abi.rs:15:1 | LL | extern "msp430-interrupt" fn f5() {} //~ ERROR msp430-interrupt ABI is experimental | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -39,7 +39,7 @@ LL | extern "msp430-interrupt" fn f5() {} //~ ERROR msp430-interrupt ABI is expe = help: add #![feature(abi_msp430_interrupt)] to the crate attributes to enable error[E0658]: PTX ABIs are experimental and subject to change (see issue #38788) - --> $DIR/feature-gate-abi.rs:25:1 + --> $DIR/feature-gate-abi.rs:16:1 | LL | extern "ptx-kernel" fn f6() {} //~ ERROR PTX ABIs are experimental and subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -47,7 +47,7 @@ LL | extern "ptx-kernel" fn f6() {} //~ ERROR PTX ABIs are experimental and subj = help: add #![feature(abi_ptx)] to the crate attributes to enable error[E0658]: x86-interrupt ABI is experimental and subject to change (see issue #40180) - --> $DIR/feature-gate-abi.rs:26:1 + --> $DIR/feature-gate-abi.rs:17:1 | LL | extern "x86-interrupt" fn f7() {} //~ ERROR x86-interrupt ABI is experimental | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -55,7 +55,7 @@ LL | extern "x86-interrupt" fn f7() {} //~ ERROR x86-interrupt ABI is experiment = help: add #![feature(abi_x86_interrupt)] to the crate attributes to enable error[E0658]: thiscall is experimental and subject to change - --> $DIR/feature-gate-abi.rs:27:1 + --> $DIR/feature-gate-abi.rs:18:1 | LL | extern "thiscall" fn f8() {} //~ ERROR thiscall is experimental and subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -63,7 +63,7 @@ LL | extern "thiscall" fn f8() {} //~ ERROR thiscall is experimental and subject = help: add #![feature(abi_thiscall)] to the crate attributes to enable error[E0658]: amdgpu-kernel ABI is experimental and subject to change (see issue #51575) - --> $DIR/feature-gate-abi.rs:28:1 + --> $DIR/feature-gate-abi.rs:19:1 | LL | extern "amdgpu-kernel" fn f9() {} //~ ERROR amdgpu-kernel ABI is experimental and subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -71,7 +71,7 @@ LL | extern "amdgpu-kernel" fn f9() {} //~ ERROR amdgpu-kernel ABI is experiment = help: add #![feature(abi_amdgpu_kernel)] to the crate attributes to enable error[E0658]: intrinsics are subject to change - --> $DIR/feature-gate-abi.rs:32:5 + --> $DIR/feature-gate-abi.rs:23:5 | LL | extern "rust-intrinsic" fn m1(); //~ ERROR intrinsics are subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -79,7 +79,7 @@ LL | extern "rust-intrinsic" fn m1(); //~ ERROR intrinsics are subject to ch = help: add #![feature(intrinsics)] to the crate attributes to enable error[E0658]: platform intrinsics are experimental and possibly buggy (see issue #27731) - --> $DIR/feature-gate-abi.rs:33:5 + --> $DIR/feature-gate-abi.rs:24:5 | LL | extern "platform-intrinsic" fn m2(); //~ ERROR platform intrinsics are experimental | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -87,7 +87,7 @@ LL | extern "platform-intrinsic" fn m2(); //~ ERROR platform intrinsics are = help: add #![feature(platform_intrinsics)] to the crate attributes to enable error[E0658]: vectorcall is experimental and subject to change - --> $DIR/feature-gate-abi.rs:34:5 + --> $DIR/feature-gate-abi.rs:25:5 | LL | extern "vectorcall" fn m3(); //~ ERROR vectorcall is experimental and subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -95,7 +95,7 @@ LL | extern "vectorcall" fn m3(); //~ ERROR vectorcall is experimental and s = help: add #![feature(abi_vectorcall)] to the crate attributes to enable error[E0658]: rust-call ABI is subject to change (see issue #29625) - --> $DIR/feature-gate-abi.rs:35:5 + --> $DIR/feature-gate-abi.rs:26:5 | LL | extern "rust-call" fn m4(); //~ ERROR rust-call ABI is subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -103,7 +103,7 @@ LL | extern "rust-call" fn m4(); //~ ERROR rust-call ABI is subject to chang = help: add #![feature(unboxed_closures)] to the crate attributes to enable error[E0658]: msp430-interrupt ABI is experimental and subject to change (see issue #38487) - --> $DIR/feature-gate-abi.rs:36:5 + --> $DIR/feature-gate-abi.rs:27:5 | LL | extern "msp430-interrupt" fn m5(); //~ ERROR msp430-interrupt ABI is experimental | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -111,7 +111,7 @@ LL | extern "msp430-interrupt" fn m5(); //~ ERROR msp430-interrupt ABI is ex = help: add #![feature(abi_msp430_interrupt)] to the crate attributes to enable error[E0658]: PTX ABIs are experimental and subject to change (see issue #38788) - --> $DIR/feature-gate-abi.rs:37:5 + --> $DIR/feature-gate-abi.rs:28:5 | LL | extern "ptx-kernel" fn m6(); //~ ERROR PTX ABIs are experimental and subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -119,7 +119,7 @@ LL | extern "ptx-kernel" fn m6(); //~ ERROR PTX ABIs are experimental and su = help: add #![feature(abi_ptx)] to the crate attributes to enable error[E0658]: x86-interrupt ABI is experimental and subject to change (see issue #40180) - --> $DIR/feature-gate-abi.rs:38:5 + --> $DIR/feature-gate-abi.rs:29:5 | LL | extern "x86-interrupt" fn m7(); //~ ERROR x86-interrupt ABI is experimental | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -127,7 +127,7 @@ LL | extern "x86-interrupt" fn m7(); //~ ERROR x86-interrupt ABI is experime = help: add #![feature(abi_x86_interrupt)] to the crate attributes to enable error[E0658]: thiscall is experimental and subject to change - --> $DIR/feature-gate-abi.rs:39:5 + --> $DIR/feature-gate-abi.rs:30:5 | LL | extern "thiscall" fn m8(); //~ ERROR thiscall is experimental and subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -135,7 +135,7 @@ LL | extern "thiscall" fn m8(); //~ ERROR thiscall is experimental and subje = help: add #![feature(abi_thiscall)] to the crate attributes to enable error[E0658]: amdgpu-kernel ABI is experimental and subject to change (see issue #51575) - --> $DIR/feature-gate-abi.rs:40:5 + --> $DIR/feature-gate-abi.rs:31:5 | LL | extern "amdgpu-kernel" fn m9(); //~ ERROR amdgpu-kernel ABI is experimental and subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -143,7 +143,7 @@ LL | extern "amdgpu-kernel" fn m9(); //~ ERROR amdgpu-kernel ABI is experime = help: add #![feature(abi_amdgpu_kernel)] to the crate attributes to enable error[E0658]: intrinsics are subject to change - --> $DIR/feature-gate-abi.rs:42:5 + --> $DIR/feature-gate-abi.rs:33:5 | LL | extern "rust-intrinsic" fn dm1() {} //~ ERROR intrinsics are subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -151,7 +151,7 @@ LL | extern "rust-intrinsic" fn dm1() {} //~ ERROR intrinsics are subject to = help: add #![feature(intrinsics)] to the crate attributes to enable error[E0658]: platform intrinsics are experimental and possibly buggy (see issue #27731) - --> $DIR/feature-gate-abi.rs:43:5 + --> $DIR/feature-gate-abi.rs:34:5 | LL | extern "platform-intrinsic" fn dm2() {} //~ ERROR platform intrinsics are experimental | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -159,7 +159,7 @@ LL | extern "platform-intrinsic" fn dm2() {} //~ ERROR platform intrinsics a = help: add #![feature(platform_intrinsics)] to the crate attributes to enable error[E0658]: vectorcall is experimental and subject to change - --> $DIR/feature-gate-abi.rs:44:5 + --> $DIR/feature-gate-abi.rs:35:5 | LL | extern "vectorcall" fn dm3() {} //~ ERROR vectorcall is experimental and subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -167,7 +167,7 @@ LL | extern "vectorcall" fn dm3() {} //~ ERROR vectorcall is experimental an = help: add #![feature(abi_vectorcall)] to the crate attributes to enable error[E0658]: rust-call ABI is subject to change (see issue #29625) - --> $DIR/feature-gate-abi.rs:45:5 + --> $DIR/feature-gate-abi.rs:36:5 | LL | extern "rust-call" fn dm4() {} //~ ERROR rust-call ABI is subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -175,7 +175,7 @@ LL | extern "rust-call" fn dm4() {} //~ ERROR rust-call ABI is subject to ch = help: add #![feature(unboxed_closures)] to the crate attributes to enable error[E0658]: msp430-interrupt ABI is experimental and subject to change (see issue #38487) - --> $DIR/feature-gate-abi.rs:46:5 + --> $DIR/feature-gate-abi.rs:37:5 | LL | extern "msp430-interrupt" fn dm5() {} //~ ERROR msp430-interrupt ABI is experimental | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -183,7 +183,7 @@ LL | extern "msp430-interrupt" fn dm5() {} //~ ERROR msp430-interrupt ABI is = help: add #![feature(abi_msp430_interrupt)] to the crate attributes to enable error[E0658]: PTX ABIs are experimental and subject to change (see issue #38788) - --> $DIR/feature-gate-abi.rs:47:5 + --> $DIR/feature-gate-abi.rs:38:5 | LL | extern "ptx-kernel" fn dm6() {} //~ ERROR PTX ABIs are experimental and subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -191,7 +191,7 @@ LL | extern "ptx-kernel" fn dm6() {} //~ ERROR PTX ABIs are experimental and = help: add #![feature(abi_ptx)] to the crate attributes to enable error[E0658]: x86-interrupt ABI is experimental and subject to change (see issue #40180) - --> $DIR/feature-gate-abi.rs:48:5 + --> $DIR/feature-gate-abi.rs:39:5 | LL | extern "x86-interrupt" fn dm7() {} //~ ERROR x86-interrupt ABI is experimental | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -199,7 +199,7 @@ LL | extern "x86-interrupt" fn dm7() {} //~ ERROR x86-interrupt ABI is exper = help: add #![feature(abi_x86_interrupt)] to the crate attributes to enable error[E0658]: thiscall is experimental and subject to change - --> $DIR/feature-gate-abi.rs:49:5 + --> $DIR/feature-gate-abi.rs:40:5 | LL | extern "thiscall" fn dm8() {} //~ ERROR thiscall is experimental and subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -207,7 +207,7 @@ LL | extern "thiscall" fn dm8() {} //~ ERROR thiscall is experimental and su = help: add #![feature(abi_thiscall)] to the crate attributes to enable error[E0658]: amdgpu-kernel ABI is experimental and subject to change (see issue #51575) - --> $DIR/feature-gate-abi.rs:50:5 + --> $DIR/feature-gate-abi.rs:41:5 | LL | extern "amdgpu-kernel" fn dm9() {} //~ ERROR amdgpu-kernel ABI is experimental and subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -215,7 +215,7 @@ LL | extern "amdgpu-kernel" fn dm9() {} //~ ERROR amdgpu-kernel ABI is exper = help: add #![feature(abi_amdgpu_kernel)] to the crate attributes to enable error[E0658]: intrinsics are subject to change - --> $DIR/feature-gate-abi.rs:57:5 + --> $DIR/feature-gate-abi.rs:48:5 | LL | extern "rust-intrinsic" fn m1() {} //~ ERROR intrinsics are subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -223,7 +223,7 @@ LL | extern "rust-intrinsic" fn m1() {} //~ ERROR intrinsics are subject to = help: add #![feature(intrinsics)] to the crate attributes to enable error[E0658]: platform intrinsics are experimental and possibly buggy (see issue #27731) - --> $DIR/feature-gate-abi.rs:58:5 + --> $DIR/feature-gate-abi.rs:49:5 | LL | extern "platform-intrinsic" fn m2() {} //~ ERROR platform intrinsics are experimental | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -231,7 +231,7 @@ LL | extern "platform-intrinsic" fn m2() {} //~ ERROR platform intrinsics ar = help: add #![feature(platform_intrinsics)] to the crate attributes to enable error[E0658]: vectorcall is experimental and subject to change - --> $DIR/feature-gate-abi.rs:59:5 + --> $DIR/feature-gate-abi.rs:50:5 | LL | extern "vectorcall" fn m3() {} //~ ERROR vectorcall is experimental and subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -239,7 +239,7 @@ LL | extern "vectorcall" fn m3() {} //~ ERROR vectorcall is experimental and = help: add #![feature(abi_vectorcall)] to the crate attributes to enable error[E0658]: rust-call ABI is subject to change (see issue #29625) - --> $DIR/feature-gate-abi.rs:60:5 + --> $DIR/feature-gate-abi.rs:51:5 | LL | extern "rust-call" fn m4() {} //~ ERROR rust-call ABI is subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -247,7 +247,7 @@ LL | extern "rust-call" fn m4() {} //~ ERROR rust-call ABI is subject to cha = help: add #![feature(unboxed_closures)] to the crate attributes to enable error[E0658]: msp430-interrupt ABI is experimental and subject to change (see issue #38487) - --> $DIR/feature-gate-abi.rs:61:5 + --> $DIR/feature-gate-abi.rs:52:5 | LL | extern "msp430-interrupt" fn m5() {} //~ ERROR msp430-interrupt ABI is experimental | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -255,7 +255,7 @@ LL | extern "msp430-interrupt" fn m5() {} //~ ERROR msp430-interrupt ABI is = help: add #![feature(abi_msp430_interrupt)] to the crate attributes to enable error[E0658]: PTX ABIs are experimental and subject to change (see issue #38788) - --> $DIR/feature-gate-abi.rs:62:5 + --> $DIR/feature-gate-abi.rs:53:5 | LL | extern "ptx-kernel" fn m6() {} //~ ERROR PTX ABIs are experimental and subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -263,7 +263,7 @@ LL | extern "ptx-kernel" fn m6() {} //~ ERROR PTX ABIs are experimental and = help: add #![feature(abi_ptx)] to the crate attributes to enable error[E0658]: x86-interrupt ABI is experimental and subject to change (see issue #40180) - --> $DIR/feature-gate-abi.rs:63:5 + --> $DIR/feature-gate-abi.rs:54:5 | LL | extern "x86-interrupt" fn m7() {} //~ ERROR x86-interrupt ABI is experimental | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -271,7 +271,7 @@ LL | extern "x86-interrupt" fn m7() {} //~ ERROR x86-interrupt ABI is experi = help: add #![feature(abi_x86_interrupt)] to the crate attributes to enable error[E0658]: thiscall is experimental and subject to change - --> $DIR/feature-gate-abi.rs:64:5 + --> $DIR/feature-gate-abi.rs:55:5 | LL | extern "thiscall" fn m8() {} //~ ERROR thiscall is experimental and subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -279,7 +279,7 @@ LL | extern "thiscall" fn m8() {} //~ ERROR thiscall is experimental and sub = help: add #![feature(abi_thiscall)] to the crate attributes to enable error[E0658]: amdgpu-kernel ABI is experimental and subject to change (see issue #51575) - --> $DIR/feature-gate-abi.rs:65:5 + --> $DIR/feature-gate-abi.rs:56:5 | LL | extern "amdgpu-kernel" fn m9() {} //~ ERROR amdgpu-kernel ABI is experimental and subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -287,7 +287,7 @@ LL | extern "amdgpu-kernel" fn m9() {} //~ ERROR amdgpu-kernel ABI is experi = help: add #![feature(abi_amdgpu_kernel)] to the crate attributes to enable error[E0658]: intrinsics are subject to change - --> $DIR/feature-gate-abi.rs:70:5 + --> $DIR/feature-gate-abi.rs:61:5 | LL | extern "rust-intrinsic" fn im1() {} //~ ERROR intrinsics are subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -295,7 +295,7 @@ LL | extern "rust-intrinsic" fn im1() {} //~ ERROR intrinsics are subject to = help: add #![feature(intrinsics)] to the crate attributes to enable error[E0658]: platform intrinsics are experimental and possibly buggy (see issue #27731) - --> $DIR/feature-gate-abi.rs:71:5 + --> $DIR/feature-gate-abi.rs:62:5 | LL | extern "platform-intrinsic" fn im2() {} //~ ERROR platform intrinsics are experimental | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -303,7 +303,7 @@ LL | extern "platform-intrinsic" fn im2() {} //~ ERROR platform intrinsics a = help: add #![feature(platform_intrinsics)] to the crate attributes to enable error[E0658]: vectorcall is experimental and subject to change - --> $DIR/feature-gate-abi.rs:72:5 + --> $DIR/feature-gate-abi.rs:63:5 | LL | extern "vectorcall" fn im3() {} //~ ERROR vectorcall is experimental and subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -311,7 +311,7 @@ LL | extern "vectorcall" fn im3() {} //~ ERROR vectorcall is experimental an = help: add #![feature(abi_vectorcall)] to the crate attributes to enable error[E0658]: rust-call ABI is subject to change (see issue #29625) - --> $DIR/feature-gate-abi.rs:73:5 + --> $DIR/feature-gate-abi.rs:64:5 | LL | extern "rust-call" fn im4() {} //~ ERROR rust-call ABI is subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -319,7 +319,7 @@ LL | extern "rust-call" fn im4() {} //~ ERROR rust-call ABI is subject to ch = help: add #![feature(unboxed_closures)] to the crate attributes to enable error[E0658]: msp430-interrupt ABI is experimental and subject to change (see issue #38487) - --> $DIR/feature-gate-abi.rs:74:5 + --> $DIR/feature-gate-abi.rs:65:5 | LL | extern "msp430-interrupt" fn im5() {} //~ ERROR msp430-interrupt ABI is experimental | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -327,7 +327,7 @@ LL | extern "msp430-interrupt" fn im5() {} //~ ERROR msp430-interrupt ABI is = help: add #![feature(abi_msp430_interrupt)] to the crate attributes to enable error[E0658]: PTX ABIs are experimental and subject to change (see issue #38788) - --> $DIR/feature-gate-abi.rs:75:5 + --> $DIR/feature-gate-abi.rs:66:5 | LL | extern "ptx-kernel" fn im6() {} //~ ERROR PTX ABIs are experimental and subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -335,7 +335,7 @@ LL | extern "ptx-kernel" fn im6() {} //~ ERROR PTX ABIs are experimental and = help: add #![feature(abi_ptx)] to the crate attributes to enable error[E0658]: x86-interrupt ABI is experimental and subject to change (see issue #40180) - --> $DIR/feature-gate-abi.rs:76:5 + --> $DIR/feature-gate-abi.rs:67:5 | LL | extern "x86-interrupt" fn im7() {} //~ ERROR x86-interrupt ABI is experimental | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -343,7 +343,7 @@ LL | extern "x86-interrupt" fn im7() {} //~ ERROR x86-interrupt ABI is exper = help: add #![feature(abi_x86_interrupt)] to the crate attributes to enable error[E0658]: thiscall is experimental and subject to change - --> $DIR/feature-gate-abi.rs:77:5 + --> $DIR/feature-gate-abi.rs:68:5 | LL | extern "thiscall" fn im8() {} //~ ERROR thiscall is experimental and subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -351,7 +351,7 @@ LL | extern "thiscall" fn im8() {} //~ ERROR thiscall is experimental and su = help: add #![feature(abi_thiscall)] to the crate attributes to enable error[E0658]: amdgpu-kernel ABI is experimental and subject to change (see issue #51575) - --> $DIR/feature-gate-abi.rs:78:5 + --> $DIR/feature-gate-abi.rs:69:5 | LL | extern "amdgpu-kernel" fn im9() {} //~ ERROR amdgpu-kernel ABI is experimental and subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -359,7 +359,7 @@ LL | extern "amdgpu-kernel" fn im9() {} //~ ERROR amdgpu-kernel ABI is exper = help: add #![feature(abi_amdgpu_kernel)] to the crate attributes to enable error[E0658]: intrinsics are subject to change - --> $DIR/feature-gate-abi.rs:82:11 + --> $DIR/feature-gate-abi.rs:73:11 | LL | type A1 = extern "rust-intrinsic" fn(); //~ ERROR intrinsics are subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -367,7 +367,7 @@ LL | type A1 = extern "rust-intrinsic" fn(); //~ ERROR intrinsics are subject to = help: add #![feature(intrinsics)] to the crate attributes to enable error[E0658]: platform intrinsics are experimental and possibly buggy (see issue #27731) - --> $DIR/feature-gate-abi.rs:83:11 + --> $DIR/feature-gate-abi.rs:74:11 | LL | type A2 = extern "platform-intrinsic" fn(); //~ ERROR platform intrinsics are experimental | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -375,7 +375,7 @@ LL | type A2 = extern "platform-intrinsic" fn(); //~ ERROR platform intrinsics a = help: add #![feature(platform_intrinsics)] to the crate attributes to enable error[E0658]: vectorcall is experimental and subject to change - --> $DIR/feature-gate-abi.rs:84:11 + --> $DIR/feature-gate-abi.rs:75:11 | LL | type A3 = extern "vectorcall" fn(); //~ ERROR vectorcall is experimental and subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -383,7 +383,7 @@ LL | type A3 = extern "vectorcall" fn(); //~ ERROR vectorcall is experimental an = help: add #![feature(abi_vectorcall)] to the crate attributes to enable error[E0658]: rust-call ABI is subject to change (see issue #29625) - --> $DIR/feature-gate-abi.rs:85:11 + --> $DIR/feature-gate-abi.rs:76:11 | LL | type A4 = extern "rust-call" fn(); //~ ERROR rust-call ABI is subject to change | ^^^^^^^^^^^^^^^^^^^^^^^ @@ -391,7 +391,7 @@ LL | type A4 = extern "rust-call" fn(); //~ ERROR rust-call ABI is subject to ch = help: add #![feature(unboxed_closures)] to the crate attributes to enable error[E0658]: msp430-interrupt ABI is experimental and subject to change (see issue #38487) - --> $DIR/feature-gate-abi.rs:86:11 + --> $DIR/feature-gate-abi.rs:77:11 | LL | type A5 = extern "msp430-interrupt" fn(); //~ ERROR msp430-interrupt ABI is experimental | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -399,7 +399,7 @@ LL | type A5 = extern "msp430-interrupt" fn(); //~ ERROR msp430-interrupt ABI is = help: add #![feature(abi_msp430_interrupt)] to the crate attributes to enable error[E0658]: PTX ABIs are experimental and subject to change (see issue #38788) - --> $DIR/feature-gate-abi.rs:87:11 + --> $DIR/feature-gate-abi.rs:78:11 | LL | type A6 = extern "ptx-kernel" fn (); //~ ERROR PTX ABIs are experimental and subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -407,7 +407,7 @@ LL | type A6 = extern "ptx-kernel" fn (); //~ ERROR PTX ABIs are experimental an = help: add #![feature(abi_ptx)] to the crate attributes to enable error[E0658]: x86-interrupt ABI is experimental and subject to change (see issue #40180) - --> $DIR/feature-gate-abi.rs:88:11 + --> $DIR/feature-gate-abi.rs:79:11 | LL | type A7 = extern "x86-interrupt" fn(); //~ ERROR x86-interrupt ABI is experimental | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -415,7 +415,7 @@ LL | type A7 = extern "x86-interrupt" fn(); //~ ERROR x86-interrupt ABI is exper = help: add #![feature(abi_x86_interrupt)] to the crate attributes to enable error[E0658]: thiscall is experimental and subject to change - --> $DIR/feature-gate-abi.rs:89:11 + --> $DIR/feature-gate-abi.rs:80:11 | LL | type A8 = extern "thiscall" fn(); //~ ERROR thiscall is experimental and subject to change | ^^^^^^^^^^^^^^^^^^^^^^ @@ -423,7 +423,7 @@ LL | type A8 = extern "thiscall" fn(); //~ ERROR thiscall is experimental and su = help: add #![feature(abi_thiscall)] to the crate attributes to enable error[E0658]: amdgpu-kernel ABI is experimental and subject to change (see issue #51575) - --> $DIR/feature-gate-abi.rs:90:11 + --> $DIR/feature-gate-abi.rs:81:11 | LL | type A9 = extern "amdgpu-kernel" fn(); //~ ERROR amdgpu-kernel ABI is experimental and subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -431,7 +431,7 @@ LL | type A9 = extern "amdgpu-kernel" fn(); //~ ERROR amdgpu-kernel ABI is exper = help: add #![feature(abi_amdgpu_kernel)] to the crate attributes to enable error[E0658]: intrinsics are subject to change - --> $DIR/feature-gate-abi.rs:93:1 + --> $DIR/feature-gate-abi.rs:84:1 | LL | extern "rust-intrinsic" {} //~ ERROR intrinsics are subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -439,7 +439,7 @@ LL | extern "rust-intrinsic" {} //~ ERROR intrinsics are subject to change = help: add #![feature(intrinsics)] to the crate attributes to enable error[E0658]: platform intrinsics are experimental and possibly buggy (see issue #27731) - --> $DIR/feature-gate-abi.rs:94:1 + --> $DIR/feature-gate-abi.rs:85:1 | LL | extern "platform-intrinsic" {} //~ ERROR platform intrinsics are experimental | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -447,7 +447,7 @@ LL | extern "platform-intrinsic" {} //~ ERROR platform intrinsics are experiment = help: add #![feature(platform_intrinsics)] to the crate attributes to enable error[E0658]: vectorcall is experimental and subject to change - --> $DIR/feature-gate-abi.rs:95:1 + --> $DIR/feature-gate-abi.rs:86:1 | LL | extern "vectorcall" {} //~ ERROR vectorcall is experimental and subject to change | ^^^^^^^^^^^^^^^^^^^^^^ @@ -455,7 +455,7 @@ LL | extern "vectorcall" {} //~ ERROR vectorcall is experimental and subject to = help: add #![feature(abi_vectorcall)] to the crate attributes to enable error[E0658]: rust-call ABI is subject to change (see issue #29625) - --> $DIR/feature-gate-abi.rs:96:1 + --> $DIR/feature-gate-abi.rs:87:1 | LL | extern "rust-call" {} //~ ERROR rust-call ABI is subject to change | ^^^^^^^^^^^^^^^^^^^^^ @@ -463,7 +463,7 @@ LL | extern "rust-call" {} //~ ERROR rust-call ABI is subject to change = help: add #![feature(unboxed_closures)] to the crate attributes to enable error[E0658]: msp430-interrupt ABI is experimental and subject to change (see issue #38487) - --> $DIR/feature-gate-abi.rs:97:1 + --> $DIR/feature-gate-abi.rs:88:1 | LL | extern "msp430-interrupt" {} //~ ERROR msp430-interrupt ABI is experimental | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -471,7 +471,7 @@ LL | extern "msp430-interrupt" {} //~ ERROR msp430-interrupt ABI is experimental = help: add #![feature(abi_msp430_interrupt)] to the crate attributes to enable error[E0658]: PTX ABIs are experimental and subject to change (see issue #38788) - --> $DIR/feature-gate-abi.rs:98:1 + --> $DIR/feature-gate-abi.rs:89:1 | LL | extern "ptx-kernel" {} //~ ERROR PTX ABIs are experimental and subject to change | ^^^^^^^^^^^^^^^^^^^^^^ @@ -479,7 +479,7 @@ LL | extern "ptx-kernel" {} //~ ERROR PTX ABIs are experimental and subject to c = help: add #![feature(abi_ptx)] to the crate attributes to enable error[E0658]: x86-interrupt ABI is experimental and subject to change (see issue #40180) - --> $DIR/feature-gate-abi.rs:99:1 + --> $DIR/feature-gate-abi.rs:90:1 | LL | extern "x86-interrupt" {} //~ ERROR x86-interrupt ABI is experimental | ^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -487,7 +487,7 @@ LL | extern "x86-interrupt" {} //~ ERROR x86-interrupt ABI is experimental = help: add #![feature(abi_x86_interrupt)] to the crate attributes to enable error[E0658]: thiscall is experimental and subject to change - --> $DIR/feature-gate-abi.rs:100:1 + --> $DIR/feature-gate-abi.rs:91:1 | LL | extern "thiscall" {} //~ ERROR thiscall is experimental and subject to change | ^^^^^^^^^^^^^^^^^^^^ @@ -495,7 +495,7 @@ LL | extern "thiscall" {} //~ ERROR thiscall is experimental and subject to chan = help: add #![feature(abi_thiscall)] to the crate attributes to enable error[E0658]: amdgpu-kernel ABI is experimental and subject to change (see issue #51575) - --> $DIR/feature-gate-abi.rs:101:1 + --> $DIR/feature-gate-abi.rs:92:1 | LL | extern "amdgpu-kernel" {} //~ ERROR amdgpu-kernel ABI is experimental and subject to change | ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-abi_unadjusted.rs b/src/test/ui/feature-gates/feature-gate-abi_unadjusted.rs index 501f4451ed8d5..35a7d73288b5d 100644 --- a/src/test/ui/feature-gates/feature-gate-abi_unadjusted.rs +++ b/src/test/ui/feature-gates/feature-gate-abi_unadjusted.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern "unadjusted" fn foo() { //~^ ERROR: unadjusted ABI is an implementation detail and perma-unstable } diff --git a/src/test/ui/feature-gates/feature-gate-abi_unadjusted.stderr b/src/test/ui/feature-gates/feature-gate-abi_unadjusted.stderr index 467102d18477b..707b6bc75b171 100644 --- a/src/test/ui/feature-gates/feature-gate-abi_unadjusted.stderr +++ b/src/test/ui/feature-gates/feature-gate-abi_unadjusted.stderr @@ -1,5 +1,5 @@ error[E0658]: unadjusted ABI is an implementation detail and perma-unstable - --> $DIR/feature-gate-abi_unadjusted.rs:11:1 + --> $DIR/feature-gate-abi_unadjusted.rs:1:1 | LL | / extern "unadjusted" fn foo() { LL | | //~^ ERROR: unadjusted ABI is an implementation detail and perma-unstable diff --git a/src/test/ui/feature-gates/feature-gate-alloc-error-handler.rs b/src/test/ui/feature-gates/feature-gate-alloc-error-handler.rs index 66691af2d0325..fbd9291afbe03 100644 --- a/src/test/ui/feature-gates/feature-gate-alloc-error-handler.rs +++ b/src/test/ui/feature-gates/feature-gate-alloc-error-handler.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-C panic=abort #![no_std] diff --git a/src/test/ui/feature-gates/feature-gate-alloc-error-handler.stderr b/src/test/ui/feature-gates/feature-gate-alloc-error-handler.stderr index 255d5b06c1768..c20b21fa43d68 100644 --- a/src/test/ui/feature-gates/feature-gate-alloc-error-handler.stderr +++ b/src/test/ui/feature-gates/feature-gate-alloc-error-handler.stderr @@ -1,5 +1,5 @@ error[E0658]: #[alloc_error_handler] is an unstable feature (see issue #51540) - --> $DIR/feature-gate-alloc-error-handler.rs:18:1 + --> $DIR/feature-gate-alloc-error-handler.rs:8:1 | LL | #[alloc_error_handler] //~ ERROR #[alloc_error_handler] is an unstable feature (see issue #51540) | ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-allocator_internals.rs b/src/test/ui/feature-gates/feature-gate-allocator_internals.rs index b519a985ec5e7..2045857e4cb05 100644 --- a/src/test/ui/feature-gates/feature-gate-allocator_internals.rs +++ b/src/test/ui/feature-gates/feature-gate-allocator_internals.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![default_lib_allocator] //~ ERROR: attribute is an experimental feature fn main() {} diff --git a/src/test/ui/feature-gates/feature-gate-allocator_internals.stderr b/src/test/ui/feature-gates/feature-gate-allocator_internals.stderr index a9667e8011a9b..5103b7214f508 100644 --- a/src/test/ui/feature-gates/feature-gate-allocator_internals.stderr +++ b/src/test/ui/feature-gates/feature-gate-allocator_internals.stderr @@ -1,5 +1,5 @@ error[E0658]: the `#[default_lib_allocator]` attribute is an experimental feature - --> $DIR/feature-gate-allocator_internals.rs:11:1 + --> $DIR/feature-gate-allocator_internals.rs:1:1 | LL | #![default_lib_allocator] //~ ERROR: attribute is an experimental feature | ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-allow-internal-unsafe-nested-macro.rs b/src/test/ui/feature-gates/feature-gate-allow-internal-unsafe-nested-macro.rs index 590dc619f2f1a..9f604aafdf87d 100644 --- a/src/test/ui/feature-gates/feature-gate-allow-internal-unsafe-nested-macro.rs +++ b/src/test/ui/feature-gates/feature-gate-allow-internal-unsafe-nested-macro.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // gate-test-allow_internal_unsafe #![allow(unused_macros)] diff --git a/src/test/ui/feature-gates/feature-gate-allow-internal-unsafe-nested-macro.stderr b/src/test/ui/feature-gates/feature-gate-allow-internal-unsafe-nested-macro.stderr index 97e4141185461..1cadfb28214cb 100644 --- a/src/test/ui/feature-gates/feature-gate-allow-internal-unsafe-nested-macro.stderr +++ b/src/test/ui/feature-gates/feature-gate-allow-internal-unsafe-nested-macro.stderr @@ -1,5 +1,5 @@ error[E0658]: allow_internal_unsafe side-steps the unsafe_code lint - --> $DIR/feature-gate-allow-internal-unsafe-nested-macro.rs:18:9 + --> $DIR/feature-gate-allow-internal-unsafe-nested-macro.rs:8:9 | LL | #[allow_internal_unsafe] //~ ERROR allow_internal_unsafe side-steps | ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-allow-internal-unstable-nested-macro.rs b/src/test/ui/feature-gates/feature-gate-allow-internal-unstable-nested-macro.rs index 9af501b141955..cf320b2747c36 100644 --- a/src/test/ui/feature-gates/feature-gate-allow-internal-unstable-nested-macro.rs +++ b/src/test/ui/feature-gates/feature-gate-allow-internal-unstable-nested-macro.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // gate-test-allow_internal_unstable #![allow(unused_macros)] diff --git a/src/test/ui/feature-gates/feature-gate-allow-internal-unstable-nested-macro.stderr b/src/test/ui/feature-gates/feature-gate-allow-internal-unstable-nested-macro.stderr index 2ecaaae89d10e..7cdf743b279c2 100644 --- a/src/test/ui/feature-gates/feature-gate-allow-internal-unstable-nested-macro.stderr +++ b/src/test/ui/feature-gates/feature-gate-allow-internal-unstable-nested-macro.stderr @@ -1,5 +1,5 @@ error[E0658]: allow_internal_unstable side-steps feature gating and stability checks - --> $DIR/feature-gate-allow-internal-unstable-nested-macro.rs:18:9 + --> $DIR/feature-gate-allow-internal-unstable-nested-macro.rs:8:9 | LL | #[allow_internal_unstable] //~ ERROR allow_internal_unstable side-steps | ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-allow-internal-unstable-struct.rs b/src/test/ui/feature-gates/feature-gate-allow-internal-unstable-struct.rs index b186278ef8b7b..c9ea6c338b5cc 100644 --- a/src/test/ui/feature-gates/feature-gate-allow-internal-unstable-struct.rs +++ b/src/test/ui/feature-gates/feature-gate-allow-internal-unstable-struct.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // checks that this attribute is caught on non-macro items. // this needs a different test since this is done after expansion diff --git a/src/test/ui/feature-gates/feature-gate-allow-internal-unstable-struct.stderr b/src/test/ui/feature-gates/feature-gate-allow-internal-unstable-struct.stderr index 4ff5162b0c082..485c00ad42bd6 100644 --- a/src/test/ui/feature-gates/feature-gate-allow-internal-unstable-struct.stderr +++ b/src/test/ui/feature-gates/feature-gate-allow-internal-unstable-struct.stderr @@ -1,5 +1,5 @@ error[E0658]: allow_internal_unstable side-steps feature gating and stability checks - --> $DIR/feature-gate-allow-internal-unstable-struct.rs:14:1 + --> $DIR/feature-gate-allow-internal-unstable-struct.rs:4:1 | LL | #[allow_internal_unstable] //~ ERROR allow_internal_unstable side-steps | ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-allow-internal-unstable.rs b/src/test/ui/feature-gates/feature-gate-allow-internal-unstable.rs index 61a362cb37fb2..bea60fc012e3f 100644 --- a/src/test/ui/feature-gates/feature-gate-allow-internal-unstable.rs +++ b/src/test/ui/feature-gates/feature-gate-allow-internal-unstable.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_macros)] #[allow_internal_unstable] //~ ERROR allow_internal_unstable side-steps diff --git a/src/test/ui/feature-gates/feature-gate-allow-internal-unstable.stderr b/src/test/ui/feature-gates/feature-gate-allow-internal-unstable.stderr index b691eed60d3db..0533d071de3ac 100644 --- a/src/test/ui/feature-gates/feature-gate-allow-internal-unstable.stderr +++ b/src/test/ui/feature-gates/feature-gate-allow-internal-unstable.stderr @@ -1,5 +1,5 @@ error[E0658]: allow_internal_unstable side-steps feature gating and stability checks - --> $DIR/feature-gate-allow-internal-unstable.rs:13:1 + --> $DIR/feature-gate-allow-internal-unstable.rs:3:1 | LL | #[allow_internal_unstable] //~ ERROR allow_internal_unstable side-steps | ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-allow_fail.rs b/src/test/ui/feature-gates/feature-gate-allow_fail.rs index 1124740280960..cd8b096294261 100644 --- a/src/test/ui/feature-gates/feature-gate-allow_fail.rs +++ b/src/test/ui/feature-gates/feature-gate-allow_fail.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // check that #[allow_fail] is feature-gated #[allow_fail] //~ ERROR allow_fail attribute is currently unstable diff --git a/src/test/ui/feature-gates/feature-gate-allow_fail.stderr b/src/test/ui/feature-gates/feature-gate-allow_fail.stderr index 3f8ad32437df9..7ed2bb282310c 100644 --- a/src/test/ui/feature-gates/feature-gate-allow_fail.stderr +++ b/src/test/ui/feature-gates/feature-gate-allow_fail.stderr @@ -1,5 +1,5 @@ error[E0658]: allow_fail attribute is currently unstable (see issue #42219) - --> $DIR/feature-gate-allow_fail.rs:13:1 + --> $DIR/feature-gate-allow_fail.rs:3:1 | LL | #[allow_fail] //~ ERROR allow_fail attribute is currently unstable | ^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-arbitrary-self-types.rs b/src/test/ui/feature-gates/feature-gate-arbitrary-self-types.rs index ff0306f199310..7eaebe6b26aae 100644 --- a/src/test/ui/feature-gates/feature-gate-arbitrary-self-types.rs +++ b/src/test/ui/feature-gates/feature-gate-arbitrary-self-types.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::rc::Rc; trait Foo { diff --git a/src/test/ui/feature-gates/feature-gate-arbitrary-self-types.stderr b/src/test/ui/feature-gates/feature-gate-arbitrary-self-types.stderr index ea259aa22adfb..7443fd4845963 100644 --- a/src/test/ui/feature-gates/feature-gate-arbitrary-self-types.stderr +++ b/src/test/ui/feature-gates/feature-gate-arbitrary-self-types.stderr @@ -1,5 +1,5 @@ error[E0658]: arbitrary `self` types are unstable (see issue #44874) - --> $DIR/feature-gate-arbitrary-self-types.rs:14:18 + --> $DIR/feature-gate-arbitrary-self-types.rs:4:18 | LL | fn foo(self: Rc>); //~ ERROR arbitrary `self` types are unstable | ^^^^^^^^^^^^^ @@ -8,7 +8,7 @@ LL | fn foo(self: Rc>); //~ ERROR arbitrary `self` types are unsta = help: consider changing to `self`, `&self`, `&mut self`, or `self: Box` error[E0658]: arbitrary `self` types are unstable (see issue #44874) - --> $DIR/feature-gate-arbitrary-self-types.rs:20:18 + --> $DIR/feature-gate-arbitrary-self-types.rs:10:18 | LL | fn foo(self: Rc>) {} //~ ERROR arbitrary `self` types are unstable | ^^^^^^^^^^^^^ @@ -17,7 +17,7 @@ LL | fn foo(self: Rc>) {} //~ ERROR arbitrary `self` types are uns = help: consider changing to `self`, `&self`, `&mut self`, or `self: Box` error[E0658]: arbitrary `self` types are unstable (see issue #44874) - --> $DIR/feature-gate-arbitrary-self-types.rs:24:18 + --> $DIR/feature-gate-arbitrary-self-types.rs:14:18 | LL | fn bar(self: Box>) {} //~ ERROR arbitrary `self` types are unstable | ^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-arbitrary_self_types-raw-pointer.rs b/src/test/ui/feature-gates/feature-gate-arbitrary_self_types-raw-pointer.rs index 29e51727edcfd..4c69c4546a30b 100644 --- a/src/test/ui/feature-gates/feature-gate-arbitrary_self_types-raw-pointer.rs +++ b/src/test/ui/feature-gates/feature-gate-arbitrary_self_types-raw-pointer.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo; impl Foo { diff --git a/src/test/ui/feature-gates/feature-gate-arbitrary_self_types-raw-pointer.stderr b/src/test/ui/feature-gates/feature-gate-arbitrary_self_types-raw-pointer.stderr index 5ed9a0f4ed040..2254d1b420a2d 100644 --- a/src/test/ui/feature-gates/feature-gate-arbitrary_self_types-raw-pointer.stderr +++ b/src/test/ui/feature-gates/feature-gate-arbitrary_self_types-raw-pointer.stderr @@ -1,5 +1,5 @@ error[E0658]: raw pointer `self` is unstable (see issue #44874) - --> $DIR/feature-gate-arbitrary_self_types-raw-pointer.rs:19:18 + --> $DIR/feature-gate-arbitrary_self_types-raw-pointer.rs:9:18 | LL | fn bar(self: *const Self); | ^^^^^^^^^^^ @@ -8,7 +8,7 @@ LL | fn bar(self: *const Self); = help: consider changing to `self`, `&self`, `&mut self`, or `self: Box` error[E0658]: raw pointer `self` is unstable (see issue #44874) - --> $DIR/feature-gate-arbitrary_self_types-raw-pointer.rs:14:18 + --> $DIR/feature-gate-arbitrary_self_types-raw-pointer.rs:4:18 | LL | fn foo(self: *const Self) {} | ^^^^^^^^^^^ @@ -17,7 +17,7 @@ LL | fn foo(self: *const Self) {} = help: consider changing to `self`, `&self`, `&mut self`, or `self: Box` error[E0658]: raw pointer `self` is unstable (see issue #44874) - --> $DIR/feature-gate-arbitrary_self_types-raw-pointer.rs:24:18 + --> $DIR/feature-gate-arbitrary_self_types-raw-pointer.rs:14:18 | LL | fn bar(self: *const Self) {} | ^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-asm.rs b/src/test/ui/feature-gates/feature-gate-asm.rs index 8d053bdae789b..572d9f26cae7e 100644 --- a/src/test/ui/feature-gates/feature-gate-asm.rs +++ b/src/test/ui/feature-gates/feature-gate-asm.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { unsafe { asm!(""); //~ ERROR inline assembly is not stable enough diff --git a/src/test/ui/feature-gates/feature-gate-asm.stderr b/src/test/ui/feature-gates/feature-gate-asm.stderr index 3fab7c0ece58d..eee38e12c2aaa 100644 --- a/src/test/ui/feature-gates/feature-gate-asm.stderr +++ b/src/test/ui/feature-gates/feature-gate-asm.stderr @@ -1,5 +1,5 @@ error[E0658]: inline assembly is not stable enough for use and is subject to change (see issue #29722) - --> $DIR/feature-gate-asm.rs:13:9 + --> $DIR/feature-gate-asm.rs:3:9 | LL | asm!(""); //~ ERROR inline assembly is not stable enough | ^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-asm2.rs b/src/test/ui/feature-gates/feature-gate-asm2.rs index 222190de9fe9c..b842cba8a7d59 100644 --- a/src/test/ui/feature-gates/feature-gate-asm2.rs +++ b/src/test/ui/feature-gates/feature-gate-asm2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // gate-test-asm fn main() { diff --git a/src/test/ui/feature-gates/feature-gate-asm2.stderr b/src/test/ui/feature-gates/feature-gate-asm2.stderr index a0e881a3b99ae..aadedc887071d 100644 --- a/src/test/ui/feature-gates/feature-gate-asm2.stderr +++ b/src/test/ui/feature-gates/feature-gate-asm2.stderr @@ -1,5 +1,5 @@ error[E0658]: inline assembly is not stable enough for use and is subject to change (see issue #29722) - --> $DIR/feature-gate-asm2.rs:15:24 + --> $DIR/feature-gate-asm2.rs:5:24 | LL | println!("{}", asm!("")); //~ ERROR inline assembly is not stable | ^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-assoc-type-defaults.rs b/src/test/ui/feature-gates/feature-gate-assoc-type-defaults.rs index de3521eb0f20b..d7c6a9f97ad34 100644 --- a/src/test/ui/feature-gates/feature-gate-assoc-type-defaults.rs +++ b/src/test/ui/feature-gates/feature-gate-assoc-type-defaults.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // gate-test-associated_type_defaults trait Foo { diff --git a/src/test/ui/feature-gates/feature-gate-assoc-type-defaults.stderr b/src/test/ui/feature-gates/feature-gate-assoc-type-defaults.stderr index 86431842a8367..a23962fe31897 100644 --- a/src/test/ui/feature-gates/feature-gate-assoc-type-defaults.stderr +++ b/src/test/ui/feature-gates/feature-gate-assoc-type-defaults.stderr @@ -1,5 +1,5 @@ error[E0658]: associated type defaults are unstable (see issue #29661) - --> $DIR/feature-gate-assoc-type-defaults.rs:14:5 + --> $DIR/feature-gate-assoc-type-defaults.rs:4:5 | LL | type Bar = u8; //~ ERROR associated type defaults are unstable | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-async-await-2015-edition.rs b/src/test/ui/feature-gates/feature-gate-async-await-2015-edition.rs index 5b865e9c1c7cb..00a3103af2cbc 100644 --- a/src/test/ui/feature-gates/feature-gate-async-await-2015-edition.rs +++ b/src/test/ui/feature-gates/feature-gate-async-await-2015-edition.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2015 #![feature(futures_api)] diff --git a/src/test/ui/feature-gates/feature-gate-async-await-2015-edition.stderr b/src/test/ui/feature-gates/feature-gate-async-await-2015-edition.stderr index 3db90a48e90b9..7754dbb3b3736 100644 --- a/src/test/ui/feature-gates/feature-gate-async-await-2015-edition.stderr +++ b/src/test/ui/feature-gates/feature-gate-async-await-2015-edition.stderr @@ -1,17 +1,17 @@ error[E0422]: cannot find struct, variant or union type `async` in this scope - --> $DIR/feature-gate-async-await-2015-edition.rs:18:13 + --> $DIR/feature-gate-async-await-2015-edition.rs:8:13 | LL | let _ = async {}; //~ ERROR cannot find struct, variant or union type `async` | ^^^^^ not found in this scope error[E0425]: cannot find value `async` in this scope - --> $DIR/feature-gate-async-await-2015-edition.rs:19:13 + --> $DIR/feature-gate-async-await-2015-edition.rs:9:13 | LL | let _ = async || {}; //~ ERROR cannot find value `async` in this scope | ^^^^^ not found in this scope error[E0658]: async fn is unstable (see issue #50547) - --> $DIR/feature-gate-async-await-2015-edition.rs:15:1 + --> $DIR/feature-gate-async-await-2015-edition.rs:5:1 | LL | async fn foo() {} //~ ERROR async fn is unstable | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-async-await.rs b/src/test/ui/feature-gates/feature-gate-async-await.rs index be34842dea3a6..7ee035644bc95 100644 --- a/src/test/ui/feature-gates/feature-gate-async-await.rs +++ b/src/test/ui/feature-gates/feature-gate-async-await.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // edition:2018 #![feature(futures_api)] diff --git a/src/test/ui/feature-gates/feature-gate-async-await.stderr b/src/test/ui/feature-gates/feature-gate-async-await.stderr index 79ed5c4d008b1..3a3165ba3e696 100644 --- a/src/test/ui/feature-gates/feature-gate-async-await.stderr +++ b/src/test/ui/feature-gates/feature-gate-async-await.stderr @@ -1,5 +1,5 @@ error[E0658]: async fn is unstable (see issue #50547) - --> $DIR/feature-gate-async-await.rs:15:1 + --> $DIR/feature-gate-async-await.rs:5:1 | LL | async fn foo() {} //~ ERROR async fn is unstable | ^^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | async fn foo() {} //~ ERROR async fn is unstable = help: add #![feature(async_await)] to the crate attributes to enable error[E0658]: async blocks are unstable (see issue #50547) - --> $DIR/feature-gate-async-await.rs:18:13 + --> $DIR/feature-gate-async-await.rs:8:13 | LL | let _ = async {}; //~ ERROR async blocks are unstable | ^^^^^^^^ @@ -15,7 +15,7 @@ LL | let _ = async {}; //~ ERROR async blocks are unstable = help: add #![feature(async_await)] to the crate attributes to enable error[E0658]: async closures are unstable (see issue #50547) - --> $DIR/feature-gate-async-await.rs:19:13 + --> $DIR/feature-gate-async-await.rs:9:13 | LL | let _ = async || {}; //~ ERROR async closures are unstable | ^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-box-expr.rs b/src/test/ui/feature-gates/feature-gate-box-expr.rs index 65d437d0c0d31..870253d2f052e 100644 --- a/src/test/ui/feature-gates/feature-gate-box-expr.rs +++ b/src/test/ui/feature-gates/feature-gate-box-expr.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // gate-test-box_syntax // Check that `box EXPR` is feature-gated. diff --git a/src/test/ui/feature-gates/feature-gate-box-expr.stderr b/src/test/ui/feature-gates/feature-gate-box-expr.stderr index 7b235da7ed7e9..9ebff2e044c95 100644 --- a/src/test/ui/feature-gates/feature-gate-box-expr.stderr +++ b/src/test/ui/feature-gates/feature-gate-box-expr.stderr @@ -1,5 +1,5 @@ error[E0658]: box expression syntax is experimental; you can call `Box::new` instead. (see issue #49733) - --> $DIR/feature-gate-box-expr.rs:22:13 + --> $DIR/feature-gate-box-expr.rs:12:13 | LL | let x = box 'c'; //~ ERROR box expression syntax is experimental | ^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-box_patterns.rs b/src/test/ui/feature-gates/feature-gate-box_patterns.rs index e64081823e74c..8bec16a974e80 100644 --- a/src/test/ui/feature-gates/feature-gate-box_patterns.rs +++ b/src/test/ui/feature-gates/feature-gate-box_patterns.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let box x = Box::new('c'); //~ ERROR box pattern syntax is experimental println!("x: {}", x); diff --git a/src/test/ui/feature-gates/feature-gate-box_patterns.stderr b/src/test/ui/feature-gates/feature-gate-box_patterns.stderr index a8edb842cfcd3..1379ba526f5d5 100644 --- a/src/test/ui/feature-gates/feature-gate-box_patterns.stderr +++ b/src/test/ui/feature-gates/feature-gate-box_patterns.stderr @@ -1,5 +1,5 @@ error[E0658]: box pattern syntax is experimental (see issue #29641) - --> $DIR/feature-gate-box_patterns.rs:12:9 + --> $DIR/feature-gate-box_patterns.rs:2:9 | LL | let box x = Box::new('c'); //~ ERROR box pattern syntax is experimental | ^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-box_syntax.rs b/src/test/ui/feature-gates/feature-gate-box_syntax.rs index a2643fe02b8f7..df0c604b2a809 100644 --- a/src/test/ui/feature-gates/feature-gate-box_syntax.rs +++ b/src/test/ui/feature-gates/feature-gate-box_syntax.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the use of the box syntax is gated by `box_syntax` feature gate. fn main() { diff --git a/src/test/ui/feature-gates/feature-gate-box_syntax.stderr b/src/test/ui/feature-gates/feature-gate-box_syntax.stderr index d45dee2970bd1..f144d11d89b23 100644 --- a/src/test/ui/feature-gates/feature-gate-box_syntax.stderr +++ b/src/test/ui/feature-gates/feature-gate-box_syntax.stderr @@ -1,5 +1,5 @@ error[E0658]: box expression syntax is experimental; you can call `Box::new` instead. (see issue #49733) - --> $DIR/feature-gate-box_syntax.rs:14:13 + --> $DIR/feature-gate-box_syntax.rs:4:13 | LL | let x = box 3; | ^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-cfg-target-has-atomic.rs b/src/test/ui/feature-gates/feature-gate-cfg-target-has-atomic.rs index aa27f8922c005..83cac6df987ee 100644 --- a/src/test/ui/feature-gates/feature-gate-cfg-target-has-atomic.rs +++ b/src/test/ui/feature-gates/feature-gate-cfg-target-has-atomic.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="rlib"] #![no_core] diff --git a/src/test/ui/feature-gates/feature-gate-cfg-target-has-atomic.stderr b/src/test/ui/feature-gates/feature-gate-cfg-target-has-atomic.stderr index f3975b7ce8b26..720f6da845b1b 100644 --- a/src/test/ui/feature-gates/feature-gate-cfg-target-has-atomic.stderr +++ b/src/test/ui/feature-gates/feature-gate-cfg-target-has-atomic.stderr @@ -1,5 +1,5 @@ error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976) - --> $DIR/feature-gate-cfg-target-has-atomic.rs:23:7 + --> $DIR/feature-gate-cfg-target-has-atomic.rs:13:7 | LL | #[cfg(target_has_atomic = "8")] | ^^^^^^^^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | #[cfg(target_has_atomic = "8")] = help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976) - --> $DIR/feature-gate-cfg-target-has-atomic.rs:29:7 + --> $DIR/feature-gate-cfg-target-has-atomic.rs:19:7 | LL | #[cfg(target_has_atomic = "8")] | ^^^^^^^^^^^^^^^^^^^^^^^ @@ -15,7 +15,7 @@ LL | #[cfg(target_has_atomic = "8")] = help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976) - --> $DIR/feature-gate-cfg-target-has-atomic.rs:34:7 + --> $DIR/feature-gate-cfg-target-has-atomic.rs:24:7 | LL | #[cfg(target_has_atomic = "16")] | ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -23,7 +23,7 @@ LL | #[cfg(target_has_atomic = "16")] = help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976) - --> $DIR/feature-gate-cfg-target-has-atomic.rs:39:7 + --> $DIR/feature-gate-cfg-target-has-atomic.rs:29:7 | LL | #[cfg(target_has_atomic = "16")] | ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -31,7 +31,7 @@ LL | #[cfg(target_has_atomic = "16")] = help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976) - --> $DIR/feature-gate-cfg-target-has-atomic.rs:44:7 + --> $DIR/feature-gate-cfg-target-has-atomic.rs:34:7 | LL | #[cfg(target_has_atomic = "32")] | ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -39,7 +39,7 @@ LL | #[cfg(target_has_atomic = "32")] = help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976) - --> $DIR/feature-gate-cfg-target-has-atomic.rs:49:7 + --> $DIR/feature-gate-cfg-target-has-atomic.rs:39:7 | LL | #[cfg(target_has_atomic = "32")] | ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -47,7 +47,7 @@ LL | #[cfg(target_has_atomic = "32")] = help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976) - --> $DIR/feature-gate-cfg-target-has-atomic.rs:54:7 + --> $DIR/feature-gate-cfg-target-has-atomic.rs:44:7 | LL | #[cfg(target_has_atomic = "64")] | ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -55,7 +55,7 @@ LL | #[cfg(target_has_atomic = "64")] = help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976) - --> $DIR/feature-gate-cfg-target-has-atomic.rs:59:7 + --> $DIR/feature-gate-cfg-target-has-atomic.rs:49:7 | LL | #[cfg(target_has_atomic = "64")] | ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -63,7 +63,7 @@ LL | #[cfg(target_has_atomic = "64")] = help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976) - --> $DIR/feature-gate-cfg-target-has-atomic.rs:64:7 + --> $DIR/feature-gate-cfg-target-has-atomic.rs:54:7 | LL | #[cfg(target_has_atomic = "ptr")] | ^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -71,7 +71,7 @@ LL | #[cfg(target_has_atomic = "ptr")] = help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976) - --> $DIR/feature-gate-cfg-target-has-atomic.rs:69:7 + --> $DIR/feature-gate-cfg-target-has-atomic.rs:59:7 | LL | #[cfg(target_has_atomic = "ptr")] | ^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -79,7 +79,7 @@ LL | #[cfg(target_has_atomic = "ptr")] = help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976) - --> $DIR/feature-gate-cfg-target-has-atomic.rs:76:10 + --> $DIR/feature-gate-cfg-target-has-atomic.rs:66:10 | LL | cfg!(target_has_atomic = "8"); | ^^^^^^^^^^^^^^^^^^^^^^^ @@ -87,7 +87,7 @@ LL | cfg!(target_has_atomic = "8"); = help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976) - --> $DIR/feature-gate-cfg-target-has-atomic.rs:78:10 + --> $DIR/feature-gate-cfg-target-has-atomic.rs:68:10 | LL | cfg!(target_has_atomic = "16"); | ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -95,7 +95,7 @@ LL | cfg!(target_has_atomic = "16"); = help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976) - --> $DIR/feature-gate-cfg-target-has-atomic.rs:80:10 + --> $DIR/feature-gate-cfg-target-has-atomic.rs:70:10 | LL | cfg!(target_has_atomic = "32"); | ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -103,7 +103,7 @@ LL | cfg!(target_has_atomic = "32"); = help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976) - --> $DIR/feature-gate-cfg-target-has-atomic.rs:82:10 + --> $DIR/feature-gate-cfg-target-has-atomic.rs:72:10 | LL | cfg!(target_has_atomic = "64"); | ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -111,7 +111,7 @@ LL | cfg!(target_has_atomic = "64"); = help: add #![feature(cfg_target_has_atomic)] to the crate attributes to enable error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change (see issue #32976) - --> $DIR/feature-gate-cfg-target-has-atomic.rs:84:10 + --> $DIR/feature-gate-cfg-target-has-atomic.rs:74:10 | LL | cfg!(target_has_atomic = "ptr"); | ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-cfg-target-thread-local.rs b/src/test/ui/feature-gates/feature-gate-cfg-target-thread-local.rs index 985bd8320e059..54db7500583d1 100644 --- a/src/test/ui/feature-gates/feature-gate-cfg-target-thread-local.rs +++ b/src/test/ui/feature-gates/feature-gate-cfg-target-thread-local.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-windows // aux-build:cfg-target-thread-local.rs diff --git a/src/test/ui/feature-gates/feature-gate-cfg-target-thread-local.stderr b/src/test/ui/feature-gates/feature-gate-cfg-target-thread-local.stderr index 3467d4e482daa..672fb14871a74 100644 --- a/src/test/ui/feature-gates/feature-gate-cfg-target-thread-local.stderr +++ b/src/test/ui/feature-gates/feature-gate-cfg-target-thread-local.stderr @@ -1,5 +1,5 @@ error[E0658]: `cfg(target_thread_local)` is experimental and subject to change (see issue #29594) - --> $DIR/feature-gate-cfg-target-thread-local.rs:19:16 + --> $DIR/feature-gate-cfg-target-thread-local.rs:9:16 | LL | #[cfg_attr(target_thread_local, thread_local)] | ^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-cfg-target-vendor.rs b/src/test/ui/feature-gates/feature-gate-cfg-target-vendor.rs index e68a84d35534f..acd310e7e2e07 100644 --- a/src/test/ui/feature-gates/feature-gate-cfg-target-vendor.rs +++ b/src/test/ui/feature-gates/feature-gate-cfg-target-vendor.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[cfg(target_vendor = "x")] //~ ERROR `cfg(target_vendor)` is experimental #[cfg_attr(target_vendor = "x", x)] //~ ERROR `cfg(target_vendor)` is experimental struct Foo(u64, u64); diff --git a/src/test/ui/feature-gates/feature-gate-cfg-target-vendor.stderr b/src/test/ui/feature-gates/feature-gate-cfg-target-vendor.stderr index a625c7e4b2471..dd514a5d90a03 100644 --- a/src/test/ui/feature-gates/feature-gate-cfg-target-vendor.stderr +++ b/src/test/ui/feature-gates/feature-gate-cfg-target-vendor.stderr @@ -1,5 +1,5 @@ error[E0658]: `cfg(target_vendor)` is experimental and subject to change (see issue #29718) - --> $DIR/feature-gate-cfg-target-vendor.rs:12:12 + --> $DIR/feature-gate-cfg-target-vendor.rs:2:12 | LL | #[cfg_attr(target_vendor = "x", x)] //~ ERROR `cfg(target_vendor)` is experimental | ^^^^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | #[cfg_attr(target_vendor = "x", x)] //~ ERROR `cfg(target_vendor)` is exper = help: add #![feature(cfg_target_vendor)] to the crate attributes to enable error[E0658]: `cfg(target_vendor)` is experimental and subject to change (see issue #29718) - --> $DIR/feature-gate-cfg-target-vendor.rs:11:7 + --> $DIR/feature-gate-cfg-target-vendor.rs:1:7 | LL | #[cfg(target_vendor = "x")] //~ ERROR `cfg(target_vendor)` is experimental | ^^^^^^^^^^^^^^^^^^^ @@ -15,7 +15,7 @@ LL | #[cfg(target_vendor = "x")] //~ ERROR `cfg(target_vendor)` is experimental = help: add #![feature(cfg_target_vendor)] to the crate attributes to enable error[E0658]: `cfg(target_vendor)` is experimental and subject to change (see issue #29718) - --> $DIR/feature-gate-cfg-target-vendor.rs:15:19 + --> $DIR/feature-gate-cfg-target-vendor.rs:5:19 | LL | #[cfg(not(any(all(target_vendor = "x"))))] //~ ERROR `cfg(target_vendor)` is experimental | ^^^^^^^^^^^^^^^^^^^ @@ -23,7 +23,7 @@ LL | #[cfg(not(any(all(target_vendor = "x"))))] //~ ERROR `cfg(target_vendor)` i = help: add #![feature(cfg_target_vendor)] to the crate attributes to enable error[E0658]: `cfg(target_vendor)` is experimental and subject to change (see issue #29718) - --> $DIR/feature-gate-cfg-target-vendor.rs:19:10 + --> $DIR/feature-gate-cfg-target-vendor.rs:9:10 | LL | cfg!(target_vendor = "x"); | ^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-compiler-builtins.rs b/src/test/ui/feature-gates/feature-gate-compiler-builtins.rs index f9334f1d3b072..10a9749ee5cf8 100644 --- a/src/test/ui/feature-gates/feature-gate-compiler-builtins.rs +++ b/src/test/ui/feature-gates/feature-gate-compiler-builtins.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![compiler_builtins] //~ ERROR the `#[compiler_builtins]` attribute is fn main() {} diff --git a/src/test/ui/feature-gates/feature-gate-compiler-builtins.stderr b/src/test/ui/feature-gates/feature-gate-compiler-builtins.stderr index 5330d83c284ae..5bda76e2bfebc 100644 --- a/src/test/ui/feature-gates/feature-gate-compiler-builtins.stderr +++ b/src/test/ui/feature-gates/feature-gate-compiler-builtins.stderr @@ -1,5 +1,5 @@ error[E0658]: the `#[compiler_builtins]` attribute is used to identify the `compiler_builtins` crate which contains compiler-rt intrinsics and will never be stable - --> $DIR/feature-gate-compiler-builtins.rs:11:1 + --> $DIR/feature-gate-compiler-builtins.rs:1:1 | LL | #![compiler_builtins] //~ ERROR the `#[compiler_builtins]` attribute is | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-concat_idents.rs b/src/test/ui/feature-gates/feature-gate-concat_idents.rs index f4d97445725cd..68caf3d71e907 100644 --- a/src/test/ui/feature-gates/feature-gate-concat_idents.rs +++ b/src/test/ui/feature-gates/feature-gate-concat_idents.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const XY_1: i32 = 10; fn main() { diff --git a/src/test/ui/feature-gates/feature-gate-concat_idents.stderr b/src/test/ui/feature-gates/feature-gate-concat_idents.stderr index 2f1e3fe6a7d99..d465512527a62 100644 --- a/src/test/ui/feature-gates/feature-gate-concat_idents.stderr +++ b/src/test/ui/feature-gates/feature-gate-concat_idents.stderr @@ -1,5 +1,5 @@ error[E0658]: `concat_idents` is not stable enough for use and is subject to change (see issue #29599) - --> $DIR/feature-gate-concat_idents.rs:15:13 + --> $DIR/feature-gate-concat_idents.rs:5:13 | LL | let a = concat_idents!(X, Y_1); //~ ERROR `concat_idents` is not stable | ^^^^^^^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | let a = concat_idents!(X, Y_1); //~ ERROR `concat_idents` is not stable = help: add #![feature(concat_idents)] to the crate attributes to enable error[E0658]: `concat_idents` is not stable enough for use and is subject to change (see issue #29599) - --> $DIR/feature-gate-concat_idents.rs:16:13 + --> $DIR/feature-gate-concat_idents.rs:6:13 | LL | let b = concat_idents!(X, Y_2); //~ ERROR `concat_idents` is not stable | ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-concat_idents2.rs b/src/test/ui/feature-gates/feature-gate-concat_idents2.rs index af288a9790440..659e962650128 100644 --- a/src/test/ui/feature-gates/feature-gate-concat_idents2.rs +++ b/src/test/ui/feature-gates/feature-gate-concat_idents2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // gate-test-concat_idents fn main() { diff --git a/src/test/ui/feature-gates/feature-gate-concat_idents2.stderr b/src/test/ui/feature-gates/feature-gate-concat_idents2.stderr index 9312a6f5b3618..23c2e2976451d 100644 --- a/src/test/ui/feature-gates/feature-gate-concat_idents2.stderr +++ b/src/test/ui/feature-gates/feature-gate-concat_idents2.stderr @@ -1,5 +1,5 @@ error[E0658]: `concat_idents` is not stable enough for use and is subject to change (see issue #29599) - --> $DIR/feature-gate-concat_idents2.rs:14:5 + --> $DIR/feature-gate-concat_idents2.rs:4:5 | LL | concat_idents!(a, b); //~ ERROR `concat_idents` is not stable enough | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-concat_idents3.rs b/src/test/ui/feature-gates/feature-gate-concat_idents3.rs index 5a9ffe98c93ca..2882e7a800836 100644 --- a/src/test/ui/feature-gates/feature-gate-concat_idents3.rs +++ b/src/test/ui/feature-gates/feature-gate-concat_idents3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // gate-test-concat_idents const XY_1: i32 = 10; diff --git a/src/test/ui/feature-gates/feature-gate-concat_idents3.stderr b/src/test/ui/feature-gates/feature-gate-concat_idents3.stderr index 1a86032d8a324..e9b9f240e8cd0 100644 --- a/src/test/ui/feature-gates/feature-gate-concat_idents3.stderr +++ b/src/test/ui/feature-gates/feature-gate-concat_idents3.stderr @@ -1,5 +1,5 @@ error[E0658]: `concat_idents` is not stable enough for use and is subject to change (see issue #29599) - --> $DIR/feature-gate-concat_idents3.rs:17:20 + --> $DIR/feature-gate-concat_idents3.rs:7:20 | LL | assert_eq!(10, concat_idents!(X, Y_1)); //~ ERROR `concat_idents` is not stable | ^^^^^^^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | assert_eq!(10, concat_idents!(X, Y_1)); //~ ERROR `concat_idents` is no = help: add #![feature(concat_idents)] to the crate attributes to enable error[E0658]: `concat_idents` is not stable enough for use and is subject to change (see issue #29599) - --> $DIR/feature-gate-concat_idents3.rs:18:20 + --> $DIR/feature-gate-concat_idents3.rs:8:20 | LL | assert_eq!(20, concat_idents!(X, Y_2)); //~ ERROR `concat_idents` is not stable | ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-const-indexing.rs b/src/test/ui/feature-gates/feature-gate-const-indexing.rs index c89cbd0420dab..4df1c7d6ed237 100644 --- a/src/test/ui/feature-gates/feature-gate-const-indexing.rs +++ b/src/test/ui/feature-gates/feature-gate-const-indexing.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass fn main() { diff --git a/src/test/ui/feature-gates/feature-gate-const_fn.rs b/src/test/ui/feature-gates/feature-gate-const_fn.rs index 1d1dedddaaa3e..23a81e35db81e 100644 --- a/src/test/ui/feature-gates/feature-gate-const_fn.rs +++ b/src/test/ui/feature-gates/feature-gate-const_fn.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test use of const fn without feature gate. const fn foo() -> usize { 0 } //~ ERROR const fn is unstable diff --git a/src/test/ui/feature-gates/feature-gate-const_fn.stderr b/src/test/ui/feature-gates/feature-gate-const_fn.stderr index d7c00a3e0cb40..51199ed540c02 100644 --- a/src/test/ui/feature-gates/feature-gate-const_fn.stderr +++ b/src/test/ui/feature-gates/feature-gate-const_fn.stderr @@ -1,23 +1,23 @@ error[E0379]: trait fns cannot be declared const - --> $DIR/feature-gate-const_fn.rs:16:5 + --> $DIR/feature-gate-const_fn.rs:6:5 | LL | const fn foo() -> u32; //~ ERROR const fn is unstable | ^^^^^ trait fns cannot be const error[E0379]: trait fns cannot be declared const - --> $DIR/feature-gate-const_fn.rs:18:5 + --> $DIR/feature-gate-const_fn.rs:8:5 | LL | const fn bar() -> u32 { 0 } //~ ERROR const fn is unstable | ^^^^^ trait fns cannot be const error[E0379]: trait fns cannot be declared const - --> $DIR/feature-gate-const_fn.rs:27:5 + --> $DIR/feature-gate-const_fn.rs:17:5 | LL | const fn foo() -> u32 { 0 } //~ ERROR const fn is unstable | ^^^^^ trait fns cannot be const error[E0658]: const fn is unstable (see issue #24111) - --> $DIR/feature-gate-const_fn.rs:13:1 + --> $DIR/feature-gate-const_fn.rs:3:1 | LL | const fn foo() -> usize { 0 } //~ ERROR const fn is unstable | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -25,7 +25,7 @@ LL | const fn foo() -> usize { 0 } //~ ERROR const fn is unstable = help: add #![feature(const_fn)] to the crate attributes to enable error[E0658]: const fn is unstable (see issue #24111) - --> $DIR/feature-gate-const_fn.rs:16:5 + --> $DIR/feature-gate-const_fn.rs:6:5 | LL | const fn foo() -> u32; //~ ERROR const fn is unstable | ^^^^^^^^^^^^^^^^^^^^^^ @@ -33,7 +33,7 @@ LL | const fn foo() -> u32; //~ ERROR const fn is unstable = help: add #![feature(const_fn)] to the crate attributes to enable error[E0658]: const fn is unstable (see issue #24111) - --> $DIR/feature-gate-const_fn.rs:18:5 + --> $DIR/feature-gate-const_fn.rs:8:5 | LL | const fn bar() -> u32 { 0 } //~ ERROR const fn is unstable | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -41,7 +41,7 @@ LL | const fn bar() -> u32 { 0 } //~ ERROR const fn is unstable = help: add #![feature(const_fn)] to the crate attributes to enable error[E0658]: const fn is unstable (see issue #24111) - --> $DIR/feature-gate-const_fn.rs:23:5 + --> $DIR/feature-gate-const_fn.rs:13:5 | LL | const fn baz() -> u32 { 0 } //~ ERROR const fn is unstable | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -49,7 +49,7 @@ LL | const fn baz() -> u32 { 0 } //~ ERROR const fn is unstable = help: add #![feature(const_fn)] to the crate attributes to enable error[E0658]: const fn is unstable (see issue #24111) - --> $DIR/feature-gate-const_fn.rs:27:5 + --> $DIR/feature-gate-const_fn.rs:17:5 | LL | const fn foo() -> u32 { 0 } //~ ERROR const fn is unstable | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-const_let.rs b/src/test/ui/feature-gates/feature-gate-const_let.rs index 05d02e62bc871..23183f649e02c 100644 --- a/src/test/ui/feature-gates/feature-gate-const_let.rs +++ b/src/test/ui/feature-gates/feature-gate-const_let.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test use of const let without feature gate. #![feature(const_fn)] diff --git a/src/test/ui/feature-gates/feature-gate-const_let.stderr b/src/test/ui/feature-gates/feature-gate-const_let.stderr index 6a7f6255678ff..9757028dae579 100644 --- a/src/test/ui/feature-gates/feature-gate-const_let.stderr +++ b/src/test/ui/feature-gates/feature-gate-const_let.stderr @@ -1,5 +1,5 @@ error[E0658]: let bindings in constant functions are unstable (see issue #48821) - --> $DIR/feature-gate-const_let.rs:16:13 + --> $DIR/feature-gate-const_let.rs:6:13 | LL | let x = 42; | ^^ @@ -7,7 +7,7 @@ LL | let x = 42; = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: statements in constant functions are unstable (see issue #48821) - --> $DIR/feature-gate-const_let.rs:16:13 + --> $DIR/feature-gate-const_let.rs:6:13 | LL | let x = 42; | ^^ diff --git a/src/test/ui/feature-gates/feature-gate-crate_in_paths.rs b/src/test/ui/feature-gates/feature-gate-crate_in_paths.rs index e667dab621bda..a7c44f49de520 100644 --- a/src/test/ui/feature-gates/feature-gate-crate_in_paths.rs +++ b/src/test/ui/feature-gates/feature-gate-crate_in_paths.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S; fn main() { diff --git a/src/test/ui/feature-gates/feature-gate-crate_in_paths.stderr b/src/test/ui/feature-gates/feature-gate-crate_in_paths.stderr index 32115ba2111b5..c92d3dc275daa 100644 --- a/src/test/ui/feature-gates/feature-gate-crate_in_paths.stderr +++ b/src/test/ui/feature-gates/feature-gate-crate_in_paths.stderr @@ -1,5 +1,5 @@ error[E0658]: `crate` in paths is experimental (see issue #45477) - --> $DIR/feature-gate-crate_in_paths.rs:14:13 + --> $DIR/feature-gate-crate_in_paths.rs:4:13 | LL | let _ = crate::S; //~ ERROR `crate` in paths is experimental | ^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-crate_visibility_modifier.rs b/src/test/ui/feature-gates/feature-gate-crate_visibility_modifier.rs index a2937d6de31f3..0e3f6b168be6b 100644 --- a/src/test/ui/feature-gates/feature-gate-crate_visibility_modifier.rs +++ b/src/test/ui/feature-gates/feature-gate-crate_visibility_modifier.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - crate struct Bender { //~ ERROR `crate` visibility modifier is experimental earth: bool, fire: bool, diff --git a/src/test/ui/feature-gates/feature-gate-crate_visibility_modifier.stderr b/src/test/ui/feature-gates/feature-gate-crate_visibility_modifier.stderr index d0ee40504fb21..1ff9b850d25bf 100644 --- a/src/test/ui/feature-gates/feature-gate-crate_visibility_modifier.stderr +++ b/src/test/ui/feature-gates/feature-gate-crate_visibility_modifier.stderr @@ -1,5 +1,5 @@ error[E0658]: `crate` visibility modifier is experimental (see issue #45388) - --> $DIR/feature-gate-crate_visibility_modifier.rs:11:1 + --> $DIR/feature-gate-crate_visibility_modifier.rs:1:1 | LL | crate struct Bender { //~ ERROR `crate` visibility modifier is experimental | ^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-custom_attribute.rs b/src/test/ui/feature-gates/feature-gate-custom_attribute.rs index ed8392ad7a3d1..0c988fd268d0f 100644 --- a/src/test/ui/feature-gates/feature-gate-custom_attribute.rs +++ b/src/test/ui/feature-gates/feature-gate-custom_attribute.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that literals in attributes parse just fine. #![feature(rustc_attrs)] diff --git a/src/test/ui/feature-gates/feature-gate-custom_attribute.stderr b/src/test/ui/feature-gates/feature-gate-custom_attribute.stderr index e60e9a342a99c..51fefcfaff725 100644 --- a/src/test/ui/feature-gates/feature-gate-custom_attribute.stderr +++ b/src/test/ui/feature-gates/feature-gate-custom_attribute.stderr @@ -1,5 +1,5 @@ error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/feature-gate-custom_attribute.rs:17:3 + --> $DIR/feature-gate-custom_attribute.rs:7:3 | LL | #[fake_attr] //~ ERROR attribute `fake_attr` is currently unknown | ^^^^^^^^^ @@ -7,7 +7,7 @@ LL | #[fake_attr] //~ ERROR attribute `fake_attr` is currently unknown = help: add #![feature(custom_attribute)] to the crate attributes to enable error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/feature-gate-custom_attribute.rs:18:3 + --> $DIR/feature-gate-custom_attribute.rs:8:3 | LL | #[fake_attr(100)] //~ ERROR attribute `fake_attr` is currently unknown | ^^^^^^^^^ @@ -15,7 +15,7 @@ LL | #[fake_attr(100)] //~ ERROR attribute `fake_attr` is currently unknown = help: add #![feature(custom_attribute)] to the crate attributes to enable error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/feature-gate-custom_attribute.rs:19:3 + --> $DIR/feature-gate-custom_attribute.rs:9:3 | LL | #[fake_attr(1, 2, 3)] //~ ERROR attribute `fake_attr` is currently unknown | ^^^^^^^^^ @@ -23,7 +23,7 @@ LL | #[fake_attr(1, 2, 3)] //~ ERROR attribute `fake_attr` is currently unknown = help: add #![feature(custom_attribute)] to the crate attributes to enable error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/feature-gate-custom_attribute.rs:20:3 + --> $DIR/feature-gate-custom_attribute.rs:10:3 | LL | #[fake_attr("hello")] //~ ERROR attribute `fake_attr` is currently unknown | ^^^^^^^^^ @@ -31,7 +31,7 @@ LL | #[fake_attr("hello")] //~ ERROR attribute `fake_attr` is currently unknown = help: add #![feature(custom_attribute)] to the crate attributes to enable error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/feature-gate-custom_attribute.rs:21:3 + --> $DIR/feature-gate-custom_attribute.rs:11:3 | LL | #[fake_attr(name = "hello")] //~ ERROR attribute `fake_attr` is currently unknown | ^^^^^^^^^ @@ -39,7 +39,7 @@ LL | #[fake_attr(name = "hello")] //~ ERROR attribute `fake_attr` is currently u = help: add #![feature(custom_attribute)] to the crate attributes to enable error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/feature-gate-custom_attribute.rs:22:3 + --> $DIR/feature-gate-custom_attribute.rs:12:3 | LL | #[fake_attr(1, "hi", key = 12, true, false)] //~ ERROR attribute `fake_attr` is currently unknown | ^^^^^^^^^ @@ -47,7 +47,7 @@ LL | #[fake_attr(1, "hi", key = 12, true, false)] //~ ERROR attribute `fake_attr = help: add #![feature(custom_attribute)] to the crate attributes to enable error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/feature-gate-custom_attribute.rs:23:3 + --> $DIR/feature-gate-custom_attribute.rs:13:3 | LL | #[fake_attr(key = "hello", val = 10)] //~ ERROR attribute `fake_attr` is currently unknown | ^^^^^^^^^ @@ -55,7 +55,7 @@ LL | #[fake_attr(key = "hello", val = 10)] //~ ERROR attribute `fake_attr` is cu = help: add #![feature(custom_attribute)] to the crate attributes to enable error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/feature-gate-custom_attribute.rs:24:3 + --> $DIR/feature-gate-custom_attribute.rs:14:3 | LL | #[fake_attr(key("hello"), val(10))] //~ ERROR attribute `fake_attr` is currently unknown | ^^^^^^^^^ @@ -63,7 +63,7 @@ LL | #[fake_attr(key("hello"), val(10))] //~ ERROR attribute `fake_attr` is curr = help: add #![feature(custom_attribute)] to the crate attributes to enable error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/feature-gate-custom_attribute.rs:25:3 + --> $DIR/feature-gate-custom_attribute.rs:15:3 | LL | #[fake_attr(enabled = true, disabled = false)] //~ ERROR attribute `fake_attr` is currently unknown | ^^^^^^^^^ @@ -71,7 +71,7 @@ LL | #[fake_attr(enabled = true, disabled = false)] //~ ERROR attribute `fake_at = help: add #![feature(custom_attribute)] to the crate attributes to enable error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/feature-gate-custom_attribute.rs:26:3 + --> $DIR/feature-gate-custom_attribute.rs:16:3 | LL | #[fake_attr(true)] //~ ERROR attribute `fake_attr` is currently unknown | ^^^^^^^^^ @@ -79,7 +79,7 @@ LL | #[fake_attr(true)] //~ ERROR attribute `fake_attr` is currently unknown = help: add #![feature(custom_attribute)] to the crate attributes to enable error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/feature-gate-custom_attribute.rs:27:3 + --> $DIR/feature-gate-custom_attribute.rs:17:3 | LL | #[fake_attr(pi = 3.14159)] //~ ERROR attribute `fake_attr` is currently unknown | ^^^^^^^^^ @@ -87,7 +87,7 @@ LL | #[fake_attr(pi = 3.14159)] //~ ERROR attribute `fake_attr` is currently unk = help: add #![feature(custom_attribute)] to the crate attributes to enable error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/feature-gate-custom_attribute.rs:28:3 + --> $DIR/feature-gate-custom_attribute.rs:18:3 | LL | #[fake_attr(b"hi")] //~ ERROR attribute `fake_attr` is currently unknown | ^^^^^^^^^ @@ -95,7 +95,7 @@ LL | #[fake_attr(b"hi")] //~ ERROR attribute `fake_attr` is currently unknown = help: add #![feature(custom_attribute)] to the crate attributes to enable error[E0658]: The attribute `fake_doc` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/feature-gate-custom_attribute.rs:29:3 + --> $DIR/feature-gate-custom_attribute.rs:19:3 | LL | #[fake_doc(r"doc")] //~ ERROR attribute `fake_doc` is currently unknown | ^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-custom_attribute2.rs b/src/test/ui/feature-gates/feature-gate-custom_attribute2.rs index 30fd89f091b47..2137a2a003adf 100644 --- a/src/test/ui/feature-gates/feature-gate-custom_attribute2.rs +++ b/src/test/ui/feature-gates/feature-gate-custom_attribute2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test ensures that attributes on formals in generic parameter // lists are included when we are checking for unstable attributes. diff --git a/src/test/ui/feature-gates/feature-gate-custom_attribute2.stderr b/src/test/ui/feature-gates/feature-gate-custom_attribute2.stderr index 1c1f50366d64c..560ceda3486dd 100644 --- a/src/test/ui/feature-gates/feature-gate-custom_attribute2.stderr +++ b/src/test/ui/feature-gates/feature-gate-custom_attribute2.stderr @@ -1,5 +1,5 @@ error[E0658]: The attribute `lt_struct` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/feature-gate-custom_attribute2.rs:16:13 + --> $DIR/feature-gate-custom_attribute2.rs:6:13 | LL | struct StLt<#[lt_struct] 'a>(&'a u32); | ^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | struct StLt<#[lt_struct] 'a>(&'a u32); = help: add #![feature(custom_attribute)] to the crate attributes to enable error[E0658]: The attribute `ty_struct` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/feature-gate-custom_attribute2.rs:18:13 + --> $DIR/feature-gate-custom_attribute2.rs:8:13 | LL | struct StTy<#[ty_struct] I>(I); | ^^^^^^^^^^^^ @@ -15,7 +15,7 @@ LL | struct StTy<#[ty_struct] I>(I); = help: add #![feature(custom_attribute)] to the crate attributes to enable error[E0658]: The attribute `lt_enum` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/feature-gate-custom_attribute2.rs:21:11 + --> $DIR/feature-gate-custom_attribute2.rs:11:11 | LL | enum EnLt<#[lt_enum] 'b> { A(&'b u32), B } | ^^^^^^^^^^ @@ -23,7 +23,7 @@ LL | enum EnLt<#[lt_enum] 'b> { A(&'b u32), B } = help: add #![feature(custom_attribute)] to the crate attributes to enable error[E0658]: The attribute `ty_enum` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/feature-gate-custom_attribute2.rs:23:11 + --> $DIR/feature-gate-custom_attribute2.rs:13:11 | LL | enum EnTy<#[ty_enum] J> { A(J), B } | ^^^^^^^^^^ @@ -31,7 +31,7 @@ LL | enum EnTy<#[ty_enum] J> { A(J), B } = help: add #![feature(custom_attribute)] to the crate attributes to enable error[E0658]: The attribute `lt_trait` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/feature-gate-custom_attribute2.rs:26:12 + --> $DIR/feature-gate-custom_attribute2.rs:16:12 | LL | trait TrLt<#[lt_trait] 'c> { fn foo(&self, _: &'c [u32]) -> &'c u32; } | ^^^^^^^^^^^ @@ -39,7 +39,7 @@ LL | trait TrLt<#[lt_trait] 'c> { fn foo(&self, _: &'c [u32]) -> &'c u32; } = help: add #![feature(custom_attribute)] to the crate attributes to enable error[E0658]: The attribute `ty_trait` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/feature-gate-custom_attribute2.rs:28:12 + --> $DIR/feature-gate-custom_attribute2.rs:18:12 | LL | trait TrTy<#[ty_trait] K> { fn foo(&self, _: K); } | ^^^^^^^^^^^ @@ -47,7 +47,7 @@ LL | trait TrTy<#[ty_trait] K> { fn foo(&self, _: K); } = help: add #![feature(custom_attribute)] to the crate attributes to enable error[E0658]: The attribute `lt_type` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/feature-gate-custom_attribute2.rs:31:11 + --> $DIR/feature-gate-custom_attribute2.rs:21:11 | LL | type TyLt<#[lt_type] 'd> = &'d u32; | ^^^^^^^^^^ @@ -55,7 +55,7 @@ LL | type TyLt<#[lt_type] 'd> = &'d u32; = help: add #![feature(custom_attribute)] to the crate attributes to enable error[E0658]: The attribute `ty_type` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/feature-gate-custom_attribute2.rs:33:11 + --> $DIR/feature-gate-custom_attribute2.rs:23:11 | LL | type TyTy<#[ty_type] L> = (L, ); | ^^^^^^^^^^ @@ -63,7 +63,7 @@ LL | type TyTy<#[ty_type] L> = (L, ); = help: add #![feature(custom_attribute)] to the crate attributes to enable error[E0658]: The attribute `lt_inherent` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/feature-gate-custom_attribute2.rs:36:6 + --> $DIR/feature-gate-custom_attribute2.rs:26:6 | LL | impl<#[lt_inherent] 'e> StLt<'e> { } | ^^^^^^^^^^^^^^ @@ -71,7 +71,7 @@ LL | impl<#[lt_inherent] 'e> StLt<'e> { } = help: add #![feature(custom_attribute)] to the crate attributes to enable error[E0658]: The attribute `ty_inherent` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/feature-gate-custom_attribute2.rs:38:6 + --> $DIR/feature-gate-custom_attribute2.rs:28:6 | LL | impl<#[ty_inherent] M> StTy { } | ^^^^^^^^^^^^^^ @@ -79,7 +79,7 @@ LL | impl<#[ty_inherent] M> StTy { } = help: add #![feature(custom_attribute)] to the crate attributes to enable error[E0658]: The attribute `lt_impl_for` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/feature-gate-custom_attribute2.rs:41:6 + --> $DIR/feature-gate-custom_attribute2.rs:31:6 | LL | impl<#[lt_impl_for] 'f> TrLt<'f> for StLt<'f> { | ^^^^^^^^^^^^^^ @@ -87,7 +87,7 @@ LL | impl<#[lt_impl_for] 'f> TrLt<'f> for StLt<'f> { = help: add #![feature(custom_attribute)] to the crate attributes to enable error[E0658]: The attribute `ty_impl_for` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/feature-gate-custom_attribute2.rs:45:6 + --> $DIR/feature-gate-custom_attribute2.rs:35:6 | LL | impl<#[ty_impl_for] N> TrTy for StTy { | ^^^^^^^^^^^^^^ @@ -95,7 +95,7 @@ LL | impl<#[ty_impl_for] N> TrTy for StTy { = help: add #![feature(custom_attribute)] to the crate attributes to enable error[E0658]: The attribute `lt_fn` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/feature-gate-custom_attribute2.rs:50:9 + --> $DIR/feature-gate-custom_attribute2.rs:40:9 | LL | fn f_lt<#[lt_fn] 'g>(_: &'g [u32]) -> &'g u32 { loop { } } | ^^^^^^^^ @@ -103,7 +103,7 @@ LL | fn f_lt<#[lt_fn] 'g>(_: &'g [u32]) -> &'g u32 { loop { } } = help: add #![feature(custom_attribute)] to the crate attributes to enable error[E0658]: The attribute `ty_fn` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/feature-gate-custom_attribute2.rs:52:9 + --> $DIR/feature-gate-custom_attribute2.rs:42:9 | LL | fn f_ty<#[ty_fn] O>(_: O) { } | ^^^^^^^^ @@ -111,7 +111,7 @@ LL | fn f_ty<#[ty_fn] O>(_: O) { } = help: add #![feature(custom_attribute)] to the crate attributes to enable error[E0658]: The attribute `lt_meth` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/feature-gate-custom_attribute2.rs:56:13 + --> $DIR/feature-gate-custom_attribute2.rs:46:13 | LL | fn m_lt<#[lt_meth] 'h>(_: &'h [u32]) -> &'h u32 { loop { } } | ^^^^^^^^^^ @@ -119,7 +119,7 @@ LL | fn m_lt<#[lt_meth] 'h>(_: &'h [u32]) -> &'h u32 { loop { } } = help: add #![feature(custom_attribute)] to the crate attributes to enable error[E0658]: The attribute `ty_meth` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/feature-gate-custom_attribute2.rs:58:13 + --> $DIR/feature-gate-custom_attribute2.rs:48:13 | LL | fn m_ty<#[ty_meth] P>(_: P) { } | ^^^^^^^^^^ @@ -127,7 +127,7 @@ LL | fn m_ty<#[ty_meth] P>(_: P) { } = help: add #![feature(custom_attribute)] to the crate attributes to enable error[E0658]: The attribute `lt_hof` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/feature-gate-custom_attribute2.rs:63:19 + --> $DIR/feature-gate-custom_attribute2.rs:53:19 | LL | where Q: for <#[lt_hof] 'i> Fn(&'i [u32]) -> &'i u32 | ^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-custom_derive.rs b/src/test/ui/feature-gates/feature-gate-custom_derive.rs index 0b1b3141f5bf7..892ce7c93fc8d 100644 --- a/src/test/ui/feature-gates/feature-gate-custom_derive.rs +++ b/src/test/ui/feature-gates/feature-gate-custom_derive.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive_Clone] //~^ ERROR attributes of the form `#[derive_*]` are reserved struct Test; diff --git a/src/test/ui/feature-gates/feature-gate-custom_derive.stderr b/src/test/ui/feature-gates/feature-gate-custom_derive.stderr index 0979372daea30..93432fb4f2f04 100644 --- a/src/test/ui/feature-gates/feature-gate-custom_derive.stderr +++ b/src/test/ui/feature-gates/feature-gate-custom_derive.stderr @@ -1,5 +1,5 @@ error[E0658]: attributes of the form `#[derive_*]` are reserved for the compiler (see issue #29644) - --> $DIR/feature-gate-custom_derive.rs:11:3 + --> $DIR/feature-gate-custom_derive.rs:1:3 | LL | #[derive_Clone] | ^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-decl_macro.rs b/src/test/ui/feature-gates/feature-gate-decl_macro.rs index 4cb34c8274d8d..ca0dafd0bf739 100644 --- a/src/test/ui/feature-gates/feature-gate-decl_macro.rs +++ b/src/test/ui/feature-gates/feature-gate-decl_macro.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_macros)] macro m() {} //~ ERROR `macro` is experimental (see issue #39412) diff --git a/src/test/ui/feature-gates/feature-gate-decl_macro.stderr b/src/test/ui/feature-gates/feature-gate-decl_macro.stderr index 56c0dea02369a..01ec3d8b2e21f 100644 --- a/src/test/ui/feature-gates/feature-gate-decl_macro.stderr +++ b/src/test/ui/feature-gates/feature-gate-decl_macro.stderr @@ -1,5 +1,5 @@ error[E0658]: `macro` is experimental (see issue #39412) - --> $DIR/feature-gate-decl_macro.rs:13:1 + --> $DIR/feature-gate-decl_macro.rs:3:1 | LL | macro m() {} //~ ERROR `macro` is experimental (see issue #39412) | ^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-default_type_parameter_fallback.rs b/src/test/ui/feature-gates/feature-gate-default_type_parameter_fallback.rs index ccc5ec49f1302..33038e24bc62b 100644 --- a/src/test/ui/feature-gates/feature-gate-default_type_parameter_fallback.rs +++ b/src/test/ui/feature-gates/feature-gate-default_type_parameter_fallback.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused)] fn avg(_: T) {} diff --git a/src/test/ui/feature-gates/feature-gate-default_type_parameter_fallback.stderr b/src/test/ui/feature-gates/feature-gate-default_type_parameter_fallback.stderr index 134bf29d2aa40..ac8cd101767f4 100644 --- a/src/test/ui/feature-gates/feature-gate-default_type_parameter_fallback.stderr +++ b/src/test/ui/feature-gates/feature-gate-default_type_parameter_fallback.stderr @@ -1,5 +1,5 @@ error: defaults for type parameters are only allowed in `struct`, `enum`, `type`, or `trait` definitions. - --> $DIR/feature-gate-default_type_parameter_fallback.rs:13:8 + --> $DIR/feature-gate-default_type_parameter_fallback.rs:3:8 | LL | fn avg(_: T) {} | ^ @@ -9,7 +9,7 @@ LL | fn avg(_: T) {} = note: for more information, see issue #36887 error: defaults for type parameters are only allowed in `struct`, `enum`, `type`, or `trait` definitions. - --> $DIR/feature-gate-default_type_parameter_fallback.rs:18:6 + --> $DIR/feature-gate-default_type_parameter_fallback.rs:8:6 | LL | impl S {} | ^ diff --git a/src/test/ui/feature-gates/feature-gate-doc_alias.rs b/src/test/ui/feature-gates/feature-gate-doc_alias.rs index 1503dfe81fb7d..d7980f882d9f0 100644 --- a/src/test/ui/feature-gates/feature-gate-doc_alias.rs +++ b/src/test/ui/feature-gates/feature-gate-doc_alias.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[doc(alias = "foo")] //~ ERROR: #[doc(alias = "...")] is experimental pub struct Foo; diff --git a/src/test/ui/feature-gates/feature-gate-doc_alias.stderr b/src/test/ui/feature-gates/feature-gate-doc_alias.stderr index a987e03c0aaf1..91845329534e7 100644 --- a/src/test/ui/feature-gates/feature-gate-doc_alias.stderr +++ b/src/test/ui/feature-gates/feature-gate-doc_alias.stderr @@ -1,5 +1,5 @@ error[E0658]: #[doc(alias = "...")] is experimental (see issue #50146) - --> $DIR/feature-gate-doc_alias.rs:11:1 + --> $DIR/feature-gate-doc_alias.rs:1:1 | LL | #[doc(alias = "foo")] //~ ERROR: #[doc(alias = "...")] is experimental | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-doc_cfg.rs b/src/test/ui/feature-gates/feature-gate-doc_cfg.rs index 1a77d91801457..f13129888b4d6 100644 --- a/src/test/ui/feature-gates/feature-gate-doc_cfg.rs +++ b/src/test/ui/feature-gates/feature-gate-doc_cfg.rs @@ -1,12 +1,2 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[doc(cfg(unix))] //~ ERROR: #[doc(cfg(...))] is experimental fn main() {} diff --git a/src/test/ui/feature-gates/feature-gate-doc_cfg.stderr b/src/test/ui/feature-gates/feature-gate-doc_cfg.stderr index 5839e1dd611ed..20e3a4dbbca45 100644 --- a/src/test/ui/feature-gates/feature-gate-doc_cfg.stderr +++ b/src/test/ui/feature-gates/feature-gate-doc_cfg.stderr @@ -1,5 +1,5 @@ error[E0658]: #[doc(cfg(...))] is experimental (see issue #43781) - --> $DIR/feature-gate-doc_cfg.rs:11:1 + --> $DIR/feature-gate-doc_cfg.rs:1:1 | LL | #[doc(cfg(unix))] //~ ERROR: #[doc(cfg(...))] is experimental | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-doc_keyword.rs b/src/test/ui/feature-gates/feature-gate-doc_keyword.rs index 2ff44626ccd06..f417828db15ad 100644 --- a/src/test/ui/feature-gates/feature-gate-doc_keyword.rs +++ b/src/test/ui/feature-gates/feature-gate-doc_keyword.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[doc(keyword = "match")] //~ ERROR: #[doc(keyword = "...")] is experimental /// wonderful mod foo{} diff --git a/src/test/ui/feature-gates/feature-gate-doc_keyword.stderr b/src/test/ui/feature-gates/feature-gate-doc_keyword.stderr index e4f5109afc3eb..96f165d5a515a 100644 --- a/src/test/ui/feature-gates/feature-gate-doc_keyword.stderr +++ b/src/test/ui/feature-gates/feature-gate-doc_keyword.stderr @@ -1,5 +1,5 @@ error[E0658]: #[doc(keyword = "...")] is experimental (see issue #51315) - --> $DIR/feature-gate-doc_keyword.rs:11:1 + --> $DIR/feature-gate-doc_keyword.rs:1:1 | LL | #[doc(keyword = "match")] //~ ERROR: #[doc(keyword = "...")] is experimental | ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-doc_masked.rs b/src/test/ui/feature-gates/feature-gate-doc_masked.rs index bb5be9d69710f..034c5cf52eeca 100644 --- a/src/test/ui/feature-gates/feature-gate-doc_masked.rs +++ b/src/test/ui/feature-gates/feature-gate-doc_masked.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[doc(masked)] //~ ERROR: #[doc(masked)] is experimental extern crate std as realstd; diff --git a/src/test/ui/feature-gates/feature-gate-doc_masked.stderr b/src/test/ui/feature-gates/feature-gate-doc_masked.stderr index 043397efde25c..044f21a983365 100644 --- a/src/test/ui/feature-gates/feature-gate-doc_masked.stderr +++ b/src/test/ui/feature-gates/feature-gate-doc_masked.stderr @@ -1,5 +1,5 @@ error[E0658]: #[doc(masked)] is experimental (see issue #44027) - --> $DIR/feature-gate-doc_masked.rs:11:1 + --> $DIR/feature-gate-doc_masked.rs:1:1 | LL | #[doc(masked)] //~ ERROR: #[doc(masked)] is experimental | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-doc_spotlight.rs b/src/test/ui/feature-gates/feature-gate-doc_spotlight.rs index 6369358538d50..28b689b4d9852 100644 --- a/src/test/ui/feature-gates/feature-gate-doc_spotlight.rs +++ b/src/test/ui/feature-gates/feature-gate-doc_spotlight.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[doc(spotlight)] //~ ERROR: #[doc(spotlight)] is experimental trait SomeTrait {} diff --git a/src/test/ui/feature-gates/feature-gate-doc_spotlight.stderr b/src/test/ui/feature-gates/feature-gate-doc_spotlight.stderr index 98e7f38a44184..c7101b436e26b 100644 --- a/src/test/ui/feature-gates/feature-gate-doc_spotlight.stderr +++ b/src/test/ui/feature-gates/feature-gate-doc_spotlight.stderr @@ -1,5 +1,5 @@ error[E0658]: #[doc(spotlight)] is experimental (see issue #45040) - --> $DIR/feature-gate-doc_spotlight.rs:11:1 + --> $DIR/feature-gate-doc_spotlight.rs:1:1 | LL | #[doc(spotlight)] //~ ERROR: #[doc(spotlight)] is experimental | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-dropck-ugeh-2.rs b/src/test/ui/feature-gates/feature-gate-dropck-ugeh-2.rs index 70ec561439c61..33252019e71e6 100644 --- a/src/test/ui/feature-gates/feature-gate-dropck-ugeh-2.rs +++ b/src/test/ui/feature-gates/feature-gate-dropck-ugeh-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(deprecated)] #![feature(dropck_parametricity)] diff --git a/src/test/ui/feature-gates/feature-gate-dropck-ugeh-2.stderr b/src/test/ui/feature-gates/feature-gate-dropck-ugeh-2.stderr index 80d81ea03cb6d..a55060c772738 100644 --- a/src/test/ui/feature-gates/feature-gate-dropck-ugeh-2.stderr +++ b/src/test/ui/feature-gates/feature-gate-dropck-ugeh-2.stderr @@ -1,11 +1,11 @@ error: use of deprecated attribute `dropck_parametricity`: unsafe_destructor_blind_to_params has been replaced by may_dangle and will be removed in the future. See https://github.com/rust-lang/rust/issues/34761 - --> $DIR/feature-gate-dropck-ugeh-2.rs:17:5 + --> $DIR/feature-gate-dropck-ugeh-2.rs:7:5 | LL | #[unsafe_destructor_blind_to_params] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove this attribute | note: lint level defined here - --> $DIR/feature-gate-dropck-ugeh-2.rs:11:9 + --> $DIR/feature-gate-dropck-ugeh-2.rs:1:9 | LL | #![deny(deprecated)] | ^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-dropck-ugeh.rs b/src/test/ui/feature-gates/feature-gate-dropck-ugeh.rs index 360895d30b0b7..02aa5000661d3 100644 --- a/src/test/ui/feature-gates/feature-gate-dropck-ugeh.rs +++ b/src/test/ui/feature-gates/feature-gate-dropck-ugeh.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // gate-test-dropck_parametricity // Ensure that attempts to use the unsafe attribute are feature-gated. diff --git a/src/test/ui/feature-gates/feature-gate-dropck-ugeh.stderr b/src/test/ui/feature-gates/feature-gate-dropck-ugeh.stderr index 33bb5f2d98977..99ca454bcabab 100644 --- a/src/test/ui/feature-gates/feature-gate-dropck-ugeh.stderr +++ b/src/test/ui/feature-gates/feature-gate-dropck-ugeh.stderr @@ -1,5 +1,5 @@ error[E0658]: unsafe_destructor_blind_to_params has been replaced by may_dangle and will be removed in the future (see issue #28498) - --> $DIR/feature-gate-dropck-ugeh.rs:29:5 + --> $DIR/feature-gate-dropck-ugeh.rs:19:5 | LL | #[unsafe_destructor_blind_to_params] // This is the UGEH attribute | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-exclusive-range-pattern.rs b/src/test/ui/feature-gates/feature-gate-exclusive-range-pattern.rs index e0b6d5986ff37..ded08b93fe81c 100644 --- a/src/test/ui/feature-gates/feature-gate-exclusive-range-pattern.rs +++ b/src/test/ui/feature-gates/feature-gate-exclusive-range-pattern.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { match 22 { 0 .. 3 => {} //~ ERROR exclusive range pattern syntax is experimental diff --git a/src/test/ui/feature-gates/feature-gate-exclusive-range-pattern.stderr b/src/test/ui/feature-gates/feature-gate-exclusive-range-pattern.stderr index 27fd49edcc699..2b43a480c6b94 100644 --- a/src/test/ui/feature-gates/feature-gate-exclusive-range-pattern.stderr +++ b/src/test/ui/feature-gates/feature-gate-exclusive-range-pattern.stderr @@ -1,5 +1,5 @@ error[E0658]: exclusive range pattern syntax is experimental (see issue #37854) - --> $DIR/feature-gate-exclusive-range-pattern.rs:13:9 + --> $DIR/feature-gate-exclusive-range-pattern.rs:3:9 | LL | 0 .. 3 => {} //~ ERROR exclusive range pattern syntax is experimental | ^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-exhaustive-patterns.rs b/src/test/ui/feature-gates/feature-gate-exhaustive-patterns.rs index c83d9b56bc39f..dce8cf46ff9f3 100644 --- a/src/test/ui/feature-gates/feature-gate-exhaustive-patterns.rs +++ b/src/test/ui/feature-gates/feature-gate-exhaustive-patterns.rs @@ -1,12 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![feature(never_type)] fn foo() -> Result { Ok(123) diff --git a/src/test/ui/feature-gates/feature-gate-exhaustive-patterns.stderr b/src/test/ui/feature-gates/feature-gate-exhaustive-patterns.stderr index 4afe5b5d5e011..cbe6d56775594 100644 --- a/src/test/ui/feature-gates/feature-gate-exhaustive-patterns.stderr +++ b/src/test/ui/feature-gates/feature-gate-exhaustive-patterns.stderr @@ -1,5 +1,5 @@ error[E0005]: refutable pattern in local binding: `Err(_)` not covered - --> $DIR/feature-gate-exhaustive-patterns.rs:16:9 + --> $DIR/feature-gate-exhaustive-patterns.rs:7:9 | LL | let Ok(_x) = foo(); //~ ERROR refutable pattern in local binding | ^^^^^^ pattern `Err(_)` not covered diff --git a/src/test/ui/feature-gates/feature-gate-existential-type.rs b/src/test/ui/feature-gates/feature-gate-existential-type.rs index b35a391637737..e14467d6c3eb5 100644 --- a/src/test/ui/feature-gates/feature-gate-existential-type.rs +++ b/src/test/ui/feature-gates/feature-gate-existential-type.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that existential types must be ungated to use the `existential` keyword diff --git a/src/test/ui/feature-gates/feature-gate-existential-type.stderr b/src/test/ui/feature-gates/feature-gate-existential-type.stderr index 6db5fa2ce6b94..e88bdc01fdc19 100644 --- a/src/test/ui/feature-gates/feature-gate-existential-type.stderr +++ b/src/test/ui/feature-gates/feature-gate-existential-type.stderr @@ -1,5 +1,5 @@ error[E0658]: existential types are unstable (see issue #34511) - --> $DIR/feature-gate-existential-type.rs:15:1 + --> $DIR/feature-gate-existential-type.rs:5:1 | LL | existential type Foo: std::fmt::Debug; //~ ERROR existential types are unstable | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | existential type Foo: std::fmt::Debug; //~ ERROR existential types are unst = help: add #![feature(existential_type)] to the crate attributes to enable error[E0658]: existential types are unstable (see issue #34511) - --> $DIR/feature-gate-existential-type.rs:22:5 + --> $DIR/feature-gate-existential-type.rs:12:5 | LL | existential type Baa: std::fmt::Debug; //~ ERROR existential types are unstable | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-extern_absolute_paths.rs b/src/test/ui/feature-gates/feature-gate-extern_absolute_paths.rs index 40fdbf0bbdba6..cff273ce2c55a 100644 --- a/src/test/ui/feature-gates/feature-gate-extern_absolute_paths.rs +++ b/src/test/ui/feature-gates/feature-gate-extern_absolute_paths.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use core::default; //~ ERROR unresolved import `core` fn main() { diff --git a/src/test/ui/feature-gates/feature-gate-extern_absolute_paths.stderr b/src/test/ui/feature-gates/feature-gate-extern_absolute_paths.stderr index 7a996abc76755..f0f2adc37c0f7 100644 --- a/src/test/ui/feature-gates/feature-gate-extern_absolute_paths.stderr +++ b/src/test/ui/feature-gates/feature-gate-extern_absolute_paths.stderr @@ -1,11 +1,11 @@ error[E0432]: unresolved import `core` - --> $DIR/feature-gate-extern_absolute_paths.rs:11:5 + --> $DIR/feature-gate-extern_absolute_paths.rs:1:5 | LL | use core::default; //~ ERROR unresolved import `core` | ^^^^ Maybe a missing `extern crate core;`? error[E0433]: failed to resolve. Maybe a missing `extern crate core;`? - --> $DIR/feature-gate-extern_absolute_paths.rs:14:19 + --> $DIR/feature-gate-extern_absolute_paths.rs:4:19 | LL | let _: u8 = ::core::default::Default(); //~ ERROR failed to resolve | ^^^^ Maybe a missing `extern crate core;`? diff --git a/src/test/ui/feature-gates/feature-gate-extern_in_paths.rs b/src/test/ui/feature-gates/feature-gate-extern_in_paths.rs index 3c01fcf68331b..2d23d13d2472b 100644 --- a/src/test/ui/feature-gates/feature-gate-extern_in_paths.rs +++ b/src/test/ui/feature-gates/feature-gate-extern_in_paths.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S; fn main() { diff --git a/src/test/ui/feature-gates/feature-gate-extern_in_paths.stderr b/src/test/ui/feature-gates/feature-gate-extern_in_paths.stderr index 535ed94565c6d..7da163c0931e8 100644 --- a/src/test/ui/feature-gates/feature-gate-extern_in_paths.stderr +++ b/src/test/ui/feature-gates/feature-gate-extern_in_paths.stderr @@ -1,5 +1,5 @@ error[E0658]: `extern` in paths is experimental (see issue #44660) - --> $DIR/feature-gate-extern_in_paths.rs:14:13 + --> $DIR/feature-gate-extern_in_paths.rs:4:13 | LL | let _ = extern::std::vec::Vec::new(); //~ ERROR `extern` in paths is experimental | ^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-extern_prelude.rs b/src/test/ui/feature-gates/feature-gate-extern_prelude.rs index 8d3a30305bdb0..237099e790107 100644 --- a/src/test/ui/feature-gates/feature-gate-extern_prelude.rs +++ b/src/test/ui/feature-gates/feature-gate-extern_prelude.rs @@ -1,11 +1 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - can-only-test-this-in-run-make-fulldeps //~ ERROR expected one of `!` or `::`, found `-` diff --git a/src/test/ui/feature-gates/feature-gate-extern_prelude.stderr b/src/test/ui/feature-gates/feature-gate-extern_prelude.stderr index 5abf369baf9c0..7a13f61a27ea7 100644 --- a/src/test/ui/feature-gates/feature-gate-extern_prelude.stderr +++ b/src/test/ui/feature-gates/feature-gate-extern_prelude.stderr @@ -1,5 +1,5 @@ error: expected one of `!` or `::`, found `-` - --> $DIR/feature-gate-extern_prelude.rs:11:4 + --> $DIR/feature-gate-extern_prelude.rs:1:4 | LL | can-only-test-this-in-run-make-fulldeps //~ ERROR expected one of `!` or `::`, found `-` | ^ expected one of `!` or `::` here diff --git a/src/test/ui/feature-gates/feature-gate-extern_types.rs b/src/test/ui/feature-gates/feature-gate-extern_types.rs index 1203b598df3c2..6bdc96f55d6a5 100644 --- a/src/test/ui/feature-gates/feature-gate-extern_types.rs +++ b/src/test/ui/feature-gates/feature-gate-extern_types.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern { type T; //~ ERROR extern types are experimental } diff --git a/src/test/ui/feature-gates/feature-gate-extern_types.stderr b/src/test/ui/feature-gates/feature-gate-extern_types.stderr index 47c74bda17794..70ba06cde45ce 100644 --- a/src/test/ui/feature-gates/feature-gate-extern_types.stderr +++ b/src/test/ui/feature-gates/feature-gate-extern_types.stderr @@ -1,5 +1,5 @@ error[E0658]: extern types are experimental (see issue #43467) - --> $DIR/feature-gate-extern_types.rs:12:5 + --> $DIR/feature-gate-extern_types.rs:2:5 | LL | type T; //~ ERROR extern types are experimental | ^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-external_doc.rs b/src/test/ui/feature-gates/feature-gate-external_doc.rs index fa0a2a29078c5..e3ffb88819b06 100644 --- a/src/test/ui/feature-gates/feature-gate-external_doc.rs +++ b/src/test/ui/feature-gates/feature-gate-external_doc.rs @@ -1,12 +1,2 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[doc(include="asdf.md")] //~ ERROR: #[doc(include = "...")] is experimental fn main() {} diff --git a/src/test/ui/feature-gates/feature-gate-external_doc.stderr b/src/test/ui/feature-gates/feature-gate-external_doc.stderr index 272380f2336e9..b5cb9f564a3b6 100644 --- a/src/test/ui/feature-gates/feature-gate-external_doc.stderr +++ b/src/test/ui/feature-gates/feature-gate-external_doc.stderr @@ -1,5 +1,5 @@ error[E0658]: #[doc(include = "...")] is experimental (see issue #44732) - --> $DIR/feature-gate-external_doc.rs:11:1 + --> $DIR/feature-gate-external_doc.rs:1:1 | LL | #[doc(include="asdf.md")] //~ ERROR: #[doc(include = "...")] is experimental | ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-feature-gate.rs b/src/test/ui/feature-gates/feature-gate-feature-gate.rs index b903b29658bbb..3c98e16a136a8 100644 --- a/src/test/ui/feature-gates/feature-gate-feature-gate.rs +++ b/src/test/ui/feature-gates/feature-gate-feature-gate.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![forbid(unstable_features)] #![feature(intrinsics)] //~ ERROR unstable feature diff --git a/src/test/ui/feature-gates/feature-gate-feature-gate.stderr b/src/test/ui/feature-gates/feature-gate-feature-gate.stderr index 256cf47c12021..aee4f7ba47db9 100644 --- a/src/test/ui/feature-gates/feature-gate-feature-gate.stderr +++ b/src/test/ui/feature-gates/feature-gate-feature-gate.stderr @@ -1,11 +1,11 @@ error: unstable feature - --> $DIR/feature-gate-feature-gate.rs:12:12 + --> $DIR/feature-gate-feature-gate.rs:2:12 | LL | #![feature(intrinsics)] //~ ERROR unstable feature | ^^^^^^^^^^ | note: lint level defined here - --> $DIR/feature-gate-feature-gate.rs:11:11 + --> $DIR/feature-gate-feature-gate.rs:1:11 | LL | #![forbid(unstable_features)] | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-format_args_nl.rs b/src/test/ui/feature-gates/feature-gate-format_args_nl.rs index b976d57f9c179..aeee2fbad9071 100644 --- a/src/test/ui/feature-gates/feature-gate-format_args_nl.rs +++ b/src/test/ui/feature-gates/feature-gate-format_args_nl.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { format_args_nl!(""); //~ ERROR `format_args_nl` is only for internal language use } diff --git a/src/test/ui/feature-gates/feature-gate-format_args_nl.stderr b/src/test/ui/feature-gates/feature-gate-format_args_nl.stderr index a79535641a627..135ec5eb0c094 100644 --- a/src/test/ui/feature-gates/feature-gate-format_args_nl.stderr +++ b/src/test/ui/feature-gates/feature-gate-format_args_nl.stderr @@ -1,5 +1,5 @@ error[E0658]: `format_args_nl` is only for internal language use and is subject to change - --> $DIR/feature-gate-format_args_nl.rs:12:5 + --> $DIR/feature-gate-format_args_nl.rs:2:5 | LL | format_args_nl!(""); //~ ERROR `format_args_nl` is only for internal language use | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-fundamental.rs b/src/test/ui/feature-gates/feature-gate-fundamental.rs index 18718a0d0be93..70e0133929c62 100644 --- a/src/test/ui/feature-gates/feature-gate-fundamental.rs +++ b/src/test/ui/feature-gates/feature-gate-fundamental.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[fundamental] //~ ERROR the `#[fundamental]` attribute is an experimental feature struct Fundamental; diff --git a/src/test/ui/feature-gates/feature-gate-fundamental.stderr b/src/test/ui/feature-gates/feature-gate-fundamental.stderr index ac8430d7c1c03..47cf241cc3f96 100644 --- a/src/test/ui/feature-gates/feature-gate-fundamental.stderr +++ b/src/test/ui/feature-gates/feature-gate-fundamental.stderr @@ -1,5 +1,5 @@ error[E0658]: the `#[fundamental]` attribute is an experimental feature (see issue #29635) - --> $DIR/feature-gate-fundamental.rs:11:1 + --> $DIR/feature-gate-fundamental.rs:1:1 | LL | #[fundamental] //~ ERROR the `#[fundamental]` attribute is an experimental feature | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-generators.rs b/src/test/ui/feature-gates/feature-gate-generators.rs index 3754f92d8cde2..88e8781d2b9ba 100644 --- a/src/test/ui/feature-gates/feature-gate-generators.rs +++ b/src/test/ui/feature-gates/feature-gate-generators.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { yield true; //~ ERROR yield syntax is experimental } diff --git a/src/test/ui/feature-gates/feature-gate-generators.stderr b/src/test/ui/feature-gates/feature-gate-generators.stderr index 0c2337e27a700..4b90cd1c1f8e4 100644 --- a/src/test/ui/feature-gates/feature-gate-generators.stderr +++ b/src/test/ui/feature-gates/feature-gate-generators.stderr @@ -1,5 +1,5 @@ error[E0658]: yield syntax is experimental (see issue #43122) - --> $DIR/feature-gate-generators.rs:12:5 + --> $DIR/feature-gate-generators.rs:2:5 | LL | yield true; //~ ERROR yield syntax is experimental | ^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-generic_associated_types.rs b/src/test/ui/feature-gates/feature-gate-generic_associated_types.rs index bbaae1ef449fc..86a1f5ca4d5d5 100644 --- a/src/test/ui/feature-gates/feature-gate-generic_associated_types.rs +++ b/src/test/ui/feature-gates/feature-gate-generic_associated_types.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::Deref; trait PointerFamily { diff --git a/src/test/ui/feature-gates/feature-gate-generic_associated_types.stderr b/src/test/ui/feature-gates/feature-gate-generic_associated_types.stderr index f12cbe727fbed..392d0f1bd7e15 100644 --- a/src/test/ui/feature-gates/feature-gate-generic_associated_types.stderr +++ b/src/test/ui/feature-gates/feature-gate-generic_associated_types.stderr @@ -1,5 +1,5 @@ error[E0658]: generic associated types are unstable (see issue #44265) - --> $DIR/feature-gate-generic_associated_types.rs:14:5 + --> $DIR/feature-gate-generic_associated_types.rs:4:5 | LL | type Pointer: Deref; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | type Pointer: Deref; = help: add #![feature(generic_associated_types)] to the crate attributes to enable error[E0658]: generic associated types are unstable (see issue #44265) - --> $DIR/feature-gate-generic_associated_types.rs:16:5 + --> $DIR/feature-gate-generic_associated_types.rs:6:5 | LL | type Pointer2: Deref where T: Clone, U: Clone; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -15,7 +15,7 @@ LL | type Pointer2: Deref where T: Clone, U: Clone; = help: add #![feature(generic_associated_types)] to the crate attributes to enable error[E0658]: where clauses on associated types are unstable (see issue #44265) - --> $DIR/feature-gate-generic_associated_types.rs:16:5 + --> $DIR/feature-gate-generic_associated_types.rs:6:5 | LL | type Pointer2: Deref where T: Clone, U: Clone; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -23,7 +23,7 @@ LL | type Pointer2: Deref where T: Clone, U: Clone; = help: add #![feature(generic_associated_types)] to the crate attributes to enable error[E0658]: generic associated types are unstable (see issue #44265) - --> $DIR/feature-gate-generic_associated_types.rs:24:5 + --> $DIR/feature-gate-generic_associated_types.rs:14:5 | LL | type Pointer = Box; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -31,7 +31,7 @@ LL | type Pointer = Box; = help: add #![feature(generic_associated_types)] to the crate attributes to enable error[E0658]: generic associated types are unstable (see issue #44265) - --> $DIR/feature-gate-generic_associated_types.rs:26:5 + --> $DIR/feature-gate-generic_associated_types.rs:16:5 | LL | type Pointer2 = Box; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -39,7 +39,7 @@ LL | type Pointer2 = Box; = help: add #![feature(generic_associated_types)] to the crate attributes to enable error[E0658]: where clauses on associated types are unstable (see issue #44265) - --> $DIR/feature-gate-generic_associated_types.rs:31:5 + --> $DIR/feature-gate-generic_associated_types.rs:21:5 | LL | type Assoc where Self: Sized; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -47,7 +47,7 @@ LL | type Assoc where Self: Sized; = help: add #![feature(generic_associated_types)] to the crate attributes to enable error[E0658]: where clauses on associated types are unstable (see issue #44265) - --> $DIR/feature-gate-generic_associated_types.rs:36:5 + --> $DIR/feature-gate-generic_associated_types.rs:26:5 | LL | type Assoc where Self: Sized = Foo; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-global_asm.rs b/src/test/ui/feature-gates/feature-gate-global_asm.rs index 77f61ba47b005..8c9f22e975257 100644 --- a/src/test/ui/feature-gates/feature-gate-global_asm.rs +++ b/src/test/ui/feature-gates/feature-gate-global_asm.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - global_asm!(""); //~ ERROR `global_asm!` is not stable fn main() {} diff --git a/src/test/ui/feature-gates/feature-gate-global_asm.stderr b/src/test/ui/feature-gates/feature-gate-global_asm.stderr index 2219d49a26362..b698777f6234c 100644 --- a/src/test/ui/feature-gates/feature-gate-global_asm.stderr +++ b/src/test/ui/feature-gates/feature-gate-global_asm.stderr @@ -1,5 +1,5 @@ error[E0658]: `global_asm!` is not stable enough for use and is subject to change (see issue #35119) - --> $DIR/feature-gate-global_asm.rs:11:1 + --> $DIR/feature-gate-global_asm.rs:1:1 | LL | global_asm!(""); //~ ERROR `global_asm!` is not stable | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-if_while_or_patterns.rs b/src/test/ui/feature-gates/feature-gate-if_while_or_patterns.rs index 3df140c77fc81..233185f92e3f5 100644 --- a/src/test/ui/feature-gates/feature-gate-if_while_or_patterns.rs +++ b/src/test/ui/feature-gates/feature-gate-if_while_or_patterns.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { if let 0 | 1 = 0 { //~ ERROR multiple patterns in `if let` and `while let` are unstable ; diff --git a/src/test/ui/feature-gates/feature-gate-if_while_or_patterns.stderr b/src/test/ui/feature-gates/feature-gate-if_while_or_patterns.stderr index 909046812d3b1..ff991819a9218 100644 --- a/src/test/ui/feature-gates/feature-gate-if_while_or_patterns.stderr +++ b/src/test/ui/feature-gates/feature-gate-if_while_or_patterns.stderr @@ -1,5 +1,5 @@ error[E0658]: multiple patterns in `if let` and `while let` are unstable (see issue #48215) - --> $DIR/feature-gate-if_while_or_patterns.rs:12:5 + --> $DIR/feature-gate-if_while_or_patterns.rs:2:5 | LL | / if let 0 | 1 = 0 { //~ ERROR multiple patterns in `if let` and `while let` are unstable LL | | ; @@ -9,7 +9,7 @@ LL | | } = help: add #![feature(if_while_or_patterns)] to the crate attributes to enable error[E0658]: multiple patterns in `if let` and `while let` are unstable (see issue #48215) - --> $DIR/feature-gate-if_while_or_patterns.rs:15:5 + --> $DIR/feature-gate-if_while_or_patterns.rs:5:5 | LL | / while let 0 | 1 = 1 { //~ ERROR multiple patterns in `if let` and `while let` are unstable LL | | break; diff --git a/src/test/ui/feature-gates/feature-gate-impl_header_lifetime_elision-with-in_band.rs b/src/test/ui/feature-gates/feature-gate-impl_header_lifetime_elision-with-in_band.rs index b7e07e1dca674..5dd0a6c110c53 100644 --- a/src/test/ui/feature-gates/feature-gate-impl_header_lifetime_elision-with-in_band.rs +++ b/src/test/ui/feature-gates/feature-gate-impl_header_lifetime_elision-with-in_band.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(warnings)] // Make sure this related feature didn't accidentally enable this diff --git a/src/test/ui/feature-gates/feature-gate-impl_header_lifetime_elision-with-in_band.stderr b/src/test/ui/feature-gates/feature-gate-impl_header_lifetime_elision-with-in_band.stderr index 9487d11d505ca..18381efe3b689 100644 --- a/src/test/ui/feature-gates/feature-gate-impl_header_lifetime_elision-with-in_band.stderr +++ b/src/test/ui/feature-gates/feature-gate-impl_header_lifetime_elision-with-in_band.stderr @@ -1,11 +1,11 @@ error[E0106]: missing lifetime specifier - --> $DIR/feature-gate-impl_header_lifetime_elision-with-in_band.rs:18:22 + --> $DIR/feature-gate-impl_header_lifetime_elision-with-in_band.rs:8:22 | LL | impl MyTrait<'a> for &u32 { } | ^ expected lifetime parameter error[E0106]: missing lifetime specifier - --> $DIR/feature-gate-impl_header_lifetime_elision-with-in_band.rs:24:23 + --> $DIR/feature-gate-impl_header_lifetime_elision-with-in_band.rs:14:23 | LL | impl MarkerTrait for &'_ MyStruct { } | ^^ expected lifetime parameter diff --git a/src/test/ui/feature-gates/feature-gate-impl_header_lifetime_elision.rs b/src/test/ui/feature-gates/feature-gate-impl_header_lifetime_elision.rs index 3eb2ac1b00851..bcae9f7218484 100644 --- a/src/test/ui/feature-gates/feature-gate-impl_header_lifetime_elision.rs +++ b/src/test/ui/feature-gates/feature-gate-impl_header_lifetime_elision.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(warnings)] trait MyTrait<'a> { } diff --git a/src/test/ui/feature-gates/feature-gate-impl_header_lifetime_elision.stderr b/src/test/ui/feature-gates/feature-gate-impl_header_lifetime_elision.stderr index 2c8a7dd4305a7..5b6d8adbd29e5 100644 --- a/src/test/ui/feature-gates/feature-gate-impl_header_lifetime_elision.stderr +++ b/src/test/ui/feature-gates/feature-gate-impl_header_lifetime_elision.stderr @@ -1,11 +1,11 @@ error[E0106]: missing lifetime specifier - --> $DIR/feature-gate-impl_header_lifetime_elision.rs:15:26 + --> $DIR/feature-gate-impl_header_lifetime_elision.rs:5:26 | LL | impl<'a> MyTrait<'a> for &u32 { } | ^ expected lifetime parameter error[E0106]: missing lifetime specifier - --> $DIR/feature-gate-impl_header_lifetime_elision.rs:18:18 + --> $DIR/feature-gate-impl_header_lifetime_elision.rs:8:18 | LL | impl<'a> MyTrait<'_> for &'a f32 { } | ^^ expected lifetime parameter diff --git a/src/test/ui/feature-gates/feature-gate-in_band_lifetimes.rs b/src/test/ui/feature-gates/feature-gate-in_band_lifetimes.rs index 23b30711cf3c0..8a96ce4f19241 100644 --- a/src/test/ui/feature-gates/feature-gate-in_band_lifetimes.rs +++ b/src/test/ui/feature-gates/feature-gate-in_band_lifetimes.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(warnings)] // Make sure this related feature didn't accidentally enable this diff --git a/src/test/ui/feature-gates/feature-gate-in_band_lifetimes.stderr b/src/test/ui/feature-gates/feature-gate-in_band_lifetimes.stderr index 5fe143959d2c5..fc9c633de5a80 100644 --- a/src/test/ui/feature-gates/feature-gate-in_band_lifetimes.stderr +++ b/src/test/ui/feature-gates/feature-gate-in_band_lifetimes.stderr @@ -1,101 +1,101 @@ error[E0261]: use of undeclared lifetime name `'x` - --> $DIR/feature-gate-in_band_lifetimes.rs:16:12 + --> $DIR/feature-gate-in_band_lifetimes.rs:6:12 | LL | fn foo(x: &'x u8) -> &'x u8 { x } | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'x` - --> $DIR/feature-gate-in_band_lifetimes.rs:16:23 + --> $DIR/feature-gate-in_band_lifetimes.rs:6:23 | LL | fn foo(x: &'x u8) -> &'x u8 { x } | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'b` - --> $DIR/feature-gate-in_band_lifetimes.rs:28:12 + --> $DIR/feature-gate-in_band_lifetimes.rs:18:12 | LL | impl<'a> X<'b> { | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'b` - --> $DIR/feature-gate-in_band_lifetimes.rs:30:27 + --> $DIR/feature-gate-in_band_lifetimes.rs:20:27 | LL | fn inner_2(&self) -> &'b u8 { | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'b` - --> $DIR/feature-gate-in_band_lifetimes.rs:36:8 + --> $DIR/feature-gate-in_band_lifetimes.rs:26:8 | LL | impl X<'b> { | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'b` - --> $DIR/feature-gate-in_band_lifetimes.rs:38:27 + --> $DIR/feature-gate-in_band_lifetimes.rs:28:27 | LL | fn inner_3(&self) -> &'b u8 { | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'a` - --> $DIR/feature-gate-in_band_lifetimes.rs:46:9 + --> $DIR/feature-gate-in_band_lifetimes.rs:36:9 | LL | impl Y<&'a u8> { | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'a` - --> $DIR/feature-gate-in_band_lifetimes.rs:48:25 + --> $DIR/feature-gate-in_band_lifetimes.rs:38:25 | LL | fn inner(&self) -> &'a u8 { | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'b` - --> $DIR/feature-gate-in_band_lifetimes.rs:56:27 + --> $DIR/feature-gate-in_band_lifetimes.rs:46:27 | LL | fn any_lifetime() -> &'b u8; | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'b` - --> $DIR/feature-gate-in_band_lifetimes.rs:58:27 + --> $DIR/feature-gate-in_band_lifetimes.rs:48:27 | LL | fn borrowed_lifetime(&'b self) -> &'b u8; | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'b` - --> $DIR/feature-gate-in_band_lifetimes.rs:58:40 + --> $DIR/feature-gate-in_band_lifetimes.rs:48:40 | LL | fn borrowed_lifetime(&'b self) -> &'b u8; | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'a` - --> $DIR/feature-gate-in_band_lifetimes.rs:63:14 + --> $DIR/feature-gate-in_band_lifetimes.rs:53:14 | LL | impl MyTrait<'a> for Y<&'a u8> { | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'a` - --> $DIR/feature-gate-in_band_lifetimes.rs:63:25 + --> $DIR/feature-gate-in_band_lifetimes.rs:53:25 | LL | impl MyTrait<'a> for Y<&'a u8> { | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'a` - --> $DIR/feature-gate-in_band_lifetimes.rs:66:31 + --> $DIR/feature-gate-in_band_lifetimes.rs:56:31 | LL | fn my_lifetime(&self) -> &'a u8 { self.0 } | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'b` - --> $DIR/feature-gate-in_band_lifetimes.rs:68:27 + --> $DIR/feature-gate-in_band_lifetimes.rs:58:27 | LL | fn any_lifetime() -> &'b u8 { &0 } | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'b` - --> $DIR/feature-gate-in_band_lifetimes.rs:70:27 + --> $DIR/feature-gate-in_band_lifetimes.rs:60:27 | LL | fn borrowed_lifetime(&'b self) -> &'b u8 { &*self.0 } | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'b` - --> $DIR/feature-gate-in_band_lifetimes.rs:70:40 + --> $DIR/feature-gate-in_band_lifetimes.rs:60:40 | LL | fn borrowed_lifetime(&'b self) -> &'b u8 { &*self.0 } | ^^ undeclared lifetime diff --git a/src/test/ui/feature-gates/feature-gate-infer_outlives_requirements.rs b/src/test/ui/feature-gates/feature-gate-infer_outlives_requirements.rs index 01ccc50a130f2..1b13f0b6e72f4 100644 --- a/src/test/ui/feature-gates/feature-gate-infer_outlives_requirements.rs +++ b/src/test/ui/feature-gates/feature-gate-infer_outlives_requirements.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Needs an explicit where clause stating outlives condition. (RFC 2093) // Type T needs to outlive lifetime 'a. diff --git a/src/test/ui/feature-gates/feature-gate-infer_outlives_requirements.stderr b/src/test/ui/feature-gates/feature-gate-infer_outlives_requirements.stderr index 560e494b5828d..00875f4e0fbdb 100644 --- a/src/test/ui/feature-gates/feature-gate-infer_outlives_requirements.stderr +++ b/src/test/ui/feature-gates/feature-gate-infer_outlives_requirements.stderr @@ -1,5 +1,5 @@ error[E0309]: the parameter type `T` may not live long enough - --> $DIR/feature-gate-infer_outlives_requirements.rs:15:5 + --> $DIR/feature-gate-infer_outlives_requirements.rs:5:5 | LL | struct Foo<'a, T> { | - help: consider adding an explicit lifetime bound `T: 'a`... @@ -7,7 +7,7 @@ LL | bar: &'a [T] //~ ERROR the parameter type `T` may not live long enough | ^^^^^^^^^^^^ | note: ...so that the reference type `&'a [T]` does not outlive the data it points at - --> $DIR/feature-gate-infer_outlives_requirements.rs:15:5 + --> $DIR/feature-gate-infer_outlives_requirements.rs:5:5 | LL | bar: &'a [T] //~ ERROR the parameter type `T` may not live long enough [E0309] | ^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-infer_static_outlives_requirements.rs b/src/test/ui/feature-gates/feature-gate-infer_static_outlives_requirements.rs index 7b68449859e96..e484688b3093d 100644 --- a/src/test/ui/feature-gates/feature-gate-infer_static_outlives_requirements.rs +++ b/src/test/ui/feature-gates/feature-gate-infer_static_outlives_requirements.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Needs an explicit where clause stating outlives condition. (RFC 2093) // Type T needs to outlive lifetime 'static. diff --git a/src/test/ui/feature-gates/feature-gate-infer_static_outlives_requirements.stderr b/src/test/ui/feature-gates/feature-gate-infer_static_outlives_requirements.stderr index 13022b901a76f..12254fc592734 100644 --- a/src/test/ui/feature-gates/feature-gate-infer_static_outlives_requirements.stderr +++ b/src/test/ui/feature-gates/feature-gate-infer_static_outlives_requirements.stderr @@ -1,5 +1,5 @@ error[E0310]: the parameter type `U` may not live long enough - --> $DIR/feature-gate-infer_static_outlives_requirements.rs:15:5 + --> $DIR/feature-gate-infer_static_outlives_requirements.rs:5:5 | LL | struct Foo { | - help: consider adding an explicit lifetime bound `U: 'static`... @@ -7,7 +7,7 @@ LL | bar: Bar //~ ERROR 15:5: 15:16: the parameter type `U` may not live | ^^^^^^^^^^^ | note: ...so that the type `U` will meet its required lifetime bounds - --> $DIR/feature-gate-infer_static_outlives_requirements.rs:15:5 + --> $DIR/feature-gate-infer_static_outlives_requirements.rs:5:5 | LL | bar: Bar //~ ERROR 15:5: 15:16: the parameter type `U` may not live long enough [E0310] | ^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-intrinsics.rs b/src/test/ui/feature-gates/feature-gate-intrinsics.rs index a4c09b21c90a6..0916d7fcd36d3 100644 --- a/src/test/ui/feature-gates/feature-gate-intrinsics.rs +++ b/src/test/ui/feature-gates/feature-gate-intrinsics.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern "rust-intrinsic" { //~ ERROR intrinsics are subject to change fn bar(); } diff --git a/src/test/ui/feature-gates/feature-gate-intrinsics.stderr b/src/test/ui/feature-gates/feature-gate-intrinsics.stderr index e583569cb99ff..034e2b1b588b5 100644 --- a/src/test/ui/feature-gates/feature-gate-intrinsics.stderr +++ b/src/test/ui/feature-gates/feature-gate-intrinsics.stderr @@ -1,5 +1,5 @@ error[E0658]: intrinsics are subject to change - --> $DIR/feature-gate-intrinsics.rs:11:1 + --> $DIR/feature-gate-intrinsics.rs:1:1 | LL | / extern "rust-intrinsic" { //~ ERROR intrinsics are subject to change LL | | fn bar(); @@ -9,7 +9,7 @@ LL | | } = help: add #![feature(intrinsics)] to the crate attributes to enable error[E0658]: intrinsics are subject to change - --> $DIR/feature-gate-intrinsics.rs:15:1 + --> $DIR/feature-gate-intrinsics.rs:5:1 | LL | / extern "rust-intrinsic" fn baz() { //~ ERROR intrinsics are subject to change LL | | } diff --git a/src/test/ui/feature-gates/feature-gate-label_break_value.rs b/src/test/ui/feature-gates/feature-gate-label_break_value.rs index dcda7580bda41..6fc38f45517ef 100644 --- a/src/test/ui/feature-gates/feature-gate-label_break_value.rs +++ b/src/test/ui/feature-gates/feature-gate-label_break_value.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { 'a: { //~ ERROR labels on blocks are unstable break 'a; diff --git a/src/test/ui/feature-gates/feature-gate-label_break_value.stderr b/src/test/ui/feature-gates/feature-gate-label_break_value.stderr index 8e8f31e787133..347b8a9710eec 100644 --- a/src/test/ui/feature-gates/feature-gate-label_break_value.stderr +++ b/src/test/ui/feature-gates/feature-gate-label_break_value.stderr @@ -1,5 +1,5 @@ error[E0658]: labels on blocks are unstable (see issue #48594) - --> $DIR/feature-gate-label_break_value.rs:12:5 + --> $DIR/feature-gate-label_break_value.rs:2:5 | LL | 'a: { //~ ERROR labels on blocks are unstable | ^^ diff --git a/src/test/ui/feature-gates/feature-gate-lang-items.rs b/src/test/ui/feature-gates/feature-gate-lang-items.rs index 0435ff4c332d5..943ca161d678d 100644 --- a/src/test/ui/feature-gates/feature-gate-lang-items.rs +++ b/src/test/ui/feature-gates/feature-gate-lang-items.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[lang="foo"] //~ ERROR language items are subject to change trait Foo {} diff --git a/src/test/ui/feature-gates/feature-gate-lang-items.stderr b/src/test/ui/feature-gates/feature-gate-lang-items.stderr index ef3e794728086..3383eaab01f32 100644 --- a/src/test/ui/feature-gates/feature-gate-lang-items.stderr +++ b/src/test/ui/feature-gates/feature-gate-lang-items.stderr @@ -1,5 +1,5 @@ error[E0658]: language items are subject to change - --> $DIR/feature-gate-lang-items.rs:11:1 + --> $DIR/feature-gate-lang-items.rs:1:1 | LL | #[lang="foo"] //~ ERROR language items are subject to change | ^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-link_args.rs b/src/test/ui/feature-gates/feature-gate-link_args.rs index bd48ac673dd34..49948dab1ee55 100644 --- a/src/test/ui/feature-gates/feature-gate-link_args.rs +++ b/src/test/ui/feature-gates/feature-gate-link_args.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that `#[link_args]` attribute is gated by `link_args` // feature gate, both when it occurs where expected (atop // `extern { }` blocks) and where unexpected. diff --git a/src/test/ui/feature-gates/feature-gate-link_args.stderr b/src/test/ui/feature-gates/feature-gate-link_args.stderr index 86a2818b34420..c43377fe63081 100644 --- a/src/test/ui/feature-gates/feature-gate-link_args.stderr +++ b/src/test/ui/feature-gates/feature-gate-link_args.stderr @@ -1,5 +1,5 @@ error[E0658]: the `link_args` attribute is experimental and not portable across platforms, it is recommended to use `#[link(name = "foo")] instead (see issue #29596) - --> $DIR/feature-gate-link_args.rs:22:1 + --> $DIR/feature-gate-link_args.rs:12:1 | LL | #[link_args = "-l expected_use_case"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | #[link_args = "-l expected_use_case"] = help: add #![feature(link_args)] to the crate attributes to enable error[E0658]: the `link_args` attribute is experimental and not portable across platforms, it is recommended to use `#[link(name = "foo")] instead (see issue #29596) - --> $DIR/feature-gate-link_args.rs:26:1 + --> $DIR/feature-gate-link_args.rs:16:1 | LL | #[link_args = "-l unexected_use_on_non_extern_item"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -15,7 +15,7 @@ LL | #[link_args = "-l unexected_use_on_non_extern_item"] = help: add #![feature(link_args)] to the crate attributes to enable error[E0658]: the `link_args` attribute is experimental and not portable across platforms, it is recommended to use `#[link(name = "foo")] instead (see issue #29596) - --> $DIR/feature-gate-link_args.rs:19:1 + --> $DIR/feature-gate-link_args.rs:9:1 | LL | #![link_args = "-l unexpected_use_as_inner_attr_on_mod"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-link_cfg.rs b/src/test/ui/feature-gates/feature-gate-link_cfg.rs index 27918a27caf50..1905346e2b5d7 100644 --- a/src/test/ui/feature-gates/feature-gate-link_cfg.rs +++ b/src/test/ui/feature-gates/feature-gate-link_cfg.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[link(name = "foo", cfg(foo))] //~^ ERROR: is feature gated extern {} diff --git a/src/test/ui/feature-gates/feature-gate-link_cfg.stderr b/src/test/ui/feature-gates/feature-gate-link_cfg.stderr index 1da8c3e922dd0..b5ac5fdb86a7d 100644 --- a/src/test/ui/feature-gates/feature-gate-link_cfg.stderr +++ b/src/test/ui/feature-gates/feature-gate-link_cfg.stderr @@ -1,5 +1,5 @@ error[E0658]: is feature gated (see issue #37406) - --> $DIR/feature-gate-link_cfg.rs:11:1 + --> $DIR/feature-gate-link_cfg.rs:1:1 | LL | #[link(name = "foo", cfg(foo))] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-link_llvm_intrinsics.rs b/src/test/ui/feature-gates/feature-gate-link_llvm_intrinsics.rs index 92a1b071437e6..1c7f33133280a 100644 --- a/src/test/ui/feature-gates/feature-gate-link_llvm_intrinsics.rs +++ b/src/test/ui/feature-gates/feature-gate-link_llvm_intrinsics.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern { #[link_name = "llvm.sqrt.f32"] fn sqrt(x: f32) -> f32; diff --git a/src/test/ui/feature-gates/feature-gate-link_llvm_intrinsics.stderr b/src/test/ui/feature-gates/feature-gate-link_llvm_intrinsics.stderr index 7a9c5955958a8..a6cfc99ecd238 100644 --- a/src/test/ui/feature-gates/feature-gate-link_llvm_intrinsics.stderr +++ b/src/test/ui/feature-gates/feature-gate-link_llvm_intrinsics.stderr @@ -1,5 +1,5 @@ error[E0658]: linking to LLVM intrinsics is experimental (see issue #29602) - --> $DIR/feature-gate-link_llvm_intrinsics.rs:13:5 + --> $DIR/feature-gate-link_llvm_intrinsics.rs:3:5 | LL | fn sqrt(x: f32) -> f32; | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-linkage.rs b/src/test/ui/feature-gates/feature-gate-linkage.rs index 555cc2b9a7aad..282c9a8b843f9 100644 --- a/src/test/ui/feature-gates/feature-gate-linkage.rs +++ b/src/test/ui/feature-gates/feature-gate-linkage.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern { #[linkage = "extern_weak"] static foo: isize; //~^ ERROR: the `linkage` attribute is experimental and not portable diff --git a/src/test/ui/feature-gates/feature-gate-linkage.stderr b/src/test/ui/feature-gates/feature-gate-linkage.stderr index 2fc1a3e1ae535..1399a84faf6b2 100644 --- a/src/test/ui/feature-gates/feature-gate-linkage.stderr +++ b/src/test/ui/feature-gates/feature-gate-linkage.stderr @@ -1,5 +1,5 @@ error[E0658]: the `linkage` attribute is experimental and not portable across platforms (see issue #29603) - --> $DIR/feature-gate-linkage.rs:12:5 + --> $DIR/feature-gate-linkage.rs:2:5 | LL | #[linkage = "extern_weak"] static foo: isize; | ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-linker-flavor.rs b/src/test/ui/feature-gates/feature-gate-linker-flavor.rs index 955ec39cda1e5..d4494c22f4cb6 100644 --- a/src/test/ui/feature-gates/feature-gate-linker-flavor.rs +++ b/src/test/ui/feature-gates/feature-gate-linker-flavor.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This is a fake compile fail test as there's no way to generate a // `#![feature(linker_flavor)]` error. The only reason we have a `linker_flavor` // feature gate is to be able to document `-Z linker-flavor` in the unstable diff --git a/src/test/ui/feature-gates/feature-gate-linker-flavor.stderr b/src/test/ui/feature-gates/feature-gate-linker-flavor.stderr index b8bccece29277..1e23ffbc500f3 100644 --- a/src/test/ui/feature-gates/feature-gate-linker-flavor.stderr +++ b/src/test/ui/feature-gates/feature-gate-linker-flavor.stderr @@ -1,5 +1,5 @@ error[E0658]: the `#[used]` attribute is an experimental feature (see issue #40289) - --> $DIR/feature-gate-linker-flavor.rs:16:1 + --> $DIR/feature-gate-linker-flavor.rs:6:1 | LL | #[used] | ^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-log_syntax.rs b/src/test/ui/feature-gates/feature-gate-log_syntax.rs index 63c66e53c5ee8..181f66cb08ee2 100644 --- a/src/test/ui/feature-gates/feature-gate-log_syntax.rs +++ b/src/test/ui/feature-gates/feature-gate-log_syntax.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { log_syntax!() //~ ERROR `log_syntax!` is not stable enough } diff --git a/src/test/ui/feature-gates/feature-gate-log_syntax.stderr b/src/test/ui/feature-gates/feature-gate-log_syntax.stderr index d9934be778e6d..33d1f07aa3625 100644 --- a/src/test/ui/feature-gates/feature-gate-log_syntax.stderr +++ b/src/test/ui/feature-gates/feature-gate-log_syntax.stderr @@ -1,5 +1,5 @@ error[E0658]: `log_syntax!` is not stable enough for use and is subject to change (see issue #29598) - --> $DIR/feature-gate-log_syntax.rs:12:5 + --> $DIR/feature-gate-log_syntax.rs:2:5 | LL | log_syntax!() //~ ERROR `log_syntax!` is not stable enough | ^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-log_syntax2.rs b/src/test/ui/feature-gates/feature-gate-log_syntax2.rs index dcbe7eefee52c..95baea6f7e484 100644 --- a/src/test/ui/feature-gates/feature-gate-log_syntax2.rs +++ b/src/test/ui/feature-gates/feature-gate-log_syntax2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // gate-test-log_syntax fn main() { diff --git a/src/test/ui/feature-gates/feature-gate-log_syntax2.stderr b/src/test/ui/feature-gates/feature-gate-log_syntax2.stderr index 19e7de1a824ff..7f65794e5debd 100644 --- a/src/test/ui/feature-gates/feature-gate-log_syntax2.stderr +++ b/src/test/ui/feature-gates/feature-gate-log_syntax2.stderr @@ -1,5 +1,5 @@ error[E0658]: `log_syntax!` is not stable enough for use and is subject to change (see issue #29598) - --> $DIR/feature-gate-log_syntax2.rs:14:20 + --> $DIR/feature-gate-log_syntax2.rs:4:20 | LL | println!("{}", log_syntax!()); //~ ERROR `log_syntax!` is not stable | ^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-macro-literal-matcher.rs b/src/test/ui/feature-gates/feature-gate-macro-literal-matcher.rs index db5cca193ab4e..e722b7ab30d6c 100644 --- a/src/test/ui/feature-gates/feature-gate-macro-literal-matcher.rs +++ b/src/test/ui/feature-gates/feature-gate-macro-literal-matcher.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the :lifetime macro fragment cannot be used when macro_lifetime_matcher // feature gate is not used. diff --git a/src/test/ui/feature-gates/feature-gate-macro-literal-matcher.stderr b/src/test/ui/feature-gates/feature-gate-macro-literal-matcher.stderr index f714b916966a1..a001a1db501ea 100644 --- a/src/test/ui/feature-gates/feature-gate-macro-literal-matcher.stderr +++ b/src/test/ui/feature-gates/feature-gate-macro-literal-matcher.stderr @@ -1,5 +1,5 @@ error[E0658]: :literal fragment specifier is experimental and subject to change (see issue #35625) - --> $DIR/feature-gate-macro-literal-matcher.rs:14:19 + --> $DIR/feature-gate-macro-literal-matcher.rs:4:19 | LL | macro_rules! m { ($lt:literal) => {} } | ^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-macros_in_extern.rs b/src/test/ui/feature-gates/feature-gate-macros_in_extern.rs index 77080e3c348f9..8f8147a742395 100644 --- a/src/test/ui/feature-gates/feature-gate-macros_in_extern.rs +++ b/src/test/ui/feature-gates/feature-gate-macros_in_extern.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(decl_macro)] macro_rules! returns_isize( diff --git a/src/test/ui/feature-gates/feature-gate-macros_in_extern.stderr b/src/test/ui/feature-gates/feature-gate-macros_in_extern.stderr index 23b63078dbf8e..affef0fe7d37f 100644 --- a/src/test/ui/feature-gates/feature-gate-macros_in_extern.stderr +++ b/src/test/ui/feature-gates/feature-gate-macros_in_extern.stderr @@ -1,5 +1,5 @@ error[E0658]: macro invocations in `extern {}` blocks are experimental (see issue #49476) - --> $DIR/feature-gate-macros_in_extern.rs:29:5 + --> $DIR/feature-gate-macros_in_extern.rs:19:5 | LL | returns_isize!(rust_get_test_int); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | returns_isize!(rust_get_test_int); = help: add #![feature(macros_in_extern)] to the crate attributes to enable error[E0658]: macro invocations in `extern {}` blocks are experimental (see issue #49476) - --> $DIR/feature-gate-macros_in_extern.rs:31:5 + --> $DIR/feature-gate-macros_in_extern.rs:21:5 | LL | takes_u32_returns_u32!(rust_dbg_extern_identity_u32); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -15,7 +15,7 @@ LL | takes_u32_returns_u32!(rust_dbg_extern_identity_u32); = help: add #![feature(macros_in_extern)] to the crate attributes to enable error[E0658]: macro invocations in `extern {}` blocks are experimental (see issue #49476) - --> $DIR/feature-gate-macros_in_extern.rs:33:5 + --> $DIR/feature-gate-macros_in_extern.rs:23:5 | LL | emits_nothing!(); | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-main.rs b/src/test/ui/feature-gates/feature-gate-main.rs index db1c1a944172d..681bdca392530 100644 --- a/src/test/ui/feature-gates/feature-gate-main.rs +++ b/src/test/ui/feature-gates/feature-gate-main.rs @@ -1,12 +1,2 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[main] fn foo() {} //~ ERROR: declaration of a nonstandard #[main] function may change over time diff --git a/src/test/ui/feature-gates/feature-gate-main.stderr b/src/test/ui/feature-gates/feature-gate-main.stderr index 34c9fd15f7cf9..c92887eded640 100644 --- a/src/test/ui/feature-gates/feature-gate-main.stderr +++ b/src/test/ui/feature-gates/feature-gate-main.stderr @@ -1,5 +1,5 @@ error[E0658]: declaration of a nonstandard #[main] function may change over time, for now a top-level `fn main()` is required (see issue #29634) - --> $DIR/feature-gate-main.rs:12:1 + --> $DIR/feature-gate-main.rs:2:1 | LL | fn foo() {} //~ ERROR: declaration of a nonstandard #[main] function may change over time | ^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-may-dangle.rs b/src/test/ui/feature-gates/feature-gate-may-dangle.rs index a67ece0448838..45666e90b210a 100644 --- a/src/test/ui/feature-gates/feature-gate-may-dangle.rs +++ b/src/test/ui/feature-gates/feature-gate-may-dangle.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // gate-test-dropck_eyepatch // Check that `may_dangle` is rejected if `dropck_eyepatch` feature gate is absent. diff --git a/src/test/ui/feature-gates/feature-gate-may-dangle.stderr b/src/test/ui/feature-gates/feature-gate-may-dangle.stderr index aad725dfe65ec..b537a5815886f 100644 --- a/src/test/ui/feature-gates/feature-gate-may-dangle.stderr +++ b/src/test/ui/feature-gates/feature-gate-may-dangle.stderr @@ -1,5 +1,5 @@ error[E0658]: may_dangle has unstable semantics and may be removed in the future (see issue #34761) - --> $DIR/feature-gate-may-dangle.rs:16:6 + --> $DIR/feature-gate-may-dangle.rs:6:6 | LL | impl<#[may_dangle] A> Drop for Pt { | ^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-naked_functions.rs b/src/test/ui/feature-gates/feature-gate-naked_functions.rs index ceb475e119217..36bc636b0bb7b 100644 --- a/src/test/ui/feature-gates/feature-gate-naked_functions.rs +++ b/src/test/ui/feature-gates/feature-gate-naked_functions.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[naked] //~^ the `#[naked]` attribute is an experimental feature fn naked() {} diff --git a/src/test/ui/feature-gates/feature-gate-naked_functions.stderr b/src/test/ui/feature-gates/feature-gate-naked_functions.stderr index a2d3dfc83ae30..2ff5ef101e062 100644 --- a/src/test/ui/feature-gates/feature-gate-naked_functions.stderr +++ b/src/test/ui/feature-gates/feature-gate-naked_functions.stderr @@ -1,5 +1,5 @@ error[E0658]: the `#[naked]` attribute is an experimental feature (see issue #32408) - --> $DIR/feature-gate-naked_functions.rs:11:1 + --> $DIR/feature-gate-naked_functions.rs:1:1 | LL | #[naked] | ^^^^^^^^ @@ -7,7 +7,7 @@ LL | #[naked] = help: add #![feature(naked_functions)] to the crate attributes to enable error[E0658]: the `#[naked]` attribute is an experimental feature (see issue #32408) - --> $DIR/feature-gate-naked_functions.rs:15:1 + --> $DIR/feature-gate-naked_functions.rs:5:1 | LL | #[naked] | ^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-needs-allocator.rs b/src/test/ui/feature-gates/feature-gate-needs-allocator.rs index 1809564f5de1e..a3f91d02b3ee3 100644 --- a/src/test/ui/feature-gates/feature-gate-needs-allocator.rs +++ b/src/test/ui/feature-gates/feature-gate-needs-allocator.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![needs_allocator] //~ ERROR the `#[needs_allocator]` attribute is fn main() {} diff --git a/src/test/ui/feature-gates/feature-gate-needs-allocator.stderr b/src/test/ui/feature-gates/feature-gate-needs-allocator.stderr index 13665b2a0eb2f..8897f393dbd56 100644 --- a/src/test/ui/feature-gates/feature-gate-needs-allocator.stderr +++ b/src/test/ui/feature-gates/feature-gate-needs-allocator.stderr @@ -1,5 +1,5 @@ error[E0658]: the `#[needs_allocator]` attribute is an experimental feature - --> $DIR/feature-gate-needs-allocator.rs:11:1 + --> $DIR/feature-gate-needs-allocator.rs:1:1 | LL | #![needs_allocator] //~ ERROR the `#[needs_allocator]` attribute is | ^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-negate-unsigned.rs b/src/test/ui/feature-gates/feature-gate-negate-unsigned.rs index 599e31341f233..05e04f3e2b48c 100644 --- a/src/test/ui/feature-gates/feature-gate-negate-unsigned.rs +++ b/src/test/ui/feature-gates/feature-gate-negate-unsigned.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that negating unsigned integers doesn't compile struct S; diff --git a/src/test/ui/feature-gates/feature-gate-negate-unsigned.stderr b/src/test/ui/feature-gates/feature-gate-negate-unsigned.stderr index 85e9b56e4af9d..aa84c27e40f5e 100644 --- a/src/test/ui/feature-gates/feature-gate-negate-unsigned.stderr +++ b/src/test/ui/feature-gates/feature-gate-negate-unsigned.stderr @@ -1,5 +1,5 @@ error[E0600]: cannot apply unary operator `-` to type `usize` - --> $DIR/feature-gate-negate-unsigned.rs:20:23 + --> $DIR/feature-gate-negate-unsigned.rs:10:23 | LL | let _max: usize = -1; | ^^ cannot apply unary operator `-` @@ -7,7 +7,7 @@ LL | let _max: usize = -1; = note: unsigned values cannot be negated error[E0600]: cannot apply unary operator `-` to type `u8` - --> $DIR/feature-gate-negate-unsigned.rs:24:14 + --> $DIR/feature-gate-negate-unsigned.rs:14:14 | LL | let _y = -x; | ^^ cannot apply unary operator `-` diff --git a/src/test/ui/feature-gates/feature-gate-never_type.rs b/src/test/ui/feature-gates/feature-gate-never_type.rs index ebbe17a821f02..44a3bdd2ca36b 100644 --- a/src/test/ui/feature-gates/feature-gate-never_type.rs +++ b/src/test/ui/feature-gates/feature-gate-never_type.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that ! errors when used in illegal positions with feature(never_type) disabled trait Foo { diff --git a/src/test/ui/feature-gates/feature-gate-never_type.stderr b/src/test/ui/feature-gates/feature-gate-never_type.stderr index 187be6d829137..927758b67b9cc 100644 --- a/src/test/ui/feature-gates/feature-gate-never_type.stderr +++ b/src/test/ui/feature-gates/feature-gate-never_type.stderr @@ -1,5 +1,5 @@ error[E0658]: The `!` type is experimental (see issue #35121) - --> $DIR/feature-gate-never_type.rs:17:17 + --> $DIR/feature-gate-never_type.rs:7:17 | LL | type Ma = (u32, !, i32); //~ ERROR type is experimental | ^ @@ -7,7 +7,7 @@ LL | type Ma = (u32, !, i32); //~ ERROR type is experimental = help: add #![feature(never_type)] to the crate attributes to enable error[E0658]: The `!` type is experimental (see issue #35121) - --> $DIR/feature-gate-never_type.rs:18:20 + --> $DIR/feature-gate-never_type.rs:8:20 | LL | type Meeshka = Vec; //~ ERROR type is experimental | ^ @@ -15,7 +15,7 @@ LL | type Meeshka = Vec; //~ ERROR type is experimental = help: add #![feature(never_type)] to the crate attributes to enable error[E0658]: The `!` type is experimental (see issue #35121) - --> $DIR/feature-gate-never_type.rs:19:16 + --> $DIR/feature-gate-never_type.rs:9:16 | LL | type Mow = &fn(!) -> !; //~ ERROR type is experimental | ^ @@ -23,7 +23,7 @@ LL | type Mow = &fn(!) -> !; //~ ERROR type is experimental = help: add #![feature(never_type)] to the crate attributes to enable error[E0658]: The `!` type is experimental (see issue #35121) - --> $DIR/feature-gate-never_type.rs:20:19 + --> $DIR/feature-gate-never_type.rs:10:19 | LL | type Skwoz = &mut !; //~ ERROR type is experimental | ^ @@ -31,7 +31,7 @@ LL | type Skwoz = &mut !; //~ ERROR type is experimental = help: add #![feature(never_type)] to the crate attributes to enable error[E0658]: The `!` type is experimental (see issue #35121) - --> $DIR/feature-gate-never_type.rs:23:16 + --> $DIR/feature-gate-never_type.rs:13:16 | LL | type Wub = !; //~ ERROR type is experimental | ^ diff --git a/src/test/ui/feature-gates/feature-gate-nll.nll.stderr b/src/test/ui/feature-gates/feature-gate-nll.nll.stderr index 81de0d14aa7d3..316d2e1c45326 100644 --- a/src/test/ui/feature-gates/feature-gate-nll.nll.stderr +++ b/src/test/ui/feature-gates/feature-gate-nll.nll.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/feature-gate-nll.rs:13:1 + --> $DIR/feature-gate-nll.rs:4:1 | LL | / fn main() { #![rustc_error] // rust-lang/rust#49855 LL | | let mut x = 33; diff --git a/src/test/ui/feature-gates/feature-gate-nll.rs b/src/test/ui/feature-gates/feature-gate-nll.rs index 752b1fa821f7f..48e3d8e5e145f 100644 --- a/src/test/ui/feature-gates/feature-gate-nll.rs +++ b/src/test/ui/feature-gates/feature-gate-nll.rs @@ -1,12 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![feature(rustc_attrs)] #![allow(dead_code)] diff --git a/src/test/ui/feature-gates/feature-gate-nll.stderr b/src/test/ui/feature-gates/feature-gate-nll.stderr index f7b431d19be7a..0031e8e9407ef 100644 --- a/src/test/ui/feature-gates/feature-gate-nll.stderr +++ b/src/test/ui/feature-gates/feature-gate-nll.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `x` because it is borrowed - --> $DIR/feature-gate-nll.rs:17:5 + --> $DIR/feature-gate-nll.rs:8:5 | LL | let p = &x; | - borrow of `x` occurs here diff --git a/src/test/ui/feature-gates/feature-gate-no-debug-2.rs b/src/test/ui/feature-gates/feature-gate-no-debug-2.rs index b663c136ee525..b399bd2cc0f8d 100644 --- a/src/test/ui/feature-gates/feature-gate-no-debug-2.rs +++ b/src/test/ui/feature-gates/feature-gate-no-debug-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(deprecated)] #![feature(no_debug)] diff --git a/src/test/ui/feature-gates/feature-gate-no-debug-2.stderr b/src/test/ui/feature-gates/feature-gate-no-debug-2.stderr index 183feae223231..9299ac739ce3c 100644 --- a/src/test/ui/feature-gates/feature-gate-no-debug-2.stderr +++ b/src/test/ui/feature-gates/feature-gate-no-debug-2.stderr @@ -1,11 +1,11 @@ error: use of deprecated attribute `no_debug`: the `#[no_debug]` attribute was an experimental feature that has been deprecated due to lack of demand. See https://github.com/rust-lang/rust/issues/29721 - --> $DIR/feature-gate-no-debug-2.rs:14:1 + --> $DIR/feature-gate-no-debug-2.rs:4:1 | LL | #[no_debug] //~ ERROR use of deprecated attribute `no_debug` | ^^^^^^^^^^^ help: remove this attribute | note: lint level defined here - --> $DIR/feature-gate-no-debug-2.rs:11:9 + --> $DIR/feature-gate-no-debug-2.rs:1:9 | LL | #![deny(deprecated)] | ^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-no-debug.rs b/src/test/ui/feature-gates/feature-gate-no-debug.rs index d21493de50a7f..a472c4c7663f5 100644 --- a/src/test/ui/feature-gates/feature-gate-no-debug.rs +++ b/src/test/ui/feature-gates/feature-gate-no-debug.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(deprecated)] #[no_debug] //~ ERROR the `#[no_debug]` attribute was diff --git a/src/test/ui/feature-gates/feature-gate-no-debug.stderr b/src/test/ui/feature-gates/feature-gate-no-debug.stderr index 55fad0d99cf03..bdb732af7d2ed 100644 --- a/src/test/ui/feature-gates/feature-gate-no-debug.stderr +++ b/src/test/ui/feature-gates/feature-gate-no-debug.stderr @@ -1,5 +1,5 @@ error[E0658]: the `#[no_debug]` attribute was an experimental feature that has been deprecated due to lack of demand (see issue #29721) - --> $DIR/feature-gate-no-debug.rs:13:1 + --> $DIR/feature-gate-no-debug.rs:3:1 | LL | #[no_debug] //~ ERROR the `#[no_debug]` attribute was | ^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-no_core.rs b/src/test/ui/feature-gates/feature-gate-no_core.rs index 0a55a8a78ce5a..03b237867aa91 100644 --- a/src/test/ui/feature-gates/feature-gate-no_core.rs +++ b/src/test/ui/feature-gates/feature-gate-no_core.rs @@ -1,13 +1,3 @@ -// Copyright 2105 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![no_core] //~ ERROR no_core is experimental fn main() {} diff --git a/src/test/ui/feature-gates/feature-gate-no_core.stderr b/src/test/ui/feature-gates/feature-gate-no_core.stderr index c8813dcd991fe..cb8fe25df58a2 100644 --- a/src/test/ui/feature-gates/feature-gate-no_core.stderr +++ b/src/test/ui/feature-gates/feature-gate-no_core.stderr @@ -1,5 +1,5 @@ error[E0658]: no_core is experimental (see issue #29639) - --> $DIR/feature-gate-no_core.rs:11:1 + --> $DIR/feature-gate-no_core.rs:1:1 | LL | #![no_core] //~ ERROR no_core is experimental | ^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-non_ascii_idents.rs b/src/test/ui/feature-gates/feature-gate-non_ascii_idents.rs index 9e042c3a7d50e..11ff54058488a 100644 --- a/src/test/ui/feature-gates/feature-gate-non_ascii_idents.rs +++ b/src/test/ui/feature-gates/feature-gate-non_ascii_idents.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate core as bäz; //~ ERROR non-ascii idents use föö::bar; //~ ERROR non-ascii idents diff --git a/src/test/ui/feature-gates/feature-gate-non_ascii_idents.stderr b/src/test/ui/feature-gates/feature-gate-non_ascii_idents.stderr index a2853570d6d3f..452a3ecfacd84 100644 --- a/src/test/ui/feature-gates/feature-gate-non_ascii_idents.stderr +++ b/src/test/ui/feature-gates/feature-gate-non_ascii_idents.stderr @@ -1,5 +1,5 @@ error[E0658]: non-ascii idents are not fully supported. (see issue #28979) - --> $DIR/feature-gate-non_ascii_idents.rs:11:22 + --> $DIR/feature-gate-non_ascii_idents.rs:1:22 | LL | extern crate core as bäz; //~ ERROR non-ascii idents | ^^^ @@ -7,7 +7,7 @@ LL | extern crate core as bäz; //~ ERROR non-ascii idents = help: add #![feature(non_ascii_idents)] to the crate attributes to enable error[E0658]: non-ascii idents are not fully supported. (see issue #28979) - --> $DIR/feature-gate-non_ascii_idents.rs:13:5 + --> $DIR/feature-gate-non_ascii_idents.rs:3:5 | LL | use föö::bar; //~ ERROR non-ascii idents | ^^^ @@ -15,7 +15,7 @@ LL | use föö::bar; //~ ERROR non-ascii idents = help: add #![feature(non_ascii_idents)] to the crate attributes to enable error[E0658]: non-ascii idents are not fully supported. (see issue #28979) - --> $DIR/feature-gate-non_ascii_idents.rs:15:5 + --> $DIR/feature-gate-non_ascii_idents.rs:5:5 | LL | mod föö { //~ ERROR non-ascii idents | ^^^ @@ -23,7 +23,7 @@ LL | mod föö { //~ ERROR non-ascii idents = help: add #![feature(non_ascii_idents)] to the crate attributes to enable error[E0658]: non-ascii idents are not fully supported. (see issue #28979) - --> $DIR/feature-gate-non_ascii_idents.rs:19:4 + --> $DIR/feature-gate-non_ascii_idents.rs:9:4 | LL | fn bär( //~ ERROR non-ascii idents | ^^^ @@ -31,7 +31,7 @@ LL | fn bär( //~ ERROR non-ascii idents = help: add #![feature(non_ascii_idents)] to the crate attributes to enable error[E0658]: non-ascii idents are not fully supported. (see issue #28979) - --> $DIR/feature-gate-non_ascii_idents.rs:20:5 + --> $DIR/feature-gate-non_ascii_idents.rs:10:5 | LL | bäz: isize //~ ERROR non-ascii idents | ^^^ @@ -39,7 +39,7 @@ LL | bäz: isize //~ ERROR non-ascii idents = help: add #![feature(non_ascii_idents)] to the crate attributes to enable error[E0658]: non-ascii idents are not fully supported. (see issue #28979) - --> $DIR/feature-gate-non_ascii_idents.rs:22:9 + --> $DIR/feature-gate-non_ascii_idents.rs:12:9 | LL | let _ö: isize; //~ ERROR non-ascii idents | ^^ @@ -47,7 +47,7 @@ LL | let _ö: isize; //~ ERROR non-ascii idents = help: add #![feature(non_ascii_idents)] to the crate attributes to enable error[E0658]: non-ascii idents are not fully supported. (see issue #28979) - --> $DIR/feature-gate-non_ascii_idents.rs:25:10 + --> $DIR/feature-gate-non_ascii_idents.rs:15:10 | LL | (_ä, _) => {} //~ ERROR non-ascii idents | ^^ @@ -55,7 +55,7 @@ LL | (_ä, _) => {} //~ ERROR non-ascii idents = help: add #![feature(non_ascii_idents)] to the crate attributes to enable error[E0658]: non-ascii idents are not fully supported. (see issue #28979) - --> $DIR/feature-gate-non_ascii_idents.rs:29:8 + --> $DIR/feature-gate-non_ascii_idents.rs:19:8 | LL | struct Föö { //~ ERROR non-ascii idents | ^^^ @@ -63,7 +63,7 @@ LL | struct Föö { //~ ERROR non-ascii idents = help: add #![feature(non_ascii_idents)] to the crate attributes to enable error[E0658]: non-ascii idents are not fully supported. (see issue #28979) - --> $DIR/feature-gate-non_ascii_idents.rs:30:5 + --> $DIR/feature-gate-non_ascii_idents.rs:20:5 | LL | föö: isize //~ ERROR non-ascii idents | ^^^ @@ -71,7 +71,7 @@ LL | föö: isize //~ ERROR non-ascii idents = help: add #![feature(non_ascii_idents)] to the crate attributes to enable error[E0658]: non-ascii idents are not fully supported. (see issue #28979) - --> $DIR/feature-gate-non_ascii_idents.rs:33:6 + --> $DIR/feature-gate-non_ascii_idents.rs:23:6 | LL | enum Bär { //~ ERROR non-ascii idents | ^^^ @@ -79,7 +79,7 @@ LL | enum Bär { //~ ERROR non-ascii idents = help: add #![feature(non_ascii_idents)] to the crate attributes to enable error[E0658]: non-ascii idents are not fully supported. (see issue #28979) - --> $DIR/feature-gate-non_ascii_idents.rs:34:5 + --> $DIR/feature-gate-non_ascii_idents.rs:24:5 | LL | Bäz { //~ ERROR non-ascii idents | ^^^ @@ -87,7 +87,7 @@ LL | Bäz { //~ ERROR non-ascii idents = help: add #![feature(non_ascii_idents)] to the crate attributes to enable error[E0658]: non-ascii idents are not fully supported. (see issue #28979) - --> $DIR/feature-gate-non_ascii_idents.rs:35:9 + --> $DIR/feature-gate-non_ascii_idents.rs:25:9 | LL | qüx: isize //~ ERROR non-ascii idents | ^^^ @@ -95,7 +95,7 @@ LL | qüx: isize //~ ERROR non-ascii idents = help: add #![feature(non_ascii_idents)] to the crate attributes to enable error[E0658]: non-ascii idents are not fully supported. (see issue #28979) - --> $DIR/feature-gate-non_ascii_idents.rs:40:8 + --> $DIR/feature-gate-non_ascii_idents.rs:30:8 | LL | fn qüx(); //~ ERROR non-ascii idents | ^^^ diff --git a/src/test/ui/feature-gates/feature-gate-non_exhaustive.rs b/src/test/ui/feature-gates/feature-gate-non_exhaustive.rs index d2711084a4d48..b3e2e3d95f536 100644 --- a/src/test/ui/feature-gates/feature-gate-non_exhaustive.rs +++ b/src/test/ui/feature-gates/feature-gate-non_exhaustive.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //#![feature(non_exhaustive)] #[non_exhaustive] //~ERROR non exhaustive is an experimental feature (see issue #44109) diff --git a/src/test/ui/feature-gates/feature-gate-non_exhaustive.stderr b/src/test/ui/feature-gates/feature-gate-non_exhaustive.stderr index 67f103d852a02..9b45e19c3a3c7 100644 --- a/src/test/ui/feature-gates/feature-gate-non_exhaustive.stderr +++ b/src/test/ui/feature-gates/feature-gate-non_exhaustive.stderr @@ -1,5 +1,5 @@ error[E0658]: non exhaustive is an experimental feature (see issue #44109) - --> $DIR/feature-gate-non_exhaustive.rs:13:1 + --> $DIR/feature-gate-non_exhaustive.rs:3:1 | LL | #[non_exhaustive] //~ERROR non exhaustive is an experimental feature (see issue #44109) | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-omit-gdb-pretty-printer-section.rs b/src/test/ui/feature-gates/feature-gate-omit-gdb-pretty-printer-section.rs index a837a7f213e88..66bf7973832ec 100644 --- a/src/test/ui/feature-gates/feature-gate-omit-gdb-pretty-printer-section.rs +++ b/src/test/ui/feature-gates/feature-gate-omit-gdb-pretty-printer-section.rs @@ -1,12 +1,2 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[omit_gdb_pretty_printer_section] //~ ERROR the `#[omit_gdb_pretty_printer_section]` attribute is fn main() {} diff --git a/src/test/ui/feature-gates/feature-gate-omit-gdb-pretty-printer-section.stderr b/src/test/ui/feature-gates/feature-gate-omit-gdb-pretty-printer-section.stderr index 253811400efdf..de1f03cc170b1 100644 --- a/src/test/ui/feature-gates/feature-gate-omit-gdb-pretty-printer-section.stderr +++ b/src/test/ui/feature-gates/feature-gate-omit-gdb-pretty-printer-section.stderr @@ -1,5 +1,5 @@ error[E0658]: the `#[omit_gdb_pretty_printer_section]` attribute is just used for the Rust test suite - --> $DIR/feature-gate-omit-gdb-pretty-printer-section.rs:11:1 + --> $DIR/feature-gate-omit-gdb-pretty-printer-section.rs:1:1 | LL | #[omit_gdb_pretty_printer_section] //~ ERROR the `#[omit_gdb_pretty_printer_section]` attribute is | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-on-unimplemented.rs b/src/test/ui/feature-gates/feature-gate-on-unimplemented.rs index 5d32bba6a766c..bec1531c5338f 100644 --- a/src/test/ui/feature-gates/feature-gate-on-unimplemented.rs +++ b/src/test/ui/feature-gates/feature-gate-on-unimplemented.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that `#[rustc_on_unimplemented]` is gated by `on_unimplemented` feature // gate. diff --git a/src/test/ui/feature-gates/feature-gate-on-unimplemented.stderr b/src/test/ui/feature-gates/feature-gate-on-unimplemented.stderr index a059f5e3c4d25..32bfb20d5ed3e 100644 --- a/src/test/ui/feature-gates/feature-gate-on-unimplemented.stderr +++ b/src/test/ui/feature-gates/feature-gate-on-unimplemented.stderr @@ -1,5 +1,5 @@ error[E0658]: the `#[rustc_on_unimplemented]` attribute is an experimental feature (see issue #29628) - --> $DIR/feature-gate-on-unimplemented.rs:14:1 + --> $DIR/feature-gate-on-unimplemented.rs:4:1 | LL | #[rustc_on_unimplemented = "test error `{Self}` with `{Bar}`"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-optin-builtin-traits.rs b/src/test/ui/feature-gates/feature-gate-optin-builtin-traits.rs index ab3313af16d5d..9d70cbee53b09 100644 --- a/src/test/ui/feature-gates/feature-gate-optin-builtin-traits.rs +++ b/src/test/ui/feature-gates/feature-gate-optin-builtin-traits.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that default and negative trait implementations are gated by // `optin_builtin_traits` feature gate diff --git a/src/test/ui/feature-gates/feature-gate-optin-builtin-traits.stderr b/src/test/ui/feature-gates/feature-gate-optin-builtin-traits.stderr index 8bd07ffd12298..c523147611a81 100644 --- a/src/test/ui/feature-gates/feature-gate-optin-builtin-traits.stderr +++ b/src/test/ui/feature-gates/feature-gate-optin-builtin-traits.stderr @@ -1,5 +1,5 @@ error[E0658]: auto traits are experimental and possibly buggy (see issue #13231) - --> $DIR/feature-gate-optin-builtin-traits.rs:20:1 + --> $DIR/feature-gate-optin-builtin-traits.rs:10:1 | LL | auto trait AutoDummyTrait {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | auto trait AutoDummyTrait {} = help: add #![feature(optin_builtin_traits)] to the crate attributes to enable error[E0658]: negative trait bounds are not yet fully implemented; use marker types for now (see issue #13231) - --> $DIR/feature-gate-optin-builtin-traits.rs:23:1 + --> $DIR/feature-gate-optin-builtin-traits.rs:13:1 | LL | impl !DummyTrait for DummyStruct {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-overlapping_marker_traits.rs b/src/test/ui/feature-gates/feature-gate-overlapping_marker_traits.rs index d2aa4e59b5ba9..6922d6f838747 100644 --- a/src/test/ui/feature-gates/feature-gate-overlapping_marker_traits.rs +++ b/src/test/ui/feature-gates/feature-gate-overlapping_marker_traits.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt::{Debug, Display}; trait MyMarker {} diff --git a/src/test/ui/feature-gates/feature-gate-overlapping_marker_traits.stderr b/src/test/ui/feature-gates/feature-gate-overlapping_marker_traits.stderr index 040ad019b9fcf..5ce4c5cccb31e 100644 --- a/src/test/ui/feature-gates/feature-gate-overlapping_marker_traits.stderr +++ b/src/test/ui/feature-gates/feature-gate-overlapping_marker_traits.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `MyMarker`: - --> $DIR/feature-gate-overlapping_marker_traits.rs:16:1 + --> $DIR/feature-gate-overlapping_marker_traits.rs:6:1 | LL | impl MyMarker for T {} | ------------------------------- first implementation here diff --git a/src/test/ui/feature-gates/feature-gate-panic-implementation.rs b/src/test/ui/feature-gates/feature-gate-panic-implementation.rs index ae9fbc7b13bd5..23eded024322a 100644 --- a/src/test/ui/feature-gates/feature-gate-panic-implementation.rs +++ b/src/test/ui/feature-gates/feature-gate-panic-implementation.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-C panic=abort #![no_std] diff --git a/src/test/ui/feature-gates/feature-gate-panic-implementation.stderr b/src/test/ui/feature-gates/feature-gate-panic-implementation.stderr index f99228bef1d62..b9674ca52c859 100644 --- a/src/test/ui/feature-gates/feature-gate-panic-implementation.stderr +++ b/src/test/ui/feature-gates/feature-gate-panic-implementation.stderr @@ -1,5 +1,5 @@ error[E0658]: #[panic_implementation] is an unstable feature (see issue #44489) - --> $DIR/feature-gate-panic-implementation.rs:18:1 + --> $DIR/feature-gate-panic-implementation.rs:8:1 | LL | #[panic_implementation] //~ ERROR #[panic_implementation] is an unstable feature (see issue #44489) | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-pattern_parentheses.rs b/src/test/ui/feature-gates/feature-gate-pattern_parentheses.rs index 29768018f0e44..6581341bda9cc 100644 --- a/src/test/ui/feature-gates/feature-gate-pattern_parentheses.rs +++ b/src/test/ui/feature-gates/feature-gate-pattern_parentheses.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { match 0 { (pat) => {} //~ ERROR parentheses in patterns are unstable diff --git a/src/test/ui/feature-gates/feature-gate-pattern_parentheses.stderr b/src/test/ui/feature-gates/feature-gate-pattern_parentheses.stderr index 4268d27ebec99..6b319a656a39b 100644 --- a/src/test/ui/feature-gates/feature-gate-pattern_parentheses.stderr +++ b/src/test/ui/feature-gates/feature-gate-pattern_parentheses.stderr @@ -1,5 +1,5 @@ error[E0658]: parentheses in patterns are unstable (see issue #51087) - --> $DIR/feature-gate-pattern_parentheses.rs:13:9 + --> $DIR/feature-gate-pattern_parentheses.rs:3:9 | LL | (pat) => {} //~ ERROR parentheses in patterns are unstable | ^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-plugin.rs b/src/test/ui/feature-gates/feature-gate-plugin.rs index 3b5d7626ce309..977a5556899ba 100644 --- a/src/test/ui/feature-gates/feature-gate-plugin.rs +++ b/src/test/ui/feature-gates/feature-gate-plugin.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that `#![plugin(...)]` attribute is gated by `plugin` feature gate #![plugin(foo)] diff --git a/src/test/ui/feature-gates/feature-gate-plugin.stderr b/src/test/ui/feature-gates/feature-gate-plugin.stderr index 366e293c1826d..0feebb6f0e0f7 100644 --- a/src/test/ui/feature-gates/feature-gate-plugin.stderr +++ b/src/test/ui/feature-gates/feature-gate-plugin.stderr @@ -1,5 +1,5 @@ error[E0658]: compiler plugins are experimental and possibly buggy (see issue #29597) - --> $DIR/feature-gate-plugin.rs:13:1 + --> $DIR/feature-gate-plugin.rs:3:1 | LL | #![plugin(foo)] | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-plugin_registrar.rs b/src/test/ui/feature-gates/feature-gate-plugin_registrar.rs index 9cdebde7b7b98..0e357f89d14a6 100644 --- a/src/test/ui/feature-gates/feature-gate-plugin_registrar.rs +++ b/src/test/ui/feature-gates/feature-gate-plugin_registrar.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that `#[plugin_registrar]` attribute is gated by `plugin_registrar` // feature gate. diff --git a/src/test/ui/feature-gates/feature-gate-plugin_registrar.stderr b/src/test/ui/feature-gates/feature-gate-plugin_registrar.stderr index 3e6ffb6ef1a56..6464d4087be08 100644 --- a/src/test/ui/feature-gates/feature-gate-plugin_registrar.stderr +++ b/src/test/ui/feature-gates/feature-gate-plugin_registrar.stderr @@ -1,5 +1,5 @@ error[E0658]: compiler plugins are experimental and possibly buggy (see issue #29597) - --> $DIR/feature-gate-plugin_registrar.rs:16:1 + --> $DIR/feature-gate-plugin_registrar.rs:6:1 | LL | pub fn registrar() {} | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-prelude_import.rs b/src/test/ui/feature-gates/feature-gate-prelude_import.rs index 8bc3df247ec12..a338bf973992c 100644 --- a/src/test/ui/feature-gates/feature-gate-prelude_import.rs +++ b/src/test/ui/feature-gates/feature-gate-prelude_import.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[prelude_import] //~ ERROR `#[prelude_import]` is for use by rustc only use std::prelude::v1::*; diff --git a/src/test/ui/feature-gates/feature-gate-prelude_import.stderr b/src/test/ui/feature-gates/feature-gate-prelude_import.stderr index 6841df54067a0..c0016d24f35e1 100644 --- a/src/test/ui/feature-gates/feature-gate-prelude_import.stderr +++ b/src/test/ui/feature-gates/feature-gate-prelude_import.stderr @@ -1,5 +1,5 @@ error[E0658]: `#[prelude_import]` is for use by rustc only - --> $DIR/feature-gate-prelude_import.rs:11:1 + --> $DIR/feature-gate-prelude_import.rs:1:1 | LL | #[prelude_import] //~ ERROR `#[prelude_import]` is for use by rustc only | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-profiler-runtime.rs b/src/test/ui/feature-gates/feature-gate-profiler-runtime.rs index c6b2cb2eb0772..f8a70963481c5 100644 --- a/src/test/ui/feature-gates/feature-gate-profiler-runtime.rs +++ b/src/test/ui/feature-gates/feature-gate-profiler-runtime.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![profiler_runtime] //~ ERROR the `#[profiler_runtime]` attribute is fn main() {} diff --git a/src/test/ui/feature-gates/feature-gate-profiler-runtime.stderr b/src/test/ui/feature-gates/feature-gate-profiler-runtime.stderr index dd395742b4f4e..2d6ef277572b9 100644 --- a/src/test/ui/feature-gates/feature-gate-profiler-runtime.stderr +++ b/src/test/ui/feature-gates/feature-gate-profiler-runtime.stderr @@ -1,5 +1,5 @@ error[E0658]: the `#[profiler_runtime]` attribute is used to identify the `profiler_builtins` crate which contains the profiler runtime and will never be stable - --> $DIR/feature-gate-profiler-runtime.rs:11:1 + --> $DIR/feature-gate-profiler-runtime.rs:1:1 | LL | #![profiler_runtime] //~ ERROR the `#[profiler_runtime]` attribute is | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-repr-simd.rs b/src/test/ui/feature-gates/feature-gate-repr-simd.rs index 429cec7ec90d0..4e84b4b0d3871 100644 --- a/src/test/ui/feature-gates/feature-gate-repr-simd.rs +++ b/src/test/ui/feature-gates/feature-gate-repr-simd.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[repr(simd)] //~ error: SIMD types are experimental struct Foo(u64, u64); diff --git a/src/test/ui/feature-gates/feature-gate-repr-simd.stderr b/src/test/ui/feature-gates/feature-gate-repr-simd.stderr index 8174f82060a18..607193b2dc9a8 100644 --- a/src/test/ui/feature-gates/feature-gate-repr-simd.stderr +++ b/src/test/ui/feature-gates/feature-gate-repr-simd.stderr @@ -1,5 +1,5 @@ error[E0658]: SIMD types are experimental and possibly buggy (see issue #27731) - --> $DIR/feature-gate-repr-simd.rs:11:1 + --> $DIR/feature-gate-repr-simd.rs:1:1 | LL | #[repr(simd)] //~ error: SIMD types are experimental | ^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-repr128.rs b/src/test/ui/feature-gates/feature-gate-repr128.rs index f5753f1c7fbe1..0290874dd27f8 100644 --- a/src/test/ui/feature-gates/feature-gate-repr128.rs +++ b/src/test/ui/feature-gates/feature-gate-repr128.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[repr(u128)] enum A { //~ ERROR repr with 128-bit type is unstable A(u64) diff --git a/src/test/ui/feature-gates/feature-gate-repr128.stderr b/src/test/ui/feature-gates/feature-gate-repr128.stderr index 29cba831f545e..ddd11f6daab94 100644 --- a/src/test/ui/feature-gates/feature-gate-repr128.stderr +++ b/src/test/ui/feature-gates/feature-gate-repr128.stderr @@ -1,5 +1,5 @@ error[E0658]: repr with 128-bit type is unstable (see issue #35118) - --> $DIR/feature-gate-repr128.rs:12:1 + --> $DIR/feature-gate-repr128.rs:2:1 | LL | / enum A { //~ ERROR repr with 128-bit type is unstable LL | | A(u64) diff --git a/src/test/ui/feature-gates/feature-gate-repr_packed.rs b/src/test/ui/feature-gates/feature-gate-repr_packed.rs index 12bb152b46749..8735756226c07 100644 --- a/src/test/ui/feature-gates/feature-gate-repr_packed.rs +++ b/src/test/ui/feature-gates/feature-gate-repr_packed.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[repr(packed(1))] //~ error: the `#[repr(packed(n))]` attribute is experimental struct Foo(u64); diff --git a/src/test/ui/feature-gates/feature-gate-repr_packed.stderr b/src/test/ui/feature-gates/feature-gate-repr_packed.stderr index d0faf9d90bd5c..db7c8e847e93a 100644 --- a/src/test/ui/feature-gates/feature-gate-repr_packed.stderr +++ b/src/test/ui/feature-gates/feature-gate-repr_packed.stderr @@ -1,5 +1,5 @@ error[E0658]: the `#[repr(packed(n))]` attribute is experimental (see issue #33158) - --> $DIR/feature-gate-repr_packed.rs:11:1 + --> $DIR/feature-gate-repr_packed.rs:1:1 | LL | #[repr(packed(1))] //~ error: the `#[repr(packed(n))]` attribute is experimental | ^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-rustc-attrs-1.rs b/src/test/ui/feature-gates/feature-gate-rustc-attrs-1.rs index 7295de80db56d..f7ff3eb3ac9ff 100644 --- a/src/test/ui/feature-gates/feature-gate-rustc-attrs-1.rs +++ b/src/test/ui/feature-gates/feature-gate-rustc-attrs-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // Test that `#[rustc_*]` attributes are gated by `rustc_attrs` feature gate. diff --git a/src/test/ui/feature-gates/feature-gate-rustc-attrs-1.stderr b/src/test/ui/feature-gates/feature-gate-rustc-attrs-1.stderr index 54a580ce9f942..2b90699384b48 100644 --- a/src/test/ui/feature-gates/feature-gate-rustc-attrs-1.stderr +++ b/src/test/ui/feature-gates/feature-gate-rustc-attrs-1.stderr @@ -1,5 +1,5 @@ error[E0658]: the `#[rustc_variance]` attribute is just used for rustc unit tests and will never be stable (see issue #29642) - --> $DIR/feature-gate-rustc-attrs-1.rs:15:1 + --> $DIR/feature-gate-rustc-attrs-1.rs:5:1 | LL | #[rustc_variance] //~ ERROR the `#[rustc_variance]` attribute is just used for rustc unit tests and will never be stable | ^^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | #[rustc_variance] //~ ERROR the `#[rustc_variance]` attribute is just used = help: add #![feature(rustc_attrs)] to the crate attributes to enable error[E0658]: the `#[rustc_error]` attribute is just used for rustc unit tests and will never be stable (see issue #29642) - --> $DIR/feature-gate-rustc-attrs-1.rs:16:1 + --> $DIR/feature-gate-rustc-attrs-1.rs:6:1 | LL | #[rustc_error] //~ ERROR the `#[rustc_error]` attribute is just used for rustc unit tests and will never be stable | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-rustc-attrs.rs b/src/test/ui/feature-gates/feature-gate-rustc-attrs.rs index 99bc51b69c6cb..993daca075613 100644 --- a/src/test/ui/feature-gates/feature-gate-rustc-attrs.rs +++ b/src/test/ui/feature-gates/feature-gate-rustc-attrs.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // Test that `#[rustc_*]` attributes are gated by `rustc_attrs` feature gate. diff --git a/src/test/ui/feature-gates/feature-gate-rustc-attrs.stderr b/src/test/ui/feature-gates/feature-gate-rustc-attrs.stderr index 882549c1eafba..1d742c2fa9e5d 100644 --- a/src/test/ui/feature-gates/feature-gate-rustc-attrs.stderr +++ b/src/test/ui/feature-gates/feature-gate-rustc-attrs.stderr @@ -1,5 +1,5 @@ error[E0658]: unless otherwise specified, attributes with the prefix `rustc_` are reserved for internal compiler diagnostics (see issue #29642) - --> $DIR/feature-gate-rustc-attrs.rs:15:3 + --> $DIR/feature-gate-rustc-attrs.rs:5:3 | LL | #[rustc_foo] | ^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-rustc-diagnostic-macros.rs b/src/test/ui/feature-gates/feature-gate-rustc-diagnostic-macros.rs index bbdf248780f33..63c2c31fd30e6 100644 --- a/src/test/ui/feature-gates/feature-gate-rustc-diagnostic-macros.rs +++ b/src/test/ui/feature-gates/feature-gate-rustc-diagnostic-macros.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that diagnostic macros are gated by `rustc_diagnostic_macros` feature // gate diff --git a/src/test/ui/feature-gates/feature-gate-rustc-diagnostic-macros.stderr b/src/test/ui/feature-gates/feature-gate-rustc-diagnostic-macros.stderr index 70b66db608342..478bc09f29192 100644 --- a/src/test/ui/feature-gates/feature-gate-rustc-diagnostic-macros.stderr +++ b/src/test/ui/feature-gates/feature-gate-rustc-diagnostic-macros.stderr @@ -1,17 +1,17 @@ error: cannot find macro `__build_diagnostic_array!` in this scope - --> $DIR/feature-gate-rustc-diagnostic-macros.rs:22:1 + --> $DIR/feature-gate-rustc-diagnostic-macros.rs:12:1 | LL | __build_diagnostic_array!(DIAGNOSTICS); | ^^^^^^^^^^^^^^^^^^^^^^^^ error: cannot find macro `__register_diagnostic!` in this scope - --> $DIR/feature-gate-rustc-diagnostic-macros.rs:14:1 + --> $DIR/feature-gate-rustc-diagnostic-macros.rs:4:1 | LL | __register_diagnostic!(E0001); | ^^^^^^^^^^^^^^^^^^^^^ error: cannot find macro `__diagnostic_used!` in this scope - --> $DIR/feature-gate-rustc-diagnostic-macros.rs:18:5 + --> $DIR/feature-gate-rustc-diagnostic-macros.rs:8:5 | LL | __diagnostic_used!(E0001); | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-rustc_const_unstable.rs b/src/test/ui/feature-gates/feature-gate-rustc_const_unstable.rs index 38a3e15fd7eb3..a85f2f4ad30ea 100644 --- a/src/test/ui/feature-gates/feature-gate-rustc_const_unstable.rs +++ b/src/test/ui/feature-gates/feature-gate-rustc_const_unstable.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test internal const fn feature gate. #![feature(staged_api)] diff --git a/src/test/ui/feature-gates/feature-gate-rustc_const_unstable.stderr b/src/test/ui/feature-gates/feature-gate-rustc_const_unstable.stderr index fa3f9807a04e8..52d9b8db2fbe7 100644 --- a/src/test/ui/feature-gates/feature-gate-rustc_const_unstable.stderr +++ b/src/test/ui/feature-gates/feature-gate-rustc_const_unstable.stderr @@ -1,5 +1,5 @@ error[E0658]: the `#[rustc_const_unstable]` attribute is an internal feature - --> $DIR/feature-gate-rustc_const_unstable.rs:18:1 + --> $DIR/feature-gate-rustc_const_unstable.rs:8:1 | LL | #[rustc_const_unstable(feature="fzzzzzt")] //~ERROR internal feature | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-sanitizer-runtime.rs b/src/test/ui/feature-gates/feature-gate-sanitizer-runtime.rs index a18641d824691..3b972c117a6ff 100644 --- a/src/test/ui/feature-gates/feature-gate-sanitizer-runtime.rs +++ b/src/test/ui/feature-gates/feature-gate-sanitizer-runtime.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![sanitizer_runtime] //~ ERROR the `#[sanitizer_runtime]` attribute is fn main() {} diff --git a/src/test/ui/feature-gates/feature-gate-sanitizer-runtime.stderr b/src/test/ui/feature-gates/feature-gate-sanitizer-runtime.stderr index fc93e10300536..37e9b35c0ba78 100644 --- a/src/test/ui/feature-gates/feature-gate-sanitizer-runtime.stderr +++ b/src/test/ui/feature-gates/feature-gate-sanitizer-runtime.stderr @@ -1,5 +1,5 @@ error[E0658]: the `#[sanitizer_runtime]` attribute is used to identify crates that contain the runtime of a sanitizer and will never be stable - --> $DIR/feature-gate-sanitizer-runtime.rs:11:1 + --> $DIR/feature-gate-sanitizer-runtime.rs:1:1 | LL | #![sanitizer_runtime] //~ ERROR the `#[sanitizer_runtime]` attribute is | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-self-in-typedefs.rs b/src/test/ui/feature-gates/feature-gate-self-in-typedefs.rs index 4b476a0a645b1..9fcaf81bb40bd 100644 --- a/src/test/ui/feature-gates/feature-gate-self-in-typedefs.rs +++ b/src/test/ui/feature-gates/feature-gate-self-in-typedefs.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum StackList<'a, T: 'a> { Nil, Cons(T, &'a Self) diff --git a/src/test/ui/feature-gates/feature-gate-self-in-typedefs.stderr b/src/test/ui/feature-gates/feature-gate-self-in-typedefs.stderr index c3f9abd90a7f1..b128e7a822c95 100644 --- a/src/test/ui/feature-gates/feature-gate-self-in-typedefs.stderr +++ b/src/test/ui/feature-gates/feature-gate-self-in-typedefs.stderr @@ -1,5 +1,5 @@ error[E0411]: cannot find type `Self` in this scope - --> $DIR/feature-gate-self-in-typedefs.rs:13:17 + --> $DIR/feature-gate-self-in-typedefs.rs:3:17 | LL | Cons(T, &'a Self) | ^^^^ `Self` is only available in traits and impls diff --git a/src/test/ui/feature-gates/feature-gate-simd-ffi.rs b/src/test/ui/feature-gates/feature-gate-simd-ffi.rs index a603658d31610..0425e39e67745 100644 --- a/src/test/ui/feature-gates/feature-gate-simd-ffi.rs +++ b/src/test/ui/feature-gates/feature-gate-simd-ffi.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(repr_simd)] #![allow(dead_code)] diff --git a/src/test/ui/feature-gates/feature-gate-simd-ffi.stderr b/src/test/ui/feature-gates/feature-gate-simd-ffi.stderr index f7b17aa4e6ad5..01005138a6077 100644 --- a/src/test/ui/feature-gates/feature-gate-simd-ffi.stderr +++ b/src/test/ui/feature-gates/feature-gate-simd-ffi.stderr @@ -1,5 +1,5 @@ error: use of SIMD type `LocalSimd` in FFI is highly experimental and may result in invalid code - --> $DIR/feature-gate-simd-ffi.rs:19:17 + --> $DIR/feature-gate-simd-ffi.rs:9:17 | LL | fn baz() -> LocalSimd; //~ ERROR use of SIMD type | ^^^^^^^^^ @@ -7,7 +7,7 @@ LL | fn baz() -> LocalSimd; //~ ERROR use of SIMD type = help: add #![feature(simd_ffi)] to the crate attributes to enable error: use of SIMD type `LocalSimd` in FFI is highly experimental and may result in invalid code - --> $DIR/feature-gate-simd-ffi.rs:20:15 + --> $DIR/feature-gate-simd-ffi.rs:10:15 | LL | fn qux(x: LocalSimd); //~ ERROR use of SIMD type | ^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-simd.rs b/src/test/ui/feature-gates/feature-gate-simd.rs index 025eaca553336..d01d33de28988 100644 --- a/src/test/ui/feature-gates/feature-gate-simd.rs +++ b/src/test/ui/feature-gates/feature-gate-simd.rs @@ -1,14 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // pretty-expanded FIXME #23616 #[repr(simd)] //~ ERROR SIMD types are experimental diff --git a/src/test/ui/feature-gates/feature-gate-simd.stderr b/src/test/ui/feature-gates/feature-gate-simd.stderr index 414a5d9eb5d01..ad5ffa5e7852b 100644 --- a/src/test/ui/feature-gates/feature-gate-simd.stderr +++ b/src/test/ui/feature-gates/feature-gate-simd.stderr @@ -1,5 +1,5 @@ error[E0658]: SIMD types are experimental and possibly buggy (see issue #27731) - --> $DIR/feature-gate-simd.rs:14:1 + --> $DIR/feature-gate-simd.rs:3:1 | LL | #[repr(simd)] //~ ERROR SIMD types are experimental | ^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-slice-patterns.rs b/src/test/ui/feature-gates/feature-gate-slice-patterns.rs index fd058f6517211..0165321debe6b 100644 --- a/src/test/ui/feature-gates/feature-gate-slice-patterns.rs +++ b/src/test/ui/feature-gates/feature-gate-slice-patterns.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that slice pattern syntax with `..` is gated by `slice_patterns` feature gate fn main() { diff --git a/src/test/ui/feature-gates/feature-gate-slice-patterns.stderr b/src/test/ui/feature-gates/feature-gate-slice-patterns.stderr index d560dcd54eefb..65dec6e10990b 100644 --- a/src/test/ui/feature-gates/feature-gate-slice-patterns.stderr +++ b/src/test/ui/feature-gates/feature-gate-slice-patterns.stderr @@ -1,5 +1,5 @@ error[E0658]: syntax for subslices in slice patterns is not yet stabilized (see issue #23121) - --> $DIR/feature-gate-slice-patterns.rs:16:16 + --> $DIR/feature-gate-slice-patterns.rs:6:16 | LL | [1, 2, ..] => {} //~ ERROR syntax for subslices in slice patterns is not yet stabilized | ^^ @@ -7,7 +7,7 @@ LL | [1, 2, ..] => {} //~ ERROR syntax for subslices in slice patterns i = help: add #![feature(slice_patterns)] to the crate attributes to enable error[E0658]: syntax for subslices in slice patterns is not yet stabilized (see issue #23121) - --> $DIR/feature-gate-slice-patterns.rs:17:13 + --> $DIR/feature-gate-slice-patterns.rs:7:13 | LL | [1, .., 5] => {} //~ ERROR syntax for subslices in slice patterns is not yet stabilized | ^^ @@ -15,7 +15,7 @@ LL | [1, .., 5] => {} //~ ERROR syntax for subslices in slice patterns i = help: add #![feature(slice_patterns)] to the crate attributes to enable error[E0658]: syntax for subslices in slice patterns is not yet stabilized (see issue #23121) - --> $DIR/feature-gate-slice-patterns.rs:18:10 + --> $DIR/feature-gate-slice-patterns.rs:8:10 | LL | [.., 4, 5] => {} //~ ERROR syntax for subslices in slice patterns is not yet stabilized | ^^ @@ -23,7 +23,7 @@ LL | [.., 4, 5] => {} //~ ERROR syntax for subslices in slice patterns i = help: add #![feature(slice_patterns)] to the crate attributes to enable error[E0658]: syntax for subslices in slice patterns is not yet stabilized (see issue #23121) - --> $DIR/feature-gate-slice-patterns.rs:23:11 + --> $DIR/feature-gate-slice-patterns.rs:13:11 | LL | [ xs.., 4, 5 ] => {} //~ ERROR syntax for subslices in slice patterns is not yet stabilized | ^^ @@ -31,7 +31,7 @@ LL | [ xs.., 4, 5 ] => {} //~ ERROR syntax for subslices in slice patter = help: add #![feature(slice_patterns)] to the crate attributes to enable error[E0658]: syntax for subslices in slice patterns is not yet stabilized (see issue #23121) - --> $DIR/feature-gate-slice-patterns.rs:24:14 + --> $DIR/feature-gate-slice-patterns.rs:14:14 | LL | [ 1, xs.., 5 ] => {} //~ ERROR syntax for subslices in slice patterns is not yet stabilized | ^^ @@ -39,7 +39,7 @@ LL | [ 1, xs.., 5 ] => {} //~ ERROR syntax for subslices in slice patter = help: add #![feature(slice_patterns)] to the crate attributes to enable error[E0658]: syntax for subslices in slice patterns is not yet stabilized (see issue #23121) - --> $DIR/feature-gate-slice-patterns.rs:25:17 + --> $DIR/feature-gate-slice-patterns.rs:15:17 | LL | [ 1, 2, xs.. ] => {} //~ ERROR syntax for subslices in slice patterns is not yet stabilized | ^^ diff --git a/src/test/ui/feature-gates/feature-gate-staged_api.rs b/src/test/ui/feature-gates/feature-gate-staged_api.rs index 014a0aaaf68e6..2571ab5d1b4e1 100644 --- a/src/test/ui/feature-gates/feature-gate-staged_api.rs +++ b/src/test/ui/feature-gates/feature-gate-staged_api.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![stable(feature = "a", since = "b")] //~^ ERROR stability attributes may not be used outside of the standard library mod inner_private_module { diff --git a/src/test/ui/feature-gates/feature-gate-staged_api.stderr b/src/test/ui/feature-gates/feature-gate-staged_api.stderr index 7b395ffb74bad..f0db47fe8a875 100644 --- a/src/test/ui/feature-gates/feature-gate-staged_api.stderr +++ b/src/test/ui/feature-gates/feature-gate-staged_api.stderr @@ -1,11 +1,11 @@ error: stability attributes may not be used outside of the standard library - --> $DIR/feature-gate-staged_api.rs:11:1 + --> $DIR/feature-gate-staged_api.rs:1:1 | LL | #![stable(feature = "a", since = "b")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: stability attributes may not be used outside of the standard library - --> $DIR/feature-gate-staged_api.rs:18:1 + --> $DIR/feature-gate-staged_api.rs:8:1 | LL | #[stable(feature = "a", since = "b")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-start.rs b/src/test/ui/feature-gates/feature-gate-start.rs index 7a0924d8adf1b..bf097c8203156 100644 --- a/src/test/ui/feature-gates/feature-gate-start.rs +++ b/src/test/ui/feature-gates/feature-gate-start.rs @@ -1,12 +1,2 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[start] fn foo() {} //~ ERROR: a #[start] function is an experimental feature diff --git a/src/test/ui/feature-gates/feature-gate-start.stderr b/src/test/ui/feature-gates/feature-gate-start.stderr index cf590d2a0e3a2..255703d767388 100644 --- a/src/test/ui/feature-gates/feature-gate-start.stderr +++ b/src/test/ui/feature-gates/feature-gate-start.stderr @@ -1,5 +1,5 @@ error[E0658]: a #[start] function is an experimental feature whose signature may change over time (see issue #29633) - --> $DIR/feature-gate-start.rs:12:1 + --> $DIR/feature-gate-start.rs:2:1 | LL | fn foo() {} //~ ERROR: a #[start] function is an experimental feature | ^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-static-nobundle.rs b/src/test/ui/feature-gates/feature-gate-static-nobundle.rs index 0d13a4937c468..1ce6c54aa4dc2 100644 --- a/src/test/ui/feature-gates/feature-gate-static-nobundle.rs +++ b/src/test/ui/feature-gates/feature-gate-static-nobundle.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[link(name="foo", kind="static-nobundle")] //~^ ERROR: kind="static-nobundle" is feature gated extern {} diff --git a/src/test/ui/feature-gates/feature-gate-static-nobundle.stderr b/src/test/ui/feature-gates/feature-gate-static-nobundle.stderr index fd9f2b371f60b..2e80275f3f7b3 100644 --- a/src/test/ui/feature-gates/feature-gate-static-nobundle.stderr +++ b/src/test/ui/feature-gates/feature-gate-static-nobundle.stderr @@ -1,5 +1,5 @@ error[E0658]: kind="static-nobundle" is feature gated (see issue #37403) - --> $DIR/feature-gate-static-nobundle.rs:11:1 + --> $DIR/feature-gate-static-nobundle.rs:1:1 | LL | #[link(name="foo", kind="static-nobundle")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-stmt_expr_attributes.rs b/src/test/ui/feature-gates/feature-gate-stmt_expr_attributes.rs index 55706938ae8f2..3e5b6260d74bc 100644 --- a/src/test/ui/feature-gates/feature-gate-stmt_expr_attributes.rs +++ b/src/test/ui/feature-gates/feature-gate-stmt_expr_attributes.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const X: i32 = #[allow(dead_code)] 8; //~^ ERROR attributes on expressions are experimental. (see issue #15701) diff --git a/src/test/ui/feature-gates/feature-gate-stmt_expr_attributes.stderr b/src/test/ui/feature-gates/feature-gate-stmt_expr_attributes.stderr index ad5c263403df3..4318edd9230a0 100644 --- a/src/test/ui/feature-gates/feature-gate-stmt_expr_attributes.stderr +++ b/src/test/ui/feature-gates/feature-gate-stmt_expr_attributes.stderr @@ -1,5 +1,5 @@ error[E0658]: attributes on expressions are experimental. (see issue #15701) - --> $DIR/feature-gate-stmt_expr_attributes.rs:11:16 + --> $DIR/feature-gate-stmt_expr_attributes.rs:1:16 | LL | const X: i32 = #[allow(dead_code)] 8; | ^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-thread_local.rs b/src/test/ui/feature-gates/feature-gate-thread_local.rs index f355c6562c8b0..c47bdc1006c72 100644 --- a/src/test/ui/feature-gates/feature-gate-thread_local.rs +++ b/src/test/ui/feature-gates/feature-gate-thread_local.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that `#[thread_local]` attribute is gated by `thread_local` // feature gate. // diff --git a/src/test/ui/feature-gates/feature-gate-thread_local.stderr b/src/test/ui/feature-gates/feature-gate-thread_local.stderr index 9b44c3f959016..dc7d67a205379 100644 --- a/src/test/ui/feature-gates/feature-gate-thread_local.stderr +++ b/src/test/ui/feature-gates/feature-gate-thread_local.stderr @@ -1,5 +1,5 @@ error[E0658]: `#[thread_local]` is an experimental feature, and does not currently handle destructors. (see issue #29594) - --> $DIR/feature-gate-thread_local.rs:18:1 + --> $DIR/feature-gate-thread_local.rs:8:1 | LL | #[thread_local] //~ ERROR `#[thread_local]` is an experimental feature | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-tool_lints-fail.rs b/src/test/ui/feature-gates/feature-gate-tool_lints-fail.rs index c311eb7ed7ae1..6d0428868853b 100644 --- a/src/test/ui/feature-gates/feature-gate-tool_lints-fail.rs +++ b/src/test/ui/feature-gates/feature-gate-tool_lints-fail.rs @@ -1,12 +1,2 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[warn(clippy::assign_ops)] //~ ERROR scoped lint `clippy::assign_ops` is experimental fn main() {} diff --git a/src/test/ui/feature-gates/feature-gate-tool_lints-fail.stderr b/src/test/ui/feature-gates/feature-gate-tool_lints-fail.stderr index 33ee79cd2011a..18caf803da1f2 100644 --- a/src/test/ui/feature-gates/feature-gate-tool_lints-fail.stderr +++ b/src/test/ui/feature-gates/feature-gate-tool_lints-fail.stderr @@ -1,5 +1,5 @@ error[E0658]: scoped lint `clippy::assign_ops` is experimental (see issue #44690) - --> $DIR/feature-gate-tool_lints-fail.rs:11:8 + --> $DIR/feature-gate-tool_lints-fail.rs:1:8 | LL | #[warn(clippy::assign_ops)] //~ ERROR scoped lint `clippy::assign_ops` is experimental | ^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-tool_lints.rs b/src/test/ui/feature-gates/feature-gate-tool_lints.rs index 3ef67982be9a4..6c31e6e11bdf6 100644 --- a/src/test/ui/feature-gates/feature-gate-tool_lints.rs +++ b/src/test/ui/feature-gates/feature-gate-tool_lints.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[warn(clippy::decimal_literal_representation)] //~^ ERROR scoped lint `clippy::decimal_literal_representation` is experimental fn main() { diff --git a/src/test/ui/feature-gates/feature-gate-tool_lints.stderr b/src/test/ui/feature-gates/feature-gate-tool_lints.stderr index 8019b1e6a28f6..413924edb1c27 100644 --- a/src/test/ui/feature-gates/feature-gate-tool_lints.stderr +++ b/src/test/ui/feature-gates/feature-gate-tool_lints.stderr @@ -1,5 +1,5 @@ error[E0658]: scoped lint `clippy::decimal_literal_representation` is experimental (see issue #44690) - --> $DIR/feature-gate-tool_lints.rs:11:8 + --> $DIR/feature-gate-tool_lints.rs:1:8 | LL | #[warn(clippy::decimal_literal_representation)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-trace_macros.rs b/src/test/ui/feature-gates/feature-gate-trace_macros.rs index 367ee6df50dfe..07159b7b54264 100644 --- a/src/test/ui/feature-gates/feature-gate-trace_macros.rs +++ b/src/test/ui/feature-gates/feature-gate-trace_macros.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { trace_macros!(true); //~ ERROR: `trace_macros` is not stable } diff --git a/src/test/ui/feature-gates/feature-gate-trace_macros.stderr b/src/test/ui/feature-gates/feature-gate-trace_macros.stderr index a31f618bbbe97..9f4b01e45b6a6 100644 --- a/src/test/ui/feature-gates/feature-gate-trace_macros.stderr +++ b/src/test/ui/feature-gates/feature-gate-trace_macros.stderr @@ -1,5 +1,5 @@ error[E0658]: `trace_macros` is not stable enough for use and is subject to change (see issue #29598) - --> $DIR/feature-gate-trace_macros.rs:12:5 + --> $DIR/feature-gate-trace_macros.rs:2:5 | LL | trace_macros!(true); //~ ERROR: `trace_macros` is not stable | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-trivial_bounds-lint.rs b/src/test/ui/feature-gates/feature-gate-trivial_bounds-lint.rs index 2d2d491bd4df3..8f68d5d6dd2d6 100644 --- a/src/test/ui/feature-gates/feature-gate-trivial_bounds-lint.rs +++ b/src/test/ui/feature-gates/feature-gate-trivial_bounds-lint.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass #![allow(unused)] diff --git a/src/test/ui/feature-gates/feature-gate-trivial_bounds.rs b/src/test/ui/feature-gates/feature-gate-trivial_bounds.rs index dba66e0b69bfc..e5028f2f8aa78 100644 --- a/src/test/ui/feature-gates/feature-gate-trivial_bounds.rs +++ b/src/test/ui/feature-gates/feature-gate-trivial_bounds.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused)] #![allow(type_alias_bounds)] diff --git a/src/test/ui/feature-gates/feature-gate-trivial_bounds.stderr b/src/test/ui/feature-gates/feature-gate-trivial_bounds.stderr index f20c1ebb37aa9..04d4e7d7b17ab 100644 --- a/src/test/ui/feature-gates/feature-gate-trivial_bounds.stderr +++ b/src/test/ui/feature-gates/feature-gate-trivial_bounds.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `i32: Foo` is not satisfied - --> $DIR/feature-gate-trivial_bounds.rs:20:1 + --> $DIR/feature-gate-trivial_bounds.rs:10:1 | LL | enum E where i32: Foo { V } //~ ERROR | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Foo` is not implemented for `i32` @@ -8,7 +8,7 @@ LL | enum E where i32: Foo { V } //~ ERROR = help: add #![feature(trivial_bounds)] to the crate attributes to enable error[E0277]: the trait bound `i32: Foo` is not satisfied - --> $DIR/feature-gate-trivial_bounds.rs:22:1 + --> $DIR/feature-gate-trivial_bounds.rs:12:1 | LL | struct S where i32: Foo; //~ ERROR | ^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Foo` is not implemented for `i32` @@ -17,7 +17,7 @@ LL | struct S where i32: Foo; //~ ERROR = help: add #![feature(trivial_bounds)] to the crate attributes to enable error[E0277]: the trait bound `i32: Foo` is not satisfied - --> $DIR/feature-gate-trivial_bounds.rs:24:1 + --> $DIR/feature-gate-trivial_bounds.rs:14:1 | LL | trait T where i32: Foo {} //~ ERROR | ^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Foo` is not implemented for `i32` @@ -26,7 +26,7 @@ LL | trait T where i32: Foo {} //~ ERROR = help: add #![feature(trivial_bounds)] to the crate attributes to enable error[E0277]: the trait bound `i32: Foo` is not satisfied - --> $DIR/feature-gate-trivial_bounds.rs:26:1 + --> $DIR/feature-gate-trivial_bounds.rs:16:1 | LL | union U where i32: Foo { f: i32 } //~ ERROR | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Foo` is not implemented for `i32` @@ -35,7 +35,7 @@ LL | union U where i32: Foo { f: i32 } //~ ERROR = help: add #![feature(trivial_bounds)] to the crate attributes to enable error[E0277]: the trait bound `i32: Foo` is not satisfied - --> $DIR/feature-gate-trivial_bounds.rs:30:1 + --> $DIR/feature-gate-trivial_bounds.rs:20:1 | LL | / impl Foo for () where i32: Foo { //~ ERROR LL | | fn test(&self) { @@ -50,7 +50,7 @@ LL | | } = help: add #![feature(trivial_bounds)] to the crate attributes to enable error[E0277]: the trait bound `i32: Foo` is not satisfied - --> $DIR/feature-gate-trivial_bounds.rs:38:1 + --> $DIR/feature-gate-trivial_bounds.rs:28:1 | LL | / fn f() where i32: Foo //~ ERROR LL | | { @@ -65,7 +65,7 @@ LL | | } = help: add #![feature(trivial_bounds)] to the crate attributes to enable error[E0277]: the trait bound `std::string::String: std::ops::Neg` is not satisfied - --> $DIR/feature-gate-trivial_bounds.rs:46:1 + --> $DIR/feature-gate-trivial_bounds.rs:36:1 | LL | / fn use_op(s: String) -> String where String: ::std::ops::Neg { //~ ERROR LL | | -s @@ -76,7 +76,7 @@ LL | | } = help: add #![feature(trivial_bounds)] to the crate attributes to enable error[E0277]: the trait bound `i32: std::iter::Iterator` is not satisfied - --> $DIR/feature-gate-trivial_bounds.rs:50:1 + --> $DIR/feature-gate-trivial_bounds.rs:40:1 | LL | / fn use_for() where i32: Iterator { //~ ERROR LL | | for _ in 2i32 {} @@ -88,7 +88,7 @@ LL | | } = help: add #![feature(trivial_bounds)] to the crate attributes to enable error[E0277]: the size for values of type `str` cannot be known at compilation time - --> $DIR/feature-gate-trivial_bounds.rs:62:1 + --> $DIR/feature-gate-trivial_bounds.rs:52:1 | LL | struct TwoStrs(str, str) where str: Sized; //~ ERROR | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time @@ -99,7 +99,7 @@ LL | struct TwoStrs(str, str) where str: Sized; //~ ERROR = help: add #![feature(trivial_bounds)] to the crate attributes to enable error[E0277]: the size for values of type `(dyn A + 'static)` cannot be known at compilation time - --> $DIR/feature-gate-trivial_bounds.rs:65:1 + --> $DIR/feature-gate-trivial_bounds.rs:55:1 | LL | / fn unsized_local() where Dst: Sized { //~ ERROR LL | | let x: Dst = *(Box::new(Dst { x: 1 }) as Box>); @@ -113,7 +113,7 @@ LL | | } = help: add #![feature(trivial_bounds)] to the crate attributes to enable error[E0277]: the size for values of type `str` cannot be known at compilation time - --> $DIR/feature-gate-trivial_bounds.rs:69:1 + --> $DIR/feature-gate-trivial_bounds.rs:59:1 | LL | / fn return_str() -> str where str: Sized { //~ ERROR LL | | *"Sized".to_string().into_boxed_str() diff --git a/src/test/ui/feature-gates/feature-gate-try_blocks.rs b/src/test/ui/feature-gates/feature-gate-try_blocks.rs index 6536280c71f09..06cadd82c0731 100644 --- a/src/test/ui/feature-gates/feature-gate-try_blocks.rs +++ b/src/test/ui/feature-gates/feature-gate-try_blocks.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --edition 2018 pub fn main() { diff --git a/src/test/ui/feature-gates/feature-gate-try_blocks.stderr b/src/test/ui/feature-gates/feature-gate-try_blocks.stderr index 29ef2f87b9d0d..209a445194da9 100644 --- a/src/test/ui/feature-gates/feature-gate-try_blocks.stderr +++ b/src/test/ui/feature-gates/feature-gate-try_blocks.stderr @@ -1,5 +1,5 @@ error[E0658]: `try` expression is experimental (see issue #31436) - --> $DIR/feature-gate-try_blocks.rs:14:33 + --> $DIR/feature-gate-try_blocks.rs:4:33 | LL | let try_result: Option<_> = try { //~ ERROR `try` expression is experimental | _________________________________^ diff --git a/src/test/ui/feature-gates/feature-gate-try_reserve.rs b/src/test/ui/feature-gates/feature-gate-try_reserve.rs index 9322dbd272f70..a19dd58da11b3 100644 --- a/src/test/ui/feature-gates/feature-gate-try_reserve.rs +++ b/src/test/ui/feature-gates/feature-gate-try_reserve.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let v = Vec::new(); v.try_reserve(10); //~ ERROR: use of unstable library feature 'try_reserve' diff --git a/src/test/ui/feature-gates/feature-gate-try_reserve.stderr b/src/test/ui/feature-gates/feature-gate-try_reserve.stderr index 928d266b37aec..4ced5037f38ba 100644 --- a/src/test/ui/feature-gates/feature-gate-try_reserve.stderr +++ b/src/test/ui/feature-gates/feature-gate-try_reserve.stderr @@ -1,5 +1,5 @@ error[E0658]: use of unstable library feature 'try_reserve': new API (see issue #48043) - --> $DIR/feature-gate-try_reserve.rs:13:7 + --> $DIR/feature-gate-try_reserve.rs:3:7 | LL | v.try_reserve(10); //~ ERROR: use of unstable library feature 'try_reserve' | ^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-type_ascription.rs b/src/test/ui/feature-gates/feature-gate-type_ascription.rs index d3c07d653f40c..e42e340550681 100644 --- a/src/test/ui/feature-gates/feature-gate-type_ascription.rs +++ b/src/test/ui/feature-gates/feature-gate-type_ascription.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Type ascription is feature gated fn main() { diff --git a/src/test/ui/feature-gates/feature-gate-type_ascription.stderr b/src/test/ui/feature-gates/feature-gate-type_ascription.stderr index 2bd475b68b209..4cf1f29f1ab04 100644 --- a/src/test/ui/feature-gates/feature-gate-type_ascription.stderr +++ b/src/test/ui/feature-gates/feature-gate-type_ascription.stderr @@ -1,5 +1,5 @@ error[E0658]: type ascription is experimental (see issue #23416) - --> $DIR/feature-gate-type_ascription.rs:14:13 + --> $DIR/feature-gate-type_ascription.rs:4:13 | LL | let a = 10: u8; //~ ERROR type ascription is experimental | ^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-unboxed-closures-manual-impls.rs b/src/test/ui/feature-gates/feature-gate-unboxed-closures-manual-impls.rs index 5df309321d310..fc5902721d788 100644 --- a/src/test/ui/feature-gates/feature-gate-unboxed-closures-manual-impls.rs +++ b/src/test/ui/feature-gates/feature-gate-unboxed-closures-manual-impls.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that manual impls of the `Fn` traits are not possible without // a feature gate. In fact, the specialized check for these cases // never triggers (yet), because they encounter other problems around diff --git a/src/test/ui/feature-gates/feature-gate-unboxed-closures-manual-impls.stderr b/src/test/ui/feature-gates/feature-gate-unboxed-closures-manual-impls.stderr index 6dfcdfc256710..0e40e1fddb0c7 100644 --- a/src/test/ui/feature-gates/feature-gate-unboxed-closures-manual-impls.stderr +++ b/src/test/ui/feature-gates/feature-gate-unboxed-closures-manual-impls.stderr @@ -1,5 +1,5 @@ error[E0658]: rust-call ABI is subject to change (see issue #29625) - --> $DIR/feature-gate-unboxed-closures-manual-impls.rs:20:5 + --> $DIR/feature-gate-unboxed-closures-manual-impls.rs:10:5 | LL | extern "rust-call" fn call(self, args: ()) -> () {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | extern "rust-call" fn call(self, args: ()) -> () {} = help: add #![feature(unboxed_closures)] to the crate attributes to enable error[E0658]: rust-call ABI is subject to change (see issue #29625) - --> $DIR/feature-gate-unboxed-closures-manual-impls.rs:25:5 + --> $DIR/feature-gate-unboxed-closures-manual-impls.rs:15:5 | LL | extern "rust-call" fn call_once(self, args: ()) -> () {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -15,7 +15,7 @@ LL | extern "rust-call" fn call_once(self, args: ()) -> () {} = help: add #![feature(unboxed_closures)] to the crate attributes to enable error[E0658]: rust-call ABI is subject to change (see issue #29625) - --> $DIR/feature-gate-unboxed-closures-manual-impls.rs:30:5 + --> $DIR/feature-gate-unboxed-closures-manual-impls.rs:20:5 | LL | extern "rust-call" fn call_mut(&self, args: ()) -> () {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -23,7 +23,7 @@ LL | extern "rust-call" fn call_mut(&self, args: ()) -> () {} = help: add #![feature(unboxed_closures)] to the crate attributes to enable error[E0658]: rust-call ABI is subject to change (see issue #29625) - --> $DIR/feature-gate-unboxed-closures-manual-impls.rs:35:5 + --> $DIR/feature-gate-unboxed-closures-manual-impls.rs:25:5 | LL | extern "rust-call" fn call_once(&self, args: ()) -> () {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-unboxed-closures-method-calls.rs b/src/test/ui/feature-gates/feature-gate-unboxed-closures-method-calls.rs index 253d1633b1c4e..42f7c5f0fbaa8 100644 --- a/src/test/ui/feature-gates/feature-gate-unboxed-closures-method-calls.rs +++ b/src/test/ui/feature-gates/feature-gate-unboxed-closures-method-calls.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] fn foo(mut f: F) { diff --git a/src/test/ui/feature-gates/feature-gate-unboxed-closures-method-calls.stderr b/src/test/ui/feature-gates/feature-gate-unboxed-closures-method-calls.stderr index cc8615d3620e1..8730bf678fd34 100644 --- a/src/test/ui/feature-gates/feature-gate-unboxed-closures-method-calls.stderr +++ b/src/test/ui/feature-gates/feature-gate-unboxed-closures-method-calls.stderr @@ -1,5 +1,5 @@ error[E0658]: use of unstable library feature 'fn_traits' (see issue #29625) - --> $DIR/feature-gate-unboxed-closures-method-calls.rs:14:7 + --> $DIR/feature-gate-unboxed-closures-method-calls.rs:4:7 | LL | f.call(()); //~ ERROR use of unstable library feature 'fn_traits' | ^^^^ @@ -7,7 +7,7 @@ LL | f.call(()); //~ ERROR use of unstable library feature 'fn_traits' = help: add #![feature(fn_traits)] to the crate attributes to enable error[E0658]: use of unstable library feature 'fn_traits' (see issue #29625) - --> $DIR/feature-gate-unboxed-closures-method-calls.rs:15:7 + --> $DIR/feature-gate-unboxed-closures-method-calls.rs:5:7 | LL | f.call_mut(()); //~ ERROR use of unstable library feature 'fn_traits' | ^^^^^^^^ @@ -15,7 +15,7 @@ LL | f.call_mut(()); //~ ERROR use of unstable library feature 'fn_traits' = help: add #![feature(fn_traits)] to the crate attributes to enable error[E0658]: use of unstable library feature 'fn_traits' (see issue #29625) - --> $DIR/feature-gate-unboxed-closures-method-calls.rs:16:7 + --> $DIR/feature-gate-unboxed-closures-method-calls.rs:6:7 | LL | f.call_once(()); //~ ERROR use of unstable library feature 'fn_traits' | ^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-unboxed-closures-ufcs-calls.rs b/src/test/ui/feature-gates/feature-gate-unboxed-closures-ufcs-calls.rs index 902b3c1774c1d..25c90492eb8f2 100644 --- a/src/test/ui/feature-gates/feature-gate-unboxed-closures-ufcs-calls.rs +++ b/src/test/ui/feature-gates/feature-gate-unboxed-closures-ufcs-calls.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] fn foo(mut f: F) { diff --git a/src/test/ui/feature-gates/feature-gate-unboxed-closures-ufcs-calls.stderr b/src/test/ui/feature-gates/feature-gate-unboxed-closures-ufcs-calls.stderr index 26dd983e877df..266775484a901 100644 --- a/src/test/ui/feature-gates/feature-gate-unboxed-closures-ufcs-calls.stderr +++ b/src/test/ui/feature-gates/feature-gate-unboxed-closures-ufcs-calls.stderr @@ -1,5 +1,5 @@ error[E0658]: use of unstable library feature 'fn_traits' (see issue #29625) - --> $DIR/feature-gate-unboxed-closures-ufcs-calls.rs:14:5 + --> $DIR/feature-gate-unboxed-closures-ufcs-calls.rs:4:5 | LL | Fn::call(&f, ()); //~ ERROR use of unstable library feature 'fn_traits' | ^^^^^^^^ @@ -7,7 +7,7 @@ LL | Fn::call(&f, ()); //~ ERROR use of unstable library feature 'fn_traits' = help: add #![feature(fn_traits)] to the crate attributes to enable error[E0658]: use of unstable library feature 'fn_traits' (see issue #29625) - --> $DIR/feature-gate-unboxed-closures-ufcs-calls.rs:15:5 + --> $DIR/feature-gate-unboxed-closures-ufcs-calls.rs:5:5 | LL | FnMut::call_mut(&mut f, ()); //~ ERROR use of unstable library feature 'fn_traits' | ^^^^^^^^^^^^^^^ @@ -15,7 +15,7 @@ LL | FnMut::call_mut(&mut f, ()); //~ ERROR use of unstable library feature = help: add #![feature(fn_traits)] to the crate attributes to enable error[E0658]: use of unstable library feature 'fn_traits' (see issue #29625) - --> $DIR/feature-gate-unboxed-closures-ufcs-calls.rs:16:5 + --> $DIR/feature-gate-unboxed-closures-ufcs-calls.rs:6:5 | LL | FnOnce::call_once(f, ()); //~ ERROR use of unstable library feature 'fn_traits' | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-unboxed-closures.rs b/src/test/ui/feature-gates/feature-gate-unboxed-closures.rs index 4005021774443..4c0d7d14a5064 100644 --- a/src/test/ui/feature-gates/feature-gate-unboxed-closures.rs +++ b/src/test/ui/feature-gates/feature-gate-unboxed-closures.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Test; impl FnOnce<(u32, u32)> for Test { diff --git a/src/test/ui/feature-gates/feature-gate-unboxed-closures.stderr b/src/test/ui/feature-gates/feature-gate-unboxed-closures.stderr index a5b1ed9bbc4fc..420b331ccccb3 100644 --- a/src/test/ui/feature-gates/feature-gate-unboxed-closures.stderr +++ b/src/test/ui/feature-gates/feature-gate-unboxed-closures.stderr @@ -1,5 +1,5 @@ error[E0658]: rust-call ABI is subject to change (see issue #29625) - --> $DIR/feature-gate-unboxed-closures.rs:16:5 + --> $DIR/feature-gate-unboxed-closures.rs:6:5 | LL | / extern "rust-call" fn call_once(self, (a, b): (u32, u32)) -> u32 { LL | | a + b diff --git a/src/test/ui/feature-gates/feature-gate-underscore-imports.rs b/src/test/ui/feature-gates/feature-gate-underscore-imports.rs index ceb8afe124a8c..6a4122670e7f1 100644 --- a/src/test/ui/feature-gates/feature-gate-underscore-imports.rs +++ b/src/test/ui/feature-gates/feature-gate-underscore-imports.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate std as _; //~ ERROR renaming extern crates with `_` is unstable use std::vec as _; //~ ERROR renaming imports with `_` is unstable diff --git a/src/test/ui/feature-gates/feature-gate-underscore-imports.stderr b/src/test/ui/feature-gates/feature-gate-underscore-imports.stderr index 2eea95260d5e5..ee8d0d22b525e 100644 --- a/src/test/ui/feature-gates/feature-gate-underscore-imports.stderr +++ b/src/test/ui/feature-gates/feature-gate-underscore-imports.stderr @@ -1,5 +1,5 @@ error[E0658]: renaming extern crates with `_` is unstable (see issue #48216) - --> $DIR/feature-gate-underscore-imports.rs:11:1 + --> $DIR/feature-gate-underscore-imports.rs:1:1 | LL | extern crate std as _; //~ ERROR renaming extern crates with `_` is unstable | ^^^^^^^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | extern crate std as _; //~ ERROR renaming extern crates with `_` is unstabl = help: add #![feature(underscore_imports)] to the crate attributes to enable error[E0658]: renaming imports with `_` is unstable (see issue #48216) - --> $DIR/feature-gate-underscore-imports.rs:12:5 + --> $DIR/feature-gate-underscore-imports.rs:2:5 | LL | use std::vec as _; //~ ERROR renaming imports with `_` is unstable | ^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-uniform-paths.rs b/src/test/ui/feature-gates/feature-gate-uniform-paths.rs index 140655d52bd46..6be875a67da4f 100644 --- a/src/test/ui/feature-gates/feature-gate-uniform-paths.rs +++ b/src/test/ui/feature-gates/feature-gate-uniform-paths.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod foo { pub use bar::Bar; //~^ ERROR unresolved import `bar` diff --git a/src/test/ui/feature-gates/feature-gate-uniform-paths.stderr b/src/test/ui/feature-gates/feature-gate-uniform-paths.stderr index 68faacfcbe75e..65644cc98bdb2 100644 --- a/src/test/ui/feature-gates/feature-gate-uniform-paths.stderr +++ b/src/test/ui/feature-gates/feature-gate-uniform-paths.stderr @@ -1,5 +1,5 @@ error[E0432]: unresolved import `bar` - --> $DIR/feature-gate-uniform-paths.rs:12:13 + --> $DIR/feature-gate-uniform-paths.rs:2:13 | LL | pub use bar::Bar; | ^^^ Did you mean `self::bar`? diff --git a/src/test/ui/feature-gates/feature-gate-unrestricted-attribute-tokens.rs b/src/test/ui/feature-gates/feature-gate-unrestricted-attribute-tokens.rs index daebbe658a23b..181c8592c547b 100644 --- a/src/test/ui/feature-gates/feature-gate-unrestricted-attribute-tokens.rs +++ b/src/test/ui/feature-gates/feature-gate-unrestricted-attribute-tokens.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(custom_attribute)] #[my_attr(a b c d)] diff --git a/src/test/ui/feature-gates/feature-gate-unrestricted-attribute-tokens.stderr b/src/test/ui/feature-gates/feature-gate-unrestricted-attribute-tokens.stderr index cc5694b1598d3..1ddf2ff6d640b 100644 --- a/src/test/ui/feature-gates/feature-gate-unrestricted-attribute-tokens.stderr +++ b/src/test/ui/feature-gates/feature-gate-unrestricted-attribute-tokens.stderr @@ -1,17 +1,17 @@ error: expected one of `(`, `)`, `,`, `::`, or `=`, found `b` - --> $DIR/feature-gate-unrestricted-attribute-tokens.rs:13:13 + --> $DIR/feature-gate-unrestricted-attribute-tokens.rs:3:13 | LL | #[my_attr(a b c d)] | ^ expected one of `(`, `)`, `,`, `::`, or `=` here error: expected one of `(`, `)`, `,`, `::`, or `=`, found `c` - --> $DIR/feature-gate-unrestricted-attribute-tokens.rs:13:15 + --> $DIR/feature-gate-unrestricted-attribute-tokens.rs:3:15 | LL | #[my_attr(a b c d)] | ^ expected one of `(`, `)`, `,`, `::`, or `=` here error: expected one of `(`, `)`, `,`, `::`, or `=`, found `d` - --> $DIR/feature-gate-unrestricted-attribute-tokens.rs:13:17 + --> $DIR/feature-gate-unrestricted-attribute-tokens.rs:3:17 | LL | #[my_attr(a b c d)] | ^ expected one of `(`, `)`, `,`, `::`, or `=` here diff --git a/src/test/ui/feature-gates/feature-gate-unsized_tuple_coercion.rs b/src/test/ui/feature-gates/feature-gate-unsized_tuple_coercion.rs index 8a43e75494d81..f781bc9aeddd1 100644 --- a/src/test/ui/feature-gates/feature-gate-unsized_tuple_coercion.rs +++ b/src/test/ui/feature-gates/feature-gate-unsized_tuple_coercion.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let _ : &(Send,) = &((),); //~^ ERROR unsized tuple coercion is not stable enough diff --git a/src/test/ui/feature-gates/feature-gate-unsized_tuple_coercion.stderr b/src/test/ui/feature-gates/feature-gate-unsized_tuple_coercion.stderr index 08c15855a6a42..c2f5df48fed46 100644 --- a/src/test/ui/feature-gates/feature-gate-unsized_tuple_coercion.stderr +++ b/src/test/ui/feature-gates/feature-gate-unsized_tuple_coercion.stderr @@ -1,5 +1,5 @@ error[E0658]: unsized tuple coercion is not stable enough for use and is subject to change (see issue #42877) - --> $DIR/feature-gate-unsized_tuple_coercion.rs:12:24 + --> $DIR/feature-gate-unsized_tuple_coercion.rs:2:24 | LL | let _ : &(Send,) = &((),); | ^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-untagged_unions.rs b/src/test/ui/feature-gates/feature-gate-untagged_unions.rs index 6533fddd94714..3bac3d853e907 100644 --- a/src/test/ui/feature-gates/feature-gate-untagged_unions.rs +++ b/src/test/ui/feature-gates/feature-gate-untagged_unions.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - union U1 { // OK a: u8, } diff --git a/src/test/ui/feature-gates/feature-gate-untagged_unions.stderr b/src/test/ui/feature-gates/feature-gate-untagged_unions.stderr index e0c845b77685a..f9f8cfe9171a9 100644 --- a/src/test/ui/feature-gates/feature-gate-untagged_unions.stderr +++ b/src/test/ui/feature-gates/feature-gate-untagged_unions.stderr @@ -1,5 +1,5 @@ error[E0658]: unions with non-`Copy` fields are unstable (see issue #32836) - --> $DIR/feature-gate-untagged_unions.rs:19:1 + --> $DIR/feature-gate-untagged_unions.rs:9:1 | LL | / union U3 { //~ ERROR unions with non-`Copy` fields are unstable LL | | a: String, @@ -9,7 +9,7 @@ LL | | } = help: add #![feature(untagged_unions)] to the crate attributes to enable error[E0658]: unions with non-`Copy` fields are unstable (see issue #32836) - --> $DIR/feature-gate-untagged_unions.rs:23:1 + --> $DIR/feature-gate-untagged_unions.rs:13:1 | LL | / union U4 { //~ ERROR unions with non-`Copy` fields are unstable LL | | a: T, @@ -19,7 +19,7 @@ LL | | } = help: add #![feature(untagged_unions)] to the crate attributes to enable error[E0658]: unions with `Drop` implementations are unstable (see issue #32836) - --> $DIR/feature-gate-untagged_unions.rs:27:1 + --> $DIR/feature-gate-untagged_unions.rs:17:1 | LL | / union U5 { //~ ERROR unions with `Drop` implementations are unstable LL | | a: u8, diff --git a/src/test/ui/feature-gates/feature-gate-unwind-attributes.rs b/src/test/ui/feature-gates/feature-gate-unwind-attributes.rs index 681842e30e006..6dda2c5551358 100644 --- a/src/test/ui/feature-gates/feature-gate-unwind-attributes.rs +++ b/src/test/ui/feature-gates/feature-gate-unwind-attributes.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C no-prepopulate-passes -Cpasses=name-anon-globals #![crate_type = "lib"] diff --git a/src/test/ui/feature-gates/feature-gate-unwind-attributes.stderr b/src/test/ui/feature-gates/feature-gate-unwind-attributes.stderr index 4c6e6f420de3b..e558712afd13b 100644 --- a/src/test/ui/feature-gates/feature-gate-unwind-attributes.stderr +++ b/src/test/ui/feature-gates/feature-gate-unwind-attributes.stderr @@ -1,5 +1,5 @@ error[E0658]: #[unwind] is experimental - --> $DIR/feature-gate-unwind-attributes.rs:21:5 + --> $DIR/feature-gate-unwind-attributes.rs:11:5 | LL | #[unwind] //~ ERROR #[unwind] is experimental | ^^^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-used.rs b/src/test/ui/feature-gates/feature-gate-used.rs index 68679d7dac896..68eadc2f84363 100644 --- a/src/test/ui/feature-gates/feature-gate-used.rs +++ b/src/test/ui/feature-gates/feature-gate-used.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[used] fn foo() {} //~^^ ERROR the `#[used]` attribute is an experimental feature diff --git a/src/test/ui/feature-gates/feature-gate-used.stderr b/src/test/ui/feature-gates/feature-gate-used.stderr index d650b5ebb3b19..eb47e68d9c232 100644 --- a/src/test/ui/feature-gates/feature-gate-used.stderr +++ b/src/test/ui/feature-gates/feature-gate-used.stderr @@ -1,5 +1,5 @@ error[E0658]: the `#[used]` attribute is an experimental feature (see issue #40289) - --> $DIR/feature-gate-used.rs:11:1 + --> $DIR/feature-gate-used.rs:1:1 | LL | #[used] | ^^^^^^^ diff --git a/src/test/ui/feature-gates/feature-gate-without_gate_irrefutable_pattern.rs b/src/test/ui/feature-gates/feature-gate-without_gate_irrefutable_pattern.rs index 7bcddbb6a2f16..6cf2d29055e4d 100644 --- a/src/test/ui/feature-gates/feature-gate-without_gate_irrefutable_pattern.rs +++ b/src/test/ui/feature-gates/feature-gate-without_gate_irrefutable_pattern.rs @@ -1,14 +1,5 @@ // gate-test-irrefutable_let_patterns -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #[allow(irrefutable_let_patterns)] fn main() { diff --git a/src/test/ui/feature-gates/feature-gate-without_gate_irrefutable_pattern.stderr b/src/test/ui/feature-gates/feature-gate-without_gate_irrefutable_pattern.stderr index 2b23962a3042e..fa8b74ffecf3a 100644 --- a/src/test/ui/feature-gates/feature-gate-without_gate_irrefutable_pattern.stderr +++ b/src/test/ui/feature-gates/feature-gate-without_gate_irrefutable_pattern.stderr @@ -1,5 +1,5 @@ error[E0162]: irrefutable if-let pattern - --> $DIR/feature-gate-without_gate_irrefutable_pattern.rs:15:12 + --> $DIR/feature-gate-without_gate_irrefutable_pattern.rs:6:12 | LL | if let _ = 5 {} | ^ irrefutable pattern diff --git a/src/test/ui/float-literal-inference-restrictions.rs b/src/test/ui/float-literal-inference-restrictions.rs index 1e58df69f1664..34079b61e67b4 100644 --- a/src/test/ui/float-literal-inference-restrictions.rs +++ b/src/test/ui/float-literal-inference-restrictions.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x: f32 = 1; //~ ERROR mismatched types let y: f32 = 1f64; //~ ERROR mismatched types diff --git a/src/test/ui/float-literal-inference-restrictions.stderr b/src/test/ui/float-literal-inference-restrictions.stderr index da8f6ed42f9b3..ea12c9caa77cc 100644 --- a/src/test/ui/float-literal-inference-restrictions.stderr +++ b/src/test/ui/float-literal-inference-restrictions.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/float-literal-inference-restrictions.rs:12:18 + --> $DIR/float-literal-inference-restrictions.rs:2:18 | LL | let x: f32 = 1; //~ ERROR mismatched types | ^ @@ -11,7 +11,7 @@ LL | let x: f32 = 1; //~ ERROR mismatched types found type `{integer}` error[E0308]: mismatched types - --> $DIR/float-literal-inference-restrictions.rs:13:18 + --> $DIR/float-literal-inference-restrictions.rs:3:18 | LL | let y: f32 = 1f64; //~ ERROR mismatched types | ^^^^ expected f32, found f64 diff --git a/src/test/ui/fmt/format-string-error.rs b/src/test/ui/fmt/format-string-error.rs index f39110ebc5dcc..6d2837e35b714 100644 --- a/src/test/ui/fmt/format-string-error.rs +++ b/src/test/ui/fmt/format-string-error.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-tab fn main() { diff --git a/src/test/ui/fmt/format-string-error.stderr b/src/test/ui/fmt/format-string-error.stderr index 9c84fd2521891..4dffec4561802 100644 --- a/src/test/ui/fmt/format-string-error.stderr +++ b/src/test/ui/fmt/format-string-error.stderr @@ -1,5 +1,5 @@ error: invalid format string: expected `'}'` but string was terminated - --> $DIR/format-string-error.rs:14:16 + --> $DIR/format-string-error.rs:4:16 | LL | println!("{"); | ^ expected `'}'` in format string @@ -7,7 +7,7 @@ LL | println!("{"); = note: if you intended to print `{`, you can escape it using `{{` error: invalid format string: unmatched `}` found - --> $DIR/format-string-error.rs:17:15 + --> $DIR/format-string-error.rs:7:15 | LL | println!("}"); | ^ unmatched `}` in format string @@ -15,7 +15,7 @@ LL | println!("}"); = note: if you intended to print `}`, you can escape it using `}}` error: invalid format string: invalid argument name `_foo` - --> $DIR/format-string-error.rs:19:23 + --> $DIR/format-string-error.rs:9:23 | LL | let _ = format!("{_foo}", _foo = 6usize); | ^^^^ invalid argument name in format string @@ -23,7 +23,7 @@ LL | let _ = format!("{_foo}", _foo = 6usize); = note: argument names cannot start with an underscore error: invalid format string: invalid argument name `_` - --> $DIR/format-string-error.rs:21:23 + --> $DIR/format-string-error.rs:11:23 | LL | let _ = format!("{_}", _ = 6usize); | ^ invalid argument name in format string @@ -31,7 +31,7 @@ LL | let _ = format!("{_}", _ = 6usize); = note: argument names cannot start with an underscore error: invalid format string: expected `'}'` but string was terminated - --> $DIR/format-string-error.rs:23:23 + --> $DIR/format-string-error.rs:13:23 | LL | let _ = format!("{"); | ^ expected `'}'` in format string @@ -39,7 +39,7 @@ LL | let _ = format!("{"); = note: if you intended to print `{`, you can escape it using `{{` error: invalid format string: unmatched `}` found - --> $DIR/format-string-error.rs:25:22 + --> $DIR/format-string-error.rs:15:22 | LL | let _ = format!("}"); | ^ unmatched `}` in format string @@ -47,13 +47,13 @@ LL | let _ = format!("}"); = note: if you intended to print `}`, you can escape it using `}}` error: invalid format string: expected `'}'`, found `'/'` - --> $DIR/format-string-error.rs:27:23 + --> $DIR/format-string-error.rs:17:23 | LL | let _ = format!("{/}"); | ^ expected `}` in format string error: invalid format string: expected `'}'` but string was terminated - --> $DIR/format-string-error.rs:29:29 + --> $DIR/format-string-error.rs:19:29 | LL | let _ = format!("/n/n/n{/n/n/n"); | ^ expected `'}'` in format string @@ -61,7 +61,7 @@ LL | let _ = format!("/n/n/n{/n/n/n"); = note: if you intended to print `{`, you can escape it using `{{` error: invalid format string: expected `'}'` but string was terminated - --> $DIR/format-string-error.rs:35:3 + --> $DIR/format-string-error.rs:25:3 | LL | {"###); | ^ expected `'}'` in format string @@ -69,7 +69,7 @@ LL | {"###); = note: if you intended to print `{`, you can escape it using `{{` error: invalid format string: expected `'}'` but string was terminated - --> $DIR/format-string-error.rs:42:1 + --> $DIR/format-string-error.rs:32:1 | LL | | ^ expected `'}'` in format string @@ -77,7 +77,7 @@ LL | = note: if you intended to print `{`, you can escape it using `{{` error: invalid format string: unmatched `}` found - --> $DIR/format-string-error.rs:49:2 + --> $DIR/format-string-error.rs:39:2 | LL | } | ^ unmatched `}` in format string @@ -85,7 +85,7 @@ LL | } = note: if you intended to print `}`, you can escape it using `}}` error: invalid format string: unmatched `}` found - --> $DIR/format-string-error.rs:57:9 + --> $DIR/format-string-error.rs:47:9 | LL | } | ^ unmatched `}` in format string diff --git a/src/test/ui/fmt/send-sync.rs b/src/test/ui/fmt/send-sync.rs index 424919a0eba67..95ec68d1d5e4c 100644 --- a/src/test/ui/fmt/send-sync.rs +++ b/src/test/ui/fmt/send-sync.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn send(_: T) {} fn sync(_: T) {} diff --git a/src/test/ui/fmt/send-sync.stderr b/src/test/ui/fmt/send-sync.stderr index 0d9239d72276e..5abe0d0c50b4f 100644 --- a/src/test/ui/fmt/send-sync.stderr +++ b/src/test/ui/fmt/send-sync.stderr @@ -1,5 +1,5 @@ error[E0277]: `*mut (dyn std::ops::Fn() + 'static)` cannot be shared between threads safely - --> $DIR/send-sync.rs:18:5 + --> $DIR/send-sync.rs:8:5 | LL | send(format_args!("{:?}", c)); //~ ERROR E0277 | ^^^^ `*mut (dyn std::ops::Fn() + 'static)` cannot be shared between threads safely @@ -13,13 +13,13 @@ LL | send(format_args!("{:?}", c)); //~ ERROR E0277 = note: required because of the requirements on the impl of `std::marker::Send` for `&[std::fmt::ArgumentV1<'_>]` = note: required because it appears within the type `std::fmt::Arguments<'_>` note: required by `send` - --> $DIR/send-sync.rs:11:1 + --> $DIR/send-sync.rs:1:1 | LL | fn send(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: `*mut (dyn std::ops::Fn() + 'static)` cannot be shared between threads safely - --> $DIR/send-sync.rs:19:5 + --> $DIR/send-sync.rs:9:5 | LL | sync(format_args!("{:?}", c)); //~ ERROR E0277 | ^^^^ `*mut (dyn std::ops::Fn() + 'static)` cannot be shared between threads safely @@ -33,7 +33,7 @@ LL | sync(format_args!("{:?}", c)); //~ ERROR E0277 = note: required because it appears within the type `&[std::fmt::ArgumentV1<'_>]` = note: required because it appears within the type `std::fmt::Arguments<'_>` note: required by `sync` - --> $DIR/send-sync.rs:12:1 + --> $DIR/send-sync.rs:2:1 | LL | fn sync(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/fn/fn-bad-block-type.rs b/src/test/ui/fn/fn-bad-block-type.rs index c5c355cfbce84..01dcff05881b3 100644 --- a/src/test/ui/fn/fn-bad-block-type.rs +++ b/src/test/ui/fn/fn-bad-block-type.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:mismatched types fn f() -> isize { true } diff --git a/src/test/ui/fn/fn-bad-block-type.stderr b/src/test/ui/fn/fn-bad-block-type.stderr index 23d76e5453156..5abee94653afb 100644 --- a/src/test/ui/fn/fn-bad-block-type.stderr +++ b/src/test/ui/fn/fn-bad-block-type.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/fn-bad-block-type.rs:13:19 + --> $DIR/fn-bad-block-type.rs:3:19 | LL | fn f() -> isize { true } | ----- ^^^^ expected isize, found bool diff --git a/src/test/ui/fn/fn-closure-mutable-capture.nll.stderr b/src/test/ui/fn/fn-closure-mutable-capture.nll.stderr index ff06256088fa2..f7ab56da8de97 100644 --- a/src/test/ui/fn/fn-closure-mutable-capture.nll.stderr +++ b/src/test/ui/fn/fn-closure-mutable-capture.nll.stderr @@ -1,11 +1,11 @@ error[E0594]: cannot assign to `x`, as it is a captured variable in a `Fn` closure - --> $DIR/fn-closure-mutable-capture.rs:15:17 + --> $DIR/fn-closure-mutable-capture.rs:5:17 | LL | bar(move || x = 1); | ^^^^^ cannot assign | help: consider changing this to accept closures that implement `FnMut` - --> $DIR/fn-closure-mutable-capture.rs:15:9 + --> $DIR/fn-closure-mutable-capture.rs:5:9 | LL | bar(move || x = 1); | ^^^^^^^^^^^^^ diff --git a/src/test/ui/fn/fn-closure-mutable-capture.rs b/src/test/ui/fn/fn-closure-mutable-capture.rs index 385efebd59008..a37eceffb9dae 100644 --- a/src/test/ui/fn/fn-closure-mutable-capture.rs +++ b/src/test/ui/fn/fn-closure-mutable-capture.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn bar(_f: F) {} pub fn foo() { diff --git a/src/test/ui/fn/fn-closure-mutable-capture.stderr b/src/test/ui/fn/fn-closure-mutable-capture.stderr index a58d663dc0ab7..84a5989c28c09 100644 --- a/src/test/ui/fn/fn-closure-mutable-capture.stderr +++ b/src/test/ui/fn/fn-closure-mutable-capture.stderr @@ -1,12 +1,12 @@ error[E0594]: cannot assign to captured outer variable in an `Fn` closure - --> $DIR/fn-closure-mutable-capture.rs:15:17 + --> $DIR/fn-closure-mutable-capture.rs:5:17 | LL | bar(move || x = 1); | ^^^^^ | = note: `Fn` closures cannot capture their enclosing environment for modifications help: consider changing this closure to take self by mutable reference - --> $DIR/fn-closure-mutable-capture.rs:15:9 + --> $DIR/fn-closure-mutable-capture.rs:5:9 | LL | bar(move || x = 1); | ^^^^^^^^^^^^^ diff --git a/src/test/ui/fn/fn-compare-mismatch.rs b/src/test/ui/fn/fn-compare-mismatch.rs index 27be1ada44550..d734d54e8b0a8 100644 --- a/src/test/ui/fn/fn-compare-mismatch.rs +++ b/src/test/ui/fn/fn-compare-mismatch.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { fn f() { } fn g() { } diff --git a/src/test/ui/fn/fn-compare-mismatch.stderr b/src/test/ui/fn/fn-compare-mismatch.stderr index 995a17e01bf15..54dae525ffd0e 100644 --- a/src/test/ui/fn/fn-compare-mismatch.stderr +++ b/src/test/ui/fn/fn-compare-mismatch.stderr @@ -1,5 +1,5 @@ error[E0369]: binary operation `==` cannot be applied to type `fn() {main::f}` - --> $DIR/fn-compare-mismatch.rs:14:13 + --> $DIR/fn-compare-mismatch.rs:4:13 | LL | let x = f == g; | ^^^^^^ @@ -7,7 +7,7 @@ LL | let x = f == g; = note: an implementation of `std::cmp::PartialEq` might be missing for `fn() {main::f}` error[E0308]: mismatched types - --> $DIR/fn-compare-mismatch.rs:14:18 + --> $DIR/fn-compare-mismatch.rs:4:18 | LL | let x = f == g; | ^ expected fn item, found a different fn item diff --git a/src/test/ui/fn/fn-item-type.rs b/src/test/ui/fn/fn-item-type.rs index 6217a9f16b935..e71172d722981 100644 --- a/src/test/ui/fn/fn-item-type.rs +++ b/src/test/ui/fn/fn-item-type.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the types of distinct fn items are not compatible by // default. See also `run-pass/fn-item-type-*.rs`. diff --git a/src/test/ui/fn/fn-item-type.stderr b/src/test/ui/fn/fn-item-type.stderr index 59dd4b294aacb..d52646c0c4b4e 100644 --- a/src/test/ui/fn/fn-item-type.stderr +++ b/src/test/ui/fn/fn-item-type.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/fn-item-type.rs:23:19 + --> $DIR/fn-item-type.rs:13:19 | LL | eq(foo::, bar::); | ^^^^^^^^^ expected fn item, found a different fn item @@ -8,7 +8,7 @@ LL | eq(foo::, bar::); found type `fn(isize) -> isize {bar::}` error[E0308]: mismatched types - --> $DIR/fn-item-type.rs:29:19 + --> $DIR/fn-item-type.rs:19:19 | LL | eq(foo::, foo::); | ^^^^^^^^^ expected u8, found i8 @@ -17,7 +17,7 @@ LL | eq(foo::, foo::); found type `fn(isize) -> isize {foo::}` error[E0308]: mismatched types - --> $DIR/fn-item-type.rs:33:23 + --> $DIR/fn-item-type.rs:23:23 | LL | eq(bar::, bar::>); | ^^^^^^^^^^^^^^ expected struct `std::string::String`, found struct `std::vec::Vec` @@ -26,7 +26,7 @@ LL | eq(bar::, bar::>); found type `fn(isize) -> isize {bar::>}` error[E0308]: mismatched types - --> $DIR/fn-item-type.rs:40:26 + --> $DIR/fn-item-type.rs:30:26 | LL | eq(::foo, ::foo); | ^^^^^^^^^^^^^^^^^ expected u8, found u16 diff --git a/src/test/ui/fn/fn-trait-formatting.rs b/src/test/ui/fn/fn-trait-formatting.rs index ac7b0a6098462..21da39dd4004f 100644 --- a/src/test/ui/fn/fn-trait-formatting.rs +++ b/src/test/ui/fn/fn-trait-formatting.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn needs_fn(x: F) where F: Fn(isize) -> isize {} diff --git a/src/test/ui/fn/fn-trait-formatting.stderr b/src/test/ui/fn/fn-trait-formatting.stderr index 198b343cdd3e7..bbccb57a1e218 100644 --- a/src/test/ui/fn/fn-trait-formatting.stderr +++ b/src/test/ui/fn/fn-trait-formatting.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/fn-trait-formatting.rs:16:17 + --> $DIR/fn-trait-formatting.rs:6:17 | LL | let _: () = (box |_: isize| {}) as Box; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected (), found struct `std::boxed::Box` @@ -8,7 +8,7 @@ LL | let _: () = (box |_: isize| {}) as Box; found type `std::boxed::Box` error[E0308]: mismatched types - --> $DIR/fn-trait-formatting.rs:20:17 + --> $DIR/fn-trait-formatting.rs:10:17 | LL | let _: () = (box |_: isize, isize| {}) as Box; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected (), found struct `std::boxed::Box` @@ -17,7 +17,7 @@ LL | let _: () = (box |_: isize, isize| {}) as Box; found type `std::boxed::Box` error[E0308]: mismatched types - --> $DIR/fn-trait-formatting.rs:24:17 + --> $DIR/fn-trait-formatting.rs:14:17 | LL | let _: () = (box || -> isize { unimplemented!() }) as Box isize>; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected (), found struct `std::boxed::Box` @@ -26,14 +26,14 @@ LL | let _: () = (box || -> isize { unimplemented!() }) as Box is found type `std::boxed::Box isize>` error[E0277]: expected a `std::ops::Fn<(isize,)>` closure, found `{integer}` - --> $DIR/fn-trait-formatting.rs:29:5 + --> $DIR/fn-trait-formatting.rs:19:5 | LL | needs_fn(1); | ^^^^^^^^ expected an `Fn<(isize,)>` closure, found `{integer}` | = help: the trait `std::ops::Fn<(isize,)>` is not implemented for `{integer}` note: required by `needs_fn` - --> $DIR/fn-trait-formatting.rs:13:1 + --> $DIR/fn-trait-formatting.rs:3:1 | LL | fn needs_fn(x: F) where F: Fn(isize) -> isize {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/fn_must_use.rs b/src/test/ui/fn_must_use.rs index def23046db21d..7f2e189107e91 100644 --- a/src/test/ui/fn_must_use.rs +++ b/src/test/ui/fn_must_use.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![warn(unused_must_use)] diff --git a/src/test/ui/fn_must_use.stderr b/src/test/ui/fn_must_use.stderr index b5bad22f3dc78..f9de13fdabf68 100644 --- a/src/test/ui/fn_must_use.stderr +++ b/src/test/ui/fn_must_use.stderr @@ -1,24 +1,24 @@ warning: unused return value of `need_to_use_this_value` which must be used - --> $DIR/fn_must_use.rs:60:5 + --> $DIR/fn_must_use.rs:50:5 | LL | need_to_use_this_value(); //~ WARN unused return value | ^^^^^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/fn_must_use.rs:13:9 + --> $DIR/fn_must_use.rs:3:9 | LL | #![warn(unused_must_use)] | ^^^^^^^^^^^^^^^ = note: it's important warning: unused return value of `MyStruct::need_to_use_this_method_value` which must be used - --> $DIR/fn_must_use.rs:65:5 + --> $DIR/fn_must_use.rs:55:5 | LL | m.need_to_use_this_method_value(); //~ WARN unused return value | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: unused return value of `EvenNature::is_even` which must be used - --> $DIR/fn_must_use.rs:66:5 + --> $DIR/fn_must_use.rs:56:5 | LL | m.is_even(); // trait method! | ^^^^^^^^^^^^ @@ -26,25 +26,25 @@ LL | m.is_even(); // trait method! = note: no side effects warning: unused return value of `std::cmp::PartialEq::eq` which must be used - --> $DIR/fn_must_use.rs:72:5 + --> $DIR/fn_must_use.rs:62:5 | LL | 2.eq(&3); //~ WARN unused return value | ^^^^^^^^^ warning: unused return value of `std::cmp::PartialEq::eq` which must be used - --> $DIR/fn_must_use.rs:73:5 + --> $DIR/fn_must_use.rs:63:5 | LL | m.eq(&n); //~ WARN unused return value | ^^^^^^^^^ warning: unused comparison which must be used - --> $DIR/fn_must_use.rs:76:5 + --> $DIR/fn_must_use.rs:66:5 | LL | 2 == 3; //~ WARN unused comparison | ^^^^^^ warning: unused comparison which must be used - --> $DIR/fn_must_use.rs:77:5 + --> $DIR/fn_must_use.rs:67:5 | LL | m == n; //~ WARN unused comparison | ^^^^^^ diff --git a/src/test/ui/for/for-c-in-str.rs b/src/test/ui/for/for-c-in-str.rs index 011886e807346..dd88c96fdcb31 100644 --- a/src/test/ui/for/for-c-in-str.rs +++ b/src/test/ui/for/for-c-in-str.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // E0277 should point exclusively at line 14, not the entire for loop span fn main() { diff --git a/src/test/ui/for/for-c-in-str.stderr b/src/test/ui/for/for-c-in-str.stderr index b249df3b4ef6a..a4b5923f1f7ae 100644 --- a/src/test/ui/for/for-c-in-str.stderr +++ b/src/test/ui/for/for-c-in-str.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `&str: std::iter::Iterator` is not satisfied - --> $DIR/for-c-in-str.rs:14:14 + --> $DIR/for-c-in-str.rs:4:14 | LL | for c in "asdf" { | ^^^^^^ `&str` is not an iterator; try calling `.chars()` or `.bytes()` diff --git a/src/test/ui/for/for-expn.rs b/src/test/ui/for/for-expn.rs index 7e9d4df005db9..b9c4bbedac9f7 100644 --- a/src/test/ui/for/for-expn.rs +++ b/src/test/ui/for/for-expn.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that an error on a sub-expresson in a for loop has the correct span. fn main() { diff --git a/src/test/ui/for/for-expn.stderr b/src/test/ui/for/for-expn.stderr index 14c2c1a6d3d27..b598032e4c9b1 100644 --- a/src/test/ui/for/for-expn.stderr +++ b/src/test/ui/for/for-expn.stderr @@ -1,5 +1,5 @@ error[E0425]: cannot find value `foo` in this scope - --> $DIR/for-expn.rs:16:7 + --> $DIR/for-expn.rs:6:7 | LL | foo //~ ERROR cannot find value `foo` in this scope | ^^^ not found in this scope diff --git a/src/test/ui/for/for-loop-bogosity.rs b/src/test/ui/for/for-loop-bogosity.rs index 96ad184fd3558..3fe56601bd21f 100644 --- a/src/test/ui/for/for-loop-bogosity.rs +++ b/src/test/ui/for/for-loop-bogosity.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct MyStruct { x: isize, y: isize, diff --git a/src/test/ui/for/for-loop-bogosity.stderr b/src/test/ui/for/for-loop-bogosity.stderr index 0476ec06c705a..46a97bd66819c 100644 --- a/src/test/ui/for/for-loop-bogosity.stderr +++ b/src/test/ui/for/for-loop-bogosity.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `MyStruct: std::iter::Iterator` is not satisfied - --> $DIR/for-loop-bogosity.rs:27:14 + --> $DIR/for-loop-bogosity.rs:17:14 | LL | for x in bogus { //~ ERROR `MyStruct: std::iter::Iterator` is not satisfied | ^^^^^ `MyStruct` is not an iterator; maybe try calling `.iter()` or a similar method diff --git a/src/test/ui/for/for-loop-refutable-pattern-error-message.rs b/src/test/ui/for/for-loop-refutable-pattern-error-message.rs index 81c4db68628d4..221951c874d2b 100644 --- a/src/test/ui/for/for-loop-refutable-pattern-error-message.rs +++ b/src/test/ui/for/for-loop-refutable-pattern-error-message.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { for &1 in [1].iter() {} //~ ERROR refutable pattern in `for` loop binding } diff --git a/src/test/ui/for/for-loop-refutable-pattern-error-message.stderr b/src/test/ui/for/for-loop-refutable-pattern-error-message.stderr index b76c2ffc240e1..6fcdd65a14d05 100644 --- a/src/test/ui/for/for-loop-refutable-pattern-error-message.stderr +++ b/src/test/ui/for/for-loop-refutable-pattern-error-message.stderr @@ -1,5 +1,5 @@ error[E0005]: refutable pattern in `for` loop binding: `&_` not covered - --> $DIR/for-loop-refutable-pattern-error-message.rs:12:9 + --> $DIR/for-loop-refutable-pattern-error-message.rs:2:9 | LL | for &1 in [1].iter() {} //~ ERROR refutable pattern in `for` loop binding | ^^ pattern `&_` not covered diff --git a/src/test/ui/for/for-loop-type-error.rs b/src/test/ui/for/for-loop-type-error.rs index 7f0e40128f5d6..879fa47549e98 100644 --- a/src/test/ui/for/for-loop-type-error.rs +++ b/src/test/ui/for/for-loop-type-error.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { let x = () + (); //~ ERROR binary operation diff --git a/src/test/ui/for/for-loop-type-error.stderr b/src/test/ui/for/for-loop-type-error.stderr index f80a457dce34d..b5a4a5240d9d7 100644 --- a/src/test/ui/for/for-loop-type-error.stderr +++ b/src/test/ui/for/for-loop-type-error.stderr @@ -1,5 +1,5 @@ error[E0369]: binary operation `+` cannot be applied to type `()` - --> $DIR/for-loop-type-error.rs:12:13 + --> $DIR/for-loop-type-error.rs:2:13 | LL | let x = () + (); //~ ERROR binary operation | ^^^^^^^ diff --git a/src/test/ui/for/for-loop-unconstrained-element-type.rs b/src/test/ui/for/for-loop-unconstrained-element-type.rs index fb5553166bafb..0c7a3516a14ca 100644 --- a/src/test/ui/for/for-loop-unconstrained-element-type.rs +++ b/src/test/ui/for/for-loop-unconstrained-element-type.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that `for` loops don't introduce artificial // constraints on the type of the binding (`i`). // Subtle changes in the desugaring can cause the diff --git a/src/test/ui/for/for-loop-unconstrained-element-type.stderr b/src/test/ui/for/for-loop-unconstrained-element-type.stderr index c3723c52fda2b..aaaad658de7ba 100644 --- a/src/test/ui/for/for-loop-unconstrained-element-type.stderr +++ b/src/test/ui/for/for-loop-unconstrained-element-type.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/for-loop-unconstrained-element-type.rs:18:14 + --> $DIR/for-loop-unconstrained-element-type.rs:8:14 | LL | for i in Vec::new() { } //~ ERROR type annotations needed | ^^^^^^^^^^ diff --git a/src/test/ui/foreign-fn-return-lifetime.rs b/src/test/ui/foreign-fn-return-lifetime.rs index da77066150cc7..bd2d273362c00 100644 --- a/src/test/ui/foreign-fn-return-lifetime.rs +++ b/src/test/ui/foreign-fn-return-lifetime.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern "C" { fn g(_: &u8) -> &u8; // OK fn f() -> &u8; //~ ERROR missing lifetime specifier diff --git a/src/test/ui/foreign-fn-return-lifetime.stderr b/src/test/ui/foreign-fn-return-lifetime.stderr index ea15897b3d694..6ddd703605636 100644 --- a/src/test/ui/foreign-fn-return-lifetime.stderr +++ b/src/test/ui/foreign-fn-return-lifetime.stderr @@ -1,5 +1,5 @@ error[E0106]: missing lifetime specifier - --> $DIR/foreign-fn-return-lifetime.rs:13:15 + --> $DIR/foreign-fn-return-lifetime.rs:3:15 | LL | fn f() -> &u8; //~ ERROR missing lifetime specifier | ^ expected lifetime parameter diff --git a/src/test/ui/foreign-unsafe-fn-called.rs b/src/test/ui/foreign-unsafe-fn-called.rs index 5fad4c3677c0d..9352efaf2f000 100644 --- a/src/test/ui/foreign-unsafe-fn-called.rs +++ b/src/test/ui/foreign-unsafe-fn-called.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - mod test { extern { pub fn free(); diff --git a/src/test/ui/foreign-unsafe-fn-called.stderr b/src/test/ui/foreign-unsafe-fn-called.stderr index 498dd04e08fe9..afc9632de7cf8 100644 --- a/src/test/ui/foreign-unsafe-fn-called.stderr +++ b/src/test/ui/foreign-unsafe-fn-called.stderr @@ -1,5 +1,5 @@ error[E0133]: call to unsafe function is unsafe and requires unsafe function or block - --> $DIR/foreign-unsafe-fn-called.rs:19:5 + --> $DIR/foreign-unsafe-fn-called.rs:8:5 | LL | test::free(); | ^^^^^^^^^^^^ call to unsafe function diff --git a/src/test/ui/fully-qualified-type/fully-qualified-type-name1.rs b/src/test/ui/fully-qualified-type/fully-qualified-type-name1.rs index 1a7ceb2e7639e..8fdcbbae8debf 100644 --- a/src/test/ui/fully-qualified-type/fully-qualified-type-name1.rs +++ b/src/test/ui/fully-qualified-type/fully-qualified-type-name1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we use fully-qualified type names in error messages. fn main() { diff --git a/src/test/ui/fully-qualified-type/fully-qualified-type-name1.stderr b/src/test/ui/fully-qualified-type/fully-qualified-type-name1.stderr index 55553c084c9d0..d16cbcfe1d5f4 100644 --- a/src/test/ui/fully-qualified-type/fully-qualified-type-name1.stderr +++ b/src/test/ui/fully-qualified-type/fully-qualified-type-name1.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/fully-qualified-type-name1.rs:15:9 + --> $DIR/fully-qualified-type-name1.rs:5:9 | LL | x = 5; | ^ diff --git a/src/test/ui/fully-qualified-type/fully-qualified-type-name2.rs b/src/test/ui/fully-qualified-type/fully-qualified-type-name2.rs index 9ba8a11d536be..74f9f00245ff7 100644 --- a/src/test/ui/fully-qualified-type/fully-qualified-type-name2.rs +++ b/src/test/ui/fully-qualified-type/fully-qualified-type-name2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we use fully-qualified type names in error messages. mod x { diff --git a/src/test/ui/fully-qualified-type/fully-qualified-type-name2.stderr b/src/test/ui/fully-qualified-type/fully-qualified-type-name2.stderr index f2881894b0a71..b3c1808b46b92 100644 --- a/src/test/ui/fully-qualified-type/fully-qualified-type-name2.stderr +++ b/src/test/ui/fully-qualified-type/fully-qualified-type-name2.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/fully-qualified-type-name2.rs:22:12 + --> $DIR/fully-qualified-type-name2.rs:12:12 | LL | return x; | ^ expected enum `y::foo`, found enum `x::foo` diff --git a/src/test/ui/fully-qualified-type/fully-qualified-type-name3.rs b/src/test/ui/fully-qualified-type/fully-qualified-type-name3.rs index dc0c9a093fff8..22faa66d9fb03 100644 --- a/src/test/ui/fully-qualified-type/fully-qualified-type-name3.rs +++ b/src/test/ui/fully-qualified-type/fully-qualified-type-name3.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we use fully-qualified type names in error messages. // ignore-test diff --git a/src/test/ui/fully-qualified-type/fully-qualified-type-name4.rs b/src/test/ui/fully-qualified-type/fully-qualified-type-name4.rs index 3c8fde751f123..88910a7bb20ff 100644 --- a/src/test/ui/fully-qualified-type/fully-qualified-type-name4.rs +++ b/src/test/ui/fully-qualified-type/fully-qualified-type-name4.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we use fully-qualified type names in error messages. use std::option::Option; diff --git a/src/test/ui/fully-qualified-type/fully-qualified-type-name4.stderr b/src/test/ui/fully-qualified-type/fully-qualified-type-name4.stderr index eb855484468d0..f03aaa67edbb8 100644 --- a/src/test/ui/fully-qualified-type/fully-qualified-type-name4.stderr +++ b/src/test/ui/fully-qualified-type/fully-qualified-type-name4.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/fully-qualified-type-name4.rs:16:12 + --> $DIR/fully-qualified-type-name4.rs:6:12 | LL | return x; | ^ expected enum `std::option::Option`, found usize diff --git a/src/test/ui/functional-struct-update/functional-struct-update-noncopyable.nll.stderr b/src/test/ui/functional-struct-update/functional-struct-update-noncopyable.nll.stderr index 832b570512a45..67cca25ac0cac 100644 --- a/src/test/ui/functional-struct-update/functional-struct-update-noncopyable.nll.stderr +++ b/src/test/ui/functional-struct-update/functional-struct-update-noncopyable.nll.stderr @@ -1,5 +1,5 @@ error[E0509]: cannot move out of type `A`, which implements the `Drop` trait - --> $DIR/functional-struct-update-noncopyable.rs:22:14 + --> $DIR/functional-struct-update-noncopyable.rs:12:14 | LL | let _b = A { y: Arc::new(3), ..a }; //~ ERROR cannot move out of type `A` | ^^^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of here diff --git a/src/test/ui/functional-struct-update/functional-struct-update-noncopyable.rs b/src/test/ui/functional-struct-update/functional-struct-update-noncopyable.rs index 7ce32bbc975c6..a9d7d9c8aa903 100644 --- a/src/test/ui/functional-struct-update/functional-struct-update-noncopyable.rs +++ b/src/test/ui/functional-struct-update/functional-struct-update-noncopyable.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // issue 7327 use std::sync::Arc; diff --git a/src/test/ui/functional-struct-update/functional-struct-update-noncopyable.stderr b/src/test/ui/functional-struct-update/functional-struct-update-noncopyable.stderr index ad4fb97ae09ee..a3497c59a52b1 100644 --- a/src/test/ui/functional-struct-update/functional-struct-update-noncopyable.stderr +++ b/src/test/ui/functional-struct-update/functional-struct-update-noncopyable.stderr @@ -1,5 +1,5 @@ error[E0509]: cannot move out of type `A`, which implements the `Drop` trait - --> $DIR/functional-struct-update-noncopyable.rs:22:36 + --> $DIR/functional-struct-update-noncopyable.rs:12:36 | LL | let _b = A { y: Arc::new(3), ..a }; //~ ERROR cannot move out of type `A` | ^ cannot move out of here diff --git a/src/test/ui/functional-struct-update/functional-struct-update-respects-privacy.rs b/src/test/ui/functional-struct-update/functional-struct-update-respects-privacy.rs index 3f41401eb69c1..00606af904835 100644 --- a/src/test/ui/functional-struct-update/functional-struct-update-respects-privacy.rs +++ b/src/test/ui/functional-struct-update/functional-struct-update-respects-privacy.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // RFC 736 (and Issue 21407): functional struct update should respect privacy. // The `foo` module attempts to maintains an invariant that each `S` diff --git a/src/test/ui/functional-struct-update/functional-struct-update-respects-privacy.stderr b/src/test/ui/functional-struct-update/functional-struct-update-respects-privacy.stderr index 35a2f8460b64b..2aeffc3e5e457 100644 --- a/src/test/ui/functional-struct-update/functional-struct-update-respects-privacy.stderr +++ b/src/test/ui/functional-struct-update/functional-struct-update-respects-privacy.stderr @@ -1,5 +1,5 @@ error[E0451]: field `secret_uid` of struct `foo::S` is private - --> $DIR/functional-struct-update-respects-privacy.rs:38:49 + --> $DIR/functional-struct-update-respects-privacy.rs:28:49 | LL | let s_2 = foo::S { b: format!("ess two"), ..s_1 }; // FRU ... | ^^^ field `secret_uid` is private diff --git a/src/test/ui/future-incompatible-lint-group.rs b/src/test/ui/future-incompatible-lint-group.rs index 5f320135edfd1..3630f08c93778 100644 --- a/src/test/ui/future-incompatible-lint-group.rs +++ b/src/test/ui/future-incompatible-lint-group.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(future_incompatible)] trait Tr { diff --git a/src/test/ui/future-incompatible-lint-group.stderr b/src/test/ui/future-incompatible-lint-group.stderr index 56f4ff33eb2d8..e02646749b833 100644 --- a/src/test/ui/future-incompatible-lint-group.stderr +++ b/src/test/ui/future-incompatible-lint-group.stderr @@ -1,11 +1,11 @@ error: anonymous parameters are deprecated and will be removed in the next edition. - --> $DIR/future-incompatible-lint-group.rs:14:10 + --> $DIR/future-incompatible-lint-group.rs:4:10 | LL | fn f(u8) {} //~ ERROR anonymous parameters are deprecated | ^^ help: Try naming the parameter or explicitly ignoring it: `_: u8` | note: lint level defined here - --> $DIR/future-incompatible-lint-group.rs:11:9 + --> $DIR/future-incompatible-lint-group.rs:1:9 | LL | #![deny(future_incompatible)] | ^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/gated-attr-literals.rs b/src/test/ui/gated-attr-literals.rs new file mode 100644 index 0000000000000..d7ad9cee4c5e3 --- /dev/null +++ b/src/test/ui/gated-attr-literals.rs @@ -0,0 +1,33 @@ +// Check that literals in attributes don't parse without the feature gate. + +// gate-test-attr_literals + +#![feature(custom_attribute)] + +#[fake_attr] // OK +#[fake_attr(100)] + //~^ ERROR non-string literals in attributes +#[fake_attr(1, 2, 3)] + //~^ ERROR non-string literals in attributes +#[fake_attr("hello")] + //~^ ERROR string literals in top-level positions, are experimental +#[fake_attr(name = "hello")] // OK +#[fake_attr(1, "hi", key = 12, true, false)] + //~^ ERROR non-string literals in attributes, or string literals in top-level positions +#[fake_attr(key = "hello", val = 10)] + //~^ ERROR non-string literals in attributes +#[fake_attr(key("hello"), val(10))] + //~^ ERROR non-string literals in attributes, or string literals in top-level positions +#[fake_attr(enabled = true, disabled = false)] + //~^ ERROR non-string literals in attributes +#[fake_attr(true)] + //~^ ERROR non-string literals in attributes +#[fake_attr(pi = 3.14159)] + //~^ ERROR non-string literals in attributes +#[fake_attr(b"hi")] + //~^ ERROR string literals in top-level positions, are experimental +#[fake_doc(r"doc")] + //~^ ERROR string literals in top-level positions, are experimental +struct Q { } + +fn main() { } diff --git a/src/test/ui/gated-bad-feature.rs b/src/test/ui/gated-bad-feature.rs index 5baafd4153159..88a05f7840fd0 100644 --- a/src/test/ui/gated-bad-feature.rs +++ b/src/test/ui/gated-bad-feature.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature( foo_bar_baz, foo(bar), diff --git a/src/test/ui/gated-bad-feature.stderr b/src/test/ui/gated-bad-feature.stderr index 2bed241d68cab..256bfddc2f69f 100644 --- a/src/test/ui/gated-bad-feature.stderr +++ b/src/test/ui/gated-bad-feature.stderr @@ -1,29 +1,29 @@ error[E0556]: malformed feature, expected just one word - --> $DIR/gated-bad-feature.rs:13:5 + --> $DIR/gated-bad-feature.rs:3:5 | LL | foo(bar), | ^^^^^^^^ error[E0556]: malformed feature, expected just one word - --> $DIR/gated-bad-feature.rs:14:5 + --> $DIR/gated-bad-feature.rs:4:5 | LL | foo = "baz" | ^^^^^^^^^^^ error[E0555]: malformed feature attribute, expected #![feature(...)] - --> $DIR/gated-bad-feature.rs:19:1 + --> $DIR/gated-bad-feature.rs:9:1 | LL | #![feature] //~ ERROR: malformed feature | ^^^^^^^^^^^ error[E0555]: malformed feature attribute, expected #![feature(...)] - --> $DIR/gated-bad-feature.rs:20:1 + --> $DIR/gated-bad-feature.rs:10:1 | LL | #![feature = "foo"] //~ ERROR: malformed feature | ^^^^^^^^^^^^^^^^^^^ error[E0557]: feature has been removed - --> $DIR/gated-bad-feature.rs:22:12 + --> $DIR/gated-bad-feature.rs:12:12 | LL | #![feature(test_removed_feature)] //~ ERROR: feature has been removed | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/generator-yielding-or-returning-itself.rs b/src/test/ui/generator-yielding-or-returning-itself.rs index 13abdf616b29b..30788e3c1864b 100644 --- a/src/test/ui/generator-yielding-or-returning-itself.rs +++ b/src/test/ui/generator-yielding-or-returning-itself.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generator_trait)] #![feature(generators)] diff --git a/src/test/ui/generator-yielding-or-returning-itself.stderr b/src/test/ui/generator-yielding-or-returning-itself.stderr index a52e717ebae03..5834aed2450b1 100644 --- a/src/test/ui/generator-yielding-or-returning-itself.stderr +++ b/src/test/ui/generator-yielding-or-returning-itself.stderr @@ -1,5 +1,5 @@ -error[E0271]: type mismatch resolving `<[generator@$DIR/generator-yielding-or-returning-itself.rs:25:34: 29:6 _] as std::ops::Generator>::Return == [generator@$DIR/generator-yielding-or-returning-itself.rs:25:34: 29:6 _]` - --> $DIR/generator-yielding-or-returning-itself.rs:25:5 +error[E0271]: type mismatch resolving `<[generator@$DIR/generator-yielding-or-returning-itself.rs:15:34: 19:6 _] as std::ops::Generator>::Return == [generator@$DIR/generator-yielding-or-returning-itself.rs:15:34: 19:6 _]` + --> $DIR/generator-yielding-or-returning-itself.rs:15:5 | LL | want_cyclic_generator_return(|| { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cyclic type of infinite size @@ -8,7 +8,7 @@ LL | want_cyclic_generator_return(|| { this error may be the result of a recent compiler bug-fix, see https://github.com/rust-lang/rust/issues/46062 for more details note: required by `want_cyclic_generator_return` - --> $DIR/generator-yielding-or-returning-itself.rs:19:1 + --> $DIR/generator-yielding-or-returning-itself.rs:9:1 | LL | / pub fn want_cyclic_generator_return(_: T) LL | | where T: Generator @@ -16,8 +16,8 @@ LL | | { LL | | } | |_^ -error[E0271]: type mismatch resolving `<[generator@$DIR/generator-yielding-or-returning-itself.rs:38:33: 42:6 _] as std::ops::Generator>::Yield == [generator@$DIR/generator-yielding-or-returning-itself.rs:38:33: 42:6 _]` - --> $DIR/generator-yielding-or-returning-itself.rs:38:5 +error[E0271]: type mismatch resolving `<[generator@$DIR/generator-yielding-or-returning-itself.rs:28:33: 32:6 _] as std::ops::Generator>::Yield == [generator@$DIR/generator-yielding-or-returning-itself.rs:28:33: 32:6 _]` + --> $DIR/generator-yielding-or-returning-itself.rs:28:5 | LL | want_cyclic_generator_yield(|| { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ cyclic type of infinite size @@ -26,7 +26,7 @@ LL | want_cyclic_generator_yield(|| { this error may be the result of a recent compiler bug-fix, see https://github.com/rust-lang/rust/issues/46062 for more details note: required by `want_cyclic_generator_yield` - --> $DIR/generator-yielding-or-returning-itself.rs:32:1 + --> $DIR/generator-yielding-or-returning-itself.rs:22:1 | LL | / pub fn want_cyclic_generator_yield(_: T) LL | | where T: Generator diff --git a/src/test/ui/generator/auto-trait-regions.rs b/src/test/ui/generator/auto-trait-regions.rs index ac2a414b742c6..2110e8a5407ba 100644 --- a/src/test/ui/generator/auto-trait-regions.rs +++ b/src/test/ui/generator/auto-trait-regions.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators)] #![feature(optin_builtin_traits)] diff --git a/src/test/ui/generator/auto-trait-regions.stderr b/src/test/ui/generator/auto-trait-regions.stderr index dd78baf927509..a301dc2ff9a00 100644 --- a/src/test/ui/generator/auto-trait-regions.stderr +++ b/src/test/ui/generator/auto-trait-regions.stderr @@ -1,32 +1,32 @@ -error[E0277]: the trait bound `No: Foo` is not satisfied in `[generator@$DIR/auto-trait-regions.rs:35:15: 39:6 x:&&OnlyFooIfStaticRef for<'r> {&'r OnlyFooIfStaticRef, ()}]` - --> $DIR/auto-trait-regions.rs:40:5 +error[E0277]: the trait bound `No: Foo` is not satisfied in `[generator@$DIR/auto-trait-regions.rs:25:15: 29:6 x:&&OnlyFooIfStaticRef for<'r> {&'r OnlyFooIfStaticRef, ()}]` + --> $DIR/auto-trait-regions.rs:30:5 | LL | assert_foo(gen); //~ ERROR the trait bound `No: Foo` is not satisfied - | ^^^^^^^^^^ within `[generator@$DIR/auto-trait-regions.rs:35:15: 39:6 x:&&OnlyFooIfStaticRef for<'r> {&'r OnlyFooIfStaticRef, ()}]`, the trait `Foo` is not implemented for `No` + | ^^^^^^^^^^ within `[generator@$DIR/auto-trait-regions.rs:25:15: 29:6 x:&&OnlyFooIfStaticRef for<'r> {&'r OnlyFooIfStaticRef, ()}]`, the trait `Foo` is not implemented for `No` | = help: the following implementations were found: = note: required because it appears within the type `OnlyFooIfStaticRef` = note: required because it appears within the type `&OnlyFooIfStaticRef` = note: required because it appears within the type `for<'r> {&'r OnlyFooIfStaticRef, ()}` - = note: required because it appears within the type `[generator@$DIR/auto-trait-regions.rs:35:15: 39:6 x:&&OnlyFooIfStaticRef for<'r> {&'r OnlyFooIfStaticRef, ()}]` + = note: required because it appears within the type `[generator@$DIR/auto-trait-regions.rs:25:15: 29:6 x:&&OnlyFooIfStaticRef for<'r> {&'r OnlyFooIfStaticRef, ()}]` note: required by `assert_foo` - --> $DIR/auto-trait-regions.rs:30:1 + --> $DIR/auto-trait-regions.rs:20:1 | LL | fn assert_foo(f: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0279]: the requirement `for<'r, 's> 'r : 's` is not satisfied (`expected bound lifetime parameter, found concrete lifetime`) - --> $DIR/auto-trait-regions.rs:57:5 + --> $DIR/auto-trait-regions.rs:47:5 | LL | assert_foo(gen); //~ ERROR the requirement `for<'r, 's> 'r : 's` is not satisfied | ^^^^^^^^^^ | = note: required because of the requirements on the impl of `for<'r, 's> Foo` for `A<'_, '_>` = note: required because it appears within the type `for<'r, 's> {A<'r, 's>, ()}` - = note: required because it appears within the type `[generator@$DIR/auto-trait-regions.rs:52:15: 56:6 for<'r, 's> {A<'r, 's>, ()}]` + = note: required because it appears within the type `[generator@$DIR/auto-trait-regions.rs:42:15: 46:6 for<'r, 's> {A<'r, 's>, ()}]` note: required by `assert_foo` - --> $DIR/auto-trait-regions.rs:30:1 + --> $DIR/auto-trait-regions.rs:20:1 | LL | fn assert_foo(f: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/generator/borrowing.nll.stderr b/src/test/ui/generator/borrowing.nll.stderr index e03d72a02f0aa..77820d86674e6 100644 --- a/src/test/ui/generator/borrowing.nll.stderr +++ b/src/test/ui/generator/borrowing.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `a` does not live long enough - --> $DIR/borrowing.rs:18:18 + --> $DIR/borrowing.rs:8:18 | LL | unsafe { (|| yield &a).resume() } | ^^^^^^^^^^^^^ borrowed value does not live long enough @@ -8,7 +8,7 @@ LL | }; | - `a` dropped here while still borrowed error[E0597]: `a` does not live long enough - --> $DIR/borrowing.rs:24:9 + --> $DIR/borrowing.rs:14:9 | LL | / || { LL | | yield &a diff --git a/src/test/ui/generator/borrowing.rs b/src/test/ui/generator/borrowing.rs index e56927d818231..88a0cf9a77a54 100644 --- a/src/test/ui/generator/borrowing.rs +++ b/src/test/ui/generator/borrowing.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators, generator_trait)] use std::ops::Generator; diff --git a/src/test/ui/generator/borrowing.stderr b/src/test/ui/generator/borrowing.stderr index 45d950b5aef64..3f5d32e1c3358 100644 --- a/src/test/ui/generator/borrowing.stderr +++ b/src/test/ui/generator/borrowing.stderr @@ -1,5 +1,5 @@ error[E0597]: `a` does not live long enough - --> $DIR/borrowing.rs:18:29 + --> $DIR/borrowing.rs:8:29 | LL | unsafe { (|| yield &a).resume() } | -- ^ borrowed value does not live long enough @@ -13,7 +13,7 @@ LL | } | - borrowed value needs to live until here error[E0597]: `a` does not live long enough - --> $DIR/borrowing.rs:25:20 + --> $DIR/borrowing.rs:15:20 | LL | || { | -- capture occurs here diff --git a/src/test/ui/generator/dropck.nll.stderr b/src/test/ui/generator/dropck.nll.stderr index b49bf81715079..a90a8c5f8c4f9 100644 --- a/src/test/ui/generator/dropck.nll.stderr +++ b/src/test/ui/generator/dropck.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `*cell` does not live long enough - --> $DIR/dropck.rs:19:40 + --> $DIR/dropck.rs:9:40 | LL | let ref_ = Box::leak(Box::new(Some(cell.borrow_mut()))); | ^^^^ borrowed value does not live long enough @@ -11,7 +11,7 @@ LL | } | borrow later used here, when `gen` is dropped error[E0597]: `ref_` does not live long enough - --> $DIR/dropck.rs:22:11 + --> $DIR/dropck.rs:12:11 | LL | gen = || { | ___________^ diff --git a/src/test/ui/generator/dropck.rs b/src/test/ui/generator/dropck.rs index 992a31a732083..1b0c1ebe517b4 100644 --- a/src/test/ui/generator/dropck.rs +++ b/src/test/ui/generator/dropck.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators, generator_trait, box_leak)] use std::cell::RefCell; diff --git a/src/test/ui/generator/dropck.stderr b/src/test/ui/generator/dropck.stderr index 1a6fed2dd3594..281c9647bc3e1 100644 --- a/src/test/ui/generator/dropck.stderr +++ b/src/test/ui/generator/dropck.stderr @@ -1,5 +1,5 @@ error[E0597]: `*cell` does not live long enough - --> $DIR/dropck.rs:19:40 + --> $DIR/dropck.rs:9:40 | LL | let ref_ = Box::leak(Box::new(Some(cell.borrow_mut()))); | ^^^^ borrowed value does not live long enough @@ -10,7 +10,7 @@ LL | } = note: values in a scope are dropped in the opposite order they are created error[E0597]: `ref_` does not live long enough - --> $DIR/dropck.rs:24:18 + --> $DIR/dropck.rs:14:18 | LL | gen = || { | -- capture occurs here diff --git a/src/test/ui/generator/generator-with-nll.rs b/src/test/ui/generator/generator-with-nll.rs index fdfe9e2c562e0..87afa57ab5198 100644 --- a/src/test/ui/generator/generator-with-nll.rs +++ b/src/test/ui/generator/generator-with-nll.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators)] #![feature(nll)] diff --git a/src/test/ui/generator/generator-with-nll.stderr b/src/test/ui/generator/generator-with-nll.stderr index 1dc663d8bcbf7..c683ea1a3094b 100644 --- a/src/test/ui/generator/generator-with-nll.stderr +++ b/src/test/ui/generator/generator-with-nll.stderr @@ -1,5 +1,5 @@ error[E0626]: borrow may still be in use when generator yields - --> $DIR/generator-with-nll.rs:18:17 + --> $DIR/generator-with-nll.rs:8:17 | LL | let b = &mut true; | ^^^^^^^^^ diff --git a/src/test/ui/generator/issue-48048.rs b/src/test/ui/generator/issue-48048.rs index 89739bd591cc8..992bbc97a9f17 100644 --- a/src/test/ui/generator/issue-48048.rs +++ b/src/test/ui/generator/issue-48048.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators)] fn main() { diff --git a/src/test/ui/generator/issue-48048.stderr b/src/test/ui/generator/issue-48048.stderr index f0654685debae..aeea10225091f 100644 --- a/src/test/ui/generator/issue-48048.stderr +++ b/src/test/ui/generator/issue-48048.stderr @@ -1,5 +1,5 @@ error[E0626]: borrow may still be in use when generator yields - --> $DIR/issue-48048.rs:19:9 + --> $DIR/issue-48048.rs:9:9 | LL | x.0({ //~ ERROR borrow may still be in use when generator yields | ^^^ diff --git a/src/test/ui/generator/no-arguments-on-generators.rs b/src/test/ui/generator/no-arguments-on-generators.rs index a7e98fe450927..344c1179be90e 100644 --- a/src/test/ui/generator/no-arguments-on-generators.rs +++ b/src/test/ui/generator/no-arguments-on-generators.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators)] fn main() { diff --git a/src/test/ui/generator/no-arguments-on-generators.stderr b/src/test/ui/generator/no-arguments-on-generators.stderr index 6520f8b20231d..521001293afa1 100644 --- a/src/test/ui/generator/no-arguments-on-generators.stderr +++ b/src/test/ui/generator/no-arguments-on-generators.stderr @@ -1,5 +1,5 @@ error[E0628]: generators cannot have explicit arguments - --> $DIR/no-arguments-on-generators.rs:14:15 + --> $DIR/no-arguments-on-generators.rs:4:15 | LL | let gen = |start| { //~ ERROR generators cannot have explicit arguments | ^^^^^^^ diff --git a/src/test/ui/generator/not-send-sync.rs b/src/test/ui/generator/not-send-sync.rs index f0df05ebfdf80..ae0a288bbb496 100644 --- a/src/test/ui/generator/not-send-sync.rs +++ b/src/test/ui/generator/not-send-sync.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators)] use std::cell::Cell; diff --git a/src/test/ui/generator/not-send-sync.stderr b/src/test/ui/generator/not-send-sync.stderr index edf7151f7c4b7..7ea9832c99a24 100644 --- a/src/test/ui/generator/not-send-sync.stderr +++ b/src/test/ui/generator/not-send-sync.stderr @@ -1,29 +1,29 @@ error[E0277]: `std::cell::Cell` cannot be shared between threads safely - --> $DIR/not-send-sync.rs:26:5 + --> $DIR/not-send-sync.rs:16:5 | LL | assert_send(|| { | ^^^^^^^^^^^ `std::cell::Cell` cannot be shared between threads safely | = help: the trait `std::marker::Sync` is not implemented for `std::cell::Cell` = note: required because of the requirements on the impl of `std::marker::Send` for `&std::cell::Cell` - = note: required because it appears within the type `[generator@$DIR/not-send-sync.rs:26:17: 30:6 a:&std::cell::Cell _]` + = note: required because it appears within the type `[generator@$DIR/not-send-sync.rs:16:17: 20:6 a:&std::cell::Cell _]` note: required by `main::assert_send` - --> $DIR/not-send-sync.rs:17:5 + --> $DIR/not-send-sync.rs:7:5 | LL | fn assert_send(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: `std::cell::Cell` cannot be shared between threads safely - --> $DIR/not-send-sync.rs:19:5 + --> $DIR/not-send-sync.rs:9:5 | LL | assert_sync(|| { | ^^^^^^^^^^^ `std::cell::Cell` cannot be shared between threads safely | - = help: within `[generator@$DIR/not-send-sync.rs:19:17: 23:6 {std::cell::Cell, ()}]`, the trait `std::marker::Sync` is not implemented for `std::cell::Cell` + = help: within `[generator@$DIR/not-send-sync.rs:9:17: 13:6 {std::cell::Cell, ()}]`, the trait `std::marker::Sync` is not implemented for `std::cell::Cell` = note: required because it appears within the type `{std::cell::Cell, ()}` - = note: required because it appears within the type `[generator@$DIR/not-send-sync.rs:19:17: 23:6 {std::cell::Cell, ()}]` + = note: required because it appears within the type `[generator@$DIR/not-send-sync.rs:9:17: 13:6 {std::cell::Cell, ()}]` note: required by `main::assert_sync` - --> $DIR/not-send-sync.rs:16:5 + --> $DIR/not-send-sync.rs:6:5 | LL | fn assert_sync(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/generator/pattern-borrow.rs b/src/test/ui/generator/pattern-borrow.rs index 2c4c682d8cca9..d193637081938 100644 --- a/src/test/ui/generator/pattern-borrow.rs +++ b/src/test/ui/generator/pattern-borrow.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators)] enum Test { A(i32), B, } diff --git a/src/test/ui/generator/pattern-borrow.stderr b/src/test/ui/generator/pattern-borrow.stderr index 48f23486a317c..50442828d8df1 100644 --- a/src/test/ui/generator/pattern-borrow.stderr +++ b/src/test/ui/generator/pattern-borrow.stderr @@ -1,5 +1,5 @@ error[E0626]: borrow may still be in use when generator yields - --> $DIR/pattern-borrow.rs:19:24 + --> $DIR/pattern-borrow.rs:9:24 | LL | if let Test::A(ref _a) = test { //~ ERROR borrow may still be in use when generator yields | ^^^^^^ diff --git a/src/test/ui/generator/ref-escapes-but-not-over-yield.nll.stderr b/src/test/ui/generator/ref-escapes-but-not-over-yield.nll.stderr index 56d853c2966c5..f6df96a486793 100644 --- a/src/test/ui/generator/ref-escapes-but-not-over-yield.nll.stderr +++ b/src/test/ui/generator/ref-escapes-but-not-over-yield.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `b` does not live long enough - --> $DIR/ref-escapes-but-not-over-yield.rs:24:13 + --> $DIR/ref-escapes-but-not-over-yield.rs:14:13 | LL | a = &b; | ^^ borrowed value does not live long enough diff --git a/src/test/ui/generator/ref-escapes-but-not-over-yield.rs b/src/test/ui/generator/ref-escapes-but-not-over-yield.rs index 989949cd9d75a..332e074e9fe64 100644 --- a/src/test/ui/generator/ref-escapes-but-not-over-yield.rs +++ b/src/test/ui/generator/ref-escapes-but-not-over-yield.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators, generator_trait)] use std::ops::{GeneratorState, Generator}; diff --git a/src/test/ui/generator/ref-escapes-but-not-over-yield.stderr b/src/test/ui/generator/ref-escapes-but-not-over-yield.stderr index 65817e30c4de9..e1d718e847f8f 100644 --- a/src/test/ui/generator/ref-escapes-but-not-over-yield.stderr +++ b/src/test/ui/generator/ref-escapes-but-not-over-yield.stderr @@ -1,5 +1,5 @@ error[E0597]: `b` does not live long enough - --> $DIR/ref-escapes-but-not-over-yield.rs:24:14 + --> $DIR/ref-escapes-but-not-over-yield.rs:14:14 | LL | a = &b; | ^ borrowed value does not live long enough diff --git a/src/test/ui/generator/sized-yield.rs b/src/test/ui/generator/sized-yield.rs index 461da94dde0d0..e34731a4406d9 100644 --- a/src/test/ui/generator/sized-yield.rs +++ b/src/test/ui/generator/sized-yield.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators, generator_trait)] use std::ops::Generator; diff --git a/src/test/ui/generator/sized-yield.stderr b/src/test/ui/generator/sized-yield.stderr index d91db6763ab24..7e1cd95429cb4 100644 --- a/src/test/ui/generator/sized-yield.stderr +++ b/src/test/ui/generator/sized-yield.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `str` cannot be known at compilation time - --> $DIR/sized-yield.rs:17:26 + --> $DIR/sized-yield.rs:7:26 | LL | let mut gen = move || { | __________________________^ @@ -13,7 +13,7 @@ LL | | }; = note: the yield type of a generator must have a statically known size error[E0277]: the size for values of type `str` cannot be known at compilation time - --> $DIR/sized-yield.rs:21:17 + --> $DIR/sized-yield.rs:11:17 | LL | unsafe { gen.resume(); } | ^^^^^^ doesn't have a size known at compile-time diff --git a/src/test/ui/generator/yield-in-args.nll.stderr b/src/test/ui/generator/yield-in-args.nll.stderr index 6242ec0f548c9..f753daafa9741 100644 --- a/src/test/ui/generator/yield-in-args.nll.stderr +++ b/src/test/ui/generator/yield-in-args.nll.stderr @@ -1,5 +1,5 @@ error[E0626]: borrow may still be in use when generator yields - --> $DIR/yield-in-args.rs:18:13 + --> $DIR/yield-in-args.rs:8:13 | LL | foo(&b, yield); //~ ERROR | ^^ ----- possible yield occurs here diff --git a/src/test/ui/generator/yield-in-args.rs b/src/test/ui/generator/yield-in-args.rs index faeb4b1feb28d..80110af55ab07 100644 --- a/src/test/ui/generator/yield-in-args.rs +++ b/src/test/ui/generator/yield-in-args.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators)] fn foo(_b: &bool, _a: ()) {} diff --git a/src/test/ui/generator/yield-in-args.stderr b/src/test/ui/generator/yield-in-args.stderr index 3219939e89b2a..f53677b5312ed 100644 --- a/src/test/ui/generator/yield-in-args.stderr +++ b/src/test/ui/generator/yield-in-args.stderr @@ -1,5 +1,5 @@ error[E0626]: borrow may still be in use when generator yields - --> $DIR/yield-in-args.rs:18:14 + --> $DIR/yield-in-args.rs:8:14 | LL | foo(&b, yield); //~ ERROR | ^ ----- possible yield occurs here diff --git a/src/test/ui/generator/yield-in-const.rs b/src/test/ui/generator/yield-in-const.rs index 8636a66ae00ae..f6f11b9cb13dd 100644 --- a/src/test/ui/generator/yield-in-const.rs +++ b/src/test/ui/generator/yield-in-const.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators)] const A: u8 = { yield 3u8; 3u8}; diff --git a/src/test/ui/generator/yield-in-const.stderr b/src/test/ui/generator/yield-in-const.stderr index 874edce593168..e531bd6ef9ff5 100644 --- a/src/test/ui/generator/yield-in-const.stderr +++ b/src/test/ui/generator/yield-in-const.stderr @@ -1,5 +1,5 @@ error[E0627]: yield statement outside of generator literal - --> $DIR/yield-in-const.rs:13:17 + --> $DIR/yield-in-const.rs:3:17 | LL | const A: u8 = { yield 3u8; 3u8}; | ^^^^^^^^^ diff --git a/src/test/ui/generator/yield-in-function.rs b/src/test/ui/generator/yield-in-function.rs index 2f6c5a9ef754c..b737d3b224035 100644 --- a/src/test/ui/generator/yield-in-function.rs +++ b/src/test/ui/generator/yield-in-function.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators)] fn main() { yield; } diff --git a/src/test/ui/generator/yield-in-function.stderr b/src/test/ui/generator/yield-in-function.stderr index 35be1fcd28d1c..981c9f8339f1f 100644 --- a/src/test/ui/generator/yield-in-function.stderr +++ b/src/test/ui/generator/yield-in-function.stderr @@ -1,5 +1,5 @@ error[E0627]: yield statement outside of generator literal - --> $DIR/yield-in-function.rs:13:13 + --> $DIR/yield-in-function.rs:3:13 | LL | fn main() { yield; } | ^^^^^ diff --git a/src/test/ui/generator/yield-in-static.rs b/src/test/ui/generator/yield-in-static.rs index 21601f47f677d..12c9ccea4cb78 100644 --- a/src/test/ui/generator/yield-in-static.rs +++ b/src/test/ui/generator/yield-in-static.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators)] static B: u8 = { yield 3u8; 3u8}; diff --git a/src/test/ui/generator/yield-in-static.stderr b/src/test/ui/generator/yield-in-static.stderr index 35d1ebaabdc1c..46d341f3dcfba 100644 --- a/src/test/ui/generator/yield-in-static.stderr +++ b/src/test/ui/generator/yield-in-static.stderr @@ -1,5 +1,5 @@ error[E0627]: yield statement outside of generator literal - --> $DIR/yield-in-static.rs:13:18 + --> $DIR/yield-in-static.rs:3:18 | LL | static B: u8 = { yield 3u8; 3u8}; | ^^^^^^^^^ diff --git a/src/test/ui/generator/yield-while-iterating.nll.stderr b/src/test/ui/generator/yield-while-iterating.nll.stderr index af79eb7ac054f..3abd1cc91b3f5 100644 --- a/src/test/ui/generator/yield-while-iterating.nll.stderr +++ b/src/test/ui/generator/yield-while-iterating.nll.stderr @@ -1,5 +1,5 @@ error[E0626]: borrow may still be in use when generator yields - --> $DIR/yield-while-iterating.rs:22:18 + --> $DIR/yield-while-iterating.rs:12:18 | LL | for p in &x { //~ ERROR | ^^ @@ -7,7 +7,7 @@ LL | yield(); | ------- possible yield occurs here error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable - --> $DIR/yield-while-iterating.rs:67:20 + --> $DIR/yield-while-iterating.rs:57:20 | LL | let mut b = || { | _________________- diff --git a/src/test/ui/generator/yield-while-iterating.rs b/src/test/ui/generator/yield-while-iterating.rs index b8a67a0e7b65d..b0966d2e921b7 100644 --- a/src/test/ui/generator/yield-while-iterating.rs +++ b/src/test/ui/generator/yield-while-iterating.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators, generator_trait)] use std::ops::{GeneratorState, Generator}; diff --git a/src/test/ui/generator/yield-while-iterating.stderr b/src/test/ui/generator/yield-while-iterating.stderr index c20b1348e279d..aa66047feb227 100644 --- a/src/test/ui/generator/yield-while-iterating.stderr +++ b/src/test/ui/generator/yield-while-iterating.stderr @@ -1,5 +1,5 @@ error[E0626]: borrow may still be in use when generator yields - --> $DIR/yield-while-iterating.rs:22:19 + --> $DIR/yield-while-iterating.rs:12:19 | LL | for p in &x { //~ ERROR | ^ @@ -7,7 +7,7 @@ LL | yield(); | ------- possible yield occurs here error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable - --> $DIR/yield-while-iterating.rs:67:20 + --> $DIR/yield-while-iterating.rs:57:20 | LL | let mut b = || { | -- mutable borrow occurs here diff --git a/src/test/ui/generator/yield-while-local-borrowed.rs b/src/test/ui/generator/yield-while-local-borrowed.rs index 3dc2650a2ecbf..a895f05b34cae 100644 --- a/src/test/ui/generator/yield-while-local-borrowed.rs +++ b/src/test/ui/generator/yield-while-local-borrowed.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z borrowck=compare #![feature(generators, generator_trait)] diff --git a/src/test/ui/generator/yield-while-local-borrowed.stderr b/src/test/ui/generator/yield-while-local-borrowed.stderr index a7f9862a726f4..765267a58b4a7 100644 --- a/src/test/ui/generator/yield-while-local-borrowed.stderr +++ b/src/test/ui/generator/yield-while-local-borrowed.stderr @@ -1,5 +1,5 @@ error[E0626]: borrow may still be in use when generator yields (Ast) - --> $DIR/yield-while-local-borrowed.rs:24:22 + --> $DIR/yield-while-local-borrowed.rs:14:22 | LL | let a = &mut 3; | ^ @@ -8,7 +8,7 @@ LL | yield(); | ------- possible yield occurs here error[E0626]: borrow may still be in use when generator yields (Ast) - --> $DIR/yield-while-local-borrowed.rs:52:22 + --> $DIR/yield-while-local-borrowed.rs:42:22 | LL | let b = &a; | ^ @@ -17,7 +17,7 @@ LL | yield(); | ------- possible yield occurs here error[E0626]: borrow may still be in use when generator yields (Mir) - --> $DIR/yield-while-local-borrowed.rs:24:17 + --> $DIR/yield-while-local-borrowed.rs:14:17 | LL | let a = &mut 3; | ^^^^^^ @@ -26,7 +26,7 @@ LL | yield(); | ------- possible yield occurs here error[E0626]: borrow may still be in use when generator yields (Mir) - --> $DIR/yield-while-local-borrowed.rs:52:21 + --> $DIR/yield-while-local-borrowed.rs:42:21 | LL | let b = &a; | ^^ diff --git a/src/test/ui/generator/yield-while-ref-reborrowed.nll.stderr b/src/test/ui/generator/yield-while-ref-reborrowed.nll.stderr index 1498907952741..28f018e6700be 100644 --- a/src/test/ui/generator/yield-while-ref-reborrowed.nll.stderr +++ b/src/test/ui/generator/yield-while-ref-reborrowed.nll.stderr @@ -1,5 +1,5 @@ error[E0501]: cannot borrow `x` as immutable because previous closure requires unique access - --> $DIR/yield-while-ref-reborrowed.rs:45:20 + --> $DIR/yield-while-ref-reborrowed.rs:35:20 | LL | let mut b = || { | _________________- diff --git a/src/test/ui/generator/yield-while-ref-reborrowed.rs b/src/test/ui/generator/yield-while-ref-reborrowed.rs index 573dd4377bb2c..540907a421dfb 100644 --- a/src/test/ui/generator/yield-while-ref-reborrowed.rs +++ b/src/test/ui/generator/yield-while-ref-reborrowed.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(generators, generator_trait)] use std::ops::{GeneratorState, Generator}; diff --git a/src/test/ui/generator/yield-while-ref-reborrowed.stderr b/src/test/ui/generator/yield-while-ref-reborrowed.stderr index 8139814c7f2b6..d70ef189ebc9a 100644 --- a/src/test/ui/generator/yield-while-ref-reborrowed.stderr +++ b/src/test/ui/generator/yield-while-ref-reborrowed.stderr @@ -1,5 +1,5 @@ error[E0501]: cannot borrow `x` as immutable because previous closure requires unique access - --> $DIR/yield-while-ref-reborrowed.rs:45:20 + --> $DIR/yield-while-ref-reborrowed.rs:35:20 | LL | let mut b = || { | -- closure construction occurs here diff --git a/src/test/ui/generic/generic-arg-mismatch-recover.rs b/src/test/ui/generic/generic-arg-mismatch-recover.rs index b8883ff9c8333..f4e15fbebcebb 100644 --- a/src/test/ui/generic/generic-arg-mismatch-recover.rs +++ b/src/test/ui/generic/generic-arg-mismatch-recover.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo<'a, T: 'a>(&'a T); struct Bar<'a>(&'a ()); diff --git a/src/test/ui/generic/generic-arg-mismatch-recover.stderr b/src/test/ui/generic/generic-arg-mismatch-recover.stderr index 81869ad0d08a5..c3e8b5450157d 100644 --- a/src/test/ui/generic/generic-arg-mismatch-recover.stderr +++ b/src/test/ui/generic/generic-arg-mismatch-recover.stderr @@ -1,11 +1,11 @@ error[E0088]: wrong number of lifetime arguments: expected 1, found 2 - --> $DIR/generic-arg-mismatch-recover.rs:16:20 + --> $DIR/generic-arg-mismatch-recover.rs:6:20 | LL | Foo::<'static, 'static, ()>(&0); //~ ERROR wrong number of lifetime arguments | ^^^^^^^ unexpected lifetime argument error[E0308]: mismatched types - --> $DIR/generic-arg-mismatch-recover.rs:16:33 + --> $DIR/generic-arg-mismatch-recover.rs:6:33 | LL | Foo::<'static, 'static, ()>(&0); //~ ERROR wrong number of lifetime arguments | ^^ expected (), found integral variable @@ -14,13 +14,13 @@ LL | Foo::<'static, 'static, ()>(&0); //~ ERROR wrong number of lifetime arg found type `&{integer}` error[E0088]: wrong number of lifetime arguments: expected 1, found 2 - --> $DIR/generic-arg-mismatch-recover.rs:19:20 + --> $DIR/generic-arg-mismatch-recover.rs:9:20 | LL | Bar::<'static, 'static, ()>(&()); //~ ERROR wrong number of lifetime arguments | ^^^^^^^ unexpected lifetime argument error[E0087]: wrong number of type arguments: expected 0, found 1 - --> $DIR/generic-arg-mismatch-recover.rs:19:29 + --> $DIR/generic-arg-mismatch-recover.rs:9:29 | LL | Bar::<'static, 'static, ()>(&()); //~ ERROR wrong number of lifetime arguments | ^^ unexpected type argument diff --git a/src/test/ui/generic/generic-extern-lifetime.rs b/src/test/ui/generic/generic-extern-lifetime.rs index fa2d474393786..22bcd44a14d9b 100644 --- a/src/test/ui/generic/generic-extern-lifetime.rs +++ b/src/test/ui/generic/generic-extern-lifetime.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test to make sure the names of the lifetimes are correctly resolved // in extern blocks. diff --git a/src/test/ui/generic/generic-extern-lifetime.stderr b/src/test/ui/generic/generic-extern-lifetime.stderr index 9276ae0d41253..b31d2a88044c7 100644 --- a/src/test/ui/generic/generic-extern-lifetime.stderr +++ b/src/test/ui/generic/generic-extern-lifetime.stderr @@ -1,17 +1,17 @@ error[E0261]: use of undeclared lifetime name `'a` - --> $DIR/generic-extern-lifetime.rs:16:24 + --> $DIR/generic-extern-lifetime.rs:6:24 | LL | pub fn life2<'b>(x:&'a i32, y:&'b i32); //~ ERROR use of undeclared lifetime name `'a` | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'a` - --> $DIR/generic-extern-lifetime.rs:18:36 + --> $DIR/generic-extern-lifetime.rs:8:36 | LL | pub fn life4<'b>(x: for<'c> fn(&'a i32)); //~ ERROR use of undeclared lifetime name `'a` | ^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'a` - --> $DIR/generic-extern-lifetime.rs:21:38 + --> $DIR/generic-extern-lifetime.rs:11:38 | LL | pub fn life7<'b>() -> for<'c> fn(&'a i32); //~ ERROR use of undeclared lifetime name `'a` | ^^ undeclared lifetime diff --git a/src/test/ui/generic/generic-extern.rs b/src/test/ui/generic/generic-extern.rs index a7140d1be87ad..e52a88592ff96 100644 --- a/src/test/ui/generic/generic-extern.rs +++ b/src/test/ui/generic/generic-extern.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern { fn foo(); //~ ERROR foreign items may not have type parameters } diff --git a/src/test/ui/generic/generic-extern.stderr b/src/test/ui/generic/generic-extern.stderr index c1ba2cced547a..1c978245f9c63 100644 --- a/src/test/ui/generic/generic-extern.stderr +++ b/src/test/ui/generic/generic-extern.stderr @@ -1,5 +1,5 @@ error[E0044]: foreign items may not have type parameters - --> $DIR/generic-extern.rs:12:5 + --> $DIR/generic-extern.rs:2:5 | LL | fn foo(); //~ ERROR foreign items may not have type parameters | ^^^^^^^^^^^^ can't have type parameters diff --git a/src/test/ui/generic/generic-impl-less-params-with-defaults.rs b/src/test/ui/generic/generic-impl-less-params-with-defaults.rs index 3f5f7bb3a53ea..abbf64058204a 100644 --- a/src/test/ui/generic/generic-impl-less-params-with-defaults.rs +++ b/src/test/ui/generic/generic-impl-less-params-with-defaults.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::marker; struct Foo( diff --git a/src/test/ui/generic/generic-impl-less-params-with-defaults.stderr b/src/test/ui/generic/generic-impl-less-params-with-defaults.stderr index a10b500f9f8b8..a95ad9b418e8d 100644 --- a/src/test/ui/generic/generic-impl-less-params-with-defaults.stderr +++ b/src/test/ui/generic/generic-impl-less-params-with-defaults.stderr @@ -1,5 +1,5 @@ error[E0243]: wrong number of type arguments: expected at least 2, found 1 - --> $DIR/generic-impl-less-params-with-defaults.rs:21:5 + --> $DIR/generic-impl-less-params-with-defaults.rs:11:5 | LL | Foo::::new(); | ^^^^^^^^^^^^^^^^^ expected at least 2 type arguments diff --git a/src/test/ui/generic/generic-impl-more-params-with-defaults.rs b/src/test/ui/generic/generic-impl-more-params-with-defaults.rs index 3141199208965..a14fb7064c995 100644 --- a/src/test/ui/generic/generic-impl-more-params-with-defaults.rs +++ b/src/test/ui/generic/generic-impl-more-params-with-defaults.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::marker; struct Heap; diff --git a/src/test/ui/generic/generic-impl-more-params-with-defaults.stderr b/src/test/ui/generic/generic-impl-more-params-with-defaults.stderr index b614da88ba164..434f990911e1d 100644 --- a/src/test/ui/generic/generic-impl-more-params-with-defaults.stderr +++ b/src/test/ui/generic/generic-impl-more-params-with-defaults.stderr @@ -1,5 +1,5 @@ error[E0244]: wrong number of type arguments: expected at most 2, found 3 - --> $DIR/generic-impl-more-params-with-defaults.rs:23:5 + --> $DIR/generic-impl-more-params-with-defaults.rs:13:5 | LL | Vec::::new(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected at most 2 type argument diff --git a/src/test/ui/generic/generic-lifetime-trait-impl.rs b/src/test/ui/generic/generic-lifetime-trait-impl.rs index 9b9f09f477757..6ffaba19d78b8 100644 --- a/src/test/ui/generic/generic-lifetime-trait-impl.rs +++ b/src/test/ui/generic/generic-lifetime-trait-impl.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This code used to produce an ICE on the definition of trait Bar // with the following message: // diff --git a/src/test/ui/generic/generic-lifetime-trait-impl.stderr b/src/test/ui/generic/generic-lifetime-trait-impl.stderr index 182eab0a69b21..8f4a0f23670bf 100644 --- a/src/test/ui/generic/generic-lifetime-trait-impl.stderr +++ b/src/test/ui/generic/generic-lifetime-trait-impl.stderr @@ -1,5 +1,5 @@ error[E0195]: lifetime parameters or bounds on method `bar` do not match the trait declaration - --> $DIR/generic-lifetime-trait-impl.rs:29:11 + --> $DIR/generic-lifetime-trait-impl.rs:19:11 | LL | fn bar<'b, T: Bar<'b>>(self) -> &'b str; | ---------------- lifetimes in impl do not match this method in trait diff --git a/src/test/ui/generic/generic-no-mangle.rs b/src/test/ui/generic/generic-no-mangle.rs index 2b4c94d281f73..15e662a41de22 100644 --- a/src/test/ui/generic/generic-no-mangle.rs +++ b/src/test/ui/generic/generic-no-mangle.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(no_mangle_generic_items)] #[no_mangle] diff --git a/src/test/ui/generic/generic-no-mangle.stderr b/src/test/ui/generic/generic-no-mangle.stderr index 4eaa3973329c9..639ee19910155 100644 --- a/src/test/ui/generic/generic-no-mangle.stderr +++ b/src/test/ui/generic/generic-no-mangle.stderr @@ -1,5 +1,5 @@ error: functions generic over types must be mangled - --> $DIR/generic-no-mangle.rs:14:1 + --> $DIR/generic-no-mangle.rs:4:1 | LL | #[no_mangle] | ------------ help: remove this attribute @@ -7,13 +7,13 @@ LL | pub fn foo() {} //~ ERROR functions generic over types must be mangled | ^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/generic-no-mangle.rs:11:9 + --> $DIR/generic-no-mangle.rs:1:9 | LL | #![deny(no_mangle_generic_items)] | ^^^^^^^^^^^^^^^^^^^^^^^ error: functions generic over types must be mangled - --> $DIR/generic-no-mangle.rs:17:1 + --> $DIR/generic-no-mangle.rs:7:1 | LL | #[no_mangle] | ------------ help: remove this attribute diff --git a/src/test/ui/generic/generic-non-trailing-defaults.rs b/src/test/ui/generic/generic-non-trailing-defaults.rs index 13b7753082c61..8d9883dc7a939 100644 --- a/src/test/ui/generic/generic-non-trailing-defaults.rs +++ b/src/test/ui/generic/generic-non-trailing-defaults.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Heap; struct Vec(A, T); diff --git a/src/test/ui/generic/generic-non-trailing-defaults.stderr b/src/test/ui/generic/generic-non-trailing-defaults.stderr index ce8badf6d30bc..fb359f673a95e 100644 --- a/src/test/ui/generic/generic-non-trailing-defaults.stderr +++ b/src/test/ui/generic/generic-non-trailing-defaults.stderr @@ -1,17 +1,17 @@ error: type parameters with a default must be trailing - --> $DIR/generic-non-trailing-defaults.rs:13:12 + --> $DIR/generic-non-trailing-defaults.rs:3:12 | LL | struct Vec(A, T); | ^ error: type parameters with a default must be trailing - --> $DIR/generic-non-trailing-defaults.rs:16:15 + --> $DIR/generic-non-trailing-defaults.rs:6:15 | LL | struct Foo, C>(A, B, C); | ^ error[E0128]: type parameters with a default cannot use forward declared identifiers - --> $DIR/generic-non-trailing-defaults.rs:16:23 + --> $DIR/generic-non-trailing-defaults.rs:6:23 | LL | struct Foo, C>(A, B, C); | ^ defaulted type parameters cannot be forward declared diff --git a/src/test/ui/generic/generic-param-attrs.rs b/src/test/ui/generic/generic-param-attrs.rs index 81113d949e173..601d2a9e0a31f 100644 --- a/src/test/ui/generic/generic-param-attrs.rs +++ b/src/test/ui/generic/generic-param-attrs.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This test previously ensured that attributes on formals in generic parameter // lists are rejected without a feature gate. // diff --git a/src/test/ui/generic/generic-type-less-params-with-defaults.rs b/src/test/ui/generic/generic-type-less-params-with-defaults.rs index c873fa676008d..c7fcaad6bdab8 100644 --- a/src/test/ui/generic/generic-type-less-params-with-defaults.rs +++ b/src/test/ui/generic/generic-type-less-params-with-defaults.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::marker; struct Heap; diff --git a/src/test/ui/generic/generic-type-less-params-with-defaults.stderr b/src/test/ui/generic/generic-type-less-params-with-defaults.stderr index 28867eb2254ea..3b7a6dd143da1 100644 --- a/src/test/ui/generic/generic-type-less-params-with-defaults.stderr +++ b/src/test/ui/generic/generic-type-less-params-with-defaults.stderr @@ -1,5 +1,5 @@ error[E0243]: wrong number of type arguments: expected at least 1, found 0 - --> $DIR/generic-type-less-params-with-defaults.rs:19:12 + --> $DIR/generic-type-less-params-with-defaults.rs:9:12 | LL | let _: Vec; | ^^^ expected at least 1 type argument diff --git a/src/test/ui/generic/generic-type-more-params-with-defaults.rs b/src/test/ui/generic/generic-type-more-params-with-defaults.rs index 0d1b1943ca220..dd57d8b808a61 100644 --- a/src/test/ui/generic/generic-type-more-params-with-defaults.rs +++ b/src/test/ui/generic/generic-type-more-params-with-defaults.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::marker; struct Heap; diff --git a/src/test/ui/generic/generic-type-more-params-with-defaults.stderr b/src/test/ui/generic/generic-type-more-params-with-defaults.stderr index f226921816d09..89d855d298a17 100644 --- a/src/test/ui/generic/generic-type-more-params-with-defaults.stderr +++ b/src/test/ui/generic/generic-type-more-params-with-defaults.stderr @@ -1,5 +1,5 @@ error[E0244]: wrong number of type arguments: expected at most 2, found 3 - --> $DIR/generic-type-more-params-with-defaults.rs:19:12 + --> $DIR/generic-type-more-params-with-defaults.rs:9:12 | LL | let _: Vec; | ^^^^^^^^^^^^^^^^^^^^^^ expected at most 2 type argument diff --git a/src/test/ui/generic/generic-type-params-forward-mention.rs b/src/test/ui/generic/generic-type-params-forward-mention.rs index bfa6af0da433b..ac0cab20d78a2 100644 --- a/src/test/ui/generic/generic-type-params-forward-mention.rs +++ b/src/test/ui/generic/generic-type-params-forward-mention.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Ensure that we get an error and not an ICE for this problematic case. struct Foo, U = bool>(T, U); //~^ ERROR type parameters with a default cannot use forward declared identifiers diff --git a/src/test/ui/generic/generic-type-params-forward-mention.stderr b/src/test/ui/generic/generic-type-params-forward-mention.stderr index 542716326f1b2..97389c337fcbe 100644 --- a/src/test/ui/generic/generic-type-params-forward-mention.stderr +++ b/src/test/ui/generic/generic-type-params-forward-mention.stderr @@ -1,5 +1,5 @@ error[E0128]: type parameters with a default cannot use forward declared identifiers - --> $DIR/generic-type-params-forward-mention.rs:12:23 + --> $DIR/generic-type-params-forward-mention.rs:2:23 | LL | struct Foo, U = bool>(T, U); | ^ defaulted type parameters cannot be forward declared diff --git a/src/test/ui/generic/generic-type-params-name-repr.rs b/src/test/ui/generic/generic-type-params-name-repr.rs index 71d7cf792e475..7e074aa2a6bd4 100644 --- a/src/test/ui/generic/generic-type-params-name-repr.rs +++ b/src/test/ui/generic/generic-type-params-name-repr.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::marker; struct A; diff --git a/src/test/ui/generic/generic-type-params-name-repr.stderr b/src/test/ui/generic/generic-type-params-name-repr.stderr index 1c65aeadae605..2aa9cafb8bf0e 100644 --- a/src/test/ui/generic/generic-type-params-name-repr.stderr +++ b/src/test/ui/generic/generic-type-params-name-repr.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/generic-type-params-name-repr.rs:23:25 + --> $DIR/generic-type-params-name-repr.rs:13:25 | LL | let _: Foo = (); | ^^ expected struct `Foo`, found () @@ -8,7 +8,7 @@ LL | let _: Foo = (); found type `()` error[E0308]: mismatched types - --> $DIR/generic-type-params-name-repr.rs:30:31 + --> $DIR/generic-type-params-name-repr.rs:20:31 | LL | let _: Foo = (); | ^^ expected struct `Foo`, found () @@ -17,7 +17,7 @@ LL | let _: Foo = (); found type `()` error[E0308]: mismatched types - --> $DIR/generic-type-params-name-repr.rs:37:37 + --> $DIR/generic-type-params-name-repr.rs:27:37 | LL | let _: HashMap = (); | ^^ expected struct `HashMap`, found () @@ -26,7 +26,7 @@ LL | let _: HashMap = (); found type `()` error[E0308]: mismatched types - --> $DIR/generic-type-params-name-repr.rs:42:51 + --> $DIR/generic-type-params-name-repr.rs:32:51 | LL | let _: HashMap> = (); | ^^ expected struct `HashMap`, found () @@ -35,7 +35,7 @@ LL | let _: HashMap> = (); found type `()` error[E0308]: mismatched types - --> $DIR/generic-type-params-name-repr.rs:49:31 + --> $DIR/generic-type-params-name-repr.rs:39:31 | LL | let _: Foo = (); | ^^ expected struct `Foo`, found () @@ -44,7 +44,7 @@ LL | let _: Foo = (); found type `()` error[E0308]: mismatched types - --> $DIR/generic-type-params-name-repr.rs:56:27 + --> $DIR/generic-type-params-name-repr.rs:46:27 | LL | let _: Foo = (); | ^^ expected struct `Foo`, found () diff --git a/src/test/ui/glob-cycles.rs b/src/test/ui/glob-cycles.rs index 8f1b8ec91db38..16df18a705292 100644 --- a/src/test/ui/glob-cycles.rs +++ b/src/test/ui/glob-cycles.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] mod foo { diff --git a/src/test/ui/glob-cycles.stderr b/src/test/ui/glob-cycles.stderr index a9fd9306e2140..76a791e1e4364 100644 --- a/src/test/ui/glob-cycles.stderr +++ b/src/test/ui/glob-cycles.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/glob-cycles.rs:29:1 + --> $DIR/glob-cycles.rs:19:1 | LL | pub fn main() {} //~ ERROR compilation successful | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/glob-resolve1.rs b/src/test/ui/glob-resolve1.rs index 2723b4ce256d9..63c435cc20641 100644 --- a/src/test/ui/glob-resolve1.rs +++ b/src/test/ui/glob-resolve1.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Make sure that globs only bring in public things. use bar::*; diff --git a/src/test/ui/glob-resolve1.stderr b/src/test/ui/glob-resolve1.stderr index 650dd2c3b19e3..899ffbf0d09a0 100644 --- a/src/test/ui/glob-resolve1.stderr +++ b/src/test/ui/glob-resolve1.stderr @@ -1,5 +1,5 @@ error[E0425]: cannot find function `fpriv` in this scope - --> $DIR/glob-resolve1.rs:32:5 + --> $DIR/glob-resolve1.rs:22:5 | LL | fpriv(); //~ ERROR cannot find function `fpriv` in this scope | ^^^^^ not found in this scope @@ -9,7 +9,7 @@ LL | use bar::fpriv; | error[E0425]: cannot find function `epriv` in this scope - --> $DIR/glob-resolve1.rs:33:5 + --> $DIR/glob-resolve1.rs:23:5 | LL | epriv(); //~ ERROR cannot find function `epriv` in this scope | ^^^^^ not found in this scope @@ -19,7 +19,7 @@ LL | use bar::epriv; | error[E0423]: expected value, found enum `B` - --> $DIR/glob-resolve1.rs:34:5 + --> $DIR/glob-resolve1.rs:24:5 | LL | B; //~ ERROR expected value, found enum `B` | ^ @@ -28,7 +28,7 @@ LL | B; //~ ERROR expected value, found enum `B` - `B::B1` error[E0425]: cannot find value `C` in this scope - --> $DIR/glob-resolve1.rs:35:5 + --> $DIR/glob-resolve1.rs:25:5 | LL | C; //~ ERROR cannot find value `C` in this scope | ^ not found in this scope @@ -38,13 +38,13 @@ LL | use bar::C; | error[E0425]: cannot find function `import` in this scope - --> $DIR/glob-resolve1.rs:36:5 + --> $DIR/glob-resolve1.rs:26:5 | LL | import(); //~ ERROR: cannot find function `import` in this scope | ^^^^^^ not found in this scope error[E0412]: cannot find type `A` in this scope - --> $DIR/glob-resolve1.rs:38:11 + --> $DIR/glob-resolve1.rs:28:11 | LL | foo::(); //~ ERROR: cannot find type `A` in this scope | ^ did you mean `B`? @@ -54,7 +54,7 @@ LL | use bar::A; | error[E0412]: cannot find type `C` in this scope - --> $DIR/glob-resolve1.rs:39:11 + --> $DIR/glob-resolve1.rs:29:11 | LL | foo::(); //~ ERROR: cannot find type `C` in this scope | ^ did you mean `B`? @@ -64,7 +64,7 @@ LL | use bar::C; | error[E0412]: cannot find type `D` in this scope - --> $DIR/glob-resolve1.rs:40:11 + --> $DIR/glob-resolve1.rs:30:11 | LL | foo::(); //~ ERROR: cannot find type `D` in this scope | ^ did you mean `B`? diff --git a/src/test/ui/hashmap-iter-value-lifetime.nll.stderr b/src/test/ui/hashmap-iter-value-lifetime.nll.stderr index ec52d19cd1c58..1dabe2981f7eb 100644 --- a/src/test/ui/hashmap-iter-value-lifetime.nll.stderr +++ b/src/test/ui/hashmap-iter-value-lifetime.nll.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `my_stuff` as mutable because it is also borrowed as immutable - --> $DIR/hashmap-iter-value-lifetime.rs:17:5 + --> $DIR/hashmap-iter-value-lifetime.rs:7:5 | LL | let (_, thing) = my_stuff.iter().next().unwrap(); | -------- immutable borrow occurs here diff --git a/src/test/ui/hashmap-iter-value-lifetime.rs b/src/test/ui/hashmap-iter-value-lifetime.rs index 9cf145a1ff387..260ea8c7ae15f 100644 --- a/src/test/ui/hashmap-iter-value-lifetime.rs +++ b/src/test/ui/hashmap-iter-value-lifetime.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let mut my_stuff = std::collections::HashMap::new(); my_stuff.insert(0, 42); diff --git a/src/test/ui/hashmap-iter-value-lifetime.stderr b/src/test/ui/hashmap-iter-value-lifetime.stderr index 16e9c52739139..99761dd1cd7f5 100644 --- a/src/test/ui/hashmap-iter-value-lifetime.stderr +++ b/src/test/ui/hashmap-iter-value-lifetime.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `my_stuff` as mutable because it is also borrowed as immutable - --> $DIR/hashmap-iter-value-lifetime.rs:17:5 + --> $DIR/hashmap-iter-value-lifetime.rs:7:5 | LL | let (_, thing) = my_stuff.iter().next().unwrap(); | -------- immutable borrow occurs here diff --git a/src/test/ui/hashmap-lifetimes.nll.stderr b/src/test/ui/hashmap-lifetimes.nll.stderr index 943b684fe8d77..778bb88244b08 100644 --- a/src/test/ui/hashmap-lifetimes.nll.stderr +++ b/src/test/ui/hashmap-lifetimes.nll.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `my_stuff` as mutable because it is also borrowed as immutable - --> $DIR/hashmap-lifetimes.rs:18:5 + --> $DIR/hashmap-lifetimes.rs:6:5 | LL | let mut it = my_stuff.iter(); | -------- immutable borrow occurs here diff --git a/src/test/ui/hashmap-lifetimes.rs b/src/test/ui/hashmap-lifetimes.rs index eb7404e7b780b..295bf3b0e6631 100644 --- a/src/test/ui/hashmap-lifetimes.rs +++ b/src/test/ui/hashmap-lifetimes.rs @@ -1,15 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - - fn main() { let mut my_stuff = std::collections::HashMap::new(); my_stuff.insert(0, 42); diff --git a/src/test/ui/hashmap-lifetimes.stderr b/src/test/ui/hashmap-lifetimes.stderr index 187c98ab298b6..81b2304f38102 100644 --- a/src/test/ui/hashmap-lifetimes.stderr +++ b/src/test/ui/hashmap-lifetimes.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `my_stuff` as mutable because it is also borrowed as immutable - --> $DIR/hashmap-lifetimes.rs:18:5 + --> $DIR/hashmap-lifetimes.rs:6:5 | LL | let mut it = my_stuff.iter(); | -------- immutable borrow occurs here diff --git a/src/test/ui/hello_world/main.rs b/src/test/ui/hello_world/main.rs index bf6e5225124c7..f790af64b4df0 100644 --- a/src/test/ui/hello_world/main.rs +++ b/src/test/ui/hello_world/main.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass // Test that compiling hello world succeeds with no output of any kind. diff --git a/src/test/ui/hidden-rt-injection.rs b/src/test/ui/hidden-rt-injection.rs index a27a84647072c..3ca04f934934c 100644 --- a/src/test/ui/hidden-rt-injection.rs +++ b/src/test/ui/hidden-rt-injection.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This is testing that users can't access the runtime crate. mod m { diff --git a/src/test/ui/hidden-rt-injection.stderr b/src/test/ui/hidden-rt-injection.stderr index 103cdf0548513..6d63344882b22 100644 --- a/src/test/ui/hidden-rt-injection.stderr +++ b/src/test/ui/hidden-rt-injection.stderr @@ -1,5 +1,5 @@ error[E0432]: unresolved import `native` - --> $DIR/hidden-rt-injection.rs:15:9 + --> $DIR/hidden-rt-injection.rs:5:9 | LL | use native; //~ ERROR unresolved import | ^^^^^^ no `native` in the root diff --git a/src/test/ui/hidden-rt-injection2.rs b/src/test/ui/hidden-rt-injection2.rs index fa6584ddd98e8..2af113c05e012 100644 --- a/src/test/ui/hidden-rt-injection2.rs +++ b/src/test/ui/hidden-rt-injection2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This is testing that users can't access the runtime crate. mod m { diff --git a/src/test/ui/hidden-rt-injection2.stderr b/src/test/ui/hidden-rt-injection2.stderr index df0527f307a56..bbb45552f2c14 100644 --- a/src/test/ui/hidden-rt-injection2.stderr +++ b/src/test/ui/hidden-rt-injection2.stderr @@ -1,5 +1,5 @@ error[E0432]: unresolved import `rt` - --> $DIR/hidden-rt-injection2.rs:15:9 + --> $DIR/hidden-rt-injection2.rs:5:9 | LL | use rt; //~ ERROR unresolved import | ^^ no `rt` in the root diff --git a/src/test/ui/higher-lifetime-bounds.rs b/src/test/ui/higher-lifetime-bounds.rs index 70b3b34fbd8fc..546f4d4366333 100644 --- a/src/test/ui/higher-lifetime-bounds.rs +++ b/src/test/ui/higher-lifetime-bounds.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code, non_camel_case_types)] // Test that bounds on higher-kinded lifetime binders are rejected. diff --git a/src/test/ui/higher-lifetime-bounds.stderr b/src/test/ui/higher-lifetime-bounds.stderr index 82c0074743604..431a89f5eb81b 100644 --- a/src/test/ui/higher-lifetime-bounds.stderr +++ b/src/test/ui/higher-lifetime-bounds.stderr @@ -1,65 +1,65 @@ error: lifetime bounds cannot be used in this context - --> $DIR/higher-lifetime-bounds.rs:18:22 + --> $DIR/higher-lifetime-bounds.rs:8:22 | LL | f: for<'xa, 'xb: 'xa+'xa> fn(&'xa i32, &'xb i32) -> &'xa i32) | ^^^ ^^^ error: lifetime bounds cannot be used in this context - --> $DIR/higher-lifetime-bounds.rs:26:34 + --> $DIR/higher-lifetime-bounds.rs:16:34 | LL | fn bar2<'a, 'b, F: for<'xa, 'xb: 'xa> Fn(&'xa i32, &'xb i32) -> &'xa i32>( | ^^^ error: lifetime bounds cannot be used in this context - --> $DIR/higher-lifetime-bounds.rs:41:28 + --> $DIR/higher-lifetime-bounds.rs:31:28 | LL | where F: for<'xa, 'xb: 'xa> Fn(&'xa i32, &'xb i32) -> &'xa i32 | ^^^ error: lifetime bounds cannot be used in this context - --> $DIR/higher-lifetime-bounds.rs:53:25 + --> $DIR/higher-lifetime-bounds.rs:43:25 | LL | where for<'xa, 'xb: 'xa> F: Fn(&'xa i32, &'xb i32) -> &'xa i32 | ^^^ error: lifetime bounds cannot be used in this context - --> $DIR/higher-lifetime-bounds.rs:61:28 + --> $DIR/higher-lifetime-bounds.rs:51:28 | LL | struct S1 Fn(&'xa i32, &'xb i32) -> &'xa i32>(F); | ^^^ error: lifetime bounds cannot be used in this context - --> $DIR/higher-lifetime-bounds.rs:63:40 + --> $DIR/higher-lifetime-bounds.rs:53:40 | LL | struct S2(F) where F: for<'xa, 'xb: 'xa> Fn(&'xa i32, &'xb i32) -> &'xa i32; | ^^^ error: lifetime bounds cannot be used in this context - --> $DIR/higher-lifetime-bounds.rs:65:37 + --> $DIR/higher-lifetime-bounds.rs:55:37 | LL | struct S3(F) where for<'xa, 'xb: 'xa> F: Fn(&'xa i32, &'xb i32) -> &'xa i32; | ^^^ error: lifetime bounds cannot be used in this context - --> $DIR/higher-lifetime-bounds.rs:68:29 + --> $DIR/higher-lifetime-bounds.rs:58:29 | LL | struct S_fnty(for<'xa, 'xb: 'xa> fn(&'xa i32, &'xb i32) -> &'xa i32); | ^^^ error: lifetime bounds cannot be used in this context - --> $DIR/higher-lifetime-bounds.rs:71:29 + --> $DIR/higher-lifetime-bounds.rs:61:29 | LL | type T1 = Box Fn(&'xa i32, &'xb i32) -> &'xa i32>; | ^^^ error: lifetime bounds cannot be used in this context - --> $DIR/higher-lifetime-bounds.rs:75:34 + --> $DIR/higher-lifetime-bounds.rs:65:34 | LL | let _ : Option fn(&'xa i32, &'xb i32) -> &'xa i32> = None; | ^^^ error: lifetime bounds cannot be used in this context - --> $DIR/higher-lifetime-bounds.rs:77:38 + --> $DIR/higher-lifetime-bounds.rs:67:38 | LL | let _ : Option Fn(&'xa i32, &'xb i32) -> &'xa i32>> = None; | ^^^ diff --git a/src/test/ui/hr-subtype/hr-subtype.bound_a_b_ret_a_vs_bound_a_ret_a.stderr b/src/test/ui/hr-subtype/hr-subtype.bound_a_b_ret_a_vs_bound_a_ret_a.stderr index d668a931459d8..8e2b0b8c60045 100644 --- a/src/test/ui/hr-subtype/hr-subtype.bound_a_b_ret_a_vs_bound_a_ret_a.stderr +++ b/src/test/ui/hr-subtype/hr-subtype.bound_a_b_ret_a_vs_bound_a_ret_a.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/hr-subtype.rs:49:26 + --> $DIR/hr-subtype.rs:39:26 | LL | gimme::<$t1>(None::<$t2>); | ^^^^^^^^^^^ expected concrete lifetime, found bound lifetime parameter 'a diff --git a/src/test/ui/hr-subtype/hr-subtype.bound_a_b_vs_bound_a.stderr b/src/test/ui/hr-subtype/hr-subtype.bound_a_b_vs_bound_a.stderr index 23854f9c147a0..dbb5018139076 100644 --- a/src/test/ui/hr-subtype/hr-subtype.bound_a_b_vs_bound_a.stderr +++ b/src/test/ui/hr-subtype/hr-subtype.bound_a_b_vs_bound_a.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/hr-subtype.rs:49:26 + --> $DIR/hr-subtype.rs:39:26 | LL | gimme::<$t1>(None::<$t2>); | ^^^^^^^^^^^ expected concrete lifetime, found bound lifetime parameter 'a diff --git a/src/test/ui/hr-subtype/hr-subtype.bound_a_vs_bound_a.stderr b/src/test/ui/hr-subtype/hr-subtype.bound_a_vs_bound_a.stderr index 01a9f578fbc91..5fcb63e17bf31 100644 --- a/src/test/ui/hr-subtype/hr-subtype.bound_a_vs_bound_a.stderr +++ b/src/test/ui/hr-subtype/hr-subtype.bound_a_vs_bound_a.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/hr-subtype.rs:110:1 + --> $DIR/hr-subtype.rs:100:1 | LL | / fn main() { LL | | //[bound_a_vs_bound_a]~^ ERROR compilation successful diff --git a/src/test/ui/hr-subtype/hr-subtype.bound_a_vs_bound_b.stderr b/src/test/ui/hr-subtype/hr-subtype.bound_a_vs_bound_b.stderr index 01a9f578fbc91..5fcb63e17bf31 100644 --- a/src/test/ui/hr-subtype/hr-subtype.bound_a_vs_bound_b.stderr +++ b/src/test/ui/hr-subtype/hr-subtype.bound_a_vs_bound_b.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/hr-subtype.rs:110:1 + --> $DIR/hr-subtype.rs:100:1 | LL | / fn main() { LL | | //[bound_a_vs_bound_a]~^ ERROR compilation successful diff --git a/src/test/ui/hr-subtype/hr-subtype.bound_a_vs_free_x.stderr b/src/test/ui/hr-subtype/hr-subtype.bound_a_vs_free_x.stderr index 14e498593f314..db9892b48a6f7 100644 --- a/src/test/ui/hr-subtype/hr-subtype.bound_a_vs_free_x.stderr +++ b/src/test/ui/hr-subtype/hr-subtype.bound_a_vs_free_x.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/hr-subtype.rs:49:26 + --> $DIR/hr-subtype.rs:39:26 | LL | gimme::<$t1>(None::<$t2>); | ^^^^^^^^^^^ expected concrete lifetime, found bound lifetime parameter 'a diff --git a/src/test/ui/hr-subtype/hr-subtype.bound_co_a_b_vs_bound_co_a.stderr b/src/test/ui/hr-subtype/hr-subtype.bound_co_a_b_vs_bound_co_a.stderr index a66a4ace9103a..e9fb73411bd39 100644 --- a/src/test/ui/hr-subtype/hr-subtype.bound_co_a_b_vs_bound_co_a.stderr +++ b/src/test/ui/hr-subtype/hr-subtype.bound_co_a_b_vs_bound_co_a.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/hr-subtype.rs:49:26 + --> $DIR/hr-subtype.rs:39:26 | LL | gimme::<$t1>(None::<$t2>); | ^^^^^^^^^^^ expected concrete lifetime, found bound lifetime parameter 'a diff --git a/src/test/ui/hr-subtype/hr-subtype.bound_co_a_co_b_ret_contra_a.stderr b/src/test/ui/hr-subtype/hr-subtype.bound_co_a_co_b_ret_contra_a.stderr index 9f94b45140c06..d0e80faa68e8b 100644 --- a/src/test/ui/hr-subtype/hr-subtype.bound_co_a_co_b_ret_contra_a.stderr +++ b/src/test/ui/hr-subtype/hr-subtype.bound_co_a_co_b_ret_contra_a.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/hr-subtype.rs:49:26 + --> $DIR/hr-subtype.rs:39:26 | LL | gimme::<$t1>(None::<$t2>); | ^^^^^^^^^^^ expected concrete lifetime, found bound lifetime parameter 'a diff --git a/src/test/ui/hr-subtype/hr-subtype.bound_co_a_vs_bound_co_b.stderr b/src/test/ui/hr-subtype/hr-subtype.bound_co_a_vs_bound_co_b.stderr index 01a9f578fbc91..5fcb63e17bf31 100644 --- a/src/test/ui/hr-subtype/hr-subtype.bound_co_a_vs_bound_co_b.stderr +++ b/src/test/ui/hr-subtype/hr-subtype.bound_co_a_vs_bound_co_b.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/hr-subtype.rs:110:1 + --> $DIR/hr-subtype.rs:100:1 | LL | / fn main() { LL | | //[bound_a_vs_bound_a]~^ ERROR compilation successful diff --git a/src/test/ui/hr-subtype/hr-subtype.bound_contra_a_contra_b_ret_co_a.stderr b/src/test/ui/hr-subtype/hr-subtype.bound_contra_a_contra_b_ret_co_a.stderr index 511369703baed..3605ecf4f8667 100644 --- a/src/test/ui/hr-subtype/hr-subtype.bound_contra_a_contra_b_ret_co_a.stderr +++ b/src/test/ui/hr-subtype/hr-subtype.bound_contra_a_contra_b_ret_co_a.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/hr-subtype.rs:49:26 + --> $DIR/hr-subtype.rs:39:26 | LL | gimme::<$t1>(None::<$t2>); | ^^^^^^^^^^^ expected concrete lifetime, found bound lifetime parameter 'a diff --git a/src/test/ui/hr-subtype/hr-subtype.bound_inv_a_b_vs_bound_inv_a.stderr b/src/test/ui/hr-subtype/hr-subtype.bound_inv_a_b_vs_bound_inv_a.stderr index d39d5f76a6e86..fae6e9b5c89ca 100644 --- a/src/test/ui/hr-subtype/hr-subtype.bound_inv_a_b_vs_bound_inv_a.stderr +++ b/src/test/ui/hr-subtype/hr-subtype.bound_inv_a_b_vs_bound_inv_a.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/hr-subtype.rs:49:26 + --> $DIR/hr-subtype.rs:39:26 | LL | gimme::<$t1>(None::<$t2>); | ^^^^^^^^^^^ expected concrete lifetime, found bound lifetime parameter 'a diff --git a/src/test/ui/hr-subtype/hr-subtype.bound_inv_a_vs_bound_inv_b.stderr b/src/test/ui/hr-subtype/hr-subtype.bound_inv_a_vs_bound_inv_b.stderr index 01a9f578fbc91..5fcb63e17bf31 100644 --- a/src/test/ui/hr-subtype/hr-subtype.bound_inv_a_vs_bound_inv_b.stderr +++ b/src/test/ui/hr-subtype/hr-subtype.bound_inv_a_vs_bound_inv_b.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/hr-subtype.rs:110:1 + --> $DIR/hr-subtype.rs:100:1 | LL | / fn main() { LL | | //[bound_a_vs_bound_a]~^ ERROR compilation successful diff --git a/src/test/ui/hr-subtype/hr-subtype.free_inv_x_vs_free_inv_y.nll.stderr b/src/test/ui/hr-subtype/hr-subtype.free_inv_x_vs_free_inv_y.nll.stderr index 1999df909ed2b..a8bbafa6aed3c 100644 --- a/src/test/ui/hr-subtype/hr-subtype.free_inv_x_vs_free_inv_y.nll.stderr +++ b/src/test/ui/hr-subtype/hr-subtype.free_inv_x_vs_free_inv_y.nll.stderr @@ -1,5 +1,5 @@ warning: not reporting region error due to nll - --> $DIR/hr-subtype.rs:43:26 + --> $DIR/hr-subtype.rs:33:26 | LL | gimme::<$t2>(None::<$t1>); | ^^^^^^^^^^^ @@ -9,7 +9,7 @@ LL | | fn(Inv<'y>)) } | |__________________________________________________- in this macro invocation warning: not reporting region error due to nll - --> $DIR/hr-subtype.rs:49:26 + --> $DIR/hr-subtype.rs:39:26 | LL | gimme::<$t1>(None::<$t2>); | ^^^^^^^^^^^ @@ -19,7 +19,7 @@ LL | | fn(Inv<'y>)) } | |__________________________________________________- in this macro invocation error: compilation successful - --> $DIR/hr-subtype.rs:110:1 + --> $DIR/hr-subtype.rs:100:1 | LL | / fn main() { LL | | //[bound_a_vs_bound_a]~^ ERROR compilation successful diff --git a/src/test/ui/hr-subtype/hr-subtype.free_inv_x_vs_free_inv_y.stderr b/src/test/ui/hr-subtype/hr-subtype.free_inv_x_vs_free_inv_y.stderr index bf562700bb4f9..979f64fcd90a5 100644 --- a/src/test/ui/hr-subtype/hr-subtype.free_inv_x_vs_free_inv_y.stderr +++ b/src/test/ui/hr-subtype/hr-subtype.free_inv_x_vs_free_inv_y.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/hr-subtype.rs:43:26 + --> $DIR/hr-subtype.rs:33:26 | LL | gimme::<$t2>(None::<$t1>); | ^^^^^^^^^^^ lifetime mismatch @@ -10,8 +10,8 @@ LL | | fn(Inv<'y>)) } | = note: expected type `std::option::Option)>` found type `std::option::Option)>` -note: the lifetime 'x as defined on the function body at 42:20... - --> $DIR/hr-subtype.rs:42:20 +note: the lifetime 'x as defined on the function body at 32:20... + --> $DIR/hr-subtype.rs:32:20 | LL | fn subtype<'x,'y:'x,'z:'y>() { | ^^ @@ -19,8 +19,8 @@ LL | fn subtype<'x,'y:'x,'z:'y>() { LL | / check! { free_inv_x_vs_free_inv_y: (fn(Inv<'x>), LL | | fn(Inv<'y>)) } | |__________________________________________________- in this macro invocation -note: ...does not necessarily outlive the lifetime 'y as defined on the function body at 42:23 - --> $DIR/hr-subtype.rs:42:23 +note: ...does not necessarily outlive the lifetime 'y as defined on the function body at 32:23 + --> $DIR/hr-subtype.rs:32:23 | LL | fn subtype<'x,'y:'x,'z:'y>() { | ^^ @@ -30,7 +30,7 @@ LL | | fn(Inv<'y>)) } | |__________________________________________________- in this macro invocation error[E0308]: mismatched types - --> $DIR/hr-subtype.rs:49:26 + --> $DIR/hr-subtype.rs:39:26 | LL | gimme::<$t1>(None::<$t2>); | ^^^^^^^^^^^ lifetime mismatch @@ -41,8 +41,8 @@ LL | | fn(Inv<'y>)) } | = note: expected type `std::option::Option)>` found type `std::option::Option)>` -note: the lifetime 'x as defined on the function body at 48:22... - --> $DIR/hr-subtype.rs:48:22 +note: the lifetime 'x as defined on the function body at 38:22... + --> $DIR/hr-subtype.rs:38:22 | LL | fn supertype<'x,'y:'x,'z:'y>() { | ^^ @@ -50,8 +50,8 @@ LL | fn supertype<'x,'y:'x,'z:'y>() { LL | / check! { free_inv_x_vs_free_inv_y: (fn(Inv<'x>), LL | | fn(Inv<'y>)) } | |__________________________________________________- in this macro invocation -note: ...does not necessarily outlive the lifetime 'y as defined on the function body at 48:25 - --> $DIR/hr-subtype.rs:48:25 +note: ...does not necessarily outlive the lifetime 'y as defined on the function body at 38:25 + --> $DIR/hr-subtype.rs:38:25 | LL | fn supertype<'x,'y:'x,'z:'y>() { | ^^ diff --git a/src/test/ui/hr-subtype/hr-subtype.free_x_vs_free_x.stderr b/src/test/ui/hr-subtype/hr-subtype.free_x_vs_free_x.stderr index 01a9f578fbc91..5fcb63e17bf31 100644 --- a/src/test/ui/hr-subtype/hr-subtype.free_x_vs_free_x.stderr +++ b/src/test/ui/hr-subtype/hr-subtype.free_x_vs_free_x.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/hr-subtype.rs:110:1 + --> $DIR/hr-subtype.rs:100:1 | LL | / fn main() { LL | | //[bound_a_vs_bound_a]~^ ERROR compilation successful diff --git a/src/test/ui/hr-subtype/hr-subtype.free_x_vs_free_y.nll.stderr b/src/test/ui/hr-subtype/hr-subtype.free_x_vs_free_y.nll.stderr index f76b26b5191d3..b70dc7b0a2a23 100644 --- a/src/test/ui/hr-subtype/hr-subtype.free_x_vs_free_y.nll.stderr +++ b/src/test/ui/hr-subtype/hr-subtype.free_x_vs_free_y.nll.stderr @@ -1,5 +1,5 @@ warning: not reporting region error due to nll - --> $DIR/hr-subtype.rs:49:26 + --> $DIR/hr-subtype.rs:39:26 | LL | gimme::<$t1>(None::<$t2>); | ^^^^^^^^^^^ @@ -9,7 +9,7 @@ LL | | fn(&'y u32)) } | |__________________________________________- in this macro invocation error: compilation successful - --> $DIR/hr-subtype.rs:110:1 + --> $DIR/hr-subtype.rs:100:1 | LL | / fn main() { LL | | //[bound_a_vs_bound_a]~^ ERROR compilation successful diff --git a/src/test/ui/hr-subtype/hr-subtype.free_x_vs_free_y.stderr b/src/test/ui/hr-subtype/hr-subtype.free_x_vs_free_y.stderr index 228f6db38fb86..3b6aff5216989 100644 --- a/src/test/ui/hr-subtype/hr-subtype.free_x_vs_free_y.stderr +++ b/src/test/ui/hr-subtype/hr-subtype.free_x_vs_free_y.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/hr-subtype.rs:49:26 + --> $DIR/hr-subtype.rs:39:26 | LL | gimme::<$t1>(None::<$t2>); | ^^^^^^^^^^^ lifetime mismatch @@ -10,8 +10,8 @@ LL | | fn(&'y u32)) } | = note: expected type `std::option::Option` found type `std::option::Option` -note: the lifetime 'x as defined on the function body at 48:22... - --> $DIR/hr-subtype.rs:48:22 +note: the lifetime 'x as defined on the function body at 38:22... + --> $DIR/hr-subtype.rs:38:22 | LL | fn supertype<'x,'y:'x,'z:'y>() { | ^^ @@ -19,8 +19,8 @@ LL | fn supertype<'x,'y:'x,'z:'y>() { LL | / check! { free_x_vs_free_y: (fn(&'x u32), LL | | fn(&'y u32)) } | |__________________________________________- in this macro invocation -note: ...does not necessarily outlive the lifetime 'y as defined on the function body at 48:25 - --> $DIR/hr-subtype.rs:48:25 +note: ...does not necessarily outlive the lifetime 'y as defined on the function body at 38:25 + --> $DIR/hr-subtype.rs:38:25 | LL | fn supertype<'x,'y:'x,'z:'y>() { | ^^ diff --git a/src/test/ui/hr-subtype/hr-subtype.rs b/src/test/ui/hr-subtype/hr-subtype.rs index 86df2382732b5..4157953fb9068 100644 --- a/src/test/ui/hr-subtype/hr-subtype.rs +++ b/src/test/ui/hr-subtype/hr-subtype.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Targeted tests for the higher-ranked subtyping code. #![feature(rustc_attrs)] diff --git a/src/test/ui/hrtb/hrtb-conflate-regions.rs b/src/test/ui/hrtb/hrtb-conflate-regions.rs index 845429d4b0c0b..8953a847213d5 100644 --- a/src/test/ui/hrtb/hrtb-conflate-regions.rs +++ b/src/test/ui/hrtb/hrtb-conflate-regions.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that an impl with only one bound region `'a` cannot be used to // satisfy a constraint where there are two bound regions. diff --git a/src/test/ui/hrtb/hrtb-conflate-regions.stderr b/src/test/ui/hrtb/hrtb-conflate-regions.stderr index 42778c129600c..e2a99ea8472ba 100644 --- a/src/test/ui/hrtb/hrtb-conflate-regions.stderr +++ b/src/test/ui/hrtb/hrtb-conflate-regions.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `for<'a, 'b> SomeStruct: Foo<(&'a isize, &'b isize)>` is not satisfied - --> $DIR/hrtb-conflate-regions.rs:38:10 + --> $DIR/hrtb-conflate-regions.rs:28:10 | LL | fn b() { want_foo2::(); } //~ ERROR E0277 | ^^^^^^^^^^^^^^^^^^^^^^^ the trait `for<'a, 'b> Foo<(&'a isize, &'b isize)>` is not implemented for `SomeStruct` @@ -7,7 +7,7 @@ LL | fn b() { want_foo2::(); } //~ ERROR E0277 = help: the following implementations were found: > note: required by `want_foo2` - --> $DIR/hrtb-conflate-regions.rs:18:1 + --> $DIR/hrtb-conflate-regions.rs:8:1 | LL | / fn want_foo2() LL | | where T : for<'a,'b> Foo<(&'a isize, &'b isize)> diff --git a/src/test/ui/hrtb/hrtb-debruijn-in-receiver.nll.stderr b/src/test/ui/hrtb/hrtb-debruijn-in-receiver.nll.stderr index 0697022932504..9ef4491301253 100644 --- a/src/test/ui/hrtb/hrtb-debruijn-in-receiver.nll.stderr +++ b/src/test/ui/hrtb/hrtb-debruijn-in-receiver.nll.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `foo` as mutable more than once at a time - --> $DIR/hrtb-debruijn-in-receiver.rs:27:5 + --> $DIR/hrtb-debruijn-in-receiver.rs:17:5 | LL | foo.insert(); | --- first mutable borrow occurs here diff --git a/src/test/ui/hrtb/hrtb-debruijn-in-receiver.rs b/src/test/ui/hrtb/hrtb-debruijn-in-receiver.rs index 2365f494075d2..05d3e1a434e69 100644 --- a/src/test/ui/hrtb/hrtb-debruijn-in-receiver.rs +++ b/src/test/ui/hrtb/hrtb-debruijn-in-receiver.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test the case where the `Self` type has a bound lifetime that must // be adjusted in the fn signature. Issue #19537. diff --git a/src/test/ui/hrtb/hrtb-debruijn-in-receiver.stderr b/src/test/ui/hrtb/hrtb-debruijn-in-receiver.stderr index 9a560caf5e9c1..85bff4ce7911f 100644 --- a/src/test/ui/hrtb/hrtb-debruijn-in-receiver.stderr +++ b/src/test/ui/hrtb/hrtb-debruijn-in-receiver.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `foo` as mutable more than once at a time - --> $DIR/hrtb-debruijn-in-receiver.rs:27:5 + --> $DIR/hrtb-debruijn-in-receiver.rs:17:5 | LL | foo.insert(); | --- first mutable borrow occurs here diff --git a/src/test/ui/hrtb/hrtb-higher-ranker-supertraits-transitive.rs b/src/test/ui/hrtb/hrtb-higher-ranker-supertraits-transitive.rs index b55dccec2d56f..99001d7053c62 100644 --- a/src/test/ui/hrtb/hrtb-higher-ranker-supertraits-transitive.rs +++ b/src/test/ui/hrtb/hrtb-higher-ranker-supertraits-transitive.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test HRTB supertraits with several levels of expansion required. trait Foo<'tcx> diff --git a/src/test/ui/hrtb/hrtb-higher-ranker-supertraits-transitive.stderr b/src/test/ui/hrtb/hrtb-higher-ranker-supertraits-transitive.stderr index dca9feab201e2..d233ed475241a 100644 --- a/src/test/ui/hrtb/hrtb-higher-ranker-supertraits-transitive.stderr +++ b/src/test/ui/hrtb/hrtb-higher-ranker-supertraits-transitive.stderr @@ -1,12 +1,12 @@ error[E0277]: the trait bound `for<'ccx> B: Bar<'ccx>` is not satisfied - --> $DIR/hrtb-higher-ranker-supertraits-transitive.rs:57:5 + --> $DIR/hrtb-higher-ranker-supertraits-transitive.rs:47:5 | LL | want_bar_for_any_ccx(b); //~ ERROR E0277 | ^^^^^^^^^^^^^^^^^^^^ the trait `for<'ccx> Bar<'ccx>` is not implemented for `B` | = help: consider adding a `where for<'ccx> B: Bar<'ccx>` bound note: required by `want_bar_for_any_ccx` - --> $DIR/hrtb-higher-ranker-supertraits-transitive.rs:41:1 + --> $DIR/hrtb-higher-ranker-supertraits-transitive.rs:31:1 | LL | / fn want_bar_for_any_ccx(b: &B) LL | | where B : for<'ccx> Bar<'ccx> diff --git a/src/test/ui/hrtb/hrtb-higher-ranker-supertraits.rs b/src/test/ui/hrtb/hrtb-higher-ranker-supertraits.rs index 4c5add4aceaaf..f430a10d2a722 100644 --- a/src/test/ui/hrtb/hrtb-higher-ranker-supertraits.rs +++ b/src/test/ui/hrtb/hrtb-higher-ranker-supertraits.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test a trait (`Bar`) with a higher-ranked supertrait. trait Foo<'tcx> diff --git a/src/test/ui/hrtb/hrtb-higher-ranker-supertraits.stderr b/src/test/ui/hrtb/hrtb-higher-ranker-supertraits.stderr index ad069e10182c9..fe485c5b259eb 100644 --- a/src/test/ui/hrtb/hrtb-higher-ranker-supertraits.stderr +++ b/src/test/ui/hrtb/hrtb-higher-ranker-supertraits.stderr @@ -1,12 +1,12 @@ error[E0277]: the trait bound `for<'tcx> F: Foo<'tcx>` is not satisfied - --> $DIR/hrtb-higher-ranker-supertraits.rs:28:5 + --> $DIR/hrtb-higher-ranker-supertraits.rs:18:5 | LL | want_foo_for_any_tcx(f); //~ ERROR E0277 | ^^^^^^^^^^^^^^^^^^^^ the trait `for<'tcx> Foo<'tcx>` is not implemented for `F` | = help: consider adding a `where for<'tcx> F: Foo<'tcx>` bound note: required by `want_foo_for_any_tcx` - --> $DIR/hrtb-higher-ranker-supertraits.rs:31:1 + --> $DIR/hrtb-higher-ranker-supertraits.rs:21:1 | LL | / fn want_foo_for_any_tcx(f: &F) LL | | where F : for<'tcx> Foo<'tcx> @@ -17,14 +17,14 @@ LL | | } | |_^ error[E0277]: the trait bound `for<'ccx> B: Bar<'ccx>` is not satisfied - --> $DIR/hrtb-higher-ranker-supertraits.rs:45:5 + --> $DIR/hrtb-higher-ranker-supertraits.rs:35:5 | LL | want_bar_for_any_ccx(b); //~ ERROR E0277 | ^^^^^^^^^^^^^^^^^^^^ the trait `for<'ccx> Bar<'ccx>` is not implemented for `B` | = help: consider adding a `where for<'ccx> B: Bar<'ccx>` bound note: required by `want_bar_for_any_ccx` - --> $DIR/hrtb-higher-ranker-supertraits.rs:48:1 + --> $DIR/hrtb-higher-ranker-supertraits.rs:38:1 | LL | / fn want_bar_for_any_ccx(b: &B) LL | | where B : for<'ccx> Bar<'ccx> diff --git a/src/test/ui/hrtb/hrtb-identity-fn-borrows.ast.nll.stderr b/src/test/ui/hrtb/hrtb-identity-fn-borrows.ast.nll.stderr index e533ecc6eb04f..bbb95e8c8d440 100644 --- a/src/test/ui/hrtb/hrtb-identity-fn-borrows.ast.nll.stderr +++ b/src/test/ui/hrtb/hrtb-identity-fn-borrows.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `x` because it is borrowed - --> $DIR/hrtb-identity-fn-borrows.rs:27:5 + --> $DIR/hrtb-identity-fn-borrows.rs:17:5 | LL | let y = f.call(&x); | -- borrow of `x` occurs here diff --git a/src/test/ui/hrtb/hrtb-identity-fn-borrows.ast.stderr b/src/test/ui/hrtb/hrtb-identity-fn-borrows.ast.stderr index 6888ec9bddbf0..f6f9200a354d5 100644 --- a/src/test/ui/hrtb/hrtb-identity-fn-borrows.ast.stderr +++ b/src/test/ui/hrtb/hrtb-identity-fn-borrows.ast.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `x` because it is borrowed - --> $DIR/hrtb-identity-fn-borrows.rs:27:5 + --> $DIR/hrtb-identity-fn-borrows.rs:17:5 | LL | let y = f.call(&x); | - borrow of `x` occurs here diff --git a/src/test/ui/hrtb/hrtb-identity-fn-borrows.mir.stderr b/src/test/ui/hrtb/hrtb-identity-fn-borrows.mir.stderr index e533ecc6eb04f..bbb95e8c8d440 100644 --- a/src/test/ui/hrtb/hrtb-identity-fn-borrows.mir.stderr +++ b/src/test/ui/hrtb/hrtb-identity-fn-borrows.mir.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `x` because it is borrowed - --> $DIR/hrtb-identity-fn-borrows.rs:27:5 + --> $DIR/hrtb-identity-fn-borrows.rs:17:5 | LL | let y = f.call(&x); | -- borrow of `x` occurs here diff --git a/src/test/ui/hrtb/hrtb-identity-fn-borrows.rs b/src/test/ui/hrtb/hrtb-identity-fn-borrows.rs index e98cf4eb2abd9..35b39a9a69dd0 100644 --- a/src/test/ui/hrtb/hrtb-identity-fn-borrows.rs +++ b/src/test/ui/hrtb/hrtb-identity-fn-borrows.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that the `'a` in the where clause correctly links the region // of the output to the region of the input. diff --git a/src/test/ui/hrtb/hrtb-just-for-static.rs b/src/test/ui/hrtb/hrtb-just-for-static.rs index aec950f992cf4..c162c777c0bad 100644 --- a/src/test/ui/hrtb/hrtb-just-for-static.rs +++ b/src/test/ui/hrtb/hrtb-just-for-static.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test a case where you have an impl of `Foo` for all `X` that // is being applied to `for<'a> Foo<&'a mut X>`. Issue #19730. diff --git a/src/test/ui/hrtb/hrtb-just-for-static.stderr b/src/test/ui/hrtb/hrtb-just-for-static.stderr index 615a8b3bde5b8..38865fac86ded 100644 --- a/src/test/ui/hrtb/hrtb-just-for-static.stderr +++ b/src/test/ui/hrtb/hrtb-just-for-static.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `for<'a> StaticInt: Foo<&'a isize>` is not satisfied - --> $DIR/hrtb-just-for-static.rs:34:5 + --> $DIR/hrtb-just-for-static.rs:24:5 | LL | want_hrtb::() //~ ERROR `for<'a> StaticInt: Foo<&'a isize>` is not satisfied | ^^^^^^^^^^^^^^^^^^^^^^ the trait `for<'a> Foo<&'a isize>` is not implemented for `StaticInt` @@ -7,7 +7,7 @@ LL | want_hrtb::() //~ ERROR `for<'a> StaticInt: Foo<&'a isize>` = help: the following implementations were found: > note: required by `want_hrtb` - --> $DIR/hrtb-just-for-static.rs:18:1 + --> $DIR/hrtb-just-for-static.rs:8:1 | LL | / fn want_hrtb() LL | | where T : for<'a> Foo<&'a isize> diff --git a/src/test/ui/hrtb/hrtb-perfect-forwarding.rs b/src/test/ui/hrtb/hrtb-perfect-forwarding.rs index fcfbeefced06b..90e1773a3f62d 100644 --- a/src/test/ui/hrtb/hrtb-perfect-forwarding.rs +++ b/src/test/ui/hrtb/hrtb-perfect-forwarding.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test a case where you have an impl of `Foo` for all `X` that // is being applied to `for<'a> Foo<&'a mut X>`. Issue #19730. diff --git a/src/test/ui/hrtb/hrtb-perfect-forwarding.stderr b/src/test/ui/hrtb/hrtb-perfect-forwarding.stderr index 5e8674df0537d..6cada7ac78f4b 100644 --- a/src/test/ui/hrtb/hrtb-perfect-forwarding.stderr +++ b/src/test/ui/hrtb/hrtb-perfect-forwarding.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `for<'a> T: Bar<&'a isize>` is not satisfied - --> $DIR/hrtb-perfect-forwarding.rs:56:5 + --> $DIR/hrtb-perfect-forwarding.rs:46:5 | LL | foo_hrtb_bar_not(&mut t); //~ ERROR `for<'a> T: Bar<&'a isize>` is not satisfied | ^^^^^^^^^^^^^^^^ the trait `for<'a> Bar<&'a isize>` is not implemented for `T` @@ -7,7 +7,7 @@ LL | foo_hrtb_bar_not(&mut t); //~ ERROR `for<'a> T: Bar<&'a isize>` is not = help: consider adding a `where for<'a> T: Bar<&'a isize>` bound = note: required because of the requirements on the impl of `for<'a> Foo<&'a isize>` for `&mut T` note: required by `foo_hrtb_bar_not` - --> $DIR/hrtb-perfect-forwarding.rs:49:1 + --> $DIR/hrtb-perfect-forwarding.rs:39:1 | LL | / fn foo_hrtb_bar_not<'b,T>(mut t: T) LL | | where T : for<'a> Foo<&'a isize> + Bar<&'b isize> diff --git a/src/test/ui/huge-array-simple.rs b/src/test/ui/huge-array-simple.rs index 54340cf7ac414..5fa874c1fa0d3 100644 --- a/src/test/ui/huge-array-simple.rs +++ b/src/test/ui/huge-array-simple.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // FIXME (#23926): the error output is not consistent between a // self-hosted and a cross-compiled setup. Skipping for now. diff --git a/src/test/ui/huge-array.rs b/src/test/ui/huge-array.rs index 7de84802e1d05..0608b23dac6b1 100644 --- a/src/test/ui/huge-array.rs +++ b/src/test/ui/huge-array.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:; 1518600000 fn generic(t: T) { diff --git a/src/test/ui/huge-enum.rs b/src/test/ui/huge-enum.rs index 17e20766bab1b..18ef45794af19 100644 --- a/src/test/ui/huge-enum.rs +++ b/src/test/ui/huge-enum.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: Option // normalize-stderr-test "<\[u32; \d+\]>" -> "<[u32; N]>" diff --git a/src/test/ui/huge-struct.rs b/src/test/ui/huge-struct.rs index c935ad92e4425..74e43cc6472be 100644 --- a/src/test/ui/huge-struct.rs +++ b/src/test/ui/huge-struct.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // normalize-stderr-test "S32" -> "SXX" // normalize-stderr-test "S1M" -> "SXX" // error-pattern: too big for the current diff --git a/src/test/ui/hygiene/arguments.rs b/src/test/ui/hygiene/arguments.rs index 958133e7ec589..f0f732f4c6ff3 100644 --- a/src/test/ui/hygiene/arguments.rs +++ b/src/test/ui/hygiene/arguments.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty pretty-printing is unhygienic #![feature(decl_macro)] diff --git a/src/test/ui/hygiene/arguments.stderr b/src/test/ui/hygiene/arguments.stderr index 1b0c23eff297e..4cf35be22fad9 100644 --- a/src/test/ui/hygiene/arguments.stderr +++ b/src/test/ui/hygiene/arguments.stderr @@ -1,5 +1,5 @@ error[E0412]: cannot find type `S` in this scope - --> $DIR/arguments.rs:26:8 + --> $DIR/arguments.rs:16:8 | LL | m!(S, S); //~ ERROR cannot find type `S` in this scope | ^ not found in this scope diff --git a/src/test/ui/hygiene/assoc_item_ctxt.rs b/src/test/ui/hygiene/assoc_item_ctxt.rs index e336b0df13fea..65593d1d56077 100644 --- a/src/test/ui/hygiene/assoc_item_ctxt.rs +++ b/src/test/ui/hygiene/assoc_item_ctxt.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty pretty-printing is unhygienic #![feature(decl_macro)] diff --git a/src/test/ui/hygiene/assoc_item_ctxt.stderr b/src/test/ui/hygiene/assoc_item_ctxt.stderr index 8b410405ae5ca..d89f395d8c170 100644 --- a/src/test/ui/hygiene/assoc_item_ctxt.stderr +++ b/src/test/ui/hygiene/assoc_item_ctxt.stderr @@ -1,5 +1,5 @@ error[E0407]: method `method` is not a member of trait `Tr` - --> $DIR/assoc_item_ctxt.rs:45:13 + --> $DIR/assoc_item_ctxt.rs:35:13 | LL | fn method() {} //~ ERROR method `method` is not a member of trait `Tr` | ^^^^^^^^^^^^^^ not a member of trait `Tr` @@ -8,7 +8,7 @@ LL | mac_trait_impl!(); | ------------------ in this macro invocation error[E0046]: not all trait items implemented, missing: `method` - --> $DIR/assoc_item_ctxt.rs:44:9 + --> $DIR/assoc_item_ctxt.rs:34:9 | LL | fn method(); | ------------ `method` from trait diff --git a/src/test/ui/hygiene/assoc_ty_bindings.rs b/src/test/ui/hygiene/assoc_ty_bindings.rs index 46a138749ff17..169bf95ffe2ac 100644 --- a/src/test/ui/hygiene/assoc_ty_bindings.rs +++ b/src/test/ui/hygiene/assoc_ty_bindings.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty pretty-printing is unhygienic #![feature(decl_macro, associated_type_defaults)] diff --git a/src/test/ui/hygiene/assoc_ty_bindings.stderr b/src/test/ui/hygiene/assoc_ty_bindings.stderr index 0adf80994f7fc..c5f4d055f7551 100644 --- a/src/test/ui/hygiene/assoc_ty_bindings.stderr +++ b/src/test/ui/hygiene/assoc_ty_bindings.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/assoc_ty_bindings.rs:49:1 + --> $DIR/assoc_ty_bindings.rs:39:1 | LL | fn main() {} //~ ERROR compilation successful | ^^^^^^^^^^^^ diff --git a/src/test/ui/hygiene/auxiliary/intercrate.rs b/src/test/ui/hygiene/auxiliary/intercrate.rs index f917fabbe0c58..10d399ba54e71 100644 --- a/src/test/ui/hygiene/auxiliary/intercrate.rs +++ b/src/test/ui/hygiene/auxiliary/intercrate.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(decl_macro)] pub mod foo { diff --git a/src/test/ui/hygiene/auxiliary/local_inner_macros.rs b/src/test/ui/hygiene/auxiliary/local_inner_macros.rs index caa2903cc7035..4296ae2fddfba 100644 --- a/src/test/ui/hygiene/auxiliary/local_inner_macros.rs +++ b/src/test/ui/hygiene/auxiliary/local_inner_macros.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_export] macro_rules! helper1 { () => ( struct S; ) diff --git a/src/test/ui/hygiene/auxiliary/transparent-basic.rs b/src/test/ui/hygiene/auxiliary/transparent-basic.rs index ba65c5f4da80c..0d045d09d2cd8 100644 --- a/src/test/ui/hygiene/auxiliary/transparent-basic.rs +++ b/src/test/ui/hygiene/auxiliary/transparent-basic.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(decl_macro, rustc_attrs)] #[rustc_transparent_macro] diff --git a/src/test/ui/hygiene/dollar-crate-modern.rs b/src/test/ui/hygiene/dollar-crate-modern.rs index 6e536ab142215..380ad20486ec4 100644 --- a/src/test/ui/hygiene/dollar-crate-modern.rs +++ b/src/test/ui/hygiene/dollar-crate-modern.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Make sure `$crate` and `crate` work in for basic cases of nested macros. // compile-pass diff --git a/src/test/ui/hygiene/fields-definition.rs b/src/test/ui/hygiene/fields-definition.rs index c92bf55a72381..173c357bd69a2 100644 --- a/src/test/ui/hygiene/fields-definition.rs +++ b/src/test/ui/hygiene/fields-definition.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(decl_macro)] macro modern($a: ident) { diff --git a/src/test/ui/hygiene/fields-definition.stderr b/src/test/ui/hygiene/fields-definition.stderr index 73f524b7d2a7f..d6d25d7fa0c2c 100644 --- a/src/test/ui/hygiene/fields-definition.stderr +++ b/src/test/ui/hygiene/fields-definition.stderr @@ -1,5 +1,5 @@ error[E0124]: field `a` is already declared - --> $DIR/fields-definition.rs:24:17 + --> $DIR/fields-definition.rs:14:17 | LL | a: u8, | ----- `a` first declared here diff --git a/src/test/ui/hygiene/fields-move.nll.stderr b/src/test/ui/hygiene/fields-move.nll.stderr index 56b77714991ca..467bdd17bb67c 100644 --- a/src/test/ui/hygiene/fields-move.nll.stderr +++ b/src/test/ui/hygiene/fields-move.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `foo.x` - --> $DIR/fields-move.rs:28:9 + --> $DIR/fields-move.rs:18:9 | LL | $foo.x | ------ value moved here @@ -15,7 +15,7 @@ LL | assert_two_copies(copy_legacy!(foo), foo.x); //~ ERROR use of moved val = note: move occurs because `foo.x` has type `NonCopy`, which does not implement the `Copy` trait error[E0382]: use of moved value: `foo.x` - --> $DIR/fields-move.rs:38:42 + --> $DIR/fields-move.rs:28:42 | LL | $foo.x | ------ value moved here @@ -26,7 +26,7 @@ LL | assert_two_copies(copy_modern!(foo), foo.x); //~ ERROR use of moved val = note: move occurs because `foo.x` has type `NonCopy`, which does not implement the `Copy` trait error[E0382]: use of moved value: `foo.x` - --> $DIR/fields-move.rs:39:42 + --> $DIR/fields-move.rs:29:42 | LL | $foo.x | ------ value moved here diff --git a/src/test/ui/hygiene/fields-move.rs b/src/test/ui/hygiene/fields-move.rs index a6e3b2b2d8b47..401ad97e3b83c 100644 --- a/src/test/ui/hygiene/fields-move.rs +++ b/src/test/ui/hygiene/fields-move.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // issue #46314 #![feature(decl_macro)] diff --git a/src/test/ui/hygiene/fields-move.stderr b/src/test/ui/hygiene/fields-move.stderr index ba9de09f9d2f1..a5eeadff4dc05 100644 --- a/src/test/ui/hygiene/fields-move.stderr +++ b/src/test/ui/hygiene/fields-move.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `foo.x` - --> $DIR/fields-move.rs:38:42 + --> $DIR/fields-move.rs:28:42 | LL | $foo.x | ------ value moved here @@ -10,7 +10,7 @@ LL | assert_two_copies(copy_modern!(foo), foo.x); //~ ERROR use of moved val = note: move occurs because `foo.x` has type `NonCopy`, which does not implement the `Copy` trait error[E0382]: use of moved value: `foo.x` - --> $DIR/fields-move.rs:28:9 + --> $DIR/fields-move.rs:18:9 | LL | $foo.x | ------ value moved here @@ -24,7 +24,7 @@ LL | assert_two_copies(copy_legacy!(foo), foo.x); //~ ERROR use of moved val = note: move occurs because `foo.x` has type `NonCopy`, which does not implement the `Copy` trait error[E0382]: use of moved value: `foo.x` - --> $DIR/fields-move.rs:39:42 + --> $DIR/fields-move.rs:29:42 | LL | $foo.x | ------ value moved here diff --git a/src/test/ui/hygiene/fields-numeric-borrowck.nll.stderr b/src/test/ui/hygiene/fields-numeric-borrowck.nll.stderr index 56dfee1fe33c1..c05f2ea2ae254 100644 --- a/src/test/ui/hygiene/fields-numeric-borrowck.nll.stderr +++ b/src/test/ui/hygiene/fields-numeric-borrowck.nll.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `s.0` as mutable more than once at a time - --> $DIR/fields-numeric-borrowck.rs:16:16 + --> $DIR/fields-numeric-borrowck.rs:6:16 | LL | let borrow1 = &mut s.0; | -------- first mutable borrow occurs here diff --git a/src/test/ui/hygiene/fields-numeric-borrowck.rs b/src/test/ui/hygiene/fields-numeric-borrowck.rs index 7e14c811a30a1..9536babc25eac 100644 --- a/src/test/ui/hygiene/fields-numeric-borrowck.rs +++ b/src/test/ui/hygiene/fields-numeric-borrowck.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S(u8); fn main() { diff --git a/src/test/ui/hygiene/fields-numeric-borrowck.stderr b/src/test/ui/hygiene/fields-numeric-borrowck.stderr index d0156cfa671b5..11b5fd70aff9f 100644 --- a/src/test/ui/hygiene/fields-numeric-borrowck.stderr +++ b/src/test/ui/hygiene/fields-numeric-borrowck.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `s.0` as mutable more than once at a time - --> $DIR/fields-numeric-borrowck.rs:16:16 + --> $DIR/fields-numeric-borrowck.rs:6:16 | LL | let borrow1 = &mut s.0; | --- first mutable borrow occurs here diff --git a/src/test/ui/hygiene/fields.rs b/src/test/ui/hygiene/fields.rs index 64217770b13c9..597019cb1ee2d 100644 --- a/src/test/ui/hygiene/fields.rs +++ b/src/test/ui/hygiene/fields.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty pretty-printing is unhygienic #![feature(decl_macro)] diff --git a/src/test/ui/hygiene/fields.stderr b/src/test/ui/hygiene/fields.stderr index c4be1834c04f8..6d5b60fcb5b7f 100644 --- a/src/test/ui/hygiene/fields.stderr +++ b/src/test/ui/hygiene/fields.stderr @@ -1,5 +1,5 @@ error: type `foo::S` is private - --> $DIR/fields.rs:25:17 + --> $DIR/fields.rs:15:17 | LL | let s = S { x: 0 }; //~ ERROR type `foo::S` is private | ^^^^^^^^^^ @@ -8,7 +8,7 @@ LL | let s = foo::m!(S, x); | ------------- in this macro invocation error: type `foo::S` is private - --> $DIR/fields.rs:26:17 + --> $DIR/fields.rs:16:17 | LL | let _ = s.x; //~ ERROR type `foo::S` is private | ^ @@ -17,7 +17,7 @@ LL | let s = foo::m!(S, x); | ------------- in this macro invocation error: type `foo::T` is private - --> $DIR/fields.rs:28:17 + --> $DIR/fields.rs:18:17 | LL | let t = T(0); //~ ERROR type `foo::T` is private | ^^^^ @@ -26,7 +26,7 @@ LL | let s = foo::m!(S, x); | ------------- in this macro invocation error: type `foo::T` is private - --> $DIR/fields.rs:29:17 + --> $DIR/fields.rs:19:17 | LL | let _ = t.0; //~ ERROR type `foo::T` is private | ^ diff --git a/src/test/ui/hygiene/for-loop.rs b/src/test/ui/hygiene/for-loop.rs index d938642197092..2e5ae43a9ce47 100644 --- a/src/test/ui/hygiene/for-loop.rs +++ b/src/test/ui/hygiene/for-loop.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // for-loops are expanded in the front end, and use an `iter` ident in their expansion. Check that // `iter` is not accessible inside the for loop. diff --git a/src/test/ui/hygiene/for-loop.stderr b/src/test/ui/hygiene/for-loop.stderr index 7e606b2358c14..755bf3e55f716 100644 --- a/src/test/ui/hygiene/for-loop.stderr +++ b/src/test/ui/hygiene/for-loop.stderr @@ -1,5 +1,5 @@ error[E0425]: cannot find value `iter` in this scope - --> $DIR/for-loop.rs:16:9 + --> $DIR/for-loop.rs:6:9 | LL | iter.next(); //~ ERROR cannot find value `iter` in this scope | ^^^^ not found in this scope diff --git a/src/test/ui/hygiene/generate-mod.rs b/src/test/ui/hygiene/generate-mod.rs index 2b2108558a0f3..5a509a63cea1b 100644 --- a/src/test/ui/hygiene/generate-mod.rs +++ b/src/test/ui/hygiene/generate-mod.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This is an equivalent of issue #50504, but for declarative macros. #![feature(decl_macro, rustc_attrs)] diff --git a/src/test/ui/hygiene/generate-mod.stderr b/src/test/ui/hygiene/generate-mod.stderr index 0c5905c5acb4f..79d03b6aeebce 100644 --- a/src/test/ui/hygiene/generate-mod.stderr +++ b/src/test/ui/hygiene/generate-mod.stderr @@ -1,17 +1,17 @@ error[E0412]: cannot find type `FromOutside` in this scope - --> $DIR/generate-mod.rs:45:13 + --> $DIR/generate-mod.rs:35:13 | LL | genmod!(FromOutside, Outer); //~ ERROR cannot find type `FromOutside` in this scope | ^^^^^^^^^^^ not found in this scope error[E0412]: cannot find type `Outer` in this scope - --> $DIR/generate-mod.rs:45:26 + --> $DIR/generate-mod.rs:35:26 | LL | genmod!(FromOutside, Outer); //~ ERROR cannot find type `FromOutside` in this scope | ^^^^^ not found in this scope error[E0412]: cannot find type `FromOutside` in this scope - --> $DIR/generate-mod.rs:29:18 + --> $DIR/generate-mod.rs:19:18 | LL | type A = FromOutside; //~ ERROR cannot find type `FromOutside` in this scope | ^^^^^^^^^^^ not found in this scope @@ -20,7 +20,7 @@ LL | genmod_transparent!(); | ---------------------- in this macro invocation error[E0412]: cannot find type `Outer` in this scope - --> $DIR/generate-mod.rs:30:22 + --> $DIR/generate-mod.rs:20:22 | LL | type Inner = Outer; //~ ERROR cannot find type `Outer` in this scope | ^^^^^ not found in this scope @@ -29,7 +29,7 @@ LL | genmod_transparent!(); | ---------------------- in this macro invocation error[E0412]: cannot find type `FromOutside` in this scope - --> $DIR/generate-mod.rs:38:18 + --> $DIR/generate-mod.rs:28:18 | LL | type A = FromOutside; //~ ERROR cannot find type `FromOutside` in this scope | ^^^^^^^^^^^ not found in this scope @@ -38,7 +38,7 @@ LL | genmod_legacy!(); | ----------------- in this macro invocation error[E0412]: cannot find type `Outer` in this scope - --> $DIR/generate-mod.rs:39:22 + --> $DIR/generate-mod.rs:29:22 | LL | type Inner = Outer; //~ ERROR cannot find type `Outer` in this scope | ^^^^^ not found in this scope diff --git a/src/test/ui/hygiene/globs.rs b/src/test/ui/hygiene/globs.rs index 9785ce6c0048e..a3f466ef435d3 100644 --- a/src/test/ui/hygiene/globs.rs +++ b/src/test/ui/hygiene/globs.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(decl_macro)] mod foo { diff --git a/src/test/ui/hygiene/globs.stderr b/src/test/ui/hygiene/globs.stderr index 7df2e31f9a752..ad62b976251f0 100644 --- a/src/test/ui/hygiene/globs.stderr +++ b/src/test/ui/hygiene/globs.stderr @@ -1,5 +1,5 @@ error[E0425]: cannot find function `f` in this scope - --> $DIR/globs.rs:32:9 + --> $DIR/globs.rs:22:9 | LL | f(); //~ ERROR cannot find function `f` in this scope | ^ not found in this scope @@ -13,7 +13,7 @@ LL | use foo::f; | error[E0425]: cannot find function `g` in this scope - --> $DIR/globs.rs:25:5 + --> $DIR/globs.rs:15:5 | LL | g(); //~ ERROR cannot find function `g` in this scope | ^ not found in this scope @@ -37,7 +37,7 @@ LL | use foo::test::g; and 2 other candidates error[E0425]: cannot find function `f` in this scope - --> $DIR/globs.rs:71:12 + --> $DIR/globs.rs:61:12 | LL | n!(f); | ------ in this macro invocation @@ -46,7 +46,7 @@ LL | n!(f); //~ ERROR cannot find function `f` in this scope | ^ not found in this scope error[E0425]: cannot find function `f` in this scope - --> $DIR/globs.rs:75:17 + --> $DIR/globs.rs:65:17 | LL | n!(f); | ------ in this macro invocation diff --git a/src/test/ui/hygiene/hygienic-label-1.rs b/src/test/ui/hygiene/hygienic-label-1.rs index 305b43402da0b..66361eec21a52 100644 --- a/src/test/ui/hygiene/hygienic-label-1.rs +++ b/src/test/ui/hygiene/hygienic-label-1.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! foo { () => { break 'x; } //~ ERROR use of undeclared label `'x` } diff --git a/src/test/ui/hygiene/hygienic-label-1.stderr b/src/test/ui/hygiene/hygienic-label-1.stderr index 051466b183d03..9a55965d85fea 100644 --- a/src/test/ui/hygiene/hygienic-label-1.stderr +++ b/src/test/ui/hygiene/hygienic-label-1.stderr @@ -1,5 +1,5 @@ error[E0426]: use of undeclared label `'x` - --> $DIR/hygienic-label-1.rs:12:19 + --> $DIR/hygienic-label-1.rs:2:19 | LL | () => { break 'x; } //~ ERROR use of undeclared label `'x` | ^^ did you mean `'x`? diff --git a/src/test/ui/hygiene/hygienic-label-2.rs b/src/test/ui/hygiene/hygienic-label-2.rs index 24194d7bbe970..43e01a93477bd 100644 --- a/src/test/ui/hygiene/hygienic-label-2.rs +++ b/src/test/ui/hygiene/hygienic-label-2.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! foo { ($e: expr) => { 'x: loop { $e } } } diff --git a/src/test/ui/hygiene/hygienic-label-2.stderr b/src/test/ui/hygiene/hygienic-label-2.stderr index 081c1c7e69e73..b7cb91d94f1b1 100644 --- a/src/test/ui/hygiene/hygienic-label-2.stderr +++ b/src/test/ui/hygiene/hygienic-label-2.stderr @@ -1,5 +1,5 @@ error[E0426]: use of undeclared label `'x` - --> $DIR/hygienic-label-2.rs:16:16 + --> $DIR/hygienic-label-2.rs:6:16 | LL | foo!(break 'x); //~ ERROR use of undeclared label `'x` | ^^ did you mean `'x`? diff --git a/src/test/ui/hygiene/hygienic-label-3.rs b/src/test/ui/hygiene/hygienic-label-3.rs index b107b71024dad..a81eb84225970 100644 --- a/src/test/ui/hygiene/hygienic-label-3.rs +++ b/src/test/ui/hygiene/hygienic-label-3.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! foo { () => { break 'x; } //~ ERROR use of undeclared label `'x` } diff --git a/src/test/ui/hygiene/hygienic-label-3.stderr b/src/test/ui/hygiene/hygienic-label-3.stderr index e5593df49f428..227a39512b74f 100644 --- a/src/test/ui/hygiene/hygienic-label-3.stderr +++ b/src/test/ui/hygiene/hygienic-label-3.stderr @@ -1,5 +1,5 @@ error[E0426]: use of undeclared label `'x` - --> $DIR/hygienic-label-3.rs:12:19 + --> $DIR/hygienic-label-3.rs:2:19 | LL | () => { break 'x; } //~ ERROR use of undeclared label `'x` | ^^ did you mean `'x`? diff --git a/src/test/ui/hygiene/hygienic-label-4.rs b/src/test/ui/hygiene/hygienic-label-4.rs index 5bfcb6360e452..a7e1f0e78b74e 100644 --- a/src/test/ui/hygiene/hygienic-label-4.rs +++ b/src/test/ui/hygiene/hygienic-label-4.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! foo { ($e: expr) => { 'x: for _ in 0..1 { $e } } } diff --git a/src/test/ui/hygiene/hygienic-label-4.stderr b/src/test/ui/hygiene/hygienic-label-4.stderr index 60351386a0b0a..4f9a68ca8311b 100644 --- a/src/test/ui/hygiene/hygienic-label-4.stderr +++ b/src/test/ui/hygiene/hygienic-label-4.stderr @@ -1,5 +1,5 @@ error[E0426]: use of undeclared label `'x` - --> $DIR/hygienic-label-4.rs:16:16 + --> $DIR/hygienic-label-4.rs:6:16 | LL | foo!(break 'x); //~ ERROR use of undeclared label `'x` | ^^ did you mean `'x`? diff --git a/src/test/ui/hygiene/impl_items.rs b/src/test/ui/hygiene/impl_items.rs index cdba559445d19..37794c6e0773c 100644 --- a/src/test/ui/hygiene/impl_items.rs +++ b/src/test/ui/hygiene/impl_items.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty pretty-printing is unhygienic #![feature(decl_macro)] diff --git a/src/test/ui/hygiene/impl_items.stderr b/src/test/ui/hygiene/impl_items.stderr index dbcf53554cf25..cb3705e5513cc 100644 --- a/src/test/ui/hygiene/impl_items.stderr +++ b/src/test/ui/hygiene/impl_items.stderr @@ -1,5 +1,5 @@ error: type `for<'r> fn(&'r foo::S) {foo::S::f}` is private - --> $DIR/impl_items.rs:22:23 + --> $DIR/impl_items.rs:12:23 | LL | let _: () = S.f(); //~ ERROR type `for<'r> fn(&'r foo::S) {foo::S::f}` is private | ^ diff --git a/src/test/ui/hygiene/intercrate.rs b/src/test/ui/hygiene/intercrate.rs index f27eed59b8f98..2acbc893cf5fa 100644 --- a/src/test/ui/hygiene/intercrate.rs +++ b/src/test/ui/hygiene/intercrate.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-pretty pretty-printing is unhygienic // aux-build:intercrate.rs diff --git a/src/test/ui/hygiene/intercrate.stderr b/src/test/ui/hygiene/intercrate.stderr index b0792412aa0ac..30a5570b2ad0e 100644 --- a/src/test/ui/hygiene/intercrate.stderr +++ b/src/test/ui/hygiene/intercrate.stderr @@ -1,5 +1,5 @@ error: type `fn() -> u32 {intercrate::foo::bar::f}` is private - --> $DIR/intercrate.rs:20:16 + --> $DIR/intercrate.rs:10:16 | LL | assert_eq!(intercrate::foo::m!(), 1); | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/hygiene/local_inner_macros.rs b/src/test/ui/hygiene/local_inner_macros.rs index 92e10c190aa05..f4c1a931f68ad 100644 --- a/src/test/ui/hygiene/local_inner_macros.rs +++ b/src/test/ui/hygiene/local_inner_macros.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass // aux-build:local_inner_macros.rs diff --git a/src/test/ui/hygiene/nested_macro_privacy.rs b/src/test/ui/hygiene/nested_macro_privacy.rs index 6612359649c19..bee90e2bb88d4 100644 --- a/src/test/ui/hygiene/nested_macro_privacy.rs +++ b/src/test/ui/hygiene/nested_macro_privacy.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(decl_macro)] macro n($foo:ident, $S:ident, $i:ident, $m:ident) { diff --git a/src/test/ui/hygiene/nested_macro_privacy.stderr b/src/test/ui/hygiene/nested_macro_privacy.stderr index 1179065b94cd8..4fca86d521ba6 100644 --- a/src/test/ui/hygiene/nested_macro_privacy.stderr +++ b/src/test/ui/hygiene/nested_macro_privacy.stderr @@ -1,5 +1,5 @@ error[E0616]: field `i` of struct `foo::S` is private - --> $DIR/nested_macro_privacy.rs:25:5 + --> $DIR/nested_macro_privacy.rs:15:5 | LL | S::default().i; //~ ERROR field `i` of struct `foo::S` is private | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/hygiene/no_implicit_prelude.rs b/src/test/ui/hygiene/no_implicit_prelude.rs index c90c7b3093c9f..c73487628381c 100644 --- a/src/test/ui/hygiene/no_implicit_prelude.rs +++ b/src/test/ui/hygiene/no_implicit_prelude.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(decl_macro)] mod foo { diff --git a/src/test/ui/hygiene/no_implicit_prelude.stderr b/src/test/ui/hygiene/no_implicit_prelude.stderr index b3d82e9094ba7..611b6e391c43b 100644 --- a/src/test/ui/hygiene/no_implicit_prelude.stderr +++ b/src/test/ui/hygiene/no_implicit_prelude.stderr @@ -1,5 +1,5 @@ error[E0433]: failed to resolve. Use of undeclared type or module `Vec` - --> $DIR/no_implicit_prelude.rs:21:9 + --> $DIR/no_implicit_prelude.rs:11:9 | LL | fn f() { ::bar::m!(); } | ------------ in this macro invocation @@ -12,7 +12,7 @@ error[E0601]: `main` function not found in crate `no_implicit_prelude` = note: consider adding a `main` function to `$DIR/no_implicit_prelude.rs` error[E0599]: no method named `clone` found for type `()` in the current scope - --> $DIR/no_implicit_prelude.rs:22:12 + --> $DIR/no_implicit_prelude.rs:12:12 | LL | fn f() { ::bar::m!(); } | ------------ in this macro invocation diff --git a/src/test/ui/hygiene/pattern-macro.rs b/src/test/ui/hygiene/pattern-macro.rs index 26d411c915482..e5d6a3aa1a0e6 100644 --- a/src/test/ui/hygiene/pattern-macro.rs +++ b/src/test/ui/hygiene/pattern-macro.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! foo { () => ( x ) } fn main() { diff --git a/src/test/ui/hygiene/pattern-macro.stderr b/src/test/ui/hygiene/pattern-macro.stderr index b26084db02e96..8a170dccd5c42 100644 --- a/src/test/ui/hygiene/pattern-macro.stderr +++ b/src/test/ui/hygiene/pattern-macro.stderr @@ -1,5 +1,5 @@ error[E0425]: cannot find value `x` in this scope - --> $DIR/pattern-macro.rs:15:5 + --> $DIR/pattern-macro.rs:5:5 | LL | x + 1; //~ ERROR cannot find value `x` in this scope | ^ not found in this scope diff --git a/src/test/ui/hygiene/privacy.rs b/src/test/ui/hygiene/privacy.rs index 987cad187d428..78d2555539dc7 100644 --- a/src/test/ui/hygiene/privacy.rs +++ b/src/test/ui/hygiene/privacy.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(decl_macro)] mod foo { diff --git a/src/test/ui/hygiene/privacy.stderr b/src/test/ui/hygiene/privacy.stderr index 808d244e9cdb6..eed2fb260ef47 100644 --- a/src/test/ui/hygiene/privacy.stderr +++ b/src/test/ui/hygiene/privacy.stderr @@ -1,5 +1,5 @@ error[E0603]: function `f` is private - --> $DIR/privacy.rs:26:9 + --> $DIR/privacy.rs:16:9 | LL | foo::f() //~ ERROR `f` is private | ^^^^^^ diff --git a/src/test/ui/hygiene/trait_items.rs b/src/test/ui/hygiene/trait_items.rs index 3bd19cbc0ac67..a116c5b38ce97 100644 --- a/src/test/ui/hygiene/trait_items.rs +++ b/src/test/ui/hygiene/trait_items.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(decl_macro)] mod foo { diff --git a/src/test/ui/hygiene/trait_items.stderr b/src/test/ui/hygiene/trait_items.stderr index 1b2975bcf1c28..677bd08b6af57 100644 --- a/src/test/ui/hygiene/trait_items.stderr +++ b/src/test/ui/hygiene/trait_items.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `f` found for type `()` in the current scope - --> $DIR/trait_items.rs:27:24 + --> $DIR/trait_items.rs:17:24 | LL | fn f() { ::baz::m!(); } | ------------ in this macro invocation diff --git a/src/test/ui/hygiene/transparent-basic.rs b/src/test/ui/hygiene/transparent-basic.rs index 81ece1f11bc6a..0a86234fdba1f 100644 --- a/src/test/ui/hygiene/transparent-basic.rs +++ b/src/test/ui/hygiene/transparent-basic.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass // aux-build:transparent-basic.rs diff --git a/src/test/ui/if/if-branch-types.rs b/src/test/ui/if/if-branch-types.rs index ca9803f66b20d..b79a49eb5dec1 100644 --- a/src/test/ui/if/if-branch-types.rs +++ b/src/test/ui/if/if-branch-types.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = if true { 10i32 } else { 10u32 }; //~^ ERROR if and else have incompatible types diff --git a/src/test/ui/if/if-branch-types.stderr b/src/test/ui/if/if-branch-types.stderr index cefd94dc99b6c..44e172da78394 100644 --- a/src/test/ui/if/if-branch-types.stderr +++ b/src/test/ui/if/if-branch-types.stderr @@ -1,5 +1,5 @@ error[E0308]: if and else have incompatible types - --> $DIR/if-branch-types.rs:12:13 + --> $DIR/if-branch-types.rs:2:13 | LL | let x = if true { 10i32 } else { 10u32 }; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected i32, found u32 diff --git a/src/test/ui/if/if-let-arm-types.rs b/src/test/ui/if/if-let-arm-types.rs index 331fdc444ca5a..ca115cc219e95 100644 --- a/src/test/ui/if/if-let-arm-types.rs +++ b/src/test/ui/if/if-let-arm-types.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { if let Some(b) = None { //~ ERROR: `if let` arms have incompatible types //~^ expected (), found integral variable diff --git a/src/test/ui/if/if-let-arm-types.stderr b/src/test/ui/if/if-let-arm-types.stderr index 2e6b71dadf132..23cf5a45af055 100644 --- a/src/test/ui/if/if-let-arm-types.stderr +++ b/src/test/ui/if/if-let-arm-types.stderr @@ -1,5 +1,5 @@ error[E0308]: `if let` arms have incompatible types - --> $DIR/if-let-arm-types.rs:12:5 + --> $DIR/if-let-arm-types.rs:2:5 | LL | / if let Some(b) = None { //~ ERROR: `if let` arms have incompatible types LL | | //~^ expected (), found integral variable @@ -13,7 +13,7 @@ LL | | }; = note: expected type `()` found type `{integer}` note: `if let` arm with an incompatible type - --> $DIR/if-let-arm-types.rs:17:12 + --> $DIR/if-let-arm-types.rs:7:12 | LL | } else { | ____________^ diff --git a/src/test/ui/if/if-let.rs b/src/test/ui/if/if-let.rs index 1e9144910b053..304de457059f3 100644 --- a/src/test/ui/if/if-let.rs +++ b/src/test/ui/if/if-let.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn macros() { macro_rules! foo{ ($p:pat, $e:expr, $b:block) => {{ diff --git a/src/test/ui/if/if-let.stderr b/src/test/ui/if/if-let.stderr index de8d6feb3c4c8..3802d7828ae7d 100644 --- a/src/test/ui/if/if-let.stderr +++ b/src/test/ui/if/if-let.stderr @@ -1,35 +1,35 @@ error[E0162]: irrefutable if-let pattern - --> $DIR/if-let.rs:23:10 + --> $DIR/if-let.rs:13:10 | LL | foo!(a, 1, { //~ ERROR irrefutable if-let | ^ irrefutable pattern error[E0162]: irrefutable if-let pattern - --> $DIR/if-let.rs:26:10 + --> $DIR/if-let.rs:16:10 | LL | bar!(a, 1, { //~ ERROR irrefutable if-let | ^ irrefutable pattern error[E0162]: irrefutable if-let pattern - --> $DIR/if-let.rs:32:12 + --> $DIR/if-let.rs:22:12 | LL | if let a = 1 { //~ ERROR irrefutable if-let | ^ irrefutable pattern error[E0162]: irrefutable if-let pattern - --> $DIR/if-let.rs:36:12 + --> $DIR/if-let.rs:26:12 | LL | if let a = 1 { //~ ERROR irrefutable if-let | ^ irrefutable pattern error[E0162]: irrefutable if-let pattern - --> $DIR/if-let.rs:46:19 + --> $DIR/if-let.rs:36:19 | LL | } else if let a = 1 { //~ ERROR irrefutable if-let | ^ irrefutable pattern error[E0162]: irrefutable if-let pattern - --> $DIR/if-let.rs:52:19 + --> $DIR/if-let.rs:42:19 | LL | } else if let a = 1 { //~ ERROR irrefutable if-let | ^ irrefutable pattern diff --git a/src/test/ui/if/if-loop.rs b/src/test/ui/if/if-loop.rs index 15f04df693981..5a835a44a98d1 100644 --- a/src/test/ui/if/if-loop.rs +++ b/src/test/ui/if/if-loop.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![allow(warnings)] diff --git a/src/test/ui/if/if-loop.stderr b/src/test/ui/if/if-loop.stderr index 6862560570d73..15051e18e8d82 100644 --- a/src/test/ui/if/if-loop.stderr +++ b/src/test/ui/if/if-loop.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/if-loop.rs:20:1 + --> $DIR/if-loop.rs:10:1 | LL | fn main() {} //~ ERROR compilation successful | ^^^^^^^^^^^^ diff --git a/src/test/ui/if/if-typeck.rs b/src/test/ui/if/if-typeck.rs index d5d7d2005be6c..d8c262bd6b370 100644 --- a/src/test/ui/if/if-typeck.rs +++ b/src/test/ui/if/if-typeck.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:mismatched types // issue #513 diff --git a/src/test/ui/if/if-typeck.stderr b/src/test/ui/if/if-typeck.stderr index 6d96f8bf223d0..714d3ebcdb016 100644 --- a/src/test/ui/if/if-typeck.stderr +++ b/src/test/ui/if/if-typeck.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/if-typeck.rs:19:8 + --> $DIR/if-typeck.rs:9:8 | LL | if f { } | ^ expected bool, found fn item diff --git a/src/test/ui/if/if-without-block.rs b/src/test/ui/if/if-without-block.rs index ce3de3b302dd3..4f446350fac2d 100644 --- a/src/test/ui/if/if-without-block.rs +++ b/src/test/ui/if/if-without-block.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let n = 1; if 5 == { diff --git a/src/test/ui/if/if-without-block.stderr b/src/test/ui/if/if-without-block.stderr index bc8e7310ce371..35caca003c44a 100644 --- a/src/test/ui/if/if-without-block.stderr +++ b/src/test/ui/if/if-without-block.stderr @@ -1,5 +1,5 @@ error: expected `{`, found `}` - --> $DIR/if-without-block.rs:17:1 + --> $DIR/if-without-block.rs:7:1 | LL | if 5 == { | -- this `if` statement has a condition, but no block diff --git a/src/test/ui/if/if-without-else-result.rs b/src/test/ui/if/if-without-else-result.rs index 95bcce5a8474a..cd7fde40fe8f3 100644 --- a/src/test/ui/if/if-without-else-result.rs +++ b/src/test/ui/if/if-without-else-result.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let a = if true { true }; //~^ ERROR if may be missing an else clause [E0317] diff --git a/src/test/ui/if/if-without-else-result.stderr b/src/test/ui/if/if-without-else-result.stderr index ab97f6c81f79d..2134781088c3d 100644 --- a/src/test/ui/if/if-without-else-result.stderr +++ b/src/test/ui/if/if-without-else-result.stderr @@ -1,5 +1,5 @@ error[E0317]: if may be missing an else clause - --> $DIR/if-without-else-result.rs:12:13 + --> $DIR/if-without-else-result.rs:2:13 | LL | let a = if true { true }; | ^^^^^^^^^^^^^^^^ expected (), found bool diff --git a/src/test/ui/if/ifmt-bad-arg.rs b/src/test/ui/if/ifmt-bad-arg.rs index bbd75f30d6cb1..76c926378bccb 100644 --- a/src/test/ui/if/ifmt-bad-arg.rs +++ b/src/test/ui/if/ifmt-bad-arg.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { // bad arguments to the format! call diff --git a/src/test/ui/if/ifmt-bad-arg.stderr b/src/test/ui/if/ifmt-bad-arg.stderr index c8fd8bad19ba5..2c9c7a69e2844 100644 --- a/src/test/ui/if/ifmt-bad-arg.stderr +++ b/src/test/ui/if/ifmt-bad-arg.stderr @@ -1,11 +1,11 @@ error: 1 positional argument in format string, but no arguments were given - --> $DIR/ifmt-bad-arg.rs:16:14 + --> $DIR/ifmt-bad-arg.rs:6:14 | LL | format!("{}"); | ^^ error: invalid reference to positional argument 1 (there is 1 argument) - --> $DIR/ifmt-bad-arg.rs:19:14 + --> $DIR/ifmt-bad-arg.rs:9:14 | LL | format!("{1}", 1); | ^^^ @@ -13,7 +13,7 @@ LL | format!("{1}", 1); = note: positional arguments are zero-based error: argument never used - --> $DIR/ifmt-bad-arg.rs:19:20 + --> $DIR/ifmt-bad-arg.rs:9:20 | LL | format!("{1}", 1); | ----- ^ @@ -21,13 +21,13 @@ LL | format!("{1}", 1); | formatting specifier missing error: 2 positional arguments in format string, but no arguments were given - --> $DIR/ifmt-bad-arg.rs:23:14 + --> $DIR/ifmt-bad-arg.rs:13:14 | LL | format!("{} {}"); | ^^ ^^ error: invalid reference to positional argument 1 (there is 1 argument) - --> $DIR/ifmt-bad-arg.rs:26:18 + --> $DIR/ifmt-bad-arg.rs:16:18 | LL | format!("{0} {1}", 1); | ^^^ @@ -35,7 +35,7 @@ LL | format!("{0} {1}", 1); = note: positional arguments are zero-based error: invalid reference to positional argument 2 (there are 2 arguments) - --> $DIR/ifmt-bad-arg.rs:29:22 + --> $DIR/ifmt-bad-arg.rs:19:22 | LL | format!("{0} {1} {2}", 1, 2); | ^^^ @@ -43,7 +43,7 @@ LL | format!("{0} {1} {2}", 1, 2); = note: positional arguments are zero-based error: invalid reference to positional argument 2 (there are 2 arguments) - --> $DIR/ifmt-bad-arg.rs:32:28 + --> $DIR/ifmt-bad-arg.rs:22:28 | LL | format!("{} {value} {} {}", 1, value=2); | ^^ @@ -51,7 +51,7 @@ LL | format!("{} {value} {} {}", 1, value=2); = note: positional arguments are zero-based error: invalid reference to positional arguments 3, 4 and 5 (there are 3 arguments) - --> $DIR/ifmt-bad-arg.rs:34:38 + --> $DIR/ifmt-bad-arg.rs:24:38 | LL | format!("{name} {value} {} {} {} {} {} {}", 0, name=1, value=2); | ^^ ^^ ^^ @@ -59,25 +59,25 @@ LL | format!("{name} {value} {} {} {} {} {} {}", 0, name=1, value=2); = note: positional arguments are zero-based error: there is no argument named `foo` - --> $DIR/ifmt-bad-arg.rs:37:17 + --> $DIR/ifmt-bad-arg.rs:27:17 | LL | format!("{} {foo} {} {bar} {}", 1, 2, 3); | ^^^^^ error: there is no argument named `bar` - --> $DIR/ifmt-bad-arg.rs:37:26 + --> $DIR/ifmt-bad-arg.rs:27:26 | LL | format!("{} {foo} {} {bar} {}", 1, 2, 3); | ^^^^^ error: there is no argument named `foo` - --> $DIR/ifmt-bad-arg.rs:41:14 + --> $DIR/ifmt-bad-arg.rs:31:14 | LL | format!("{foo}"); //~ ERROR: no argument named `foo` | ^^^^^ error: multiple unused formatting arguments - --> $DIR/ifmt-bad-arg.rs:42:17 + --> $DIR/ifmt-bad-arg.rs:32:17 | LL | format!("", 1, 2); //~ ERROR: multiple unused formatting arguments | -- ^ ^ @@ -85,7 +85,7 @@ LL | format!("", 1, 2); //~ ERROR: multiple unused formatting | multiple missing formatting specifiers error: argument never used - --> $DIR/ifmt-bad-arg.rs:43:22 + --> $DIR/ifmt-bad-arg.rs:33:22 | LL | format!("{}", 1, 2); //~ ERROR: argument never used | ---- ^ @@ -93,7 +93,7 @@ LL | format!("{}", 1, 2); //~ ERROR: argument never used | formatting specifier missing error: argument never used - --> $DIR/ifmt-bad-arg.rs:44:20 + --> $DIR/ifmt-bad-arg.rs:34:20 | LL | format!("{1}", 1, 2); //~ ERROR: argument never used | ----- ^ @@ -101,7 +101,7 @@ LL | format!("{1}", 1, 2); //~ ERROR: argument never used | formatting specifier missing error: named argument never used - --> $DIR/ifmt-bad-arg.rs:45:26 + --> $DIR/ifmt-bad-arg.rs:35:26 | LL | format!("{}", 1, foo=2); //~ ERROR: named argument never used | ---- ^ @@ -109,7 +109,7 @@ LL | format!("{}", 1, foo=2); //~ ERROR: named argument never used | formatting specifier missing error: argument never used - --> $DIR/ifmt-bad-arg.rs:46:22 + --> $DIR/ifmt-bad-arg.rs:36:22 | LL | format!("{foo}", 1, foo=2); //~ ERROR: argument never used | ------- ^ @@ -117,7 +117,7 @@ LL | format!("{foo}", 1, foo=2); //~ ERROR: argument never used | formatting specifier missing error: named argument never used - --> $DIR/ifmt-bad-arg.rs:47:21 + --> $DIR/ifmt-bad-arg.rs:37:21 | LL | format!("", foo=2); //~ ERROR: named argument never used | -- ^ @@ -125,7 +125,7 @@ LL | format!("", foo=2); //~ ERROR: named argument never used | formatting specifier missing error: multiple unused formatting arguments - --> $DIR/ifmt-bad-arg.rs:48:32 + --> $DIR/ifmt-bad-arg.rs:38:32 | LL | format!("{} {}", 1, 2, foo=1, bar=2); //~ ERROR: multiple unused formatting arguments | ------- ^ ^ @@ -133,31 +133,31 @@ LL | format!("{} {}", 1, 2, foo=1, bar=2); //~ ERROR: multiple unused forma | multiple missing formatting specifiers error: duplicate argument named `foo` - --> $DIR/ifmt-bad-arg.rs:50:33 + --> $DIR/ifmt-bad-arg.rs:40:33 | LL | format!("{foo}", foo=1, foo=2); //~ ERROR: duplicate argument | ^ | note: previously here - --> $DIR/ifmt-bad-arg.rs:50:26 + --> $DIR/ifmt-bad-arg.rs:40:26 | LL | format!("{foo}", foo=1, foo=2); //~ ERROR: duplicate argument | ^ error: expected ident, positional arguments cannot follow named arguments - --> $DIR/ifmt-bad-arg.rs:51:24 + --> $DIR/ifmt-bad-arg.rs:41:24 | LL | format!("", foo=1, 2); //~ ERROR: positional arguments cannot follow | ^ error: there is no argument named `valueb` - --> $DIR/ifmt-bad-arg.rs:55:23 + --> $DIR/ifmt-bad-arg.rs:45:23 | LL | format!("{valuea} {valueb}", valuea=5, valuec=7); | ^^^^^^^^ error: named argument never used - --> $DIR/ifmt-bad-arg.rs:55:51 + --> $DIR/ifmt-bad-arg.rs:45:51 | LL | format!("{valuea} {valueb}", valuea=5, valuec=7); | ------------------- ^ @@ -165,7 +165,7 @@ LL | format!("{valuea} {valueb}", valuea=5, valuec=7); | formatting specifier missing error: invalid format string: expected `'}'` but string was terminated - --> $DIR/ifmt-bad-arg.rs:61:15 + --> $DIR/ifmt-bad-arg.rs:51:15 | LL | format!("{"); //~ ERROR: expected `'}'` but string was terminated | ^ expected `'}'` in format string @@ -173,7 +173,7 @@ LL | format!("{"); //~ ERROR: expected `'}'` but string was terminated = note: if you intended to print `{`, you can escape it using `{{` error: invalid format string: unmatched `}` found - --> $DIR/ifmt-bad-arg.rs:63:18 + --> $DIR/ifmt-bad-arg.rs:53:18 | LL | format!("foo } bar"); //~ ERROR: unmatched `}` found | ^ unmatched `}` in format string @@ -181,7 +181,7 @@ LL | format!("foo } bar"); //~ ERROR: unmatched `}` found = note: if you intended to print `}`, you can escape it using `}}` error: invalid format string: unmatched `}` found - --> $DIR/ifmt-bad-arg.rs:64:18 + --> $DIR/ifmt-bad-arg.rs:54:18 | LL | format!("foo }"); //~ ERROR: unmatched `}` found | ^ unmatched `}` in format string @@ -189,7 +189,7 @@ LL | format!("foo }"); //~ ERROR: unmatched `}` found = note: if you intended to print `}`, you can escape it using `}}` error: argument never used - --> $DIR/ifmt-bad-arg.rs:66:27 + --> $DIR/ifmt-bad-arg.rs:56:27 | LL | format!("foo %s baz", "bar"); //~ ERROR: argument never used | -- ^^^^^ @@ -199,7 +199,7 @@ LL | format!("foo %s baz", "bar"); //~ ERROR: argument never used = note: printf formatting not supported; see the documentation for `std::fmt` error: there is no argument named `foo` - --> $DIR/ifmt-bad-arg.rs:70:9 + --> $DIR/ifmt-bad-arg.rs:60:9 | LL | {foo} | ^^^^^ diff --git a/src/test/ui/if/ifmt-bad-format-args.rs b/src/test/ui/if/ifmt-bad-format-args.rs index 8bd3cb0f60b04..ba7301561bd0d 100644 --- a/src/test/ui/if/ifmt-bad-format-args.rs +++ b/src/test/ui/if/ifmt-bad-format-args.rs @@ -1,13 +1,3 @@ -// Copyright 2013-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { format_args!(); //~ ERROR: requires at least a format string argument format_args!(|| {}); //~ ERROR: must be a string literal diff --git a/src/test/ui/if/ifmt-bad-format-args.stderr b/src/test/ui/if/ifmt-bad-format-args.stderr index d2fe12925d78d..966c8d916a3b5 100644 --- a/src/test/ui/if/ifmt-bad-format-args.stderr +++ b/src/test/ui/if/ifmt-bad-format-args.stderr @@ -1,11 +1,11 @@ error: requires at least a format string argument - --> $DIR/ifmt-bad-format-args.rs:12:5 + --> $DIR/ifmt-bad-format-args.rs:2:5 | LL | format_args!(); //~ ERROR: requires at least a format string argument | ^^^^^^^^^^^^^^^ error: format argument must be a string literal - --> $DIR/ifmt-bad-format-args.rs:13:18 + --> $DIR/ifmt-bad-format-args.rs:3:18 | LL | format_args!(|| {}); //~ ERROR: must be a string literal | ^^^^^ diff --git a/src/test/ui/if/ifmt-unimpl.rs b/src/test/ui/if/ifmt-unimpl.rs index 9b9bae92c33c1..65daae4b25e09 100644 --- a/src/test/ui/if/ifmt-unimpl.rs +++ b/src/test/ui/if/ifmt-unimpl.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { format!("{:X}", "3"); //~^ ERROR: `str: std::fmt::UpperHex` is not satisfied diff --git a/src/test/ui/if/ifmt-unimpl.stderr b/src/test/ui/if/ifmt-unimpl.stderr index fbb3136693a27..7a7e4b34d2595 100644 --- a/src/test/ui/if/ifmt-unimpl.stderr +++ b/src/test/ui/if/ifmt-unimpl.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `str: std::fmt::UpperHex` is not satisfied - --> $DIR/ifmt-unimpl.rs:12:21 + --> $DIR/ifmt-unimpl.rs:2:21 | LL | format!("{:X}", "3"); | ^^^ the trait `std::fmt::UpperHex` is not implemented for `str` diff --git a/src/test/ui/if/ifmt-unknown-trait.rs b/src/test/ui/if/ifmt-unknown-trait.rs index d90b3d3cf81df..158152c89a428 100644 --- a/src/test/ui/if/ifmt-unknown-trait.rs +++ b/src/test/ui/if/ifmt-unknown-trait.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { format!("{:notimplemented}", "3"); //~^ ERROR: unknown format trait `notimplemented` diff --git a/src/test/ui/if/ifmt-unknown-trait.stderr b/src/test/ui/if/ifmt-unknown-trait.stderr index 3c746e4c53b51..9ea367c81ec0a 100644 --- a/src/test/ui/if/ifmt-unknown-trait.stderr +++ b/src/test/ui/if/ifmt-unknown-trait.stderr @@ -1,5 +1,5 @@ error: unknown format trait `notimplemented` - --> $DIR/ifmt-unknown-trait.rs:12:34 + --> $DIR/ifmt-unknown-trait.rs:2:34 | LL | format!("{:notimplemented}", "3"); | ^^^ diff --git a/src/test/ui/illegal-ufcs-drop.rs b/src/test/ui/illegal-ufcs-drop.rs index f4c653bd57323..5c072663eda45 100644 --- a/src/test/ui/illegal-ufcs-drop.rs +++ b/src/test/ui/illegal-ufcs-drop.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct Foo; impl Drop for Foo { diff --git a/src/test/ui/illegal-ufcs-drop.stderr b/src/test/ui/illegal-ufcs-drop.stderr index f82c54664a9a1..d8e2dc6e8700e 100644 --- a/src/test/ui/illegal-ufcs-drop.stderr +++ b/src/test/ui/illegal-ufcs-drop.stderr @@ -1,5 +1,5 @@ error[E0040]: explicit use of destructor method - --> $DIR/illegal-ufcs-drop.rs:19:5 + --> $DIR/illegal-ufcs-drop.rs:8:5 | LL | Drop::drop(&mut Foo) //~ ERROR explicit use of destructor method | ^^^^^^^^^^ explicit destructor calls not allowed diff --git a/src/test/ui/immut-function-arguments.ast.nll.stderr b/src/test/ui/immut-function-arguments.ast.nll.stderr index d33814a0fc5f5..f0163390ae000 100644 --- a/src/test/ui/immut-function-arguments.ast.nll.stderr +++ b/src/test/ui/immut-function-arguments.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to `*y`, as `y` is not declared as mutable - --> $DIR/immut-function-arguments.rs:15:5 + --> $DIR/immut-function-arguments.rs:5:5 | LL | fn f(y: Box) { | - help: consider changing this to be mutable: `mut y` @@ -7,7 +7,7 @@ LL | *y = 5; //[ast]~ ERROR cannot assign | ^^^^^^ cannot assign error[E0594]: cannot assign to `*q`, as `q` is not declared as mutable - --> $DIR/immut-function-arguments.rs:20:35 + --> $DIR/immut-function-arguments.rs:10:35 | LL | let _frob = |q: Box| { *q = 2; }; //[ast]~ ERROR cannot assign | - ^^^^^^ cannot assign diff --git a/src/test/ui/immut-function-arguments.ast.stderr b/src/test/ui/immut-function-arguments.ast.stderr index 54125b955cb1f..bbb2e64e1a84f 100644 --- a/src/test/ui/immut-function-arguments.ast.stderr +++ b/src/test/ui/immut-function-arguments.ast.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to immutable `Box` content `*y` - --> $DIR/immut-function-arguments.rs:15:5 + --> $DIR/immut-function-arguments.rs:5:5 | LL | fn f(y: Box) { | - consider changing this to `mut y` @@ -7,7 +7,7 @@ LL | *y = 5; //[ast]~ ERROR cannot assign | ^^^^^^ cannot borrow as mutable error[E0594]: cannot assign to immutable `Box` content `*q` - --> $DIR/immut-function-arguments.rs:20:35 + --> $DIR/immut-function-arguments.rs:10:35 | LL | let _frob = |q: Box| { *q = 2; }; //[ast]~ ERROR cannot assign | - ^^^^^^ cannot borrow as mutable diff --git a/src/test/ui/immut-function-arguments.mir.stderr b/src/test/ui/immut-function-arguments.mir.stderr index d33814a0fc5f5..f0163390ae000 100644 --- a/src/test/ui/immut-function-arguments.mir.stderr +++ b/src/test/ui/immut-function-arguments.mir.stderr @@ -1,5 +1,5 @@ error[E0594]: cannot assign to `*y`, as `y` is not declared as mutable - --> $DIR/immut-function-arguments.rs:15:5 + --> $DIR/immut-function-arguments.rs:5:5 | LL | fn f(y: Box) { | - help: consider changing this to be mutable: `mut y` @@ -7,7 +7,7 @@ LL | *y = 5; //[ast]~ ERROR cannot assign | ^^^^^^ cannot assign error[E0594]: cannot assign to `*q`, as `q` is not declared as mutable - --> $DIR/immut-function-arguments.rs:20:35 + --> $DIR/immut-function-arguments.rs:10:35 | LL | let _frob = |q: Box| { *q = 2; }; //[ast]~ ERROR cannot assign | - ^^^^^^ cannot assign diff --git a/src/test/ui/immut-function-arguments.rs b/src/test/ui/immut-function-arguments.rs index 61a074952efd2..2cc9c694ef198 100644 --- a/src/test/ui/immut-function-arguments.rs +++ b/src/test/ui/immut-function-arguments.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/impl-bounds-checking.rs b/src/test/ui/impl-bounds-checking.rs index f90365b71ae55..5e65a27bf14f5 100644 --- a/src/test/ui/impl-bounds-checking.rs +++ b/src/test/ui/impl-bounds-checking.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Clone2 { fn clone(&self) -> Self; } diff --git a/src/test/ui/impl-bounds-checking.stderr b/src/test/ui/impl-bounds-checking.stderr index 80666131b2ca6..618a9f94aa451 100644 --- a/src/test/ui/impl-bounds-checking.stderr +++ b/src/test/ui/impl-bounds-checking.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `isize: Clone2` is not satisfied - --> $DIR/impl-bounds-checking.rs:20:6 + --> $DIR/impl-bounds-checking.rs:10:6 | LL | impl Getter for isize { //~ ERROR `isize: Clone2` is not satisfied | ^^^^^^^^^^^^^ the trait `Clone2` is not implemented for `isize` diff --git a/src/test/ui/impl-duplicate-methods.rs b/src/test/ui/impl-duplicate-methods.rs index 884991407512f..adb09d7f56e93 100644 --- a/src/test/ui/impl-duplicate-methods.rs +++ b/src/test/ui/impl-duplicate-methods.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo; impl Foo { diff --git a/src/test/ui/impl-duplicate-methods.stderr b/src/test/ui/impl-duplicate-methods.stderr index 99e1e56e3233a..b6dc4882fc8f3 100644 --- a/src/test/ui/impl-duplicate-methods.stderr +++ b/src/test/ui/impl-duplicate-methods.stderr @@ -1,5 +1,5 @@ error[E0201]: duplicate definitions with name `orange`: - --> $DIR/impl-duplicate-methods.rs:15:5 + --> $DIR/impl-duplicate-methods.rs:5:5 | LL | fn orange(&self) {} | ------------------- previous definition of `orange` here diff --git a/src/test/ui/impl-header-lifetime-elision/assoc-type.rs b/src/test/ui/impl-header-lifetime-elision/assoc-type.rs index 15cf07771f268..50e7b3b270717 100644 --- a/src/test/ui/impl-header-lifetime-elision/assoc-type.rs +++ b/src/test/ui/impl-header-lifetime-elision/assoc-type.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we do not yet support elision in associated types, even // when there is just one name we could take from the impl header. diff --git a/src/test/ui/impl-header-lifetime-elision/assoc-type.stderr b/src/test/ui/impl-header-lifetime-elision/assoc-type.stderr index 59b2cfd2226db..b2843af0dd205 100644 --- a/src/test/ui/impl-header-lifetime-elision/assoc-type.stderr +++ b/src/test/ui/impl-header-lifetime-elision/assoc-type.stderr @@ -1,11 +1,11 @@ error[E0106]: missing lifetime specifier - --> $DIR/assoc-type.rs:23:19 + --> $DIR/assoc-type.rs:13:19 | LL | type Output = &i32; | ^ expected lifetime parameter error[E0106]: missing lifetime specifier - --> $DIR/assoc-type.rs:28:20 + --> $DIR/assoc-type.rs:18:20 | LL | type Output = &'_ i32; | ^^ expected lifetime parameter diff --git a/src/test/ui/impl-header-lifetime-elision/dyn-trait.nll.stderr b/src/test/ui/impl-header-lifetime-elision/dyn-trait.nll.stderr index f5d98e04ad804..23ee136770dfa 100644 --- a/src/test/ui/impl-header-lifetime-elision/dyn-trait.nll.stderr +++ b/src/test/ui/impl-header-lifetime-elision/dyn-trait.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/dyn-trait.rs:32:16 + --> $DIR/dyn-trait.rs:22:16 | LL | static_val(x); //~ ERROR cannot infer | ^ error: borrowed data escapes outside of function - --> $DIR/dyn-trait.rs:32:5 + --> $DIR/dyn-trait.rs:22:5 | LL | fn with_dyn_debug_static<'a>(x: Box) { | - `x` is a reference that is only valid in the function body diff --git a/src/test/ui/impl-header-lifetime-elision/dyn-trait.rs b/src/test/ui/impl-header-lifetime-elision/dyn-trait.rs index 661bfa8bdcc9b..b8ae51eaed53f 100644 --- a/src/test/ui/impl-header-lifetime-elision/dyn-trait.rs +++ b/src/test/ui/impl-header-lifetime-elision/dyn-trait.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that `impl MyTrait<'_> for &i32` is equivalent to `impl<'a, // 'b> MyTrait<'a> for &'b i32`. diff --git a/src/test/ui/impl-header-lifetime-elision/dyn-trait.stderr b/src/test/ui/impl-header-lifetime-elision/dyn-trait.stderr index 3e54ebeb398d6..75be8f18d1e0a 100644 --- a/src/test/ui/impl-header-lifetime-elision/dyn-trait.stderr +++ b/src/test/ui/impl-header-lifetime-elision/dyn-trait.stderr @@ -1,11 +1,11 @@ error[E0495]: cannot infer an appropriate lifetime due to conflicting requirements - --> $DIR/dyn-trait.rs:32:16 + --> $DIR/dyn-trait.rs:22:16 | LL | static_val(x); //~ ERROR cannot infer | ^ | -note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 31:26... - --> $DIR/dyn-trait.rs:31:26 +note: first, the lifetime cannot outlive the lifetime 'a as defined on the function body at 21:26... + --> $DIR/dyn-trait.rs:21:26 | LL | fn with_dyn_debug_static<'a>(x: Box) { | ^^ diff --git a/src/test/ui/impl-header-lifetime-elision/path-elided.rs b/src/test/ui/impl-header-lifetime-elision/path-elided.rs index f88c899065c1b..9bb6965253a92 100644 --- a/src/test/ui/impl-header-lifetime-elision/path-elided.rs +++ b/src/test/ui/impl-header-lifetime-elision/path-elided.rs @@ -1,12 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![allow(warnings)] #![feature(impl_header_lifetime_elision)] diff --git a/src/test/ui/impl-header-lifetime-elision/path-elided.stderr b/src/test/ui/impl-header-lifetime-elision/path-elided.stderr index 6c1d72411bf57..8403c095b263c 100644 --- a/src/test/ui/impl-header-lifetime-elision/path-elided.stderr +++ b/src/test/ui/impl-header-lifetime-elision/path-elided.stderr @@ -1,5 +1,5 @@ error[E0106]: missing lifetime specifier - --> $DIR/path-elided.rs:18:18 + --> $DIR/path-elided.rs:9:18 | LL | impl MyTrait for Foo { | ^^^ expected lifetime parameter diff --git a/src/test/ui/impl-header-lifetime-elision/path-underscore.rs b/src/test/ui/impl-header-lifetime-elision/path-underscore.rs index 38118f0d21333..008fdd614a9cb 100644 --- a/src/test/ui/impl-header-lifetime-elision/path-underscore.rs +++ b/src/test/ui/impl-header-lifetime-elision/path-underscore.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that `impl MyTrait for Foo<'_>` works. // run-pass diff --git a/src/test/ui/impl-header-lifetime-elision/ref-underscore.rs b/src/test/ui/impl-header-lifetime-elision/ref-underscore.rs index 96a56aacd87cc..fadfb9975ac33 100644 --- a/src/test/ui/impl-header-lifetime-elision/ref-underscore.rs +++ b/src/test/ui/impl-header-lifetime-elision/ref-underscore.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that `impl MyTrait for &i32` works and is equivalent to any lifetime. // run-pass diff --git a/src/test/ui/impl-header-lifetime-elision/trait-elided.rs b/src/test/ui/impl-header-lifetime-elision/trait-elided.rs index afdf2200d909a..3e5f0a3097155 100644 --- a/src/test/ui/impl-header-lifetime-elision/trait-elided.rs +++ b/src/test/ui/impl-header-lifetime-elision/trait-elided.rs @@ -1,12 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![allow(warnings)] #![feature(impl_header_lifetime_elision)] diff --git a/src/test/ui/impl-header-lifetime-elision/trait-elided.stderr b/src/test/ui/impl-header-lifetime-elision/trait-elided.stderr index fe3ded8e04c33..4bef805d6a9f6 100644 --- a/src/test/ui/impl-header-lifetime-elision/trait-elided.stderr +++ b/src/test/ui/impl-header-lifetime-elision/trait-elided.stderr @@ -1,5 +1,5 @@ error[E0106]: missing lifetime specifier - --> $DIR/trait-elided.rs:16:6 + --> $DIR/trait-elided.rs:7:6 | LL | impl MyTrait for u32 { | ^^^^^^^ expected lifetime parameter diff --git a/src/test/ui/impl-header-lifetime-elision/trait-underscore.rs b/src/test/ui/impl-header-lifetime-elision/trait-underscore.rs index 98242ff657795..d7406d3a24edb 100644 --- a/src/test/ui/impl-header-lifetime-elision/trait-underscore.rs +++ b/src/test/ui/impl-header-lifetime-elision/trait-underscore.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that `impl MyTrait<'_> for &i32` is equivalent to `impl<'a, // 'b> MyTrait<'a> for &'b i32`. // diff --git a/src/test/ui/impl-trait/associated-existential-type-generic-trait.rs b/src/test/ui/impl-trait/associated-existential-type-generic-trait.rs index c9bf7b87ef4a9..26bd435cbac96 100644 --- a/src/test/ui/impl-trait/associated-existential-type-generic-trait.rs +++ b/src/test/ui/impl-trait/associated-existential-type-generic-trait.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(existential_type)] // compile-pass diff --git a/src/test/ui/impl-trait/associated-existential-type-trivial.rs b/src/test/ui/impl-trait/associated-existential-type-trivial.rs index 78593fe319c0c..cc974ffea7bbc 100644 --- a/src/test/ui/impl-trait/associated-existential-type-trivial.rs +++ b/src/test/ui/impl-trait/associated-existential-type-trivial.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(existential_type)] // compile-pass diff --git a/src/test/ui/impl-trait/associated-existential-type.rs b/src/test/ui/impl-trait/associated-existential-type.rs index d880428411f9e..38511bd062c85 100644 --- a/src/test/ui/impl-trait/associated-existential-type.rs +++ b/src/test/ui/impl-trait/associated-existential-type.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(existential_type)] // compile-pass diff --git a/src/test/ui/impl-trait/auto-trait-leak.rs b/src/test/ui/impl-trait/auto-trait-leak.rs index a241ba53461ff..ea0be0b346cbe 100644 --- a/src/test/ui/impl-trait/auto-trait-leak.rs +++ b/src/test/ui/impl-trait/auto-trait-leak.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength use std::cell::Cell; diff --git a/src/test/ui/impl-trait/auto-trait-leak.stderr b/src/test/ui/impl-trait/auto-trait-leak.stderr index 10711d1cd8cec..d6928584b9e43 100644 --- a/src/test/ui/impl-trait/auto-trait-leak.stderr +++ b/src/test/ui/impl-trait/auto-trait-leak.stderr @@ -1,22 +1,22 @@ error[E0391]: cycle detected when processing `cycle1::{{impl-Trait}}` - --> $DIR/auto-trait-leak.rs:24:16 + --> $DIR/auto-trait-leak.rs:14:16 | LL | fn cycle1() -> impl Clone { | ^^^^^^^^^^ | note: ...which requires processing `cycle1`... - --> $DIR/auto-trait-leak.rs:24:1 + --> $DIR/auto-trait-leak.rs:14:1 | LL | fn cycle1() -> impl Clone { | ^^^^^^^^^^^^^^^^^^^^^^^^^ note: ...which requires evaluating trait selection obligation `impl std::clone::Clone: std::marker::Send`... note: ...which requires processing `cycle2::{{impl-Trait}}`... - --> $DIR/auto-trait-leak.rs:33:16 + --> $DIR/auto-trait-leak.rs:23:16 | LL | fn cycle2() -> impl Clone { | ^^^^^^^^^^ note: ...which requires processing `cycle2`... - --> $DIR/auto-trait-leak.rs:33:1 + --> $DIR/auto-trait-leak.rs:23:1 | LL | fn cycle2() -> impl Clone { | ^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -24,31 +24,31 @@ note: ...which requires evaluating trait selection obligation `impl std::clone:: = note: ...which again requires processing `cycle1::{{impl-Trait}}`, completing the cycle error[E0391]: cycle detected when processing `cycle1::{{impl-Trait}}` - --> $DIR/auto-trait-leak.rs:24:16 + --> $DIR/auto-trait-leak.rs:14:16 | LL | fn cycle1() -> impl Clone { | ^^^^^^^^^^ | note: ...which requires processing `cycle1`... - --> $DIR/auto-trait-leak.rs:24:1 + --> $DIR/auto-trait-leak.rs:14:1 | LL | fn cycle1() -> impl Clone { | ^^^^^^^^^^^^^^^^^^^^^^^^^ note: ...which requires evaluating trait selection obligation `impl std::clone::Clone: std::marker::Send`... note: ...which requires processing `cycle2::{{impl-Trait}}`... - --> $DIR/auto-trait-leak.rs:33:16 + --> $DIR/auto-trait-leak.rs:23:16 | LL | fn cycle2() -> impl Clone { | ^^^^^^^^^^ note: ...which requires processing `cycle2`... - --> $DIR/auto-trait-leak.rs:33:1 + --> $DIR/auto-trait-leak.rs:23:1 | LL | fn cycle2() -> impl Clone { | ^^^^^^^^^^^^^^^^^^^^^^^^^ = note: ...which again requires processing `cycle1::{{impl-Trait}}`, completing the cycle error[E0277]: `std::rc::Rc` cannot be sent between threads safely - --> $DIR/auto-trait-leak.rs:27:5 + --> $DIR/auto-trait-leak.rs:17:5 | LL | send(cycle2().clone()); | ^^^^ `std::rc::Rc` cannot be sent between threads safely @@ -56,7 +56,7 @@ LL | send(cycle2().clone()); = help: within `impl std::clone::Clone`, the trait `std::marker::Send` is not implemented for `std::rc::Rc` = note: required because it appears within the type `impl std::clone::Clone` note: required by `send` - --> $DIR/auto-trait-leak.rs:16:1 + --> $DIR/auto-trait-leak.rs:6:1 | LL | fn send(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/impl-trait/auto-trait-leak2.rs b/src/test/ui/impl-trait/auto-trait-leak2.rs index 3c61543a711bd..a373edcfcf952 100644 --- a/src/test/ui/impl-trait/auto-trait-leak2.rs +++ b/src/test/ui/impl-trait/auto-trait-leak2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength use std::cell::Cell; diff --git a/src/test/ui/impl-trait/auto-trait-leak2.stderr b/src/test/ui/impl-trait/auto-trait-leak2.stderr index fb00c41f79c8f..4e427d3d6b388 100644 --- a/src/test/ui/impl-trait/auto-trait-leak2.stderr +++ b/src/test/ui/impl-trait/auto-trait-leak2.stderr @@ -1,29 +1,29 @@ error[E0277]: `std::rc::Rc>` cannot be sent between threads safely - --> $DIR/auto-trait-leak2.rs:25:5 + --> $DIR/auto-trait-leak2.rs:15:5 | LL | send(before()); | ^^^^ `std::rc::Rc>` cannot be sent between threads safely | = help: within `impl std::ops::Fn<(i32,)>`, the trait `std::marker::Send` is not implemented for `std::rc::Rc>` - = note: required because it appears within the type `[closure@$DIR/auto-trait-leak2.rs:19:5: 19:22 p:std::rc::Rc>]` + = note: required because it appears within the type `[closure@$DIR/auto-trait-leak2.rs:9:5: 9:22 p:std::rc::Rc>]` = note: required because it appears within the type `impl std::ops::Fn<(i32,)>` note: required by `send` - --> $DIR/auto-trait-leak2.rs:22:1 + --> $DIR/auto-trait-leak2.rs:12:1 | LL | fn send(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: `std::rc::Rc>` cannot be sent between threads safely - --> $DIR/auto-trait-leak2.rs:28:5 + --> $DIR/auto-trait-leak2.rs:18:5 | LL | send(after()); | ^^^^ `std::rc::Rc>` cannot be sent between threads safely | = help: within `impl std::ops::Fn<(i32,)>`, the trait `std::marker::Send` is not implemented for `std::rc::Rc>` - = note: required because it appears within the type `[closure@$DIR/auto-trait-leak2.rs:36:5: 36:22 p:std::rc::Rc>]` + = note: required because it appears within the type `[closure@$DIR/auto-trait-leak2.rs:26:5: 26:22 p:std::rc::Rc>]` = note: required because it appears within the type `impl std::ops::Fn<(i32,)>` note: required by `send` - --> $DIR/auto-trait-leak2.rs:22:1 + --> $DIR/auto-trait-leak2.rs:12:1 | LL | fn send(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/impl-trait/auxiliary/no_method_suggested_traits.rs b/src/test/ui/impl-trait/auxiliary/no_method_suggested_traits.rs index 20cebb9be1746..cefb17e0fd47b 100644 --- a/src/test/ui/impl-trait/auxiliary/no_method_suggested_traits.rs +++ b/src/test/ui/impl-trait/auxiliary/no_method_suggested_traits.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub use reexport::Reexported; pub struct Foo; diff --git a/src/test/ui/impl-trait/equality.rs b/src/test/ui/impl-trait/equality.rs index 71fccc022b71b..f6b0853284d51 100644 --- a/src/test/ui/impl-trait/equality.rs +++ b/src/test/ui/impl-trait/equality.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(specialization)] trait Foo: Copy + ToString {} diff --git a/src/test/ui/impl-trait/equality.stderr b/src/test/ui/impl-trait/equality.stderr index e277d4e28cb2b..84229cde3746a 100644 --- a/src/test/ui/impl-trait/equality.stderr +++ b/src/test/ui/impl-trait/equality.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/equality.rs:25:5 + --> $DIR/equality.rs:15:5 | LL | 0_u32 | ^^^^^ expected i32, found u32 @@ -8,7 +8,7 @@ LL | 0_u32 found type `u32` error[E0277]: cannot add `impl Foo` to `u32` - --> $DIR/equality.rs:34:11 + --> $DIR/equality.rs:24:11 | LL | n + sum_to(n - 1) | ^ no implementation for `u32 + impl Foo` diff --git a/src/test/ui/impl-trait/equality2.rs b/src/test/ui/impl-trait/equality2.rs index ec3dc15d8464e..986db71a4b389 100644 --- a/src/test/ui/impl-trait/equality2.rs +++ b/src/test/ui/impl-trait/equality2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(specialization)] trait Foo: Copy + ToString {} diff --git a/src/test/ui/impl-trait/equality2.stderr b/src/test/ui/impl-trait/equality2.stderr index e4ff2f6824783..a520840f825fc 100644 --- a/src/test/ui/impl-trait/equality2.stderr +++ b/src/test/ui/impl-trait/equality2.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/equality2.rs:35:18 + --> $DIR/equality2.rs:25:18 | LL | let _: u32 = hide(0_u32); | ^^^^^^^^^^^ expected u32, found anonymized type @@ -8,7 +8,7 @@ LL | let _: u32 = hide(0_u32); found type `impl Foo` error[E0308]: mismatched types - --> $DIR/equality2.rs:41:18 + --> $DIR/equality2.rs:31:18 | LL | let _: i32 = Leak::leak(hide(0_i32)); | ^^^^^^^^^^^^^^^^^^^^^^^ expected i32, found associated type @@ -17,7 +17,7 @@ LL | let _: i32 = Leak::leak(hide(0_i32)); found type `::T` error[E0308]: mismatched types - --> $DIR/equality2.rs:48:10 + --> $DIR/equality2.rs:38:10 | LL | x = (x.1, | ^^^ expected u32, found i32 @@ -26,7 +26,7 @@ LL | x = (x.1, found type `impl Foo` (i32) error[E0308]: mismatched types - --> $DIR/equality2.rs:51:10 + --> $DIR/equality2.rs:41:10 | LL | x.0); | ^^^ expected i32, found u32 diff --git a/src/test/ui/impl-trait/existential_type_in_fn_body.rs b/src/test/ui/impl-trait/existential_type_in_fn_body.rs index 20f9e0d77c312..b29ae064b76c4 100644 --- a/src/test/ui/impl-trait/existential_type_in_fn_body.rs +++ b/src/test/ui/impl-trait/existential_type_in_fn_body.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![feature(existential_type)] diff --git a/src/test/ui/impl-trait/impl-generic-mismatch-ab.rs b/src/test/ui/impl-trait/impl-generic-mismatch-ab.rs index 23549918ff1b3..6c9b119de7411 100644 --- a/src/test/ui/impl-trait/impl-generic-mismatch-ab.rs +++ b/src/test/ui/impl-trait/impl-generic-mismatch-ab.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt::Debug; trait Foo { diff --git a/src/test/ui/impl-trait/impl-generic-mismatch-ab.stderr b/src/test/ui/impl-trait/impl-generic-mismatch-ab.stderr index 77ecdf2f5acf0..357e6b026e2a3 100644 --- a/src/test/ui/impl-trait/impl-generic-mismatch-ab.stderr +++ b/src/test/ui/impl-trait/impl-generic-mismatch-ab.stderr @@ -1,5 +1,5 @@ error[E0053]: method `foo` has an incompatible type for trait - --> $DIR/impl-generic-mismatch-ab.rs:18:32 + --> $DIR/impl-generic-mismatch-ab.rs:8:32 | LL | fn foo(&self, a: &A, b: &impl Debug); | -- type in trait diff --git a/src/test/ui/impl-trait/impl-generic-mismatch.rs b/src/test/ui/impl-trait/impl-generic-mismatch.rs index d6707f590113c..ba678bb032dcb 100644 --- a/src/test/ui/impl-trait/impl-generic-mismatch.rs +++ b/src/test/ui/impl-trait/impl-generic-mismatch.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt::Debug; trait Foo { diff --git a/src/test/ui/impl-trait/impl-generic-mismatch.stderr b/src/test/ui/impl-trait/impl-generic-mismatch.stderr index 7ad16b1f8f237..b19e45db9c1b4 100644 --- a/src/test/ui/impl-trait/impl-generic-mismatch.stderr +++ b/src/test/ui/impl-trait/impl-generic-mismatch.stderr @@ -1,5 +1,5 @@ error[E0643]: method `foo` has incompatible signature for trait - --> $DIR/impl-generic-mismatch.rs:18:12 + --> $DIR/impl-generic-mismatch.rs:8:12 | LL | fn foo(&self, _: &impl Debug); | ---------- declaration in trait here @@ -12,7 +12,7 @@ LL | fn foo(&self, _: &impl Debug) { } | -- ^^^^^^^^^^ error[E0643]: method `bar` has incompatible signature for trait - --> $DIR/impl-generic-mismatch.rs:27:23 + --> $DIR/impl-generic-mismatch.rs:17:23 | LL | fn bar(&self, _: &U); | - declaration in trait here @@ -25,7 +25,7 @@ LL | fn bar(&self, _: &U) { } | ^^^^^^^^^^ ^ error[E0643]: method `hash` has incompatible signature for trait - --> $DIR/impl-generic-mismatch.rs:38:33 + --> $DIR/impl-generic-mismatch.rs:28:33 | LL | fn hash(&self, hasher: &mut impl Hasher) {} | ^^^^^^^^^^^ expected generic parameter, found `impl Trait` diff --git a/src/test/ui/impl-trait/impl-trait-plus-priority.rs b/src/test/ui/impl-trait/impl-trait-plus-priority.rs index f451123ca27fd..2e4f048a4e406 100644 --- a/src/test/ui/impl-trait/impl-trait-plus-priority.rs +++ b/src/test/ui/impl-trait/impl-trait-plus-priority.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only -Z continue-parse-after-error fn f() -> impl A + {} // OK diff --git a/src/test/ui/impl-trait/impl-trait-plus-priority.stderr b/src/test/ui/impl-trait/impl-trait-plus-priority.stderr index 2a9199b25bcf2..205d9b0b75ea8 100644 --- a/src/test/ui/impl-trait/impl-trait-plus-priority.stderr +++ b/src/test/ui/impl-trait/impl-trait-plus-priority.stderr @@ -1,65 +1,65 @@ error: ambiguous `+` in a type - --> $DIR/impl-trait-plus-priority.rs:33:18 + --> $DIR/impl-trait-plus-priority.rs:23:18 | LL | type A = fn() -> impl A +; | ^^^^^^^^ help: use parentheses to disambiguate: `(impl A)` error: ambiguous `+` in a type - --> $DIR/impl-trait-plus-priority.rs:35:18 + --> $DIR/impl-trait-plus-priority.rs:25:18 | LL | type A = fn() -> impl A + B; | ^^^^^^^^^^ help: use parentheses to disambiguate: `(impl A + B)` error: ambiguous `+` in a type - --> $DIR/impl-trait-plus-priority.rs:37:18 + --> $DIR/impl-trait-plus-priority.rs:27:18 | LL | type A = fn() -> dyn A + B; | ^^^^^^^^^ help: use parentheses to disambiguate: `(dyn A + B)` error[E0178]: expected a path on the left-hand side of `+`, not `fn() -> A` - --> $DIR/impl-trait-plus-priority.rs:39:10 + --> $DIR/impl-trait-plus-priority.rs:29:10 | LL | type A = fn() -> A + B; | ^^^^^^^^^^^^^ perhaps you forgot parentheses? error: ambiguous `+` in a type - --> $DIR/impl-trait-plus-priority.rs:42:18 + --> $DIR/impl-trait-plus-priority.rs:32:18 | LL | type A = Fn() -> impl A +; | ^^^^^^^^ help: use parentheses to disambiguate: `(impl A)` error: ambiguous `+` in a type - --> $DIR/impl-trait-plus-priority.rs:44:18 + --> $DIR/impl-trait-plus-priority.rs:34:18 | LL | type A = Fn() -> impl A + B; | ^^^^^^^^^^ help: use parentheses to disambiguate: `(impl A + B)` error: ambiguous `+` in a type - --> $DIR/impl-trait-plus-priority.rs:46:18 + --> $DIR/impl-trait-plus-priority.rs:36:18 | LL | type A = Fn() -> dyn A + B; | ^^^^^^^^^ help: use parentheses to disambiguate: `(dyn A + B)` error: ambiguous `+` in a type - --> $DIR/impl-trait-plus-priority.rs:50:11 + --> $DIR/impl-trait-plus-priority.rs:40:11 | LL | type A = &impl A +; | ^^^^^^^^ help: use parentheses to disambiguate: `(impl A)` error: ambiguous `+` in a type - --> $DIR/impl-trait-plus-priority.rs:52:11 + --> $DIR/impl-trait-plus-priority.rs:42:11 | LL | type A = &impl A + B; | ^^^^^^^^^^ help: use parentheses to disambiguate: `(impl A + B)` error: ambiguous `+` in a type - --> $DIR/impl-trait-plus-priority.rs:54:11 + --> $DIR/impl-trait-plus-priority.rs:44:11 | LL | type A = &dyn A + B; | ^^^^^^^^^ help: use parentheses to disambiguate: `(dyn A + B)` error[E0178]: expected a path on the left-hand side of `+`, not `&A` - --> $DIR/impl-trait-plus-priority.rs:56:10 + --> $DIR/impl-trait-plus-priority.rs:46:10 | LL | type A = &A + B; | ^^^^^^ help: try adding parentheses: `&(A + B)` diff --git a/src/test/ui/impl-trait/impl_trait_projections.rs b/src/test/ui/impl-trait/impl_trait_projections.rs index 57a0040600a25..fd0986d7c0a9d 100644 --- a/src/test/ui/impl-trait/impl_trait_projections.rs +++ b/src/test/ui/impl-trait/impl_trait_projections.rs @@ -1,12 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. use std::fmt::Debug; use std::option; diff --git a/src/test/ui/impl-trait/impl_trait_projections.stderr b/src/test/ui/impl-trait/impl_trait_projections.stderr index f6d58984ecef7..b61983c04e7fd 100644 --- a/src/test/ui/impl-trait/impl_trait_projections.stderr +++ b/src/test/ui/impl-trait/impl_trait_projections.stderr @@ -1,29 +1,29 @@ error[E0667]: `impl Trait` is not allowed in path parameters - --> $DIR/impl_trait_projections.rs:21:51 + --> $DIR/impl_trait_projections.rs:12:51 | LL | fn projection_is_disallowed(x: impl Iterator) -> ::Item { | ^^^^^^^^^^^^^ error[E0667]: `impl Trait` is not allowed in path parameters - --> $DIR/impl_trait_projections.rs:28:9 + --> $DIR/impl_trait_projections.rs:19:9 | LL | -> ::Item | ^^^^^^^^^^^^^ error[E0667]: `impl Trait` is not allowed in path parameters - --> $DIR/impl_trait_projections.rs:35:27 + --> $DIR/impl_trait_projections.rs:26:27 | LL | -> <::std::ops::Range as Iterator>::Item | ^^^^^^^^^^ error[E0667]: `impl Trait` is not allowed in path parameters - --> $DIR/impl_trait_projections.rs:42:29 + --> $DIR/impl_trait_projections.rs:33:29 | LL | -> as Iterator>::Item | ^^^^^^^^^^ error[E0223]: ambiguous associated type - --> $DIR/impl_trait_projections.rs:21:50 + --> $DIR/impl_trait_projections.rs:12:50 | LL | fn projection_is_disallowed(x: impl Iterator) -> ::Item { | ^^^^^^^^^^^^^^^^^^^^^ ambiguous associated type diff --git a/src/test/ui/impl-trait/infinite-impl-trait-issue-38064.rs b/src/test/ui/impl-trait/infinite-impl-trait-issue-38064.rs index 653ef1723e0b6..c84e5883bb2a5 100644 --- a/src/test/ui/impl-trait/infinite-impl-trait-issue-38064.rs +++ b/src/test/ui/impl-trait/infinite-impl-trait-issue-38064.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that attempts to construct infinite types via impl trait fail // in a graceful way. // diff --git a/src/test/ui/impl-trait/issue-21659-show-relevant-trait-impls-3.rs b/src/test/ui/impl-trait/issue-21659-show-relevant-trait-impls-3.rs index 79d487493e877..2bff01be9b813 100644 --- a/src/test/ui/impl-trait/issue-21659-show-relevant-trait-impls-3.rs +++ b/src/test/ui/impl-trait/issue-21659-show-relevant-trait-impls-3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn foo(&self, a: A) -> A { a diff --git a/src/test/ui/impl-trait/issue-21659-show-relevant-trait-impls-3.stderr b/src/test/ui/impl-trait/issue-21659-show-relevant-trait-impls-3.stderr index 89bc538849437..666418f6ee2c1 100644 --- a/src/test/ui/impl-trait/issue-21659-show-relevant-trait-impls-3.stderr +++ b/src/test/ui/impl-trait/issue-21659-show-relevant-trait-impls-3.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `foo` found for type `Bar` in the current scope - --> $DIR/issue-21659-show-relevant-trait-impls-3.rs:30:8 + --> $DIR/issue-21659-show-relevant-trait-impls-3.rs:20:8 | LL | struct Bar; | ----------- method `foo` not found for this diff --git a/src/test/ui/impl-trait/issue-52128.rs b/src/test/ui/impl-trait/issue-52128.rs index e68637b35d157..eb4456a0d592e 100644 --- a/src/test/ui/impl-trait/issue-52128.rs +++ b/src/test/ui/impl-trait/issue-52128.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #![deny(warnings)] diff --git a/src/test/ui/impl-trait/method-suggestion-no-duplication.rs b/src/test/ui/impl-trait/method-suggestion-no-duplication.rs index 28028922e3286..32f3517167349 100644 --- a/src/test/ui/impl-trait/method-suggestion-no-duplication.rs +++ b/src/test/ui/impl-trait/method-suggestion-no-duplication.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // issue #21405 // ignore-tidy-linelength diff --git a/src/test/ui/impl-trait/method-suggestion-no-duplication.stderr b/src/test/ui/impl-trait/method-suggestion-no-duplication.stderr index f7aaab4242c0f..8da1ce41a0f94 100644 --- a/src/test/ui/impl-trait/method-suggestion-no-duplication.stderr +++ b/src/test/ui/impl-trait/method-suggestion-no-duplication.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `is_empty` found for type `Foo` in the current scope - --> $DIR/method-suggestion-no-duplication.rs:19:15 + --> $DIR/method-suggestion-no-duplication.rs:9:15 | LL | struct Foo; | ----------- method `is_empty` not found for this diff --git a/src/test/ui/impl-trait/must_outlive_least_region_or_bound.nll.stderr b/src/test/ui/impl-trait/must_outlive_least_region_or_bound.nll.stderr index 97cb2cc16e45e..08daedd620e1b 100644 --- a/src/test/ui/impl-trait/must_outlive_least_region_or_bound.nll.stderr +++ b/src/test/ui/impl-trait/must_outlive_least_region_or_bound.nll.stderr @@ -1,35 +1,35 @@ warning: not reporting region error due to nll - --> $DIR/must_outlive_least_region_or_bound.rs:13:35 + --> $DIR/must_outlive_least_region_or_bound.rs:3:35 | LL | fn elided(x: &i32) -> impl Copy { x } | ^ warning: not reporting region error due to nll - --> $DIR/must_outlive_least_region_or_bound.rs:16:44 + --> $DIR/must_outlive_least_region_or_bound.rs:6:44 | LL | fn explicit<'a>(x: &'a i32) -> impl Copy { x } | ^ warning: not reporting region error due to nll - --> $DIR/must_outlive_least_region_or_bound.rs:22:69 + --> $DIR/must_outlive_least_region_or_bound.rs:12:69 | LL | fn with_bound<'a>(x: &'a i32) -> impl LifetimeTrait<'a> + 'static { x } | ^ warning: not reporting region error due to nll - --> $DIR/must_outlive_least_region_or_bound.rs:29:5 + --> $DIR/must_outlive_least_region_or_bound.rs:19:5 | LL | move |_| println!("{}", y) | ^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: not reporting region error due to nll - --> $DIR/must_outlive_least_region_or_bound.rs:32:51 + --> $DIR/must_outlive_least_region_or_bound.rs:22:51 | LL | fn ty_param_wont_outlive_static(x: T) -> impl Debug + 'static { | ^^^^^^^^^^^^^^^^^^^^ error[E0621]: explicit lifetime required in the type of `x` - --> $DIR/must_outlive_least_region_or_bound.rs:13:35 + --> $DIR/must_outlive_least_region_or_bound.rs:3:35 | LL | fn elided(x: &i32) -> impl Copy { x } | ---- ^ lifetime `'static` required @@ -37,19 +37,19 @@ LL | fn elided(x: &i32) -> impl Copy { x } | help: add explicit lifetime `'static` to the type of `x`: `&'static i32` error: unsatisfied lifetime constraints - --> $DIR/must_outlive_least_region_or_bound.rs:16:44 + --> $DIR/must_outlive_least_region_or_bound.rs:6:44 | LL | fn explicit<'a>(x: &'a i32) -> impl Copy { x } | -- lifetime `'a` defined here ^ returning this value requires that `'a` must outlive `'static` error: unsatisfied lifetime constraints - --> $DIR/must_outlive_least_region_or_bound.rs:22:69 + --> $DIR/must_outlive_least_region_or_bound.rs:12:69 | LL | fn with_bound<'a>(x: &'a i32) -> impl LifetimeTrait<'a> + 'static { x } | -- lifetime `'a` defined here ^ returning this value requires that `'a` must outlive `'static` error: unsatisfied lifetime constraints - --> $DIR/must_outlive_least_region_or_bound.rs:29:5 + --> $DIR/must_outlive_least_region_or_bound.rs:19:5 | LL | fn move_lifetime_into_fn<'a, 'b>(x: &'a u32, y: &'b u32) -> impl Fn(&'a u32) { | -- -- lifetime `'b` defined here @@ -60,7 +60,7 @@ LL | move |_| println!("{}", y) | ^^^^^^^^^^^^^^^^^^^^^^^^^^ function was supposed to return data with lifetime `'a` but it is returning data with lifetime `'b` error[E0310]: the parameter type `T` may not live long enough - --> $DIR/must_outlive_least_region_or_bound.rs:34:5 + --> $DIR/must_outlive_least_region_or_bound.rs:24:5 | LL | x | ^ diff --git a/src/test/ui/impl-trait/must_outlive_least_region_or_bound.rs b/src/test/ui/impl-trait/must_outlive_least_region_or_bound.rs index 537fc975bcf92..ef1b976ae333f 100644 --- a/src/test/ui/impl-trait/must_outlive_least_region_or_bound.rs +++ b/src/test/ui/impl-trait/must_outlive_least_region_or_bound.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt::Debug; fn elided(x: &i32) -> impl Copy { x } diff --git a/src/test/ui/impl-trait/must_outlive_least_region_or_bound.stderr b/src/test/ui/impl-trait/must_outlive_least_region_or_bound.stderr index 48686cbcaf232..8a477e42a66ef 100644 --- a/src/test/ui/impl-trait/must_outlive_least_region_or_bound.stderr +++ b/src/test/ui/impl-trait/must_outlive_least_region_or_bound.stderr @@ -1,5 +1,5 @@ error[E0621]: explicit lifetime required in the type of `x` - --> $DIR/must_outlive_least_region_or_bound.rs:13:23 + --> $DIR/must_outlive_least_region_or_bound.rs:3:23 | LL | fn elided(x: &i32) -> impl Copy { x } | ---- ^^^^^^^^^ lifetime `'static` required @@ -7,43 +7,43 @@ LL | fn elided(x: &i32) -> impl Copy { x } | help: add explicit lifetime `'static` to the type of `x`: `&'static i32` error: cannot infer an appropriate lifetime - --> $DIR/must_outlive_least_region_or_bound.rs:16:44 + --> $DIR/must_outlive_least_region_or_bound.rs:6:44 | LL | fn explicit<'a>(x: &'a i32) -> impl Copy { x } | --------- ^ ...but this borrow... | | | this return type evaluates to the `'static` lifetime... | -note: ...can't outlive the lifetime 'a as defined on the function body at 16:13 - --> $DIR/must_outlive_least_region_or_bound.rs:16:13 +note: ...can't outlive the lifetime 'a as defined on the function body at 6:13 + --> $DIR/must_outlive_least_region_or_bound.rs:6:13 | LL | fn explicit<'a>(x: &'a i32) -> impl Copy { x } | ^^ -help: you can add a constraint to the return type to make it last less than `'static` and match the lifetime 'a as defined on the function body at 16:13 +help: you can add a constraint to the return type to make it last less than `'static` and match the lifetime 'a as defined on the function body at 6:13 | LL | fn explicit<'a>(x: &'a i32) -> impl Copy + 'a { x } | ^^^^^^^^^^^^^^ error: cannot infer an appropriate lifetime - --> $DIR/must_outlive_least_region_or_bound.rs:22:69 + --> $DIR/must_outlive_least_region_or_bound.rs:12:69 | LL | fn with_bound<'a>(x: &'a i32) -> impl LifetimeTrait<'a> + 'static { x } | -------------------------------- ^ ...but this borrow... | | | this return type evaluates to the `'static` lifetime... | -note: ...can't outlive the lifetime 'a as defined on the function body at 22:15 - --> $DIR/must_outlive_least_region_or_bound.rs:22:15 +note: ...can't outlive the lifetime 'a as defined on the function body at 12:15 + --> $DIR/must_outlive_least_region_or_bound.rs:12:15 | LL | fn with_bound<'a>(x: &'a i32) -> impl LifetimeTrait<'a> + 'static { x } | ^^ -help: you can add a constraint to the return type to make it last less than `'static` and match the lifetime 'a as defined on the function body at 22:15 +help: you can add a constraint to the return type to make it last less than `'static` and match the lifetime 'a as defined on the function body at 12:15 | LL | fn with_bound<'a>(x: &'a i32) -> impl LifetimeTrait<'a> + 'static + 'a { x } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0623]: lifetime mismatch - --> $DIR/must_outlive_least_region_or_bound.rs:27:61 + --> $DIR/must_outlive_least_region_or_bound.rs:17:61 | LL | fn move_lifetime_into_fn<'a, 'b>(x: &'a u32, y: &'b u32) -> impl Fn(&'a u32) { | ------- ^^^^^^^^^^^^^^^^ @@ -52,7 +52,7 @@ LL | fn move_lifetime_into_fn<'a, 'b>(x: &'a u32, y: &'b u32) -> impl Fn(&'a u32 | this parameter and the return type are declared with different lifetimes... error[E0310]: the parameter type `T` may not live long enough - --> $DIR/must_outlive_least_region_or_bound.rs:32:51 + --> $DIR/must_outlive_least_region_or_bound.rs:22:51 | LL | fn ty_param_wont_outlive_static(x: T) -> impl Debug + 'static { | -- ^^^^^^^^^^^^^^^^^^^^ @@ -60,7 +60,7 @@ LL | fn ty_param_wont_outlive_static(x: T) -> impl Debug + 'static { | help: consider adding an explicit lifetime bound `T: 'static`... | note: ...so that the type `T` will meet its required lifetime bounds - --> $DIR/must_outlive_least_region_or_bound.rs:32:51 + --> $DIR/must_outlive_least_region_or_bound.rs:22:51 | LL | fn ty_param_wont_outlive_static(x: T) -> impl Debug + 'static { | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/impl-trait/needs_least_region_or_bound.rs b/src/test/ui/impl-trait/needs_least_region_or_bound.rs index 6c0a0b800ce33..2a5b365559e77 100644 --- a/src/test/ui/impl-trait/needs_least_region_or_bound.rs +++ b/src/test/ui/impl-trait/needs_least_region_or_bound.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt::Debug; trait MultiRegionTrait<'a, 'b> {} diff --git a/src/test/ui/impl-trait/needs_least_region_or_bound.stderr b/src/test/ui/impl-trait/needs_least_region_or_bound.stderr index fd2665dc76220..f1b4d9c58f39f 100644 --- a/src/test/ui/impl-trait/needs_least_region_or_bound.stderr +++ b/src/test/ui/impl-trait/needs_least_region_or_bound.stderr @@ -1,5 +1,5 @@ error: ambiguous lifetime bound in `impl Trait` - --> $DIR/needs_least_region_or_bound.rs:16:55 + --> $DIR/needs_least_region_or_bound.rs:6:55 | LL | fn no_least_region<'a, 'b>(x: &'a u32, y: &'b u32) -> impl MultiRegionTrait<'a, 'b> { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ neither `'a` nor `'b` outlives the other diff --git a/src/test/ui/impl-trait/no-method-suggested-traits.rs b/src/test/ui/impl-trait/no-method-suggested-traits.rs index 07c0e6f529f3c..c912873a6c05c 100644 --- a/src/test/ui/impl-trait/no-method-suggested-traits.rs +++ b/src/test/ui/impl-trait/no-method-suggested-traits.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:no_method_suggested_traits.rs extern crate no_method_suggested_traits; diff --git a/src/test/ui/impl-trait/no-method-suggested-traits.stderr b/src/test/ui/impl-trait/no-method-suggested-traits.stderr index bc4afb931098f..a3b118efa62c5 100644 --- a/src/test/ui/impl-trait/no-method-suggested-traits.stderr +++ b/src/test/ui/impl-trait/no-method-suggested-traits.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `method` found for type `u32` in the current scope - --> $DIR/no-method-suggested-traits.rs:33:10 + --> $DIR/no-method-suggested-traits.rs:23:10 | LL | 1u32.method(); | ^^^^^^ @@ -17,7 +17,7 @@ LL | use no_method_suggested_traits::Reexported; | error[E0599]: no method named `method` found for type `std::rc::Rc<&mut std::boxed::Box<&u32>>` in the current scope - --> $DIR/no-method-suggested-traits.rs:36:44 + --> $DIR/no-method-suggested-traits.rs:26:44 | LL | std::rc::Rc::new(&mut Box::new(&1u32)).method(); | ^^^^^^ @@ -35,7 +35,7 @@ LL | use no_method_suggested_traits::Reexported; | error[E0599]: no method named `method` found for type `char` in the current scope - --> $DIR/no-method-suggested-traits.rs:40:9 + --> $DIR/no-method-suggested-traits.rs:30:9 | LL | 'a'.method(); | ^^^^^^ @@ -47,7 +47,7 @@ LL | use foo::Bar; | error[E0599]: no method named `method` found for type `std::rc::Rc<&mut std::boxed::Box<&char>>` in the current scope - --> $DIR/no-method-suggested-traits.rs:42:43 + --> $DIR/no-method-suggested-traits.rs:32:43 | LL | std::rc::Rc::new(&mut Box::new(&'a')).method(); | ^^^^^^ @@ -59,7 +59,7 @@ LL | use foo::Bar; | error[E0599]: no method named `method` found for type `i32` in the current scope - --> $DIR/no-method-suggested-traits.rs:45:10 + --> $DIR/no-method-suggested-traits.rs:35:10 | LL | 1i32.method(); | ^^^^^^ @@ -71,7 +71,7 @@ LL | use no_method_suggested_traits::foo::PubPub; | error[E0599]: no method named `method` found for type `std::rc::Rc<&mut std::boxed::Box<&i32>>` in the current scope - --> $DIR/no-method-suggested-traits.rs:47:44 + --> $DIR/no-method-suggested-traits.rs:37:44 | LL | std::rc::Rc::new(&mut Box::new(&1i32)).method(); | ^^^^^^ @@ -83,7 +83,7 @@ LL | use no_method_suggested_traits::foo::PubPub; | error[E0599]: no method named `method` found for type `Foo` in the current scope - --> $DIR/no-method-suggested-traits.rs:50:9 + --> $DIR/no-method-suggested-traits.rs:40:9 | LL | struct Foo; | ----------- method `method` not found for this @@ -99,7 +99,7 @@ LL | Foo.method(); candidate #4: `no_method_suggested_traits::Reexported` error[E0599]: no method named `method` found for type `std::rc::Rc<&mut std::boxed::Box<&Foo>>` in the current scope - --> $DIR/no-method-suggested-traits.rs:52:43 + --> $DIR/no-method-suggested-traits.rs:42:43 | LL | std::rc::Rc::new(&mut Box::new(&Foo)).method(); | ^^^^^^ @@ -112,7 +112,7 @@ LL | std::rc::Rc::new(&mut Box::new(&Foo)).method(); candidate #4: `no_method_suggested_traits::Reexported` error[E0599]: no method named `method2` found for type `u64` in the current scope - --> $DIR/no-method-suggested-traits.rs:55:10 + --> $DIR/no-method-suggested-traits.rs:45:10 | LL | 1u64.method2(); | ^^^^^^^ @@ -122,7 +122,7 @@ LL | 1u64.method2(); candidate #1: `foo::Bar` error[E0599]: no method named `method2` found for type `std::rc::Rc<&mut std::boxed::Box<&u64>>` in the current scope - --> $DIR/no-method-suggested-traits.rs:57:44 + --> $DIR/no-method-suggested-traits.rs:47:44 | LL | std::rc::Rc::new(&mut Box::new(&1u64)).method2(); | ^^^^^^^ @@ -132,7 +132,7 @@ LL | std::rc::Rc::new(&mut Box::new(&1u64)).method2(); candidate #1: `foo::Bar` error[E0599]: no method named `method2` found for type `no_method_suggested_traits::Foo` in the current scope - --> $DIR/no-method-suggested-traits.rs:60:37 + --> $DIR/no-method-suggested-traits.rs:50:37 | LL | no_method_suggested_traits::Foo.method2(); | ^^^^^^^ @@ -142,7 +142,7 @@ LL | no_method_suggested_traits::Foo.method2(); candidate #1: `foo::Bar` error[E0599]: no method named `method2` found for type `std::rc::Rc<&mut std::boxed::Box<&no_method_suggested_traits::Foo>>` in the current scope - --> $DIR/no-method-suggested-traits.rs:62:71 + --> $DIR/no-method-suggested-traits.rs:52:71 | LL | std::rc::Rc::new(&mut Box::new(&no_method_suggested_traits::Foo)).method2(); | ^^^^^^^ @@ -152,7 +152,7 @@ LL | std::rc::Rc::new(&mut Box::new(&no_method_suggested_traits::Foo)).metho candidate #1: `foo::Bar` error[E0599]: no method named `method2` found for type `no_method_suggested_traits::Bar` in the current scope - --> $DIR/no-method-suggested-traits.rs:64:40 + --> $DIR/no-method-suggested-traits.rs:54:40 | LL | no_method_suggested_traits::Bar::X.method2(); | ^^^^^^^ @@ -162,7 +162,7 @@ LL | no_method_suggested_traits::Bar::X.method2(); candidate #1: `foo::Bar` error[E0599]: no method named `method2` found for type `std::rc::Rc<&mut std::boxed::Box<&no_method_suggested_traits::Bar>>` in the current scope - --> $DIR/no-method-suggested-traits.rs:66:74 + --> $DIR/no-method-suggested-traits.rs:56:74 | LL | std::rc::Rc::new(&mut Box::new(&no_method_suggested_traits::Bar::X)).method2(); | ^^^^^^^ @@ -172,7 +172,7 @@ LL | std::rc::Rc::new(&mut Box::new(&no_method_suggested_traits::Bar::X)).me candidate #1: `foo::Bar` error[E0599]: no method named `method3` found for type `Foo` in the current scope - --> $DIR/no-method-suggested-traits.rs:69:9 + --> $DIR/no-method-suggested-traits.rs:59:9 | LL | struct Foo; | ----------- method `method3` not found for this @@ -185,7 +185,7 @@ LL | Foo.method3(); candidate #1: `no_method_suggested_traits::foo::PubPub` error[E0599]: no method named `method3` found for type `std::rc::Rc<&mut std::boxed::Box<&Foo>>` in the current scope - --> $DIR/no-method-suggested-traits.rs:71:43 + --> $DIR/no-method-suggested-traits.rs:61:43 | LL | std::rc::Rc::new(&mut Box::new(&Foo)).method3(); | ^^^^^^^ @@ -195,7 +195,7 @@ LL | std::rc::Rc::new(&mut Box::new(&Foo)).method3(); candidate #1: `no_method_suggested_traits::foo::PubPub` error[E0599]: no method named `method3` found for type `Bar` in the current scope - --> $DIR/no-method-suggested-traits.rs:73:12 + --> $DIR/no-method-suggested-traits.rs:63:12 | LL | enum Bar { X } | -------- method `method3` not found for this @@ -208,7 +208,7 @@ LL | Bar::X.method3(); candidate #1: `no_method_suggested_traits::foo::PubPub` error[E0599]: no method named `method3` found for type `std::rc::Rc<&mut std::boxed::Box<&Bar>>` in the current scope - --> $DIR/no-method-suggested-traits.rs:75:46 + --> $DIR/no-method-suggested-traits.rs:65:46 | LL | std::rc::Rc::new(&mut Box::new(&Bar::X)).method3(); | ^^^^^^^ @@ -218,37 +218,37 @@ LL | std::rc::Rc::new(&mut Box::new(&Bar::X)).method3(); candidate #1: `no_method_suggested_traits::foo::PubPub` error[E0599]: no method named `method3` found for type `usize` in the current scope - --> $DIR/no-method-suggested-traits.rs:79:13 + --> $DIR/no-method-suggested-traits.rs:69:13 | LL | 1_usize.method3(); //~ ERROR no method named | ^^^^^^^ error[E0599]: no method named `method3` found for type `std::rc::Rc<&mut std::boxed::Box<&usize>>` in the current scope - --> $DIR/no-method-suggested-traits.rs:80:47 + --> $DIR/no-method-suggested-traits.rs:70:47 | LL | std::rc::Rc::new(&mut Box::new(&1_usize)).method3(); //~ ERROR no method named | ^^^^^^^ error[E0599]: no method named `method3` found for type `no_method_suggested_traits::Foo` in the current scope - --> $DIR/no-method-suggested-traits.rs:81:37 + --> $DIR/no-method-suggested-traits.rs:71:37 | LL | no_method_suggested_traits::Foo.method3(); //~ ERROR no method named | ^^^^^^^ error[E0599]: no method named `method3` found for type `std::rc::Rc<&mut std::boxed::Box<&no_method_suggested_traits::Foo>>` in the current scope - --> $DIR/no-method-suggested-traits.rs:82:71 + --> $DIR/no-method-suggested-traits.rs:72:71 | LL | std::rc::Rc::new(&mut Box::new(&no_method_suggested_traits::Foo)).method3(); | ^^^^^^^ error[E0599]: no method named `method3` found for type `no_method_suggested_traits::Bar` in the current scope - --> $DIR/no-method-suggested-traits.rs:84:40 + --> $DIR/no-method-suggested-traits.rs:74:40 | LL | no_method_suggested_traits::Bar::X.method3(); //~ ERROR no method named | ^^^^^^^ error[E0599]: no method named `method3` found for type `std::rc::Rc<&mut std::boxed::Box<&no_method_suggested_traits::Bar>>` in the current scope - --> $DIR/no-method-suggested-traits.rs:85:74 + --> $DIR/no-method-suggested-traits.rs:75:74 | LL | std::rc::Rc::new(&mut Box::new(&no_method_suggested_traits::Bar::X)).method3(); | ^^^^^^^ diff --git a/src/test/ui/impl-trait/no-trait.rs b/src/test/ui/impl-trait/no-trait.rs index 5299ba297d0a6..9ce668f46727f 100644 --- a/src/test/ui/impl-trait/no-trait.rs +++ b/src/test/ui/impl-trait/no-trait.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn f() -> impl 'static {} //~ ERROR at least one trait must be specified fn main() {} diff --git a/src/test/ui/impl-trait/no-trait.stderr b/src/test/ui/impl-trait/no-trait.stderr index fdd01c87d1c99..84ac1bd5ca4a3 100644 --- a/src/test/ui/impl-trait/no-trait.stderr +++ b/src/test/ui/impl-trait/no-trait.stderr @@ -1,5 +1,5 @@ error: at least one trait must be specified - --> $DIR/no-trait.rs:11:11 + --> $DIR/no-trait.rs:1:11 | LL | fn f() -> impl 'static {} //~ ERROR at least one trait must be specified | ^^^^^^^^^^^^ diff --git a/src/test/ui/impl-trait/region-escape-via-bound-contravariant-closure.rs b/src/test/ui/impl-trait/region-escape-via-bound-contravariant-closure.rs index 78ae922c75126..cb40d90ae551a 100644 --- a/src/test/ui/impl-trait/region-escape-via-bound-contravariant-closure.rs +++ b/src/test/ui/impl-trait/region-escape-via-bound-contravariant-closure.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // In contrast to `region-escape-via-bound-invariant`, in this case we // *can* return a value of type `&'x u32`, even though `'x` does not // appear in the bounds. This is because `&` is contravariant, and so diff --git a/src/test/ui/impl-trait/region-escape-via-bound-contravariant.rs b/src/test/ui/impl-trait/region-escape-via-bound-contravariant.rs index 972461c2ffd96..e2310a3907f7e 100644 --- a/src/test/ui/impl-trait/region-escape-via-bound-contravariant.rs +++ b/src/test/ui/impl-trait/region-escape-via-bound-contravariant.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // In contrast to `region-escape-via-bound-invariant`, in this case we // *can* return a value of type `&'x u32`, even though `'x` does not // appear in the bounds. This is because `&` is contravariant, and so diff --git a/src/test/ui/impl-trait/region-escape-via-bound.rs b/src/test/ui/impl-trait/region-escape-via-bound.rs index c40c5f4cc3191..d62aec800e8ce 100644 --- a/src/test/ui/impl-trait/region-escape-via-bound.rs +++ b/src/test/ui/impl-trait/region-escape-via-bound.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we do not allow the region `'x` to escape in the impl // trait **even though** `'y` escapes, which outlives `'x`. // diff --git a/src/test/ui/impl-trait/region-escape-via-bound.stderr b/src/test/ui/impl-trait/region-escape-via-bound.stderr index 92464a2430169..81b44b7eba7fd 100644 --- a/src/test/ui/impl-trait/region-escape-via-bound.stderr +++ b/src/test/ui/impl-trait/region-escape-via-bound.stderr @@ -1,11 +1,11 @@ error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds - --> $DIR/region-escape-via-bound.rs:26:29 + --> $DIR/region-escape-via-bound.rs:16:29 | LL | fn foo(x: Cell<&'x u32>) -> impl Trait<'y> | ^^^^^^^^^^^^^^ | -note: hidden type `std::cell::Cell<&'x u32>` captures the lifetime 'x as defined on the function body at 28:7 - --> $DIR/region-escape-via-bound.rs:28:7 +note: hidden type `std::cell::Cell<&'x u32>` captures the lifetime 'x as defined on the function body at 18:7 + --> $DIR/region-escape-via-bound.rs:18:7 | LL | where 'x: 'y | ^^ diff --git a/src/test/ui/impl-trait/static-return-lifetime-infered.nll.stderr b/src/test/ui/impl-trait/static-return-lifetime-infered.nll.stderr index c1e12978c5179..778ef84197d99 100644 --- a/src/test/ui/impl-trait/static-return-lifetime-infered.nll.stderr +++ b/src/test/ui/impl-trait/static-return-lifetime-infered.nll.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/static-return-lifetime-infered.rs:17:16 + --> $DIR/static-return-lifetime-infered.rs:7:16 | LL | self.x.iter().map(|a| a.0) | ^^^^ warning: not reporting region error due to nll - --> $DIR/static-return-lifetime-infered.rs:21:16 + --> $DIR/static-return-lifetime-infered.rs:11:16 | LL | self.x.iter().map(|a| a.0) | ^^^^ error: unsatisfied lifetime constraints - --> $DIR/static-return-lifetime-infered.rs:17:9 + --> $DIR/static-return-lifetime-infered.rs:7:9 | LL | fn iter_values_anon(&self) -> impl Iterator { | - let's call the lifetime of this reference `'1` @@ -19,7 +19,7 @@ LL | self.x.iter().map(|a| a.0) | ^^^^^^^^^^^^^ requires that `'1` must outlive `'static` error: unsatisfied lifetime constraints - --> $DIR/static-return-lifetime-infered.rs:21:9 + --> $DIR/static-return-lifetime-infered.rs:11:9 | LL | fn iter_values<'a>(&'a self) -> impl Iterator { | -- lifetime `'a` defined here diff --git a/src/test/ui/impl-trait/static-return-lifetime-infered.rs b/src/test/ui/impl-trait/static-return-lifetime-infered.rs index a05c889528280..96f3652c226ea 100644 --- a/src/test/ui/impl-trait/static-return-lifetime-infered.rs +++ b/src/test/ui/impl-trait/static-return-lifetime-infered.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct A { x: [(u32, u32); 10] } diff --git a/src/test/ui/impl-trait/static-return-lifetime-infered.stderr b/src/test/ui/impl-trait/static-return-lifetime-infered.stderr index 083ad03ff8503..0bc0180e78a42 100644 --- a/src/test/ui/impl-trait/static-return-lifetime-infered.stderr +++ b/src/test/ui/impl-trait/static-return-lifetime-infered.stderr @@ -1,5 +1,5 @@ error: cannot infer an appropriate lifetime - --> $DIR/static-return-lifetime-infered.rs:17:16 + --> $DIR/static-return-lifetime-infered.rs:7:16 | LL | fn iter_values_anon(&self) -> impl Iterator { | ----------------------- this return type evaluates to the `'static` lifetime... @@ -8,20 +8,20 @@ LL | self.x.iter().map(|a| a.0) | | | ...but this borrow... | -note: ...can't outlive the anonymous lifetime #1 defined on the method body at 16:5 - --> $DIR/static-return-lifetime-infered.rs:16:5 +note: ...can't outlive the anonymous lifetime #1 defined on the method body at 6:5 + --> $DIR/static-return-lifetime-infered.rs:6:5 | LL | / fn iter_values_anon(&self) -> impl Iterator { LL | | self.x.iter().map(|a| a.0) LL | | } | |_____^ -help: you can add a constraint to the return type to make it last less than `'static` and match the anonymous lifetime #1 defined on the method body at 16:5 +help: you can add a constraint to the return type to make it last less than `'static` and match the anonymous lifetime #1 defined on the method body at 6:5 | LL | fn iter_values_anon(&self) -> impl Iterator + '_ { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: cannot infer an appropriate lifetime - --> $DIR/static-return-lifetime-infered.rs:21:16 + --> $DIR/static-return-lifetime-infered.rs:11:16 | LL | fn iter_values<'a>(&'a self) -> impl Iterator { | ----------------------- this return type evaluates to the `'static` lifetime... @@ -30,12 +30,12 @@ LL | self.x.iter().map(|a| a.0) | | | ...but this borrow... | -note: ...can't outlive the lifetime 'a as defined on the method body at 20:20 - --> $DIR/static-return-lifetime-infered.rs:20:20 +note: ...can't outlive the lifetime 'a as defined on the method body at 10:20 + --> $DIR/static-return-lifetime-infered.rs:10:20 | LL | fn iter_values<'a>(&'a self) -> impl Iterator { | ^^ -help: you can add a constraint to the return type to make it last less than `'static` and match the lifetime 'a as defined on the method body at 20:20 +help: you can add a constraint to the return type to make it last less than `'static` and match the lifetime 'a as defined on the method body at 10:20 | LL | fn iter_values<'a>(&'a self) -> impl Iterator + 'a { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/impl-trait/trait_type.rs b/src/test/ui/impl-trait/trait_type.rs index 7eefa5c600617..638fefc46d10e 100644 --- a/src/test/ui/impl-trait/trait_type.rs +++ b/src/test/ui/impl-trait/trait_type.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct MyType; struct MyType2; struct MyType3; diff --git a/src/test/ui/impl-trait/trait_type.stderr b/src/test/ui/impl-trait/trait_type.stderr index c91ebb705deec..a1f6b73abff2d 100644 --- a/src/test/ui/impl-trait/trait_type.stderr +++ b/src/test/ui/impl-trait/trait_type.stderr @@ -1,5 +1,5 @@ error[E0053]: method `fmt` has an incompatible type for trait - --> $DIR/trait_type.rs:17:4 + --> $DIR/trait_type.rs:7:4 | LL | fn fmt(&self, x: &str) -> () { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ types differ in mutability @@ -8,7 +8,7 @@ LL | fn fmt(&self, x: &str) -> () { } found type `fn(&MyType, &str)` error[E0050]: method `fmt` has 1 parameter but the declaration in trait `std::fmt::Display::fmt` has 2 - --> $DIR/trait_type.rs:22:11 + --> $DIR/trait_type.rs:12:11 | LL | fn fmt(&self) -> () { } | ^^^^^ expected 2 parameters, found 1 @@ -16,7 +16,7 @@ LL | fn fmt(&self) -> () { } = note: `fmt` from trait: `fn(&Self, &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error>` error[E0186]: method `fmt` has a `&self` declaration in the trait, but not in the impl - --> $DIR/trait_type.rs:27:4 + --> $DIR/trait_type.rs:17:4 | LL | fn fmt() -> () { } | ^^^^^^^^^^^^^^ expected `&self` in impl @@ -24,7 +24,7 @@ LL | fn fmt() -> () { } = note: `fmt` from trait: `fn(&Self, &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error>` error[E0046]: not all trait items implemented, missing: `fmt` - --> $DIR/trait_type.rs:31:1 + --> $DIR/trait_type.rs:21:1 | LL | impl std::fmt::Display for MyType4 {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `fmt` in implementation diff --git a/src/test/ui/impl-trait/type_parameters_captured.nll.stderr b/src/test/ui/impl-trait/type_parameters_captured.nll.stderr index 823ee4467299e..787505001af20 100644 --- a/src/test/ui/impl-trait/type_parameters_captured.nll.stderr +++ b/src/test/ui/impl-trait/type_parameters_captured.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/type_parameters_captured.rs:17:20 + --> $DIR/type_parameters_captured.rs:7:20 | LL | fn foo(x: T) -> impl Any + 'static { | ^^^^^^^^^^^^^^^^^^ error[E0310]: the parameter type `T` may not live long enough - --> $DIR/type_parameters_captured.rs:19:5 + --> $DIR/type_parameters_captured.rs:9:5 | LL | x | ^ diff --git a/src/test/ui/impl-trait/type_parameters_captured.rs b/src/test/ui/impl-trait/type_parameters_captured.rs index 7c3430ab90e52..6c9c9d4a42af5 100644 --- a/src/test/ui/impl-trait/type_parameters_captured.rs +++ b/src/test/ui/impl-trait/type_parameters_captured.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt::Debug; trait Any {} diff --git a/src/test/ui/impl-trait/type_parameters_captured.stderr b/src/test/ui/impl-trait/type_parameters_captured.stderr index 3b9b0e08a45a2..708b479ab17ef 100644 --- a/src/test/ui/impl-trait/type_parameters_captured.stderr +++ b/src/test/ui/impl-trait/type_parameters_captured.stderr @@ -1,5 +1,5 @@ error[E0310]: the parameter type `T` may not live long enough - --> $DIR/type_parameters_captured.rs:17:20 + --> $DIR/type_parameters_captured.rs:7:20 | LL | fn foo(x: T) -> impl Any + 'static { | - ^^^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | fn foo(x: T) -> impl Any + 'static { | help: consider adding an explicit lifetime bound `T: 'static`... | note: ...so that the type `T` will meet its required lifetime bounds - --> $DIR/type_parameters_captured.rs:17:20 + --> $DIR/type_parameters_captured.rs:7:20 | LL | fn foo(x: T) -> impl Any + 'static { | ^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/impl-trait/universal-issue-48703.rs b/src/test/ui/impl-trait/universal-issue-48703.rs index e017b37b7b733..e434e10bf89d7 100644 --- a/src/test/ui/impl-trait/universal-issue-48703.rs +++ b/src/test/ui/impl-trait/universal-issue-48703.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(universal_impl_trait)] use std::fmt::Debug; diff --git a/src/test/ui/impl-trait/universal-issue-48703.stderr b/src/test/ui/impl-trait/universal-issue-48703.stderr index ea509684f9efc..920b44fc909ab 100644 --- a/src/test/ui/impl-trait/universal-issue-48703.stderr +++ b/src/test/ui/impl-trait/universal-issue-48703.stderr @@ -1,5 +1,5 @@ error[E0632]: cannot provide explicit type parameters when `impl Trait` is used in argument position. - --> $DIR/universal-issue-48703.rs:18:5 + --> $DIR/universal-issue-48703.rs:8:5 | LL | foo::('a'); //~ ERROR cannot provide explicit type parameters | ^^^^^^^^^^^^^ diff --git a/src/test/ui/impl-trait/universal-mismatched-type.rs b/src/test/ui/impl-trait/universal-mismatched-type.rs index 6a62eb36c303c..e9129bbd71328 100644 --- a/src/test/ui/impl-trait/universal-mismatched-type.rs +++ b/src/test/ui/impl-trait/universal-mismatched-type.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt::Debug; fn foo(x: impl Debug) -> String { diff --git a/src/test/ui/impl-trait/universal-mismatched-type.stderr b/src/test/ui/impl-trait/universal-mismatched-type.stderr index 031db511ff30d..55e1216d3a8a0 100644 --- a/src/test/ui/impl-trait/universal-mismatched-type.stderr +++ b/src/test/ui/impl-trait/universal-mismatched-type.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/universal-mismatched-type.rs:14:5 + --> $DIR/universal-mismatched-type.rs:4:5 | LL | fn foo(x: impl Debug) -> String { | ------ expected `std::string::String` because of return type diff --git a/src/test/ui/impl-trait/universal-turbofish-in-method-issue-50950.rs b/src/test/ui/impl-trait/universal-turbofish-in-method-issue-50950.rs index ac53612d2daac..d3d561621fc2d 100644 --- a/src/test/ui/impl-trait/universal-turbofish-in-method-issue-50950.rs +++ b/src/test/ui/impl-trait/universal-turbofish-in-method-issue-50950.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::any::Any; pub struct EventHandler { } diff --git a/src/test/ui/impl-trait/universal-turbofish-in-method-issue-50950.stderr b/src/test/ui/impl-trait/universal-turbofish-in-method-issue-50950.stderr index fec3f78535ddd..b7fc4d149e3d2 100644 --- a/src/test/ui/impl-trait/universal-turbofish-in-method-issue-50950.stderr +++ b/src/test/ui/impl-trait/universal-turbofish-in-method-issue-50950.stderr @@ -1,5 +1,5 @@ error[E0632]: cannot provide explicit type parameters when `impl Trait` is used in argument position. - --> $DIR/universal-turbofish-in-method-issue-50950.rs:24:9 + --> $DIR/universal-turbofish-in-method-issue-50950.rs:14:9 | LL | evt.handle_event::(|_evt| { | ^^^^^^^^^^^^ diff --git a/src/test/ui/impl-trait/universal-two-impl-traits.rs b/src/test/ui/impl-trait/universal-two-impl-traits.rs index 5ecef1fee65d1..1ed47d8f49ead 100644 --- a/src/test/ui/impl-trait/universal-two-impl-traits.rs +++ b/src/test/ui/impl-trait/universal-two-impl-traits.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt::Debug; fn foo(x: impl Debug, y: impl Debug) -> String { diff --git a/src/test/ui/impl-trait/universal-two-impl-traits.stderr b/src/test/ui/impl-trait/universal-two-impl-traits.stderr index ed406895fc699..43bf2862feea5 100644 --- a/src/test/ui/impl-trait/universal-two-impl-traits.stderr +++ b/src/test/ui/impl-trait/universal-two-impl-traits.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/universal-two-impl-traits.rs:15:9 + --> $DIR/universal-two-impl-traits.rs:5:9 | LL | a = y; //~ ERROR mismatched | ^ expected type parameter, found a different type parameter diff --git a/src/test/ui/impl-trait/universal_wrong_bounds.rs b/src/test/ui/impl-trait/universal_wrong_bounds.rs index 63d000c056835..56a13ea257e88 100644 --- a/src/test/ui/impl-trait/universal_wrong_bounds.rs +++ b/src/test/ui/impl-trait/universal_wrong_bounds.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt::Display; fn foo(f: impl Display + Clone) -> String { diff --git a/src/test/ui/impl-trait/universal_wrong_bounds.stderr b/src/test/ui/impl-trait/universal_wrong_bounds.stderr index 68a318e2ac4b7..f0b685bd5ee91 100644 --- a/src/test/ui/impl-trait/universal_wrong_bounds.stderr +++ b/src/test/ui/impl-trait/universal_wrong_bounds.stderr @@ -1,5 +1,5 @@ error[E0405]: cannot find trait `Debug` in this scope - --> $DIR/universal_wrong_bounds.rs:19:24 + --> $DIR/universal_wrong_bounds.rs:9:24 | LL | fn wants_debug(g: impl Debug) { } //~ ERROR cannot find | ^^^^^ not found in this scope @@ -9,7 +9,7 @@ LL | use std::fmt::Debug; | error[E0405]: cannot find trait `Debug` in this scope - --> $DIR/universal_wrong_bounds.rs:20:26 + --> $DIR/universal_wrong_bounds.rs:10:26 | LL | fn wants_display(g: impl Debug) { } //~ ERROR cannot find | ^^^^^ not found in this scope diff --git a/src/test/ui/impl-trait/where-allowed.rs b/src/test/ui/impl-trait/where-allowed.rs index 2891cd59e3e1f..4e659150c9d0b 100644 --- a/src/test/ui/impl-trait/where-allowed.rs +++ b/src/test/ui/impl-trait/where-allowed.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! A simple test for testing many permutations of allowedness of //! impl Trait use std::fmt::Debug; diff --git a/src/test/ui/impl-trait/where-allowed.stderr b/src/test/ui/impl-trait/where-allowed.stderr index b15893e7c28cf..f58e50b4c4684 100644 --- a/src/test/ui/impl-trait/where-allowed.stderr +++ b/src/test/ui/impl-trait/where-allowed.stderr @@ -1,5 +1,5 @@ error[E0666]: nested `impl Trait` is not allowed - --> $DIR/where-allowed.rs:60:51 + --> $DIR/where-allowed.rs:50:51 | LL | fn in_impl_Fn_parameter_in_parameters(_: &impl Fn(impl Debug)) { panic!() } | --------^^^^^^^^^^- @@ -8,7 +8,7 @@ LL | fn in_impl_Fn_parameter_in_parameters(_: &impl Fn(impl Debug)) { panic!() } | outer `impl Trait` error[E0666]: nested `impl Trait` is not allowed - --> $DIR/where-allowed.rs:69:57 + --> $DIR/where-allowed.rs:59:57 | LL | fn in_impl_Fn_parameter_in_return() -> &'static impl Fn(impl Debug) { panic!() } | --------^^^^^^^^^^- @@ -17,223 +17,223 @@ LL | fn in_impl_Fn_parameter_in_return() -> &'static impl Fn(impl Debug) { panic | outer `impl Trait` error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:28:40 + --> $DIR/where-allowed.rs:18:40 | LL | fn in_fn_parameter_in_parameters(_: fn(impl Debug)) { panic!() } | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:32:42 + --> $DIR/where-allowed.rs:22:42 | LL | fn in_fn_return_in_parameters(_: fn() -> impl Debug) { panic!() } | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:36:38 + --> $DIR/where-allowed.rs:26:38 | LL | fn in_fn_parameter_in_return() -> fn(impl Debug) { panic!() } | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:40:40 + --> $DIR/where-allowed.rs:30:40 | LL | fn in_fn_return_in_return() -> fn() -> impl Debug { panic!() } | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:44:49 + --> $DIR/where-allowed.rs:34:49 | LL | fn in_dyn_Fn_parameter_in_parameters(_: &dyn Fn(impl Debug)) { panic!() } | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:48:51 + --> $DIR/where-allowed.rs:38:51 | LL | fn in_dyn_Fn_return_in_parameters(_: &dyn Fn() -> impl Debug) { panic!() } | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:52:55 + --> $DIR/where-allowed.rs:42:55 | LL | fn in_dyn_Fn_parameter_in_return() -> &'static dyn Fn(impl Debug) { panic!() } | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:56:57 + --> $DIR/where-allowed.rs:46:57 | LL | fn in_dyn_Fn_return_in_return() -> &'static dyn Fn() -> impl Debug { panic!() } | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:60:51 + --> $DIR/where-allowed.rs:50:51 | LL | fn in_impl_Fn_parameter_in_parameters(_: &impl Fn(impl Debug)) { panic!() } | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:65:53 + --> $DIR/where-allowed.rs:55:53 | LL | fn in_impl_Fn_return_in_parameters(_: &impl Fn() -> impl Debug) { panic!() } | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:69:57 + --> $DIR/where-allowed.rs:59:57 | LL | fn in_impl_Fn_parameter_in_return() -> &'static impl Fn(impl Debug) { panic!() } | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:74:59 + --> $DIR/where-allowed.rs:64:59 | LL | fn in_impl_Fn_return_in_return() -> &'static impl Fn() -> impl Debug { panic!() } | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:78:38 + --> $DIR/where-allowed.rs:68:38 | LL | fn in_Fn_parameter_in_generics (_: F) { panic!() } | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:82:40 + --> $DIR/where-allowed.rs:72:40 | LL | fn in_Fn_return_in_generics impl Debug> (_: F) { panic!() } | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:95:32 + --> $DIR/where-allowed.rs:85:32 | LL | struct InBraceStructField { x: impl Debug } | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:99:41 + --> $DIR/where-allowed.rs:89:41 | LL | struct InAdtInBraceStructField { x: Vec } | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:103:27 + --> $DIR/where-allowed.rs:93:27 | LL | struct InTupleStructField(impl Debug); | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:108:25 + --> $DIR/where-allowed.rs:98:25 | LL | InBraceVariant { x: impl Debug }, | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:110:20 + --> $DIR/where-allowed.rs:100:20 | LL | InTupleVariant(impl Debug), | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:121:23 + --> $DIR/where-allowed.rs:111:23 | LL | fn in_return() -> impl Debug; | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:132:16 + --> $DIR/where-allowed.rs:122:16 | LL | type Out = impl Debug; | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:138:34 + --> $DIR/where-allowed.rs:128:34 | LL | fn in_trait_impl_return() -> impl Debug { () } | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:151:33 + --> $DIR/where-allowed.rs:141:33 | LL | fn in_foreign_parameters(_: impl Debug); | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:154:31 + --> $DIR/where-allowed.rs:144:31 | LL | fn in_foreign_return() -> impl Debug; | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:167:23 + --> $DIR/where-allowed.rs:157:23 | LL | type InTypeAlias = impl Debug; | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:170:39 + --> $DIR/where-allowed.rs:160:39 | LL | type InReturnInTypeAlias = fn() -> impl Debug; | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:174:16 + --> $DIR/where-allowed.rs:164:16 | LL | impl PartialEq for () { | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:179:24 + --> $DIR/where-allowed.rs:169:24 | LL | impl PartialEq<()> for impl Debug { | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:184:6 + --> $DIR/where-allowed.rs:174:6 | LL | impl impl Debug { | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:190:24 + --> $DIR/where-allowed.rs:180:24 | LL | impl InInherentImplAdt { | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:196:11 + --> $DIR/where-allowed.rs:186:11 | LL | where impl Debug: Debug | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:203:15 + --> $DIR/where-allowed.rs:193:15 | LL | where Vec: Debug | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:210:24 + --> $DIR/where-allowed.rs:200:24 | LL | where T: PartialEq | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:217:17 + --> $DIR/where-allowed.rs:207:17 | LL | where T: Fn(impl Debug) | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:224:22 + --> $DIR/where-allowed.rs:214:22 | LL | where T: Fn() -> impl Debug | ^^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:230:29 + --> $DIR/where-allowed.rs:220:29 | LL | let _in_local_variable: impl Fn() = || {}; | ^^^^^^^^^ error[E0562]: `impl Trait` not allowed outside of function and inherent method return types - --> $DIR/where-allowed.rs:232:46 + --> $DIR/where-allowed.rs:222:46 | LL | let _in_return_in_local_variable = || -> impl Fn() { || {} }; | ^^^^^^^^^ diff --git a/src/test/ui/impl-unused-rps-in-assoc-type.rs b/src/test/ui/impl-unused-rps-in-assoc-type.rs index 23401db21d890..ea41997a69858 100644 --- a/src/test/ui/impl-unused-rps-in-assoc-type.rs +++ b/src/test/ui/impl-unused-rps-in-assoc-type.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that lifetime parameters must be constrained if they appear in // an associated type def'n. Issue #22077. diff --git a/src/test/ui/impl-unused-rps-in-assoc-type.stderr b/src/test/ui/impl-unused-rps-in-assoc-type.stderr index 1f7f790b1e4ad..80fc0504558f9 100644 --- a/src/test/ui/impl-unused-rps-in-assoc-type.stderr +++ b/src/test/ui/impl-unused-rps-in-assoc-type.stderr @@ -1,5 +1,5 @@ error[E0207]: the lifetime parameter `'a` is not constrained by the impl trait, self type, or predicates - --> $DIR/impl-unused-rps-in-assoc-type.rs:21:6 + --> $DIR/impl-unused-rps-in-assoc-type.rs:11:6 | LL | impl<'a> Fun for Holder { //~ ERROR E0207 | ^^ unconstrained lifetime parameter diff --git a/src/test/ui/impl-unused-tps-inherent.rs b/src/test/ui/impl-unused-tps-inherent.rs index 3803bb9b045ed..83a228e551aa6 100644 --- a/src/test/ui/impl-unused-tps-inherent.rs +++ b/src/test/ui/impl-unused-tps-inherent.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct MyType; struct MyType1(T); diff --git a/src/test/ui/impl-unused-tps-inherent.stderr b/src/test/ui/impl-unused-tps-inherent.stderr index c1f31deb858d9..43f63cf968cf5 100644 --- a/src/test/ui/impl-unused-tps-inherent.stderr +++ b/src/test/ui/impl-unused-tps-inherent.stderr @@ -1,11 +1,11 @@ error[E0207]: the type parameter `T` is not constrained by the impl trait, self type, or predicates - --> $DIR/impl-unused-tps-inherent.rs:19:6 + --> $DIR/impl-unused-tps-inherent.rs:9:6 | LL | impl MyType { | ^ unconstrained type parameter error[E0207]: the type parameter `U` is not constrained by the impl trait, self type, or predicates - --> $DIR/impl-unused-tps-inherent.rs:27:8 + --> $DIR/impl-unused-tps-inherent.rs:17:8 | LL | impl MyType1 { | ^ unconstrained type parameter diff --git a/src/test/ui/impl-unused-tps.rs b/src/test/ui/impl-unused-tps.rs index c9399afbb93b2..7cc1ae613bc3f 100644 --- a/src/test/ui/impl-unused-tps.rs +++ b/src/test/ui/impl-unused-tps.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn get(&self, A: &A) { } } diff --git a/src/test/ui/impl-unused-tps.stderr b/src/test/ui/impl-unused-tps.stderr index f50cc00b2f6b6..053ab91c89328 100644 --- a/src/test/ui/impl-unused-tps.stderr +++ b/src/test/ui/impl-unused-tps.stderr @@ -1,29 +1,29 @@ error[E0207]: the type parameter `U` is not constrained by the impl trait, self type, or predicates - --> $DIR/impl-unused-tps.rs:23:8 + --> $DIR/impl-unused-tps.rs:13:8 | LL | impl Foo for [isize;1] { | ^ unconstrained type parameter error[E0207]: the type parameter `U` is not constrained by the impl trait, self type, or predicates - --> $DIR/impl-unused-tps.rs:40:8 + --> $DIR/impl-unused-tps.rs:30:8 | LL | impl Bar for T { | ^ unconstrained type parameter error[E0207]: the type parameter `U` is not constrained by the impl trait, self type, or predicates - --> $DIR/impl-unused-tps.rs:48:8 + --> $DIR/impl-unused-tps.rs:38:8 | LL | impl Bar for T | ^ unconstrained type parameter error[E0207]: the type parameter `U` is not constrained by the impl trait, self type, or predicates - --> $DIR/impl-unused-tps.rs:56:8 + --> $DIR/impl-unused-tps.rs:46:8 | LL | impl Foo for T | ^ unconstrained type parameter error[E0207]: the type parameter `V` is not constrained by the impl trait, self type, or predicates - --> $DIR/impl-unused-tps.rs:56:10 + --> $DIR/impl-unused-tps.rs:46:10 | LL | impl Foo for T | ^ unconstrained type parameter diff --git a/src/test/ui/implicit-method-bind.rs b/src/test/ui/implicit-method-bind.rs index e116966670d2b..5e27516a89a41 100644 --- a/src/test/ui/implicit-method-bind.rs +++ b/src/test/ui/implicit-method-bind.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let _f = 10i32.abs; //~ ERROR attempted to take value of method } diff --git a/src/test/ui/implicit-method-bind.stderr b/src/test/ui/implicit-method-bind.stderr index 5de9e58807c4e..6f0ed4c5b5822 100644 --- a/src/test/ui/implicit-method-bind.stderr +++ b/src/test/ui/implicit-method-bind.stderr @@ -1,5 +1,5 @@ error[E0615]: attempted to take value of method `abs` on type `i32` - --> $DIR/implicit-method-bind.rs:12:20 + --> $DIR/implicit-method-bind.rs:2:20 | LL | let _f = 10i32.abs; //~ ERROR attempted to take value of method | ^^^ diff --git a/src/test/ui/import.rs b/src/test/ui/import.rs index 81a5334ed7ab7..540258daaec82 100644 --- a/src/test/ui/import.rs +++ b/src/test/ui/import.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use zed::bar; use zed::baz; //~ ERROR unresolved import `zed::baz` [E0432] //~^ no `baz` in `zed`. Did you mean to use `bar`? diff --git a/src/test/ui/import.stderr b/src/test/ui/import.stderr index 896655868441c..4c1d622985d01 100644 --- a/src/test/ui/import.stderr +++ b/src/test/ui/import.stderr @@ -1,17 +1,17 @@ error[E0432]: unresolved import `zed::baz` - --> $DIR/import.rs:12:5 + --> $DIR/import.rs:2:5 | LL | use zed::baz; //~ ERROR unresolved import `zed::baz` [E0432] | ^^^^^^^^ no `baz` in `zed`. Did you mean to use `bar`? error[E0432]: unresolved import `foo` - --> $DIR/import.rs:18:9 + --> $DIR/import.rs:8:9 | LL | use foo; //~ ERROR unresolved import `foo` [E0432] | ^^^ no `foo` in the root error[E0603]: unresolved item `foo` is private - --> $DIR/import.rs:23:5 + --> $DIR/import.rs:13:5 | LL | zed::foo(); //~ ERROR `foo` is private | ^^^^^^^^ diff --git a/src/test/ui/import2.rs b/src/test/ui/import2.rs index c4bd9ff1e2abe..37d8663e03f40 100644 --- a/src/test/ui/import2.rs +++ b/src/test/ui/import2.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use baz::zed::bar; //~ ERROR unresolved import `baz::zed` [E0432] //~^ Could not find `zed` in `baz` diff --git a/src/test/ui/import2.stderr b/src/test/ui/import2.stderr index c07506845c4cc..1e03b7245d6eb 100644 --- a/src/test/ui/import2.stderr +++ b/src/test/ui/import2.stderr @@ -1,5 +1,5 @@ error[E0432]: unresolved import `baz::zed` - --> $DIR/import2.rs:11:10 + --> $DIR/import2.rs:1:10 | LL | use baz::zed::bar; //~ ERROR unresolved import `baz::zed` [E0432] | ^^^ Could not find `zed` in `baz` diff --git a/src/test/ui/import3.rs b/src/test/ui/import3.rs index 0a7827587a693..2c6ac9a00e109 100644 --- a/src/test/ui/import3.rs +++ b/src/test/ui/import3.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: unresolved use main::bar; diff --git a/src/test/ui/import3.stderr b/src/test/ui/import3.stderr index 5211b862b3dc5..4b184dca7967b 100644 --- a/src/test/ui/import3.stderr +++ b/src/test/ui/import3.stderr @@ -1,5 +1,5 @@ error[E0432]: unresolved import `main` - --> $DIR/import3.rs:12:5 + --> $DIR/import3.rs:2:5 | LL | use main::bar; | ^^^^ Maybe a missing `extern crate main;`? diff --git a/src/test/ui/import4.rs b/src/test/ui/import4.rs index 5f3163e939019..ba3b7fbf53559 100644 --- a/src/test/ui/import4.rs +++ b/src/test/ui/import4.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: import diff --git a/src/test/ui/import4.stderr b/src/test/ui/import4.stderr index d74e781ad4a48..e0b478f1aec4b 100644 --- a/src/test/ui/import4.stderr +++ b/src/test/ui/import4.stderr @@ -1,5 +1,5 @@ error[E0432]: unresolved import `a::foo` - --> $DIR/import4.rs:15:17 + --> $DIR/import4.rs:5:17 | LL | mod b { pub use a::foo; } | ^^^^^^ no `foo` in `a` diff --git a/src/test/ui/imports/auxiliary/import_crate_var.rs b/src/test/ui/imports/auxiliary/import_crate_var.rs index a8a55afa41a0e..a273b103a1b10 100644 --- a/src/test/ui/imports/auxiliary/import_crate_var.rs +++ b/src/test/ui/imports/auxiliary/import_crate_var.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn f() {} #[macro_export] diff --git a/src/test/ui/imports/auxiliary/two_macros.rs b/src/test/ui/imports/auxiliary/two_macros.rs index 2ac8e3ef983da..92c211467d83d 100644 --- a/src/test/ui/imports/auxiliary/two_macros.rs +++ b/src/test/ui/imports/auxiliary/two_macros.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[macro_export] macro_rules! m { ($($t:tt)*) => { $($t)* } } diff --git a/src/test/ui/imports/duplicate.rs b/src/test/ui/imports/duplicate.rs index dd2dcbe2e6808..95bb69043e9bf 100644 --- a/src/test/ui/imports/duplicate.rs +++ b/src/test/ui/imports/duplicate.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod a { pub fn foo() {} } diff --git a/src/test/ui/imports/duplicate.stderr b/src/test/ui/imports/duplicate.stderr index 452e3e1e2008f..b395c578fc1e3 100644 --- a/src/test/ui/imports/duplicate.stderr +++ b/src/test/ui/imports/duplicate.stderr @@ -1,5 +1,5 @@ error[E0252]: the name `foo` is defined multiple times - --> $DIR/duplicate.rs:25:9 + --> $DIR/duplicate.rs:15:9 | LL | use a::foo; | ------ previous import of the value `foo` here @@ -13,72 +13,72 @@ LL | use a::foo as other_foo; //~ ERROR the name `foo` is defined multiple t | ^^^^^^^^^^^^^^^^^^^ error[E0659]: `foo` is ambiguous - --> $DIR/duplicate.rs:56:9 + --> $DIR/duplicate.rs:46:9 | LL | use self::foo::bar; //~ ERROR `foo` is ambiguous | ^^^^^^^^^^^^^^ | note: `foo` could refer to the name imported here - --> $DIR/duplicate.rs:53:9 + --> $DIR/duplicate.rs:43:9 | LL | use self::m1::*; | ^^^^^^^^^^^ note: `foo` could also refer to the name imported here - --> $DIR/duplicate.rs:54:9 + --> $DIR/duplicate.rs:44:9 | LL | use self::m2::*; | ^^^^^^^^^^^ = note: consider adding an explicit import of `foo` to disambiguate error[E0659]: `foo` is ambiguous - --> $DIR/duplicate.rs:45:5 + --> $DIR/duplicate.rs:35:5 | LL | f::foo(); //~ ERROR `foo` is ambiguous | ^^^^^^ | note: `foo` could refer to the name imported here - --> $DIR/duplicate.rs:34:13 + --> $DIR/duplicate.rs:24:13 | LL | pub use a::*; | ^^^^ note: `foo` could also refer to the name imported here - --> $DIR/duplicate.rs:35:13 + --> $DIR/duplicate.rs:25:13 | LL | pub use b::*; | ^^^^ = note: consider adding an explicit import of `foo` to disambiguate error[E0659]: `foo` is ambiguous - --> $DIR/duplicate.rs:46:5 + --> $DIR/duplicate.rs:36:5 | LL | g::foo(); //~ ERROR `foo` is ambiguous | ^^^^^^ | note: `foo` could refer to the name imported here - --> $DIR/duplicate.rs:39:13 + --> $DIR/duplicate.rs:29:13 | LL | pub use a::*; | ^^^^ note: `foo` could also refer to the name imported here - --> $DIR/duplicate.rs:40:13 + --> $DIR/duplicate.rs:30:13 | LL | pub use f::*; | ^^^^ = note: consider adding an explicit import of `foo` to disambiguate error[E0659]: `foo` is ambiguous - --> $DIR/duplicate.rs:59:9 + --> $DIR/duplicate.rs:49:9 | LL | foo::bar(); //~ ERROR `foo` is ambiguous | ^^^^^^^^ | note: `foo` could refer to the name imported here - --> $DIR/duplicate.rs:53:9 + --> $DIR/duplicate.rs:43:9 | LL | use self::m1::*; | ^^^^^^^^^^^ note: `foo` could also refer to the name imported here - --> $DIR/duplicate.rs:54:9 + --> $DIR/duplicate.rs:44:9 | LL | use self::m2::*; | ^^^^^^^^^^^ diff --git a/src/test/ui/imports/glob-shadowing.rs b/src/test/ui/imports/glob-shadowing.rs index e4f55137e660f..3a33b592b0081 100644 --- a/src/test/ui/imports/glob-shadowing.rs +++ b/src/test/ui/imports/glob-shadowing.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(decl_macro)] mod m { diff --git a/src/test/ui/imports/glob-shadowing.stderr b/src/test/ui/imports/glob-shadowing.stderr index 7f61cd6c76d6a..31cf9a7cf42df 100644 --- a/src/test/ui/imports/glob-shadowing.stderr +++ b/src/test/ui/imports/glob-shadowing.stderr @@ -1,11 +1,11 @@ error[E0659]: `env` is ambiguous - --> $DIR/glob-shadowing.rs:21:17 + --> $DIR/glob-shadowing.rs:11:17 | LL | let x = env!("PATH"); //~ ERROR `env` is ambiguous | ^^^ | note: `env` could refer to the name imported here - --> $DIR/glob-shadowing.rs:19:9 + --> $DIR/glob-shadowing.rs:9:9 | LL | use m::*; | ^^^^ @@ -13,13 +13,13 @@ LL | use m::*; = note: consider adding an explicit import of `env` to disambiguate error[E0659]: `env` is ambiguous - --> $DIR/glob-shadowing.rs:29:21 + --> $DIR/glob-shadowing.rs:19:21 | LL | let x = env!("PATH"); //~ ERROR `env` is ambiguous | ^^^ | note: `env` could refer to the name imported here - --> $DIR/glob-shadowing.rs:27:13 + --> $DIR/glob-shadowing.rs:17:13 | LL | use m::*; | ^^^^ @@ -27,18 +27,18 @@ LL | use m::*; = note: consider adding an explicit import of `env` to disambiguate error[E0659]: `fenv` is ambiguous - --> $DIR/glob-shadowing.rs:39:21 + --> $DIR/glob-shadowing.rs:29:21 | LL | let x = fenv!(); //~ ERROR `fenv` is ambiguous | ^^^^ | note: `fenv` could refer to the name imported here - --> $DIR/glob-shadowing.rs:37:13 + --> $DIR/glob-shadowing.rs:27:13 | LL | use m::*; | ^^^^ note: `fenv` could also refer to the name defined here - --> $DIR/glob-shadowing.rs:35:5 + --> $DIR/glob-shadowing.rs:25:5 | LL | pub macro fenv($e: expr) { $e } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/imports/import-crate-var.rs b/src/test/ui/imports/import-crate-var.rs index b09883d9adeea..d0919dd962b55 100644 --- a/src/test/ui/imports/import-crate-var.rs +++ b/src/test/ui/imports/import-crate-var.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:import_crate_var.rs #![feature(rustc_attrs)] diff --git a/src/test/ui/imports/import-crate-var.stderr b/src/test/ui/imports/import-crate-var.stderr index 3f02223fb67a4..8bc077a796d35 100644 --- a/src/test/ui/imports/import-crate-var.stderr +++ b/src/test/ui/imports/import-crate-var.stderr @@ -1,5 +1,5 @@ warning: `$crate` may not be imported - --> $DIR/import-crate-var.rs:19:5 + --> $DIR/import-crate-var.rs:9:5 | LL | m!(); | ^^^^^ @@ -8,7 +8,7 @@ LL | m!(); = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) error: compilation successful - --> $DIR/import-crate-var.rs:18:1 + --> $DIR/import-crate-var.rs:8:1 | LL | / fn main() { //~ ERROR compilation successful LL | | m!(); diff --git a/src/test/ui/imports/import-from-missing.rs b/src/test/ui/imports/import-from-missing.rs index 220b255bde419..8eae700208f99 100644 --- a/src/test/ui/imports/import-from-missing.rs +++ b/src/test/ui/imports/import-from-missing.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use spam::{ham, eggs}; //~ ERROR unresolved import `spam::eggs` [E0432] //~^ no `eggs` in `spam` diff --git a/src/test/ui/imports/import-from-missing.stderr b/src/test/ui/imports/import-from-missing.stderr index 1b40fe45c7f8d..0524b1675645a 100644 --- a/src/test/ui/imports/import-from-missing.stderr +++ b/src/test/ui/imports/import-from-missing.stderr @@ -1,5 +1,5 @@ error[E0432]: unresolved import `spam::eggs` - --> $DIR/import-from-missing.rs:11:17 + --> $DIR/import-from-missing.rs:1:17 | LL | use spam::{ham, eggs}; //~ ERROR unresolved import `spam::eggs` [E0432] | ^^^^ no `eggs` in `spam` diff --git a/src/test/ui/imports/import-glob-0.rs b/src/test/ui/imports/import-glob-0.rs index 774eaf174d96d..37a0d15456c67 100644 --- a/src/test/ui/imports/import-glob-0.rs +++ b/src/test/ui/imports/import-glob-0.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use module_of_many_things::*; mod module_of_many_things { diff --git a/src/test/ui/imports/import-glob-0.stderr b/src/test/ui/imports/import-glob-0.stderr index 91cae30776da3..4fecf80bff22b 100644 --- a/src/test/ui/imports/import-glob-0.stderr +++ b/src/test/ui/imports/import-glob-0.stderr @@ -1,5 +1,5 @@ error[E0425]: cannot find function `f999` in this scope - --> $DIR/import-glob-0.rs:24:5 + --> $DIR/import-glob-0.rs:14:5 | LL | f999(); //~ ERROR cannot find function `f999` in this scope | ^^^^ not found in this scope diff --git a/src/test/ui/imports/import-glob-circular.rs b/src/test/ui/imports/import-glob-circular.rs index d9cc17791ed56..ee18f153d9018 100644 --- a/src/test/ui/imports/import-glob-circular.rs +++ b/src/test/ui/imports/import-glob-circular.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod circ1 { pub use circ2::f2; pub fn f1() { println!("f1"); } diff --git a/src/test/ui/imports/import-glob-circular.stderr b/src/test/ui/imports/import-glob-circular.stderr index 078a6a3937a47..81e28fa174f8d 100644 --- a/src/test/ui/imports/import-glob-circular.stderr +++ b/src/test/ui/imports/import-glob-circular.stderr @@ -1,5 +1,5 @@ error[E0425]: cannot find function `f1066` in this scope - --> $DIR/import-glob-circular.rs:26:17 + --> $DIR/import-glob-circular.rs:16:17 | LL | fn test() { f1066(); } //~ ERROR cannot find function `f1066` in this scope | ^^^^^ not found in this scope diff --git a/src/test/ui/imports/import-loop-2.rs b/src/test/ui/imports/import-loop-2.rs index b7bbe11a4dc96..66d026b923191 100644 --- a/src/test/ui/imports/import-loop-2.rs +++ b/src/test/ui/imports/import-loop-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:import mod a { diff --git a/src/test/ui/imports/import-loop-2.stderr b/src/test/ui/imports/import-loop-2.stderr index 717f74643ebb4..5bd9f2ae58863 100644 --- a/src/test/ui/imports/import-loop-2.stderr +++ b/src/test/ui/imports/import-loop-2.stderr @@ -1,5 +1,5 @@ error[E0432]: unresolved import `a::x` - --> $DIR/import-loop-2.rs:18:13 + --> $DIR/import-loop-2.rs:8:13 | LL | pub use a::x; | ^^^^ no `x` in `a` @@ -8,7 +8,7 @@ error[E0601]: `main` function not found in crate `import_loop_2` | = note: the main function must be defined at the crate level but you have one or more functions named 'main' that are not defined at the crate level. Either move the definition or attach the `#[main]` attribute to override this behavior. note: here is a function named 'main' - --> $DIR/import-loop-2.rs:20:5 + --> $DIR/import-loop-2.rs:10:5 | LL | fn main() { let y = x; } | ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/imports/import-loop.rs b/src/test/ui/imports/import-loop.rs index f9b57f007766e..b48783401455d 100644 --- a/src/test/ui/imports/import-loop.rs +++ b/src/test/ui/imports/import-loop.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:import use y::x; diff --git a/src/test/ui/imports/import-loop.stderr b/src/test/ui/imports/import-loop.stderr index b9a1204bb73ee..b87bfb1be52cd 100644 --- a/src/test/ui/imports/import-loop.stderr +++ b/src/test/ui/imports/import-loop.stderr @@ -1,5 +1,5 @@ error[E0432]: unresolved import `y::x` - --> $DIR/import-loop.rs:16:13 + --> $DIR/import-loop.rs:6:13 | LL | pub use y::x; | ^^^^ no `x` in `y` diff --git a/src/test/ui/imports/import-prefix-macro-1.rs b/src/test/ui/imports/import-prefix-macro-1.rs index beb15a11a9695..91cfd376886d8 100644 --- a/src/test/ui/imports/import-prefix-macro-1.rs +++ b/src/test/ui/imports/import-prefix-macro-1.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod a { pub mod b { pub mod c { diff --git a/src/test/ui/imports/import-prefix-macro-1.stderr b/src/test/ui/imports/import-prefix-macro-1.stderr index e3f436e4ea87b..76e543a9f271b 100644 --- a/src/test/ui/imports/import-prefix-macro-1.stderr +++ b/src/test/ui/imports/import-prefix-macro-1.stderr @@ -1,5 +1,5 @@ error: expected one of `::`, `;`, or `as`, found `{` - --> $DIR/import-prefix-macro-1.rs:21:27 + --> $DIR/import-prefix-macro-1.rs:11:27 | LL | ($p: path) => (use $p {S, Z}); //~ERROR expected one of `::`, `;`, or `as`, found `{` | ^ expected one of `::`, `;`, or `as` here diff --git a/src/test/ui/imports/import-prefix-macro-2.rs b/src/test/ui/imports/import-prefix-macro-2.rs index 56c6273aa9a29..952d161e83fac 100644 --- a/src/test/ui/imports/import-prefix-macro-2.rs +++ b/src/test/ui/imports/import-prefix-macro-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod a { pub mod b { pub mod c { diff --git a/src/test/ui/imports/import-prefix-macro-2.stderr b/src/test/ui/imports/import-prefix-macro-2.stderr index ab9e32afdf084..fa3c90d9ed29e 100644 --- a/src/test/ui/imports/import-prefix-macro-2.stderr +++ b/src/test/ui/imports/import-prefix-macro-2.stderr @@ -1,5 +1,5 @@ error: expected identifier, found `a::b::c` - --> $DIR/import-prefix-macro-2.rs:21:26 + --> $DIR/import-prefix-macro-2.rs:11:26 | LL | ($p: path) => (use ::$p {S, Z}); //~ERROR expected identifier, found `a::b::c` | ^^ expected identifier diff --git a/src/test/ui/imports/import-trait-method.rs b/src/test/ui/imports/import-trait-method.rs index 75081b10d862e..97dd68f1e76e7 100644 --- a/src/test/ui/imports/import-trait-method.rs +++ b/src/test/ui/imports/import-trait-method.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn foo(); } diff --git a/src/test/ui/imports/import-trait-method.stderr b/src/test/ui/imports/import-trait-method.stderr index 917a68a7c8b6b..00cfb42ddd4fa 100644 --- a/src/test/ui/imports/import-trait-method.stderr +++ b/src/test/ui/imports/import-trait-method.stderr @@ -1,5 +1,5 @@ error[E0253]: `foo` is not directly importable - --> $DIR/import-trait-method.rs:15:5 + --> $DIR/import-trait-method.rs:5:5 | LL | use Foo::foo; //~ ERROR not directly importable | ^^^^^^^^ cannot be imported directly diff --git a/src/test/ui/imports/issue-53140.rs b/src/test/ui/imports/issue-53140.rs index dcfa054f2513f..dbfba2c94339a 100644 --- a/src/test/ui/imports/issue-53140.rs +++ b/src/test/ui/imports/issue-53140.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass mod m { diff --git a/src/test/ui/imports/issue-53269.rs b/src/test/ui/imports/issue-53269.rs index 1b21e3ba5f3a7..444a16f7e7a56 100644 --- a/src/test/ui/imports/issue-53269.rs +++ b/src/test/ui/imports/issue-53269.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Ambiguity between a `macro_rules` macro and a non-existent import recovered as `Def::Err` macro_rules! mac { () => () } diff --git a/src/test/ui/imports/issue-53269.stderr b/src/test/ui/imports/issue-53269.stderr index 0036d71107a95..2dffd07efdb1b 100644 --- a/src/test/ui/imports/issue-53269.stderr +++ b/src/test/ui/imports/issue-53269.stderr @@ -1,22 +1,22 @@ error[E0432]: unresolved import `nonexistent_module` - --> $DIR/issue-53269.rs:16:9 + --> $DIR/issue-53269.rs:6:9 | LL | use nonexistent_module::mac; //~ ERROR unresolved import `nonexistent_module` | ^^^^^^^^^^^^^^^^^^ Maybe a missing `extern crate nonexistent_module;`? error[E0659]: `mac` is ambiguous - --> $DIR/issue-53269.rs:18:5 + --> $DIR/issue-53269.rs:8:5 | LL | mac!(); //~ ERROR `mac` is ambiguous | ^^^ | note: `mac` could refer to the name defined here - --> $DIR/issue-53269.rs:13:1 + --> $DIR/issue-53269.rs:3:1 | LL | macro_rules! mac { () => () } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ note: `mac` could also refer to the name imported here - --> $DIR/issue-53269.rs:16:9 + --> $DIR/issue-53269.rs:6:9 | LL | use nonexistent_module::mac; //~ ERROR unresolved import `nonexistent_module` | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/imports/issue-53512.rs b/src/test/ui/imports/issue-53512.rs index 82ae75e8198ac..61d93531a15b3 100644 --- a/src/test/ui/imports/issue-53512.rs +++ b/src/test/ui/imports/issue-53512.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Macro from prelude is shadowed by non-existent import recovered as `Def::Err`. use std::assert; //~ ERROR unresolved import `std::assert` diff --git a/src/test/ui/imports/issue-53512.stderr b/src/test/ui/imports/issue-53512.stderr index e79e759f6c69f..a733013be5f2e 100644 --- a/src/test/ui/imports/issue-53512.stderr +++ b/src/test/ui/imports/issue-53512.stderr @@ -1,5 +1,5 @@ error[E0432]: unresolved import `std::assert` - --> $DIR/issue-53512.rs:13:5 + --> $DIR/issue-53512.rs:3:5 | LL | use std::assert; //~ ERROR unresolved import `std::assert` | ^^^^^^^^^^^ no `assert` in the root diff --git a/src/test/ui/imports/local-modularized-tricky-fail-1.rs b/src/test/ui/imports/local-modularized-tricky-fail-1.rs index 445344732f7bd..7d576cb861f19 100644 --- a/src/test/ui/imports/local-modularized-tricky-fail-1.rs +++ b/src/test/ui/imports/local-modularized-tricky-fail-1.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(decl_macro)] macro_rules! define_exported { () => { diff --git a/src/test/ui/imports/local-modularized-tricky-fail-1.stderr b/src/test/ui/imports/local-modularized-tricky-fail-1.stderr index e9a81e7ae4c4c..75b6e78602ad1 100644 --- a/src/test/ui/imports/local-modularized-tricky-fail-1.stderr +++ b/src/test/ui/imports/local-modularized-tricky-fail-1.stderr @@ -1,11 +1,11 @@ error[E0659]: `exported` is ambiguous - --> $DIR/local-modularized-tricky-fail-1.rs:38:1 + --> $DIR/local-modularized-tricky-fail-1.rs:28:1 | LL | exported!(); //~ ERROR `exported` is ambiguous | ^^^^^^^^ | note: `exported` could refer to the name defined here - --> $DIR/local-modularized-tricky-fail-1.rs:15:5 + --> $DIR/local-modularized-tricky-fail-1.rs:5:5 | LL | / macro_rules! exported { LL | | () => () @@ -15,20 +15,20 @@ LL | | } LL | define_exported!(); | ------------------- in this macro invocation note: `exported` could also refer to the name imported here - --> $DIR/local-modularized-tricky-fail-1.rs:32:5 + --> $DIR/local-modularized-tricky-fail-1.rs:22:5 | LL | use inner1::*; | ^^^^^^^^^ = note: macro-expanded macros do not shadow error[E0659]: `include` is ambiguous - --> $DIR/local-modularized-tricky-fail-1.rs:57:1 + --> $DIR/local-modularized-tricky-fail-1.rs:47:1 | LL | include!(); //~ ERROR `include` is ambiguous | ^^^^^^^ | note: `include` could refer to the name defined here - --> $DIR/local-modularized-tricky-fail-1.rs:27:5 + --> $DIR/local-modularized-tricky-fail-1.rs:17:5 | LL | / macro_rules! include { LL | | () => () @@ -41,13 +41,13 @@ LL | define_include!(); = note: macro-expanded macros do not shadow error[E0659]: `panic` is ambiguous - --> $DIR/local-modularized-tricky-fail-1.rs:45:5 + --> $DIR/local-modularized-tricky-fail-1.rs:35:5 | LL | panic!(); //~ ERROR `panic` is ambiguous | ^^^^^ | note: `panic` could refer to the name defined here - --> $DIR/local-modularized-tricky-fail-1.rs:21:5 + --> $DIR/local-modularized-tricky-fail-1.rs:11:5 | LL | / macro_rules! panic { LL | | () => () @@ -60,13 +60,13 @@ LL | define_panic!(); = note: macro-expanded macros do not shadow error[E0659]: `panic` is ambiguous - --> $DIR/local-modularized-tricky-fail-1.rs:45:5 + --> $DIR/local-modularized-tricky-fail-1.rs:35:5 | LL | panic!(); //~ ERROR `panic` is ambiguous | ^^^^^^^^^ | note: `panic` could refer to the name defined here - --> $DIR/local-modularized-tricky-fail-1.rs:21:5 + --> $DIR/local-modularized-tricky-fail-1.rs:11:5 | LL | / macro_rules! panic { LL | | () => () diff --git a/src/test/ui/imports/local-modularized-tricky-fail-2.rs b/src/test/ui/imports/local-modularized-tricky-fail-2.rs index 1ae7ed268ebf8..e637edadb0074 100644 --- a/src/test/ui/imports/local-modularized-tricky-fail-2.rs +++ b/src/test/ui/imports/local-modularized-tricky-fail-2.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // `#[macro_export] macro_rules` that doesn't originate from macro expansions can be placed // into the root module soon enough to act as usual items and shadow globs and preludes. diff --git a/src/test/ui/imports/local-modularized-tricky-fail-2.stderr b/src/test/ui/imports/local-modularized-tricky-fail-2.stderr index 5681dd5962850..42ee68073fbc5 100644 --- a/src/test/ui/imports/local-modularized-tricky-fail-2.stderr +++ b/src/test/ui/imports/local-modularized-tricky-fail-2.stderr @@ -1,5 +1,5 @@ error[E0658]: non-ascii idents are not fully supported. (see issue #28979) - --> $DIR/local-modularized-tricky-fail-2.rs:30:32 + --> $DIR/local-modularized-tricky-fail-2.rs:20:32 | LL | exported!(); | ------------ in this macro invocation @@ -10,7 +10,7 @@ LL | () => ( struct Б; ) //~ ERROR non-ascii idents are not ful = help: add #![feature(non_ascii_idents)] to the crate attributes to enable error[E0658]: non-ascii idents are not fully supported. (see issue #28979) - --> $DIR/local-modularized-tricky-fail-2.rs:46:24 + --> $DIR/local-modularized-tricky-fail-2.rs:36:24 | LL | panic!(); | --------- in this macro invocation @@ -21,7 +21,7 @@ LL | () => ( struct Г; ) //~ ERROR non-ascii idents are not fully suppo = help: add #![feature(non_ascii_idents)] to the crate attributes to enable error[E0658]: non-ascii idents are not fully supported. (see issue #28979) - --> $DIR/local-modularized-tricky-fail-2.rs:56:24 + --> $DIR/local-modularized-tricky-fail-2.rs:46:24 | LL | include!(); | ----------- in this macro invocation diff --git a/src/test/ui/imports/local-modularized-tricky-fail-3.rs b/src/test/ui/imports/local-modularized-tricky-fail-3.rs index 1cd7cc56a400d..386de88bc3d62 100644 --- a/src/test/ui/imports/local-modularized-tricky-fail-3.rs +++ b/src/test/ui/imports/local-modularized-tricky-fail-3.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Crate-local macro expanded `macro_export` macros cannot be accessed with module-relative paths. macro_rules! define_exported { () => { diff --git a/src/test/ui/imports/local-modularized-tricky-fail-3.stderr b/src/test/ui/imports/local-modularized-tricky-fail-3.stderr index 6c5c789e5ee80..6bece2b17cecf 100644 --- a/src/test/ui/imports/local-modularized-tricky-fail-3.stderr +++ b/src/test/ui/imports/local-modularized-tricky-fail-3.stderr @@ -1,5 +1,5 @@ error: macro-expanded `macro_export` macros from the current crate cannot be referred to by absolute paths - --> $DIR/local-modularized-tricky-fail-3.rs:23:9 + --> $DIR/local-modularized-tricky-fail-3.rs:13:9 | LL | use exported; | ^^^^^^^^ @@ -8,7 +8,7 @@ LL | use exported; = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release! = note: for more information, see issue #52234 note: the macro is defined here - --> $DIR/local-modularized-tricky-fail-3.rs:15:5 + --> $DIR/local-modularized-tricky-fail-3.rs:5:5 | LL | / macro_rules! exported { LL | | () => () @@ -19,7 +19,7 @@ LL | define_exported!(); | ------------------- in this macro invocation error: macro-expanded `macro_export` macros from the current crate cannot be referred to by absolute paths - --> $DIR/local-modularized-tricky-fail-3.rs:29:5 + --> $DIR/local-modularized-tricky-fail-3.rs:19:5 | LL | ::exported!(); | ^^^^^^^^^^ @@ -27,7 +27,7 @@ LL | ::exported!(); = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release! = note: for more information, see issue #52234 note: the macro is defined here - --> $DIR/local-modularized-tricky-fail-3.rs:15:5 + --> $DIR/local-modularized-tricky-fail-3.rs:5:5 | LL | / macro_rules! exported { LL | | () => () diff --git a/src/test/ui/imports/local-modularized-tricky-pass.rs b/src/test/ui/imports/local-modularized-tricky-pass.rs index 9392473eace66..59aac952b9299 100644 --- a/src/test/ui/imports/local-modularized-tricky-pass.rs +++ b/src/test/ui/imports/local-modularized-tricky-pass.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass macro_rules! define_exported { () => { diff --git a/src/test/ui/imports/local-modularized.rs b/src/test/ui/imports/local-modularized.rs index 260a406ef75f9..a073fe26eb619 100644 --- a/src/test/ui/imports/local-modularized.rs +++ b/src/test/ui/imports/local-modularized.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass #[macro_export(local_inner_macros)] diff --git a/src/test/ui/imports/macro-paths.rs b/src/test/ui/imports/macro-paths.rs index 50cfd2d2170e8..cc584e05a6bfd 100644 --- a/src/test/ui/imports/macro-paths.rs +++ b/src/test/ui/imports/macro-paths.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:two_macros.rs extern crate two_macros; diff --git a/src/test/ui/imports/macro-paths.stderr b/src/test/ui/imports/macro-paths.stderr index 08f45e1a57530..b2f4c96a33778 100644 --- a/src/test/ui/imports/macro-paths.stderr +++ b/src/test/ui/imports/macro-paths.stderr @@ -1,34 +1,34 @@ error[E0659]: `bar` is ambiguous - --> $DIR/macro-paths.rs:23:5 + --> $DIR/macro-paths.rs:13:5 | LL | bar::m! { //~ ERROR ambiguous | ^^^^^^ | note: `bar` could refer to the name defined here - --> $DIR/macro-paths.rs:24:9 + --> $DIR/macro-paths.rs:14:9 | LL | mod bar { pub use two_macros::m; } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ note: `bar` could also refer to the name imported here - --> $DIR/macro-paths.rs:22:9 + --> $DIR/macro-paths.rs:12:9 | LL | use foo::*; | ^^^^^^ = note: macro-expanded items do not shadow when used in a macro invocation path error[E0659]: `baz` is ambiguous - --> $DIR/macro-paths.rs:33:5 + --> $DIR/macro-paths.rs:23:5 | LL | baz::m! { //~ ERROR ambiguous | ^^^^^^ | note: `baz` could refer to the name defined here - --> $DIR/macro-paths.rs:34:9 + --> $DIR/macro-paths.rs:24:9 | LL | mod baz { pub use two_macros::m; } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ note: `baz` could also refer to the name defined here - --> $DIR/macro-paths.rs:28:1 + --> $DIR/macro-paths.rs:18:1 | LL | / pub mod baz { LL | | pub use two_macros::m; diff --git a/src/test/ui/imports/macros.rs b/src/test/ui/imports/macros.rs index 47ab8fc6c2f75..4c97daf9fc20a 100644 --- a/src/test/ui/imports/macros.rs +++ b/src/test/ui/imports/macros.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:two_macros.rs extern crate two_macros; // two identity macros `m` and `n` diff --git a/src/test/ui/imports/macros.stderr b/src/test/ui/imports/macros.stderr index 2c0c4642067ac..0a097ee322e58 100644 --- a/src/test/ui/imports/macros.stderr +++ b/src/test/ui/imports/macros.stderr @@ -1,51 +1,51 @@ error[E0659]: `m` is ambiguous - --> $DIR/macros.rs:48:5 + --> $DIR/macros.rs:38:5 | LL | m!(); //~ ERROR ambiguous | ^ | note: `m` could refer to the name defined here - --> $DIR/macros.rs:46:5 + --> $DIR/macros.rs:36:5 | LL | macro_rules! m { () => {} } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ note: `m` could also refer to the name imported here - --> $DIR/macros.rs:47:9 + --> $DIR/macros.rs:37:9 | LL | use two_macros::m; | ^^^^^^^^^^^^^ error[E0659]: `m` is ambiguous - --> $DIR/macros.rs:26:5 + --> $DIR/macros.rs:16:5 | LL | m! { //~ ERROR ambiguous | ^ | note: `m` could refer to the name imported here - --> $DIR/macros.rs:27:13 + --> $DIR/macros.rs:17:13 | LL | use foo::m; | ^^^^^^ note: `m` could also refer to the name imported here - --> $DIR/macros.rs:25:9 + --> $DIR/macros.rs:15:9 | LL | use two_macros::*; | ^^^^^^^^^^^^^ = note: macro-expanded macro imports do not shadow error[E0659]: `m` is ambiguous - --> $DIR/macros.rs:39:9 + --> $DIR/macros.rs:29:9 | LL | m! { //~ ERROR ambiguous | ^ | note: `m` could refer to the name imported here - --> $DIR/macros.rs:40:17 + --> $DIR/macros.rs:30:17 | LL | use two_macros::n as m; | ^^^^^^^^^^^^^^^^^^ note: `m` could also refer to the name imported here - --> $DIR/macros.rs:32:9 + --> $DIR/macros.rs:22:9 | LL | use two_macros::m; | ^^^^^^^^^^^^^ diff --git a/src/test/ui/imports/reexports.rs b/src/test/ui/imports/reexports.rs index f50b5b0e84999..b0a591b08ac89 100644 --- a/src/test/ui/imports/reexports.rs +++ b/src/test/ui/imports/reexports.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod a { fn foo() {} mod foo {} diff --git a/src/test/ui/imports/reexports.stderr b/src/test/ui/imports/reexports.stderr index a166344314b90..5489735b39dc6 100644 --- a/src/test/ui/imports/reexports.stderr +++ b/src/test/ui/imports/reexports.stderr @@ -1,29 +1,29 @@ error[E0364]: `foo` is private, and cannot be re-exported - --> $DIR/reexports.rs:16:17 + --> $DIR/reexports.rs:6:17 | LL | pub use super::foo; //~ ERROR cannot be re-exported | ^^^^^^^^^^ | note: consider marking `foo` as `pub` in the imported module - --> $DIR/reexports.rs:16:17 + --> $DIR/reexports.rs:6:17 | LL | pub use super::foo; //~ ERROR cannot be re-exported | ^^^^^^^^^^ error: A non-empty glob must import something with the glob's visibility - --> $DIR/reexports.rs:17:17 + --> $DIR/reexports.rs:7:17 | LL | pub use super::*; //~ ERROR must import something with the glob's visibility | ^^^^^^^^ error[E0603]: module `foo` is private - --> $DIR/reexports.rs:38:9 + --> $DIR/reexports.rs:28:9 | LL | use b::a::foo::S; //~ ERROR `foo` | ^^^^^^^^^^^^ error[E0603]: module `foo` is private - --> $DIR/reexports.rs:39:9 + --> $DIR/reexports.rs:29:9 | LL | use b::b::foo::S as T; //~ ERROR `foo` | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/imports/rfc-1560-warning-cycle.rs b/src/test/ui/imports/rfc-1560-warning-cycle.rs index 5b62c5fcd3f31..cfa7179fb6b57 100644 --- a/src/test/ui/imports/rfc-1560-warning-cycle.rs +++ b/src/test/ui/imports/rfc-1560-warning-cycle.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Foo; mod bar { diff --git a/src/test/ui/imports/rfc-1560-warning-cycle.stderr b/src/test/ui/imports/rfc-1560-warning-cycle.stderr index 5a01680fc1921..1d9061fcc56ef 100644 --- a/src/test/ui/imports/rfc-1560-warning-cycle.stderr +++ b/src/test/ui/imports/rfc-1560-warning-cycle.stderr @@ -1,16 +1,16 @@ error[E0659]: `Foo` is ambiguous - --> $DIR/rfc-1560-warning-cycle.rs:19:17 + --> $DIR/rfc-1560-warning-cycle.rs:9:17 | LL | fn f(_: Foo) {} //~ ERROR `Foo` is ambiguous | ^^^ | note: `Foo` could refer to the name imported here - --> $DIR/rfc-1560-warning-cycle.rs:17:13 + --> $DIR/rfc-1560-warning-cycle.rs:7:13 | LL | use *; | ^ note: `Foo` could also refer to the name imported here - --> $DIR/rfc-1560-warning-cycle.rs:18:13 + --> $DIR/rfc-1560-warning-cycle.rs:8:13 | LL | use bar::*; | ^^^^^^ diff --git a/src/test/ui/imports/shadow_builtin_macros.rs b/src/test/ui/imports/shadow_builtin_macros.rs index ec3f4107e38fc..02c27d5ce333a 100644 --- a/src/test/ui/imports/shadow_builtin_macros.rs +++ b/src/test/ui/imports/shadow_builtin_macros.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:two_macros.rs mod foo { diff --git a/src/test/ui/imports/shadow_builtin_macros.stderr b/src/test/ui/imports/shadow_builtin_macros.stderr index 5c7f15b6fe26f..d532e1ca46cc1 100644 --- a/src/test/ui/imports/shadow_builtin_macros.stderr +++ b/src/test/ui/imports/shadow_builtin_macros.stderr @@ -1,11 +1,11 @@ error[E0659]: `panic` is ambiguous - --> $DIR/shadow_builtin_macros.rs:43:5 + --> $DIR/shadow_builtin_macros.rs:33:5 | LL | panic!(); //~ ERROR `panic` is ambiguous | ^^^^^ | note: `panic` could refer to the name defined here - --> $DIR/shadow_builtin_macros.rs:40:9 + --> $DIR/shadow_builtin_macros.rs:30:9 | LL | macro_rules! panic { () => {} } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -16,13 +16,13 @@ LL | m!(); = note: macro-expanded macros do not shadow error[E0659]: `panic` is ambiguous - --> $DIR/shadow_builtin_macros.rs:25:14 + --> $DIR/shadow_builtin_macros.rs:15:14 | LL | fn f() { panic!(); } //~ ERROR ambiguous | ^^^^^ | note: `panic` could refer to the name imported here - --> $DIR/shadow_builtin_macros.rs:24:9 + --> $DIR/shadow_builtin_macros.rs:14:9 | LL | use foo::*; | ^^^^^^ @@ -30,13 +30,13 @@ LL | use foo::*; = note: consider adding an explicit import of `panic` to disambiguate error[E0659]: `panic` is ambiguous - --> $DIR/shadow_builtin_macros.rs:30:14 + --> $DIR/shadow_builtin_macros.rs:20:14 | LL | fn f() { panic!(); } //~ ERROR ambiguous | ^^^^^ | note: `panic` could refer to the name imported here - --> $DIR/shadow_builtin_macros.rs:29:26 + --> $DIR/shadow_builtin_macros.rs:19:26 | LL | ::two_macros::m!(use foo::panic;); | ^^^^^^^^^^ @@ -44,18 +44,18 @@ LL | ::two_macros::m!(use foo::panic;); = note: macro-expanded macro imports do not shadow error[E0659]: `n` is ambiguous - --> $DIR/shadow_builtin_macros.rs:59:5 + --> $DIR/shadow_builtin_macros.rs:49:5 | LL | n!(); //~ ERROR ambiguous | ^ | note: `n` could refer to the name imported here - --> $DIR/shadow_builtin_macros.rs:58:9 + --> $DIR/shadow_builtin_macros.rs:48:9 | LL | use bar::*; | ^^^^^^ note: `n` could also refer to the name imported here - --> $DIR/shadow_builtin_macros.rs:46:13 + --> $DIR/shadow_builtin_macros.rs:36:13 | LL | #[macro_use(n)] | ^ diff --git a/src/test/ui/imports/unused-macro-use.rs b/src/test/ui/imports/unused-macro-use.rs index 365521970cd21..9f63eb4b4ec0d 100644 --- a/src/test/ui/imports/unused-macro-use.rs +++ b/src/test/ui/imports/unused-macro-use.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(unused)] #[macro_use] //~ ERROR unused `#[macro_use]` import diff --git a/src/test/ui/imports/unused-macro-use.stderr b/src/test/ui/imports/unused-macro-use.stderr index 0920b5c6d1e97..2d20b3114426c 100644 --- a/src/test/ui/imports/unused-macro-use.stderr +++ b/src/test/ui/imports/unused-macro-use.stderr @@ -1,18 +1,18 @@ error: unused `#[macro_use]` import - --> $DIR/unused-macro-use.rs:13:1 + --> $DIR/unused-macro-use.rs:3:1 | LL | #[macro_use] //~ ERROR unused `#[macro_use]` import | ^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/unused-macro-use.rs:11:9 + --> $DIR/unused-macro-use.rs:1:9 | LL | #![deny(unused)] | ^^^^^^ = note: #[deny(unused_imports)] implied by #[deny(unused)] error: unused `#[macro_use]` import - --> $DIR/unused-macro-use.rs:17:5 + --> $DIR/unused-macro-use.rs:7:5 | LL | panic //~ ERROR unused `#[macro_use]` import | ^^^^^ diff --git a/src/test/ui/imports/unused.rs b/src/test/ui/imports/unused.rs index 1eb756fe9e4ec..0fadaf105f131 100644 --- a/src/test/ui/imports/unused.rs +++ b/src/test/ui/imports/unused.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(unused)] mod foo { diff --git a/src/test/ui/imports/unused.stderr b/src/test/ui/imports/unused.stderr index ff5c937aa837b..b56e930158cc1 100644 --- a/src/test/ui/imports/unused.stderr +++ b/src/test/ui/imports/unused.stderr @@ -1,11 +1,11 @@ error: unused import: `super::f` - --> $DIR/unused.rs:17:24 + --> $DIR/unused.rs:7:24 | LL | pub(super) use super::f; //~ ERROR unused | ^^^^^^^^ | note: lint level defined here - --> $DIR/unused.rs:11:9 + --> $DIR/unused.rs:1:9 | LL | #![deny(unused)] | ^^^^^^ diff --git a/src/test/ui/impossible_range.rs b/src/test/ui/impossible_range.rs index 073ed867bdb84..6345af001112f 100644 --- a/src/test/ui/impossible_range.rs +++ b/src/test/ui/impossible_range.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Make sure that invalid ranges generate an error during HIR lowering, not an ICE pub fn main() { diff --git a/src/test/ui/impossible_range.stderr b/src/test/ui/impossible_range.stderr index cfeaa53a6bb18..1d26030625fc9 100644 --- a/src/test/ui/impossible_range.stderr +++ b/src/test/ui/impossible_range.stderr @@ -1,5 +1,5 @@ error[E0586]: inclusive range with no end - --> $DIR/impossible_range.rs:18:8 + --> $DIR/impossible_range.rs:8:8 | LL | ..=; //~ERROR inclusive range with no end | ^ @@ -7,7 +7,7 @@ LL | ..=; //~ERROR inclusive range with no end = help: inclusive ranges must be bounded at the end (`..=b` or `a..=b`) error[E0586]: inclusive range with no end - --> $DIR/impossible_range.rs:25:9 + --> $DIR/impossible_range.rs:15:9 | LL | 0..=; //~ERROR inclusive range with no end | ^ diff --git a/src/test/ui/in-band-lifetimes/E0687.rs b/src/test/ui/in-band-lifetimes/E0687.rs index 4eddebb15e120..2e262ddaea3f4 100644 --- a/src/test/ui/in-band-lifetimes/E0687.rs +++ b/src/test/ui/in-band-lifetimes/E0687.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(warnings)] #![feature(in_band_lifetimes)] diff --git a/src/test/ui/in-band-lifetimes/E0687.stderr b/src/test/ui/in-band-lifetimes/E0687.stderr index 441494d738a7a..74245e16e7f2b 100644 --- a/src/test/ui/in-band-lifetimes/E0687.stderr +++ b/src/test/ui/in-band-lifetimes/E0687.stderr @@ -1,23 +1,23 @@ error[E0687]: lifetimes used in `fn` or `Fn` syntax must be explicitly declared using `<...>` binders - --> $DIR/E0687.rs:14:15 + --> $DIR/E0687.rs:4:15 | LL | fn foo(x: fn(&'a u32)) {} //~ ERROR must be explicitly | ^^ in-band lifetime definition error[E0687]: lifetimes used in `fn` or `Fn` syntax must be explicitly declared using `<...>` binders - --> $DIR/E0687.rs:16:16 + --> $DIR/E0687.rs:6:16 | LL | fn bar(x: &Fn(&'a u32)) {} //~ ERROR must be explicitly | ^^ in-band lifetime definition error[E0687]: lifetimes used in `fn` or `Fn` syntax must be explicitly declared using `<...>` binders - --> $DIR/E0687.rs:18:15 + --> $DIR/E0687.rs:8:15 | LL | fn baz(x: fn(&'a u32), y: &'a u32) {} //~ ERROR must be explicitly | ^^ in-band lifetime definition error[E0687]: lifetimes used in `fn` or `Fn` syntax must be explicitly declared using `<...>` binders - --> $DIR/E0687.rs:23:26 + --> $DIR/E0687.rs:13:26 | LL | fn bar(&self, x: fn(&'a u32)) {} //~ ERROR must be explicitly | ^^ in-band lifetime definition diff --git a/src/test/ui/in-band-lifetimes/E0687_where.rs b/src/test/ui/in-band-lifetimes/E0687_where.rs index c1b268eac701c..6cf8053287d8f 100644 --- a/src/test/ui/in-band-lifetimes/E0687_where.rs +++ b/src/test/ui/in-band-lifetimes/E0687_where.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(warnings)] #![feature(in_band_lifetimes)] diff --git a/src/test/ui/in-band-lifetimes/E0687_where.stderr b/src/test/ui/in-band-lifetimes/E0687_where.stderr index a2ad5cf0f83bf..4533c3b10f797 100644 --- a/src/test/ui/in-band-lifetimes/E0687_where.stderr +++ b/src/test/ui/in-band-lifetimes/E0687_where.stderr @@ -1,11 +1,11 @@ error[E0687]: lifetimes used in `fn` or `Fn` syntax must be explicitly declared using `<...>` binders - --> $DIR/E0687_where.rs:14:31 + --> $DIR/E0687_where.rs:4:31 | LL | fn bar(x: &F) where F: Fn(&'a u32) {} //~ ERROR must be explicitly | ^^ in-band lifetime definition error[E0687]: lifetimes used in `fn` or `Fn` syntax must be explicitly declared using `<...>` binders - --> $DIR/E0687_where.rs:16:21 + --> $DIR/E0687_where.rs:6:21 | LL | fn baz(x: &impl Fn(&'a u32)) {} //~ ERROR must be explicitly | ^^ in-band lifetime definition diff --git a/src/test/ui/in-band-lifetimes/E0688.rs b/src/test/ui/in-band-lifetimes/E0688.rs index 29b954e9a8360..a4e1f01c1781a 100644 --- a/src/test/ui/in-band-lifetimes/E0688.rs +++ b/src/test/ui/in-band-lifetimes/E0688.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(warnings)] #![feature(in_band_lifetimes)] diff --git a/src/test/ui/in-band-lifetimes/E0688.stderr b/src/test/ui/in-band-lifetimes/E0688.stderr index 66dca227941af..f02b8db4669e0 100644 --- a/src/test/ui/in-band-lifetimes/E0688.stderr +++ b/src/test/ui/in-band-lifetimes/E0688.stderr @@ -1,5 +1,5 @@ error[E0688]: cannot mix in-band and explicit lifetime definitions - --> $DIR/E0688.rs:14:28 + --> $DIR/E0688.rs:4:28 | LL | fn foo<'a>(x: &'a u32, y: &'b u32) {} //~ ERROR cannot mix | -- ^^ in-band lifetime definition here @@ -7,7 +7,7 @@ LL | fn foo<'a>(x: &'a u32, y: &'b u32) {} //~ ERROR cannot mix | explicit lifetime definition here error[E0688]: cannot mix in-band and explicit lifetime definitions - --> $DIR/E0688.rs:19:44 + --> $DIR/E0688.rs:9:44 | LL | fn bar<'b>(x: &'a u32, y: &'b u32, z: &'c u32) {} //~ ERROR cannot mix | -- ^^ in-band lifetime definition here @@ -15,7 +15,7 @@ LL | fn bar<'b>(x: &'a u32, y: &'b u32, z: &'c u32) {} //~ ERROR cannot mix | explicit lifetime definition here error[E0688]: cannot mix in-band and explicit lifetime definitions - --> $DIR/E0688.rs:22:14 + --> $DIR/E0688.rs:12:14 | LL | impl<'b> Foo<'a> { //~ ERROR cannot mix | -- ^^ in-band lifetime definition here diff --git a/src/test/ui/in-band-lifetimes/elided-lifetimes.fixed b/src/test/ui/in-band-lifetimes/elided-lifetimes.fixed index 153e500374688..29c570daefd0b 100644 --- a/src/test/ui/in-band-lifetimes/elided-lifetimes.fixed +++ b/src/test/ui/in-band-lifetimes/elided-lifetimes.fixed @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix // edition:2018 diff --git a/src/test/ui/in-band-lifetimes/elided-lifetimes.rs b/src/test/ui/in-band-lifetimes/elided-lifetimes.rs index 41aa7e1a7b7b9..e59c9b4367f12 100644 --- a/src/test/ui/in-band-lifetimes/elided-lifetimes.rs +++ b/src/test/ui/in-band-lifetimes/elided-lifetimes.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix // edition:2018 diff --git a/src/test/ui/in-band-lifetimes/elided-lifetimes.stderr b/src/test/ui/in-band-lifetimes/elided-lifetimes.stderr index e7a1b42b8c9cc..5c50d7e2aac3f 100644 --- a/src/test/ui/in-band-lifetimes/elided-lifetimes.stderr +++ b/src/test/ui/in-band-lifetimes/elided-lifetimes.stderr @@ -1,35 +1,35 @@ error: hidden lifetime parameters in types are deprecated - --> $DIR/elided-lifetimes.rs:23:12 + --> $DIR/elided-lifetimes.rs:13:12 | LL | fn foo(x: &Foo) { | ^^^- help: indicate the anonymous lifetime: `<'_>` | note: lint level defined here - --> $DIR/elided-lifetimes.rs:15:9 + --> $DIR/elided-lifetimes.rs:5:9 | LL | #![deny(elided_lifetimes_in_paths)] | ^^^^^^^^^^^^^^^^^^^^^^^^^ error: hidden lifetime parameters in types are deprecated - --> $DIR/elided-lifetimes.rs:42:29 + --> $DIR/elided-lifetimes.rs:32:29 | LL | fn wrap_gift(gift: &str) -> Wrapped { | ^^^^^^^- help: indicate the anonymous lifetime: `<'_>` error: hidden lifetime parameters in types are deprecated - --> $DIR/elided-lifetimes.rs:48:38 + --> $DIR/elided-lifetimes.rs:38:38 | LL | fn wrap_gift_with_bow(gift: &str) -> WrappedWithBow { | ^^^^^^^^^^^^^^- help: indicate the anonymous lifetime: `<'_>` error: hidden lifetime parameters in types are deprecated - --> $DIR/elided-lifetimes.rs:54:29 + --> $DIR/elided-lifetimes.rs:44:29 | LL | fn inspect_matched_set(set: MatchedSet) { | ^^^^^^^^^^- help: indicate the anonymous lifetimes: `<'_, '_>` error: hidden lifetime parameters in types are deprecated - --> $DIR/elided-lifetimes.rs:66:36 + --> $DIR/elided-lifetimes.rs:56:36 | LL | fn $fn_name(gift: &str) -> $type_name { | ^^^^^^^^^^- help: indicate the anonymous lifetime: `<'_>` @@ -38,13 +38,13 @@ LL | autowrapper!(Autowrapped, autowrap_gift, 'a); | --------------------------------------------- in this macro invocation error: hidden lifetime parameters in types are deprecated - --> $DIR/elided-lifetimes.rs:88:18 + --> $DIR/elided-lifetimes.rs:78:18 | LL | let loyalty: Ref<(u32, char)> = honesty.borrow(); | ^^^^^^^^^^^^^^^^ help: indicate the anonymous lifetime: `Ref<'_, (u32, char)>` error: hidden lifetime parameters in types are deprecated - --> $DIR/elided-lifetimes.rs:80:9 + --> $DIR/elided-lifetimes.rs:70:9 | LL | Ref<($($types),*)> | ^^^^^^^^^^^^^^^^^^ help: indicate the anonymous lifetime: `Ref<'_, ($($types),*)>` diff --git a/src/test/ui/in-band-lifetimes/mismatched.nll.stderr b/src/test/ui/in-band-lifetimes/mismatched.nll.stderr index c07921bce2d72..af36361ae2e6a 100644 --- a/src/test/ui/in-band-lifetimes/mismatched.nll.stderr +++ b/src/test/ui/in-band-lifetimes/mismatched.nll.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/mismatched.rs:14:42 + --> $DIR/mismatched.rs:4:42 | LL | fn foo(x: &'a u32, y: &u32) -> &'a u32 { y } //~ ERROR explicit lifetime required | ^ warning: not reporting region error due to nll - --> $DIR/mismatched.rs:16:46 + --> $DIR/mismatched.rs:6:46 | LL | fn foo2(x: &'a u32, y: &'b u32) -> &'a u32 { y } //~ ERROR lifetime mismatch | ^ error[E0621]: explicit lifetime required in the type of `y` - --> $DIR/mismatched.rs:14:42 + --> $DIR/mismatched.rs:4:42 | LL | fn foo(x: &'a u32, y: &u32) -> &'a u32 { y } //~ ERROR explicit lifetime required | ---- ^ lifetime `'a` required @@ -19,7 +19,7 @@ LL | fn foo(x: &'a u32, y: &u32) -> &'a u32 { y } //~ ERROR explicit lifetime re | help: add explicit lifetime `'a` to the type of `y`: `&'a u32` error: unsatisfied lifetime constraints - --> $DIR/mismatched.rs:16:46 + --> $DIR/mismatched.rs:6:46 | LL | fn foo2(x: &'a u32, y: &'b u32) -> &'a u32 { y } //~ ERROR lifetime mismatch | -- -- ^ function was supposed to return data with lifetime `'a` but it is returning data with lifetime `'b` diff --git a/src/test/ui/in-band-lifetimes/mismatched.rs b/src/test/ui/in-band-lifetimes/mismatched.rs index 80bc56c0f441c..11c41eae954d4 100644 --- a/src/test/ui/in-band-lifetimes/mismatched.rs +++ b/src/test/ui/in-band-lifetimes/mismatched.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(warnings)] #![feature(in_band_lifetimes)] diff --git a/src/test/ui/in-band-lifetimes/mismatched.stderr b/src/test/ui/in-band-lifetimes/mismatched.stderr index ed932a97ba465..abc6d42910fb3 100644 --- a/src/test/ui/in-band-lifetimes/mismatched.stderr +++ b/src/test/ui/in-band-lifetimes/mismatched.stderr @@ -1,5 +1,5 @@ error[E0621]: explicit lifetime required in the type of `y` - --> $DIR/mismatched.rs:14:42 + --> $DIR/mismatched.rs:4:42 | LL | fn foo(x: &'a u32, y: &u32) -> &'a u32 { y } //~ ERROR explicit lifetime required | ---- ^ lifetime `'a` required @@ -7,7 +7,7 @@ LL | fn foo(x: &'a u32, y: &u32) -> &'a u32 { y } //~ ERROR explicit lifetime re | help: add explicit lifetime `'a` to the type of `y`: `&'a u32` error[E0623]: lifetime mismatch - --> $DIR/mismatched.rs:16:46 + --> $DIR/mismatched.rs:6:46 | LL | fn foo2(x: &'a u32, y: &'b u32) -> &'a u32 { y } //~ ERROR lifetime mismatch | ------- ------- ^ ...but data from `y` is returned here diff --git a/src/test/ui/in-band-lifetimes/mismatched_trait.nll.stderr b/src/test/ui/in-band-lifetimes/mismatched_trait.nll.stderr index a01f3219dc5e4..ef396522f03b1 100644 --- a/src/test/ui/in-band-lifetimes/mismatched_trait.nll.stderr +++ b/src/test/ui/in-band-lifetimes/mismatched_trait.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/mismatched_trait.rs:16:9 + --> $DIR/mismatched_trait.rs:6:9 | LL | y //~ ERROR explicit lifetime required | ^ error[E0621]: explicit lifetime required in the type of `y` - --> $DIR/mismatched_trait.rs:16:9 + --> $DIR/mismatched_trait.rs:6:9 | LL | fn baz(&self, x: &'a u32, y: &u32) -> &'a u32 { | ---- help: add explicit lifetime `'a` to the type of `y`: `&'a u32` diff --git a/src/test/ui/in-band-lifetimes/mismatched_trait.rs b/src/test/ui/in-band-lifetimes/mismatched_trait.rs index bc175803ebda7..221f4fc271bbf 100644 --- a/src/test/ui/in-band-lifetimes/mismatched_trait.rs +++ b/src/test/ui/in-band-lifetimes/mismatched_trait.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(warnings)] #![feature(in_band_lifetimes)] diff --git a/src/test/ui/in-band-lifetimes/mismatched_trait.stderr b/src/test/ui/in-band-lifetimes/mismatched_trait.stderr index 745b82c20b4eb..dd28aa226b7fc 100644 --- a/src/test/ui/in-band-lifetimes/mismatched_trait.stderr +++ b/src/test/ui/in-band-lifetimes/mismatched_trait.stderr @@ -1,5 +1,5 @@ error[E0621]: explicit lifetime required in the type of `y` - --> $DIR/mismatched_trait.rs:16:9 + --> $DIR/mismatched_trait.rs:6:9 | LL | fn baz(&self, x: &'a u32, y: &u32) -> &'a u32 { | ---- help: add explicit lifetime `'a` to the type of `y`: `&'a u32` diff --git a/src/test/ui/in-band-lifetimes/mismatched_trait_impl-2.rs b/src/test/ui/in-band-lifetimes/mismatched_trait_impl-2.rs index ff04cfe99c0bc..d4535ac442538 100644 --- a/src/test/ui/in-band-lifetimes/mismatched_trait_impl-2.rs +++ b/src/test/ui/in-band-lifetimes/mismatched_trait_impl-2.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::Deref; trait Trait {} diff --git a/src/test/ui/in-band-lifetimes/mismatched_trait_impl-2.stderr b/src/test/ui/in-band-lifetimes/mismatched_trait_impl-2.stderr index 169369c304eb2..fbd312a632f07 100644 --- a/src/test/ui/in-band-lifetimes/mismatched_trait_impl-2.stderr +++ b/src/test/ui/in-band-lifetimes/mismatched_trait_impl-2.stderr @@ -1,11 +1,11 @@ error[E0495]: cannot infer an appropriate lifetime for lifetime parameter in generic type due to conflicting requirements - --> $DIR/mismatched_trait_impl-2.rs:18:5 + --> $DIR/mismatched_trait_impl-2.rs:8:5 | LL | fn deref(&self) -> &Trait { | ^^^^^^^^^^^^^^^^^^^^^^^^^ | -note: first, the lifetime cannot outlive the anonymous lifetime #1 defined on the method body at 18:5... - --> $DIR/mismatched_trait_impl-2.rs:18:5 +note: first, the lifetime cannot outlive the anonymous lifetime #1 defined on the method body at 8:5... + --> $DIR/mismatched_trait_impl-2.rs:8:5 | LL | / fn deref(&self) -> &Trait { LL | | unimplemented!(); diff --git a/src/test/ui/in-band-lifetimes/mismatched_trait_impl.rs b/src/test/ui/in-band-lifetimes/mismatched_trait_impl.rs index 52641059b1fa8..654d2bddfd041 100644 --- a/src/test/ui/in-band-lifetimes/mismatched_trait_impl.rs +++ b/src/test/ui/in-band-lifetimes/mismatched_trait_impl.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(warnings)] #![feature(in_band_lifetimes)] diff --git a/src/test/ui/in-band-lifetimes/mismatched_trait_impl.stderr b/src/test/ui/in-band-lifetimes/mismatched_trait_impl.stderr index f2c6155fd98f8..4af991cede436 100644 --- a/src/test/ui/in-band-lifetimes/mismatched_trait_impl.stderr +++ b/src/test/ui/in-band-lifetimes/mismatched_trait_impl.stderr @@ -1,18 +1,18 @@ error[E0495]: cannot infer an appropriate lifetime for lifetime parameter 'a in generic type due to conflicting requirements - --> $DIR/mismatched_trait_impl.rs:19:5 + --> $DIR/mismatched_trait_impl.rs:9:5 | LL | fn foo(&self, x: &u32, y: &'a u32) -> &'a u32 { //~ ERROR cannot infer | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | -note: first, the lifetime cannot outlive the anonymous lifetime #2 defined on the method body at 19:5... - --> $DIR/mismatched_trait_impl.rs:19:5 +note: first, the lifetime cannot outlive the anonymous lifetime #2 defined on the method body at 9:5... + --> $DIR/mismatched_trait_impl.rs:9:5 | LL | / fn foo(&self, x: &u32, y: &'a u32) -> &'a u32 { //~ ERROR cannot infer LL | | x LL | | } | |_____^ -note: ...but the lifetime must also be valid for the lifetime 'a as defined on the method body at 19:32... - --> $DIR/mismatched_trait_impl.rs:19:32 +note: ...but the lifetime must also be valid for the lifetime 'a as defined on the method body at 9:32... + --> $DIR/mismatched_trait_impl.rs:9:32 | LL | fn foo(&self, x: &u32, y: &'a u32) -> &'a u32 { //~ ERROR cannot infer | ^^ diff --git a/src/test/ui/in-band-lifetimes/mut_while_borrow.nll.stderr b/src/test/ui/in-band-lifetimes/mut_while_borrow.nll.stderr index 546d7b0ed5c8a..3f5dbb850cc71 100644 --- a/src/test/ui/in-band-lifetimes/mut_while_borrow.nll.stderr +++ b/src/test/ui/in-band-lifetimes/mut_while_borrow.nll.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `p` because it is borrowed - --> $DIR/mut_while_borrow.rs:19:5 + --> $DIR/mut_while_borrow.rs:9:5 | LL | let r = foo(&p); | -- borrow of `p` occurs here diff --git a/src/test/ui/in-band-lifetimes/mut_while_borrow.rs b/src/test/ui/in-band-lifetimes/mut_while_borrow.rs index 08ce13d0bccd1..97e8ed0d2813e 100644 --- a/src/test/ui/in-band-lifetimes/mut_while_borrow.rs +++ b/src/test/ui/in-band-lifetimes/mut_while_borrow.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(warnings)] #![feature(in_band_lifetimes)] diff --git a/src/test/ui/in-band-lifetimes/mut_while_borrow.stderr b/src/test/ui/in-band-lifetimes/mut_while_borrow.stderr index 1498eb7ac1daa..e710986c7217b 100644 --- a/src/test/ui/in-band-lifetimes/mut_while_borrow.stderr +++ b/src/test/ui/in-band-lifetimes/mut_while_borrow.stderr @@ -1,5 +1,5 @@ error[E0506]: cannot assign to `p` because it is borrowed - --> $DIR/mut_while_borrow.rs:19:5 + --> $DIR/mut_while_borrow.rs:9:5 | LL | let r = foo(&p); | - borrow of `p` occurs here diff --git a/src/test/ui/in-band-lifetimes/no_in_band_in_struct.rs b/src/test/ui/in-band-lifetimes/no_in_band_in_struct.rs index 0d3e6ba644e63..9b0c0cda77220 100644 --- a/src/test/ui/in-band-lifetimes/no_in_band_in_struct.rs +++ b/src/test/ui/in-band-lifetimes/no_in_band_in_struct.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(warnings)] #![feature(in_band_lifetimes)] diff --git a/src/test/ui/in-band-lifetimes/no_in_band_in_struct.stderr b/src/test/ui/in-band-lifetimes/no_in_band_in_struct.stderr index da46cb7f22e34..9076bdc946a39 100644 --- a/src/test/ui/in-band-lifetimes/no_in_band_in_struct.stderr +++ b/src/test/ui/in-band-lifetimes/no_in_band_in_struct.stderr @@ -1,11 +1,11 @@ error[E0261]: use of undeclared lifetime name `'test` - --> $DIR/no_in_band_in_struct.rs:15:9 + --> $DIR/no_in_band_in_struct.rs:5:9 | LL | x: &'test u32, //~ ERROR undeclared lifetime | ^^^^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'test` - --> $DIR/no_in_band_in_struct.rs:19:10 + --> $DIR/no_in_band_in_struct.rs:9:10 | LL | Baz(&'test u32), //~ ERROR undeclared lifetime | ^^^^^ undeclared lifetime diff --git a/src/test/ui/in-band-lifetimes/no_introducing_in_band_in_locals.rs b/src/test/ui/in-band-lifetimes/no_introducing_in_band_in_locals.rs index eaa082a35da59..c1c40afdbab55 100644 --- a/src/test/ui/in-band-lifetimes/no_introducing_in_band_in_locals.rs +++ b/src/test/ui/in-band-lifetimes/no_introducing_in_band_in_locals.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(warnings)] #![feature(in_band_lifetimes)] diff --git a/src/test/ui/in-band-lifetimes/no_introducing_in_band_in_locals.stderr b/src/test/ui/in-band-lifetimes/no_introducing_in_band_in_locals.stderr index d53b71907a42e..932dea5b2a953 100644 --- a/src/test/ui/in-band-lifetimes/no_introducing_in_band_in_locals.stderr +++ b/src/test/ui/in-band-lifetimes/no_introducing_in_band_in_locals.stderr @@ -1,11 +1,11 @@ error[E0261]: use of undeclared lifetime name `'test` - --> $DIR/no_introducing_in_band_in_locals.rs:15:13 + --> $DIR/no_introducing_in_band_in_locals.rs:5:13 | LL | let y: &'test u32 = x; //~ ERROR use of undeclared lifetime | ^^^^^ undeclared lifetime error[E0261]: use of undeclared lifetime name `'test` - --> $DIR/no_introducing_in_band_in_locals.rs:20:16 + --> $DIR/no_introducing_in_band_in_locals.rs:10:16 | LL | let y: fn(&'test u32) = foo2; //~ ERROR use of undeclared lifetime | ^^^^^ undeclared lifetime diff --git a/src/test/ui/in-band-lifetimes/shadow.rs b/src/test/ui/in-band-lifetimes/shadow.rs index b6438f01af5f3..27b5d57488c91 100644 --- a/src/test/ui/in-band-lifetimes/shadow.rs +++ b/src/test/ui/in-band-lifetimes/shadow.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(warnings)] #![feature(in_band_lifetimes)] diff --git a/src/test/ui/in-band-lifetimes/shadow.stderr b/src/test/ui/in-band-lifetimes/shadow.stderr index 0ee228fca3124..ac5bd5b5a3321 100644 --- a/src/test/ui/in-band-lifetimes/shadow.stderr +++ b/src/test/ui/in-band-lifetimes/shadow.stderr @@ -1,5 +1,5 @@ error[E0496]: lifetime name `'s` shadows a lifetime name that is already in scope - --> $DIR/shadow.rs:17:12 + --> $DIR/shadow.rs:7:12 | LL | impl Foo<&'s u8> { | -- first declared here @@ -7,7 +7,7 @@ LL | fn bar<'s>(&self, x: &'s u8) {} //~ ERROR shadows a lifetime name | ^^ lifetime 's already in scope error[E0496]: lifetime name `'s` shadows a lifetime name that is already in scope - --> $DIR/shadow.rs:18:19 + --> $DIR/shadow.rs:8:19 | LL | impl Foo<&'s u8> { | -- first declared here diff --git a/src/test/ui/inaccessible-test-modules.rs b/src/test/ui/inaccessible-test-modules.rs index bfc1ac2daef41..7095ec290f8f2 100644 --- a/src/test/ui/inaccessible-test-modules.rs +++ b/src/test/ui/inaccessible-test-modules.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:--test // the `--test` harness creates modules with these textual names, but diff --git a/src/test/ui/inaccessible-test-modules.stderr b/src/test/ui/inaccessible-test-modules.stderr index ce8eaf590275f..85983601ed1a2 100644 --- a/src/test/ui/inaccessible-test-modules.stderr +++ b/src/test/ui/inaccessible-test-modules.stderr @@ -1,11 +1,11 @@ error[E0432]: unresolved import `__test` - --> $DIR/inaccessible-test-modules.rs:15:5 + --> $DIR/inaccessible-test-modules.rs:5:5 | LL | use __test as x; //~ ERROR unresolved import `__test` | ^^^^^^^^^^^ no `__test` in the root. Did you mean to use `__test`? error[E0432]: unresolved import `__test_reexports` - --> $DIR/inaccessible-test-modules.rs:16:5 + --> $DIR/inaccessible-test-modules.rs:6:5 | LL | use __test_reexports as y; //~ ERROR unresolved import `__test_reexports` | ^^^^^^^^^^^^^^^^^^^^^ no `__test_reexports` in the root. Did you mean to use `__test_reexports`? diff --git a/src/test/ui/include-macros/mismatched-types.rs b/src/test/ui/include-macros/mismatched-types.rs index aca1b071644d1..83fa378a3ae05 100644 --- a/src/test/ui/include-macros/mismatched-types.rs +++ b/src/test/ui/include-macros/mismatched-types.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let b: &[u8] = include_str!("file.txt"); //~ ERROR mismatched types let s: &str = include_bytes!("file.txt"); //~ ERROR mismatched types diff --git a/src/test/ui/include-macros/mismatched-types.stderr b/src/test/ui/include-macros/mismatched-types.stderr index 05286f2ca5707..1ee223b23f055 100644 --- a/src/test/ui/include-macros/mismatched-types.stderr +++ b/src/test/ui/include-macros/mismatched-types.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/mismatched-types.rs:12:20 + --> $DIR/mismatched-types.rs:2:20 | LL | let b: &[u8] = include_str!("file.txt"); //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^^^^^^^^ expected slice, found str @@ -8,7 +8,7 @@ LL | let b: &[u8] = include_str!("file.txt"); //~ ERROR mismatched types found type `&'static str` error[E0308]: mismatched types - --> $DIR/mismatched-types.rs:13:19 + --> $DIR/mismatched-types.rs:3:19 | LL | let s: &str = include_bytes!("file.txt"); //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^^^^^^^^^^^ expected str, found array of 0 elements diff --git a/src/test/ui/index-bot.rs b/src/test/ui/index-bot.rs index fc88ff6f47b87..e69c4019f61e5 100644 --- a/src/test/ui/index-bot.rs +++ b/src/test/ui/index-bot.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { (return)[0]; //~ ERROR cannot index into a value of type `!` } diff --git a/src/test/ui/index-bot.stderr b/src/test/ui/index-bot.stderr index 1086196d6aec4..2e2a98d1d80a7 100644 --- a/src/test/ui/index-bot.stderr +++ b/src/test/ui/index-bot.stderr @@ -1,5 +1,5 @@ error[E0608]: cannot index into a value of type `!` - --> $DIR/index-bot.rs:12:5 + --> $DIR/index-bot.rs:2:5 | LL | (return)[0]; //~ ERROR cannot index into a value of type `!` | ^^^^^^^^^^^ diff --git a/src/test/ui/index-help.rs b/src/test/ui/index-help.rs index 4a64d6c4cc518..66571ec41a097 100644 --- a/src/test/ui/index-help.rs +++ b/src/test/ui/index-help.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = vec![1]; x[0i32]; //~ ERROR E0277 diff --git a/src/test/ui/index-help.stderr b/src/test/ui/index-help.stderr index 669c0837fdabd..c8b23d812e1b5 100644 --- a/src/test/ui/index-help.stderr +++ b/src/test/ui/index-help.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `i32: std::slice::SliceIndex<[{integer}]>` is not satisfied - --> $DIR/index-help.rs:13:5 + --> $DIR/index-help.rs:3:5 | LL | x[0i32]; //~ ERROR E0277 | ^^^^^^^ slice indices are of type `usize` or ranges of `usize` diff --git a/src/test/ui/index_message.rs b/src/test/ui/index_message.rs index b9daad936c338..87e0cde591959 100644 --- a/src/test/ui/index_message.rs +++ b/src/test/ui/index_message.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let z = (); let _ = z[0]; //~ ERROR cannot index into a value of type `()` diff --git a/src/test/ui/index_message.stderr b/src/test/ui/index_message.stderr index 208d33e9cd5d8..62a14523fe9ad 100644 --- a/src/test/ui/index_message.stderr +++ b/src/test/ui/index_message.stderr @@ -1,5 +1,5 @@ error[E0608]: cannot index into a value of type `()` - --> $DIR/index_message.rs:13:13 + --> $DIR/index_message.rs:3:13 | LL | let _ = z[0]; //~ ERROR cannot index into a value of type `()` | ^^^^ help: to access tuple elements, use: `z.0` diff --git a/src/test/ui/indexing-requires-a-uint.rs b/src/test/ui/indexing-requires-a-uint.rs index 624944f7344cb..2db3c58ec519f 100644 --- a/src/test/ui/indexing-requires-a-uint.rs +++ b/src/test/ui/indexing-requires-a-uint.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Make sure that indexing an array is only valid with a `usize`, not any other // integral type. diff --git a/src/test/ui/indexing-requires-a-uint.stderr b/src/test/ui/indexing-requires-a-uint.stderr index e9608e0b23519..767f1af2c46e9 100644 --- a/src/test/ui/indexing-requires-a-uint.stderr +++ b/src/test/ui/indexing-requires-a-uint.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `u8: std::slice::SliceIndex<[{integer}]>` is not satisfied - --> $DIR/indexing-requires-a-uint.rs:16:5 + --> $DIR/indexing-requires-a-uint.rs:6:5 | LL | [0][0u8]; //~ ERROR: the trait bound `u8: std::slice::SliceIndex<[{integer}]>` is not satisfied | ^^^^^^^^ slice indices are of type `usize` or ranges of `usize` @@ -8,7 +8,7 @@ LL | [0][0u8]; //~ ERROR: the trait bound `u8: std::slice::SliceIndex<[{inte = note: required because of the requirements on the impl of `std::ops::Index` for `[{integer}]` error[E0308]: mismatched types - --> $DIR/indexing-requires-a-uint.rs:22:18 + --> $DIR/indexing-requires-a-uint.rs:12:18 | LL | bar::(i); // i should not be re-coerced back to an isize | ^ expected isize, found usize diff --git a/src/test/ui/inference/auxiliary/inference_unstable_iterator.rs b/src/test/ui/inference/auxiliary/inference_unstable_iterator.rs index b73346e6332ca..0dc09704e7fab 100644 --- a/src/test/ui/inference/auxiliary/inference_unstable_iterator.rs +++ b/src/test/ui/inference/auxiliary/inference_unstable_iterator.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(staged_api)] #![stable(feature = "ipu_iterator", since = "1.0.0")] diff --git a/src/test/ui/inference/auxiliary/inference_unstable_itertools.rs b/src/test/ui/inference/auxiliary/inference_unstable_itertools.rs index 2ad264ee3d82f..964f35ddadec5 100644 --- a/src/test/ui/inference/auxiliary/inference_unstable_itertools.rs +++ b/src/test/ui/inference/auxiliary/inference_unstable_itertools.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait IpuItertools { fn ipu_flatten(&self) -> u32 { 1 diff --git a/src/test/ui/inference/inference-variable-behind-raw-pointer.rs b/src/test/ui/inference/inference-variable-behind-raw-pointer.rs index 88dc85f1620dd..513b15ed088d8 100644 --- a/src/test/ui/inference/inference-variable-behind-raw-pointer.rs +++ b/src/test/ui/inference/inference-variable-behind-raw-pointer.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-pass // tests that the following code compiles, but produces a future-compatibility warning diff --git a/src/test/ui/inference/inference-variable-behind-raw-pointer.stderr b/src/test/ui/inference/inference-variable-behind-raw-pointer.stderr index fe6dc0b07482f..52cf68ae2a6d1 100644 --- a/src/test/ui/inference/inference-variable-behind-raw-pointer.stderr +++ b/src/test/ui/inference/inference-variable-behind-raw-pointer.stderr @@ -1,5 +1,5 @@ warning: type annotations needed - --> $DIR/inference-variable-behind-raw-pointer.rs:18:13 + --> $DIR/inference-variable-behind-raw-pointer.rs:8:13 | LL | if data.is_null() {} | ^^^^^^^ diff --git a/src/test/ui/inference/inference_unstable.rs b/src/test/ui/inference/inference_unstable.rs index 5a70dffd4c8c2..0b95770018241 100644 --- a/src/test/ui/inference/inference_unstable.rs +++ b/src/test/ui/inference/inference_unstable.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Ensures #[unstable] functions without opting in the corresponding #![feature] // will not break inference. diff --git a/src/test/ui/inference/inference_unstable.stderr b/src/test/ui/inference/inference_unstable.stderr index 3a5cb6f2b2e0f..54b8ecb7ffbad 100644 --- a/src/test/ui/inference/inference_unstable.stderr +++ b/src/test/ui/inference/inference_unstable.stderr @@ -1,5 +1,5 @@ warning: a method with this name may be added to the standard library in the future - --> $DIR/inference_unstable.rs:26:20 + --> $DIR/inference_unstable.rs:16:20 | LL | assert_eq!('x'.ipu_flatten(), 1); | ^^^^^^^^^^^ diff --git a/src/test/ui/inference/inference_unstable_featured.rs b/src/test/ui/inference/inference_unstable_featured.rs index f5c49bedc7117..792b29aaadc08 100644 --- a/src/test/ui/inference/inference_unstable_featured.rs +++ b/src/test/ui/inference/inference_unstable_featured.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // There should be E0034 "multiple applicable items in scope" if we opt-in for // the feature. diff --git a/src/test/ui/inference/inference_unstable_featured.stderr b/src/test/ui/inference/inference_unstable_featured.stderr index cb5f3623291b5..5f02578512712 100644 --- a/src/test/ui/inference/inference_unstable_featured.stderr +++ b/src/test/ui/inference/inference_unstable_featured.stderr @@ -1,5 +1,5 @@ error[E0034]: multiple applicable items in scope - --> $DIR/inference_unstable_featured.rs:26:20 + --> $DIR/inference_unstable_featured.rs:16:20 | LL | assert_eq!('x'.ipu_flatten(), 0); //~ ERROR E0034 | ^^^^^^^^^^^ multiple `ipu_flatten` found diff --git a/src/test/ui/inference/inference_unstable_forced.rs b/src/test/ui/inference/inference_unstable_forced.rs index 82ce4034ce269..649b3ed2a6f87 100644 --- a/src/test/ui/inference/inference_unstable_forced.rs +++ b/src/test/ui/inference/inference_unstable_forced.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // If the unstable API is the only possible solution, // still emit E0658 "use of unstable library feature". diff --git a/src/test/ui/inference/inference_unstable_forced.stderr b/src/test/ui/inference/inference_unstable_forced.stderr index 00eb81cd9a239..3c07085a648f6 100644 --- a/src/test/ui/inference/inference_unstable_forced.stderr +++ b/src/test/ui/inference/inference_unstable_forced.stderr @@ -1,5 +1,5 @@ error[E0658]: use of unstable library feature 'ipu_flatten' (see issue #99999) - --> $DIR/inference_unstable_forced.rs:21:20 + --> $DIR/inference_unstable_forced.rs:11:20 | LL | assert_eq!('x'.ipu_flatten(), 0); //~ ERROR E0658 | ^^^^^^^^^^^ diff --git a/src/test/ui/infinite/infinite-autoderef.rs b/src/test/ui/infinite/infinite-autoderef.rs index 3635c4dbb0263..6d6908ef7f63e 100644 --- a/src/test/ui/infinite/infinite-autoderef.rs +++ b/src/test/ui/infinite/infinite-autoderef.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: reached the recursion limit while auto-dereferencing #![feature(box_syntax)] diff --git a/src/test/ui/infinite/infinite-autoderef.stderr b/src/test/ui/infinite/infinite-autoderef.stderr index b5e20ea5cbf99..9d3ea5450e97f 100644 --- a/src/test/ui/infinite/infinite-autoderef.stderr +++ b/src/test/ui/infinite/infinite-autoderef.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/infinite-autoderef.rs:30:13 + --> $DIR/infinite-autoderef.rs:20:13 | LL | x = box x; | ^^^^^ @@ -8,7 +8,7 @@ LL | x = box x; | help: try using a conversion method: `box x.to_string()` error[E0055]: reached the recursion limit while auto-dereferencing Foo - --> $DIR/infinite-autoderef.rs:35:5 + --> $DIR/infinite-autoderef.rs:25:5 | LL | Foo.foo; | ^^^^^^^ deref recursion limit reached @@ -16,7 +16,7 @@ LL | Foo.foo; = help: consider adding a `#![recursion_limit="128"]` attribute to your crate error[E0055]: reached the recursion limit while auto-dereferencing Foo - --> $DIR/infinite-autoderef.rs:35:9 + --> $DIR/infinite-autoderef.rs:25:9 | LL | Foo.foo; | ^^^ deref recursion limit reached @@ -24,13 +24,13 @@ LL | Foo.foo; = help: consider adding a `#![recursion_limit="128"]` attribute to your crate error[E0609]: no field `foo` on type `Foo` - --> $DIR/infinite-autoderef.rs:35:9 + --> $DIR/infinite-autoderef.rs:25:9 | LL | Foo.foo; | ^^^ unknown field error[E0055]: reached the recursion limit while auto-dereferencing Foo - --> $DIR/infinite-autoderef.rs:36:9 + --> $DIR/infinite-autoderef.rs:26:9 | LL | Foo.bar(); | ^^^ deref recursion limit reached @@ -38,7 +38,7 @@ LL | Foo.bar(); = help: consider adding a `#![recursion_limit="128"]` attribute to your crate error[E0599]: no method named `bar` found for type `Foo` in the current scope - --> $DIR/infinite-autoderef.rs:36:9 + --> $DIR/infinite-autoderef.rs:26:9 | LL | struct Foo; | ----------- method `bar` not found for this diff --git a/src/test/ui/infinite/infinite-instantiation.rs b/src/test/ui/infinite/infinite-instantiation.rs index 08e6bf2469117..4220c8837d298 100644 --- a/src/test/ui/infinite/infinite-instantiation.rs +++ b/src/test/ui/infinite/infinite-instantiation.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // // We get an error message at the top of file (dummy span). // This is not helpful, but also kind of annoying to prevent, diff --git a/src/test/ui/infinite/infinite-instantiation.stderr b/src/test/ui/infinite/infinite-instantiation.stderr index 483605fc38949..42be1411b686a 100644 --- a/src/test/ui/infinite/infinite-instantiation.stderr +++ b/src/test/ui/infinite/infinite-instantiation.stderr @@ -1,5 +1,5 @@ error: reached the recursion limit while instantiating `function::>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>` - --> $DIR/infinite-instantiation.rs:33:1 + --> $DIR/infinite-instantiation.rs:23:1 | LL | / fn function(counter: usize, t: T) { LL | | //~^ ERROR reached the recursion limit while instantiating `function:: or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! recursive { () => (recursive!()) //~ ERROR recursion limit reached while expanding the macro `recursive` } diff --git a/src/test/ui/infinite/infinite-macro-expansion.stderr b/src/test/ui/infinite/infinite-macro-expansion.stderr index 7921669347589..9b64fba8b94dd 100644 --- a/src/test/ui/infinite/infinite-macro-expansion.stderr +++ b/src/test/ui/infinite/infinite-macro-expansion.stderr @@ -1,5 +1,5 @@ error: recursion limit reached while expanding the macro `recursive` - --> $DIR/infinite-macro-expansion.rs:12:12 + --> $DIR/infinite-macro-expansion.rs:2:12 | LL | () => (recursive!()) //~ ERROR recursion limit reached while expanding the macro `recursive` | ^^^^^^^^^^^^ diff --git a/src/test/ui/infinite/infinite-recursion-const-fn.rs b/src/test/ui/infinite/infinite-recursion-const-fn.rs index 4f1f67214509e..24f776d89b9db 100644 --- a/src/test/ui/infinite/infinite-recursion-const-fn.rs +++ b/src/test/ui/infinite/infinite-recursion-const-fn.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //https://github.com/rust-lang/rust/issues/31364 #![feature(const_fn)] diff --git a/src/test/ui/infinite/infinite-recursion-const-fn.stderr b/src/test/ui/infinite/infinite-recursion-const-fn.stderr index fb7c1be75413e..163a1ba723c85 100644 --- a/src/test/ui/infinite/infinite-recursion-const-fn.stderr +++ b/src/test/ui/infinite/infinite-recursion-const-fn.stderr @@ -1,5 +1,5 @@ error[E0080]: could not evaluate constant expression - --> $DIR/infinite-recursion-const-fn.rs:16:1 + --> $DIR/infinite-recursion-const-fn.rs:6:1 | LL | const fn a() -> usize { b() } | --- diff --git a/src/test/ui/infinite/infinite-tag-type-recursion.rs b/src/test/ui/infinite/infinite-tag-type-recursion.rs index c9a7f731aea08..cb47a1ce7d707 100644 --- a/src/test/ui/infinite/infinite-tag-type-recursion.rs +++ b/src/test/ui/infinite/infinite-tag-type-recursion.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum mlist { cons(isize, mlist), nil, } //~^ ERROR recursive type `mlist` has infinite size diff --git a/src/test/ui/infinite/infinite-tag-type-recursion.stderr b/src/test/ui/infinite/infinite-tag-type-recursion.stderr index e1fa3dec64c7f..7795ba7c6f78c 100644 --- a/src/test/ui/infinite/infinite-tag-type-recursion.stderr +++ b/src/test/ui/infinite/infinite-tag-type-recursion.stderr @@ -1,5 +1,5 @@ error[E0072]: recursive type `mlist` has infinite size - --> $DIR/infinite-tag-type-recursion.rs:11:1 + --> $DIR/infinite-tag-type-recursion.rs:1:1 | LL | enum mlist { cons(isize, mlist), nil, } | ^^^^^^^^^^ ----- recursive without indirection diff --git a/src/test/ui/infinite/infinite-vec-type-recursion.rs b/src/test/ui/infinite/infinite-vec-type-recursion.rs index 42c80b54313d0..2aa759a3e77fb 100644 --- a/src/test/ui/infinite/infinite-vec-type-recursion.rs +++ b/src/test/ui/infinite/infinite-vec-type-recursion.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - type x = Vec; //~^ ERROR cycle detected diff --git a/src/test/ui/infinite/infinite-vec-type-recursion.stderr b/src/test/ui/infinite/infinite-vec-type-recursion.stderr index 3e2d3d6d726c9..3e28b5ca62809 100644 --- a/src/test/ui/infinite/infinite-vec-type-recursion.stderr +++ b/src/test/ui/infinite/infinite-vec-type-recursion.stderr @@ -1,5 +1,5 @@ error[E0391]: cycle detected when processing `x` - --> $DIR/infinite-vec-type-recursion.rs:11:14 + --> $DIR/infinite-vec-type-recursion.rs:1:14 | LL | type x = Vec; | ^ diff --git a/src/test/ui/inhabitedness-infinite-loop.rs b/src/test/ui/inhabitedness-infinite-loop.rs index d11aacec19631..e85193ad76d6d 100644 --- a/src/test/ui/inhabitedness-infinite-loop.rs +++ b/src/test/ui/inhabitedness-infinite-loop.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern:reached recursion limit #![feature(never_type)] diff --git a/src/test/ui/init-unsafe.rs b/src/test/ui/init-unsafe.rs index 9e599cebd7a1c..92b21c4efa3a2 100644 --- a/src/test/ui/init-unsafe.rs +++ b/src/test/ui/init-unsafe.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(core_intrinsics)] use std::intrinsics::{init}; diff --git a/src/test/ui/init-unsafe.stderr b/src/test/ui/init-unsafe.stderr index f3d041fde0142..dba8cc43ff223 100644 --- a/src/test/ui/init-unsafe.stderr +++ b/src/test/ui/init-unsafe.stderr @@ -1,5 +1,5 @@ error[E0133]: call to unsafe function is unsafe and requires unsafe function or block - --> $DIR/init-unsafe.rs:17:17 + --> $DIR/init-unsafe.rs:7:17 | LL | let stuff = init::(); //~ ERROR call to unsafe function is unsafe | ^^^^^^^^^^^^^^^ call to unsafe function diff --git a/src/test/ui/inner-static-type-parameter.rs b/src/test/ui/inner-static-type-parameter.rs index 4d763017c0f8b..60b4c5b8131b3 100644 --- a/src/test/ui/inner-static-type-parameter.rs +++ b/src/test/ui/inner-static-type-parameter.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // see #9186 enum Bar { What } //~ ERROR parameter `T` is never used diff --git a/src/test/ui/inner-static-type-parameter.stderr b/src/test/ui/inner-static-type-parameter.stderr index 1820e5c57dd3a..2f2856edb0ca9 100644 --- a/src/test/ui/inner-static-type-parameter.stderr +++ b/src/test/ui/inner-static-type-parameter.stderr @@ -1,5 +1,5 @@ error[E0401]: can't use type parameters from outer function - --> $DIR/inner-static-type-parameter.rs:16:19 + --> $DIR/inner-static-type-parameter.rs:6:19 | LL | fn foo() { | --- - type variable from outer function @@ -9,7 +9,7 @@ LL | static a: Bar = Bar::What; | ^ use of type variable from outer function error[E0392]: parameter `T` is never used - --> $DIR/inner-static-type-parameter.rs:13:10 + --> $DIR/inner-static-type-parameter.rs:3:10 | LL | enum Bar { What } //~ ERROR parameter `T` is never used | ^ unused type parameter diff --git a/src/test/ui/integer-literal-suffix-inference.rs b/src/test/ui/integer-literal-suffix-inference.rs index 7a850d90a8747..2da3286c70056 100644 --- a/src/test/ui/integer-literal-suffix-inference.rs +++ b/src/test/ui/integer-literal-suffix-inference.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { // the smallest positive values that need these types diff --git a/src/test/ui/integer-literal-suffix-inference.stderr b/src/test/ui/integer-literal-suffix-inference.stderr index 1c5d656020c84..04c8633c8b5d8 100644 --- a/src/test/ui/integer-literal-suffix-inference.stderr +++ b/src/test/ui/integer-literal-suffix-inference.stderr @@ -1,23 +1,23 @@ error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:42:11 + --> $DIR/integer-literal-suffix-inference.rs:32:11 | LL | id_i8(a16); | ^^^ expected i8, found i16 error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:45:11 + --> $DIR/integer-literal-suffix-inference.rs:35:11 | LL | id_i8(a32); | ^^^ expected i8, found i32 error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:48:11 + --> $DIR/integer-literal-suffix-inference.rs:38:11 | LL | id_i8(a64); | ^^^ expected i8, found i64 error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:52:12 + --> $DIR/integer-literal-suffix-inference.rs:42:12 | LL | id_i16(a8); | ^^ expected i16, found i8 @@ -27,19 +27,19 @@ LL | id_i16(a8.into()); | ^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:56:12 + --> $DIR/integer-literal-suffix-inference.rs:46:12 | LL | id_i16(a32); | ^^^ expected i16, found i32 error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:59:12 + --> $DIR/integer-literal-suffix-inference.rs:49:12 | LL | id_i16(a64); | ^^^ expected i16, found i64 error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:63:12 + --> $DIR/integer-literal-suffix-inference.rs:53:12 | LL | id_i32(a8); | ^^ expected i32, found i8 @@ -49,7 +49,7 @@ LL | id_i32(a8.into()); | ^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:66:12 + --> $DIR/integer-literal-suffix-inference.rs:56:12 | LL | id_i32(a16); | ^^^ expected i32, found i16 @@ -59,13 +59,13 @@ LL | id_i32(a16.into()); | ^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:70:12 + --> $DIR/integer-literal-suffix-inference.rs:60:12 | LL | id_i32(a64); | ^^^ expected i32, found i64 error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:74:12 + --> $DIR/integer-literal-suffix-inference.rs:64:12 | LL | id_i64(a8); | ^^ expected i64, found i8 @@ -75,7 +75,7 @@ LL | id_i64(a8.into()); | ^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:77:12 + --> $DIR/integer-literal-suffix-inference.rs:67:12 | LL | id_i64(a16); | ^^^ expected i64, found i16 @@ -85,7 +85,7 @@ LL | id_i64(a16.into()); | ^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:80:12 + --> $DIR/integer-literal-suffix-inference.rs:70:12 | LL | id_i64(a32); | ^^^ expected i64, found i32 @@ -95,25 +95,25 @@ LL | id_i64(a32.into()); | ^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:86:11 + --> $DIR/integer-literal-suffix-inference.rs:76:11 | LL | id_i8(c16); | ^^^ expected i8, found i16 error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:89:11 + --> $DIR/integer-literal-suffix-inference.rs:79:11 | LL | id_i8(c32); | ^^^ expected i8, found i32 error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:92:11 + --> $DIR/integer-literal-suffix-inference.rs:82:11 | LL | id_i8(c64); | ^^^ expected i8, found i64 error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:96:12 + --> $DIR/integer-literal-suffix-inference.rs:86:12 | LL | id_i16(c8); | ^^ expected i16, found i8 @@ -123,19 +123,19 @@ LL | id_i16(c8.into()); | ^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:100:12 + --> $DIR/integer-literal-suffix-inference.rs:90:12 | LL | id_i16(c32); | ^^^ expected i16, found i32 error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:103:12 + --> $DIR/integer-literal-suffix-inference.rs:93:12 | LL | id_i16(c64); | ^^^ expected i16, found i64 error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:107:12 + --> $DIR/integer-literal-suffix-inference.rs:97:12 | LL | id_i32(c8); | ^^ expected i32, found i8 @@ -145,7 +145,7 @@ LL | id_i32(c8.into()); | ^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:110:12 + --> $DIR/integer-literal-suffix-inference.rs:100:12 | LL | id_i32(c16); | ^^^ expected i32, found i16 @@ -155,13 +155,13 @@ LL | id_i32(c16.into()); | ^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:114:12 + --> $DIR/integer-literal-suffix-inference.rs:104:12 | LL | id_i32(c64); | ^^^ expected i32, found i64 error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:118:12 + --> $DIR/integer-literal-suffix-inference.rs:108:12 | LL | id_i64(a8); | ^^ expected i64, found i8 @@ -171,7 +171,7 @@ LL | id_i64(a8.into()); | ^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:121:12 + --> $DIR/integer-literal-suffix-inference.rs:111:12 | LL | id_i64(a16); | ^^^ expected i64, found i16 @@ -181,7 +181,7 @@ LL | id_i64(a16.into()); | ^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:124:12 + --> $DIR/integer-literal-suffix-inference.rs:114:12 | LL | id_i64(a32); | ^^^ expected i64, found i32 @@ -191,25 +191,25 @@ LL | id_i64(a32.into()); | ^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:130:11 + --> $DIR/integer-literal-suffix-inference.rs:120:11 | LL | id_u8(b16); | ^^^ expected u8, found u16 error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:133:11 + --> $DIR/integer-literal-suffix-inference.rs:123:11 | LL | id_u8(b32); | ^^^ expected u8, found u32 error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:136:11 + --> $DIR/integer-literal-suffix-inference.rs:126:11 | LL | id_u8(b64); | ^^^ expected u8, found u64 error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:140:12 + --> $DIR/integer-literal-suffix-inference.rs:130:12 | LL | id_u16(b8); | ^^ expected u16, found u8 @@ -219,19 +219,19 @@ LL | id_u16(b8.into()); | ^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:144:12 + --> $DIR/integer-literal-suffix-inference.rs:134:12 | LL | id_u16(b32); | ^^^ expected u16, found u32 error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:147:12 + --> $DIR/integer-literal-suffix-inference.rs:137:12 | LL | id_u16(b64); | ^^^ expected u16, found u64 error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:151:12 + --> $DIR/integer-literal-suffix-inference.rs:141:12 | LL | id_u32(b8); | ^^ expected u32, found u8 @@ -241,7 +241,7 @@ LL | id_u32(b8.into()); | ^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:154:12 + --> $DIR/integer-literal-suffix-inference.rs:144:12 | LL | id_u32(b16); | ^^^ expected u32, found u16 @@ -251,13 +251,13 @@ LL | id_u32(b16.into()); | ^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:158:12 + --> $DIR/integer-literal-suffix-inference.rs:148:12 | LL | id_u32(b64); | ^^^ expected u32, found u64 error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:162:12 + --> $DIR/integer-literal-suffix-inference.rs:152:12 | LL | id_u64(b8); | ^^ expected u64, found u8 @@ -267,7 +267,7 @@ LL | id_u64(b8.into()); | ^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:165:12 + --> $DIR/integer-literal-suffix-inference.rs:155:12 | LL | id_u64(b16); | ^^^ expected u64, found u16 @@ -277,7 +277,7 @@ LL | id_u64(b16.into()); | ^^^^^^^^^^ error[E0308]: mismatched types - --> $DIR/integer-literal-suffix-inference.rs:168:12 + --> $DIR/integer-literal-suffix-inference.rs:158:12 | LL | id_u64(b32); | ^^^ expected u64, found u32 diff --git a/src/test/ui/integral-indexing.rs b/src/test/ui/integral-indexing.rs index 4b01afb8131b7..7bdbc45879b9d 100644 --- a/src/test/ui/integral-indexing.rs +++ b/src/test/ui/integral-indexing.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { let v: Vec = vec![0, 1, 2, 3, 4, 5]; let s: String = "abcdef".to_string(); diff --git a/src/test/ui/integral-indexing.stderr b/src/test/ui/integral-indexing.stderr index d86421a79856f..7f2dddcf7b8c3 100644 --- a/src/test/ui/integral-indexing.stderr +++ b/src/test/ui/integral-indexing.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `u8: std::slice::SliceIndex<[isize]>` is not satisfied - --> $DIR/integral-indexing.rs:16:5 + --> $DIR/integral-indexing.rs:6:5 | LL | v[3u8]; //~ERROR : std::slice::SliceIndex<[isize]>` is not satisfied | ^^^^^^ slice indices are of type `usize` or ranges of `usize` @@ -8,7 +8,7 @@ LL | v[3u8]; //~ERROR : std::slice::SliceIndex<[isize]>` is not satisfied = note: required because of the requirements on the impl of `std::ops::Index` for `std::vec::Vec` error[E0277]: the trait bound `i8: std::slice::SliceIndex<[isize]>` is not satisfied - --> $DIR/integral-indexing.rs:17:5 + --> $DIR/integral-indexing.rs:7:5 | LL | v[3i8]; //~ERROR : std::slice::SliceIndex<[isize]>` is not satisfied | ^^^^^^ slice indices are of type `usize` or ranges of `usize` @@ -17,7 +17,7 @@ LL | v[3i8]; //~ERROR : std::slice::SliceIndex<[isize]>` is not satisfied = note: required because of the requirements on the impl of `std::ops::Index` for `std::vec::Vec` error[E0277]: the trait bound `u32: std::slice::SliceIndex<[isize]>` is not satisfied - --> $DIR/integral-indexing.rs:18:5 + --> $DIR/integral-indexing.rs:8:5 | LL | v[3u32]; //~ERROR : std::slice::SliceIndex<[isize]>` is not satisfied | ^^^^^^^ slice indices are of type `usize` or ranges of `usize` @@ -26,7 +26,7 @@ LL | v[3u32]; //~ERROR : std::slice::SliceIndex<[isize]>` is not satisfied = note: required because of the requirements on the impl of `std::ops::Index` for `std::vec::Vec` error[E0277]: the trait bound `i32: std::slice::SliceIndex<[isize]>` is not satisfied - --> $DIR/integral-indexing.rs:19:5 + --> $DIR/integral-indexing.rs:9:5 | LL | v[3i32]; //~ERROR : std::slice::SliceIndex<[isize]>` is not satisfied | ^^^^^^^ slice indices are of type `usize` or ranges of `usize` @@ -35,7 +35,7 @@ LL | v[3i32]; //~ERROR : std::slice::SliceIndex<[isize]>` is not satisfied = note: required because of the requirements on the impl of `std::ops::Index` for `std::vec::Vec` error[E0277]: the trait bound `u8: std::slice::SliceIndex<[u8]>` is not satisfied - --> $DIR/integral-indexing.rs:22:5 + --> $DIR/integral-indexing.rs:12:5 | LL | s.as_bytes()[3u8]; //~ERROR : std::slice::SliceIndex<[u8]>` is not satisfied | ^^^^^^^^^^^^^^^^^ slice indices are of type `usize` or ranges of `usize` @@ -44,7 +44,7 @@ LL | s.as_bytes()[3u8]; //~ERROR : std::slice::SliceIndex<[u8]>` is not sat = note: required because of the requirements on the impl of `std::ops::Index` for `[u8]` error[E0277]: the trait bound `i8: std::slice::SliceIndex<[u8]>` is not satisfied - --> $DIR/integral-indexing.rs:23:5 + --> $DIR/integral-indexing.rs:13:5 | LL | s.as_bytes()[3i8]; //~ERROR : std::slice::SliceIndex<[u8]>` is not satisfied | ^^^^^^^^^^^^^^^^^ slice indices are of type `usize` or ranges of `usize` @@ -53,7 +53,7 @@ LL | s.as_bytes()[3i8]; //~ERROR : std::slice::SliceIndex<[u8]>` is not sat = note: required because of the requirements on the impl of `std::ops::Index` for `[u8]` error[E0277]: the trait bound `u32: std::slice::SliceIndex<[u8]>` is not satisfied - --> $DIR/integral-indexing.rs:24:5 + --> $DIR/integral-indexing.rs:14:5 | LL | s.as_bytes()[3u32]; //~ERROR : std::slice::SliceIndex<[u8]>` is not satisfied | ^^^^^^^^^^^^^^^^^^ slice indices are of type `usize` or ranges of `usize` @@ -62,7 +62,7 @@ LL | s.as_bytes()[3u32]; //~ERROR : std::slice::SliceIndex<[u8]>` is not sat = note: required because of the requirements on the impl of `std::ops::Index` for `[u8]` error[E0277]: the trait bound `i32: std::slice::SliceIndex<[u8]>` is not satisfied - --> $DIR/integral-indexing.rs:25:5 + --> $DIR/integral-indexing.rs:15:5 | LL | s.as_bytes()[3i32]; //~ERROR : std::slice::SliceIndex<[u8]>` is not satisfied | ^^^^^^^^^^^^^^^^^^ slice indices are of type `usize` or ranges of `usize` diff --git a/src/test/ui/integral-variable-unification-error.rs b/src/test/ui/integral-variable-unification-error.rs index f2686ae4d196b..98a77e9c82f67 100644 --- a/src/test/ui/integral-variable-unification-error.rs +++ b/src/test/ui/integral-variable-unification-error.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let mut x = 2; x = 5.0; diff --git a/src/test/ui/integral-variable-unification-error.stderr b/src/test/ui/integral-variable-unification-error.stderr index bbaa60308662f..7670f7a0e8da7 100644 --- a/src/test/ui/integral-variable-unification-error.stderr +++ b/src/test/ui/integral-variable-unification-error.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/integral-variable-unification-error.rs:13:9 + --> $DIR/integral-variable-unification-error.rs:3:9 | LL | x = 5.0; | ^^^ expected integral variable, found floating-point variable diff --git a/src/test/ui/interior-mutability/interior-mutability.rs b/src/test/ui/interior-mutability/interior-mutability.rs index b0288463e9157..ddc882cccf390 100644 --- a/src/test/ui/interior-mutability/interior-mutability.rs +++ b/src/test/ui/interior-mutability/interior-mutability.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cell::Cell; use std::panic::catch_unwind; fn main() { diff --git a/src/test/ui/interior-mutability/interior-mutability.stderr b/src/test/ui/interior-mutability/interior-mutability.stderr index f2aecc55ccb41..31390bc6ccefd 100644 --- a/src/test/ui/interior-mutability/interior-mutability.stderr +++ b/src/test/ui/interior-mutability/interior-mutability.stderr @@ -1,5 +1,5 @@ error[E0277]: the type `std::cell::UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary - --> $DIR/interior-mutability.rs:15:5 + --> $DIR/interior-mutability.rs:5:5 | LL | catch_unwind(|| { x.set(23); }); | ^^^^^^^^^^^^ `std::cell::UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary @@ -7,7 +7,7 @@ LL | catch_unwind(|| { x.set(23); }); = help: within `std::cell::Cell`, the trait `std::panic::RefUnwindSafe` is not implemented for `std::cell::UnsafeCell` = note: required because it appears within the type `std::cell::Cell` = note: required because of the requirements on the impl of `std::panic::UnwindSafe` for `&std::cell::Cell` - = note: required because it appears within the type `[closure@$DIR/interior-mutability.rs:15:18: 15:35 x:&std::cell::Cell]` + = note: required because it appears within the type `[closure@$DIR/interior-mutability.rs:5:18: 5:35 x:&std::cell::Cell]` = note: required by `std::panic::catch_unwind` error: aborting due to previous error diff --git a/src/test/ui/internal/auxiliary/internal_unstable.rs b/src/test/ui/internal/auxiliary/internal_unstable.rs index a4cd487eb6515..7cf54c3e6a69f 100644 --- a/src/test/ui/internal/auxiliary/internal_unstable.rs +++ b/src/test/ui/internal/auxiliary/internal_unstable.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(staged_api, allow_internal_unstable)] #![stable(feature = "stable", since = "1.0.0")] diff --git a/src/test/ui/internal/internal-unstable-noallow.rs b/src/test/ui/internal/internal-unstable-noallow.rs index 2e42e9d3b0195..616f6668d02cd 100644 --- a/src/test/ui/internal/internal-unstable-noallow.rs +++ b/src/test/ui/internal/internal-unstable-noallow.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // this has to be separate to internal-unstable.rs because these tests // have error messages pointing deep into the internals of the // cross-crate macros, and hence need to use error-pattern instead of diff --git a/src/test/ui/internal/internal-unstable-noallow.stderr b/src/test/ui/internal/internal-unstable-noallow.stderr index fc8100525e9bd..7247f68fa43c2 100644 --- a/src/test/ui/internal/internal-unstable-noallow.stderr +++ b/src/test/ui/internal/internal-unstable-noallow.stderr @@ -1,5 +1,5 @@ error[E0658]: use of unstable library feature 'function' - --> $DIR/internal-unstable-noallow.rs:26:5 + --> $DIR/internal-unstable-noallow.rs:16:5 | LL | call_unstable_noallow!(); | ^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -8,7 +8,7 @@ LL | call_unstable_noallow!(); = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) error[E0658]: use of unstable library feature 'struct_field' - --> $DIR/internal-unstable-noallow.rs:28:5 + --> $DIR/internal-unstable-noallow.rs:18:5 | LL | construct_unstable_noallow!(0); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -17,7 +17,7 @@ LL | construct_unstable_noallow!(0); = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) error[E0658]: use of unstable library feature 'method' - --> $DIR/internal-unstable-noallow.rs:30:35 + --> $DIR/internal-unstable-noallow.rs:20:35 | LL | |x: internal_unstable::Foo| { call_method_noallow!(x) }; | ^^^^^^^^^^^^^^^^^^^^^^^ @@ -26,7 +26,7 @@ LL | |x: internal_unstable::Foo| { call_method_noallow!(x) }; = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) error[E0658]: use of unstable library feature 'struct2_field' - --> $DIR/internal-unstable-noallow.rs:32:35 + --> $DIR/internal-unstable-noallow.rs:22:35 | LL | |x: internal_unstable::Bar| { access_field_noallow!(x) }; | ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/internal/internal-unstable-thread-local.rs b/src/test/ui/internal/internal-unstable-thread-local.rs index 74526fb3d8314..b9194c6b3705f 100644 --- a/src/test/ui/internal/internal-unstable-thread-local.rs +++ b/src/test/ui/internal/internal-unstable-thread-local.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:internal_unstable.rs #![allow(dead_code)] diff --git a/src/test/ui/internal/internal-unstable-thread-local.stderr b/src/test/ui/internal/internal-unstable-thread-local.stderr index b77b94663ff09..0e25592b103c3 100644 --- a/src/test/ui/internal/internal-unstable-thread-local.stderr +++ b/src/test/ui/internal/internal-unstable-thread-local.stderr @@ -1,5 +1,5 @@ error[E0658]: use of unstable library feature 'function' - --> $DIR/internal-unstable-thread-local.rs:19:32 + --> $DIR/internal-unstable-thread-local.rs:9:32 | LL | thread_local!(static BAR: () = internal_unstable::unstable()); //~ ERROR use of unstable | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/internal/internal-unstable.rs b/src/test/ui/internal/internal-unstable.rs index e01259f0debbd..34fef33bfeb97 100644 --- a/src/test/ui/internal/internal-unstable.rs +++ b/src/test/ui/internal/internal-unstable.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:internal_unstable.rs #![feature(allow_internal_unstable)] diff --git a/src/test/ui/internal/internal-unstable.stderr b/src/test/ui/internal/internal-unstable.stderr index ec4f0725c34f4..3e1a44f082ee7 100644 --- a/src/test/ui/internal/internal-unstable.stderr +++ b/src/test/ui/internal/internal-unstable.stderr @@ -1,5 +1,5 @@ error[E0658]: use of unstable library feature 'function' - --> $DIR/internal-unstable.rs:43:25 + --> $DIR/internal-unstable.rs:33:25 | LL | pass_through_allow!(internal_unstable::unstable()); //~ ERROR use of unstable | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | pass_through_allow!(internal_unstable::unstable()); //~ ERROR use of un = help: add #![feature(function)] to the crate attributes to enable error[E0658]: use of unstable library feature 'function' - --> $DIR/internal-unstable.rs:45:27 + --> $DIR/internal-unstable.rs:35:27 | LL | pass_through_noallow!(internal_unstable::unstable()); //~ ERROR use of unstable | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -15,7 +15,7 @@ LL | pass_through_noallow!(internal_unstable::unstable()); //~ ERROR use of = help: add #![feature(function)] to the crate attributes to enable error[E0658]: use of unstable library feature 'function' - --> $DIR/internal-unstable.rs:49:22 + --> $DIR/internal-unstable.rs:39:22 | LL | println!("{:?}", internal_unstable::unstable()); //~ ERROR use of unstable | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -23,7 +23,7 @@ LL | println!("{:?}", internal_unstable::unstable()); //~ ERROR use of unsta = help: add #![feature(function)] to the crate attributes to enable error[E0658]: use of unstable library feature 'function' - --> $DIR/internal-unstable.rs:51:10 + --> $DIR/internal-unstable.rs:41:10 | LL | bar!(internal_unstable::unstable()); //~ ERROR use of unstable | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -31,7 +31,7 @@ LL | bar!(internal_unstable::unstable()); //~ ERROR use of unstable = help: add #![feature(function)] to the crate attributes to enable error[E0658]: use of unstable library feature 'function' - --> $DIR/internal-unstable.rs:22:9 + --> $DIR/internal-unstable.rs:12:9 | LL | internal_unstable::unstable(); //~ ERROR use of unstable | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/intrinsic-invalid-number-of-arguments.rs b/src/test/ui/intrinsic-invalid-number-of-arguments.rs index a224690af765c..dca691627df78 100644 --- a/src/test/ui/intrinsic-invalid-number-of-arguments.rs +++ b/src/test/ui/intrinsic-invalid-number-of-arguments.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test number of arguments in platform-specific intrinsic function // This is the error E0444 diff --git a/src/test/ui/intrinsic-invalid-number-of-arguments.stderr b/src/test/ui/intrinsic-invalid-number-of-arguments.stderr index af852b669c42c..d5f67484c29a9 100644 --- a/src/test/ui/intrinsic-invalid-number-of-arguments.stderr +++ b/src/test/ui/intrinsic-invalid-number-of-arguments.stderr @@ -1,5 +1,5 @@ error[E0444]: platform-specific intrinsic has invalid number of arguments: found 3, expected 1 - --> $DIR/intrinsic-invalid-number-of-arguments.rs:20:5 + --> $DIR/intrinsic-invalid-number-of-arguments.rs:10:5 | LL | fn x86_mm_movemask_pd(x: f64x2, y: f64x2, z: f64x2) -> i32; //~ platform-specific intrinsic | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/invalid-module-declaration/auxiliary/foo/bar.rs b/src/test/ui/invalid-module-declaration/auxiliary/foo/bar.rs index 4b6b4f5ebf82f..bcfd7dc0ade75 100644 --- a/src/test/ui/invalid-module-declaration/auxiliary/foo/bar.rs +++ b/src/test/ui/invalid-module-declaration/auxiliary/foo/bar.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod baz; diff --git a/src/test/ui/invalid-module-declaration/auxiliary/foo/mod.rs b/src/test/ui/invalid-module-declaration/auxiliary/foo/mod.rs index 6d77fb60a35de..46f285ca47d69 100644 --- a/src/test/ui/invalid-module-declaration/auxiliary/foo/mod.rs +++ b/src/test/ui/invalid-module-declaration/auxiliary/foo/mod.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod bar; diff --git a/src/test/ui/invalid-module-declaration/invalid-module-declaration.rs b/src/test/ui/invalid-module-declaration/invalid-module-declaration.rs index c0a10fe3e60fe..2d901b1e38851 100644 --- a/src/test/ui/invalid-module-declaration/invalid-module-declaration.rs +++ b/src/test/ui/invalid-module-declaration/invalid-module-declaration.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength // ignore-windows diff --git a/src/test/ui/invalid-module-declaration/invalid-module-declaration.stderr b/src/test/ui/invalid-module-declaration/invalid-module-declaration.stderr index 2dd62ec050074..c95df5b4534c1 100644 --- a/src/test/ui/invalid-module-declaration/invalid-module-declaration.stderr +++ b/src/test/ui/invalid-module-declaration/invalid-module-declaration.stderr @@ -1,5 +1,5 @@ error[E0583]: file not found for module `baz` - --> $DIR/auxiliary/foo/bar.rs:11:9 + --> $DIR/auxiliary/foo/bar.rs:1:9 | LL | pub mod baz; | ^^^ diff --git a/src/test/ui/invalid/invalid-crate-type.rs b/src/test/ui/invalid/invalid-crate-type.rs index 4b6b6c2fe7677..63ea12d30d9dd 100644 --- a/src/test/ui/invalid/invalid-crate-type.rs +++ b/src/test/ui/invalid/invalid-crate-type.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // regression test for issue 11256 #![crate_type="foo"] //~ ERROR invalid `crate_type` value diff --git a/src/test/ui/invalid/invalid-crate-type.stderr b/src/test/ui/invalid/invalid-crate-type.stderr index 6dc8a0f2bbb04..59d4e1e6d8634 100644 --- a/src/test/ui/invalid/invalid-crate-type.stderr +++ b/src/test/ui/invalid/invalid-crate-type.stderr @@ -1,5 +1,5 @@ error: invalid `crate_type` value - --> $DIR/invalid-crate-type.rs:12:1 + --> $DIR/invalid-crate-type.rs:2:1 | LL | #![crate_type="foo"] //~ ERROR invalid `crate_type` value | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/invalid/invalid-inline.rs b/src/test/ui/invalid/invalid-inline.rs index 93b985b4fb063..8aa8f99f52285 100644 --- a/src/test/ui/invalid/invalid-inline.rs +++ b/src/test/ui/invalid/invalid-inline.rs @@ -1,12 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![allow(dead_code)] #[inline(please_no)] //~ ERROR invalid argument diff --git a/src/test/ui/invalid/invalid-inline.stderr b/src/test/ui/invalid/invalid-inline.stderr index d4861c23aee20..fdbd25070f7f8 100644 --- a/src/test/ui/invalid/invalid-inline.stderr +++ b/src/test/ui/invalid/invalid-inline.stderr @@ -1,17 +1,17 @@ error[E0535]: invalid argument - --> $DIR/invalid-inline.rs:12:10 + --> $DIR/invalid-inline.rs:3:10 | LL | #[inline(please_no)] //~ ERROR invalid argument | ^^^^^^^^^ error[E0534]: expected one argument - --> $DIR/invalid-inline.rs:16:1 + --> $DIR/invalid-inline.rs:7:1 | LL | #[inline(please,no)] //~ ERROR expected one argument | ^^^^^^^^^^^^^^^^^^^^ error[E0534]: expected one argument - --> $DIR/invalid-inline.rs:20:1 + --> $DIR/invalid-inline.rs:11:1 | LL | #[inline()] //~ ERROR expected one argument | ^^^^^^^^^^^ diff --git a/src/test/ui/invalid/invalid-macro-matcher.rs b/src/test/ui/invalid/invalid-macro-matcher.rs index d710f5647dd9f..ff79d4e1a9259 100644 --- a/src/test/ui/invalid/invalid-macro-matcher.rs +++ b/src/test/ui/invalid/invalid-macro-matcher.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_macros)] macro_rules! invalid { diff --git a/src/test/ui/invalid/invalid-macro-matcher.stderr b/src/test/ui/invalid/invalid-macro-matcher.stderr index d3ddb613f946b..5d6c70fa30b88 100644 --- a/src/test/ui/invalid/invalid-macro-matcher.stderr +++ b/src/test/ui/invalid/invalid-macro-matcher.stderr @@ -1,5 +1,5 @@ error: invalid macro matcher; matchers must be contained in balanced delimiters - --> $DIR/invalid-macro-matcher.rs:14:5 + --> $DIR/invalid-macro-matcher.rs:4:5 | LL | _ => (); //~ ERROR invalid macro matcher | ^ diff --git a/src/test/ui/invalid/invalid-path-in-const.rs b/src/test/ui/invalid/invalid-path-in-const.rs index ab839e7630de9..51eb860721190 100644 --- a/src/test/ui/invalid/invalid-path-in-const.rs +++ b/src/test/ui/invalid/invalid-path-in-const.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { fn f(a: [u8; u32::DOESNOTEXIST]) {} //~^ ERROR no associated item named `DOESNOTEXIST` found for type `u32` diff --git a/src/test/ui/invalid/invalid-path-in-const.stderr b/src/test/ui/invalid/invalid-path-in-const.stderr index 9214800b93a59..6541c92c691c8 100644 --- a/src/test/ui/invalid/invalid-path-in-const.stderr +++ b/src/test/ui/invalid/invalid-path-in-const.stderr @@ -1,5 +1,5 @@ error[E0599]: no associated item named `DOESNOTEXIST` found for type `u32` in the current scope - --> $DIR/invalid-path-in-const.rs:12:18 + --> $DIR/invalid-path-in-const.rs:2:18 | LL | fn f(a: [u8; u32::DOESNOTEXIST]) {} | ^^^^^^^^^^^^^^^^^ associated item not found in `u32` diff --git a/src/test/ui/invalid/invalid-plugin-attr.rs b/src/test/ui/invalid/invalid-plugin-attr.rs index 3bf09e10ae8c3..2cbd523386148 100644 --- a/src/test/ui/invalid/invalid-plugin-attr.rs +++ b/src/test/ui/invalid/invalid-plugin-attr.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(unused_attributes)] #![feature(plugin)] diff --git a/src/test/ui/invalid/invalid-plugin-attr.stderr b/src/test/ui/invalid/invalid-plugin-attr.stderr index a5d321ea9bd35..2d7ae1f5cfedc 100644 --- a/src/test/ui/invalid/invalid-plugin-attr.stderr +++ b/src/test/ui/invalid/invalid-plugin-attr.stderr @@ -1,17 +1,17 @@ error: unused attribute - --> $DIR/invalid-plugin-attr.rs:14:1 + --> $DIR/invalid-plugin-attr.rs:4:1 | LL | #[plugin(bla)] //~ ERROR unused attribute | ^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/invalid-plugin-attr.rs:11:9 + --> $DIR/invalid-plugin-attr.rs:1:9 | LL | #![deny(unused_attributes)] | ^^^^^^^^^^^^^^^^^ error: crate-level attribute should be an inner attribute: add an exclamation mark: #![foo] - --> $DIR/invalid-plugin-attr.rs:14:1 + --> $DIR/invalid-plugin-attr.rs:4:1 | LL | #[plugin(bla)] //~ ERROR unused attribute | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/invalid/invalid-variadic-function.rs b/src/test/ui/invalid/invalid-variadic-function.rs index 3d421e00b08e4..aea630e7c26a1 100644 --- a/src/test/ui/invalid/invalid-variadic-function.rs +++ b/src/test/ui/invalid/invalid-variadic-function.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern "C" fn foo(x: u8, ...); //~^ ERROR only foreign functions are allowed to be variadic //~| ERROR expected one of `->`, `where`, or `{`, found `;` diff --git a/src/test/ui/invalid/invalid-variadic-function.stderr b/src/test/ui/invalid/invalid-variadic-function.stderr index 13678d10ef517..7a0b8066fd52a 100644 --- a/src/test/ui/invalid/invalid-variadic-function.stderr +++ b/src/test/ui/invalid/invalid-variadic-function.stderr @@ -1,11 +1,11 @@ error: only foreign functions are allowed to be variadic - --> $DIR/invalid-variadic-function.rs:11:26 + --> $DIR/invalid-variadic-function.rs:1:26 | LL | extern "C" fn foo(x: u8, ...); | ^^^ error: expected one of `->`, `where`, or `{`, found `;` - --> $DIR/invalid-variadic-function.rs:11:30 + --> $DIR/invalid-variadic-function.rs:1:30 | LL | extern "C" fn foo(x: u8, ...); | ^ expected one of `->`, `where`, or `{` here diff --git a/src/test/ui/invalid_crate_type_syntax.rs b/src/test/ui/invalid_crate_type_syntax.rs index 6d42515704ea1..34867ec634994 100644 --- a/src/test/ui/invalid_crate_type_syntax.rs +++ b/src/test/ui/invalid_crate_type_syntax.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // regression test for issue 16974 #![crate_type(lib)] //~ ERROR `crate_type` requires a value diff --git a/src/test/ui/invalid_crate_type_syntax.stderr b/src/test/ui/invalid_crate_type_syntax.stderr index b609695b86ee5..ce596943cd8fa 100644 --- a/src/test/ui/invalid_crate_type_syntax.stderr +++ b/src/test/ui/invalid_crate_type_syntax.stderr @@ -1,5 +1,5 @@ error: `crate_type` requires a value - --> $DIR/invalid_crate_type_syntax.rs:12:1 + --> $DIR/invalid_crate_type_syntax.rs:2:1 | LL | #![crate_type(lib)] //~ ERROR `crate_type` requires a value | ^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issue-10636-1.rs b/src/test/ui/issue-10636-1.rs index fdd50773593a8..a29071a9fd822 100644 --- a/src/test/ui/issue-10636-1.rs +++ b/src/test/ui/issue-10636-1.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z parse-only struct Obj { //~ NOTE: unclosed delimiter diff --git a/src/test/ui/issue-10636-1.stderr b/src/test/ui/issue-10636-1.stderr index af80e259fbd25..71f5125890da9 100644 --- a/src/test/ui/issue-10636-1.stderr +++ b/src/test/ui/issue-10636-1.stderr @@ -1,5 +1,5 @@ error: incorrect close delimiter: `)` - --> $DIR/issue-10636-1.rs:15:1 + --> $DIR/issue-10636-1.rs:5:1 | LL | struct Obj { //~ NOTE: unclosed delimiter | - unclosed delimiter diff --git a/src/test/ui/issue-51602.rs b/src/test/ui/issue-51602.rs index a3edecb94f7c5..1aca5b9a36013 100644 --- a/src/test/ui/issue-51602.rs +++ b/src/test/ui/issue-51602.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main(){ if i in 1..10 { break; diff --git a/src/test/ui/issue-51602.stderr b/src/test/ui/issue-51602.stderr index ac079b452c5eb..fba76327ace01 100644 --- a/src/test/ui/issue-51602.stderr +++ b/src/test/ui/issue-51602.stderr @@ -1,5 +1,5 @@ error: expected `{`, found `in` - --> $DIR/issue-51602.rs:12:10 + --> $DIR/issue-51602.rs:2:10 | LL | if i in 1..10 { | -- ^^ expected `{` diff --git a/src/test/ui/issue-53251.rs b/src/test/ui/issue-53251.rs index 8c75ea45a6170..0751b0a635b3e 100644 --- a/src/test/ui/issue-53251.rs +++ b/src/test/ui/issue-53251.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S; impl S { diff --git a/src/test/ui/issue-53251.stderr b/src/test/ui/issue-53251.stderr index f12afa4a79208..e052c48be88d2 100644 --- a/src/test/ui/issue-53251.stderr +++ b/src/test/ui/issue-53251.stderr @@ -1,5 +1,5 @@ error[E0087]: wrong number of type arguments: expected 0, found 1 - --> $DIR/issue-53251.rs:21:24 + --> $DIR/issue-53251.rs:11:24 | LL | S::f::(); | ^^^ unexpected type argument diff --git a/src/test/ui/issues/auxiliary/empty-struct.rs b/src/test/ui/issues/auxiliary/empty-struct.rs index 4a30286563422..3fb40f6bfa960 100644 --- a/src/test/ui/issues/auxiliary/empty-struct.rs +++ b/src/test/ui/issues/auxiliary/empty-struct.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct XEmpty1 {} pub struct XEmpty2; pub struct XEmpty6(); diff --git a/src/test/ui/issues/auxiliary/issue-19163.rs b/src/test/ui/issues/auxiliary/issue-19163.rs index 76c5cdafd7cf1..0c0d9e43c1d24 100644 --- a/src/test/ui/issues/auxiliary/issue-19163.rs +++ b/src/test/ui/issues/auxiliary/issue-19163.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] #[macro_export] diff --git a/src/test/ui/issues/auxiliary/issue-21146-inc.rs b/src/test/ui/issues/auxiliary/issue-21146-inc.rs index 1b740d112e9d3..32a3b9dcc35c9 100644 --- a/src/test/ui/issues/auxiliary/issue-21146-inc.rs +++ b/src/test/ui/issues/auxiliary/issue-21146-inc.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // include file for issue-21146.rs parse_error diff --git a/src/test/ui/issues/auxiliary/issue-29181.rs b/src/test/ui/issues/auxiliary/issue-29181.rs index 361f1ea550934..bd1a9be4ef107 100644 --- a/src/test/ui/issues/auxiliary/issue-29181.rs +++ b/src/test/ui/issues/auxiliary/issue-29181.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="lib"] pub mod foo { diff --git a/src/test/ui/issues/auxiliary/issue-30535.rs b/src/test/ui/issues/auxiliary/issue-30535.rs index 8d44e8d101616..3608d4a2f14ef 100644 --- a/src/test/ui/issues/auxiliary/issue-30535.rs +++ b/src/test/ui/issues/auxiliary/issue-30535.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="lib"] pub enum Foo { diff --git a/src/test/ui/issues/auxiliary/issue-36708.rs b/src/test/ui/issues/auxiliary/issue-36708.rs index e64e63a2139e9..bd8580f9782e7 100644 --- a/src/test/ui/issues/auxiliary/issue-36708.rs +++ b/src/test/ui/issues/auxiliary/issue-36708.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] pub trait Foo { diff --git a/src/test/ui/issues/auxiliary/issue-36881-aux.rs b/src/test/ui/issues/auxiliary/issue-36881-aux.rs index 33ac11feb2db6..e373b64384f92 100644 --- a/src/test/ui/issues/auxiliary/issue-36881-aux.rs +++ b/src/test/ui/issues/auxiliary/issue-36881-aux.rs @@ -1,11 +1 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Foo {} diff --git a/src/test/ui/issues/auxiliary/issue-52489.rs b/src/test/ui/issues/auxiliary/issue-52489.rs index 68d1ef8d776aa..c649930c2b4d1 100644 --- a/src/test/ui/issues/auxiliary/issue-52489.rs +++ b/src/test/ui/issues/auxiliary/issue-52489.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type = "lib"] #![unstable(feature = "issue_52489_unstable", issue = "0")] #![feature(staged_api)] diff --git a/src/test/ui/issues/auxiliary/issue_11680.rs b/src/test/ui/issues/auxiliary/issue_11680.rs index 18f78750b15fc..74abbf0bf8cda 100644 --- a/src/test/ui/issues/auxiliary/issue_11680.rs +++ b/src/test/ui/issues/auxiliary/issue_11680.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Foo { Bar(isize) } diff --git a/src/test/ui/issues/auxiliary/issue_16725.rs b/src/test/ui/issues/auxiliary/issue_16725.rs index b3b04b4a5ac13..b75b5e2d8d701 100644 --- a/src/test/ui/issues/auxiliary/issue_16725.rs +++ b/src/test/ui/issues/auxiliary/issue_16725.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern { fn bar(); } diff --git a/src/test/ui/issues/auxiliary/issue_17718_const_privacy.rs b/src/test/ui/issues/auxiliary/issue_17718_const_privacy.rs index 3901d73382fcf..93cf4bf3ecce3 100644 --- a/src/test/ui/issues/auxiliary/issue_17718_const_privacy.rs +++ b/src/test/ui/issues/auxiliary/issue_17718_const_privacy.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub use foo::FOO2; pub const FOO: usize = 3; diff --git a/src/test/ui/issues/auxiliary/issue_1920.rs b/src/test/ui/issues/auxiliary/issue_1920.rs index 55065174ca759..1548cb995638c 100644 --- a/src/test/ui/issues/auxiliary/issue_1920.rs +++ b/src/test/ui/issues/auxiliary/issue_1920.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Just exporting some type to test for correct diagnostics when this // crate is pulled in at a non-root location in client crate. diff --git a/src/test/ui/issues/auxiliary/issue_21202.rs b/src/test/ui/issues/auxiliary/issue_21202.rs index afdbf78aa8292..e3daa1ba0d568 100644 --- a/src/test/ui/issues/auxiliary/issue_21202.rs +++ b/src/test/ui/issues/auxiliary/issue_21202.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod A { pub struct Foo; impl Foo { diff --git a/src/test/ui/issues/auxiliary/issue_30123_aux.rs b/src/test/ui/issues/auxiliary/issue_30123_aux.rs index f60311a9400b3..07c743eb2aa34 100644 --- a/src/test/ui/issues/auxiliary/issue_30123_aux.rs +++ b/src/test/ui/issues/auxiliary/issue_30123_aux.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::marker::PhantomData; pub struct Directed; diff --git a/src/test/ui/issues/auxiliary/issue_41549.rs b/src/test/ui/issues/auxiliary/issue_41549.rs index 5a6db78928273..b7bd375250f0b 100644 --- a/src/test/ui/issues/auxiliary/issue_41549.rs +++ b/src/test/ui/issues/auxiliary/issue_41549.rs @@ -1,14 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - pub trait Trait { const CONST: u32; } diff --git a/src/test/ui/issues/auxiliary/issue_5844_aux.rs b/src/test/ui/issues/auxiliary/issue_5844_aux.rs index 7fa937e93b34b..ea83378cad6c5 100644 --- a/src/test/ui/issues/auxiliary/issue_5844_aux.rs +++ b/src/test/ui/issues/auxiliary/issue_5844_aux.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern "C" { pub fn rand() -> u32; } diff --git a/src/test/ui/issues/auxiliary/lint_stability.rs b/src/test/ui/issues/auxiliary/lint_stability.rs index 5547458abbef8..3188d706ab057 100644 --- a/src/test/ui/issues/auxiliary/lint_stability.rs +++ b/src/test/ui/issues/auxiliary/lint_stability.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_name="lint_stability"] #![crate_type = "lib"] #![feature(staged_api)] diff --git a/src/test/ui/issues/auxiliary/private_trait_xc.rs b/src/test/ui/issues/auxiliary/private_trait_xc.rs index 37ee10c8d3733..481a48a7cd85d 100644 --- a/src/test/ui/issues/auxiliary/private_trait_xc.rs +++ b/src/test/ui/issues/auxiliary/private_trait_xc.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo {} diff --git a/src/test/ui/issues/auxiliary/xcrate_issue_43189_a.rs b/src/test/ui/issues/auxiliary/xcrate_issue_43189_a.rs index 95b2d62e42625..9ab570fd170f6 100644 --- a/src/test/ui/issues/auxiliary/xcrate_issue_43189_a.rs +++ b/src/test/ui/issues/auxiliary/xcrate_issue_43189_a.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="lib"] diff --git a/src/test/ui/issues/auxiliary/xcrate_issue_43189_b.rs b/src/test/ui/issues/auxiliary/xcrate_issue_43189_b.rs index a396c31e21d5a..31dfb050b27e7 100644 --- a/src/test/ui/issues/auxiliary/xcrate_issue_43189_b.rs +++ b/src/test/ui/issues/auxiliary/xcrate_issue_43189_b.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="lib"] pub extern crate xcrate_issue_43189_a; diff --git a/src/test/ui/issues/auxiliary/xcrate_issue_46112_rexport_core.rs b/src/test/ui/issues/auxiliary/xcrate_issue_46112_rexport_core.rs index 80f877f834d8b..2b517b5784af7 100644 --- a/src/test/ui/issues/auxiliary/xcrate_issue_46112_rexport_core.rs +++ b/src/test/ui/issues/auxiliary/xcrate_issue_46112_rexport_core.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![crate_type="lib"] pub extern crate core; diff --git a/src/test/ui/issues/issue-10176.rs b/src/test/ui/issues/issue-10176.rs index c968844ae21ac..ff0619b489d7f 100644 --- a/src/test/ui/issues/issue-10176.rs +++ b/src/test/ui/issues/issue-10176.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn f() -> isize { (return 1, return 2) //~^ ERROR mismatched types diff --git a/src/test/ui/issues/issue-10176.stderr b/src/test/ui/issues/issue-10176.stderr index 02e0b899b3f88..45482447ebe2c 100644 --- a/src/test/ui/issues/issue-10176.stderr +++ b/src/test/ui/issues/issue-10176.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-10176.rs:12:5 + --> $DIR/issue-10176.rs:2:5 | LL | fn f() -> isize { | ----- expected `isize` because of return type diff --git a/src/test/ui/issues/issue-10200.rs b/src/test/ui/issues/issue-10200.rs index 8c58ef6261e10..12867a878f310 100644 --- a/src/test/ui/issues/issue-10200.rs +++ b/src/test/ui/issues/issue-10200.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo(bool); fn foo(_: usize) -> Foo { Foo(false) } diff --git a/src/test/ui/issues/issue-10200.stderr b/src/test/ui/issues/issue-10200.stderr index 4eb0782762857..78e601568f187 100644 --- a/src/test/ui/issues/issue-10200.stderr +++ b/src/test/ui/issues/issue-10200.stderr @@ -1,5 +1,5 @@ error[E0532]: expected tuple struct/variant, found function `foo` - --> $DIR/issue-10200.rs:16:9 + --> $DIR/issue-10200.rs:6:9 | LL | foo(x) //~ ERROR expected tuple struct/variant, found function `foo` | ^^^ did you mean `Foo`? diff --git a/src/test/ui/issues/issue-10291.nll.stderr b/src/test/ui/issues/issue-10291.nll.stderr index 48dad040f9d0c..34b003025368e 100644 --- a/src/test/ui/issues/issue-10291.nll.stderr +++ b/src/test/ui/issues/issue-10291.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/issue-10291.rs:13:9 + --> $DIR/issue-10291.rs:3:9 | LL | x //~ ERROR E0312 | ^ error: unsatisfied lifetime constraints - --> $DIR/issue-10291.rs:12:5 + --> $DIR/issue-10291.rs:2:5 | LL | fn test<'x>(x: &'x isize) { | -- lifetime `'x` defined here diff --git a/src/test/ui/issues/issue-10291.rs b/src/test/ui/issues/issue-10291.rs index d4e7dc7e9a35d..877b0aba47392 100644 --- a/src/test/ui/issues/issue-10291.rs +++ b/src/test/ui/issues/issue-10291.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn test<'x>(x: &'x isize) { drop:: FnMut(&'z isize) -> &'z isize>>(Box::new(|z| { x //~ ERROR E0312 diff --git a/src/test/ui/issues/issue-10291.stderr b/src/test/ui/issues/issue-10291.stderr index af5929782f627..9bd428950179b 100644 --- a/src/test/ui/issues/issue-10291.stderr +++ b/src/test/ui/issues/issue-10291.stderr @@ -1,19 +1,19 @@ error[E0312]: lifetime of reference outlives lifetime of borrowed content... - --> $DIR/issue-10291.rs:13:9 + --> $DIR/issue-10291.rs:3:9 | LL | x //~ ERROR E0312 | ^ | -note: ...the reference is valid for the anonymous lifetime #2 defined on the body at 12:65... - --> $DIR/issue-10291.rs:12:65 +note: ...the reference is valid for the anonymous lifetime #2 defined on the body at 2:65... + --> $DIR/issue-10291.rs:2:65 | LL | drop:: FnMut(&'z isize) -> &'z isize>>(Box::new(|z| { | _________________________________________________________________^ LL | | x //~ ERROR E0312 LL | | })); | |_____^ -note: ...but the borrowed content is only valid for the lifetime 'x as defined on the function body at 11:9 - --> $DIR/issue-10291.rs:11:9 +note: ...but the borrowed content is only valid for the lifetime 'x as defined on the function body at 1:9 + --> $DIR/issue-10291.rs:1:9 | LL | fn test<'x>(x: &'x isize) { | ^^ diff --git a/src/test/ui/issues/issue-10398.nll.stderr b/src/test/ui/issues/issue-10398.nll.stderr index d13e843b94b56..f5f4974265b9a 100644 --- a/src/test/ui/issues/issue-10398.nll.stderr +++ b/src/test/ui/issues/issue-10398.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `x` - --> $DIR/issue-10398.rs:17:14 + --> $DIR/issue-10398.rs:7:14 | LL | let _a = x; | - value moved here diff --git a/src/test/ui/issues/issue-10398.rs b/src/test/ui/issues/issue-10398.rs index 08e8effc626f5..0405b2d01e2cc 100644 --- a/src/test/ui/issues/issue-10398.rs +++ b/src/test/ui/issues/issue-10398.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn main() { diff --git a/src/test/ui/issues/issue-10398.stderr b/src/test/ui/issues/issue-10398.stderr index e3b816df3f4b6..ceb2cfe2b75af 100644 --- a/src/test/ui/issues/issue-10398.stderr +++ b/src/test/ui/issues/issue-10398.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `x` - --> $DIR/issue-10398.rs:17:14 + --> $DIR/issue-10398.rs:7:14 | LL | let _a = x; | -- value moved here diff --git a/src/test/ui/issues/issue-10401.rs b/src/test/ui/issues/issue-10401.rs index e36193aee25c0..d77ff381e1a09 100644 --- a/src/test/ui/issues/issue-10401.rs +++ b/src/test/ui/issues/issue-10401.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let mut a = "a"; a += { "b" }; diff --git a/src/test/ui/issues/issue-10401.stderr b/src/test/ui/issues/issue-10401.stderr index 94d13d5f26858..1f68abcfb4371 100644 --- a/src/test/ui/issues/issue-10401.stderr +++ b/src/test/ui/issues/issue-10401.stderr @@ -1,5 +1,5 @@ error[E0368]: binary assignment operation `+=` cannot be applied to type `&str` - --> $DIR/issue-10401.rs:13:5 + --> $DIR/issue-10401.rs:3:5 | LL | a += { "b" }; | -^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-10412.rs b/src/test/ui/issues/issue-10412.rs index ee553730a35bc..a0bc2fc2f3c79 100644 --- a/src/test/ui/issues/issue-10412.rs +++ b/src/test/ui/issues/issue-10412.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Serializable<'self, T> { //~ ERROR lifetimes cannot use keyword names fn serialize(val : &'self T) -> Vec; //~ ERROR lifetimes cannot use keyword names fn deserialize(repr : &[u8]) -> &'self T; //~ ERROR lifetimes cannot use keyword names diff --git a/src/test/ui/issues/issue-10412.stderr b/src/test/ui/issues/issue-10412.stderr index 7f2f2dbf5091a..8128ba22fdeb1 100644 --- a/src/test/ui/issues/issue-10412.stderr +++ b/src/test/ui/issues/issue-10412.stderr @@ -1,47 +1,47 @@ error: lifetimes cannot use keyword names - --> $DIR/issue-10412.rs:11:20 + --> $DIR/issue-10412.rs:1:20 | LL | trait Serializable<'self, T> { //~ ERROR lifetimes cannot use keyword names | ^^^^^ error: lifetimes cannot use keyword names - --> $DIR/issue-10412.rs:12:25 + --> $DIR/issue-10412.rs:2:25 | LL | fn serialize(val : &'self T) -> Vec; //~ ERROR lifetimes cannot use keyword names | ^^^^^ error: lifetimes cannot use keyword names - --> $DIR/issue-10412.rs:13:38 + --> $DIR/issue-10412.rs:3:38 | LL | fn deserialize(repr : &[u8]) -> &'self T; //~ ERROR lifetimes cannot use keyword names | ^^^^^ error: lifetimes cannot use keyword names - --> $DIR/issue-10412.rs:16:6 + --> $DIR/issue-10412.rs:6:6 | LL | impl<'self> Serializable for &'self str { //~ ERROR lifetimes cannot use keyword names | ^^^^^ error: lifetimes cannot use keyword names - --> $DIR/issue-10412.rs:16:36 + --> $DIR/issue-10412.rs:6:36 | LL | impl<'self> Serializable for &'self str { //~ ERROR lifetimes cannot use keyword names | ^^^^^ error: lifetimes cannot use keyword names - --> $DIR/issue-10412.rs:19:25 + --> $DIR/issue-10412.rs:9:25 | LL | fn serialize(val : &'self str) -> Vec { //~ ERROR lifetimes cannot use keyword names | ^^^^^ error: lifetimes cannot use keyword names - --> $DIR/issue-10412.rs:22:37 + --> $DIR/issue-10412.rs:12:37 | LL | fn deserialize(repr: &[u8]) -> &'self str { //~ ERROR lifetimes cannot use keyword names | ^^^^^ error[E0106]: missing lifetime specifier - --> $DIR/issue-10412.rs:16:13 + --> $DIR/issue-10412.rs:6:13 | LL | impl<'self> Serializable for &'self str { //~ ERROR lifetimes cannot use keyword names | ^^^^^^^^^^^^^^^^^ expected lifetime parameter diff --git a/src/test/ui/issues/issue-10465.rs b/src/test/ui/issues/issue-10465.rs index ed91e935407b9..d899c3ffa9129 100644 --- a/src/test/ui/issues/issue-10465.rs +++ b/src/test/ui/issues/issue-10465.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod a { pub trait A { fn foo(&self); diff --git a/src/test/ui/issues/issue-10465.stderr b/src/test/ui/issues/issue-10465.stderr index add4b832e8322..41613cfa01058 100644 --- a/src/test/ui/issues/issue-10465.stderr +++ b/src/test/ui/issues/issue-10465.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `foo` found for type `&b::B` in the current scope - --> $DIR/issue-10465.rs:27:15 + --> $DIR/issue-10465.rs:17:15 | LL | b.foo(); //~ ERROR: no method named `foo` found | ^^^ diff --git a/src/test/ui/issues/issue-10536.rs b/src/test/ui/issues/issue-10536.rs index 2b71fb5c67f7a..f8695caca5b61 100644 --- a/src/test/ui/issues/issue-10536.rs +++ b/src/test/ui/issues/issue-10536.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // We only want to assert that this doesn't ICE, we don't particularly care // about whether it nor it fails to compile. diff --git a/src/test/ui/issues/issue-10536.stderr b/src/test/ui/issues/issue-10536.stderr index ba404d0dd3f63..bc542ce35c0ab 100644 --- a/src/test/ui/issues/issue-10536.stderr +++ b/src/test/ui/issues/issue-10536.stderr @@ -1,11 +1,11 @@ error: macros that expand to items must either be surrounded with braces or followed by a semicolon - --> $DIR/issue-10536.rs:26:22 + --> $DIR/issue-10536.rs:16:22 | LL | assert!({one! two()}); | ^^ error: expected `(` or `{`, found `}` - --> $DIR/issue-10536.rs:31:22 + --> $DIR/issue-10536.rs:21:22 | LL | assert!({one! two}); | ^ expected `(` or `{` diff --git a/src/test/ui/issues/issue-10545.rs b/src/test/ui/issues/issue-10545.rs index 708eea39a9571..acd0714961906 100644 --- a/src/test/ui/issues/issue-10545.rs +++ b/src/test/ui/issues/issue-10545.rs @@ -1,14 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - mod a { struct S; impl S { } diff --git a/src/test/ui/issues/issue-10545.stderr b/src/test/ui/issues/issue-10545.stderr index 28f95dff3bc0a..d97d6e1759c50 100644 --- a/src/test/ui/issues/issue-10545.stderr +++ b/src/test/ui/issues/issue-10545.stderr @@ -1,5 +1,5 @@ error[E0603]: struct `S` is private - --> $DIR/issue-10545.rs:17:11 + --> $DIR/issue-10545.rs:6:11 | LL | fn foo(_: a::S) { //~ ERROR: struct `S` is private | ^^^^ diff --git a/src/test/ui/issues/issue-10656.rs b/src/test/ui/issues/issue-10656.rs index 7fd5a0d13485b..8918dadb47a35 100644 --- a/src/test/ui/issues/issue-10656.rs +++ b/src/test/ui/issues/issue-10656.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(missing_docs)] #![crate_type="lib"] //~^^ ERROR missing documentation for crate diff --git a/src/test/ui/issues/issue-10656.stderr b/src/test/ui/issues/issue-10656.stderr index d67463f02636b..818457f50794e 100644 --- a/src/test/ui/issues/issue-10656.stderr +++ b/src/test/ui/issues/issue-10656.stderr @@ -1,12 +1,12 @@ error: missing documentation for crate - --> $DIR/issue-10656.rs:11:1 + --> $DIR/issue-10656.rs:1:1 | LL | / #![deny(missing_docs)] LL | | #![crate_type="lib"] | |____________________^ | note: lint level defined here - --> $DIR/issue-10656.rs:11:9 + --> $DIR/issue-10656.rs:1:9 | LL | #![deny(missing_docs)] | ^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-10764.rs b/src/test/ui/issues/issue-10764.rs index cd4ec495556c5..8fa3607815ad5 100644 --- a/src/test/ui/issues/issue-10764.rs +++ b/src/test/ui/issues/issue-10764.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn f(_: extern "Rust" fn()) {} extern fn bar() {} diff --git a/src/test/ui/issues/issue-10764.stderr b/src/test/ui/issues/issue-10764.stderr index 6aacbef089720..c5f1887b7965c 100644 --- a/src/test/ui/issues/issue-10764.stderr +++ b/src/test/ui/issues/issue-10764.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-10764.rs:14:15 + --> $DIR/issue-10764.rs:4:15 | LL | fn main() { f(bar) } | ^^^ expected "Rust" fn, found "C" fn diff --git a/src/test/ui/issues/issue-10877.rs b/src/test/ui/issues/issue-10877.rs index 39f25b837cd49..b57929be28403 100644 --- a/src/test/ui/issues/issue-10877.rs +++ b/src/test/ui/issues/issue-10877.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { x: isize } extern { fn foo(1: ()); diff --git a/src/test/ui/issues/issue-10877.stderr b/src/test/ui/issues/issue-10877.stderr index 6db0bf6dc65fb..0f9dc211ceacf 100644 --- a/src/test/ui/issues/issue-10877.stderr +++ b/src/test/ui/issues/issue-10877.stderr @@ -1,23 +1,23 @@ error[E0130]: patterns aren't allowed in foreign function declarations - --> $DIR/issue-10877.rs:13:12 + --> $DIR/issue-10877.rs:3:12 | LL | fn foo(1: ()); | ^ pattern not allowed in foreign function error[E0130]: patterns aren't allowed in foreign function declarations - --> $DIR/issue-10877.rs:15:12 + --> $DIR/issue-10877.rs:5:12 | LL | fn bar((): isize); | ^^ pattern not allowed in foreign function error[E0130]: patterns aren't allowed in foreign function declarations - --> $DIR/issue-10877.rs:17:12 + --> $DIR/issue-10877.rs:7:12 | LL | fn baz(Foo { x }: isize); | ^^^^^^^^^ pattern not allowed in foreign function error[E0130]: patterns aren't allowed in foreign function declarations - --> $DIR/issue-10877.rs:19:12 + --> $DIR/issue-10877.rs:9:12 | LL | fn qux((x,y): ()); | ^^^^^ pattern not allowed in foreign function diff --git a/src/test/ui/issues/issue-10969.rs b/src/test/ui/issues/issue-10969.rs index 4ab4a8b579abc..0b78fc1bb7fa2 100644 --- a/src/test/ui/issues/issue-10969.rs +++ b/src/test/ui/issues/issue-10969.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn func(i: i32) { i(); //~ERROR expected function, found `i32` } diff --git a/src/test/ui/issues/issue-10969.stderr b/src/test/ui/issues/issue-10969.stderr index edc4ecbab525a..c006d7ea835b1 100644 --- a/src/test/ui/issues/issue-10969.stderr +++ b/src/test/ui/issues/issue-10969.stderr @@ -1,5 +1,5 @@ error[E0618]: expected function, found `i32` - --> $DIR/issue-10969.rs:12:5 + --> $DIR/issue-10969.rs:2:5 | LL | fn func(i: i32) { | - `i32` defined here @@ -7,7 +7,7 @@ LL | i(); //~ERROR expected function, found `i32` | ^^^ not a function error[E0618]: expected function, found `i32` - --> $DIR/issue-10969.rs:16:5 + --> $DIR/issue-10969.rs:6:5 | LL | let i = 0i32; | - `i32` defined here diff --git a/src/test/ui/issues/issue-10991.rs b/src/test/ui/issues/issue-10991.rs index 2d00f339f33a0..c36829fdf5b85 100644 --- a/src/test/ui/issues/issue-10991.rs +++ b/src/test/ui/issues/issue-10991.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let nil = (); let _t = nil as usize; //~ ERROR: non-primitive cast: `()` as `usize` diff --git a/src/test/ui/issues/issue-10991.stderr b/src/test/ui/issues/issue-10991.stderr index 3ae3bbe06cbf7..c91b15cb3fb33 100644 --- a/src/test/ui/issues/issue-10991.stderr +++ b/src/test/ui/issues/issue-10991.stderr @@ -1,5 +1,5 @@ error[E0605]: non-primitive cast: `()` as `usize` - --> $DIR/issue-10991.rs:13:14 + --> $DIR/issue-10991.rs:3:14 | LL | let _t = nil as usize; //~ ERROR: non-primitive cast: `()` as `usize` | ^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-11004.rs b/src/test/ui/issues/issue-11004.rs index 503fa64751274..10ef1f5e3b5cd 100644 --- a/src/test/ui/issues/issue-11004.rs +++ b/src/test/ui/issues/issue-11004.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::mem; struct A { x: i32, y: f64 } diff --git a/src/test/ui/issues/issue-11004.stderr b/src/test/ui/issues/issue-11004.stderr index 215120c9c25ea..ecab6c18cb17e 100644 --- a/src/test/ui/issues/issue-11004.stderr +++ b/src/test/ui/issues/issue-11004.stderr @@ -1,11 +1,11 @@ error[E0609]: no field `x` on type `*mut A` - --> $DIR/issue-11004.rs:17:21 + --> $DIR/issue-11004.rs:7:21 | LL | let x : i32 = n.x; //~ no field `x` on type `*mut A` | ^ help: `n` is a native pointer; try dereferencing it: `(*n).x` error[E0609]: no field `y` on type `*mut A` - --> $DIR/issue-11004.rs:18:21 + --> $DIR/issue-11004.rs:8:21 | LL | let y : f64 = n.y; //~ no field `y` on type `*mut A` | ^ help: `n` is a native pointer; try dereferencing it: `(*n).y` diff --git a/src/test/ui/issues/issue-11154.rs b/src/test/ui/issues/issue-11154.rs index 1ff6812337406..7513abd8a5bbb 100644 --- a/src/test/ui/issues/issue-11154.rs +++ b/src/test/ui/issues/issue-11154.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -C lto -C prefer-dynamic // error-pattern: cannot prefer dynamic linking diff --git a/src/test/ui/issues/issue-11192.nll.stderr b/src/test/ui/issues/issue-11192.nll.stderr index a7e6c9f2b3371..6dd71076725e5 100644 --- a/src/test/ui/issues/issue-11192.nll.stderr +++ b/src/test/ui/issues/issue-11192.nll.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `*ptr` as immutable because it is also borrowed as mutable - --> $DIR/issue-11192.rs:30:10 + --> $DIR/issue-11192.rs:20:10 | LL | let mut test = |foo: &Foo| { | ----------- mutable borrow occurs here diff --git a/src/test/ui/issues/issue-11192.rs b/src/test/ui/issues/issue-11192.rs index 7d8a1528aba36..3bf91675ec3bb 100644 --- a/src/test/ui/issues/issue-11192.rs +++ b/src/test/ui/issues/issue-11192.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] struct Foo { diff --git a/src/test/ui/issues/issue-11192.stderr b/src/test/ui/issues/issue-11192.stderr index e9853ac0ca827..37ae73685b4f2 100644 --- a/src/test/ui/issues/issue-11192.stderr +++ b/src/test/ui/issues/issue-11192.stderr @@ -1,5 +1,5 @@ error[E0502]: cannot borrow `*ptr` as immutable because `ptr` is also borrowed as mutable - --> $DIR/issue-11192.rs:30:11 + --> $DIR/issue-11192.rs:20:11 | LL | let mut test = |foo: &Foo| { | ----------- mutable borrow occurs here diff --git a/src/test/ui/issues/issue-11319.rs b/src/test/ui/issues/issue-11319.rs index 20636ed1ea9e0..ea901205544b6 100644 --- a/src/test/ui/issues/issue-11319.rs +++ b/src/test/ui/issues/issue-11319.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { match Some(10) { //~^ ERROR match arms have incompatible types diff --git a/src/test/ui/issues/issue-11319.stderr b/src/test/ui/issues/issue-11319.stderr index 8189cf5ea170e..44d63ba3e6879 100644 --- a/src/test/ui/issues/issue-11319.stderr +++ b/src/test/ui/issues/issue-11319.stderr @@ -1,5 +1,5 @@ error[E0308]: match arms have incompatible types - --> $DIR/issue-11319.rs:12:5 + --> $DIR/issue-11319.rs:2:5 | LL | / match Some(10) { LL | | //~^ ERROR match arms have incompatible types diff --git a/src/test/ui/issues/issue-11374.rs b/src/test/ui/issues/issue-11374.rs index 1e444a6bebf9b..f00da0acf8124 100644 --- a/src/test/ui/issues/issue-11374.rs +++ b/src/test/ui/issues/issue-11374.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::io::{self, Read}; use std::vec; diff --git a/src/test/ui/issues/issue-11374.stderr b/src/test/ui/issues/issue-11374.stderr index 3465069129bf5..6cd552f86e158 100644 --- a/src/test/ui/issues/issue-11374.stderr +++ b/src/test/ui/issues/issue-11374.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-11374.rs:36:15 + --> $DIR/issue-11374.rs:26:15 | LL | c.read_to(v); //~ ERROR E0308 | ^ diff --git a/src/test/ui/issues/issue-11493.ast.stderr b/src/test/ui/issues/issue-11493.ast.stderr index 99b996387e79b..a5f8aefd194b0 100644 --- a/src/test/ui/issues/issue-11493.ast.stderr +++ b/src/test/ui/issues/issue-11493.ast.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough (Ast) - --> $DIR/issue-11493.rs:20:35 + --> $DIR/issue-11493.rs:10:35 | LL | let y = x.as_ref().unwrap_or(&id(5)); | ^^^^^ - temporary value dropped here while still borrowed diff --git a/src/test/ui/issues/issue-11493.mir.stderr b/src/test/ui/issues/issue-11493.mir.stderr index 99b996387e79b..a5f8aefd194b0 100644 --- a/src/test/ui/issues/issue-11493.mir.stderr +++ b/src/test/ui/issues/issue-11493.mir.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough (Ast) - --> $DIR/issue-11493.rs:20:35 + --> $DIR/issue-11493.rs:10:35 | LL | let y = x.as_ref().unwrap_or(&id(5)); | ^^^^^ - temporary value dropped here while still borrowed diff --git a/src/test/ui/issues/issue-11493.rs b/src/test/ui/issues/issue-11493.rs index 80ecc24543e17..4fdc32b42c2e9 100644 --- a/src/test/ui/issues/issue-11493.rs +++ b/src/test/ui/issues/issue-11493.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This file must never have a trailing newline // // revisions: ast mir diff --git a/src/test/ui/issues/issue-11515.rs b/src/test/ui/issues/issue-11515.rs index 7afb8314ea689..7eab2a26178af 100644 --- a/src/test/ui/issues/issue-11515.rs +++ b/src/test/ui/issues/issue-11515.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] struct Test { diff --git a/src/test/ui/issues/issue-11515.stderr b/src/test/ui/issues/issue-11515.stderr index 25e2a45438e84..d7d51a32414cc 100644 --- a/src/test/ui/issues/issue-11515.stderr +++ b/src/test/ui/issues/issue-11515.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-11515.rs:19:33 + --> $DIR/issue-11515.rs:9:33 | LL | let test = box Test { func: closure }; //~ ERROR mismatched types | ^^^^^^^ expected trait `std::ops::FnMut`, found trait `std::ops::Fn` diff --git a/src/test/ui/issues/issue-11593.rs b/src/test/ui/issues/issue-11593.rs index 2749438433d16..653e13a14748e 100644 --- a/src/test/ui/issues/issue-11593.rs +++ b/src/test/ui/issues/issue-11593.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:private_trait_xc.rs extern crate private_trait_xc; diff --git a/src/test/ui/issues/issue-11593.stderr b/src/test/ui/issues/issue-11593.stderr index 24e1a5eb6f46e..7767005127a8b 100644 --- a/src/test/ui/issues/issue-11593.stderr +++ b/src/test/ui/issues/issue-11593.stderr @@ -1,5 +1,5 @@ error[E0603]: trait `Foo` is private - --> $DIR/issue-11593.rs:17:6 + --> $DIR/issue-11593.rs:7:6 | LL | impl private_trait_xc::Foo for Bar {} | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-11680.rs b/src/test/ui/issues/issue-11680.rs index 7dccd7811066e..667830f184648 100644 --- a/src/test/ui/issues/issue-11680.rs +++ b/src/test/ui/issues/issue-11680.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_11680.rs extern crate issue_11680 as other; diff --git a/src/test/ui/issues/issue-11680.stderr b/src/test/ui/issues/issue-11680.stderr index 37cfe960600b0..b74faad4f51f3 100644 --- a/src/test/ui/issues/issue-11680.stderr +++ b/src/test/ui/issues/issue-11680.stderr @@ -1,11 +1,11 @@ error[E0603]: enum `Foo` is private - --> $DIR/issue-11680.rs:16:14 + --> $DIR/issue-11680.rs:6:14 | LL | let _b = other::Foo::Bar(1); | ^^^^^^^^^^^^^^^ error[E0603]: enum `Foo` is private - --> $DIR/issue-11680.rs:19:14 + --> $DIR/issue-11680.rs:9:14 | LL | let _b = other::test::Foo::Bar(1); | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-11681.rs b/src/test/ui/issues/issue-11681.rs index 71f1d5dcc9af4..8294ca6b22e2e 100644 --- a/src/test/ui/issues/issue-11681.rs +++ b/src/test/ui/issues/issue-11681.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This tests verifies that unary structs and enum variants // are treated as rvalues and their lifetime is not bounded to // the static scope. diff --git a/src/test/ui/issues/issue-11681.stderr b/src/test/ui/issues/issue-11681.stderr index ef3d24c6657be..210c6dc5a00b6 100644 --- a/src/test/ui/issues/issue-11681.stderr +++ b/src/test/ui/issues/issue-11681.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/issue-11681.rs:22:20 + --> $DIR/issue-11681.rs:12:20 | LL | let testValue = &Test; //~ ERROR borrowed value does not live long enough | ^^^^ temporary value does not live long enough @@ -7,8 +7,8 @@ LL | return testValue; LL | } | - temporary value only lives until here | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 21:15... - --> $DIR/issue-11681.rs:21:15 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 11:15... + --> $DIR/issue-11681.rs:11:15 | LL | fn createTest<'a>() -> &'a Test { | ^^ diff --git a/src/test/ui/issues/issue-11692-1.rs b/src/test/ui/issues/issue-11692-1.rs index ff6009da72fd9..eae555ad83cfd 100644 --- a/src/test/ui/issues/issue-11692-1.rs +++ b/src/test/ui/issues/issue-11692-1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { print!(testo!()); //~^ ERROR: format argument must be a string literal diff --git a/src/test/ui/issues/issue-11692-1.stderr b/src/test/ui/issues/issue-11692-1.stderr index 61ff455d16ca5..1173e056321dd 100644 --- a/src/test/ui/issues/issue-11692-1.stderr +++ b/src/test/ui/issues/issue-11692-1.stderr @@ -1,5 +1,5 @@ error: format argument must be a string literal - --> $DIR/issue-11692-1.rs:12:12 + --> $DIR/issue-11692-1.rs:2:12 | LL | print!(testo!()); | ^^^^^^^^ diff --git a/src/test/ui/issues/issue-11692-2.rs b/src/test/ui/issues/issue-11692-2.rs index acac2d151fe9a..6af704685af5a 100644 --- a/src/test/ui/issues/issue-11692-2.rs +++ b/src/test/ui/issues/issue-11692-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { concat!(test!()); //~^ ERROR cannot find macro `test!` in this scope diff --git a/src/test/ui/issues/issue-11692-2.stderr b/src/test/ui/issues/issue-11692-2.stderr index 51d6041e92220..740c3555e52f0 100644 --- a/src/test/ui/issues/issue-11692-2.stderr +++ b/src/test/ui/issues/issue-11692-2.stderr @@ -1,5 +1,5 @@ error: cannot find macro `test!` in this scope - --> $DIR/issue-11692-2.rs:12:13 + --> $DIR/issue-11692-2.rs:2:13 | LL | concat!(test!()); | ^^^^ diff --git a/src/test/ui/issues/issue-11740.rs b/src/test/ui/issues/issue-11740.rs index 0bda06be9e8ca..61c2b8124164d 100644 --- a/src/test/ui/issues/issue-11740.rs +++ b/src/test/ui/issues/issue-11740.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![allow(warnings)] diff --git a/src/test/ui/issues/issue-11740.stderr b/src/test/ui/issues/issue-11740.stderr index a1913e0057ca7..4c131a105bc3a 100644 --- a/src/test/ui/issues/issue-11740.stderr +++ b/src/test/ui/issues/issue-11740.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-11740.rs:35:1 + --> $DIR/issue-11740.rs:25:1 | LL | / fn main() { //~ ERROR compilation successful LL | | let element = Element { attrs: Vec::new() }; diff --git a/src/test/ui/issues/issue-11771.rs b/src/test/ui/issues/issue-11771.rs index 69899105bc317..c69cd1e79e372 100644 --- a/src/test/ui/issues/issue-11771.rs +++ b/src/test/ui/issues/issue-11771.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = (); 1 + diff --git a/src/test/ui/issues/issue-11771.stderr b/src/test/ui/issues/issue-11771.stderr index a31c4fa008db1..e78d8423e837e 100644 --- a/src/test/ui/issues/issue-11771.stderr +++ b/src/test/ui/issues/issue-11771.stderr @@ -1,5 +1,5 @@ error[E0277]: cannot add `()` to `{integer}` - --> $DIR/issue-11771.rs:13:7 + --> $DIR/issue-11771.rs:3:7 | LL | 1 + | ^ no implementation for `{integer} + ()` @@ -7,7 +7,7 @@ LL | 1 + = help: the trait `std::ops::Add<()>` is not implemented for `{integer}` error[E0277]: cannot add `()` to `{integer}` - --> $DIR/issue-11771.rs:18:7 + --> $DIR/issue-11771.rs:8:7 | LL | 1 + | ^ no implementation for `{integer} + ()` diff --git a/src/test/ui/issues/issue-11844.rs b/src/test/ui/issues/issue-11844.rs index a6dbe954ec0ac..bb06f00d5cf2d 100644 --- a/src/test/ui/issues/issue-11844.rs +++ b/src/test/ui/issues/issue-11844.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn main() { diff --git a/src/test/ui/issues/issue-11844.stderr b/src/test/ui/issues/issue-11844.stderr index d773e88d01cf2..05d2685958eb8 100644 --- a/src/test/ui/issues/issue-11844.stderr +++ b/src/test/ui/issues/issue-11844.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-11844.rs:16:9 + --> $DIR/issue-11844.rs:6:9 | LL | Ok(a) => //~ ERROR: mismatched types | ^^^^^ expected enum `std::option::Option`, found enum `std::result::Result` diff --git a/src/test/ui/issues/issue-11873.nll.stderr b/src/test/ui/issues/issue-11873.nll.stderr index bf4fed06dee21..e5abf07420233 100644 --- a/src/test/ui/issues/issue-11873.nll.stderr +++ b/src/test/ui/issues/issue-11873.nll.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `v` because it is borrowed - --> $DIR/issue-11873.rs:14:14 + --> $DIR/issue-11873.rs:4:14 | LL | let mut f = || v.push(2); | -- - borrow occurs due to use in closure diff --git a/src/test/ui/issues/issue-11873.rs b/src/test/ui/issues/issue-11873.rs index 4618851529a15..d3bd05caf384e 100644 --- a/src/test/ui/issues/issue-11873.rs +++ b/src/test/ui/issues/issue-11873.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let mut v = vec![1]; let mut f = || v.push(2); diff --git a/src/test/ui/issues/issue-11873.stderr b/src/test/ui/issues/issue-11873.stderr index f4da011f5729c..1e44754c707d7 100644 --- a/src/test/ui/issues/issue-11873.stderr +++ b/src/test/ui/issues/issue-11873.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `v` because it is borrowed - --> $DIR/issue-11873.rs:14:9 + --> $DIR/issue-11873.rs:4:9 | LL | let mut f = || v.push(2); | -- borrow of `v` occurs here diff --git a/src/test/ui/issues/issue-12028.rs b/src/test/ui/issues/issue-12028.rs index 980385ce4cc6b..d55354529a9b4 100644 --- a/src/test/ui/issues/issue-12028.rs +++ b/src/test/ui/issues/issue-12028.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test an example where we fail to infer the type parameter H. This // is because there is really nothing constraining it. At one time, we // would infer based on the where clauses in scope, but that no longer diff --git a/src/test/ui/issues/issue-12028.stderr b/src/test/ui/issues/issue-12028.stderr index f756e0a29d17a..7b0850581cecc 100644 --- a/src/test/ui/issues/issue-12028.stderr +++ b/src/test/ui/issues/issue-12028.stderr @@ -1,5 +1,5 @@ error[E0284]: type annotations required: cannot resolve `<_ as StreamHasher>::S == ::S` - --> $DIR/issue-12028.rs:39:14 + --> $DIR/issue-12028.rs:29:14 | LL | self.input_stream(&mut stream); //~ ERROR type annotations required | ^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-12041.nll.stderr b/src/test/ui/issues/issue-12041.nll.stderr index b880317a2a612..bf8e2aebe4eaa 100644 --- a/src/test/ui/issues/issue-12041.nll.stderr +++ b/src/test/ui/issues/issue-12041.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `tx` - --> $DIR/issue-12041.rs:18:22 + --> $DIR/issue-12041.rs:8:22 | LL | let tx = tx; | ^^ value moved here in previous iteration of loop diff --git a/src/test/ui/issues/issue-12041.rs b/src/test/ui/issues/issue-12041.rs index f0f4bf5ca71bb..091e8fe8b2a66 100644 --- a/src/test/ui/issues/issue-12041.rs +++ b/src/test/ui/issues/issue-12041.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::sync::mpsc::channel; use std::thread; diff --git a/src/test/ui/issues/issue-12041.stderr b/src/test/ui/issues/issue-12041.stderr index 6172d78b51377..48544c073efcf 100644 --- a/src/test/ui/issues/issue-12041.stderr +++ b/src/test/ui/issues/issue-12041.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `tx` - --> $DIR/issue-12041.rs:18:17 + --> $DIR/issue-12041.rs:8:17 | LL | let tx = tx; | ^^ value moved here in previous iteration of loop diff --git a/src/test/ui/issues/issue-12116.rs b/src/test/ui/issues/issue-12116.rs index a8d2c55255340..8b391cd95d7f7 100644 --- a/src/test/ui/issues/issue-12116.rs +++ b/src/test/ui/issues/issue-12116.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_patterns)] #![feature(box_syntax)] #![allow(dead_code)] diff --git a/src/test/ui/issues/issue-12116.stderr b/src/test/ui/issues/issue-12116.stderr index 3bf0984b25685..10db4f1c031d2 100644 --- a/src/test/ui/issues/issue-12116.stderr +++ b/src/test/ui/issues/issue-12116.stderr @@ -1,11 +1,11 @@ error: unreachable pattern - --> $DIR/issue-12116.rs:25:9 + --> $DIR/issue-12116.rs:15:9 | LL | &IntList::Cons(val, box IntList::Nil) => IntList::Cons(val, box IntList::Nil), | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/issue-12116.rs:15:9 + --> $DIR/issue-12116.rs:5:9 | LL | #![deny(unreachable_patterns)] | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-12127.rs b/src/test/ui/issues/issue-12127.rs index 5565a9a576116..bb2c2734583eb 100644 --- a/src/test/ui/issues/issue-12127.rs +++ b/src/test/ui/issues/issue-12127.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax, unboxed_closures)] fn to_fn_once>(f: F) -> F { f } diff --git a/src/test/ui/issues/issue-12127.stderr b/src/test/ui/issues/issue-12127.stderr index afd483823a630..2283b1275d018 100644 --- a/src/test/ui/issues/issue-12127.stderr +++ b/src/test/ui/issues/issue-12127.stderr @@ -1,12 +1,12 @@ error[E0382]: use of moved value: `f` - --> $DIR/issue-12127.rs:21:9 + --> $DIR/issue-12127.rs:11:9 | LL | f(); | - value moved here LL | f(); | ^ value used here after move | - = note: move occurs because `f` has type `[closure@$DIR/issue-12127.rs:18:24: 18:41 x:std::boxed::Box]`, which does not implement the `Copy` trait + = note: move occurs because `f` has type `[closure@$DIR/issue-12127.rs:8:24: 8:41 x:std::boxed::Box]`, which does not implement the `Copy` trait error: aborting due to previous error diff --git a/src/test/ui/issues/issue-12187-1.rs b/src/test/ui/issues/issue-12187-1.rs index c429b73bc9544..37ff468e03205 100644 --- a/src/test/ui/issues/issue-12187-1.rs +++ b/src/test/ui/issues/issue-12187-1.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn new() -> &'static T { panic!() } diff --git a/src/test/ui/issues/issue-12187-1.stderr b/src/test/ui/issues/issue-12187-1.stderr index 94afd6aab574f..f8df4f82e7efd 100644 --- a/src/test/ui/issues/issue-12187-1.stderr +++ b/src/test/ui/issues/issue-12187-1.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/issue-12187-1.rs:16:10 + --> $DIR/issue-12187-1.rs:6:10 | LL | let &v = new(); | -^ diff --git a/src/test/ui/issues/issue-12187-2.rs b/src/test/ui/issues/issue-12187-2.rs index 733f597e7ac4a..a1cdb84977907 100644 --- a/src/test/ui/issues/issue-12187-2.rs +++ b/src/test/ui/issues/issue-12187-2.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn new<'r, T>() -> &'r T { panic!() } diff --git a/src/test/ui/issues/issue-12187-2.stderr b/src/test/ui/issues/issue-12187-2.stderr index 90b41e397c6d0..c40ae0461ec03 100644 --- a/src/test/ui/issues/issue-12187-2.stderr +++ b/src/test/ui/issues/issue-12187-2.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/issue-12187-2.rs:16:10 + --> $DIR/issue-12187-2.rs:6:10 | LL | let &v = new(); | -^ diff --git a/src/test/ui/issues/issue-12369.rs b/src/test/ui/issues/issue-12369.rs index 1b9af393ccce4..8df8efefd05ed 100644 --- a/src/test/ui/issues/issue-12369.rs +++ b/src/test/ui/issues/issue-12369.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(slice_patterns)] #![deny(unreachable_patterns)] diff --git a/src/test/ui/issues/issue-12369.stderr b/src/test/ui/issues/issue-12369.stderr index 2e8cd840fb7e8..6906c7b7920ca 100644 --- a/src/test/ui/issues/issue-12369.stderr +++ b/src/test/ui/issues/issue-12369.stderr @@ -1,11 +1,11 @@ error: unreachable pattern - --> $DIR/issue-12369.rs:20:9 + --> $DIR/issue-12369.rs:10:9 | LL | &[10,a, ref rest..] => 10 //~ ERROR: unreachable pattern | ^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/issue-12369.rs:12:9 + --> $DIR/issue-12369.rs:2:9 | LL | #![deny(unreachable_patterns)] | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-12470.nll.stderr b/src/test/ui/issues/issue-12470.nll.stderr index 6eb2765514054..c1ad7995f2884 100644 --- a/src/test/ui/issues/issue-12470.nll.stderr +++ b/src/test/ui/issues/issue-12470.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `*b` does not live long enough - --> $DIR/issue-12470.rs:38:18 + --> $DIR/issue-12470.rs:28:18 | LL | let bb: &B = &*b; //~ ERROR does not live long enough | ^^^ borrowed value does not live long enough @@ -7,8 +7,8 @@ LL | make_a(bb) LL | } | - `*b` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 36:16... - --> $DIR/issue-12470.rs:36:16 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 26:16... + --> $DIR/issue-12470.rs:26:16 | LL | fn make_make_a<'a>() -> A<'a> { | ^^ diff --git a/src/test/ui/issues/issue-12470.rs b/src/test/ui/issues/issue-12470.rs index 93785817e14f3..acf1b764fd92c 100644 --- a/src/test/ui/issues/issue-12470.rs +++ b/src/test/ui/issues/issue-12470.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] trait X { diff --git a/src/test/ui/issues/issue-12470.stderr b/src/test/ui/issues/issue-12470.stderr index 91788e9629789..59056aaca9022 100644 --- a/src/test/ui/issues/issue-12470.stderr +++ b/src/test/ui/issues/issue-12470.stderr @@ -1,5 +1,5 @@ error[E0597]: `*b` does not live long enough - --> $DIR/issue-12470.rs:38:19 + --> $DIR/issue-12470.rs:28:19 | LL | let bb: &B = &*b; //~ ERROR does not live long enough | ^^ borrowed value does not live long enough @@ -7,8 +7,8 @@ LL | make_a(bb) LL | } | - borrowed value only lives until here | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 36:16... - --> $DIR/issue-12470.rs:36:16 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 26:16... + --> $DIR/issue-12470.rs:26:16 | LL | fn make_make_a<'a>() -> A<'a> { | ^^ diff --git a/src/test/ui/issues/issue-12511.rs b/src/test/ui/issues/issue-12511.rs index 83359bf1675d9..ae6d9e1247665 100644 --- a/src/test/ui/issues/issue-12511.rs +++ b/src/test/ui/issues/issue-12511.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait t1 : t2 { //~^ ERROR cycle detected } diff --git a/src/test/ui/issues/issue-12511.stderr b/src/test/ui/issues/issue-12511.stderr index 1a48e6a6de1c6..d0d7626d1375c 100644 --- a/src/test/ui/issues/issue-12511.stderr +++ b/src/test/ui/issues/issue-12511.stderr @@ -1,11 +1,11 @@ error[E0391]: cycle detected when computing the supertraits of `t1` - --> $DIR/issue-12511.rs:11:1 + --> $DIR/issue-12511.rs:1:1 | LL | trait t1 : t2 { | ^^^^^^^^^^^^^ | note: ...which requires computing the supertraits of `t2`... - --> $DIR/issue-12511.rs:15:1 + --> $DIR/issue-12511.rs:5:1 | LL | trait t2 : t1 { | ^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-12552.rs b/src/test/ui/issues/issue-12552.rs index e4788bac256e2..b7f71dd1ce354 100644 --- a/src/test/ui/issues/issue-12552.rs +++ b/src/test/ui/issues/issue-12552.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // this code used to cause an ICE fn main() { diff --git a/src/test/ui/issues/issue-12552.stderr b/src/test/ui/issues/issue-12552.stderr index 9a3d5ef02c627..ca5efcdc4726a 100644 --- a/src/test/ui/issues/issue-12552.stderr +++ b/src/test/ui/issues/issue-12552.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-12552.rs:16:5 + --> $DIR/issue-12552.rs:6:5 | LL | Some(k) => match k { //~ ERROR mismatched types | ^^^^^^^ expected enum `std::result::Result`, found enum `std::option::Option` @@ -8,7 +8,7 @@ LL | Some(k) => match k { //~ ERROR mismatched types found type `std::option::Option<_>` error[E0308]: mismatched types - --> $DIR/issue-12552.rs:19:5 + --> $DIR/issue-12552.rs:9:5 | LL | None => () //~ ERROR mismatched types | ^^^^ expected enum `std::result::Result`, found enum `std::option::Option` diff --git a/src/test/ui/issues/issue-12567.nll.stderr b/src/test/ui/issues/issue-12567.nll.stderr index 72d21d47d86fa..17388df91d1f3 100644 --- a/src/test/ui/issues/issue-12567.nll.stderr +++ b/src/test/ui/issues/issue-12567.nll.stderr @@ -1,5 +1,5 @@ error[E0508]: cannot move out of type `[T]`, a non-copy slice - --> $DIR/issue-12567.rs:14:11 + --> $DIR/issue-12567.rs:4:11 | LL | match (l1, l2) { | ^^^^^^^^ cannot move out of here @@ -11,7 +11,7 @@ LL | (&[hd1, ..], &[hd2, ..]) | --- ...and here | note: move occurs because these variables have types that don't implement the `Copy` trait - --> $DIR/issue-12567.rs:16:17 + --> $DIR/issue-12567.rs:6:17 | LL | (&[], &[hd, ..]) | (&[hd, ..], &[]) | ^^ @@ -20,7 +20,7 @@ LL | (&[hd1, ..], &[hd2, ..]) | ^^^ error[E0508]: cannot move out of type `[T]`, a non-copy slice - --> $DIR/issue-12567.rs:14:11 + --> $DIR/issue-12567.rs:4:11 | LL | match (l1, l2) { | ^^^^^^^^ cannot move out of here @@ -32,7 +32,7 @@ LL | (&[hd1, ..], &[hd2, ..]) | --- ...and here | note: move occurs because these variables have types that don't implement the `Copy` trait - --> $DIR/issue-12567.rs:16:17 + --> $DIR/issue-12567.rs:6:17 | LL | (&[], &[hd, ..]) | (&[hd, ..], &[]) | ^^ diff --git a/src/test/ui/issues/issue-12567.rs b/src/test/ui/issues/issue-12567.rs index 30cdd07b39998..1e1debe31ce6d 100644 --- a/src/test/ui/issues/issue-12567.rs +++ b/src/test/ui/issues/issue-12567.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(slice_patterns)] fn match_vecs<'a, T>(l1: &'a [T], l2: &'a [T]) { diff --git a/src/test/ui/issues/issue-12567.stderr b/src/test/ui/issues/issue-12567.stderr index 60acffdcb06f8..15f723f1cee0f 100644 --- a/src/test/ui/issues/issue-12567.stderr +++ b/src/test/ui/issues/issue-12567.stderr @@ -1,5 +1,5 @@ error[E0508]: cannot move out of type `[T]`, a non-copy slice - --> $DIR/issue-12567.rs:16:16 + --> $DIR/issue-12567.rs:6:16 | LL | (&[], &[hd, ..]) | (&[hd, ..], &[]) | ^--^^^^^ @@ -8,7 +8,7 @@ LL | (&[], &[hd, ..]) | (&[hd, ..], &[]) | cannot move out of here error[E0508]: cannot move out of type `[T]`, a non-copy slice - --> $DIR/issue-12567.rs:16:30 + --> $DIR/issue-12567.rs:6:30 | LL | (&[], &[hd, ..]) | (&[hd, ..], &[]) | ^--^^^^^ @@ -17,7 +17,7 @@ LL | (&[], &[hd, ..]) | (&[hd, ..], &[]) | cannot move out of here error[E0508]: cannot move out of type `[T]`, a non-copy slice - --> $DIR/issue-12567.rs:20:11 + --> $DIR/issue-12567.rs:10:11 | LL | (&[hd1, ..], &[hd2, ..]) | ^---^^^^^ @@ -26,7 +26,7 @@ LL | (&[hd1, ..], &[hd2, ..]) | cannot move out of here error[E0508]: cannot move out of type `[T]`, a non-copy slice - --> $DIR/issue-12567.rs:20:23 + --> $DIR/issue-12567.rs:10:23 | LL | (&[hd1, ..], &[hd2, ..]) | ^---^^^^^ diff --git a/src/test/ui/issues/issue-12796.rs b/src/test/ui/issues/issue-12796.rs index 0c3c82a99f28f..acd4584c73700 100644 --- a/src/test/ui/issues/issue-12796.rs +++ b/src/test/ui/issues/issue-12796.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Trait { fn outer(&self) { fn inner(_: &Self) { diff --git a/src/test/ui/issues/issue-12796.stderr b/src/test/ui/issues/issue-12796.stderr index c8bedd3853c68..58b4d9218bde0 100644 --- a/src/test/ui/issues/issue-12796.stderr +++ b/src/test/ui/issues/issue-12796.stderr @@ -1,5 +1,5 @@ error[E0401]: can't use type parameters from outer function - --> $DIR/issue-12796.rs:13:22 + --> $DIR/issue-12796.rs:3:22 | LL | fn inner(_: &Self) { | ----- ^^^^ use of type variable from outer function diff --git a/src/test/ui/issues/issue-12863.rs b/src/test/ui/issues/issue-12863.rs index d3432410c5427..d7941a70d51fd 100644 --- a/src/test/ui/issues/issue-12863.rs +++ b/src/test/ui/issues/issue-12863.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod foo { pub fn bar() {} } fn main() { diff --git a/src/test/ui/issues/issue-12863.stderr b/src/test/ui/issues/issue-12863.stderr index eb2957a822593..3f1a6bf598de7 100644 --- a/src/test/ui/issues/issue-12863.stderr +++ b/src/test/ui/issues/issue-12863.stderr @@ -1,5 +1,5 @@ error[E0532]: expected unit struct/variant or constant, found function `foo::bar` - --> $DIR/issue-12863.rs:15:9 + --> $DIR/issue-12863.rs:5:9 | LL | foo::bar => {} //~ ERROR expected unit struct/variant or constant, found function `foo::bar` | ^^^^^^^^ not a unit struct/variant or constant diff --git a/src/test/ui/issues/issue-12997-1.rs b/src/test/ui/issues/issue-12997-1.rs index 2d8d7857c99fb..d00980e72f565 100644 --- a/src/test/ui/issues/issue-12997-1.rs +++ b/src/test/ui/issues/issue-12997-1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --test //! Test that makes sure wrongly-typed bench functions aren't ignored diff --git a/src/test/ui/issues/issue-12997-1.stderr b/src/test/ui/issues/issue-12997-1.stderr index 856538417d914..050e753dd1a4c 100644 --- a/src/test/ui/issues/issue-12997-1.stderr +++ b/src/test/ui/issues/issue-12997-1.stderr @@ -1,11 +1,11 @@ error: functions used as benches must have signature `fn(&mut Bencher) -> impl Termination` - --> $DIR/issue-12997-1.rs:16:1 + --> $DIR/issue-12997-1.rs:6:1 | LL | fn foo() { } //~ ERROR functions used as benches | ^^^^^^^^^^^^ error: functions used as benches must have signature `fn(&mut Bencher) -> impl Termination` - --> $DIR/issue-12997-1.rs:19:1 + --> $DIR/issue-12997-1.rs:9:1 | LL | fn bar(x: isize, y: isize) { } //~ ERROR functions used as benches | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-12997-2.rs b/src/test/ui/issues/issue-12997-2.rs index 8d3df68577bab..8bf1a375bb45f 100644 --- a/src/test/ui/issues/issue-12997-2.rs +++ b/src/test/ui/issues/issue-12997-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --test //! Test that makes sure wrongly-typed bench functions are rejected diff --git a/src/test/ui/issues/issue-12997-2.stderr b/src/test/ui/issues/issue-12997-2.stderr index 3030ee4779b4b..d4e5599539cc9 100644 --- a/src/test/ui/issues/issue-12997-2.stderr +++ b/src/test/ui/issues/issue-12997-2.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-12997-2.rs:16:1 + --> $DIR/issue-12997-2.rs:6:1 | LL | fn bar(x: isize) { } | ^^^^^^^^^^^^^^^^^^^^ expected isize, found mutable reference diff --git a/src/test/ui/issues/issue-13033.rs b/src/test/ui/issues/issue-13033.rs index f1fd617717a5e..a6c9e9712c050 100644 --- a/src/test/ui/issues/issue-13033.rs +++ b/src/test/ui/issues/issue-13033.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn bar(&mut self, other: &mut Foo); } diff --git a/src/test/ui/issues/issue-13033.stderr b/src/test/ui/issues/issue-13033.stderr index f06d7360d85b0..d1e8eb31c8834 100644 --- a/src/test/ui/issues/issue-13033.stderr +++ b/src/test/ui/issues/issue-13033.stderr @@ -1,5 +1,5 @@ error[E0053]: method `bar` has an incompatible type for trait - --> $DIR/issue-13033.rs:18:30 + --> $DIR/issue-13033.rs:8:30 | LL | fn bar(&mut self, other: &mut Foo); | -------- type in trait diff --git a/src/test/ui/issues/issue-13058.nll.stderr b/src/test/ui/issues/issue-13058.nll.stderr index 146385f3de2d8..fa5393f3d2259 100644 --- a/src/test/ui/issues/issue-13058.nll.stderr +++ b/src/test/ui/issues/issue-13058.nll.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/issue-13058.rs:24:21 + --> $DIR/issue-13058.rs:14:21 | LL | let cont_iter = cont.iter(); | ^^^^ warning: not reporting region error due to nll - --> $DIR/issue-13058.rs:24:26 + --> $DIR/issue-13058.rs:14:26 | LL | let cont_iter = cont.iter(); | ^^^^ error[E0308]: mismatched types - --> $DIR/issue-13058.rs:36:11 + --> $DIR/issue-13058.rs:26:11 | LL | check((3, 5)); | ^^^^^^ diff --git a/src/test/ui/issues/issue-13058.rs b/src/test/ui/issues/issue-13058.rs index dbcf9998ad937..7b69ae0aad5a3 100644 --- a/src/test/ui/issues/issue-13058.rs +++ b/src/test/ui/issues/issue-13058.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::Range; trait Itble<'r, T, I: Iterator> { fn iter(&'r self) -> I; } diff --git a/src/test/ui/issues/issue-13058.stderr b/src/test/ui/issues/issue-13058.stderr index 5e8319d26ad3c..2c5c19680e034 100644 --- a/src/test/ui/issues/issue-13058.stderr +++ b/src/test/ui/issues/issue-13058.stderr @@ -1,5 +1,5 @@ error[E0621]: explicit lifetime required in the type of `cont` - --> $DIR/issue-13058.rs:24:26 + --> $DIR/issue-13058.rs:14:26 | LL | fn check<'r, I: Iterator, T: Itble<'r, usize, I>>(cont: &T) -> bool | -- help: add explicit lifetime `'r` to the type of `cont`: `&'r T` @@ -8,7 +8,7 @@ LL | let cont_iter = cont.iter(); | ^^^^ lifetime `'r` required error[E0308]: mismatched types - --> $DIR/issue-13058.rs:36:11 + --> $DIR/issue-13058.rs:26:11 | LL | check((3, 5)); | ^^^^^^ diff --git a/src/test/ui/issues/issue-13352.rs b/src/test/ui/issues/issue-13352.rs index e9d76c758cdb7..c711e3b713f29 100644 --- a/src/test/ui/issues/issue-13352.rs +++ b/src/test/ui/issues/issue-13352.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-cloudabi no std::process fn foo(_: Box) {} diff --git a/src/test/ui/issues/issue-13352.stderr b/src/test/ui/issues/issue-13352.stderr index 5324eb2118617..58ac74be3e3b7 100644 --- a/src/test/ui/issues/issue-13352.stderr +++ b/src/test/ui/issues/issue-13352.stderr @@ -1,5 +1,5 @@ error[E0277]: cannot add `()` to `usize` - --> $DIR/issue-13352.rs:19:13 + --> $DIR/issue-13352.rs:9:13 | LL | 2_usize + (loop {}); | ^ no implementation for `usize + ()` diff --git a/src/test/ui/issues/issue-13359.rs b/src/test/ui/issues/issue-13359.rs index e33859e8c19a3..7409426dc39b0 100644 --- a/src/test/ui/issues/issue-13359.rs +++ b/src/test/ui/issues/issue-13359.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo(_s: i16) { } fn bar(_s: u32) { } diff --git a/src/test/ui/issues/issue-13359.stderr b/src/test/ui/issues/issue-13359.stderr index 77f10be982b01..00b7fbd456490 100644 --- a/src/test/ui/issues/issue-13359.stderr +++ b/src/test/ui/issues/issue-13359.stderr @@ -1,11 +1,11 @@ error[E0308]: mismatched types - --> $DIR/issue-13359.rs:16:9 + --> $DIR/issue-13359.rs:6:9 | LL | foo(1*(1 as isize)); | ^^^^^^^^^^^^^^ expected i16, found isize error[E0308]: mismatched types - --> $DIR/issue-13359.rs:20:9 + --> $DIR/issue-13359.rs:10:9 | LL | bar(1*(1 as usize)); | ^^^^^^^^^^^^^^ expected u32, found usize diff --git a/src/test/ui/issues/issue-13404.rs b/src/test/ui/issues/issue-13404.rs index 0059e92e07f07..c5af827d50c4e 100644 --- a/src/test/ui/issues/issue-13404.rs +++ b/src/test/ui/issues/issue-13404.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use a::f; use b::f; //~ ERROR: unresolved import `b::f` [E0432] //~^ no `f` in `b` diff --git a/src/test/ui/issues/issue-13404.stderr b/src/test/ui/issues/issue-13404.stderr index b71d3ceab5b3b..45cddffef710e 100644 --- a/src/test/ui/issues/issue-13404.stderr +++ b/src/test/ui/issues/issue-13404.stderr @@ -1,5 +1,5 @@ error[E0432]: unresolved import `b::f` - --> $DIR/issue-13404.rs:12:5 + --> $DIR/issue-13404.rs:2:5 | LL | use b::f; //~ ERROR: unresolved import `b::f` [E0432] | ^^^^ no `f` in `b` diff --git a/src/test/ui/issues/issue-13407.rs b/src/test/ui/issues/issue-13407.rs index afb2e867f45c6..322e67cc13180 100644 --- a/src/test/ui/issues/issue-13407.rs +++ b/src/test/ui/issues/issue-13407.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod A { struct C; } diff --git a/src/test/ui/issues/issue-13407.stderr b/src/test/ui/issues/issue-13407.stderr index e5ef50e984a76..1c35e341ac014 100644 --- a/src/test/ui/issues/issue-13407.stderr +++ b/src/test/ui/issues/issue-13407.stderr @@ -1,11 +1,11 @@ error[E0603]: unit struct `C` is private - --> $DIR/issue-13407.rs:16:5 + --> $DIR/issue-13407.rs:6:5 | LL | A::C = 1; | ^^^^ error[E0308]: mismatched types - --> $DIR/issue-13407.rs:16:12 + --> $DIR/issue-13407.rs:6:12 | LL | A::C = 1; | ^ expected struct `A::C`, found integral variable @@ -14,7 +14,7 @@ LL | A::C = 1; found type `{integer}` error[E0070]: invalid left-hand side expression - --> $DIR/issue-13407.rs:16:5 + --> $DIR/issue-13407.rs:6:5 | LL | A::C = 1; | ^^^^^^^^ left-hand of expression not valid diff --git a/src/test/ui/issues/issue-13446.rs b/src/test/ui/issues/issue-13446.rs index 6607e1903b632..9f1fc42774fb2 100644 --- a/src/test/ui/issues/issue-13446.rs +++ b/src/test/ui/issues/issue-13446.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - // Used to cause ICE static VEC: [u32; 256] = vec![]; diff --git a/src/test/ui/issues/issue-13446.stderr b/src/test/ui/issues/issue-13446.stderr index 110bb4b83db46..a27bfeda64c26 100644 --- a/src/test/ui/issues/issue-13446.stderr +++ b/src/test/ui/issues/issue-13446.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-13446.rs:14:26 + --> $DIR/issue-13446.rs:3:26 | LL | static VEC: [u32; 256] = vec![]; | ^^^^^^ expected array of 256 elements, found struct `std::vec::Vec` diff --git a/src/test/ui/issues/issue-13466.rs b/src/test/ui/issues/issue-13466.rs index abddf6ba7a38d..c285bfa107d4c 100644 --- a/src/test/ui/issues/issue-13466.rs +++ b/src/test/ui/issues/issue-13466.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #13466 pub fn main() { diff --git a/src/test/ui/issues/issue-13466.stderr b/src/test/ui/issues/issue-13466.stderr index be845fb8e2285..2f60070337b77 100644 --- a/src/test/ui/issues/issue-13466.stderr +++ b/src/test/ui/issues/issue-13466.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-13466.rs:18:9 + --> $DIR/issue-13466.rs:8:9 | LL | Ok(u) => u, | ^^^^^ expected enum `std::option::Option`, found enum `std::result::Result` @@ -8,7 +8,7 @@ LL | Ok(u) => u, found type `std::result::Result<_, _>` error[E0308]: mismatched types - --> $DIR/issue-13466.rs:24:9 + --> $DIR/issue-13466.rs:14:9 | LL | Err(e) => panic!(e) | ^^^^^^ expected enum `std::option::Option`, found enum `std::result::Result` diff --git a/src/test/ui/issues/issue-13482-2.rs b/src/test/ui/issues/issue-13482-2.rs index fe7fbb176cc5e..bbcb954afcc8c 100644 --- a/src/test/ui/issues/issue-13482-2.rs +++ b/src/test/ui/issues/issue-13482-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags:-Z verbose fn main() { diff --git a/src/test/ui/issues/issue-13482-2.stderr b/src/test/ui/issues/issue-13482-2.stderr index 1ecae3b867a11..0c036f1d0e68b 100644 --- a/src/test/ui/issues/issue-13482-2.stderr +++ b/src/test/ui/issues/issue-13482-2.stderr @@ -1,5 +1,5 @@ error[E0527]: pattern requires 0 elements but array has 2 - --> $DIR/issue-13482-2.rs:16:9 + --> $DIR/issue-13482-2.rs:6:9 | LL | [] => None, //~ ERROR pattern requires 0 elements but array has 2 | ^^ expected 2 elements diff --git a/src/test/ui/issues/issue-13482.rs b/src/test/ui/issues/issue-13482.rs index 32a63b79a32dd..244b3237e023c 100644 --- a/src/test/ui/issues/issue-13482.rs +++ b/src/test/ui/issues/issue-13482.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = [1,2]; let y = match x { diff --git a/src/test/ui/issues/issue-13482.stderr b/src/test/ui/issues/issue-13482.stderr index 95273bb46bca3..5776dedf0a2cf 100644 --- a/src/test/ui/issues/issue-13482.stderr +++ b/src/test/ui/issues/issue-13482.stderr @@ -1,5 +1,5 @@ error[E0527]: pattern requires 0 elements but array has 2 - --> $DIR/issue-13482.rs:14:5 + --> $DIR/issue-13482.rs:4:5 | LL | [] => None, //~ ERROR pattern requires 0 elements but array has 2 | ^^ expected 2 elements diff --git a/src/test/ui/issues/issue-13483.rs b/src/test/ui/issues/issue-13483.rs index c44465b221cdc..cb53523b3b04d 100644 --- a/src/test/ui/issues/issue-13483.rs +++ b/src/test/ui/issues/issue-13483.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { if true { } else if { //~ ERROR missing condition diff --git a/src/test/ui/issues/issue-13483.stderr b/src/test/ui/issues/issue-13483.stderr index afcb8b8da17b6..1ab67d285c0de 100644 --- a/src/test/ui/issues/issue-13483.stderr +++ b/src/test/ui/issues/issue-13483.stderr @@ -1,11 +1,11 @@ error: missing condition for `if` statemement - --> $DIR/issue-13483.rs:13:14 + --> $DIR/issue-13483.rs:3:14 | LL | } else if { //~ ERROR missing condition | ^ expected if condition here error: missing condition for `if` statemement - --> $DIR/issue-13483.rs:20:14 + --> $DIR/issue-13483.rs:10:14 | LL | } else if { //~ ERROR missing condition | ^ expected if condition here diff --git a/src/test/ui/issues/issue-13497-2.nll.stderr b/src/test/ui/issues/issue-13497-2.nll.stderr index 5c592f6f37523..77b920689d957 100644 --- a/src/test/ui/issues/issue-13497-2.nll.stderr +++ b/src/test/ui/issues/issue-13497-2.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `rawLines` does not live long enough - --> $DIR/issue-13497-2.rs:13:5 + --> $DIR/issue-13497-2.rs:3:5 | LL | rawLines //~ ERROR `rawLines` does not live long enough | ^^^^^^^^ borrowed value does not live long enough @@ -7,8 +7,8 @@ LL | .iter().map(|l| l.trim()).collect() LL | } | - `rawLines` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 11:24... - --> $DIR/issue-13497-2.rs:11:24 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 1:24... + --> $DIR/issue-13497-2.rs:1:24 | LL | fn read_lines_borrowed<'a>() -> Vec<&'a str> { | ^^ diff --git a/src/test/ui/issues/issue-13497-2.rs b/src/test/ui/issues/issue-13497-2.rs index 31716837493c7..a39ae4f1cf33b 100644 --- a/src/test/ui/issues/issue-13497-2.rs +++ b/src/test/ui/issues/issue-13497-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn read_lines_borrowed<'a>() -> Vec<&'a str> { let rawLines: Vec = vec!["foo ".to_string(), " bar".to_string()]; rawLines //~ ERROR `rawLines` does not live long enough diff --git a/src/test/ui/issues/issue-13497-2.stderr b/src/test/ui/issues/issue-13497-2.stderr index 72770f8c84ce7..c91ab789fe8a8 100644 --- a/src/test/ui/issues/issue-13497-2.stderr +++ b/src/test/ui/issues/issue-13497-2.stderr @@ -1,5 +1,5 @@ error[E0597]: `rawLines` does not live long enough - --> $DIR/issue-13497-2.rs:13:5 + --> $DIR/issue-13497-2.rs:3:5 | LL | rawLines //~ ERROR `rawLines` does not live long enough | ^^^^^^^^ borrowed value does not live long enough @@ -7,8 +7,8 @@ LL | .iter().map(|l| l.trim()).collect() LL | } | - borrowed value only lives until here | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 11:24... - --> $DIR/issue-13497-2.rs:11:24 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 1:24... + --> $DIR/issue-13497-2.rs:1:24 | LL | fn read_lines_borrowed<'a>() -> Vec<&'a str> { | ^^ diff --git a/src/test/ui/issues/issue-13497.rs b/src/test/ui/issues/issue-13497.rs index d544a92d9c3b5..4b2795aa841e8 100644 --- a/src/test/ui/issues/issue-13497.rs +++ b/src/test/ui/issues/issue-13497.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn read_lines_borrowed1() -> Vec< &str //~ ERROR missing lifetime specifier > { diff --git a/src/test/ui/issues/issue-13497.stderr b/src/test/ui/issues/issue-13497.stderr index ab6d041bd48d7..954af341314e5 100644 --- a/src/test/ui/issues/issue-13497.stderr +++ b/src/test/ui/issues/issue-13497.stderr @@ -1,5 +1,5 @@ error[E0106]: missing lifetime specifier - --> $DIR/issue-13497.rs:12:5 + --> $DIR/issue-13497.rs:2:5 | LL | &str //~ ERROR missing lifetime specifier | ^ expected lifetime parameter diff --git a/src/test/ui/issues/issue-1362.rs b/src/test/ui/issues/issue-1362.rs index d51db4795998b..6fd43f50e4dc8 100644 --- a/src/test/ui/issues/issue-1362.rs +++ b/src/test/ui/issues/issue-1362.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #1362 - without that fix the span will be bogus // no-reformat fn main() { diff --git a/src/test/ui/issues/issue-1362.stderr b/src/test/ui/issues/issue-1362.stderr index c19e256eb9283..dd97e0cf04a99 100644 --- a/src/test/ui/issues/issue-1362.stderr +++ b/src/test/ui/issues/issue-1362.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-1362.rs:14:16 + --> $DIR/issue-1362.rs:4:16 | LL | let x: u32 = 20i32; //~ ERROR mismatched types | ^^^^^ expected u32, found i32 diff --git a/src/test/ui/issues/issue-13641.rs b/src/test/ui/issues/issue-13641.rs index 3b690e08f6143..198cea4289cfc 100644 --- a/src/test/ui/issues/issue-13641.rs +++ b/src/test/ui/issues/issue-13641.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod a { struct Foo; impl Foo { pub fn new() {} } diff --git a/src/test/ui/issues/issue-13641.stderr b/src/test/ui/issues/issue-13641.stderr index 0f96b5f66b1b8..6e16232fadd81 100644 --- a/src/test/ui/issues/issue-13641.stderr +++ b/src/test/ui/issues/issue-13641.stderr @@ -1,11 +1,11 @@ error[E0603]: struct `Foo` is private - --> $DIR/issue-13641.rs:19:5 + --> $DIR/issue-13641.rs:9:5 | LL | a::Foo::new(); | ^^^^^^^^^^^ error[E0603]: enum `Bar` is private - --> $DIR/issue-13641.rs:21:5 + --> $DIR/issue-13641.rs:11:5 | LL | a::Bar::new(); | ^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-13727.rs b/src/test/ui/issues/issue-13727.rs index 2e815548e8913..7fb565ef3bf33 100644 --- a/src/test/ui/issues/issue-13727.rs +++ b/src/test/ui/issues/issue-13727.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(overflowing_literals)] #![deny(unreachable_patterns)] diff --git a/src/test/ui/issues/issue-13727.stderr b/src/test/ui/issues/issue-13727.stderr index 47b9a0211a967..0c2ce9f8b488e 100644 --- a/src/test/ui/issues/issue-13727.stderr +++ b/src/test/ui/issues/issue-13727.stderr @@ -1,11 +1,11 @@ error: unreachable pattern - --> $DIR/issue-13727.rs:17:5 + --> $DIR/issue-13727.rs:7:5 | LL | 512 => print!("0b1111/n"), | ^^^ | note: lint level defined here - --> $DIR/issue-13727.rs:12:9 + --> $DIR/issue-13727.rs:2:9 | LL | #![deny(unreachable_patterns)] | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-13847.rs b/src/test/ui/issues/issue-13847.rs index 0314f109a7c81..06a0304ae4975 100644 --- a/src/test/ui/issues/issue-13847.rs +++ b/src/test/ui/issues/issue-13847.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { return.is_failure //~ ERROR no field `is_failure` on type `!` } diff --git a/src/test/ui/issues/issue-13847.stderr b/src/test/ui/issues/issue-13847.stderr index fad3245034d06..9199199d7305a 100644 --- a/src/test/ui/issues/issue-13847.stderr +++ b/src/test/ui/issues/issue-13847.stderr @@ -1,5 +1,5 @@ error[E0609]: no field `is_failure` on type `!` - --> $DIR/issue-13847.rs:12:12 + --> $DIR/issue-13847.rs:2:12 | LL | return.is_failure //~ ERROR no field `is_failure` on type `!` | ^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-13853-2.rs b/src/test/ui/issues/issue-13853-2.rs index 1635a8f69a6cd..b58f2bd3b3b7c 100644 --- a/src/test/ui/issues/issue-13853-2.rs +++ b/src/test/ui/issues/issue-13853-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait FromStructReader<'a> { } trait ResponseHook { fn get(&self); diff --git a/src/test/ui/issues/issue-13853-2.stderr b/src/test/ui/issues/issue-13853-2.stderr index c15290fb1d957..522042d3a6551 100644 --- a/src/test/ui/issues/issue-13853-2.stderr +++ b/src/test/ui/issues/issue-13853-2.stderr @@ -1,5 +1,5 @@ error[E0615]: attempted to take value of method `get` on type `std::boxed::Box<(dyn ResponseHook + 'static)>` - --> $DIR/issue-13853-2.rs:15:39 + --> $DIR/issue-13853-2.rs:5:39 | LL | fn foo(res : Box) { res.get } //~ ERROR attempted to take value of method | ^^^ diff --git a/src/test/ui/issues/issue-13853-5.rs b/src/test/ui/issues/issue-13853-5.rs index 78b079a7c44a4..2afdf95aacf42 100644 --- a/src/test/ui/issues/issue-13853-5.rs +++ b/src/test/ui/issues/issue-13853-5.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Deserializer<'a> { } trait Deserializable { diff --git a/src/test/ui/issues/issue-13853-5.stderr b/src/test/ui/issues/issue-13853-5.stderr index e93b03b43ee66..3d8f824ec94cb 100644 --- a/src/test/ui/issues/issue-13853-5.stderr +++ b/src/test/ui/issues/issue-13853-5.stderr @@ -1,5 +1,5 @@ error[E0207]: the type parameter `T` is not constrained by the impl trait, self type, or predicates - --> $DIR/issue-13853-5.rs:17:10 + --> $DIR/issue-13853-5.rs:7:10 | LL | impl<'a, T: Deserializable> Deserializable for &'a str { | ^ unconstrained type parameter diff --git a/src/test/ui/issues/issue-13853.rs b/src/test/ui/issues/issue-13853.rs index 86a6bdfd4dde4..ac9886d2e7249 100644 --- a/src/test/ui/issues/issue-13853.rs +++ b/src/test/ui/issues/issue-13853.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Node { fn zomg(); } diff --git a/src/test/ui/issues/issue-13853.stderr b/src/test/ui/issues/issue-13853.stderr index 188bfd5930105..6da5da04fb165 100644 --- a/src/test/ui/issues/issue-13853.stderr +++ b/src/test/ui/issues/issue-13853.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-13853.rs:24:9 + --> $DIR/issue-13853.rs:14:9 | LL | fn nodes<'a, I: Iterator>(&self) -> I | - expected `I` because of return type @@ -11,13 +11,13 @@ LL | self.iter() //~ ERROR mismatched types found type `std::slice::Iter<'_, N>` error[E0599]: no method named `iter` found for type `&G` in the current scope - --> $DIR/issue-13853.rs:37:23 + --> $DIR/issue-13853.rs:27:23 | LL | for node in graph.iter() { //~ ERROR no method named `iter` found | ^^^^ error[E0308]: mismatched types - --> $DIR/issue-13853.rs:47:13 + --> $DIR/issue-13853.rs:37:13 | LL | iterate(graph); //~ ERROR mismatched types | ^^^^^ diff --git a/src/test/ui/issues/issue-14091-2.rs b/src/test/ui/issues/issue-14091-2.rs index a4351733a876e..e2f6b18337266 100644 --- a/src/test/ui/issues/issue-14091-2.rs +++ b/src/test/ui/issues/issue-14091-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // // Very diff --git a/src/test/ui/issues/issue-14091-2.stderr b/src/test/ui/issues/issue-14091-2.stderr index ccabd801c85da..2d6e9567d265d 100644 --- a/src/test/ui/issues/issue-14091-2.stderr +++ b/src/test/ui/issues/issue-14091-2.stderr @@ -1,5 +1,5 @@ error[E0600]: cannot apply unary operator `!` to type `BytePos` - --> $DIR/issue-14091-2.rs:25:5 + --> $DIR/issue-14091-2.rs:15:5 | LL | assert!(x, x); | ^^^^^^^^^^^^^^ cannot apply unary operator `!` diff --git a/src/test/ui/issues/issue-14091.rs b/src/test/ui/issues/issue-14091.rs index 9e436b8e629dd..0ee20de9053dc 100644 --- a/src/test/ui/issues/issue-14091.rs +++ b/src/test/ui/issues/issue-14091.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main(){ assert!(1,1); //~^ ERROR mismatched types diff --git a/src/test/ui/issues/issue-14091.stderr b/src/test/ui/issues/issue-14091.stderr index 9db2a0e2a86f5..c7616e5ab4f41 100644 --- a/src/test/ui/issues/issue-14091.stderr +++ b/src/test/ui/issues/issue-14091.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-14091.rs:12:5 + --> $DIR/issue-14091.rs:2:5 | LL | assert!(1,1); | ^^^^^^^^^^^^^ expected bool, found integral variable diff --git a/src/test/ui/issues/issue-14092.rs b/src/test/ui/issues/issue-14092.rs index 449de26769ff3..a93a739c9b21a 100644 --- a/src/test/ui/issues/issue-14092.rs +++ b/src/test/ui/issues/issue-14092.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn fn1(0: Box) {} //~^ ERROR wrong number of type arguments: expected 1, found 0 [E0243] diff --git a/src/test/ui/issues/issue-14092.stderr b/src/test/ui/issues/issue-14092.stderr index f90ea4776ab7c..959ce677a5858 100644 --- a/src/test/ui/issues/issue-14092.stderr +++ b/src/test/ui/issues/issue-14092.stderr @@ -1,5 +1,5 @@ error[E0243]: wrong number of type arguments: expected 1, found 0 - --> $DIR/issue-14092.rs:11:11 + --> $DIR/issue-14092.rs:1:11 | LL | fn fn1(0: Box) {} | ^^^ expected 1 type argument diff --git a/src/test/ui/issues/issue-14221.rs b/src/test/ui/issues/issue-14221.rs index d11fe99c07f6b..282c411136922 100644 --- a/src/test/ui/issues/issue-14221.rs +++ b/src/test/ui/issues/issue-14221.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(unreachable_patterns)] #![allow(unused_variables)] #![allow(non_snake_case)] diff --git a/src/test/ui/issues/issue-14221.stderr b/src/test/ui/issues/issue-14221.stderr index 9252a4f304f25..bf12480a5d374 100644 --- a/src/test/ui/issues/issue-14221.stderr +++ b/src/test/ui/issues/issue-14221.stderr @@ -1,17 +1,17 @@ warning[E0170]: pattern binding `A` is named the same as one of the variants of the type `E` - --> $DIR/issue-14221.rs:23:13 + --> $DIR/issue-14221.rs:13:13 | LL | A => "A", | ^ help: to match on the variant, qualify the path: `E::A` warning[E0170]: pattern binding `B` is named the same as one of the variants of the type `E` - --> $DIR/issue-14221.rs:25:13 + --> $DIR/issue-14221.rs:15:13 | LL | B => "B", //~ ERROR: unreachable pattern | ^ help: to match on the variant, qualify the path: `E::B` error: unreachable pattern - --> $DIR/issue-14221.rs:25:13 + --> $DIR/issue-14221.rs:15:13 | LL | A => "A", | - matches any value @@ -20,7 +20,7 @@ LL | B => "B", //~ ERROR: unreachable pattern | ^ unreachable pattern | note: lint level defined here - --> $DIR/issue-14221.rs:11:9 + --> $DIR/issue-14221.rs:1:9 | LL | #![deny(unreachable_patterns)] | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-14227.rs b/src/test/ui/issues/issue-14227.rs index 250e78ce24640..d85f88418049a 100644 --- a/src/test/ui/issues/issue-14227.rs +++ b/src/test/ui/issues/issue-14227.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(safe_extern_statics, warnings)] extern { diff --git a/src/test/ui/issues/issue-14227.stderr b/src/test/ui/issues/issue-14227.stderr index f5f39465b187b..a72849895ebcb 100644 --- a/src/test/ui/issues/issue-14227.stderr +++ b/src/test/ui/issues/issue-14227.stderr @@ -1,5 +1,5 @@ error[E0080]: could not evaluate static initializer - --> $DIR/issue-14227.rs:16:20 + --> $DIR/issue-14227.rs:6:20 | LL | static CRASH: () = symbol; | ^^^^^^ tried to read from foreign (extern) static diff --git a/src/test/ui/issues/issue-14285.nll.stderr b/src/test/ui/issues/issue-14285.nll.stderr index cf3e44f7874aa..c58ab84cf45b5 100644 --- a/src/test/ui/issues/issue-14285.nll.stderr +++ b/src/test/ui/issues/issue-14285.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/issue-14285.rs:22:7 + --> $DIR/issue-14285.rs:12:7 | LL | B(a) //~ ERROR 22:5: 22:9: explicit lifetime required in the type of `a` [E0621] | ^ error[E0621]: explicit lifetime required in the type of `a` - --> $DIR/issue-14285.rs:22:5 + --> $DIR/issue-14285.rs:12:5 | LL | fn foo<'a>(a: &Foo) -> B<'a> { | ---- help: add explicit lifetime `'a` to the type of `a`: `&'a (dyn Foo + 'a)` diff --git a/src/test/ui/issues/issue-14285.rs b/src/test/ui/issues/issue-14285.rs index dceecee6ca74b..e2ae4bc67567d 100644 --- a/src/test/ui/issues/issue-14285.rs +++ b/src/test/ui/issues/issue-14285.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn dummy(&self) { } } diff --git a/src/test/ui/issues/issue-14285.stderr b/src/test/ui/issues/issue-14285.stderr index 52163f81b7bf4..730f4a6eecf78 100644 --- a/src/test/ui/issues/issue-14285.stderr +++ b/src/test/ui/issues/issue-14285.stderr @@ -1,5 +1,5 @@ error[E0621]: explicit lifetime required in the type of `a` - --> $DIR/issue-14285.rs:22:5 + --> $DIR/issue-14285.rs:12:5 | LL | fn foo<'a>(a: &Foo) -> B<'a> { | ---- help: add explicit lifetime `'a` to the type of `a`: `&'a (dyn Foo + 'a)` diff --git a/src/test/ui/issues/issue-14309.rs b/src/test/ui/issues/issue-14309.rs index f76fa3e4a8ece..d0e532a264656 100644 --- a/src/test/ui/issues/issue-14309.rs +++ b/src/test/ui/issues/issue-14309.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(improper_ctypes)] #![allow(dead_code)] diff --git a/src/test/ui/issues/issue-14309.stderr b/src/test/ui/issues/issue-14309.stderr index e062c633ee6f1..b8d82aadd482f 100644 --- a/src/test/ui/issues/issue-14309.stderr +++ b/src/test/ui/issues/issue-14309.stderr @@ -1,17 +1,17 @@ error: `extern` block uses type `A` which is not FFI-safe: this struct has unspecified layout - --> $DIR/issue-14309.rs:40:15 + --> $DIR/issue-14309.rs:30:15 | LL | fn foo(x: A); //~ ERROR type `A` which is not FFI-safe | ^ | note: lint level defined here - --> $DIR/issue-14309.rs:11:9 + --> $DIR/issue-14309.rs:1:9 | LL | #![deny(improper_ctypes)] | ^^^^^^^^^^^^^^^ = help: consider adding a #[repr(C)] or #[repr(transparent)] attribute to this struct note: type defined here - --> $DIR/issue-14309.rs:14:1 + --> $DIR/issue-14309.rs:4:1 | LL | / struct A { LL | | x: i32 @@ -19,14 +19,14 @@ LL | | } | |_^ error: `extern` block uses type `A` which is not FFI-safe: this struct has unspecified layout - --> $DIR/issue-14309.rs:41:15 + --> $DIR/issue-14309.rs:31:15 | LL | fn bar(x: B); //~ ERROR type `A` | ^ | = help: consider adding a #[repr(C)] or #[repr(transparent)] attribute to this struct note: type defined here - --> $DIR/issue-14309.rs:14:1 + --> $DIR/issue-14309.rs:4:1 | LL | / struct A { LL | | x: i32 @@ -34,14 +34,14 @@ LL | | } | |_^ error: `extern` block uses type `A` which is not FFI-safe: this struct has unspecified layout - --> $DIR/issue-14309.rs:43:15 + --> $DIR/issue-14309.rs:33:15 | LL | fn qux(x: A2); //~ ERROR type `A` | ^^ | = help: consider adding a #[repr(C)] or #[repr(transparent)] attribute to this struct note: type defined here - --> $DIR/issue-14309.rs:14:1 + --> $DIR/issue-14309.rs:4:1 | LL | / struct A { LL | | x: i32 @@ -49,14 +49,14 @@ LL | | } | |_^ error: `extern` block uses type `A` which is not FFI-safe: this struct has unspecified layout - --> $DIR/issue-14309.rs:44:16 + --> $DIR/issue-14309.rs:34:16 | LL | fn quux(x: B2); //~ ERROR type `A` | ^^ | = help: consider adding a #[repr(C)] or #[repr(transparent)] attribute to this struct note: type defined here - --> $DIR/issue-14309.rs:14:1 + --> $DIR/issue-14309.rs:4:1 | LL | / struct A { LL | | x: i32 @@ -64,14 +64,14 @@ LL | | } | |_^ error: `extern` block uses type `A` which is not FFI-safe: this struct has unspecified layout - --> $DIR/issue-14309.rs:46:16 + --> $DIR/issue-14309.rs:36:16 | LL | fn fred(x: D); //~ ERROR type `A` | ^ | = help: consider adding a #[repr(C)] or #[repr(transparent)] attribute to this struct note: type defined here - --> $DIR/issue-14309.rs:14:1 + --> $DIR/issue-14309.rs:4:1 | LL | / struct A { LL | | x: i32 diff --git a/src/test/ui/issues/issue-14366.rs b/src/test/ui/issues/issue-14366.rs index 0b154d0a3ea88..a6298f25d470b 100644 --- a/src/test/ui/issues/issue-14366.rs +++ b/src/test/ui/issues/issue-14366.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let _x = "test" as &::std::any::Any; //~^ ERROR the size for values of type diff --git a/src/test/ui/issues/issue-14366.stderr b/src/test/ui/issues/issue-14366.stderr index 3c3ecd23bef6e..b93f5c2588256 100644 --- a/src/test/ui/issues/issue-14366.stderr +++ b/src/test/ui/issues/issue-14366.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `str` cannot be known at compilation time - --> $DIR/issue-14366.rs:12:14 + --> $DIR/issue-14366.rs:2:14 | LL | let _x = "test" as &::std::any::Any; | ^^^^^^ doesn't have a size known at compile-time diff --git a/src/test/ui/issues/issue-1448-2.rs b/src/test/ui/issues/issue-1448-2.rs index ddfed3647c2e0..829e81b9c24b5 100644 --- a/src/test/ui/issues/issue-1448-2.rs +++ b/src/test/ui/issues/issue-1448-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #1448 and #1386 fn foo(a: u32) -> u32 { a } diff --git a/src/test/ui/issues/issue-1448-2.stderr b/src/test/ui/issues/issue-1448-2.stderr index 5769b0c3b9fae..b06a6162712fc 100644 --- a/src/test/ui/issues/issue-1448-2.stderr +++ b/src/test/ui/issues/issue-1448-2.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-1448-2.rs:16:24 + --> $DIR/issue-1448-2.rs:6:24 | LL | println!("{}", foo(10i32)); //~ ERROR mismatched types | ^^^^^ expected u32, found i32 diff --git a/src/test/ui/issues/issue-14541.rs b/src/test/ui/issues/issue-14541.rs index 84c600d2201e3..af9e17ca5b2a7 100644 --- a/src/test/ui/issues/issue-14541.rs +++ b/src/test/ui/issues/issue-14541.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct vec2 { y: f32 } struct vec3 { y: f32, z: f32 } diff --git a/src/test/ui/issues/issue-14541.stderr b/src/test/ui/issues/issue-14541.stderr index fcff500cfda8e..41379c7f61073 100644 --- a/src/test/ui/issues/issue-14541.stderr +++ b/src/test/ui/issues/issue-14541.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-14541.rs:15:9 + --> $DIR/issue-14541.rs:5:9 | LL | let vec3 { y: _, z: _ } = v; | ^^^^^^^^^^^^^^^^^^^ expected struct `vec2`, found struct `vec3` diff --git a/src/test/ui/issues/issue-14721.rs b/src/test/ui/issues/issue-14721.rs index 58e8e10ee37ac..a5c47dd8cb3d6 100644 --- a/src/test/ui/issues/issue-14721.rs +++ b/src/test/ui/issues/issue-14721.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let foo = "str"; println!("{}", foo.desc); //~ no field `desc` on type `&str` diff --git a/src/test/ui/issues/issue-14721.stderr b/src/test/ui/issues/issue-14721.stderr index 93e51140caa0e..8029318419a62 100644 --- a/src/test/ui/issues/issue-14721.stderr +++ b/src/test/ui/issues/issue-14721.stderr @@ -1,5 +1,5 @@ error[E0609]: no field `desc` on type `&str` - --> $DIR/issue-14721.rs:13:24 + --> $DIR/issue-14721.rs:3:24 | LL | println!("{}", foo.desc); //~ no field `desc` on type `&str` | ^^^^ diff --git a/src/test/ui/issues/issue-1476.rs b/src/test/ui/issues/issue-1476.rs index 48bf71f5892b9..138570a93c498 100644 --- a/src/test/ui/issues/issue-1476.rs +++ b/src/test/ui/issues/issue-1476.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { println!("{}", x); //~ ERROR cannot find value `x` in this scope } diff --git a/src/test/ui/issues/issue-1476.stderr b/src/test/ui/issues/issue-1476.stderr index afdda3e15dad0..a0c0a8fb1f29e 100644 --- a/src/test/ui/issues/issue-1476.stderr +++ b/src/test/ui/issues/issue-1476.stderr @@ -1,5 +1,5 @@ error[E0425]: cannot find value `x` in this scope - --> $DIR/issue-1476.rs:12:20 + --> $DIR/issue-1476.rs:2:20 | LL | println!("{}", x); //~ ERROR cannot find value `x` in this scope | ^ not found in this scope diff --git a/src/test/ui/issues/issue-14772.rs b/src/test/ui/issues/issue-14772.rs index aaaad67be52dd..8f6745246fd1d 100644 --- a/src/test/ui/issues/issue-14772.rs +++ b/src/test/ui/issues/issue-14772.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --test #[test] diff --git a/src/test/ui/issues/issue-14772.stderr b/src/test/ui/issues/issue-14772.stderr index 1116cd38edf6a..a7448ad5b88d5 100644 --- a/src/test/ui/issues/issue-14772.stderr +++ b/src/test/ui/issues/issue-14772.stderr @@ -1,5 +1,5 @@ error: only functions may be used as tests - --> $DIR/issue-14772.rs:14:1 + --> $DIR/issue-14772.rs:4:1 | LL | mod foo {} //~ ERROR only functions may be used as tests | ^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-14845.rs b/src/test/ui/issues/issue-14845.rs index 74f0833e8d11c..d9b20e1f688ff 100644 --- a/src/test/ui/issues/issue-14845.rs +++ b/src/test/ui/issues/issue-14845.rs @@ -1,14 +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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct X { a: [u8; 1] } diff --git a/src/test/ui/issues/issue-14845.stderr b/src/test/ui/issues/issue-14845.stderr index a994026946eaf..94e7ac74ff0ce 100644 --- a/src/test/ui/issues/issue-14845.stderr +++ b/src/test/ui/issues/issue-14845.stderr @@ -1,11 +1,11 @@ error[E0606]: casting `&[u8; 1]` as `*mut u8` is invalid - --> $DIR/issue-14845.rs:18:14 + --> $DIR/issue-14845.rs:7:14 | LL | let _f = &x.a as *mut u8; //~ ERROR casting | ^^^^^^^^^^^^^^^ error[E0606]: casting `&[u8; 1]` as `*mut u8` is invalid - --> $DIR/issue-14845.rs:21:14 + --> $DIR/issue-14845.rs:10:14 | LL | let _v = &local as *mut u8; //~ ERROR casting | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-14853.rs b/src/test/ui/issues/issue-14853.rs index e4da3e4fa43e6..4ce6e3174d0af 100644 --- a/src/test/ui/issues/issue-14853.rs +++ b/src/test/ui/issues/issue-14853.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt::Debug; trait Str {} diff --git a/src/test/ui/issues/issue-14853.stderr b/src/test/ui/issues/issue-14853.stderr index 6c2f6bb9c6978..6fc1055049261 100644 --- a/src/test/ui/issues/issue-14853.stderr +++ b/src/test/ui/issues/issue-14853.stderr @@ -1,5 +1,5 @@ error[E0276]: impl has stricter requirements than trait - --> $DIR/issue-14853.rs:22:5 + --> $DIR/issue-14853.rs:12:5 | LL | fn yay(_: Option, thing: &[T]); | ----------------------------------------------- definition of `yay` from trait diff --git a/src/test/ui/issues/issue-14915.rs b/src/test/ui/issues/issue-14915.rs index 810d6656a8f62..294533f0cbb75 100644 --- a/src/test/ui/issues/issue-14915.rs +++ b/src/test/ui/issues/issue-14915.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] fn main() { diff --git a/src/test/ui/issues/issue-14915.stderr b/src/test/ui/issues/issue-14915.stderr index aa418f5df867a..411d7a3455238 100644 --- a/src/test/ui/issues/issue-14915.stderr +++ b/src/test/ui/issues/issue-14915.stderr @@ -1,5 +1,5 @@ error[E0369]: binary operation `+` cannot be applied to type `std::boxed::Box` - --> $DIR/issue-14915.rs:16:20 + --> $DIR/issue-14915.rs:6:20 | LL | println!("{}", x + 1); | ^^^^^ diff --git a/src/test/ui/issues/issue-15034.nll.stderr b/src/test/ui/issues/issue-15034.nll.stderr index 8dd18fa0cab89..113a2eb5a109f 100644 --- a/src/test/ui/issues/issue-15034.nll.stderr +++ b/src/test/ui/issues/issue-15034.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/issue-15034.rs:27:9 + --> $DIR/issue-15034.rs:17:9 | LL | Parser { lexer: lexer } | ^^^^^^ error[E0621]: explicit lifetime required in the type of `lexer` - --> $DIR/issue-15034.rs:27:9 + --> $DIR/issue-15034.rs:17:9 | LL | pub fn new(lexer: &'a mut Lexer) -> Parser<'a> { | ------------- help: add explicit lifetime `'a` to the type of `lexer`: `&'a mut Lexer<'a>` diff --git a/src/test/ui/issues/issue-15034.rs b/src/test/ui/issues/issue-15034.rs index a62e46820d3cb..c53bdb6834d02 100644 --- a/src/test/ui/issues/issue-15034.rs +++ b/src/test/ui/issues/issue-15034.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Lexer<'a> { input: &'a str, } diff --git a/src/test/ui/issues/issue-15034.stderr b/src/test/ui/issues/issue-15034.stderr index c87bec00d9527..3ede5ba4fa30a 100644 --- a/src/test/ui/issues/issue-15034.stderr +++ b/src/test/ui/issues/issue-15034.stderr @@ -1,5 +1,5 @@ error[E0621]: explicit lifetime required in the type of `lexer` - --> $DIR/issue-15034.rs:27:25 + --> $DIR/issue-15034.rs:17:25 | LL | pub fn new(lexer: &'a mut Lexer) -> Parser<'a> { | ------------- help: add explicit lifetime `'a` to the type of `lexer`: `&'a mut Lexer<'a>` diff --git a/src/test/ui/issues/issue-15094.rs b/src/test/ui/issues/issue-15094.rs index 1dd6763cbe50a..dea85df5efe0a 100644 --- a/src/test/ui/issues/issue-15094.rs +++ b/src/test/ui/issues/issue-15094.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(fn_traits, unboxed_closures)] use std::{fmt, ops}; diff --git a/src/test/ui/issues/issue-15094.stderr b/src/test/ui/issues/issue-15094.stderr index 7928a6be35018..07e147132f7d4 100644 --- a/src/test/ui/issues/issue-15094.stderr +++ b/src/test/ui/issues/issue-15094.stderr @@ -1,5 +1,5 @@ error[E0053]: method `call_once` has an incompatible type for trait - --> $DIR/issue-15094.rs:21:5 + --> $DIR/issue-15094.rs:11:5 | LL | fn call_once(self, _args: ()) { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected "rust-call" fn, found "Rust" fn diff --git a/src/test/ui/issues/issue-15129.rs b/src/test/ui/issues/issue-15129.rs index 7a7ba46de74f3..ed134c175eddb 100644 --- a/src/test/ui/issues/issue-15129.rs +++ b/src/test/ui/issues/issue-15129.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub enum T { T1(()), T2(()) diff --git a/src/test/ui/issues/issue-15129.stderr b/src/test/ui/issues/issue-15129.stderr index e65e651622244..7ee369085202b 100644 --- a/src/test/ui/issues/issue-15129.stderr +++ b/src/test/ui/issues/issue-15129.stderr @@ -1,5 +1,5 @@ error[E0004]: non-exhaustive patterns: `(T1(()), V2(_))` not covered - --> $DIR/issue-15129.rs:22:11 + --> $DIR/issue-15129.rs:12:11 | LL | match (T::T1(()), V::V2(true)) { | ^^^^^^^^^^^^^^^^^^^^^^^^ pattern `(T1(()), V2(_))` not covered diff --git a/src/test/ui/issues/issue-15167.rs b/src/test/ui/issues/issue-15167.rs index d224b8a548c84..a2653c10ea4f7 100644 --- a/src/test/ui/issues/issue-15167.rs +++ b/src/test/ui/issues/issue-15167.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // macro f should not be able to inject a reference to 'n'. macro_rules! f { () => (n) } diff --git a/src/test/ui/issues/issue-15167.stderr b/src/test/ui/issues/issue-15167.stderr index b15c493ad69c5..1c488bf6fba8d 100644 --- a/src/test/ui/issues/issue-15167.stderr +++ b/src/test/ui/issues/issue-15167.stderr @@ -1,5 +1,5 @@ error[E0425]: cannot find value `n` in this scope - --> $DIR/issue-15167.rs:13:25 + --> $DIR/issue-15167.rs:3:25 | LL | macro_rules! f { () => (n) } | ^ not found in this scope @@ -8,7 +8,7 @@ LL | println!("{}", f!()); | ---- in this macro invocation error[E0425]: cannot find value `n` in this scope - --> $DIR/issue-15167.rs:13:25 + --> $DIR/issue-15167.rs:3:25 | LL | macro_rules! f { () => (n) } | ^ not found in this scope @@ -17,7 +17,7 @@ LL | println!("{}", f!()); | ---- in this macro invocation error[E0425]: cannot find value `n` in this scope - --> $DIR/issue-15167.rs:13:25 + --> $DIR/issue-15167.rs:3:25 | LL | macro_rules! f { () => (n) } | ^ not found in this scope @@ -26,7 +26,7 @@ LL | println!("{}", f!()); | ---- in this macro invocation error[E0425]: cannot find value `n` in this scope - --> $DIR/issue-15167.rs:13:25 + --> $DIR/issue-15167.rs:3:25 | LL | macro_rules! f { () => (n) } | ^ not found in this scope diff --git a/src/test/ui/issues/issue-15207.rs b/src/test/ui/issues/issue-15207.rs index 70da8cf4169bd..356e55ac912ec 100644 --- a/src/test/ui/issues/issue-15207.rs +++ b/src/test/ui/issues/issue-15207.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { loop { break.push(1) //~ ERROR no method named `push` found for type `!` diff --git a/src/test/ui/issues/issue-15207.stderr b/src/test/ui/issues/issue-15207.stderr index 77e520122777e..7149444b56685 100644 --- a/src/test/ui/issues/issue-15207.stderr +++ b/src/test/ui/issues/issue-15207.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `push` found for type `!` in the current scope - --> $DIR/issue-15207.rs:13:15 + --> $DIR/issue-15207.rs:3:15 | LL | break.push(1) //~ ERROR no method named `push` found for type `!` | ^^^^ diff --git a/src/test/ui/issues/issue-15260.rs b/src/test/ui/issues/issue-15260.rs index 6356ea81660df..64fc3df3d23f1 100644 --- a/src/test/ui/issues/issue-15260.rs +++ b/src/test/ui/issues/issue-15260.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { a: usize, } diff --git a/src/test/ui/issues/issue-15260.stderr b/src/test/ui/issues/issue-15260.stderr index 10cb79e0fc547..4a3041122b26d 100644 --- a/src/test/ui/issues/issue-15260.stderr +++ b/src/test/ui/issues/issue-15260.stderr @@ -1,5 +1,5 @@ error[E0025]: field `a` bound multiple times in the pattern - --> $DIR/issue-15260.rs:18:9 + --> $DIR/issue-15260.rs:8:9 | LL | a: _, | ---- first use of `a` @@ -7,7 +7,7 @@ LL | a: _ | ^^^^ multiple uses of `a` in pattern error[E0025]: field `a` bound multiple times in the pattern - --> $DIR/issue-15260.rs:24:9 + --> $DIR/issue-15260.rs:14:9 | LL | a, | - first use of `a` @@ -15,7 +15,7 @@ LL | a: _ | ^^^^ multiple uses of `a` in pattern error[E0025]: field `a` bound multiple times in the pattern - --> $DIR/issue-15260.rs:30:9 + --> $DIR/issue-15260.rs:20:9 | LL | a, | - first use of `a` @@ -23,7 +23,7 @@ LL | a: _, | ^^^^ multiple uses of `a` in pattern error[E0025]: field `a` bound multiple times in the pattern - --> $DIR/issue-15260.rs:32:9 + --> $DIR/issue-15260.rs:22:9 | LL | a, | - first use of `a` diff --git a/src/test/ui/issues/issue-15381.rs b/src/test/ui/issues/issue-15381.rs index 1cdd803971b4b..e58c866119fbb 100644 --- a/src/test/ui/issues/issue-15381.rs +++ b/src/test/ui/issues/issue-15381.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let values: Vec = vec![1,2,3,4,5,6,7,8]; diff --git a/src/test/ui/issues/issue-15381.stderr b/src/test/ui/issues/issue-15381.stderr index 7a936a8210822..8152737256c7f 100644 --- a/src/test/ui/issues/issue-15381.stderr +++ b/src/test/ui/issues/issue-15381.stderr @@ -1,5 +1,5 @@ error[E0005]: refutable pattern in `for` loop binding: `&[]` not covered - --> $DIR/issue-15381.rs:14:9 + --> $DIR/issue-15381.rs:4:9 | LL | for &[x,y,z] in values.chunks(3).filter(|&xs| xs.len() == 3) { | ^^^^^^^^ pattern `&[]` not covered diff --git a/src/test/ui/issues/issue-15524.rs b/src/test/ui/issues/issue-15524.rs index 7e696c97595aa..eb7ec419c2ee8 100644 --- a/src/test/ui/issues/issue-15524.rs +++ b/src/test/ui/issues/issue-15524.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const N: isize = 1; enum Foo { diff --git a/src/test/ui/issues/issue-15524.stderr b/src/test/ui/issues/issue-15524.stderr index a116e621a95df..1702dad34ca0c 100644 --- a/src/test/ui/issues/issue-15524.stderr +++ b/src/test/ui/issues/issue-15524.stderr @@ -1,5 +1,5 @@ error[E0081]: discriminant value `1` already exists - --> $DIR/issue-15524.rs:15:9 + --> $DIR/issue-15524.rs:5:9 | LL | A = 1, | - first use of `1` @@ -7,7 +7,7 @@ LL | B = 1, | ^ enum already has `1` error[E0081]: discriminant value `1` already exists - --> $DIR/issue-15524.rs:18:5 + --> $DIR/issue-15524.rs:8:5 | LL | A = 1, | - first use of `1` @@ -16,7 +16,7 @@ LL | D, | ^ enum already has `1` error[E0081]: discriminant value `1` already exists - --> $DIR/issue-15524.rs:21:9 + --> $DIR/issue-15524.rs:11:9 | LL | A = 1, | - first use of `1` diff --git a/src/test/ui/issues/issue-15756.rs b/src/test/ui/issues/issue-15756.rs index c123e85a0e0fc..e0861dee61ea1 100644 --- a/src/test/ui/issues/issue-15756.rs +++ b/src/test/ui/issues/issue-15756.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::slice::Chunks; use std::slice::ChunksMut; diff --git a/src/test/ui/issues/issue-15756.stderr b/src/test/ui/issues/issue-15756.stderr index 877e0eaedf143..9133376f6cfa3 100644 --- a/src/test/ui/issues/issue-15756.stderr +++ b/src/test/ui/issues/issue-15756.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `[T]` cannot be known at compilation time - --> $DIR/issue-15756.rs:17:10 + --> $DIR/issue-15756.rs:7:10 | LL | &mut something | ^^^^^^^^^ doesn't have a size known at compile-time diff --git a/src/test/ui/issues/issue-15783.rs b/src/test/ui/issues/issue-15783.rs index 37a2f1582bf08..77eae914fa1ca 100644 --- a/src/test/ui/issues/issue-15783.rs +++ b/src/test/ui/issues/issue-15783.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn foo(params: Option<&[&str]>) -> usize { params.unwrap().first().unwrap().len() } diff --git a/src/test/ui/issues/issue-15783.stderr b/src/test/ui/issues/issue-15783.stderr index d565bad244810..595fe4025ad48 100644 --- a/src/test/ui/issues/issue-15783.stderr +++ b/src/test/ui/issues/issue-15783.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-15783.rs:18:19 + --> $DIR/issue-15783.rs:8:19 | LL | let msg = foo(x); | ^ expected slice, found array of 1 elements diff --git a/src/test/ui/issues/issue-15896.rs b/src/test/ui/issues/issue-15896.rs index 35ef9ba2b4bea..3054af7b93093 100644 --- a/src/test/ui/issues/issue-15896.rs +++ b/src/test/ui/issues/issue-15896.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #15896. It used to ICE rustc. fn main() { diff --git a/src/test/ui/issues/issue-15896.stderr b/src/test/ui/issues/issue-15896.stderr index b41848c8cdf28..cd629841fee83 100644 --- a/src/test/ui/issues/issue-15896.stderr +++ b/src/test/ui/issues/issue-15896.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-15896.rs:21:11 + --> $DIR/issue-15896.rs:11:11 | LL | Tau{t: x}, | ^^^^^^^^^ expected enum `main::R`, found struct `main::Tau` diff --git a/src/test/ui/issues/issue-15919.rs b/src/test/ui/issues/issue-15919.rs index f371995190972..19ecf2f657e0a 100644 --- a/src/test/ui/issues/issue-15919.rs +++ b/src/test/ui/issues/issue-15919.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: too big for the current architecture // normalize-stderr-test "\[usize; \d+\]" -> "[usize; N]" diff --git a/src/test/ui/issues/issue-15965.rs b/src/test/ui/issues/issue-15965.rs index 76ba5a0f4b371..eef4900d432d0 100644 --- a/src/test/ui/issues/issue-15965.rs +++ b/src/test/ui/issues/issue-15965.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { return { return () } diff --git a/src/test/ui/issues/issue-15965.stderr b/src/test/ui/issues/issue-15965.stderr index 3162556986e2b..904656cb3b1cf 100644 --- a/src/test/ui/issues/issue-15965.stderr +++ b/src/test/ui/issues/issue-15965.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/issue-15965.rs:13:9 + --> $DIR/issue-15965.rs:3:9 | LL | / { return () } LL | | //~^ ERROR type annotations needed [E0282] diff --git a/src/test/ui/issues/issue-16048.rs b/src/test/ui/issues/issue-16048.rs index cda83fe54b09a..5910481bf7e0d 100644 --- a/src/test/ui/issues/issue-16048.rs +++ b/src/test/ui/issues/issue-16048.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait NoLifetime { fn get<'p, T : Test<'p>>(&self) -> T; //~^ NOTE lifetimes in impl do not match this method in trait diff --git a/src/test/ui/issues/issue-16048.stderr b/src/test/ui/issues/issue-16048.stderr index 97883fb2a9501..18e59bd2410ff 100644 --- a/src/test/ui/issues/issue-16048.stderr +++ b/src/test/ui/issues/issue-16048.stderr @@ -1,5 +1,5 @@ error[E0195]: lifetime parameters or bounds on method `get` do not match the trait declaration - --> $DIR/issue-16048.rs:31:11 + --> $DIR/issue-16048.rs:21:11 | LL | fn get<'p, T : Test<'p>>(&self) -> T; | ------------------ lifetimes in impl do not match this method in trait diff --git a/src/test/ui/issues/issue-16098.rs b/src/test/ui/issues/issue-16098.rs index 68ac19b383f5a..a1131f80e906a 100644 --- a/src/test/ui/issues/issue-16098.rs +++ b/src/test/ui/issues/issue-16098.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! prob1 { (0) => { 0 diff --git a/src/test/ui/issues/issue-16098.stderr b/src/test/ui/issues/issue-16098.stderr index 31162ca50cc89..4a62cea20b8a8 100644 --- a/src/test/ui/issues/issue-16098.stderr +++ b/src/test/ui/issues/issue-16098.stderr @@ -1,5 +1,5 @@ error: recursion limit reached while expanding the macro `prob1` - --> $DIR/issue-16098.rs:17:18 + --> $DIR/issue-16098.rs:7:18 | LL | $n + prob1!($n - 1); //~ ERROR recursion limit reached while expanding the macro `prob1` | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-16149.rs b/src/test/ui/issues/issue-16149.rs index 60117bd88d46a..7f0cad96a58df 100644 --- a/src/test/ui/issues/issue-16149.rs +++ b/src/test/ui/issues/issue-16149.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern { static externalValue: isize; } diff --git a/src/test/ui/issues/issue-16149.stderr b/src/test/ui/issues/issue-16149.stderr index b0b6e9dfcd03d..64c9c11203d96 100644 --- a/src/test/ui/issues/issue-16149.stderr +++ b/src/test/ui/issues/issue-16149.stderr @@ -1,5 +1,5 @@ error[E0530]: match bindings cannot shadow statics - --> $DIR/issue-16149.rs:17:9 + --> $DIR/issue-16149.rs:7:9 | LL | static externalValue: isize; | ---------------------------- a static `externalValue` is defined here diff --git a/src/test/ui/issues/issue-16250.rs b/src/test/ui/issues/issue-16250.rs index f9d01003005e4..bf01627adfc1f 100644 --- a/src/test/ui/issues/issue-16250.rs +++ b/src/test/ui/issues/issue-16250.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(warnings)] pub struct Foo; diff --git a/src/test/ui/issues/issue-16250.stderr b/src/test/ui/issues/issue-16250.stderr index c826b20b65f29..fc6f26f043997 100644 --- a/src/test/ui/issues/issue-16250.stderr +++ b/src/test/ui/issues/issue-16250.stderr @@ -1,18 +1,18 @@ error: `extern` block uses type `Foo` which is not FFI-safe: this struct has unspecified layout - --> $DIR/issue-16250.rs:16:20 + --> $DIR/issue-16250.rs:6:20 | LL | pub fn foo(x: (Foo)); //~ ERROR unspecified layout | ^^^ | note: lint level defined here - --> $DIR/issue-16250.rs:11:9 + --> $DIR/issue-16250.rs:1:9 | LL | #![deny(warnings)] | ^^^^^^^^ = note: #[deny(improper_ctypes)] implied by #[deny(warnings)] = help: consider adding a #[repr(C)] or #[repr(transparent)] attribute to this struct note: type defined here - --> $DIR/issue-16250.rs:13:1 + --> $DIR/issue-16250.rs:3:1 | LL | pub struct Foo; | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-16338.rs b/src/test/ui/issues/issue-16338.rs index 438073e3b2f82..7567740f28b05 100644 --- a/src/test/ui/issues/issue-16338.rs +++ b/src/test/ui/issues/issue-16338.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Slice { data: *const T, len: usize, diff --git a/src/test/ui/issues/issue-16338.stderr b/src/test/ui/issues/issue-16338.stderr index c670f1e3e9ca1..af8c39d24ec02 100644 --- a/src/test/ui/issues/issue-16338.stderr +++ b/src/test/ui/issues/issue-16338.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-16338.rs:17:9 + --> $DIR/issue-16338.rs:7:9 | LL | let Slice { data: data, len: len } = "foo"; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected str, found struct `Slice` diff --git a/src/test/ui/issues/issue-16401.rs b/src/test/ui/issues/issue-16401.rs index 3060bbea43c3b..7135b7d82efa6 100644 --- a/src/test/ui/issues/issue-16401.rs +++ b/src/test/ui/issues/issue-16401.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Slice { data: *const T, len: usize, diff --git a/src/test/ui/issues/issue-16401.stderr b/src/test/ui/issues/issue-16401.stderr index 179415c762163..a1cf6c98705aa 100644 --- a/src/test/ui/issues/issue-16401.stderr +++ b/src/test/ui/issues/issue-16401.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-16401.rs:18:9 + --> $DIR/issue-16401.rs:8:9 | LL | Slice { data: data, len: len } => (), | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected (), found struct `Slice` diff --git a/src/test/ui/issues/issue-16538.rs b/src/test/ui/issues/issue-16538.rs index cc65211937716..a990c078a7986 100644 --- a/src/test/ui/issues/issue-16538.rs +++ b/src/test/ui/issues/issue-16538.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(safe_extern_statics)] mod Y { diff --git a/src/test/ui/issues/issue-16538.stderr b/src/test/ui/issues/issue-16538.stderr index 9bc3590ebab37..78c7d310ba2b2 100644 --- a/src/test/ui/issues/issue-16538.stderr +++ b/src/test/ui/issues/issue-16538.stderr @@ -1,11 +1,11 @@ error[E0015]: calls in statics are limited to constant functions, tuple structs and tuple variants - --> $DIR/issue-16538.rs:23:27 + --> $DIR/issue-16538.rs:13:27 | LL | static foo: *const Y::X = Y::foo(Y::x as *const Y::X); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0277]: `*const usize` cannot be shared between threads safely - --> $DIR/issue-16538.rs:23:1 + --> $DIR/issue-16538.rs:13:1 | LL | static foo: *const Y::X = Y::foo(Y::x as *const Y::X); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `*const usize` cannot be shared between threads safely diff --git a/src/test/ui/issues/issue-16562.rs b/src/test/ui/issues/issue-16562.rs index a400263a24327..e16a35158c35a 100644 --- a/src/test/ui/issues/issue-16562.rs +++ b/src/test/ui/issues/issue-16562.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait MatrixShape {} struct Col { diff --git a/src/test/ui/issues/issue-16562.stderr b/src/test/ui/issues/issue-16562.stderr index a4525033e2556..3fe7507e8a412 100644 --- a/src/test/ui/issues/issue-16562.stderr +++ b/src/test/ui/issues/issue-16562.stderr @@ -1,5 +1,5 @@ error[E0207]: the type parameter `T` is not constrained by the impl trait, self type, or predicates - --> $DIR/issue-16562.rs:20:6 + --> $DIR/issue-16562.rs:10:6 | LL | impl Collection for Col { | ^ unconstrained type parameter diff --git a/src/test/ui/issues/issue-16683.nll.stderr b/src/test/ui/issues/issue-16683.nll.stderr index 890bb426441e2..b7ca12cf2c48e 100644 --- a/src/test/ui/issues/issue-16683.nll.stderr +++ b/src/test/ui/issues/issue-16683.nll.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/issue-16683.rs:14:9 + --> $DIR/issue-16683.rs:4:9 | LL | self.a(); //~ ERROR cannot infer | ^^^^ warning: not reporting region error due to nll - --> $DIR/issue-16683.rs:14:14 + --> $DIR/issue-16683.rs:4:14 | LL | self.a(); //~ ERROR cannot infer | ^ error: borrowed data escapes outside of function - --> $DIR/issue-16683.rs:14:9 + --> $DIR/issue-16683.rs:4:9 | LL | fn b(&self) { | ----- `self` is a reference that is only valid in the function body diff --git a/src/test/ui/issues/issue-16683.rs b/src/test/ui/issues/issue-16683.rs index fcbf8a3d3519e..bbbd4daa4c5c4 100644 --- a/src/test/ui/issues/issue-16683.rs +++ b/src/test/ui/issues/issue-16683.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait T<'a> { fn a(&'a self) -> &'a bool; fn b(&self) { diff --git a/src/test/ui/issues/issue-16683.stderr b/src/test/ui/issues/issue-16683.stderr index ceb5347ca8036..23e67bb2de9b7 100644 --- a/src/test/ui/issues/issue-16683.stderr +++ b/src/test/ui/issues/issue-16683.stderr @@ -1,23 +1,23 @@ error[E0495]: cannot infer an appropriate lifetime for autoref due to conflicting requirements - --> $DIR/issue-16683.rs:14:14 + --> $DIR/issue-16683.rs:4:14 | LL | self.a(); //~ ERROR cannot infer | ^ | -note: first, the lifetime cannot outlive the anonymous lifetime #1 defined on the method body at 13:5... - --> $DIR/issue-16683.rs:13:5 +note: first, the lifetime cannot outlive the anonymous lifetime #1 defined on the method body at 3:5... + --> $DIR/issue-16683.rs:3:5 | LL | / fn b(&self) { LL | | self.a(); //~ ERROR cannot infer LL | | } | |_____^ note: ...so that reference does not outlive borrowed content - --> $DIR/issue-16683.rs:14:9 + --> $DIR/issue-16683.rs:4:9 | LL | self.a(); //~ ERROR cannot infer | ^^^^ -note: but, the lifetime must be valid for the lifetime 'a as defined on the trait at 11:9... - --> $DIR/issue-16683.rs:11:9 +note: but, the lifetime must be valid for the lifetime 'a as defined on the trait at 1:9... + --> $DIR/issue-16683.rs:1:9 | LL | trait T<'a> { | ^^ diff --git a/src/test/ui/issues/issue-16725.rs b/src/test/ui/issues/issue-16725.rs index cadf602a4cfc4..619b5c0a34ac3 100644 --- a/src/test/ui/issues/issue-16725.rs +++ b/src/test/ui/issues/issue-16725.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_16725.rs extern crate issue_16725 as foo; diff --git a/src/test/ui/issues/issue-16725.stderr b/src/test/ui/issues/issue-16725.stderr index 709f3cf50b992..c3001431c597d 100644 --- a/src/test/ui/issues/issue-16725.stderr +++ b/src/test/ui/issues/issue-16725.stderr @@ -1,5 +1,5 @@ error[E0603]: function `bar` is private - --> $DIR/issue-16725.rs:16:14 + --> $DIR/issue-16725.rs:6:14 | LL | unsafe { foo::bar(); } | ^^^^^^^^ diff --git a/src/test/ui/issues/issue-16922.nll.stderr b/src/test/ui/issues/issue-16922.nll.stderr index 1bd26faedaae3..25c64127cac3a 100644 --- a/src/test/ui/issues/issue-16922.nll.stderr +++ b/src/test/ui/issues/issue-16922.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/issue-16922.rs:14:14 + --> $DIR/issue-16922.rs:4:14 | LL | Box::new(value) as Box | ^^^^^ error[E0621]: explicit lifetime required in the type of `value` - --> $DIR/issue-16922.rs:14:5 + --> $DIR/issue-16922.rs:4:5 | LL | fn foo(value: &T) -> Box { | -- help: add explicit lifetime `'static` to the type of `value`: `&'static T` diff --git a/src/test/ui/issues/issue-16922.rs b/src/test/ui/issues/issue-16922.rs index 1768c834cb391..1e865515c4b74 100644 --- a/src/test/ui/issues/issue-16922.rs +++ b/src/test/ui/issues/issue-16922.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::any::Any; fn foo(value: &T) -> Box { diff --git a/src/test/ui/issues/issue-16922.stderr b/src/test/ui/issues/issue-16922.stderr index e70869eb1838d..342be8994a2d8 100644 --- a/src/test/ui/issues/issue-16922.stderr +++ b/src/test/ui/issues/issue-16922.stderr @@ -1,5 +1,5 @@ error[E0621]: explicit lifetime required in the type of `value` - --> $DIR/issue-16922.rs:14:5 + --> $DIR/issue-16922.rs:4:5 | LL | fn foo(value: &T) -> Box { | -- help: add explicit lifetime `'static` to the type of `value`: `&'static T` diff --git a/src/test/ui/issues/issue-16939.rs b/src/test/ui/issues/issue-16939.rs index e16c58b8a6c1a..ad7248343918d 100644 --- a/src/test/ui/issues/issue-16939.rs +++ b/src/test/ui/issues/issue-16939.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Make sure we don't ICE when making an overloaded call with the // wrong arity. diff --git a/src/test/ui/issues/issue-16939.stderr b/src/test/ui/issues/issue-16939.stderr index 238480493703d..7281f6a735569 100644 --- a/src/test/ui/issues/issue-16939.stderr +++ b/src/test/ui/issues/issue-16939.stderr @@ -1,5 +1,5 @@ error[E0057]: this function takes 0 parameters but 1 parameter was supplied - --> $DIR/issue-16939.rs:15:9 + --> $DIR/issue-16939.rs:5:9 | LL | |t| f(t); //~ ERROR E0057 | ^^^^ expected 0 parameters diff --git a/src/test/ui/issues/issue-16966.rs b/src/test/ui/issues/issue-16966.rs index 38b102c7e3e6b..9c6188350e3f7 100644 --- a/src/test/ui/issues/issue-16966.rs +++ b/src/test/ui/issues/issue-16966.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { panic!(std::default::Default::default()); //~^ ERROR type annotations needed diff --git a/src/test/ui/issues/issue-16966.stderr b/src/test/ui/issues/issue-16966.stderr index a26910e0146fa..13e77fe3073ca 100644 --- a/src/test/ui/issues/issue-16966.stderr +++ b/src/test/ui/issues/issue-16966.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/issue-16966.rs:12:5 + --> $DIR/issue-16966.rs:2:5 | LL | panic!(std::default::Default::default()); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot infer type for `M` diff --git a/src/test/ui/issues/issue-1697.rs b/src/test/ui/issues/issue-1697.rs index f8a68264339b9..22e9e54c4cd3a 100644 --- a/src/test/ui/issues/issue-1697.rs +++ b/src/test/ui/issues/issue-1697.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Testing that we don't fail abnormally after hitting the errors use unresolved::*; //~ ERROR unresolved import `unresolved` [E0432] diff --git a/src/test/ui/issues/issue-1697.stderr b/src/test/ui/issues/issue-1697.stderr index 28a7fbcaabee8..813a2629f3ad6 100644 --- a/src/test/ui/issues/issue-1697.stderr +++ b/src/test/ui/issues/issue-1697.stderr @@ -1,5 +1,5 @@ error[E0432]: unresolved import `unresolved` - --> $DIR/issue-1697.rs:13:5 + --> $DIR/issue-1697.rs:3:5 | LL | use unresolved::*; //~ ERROR unresolved import `unresolved` [E0432] | ^^^^^^^^^^ Maybe a missing `extern crate unresolved;`? diff --git a/src/test/ui/issues/issue-16994.rs b/src/test/ui/issues/issue-16994.rs index ae4e8ce1df8ff..a4bddf1b13833 100644 --- a/src/test/ui/issues/issue-16994.rs +++ b/src/test/ui/issues/issue-16994.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] fn cb<'a,T>(_x: Box, bool))) -> T>) -> T { diff --git a/src/test/ui/issues/issue-16994.stderr b/src/test/ui/issues/issue-16994.stderr index 8392b9da4118b..19525067eac79 100644 --- a/src/test/ui/issues/issue-16994.stderr +++ b/src/test/ui/issues/issue-16994.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-16994.rs:18:1 + --> $DIR/issue-16994.rs:8:1 | LL | / fn main() { //~ ERROR compilation successful LL | | cb(Box::new(|(k, &(ref v, b))| (*k, v.clone(), b))); diff --git a/src/test/ui/issues/issue-17001.rs b/src/test/ui/issues/issue-17001.rs index 413e8b464fff7..68cb2865fdc82 100644 --- a/src/test/ui/issues/issue-17001.rs +++ b/src/test/ui/issues/issue-17001.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod foo {} fn main() { diff --git a/src/test/ui/issues/issue-17001.stderr b/src/test/ui/issues/issue-17001.stderr index a8e0cd8591bf8..bdd0824963809 100644 --- a/src/test/ui/issues/issue-17001.stderr +++ b/src/test/ui/issues/issue-17001.stderr @@ -1,5 +1,5 @@ error[E0574]: expected struct, variant or union type, found module `foo` - --> $DIR/issue-17001.rs:14:13 + --> $DIR/issue-17001.rs:4:13 | LL | let p = foo { x: () }; //~ ERROR expected struct, variant or union type, found module `foo` | ^^^ not a struct, variant or union type diff --git a/src/test/ui/issues/issue-17025.rs b/src/test/ui/issues/issue-17025.rs index f250103b14407..6b7b6d010aa22 100644 --- a/src/test/ui/issues/issue-17025.rs +++ b/src/test/ui/issues/issue-17025.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-test the unsized enum no longer compiles enum A { diff --git a/src/test/ui/issues/issue-17033.rs b/src/test/ui/issues/issue-17033.rs index 1cd43cbb0f857..d39b5683fee93 100644 --- a/src/test/ui/issues/issue-17033.rs +++ b/src/test/ui/issues/issue-17033.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn f<'r>(p: &'r mut fn(p: &mut ())) { (*p)(()) //~ ERROR mismatched types //~| expected type `&mut ()` diff --git a/src/test/ui/issues/issue-17033.stderr b/src/test/ui/issues/issue-17033.stderr index d6884f1888189..181a9992c6d82 100644 --- a/src/test/ui/issues/issue-17033.stderr +++ b/src/test/ui/issues/issue-17033.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-17033.rs:12:10 + --> $DIR/issue-17033.rs:2:10 | LL | (*p)(()) //~ ERROR mismatched types | ^^ diff --git a/src/test/ui/issues/issue-17252.rs b/src/test/ui/issues/issue-17252.rs index 1c3e6890c8e2e..7141e4874c02d 100644 --- a/src/test/ui/issues/issue-17252.rs +++ b/src/test/ui/issues/issue-17252.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const FOO: usize = FOO; //~ ERROR E0391 fn main() { diff --git a/src/test/ui/issues/issue-17252.stderr b/src/test/ui/issues/issue-17252.stderr index 8f97a841666ec..e333e15065111 100644 --- a/src/test/ui/issues/issue-17252.stderr +++ b/src/test/ui/issues/issue-17252.stderr @@ -1,12 +1,12 @@ error[E0391]: cycle detected when processing `FOO` - --> $DIR/issue-17252.rs:11:20 + --> $DIR/issue-17252.rs:1:20 | LL | const FOO: usize = FOO; //~ ERROR E0391 | ^^^ | = note: ...which again requires processing `FOO`, completing the cycle note: cycle used when processing `main::{{constant}}` - --> $DIR/issue-17252.rs:14:18 + --> $DIR/issue-17252.rs:4:18 | LL | let _x: [u8; FOO]; // caused stack overflow prior to fix | ^^^ diff --git a/src/test/ui/issues/issue-17263.nll.stderr b/src/test/ui/issues/issue-17263.nll.stderr index d6009e8078dce..2c32fdb52377d 100644 --- a/src/test/ui/issues/issue-17263.nll.stderr +++ b/src/test/ui/issues/issue-17263.nll.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-17263.rs:15:1 + --> $DIR/issue-17263.rs:5:1 | LL | / fn main() { #![rustc_error] // rust-lang/rust#49855 LL | | let mut x: Box<_> = box Foo { a: 1, b: 2 }; diff --git a/src/test/ui/issues/issue-17263.rs b/src/test/ui/issues/issue-17263.rs index b251f9a415253..555ea2baeb6fb 100644 --- a/src/test/ui/issues/issue-17263.rs +++ b/src/test/ui/issues/issue-17263.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax, rustc_attrs)] struct Foo { a: isize, b: isize } diff --git a/src/test/ui/issues/issue-17263.stderr b/src/test/ui/issues/issue-17263.stderr index 4767fbbcfbbd5..d570a19b10608 100644 --- a/src/test/ui/issues/issue-17263.stderr +++ b/src/test/ui/issues/issue-17263.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `x` (via `x.b`) as mutable more than once at a time - --> $DIR/issue-17263.rs:17:34 + --> $DIR/issue-17263.rs:7:34 | LL | let (a, b) = (&mut x.a, &mut x.b); | --- ^^^ second mutable borrow occurs here (via `x.b`) @@ -10,7 +10,7 @@ LL | } | - first borrow ends here error[E0502]: cannot borrow `foo` (via `foo.b`) as immutable because `foo` is also borrowed as mutable (via `foo.a`) - --> $DIR/issue-17263.rs:21:32 + --> $DIR/issue-17263.rs:11:32 | LL | let (c, d) = (&mut foo.a, &foo.b); | ----- ^^^^^ immutable borrow occurs here (via `foo.b`) diff --git a/src/test/ui/issues/issue-17337.rs b/src/test/ui/issues/issue-17337.rs index 8642396c380cc..1126ab7a206d2 100644 --- a/src/test/ui/issues/issue-17337.rs +++ b/src/test/ui/issues/issue-17337.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(staged_api)] #![deny(deprecated)] diff --git a/src/test/ui/issues/issue-17337.stderr b/src/test/ui/issues/issue-17337.stderr index 0321547374537..4c3ffe92cccdc 100644 --- a/src/test/ui/issues/issue-17337.stderr +++ b/src/test/ui/issues/issue-17337.stderr @@ -1,11 +1,11 @@ error: use of deprecated item 'Foo::foo': text - --> $DIR/issue-17337.rs:26:6 + --> $DIR/issue-17337.rs:16:6 | LL | .foo(); //~ ERROR use of deprecated item | ^^^ | note: lint level defined here - --> $DIR/issue-17337.rs:12:9 + --> $DIR/issue-17337.rs:2:9 | LL | #![deny(deprecated)] | ^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-17373.rs b/src/test/ui/issues/issue-17373.rs index f6e6a8a0852dd..dc3be48a7ead7 100644 --- a/src/test/ui/issues/issue-17373.rs +++ b/src/test/ui/issues/issue-17373.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { *return //~ ERROR type `!` cannot be dereferenced ; diff --git a/src/test/ui/issues/issue-17373.stderr b/src/test/ui/issues/issue-17373.stderr index 38e93e65bdc17..e1a9f097b226c 100644 --- a/src/test/ui/issues/issue-17373.stderr +++ b/src/test/ui/issues/issue-17373.stderr @@ -1,5 +1,5 @@ error[E0614]: type `!` cannot be dereferenced - --> $DIR/issue-17373.rs:12:5 + --> $DIR/issue-17373.rs:2:5 | LL | *return //~ ERROR type `!` cannot be dereferenced | ^^^^^^^ diff --git a/src/test/ui/issues/issue-17385.nll.stderr b/src/test/ui/issues/issue-17385.nll.stderr index 85924a7526168..2e41ee2ea4f0d 100644 --- a/src/test/ui/issues/issue-17385.nll.stderr +++ b/src/test/ui/issues/issue-17385.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `foo` - --> $DIR/issue-17385.rs:28:11 + --> $DIR/issue-17385.rs:18:11 | LL | drop(foo); | --- value moved here @@ -9,7 +9,7 @@ LL | match foo { //~ ERROR use of moved value = note: move occurs because `foo` has type `X`, which does not implement the `Copy` trait error[E0382]: borrow of moved value: `foo` - --> $DIR/issue-17385.rs:28:11 + --> $DIR/issue-17385.rs:18:11 | LL | drop(foo); | --- value moved here @@ -19,7 +19,7 @@ LL | match foo { //~ ERROR use of moved value = note: move occurs because `foo` has type `X`, which does not implement the `Copy` trait error[E0382]: use of moved value: `foo.0` - --> $DIR/issue-17385.rs:29:11 + --> $DIR/issue-17385.rs:19:11 | LL | drop(foo); | --- value moved here @@ -30,7 +30,7 @@ LL | X(1) => (), = note: move occurs because `foo` has type `X`, which does not implement the `Copy` trait error[E0382]: use of moved value: `e` - --> $DIR/issue-17385.rs:35:11 + --> $DIR/issue-17385.rs:25:11 | LL | drop(e); | - value moved here @@ -40,7 +40,7 @@ LL | match e { //~ ERROR use of moved value = note: move occurs because `e` has type `Enum`, which does not implement the `Copy` trait error[E0382]: borrow of moved value: `e` - --> $DIR/issue-17385.rs:35:11 + --> $DIR/issue-17385.rs:25:11 | LL | drop(e); | - value moved here @@ -50,7 +50,7 @@ LL | match e { //~ ERROR use of moved value = note: move occurs because `e` has type `Enum`, which does not implement the `Copy` trait error[E0382]: use of moved value: `e` - --> $DIR/issue-17385.rs:36:9 + --> $DIR/issue-17385.rs:26:9 | LL | drop(e); | - value moved here diff --git a/src/test/ui/issues/issue-17385.rs b/src/test/ui/issues/issue-17385.rs index eb293c7924705..7400aadb059f7 100644 --- a/src/test/ui/issues/issue-17385.rs +++ b/src/test/ui/issues/issue-17385.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct X(isize); enum Enum { diff --git a/src/test/ui/issues/issue-17385.stderr b/src/test/ui/issues/issue-17385.stderr index 01d6d1a2720a3..5f28a3c2c2785 100644 --- a/src/test/ui/issues/issue-17385.stderr +++ b/src/test/ui/issues/issue-17385.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `foo` - --> $DIR/issue-17385.rs:28:11 + --> $DIR/issue-17385.rs:18:11 | LL | drop(foo); | --- value moved here @@ -9,7 +9,7 @@ LL | match foo { //~ ERROR use of moved value = note: move occurs because `foo` has type `X`, which does not implement the `Copy` trait error[E0382]: use of moved value: `e` - --> $DIR/issue-17385.rs:35:11 + --> $DIR/issue-17385.rs:25:11 | LL | drop(e); | - value moved here diff --git a/src/test/ui/issues/issue-17405.rs b/src/test/ui/issues/issue-17405.rs index 5a6bd5ed588a6..14781a7d3f7ea 100644 --- a/src/test/ui/issues/issue-17405.rs +++ b/src/test/ui/issues/issue-17405.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Foo { Bar(isize) } diff --git a/src/test/ui/issues/issue-17405.stderr b/src/test/ui/issues/issue-17405.stderr index bcccfd301b786..2bfc85cc7de8f 100644 --- a/src/test/ui/issues/issue-17405.stderr +++ b/src/test/ui/issues/issue-17405.stderr @@ -1,5 +1,5 @@ error[E0574]: expected struct, variant or union type, found enum `Foo` - --> $DIR/issue-17405.rs:17:9 + --> $DIR/issue-17405.rs:7:9 | LL | Foo { i } => () //~ ERROR expected struct, variant or union type, found enum `Foo` | ^^^ not a struct, variant or union type diff --git a/src/test/ui/issues/issue-17431-1.rs b/src/test/ui/issues/issue-17431-1.rs index 260cc366fae08..3b692cc0eeb59 100644 --- a/src/test/ui/issues/issue-17431-1.rs +++ b/src/test/ui/issues/issue-17431-1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo { foo: Option> } //~^ ERROR recursive type `Foo` has infinite size diff --git a/src/test/ui/issues/issue-17431-1.stderr b/src/test/ui/issues/issue-17431-1.stderr index fb27693c85efd..eb5a1366e8953 100644 --- a/src/test/ui/issues/issue-17431-1.stderr +++ b/src/test/ui/issues/issue-17431-1.stderr @@ -1,5 +1,5 @@ error[E0072]: recursive type `Foo` has infinite size - --> $DIR/issue-17431-1.rs:11:1 + --> $DIR/issue-17431-1.rs:1:1 | LL | struct Foo { foo: Option> } | ^^^^^^^^^^ ------------------------ recursive without indirection diff --git a/src/test/ui/issues/issue-17431-2.rs b/src/test/ui/issues/issue-17431-2.rs index f39fb0e31c6ee..9ed97f63177f0 100644 --- a/src/test/ui/issues/issue-17431-2.rs +++ b/src/test/ui/issues/issue-17431-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Baz { q: Option } //~^ ERROR recursive type `Baz` has infinite size diff --git a/src/test/ui/issues/issue-17431-2.stderr b/src/test/ui/issues/issue-17431-2.stderr index 7e87babe93e85..3a7b0e9ce7997 100644 --- a/src/test/ui/issues/issue-17431-2.stderr +++ b/src/test/ui/issues/issue-17431-2.stderr @@ -1,5 +1,5 @@ error[E0072]: recursive type `Baz` has infinite size - --> $DIR/issue-17431-2.rs:11:1 + --> $DIR/issue-17431-2.rs:1:1 | LL | struct Baz { q: Option } | ^^^^^^^^^^ -------------- recursive without indirection @@ -9,7 +9,7 @@ LL | struct Baz { q: Option } = help: insert indirection (e.g., a `Box`, `Rc`, or `&`) at some point to make `Baz` representable error[E0072]: recursive type `Foo` has infinite size - --> $DIR/issue-17431-2.rs:14:1 + --> $DIR/issue-17431-2.rs:4:1 | LL | struct Foo { q: Option } | ^^^^^^^^^^ -------------- recursive without indirection diff --git a/src/test/ui/issues/issue-17431-3.rs b/src/test/ui/issues/issue-17431-3.rs index 9ba085591f08b..83a63a88b7246 100644 --- a/src/test/ui/issues/issue-17431-3.rs +++ b/src/test/ui/issues/issue-17431-3.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::sync::Mutex; struct Foo { foo: Mutex> } diff --git a/src/test/ui/issues/issue-17431-3.stderr b/src/test/ui/issues/issue-17431-3.stderr index c12a4c11c2cfb..675a2e2714209 100644 --- a/src/test/ui/issues/issue-17431-3.stderr +++ b/src/test/ui/issues/issue-17431-3.stderr @@ -1,5 +1,5 @@ error[E0072]: recursive type `Foo` has infinite size - --> $DIR/issue-17431-3.rs:13:1 + --> $DIR/issue-17431-3.rs:3:1 | LL | struct Foo { foo: Mutex> } | ^^^^^^^^^^ ----------------------- recursive without indirection diff --git a/src/test/ui/issues/issue-17431-4.rs b/src/test/ui/issues/issue-17431-4.rs index 665c3cf8fe639..48f0dba2aec44 100644 --- a/src/test/ui/issues/issue-17431-4.rs +++ b/src/test/ui/issues/issue-17431-4.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::marker; struct Foo { foo: Option>>, marker: marker::PhantomData } diff --git a/src/test/ui/issues/issue-17431-4.stderr b/src/test/ui/issues/issue-17431-4.stderr index acfd688b62206..aff9071095ca0 100644 --- a/src/test/ui/issues/issue-17431-4.stderr +++ b/src/test/ui/issues/issue-17431-4.stderr @@ -1,5 +1,5 @@ error[E0072]: recursive type `Foo` has infinite size - --> $DIR/issue-17431-4.rs:13:1 + --> $DIR/issue-17431-4.rs:3:1 | LL | struct Foo { foo: Option>>, marker: marker::PhantomData } | ^^^^^^^^^^^^^ --------------------------- recursive without indirection diff --git a/src/test/ui/issues/issue-17431-5.rs b/src/test/ui/issues/issue-17431-5.rs index 85ed4d5d634db..0fd6ee61156fd 100644 --- a/src/test/ui/issues/issue-17431-5.rs +++ b/src/test/ui/issues/issue-17431-5.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::marker; struct Foo { foo: Bar } diff --git a/src/test/ui/issues/issue-17431-5.stderr b/src/test/ui/issues/issue-17431-5.stderr index ddfea58a857ac..537f9f34f55ca 100644 --- a/src/test/ui/issues/issue-17431-5.stderr +++ b/src/test/ui/issues/issue-17431-5.stderr @@ -1,5 +1,5 @@ error[E0072]: recursive type `Bar` has infinite size - --> $DIR/issue-17431-5.rs:15:1 + --> $DIR/issue-17431-5.rs:5:1 | LL | struct Bar { x: Bar , marker: marker::PhantomData } | ^^^^^^^^^^^^^ ----------- recursive without indirection diff --git a/src/test/ui/issues/issue-17431-6.rs b/src/test/ui/issues/issue-17431-6.rs index 4c1e82c3d6ae4..b7e49873da81a 100644 --- a/src/test/ui/issues/issue-17431-6.rs +++ b/src/test/ui/issues/issue-17431-6.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::sync::Mutex; enum Foo { X(Mutex>) } diff --git a/src/test/ui/issues/issue-17431-6.stderr b/src/test/ui/issues/issue-17431-6.stderr index ab2cc439f17a9..cb2dab9501488 100644 --- a/src/test/ui/issues/issue-17431-6.stderr +++ b/src/test/ui/issues/issue-17431-6.stderr @@ -1,5 +1,5 @@ error[E0072]: recursive type `Foo` has infinite size - --> $DIR/issue-17431-6.rs:13:1 + --> $DIR/issue-17431-6.rs:3:1 | LL | enum Foo { X(Mutex>) } | ^^^^^^^^ ------------------ recursive without indirection diff --git a/src/test/ui/issues/issue-17431-7.rs b/src/test/ui/issues/issue-17431-7.rs index 71b85da29fc71..4fd7862781bfb 100644 --- a/src/test/ui/issues/issue-17431-7.rs +++ b/src/test/ui/issues/issue-17431-7.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Foo { Voo(Option>) } //~^ ERROR recursive type `Foo` has infinite size diff --git a/src/test/ui/issues/issue-17431-7.stderr b/src/test/ui/issues/issue-17431-7.stderr index 7f9118860b9b1..de70851da4b5f 100644 --- a/src/test/ui/issues/issue-17431-7.stderr +++ b/src/test/ui/issues/issue-17431-7.stderr @@ -1,5 +1,5 @@ error[E0072]: recursive type `Foo` has infinite size - --> $DIR/issue-17431-7.rs:11:1 + --> $DIR/issue-17431-7.rs:1:1 | LL | enum Foo { Voo(Option>) } | ^^^^^^^^ ------------------- recursive without indirection diff --git a/src/test/ui/issues/issue-17441.rs b/src/test/ui/issues/issue-17441.rs index 5432d5f5ed910..cfb2fe674edf7 100644 --- a/src/test/ui/issues/issue-17441.rs +++ b/src/test/ui/issues/issue-17441.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let _foo = &[1_usize, 2] as [usize]; //~^ ERROR cast to unsized type: `&[usize; 2]` as `[usize]` diff --git a/src/test/ui/issues/issue-17441.stderr b/src/test/ui/issues/issue-17441.stderr index 6c7e883f9f9c2..436ee7325f8e5 100644 --- a/src/test/ui/issues/issue-17441.stderr +++ b/src/test/ui/issues/issue-17441.stderr @@ -1,17 +1,17 @@ error[E0620]: cast to unsized type: `&[usize; 2]` as `[usize]` - --> $DIR/issue-17441.rs:12:16 + --> $DIR/issue-17441.rs:2:16 | LL | let _foo = &[1_usize, 2] as [usize]; | ^^^^^^^^^^^^^^^^^^^^^^^^ | help: consider using an implicit coercion to `&[usize]` instead - --> $DIR/issue-17441.rs:12:16 + --> $DIR/issue-17441.rs:2:16 | LL | let _foo = &[1_usize, 2] as [usize]; | ^^^^^^^^^^^^^^^^^^^^^^^^ error[E0620]: cast to unsized type: `std::boxed::Box` as `dyn std::fmt::Debug` - --> $DIR/issue-17441.rs:15:16 + --> $DIR/issue-17441.rs:5:16 | LL | let _bar = Box::new(1_usize) as std::fmt::Debug; | ^^^^^^^^^^^^^^^^^^^^^--------------- @@ -19,25 +19,25 @@ LL | let _bar = Box::new(1_usize) as std::fmt::Debug; | help: try casting to a `Box` instead: `Box` error[E0620]: cast to unsized type: `usize` as `dyn std::fmt::Debug` - --> $DIR/issue-17441.rs:18:16 + --> $DIR/issue-17441.rs:8:16 | LL | let _baz = 1_usize as std::fmt::Debug; | ^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: consider using a box or reference as appropriate - --> $DIR/issue-17441.rs:18:16 + --> $DIR/issue-17441.rs:8:16 | LL | let _baz = 1_usize as std::fmt::Debug; | ^^^^^^^ error[E0620]: cast to unsized type: `[usize; 2]` as `[usize]` - --> $DIR/issue-17441.rs:21:17 + --> $DIR/issue-17441.rs:11:17 | LL | let _quux = [1_usize, 2] as [usize]; | ^^^^^^^^^^^^^^^^^^^^^^^ | help: consider using a box or reference as appropriate - --> $DIR/issue-17441.rs:21:17 + --> $DIR/issue-17441.rs:11:17 | LL | let _quux = [1_usize, 2] as [usize]; | ^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-17444.rs b/src/test/ui/issues/issue-17444.rs index dafcff238387e..906b443c9fab8 100644 --- a/src/test/ui/issues/issue-17444.rs +++ b/src/test/ui/issues/issue-17444.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Test { Foo = 0 } diff --git a/src/test/ui/issues/issue-17444.stderr b/src/test/ui/issues/issue-17444.stderr index 3f87d806e7e87..1097079dfc1d1 100644 --- a/src/test/ui/issues/issue-17444.stderr +++ b/src/test/ui/issues/issue-17444.stderr @@ -1,5 +1,5 @@ error[E0606]: casting `Test` as `*const isize` is invalid - --> $DIR/issue-17444.rs:16:14 + --> $DIR/issue-17444.rs:6:14 | LL | let _x = Test::Foo as *const isize; | ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-17458.rs b/src/test/ui/issues/issue-17458.rs index 354d389158d61..d7a1752b96c44 100644 --- a/src/test/ui/issues/issue-17458.rs +++ b/src/test/ui/issues/issue-17458.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - static X: usize = 0 as *const usize as usize; //~^ ERROR: casting pointers to integers in statics is unstable diff --git a/src/test/ui/issues/issue-17458.stderr b/src/test/ui/issues/issue-17458.stderr index 0303e4bddb56f..04921419ae01a 100644 --- a/src/test/ui/issues/issue-17458.stderr +++ b/src/test/ui/issues/issue-17458.stderr @@ -1,5 +1,5 @@ error[E0658]: casting pointers to integers in statics is unstable (see issue #51910) - --> $DIR/issue-17458.rs:11:19 + --> $DIR/issue-17458.rs:1:19 | LL | static X: usize = 0 as *const usize as usize; | ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-17545.nll.stderr b/src/test/ui/issues/issue-17545.nll.stderr index 50a4b3f7f3e82..58742634a2483 100644 --- a/src/test/ui/issues/issue-17545.nll.stderr +++ b/src/test/ui/issues/issue-17545.nll.stderr @@ -1,13 +1,13 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/issue-17545.rs:17:10 + --> $DIR/issue-17545.rs:7:10 | LL | &id(()), //~ ERROR borrowed value does not live long enough | ^^^^^^ temporary value does not live long enough LL | )); | - temporary value only lives until here | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 15:12... - --> $DIR/issue-17545.rs:15:12 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 5:12... + --> $DIR/issue-17545.rs:5:12 | LL | pub fn foo<'a, F: Fn(&'a ())>(bar: F) { | ^^ diff --git a/src/test/ui/issues/issue-17545.rs b/src/test/ui/issues/issue-17545.rs index 9264305e6ea5c..d62c0b9f32cb9 100644 --- a/src/test/ui/issues/issue-17545.rs +++ b/src/test/ui/issues/issue-17545.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(fn_traits)] fn id(x: T) -> T { x } diff --git a/src/test/ui/issues/issue-17545.stderr b/src/test/ui/issues/issue-17545.stderr index ce69866558335..62ec25e1d1a4f 100644 --- a/src/test/ui/issues/issue-17545.stderr +++ b/src/test/ui/issues/issue-17545.stderr @@ -1,13 +1,13 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/issue-17545.rs:17:10 + --> $DIR/issue-17545.rs:7:10 | LL | &id(()), //~ ERROR borrowed value does not live long enough | ^^^^^^ temporary value does not live long enough LL | )); | - temporary value only lives until here | -note: borrowed value must be valid for the lifetime 'a as defined on the function body at 15:12... - --> $DIR/issue-17545.rs:15:12 +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 5:12... + --> $DIR/issue-17545.rs:5:12 | LL | pub fn foo<'a, F: Fn(&'a ())>(bar: F) { | ^^ diff --git a/src/test/ui/issues/issue-17546.rs b/src/test/ui/issues/issue-17546.rs index fe125b973d9bd..dbfdad25e5be8 100644 --- a/src/test/ui/issues/issue-17546.rs +++ b/src/test/ui/issues/issue-17546.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use foo::MyEnum::Result; use foo::NoResult; // Through a re-export diff --git a/src/test/ui/issues/issue-17546.stderr b/src/test/ui/issues/issue-17546.stderr index 39f7d5fcc04bc..1674dac561d4f 100644 --- a/src/test/ui/issues/issue-17546.stderr +++ b/src/test/ui/issues/issue-17546.stderr @@ -1,5 +1,5 @@ error[E0573]: expected type, found variant `NoResult` - --> $DIR/issue-17546.rs:22:17 + --> $DIR/issue-17546.rs:12:17 | LL | fn new() -> NoResult { | --------^^^^^^^^^^^^^^^^ @@ -8,7 +8,7 @@ LL | fn new() -> NoResult { | help: you can try using the variant's enum: `foo::MyEnum` error[E0573]: expected type, found variant `Result` - --> $DIR/issue-17546.rs:32:17 + --> $DIR/issue-17546.rs:22:17 | LL | fn new() -> Result { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ not a type @@ -25,7 +25,7 @@ LL | use std::result::Result; and 1 other candidates error[E0573]: expected type, found variant `Result` - --> $DIR/issue-17546.rs:38:13 + --> $DIR/issue-17546.rs:28:13 | LL | fn new() -> Result { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ not a type @@ -42,7 +42,7 @@ LL | use std::result::Result; and 1 other candidates error[E0573]: expected type, found variant `NoResult` - --> $DIR/issue-17546.rs:43:15 + --> $DIR/issue-17546.rs:33:15 | LL | fn newer() -> NoResult { | --------^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-17551.rs b/src/test/ui/issues/issue-17551.rs index b55863f0dda7a..a65957ce074ef 100644 --- a/src/test/ui/issues/issue-17551.rs +++ b/src/test/ui/issues/issue-17551.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::marker; struct B(marker::PhantomData); diff --git a/src/test/ui/issues/issue-17551.stderr b/src/test/ui/issues/issue-17551.stderr index 0cdee0337d848..df693591e7c25 100644 --- a/src/test/ui/issues/issue-17551.stderr +++ b/src/test/ui/issues/issue-17551.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/issue-17551.rs:16:15 + --> $DIR/issue-17551.rs:6:15 | LL | let foo = B(marker::PhantomData); //~ ERROR type annotations needed | --- ^ cannot infer type for `T` diff --git a/src/test/ui/issues/issue-17651.rs b/src/test/ui/issues/issue-17651.rs index cbd0da4b53ce3..7629a5a3be1ea 100644 --- a/src/test/ui/issues/issue-17651.rs +++ b/src/test/ui/issues/issue-17651.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that moves of unsized values within closures are caught // and rejected. diff --git a/src/test/ui/issues/issue-17651.stderr b/src/test/ui/issues/issue-17651.stderr index 3e5679bdc3b3f..e2d0d3301b6a1 100644 --- a/src/test/ui/issues/issue-17651.stderr +++ b/src/test/ui/issues/issue-17651.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `[{integer}]` cannot be known at compilation time - --> $DIR/issue-17651.rs:15:9 + --> $DIR/issue-17651.rs:5:9 | LL | (|| Box::new(*(&[0][..])))(); | ^^^^^^^^ doesn't have a size known at compile-time diff --git a/src/test/ui/issues/issue-17718-const-bad-values.rs b/src/test/ui/issues/issue-17718-const-bad-values.rs index 17ec77d77eea2..1919cc2416595 100644 --- a/src/test/ui/issues/issue-17718-const-bad-values.rs +++ b/src/test/ui/issues/issue-17718-const-bad-values.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const C1: &'static mut [usize] = &mut []; //~^ ERROR: references in constants may only refer to immutable values diff --git a/src/test/ui/issues/issue-17718-const-bad-values.stderr b/src/test/ui/issues/issue-17718-const-bad-values.stderr index 0ab7f965b63eb..51e060be0c3ea 100644 --- a/src/test/ui/issues/issue-17718-const-bad-values.stderr +++ b/src/test/ui/issues/issue-17718-const-bad-values.stderr @@ -1,23 +1,23 @@ error[E0017]: references in constants may only refer to immutable values - --> $DIR/issue-17718-const-bad-values.rs:11:34 + --> $DIR/issue-17718-const-bad-values.rs:1:34 | LL | const C1: &'static mut [usize] = &mut []; | ^^^^^^^ constants require immutable values error[E0013]: constants cannot refer to statics, use a constant instead - --> $DIR/issue-17718-const-bad-values.rs:15:41 + --> $DIR/issue-17718-const-bad-values.rs:5:41 | LL | const C2: &'static mut usize = unsafe { &mut S }; | ^^^^^^ error[E0017]: references in constants may only refer to immutable values - --> $DIR/issue-17718-const-bad-values.rs:15:41 + --> $DIR/issue-17718-const-bad-values.rs:5:41 | LL | const C2: &'static mut usize = unsafe { &mut S }; | ^^^^^^ constants require immutable values error[E0017]: references in constants may only refer to immutable values - --> $DIR/issue-17718-const-bad-values.rs:15:32 + --> $DIR/issue-17718-const-bad-values.rs:5:32 | LL | const C2: &'static mut usize = unsafe { &mut S }; | ^^^^^^^^^^^^^^^^^ constants require immutable values diff --git a/src/test/ui/issues/issue-17718-const-borrow.rs b/src/test/ui/issues/issue-17718-const-borrow.rs index 07123c6949255..8a31bd0c66af6 100644 --- a/src/test/ui/issues/issue-17718-const-borrow.rs +++ b/src/test/ui/issues/issue-17718-const-borrow.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cell::UnsafeCell; const A: UnsafeCell = UnsafeCell::new(1); diff --git a/src/test/ui/issues/issue-17718-const-borrow.stderr b/src/test/ui/issues/issue-17718-const-borrow.stderr index 3b0217060f782..b4330049689e5 100644 --- a/src/test/ui/issues/issue-17718-const-borrow.stderr +++ b/src/test/ui/issues/issue-17718-const-borrow.stderr @@ -1,17 +1,17 @@ error[E0492]: cannot borrow a constant which may contain interior mutability, create a static instead - --> $DIR/issue-17718-const-borrow.rs:14:39 + --> $DIR/issue-17718-const-borrow.rs:4:39 | LL | const B: &'static UnsafeCell = &A; | ^^ error[E0492]: cannot borrow a constant which may contain interior mutability, create a static instead - --> $DIR/issue-17718-const-borrow.rs:19:39 + --> $DIR/issue-17718-const-borrow.rs:9:39 | LL | const E: &'static UnsafeCell = &D.a; | ^^^^ error[E0492]: cannot borrow a constant which may contain interior mutability, create a static instead - --> $DIR/issue-17718-const-borrow.rs:21:23 + --> $DIR/issue-17718-const-borrow.rs:11:23 | LL | const F: &'static C = &D; | ^^ diff --git a/src/test/ui/issues/issue-17718-const-naming.rs b/src/test/ui/issues/issue-17718-const-naming.rs index 4857c2fb446b5..9b3d84b3dd51c 100644 --- a/src/test/ui/issues/issue-17718-const-naming.rs +++ b/src/test/ui/issues/issue-17718-const-naming.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![warn(unused)] #[deny(warnings)] diff --git a/src/test/ui/issues/issue-17718-const-naming.stderr b/src/test/ui/issues/issue-17718-const-naming.stderr index 9636db31390d9..641e50a5fc9b7 100644 --- a/src/test/ui/issues/issue-17718-const-naming.stderr +++ b/src/test/ui/issues/issue-17718-const-naming.stderr @@ -1,24 +1,24 @@ error: constant item is never used: `foo` - --> $DIR/issue-17718-const-naming.rs:14:1 + --> $DIR/issue-17718-const-naming.rs:4:1 | LL | const foo: isize = 3; | ^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/issue-17718-const-naming.rs:12:8 + --> $DIR/issue-17718-const-naming.rs:2:8 | LL | #[deny(warnings)] | ^^^^^^^^ = note: #[deny(dead_code)] implied by #[deny(warnings)] error: constant `foo` should have an upper case name such as `FOO` - --> $DIR/issue-17718-const-naming.rs:14:1 + --> $DIR/issue-17718-const-naming.rs:4:1 | LL | const foo: isize = 3; | ^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/issue-17718-const-naming.rs:12:8 + --> $DIR/issue-17718-const-naming.rs:2:8 | LL | #[deny(warnings)] | ^^^^^^^^ diff --git a/src/test/ui/issues/issue-17718-const-privacy.rs b/src/test/ui/issues/issue-17718-const-privacy.rs index 523a387956a32..8fee815c0abb2 100644 --- a/src/test/ui/issues/issue-17718-const-privacy.rs +++ b/src/test/ui/issues/issue-17718-const-privacy.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_17718_const_privacy.rs extern crate issue_17718_const_privacy as other; diff --git a/src/test/ui/issues/issue-17718-const-privacy.stderr b/src/test/ui/issues/issue-17718-const-privacy.stderr index a453e599c8b43..5098d02ff573a 100644 --- a/src/test/ui/issues/issue-17718-const-privacy.stderr +++ b/src/test/ui/issues/issue-17718-const-privacy.stderr @@ -1,11 +1,11 @@ error[E0603]: constant `B` is private - --> $DIR/issue-17718-const-privacy.rs:15:5 + --> $DIR/issue-17718-const-privacy.rs:5:5 | LL | use a::B; //~ ERROR: constant `B` is private | ^^^^ error[E0603]: constant `BAR` is private - --> $DIR/issue-17718-const-privacy.rs:18:5 + --> $DIR/issue-17718-const-privacy.rs:8:5 | LL | BAR, //~ ERROR: constant `BAR` is private | ^^^ diff --git a/src/test/ui/issues/issue-17718-constants-not-static.rs b/src/test/ui/issues/issue-17718-constants-not-static.rs index 9b7ed463499de..e857b906efa7b 100644 --- a/src/test/ui/issues/issue-17718-constants-not-static.rs +++ b/src/test/ui/issues/issue-17718-constants-not-static.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn id(x: T) -> T { x } const FOO: usize = 3; diff --git a/src/test/ui/issues/issue-17718-constants-not-static.stderr b/src/test/ui/issues/issue-17718-constants-not-static.stderr index 61d8399aba9b1..2a5b9d7222345 100644 --- a/src/test/ui/issues/issue-17718-constants-not-static.stderr +++ b/src/test/ui/issues/issue-17718-constants-not-static.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/issue-17718-constants-not-static.rs:15:31 + --> $DIR/issue-17718-constants-not-static.rs:5:31 | LL | fn foo() -> &'static usize { &id(FOO) } | ^^^^^^^ - temporary value only lives until here diff --git a/src/test/ui/issues/issue-17718-patterns.rs b/src/test/ui/issues/issue-17718-patterns.rs index b9f5e98b6faa9..2ca0f67f80e5e 100644 --- a/src/test/ui/issues/issue-17718-patterns.rs +++ b/src/test/ui/issues/issue-17718-patterns.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - static A1: usize = 1; static mut A2: usize = 1; const A3: usize = 1; diff --git a/src/test/ui/issues/issue-17718-patterns.stderr b/src/test/ui/issues/issue-17718-patterns.stderr index 13cab9a08b1de..a28509375db89 100644 --- a/src/test/ui/issues/issue-17718-patterns.stderr +++ b/src/test/ui/issues/issue-17718-patterns.stderr @@ -1,5 +1,5 @@ error[E0530]: match bindings cannot shadow statics - --> $DIR/issue-17718-patterns.rs:17:9 + --> $DIR/issue-17718-patterns.rs:7:9 | LL | static A1: usize = 1; | --------------------- a static `A1` is defined here @@ -8,7 +8,7 @@ LL | A1 => {} //~ ERROR: match bindings cannot shadow statics | ^^ cannot be named the same as a static error[E0530]: match bindings cannot shadow statics - --> $DIR/issue-17718-patterns.rs:18:9 + --> $DIR/issue-17718-patterns.rs:8:9 | LL | static mut A2: usize = 1; | ------------------------- a static `A2` is defined here diff --git a/src/test/ui/issues/issue-17718-references.rs b/src/test/ui/issues/issue-17718-references.rs index 586cfebcd161c..03d5f8bb3f1c9 100644 --- a/src/test/ui/issues/issue-17718-references.rs +++ b/src/test/ui/issues/issue-17718-references.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(warnings)] struct Struct { a: usize } diff --git a/src/test/ui/issues/issue-17718-references.stderr b/src/test/ui/issues/issue-17718-references.stderr index 6e89a83b30872..ef49dcfeef9f4 100644 --- a/src/test/ui/issues/issue-17718-references.stderr +++ b/src/test/ui/issues/issue-17718-references.stderr @@ -1,17 +1,17 @@ error[E0013]: constants cannot refer to statics, use a constant instead - --> $DIR/issue-17718-references.rs:19:28 + --> $DIR/issue-17718-references.rs:9:28 | LL | const T2: &'static usize = &S; //~ ERROR: constants cannot refer to statics | ^^ error[E0013]: constants cannot refer to statics, use a constant instead - --> $DIR/issue-17718-references.rs:24:19 + --> $DIR/issue-17718-references.rs:14:19 | LL | const T6: usize = S; //~ ERROR: constants cannot refer to statics | ^ error[E0013]: constants cannot refer to statics, use a constant instead - --> $DIR/issue-17718-references.rs:29:33 + --> $DIR/issue-17718-references.rs:19:33 | LL | const T10: Struct = Struct { a: S }; | ^ diff --git a/src/test/ui/issues/issue-17718-static-move.nll.stderr b/src/test/ui/issues/issue-17718-static-move.nll.stderr index f8da3c3d5989e..86e7a18491041 100644 --- a/src/test/ui/issues/issue-17718-static-move.nll.stderr +++ b/src/test/ui/issues/issue-17718-static-move.nll.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of static item - --> $DIR/issue-17718-static-move.rs:16:14 + --> $DIR/issue-17718-static-move.rs:6:14 | LL | let _a = FOO; //~ ERROR: cannot move out of static item | ^^^ diff --git a/src/test/ui/issues/issue-17718-static-move.rs b/src/test/ui/issues/issue-17718-static-move.rs index a5a7117956f4a..015487a06aafe 100644 --- a/src/test/ui/issues/issue-17718-static-move.rs +++ b/src/test/ui/issues/issue-17718-static-move.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo; const INIT: Foo = Foo; static FOO: Foo = INIT; diff --git a/src/test/ui/issues/issue-17718-static-move.stderr b/src/test/ui/issues/issue-17718-static-move.stderr index a6384cfce8fd4..dd473f0a4c457 100644 --- a/src/test/ui/issues/issue-17718-static-move.stderr +++ b/src/test/ui/issues/issue-17718-static-move.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of static item - --> $DIR/issue-17718-static-move.rs:16:14 + --> $DIR/issue-17718-static-move.rs:6:14 | LL | let _a = FOO; //~ ERROR: cannot move out of static item | ^^^ diff --git a/src/test/ui/issues/issue-17718-static-sync.rs b/src/test/ui/issues/issue-17718-static-sync.rs index c5349d4e82b4b..dccbde6a3c532 100644 --- a/src/test/ui/issues/issue-17718-static-sync.rs +++ b/src/test/ui/issues/issue-17718-static-sync.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(optin_builtin_traits)] use std::marker::Sync; diff --git a/src/test/ui/issues/issue-17718-static-sync.stderr b/src/test/ui/issues/issue-17718-static-sync.stderr index d6816826a00b3..7f162a9985fd6 100644 --- a/src/test/ui/issues/issue-17718-static-sync.stderr +++ b/src/test/ui/issues/issue-17718-static-sync.stderr @@ -1,5 +1,5 @@ error[E0277]: `Foo` cannot be shared between threads safely - --> $DIR/issue-17718-static-sync.rs:19:1 + --> $DIR/issue-17718-static-sync.rs:9:1 | LL | static BAR: Foo = Foo; | ^^^^^^^^^^^^^^^^^^^^^^ `Foo` cannot be shared between threads safely diff --git a/src/test/ui/issues/issue-17728.nll.stderr b/src/test/ui/issues/issue-17728.nll.stderr index b9931e45bd238..384ae2ca001a0 100644 --- a/src/test/ui/issues/issue-17728.nll.stderr +++ b/src/test/ui/issues/issue-17728.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/issue-17728.rs:23:49 + --> $DIR/issue-17728.rs:13:49 | LL | let maybe_room = room.direction_to_room.get(&direction); | ^^^ error[E0308]: match arms have incompatible types - --> $DIR/issue-17728.rs:110:5 + --> $DIR/issue-17728.rs:100:5 | LL | / match to_parse { //~ ERROR match arms have incompatible types LL | | "w" | "west" => RoomDirection::West, diff --git a/src/test/ui/issues/issue-17728.rs b/src/test/ui/issues/issue-17728.rs index 8516a8ea52e42..256e7d34b4773 100644 --- a/src/test/ui/issues/issue-17728.rs +++ b/src/test/ui/issues/issue-17728.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt::{Debug, Formatter, Error}; use std::collections::HashMap; diff --git a/src/test/ui/issues/issue-17728.stderr b/src/test/ui/issues/issue-17728.stderr index e46c48c4c39b5..355868f05690f 100644 --- a/src/test/ui/issues/issue-17728.stderr +++ b/src/test/ui/issues/issue-17728.stderr @@ -1,5 +1,5 @@ error[E0623]: lifetime mismatch - --> $DIR/issue-17728.rs:25:28 + --> $DIR/issue-17728.rs:15:28 | LL | fn attemptTraverse(&self, room: &Room, directionStr: &str) -> Result<&Room, &str> { | ----- ------------------- @@ -10,7 +10,7 @@ LL | Some(entry) => Ok(entry), | ^^^^^^^^^ ...but data from `room` is returned here error[E0308]: match arms have incompatible types - --> $DIR/issue-17728.rs:110:5 + --> $DIR/issue-17728.rs:100:5 | LL | / match to_parse { //~ ERROR match arms have incompatible types LL | | "w" | "west" => RoomDirection::West, diff --git a/src/test/ui/issues/issue-17740.rs b/src/test/ui/issues/issue-17740.rs index 1d5ef4360dc1e..c131b895849ae 100644 --- a/src/test/ui/issues/issue-17740.rs +++ b/src/test/ui/issues/issue-17740.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo<'a> { data: &'a[u8], } diff --git a/src/test/ui/issues/issue-17740.stderr b/src/test/ui/issues/issue-17740.stderr index e4f5485953c68..c7a76c558ee8b 100644 --- a/src/test/ui/issues/issue-17740.stderr +++ b/src/test/ui/issues/issue-17740.stderr @@ -1,13 +1,13 @@ error[E0308]: mismatched method receiver - --> $DIR/issue-17740.rs:16:18 + --> $DIR/issue-17740.rs:6:18 | LL | fn bar(self: &mut Foo) { | ^^^^^^^^ lifetime mismatch | = note: expected type `Foo<'a>` found type `Foo<'_>` -note: the anonymous lifetime #2 defined on the method body at 16:5... - --> $DIR/issue-17740.rs:16:5 +note: the anonymous lifetime #2 defined on the method body at 6:5... + --> $DIR/issue-17740.rs:6:5 | LL | / fn bar(self: &mut Foo) { LL | | //~^ mismatched method receiver @@ -17,27 +17,27 @@ LL | | //~| found type `Foo<'_>` LL | | //~| lifetime mismatch LL | | } | |_____^ -note: ...does not necessarily outlive the lifetime 'a as defined on the impl at 15:7 - --> $DIR/issue-17740.rs:15:7 +note: ...does not necessarily outlive the lifetime 'a as defined on the impl at 5:7 + --> $DIR/issue-17740.rs:5:7 | LL | impl <'a> Foo<'a>{ | ^^ error[E0308]: mismatched method receiver - --> $DIR/issue-17740.rs:16:18 + --> $DIR/issue-17740.rs:6:18 | LL | fn bar(self: &mut Foo) { | ^^^^^^^^ lifetime mismatch | = note: expected type `Foo<'a>` found type `Foo<'_>` -note: the lifetime 'a as defined on the impl at 15:7... - --> $DIR/issue-17740.rs:15:7 +note: the lifetime 'a as defined on the impl at 5:7... + --> $DIR/issue-17740.rs:5:7 | LL | impl <'a> Foo<'a>{ | ^^ -note: ...does not necessarily outlive the anonymous lifetime #2 defined on the method body at 16:5 - --> $DIR/issue-17740.rs:16:5 +note: ...does not necessarily outlive the anonymous lifetime #2 defined on the method body at 6:5 + --> $DIR/issue-17740.rs:6:5 | LL | / fn bar(self: &mut Foo) { LL | | //~^ mismatched method receiver diff --git a/src/test/ui/issues/issue-17758.nll.stderr b/src/test/ui/issues/issue-17758.nll.stderr index c51a72f885d6c..f2acc5d4f5c32 100644 --- a/src/test/ui/issues/issue-17758.nll.stderr +++ b/src/test/ui/issues/issue-17758.nll.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/issue-17758.rs:17:9 + --> $DIR/issue-17758.rs:7:9 | LL | self.foo(); | ^^^^ warning: not reporting region error due to nll - --> $DIR/issue-17758.rs:17:14 + --> $DIR/issue-17758.rs:7:14 | LL | self.foo(); | ^^^ error: borrowed data escapes outside of function - --> $DIR/issue-17758.rs:17:9 + --> $DIR/issue-17758.rs:7:9 | LL | fn bar(&self) { | ----- `self` is a reference that is only valid in the function body diff --git a/src/test/ui/issues/issue-17758.rs b/src/test/ui/issues/issue-17758.rs index a47f5c16a4691..d0dbd3455df78 100644 --- a/src/test/ui/issues/issue-17758.rs +++ b/src/test/ui/issues/issue-17758.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that regionck suggestions in a provided method of a trait // don't ICE diff --git a/src/test/ui/issues/issue-17758.stderr b/src/test/ui/issues/issue-17758.stderr index 3d78b2e2d7f9d..b376757091dd3 100644 --- a/src/test/ui/issues/issue-17758.stderr +++ b/src/test/ui/issues/issue-17758.stderr @@ -1,11 +1,11 @@ error[E0495]: cannot infer an appropriate lifetime for autoref due to conflicting requirements - --> $DIR/issue-17758.rs:17:14 + --> $DIR/issue-17758.rs:7:14 | LL | self.foo(); | ^^^ | -note: first, the lifetime cannot outlive the anonymous lifetime #1 defined on the method body at 16:5... - --> $DIR/issue-17758.rs:16:5 +note: first, the lifetime cannot outlive the anonymous lifetime #1 defined on the method body at 6:5... + --> $DIR/issue-17758.rs:6:5 | LL | / fn bar(&self) { LL | | self.foo(); @@ -13,12 +13,12 @@ LL | | //~^ ERROR cannot infer LL | | } | |_____^ note: ...so that reference does not outlive borrowed content - --> $DIR/issue-17758.rs:17:9 + --> $DIR/issue-17758.rs:7:9 | LL | self.foo(); | ^^^^ -note: but, the lifetime must be valid for the lifetime 'a as defined on the trait at 14:11... - --> $DIR/issue-17758.rs:14:11 +note: but, the lifetime must be valid for the lifetime 'a as defined on the trait at 4:11... + --> $DIR/issue-17758.rs:4:11 | LL | trait Foo<'a> { | ^^ diff --git a/src/test/ui/issues/issue-17800.rs b/src/test/ui/issues/issue-17800.rs index f7cae91aa93a4..2f9e382fef7c7 100644 --- a/src/test/ui/issues/issue-17800.rs +++ b/src/test/ui/issues/issue-17800.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum MyOption { MySome(T), MyNone, diff --git a/src/test/ui/issues/issue-17800.stderr b/src/test/ui/issues/issue-17800.stderr index 2cc562fbd7a1a..e8519075bc1e6 100644 --- a/src/test/ui/issues/issue-17800.stderr +++ b/src/test/ui/issues/issue-17800.stderr @@ -1,11 +1,11 @@ error[E0026]: variant `MyOption::MySome` does not have a field named `x` - --> $DIR/issue-17800.rs:18:28 + --> $DIR/issue-17800.rs:8:28 | LL | MyOption::MySome { x: 42 } => (), | ^^^^^ variant `MyOption::MySome` does not have this field error[E0027]: pattern does not mention field `0` - --> $DIR/issue-17800.rs:18:9 + --> $DIR/issue-17800.rs:8:9 | LL | MyOption::MySome { x: 42 } => (), | ^^^^^^^^^^^^^^^^^^^^^^^^^^ missing field `0` diff --git a/src/test/ui/issues/issue-17904-2.rs b/src/test/ui/issues/issue-17904-2.rs index a15ccb71aa733..9603da097b1cf 100644 --- a/src/test/ui/issues/issue-17904-2.rs +++ b/src/test/ui/issues/issue-17904-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that we can parse a unit struct with a where clause, even if // it leads to an error later on since `T` is unused. diff --git a/src/test/ui/issues/issue-17904-2.stderr b/src/test/ui/issues/issue-17904-2.stderr index 00013d4d52bec..b4f9745257492 100644 --- a/src/test/ui/issues/issue-17904-2.stderr +++ b/src/test/ui/issues/issue-17904-2.stderr @@ -1,5 +1,5 @@ error[E0392]: parameter `T` is never used - --> $DIR/issue-17904-2.rs:14:12 + --> $DIR/issue-17904-2.rs:4:12 | LL | struct Foo where T: Copy; //~ ERROR parameter `T` is never used | ^ unused type parameter diff --git a/src/test/ui/issues/issue-17905.rs b/src/test/ui/issues/issue-17905.rs index f11d482ea16db..3492f5e3915a2 100644 --- a/src/test/ui/issues/issue-17905.rs +++ b/src/test/ui/issues/issue-17905.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Debug)] struct Pair (T, V); diff --git a/src/test/ui/issues/issue-17905.stderr b/src/test/ui/issues/issue-17905.stderr index 1a7aba1748015..3ac58c5385573 100644 --- a/src/test/ui/issues/issue-17905.stderr +++ b/src/test/ui/issues/issue-17905.stderr @@ -1,5 +1,5 @@ error[E0106]: missing lifetime specifier - --> $DIR/issue-17905.rs:15:5 + --> $DIR/issue-17905.rs:5:5 | LL | &str, //~ ERROR missing lifetime specifier | ^ expected lifetime parameter diff --git a/src/test/ui/issues/issue-17913.rs b/src/test/ui/issues/issue-17913.rs index 9b9159994aca4..b0c4ef54b165d 100644 --- a/src/test/ui/issues/issue-17913.rs +++ b/src/test/ui/issues/issue-17913.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // normalize-stderr-test "\[&usize; \d+\]" -> "[&usize; N]" // error-pattern: too big for the current architecture diff --git a/src/test/ui/issues/issue-17933.rs b/src/test/ui/issues/issue-17933.rs index 049a0665c5458..c649b64dcd44a 100644 --- a/src/test/ui/issues/issue-17933.rs +++ b/src/test/ui/issues/issue-17933.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub static X: usize = 1; fn main() { diff --git a/src/test/ui/issues/issue-17933.stderr b/src/test/ui/issues/issue-17933.stderr index ec0f4785c8fa8..e48a65087f4a3 100644 --- a/src/test/ui/issues/issue-17933.stderr +++ b/src/test/ui/issues/issue-17933.stderr @@ -1,5 +1,5 @@ error[E0532]: expected unit struct/variant or constant, found static `self::X` - --> $DIR/issue-17933.rs:15:9 + --> $DIR/issue-17933.rs:5:9 | LL | self::X => { }, | ^^^^^^^ not a unit struct/variant or constant diff --git a/src/test/ui/issues/issue-17954.nll.stderr b/src/test/ui/issues/issue-17954.nll.stderr index 67a5e3eaec787..e08375fee1fe4 100644 --- a/src/test/ui/issues/issue-17954.nll.stderr +++ b/src/test/ui/issues/issue-17954.nll.stderr @@ -1,5 +1,5 @@ error[E0712]: thread-local variable borrowed past end of function - --> $DIR/issue-17954.rs:17:13 + --> $DIR/issue-17954.rs:7:13 | LL | let a = &FOO; | ^^^^ thread-local variables cannot be borrowed beyond the end of the function diff --git a/src/test/ui/issues/issue-17954.rs b/src/test/ui/issues/issue-17954.rs index ce554a7254812..49ef4a45cdb00 100644 --- a/src/test/ui/issues/issue-17954.rs +++ b/src/test/ui/issues/issue-17954.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(thread_local)] #[thread_local] diff --git a/src/test/ui/issues/issue-17954.stderr b/src/test/ui/issues/issue-17954.stderr index 76858a9b097b2..25bed414c06bb 100644 --- a/src/test/ui/issues/issue-17954.stderr +++ b/src/test/ui/issues/issue-17954.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/issue-17954.rs:17:14 + --> $DIR/issue-17954.rs:7:14 | LL | let a = &FOO; | ^^^ temporary value does not live long enough diff --git a/src/test/ui/issues/issue-17959.rs b/src/test/ui/issues/issue-17959.rs index 37c8173c4f66b..d56f346ecd45a 100644 --- a/src/test/ui/issues/issue-17959.rs +++ b/src/test/ui/issues/issue-17959.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern crate core; use core::ops::Drop; diff --git a/src/test/ui/issues/issue-17959.stderr b/src/test/ui/issues/issue-17959.stderr index 626b670ae3555..790e8f7c79824 100644 --- a/src/test/ui/issues/issue-17959.stderr +++ b/src/test/ui/issues/issue-17959.stderr @@ -1,5 +1,5 @@ error[E0367]: The requirement `T: std::marker::Sized` is added only by the Drop impl. - --> $DIR/issue-17959.rs:21:1 + --> $DIR/issue-17959.rs:11:1 | LL | / impl Drop for G { LL | | //~^ ERROR: The requirement `T: std::marker::Sized` is added only by the Drop impl. [E0367] @@ -11,7 +11,7 @@ LL | | } | |_^ | note: The same requirement must be part of the struct/enum definition - --> $DIR/issue-17959.rs:17:1 + --> $DIR/issue-17959.rs:7:1 | LL | / struct G { LL | | _ptr: *const T diff --git a/src/test/ui/issues/issue-17994.rs b/src/test/ui/issues/issue-17994.rs index 25141b9b82557..39b0a7ebe74d8 100644 --- a/src/test/ui/issues/issue-17994.rs +++ b/src/test/ui/issues/issue-17994.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Tr {} type Huh where T: Tr = isize; //~ ERROR type parameter `T` is unused fn main() {} diff --git a/src/test/ui/issues/issue-17994.stderr b/src/test/ui/issues/issue-17994.stderr index 77bcc4695389f..e22b2c0719736 100644 --- a/src/test/ui/issues/issue-17994.stderr +++ b/src/test/ui/issues/issue-17994.stderr @@ -1,5 +1,5 @@ error[E0091]: type parameter `T` is unused - --> $DIR/issue-17994.rs:12:10 + --> $DIR/issue-17994.rs:2:10 | LL | type Huh where T: Tr = isize; //~ ERROR type parameter `T` is unused | ^ unused type parameter diff --git a/src/test/ui/issues/issue-17999.rs b/src/test/ui/issues/issue-17999.rs index 88945f80eae91..941f1e7755afe 100644 --- a/src/test/ui/issues/issue-17999.rs +++ b/src/test/ui/issues/issue-17999.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(unused_variables)] fn main() { diff --git a/src/test/ui/issues/issue-17999.stderr b/src/test/ui/issues/issue-17999.stderr index 1a24015da541a..3f32dc1540232 100644 --- a/src/test/ui/issues/issue-17999.stderr +++ b/src/test/ui/issues/issue-17999.stderr @@ -1,17 +1,17 @@ error: unused variable: `x` - --> $DIR/issue-17999.rs:15:13 + --> $DIR/issue-17999.rs:5:13 | LL | let x = (); //~ ERROR: unused variable: `x` | ^ help: consider using `_x` instead | note: lint level defined here - --> $DIR/issue-17999.rs:11:9 + --> $DIR/issue-17999.rs:1:9 | LL | #![deny(unused_variables)] | ^^^^^^^^^^^^^^^^ error: unused variable: `a` - --> $DIR/issue-17999.rs:17:13 + --> $DIR/issue-17999.rs:7:13 | LL | a => {} //~ ERROR: unused variable: `a` | ^ help: consider using `_a` instead diff --git a/src/test/ui/issues/issue-18058.rs b/src/test/ui/issues/issue-18058.rs index 4c815e689d462..cced66717e1bf 100644 --- a/src/test/ui/issues/issue-18058.rs +++ b/src/test/ui/issues/issue-18058.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - impl Undefined {} //~^ ERROR cannot find type `Undefined` in this scope diff --git a/src/test/ui/issues/issue-18058.stderr b/src/test/ui/issues/issue-18058.stderr index ded375a9332ef..18159ffc23840 100644 --- a/src/test/ui/issues/issue-18058.stderr +++ b/src/test/ui/issues/issue-18058.stderr @@ -1,5 +1,5 @@ error[E0412]: cannot find type `Undefined` in this scope - --> $DIR/issue-18058.rs:11:6 + --> $DIR/issue-18058.rs:1:6 | LL | impl Undefined {} | ^^^^^^^^^ not found in this scope diff --git a/src/test/ui/issues/issue-18107.rs b/src/test/ui/issues/issue-18107.rs index 260038b7add59..184d122d5cd61 100644 --- a/src/test/ui/issues/issue-18107.rs +++ b/src/test/ui/issues/issue-18107.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait AbstractRenderer {} fn _create_render(_: &()) -> diff --git a/src/test/ui/issues/issue-18107.stderr b/src/test/ui/issues/issue-18107.stderr index c813e290b9e6a..4bad37df2edfe 100644 --- a/src/test/ui/issues/issue-18107.stderr +++ b/src/test/ui/issues/issue-18107.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `(dyn AbstractRenderer + 'static)` cannot be known at compilation time - --> $DIR/issue-18107.rs:14:5 + --> $DIR/issue-18107.rs:4:5 | LL | AbstractRenderer | ^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time diff --git a/src/test/ui/issues/issue-18118-2.rs b/src/test/ui/issues/issue-18118-2.rs index 6efe532b5fdf6..6d52156b3d2de 100644 --- a/src/test/ui/issues/issue-18118-2.rs +++ b/src/test/ui/issues/issue-18118-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { const z: &'static isize = { static p: isize = 3; diff --git a/src/test/ui/issues/issue-18118-2.stderr b/src/test/ui/issues/issue-18118-2.stderr index c0b306140c57a..4e848c261be33 100644 --- a/src/test/ui/issues/issue-18118-2.stderr +++ b/src/test/ui/issues/issue-18118-2.stderr @@ -1,5 +1,5 @@ error[E0013]: constants cannot refer to statics, use a constant instead - --> $DIR/issue-18118-2.rs:14:9 + --> $DIR/issue-18118-2.rs:4:9 | LL | &p | ^^ diff --git a/src/test/ui/issues/issue-18118.nll.stderr b/src/test/ui/issues/issue-18118.nll.stderr index 860359b5937cc..d4517c9fd4b55 100644 --- a/src/test/ui/issues/issue-18118.nll.stderr +++ b/src/test/ui/issues/issue-18118.nll.stderr @@ -1,5 +1,5 @@ error[E0658]: let bindings in constants are unstable (see issue #48821) - --> $DIR/issue-18118.rs:15:17 + --> $DIR/issue-18118.rs:5:17 | LL | let p = 3; | ^ @@ -7,7 +7,7 @@ LL | let p = 3; = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: statements in constants are unstable (see issue #48821) - --> $DIR/issue-18118.rs:15:17 + --> $DIR/issue-18118.rs:5:17 | LL | let p = 3; | ^ @@ -15,7 +15,7 @@ LL | let p = 3; = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: let bindings in constants are unstable (see issue #48821) - --> $DIR/issue-18118.rs:18:9 + --> $DIR/issue-18118.rs:8:9 | LL | &p //~ ERROR `p` does not live long enough | ^^ @@ -23,7 +23,7 @@ LL | &p //~ ERROR `p` does not live long enough = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: let bindings in constants are unstable (see issue #48821) - --> $DIR/issue-18118.rs:12:5 + --> $DIR/issue-18118.rs:2:5 | LL | / const z: &'static isize = { LL | | //~^ ERROR let bindings in constants are unstable @@ -37,7 +37,7 @@ LL | | }; = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: statements in constants are unstable (see issue #48821) - --> $DIR/issue-18118.rs:12:5 + --> $DIR/issue-18118.rs:2:5 | LL | / const z: &'static isize = { LL | | //~^ ERROR let bindings in constants are unstable @@ -51,7 +51,7 @@ LL | | }; = help: add #![feature(const_let)] to the crate attributes to enable error[E0597]: `p` does not live long enough - --> $DIR/issue-18118.rs:18:9 + --> $DIR/issue-18118.rs:8:9 | LL | &p //~ ERROR `p` does not live long enough | ^^ borrowed value does not live long enough diff --git a/src/test/ui/issues/issue-18118.rs b/src/test/ui/issues/issue-18118.rs index 7194c159c1e98..7bbea191cd167 100644 --- a/src/test/ui/issues/issue-18118.rs +++ b/src/test/ui/issues/issue-18118.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub fn main() { const z: &'static isize = { //~^ ERROR let bindings in constants are unstable diff --git a/src/test/ui/issues/issue-18118.stderr b/src/test/ui/issues/issue-18118.stderr index 2d83b86e5f40b..1383cdb4438c9 100644 --- a/src/test/ui/issues/issue-18118.stderr +++ b/src/test/ui/issues/issue-18118.stderr @@ -1,5 +1,5 @@ error[E0658]: let bindings in constants are unstable (see issue #48821) - --> $DIR/issue-18118.rs:15:17 + --> $DIR/issue-18118.rs:5:17 | LL | let p = 3; | ^ @@ -7,7 +7,7 @@ LL | let p = 3; = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: statements in constants are unstable (see issue #48821) - --> $DIR/issue-18118.rs:15:17 + --> $DIR/issue-18118.rs:5:17 | LL | let p = 3; | ^ @@ -15,7 +15,7 @@ LL | let p = 3; = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: let bindings in constants are unstable (see issue #48821) - --> $DIR/issue-18118.rs:18:9 + --> $DIR/issue-18118.rs:8:9 | LL | &p //~ ERROR `p` does not live long enough | ^^ @@ -23,7 +23,7 @@ LL | &p //~ ERROR `p` does not live long enough = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: let bindings in constants are unstable (see issue #48821) - --> $DIR/issue-18118.rs:12:5 + --> $DIR/issue-18118.rs:2:5 | LL | / const z: &'static isize = { LL | | //~^ ERROR let bindings in constants are unstable @@ -37,7 +37,7 @@ LL | | }; = help: add #![feature(const_let)] to the crate attributes to enable error[E0658]: statements in constants are unstable (see issue #48821) - --> $DIR/issue-18118.rs:12:5 + --> $DIR/issue-18118.rs:2:5 | LL | / const z: &'static isize = { LL | | //~^ ERROR let bindings in constants are unstable @@ -51,7 +51,7 @@ LL | | }; = help: add #![feature(const_let)] to the crate attributes to enable error[E0597]: `p` does not live long enough - --> $DIR/issue-18118.rs:18:10 + --> $DIR/issue-18118.rs:8:10 | LL | &p //~ ERROR `p` does not live long enough | ^ borrowed value does not live long enough diff --git a/src/test/ui/issues/issue-18119.rs b/src/test/ui/issues/issue-18119.rs index 412f7566f472b..e48dc51a2c644 100644 --- a/src/test/ui/issues/issue-18119.rs +++ b/src/test/ui/issues/issue-18119.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const X: u8 = 1; static Y: u8 = 1; fn foo() {} diff --git a/src/test/ui/issues/issue-18119.stderr b/src/test/ui/issues/issue-18119.stderr index e0e2d089b7b1f..ddee5a9da7a42 100644 --- a/src/test/ui/issues/issue-18119.stderr +++ b/src/test/ui/issues/issue-18119.stderr @@ -1,17 +1,17 @@ error[E0573]: expected type, found constant `X` - --> $DIR/issue-18119.rs:15:6 + --> $DIR/issue-18119.rs:5:6 | LL | impl X {} | ^ not a type error[E0573]: expected type, found static `Y` - --> $DIR/issue-18119.rs:17:6 + --> $DIR/issue-18119.rs:7:6 | LL | impl Y {} | ^ not a type error[E0573]: expected type, found function `foo` - --> $DIR/issue-18119.rs:19:6 + --> $DIR/issue-18119.rs:9:6 | LL | impl foo {} | ^^^ not a type diff --git a/src/test/ui/issues/issue-18159.rs b/src/test/ui/issues/issue-18159.rs index 8991eded3d6b8..bd347d6329846 100644 --- a/src/test/ui/issues/issue-18159.rs +++ b/src/test/ui/issues/issue-18159.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x; //~ ERROR type annotations needed } diff --git a/src/test/ui/issues/issue-18159.stderr b/src/test/ui/issues/issue-18159.stderr index 084e859111bf1..25b7051a88004 100644 --- a/src/test/ui/issues/issue-18159.stderr +++ b/src/test/ui/issues/issue-18159.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/issue-18159.rs:12:9 + --> $DIR/issue-18159.rs:2:9 | LL | let x; //~ ERROR type annotations needed | ^ diff --git a/src/test/ui/issues/issue-18183.rs b/src/test/ui/issues/issue-18183.rs index 2cad4a3175f4d..64476d1c10999 100644 --- a/src/test/ui/issues/issue-18183.rs +++ b/src/test/ui/issues/issue-18183.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct Foo(Bar); //~ ERROR E0128 pub struct Baz(Foo); fn main() {} diff --git a/src/test/ui/issues/issue-18183.stderr b/src/test/ui/issues/issue-18183.stderr index 169a3019d521c..cf33124bc950a 100644 --- a/src/test/ui/issues/issue-18183.stderr +++ b/src/test/ui/issues/issue-18183.stderr @@ -1,5 +1,5 @@ error[E0128]: type parameters with a default cannot use forward declared identifiers - --> $DIR/issue-18183.rs:11:20 + --> $DIR/issue-18183.rs:1:20 | LL | pub struct Foo(Bar); //~ ERROR E0128 | ^^^ defaulted type parameters cannot be forward declared diff --git a/src/test/ui/issues/issue-18294.rs b/src/test/ui/issues/issue-18294.rs index 28dc6846f69e1..df4fd1642f2bc 100644 --- a/src/test/ui/issues/issue-18294.rs +++ b/src/test/ui/issues/issue-18294.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { const X: u32 = 1; const Y: usize = &X as *const u32 as usize; //~ ERROR is unstable diff --git a/src/test/ui/issues/issue-18294.stderr b/src/test/ui/issues/issue-18294.stderr index 0b94e778d3771..2af7f45628e37 100644 --- a/src/test/ui/issues/issue-18294.stderr +++ b/src/test/ui/issues/issue-18294.stderr @@ -1,5 +1,5 @@ error[E0658]: casting pointers to integers in constants is unstable (see issue #51910) - --> $DIR/issue-18294.rs:13:22 + --> $DIR/issue-18294.rs:3:22 | LL | const Y: usize = &X as *const u32 as usize; //~ ERROR is unstable | ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-18389.rs b/src/test/ui/issues/issue-18389.rs index aad3d52153a2d..654dfb63b88be 100644 --- a/src/test/ui/issues/issue-18389.rs +++ b/src/test/ui/issues/issue-18389.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::any::Any; use std::any::TypeId; diff --git a/src/test/ui/issues/issue-18389.stderr b/src/test/ui/issues/issue-18389.stderr index 6f067301d042e..9cbe8c05b7e3d 100644 --- a/src/test/ui/issues/issue-18389.stderr +++ b/src/test/ui/issues/issue-18389.stderr @@ -1,5 +1,5 @@ error[E0445]: private trait `Private<::P, ::R>` in public interface - --> $DIR/issue-18389.rs:17:1 + --> $DIR/issue-18389.rs:7:1 | LL | / pub trait Public: Private< LL | | //~^ ERROR private trait `Private<::P, ::R>` in public interface diff --git a/src/test/ui/issues/issue-18400.rs b/src/test/ui/issues/issue-18400.rs index dd17189aeea68..fdd11512da3a3 100644 --- a/src/test/ui/issues/issue-18400.rs +++ b/src/test/ui/issues/issue-18400.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Set { fn contains(&self, _: T) -> bool; fn set(&mut self, _: T); diff --git a/src/test/ui/issues/issue-18400.stderr b/src/test/ui/issues/issue-18400.stderr index 2426d429ca153..9c496cac88e7d 100644 --- a/src/test/ui/issues/issue-18400.stderr +++ b/src/test/ui/issues/issue-18400.stderr @@ -1,5 +1,5 @@ error[E0275]: overflow evaluating the requirement `_: std::marker::Sized` - --> $DIR/issue-18400.rs:34:7 + --> $DIR/issue-18400.rs:24:7 | LL | 0.contains(bits); | ^^^^^^^^ diff --git a/src/test/ui/issues/issue-18423.rs b/src/test/ui/issues/issue-18423.rs index f550dc6f310ff..c072e6b5d22b5 100644 --- a/src/test/ui/issues/issue-18423.rs +++ b/src/test/ui/issues/issue-18423.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that `Box` cannot be used with a lifetime argument. struct Foo<'a> { diff --git a/src/test/ui/issues/issue-18423.stderr b/src/test/ui/issues/issue-18423.stderr index 49afd51309241..96652767a05c3 100644 --- a/src/test/ui/issues/issue-18423.stderr +++ b/src/test/ui/issues/issue-18423.stderr @@ -1,5 +1,5 @@ error[E0107]: wrong number of lifetime arguments: expected 0, found 1 - --> $DIR/issue-18423.rs:14:12 + --> $DIR/issue-18423.rs:4:12 | LL | x: Box<'a, isize> //~ ERROR wrong number of lifetime arguments | ^^ unexpected lifetime argument diff --git a/src/test/ui/issues/issue-18446.rs b/src/test/ui/issues/issue-18446.rs index 60afea5a621bd..64c89df3868cc 100644 --- a/src/test/ui/issues/issue-18446.rs +++ b/src/test/ui/issues/issue-18446.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that name clashes between the method in an impl for the type // and the method in the trait when both are in the same scope. diff --git a/src/test/ui/issues/issue-18446.stderr b/src/test/ui/issues/issue-18446.stderr index d1914fc14f832..8aff0309aa77f 100644 --- a/src/test/ui/issues/issue-18446.stderr +++ b/src/test/ui/issues/issue-18446.stderr @@ -1,16 +1,16 @@ error[E0034]: multiple applicable items in scope - --> $DIR/issue-18446.rs:28:7 + --> $DIR/issue-18446.rs:18:7 | LL | x.foo(); //~ ERROR multiple applicable items in scope [E0034] | ^^^ multiple `foo` found | note: candidate #1 is defined in an impl for the type `dyn T` - --> $DIR/issue-18446.rs:19:5 + --> $DIR/issue-18446.rs:9:5 | LL | fn foo(&self) {} | ^^^^^^^^^^^^^ note: candidate #2 is defined in the trait `T` - --> $DIR/issue-18446.rs:15:5 + --> $DIR/issue-18446.rs:5:5 | LL | fn foo(&self); | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-18532.rs b/src/test/ui/issues/issue-18532.rs index 2be5fdcac4ede..31fd87961dc9f 100644 --- a/src/test/ui/issues/issue-18532.rs +++ b/src/test/ui/issues/issue-18532.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that overloaded call parameter checking does not ICE // when a type error or unconstrained type variable propagates // into it. diff --git a/src/test/ui/issues/issue-18532.stderr b/src/test/ui/issues/issue-18532.stderr index 8f10cb0f7b03d..e93032039bb2f 100644 --- a/src/test/ui/issues/issue-18532.stderr +++ b/src/test/ui/issues/issue-18532.stderr @@ -1,5 +1,5 @@ error[E0618]: expected function, found `!` - --> $DIR/issue-18532.rs:16:5 + --> $DIR/issue-18532.rs:6:5 | LL | (return)((),()); //~ ERROR expected function, found `!` | ^^^^^^^^^^^^^^^ not a function diff --git a/src/test/ui/issues/issue-18566.nll.stderr b/src/test/ui/issues/issue-18566.nll.stderr index b5ed33d07c5a5..1197123fc3db7 100644 --- a/src/test/ui/issues/issue-18566.nll.stderr +++ b/src/test/ui/issues/issue-18566.nll.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `*s` as mutable more than once at a time - --> $DIR/issue-18566.rs:33:19 + --> $DIR/issue-18566.rs:23:19 | LL | MyPtr(s).poke(s); | --------------^- diff --git a/src/test/ui/issues/issue-18566.rs b/src/test/ui/issues/issue-18566.rs index 41e82d0cd8912..9da904acf1f2b 100644 --- a/src/test/ui/issues/issue-18566.rs +++ b/src/test/ui/issues/issue-18566.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::Deref; struct MyPtr<'a>(&'a mut usize); diff --git a/src/test/ui/issues/issue-18566.stderr b/src/test/ui/issues/issue-18566.stderr index e07fde114f253..90c3af48eb482 100644 --- a/src/test/ui/issues/issue-18566.stderr +++ b/src/test/ui/issues/issue-18566.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `*s` as mutable more than once at a time - --> $DIR/issue-18566.rs:33:19 + --> $DIR/issue-18566.rs:23:19 | LL | MyPtr(s).poke(s); | - ^- first borrow ends here diff --git a/src/test/ui/issues/issue-18611.rs b/src/test/ui/issues/issue-18611.rs index a3ad76e1be06b..91a765f34efc3 100644 --- a/src/test/ui/issues/issue-18611.rs +++ b/src/test/ui/issues/issue-18611.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn add_state(op: ::State) { //~^ ERROR `isize: HasState` is not satisfied } diff --git a/src/test/ui/issues/issue-18611.stderr b/src/test/ui/issues/issue-18611.stderr index d890a322f0c98..8fa7694dc6c36 100644 --- a/src/test/ui/issues/issue-18611.stderr +++ b/src/test/ui/issues/issue-18611.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `isize: HasState` is not satisfied - --> $DIR/issue-18611.rs:11:1 + --> $DIR/issue-18611.rs:1:1 | LL | / fn add_state(op: ::State) { LL | | //~^ ERROR `isize: HasState` is not satisfied diff --git a/src/test/ui/issues/issue-1871.rs b/src/test/ui/issues/issue-1871.rs index e4d132c86415a..f7a2bdd565989 100644 --- a/src/test/ui/issues/issue-1871.rs +++ b/src/test/ui/issues/issue-1871.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Tests that we don't generate a spurious error about f.honk's type // being undeterminable fn main() { diff --git a/src/test/ui/issues/issue-1871.stderr b/src/test/ui/issues/issue-1871.stderr index 0546848df9b66..10b0825c34e1b 100644 --- a/src/test/ui/issues/issue-1871.stderr +++ b/src/test/ui/issues/issue-1871.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `honk` found for type `{integer}` in the current scope - --> $DIR/issue-1871.rs:17:9 + --> $DIR/issue-1871.rs:7:9 | LL | f.honk() //~ ERROR no method named `honk` found | ^^^^ diff --git a/src/test/ui/issues/issue-18783.nll.stderr b/src/test/ui/issues/issue-18783.nll.stderr index 8acdc73bf0e68..63ac9be5e6928 100644 --- a/src/test/ui/issues/issue-18783.nll.stderr +++ b/src/test/ui/issues/issue-18783.nll.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `y` as mutable more than once at a time - --> $DIR/issue-18783.rs:17:21 + --> $DIR/issue-18783.rs:7:21 | LL | c.push(Box::new(|| y = 0)); | -- - first borrow occurs due to use of `y` in closure @@ -14,7 +14,7 @@ LL | } | - borrow later used here, when `c` is dropped error[E0499]: cannot borrow `y` as mutable more than once at a time - --> $DIR/issue-18783.rs:26:29 + --> $DIR/issue-18783.rs:16:29 | LL | Push::push(&c, Box::new(|| y = 0)); | -- - first borrow occurs due to use of `y` in closure diff --git a/src/test/ui/issues/issue-18783.rs b/src/test/ui/issues/issue-18783.rs index 9a7b3781f1e24..b84a1adb42569 100644 --- a/src/test/ui/issues/issue-18783.rs +++ b/src/test/ui/issues/issue-18783.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::cell::RefCell; fn main() { diff --git a/src/test/ui/issues/issue-18783.stderr b/src/test/ui/issues/issue-18783.stderr index 64d2809a36ae1..68eb5167ecbdc 100644 --- a/src/test/ui/issues/issue-18783.stderr +++ b/src/test/ui/issues/issue-18783.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `y` as mutable more than once at a time - --> $DIR/issue-18783.rs:17:21 + --> $DIR/issue-18783.rs:7:21 | LL | c.push(Box::new(|| y = 0)); | -- - previous borrow occurs due to use of `y` in closure @@ -14,7 +14,7 @@ LL | } | - first borrow ends here error[E0499]: cannot borrow `y` as mutable more than once at a time - --> $DIR/issue-18783.rs:26:29 + --> $DIR/issue-18783.rs:16:29 | LL | Push::push(&c, Box::new(|| y = 0)); | -- - previous borrow occurs due to use of `y` in closure diff --git a/src/test/ui/issues/issue-18819.rs b/src/test/ui/issues/issue-18819.rs index c6f60f1cbba86..80db056e7dd3a 100644 --- a/src/test/ui/issues/issue-18819.rs +++ b/src/test/ui/issues/issue-18819.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { type Item; } diff --git a/src/test/ui/issues/issue-18819.stderr b/src/test/ui/issues/issue-18819.stderr index 86926863598b2..eb7e4ad405fa1 100644 --- a/src/test/ui/issues/issue-18819.stderr +++ b/src/test/ui/issues/issue-18819.stderr @@ -1,5 +1,5 @@ error[E0061]: this function takes 2 parameters but 1 parameter was supplied - --> $DIR/issue-18819.rs:26:5 + --> $DIR/issue-18819.rs:16:5 | LL | fn print_x(_: &Foo, extra: &str) { | ------------------------------------------- defined here diff --git a/src/test/ui/issues/issue-18919.rs b/src/test/ui/issues/issue-18919.rs index cc87a0977a0cc..9db3084918239 100644 --- a/src/test/ui/issues/issue-18919.rs +++ b/src/test/ui/issues/issue-18919.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - type FuncType<'f> = Fn(&isize) -> isize + 'f; fn ho_func(f: Option) { diff --git a/src/test/ui/issues/issue-18919.stderr b/src/test/ui/issues/issue-18919.stderr index 0e71b0bbedde2..cbad31a40cb6d 100644 --- a/src/test/ui/issues/issue-18919.stderr +++ b/src/test/ui/issues/issue-18919.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `dyn for<'r> std::ops::Fn(&'r isize) -> isize` cannot be known at compilation time - --> $DIR/issue-18919.rs:13:1 + --> $DIR/issue-18919.rs:3:1 | LL | / fn ho_func(f: Option) { LL | | //~^ ERROR the size for values of type diff --git a/src/test/ui/issues/issue-18937.rs b/src/test/ui/issues/issue-18937.rs index f7f84e6452ddb..f3824765f237a 100644 --- a/src/test/ui/issues/issue-18937.rs +++ b/src/test/ui/issues/issue-18937.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #18937. use std::fmt; diff --git a/src/test/ui/issues/issue-18937.stderr b/src/test/ui/issues/issue-18937.stderr index 7b4c35e0dbe35..91182224ad0a6 100644 --- a/src/test/ui/issues/issue-18937.stderr +++ b/src/test/ui/issues/issue-18937.stderr @@ -1,5 +1,5 @@ error[E0276]: impl has stricter requirements than trait - --> $DIR/issue-18937.rs:29:5 + --> $DIR/issue-18937.rs:19:5 | LL | / fn foo(&mut self, f: F) LL | | where F: fmt::Debug + 'a, diff --git a/src/test/ui/issues/issue-18959.rs b/src/test/ui/issues/issue-18959.rs index 7a6d012a3b605..b07800928bc22 100644 --- a/src/test/ui/issues/issue-18959.rs +++ b/src/test/ui/issues/issue-18959.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Foo { fn foo(&self, ext_thing: &T); } pub trait Bar: Foo { } impl Bar for T { } diff --git a/src/test/ui/issues/issue-18959.stderr b/src/test/ui/issues/issue-18959.stderr index 42a1c2d4d0314..939390102c387 100644 --- a/src/test/ui/issues/issue-18959.stderr +++ b/src/test/ui/issues/issue-18959.stderr @@ -1,5 +1,5 @@ error[E0038]: the trait `Bar` cannot be made into an object - --> $DIR/issue-18959.rs:21:1 + --> $DIR/issue-18959.rs:11:1 | LL | fn foo(b: &Bar) { | ^^^^^^^^^^^^^^^ the trait `Bar` cannot be made into an object diff --git a/src/test/ui/issues/issue-1900.rs b/src/test/ui/issues/issue-1900.rs index e41bb0030aeac..761bd3170270c 100644 --- a/src/test/ui/issues/issue-1900.rs +++ b/src/test/ui/issues/issue-1900.rs @@ -1,12 +1,2 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { } //~^ ERROR `main` function is not allowed to have generic parameters diff --git a/src/test/ui/issues/issue-1900.stderr b/src/test/ui/issues/issue-1900.stderr index 512a923fadd22..ce413662f0dac 100644 --- a/src/test/ui/issues/issue-1900.stderr +++ b/src/test/ui/issues/issue-1900.stderr @@ -1,5 +1,5 @@ error[E0131]: `main` function is not allowed to have generic parameters - --> $DIR/issue-1900.rs:11:8 + --> $DIR/issue-1900.rs:1:8 | LL | fn main() { } | ^^^ `main` cannot have generic parameters diff --git a/src/test/ui/issues/issue-19086.rs b/src/test/ui/issues/issue-19086.rs index ba571ce17fd12..9802814a87a51 100644 --- a/src/test/ui/issues/issue-19086.rs +++ b/src/test/ui/issues/issue-19086.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use Foo::FooB; enum Foo { diff --git a/src/test/ui/issues/issue-19086.stderr b/src/test/ui/issues/issue-19086.stderr index b71d40065c3f7..d2b9b90890e3c 100644 --- a/src/test/ui/issues/issue-19086.stderr +++ b/src/test/ui/issues/issue-19086.stderr @@ -1,5 +1,5 @@ error[E0532]: expected tuple struct/variant, found struct variant `FooB` - --> $DIR/issue-19086.rs:20:9 + --> $DIR/issue-19086.rs:10:9 | LL | FooB(a, b) => println!("{} {}", a, b), | ^^^^ did you mean `FooB { /* fields */ }`? diff --git a/src/test/ui/issues/issue-19100.fixed b/src/test/ui/issues/issue-19100.fixed index 3ced913ae11c2..6dc8f7ddbc972 100644 --- a/src/test/ui/issues/issue-19100.fixed +++ b/src/test/ui/issues/issue-19100.fixed @@ -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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass // run-rustfix diff --git a/src/test/ui/issues/issue-19100.rs b/src/test/ui/issues/issue-19100.rs index e073bf9076160..cfdc7c9e75488 100644 --- a/src/test/ui/issues/issue-19100.rs +++ b/src/test/ui/issues/issue-19100.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-pass // run-rustfix diff --git a/src/test/ui/issues/issue-19100.stderr b/src/test/ui/issues/issue-19100.stderr index 34dc29c63df72..1ab13477e37ed 100644 --- a/src/test/ui/issues/issue-19100.stderr +++ b/src/test/ui/issues/issue-19100.stderr @@ -1,11 +1,11 @@ warning[E0170]: pattern binding `Bar` is named the same as one of the variants of the type `Foo` - --> $DIR/issue-19100.rs:28:1 + --> $DIR/issue-19100.rs:18:1 | LL | Bar if true | ^^^ help: to match on the variant, qualify the path: `Foo::Bar` warning[E0170]: pattern binding `Baz` is named the same as one of the variants of the type `Foo` - --> $DIR/issue-19100.rs:32:1 + --> $DIR/issue-19100.rs:22:1 | LL | Baz if false | ^^^ help: to match on the variant, qualify the path: `Foo::Baz` diff --git a/src/test/ui/issues/issue-19163.nll.stderr b/src/test/ui/issues/issue-19163.nll.stderr index 32059bf0af104..af509aa59d481 100644 --- a/src/test/ui/issues/issue-19163.nll.stderr +++ b/src/test/ui/issues/issue-19163.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow data in a `&` reference as mutable - --> $DIR/issue-19163.rs:19:14 + --> $DIR/issue-19163.rs:9:14 | LL | mywrite!(&v, "Hello world"); | ^^ cannot borrow as mutable diff --git a/src/test/ui/issues/issue-19163.rs b/src/test/ui/issues/issue-19163.rs index cd6f7c4fd8fc9..20d3244027da1 100644 --- a/src/test/ui/issues/issue-19163.rs +++ b/src/test/ui/issues/issue-19163.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-19163.rs #[macro_use] extern crate issue_19163; diff --git a/src/test/ui/issues/issue-19163.stderr b/src/test/ui/issues/issue-19163.stderr index f7e65e18326b6..242ceaedcb0b4 100644 --- a/src/test/ui/issues/issue-19163.stderr +++ b/src/test/ui/issues/issue-19163.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow immutable borrowed content as mutable - --> $DIR/issue-19163.rs:19:14 + --> $DIR/issue-19163.rs:9:14 | LL | mywrite!(&v, "Hello world"); | ^^ cannot borrow as mutable diff --git a/src/test/ui/issues/issue-1920-1.rs b/src/test/ui/issues/issue-1920-1.rs index 97dd290a45bc8..6c18542d060d4 100644 --- a/src/test/ui/issues/issue-1920-1.rs +++ b/src/test/ui/issues/issue-1920-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Test that absolute path names are correct when a crate is not linked into the root namespace // aux-build:issue_1920.rs diff --git a/src/test/ui/issues/issue-1920-1.stderr b/src/test/ui/issues/issue-1920-1.stderr index bd823ad6fb6ef..b3ac05031b00f 100644 --- a/src/test/ui/issues/issue-1920-1.stderr +++ b/src/test/ui/issues/issue-1920-1.stderr @@ -1,11 +1,11 @@ error[E0277]: the trait bound `foo::issue_1920::S: std::clone::Clone` is not satisfied - --> $DIR/issue-1920-1.rs:22:5 + --> $DIR/issue-1920-1.rs:12:5 | LL | assert_clone::(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::clone::Clone` is not implemented for `foo::issue_1920::S` | note: required by `assert_clone` - --> $DIR/issue-1920-1.rs:19:1 + --> $DIR/issue-1920-1.rs:9:1 | LL | fn assert_clone() where T : Clone { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-1920-2.rs b/src/test/ui/issues/issue-1920-2.rs index 2af6e2cc991fa..4ed2c00f35691 100644 --- a/src/test/ui/issues/issue-1920-2.rs +++ b/src/test/ui/issues/issue-1920-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Test that when a crate is linked under another name that name is used in global paths // aux-build:issue_1920.rs diff --git a/src/test/ui/issues/issue-1920-2.stderr b/src/test/ui/issues/issue-1920-2.stderr index cf98a893a189a..a000a87302bf7 100644 --- a/src/test/ui/issues/issue-1920-2.stderr +++ b/src/test/ui/issues/issue-1920-2.stderr @@ -1,11 +1,11 @@ error[E0277]: the trait bound `bar::S: std::clone::Clone` is not satisfied - --> $DIR/issue-1920-2.rs:20:5 + --> $DIR/issue-1920-2.rs:10:5 | LL | assert_clone::(); | ^^^^^^^^^^^^^^^^^^^^^^ the trait `std::clone::Clone` is not implemented for `bar::S` | note: required by `assert_clone` - --> $DIR/issue-1920-2.rs:17:1 + --> $DIR/issue-1920-2.rs:7:1 | LL | fn assert_clone() where T : Clone { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-1920-3.rs b/src/test/ui/issues/issue-1920-3.rs index fa6efea845fce..6587dcb198635 100644 --- a/src/test/ui/issues/issue-1920-3.rs +++ b/src/test/ui/issues/issue-1920-3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //! Test that when a crate is linked multiple times that the shortest absolute path name is used // aux-build:issue_1920.rs diff --git a/src/test/ui/issues/issue-1920-3.stderr b/src/test/ui/issues/issue-1920-3.stderr index 6f5efd0dc4ea6..62e47a6866e63 100644 --- a/src/test/ui/issues/issue-1920-3.stderr +++ b/src/test/ui/issues/issue-1920-3.stderr @@ -1,11 +1,11 @@ error[E0277]: the trait bound `issue_1920::S: std::clone::Clone` is not satisfied - --> $DIR/issue-1920-3.rs:24:5 + --> $DIR/issue-1920-3.rs:14:5 | LL | assert_clone::(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::clone::Clone` is not implemented for `issue_1920::S` | note: required by `assert_clone` - --> $DIR/issue-1920-3.rs:21:1 + --> $DIR/issue-1920-3.rs:11:1 | LL | fn assert_clone() where T : Clone { } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-19244-1.rs b/src/test/ui/issues/issue-19244-1.rs index df34aab4b8f66..77fab7cfa32c7 100644 --- a/src/test/ui/issues/issue-19244-1.rs +++ b/src/test/ui/issues/issue-19244-1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const TUP: (usize,) = (42,); fn main() { diff --git a/src/test/ui/issues/issue-19244-1.stderr b/src/test/ui/issues/issue-19244-1.stderr index 28e66b2d974da..1eb530542c02b 100644 --- a/src/test/ui/issues/issue-19244-1.stderr +++ b/src/test/ui/issues/issue-19244-1.stderr @@ -1,5 +1,5 @@ error[E0609]: no field `1` on type `(usize,)` - --> $DIR/issue-19244-1.rs:14:24 + --> $DIR/issue-19244-1.rs:4:24 | LL | let a: [isize; TUP.1]; | ^ diff --git a/src/test/ui/issues/issue-19244-2.rs b/src/test/ui/issues/issue-19244-2.rs index 864f8f6b54e7c..c9a68b05c5bae 100644 --- a/src/test/ui/issues/issue-19244-2.rs +++ b/src/test/ui/issues/issue-19244-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct MyStruct { field: usize } const STRUCT: MyStruct = MyStruct { field: 42 }; diff --git a/src/test/ui/issues/issue-19244-2.stderr b/src/test/ui/issues/issue-19244-2.stderr index 3969c77f24d71..54529fdf5ba72 100644 --- a/src/test/ui/issues/issue-19244-2.stderr +++ b/src/test/ui/issues/issue-19244-2.stderr @@ -1,5 +1,5 @@ error[E0609]: no field `nonexistent_field` on type `MyStruct` - --> $DIR/issue-19244-2.rs:15:27 + --> $DIR/issue-19244-2.rs:5:27 | LL | let a: [isize; STRUCT.nonexistent_field]; | ^^^^^^^^^^^^^^^^^ unknown field diff --git a/src/test/ui/issues/issue-19380.rs b/src/test/ui/issues/issue-19380.rs index 322952ffef1e6..efbc5a0346ac5 100644 --- a/src/test/ui/issues/issue-19380.rs +++ b/src/test/ui/issues/issue-19380.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Qiz { fn qiz(); } diff --git a/src/test/ui/issues/issue-19380.stderr b/src/test/ui/issues/issue-19380.stderr index a251d3b29904d..060e160f2e484 100644 --- a/src/test/ui/issues/issue-19380.stderr +++ b/src/test/ui/issues/issue-19380.stderr @@ -1,5 +1,5 @@ error[E0038]: the trait `Qiz` cannot be made into an object - --> $DIR/issue-19380.rs:21:3 + --> $DIR/issue-19380.rs:11:3 | LL | foos: &'static [&'static (Qiz + 'static)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Qiz` cannot be made into an object diff --git a/src/test/ui/issues/issue-19482.rs b/src/test/ui/issues/issue-19482.rs index b54f008f8ce3a..6ba334905499e 100644 --- a/src/test/ui/issues/issue-19482.rs +++ b/src/test/ui/issues/issue-19482.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that a partially specified trait object with unspecified associated // type does not type-check. diff --git a/src/test/ui/issues/issue-19482.stderr b/src/test/ui/issues/issue-19482.stderr index 5e2d427ab7258..64c6cdb4357b1 100644 --- a/src/test/ui/issues/issue-19482.stderr +++ b/src/test/ui/issues/issue-19482.stderr @@ -1,5 +1,5 @@ error[E0191]: the value of the associated type `A` (from the trait `Foo`) must be specified - --> $DIR/issue-19482.rs:20:12 + --> $DIR/issue-19482.rs:10:12 | LL | fn bar(x: &Foo) {} | ^^^ missing associated type `A` value diff --git a/src/test/ui/issues/issue-19498.rs b/src/test/ui/issues/issue-19498.rs index 30eea2efd150e..5fe6742f55e03 100644 --- a/src/test/ui/issues/issue-19498.rs +++ b/src/test/ui/issues/issue-19498.rs @@ -1,13 +1,3 @@ -// Copyright 2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use self::A; use self::B; mod A {} //~ ERROR the name `A` is defined multiple times diff --git a/src/test/ui/issues/issue-19498.stderr b/src/test/ui/issues/issue-19498.stderr index 839ab778061c2..0fd3002acb925 100644 --- a/src/test/ui/issues/issue-19498.stderr +++ b/src/test/ui/issues/issue-19498.stderr @@ -1,5 +1,5 @@ error[E0255]: the name `A` is defined multiple times - --> $DIR/issue-19498.rs:13:1 + --> $DIR/issue-19498.rs:3:1 | LL | use self::A; | ------- previous import of the module `A` here @@ -14,7 +14,7 @@ LL | use self::A as OtherA; | ^^^^^^^^^^^^^^^^^ error[E0255]: the name `B` is defined multiple times - --> $DIR/issue-19498.rs:15:1 + --> $DIR/issue-19498.rs:5:1 | LL | use self::B; | ------- previous import of the module `B` here @@ -29,7 +29,7 @@ LL | use self::B as OtherB; | ^^^^^^^^^^^^^^^^^ error[E0255]: the name `D` is defined multiple times - --> $DIR/issue-19498.rs:19:5 + --> $DIR/issue-19498.rs:9:5 | LL | use C::D; | ---- previous import of the module `D` here diff --git a/src/test/ui/issues/issue-19521.rs b/src/test/ui/issues/issue-19521.rs index 93d95ca0b0f94..a2a32a21a22f4 100644 --- a/src/test/ui/issues/issue-19521.rs +++ b/src/test/ui/issues/issue-19521.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { "".homura()(); //~ ERROR no method named `homura` found } diff --git a/src/test/ui/issues/issue-19521.stderr b/src/test/ui/issues/issue-19521.stderr index 8f81bcbd4c417..9005317736a9a 100644 --- a/src/test/ui/issues/issue-19521.stderr +++ b/src/test/ui/issues/issue-19521.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `homura` found for type `&'static str` in the current scope - --> $DIR/issue-19521.rs:12:8 + --> $DIR/issue-19521.rs:2:8 | LL | "".homura()(); //~ ERROR no method named `homura` found | ^^^^^^ diff --git a/src/test/ui/issues/issue-19538.rs b/src/test/ui/issues/issue-19538.rs index a619050058262..9f0b08d6c357c 100644 --- a/src/test/ui/issues/issue-19538.rs +++ b/src/test/ui/issues/issue-19538.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn foo(&self, val: T); } diff --git a/src/test/ui/issues/issue-19538.stderr b/src/test/ui/issues/issue-19538.stderr index 3cd73ad9d450e..d0f05a41d4d3a 100644 --- a/src/test/ui/issues/issue-19538.stderr +++ b/src/test/ui/issues/issue-19538.stderr @@ -1,5 +1,5 @@ error[E0038]: the trait `Bar` cannot be made into an object - --> $DIR/issue-19538.rs:27:15 + --> $DIR/issue-19538.rs:17:15 | LL | let test: &mut Bar = &mut thing; | ^^^^^^^^ the trait `Bar` cannot be made into an object @@ -7,7 +7,7 @@ LL | let test: &mut Bar = &mut thing; = note: method `foo` has generic type parameters error[E0038]: the trait `Bar` cannot be made into an object - --> $DIR/issue-19538.rs:27:26 + --> $DIR/issue-19538.rs:17:26 | LL | let test: &mut Bar = &mut thing; | ^^^^^^^^^^ the trait `Bar` cannot be made into an object diff --git a/src/test/ui/issues/issue-19601.rs b/src/test/ui/issues/issue-19601.rs index 02b4932cea8c9..d919349e01357 100644 --- a/src/test/ui/issues/issue-19601.rs +++ b/src/test/ui/issues/issue-19601.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![allow(warnings)] diff --git a/src/test/ui/issues/issue-19601.stderr b/src/test/ui/issues/issue-19601.stderr index 594d76605fe90..bb7cbf55d8a81 100644 --- a/src/test/ui/issues/issue-19601.stderr +++ b/src/test/ui/issues/issue-19601.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-19601.rs:18:1 + --> $DIR/issue-19601.rs:8:1 | LL | / fn main() { //~ ERROR compilation successful LL | | } diff --git a/src/test/ui/issues/issue-1962.rs b/src/test/ui/issues/issue-1962.rs index 9de3040bb616c..e9ab3b5f99baa 100644 --- a/src/test/ui/issues/issue-1962.rs +++ b/src/test/ui/issues/issue-1962.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -D while-true fn main() { let mut i = 0; diff --git a/src/test/ui/issues/issue-1962.stderr b/src/test/ui/issues/issue-1962.stderr index b7c2bd844811d..f2c540b74515c 100644 --- a/src/test/ui/issues/issue-1962.stderr +++ b/src/test/ui/issues/issue-1962.stderr @@ -1,5 +1,5 @@ error: denote infinite loops with `loop { ... }` - --> $DIR/issue-1962.rs:14:3 + --> $DIR/issue-1962.rs:4:3 | LL | while true { //~ ERROR denote infinite loops with `loop | ^^^^^^^^^^ help: use `loop` diff --git a/src/test/ui/issues/issue-19660.rs b/src/test/ui/issues/issue-19660.rs index c4b871a28c57d..400ac310b9649 100644 --- a/src/test/ui/issues/issue-19660.rs +++ b/src/test/ui/issues/issue-19660.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: requires `copy` lang_item #![feature(lang_items, start, no_core)] diff --git a/src/test/ui/issues/issue-19692.rs b/src/test/ui/issues/issue-19692.rs index ca1715445e526..99eccc8a8175c 100644 --- a/src/test/ui/issues/issue-19692.rs +++ b/src/test/ui/issues/issue-19692.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Homura; fn akemi(homura: Homura) { diff --git a/src/test/ui/issues/issue-19692.stderr b/src/test/ui/issues/issue-19692.stderr index 33361ff84880a..1ed1967667448 100644 --- a/src/test/ui/issues/issue-19692.stderr +++ b/src/test/ui/issues/issue-19692.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `kaname` found for type `Homura` in the current scope - --> $DIR/issue-19692.rs:14:40 + --> $DIR/issue-19692.rs:4:40 | LL | struct Homura; | -------------- method `kaname` not found for this diff --git a/src/test/ui/issues/issue-19707.rs b/src/test/ui/issues/issue-19707.rs index 377aef2f7d7d5..795f8326b15ae 100644 --- a/src/test/ui/issues/issue-19707.rs +++ b/src/test/ui/issues/issue-19707.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] type foo = fn(&u8, &u8) -> &u8; //~ ERROR missing lifetime specifier diff --git a/src/test/ui/issues/issue-19707.stderr b/src/test/ui/issues/issue-19707.stderr index 56088d38aaf99..1189110fa3e34 100644 --- a/src/test/ui/issues/issue-19707.stderr +++ b/src/test/ui/issues/issue-19707.stderr @@ -1,5 +1,5 @@ error[E0106]: missing lifetime specifier - --> $DIR/issue-19707.rs:13:28 + --> $DIR/issue-19707.rs:3:28 | LL | type foo = fn(&u8, &u8) -> &u8; //~ ERROR missing lifetime specifier | ^ expected lifetime parameter @@ -7,7 +7,7 @@ LL | type foo = fn(&u8, &u8) -> &u8; //~ ERROR missing lifetime specifier = help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from argument 1 or argument 2 error[E0106]: missing lifetime specifier - --> $DIR/issue-19707.rs:15:27 + --> $DIR/issue-19707.rs:5:27 | LL | fn bar &u8>(f: &F) {} //~ ERROR missing lifetime specifier | ^ expected lifetime parameter diff --git a/src/test/ui/issues/issue-19734.rs b/src/test/ui/issues/issue-19734.rs index a3820d20aac5b..b730e19a1e632 100644 --- a/src/test/ui/issues/issue-19734.rs +++ b/src/test/ui/issues/issue-19734.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() {} struct Type; diff --git a/src/test/ui/issues/issue-19734.stderr b/src/test/ui/issues/issue-19734.stderr index 1d07f4dedc3fa..fc1a7d0381be2 100644 --- a/src/test/ui/issues/issue-19734.stderr +++ b/src/test/ui/issues/issue-19734.stderr @@ -1,5 +1,5 @@ error: cannot find macro `undef!` in this scope - --> $DIR/issue-19734.rs:16:5 + --> $DIR/issue-19734.rs:6:5 | LL | undef!(); | ^^^^^ diff --git a/src/test/ui/issues/issue-19883.rs b/src/test/ui/issues/issue-19883.rs index 9b6a87702a9ea..5cf422043a585 100644 --- a/src/test/ui/issues/issue-19883.rs +++ b/src/test/ui/issues/issue-19883.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait From { type Output; diff --git a/src/test/ui/issues/issue-19883.stderr b/src/test/ui/issues/issue-19883.stderr index b4262b4cdb3a1..e370b2ec1cb42 100644 --- a/src/test/ui/issues/issue-19883.stderr +++ b/src/test/ui/issues/issue-19883.stderr @@ -1,5 +1,5 @@ error[E0576]: cannot find associated type `Dst` in trait `From` - --> $DIR/issue-19883.rs:19:30 + --> $DIR/issue-19883.rs:9:30 | LL | >::Dst | ^^^ not found in `From` diff --git a/src/test/ui/issues/issue-19922.rs b/src/test/ui/issues/issue-19922.rs index a8350fe0986c0..fede86f22afd8 100644 --- a/src/test/ui/issues/issue-19922.rs +++ b/src/test/ui/issues/issue-19922.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Homura { Akemi { madoka: () } } diff --git a/src/test/ui/issues/issue-19922.stderr b/src/test/ui/issues/issue-19922.stderr index a5bc579e1924e..826b2ac049b0e 100644 --- a/src/test/ui/issues/issue-19922.stderr +++ b/src/test/ui/issues/issue-19922.stderr @@ -1,5 +1,5 @@ error[E0559]: variant `Homura::Akemi` has no field named `kaname` - --> $DIR/issue-19922.rs:16:34 + --> $DIR/issue-19922.rs:6:34 | LL | let homura = Homura::Akemi { kaname: () }; | ^^^^^^ `Homura::Akemi` does not have this field diff --git a/src/test/ui/issues/issue-19982.rs b/src/test/ui/issues/issue-19982.rs index 9dbca997341fc..9c03dc216998c 100644 --- a/src/test/ui/issues/issue-19982.rs +++ b/src/test/ui/issues/issue-19982.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unboxed_closures)] struct Foo; diff --git a/src/test/ui/issues/issue-19982.stderr b/src/test/ui/issues/issue-19982.stderr index 9f13ba640a950..ba12972f4313a 100644 --- a/src/test/ui/issues/issue-19982.stderr +++ b/src/test/ui/issues/issue-19982.stderr @@ -1,5 +1,5 @@ error[E0106]: missing lifetime specifier - --> $DIR/issue-19982.rs:15:10 + --> $DIR/issue-19982.rs:5:10 | LL | impl Fn<(&(),)> for Foo { } //~ ERROR missing lifetime specifier | ^ expected lifetime parameter diff --git a/src/test/ui/issues/issue-19991.rs b/src/test/ui/issues/issue-19991.rs index e07dfaf9fe59e..349a1d77c2b7c 100644 --- a/src/test/ui/issues/issue-19991.rs +++ b/src/test/ui/issues/issue-19991.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test if the sugared if-let construct correctly prints "missing an else clause" when an else // clause does not exist, instead of the unsympathetic "match arms have incompatible types" diff --git a/src/test/ui/issues/issue-19991.stderr b/src/test/ui/issues/issue-19991.stderr index 45b2ef8b2806e..cf3d55e821091 100644 --- a/src/test/ui/issues/issue-19991.stderr +++ b/src/test/ui/issues/issue-19991.stderr @@ -1,5 +1,5 @@ error[E0317]: if may be missing an else clause - --> $DIR/issue-19991.rs:15:5 + --> $DIR/issue-19991.rs:5:5 | LL | / if let Some(homura) = Some("madoka") { //~ ERROR missing an else clause LL | | //~| expected type `()` diff --git a/src/test/ui/issues/issue-20005.rs b/src/test/ui/issues/issue-20005.rs index 8db09182fa3bb..6d63c9e5b613a 100644 --- a/src/test/ui/issues/issue-20005.rs +++ b/src/test/ui/issues/issue-20005.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait From { type Result; diff --git a/src/test/ui/issues/issue-20005.stderr b/src/test/ui/issues/issue-20005.stderr index b0b38c9746231..c69dfa9d89ca6 100644 --- a/src/test/ui/issues/issue-20005.stderr +++ b/src/test/ui/issues/issue-20005.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `Self` cannot be known at compilation time - --> $DIR/issue-20005.rs:18:5 + --> $DIR/issue-20005.rs:8:5 | LL | / fn to( //~ ERROR the size for values of type LL | | self @@ -12,7 +12,7 @@ LL | | } = note: to learn more, visit = help: consider adding a `where Self: std::marker::Sized` bound note: required by `From` - --> $DIR/issue-20005.rs:11:1 + --> $DIR/issue-20005.rs:1:1 | LL | trait From { | ^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-20162.rs b/src/test/ui/issues/issue-20162.rs index b2f3a2da51619..b7f9caee8948f 100644 --- a/src/test/ui/issues/issue-20162.rs +++ b/src/test/ui/issues/issue-20162.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct X { x: i32 } fn main() { diff --git a/src/test/ui/issues/issue-20162.stderr b/src/test/ui/issues/issue-20162.stderr index 0fb7009d574fd..1d0d6d5c5d7be 100644 --- a/src/test/ui/issues/issue-20162.stderr +++ b/src/test/ui/issues/issue-20162.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `X: std::cmp::Ord` is not satisfied - --> $DIR/issue-20162.rs:15:7 + --> $DIR/issue-20162.rs:5:7 | LL | b.sort(); | ^^^^ the trait `std::cmp::Ord` is not implemented for `X` diff --git a/src/test/ui/issues/issue-20225.rs b/src/test/ui/issues/issue-20225.rs index da98f21e46138..b15f2a631fd86 100644 --- a/src/test/ui/issues/issue-20225.rs +++ b/src/test/ui/issues/issue-20225.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(fn_traits, unboxed_closures)] struct Foo; diff --git a/src/test/ui/issues/issue-20225.stderr b/src/test/ui/issues/issue-20225.stderr index 7813dc5c11dba..5ab23cb55bcc4 100644 --- a/src/test/ui/issues/issue-20225.stderr +++ b/src/test/ui/issues/issue-20225.stderr @@ -1,5 +1,5 @@ error[E0053]: method `call` has an incompatible type for trait - --> $DIR/issue-20225.rs:16:3 + --> $DIR/issue-20225.rs:6:3 | LL | extern "rust-call" fn call(&self, (_,): (T,)) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected reference, found type parameter @@ -8,7 +8,7 @@ LL | extern "rust-call" fn call(&self, (_,): (T,)) {} found type `extern "rust-call" fn(&Foo, (T,))` error[E0053]: method `call_mut` has an incompatible type for trait - --> $DIR/issue-20225.rs:22:3 + --> $DIR/issue-20225.rs:12:3 | LL | extern "rust-call" fn call_mut(&mut self, (_,): (T,)) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected reference, found type parameter @@ -17,7 +17,7 @@ LL | extern "rust-call" fn call_mut(&mut self, (_,): (T,)) {} found type `extern "rust-call" fn(&mut Foo, (T,))` error[E0053]: method `call_once` has an incompatible type for trait - --> $DIR/issue-20225.rs:30:3 + --> $DIR/issue-20225.rs:20:3 | LL | extern "rust-call" fn call_once(self, (_,): (T,)) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected reference, found type parameter diff --git a/src/test/ui/issues/issue-20261.rs b/src/test/ui/issues/issue-20261.rs index bb4dbdcd0cba7..59722a791a085 100644 --- a/src/test/ui/issues/issue-20261.rs +++ b/src/test/ui/issues/issue-20261.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { // NB: this (almost) typechecks when default binding modes are enabled. for (ref i,) in [].iter() { diff --git a/src/test/ui/issues/issue-20261.stderr b/src/test/ui/issues/issue-20261.stderr index 6cdddcff92913..5665f5893f428 100644 --- a/src/test/ui/issues/issue-20261.stderr +++ b/src/test/ui/issues/issue-20261.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/issue-20261.rs:14:11 + --> $DIR/issue-20261.rs:4:11 | LL | for (ref i,) in [].iter() { | --------- the element type for this iterator is not specified diff --git a/src/test/ui/issues/issue-20313.rs b/src/test/ui/issues/issue-20313.rs index dfb23c0503689..4149ab4a30275 100644 --- a/src/test/ui/issues/issue-20313.rs +++ b/src/test/ui/issues/issue-20313.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern { #[link_name = "llvm.sqrt.f32"] fn sqrt(x: f32) -> f32; //~ ERROR linking to LLVM intrinsics is experimental diff --git a/src/test/ui/issues/issue-20313.stderr b/src/test/ui/issues/issue-20313.stderr index 95afda1b514d4..01673630cf189 100644 --- a/src/test/ui/issues/issue-20313.stderr +++ b/src/test/ui/issues/issue-20313.stderr @@ -1,5 +1,5 @@ error[E0658]: linking to LLVM intrinsics is experimental (see issue #29602) - --> $DIR/issue-20313.rs:13:5 + --> $DIR/issue-20313.rs:3:5 | LL | fn sqrt(x: f32) -> f32; //~ ERROR linking to LLVM intrinsics is experimental | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-20413.rs b/src/test/ui/issues/issue-20413.rs index a48c03aa178c3..34094fe6a44e2 100644 --- a/src/test/ui/issues/issue-20413.rs +++ b/src/test/ui/issues/issue-20413.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn answer(self); } diff --git a/src/test/ui/issues/issue-20413.stderr b/src/test/ui/issues/issue-20413.stderr index bfb2665e867fa..20e57583f1daa 100644 --- a/src/test/ui/issues/issue-20413.stderr +++ b/src/test/ui/issues/issue-20413.stderr @@ -1,5 +1,5 @@ error[E0392]: parameter `T` is never used - --> $DIR/issue-20413.rs:15:15 + --> $DIR/issue-20413.rs:5:15 | LL | struct NoData; | ^ unused type parameter @@ -7,7 +7,7 @@ LL | struct NoData; = help: consider removing `T` or using a marker such as `std::marker::PhantomData` error[E0275]: overflow evaluating the requirement `NoData>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>: std::marker::Sized` - --> $DIR/issue-20413.rs:18:1 + --> $DIR/issue-20413.rs:8:1 | LL | / impl Foo for T where NoData: Foo { LL | | //~^ ERROR: overflow evaluating the requirement @@ -83,7 +83,7 @@ LL | | } = note: required because of the requirements on the impl of `Foo` for `NoData>` = note: required because of the requirements on the impl of `Foo` for `NoData` note: required by `Foo` - --> $DIR/issue-20413.rs:11:1 + --> $DIR/issue-20413.rs:1:1 | LL | trait Foo { | ^^^^^^^^^ diff --git a/src/test/ui/issues/issue-20433.rs b/src/test/ui/issues/issue-20433.rs index f760cd59968c2..a663239ccab81 100644 --- a/src/test/ui/issues/issue-20433.rs +++ b/src/test/ui/issues/issue-20433.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() {} struct The; diff --git a/src/test/ui/issues/issue-20433.stderr b/src/test/ui/issues/issue-20433.stderr index 9800c9b3b58e1..cc98a775092e3 100644 --- a/src/test/ui/issues/issue-20433.stderr +++ b/src/test/ui/issues/issue-20433.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `[i32]` cannot be known at compilation time - --> $DIR/issue-20433.rs:16:5 + --> $DIR/issue-20433.rs:6:5 | LL | fn iceman(c: Vec<[i32]>) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time diff --git a/src/test/ui/issues/issue-20605.rs b/src/test/ui/issues/issue-20605.rs index 60d012ab13426..11a2a573ea677 100644 --- a/src/test/ui/issues/issue-20605.rs +++ b/src/test/ui/issues/issue-20605.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn changer<'a>(mut things: Box>) { for item in *things { *item = 0 } //~^ ERROR the size for values of type diff --git a/src/test/ui/issues/issue-20605.stderr b/src/test/ui/issues/issue-20605.stderr index fb32283ddf7b9..472080d1091d4 100644 --- a/src/test/ui/issues/issue-20605.stderr +++ b/src/test/ui/issues/issue-20605.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `dyn std::iter::Iterator` cannot be known at compilation time - --> $DIR/issue-20605.rs:12:17 + --> $DIR/issue-20605.rs:2:17 | LL | for item in *things { *item = 0 } | ^^^^^^^ doesn't have a size known at compile-time diff --git a/src/test/ui/issues/issue-20616-1.rs b/src/test/ui/issues/issue-20616-1.rs index 3e29383d62cf8..49e9cb310c144 100644 --- a/src/test/ui/issues/issue-20616-1.rs +++ b/src/test/ui/issues/issue-20616-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // We need all these 9 issue-20616-N.rs files // because we can only catch one parsing error at a time diff --git a/src/test/ui/issues/issue-20616-1.stderr b/src/test/ui/issues/issue-20616-1.stderr index 1ee965d2186e0..522db41241229 100644 --- a/src/test/ui/issues/issue-20616-1.stderr +++ b/src/test/ui/issues/issue-20616-1.stderr @@ -1,5 +1,5 @@ error: expected one of `,`, `:`, or `>`, found `T` - --> $DIR/issue-20616-1.rs:19:16 + --> $DIR/issue-20616-1.rs:9:16 | LL | type Type_1<'a T> = &'a T; //~ error: expected one of `,`, `:`, or `>`, found `T` | ^ expected one of `,`, `:`, or `>` here diff --git a/src/test/ui/issues/issue-20616-2.rs b/src/test/ui/issues/issue-20616-2.rs index 1ec7a74559a6e..2f2c6903a9f4c 100644 --- a/src/test/ui/issues/issue-20616-2.rs +++ b/src/test/ui/issues/issue-20616-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // We need all these 9 issue-20616-N.rs files // because we can only catch one parsing error at a time diff --git a/src/test/ui/issues/issue-20616-2.stderr b/src/test/ui/issues/issue-20616-2.stderr index 1c103b21a181e..544219eb6cfae 100644 --- a/src/test/ui/issues/issue-20616-2.stderr +++ b/src/test/ui/issues/issue-20616-2.stderr @@ -1,5 +1,5 @@ error: expected one of `,` or `>`, found `(` - --> $DIR/issue-20616-2.rs:22:31 + --> $DIR/issue-20616-2.rs:12:31 | LL | type Type_2 = Type_1_<'static ()>; //~ error: expected one of `,` or `>`, found `(` | ^ expected one of `,` or `>` here diff --git a/src/test/ui/issues/issue-20616-3.rs b/src/test/ui/issues/issue-20616-3.rs index 885fd24654731..e84506ee249d2 100644 --- a/src/test/ui/issues/issue-20616-3.rs +++ b/src/test/ui/issues/issue-20616-3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // We need all these 9 issue-20616-N.rs files // because we can only catch one parsing error at a time diff --git a/src/test/ui/issues/issue-20616-3.stderr b/src/test/ui/issues/issue-20616-3.stderr index b4b40b3637db7..5247298b7cc26 100644 --- a/src/test/ui/issues/issue-20616-3.stderr +++ b/src/test/ui/issues/issue-20616-3.stderr @@ -1,5 +1,5 @@ error: expected one of `>`, identifier, lifetime, or type, found `,` - --> $DIR/issue-20616-3.rs:25:24 + --> $DIR/issue-20616-3.rs:15:24 | LL | type Type_3 = Box; //~ error: expected one of `>`, identifier, lifetime, or type, found `,` | ^ expected one of `>`, identifier, lifetime, or type here diff --git a/src/test/ui/issues/issue-20616-4.rs b/src/test/ui/issues/issue-20616-4.rs index 0dbe92fc1bcb3..785a6fa7d9a2f 100644 --- a/src/test/ui/issues/issue-20616-4.rs +++ b/src/test/ui/issues/issue-20616-4.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // We need all these 9 issue-20616-N.rs files // because we can only catch one parsing error at a time diff --git a/src/test/ui/issues/issue-20616-4.stderr b/src/test/ui/issues/issue-20616-4.stderr index 0a734e4fdcdbe..74c38d9e97d60 100644 --- a/src/test/ui/issues/issue-20616-4.stderr +++ b/src/test/ui/issues/issue-20616-4.stderr @@ -1,5 +1,5 @@ error: expected one of `>`, identifier, lifetime, or type, found `,` - --> $DIR/issue-20616-4.rs:28:34 + --> $DIR/issue-20616-4.rs:18:34 | LL | type Type_4 = Type_1_<'static,, T>; | ^ expected one of `>`, identifier, lifetime, or type here diff --git a/src/test/ui/issues/issue-20616-5.rs b/src/test/ui/issues/issue-20616-5.rs index 794e5178f4b2c..71dcc1f3a024f 100644 --- a/src/test/ui/issues/issue-20616-5.rs +++ b/src/test/ui/issues/issue-20616-5.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // We need all these 9 issue-20616-N.rs files // because we can only catch one parsing error at a time diff --git a/src/test/ui/issues/issue-20616-5.stderr b/src/test/ui/issues/issue-20616-5.stderr index 504be1632ba5b..38457beadc448 100644 --- a/src/test/ui/issues/issue-20616-5.stderr +++ b/src/test/ui/issues/issue-20616-5.stderr @@ -1,5 +1,5 @@ error: expected one of `>`, identifier, lifetime, or type, found `,` - --> $DIR/issue-20616-5.rs:34:34 + --> $DIR/issue-20616-5.rs:24:34 | LL | type Type_5<'a> = Type_1_<'a, (),,>; | ^ expected one of `>`, identifier, lifetime, or type here diff --git a/src/test/ui/issues/issue-20616-6.rs b/src/test/ui/issues/issue-20616-6.rs index fe91751a4a06b..da32da4885242 100644 --- a/src/test/ui/issues/issue-20616-6.rs +++ b/src/test/ui/issues/issue-20616-6.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // We need all these 9 issue-20616-N.rs files // because we can only catch one parsing error at a time diff --git a/src/test/ui/issues/issue-20616-6.stderr b/src/test/ui/issues/issue-20616-6.stderr index 41dea4137afd8..55b1d031a3915 100644 --- a/src/test/ui/issues/issue-20616-6.stderr +++ b/src/test/ui/issues/issue-20616-6.stderr @@ -1,5 +1,5 @@ error: expected one of `>`, identifier, lifetime, or type, found `,` - --> $DIR/issue-20616-6.rs:37:26 + --> $DIR/issue-20616-6.rs:27:26 | LL | type Type_6 = Type_5_<'a,,>; | ^ expected one of `>`, identifier, lifetime, or type here diff --git a/src/test/ui/issues/issue-20616-7.rs b/src/test/ui/issues/issue-20616-7.rs index 184ad02710268..feaaff2c89025 100644 --- a/src/test/ui/issues/issue-20616-7.rs +++ b/src/test/ui/issues/issue-20616-7.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // We need all these 9 issue-20616-N.rs files // because we can only catch one parsing error at a time diff --git a/src/test/ui/issues/issue-20616-7.stderr b/src/test/ui/issues/issue-20616-7.stderr index caf66895fabbf..8b5f67c703f64 100644 --- a/src/test/ui/issues/issue-20616-7.stderr +++ b/src/test/ui/issues/issue-20616-7.stderr @@ -1,5 +1,5 @@ error: expected one of `>`, identifier, lifetime, or type, found `,` - --> $DIR/issue-20616-7.rs:40:22 + --> $DIR/issue-20616-7.rs:30:22 | LL | type Type_7 = Box<(),,>; //~ error: expected one of `>`, identifier, lifetime, or type, found `,` | ^ expected one of `>`, identifier, lifetime, or type here diff --git a/src/test/ui/issues/issue-20616-8.rs b/src/test/ui/issues/issue-20616-8.rs index 5cdec33e94b92..2fc7243559a31 100644 --- a/src/test/ui/issues/issue-20616-8.rs +++ b/src/test/ui/issues/issue-20616-8.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // We need all these 9 issue-20616-N.rs files // because we can only catch one parsing error at a time diff --git a/src/test/ui/issues/issue-20616-8.stderr b/src/test/ui/issues/issue-20616-8.stderr index 6d840fc562b42..cdeb544f07c4c 100644 --- a/src/test/ui/issues/issue-20616-8.stderr +++ b/src/test/ui/issues/issue-20616-8.stderr @@ -1,5 +1,5 @@ error: expected one of `>`, identifier, or lifetime, found `,` - --> $DIR/issue-20616-8.rs:43:16 + --> $DIR/issue-20616-8.rs:33:16 | LL | type Type_8<'a,,> = &'a (); //~ error: expected one of `>`, identifier, or lifetime, found `,` | ^ expected one of `>`, identifier, or lifetime here diff --git a/src/test/ui/issues/issue-20616-9.rs b/src/test/ui/issues/issue-20616-9.rs index 7995addb692cc..b14a5b0ff36da 100644 --- a/src/test/ui/issues/issue-20616-9.rs +++ b/src/test/ui/issues/issue-20616-9.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // We need all these 9 issue-20616-N.rs files // because we can only catch one parsing error at a time diff --git a/src/test/ui/issues/issue-20616-9.stderr b/src/test/ui/issues/issue-20616-9.stderr index f9cc4e0b48093..dfe705c6f12ed 100644 --- a/src/test/ui/issues/issue-20616-9.stderr +++ b/src/test/ui/issues/issue-20616-9.stderr @@ -1,5 +1,5 @@ error: expected one of `>`, identifier, or lifetime, found `,` - --> $DIR/issue-20616-9.rs:46:15 + --> $DIR/issue-20616-9.rs:36:15 | LL | type Type_9 = Box; //~ error: expected one of `>`, identifier, or lifetime, found `,` | ^ expected one of `>`, identifier, or lifetime here diff --git a/src/test/ui/issues/issue-20692.rs b/src/test/ui/issues/issue-20692.rs index 0a4e7c8ee6bdd..ea89bca78d076 100644 --- a/src/test/ui/issues/issue-20692.rs +++ b/src/test/ui/issues/issue-20692.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Array: Sized {} fn f(x: &T) { diff --git a/src/test/ui/issues/issue-20692.stderr b/src/test/ui/issues/issue-20692.stderr index 156ebd920f0d9..acc223c0b2dfc 100644 --- a/src/test/ui/issues/issue-20692.stderr +++ b/src/test/ui/issues/issue-20692.stderr @@ -1,5 +1,5 @@ error[E0038]: the trait `Array` cannot be made into an object - --> $DIR/issue-20692.rs:17:5 + --> $DIR/issue-20692.rs:7:5 | LL | &Array; | ^^^^^^ the trait `Array` cannot be made into an object @@ -7,7 +7,7 @@ LL | &Array; = note: the trait cannot require that `Self : Sized` error[E0038]: the trait `Array` cannot be made into an object - --> $DIR/issue-20692.rs:14:13 + --> $DIR/issue-20692.rs:4:13 | LL | let _ = x | ^ the trait `Array` cannot be made into an object diff --git a/src/test/ui/issues/issue-20714.rs b/src/test/ui/issues/issue-20714.rs index cb322f00723d2..0a4817c1164dd 100644 --- a/src/test/ui/issues/issue-20714.rs +++ b/src/test/ui/issues/issue-20714.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct G; fn main() { diff --git a/src/test/ui/issues/issue-20714.stderr b/src/test/ui/issues/issue-20714.stderr index 1ea85ee440e21..827fc471331f3 100644 --- a/src/test/ui/issues/issue-20714.stderr +++ b/src/test/ui/issues/issue-20714.stderr @@ -1,5 +1,5 @@ error[E0618]: expected function, found `G` - --> $DIR/issue-20714.rs:14:13 + --> $DIR/issue-20714.rs:4:13 | LL | struct G; | --------- `G` defined here diff --git a/src/test/ui/issues/issue-20772.rs b/src/test/ui/issues/issue-20772.rs index d67c76a1525d5..36551e7014f10 100644 --- a/src/test/ui/issues/issue-20772.rs +++ b/src/test/ui/issues/issue-20772.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait T : Iterator //~^ ERROR cycle detected //~| ERROR associated type `Item` not found for `Self` diff --git a/src/test/ui/issues/issue-20772.stderr b/src/test/ui/issues/issue-20772.stderr index b898962c9cca3..15a5fc40926fe 100644 --- a/src/test/ui/issues/issue-20772.stderr +++ b/src/test/ui/issues/issue-20772.stderr @@ -1,5 +1,5 @@ error[E0391]: cycle detected when computing the supertraits of `T` - --> $DIR/issue-20772.rs:11:1 + --> $DIR/issue-20772.rs:1:1 | LL | / trait T : Iterator LL | | //~^ ERROR cycle detected @@ -10,7 +10,7 @@ LL | | {} = note: ...which again requires computing the supertraits of `T`, completing the cycle error[E0220]: associated type `Item` not found for `Self` - --> $DIR/issue-20772.rs:11:25 + --> $DIR/issue-20772.rs:1:25 | LL | trait T : Iterator | ^^^^^^^^^^ associated type `Item` not found diff --git a/src/test/ui/issues/issue-20801.nll.stderr b/src/test/ui/issues/issue-20801.nll.stderr index 3a6784eed67dd..420a06242abd6 100644 --- a/src/test/ui/issues/issue-20801.nll.stderr +++ b/src/test/ui/issues/issue-20801.nll.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/issue-20801.rs:36:22 + --> $DIR/issue-20801.rs:26:22 | LL | let a = unsafe { *mut_ref() }; | ^^^^^^^^^^ @@ -8,7 +8,7 @@ LL | let a = unsafe { *mut_ref() }; | help: consider removing the `*`: `mut_ref()` error[E0507]: cannot move out of borrowed content - --> $DIR/issue-20801.rs:39:22 + --> $DIR/issue-20801.rs:29:22 | LL | let b = unsafe { *imm_ref() }; | ^^^^^^^^^^ @@ -17,7 +17,7 @@ LL | let b = unsafe { *imm_ref() }; | help: consider removing the `*`: `imm_ref()` error[E0507]: cannot move out of borrowed content - --> $DIR/issue-20801.rs:42:22 + --> $DIR/issue-20801.rs:32:22 | LL | let c = unsafe { *mut_ptr() }; | ^^^^^^^^^^ @@ -26,7 +26,7 @@ LL | let c = unsafe { *mut_ptr() }; | help: consider removing the `*`: `mut_ptr()` error[E0507]: cannot move out of borrowed content - --> $DIR/issue-20801.rs:45:22 + --> $DIR/issue-20801.rs:35:22 | LL | let d = unsafe { *const_ptr() }; | ^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-20801.rs b/src/test/ui/issues/issue-20801.rs index d3b97a9c05863..6f8ce66d8f288 100644 --- a/src/test/ui/issues/issue-20801.rs +++ b/src/test/ui/issues/issue-20801.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // We used to ICE when moving out of a `*mut T` or `*const T`. struct T(u8); diff --git a/src/test/ui/issues/issue-20801.stderr b/src/test/ui/issues/issue-20801.stderr index 3989957b7b45a..3e273919bb9e2 100644 --- a/src/test/ui/issues/issue-20801.stderr +++ b/src/test/ui/issues/issue-20801.stderr @@ -1,23 +1,23 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/issue-20801.rs:36:22 + --> $DIR/issue-20801.rs:26:22 | LL | let a = unsafe { *mut_ref() }; | ^^^^^^^^^^ cannot move out of borrowed content error[E0507]: cannot move out of borrowed content - --> $DIR/issue-20801.rs:39:22 + --> $DIR/issue-20801.rs:29:22 | LL | let b = unsafe { *imm_ref() }; | ^^^^^^^^^^ cannot move out of borrowed content error[E0507]: cannot move out of dereference of raw pointer - --> $DIR/issue-20801.rs:42:22 + --> $DIR/issue-20801.rs:32:22 | LL | let c = unsafe { *mut_ptr() }; | ^^^^^^^^^^ cannot move out of dereference of raw pointer error[E0507]: cannot move out of dereference of raw pointer - --> $DIR/issue-20801.rs:45:22 + --> $DIR/issue-20801.rs:35:22 | LL | let d = unsafe { *const_ptr() }; | ^^^^^^^^^^^^ cannot move out of dereference of raw pointer diff --git a/src/test/ui/issues/issue-20825.rs b/src/test/ui/issues/issue-20825.rs index cbb987cd512af..516c304d8b350 100644 --- a/src/test/ui/issues/issue-20825.rs +++ b/src/test/ui/issues/issue-20825.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Subscriber { type Input; } diff --git a/src/test/ui/issues/issue-20825.stderr b/src/test/ui/issues/issue-20825.stderr index e49e3668536cc..1df51dc2d41ac 100644 --- a/src/test/ui/issues/issue-20825.stderr +++ b/src/test/ui/issues/issue-20825.stderr @@ -1,5 +1,5 @@ error[E0391]: cycle detected when computing the supertraits of `Processor` - --> $DIR/issue-20825.rs:15:1 + --> $DIR/issue-20825.rs:5:1 | LL | pub trait Processor: Subscriber { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-20831-debruijn.rs b/src/test/ui/issues/issue-20831-debruijn.rs index 6ad97d072df86..6d3c7331a4579 100644 --- a/src/test/ui/issues/issue-20831-debruijn.rs +++ b/src/test/ui/issues/issue-20831-debruijn.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #20831: debruijn index account was thrown off // by the (anonymous) lifetime in `::Output` // below. Note that changing to a named lifetime made the problem go diff --git a/src/test/ui/issues/issue-20831-debruijn.stderr b/src/test/ui/issues/issue-20831-debruijn.stderr index 556d8b402c457..fa7704cf17e3f 100644 --- a/src/test/ui/issues/issue-20831-debruijn.stderr +++ b/src/test/ui/issues/issue-20831-debruijn.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-20831-debruijn.rs:38:5 + --> $DIR/issue-20831-debruijn.rs:28:5 | LL | / fn subscribe(&mut self, t : Box::Output> + 'a>) { LL | | // Not obvious, but there is an implicit lifetime here -------^ @@ -12,8 +12,8 @@ LL | | } | = note: expected type `'a` found type `` -note: the anonymous lifetime #2 defined on the method body at 38:5... - --> $DIR/issue-20831-debruijn.rs:38:5 +note: the anonymous lifetime #2 defined on the method body at 28:5... + --> $DIR/issue-20831-debruijn.rs:28:5 | LL | / fn subscribe(&mut self, t : Box::Output> + 'a>) { LL | | // Not obvious, but there is an implicit lifetime here -------^ @@ -23,14 +23,14 @@ LL | | //~| ERROR mismatched types LL | | self.sub = t; LL | | } | |_____^ -note: ...does not necessarily outlive the lifetime 'a as defined on the impl at 36:6 - --> $DIR/issue-20831-debruijn.rs:36:6 +note: ...does not necessarily outlive the lifetime 'a as defined on the impl at 26:6 + --> $DIR/issue-20831-debruijn.rs:26:6 | LL | impl<'a> Publisher<'a> for MyStruct<'a> { | ^^ error[E0308]: mismatched types - --> $DIR/issue-20831-debruijn.rs:38:5 + --> $DIR/issue-20831-debruijn.rs:28:5 | LL | / fn subscribe(&mut self, t : Box::Output> + 'a>) { LL | | // Not obvious, but there is an implicit lifetime here -------^ @@ -43,13 +43,13 @@ LL | | } | = note: expected type `'a` found type `` -note: the lifetime 'a as defined on the impl at 36:6... - --> $DIR/issue-20831-debruijn.rs:36:6 +note: the lifetime 'a as defined on the impl at 26:6... + --> $DIR/issue-20831-debruijn.rs:26:6 | LL | impl<'a> Publisher<'a> for MyStruct<'a> { | ^^ -note: ...does not necessarily outlive the anonymous lifetime #2 defined on the method body at 38:5 - --> $DIR/issue-20831-debruijn.rs:38:5 +note: ...does not necessarily outlive the anonymous lifetime #2 defined on the method body at 28:5 + --> $DIR/issue-20831-debruijn.rs:28:5 | LL | / fn subscribe(&mut self, t : Box::Output> + 'a>) { LL | | // Not obvious, but there is an implicit lifetime here -------^ @@ -61,7 +61,7 @@ LL | | } | |_____^ error[E0495]: cannot infer an appropriate lifetime for lifetime parameter `'a` due to conflicting requirements - --> $DIR/issue-20831-debruijn.rs:38:5 + --> $DIR/issue-20831-debruijn.rs:28:5 | LL | / fn subscribe(&mut self, t : Box::Output> + 'a>) { LL | | // Not obvious, but there is an implicit lifetime here -------^ @@ -72,8 +72,8 @@ LL | | self.sub = t; LL | | } | |_____^ | -note: first, the lifetime cannot outlive the anonymous lifetime #2 defined on the method body at 38:5... - --> $DIR/issue-20831-debruijn.rs:38:5 +note: first, the lifetime cannot outlive the anonymous lifetime #2 defined on the method body at 28:5... + --> $DIR/issue-20831-debruijn.rs:28:5 | LL | / fn subscribe(&mut self, t : Box::Output> + 'a>) { LL | | // Not obvious, but there is an implicit lifetime here -------^ @@ -83,8 +83,8 @@ LL | | //~| ERROR mismatched types LL | | self.sub = t; LL | | } | |_____^ -note: ...but the lifetime must also be valid for the lifetime 'a as defined on the impl at 36:6... - --> $DIR/issue-20831-debruijn.rs:36:6 +note: ...but the lifetime must also be valid for the lifetime 'a as defined on the impl at 26:6... + --> $DIR/issue-20831-debruijn.rs:26:6 | LL | impl<'a> Publisher<'a> for MyStruct<'a> { | ^^ diff --git a/src/test/ui/issues/issue-20939.rs b/src/test/ui/issues/issue-20939.rs index 5282ce4bb8897..259fff2e6c2f8 100644 --- a/src/test/ui/issues/issue-20939.rs +++ b/src/test/ui/issues/issue-20939.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo {} impl<'a> Foo for Foo+'a {} diff --git a/src/test/ui/issues/issue-20939.stderr b/src/test/ui/issues/issue-20939.stderr index c8f7e58540b39..d15a5196667f3 100644 --- a/src/test/ui/issues/issue-20939.stderr +++ b/src/test/ui/issues/issue-20939.stderr @@ -1,5 +1,5 @@ error[E0371]: the object type `(dyn Foo + 'a)` automatically implements the trait `Foo` - --> $DIR/issue-20939.rs:13:1 + --> $DIR/issue-20939.rs:3:1 | LL | impl<'a> Foo for Foo+'a {} | ^^^^^^^^^^^^^^^^^^^^^^^ `(dyn Foo + 'a)` automatically implements trait `Foo` diff --git a/src/test/ui/issues/issue-2111.rs b/src/test/ui/issues/issue-2111.rs index 8180ce52bdbc1..7e5835e8697a3 100644 --- a/src/test/ui/issues/issue-2111.rs +++ b/src/test/ui/issues/issue-2111.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo(a: Option, b: Option) { match (a,b) { //~^ ERROR: non-exhaustive patterns: `(None, None)` not covered diff --git a/src/test/ui/issues/issue-2111.stderr b/src/test/ui/issues/issue-2111.stderr index 5aa1b02779b7d..348ad153c8099 100644 --- a/src/test/ui/issues/issue-2111.stderr +++ b/src/test/ui/issues/issue-2111.stderr @@ -1,5 +1,5 @@ error[E0004]: non-exhaustive patterns: `(None, None)` not covered - --> $DIR/issue-2111.rs:12:9 + --> $DIR/issue-2111.rs:2:9 | LL | match (a,b) { | ^^^^^ pattern `(None, None)` not covered diff --git a/src/test/ui/issues/issue-21146.rs b/src/test/ui/issues/issue-21146.rs index 457d40e62b037..19eaffc3edd4a 100644 --- a/src/test/ui/issues/issue-21146.rs +++ b/src/test/ui/issues/issue-21146.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // error-pattern: expected one of `!` or `::`, found `` include!("auxiliary/issue-21146-inc.rs"); fn main() {} diff --git a/src/test/ui/issues/issue-21146.stderr b/src/test/ui/issues/issue-21146.stderr index fab38123ea871..2798196ea00c0 100644 --- a/src/test/ui/issues/issue-21146.stderr +++ b/src/test/ui/issues/issue-21146.stderr @@ -1,5 +1,5 @@ error: expected one of `!` or `::`, found `` - --> $DIR/auxiliary/issue-21146-inc.rs:13:1 + --> $DIR/auxiliary/issue-21146-inc.rs:3:1 | LL | parse_error | ^^^^^^^^^^^ expected one of `!` or `::` here diff --git a/src/test/ui/issues/issue-21160.rs b/src/test/ui/issues/issue-21160.rs index 0de0ab2269bff..46733566cf383 100644 --- a/src/test/ui/issues/issue-21160.rs +++ b/src/test/ui/issues/issue-21160.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Bar; impl Bar { diff --git a/src/test/ui/issues/issue-21160.stderr b/src/test/ui/issues/issue-21160.stderr index 75ed9988b895b..e32343e9682db 100644 --- a/src/test/ui/issues/issue-21160.stderr +++ b/src/test/ui/issues/issue-21160.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `Bar: std::hash::Hash` is not satisfied - --> $DIR/issue-21160.rs:18:12 + --> $DIR/issue-21160.rs:8:12 | LL | struct Foo(Bar); | ^^^ the trait `std::hash::Hash` is not implemented for `Bar` diff --git a/src/test/ui/issues/issue-21174.rs b/src/test/ui/issues/issue-21174.rs index 9d9b7e4804354..4f835cde641e7 100644 --- a/src/test/ui/issues/issue-21174.rs +++ b/src/test/ui/issues/issue-21174.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Trait<'a> { type A; type B; diff --git a/src/test/ui/issues/issue-21174.stderr b/src/test/ui/issues/issue-21174.stderr index 391ed1e7698bf..5ff72aef550c3 100644 --- a/src/test/ui/issues/issue-21174.stderr +++ b/src/test/ui/issues/issue-21174.stderr @@ -1,5 +1,5 @@ error[E0512]: transmute called with types of different sizes - --> $DIR/issue-21174.rs:17:30 + --> $DIR/issue-21174.rs:7:30 | LL | let new: T::B = unsafe { std::mem::transmute(value) }; | ^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-21177.rs b/src/test/ui/issues/issue-21177.rs index 9da57877a09dc..9d153696b885e 100644 --- a/src/test/ui/issues/issue-21177.rs +++ b/src/test/ui/issues/issue-21177.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Trait { type A; type B; diff --git a/src/test/ui/issues/issue-21177.stderr b/src/test/ui/issues/issue-21177.stderr index c924fb2ee9498..c3d2c6f48af6c 100644 --- a/src/test/ui/issues/issue-21177.stderr +++ b/src/test/ui/issues/issue-21177.stderr @@ -1,18 +1,18 @@ error[E0391]: cycle detected when computing the bounds for type parameter `T` - --> $DIR/issue-21177.rs:16:21 + --> $DIR/issue-21177.rs:6:21 | LL | fn foo>() { } | ^^^^ | = note: ...which again requires computing the bounds for type parameter `T`, completing the cycle note: cycle used when processing `foo` - --> $DIR/issue-21177.rs:16:21 + --> $DIR/issue-21177.rs:6:21 | LL | fn foo>() { } | ^^^^ error[E0220]: associated type `B` not found for `T` - --> $DIR/issue-21177.rs:16:21 + --> $DIR/issue-21177.rs:6:21 | LL | fn foo>() { } | ^^^^ associated type `B` not found diff --git a/src/test/ui/issues/issue-21202.rs b/src/test/ui/issues/issue-21202.rs index 2bce838c1cfdc..446e1acbb97be 100644 --- a/src/test/ui/issues/issue-21202.rs +++ b/src/test/ui/issues/issue-21202.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_21202.rs extern crate issue_21202 as crate1; diff --git a/src/test/ui/issues/issue-21202.stderr b/src/test/ui/issues/issue-21202.stderr index 9d17ff64769c3..d19e42d8d9cad 100644 --- a/src/test/ui/issues/issue-21202.stderr +++ b/src/test/ui/issues/issue-21202.stderr @@ -1,5 +1,5 @@ error[E0624]: method `foo` is private - --> $DIR/issue-21202.rs:20:9 + --> $DIR/issue-21202.rs:10:9 | LL | Foo::foo(&f); | ^^^^^^^^ diff --git a/src/test/ui/issues/issue-21332.rs b/src/test/ui/issues/issue-21332.rs index db3334834d44e..db157f095a9be 100644 --- a/src/test/ui/issues/issue-21332.rs +++ b/src/test/ui/issues/issue-21332.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S; impl Iterator for S { diff --git a/src/test/ui/issues/issue-21332.stderr b/src/test/ui/issues/issue-21332.stderr index b5fbb71f8ca04..693b2be6c0095 100644 --- a/src/test/ui/issues/issue-21332.stderr +++ b/src/test/ui/issues/issue-21332.stderr @@ -1,5 +1,5 @@ error[E0053]: method `next` has an incompatible type for trait - --> $DIR/issue-21332.rs:15:5 + --> $DIR/issue-21332.rs:5:5 | LL | fn next(&mut self) -> Result { Ok(7) } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected enum `std::option::Option`, found enum `std::result::Result` diff --git a/src/test/ui/issues/issue-21356.rs b/src/test/ui/issues/issue-21356.rs index f66c09291cc9e..ae623929d6391 100644 --- a/src/test/ui/issues/issue-21356.rs +++ b/src/test/ui/issues/issue-21356.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused_macros)] macro_rules! test { ($wrong:t_ty ..) => () } diff --git a/src/test/ui/issues/issue-21356.stderr b/src/test/ui/issues/issue-21356.stderr index 5787476c2f235..bd708b33408e5 100644 --- a/src/test/ui/issues/issue-21356.stderr +++ b/src/test/ui/issues/issue-21356.stderr @@ -1,5 +1,5 @@ error: invalid fragment specifier `t_ty` - --> $DIR/issue-21356.rs:13:22 + --> $DIR/issue-21356.rs:3:22 | LL | macro_rules! test { ($wrong:t_ty ..) => () } | ^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-21449.rs b/src/test/ui/issues/issue-21449.rs index cc44cf88f09bd..00ce2b7fffa88 100644 --- a/src/test/ui/issues/issue-21449.rs +++ b/src/test/ui/issues/issue-21449.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod MyMod {} fn main() { diff --git a/src/test/ui/issues/issue-21449.stderr b/src/test/ui/issues/issue-21449.stderr index d84b3b99c1f57..ecaf6faba429e 100644 --- a/src/test/ui/issues/issue-21449.stderr +++ b/src/test/ui/issues/issue-21449.stderr @@ -1,5 +1,5 @@ error[E0574]: expected struct, variant or union type, found module `MyMod` - --> $DIR/issue-21449.rs:14:17 + --> $DIR/issue-21449.rs:4:17 | LL | let myVar = MyMod { T: 0 }; | ^^^^^ not a struct, variant or union type diff --git a/src/test/ui/issues/issue-2149.rs b/src/test/ui/issues/issue-2149.rs index 256c5d8e6f72c..9f6134ed03a12 100644 --- a/src/test/ui/issues/issue-2149.rs +++ b/src/test/ui/issues/issue-2149.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait vec_monad { fn bind(&self, f: F) where F: FnMut(A) -> Vec; } diff --git a/src/test/ui/issues/issue-2149.stderr b/src/test/ui/issues/issue-2149.stderr index 4ae9032cd1aa8..a0a237a193f4a 100644 --- a/src/test/ui/issues/issue-2149.stderr +++ b/src/test/ui/issues/issue-2149.stderr @@ -1,5 +1,5 @@ error[E0277]: cannot add `std::vec::Vec` to `()` - --> $DIR/issue-2149.rs:18:33 + --> $DIR/issue-2149.rs:8:33 | LL | for elt in self { r = r + f(*elt); } | ^ no implementation for `() + std::vec::Vec` @@ -7,7 +7,7 @@ LL | for elt in self { r = r + f(*elt); } = help: the trait `std::ops::Add>` is not implemented for `()` error[E0599]: no method named `bind` found for type `[&str; 1]` in the current scope - --> $DIR/issue-2149.rs:23:12 + --> $DIR/issue-2149.rs:13:12 | LL | ["hi"].bind(|x| [x] ); | ^^^^ diff --git a/src/test/ui/issues/issue-2150.rs b/src/test/ui/issues/issue-2150.rs index 8b109b0a5c04d..baa1dde0fc2e8 100644 --- a/src/test/ui/issues/issue-2150.rs +++ b/src/test/ui/issues/issue-2150.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(unreachable_code)] #![allow(unused_variables)] #![allow(dead_code)] diff --git a/src/test/ui/issues/issue-2150.stderr b/src/test/ui/issues/issue-2150.stderr index c1944efab8bea..59000f3dd5338 100644 --- a/src/test/ui/issues/issue-2150.stderr +++ b/src/test/ui/issues/issue-2150.stderr @@ -1,11 +1,11 @@ error: unreachable statement - --> $DIR/issue-2150.rs:18:5 + --> $DIR/issue-2150.rs:8:5 | LL | for x in &v { i += 1; } | ^^^^^^^^^^^^^^^^^^^^^^^ | note: lint level defined here - --> $DIR/issue-2150.rs:11:9 + --> $DIR/issue-2150.rs:1:9 | LL | #![deny(unreachable_code)] | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-2151.rs b/src/test/ui/issues/issue-2151.rs index 3cf971f3f8dfb..32fba4cb2177d 100644 --- a/src/test/ui/issues/issue-2151.rs +++ b/src/test/ui/issues/issue-2151.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x = panic!(); x.clone(); //~ ERROR type annotations needed diff --git a/src/test/ui/issues/issue-2151.stderr b/src/test/ui/issues/issue-2151.stderr index 516c5287b319a..23f3c58653e50 100644 --- a/src/test/ui/issues/issue-2151.stderr +++ b/src/test/ui/issues/issue-2151.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/issue-2151.rs:13:5 + --> $DIR/issue-2151.rs:3:5 | LL | let x = panic!(); | - consider giving `x` a type diff --git a/src/test/ui/issues/issue-21546.rs b/src/test/ui/issues/issue-21546.rs index da1669bc913f8..9f3974b431470 100644 --- a/src/test/ui/issues/issue-21546.rs +++ b/src/test/ui/issues/issue-21546.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Also works as a test for #14564 #[allow(non_snake_case)] diff --git a/src/test/ui/issues/issue-21546.stderr b/src/test/ui/issues/issue-21546.stderr index bff79e52aa181..5fd06fc673361 100644 --- a/src/test/ui/issues/issue-21546.stderr +++ b/src/test/ui/issues/issue-21546.stderr @@ -1,5 +1,5 @@ error[E0428]: the name `Foo` is defined multiple times - --> $DIR/issue-21546.rs:17:1 + --> $DIR/issue-21546.rs:7:1 | LL | mod Foo { } | ------- previous definition of the module `Foo` here @@ -10,7 +10,7 @@ LL | struct Foo; = note: `Foo` must be defined only once in the type namespace of this module error[E0428]: the name `Bar` is defined multiple times - --> $DIR/issue-21546.rs:24:1 + --> $DIR/issue-21546.rs:14:1 | LL | mod Bar { } | ------- previous definition of the module `Bar` here @@ -21,7 +21,7 @@ LL | struct Bar(i32); = note: `Bar` must be defined only once in the type namespace of this module error[E0428]: the name `Baz` is defined multiple times - --> $DIR/issue-21546.rs:32:1 + --> $DIR/issue-21546.rs:22:1 | LL | struct Baz(i32); | ---------------- previous definition of the type `Baz` here @@ -32,7 +32,7 @@ LL | mod Baz { } = note: `Baz` must be defined only once in the type namespace of this module error[E0428]: the name `Qux` is defined multiple times - --> $DIR/issue-21546.rs:40:1 + --> $DIR/issue-21546.rs:30:1 | LL | struct Qux { x: bool } | ---------- previous definition of the type `Qux` here @@ -43,7 +43,7 @@ LL | mod Qux { } = note: `Qux` must be defined only once in the type namespace of this module error[E0428]: the name `Quux` is defined multiple times - --> $DIR/issue-21546.rs:48:1 + --> $DIR/issue-21546.rs:38:1 | LL | struct Quux; | ------------ previous definition of the type `Quux` here @@ -54,7 +54,7 @@ LL | mod Quux { } = note: `Quux` must be defined only once in the type namespace of this module error[E0428]: the name `Corge` is defined multiple times - --> $DIR/issue-21546.rs:56:1 + --> $DIR/issue-21546.rs:46:1 | LL | enum Corge { A, B } | ---------- previous definition of the type `Corge` here diff --git a/src/test/ui/issues/issue-21554.rs b/src/test/ui/issues/issue-21554.rs index 1b87862a056df..c176b1247cea9 100644 --- a/src/test/ui/issues/issue-21554.rs +++ b/src/test/ui/issues/issue-21554.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Inches(i32); fn main() { diff --git a/src/test/ui/issues/issue-21554.stderr b/src/test/ui/issues/issue-21554.stderr index be7762f1aa245..3acfeff0859dd 100644 --- a/src/test/ui/issues/issue-21554.stderr +++ b/src/test/ui/issues/issue-21554.stderr @@ -1,5 +1,5 @@ error[E0606]: casting `fn(i32) -> Inches {Inches::{{constructor}}}` as `f32` is invalid - --> $DIR/issue-21554.rs:14:5 + --> $DIR/issue-21554.rs:4:5 | LL | Inches as f32; | ^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-21600.nll.stderr b/src/test/ui/issues/issue-21600.nll.stderr index 5fe8dc45ccc72..05837e92cdbc1 100644 --- a/src/test/ui/issues/issue-21600.nll.stderr +++ b/src/test/ui/issues/issue-21600.nll.stderr @@ -1,17 +1,17 @@ error[E0596]: cannot borrow `x` as mutable, as it is a captured variable in a `Fn` closure - --> $DIR/issue-21600.rs:24:20 + --> $DIR/issue-21600.rs:14:20 | LL | call_it(|| x.gen_mut()); //~ ERROR cannot borrow data mutably in a captured outer | ^ cannot borrow as mutable | help: consider changing this to accept closures that implement `FnMut` - --> $DIR/issue-21600.rs:24:17 + --> $DIR/issue-21600.rs:14:17 | LL | call_it(|| x.gen_mut()); //~ ERROR cannot borrow data mutably in a captured outer | ^^^^^^^^^^^^^^ error[E0596]: cannot borrow `x` as mutable, as it is a captured variable in a `Fn` closure - --> $DIR/issue-21600.rs:24:17 + --> $DIR/issue-21600.rs:14:17 | LL | call_it(|| x.gen_mut()); //~ ERROR cannot borrow data mutably in a captured outer | ^^ - mutable borrow occurs due to use of `x` in closure @@ -19,7 +19,7 @@ LL | call_it(|| x.gen_mut()); //~ ERROR cannot borrow data mutably in a | cannot borrow as mutable | help: consider changing this to accept closures that implement `FnMut` - --> $DIR/issue-21600.rs:22:13 + --> $DIR/issue-21600.rs:12:13 | LL | call_it(|| { | _____________^ diff --git a/src/test/ui/issues/issue-21600.rs b/src/test/ui/issues/issue-21600.rs index e4dfad2433c14..1efc873bee266 100644 --- a/src/test/ui/issues/issue-21600.rs +++ b/src/test/ui/issues/issue-21600.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn call_it(f: F) where F: Fn() { f(); } struct A; diff --git a/src/test/ui/issues/issue-21600.stderr b/src/test/ui/issues/issue-21600.stderr index 873dc7448be25..ccb75f4cc005c 100644 --- a/src/test/ui/issues/issue-21600.stderr +++ b/src/test/ui/issues/issue-21600.stderr @@ -1,11 +1,11 @@ error[E0387]: cannot borrow data mutably in a captured outer variable in an `Fn` closure - --> $DIR/issue-21600.rs:24:17 + --> $DIR/issue-21600.rs:14:17 | LL | call_it(|| x.gen_mut()); //~ ERROR cannot borrow data mutably in a captured outer | ^^ | help: consider changing this to accept closures that implement `FnMut` - --> $DIR/issue-21600.rs:22:13 + --> $DIR/issue-21600.rs:12:13 | LL | call_it(|| { | _____________^ @@ -16,13 +16,13 @@ LL | | }); | |_____^ error[E0387]: cannot borrow data mutably in a captured outer variable in an `Fn` closure - --> $DIR/issue-21600.rs:24:20 + --> $DIR/issue-21600.rs:14:20 | LL | call_it(|| x.gen_mut()); //~ ERROR cannot borrow data mutably in a captured outer | ^ | help: consider changing this closure to take self by mutable reference - --> $DIR/issue-21600.rs:24:17 + --> $DIR/issue-21600.rs:14:17 | LL | call_it(|| x.gen_mut()); //~ ERROR cannot borrow data mutably in a captured outer | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-21701.rs b/src/test/ui/issues/issue-21701.rs index f24de2ffe6b5f..fb2d5a4ad2a2c 100644 --- a/src/test/ui/issues/issue-21701.rs +++ b/src/test/ui/issues/issue-21701.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo(t: U) { let y = t(); //~^ ERROR: expected function, found `U` diff --git a/src/test/ui/issues/issue-21701.stderr b/src/test/ui/issues/issue-21701.stderr index 9fb9a7b51f280..27e0e467f5526 100644 --- a/src/test/ui/issues/issue-21701.stderr +++ b/src/test/ui/issues/issue-21701.stderr @@ -1,5 +1,5 @@ error[E0618]: expected function, found `U` - --> $DIR/issue-21701.rs:12:13 + --> $DIR/issue-21701.rs:2:13 | LL | fn foo(t: U) { | - `U` defined here @@ -7,7 +7,7 @@ LL | let y = t(); | ^^^ not a function error[E0618]: expected function, found `Bar` - --> $DIR/issue-21701.rs:19:13 + --> $DIR/issue-21701.rs:9:13 | LL | struct Bar; | ----------- `Bar` defined here diff --git a/src/test/ui/issues/issue-21763.rs b/src/test/ui/issues/issue-21763.rs index b4f952c87d4aa..29ee5f91717d5 100644 --- a/src/test/ui/issues/issue-21763.rs +++ b/src/test/ui/issues/issue-21763.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for HashMap only impl'ing Send/Sync if its contents do use std::collections::HashMap; diff --git a/src/test/ui/issues/issue-21763.stderr b/src/test/ui/issues/issue-21763.stderr index 91db16e0f6d27..62cc88776882f 100644 --- a/src/test/ui/issues/issue-21763.stderr +++ b/src/test/ui/issues/issue-21763.stderr @@ -1,5 +1,5 @@ error[E0277]: `std::rc::Rc<()>` cannot be sent between threads safely - --> $DIR/issue-21763.rs:19:5 + --> $DIR/issue-21763.rs:9:5 | LL | foo::, Rc<()>>>(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `std::rc::Rc<()>` cannot be sent between threads safely @@ -10,7 +10,7 @@ LL | foo::, Rc<()>>>(); = note: required because it appears within the type `std::collections::hash::table::RawTable, std::rc::Rc<()>>` = note: required because it appears within the type `std::collections::HashMap, std::rc::Rc<()>>` note: required by `foo` - --> $DIR/issue-21763.rs:16:1 + --> $DIR/issue-21763.rs:6:1 | LL | fn foo() {} | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-21837.rs b/src/test/ui/issues/issue-21837.rs index 86506de1ea9c5..213119bd21c43 100644 --- a/src/test/ui/issues/issue-21837.rs +++ b/src/test/ui/issues/issue-21837.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Bound {} pub struct Foo(T); diff --git a/src/test/ui/issues/issue-21837.stderr b/src/test/ui/issues/issue-21837.stderr index bbdebeefdd68e..464a65fa695af 100644 --- a/src/test/ui/issues/issue-21837.stderr +++ b/src/test/ui/issues/issue-21837.stderr @@ -1,12 +1,12 @@ error[E0277]: the trait bound `T: Bound` is not satisfied - --> $DIR/issue-21837.rs:18:9 + --> $DIR/issue-21837.rs:8:9 | LL | impl Trait2 for Foo {} //~ ERROR the trait bound `T: Bound` is not satisfied | ^^^^^^ the trait `Bound` is not implemented for `T` | = help: consider adding a `where T: Bound` bound note: required by `Foo` - --> $DIR/issue-21837.rs:12:1 + --> $DIR/issue-21837.rs:2:1 | LL | pub struct Foo(T); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-21946.rs b/src/test/ui/issues/issue-21946.rs index 0d652be5c2611..d7a6c656df98f 100644 --- a/src/test/ui/issues/issue-21946.rs +++ b/src/test/ui/issues/issue-21946.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { type A; } diff --git a/src/test/ui/issues/issue-21946.stderr b/src/test/ui/issues/issue-21946.stderr index ebb0c0c9ce000..7a178bee6ae03 100644 --- a/src/test/ui/issues/issue-21946.stderr +++ b/src/test/ui/issues/issue-21946.stderr @@ -1,5 +1,5 @@ error[E0275]: overflow evaluating the requirement `::A` - --> $DIR/issue-21946.rs:17:6 + --> $DIR/issue-21946.rs:7:6 | LL | impl Foo for FooStruct { | ^^^ diff --git a/src/test/ui/issues/issue-21950.rs b/src/test/ui/issues/issue-21950.rs index f9328a58d0935..0f78b37fedba3 100644 --- a/src/test/ui/issues/issue-21950.rs +++ b/src/test/ui/issues/issue-21950.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength use std::ops::Add; diff --git a/src/test/ui/issues/issue-21950.stderr b/src/test/ui/issues/issue-21950.stderr index a2f74a29aab78..ce0caec34b1e7 100644 --- a/src/test/ui/issues/issue-21950.stderr +++ b/src/test/ui/issues/issue-21950.stderr @@ -1,5 +1,5 @@ error[E0393]: the type parameter `RHS` must be explicitly specified - --> $DIR/issue-21950.rs:17:14 + --> $DIR/issue-21950.rs:7:14 | LL | &Add; | ^^^ missing reference to `RHS` @@ -7,7 +7,7 @@ LL | &Add; = note: because of the default `Self` reference, type parameters must be specified on object types error[E0191]: the value of the associated type `Output` (from the trait `std::ops::Add`) must be specified - --> $DIR/issue-21950.rs:17:14 + --> $DIR/issue-21950.rs:7:14 | LL | &Add; | ^^^ missing associated type `Output` value diff --git a/src/test/ui/issues/issue-21974.rs b/src/test/ui/issues/issue-21974.rs index 6ddfa4c8e3e57..f49eb230b4083 100644 --- a/src/test/ui/issues/issue-21974.rs +++ b/src/test/ui/issues/issue-21974.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that (for now) we report an ambiguity error here, because // specific trait relationships are ignored for the purposes of trait // matching. This behavior should likely be improved such that this diff --git a/src/test/ui/issues/issue-21974.stderr b/src/test/ui/issues/issue-21974.stderr index 4cc28c9ceb508..d5c48db4500ea 100644 --- a/src/test/ui/issues/issue-21974.stderr +++ b/src/test/ui/issues/issue-21974.stderr @@ -1,5 +1,5 @@ error[E0283]: type annotations required: cannot resolve `&'a T: Foo` - --> $DIR/issue-21974.rs:20:1 + --> $DIR/issue-21974.rs:10:1 | LL | / fn foo<'a,'b,T>(x: &'a T, y: &'b T) //~ ERROR type annotations required LL | | where &'a T : Foo, @@ -11,7 +11,7 @@ LL | | } | |_^ | note: required by `Foo` - --> $DIR/issue-21974.rs:16:1 + --> $DIR/issue-21974.rs:6:1 | LL | trait Foo { | ^^^^^^^^^ diff --git a/src/test/ui/issues/issue-22034.rs b/src/test/ui/issues/issue-22034.rs index 2708de2c13a8f..ac54449396eab 100644 --- a/src/test/ui/issues/issue-22034.rs +++ b/src/test/ui/issues/issue-22034.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(libc)] extern crate libc; diff --git a/src/test/ui/issues/issue-22034.stderr b/src/test/ui/issues/issue-22034.stderr index da376fedbb98a..de2d315ff5c68 100644 --- a/src/test/ui/issues/issue-22034.stderr +++ b/src/test/ui/issues/issue-22034.stderr @@ -1,5 +1,5 @@ error[E0277]: expected a `std::ops::Fn<()>` closure, found `()` - --> $DIR/issue-22034.rs:18:16 + --> $DIR/issue-22034.rs:8:16 | LL | &mut *(ptr as *mut Fn()) | ^^^ expected an `Fn<()>` closure, found `()` diff --git a/src/test/ui/issues/issue-22037.rs b/src/test/ui/issues/issue-22037.rs index ffa881b49c500..b9eb41b6ea6e5 100644 --- a/src/test/ui/issues/issue-22037.rs +++ b/src/test/ui/issues/issue-22037.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait A { type Output; fn a(&self) -> ::X; diff --git a/src/test/ui/issues/issue-22037.stderr b/src/test/ui/issues/issue-22037.stderr index ae739afc70453..615628558f08b 100644 --- a/src/test/ui/issues/issue-22037.stderr +++ b/src/test/ui/issues/issue-22037.stderr @@ -1,5 +1,5 @@ error[E0576]: cannot find associated type `X` in trait `A` - --> $DIR/issue-22037.rs:13:33 + --> $DIR/issue-22037.rs:3:33 | LL | fn a(&self) -> ::X; | ^ not found in `A` diff --git a/src/test/ui/issues/issue-22289.rs b/src/test/ui/issues/issue-22289.rs index c23fc4f334472..b683834de441b 100644 --- a/src/test/ui/issues/issue-22289.rs +++ b/src/test/ui/issues/issue-22289.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { 0 as &std::any::Any; //~ ERROR non-primitive cast } diff --git a/src/test/ui/issues/issue-22289.stderr b/src/test/ui/issues/issue-22289.stderr index 202b25f1a5b9a..5214ec1ad1638 100644 --- a/src/test/ui/issues/issue-22289.stderr +++ b/src/test/ui/issues/issue-22289.stderr @@ -1,5 +1,5 @@ error[E0605]: non-primitive cast: `i32` as `&(dyn std::any::Any + 'static)` - --> $DIR/issue-22289.rs:12:5 + --> $DIR/issue-22289.rs:2:5 | LL | 0 as &std::any::Any; //~ ERROR non-primitive cast | ^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-22312.rs b/src/test/ui/issues/issue-22312.rs index 2128c4206301b..f7ebdb0372ad8 100644 --- a/src/test/ui/issues/issue-22312.rs +++ b/src/test/ui/issues/issue-22312.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::Index; pub trait Array2D: Index { diff --git a/src/test/ui/issues/issue-22312.stderr b/src/test/ui/issues/issue-22312.stderr index abd712e5c2957..d8987a37f7e46 100644 --- a/src/test/ui/issues/issue-22312.stderr +++ b/src/test/ui/issues/issue-22312.stderr @@ -1,5 +1,5 @@ error[E0605]: non-primitive cast: `Self` as `&dyn std::ops::Index>::Output>` - --> $DIR/issue-22312.rs:21:24 + --> $DIR/issue-22312.rs:11:24 | LL | let indexer = &(*self as &Index>::Output>); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-22370.rs b/src/test/ui/issues/issue-22370.rs index 4613c5977fd7f..44eef2da83ce3 100644 --- a/src/test/ui/issues/issue-22370.rs +++ b/src/test/ui/issues/issue-22370.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength trait A {} diff --git a/src/test/ui/issues/issue-22370.stderr b/src/test/ui/issues/issue-22370.stderr index b3691503fc19a..5d76d84d11e6f 100644 --- a/src/test/ui/issues/issue-22370.stderr +++ b/src/test/ui/issues/issue-22370.stderr @@ -1,5 +1,5 @@ error[E0393]: the type parameter `T` must be explicitly specified - --> $DIR/issue-22370.rs:15:10 + --> $DIR/issue-22370.rs:5:10 | LL | fn f(a: &A) {} | ^ missing reference to `T` diff --git a/src/test/ui/issues/issue-22384.rs b/src/test/ui/issues/issue-22384.rs index ae7fb01e057c6..98988f27ecce5 100644 --- a/src/test/ui/issues/issue-22384.rs +++ b/src/test/ui/issues/issue-22384.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Trait { fn foo(); } diff --git a/src/test/ui/issues/issue-22384.stderr b/src/test/ui/issues/issue-22384.stderr index b8cc1e643e53d..1f767a443d0f0 100644 --- a/src/test/ui/issues/issue-22384.stderr +++ b/src/test/ui/issues/issue-22384.stderr @@ -1,5 +1,5 @@ error[E0576]: cannot find associated type `foobar` in trait `Copy` - --> $DIR/issue-22384.rs:16:21 + --> $DIR/issue-22384.rs:6:21 | LL | <::foobar as Trait>::foo(); | ^^^^^^ not found in `Copy` diff --git a/src/test/ui/issues/issue-22434.rs b/src/test/ui/issues/issue-22434.rs index 6effd02bac8da..0d7d67cbc1bc2 100644 --- a/src/test/ui/issues/issue-22434.rs +++ b/src/test/ui/issues/issue-22434.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Foo { type A; } diff --git a/src/test/ui/issues/issue-22434.stderr b/src/test/ui/issues/issue-22434.stderr index 914da801ad4e7..132ba008bb12a 100644 --- a/src/test/ui/issues/issue-22434.stderr +++ b/src/test/ui/issues/issue-22434.stderr @@ -1,5 +1,5 @@ error[E0191]: the value of the associated type `A` (from the trait `Foo`) must be specified - --> $DIR/issue-22434.rs:15:19 + --> $DIR/issue-22434.rs:5:19 | LL | type I<'a> = &'a (Foo + 'a); | ^^^^^^^^ missing associated type `A` value diff --git a/src/test/ui/issues/issue-22468.rs b/src/test/ui/issues/issue-22468.rs index 50e5dd2955dff..197a19c038c4b 100644 --- a/src/test/ui/issues/issue-22468.rs +++ b/src/test/ui/issues/issue-22468.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let foo = "bar"; let x = foo("baz"); diff --git a/src/test/ui/issues/issue-22468.stderr b/src/test/ui/issues/issue-22468.stderr index 034a076fbfe83..686b9bb88183c 100644 --- a/src/test/ui/issues/issue-22468.stderr +++ b/src/test/ui/issues/issue-22468.stderr @@ -1,5 +1,5 @@ error[E0618]: expected function, found `&str` - --> $DIR/issue-22468.rs:13:13 + --> $DIR/issue-22468.rs:3:13 | LL | let foo = "bar"; | --- `&str` defined here diff --git a/src/test/ui/issues/issue-22560.rs b/src/test/ui/issues/issue-22560.rs index b1c636f2ef645..d91211e556b11 100644 --- a/src/test/ui/issues/issue-22560.rs +++ b/src/test/ui/issues/issue-22560.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength use std::ops::{Add, Sub}; diff --git a/src/test/ui/issues/issue-22560.stderr b/src/test/ui/issues/issue-22560.stderr index b5524036fae9d..d9d02f0ba8cbf 100644 --- a/src/test/ui/issues/issue-22560.stderr +++ b/src/test/ui/issues/issue-22560.stderr @@ -1,5 +1,5 @@ error[E0393]: the type parameter `RHS` must be explicitly specified - --> $DIR/issue-22560.rs:15:13 + --> $DIR/issue-22560.rs:5:13 | LL | type Test = Add + | ^^^ missing reference to `RHS` @@ -7,7 +7,7 @@ LL | type Test = Add + = note: because of the default `Self` reference, type parameters must be specified on object types error[E0393]: the type parameter `RHS` must be explicitly specified - --> $DIR/issue-22560.rs:18:13 + --> $DIR/issue-22560.rs:8:13 | LL | Sub; | ^^^ missing reference to `RHS` @@ -15,13 +15,13 @@ LL | Sub; = note: because of the default `Self` reference, type parameters must be specified on object types error[E0225]: only auto traits can be used as additional traits in a trait object - --> $DIR/issue-22560.rs:18:13 + --> $DIR/issue-22560.rs:8:13 | LL | Sub; | ^^^ non-auto additional trait error[E0191]: the value of the associated type `Output` (from the trait `std::ops::Add`) must be specified - --> $DIR/issue-22560.rs:15:13 + --> $DIR/issue-22560.rs:5:13 | LL | type Test = Add + | _____________^ diff --git a/src/test/ui/issues/issue-22599.rs b/src/test/ui/issues/issue-22599.rs index b9ea358329677..05096e5c18531 100644 --- a/src/test/ui/issues/issue-22599.rs +++ b/src/test/ui/issues/issue-22599.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(unused_variables)] fn f(_: i32) {} diff --git a/src/test/ui/issues/issue-22599.stderr b/src/test/ui/issues/issue-22599.stderr index 19c9b94a430a8..5c2ed7455f132 100644 --- a/src/test/ui/issues/issue-22599.stderr +++ b/src/test/ui/issues/issue-22599.stderr @@ -1,11 +1,11 @@ error: unused variable: `a` - --> $DIR/issue-22599.rs:18:19 + --> $DIR/issue-22599.rs:8:19 | LL | v = match 0 { a => 0 }; //~ ERROR: unused variable: `a` | ^ help: consider using `_a` instead | note: lint level defined here - --> $DIR/issue-22599.rs:11:9 + --> $DIR/issue-22599.rs:1:9 | LL | #![deny(unused_variables)] | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-22603.rs b/src/test/ui/issues/issue-22603.rs index d08f916b870c1..88f0839f65f37 100644 --- a/src/test/ui/issues/issue-22603.rs +++ b/src/test/ui/issues/issue-22603.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unboxed_closures, fn_traits, rustc_attrs)] struct Foo; diff --git a/src/test/ui/issues/issue-22603.stderr b/src/test/ui/issues/issue-22603.stderr index b50a5a25a7a46..ad06b00f4f17d 100644 --- a/src/test/ui/issues/issue-22603.stderr +++ b/src/test/ui/issues/issue-22603.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-22603.rs:21:1 + --> $DIR/issue-22603.rs:11:1 | LL | / fn main() { //~ ERROR compilation successful LL | | println!("{:?}", Foo("bar")); diff --git a/src/test/ui/issues/issue-22638.rs b/src/test/ui/issues/issue-22638.rs index 10ea1077ede53..fab24404eba7d 100644 --- a/src/test/ui/issues/issue-22638.rs +++ b/src/test/ui/issues/issue-22638.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // normalize-stderr-test: "<\[closure@.+`" -> "$$CLOSURE`" #![allow(unused)] diff --git a/src/test/ui/issues/issue-22638.stderr b/src/test/ui/issues/issue-22638.stderr index 299d74b08b80e..ba7d5f070170d 100644 --- a/src/test/ui/issues/issue-22638.stderr +++ b/src/test/ui/issues/issue-22638.stderr @@ -1,5 +1,5 @@ error: reached the type-length limit while instantiating `D::matches::$CLOSURE` - --> $DIR/issue-22638.rs:62:5 + --> $DIR/issue-22638.rs:52:5 | LL | / pub fn matches(&self, f: &F) { LL | | //~^ ERROR reached the type-length limit while instantiating `D::matches::<[closure diff --git a/src/test/ui/issues/issue-22644.rs b/src/test/ui/issues/issue-22644.rs index f787e43dbdf57..c87a927e55008 100644 --- a/src/test/ui/issues/issue-22644.rs +++ b/src/test/ui/issues/issue-22644.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let a : u32 = 0; let long_name : usize = 0; diff --git a/src/test/ui/issues/issue-22644.stderr b/src/test/ui/issues/issue-22644.stderr index aeb465b2ab233..ea5c9c5ad239e 100644 --- a/src/test/ui/issues/issue-22644.stderr +++ b/src/test/ui/issues/issue-22644.stderr @@ -1,5 +1,5 @@ error: `<` is interpreted as a start of generic arguments for `usize`, not a comparison - --> $DIR/issue-22644.rs:16:31 + --> $DIR/issue-22644.rs:6:31 | LL | println!("{}", a as usize < long_name); //~ ERROR `<` is interpreted as a start of generic | ---------- ^ --------- interpreted as generic arguments @@ -8,7 +8,7 @@ LL | println!("{}", a as usize < long_name); //~ ERROR `<` is interpreted as | help: try comparing the cast value: `(a as usize)` error: `<` is interpreted as a start of generic arguments for `usize`, not a comparison - --> $DIR/issue-22644.rs:17:33 + --> $DIR/issue-22644.rs:7:33 | LL | println!("{}{}", a as usize < long_name, long_name); | ---------- ^ -------------------- interpreted as generic arguments @@ -17,7 +17,7 @@ LL | println!("{}{}", a as usize < long_name, long_name); | help: try comparing the cast value: `(a as usize)` error: `<` is interpreted as a start of generic arguments for `usize`, not a comparison - --> $DIR/issue-22644.rs:19:31 + --> $DIR/issue-22644.rs:9:31 | LL | println!("{}", a as usize < 4); //~ ERROR `<` is interpreted as a start of generic | ---------- ^ - interpreted as generic arguments @@ -26,7 +26,7 @@ LL | println!("{}", a as usize < 4); //~ ERROR `<` is interpreted as a start | help: try comparing the cast value: `(a as usize)` error: `<` is interpreted as a start of generic arguments for `usize`, not a comparison - --> $DIR/issue-22644.rs:21:31 + --> $DIR/issue-22644.rs:11:31 | LL | println!("{}{}", a: usize < long_name, long_name); | -------- ^ -------------------- interpreted as generic arguments @@ -35,7 +35,7 @@ LL | println!("{}{}", a: usize < long_name, long_name); | help: try comparing the cast value: `(a: usize)` error: `<` is interpreted as a start of generic arguments for `usize`, not a comparison - --> $DIR/issue-22644.rs:23:29 + --> $DIR/issue-22644.rs:13:29 | LL | println!("{}", a: usize < 4); //~ ERROR `<` is interpreted as a start of generic | -------- ^ - interpreted as generic arguments @@ -44,7 +44,7 @@ LL | println!("{}", a: usize < 4); //~ ERROR `<` is interpreted as a start o | help: try comparing the cast value: `(a: usize)` error: `<` is interpreted as a start of generic arguments for `usize`, not a comparison - --> $DIR/issue-22644.rs:28:20 + --> $DIR/issue-22644.rs:18:20 | LL | < //~ ERROR `<` is interpreted as a start of generic | ^ not interpreted as comparison @@ -58,7 +58,7 @@ LL | usize) | error: `<` is interpreted as a start of generic arguments for `usize`, not a comparison - --> $DIR/issue-22644.rs:37:20 + --> $DIR/issue-22644.rs:27:20 | LL | < //~ ERROR `<` is interpreted as a start of generic | ^ not interpreted as comparison @@ -75,7 +75,7 @@ LL | ... error: `<` is interpreted as a start of generic arguments for `usize`, not a shift - --> $DIR/issue-22644.rs:40:31 + --> $DIR/issue-22644.rs:30:31 | LL | println!("{}", a as usize << long_name); //~ ERROR `<` is interpreted as a start of generic | ---------- ^^ --------- interpreted as generic arguments @@ -84,7 +84,7 @@ LL | println!("{}", a as usize << long_name); //~ ERROR `<` is interpreted a | help: try shifting the cast value: `(a as usize)` error: expected type, found `4` - --> $DIR/issue-22644.rs:42:28 + --> $DIR/issue-22644.rs:32:28 | LL | println!("{}", a: &mut 4); //~ ERROR expected type, found `4` | ^ expecting a type here because of type ascription diff --git a/src/test/ui/issues/issue-22673.rs b/src/test/ui/issues/issue-22673.rs index 2396007c3df3e..ba8057b684de8 100644 --- a/src/test/ui/issues/issue-22673.rs +++ b/src/test/ui/issues/issue-22673.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Expr : PartialEq { //~^ ERROR: cycle detected type Item; diff --git a/src/test/ui/issues/issue-22673.stderr b/src/test/ui/issues/issue-22673.stderr index 7e5b80c371153..4b5730c91eb55 100644 --- a/src/test/ui/issues/issue-22673.stderr +++ b/src/test/ui/issues/issue-22673.stderr @@ -1,5 +1,5 @@ error[E0391]: cycle detected when computing the supertraits of `Expr` - --> $DIR/issue-22673.rs:11:1 + --> $DIR/issue-22673.rs:1:1 | LL | trait Expr : PartialEq { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-22684.rs b/src/test/ui/issues/issue-22684.rs index a791758ad1763..a5b042706ed1c 100644 --- a/src/test/ui/issues/issue-22684.rs +++ b/src/test/ui/issues/issue-22684.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod foo { pub struct Foo; impl Foo { diff --git a/src/test/ui/issues/issue-22684.stderr b/src/test/ui/issues/issue-22684.stderr index 2c868bc877849..6e2b2357a05de 100644 --- a/src/test/ui/issues/issue-22684.stderr +++ b/src/test/ui/issues/issue-22684.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-22684.rs:27:17 + --> $DIR/issue-22684.rs:17:17 | LL | let _: () = foo::Foo.bar(); //~ ERROR mismatched types | ^^^^^^^^^^^^^^ expected (), found bool diff --git a/src/test/ui/issues/issue-22706.rs b/src/test/ui/issues/issue-22706.rs index 3d9ec0a6581d6..c19c2a4c7059b 100644 --- a/src/test/ui/issues/issue-22706.rs +++ b/src/test/ui/issues/issue-22706.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn is_copy::Copy>() {} //~^ ERROR type parameters are not allowed on this type [E0109] fn main() {} diff --git a/src/test/ui/issues/issue-22706.stderr b/src/test/ui/issues/issue-22706.stderr index 2bbb3e5acad6f..57e62599b196f 100644 --- a/src/test/ui/issues/issue-22706.stderr +++ b/src/test/ui/issues/issue-22706.stderr @@ -1,5 +1,5 @@ error[E0109]: type parameters are not allowed on this type - --> $DIR/issue-22706.rs:11:29 + --> $DIR/issue-22706.rs:1:29 | LL | fn is_copy::Copy>() {} | ^^^ type parameter not allowed diff --git a/src/test/ui/issues/issue-22789.rs b/src/test/ui/issues/issue-22789.rs index cba1c367bb9b2..35cad399676e5 100644 --- a/src/test/ui/issues/issue-22789.rs +++ b/src/test/ui/issues/issue-22789.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unboxed_closures, fn_traits, rustc_attrs)] #[rustc_error] diff --git a/src/test/ui/issues/issue-22789.stderr b/src/test/ui/issues/issue-22789.stderr index afeae9c78efb8..a412b0eb9cc3b 100644 --- a/src/test/ui/issues/issue-22789.stderr +++ b/src/test/ui/issues/issue-22789.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-22789.rs:14:1 + --> $DIR/issue-22789.rs:4:1 | LL | / fn main() { //~ ERROR compilation successful LL | | let k = |x: i32| { x + 1 }; diff --git a/src/test/ui/issues/issue-2281-part1.rs b/src/test/ui/issues/issue-2281-part1.rs index e3fd9c48a5256..8340ade2239d1 100644 --- a/src/test/ui/issues/issue-2281-part1.rs +++ b/src/test/ui/issues/issue-2281-part1.rs @@ -1,11 +1 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { println!("{}", foobar); } //~ ERROR cannot find value `foobar` in this scope diff --git a/src/test/ui/issues/issue-2281-part1.stderr b/src/test/ui/issues/issue-2281-part1.stderr index e88cfe2b2ac72..faf31c7bd4af5 100644 --- a/src/test/ui/issues/issue-2281-part1.stderr +++ b/src/test/ui/issues/issue-2281-part1.stderr @@ -1,5 +1,5 @@ error[E0425]: cannot find value `foobar` in this scope - --> $DIR/issue-2281-part1.rs:11:28 + --> $DIR/issue-2281-part1.rs:1:28 | LL | fn main() { println!("{}", foobar); } //~ ERROR cannot find value `foobar` in this scope | ^^^^^^ not found in this scope diff --git a/src/test/ui/issues/issue-22874.rs b/src/test/ui/issues/issue-22874.rs index e0a87b3a1746e..37c6c8143524a 100644 --- a/src/test/ui/issues/issue-22874.rs +++ b/src/test/ui/issues/issue-22874.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Table { rows: [[String]], //~^ ERROR the size for values of type diff --git a/src/test/ui/issues/issue-22874.stderr b/src/test/ui/issues/issue-22874.stderr index a69ee7c9ff01b..26addd173912f 100644 --- a/src/test/ui/issues/issue-22874.stderr +++ b/src/test/ui/issues/issue-22874.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `[std::string::String]` cannot be known at compilation time - --> $DIR/issue-22874.rs:12:5 + --> $DIR/issue-22874.rs:2:5 | LL | rows: [[String]], | ^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time diff --git a/src/test/ui/issues/issue-22886.rs b/src/test/ui/issues/issue-22886.rs index 4aa2571cad0cc..f8b576e094d8c 100644 --- a/src/test/ui/issues/issue-22886.rs +++ b/src/test/ui/issues/issue-22886.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #22886. fn crash_please() { diff --git a/src/test/ui/issues/issue-22886.stderr b/src/test/ui/issues/issue-22886.stderr index 0e05cbfa7eed7..ff206e8113e1e 100644 --- a/src/test/ui/issues/issue-22886.stderr +++ b/src/test/ui/issues/issue-22886.stderr @@ -1,5 +1,5 @@ error[E0207]: the lifetime parameter `'a` is not constrained by the impl trait, self type, or predicates - --> $DIR/issue-22886.rs:23:6 + --> $DIR/issue-22886.rs:13:6 | LL | impl<'a> Iterator for Newtype { //~ ERROR E0207 | ^^ unconstrained lifetime parameter diff --git a/src/test/ui/issues/issue-22933-1.rs b/src/test/ui/issues/issue-22933-1.rs index afb972faaca0e..5b617e56ccb39 100644 --- a/src/test/ui/issues/issue-22933-1.rs +++ b/src/test/ui/issues/issue-22933-1.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![allow(warnings)] diff --git a/src/test/ui/issues/issue-22933-1.stderr b/src/test/ui/issues/issue-22933-1.stderr index eaebebe3b111a..5ad8b025c13cb 100644 --- a/src/test/ui/issues/issue-22933-1.stderr +++ b/src/test/ui/issues/issue-22933-1.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-22933-1.rs:35:1 + --> $DIR/issue-22933-1.rs:25:1 | LL | fn main() {} //~ ERROR compilation successful | ^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-22933-2.rs b/src/test/ui/issues/issue-22933-2.rs index e887c7760d693..68d9ef2cfa809 100644 --- a/src/test/ui/issues/issue-22933-2.rs +++ b/src/test/ui/issues/issue-22933-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Delicious { Pie = 0x1, Apple = 0x2, diff --git a/src/test/ui/issues/issue-22933-2.stderr b/src/test/ui/issues/issue-22933-2.stderr index 435a89b716f96..58145a38026e4 100644 --- a/src/test/ui/issues/issue-22933-2.stderr +++ b/src/test/ui/issues/issue-22933-2.stderr @@ -1,5 +1,5 @@ error[E0599]: no variant named `PIE` found for type `Delicious` in the current scope - --> $DIR/issue-22933-2.rs:14:44 + --> $DIR/issue-22933-2.rs:4:44 | LL | enum Delicious { | -------------- variant `PIE` not found here diff --git a/src/test/ui/issues/issue-22933-3.rs b/src/test/ui/issues/issue-22933-3.rs index 62adae41adfc8..8518ed34aee9f 100644 --- a/src/test/ui/issues/issue-22933-3.rs +++ b/src/test/ui/issues/issue-22933-3.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const FOO: [u32; u8::MIN as usize] = []; //~^ ERROR no associated item named `MIN` found for type `u8` diff --git a/src/test/ui/issues/issue-22933-3.stderr b/src/test/ui/issues/issue-22933-3.stderr index 3d4d2df4d322a..2ca1bd7401a20 100644 --- a/src/test/ui/issues/issue-22933-3.stderr +++ b/src/test/ui/issues/issue-22933-3.stderr @@ -1,5 +1,5 @@ error[E0599]: no associated item named `MIN` found for type `u8` in the current scope - --> $DIR/issue-22933-3.rs:11:18 + --> $DIR/issue-22933-3.rs:1:18 | LL | const FOO: [u32; u8::MIN as usize] = []; | ^^^^^^^ associated item not found in `u8` diff --git a/src/test/ui/issues/issue-23024.rs b/src/test/ui/issues/issue-23024.rs index 5d9b49f486c69..ecaed31c8ad7c 100644 --- a/src/test/ui/issues/issue-23024.rs +++ b/src/test/ui/issues/issue-23024.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_syntax)] use std::any::Any; diff --git a/src/test/ui/issues/issue-23024.stderr b/src/test/ui/issues/issue-23024.stderr index 39c79d8f14e8a..212c141d6d2dc 100644 --- a/src/test/ui/issues/issue-23024.stderr +++ b/src/test/ui/issues/issue-23024.stderr @@ -1,5 +1,5 @@ error[E0658]: the precise format of `Fn`-family traits' type parameters is subject to change. Use parenthetical notation (Fn(Foo, Bar) -> Baz) instead (see issue #29625) - --> $DIR/issue-23024.rs:19:35 + --> $DIR/issue-23024.rs:9:35 | LL | println!("{:?}",(vfnfer[0] as Fn)(3)); | ^^ @@ -7,13 +7,13 @@ LL | println!("{:?}",(vfnfer[0] as Fn)(3)); = help: add #![feature(unboxed_closures)] to the crate attributes to enable error[E0243]: wrong number of type arguments: expected 1, found 0 - --> $DIR/issue-23024.rs:19:35 + --> $DIR/issue-23024.rs:9:35 | LL | println!("{:?}",(vfnfer[0] as Fn)(3)); | ^^ expected 1 type argument error[E0191]: the value of the associated type `Output` (from the trait `std::ops::FnOnce`) must be specified - --> $DIR/issue-23024.rs:19:35 + --> $DIR/issue-23024.rs:9:35 | LL | println!("{:?}",(vfnfer[0] as Fn)(3)); | ^^ missing associated type `Output` value diff --git a/src/test/ui/issues/issue-23041.rs b/src/test/ui/issues/issue-23041.rs index 1a9bb4c29f3e0..a18e85806d918 100644 --- a/src/test/ui/issues/issue-23041.rs +++ b/src/test/ui/issues/issue-23041.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::any::Any; fn main() { diff --git a/src/test/ui/issues/issue-23041.stderr b/src/test/ui/issues/issue-23041.stderr index e97a97fec09f2..aa6ffdd2570f4 100644 --- a/src/test/ui/issues/issue-23041.stderr +++ b/src/test/ui/issues/issue-23041.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/issue-23041.rs:16:22 + --> $DIR/issue-23041.rs:6:22 | LL | b.downcast_ref::_>(); //~ ERROR E0282 | ^^^^^^^^ cannot infer type diff --git a/src/test/ui/issues/issue-23046.rs b/src/test/ui/issues/issue-23046.rs index 670706b7a9adf..898654b7b5967 100644 --- a/src/test/ui/issues/issue-23046.rs +++ b/src/test/ui/issues/issue-23046.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub enum Expr<'var, VAR> { Let(Box>, Box Fn(Expr<'v, VAR>) -> Expr<'v, VAR> + 'var>) diff --git a/src/test/ui/issues/issue-23046.stderr b/src/test/ui/issues/issue-23046.stderr index 3e5b4ec91d782..9b7599e1e35de 100644 --- a/src/test/ui/issues/issue-23046.stderr +++ b/src/test/ui/issues/issue-23046.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/issue-23046.rs:27:15 + --> $DIR/issue-23046.rs:17:15 | LL | let ex = |x| { //~ ERROR type annotations needed | ^ consider giving this closure parameter a type diff --git a/src/test/ui/issues/issue-23073.rs b/src/test/ui/issues/issue-23073.rs index 2d219177a80d4..a0ca91336c365 100644 --- a/src/test/ui/issues/issue-23073.rs +++ b/src/test/ui/issues/issue-23073.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(associated_type_defaults)] trait Foo { type T; } diff --git a/src/test/ui/issues/issue-23073.stderr b/src/test/ui/issues/issue-23073.stderr index 44b2128af0aa1..fdce4c6284a6e 100644 --- a/src/test/ui/issues/issue-23073.stderr +++ b/src/test/ui/issues/issue-23073.stderr @@ -1,5 +1,5 @@ error[E0223]: ambiguous associated type - --> $DIR/issue-23073.rs:16:17 + --> $DIR/issue-23073.rs:6:17 | LL | type FooT = <::Foo>::T; //~ ERROR ambiguous associated type | ^^^^^^^^^^^^^^^^^^^^^^^ ambiguous associated type diff --git a/src/test/ui/issues/issue-23080-2.rs b/src/test/ui/issues/issue-23080-2.rs index fc365a4b9aaee..de618288b6573 100644 --- a/src/test/ui/issues/issue-23080-2.rs +++ b/src/test/ui/issues/issue-23080-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength //~^^^^^^^^^^^^ ERROR diff --git a/src/test/ui/issues/issue-23080-2.stderr b/src/test/ui/issues/issue-23080-2.stderr index dda7fbd69cf41..db9a6488851a8 100644 --- a/src/test/ui/issues/issue-23080-2.stderr +++ b/src/test/ui/issues/issue-23080-2.stderr @@ -1,5 +1,5 @@ error[E0380]: auto traits cannot have methods or associated items - --> $DIR/issue-23080-2.rs:17:1 + --> $DIR/issue-23080-2.rs:7:1 | LL | / unsafe auto trait Trait { LL | | //~^ ERROR E0380 diff --git a/src/test/ui/issues/issue-23080.rs b/src/test/ui/issues/issue-23080.rs index 153b6fd07e6d1..e25a2d916f5f2 100644 --- a/src/test/ui/issues/issue-23080.rs +++ b/src/test/ui/issues/issue-23080.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength #![feature(optin_builtin_traits)] diff --git a/src/test/ui/issues/issue-23080.stderr b/src/test/ui/issues/issue-23080.stderr index 43e6f29603385..cace9a57507ff 100644 --- a/src/test/ui/issues/issue-23080.stderr +++ b/src/test/ui/issues/issue-23080.stderr @@ -1,5 +1,5 @@ error[E0380]: auto traits cannot have methods or associated items - --> $DIR/issue-23080.rs:15:1 + --> $DIR/issue-23080.rs:5:1 | LL | / unsafe auto trait Trait { LL | | //~^ ERROR E0380 diff --git a/src/test/ui/issues/issue-23122-1.rs b/src/test/ui/issues/issue-23122-1.rs index 36d8450848d05..a882aa36af758 100644 --- a/src/test/ui/issues/issue-23122-1.rs +++ b/src/test/ui/issues/issue-23122-1.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Next { type Next: Next; } diff --git a/src/test/ui/issues/issue-23122-1.stderr b/src/test/ui/issues/issue-23122-1.stderr index a0e5386c111c1..39dd424a86ca0 100644 --- a/src/test/ui/issues/issue-23122-1.stderr +++ b/src/test/ui/issues/issue-23122-1.stderr @@ -1,5 +1,5 @@ error[E0275]: overflow evaluating the requirement ` as Next>::Next` - --> $DIR/issue-23122-1.rs:17:15 + --> $DIR/issue-23122-1.rs:7:15 | LL | impl Next for GetNext { | ^^^^ diff --git a/src/test/ui/issues/issue-23122-2.rs b/src/test/ui/issues/issue-23122-2.rs index faaf78f894b05..b841120034301 100644 --- a/src/test/ui/issues/issue-23122-2.rs +++ b/src/test/ui/issues/issue-23122-2.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Next { type Next: Next; } diff --git a/src/test/ui/issues/issue-23122-2.stderr b/src/test/ui/issues/issue-23122-2.stderr index c43f8d7782397..443a1f4e92331 100644 --- a/src/test/ui/issues/issue-23122-2.stderr +++ b/src/test/ui/issues/issue-23122-2.stderr @@ -1,5 +1,5 @@ error[E0275]: overflow evaluating the requirement `<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next` - --> $DIR/issue-23122-2.rs:17:15 + --> $DIR/issue-23122-2.rs:7:15 | LL | impl Next for GetNext { | ^^^^ diff --git a/src/test/ui/issues/issue-23173.rs b/src/test/ui/issues/issue-23173.rs index 17e5317b9fe49..2922ebddf4c8a 100644 --- a/src/test/ui/issues/issue-23173.rs +++ b/src/test/ui/issues/issue-23173.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Token { LeftParen, RightParen, Plus, Minus, /* etc */ } struct Struct { a: usize, diff --git a/src/test/ui/issues/issue-23173.stderr b/src/test/ui/issues/issue-23173.stderr index d58a4d2b8f8a9..de4c8422b9ccb 100644 --- a/src/test/ui/issues/issue-23173.stderr +++ b/src/test/ui/issues/issue-23173.stderr @@ -1,5 +1,5 @@ error[E0599]: no variant named `Homura` found for type `Token` in the current scope - --> $DIR/issue-23173.rs:19:16 + --> $DIR/issue-23173.rs:9:16 | LL | enum Token { LeftParen, RightParen, Plus, Minus, /* etc */ } | ---------- variant `Homura` not found here @@ -8,7 +8,7 @@ LL | use_token(&Token::Homura); | ^^^^^^^^^^^^^ variant not found in `Token` error[E0599]: no function or associated item named `method` found for type `Struct` in the current scope - --> $DIR/issue-23173.rs:21:5 + --> $DIR/issue-23173.rs:11:5 | LL | struct Struct { | ------------- function or associated item `method` not found for this @@ -17,7 +17,7 @@ LL | Struct::method(); | ^^^^^^^^^^^^^^ function or associated item not found in `Struct` error[E0599]: no function or associated item named `method` found for type `Struct` in the current scope - --> $DIR/issue-23173.rs:23:5 + --> $DIR/issue-23173.rs:13:5 | LL | struct Struct { | ------------- function or associated item `method` not found for this @@ -26,7 +26,7 @@ LL | Struct::method; | ^^^^^^^^^^^^^^ function or associated item not found in `Struct` error[E0599]: no associated item named `Assoc` found for type `Struct` in the current scope - --> $DIR/issue-23173.rs:25:5 + --> $DIR/issue-23173.rs:15:5 | LL | struct Struct { | ------------- associated item `Assoc` not found for this diff --git a/src/test/ui/issues/issue-23217.rs b/src/test/ui/issues/issue-23217.rs index dc51adf42aad2..11426df6177ca 100644 --- a/src/test/ui/issues/issue-23217.rs +++ b/src/test/ui/issues/issue-23217.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub enum SomeEnum { B = SomeEnum::A, //~^ ERROR no variant named `A` found for type `SomeEnum` diff --git a/src/test/ui/issues/issue-23217.stderr b/src/test/ui/issues/issue-23217.stderr index d87f239bca690..a058caf81bbe8 100644 --- a/src/test/ui/issues/issue-23217.stderr +++ b/src/test/ui/issues/issue-23217.stderr @@ -1,5 +1,5 @@ error[E0599]: no variant named `A` found for type `SomeEnum` in the current scope - --> $DIR/issue-23217.rs:12:9 + --> $DIR/issue-23217.rs:2:9 | LL | pub enum SomeEnum { | ----------------- variant `A` not found here diff --git a/src/test/ui/issues/issue-23253.rs b/src/test/ui/issues/issue-23253.rs index 626604a87a72c..22b55c2858145 100644 --- a/src/test/ui/issues/issue-23253.rs +++ b/src/test/ui/issues/issue-23253.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Foo { Bar } fn main() { diff --git a/src/test/ui/issues/issue-23253.stderr b/src/test/ui/issues/issue-23253.stderr index f14ee510bd876..be5714cd91a2b 100644 --- a/src/test/ui/issues/issue-23253.stderr +++ b/src/test/ui/issues/issue-23253.stderr @@ -1,5 +1,5 @@ error[E0609]: no field `a` on type `Foo` - --> $DIR/issue-23253.rs:14:14 + --> $DIR/issue-23253.rs:4:14 | LL | Foo::Bar.a; | ^ diff --git a/src/test/ui/issues/issue-23281.rs b/src/test/ui/issues/issue-23281.rs index 5de00eb8f6823..98a0495451d04 100644 --- a/src/test/ui/issues/issue-23281.rs +++ b/src/test/ui/issues/issue-23281.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-tidy-linelength pub struct Struct; diff --git a/src/test/ui/issues/issue-23281.stderr b/src/test/ui/issues/issue-23281.stderr index 78db19d6b06ff..adc92ff7d0890 100644 --- a/src/test/ui/issues/issue-23281.stderr +++ b/src/test/ui/issues/issue-23281.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `(dyn std::ops::Fn() + 'static)` cannot be known at compilation time - --> $DIR/issue-23281.rs:16:5 + --> $DIR/issue-23281.rs:6:5 | LL | pub fn function(funs: Vec ()>) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time diff --git a/src/test/ui/issues/issue-2330.rs b/src/test/ui/issues/issue-2330.rs index f1a282695ac11..f8816738224a8 100644 --- a/src/test/ui/issues/issue-2330.rs +++ b/src/test/ui/issues/issue-2330.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum chan { } trait channel { diff --git a/src/test/ui/issues/issue-2330.stderr b/src/test/ui/issues/issue-2330.stderr index 6b1d5e3b21948..679838e24d4e2 100644 --- a/src/test/ui/issues/issue-2330.stderr +++ b/src/test/ui/issues/issue-2330.stderr @@ -1,5 +1,5 @@ error[E0404]: expected trait, found enum `chan` - --> $DIR/issue-2330.rs:18:6 + --> $DIR/issue-2330.rs:8:6 | LL | impl chan for isize { //~ ERROR expected trait, found enum `chan` | ^^^^ not a trait diff --git a/src/test/ui/issues/issue-23302-1.rs b/src/test/ui/issues/issue-23302-1.rs index 10a538301162c..24e79dc581197 100644 --- a/src/test/ui/issues/issue-23302-1.rs +++ b/src/test/ui/issues/issue-23302-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that an enum with recursion in the discriminant throws // the appropriate error (rather than, say, blowing the stack). enum X { diff --git a/src/test/ui/issues/issue-23302-1.stderr b/src/test/ui/issues/issue-23302-1.stderr index dcf021de57e56..ed422e10c985e 100644 --- a/src/test/ui/issues/issue-23302-1.stderr +++ b/src/test/ui/issues/issue-23302-1.stderr @@ -1,12 +1,12 @@ error[E0391]: cycle detected when processing `X::A::{{constant}}` - --> $DIR/issue-23302-1.rs:14:9 + --> $DIR/issue-23302-1.rs:4:9 | LL | A = X::A as isize, //~ ERROR E0391 | ^^^^^^^^^^^^^ | = note: ...which again requires processing `X::A::{{constant}}`, completing the cycle note: cycle used when const-evaluating `X::A::{{constant}}` - --> $DIR/issue-23302-1.rs:14:9 + --> $DIR/issue-23302-1.rs:4:9 | LL | A = X::A as isize, //~ ERROR E0391 | ^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-23302-2.rs b/src/test/ui/issues/issue-23302-2.rs index d1af19eb579f5..e89c7eab50369 100644 --- a/src/test/ui/issues/issue-23302-2.rs +++ b/src/test/ui/issues/issue-23302-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Since `Y::B` here defaults to `Y::A+1`, this is also a // recursive definition. enum Y { diff --git a/src/test/ui/issues/issue-23302-2.stderr b/src/test/ui/issues/issue-23302-2.stderr index 146f86127c5e4..b6d44ceec9d75 100644 --- a/src/test/ui/issues/issue-23302-2.stderr +++ b/src/test/ui/issues/issue-23302-2.stderr @@ -1,12 +1,12 @@ error[E0391]: cycle detected when processing `Y::A::{{constant}}` - --> $DIR/issue-23302-2.rs:14:9 + --> $DIR/issue-23302-2.rs:4:9 | LL | A = Y::B as isize, //~ ERROR E0391 | ^^^^^^^^^^^^^ | = note: ...which again requires processing `Y::A::{{constant}}`, completing the cycle note: cycle used when const-evaluating `Y::A::{{constant}}` - --> $DIR/issue-23302-2.rs:14:9 + --> $DIR/issue-23302-2.rs:4:9 | LL | A = Y::B as isize, //~ ERROR E0391 | ^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-23302-3.rs b/src/test/ui/issues/issue-23302-3.rs index c3664e0abe114..da75f33079886 100644 --- a/src/test/ui/issues/issue-23302-3.rs +++ b/src/test/ui/issues/issue-23302-3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const A: i32 = B; //~ ERROR cycle detected const B: i32 = A; diff --git a/src/test/ui/issues/issue-23302-3.stderr b/src/test/ui/issues/issue-23302-3.stderr index 54edf42679aef..392769b4c565f 100644 --- a/src/test/ui/issues/issue-23302-3.stderr +++ b/src/test/ui/issues/issue-23302-3.stderr @@ -1,21 +1,21 @@ error[E0391]: cycle detected when const checking if rvalue is promotable to static `A` - --> $DIR/issue-23302-3.rs:11:1 + --> $DIR/issue-23302-3.rs:1:1 | LL | const A: i32 = B; //~ ERROR cycle detected | ^^^^^^^^^^^^^^^^^ | note: ...which requires checking which parts of `A` are promotable to static... - --> $DIR/issue-23302-3.rs:11:16 + --> $DIR/issue-23302-3.rs:1:16 | LL | const A: i32 = B; //~ ERROR cycle detected | ^ note: ...which requires const checking if rvalue is promotable to static `B`... - --> $DIR/issue-23302-3.rs:13:1 + --> $DIR/issue-23302-3.rs:3:1 | LL | const B: i32 = A; | ^^^^^^^^^^^^^^^^^ note: ...which requires checking which parts of `B` are promotable to static... - --> $DIR/issue-23302-3.rs:13:16 + --> $DIR/issue-23302-3.rs:3:16 | LL | const B: i32 = A; | ^ diff --git a/src/test/ui/issues/issue-23543.rs b/src/test/ui/issues/issue-23543.rs index 4ed44154c4748..843e1a8a83aef 100644 --- a/src/test/ui/issues/issue-23543.rs +++ b/src/test/ui/issues/issue-23543.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait A: Copy {} struct Foo; diff --git a/src/test/ui/issues/issue-23543.stderr b/src/test/ui/issues/issue-23543.stderr index ea443f1cbbbae..ebb70afe31681 100644 --- a/src/test/ui/issues/issue-23543.stderr +++ b/src/test/ui/issues/issue-23543.stderr @@ -1,5 +1,5 @@ error[E0229]: associated type bindings are not allowed here - --> $DIR/issue-23543.rs:17:17 + --> $DIR/issue-23543.rs:7:17 | LL | where T: A; | ^^^^^^^^^^^ associated type not allowed here diff --git a/src/test/ui/issues/issue-23544.rs b/src/test/ui/issues/issue-23544.rs index 1d7c2187045ea..6ad00b2fba4bd 100644 --- a/src/test/ui/issues/issue-23544.rs +++ b/src/test/ui/issues/issue-23544.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait A: Copy {} pub trait D { diff --git a/src/test/ui/issues/issue-23544.stderr b/src/test/ui/issues/issue-23544.stderr index 147e2a212edd1..c912baccb4924 100644 --- a/src/test/ui/issues/issue-23544.stderr +++ b/src/test/ui/issues/issue-23544.stderr @@ -1,5 +1,5 @@ error[E0229]: associated type bindings are not allowed here - --> $DIR/issue-23544.rs:15:17 + --> $DIR/issue-23544.rs:5:17 | LL | where T: A; | ^^^^^^^^^^^^^^^^^^^^^^^ associated type not allowed here diff --git a/src/test/ui/issues/issue-23589.rs b/src/test/ui/issues/issue-23589.rs index 1c1d42da029be..a59710a1a3cde 100644 --- a/src/test/ui/issues/issue-23589.rs +++ b/src/test/ui/issues/issue-23589.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let v: Vec(&str) = vec!['1', '2']; //~^ ERROR parenthesized parameters may only be used with a trait diff --git a/src/test/ui/issues/issue-23589.stderr b/src/test/ui/issues/issue-23589.stderr index f0c07b380b457..e6e07c167f349 100644 --- a/src/test/ui/issues/issue-23589.stderr +++ b/src/test/ui/issues/issue-23589.stderr @@ -1,5 +1,5 @@ error[E0214]: parenthesized parameters may only be used with a trait - --> $DIR/issue-23589.rs:12:15 + --> $DIR/issue-23589.rs:2:15 | LL | let v: Vec(&str) = vec!['1', '2']; | ^^^^^^ only traits may use parentheses diff --git a/src/test/ui/issues/issue-23595-2.rs b/src/test/ui/issues/issue-23595-2.rs index 6a3ce03fce5e0..2bfee7a35faab 100644 --- a/src/test/ui/issues/issue-23595-2.rs +++ b/src/test/ui/issues/issue-23595-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(associated_type_defaults)] pub struct C {a:AType} diff --git a/src/test/ui/issues/issue-23595-2.stderr b/src/test/ui/issues/issue-23595-2.stderr index 5ddaab6abfe6c..f1004db0b0904 100644 --- a/src/test/ui/issues/issue-23595-2.stderr +++ b/src/test/ui/issues/issue-23595-2.stderr @@ -1,5 +1,5 @@ error[E0220]: associated type `anything_here_kills_it` not found for `Self` - --> $DIR/issue-23595-2.rs:16:16 + --> $DIR/issue-23595-2.rs:6:16 | LL | type B = C; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ associated type `anything_here_kills_it` not found diff --git a/src/test/ui/issues/issue-23716.rs b/src/test/ui/issues/issue-23716.rs index 7b72e5689ba4d..e9139c0aa143f 100644 --- a/src/test/ui/issues/issue-23716.rs +++ b/src/test/ui/issues/issue-23716.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - static foo: i32 = 0; fn bar(foo: i32) {} diff --git a/src/test/ui/issues/issue-23716.stderr b/src/test/ui/issues/issue-23716.stderr index fd268c1b5a190..d42d5bbde585e 100644 --- a/src/test/ui/issues/issue-23716.stderr +++ b/src/test/ui/issues/issue-23716.stderr @@ -1,5 +1,5 @@ error[E0530]: function parameters cannot shadow statics - --> $DIR/issue-23716.rs:13:8 + --> $DIR/issue-23716.rs:3:8 | LL | static foo: i32 = 0; | -------------------- a static `foo` is defined here @@ -8,7 +8,7 @@ LL | fn bar(foo: i32) {} | ^^^ cannot be named the same as a static error[E0530]: function parameters cannot shadow statics - --> $DIR/issue-23716.rs:23:13 + --> $DIR/issue-23716.rs:13:13 | LL | use self::submod::answer; | -------------------- a static `answer` is imported here diff --git a/src/test/ui/issues/issue-23966.rs b/src/test/ui/issues/issue-23966.rs index 544d3c8af2054..5fdec28ac2cd2 100644 --- a/src/test/ui/issues/issue-23966.rs +++ b/src/test/ui/issues/issue-23966.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { "".chars().fold(|_, _| (), ()); //~^ ERROR E0277 diff --git a/src/test/ui/issues/issue-23966.stderr b/src/test/ui/issues/issue-23966.stderr index 0418933180c00..ac64067db1099 100644 --- a/src/test/ui/issues/issue-23966.stderr +++ b/src/test/ui/issues/issue-23966.stderr @@ -1,5 +1,5 @@ error[E0277]: expected a `std::ops::FnMut<(_, char)>` closure, found `()` - --> $DIR/issue-23966.rs:12:16 + --> $DIR/issue-23966.rs:2:16 | LL | "".chars().fold(|_, _| (), ()); | ^^^^ expected an `FnMut<(_, char)>` closure, found `()` diff --git a/src/test/ui/issues/issue-24013.rs b/src/test/ui/issues/issue-24013.rs index a7232781f6fbc..c6d3016712720 100644 --- a/src/test/ui/issues/issue-24013.rs +++ b/src/test/ui/issues/issue-24013.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { use std::mem::{transmute, swap}; let a = 1; diff --git a/src/test/ui/issues/issue-24013.stderr b/src/test/ui/issues/issue-24013.stderr index 5729bdf2064f5..4e3cb88297d3b 100644 --- a/src/test/ui/issues/issue-24013.stderr +++ b/src/test/ui/issues/issue-24013.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/issue-24013.rs:15:20 + --> $DIR/issue-24013.rs:5:20 | LL | unsafe {swap::<&mut _>(transmute(&a), transmute(&b))}; | ^^^^^^ cannot infer type diff --git a/src/test/ui/issues/issue-24036.rs b/src/test/ui/issues/issue-24036.rs index 94ac17de4c0d0..3642085934abe 100644 --- a/src/test/ui/issues/issue-24036.rs +++ b/src/test/ui/issues/issue-24036.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn closure_to_loc() { let mut x = |c| c + 1; x = |c| c + 1; diff --git a/src/test/ui/issues/issue-24036.stderr b/src/test/ui/issues/issue-24036.stderr index 24995be773e7a..9f799c9b45069 100644 --- a/src/test/ui/issues/issue-24036.stderr +++ b/src/test/ui/issues/issue-24036.stderr @@ -1,16 +1,16 @@ error[E0308]: mismatched types - --> $DIR/issue-24036.rs:13:9 + --> $DIR/issue-24036.rs:3:9 | LL | x = |c| c + 1; | ^^^^^^^^^ expected closure, found a different closure | - = note: expected type `[closure@$DIR/issue-24036.rs:12:17: 12:26]` - found type `[closure@$DIR/issue-24036.rs:13:9: 13:18]` + = note: expected type `[closure@$DIR/issue-24036.rs:2:17: 2:26]` + found type `[closure@$DIR/issue-24036.rs:3:9: 3:18]` = note: no two closures, even if identical, have the same type = help: consider boxing your closure and/or using it as a trait object error[E0308]: match arms have incompatible types - --> $DIR/issue-24036.rs:18:13 + --> $DIR/issue-24036.rs:8:13 | LL | let x = match 1usize { | _____________^ @@ -22,8 +22,8 @@ LL | | _ => |c| c - 1 LL | | }; | |_____^ expected closure, found a different closure | - = note: expected type `[closure@$DIR/issue-24036.rs:20:14: 20:23]` - found type `[closure@$DIR/issue-24036.rs:21:14: 21:23]` + = note: expected type `[closure@$DIR/issue-24036.rs:10:14: 10:23]` + found type `[closure@$DIR/issue-24036.rs:11:14: 11:23]` = note: no two closures, even if identical, have the same type = help: consider boxing your closure and/or using it as a trait object diff --git a/src/test/ui/issues/issue-24081.rs b/src/test/ui/issues/issue-24081.rs index 16530c509f28c..10983ce11b501 100644 --- a/src/test/ui/issues/issue-24081.rs +++ b/src/test/ui/issues/issue-24081.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::Add; use std::ops::Sub; use std::ops::Mul; diff --git a/src/test/ui/issues/issue-24081.stderr b/src/test/ui/issues/issue-24081.stderr index 17cd3ec0aa6d3..d7576a48e5583 100644 --- a/src/test/ui/issues/issue-24081.stderr +++ b/src/test/ui/issues/issue-24081.stderr @@ -1,5 +1,5 @@ error[E0255]: the name `Add` is defined multiple times - --> $DIR/issue-24081.rs:17:1 + --> $DIR/issue-24081.rs:7:1 | LL | use std::ops::Add; | ------------- previous import of the trait `Add` here @@ -14,7 +14,7 @@ LL | use std::ops::Add as OtherAdd; | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0255]: the name `Sub` is defined multiple times - --> $DIR/issue-24081.rs:19:1 + --> $DIR/issue-24081.rs:9:1 | LL | use std::ops::Sub; | ------------- previous import of the trait `Sub` here @@ -29,7 +29,7 @@ LL | use std::ops::Sub as OtherSub; | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0255]: the name `Mul` is defined multiple times - --> $DIR/issue-24081.rs:21:1 + --> $DIR/issue-24081.rs:11:1 | LL | use std::ops::Mul; | ------------- previous import of the trait `Mul` here @@ -44,7 +44,7 @@ LL | use std::ops::Mul as OtherMul; | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0255]: the name `Div` is defined multiple times - --> $DIR/issue-24081.rs:23:1 + --> $DIR/issue-24081.rs:13:1 | LL | use std::ops::Div; | ------------- previous import of the trait `Div` here @@ -59,7 +59,7 @@ LL | use std::ops::Div as OtherDiv; | ^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0255]: the name `Rem` is defined multiple times - --> $DIR/issue-24081.rs:25:1 + --> $DIR/issue-24081.rs:15:1 | LL | use std::ops::Rem; | ------------- previous import of the trait `Rem` here diff --git a/src/test/ui/issues/issue-24204.rs b/src/test/ui/issues/issue-24204.rs index 2a012da0083bc..61671b32e9b15 100644 --- a/src/test/ui/issues/issue-24204.rs +++ b/src/test/ui/issues/issue-24204.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] trait MultiDispatch { diff --git a/src/test/ui/issues/issue-24204.stderr b/src/test/ui/issues/issue-24204.stderr index 809db28403208..8e04c0ddccea6 100644 --- a/src/test/ui/issues/issue-24204.stderr +++ b/src/test/ui/issues/issue-24204.stderr @@ -1,5 +1,5 @@ error[E0271]: type mismatch resolving `<::A as MultiDispatch>::O == T` - --> $DIR/issue-24204.rs:24:1 + --> $DIR/issue-24204.rs:14:1 | LL | fn test>(b: i32) -> T where T::A: MultiDispatch { T::new(b) } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected associated type, found type parameter @@ -7,7 +7,7 @@ LL | fn test>(b: i32) -> T where T::A: MultiDispatch { T::n = note: expected type `<::A as MultiDispatch>::O` found type `T` note: required by `Trait` - --> $DIR/issue-24204.rs:17:1 + --> $DIR/issue-24204.rs:7:1 | LL | trait Trait: Sized { | ^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-24267-flow-exit.nll.stderr b/src/test/ui/issues/issue-24267-flow-exit.nll.stderr index cf3553c6b0dd6..52e637a3f0b0b 100644 --- a/src/test/ui/issues/issue-24267-flow-exit.nll.stderr +++ b/src/test/ui/issues/issue-24267-flow-exit.nll.stderr @@ -1,11 +1,11 @@ error[E0381]: borrow of possibly uninitialized variable: `x` - --> $DIR/issue-24267-flow-exit.rs:22:20 + --> $DIR/issue-24267-flow-exit.rs:12:20 | LL | println!("{}", x); //~ ERROR use of possibly uninitialized variable: `x` | ^ use of possibly uninitialized `x` error[E0381]: borrow of possibly uninitialized variable: `x` - --> $DIR/issue-24267-flow-exit.rs:28:20 + --> $DIR/issue-24267-flow-exit.rs:18:20 | LL | println!("{}", x); //~ ERROR use of possibly uninitialized variable: `x` | ^ use of possibly uninitialized `x` diff --git a/src/test/ui/issues/issue-24267-flow-exit.rs b/src/test/ui/issues/issue-24267-flow-exit.rs index 4aca6bf38e1c4..ce3a799fb3817 100644 --- a/src/test/ui/issues/issue-24267-flow-exit.rs +++ b/src/test/ui/issues/issue-24267-flow-exit.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Ensure that we reject code when a nonlocal exit (`break`, // `continue`) causes us to pop over a needed assignment. diff --git a/src/test/ui/issues/issue-24267-flow-exit.stderr b/src/test/ui/issues/issue-24267-flow-exit.stderr index 7d1d5ac7df65e..0d226e01809be 100644 --- a/src/test/ui/issues/issue-24267-flow-exit.stderr +++ b/src/test/ui/issues/issue-24267-flow-exit.stderr @@ -1,11 +1,11 @@ error[E0381]: use of possibly uninitialized variable: `x` - --> $DIR/issue-24267-flow-exit.rs:22:20 + --> $DIR/issue-24267-flow-exit.rs:12:20 | LL | println!("{}", x); //~ ERROR use of possibly uninitialized variable: `x` | ^ use of possibly uninitialized `x` error[E0381]: use of possibly uninitialized variable: `x` - --> $DIR/issue-24267-flow-exit.rs:28:20 + --> $DIR/issue-24267-flow-exit.rs:18:20 | LL | println!("{}", x); //~ ERROR use of possibly uninitialized variable: `x` | ^ use of possibly uninitialized `x` diff --git a/src/test/ui/issues/issue-24322.rs b/src/test/ui/issues/issue-24322.rs index bb726aca92110..6567fcab46cde 100644 --- a/src/test/ui/issues/issue-24322.rs +++ b/src/test/ui/issues/issue-24322.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct B; impl B { diff --git a/src/test/ui/issues/issue-24322.stderr b/src/test/ui/issues/issue-24322.stderr index d2cad8d34646e..b42854387518e 100644 --- a/src/test/ui/issues/issue-24322.stderr +++ b/src/test/ui/issues/issue-24322.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-24322.rs:18:29 + --> $DIR/issue-24322.rs:8:29 | LL | let x: &fn(&B) -> u32 = &B::func; //~ ERROR mismatched types | ^^^^^^^^ expected fn pointer, found fn item diff --git a/src/test/ui/issues/issue-24352.rs b/src/test/ui/issues/issue-24352.rs index 4b0773140566c..5c8246d179f9d 100644 --- a/src/test/ui/issues/issue-24352.rs +++ b/src/test/ui/issues/issue-24352.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { 1.0f64 - 1.0; 1.0f64 - 1 //~ ERROR E0277 diff --git a/src/test/ui/issues/issue-24352.stderr b/src/test/ui/issues/issue-24352.stderr index 8a4169055e7d7..835706d015b5c 100644 --- a/src/test/ui/issues/issue-24352.stderr +++ b/src/test/ui/issues/issue-24352.stderr @@ -1,5 +1,5 @@ error[E0277]: cannot subtract `{integer}` from `f64` - --> $DIR/issue-24352.rs:13:12 + --> $DIR/issue-24352.rs:3:12 | LL | 1.0f64 - 1 //~ ERROR E0277 | ^ no implementation for `f64 - {integer}` diff --git a/src/test/ui/issues/issue-24357.nll.stderr b/src/test/ui/issues/issue-24357.nll.stderr index e35f443548d90..06de9537af031 100644 --- a/src/test/ui/issues/issue-24357.nll.stderr +++ b/src/test/ui/issues/issue-24357.nll.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `x` - --> $DIR/issue-24357.rs:16:12 + --> $DIR/issue-24357.rs:6:12 | LL | let f = move || { let y = x; }; | ------- - variable moved due to use in closure diff --git a/src/test/ui/issues/issue-24357.rs b/src/test/ui/issues/issue-24357.rs index 016ce93a0bd0b..84f263ff649c4 100644 --- a/src/test/ui/issues/issue-24357.rs +++ b/src/test/ui/issues/issue-24357.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct NoCopy; fn main() { let x = NoCopy; diff --git a/src/test/ui/issues/issue-24357.stderr b/src/test/ui/issues/issue-24357.stderr index be531ec85676c..3bc84cba0f53f 100644 --- a/src/test/ui/issues/issue-24357.stderr +++ b/src/test/ui/issues/issue-24357.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `x` - --> $DIR/issue-24357.rs:16:8 + --> $DIR/issue-24357.rs:6:8 | LL | let f = move || { let y = x; }; | ------- value moved (into closure) here diff --git a/src/test/ui/issues/issue-24363.rs b/src/test/ui/issues/issue-24363.rs index 619ad74ad00e2..a5b45f13e74ad 100644 --- a/src/test/ui/issues/issue-24363.rs +++ b/src/test/ui/issues/issue-24363.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { 1.create_a_type_error[ //~ `{integer}` is a primitive type and therefore doesn't have fields ()+() //~ ERROR binary operation `+` cannot be applied diff --git a/src/test/ui/issues/issue-24363.stderr b/src/test/ui/issues/issue-24363.stderr index 2695d6acea840..ff02887a15392 100644 --- a/src/test/ui/issues/issue-24363.stderr +++ b/src/test/ui/issues/issue-24363.stderr @@ -1,11 +1,11 @@ error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields - --> $DIR/issue-24363.rs:12:7 + --> $DIR/issue-24363.rs:2:7 | LL | 1.create_a_type_error[ //~ `{integer}` is a primitive type and therefore doesn't have fields | ^^^^^^^^^^^^^^^^^^^ error[E0369]: binary operation `+` cannot be applied to type `()` - --> $DIR/issue-24363.rs:13:9 + --> $DIR/issue-24363.rs:3:9 | LL | ()+() //~ ERROR binary operation `+` cannot be applied | ^^^^^ diff --git a/src/test/ui/issues/issue-24365.rs b/src/test/ui/issues/issue-24365.rs index 72df6fb59990f..eca104b6f1d89 100644 --- a/src/test/ui/issues/issue-24365.rs +++ b/src/test/ui/issues/issue-24365.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub enum Attribute { Code {attr_name_idx: u16}, } diff --git a/src/test/ui/issues/issue-24365.stderr b/src/test/ui/issues/issue-24365.stderr index 0ad4674ca8677..7d02f117f9f55 100644 --- a/src/test/ui/issues/issue-24365.stderr +++ b/src/test/ui/issues/issue-24365.stderr @@ -1,17 +1,17 @@ error[E0609]: no field `b` on type `Foo` - --> $DIR/issue-24365.rs:20:22 + --> $DIR/issue-24365.rs:10:22 | LL | println!("{}", a.b); //~ no field `b` on type `Foo` | ^ error[E0609]: no field `attr_name_idx` on type `&Attribute` - --> $DIR/issue-24365.rs:27:18 + --> $DIR/issue-24365.rs:17:18 | LL | let z = (&x).attr_name_idx; //~ no field `attr_name_idx` on type `&Attribute` | ^^^^^^^^^^^^^ error[E0609]: no field `attr_name_idx` on type `Attribute` - --> $DIR/issue-24365.rs:28:15 + --> $DIR/issue-24365.rs:18:15 | LL | let y = x.attr_name_idx; //~ no field `attr_name_idx` on type `Attribute` | ^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-24424.rs b/src/test/ui/issues/issue-24424.rs index 8e9f675b5752c..8b8c5bc23e48b 100644 --- a/src/test/ui/issues/issue-24424.rs +++ b/src/test/ui/issues/issue-24424.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Trait1<'l0, T0> {} trait Trait0<'l0> {} diff --git a/src/test/ui/issues/issue-24424.stderr b/src/test/ui/issues/issue-24424.stderr index 7bcf67a50480f..4c6ac0180a873 100644 --- a/src/test/ui/issues/issue-24424.stderr +++ b/src/test/ui/issues/issue-24424.stderr @@ -1,11 +1,11 @@ error[E0283]: type annotations required: cannot resolve `T0: Trait0<'l0>` - --> $DIR/issue-24424.rs:14:1 + --> $DIR/issue-24424.rs:4:1 | LL | impl <'l0, 'l1, T0> Trait1<'l0, T0> for bool where T0 : Trait0<'l0>, T0 : Trait0<'l1> {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | note: required by `Trait0` - --> $DIR/issue-24424.rs:12:1 + --> $DIR/issue-24424.rs:2:1 | LL | trait Trait0<'l0> {} | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-24446.rs b/src/test/ui/issues/issue-24446.rs index a9c7978642d5f..a1f8234178e46 100644 --- a/src/test/ui/issues/issue-24446.rs +++ b/src/test/ui/issues/issue-24446.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { static foo: Fn() -> u32 = || -> u32 { //~^ ERROR mismatched types diff --git a/src/test/ui/issues/issue-24446.stderr b/src/test/ui/issues/issue-24446.stderr index 3c42462743700..e3d0232fec541 100644 --- a/src/test/ui/issues/issue-24446.stderr +++ b/src/test/ui/issues/issue-24446.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-24446.rs:12:31 + --> $DIR/issue-24446.rs:2:31 | LL | static foo: Fn() -> u32 = || -> u32 { | _______________________________^ @@ -10,10 +10,10 @@ LL | | }; | |_____^ expected trait std::ops::Fn, found closure | = note: expected type `(dyn std::ops::Fn() -> u32 + 'static)` - found type `[closure@$DIR/issue-24446.rs:12:31: 16:6]` + found type `[closure@$DIR/issue-24446.rs:2:31: 6:6]` error[E0277]: the size for values of type `(dyn std::ops::Fn() -> u32 + 'static)` cannot be known at compilation time - --> $DIR/issue-24446.rs:12:31 + --> $DIR/issue-24446.rs:2:31 | LL | static foo: Fn() -> u32 = || -> u32 { | _______________________________^ diff --git a/src/test/ui/issues/issue-24682.rs b/src/test/ui/issues/issue-24682.rs index 0e872f71df424..0d1ab73417c02 100644 --- a/src/test/ui/issues/issue-24682.rs +++ b/src/test/ui/issues/issue-24682.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait A: Sized { type N; fn x() -> diff --git a/src/test/ui/issues/issue-24682.stderr b/src/test/ui/issues/issue-24682.stderr index 1e16cb72a0964..f6d03f6c18fdc 100644 --- a/src/test/ui/issues/issue-24682.stderr +++ b/src/test/ui/issues/issue-24682.stderr @@ -1,18 +1,18 @@ error[E0229]: associated type bindings are not allowed here - --> $DIR/issue-24682.rs:15:11 + --> $DIR/issue-24682.rs:5:11 | LL | / N= //~ ERROR associated type bindings are not allowed here LL | | Self::N> { | |_________________^ associated type not allowed here error[E0229]: associated type bindings are not allowed here - --> $DIR/issue-24682.rs:21:13 + --> $DIR/issue-24682.rs:11:13 | LL | //~ ERROR associated type bindings are not allowed here | ^^^^ associated type not allowed here error[E0229]: associated type bindings are not allowed here - --> $DIR/issue-24682.rs:25:13 + --> $DIR/issue-24682.rs:15:13 | LL | u32 //~ ERROR associated type bindings are not allowed here | ^^^^ associated type not allowed here diff --git a/src/test/ui/issues/issue-24819.rs b/src/test/ui/issues/issue-24819.rs index 52f5f1cd079eb..1155e8d5d548a 100644 --- a/src/test/ui/issues/issue-24819.rs +++ b/src/test/ui/issues/issue-24819.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::HashSet; fn main() { diff --git a/src/test/ui/issues/issue-24819.stderr b/src/test/ui/issues/issue-24819.stderr index 33034b7072bcc..5f1cd0a255ffa 100644 --- a/src/test/ui/issues/issue-24819.stderr +++ b/src/test/ui/issues/issue-24819.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-24819.rs:15:9 + --> $DIR/issue-24819.rs:5:9 | LL | foo(&mut v); | ^^^^^^ expected struct `std::collections::HashSet`, found struct `std::vec::Vec` diff --git a/src/test/ui/issues/issue-24883.rs b/src/test/ui/issues/issue-24883.rs index 097f2a5630cfa..dba7276167a5a 100644 --- a/src/test/ui/issues/issue-24883.rs +++ b/src/test/ui/issues/issue-24883.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] mod a { diff --git a/src/test/ui/issues/issue-24883.stderr b/src/test/ui/issues/issue-24883.stderr index 4b17747f10908..515918cc5d950 100644 --- a/src/test/ui/issues/issue-24883.stderr +++ b/src/test/ui/issues/issue-24883.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-24883.rs:25:1 + --> $DIR/issue-24883.rs:15:1 | LL | / fn main() { //~ ERROR compilation successful LL | | let _ = a::c::Bar(a::b::Foo); diff --git a/src/test/ui/issues/issue-25076.rs b/src/test/ui/issues/issue-25076.rs index 1c255b4e6314a..6c5a553924561 100644 --- a/src/test/ui/issues/issue-25076.rs +++ b/src/test/ui/issues/issue-25076.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S; trait InOut { type Out; } diff --git a/src/test/ui/issues/issue-25076.stderr b/src/test/ui/issues/issue-25076.stderr index 13ee70fdd9b7a..8793475e6d4ed 100644 --- a/src/test/ui/issues/issue-25076.stderr +++ b/src/test/ui/issues/issue-25076.stderr @@ -1,11 +1,11 @@ error[E0277]: the trait bound `(): InOut<_>` is not satisfied - --> $DIR/issue-25076.rs:20:5 + --> $DIR/issue-25076.rs:10:5 | LL | do_fold(bot(), ()); //~ ERROR `(): InOut<_>` is not satisfied | ^^^^^^^ the trait `InOut<_>` is not implemented for `()` | note: required by `do_fold` - --> $DIR/issue-25076.rs:15:1 + --> $DIR/issue-25076.rs:5:1 | LL | fn do_fold>(init: B, f: F) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-25368.rs b/src/test/ui/issues/issue-25368.rs index e70c00502210f..8b4dbb6e460a5 100644 --- a/src/test/ui/issues/issue-25368.rs +++ b/src/test/ui/issues/issue-25368.rs @@ -1,13 +1,3 @@ -// Copyright 2014-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::sync::mpsc::channel; use std::thread::spawn; use std::marker::PhantomData; diff --git a/src/test/ui/issues/issue-25368.stderr b/src/test/ui/issues/issue-25368.stderr index 56cbef7b89c41..2e6a02e7389a7 100644 --- a/src/test/ui/issues/issue-25368.stderr +++ b/src/test/ui/issues/issue-25368.stderr @@ -1,5 +1,5 @@ error[E0282]: type annotations needed - --> $DIR/issue-25368.rs:21:17 + --> $DIR/issue-25368.rs:11:17 | LL | let (tx, rx) = channel(); | -------- consider giving the pattern a type diff --git a/src/test/ui/issues/issue-25385.rs b/src/test/ui/issues/issue-25385.rs index aa941bc569130..adad6c35a3f67 100644 --- a/src/test/ui/issues/issue-25385.rs +++ b/src/test/ui/issues/issue-25385.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - macro_rules! foo { ($e:expr) => { $e.foo() } //~^ ERROR no method named `foo` found for type `i32` in the current scope diff --git a/src/test/ui/issues/issue-25385.stderr b/src/test/ui/issues/issue-25385.stderr index f12388d4b458b..e170a9d383b0e 100644 --- a/src/test/ui/issues/issue-25385.stderr +++ b/src/test/ui/issues/issue-25385.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `foo` found for type `i32` in the current scope - --> $DIR/issue-25385.rs:13:23 + --> $DIR/issue-25385.rs:2:23 | LL | ($e:expr) => { $e.foo() } | ^^^ @@ -8,7 +8,7 @@ LL | foo!(a); | -------- in this macro invocation error[E0599]: no method named `foo` found for type `i32` in the current scope - --> $DIR/issue-25385.rs:21:15 + --> $DIR/issue-25385.rs:10:15 | LL | foo!(1i32.foo()); | ^^^ diff --git a/src/test/ui/issues/issue-25386.rs b/src/test/ui/issues/issue-25386.rs index b2775db5e75a7..607c9fceab84f 100644 --- a/src/test/ui/issues/issue-25386.rs +++ b/src/test/ui/issues/issue-25386.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod stuff { pub struct Item { c_object: Box, diff --git a/src/test/ui/issues/issue-25386.stderr b/src/test/ui/issues/issue-25386.stderr index 986961d36c9e5..eabb139b97db5 100644 --- a/src/test/ui/issues/issue-25386.stderr +++ b/src/test/ui/issues/issue-25386.stderr @@ -1,5 +1,5 @@ error[E0616]: field `c_object` of struct `stuff::Item` is private - --> $DIR/issue-25386.rs:29:11 + --> $DIR/issue-25386.rs:19:11 | LL | (*$var.c_object).$member.is_some() | ^^^^^^^^^^^^^ @@ -8,7 +8,7 @@ LL | println!("{}", check_ptr_exist!(item, name)); | ---------------------------- in this macro invocation error[E0616]: field `name` of struct `stuff::CObj` is private - --> $DIR/issue-25386.rs:29:9 + --> $DIR/issue-25386.rs:19:9 | LL | (*$var.c_object).$member.is_some() | ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-25396.rs b/src/test/ui/issues/issue-25396.rs index 7cfcbc5471a06..cb8737c9a6d68 100644 --- a/src/test/ui/issues/issue-25396.rs +++ b/src/test/ui/issues/issue-25396.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use foo::baz; use bar::baz; //~ ERROR the name `baz` is defined multiple times diff --git a/src/test/ui/issues/issue-25396.stderr b/src/test/ui/issues/issue-25396.stderr index 1946f39167238..5c9cf1c119ddb 100644 --- a/src/test/ui/issues/issue-25396.stderr +++ b/src/test/ui/issues/issue-25396.stderr @@ -1,5 +1,5 @@ error[E0252]: the name `baz` is defined multiple times - --> $DIR/issue-25396.rs:12:5 + --> $DIR/issue-25396.rs:2:5 | LL | use foo::baz; | -------- previous import of the module `baz` here @@ -13,7 +13,7 @@ LL | use bar::baz as other_baz; //~ ERROR the name `baz` is defined multiple tim | ^^^^^^^^^^^^^^^^^^^^^ error[E0252]: the name `Quux` is defined multiple times - --> $DIR/issue-25396.rs:15:5 + --> $DIR/issue-25396.rs:5:5 | LL | use foo::Quux; | --------- previous import of the trait `Quux` here @@ -27,7 +27,7 @@ LL | use bar::Quux as OtherQuux; //~ ERROR the name `Quux` is defined multiple t | ^^^^^^^^^^^^^^^^^^^^^^ error[E0252]: the name `blah` is defined multiple times - --> $DIR/issue-25396.rs:18:5 + --> $DIR/issue-25396.rs:8:5 | LL | use foo::blah; | --------- previous import of the type `blah` here @@ -41,7 +41,7 @@ LL | use bar::blah as other_blah; //~ ERROR the name `blah` is defined multiple | ^^^^^^^^^^^^^^^^^^^^^^^ error[E0252]: the name `WOMP` is defined multiple times - --> $DIR/issue-25396.rs:21:5 + --> $DIR/issue-25396.rs:11:5 | LL | use foo::WOMP; | --------- previous import of the value `WOMP` here diff --git a/src/test/ui/issues/issue-25439.rs b/src/test/ui/issues/issue-25439.rs index 6e33fd5ae71a6..4f73ff3e38b9e 100644 --- a/src/test/ui/issues/issue-25439.rs +++ b/src/test/ui/issues/issue-25439.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Helper<'a, F: 'a>(&'a F); fn fix(f: F) -> i32 where F: Fn(Helper, i32) -> i32 { diff --git a/src/test/ui/issues/issue-25439.stderr b/src/test/ui/issues/issue-25439.stderr index 467bb1ad28e04..9e9ab4e39d34c 100644 --- a/src/test/ui/issues/issue-25439.stderr +++ b/src/test/ui/issues/issue-25439.stderr @@ -1,5 +1,5 @@ error[E0644]: closure/generator type that references itself - --> $DIR/issue-25439.rs:18:9 + --> $DIR/issue-25439.rs:8:9 | LL | fix(|_, x| x); //~ ERROR closure/generator type that references itself [E0644] | ^^^^^^^^ cyclic type of infinite size diff --git a/src/test/ui/issues/issue-25579.ast.nll.stderr b/src/test/ui/issues/issue-25579.ast.nll.stderr index 9f698e4d5826a..b791f600f50cb 100644 --- a/src/test/ui/issues/issue-25579.ast.nll.stderr +++ b/src/test/ui/issues/issue-25579.ast.nll.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-25579.rs:31:1 + --> $DIR/issue-25579.rs:21:1 | LL | / fn main() { //[mir]~ ERROR compilation successful LL | | } diff --git a/src/test/ui/issues/issue-25579.ast.stderr b/src/test/ui/issues/issue-25579.ast.stderr index 49b483d750314..3de7f565b7b8a 100644 --- a/src/test/ui/issues/issue-25579.ast.stderr +++ b/src/test/ui/issues/issue-25579.ast.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `l.0` as mutable more than once at a time - --> $DIR/issue-25579.rs:24:32 + --> $DIR/issue-25579.rs:14:32 | LL | &mut Sexpression::Cons(ref mut expr) => { //[ast]~ ERROR [E0499] | ^^^^^^^^^^^^ mutable borrow starts here in previous iteration of loop @@ -8,7 +8,7 @@ LL | } | - mutable borrow ends here error[E0506]: cannot assign to `l` because it is borrowed - --> $DIR/issue-25579.rs:25:13 + --> $DIR/issue-25579.rs:15:13 | LL | &mut Sexpression::Cons(ref mut expr) => { //[ast]~ ERROR [E0499] | ------------ borrow of `l` occurs here diff --git a/src/test/ui/issues/issue-25579.mir.stderr b/src/test/ui/issues/issue-25579.mir.stderr index 9f698e4d5826a..b791f600f50cb 100644 --- a/src/test/ui/issues/issue-25579.mir.stderr +++ b/src/test/ui/issues/issue-25579.mir.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-25579.rs:31:1 + --> $DIR/issue-25579.rs:21:1 | LL | / fn main() { //[mir]~ ERROR compilation successful LL | | } diff --git a/src/test/ui/issues/issue-25579.rs b/src/test/ui/issues/issue-25579.rs index 71c1d63cf5af3..1813253332f98 100644 --- a/src/test/ui/issues/issue-25579.rs +++ b/src/test/ui/issues/issue-25579.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/issues/issue-25700.rs b/src/test/ui/issues/issue-25700.rs index 477c3237f84ee..45c452d618d84 100644 --- a/src/test/ui/issues/issue-25700.rs +++ b/src/test/ui/issues/issue-25700.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S(Option<&'static T>); trait Tr { type Out; } diff --git a/src/test/ui/issues/issue-25700.stderr b/src/test/ui/issues/issue-25700.stderr index 786620ab75074..d4cf89d0abd5f 100644 --- a/src/test/ui/issues/issue-25700.stderr +++ b/src/test/ui/issues/issue-25700.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `t` - --> $DIR/issue-25700.rs:23:10 + --> $DIR/issue-25700.rs:13:10 | LL | drop(t); | - value moved here diff --git a/src/test/ui/issues/issue-25793.nll.stderr b/src/test/ui/issues/issue-25793.nll.stderr index bd48d0eeb7c42..61affb7823e8b 100644 --- a/src/test/ui/issues/issue-25793.nll.stderr +++ b/src/test/ui/issues/issue-25793.nll.stderr @@ -1,5 +1,5 @@ error[E0503]: cannot use `self.width` because it was mutably borrowed - --> $DIR/issue-25793.rs:13:9 + --> $DIR/issue-25793.rs:4:9 | LL | $this.width.unwrap() | ^^^^^^^^^^^ use of borrowed `*self` diff --git a/src/test/ui/issues/issue-25793.rs b/src/test/ui/issues/issue-25793.rs index 2939646342aac..6c8dacc224892 100644 --- a/src/test/ui/issues/issue-25793.rs +++ b/src/test/ui/issues/issue-25793.rs @@ -1,12 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. #![feature(rustc_attrs)] macro_rules! width( ($this:expr) => { diff --git a/src/test/ui/issues/issue-25793.stderr b/src/test/ui/issues/issue-25793.stderr index fb83d767c5069..e8d208c19aa37 100644 --- a/src/test/ui/issues/issue-25793.stderr +++ b/src/test/ui/issues/issue-25793.stderr @@ -1,5 +1,5 @@ error[E0503]: cannot use `self.width` because it was mutably borrowed - --> $DIR/issue-25793.rs:13:9 + --> $DIR/issue-25793.rs:4:9 | LL | $this.width.unwrap() | ^^^^^^^^^^^ use of borrowed `*self` diff --git a/src/test/ui/issues/issue-25826.rs b/src/test/ui/issues/issue-25826.rs index 6b9caba0218f3..e6022653d9c3b 100644 --- a/src/test/ui/issues/issue-25826.rs +++ b/src/test/ui/issues/issue-25826.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn id(t: T) -> T { t } fn main() { const A: bool = id:: as *const () < id:: as *const (); diff --git a/src/test/ui/issues/issue-25826.stderr b/src/test/ui/issues/issue-25826.stderr index a5ab7cfa6d3c5..73ebf29d08e78 100644 --- a/src/test/ui/issues/issue-25826.stderr +++ b/src/test/ui/issues/issue-25826.stderr @@ -1,5 +1,5 @@ error[E0658]: comparing raw pointers inside constant (see issue #53020) - --> $DIR/issue-25826.rs:13:21 + --> $DIR/issue-25826.rs:3:21 | LL | const A: bool = id:: as *const () < id:: as *const (); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-2590.nll.stderr b/src/test/ui/issues/issue-2590.nll.stderr index fa2df26498a06..1252578419a80 100644 --- a/src/test/ui/issues/issue-2590.nll.stderr +++ b/src/test/ui/issues/issue-2590.nll.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/issue-2590.rs:22:9 + --> $DIR/issue-2590.rs:11:9 | LL | self.tokens //~ ERROR cannot move out of borrowed content | ^^^^^^^^^^^ cannot move out of borrowed content diff --git a/src/test/ui/issues/issue-2590.rs b/src/test/ui/issues/issue-2590.rs index d7e438d1049f9..8aeb2a0c88889 100644 --- a/src/test/ui/issues/issue-2590.rs +++ b/src/test/ui/issues/issue-2590.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - struct parser { tokens: Vec , } diff --git a/src/test/ui/issues/issue-2590.stderr b/src/test/ui/issues/issue-2590.stderr index 59ec66d42cd5d..f93b5db3adfbc 100644 --- a/src/test/ui/issues/issue-2590.stderr +++ b/src/test/ui/issues/issue-2590.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/issue-2590.rs:22:9 + --> $DIR/issue-2590.rs:11:9 | LL | self.tokens //~ ERROR cannot move out of borrowed content | ^^^^ cannot move out of borrowed content diff --git a/src/test/ui/issues/issue-25901.rs b/src/test/ui/issues/issue-25901.rs index 72fb2a682ebe2..a139ad0d3e323 100644 --- a/src/test/ui/issues/issue-25901.rs +++ b/src/test/ui/issues/issue-25901.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct A; struct B; diff --git a/src/test/ui/issues/issue-25901.stderr b/src/test/ui/issues/issue-25901.stderr index 8c20df5a230bb..d6eb3760cdf40 100644 --- a/src/test/ui/issues/issue-25901.stderr +++ b/src/test/ui/issues/issue-25901.stderr @@ -1,5 +1,5 @@ error[E0015]: calls in statics are limited to constant functions, tuple structs and tuple variants - --> $DIR/issue-25901.rs:14:24 + --> $DIR/issue-25901.rs:4:24 | LL | static S: &'static B = &A; | ^^ diff --git a/src/test/ui/issues/issue-26056.rs b/src/test/ui/issues/issue-26056.rs index 2dad23514403b..0d9973b454843 100644 --- a/src/test/ui/issues/issue-26056.rs +++ b/src/test/ui/issues/issue-26056.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait MapLookup { type MapValue; } diff --git a/src/test/ui/issues/issue-26056.stderr b/src/test/ui/issues/issue-26056.stderr index 51a48af81a163..44fabd0db195a 100644 --- a/src/test/ui/issues/issue-26056.stderr +++ b/src/test/ui/issues/issue-26056.stderr @@ -1,5 +1,5 @@ error[E0038]: the trait `Map` cannot be made into an object - --> $DIR/issue-26056.rs:30:13 + --> $DIR/issue-26056.rs:20:13 | LL | as &Map; | ^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Map` cannot be made into an object diff --git a/src/test/ui/issues/issue-26093.rs b/src/test/ui/issues/issue-26093.rs index 22751c4a37cdd..7895c90068fe2 100644 --- a/src/test/ui/issues/issue-26093.rs +++ b/src/test/ui/issues/issue-26093.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! not_a_place { ($thing:expr) => { $thing = 42; diff --git a/src/test/ui/issues/issue-26093.stderr b/src/test/ui/issues/issue-26093.stderr index 1abe313bbf669..947c52f08d2e6 100644 --- a/src/test/ui/issues/issue-26093.stderr +++ b/src/test/ui/issues/issue-26093.stderr @@ -1,5 +1,5 @@ error[E0070]: invalid left-hand side expression - --> $DIR/issue-26093.rs:13:9 + --> $DIR/issue-26093.rs:3:9 | LL | $thing = 42; | ^^^^^^^^^^^ left-hand of expression not valid diff --git a/src/test/ui/issues/issue-26094.rs b/src/test/ui/issues/issue-26094.rs index 99add95e806f6..b9433849853a8 100644 --- a/src/test/ui/issues/issue-26094.rs +++ b/src/test/ui/issues/issue-26094.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! some_macro { ($other: expr) => ({ $other(None) diff --git a/src/test/ui/issues/issue-26094.stderr b/src/test/ui/issues/issue-26094.stderr index bf902e16c0c35..36b2d3d074b0c 100644 --- a/src/test/ui/issues/issue-26094.stderr +++ b/src/test/ui/issues/issue-26094.stderr @@ -1,5 +1,5 @@ error[E0061]: this function takes 0 parameters but 1 parameter was supplied - --> $DIR/issue-26094.rs:13:9 + --> $DIR/issue-26094.rs:3:9 | LL | $other(None) | ^^^^^^^^^^^^ expected 0 parameters diff --git a/src/test/ui/issues/issue-26158.rs b/src/test/ui/issues/issue-26158.rs index 54f5313aed16e..11f47b6d02a73 100644 --- a/src/test/ui/issues/issue-26158.rs +++ b/src/test/ui/issues/issue-26158.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(slice_patterns)] fn main() { diff --git a/src/test/ui/issues/issue-26158.stderr b/src/test/ui/issues/issue-26158.stderr index 07b968c8e780a..868ffd191cba7 100644 --- a/src/test/ui/issues/issue-26158.stderr +++ b/src/test/ui/issues/issue-26158.stderr @@ -1,5 +1,5 @@ error[E0005]: refutable pattern in local binding: `&[]` not covered - --> $DIR/issue-26158.rs:15:9 + --> $DIR/issue-26158.rs:5:9 | LL | let &[[ref _a, ref _b..]..] = x; //~ ERROR refutable pattern | ^^^^^^^^^^^^^^^^^^^^^^^ pattern `&[]` not covered diff --git a/src/test/ui/issues/issue-26217.nll.stderr b/src/test/ui/issues/issue-26217.nll.stderr index 94e3692d53db5..3abc55ff6419c 100644 --- a/src/test/ui/issues/issue-26217.nll.stderr +++ b/src/test/ui/issues/issue-26217.nll.stderr @@ -1,11 +1,11 @@ warning: not reporting region error due to nll - --> $DIR/issue-26217.rs:14:5 + --> $DIR/issue-26217.rs:4:5 | LL | foo::<&'a i32>(); | ^^^^^^^^^^^^^^ error[E0131]: `main` function is not allowed to have generic parameters - --> $DIR/issue-26217.rs:13:8 + --> $DIR/issue-26217.rs:3:8 | LL | fn main<'a>() { | ^^^^ `main` cannot have generic parameters diff --git a/src/test/ui/issues/issue-26217.rs b/src/test/ui/issues/issue-26217.rs index 06a8fe525889b..a700807d7f216 100644 --- a/src/test/ui/issues/issue-26217.rs +++ b/src/test/ui/issues/issue-26217.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo() where for<'a> T: 'a {} fn main<'a>() { diff --git a/src/test/ui/issues/issue-26217.stderr b/src/test/ui/issues/issue-26217.stderr index f581826440e2c..be9da569f8be1 100644 --- a/src/test/ui/issues/issue-26217.stderr +++ b/src/test/ui/issues/issue-26217.stderr @@ -1,5 +1,5 @@ error[E0477]: the type `&'a i32` does not fulfill the required lifetime - --> $DIR/issue-26217.rs:14:5 + --> $DIR/issue-26217.rs:4:5 | LL | foo::<&'a i32>(); | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-26237.rs b/src/test/ui/issues/issue-26237.rs index 22772e596b19e..eb7724b631369 100644 --- a/src/test/ui/issues/issue-26237.rs +++ b/src/test/ui/issues/issue-26237.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! macro_panic { ($not_a_function:expr, $some_argument:ident) => { $not_a_function($some_argument) diff --git a/src/test/ui/issues/issue-26237.stderr b/src/test/ui/issues/issue-26237.stderr index ae6fda8b93248..416be936ad904 100644 --- a/src/test/ui/issues/issue-26237.stderr +++ b/src/test/ui/issues/issue-26237.stderr @@ -1,5 +1,5 @@ error[E0618]: expected function, found `{integer}` - --> $DIR/issue-26237.rs:13:9 + --> $DIR/issue-26237.rs:3:9 | LL | $not_a_function($some_argument) | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not a function diff --git a/src/test/ui/issues/issue-26262.rs b/src/test/ui/issues/issue-26262.rs index 8d79fd4570d34..41135db910446 100644 --- a/src/test/ui/issues/issue-26262.rs +++ b/src/test/ui/issues/issue-26262.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that projections don't count as constraining type parameters. struct S(T); diff --git a/src/test/ui/issues/issue-26262.stderr b/src/test/ui/issues/issue-26262.stderr index 2e0a211d06194..90e2d0d930164 100644 --- a/src/test/ui/issues/issue-26262.stderr +++ b/src/test/ui/issues/issue-26262.stderr @@ -1,11 +1,11 @@ error[E0207]: the type parameter `T` is not constrained by the impl trait, self type, or predicates - --> $DIR/issue-26262.rs:17:6 + --> $DIR/issue-26262.rs:7:6 | LL | impl S { | ^ unconstrained type parameter error[E0207]: the lifetime parameter `'a` is not constrained by the impl trait, self type, or predicates - --> $DIR/issue-26262.rs:27:6 + --> $DIR/issue-26262.rs:17:6 | LL | impl<'a,T: Trait2<'a>> Trait1<>::Foo> for T { | ^^ unconstrained lifetime parameter diff --git a/src/test/ui/issues/issue-26459.rs b/src/test/ui/issues/issue-26459.rs index 8be3d88bd5c8f..79791e0e06ad5 100644 --- a/src/test/ui/issues/issue-26459.rs +++ b/src/test/ui/issues/issue-26459.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { match 'a' { char{ch} => true diff --git a/src/test/ui/issues/issue-26459.stderr b/src/test/ui/issues/issue-26459.stderr index d497c1c920964..187369263a446 100644 --- a/src/test/ui/issues/issue-26459.stderr +++ b/src/test/ui/issues/issue-26459.stderr @@ -1,5 +1,5 @@ error[E0574]: expected struct, variant or union type, found builtin type `char` - --> $DIR/issue-26459.rs:13:9 + --> $DIR/issue-26459.rs:3:9 | LL | char{ch} => true | ^^^^ not a struct, variant or union type diff --git a/src/test/ui/issues/issue-26472.rs b/src/test/ui/issues/issue-26472.rs index 9b25eb72f3d46..4659c0d690242 100644 --- a/src/test/ui/issues/issue-26472.rs +++ b/src/test/ui/issues/issue-26472.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod sub { pub struct S { len: usize } impl S { diff --git a/src/test/ui/issues/issue-26472.stderr b/src/test/ui/issues/issue-26472.stderr index 26f54f61a7ee6..dd7941e9a6e5f 100644 --- a/src/test/ui/issues/issue-26472.stderr +++ b/src/test/ui/issues/issue-26472.stderr @@ -1,5 +1,5 @@ error[E0616]: field `len` of struct `sub::S` is private - --> $DIR/issue-26472.rs:21:13 + --> $DIR/issue-26472.rs:11:13 | LL | let v = s.len; | ^^^^^ diff --git a/src/test/ui/issues/issue-26548.rs b/src/test/ui/issues/issue-26548.rs index 85ddf8d9493d5..d7790663d4ef5 100644 --- a/src/test/ui/issues/issue-26548.rs +++ b/src/test/ui/issues/issue-26548.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - //~^^^^^^^^^^ ERROR cycle detected when computing layout of //~| NOTE ...which requires computing layout of //~| NOTE ...which again requires computing layout of diff --git a/src/test/ui/issues/issue-26548.stderr b/src/test/ui/issues/issue-26548.stderr index 7ebeb76b65710..84604f31d1e7f 100644 --- a/src/test/ui/issues/issue-26548.stderr +++ b/src/test/ui/issues/issue-26548.stderr @@ -3,7 +3,7 @@ error[E0391]: cycle detected when computing layout of `std::option::Option` note: ...which requires computing layout of `S`... = note: ...which again requires computing layout of `std::option::Option`, completing the cycle note: cycle used when processing `main` - --> $DIR/issue-26548.rs:19:1 + --> $DIR/issue-26548.rs:9:1 | LL | fn main() { //~ NOTE cycle used when processing `main` | ^^^^^^^^^ diff --git a/src/test/ui/issues/issue-26614.rs b/src/test/ui/issues/issue-26614.rs index c128fb3b47959..ef6e3606449a0 100644 --- a/src/test/ui/issues/issue-26614.rs +++ b/src/test/ui/issues/issue-26614.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![allow(warnings)] diff --git a/src/test/ui/issues/issue-26614.stderr b/src/test/ui/issues/issue-26614.stderr index 1752d80fde367..74c165634ec5c 100644 --- a/src/test/ui/issues/issue-26614.stderr +++ b/src/test/ui/issues/issue-26614.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-26614.rs:24:1 + --> $DIR/issue-26614.rs:14:1 | LL | / fn main() { //~ ERROR compilation successful LL | | let c: ::It = 5; diff --git a/src/test/ui/issues/issue-26638.rs b/src/test/ui/issues/issue-26638.rs index 85a10588975e5..0f5ed5caa74cb 100644 --- a/src/test/ui/issues/issue-26638.rs +++ b/src/test/ui/issues/issue-26638.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn parse_type(iter: Box+'static>) -> &str { iter.next() } //~^ ERROR missing lifetime specifier [E0106] diff --git a/src/test/ui/issues/issue-26638.stderr b/src/test/ui/issues/issue-26638.stderr index cf6fcd9f01cc8..e7a590c192bcf 100644 --- a/src/test/ui/issues/issue-26638.stderr +++ b/src/test/ui/issues/issue-26638.stderr @@ -1,5 +1,5 @@ error[E0106]: missing lifetime specifier - --> $DIR/issue-26638.rs:11:58 + --> $DIR/issue-26638.rs:1:58 | LL | fn parse_type(iter: Box+'static>) -> &str { iter.next() } | ^ expected lifetime parameter @@ -7,7 +7,7 @@ LL | fn parse_type(iter: Box+'static>) -> &str { iter.next() = help: this function's return type contains a borrowed value, but the signature does not say which one of `iter`'s 2 lifetimes it is borrowed from error[E0106]: missing lifetime specifier - --> $DIR/issue-26638.rs:14:40 + --> $DIR/issue-26638.rs:4:40 | LL | fn parse_type_2(iter: fn(&u8)->&u8) -> &str { iter() } | ^ expected lifetime parameter @@ -16,7 +16,7 @@ LL | fn parse_type_2(iter: fn(&u8)->&u8) -> &str { iter() } = help: consider giving it an explicit bounded or 'static lifetime error[E0106]: missing lifetime specifier - --> $DIR/issue-26638.rs:17:22 + --> $DIR/issue-26638.rs:7:22 | LL | fn parse_type_3() -> &str { unimplemented!() } | ^ expected lifetime parameter diff --git a/src/test/ui/issues/issue-26812.rs b/src/test/ui/issues/issue-26812.rs index 1dd008810788b..b2494a91a3f8a 100644 --- a/src/test/ui/issues/issue-26812.rs +++ b/src/test/ui/issues/issue-26812.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(default_type_parameter_fallback)] fn avg(_: T) {} diff --git a/src/test/ui/issues/issue-26812.stderr b/src/test/ui/issues/issue-26812.stderr index 82cc17b7665e1..8d507a7ea0144 100644 --- a/src/test/ui/issues/issue-26812.stderr +++ b/src/test/ui/issues/issue-26812.stderr @@ -1,5 +1,5 @@ error[E0128]: type parameters with a default cannot use forward declared identifiers - --> $DIR/issue-26812.rs:13:10 + --> $DIR/issue-26812.rs:3:10 | LL | fn avg(_: T) {} | ^^^^^^^ defaulted type parameters cannot be forward declared diff --git a/src/test/ui/issues/issue-26886.rs b/src/test/ui/issues/issue-26886.rs index 24ef7cb74c852..6e6d406c656d6 100644 --- a/src/test/ui/issues/issue-26886.rs +++ b/src/test/ui/issues/issue-26886.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::sync::{self, Arc}; use std::sync::Arc; //~ ERROR the name `Arc` is defined multiple times //~| `Arc` must be defined only once in the type namespace of this module diff --git a/src/test/ui/issues/issue-26886.stderr b/src/test/ui/issues/issue-26886.stderr index 759426239410f..bc640678b0c17 100644 --- a/src/test/ui/issues/issue-26886.stderr +++ b/src/test/ui/issues/issue-26886.stderr @@ -1,5 +1,5 @@ error[E0252]: the name `Arc` is defined multiple times - --> $DIR/issue-26886.rs:12:5 + --> $DIR/issue-26886.rs:2:5 | LL | use std::sync::{self, Arc}; | --- previous import of the type `Arc` here @@ -13,7 +13,7 @@ LL | use std::sync::Arc as OtherArc; //~ ERROR the name `Arc` is defined multipl | ^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0252]: the name `sync` is defined multiple times - --> $DIR/issue-26886.rs:14:5 + --> $DIR/issue-26886.rs:4:5 | LL | use std::sync::{self, Arc}; | ---- previous import of the module `sync` here diff --git a/src/test/ui/issues/issue-26905.rs b/src/test/ui/issues/issue-26905.rs index 3b8fac832a464..0cd166f4ac694 100644 --- a/src/test/ui/issues/issue-26905.rs +++ b/src/test/ui/issues/issue-26905.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(unsize, coerce_unsized)] // Verfies that non-PhantomData ZSTs still cause coercions to fail. diff --git a/src/test/ui/issues/issue-26905.stderr b/src/test/ui/issues/issue-26905.stderr index f18b58a8330e0..6465a4f9145fc 100644 --- a/src/test/ui/issues/issue-26905.stderr +++ b/src/test/ui/issues/issue-26905.stderr @@ -1,5 +1,5 @@ error[E0375]: implementing the trait `CoerceUnsized` requires multiple coercions - --> $DIR/issue-26905.rs:26:40 + --> $DIR/issue-26905.rs:16:40 | LL | impl, U: ?Sized> CoerceUnsized> for MyRc{ } //~ERROR | ^^^^^^^^^^^^^^^^^^^^^^ requires multiple coercions diff --git a/src/test/ui/issues/issue-26930.rs b/src/test/ui/issues/issue-26930.rs index 6c98f3e856023..ecd3e50c06101 100644 --- a/src/test/ui/issues/issue-26930.rs +++ b/src/test/ui/issues/issue-26930.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![allow(unused)] diff --git a/src/test/ui/issues/issue-26930.stderr b/src/test/ui/issues/issue-26930.stderr index f962f4c58c444..90f1afd906ecd 100644 --- a/src/test/ui/issues/issue-26930.stderr +++ b/src/test/ui/issues/issue-26930.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-26930.rs:20:1 + --> $DIR/issue-26930.rs:10:1 | LL | fn main() {} //~ ERROR compilation successful | ^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-26948.rs b/src/test/ui/issues/issue-26948.rs index c63cb5defb7e3..832c9641daa0d 100644 --- a/src/test/ui/issues/issue-26948.rs +++ b/src/test/ui/issues/issue-26948.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { enum Foo { A { x: u32 } } let orig = Foo::A { x: 5 }; diff --git a/src/test/ui/issues/issue-26948.stderr b/src/test/ui/issues/issue-26948.stderr index 982ce1d6c7be6..faede1687673c 100644 --- a/src/test/ui/issues/issue-26948.stderr +++ b/src/test/ui/issues/issue-26948.stderr @@ -1,5 +1,5 @@ error[E0436]: functional record update syntax requires a struct - --> $DIR/issue-26948.rs:14:22 + --> $DIR/issue-26948.rs:4:22 | LL | Foo::A { x: 6, ..orig }; | ^^^^ diff --git a/src/test/ui/issues/issue-27008.rs b/src/test/ui/issues/issue-27008.rs index f80135848e0c1..b37ea6f01ba4b 100644 --- a/src/test/ui/issues/issue-27008.rs +++ b/src/test/ui/issues/issue-27008.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S; fn main() { diff --git a/src/test/ui/issues/issue-27008.stderr b/src/test/ui/issues/issue-27008.stderr index 7983146366446..c45d757ff0a3d 100644 --- a/src/test/ui/issues/issue-27008.stderr +++ b/src/test/ui/issues/issue-27008.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-27008.rs:14:17 + --> $DIR/issue-27008.rs:4:17 | LL | let b = [0; S]; | ^ expected usize, found struct `S` diff --git a/src/test/ui/issues/issue-27033.rs b/src/test/ui/issues/issue-27033.rs index b8552aaee9005..a23819a20f9aa 100644 --- a/src/test/ui/issues/issue-27033.rs +++ b/src/test/ui/issues/issue-27033.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { match Some(1) { None @ _ => {} //~ ERROR match bindings cannot shadow unit variants diff --git a/src/test/ui/issues/issue-27033.stderr b/src/test/ui/issues/issue-27033.stderr index ba573c3eb6db8..68d4045d5117b 100644 --- a/src/test/ui/issues/issue-27033.stderr +++ b/src/test/ui/issues/issue-27033.stderr @@ -1,11 +1,11 @@ error[E0530]: match bindings cannot shadow unit variants - --> $DIR/issue-27033.rs:13:9 + --> $DIR/issue-27033.rs:3:9 | LL | None @ _ => {} //~ ERROR match bindings cannot shadow unit variants | ^^^^ cannot be named the same as a unit variant error[E0530]: match bindings cannot shadow constants - --> $DIR/issue-27033.rs:17:9 + --> $DIR/issue-27033.rs:7:9 | LL | const C: u8 = 1; | ---------------- a constant `C` is defined here diff --git a/src/test/ui/issues/issue-27042.rs b/src/test/ui/issues/issue-27042.rs index 23afa4b629636..8c7758597f03e 100644 --- a/src/test/ui/issues/issue-27042.rs +++ b/src/test/ui/issues/issue-27042.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #27042. Test that a loop's label is included in its span. fn main() { diff --git a/src/test/ui/issues/issue-27042.stderr b/src/test/ui/issues/issue-27042.stderr index 4811344558262..bcefb29c18b05 100644 --- a/src/test/ui/issues/issue-27042.stderr +++ b/src/test/ui/issues/issue-27042.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-27042.rs:16:16 + --> $DIR/issue-27042.rs:6:16 | LL | loop { break }; //~ ERROR mismatched types | ^^^^^ expected (), found i32 @@ -8,7 +8,7 @@ LL | loop { break }; //~ ERROR mismatched types found type `i32` error[E0308]: mismatched types - --> $DIR/issue-27042.rs:18:9 + --> $DIR/issue-27042.rs:8:9 | LL | / 'b: //~ ERROR mismatched types LL | | while true { break }; // but here we cite the whole loop @@ -18,7 +18,7 @@ LL | | while true { break }; // but here we cite the whole loop found type `()` error[E0308]: mismatched types - --> $DIR/issue-27042.rs:21:9 + --> $DIR/issue-27042.rs:11:9 | LL | / 'c: //~ ERROR mismatched types LL | | for _ in None { break }; // but here we cite the whole loop @@ -28,7 +28,7 @@ LL | | for _ in None { break }; // but here we cite the whole loop found type `()` error[E0308]: mismatched types - --> $DIR/issue-27042.rs:24:9 + --> $DIR/issue-27042.rs:14:9 | LL | / 'd: //~ ERROR mismatched types LL | | while let Some(_) = None { break }; diff --git a/src/test/ui/issues/issue-27060-2.rs b/src/test/ui/issues/issue-27060-2.rs index 619616adda6de..a001ce1e0ac13 100644 --- a/src/test/ui/issues/issue-27060-2.rs +++ b/src/test/ui/issues/issue-27060-2.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[repr(packed)] pub struct Bad { data: T, //~ ERROR the size for values of type diff --git a/src/test/ui/issues/issue-27060-2.stderr b/src/test/ui/issues/issue-27060-2.stderr index c9a29ac2199c0..6141ada5d9ab2 100644 --- a/src/test/ui/issues/issue-27060-2.stderr +++ b/src/test/ui/issues/issue-27060-2.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `T` cannot be known at compilation time - --> $DIR/issue-27060-2.rs:13:5 + --> $DIR/issue-27060-2.rs:3:5 | LL | data: T, //~ ERROR the size for values of type | ^^^^^^^ doesn't have a size known at compile-time diff --git a/src/test/ui/issues/issue-27060.rs b/src/test/ui/issues/issue-27060.rs index f88c2137e77ef..4caad03a36151 100644 --- a/src/test/ui/issues/issue-27060.rs +++ b/src/test/ui/issues/issue-27060.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[repr(packed)] pub struct Good { data: &'static u32, diff --git a/src/test/ui/issues/issue-27060.stderr b/src/test/ui/issues/issue-27060.stderr index bd01f75d8fbc9..023f90eb9fea3 100644 --- a/src/test/ui/issues/issue-27060.stderr +++ b/src/test/ui/issues/issue-27060.stderr @@ -1,11 +1,11 @@ error: borrow of packed field is unsafe and requires unsafe function or block (error E0133) - --> $DIR/issue-27060.rs:36:13 + --> $DIR/issue-27060.rs:26:13 | LL | let _ = &good.data; //~ ERROR borrow of packed field is unsafe | ^^^^^^^^^^ | note: lint level defined here - --> $DIR/issue-27060.rs:23:8 + --> $DIR/issue-27060.rs:13:8 | LL | #[deny(safe_packed_borrows)] | ^^^^^^^^^^^^^^^^^^^ @@ -14,7 +14,7 @@ LL | #[deny(safe_packed_borrows)] = note: fields of packed structs might be misaligned: dereferencing a misaligned pointer or even just creating a misaligned reference is undefined behavior error: borrow of packed field is unsafe and requires unsafe function or block (error E0133) - --> $DIR/issue-27060.rs:38:13 + --> $DIR/issue-27060.rs:28:13 | LL | let _ = &good.data2[0]; //~ ERROR borrow of packed field is unsafe | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-27078.rs b/src/test/ui/issues/issue-27078.rs index 294c288a970df..ae6ec62be38ad 100644 --- a/src/test/ui/issues/issue-27078.rs +++ b/src/test/ui/issues/issue-27078.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(associated_consts)] trait Foo { diff --git a/src/test/ui/issues/issue-27078.stderr b/src/test/ui/issues/issue-27078.stderr index 269a69dde3345..278c57d146d84 100644 --- a/src/test/ui/issues/issue-27078.stderr +++ b/src/test/ui/issues/issue-27078.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `Self` cannot be known at compilation time - --> $DIR/issue-27078.rs:15:12 + --> $DIR/issue-27078.rs:5:12 | LL | fn foo(self) -> &'static i32 { | ^^^^ doesn't have a size known at compile-time diff --git a/src/test/ui/issues/issue-2718-a.rs b/src/test/ui/issues/issue-2718-a.rs index 6de28cbbf357c..007f41d67dbb8 100644 --- a/src/test/ui/issues/issue-2718-a.rs +++ b/src/test/ui/issues/issue-2718-a.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct send_packet { p: T } diff --git a/src/test/ui/issues/issue-2718-a.stderr b/src/test/ui/issues/issue-2718-a.stderr index a60e5d044557d..bc621a2166fe1 100644 --- a/src/test/ui/issues/issue-2718-a.stderr +++ b/src/test/ui/issues/issue-2718-a.stderr @@ -1,5 +1,5 @@ error[E0072]: recursive type `pingpong::pong` has infinite size - --> $DIR/issue-2718-a.rs:18:5 + --> $DIR/issue-2718-a.rs:8:5 | LL | pub struct pong(send_packet); | ^^^^^^^^^^^^^^^^-----------------^^ diff --git a/src/test/ui/issues/issue-27282-move-match-input-into-guard.rs b/src/test/ui/issues/issue-27282-move-match-input-into-guard.rs index b3be36e41e657..423da29373625 100644 --- a/src/test/ui/issues/issue-27282-move-match-input-into-guard.rs +++ b/src/test/ui/issues/issue-27282-move-match-input-into-guard.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue 27282: Example 2: This sidesteps the AST checks disallowing // mutable borrows in match guards by hiding the mutable borrow in a // guard behind a move (of the mutably borrowed match input) within a diff --git a/src/test/ui/issues/issue-27282-move-match-input-into-guard.stderr b/src/test/ui/issues/issue-27282-move-match-input-into-guard.stderr index 91c51bcd05825..7bd41ee26a0b8 100644 --- a/src/test/ui/issues/issue-27282-move-match-input-into-guard.stderr +++ b/src/test/ui/issues/issue-27282-move-match-input-into-guard.stderr @@ -1,5 +1,5 @@ error[E0505]: cannot move out of `b` because it is borrowed - --> $DIR/issue-27282-move-match-input-into-guard.rs:26:17 + --> $DIR/issue-27282-move-match-input-into-guard.rs:16:17 | LL | match b { | - borrow of `b` occurs here @@ -13,7 +13,7 @@ LL | &mut true => { println!("You might think we should get here"); }, | --------- borrow later used here error[E0382]: use of moved value: `*b` - --> $DIR/issue-27282-move-match-input-into-guard.rs:29:14 + --> $DIR/issue-27282-move-match-input-into-guard.rs:19:14 | LL | _ if { (|| { let bar = b; *bar = false; })(); | -- - variable moved due to use in closure diff --git a/src/test/ui/issues/issue-27282-move-ref-mut-into-guard.rs b/src/test/ui/issues/issue-27282-move-ref-mut-into-guard.rs index 5b4c746a1b611..1312aff30fecf 100644 --- a/src/test/ui/issues/issue-27282-move-ref-mut-into-guard.rs +++ b/src/test/ui/issues/issue-27282-move-ref-mut-into-guard.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue 27282: Example 1: This sidesteps the AST checks disallowing // mutable borrows in match guards by hiding the mutable borrow in a // guard behind a move (of the ref mut pattern id) within a closure. diff --git a/src/test/ui/issues/issue-27282-move-ref-mut-into-guard.stderr b/src/test/ui/issues/issue-27282-move-ref-mut-into-guard.stderr index f6ffa90069cc4..b5973ba8bd56e 100644 --- a/src/test/ui/issues/issue-27282-move-ref-mut-into-guard.stderr +++ b/src/test/ui/issues/issue-27282-move-ref-mut-into-guard.stderr @@ -1,5 +1,5 @@ error[E0507]: cannot move out of borrowed content - --> $DIR/issue-27282-move-ref-mut-into-guard.rs:24:18 + --> $DIR/issue-27282-move-ref-mut-into-guard.rs:14:18 | LL | if { (|| { let bar = foo; bar.take() })(); false } => {}, | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of borrowed content diff --git a/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-1.rs b/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-1.rs index b575f4ebce6c0..e13657f6825c6 100644 --- a/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-1.rs +++ b/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-1.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This is testing an attempt to corrupt the discriminant of the match // arm in a guard, followed by an attempt to continue matching on that // corrupted discriminant in the remaining match arms. diff --git a/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-1.stderr b/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-1.stderr index a9d9651fb2a35..14bd54ab30686 100644 --- a/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-1.stderr +++ b/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-1.stderr @@ -1,5 +1,5 @@ error[E0500]: closure requires unique access to `x` but it is already borrowed - --> $DIR/issue-27282-mutate-before-diverging-arm-1.rs:33:14 + --> $DIR/issue-27282-mutate-before-diverging-arm-1.rs:23:14 | LL | match x { | - borrow occurs here diff --git a/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-2.rs b/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-2.rs index 866fed1368504..a7b4c5d0c8036 100644 --- a/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-2.rs +++ b/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-2.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This is testing an attempt to corrupt the discriminant of the match // arm in a guard, followed by an attempt to continue matching on that // corrupted discriminant in the remaining match arms. diff --git a/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-2.stderr b/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-2.stderr index 582d0fd678c07..199683b98c7bd 100644 --- a/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-2.stderr +++ b/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-2.stderr @@ -1,5 +1,5 @@ error[E0500]: closure requires unique access to `x` but it is already borrowed - --> $DIR/issue-27282-mutate-before-diverging-arm-2.rs:38:18 + --> $DIR/issue-27282-mutate-before-diverging-arm-2.rs:28:18 | LL | match x { | - borrow occurs here diff --git a/src/test/ui/issues/issue-27282-reborrow-ref-mut-in-guard.rs b/src/test/ui/issues/issue-27282-reborrow-ref-mut-in-guard.rs index 39d54f6e7ae28..a45aca96edf6e 100644 --- a/src/test/ui/issues/issue-27282-reborrow-ref-mut-in-guard.rs +++ b/src/test/ui/issues/issue-27282-reborrow-ref-mut-in-guard.rs @@ -1,13 +1,3 @@ -// Copyright 2018 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Issue 27282: This is a variation on issue-27282-move-ref-mut-into-guard.rs // // It reborrows instead of moving the `ref mut` pattern borrow. This diff --git a/src/test/ui/issues/issue-27282-reborrow-ref-mut-in-guard.stderr b/src/test/ui/issues/issue-27282-reborrow-ref-mut-in-guard.stderr index 660902880ac2f..3a10928981c8b 100644 --- a/src/test/ui/issues/issue-27282-reborrow-ref-mut-in-guard.stderr +++ b/src/test/ui/issues/issue-27282-reborrow-ref-mut-in-guard.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `r` as mutable, as it is immutable for the pattern guard - --> $DIR/issue-27282-reborrow-ref-mut-in-guard.rs:26:25 + --> $DIR/issue-27282-reborrow-ref-mut-in-guard.rs:16:25 | LL | ref mut r if { (|| { let bar = &mut *r; **bar = false; })(); | ^^ - mutable borrow occurs due to use of `r` in closure diff --git a/src/test/ui/issues/issue-27340.rs b/src/test/ui/issues/issue-27340.rs index ce3fa487d4e02..61c77cc1ff39b 100644 --- a/src/test/ui/issues/issue-27340.rs +++ b/src/test/ui/issues/issue-27340.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo; #[derive(Copy, Clone)] //~^ ERROR the trait `Copy` may not be implemented for this type diff --git a/src/test/ui/issues/issue-27340.stderr b/src/test/ui/issues/issue-27340.stderr index bae47b3d2a3d4..634a31a89d557 100644 --- a/src/test/ui/issues/issue-27340.stderr +++ b/src/test/ui/issues/issue-27340.stderr @@ -1,5 +1,5 @@ error[E0204]: the trait `Copy` may not be implemented for this type - --> $DIR/issue-27340.rs:12:10 + --> $DIR/issue-27340.rs:2:10 | LL | #[derive(Copy, Clone)] | ^^^^ diff --git a/src/test/ui/issues/issue-27433.rs b/src/test/ui/issues/issue-27433.rs index 782b205743871..2cc7d05e7c691 100644 --- a/src/test/ui/issues/issue-27433.rs +++ b/src/test/ui/issues/issue-27433.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let foo = 42u32; const FOO : u32 = foo; diff --git a/src/test/ui/issues/issue-27433.stderr b/src/test/ui/issues/issue-27433.stderr index 0fc04b082e518..78a193dd99a7f 100644 --- a/src/test/ui/issues/issue-27433.stderr +++ b/src/test/ui/issues/issue-27433.stderr @@ -1,5 +1,5 @@ error[E0434]: can't capture dynamic environment in a fn item - --> $DIR/issue-27433.rs:13:23 + --> $DIR/issue-27433.rs:3:23 | LL | const FOO : u32 = foo; | ^^^ diff --git a/src/test/ui/issues/issue-27592.nll.stderr b/src/test/ui/issues/issue-27592.nll.stderr index 36a15e79ac825..89fdb8d95df12 100644 --- a/src/test/ui/issues/issue-27592.nll.stderr +++ b/src/test/ui/issues/issue-27592.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/issue-27592.rs:26:27 + --> $DIR/issue-27592.rs:16:27 | LL | write(|| format_args!("{}", String::from("Hello world"))); | ^^^^ - temporary value only lives until here @@ -7,7 +7,7 @@ LL | write(|| format_args!("{}", String::from("Hello world"))); | temporary value does not live long enough error[E0597]: borrowed value does not live long enough - --> $DIR/issue-27592.rs:26:33 + --> $DIR/issue-27592.rs:16:33 | LL | write(|| format_args!("{}", String::from("Hello world"))); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^- temporary value only lives until here diff --git a/src/test/ui/issues/issue-27592.rs b/src/test/ui/issues/issue-27592.rs index 731d4fb2bf693..6006f9a7c51d6 100644 --- a/src/test/ui/issues/issue-27592.rs +++ b/src/test/ui/issues/issue-27592.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #27592. fn write<'a, F: ::std::ops::FnOnce()->::std::fmt::Arguments<'a> + 'a>(fcn: F) { diff --git a/src/test/ui/issues/issue-27592.stderr b/src/test/ui/issues/issue-27592.stderr index 74b0541c01b2f..0f62abee1ca88 100644 --- a/src/test/ui/issues/issue-27592.stderr +++ b/src/test/ui/issues/issue-27592.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/issue-27592.rs:26:27 + --> $DIR/issue-27592.rs:16:27 | LL | write(|| format_args!("{}", String::from("Hello world"))); | ^^^^ -- temporary value needs to live until here @@ -8,7 +8,7 @@ LL | write(|| format_args!("{}", String::from("Hello world"))); | temporary value does not live long enough error[E0597]: borrowed value does not live long enough - --> $DIR/issue-27592.rs:26:33 + --> $DIR/issue-27592.rs:16:33 | LL | write(|| format_args!("{}", String::from("Hello world"))); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^-- temporary value needs to live until here diff --git a/src/test/ui/issues/issue-27815.rs b/src/test/ui/issues/issue-27815.rs index d9840abf0ca77..9e53014f45522 100644 --- a/src/test/ui/issues/issue-27815.rs +++ b/src/test/ui/issues/issue-27815.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod A {} fn main() { diff --git a/src/test/ui/issues/issue-27815.stderr b/src/test/ui/issues/issue-27815.stderr index 987feaee9eb31..fbddd3be9dcea 100644 --- a/src/test/ui/issues/issue-27815.stderr +++ b/src/test/ui/issues/issue-27815.stderr @@ -1,23 +1,23 @@ error[E0574]: expected struct, variant or union type, found module `A` - --> $DIR/issue-27815.rs:14:13 + --> $DIR/issue-27815.rs:4:13 | LL | let u = A { x: 1 }; //~ ERROR expected struct, variant or union type, found module `A` | ^ not a struct, variant or union type error[E0574]: expected struct, variant or union type, found builtin type `u32` - --> $DIR/issue-27815.rs:15:13 + --> $DIR/issue-27815.rs:5:13 | LL | let v = u32 { x: 1 }; //~ ERROR expected struct, variant or union type, found builtin type `u32` | ^^^ not a struct, variant or union type error[E0574]: expected struct, variant or union type, found module `A` - --> $DIR/issue-27815.rs:17:9 + --> $DIR/issue-27815.rs:7:9 | LL | A { x: 1 } => {} | ^ not a struct, variant or union type error[E0574]: expected struct, variant or union type, found builtin type `u32` - --> $DIR/issue-27815.rs:19:9 + --> $DIR/issue-27815.rs:9:9 | LL | u32 { x: 1 } => {} | ^^^ not a struct, variant or union type diff --git a/src/test/ui/issues/issue-27842.rs b/src/test/ui/issues/issue-27842.rs index d9dc3458a4a2c..3bcfa13307018 100644 --- a/src/test/ui/issues/issue-27842.rs +++ b/src/test/ui/issues/issue-27842.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let tup = (0, 1, 2); // the case where we show a suggestion diff --git a/src/test/ui/issues/issue-27842.stderr b/src/test/ui/issues/issue-27842.stderr index 026594811e479..e4be7e3b9780c 100644 --- a/src/test/ui/issues/issue-27842.stderr +++ b/src/test/ui/issues/issue-27842.stderr @@ -1,11 +1,11 @@ error[E0608]: cannot index into a value of type `({integer}, {integer}, {integer})` - --> $DIR/issue-27842.rs:14:13 + --> $DIR/issue-27842.rs:4:13 | LL | let _ = tup[0]; | ^^^^^^ help: to access tuple elements, use: `tup.0` error[E0608]: cannot index into a value of type `({integer}, {integer}, {integer})` - --> $DIR/issue-27842.rs:19:13 + --> $DIR/issue-27842.rs:9:13 | LL | let _ = tup[i]; | ^^^^^^ diff --git a/src/test/ui/issues/issue-27895.rs b/src/test/ui/issues/issue-27895.rs index 6063755c04f28..0018ac1bdf164 100644 --- a/src/test/ui/issues/issue-27895.rs +++ b/src/test/ui/issues/issue-27895.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let i = 5; let index = 6; diff --git a/src/test/ui/issues/issue-27895.stderr b/src/test/ui/issues/issue-27895.stderr index 395c806fbdbda..55bd938b0bfca 100644 --- a/src/test/ui/issues/issue-27895.stderr +++ b/src/test/ui/issues/issue-27895.stderr @@ -1,5 +1,5 @@ error[E0080]: runtime values cannot be referenced in patterns - --> $DIR/issue-27895.rs:16:13 + --> $DIR/issue-27895.rs:6:13 | LL | 0..=index => println!("winner"), | ^^^^^ diff --git a/src/test/ui/issues/issue-27942.rs b/src/test/ui/issues/issue-27942.rs index 2234aede00df4..34b34de387976 100644 --- a/src/test/ui/issues/issue-27942.rs +++ b/src/test/ui/issues/issue-27942.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Resources<'a> {} pub trait Buffer<'a, R: Resources<'a>> { diff --git a/src/test/ui/issues/issue-27942.stderr b/src/test/ui/issues/issue-27942.stderr index 5e2ecbb05aebc..e03959598b8b8 100644 --- a/src/test/ui/issues/issue-27942.stderr +++ b/src/test/ui/issues/issue-27942.stderr @@ -1,37 +1,37 @@ error[E0308]: mismatched types - --> $DIR/issue-27942.rs:15:5 + --> $DIR/issue-27942.rs:5:5 | LL | fn select(&self) -> BufferViewHandle; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lifetime mismatch | = note: expected type `Resources<'_>` found type `Resources<'a>` -note: the anonymous lifetime #1 defined on the method body at 15:5... - --> $DIR/issue-27942.rs:15:5 +note: the anonymous lifetime #1 defined on the method body at 5:5... + --> $DIR/issue-27942.rs:5:5 | LL | fn select(&self) -> BufferViewHandle; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -note: ...does not necessarily outlive the lifetime 'a as defined on the trait at 13:18 - --> $DIR/issue-27942.rs:13:18 +note: ...does not necessarily outlive the lifetime 'a as defined on the trait at 3:18 + --> $DIR/issue-27942.rs:3:18 | LL | pub trait Buffer<'a, R: Resources<'a>> { | ^^ error[E0308]: mismatched types - --> $DIR/issue-27942.rs:15:5 + --> $DIR/issue-27942.rs:5:5 | LL | fn select(&self) -> BufferViewHandle; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lifetime mismatch | = note: expected type `Resources<'_>` found type `Resources<'a>` -note: the lifetime 'a as defined on the trait at 13:18... - --> $DIR/issue-27942.rs:13:18 +note: the lifetime 'a as defined on the trait at 3:18... + --> $DIR/issue-27942.rs:3:18 | LL | pub trait Buffer<'a, R: Resources<'a>> { | ^^ -note: ...does not necessarily outlive the anonymous lifetime #1 defined on the method body at 15:5 - --> $DIR/issue-27942.rs:15:5 +note: ...does not necessarily outlive the anonymous lifetime #1 defined on the method body at 5:5 + --> $DIR/issue-27942.rs:5:5 | LL | fn select(&self) -> BufferViewHandle; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-28075.rs b/src/test/ui/issues/issue-28075.rs index 0f6b9d1b5dc4f..468137fcf3cfe 100644 --- a/src/test/ui/issues/issue-28075.rs +++ b/src/test/ui/issues/issue-28075.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Unstable entities should be caught in import lists // aux-build:lint_stability.rs diff --git a/src/test/ui/issues/issue-28075.stderr b/src/test/ui/issues/issue-28075.stderr index b42a322cbb4a4..323be5cc2cff5 100644 --- a/src/test/ui/issues/issue-28075.stderr +++ b/src/test/ui/issues/issue-28075.stderr @@ -1,5 +1,5 @@ error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/issue-28075.rs:19:22 + --> $DIR/issue-28075.rs:9:22 | LL | use lint_stability::{unstable, deprecated}; | ^^^^^^^^ diff --git a/src/test/ui/issues/issue-28098.rs b/src/test/ui/issues/issue-28098.rs index 5dded2b1e1697..920663db46e92 100644 --- a/src/test/ui/issues/issue-28098.rs +++ b/src/test/ui/issues/issue-28098.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let _ = Iterator::next(&mut ()); //~^ ERROR `(): std::iter::Iterator` is not satisfied diff --git a/src/test/ui/issues/issue-28098.stderr b/src/test/ui/issues/issue-28098.stderr index 3a6e1aea28834..4e0df33f8a97c 100644 --- a/src/test/ui/issues/issue-28098.stderr +++ b/src/test/ui/issues/issue-28098.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `(): std::iter::Iterator` is not satisfied - --> $DIR/issue-28098.rs:12:13 + --> $DIR/issue-28098.rs:2:13 | LL | let _ = Iterator::next(&mut ()); | ^^^^^^^^^^^^^^ `()` is not an iterator; maybe try calling `.iter()` or a similar method @@ -8,7 +8,7 @@ LL | let _ = Iterator::next(&mut ()); = note: required by `std::iter::Iterator::next` error[E0277]: the trait bound `bool: std::iter::Iterator` is not satisfied - --> $DIR/issue-28098.rs:15:14 + --> $DIR/issue-28098.rs:5:14 | LL | for _ in false {} | ^^^^^ `bool` is not an iterator; maybe try calling `.iter()` or a similar method @@ -17,7 +17,7 @@ LL | for _ in false {} = note: required by `std::iter::IntoIterator::into_iter` error[E0277]: the trait bound `(): std::iter::Iterator` is not satisfied - --> $DIR/issue-28098.rs:18:13 + --> $DIR/issue-28098.rs:8:13 | LL | let _ = Iterator::next(&mut ()); | ^^^^^^^^^^^^^^ `()` is not an iterator; maybe try calling `.iter()` or a similar method @@ -26,7 +26,7 @@ LL | let _ = Iterator::next(&mut ()); = note: required by `std::iter::Iterator::next` error[E0277]: the trait bound `(): std::iter::Iterator` is not satisfied - --> $DIR/issue-28098.rs:27:13 + --> $DIR/issue-28098.rs:17:13 | LL | let _ = Iterator::next(&mut ()); | ^^^^^^^^^^^^^^ `()` is not an iterator; maybe try calling `.iter()` or a similar method @@ -35,7 +35,7 @@ LL | let _ = Iterator::next(&mut ()); = note: required by `std::iter::Iterator::next` error[E0277]: the trait bound `(): std::iter::Iterator` is not satisfied - --> $DIR/issue-28098.rs:30:13 + --> $DIR/issue-28098.rs:20:13 | LL | let _ = Iterator::next(&mut ()); | ^^^^^^^^^^^^^^ `()` is not an iterator; maybe try calling `.iter()` or a similar method @@ -44,7 +44,7 @@ LL | let _ = Iterator::next(&mut ()); = note: required by `std::iter::Iterator::next` error[E0277]: the trait bound `bool: std::iter::Iterator` is not satisfied - --> $DIR/issue-28098.rs:33:14 + --> $DIR/issue-28098.rs:23:14 | LL | for _ in false {} | ^^^^^ `bool` is not an iterator; maybe try calling `.iter()` or a similar method diff --git a/src/test/ui/issues/issue-28105.rs b/src/test/ui/issues/issue-28105.rs index 8e58d1aaf240d..6026cbb82ae75 100644 --- a/src/test/ui/issues/issue-28105.rs +++ b/src/test/ui/issues/issue-28105.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Make sure that a continue span actually contains the keyword. fn main() { diff --git a/src/test/ui/issues/issue-28105.stderr b/src/test/ui/issues/issue-28105.stderr index eb05dbea2be09..900bc43bfc8ad 100644 --- a/src/test/ui/issues/issue-28105.stderr +++ b/src/test/ui/issues/issue-28105.stderr @@ -1,11 +1,11 @@ error[E0268]: `continue` outside of loop - --> $DIR/issue-28105.rs:14:5 + --> $DIR/issue-28105.rs:4:5 | LL | continue //~ ERROR `continue` outside of loop | ^^^^^^^^ cannot break outside of a loop error[E0268]: `break` outside of loop - --> $DIR/issue-28105.rs:16:5 + --> $DIR/issue-28105.rs:6:5 | LL | break //~ ERROR `break` outside of loop | ^^^^^ cannot break outside of a loop diff --git a/src/test/ui/issues/issue-28109.rs b/src/test/ui/issues/issue-28109.rs index 0d372d300154a..755a539b5003e 100644 --- a/src/test/ui/issues/issue-28109.rs +++ b/src/test/ui/issues/issue-28109.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Make sure that label for continue and break is spanned correctly fn main() { diff --git a/src/test/ui/issues/issue-28109.stderr b/src/test/ui/issues/issue-28109.stderr index 902fe2390b944..91a8297256435 100644 --- a/src/test/ui/issues/issue-28109.stderr +++ b/src/test/ui/issues/issue-28109.stderr @@ -1,11 +1,11 @@ error[E0426]: use of undeclared label `'b` - --> $DIR/issue-28109.rs:16:9 + --> $DIR/issue-28109.rs:6:9 | LL | 'b //~ ERROR use of undeclared label | ^^ undeclared label `'b` error[E0426]: use of undeclared label `'c` - --> $DIR/issue-28109.rs:19:9 + --> $DIR/issue-28109.rs:9:9 | LL | 'c //~ ERROR use of undeclared label | ^^ undeclared label `'c` diff --git a/src/test/ui/issues/issue-28113.rs b/src/test/ui/issues/issue-28113.rs index 7d2541966a481..e5bd7aafe41e6 100644 --- a/src/test/ui/issues/issue-28113.rs +++ b/src/test/ui/issues/issue-28113.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(warnings)] const X: u8 = diff --git a/src/test/ui/issues/issue-28113.stderr b/src/test/ui/issues/issue-28113.stderr index 633257f1a4bca..3d274d777b0c7 100644 --- a/src/test/ui/issues/issue-28113.stderr +++ b/src/test/ui/issues/issue-28113.stderr @@ -1,5 +1,5 @@ error[E0015]: calls in constants are limited to constant functions, tuple structs and tuple variants - --> $DIR/issue-28113.rs:14:5 + --> $DIR/issue-28113.rs:4:5 | LL | || -> u8 { 5 }() | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-2823.rs b/src/test/ui/issues/issue-2823.rs index 631bcb7bd9eb9..7b443b4152613 100644 --- a/src/test/ui/issues/issue-2823.rs +++ b/src/test/ui/issues/issue-2823.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct C { x: isize, } diff --git a/src/test/ui/issues/issue-2823.stderr b/src/test/ui/issues/issue-2823.stderr index 5a5cae7aab411..b51ff611dbd77 100644 --- a/src/test/ui/issues/issue-2823.stderr +++ b/src/test/ui/issues/issue-2823.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `clone` found for type `C` in the current scope - --> $DIR/issue-2823.rs:23:16 + --> $DIR/issue-2823.rs:13:16 | LL | struct C { | -------- method `clone` not found for this diff --git a/src/test/ui/issues/issue-28324.rs b/src/test/ui/issues/issue-28324.rs index af73db2b4d211..73e8cd6ab0da1 100644 --- a/src/test/ui/issues/issue-28324.rs +++ b/src/test/ui/issues/issue-28324.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(safe_extern_statics)] extern { diff --git a/src/test/ui/issues/issue-28324.stderr b/src/test/ui/issues/issue-28324.stderr index c62d8bddf0051..bbd02ba03f489 100644 --- a/src/test/ui/issues/issue-28324.stderr +++ b/src/test/ui/issues/issue-28324.stderr @@ -1,5 +1,5 @@ error[E0080]: could not evaluate static initializer - --> $DIR/issue-28324.rs:17:23 + --> $DIR/issue-28324.rs:7:23 | LL | pub static BAZ: u32 = *&error_message_count; | ^^^^^^^^^^^^^^^^^^^^^ tried to read from foreign (extern) static diff --git a/src/test/ui/issues/issue-28344.rs b/src/test/ui/issues/issue-28344.rs index d28c314640449..4da7ee21baa0f 100644 --- a/src/test/ui/issues/issue-28344.rs +++ b/src/test/ui/issues/issue-28344.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ops::BitXor; fn main() { diff --git a/src/test/ui/issues/issue-28344.stderr b/src/test/ui/issues/issue-28344.stderr index 7ef2e906422ed..108e17950499b 100644 --- a/src/test/ui/issues/issue-28344.stderr +++ b/src/test/ui/issues/issue-28344.stderr @@ -1,11 +1,11 @@ error[E0191]: the value of the associated type `Output` (from the trait `std::ops::BitXor`) must be specified - --> $DIR/issue-28344.rs:14:17 + --> $DIR/issue-28344.rs:4:17 | LL | let x: u8 = BitXor::bitor(0 as u8, 0 as u8); | ^^^^^^^^^^^^^ missing associated type `Output` value error[E0599]: no function or associated item named `bitor` found for type `dyn std::ops::BitXor<_>` in the current scope - --> $DIR/issue-28344.rs:14:17 + --> $DIR/issue-28344.rs:4:17 | LL | let x: u8 = BitXor::bitor(0 as u8, 0 as u8); | ^^^^^^^^^^^^^ function or associated item not found in `dyn std::ops::BitXor<_>` @@ -13,13 +13,13 @@ LL | let x: u8 = BitXor::bitor(0 as u8, 0 as u8); = help: did you mean `bitxor`? error[E0191]: the value of the associated type `Output` (from the trait `std::ops::BitXor`) must be specified - --> $DIR/issue-28344.rs:18:13 + --> $DIR/issue-28344.rs:8:13 | LL | let g = BitXor::bitor; | ^^^^^^^^^^^^^ missing associated type `Output` value error[E0599]: no function or associated item named `bitor` found for type `dyn std::ops::BitXor<_>` in the current scope - --> $DIR/issue-28344.rs:18:13 + --> $DIR/issue-28344.rs:8:13 | LL | let g = BitXor::bitor; | ^^^^^^^^^^^^^ function or associated item not found in `dyn std::ops::BitXor<_>` diff --git a/src/test/ui/issues/issue-28388-1.rs b/src/test/ui/issues/issue-28388-1.rs index 187d91731d0d6..4f122f44c44f0 100644 --- a/src/test/ui/issues/issue-28388-1.rs +++ b/src/test/ui/issues/issue-28388-1.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Prefix in imports with empty braces should be resolved and checked privacy, stability, etc. use foo::{}; //~ ERROR cannot find module or enum `foo` in the crate root diff --git a/src/test/ui/issues/issue-28388-1.stderr b/src/test/ui/issues/issue-28388-1.stderr index 9f4b6cb56e727..ce203c621ae20 100644 --- a/src/test/ui/issues/issue-28388-1.stderr +++ b/src/test/ui/issues/issue-28388-1.stderr @@ -1,5 +1,5 @@ error[E0578]: cannot find module or enum `foo` in the crate root - --> $DIR/issue-28388-1.rs:13:5 + --> $DIR/issue-28388-1.rs:3:5 | LL | use foo::{}; //~ ERROR cannot find module or enum `foo` in the crate root | ^^^ not found in the crate root diff --git a/src/test/ui/issues/issue-28388-2.rs b/src/test/ui/issues/issue-28388-2.rs index 4ed5bfab06f02..024b0388bc609 100644 --- a/src/test/ui/issues/issue-28388-2.rs +++ b/src/test/ui/issues/issue-28388-2.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Prefix in imports with empty braces should be resolved and checked privacy, stability, etc. mod m { diff --git a/src/test/ui/issues/issue-28388-2.stderr b/src/test/ui/issues/issue-28388-2.stderr index 7809934942c26..eef10656191b8 100644 --- a/src/test/ui/issues/issue-28388-2.stderr +++ b/src/test/ui/issues/issue-28388-2.stderr @@ -1,5 +1,5 @@ error[E0603]: module `n` is private - --> $DIR/issue-28388-2.rs:17:5 + --> $DIR/issue-28388-2.rs:7:5 | LL | use m::n::{}; | ^^^^^^^^ diff --git a/src/test/ui/issues/issue-28388-3.rs b/src/test/ui/issues/issue-28388-3.rs index 12e3457ef9e34..fb37f20984d4d 100644 --- a/src/test/ui/issues/issue-28388-3.rs +++ b/src/test/ui/issues/issue-28388-3.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Prefix in imports with empty braces should be resolved and checked privacy, stability, etc. // aux-build:lint_stability.rs diff --git a/src/test/ui/issues/issue-28388-3.stderr b/src/test/ui/issues/issue-28388-3.stderr index 653fdb5a4d43a..2eb8249250e17 100644 --- a/src/test/ui/issues/issue-28388-3.stderr +++ b/src/test/ui/issues/issue-28388-3.stderr @@ -1,5 +1,5 @@ error[E0658]: use of unstable library feature 'unstable_test_feature' - --> $DIR/issue-28388-3.rs:17:5 + --> $DIR/issue-28388-3.rs:7:5 | LL | use lint_stability::UnstableEnum::{}; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-28433.rs b/src/test/ui/issues/issue-28433.rs index 9253a490733ed..a87ac63784fc6 100644 --- a/src/test/ui/issues/issue-28433.rs +++ b/src/test/ui/issues/issue-28433.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z continue-parse-after-error enum bird { diff --git a/src/test/ui/issues/issue-28433.stderr b/src/test/ui/issues/issue-28433.stderr index bde01ef374651..97df6db2b5215 100644 --- a/src/test/ui/issues/issue-28433.stderr +++ b/src/test/ui/issues/issue-28433.stderr @@ -1,11 +1,11 @@ error: expected identifier, found keyword `pub` - --> $DIR/issue-28433.rs:14:5 + --> $DIR/issue-28433.rs:4:5 | LL | pub duck, | ^^^ expected identifier, found keyword error: expected one of `(`, `,`, `=`, `{`, or `}`, found `duck` - --> $DIR/issue-28433.rs:14:9 + --> $DIR/issue-28433.rs:4:9 | LL | pub duck, | ^^^^ expected one of `(`, `,`, `=`, `{`, or `}` here diff --git a/src/test/ui/issues/issue-28472.rs b/src/test/ui/issues/issue-28472.rs index 837de8eddcf14..17d74ea0cf41d 100644 --- a/src/test/ui/issues/issue-28472.rs +++ b/src/test/ui/issues/issue-28472.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Check that the visibility modifier is included in the span of foreign items. extern { diff --git a/src/test/ui/issues/issue-28472.stderr b/src/test/ui/issues/issue-28472.stderr index 37c04a7a7740b..8288a1d9bb78f 100644 --- a/src/test/ui/issues/issue-28472.stderr +++ b/src/test/ui/issues/issue-28472.stderr @@ -1,5 +1,5 @@ error[E0428]: the name `foo` is defined multiple times - --> $DIR/issue-28472.rs:16:3 + --> $DIR/issue-28472.rs:6:3 | LL | fn foo(); | --------- previous definition of the value `foo` here @@ -11,7 +11,7 @@ LL | | fn foo(); = note: `foo` must be defined only once in the value namespace of this module error[E0428]: the name `foo` is defined multiple times - --> $DIR/issue-28472.rs:19:3 + --> $DIR/issue-28472.rs:9:3 | LL | fn foo(); | --------- previous definition of the value `foo` here diff --git a/src/test/ui/issues/issue-2848.rs b/src/test/ui/issues/issue-2848.rs index f3fc94434d3a0..fb5af1cf6bd42 100644 --- a/src/test/ui/issues/issue-2848.rs +++ b/src/test/ui/issues/issue-2848.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod bar { pub enum foo { alpha, diff --git a/src/test/ui/issues/issue-2848.stderr b/src/test/ui/issues/issue-2848.stderr index 8f7ebbf95dd93..790f7cf500329 100644 --- a/src/test/ui/issues/issue-2848.stderr +++ b/src/test/ui/issues/issue-2848.stderr @@ -1,5 +1,5 @@ error[E0408]: variable `beta` is not bound in all patterns - --> $DIR/issue-2848.rs:22:7 + --> $DIR/issue-2848.rs:12:7 | LL | alpha | beta => {} //~ ERROR variable `beta` is not bound in all patterns | ^^^^^ ---- variable not in all patterns diff --git a/src/test/ui/issues/issue-2849.rs b/src/test/ui/issues/issue-2849.rs index 203b28bd5e417..fa93a411e0254 100644 --- a/src/test/ui/issues/issue-2849.rs +++ b/src/test/ui/issues/issue-2849.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum foo { alpha, beta(isize) } fn main() { diff --git a/src/test/ui/issues/issue-2849.stderr b/src/test/ui/issues/issue-2849.stderr index ffd15a58880c2..68cb9af986b1e 100644 --- a/src/test/ui/issues/issue-2849.stderr +++ b/src/test/ui/issues/issue-2849.stderr @@ -1,5 +1,5 @@ error[E0408]: variable `i` is not bound in all patterns - --> $DIR/issue-2849.rs:15:7 + --> $DIR/issue-2849.rs:5:7 | LL | foo::alpha | foo::beta(i) => {} | ^^^^^^^^^^ - variable not in all patterns diff --git a/src/test/ui/issues/issue-28568.rs b/src/test/ui/issues/issue-28568.rs index e8c34198852e4..ce511158f0051 100644 --- a/src/test/ui/issues/issue-28568.rs +++ b/src/test/ui/issues/issue-28568.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct MyStruct; impl Drop for MyStruct { diff --git a/src/test/ui/issues/issue-28568.stderr b/src/test/ui/issues/issue-28568.stderr index 3208074642f09..7729b9d240d28 100644 --- a/src/test/ui/issues/issue-28568.stderr +++ b/src/test/ui/issues/issue-28568.stderr @@ -1,5 +1,5 @@ error[E0119]: conflicting implementations of trait `std::ops::Drop` for type `MyStruct`: - --> $DIR/issue-28568.rs:17:1 + --> $DIR/issue-28568.rs:7:1 | LL | impl Drop for MyStruct { | ---------------------- first implementation here diff --git a/src/test/ui/issues/issue-28576.rs b/src/test/ui/issues/issue-28576.rs index bd7186708a6c2..de665d5aa1680 100644 --- a/src/test/ui/issues/issue-28576.rs +++ b/src/test/ui/issues/issue-28576.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Foo { type Assoc; } diff --git a/src/test/ui/issues/issue-28576.stderr b/src/test/ui/issues/issue-28576.stderr index 80f0f1ba1b1aa..b04715f23f49e 100644 --- a/src/test/ui/issues/issue-28576.stderr +++ b/src/test/ui/issues/issue-28576.stderr @@ -1,5 +1,5 @@ error[E0038]: the trait `Bar` cannot be made into an object - --> $DIR/issue-28576.rs:17:12 + --> $DIR/issue-28576.rs:7:12 | LL | / Bar //~ ERROR the trait `Bar` cannot be made into an object LL | | diff --git a/src/test/ui/issues/issue-28586.rs b/src/test/ui/issues/issue-28586.rs index b8571d2e85e2c..4d286be1e3302 100644 --- a/src/test/ui/issues/issue-28586.rs +++ b/src/test/ui/issues/issue-28586.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for issue #28586 pub trait Foo {} diff --git a/src/test/ui/issues/issue-28586.stderr b/src/test/ui/issues/issue-28586.stderr index 9820d64909edd..52af2f54653f3 100644 --- a/src/test/ui/issues/issue-28586.stderr +++ b/src/test/ui/issues/issue-28586.stderr @@ -1,5 +1,5 @@ error[E0599]: no associated item named `BYTES` found for type `usize` in the current scope - --> $DIR/issue-28586.rs:14:19 + --> $DIR/issue-28586.rs:4:19 | LL | impl Foo for [u8; usize::BYTES] {} | ^^^^^^^^^^^^ associated item not found in `usize` diff --git a/src/test/ui/issues/issue-28625.rs b/src/test/ui/issues/issue-28625.rs index 273629a90fcc3..46cbb45e97bb6 100644 --- a/src/test/ui/issues/issue-28625.rs +++ b/src/test/ui/issues/issue-28625.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // normalize-stderr-test "\d+ bits" -> "N bits" trait Bar { diff --git a/src/test/ui/issues/issue-28625.stderr b/src/test/ui/issues/issue-28625.stderr index 22f8db4d3870f..ae383b44511bd 100644 --- a/src/test/ui/issues/issue-28625.stderr +++ b/src/test/ui/issues/issue-28625.stderr @@ -1,5 +1,5 @@ error[E0512]: transmute called with types of different sizes - --> $DIR/issue-28625.rs:22:14 + --> $DIR/issue-28625.rs:12:14 | LL | unsafe { std::mem::transmute(a) } //~ ERROR transmute called with types of different sizes | ^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-28776.rs b/src/test/ui/issues/issue-28776.rs index 196c4bd2728e7..e564ebcd110cb 100644 --- a/src/test/ui/issues/issue-28776.rs +++ b/src/test/ui/issues/issue-28776.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::ptr; fn main() { diff --git a/src/test/ui/issues/issue-28776.stderr b/src/test/ui/issues/issue-28776.stderr index aef0d9cd1d8c6..7faac88e26a23 100644 --- a/src/test/ui/issues/issue-28776.stderr +++ b/src/test/ui/issues/issue-28776.stderr @@ -1,5 +1,5 @@ error[E0133]: call to unsafe function is unsafe and requires unsafe function or block - --> $DIR/issue-28776.rs:14:5 + --> $DIR/issue-28776.rs:4:5 | LL | (&ptr::write)(1 as *mut _, 42); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ call to unsafe function diff --git a/src/test/ui/issues/issue-28837.rs b/src/test/ui/issues/issue-28837.rs index 91ea18a8c6cf7..114473f3acfec 100644 --- a/src/test/ui/issues/issue-28837.rs +++ b/src/test/ui/issues/issue-28837.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct A; fn main() { diff --git a/src/test/ui/issues/issue-28837.stderr b/src/test/ui/issues/issue-28837.stderr index 88994eaeb9376..833493e5cda5e 100644 --- a/src/test/ui/issues/issue-28837.stderr +++ b/src/test/ui/issues/issue-28837.stderr @@ -1,5 +1,5 @@ error[E0369]: binary operation `+` cannot be applied to type `A` - --> $DIR/issue-28837.rs:16:5 + --> $DIR/issue-28837.rs:6:5 | LL | a + a; //~ ERROR binary operation `+` cannot be applied to type `A` | ^^^^^ @@ -7,7 +7,7 @@ LL | a + a; //~ ERROR binary operation `+` cannot be applied to type `A` = note: an implementation of `std::ops::Add` might be missing for `A` error[E0369]: binary operation `-` cannot be applied to type `A` - --> $DIR/issue-28837.rs:18:5 + --> $DIR/issue-28837.rs:8:5 | LL | a - a; //~ ERROR binary operation `-` cannot be applied to type `A` | ^^^^^ @@ -15,7 +15,7 @@ LL | a - a; //~ ERROR binary operation `-` cannot be applied to type `A` = note: an implementation of `std::ops::Sub` might be missing for `A` error[E0369]: binary operation `*` cannot be applied to type `A` - --> $DIR/issue-28837.rs:20:5 + --> $DIR/issue-28837.rs:10:5 | LL | a * a; //~ ERROR binary operation `*` cannot be applied to type `A` | ^^^^^ @@ -23,7 +23,7 @@ LL | a * a; //~ ERROR binary operation `*` cannot be applied to type `A` = note: an implementation of `std::ops::Mul` might be missing for `A` error[E0369]: binary operation `/` cannot be applied to type `A` - --> $DIR/issue-28837.rs:22:5 + --> $DIR/issue-28837.rs:12:5 | LL | a / a; //~ ERROR binary operation `/` cannot be applied to type `A` | ^^^^^ @@ -31,7 +31,7 @@ LL | a / a; //~ ERROR binary operation `/` cannot be applied to type `A` = note: an implementation of `std::ops::Div` might be missing for `A` error[E0369]: binary operation `%` cannot be applied to type `A` - --> $DIR/issue-28837.rs:24:5 + --> $DIR/issue-28837.rs:14:5 | LL | a % a; //~ ERROR binary operation `%` cannot be applied to type `A` | ^^^^^ @@ -39,7 +39,7 @@ LL | a % a; //~ ERROR binary operation `%` cannot be applied to type `A` = note: an implementation of `std::ops::Rem` might be missing for `A` error[E0369]: binary operation `&` cannot be applied to type `A` - --> $DIR/issue-28837.rs:26:5 + --> $DIR/issue-28837.rs:16:5 | LL | a & a; //~ ERROR binary operation `&` cannot be applied to type `A` | ^^^^^ @@ -47,7 +47,7 @@ LL | a & a; //~ ERROR binary operation `&` cannot be applied to type `A` = note: an implementation of `std::ops::BitAnd` might be missing for `A` error[E0369]: binary operation `|` cannot be applied to type `A` - --> $DIR/issue-28837.rs:28:5 + --> $DIR/issue-28837.rs:18:5 | LL | a | a; //~ ERROR binary operation `|` cannot be applied to type `A` | ^^^^^ @@ -55,7 +55,7 @@ LL | a | a; //~ ERROR binary operation `|` cannot be applied to type `A` = note: an implementation of `std::ops::BitOr` might be missing for `A` error[E0369]: binary operation `<<` cannot be applied to type `A` - --> $DIR/issue-28837.rs:30:5 + --> $DIR/issue-28837.rs:20:5 | LL | a << a; //~ ERROR binary operation `<<` cannot be applied to type `A` | ^^^^^^ @@ -63,7 +63,7 @@ LL | a << a; //~ ERROR binary operation `<<` cannot be applied to type `A` = note: an implementation of `std::ops::Shl` might be missing for `A` error[E0369]: binary operation `>>` cannot be applied to type `A` - --> $DIR/issue-28837.rs:32:5 + --> $DIR/issue-28837.rs:22:5 | LL | a >> a; //~ ERROR binary operation `>>` cannot be applied to type `A` | ^^^^^^ @@ -71,7 +71,7 @@ LL | a >> a; //~ ERROR binary operation `>>` cannot be applied to type `A` = note: an implementation of `std::ops::Shr` might be missing for `A` error[E0369]: binary operation `==` cannot be applied to type `A` - --> $DIR/issue-28837.rs:34:5 + --> $DIR/issue-28837.rs:24:5 | LL | a == a; //~ ERROR binary operation `==` cannot be applied to type `A` | ^^^^^^ @@ -79,7 +79,7 @@ LL | a == a; //~ ERROR binary operation `==` cannot be applied to type `A` = note: an implementation of `std::cmp::PartialEq` might be missing for `A` error[E0369]: binary operation `!=` cannot be applied to type `A` - --> $DIR/issue-28837.rs:36:5 + --> $DIR/issue-28837.rs:26:5 | LL | a != a; //~ ERROR binary operation `!=` cannot be applied to type `A` | ^^^^^^ @@ -87,7 +87,7 @@ LL | a != a; //~ ERROR binary operation `!=` cannot be applied to type `A` = note: an implementation of `std::cmp::PartialEq` might be missing for `A` error[E0369]: binary operation `<` cannot be applied to type `A` - --> $DIR/issue-28837.rs:38:5 + --> $DIR/issue-28837.rs:28:5 | LL | a < a; //~ ERROR binary operation `<` cannot be applied to type `A` | ^^^^^ @@ -95,7 +95,7 @@ LL | a < a; //~ ERROR binary operation `<` cannot be applied to type `A` = note: an implementation of `std::cmp::PartialOrd` might be missing for `A` error[E0369]: binary operation `<=` cannot be applied to type `A` - --> $DIR/issue-28837.rs:40:5 + --> $DIR/issue-28837.rs:30:5 | LL | a <= a; //~ ERROR binary operation `<=` cannot be applied to type `A` | ^^^^^^ @@ -103,7 +103,7 @@ LL | a <= a; //~ ERROR binary operation `<=` cannot be applied to type `A` = note: an implementation of `std::cmp::PartialOrd` might be missing for `A` error[E0369]: binary operation `>` cannot be applied to type `A` - --> $DIR/issue-28837.rs:42:5 + --> $DIR/issue-28837.rs:32:5 | LL | a > a; //~ ERROR binary operation `>` cannot be applied to type `A` | ^^^^^ @@ -111,7 +111,7 @@ LL | a > a; //~ ERROR binary operation `>` cannot be applied to type `A` = note: an implementation of `std::cmp::PartialOrd` might be missing for `A` error[E0369]: binary operation `>=` cannot be applied to type `A` - --> $DIR/issue-28837.rs:44:5 + --> $DIR/issue-28837.rs:34:5 | LL | a >= a; //~ ERROR binary operation `>=` cannot be applied to type `A` | ^^^^^^ diff --git a/src/test/ui/issues/issue-28848.rs b/src/test/ui/issues/issue-28848.rs index c13fd5fa71669..f949c5f54b391 100644 --- a/src/test/ui/issues/issue-28848.rs +++ b/src/test/ui/issues/issue-28848.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // ignore-compare-mode-nll struct Foo<'a, 'b: 'a>(&'a &'b ()); diff --git a/src/test/ui/issues/issue-28848.stderr b/src/test/ui/issues/issue-28848.stderr index dadcff226f53b..42df7d82d7b4a 100644 --- a/src/test/ui/issues/issue-28848.stderr +++ b/src/test/ui/issues/issue-28848.stderr @@ -1,16 +1,16 @@ error[E0478]: lifetime bound not satisfied - --> $DIR/issue-28848.rs:22:5 + --> $DIR/issue-28848.rs:12:5 | LL | Foo::<'a, 'b>::xmute(u) //~ ERROR lifetime bound not satisfied | ^^^^^^^^^^^^^^^^^^^^ | -note: lifetime parameter instantiated with the lifetime 'b as defined on the function body at 21:16 - --> $DIR/issue-28848.rs:21:16 +note: lifetime parameter instantiated with the lifetime 'b as defined on the function body at 11:16 + --> $DIR/issue-28848.rs:11:16 | LL | pub fn foo<'a, 'b>(u: &'b ()) -> &'a () { | ^^ -note: but lifetime parameter must outlive the lifetime 'a as defined on the function body at 21:12 - --> $DIR/issue-28848.rs:21:12 +note: but lifetime parameter must outlive the lifetime 'a as defined on the function body at 11:12 + --> $DIR/issue-28848.rs:11:12 | LL | pub fn foo<'a, 'b>(u: &'b ()) -> &'a () { | ^^ diff --git a/src/test/ui/issues/issue-28971.rs b/src/test/ui/issues/issue-28971.rs index e553fee5a62f9..3f0d2fafb0478 100644 --- a/src/test/ui/issues/issue-28971.rs +++ b/src/test/ui/issues/issue-28971.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This should not cause an ICE enum Foo { diff --git a/src/test/ui/issues/issue-28971.stderr b/src/test/ui/issues/issue-28971.stderr index c04e21f7c5857..f6362faab12b8 100644 --- a/src/test/ui/issues/issue-28971.stderr +++ b/src/test/ui/issues/issue-28971.stderr @@ -1,5 +1,5 @@ error[E0599]: no variant named `Baz` found for type `Foo` in the current scope - --> $DIR/issue-28971.rs:19:13 + --> $DIR/issue-28971.rs:9:13 | LL | enum Foo { | -------- variant `Baz` not found here diff --git a/src/test/ui/issues/issue-28992-empty.rs b/src/test/ui/issues/issue-28992-empty.rs index 536784508b77b..22961fc61d134 100644 --- a/src/test/ui/issues/issue-28992-empty.rs +++ b/src/test/ui/issues/issue-28992-empty.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Can't use constants as tuple struct patterns diff --git a/src/test/ui/issues/issue-28992-empty.stderr b/src/test/ui/issues/issue-28992-empty.stderr index 9b5e42f8eb902..1eb1c67d106cf 100644 --- a/src/test/ui/issues/issue-28992-empty.stderr +++ b/src/test/ui/issues/issue-28992-empty.stderr @@ -1,11 +1,11 @@ error[E0532]: expected tuple struct/variant, found constant `C1` - --> $DIR/issue-28992-empty.rs:23:12 + --> $DIR/issue-28992-empty.rs:13:12 | LL | if let C1(..) = 0 {} //~ ERROR expected tuple struct/variant, found constant `C1` | ^^ not a tuple struct/variant error[E0164]: expected tuple struct/variant, found associated constant `::C2` - --> $DIR/issue-28992-empty.rs:24:12 + --> $DIR/issue-28992-empty.rs:14:12 | LL | if let S::C2(..) = 0 {} | ^^^^^^^^^ not a tuple variant or struct diff --git a/src/test/ui/issues/issue-29084.rs b/src/test/ui/issues/issue-29084.rs index 6cb6bbf1893fc..86b348d828597 100644 --- a/src/test/ui/issues/issue-29084.rs +++ b/src/test/ui/issues/issue-29084.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! foo { ($d:expr) => {{ fn bar(d: u8) { } diff --git a/src/test/ui/issues/issue-29084.stderr b/src/test/ui/issues/issue-29084.stderr index 3f1f18dabd061..cb4bf6a08ef86 100644 --- a/src/test/ui/issues/issue-29084.stderr +++ b/src/test/ui/issues/issue-29084.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-29084.rs:14:13 + --> $DIR/issue-29084.rs:4:13 | LL | bar(&mut $d); | ^^^^^^^ expected u8, found &mut u8 diff --git a/src/test/ui/issues/issue-29124.rs b/src/test/ui/issues/issue-29124.rs index 77fa8192b97b5..73ca345e41f23 100644 --- a/src/test/ui/issues/issue-29124.rs +++ b/src/test/ui/issues/issue-29124.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct ret; struct obj; diff --git a/src/test/ui/issues/issue-29124.stderr b/src/test/ui/issues/issue-29124.stderr index bd00772dfd287..df715c29cd435 100644 --- a/src/test/ui/issues/issue-29124.stderr +++ b/src/test/ui/issues/issue-29124.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `x` found for type `fn() -> ret {obj::func}` in the current scope - --> $DIR/issue-29124.rs:25:15 + --> $DIR/issue-29124.rs:15:15 | LL | obj::func.x(); | ^ @@ -7,7 +7,7 @@ LL | obj::func.x(); = note: obj::func is a function, perhaps you wish to call it error[E0599]: no method named `x` found for type `fn() -> ret {func}` in the current scope - --> $DIR/issue-29124.rs:27:10 + --> $DIR/issue-29124.rs:17:10 | LL | func.x(); | ^ diff --git a/src/test/ui/issues/issue-29147.rs b/src/test/ui/issues/issue-29147.rs index 0ecaa409412a6..7ec96b97eef07 100644 --- a/src/test/ui/issues/issue-29147.rs +++ b/src/test/ui/issues/issue-29147.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![recursion_limit="1024"] pub struct S0(T,T); diff --git a/src/test/ui/issues/issue-29147.stderr b/src/test/ui/issues/issue-29147.stderr index d0ad0c99aa097..c6d850925ec64 100644 --- a/src/test/ui/issues/issue-29147.stderr +++ b/src/test/ui/issues/issue-29147.stderr @@ -1,11 +1,11 @@ error[E0283]: type annotations required: cannot resolve `S5<_>: Foo` - --> $DIR/issue-29147.rs:31:13 + --> $DIR/issue-29147.rs:21:13 | LL | let _ = >::xxx; //~ ERROR cannot resolve `S5<_>: Foo` | ^^^^^^^^^^^^ | note: required by `Foo::xxx` - --> $DIR/issue-29147.rs:20:13 + --> $DIR/issue-29147.rs:10:13 | LL | trait Foo { fn xxx(&self); } | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-29161.rs b/src/test/ui/issues/issue-29161.rs index 97ba222fe45f0..d80405aa85624 100644 --- a/src/test/ui/issues/issue-29161.rs +++ b/src/test/ui/issues/issue-29161.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod a { struct A; diff --git a/src/test/ui/issues/issue-29161.stderr b/src/test/ui/issues/issue-29161.stderr index fb6a41d2eca09..cd8874593c9bf 100644 --- a/src/test/ui/issues/issue-29161.stderr +++ b/src/test/ui/issues/issue-29161.stderr @@ -1,11 +1,11 @@ error[E0449]: unnecessary visibility qualifier - --> $DIR/issue-29161.rs:15:9 + --> $DIR/issue-29161.rs:5:9 | LL | pub fn default() -> A { //~ ERROR unnecessary visibility qualifier | ^^^ `pub` not permitted here because it's implied error[E0603]: struct `A` is private - --> $DIR/issue-29161.rs:23:5 + --> $DIR/issue-29161.rs:13:5 | LL | a::A::default(); | ^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-29181.rs b/src/test/ui/issues/issue-29181.rs index 2fcec51912e45..45752ad4f62b6 100644 --- a/src/test/ui/issues/issue-29181.rs +++ b/src/test/ui/issues/issue-29181.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-29181.rs extern crate issue_29181 as foo; diff --git a/src/test/ui/issues/issue-29181.stderr b/src/test/ui/issues/issue-29181.stderr index 5dda78489266b..b277753608a16 100644 --- a/src/test/ui/issues/issue-29181.stderr +++ b/src/test/ui/issues/issue-29181.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `homura` found for type `{integer}` in the current scope - --> $DIR/issue-29181.rs:16:7 + --> $DIR/issue-29181.rs:6:7 | LL | 0.homura(); //~ ERROR no method named `homura` found | ^^^^^^ diff --git a/src/test/ui/issues/issue-29184.rs b/src/test/ui/issues/issue-29184.rs index 98fe12c1b9d16..c77e364c3b83c 100644 --- a/src/test/ui/issues/issue-29184.rs +++ b/src/test/ui/issues/issue-29184.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let x: typeof(92) = 92; //~ ERROR `typeof` is a reserved keyword } diff --git a/src/test/ui/issues/issue-29184.stderr b/src/test/ui/issues/issue-29184.stderr index 72d7bb8d5f64b..6c1eeb9c0dc81 100644 --- a/src/test/ui/issues/issue-29184.stderr +++ b/src/test/ui/issues/issue-29184.stderr @@ -1,5 +1,5 @@ error[E0516]: `typeof` is a reserved keyword but unimplemented - --> $DIR/issue-29184.rs:12:12 + --> $DIR/issue-29184.rs:2:12 | LL | let x: typeof(92) = 92; //~ ERROR `typeof` is a reserved keyword | ^^^^^^^^^^ reserved keyword diff --git a/src/test/ui/issues/issue-2937.rs b/src/test/ui/issues/issue-2937.rs index 0d684ec5ae19b..335df5c07e256 100644 --- a/src/test/ui/issues/issue-2937.rs +++ b/src/test/ui/issues/issue-2937.rs @@ -1,13 +1,3 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use m::f as x; //~ ERROR unresolved import `m::f` [E0432] //~^ no `f` in `m` diff --git a/src/test/ui/issues/issue-2937.stderr b/src/test/ui/issues/issue-2937.stderr index 8c0125c7522d2..e63ee42d99c0a 100644 --- a/src/test/ui/issues/issue-2937.stderr +++ b/src/test/ui/issues/issue-2937.stderr @@ -1,5 +1,5 @@ error[E0432]: unresolved import `m::f` - --> $DIR/issue-2937.rs:11:5 + --> $DIR/issue-2937.rs:1:5 | LL | use m::f as x; //~ ERROR unresolved import `m::f` [E0432] | ^^^^^^^^^ no `f` in `m` diff --git a/src/test/ui/issues/issue-2951.rs b/src/test/ui/issues/issue-2951.rs index 11ff7ab2476b9..e0ae3ffa6240d 100644 --- a/src/test/ui/issues/issue-2951.rs +++ b/src/test/ui/issues/issue-2951.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo(x: T, y: U) { let mut xx = x; xx = y; diff --git a/src/test/ui/issues/issue-2951.stderr b/src/test/ui/issues/issue-2951.stderr index 8c166807c46ad..58e28c1a9dc83 100644 --- a/src/test/ui/issues/issue-2951.stderr +++ b/src/test/ui/issues/issue-2951.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-2951.rs:13:10 + --> $DIR/issue-2951.rs:3:10 | LL | xx = y; | ^ expected type parameter, found a different type parameter diff --git a/src/test/ui/issues/issue-29723.rs b/src/test/ui/issues/issue-29723.rs index f31e965ae01c7..41db52a1fadac 100644 --- a/src/test/ui/issues/issue-29723.rs +++ b/src/test/ui/issues/issue-29723.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(nll)] // test for https://github.com/rust-lang/rust/issues/29723 diff --git a/src/test/ui/issues/issue-29723.stderr b/src/test/ui/issues/issue-29723.stderr index 48e50b9dea9c1..de858aec881f7 100644 --- a/src/test/ui/issues/issue-29723.stderr +++ b/src/test/ui/issues/issue-29723.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `s` - --> $DIR/issue-29723.rs:22:13 + --> $DIR/issue-29723.rs:12:13 | LL | 0 if { drop(s); false } => String::from("oops"), | - value moved here diff --git a/src/test/ui/issues/issue-29857.rs b/src/test/ui/issues/issue-29857.rs index 661579f52b684..99ba0945e68fa 100644 --- a/src/test/ui/issues/issue-29857.rs +++ b/src/test/ui/issues/issue-29857.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - #![feature(rustc_attrs)] use std::marker::PhantomData; diff --git a/src/test/ui/issues/issue-29857.stderr b/src/test/ui/issues/issue-29857.stderr index d5ba942b19f26..6a919f0f54036 100644 --- a/src/test/ui/issues/issue-29857.stderr +++ b/src/test/ui/issues/issue-29857.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-29857.rs:31:1 + --> $DIR/issue-29857.rs:20:1 | LL | fn main() {} //~ ERROR compilation successful | ^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-29861.rs b/src/test/ui/issues/issue-29861.rs index 79514ad376b3b..58f8eb5362c2e 100644 --- a/src/test/ui/issues/issue-29861.rs +++ b/src/test/ui/issues/issue-29861.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait MakeRef<'a> { type Ref; } diff --git a/src/test/ui/issues/issue-29861.stderr b/src/test/ui/issues/issue-29861.stderr index 27453337b10f1..d9d3cf360df2d 100644 --- a/src/test/ui/issues/issue-29861.stderr +++ b/src/test/ui/issues/issue-29861.stderr @@ -1,5 +1,5 @@ error[E0207]: the lifetime parameter `'a` is not constrained by the impl trait, self type, or predicates - --> $DIR/issue-29861.rs:21:6 + --> $DIR/issue-29861.rs:11:6 | LL | impl<'a, T: 'a> MakeRef2 for T { | ^^ unconstrained lifetime parameter diff --git a/src/test/ui/issues/issue-2995.rs b/src/test/ui/issues/issue-2995.rs index d735e184d5cd5..0da7909480d20 100644 --- a/src/test/ui/issues/issue-2995.rs +++ b/src/test/ui/issues/issue-2995.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn bad (p: *const isize) { let _q: &isize = p as &isize; //~ ERROR non-primitive cast } diff --git a/src/test/ui/issues/issue-2995.stderr b/src/test/ui/issues/issue-2995.stderr index b52bbbead9163..68cb283e453d5 100644 --- a/src/test/ui/issues/issue-2995.stderr +++ b/src/test/ui/issues/issue-2995.stderr @@ -1,5 +1,5 @@ error[E0605]: non-primitive cast: `*const isize` as `&isize` - --> $DIR/issue-2995.rs:12:22 + --> $DIR/issue-2995.rs:2:22 | LL | let _q: &isize = p as &isize; //~ ERROR non-primitive cast | ^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-30007.rs b/src/test/ui/issues/issue-30007.rs index c17833ee83070..918a821bae925 100644 --- a/src/test/ui/issues/issue-30007.rs +++ b/src/test/ui/issues/issue-30007.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! t { () => ( String ; ); //~ ERROR macro expansion ignores token `;` } diff --git a/src/test/ui/issues/issue-30007.stderr b/src/test/ui/issues/issue-30007.stderr index a467ff6dd0a1a..47da6c49a6b20 100644 --- a/src/test/ui/issues/issue-30007.stderr +++ b/src/test/ui/issues/issue-30007.stderr @@ -1,11 +1,11 @@ error: macro expansion ignores token `;` and any following - --> $DIR/issue-30007.rs:12:20 + --> $DIR/issue-30007.rs:2:20 | LL | () => ( String ; ); //~ ERROR macro expansion ignores token `;` | ^ | note: caused by the macro expansion here; the usage of `t!` is likely invalid in type context - --> $DIR/issue-30007.rs:16:16 + --> $DIR/issue-30007.rs:6:16 | LL | let i: Vec; | ^^^^ diff --git a/src/test/ui/issues/issue-30079.rs b/src/test/ui/issues/issue-30079.rs index 04ae8f6d255d0..a02a932d0570a 100644 --- a/src/test/ui/issues/issue-30079.rs +++ b/src/test/ui/issues/issue-30079.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct SemiPriv; mod m1 { diff --git a/src/test/ui/issues/issue-30079.stderr b/src/test/ui/issues/issue-30079.stderr index dadaf3db24e05..b62482add304a 100644 --- a/src/test/ui/issues/issue-30079.stderr +++ b/src/test/ui/issues/issue-30079.stderr @@ -1,5 +1,5 @@ warning: private type `m1::Priv` in public interface (error E0446) - --> $DIR/issue-30079.rs:16:9 + --> $DIR/issue-30079.rs:6:9 | LL | pub fn f(_: Priv) {} //~ WARN private type `m1::Priv` in public interface | ^^^^^^^^^^^^^^^^^^^^ @@ -9,7 +9,7 @@ LL | pub fn f(_: Priv) {} //~ WARN private type `m1::Priv` in public int = note: for more information, see issue #34537 error[E0446]: private type `m2::Priv` in public interface - --> $DIR/issue-30079.rs:28:9 + --> $DIR/issue-30079.rs:18:9 | LL | struct Priv; | - `m2::Priv` declared as private @@ -18,7 +18,7 @@ LL | type Target = Priv; //~ ERROR private type `m2::Priv` in public int | ^^^^^^^^^^^^^^^^^^^ can't leak private type error[E0446]: private type `m3::Priv` in public interface - --> $DIR/issue-30079.rs:45:9 + --> $DIR/issue-30079.rs:35:9 | LL | struct Priv; | - `m3::Priv` declared as private diff --git a/src/test/ui/issues/issue-3008-1.rs b/src/test/ui/issues/issue-3008-1.rs index 89de27326b48a..1124969e6d0a4 100644 --- a/src/test/ui/issues/issue-3008-1.rs +++ b/src/test/ui/issues/issue-3008-1.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Foo { Foo_(Bar) } diff --git a/src/test/ui/issues/issue-3008-1.stderr b/src/test/ui/issues/issue-3008-1.stderr index fe3e294d9e32a..f12274134ee05 100644 --- a/src/test/ui/issues/issue-3008-1.stderr +++ b/src/test/ui/issues/issue-3008-1.stderr @@ -1,5 +1,5 @@ error[E0072]: recursive type `Bar` has infinite size - --> $DIR/issue-3008-1.rs:15:1 + --> $DIR/issue-3008-1.rs:5:1 | LL | enum Bar { | ^^^^^^^^ recursive type has infinite size diff --git a/src/test/ui/issues/issue-3008-2.rs b/src/test/ui/issues/issue-3008-2.rs index b627656c91a74..5672eef20161e 100644 --- a/src/test/ui/issues/issue-3008-2.rs +++ b/src/test/ui/issues/issue-3008-2.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum foo { foo_(bar) } struct bar { x: bar } //~^ ERROR E0072 diff --git a/src/test/ui/issues/issue-3008-2.stderr b/src/test/ui/issues/issue-3008-2.stderr index d02fb45be4967..66c7e7f0e5979 100644 --- a/src/test/ui/issues/issue-3008-2.stderr +++ b/src/test/ui/issues/issue-3008-2.stderr @@ -1,5 +1,5 @@ error[E0072]: recursive type `bar` has infinite size - --> $DIR/issue-3008-2.rs:12:1 + --> $DIR/issue-3008-2.rs:2:1 | LL | struct bar { x: bar } | ^^^^^^^^^^ ------ recursive without indirection diff --git a/src/test/ui/issues/issue-3008-3.rs b/src/test/ui/issues/issue-3008-3.rs index 66bfab003e9cf..212eb2eb8e06f 100644 --- a/src/test/ui/issues/issue-3008-3.rs +++ b/src/test/ui/issues/issue-3008-3.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::marker; enum E1 { V1(E2), } diff --git a/src/test/ui/issues/issue-3008-3.stderr b/src/test/ui/issues/issue-3008-3.stderr index 22c0871fb0ca3..d08a3d9708db3 100644 --- a/src/test/ui/issues/issue-3008-3.stderr +++ b/src/test/ui/issues/issue-3008-3.stderr @@ -1,5 +1,5 @@ error[E0072]: recursive type `E2` has infinite size - --> $DIR/issue-3008-3.rs:14:1 + --> $DIR/issue-3008-3.rs:4:1 | LL | enum E2 { V2(E2, marker::PhantomData), } | ^^^^^^^^^^ ------ recursive without indirection diff --git a/src/test/ui/issues/issue-30123.rs b/src/test/ui/issues/issue-30123.rs index 653097ad69f72..141d195d9ba77 100644 --- a/src/test/ui/issues/issue-30123.rs +++ b/src/test/ui/issues/issue-30123.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue_30123_aux.rs extern crate issue_30123_aux; diff --git a/src/test/ui/issues/issue-30123.stderr b/src/test/ui/issues/issue-30123.stderr index 094c962de29ec..9729b13d57fe8 100644 --- a/src/test/ui/issues/issue-30123.stderr +++ b/src/test/ui/issues/issue-30123.stderr @@ -1,5 +1,5 @@ error[E0599]: no function or associated item named `new_undirected` found for type `issue_30123_aux::Graph` in the current scope - --> $DIR/issue-30123.rs:17:14 + --> $DIR/issue-30123.rs:7:14 | LL | let ug = Graph::::new_undirected(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ function or associated item not found in `issue_30123_aux::Graph` diff --git a/src/test/ui/issues/issue-3021-b.rs b/src/test/ui/issues/issue-3021-b.rs index 2b0a24cfdb35f..62a1e5a85cc4c 100644 --- a/src/test/ui/issues/issue-3021-b.rs +++ b/src/test/ui/issues/issue-3021-b.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn siphash(k0 : u64) { struct siphash { diff --git a/src/test/ui/issues/issue-3021-b.stderr b/src/test/ui/issues/issue-3021-b.stderr index dfc80e5ca529e..375da43c1973e 100644 --- a/src/test/ui/issues/issue-3021-b.stderr +++ b/src/test/ui/issues/issue-3021-b.stderr @@ -1,5 +1,5 @@ error[E0434]: can't capture dynamic environment in a fn item - --> $DIR/issue-3021-b.rs:19:22 + --> $DIR/issue-3021-b.rs:9:22 | LL | self.v0 = k0 ^ 0x736f6d6570736575; //~ ERROR can't capture dynamic environment | ^^ diff --git a/src/test/ui/issues/issue-3021-c.rs b/src/test/ui/issues/issue-3021-c.rs index 55975cc8e8645..69da08db89b70 100644 --- a/src/test/ui/issues/issue-3021-c.rs +++ b/src/test/ui/issues/issue-3021-c.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn siphash() { trait t { diff --git a/src/test/ui/issues/issue-3021-c.stderr b/src/test/ui/issues/issue-3021-c.stderr index 4a250e76af3be..323ce4fa30613 100644 --- a/src/test/ui/issues/issue-3021-c.stderr +++ b/src/test/ui/issues/issue-3021-c.stderr @@ -1,5 +1,5 @@ error[E0401]: can't use type parameters from outer function - --> $DIR/issue-3021-c.rs:14:24 + --> $DIR/issue-3021-c.rs:4:24 | LL | fn siphash() { | - type variable from outer function @@ -10,7 +10,7 @@ LL | fn g(&self, x: T) -> T; //~ ERROR can't use type parameters from o | help: try using a local type parameter instead: `g` error[E0401]: can't use type parameters from outer function - --> $DIR/issue-3021-c.rs:14:30 + --> $DIR/issue-3021-c.rs:4:30 | LL | fn siphash() { | - type variable from outer function diff --git a/src/test/ui/issues/issue-3021-d.rs b/src/test/ui/issues/issue-3021-d.rs index c23e12e713aad..f1e1ccc1ee8e0 100644 --- a/src/test/ui/issues/issue-3021-d.rs +++ b/src/test/ui/issues/issue-3021-d.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait siphash { fn result(&self) -> u64; fn reset(&self); diff --git a/src/test/ui/issues/issue-3021-d.stderr b/src/test/ui/issues/issue-3021-d.stderr index ab5ad94a03104..ffefab19725fb 100644 --- a/src/test/ui/issues/issue-3021-d.stderr +++ b/src/test/ui/issues/issue-3021-d.stderr @@ -1,5 +1,5 @@ error[E0434]: can't capture dynamic environment in a fn item - --> $DIR/issue-3021-d.rs:31:23 + --> $DIR/issue-3021-d.rs:21:23 | LL | self.v0 = k0 ^ 0x736f6d6570736575; //~ ERROR can't capture dynamic environment | ^^ @@ -7,7 +7,7 @@ LL | self.v0 = k0 ^ 0x736f6d6570736575; //~ ERROR can't capture dyna = help: use the `|| { ... }` closure form instead error[E0434]: can't capture dynamic environment in a fn item - --> $DIR/issue-3021-d.rs:32:23 + --> $DIR/issue-3021-d.rs:22:23 | LL | self.v1 = k1 ^ 0x646f72616e646f6d; //~ ERROR can't capture dynamic environment | ^^ diff --git a/src/test/ui/issues/issue-3021.rs b/src/test/ui/issues/issue-3021.rs index f93a333d2aea7..a672261f8d681 100644 --- a/src/test/ui/issues/issue-3021.rs +++ b/src/test/ui/issues/issue-3021.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait SipHash { fn reset(&self); } diff --git a/src/test/ui/issues/issue-3021.stderr b/src/test/ui/issues/issue-3021.stderr index 312b9f3b864f3..38c5bd2b94af7 100644 --- a/src/test/ui/issues/issue-3021.stderr +++ b/src/test/ui/issues/issue-3021.stderr @@ -1,5 +1,5 @@ error[E0434]: can't capture dynamic environment in a fn item - --> $DIR/issue-3021.rs:22:22 + --> $DIR/issue-3021.rs:12:22 | LL | self.v0 = k0 ^ 0x736f6d6570736575; //~ ERROR can't capture dynamic environment | ^^ diff --git a/src/test/ui/issues/issue-30225.rs b/src/test/ui/issues/issue-30225.rs index 7acbbfb8826df..42315332c20c5 100644 --- a/src/test/ui/issues/issue-30225.rs +++ b/src/test/ui/issues/issue-30225.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #30225, which was an ICE that would trigger as // a result of a poor interaction between trait result caching and // type inference. Specifically, at that time, unification could cause diff --git a/src/test/ui/issues/issue-30225.stderr b/src/test/ui/issues/issue-30225.stderr index b3bbf233257d5..64a56e3237dc3 100644 --- a/src/test/ui/issues/issue-30225.stderr +++ b/src/test/ui/issues/issue-30225.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-30225.rs:41:9 + --> $DIR/issue-30225.rs:31:9 | LL | u = v; // mark $0 and $1 in a subtype relationship | ^ expected struct `A`, found struct `B` diff --git a/src/test/ui/issues/issue-30236.rs b/src/test/ui/issues/issue-30236.rs index 45a5cd093379f..02f899be09ca1 100644 --- a/src/test/ui/issues/issue-30236.rs +++ b/src/test/ui/issues/issue-30236.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - type Foo< Unused //~ ERROR type parameter `Unused` is unused > = u8; diff --git a/src/test/ui/issues/issue-30236.stderr b/src/test/ui/issues/issue-30236.stderr index 3a9f075d4808a..e60babd9559e2 100644 --- a/src/test/ui/issues/issue-30236.stderr +++ b/src/test/ui/issues/issue-30236.stderr @@ -1,5 +1,5 @@ error[E0091]: type parameter `Unused` is unused - --> $DIR/issue-30236.rs:12:5 + --> $DIR/issue-30236.rs:2:5 | LL | Unused //~ ERROR type parameter `Unused` is unused | ^^^^^^ unused type parameter diff --git a/src/test/ui/issues/issue-30240-b.rs b/src/test/ui/issues/issue-30240-b.rs index cf6935b9ba6d4..2df06842e1818 100644 --- a/src/test/ui/issues/issue-30240-b.rs +++ b/src/test/ui/issues/issue-30240-b.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![deny(unreachable_patterns)] fn main() { diff --git a/src/test/ui/issues/issue-30240-b.stderr b/src/test/ui/issues/issue-30240-b.stderr index 535d1a92ed91e..5613a18f404a0 100644 --- a/src/test/ui/issues/issue-30240-b.stderr +++ b/src/test/ui/issues/issue-30240-b.stderr @@ -1,11 +1,11 @@ error: unreachable pattern - --> $DIR/issue-30240-b.rs:22:9 + --> $DIR/issue-30240-b.rs:12:9 | LL | "hello" => {} //~ ERROR unreachable pattern | ^^^^^^^ | note: lint level defined here - --> $DIR/issue-30240-b.rs:11:9 + --> $DIR/issue-30240-b.rs:1:9 | LL | #![deny(unreachable_patterns)] | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-30240.rs b/src/test/ui/issues/issue-30240.rs index 60fb307d4e1a4..a0c0d1626ec45 100644 --- a/src/test/ui/issues/issue-30240.rs +++ b/src/test/ui/issues/issue-30240.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { match "world" { //~ ERROR non-exhaustive patterns: `&_` "hello" => {} diff --git a/src/test/ui/issues/issue-30240.stderr b/src/test/ui/issues/issue-30240.stderr index 9acb53ff911c7..973c59c58526b 100644 --- a/src/test/ui/issues/issue-30240.stderr +++ b/src/test/ui/issues/issue-30240.stderr @@ -1,11 +1,11 @@ error[E0004]: non-exhaustive patterns: `&_` not covered - --> $DIR/issue-30240.rs:12:11 + --> $DIR/issue-30240.rs:2:11 | LL | match "world" { //~ ERROR non-exhaustive patterns: `&_` | ^^^^^^^ pattern `&_` not covered error[E0004]: non-exhaustive patterns: `&_` not covered - --> $DIR/issue-30240.rs:16:11 + --> $DIR/issue-30240.rs:6:11 | LL | match "world" { //~ ERROR non-exhaustive patterns: `&_` | ^^^^^^^ pattern `&_` not covered diff --git a/src/test/ui/issues/issue-30255.rs b/src/test/ui/issues/issue-30255.rs index 64f70ef2b6fdc..6970a122b7144 100644 --- a/src/test/ui/issues/issue-30255.rs +++ b/src/test/ui/issues/issue-30255.rs @@ -1,12 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. // // Test that lifetime elision error messages correctly omit parameters // with no elided lifetimes diff --git a/src/test/ui/issues/issue-30255.stderr b/src/test/ui/issues/issue-30255.stderr index 9556f6d9e2307..c53129b7f2967 100644 --- a/src/test/ui/issues/issue-30255.stderr +++ b/src/test/ui/issues/issue-30255.stderr @@ -1,5 +1,5 @@ error[E0106]: missing lifetime specifier - --> $DIR/issue-30255.rs:18:24 + --> $DIR/issue-30255.rs:9:24 | LL | fn f(a: &S, b: i32) -> &i32 { | ^ expected lifetime parameter @@ -7,7 +7,7 @@ LL | fn f(a: &S, b: i32) -> &i32 { = help: this function's return type contains a borrowed value, but the signature does not say which one of `a`'s 2 lifetimes it is borrowed from error[E0106]: missing lifetime specifier - --> $DIR/issue-30255.rs:23:34 + --> $DIR/issue-30255.rs:14:34 | LL | fn g(a: &S, b: bool, c: &i32) -> &i32 { | ^ expected lifetime parameter @@ -15,7 +15,7 @@ LL | fn g(a: &S, b: bool, c: &i32) -> &i32 { = help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from one of `a`'s 2 lifetimes or `c` error[E0106]: missing lifetime specifier - --> $DIR/issue-30255.rs:28:44 + --> $DIR/issue-30255.rs:19:44 | LL | fn h(a: &bool, b: bool, c: &S, d: &i32) -> &i32 { | ^ expected lifetime parameter diff --git a/src/test/ui/issues/issue-30302.rs b/src/test/ui/issues/issue-30302.rs index 51c76713a766d..c37d4f29d10e3 100644 --- a/src/test/ui/issues/issue-30302.rs +++ b/src/test/ui/issues/issue-30302.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] #![allow(unused_variables)] #![allow(non_snake_case)] diff --git a/src/test/ui/issues/issue-30302.stderr b/src/test/ui/issues/issue-30302.stderr index fa3cb92b180e0..193a8c4916c66 100644 --- a/src/test/ui/issues/issue-30302.stderr +++ b/src/test/ui/issues/issue-30302.stderr @@ -1,11 +1,11 @@ warning[E0170]: pattern binding `Nil` is named the same as one of the variants of the type `Stack` - --> $DIR/issue-30302.rs:23:9 + --> $DIR/issue-30302.rs:13:9 | LL | Nil => true, | ^^^ help: to match on the variant, qualify the path: `Stack::Nil` error: unreachable pattern - --> $DIR/issue-30302.rs:25:9 + --> $DIR/issue-30302.rs:15:9 | LL | Nil => true, | --- matches any value @@ -14,7 +14,7 @@ LL | _ => false | ^ unreachable pattern | note: lint level defined here - --> $DIR/issue-30302.rs:14:9 + --> $DIR/issue-30302.rs:4:9 | LL | #![deny(unreachable_patterns)] | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-30355.nll.stderr b/src/test/ui/issues/issue-30355.nll.stderr index fdf8157dcf833..a3a97d563eaf8 100644 --- a/src/test/ui/issues/issue-30355.nll.stderr +++ b/src/test/ui/issues/issue-30355.nll.stderr @@ -1,17 +1,17 @@ error[E0161]: cannot move a value of type X: the size of X cannot be statically determined - --> $DIR/issue-30355.rs:15:6 + --> $DIR/issue-30355.rs:5:6 | LL | &X(*Y) | ^^^^^ error[E0161]: cannot move a value of type [u8]: the size of [u8] cannot be statically determined - --> $DIR/issue-30355.rs:15:8 + --> $DIR/issue-30355.rs:5:8 | LL | &X(*Y) | ^^ error[E0508]: cannot move out of type `[u8]`, a non-copy slice - --> $DIR/issue-30355.rs:15:8 + --> $DIR/issue-30355.rs:5:8 | LL | &X(*Y) | ^^ cannot move out of here diff --git a/src/test/ui/issues/issue-30355.rs b/src/test/ui/issues/issue-30355.rs index ee19d04031893..e7f7a06125369 100644 --- a/src/test/ui/issues/issue-30355.rs +++ b/src/test/ui/issues/issue-30355.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub struct X([u8]); pub static Y: &'static X = { diff --git a/src/test/ui/issues/issue-30355.stderr b/src/test/ui/issues/issue-30355.stderr index 7e843688035af..07f3488c67ec0 100644 --- a/src/test/ui/issues/issue-30355.stderr +++ b/src/test/ui/issues/issue-30355.stderr @@ -1,17 +1,17 @@ error[E0161]: cannot move a value of type X: the size of X cannot be statically determined - --> $DIR/issue-30355.rs:15:6 + --> $DIR/issue-30355.rs:5:6 | LL | &X(*Y) | ^^^^^ error[E0161]: cannot move a value of type [u8]: the size of [u8] cannot be statically determined - --> $DIR/issue-30355.rs:15:8 + --> $DIR/issue-30355.rs:5:8 | LL | &X(*Y) | ^^ error[E0507]: cannot move out of borrowed content - --> $DIR/issue-30355.rs:15:8 + --> $DIR/issue-30355.rs:5:8 | LL | &X(*Y) | ^^ cannot move out of borrowed content diff --git a/src/test/ui/issues/issue-3038.rs b/src/test/ui/issues/issue-3038.rs index 1eec62df78801..8541a740c1dfc 100644 --- a/src/test/ui/issues/issue-3038.rs +++ b/src/test/ui/issues/issue-3038.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum f { g(isize, isize) } enum h { i(j, k) } diff --git a/src/test/ui/issues/issue-3038.stderr b/src/test/ui/issues/issue-3038.stderr index 17ad99361495c..8fba3af8eb322 100644 --- a/src/test/ui/issues/issue-3038.stderr +++ b/src/test/ui/issues/issue-3038.stderr @@ -1,17 +1,17 @@ error[E0416]: identifier `x` is bound more than once in the same pattern - --> $DIR/issue-3038.rs:22:15 + --> $DIR/issue-3038.rs:12:15 | LL | f::g(x, x) => { println!("{}", x + x); } | ^ used in a pattern more than once error[E0416]: identifier `x` is bound more than once in the same pattern - --> $DIR/issue-3038.rs:27:32 + --> $DIR/issue-3038.rs:17:32 | LL | h::i(j::l(x, _), k::m(_, x)) | ^ used in a pattern more than once error[E0416]: identifier `x` is bound more than once in the same pattern - --> $DIR/issue-3038.rs:33:13 + --> $DIR/issue-3038.rs:23:13 | LL | (x, x) => { x } //~ ERROR identifier `x` is bound more than once in the same pattern | ^ used in a pattern more than once diff --git a/src/test/ui/issues/issue-30438-a.nll.stderr b/src/test/ui/issues/issue-30438-a.nll.stderr index 2d27cd55e019a..3b57fc796e90e 100644 --- a/src/test/ui/issues/issue-30438-a.nll.stderr +++ b/src/test/ui/issues/issue-30438-a.nll.stderr @@ -1,13 +1,13 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/issue-30438-a.rs:22:17 + --> $DIR/issue-30438-a.rs:12:17 | LL | return &Test { s: &self.s}; | ^^^^^^^^^^^^^^^^^^- temporary value only lives until here | | | temporary value does not live long enough | -note: borrowed value must be valid for the anonymous lifetime #1 defined on the method body at 21:5... - --> $DIR/issue-30438-a.rs:21:5 +note: borrowed value must be valid for the anonymous lifetime #1 defined on the method body at 11:5... + --> $DIR/issue-30438-a.rs:11:5 | LL | / fn index(&self, _: usize) -> &Self::Output { LL | | return &Test { s: &self.s}; diff --git a/src/test/ui/issues/issue-30438-a.rs b/src/test/ui/issues/issue-30438-a.rs index 441815de81d30..8900821090b1c 100644 --- a/src/test/ui/issues/issue-30438-a.rs +++ b/src/test/ui/issues/issue-30438-a.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Original regression test for Issue #30438. use std::ops::Index; diff --git a/src/test/ui/issues/issue-30438-a.stderr b/src/test/ui/issues/issue-30438-a.stderr index 5f4a51a927a2d..94aca7f031999 100644 --- a/src/test/ui/issues/issue-30438-a.stderr +++ b/src/test/ui/issues/issue-30438-a.stderr @@ -1,13 +1,13 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/issue-30438-a.rs:22:17 + --> $DIR/issue-30438-a.rs:12:17 | LL | return &Test { s: &self.s}; | ^^^^^^^^^^^^^^^^^^- temporary value only lives until here | | | temporary value does not live long enough | -note: borrowed value must be valid for the anonymous lifetime #1 defined on the method body at 21:5... - --> $DIR/issue-30438-a.rs:21:5 +note: borrowed value must be valid for the anonymous lifetime #1 defined on the method body at 11:5... + --> $DIR/issue-30438-a.rs:11:5 | LL | / fn index(&self, _: usize) -> &Self::Output { LL | | return &Test { s: &self.s}; diff --git a/src/test/ui/issues/issue-30438-b.rs b/src/test/ui/issues/issue-30438-b.rs index 981b196c4aeb2..b84211bec67d1 100644 --- a/src/test/ui/issues/issue-30438-b.rs +++ b/src/test/ui/issues/issue-30438-b.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Modified regression test for Issue #30438 that exposed an // independent issue (see discussion on ticket). diff --git a/src/test/ui/issues/issue-30438-b.stderr b/src/test/ui/issues/issue-30438-b.stderr index 651ff9f2ae11d..b99801dad81d5 100644 --- a/src/test/ui/issues/issue-30438-b.stderr +++ b/src/test/ui/issues/issue-30438-b.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/issue-30438-b.rs:23:10 + --> $DIR/issue-30438-b.rs:13:10 | LL | &Test { s: &self.s} | ^^^^^^^^^^^^^^^^^^ temporary value does not live long enough @@ -7,8 +7,8 @@ LL | //~^ ERROR: borrowed value does not live long enough LL | } | - temporary value only lives until here | -note: borrowed value must be valid for the anonymous lifetime #1 defined on the method body at 22:5... - --> $DIR/issue-30438-b.rs:22:5 +note: borrowed value must be valid for the anonymous lifetime #1 defined on the method body at 12:5... + --> $DIR/issue-30438-b.rs:12:5 | LL | / fn index(&self, _: usize) -> &Self::Output { LL | | &Test { s: &self.s} diff --git a/src/test/ui/issues/issue-30438-c.nll.stderr b/src/test/ui/issues/issue-30438-c.nll.stderr index 28e63b2d36b11..8511499d227f6 100644 --- a/src/test/ui/issues/issue-30438-c.nll.stderr +++ b/src/test/ui/issues/issue-30438-c.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: `x` does not live long enough - --> $DIR/issue-30438-c.rs:19:5 + --> $DIR/issue-30438-c.rs:9:5 | LL | &x | ^^ borrowed value does not live long enough @@ -7,8 +7,8 @@ LL | //~^ ERROR: `x` does not live long enough LL | } | - `x` dropped here while still borrowed | -note: borrowed value must be valid for the lifetime 'y as defined on the function body at 17:10... - --> $DIR/issue-30438-c.rs:17:10 +note: borrowed value must be valid for the lifetime 'y as defined on the function body at 7:10... + --> $DIR/issue-30438-c.rs:7:10 | LL | fn silly<'y, 'z>(_s: &'y Test<'z>) -> &'y as Trait>::Out where 'z: 'static { | ^^ diff --git a/src/test/ui/issues/issue-30438-c.rs b/src/test/ui/issues/issue-30438-c.rs index 2b4d0dc339bf0..75caf0a75dfb6 100644 --- a/src/test/ui/issues/issue-30438-c.rs +++ b/src/test/ui/issues/issue-30438-c.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Simplified regression test for #30438, inspired by arielb1. trait Trait { type Out; } diff --git a/src/test/ui/issues/issue-30438-c.stderr b/src/test/ui/issues/issue-30438-c.stderr index dc6e1c52be103..71c2ed9dfc935 100644 --- a/src/test/ui/issues/issue-30438-c.stderr +++ b/src/test/ui/issues/issue-30438-c.stderr @@ -1,5 +1,5 @@ error[E0597]: `x` does not live long enough - --> $DIR/issue-30438-c.rs:19:6 + --> $DIR/issue-30438-c.rs:9:6 | LL | &x | ^ borrowed value does not live long enough @@ -7,8 +7,8 @@ LL | //~^ ERROR: `x` does not live long enough LL | } | - borrowed value only lives until here | -note: borrowed value must be valid for the lifetime 'y as defined on the function body at 17:10... - --> $DIR/issue-30438-c.rs:17:10 +note: borrowed value must be valid for the lifetime 'y as defined on the function body at 7:10... + --> $DIR/issue-30438-c.rs:7:10 | LL | fn silly<'y, 'z>(_s: &'y Test<'z>) -> &'y as Trait>::Out where 'z: 'static { | ^^ diff --git a/src/test/ui/issues/issue-3044.rs b/src/test/ui/issues/issue-3044.rs index 5708f160a41cc..26db04b69b4a2 100644 --- a/src/test/ui/issues/issue-3044.rs +++ b/src/test/ui/issues/issue-3044.rs @@ -1,14 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - fn main() { let needlesArr: Vec = vec!['a', 'f']; needlesArr.iter().fold(|x, y| { diff --git a/src/test/ui/issues/issue-3044.stderr b/src/test/ui/issues/issue-3044.stderr index cdca9be48ac68..35a85b604b291 100644 --- a/src/test/ui/issues/issue-3044.stderr +++ b/src/test/ui/issues/issue-3044.stderr @@ -1,5 +1,5 @@ error[E0061]: this function takes 2 parameters but 1 parameter was supplied - --> $DIR/issue-3044.rs:14:23 + --> $DIR/issue-3044.rs:3:23 | LL | needlesArr.iter().fold(|x, y| { | ^^^^ expected 2 parameters diff --git a/src/test/ui/issues/issue-30535.rs b/src/test/ui/issues/issue-30535.rs index 90f5220a623af..d48f00d5acacb 100644 --- a/src/test/ui/issues/issue-30535.rs +++ b/src/test/ui/issues/issue-30535.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // aux-build:issue-30535.rs extern crate issue_30535 as foo; diff --git a/src/test/ui/issues/issue-30535.stderr b/src/test/ui/issues/issue-30535.stderr index c3838fdb9cf07..59ea69c287d5c 100644 --- a/src/test/ui/issues/issue-30535.stderr +++ b/src/test/ui/issues/issue-30535.stderr @@ -1,5 +1,5 @@ error[E0573]: expected type, found variant `foo::Foo::FooV` - --> $DIR/issue-30535.rs:16:8 + --> $DIR/issue-30535.rs:6:8 | LL | _: foo::Foo::FooV //~ ERROR expected type, found variant `foo::Foo::FooV` | ^^^^^^^^^^^^^^ not a type diff --git a/src/test/ui/issues/issue-30560.rs b/src/test/ui/issues/issue-30560.rs index 0b1afd75ca935..70f23f8575cd2 100644 --- a/src/test/ui/issues/issue-30560.rs +++ b/src/test/ui/issues/issue-30560.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - type Alias = (); use Alias::*; //~^ ERROR unresolved import `Alias` [E0432] diff --git a/src/test/ui/issues/issue-30560.stderr b/src/test/ui/issues/issue-30560.stderr index cb38c0dabe0a3..b980d0e3de7a0 100644 --- a/src/test/ui/issues/issue-30560.stderr +++ b/src/test/ui/issues/issue-30560.stderr @@ -1,17 +1,17 @@ error: items in traits are not importable. - --> $DIR/issue-30560.rs:20:5 + --> $DIR/issue-30560.rs:10:5 | LL | use T::*; //~ ERROR items in traits are not importable | ^^^^ error[E0432]: unresolved import `Alias` - --> $DIR/issue-30560.rs:12:5 + --> $DIR/issue-30560.rs:2:5 | LL | use Alias::*; | ^^^^^ Not a module `Alias` error[E0432]: unresolved import `std::io::Result` - --> $DIR/issue-30560.rs:15:14 + --> $DIR/issue-30560.rs:5:14 | LL | use std::io::Result::*; | ^^^^^^ Not a module `Result` diff --git a/src/test/ui/issues/issue-30589.rs b/src/test/ui/issues/issue-30589.rs index 61721fe58b345..94eb5839958af 100644 --- a/src/test/ui/issues/issue-30589.rs +++ b/src/test/ui/issues/issue-30589.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt; impl fmt::Display for DecoderError { //~ ERROR cannot find type `DecoderError` in this scope diff --git a/src/test/ui/issues/issue-30589.stderr b/src/test/ui/issues/issue-30589.stderr index 8174af83230c5..17ba4051fb4e7 100644 --- a/src/test/ui/issues/issue-30589.stderr +++ b/src/test/ui/issues/issue-30589.stderr @@ -1,5 +1,5 @@ error[E0412]: cannot find type `DecoderError` in this scope - --> $DIR/issue-30589.rs:13:23 + --> $DIR/issue-30589.rs:3:23 | LL | impl fmt::Display for DecoderError { //~ ERROR cannot find type `DecoderError` in this scope | ^^^^^^^^^^^^ not found in this scope diff --git a/src/test/ui/issues/issue-30730.rs b/src/test/ui/issues/issue-30730.rs index c57a34a90df78..d6be90c8148d7 100644 --- a/src/test/ui/issues/issue-30730.rs +++ b/src/test/ui/issues/issue-30730.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![warn(unused)] #![deny(warnings)] use std::thread; diff --git a/src/test/ui/issues/issue-30730.stderr b/src/test/ui/issues/issue-30730.stderr index 696c3acce72fc..0a901076f467a 100644 --- a/src/test/ui/issues/issue-30730.stderr +++ b/src/test/ui/issues/issue-30730.stderr @@ -1,11 +1,11 @@ error: unused import: `std::thread` - --> $DIR/issue-30730.rs:13:5 + --> $DIR/issue-30730.rs:3:5 | LL | use std::thread; | ^^^^^^^^^^^ | note: lint level defined here - --> $DIR/issue-30730.rs:12:9 + --> $DIR/issue-30730.rs:2:9 | LL | #![deny(warnings)] | ^^^^^^^^ diff --git a/src/test/ui/issues/issue-3080.rs b/src/test/ui/issues/issue-3080.rs index fb16dad39608e..9845328a1dc4e 100644 --- a/src/test/ui/issues/issue-3080.rs +++ b/src/test/ui/issues/issue-3080.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct x(()); impl x { pub unsafe fn with(&self) { } diff --git a/src/test/ui/issues/issue-3080.stderr b/src/test/ui/issues/issue-3080.stderr index 3a966e3f31551..1aac93f057fe9 100644 --- a/src/test/ui/issues/issue-3080.stderr +++ b/src/test/ui/issues/issue-3080.stderr @@ -1,5 +1,5 @@ error[E0133]: call to unsafe function is unsafe and requires unsafe function or block - --> $DIR/issue-3080.rs:17:5 + --> $DIR/issue-3080.rs:7:5 | LL | x(()).with(); //~ ERROR requires unsafe function or block | ^^^^^^^^^^^^ call to unsafe function diff --git a/src/test/ui/issues/issue-3096-1.rs b/src/test/ui/issues/issue-3096-1.rs index 62c2639836b24..edc3b322305c8 100644 --- a/src/test/ui/issues/issue-3096-1.rs +++ b/src/test/ui/issues/issue-3096-1.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { match () { } //~ ERROR non-exhaustive } diff --git a/src/test/ui/issues/issue-3096-1.stderr b/src/test/ui/issues/issue-3096-1.stderr index 783e831a2a523..28fa59e38e27a 100644 --- a/src/test/ui/issues/issue-3096-1.stderr +++ b/src/test/ui/issues/issue-3096-1.stderr @@ -1,11 +1,11 @@ error[E0004]: non-exhaustive patterns: type () is non-empty - --> $DIR/issue-3096-1.rs:12:11 + --> $DIR/issue-3096-1.rs:2:11 | LL | match () { } //~ ERROR non-exhaustive | ^^ | help: Please ensure that all possible cases are being handled; possibly adding wildcards or more match arms. - --> $DIR/issue-3096-1.rs:12:11 + --> $DIR/issue-3096-1.rs:2:11 | LL | match () { } //~ ERROR non-exhaustive | ^^ diff --git a/src/test/ui/issues/issue-3096-2.rs b/src/test/ui/issues/issue-3096-2.rs index 2d1ad9a2692ec..b71a40507f8c2 100644 --- a/src/test/ui/issues/issue-3096-2.rs +++ b/src/test/ui/issues/issue-3096-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum bottom { } fn main() { diff --git a/src/test/ui/issues/issue-3096-2.stderr b/src/test/ui/issues/issue-3096-2.stderr index 6031f25c03dff..43871bf8d3e60 100644 --- a/src/test/ui/issues/issue-3096-2.stderr +++ b/src/test/ui/issues/issue-3096-2.stderr @@ -1,11 +1,11 @@ error[E0004]: non-exhaustive patterns: type *const bottom is non-empty - --> $DIR/issue-3096-2.rs:15:11 + --> $DIR/issue-3096-2.rs:5:11 | LL | match x { } //~ ERROR non-exhaustive patterns | ^ | help: Please ensure that all possible cases are being handled; possibly adding wildcards or more match arms. - --> $DIR/issue-3096-2.rs:15:11 + --> $DIR/issue-3096-2.rs:5:11 | LL | match x { } //~ ERROR non-exhaustive patterns | ^ diff --git a/src/test/ui/issues/issue-3099-a.rs b/src/test/ui/issues/issue-3099-a.rs index db60d70ca9b5f..132ecbb92bebd 100644 --- a/src/test/ui/issues/issue-3099-a.rs +++ b/src/test/ui/issues/issue-3099-a.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum a { b, c } enum a { d, e } //~ ERROR the name `a` is defined multiple times diff --git a/src/test/ui/issues/issue-3099-a.stderr b/src/test/ui/issues/issue-3099-a.stderr index 6a194593c3fe4..d2b13a46ed7c8 100644 --- a/src/test/ui/issues/issue-3099-a.stderr +++ b/src/test/ui/issues/issue-3099-a.stderr @@ -1,5 +1,5 @@ error[E0428]: the name `a` is defined multiple times - --> $DIR/issue-3099-a.rs:13:1 + --> $DIR/issue-3099-a.rs:3:1 | LL | enum a { b, c } | ------ previous definition of the type `a` here diff --git a/src/test/ui/issues/issue-3099-b.rs b/src/test/ui/issues/issue-3099-b.rs index 956d2186752a9..71952c3b06080 100644 --- a/src/test/ui/issues/issue-3099-b.rs +++ b/src/test/ui/issues/issue-3099-b.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub mod a {} pub mod a {} //~ ERROR the name `a` is defined multiple times diff --git a/src/test/ui/issues/issue-3099-b.stderr b/src/test/ui/issues/issue-3099-b.stderr index 226d99e3b82f4..cc49325805e36 100644 --- a/src/test/ui/issues/issue-3099-b.stderr +++ b/src/test/ui/issues/issue-3099-b.stderr @@ -1,5 +1,5 @@ error[E0428]: the name `a` is defined multiple times - --> $DIR/issue-3099-b.rs:13:1 + --> $DIR/issue-3099-b.rs:3:1 | LL | pub mod a {} | --------- previous definition of the module `a` here diff --git a/src/test/ui/issues/issue-3099.rs b/src/test/ui/issues/issue-3099.rs index 42766533556d5..ee75b359388f3 100644 --- a/src/test/ui/issues/issue-3099.rs +++ b/src/test/ui/issues/issue-3099.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn a(x: String) -> String { format!("First function with {}", x) } diff --git a/src/test/ui/issues/issue-3099.stderr b/src/test/ui/issues/issue-3099.stderr index a5f29e7b6c339..a650d3caa6407 100644 --- a/src/test/ui/issues/issue-3099.stderr +++ b/src/test/ui/issues/issue-3099.stderr @@ -1,5 +1,5 @@ error[E0428]: the name `a` is defined multiple times - --> $DIR/issue-3099.rs:15:1 + --> $DIR/issue-3099.rs:5:1 | LL | fn a(x: String) -> String { | ------------------------- previous definition of the value `a` here diff --git a/src/test/ui/issues/issue-31011.rs b/src/test/ui/issues/issue-31011.rs index 716b0bbe77294..4dead04c2ca30 100644 --- a/src/test/ui/issues/issue-31011.rs +++ b/src/test/ui/issues/issue-31011.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! log { ( $ctx:expr, $( $args:expr),* ) => { if $ctx.trace { diff --git a/src/test/ui/issues/issue-31011.stderr b/src/test/ui/issues/issue-31011.stderr index c2e7c9876cb88..ab0069510fcc0 100644 --- a/src/test/ui/issues/issue-31011.stderr +++ b/src/test/ui/issues/issue-31011.stderr @@ -1,5 +1,5 @@ error[E0609]: no field `trace` on type `&T` - --> $DIR/issue-31011.rs:13:17 + --> $DIR/issue-31011.rs:3:17 | LL | if $ctx.trace { | ^^^^^ diff --git a/src/test/ui/issues/issue-31109.rs b/src/test/ui/issues/issue-31109.rs index 74121e3a420f9..37c2390581973 100644 --- a/src/test/ui/issues/issue-31109.rs +++ b/src/test/ui/issues/issue-31109.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { // FIXME(#31407) this error should go away, but in the meantime we test that it // is accompanied by a somewhat useful error message. diff --git a/src/test/ui/issues/issue-31109.stderr b/src/test/ui/issues/issue-31109.stderr index c66a4f0b175a0..d354f61a50143 100644 --- a/src/test/ui/issues/issue-31109.stderr +++ b/src/test/ui/issues/issue-31109.stderr @@ -1,5 +1,5 @@ error: could not evaluate float literal (see issue #31407) - --> $DIR/issue-31109.rs:14:18 + --> $DIR/issue-31109.rs:4:18 | LL | let _: f64 = 1234567890123456789012345678901234567890e-340; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-31173.rs b/src/test/ui/issues/issue-31173.rs index fb1e3cc87e88c..6df80664575f3 100644 --- a/src/test/ui/issues/issue-31173.rs +++ b/src/test/ui/issues/issue-31173.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::vec::IntoIter; pub fn get_tok(it: &mut IntoIter) { diff --git a/src/test/ui/issues/issue-31173.stderr b/src/test/ui/issues/issue-31173.stderr index e2630b5b8ce47..3310ca1aea3bc 100644 --- a/src/test/ui/issues/issue-31173.stderr +++ b/src/test/ui/issues/issue-31173.stderr @@ -1,5 +1,5 @@ -error[E0271]: type mismatch resolving `, [closure@$DIR/issue-31173.rs:16:39: 19:6 found_e:_]> as std::iter::Iterator>::Item == &_` - --> $DIR/issue-31173.rs:20:10 +error[E0271]: type mismatch resolving `, [closure@$DIR/issue-31173.rs:6:39: 9:6 found_e:_]> as std::iter::Iterator>::Item == &_` + --> $DIR/issue-31173.rs:10:10 | LL | .cloned() | ^^^^^^ expected u8, found reference @@ -7,15 +7,15 @@ LL | .cloned() = note: expected type `u8` found type `&_` -error[E0599]: no method named `collect` found for type `std::iter::Cloned, [closure@$DIR/issue-31173.rs:16:39: 19:6 found_e:_]>>` in the current scope - --> $DIR/issue-31173.rs:24:10 +error[E0599]: no method named `collect` found for type `std::iter::Cloned, [closure@$DIR/issue-31173.rs:6:39: 9:6 found_e:_]>>` in the current scope + --> $DIR/issue-31173.rs:14:10 | LL | .collect(); //~ ERROR no method named `collect` | ^^^^^^^ | = note: the method `collect` exists but the following trait bounds were not satisfied: - `std::iter::Cloned, [closure@$DIR/issue-31173.rs:16:39: 19:6 found_e:_]>> : std::iter::Iterator` - `&mut std::iter::Cloned, [closure@$DIR/issue-31173.rs:16:39: 19:6 found_e:_]>> : std::iter::Iterator` + `std::iter::Cloned, [closure@$DIR/issue-31173.rs:6:39: 9:6 found_e:_]>> : std::iter::Iterator` + `&mut std::iter::Cloned, [closure@$DIR/issue-31173.rs:6:39: 9:6 found_e:_]>> : std::iter::Iterator` error: aborting due to 2 previous errors diff --git a/src/test/ui/issues/issue-31212.rs b/src/test/ui/issues/issue-31212.rs index 8dc58eee5fb81..556f0d18f9f22 100644 --- a/src/test/ui/issues/issue-31212.rs +++ b/src/test/ui/issues/issue-31212.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This checks that a path that cannot be resolved because of an indeterminate import // does not trigger an ICE. diff --git a/src/test/ui/issues/issue-31212.stderr b/src/test/ui/issues/issue-31212.stderr index 17cf2e81236f4..d964b702f221f 100644 --- a/src/test/ui/issues/issue-31212.stderr +++ b/src/test/ui/issues/issue-31212.stderr @@ -1,11 +1,11 @@ error[E0432]: unresolved import `self::*` - --> $DIR/issue-31212.rs:15:13 + --> $DIR/issue-31212.rs:5:13 | LL | pub use self::*; //~ ERROR unresolved | ^^^^^^^ Cannot glob-import a module into itself. error[E0425]: cannot find function `f` in module `foo` - --> $DIR/issue-31212.rs:19:10 + --> $DIR/issue-31212.rs:9:10 | LL | foo::f(); //~ ERROR cannot find function `f` in module `foo` | ^ not found in `foo` diff --git a/src/test/ui/issues/issue-31221.rs b/src/test/ui/issues/issue-31221.rs index ca15a869a9c20..e03f1ec5bc209 100644 --- a/src/test/ui/issues/issue-31221.rs +++ b/src/test/ui/issues/issue-31221.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] #![allow(unused_variables)] #![allow(non_snake_case)] diff --git a/src/test/ui/issues/issue-31221.stderr b/src/test/ui/issues/issue-31221.stderr index 56c7b8ab6e757..0f3b4ba7d97ea 100644 --- a/src/test/ui/issues/issue-31221.stderr +++ b/src/test/ui/issues/issue-31221.stderr @@ -1,5 +1,5 @@ error: unreachable pattern - --> $DIR/issue-31221.rs:28:9 + --> $DIR/issue-31221.rs:18:9 | LL | Var3 => (), | ---- matches any value @@ -7,13 +7,13 @@ LL | Var2 => (), | ^^^^ unreachable pattern | note: lint level defined here - --> $DIR/issue-31221.rs:14:9 + --> $DIR/issue-31221.rs:4:9 | LL | #![deny(unreachable_patterns)] | ^^^^^^^^^^^^^^^^^^^^ error: unreachable pattern - --> $DIR/issue-31221.rs:34:9 + --> $DIR/issue-31221.rs:24:9 | LL | &Var3 => (), | ----- matches any value @@ -21,7 +21,7 @@ LL | &Var2 => (), | ^^^^^ unreachable pattern error: unreachable pattern - --> $DIR/issue-31221.rs:41:9 + --> $DIR/issue-31221.rs:31:9 | LL | (c, d) => (), | ------ matches any value diff --git a/src/test/ui/issues/issue-31495.rs b/src/test/ui/issues/issue-31495.rs index 794b8bb86bb57..5cc2894015749 100644 --- a/src/test/ui/issues/issue-31495.rs +++ b/src/test/ui/issues/issue-31495.rs @@ -1,13 +1,3 @@ -// Copyright 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: --cfg foo(bar) // error-pattern: invalid predicate in --cfg command line argument: `foo` fn main() {} diff --git a/src/test/ui/issues/issue-31511.rs b/src/test/ui/issues/issue-31511.rs index dd1af2f44487f..53fecb0166351 100644 --- a/src/test/ui/issues/issue-31511.rs +++ b/src/test/ui/issues/issue-31511.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn cast_thin_to_fat(x: *const ()) { x as *const [u8]; //~^ ERROR: cannot cast thin pointer `*const ()` to fat pointer `*const [u8]` diff --git a/src/test/ui/issues/issue-31511.stderr b/src/test/ui/issues/issue-31511.stderr index 7d4c9426da103..cb2991809dd13 100644 --- a/src/test/ui/issues/issue-31511.stderr +++ b/src/test/ui/issues/issue-31511.stderr @@ -1,5 +1,5 @@ error[E0607]: cannot cast thin pointer `*const ()` to fat pointer `*const [u8]` - --> $DIR/issue-31511.rs:12:5 + --> $DIR/issue-31511.rs:2:5 | LL | x as *const [u8]; | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-3154.nll.stderr b/src/test/ui/issues/issue-3154.nll.stderr index 3cd7ce8cd5409..d49a3e6a03c6f 100644 --- a/src/test/ui/issues/issue-3154.nll.stderr +++ b/src/test/ui/issues/issue-3154.nll.stderr @@ -1,17 +1,17 @@ warning: not reporting region error due to nll - --> $DIR/issue-3154.rs:16:15 + --> $DIR/issue-3154.rs:6:15 | LL | thing{ x: x } //~ ERROR 16:5: 16:18: explicit lifetime required in the type of `x` [E0621] | ^ warning: not reporting region error due to nll - --> $DIR/issue-3154.rs:16:5 + --> $DIR/issue-3154.rs:6:5 | LL | thing{ x: x } //~ ERROR 16:5: 16:18: explicit lifetime required in the type of `x` [E0621] | ^^^^^ error[E0621]: explicit lifetime required in the type of `x` - --> $DIR/issue-3154.rs:16:5 + --> $DIR/issue-3154.rs:6:5 | LL | fn thing<'a,Q>(x: &Q) -> thing<'a,Q> { | -- help: add explicit lifetime `'a` to the type of `x`: `&'a Q` diff --git a/src/test/ui/issues/issue-3154.rs b/src/test/ui/issues/issue-3154.rs index 519e9d06d1b33..95086cd0afddc 100644 --- a/src/test/ui/issues/issue-3154.rs +++ b/src/test/ui/issues/issue-3154.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct thing<'a, Q:'a> { x: &'a Q } diff --git a/src/test/ui/issues/issue-3154.stderr b/src/test/ui/issues/issue-3154.stderr index 01299d7480862..58154f67aa97d 100644 --- a/src/test/ui/issues/issue-3154.stderr +++ b/src/test/ui/issues/issue-3154.stderr @@ -1,5 +1,5 @@ error[E0621]: explicit lifetime required in the type of `x` - --> $DIR/issue-3154.rs:16:5 + --> $DIR/issue-3154.rs:6:5 | LL | fn thing<'a,Q>(x: &Q) -> thing<'a,Q> { | -- help: add explicit lifetime `'a` to the type of `x`: `&'a Q` diff --git a/src/test/ui/issues/issue-31561.rs b/src/test/ui/issues/issue-31561.rs index f8645c4d3a7e8..87b19fe5ea7cb 100644 --- a/src/test/ui/issues/issue-31561.rs +++ b/src/test/ui/issues/issue-31561.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Thing { Foo(u8), Bar, diff --git a/src/test/ui/issues/issue-31561.stderr b/src/test/ui/issues/issue-31561.stderr index 4608a95459bed..c95fc36cea6e8 100644 --- a/src/test/ui/issues/issue-31561.stderr +++ b/src/test/ui/issues/issue-31561.stderr @@ -1,5 +1,5 @@ error[E0005]: refutable pattern in local binding: `Bar` not covered - --> $DIR/issue-31561.rs:18:9 + --> $DIR/issue-31561.rs:8:9 | LL | let Thing::Foo(y) = Thing::Foo(1); | ^^^^^^^^^^^^^ pattern `Bar` not covered diff --git a/src/test/ui/issues/issue-31769.rs b/src/test/ui/issues/issue-31769.rs index 2bd45deeab4df..794c1d1989388 100644 --- a/src/test/ui/issues/issue-31769.rs +++ b/src/test/ui/issues/issue-31769.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { #[inline] struct Foo; //~ ERROR attribute should be applied to function or closure #[repr(C)] fn foo() {} //~ ERROR attribute should be applied to struct, enum or union diff --git a/src/test/ui/issues/issue-31769.stderr b/src/test/ui/issues/issue-31769.stderr index 1f1904e3c2cf2..7e5e5673bafc6 100644 --- a/src/test/ui/issues/issue-31769.stderr +++ b/src/test/ui/issues/issue-31769.stderr @@ -1,11 +1,11 @@ error[E0518]: attribute should be applied to function or closure - --> $DIR/issue-31769.rs:12:5 + --> $DIR/issue-31769.rs:2:5 | LL | #[inline] struct Foo; //~ ERROR attribute should be applied to function or closure | ^^^^^^^^^ ----------- not a function or closure error[E0517]: attribute should be applied to struct, enum or union - --> $DIR/issue-31769.rs:13:12 + --> $DIR/issue-31769.rs:3:12 | LL | #[repr(C)] fn foo() {} //~ ERROR attribute should be applied to struct, enum or union | ^ ----------- not a struct, enum or union diff --git a/src/test/ui/issues/issue-31804.rs b/src/test/ui/issues/issue-31804.rs index cea52b11c5ded..d056b77cf0989 100644 --- a/src/test/ui/issues/issue-31804.rs +++ b/src/test/ui/issues/issue-31804.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Test that error recovery in the parser to an EOF does not give an infinite // spew of errors. diff --git a/src/test/ui/issues/issue-31804.stderr b/src/test/ui/issues/issue-31804.stderr index e0ac2f631ba8f..67e2f2bf2ecf7 100644 --- a/src/test/ui/issues/issue-31804.stderr +++ b/src/test/ui/issues/issue-31804.stderr @@ -1,5 +1,5 @@ error: expected pattern, found `}` - --> $DIR/issue-31804.rs:16:1 + --> $DIR/issue-31804.rs:6:1 | LL | } //~ ERROR expected pattern, found `}` | ^ expected pattern diff --git a/src/test/ui/issues/issue-31845.rs b/src/test/ui/issues/issue-31845.rs index 418754b9a2446..f6dc11502ba18 100644 --- a/src/test/ui/issues/issue-31845.rs +++ b/src/test/ui/issues/issue-31845.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Checks lexical scopes cannot see through normal module boundaries fn f() { diff --git a/src/test/ui/issues/issue-31845.stderr b/src/test/ui/issues/issue-31845.stderr index 9fb8f2ead8795..d04a884a9336a 100644 --- a/src/test/ui/issues/issue-31845.stderr +++ b/src/test/ui/issues/issue-31845.stderr @@ -1,5 +1,5 @@ error[E0425]: cannot find function `g` in this scope - --> $DIR/issue-31845.rs:17:12 + --> $DIR/issue-31845.rs:7:12 | LL | g(); //~ ERROR cannot find function `g` in this scope | ^ did you mean `h`? diff --git a/src/test/ui/issues/issue-31910.rs b/src/test/ui/issues/issue-31910.rs index 7524049c5df3d..c62ed89c4ad00 100644 --- a/src/test/ui/issues/issue-31910.rs +++ b/src/test/ui/issues/issue-31910.rs @@ -1,14 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - - enum Enum { X = Trait::Number, //~^ ERROR mismatched types diff --git a/src/test/ui/issues/issue-31910.stderr b/src/test/ui/issues/issue-31910.stderr index da5aa15445030..c58702da97bc6 100644 --- a/src/test/ui/issues/issue-31910.stderr +++ b/src/test/ui/issues/issue-31910.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-31910.rs:13:9 + --> $DIR/issue-31910.rs:2:9 | LL | X = Trait::Number, | ^^^^^^^^^^^^^ expected isize, found i32 diff --git a/src/test/ui/issues/issue-31924-non-snake-ffi.rs b/src/test/ui/issues/issue-31924-non-snake-ffi.rs index d9ce1159c0ece..980acb81645f9 100644 --- a/src/test/ui/issues/issue-31924-non-snake-ffi.rs +++ b/src/test/ui/issues/issue-31924-non-snake-ffi.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![deny(non_snake_case)] diff --git a/src/test/ui/issues/issue-31924-non-snake-ffi.stderr b/src/test/ui/issues/issue-31924-non-snake-ffi.stderr index 2aaaa1578a581..193aa5051fa52 100644 --- a/src/test/ui/issues/issue-31924-non-snake-ffi.stderr +++ b/src/test/ui/issues/issue-31924-non-snake-ffi.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-31924-non-snake-ffi.rs:18:1 + --> $DIR/issue-31924-non-snake-ffi.rs:8:1 | LL | fn main() {} //~ ERROR compilation successful | ^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-32004.rs b/src/test/ui/issues/issue-32004.rs index 7e1f4c28d21e9..aeddb00e2b04c 100644 --- a/src/test/ui/issues/issue-32004.rs +++ b/src/test/ui/issues/issue-32004.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum Foo { Bar(i32), Baz diff --git a/src/test/ui/issues/issue-32004.stderr b/src/test/ui/issues/issue-32004.stderr index c409d4bb612eb..04cd27b8bdb6c 100644 --- a/src/test/ui/issues/issue-32004.stderr +++ b/src/test/ui/issues/issue-32004.stderr @@ -1,5 +1,5 @@ error[E0532]: expected unit struct/variant or constant, found tuple variant `Foo::Bar` - --> $DIR/issue-32004.rs:20:9 + --> $DIR/issue-32004.rs:10:9 | LL | Foo::Bar => {} | ^^^^^--- @@ -7,7 +7,7 @@ LL | Foo::Bar => {} | did you mean `Baz`? error[E0532]: expected tuple struct/variant, found unit struct `S` - --> $DIR/issue-32004.rs:26:9 + --> $DIR/issue-32004.rs:16:9 | LL | S(()) => {} | ^ not a tuple struct/variant diff --git a/src/test/ui/issues/issue-32086.rs b/src/test/ui/issues/issue-32086.rs index dd236b76a6739..3188377584dc0 100644 --- a/src/test/ui/issues/issue-32086.rs +++ b/src/test/ui/issues/issue-32086.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct S(u8); const C: S = S(10); diff --git a/src/test/ui/issues/issue-32086.stderr b/src/test/ui/issues/issue-32086.stderr index 28d21708b217d..98a6200cdae8a 100644 --- a/src/test/ui/issues/issue-32086.stderr +++ b/src/test/ui/issues/issue-32086.stderr @@ -1,11 +1,11 @@ error[E0532]: expected tuple struct/variant, found constant `C` - --> $DIR/issue-32086.rs:15:9 + --> $DIR/issue-32086.rs:5:9 | LL | let C(a) = S(11); //~ ERROR expected tuple struct/variant, found constant `C` | ^ did you mean `S`? error[E0532]: expected tuple struct/variant, found constant `C` - --> $DIR/issue-32086.rs:16:9 + --> $DIR/issue-32086.rs:6:9 | LL | let C(..) = S(11); //~ ERROR expected tuple struct/variant, found constant `C` | ^ did you mean `S`? diff --git a/src/test/ui/issues/issue-32119.rs b/src/test/ui/issues/issue-32119.rs index e630a01a59300..3161f3ac8e341 100644 --- a/src/test/ui/issues/issue-32119.rs +++ b/src/test/ui/issues/issue-32119.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![allow(dead_code)] diff --git a/src/test/ui/issues/issue-32119.stderr b/src/test/ui/issues/issue-32119.stderr index 04276ec1ffd06..0438b08e44ad1 100644 --- a/src/test/ui/issues/issue-32119.stderr +++ b/src/test/ui/issues/issue-32119.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-32119.rs:29:1 + --> $DIR/issue-32119.rs:19:1 | LL | fn main() {} //~ ERROR compilation successful | ^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-3214.rs b/src/test/ui/issues/issue-3214.rs index 9a769c39eca12..452affde64fd3 100644 --- a/src/test/ui/issues/issue-3214.rs +++ b/src/test/ui/issues/issue-3214.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn foo() { struct foo { x: T, //~ ERROR can't use type parameters from outer function diff --git a/src/test/ui/issues/issue-3214.stderr b/src/test/ui/issues/issue-3214.stderr index 2c4b9f84105ea..2f388af39dc53 100644 --- a/src/test/ui/issues/issue-3214.stderr +++ b/src/test/ui/issues/issue-3214.stderr @@ -1,5 +1,5 @@ error[E0401]: can't use type parameters from outer function - --> $DIR/issue-3214.rs:13:12 + --> $DIR/issue-3214.rs:3:12 | LL | fn foo() { | --- - type variable from outer function @@ -10,7 +10,7 @@ LL | x: T, //~ ERROR can't use type parameters from outer function | ^ use of type variable from outer function error[E0244]: wrong number of type arguments: expected 0, found 1 - --> $DIR/issue-3214.rs:16:26 + --> $DIR/issue-3214.rs:6:26 | LL | impl Drop for foo { | ^ unexpected type argument diff --git a/src/test/ui/issues/issue-32201.rs b/src/test/ui/issues/issue-32201.rs index bf9f8ecbc8097..e22c160416517 100644 --- a/src/test/ui/issues/issue-32201.rs +++ b/src/test/ui/issues/issue-32201.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - extern { fn foo(a: i32, ...); } diff --git a/src/test/ui/issues/issue-32201.stderr b/src/test/ui/issues/issue-32201.stderr index 986c2f0890c3e..cedb58784662e 100644 --- a/src/test/ui/issues/issue-32201.stderr +++ b/src/test/ui/issues/issue-32201.stderr @@ -1,5 +1,5 @@ error[E0617]: can't pass `fn(*const u8) {bar}` to variadic function - --> $DIR/issue-32201.rs:19:16 + --> $DIR/issue-32201.rs:9:16 | LL | foo(0, bar); | ^^^ help: cast the value to `fn(*const u8)`: `bar as fn(*const u8)` diff --git a/src/test/ui/issues/issue-32222.rs b/src/test/ui/issues/issue-32222.rs index b3b34f4b0efda..ef3d3eeaadd8f 100644 --- a/src/test/ui/issues/issue-32222.rs +++ b/src/test/ui/issues/issue-32222.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![allow(warnings)] diff --git a/src/test/ui/issues/issue-32222.stderr b/src/test/ui/issues/issue-32222.stderr index ba2c5396e4d8c..06d10d01c607f 100644 --- a/src/test/ui/issues/issue-32222.stderr +++ b/src/test/ui/issues/issue-32222.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-32222.rs:34:1 + --> $DIR/issue-32222.rs:24:1 | LL | fn main() {} //~ ERROR compilation successful | ^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-32323.rs b/src/test/ui/issues/issue-32323.rs index e5cb813032771..5078f5523c920 100644 --- a/src/test/ui/issues/issue-32323.rs +++ b/src/test/ui/issues/issue-32323.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - pub trait Tr<'a> { type Out; } diff --git a/src/test/ui/issues/issue-32323.stderr b/src/test/ui/issues/issue-32323.stderr index 09ac1553b3a8e..00ef2ca18098b 100644 --- a/src/test/ui/issues/issue-32323.stderr +++ b/src/test/ui/issues/issue-32323.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-32323.rs:15:49 + --> $DIR/issue-32323.rs:5:49 | LL | pub fn f<'a, T: Tr<'a>>() -> >::Out {} | ^^ expected associated type, found () diff --git a/src/test/ui/issues/issue-32326.rs b/src/test/ui/issues/issue-32326.rs index 8af243afc2299..e928c66e2cc7e 100644 --- a/src/test/ui/issues/issue-32326.rs +++ b/src/test/ui/issues/issue-32326.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Regression test for #32326. We ran out of memory because we // attempted to expand this case up to the recursion limit, and 2^N is // too big. diff --git a/src/test/ui/issues/issue-32326.stderr b/src/test/ui/issues/issue-32326.stderr index b7e359af64ad0..0f56e94bd196c 100644 --- a/src/test/ui/issues/issue-32326.stderr +++ b/src/test/ui/issues/issue-32326.stderr @@ -1,5 +1,5 @@ error[E0072]: recursive type `Expr` has infinite size - --> $DIR/issue-32326.rs:15:1 + --> $DIR/issue-32326.rs:5:1 | LL | enum Expr { //~ ERROR E0072 | ^^^^^^^^^ recursive type has infinite size diff --git a/src/test/ui/issues/issue-32354-suggest-import-rename.fixed b/src/test/ui/issues/issue-32354-suggest-import-rename.fixed index 251f7eb9a2487..27f1b8964e2ad 100644 --- a/src/test/ui/issues/issue-32354-suggest-import-rename.fixed +++ b/src/test/ui/issues/issue-32354-suggest-import-rename.fixed @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix #![allow(unused_imports)] diff --git a/src/test/ui/issues/issue-32354-suggest-import-rename.rs b/src/test/ui/issues/issue-32354-suggest-import-rename.rs index 57cbeb47a1e04..5a7f234d5fa2b 100644 --- a/src/test/ui/issues/issue-32354-suggest-import-rename.rs +++ b/src/test/ui/issues/issue-32354-suggest-import-rename.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // run-rustfix #![allow(unused_imports)] diff --git a/src/test/ui/issues/issue-32354-suggest-import-rename.stderr b/src/test/ui/issues/issue-32354-suggest-import-rename.stderr index f45a5f7dd619b..63570ea29090b 100644 --- a/src/test/ui/issues/issue-32354-suggest-import-rename.stderr +++ b/src/test/ui/issues/issue-32354-suggest-import-rename.stderr @@ -1,5 +1,5 @@ error[E0252]: the name `ConstructorExtension` is defined multiple times - --> $DIR/issue-32354-suggest-import-rename.rs:24:5 + --> $DIR/issue-32354-suggest-import-rename.rs:14:5 | LL | use extension1::ConstructorExtension; | -------------------------------- previous import of the trait `ConstructorExtension` here diff --git a/src/test/ui/issues/issue-32377.rs b/src/test/ui/issues/issue-32377.rs index 425dcc6b21ea2..6f073bcce6108 100644 --- a/src/test/ui/issues/issue-32377.rs +++ b/src/test/ui/issues/issue-32377.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // normalize-stderr-test "\d+ bits" -> "N bits" use std::mem; diff --git a/src/test/ui/issues/issue-32377.stderr b/src/test/ui/issues/issue-32377.stderr index 7168a000a0207..72d94721d887f 100644 --- a/src/test/ui/issues/issue-32377.stderr +++ b/src/test/ui/issues/issue-32377.stderr @@ -1,5 +1,5 @@ error[E0512]: transmute called with types of different sizes - --> $DIR/issue-32377.rs:25:14 + --> $DIR/issue-32377.rs:15:14 | LL | unsafe { mem::transmute(x) } | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-32655.rs b/src/test/ui/issues/issue-32655.rs index 25ecd5d08626d..35c19db3863fb 100644 --- a/src/test/ui/issues/issue-32655.rs +++ b/src/test/ui/issues/issue-32655.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(dead_code)] #![feature(rustc_attrs)] diff --git a/src/test/ui/issues/issue-32655.stderr b/src/test/ui/issues/issue-32655.stderr index f930217fe9ef5..e48cba3128336 100644 --- a/src/test/ui/issues/issue-32655.stderr +++ b/src/test/ui/issues/issue-32655.stderr @@ -1,5 +1,5 @@ error[E0658]: attributes of the form `#[derive_*]` are reserved for the compiler (see issue #29644) - --> $DIR/issue-32655.rs:16:11 + --> $DIR/issue-32655.rs:6:11 | LL | #[derive_Clone] //~ ERROR attributes of the form | ^^^^^^^^^^^^ @@ -10,7 +10,7 @@ LL | foo!(); = help: add #![feature(custom_derive)] to the crate attributes to enable error[E0658]: attributes of the form `#[derive_*]` are reserved for the compiler (see issue #29644) - --> $DIR/issue-32655.rs:28:7 + --> $DIR/issue-32655.rs:18:7 | LL | #[derive_Clone] //~ ERROR attributes of the form | ^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-32709.rs b/src/test/ui/issues/issue-32709.rs index 09538818dcdf9..cc764b417b8ec 100644 --- a/src/test/ui/issues/issue-32709.rs +++ b/src/test/ui/issues/issue-32709.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Make sure that the span of try shorthand does not include the trailing // semicolon; fn a() -> Result { diff --git a/src/test/ui/issues/issue-32709.stderr b/src/test/ui/issues/issue-32709.stderr index 8da4be2ba2bb1..16407b7074d64 100644 --- a/src/test/ui/issues/issue-32709.stderr +++ b/src/test/ui/issues/issue-32709.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `(): std::convert::From<{integer}>` is not satisfied - --> $DIR/issue-32709.rs:14:5 + --> $DIR/issue-32709.rs:4:5 | LL | Err(5)?; //~ ERROR 14:5: 14:12 | ^^^^^^^ the trait `std::convert::From<{integer}>` is not implemented for `()` diff --git a/src/test/ui/issues/issue-32782.rs b/src/test/ui/issues/issue-32782.rs index 696ea0ef5473b..e3aa9f3bf2fd7 100644 --- a/src/test/ui/issues/issue-32782.rs +++ b/src/test/ui/issues/issue-32782.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! bar ( () => () ); diff --git a/src/test/ui/issues/issue-32782.stderr b/src/test/ui/issues/issue-32782.stderr index 8b486000a450d..5d583ee843f66 100644 --- a/src/test/ui/issues/issue-32782.stderr +++ b/src/test/ui/issues/issue-32782.stderr @@ -1,5 +1,5 @@ error[E0658]: allow_internal_unstable side-steps feature gating and stability checks - --> $DIR/issue-32782.rs:17:9 + --> $DIR/issue-32782.rs:7:9 | LL | #[allow_internal_unstable] //~ ERROR allow_internal_unstable side-steps | ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-32797.rs b/src/test/ui/issues/issue-32797.rs index 2c54ed3e857e9..52f25173629cf 100644 --- a/src/test/ui/issues/issue-32797.rs +++ b/src/test/ui/issues/issue-32797.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] pub use bar::*; diff --git a/src/test/ui/issues/issue-32797.stderr b/src/test/ui/issues/issue-32797.stderr index 8e1430e505df9..371bd10325693 100644 --- a/src/test/ui/issues/issue-32797.stderr +++ b/src/test/ui/issues/issue-32797.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-32797.rs:24:1 + --> $DIR/issue-32797.rs:14:1 | LL | pub fn main() {} //~ ERROR compilation successful | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-32829.rs b/src/test/ui/issues/issue-32829.rs index 2d333f324c4d3..adfee7b925cc5 100644 --- a/src/test/ui/issues/issue-32829.rs +++ b/src/test/ui/issues/issue-32829.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - static S : u64 = { { panic!("foo"); 0 } }; //~^ ERROR panicking in statics is unstable diff --git a/src/test/ui/issues/issue-32829.stderr b/src/test/ui/issues/issue-32829.stderr index 55ee6d80d1f89..037f5416fa583 100644 --- a/src/test/ui/issues/issue-32829.stderr +++ b/src/test/ui/issues/issue-32829.stderr @@ -1,5 +1,5 @@ error[E0658]: panicking in statics is unstable (see issue #51999) - --> $DIR/issue-32829.rs:11:22 + --> $DIR/issue-32829.rs:1:22 | LL | static S : u64 = { { panic!("foo"); 0 } }; | ^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-32833.rs b/src/test/ui/issues/issue-32833.rs index 41383e93603d3..379eedde72635 100644 --- a/src/test/ui/issues/issue-32833.rs +++ b/src/test/ui/issues/issue-32833.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use bar::Foo; //~ ERROR unresolved import `bar::Foo` [E0432] //~^ no `Foo` in `bar` mod bar { diff --git a/src/test/ui/issues/issue-32833.stderr b/src/test/ui/issues/issue-32833.stderr index 11af5d567664e..c7f0eb1a43290 100644 --- a/src/test/ui/issues/issue-32833.stderr +++ b/src/test/ui/issues/issue-32833.stderr @@ -1,5 +1,5 @@ error[E0432]: unresolved import `bar::Foo` - --> $DIR/issue-32833.rs:11:5 + --> $DIR/issue-32833.rs:1:5 | LL | use bar::Foo; //~ ERROR unresolved import `bar::Foo` [E0432] | ^^^^^^^^ no `Foo` in `bar` diff --git a/src/test/ui/issues/issue-32922.rs b/src/test/ui/issues/issue-32922.rs index 317a47156c1ac..32eff4d939af4 100644 --- a/src/test/ui/issues/issue-32922.rs +++ b/src/test/ui/issues/issue-32922.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![allow(warnings)] diff --git a/src/test/ui/issues/issue-32922.stderr b/src/test/ui/issues/issue-32922.stderr index c1e80b0eb78b8..9423bb22f9fbd 100644 --- a/src/test/ui/issues/issue-32922.stderr +++ b/src/test/ui/issues/issue-32922.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-32922.rs:35:1 + --> $DIR/issue-32922.rs:25:1 | LL | / fn main() { //~ ERROR compilation successful LL | | foo! {}; diff --git a/src/test/ui/issues/issue-32950.rs b/src/test/ui/issues/issue-32950.rs index 4e5cdd50b2a95..dc5b063ada4bf 100644 --- a/src/test/ui/issues/issue-32950.rs +++ b/src/test/ui/issues/issue-32950.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(concat_idents)] #[derive(Debug)] diff --git a/src/test/ui/issues/issue-32950.stderr b/src/test/ui/issues/issue-32950.stderr index 0363bf05f0080..e8e3347af2e1e 100644 --- a/src/test/ui/issues/issue-32950.stderr +++ b/src/test/ui/issues/issue-32950.stderr @@ -1,5 +1,5 @@ error: `derive` cannot be used on items with type macros - --> $DIR/issue-32950.rs:15:5 + --> $DIR/issue-32950.rs:5:5 | LL | concat_idents!(Foo, Bar) //~ ERROR `derive` cannot be used on items with type macros | ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-32963.rs b/src/test/ui/issues/issue-32963.rs index 24db822f89ca0..be59d3522b865 100644 --- a/src/test/ui/issues/issue-32963.rs +++ b/src/test/ui/issues/issue-32963.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::mem; trait Misc {} diff --git a/src/test/ui/issues/issue-32963.stderr b/src/test/ui/issues/issue-32963.stderr index dff7c9f2b8bfe..3e22ea7b2891b 100644 --- a/src/test/ui/issues/issue-32963.stderr +++ b/src/test/ui/issues/issue-32963.stderr @@ -1,17 +1,17 @@ error[E0225]: only auto traits can be used as additional traits in a trait object - --> $DIR/issue-32963.rs:18:25 + --> $DIR/issue-32963.rs:8:25 | LL | size_of_copy::(); | ^^^^ non-auto additional trait error[E0277]: the trait bound `dyn Misc: std::marker::Copy` is not satisfied - --> $DIR/issue-32963.rs:18:5 + --> $DIR/issue-32963.rs:8:5 | LL | size_of_copy::(); | ^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `dyn Misc` | note: required by `size_of_copy` - --> $DIR/issue-32963.rs:15:1 + --> $DIR/issue-32963.rs:5:1 | LL | fn size_of_copy() -> usize { mem::size_of::() } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-32995-2.rs b/src/test/ui/issues/issue-32995-2.rs index 18424fcc9e0af..a4e333ec20ae0 100644 --- a/src/test/ui/issues/issue-32995-2.rs +++ b/src/test/ui/issues/issue-32995-2.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused)] fn main() { diff --git a/src/test/ui/issues/issue-32995-2.stderr b/src/test/ui/issues/issue-32995-2.stderr index 68eda14f81db4..0ac12b78d3842 100644 --- a/src/test/ui/issues/issue-32995-2.stderr +++ b/src/test/ui/issues/issue-32995-2.stderr @@ -1,5 +1,5 @@ error: parenthesized parameters may only be used with a trait - --> $DIR/issue-32995-2.rs:14:28 + --> $DIR/issue-32995-2.rs:4:28 | LL | { fn f() {} } | ^^ @@ -9,7 +9,7 @@ LL | { fn f() {} } = note: for more information, see issue #42238 error: parenthesized parameters may only be used with a trait - --> $DIR/issue-32995-2.rs:18:35 + --> $DIR/issue-32995-2.rs:8:35 | LL | { fn f() -> impl ::std::marker()::Send { } } | ^^ @@ -18,7 +18,7 @@ LL | { fn f() -> impl ::std::marker()::Send { } } = note: for more information, see issue #42238 error: parenthesized parameters may only be used with a trait - --> $DIR/issue-32995-2.rs:26:19 + --> $DIR/issue-32995-2.rs:16:19 | LL | impl ::std::marker()::Copy for X {} | ^^ diff --git a/src/test/ui/issues/issue-32995.rs b/src/test/ui/issues/issue-32995.rs index ffbd0c0c22a7c..726cc85d3f479 100644 --- a/src/test/ui/issues/issue-32995.rs +++ b/src/test/ui/issues/issue-32995.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(unused)] fn main() { diff --git a/src/test/ui/issues/issue-32995.stderr b/src/test/ui/issues/issue-32995.stderr index f427964135cfd..12551bb7f1f00 100644 --- a/src/test/ui/issues/issue-32995.stderr +++ b/src/test/ui/issues/issue-32995.stderr @@ -1,5 +1,5 @@ error: parenthesized parameters may only be used with a trait - --> $DIR/issue-32995.rs:14:17 + --> $DIR/issue-32995.rs:4:17 | LL | let x: usize() = 1; | ^^ @@ -9,7 +9,7 @@ LL | let x: usize() = 1; = note: for more information, see issue #42238 error: parenthesized parameters may only be used with a trait - --> $DIR/issue-32995.rs:18:24 + --> $DIR/issue-32995.rs:8:24 | LL | let b: ::std::boxed()::Box<_> = Box::new(1); | ^^ @@ -18,7 +18,7 @@ LL | let b: ::std::boxed()::Box<_> = Box::new(1); = note: for more information, see issue #42238 error: parenthesized parameters may only be used with a trait - --> $DIR/issue-32995.rs:22:23 + --> $DIR/issue-32995.rs:12:23 | LL | let p = ::std::str::()::from_utf8(b"foo").unwrap(); | ^^^^ @@ -27,7 +27,7 @@ LL | let p = ::std::str::()::from_utf8(b"foo").unwrap(); = note: for more information, see issue #42238 error: parenthesized parameters may only be used with a trait - --> $DIR/issue-32995.rs:26:34 + --> $DIR/issue-32995.rs:16:34 | LL | let p = ::std::str::from_utf8::()(b"foo").unwrap(); | ^^^^ @@ -36,7 +36,7 @@ LL | let p = ::std::str::from_utf8::()(b"foo").unwrap(); = note: for more information, see issue #42238 error: parenthesized parameters may only be used with a trait - --> $DIR/issue-32995.rs:30:30 + --> $DIR/issue-32995.rs:20:30 | LL | let o : Box<::std::marker()::Send> = Box::new(1); | ^^ @@ -45,7 +45,7 @@ LL | let o : Box<::std::marker()::Send> = Box::new(1); = note: for more information, see issue #42238 error: parenthesized parameters may only be used with a trait - --> $DIR/issue-32995.rs:34:37 + --> $DIR/issue-32995.rs:24:37 | LL | let o : Box = Box::new(1); | ^^ @@ -54,7 +54,7 @@ LL | let o : Box = Box::new(1); = note: for more information, see issue #42238 error: parenthesized parameters may only be used with a trait - --> $DIR/issue-32995.rs:40:14 + --> $DIR/issue-32995.rs:30:14 | LL | let d : X() = Default::default(); | ^^ diff --git a/src/test/ui/issues/issue-33241.rs b/src/test/ui/issues/issue-33241.rs index 6a411b4c59c68..60810d7156fa2 100644 --- a/src/test/ui/issues/issue-33241.rs +++ b/src/test/ui/issues/issue-33241.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] use std::fmt; diff --git a/src/test/ui/issues/issue-33241.stderr b/src/test/ui/issues/issue-33241.stderr index 1b6577dc41f06..8731831acc630 100644 --- a/src/test/ui/issues/issue-33241.stderr +++ b/src/test/ui/issues/issue-33241.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-33241.rs:20:1 + --> $DIR/issue-33241.rs:10:1 | LL | / fn main() { //~ ERROR compilation successful LL | | let t: &(u8, fmt::Debug) = any(); diff --git a/src/test/ui/issues/issue-33293.rs b/src/test/ui/issues/issue-33293.rs index bed577b8b9d10..39438d2469f76 100644 --- a/src/test/ui/issues/issue-33293.rs +++ b/src/test/ui/issues/issue-33293.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { match 0 { aaa::bbb(_) => () diff --git a/src/test/ui/issues/issue-33293.stderr b/src/test/ui/issues/issue-33293.stderr index e94979b6da4d5..a0d2efdbd5b5c 100644 --- a/src/test/ui/issues/issue-33293.stderr +++ b/src/test/ui/issues/issue-33293.stderr @@ -1,5 +1,5 @@ error[E0433]: failed to resolve. Use of undeclared type or module `aaa` - --> $DIR/issue-33293.rs:13:9 + --> $DIR/issue-33293.rs:3:9 | LL | aaa::bbb(_) => () | ^^^ Use of undeclared type or module `aaa` diff --git a/src/test/ui/issues/issue-3344.rs b/src/test/ui/issues/issue-3344.rs index 73532cb768ad8..1c5389199cb87 100644 --- a/src/test/ui/issues/issue-3344.rs +++ b/src/test/ui/issues/issue-3344.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(PartialEq)] struct thing(usize); impl PartialOrd for thing { //~ ERROR not all trait items implemented, missing: `partial_cmp` diff --git a/src/test/ui/issues/issue-3344.stderr b/src/test/ui/issues/issue-3344.stderr index eb6caa7307e97..b7ba9ff6f59ec 100644 --- a/src/test/ui/issues/issue-3344.stderr +++ b/src/test/ui/issues/issue-3344.stderr @@ -1,5 +1,5 @@ error[E0046]: not all trait items implemented, missing: `partial_cmp` - --> $DIR/issue-3344.rs:13:1 + --> $DIR/issue-3344.rs:3:1 | LL | impl PartialOrd for thing { //~ ERROR not all trait items implemented, missing: `partial_cmp` | ^^^^^^^^^^^^^^^^^^^^^^^^^ missing `partial_cmp` in implementation diff --git a/src/test/ui/issues/issue-33464.rs b/src/test/ui/issues/issue-33464.rs index b7dbaf20ecae1..8c605b55ac37c 100644 --- a/src/test/ui/issues/issue-33464.rs +++ b/src/test/ui/issues/issue-33464.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Make sure that the spans of import errors are correct. use abc::one_el; diff --git a/src/test/ui/issues/issue-33464.stderr b/src/test/ui/issues/issue-33464.stderr index b70fff01c9ef4..899cb1e5b5c4e 100644 --- a/src/test/ui/issues/issue-33464.stderr +++ b/src/test/ui/issues/issue-33464.stderr @@ -1,17 +1,17 @@ error[E0432]: unresolved import `abc` - --> $DIR/issue-33464.rs:13:5 + --> $DIR/issue-33464.rs:3:5 | LL | use abc::one_el; | ^^^ Maybe a missing `extern crate abc;`? error[E0432]: unresolved import `abc` - --> $DIR/issue-33464.rs:15:5 + --> $DIR/issue-33464.rs:5:5 | LL | use abc::{a, bbb, cccccc}; | ^^^ Maybe a missing `extern crate abc;`? error[E0432]: unresolved import `a_very_long_name` - --> $DIR/issue-33464.rs:17:5 + --> $DIR/issue-33464.rs:7:5 | LL | use a_very_long_name::{el, el2}; | ^^^^^^^^^^^^^^^^ Maybe a missing `extern crate a_very_long_name;`? diff --git a/src/test/ui/issues/issue-33504.rs b/src/test/ui/issues/issue-33504.rs index 1e1994357c77a..89cc06ede5e48 100644 --- a/src/test/ui/issues/issue-33504.rs +++ b/src/test/ui/issues/issue-33504.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Shadowing a unit-like enum in a closure struct Test; diff --git a/src/test/ui/issues/issue-33504.stderr b/src/test/ui/issues/issue-33504.stderr index ecf8076b2b3e7..95d6c55c1ea50 100644 --- a/src/test/ui/issues/issue-33504.stderr +++ b/src/test/ui/issues/issue-33504.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-33504.rs:17:13 + --> $DIR/issue-33504.rs:7:13 | LL | let Test = 1; //~ ERROR mismatched types | ^^^^ expected integral variable, found struct `Test` diff --git a/src/test/ui/issues/issue-33525.rs b/src/test/ui/issues/issue-33525.rs index 0589618a82faf..74f21eff20f69 100644 --- a/src/test/ui/issues/issue-33525.rs +++ b/src/test/ui/issues/issue-33525.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { a; //~ ERROR cannot find value `a` "".lorem; //~ ERROR no field diff --git a/src/test/ui/issues/issue-33525.stderr b/src/test/ui/issues/issue-33525.stderr index 2b365e1cc98ba..2c97a39a183f8 100644 --- a/src/test/ui/issues/issue-33525.stderr +++ b/src/test/ui/issues/issue-33525.stderr @@ -1,17 +1,17 @@ error[E0425]: cannot find value `a` in this scope - --> $DIR/issue-33525.rs:12:5 + --> $DIR/issue-33525.rs:2:5 | LL | a; //~ ERROR cannot find value `a` | ^ not found in this scope error[E0609]: no field `lorem` on type `&'static str` - --> $DIR/issue-33525.rs:13:8 + --> $DIR/issue-33525.rs:3:8 | LL | "".lorem; //~ ERROR no field | ^^^^^ error[E0609]: no field `ipsum` on type `&'static str` - --> $DIR/issue-33525.rs:14:8 + --> $DIR/issue-33525.rs:4:8 | LL | "".ipsum; //~ ERROR no field | ^^^^^ diff --git a/src/test/ui/issues/issue-33571.rs b/src/test/ui/issues/issue-33571.rs index 5dfc41c8f4a48..5f9c514addbde 100644 --- a/src/test/ui/issues/issue-33571.rs +++ b/src/test/ui/issues/issue-33571.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #[derive(Clone, Sync, //~ ERROR this unsafe trait should be implemented explicitly Copy)] diff --git a/src/test/ui/issues/issue-33571.stderr b/src/test/ui/issues/issue-33571.stderr index be45f377c1f47..2fae447c5e8c5 100644 --- a/src/test/ui/issues/issue-33571.stderr +++ b/src/test/ui/issues/issue-33571.stderr @@ -1,5 +1,5 @@ error: this unsafe trait should be implemented explicitly - --> $DIR/issue-33571.rs:12:10 + --> $DIR/issue-33571.rs:2:10 | LL | Sync, //~ ERROR this unsafe trait should be implemented explicitly | ^^^^ diff --git a/src/test/ui/issues/issue-33819.nll.stderr b/src/test/ui/issues/issue-33819.nll.stderr index 78ad31a04c88b..8bc2d82cd3f14 100644 --- a/src/test/ui/issues/issue-33819.nll.stderr +++ b/src/test/ui/issues/issue-33819.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `v` as mutable, as it is not declared as mutable - --> $DIR/issue-33819.rs:13:34 + --> $DIR/issue-33819.rs:4:34 | LL | Some(ref v) => { let a = &mut v; }, | ^^^^^^ diff --git a/src/test/ui/issues/issue-33819.rs b/src/test/ui/issues/issue-33819.rs index 499e7e54947b7..7f25ebd18fffc 100644 --- a/src/test/ui/issues/issue-33819.rs +++ b/src/test/ui/issues/issue-33819.rs @@ -1,12 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. fn main() { let mut op = Some(2); match op { diff --git a/src/test/ui/issues/issue-33819.stderr b/src/test/ui/issues/issue-33819.stderr index bb8a542b12be6..09b8835a8a69c 100644 --- a/src/test/ui/issues/issue-33819.stderr +++ b/src/test/ui/issues/issue-33819.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow immutable local variable `v` as mutable - --> $DIR/issue-33819.rs:13:39 + --> $DIR/issue-33819.rs:4:39 | LL | Some(ref v) => { let a = &mut v; }, | ^ cannot borrow mutably diff --git a/src/test/ui/issues/issue-33941.rs b/src/test/ui/issues/issue-33941.rs index 21c169c663828..ccaa6334856b4 100644 --- a/src/test/ui/issues/issue-33941.rs +++ b/src/test/ui/issues/issue-33941.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::collections::HashMap; fn main() { diff --git a/src/test/ui/issues/issue-33941.stderr b/src/test/ui/issues/issue-33941.stderr index f20b87fa371f2..43cd7af81d98a 100644 --- a/src/test/ui/issues/issue-33941.stderr +++ b/src/test/ui/issues/issue-33941.stderr @@ -1,5 +1,5 @@ error[E0271]: type mismatch resolving ` as std::iter::Iterator>::Item == &_` - --> $DIR/issue-33941.rs:14:36 + --> $DIR/issue-33941.rs:4:36 | LL | for _ in HashMap::new().iter().cloned() {} //~ ERROR type mismatch | ^^^^^^ expected tuple, found reference @@ -8,7 +8,7 @@ LL | for _ in HashMap::new().iter().cloned() {} //~ ERROR type mismatch found type `&_` error[E0271]: type mismatch resolving ` as std::iter::Iterator>::Item == &_` - --> $DIR/issue-33941.rs:14:14 + --> $DIR/issue-33941.rs:4:14 | LL | for _ in HashMap::new().iter().cloned() {} //~ ERROR type mismatch | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected tuple, found reference diff --git a/src/test/ui/issues/issue-34028.rs b/src/test/ui/issues/issue-34028.rs index 117ab18a1158a..5338c3015c475 100644 --- a/src/test/ui/issues/issue-34028.rs +++ b/src/test/ui/issues/issue-34028.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] macro_rules! m { diff --git a/src/test/ui/issues/issue-34028.stderr b/src/test/ui/issues/issue-34028.stderr index b715fa84f6018..64d54248d6239 100644 --- a/src/test/ui/issues/issue-34028.stderr +++ b/src/test/ui/issues/issue-34028.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-34028.rs:21:1 + --> $DIR/issue-34028.rs:11:1 | LL | fn main() {} //~ ERROR compilation successful | ^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-34047.rs b/src/test/ui/issues/issue-34047.rs index db28410250311..55196177f6934 100644 --- a/src/test/ui/issues/issue-34047.rs +++ b/src/test/ui/issues/issue-34047.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const C: u8 = 0; fn main() { diff --git a/src/test/ui/issues/issue-34047.stderr b/src/test/ui/issues/issue-34047.stderr index 10804cc6fff4b..0552175134473 100644 --- a/src/test/ui/issues/issue-34047.stderr +++ b/src/test/ui/issues/issue-34047.stderr @@ -1,5 +1,5 @@ error[E0530]: match bindings cannot shadow constants - --> $DIR/issue-34047.rs:15:13 + --> $DIR/issue-34047.rs:5:13 | LL | const C: u8 = 0; | ---------------- a constant `C` is defined here diff --git a/src/test/ui/issues/issue-34171.rs b/src/test/ui/issues/issue-34171.rs index 30dd34ae9a029..837873ad721a6 100644 --- a/src/test/ui/issues/issue-34171.rs +++ b/src/test/ui/issues/issue-34171.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] macro_rules! null { ($i:tt) => {} } diff --git a/src/test/ui/issues/issue-34171.stderr b/src/test/ui/issues/issue-34171.stderr index cb8cfbd8599ce..7484c3aec75c2 100644 --- a/src/test/ui/issues/issue-34171.stderr +++ b/src/test/ui/issues/issue-34171.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-34171.rs:19:1 + --> $DIR/issue-34171.rs:9:1 | LL | / fn main() { //~ ERROR compilation successful LL | | apply_null!(#[cfg(all())] fn f() {}); diff --git a/src/test/ui/issues/issue-34209.rs b/src/test/ui/issues/issue-34209.rs index b3cb7d4cc3053..b994e71c6f238 100644 --- a/src/test/ui/issues/issue-34209.rs +++ b/src/test/ui/issues/issue-34209.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum S { A, } diff --git a/src/test/ui/issues/issue-34209.stderr b/src/test/ui/issues/issue-34209.stderr index 5c31acea5b600..dc5e4bbeec4bb 100644 --- a/src/test/ui/issues/issue-34209.stderr +++ b/src/test/ui/issues/issue-34209.stderr @@ -1,5 +1,5 @@ error[E0223]: ambiguous associated type - --> $DIR/issue-34209.rs:17:9 + --> $DIR/issue-34209.rs:7:9 | LL | S::B{ } => { }, | ^^^^ ambiguous associated type diff --git a/src/test/ui/issues/issue-34222-1.rs b/src/test/ui/issues/issue-34222-1.rs index 6c85414860f33..d36dddc97bb7e 100644 --- a/src/test/ui/issues/issue-34222-1.rs +++ b/src/test/ui/issues/issue-34222-1.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { /// comment //~ ERROR found a documentation comment that doesn't document anything } diff --git a/src/test/ui/issues/issue-34222-1.stderr b/src/test/ui/issues/issue-34222-1.stderr index ef68d41da3cd8..beb6b589766b5 100644 --- a/src/test/ui/issues/issue-34222-1.stderr +++ b/src/test/ui/issues/issue-34222-1.stderr @@ -1,5 +1,5 @@ error[E0585]: found a documentation comment that doesn't document anything - --> $DIR/issue-34222-1.rs:12:5 + --> $DIR/issue-34222-1.rs:2:5 | LL | /// comment //~ ERROR found a documentation comment that doesn't document anything | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-34334.rs b/src/test/ui/issues/issue-34334.rs index a752a36ade28d..5c4f5c86a7fde 100644 --- a/src/test/ui/issues/issue-34334.rs +++ b/src/test/ui/issues/issue-34334.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main () { let sr: Vec<(u32, _, _) = vec![]; //~ ERROR expected one of `,` or `>`, found `=` let sr2: Vec<(u32, _, _)> = sr.iter().map(|(faction, th_sender, th_receiver)| {}).collect(); diff --git a/src/test/ui/issues/issue-34334.stderr b/src/test/ui/issues/issue-34334.stderr index 240df196ae77b..9571d04363512 100644 --- a/src/test/ui/issues/issue-34334.stderr +++ b/src/test/ui/issues/issue-34334.stderr @@ -1,5 +1,5 @@ error: expected one of `,` or `>`, found `=` - --> $DIR/issue-34334.rs:12:29 + --> $DIR/issue-34334.rs:2:29 | LL | let sr: Vec<(u32, _, _) = vec![]; //~ ERROR expected one of `,` or `>`, found `=` | -- ^ expected one of `,` or `>` here diff --git a/src/test/ui/issues/issue-34349.rs b/src/test/ui/issues/issue-34349.rs index 591753181db12..d861802610aac 100644 --- a/src/test/ui/issues/issue-34349.rs +++ b/src/test/ui/issues/issue-34349.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // This is a regression test for a problem encountered around upvar // inference and trait caching: in particular, we were entering a // temporary closure kind during inference, and then caching results diff --git a/src/test/ui/issues/issue-34349.stderr b/src/test/ui/issues/issue-34349.stderr index 8683962b24df4..f0cd8f9488157 100644 --- a/src/test/ui/issues/issue-34349.stderr +++ b/src/test/ui/issues/issue-34349.stderr @@ -1,5 +1,5 @@ error[E0525]: expected a closure that implements the `Fn` trait, but this closure only implements `FnMut` - --> $DIR/issue-34349.rs:26:17 + --> $DIR/issue-34349.rs:16:17 | LL | let diary = || { //~ ERROR E0525 | ^^ this closure implements `FnMut`, not `Fn` diff --git a/src/test/ui/issues/issue-34373.rs b/src/test/ui/issues/issue-34373.rs index 4d7238ad76f75..ca24e37d9bb11 100644 --- a/src/test/ui/issues/issue-34373.rs +++ b/src/test/ui/issues/issue-34373.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![allow(warnings)] trait Trait { diff --git a/src/test/ui/issues/issue-34373.stderr b/src/test/ui/issues/issue-34373.stderr index ea80111b5e24a..45e8d1bf3e399 100644 --- a/src/test/ui/issues/issue-34373.stderr +++ b/src/test/ui/issues/issue-34373.stderr @@ -1,11 +1,11 @@ error[E0391]: cycle detected when processing `Foo::T` - --> $DIR/issue-34373.rs:17:30 + --> $DIR/issue-34373.rs:7:30 | LL | pub struct Foo>>; //~ ERROR cycle detected | ^^^^^^^^^^ | note: ...which requires processing `DefaultFoo`... - --> $DIR/issue-34373.rs:18:19 + --> $DIR/issue-34373.rs:8:19 | LL | type DefaultFoo = Foo; | ^^^ diff --git a/src/test/ui/issues/issue-34418.rs b/src/test/ui/issues/issue-34418.rs index 6bc0add220517..bc755e46227bd 100644 --- a/src/test/ui/issues/issue-34418.rs +++ b/src/test/ui/issues/issue-34418.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![allow(unused)] diff --git a/src/test/ui/issues/issue-34418.stderr b/src/test/ui/issues/issue-34418.stderr index 4cb5ec1ae3b32..f155ca50c924e 100644 --- a/src/test/ui/issues/issue-34418.stderr +++ b/src/test/ui/issues/issue-34418.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-34418.rs:31:1 + --> $DIR/issue-34418.rs:21:1 | LL | fn main() {} //~ ERROR compilation successful | ^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-3477.rs b/src/test/ui/issues/issue-3477.rs index 0bad7372a12d9..ae17e7d1e418a 100644 --- a/src/test/ui/issues/issue-3477.rs +++ b/src/test/ui/issues/issue-3477.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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let _p: char = 100; //~^ ERROR mismatched types diff --git a/src/test/ui/issues/issue-3477.stderr b/src/test/ui/issues/issue-3477.stderr index 4207828693a35..1b7f597d50e2a 100644 --- a/src/test/ui/issues/issue-3477.stderr +++ b/src/test/ui/issues/issue-3477.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-3477.rs:12:20 + --> $DIR/issue-3477.rs:2:20 | LL | let _p: char = 100; | ^^^ expected char, found u8 diff --git a/src/test/ui/issues/issue-34839.rs b/src/test/ui/issues/issue-34839.rs index be7e782002048..da3cfee6e4770 100644 --- a/src/test/ui/issues/issue-34839.rs +++ b/src/test/ui/issues/issue-34839.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] #![allow(dead_code)] diff --git a/src/test/ui/issues/issue-34839.stderr b/src/test/ui/issues/issue-34839.stderr index 538cc7a581bd6..c3a87f15f0e40 100644 --- a/src/test/ui/issues/issue-34839.stderr +++ b/src/test/ui/issues/issue-34839.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-34839.rs:31:1 + --> $DIR/issue-34839.rs:21:1 | LL | fn main() {} //~ ERROR compilation successful | ^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-35075.rs b/src/test/ui/issues/issue-35075.rs index 9943cfb9bca54..0e54131c24560 100644 --- a/src/test/ui/issues/issue-35075.rs +++ b/src/test/ui/issues/issue-35075.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Bar { inner: Foo //~ ERROR cannot find type `Foo` in this scope } diff --git a/src/test/ui/issues/issue-35075.stderr b/src/test/ui/issues/issue-35075.stderr index 9b2f17f038b8f..9fc9985bdd3b7 100644 --- a/src/test/ui/issues/issue-35075.stderr +++ b/src/test/ui/issues/issue-35075.stderr @@ -1,5 +1,5 @@ error[E0412]: cannot find type `Foo` in this scope - --> $DIR/issue-35075.rs:12:12 + --> $DIR/issue-35075.rs:2:12 | LL | inner: Foo //~ ERROR cannot find type `Foo` in this scope | ^^^--- @@ -8,7 +8,7 @@ LL | inner: Foo //~ ERROR cannot find type `Foo` in this scope | help: you can try using the variant's enum: `Baz` error[E0412]: cannot find type `Foo` in this scope - --> $DIR/issue-35075.rs:16:9 + --> $DIR/issue-35075.rs:6:9 | LL | Foo(Foo) //~ ERROR cannot find type `Foo` in this scope | ^^^--- diff --git a/src/test/ui/issues/issue-35139.rs b/src/test/ui/issues/issue-35139.rs index 67f0e7aaf9717..1ee00fc7ec2d9 100644 --- a/src/test/ui/issues/issue-35139.rs +++ b/src/test/ui/issues/issue-35139.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - use std::fmt; pub trait MethodType { diff --git a/src/test/ui/issues/issue-35139.stderr b/src/test/ui/issues/issue-35139.stderr index 7ec1459dd1693..1e3d24fa514c3 100644 --- a/src/test/ui/issues/issue-35139.stderr +++ b/src/test/ui/issues/issue-35139.stderr @@ -1,5 +1,5 @@ error[E0207]: the lifetime parameter `'a` is not constrained by the impl trait, self type, or predicates - --> $DIR/issue-35139.rs:19:6 + --> $DIR/issue-35139.rs:9:6 | LL | impl<'a> MethodType for MTFn { //~ ERROR E0207 | ^^ unconstrained lifetime parameter diff --git a/src/test/ui/issues/issue-3521-2.rs b/src/test/ui/issues/issue-3521-2.rs index 1742cb4fb7214..39f7fcb833756 100644 --- a/src/test/ui/issues/issue-3521-2.rs +++ b/src/test/ui/issues/issue-3521-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let foo = 100; diff --git a/src/test/ui/issues/issue-3521-2.stderr b/src/test/ui/issues/issue-3521-2.stderr index 07c37fadbbad5..1464fd74bba69 100644 --- a/src/test/ui/issues/issue-3521-2.stderr +++ b/src/test/ui/issues/issue-3521-2.stderr @@ -1,5 +1,5 @@ error[E0434]: can't capture dynamic environment in a fn item - --> $DIR/issue-3521-2.rs:14:23 + --> $DIR/issue-3521-2.rs:4:23 | LL | static y: isize = foo + 1; | ^^^ diff --git a/src/test/ui/issues/issue-3521.rs b/src/test/ui/issues/issue-3521.rs index 78af11a0b5813..9e72dd29a408e 100644 --- a/src/test/ui/issues/issue-3521.rs +++ b/src/test/ui/issues/issue-3521.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn main() { let foo = 100; diff --git a/src/test/ui/issues/issue-3521.stderr b/src/test/ui/issues/issue-3521.stderr index f4a1ef5cefaf3..ae1998752693c 100644 --- a/src/test/ui/issues/issue-3521.stderr +++ b/src/test/ui/issues/issue-3521.stderr @@ -1,5 +1,5 @@ error[E0435]: attempt to use a non-constant value in a constant - --> $DIR/issue-3521.rs:16:15 + --> $DIR/issue-3521.rs:6:15 | LL | Bar = foo | ^^^ non-constant value diff --git a/src/test/ui/issues/issue-35241.rs b/src/test/ui/issues/issue-35241.rs index 4616f25bdfb86..2fa762475da95 100644 --- a/src/test/ui/issues/issue-35241.rs +++ b/src/test/ui/issues/issue-35241.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo(u32); fn test() -> Foo { Foo } //~ ERROR mismatched types diff --git a/src/test/ui/issues/issue-35241.stderr b/src/test/ui/issues/issue-35241.stderr index 42bf0aae5b12c..50f15c811f20b 100644 --- a/src/test/ui/issues/issue-35241.stderr +++ b/src/test/ui/issues/issue-35241.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/issue-35241.rs:13:20 + --> $DIR/issue-35241.rs:3:20 | LL | fn test() -> Foo { Foo } //~ ERROR mismatched types | --- ^^^ diff --git a/src/test/ui/issues/issue-35450.rs b/src/test/ui/issues/issue-35450.rs index 5f54f269c6c55..ac4c16306cd48 100644 --- a/src/test/ui/issues/issue-35450.rs +++ b/src/test/ui/issues/issue-35450.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - macro_rules! m { ($($t:tt)*) => { $($t)* } } fn main() { diff --git a/src/test/ui/issues/issue-35450.stderr b/src/test/ui/issues/issue-35450.stderr index b8fc7d2054ca8..7edee5c41e626 100644 --- a/src/test/ui/issues/issue-35450.stderr +++ b/src/test/ui/issues/issue-35450.stderr @@ -1,5 +1,5 @@ error: expected expression, found `$` - --> $DIR/issue-35450.rs:14:8 + --> $DIR/issue-35450.rs:4:8 | LL | m!($t); //~ ERROR expected expression | ^ expected expression diff --git a/src/test/ui/issues/issue-35570.rs b/src/test/ui/issues/issue-35570.rs index 092bf00ddd6a4..de2c93c4c404e 100644 --- a/src/test/ui/issues/issue-35570.rs +++ b/src/test/ui/issues/issue-35570.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] use std::mem; diff --git a/src/test/ui/issues/issue-35570.stderr b/src/test/ui/issues/issue-35570.stderr index 349693f29d5fe..4690f4375fe7f 100644 --- a/src/test/ui/issues/issue-35570.stderr +++ b/src/test/ui/issues/issue-35570.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-35570.rs:38:1 + --> $DIR/issue-35570.rs:28:1 | LL | / fn main() { //~ ERROR compilation successful LL | | takes_lifetime(foo); diff --git a/src/test/ui/issues/issue-35668.rs b/src/test/ui/issues/issue-35668.rs index 17fd77b6df3a2..1b8ada57ed69c 100644 --- a/src/test/ui/issues/issue-35668.rs +++ b/src/test/ui/issues/issue-35668.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn func<'a, T>(a: &'a [T]) -> impl Iterator { a.iter().map(|a| a*a) //~^ ERROR binary operation `*` cannot be applied to type `&T` diff --git a/src/test/ui/issues/issue-35668.stderr b/src/test/ui/issues/issue-35668.stderr index 51d6b04024047..08ce2faff10ab 100644 --- a/src/test/ui/issues/issue-35668.stderr +++ b/src/test/ui/issues/issue-35668.stderr @@ -1,5 +1,5 @@ error[E0369]: binary operation `*` cannot be applied to type `&T` - --> $DIR/issue-35668.rs:12:22 + --> $DIR/issue-35668.rs:2:22 | LL | a.iter().map(|a| a*a) | ^^^ diff --git a/src/test/ui/issues/issue-35675.rs b/src/test/ui/issues/issue-35675.rs index f34954681510e..fae5cdc0733f1 100644 --- a/src/test/ui/issues/issue-35675.rs +++ b/src/test/ui/issues/issue-35675.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // these two HELPs are actually in a new line between this line and the `enum Fruit` line enum Fruit { Apple(i64), diff --git a/src/test/ui/issues/issue-35675.stderr b/src/test/ui/issues/issue-35675.stderr index fef8de3a28d9e..cc23236db1729 100644 --- a/src/test/ui/issues/issue-35675.stderr +++ b/src/test/ui/issues/issue-35675.stderr @@ -1,5 +1,5 @@ error[E0412]: cannot find type `Apple` in this scope - --> $DIR/issue-35675.rs:17:29 + --> $DIR/issue-35675.rs:7:29 | LL | fn should_return_fruit() -> Apple { | ^^^^^ @@ -8,7 +8,7 @@ LL | fn should_return_fruit() -> Apple { | help: you can try using the variant's enum: `Fruit` error[E0425]: cannot find function `Apple` in this scope - --> $DIR/issue-35675.rs:19:5 + --> $DIR/issue-35675.rs:9:5 | LL | Apple(5) | ^^^^^ not found in this scope @@ -18,7 +18,7 @@ LL | use Fruit::Apple; | error[E0573]: expected type, found variant `Fruit::Apple` - --> $DIR/issue-35675.rs:23:33 + --> $DIR/issue-35675.rs:13:33 | LL | fn should_return_fruit_too() -> Fruit::Apple { | ^^^^^^^^^^^^ @@ -27,7 +27,7 @@ LL | fn should_return_fruit_too() -> Fruit::Apple { | help: you can try using the variant's enum: `Fruit` error[E0425]: cannot find function `Apple` in this scope - --> $DIR/issue-35675.rs:25:5 + --> $DIR/issue-35675.rs:15:5 | LL | Apple(5) | ^^^^^ not found in this scope @@ -37,7 +37,7 @@ LL | use Fruit::Apple; | error[E0573]: expected type, found variant `Ok` - --> $DIR/issue-35675.rs:29:13 + --> $DIR/issue-35675.rs:19:13 | LL | fn foo() -> Ok { | ^^ not a type @@ -46,7 +46,7 @@ LL | fn foo() -> Ok { = help: there is an enum variant `std::result::Result::Ok`, try using `std::result::Result`? error[E0412]: cannot find type `Variant3` in this scope - --> $DIR/issue-35675.rs:34:13 + --> $DIR/issue-35675.rs:24:13 | LL | fn bar() -> Variant3 { | ^^^^^^^^ @@ -55,7 +55,7 @@ LL | fn bar() -> Variant3 { | help: you can try using the variant's enum: `x::Enum` error[E0573]: expected type, found variant `Some` - --> $DIR/issue-35675.rs:38:13 + --> $DIR/issue-35675.rs:28:13 | LL | fn qux() -> Some { | ^^^^ not a type diff --git a/src/test/ui/issues/issue-35869.rs b/src/test/ui/issues/issue-35869.rs index 7bab22edcf684..b9b4c972e586e 100644 --- a/src/test/ui/issues/issue-35869.rs +++ b/src/test/ui/issues/issue-35869.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - trait Foo { fn foo(_: fn(u8) -> ()); fn bar(_: Option); diff --git a/src/test/ui/issues/issue-35869.stderr b/src/test/ui/issues/issue-35869.stderr index 1930dd5bbcb8e..4ef840d019f1d 100644 --- a/src/test/ui/issues/issue-35869.stderr +++ b/src/test/ui/issues/issue-35869.stderr @@ -1,5 +1,5 @@ error[E0053]: method `foo` has an incompatible type for trait - --> $DIR/issue-35869.rs:21:15 + --> $DIR/issue-35869.rs:11:15 | LL | fn foo(_: fn(u8) -> ()); | ------------ type in trait @@ -11,7 +11,7 @@ LL | fn foo(_: fn(u16) -> ()) {} found type `fn(fn(u16))` error[E0053]: method `bar` has an incompatible type for trait - --> $DIR/issue-35869.rs:23:15 + --> $DIR/issue-35869.rs:13:15 | LL | fn bar(_: Option); | ---------- type in trait @@ -23,7 +23,7 @@ LL | fn bar(_: Option) {} found type `fn(std::option::Option)` error[E0053]: method `baz` has an incompatible type for trait - --> $DIR/issue-35869.rs:25:15 + --> $DIR/issue-35869.rs:15:15 | LL | fn baz(_: (u8, u16)); | --------- type in trait @@ -35,7 +35,7 @@ LL | fn baz(_: (u16, u16)) {} found type `fn((u16, u16))` error[E0053]: method `qux` has an incompatible type for trait - --> $DIR/issue-35869.rs:27:17 + --> $DIR/issue-35869.rs:17:17 | LL | fn qux() -> u8; | -- type in trait diff --git a/src/test/ui/issues/issue-35976.rs b/src/test/ui/issues/issue-35976.rs index d45b0c5a0416c..95c0cc95bb2ba 100644 --- a/src/test/ui/issues/issue-35976.rs +++ b/src/test/ui/issues/issue-35976.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - mod private { pub trait Future { fn wait(&self) where Self: Sized; diff --git a/src/test/ui/issues/issue-35976.stderr b/src/test/ui/issues/issue-35976.stderr index f97ba33dfd32b..d12198de5e114 100644 --- a/src/test/ui/issues/issue-35976.stderr +++ b/src/test/ui/issues/issue-35976.stderr @@ -1,5 +1,5 @@ error: the `wait` method cannot be invoked on a trait object - --> $DIR/issue-35976.rs:24:9 + --> $DIR/issue-35976.rs:14:9 | LL | arg.wait(); | ^^^^ diff --git a/src/test/ui/issues/issue-35988.rs b/src/test/ui/issues/issue-35988.rs index 5909322ff1fe5..5cf2f8e5212d1 100644 --- a/src/test/ui/issues/issue-35988.rs +++ b/src/test/ui/issues/issue-35988.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - enum E { V([Box]), //~^ ERROR the size for values of type diff --git a/src/test/ui/issues/issue-35988.stderr b/src/test/ui/issues/issue-35988.stderr index 0b9d846924798..a570bd22dcc43 100644 --- a/src/test/ui/issues/issue-35988.stderr +++ b/src/test/ui/issues/issue-35988.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `[std::boxed::Box]` cannot be known at compilation time - --> $DIR/issue-35988.rs:12:7 + --> $DIR/issue-35988.rs:2:7 | LL | V([Box]), | ^^^^^^^^ doesn't have a size known at compile-time diff --git a/src/test/ui/issues/issue-3601.rs b/src/test/ui/issues/issue-3601.rs index cc69a76e04331..e33359beccdef 100644 --- a/src/test/ui/issues/issue-3601.rs +++ b/src/test/ui/issues/issue-3601.rs @@ -1,13 +1,3 @@ -// Copyright 2012-2013 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(box_patterns)] #![feature(box_syntax)] diff --git a/src/test/ui/issues/issue-3601.stderr b/src/test/ui/issues/issue-3601.stderr index 6c28ccb2ee8d4..0b5242ee528dd 100644 --- a/src/test/ui/issues/issue-3601.stderr +++ b/src/test/ui/issues/issue-3601.stderr @@ -1,5 +1,5 @@ error[E0004]: non-exhaustive patterns: `_` not covered - --> $DIR/issue-3601.rs:40:44 + --> $DIR/issue-3601.rs:30:44 | LL | box NodeKind::Element(ed) => match ed.kind { //~ ERROR non-exhaustive patterns | ^^^^^^^ pattern `_` not covered diff --git a/src/test/ui/issues/issue-36082.ast.nll.stderr b/src/test/ui/issues/issue-36082.ast.nll.stderr index cf280bd80b27f..594645577fd12 100644 --- a/src/test/ui/issues/issue-36082.ast.nll.stderr +++ b/src/test/ui/issues/issue-36082.ast.nll.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/issue-36082.rs:23:19 + --> $DIR/issue-36082.rs:13:19 | LL | let val: &_ = x.borrow().0; | ^^^^^^^^^^ - temporary value only lives until here diff --git a/src/test/ui/issues/issue-36082.ast.stderr b/src/test/ui/issues/issue-36082.ast.stderr index b79958de5cb36..21b63058e9de2 100644 --- a/src/test/ui/issues/issue-36082.ast.stderr +++ b/src/test/ui/issues/issue-36082.ast.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/issue-36082.rs:23:19 + --> $DIR/issue-36082.rs:13:19 | LL | let val: &_ = x.borrow().0; | ^^^^^^^^^^ - temporary value dropped here while still borrowed diff --git a/src/test/ui/issues/issue-36082.mir.stderr b/src/test/ui/issues/issue-36082.mir.stderr index cf280bd80b27f..594645577fd12 100644 --- a/src/test/ui/issues/issue-36082.mir.stderr +++ b/src/test/ui/issues/issue-36082.mir.stderr @@ -1,5 +1,5 @@ error[E0597]: borrowed value does not live long enough - --> $DIR/issue-36082.rs:23:19 + --> $DIR/issue-36082.rs:13:19 | LL | let val: &_ = x.borrow().0; | ^^^^^^^^^^ - temporary value only lives until here diff --git a/src/test/ui/issues/issue-36082.rs b/src/test/ui/issues/issue-36082.rs index ed6a2f85fbe23..87cb1e55150a1 100644 --- a/src/test/ui/issues/issue-36082.rs +++ b/src/test/ui/issues/issue-36082.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/ui/issues/issue-36116.rs b/src/test/ui/issues/issue-36116.rs index 3afbfa61984b5..31d64e2f32563 100644 --- a/src/test/ui/issues/issue-36116.rs +++ b/src/test/ui/issues/issue-36116.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // Unnecessary path disambiguator is ok #![feature(rustc_attrs)] diff --git a/src/test/ui/issues/issue-36116.stderr b/src/test/ui/issues/issue-36116.stderr index df69dcb0d92c6..422ea23e934cb 100644 --- a/src/test/ui/issues/issue-36116.stderr +++ b/src/test/ui/issues/issue-36116.stderr @@ -1,17 +1,17 @@ warning: unnecessary path disambiguator - --> $DIR/issue-36116.rs:30:50 + --> $DIR/issue-36116.rs:20:50 | LL | let f = Some(Foo { _a: 42 }).map(|a| a as Foo::); //~ WARN unnecessary path disambiguator | ^^ try removing `::` warning: unnecessary path disambiguator - --> $DIR/issue-36116.rs:31:15 + --> $DIR/issue-36116.rs:21:15 | LL | let g: Foo:: = Foo { _a: 42 }; //~ WARN unnecessary path disambiguator | ^^ try removing `::` error: compilation successful - --> $DIR/issue-36116.rs:37:1 + --> $DIR/issue-36116.rs:27:1 | LL | fn main() {} //~ ERROR compilation successful | ^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-36163.rs b/src/test/ui/issues/issue-36163.rs index 4c74d9d9173d8..340d2c3997c30 100644 --- a/src/test/ui/issues/issue-36163.rs +++ b/src/test/ui/issues/issue-36163.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - const A: isize = Foo::B as isize; enum Foo { diff --git a/src/test/ui/issues/issue-36163.stderr b/src/test/ui/issues/issue-36163.stderr index 5623437669f06..c114e58e4d943 100644 --- a/src/test/ui/issues/issue-36163.stderr +++ b/src/test/ui/issues/issue-36163.stderr @@ -1,17 +1,17 @@ error[E0391]: cycle detected when processing `Foo::B::{{constant}}` - --> $DIR/issue-36163.rs:14:9 + --> $DIR/issue-36163.rs:4:9 | LL | B = A, //~ ERROR E0391 | ^ | note: ...which requires processing `A`... - --> $DIR/issue-36163.rs:11:18 + --> $DIR/issue-36163.rs:1:18 | LL | const A: isize = Foo::B as isize; | ^^^^^^^^^^^^^^^ = note: ...which again requires processing `Foo::B::{{constant}}`, completing the cycle note: cycle used when const-evaluating `Foo::B::{{constant}}` - --> $DIR/issue-36163.rs:14:9 + --> $DIR/issue-36163.rs:4:9 | LL | B = A, //~ ERROR E0391 | ^ diff --git a/src/test/ui/issues/issue-36299.rs b/src/test/ui/issues/issue-36299.rs index 88ac74cb09e42..7b68420b71cb2 100644 --- a/src/test/ui/issues/issue-36299.rs +++ b/src/test/ui/issues/issue-36299.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct Foo<'a, A> {} //~^ ERROR parameter `'a` is never used //~| ERROR parameter `A` is never used diff --git a/src/test/ui/issues/issue-36299.stderr b/src/test/ui/issues/issue-36299.stderr index faa20253b9b47..dce4bd31ca305 100644 --- a/src/test/ui/issues/issue-36299.stderr +++ b/src/test/ui/issues/issue-36299.stderr @@ -1,5 +1,5 @@ error[E0392]: parameter `'a` is never used - --> $DIR/issue-36299.rs:11:12 + --> $DIR/issue-36299.rs:1:12 | LL | struct Foo<'a, A> {} | ^^ unused type parameter @@ -7,7 +7,7 @@ LL | struct Foo<'a, A> {} = help: consider removing `'a` or using a marker such as `std::marker::PhantomData` error[E0392]: parameter `A` is never used - --> $DIR/issue-36299.rs:11:16 + --> $DIR/issue-36299.rs:1:16 | LL | struct Foo<'a, A> {} | ^ unused type parameter diff --git a/src/test/ui/issues/issue-36379.rs b/src/test/ui/issues/issue-36379.rs index b20765815e0b2..fe591417d9bc0 100644 --- a/src/test/ui/issues/issue-36379.rs +++ b/src/test/ui/issues/issue-36379.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![feature(rustc_attrs)] fn _test() -> impl Default { } diff --git a/src/test/ui/issues/issue-36379.stderr b/src/test/ui/issues/issue-36379.stderr index b06591f411e99..99f398557f2e7 100644 --- a/src/test/ui/issues/issue-36379.stderr +++ b/src/test/ui/issues/issue-36379.stderr @@ -1,5 +1,5 @@ error: compilation successful - --> $DIR/issue-36379.rs:16:1 + --> $DIR/issue-36379.rs:6:1 | LL | fn main() { } //~ ERROR compilation successful | ^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-36400.nll.stderr b/src/test/ui/issues/issue-36400.nll.stderr index e4347f0ece831..e260fab779112 100644 --- a/src/test/ui/issues/issue-36400.nll.stderr +++ b/src/test/ui/issues/issue-36400.nll.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow `*x` as mutable, as `x` is not declared as mutable - --> $DIR/issue-36400.rs:15:7 + --> $DIR/issue-36400.rs:5:7 | LL | let x = Box::new(3); | - help: consider changing this to be mutable: `mut x` diff --git a/src/test/ui/issues/issue-36400.rs b/src/test/ui/issues/issue-36400.rs index fa4361e42aa5b..5ba9eb2333bbd 100644 --- a/src/test/ui/issues/issue-36400.rs +++ b/src/test/ui/issues/issue-36400.rs @@ -1,13 +1,3 @@ -// Copyright 2017 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn f(x: &mut u32) {} fn main() { diff --git a/src/test/ui/issues/issue-36400.stderr b/src/test/ui/issues/issue-36400.stderr index dbd6999b4f29f..f29ef053768cd 100644 --- a/src/test/ui/issues/issue-36400.stderr +++ b/src/test/ui/issues/issue-36400.stderr @@ -1,5 +1,5 @@ error[E0596]: cannot borrow immutable `Box` content `*x` as mutable - --> $DIR/issue-36400.rs:15:12 + --> $DIR/issue-36400.rs:5:12 | LL | let x = Box::new(3); | - consider changing this to `mut x` diff --git a/src/test/ui/issues/issue-36617.rs b/src/test/ui/issues/issue-36617.rs index 9f5eeb1a45dc8..846efac41c856 100644 --- a/src/test/ui/issues/issue-36617.rs +++ b/src/test/ui/issues/issue-36617.rs @@ -1,11 +1 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - #![derive(Copy)] //~ ERROR `derive` may only be applied to structs, enums and unions diff --git a/src/test/ui/issues/issue-36617.stderr b/src/test/ui/issues/issue-36617.stderr index efd582352827d..7685b84bea7bf 100644 --- a/src/test/ui/issues/issue-36617.stderr +++ b/src/test/ui/issues/issue-36617.stderr @@ -1,5 +1,5 @@ error: `derive` may only be applied to structs, enums and unions - --> $DIR/issue-36617.rs:11:1 + --> $DIR/issue-36617.rs:1:1 | LL | #![derive(Copy)] //~ ERROR `derive` may only be applied to structs, enums and unions | ^^^^^^^^^^^^^^^^ help: try an outer attribute: `#[derive(Copy)]` diff --git a/src/test/ui/issues/issue-36638.rs b/src/test/ui/issues/issue-36638.rs index 5e43536ef3f90..a412505ff0fab 100644 --- a/src/test/ui/issues/issue-36638.rs +++ b/src/test/ui/issues/issue-36638.rs @@ -1,13 +1,3 @@ -// Copyright 2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - // compile-flags: -Z continue-parse-after-error struct Foo(Self); diff --git a/src/test/ui/issues/issue-36638.stderr b/src/test/ui/issues/issue-36638.stderr index d111fb469bfe1..4ef00b8c50dbd 100644 --- a/src/test/ui/issues/issue-36638.stderr +++ b/src/test/ui/issues/issue-36638.stderr @@ -1,11 +1,11 @@ error: expected identifier, found keyword `Self` - --> $DIR/issue-36638.rs:13:12 + --> $DIR/issue-36638.rs:3:12 | LL | struct Foo(Self); | ^^^^ expected identifier, found keyword error: expected identifier, found keyword `Self` - --> $DIR/issue-36638.rs:16:11 + --> $DIR/issue-36638.rs:6:11 | LL | trait Bar {} | ^^^^ expected identifier, found keyword diff --git a/src/test/ui/issues/issue-3668-2.rs b/src/test/ui/issues/issue-3668-2.rs index fe46877e8d340..265a884ded7aa 100644 --- a/src/test/ui/issues/issue-3668-2.rs +++ b/src/test/ui/issues/issue-3668-2.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - fn f(x:isize) { static child: isize = x + 1; //~^ ERROR can't capture dynamic environment diff --git a/src/test/ui/issues/issue-3668-2.stderr b/src/test/ui/issues/issue-3668-2.stderr index e78a2791907da..8dd6f49d8de5a 100644 --- a/src/test/ui/issues/issue-3668-2.stderr +++ b/src/test/ui/issues/issue-3668-2.stderr @@ -1,5 +1,5 @@ error[E0434]: can't capture dynamic environment in a fn item - --> $DIR/issue-3668-2.rs:12:27 + --> $DIR/issue-3668-2.rs:2:27 | LL | static child: isize = x + 1; | ^ diff --git a/src/test/ui/issues/issue-3668.rs b/src/test/ui/issues/issue-3668.rs index 00f64414a9e72..3f61b1b02e779 100644 --- a/src/test/ui/issues/issue-3668.rs +++ b/src/test/ui/issues/issue-3668.rs @@ -1,13 +1,3 @@ -// 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - struct P { child: Option> } trait PTrait { fn getChildOption(&self) -> Option>; diff --git a/src/test/ui/issues/issue-3668.stderr b/src/test/ui/issues/issue-3668.stderr index 73eaf57c95543..7f974de9da8ea 100644 --- a/src/test/ui/issues/issue-3668.stderr +++ b/src/test/ui/issues/issue-3668.stderr @@ -1,5 +1,5 @@ error[E0434]: can't capture dynamic environment in a fn item - --> $DIR/issue-3668.rs:18:34 + --> $DIR/issue-3668.rs:8:34 | LL | static childVal: Box